From 7cc9639417d9a33ff9b2e0c34737c1cdd9e6908e Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 22 Feb 2020 12:28:15 +0100
Subject: [PATCH 001/490] comment translation

---
 .../template/core/modules/mymodule/mod_myobject_standard.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
index 71926700aa4..9c1f6ece4d0 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
@@ -116,7 +116,7 @@ class mod_myobject_standard extends ModeleNumRefMyObject
 	{
 		global $db, $conf;
 
-		// D'abord on recupere la valeur max
+		// First we get the max value
 		$posindice = 9;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql .= " FROM ".MAIN_DB_PREFIX."mymodule_myobject";

From 061f4623b3cc8ce593c97a8ae6c4fe2333514e0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 22 Apr 2020 23:53:00 +0200
Subject: [PATCH 002/490] remove deprecated libelle

---
 htdocs/product/stock/class/entrepot.class.php | 21 +++++++++++--------
 htdocs/product/stock/movement_card.php        |  1 -
 htdocs/product/stock/movement_list.php        |  1 -
 htdocs/product/stock/product.php              |  1 -
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 3dd22c9e5c3..c09c8932401 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2008 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011	   Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2016	   Francis Appels       <francis.appels@yahoo.com>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2020  Frédéric France         <frederic.france@netlogic.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
@@ -48,7 +48,11 @@ class Entrepot extends CommonObject
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
 	public $picto = 'stock';
-	public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+
+    /**
+     * @var int 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+     */
+	public $ismultientitymanaged = 1;
 
 	/**
 	 * @var string	Label
@@ -184,11 +188,10 @@ class Entrepot extends CommonObject
 
 		$error = 0;
 
-		$this->libelle = trim($this->libelle);
+		$this->label = !empty($this->label) ? trim($this->label) : trim($this->libelle);
 
-		// Si libelle non defini, erreur
-		if ($this->libelle == '')
-		{
+		// Error if label not defined
+		if ($this->label == '') {
 			$this->error = "ErrorFieldRequired";
 			return 0;
 		}
@@ -198,7 +201,7 @@ class Entrepot extends CommonObject
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."entrepot (ref, entity, datec, fk_user_author, fk_parent)";
-		$sql .= " VALUES ('".$this->db->escape($this->libelle)."', ".$conf->entity.", '".$this->db->idate($now)."', ".$user->id.", ".($this->fk_parent > 0 ? $this->fk_parent : "NULL").")";
+		$sql .= " VALUES ('".$this->db->escape($this->label)."', ".$conf->entity.", '".$this->db->idate($now)."', ".$user->id.", ".($this->fk_parent > 0 ? $this->fk_parent : "NULL").")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -285,7 +288,7 @@ class Entrepot extends CommonObject
 			}
 		}
 
-		$this->libelle = trim($this->libelle);
+		$this->label = !empty($this->label) ? trim($this->label) : trim($this->libelle);
 		$this->description = trim($this->description);
 
 		$this->lieu = trim($this->lieu);
@@ -296,7 +299,7 @@ class Entrepot extends CommonObject
 		$this->country_id = ($this->country_id > 0 ? $this->country_id : 0);
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."entrepot ";
-		$sql .= " SET ref = '".$this->db->escape($this->libelle)."'";
+		$sql .= " SET ref = '".$this->db->escape($this->label)."'";
 		$sql .= ", fk_parent = ".(($this->fk_parent > 0) ? $this->fk_parent : "NULL");
 		$sql .= ", description = '".$this->db->escape($this->description)."'";
 		$sql .= ", statut = ".$this->statut;
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index 2714740eb45..7e7aa53cd08 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -975,7 +975,6 @@ if ($resql)
         $productlot->sellby = $objp->sellby;
 
         $warehousestatic->id = $objp->entrepot_id;
-        $warehousestatic->libelle = $objp->warehouse_ref; // deprecated
         $warehousestatic->label = $objp->warehouse_ref;
         $warehousestatic->lieu = $objp->lieu;
 
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 944462ccdfc..de12c018f20 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -1012,7 +1012,6 @@ if ($resql)
 
         $warehousestatic->id = $objp->entrepot_id;
         $warehousestatic->ref = $objp->warehouse_ref;
-        $warehousestatic->libelle = $objp->warehouse_ref; // deprecated
         $warehousestatic->label = $objp->warehouse_ref;
         $warehousestatic->lieu = $objp->lieu;
         $warehousestatic->fk_parent = $objp->fk_parent;
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 0164f6338e6..e188ab368f7 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -866,7 +866,6 @@ if (!$variants) {
 
 			$entrepotstatic->id = $obj->rowid;
 			$entrepotstatic->ref = $obj->ref;
-			$entrepotstatic->libelle = $obj->ref;
 			$entrepotstatic->label = $obj->ref;
 			$entrepotstatic->lieu = $obj->lieu;
 			$entrepotstatic->fk_parent = $obj->fk_parent;

From 2349c2be2247188bd37fa260e1ff813b304919f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 22 Apr 2020 23:55:50 +0200
Subject: [PATCH 003/490] remove deprecated libelle

---
 htdocs/product/stock/card.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 0665cc48e06..d0e9228fbf5 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -97,7 +97,7 @@ if (empty($reshook))
 	{
 		$object->ref         = GETPOST("ref");
 		$object->fk_parent   = GETPOST("fk_parent");
-		$object->libelle     = GETPOST("libelle");
+		$object->label = GETPOST("libelle");
 		$object->description = GETPOST("desc");
 		$object->statut      = GETPOST("statut");
 		$object->lieu        = GETPOST("lieu");
@@ -108,8 +108,7 @@ if (empty($reshook))
 		$object->phone = GETPOST("phone");
 		$object->fax = GETPOST("fax");
 
-		if (!empty($object->libelle))
-		{
+		if (!empty($object->label)) {
 	        // Fill array 'array_options' with data from add form
 	        $ret = $extrafields->setOptionalsFromPost(null, $object);
 	        if ($ret < 0) {
@@ -167,7 +166,7 @@ if (empty($reshook))
 	{
 		if ($object->fetch($id))
 		{
-			$object->libelle     = GETPOST("libelle");
+			$object->label = GETPOST("libelle");
 			$object->fk_parent   = GETPOST("fk_parent");
 			$object->description = GETPOST("desc");
 			$object->statut      = GETPOST("statut");

From bc4726c7c347e406b0bed30ddb0f437c3209bb8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 23 Apr 2020 00:06:57 +0200
Subject: [PATCH 004/490] remove deprecated libelle

---
 test/phpunit/MouvementStockTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/phpunit/MouvementStockTest.php b/test/phpunit/MouvementStockTest.php
index d095736042b..85137234a3b 100644
--- a/test/phpunit/MouvementStockTest.php
+++ b/test/phpunit/MouvementStockTest.php
@@ -148,13 +148,13 @@ class MouvementStockTest extends PHPUnit\Framework\TestCase
 		// We create a product for tests
 		$warehouse1=new Entrepot($db);
 		$warehouse1->initAsSpecimen();
-		$warehouse1->libelle.=' 1';
+		$warehouse1->label.=' 1';
 		$warehouse1->description.=' 1';
 		$warehouse1id=$warehouse1->create($user);
 
 		$warehouse2=new Entrepot($db);
 		$warehouse2->initAsSpecimen();
-		$warehouse2->libelle.=' 2';
+		$warehouse2->label.=' 2';
 		$warehouse2->description.=' 2';
 		$warehouse2id=$warehouse2->create($user);
 

From 35410209124f135e12781f757012b1c932f7d335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 23 Apr 2020 00:13:51 +0200
Subject: [PATCH 005/490] remove deprecated libelle

---
 htdocs/product/stock/class/mouvementstock.class.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 5bbc3f9d92c..d6ca1f3655e 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -41,7 +41,14 @@ class MouvementStock extends CommonObject
 	public $table_element = 'stock_mouvement';
 
 
+    /**
+     * @var int ID product
+     */
 	public $product_id;
+
+    /**
+     * @var int ID warehouse
+     */
 	public $warehouse_id;
 	public $qty;
 
@@ -58,7 +65,7 @@ class MouvementStock extends CommonObject
 	public $price;
 
 	/**
-     * @var int ID
+     * @var int ID user author
      */
 	public $fk_user_author;
 
@@ -894,13 +901,13 @@ class MouvementStock extends CommonObject
 			}
 			else
 			{
-				dol_syslog(get_class($this)."::createBatch array param dluo must contain at least key fk_product_stock".$error, LOG_ERR);
+				dol_syslog(get_class($this)."::createBatch array param dluo must contain at least key fk_product_stock", LOG_ERR);
 				$result = -1;
 			}
 		}
 		else
 		{
-			dol_syslog(get_class($this)."::createBatch error invalid param dluo".$error, LOG_ERR);
+			dol_syslog(get_class($this)."::createBatch error invalid param dluo", LOG_ERR);
 			$result = -1;
 		}
 

From ac872b6d3dc618b23b456fd7dccb9e9c1535e103 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Fri, 24 Apr 2020 23:36:37 +0200
Subject: [PATCH 006/490] Update global.inc.php

---
 htdocs/theme/eldy/global.inc.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index e495a3bb4bc..7b8e1373df9 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3360,6 +3360,7 @@ tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste
 }
 tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, form.liste_titre div a, div.liste_titre a {
 	text-shadow: none !important;
+	color: unset;
 }
 tr.liste_titre_topborder td {
 	border-top-width: <?php echo $borderwidth; ?>px;

From 740b2c92285aaf60c69fe3849306a6798fc01b74 Mon Sep 17 00:00:00 2001
From: "DEMAREST Maxime (Indelog)" <maxime@indelog.fr>
Date: Tue, 28 Apr 2020 08:59:27 +0200
Subject: [PATCH 007/490] NEW possibilty to group payments by mode and show
 their subtotal

This add two params (PAYMENTS_REPORT_GROUP_BY_MOD and
PAYMENTS_FOURN_REPORT_GROUP_BY_MOD) for payments and supplier payments
to group them by mode and get subtotals for each mode. Add the
corresponding configuration options on admin page fore each payments and
supplier payments.
---
 htdocs/admin/payment.php                      | 14 +++-
 htdocs/admin/supplier_payment.php             | 56 ++++++++++++++
 htdocs/compta/paiement/rapport.php            |  5 +-
 .../modules/rapport/pdf_paiement.class.php    | 74 +++++++++++++++++--
 htdocs/fourn/facture/rapport.php              |  5 +-
 htdocs/langs/en_US/bills.lang                 |  1 +
 htdocs/langs/fr_FR/bills.lang                 |  1 +
 7 files changed, 145 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index e740150e1d5..a5b494b62e2 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2015  Juanjo Menent				<jmenent@2byte.es>
+ * Copyright (C) 2020  Maxime DEMAREST              <maxime@indelog.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
@@ -70,11 +71,12 @@ if ($action == 'setmod')
 if ($action == 'setparams')
 {
 	$freetext = GETPOST('FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS', 'none'); // No alpha here, we want exact string
-
 	$res = dolibarr_set_const($db, "FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS", $freetext, 'chaine', 0, '', $conf->entity);
-
 	if (!$res > 0) $error++;
 
+    $res = dolibarr_set_const($db, "PAYMENTS_REPORT_GROUP_BY_MOD", GETPOST('PAYMENTS_REPORT_GROUP_BY_MOD', 'int'), 'chaine', 0, '', $conf->entity);
+    if (!$res > 0) $error++;
+
 	if ($error)
 	{
 		setEventMessages($langs->trans("Error"), null, 'errors');
@@ -253,6 +255,14 @@ print $form->selectyesno("FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS", $co
 print '</td><td class="right">';
 print "</td></tr>\n";
 
+// Allow to group payments by mod in rapports
+print '<tr class="oddeven"><td>';
+print $langs->trans("GroupPaymentsByModOnReports");
+print '</td><td width="60" align="center">';
+print $form->selectyesno("PAYMENTS_REPORT_GROUP_BY_MOD", $conf->global->PAYMENTS_REPORT_GROUP_BY_MOD, 1);
+print '</td><td class="right">';
+print "</td></tr>\n";
+
 print '</table>';
 print '</div>';
 
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index d533ba0d8eb..e2fc6dce4a7 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015  Juanjo Menent				<jmenent@2byte.es>
  * Copyright (C) 2016  Laurent Destailleur          <eldy@users.sourceforge.net>
+ * Copyright (C) 2020  Maxime DEMAREST              <maxime@indelog.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
@@ -144,6 +145,23 @@ elseif ($action == 'specimen')
     }
 }
 
+
+
+elseif ($action == 'setparams')
+{
+       $res = dolibarr_set_const($db, "PAYMENTS_FOURN_REPORT_GROUP_BY_MOD", GETPOST('PAYMENTS_FOURN_REPORT_GROUP_BY_MOD', 'int'), 'chaine', 0, '', $conf->entity);
+       if (!$res > 0) $error++;
+
+       if ($error)
+       {
+               setEventMessages($langs->trans("Error"), null, 'errors');
+       }
+       if (!$error)
+       {
+           setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+       }
+}
+
 /*
  * View
  */
@@ -428,8 +446,46 @@ foreach ($dirmodels as $reldir)
 
 print '</table>';
 
+/*
+ *  Other Options
+ */
+
+print "<br>";
+
+print load_fiche_titre($langs->trans("OtherOptions"), '', '');
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.newToken().'" />';
+print '<input type="hidden" name="action" value="setparams" />';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Parameter").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
+print '<td width="80">&nbsp;</td>';
+print "</tr>\n";
+
+// Allow to group payments by mod in rapports
+print '<tr class="oddeven"><td>';
+print $langs->trans("GroupPaymentsByModOnReports");
+print '</td><td width="60" align="center">';
+print $form->selectyesno("PAYMENTS_FOURN_REPORT_GROUP_BY_MOD", $conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD, 1);
+print '</td><td class="right">';
+print "</td></tr>\n";
+
+print '</table>';
+
 dol_fiche_end();
 
+print '<br>';
+print '<div class="center">';
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
+print '</div>';
+print '<br>';
+
+print '</form>';
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 80013d3d865..76a1ce72d76 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2020      Maxime DEMAREST      <maxime@indelog.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
@@ -26,6 +27,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/rapport/pdf_paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 // Security check
@@ -84,6 +86,7 @@ if ($action == 'builddoc')
  */
 
 $formother = new FormOther($db);
+$formfile = new FormFile($db);
 
 llxHeader();
 
@@ -155,7 +158,7 @@ if ($year)
                     $tfile = $dir.'/'.$year.'/'.$file;
                     $relativepath = $year.'/'.$file;
                     print '<tr class="oddeven">';
-                    print '<td><a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a></td>';
+                    print '<td><a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a>'.$formfile->showPreview($file, 'facture_paiement', $relativepath, 0).'</td>';
                     print '<td class="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
                     print '<td class="right">'.dol_print_date(dol_filemtime($tfile), "dayhour").'</td>';
                     print '</tr>';
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 2377e537606..58b5de4d7d8 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2006-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015-2018 Charlene BENKE  	<charlie@patas-monkey.com>
+ * Copyright (C) 2020      Maxime DEMAREST <maxime@indelog.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
@@ -207,7 +208,11 @@ class pdf_paiement
 					$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 				}
 				if (!empty($socid)) $sql .= " AND s.rowid = ".$socid;
-				$sql .= " ORDER BY p.datep ASC, pf.fk_paiement ASC";
+				// If global param PAYMENTS_REPORT_GROUP_BY_MOD is set, payement are ordered by paiement_code
+				if (!empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD))
+					$sql .= " ORDER BY paiement_code ASC, p.datep ASC, pf.fk_paiement ASC";
+				else
+					$sql .= " ORDER BY p.datep ASC, pf.fk_paiement ASC";
 				break;
 			case "fourn":
 				$sql = "SELECT p.datep as dp, f.ref as ref";
@@ -237,7 +242,11 @@ class pdf_paiement
 					$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 				}
 				if (!empty($socid)) $sql .= " AND s.rowid = ".$socid;
-				$sql .= " ORDER BY p.datep ASC, pf.fk_paiementfourn ASC";
+                // If global param PAYMENTS_FOURN_REPORT_GROUP_BY_MOD is set, payement fourn are ordered by paiement_code
+				if (!empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))
+					$sql .= " ORDER BY paiement_code ASC, p.datep ASC, pf.fk_paiementfourn ASC";
+				else
+					$sql .= " ORDER BY p.datep ASC, pf.fk_paiementfourn ASC";
 				break;
 		}
 
@@ -425,7 +434,7 @@ class pdf_paiement
 	public function Body(&$pdf, $page, $lines, $outputlangs)
 	{
         // phpcs:enable
-		global $langs;
+		global $langs, $conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$pdf->SetFont('', '', $default_font_size - 1);
@@ -435,6 +444,11 @@ class pdf_paiement
 		$pdf->SetFillColor(220, 220, 220);
 		$yp = 0;
 		$numlines = count($lines);
+		if (($this->doc_type == 'client' && !empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) || ($this->doc_type == 'fourn' && !empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD)))
+		{
+			$mod = $lines[0][2];
+			$total_mod = 0;
+		}
 		for ($j = 0; $j < $numlines; $j++)
 		{
 			$i = $j;
@@ -450,8 +464,17 @@ class pdf_paiement
 			{
 				if ($yp > $this->tab_height - 15)
 				{
-					$pdf->SetXY($this->posxpaymentamount, $this->tab_top + 10 + $yp);
-					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount, $this->line_height, $langs->transnoentities('SubTotal')." : ".price($total_page), 0, 'R', 0);
+                    $pdf->SetFillColor(255, 255, 255);
+                    $pdf->Rect($this->marge_gauche +1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite -3, $this->line_height, 'F', array(), array());
+                    $pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
+                    $pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
+                    $pdf->SetFont('', 'B', $default_font_size - 1);
+                    $pdf->SetXY($this->posxdate -1, $this->tab_top + 10 + $yp);
+                    $pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('SubTotal')." : ", 0, 'R', 1);
+                    $pdf->SetXY($this->posxpaymentamount -1, $this->tab_top + 10 + $yp);
+                    $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount +1, $this->line_height, price($total_page), 0, 'R', 1);
+                    $pdf->SetFont('', '', $default_font_size - 1);
+                    $pdf->SetFillColor(220, 220, 220);
 					$page++;
 					$pdf->AddPage();
 					$this->_pagehead($pdf, $page, 0, $outputlangs);
@@ -474,6 +497,7 @@ class pdf_paiement
 				$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount, $this->line_height, $lines[$j][4], 0, 'R', 1);
 				$yp = $yp + 5;
 				$total_page += $lines[$j][9];
+				if (($this->doc_type == 'client' && !empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) || ($this->doc_type == 'fourn' && !empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))) $total_mod += $lines[$j][9];
 			}
 
 			// Invoice number
@@ -497,9 +521,45 @@ class pdf_paiement
 			{
 				$oldprowid = $lines[$j][7];
 			}
+
+            // Add line to add total by payment mode if mode reglement for nex line change
+            if ((($this->doc_type == 'client' && !empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) || ($this->doc_type == 'fourn' && !empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))) && ($mod != $lines[$j+1][2]))
+            {
+                $pdf->SetFillColor(245, 245, 245);
+                $pdf->Rect($this->marge_gauche +1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite -3, $this->line_height, 'F', array(), array());
+                $pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
+                $pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
+                $pdf->SetXY($this->posxdate -1, $this->tab_top + 10 + $yp);
+				$pdf->SetFont('', 'I', $default_font_size - 1);
+                $pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('Total').' '.$mod." : ", 0, 'R', 1);
+                $pdf->SetXY($this->posxpaymentamount -1, $this->tab_top + 10 + $yp);
+                $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount +1, $this->line_height, price($total_mod), 0, 'R', 1);
+				$pdf->SetFont('', '', $default_font_size - 1);
+                $mod = $lines[$j+1][2];
+                $total_mod = 0;
+				$yp = $yp + 5;
+                if ($yp > $this->tab_height - 5)
+                {
+                    $page++;
+                    $pdf->AddPage();
+                    $this->_pagehead($pdf, $page, 0, $outputlangs);
+                    $pdf->SetFont('', '', $default_font_size - 1);
+                    $yp = 0;
+                }
+                $pdf->SetFillColor(220, 220, 220);
+            }
+
 		}
 		$total += $total_page;
-		$pdf->SetXY($this->posxpaymentamount, $this->tab_top + 10 + $yp);
-		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount, $this->line_height, $langs->transnoentities('Total')." : ".price($total), 0, 'R', 0);
+        $pdf->SetFillColor(255, 255, 255);
+        $pdf->Rect($this->marge_gauche +1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite -3, $this->line_height, 'F', array(), array());
+        $pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
+        $pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
+        $pdf->SetXY($this->posxdate -1, $this->tab_top + 10 + $yp);
+        $pdf->SetFont('', 'B');
+        $pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('Total')." : ", 0, 'R', 1);
+        $pdf->SetXY($this->posxpaymentamount -1, $this->tab_top + 10 + $yp);
+        $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount +1, $this->line_height, price($total), 0, 'R', 1);
+        $pdf->SetFillColor(220, 220, 220);
 	}
 }
diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
index f0bf2d85dd1..9f38c4c4f9e 100644
--- a/htdocs/fourn/facture/rapport.php
+++ b/htdocs/fourn/facture/rapport.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017		ATM-Consulting  	 <support@atm-consulting.fr>
+ * Copyright (C) 2020		Maxime DEMAREST  	 <maxime@indelog.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
@@ -24,6 +25,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/rapport/pdf_paiement_fourn.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 $langs->loadLangs(array('bills'));
@@ -86,6 +88,7 @@ if ($action == 'builddoc')
  */
 
 $formother = new FormOther($db);
+$formfile = new FormFile($db);
 
 $titre = ($year ? $langs->trans("PaymentsReportsForYear", $year) : $langs->trans("PaymentsReports"));
 
@@ -157,7 +160,7 @@ if ($year)
                 {
                     $tfile = $dir.'/'.$year.'/'.$file;
                     $relativepath = $year.'/'.$file;
-                    print '<tr class="oddeven"><td><a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart=facture_fournisseur&amp;file=payments/'.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a></td>';
+                    print '<tr class="oddeven"><td><a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart=facture_fournisseur&amp;file=payments/'.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a>'.$formfile->showPreview($file, 'facture_fournisseur', 'payments/'.$relativepath, 0).'</td>';
                     print '<td class="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
                     print '<td class="right">'.dol_print_date(dol_filemtime($tfile), "dayhour").'</td></tr>';
                 }
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 55de1591689..9f11d8ecf87 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -385,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 6ad3faba02d..92a0da802d1 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -393,6 +393,7 @@ GeneratedFromTemplate=Généré à partir du modèle de facture %s
 WarningInvoiceDateInFuture=Attention, la date de facturation est antérieur à la date actuelle
 WarningInvoiceDateTooFarInFuture=Attention, la date de facturation est trop éloignée de la date actuelle
 ViewAvailableGlobalDiscounts=Voir les remises disponibles
+GroupPaymentsByModOnReports=Grouper les paiements par mode sur les rapports
 # PaymentConditions
 Statut=État
 PaymentConditionShortRECEP=A réception

From 2cf5f12a62a949f602ac601ac6965977c991af80 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 28 Apr 2020 07:18:45 +0000
Subject: [PATCH 008/490] Fixing style errors.

---
 htdocs/admin/supplier_payment.php                  | 12 ++++++------
 htdocs/core/modules/rapport/pdf_paiement.class.php |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index e2fc6dce4a7..5d7a0d0b8d5 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -152,14 +152,14 @@ elseif ($action == 'setparams')
        $res = dolibarr_set_const($db, "PAYMENTS_FOURN_REPORT_GROUP_BY_MOD", GETPOST('PAYMENTS_FOURN_REPORT_GROUP_BY_MOD', 'int'), 'chaine', 0, '', $conf->entity);
        if (!$res > 0) $error++;
 
-       if ($error)
+	if ($error)
        {
-               setEventMessages($langs->trans("Error"), null, 'errors');
-       }
-       if (!$error)
+			setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+	if (!$error)
        {
-           setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-       }
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	}
 }
 
 /*
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 58b5de4d7d8..024310abb09 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -548,7 +548,6 @@ class pdf_paiement
                 }
                 $pdf->SetFillColor(220, 220, 220);
             }
-
 		}
 		$total += $total_page;
         $pdf->SetFillColor(255, 255, 255);

From 92898c9562da57f2fa7ccbe2c6a1bd7118674bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 1 May 2020 11:27:11 +0200
Subject: [PATCH 009/490] enable free emails with select2

---
 htdocs/core/actions_sendmails.inc.php     |  9 ++++--
 htdocs/core/class/html.form.class.php     | 39 +++++++++++++++++++----
 htdocs/core/class/html.formmail.class.php | 22 ++++++-------
 htdocs/langs/en_US/mails.lang             |  1 +
 4 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index e23d2ce01a9..f647bd5418e 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -190,10 +190,12 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				{
 					$tmparray[] = dol_string_nospecial($contact->getFullName($langs), ' ', array(",")).' <'.$contact->email.'>';
 				}
-				elseif ($val)	// $val is the Id of a contact
+				elseif ((int) $val > 0)	// $val is the Id of a contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 					$sendtoid[] = $val;
+				} else {
+					$tmparray[] = $val;
 				}
 			}
 		}
@@ -240,10 +242,12 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				{
 					$tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
 				}
-				elseif ($val)				// $val is the Id of a contact
+				elseif ((int) $val > 0)				// $val is the Id of a contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 					//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
+				} else {
+					$tmparray[] = $val;
 				}
 			}
 		}
@@ -261,6 +265,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			}
 		}
 		$sendtocc = implode(',', $tmparray);
+		//var_dump($sendto, $sendtocc);exit;
 
 		if (dol_strlen($sendto))
 		{
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b2c677ed29d..bc605d286c1 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6617,10 +6617,11 @@ class Form
 	 *  @param	string	$elemtype		Type of element we show ('category', ...). Will execute a formating function on it. To use in readonly mode if js component support HTML formatting.
 	 *  @param	string	$placeholder	String to use as placeholder
 	 *  @param	int		$addjscombo		Add js combo
+	 *  @param  int     $enablefreetag  0 no free tag, 1 enable free tag for elemtype
 	 *	@return	string					HTML multiselect string
 	 *  @see selectarray(), selectArrayAjax(), selectArrayFilter()
 	 */
-	public static function multiselectarray($htmlname, $array, $selected = array(), $key_in_label = 0, $value_as_key = 0, $morecss = '', $translate = 0, $width = 0, $moreattrib = '', $elemtype = '', $placeholder = '', $addjscombo = -1)
+	public static function multiselectarray($htmlname, $array, $selected = array(), $key_in_label = 0, $value_as_key = 0, $morecss = '', $translate = 0, $width = 0, $moreattrib = '', $elemtype = '', $placeholder = '', $addjscombo = -1, $enablefreetag = 0)
 	{
 		global $conf, $langs;
 
@@ -6634,11 +6635,11 @@ class Form
 		// Add code for jquery to use multiselect
 		if (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))
 		{
-			$out .= "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
-						<script>'."\n";
 			if ($addjscombo == 1)
 			{
 				$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
+				$out .= "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->'."\n";
+				$out .= '<script>'."\n";
 				$out .= 'function formatResult(record) {'."\n";
 				if ($elemtype == 'category')
 				{
@@ -6662,13 +6663,37 @@ class Form
 				$out .= '$(document).ready(function () {
 							$(\'#'.$htmlname.'\').'.$tmpplugin.'({
 								dir: \'ltr\',
+								tags: '.($enablefreetag?'true':'false').',
 								// Specify format function for dropdown item
 								formatResult: formatResult,
-							 	templateResult: formatResult,		/* For 4.0 */
+								/* For 4.0 */
+							 	templateResult: formatResult,
 								// Specify format function for selected item
 								formatSelection: formatSelection,
-							 	templateSelection: formatSelection		/* For 4.0 */
-							});
+								/* For 4.0 */
+								templateSelection: formatSelection';
+				if ($enablefreetag && $elemtype == 'email') {
+					$out .= ',
+								createTag: function (params) {
+									var REGEX_EMAIL = "([a-z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+/=?^_`{|}~-]+)*@" +
+									"(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)";
+									// Dont offset to create a tag if there is no @ symbol
+									if (params.term.indexOf("@") === -1) {
+										// Return null to disable tag creation
+										return null;
+									}
+									var match = params.term.match(new RegExp("^([^<]*)\<" + REGEX_EMAIL + "\>$", "i"));
+									// console.log(match);
+									if (match !== null) {
+										return {
+											id: $.trim(match[1]) + " <" + match[2] + ">",
+											text: $.trim(match[1]) + " <" + match[2] + ">"
+										}
+									}
+									return null;
+								}';
+				}
+				$out .= '			});
 						});'."\n";
 			}
 			elseif ($addjscombo == 2)
@@ -6676,6 +6701,8 @@ class Form
 				// Add other js lib
 				// TODO external lib multiselect/jquery.multi-select.js must have been loaded to use this multiselect plugin
 				// ...
+				$out .= "\n".'<!-- JS CODE TO ENABLE external lib for id '.$htmlname.' -->'."\n";
+				$out .= '<script>'."\n";
 				$out .= '$(document).ready(function () {
 							$(\'#'.$htmlname.'\').multiSelect({
 								containerHTML: \'<div class="multi-select-container">\',
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index d961cd20536..45c40a8bc72 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -630,7 +630,7 @@ class FormMail extends Form
 			if (!empty($this->withto) || is_array($this->withto))
 			{
 				$out .= '<tr><td class="fieldrequired">';
-				if ($this->withtofree) $out .= $form->textwithpicto($langs->trans("MailTo"), $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+				if ($this->withtofree) $out .= $form->textwithpicto($langs->trans("MailTo"), $langs->trans("YouCanUseFreeEmailsForRecipients"));
 				else $out .= $langs->trans("MailTo");
 				$out .= '</td><td>';
 				if ($this->withtoreadonly)
@@ -670,14 +670,14 @@ class FormMail extends Form
 				else
 				{
 					// The free input of email
-					if (!empty($this->withtofree))
-					{
-						$out .= '<input class="minwidth200" id="sendto" name="sendto" value="'.(($this->withtofree && !is_numeric($this->withtofree)) ? $this->withtofree : (!is_array($this->withto) && !is_numeric($this->withto) ? (isset($_REQUEST["sendto"]) ? $_REQUEST["sendto"] : $this->withto) : "")).'" />';
-					}
+					// if (!empty($this->withtofree))
+					// {
+					// 	$out .= '<input class="minwidth200" id="sendto" name="sendto" value="'.(($this->withtofree && !is_numeric($this->withtofree)) ? $this->withtofree : (!is_array($this->withto) && !is_numeric($this->withto) ? (isset($_REQUEST["sendto"]) ? $_REQUEST["sendto"] : $this->withto) : "")).'" />';
+					// }
 					// The select combo
 					if (!empty($this->withto) && is_array($this->withto))
 					{
-						if (!empty($this->withtofree)) $out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
+						//if (!empty($this->withtofree)) $out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withto;
 						foreach ($tmparray as $key => $val)
@@ -689,7 +689,7 @@ class FormMail extends Form
 						{
 							$withtoselected = array_keys($tmparray);
 						}
-						$out .= $form->multiselectarray("receiver", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
+						$out .= $form->multiselectarray("receiver", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', 0, '', '', 'email', '', -1, !empty($this->withtofree)?1:0);
 					}
 				}
 				$out .= "</td></tr>\n";
@@ -736,7 +736,7 @@ class FormMail extends Form
 			if (!empty($this->withtocc) || is_array($this->withtocc))
 			{
 				$out .= '<tr><td>';
-				$out .= $form->textwithpicto($langs->trans("MailCC"), $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+				$out .= $form->textwithpicto($langs->trans("MailCC"), $langs->trans("YouCanUseFreeEmailsForRecipients"));
 				$out .= '</td><td>';
 				if ($this->withtoccreadonly)
 				{
@@ -744,10 +744,10 @@ class FormMail extends Form
 				}
 				else
 				{
-				    $out .= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.(GETPOST("sendtocc", "alpha") ? GETPOST("sendtocc", "alpha") : ((!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : '')).'" />';
+				    //$out .= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.(GETPOST("sendtocc", "alpha") ? GETPOST("sendtocc", "alpha") : ((!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : '')).'" />';
 					if (!empty($this->withtocc) && is_array($this->withtocc))
 					{
-						$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
+						//$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withtocc;
 						foreach ($tmparray as $key => $val)
@@ -755,7 +755,7 @@ class FormMail extends Form
 							$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 						}
 						$withtoccselected = GETPOST("receivercc"); // Array of selected value
-						$out .= $form->multiselectarray("receivercc", $tmparray, $withtoccselected, null, null, 'inline-block minwidth500', null, "");
+						$out .= $form->multiselectarray("receivercc", $tmparray, $withtoccselected, null, null, 'inline-block minwidth500', 0, '', '', 'email', '', -1, !empty($this->withtofree)?1:0);
 					}
 				}
 				$out .= "</td></tr>\n";
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 7b3bfd3852a..9806748a1c0 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -117,6 +117,7 @@ NbOfEMailingsSend=Mass emailings sent
 IdRecord=ID record
 DeliveryReceipt=Delivery Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
+YouCanUseFreeEmailsForRecipients=You can enter free emails to specify several recipients.
 TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature of sending user

From 79647b35cd2239c4d378c3988e72c9abc789bd31 Mon Sep 17 00:00:00 2001
From: Marc Guenneugues <marc.guenneugues@simicar.fr>
Date: Sat, 2 May 2020 06:42:12 +0200
Subject: [PATCH 010/490] Enable multiple mass actions on a single page - dev
 branch

---
 htdocs/core/class/html.form.class.php | 60 ++++++++++++++-------------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 5eaa7d5ede8..00efbc00dfd 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -665,16 +665,18 @@ class Form
 	 * @param	string	$selected		Value auto selected when at least one record is selected. Not a preselected value. Use '0' by default.
 	 * @param	array		$arrayofaction	array('code'=>'label', ...). The code is the key stored into the GETPOST('massaction') when submitting action.
 	 * @param   int     $alwaysvisible  1=select button always visible
+         * @param       string  $name     Name for massaction
+         * @param       string  $cssclass CSS class used to check for select
 	 * @return	string|void					Select list
 	 */
-	public function selectMassAction($selected, $arrayofaction, $alwaysvisible = 0)
+	public function selectMassAction($selected, $arrayofaction, $alwaysvisible = 0, $name = 'massaction', $cssclass = 'checkforselect')
 	{
 		global $conf, $langs, $hookmanager;
 
 
 		$disabled = 0;
 		$ret = '<div class="centpercent center">';
-		$ret .= '<select class="flat'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' massaction massactionselect valignmiddle" name="massaction"'.($disabled ? ' disabled="disabled"' : '').'>';
+                $ret .= '<select class="flat'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' ' . $name . ' ' . $name . 'select valignmiddle" name="' . $name . '"'.($disabled ? ' disabled="disabled"' : '').'>';
 
 		// Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['currentcontext'] completed by executeHooks.
 		$parameters = array();
@@ -693,46 +695,46 @@ class Form
 
 		$ret .= '</select>';
 
-		if (empty($conf->dol_optimize_smallscreen)) $ret .= ajax_combobox('.massactionselect');
+                if (empty($conf->dol_optimize_smallscreen)) $ret .= ajax_combobox('.' . $name . 'select');
 
 		// Warning: if you set submit button to disabled, post using 'Enter' will no more work if there is no another input submit. So we add a hidden button
 		$ret .= '<input type="submit" name="confirmmassactioninvisible" style="display: none" tabindex="-1">'; // Hidden button BEFORE so it is the one used when we submit with ENTER.
-		$ret .= '<input type="submit" disabled name="confirmmassaction" class="button'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' massaction massactionconfirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';
+                $ret .= '<input type="submit" disabled name="confirmmassaction" class="button'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' ' . $name . ' ' . $name . 'confirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';
 		$ret .= '</div>';
 
 		if (!empty($conf->use_javascript_ajax))
 		{
 			$ret .= '<!-- JS CODE TO ENABLE mass action select -->
     		<script>
-        		function initCheckForSelect(mode)	/* mode is 0 during init of page or click all, 1 when we click on 1 checkbox */
+                        function initCheckForSelect(mode, name, cssclass)	/* mode is 0 during init of page or click all, 1 when we click on 1 checkboxi, 'name' refers to the class of the massaction button, 'cssclass' to the class of the checkfor select boxes */
         		{
         			atleastoneselected=0;
-    	    		jQuery(".checkforselect").each(function( index ) {
+                                jQuery("."+cssclass).each(function( index ) {
     	  				/* console.log( index + ": " + $( this ).text() ); */
     	  				if ($(this).is(\':checked\')) atleastoneselected++;
     	  			});
 
-					console.log("initCheckForSelect mode="+mode+" atleastoneselected="+atleastoneselected);
+					console.log("initCheckForSelect mode="+mode+" name="+name+" cssclass="+cssclass+" atleastoneselected="+atleastoneselected);
 
     	  			if (atleastoneselected || '.$alwaysvisible.')
     	  			{
-    	  				jQuery(".massaction").show();
-        			    '.($selected ? 'if (atleastoneselected) { jQuery(".massactionselect").val("'.$selected.'").trigger(\'change\'); jQuery(".massactionconfirmed").prop(\'disabled\', false); }' : '').'
-        			    '.($selected ? 'if (! atleastoneselected) { jQuery(".massactionselect").val("0").trigger(\'change\'); jQuery(".massactionconfirmed").prop(\'disabled\', true); } ' : '').'
+                                    jQuery("."+name).show();
+        			    '.($selected ? 'if (atleastoneselected) { jQuery("."+name+"select").val("'.$selected.'").trigger(\'change\'); jQuery("."+name+"confirmed").prop(\'disabled\', false); }' : '').'
+        			    '.($selected ? 'if (! atleastoneselected) { jQuery("."+name+"select").val("0").trigger(\'change\'); jQuery("."+name+"confirmed").prop(\'disabled\', true); } ' : '').'
     	  			}
     	  			else
     	  			{
-    	  				jQuery(".massaction").hide();
-						jQuery(".massactionother").hide();
+                                    jQuery("."+name).hide();
+                                    jQuery("."+name+"other").hide();
     	            }
         		}
 
         	jQuery(document).ready(function () {
-        		initCheckForSelect(0);
-        		jQuery(".checkforselect").click(function() {
-        			initCheckForSelect(1);
-    	  		});
-    	  		jQuery(".massactionselect").change(function() {
+                    initCheckForSelect(0, "' . $name . '", "' . $cssclass . '");
+                    jQuery(".' . $cssclass . '").click(function() {
+                        initCheckForSelect(1, "'.$name.'", "' . $cssclass . '");
+                    });
+                        jQuery(".' . $name . 'select").change(function() {
         			var massaction = $( this ).val();
         			var urlform = $( this ).closest("form").attr("action").replace("#show_files","");
         			if (massaction == "builddoc")
@@ -744,13 +746,13 @@ class Form
         	        /* Warning: if you set submit button to disabled, post using Enter will no more work if there is no other button */
         			if ($(this).val() != \'0\')
     	  			{
-    	  				jQuery(".massactionconfirmed").prop(\'disabled\', false);
-						jQuery(".massactionother").show();
+                                        jQuery(".' . $name . 'confirmed").prop(\'disabled\', false);
+                                        jQuery(".' . $name . 'other").show();
     	  			}
     	  			else
     	  			{
-    	  				jQuery(".massactionconfirmed").prop(\'disabled\', true);
-						jQuery(".massactionother").hide();
+                                        jQuery(".' . $name . 'confirmed").prop(\'disabled\', true);
+                                        jQuery(".' . $name . 'other").hide();
     	  			}
     	        });
         	});
@@ -7790,18 +7792,19 @@ class Form
 	 *
 	 *  @param  string  $cssclass                  CSS class
 	 *  @param  int     $calljsfunction            0=default. 1=call function initCheckForSelect() after changing status of checkboxes
+         *  @param  string  $massactionname            Mass action button name that will launch an action on the selected items
 	 *  @return	string
 	 */
-    public function showCheckAddButtons($cssclass = 'checkforaction', $calljsfunction = 0)
+    public function showCheckAddButtons($cssclass = 'checkforaction', $calljsfunction = 0, $massactionname = "massaction")
 	{
 		global $conf, $langs;
 
 		$out = '';
 		$id = uniqid();
-		if (!empty($conf->use_javascript_ajax)) $out .= '<div class="inline-block checkallactions"><input type="checkbox" id="checkallactions'.$id.'" name="checkallactions" class="checkallactions"></div>';
+                if (!empty($conf->use_javascript_ajax)) $out .= '<div class="inline-block checkallactions"><input type="checkbox" id="' . $cssclass . 's" name="' . $cssclass . 's" class="checkallactions"></div>';
 		$out .= '<script>
             $(document).ready(function() {
-            	$("#checkallactions'.$id.'").click(function() {
+                $("#' . $cssclass . 's").click(function() {
                     if($(this).is(\':checked\')){
                         console.log("We check all '.$cssclass.'");
                 		$(".'.$cssclass.'").prop(\'checked\', true).trigger(\'change\');
@@ -7811,10 +7814,10 @@ class Form
                         console.log("We uncheck all");
                 		$(".'.$cssclass.'").prop(\'checked\', false).trigger(\'change\');
                     }'."\n";
-		if ($calljsfunction) $out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';
+                if ($calljsfunction) $out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0, "' . $massactionname . '", "' . $cssclass . '"); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';
 		$out .= '         });
 
-        	$(".checkforselect").change(function() {
+                $(".' . $cssclass . '").change(function() {
 				$(this).closest("tr").toggleClass("highlight", this.checked);
 			});
 
@@ -7830,14 +7833,15 @@ class Form
 	 *  @param	int  	$addcheckuncheckall        Add the check all/uncheck all checkbox (use javascript) and code to manage this
 	 *  @param  string  $cssclass                  CSS class
 	 *  @param  int     $calljsfunction            0=default. 1=call function initCheckForSelect() after changing status of checkboxes
+         *  @param  string  $massactionname            Mass action name
 	 *  @return	string
 	 */
-    public function showFilterAndCheckAddButtons($addcheckuncheckall = 0, $cssclass = 'checkforaction', $calljsfunction = 0)
+    public function showFilterAndCheckAddButtons($addcheckuncheckall = 0, $cssclass = 'checkforaction', $calljsfunction = 0, $massactionname = "massaction")
 	{
 		$out = $this->showFilterButtons();
 		if ($addcheckuncheckall)
 		{
-			$out .= $this->showCheckAddButtons($cssclass, $calljsfunction);
+			$out .= $this->showCheckAddButtons($cssclass, $calljsfunction, $massactionname);
 		}
 		return $out;
 	}

From fbabfe9a7136cd91a7e6b4d9fc09106629ce9a5a Mon Sep 17 00:00:00 2001
From: Marc Guenneugues <marc.guenneugues@simicar.fr>
Date: Sat, 2 May 2020 06:53:11 +0200
Subject: [PATCH 011/490] Correct typo

---
 htdocs/core/class/html.form.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 00efbc00dfd..ade0dd06a06 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -706,7 +706,7 @@ class Form
 		{
 			$ret .= '<!-- JS CODE TO ENABLE mass action select -->
     		<script>
-                        function initCheckForSelect(mode, name, cssclass)	/* mode is 0 during init of page or click all, 1 when we click on 1 checkboxi, 'name' refers to the class of the massaction button, 'cssclass' to the class of the checkfor select boxes */
+                        function initCheckForSelect(mode, name, cssclass)	/* mode is 0 during init of page or click all, 1 when we click on 1 checkboxi, "name" refers to the class of the massaction button, "cssclass" to the class of the checkfor select boxes */
         		{
         			atleastoneselected=0;
                                 jQuery("."+cssclass).each(function( index ) {

From e0ebe85c134bebf41e794026af59b9b475648af7 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 3 May 2020 09:15:12 +0200
Subject: [PATCH 012/490] Fix addline titles

---
 htdocs/core/tpl/objectline_create.tpl.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 160d323a2c2..5e99146bc53 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -813,7 +813,7 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 		jQuery("#prod_entry_mode_free").prop('checked',true).change();
 		jQuery("#prod_entry_mode_predef").prop('checked',false).change();
 		jQuery("#search_idprod, #idprod, #search_idprodfournprice, #buying_price").val('');
-		jQuery("#price_ht, #multicurrency_price_ht, #price_ttc, #price_ttc, #fourn_ref, #tva_tx, #buying_price, #title_vat, #title_up_ht, #title_up_ht_currency, #title_up_ttc, #title_up_ttc_currency").show();
+		jQuery("#price_ht, #multicurrency_price_ht, #price_ttc, #price_ttc, #fourn_ref, #tva_tx, #buying_price, #title_fourn_ref, #title_vat, #title_up_ht, #title_up_ht_currency, #title_up_ttc, #title_up_ttc_currency").show();
 		jQuery("#np_marginRate, #np_markRate, .np_marginRate, .np_markRate, #units, #title_units").show();
 		jQuery("#fournprice_predef").hide();
 	}
@@ -825,11 +825,13 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 		<?php if (empty($conf->global->MAIN_DISABLE_EDIT_PREDEF_PRICEHT)) { ?>
 			jQuery("#price_ht").val('').show();
 			jQuery("#multicurrency_price_ht").val('').show();
+			jQuery("#title_up_ht, #title_up_ht_currency").show();
 		<?php } else { ?>
 			jQuery("#price_ht").val('').hide();
 			jQuery("#multicurrency_price_ht").val('').hide();
+			jQuery("#title_up_ht, #title_up_ht_currency").hide();
 		<?php } ?>
-		jQuery("#price_ttc, #fourn_ref, #tva_tx, #title_vat, #title_up_ht_currency, #title_up_ttc, #title_up_ttc_currency").hide();
+		jQuery("#price_ttc, #fourn_ref, #tva_tx, #title_fourn_ref, #title_vat, #title_up_ttc, #title_up_ttc_currency").hide();
 		jQuery("#np_marginRate, #np_markRate, .np_marginRate, .np_markRate, #units, #title_units").hide();
 		jQuery("#buying_price").show();
 		jQuery('#trlinefordates, .divlinefordates').show();

From c3521502deff79b1ca166a51aca9552b13708fcf Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Sun, 3 May 2020 10:34:56 +0200
Subject: [PATCH 013/490] Update global.inc.php

---
 htdocs/theme/eldy/global.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 7b8e1373df9..786bdbd431b 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3360,7 +3360,7 @@ tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste
 }
 tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, form.liste_titre div a, div.liste_titre a {
 	text-shadow: none !important;
-	color: unset;
+	color: rgb(<?php echo $colortexttitlelink ?>);
 }
 tr.liste_titre_topborder td {
 	border-top-width: <?php echo $borderwidth; ?>px;

From 87d86f32ee28ca4012a7a977fd4fdd17872b69a5 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Sun, 3 May 2020 10:40:52 +0200
Subject: [PATCH 014/490] Update usergroups.lib.php

---
 htdocs/core/lib/usergroups.lib.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 5b7c923001b..003d1260252 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -732,7 +732,34 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 
 		print '</tr>';
 	}
+	
+	// TextTitleLinkColor
+	if ($foruserprofile)
+	{
+	}
+	else
+	{
+		$default=(empty($colortexttitlelink) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitlelink)));
 
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("BackgroundTableTitleTextlinkColor").'</td>';
+		print '<td colspan="'.($colspan - 1).'">';
+		if ($edit)
+		{
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLELINK, array()), ''), 'THEME_ELDY_TEXTTITLELINK', 'formcolor', 1).' ';
+		}
+		else
+		{
+			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLELINK, $langs->trans("Default"));
+		}
+		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong><span style="color: #'.$default.'">'.$default.'</span></strong>) ';
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</span>';
+		print '</td>';
+
+		print '</tr>';
+	}
+	
 	// BackgroundTableLineOddColor
 	if ($foruserprofile)
 	{

From 5c1eb08b3fdbb6fcfa72203d90d58d7795781758 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 3 May 2020 08:42:45 +0000
Subject: [PATCH 015/490] Fixing style errors.

---
 htdocs/core/lib/usergroups.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 003d1260252..8be3e234273 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -732,7 +732,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 
 		print '</tr>';
 	}
-	
+
 	// TextTitleLinkColor
 	if ($foruserprofile)
 	{
@@ -759,7 +759,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 
 		print '</tr>';
 	}
-	
+
 	// BackgroundTableLineOddColor
 	if ($foruserprofile)
 	{

From f299f0f849d7a745cabcfdcc8d8b41347f59dbee Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Sun, 3 May 2020 10:42:49 +0200
Subject: [PATCH 016/490] Update theme_vars.inc.php

---
 htdocs/theme/eldy/theme_vars.inc.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index f6324f0146f..823b8168b4c 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -69,6 +69,7 @@ $colorbacklinebreak = '233,228,230'; // line break
 $colorbackbody = '255,255,255';
 $colortexttitlenotab = '0,113,120'; // 150,90,121 140,80,10 or 10,140,80  #875a7b  green=0,113,120, violet: 0,50,120
 $colortexttitle = '0,0,0';
+$colortexttitlelink = '10, 20, 100';
 $colortext = '0,0,0';
 $colortextlink = '10, 20, 100';
 $fontsize = '0.86em';

From 2f18b444d7946335604dfd2cd19a831540a2fd37 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Sun, 3 May 2020 10:44:37 +0200
Subject: [PATCH 017/490] Update style.css.php

---
 htdocs/theme/eldy/style.css.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 39fcd003335..927d29e1919 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -128,6 +128,7 @@ $colorbacklinebreak  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (emp
 $colorbackbody       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKBODY) ? $colorbackbody : $conf->global->THEME_ELDY_BACKBODY) : (empty($user->conf->THEME_ELDY_BACKBODY) ? $colorbackbody : $user->conf->THEME_ELDY_BACKBODY);
 $colortexttitlenotab = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLENOTAB) ? $colortexttitlenotab : $conf->global->THEME_ELDY_TEXTTITLENOTAB) : (empty($user->conf->THEME_ELDY_TEXTTITLENOTAB) ? $colortexttitlenotab : $user->conf->THEME_ELDY_TEXTTITLENOTAB);
 $colortexttitle      = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLE) ? $colortexttitle : $conf->global->THEME_ELDY_TEXTTITLE) : (empty($user->conf->THEME_ELDY_TEXTTITLE) ? $colortexttitle : $user->conf->THEME_ELDY_TEXTTITLE);
+$colortexttitlelink  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $conf->global->THEME_ELDY_TEXTTITLELINK) : (empty($user->conf->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $user->conf->THEME_ELDY_TEXTTITLELINK);
 $colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
 $colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortextlink : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
 $fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE1) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1);

From 44bafb7225555aff485d418b6440ee01a82f694a Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Sun, 3 May 2020 10:46:48 +0200
Subject: [PATCH 018/490] Update ihm.php

---
 htdocs/admin/ihm.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index ab67974c920..c83dd83a9c9 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -121,6 +121,10 @@ if ($action == 'update')
 	$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLE'), array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLE', $conf->entity);
 	else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLE', $val, 'chaine', 0, '', $conf->entity);
+	
+	$val=(implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLELINK'), array()))));
+	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLELINK', $conf->entity);
+	else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLELINK', $val, 'chaine', 0, '', $conf->entity);
 
 	$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_LINEIMPAIR1'), array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEIMPAIR1', $conf->entity);

From 30cb4f0151133291de49b144a2c511a85a3c4bf7 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Sun, 3 May 2020 10:48:16 +0200
Subject: [PATCH 019/490] Update admin.lang

---
 htdocs/langs/en_US/admin.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 58e5cecf39d..bb1b56d4465 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1803,6 +1803,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)

From fdb98dd6ed66396087a139c508310b01a7be5a5f Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Sun, 3 May 2020 10:49:57 +0200
Subject: [PATCH 020/490] Update admin.lang

---
 htdocs/langs/fr_FR/admin.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 6363b8b710d..6545b71ede3 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1803,6 +1803,7 @@ TopMenuDisableImages=Cacher les images du menu principal
 LeftMenuBackgroundColor=Couleur de fond pour le menu Gauche
 BackgroundTableTitleColor=Couleur de fond pour la ligne de titres des liste/tableaux
 BackgroundTableTitleTextColor=Couleur du texte pour la ligne de titre des tableaux
+BackgroundTableTitleTextlinkColor=Couleur du texte pour la ligne de titre lien des tableaux
 BackgroundTableLineOddColor=Couleur de fond pour les lignes impaires des tables
 BackgroundTableLineEvenColor=Couleur de fond pour les lignes paires des tales
 MinimumNoticePeriod=Période de préavis minimum (Votre demande de congé doit être faite avant ce délai)

From ef3f121c88a926d7b02a780bceb587bf67abafdf Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 3 May 2020 08:51:50 +0000
Subject: [PATCH 021/490] Fixing style errors.

---
 htdocs/admin/ihm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index c83dd83a9c9..ba849a267e7 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -121,7 +121,7 @@ if ($action == 'update')
 	$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLE'), array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLE', $conf->entity);
 	else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLE', $val, 'chaine', 0, '', $conf->entity);
-	
+
 	$val=(implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLELINK'), array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLELINK', $conf->entity);
 	else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLELINK', $val, 'chaine', 0, '', $conf->entity);

From a31eaf2eb813fe7ef1b04b940d756b8176018a40 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Sun, 3 May 2020 13:59:40 +0200
Subject: [PATCH 022/490] Update style.css.php

---
 htdocs/theme/md/style.css.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index dcc9ce34886..5c3de3d7612 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -130,6 +130,7 @@ $colorbacklinebreak  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (emp
 $colorbackbody       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKBODY) ? $colorbackbody : $conf->global->THEME_ELDY_BACKBODY) : (empty($user->conf->THEME_ELDY_BACKBODY) ? $colorbackbody : $user->conf->THEME_ELDY_BACKBODY);
 $colortexttitlenotab = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLENOTAB) ? $colortexttitlenotab : $conf->global->THEME_ELDY_TEXTTITLENOTAB) : (empty($user->conf->THEME_ELDY_TEXTTITLENOTAB) ? $colortexttitlenotab : $user->conf->THEME_ELDY_TEXTTITLENOTAB);
 $colortexttitle      = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLE) ? $colortext : $conf->global->THEME_ELDY_TEXTTITLE) : (empty($user->conf->THEME_ELDY_TEXTTITLE) ? $colortexttitle : $user->conf->THEME_ELDY_TEXTTITLE);
+$colortexttitlelink  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $conf->global->THEME_ELDY_TEXTTITLELINK) : (empty($user->conf->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $user->conf->THEME_ELDY_TEXTTITLELINK);
 $colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
 $colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortext : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
 $fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE1) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1);

From dabb2f4ad39e26438d8e528a78124a4eb4f2b41c Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Sun, 3 May 2020 14:01:42 +0200
Subject: [PATCH 023/490] Update theme_vars.inc.php

---
 htdocs/theme/md/theme_vars.inc.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index d15444acb6c..6cdd37fe913 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -65,6 +65,7 @@ $colorbacklinebreak = '214,218,220';
 $colorbackbody = '248,248,248';
 $colortexttitlenotab = '80,71,5';
 $colortexttitle = '20,20,20';
+$colortexttitlelink = '0,0,120';
 $colortext = '0,0,0';
 $colortextlink = '0,0,120';
 $fontsize = '14';

From d81ae29ab7723262a705e20cdf5af5ae3588ae2c Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Sun, 3 May 2020 14:05:18 +0200
Subject: [PATCH 024/490] Update style.css.php

---
 htdocs/theme/md/style.css.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 5c3de3d7612..2becbf57324 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3399,6 +3399,7 @@ tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste
 }
 tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, form.liste_titre div a, div.liste_titre a {
 	text-shadow: none !important;
+	color: rgb(<?php echo $colortexttitlelink ?>);
 }
 tr.liste_titre_topborder td {
 	border-top-width: <?php echo $borderwidth; ?>px;

From 6d894b7abd3bd0c7e47a4e98b817b9d954ca0f1b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 May 2020 19:08:31 +0200
Subject: [PATCH 025/490] Fix missing link in message

---
 htdocs/core/class/notify.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index db0e490a6c6..6c0ec1ec62b 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -528,7 +528,7 @@ class Notify
 						$message.= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2", $application, $mysoc->name)."\n";
 						$message.= "\n";
 						$message.= $mesg;
-						if ($link) $message.= "\n" . $urlwithroot . $link;
+						if ($link) $message.= "\n" . $urlwithroot . $link;	// if link is already added around the ref into the translation text, then $link must be set to ''
 
 						$parameters = array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list);
 						if (!isset($action)) $action = '';
@@ -600,6 +600,7 @@ class Notify
 		{
 			foreach($conf->global as $key => $val)
 			{
+				$reg = array();
 				if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
 
 				$threshold = (float) $reg[1];
@@ -743,7 +744,7 @@ class Notify
 				$message.= $langs->transnoentities("YouReceiveMailBecauseOfNotification2", $application, $mysoc->name)."\n";
 				$message.= "\n";
 				$message.= $mesg;
-				//if ($link) $message.= "\n" . $urlwithroot . $link;	// link already added around the ref into the text
+				if ($link) $message.= "\n" . $urlwithroot . $link;	// if link is already added around the ref into the translation text, then $link must be set to ''
 
 				$message = nl2br($message);
 

From 2afd38e2f65c555579dd661dd728f15c98e0e3e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 May 2020 21:59:31 +0200
Subject: [PATCH 026/490] FIX Combo list of available users to filter on the
 list of leaves.

---
 htdocs/core/class/html.form.class.php | 54 +++++++++++++--------------
 htdocs/holiday/list.php               |  8 ++--
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 39a006e0342..93061d200d8 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1574,16 +1574,16 @@ class Form
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Return select list of users
+	 *	Return the HTML select list of users
 	 *
-	 *  @param	string	$selected       Id user preselected
-	 *  @param  string	$htmlname       Field name in form
-	 *  @param  int		$show_empty     0=liste sans valeur nulle, 1=ajoute valeur inconnue
-	 *  @param  array	$exclude        Array list of users id to exclude
-	 * 	@param	int		$disabled		If select list must be disabled
-	 *  @param  array	$include        Array list of users id to include
-	 * 	@param	int		$enableonly		Array list of users id to be enabled. All other must be disabled
-	 *  @param	string	$force_entity	'0' or Ids of environment to force
+	 *  @param	string			$selected       Id user preselected
+	 *  @param  string			$htmlname       Field name in form
+	 *  @param  int				$show_empty     0=liste sans valeur nulle, 1=ajoute valeur inconnue
+	 *  @param  array			$exclude        Array list of users id to exclude
+	 * 	@param	int				$disabled		If select list must be disabled
+	 *  @param  array|string	$include        Array list of users id to include. User '' for all users or 'hierarchy' to have only supervised users or 'hierarchyme' to have supervised + me
+	 * 	@param	int				$enableonly		Array list of users id to be enabled. All other must be disabled
+	 *  @param	string			$force_entity	'0' or Ids of environment to force
 	 * 	@return	void
 	 *  @deprecated		Use select_dolusers instead
 	 *  @see select_dolusers()
@@ -1598,24 +1598,24 @@ class Form
 	/**
 	 *	Return select list of users
 	 *
-	 *  @param	string	$selected       User id or user object of user preselected. If 0 or < -2, we use id of current user. If -1, keep unselected (if empty is allowed)
-	 *  @param  string	$htmlname       Field name in form
-	 *  @param  int		$show_empty     0=list with no empty value, 1=add also an empty value into list
-	 *  @param  array	$exclude        Array list of users id to exclude
-	 * 	@param	int		$disabled		If select list must be disabled
-	 *  @param  array|string	$include        Array list of users id to include or 'hierarchy' to have only supervised users or 'hierarchyme' to have supervised + me
-	 * 	@param	array	$enableonly		Array list of users id to be enabled. If defined, it means that others will be disabled
-	 *  @param	string	$force_entity	'0' or Ids of environment to force
-	 *  @param	int		$maxlength		Maximum length of string into list (0=no limit)
-	 *  @param	int		$showstatus		0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
-	 *  @param	string	$morefilter		Add more filters into sql request (Example: 'employee = 1')
-	 *  @param	integer	$show_every		0=default list, 1=add also a value "Everybody" at beginning of list
-	 *  @param	string	$enableonlytext	If option $enableonlytext is set, we use this text to explain into label why record is disabled. Not used if enableonly is empty.
-	 *  @param	string	$morecss		More css
-	 *  @param  int     $noactive       Show only active users (this will also happened whatever is this option if USER_HIDE_INACTIVE_IN_COMBOBOX is on).
-	 *  @param  int		$outputmode     0=HTML select string, 1=Array
-	 *  @param  bool	$multiple       add [] in the name of element and add 'multiple' attribut
-	 * 	@return	string					HTML select string
+	 *  @param	string			$selected       User id or user object of user preselected. If 0 or < -2, we use id of current user. If -1, keep unselected (if empty is allowed)
+	 *  @param  string			$htmlname       Field name in form
+	 *  @param  int				$show_empty     0=list with no empty value, 1=add also an empty value into list
+	 *  @param  array			$exclude        Array list of users id to exclude
+	 * 	@param	int				$disabled		If select list must be disabled
+	 *  @param  array|string	$include        Array list of users id to include. User '' for all users or 'hierarchy' to have only supervised users or 'hierarchyme' to have supervised + me
+	 * 	@param	array			$enableonly		Array list of users id to be enabled. If defined, it means that others will be disabled
+	 *  @param	string			$force_entity	'0' or Ids of environment to force
+	 *  @param	int				$maxlength		Maximum length of string into list (0=no limit)
+	 *  @param	int				$showstatus		0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
+	 *  @param	string			$morefilter		Add more filters into sql request (Example: 'employee = 1')
+	 *  @param	integer			$show_every		0=default list, 1=add also a value "Everybody" at beginning of list
+	 *  @param	string			$enableonlytext	If option $enableonlytext is set, we use this text to explain into label why record is disabled. Not used if enableonly is empty.
+	 *  @param	string			$morecss		More css
+	 *  @param  int     		$noactive       Show only active users (this will also happened whatever is this option if USER_HIDE_INACTIVE_IN_COMBOBOX is on).
+	 *  @param  int				$outputmode     0=HTML select string, 1=Array
+	 *  @param  bool			$multiple       add [] in the name of element and add 'multiple' attribut
+	 * 	@return	string							HTML select string
 	 *  @see select_dolgroups()
 	 */
     public function select_dolusers($selected = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $maxlength = 0, $showstatus = 0, $morefilter = '', $show_every = 0, $enableonlytext = '', $morecss = '', $noactive = 0, $outputmode = 0, $multiple = false)
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 2361edf8a27..2277563aaa0 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -1,9 +1,9 @@
 <?php
 /* Copyright (C) 2011	   Dimitri Mouillard	<dmouillard@teclib.com>
- * Copyright (C) 2013-2018 Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2013-2020 Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012-2016 Regis Houssin	<regis.houssin@inodbox.com>
  * Copyright (C) 2018      Charlene Benke	<charlie@patas-monkey.com>
- * Copyright (C) 2019		Frédéric France		<frederic.france@netlogic.fr>
+ * Copyright (C) 2019	   Frédéric France		<frederic.france@netlogic.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
@@ -476,7 +476,7 @@ if ($resql)
 
 
 	$include = '';
-	if (!empty($user->rights->holiday->read_all)) $include = 'hierarchyme'; // Can see all
+	if (empty($user->rights->holiday->read_all)) $include = 'hierarchyme'; // Can see only its hierarchyl
 
 	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
@@ -488,7 +488,7 @@ if ($resql)
 	if (!empty($arrayfields['cp.ref']['checked']))
 	{
 		print '<td class="liste_titre">';
-		print '<input class="flat" size="4" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+		print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 		print '</td>';
 	}
 

From 93e69d515d66542609e281fa2293c82790d108b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 5 May 2020 06:38:24 +0200
Subject: [PATCH 027/490] nowtime is not defined

---
 htdocs/core/js/lib_notification.js.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index 769e0a36157..250eb0231a6 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -37,8 +37,9 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
     top_httphead('text/javascript; charset=UTF-8');
 
     print 'var login = \''.$_SESSION['dol_login'].'\';'."\n";
+	print 'var nowtime = Date.now();';
     print 'var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY.';'."\n"; // Always defined
-    print 'var time_js_next_test = (Date.now() + time_auto_update);'."\n";
+    print 'var time_js_next_test = (nowtime + time_auto_update);'."\n";
     ?>
 
 	/* Check if permission ok */

From c0b9fef22907d7cc747b28f142a345702e75ae79 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Tue, 5 May 2020 08:40:30 +0200
Subject: [PATCH 028/490] Fix issue in status name

Before : $commandestatic->LibStatut($obj->nb) shows bad value because bad param

Now : $commandestatic->LibStatut($obj->fk_statut) shows good value.
---
 htdocs/fourn/commande/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 78d6c01679f..dd50efc7591 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -189,7 +189,7 @@ if ($resql)
 		$obj = $db->fetch_object($resql);
 
 		print '<tr class="oddeven">';
-		print '<td>'.$commandestatic->LibStatut($obj->nb).'</td>';
+		print '<td>'.$commandestatic->LibStatut($obj->fk_statut).'</td>';
 		print '<td class="right"><a href="list.php?statut='.$obj->fk_statut.'">'.$obj->nb.' '.$commandestatic->LibStatut($obj->fk_statut, 3).'</a></td>';
 
 		print "</tr>\n";

From d6de46cc05abc417b72624534c84a8075642edf1 Mon Sep 17 00:00:00 2001
From: oscim <dom@oscim.fr>
Date: Tue, 5 May 2020 08:54:52 +0200
Subject: [PATCH 029/490] Update list.php

Add massaction for payment invoice
---
 htdocs/compta/facture/list.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index ed773b038bb..7caef50c223 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -297,7 +297,16 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
-if ($massaction == 'withdrawrequest')
+if($massaction == 'reglement'){
+
+	$arrayofselected=is_array($toselect)?$toselect:array();
+
+	$loc = dol_buildpath('/compta/paiement.php', 2).'?facids='.implode(',', $arrayofselected);
+
+	header('Location: '.$loc);
+	exit;
+}
+elseif ($massaction == 'withdrawrequest')
 {
 	$langs->load("withdrawals");
 
@@ -657,6 +666,7 @@ if ($resql)
 		'generate_doc'=>$langs->trans("ReGeneratePDF"),
 		'builddoc'=>$langs->trans("PDFMerge"),
 		'presend'=>$langs->trans("SendByMail"),
+		'reglement'=>$langs->trans("InvoicePaymentsLimits"),
 	);
 	if ($conf->prelevement->enabled) {
         	$langs->load("withdrawals");

From 204c788dec7fae27cfe6e0da5d1a6afa34baba67 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 5 May 2020 06:56:54 +0000
Subject: [PATCH 030/490] Fixing style errors.

---
 htdocs/compta/facture/list.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 7caef50c223..a06230ab60b 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -298,7 +298,6 @@ if (empty($reshook))
 }
 
 if($massaction == 'reglement'){
-
 	$arrayofselected=is_array($toselect)?$toselect:array();
 
 	$loc = dol_buildpath('/compta/paiement.php', 2).'?facids='.implode(',', $arrayofselected);

From c7753dd2e0198a5a0d8c08684aff391cf1e1571c Mon Sep 17 00:00:00 2001
From: oscim <dom@oscim.fr>
Date: Tue, 5 May 2020 09:44:46 +0200
Subject: [PATCH 031/490] Update list.php

---
 htdocs/compta/facture/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index a06230ab60b..3d7493312d1 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -300,7 +300,7 @@ if (empty($reshook))
 if($massaction == 'reglement'){
 	$arrayofselected=is_array($toselect)?$toselect:array();
 
-	$loc = dol_buildpath('/compta/paiement.php', 2).'?facids='.implode(',', $arrayofselected);
+	$loc = dol_buildpath('/compta/paiement.php', 2).'?action=create&facids='.implode(',', $arrayofselected);
 
 	header('Location: '.$loc);
 	exit;

From c14b6884e3f71de24cd27dc4da3d1e0db04bb13d Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Tue, 5 May 2020 10:02:36 +0200
Subject: [PATCH 032/490] FIX : missing hook init + table class + $page not set

---
 htdocs/compta/prelevement/bons.php   | 1 +
 htdocs/compta/prelevement/list.php   | 1 +
 htdocs/compta/prelevement/rejets.php | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 2b67b73c95b..27654de1ad0 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -53,6 +53,7 @@ $search_ref = GETPOST('search_ref', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 
 $bon=new BonPrelevement($db, "");
+$hookmanager->initHooks(array('withdrawalsreceiptslist'));
 
 
 /*
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 81e58e19cca..eb741b981d9 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -56,6 +56,7 @@ $search_company = GETPOST('search_company', 'alpha');
 $statut = GETPOST('statut', 'int');
 
 $bon=new BonPrelevement($db, "");
+$hookmanager->initHooks(array('withdrawalsreceiptslineslist'));
 $ligne=new LignePrelevement($db, $user);
 
 
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 333d07a4617..7611945a40d 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -40,6 +40,7 @@ $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 
 // Get supervariables
 $page = GETPOST('page', 'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $sortorder = GETPOST('sortorder', 'alpha');
 $sortfield = GETPOST('sortfield', 'alpha');
 
@@ -57,6 +58,7 @@ if ($sortorder == "") $sortorder="DESC";
 if ($sortfield == "") $sortfield="p.datec";
 
 $rej = new RejetPrelevement($db, $user);
+$hookmanager->initHooks(array('withdrawalsreceiptsrejectedlist'));
 $ligne = new LignePrelevement($db, $user);
 
 /*
@@ -85,7 +87,7 @@ if ($result)
 
 	print_barre_liste($langs->trans("WithdrawsRefused"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num);
 	print"\n<!-- debut table -->\n";
-	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
+	print '<table class="noborder tagtable liste" width="100%" cellspacing="0" cellpadding="4">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("Line", $_SERVER["PHP_SELF"], "p.ref", '', $urladd);
 	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", '', $urladd);

From 78a427c9967a398e0fd8d3aaeaa4c1b723a487db Mon Sep 17 00:00:00 2001
From: atm-lena <lena@atm-consulting.fr>
Date: Tue, 5 May 2020 14:35:03 +0200
Subject: [PATCH 033/490] FIX wrong user right's name to top menu "commercial"

---
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 84555ba23cf..f1859c0fcc5 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -234,7 +234,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	        ) ? 1 : 0,
 		'perms'=>(!empty($user->rights->propal->lire) ||
 				  !empty($user->rights->commande->lire) ||
-				  !empty($user->rights->supplier_order->lire) ||
+				  !empty($user->rights->fournisseur->lire) ||
 				  !empty($user->rights->supplier_proposal->lire) ||
 				  !empty($user->rights->contrat->lire) ||
 				  !empty($user->rights->ficheinter->lire)

From db591cdcd8b9920455af51ce28267b075cbebf13 Mon Sep 17 00:00:00 2001
From: kamel <kamel@kam>
Date: Tue, 5 May 2020 14:47:31 +0200
Subject: [PATCH 034/490] FIX: show value of the extrafields in the bank list

---
 htdocs/compta/bank/list.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index eaefdfb6573..457a5986dea 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -556,6 +556,12 @@ foreach ($accounts as $key=>$type)
     }
 
     // Extra fields
+	if (is_array($objecttmp->array_options)) {
+		$obj = new stdClass();
+		foreach ($objecttmp->array_options as $k => $v) {
+			$obj->$k = $v;
+		}
+	}
     include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
     // Fields from hook
     $parameters = array('arrayfields'=>$arrayfields);

From 7e6b5a384d00ea1d92a6b66f84f1a7e11c4df1a1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 May 2020 15:16:30 +0200
Subject: [PATCH 035/490] Code comment

---
 htdocs/core/class/html.form.class.php | 36 +++++++++++++--------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index f48ce989a7a..7073fd41989 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1669,24 +1669,24 @@ class Form
 	/**
 	 *	Return select list of users
 	 *
-	 *  @param	string	$selected       User id or user object of user preselected. If 0 or < -2, we use id of current user. If -1, keep unselected (if empty is allowed)
-	 *  @param  string	$htmlname       Field name in form
-	 *  @param  int		$show_empty     0=list with no empty value, 1=add also an empty value into list
-	 *  @param  array	$exclude        Array list of users id to exclude
-	 * 	@param	int		$disabled		If select list must be disabled
-	 *  @param  array|string	$include        Array list of users id to include or 'hierarchy' to have only supervised users or 'hierarchyme' to have supervised + me
-	 * 	@param	array	$enableonly		Array list of users id to be enabled. If defined, it means that others will be disabled
-	 *  @param	string	$force_entity	'0' or Ids of environment to force
-	 *  @param	int		$maxlength		Maximum length of string into list (0=no limit)
-	 *  @param	int		$showstatus		0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
-	 *  @param	string	$morefilter		Add more filters into sql request (Example: 'employee = 1')
-	 *  @param	integer	$show_every		0=default list, 1=add also a value "Everybody" at beginning of list
-	 *  @param	string	$enableonlytext	If option $enableonlytext is set, we use this text to explain into label why record is disabled. Not used if enableonly is empty.
-	 *  @param	string	$morecss		More css
-	 *  @param  int     $noactive       Show only active users (this will also happened whatever is this option if USER_HIDE_INACTIVE_IN_COMBOBOX is on).
-	 *  @param  int		$outputmode     0=HTML select string, 1=Array
-	 *  @param  bool	$multiple       add [] in the name of element and add 'multiple' attribut
-	 * 	@return	string					HTML select string
+	 *  @param	string			$selected       User id or user object of user preselected. If 0 or < -2, we use id of current user. If -1, keep unselected (if empty is allowed)
+	 *  @param  string			$htmlname       Field name in form
+	 *  @param  int				$show_empty     0=list with no empty value, 1=add also an empty value into list
+	 *  @param  array			$exclude        Array list of users id to exclude
+	 * 	@param	int				$disabled		If select list must be disabled
+	 *  @param  array|string	$include        Array list of users id to include. User '' for all users or 'hierarchy' to have only supervised users or 'hierarchyme' to have supervised + me
+	 * 	@param	array			$enableonly		Array list of users id to be enabled. If defined, it means that others will be disabled
+	 *  @param	string			$force_entity	'0' or Ids of environment to force
+	 *  @param	int				$maxlength		Maximum length of string into list (0=no limit)
+	 *  @param	int				$showstatus		0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
+	 *  @param	string			$morefilter		Add more filters into sql request (Example: 'employee = 1')
+	 *  @param	integer			$show_every		0=default list, 1=add also a value "Everybody" at beginning of list
+	 *  @param	string			$enableonlytext	If option $enableonlytext is set, we use this text to explain into label why record is disabled. Not used if enableonly is empty.
+	 *  @param	string			$morecss		More css
+	 *  @param  int     		$noactive       Show only active users (this will also happened whatever is this option if USER_HIDE_INACTIVE_IN_COMBOBOX is on).
+	 *  @param  int				$outputmode     0=HTML select string, 1=Array
+	 *  @param  bool			$multiple       add [] in the name of element and add 'multiple' attribut
+	 * 	@return	string							HTML select string
 	 *  @see select_dolgroups()
 	 */
 	public function select_dolusers($selected = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $maxlength = 0, $showstatus = 0, $morefilter = '', $show_every = 0, $enableonlytext = '', $morecss = '', $noactive = 0, $outputmode = 0, $multiple = false)

From 36a0780f148c684e3172a689e2d8e550d0473b52 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 May 2020 15:20:40 +0200
Subject: [PATCH 036/490] More complete fix for #13817

---
 htdocs/core/menus/standard/eldy.lib.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index f1859c0fcc5..17edca45676 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -227,19 +227,21 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	$tmpentry = array(
 	    'enabled'=>(!empty($conf->propal->enabled) ||
 	        !empty($conf->commande->enabled) ||
-	        !empty($conf->supplier_order->enabled) ||
-	        !empty($conf->supplier_proposal->enabled) ||
-	        !empty($conf->contrat->enabled) ||
+	    	!empty($conf->fournisseur->enabled) ||
+	    	!empty($conf->supplier_proposal->enabled) ||
+	    	!empty($conf->supplier_order->enabled) ||
+	    	!empty($conf->contrat->enabled) ||
 	        !empty($conf->ficheinter->enabled)
 	        ) ? 1 : 0,
 		'perms'=>(!empty($user->rights->propal->lire) ||
 				  !empty($user->rights->commande->lire) ||
 				  !empty($user->rights->fournisseur->lire) ||
 				  !empty($user->rights->supplier_proposal->lire) ||
+				  !empty($user->rights->supplier_order->lire) ||
 				  !empty($user->rights->contrat->lire) ||
 				  !empty($user->rights->ficheinter->lire)
 			),
-	    'module'=>'propal|commande|supplier_order|supplier_proposal|contrat|ficheinter'
+	    'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter'
 	);
 
 	$onlysupplierorder = ! empty($user->rights->fournisseur->commande->lire) &&

From 797beef79f7c351e59cb566f5909cafc81c23c92 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 May 2020 15:26:41 +0200
Subject: [PATCH 037/490] Fix

---
 htdocs/compta/facture/list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 3d7493312d1..c5a3d60f99c 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -297,7 +297,7 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
-if($massaction == 'reglement'){
+if ($massaction == 'makepayment'){
 	$arrayofselected=is_array($toselect)?$toselect:array();
 
 	$loc = dol_buildpath('/compta/paiement.php', 2).'?action=create&facids='.implode(',', $arrayofselected);
@@ -665,7 +665,7 @@ if ($resql)
 		'generate_doc'=>$langs->trans("ReGeneratePDF"),
 		'builddoc'=>$langs->trans("PDFMerge"),
 		'presend'=>$langs->trans("SendByMail"),
-		'reglement'=>$langs->trans("InvoicePaymentsLimits"),
+		//'makepayment'=>$langs->trans("InvoicePaymentsLimits"),   TODO Blank page when using this
 	);
 	if ($conf->prelevement->enabled) {
         	$langs->load("withdrawals");

From 1b35380dda4b47606d4ee8172c4152770af65a63 Mon Sep 17 00:00:00 2001
From: atm-quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Mon, 4 May 2020 14:55:24 +0200
Subject: [PATCH 038/490] NEW stats invoice graph with 3 bars

---
 htdocs/compta/facture/stats/index.php |  4 ++--
 htdocs/core/class/dolgraph.class.php  | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index f5472196cc2..1a771c8e60b 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -58,8 +58,8 @@ if ($user->socid > 0)
 
 $nowyear = strftime("%Y", dol_now());
 $year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
-//$startyear=$year-2;
-$startyear = $year - 1;
+if(!empty($conf->global->INVOICE_STATS_GRAPHS_SHOW_2_YEARS)) $startyear=$year-2;
+else $startyear=$year-1;
 $endyear = $year;
 
 
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 8af46154223..3f1bfa245fb 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -894,7 +894,15 @@ class DolGraph
 				if ($i > $firstlot) $this->stringtoshow .= ', '."\n";
 				$color = sprintf("%02x%02x%02x", $this->datacolor[$i][0], $this->datacolor[$i][1], $this->datacolor[$i][2]);
 				$this->stringtoshow .= '{ ';
-				if (!isset($this->type[$i]) || $this->type[$i] == 'bars') $this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "'.($i == $firstlot ? 'center' : 'left').'", barWidth: 0.5 }, ';
+				if (! isset($this->type[$i]) || $this->type[$i] == 'bars') {
+				    if($nblot == 3) {
+				        if($i == $firstlot) $align = 'right';
+				        else if($i == $firstlot+1) $align = 'center';
+				        else $align = 'left';
+				        $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.$align.'", barWidth: 0.45 }, ';
+                    }
+				    else $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
+                }
 				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow .= 'lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';
 				$this->stringtoshow .= 'color: "#'.$color.'", label: "'.(isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '').'", data: d'.$i.' }';
 				$i++;

From eab69c3a598e7d826ce1fbf31b8402ad0063d8b3 Mon Sep 17 00:00:00 2001
From: atm-quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Mon, 4 May 2020 15:19:45 +0200
Subject: [PATCH 039/490] NEW multiselect categorie client stats facturation

---
 htdocs/compta/facture/stats/index.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 1a771c8e60b..4c0d23c90e2 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
+if(!empty($conf->category->enabled)) require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
@@ -49,6 +50,7 @@ $categ_id = GETPOST('categ_id', 'categ_id');
 
 $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
+$custcats = GETPOST('custcats', 'array');
 // Security check
 if ($user->socid > 0)
 {
@@ -66,7 +68,7 @@ $endyear = $year;
 /*
  * View
  */
-
+if(!empty($conf->category->enabled)) $langs->load('categories');
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 $formother = new FormOther($db);
@@ -93,6 +95,10 @@ $stats = new FactureStats($db, $socid, $mode, ($userid > 0 ? $userid : 0), ($typ
 if ($mode == 'customer')
 {
     if ($object_status != '' && $object_status >= 0) $stats->where .= ' AND f.fk_statut IN ('.$db->escape($object_status).')';
+    if (is_array($custcats) && !empty($custcats)) {
+        $stats->from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cat ON (f.fk_soc = cat.fk_soc)';
+        $stats->where .= ' AND cat.fk_categorie IN ('.implode(',', $custcats).')';
+    }
 }
 if ($mode == 'supplier')
 {
@@ -256,6 +262,13 @@ if ($mode == 'customer') $filter = 's.client in (1,2,3)';
 if ($mode == 'supplier') $filter = 's.fournisseur = 1';
 print $form->selectarray('socid', $companies, $socid, 1, 0, 0, 'style="width: 95%"', 0, 0, 0, '', '', 1);
 print '</td></tr>';
+if(!empty($conf->category->enabled) && $mode == 'customer') {
+        // Customer Category
+        print '<tr><td>'.$langs->trans("CustomersProspectsCategoriesShort").'</td><td>';
+        $cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
+        print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, null, null, "90%");
+        print '</td></tr>';
+    }
 // ThirdParty Type
 print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
 $sortparam_typent = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.

From b2a9791dca9bd3872ba359a77439290167820ce9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 May 2020 16:33:02 +0200
Subject: [PATCH 040/490] Fix pagination on pages "Related items"

---
 htdocs/core/lib/product.lib.php               | 42 +++++++++----------
 htdocs/product/stats/commande.php             | 22 ++++------
 htdocs/product/stats/commande_fournisseur.php | 20 ++++-----
 htdocs/product/stats/contrat.php              | 21 ++++------
 htdocs/product/stats/facture.php              | 20 ++++-----
 htdocs/product/stats/facture_fournisseur.php  | 22 ++++------
 htdocs/product/stats/mo.php                   | 22 ++++------
 htdocs/product/stats/propal.php               | 20 ++++-----
 htdocs/product/stats/supplier_proposal.php    | 22 ++++------
 9 files changed, 90 insertions(+), 121 deletions(-)

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index a6ee33e9a65..0615ff127b0 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -353,6 +353,24 @@ function show_stats_for_company($product, $socid)
 	print '<td class="right" width="25%">'.$langs->trans("TotalQuantity").'</td>';
 	print '</tr>';
 
+	// MO
+	if (!empty($conf->mrp->enabled) && $user->rights->mrp->read)
+	{
+		$nblines++;
+		//$ret = $product->load_stats_mo($socid);
+		if ($ret < 0) dol_print_error($db);
+		$langs->load("orders");
+		print '<tr><td>';
+		print '<a href="mo.php?id='.$product->id.'">'.img_object('', 'mrp').' '.$langs->trans("MO").'</a>';
+		print '</td><td class="right">';
+		print $product->stats_mo['suppliers'];
+		print '</td><td class="right">';
+		print $product->stats_mo['nb'];
+		print '</td><td class="right">';
+		print $product->stats_mo['qty'];
+		print '</td>';
+		print '</tr>';
+	}
 	// Customer proposals
 	if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 	{
@@ -379,7 +397,7 @@ function show_stats_for_company($product, $socid)
 		if ($ret < 0) dol_print_error($db);
 		$langs->load("propal");
 		print '<tr><td>';
-		print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('', 'propal').' '.$langs->trans("SupplierProposals").'</a>';
+		print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('', 'supplier_proposal').' '.$langs->trans("SupplierProposals").'</a>';
 		print '</td><td class="right">';
 		print $product->stats_proposal_supplier['suppliers'];
 		print '</td><td class="right">';
@@ -415,7 +433,7 @@ function show_stats_for_company($product, $socid)
 		if ($ret < 0) dol_print_error($db);
 		$langs->load("orders");
 		print '<tr><td>';
-		print '<a href="commande_fournisseur.php?id='.$product->id.'">'.img_object('', 'order').' '.$langs->trans("SuppliersOrders").'</a>';
+		print '<a href="commande_fournisseur.php?id='.$product->id.'">'.img_object('', 'supplier_order').' '.$langs->trans("SuppliersOrders").'</a>';
 		print '</td><td class="right">';
 		print $product->stats_commande_fournisseur['suppliers'];
 		print '</td><td class="right">';
@@ -425,24 +443,6 @@ function show_stats_for_company($product, $socid)
 		print '</td>';
 		print '</tr>';
 	}
-	// MO
-	if (!empty($conf->mrp->enabled) && $user->rights->mrp->read)
-	{
-		$nblines++;
-		//$ret = $product->load_stats_mo($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("orders");
-		print '<tr><td>';
-		print '<a href="mo.php?id='.$product->id.'">'.img_object('', 'mrp').' '.$langs->trans("MO").'</a>';
-		print '</td><td class="right">';
-		print $product->stats_mo['suppliers'];
-		print '</td><td class="right">';
-		print $product->stats_mo['nb'];
-		print '</td><td class="right">';
-		print $product->stats_mo['qty'];
-		print '</td>';
-		print '</tr>';
-	}
 	// Customer invoices
 	if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	{
@@ -469,7 +469,7 @@ function show_stats_for_company($product, $socid)
 		if ($ret < 0) dol_print_error($db);
 		$langs->load("bills");
 		print '<tr><td>';
-		print '<a href="facture_fournisseur.php?id='.$product->id.'">'.img_object('', 'bill').' '.$langs->trans("SuppliersInvoices").'</a>';
+		print '<a href="facture_fournisseur.php?id='.$product->id.'">'.img_object('', 'supplier_invoice').' '.$langs->trans("SuppliersInvoices").'</a>';
 		print '</td><td class="right">';
 		print $product->stats_facture_fournisseur['suppliers'];
 		print '</td><td class="right">';
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 71c1b0f1ef7..9898c13f21b 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -164,26 +164,22 @@ if ($id > 0 || !empty($ref))
 			{
 				$num = $db->num_rows($result);
 
-				if (!empty($id))
-	            	$option .= '&amp;id='.$product->id;
-	            if (!empty($search_month))
-	            	$option .= '&amp;search_month='.$search_month;
-	            if (!empty($search_year))
-	            	$option .= '&amp;search_year='.$search_year;
-	            if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit);
+				if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit);
+				if (!empty($id)) $option .= '&id='.$product->id;
+				if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
+				if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
 
 	            print '<form method="post" action="'.$_SERVER ['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
 	            if (!empty($sortfield))
 	            	print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
 	            if (!empty($sortorder))
 	            	print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
-	            if (!empty($page)) {
-	            	print '<input type="hidden" name="page" value="'.$page.'"/>';
-	            	$option .= '&amp;page='.$page;
-	            }
 
-	            print_barre_liste($langs->trans("CustomersOrders"), $page, $_SERVER["PHP_SELF"], "&amp;id=".$product->id, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit);
-                print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	            print_barre_liste($langs->trans("CustomersOrders"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+
+	            if (!empty($page)) $option .= '&page='.urlencode($page);
+
+	            print '<div class="liste_titre liste_titre_bydiv centpercent">';
                 print '<div class="divsearchfield">';
 			    print $langs->trans('Period').' ('.$langs->trans("OrderDate").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 7a5b88000e1..61024cdd7ff 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -172,26 +172,22 @@ if ($id > 0 || !empty($ref)) {
 			if ($result) {
 				$num = $db->num_rows($result);
 
-				if (!empty($id))
-					$option .= '&amp;id='.$product->id;
-				if (!empty($search_month))
-					$option .= '&amp;search_month='.$search_month;
-				if (!empty($search_year))
-					$option .= '&amp;search_year='.$search_year;
 				if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit);
+				if (!empty($id)) $option .= '&id='.$product->id;
+				if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
+				if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
 
 				print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
 				if (!empty($sortfield))
 					print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
 				if (!empty($sortorder))
 					print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
-				if (!empty($page)) {
-					print '<input type="hidden" name="page" value="'.$page.'"/>';
-					$option .= '&amp;page='.$page;
-				}
 
-				print_barre_liste($langs->trans("SuppliersOrders"), $page, $_SERVER["PHP_SELF"], "&amp;id=".$product->id, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit);
-                print '<div class="liste_titre liste_titre_bydiv centpercent">';
+				print_barre_liste($langs->trans("SuppliersOrders"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+
+				if (!empty($page)) $option .= '&page='.urlencode($page);
+
+				print '<div class="liste_titre liste_titre_bydiv centpercent">';
                 print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("OrderDate").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 8e61446a834..8f88044d913 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -153,27 +153,24 @@ if ($id > 0 || !empty($ref))
 		if ($result)
 		{
 			$num = $db->num_rows($result);
-            if (!empty($id))
-                $option .= '&amp;id='.$product->id;
-            if (!empty($search_month))
-                $option .= '&amp;search_month='.$search_month;
-            if (!empty($search_year))
-                $option .= '&amp;search_year='.$search_year;
+
             if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit);
+            if (!empty($id)) $option .= '&id='.$product->id;
+            if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
+            if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
 
             print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
+
             if (!empty($sortfield))
                 print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
             if (!empty($sortorder))
                 print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
-            if (!empty($page)) {
-                print '<input type="hidden" name="page" value="'.$page.'"/>';
-                $option .= '&amp;page='.$page;
-            }
 
-            print_barre_liste($langs->trans("Contrats"), $page, $_SERVER["PHP_SELF"], "&amp;id=".$product->id, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit);
+            print_barre_liste($langs->trans("Contrats"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
-			$i = 0;
+            if (!empty($page)) $option .= '&page='.urlencode($page);
+
+            $i = 0;
             print '<div class="div-table-responsive">';
 			print '<table class="tagtable liste listwithfilterbefore" width="100%">';
 
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index e42afd9f28c..342cd3058a2 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('companies', 'bills', 'products'));
+$langs->loadLangs(array('companies', 'bills', 'products', 'supplier_proposal'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
@@ -185,25 +185,21 @@ if ($id > 0 || !empty($ref))
 			{
                 $num = $db->num_rows($result);
 
-                if (!empty($id))
-                	$option .= '&amp;id='.$product->id;
-                if (!empty($search_month))
-                	$option .= '&amp;search_month='.$search_month;
-                if (!empty($search_year))
-	               	$option .= '&amp;search_year='.$search_year;
                 if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit);
+                if (!empty($id)) $option .= '&id='.$product->id;
+                if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
+                if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
 
                 print '<form method="post" action="'.$_SERVER ['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
                 if (!empty($sortfield))
                 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
                 if (!empty($sortorder))
                 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
-                if (!empty($page)) {
-                	print '<input type="hidden" name="page" value="'.$page.'"/>';
-                	$option .= '&amp;page='.$page;
-                }
 
-                print_barre_liste($langs->trans("CustomersInvoices"), $page, $_SERVER["PHP_SELF"], "&amp;id=".$product->id, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit);
+                print_barre_liste($langs->trans("CustomersInvoices"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+
+                if (!empty($page)) $option .= '&page='.urlencode($page);
+
                 print '<div class="liste_titre liste_titre_bydiv centpercent">';
                 print '<div class="divsearchfield">';
                 print $langs->trans('Period').' ('.$langs->trans("DateInvoice").') - ';
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 29774709e5e..f39d4ab73b3 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('companies', 'bills', 'products', 'companies'));
+$langs->loadLangs(array('companies', 'bills', 'products', 'companies', 'supplier_proposal'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
@@ -165,26 +165,22 @@ if ($id > 0 || !empty($ref))
 			{
 				$num = $db->num_rows($result);
 
-				if (!empty($id))
-					$option .= '&amp;id='.$product->id;
-				if (!empty($search_month))
-					$option .= '&amp;search_month='.$search_month;
-				if (!empty($search_year))
-					$option .= '&amp;search_year='.$search_year;
 				if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit);
+				if (!empty($id)) $option .= '&id='.$product->id;
+				if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
+				if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
 
 				print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
 				if (!empty($sortfield))
 					print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
 				if (!empty($sortorder))
 					print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
-				if (!empty($page)) {
-					print '<input type="hidden" name="page" value="'.$page.'"/>';
-					$option .= '&amp;page='.$page;
-				}
 
-				print_barre_liste($langs->trans("SuppliersInvoices"), $page, $_SERVER["PHP_SELF"], "&amp;id=$product->id", $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit);
-                print '<div class="liste_titre liste_titre_bydiv centpercent">';
+				print_barre_liste($langs->trans("SuppliersInvoices"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+
+				if (!empty($page)) $option .= '&page='.urlencode($page);
+
+				print '<div class="liste_titre liste_titre_bydiv centpercent">';
                 print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("DateInvoice").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index 0a148ad2c8a..51e91aeaaac 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -150,27 +150,23 @@ if ($id > 0 || !empty($ref))
 		if ($result)
 		{
 			$num = $db->num_rows($result);
-            if (!empty($id))
-                $option .= '&amp;id='.$product->id;
-            if (!empty($search_month))
-                $option .= '&amp;search_month='.urlencode($search_month);
-            if (!empty($search_year))
-                $option .= '&amp;search_year='.urlencode($search_year);
-            if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit);
+
+			if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit);
+			if (!empty($id)) $option .= '&id='.$product->id;
+			if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
+			if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
 
             print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
             if (!empty($sortfield))
                 print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
             if (!empty($sortorder))
                 print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
-            if (!empty($page)) {
-                print '<input type="hidden" name="page" value="'.$page.'"/>';
-                $option .= '&amp;page='.$page;
-            }
 
-            print_barre_liste($langs->trans("Mos"), $page, $_SERVER["PHP_SELF"], "&amp;id=".$product->id, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit);
+            print_barre_liste($langs->trans("Mos"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
-			$i = 0;
+            if (!empty($page)) $option .= '&page='.urlencode($page);
+
+            $i = 0;
             print '<div class="div-table-responsive">';
 			print '<table class="tagtable liste listwithfilterbefore" width="100%">';
 
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index d65b88ccabc..35b93cac8b9 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -169,26 +169,22 @@ if ($id > 0 || !empty($ref))
 			{
 				$num = $db->num_rows($result);
 
-				if (!empty($id))
-					$option .= '&amp;id='.$product->id;
-				if (!empty($search_month))
-					$option .= '&amp;search_month='.$search_month;
-				if (!empty($search_year))
-					$option .= '&amp;search_year='.$search_year;
 				if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit);
+				if (!empty($id)) $option .= '&id='.$product->id;
+				if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
+				if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
 
 				print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
 				if (!empty($sortfield))
 					print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
 				if (!empty($sortorder))
 					print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
-				if (!empty($page)) {
-					print '<input type="hidden" name="page" value="'.$page.'"/>';
-					$option .= '&amp;page='.$page;
-				}
 
-				print_barre_liste($langs->trans("Proposals"), $page, $_SERVER["PHP_SELF"], "&amp;id=".$product->id, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit);
-                print '<div class="liste_titre liste_titre_bydiv centpercent">';
+				print_barre_liste($langs->trans("Proposals"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+
+				if (!empty($page)) $option .= '&page='.urlencode($page);
+
+				print '<div class="liste_titre liste_titre_bydiv centpercent">';
                 print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("DatePropal").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index a7fede51aa1..5a59cbb9c83 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('products', 'companies'));
+$langs->loadLangs(array('products', 'companies', 'supplier_proposal'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
@@ -169,26 +169,22 @@ if ($id > 0 || !empty($ref))
 			{
 				$num = $db->num_rows($result);
 
-				if (!empty($id))
-					$option .= '&amp;id='.$product->id;
-				if (!empty($search_month))
-					$option .= '&amp;search_month='.$search_month;
-				if (!empty($search_year))
-					$option .= '&amp;search_year='.$search_year;
 				if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit);
+				if (!empty($id)) $option .= '&id='.$product->id;
+				if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
+				if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
 
 				print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
 				if (!empty($sortfield))
 					print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
 				if (!empty($sortorder))
 					print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
-				if (!empty($page)) {
-					print '<input type="hidden" name="page" value="'.$page.'"/>';
-					$option .= '&amp;page='.$page;
-				}
 
-				print_barre_liste($langs->trans("Proposals"), $page, $_SERVER["PHP_SELF"], "&amp;id=".$product->id, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit);
-                print '<div class="liste_titre liste_titre_bydiv centpercent">';
+				print_barre_liste($langs->trans("Proposals"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+
+				if (!empty($page)) $option .= '&page='.urlencode($page);
+
+				print '<div class="liste_titre liste_titre_bydiv centpercent">';
                 print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("DatePropal").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';

From e871e736ebc18b39473b2227b631160444b07498 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 May 2020 17:54:01 +0200
Subject: [PATCH 041/490] Fix for #5824

---
 htdocs/modulebuilder/template/myobject_card.php | 2 +-
 htdocs/mrp/class/mo.class.php                   | 2 +-
 htdocs/mrp/mo_card.php                          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 336b410022a..c0b33be2bf8 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -533,7 +533,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			*/
 
 			// Delete (need delete permission, or if draft, just need create/modify permission)
-			if ($permissiontodelete)
+			if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd))
 			{
 				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
 			}
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 42d97ee81d9..07c6eae52a1 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1008,7 +1008,7 @@ class Mo extends CommonObject
         }
 
         $url = dol_buildpath('/mrp/mo_card.php', 1).'?id='.$this->id;
-        if ($option = 'production') $url = dol_buildpath('/mrp/mo_production.php', 1).'?id='.$this->id;
+        if ($option == 'production') $url = dol_buildpath('/mrp/mo_production.php', 1).'?id='.$this->id;
 
         if ($option != 'nolink')
         {
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 59dd5ed7a7c..92f68785856 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -639,7 +639,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		}
 
     		// Delete (need delete permission, or if draft, just need create/modify permission)
-    		if ($permissiontodelete)
+    		if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd))
     		{
     			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete">'.$langs->trans('Delete').'</a>'."\n";
     		}

From ea145188b90b5515e6d1fd4bcb5c0de9c1cc3729 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consuliting.fr>
Date: Tue, 5 May 2020 18:14:38 +0200
Subject: [PATCH 042/490] fix filter on date service contrat with hour

---
 htdocs/contrat/services_list.php | 33 ++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index b8ab4cfe1ce..b250ea23378 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -247,22 +247,31 @@ if ($search_name)     $sql .= " AND s.nom LIKE '%".$db->escape($search_name)."%'
 if ($search_contract) $sql .= " AND c.ref LIKE '%".$db->escape($search_contract)."%' ";
 if ($search_service)  $sql .= " AND (p.ref LIKE '%".$db->escape($search_service)."%' OR p.description LIKE '%".$db->escape($search_service)."%' OR cd.description LIKE '%".$db->escape($search_service)."%')";
 if ($socid > 0)       $sql .= " AND s.rowid = ".$socid;
-$filter_dateouvertureprevue = dol_mktime(0, 0, 0, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
-if ($filter_dateouvertureprevue != '' && $filter_opouvertureprevue == -1) $filter_opouvertureprevue = '=';
 
-$filter_date1 = dol_mktime(0, 0, 0, $op1month, $op1day, $op1year);
-if ($filter_date1 != '' && $filter_op1 == -1) $filter_op1 = '=';
+$filter_dateouvertureprevue_start=dol_mktime(0, 0, 0, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
+$filter_dateouvertureprevue_end=dol_mktime(23, 59, 59, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
+if ($filter_dateouvertureprevue_start != '' && $filter_opouvertureprevue == -1) $filter_opouvertureprevue = ' BETWEEN ';
 
-$filter_date2 = dol_mktime(0, 0, 0, $op2month, $op2day, $op2year);
-if ($filter_date2 != '' && $filter_op2 == -1) $filter_op2 = '=';
+$filter_date1_start =dol_mktime(0, 0, 0, $op1month, $op1day, $op1year);
+$filter_date1_end =dol_mktime(23, 59, 59, $op1month, $op1day, $op1year);
+if ($filter_date1_start != '' && $filter_op1 == -1) $filter_op1 = ' BETWEEN ';
 
-$filter_datecloture = dol_mktime(0, 0, 0, $opcloturemonth, $opclotureday, $opclotureyear);
-if ($filter_datecloture != '' && $filter_opcloture == -1) $filter_opcloture = '=';
+$filter_date2_start=dol_mktime(0, 0, 0, $op2month, $op2day, $op2year);
+$filter_date2_end=dol_mktime(23, 59, 59, $op2month, $op2day, $op2year);
+if ($filter_date2_start != '' && $filter_op2 == -1) $filter_op2 = ' BETWEEN ';
 
-if (!empty($filter_opouvertureprevue) && $filter_opouvertureprevue != -1 && $filter_dateouvertureprevue != '') $sql .= " AND cd.date_ouverture_prevue ".$filter_opouvertureprevue." '".$db->idate($filter_dateouvertureprevue)."'";
-if (!empty($filter_op1) && $filter_op1 != -1 && $filter_date1 != '') $sql .= " AND cd.date_ouverture ".$filter_op1." '".$db->idate($filter_date1)."'";
-if (!empty($filter_op2) && $filter_op2 != -1 && $filter_date2 != '') $sql .= " AND cd.date_fin_validite ".$filter_op2." '".$db->idate($filter_date2)."'";
-if (!empty($filter_opcloture) && $filter_opcloture != -1 && $filter_datecloture != '') $sql .= " AND cd.date_cloture ".$filter_opcloture." '".$db->idate($filter_datecloture)."'";
+$filter_datecloture_start=dol_mktime(0, 0, 0, $opcloturemonth, $opclotureday, $opclotureyear);
+$filter_datecloture_end=dol_mktime(23, 59, 59, $opcloturemonth, $opclotureday, $opclotureyear);
+if ($filter_datecloture_start != '' && $filter_opcloture == -1) $filter_opcloture = ' BETWEEN ';
+
+if (! empty($filter_opouvertureprevue) && $filter_opouvertureprevue != -1 && $filter_opouvertureprevue != ' BETWEEN ' && $filter_dateouvertureprevue_start != '') $sql.= " AND cd.date_ouverture_prevue ".$filter_opouvertureprevue." '".$db->idate($filter_dateouvertureprevue_start)."'";
+if (! empty($filter_opouvertureprevue) && $filter_opouvertureprevue == ' BETWEEN ') $sql.= " AND '".$db->idate($filter_dateouvertureprevue_end)."'";
+if (! empty($filter_op1) && $filter_op1 != -1 && $filter_op1 != ' BETWEEN ' && $filter_date1_start != '') $sql.= " AND cd.date_ouverture ".$filter_op1." '".$db->idate($filter_date1_start)."'";
+if (! empty($filter_op1) && $filter_op1==' BETWEEN ')  $sql.= " AND '".$db->idate($filter_date1_end)."'";
+if (! empty($filter_op2) && $filter_op2 != -1 && $filter_op2 != ' BETWEEN ' && $filter_date2_start != '') $sql.= " AND cd.date_fin_validite ".$filter_op2." '".$db->idate($filter_date2_start)."'";
+if (! empty($filter_op2) && $filter_op2==' BETWEEN ')  $sql.= " AND '".$db->idate($filter_date2_end)."'";
+if (! empty($filter_opcloture) && $filter_opcloture != ' BETWEEN ' && $filter_opcloture != -1 && $filter_datecloture_start != '') $sql.= " AND cd.date_cloture ".$filter_opcloture." '".$db->idate($filter_datecloture_start)."'";
+if (! empty($filter_opcloture) && $filter_opcloture==' BETWEEN ')  $sql.= " AND '".$db->idate($filter_datecloture_end)."'";
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 $sql .= $db->order($sortfield, $sortorder);

From 49f9e88cc179162ffcc510a82f95011eefd9f126 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 May 2020 18:16:30 +0200
Subject: [PATCH 043/490] Look and feel v12

---
 htdocs/core/lib/usergroups.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 3be6a5b44ba..f25d8058e8f 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -745,7 +745,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		{
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLELINK, $langs->trans("Default"));
 		}
-		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong><span style="color: #'.$default.'">'.$default.'</span></strong>) ';
+		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #'.$default.'">'.$default.'</span></strong> ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 		print '</span>';
 		print '</td>';

From e354e714256ab661736b2edd7f1ef6376d640b35 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 May 2020 18:19:48 +0200
Subject: [PATCH 044/490] Fix link to themes on dolistore

---
 htdocs/core/lib/usergroups.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index f25d8058e8f..9ac9383e516 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -359,7 +359,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print $form->textwithpicto($langs->trans("DefaultSkin"), $langs->trans("ThemeDir").' : '.$dirthemestring);
 		print '</th>';
 		print '<th class="right">';
-		$url = 'https://www.dolistore.com/4-skins';
+		$url = 'https://www.dolistore.com/9-skins';
 		print '<a href="'.$url.'" target="_blank">';
 		print $langs->trans('DownloadMoreSkins');
 		print '</a>';

From 41aaf5363dd3b4807bc52e86a568a94f7d78d825 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 May 2020 18:53:41 +0200
Subject: [PATCH 045/490] Fix templates

---
 .../template/myobject_agenda.php              | 70 +++++++++--------
 .../modulebuilder/template/myobject_card.php  | 72 +++++++++---------
 .../template/myobject_document.php            | 40 ++++++++++
 .../modulebuilder/template/myobject_note.php  | 76 +++++++++----------
 htdocs/mrp/mo_agenda.php                      |  2 +-
 htdocs/mrp/mo_card.php                        |  5 +-
 htdocs/mrp/mo_document.php                    |  2 +-
 htdocs/mrp/mo_note.php                        |  2 +-
 8 files changed, 153 insertions(+), 116 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 559c5ed47b0..9b71971b6cf 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -148,44 +148,42 @@ if ($object->id > 0)
 
 	$morehtmlref = '<div class="refidno">';
 	/*
-	 // Ref customer
-	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
-	 // Thirdparty
-	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
-	 // Project
-	 if (! empty($conf->projet->enabled))
-	 {
-	 $langs->load("projects");
-	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	 if ($permissiontoadd)
-	 {
-	 if ($action != 'classify')
-		//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-		$morehtmlref.=' : ';
-		if ($action == 'classify') {
-		//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-		$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-		$morehtmlref.='<input type="hidden" name="action" value="classin">';
-		$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
-		$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-		$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-		$morehtmlref.='</form>';
+	// Ref customer
+	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	// Thirdparty
+	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	// Project
+	if (! empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+		if ($permissiontoadd)
+		{
+			if ($action != 'classify')
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			$morehtmlref.=' : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref.='<input type="hidden" name="action" value="classin">';
+				$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref.='</form>';
+			} else {
+				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
 		} else {
-		$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			if (! empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= ': '.$proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
 		}
-		} else {
-		if (! empty($object->fk_project)) {
-		$proj = new Project($db);
-		$proj->fetch($object->fk_project);
-		$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-		$morehtmlref.=$proj->ref;
-		$morehtmlref.='</a>';
-		} else {
-		$morehtmlref.='';
-		}
-		}
-		}*/
+	}*/
 	$morehtmlref .= '</div>';
 
 
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index c0b33be2bf8..e92c88f1364 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -331,42 +331,42 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	$morehtmlref = '<div class="refidno">';
 	/*
-	// Ref bis
-	$morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mymodule->myobject->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mymodule->myobject->creer, 'string', '', null, null, '', 1);
-	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-		$langs->load("projects");
-		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-		if ($permissiontoadd)
-		{
-			if ($action != 'classify')
-				$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-			if ($action == 'classify') {
-				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-				$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-				$morehtmlref.='<input type="hidden" name="action" value="classin">';
-				$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
-				$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
-				$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-				$morehtmlref.='</form>';
-			} else {
-				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-			}
-		} else {
-			if (! empty($object->fk_project)) {
-				$proj = new Project($db);
-				$proj->fetch($object->fk_project);
-				$morehtmlref.=$proj->getNomUrl();
-			} else {
-				$morehtmlref.='';
-			}
-		}
-	}
-	*/
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 $morehtmlref.=' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
 	$morehtmlref .= '</div>';
 
 
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 5f3cdf02684..63b114ffc10 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -129,6 +129,46 @@ if ($object->id)
 	// ------------------------------------------------------------
 	$linkback = '<a href="'.dol_buildpath('/mymodule/myobject_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 $morehtmlref.=' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	$morehtmlref .= '</div>';
+
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 	print '<div class="fichecenter">';
diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index f116bf51f5b..aece1f98f29 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -103,45 +103,43 @@ if ($id > 0 || !empty($ref))
 
 	$morehtmlref = '<div class="refidno">';
 	/*
-	// Ref customer
-	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
-	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-		$langs->load("projects");
-		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-		if ($permissiontoadd)
-		{
-			if ($action != 'classify')
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-				$morehtmlref.=' : ';
-				if ($action == 'classify') {
-					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-					$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-					$morehtmlref.='<input type="hidden" name="action" value="classin">';
-					$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
-					$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-					$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-					$morehtmlref.='</form>';
-				} else {
-					$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-				}
-		} else {
-			if (! empty($object->fk_project)) {
-				$proj = new Project($db);
-				$proj->fetch($object->fk_project);
-				$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-				$morehtmlref.=$proj->ref;
-				$morehtmlref.='</a>';
-			} else {
-				$morehtmlref.='';
-			}
-		}
-	}*/
-	$morehtmlref .= '</div>';
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 $morehtmlref.=' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	 $morehtmlref .= '</div>';
 
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php
index 6da02f8d5bd..eee839c8a83 100644
--- a/htdocs/mrp/mo_agenda.php
+++ b/htdocs/mrp/mo_agenda.php
@@ -169,7 +169,7 @@ if ($object->id > 0)
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
-				$morehtmlref .= $proj->getNomUrl();
+				$morehtmlref .= ': '.$proj->getNomUrl();
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 92f68785856..86b2b886dea 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -427,7 +427,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mrp->creer, 'string', '', 0, 1);
 	$morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mrp->creer, 'string', '', null, null, '', 1);*/
 	// Thirdparty
-	$morehtmlref .= $langs->trans('ThirdParty').' : '.(is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	$morehtmlref .= $langs->trans('ThirdParty').' ';
+	$morehtmlref .= ': '.(is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
@@ -452,7 +453,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	        if (!empty($object->fk_project)) {
 	            $proj = new Project($db);
 	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= $proj->getNomUrl();
+	            $morehtmlref .= ' : '.$proj->getNomUrl();
 	        } else {
 	            $morehtmlref .= '';
 	        }
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index a7baa2d9144..48031b6f372 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -147,7 +147,7 @@ if ($object->id)
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
-				$morehtmlref .= $proj->getNomUrl();
+				$morehtmlref .= ': '.$proj->getNomUrl();
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php
index e22d3e4b610..d8b72fc348c 100644
--- a/htdocs/mrp/mo_note.php
+++ b/htdocs/mrp/mo_note.php
@@ -122,7 +122,7 @@ if ($id > 0 || !empty($ref))
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
-				$morehtmlref .= $proj->getNomUrl();
+				$morehtmlref .= ' : '.$proj->getNomUrl();
 			} else {
 				$morehtmlref .= '';
 			}

From d6c8988cec406432a4aa45834bbef5745a5074a4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 May 2020 19:29:47 +0200
Subject: [PATCH 046/490] Look and field v12

---
 htdocs/contrat/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 21d46fb2974..52144d44d34 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1644,13 +1644,13 @@ else
 					}
 					if ($user->rights->contrat->creer && ($object->statut >= 0))
 					{
-						print '<a class="reposition" style="padding-left: 5px;" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=editline&amp;rowid='.$objp->rowid.'">';
+						print '<a class="reposition marginrightonly editfielda" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=editline&amp;rowid='.$objp->rowid.'">';
 						print img_edit();
 						print '</a>';
 					}
 					if ($user->rights->contrat->creer && ($object->statut >= 0))
 					{
-						print '<a style="padding-left: 5px;" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=deleteline&amp;rowid='.$objp->rowid.'">';
+						print '<a class="reposition marginrightonly" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=deleteline&amp;rowid='.$objp->rowid.'">';
 						print img_delete();
 						print '</a>';
 					}

From ebe169b9ef0b97282cf1c2f9c254ae72ca57355a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 May 2020 20:51:29 +0200
Subject: [PATCH 047/490] Fix objects used for profit calculation.

---
 htdocs/projet/element.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 34dace09e93..23fa6551656 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -526,6 +526,32 @@ $listofreferent = array(
 */
 );
 
+// Change rules for benefit calculation
+if (! empty($conf->global->PROJECT_ELEMENTS_FOR_PLUS_MARGIN)) {
+	foreach($listofreferent as $key => $element) {
+		if ($listofreferent[$key]['margin'] == 'add') {
+			unset($listofreferent[$key]['margin']);
+		}
+	}
+	$newelementforplusmargin = explode(',', $conf->global->PROJECT_ELEMENTS_FOR_PLUS_MARGIN);
+	foreach($newelementforplusmargin as $value) {
+		$listofreferent[$value]['margin']='add';
+	}
+}
+if (! empty($conf->global->PROJECT_ELEMENTS_FOR_MINUS_MARGIN)) {
+	foreach($listofreferent as $key => $element) {
+		if ($listofreferent[$key]['margin'] == 'add') {
+			unset($listofreferent[$key]['margin']);
+		}
+	}
+	$newelementforplusmargin = explode(',', $conf->global->PROJECT_ELEMENTS_FOR_MINUS_MARGIN);
+	foreach($newelementforplusmargin as $value) {
+		$listofreferent[$value]['margin']='minus';
+	}
+}
+
+
+
 $parameters = array('listofreferent'=>$listofreferent);
 $resHook = $hookmanager->executeHooks('completeListOfReferent', $parameters, $object, $action);
 

From 07178fb6c09458801bad16e4e0618e77e96fc583 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 May 2020 20:52:50 +0200
Subject: [PATCH 048/490] Fix look and feel

---
 htdocs/admin/const.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 9f3accfe549..bc22a2020fb 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -328,10 +328,10 @@ if ($conf->use_javascript_ajax)
 {
 	print '<br>';
 	print '<div id="updateconst" class="right">';
-	print '<input type="submit" name="update" class="button" value="'.$langs->trans("Modify").'">';
+	print '<input type="submit" name="update" class="button marginbottomonly" value="'.$langs->trans("Modify").'">';
 	print '</div>';
 	print '<div id="delconst" class="right">';
-	print '<input type="submit" name="delete" class="button" value="'.$langs->trans("Delete").'">';
+	print '<input type="submit" name="delete" class="button marginbottomonly" value="'.$langs->trans("Delete").'">';
 	print '</div>';
 }
 

From 650096ea0f4a95b4dd5542f7b2e801e9e94fedcd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 May 2020 21:27:40 +0200
Subject: [PATCH 049/490] Fix look and feel v12

---
 htdocs/modulebuilder/index.php | 49 +++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 5b90f2a8f98..1be2ac09971 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -2122,7 +2122,7 @@ elseif (!empty($module))
 				print '<br>';
 
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
-				print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+				print ' <a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '<br>';
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("LanguageFile").' :</span> ';
 				if (!is_array($dicts) || empty($dicts)) print '<span class="opacitymedium">'.$langs->trans("NoDictionaries").'</span>';
@@ -2867,7 +2867,7 @@ elseif (!empty($module))
 				print '<br>';
 
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
-				print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+				print ' <a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '<br>';
 
 				print '<br>';
@@ -3007,7 +3007,7 @@ elseif (!empty($module))
 				print '<br>';
 
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
-				print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+				print ' <a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '<br>';
 
 				print '<br>';
@@ -3099,12 +3099,13 @@ elseif (!empty($module))
 				print '<span class="opacitymedium">'.$langs->trans("HooksDefDesc").'</span><br>';
 				print '<br>';
 
-				print '<table><tr><td>';
+				print '<table>';
 
 				$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
+				print '<tr><td>';
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong class="">'.$pathtofile.'</strong>';
 				print '</td><td>';
-				print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+				print '<a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '</td></tr>';
 
 				print '<tr><td>';
@@ -3113,13 +3114,15 @@ elseif (!empty($module))
 				if (dol_is_file($dirins.'/'.$pathtohook))
 				{
 					print '<strong>'.$pathtohook.'</strong>';
-					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
-					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
+					print '</td>';
+					print '<td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a> ';
+					print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 				}
 				else
 				{
 					print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
-					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=inithook&format=php&file='.urlencode($pathtohook).'"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a></td>';
+					print '<a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=inithook&format=php&file='.urlencode($pathtohook).'"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a></td>';
+					print '<td></td>';
 				}
 				print '</tr>';
 			}
@@ -3163,6 +3166,14 @@ elseif (!empty($module))
 				print '<br>';
 
 				print '<table>';
+
+				$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
+				print '<tr><td>';
+				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong class="">'.$pathtofile.'</strong>';
+				print '</td><td>';
+				print '<a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+				print '</td></tr>';
+
 				if (!empty($triggers))
 				{
 					foreach ($triggers as $trigger)
@@ -3171,7 +3182,7 @@ elseif (!empty($module))
 
 						print '<tr><td>';
 						print '<span class="fa fa-file-o"></span> '.$langs->trans("TriggersFile").' : <strong>'.$pathtofile.'</strong>';
-						print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
+						print '</td><td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
 						print '<td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 						print '</tr>';
 					}
@@ -3180,9 +3191,11 @@ elseif (!empty($module))
 				{
 					print '<tr><td>';
 					print '<span class="fa fa-file-o"></span> '.$langs->trans("NoTrigger");
-					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=inittrigger&format=php"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a></td>';
+					print '<a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=inittrigger&format=php"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a></td>';
+					print '<td></td>';
 					print '</tr>';
 				}
+
 				print '</table>';
 			}
 			else
@@ -3227,7 +3240,7 @@ elseif (!empty($module))
 				if (dol_is_file($dirins.'/'.$pathtohook))
 				{
 					print '<strong>'.$pathtohook.'</strong>';
-					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
+					print '</td><td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
 					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 				}
 				else
@@ -3279,7 +3292,7 @@ elseif (!empty($module))
 				if (dol_is_file($dirins.'/'.$pathtohook))
 				{
 					print '<strong>'.$pathtohook.'</strong>';
-					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
+					print '</td><td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
 					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 				}
 				else
@@ -3335,7 +3348,7 @@ elseif (!empty($module))
 						$pathtofile = $widget['relpath'];
 
 						print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("WidgetFile").' : <strong>'.$pathtofile.'</strong>';
-						print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+						print '</td><td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 						print '</tr>';
 					}
@@ -3473,7 +3486,7 @@ elseif (!empty($module))
 				print '<br>';
 
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
-				print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+				print ' <a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '<br>';
 
 				print '<br>';
@@ -3602,7 +3615,7 @@ elseif (!empty($module))
 						if (preg_match('/\.md$/i', $spec['name'])) $format = 'markdown';
 						print '<tr><td>';
 						print '<span class="fa fa-file-o"></span> '.$langs->trans("SpecificationFile").' : <strong>'.$pathtofile.'</strong>';
-						print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
+						print '</td><td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
 						print '<td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 						print '</tr>';
 					}
@@ -3657,7 +3670,7 @@ elseif (!empty($module))
 
 			// HTML
 			print '<span class="fa fa-file-o"></span> '.$langs->trans("PathToModuleDocumentation", "HTML").' : ';
-			if (!dol_is_file($outputfiledoc)) print '<strong>'.$langs->trans("FileNotYetGenerated").'</strong>';
+			if (!dol_is_file($outputfiledoc)) print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 			else {
 				print '<strong>';
 				print '<a href="'.$outputfiledocurl.'" target="_blank">';
@@ -3670,7 +3683,7 @@ elseif (!empty($module))
 
 			// PDF
 			print '<span class="fa fa-file-o"></span> '.$langs->trans("PathToModuleDocumentation", "PDF").' : ';
-			if (!dol_is_file($outputfiledocpdf)) print '<strong>'.$langs->trans("FileNotYetGenerated").'</strong>';
+			if (!dol_is_file($outputfiledocpdf)) print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 			else {
 				print '<strong>';
 				print '<a href="'.$outputfiledocurlpdf.'" target="_blank">';
@@ -3744,7 +3757,7 @@ elseif (!empty($module))
 			print '<br>';
 
 			print '<span class="fa fa-file-o"></span> '.$langs->trans("PathToModulePackage").' : ';
-			if (!dol_is_file($outputfilezip)) print '<strong>'.$langs->trans("FileNotYetGenerated").'</strong>';
+			if (!dol_is_file($outputfilezip)) print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 			else {
 				$relativepath = $modulelowercase.'/bin/'.$FILENAMEZIP;
 				print '<strong><a href="'.DOL_URL_ROOT.'/document.php?modulepart=packages&file='.urlencode($relativepath).'">'.$outputfilezip.'</a></strong>';

From 489a2cd0cc9b0182bc7267982a45cbef11e63abb Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 5 May 2020 21:35:03 +0200
Subject: [PATCH 050/490] NEW: Add quick dropdown menu in top right menu

---
 htdocs/langs/en_US/main.lang       |   4 +-
 htdocs/main.inc.php                | 225 +++++++++++++++++++++++++++++
 htdocs/theme/eldy/dropdown.inc.php |  79 +++++++++-
 htdocs/theme/eldy/global.inc.php   |   2 +-
 htdocs/theme/eldy/style.css.php    |   2 +-
 5 files changed, 307 insertions(+), 5 deletions(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index fb0808e0953..a7044861bf7 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -187,6 +187,8 @@ ShowCardHere=Show card
 Search=Search
 SearchOf=Search
 SearchMenuShortCut=Ctrl + shift + f
+QuickAdd=Quick add
+QuickAddMenuShortCut=Ctrl + shift + l
 Valid=Valid
 Approve=Approve
 Disapprove=Disapprove
@@ -1031,4 +1033,4 @@ DeleteFileHeader=Confirm file delete
 DeleteFileText=Do you really want delete this file?
 ShowOtherLanguages=Show other languages
 SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
-NotUsedForThisCustomer=Not used for this customer
\ No newline at end of file
+NotUsedForThisCustomer=Not used for this customer
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6533b4bfe54..5e6b616dc26 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1722,6 +1722,11 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			$toprightmenu .= top_menu_search();
 		}
 
+		if (!empty($conf->global->MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)) {
+			// Add search dropdown
+			$toprightmenu .= top_menu_quickadd();
+		}
+
 		// Add bookmark dropdown
 		$toprightmenu .= top_menu_bookmark();
 
@@ -1934,6 +1939,226 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
     return $btnUser;
 }
 
+/**
+ * Build the tooltip on top menu quick add
+ *
+ * @return  string                  HTML content
+ */
+function top_menu_quickadd()
+{
+	global $langs, $conf, $db, $hookmanager, $user;
+	global $menumanager;
+	$html = '';
+	// Define $dropDownQuickAddHtml
+	$dropDownQuickAddHtml = '<div class="dropdown-header bookmark-header center">';
+	$dropDownQuickAddHtml.= $langs->trans('QuickAdd');
+	$dropDownQuickAddHtml.= '</div>';
+
+	$dropDownQuickAddHtml.= '<div class="quickadd-body dropdown-body">';
+	$dropDownQuickAddHtml.= '<div class="quickadd">';
+	if (! empty($conf->societe->enabled) && $user->rights->societe->creer) {
+		$langs->load("companies");
+		$dropDownQuickAddHtml.= '
+                <!-- Thirdparty link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/societe/card.php?action=create" title="'.$langs->trans("MenuNewThirdParty").'">
+                        <i class="fal fa-building fa-2x"></i><br>
+                        '.$langs->trans("ThirdParty").'
+                    </a>
+                </div>
+                ';
+	}
+
+	if (! empty($conf->societe->enabled) && $user->rights->societe->contact->creer) {
+		$langs->load("companies");
+		$dropDownQuickAddHtml.= '
+                <!-- Contact link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/contact/card.php?action=create" title="'.$langs->trans("NewContactAddress").'">
+                        <i class="fal fa-address-book fa-2x"></i><br>
+                        '.$langs->trans("Contact").'
+                    </a>
+                </div>
+                ';
+	}
+
+	if (! empty($conf->propal->enabled) && $user->rights->propale->creer) {
+		$langs->load("propal");
+		$dropDownQuickAddHtml.= '
+                <!-- Propal link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/comm/propal/card.php?action=create" title="'.$langs->trans("NewPropal").'">
+                        <i class="fal fa-suitcase fa-2x"></i><br>
+                        '.$langs->trans("Proposal").'
+                    </a>
+                </div>
+                ';
+	}
+
+	if (! empty($conf->commande->enabled) && $user->rights->commande->creer) {
+		$langs->load("orders");
+		$dropDownQuickAddHtml.= '
+                <!-- Order link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/commande/card.php?action=create" title="'.$langs->trans("NewOrder").'">
+                        <i class="fal fa-file-alt fa-2x"></i><br>
+                        '.$langs->trans("Order").'
+                    </a>
+                </div>
+                ';
+	}
+
+	if (! empty($conf->facture->enabled) && $user->rights->facture->creer) {
+		$langs->load("bills");
+		$dropDownQuickAddHtml.= '
+                <!-- Invoice link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create" title="'.$langs->trans("NewBill").'">
+                        <i class="fal fa-coins fa-2x"></i><br>
+                        '.$langs->trans("Bill").'
+                    </a>
+                </div>
+                ';
+	}
+
+	if (! empty($conf->contrat->enabled) && $user->rights->contrat->creer) {
+		$langs->load("contracts");
+		$dropDownQuickAddHtml.= '
+                <!-- Contract link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create" title="'.$langs->trans("NewContractSubscription").'">
+                        <i class="fal fa-file-contract fa-2x"></i><br>
+                        '.$langs->trans("Contract").'
+                    </a>
+                </div>
+                ';
+	}
+
+	if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->creer) {
+		$langs->load("supplier_proposal");
+		$dropDownQuickAddHtml.= '
+                <!-- Supplier proposal link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/supplier_proposal/card.php?action=create" title="'.$langs->trans("NewAskPrice").'">
+                        <i class="fal fa-suitcase fa-2x"></i><br>
+                        '.$langs->trans("AskPrice").'
+                    </a>
+                </div>
+                ';
+	}
+
+	if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->creer) {
+		$langs->load("orders");
+		$dropDownQuickAddHtml.= '
+                <!-- Supplier order link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create" title="'.$langs->trans("NewOrder").'">
+                        <i class="fal fa-file-alt fa-2x"></i><br>
+                        '.$langs->trans("SupplierOrder").'
+                    </a>
+                </div>
+                ';
+	}
+
+	if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->creer) {
+		$langs->load("bills");
+		$dropDownQuickAddHtml.= '
+                <!-- Supplier invoice link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create" title="'.$langs->trans("NewBill").'">
+                        <i class="fal fa-coins fa-2x"></i><br>
+                        '.$langs->trans("SupplierBill").'
+                    </a>
+                </div>
+                ';
+	}
+
+	if (! empty($conf->product->enabled) && $user->rights->produit->creer) {
+		$langs->load("products");
+		$dropDownQuickAddHtml.= '
+                <!-- Product link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/product/card.php?action=create&amp;type=0" title="'.$langs->trans("NewProduct").'">
+                        <i class="fal fa-cube fa-2x"></i><br>
+                        '.$langs->trans("Product").'
+                    </a>
+                </div>
+                ';
+	}
+
+	if (! empty($conf->service->enabled) && $user->rights->service->creer) {
+		$langs->load("products");
+		$dropDownQuickAddHtml.= '
+                <!-- Service link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/product/card.php?action=create&amp;type=1" title="'.$langs->trans("NewService").'">
+                        <i class="fal fa-concierge-bell fa-2x"></i><br>
+                        '.$langs->trans("Service").'
+                    </a>
+                </div>
+                ';
+	}
+
+	// Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
+	$parameters = array();
+	$result = $hookmanager->executeHooks('printQuickAddBlock', $parameters); // Note that $action and $object may have been modified by some hooks
+	if (is_numeric($result))
+	{
+		if ($result == 0)
+			$dropDownQuickAddHtml.= $hookmanager->resPrint; // add
+		else
+			$dropDownQuickAddHtml = $hookmanager->resPrint; // replace
+	}
+	else
+	{
+		$dropDownQuickAddHtml.= $result; // For backward compatibility
+	}
+
+	$dropDownQuickAddHtml.= '</div>';
+	$dropDownQuickAddHtml.= '</div>';
+
+	$html.= '<!-- div for quick add link -->
+    <div id="topmenu-quickadd-dropdown" class="atoplogin dropdown inline-block">
+        <a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('QuickAdd').' ('.$langs->trans('QuickAddMenuShortCut').')">
+            <i class="fal fa-plus-circle" ></i>
+        </a>
+
+        <div class="dropdown-menu">
+            '.$dropDownQuickAddHtml.'
+        </div>
+    </div>';
+	$html .= '
+        <!-- Code to show/hide the user drop-down -->
+        <script>
+        $( document ).ready(function() {
+            $(document).on("click", function(event) {
+                if (!$(event.target).closest("#topmenu-quickadd-dropdown").length) {
+                    // Hide the menus.
+                    $("#topmenu-quickadd-dropdown").removeClass("open");
+                }
+            });
+            $("#topmenu-quickadd-dropdown .dropdown-toggle").on("click", function(event) {
+                openQuickAddDropDown();
+            });
+            // Key map shortcut
+            $(document).keydown(function(e){
+                  if( e.which === 76 && e.ctrlKey && e.shiftKey ){
+                     console.log(\'control + shift + l : trigger open quick add dropdown\');
+                     openQuickAddDropDown();
+                  }
+            });
+
+
+            var openQuickAddDropDown = function() {
+                event.preventDefault();
+                $("#topmenu-quickadd-dropdown").toggleClass("open");
+                //$("#top-quickadd-search-input").focus();
+            }
+        });
+        </script>
+        ';
+	return $html;
+}
 
 /**
  * Build the tooltip on top menu bookmark
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index 49f910f50da..479bb3f889b 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -9,7 +9,7 @@ button.dropdown-item.global-search-item {
     outline: none;
 }
 
-.open>.dropdown-search, .open>.dropdown-bookmark, .open>.dropdown-menu, .dropdown dd ul.open {
+.open>.dropdown-search, .open>.dropdown-bookmark, .open>.dropdown-quickadd, .open>.dropdown-menu, .dropdown dd ul.open {
     display: block;
 }
 
@@ -59,6 +59,29 @@ button.dropdown-item.global-search-item {
     -webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175);
     box-shadow: 0 6px 12px rgba(0,0,0,.175);
 }
+.dropdown-quickadd {
+	border-color: #eee;
+
+	position: absolute;
+	top: 100%;
+	left: 0;
+	z-index: 1000;
+	display: none;
+	float: left;
+	min-width: 240px;
+	margin: 2px 0 0;
+	font-size: 14px;
+	text-align: left;
+	list-style: none;
+	background-color: #fff;
+	-webkit-background-clip: padding-box;
+	background-clip: padding-box;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,.15);
+	border-radius: 4px;
+	-webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175);
+	box-shadow: 0 6px 12px rgba(0,0,0,.175);
+}
 .dropdown-menu {
     border-color: #eee;
 
@@ -163,7 +186,7 @@ button.dropdown-item.global-search-item {
     max-width: 100%;
 }
 
-div#topmenu-global-search-dropdown, div#topmenu-bookmark-dropdown {
+div#topmenu-global-search-dropdown, div#topmenu-bookmark-dropdown, div#topmenu-quickadd-dropdown {
 	<?php if (empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { ?>
 		line-height: 46px;
 	<?php } ?>
@@ -383,6 +406,58 @@ a.top-menu-dropdown-link {
     display: none !important;
 }
 
+/*
+ * QUICK ADD
+ */
+#topmenu-quickadd-dropdown .dropdown-menu {
+	width: 300px !important;
+	color: #444;
+}
+
+.quickadd-header {
+	color: #444 !important;
+}
+
+div.quickadd {
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-flex-direction: row;
+	-ms-flex-direction: row;
+	flex-direction: row;
+	-webkit-flex-wrap: wrap;
+	-ms-flex-wrap: wrap;
+	flex-wrap: wrap;
+	-webkit-justify-content: center;
+	-ms-flex-pack: center;
+	justify-content: center;
+	-webkit-align-content: center;
+	-ms-flex-line-pack: center;
+	align-content: center;
+	-webkit-align-items: flex-start;
+	-ms-flex-align: start;
+	align-items: flex-start;
+}
+
+div.quickadd a {
+	color: #444;
+}
+
+div.quickadd a:hover, div.quickadd a:active {
+	color: #000000;
+}
+
+div.quickaddblock {
+	width: 80px;
+	display: block ruby;
+}
+
+div.quickaddblock:hover,
+div.quickaddblock:active,
+div.quickaddblock:focus {
+	background: <?php print $colorbacklinepair1; ?>;
+}
+
 /* smartphone */
 @media only screen and (max-width: 767px)
 {
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 28fa0ecfa65..4a3c2523ecc 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1304,7 +1304,7 @@ td.showDragHandle {
 #id-left {
 	padding-top: 20px;
 	padding-bottom: 5px;
-	<?php if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) { ?>
+	<?php if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN) && ! empty($conf->global->MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)) { ?>
 	padding-top: 8px;
 	<?php } ?>
 }
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 39fcd003335..0409ca5830e 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -202,7 +202,7 @@ $disableimages = 0;
 $maxwidthloginblock = 180;
 if (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { $disableimages = 1; $maxwidthloginblock = $maxwidthloginblock + 50; $minwidthtmenu = 0; }
 
-
+if (!empty($conf->global->MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)) { $maxwidthloginblock = $maxwidthloginblock + 55; }
 if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) { $maxwidthloginblock = $maxwidthloginblock + 55; }
 if (!empty($conf->bookmark->enabled)) { $maxwidthloginblock = $maxwidthloginblock + 55; }
 

From eacb1b3b2e399d365bab45e58e3cf184b3d42af7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 May 2020 21:45:10 +0200
Subject: [PATCH 051/490] Debug modulebuilder

---
 htdocs/core/lib/files.lib.php  | 11 ++++++++++-
 htdocs/modulebuilder/index.php |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 941cb03d6c4..dbea182fb9b 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -761,8 +761,17 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 				if (is_dir($ossrcfile."/".$file))
 				{
 					if (empty($excludesubdir) || ($excludesubdir == 2 && strlen($file) == 2)) {
+						$newfile = $file;
+						// Replace destination filename with a new one
+						if (is_array($arrayreplacement))
+						{
+							foreach ($arrayreplacement as $key => $val)
+							{
+								$newfile = str_replace($key, $val, $newfile);
+							}
+						}
 						//var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
-						$tmpresult = dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement, $excludesubdir);
+						$tmpresult = dolCopyDir($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists, $arrayreplacement, $excludesubdir);
 					}
 				}
 				else
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 1be2ac09971..d813c3b291b 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -180,8 +180,10 @@ if ($dirins && $action == 'initmodule' && $modulename)
 		dol_delete_file($destdir.'/sql/llx_'.strtolower($modulename).'_myobject.sql');
 		dol_delete_file($destdir.'/sql/llx_'.strtolower($modulename).'_myobject_extrafields.sql');
 		dol_delete_file($destdir.'/sql/llx_'.strtolower($modulename).'_myobject.key.sql');
+		dol_delete_file($destdir.'/sql/llx_'.strtolower($modulename).'_myobject_extrafields.key.sql');
 		dol_delete_file($destdir.'/img/object_myobject.png');
 		dol_delete_file($destdir.'/class/myobject.class.php');
+		dol_delete_dir($destdir.'/class');
 		dol_delete_dir($destdir.'/sql');
 	}
 

From fa305fdaca1b7b32e51c8f80233693a2625eec4e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 May 2020 21:49:46 +0200
Subject: [PATCH 052/490] Prepare version 11.0.4

---
 ChangeLog | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 3b81e0555d5..a7d0282fba5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,84 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+***** ChangeLog for 11.0.4 compared to 11.0.3 *****
+FIX: #13749
+FIX: #7594
+FIX: #7594 Expense report multi pagebreak
+FIX: Access to undeclared static property: Contact::$table_element
+FIX: actions on supplier proposal not saved (bad trigger name)
+FIX: Add function "completeTabsHead" to "addreplace" type hook.
+FIX: All forms must use newToken()
+FIX: Another "Access to undeclared static property: Contact::$table_element" && "Societe::$table_element"
+FIX: author search supplier proposal list
+FIX: A variable was erased by a temporary variable
+FIX: Avoid infinite loop when a fetch is inside a compute field.
+FIX: Backto link
+FIX: Bad position of total in column
+FIX: bad value in currency into discount created from down payment
+FIX: buyprice extrafield langfile and tooltip
+FIX: Buyprice was updated only if min price for this qty had same qty
+FIX: Can switch from double to price type for extrafields
+FIX: Can use decimal value in virtual products
+FIX: child categories only with good entity rights
+FIX: cloning of emailing when no content selected
+FIX: closing tags
+FIX: Combo list of available users to filter on the list of leaves.
+FIX: Compatibility with multicompany, bad numerotation of task.
+FIX: consistency of price w/wo vat wrong when price entered with tax
+FIX: default value of selectMasssAction broken
+FIX: draftordered replenish virtual stock
+FIX: Error update SQL into stock reception
+FIX: expensereport status in generated pdf
+FIX: extra date field incorrect check
+FIX: Extrafields of type price must be '' and not '0' if not defined
+FIX: Foreign currency lost when splitting a discount
+FIX: get remain to pay with rounding decimals
+FIX: gzip and bzip2 must use option -f
+FIX: IHM, unexpected quote
+FIX: keep viewstatut for doli 3.5
+FIX: Link missing into email of some notification
+FIX: Look and feel v11
+FIX: md stylesheet to be included by external modules like eldy
+FIX: missing array option
+FIX: missing default accountancy product buy code
+FIX: missing fk_bank during export of suppliers invoices
+FIX: missing member entity
+FIX: missing selectedlines on supplier order but checkbox are displayed
+FIX: Missing token and take into account max date when it can.
+FIX: model export list must be sorted by label
+FIX: multicurrency manage on hidden conf SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL
+FIX: Must escape shell
+FIX: Must exclude logs and some dirs for compressed backup
+FIX: ordered stock already in $stock
+FIX: picture migration script from doli 9.0
+FIX: print pictures on shipment docs
+FIX: product get purchase prices
+FIX: product purchase prices
+FIX: Protection when database has a corrupted product id
+FIX: remove unused var, $usercancreate can be change by Multicompany
+FIX: replenish stock to buy
+FIX: Sanitizing menu parameter
+FIX: Send email from bulk action of list of thirdparties
+FIX: setup of suggested payment mode on proposals and orders
+FIX: Several pb in export of documents
+FIX: Situation invoice take into account the credit notes.
+FIX: some others modules (like subtotal) use other product_type than 0 or 1 AND must not be considered in this report
+FIX: sort by default role makes no sense
+FIX: sort on company on member list
+FIX: TakePOS buying price
+FIX: text version of html emailing (removed the body style)
+FIX: The "test smtp connectivity" failed on page to setup mass emailing
+FIX: Error logs an Orderline::delete error, but this is an Orderline::insert error
+FIX: Translation of tooltips of extrafields
+FIX: Use getNomURL instead of hard coded link. Fix limit.
+FIX: Use of image into free text for PDF if DOL_DATA_DIR is outside of
+FIX: viewstatut to search status
+FIX: we must export company mail address on contact vcard only if contact email address is empty
+FIX: when we filter a list on a view status, we want this filter to be on bookmark that we create
+FIX: Wrong Sql on getListOfTowns api method
+FIX: wrong user right's name to top menu "commercial"
+FIX: XSS Vulnerability
 
 ***** ChangeLog for 11.0.3 compared to 11.0.2 *****
 FIX: unit price for selected supplier products not set. NaN was used.

From 9f176c5e2d8733114ed712f7d2f8ba8b3b69801a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 May 2020 01:41:10 +0200
Subject: [PATCH 053/490] Fix trans

---
 htdocs/langs/en_US/companies.lang | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index f8b3d0354e2..0fad58c9389 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -325,7 +325,8 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/addresses
 ListOfThirdParties=List of Third Parties
-ShowContact=Show contact
+ShowCompany=Third Party
+ShowContact=Contact-Address
 ContactsAllShort=All (No filter)
 ContactType=Contact type
 ContactForOrders=Order's contact

From d9cef1c8d79ac971641fc4304355f5cb44d5b5f3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 May 2020 01:49:19 +0200
Subject: [PATCH 054/490] Fix packager to publish on new web site

---
 build/makepack-dolibarr.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index c6b8cd330c8..933c5b8f994 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -19,7 +19,7 @@ use Term::ANSIColor;
 # Change this to defined target for option 98 and 99
 $PROJECT="dolibarr";
 $PUBLISHSTABLE="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr";
-$PUBLISHBETARC="dolibarr\@vmprod1.dolibarr.org:/home/dolibarr/dolibarr.org/httpdocs/files";
+$PUBLISHBETARC="dolibarr\@vmprod1.dolibarr.org:/home/dolibarr/asso.dolibarr.org/dolibarr_documents/website/www.dolibarr.org/files";
 
 
 #@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","EXEDOLIWAMP","SNAPSHOT");   # Possible packages

From 247acdd27446434927a8727506cacdd58985fc8f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 May 2020 03:47:28 +0200
Subject: [PATCH 055/490] Fix position of custom groups of modules

---
 htdocs/admin/company.php                      |  2 +-
 htdocs/admin/modules.php                      | 10 ++++++----
 htdocs/core/lib/functions.lib.php             |  1 +
 htdocs/core/modules/DolibarrModules.class.php |  2 +-
 htdocs/theme/eldy/info-box.inc.php            |  5 +++++
 htdocs/theme/eldy/progress.inc.php            |  2 +-
 htdocs/theme/md/info-box.inc.php              |  4 ++++
 7 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index d4664a13de1..f33a3ea6f93 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -693,7 +693,7 @@ print '<br>';
 
 
 // Sales taxes (VAT, IRPF, ...)
-print load_fiche_titre($langs->trans("TypeOfSaleTaxes"));
+print load_fiche_titre($langs->trans("TypeOfSaleTaxes"), '', 'object_payment');
 
 print '<table class="noborder centpercent editmode">';
 print '<tr class="liste_titre">';
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 926a4c34f70..6a0ff450346 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -412,11 +412,13 @@ foreach ($modulesdir as $dir)
 									}
 
 									$familyposition = $familyinfo[$familykey]['position'];
-									if ($external)
+									$listOfOfficialModuleGroups = array('hr', 'technic', 'interface', 'technic', 'portal', 'financial', 'crm', 'base', 'products', 'srm', 'ecm', 'projects', 'other');
+									if ($external && ! in_array($familykey, $listOfOfficialModuleGroups))
 									{
-										// TODO Find a solution so modules with their own family are always at end
-										//var_dump($familyposition);
-										//$familyposition += 100;
+										// If module is extern and into a custom group (not into an official predefined one), it must appear at end (custom groups should not be before official groups).
+										if (is_numeric($familyposition)) {
+											$familyposition = sprintf("%03d", (int) $familyposition + 100);
+										}
 									}
 
 									$orders[$i] = $familyposition."_".$familykey."_".$moduleposition."_".$j; // Sort by family, then by module position then number
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 14531947574..f456ec311ac 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3268,6 +3268,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'payment'=>'bg-infobox-bank_account', 'poll'=>'bg-infobox-adherent', 'project'=>'bg-infobox-project', 'projecttask'=>'bg-infobox-project', 'propal'=>'bg-infobox-propal',
 				'resource'=>'bg-infobox-action', 'supplier_invoice'=>'bg-infobox-order_supplier', 'supplier_order'=>'bg-infobox-order_supplier', 'supplier_proposal'=>'bg-infobox-supplier_proposal',
 				'ticket'=>'bg-infobox-contrat', 'title_accountancy'=>'bg-infobox-bank_account', 'title_hrm'=>'bg-infobox-holiday', 'trip'=>'bg-infobox-expensereport', 'title_agenda'=>'bg-infobox-action',
+				//'title_setup'=>'bg-infobox-action', 'tools'=>'bg-infobox-action',
 				'list-alt'=>'imgforviewmode', 'calendar'=>'imgforviewmode', 'calendarweek'=>'imgforviewmode', 'calendarmonth'=>'imgforviewmode', 'calendarday'=>'imgforviewmode', 'calendarperuser'=>'imgforviewmode'
 			);
 			if (!empty($arrayconvpictotomorcess[$pictowithouttext])) {
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index cd3fe7922ee..c592cb69959 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -2279,7 +2279,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
     	$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($this)));
 
 		print '
-    	<div class="box-flex-item info-box-module'.(empty($conf->global->$const_name) ? ' info-box-module-disabled' : ' ').'">
+    	<div class="box-flex-item info-box-module'.(empty($conf->global->$const_name) ? ' info-box-module-disabled' : '').($this->isCoreOrExternalModule() == 'external' ? ' info-box-module-external' : '').'">
 	    <div class="info-box info-box-sm info-box-module">
 	    <div class="info-box-icon">';
 
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 028039f6c8b..7f62fe39689 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -6,6 +6,11 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
  * Component: Info Box
  * -------------------
  */
+
+.info-box-module-external span.info-box-icon-version {
+    background: #999;
+}
+
 .info-box {
 	display: block;
     position: relative;
diff --git a/htdocs/theme/eldy/progress.inc.php b/htdocs/theme/eldy/progress.inc.php
index b0bd96df1d2..71f25ff35ba 100644
--- a/htdocs/theme/eldy/progress.inc.php
+++ b/htdocs/theme/eldy/progress.inc.php
@@ -123,7 +123,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
     width: 3px;
 }
 .progress-group .progress-text {
-    font-weight: 600;
+    /* font-weight: 600; */
 }
 .progress-group .progress-number {
     float: right;
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index d9b467f130b..d866cab96a6 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -7,6 +7,10 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
  * -------------------
  */
 
+.info-box-module-external span.info-box-icon-version {
+    background: #999;
+}
+
 span.info-box-icon-text {	/* hide box text number due to problems */
     display: none;
 }

From 30fede216c7cb7b95e5db3d26cf338b88ad62b61 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 May 2020 04:03:07 +0200
Subject: [PATCH 056/490] Fix Add '_pw' var as var sensibles.

---
 htdocs/api/class/api_setup.class.php           | 2 +-
 htdocs/core/class/commondocgenerator.class.php | 2 +-
 htdocs/core/lib/functions.lib.php              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index ec7a6b89596..fd6432b553f 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -1429,7 +1429,7 @@ class Setup extends DolibarrApi
     	if (!preg_match('/^[a-zA-Z0-9_]+$/', $constantname) || !isset($conf->global->$constantname)) {
     		throw new RestException(500, 'Error Bad or unknown value for constantname');
     	}
-    	if (preg_match('/(_pass|password|secret|_key|key$)/i', $constantname)) {
+    	if (preg_match('/(_pass|_pw|password|secret|_key|key$)/i', $constantname)) {
     		throw new RestException(403, 'Forbidden');
     	}
 
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 1f5ef0a5a9e..df80aab7a1f 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -325,7 +325,7 @@ abstract class CommonDocGenerator
 
     	foreach ($conf->global as $key => $val)
     	{
-    		if (preg_match('/(_pass|password|secret|_key|key$)/i', $key)) $newval = '*****forbidden*****';
+    		if (preg_match('/(_pass|_pw|password|secret|_key|key$)/i', $key)) $newval = '*****forbidden*****';
     		else $newval = $val;
     		$array_other['__['.$key.']__'] = $newval;
     	}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f456ec311ac..28a44562b28 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6523,7 +6523,7 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null)
 		if (dol_textishtml($text, 1)) $msgishtml = 1;
 
 		$keyfound = $reg[1];
-		if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) $newval = '*****forbidden*****';
+		if (preg_match('/(_pass|_pw|password|secret|_key|key$)/i', $keyfound)) $newval = '*****forbidden*****';
 		else $newval = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;
 		$text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $msgishtml ?dol_htmlentitiesbr($newval) : $newval, $text);
 	}

From b09f179a16759ee8213c51ebf0726f57decf3a3c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 May 2020 04:32:48 +0200
Subject: [PATCH 057/490] NEW Website logs are now into a separated log file.

---
 htdocs/core/lib/functions.lib.php | 7 +++++++
 htdocs/core/lib/website2.lib.php  | 5 ++++-
 htdocs/core/website.inc.php       | 2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 28a44562b28..1a4ab00b7d6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1078,6 +1078,13 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
 	// If syslog module enabled
 	if (empty($conf->syslog->enabled)) return;
 
+	// Check if we are into execution of code of a website
+	if (defined('USEEXTERNALSERVER') && ! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
+		global $website, $websitekey;
+		if (is_object($website) && ! empty($website->ref)) $suffixinfilename.='_website_'.$website->ref;
+		elseif (! empty($websitekey)) $suffixinfilename.='_website_'.$websitekey;
+	}
+
 	if ($ident < 0)
 	{
 		foreach ($conf->loghandlers as $loghandlerinstance)
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 6ef17220283..fc56a489d75 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -39,7 +39,10 @@ function dolSaveMasterFile($filemaster)
 
 	$mastercontent = '<?php'."\n";
 	$mastercontent .= '// File generated to link to the master file - DO NOT MODIFY - It is just an include'."\n";
-	$mastercontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) require_once '".DOL_DOCUMENT_ROOT."/master.inc.php';\n";
+	$mastercontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {\n";
+	$mastercontent .= "    if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);\n";
+	$mastercontent .= "    require_once '".DOL_DOCUMENT_ROOT."/master.inc.php';\n";
+	$mastercontent .= "}\n";
 	$mastercontent .= '?>'."\n";
 	$result = file_put_contents($filemaster, $mastercontent);
 	if (!empty($conf->global->MAIN_UMASK))
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index b90da632fac..3e54f6ec2ad 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -19,7 +19,7 @@
 /**
  *	\file			htdocs/core/website.inc.php
  *  \brief			Common file loaded by all website pages (after master.inc.php). It set the new object $weblangs, using parameter 'l'.
- *  				This file is included in top of all container pages.
+ *  				This file is included in top of all container pages and is run only when a web page is called.
  *  			    The global variable $websitekey must be defined.
  */
 

From a8222c2651591a657767b8bf95cc04fa37752866 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 May 2020 05:10:42 +0200
Subject: [PATCH 058/490] Look and feel v12

---
 htdocs/admin/menus/index.php | 4 ++--
 htdocs/admin/tools/purge.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index 56251e48f7b..97f0246ac88 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -277,8 +277,8 @@ print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("TreeMenuPersonalized").'</td>';
-print '<td class="right"><div id="iddivjstreecontrol"><a href="#">'.img_picto('', 'object_category').' '.$langs->trans("UndoExpandAll").'</a>';
-print ' | <a href="#">'.img_picto('', 'object_category-expanded').' '.$langs->trans("ExpandAll").'</a></div></td>';
+print '<td class="right"><div id="iddivjstreecontrol"><a href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>';
+print ' | <a href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a></div></td>';
 print '</tr>';
 
 print '<tr>';
diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index 43cf81b41ba..9898e290ddc 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -78,7 +78,7 @@ $form = new Form($db);
 
 print load_fiche_titre($langs->trans("Purge"), '', 'title_setup');
 
-print $langs->trans("PurgeAreaDesc", $dolibarr_main_data_root).'<br>';
+print '<span class="opacitymedium">'.$langs->trans("PurgeAreaDesc", $dolibarr_main_data_root).'</span><br>';
 print '<br>';
 
 

From b6aa766c72078988a0e74d8b5305b96eb9d6d509 Mon Sep 17 00:00:00 2001
From: atm-quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Wed, 6 May 2020 09:37:17 +0200
Subject: [PATCH 059/490] FIX stickler

---
 htdocs/compta/facture/stats/index.php | 14 +++++++-------
 htdocs/core/class/dolgraph.class.php  | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 4c0d23c90e2..8606e619740 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -262,13 +262,13 @@ if ($mode == 'customer') $filter = 's.client in (1,2,3)';
 if ($mode == 'supplier') $filter = 's.fournisseur = 1';
 print $form->selectarray('socid', $companies, $socid, 1, 0, 0, 'style="width: 95%"', 0, 0, 0, '', '', 1);
 print '</td></tr>';
-if(!empty($conf->category->enabled) && $mode == 'customer') {
-        // Customer Category
-        print '<tr><td>'.$langs->trans("CustomersProspectsCategoriesShort").'</td><td>';
-        $cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
-        print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, null, null, "90%");
-        print '</td></tr>';
-    }
+if(! empty($conf->category->enabled) && $mode == 'customer') {
+    // Customer Category
+    print '<tr><td>'.$langs->trans("CustomersProspectsCategoriesShort").'</td><td>';
+    $cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
+    print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, null, null, "90%");
+    print '</td></tr>';
+}
 // ThirdParty Type
 print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
 $sortparam_typent = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 3f1bfa245fb..551fe2b82c0 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -895,11 +895,11 @@ class DolGraph
 				$color = sprintf("%02x%02x%02x", $this->datacolor[$i][0], $this->datacolor[$i][1], $this->datacolor[$i][2]);
 				$this->stringtoshow .= '{ ';
 				if (! isset($this->type[$i]) || $this->type[$i] == 'bars') {
-				    if($nblot == 3) {
-				        if($i == $firstlot) $align = 'right';
-				        else if($i == $firstlot+1) $align = 'center';
-				        else $align = 'left';
-				        $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.$align.'", barWidth: 0.45 }, ';
+                    if($nblot == 3) {
+                        if($i == $firstlot) $align = 'right';
+                        elseif($i == $firstlot + 1) $align = 'center';
+                        else $align = 'left';
+                        $this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "'.$align.'", barWidth: 0.45 }, ';
                     }
 				    else $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
                 }

From 128ec6fd78fa91569f80636a83f90dd8171ad1a1 Mon Sep 17 00:00:00 2001
From: "DEMAREST Maxime (Indelog)" <maxime@indelog.fr>
Date: Wed, 6 May 2020 08:38:36 +0200
Subject: [PATCH 060/490] Add include various payments and loans in accounting
 report

  For simplified accouning, behaviour not enable by default and must be
  enabed in simplified accounting module admin page (or by global
  settings ACCOUNTING_REPORTS_INCLUDE_VARPAY and
  ACCOUNTING_REPORTS_INCLUDE_LOAN).
---
 htdocs/admin/compta.php                |  35 ++++++++
 htdocs/compta/resultat/clientfourn.php | 116 ++++++++++++++++++++++++-
 htdocs/compta/resultat/index.php       | 112 ++++++++++++++++++++++++
 htdocs/langs/en_US/compta.lang         |   2 +
 htdocs/langs/fr_FR/compta.lang         |   2 +
 5 files changed, 266 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index cdfa15d9069..b3c66af76ca 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2011-2013 Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2013-2017 Philippe Grand	    <philippe.grand@atoo-net.com>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2020      Maxime DEMAREST      <maxime@indelog.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
@@ -83,6 +84,20 @@ if ($action == 'update')
         }
     }
 
+    $report_include_varpay = GETPOST('ACCOUNTING_REPORTS_INCLUDE_VARPAY', 'alpha');
+    if (!empty($report_include_varpay))
+        if ($report_include_varpay == 'yes')
+            if (!dolibarr_set_const($db, 'ACCOUNTING_REPORTS_INCLUDE_VARPAY', 1, 'chaine', 0, '', $conf->entity)) $error++;
+        if ($report_include_varpay == 'no')
+            if (!dolibarr_del_const($db, 'ACCOUNTING_REPORTS_INCLUDE_VARPAY', $conf->entity)) $error++;
+
+    $report_include_loan = GETPOST('ACCOUNTING_REPORTS_INCLUDE_LOAN', 'alpha');
+    if (!empty($report_include_loan))
+        if ($report_include_loan == 'yes')
+            if (!dolibarr_set_const($db, 'ACCOUNTING_REPORTS_INCLUDE_LOAN', 1, 'chaine', 0, '', $conf->entity)) $error++;
+        if ($report_include_loan == 'no')
+            if (!dolibarr_del_const($db, 'ACCOUNTING_REPORTS_INCLUDE_LOAN', $conf->entity)) $error++;
+
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -158,6 +173,26 @@ foreach ($list as $key)
 	print '</td></tr>';
 }
 
+// Option to include various payment in results
+print '<tr class="oddeven value">'."\n";
+print '<td><label for="ACCOUNTING_REPORTS_INCLUDE_VARPAY">'.$langs->trans('IncludeVarpaysInResults').'</label></td>'."\n";
+print '<td class="center">'."\n";
+print '<select id="ACCOUNTING_REPORTS_INCLUDE_VARPAY" name="ACCOUNTING_REPORTS_INCLUDE_VARPAY">'."\n";
+print '<option value="no" '.(empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY)?'selected':'').'>'.$langs->trans('No').'</option>'."\n";
+print '<option value="yes" '.(!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY)?'selected':'').'>'.$langs->trans('Yes').'</option>'."\n";
+print '</select>'."\n";
+print '</td></tr>';
+
+// Option to include loan in results
+print '<tr class="oddeven value">'."\n";
+print '<td><label for="ACCOUNTING_REPORTS_INCLUDE_LOAN">'.$langs->trans('IncludeLoansInResults').'</label></td>'."\n";
+print '<td class="center">'."\n";
+print '<select id="ACCOUNTING_REPORTS_INCLUDE_LOAN" name="ACCOUNTING_REPORTS_INCLUDE_LOAN">'."\n";
+print '<option value="no" '.(empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN)?'selected':'').'>'.$langs->trans('No').'</option>'."\n";
+print '<option value="yes" '.(!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN)?'selected':'').'>'.$langs->trans('Yes').'</option>'."\n";
+print '</select>'."\n";
+print '</td></tr>';
+
 print "</table>\n";
 
 print '<br><br><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 44be66a2218..59b7999e4ef 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2014       Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2014       Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2020       Maxime DEMAREST         <maxime@indelog.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
@@ -38,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancycategory.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('compta', 'bills', 'donation', 'salaries', 'accountancy'));
+$langs->loadLangs(array('compta', 'bills', 'donation', 'salaries', 'accountancy', 'loan'));
 
 $date_startmonth = GETPOST('date_startmonth', 'int');
 $date_startday = GETPOST('date_startday', 'int');
@@ -953,6 +954,119 @@ else
 		print '</tr>';
 	}
 
+    /*
+     * Various Payments
+     */
+
+    if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
+    {
+        $subtotal_ht = 0;
+        $subtotal_ttc = 0;
+
+        print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("VariousPayment").'</td></tr>';
+
+        // Debit
+        $sql = "SELECT SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various as p";
+        $sql .= ' WHERE 1 = 1';
+        if (!empty($date_start) && !empty($date_end))
+            $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+        $sql .= ' GROUP BY p.sens';
+        $sql .= ' ORDER BY p.sens';
+
+        dol_syslog('get various payments', LOG_DEBUG);
+        $result = $db->query($sql);
+        if ($result)
+        {
+
+            // Debit
+            $obj = $db->fetch_object($result);
+            if (isset($obj->amount))
+            {
+                $subtotal_ht += -$obj->amount;
+                $subtotal_ttc += -$obj->amount;
+            }
+            print '<tr class="oddeven"><td>&nbsp;</td>';
+            print "<td>".$langs->trans("Debit")."</td>\n";
+	        if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
+            print '<td class="right">'.price(-$obj->amount)."</td>\n";
+            print "</tr>\n";
+
+            // Credit
+            $obj = $db->fetch_object($result);
+            if (isset($obj->amount))
+            {
+                $subtotal_ht += $obj->amount;
+                $subtotal_ttc += $obj->amount;
+            }
+            print '<tr class="oddeven"><td>&nbsp;</td>';
+            print "<td>".$langs->trans("Credit")."</td>\n";
+	        if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price($obj->amount).'</td>';
+            print '<td class="right">'.price($obj->amount)."</td>\n";
+            print "</tr>\n";
+
+            // Total
+            $total_ht += $subtotal_ht;
+            $total_ttc += $subtotal_ttc;
+            print '<tr class="liste_total">';
+            if ($modecompta == 'CREANCES-DETTES')
+                print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
+            print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
+            print '</tr>';
+
+        }
+        else dol_print_error($db);
+    }
+
+    /*
+     * Payement Loan
+     */
+
+    if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
+    {
+        $subtotal_ht = 0;
+        $subtotal_ttc = 0;
+
+        print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("PaymentLoan").'</td></tr>';
+
+        $sql = 'SELECT l.rowid as id, l.label AS label, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) as amount FROM '.MAIN_DB_PREFIX.'payment_loan as p';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'loan AS l ON l.rowid = p.fk_loan';
+        $sql .= ' WHERE 1 = 1';
+        if (!empty($date_start) && !empty($date_end))
+            $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+        $sql .= ' GROUP BY p.fk_loan';
+        $sql .= ' ORDER BY p.fk_loan';
+
+        dol_syslog('get loan payments', LOG_DEBUG);
+        $result = $db->query($sql);
+        if ($result)
+        {
+            require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
+            $loan_static = new Loan($db);
+            while ($obj = $db->fetch_object($result))
+            {
+                $loan_static->id = $obj->id;
+                $loan_static->ref = $obj->id;
+                $loan_static->label = $obj->label;
+                print '<tr class="oddeven"><td>&nbsp;</td>';
+                print "<td>".$loan_static->getNomUrl(1).' - '.$obj->label."</td>\n";
+                if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
+                print '<td class="right">'.price(-$obj->amount)."</td>\n";
+                print "</tr>\n";
+                $subtotal_ht -= $obj->amount;
+                $subtotal_ttc -= $obj->amount;
+            }
+
+            $total_ht += $subtotal_ht;
+            $total_ttc += $subtotal_ttc;
+            print '<tr class="liste_total">';
+            if ($modecompta == 'CREANCES-DETTES')
+                print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
+            print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
+            print '</tr>';
+        }
+        else dol_print_error($db);
+    }
+
 
 	/*
 	 * VAT
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index d462007d273..ed3befce56c 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2014       Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2014       Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2020       Maxime DEMAREST         <maxime@indelog.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
@@ -794,6 +795,117 @@ elseif ($modecompta == 'BOOKKEEPING') {
 	// Nothing from this table
 }
 
+/*
+ * Various Payments
+ */
+
+if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
+{
+
+    // decaiss
+
+    $sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various as p";
+    $sql .= ' WHERE p.sens = 0';
+    if (!empty($date_start) && !empty($date_end))
+        $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+    $sql .= ' GROUP BY dm';
+
+    dol_syslog("get various payments");
+    $result = $db->query($sql);
+    if ($result)
+    {
+    	$num = $db->num_rows($result);
+    	$i = 0;
+    	if ($num)
+    	{
+    		while ($i < $num)
+    		{
+    			$obj = $db->fetch_object($result);
+    			if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
+                if (isset($obj->amount)) $decaiss_ttc[$obj->dm] += $obj->amount;
+    			$i++;
+    		}
+    	}
+    }
+    else
+    {
+    	dol_print_error($db);
+    }
+
+    // encaiss
+
+    $sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various AS p";
+    $sql .= ' WHERE p.sens = 1';
+    if (!empty($date_start) && !empty($date_end))
+        $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+    $sql .= ' GROUP BY dm';
+
+    dol_syslog("get various payments");
+    $result = $db->query($sql);
+    if ($result)
+    {
+    	$num = $db->num_rows($result);
+    	$i = 0;
+    	if ($num)
+    	{
+    		while ($i < $num)
+    		{
+    			$obj = $db->fetch_object($result);
+    			if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
+                if (isset($obj->amount)) $encaiss_ttc[$obj->dm] += $obj->amount;
+    			$i++;
+    		}
+    	}
+    }
+    else
+    {
+    	dol_print_error($db);
+    }
+
+}
+elseif ($modecompta == 'BOOKKEEPING') {
+	// Useless with BOOKKEEPING
+}
+
+/*
+ * Payement Loan
+ */
+
+if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
+{
+
+    $sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) AS amount FROM ".MAIN_DB_PREFIX."payment_loan AS p";
+    $sql .= ' WHERE 1 = 1';
+    if (!empty($date_start) && !empty($date_end))
+        $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+    $sql .= ' GROUP BY dm';
+
+    dol_syslog("get loan payments");
+    $result = $db->query($sql);
+    if ($result)
+    {
+    	$num = $db->num_rows($result);
+    	$i = 0;
+    	if ($num)
+    	{
+    		while ($i < $num)
+    		{
+    			$obj = $db->fetch_object($result);
+    			if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
+                if (isset($obj->amount)) $decaiss_ttc[$obj->dm] += $obj->amount;
+    			$i++;
+    		}
+    	}
+    }
+    else
+    {
+    	dol_print_error($db);
+    }
+
+}
+elseif ($modecompta == 'BOOKKEEPING') {
+	// Not use with BOOKKEEPING
+}
 
 
 /*
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 6cd046c5607..8a8c837ac87 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -262,3 +262,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index c60c79513c5..d4c59754898 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -262,3 +262,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Inclure les payments divers dans les rapports
+IncludeLoansInResults = Inclure les emprunts dans les rapports

From bf8cd51a5aaf32db3dd66bf73c1021ce08f38f4b Mon Sep 17 00:00:00 2001
From: "DEMAREST Maxime (Indelog)" <maxime@indelog.fr>
Date: Wed, 6 May 2020 13:37:24 +0200
Subject: [PATCH 061/490] Fix somes code formating errors

---
 htdocs/compta/resultat/clientfourn.php |  8 ++------
 htdocs/compta/resultat/index.php       | 14 ++++++--------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 59b7999e4ef..27bc4526a3e 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -977,7 +977,6 @@ else
         $result = $db->query($sql);
         if ($result)
         {
-
             // Debit
             $obj = $db->fetch_object($result);
             if (isset($obj->amount))
@@ -987,7 +986,7 @@ else
             }
             print '<tr class="oddeven"><td>&nbsp;</td>';
             print "<td>".$langs->trans("Debit")."</td>\n";
-	        if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
+            if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
             print '<td class="right">'.price(-$obj->amount)."</td>\n";
             print "</tr>\n";
 
@@ -1000,7 +999,7 @@ else
             }
             print '<tr class="oddeven"><td>&nbsp;</td>';
             print "<td>".$langs->trans("Credit")."</td>\n";
-	        if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price($obj->amount).'</td>';
+            if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price($obj->amount).'</td>';
             print '<td class="right">'.price($obj->amount)."</td>\n";
             print "</tr>\n";
 
@@ -1012,7 +1011,6 @@ else
                 print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
             print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
             print '</tr>';
-
         }
         else dol_print_error($db);
     }
@@ -1055,7 +1053,6 @@ else
                 $subtotal_ht -= $obj->amount;
                 $subtotal_ttc -= $obj->amount;
             }
-
             $total_ht += $subtotal_ht;
             $total_ttc += $subtotal_ttc;
             print '<tr class="liste_total">';
@@ -1067,7 +1064,6 @@ else
         else dol_print_error($db);
     }
 
-
 	/*
 	 * VAT
 	 */
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index ed3befce56c..10d0f31fe72 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -801,7 +801,6 @@ elseif ($modecompta == 'BOOKKEEPING') {
 
 if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
 {
-
     // decaiss
 
     $sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various as p";
@@ -863,9 +862,9 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->ba
     }
 
 }
-elseif ($modecompta == 'BOOKKEEPING') {
-	// Useless with BOOKKEEPING
-}
+// Useless with BOOKKEEPING
+//elseif ($modecompta == 'BOOKKEEPING') {
+//}
 
 /*
  * Payement Loan
@@ -873,7 +872,6 @@ elseif ($modecompta == 'BOOKKEEPING') {
 
 if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
 {
-
     $sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) AS amount FROM ".MAIN_DB_PREFIX."payment_loan AS p";
     $sql .= ' WHERE 1 = 1';
     if (!empty($date_start) && !empty($date_end))
@@ -903,9 +901,9 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan
     }
 
 }
-elseif ($modecompta == 'BOOKKEEPING') {
-	// Not use with BOOKKEEPING
-}
+// Useless with BOOKKEEPING
+//elseif ($modecompta == 'BOOKKEEPING') {
+//}
 
 
 /*

From 7bf037ab2ff568e45096d86b5de1d64df7b0239c Mon Sep 17 00:00:00 2001
From: "DEMAREST Maxime (Indelog)" <maxime@indelog.fr>
Date: Wed, 6 May 2020 13:46:24 +0200
Subject: [PATCH 062/490] Fix blank line at end of control structure

---
 htdocs/compta/resultat/index.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 10d0f31fe72..ad81a3943c1 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -860,7 +860,6 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->ba
     {
     	dol_print_error($db);
     }
-
 }
 // Useless with BOOKKEEPING
 //elseif ($modecompta == 'BOOKKEEPING') {
@@ -899,7 +898,6 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan
     {
     	dol_print_error($db);
     }
-
 }
 // Useless with BOOKKEEPING
 //elseif ($modecompta == 'BOOKKEEPING') {

From 889e5db4fbbf8e081f9ab4f6fe34e581bd6477a2 Mon Sep 17 00:00:00 2001
From: "DEMAREST Maxime (Indelog)" <maxime@indelog.fr>
Date: Wed, 6 May 2020 13:55:38 +0200
Subject: [PATCH 063/490] Fix use Form::selectyesno() for added options in
 admin/compta.php

---
 htdocs/admin/compta.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index b3c66af76ca..3ccc2a213ac 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -177,20 +177,14 @@ foreach ($list as $key)
 print '<tr class="oddeven value">'."\n";
 print '<td><label for="ACCOUNTING_REPORTS_INCLUDE_VARPAY">'.$langs->trans('IncludeVarpaysInResults').'</label></td>'."\n";
 print '<td class="center">'."\n";
-print '<select id="ACCOUNTING_REPORTS_INCLUDE_VARPAY" name="ACCOUNTING_REPORTS_INCLUDE_VARPAY">'."\n";
-print '<option value="no" '.(empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY)?'selected':'').'>'.$langs->trans('No').'</option>'."\n";
-print '<option value="yes" '.(!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY)?'selected':'').'>'.$langs->trans('Yes').'</option>'."\n";
-print '</select>'."\n";
+print $form->selectyesno('ACCOUNTING_REPORTS_INCLUDE_VARPAY', (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY)));
 print '</td></tr>';
 
 // Option to include loan in results
 print '<tr class="oddeven value">'."\n";
 print '<td><label for="ACCOUNTING_REPORTS_INCLUDE_LOAN">'.$langs->trans('IncludeLoansInResults').'</label></td>'."\n";
 print '<td class="center">'."\n";
-print '<select id="ACCOUNTING_REPORTS_INCLUDE_LOAN" name="ACCOUNTING_REPORTS_INCLUDE_LOAN">'."\n";
-print '<option value="no" '.(empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN)?'selected':'').'>'.$langs->trans('No').'</option>'."\n";
-print '<option value="yes" '.(!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN)?'selected':'').'>'.$langs->trans('Yes').'</option>'."\n";
-print '</select>'."\n";
+print $form->selectyesno('ACCOUNTING_REPORTS_INCLUDE_LOAN', (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN)));
 print '</td></tr>';
 
 print "</table>\n";

From 3dbe9a4af1d18cdf3a9c8404b25d1209d94d07d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 May 2020 13:59:15 +0200
Subject: [PATCH 064/490] Fix label

---
 htdocs/product/admin/stock_extrafields.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/admin/stock_extrafields.php b/htdocs/product/admin/stock_extrafields.php
index 0e8f7289b77..22ad53cd0e8 100644
--- a/htdocs/product/admin/stock_extrafields.php
+++ b/htdocs/product/admin/stock_extrafields.php
@@ -68,7 +68,7 @@ print load_fiche_titre($langs->trans("StockSetup"), $linkback, 'title_setup');
 
 $head = stock_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Warehouses"), -1, 'stock');
+dol_fiche_head($head, 'attributes', $langs->trans("StockSetup"), -1, 'stock');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 

From bfd4ebd49d40942d8cf8bfa2a2cbd2ff6f5f125e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 May 2020 14:28:24 +0200
Subject: [PATCH 065/490] FIX Changing password message not visible if a
 background is set

---
 htdocs/user/passwordforgotten.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 461ab8e7b4a..0afa158ec58 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -133,7 +133,7 @@ if ($action == 'buildnewpassword' && $username)
                     // Success
                     if ($edituser->send_password($edituser, $newpassword, 1) > 0)
                     {
-                        $message = '<div class="ok">'.$langs->trans("PasswordChangeRequestSent", $edituser->login, dolObfuscateEmail($edituser->email)).'</div>';
+                    	$message = '<div class="ok'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">'.$langs->trans("PasswordChangeRequestSent", $edituser->login, dolObfuscateEmail($edituser->email)).'</div>';
                         $username = '';
                     }
                     else

From e7ae9c752ea54a59d0ae9406d1043d4d0afb6cf5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 May 2020 14:48:02 +0200
Subject: [PATCH 066/490] Fix missing trackid

---
 htdocs/user/class/user.class.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 23d42ba3e65..09f78a7d044 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1972,12 +1972,12 @@ class User extends CommonObject
 	/**
 	 *  Send new password by email
 	 *
-	 *  @param	User	$user           Object user that send email
+	 *  @param	User	$fuser           Object user that send email
 	 *  @param	string	$password       New password
 	 *	@param	int		$changelater	0=Send clear passwod into email, 1=Change password only after clicking on confirm email. @todo Add method 2 = Send link to reset password
 	 *  @return int 		            < 0 si erreur, > 0 si ok
 	 */
-	public function send_password($user, $password = '', $changelater = 0)
+	public function send_password($fuser, $password = '', $changelater = 0)
 	{
         // phpcs:enable
 		global $conf, $langs;
@@ -1997,8 +1997,8 @@ class User extends CommonObject
 		{	// If user has defined its own language (rare because in most cases, auto is used)
 			$outputlangs->getDefaultLang($this->conf->MAIN_LANG_DEFAULT);
 		}
-		if ($user->conf->MAIN_LANG_DEFAULT) {
-            $outputlangs->setDefaultLang($user->conf->MAIN_LANG_DEFAULT);
+		if ($fuser->conf->MAIN_LANG_DEFAULT) {
+            $outputlangs->setDefaultLang($fuser->conf->MAIN_LANG_DEFAULT);
         }
 		else
 		{	// If user has not defined its own language, we used current language
@@ -2028,7 +2028,7 @@ class User extends CommonObject
 
 			$mesg .= $outputlangs->transnoentitiesnoconv("ClickHereToGoTo", $appli).': '.$url."\n\n";
 			$mesg .= "--\n";
-			$mesg .= $user->getFullName($outputlangs); // Username that make then sending
+			$mesg .= $fuser->getFullName($outputlangs); // Username that make then sending
 
 			dol_syslog(get_class($this)."::send_password changelater is off, url=".$url);
 		}
@@ -2048,6 +2048,8 @@ class User extends CommonObject
 			dol_syslog(get_class($this)."::send_password changelater is on, url=".$url);
 		}
 
+		$trackid = 'use'.$fuser->id;
+
         $mailfile = new CMailFile(
             $subject,
 			$this->email,
@@ -2059,7 +2061,10 @@ class User extends CommonObject
 			'',
 			'',
 			0,
-            $msgishtml
+            $msgishtml,
+        	'',
+        	'',
+        	$trackid
         );
 
 		if ($mailfile->sendfile())

From abdb0cc8c025359c8eb05cc705cd36820bbd46e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 May 2020 15:03:57 +0200
Subject: [PATCH 067/490] Fix use correct trackid

---
 htdocs/user/class/user.class.php  | 13 +++++++------
 htdocs/user/passwordforgotten.php |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 09f78a7d044..e20c1ca527b 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1972,12 +1972,12 @@ class User extends CommonObject
 	/**
 	 *  Send new password by email
 	 *
-	 *  @param	User	$fuser           Object user that send email
+	 *  @param	User	$user           Object user that send the email (not the user we send too)
 	 *  @param	string	$password       New password
 	 *	@param	int		$changelater	0=Send clear passwod into email, 1=Change password only after clicking on confirm email. @todo Add method 2 = Send link to reset password
 	 *  @return int 		            < 0 si erreur, > 0 si ok
 	 */
-	public function send_password($fuser, $password = '', $changelater = 0)
+	public function send_password($user, $password = '', $changelater = 0)
 	{
         // phpcs:enable
 		global $conf, $langs;
@@ -1997,8 +1997,9 @@ class User extends CommonObject
 		{	// If user has defined its own language (rare because in most cases, auto is used)
 			$outputlangs->getDefaultLang($this->conf->MAIN_LANG_DEFAULT);
 		}
-		if ($fuser->conf->MAIN_LANG_DEFAULT) {
-            $outputlangs->setDefaultLang($fuser->conf->MAIN_LANG_DEFAULT);
+
+		if ($this->conf->MAIN_LANG_DEFAULT) {
+            $outputlangs->setDefaultLang($this->conf->MAIN_LANG_DEFAULT);
         }
 		else
 		{	// If user has not defined its own language, we used current language
@@ -2028,7 +2029,7 @@ class User extends CommonObject
 
 			$mesg .= $outputlangs->transnoentitiesnoconv("ClickHereToGoTo", $appli).': '.$url."\n\n";
 			$mesg .= "--\n";
-			$mesg .= $fuser->getFullName($outputlangs); // Username that make then sending
+			$mesg .= $user->getFullName($outputlangs); // Username that send email
 
 			dol_syslog(get_class($this)."::send_password changelater is off, url=".$url);
 		}
@@ -2048,7 +2049,7 @@ class User extends CommonObject
 			dol_syslog(get_class($this)."::send_password changelater is on, url=".$url);
 		}
 
-		$trackid = 'use'.$fuser->id;
+		$trackid = 'use'.$this->id;
 
         $mailfile = new CMailFile(
             $subject,
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 0afa158ec58..81e6779b80b 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -131,7 +131,7 @@ if ($action == 'buildnewpassword' && $username)
                 else
                 {
                     // Success
-                    if ($edituser->send_password($edituser, $newpassword, 1) > 0)
+                    if ($edituser->send_password($user, $newpassword, 1) > 0)
                     {
                     	$message = '<div class="ok'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">'.$langs->trans("PasswordChangeRequestSent", $edituser->login, dolObfuscateEmail($edituser->email)).'</div>';
                         $username = '';

From 1ec8b31e46e7ef1d1036f08b4814170ed501618c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 May 2020 15:15:12 +0200
Subject: [PATCH 068/490] Fix remove action param in url to allow a second try
 without the error message

---
 htdocs/core/tpl/passwordforgotten.tpl.php | 1 +
 htdocs/user/class/user.class.php          | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index ab12b48aa08..63ff6a8a0a7 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -40,6 +40,7 @@ if (!empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax = 1;
 
 $php_self = $_SERVER['PHP_SELF'];
 $php_self .= dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '';
+$php_self = str_replace('action=validatenewpassword', '', $php_self);
 
 $titleofpage = $langs->trans('SendNewPassword');
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index e20c1ca527b..11d0cec3654 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1838,7 +1838,7 @@ class User extends CommonObject
 	/**
 	 *  Change password of a user
 	 *
-	 *  @param	User	$user             		Object user of user making change
+	 *  @param	User	$user             		Object user of user requesting the change (not the user for who we change the password). May be unknown.
 	 *  @param  string	$password         		New password in clear text (to generate if not provided)
 	 *	@param	int		$changelater			1=Change password only after clicking on confirm email
 	 *	@param	int		$notrigger				1=Does not launch triggers
@@ -2029,7 +2029,7 @@ class User extends CommonObject
 
 			$mesg .= $outputlangs->transnoentitiesnoconv("ClickHereToGoTo", $appli).': '.$url."\n\n";
 			$mesg .= "--\n";
-			$mesg .= $user->getFullName($outputlangs); // Username that send email
+			$mesg .= $user->getFullName($outputlangs); // Username that send the email (not the user for who we want to reset password)
 
 			dol_syslog(get_class($this)."::send_password changelater is off, url=".$url);
 		}

From 485896614b4e1cb831b8fcbd84e6e1ce56737bb0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 May 2020 15:30:00 +0200
Subject: [PATCH 069/490] Add message during password reset

---
 htdocs/langs/en_US/users.lang     | 1 +
 htdocs/user/passwordforgotten.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index aea4e7676e4..9b75a2ff37e 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Created user will be an external user (because linked to
 IdPhoneCaller=Id phone caller
 NewUserCreated=User %s created
 NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login. 
 EventUserModified=User %s modified
 UserDisabled=User %s disabled
 UserEnabled=User %s activated
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 81e6779b80b..f8c035779d2 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -77,7 +77,8 @@ if ($action == 'validatenewpassword' && $username && $passwordhash)
     {
         if (dol_verifyHash($edituser->pass_temp, $passwordhash))
         {
-            $newpassword = $edituser->setPassword($user, $edituser->pass_temp, 0);
+            setEventMessages('NewPasswordValidated', null, 'mesgs');
+        	$newpassword = $edituser->setPassword($user, $edituser->pass_temp, 0);
             dol_syslog("passwordforgotten.php new password for user->id=".$edituser->id." validated in database");
             header("Location: ".DOL_URL_ROOT.'/');
             exit;

From 5e6b7fb6b4cb598e5ff1980d2a20b43cf7f01c3c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 May 2020 15:36:14 +0200
Subject: [PATCH 070/490] Show message after pass reset

---
 htdocs/user/passwordforgotten.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index f8c035779d2..7f8ad45a06d 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -77,7 +77,10 @@ if ($action == 'validatenewpassword' && $username && $passwordhash)
     {
         if (dol_verifyHash($edituser->pass_temp, $passwordhash))
         {
-            setEventMessages('NewPasswordValidated', null, 'mesgs');
+        	// Clear session
+        	$_SESSION['dol_login'] = '';
+        	$_SESSION['dol_loginmesg'] = $langs->trans('NewPasswordValidated');	// Save message for the session page
+
         	$newpassword = $edituser->setPassword($user, $edituser->pass_temp, 0);
             dol_syslog("passwordforgotten.php new password for user->id=".$edituser->id." validated in database");
             header("Location: ".DOL_URL_ROOT.'/');

From 4c04ace9d8305da6e4bdca000ae8d333f2ba5217 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 May 2020 15:39:07 +0200
Subject: [PATCH 071/490] fix reset of session

---
 htdocs/user/passwordforgotten.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 7f8ad45a06d..b0f3a5aab6c 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -78,7 +78,7 @@ if ($action == 'validatenewpassword' && $username && $passwordhash)
         if (dol_verifyHash($edituser->pass_temp, $passwordhash))
         {
         	// Clear session
-        	$_SESSION['dol_login'] = '';
+        	unset($_SESSION['dol_login']);
         	$_SESSION['dol_loginmesg'] = $langs->trans('NewPasswordValidated');	// Save message for the session page
 
         	$newpassword = $edituser->setPassword($user, $edituser->pass_temp, 0);

From b3a064d309e2533c911bbf45f246f98309a1e2b8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 May 2020 16:02:34 +0200
Subject: [PATCH 072/490] Fix dup

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a7d0282fba5..bcbfb1a959c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,6 @@ English Dolibarr ChangeLog
 
 ***** ChangeLog for 11.0.4 compared to 11.0.3 *****
 FIX: #13749
-FIX: #7594
 FIX: #7594 Expense report multi pagebreak
 FIX: Access to undeclared static property: Contact::$table_element
 FIX: actions on supplier proposal not saved (bad trigger name)

From 326dc7d36743779fde215dc23a63ea03796dcf1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 6 May 2020 17:59:40 +0200
Subject: [PATCH 073/490] fix html

file:///home/fred/Images/S%C3%A9lection_078.png
---
 htdocs/bookmarks/bookmarks.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 46e9ca315a5..93283cab815 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -60,7 +60,7 @@ function printDropdownBookmarksList()
     }
 
     $searchForm = '<!-- form with POST method by default, will be replaced with GET for external link by js -->'."\n";
-    $searchForm .= '<form id="top-menu-action-bookmark" name="actionbookmark" method="POST" action=""'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? 'onsubmit="return false"' : '').'>';
+    $searchForm .= '<form id="top-menu-action-bookmark" name="actionbookmark" method="POST" action=""'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' onsubmit="return false"' : '').'>';
     $searchForm .= '<input type="hidden" name="token" value="'.newToken().'">';
 
 

From 91dcf103757d4c8d5898af031bed620b7c186c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 6 May 2020 23:56:02 +0200
Subject: [PATCH 074/490] session_cache_limiter before starting session

---
 htdocs/modulebuilder/template/css/mymodule.css.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/modulebuilder/template/css/mymodule.css.php b/htdocs/modulebuilder/template/css/mymodule.css.php
index a7ce9fce677..af1566c0869 100644
--- a/htdocs/modulebuilder/template/css/mymodule.css.php
+++ b/htdocs/modulebuilder/template/css/mymodule.css.php
@@ -32,6 +32,11 @@ if (!defined('NOLOGIN'))         define('NOLOGIN', 1); // File must be accessed
 if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
 if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
 
+session_cache_limiter('public');
+// false or '' = keep cache instruction added by server
+// 'public'  = remove cache instruction added by server
+// and if no cache-control added later, a default cache delay (10800) will be added by PHP.
+
 // Load Dolibarr environment
 $res = 0;
 // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
@@ -48,10 +53,6 @@ if (!$res) die("Include of main fails");
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-session_cache_limiter('public');
-// false or '' = keep cache instruction added by server
-// 'public'  = remove cache instruction added by server and if no cache-control added later, a default cache delay (10800) will be added by PHP.
-
 // Load user to have $user->conf loaded (not done by default here because of NOLOGIN constant defined) and load permission if we need to use them in CSS
 /*if (empty($user->id) && ! empty($_SESSION['dol_login']))
 {

From d4400cf80fce889f4836338ca40a8bff0080ee2e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 May 2020 11:39:32 +0200
Subject: [PATCH 075/490] FIX links into emails of notifications

---
 htdocs/core/class/notify.class.php | 56 ++++++++++++++----------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 6c0ec1ec62b..8a03196beef 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -416,34 +416,34 @@ class Notify
 
 						switch ($notifcode) {
 							case 'BILL_VALIDATE':
-								$link='/compta/facture/card.php?facid='.$object->id;
+								$link = '<a href="' . $urlwithroot . '/compta/facture/card.php?facid=' . $object->id . '">' . $newref . '</a>';
 								$dir_output = $conf->facture->dir_output;
 								$object_type = 'facture';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoiceValidated", $newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoiceValidated", $link);
 								break;
 							case 'BILL_PAYED':
-								$link='/compta/facture/card.php?facid='.$object->id;
+								$link ='<a href="' . $urlwithroot . '/compta/facture/card.php?facid='.$object->id . '">' . $newref . '</a>';
 								$dir_output = $conf->facture->dir_output;
 								$object_type = 'facture';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoicePayed", $newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoicePayed", $link);
 								break;
 							case 'ORDER_VALIDATE':
-								$link='/commande/card.php?id='.$object->id;
+								$link = '<a href="' . $urlwithroot . '/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
 								$dir_output = $conf->commande->dir_output;
 								$object_type = 'order';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextOrderValidated", $newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextOrderValidated", $link);
 								break;
 							case 'PROPAL_VALIDATE':
-								$link='/comm/propal/card.php?id='.$object->id;
+								$link = '<a href="' . $urlwithroot . '/comm/propal/card.php?id='.$object->id . '">' . $newref . '</a>';
 								$dir_output = $conf->propal->multidir_output[$object->entity];
 								$object_type = 'propal';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextProposalValidated", $newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextProposalValidated", $link);
 								break;
 							case 'PROPAL_CLOSE_SIGNED':
-								$link='/comm/propal/card.php?id='.$object->id;
+								$link = '<a href="' . $urlwithroot . '/comm/propal/card.php?id='.$object->id . '">' . $newref . '</a>';
 								$dir_output = $conf->propal->multidir_output[$object->entity];
 								$object_type = 'propal';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextProposalClosedSigned", $newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextProposalClosedSigned", $link);
 								break;
 							case 'FICHINTER_ADD_CONTACT':
 								$link='/fichinter/card.php?id='.$object->id;
@@ -452,17 +452,17 @@ class Notify
 								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInterventionAddedContact", $newref);
 								break;
 							case 'FICHINTER_VALIDATE':
-								$link='/fichinter/card.php?id='.$object->id;
+								$link = '<a href="' . $urlwithroot . '/fichinter/card.php?id='.$object->id . '">' . $newref . '</a>';
 								$dir_output = $conf->ficheinter->dir_output;
 								$object_type = 'ficheinter';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInterventionValidated", $newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInterventionValidated", $link);
 								break;
 							case 'ORDER_SUPPLIER_VALIDATE':
 								$link='/fourn/commande/card.php?id='.$object->id;
 								$dir_output = $conf->fournisseur->commande->dir_output;
 								$object_type = 'order_supplier';
 								$mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";
-								$mesg.= $outputlangs->transnoentitiesnoconv("EMailTextOrderValidatedBy", $newref, $user->getFullName($outputlangs));
+								$mesg.= $outputlangs->transnoentitiesnoconv("EMailTextOrderValidatedBy", $link, $user->getFullName($outputlangs));
 								$mesg.= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
 								break;
 							case 'ORDER_SUPPLIER_APPROVE':
@@ -470,46 +470,46 @@ class Notify
 								$dir_output = $conf->fournisseur->commande->dir_output;
 								$object_type = 'order_supplier';
 								$mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";
-								$mesg.= $outputlangs->transnoentitiesnoconv("EMailTextOrderApprovedBy", $newref, $user->getFullName($outputlangs));
+								$mesg.= $outputlangs->transnoentitiesnoconv("EMailTextOrderApprovedBy", $link, $user->getFullName($outputlangs));
 								$mesg.= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
 								break;
 							case 'ORDER_SUPPLIER_REFUSE':
-								$link='/fourn/commande/card.php?id='.$object->id;
+								$link = '<a href="' . $urlwithroot . '/fourn/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
 								$dir_output = $conf->fournisseur->commande->dir_output;
 								$object_type = 'order_supplier';
 								$mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";
-								$mesg.= $outputlangs->transnoentitiesnoconv("EMailTextOrderRefusedBy", $newref, $user->getFullName($outputlangs));
+								$mesg.= $outputlangs->transnoentitiesnoconv("EMailTextOrderRefusedBy", $link, $user->getFullName($outputlangs));
 								$mesg.= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
 								break;
 							case 'SHIPPING_VALIDATE':
 								$link = '<a href="'.$urlwithroot.'/expedition/card.php?id='.$object->id.'">'.$newref.'</a>';
 								$dir_output = $conf->expedition->dir_output.'/sending/';
 								$object_type = 'expedition';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextExpeditionValidated", $newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextExpeditionValidated", $link);
 								break;
 							case 'EXPENSE_REPORT_VALIDATE':
 								$link = '<a href="'.$urlwithroot.'/expensereport/card.php?id='.$object->id.'">'.$newref.'</a>';
 								$dir_output = $conf->expensereport->dir_output;
 								$object_type = 'expensereport';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextExpenseReportValidated", $newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextExpenseReportValidated", $link);
 								break;
 							case 'EXPENSE_REPORT_APPROVE':
 								$link = '<a href="'.$urlwithroot.'/expensereport/card.php?id='.$object->id.'">'.$newref.'</a>';
 								$dir_output = $conf->expensereport->dir_output;
 								$object_type = 'expensereport';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextExpenseReportApproved", $newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextExpenseReportApproved", $link);
 								break;
 							case 'HOLIDAY_VALIDATE':
 								$link = '<a href="'.$urlwithroot.'/holiday/card.php?id='.$object->id.'">'.$newref.'</a>';
 								$dir_output = $conf->holiday->dir_output;
 								$object_type = 'holiday';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayValidated", $newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayValidated", $link);
 								break;
 							case 'HOLIDAY_APPROVE':
 								$link = '<a href="'.$urlwithroot.'/holiday/card.php?id='.$object->id.'">'.$newref.'</a>';
 								$dir_output = $conf->holiday->dir_output;
 								$object_type = 'holiday';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayApproved", $newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayApproved", $link);
 								break;
 						}
 						$ref = dol_sanitizeFileName($newref);
@@ -528,7 +528,6 @@ class Notify
 						$message.= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2", $application, $mysoc->name)."\n";
 						$message.= "\n";
 						$message.= $mesg;
-						if ($link) $message.= "\n" . $urlwithroot . $link;	// if link is already added around the ref into the translation text, then $link must be set to ''
 
 						$parameters = array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list);
 						if (!isset($action)) $action = '';
@@ -655,7 +654,7 @@ class Notify
 						break;
 					case 'FICHINTER_ADD_CONTACT':
 						$link = '<a href="' . $urlwithroot . '/fichinter/card.php?id='.$object->id . '">' . $newref . '</a>';
-						$dir_output = $conf->facture->dir_output;
+						$dir_output = $conf->ficheinter->dir_output;
 						$object_type = 'ficheinter';
 						$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionAddedContact", $link);
 						break;
@@ -701,31 +700,31 @@ class Notify
 						$link = '<a href="'.$urlwithroot.'/expedition/card.php?id='.$object->id.'">'.$newref.'</a>';
 						$dir_output = $conf->expedition->dir_output.'/sending/';
 						$object_type = 'order_supplier';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated", $newref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated", $link);
 						break;
 					case 'EXPENSE_REPORT_VALIDATE':
 						$link = '<a href="'.$urlwithroot.'/expensereport/card.php?id='.$object->id.'">'.$newref.'</a>';
 						$dir_output = $conf->expensereport->dir_output;
 						$object_type = 'expensereport';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextExpenseReportValidated", $newref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextExpenseReportValidated", $link);
 						break;
 					case 'EXPENSE_REPORT_APPROVE':
 						$link = '<a href="'.$urlwithroot.'/expensereport/card.php?id='.$object->id.'">'.$newref.'</a>';
 						$dir_output = $conf->expensereport->dir_output;
 						$object_type = 'expensereport';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextExpenseReportApproved", $newref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextExpenseReportApproved", $link);
 						break;
 					case 'HOLIDAY_VALIDATE':
 						$link = '<a href="'.$urlwithroot.'/holiday/card.php?id='.$object->id.'">'.$newref.'</a>';
 						$dir_output = $conf->holiday->dir_output;
 						$object_type = 'holiday';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextHolidayValidated", $newref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextHolidayValidated", $link);
 						break;
 					case 'HOLIDAY_APPROVE':
 						$link = '<a href="'.$urlwithroot.'/holiday/card.php?id='.$object->id.'">'.$newref.'</a>';
 						$dir_output = $conf->holiday->dir_output;
 						$object_type = 'holiday';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextHolidayApproved", $newref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextHolidayApproved", $link);
 						break;
 				}
 				$ref = dol_sanitizeFileName($newref);
@@ -744,7 +743,6 @@ class Notify
 				$message.= $langs->transnoentities("YouReceiveMailBecauseOfNotification2", $application, $mysoc->name)."\n";
 				$message.= "\n";
 				$message.= $mesg;
-				if ($link) $message.= "\n" . $urlwithroot . $link;	// if link is already added around the ref into the translation text, then $link must be set to ''
 
 				$message = nl2br($message);
 

From 03fddd48af55363089ad6082be122d407922ced5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 May 2020 12:14:45 +0200
Subject: [PATCH 076/490] Clean some constructors

---
 htdocs/compta/prelevement/bons.php                     |  2 +-
 htdocs/compta/prelevement/card.php                     |  4 ++--
 .../compta/prelevement/class/bonprelevement.class.php  | 10 ++++------
 .../prelevement/class/ligneprelevement.class.php       |  4 +---
 .../prelevement/class/rejetprelevement.class.php       |  3 ++-
 htdocs/compta/prelevement/factures.php                 |  2 +-
 htdocs/compta/prelevement/fiche-rejet.php              |  2 +-
 htdocs/compta/prelevement/fiche-stat.php               |  4 ++--
 htdocs/compta/prelevement/line.php                     |  4 ++--
 htdocs/compta/prelevement/list.php                     |  4 ++--
 htdocs/compta/prelevement/rejets.php                   |  2 +-
 htdocs/compta/prelevement/stats.php                    |  2 +-
 12 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 7f0bd46c450..c7c717e702b 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -54,7 +54,7 @@ $statut = GETPOST('statut', 'int');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 
-$bon = new BonPrelevement($db, "");
+$bon = new BonPrelevement($db);
 $hookmanager->initHooks(array('withdrawalsreceiptslist'));
 
 
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 68f40999aa7..4dcd9f33388 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -58,7 +58,7 @@ $pagenext = $page + 1;
 if (!$sortfield) $sortfield = 'pl.fk_soc';
 if (!$sortorder) $sortorder = 'DESC';
 
-$object = new BonPrelevement($db, "");
+$object = new BonPrelevement($db);
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
@@ -321,7 +321,7 @@ if ($id > 0 || $ref)
 	}
 
 
-	$ligne = new LignePrelevement($db, $user);
+	$ligne = new LignePrelevement($db);
 
 	/*
 	 * Lines into withdraw request
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 0a033e2df53..0c21a3e6d2b 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -83,18 +83,16 @@ class BonPrelevement extends CommonObject
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      	Database handler
-	 *  @param		string		$filename	Filename of withdraw receipt
 	 */
-	public function __construct($db, $filename = '')
+	public function __construct($db)
 	{
 		global $conf, $langs;
 
-		$error = 0;
 		$this->db = $db;
 
-		$this->filename = $filename;
+		$this->filename = '';
 
-		$this->date_echeance = time();
+		$this->date_echeance = dol_now();
 		$this->raison_sociale = "";
 		$this->reference_remise = "";
 
@@ -892,7 +890,7 @@ class BonPrelevement extends CommonObject
 							if ($bac->verif() >= 1)
 							{
 								$factures_prev[$i] = $fac;
-								/* second tableau necessaire pour BonPrelevement */
+								/* second array necessary for BonPrelevement */
 								$factures_prev_id[$i] = $fac[0];
 								$i++;
 								//dol_syslog(__METHOD__."::RIB is ok", LOG_DEBUG);
diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php
index dd24ad9522c..88b612554df 100644
--- a/htdocs/compta/prelevement/class/ligneprelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php
@@ -48,14 +48,12 @@ class LignePrelevement
 	 *  Constructor
 	 *
 	 *  @param	DoliDb	$db			Database handler
-	 *  @param 	User	$user       Objet user
 	 */
-	public function __construct($db, $user)
+	public function __construct($db)
 	{
 		global $conf, $langs;
 
 		$this->db = $db;
-		$this->user = $user;
 
 		// List of language codes for status
 
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index 74626baed13..8c033353637 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -247,6 +247,7 @@ class RejetPrelevement
 			$sendto = $emuser->getFullName($langs)." <".$emuser->email.">";
 			$from = $this->user->getFullName($langs)." <".$this->user->email.">";
 			$msgishtml = 1;
+			$trackid = 'use'.$emuser->id;
 
 			$arr_file = array();
 			$arr_mime = array();
@@ -258,7 +259,7 @@ class RejetPrelevement
 
 			$message = $langs->trans("InfoRejectMessage", $facref, $socname, $amount, $userinfo);
 
-			$mailfile = new CMailFile($subject, $sendto, $from, $message, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $this->user->email);
+			$mailfile = new CMailFile($subject, $sendto, $from, $message, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $this->user->email, '', $trackid);
 
 			$result = $mailfile->sendfile();
 			if ($result)
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index ec004717946..fb0a5548426 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -53,7 +53,7 @@ $pagenext = $page + 1;
 if (!$sortfield) $sortfield = 'p.ref';
 if (!$sortorder) $sortorder = 'DESC';
 
-$object = new BonPrelevement($db, "");
+$object = new BonPrelevement($db);
 
 
 
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 44be3d1cd01..1cc454a3d4d 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -51,7 +51,7 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-$object = new BonPrelevement($db, "");
+$object = new BonPrelevement($db);
 
 
 
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 6e8e8390ae8..18028e2059a 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -50,7 +50,7 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 
-$object = new BonPrelevement($db, "");
+$object = new BonPrelevement($db);
 
 
 /*
@@ -142,7 +142,7 @@ if ($prev_id > 0 || $ref)
 	/*
 	 * Stats
 	 */
-	$ligne = new LignePrelevement($db, $user);
+	$ligne = new LignePrelevement($db);
 
 	$sql = "SELECT sum(pl.amount), pl.statut";
 	$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index 6eef29d1e3e..29bb5c435e3 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -90,7 +90,7 @@ if ($action == 'confirm_rejet')
 
 		if (!$error)
 		{
-			$lipre = new LignePrelevement($db, $user);
+			$lipre = new LignePrelevement($db);
 
 			if ($lipre->fetch($id) == 0)
 
@@ -132,7 +132,7 @@ $h++;
 
 if ($id)
 {
-	$lipre = new LignePrelevement($db, $user);
+	$lipre = new LignePrelevement($db);
 
 	if ($lipre->fetch($id) == 0)
 	{
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index bebb838652d..48f9bcc7c54 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -64,8 +64,8 @@ $search_code = GETPOST('search_code', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
 $statut = GETPOST('statut', 'int');
 
-$bon = new BonPrelevement($db, "");
-$line = new LignePrelevement($db, $user);
+$bon = new BonPrelevement($db);
+$line = new LignePrelevement($db);
 $company = new Societe($db);
 
 $hookmanager->initHooks(array('withdrawalsreceiptslineslist'));
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 928aaba51b1..6d1994b7a4b 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -57,7 +57,7 @@ if ($sortorder == "") $sortorder = "DESC";
 if ($sortfield == "") $sortfield = "p.datec";
 
 $rej = new RejetPrelevement($db, $user);
-$line = new LignePrelevement($db, $user);
+$line = new LignePrelevement($db);
 
 $hookmanager->initHooks(array('withdrawalsreceiptsrejectedlist'));
 
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index c19603df967..c6d1962ff46 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -73,7 +73,7 @@ if ($resql)
 print '<br>';
 print load_fiche_titre($langs->trans("WithdrawStatistics"), '', '');
 
-$ligne = new LignePrelevement($db, $user);
+$ligne = new LignePrelevement($db);
 
 $sql = "SELECT sum(pl.amount), count(pl.amount), pl.statut";
 $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";

From ad489ab1b409b11f2e39552d63e2fb6cff603115 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Thu, 7 May 2020 12:22:13 +0200
Subject: [PATCH 077/490] NEW show messages on ticket card

---
 htdocs/ticket/card.php | 919 +++++++++++++++++++++--------------------
 1 file changed, 479 insertions(+), 440 deletions(-)

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index b9459a0e161..3d37c46eb90 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -55,6 +55,17 @@ $action    = GETPOST('action', 'aZ09');
 
 $notifyTiers = GETPOST("notify_tiers_at_create", 'alpha');
 
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+
+if (GETPOST('actioncode', 'array')) {
+    $actioncode = GETPOST('actioncode', 'array', 3);
+    if (!count($actioncode)) $actioncode = '0';
+} else {
+    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+}
+$search_agenda_label = GETPOST('search_agenda_label');
+
 // Initialize technical object to manage hooks of ticket. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('ticketcard', 'globalcard'));
 
@@ -116,493 +127,486 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if ($cancel)
-{
-	if (!empty($backtopage))
+if (empty($reshook)) {
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers{
 	{
-		header("Location: ".$backtopage);
-		exit;
-	}
-	$action = 'view';
-}
-
-if (GETPOST('add', 'alpha') && $user->rights->ticket->write) {
-	$error = 0;
-
-	if (!GETPOST("subject", 'alpha')) {
-		$error++;
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject")), null, 'errors');
-		$action = 'create';
-	} elseif (!GETPOST("message", 'alpha')) {
-		$error++;
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Message")), null, 'errors');
-		$action = 'create';
+		$actioncode = '';
+		$search_agenda_label = '';
 	}
 
-	if (!$error) {
-		$db->begin();
+	if ($cancel) {
+		if (!empty($backtopage)) {
+			header("Location: " . $backtopage);
+			exit;
+		}
+		$action = 'view';
+	}
 
-		$object->ref = GETPOST("ref", 'alpha');
-		$object->fk_soc = GETPOST("socid", 'int') > 0 ? GETPOST("socid", 'int') : 0;
-		$object->subject = GETPOST("subject", 'alpha');
-		$object->message = GETPOST("message", 'none');
+	if (GETPOST('add', 'alpha') && $user->rights->ticket->write) {
+		$error = 0;
 
-		$object->type_code = GETPOST("type_code", 'alpha');
-		$object->category_code = GETPOST("category_code", 'alpha');
-		$object->severity_code = GETPOST("severity_code", 'alpha');
-		$notifyTiers = GETPOST("notify_tiers_at_create", 'alpha');
-		$object->notify_tiers_at_create = empty($notifyTiers) ? 0 : 1;
-
-		$object->fk_project = GETPOST('projectid', 'int');
-
-		$ret = $extrafields->setOptionalsFromPost(null, $object);
-
-		$id = $object->create($user);
-		if ($id <= 0) {
+		if (!GETPOST("subject", 'alpha')) {
 			$error++;
-			setEventMessage($object->error, $object->errors, 'errors');
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject")), null, 'errors');
+			$action = 'create';
+		} elseif (!GETPOST("message", 'alpha')) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Message")), null, 'errors');
 			$action = 'create';
 		}
 
-		if (!$error)
-		{
-			// Add contact
-			$contactid = GETPOST('contactid', 'int');
-			$type_contact = GETPOST("type", 'alpha');
+		if (!$error) {
+			$db->begin();
 
-			if ($contactid > 0 && $type_contact) {
-				$result = $object->add_contact($contactid, GETPOST("type"), 'external');
+			$object->ref = GETPOST("ref", 'alpha');
+			$object->fk_soc = GETPOST("socid", 'int') > 0 ? GETPOST("socid", 'int') : 0;
+			$object->subject = GETPOST("subject", 'alpha');
+			$object->message = GETPOST("message", 'none');
+
+			$object->type_code = GETPOST("type_code", 'alpha');
+			$object->category_code = GETPOST("category_code", 'alpha');
+			$object->severity_code = GETPOST("severity_code", 'alpha');
+			$notifyTiers = GETPOST("notify_tiers_at_create", 'alpha');
+			$object->notify_tiers_at_create = empty($notifyTiers) ? 0 : 1;
+
+			$object->fk_project = GETPOST('projectid', 'int');
+
+			$ret = $extrafields->setOptionalsFromPost(null, $object);
+
+			$id = $object->create($user);
+			if ($id <= 0) {
+				$error++;
+				setEventMessage($object->error, $object->errors, 'errors');
+				$action = 'create';
 			}
 
-			// altairis: link ticket to project
-			if (GETPOST('projectid') > 0) {
-				$object->setProject(GETPOST('projectid'));
-			}
+			if (!$error) {
+				// Add contact
+				$contactid = GETPOST('contactid', 'int');
+				$type_contact = GETPOST("type", 'alpha');
 
-			// Auto assign user
-			if ($conf->global->TICKET_AUTO_ASSIGN_USER_CREATE) {
-				$result = $object->assignUser($user, $user->id, 1);
-				$object->add_contact($user->id, "SUPPORTTEC", 'internal');
-			}
+				if ($contactid > 0 && $type_contact) {
+					$result = $object->add_contact($contactid, GETPOST("type"), 'external');
+				}
 
-			// Auto assign contrat
-			$contractid = 0;
-			if ($conf->global->TICKET_AUTO_ASSIGN_CONTRACT_CREATE) {
-				$contrat = new Contrat($db);
-				$contrat->socid = $object->fk_soc;
-				$list = $contrat->getListOfContracts();
+				// altairis: link ticket to project
+				if (GETPOST('projectid') > 0) {
+					$object->setProject(GETPOST('projectid'));
+				}
 
-				if (is_array($list) && !empty($list)) {
-					if (count($list) == 1) {
-						$contractid = $list[0]->id;
-						$object->setContract($contractid);
-					} else {
+				// Auto assign user
+				if ($conf->global->TICKET_AUTO_ASSIGN_USER_CREATE) {
+					$result = $object->assignUser($user, $user->id, 1);
+					$object->add_contact($user->id, "SUPPORTTEC", 'internal');
+				}
+
+				// Auto assign contrat
+				$contractid = 0;
+				if ($conf->global->TICKET_AUTO_ASSIGN_CONTRACT_CREATE) {
+					$contrat = new Contrat($db);
+					$contrat->socid = $object->fk_soc;
+					$list = $contrat->getListOfContracts();
+
+					if (is_array($list) && !empty($list)) {
+						if (count($list) == 1) {
+							$contractid = $list[0]->id;
+							$object->setContract($contractid);
+						} else {
+						}
+					}
+				}
+
+				// Auto create fiche intervention
+				if ($conf->global->TICKET_AUTO_CREATE_FICHINTER_CREATE) {
+					$fichinter = new Fichinter($db);
+					$fichinter->socid = $object->fk_soc;
+					$fichinter->fk_project = GETPOST('projectid', 'int');
+					$fichinter->fk_contrat = $contractid;
+					$fichinter->author = $user->id;
+					$fichinter->modelpdf = 'soleil';
+					$fichinter->origin = $object->element;
+					$fichinter->origin_id = $object->id;
+
+					// Extrafields
+					$extrafields->fetch_name_optionals_label($fichinter->table_element);
+					$array_options = $extrafields->getOptionalsFromPost($fichinter->table_element);
+					$fichinter->array_options = $array_options;
+
+					$id = $fichinter->create($user);
+					if ($id <= 0) {
+						setEventMessages($fichinter->error, null, 'errors');
 					}
 				}
 			}
 
-			// Auto create fiche intervention
-			if ($conf->global->TICKET_AUTO_CREATE_FICHINTER_CREATE)
-			{
-				$fichinter = new Fichinter($db);
-				$fichinter->socid = $object->fk_soc;
-				$fichinter->fk_project = GETPOST('projectid', 'int');
-				$fichinter->fk_contrat = $contractid;
-				$fichinter->author = $user->id;
-				$fichinter->modelpdf = 'soleil';
-				$fichinter->origin = $object->element;
-				$fichinter->origin_id = $object->id;
+			if (!$error) {
+				// File transfer
+				$object->copyFilesForTicket();
+			}
 
-				// Extrafields
-				$extrafields->fetch_name_optionals_label($fichinter->table_element);
-				$array_options = $extrafields->getOptionalsFromPost($fichinter->table_element);
-				$fichinter->array_options = $array_options;
+			if (!$error) {
+				$db->commit();
 
-				$id = $fichinter->create($user);
-				if ($id <= 0) {
-					setEventMessages($fichinter->error, null, 'errors');
+				if (!empty($backtopage)) {
+					$url = $backtopage;
+				} else {
+					$url = 'card.php?track_id=' . $object->track_id;
 				}
-			}
-		}
 
-		if (!$error)
-		{
-			// File transfer
-			$object->copyFilesForTicket();
-		}
-
-		if (!$error)
-		{
-			$db->commit();
-
-			if (!empty($backtopage)) {
-				$url = $backtopage;
+				header("Location: " . $url);
+				exit;
 			} else {
-				$url = 'card.php?track_id='.$object->track_id;
+				$db->rollback();
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
-
-			header("Location: ".$url);
-			exit;
 		} else {
-			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
-	}
-}
-
-if ($action == 'edit' && $user->rights->ticket->write) {
-	$error = 0;
-
-	if ($object->fetch(GETPOST('id', 'int')) < 0) {
-		$error++;
-		array_push($object->errors, $langs->trans("ErrorTicketIsNotValid"));
-		$_GET["action"] = $_POST["action"] = '';
-	}
-}
-
-if (GETPOST('update', 'alpha') && GETPOST('id', 'int') && $user->rights->ticket->write) {
-	$error = 0;
-
-	$ret = $object->fetch(GETPOST('id', 'int'));
-	if ($ret < 0) {
-		$error++;
-		array_push($object->errors, $langs->trans("ErrorTicketIsNotValid"));
-		$action = '';
-	} elseif (!GETPOST("label")) {
-		$error++;
-		array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")));
-		$action = 'edit';
-	} elseif (!GETPOST("subject")) {
-		$error++;
-		array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject")));
-		$action = 'edit';
 	}
 
-	if (!$error) {
-		$db->begin();
+	if ($action == 'edit' && $user->rights->ticket->write) {
+		$error = 0;
 
-		$object->label = GETPOST("label", 'alphanohtml');
-		$object->description = GETPOST("description", 'none');
-
-		//...
-		$ret = $object->update($user);
-		if ($ret <= 0) {
+		if ($object->fetch(GETPOST('id', 'int')) < 0) {
 			$error++;
-			setEventMessage($object->error, $object->errors, 'errors');
+			array_push($object->errors, $langs->trans("ErrorTicketIsNotValid"));
+			$_GET["action"] = $_POST["action"] = '';
+		}
+	}
+
+	if (GETPOST('update', 'alpha') && GETPOST('id', 'int') && $user->rights->ticket->write) {
+		$error = 0;
+
+		$ret = $object->fetch(GETPOST('id', 'int'));
+		if ($ret < 0) {
+			$error++;
+			array_push($object->errors, $langs->trans("ErrorTicketIsNotValid"));
+			$action = '';
+		} elseif (!GETPOST("label")) {
+			$error++;
+			array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")));
+			$action = 'edit';
+		} elseif (!GETPOST("subject")) {
+			$error++;
+			array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject")));
 			$action = 'edit';
 		}
 
-		if (!$error && $ret > 0) {
-			$db->commit();
-		} else {
-			$db->rollback();
-		}
-	}
-}
+		if (!$error) {
+			$db->begin();
 
-// Mark as Read
-if ($action == "mark_ticket_read" && $user->rights->ticket->write) {
-	$object->fetch('', '', GETPOST("track_id", 'alpha'));
+			$object->label = GETPOST("label", 'alphanohtml');
+			$object->description = GETPOST("description", 'none');
 
-	if ($object->markAsRead($user) > 0)
-	{
-		setEventMessages($langs->trans('TicketMarkedAsRead'), null, 'mesgs');
+			//...
+			$ret = $object->update($user);
+			if ($ret <= 0) {
+				$error++;
+				setEventMessage($object->error, $object->errors, 'errors');
+				$action = 'edit';
+			}
 
-		header("Location: card.php?track_id=".$object->track_id."&action=view");
-		exit;
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
-	}
-	$action = 'view';
-}
-
-// Assign to someone
-if ($action == "assign_user" && GETPOST('btn_assign_user', 'alpha') && $user->rights->ticket->write) {
-	$object->fetch('', '', GETPOST("track_id", 'alpha'));
-	$useroriginassign = $object->fk_user_assign;
-	$usertoassign = GETPOST('fk_user_assign', 'int');
-
-	/*if (! ($usertoassign > 0)) {
-     $error++;
-     array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("AssignedTo")));
-     $action = 'view';
-     }*/
-
-	if (!$error)
-	{
-		$ret = $object->assignUser($user, $usertoassign);
-		if ($ret < 0) $error++;
-	}
-
-	if (!$error)	// Update list of contacts
-	{
-		// Si déjà un user assigné on le supprime des contacts
-		if ($useroriginassign > 0) {
-			$internal_contacts = $object->listeContact(-1, 'internal');
-
-			foreach ($internal_contacts as $key => $contact) {
-				if ($contact['code'] == "SUPPORTTEC" && $contact['id'] == $useroriginassign) {
-				}
-				{
-					//print "user à effacer : ".$useroriginassign;
-					$object->delete_contact($contact['rowid']);
-				}
+			if (!$error && $ret > 0) {
+				$db->commit();
+			} else {
+				$db->rollback();
 			}
 		}
-
-		if ($usertoassign > 0) $object->add_contact($usertoassign, "SUPPORTTEC", 'internal', $notrigger = 0);
 	}
 
-	if (!$error)
-	{
-		// Log action in ticket logs table
-		$object->fetch_user($usertoassign);
-		$log_action = $langs->trans('TicketLogAssignedTo', $object->user->getFullName($langs));
+	// Mark as Read
+	if ($action == "mark_ticket_read" && $user->rights->ticket->write) {
+		$object->fetch('', '', GETPOST("track_id", 'alpha'));
 
-		setEventMessages($langs->trans('TicketAssigned'), null, 'mesgs');
+		if ($object->markAsRead($user) > 0) {
+			setEventMessages($langs->trans('TicketMarkedAsRead'), null, 'mesgs');
 
-		header("Location: card.php?track_id=".$object->track_id."&action=view");
-		exit;
-	} else {
-		array_push($object->errors, $object->error);
-	}
-	$action = 'view';
-}
-
-if ($action == 'add_message' && GETPOSTISSET('btn_add_message') && $user->rights->ticket->read) {
-	$ret = $object->newMessage($user, $action, (GETPOST('private_message', 'alpha') == "on" ? 1 : 0));
-
-	if ($ret > 0) {
-		if (!empty($backtopage)) {
-			$url = $backtopage;
-		} else {
-			$url = 'card.php?action=view&track_id='.$object->track_id;
-		}
-
-		header("Location: ".$url);
-		exit;
-	} else {
-		setEventMessages($object->error, null, 'errors');
-		$action = 'presend';
-	}
-}
-
-if ($action == "confirm_close" && GETPOST('confirm', 'alpha') == 'yes' && $user->rights->ticket->write)
-{
-	$object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha'));
-
-	if ($object->close($user)) {
-		setEventMessages($langs->trans('TicketMarkedAsClosed'), null, 'mesgs');
-
-		$url = 'card.php?action=view&track_id='.GETPOST('track_id', 'alpha');
-		header("Location: ".$url);
-	} else {
-		$action = '';
-		setEventMessages($object->error, $object->errors, 'errors');
-	}
-}
-
-if ($action == "confirm_public_close" && GETPOST('confirm', 'alpha') == 'yes') {
-	$object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha'));
-	if ($_SESSION['email_customer'] == $object->origin_email || $_SESSION['email_customer'] == $object->thirdparty->email) {
-		$object->close($user);
-
-		// Log action in ticket logs table
-		$log_action = $langs->trans('TicketLogClosedBy', $_SESSION['email_customer']);
-
-		setEventMessages('<div class="confirm">'.$langs->trans('TicketMarkedAsClosed').'</div>', null, 'mesgs');
-
-		$url = 'card.php?action=view_ticket&track_id='.GETPOST('track_id', 'alpha');
-		header("Location: ".$url);
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
-		$action = '';
-	}
-}
-
-if ($action == 'confirm_delete_ticket' && GETPOST('confirm', 'alpha') == "yes" && $user->rights->ticket->delete) {
-	if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
-		if ($object->delete($user) > 0) {
-			setEventMessages('<div class="confirm">'.$langs->trans('TicketDeletedSuccess').'</div>', null, 'mesgs');
-			Header("Location: ".DOL_URL_ROOT."/ticket/list.php");
+			header("Location: card.php?track_id=" . $object->track_id . "&action=view");
 			exit;
 		} else {
-			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans($object->error).'</div>';
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+		$action = 'view';
+	}
+
+	// Assign to someone
+	if ($action == "assign_user" && GETPOST('btn_assign_user', 'alpha') && $user->rights->ticket->write) {
+		$object->fetch('', '', GETPOST("track_id", 'alpha'));
+		$useroriginassign = $object->fk_user_assign;
+		$usertoassign = GETPOST('fk_user_assign', 'int');
+
+		/*if (! ($usertoassign > 0)) {
+		 $error++;
+		 array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("AssignedTo")));
+		 $action = 'view';
+		 }*/
+
+		if (!$error) {
+			$ret = $object->assignUser($user, $usertoassign);
+			if ($ret < 0) $error++;
+		}
+
+		if (!$error)    // Update list of contacts
+		{
+			// Si déjà un user assigné on le supprime des contacts
+			if ($useroriginassign > 0) {
+				$internal_contacts = $object->listeContact(-1, 'internal');
+
+				foreach ($internal_contacts as $key => $contact) {
+					if ($contact['code'] == "SUPPORTTEC" && $contact['id'] == $useroriginassign) {
+					}
+					{
+						//print "user à effacer : ".$useroriginassign;
+						$object->delete_contact($contact['rowid']);
+					}
+				}
+			}
+
+			if ($usertoassign > 0) $object->add_contact($usertoassign, "SUPPORTTEC", 'internal', $notrigger = 0);
+		}
+
+		if (!$error) {
+			// Log action in ticket logs table
+			$object->fetch_user($usertoassign);
+			$log_action = $langs->trans('TicketLogAssignedTo', $object->user->getFullName($langs));
+
+			setEventMessages($langs->trans('TicketAssigned'), null, 'mesgs');
+
+			header("Location: card.php?track_id=" . $object->track_id . "&action=view");
+			exit;
+		} else {
+			array_push($object->errors, $object->error);
+		}
+		$action = 'view';
+	}
+
+	if ($action == 'add_message' && GETPOSTISSET('btn_add_message') && $user->rights->ticket->read) {
+		$ret = $object->newMessage($user, $action, (GETPOST('private_message', 'alpha') == "on" ? 1 : 0));
+
+		if ($ret > 0) {
+			if (!empty($backtopage)) {
+				$url = $backtopage;
+			} else {
+				$url = 'card.php?action=view&track_id=' . $object->track_id;
+			}
+
+			header("Location: " . $url);
+			exit;
+		} else {
+			setEventMessages($object->error, null, 'errors');
+			$action = 'presend';
+		}
+	}
+
+	if ($action == "confirm_close" && GETPOST('confirm', 'alpha') == 'yes' && $user->rights->ticket->write) {
+		$object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha'));
+
+		if ($object->close($user)) {
+			setEventMessages($langs->trans('TicketMarkedAsClosed'), null, 'mesgs');
+
+			$url = 'card.php?action=view&track_id=' . GETPOST('track_id', 'alpha');
+			header("Location: " . $url);
+		} else {
+			$action = '';
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+
+	if ($action == "confirm_public_close" && GETPOST('confirm', 'alpha') == 'yes') {
+		$object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha'));
+		if ($_SESSION['email_customer'] == $object->origin_email || $_SESSION['email_customer'] == $object->thirdparty->email) {
+			$object->close($user);
+
+			// Log action in ticket logs table
+			$log_action = $langs->trans('TicketLogClosedBy', $_SESSION['email_customer']);
+
+			setEventMessages('<div class="confirm">' . $langs->trans('TicketMarkedAsClosed') . '</div>', null, 'mesgs');
+
+			$url = 'card.php?action=view_ticket&track_id=' . GETPOST('track_id', 'alpha');
+			header("Location: " . $url);
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
 	}
-}
 
-// Set parent company
-if ($action == 'set_thirdparty' && $user->rights->societe->creer) {
-	if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
-		$result = $object->setCustomer(GETPOST('editcustomer', 'int'));
-		$url = 'card.php?action=view&track_id='.GETPOST('track_id', 'alpha');
-		header("Location: ".$url);
-		exit();
-	}
-}
-
-if ($action == 'set_progression' && $user->rights->ticket->write) {
-	if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
-		$result = $object->setProgression(GETPOST('progress', 'alpha'));
-
-		$url = 'card.php?action=view&track_id='.$object->track_id;
-		header("Location: ".$url);
-		exit();
-	}
-}
-
-if ($action == 'setsubject') {
-	if ($object->fetch(GETPOST('id', 'int'))) {
-		if ($action == 'setsubject') {
-			$object->subject = trim(GETPOST('subject', 'alpha'));
-		}
-
-		if ($action == 'setsubject' && empty($object->subject)) {
-			$mesg .= ($mesg ? '<br>' : '').$langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject"));
-		}
-
-		if (!$mesg) {
-			if ($object->update($user) >= 0) {
-				header("Location: ".$_SERVER['PHP_SELF']."?track_id=".$object->track_id);
+	if ($action == 'confirm_delete_ticket' && GETPOST('confirm', 'alpha') == "yes" && $user->rights->ticket->delete) {
+		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
+			if ($object->delete($user) > 0) {
+				setEventMessages('<div class="confirm">' . $langs->trans('TicketDeletedSuccess') . '</div>', null, 'mesgs');
+				Header("Location: " . DOL_URL_ROOT . "/ticket/list.php");
 				exit;
+			} else {
+				$langs->load("errors");
+				$mesg = '<div class="error">' . $langs->trans($object->error) . '</div>';
+				$action = '';
 			}
-			$mesg = $object->error;
 		}
 	}
-}
 
-if ($action == 'confirm_reopen' && $user->rights->ticket->manage && !GETPOST('cancel')) {
-	if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
-		// prevent browser refresh from reopening ticket several times
-		if ($object->fk_statut == Ticket::STATUS_CLOSED) {
-			$res = $object->setStatut(Ticket::STATUS_ASSIGNED);
+	// Set parent company
+	if ($action == 'set_thirdparty' && $user->rights->societe->creer) {
+		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
+			$result = $object->setCustomer(GETPOST('editcustomer', 'int'));
+			$url = 'card.php?action=view&track_id=' . GETPOST('track_id', 'alpha');
+			header("Location: " . $url);
+			exit();
+		}
+	}
+
+	if ($action == 'set_progression' && $user->rights->ticket->write) {
+		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
+			$result = $object->setProgression(GETPOST('progress', 'alpha'));
+
+			$url = 'card.php?action=view&track_id=' . $object->track_id;
+			header("Location: " . $url);
+			exit();
+		}
+	}
+
+	if ($action == 'setsubject') {
+		if ($object->fetch(GETPOST('id', 'int'))) {
+			if ($action == 'setsubject') {
+				$object->subject = trim(GETPOST('subject', 'alpha'));
+			}
+
+			if ($action == 'setsubject' && empty($object->subject)) {
+				$mesg .= ($mesg ? '<br>' : '') . $langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject"));
+			}
+
+			if (!$mesg) {
+				if ($object->update($user) >= 0) {
+					header("Location: " . $_SERVER['PHP_SELF'] . "?track_id=" . $object->track_id);
+					exit;
+				}
+				$mesg = $object->error;
+			}
+		}
+	}
+
+	if ($action == 'confirm_reopen' && $user->rights->ticket->manage && !GETPOST('cancel')) {
+		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
+			// prevent browser refresh from reopening ticket several times
+			if ($object->fk_statut == Ticket::STATUS_CLOSED) {
+				$res = $object->setStatut(Ticket::STATUS_ASSIGNED);
+				if ($res) {
+					// Log action in ticket logs table
+					$log_action = $langs->trans('TicketLogReopen');
+
+					$url = 'card.php?action=view&track_id=' . $object->track_id;
+					header("Location: " . $url);
+					exit();
+				}
+			}
+		}
+	} // Categorisation dans projet
+	elseif ($action == 'classin' && $user->rights->ticket->write) {
+		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
+			$object->setProject(GETPOST('projectid', 'int'));
+			$url = 'card.php?action=view&track_id=' . $object->track_id;
+			header("Location: " . $url);
+			exit();
+		}
+	} // Categorisation dans contrat
+	elseif ($action == 'setcontract' && $user->rights->ticket->write) {
+		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
+			$object->setContract(GETPOST('contractid', 'int'));
+			$url = 'card.php?action=view&track_id=' . $object->track_id;
+			header("Location: " . $url);
+			exit();
+		}
+	} elseif ($action == "set_message" && $user->rights->ticket->manage) {
+		// altairis: manage cancel button
+		if (!GETPOST('cancel')) {
+			$object->fetch('', '', GETPOST('track_id', 'alpha'));
+			$oldvalue_message = $object->message;
+			$fieldtomodify = GETPOST('message_initial');
+
+			$object->message = $fieldtomodify;
+			$ret = $object->update($user);
+			if ($ret > 0) {
+				$log_action = $langs->trans('TicketInitialMessageModified') . " \n";
+				// include the Diff class
+				dol_include_once('/ticket/class/utils_diff.class.php');
+				// output the result of comparing two files as plain text
+				$log_action .= Diff::toString(Diff::compare(strip_tags($oldvalue_message), strip_tags($object->message)));
+
+				setEventMessages($langs->trans('TicketMessageSuccesfullyUpdated'), null, 'mesgs');
+			}
+		}
+
+		$action = 'view';
+	} // Reopen ticket
+	elseif ($action == 'confirm_set_status' && $user->rights->ticket->write && !GETPOST('cancel')) {
+		if ($object->fetch(GETPOST('id', 'int'), GETPOST('track_id', 'alpha')) >= 0) {
+			$new_status = GETPOST('new_status', 'int');
+			$old_status = $object->fk_statut;
+			$res = $object->setStatut($new_status);
 			if ($res) {
 				// Log action in ticket logs table
-				$log_action = $langs->trans('TicketLogReopen');
+				$log_action = $langs->trans('TicketLogStatusChanged', $langs->transnoentities($object->statuts_short[$old_status]), $langs->transnoentities($object->statuts_short[$new_status]));
 
-				$url = 'card.php?action=view&track_id='.$object->track_id;
-				header("Location: ".$url);
+				$url = 'card.php?action=view&track_id=' . $object->track_id;
+				header("Location: " . $url);
 				exit();
 			}
 		}
 	}
-} // Categorisation dans projet
-elseif ($action == 'classin' && $user->rights->ticket->write) {
-	if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
-		$object->setProject(GETPOST('projectid', 'int'));
-		$url = 'card.php?action=view&track_id='.$object->track_id;
-		header("Location: ".$url);
-		exit();
-	}
-} // Categorisation dans contrat
-elseif ($action == 'setcontract' && $user->rights->ticket->write) {
-	if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
-		$object->setContract(GETPOST('contractid', 'int'));
-		$url = 'card.php?action=view&track_id='.$object->track_id;
-		header("Location: ".$url);
-		exit();
-	}
-} elseif ($action == "set_message" && $user->rights->ticket->manage) {
-	// altairis: manage cancel button
-	if (!GETPOST('cancel')) {
-		$object->fetch('', '', GETPOST('track_id', 'alpha'));
-		$oldvalue_message = $object->message;
-		$fieldtomodify = GETPOST('message_initial');
 
-		$object->message = $fieldtomodify;
+	// Action to update one extrafield
+	if ($action == "update_extras" && !empty($permissiontoadd)) {
+		$object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha'));
+		$attributekey = GETPOST('attribute', 'alpha');
+		$attributekeylong = 'options_' . $attributekey;
+		$object->array_options['options_' . $attributekey] = GETPOST($attributekeylong, ' alpha');
+
+		$result = $object->insertExtraFields(empty($triggermodname) ? '' : $triggermodname, $user);
+		if ($result > 0) {
+			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+			$action = 'view';
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = 'edit_extras';
+		}
+	}
+
+	if ($action == "change_property" && GETPOST('btn_update_ticket_prop', 'alpha') && $user->rights->ticket->write) {
+		$object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha'));
+
+		$object->type_code = GETPOST('update_value_type', 'aZ09');
+		$object->severity_code = GETPOST('update_value_severity', 'aZ09');
+		$object->category_code = GETPOST('update_value_category', 'aZ09');
+
 		$ret = $object->update($user);
 		if ($ret > 0) {
-			$log_action = $langs->trans('TicketInitialMessageModified')." \n";
-			// include the Diff class
-			dol_include_once('/ticket/class/utils_diff.class.php');
-			// output the result of comparing two files as plain text
-			$log_action .= Diff::toString(Diff::compare(strip_tags($oldvalue_message), strip_tags($object->message)));
+			$log_action = $langs->trans('TicketLogPropertyChanged', $oldvalue_label, $newvalue_label);
 
-			setEventMessages($langs->trans('TicketMessageSuccesfullyUpdated'), null, 'mesgs');
+			setEventMessages($langs->trans('TicketUpdated'), null, 'mesgs');
 		}
-	}
-
-	$action = 'view';
-} // Reopen ticket
-elseif ($action == 'confirm_set_status' && $user->rights->ticket->write && !GETPOST('cancel')) {
-	if ($object->fetch(GETPOST('id', 'int'), GETPOST('track_id', 'alpha')) >= 0) {
-		$new_status = GETPOST('new_status', 'int');
-		$old_status = $object->fk_statut;
-		$res = $object->setStatut($new_status);
-		if ($res) {
-			// Log action in ticket logs table
-			$log_action = $langs->trans('TicketLogStatusChanged', $langs->transnoentities($object->statuts_short[$old_status]), $langs->transnoentities($object->statuts_short[$new_status]));
-
-			$url = 'card.php?action=view&track_id='.$object->track_id;
-			header("Location: ".$url);
-			exit();
-		}
-	}
-}
-
-// Action to update one extrafield
-if ($action == "update_extras" && !empty($permissiontoadd))
-{
-	$object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha'));
-	$attributekey = GETPOST('attribute', 'alpha');
-	$attributekeylong = 'options_'.$attributekey;
-	$object->array_options['options_'.$attributekey] = GETPOST($attributekeylong, ' alpha');
-
-	$result = $object->insertExtraFields(empty($triggermodname) ? '' : $triggermodname, $user);
-	if ($result > 0)
-	{
-		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 		$action = 'view';
 	}
-	else
-	{
-		setEventMessages($object->error, $object->errors, 'errors');
-		$action = 'edit_extras';
-	}
+
+
+	$permissiondellink = $user->rights->ticket->write;
+	include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; // Must be include, not include_once
+
+	// Actions to build doc
+	$upload_dir = $conf->ticket->dir_output;
+	$permissiontoadd = $user->rights->ticket->write;
+	include DOL_DOCUMENT_ROOT . '/core/actions_builddoc.inc.php';
+
+	// Actions to send emails
+	$triggersendname = 'TICKET_SENTBYMAIL';
+	$paramname = 'id';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_TICKET_TO'; // used to know the automatic BCC to add
+	$trackid = 'tic' . $object->id;
+	include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
+
+	// Set $action to correct value for the case we used presend action to add a message
+	if (GETPOSTISSET('actionbis') && $action == 'presend') $action = 'presend_addmessage';
 }
 
-if ($action == "change_property" && GETPOST('btn_update_ticket_prop', 'alpha') && $user->rights->ticket->write)
-{
-	$object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha'));
-
-	$object->type_code = GETPOST('update_value_type', 'aZ09');
-	$object->severity_code = GETPOST('update_value_severity', 'aZ09');
-	$object->category_code = GETPOST('update_value_category', 'aZ09');
-
-	$ret = $object->update($user);
-	if ($ret > 0) {
-		$log_action = $langs->trans('TicketLogPropertyChanged', $oldvalue_label, $newvalue_label);
-
-		setEventMessages($langs->trans('TicketUpdated'), null, 'mesgs');
-	}
-	$action = 'view';
-}
-
-
-$permissiondellink = $user->rights->ticket->write;
-include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
-
-// Actions to build doc
-$upload_dir = $conf->ticket->dir_output;
-$permissiontoadd = $user->rights->ticket->write;
-include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-
-// Actions to send emails
-$triggersendname = 'TICKET_SENTBYMAIL';
-$paramname = 'id';
-$autocopy = 'MAIN_MAIL_AUTOCOPY_TICKET_TO'; // used to know the automatic BCC to add
-$trackid = 'tic'.$object->id;
-include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
-
-// Set $action to correct value for the case we used presend action to add a message
-if (GETPOSTISSET('actionbis') && $action == 'presend') $action = 'presend_addmessage';
-
-
 /*
  * View
  */
@@ -1213,30 +1217,8 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 		// Set $action to correct value for the case we used presend action to add a message
 		if (GETPOSTISSET('actionbis') && $action == 'presend') $action = 'presend_addmessage';
 
-		if ($action != 'presend' && $action != 'presend_addmessage')
-		{
-			print '<div class="fichecenter"><div class="fichehalfleft">';
-			print '<a name="builddoc"></a>'; // ancre
-
-			// Show links to link elements
-			$linktoelem = $form->showLinkToObjectBlock($object, null, array('ticket'));
-			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-
-			// Show direct link to public interface
-			print '<br><!-- Link to public interface -->'."\n";
-			print showDirectPublicLink($object).'<br>';
-
-			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-			// List of actions on element
-			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-			$formactions = new FormActions($db);
-			$somethingshown = $formactions->showactions($object, 'ticket', $socid, 1);
-
-			print '</div></div></div>';
-		}
-		else
-		{
+		// add a message
+		if ($action == 'presend' || $action == 'presend_addmessage') {
 			$action = 'add_message'; // action to use to post the message
 			$modelmail = 'ticket_send';
 
@@ -1310,6 +1292,63 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 			$formticket->showMessageForm('100%');
 			print '</div>';
 		}
+
+		// Show messages on card
+		if (empty($conf->global->TICKET_HIDE_MESSAGES_ON_CARD)) {
+			$param = '&id='.$object->id;
+			if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+			if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+			if ($actioncode)    $param .= '&actioncode='.urlencode($actioncode);
+			if ($search_agenda_label)    $param .= '&search_agenda_label='.urlencode($search_agenda_label);
+
+			$morehtmlright = '';
+
+			$messagingUrl = DOL_URL_ROOT . '/ticket/agenda.php?track_id=' . $object->track_id;
+			$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fal fa-list-alt imgforviewmode', $messagingUrl, '', 1);
+
+			// Show link to add a message (if read and not closed)
+			$btnstatus = $object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage" && $action != "add_message";
+			$url = 'card.php?track_id=' . $object->track_id . '&action=presend_addmessage&mode=init';
+			$morehtmlright .= dolGetButtonTitle($langs->trans('TicketAddMessage'), '', 'fal fa-comment-dots', $url, 'add-new-ticket-title-button', $btnstatus);
+
+			// Show link to add event (if read and not closed)
+			$btnstatus = $object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage" && $action != "add_message";;
+			$url = dol_buildpath('/comm/action/card.php', 1) . '?action=create&datep=' . date('YmdHi') . '&origin=ticket&originid=' . $object->id . '&projectid=' . $object->fk_project . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?track_id=' . $object->track_id);
+			$morehtmlright .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fal fa-plus-circle', $url, 'add-new-ticket-even-button', $btnstatus);
+
+			print_barre_liste($langs->trans("ActionsOnTicket"), 0, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
+
+			// List of all actions
+			$filters = array();
+			$filters['search_agenda_label'] = $search_agenda_label;
+			show_ticket_messaging($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+		}
+
+		if ($action != 'presend' && $action != 'presend_addmessage') {
+			print '<div class="fichecenter"><div class="fichehalfleft">';
+			print '<a name="builddoc"></a>'; // ancre
+
+			// Show links to link elements
+			$linktoelem = $form->showLinkToObjectBlock($object, null, array('ticket'));
+			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+			// Show direct link to public interface
+			print '<br><!-- Link to public interface -->'."\n";
+			print showDirectPublicLink($object).'<br>';
+			print '</div>';
+
+			if (!empty($conf->global->TICKET_HIDE_MESSAGES_ON_CARD)) {
+				print '<div class="fichehalfright"><div class="ficheaddleft">';
+
+				// List of actions on element
+				include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+				$formactions = new FormActions($db);
+				$somethingshown = $formactions->showactions($object, 'ticket', $socid, 1);
+
+				print '</div></div>';
+			}
+			print '</div>';
+		}
 	}
 }
 

From 7e8cd565f482fcc7e58fa64f67fe4107c63b21cc Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Thu, 7 May 2020 14:35:04 +0200
Subject: [PATCH 078/490] NEW not show linked table on add message action

---
 htdocs/ticket/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 3d37c46eb90..7d5ab5fe228 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1324,7 +1324,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 			show_ticket_messaging($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
 		}
 
-		if ($action != 'presend' && $action != 'presend_addmessage') {
+		if ($action != 'presend' && $action != 'presend_addmessage' && $action != 'add_message') {
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 			print '<a name="builddoc"></a>'; // ancre
 

From dd1d29f983c4625b4866fb1c61a80f1907cf5f54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 7 May 2020 15:37:32 +0200
Subject: [PATCH 079/490] add some substitutions for date datetime

---
 htdocs/core/lib/functions.lib.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 1a4ab00b7d6..c3da7d0ade4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6358,6 +6358,17 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 					{
 						foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {
 							$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = $object->array_options['options_'.$key];
+                            if ($extrafields->attribute_type[$key] == 'date') {
+                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = dol_print_date($object->array_options['options_' . $key], 'day');
+                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_LOCALE__'] = dol_print_date($object->array_options['options_' . $key], 'day', 'tzserver', $outputlangs);
+                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_RFC__'] = dol_print_date($object->array_options['options_' . $key],'dayrfc');
+                            } elseif ($extrafields->attribute_type[$key] == 'datetime') {
+                                $datetime = $object->array_options['options_'.$key];
+                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = ($datetime!="0000-00-00 00:00:00" ? dol_print_date($datetime,'dayhour') : '');
+                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_LOCALE__'] = ($datetime!="0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhour', 'tzserver', $outputlangs) : '');
+                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_DAY_LOCALE__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'day', 'tzserver', $outputlangs) : '');
+                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_RFC__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhourrfc') : '');
+                            }
 						}
 					}
 				}

From c28e6630bb9bf6fe4a3020e01f8fbb640ce2347f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 7 May 2020 15:41:21 +0200
Subject: [PATCH 080/490] Update functions.lib.php

---
 htdocs/core/lib/functions.lib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c3da7d0ade4..43cee63c1ed 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6361,11 +6361,11 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
                             if ($extrafields->attribute_type[$key] == 'date') {
                                 $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = dol_print_date($object->array_options['options_' . $key], 'day');
                                 $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_LOCALE__'] = dol_print_date($object->array_options['options_' . $key], 'day', 'tzserver', $outputlangs);
-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_RFC__'] = dol_print_date($object->array_options['options_' . $key],'dayrfc');
+                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_RFC__'] = dol_print_date($object->array_options['options_' . $key], 'dayrfc');
                             } elseif ($extrafields->attribute_type[$key] == 'datetime') {
                                 $datetime = $object->array_options['options_'.$key];
-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = ($datetime!="0000-00-00 00:00:00" ? dol_print_date($datetime,'dayhour') : '');
-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_LOCALE__'] = ($datetime!="0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhour', 'tzserver', $outputlangs) : '');
+                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhour') : '');
+                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_LOCALE__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhour', 'tzserver', $outputlangs) : '');
                                 $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_DAY_LOCALE__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'day', 'tzserver', $outputlangs) : '');
                                 $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_RFC__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhourrfc') : '');
                             }

From 0cd05887ce95de5496924a941a92f31155a0ed2e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 May 2020 17:21:27 +0200
Subject: [PATCH 081/490] FIX count of open day when date and start are not
 open should be 0

---
 htdocs/core/lib/date.lib.php | 10 +++++++++-
 htdocs/holiday/card.php      |  4 +++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 123e3297f11..56dfee3988c 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -896,15 +896,23 @@ function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0,
 	if ($timestampStart < $timestampEnd)
 	{
 		$numdays = num_between_day($timestampStart, $timestampEnd, $lastday);
+
 		$numholidays = num_public_holiday($timestampStart, $timestampEnd, $country_code, $lastday);
 		$nbOpenDay = $numdays - $numholidays;
-		$nbOpenDay.= " " . $langs->trans("Days");
+		$nbOpenDay.= ' '.$langs->trans("Days");
 		if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
 	}
 	elseif ($timestampStart == $timestampEnd)
 	{
+		$numholidays = 0;
+		if ($lastday) {
+			$numholidays = num_public_holiday($timestampStart, $timestampEnd, $country_code, $lastday);
+			if ($numholidays == 1) return 0;
+		}
+
 		$nbOpenDay=$lastday;
+
 		if ($inhour == 1) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
 	}
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 9cc287cd28a..6dd218255e5 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -1291,7 +1291,9 @@ else
                 if ($includesunday) $htmlhelp.='<br>'.$langs->trans("DayIsANonWorkingDay", $langs->trans("Sunday"));
                 print $form->textwithpicto($langs->trans('NbUseDaysCP'), $htmlhelp);
                 print '</td>';
-                print '<td>'.num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday).'</td>';
+                print '<td>';
+                print num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
+                print '</td>';
                 print '</tr>';
 
                 if ($object->statut == Holiday::STATUS_REFUSED)

From db8596743c7c081674420aa3a53edc68c75dd851 Mon Sep 17 00:00:00 2001
From: Vaadasch <qqqrno@gmail.com>
Date: Thu, 7 May 2020 22:09:55 +0200
Subject: [PATCH 082/490] Update facture.class.php

Auto-update dates (if not empty) of services when cloning facture.

Actual code is only for month by month.

If empty (start or end) => do nothing

If set, update for next month if there is only 1d between what had been set and the start (or end) of the month.
If there is more than one day from start or end of the month => do nothing, because we're not sure the service is by month

Worst case scenario : the facture is cloned, the service is updated with new unwanted dates
User need to manually updates date : he would have done that either way
---
 htdocs/compta/facture/class/facture.class.php | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 90ed560b3cf..395de47d443 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1177,6 +1177,30 @@ class Facture extends CommonInvoice
 			{
 			    unset($object->lines[$i]);
 			    unset($object->products[$i]); // Tant que products encore utilise
+			}
+						// Bloc to update dates of service (month by month only if previously filled at 1d near start or end of month)
+			// If it's a service with start and end dates
+			if ($line->product_type == 1 && !empty($line->date_start) && !empty($line->date_end) ) {
+				// Get the dates
+				$start = dol_getdate($line->date_start);
+				$end = dol_getdate($line->date_end);
+				
+				// Get the first and last day of the month
+				$first = dol_get_first_day($start['year'], $start['mon']);
+				$last = dol_get_first_day($end['year'], $end['mon']);
+
+				// Get diff betweend start/end of month and previously filled
+				$diffFirst = num_between_day($first, dol_mktime($start['hours'], $start['minutes'], $start['seconds'], $start['mon'], $start['mday'], $start['year'], 'user'));
+				$diffLast = num_between_day(dol_mktime($end['hours'], $end['minutes'], $end['seconds'], $end['mon'], $end['mday'], $end['year'], 'user'), $last);
+
+				// If there is <= 1d (or 2?) of start/or/end of month
+				if ($diffFirst <= 2 && $diffLast <= 2) {
+					$nextMonth = dol_get_next_month($end['mon'], $end['year']);
+					$newFirst = dol_get_first_day($nextMonth['year'],$nextMonth['month']);
+					$newLast = dol_get_last_day($nextMonth['year'],$nextMonth['month']);
+					$object->lines[$i]->date_start = $newFirst;
+					$object->lines[$i]->date_end = $newLast;
+				}
 			}
 		}
 

From 7514a625fdb17a9226185ddc9a7fda64b84f625e Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 7 May 2020 20:11:59 +0000
Subject: [PATCH 083/490] Fixing style errors.

---
 htdocs/compta/facture/class/facture.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 395de47d443..ffa96fe5237 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1184,7 +1184,7 @@ class Facture extends CommonInvoice
 				// Get the dates
 				$start = dol_getdate($line->date_start);
 				$end = dol_getdate($line->date_end);
-				
+
 				// Get the first and last day of the month
 				$first = dol_get_first_day($start['year'], $start['mon']);
 				$last = dol_get_first_day($end['year'], $end['mon']);
@@ -1196,8 +1196,8 @@ class Facture extends CommonInvoice
 				// If there is <= 1d (or 2?) of start/or/end of month
 				if ($diffFirst <= 2 && $diffLast <= 2) {
 					$nextMonth = dol_get_next_month($end['mon'], $end['year']);
-					$newFirst = dol_get_first_day($nextMonth['year'],$nextMonth['month']);
-					$newLast = dol_get_last_day($nextMonth['year'],$nextMonth['month']);
+					$newFirst = dol_get_first_day($nextMonth['year'], $nextMonth['month']);
+					$newLast = dol_get_last_day($nextMonth['year'], $nextMonth['month']);
 					$object->lines[$i]->date_start = $newFirst;
 					$object->lines[$i]->date_end = $newLast;
 				}

From 206b16410ebd615c87ed7fbf120804f53c5d980e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 May 2020 22:52:32 +0200
Subject: [PATCH 084/490] Revert the option to avoid to introduce a feature
 that is duplicate with already existing view "Events/Agenda". It also keeps a
 common behaviour between other tools. Maxi debug on messages of tickets

---
 htdocs/comm/action/class/actioncomm.class.php |  3 +-
 htdocs/comm/action/list.php                   | 39 +++++++-----
 htdocs/contrat/card.php                       |  5 +-
 htdocs/core/class/html.formactions.class.php  | 63 +++++++++++--------
 htdocs/core/lib/functions.lib.php             |  6 +-
 htdocs/core/lib/ticket.lib.php                |  2 +-
 .../install/mysql/migration/11.0.0-12.0.0.sql |  2 +-
 htdocs/langs/en_US/main.lang                  |  1 +
 htdocs/public/ticket/view.php                 |  2 +-
 htdocs/societe/card.php                       |  2 +-
 htdocs/theme/eldy/timeline.inc.php            |  2 +-
 htdocs/ticket/card.php                        | 20 ++++--
 htdocs/ticket/class/actions_ticket.class.php  |  3 +-
 htdocs/ticket/class/ticket.class.php          |  2 +-
 14 files changed, 88 insertions(+), 64 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index fac4dc45715..7141d875567 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -405,7 +405,6 @@ class ActionComm extends CommonObject
         	$this->userassigned[$tmpid] = array('id'=>$tmpid, 'transparency'=>$this->transparency);
         }
 
-
         $userownerid = $this->userownerid;
         $userdoneid = $this->userdoneid;
 
@@ -484,7 +483,7 @@ class ActionComm extends CommonObject
         $sql .= (strval($this->datef) != '' ? "'".$this->db->idate($this->datef)."'" : "null").", ";
         $sql .= ((isset($this->durationp) && $this->durationp >= 0 && $this->durationp != '') ? "'".$this->db->escape($this->durationp)."'" : "null").", "; // deprecated
         $sql .= (isset($this->type_id) ? $this->type_id : "null").",";
-        $sql .= ($code ? ("'".$code."'") : "null").", ";
+        $sql .= ($code ? ("'".$this->db->escape($code)."'") : "null").", ";
         $sql .= ($this->ref_ext ? ("'".$this->db->idate($this->ref_ext)."'") : "null").", ";
         $sql .= ((isset($this->socid) && $this->socid > 0) ? $this->socid : "null").", ";
         $sql .= ((isset($this->fk_project) && $this->fk_project > 0) ? $this->fk_project : "null").", ";
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index a4b1a9618fb..ef6e21c39cd 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -242,7 +242,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 $sql = "SELECT";
 if ($usergroup > 0) $sql .= " DISTINCT";
 $sql .= " s.nom as societe, s.rowid as socid, s.client, s.email as socemail,";
-$sql .= " a.id, a.label, a.note, a.datep as dp, a.datep2 as dp2, a.fulldayevent, a.location,";
+$sql .= " a.id, a.code, a.label, a.note, a.datep as dp, a.datep2 as dp2, a.fulldayevent, a.location,";
 $sql .= ' a.fk_user_author,a.fk_user_action,';
 $sql .= " a.fk_contact, a.note, a.percent as percent,";
 $sql .= " a.fk_element, a.elementtype, a.datec, a.tms as datem,";
@@ -385,14 +385,8 @@ if ($resql)
 	print '<input type="hidden" name="type" value="'.$type.'">';
 	$nav = '';
 
-	//if ($actioncode)    $nav.='<input type="hidden" name="actioncode" value="'.$actioncode.'">';
-	//if ($resourceid)      $nav.='<input type="hidden" name="resourceid" value="'.$resourceid.'">';
 	if ($filter)          $nav .= '<input type="hidden" name="search_filter" value="'.$filter.'">';
-	//if ($filtert)         $nav.='<input type="hidden" name="filtert" value="'.$filtert.'">';
-	//if ($socid)           $nav.='<input type="hidden" name="socid" value="'.$socid.'">';
 	if ($showbirthday)    $nav .= '<input type="hidden" name="search_showbirthday" value="1">';
-	//if ($pid)             $nav.='<input type="hidden" name="projectid" value="'.$pid.'">';
-	//if ($usergroup)       $nav.='<input type="hidden" name="usergroup" value="'.$usergroup.'">';
 	print $nav;
 
     dol_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
@@ -548,6 +542,7 @@ if ($resql)
 
 		$actionstatic->id = $obj->id;
 		$actionstatic->ref = $obj->id;
+		$actionstatic->code = $obj->code;
 		$actionstatic->type_code = $obj->type_code;
 		$actionstatic->type_label = $obj->type_label;
 		$actionstatic->type_picto = $obj->type_picto;
@@ -583,21 +578,31 @@ if ($resql)
 		if (!empty($arrayfields['c.libelle']['checked']))
 		{
 			print '<td class="nowraponall">';
+			$actioncomm = $actionstatic;
+			// TODO Code common with code into showactions
+			$imgpicto = '';
 			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
 			{
-	    		if ($actionstatic->type_picto) print img_picto('', $actionstatic->type_picto);
-    			else {
-    			    if ($actionstatic->type_code == 'AC_RDV')       print img_picto('', 'object_group', '', false, 0, 0, '', '').' ';
-    			    elseif ($actionstatic->type_code == 'AC_TEL')   print img_picto('', 'object_phoning', '', false, 0, 0, '', '').' ';
-    			    elseif ($actionstatic->type_code == 'AC_FAX')   print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', '').' ';
-    			    elseif ($actionstatic->type_code == 'AC_EMAIL') print img_picto('', 'object_email', '', false, 0, 0, '', '').' ';
-    			    elseif ($actionstatic->type_code == 'AC_INT')   print img_picto('', 'object_intervention', '', false, 0, 0, '', '').' ';
-    			    elseif (!preg_match('/_AUTO/', $actionstatic->type_code)) print img_picto('', 'object_other', '', false, 0, 0, '', '').' ';
-    			}
+				if ($actioncomm->type_picto) {
+					$imgpicto = img_picto('', $actioncomm->type_picto);
+				}
+				else {
+					if ($actioncomm->type_code == 'AC_RDV')         $imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
+					elseif ($actioncomm->type_code == 'AC_TEL')     $imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
+					elseif ($actioncomm->type_code == 'AC_FAX')     $imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
+					elseif ($actioncomm->type_code == 'AC_EMAIL')   $imgpicto = img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
+					elseif ($actioncomm->type_code == 'AC_INT')     $imgpicto = img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
+					elseif ($actioncomm->type_code == 'AC_OTH' && $actioncomm->code == 'TICKET_MSG') $imgpicto = img_picto('', 'object_conversation', '', false, 0, 0, '', 'paddingright').' ';
+					elseif (!preg_match('/_AUTO/', $actioncomm->type_code)) $imgpicto = img_picto('', 'object_other', '', false, 0, 0, '', 'paddingright').' ';
+				}
 			}
+			print $imgpicto;
+
 			$labeltype = $obj->type_code;
 			if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($arraylist[$labeltype])) $labeltype = 'AC_OTH';
-			if (!empty($arraylist[$labeltype])) $labeltype = $arraylist[$labeltype];
+			if ($actioncomm->type_code == 'AC_OTH' && $actioncomm->code == 'TICKET_MSG') {
+				$labeltype = $langs->trans("Message");
+			} elseif (!empty($arraylist[$labeltype])) $labeltype = $arraylist[$labeltype];
 			print dol_trunc($labeltype, 28);
 			print '</td>';
 		}
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 52144d44d34..25857767e80 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2227,13 +2227,12 @@ else
 
 			$MAXEVENT = 10;
 
-			$morehtmlright = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt', DOL_URL_ROOT.'/contrat/agenda.php?id='.$object->id);
+			$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/contrat/agenda.php?id='.$object->id);
 
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
-			$somethingshown = $formactions->showactions($object, 'contract', $socid, 1, 'listactions', $MAXEVENT, '', $morehtmlright);
-
+			$somethingshown = $formactions->showactions($object, 'contract', $socid, 1, 'listactions', $MAXEVENT, '', $morehtmlcenter);
 
 			print '</div></div></div>';
 		}
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index b06877c8c3b..352fcebb06b 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -165,13 +165,12 @@ class FormActions
      *  @param  string  $morecss        		More css on table
      *  @param	int		$max					Max number of record
      *  @param	string	$moreparambacktopage	More param for the backtopage
-     *  @param	string	$morehtmlright			More html text on right of title line
+     *  @param	string	$morehtmlcenter			More html text on center of title line
      *	@return	int								<0 if KO, >=0 if OK
      */
-    public function showactions($object, $typeelement, $socid = 0, $forceshowtitle = 0, $morecss = 'listactions', $max = 0, $moreparambacktopage = '', $morehtmlright = '')
+    public function showactions($object, $typeelement, $socid = 0, $forceshowtitle = 0, $morecss = 'listactions', $max = 0, $moreparambacktopage = '', $morehtmlcenter = '')
     {
         global $langs, $conf, $user;
-        global $bc;
 
         require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
@@ -208,8 +207,9 @@ class FormActions
                 $newcardbutton .= dolGetButtonTitle($langs->trans("AddEvent"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(), 'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid > 0 ? '&socid='.$object->socid : ($socid > 0 ? '&socid='.$socid : '')).($projectid > 0 ? '&projectid='.$projectid : '').'&backtopage='.urlencode($urlbacktopage));
 			}
 
+
         	print '<!-- formactions->showactions -->'."\n";
-        	print load_fiche_titre($title, $newcardbutton, '', 0, 0, '', $morehtmlright);
+        	print load_fiche_titre($title, $newcardbutton, '', 0, 0, '', $morehtmlcenter);
 
         	$page = 0; $param = '';
 
@@ -230,29 +230,29 @@ class FormActions
         		$cacheusers = array();
 
 	        	$cursorevent = 0;
-	        	foreach ($listofactions as $action)
+	        	foreach ($listofactions as $actioncomm)
 	        	{
 	        		if ($max && $cursorevent >= $max) break;
 
-	        		$ref = $action->getNomUrl(1, -1);
-	        		$label = $action->getNomUrl(0, 38);
+	        		$ref = $actioncomm->getNomUrl(1, -1);
+	        		$label = $actioncomm->getNomUrl(0, 38);
 
 	        		print '<tr class="oddeven">';
 	        		// Ref
 					print '<td class="nowraponall">'.$ref.'</td>';
 					// Onwer
 	        		print '<td class="tdoverflowmax150">';
-	        		if (!empty($action->userownerid))
+	        		if (!empty($actioncomm->userownerid))
 	        		{
-	        			if (is_object($cacheusers[$action->userownerid]))
+	        			if (is_object($cacheusers[$actioncomm->userownerid]))
 	        			{
-	        				$tmpuser = $cacheusers[$action->userownerid];
+	        				$tmpuser = $cacheusers[$actioncomm->userownerid];
 	        			}
 	        			else
 	        			{
 	        				$tmpuser = new User($this->db);
-	        				$tmpuser->fetch($action->userownerid);
-	        				$cacheusers[$action->userownerid] = $tmpuser;
+	        				$tmpuser->fetch($actioncomm->userownerid);
+	        				$cacheusers[$actioncomm->userownerid] = $tmpuser;
 	        			}
 	        			if ($tmpuser->id > 0)
 	        			{
@@ -260,41 +260,50 @@ class FormActions
 	        			}
 	        		}
 	        		print '</td>';
+
 					// Type
 	        		print '<td>';
+	        		// TODO Code common with code into comm/action/list.php
 					$imgpicto = '';
 					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
 					{
-						if ($action->type_picto) $imgpicto = img_picto('', $action->type_picto);
+						if ($actioncomm->type_picto) {
+							$imgpicto = img_picto('', $actioncomm->type_picto);
+						}
 						else {
-							if ($action->type_code == 'AC_RDV')       $imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_TEL')   $imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_FAX')   $imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_EMAIL') $imgpicto = img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_INT')   $imgpicto = img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
-							elseif (!preg_match('/_AUTO/', $action->type_code)) $imgpicto = img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
+							if ($actioncomm->type_code == 'AC_RDV')         $imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
+							elseif ($actioncomm->type_code == 'AC_TEL')     $imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
+							elseif ($actioncomm->type_code == 'AC_FAX')     $imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
+							elseif ($actioncomm->type_code == 'AC_EMAIL')   $imgpicto = img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
+							elseif ($actioncomm->type_code == 'AC_INT')     $imgpicto = img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
+							elseif ($actioncomm->type_code == 'AC_OTH' && $actioncomm->code == 'TICKET_MSG') $imgpicto = img_picto('', 'object_conversation', '', false, 0, 0, '', 'paddingright').' ';
+							elseif (!preg_match('/_AUTO/', $actioncomm->type_code)) $imgpicto = img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
 						}
 					}
 					print $imgpicto;
-	        		print $action->type_short ? $action->type_short : $action->type;
+					if ($actioncomm->type_code == 'AC_OTH' && $actioncomm->code == 'TICKET_MSG') {
+						print $langs->trans("Message");
+					} else {
+						print $actioncomm->type_short ? $actioncomm->type_short : $actioncomm->type;
+					}
 	        		print '</td>';
 	        		// Label
 	        		print '<td>'.$label.'</td>';
 	        		// Date
-	        		print '<td class="center">'.dol_print_date($action->datep, 'dayhour', 'tzuserrel');
-	        		if ($action->datef)
+	        		print '<td class="center">'.dol_print_date($actioncomm->datep, 'dayhour', 'tzuserrel');
+	        		if ($actioncomm->datef)
 	        		{
-		        		$tmpa = dol_getdate($action->datep);
-		        		$tmpb = dol_getdate($action->datef);
+		        		$tmpa = dol_getdate($actioncomm->datep);
+		        		$tmpb = dol_getdate($actioncomm->datef);
 		        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
 		        		{
-		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef, 'hour', 'tzuserrel');
+		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($actioncomm->datef, 'hour', 'tzuserrel');
 		        		}
-		        		else print '-'.dol_print_date($action->datef, 'dayhour', 'tzuserrel');
+		        		else print '-'.dol_print_date($actioncomm->datef, 'dayhour', 'tzuserrel');
 	        		}
 	        		print '</td>';
 	        		print '<td class="right">';
-        			print $action->getLibStatut(3);
+        			print $actioncomm->getLibStatut(3);
 	        		print '</td>';
 	        		print '</tr>';
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 43cee63c1ed..bcf47a58eef 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3155,7 +3155,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
         		'intervention', 'label', 'language', 'list', 'listlight', 'lot',
         		'map-marker-alt', 'money-bill-alt', 'mrp', 'note',
         		'object_accounting', 'object_action', 'object_account', 'object_barcode', 'object_bill', 'object_billa', 'object_billd', 'object_bom',
-	        	'object_category', 'object_bookmark', 'object_bug', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_folder',
+	        	'object_category', 'object_conversation', 'object_bookmark', 'object_bug', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_folder',
         		'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
         		'object_cash-register', 'object_company', 'object_contact', 'object_contract', 'object_donation', 'object_dynamicprice',
         		'object_holiday', 'object_hrm', 'object_invoice', 'object_intervention', 'object_label',
@@ -3190,7 +3190,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		    $arrayconvpictotofa = array(
 		    	'account'=>'university', 'accountancy'=>'money-check-alt', 'action'=>'calendar-alt', 'address'=> 'address-book',
 		    	'bank_account'=>'university', 'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'billd'=>'file-medical', 'bom'=>'cubes',
-		    	'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd',
+		    	'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'conversation'=>'comments', 'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd',
 		    	'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins',
 		    	'accounting'=>'chart-line', 'category'=>'tag', 'dollyrevert'=>'dolly',
 		    	'hrm'=>'umbrella-beach', 'margin'=>'calculator', 'members'=>'users', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'lot'=>'barcode',
@@ -3263,7 +3263,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			$arrayconvpictotomorcess = array(
 				'action'=>'bg-infobox-action', 'account'=>'bg-infobox-bank_account', 'accountancy'=>'bg-infobox-bank_account',
 				'bank_account'=>'bg-infobox-bank_account', 'bill'=>'bg-infobox-commande', 'billa'=>'bg-infobox-commande', 'billd'=>'bg-infobox-commande',
-				'cash-register'=>'bg-infobox-bank_account', 'contract'=>'bg-infobox-contrat', 'check'=>'font-status4',
+				'cash-register'=>'bg-infobox-bank_account', 'contract'=>'bg-infobox-contrat', 'check'=>'font-status4', 'conversation'=>'bg-infobox-contrat',
 				'donation'=>'bg-infobox-commande', 'dollyrevert'=>'flip', 'ecm'=>'bg-infobox-action',
 				'hrm'=>'bg-infobox-adherent', 'group'=>'bg-infobox-adherent', 'intervention'=>'bg-infobox-contrat',
 				'multicurrency'=>'bg-infobox-bank_account',
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index e12531b3846..0a50eb7407f 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -709,7 +709,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 				$out .= $histo[$key]['id'];
 				$out .= '</a> ';
 			} else {
-				$out .= $actionstatic->getNomUrl(1, -1).' ';
+				$out .= $actionstatic->getNomUrl(1, -1, 'valignmiddle').' ';
 			}
 
             //if ($user->rights->agenda->allactions->read || $actionstatic->authorid == $user->id)
diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 0730511ad99..38d0acb97fa 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -275,4 +275,4 @@ ALTER TABLE llx_prelevement_facture ADD COLUMN fk_facture_fourn INTEGER NULL;
 
 ALTER TABLE llx_menu MODIFY COLUMN module varchar(255);
 
-
+ALTER TABLE llx_actioncomm SET fk_action = 50 where fk_action = 40 AND code = 'TICKET_MSG'; 
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index fb0808e0953..8c992bf91ca 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -426,6 +426,7 @@ Modules=Modules/Applications
 Option=Option
 List=List
 FullList=Full list
+FullConversation=Full conversation
 Statistics=Statistics
 OtherStatistics=Other statistics
 Status=Status
diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index 1938c68de3e..af656e69ab0 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -370,7 +370,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		}
 
 		// Message list
-		print load_fiche_titre($langs->trans('TicketMessagesList'), '', 'messages@ticket');
+		print load_fiche_titre($langs->trans('TicketMessagesList'), '', 'object_conversation');
 		$object->viewTicketMessages(false, true, $object->dao);
 	}
 	else
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index b5400db04b3..195d4df88bb 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2826,7 +2826,7 @@ else
 
 			$MAXEVENT = 10;
 
-            $morehtmlright = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt', DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id);
+            $morehtmlright = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id);
 
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
diff --git a/htdocs/theme/eldy/timeline.inc.php b/htdocs/theme/eldy/timeline.inc.php
index 21e683e42f0..eb13821c221 100644
--- a/htdocs/theme/eldy/timeline.inc.php
+++ b/htdocs/theme/eldy/timeline.inc.php
@@ -154,7 +154,7 @@ a.timeline-btn:hover
     border-radius: 50%;
     text-align: center;
     left: 18px;
-    top: 0;
+    top: 5px;
 }
 .timeline > .time-label > span {
     font-weight: 600;
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 7d5ab5fe228..6e400b3eeaa 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -143,6 +143,7 @@ if (empty($reshook)) {
 		$action = 'view';
 	}
 
+	// Action to add an action (not a message)
 	if (GETPOST('add', 'alpha') && $user->rights->ticket->write) {
 		$error = 0;
 
@@ -381,6 +382,7 @@ if (empty($reshook)) {
 		$action = 'view';
 	}
 
+	// Action to add an action (not a message)
 	if ($action == 'add_message' && GETPOSTISSET('btn_add_message') && $user->rights->ticket->read) {
 		$ret = $object->newMessage($user, $action, (GETPOST('private_message', 'alpha') == "on" ? 1 : 0));
 
@@ -1218,7 +1220,8 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 		if (GETPOSTISSET('actionbis') && $action == 'presend') $action = 'presend_addmessage';
 
 		// add a message
-		if ($action == 'presend' || $action == 'presend_addmessage') {
+		if ($action == 'presend' || $action == 'presend_addmessage')
+		{
 			$action = 'add_message'; // action to use to post the message
 			$modelmail = 'ticket_send';
 
@@ -1293,8 +1296,8 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 			print '</div>';
 		}
 
-		// Show messages on card
-		if (empty($conf->global->TICKET_HIDE_MESSAGES_ON_CARD)) {
+		// Show messages on card (Note: this is a duplicate of the view Events/Agenda but on the main tab)
+		if (! empty($conf->global->TICKET_SHOW_MESSAGES_ON_CARD)) {
 			$param = '&id='.$object->id;
 			if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
 			if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
@@ -1337,16 +1340,23 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 			print showDirectPublicLink($object).'<br>';
 			print '</div>';
 
-			if (!empty($conf->global->TICKET_HIDE_MESSAGES_ON_CARD)) {
+			if (empty($conf->global->TICKET_SHOW_MESSAGES_ON_CARD)) {
 				print '<div class="fichehalfright"><div class="ficheaddleft">';
 
+				$MAXEVENT = 10;
+
+				$morehtmlcenter = dolGetButtonTitle($langs->trans('FullConversation'), '', 'fa fa-comments imgforviewmode', DOL_URL_ROOT.'/ticket/messaging.php?id='.$object->id);
+				$morehtmlcenter .= ' ';
+				$morehtmlcenter .= dolGetButtonTitle($langs->trans('FullList'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/ticket/agenda.php?id='.$object->id);
+
 				// List of actions on element
 				include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 				$formactions = new FormActions($db);
-				$somethingshown = $formactions->showactions($object, 'ticket', $socid, 1);
+				$somethingshown = $formactions->showactions($object, 'ticket', $socid, 1, 'listactions', $MAXEVENT, '', $morehtmlcenter);
 
 				print '</div></div>';
 			}
+
 			print '</div>';
 		}
 	}
diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php
index 9a67c3dd574..9931b12ffa2 100644
--- a/htdocs/ticket/class/actions_ticket.class.php
+++ b/htdocs/ticket/class/actions_ticket.class.php
@@ -272,6 +272,7 @@ class ActionsTicket
 				print $langs->trans('User');
 				print '</td>';
 			}
+			print '</tr>';
 
 			foreach ($this->dao->cache_msgs_ticket as $id => $arraymsgs) {
 				if (!$arraymsgs['private']
@@ -280,7 +281,7 @@ class ActionsTicket
 					//print '<tr>';
 					print '<tr class="oddeven">';
 					print '<td><strong>';
-					print dol_print_date($arraymsgs['datec'], 'dayhour');
+					print img_picto('', 'actioncomm', 'class="paddingright"').dol_print_date($arraymsgs['datec'], 'dayhour');
 					print '<strong></td>';
 					if ($show_user) {
 						print '<td>';
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index f94599153f0..4db98cfe7ad 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1559,7 +1559,7 @@ class Ticket extends CommonObject
 		// Insert entry into agenda with code 'TICKET_MSG'
 		include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 		$actioncomm = new ActionComm($this->db);
-		$actioncomm->type_code = 'AC_OTH_AUTO';
+		$actioncomm->type_code = 'AC_OTH';
 		$actioncomm->code = 'TICKET_MSG';
 		if ($this->private) {
 			$actioncomm->code = 'TICKET_MSG_PRIVATE';

From 7e7a10f8d2140ff2ca0eae2a3818bb2da35435b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 7 May 2020 22:55:21 +0200
Subject: [PATCH 085/490] clean

---
 htdocs/core/class/html.formmail.class.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 45c40a8bc72..6007dd1dbaa 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -669,15 +669,8 @@ class FormMail extends Form
 				}
 				else
 				{
-					// The free input of email
-					// if (!empty($this->withtofree))
-					// {
-					// 	$out .= '<input class="minwidth200" id="sendto" name="sendto" value="'.(($this->withtofree && !is_numeric($this->withtofree)) ? $this->withtofree : (!is_array($this->withto) && !is_numeric($this->withto) ? (isset($_REQUEST["sendto"]) ? $_REQUEST["sendto"] : $this->withto) : "")).'" />';
-					// }
-					// The select combo
 					if (!empty($this->withto) && is_array($this->withto))
 					{
-						//if (!empty($this->withtofree)) $out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withto;
 						foreach ($tmparray as $key => $val)
@@ -744,10 +737,8 @@ class FormMail extends Form
 				}
 				else
 				{
-				    //$out .= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.(GETPOST("sendtocc", "alpha") ? GETPOST("sendtocc", "alpha") : ((!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : '')).'" />';
 					if (!empty($this->withtocc) && is_array($this->withtocc))
 					{
-						//$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withtocc;
 						foreach ($tmparray as $key => $val)

From b88a84323b34d47c81b1929b3f1d6fb8354434b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 7 May 2020 22:59:34 +0200
Subject: [PATCH 086/490] clean

---
 htdocs/core/actions_sendmails.inc.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index f647bd5418e..d6c4c0a6313 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -265,7 +265,6 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			}
 		}
 		$sendtocc = implode(',', $tmparray);
-		//var_dump($sendto, $sendtocc);exit;
 
 		if (dol_strlen($sendto))
 		{

From dca3f3b31f2075c4a65056a0d5ca0dfe5941615b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 May 2020 22:59:40 +0200
Subject: [PATCH 087/490] Look adn feel v12

---
 htdocs/ticket/class/actions_ticket.class.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php
index 9931b12ffa2..147f6228005 100644
--- a/htdocs/ticket/class/actions_ticket.class.php
+++ b/htdocs/ticket/class/actions_ticket.class.php
@@ -380,8 +380,7 @@ class ActionsTicket
 		global $langs;
 
 		print '<div class="div-table-responsive-no-min margintoponly">';
-		print '<div class="tagtable centpercent">';
-		print '<div class="tagtr">';
+		print '<div class="centpercent right">';
 		// Exclude status which requires specific method
 		$exclude_status = array(Ticket::STATUS_CLOSED, Ticket::STATUS_CANCELED);
 		// Exclude actual status
@@ -392,7 +391,7 @@ class ActionsTicket
 
 		foreach ($object->statuts_short as $status => $status_label) {
 			if (!in_array($status, $exclude_status)) {
-				print '<div class="tagtd center">';
+				print '<div class="inline-block center marginbottomonly">';
 
 				if ($status == 1)
 				{
@@ -403,13 +402,13 @@ class ActionsTicket
 					$urlforbutton = $_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'&action=set_status&new_status='.$status;
 				}
 
-				print '<a class="butAction buttonticket" href="'.$urlforbutton.'">';
+				print '<a class="butAction buttonticket marginbottomonly" href="'.$urlforbutton.'">';
 				print img_picto($langs->trans($object->statuts_short[$status]), 'statut'.$status.'.png@ticket').' '.$langs->trans($object->statuts_short[$status]);
 				print '</a>';
 				print '</div>';
 			}
 		}
-		print '</div></div></div><br>';
+		print '</div></div><br>';
 	}
 
 	/**

From f23451e1c986143235b7aea6750293b878f0e1f7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 May 2020 23:04:52 +0200
Subject: [PATCH 088/490] Update facture.class.php

---
 htdocs/compta/facture/class/facture.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index ffa96fe5237..fd6a6d32642 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1180,7 +1180,7 @@ class Facture extends CommonInvoice
 			}
 						// Bloc to update dates of service (month by month only if previously filled at 1d near start or end of month)
 			// If it's a service with start and end dates
-			if ($line->product_type == 1 && !empty($line->date_start) && !empty($line->date_end) ) {
+			if (!empty($line->date_start) && !empty($line->date_end) ) {
 				// Get the dates
 				$start = dol_getdate($line->date_start);
 				$end = dol_getdate($line->date_end);

From 8f9ee3250dba03aea88cfd5188253383c866e2fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 7 May 2020 23:28:32 +0200
Subject: [PATCH 089/490] clean

---
 htdocs/core/class/html.formmail.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 6007dd1dbaa..8881b93349f 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -669,6 +669,7 @@ class FormMail extends Form
 				}
 				else
 				{
+					// The select combo
 					if (!empty($this->withto) && is_array($this->withto))
 					{
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time

From 830a117aa7ae799cd93021b68408aa177b733cc4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 May 2020 23:39:03 +0200
Subject: [PATCH 090/490] Suggest fix for #13824

---
 htdocs/bom/class/bom.class.php       | 5 ++++-
 htdocs/takepos/admin/bar.php         | 2 +-
 htdocs/takepos/admin/setup.php       | 2 +-
 htdocs/takepos/genimg/qr.php         | 2 +-
 htdocs/takepos/phone.php             | 8 ++++----
 htdocs/takepos/public/auto_order.php | 6 +++++-
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index c2c18dae6e5..3e522b3c11f 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1004,6 +1004,7 @@ class BOM extends CommonObject
 
 	/**
 	 * BOM costs calculation based on cost_price or pmp of each BOM line
+	 *
 	 * @return void
 	 */
 	public function calculateCosts()
@@ -1022,7 +1023,9 @@ class BOM extends CommonObject
 		}
 
 		$this->total_cost = price2num($this->total_cost, 'MT');
-		$this->unit_cost = price2num($this->total_cost / $this->qty, 'MU');
+		if ($this->qty) {
+			$this->unit_cost = price2num($this->total_cost / $this->qty, 'MU');
+		}
 	}
 }
 
diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index 7b6e1d9a98c..5c255dc89c7 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -157,7 +157,7 @@ if ($conf->global->TAKEPOS_AUTO_ORDER)
 		print '<td>';
 		print "<a target='_blank' href='".$urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($row['rowid'])."'>".$urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($row['rowid'])."</a>";
 		print '<td>';
-		print "<img src='".DOL_DOCUMENT_ROOT."/takepos/genimg/qr.php?id=".dol_encode($row['rowid'])."' height='42' width='42'>";
+		print "<img src='".DOL_URL_ROOT."/takepos/genimg/qr.php?id=".dol_encode($row['rowid'])."' height='42' width='42'>";
 		print '</td></tr>';
     }
 
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 59fe85e66ef..85406c46faa 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -274,7 +274,7 @@ if (!empty($conf->service->enabled))
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("RootCategoryForProductsToSell"), $langs->trans("RootCategoryForProductsToSellDesc"));
 print '<td colspan="2">';
-print $form->select_all_categories(Categorie::TYPE_PRODUCT, $conf->global->TAKEPOS_ROOT_CATEGORY_ID, 'TAKEPOS_ROOT_CATEGORY_ID', 64, 0, 0);
+print img_object('', 'category', 'class="paddingright"').$form->select_all_categories(Categorie::TYPE_PRODUCT, $conf->global->TAKEPOS_ROOT_CATEGORY_ID, 'TAKEPOS_ROOT_CATEGORY_ID', 64, 0, 0);
 print ajax_combobox('TAKEPOS_ROOT_CATEGORY_ID');
 print "</td></tr>\n";
 
diff --git a/htdocs/takepos/genimg/qr.php b/htdocs/takepos/genimg/qr.php
index f0c3bea82b9..c73e874a465 100644
--- a/htdocs/takepos/genimg/qr.php
+++ b/htdocs/takepos/genimg/qr.php
@@ -29,5 +29,5 @@ require '../../core/modules/barcode/doc/tcpdfbarcode.modules.php';
 
 $key = GETPOST('key');
 
-$module = new modtcpdfbarcode($db);
+$module = new modTcpdfbarcode($db);
 $result = $module->buildBarCode("http://www.takepos.com", 'QRCODE', 'Y');
diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 80d67513bf2..eac1f40bfd1 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -31,14 +31,14 @@ if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
 if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
 if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
 
-require '../main.inc.php'; // Load $user and permissions
+if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 
-if ($_SESSION["publicterminal"]){
-	// Decode place if is a order from customer phone
+if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+	// Decode place if it is an order from customer phone
 	$key = GETPOST('key');
 	$place=dol_decode($key);
 }
@@ -53,7 +53,7 @@ if ($setterminal > 0)
 
 $langs->loadLangs(array("bills", "orders", "commercial", "cashdesk", "receiptprinter"));
 
-if ($_SESSION["publicterminal"]) {
+if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 	$_SESSION["takeposterminal"] = 1; // Use Terminal 1 for public customers
 }
 elseif (empty($user->rights->takepos->run)) {
diff --git a/htdocs/takepos/public/auto_order.php b/htdocs/takepos/public/auto_order.php
index c97edfdc0e7..5b463959b69 100644
--- a/htdocs/takepos/public/auto_order.php
+++ b/htdocs/takepos/public/auto_order.php
@@ -24,6 +24,10 @@
 if (!defined("NOLOGIN"))       define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 if (!defined('NOIPCHECK'))	   define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
 
+require '../../main.inc.php';
+
 $_SESSION["basiclayout"] = 1;
 $_SESSION["publicterminal"] = true; // Is a public customer
-require '../phone.php';
+
+define('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE', 1);
+include '../phone.php';

From 790bef98e5e271cc3750d2f9ff5749b590262ebb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 May 2020 23:45:33 +0200
Subject: [PATCH 091/490] Look and feel v12

---
 htdocs/ticket/class/actions_ticket.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php
index 147f6228005..0fb5835cb4c 100644
--- a/htdocs/ticket/class/actions_ticket.class.php
+++ b/htdocs/ticket/class/actions_ticket.class.php
@@ -281,7 +281,7 @@ class ActionsTicket
 					//print '<tr>';
 					print '<tr class="oddeven">';
 					print '<td><strong>';
-					print img_picto('', 'actioncomm', 'class="paddingright"').dol_print_date($arraymsgs['datec'], 'dayhour');
+					print img_picto('', 'object_action', 'class="paddingright"').dol_print_date($arraymsgs['datec'], 'dayhour');
 					print '<strong></td>';
 					if ($show_user) {
 						print '<td>';

From d9a0edcf2b83aa9e9f6e35fefa8e740f1c36ab14 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 8 May 2020 00:01:56 +0200
Subject: [PATCH 092/490] FIX missing file manifest.json.php

---
 htdocs/theme/md/manifest.json.php | 57 +++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 htdocs/theme/md/manifest.json.php

diff --git a/htdocs/theme/md/manifest.json.php b/htdocs/theme/md/manifest.json.php
new file mode 100644
index 00000000000..f8d059752a6
--- /dev/null
+++ b/htdocs/theme/md/manifest.json.php
@@ -0,0 +1,57 @@
+<?php
+/* Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2006		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2007-2017	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2018       Ferran Marcet           <fmarcet@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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FI8TNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *		\file       htdocs/theme/md/manifest.json.php
+ *		\brief      File for The Web App
+ */
+
+if (! defined('NOREQUIREUSER'))   define('NOREQUIREUSER', '1');
+if (! defined('NOREQUIREDB'))     define('NOREQUIREDB', '1');
+if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
+if (! defined('NOREQUIRETRAN'))   define('NOREQUIRETRAN', '1');
+if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK', '1');
+if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', '1');
+if (! defined('NOLOGIN'))         define('NOLOGIN', '1');
+if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU', '1');
+if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML', '1');
+if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
+
+require_once __DIR__.'/../../main.inc.php';
+
+$appli=constant('DOL_APPLICATION_TITLE');
+if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
+
+?>
+{
+    "name": "<?php echo $appli; ?>",
+    "icons": [
+        {
+            "src": "<?php echo DOL_URL_ROOT.'/theme/dolibarr_logo_256x256.png'; ?>",
+            "sizes": "256x256",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}
\ No newline at end of file

From 1a9afe6b203b1224ae0e4a641dcefe3c2073eb0a Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 8 May 2020 01:40:25 +0200
Subject: [PATCH 093/490] Fix missing hook params for printFieldListValue

---
 htdocs/accountancy/bookkeeping/list.php        | 2 +-
 htdocs/adherents/list.php                      | 2 +-
 htdocs/adherents/subscription/list.php         | 2 +-
 htdocs/admin/emailcollector_list.php           | 2 +-
 htdocs/asset/list.php                          | 2 +-
 htdocs/comm/action/list.php                    | 2 +-
 htdocs/comm/propal/list.php                    | 2 +-
 htdocs/commande/list.php                       | 2 +-
 htdocs/compta/bank/list.php                    | 2 +-
 htdocs/compta/cashcontrol/cashcontrol_list.php | 2 +-
 htdocs/compta/facture/list.php                 | 2 +-
 htdocs/contact/list.php                        | 2 +-
 htdocs/contrat/list.php                        | 2 +-
 htdocs/contrat/services_list.php               | 2 +-
 htdocs/expedition/list.php                     | 2 +-
 htdocs/expensereport/list.php                  | 2 +-
 htdocs/fichinter/list.php                      | 2 +-
 htdocs/fourn/facture/list.php                  | 2 +-
 htdocs/holiday/list.php                        | 2 +-
 htdocs/product/list.php                        | 2 +-
 htdocs/product/stock/list.php                  | 2 +-
 htdocs/product/stock/productlot_list.php       | 2 +-
 htdocs/projet/list.php                         | 2 +-
 htdocs/projet/tasks/list.php                   | 2 +-
 htdocs/projet/tasks/time.php                   | 2 +-
 htdocs/reception/list.php                      | 2 +-
 htdocs/societe/list.php                        | 2 +-
 htdocs/societe/website.php                     | 2 +-
 htdocs/supplier_proposal/list.php              | 2 +-
 htdocs/ticket/list.php                         | 2 +-
 htdocs/user/list.php                           | 2 +-
 htdocs/zapier/hook_list.php                    | 2 +-
 32 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index d8fe9975da5..129fedf3867 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -966,7 +966,7 @@ while ($i < min($num, $limit))
 	}
 
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index c9b7ee42fcf..838e7cd9a5c 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -872,7 +872,7 @@ while ($i < min($num, $limit))
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index a582584ae7f..fa47d01cd41 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -524,7 +524,7 @@ while ($i < min($num, $limit))
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index 53d9fd8d1f1..9c76c176414 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -479,7 +479,7 @@ while ($i < min($num, $limit))
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index fb8c4066a10..ae307bf1a42 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -459,7 +459,7 @@ while ($i < min($num, $limit))
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 95a3e6dbe09..410d31fb07e 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -718,7 +718,7 @@ if ($resql)
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index dcc9c7a54c7..eaeea9e3d43 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -1065,7 +1065,7 @@ if ($resql)
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i);
+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index e2b6aa06136..8a023cf7e80 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1075,7 +1075,7 @@ if ($resql)
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i);
+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index e0d7f7d5c29..ac2caaf94eb 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -529,7 +529,7 @@ foreach ($accounts as $key=>$type)
     // Extra fields
     include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
     // Fields from hook
-    $parameters=array('arrayfields'=>$arrayfields);
+    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
     $reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $objecttmp);    // Note that $action and $objecttmpect may have been modified by hook
     print $hookmanager->resPrint;
 	// Date creation
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index 6c59276d600..c13528224c4 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -496,7 +496,7 @@ while ($i < min($num, $limit))
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index f5ab943d831..c3bfe93bf30 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1313,7 +1313,7 @@ if ($resql)
 			// Extra fields
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 			// Fields from hook
-			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i);
+			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 			// Date creation
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 9903e37cd5e..d51399d21a9 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -936,7 +936,7 @@ while ($i < min($num, $limit))
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index c32e45c1b42..857f9609d36 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -744,7 +744,7 @@ while ($i < min($num, $limit))
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 29501ddee88..85579d65980 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -687,7 +687,7 @@ while ($i < min($num, $limit))
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 	$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index d5cda3e2ebb..c3db317c9de 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -591,7 +591,7 @@ if ($resql)
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 5604ee77dc3..7f5e86d9c98 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -761,7 +761,7 @@ if ($resql)
             // Extra fields
             include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
             // Fields from hook
-            $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+            $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
             $reshook=$hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
 
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 03000bdb44d..fd45d2daecb 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -562,7 +562,7 @@ if ($resql)
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 		$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index b895bf63513..ddb2ce853b1 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -1058,7 +1058,7 @@ if ($resql)
 			// Extra fields
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 			// Fields from hook
-			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 			// Date creation
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 2277563aaa0..18df214f4c6 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -744,7 +744,7 @@ if ($resql)
 			// Extra fields
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 			// Fields from hook
-			$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+			$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 			$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index ce3f8f1cd81..cc12bc73349 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -1148,7 +1148,7 @@ if ($resql)
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index e4ad265c793..057735c49cc 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -571,7 +571,7 @@ if ($num)
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 527afee2607..154ede71956 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -476,7 +476,7 @@ if ($resql)
 			// Extra fields
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 			// Fields from hook
-			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 			// Date creation
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 650c14c5ee2..f3a8900a148 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -895,7 +895,7 @@ while ($i < min($num, $limit))
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 3fd85f4082e..7d995965294 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -836,7 +836,7 @@ while ($i < min($num, $limit))
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 		$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index f9069f7efa7..3a5e3c89ae3 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1332,7 +1332,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
             */
 
 			// Fields from hook
-			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$task_time);
+			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$task_time, 'i'=>$i, 'totalarray'=>&$totalarray);
 			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index fea2662b93f..7566edfc610 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -885,7 +885,7 @@ if ($resql)
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index e480d68eca4..4e033e5f35e 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -1279,7 +1279,7 @@ while ($i < min($num, $limit))
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 5d248ec16fd..d5e89459771 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -481,7 +481,7 @@ while ($i < min($num, $limit))
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objectwebsiteaccount); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index a133d781337..91ef70c7b94 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -779,7 +779,7 @@ if ($resql)
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 		$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 8d76ef5c5eb..08419e5c46d 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -669,7 +669,7 @@ while ($i < min($num, $limit))
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index eb14f61e982..1ceec68a622 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -655,7 +655,7 @@ while ($i < min($num, $limit))
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 	$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
diff --git a/htdocs/zapier/hook_list.php b/htdocs/zapier/hook_list.php
index 56a68ad7300..dbd9239e752 100644
--- a/htdocs/zapier/hook_list.php
+++ b/htdocs/zapier/hook_list.php
@@ -519,7 +519,7 @@ while ($i < min($num, $limit)) {
     // Extra fields
     include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
     // Fields from hook
-    $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+    $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
     $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
     // Action column

From 42ee755ea5189842673d8d1f374efef088404bfe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 May 2020 02:52:55 +0200
Subject: [PATCH 094/490] Look and feel v12

---
 htdocs/admin/translation.php   | 10 +++++-----
 htdocs/comm/action/list.php    |  4 ++--
 htdocs/core/lib/agenda.lib.php |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 520cee44913..c17c2bdcee6 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -365,9 +365,9 @@ if ($mode == 'overwrite')
     		}
     		else
     		{
-    			print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=edit'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
+    			print '<a class="reposition editfielda paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=edit'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
 				print ' &nbsp; ';
-    			print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
+    			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
     		}
     		print '</td>';
 
@@ -531,8 +531,8 @@ if ($mode == 'searchkey')
                 {
                     $obj = $db->fetch_object($result);
                 }
-                print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=edit">'.img_edit().'</a>';
-                print '&nbsp;&nbsp;';
+                print '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=edit">'.img_edit().'</a>';
+                print ' ';
                 print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=delete">'.img_delete().'</a>';
                 print '&nbsp;&nbsp;';
                 $htmltext = $langs->trans("OriginalValueWas", $newlangfileonly->tab_translate[$key]);
@@ -541,7 +541,7 @@ if ($mode == 'searchkey')
             elseif (!empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
             {
             	//print $key.'-'.$val;
-                print '<a href="'.$_SERVER['PHP_SELF'].'?mode=overwrite&amp;langcode='.$langcode.'&amp;transkey='.$key.'">'.img_edit_add($langs->trans("Overwrite")).'</a>';
+                print '<a class="reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=overwrite&amp;langcode='.$langcode.'&amp;transkey='.$key.'">'.img_edit_add($langs->trans("Overwrite")).'</a>';
             }
 
             if (!empty($conf->global->MAIN_FEATURES_LEVEL))
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index ef6e21c39cd..e804213cdce 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -625,7 +625,7 @@ if ($resql)
 		$formatToUse = $obj->fulldayevent ? 'day' : 'dayhour';
 		// Start date
 		if (!empty($arrayfields['a.datep']['checked'])) {
-			print '<td class="center">';
+			print '<td class="center nowraponall">';
 			print dol_print_date($db->jdate($obj->dp), $formatToUse);
 			$late = 0;
 			if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late = 1;
@@ -638,7 +638,7 @@ if ($resql)
 
 		// End date
 		if (!empty($arrayfields['a.datep2']['checked'])) {
-			print '<td class="center">';
+			print '<td class="center nowraponall">';
 			print dol_print_date($db->jdate($obj->dp2), $formatToUse);
 			print '</td>';
 		}
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 8dc2e418cc8..474a4f03696 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -27,7 +27,7 @@
 /**
  * Show filter form in agenda view
  *
- * @param	Object	$form			Form object
+ * @param	Form	$form			Form object
  * @param	int		$canedit		Can edit filter fields
  * @param	int		$status			Status
  * @param 	int		$year			Year
@@ -123,7 +123,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		print $langs->trans("ThirdParty").' &nbsp; ';
 		print '</td><td class="nowrap" style="padding-bottom: 2px;">';
 		print img_picto('', 'company');
-		print $form->select_company($socid, 'search_socid', '', 'SelectThirdParty', 0, 0, null, 0);
+		print $form->select_company($socid, 'search_socid', '', '&nbsp;', 0, 0, null, 0);
 		print '</td></tr>';
 	}
 

From a649dcecf767cd63a5b30234916b1c7b6613fac9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 May 2020 03:01:51 +0200
Subject: [PATCH 095/490] Look and field

---
 htdocs/takepos/admin/bar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index 5c255dc89c7..2508ab56040 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -85,7 +85,7 @@ print '<input type="hidden" name="action" value="set">';
 print '<div class="div-table-responsive">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
+print '<td class="titlefieldcreate">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 if ($conf->global->TAKEPOS_BAR_RESTAURANT && $conf->global->TAKEPOS_PRINT_METHOD != "browser") {

From e55d9ed3b89c8f9e477e523e856419f8e8a62765 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 May 2020 03:02:53 +0200
Subject: [PATCH 096/490] Trans

---
 htdocs/langs/en_US/cashdesk.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index b22a7b83166..52c2004c1c7 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -95,7 +95,7 @@ PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use payment icon on numpad
-CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale

From a49635a825360a8cb92acecb92dae14d389693b0 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 8 May 2020 07:45:01 +0200
Subject: [PATCH 097/490] NEW Bookkeeping by account - Add selectfields & hook

---
 .../accountancy/bookkeeping/listbyaccount.php | 453 ++++++++++++------
 1 file changed, 318 insertions(+), 135 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 78f29e97595..582e54442a5 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -70,6 +70,13 @@ $pagenext = $page + 1;
 if ($sortorder == "") $sortorder = "ASC";
 if ($sortfield == "") $sortfield = "t.doc_date,t.rowid";
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$object = new BookKeeping($db);
+$hookmanager->initHooks(array('bookkeepingbyaccountlist'));
+
+$formaccounting = new FormAccounting($db);
+$form = new Form($db);
+
 if (empty($search_date_start) && empty($search_date_end) && GETPOSTISSET('search_date_startday') && GETPOSTISSET('search_date_startmonth') && GETPOSTISSET('search_date_starthour')) {
 	$sql = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
 	$sql .= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."'";
@@ -96,87 +103,112 @@ if (empty($search_date_start) && empty($search_date_end) && GETPOSTISSET('search
 	}
 }
 
+$arrayfields = array(
+	// 't.subledger_account'=>array('label'=>$langs->trans("SubledgerAccount"), 'checked'=>1),
+	't.piece_num'=>array('label'=>$langs->trans("TransactionNumShort"), 'checked'=>1),
+	't.doc_date'=>array('label'=>$langs->trans("Docdate"), 'checked'=>1),
+	't.doc_ref'=>array('label'=>$langs->trans("Piece"), 'checked'=>1),
+	't.label_operation'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
+	't.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1),
+	't.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1),
+	't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1),
+	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
+	// 't.date_creation'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0),
+	// 't.tms'=>array('label'=>$langs->trans("DateModification"), 'checked'=>0),
+	// 't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
+);
+
+if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) unset($arrayfields['t.lettering_code']);
+
+
 $object = new BookKeeping($db);
 
 /*
  * Action
  */
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-{
-	$search_doc_date = '';
-	$search_accountancy_code = '';
-	$search_accountancy_code_start = '';
-	$search_accountancy_code_end = '';
-	$search_label_account = '';
-	$search_doc_ref = '';
-	$search_label_operation = '';
-	$search_direction = '';
-	$search_ledger_code = '';
-	$search_date_start = '';
-	$search_date_end = '';
-	$search_date_startyear = '';
-	$search_date_startmonth = '';
-	$search_date_startday = '';
-	$search_date_endyear = '';
-	$search_date_endmonth = '';
-	$search_date_endday = '';
-	$search_debit = '';
-	$search_credit = '';
-}
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-// Must be after the remove filter action, before the export.
-$param = '';
-$filter = array();
+if (empty($reshook)) {
+	include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
 
-if (!empty($search_date_start)) {
-	$filter['t.doc_date>='] = $search_date_start;
-	$param .= '&search_date_startmonth='.GETPOST('search_date_startmonth', 'int').'&search_date_startday='.GETPOST('search_date_startday', 'int').'&search_date_startyear='.GETPOST('search_date_startyear', 'int');
-}
-if (!empty($search_date_end)) {
-	$filter['t.doc_date<='] = $search_date_end;
-	$param .= '&search_date_endmonth='.GETPOST('search_date_endmonth', 'int').'&search_date_endday='.GETPOST('search_date_endday', 'int').'&search_date_endyear='.GETPOST('search_date_endyear', 'int');
-}
-if (!empty($search_doc_date)) {
-	$filter['t.doc_date'] = $search_doc_date;
-	$param .= '&doc_datemonth='.GETPOST('doc_datemonth', 'int').'&doc_dateday='.GETPOST('doc_dateday', 'int').'&doc_dateyear='.GETPOST('doc_dateyear', 'int');
-}
-if (!empty($search_accountancy_code_start)) {
-	$filter['t.numero_compte>='] = $search_accountancy_code_start;
-	$param .= '&search_accountancy_code_start='.urlencode($search_accountancy_code_start);
-}
-if (!empty($search_accountancy_code_end)) {
-	$filter['t.numero_compte<='] = $search_accountancy_code_end;
-	$param .= '&search_accountancy_code_end='.urlencode($search_accountancy_code_end);
-}
-if (!empty($search_label_account)) {
-	$filter['t.label_compte'] = $search_label_account;
-	$param .= '&search_label_compte='.urlencode($search_label_account);
-}
-if (!empty($search_doc_ref)) {
-	$filter['t.doc_ref'] = $search_doc_ref;
-	$param .= '&search_doc_ref='.urlencode($search_doc_ref);
-}
-if (!empty($search_label_operation)) {
-	$filter['t.label_operation'] = $search_label_operation;
-	$param .= '&search_label_operation='.urlencode($search_label_operation);
-}
-if (!empty($search_direction)) {
-	$filter['t.sens'] = $search_direction;
-	$param .= '&search_direction='.urlencode($search_direction);
-}
-if (!empty($search_ledger_code)) {
-	$filter['t.code_journal'] = $search_ledger_code;
-	$param .= '&search_ledger_code='.urlencode($search_ledger_code);
-}
-if (!empty($search_debit)) {
-	$filter['t.debit'] = $search_debit;
-	$param .= '&search_debit='.urlencode($search_debit);
-}
-if (!empty($search_credit)) {
-	$filter['t.credit'] = $search_credit;
-	$param .= '&search_credit='.urlencode($search_credit);
-}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$search_doc_date = '';
+		$search_accountancy_code = '';
+		$search_accountancy_code_start = '';
+		$search_accountancy_code_end = '';
+		$search_label_account = '';
+		$search_doc_ref = '';
+		$search_label_operation = '';
+		$search_direction = '';
+		$search_ledger_code = '';
+		$search_date_start = '';
+		$search_date_end = '';
+		$search_date_startyear = '';
+		$search_date_startmonth = '';
+		$search_date_startday = '';
+		$search_date_endyear = '';
+		$search_date_endmonth = '';
+		$search_date_endday = '';
+		$search_debit = '';
+		$search_credit = '';
+	}
 
+	// Must be after the remove filter action, before the export.
+	$param = '';
+	$filter = array();
+
+	if (!empty($search_date_start)) {
+		$filter['t.doc_date>='] = $search_date_start;
+		$param .= '&search_date_startmonth=' . GETPOST('search_date_startmonth', 'int') . '&search_date_startday=' . GETPOST('search_date_startday', 'int') . '&search_date_startyear=' . GETPOST('search_date_startyear', 'int');
+	}
+	if (!empty($search_date_end)) {
+		$filter['t.doc_date<='] = $search_date_end;
+		$param .= '&search_date_endmonth=' . GETPOST('search_date_endmonth', 'int') . '&search_date_endday=' . GETPOST('search_date_endday', 'int') . '&search_date_endyear=' . GETPOST('search_date_endyear', 'int');
+	}
+	if (!empty($search_doc_date)) {
+		$filter['t.doc_date'] = $search_doc_date;
+		$param .= '&doc_datemonth=' . GETPOST('doc_datemonth', 'int') . '&doc_dateday=' . GETPOST('doc_dateday', 'int') . '&doc_dateyear=' . GETPOST('doc_dateyear', 'int');
+	}
+	if (!empty($search_accountancy_code_start)) {
+		$filter['t.numero_compte>='] = $search_accountancy_code_start;
+		$param .= '&search_accountancy_code_start=' . urlencode($search_accountancy_code_start);
+	}
+	if (!empty($search_accountancy_code_end)) {
+		$filter['t.numero_compte<='] = $search_accountancy_code_end;
+		$param .= '&search_accountancy_code_end=' . urlencode($search_accountancy_code_end);
+	}
+	if (!empty($search_label_account)) {
+		$filter['t.label_compte'] = $search_label_account;
+		$param .= '&search_label_compte=' . urlencode($search_label_account);
+	}
+	if (!empty($search_doc_ref)) {
+		$filter['t.doc_ref'] = $search_doc_ref;
+		$param .= '&search_doc_ref=' . urlencode($search_doc_ref);
+	}
+	if (!empty($search_label_operation)) {
+		$filter['t.label_operation'] = $search_label_operation;
+		$param .= '&search_label_operation=' . urlencode($search_label_operation);
+	}
+	if (!empty($search_direction)) {
+		$filter['t.sens'] = $search_direction;
+		$param .= '&search_direction=' . urlencode($search_direction);
+	}
+	if (!empty($search_ledger_code)) {
+		$filter['t.code_journal'] = $search_ledger_code;
+		$param .= '&search_ledger_code=' . urlencode($search_ledger_code);
+	}
+	if (!empty($search_debit)) {
+		$filter['t.debit'] = $search_debit;
+		$param .= '&search_debit=' . urlencode($search_debit);
+	}
+	if (!empty($search_credit)) {
+		$filter['t.credit'] = $search_credit;
+		$param .= '&search_credit=' . urlencode($search_credit);
+	}
+}
 
 if ($action == 'delmouvconfirm') {
 	$mvt_num = GETPOST('mvt_num', 'int');
@@ -267,14 +299,25 @@ if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($l
 
 print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $viewflat.$newcardbutton, '', $limit);
 
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
+else $moreforfilter = $hookmanager->resPrint;
+
 // Reverse sort order
 if (preg_match('/^asc/i', $sortorder)) $sortorder = "asc";
 else $sortorder = "desc";
 
 print '<div class="div-table-responsive">';
-print '<table class="noborder centpercent">';
+print '<table class="tagtable liste centpercent">';
 
-print '<tr class="liste_titre">';
+// Filters lines
+print '<tr class="liste_titre_filter">';
+// Accountancy account
 print '<td class="liste_titre">';
 print '<div class="nowrap">';
 print $langs->trans('From').' ';
@@ -285,35 +328,64 @@ print $langs->trans('to').' ';
 print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, 'maxwidth200');
 print '</div>';
 print '</td>';
-print '<td class="liste_titre"></td>';
+// Date document
+if (!empty($arrayfields['t.doc_date']['checked'])) {
+	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre center">';
+	print $langs->trans('From') . ': ';
+	print $form->selectDate($search_date_start, 'search_date_start', 0, 0, 1);
+	print '<br>';
+	print $langs->trans('to') . ': ';
+	print $form->selectDate($search_date_end, 'search_date_end', 0, 0, 1);
+	print '</td>';
+}
+// Ref document
+if (!empty($arrayfields['t.doc_ref']['checked'])) {
+	print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_doc_ref" value="' . dol_escape_htmltag($search_doc_ref) . '"/></td>';
+}
+// Label operation
+if (!empty($arrayfields['t.label_operation']['checked'])) {
+	print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_label_operation" value="' . dol_escape_htmltag($search_label_operation) . '"/></td>';
+}
+// Debit
+if (!empty($arrayfields['t.debit']['checked'])) {
+	print '<td class="liste_titre right"><input type="text" class="flat" name="search_debit" size="4" value="' . dol_escape_htmltag($search_debit) . '"></td>';
+}
+// Credit
+if (!empty($arrayfields['t.credit']['checked'])) {
+	print '<td class="liste_titre right"><input type="text" class="flat" name="search_credit" size="4" value="' . dol_escape_htmltag($search_credit) . '"></td>';
+}
+// Code journal
+if (!empty($arrayfields['t.code_journal']['checked'])) {
+	print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="' . dol_escape_htmltag($search_ledger_code) . '"></td>';
+}
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+// Action column
 print '<td class="liste_titre center">';
-print $langs->trans('From').': ';
-print $form->selectDate($search_date_start, 'search_date_start', 0, 0, 1);
-print '<br>';
-print $langs->trans('to').': ';
-print $form->selectDate($search_date_end, 'search_date_end', 0, 0, 1);
-print '</td>';
-print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_doc_ref" value="'.dol_escape_htmltag($search_doc_ref).'"/></td>';
-print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_label_operation" value="'.dol_escape_htmltag($search_label_operation).'"/></td>';
-print '<td class="liste_titre right"><input type="text" class="flat" name="search_debit" size="4" value="'.dol_escape_htmltag($search_debit).'"></td>';
-print '<td class="liste_titre right"><input type="text" class="flat" name="search_credit" size="4" value="'.dol_escape_htmltag($search_credit).'"></td>';
-print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="'.dol_escape_htmltag($search_ledger_code).'"></td>';
-print '<td class="liste_titre right" colspan="2">';
-$searchpicto = $form->showFilterAndCheckAddButtons(0);
+$searchpicto = $form->showFilterButtons();
 print $searchpicto;
 print '</td>';
-print '</tr>';
+print "</tr>\n";
 
 print '<tr class="liste_titre">';
 print_liste_field_titre("AccountAccountingShort", $_SERVER['PHP_SELF']);
-print_liste_field_titre("TransactionNumShort", $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder, 'right ');
-print_liste_field_titre("Docdate", $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
-print_liste_field_titre("Piece", $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre("Label");
-print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
-print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
-print_liste_field_titre("Codejournal", $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
-print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $param, "", 'width="60"', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.piece_num']['checked']))				print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['t.doc_date']['checked']))				print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.doc_ref']['checked']))				print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['t.label_operation']['checked']))		print_liste_field_titre($arrayfields['t.label_operation']['label'], $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['t.debit']['checked']))					print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['t.credit']['checked']))				print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['t.code_journal']['checked']))			print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 print "</tr>\n";
 
 
@@ -323,7 +395,10 @@ $sous_total_debit = 0;
 $sous_total_credit = 0;
 $displayed_account_number = null; // Start with undefined to be able to distinguish with empty
 
+// Loop on record
+// --------------------------------------------------------------------
 $i = 0;
+$totalarray = array();
 while ($i < min($num, $limit))
 {
 	$line = $object->lines[$i];
@@ -362,38 +437,149 @@ while ($i < min($num, $limit))
 	print '<tr class="oddeven">';
 	print '<td>&nbsp;</td>';
 	print '<td class="right"><a href="./card.php?piece_num='.$line->piece_num.'">'.$line->piece_num.'</a></td>';
-	print '<td class="center">'.dol_print_date($line->doc_date, 'day').'</td>';
 
-	// TODO Add a link according to doc_type and fk_doc
-	print '<td class="nowrap">';
-	//if ($line->doc_type == 'supplier_invoice')
-	//if ($line->doc_type == 'customer_invoice')
-	print $line->doc_ref;
+	// Document date
+	if (!empty($arrayfields['t.doc_date']['checked']))
+	{
+		print '<td class="center">'.dol_print_date($line->doc_date, 'day').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Document ref
+	if (!empty($arrayfields['t.doc_ref']['checked']))
+	{
+		if ($line->doc_type == 'customer_invoice')
+		{
+			$langs->loadLangs(array('bills'));
+
+			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+			$objectstatic = new Facture($db);
+			$objectstatic->fetch($line->fk_doc);
+			//$modulepart = 'facture';
+
+			$filename = dol_sanitizeFileName($line->doc_ref);
+			$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
+			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+		}
+		elseif ($line->doc_type == 'supplier_invoice')
+		{
+			$langs->loadLangs(array('bills'));
+
+			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+			$objectstatic = new FactureFournisseur($db);
+			$objectstatic->fetch($line->fk_doc);
+			//$modulepart = 'invoice_supplier';
+
+			$filename = dol_sanitizeFileName($line->doc_ref);
+			$filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($line->fk_doc, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
+			$subdir = get_exdir($objectstatic->id, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
+			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $subdir, $filedir);
+		}
+		elseif ($line->doc_type == 'expense_report')
+		{
+			$langs->loadLangs(array('trips'));
+
+			require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+			$objectstatic = new ExpenseReport($db);
+			$objectstatic->fetch($line->fk_doc);
+			//$modulepart = 'expensereport';
+
+			$filename = dol_sanitizeFileName($line->doc_ref);
+			$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
+			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+		}
+		else
+		{
+			// Other type
+		}
+
+		print '<td class="nowrap">';
+
+		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+		// Picto + Ref
+		print '<td class="nobordernopadding nowrap">';
+
+		if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report')
+		{
+			print $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
+			print $documentlink;
+		} else {
+			print $line->doc_ref;
+		}
+		print '</td></tr></table>';
+
+		print "</td>\n";
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Label operation
+	if (!empty($arrayfields['t.label_operation']['checked'])) {
+		// Affiche un lien vers la facture client/fournisseur
+		$doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
+		print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>' . $line->label_operation . '</td>' : '<td>' . $line->label_operation . '<br><span style="font-size:0.8em">(' . length_accounta($line->subledger_account) . ')</span></td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Amount debit
+	if (!empty($arrayfields['t.debit']['checked']))
+	{
+		print '<td class="nowrap right">'.($line->debit ? price($line->debit) : '').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totaldebit';
+		$totalarray['val']['totaldebit'] += $line->debit;
+	}
+
+	// Amount credit
+	if (!empty($arrayfields['t.credit']['checked'])) {
+		print '<td class="nowrap right">' . ($line->credit ? price($line->credit) : '') . '</td>';
+		if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalcredit';
+		$totalarray['val']['totalcredit'] += $line->credit;
+	}
+
+	// Lettering code
+	if (!empty($arrayfields['t.lettering_code']['checked']))
+	{
+		print '<td class="center">'.$line->lettering_code.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Journal code
+	if (!empty($arrayfields['t.code_journal']['checked']))
+	{
+		$accountingjournal = new AccountingJournal($db);
+		$result = $accountingjournal->fetch('', $line->code_journal);
+		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
+		print '<td class="center">'.$journaltoshow.'</td>';
+	}
+
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	// Action column
+	print '<td class="nowraponall center">';
+	if (empty($line->date_export)) {
+		if ($user->rights->accounting->mouvements->creer) {
+			print '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_edit().'</a>';
+		}
+		if ($user->rights->accounting->mouvements->supprimer) {
+			print '&nbsp;<a href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
+		}
+	}
 	print '</td>';
 
-	// Affiche un lien vers la facture client/fournisseur
-	$doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
-	print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>'.$line->label_operation.'</td>' : '<td>'.$line->label_operation.'<br><span style="font-size:0.8em">('.length_accounta($line->subledger_account).')</span></td>';
-
-
-	print '<td class="nowrap right">'.($line->debit ? price($line->debit) : '').'</td>';
-	print '<td class="nowrap right">'.($line->credit ? price($line->credit) : '').'</td>';
-
-	$accountingjournal = new AccountingJournal($db);
-	$result = $accountingjournal->fetch('', $line->code_journal);
-	$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
-	print '<td class="center">'.$journaltoshow.'</td>';
-
-	print '<td class="center">';
-	print '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$line->piece_num.'">'.img_edit().'</a>&nbsp;';
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.'">'.img_delete().'</a>';
-	print '</td>';
-	print "</tr>\n";
-
 	// Comptabilise le sous-total
 	$sous_total_debit += $line->debit;
 	$sous_total_credit += $line->credit;
 
+	if (!$i) $totalarray['nbfield']++;
+
+	print "</tr>\n";
+
 	$i++;
 }
 
@@ -406,23 +592,20 @@ print '</td>';
 print '<td></td>';
 print '</tr>';
 
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
-// Show total
-print '<tr class="liste_total">';
-print '<td class="right" colspan="5">'.$langs->trans("Total").':</td>';
-print '<td class="nowraponall right">';
-print price($total_debit);
-print '</td>';
-print '<td class="nowraponall right">';
-print price($total_credit);
-print '</td>';
-print '<td></td>';
-print '<td></td>';
-print '</tr>';
 
 print "</table>";
 print '</div>';
 
+// TODO Replace this with mass delete action
+if ($user->rights->accounting->mouvements->supprimer_tous) {
+	print '<div class="tabsAction tabsActionNoBottom">'."\n";
+	print '<a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear'.($param ? '&'.$param : '').'">'.$langs->trans("DeleteMvt").'</a>';
+	print '</div>';
+}
+
 print '</form>';
 
 // End of page

From 40ffbbe61653f7a5bfea122b1d028b5cc297fcba Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 8 May 2020 13:28:56 +0200
Subject: [PATCH 098/490] Debug

---
 .../accountancy/bookkeeping/listbyaccount.php | 38 ++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 582e54442a5..ff742c356c4 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -120,17 +120,18 @@ $arrayfields = array(
 
 if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) unset($arrayfields['t.lettering_code']);
 
-
-$object = new BookKeeping($db);
-
 /*
  * Action
  */
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+
 $parameters = array('socid'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) {
+if (empty($reshook))
+{
 	include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
 
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
@@ -328,15 +329,22 @@ print $langs->trans('to').' ';
 print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, 'maxwidth200');
 print '</div>';
 print '</td>';
+// Movement number
+if (!empty($arrayfields['t.piece_num']['checked']))
+{
+	print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="'.dol_escape_htmltag($search_mvt_num).'"></td>';
+}
 // Date document
 if (!empty($arrayfields['t.doc_date']['checked'])) {
-	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
 	print $langs->trans('From') . ': ';
 	print $form->selectDate($search_date_start, 'search_date_start', 0, 0, 1);
-	print '<br>';
+	print '</div>';
+	print '<div class="nowrap">';
 	print $langs->trans('to') . ': ';
 	print $form->selectDate($search_date_end, 'search_date_end', 0, 0, 1);
+	print '</div>';
 	print '</td>';
 }
 // Ref document
@@ -374,7 +382,7 @@ print "</tr>\n";
 
 print '<tr class="liste_titre">';
 print_liste_field_titre("AccountAccountingShort", $_SERVER['PHP_SELF']);
-if (!empty($arrayfields['t.piece_num']['checked']))				print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['t.piece_num']['checked']))				print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['t.doc_date']['checked']))				print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
 if (!empty($arrayfields['t.doc_ref']['checked']))				print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
 if (!empty($arrayfields['t.label_operation']['checked']))		print_liste_field_titre($arrayfields['t.label_operation']['label'], $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
@@ -436,7 +444,18 @@ while ($i < min($num, $limit))
 
 	print '<tr class="oddeven">';
 	print '<td>&nbsp;</td>';
-	print '<td class="right"><a href="./card.php?piece_num='.$line->piece_num.'">'.$line->piece_num.'</a></td>';
+	if (!$i) $totalarray['nbfield']++;
+
+	// Piece number
+	if (!empty($arrayfields['t.piece_num']['checked']))
+	{
+		print '<td>';
+		$object->id = $line->id;
+		$object->piece_num = $line->piece_num;
+		print $object->getNomUrl(1, '', 0, '', 1);
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
 
 	// Document date
 	if (!empty($arrayfields['t.doc_date']['checked']))
@@ -553,6 +572,7 @@ while ($i < min($num, $limit))
 		$result = $accountingjournal->fetch('', $line->code_journal);
 		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
 		print '<td class="center">'.$journaltoshow.'</td>';
+		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Fields from hook
@@ -585,7 +605,7 @@ while ($i < min($num, $limit))
 
 // Show sub-total of last shown account
 print '<tr class="liste_total">';
-print '<td class="right" colspan="5">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td>';
+print '<td class="right" colspan="'.$totalarray['nbfield'].'">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td>';
 print '<td class="nowraponall center">';
 print price($sous_total_debit - $sous_total_credit);
 print '</td>';

From 640158ea4caa3ffc94a0af63494fd509c768dbf0 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 8 May 2020 13:50:26 +0200
Subject: [PATCH 099/490] NEW Accountancy - Add Fiducial Winfic eWinfic WinSis
 Compta

---
 ...ncy-format_Winfic-eWinfic-WinSisCompta.pdf | Bin 0 -> 173394 bytes
 .../class/accountancyexport.class.php         |  96 +++++++++++++++++-
 htdocs/langs/en_US/accountancy.lang           |   3 +-
 3 files changed, 95 insertions(+), 4 deletions(-)
 create mode 100644 dev/resources/iso-normes/Accountancy-format_Winfic-eWinfic-WinSisCompta.pdf

diff --git a/dev/resources/iso-normes/Accountancy-format_Winfic-eWinfic-WinSisCompta.pdf b/dev/resources/iso-normes/Accountancy-format_Winfic-eWinfic-WinSisCompta.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..2fbaad04699b50eed31cf1373164693fda111714
GIT binary patch
literal 173394
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

literal 0
HcmV?d00001

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 1e641564de4..37b00ff43a6 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -5,11 +5,12 @@
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016       Pierre-Henry Favre  <phf@atm-consulting.fr>
- * Copyright (C) 2016-2019  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2016-2020  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2013-2017  Olivier Geffroy     <jeff@jeffinfo.com>
  * Copyright (C) 2017       Elarifr. Ari Elbaz  <github@accedinfo.com>
  * Copyright (C) 2017-2019  Frédéric France     <frederic.france@netlogic.fr>
  * Copyright (C) 2017       André Schild        <a.schild@aarboard.ch>
+ * Copyright (C) 2020       Guillaume Alexandre <guillaume@tag-info.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
@@ -52,6 +53,7 @@ class AccountancyExport
 	public static $EXPORT_TYPE_SAGE50_SWISS = 45;
 	public static $EXPORT_TYPE_CHARLEMAGNE = 50;
 	public static $EXPORT_TYPE_QUADRATUS = 60;
+	public static $EXPORT_TYPE_WINFIC = 70;
 	public static $EXPORT_TYPE_OPENCONCERTO = 100;
     public static $EXPORT_TYPE_LDCOMPTA = 110;
 	public static $EXPORT_TYPE_LDCOMPTA10 = 120;
@@ -105,6 +107,7 @@ class AccountancyExport
 			self::$EXPORT_TYPE_BOB50 => $langs->trans('Modelcsv_bob50'),
 			self::$EXPORT_TYPE_CIEL => $langs->trans('Modelcsv_ciel'),
 			self::$EXPORT_TYPE_QUADRATUS => $langs->trans('Modelcsv_quadratus'),
+			self::$EXPORT_TYPE_WINFIC => $langs->trans('Modelcsv_winfic'),
 			self::$EXPORT_TYPE_EBP => $langs->trans('Modelcsv_ebp'),
 			self::$EXPORT_TYPE_COGILOG => $langs->trans('Modelcsv_cogilog'),
 			self::$EXPORT_TYPE_AGIRIS => $langs->trans('Modelcsv_agiris'),
@@ -136,6 +139,7 @@ class AccountancyExport
 			self::$EXPORT_TYPE_BOB50 => 'bob50',
 			self::$EXPORT_TYPE_CIEL => 'ciel',
 			self::$EXPORT_TYPE_QUADRATUS => 'quadratus',
+			self::$EXPORT_TYPE_WINFIC => 'winfic',
 			self::$EXPORT_TYPE_EBP => 'ebp',
 			self::$EXPORT_TYPE_COGILOG => 'cogilog',
 			self::$EXPORT_TYPE_AGIRIS => 'agiris',
@@ -184,6 +188,10 @@ class AccountancyExport
 					'label' => $langs->trans('Modelcsv_quadratus'),
 					'ACCOUNTING_EXPORT_FORMAT' => 'txt',
 				),
+				self::$EXPORT_TYPE_WINFIC => array(
+					'label' => $langs->trans('Modelcsv_winfic'),
+					'ACCOUNTING_EXPORT_FORMAT' => 'txt',
+				),
 				self::$EXPORT_TYPE_EBP => array(
 					'label' => $langs->trans('Modelcsv_ebp'),
 				),
@@ -246,7 +254,7 @@ class AccountancyExport
 		$filename = 'general_ledger-'.$this->getFormatCode($formatexportset);
 		$type_export = 'general_ledger';
 
-		global $db; // The tpl file use $db
+		global $db; 	// The tpl file use $db
 		include DOL_DOCUMENT_ROOT.'/accountancy/tpl/export_journal.tpl.php';
 
 
@@ -269,6 +277,9 @@ class AccountancyExport
 			case self::$EXPORT_TYPE_QUADRATUS :
 				$this->exportQuadratus($TData);
 				break;
+			case self::$EXPORT_TYPE_WINFIC :
+				$this->exportWinfic($TData);
+				break;
 			case self::$EXPORT_TYPE_EBP :
 				$this->exportEbp($TData);
 				break;
@@ -548,6 +559,85 @@ class AccountancyExport
 		}
 	}
 
+	/**
+	 * Export format : WinFic - eWinfic - WinSis Compta
+	 * 
+	 *
+	 * @param array $TData data
+	 * @return void
+	 */
+	public function exportWinfic(&$TData)
+	{
+		global $conf;
+
+		$end_line = "\r\n";
+
+		//We should use dol_now function not time however this is wrong date to transfert in accounting
+		//$date_ecriture = dol_print_date(dol_now(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
+		//$date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
+		foreach ($TData as $data) {
+			$code_compta = $data->numero_compte;
+			if (!empty($data->subledger_account))
+				$code_compta = $data->subledger_account;
+
+			$Tab = array();
+			//$Tab['type_ligne'] = 'M';
+			$Tab['code_journal'] = str_pad(self::trunc($data->code_journal, 2), 2);
+
+			//We use invoice date $data->doc_date not $date_ecriture which is the transfert date
+			//maybe we should set an option for customer who prefer to keep in accounting software the tranfert date instead of invoice date ?
+			//$Tab['date_ecriture'] = $date_ecriture;
+			$Tab['date_operation'] = dol_print_date($data->doc_date, '%d%m%Y');
+
+			$Tab['folio'] = '     1';
+
+			$Tab['num_ecriture'] = str_pad(self::trunc($data->piece_num, 6), 6, ' ', STR_PAD_LEFT);
+
+			$Tab['jour_ecriture'] = dol_print_date($data->doc_date, '%d%m%y');
+
+			$Tab['num_compte'] = str_pad(self::trunc($code_compta, 6), 6, '0');
+
+			if($data->sens == 'D'){
+				$Tab['montant_debit']  =  str_pad(number_format(abs($data->montant), 2, ',', ''), 13, ' ', STR_PAD_LEFT);
+
+				$Tab['montant_crebit'] = str_pad(number_format(0, 2, ',', ''), 13, ' ', STR_PAD_LEFT);
+			}
+			else{
+				$Tab['montant_debit']  = str_pad(number_format(0, 2, ',', ''), 13, ' ', STR_PAD_LEFT);
+
+				$Tab['montant_crebit'] = str_pad(number_format(abs($data->montant), 2, ',', ''), 13, ' ', STR_PAD_LEFT);
+			}
+
+			$Tab['libelle_ecriture'] = str_pad(self::trunc(dol_string_unaccent($data->doc_ref).' '.dol_string_unaccent($data->label_operation), 30), 30);
+
+			$Tab['lettrage'] = str_repeat(' ', 2);
+
+			$Tab['code_piece'] = str_repeat(' ', 5);
+
+			$Tab['code_stat'] = str_repeat(' ', 4);
+
+			if (!empty($data->date_echeance))
+				//$Tab['date_echeance'] = dol_print_date($data->date_echeance, $conf->global->ACCOUNTING_EXPORT_DATE);
+				$Tab['date_echeance'] = dol_print_date($data->date_echeance, '%d%m%Y');
+			else
+				$Tab['date_echeance'] = dol_print_date($data->doc_date, '%d%m%Y');
+
+			$Tab['monnaie'] = '1';
+
+			$Tab['filler'] = ' ';
+
+			$Tab['ind_compteur'] = ' ';
+
+			$Tab['quantite'] = '0,000000000';
+
+			$Tab['code_pointage'] = str_repeat(' ', 2);
+
+			$Tab['end_line'] = $end_line;
+
+			print implode('|', $Tab);
+		}
+	}
+
 
 	/**
 	 * Export format : EBP
@@ -930,7 +1020,7 @@ class AccountancyExport
     }
 
     /**
-     * Export format : LD Compta version 9 & higher
+     * Export format : LD Compta version 9
      * http://www.ldsysteme.fr/fileadmin/telechargement/np/ldcompta/Documentation/IntCptW9.pdf
      *
      * @param array $objectLines data
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index ba34d38f36e..eb3229efaee 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -314,12 +314,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
 Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service

From 7ad80c9bf623a88d215baa7dce03e4446c8b7db2 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 8 May 2020 11:53:11 +0000
Subject: [PATCH 100/490] Fixing style errors.

---
 htdocs/accountancy/class/accountancyexport.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 37b00ff43a6..3bf41e6326f 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -561,7 +561,7 @@ class AccountancyExport
 
 	/**
 	 * Export format : WinFic - eWinfic - WinSis Compta
-	 * 
+	 *
 	 *
 	 * @param array $TData data
 	 * @return void

From 94d47c2acd4a53ba4ad69f914ac87212983b9ac4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 May 2020 14:04:17 +0200
Subject: [PATCH 101/490] Fix sql

---
 htdocs/install/mysql/migration/11.0.0-12.0.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 38d0acb97fa..238c98b2f6e 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -275,4 +275,4 @@ ALTER TABLE llx_prelevement_facture ADD COLUMN fk_facture_fourn INTEGER NULL;
 
 ALTER TABLE llx_menu MODIFY COLUMN module varchar(255);
 
-ALTER TABLE llx_actioncomm SET fk_action = 50 where fk_action = 40 AND code = 'TICKET_MSG'; 
+UPDATE TABLE llx_actioncomm SET fk_action = 50 where fk_action = 40 AND code = 'TICKET_MSG'; 

From c98663be4a491e133c914972891af7cde7e4ac84 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 May 2020 14:05:04 +0200
Subject: [PATCH 102/490] Fix sql

---
 htdocs/install/mysql/migration/11.0.0-12.0.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 238c98b2f6e..470d48bbf26 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -275,4 +275,4 @@ ALTER TABLE llx_prelevement_facture ADD COLUMN fk_facture_fourn INTEGER NULL;
 
 ALTER TABLE llx_menu MODIFY COLUMN module varchar(255);
 
-UPDATE TABLE llx_actioncomm SET fk_action = 50 where fk_action = 40 AND code = 'TICKET_MSG'; 
+UPDATE llx_actioncomm SET fk_action = 50 where fk_action = 40 AND code = 'TICKET_MSG'; 

From 0138ab3f7c85eb7fb1319f1ec568da8299d9eed8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 May 2020 14:25:49 +0200
Subject: [PATCH 103/490] Fix $weblangs must be initialized with language of
 page

---
 htdocs/core/website.inc.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 3e54f6ec2ad..5ea21e19fda 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -33,11 +33,6 @@ if (!is_object($website))
 	$website = new Website($db);
 	$website->fetch(0, $websitekey);
 }
-// Define $weblangs
-if (!is_object($weblangs))
-{
-	$weblangs = dol_clone($langs); // TODO Use an object lang from a language set into $website object instead of backoffice
-}
 // Define $websitepage if we have $websitepagefile defined
 if (!$pageid && !empty($websitepagefile))
 {
@@ -48,10 +43,17 @@ if (!is_object($websitepage))
 {
     $websitepage = new WebsitePage($db);
 }
+// Define $weblangs
+if (!is_object($weblangs))
+{
+	$weblangs = new Translate($db);
+}
 if ($pageid > 0)
 {
 	$websitepage->fetch($pageid);
 
+	$weblangs->setDefaultLang($websitepage->lang ? $websitepage->lang : 'auto');
+
 	if (!defined('USEDOLIBARREDITOR') && in_array($websitepage->type_container, array('menu', 'other')))
 	{
 		$weblangs->load("website");

From 6a2bb08107a15da3a4d3ccc640be071a7c3d7d80 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 May 2020 14:34:02 +0200
Subject: [PATCH 104/490] Fix constructor

---
 htdocs/core/website.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 5ea21e19fda..18744fec7a8 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -46,7 +46,7 @@ if (!is_object($websitepage))
 // Define $weblangs
 if (!is_object($weblangs))
 {
-	$weblangs = new Translate($db);
+	$weblangs = new Translate($db, $conf);
 }
 if ($pageid > 0)
 {

From c28a3e85a35cb4df9a6cc4828bcfc82eb035955b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 May 2020 14:35:03 +0200
Subject: [PATCH 105/490] Fix constructor

---
 htdocs/core/website.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 18744fec7a8..b5053fcc814 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -46,7 +46,7 @@ if (!is_object($websitepage))
 // Define $weblangs
 if (!is_object($weblangs))
 {
-	$weblangs = new Translate($db, $conf);
+	$weblangs = new Translate('', $conf);
 }
 if ($pageid > 0)
 {

From b93a3ceb297b7722229ecfbfe6d0eedb16c2f5cc Mon Sep 17 00:00:00 2001
From: "jove@bisquerra.com" <jove@bisquerra.com>
Date: Fri, 8 May 2020 17:25:48 +0200
Subject: [PATCH 106/490] TakePOS Auto Order improvements

---
 htdocs/takepos/css/phone.css         |  28 +++++
 htdocs/takepos/genimg/qr.php         |   7 +-
 htdocs/takepos/invoice.php           |  20 ++--
 htdocs/takepos/phone.php             | 162 ++++++++++++++++++++++-----
 htdocs/takepos/public/auto_order.php |   7 +-
 5 files changed, 185 insertions(+), 39 deletions(-)

diff --git a/htdocs/takepos/css/phone.css b/htdocs/takepos/css/phone.css
index 49d833ade17..0f3606071f0 100644
--- a/htdocs/takepos/css/phone.css
+++ b/htdocs/takepos/css/phone.css
@@ -79,3 +79,31 @@ button.phonebutton {
 	height:90%;
 	font-weight: bold;
 }
+
+button.publicphonebutton {
+	display: inline-block;
+	position: relative;
+	padding: 0;
+	line-height: normal;
+	cursor: pointer;
+	vertical-align: middle;
+	text-align: center;
+	overflow: visible; /* removes extra width in IE */
+	width:33%;
+	height:90%;
+	font-weight: bold;
+}
+
+button.publicphonebutton2 {
+	display: inline-block;
+	position: relative;
+	padding: 0;
+	line-height: normal;
+	cursor: pointer;
+	vertical-align: middle;
+	text-align: center;
+	overflow: visible; /* removes extra width in IE */
+	width:33%;
+	font-weight: bold;
+	padding: 8px 16px;
+}
diff --git a/htdocs/takepos/genimg/qr.php b/htdocs/takepos/genimg/qr.php
index c73e874a465..553f5165a0d 100644
--- a/htdocs/takepos/genimg/qr.php
+++ b/htdocs/takepos/genimg/qr.php
@@ -29,5 +29,8 @@ require '../../core/modules/barcode/doc/tcpdfbarcode.modules.php';
 
 $key = GETPOST('key');
 
-$module = new modTcpdfbarcode($db);
-$result = $module->buildBarCode("http://www.takepos.com", 'QRCODE', 'Y');
+$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+
+$module = new modtcpdfbarcode($db);
+$result = $module->buildBarCode($urlwithroot."/takepos/auto_order.php?key=".dol_encode($key), 'QRCODE', 'Y');
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index b1641072829..236b302406d 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -32,7 +32,7 @@ if (!defined('NOREQUIREMENU')) { define('NOREQUIREMENU', '1'); }
 if (!defined('NOREQUIREHTML')) { define('NOREQUIREHTML', '1'); }
 if (!defined('NOREQUIREAJAX')) { define('NOREQUIREAJAX', '1'); }
 
-require '../main.inc.php';
+if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
@@ -47,16 +47,11 @@ $idproduct = GETPOST('idproduct', 'int');
 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Bar or Restaurant
 $placeid = 0; // $placeid is ID of invoice
 
-if ($_SESSION["publicterminal"]) {
-	$_SESSION["takeposterminal"] = 1; // Use Terminal 1 for public customers
-}
-elseif (empty($user->rights->takepos->run)) {
+if (empty($user->rights->takepos->run) && !defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 	accessforbidden();
 }
 
-
-
-if (($conf->global->TAKEPOS_PHONE_BASIC_LAYOUT == 1 && $conf->browser->layout == 'phone') || $_SESSION["publicterminal"])
+if (($conf->global->TAKEPOS_PHONE_BASIC_LAYOUT == 1 && $conf->browser->layout == 'phone') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))
 {
 	// DIRECT LINK TO THIS PAGE FROM MOBILE AND NO TERMINAL SELECTED
 	if ($_SESSION["takeposterminal"] == "")
@@ -629,6 +624,12 @@ $(document).ready(function() {
         if (selectedline==this.id) return; // If is already selected
         else selectedline=this.id;
         selectedtext=$('#'+selectedline).find("td:first").html();
+		<?php
+		if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+			print '$("#phonediv1").load("auto_order.php?action=editline&placeid="+placeid+"&selectedline="+selectedline, function() {
+			});';
+		}
+		?>
     });
 
     /* Autoselect the line */
@@ -913,7 +914,7 @@ if ($_SESSION["basiclayout"] == 1)
 			$htmlforlines .= '" onclick="AddProduct(\''.$place.'\', '.$row->id.')">';
 			$htmlforlines .= '<td class="left">';
 			$htmlforlines .= $row->label;
-			$htmlforlines .= '</td>';
+			$htmlforlines .= '<div class="right">'.price($row->price_ttc, 1, $langs, 1, -1, -1, $conf->currency).'</div>';
 			$htmlforlines .= '</tr>'."\n";
 		}
 		$htmlforlines .= '</table>';
@@ -990,6 +991,7 @@ if ($placeid > 0)
             }
             $htmlforlines .= '" id="'.$line->id.'">';
             $htmlforlines .= '<td class="left">';
+			if ($_SESSION["basiclayout"] == 1) $htmlforlines .= $line->qty." x ";
             //if ($line->product_label) $htmlforlines.= '<b>'.$line->product_label.'</b>';
             if (isset($line->product_type))
             {
diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index eac1f40bfd1..6e912d988dc 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -31,7 +31,7 @@ if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
 if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
 if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
 
-if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) require '../main.inc.php';
+if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE') && isset($_GET['key'])) require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -45,6 +45,7 @@ if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 else $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
 $action = GETPOST('action', 'alpha');
 $setterminal = GETPOST('setterminal', 'int');
+$idproduct = GETPOST('idproduct', 'int');
 
 if ($setterminal > 0)
 {
@@ -53,14 +54,10 @@ if ($setterminal > 0)
 
 $langs->loadLangs(array("bills", "orders", "commercial", "cashdesk", "receiptprinter"));
 
-if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-	$_SESSION["takeposterminal"] = 1; // Use Terminal 1 for public customers
-}
-elseif (empty($user->rights->takepos->run)) {
+if (empty($user->rights->takepos->run) && !defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 	accessforbidden();
 }
 
-
 /*
  * View
  */
@@ -75,7 +72,42 @@ $head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
 top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
 ?>
-<link rel="stylesheet" href="css/phone.css">
+<link rel="stylesheet" href="../css/phone.css">
+<?php
+if ($action=="productinfo"){
+	$prod = new Product($db);
+    $prod->fetch($idproduct);
+	print "<b>".$prod->label."</b><br>";
+	print '<img class="imgwrapper" width="60%" src="../genimg/index.php?query=pro&id='.$idproduct.'">';
+	print "<br>".$prod->description;
+	print "<br><b>".price($prod->price_ttc, 1, $langs, 1, -1, -1, $conf->currency)."</b>";
+	print '<br>';
+	print '<button type="button" class="publicphonebutton2" onclick="AddProductConfirm(place, '.$idproduct.');">'.$langs->trans('Add').'</button>';
+}
+elseif ($action=="editline"){
+	$placeid = GETPOST('placeid', 'int');
+	$selectedline = GETPOST('selectedline', 'int');
+	$invoice = new Facture($db);
+	$invoice->fetch($placeid);
+	foreach ($invoice->lines as $line)
+    {
+        if ($line->id == $selectedline)
+		{
+			$prod = new Product($db);
+			$prod->fetch($line->fk_product);
+			print "<b>".$prod->label."</b><br>";
+			print '<img class="imgwrapper" width="60%" src="genimg/index.php?query=pro&id='.$line->fk_product.'">';
+			print "<br>".$prod->description;
+			print "<br><b>".price($prod->price_ttc, 1, $langs, 1, -1, -1, $conf->currency)."</b>";
+			print '<br>';
+			print '<button type="button" class="publicphonebutton2" onclick="SetQty(place, '.$selectedline.', '.($line->qty-1).');">-</button>';
+			print '<button type="button" class="publicphonebutton2" onclick="SetQty(place, '.$selectedline.', '.($line->qty+1).');">+</button>';
+			print '<button type="button" class="publicphonebutton2" onclick="SetNote(place, '.$selectedline.');">'.$langs->trans('Note').'</button>';
+        }
+    }
+}
+else {
+?>
 <script language="javascript">
 <?php
 $categorie = new Categorie($db);
@@ -131,33 +163,96 @@ var editnumber="";
 
 $( document ).ready(function() {
     console.log("Refresh");
-    $("#phonediv1").load("invoice.php?mobilepage=places", function() {
-    });
-    $("#phonediv2").load("invoice.php?mobilepage=invoice&place="+place, function() {
-    });
+	LoadPlace(place);
 });
 
 function LoadPlace(placeid){
     place=placeid;
-    $("#phonediv2").load("invoice.php?mobilepage=invoice&place="+place, function() {
-    });
+	<?php
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&place="+place, function() {
+		});';
+	}
+	else{
+		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&place="+place, function() {
+		});';
+	}
+	?>
     LoadCats();
 }
 
 function AddProduct(placeid, productid){
-    place=placeid;
-    $("#phonediv2").load("invoice.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
+	<?php
+	// If is a public terminal first show product information
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+		print 'place=placeid;
+		$("#phonediv1").load("auto_order.php?action=productinfo&place="+place+"&idproduct="+productid, function() {
+		});';
+	}
+	else{
+		print 'AddProductConfirm(placeid, productid);';
+	}
+	?>
+}
+
+function AddProductConfirm(placeid, productid){
+	place=placeid;
+	<?php
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
+		});';
+	}
+	else{
+		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
+		});';
+	}
+	?>
+}
+
+function SetQty(place, selectedline, qty){
+	if (qty==0){
+		$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=deleteline&place="+place+"&idline="+selectedline, function() {
+		});
+	}
+	else{
+		$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=updateqty&place="+place+"&idline="+selectedline+"&number="+qty, function() {
+		});
+	}
+	LoadCats();
+}
+
+function SetNote(place, selectedline){
+	var note = prompt("<?php $langs->trans('Note'); ?>", "Harry Potter");
+	$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=updateqty&place="+place+"&idline="+selectedline+"&number="+qty, function() {
     });
+	LoadCats();
 }
 
 function LoadCats(){
-    $("#phonediv1").load("invoice.php?mobilepage=cats&place="+place, function() {
-    });
+	<?php
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+		echo '$("#phonediv1").load("auto_order.php?mobilepage=cats&place="+place, function() {
+		});';
+	}
+	else{
+		echo '$("#phonediv1").load("invoice.php?mobilepage=cats&place="+place, function() {
+		});';
+	}
+	?>
 }
 
 function LoadProducts(idcat){
-    $("#phonediv1").load("invoice.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
-    });
+    
+	<?php
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+		echo '$("#phonediv1").load("auto_order.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
+		});';
+	}
+	else{
+		echo '$("#phonediv1").load("invoice.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
+		});';
+	}
+	?>
 }
 
 function LoadPlacesList(){
@@ -167,8 +262,16 @@ function LoadPlacesList(){
 
 function TakeposPrintingOrder(){
     console.log("TakeposPrintingOrder");
-    $("#phonediv2").load("invoice.php?action=order&place="+place, function() {
-    });
+	<?php
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+		echo '$("#phonediv2").load("auto_order.php?action=order&place="+place, function() {
+		});';
+	}
+	else{
+		echo '$("#phonediv2").load("invoice.php?action=order&place="+place, function() {
+		});';
+	}
+	?>
 }
 
 function Exit(){
@@ -192,11 +295,17 @@ if ($conf->global->TAKEPOS_NUM_TERMINALS != "1" && $_SESSION["takeposterminal"]
 <div class="container">
 	<div class="phonebuttonsrow">
 		<?php
-		if (!$_SESSION["publicterminal"]) print '<button type="button" class="phonebutton" onclick="LoadPlacesList();">'.strtoupper(substr($langs->trans('Floors'), 0, 3)).'</button>';
-		print '<button type="button" class="phonebutton" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 3)).'</button>';
-		print '<button type="button" class="phonebutton" onclick="TakeposPrintingOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 3)).'</button>';
-		print '<button type="button" class="phonebutton" onclick="Exit();">'.strtoupper(substr($langs->trans('Logout'), 0, 3)).'</button>';
-		if ($_SESSION["publicterminal"]) print '<button type="button" class="phonebutton" onclick="CheckPlease();">'.strtoupper(substr($langs->trans('Payment'), 0, 3)).'</button>';
+		if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+			print '<button type="button" class="phonebutton" onclick="LoadPlacesList();">'.strtoupper(substr($langs->trans('Floors'), 0, 3)).'</button>';
+			print '<button type="button" class="phonebutton" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 3)).'</button>';
+			print '<button type="button" class="phonebutton" onclick="TakeposPrintingOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 3)).'</button>';
+			print '<button type="button" class="phonebutton" onclick="Exit();">'.strtoupper(substr($langs->trans('Logout'), 0, 3)).'</button>';
+		}
+		else{
+			print '<button type="button" class="publicphonebutton" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 5)).'</button>';
+			print '<button type="button" class="publicphonebutton" onclick="TakeposPrintingOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 5)).'</button>';
+			print '<button type="button" class="publicphonebutton" onclick="CheckPlease();">'.strtoupper(substr($langs->trans('Payment'), 0, 5)).'</button>';
+		}
 		?>
 	</div>
 	<div class="row1">
@@ -208,6 +317,7 @@ if ($conf->global->TAKEPOS_NUM_TERMINALS != "1" && $_SESSION["takeposterminal"]
 </div>
 </body>
 <?php
+}
 
 llxFooter();
 
diff --git a/htdocs/takepos/public/auto_order.php b/htdocs/takepos/public/auto_order.php
index 5b463959b69..c7612711df0 100644
--- a/htdocs/takepos/public/auto_order.php
+++ b/htdocs/takepos/public/auto_order.php
@@ -26,8 +26,11 @@ if (!defined('NOIPCHECK'))	   define('NOIPCHECK', '1'); // Do not check IP defin
 
 require '../../main.inc.php';
 
+if (!$conf->global->TAKEPOS_AUTO_ORDER) accessforbidden(); // If Auto Order is disabled never allow NO LOGIN access
+
 $_SESSION["basiclayout"] = 1;
-$_SESSION["publicterminal"] = true; // Is a public customer
+$_SESSION["takeposterminal"] = 1;
 
 define('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE', 1);
-include '../phone.php';
+if (GETPOSTISSET("mobilepage")) require '../invoice.php';
+else require '../phone.php';

From 1674048c81cd5faac619bf4a644833121d528726 Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Fri, 8 May 2020 17:56:42 +0200
Subject: [PATCH 107/490] Fix travis

---
 htdocs/takepos/phone.php | 78 ++++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 6e912d988dc..7e454a734a3 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -107,47 +107,47 @@ elseif ($action=="editline"){
     }
 }
 else {
-?>
+	?>
 <script language="javascript">
-<?php
-$categorie = new Categorie($db);
-$categories = $categorie->get_full_arbo('product', (($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) ? $conf->global->TAKEPOS_ROOT_CATEGORY_ID : 0), 1);
+	<?php
+	$categorie = new Categorie($db);
+	$categories = $categorie->get_full_arbo('product', (($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) ? $conf->global->TAKEPOS_ROOT_CATEGORY_ID : 0), 1);
 
-// Search root category to know its level
-//$conf->global->TAKEPOS_ROOT_CATEGORY_ID=0;
-$levelofrootcategory = 0;
-if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0)
-{
-    foreach ($categories as $key => $categorycursor)
-    {
-        if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
-        {
-            $levelofrootcategory = $categorycursor['level'];
-            break;
-        }
-    }
-}
-$levelofmaincategories = $levelofrootcategory + 1;
+	// Search root category to know its level
+	//$conf->global->TAKEPOS_ROOT_CATEGORY_ID=0;
+	$levelofrootcategory = 0;
+	if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0)
+	{
+    	foreach ($categories as $key => $categorycursor)
+    	{
+        	if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
+        	{
+            	$levelofrootcategory = $categorycursor['level'];
+            	break;
+        	}
+    	}
+	}
+	$levelofmaincategories = $levelofrootcategory + 1;
 
-$maincategories = array();
-$subcategories = array();
-foreach ($categories as $key => $categorycursor)
-{
-    if ($categorycursor['level'] == $levelofmaincategories)
-    {
-        $maincategories[$key] = $categorycursor;
-    }
-    else
-    {
-        $subcategories[$key] = $categorycursor;
-    }
-}
+	$maincategories = array();
+	$subcategories = array();
+	foreach ($categories as $key => $categorycursor)
+	{
+    	if ($categorycursor['level'] == $levelofmaincategories)
+    	{
+        	$maincategories[$key] = $categorycursor;
+    	}
+    	else
+    	{
+        	$subcategories[$key] = $categorycursor;
+    	}
+	}
 
-sort($maincategories);
-sort($subcategories);
+	sort($maincategories);
+	sort($subcategories);
 
 
-?>
+	?>
 
 var categories = <?php echo json_encode($maincategories); ?>;
 var subcategories = <?php echo json_encode($subcategories); ?>;
@@ -289,9 +289,9 @@ function CheckPlease(){
 </script>
 
 <body style="overflow: hidden; background-color:#D1D1D1;">
-<?php
-if ($conf->global->TAKEPOS_NUM_TERMINALS != "1" && $_SESSION["takeposterminal"] == "") print '<div class="dialog-info-takepos-terminal" id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>';
-?>
+	<?php
+	if ($conf->global->TAKEPOS_NUM_TERMINALS != "1" && $_SESSION["takeposterminal"] == "") print '<div class="dialog-info-takepos-terminal" id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>';
+	?>
 <div class="container">
 	<div class="phonebuttonsrow">
 		<?php
@@ -316,7 +316,7 @@ if ($conf->global->TAKEPOS_NUM_TERMINALS != "1" && $_SESSION["takeposterminal"]
 	</div>
 </div>
 </body>
-<?php
+	<?php
 }
 
 llxFooter();

From f8ad954854aa49dd788e0b804ecb938d30305589 Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Fri, 8 May 2020 18:04:38 +0200
Subject: [PATCH 108/490] Fix URLs

---
 htdocs/takepos/phone.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 7e454a734a3..8714173e45f 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -31,7 +31,7 @@ if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
 if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
 if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
 
-if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE') && isset($_GET['key'])) require '../main.inc.php';
+if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -71,14 +71,13 @@ $head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
 top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
-?>
-<link rel="stylesheet" href="../css/phone.css">
-<?php
+print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/takepos/css/phone.css">';
+
 if ($action=="productinfo"){
 	$prod = new Product($db);
     $prod->fetch($idproduct);
 	print "<b>".$prod->label."</b><br>";
-	print '<img class="imgwrapper" width="60%" src="../genimg/index.php?query=pro&id='.$idproduct.'">';
+	print '<img class="imgwrapper" width="60%" src="'.DOL_URL_ROOT.'/takepos/genimg/index.php?query=pro&id='.$idproduct.'">';
 	print "<br>".$prod->description;
 	print "<br><b>".price($prod->price_ttc, 1, $langs, 1, -1, -1, $conf->currency)."</b>";
 	print '<br>';

From b89b6d7679546811e13826e74262fa67cd10be75 Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Fri, 8 May 2020 18:51:49 +0200
Subject: [PATCH 109/490] Name fix

---
 htdocs/takepos/genimg/qr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/takepos/genimg/qr.php b/htdocs/takepos/genimg/qr.php
index 553f5165a0d..99f7fced1d0 100644
--- a/htdocs/takepos/genimg/qr.php
+++ b/htdocs/takepos/genimg/qr.php
@@ -32,5 +32,5 @@ $key = GETPOST('key');
 $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
 $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 
-$module = new modtcpdfbarcode($db);
+$module = new modTcpdfbarcode($db);
 $result = $module->buildBarCode($urlwithroot."/takepos/auto_order.php?key=".dol_encode($key), 'QRCODE', 'Y');

From bba8ab657eea7ae7f28e5369ea59b06b1f3f5937 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 May 2020 18:57:15 +0200
Subject: [PATCH 110/490] Fix add missing migration

---
 htdocs/install/mysql/migration/10.0.0-11.0.0.sql | 11 +++++++++++
 htdocs/install/mysql/migration/11.0.0-12.0.0.sql |  9 +++++++++
 2 files changed, 20 insertions(+)

diff --git a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
index bc4b562711b..2a7a8963e9f 100644
--- a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
+++ b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
@@ -582,3 +582,14 @@ create table llx_commande_fournisseur_dispatch_extrafields
 
 ALTER TABLE llx_commande_fournisseur_dispatch_extrafields ADD INDEX idx_commande_fournisseur_dispatch_extrafields (fk_object);
 
+
+create table llx_facturedet_rec_extrafields
+(
+  rowid            integer AUTO_INCREMENT PRIMARY KEY,
+  tms              timestamp,
+  fk_object        integer NOT NULL,    -- object id
+  import_key       varchar(14)      	-- import key
+)ENGINE=innodb;
+
+ALTER TABLE llx_facturedet_rec_extrafields ADD INDEX idx_facturedet_rec_extrafields (fk_object);
+
diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 470d48bbf26..8a68e763160 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -54,6 +54,15 @@ create table llx_c_shipment_package_type
     entity       integer DEFAULT 1 NOT NULL -- Multi company id 
 )ENGINE=innodb;
 
+create table llx_facturedet_rec_extrafields
+(
+  rowid            integer AUTO_INCREMENT PRIMARY KEY,
+  tms              timestamp,
+  fk_object        integer NOT NULL,    -- object id
+  import_key       varchar(14)      	-- import key
+)ENGINE=innodb;
+
+ALTER TABLE llx_facturedet_rec_extrafields ADD INDEX idx_facturedet_rec_extrafields (fk_object);
 
 
 -- For v12

From a87d9cd740f2399f5d24e13e0f7791eadde19976 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Fri, 8 May 2020 22:41:49 +0200
Subject: [PATCH 111/490] Update list.php

---
 htdocs/product/list.php | 68 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 90464742839..0b1c0d19aff 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -211,6 +211,17 @@ $arrayfields = array(
 	'p.tosell'=>array('label'=>$langs->trans("Status").' ('.$langs->trans("Sell").')', 'checked'=>1, 'position'=>1000),
 	'p.tobuy'=>array('label'=>$langs->trans("Status").' ('.$langs->trans("Buy").')', 'checked'=>1, 'position'=>1000)
 );
+
+// MultiPrices
+if ($conf->global->PRODUIT_MULTIPRICES){
+	for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
+	{
+		$arrayfields['p.sellprice'.$i] = array('label'=>$langs->trans("SellingPrice")." ".$i, 'checked'=>1, 'enabled'=>$conf->global->PRODUIT_MULTIPRICES, 'position'=>40);
+		$arraypricelevel[$i] = array($i);
+	}
+}
+
+//var_dump($arraypricelevel);
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']))
 {
@@ -733,6 +744,19 @@ if ($resql)
 		print '<td class="liste_titre right">';
 		print '</td>';
 	}
+
+	// Multiprice
+	if ($conf->global->PRODUIT_MULTIPRICES){
+		foreach ($arraypricelevel as $key => $value)
+		{
+			if (!empty($arrayfields['p.sellprice'.$key]['checked']))
+			{
+				print '<td class="liste_titre right">';
+				print '</td>';
+			}
+		}
+	}
+
 	// Minimum buying Price
 	if (!empty($arrayfields['p.minbuyprice']['checked']))
 	{
@@ -865,6 +889,18 @@ if ($resql)
     if (!empty($arrayfields['p.sellprice']['checked'])) {
         print_liste_field_titre($arrayfields['p.sellprice']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
     }
+
+	// Multiprices
+	if ($conf->global->PRODUIT_MULTIPRICES){
+		foreach ($arraypricelevel as $key => $value)
+		{
+			if (!empty($arrayfields['p.sellprice'.$key]['checked']))
+			{
+				print_liste_field_titre($arrayfields['p.sellprice'.$key]['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+			}
+		}
+	}
+
     if (!empty($arrayfields['p.minbuyprice']['checked'])) {
         print_liste_field_titre($arrayfields['p.minbuyprice']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
     }
@@ -1200,6 +1236,38 @@ if ($resql)
 			if (!$i) $totalarray['nbfield']++;
 		}
 
+
+		// Multiprices
+		if ($conf->global->PRODUIT_MULTIPRICES){
+			foreach ($arraypricelevel as $key => $value)
+			{
+				if (!empty($arrayfields['p.sellprice'.$key]['checked']))
+				{
+					$resultp = "SELECT p.rowid, p.fk_product, p.price, p.price_ttc, p.price_level, p.date_price";
+					$resultp .= " FROM ".MAIN_DB_PREFIX."product_price as p";
+					$resultp .= " WHERE fk_product = ".$obj->rowid;
+					if (!empty($conf->global->PRODUIT_MULTIPRICES)) $resultp .= " AND p.price_level = ".$key;
+					$resultp .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
+					$resultp = $db->query($resultp);
+					if ($resultp)
+					{
+						$objp = $db->fetch_object($resultp);
+						print '<td class="right nowraponall">';
+							if ($obj->tosell)
+							{
+								if ($obj->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
+								else print price($objp->price).' '.$langs->trans("HT");
+							}
+							print '</td>';
+							$db->free($resultp);
+					} else {
+						dol_print_error($db);
+					}
+					if (!$i) $totalarray['nbfield']++;
+				}
+			}
+		}
+
 		// Better buy price
 		if (!empty($arrayfields['p.minbuyprice']['checked']))
 		{

From c2dff7dfed6077cba99165aa9dcc1ee86eab0785 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 8 May 2020 20:46:06 +0000
Subject: [PATCH 112/490] Fixing style errors.

---
 htdocs/product/list.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 0b1c0d19aff..d666caad80c 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -1253,11 +1253,11 @@ if ($resql)
 					{
 						$objp = $db->fetch_object($resultp);
 						print '<td class="right nowraponall">';
-							if ($obj->tosell)
+						if ($obj->tosell)
 							{
-								if ($obj->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
-								else print price($objp->price).' '.$langs->trans("HT");
-							}
+							if ($obj->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
+							else print price($objp->price).' '.$langs->trans("HT");
+						}
 							print '</td>';
 							$db->free($resultp);
 					} else {

From 52b47fd5988832725fd75c50d38e208a0095bcff Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Sat, 9 May 2020 00:28:23 +0200
Subject: [PATCH 113/490] Update list.php

---
 htdocs/product/list.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index d666caad80c..f818d2f475a 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -216,7 +216,16 @@ $arrayfields = array(
 if ($conf->global->PRODUIT_MULTIPRICES){
 	for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
 	{
-		$arrayfields['p.sellprice'.$i] = array('label'=>$langs->trans("SellingPrice")." ".$i, 'checked'=>1, 'enabled'=>$conf->global->PRODUIT_MULTIPRICES, 'position'=>40);
+		$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$i;
+		if (!empty($conf->global->$keyforlabel))
+		{
+			$labelp = $i.' - '.$langs->trans($conf->global->$keyforlabel);
+		}
+		else
+		{
+			$labelp = $langs->trans("SellingPrice")." ".$i;
+		}
+		$arrayfields['p.sellprice'.$i] = array('label'=>$labelp, 'checked'=>1, 'enabled'=>$conf->global->PRODUIT_MULTIPRICES, 'position'=>40);
 		$arraypricelevel[$i] = array($i);
 	}
 }

From 3644a718d8b7fd21deec36617724c9a30e119c15 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Sat, 9 May 2020 01:02:51 +0200
Subject: [PATCH 114/490] 1

---
 htdocs/admin/user.php         | 24 ++++++++++++++++++++++++
 htdocs/langs/en_US/admin.lang |  1 +
 htdocs/langs/fr_FR/admin.lang |  1 +
 3 files changed, 26 insertions(+)

diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index fb15a57a87e..60cbadcdd3a 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -177,6 +177,30 @@ else
 }
 print '</td></tr>';
 
+// user hide inactive
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("UserHideInactive").'</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+
+print '<td align="center" width="100">';
+if ($conf->use_javascript_ajax)
+{
+	print ajax_constantonoff('USER_HIDE_INACTIVE_IN_COMBOBOX');
+}
+else
+{
+	if (empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX))
+	{
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_USER_HIDE_INACTIVE_IN_COMBOBOX">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+	}
+	else
+	{
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_USER_HIDE_INACTIVE_IN_COMBOBOX">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+	}
+}
+print '</td></tr>';
+
 print '</table>';
 
 print '<br>';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 3cf6e6044db..e97ed8dbc54 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1272,6 +1272,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Users module setup
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users
 UsersDocModules=Document templates for documents generated from user record 
 GroupsDocModules=Document templates for documents generated from a group record 
 ##### HRM setup #####
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 6545b71ede3..172153852e3 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1272,6 +1272,7 @@ RuleForGeneratedPasswords=Règle pour la génération des mots de passe proposé
 DisableForgetPasswordLinkOnLogonPage=Cacher le lien "Mot de passe oublié" sur la page de connexion
 UsersSetup=Configuration du module utilisateurs
 UserMailRequired=Email requis pour créer un nouvel utilisateur
+UserHideInactive=Cacher les utilisateurs inactifs
 UsersDocModules=Modèles de documents pour les documents générés à partir de la fiche utilisateur
 GroupsDocModules=Modèles de documents pour les documents générés à partir de la fiche d'un groupe
 ##### HRM setup #####

From 53eb891a88d9727591ada4601c1f03fed7c22370 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Sat, 9 May 2020 18:48:01 +0200
Subject: [PATCH 115/490] Update list.php

---
 htdocs/product/stock/list.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 15b92c83acc..c13243fc9cb 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -549,6 +549,11 @@ if ($num)
 			{
 				print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
 				if ($key == 'statut') print $warehouse->getLibStatut(5);
+				if ($key == 'phone')
+				{
+					print dol_print_phone($obj->phone, '', 0, $obj->rowid, 'AC_TEL');
+				}
+				elseif ($key == 'fax') print dol_print_phone($obj->fax, '', 0, $obj->rowid, 'AC_FAX');
 				else print $warehouse->showOutputField($val, $key, $warehouse->$key, '');
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;

From fe241ea321982b4b7ee30cf6ea03e7e5c7a7b3e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 9 May 2020 21:49:12 +0200
Subject: [PATCH 116/490] Fix removed not reliabled info in PHP info

---
 htdocs/admin/system/phpinfo.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index ce21c1f3ad8..04439d11710 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -143,7 +143,7 @@ $loadedExtensions    = array_map('strtolower', get_loaded_extensions(false));
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td width="200">'.$langs->trans("Extension").'</td>';
-print '<td align="center">'.$langs->trans("EnabledInSetup").'</td>';
+//print '<td align="center">'.$langs->trans("EnabledInSetup").'</td>';
 print '<td align="center">'.$langs->trans("Loaded").'</td>';
 print '<td align="center">'.$langs->trans("FunctionTest").'</td>';
 print '<td>'.$langs->trans("Result").'</td>';
@@ -154,7 +154,7 @@ $name      = "GD";
 
 print "<tr>";
 print "<td>".$name."</td>";
-print getTableColumn($name, $activatedExtensions);
+//print getTableColumn($name, $activatedExtensions);
 print getTableColumn($name, $loadedExtensions);
 print getTableColumnFunction($functions);
 print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -165,7 +165,7 @@ $name      = "Curl";
 
 print "<tr>";
 print "<td>".$name."</td>";
-print getTableColumn($name, $activatedExtensions);
+//print getTableColumn($name, $activatedExtensions);
 print getTableColumn($name, $loadedExtensions);
 print getTableColumnFunction($functions);
 print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -178,7 +178,7 @@ if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@loc
 
 	print "<tr>";
 	print "<td>".$name."</td>";
-	print getTableColumn($name, $activatedExtensions);
+	//print getTableColumn($name, $activatedExtensions);
 	print getTableColumn($name, $loadedExtensions);
 	print getTableColumnFunction($functions);
 	print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -191,7 +191,7 @@ $name      = "xDebug";
 
 print "<tr>";
 print "<td>".$name."</td>";
-print getTableColumn($name, $activatedExtensions);
+//print getTableColumn($name, $activatedExtensions);
 print getTableColumn($name, $loadedExtensions);
 print getTableColumnFunction($functions);
 print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -208,7 +208,6 @@ foreach ($phparray as $key => $value)
 	print '<div class="div-table-responsive-no-min">';
 	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";
@@ -408,7 +407,7 @@ function getResultColumn($name, array $activated, array $loaded, array $function
 	global $langs;
 
 	$result = true;
-	$result = $result && in_array(strtolower($name), $activated);
+	//$result = $result && in_array(strtolower($name), $activated);
 	$result = $result && in_array(strtolower($name), $loaded);
 
 	foreach ($functions as $function)

From 310c5f9eb665ac0331f3b727c81bf65b668da569 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 9 May 2020 21:56:51 +0200
Subject: [PATCH 117/490] Fix size of field

---
 htdocs/install/mysql/migration/8.0.0-9.0.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
index 61f4dc544ba..b7fe131c3f9 100644
--- a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
+++ b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
@@ -200,7 +200,7 @@ CREATE TABLE llx_emailcollector_emailcollectorfilter(
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
 	fk_emailcollector INTEGER NOT NULL,
 	type varchar(128) NOT NULL,
-	rulevalue varchar(255) NULL,
+	rulevalue varchar(128) NULL,
 	date_creation datetime NOT NULL,
 	tms timestamp NOT NULL,
 	fk_user_creat integer NOT NULL,

From f40e978475751664c2b4cb1245f5c185b890613c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 10 May 2020 06:28:50 +0200
Subject: [PATCH 118/490] Fix delbookkeepingyear - add hook
 printFieldPreListTitle - Look & Feel v12

---
 .../accountancy/bookkeeping/listbyaccount.php | 282 +++++++++++++-----
 htdocs/langs/en_US/accountancy.lang           |   1 +
 2 files changed, 213 insertions(+), 70 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index ff742c356c4..49dbb81e77d 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -57,6 +57,12 @@ $search_direction = GETPOST('search_direction', 'alpha');
 $search_ledger_code = GETPOST('search_ledger_code', 'alpha');
 $search_debit = GETPOST('search_debit', 'alpha');
 $search_credit = GETPOST('search_credit', 'alpha');
+$search_lettering_code = GETPOST('search_lettering_code', 'alpha');
+$search_not_reconciled = GETPOST('search_reconciled_option', 'alpha');
+
+if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_delmvt")) {
+	$action = 'delbookkeepingyear';
+}
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
@@ -105,6 +111,7 @@ if (empty($search_date_start) && empty($search_date_end) && GETPOSTISSET('search
 
 $arrayfields = array(
 	// 't.subledger_account'=>array('label'=>$langs->trans("SubledgerAccount"), 'checked'=>1),
+	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
 	't.piece_num'=>array('label'=>$langs->trans("TransactionNumShort"), 'checked'=>1),
 	't.doc_date'=>array('label'=>$langs->trans("Docdate"), 'checked'=>1),
 	't.doc_ref'=>array('label'=>$langs->trans("Piece"), 'checked'=>1),
@@ -112,10 +119,6 @@ $arrayfields = array(
 	't.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1),
 	't.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1),
 	't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1),
-	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
-	// 't.date_creation'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0),
-	// 't.tms'=>array('label'=>$langs->trans("DateModification"), 'checked'=>0),
-	// 't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
 );
 
 if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) unset($arrayfields['t.lettering_code']);
@@ -155,6 +158,8 @@ if (empty($reshook))
 		$search_date_endday = '';
 		$search_debit = '';
 		$search_credit = '';
+		$search_lettering_code = '';
+		$search_not_reconciled = '';
 	}
 
 	// Must be after the remove filter action, before the export.
@@ -209,9 +214,62 @@ if (empty($reshook))
 		$filter['t.credit'] = $search_credit;
 		$param .= '&search_credit=' . urlencode($search_credit);
 	}
+	if (!empty($search_lettering_code)) {
+		$filter['t.lettering_code'] = $search_lettering_code;
+		$param .= '&search_lettering_code='.urlencode($search_lettering_code);
+	}
+	if (!empty($search_not_reconciled)) {
+		$filter['t.reconciled_option'] = $search_not_reconciled;
+		$param .= '&search_not_reconciled='.urlencode($search_not_reconciled);
+	}
 }
 
-if ($action == 'delmouvconfirm') {
+if ($action == 'delbookkeeping' && $user->rights->accounting->mouvements->supprimer) {
+	$import_key = GETPOST('importkey', 'alpha');
+
+	if (!empty($import_key)) {
+		$result = $object->deleteByImportkey($import_key);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+
+		// Make a redirect to avoid to launch the delete later after a back button
+		header("Location: listbyaccount.php".($param ? '?'.$param : ''));
+		exit;
+	}
+}
+if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouvements->supprimer_tous) {
+	$delmonth = GETPOST('delmonth', 'int');
+	$delyear = GETPOST('delyear', 'int');
+	if ($delyear == -1) {
+		$delyear = 0;
+	}
+	$deljournal = GETPOST('deljournal', 'alpha');
+	if ($deljournal == -1) {
+		$deljournal = 0;
+	}
+
+	if (!empty($delmonth) || !empty($delyear) || !empty($deljournal))
+	{
+		$result = $object->deleteByYearAndJournal($delyear, $deljournal, '', ($delmonth > 0 ? $delmonth : 0));
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+		else
+		{
+			setEventMessages("RecordDeleted", null, 'mesgs');
+		}
+
+		// Make a redirect to avoid to launch the delete later after a back button
+		header("Location: listbyaccount.php".($param ? '?'.$param : ''));
+		exit;
+	}
+	else
+	{
+		setEventMessages("NoRecordDeleted", null, 'warnings');
+	}
+}
+if ($action == 'delmouvconfirm' && $user->rights->accounting->mouvements->supprimer) {
 	$mvt_num = GETPOST('mvt_num', 'int');
 
 	if (!empty($mvt_num)) {
@@ -219,8 +277,13 @@ if ($action == 'delmouvconfirm') {
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-		Header("Location: listbyaccount.php");
-		exit();
+		else
+		{
+			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+		}
+
+		header("Location: listbyaccount.php?noreset=1".($param ? '&'.$param : ''));
+		exit;
 	}
 }
 
@@ -262,22 +325,42 @@ if ($action == 'delmouv') {
 }
 if ($action == 'delbookkeepingyear') {
 	$form_question = array();
-	$delyear = GETPOST('delyear');
+	$delyear = GETPOST('delyear', 'int');
+	$deljournal = GETPOST('deljournal', 'alpha');
 
 	if (empty($delyear)) {
 		$delyear = dol_print_date(dol_now(), '%Y');
 	}
+	$month_array = array();
+	for ($i = 1; $i <= 12; $i++) {
+		$month_array[$i] = $langs->trans("Month".sprintf("%02d", $i));
+	}
 	$year_array = $formaccounting->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
+	$journal_array = $formaccounting->select_journal($deljournal, 'deljournal', '', 1, 1, 1, '', 0, 1);
 
+	$form_question['delmonth'] = array(
+		'name' => 'delmonth',
+		'type' => 'select',
+		'label' => $langs->trans('DelMonth'),
+		'values' => $month_array,
+		'default' => ''
+	);
 	$form_question['delyear'] = array(
-			'name' => 'delyear',
-			'type' => 'select',
-			'label' => $langs->trans('DelYear'),
-			'values' => $year_array,
-			'default' => $delyear
+		'name' => 'delyear',
+		'type' => 'select',
+		'label' => $langs->trans('DelYear'),
+		'values' => $year_array,
+		'default' => $delyear
+	);
+	$form_question['deljournal'] = array(
+		'name' => 'deljournal',
+		'type' => 'other', // We don't use select here, the journal_array is already a select html component
+		'label' => $langs->trans('DelJournal'),
+		'value' => $journal_array,
+		'default' => $deljournal
 	);
 
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delbookkeepingyearconfirm', $form_question, 0, 1, 250);
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
 	print $formconfirm;
 }
 
@@ -304,35 +387,41 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
+// Reverse sort order
+if (preg_match('/^asc/i', $sortorder)) $sortorder = "asc";
+else $sortorder = "desc";
+
+$moreforfilter = '';
+
+// Accountancy account
+$moreforfilter .= '<div class="divsearchfield">';
+$moreforfilter .= $langs->trans('AccountAccounting').': ';
+$moreforfilter .= '<div class="nowrap">';
+$moreforfilter .= $langs->trans('From').' ';
+$moreforfilter .= $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, 'maxwidth200');
+$moreforfilter .= $langs->trans('to').' ';
+$moreforfilter .= $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, 'maxwidth200');
+$moreforfilter .= '</div>';
+$moreforfilter .= '</div>';
+
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 else $moreforfilter = $hookmanager->resPrint;
 
-// Reverse sort order
-if (preg_match('/^asc/i', $sortorder)) $sortorder = "asc";
-else $sortorder = "desc";
+print '<div class="liste_titre liste_titre_bydiv centpercent">';
+print $moreforfilter;
+print '</div>';
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste centpercent">';
 
 // Filters lines
 print '<tr class="liste_titre_filter">';
-// Accountancy account
-print '<td class="liste_titre">';
-print '<div class="nowrap">';
-print $langs->trans('From').' ';
-print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, 'maxwidth200');
-print '</div>';
-print '<div class="nowrap">';
-print $langs->trans('to').' ';
-print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, 'maxwidth200');
-print '</div>';
-print '</td>';
-// Movement number
-if (!empty($arrayfields['t.piece_num']['checked']))
-{
-	print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="'.dol_escape_htmltag($search_mvt_num).'"></td>';
+
+// Code journal
+if (!empty($arrayfields['t.code_journal']['checked'])) {
+	print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="' . dol_escape_htmltag($search_ledger_code) . '"></td>';
 }
 // Date document
 if (!empty($arrayfields['t.doc_date']['checked'])) {
@@ -347,6 +436,11 @@ if (!empty($arrayfields['t.doc_date']['checked'])) {
 	print '</div>';
 	print '</td>';
 }
+// Movement number
+if (!empty($arrayfields['t.piece_num']['checked']))
+{
+	print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="'.dol_escape_htmltag($search_mvt_num).'"></td>';
+}
 // Ref document
 if (!empty($arrayfields['t.doc_ref']['checked'])) {
 	print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_doc_ref" value="' . dol_escape_htmltag($search_doc_ref) . '"/></td>';
@@ -363,9 +457,13 @@ if (!empty($arrayfields['t.debit']['checked'])) {
 if (!empty($arrayfields['t.credit']['checked'])) {
 	print '<td class="liste_titre right"><input type="text" class="flat" name="search_credit" size="4" value="' . dol_escape_htmltag($search_credit) . '"></td>';
 }
-// Code journal
-if (!empty($arrayfields['t.code_journal']['checked'])) {
-	print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="' . dol_escape_htmltag($search_ledger_code) . '"></td>';
+// Lettering code
+if (!empty($arrayfields['t.lettering_code']['checked']))
+{
+	print '<td class="liste_titre center">';
+	print '<input type="text" size="3" class="flat" name="search_lettering_code" value="'.$search_lettering_code.'"/>';
+	print '<br><span class="nowrap"><input type="checkbox" name="search_reconciled_option" value="notreconciled"'.($search_not_reconciled == 'notreconciled' ? ' checked' : '').'>'.$langs->trans("NotReconciled").'</span>';
+	print '</td>';
 }
 
 // Fields from hook
@@ -381,14 +479,14 @@ print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-print_liste_field_titre("AccountAccountingShort", $_SERVER['PHP_SELF']);
-if (!empty($arrayfields['t.piece_num']['checked']))				print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['t.code_journal']['checked']))			print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
 if (!empty($arrayfields['t.doc_date']['checked']))				print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.piece_num']['checked']))				print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['t.doc_ref']['checked']))				print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
 if (!empty($arrayfields['t.label_operation']['checked']))		print_liste_field_titre($arrayfields['t.label_operation']['label'], $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
 if (!empty($arrayfields['t.debit']['checked']))					print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
 if (!empty($arrayfields['t.credit']['checked']))				print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['t.code_journal']['checked']))			print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.lettering_code']['checked']))		print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
@@ -419,18 +517,42 @@ while ($i < min($num, $limit))
 
 	// Is it a break ?
 	if ($accountg != $displayed_account_number || !isset($displayed_account_number)) {
-		// Affiche un Sous-Total par compte comptable
+
+		$colspan = $totalarray['nbfield'] - 3;
+		$colspanend = $totalarray['nbfield'] - 7;
+		// Show a subtotal by accounting account
 		if (isset($displayed_account_number)) {
-			print '<tr class="liste_total"><td class="right" colspan="5">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td>';
-			print "<td>&nbsp;</td>\n";
-			print "<td>&nbsp;</td>\n";
+			print '<tr class="liste_total">';
+			print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.length_accountg($displayed_account_number).':</td>';
+			print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
+			print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
+			print '<td colspan="'.$colspanend.'"></td>';
+			print '</tr>';
+			// Show balance of last shown account
+			$balance = $sous_total_debit - $sous_total_credit;
+			print '<tr class="liste_total">';
+			print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
+			if ($balance > 0 )
+			{
+				print '<td class="nowraponall right">';
+				print price($sous_total_debit - $sous_total_credit);
+				print '</td>';
+				print '<td></td>';
+			}
+			else
+			{
+				print '<td></td>';
+				print '<td class="nowraponall right">';
+				print price($sous_total_credit - $sous_total_debit);
+				print '</td>';
+			}
+			print '<td colspan="'.$colspanend.'"></td>';
 			print '</tr>';
 		}
 
 		// Show the break account
-		$colspan = 9;
 		print "<tr>";
-		print '<td colspan="'.$colspan.'" style="font-weight:bold; border-bottom: 1pt solid black;">';
+		print '<td colspan="'.$totalarray['nbfield'].'" style="font-weight:bold; border-bottom: 1pt solid black;">';
 		if ($line->numero_compte != "" && $line->numero_compte != '-1') print length_accountg($line->numero_compte).' : '.$object->get_compte_desc($line->numero_compte);
 		else print '<span class="error">'.$langs->trans("Unknown").'</span>';
 		print '</td>';
@@ -440,11 +562,28 @@ while ($i < min($num, $limit))
 		//if (empty($displayed_account_number)) $displayed_account_number='-';
 		$sous_total_debit = 0;
 		$sous_total_credit = 0;
+
+		$colspan = 0;
 	}
 
 	print '<tr class="oddeven">';
-	print '<td>&nbsp;</td>';
-	if (!$i) $totalarray['nbfield']++;
+
+	// Journal code
+	if (!empty($arrayfields['t.code_journal']['checked']))
+	{
+		$accountingjournal = new AccountingJournal($db);
+		$result = $accountingjournal->fetch('', $line->code_journal);
+		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
+		print '<td class="center">'.$journaltoshow.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Document date
+	if (!empty($arrayfields['t.doc_date']['checked']))
+	{
+		print '<td class="center">'.dol_print_date($line->doc_date, 'day').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
 
 	// Piece number
 	if (!empty($arrayfields['t.piece_num']['checked']))
@@ -457,13 +596,6 @@ while ($i < min($num, $limit))
 		if (!$i) $totalarray['nbfield']++;
 	}
 
-	// Document date
-	if (!empty($arrayfields['t.doc_date']['checked']))
-	{
-		print '<td class="center">'.dol_print_date($line->doc_date, 'day').'</td>';
-		if (!$i) $totalarray['nbfield']++;
-	}
-
 	// Document ref
 	if (!empty($arrayfields['t.doc_ref']['checked']))
 	{
@@ -565,16 +697,6 @@ while ($i < min($num, $limit))
 		if (!$i) $totalarray['nbfield']++;
 	}
 
-	// Journal code
-	if (!empty($arrayfields['t.code_journal']['checked']))
-	{
-		$accountingjournal = new AccountingJournal($db);
-		$result = $accountingjournal->fetch('', $line->code_journal);
-		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
-		print '<td class="center">'.$journaltoshow.'</td>';
-		if (!$i) $totalarray['nbfield']++;
-	}
-
 	// Fields from hook
 	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
@@ -591,25 +713,45 @@ while ($i < min($num, $limit))
 		}
 	}
 	print '</td>';
+	if (!$i) $totalarray['nbfield']++;
 
 	// Comptabilise le sous-total
 	$sous_total_debit += $line->debit;
 	$sous_total_credit += $line->credit;
 
-	if (!$i) $totalarray['nbfield']++;
-
 	print "</tr>\n";
 
 	$i++;
 }
 
 // Show sub-total of last shown account
+$colspan = $totalarray['nbfield'] - 3;
+$colspanend = $totalarray['nbfield'] - 8;
 print '<tr class="liste_total">';
-print '<td class="right" colspan="'.$totalarray['nbfield'].'">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td>';
-print '<td class="nowraponall center">';
-print price($sous_total_debit - $sous_total_credit);
-print '</td>';
-print '<td></td>';
+print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.$accountg.':</td>';
+print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
+print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
+print '<td colspan="'.$colspanend.'"></td>';
+print '</tr>';
+// Show balance of last shown account
+$balance = $sous_total_debit - $sous_total_credit;
+print '<tr class="liste_total">';
+print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
+if ($balance > 0 )
+{
+	print '<td class="nowraponall right">';
+	print price($sous_total_debit - $sous_total_credit);
+	print '</td>';
+	print '<td></td>';
+}
+else
+{
+	print '<td></td>';
+	print '<td class="nowraponall right">';
+	print price($sous_total_credit - $sous_total_debit);
+	print '</td>';
+}
+print '<td colspan="'.$colspanend.'"></td>';
 print '</tr>';
 
 // Show total line
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index eb3229efaee..adf2309ad07 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind

From ff578198d63c4e8f4b852c96c4380f264e38b74c Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 10 May 2020 04:35:52 +0000
Subject: [PATCH 119/490] Fixing style errors.

---
 htdocs/accountancy/bookkeeping/listbyaccount.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 49dbb81e77d..25f664d955e 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -517,7 +517,6 @@ while ($i < min($num, $limit))
 
 	// Is it a break ?
 	if ($accountg != $displayed_account_number || !isset($displayed_account_number)) {
-
 		$colspan = $totalarray['nbfield'] - 3;
 		$colspanend = $totalarray['nbfield'] - 7;
 		// Show a subtotal by accounting account

From 04480847df1ca79066567d41c58e613ed03a4189 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 10 May 2020 08:28:03 +0200
Subject: [PATCH 120/490] NEW Accountancy balance - Add a button
 ShowSubtotalByGroup

---
 htdocs/accountancy/bookkeeping/balance.php | 61 ++++++++++++++--------
 htdocs/langs/en_US/accountancy.lang        |  1 +
 2 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index b2a25b00ce2..7b99057f73a 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -55,7 +55,7 @@ $pagenext = $page + 1;
 //if (! $sortfield) $sortfield="p.date_fin";
 //if (! $sortorder) $sortorder="DESC";
 
-
+$show_subgroup = GETPOST('show_subgroup', 'alpha');
 $search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
 $search_date_end = dol_mktime(23, 59, 59, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
 
@@ -130,10 +130,11 @@ if (!empty($search_accountancy_code_end)) {
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-	$search_accountancy_code_start = '';
-	$search_accountancy_code_end = '';
+	$show_subgroup = '';
 	$search_date_start = '';
 	$search_date_end = '';
+	$search_accountancy_code_start = '';
+	$search_accountancy_code_end = '';
 	$filter = array();
 }
 
@@ -223,6 +224,12 @@ if ($action != 'export_csv')
 	$moreforfilter .= $form->selectDate($search_date_start ? $search_date_start : -1, 'date_start', 0, 0, 1, '', 1, 0);
 	$moreforfilter .= $langs->trans('DateEnd').': ';
 	$moreforfilter .= $form->selectDate($search_date_end ? $search_date_end : -1, 'date_end', 0, 0, 1, '', 1, 0);
+
+	$moreforfilter .= ' - ';
+	$moreforfilter .= $langs->trans('ShowSubtotalByGroup').': ';
+	$moreforfilter .= '<input type="checkbox" name="show_subgroup" value="show_subgroup"'.($show_subgroup == 'show_subgroup' ? ' checked' : '').'>';
+
+
 	$moreforfilter .= '</div>';
 
 	if (!empty($moreforfilter)) {
@@ -289,26 +296,31 @@ if ($action != 'export_csv')
 		}
 		print '<tr class="oddeven">';
 
-		// Permet d'afficher le compte comptable
-		if (empty($displayed_account) || $root_account_description != $displayed_account)
+		if(!empty($show_subgroup))
 		{
-			// Affiche un Sous-Total par compte comptable
-			if ($displayed_account != "") {
-				print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td><td class="nowrap right">'.price(price2num($sous_total_credit - $sous_total_debit)).'</td>';
-				print "<td>&nbsp;</td>\n";
+			// Permet d'afficher le compte comptable
+			if (empty($displayed_account) || $root_account_description != $displayed_account) {
+				// Affiche un Sous-Total par compte comptable
+				if ($displayed_account != "") {
+					print '<tr class="liste_total"><td class="right" colspan="2">' . $langs->trans("SubTotal") . ':</td>';
+					print '<td class="nowrap right">' . price($sous_total_debit) . '</td>';
+					print '<td class="nowrap right">' . price($sous_total_credit) . '</td>';
+					print '<td class="nowrap right">' . price(price2num($sous_total_credit - $sous_total_debit)) . '</td>';
+					print "<td></td>\n";
+					print "<td></td>\n";
+					print '</tr>';
+				}
+
+				// Show first line of a break
+				print '<tr class="trforbreak">';
+				print '<td colspan="7" style="font-weight:bold; border-bottom: 1pt solid black;">' . $line->numero_compte . ($root_account_description ? ' - ' . $root_account_description : '') . '</td>';
 				print '</tr>';
+
+				$displayed_account = $root_account_description;
+				$sous_total_debit = 0;
+				$sous_total_credit = 0;
 			}
-
-			// Show first line of a break
-			print '<tr class="trforbreak">';
-			print '<td colspan="7" style="font-weight:bold; border-bottom: 1pt solid black;">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
-			print '</tr>';
-
-			$displayed_account = $root_account_description;
-			$sous_total_debit = 0;
-			$sous_total_credit = 0;
 		}
-
 		// $object->get_compte_racine($line->numero_compte);
 
 		print '<td>'.length_accountg($line->numero_compte).'</td>';
@@ -326,12 +338,15 @@ if ($action != 'export_csv')
 		$sous_total_credit += $line->credit;
 	}
 
-	print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td><td class="nowrap right">'.price(price2num($sous_total_debit - $sous_total_credit)).'</td>';
-	print "<td>&nbsp;</td>\n";
-	print '</tr>';
+	if(!empty($show_subgroup))
+	{
+		print '<tr class="liste_total"><td class="right" colspan="3">' . $langs->trans("SubTotal") . ':</td><td class="nowrap right">' . price($sous_total_debit) . '</td><td class="nowrap right">' . price($sous_total_credit) . '</td><td class="nowrap right">' . price(price2num($sous_total_debit - $sous_total_credit)) . '</td>';
+		print "<td></td>\n";
+		print '</tr>';
+	}
 
 	print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("AccountBalance").':</td><td class="nowrap right">'.price($total_debit).'</td><td class="nowrap right">'.price($total_credit).'</td><td class="nowrap right">'.price(price2num($total_debit - $total_credit)).'</td>';
-	print "<td>&nbsp;</td>\n";
+	print "<td></td>\n";
 	print '</tr>';
 
 	print "</table>";
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index eb3229efaee..a3d4437b043 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -235,6 +235,7 @@ UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-par
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.

From 796f97c6715e16b162c9d23952c63a34d728ee8f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 May 2020 15:08:01 +0200
Subject: [PATCH 121/490] Support tag $capture in input of files

---
 htdocs/core/class/html.formfile.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 98d781a51c1..26abcf2e721 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -78,9 +78,10 @@ class FormFile
 	 *  @param	string		$accept			Specifies the types of files accepted (This is not a security check but an user interface facility. eg '.pdf,image/*' or '.png,.jpg' or 'video/*')
 	 *	@param	string		$sectiondir		If upload must be done inside a particular directory (if sectiondir defined, sectionid must not be)
 	 *  @param  int         $usewithoutform 0=Default, 1=Disable <form> and style to use in existing area
+	 *  @param	int			$capture		1=Add tag capture="capture" to force use of micro or video recording to generate file. When setting this to 1, you must also provide a value for $accept.
 	 * 	@return	int							<0 if KO, >0 if OK
 	 */
-	public function form_attach_new_file($url, $title = '', $addcancel = 0, $sectionid = 0, $perm = 1, $size = 50, $object = '', $options = '', $useajax = 1, $savingdocmask = '', $linkfiles = 1, $htmlname = 'formuserfile', $accept = '', $sectiondir = '', $usewithoutform = 0)
+	public function form_attach_new_file($url, $title = '', $addcancel = 0, $sectionid = 0, $perm = 1, $size = 50, $object = '', $options = '', $useajax = 1, $savingdocmask = '', $linkfiles = 1, $htmlname = 'formuserfile', $accept = '', $sectiondir = '', $usewithoutform = 0, $capture = 0)
 	{
         // phpcs:enable
 		global $conf, $langs, $hookmanager;
@@ -170,6 +171,7 @@ class FormFile
 			$out .= ((!empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout != 'classic') ? ' name="userfile"' : ' name="userfile[]" multiple');
 			$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm) ? ' disabled' : '');
 			$out .= (!empty($accept) ? ' accept="'.$accept.'"' : ' accept=""');
+			$out .= (!empty($capture) ? ' capture="capture"' : '');
 			$out .= '>';
 			$out .= ' ';
 			if ($sectionid) {	// Show overwrite if exists for ECM module only

From 501f1ba2c403f12c90c8a76810bec39540581e64 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 May 2020 15:45:07 +0200
Subject: [PATCH 122/490] Fix look and feel v12

---
 htdocs/contrat/document.php          | 1 -
 htdocs/core/ajax/selectsearchbox.php | 2 +-
 htdocs/core/lib/functions.lib.php    | 9 +++++----
 htdocs/main.inc.php                  | 8 ++++----
 htdocs/theme/eldy/global.inc.php     | 6 +++++-
 htdocs/theme/md/style.css.php        | 2 ++
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 7d47b5102ac..fd3b3f66e4a 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -179,7 +179,6 @@ if ($object->id)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-
     print '<table class="border tableforfield centpercent">';
     print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
     print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 2f8ad4ab5f7..31a95d1e02c 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -99,7 +99,7 @@ if (!empty($conf->commande->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUS
 }
 if (!empty($conf->expedition->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED) && $user->rights->expedition->lire)
 {
-	$arrayresult['searchintoshipment'] = array('position'=>80, 'img'=>'object_sending', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('', 'object_sending').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintoshipment'] = array('position'=>80, 'img'=>'object_shipment', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('', 'object_shipment').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 if (!empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire)
 {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index bcf47a58eef..89e76156448 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3162,7 +3162,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
         		'object_margin', 'object_money-bill-alt', 'object_multicurrency', 'object_order', 'object_payment',
         		'object_lot', 'object_mrp', 'object_payment', 'object_product', 'object_propal',
         		'object_other', 'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
-        		'object_supplier_invoice', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',
+        		'object_shipment', 'object_supplier_invoice', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',
         		'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member',
         		'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email',
         		'off', 'on', 'order',
@@ -3209,7 +3209,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'resize'=>'crop', 'supplier_order'=>'dol-order_supplier', 'supplier_proposal'=>'file-signature',
 		    	'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
 		    	'resource'=>'laptop-house',
-		    	'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
+		    	'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
 		    	'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
 		    	'title_agenda'=>'calendar-alt',
 		    	'uparrow'=>'mail-forward',
@@ -3273,7 +3273,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'error'=>'pictoerror', 'warning'=>'pictowarning', 'switch_on'=>'font-status4',
 				'holiday'=>'bg-infobox-holiday', 'invoice'=>'bg-infobox-commande',
 				'payment'=>'bg-infobox-bank_account', 'poll'=>'bg-infobox-adherent', 'project'=>'bg-infobox-project', 'projecttask'=>'bg-infobox-project', 'propal'=>'bg-infobox-propal',
-				'resource'=>'bg-infobox-action', 'supplier_invoice'=>'bg-infobox-order_supplier', 'supplier_order'=>'bg-infobox-order_supplier', 'supplier_proposal'=>'bg-infobox-supplier_proposal',
+				'resource'=>'bg-infobox-action',
+				'supplier_invoice'=>'bg-infobox-order_supplier', 'supplier_order'=>'bg-infobox-order_supplier', 'supplier_proposal'=>'bg-infobox-supplier_proposal',
 				'ticket'=>'bg-infobox-contrat', 'title_accountancy'=>'bg-infobox-bank_account', 'title_hrm'=>'bg-infobox-holiday', 'trip'=>'bg-infobox-expensereport', 'title_agenda'=>'bg-infobox-action',
 				//'title_setup'=>'bg-infobox-action', 'tools'=>'bg-infobox-action',
 				'list-alt'=>'imgforviewmode', 'calendar'=>'imgforviewmode', 'calendarweek'=>'imgforviewmode', 'calendarmonth'=>'imgforviewmode', 'calendarday'=>'imgforviewmode', 'calendarperuser'=>'imgforviewmode'
@@ -3291,7 +3292,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'map-marker-alt'=>'#aaa', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'stock'=>'#a69944',
 				'other'=>'#ddd',
 				'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'resize'=>'#444', 'rss'=>'#cba',
-				'stats'=>'#444', 'switch_off'=>'#999', 'uparrow'=>'#555', 'globe-americas'=>'#aaa'
+				'shipment'=>'#a69944', 'stats'=>'#444', 'switch_off'=>'#999', 'uparrow'=>'#555', 'globe-americas'=>'#aaa'
 			);
 			if (isset($arrayconvpictotocolor[$pictowithouttext])) {
 				$facolor = $arrayconvpictotocolor[$pictowithouttext];
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6533b4bfe54..8ebd68631cb 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2180,7 +2180,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
             } else {
                 if (is_array($arrayresult)) {
                     foreach ($arrayresult as $key => $val) {
-                        $searchform .= printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleft'.$key, img_picto('', $val['img'], '', false, 1, 1));
+                        $searchform .= printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleft'.$key, $val['img']);
                     }
                 }
             }
@@ -2453,14 +2453,14 @@ function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinpu
 	$ret .= '<input type="hidden" name="savelogin" value="'.dol_escape_htmltag($user->login).'">';
 	if ($showtitlebefore) $ret .= '<div class="tagtd left">'.$title.'</div> ';
 	$ret .= '<div class="tagtd">';
+	$ret .= img_picto('', $img, '', false, 0, 0, '', 'paddingright width20');
 	$ret .= '<input type="text" class="flat '.$htmlmorecss.'"';
-	$ret .= ' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
+	$ret .= ' style="background-repeat: no-repeat; background-position: 3px;"';
 	$ret .= ($accesskey ? ' accesskey="'.$accesskey.'"' : '');
 	$ret .= ' placeholder="'.strip_tags($title).'"';
 	$ret .= ($autofocus ? ' autofocus' : '');
 	$ret .= ' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
-	//$ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.$langs->trans("Go").'">';
-	$ret .= '<button type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px">';
+	$ret .= '<button type="submit" class="button bordertransp" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px">';
 	$ret .= '<span class="fa fa-search"></span>';
 	$ret .= '</button>';
 	$ret .= '</div>';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 9e099c6953d..4ec62c217a5 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1027,6 +1027,7 @@ table[summary="list_of_modules"] .fa-cog {
 /* rule for not too small screen only */
 @media only screen and (min-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)
 {
+	.width20  { width: 20px; }
 	.width25  { width: 25px; }
     .width50  { width: 50px; }
     .width75  { width: 75px; }
@@ -1048,6 +1049,7 @@ table[summary="list_of_modules"] .fa-cog {
     .minwidth500imp { min-width: 500px !important; }
 }
 .widthauto { width: auto; }
+.width20  { width: 20px; }
 .width25  { width: 25px; }
 .width50  { width: 50px; }
 .width75  { width: 75px; }
@@ -6309,7 +6311,9 @@ div.tabsElem a.tab {
 	div.login_block_user, div.login_block_other { clear: both; }
 	.atoplogin, .atoplogin:hover
 	{
-		color: #000 !important;
+		color:unset !important;
+		padding-left: 4px;
+		padding-right: 4px;
 	}
 	.login_block_elem {
 		padding: 0 !important;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index c995426edd9..71fbb6f50da 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1122,6 +1122,7 @@ table[summary="list_of_modules"] .fa-cog {
 /* rule for not too small screen only */
 @media only screen and (min-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 7; ?>px)
 {
+	.width20  { width: 20px; }
 	.width25  { width: 25px; }
     .width50  { width: 50px; }
     .width75  { width: 75px; }
@@ -1143,6 +1144,7 @@ table[summary="list_of_modules"] .fa-cog {
 	.minwidth500imp { min-width: 500px !important; }
 }
 .widthauto { width: auto; }
+.width20  { width: 20px; }
 .width25  { width: 25px; }
 .width50  { width: 50px; }
 .width75  { width: 75px; }

From fbbb898d528e526b9ff9b8a7e47d4a027718d96b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 May 2020 18:31:55 +0200
Subject: [PATCH 123/490] Better log

---
 scripts/cron/cron_run_jobs.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index 24e92c79d0b..79d52c49445 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -227,11 +227,13 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
 				echo "You can also enable module Log if not yet enabled, run again and take a look into dolibarr.log file\n";
 				dol_syslog("cron_run_jobs.php::run_jobs Error ".$cronjob->error, LOG_ERR);
 				$nbofjobslaunchedko++;
+				$resultstring = 'KO';
 			} else {
 				$nbofjobslaunchedok++;
+				$resultstring = 'OK';
 			}
 
-			echo " - result of run_jobs = ".$result;
+			echo " - run_jobs ".$resultstring." result = ".$result;
 
 			// We re-program the next execution and stores the last execution time for this job
 			$result = $cronjob->reprogram_jobs($userlogin, $now);

From c511af69fe31ec911679f93de77aeffbc541a952 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 May 2020 21:07:49 +0200
Subject: [PATCH 124/490] Debug look and feel v12

---
 htdocs/core/class/html.form.class.php         |  5 ++-
 htdocs/core/class/html.formactions.class.php  |  5 ++-
 htdocs/core/lib/agenda.lib.php                | 44 ++++++++++---------
 htdocs/core/modules/DolibarrModules.class.php |  2 +-
 .../class/html.formresource.class.php         |  5 ++-
 htdocs/theme/eldy/global.inc.php              | 31 +++++++++----
 6 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ee24af9f307..5fe411c6260 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7676,10 +7676,11 @@ class Form
 	 * 	@param	int		$enableonly		Array list of groups id to be enabled. All other must be disabled
 	 * 	@param	string	$force_entity	'0' or Ids of environment to force
 	 * 	@param	bool	$multiple		add [] in the name of element and add 'multiple' attribut (not working with ajax_autocompleter)
+	 *  @param  string	$morecss		More css to add to html component
 	 *  @return	string
 	 *  @see select_dolusers()
 	 */
-    public function select_dolgroups($selected = '', $htmlname = 'groupid', $show_empty = 0, $exclude = '', $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $multiple = false)
+    public function select_dolgroups($selected = '', $htmlname = 'groupid', $show_empty = 0, $exclude = '', $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $multiple = false, $morecss = '')
 	{
         // phpcs:enable
 		global $conf, $user, $langs;
@@ -7722,7 +7723,7 @@ class Form
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 		   	$out .= ajax_combobox($htmlname);
 
-			$out .= '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled ? ' disabled' : '').'>';
+			$out .= '<select class="flat minwidth200'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled ? ' disabled' : '').'>';
 
 			$num = $this->db->num_rows($resql);
 			$i = 0;
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 352fcebb06b..8aa51a66ab7 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -339,9 +339,10 @@ class FormActions
      *  @param	int		        $hideinfohelp	1=Do not show info help, 0=Show, -1=Show+Add info to tell how to set default value
      *  @param  int		        $multiselect    1=Allow multiselect of action type
      *  @param  int             $nooutput       1=No output
+     *  @param	string			$morecss		More css to add to SELECT component.
      * 	@return	string
      */
-    public function select_type_actions($selected = '', $htmlname = 'actioncode', $excludetype = '', $onlyautoornot = 0, $hideinfohelp = 0, $multiselect = 0, $nooutput = 0)
+    public function select_type_actions($selected = '', $htmlname = 'actioncode', $excludetype = '', $onlyautoornot = 0, $hideinfohelp = 0, $multiselect = 0, $nooutput = 0, $morecss = '')
     {
         // phpcs:enable
         global $langs, $user, $form, $conf;
@@ -371,7 +372,7 @@ class FormActions
 		}
 		else
 		{
-			$out .= $form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200', 1);
+			$out .= $form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200'.($morecss ? ' '.$morecss : ''), 1);
 		}
 
         if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0)
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 474a4f03696..532ef091698 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -77,27 +77,29 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 	{
 		// Type
 		print '<tr>';
-		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+		print '<td class="nowrap">';
 		print $langs->trans("Type");
-		print '</td><td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+		print '</td><td class="nowraponall">';
 		$multiselect = 0;
 		if (!empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE))     // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
 		{
 			$multiselect = (!empty($conf->global->AGENDA_USE_EVENT_TYPE));
 		}
-		print '<span class="fas fa-square" style=" color: #ddd;"></span>';
-		print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 0, $multiselect);
+		print '<span class="fas fa-square inline-block fawidth30" style=" color: #ddd;"></span>';
+		print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 0, $multiselect, 0, 'maxwidth500');
 		print '</td></tr>';
 
 		// Assigned to
 		print '<tr>';
-		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+		print '<td class="nowrap">';
 		print $langs->trans("ActionsToDoBy").' &nbsp; ';
-		print '</td><td style="padding-bottom: 2px; padding-right: 4px;">';
-		print img_picto('', 'user');
-		print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+		print '</td><td>';
+		print img_picto('', 'user', 'class="fawidth30 inline-block"');
+		print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth500');
 		if (empty($conf->dol_optimize_smallscreen)) print ' &nbsp; '.$langs->trans("or").' '.$langs->trans("ToUserOfGroup").' &nbsp; ';
-		print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', !$canedit);
+		else print '<br>';
+		print img_picto('', 'object_group', 'class="fawidth30 inline-block"');
+		print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', !$canedit, '', '', '0', false, 'maxwidth500');
 		print '</td></tr>';
 
 		if ($conf->resource->enabled)
@@ -109,9 +111,9 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
     		print '<tr>';
     		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
     		print $langs->trans("Resource");
-    		print '</td><td class="nowrap maxwidthonsmartphone" style="padding-bottom: 2px; padding-right: 4px;">';
-    		print img_picto('', 'object_resource');
-    		print $formresource->select_resource_list($resourceid, "search_resourceid", '', 1, 0, 0, null, '', 2);
+    		print '</td><td class="nowraponall maxwidthonsmartphone">';
+    		print img_picto('', 'object_resource', 'class="fawidth30 inline-block"');
+    		print $formresource->select_resource_list($resourceid, "search_resourceid", '', 1, 0, 0, null, '', 2, 0, 'maxwidth500');
     		print '</td></tr>';
 		}
 	}
@@ -119,11 +121,11 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 	if (!empty($conf->societe->enabled) && $user->rights->societe->lire)
 	{
 		print '<tr>';
-		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+		print '<td class="nowrap">';
 		print $langs->trans("ThirdParty").' &nbsp; ';
-		print '</td><td class="nowrap" style="padding-bottom: 2px;">';
-		print img_picto('', 'company');
-		print $form->select_company($socid, 'search_socid', '', '&nbsp;', 0, 0, null, 0);
+		print '</td><td class="nowraponall">';
+		print img_picto('', 'company', 'class="fawidth30 inline-block"');
+		print $form->select_company($socid, 'search_socid', '', '&nbsp;', 0, 0, null, 0, 'minwidth100 maxwidth500');
 		print '</td></tr>';
 	}
 
@@ -133,10 +135,10 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		$formproject = new FormProjets($db);
 
 		print '<tr>';
-		print '<td class="nowrap" style="padding-bottom: 2px;">';
+		print '<td class="nowrap">';
 		print $langs->trans("Project").' &nbsp; ';
-		print '</td><td class="nowrap" style="padding-bottom: 2px;">';
-		print img_picto('', 'project');
+		print '</td><td class="nowraponall">';
+		print img_picto('', 'project', 'class="fawidth30 inline-block"');
 		print $formproject->select_projects($socid ? $socid : -1, $pid, 'search_projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'maxwidth500');
 		print '</td></tr>';
 	}
@@ -145,9 +147,9 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 	{
 		// Status
 		print '<tr>';
-		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+		print '<td class="nowrap">';
 		print $langs->trans("Status");
-		print ' &nbsp;</td><td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+		print ' &nbsp;</td><td class="nowraponall">';
 		$formactions->form_select_status_action('formaction', $status, 1, 'search_status', 1, 2, 'minwidth100');
 		print '</td></tr>';
 	}
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index c592cb69959..9543cf74442 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -2314,7 +2314,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		print '</div>
 	    <div class="info-box-content info-box-text-module">
 	    <span class="info-box-title">'.$this->getName().'</span>
-	    <span class="info-box-desc twolinesmax" title="'.dol_escape_htmltag($this->getDesc()).'">'.nl2br($this->getDesc()).'</span>';
+	    <span class="info-box-desc twolinesmax opacitymedium" title="'.dol_escape_htmltag($this->getDesc()).'">'.nl2br($this->getDesc()).'</span>';
 
 		/*print '<span class="info-box-icon-version" title="'.$langs->trans("Version").' '.$this->getVersion(1).'">';
 		print $this->getVersion(1);
diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php
index 3c0bb36116e..36d3fc854cc 100644
--- a/htdocs/resource/class/html.formresource.class.php
+++ b/htdocs/resource/class/html.formresource.class.php
@@ -74,9 +74,10 @@ class FormResource
      *  @param	string	$filterkey		Filter on key value
      *  @param	int		$outputmode		0=HTML select string, 1=Array, 2=without form tag
      *  @param	int		$limit			Limit number of answers
+     *  @param	string	$morecss		More css
      * 	@return	string					HTML string with
      */
-    public function select_resource_list($selected = '', $htmlname = 'fk_resource', $filter = '', $showempty = 0, $showtype = 0, $forcecombo = 0, $event = array(), $filterkey = '', $outputmode = 0, $limit = 20)
+    public function select_resource_list($selected = '', $htmlname = 'fk_resource', $filter = '', $showempty = 0, $showtype = 0, $forcecombo = 0, $event = array(), $filterkey = '', $outputmode = 0, $limit = 20, $morecss = '')
     {
         // phpcs:enable
     	global $conf, $user, $langs;
@@ -103,7 +104,7 @@ class FormResource
     		}
 
     		// Construct $out and $outarray
-    		$out .= '<select id="'.$htmlname.'" class="flat minwidth200" name="'.$htmlname.'">'."\n";
+    		$out .= '<select id="'.$htmlname.'" class="flat minwidth200'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">'."\n";
     		if ($showempty) $out .= '<option value="-1">&nbsp;</option>'."\n";
 
     		$num = 0;
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 4ec62c217a5..dc0c77ed67d 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -670,7 +670,9 @@ body[class*="colorblind-"] .text-success{
 .editfielda span.fa-pencil-alt:hover, .editfielda span.fa-trash:hover, .editfieldlang:hover {
     color: var(--colortexttitle) !important;
 }
-
+.fawidth30 {
+	width: 20px;
+}
 .floatnone {
 	float: none !important;
 }
@@ -1137,6 +1139,19 @@ table[summary="list_of_modules"] .fa-cog {
 
     .hideonsmartphone { display: none; }
     .hideonsmartphoneimp { display: none !important; }
+
+	span.pictotitle {
+		margin-<?php echo $left; ?>: 0 !important;
+	}
+	div.fiche>table.table-fiche-title {
+		margin-top: 7px !important;
+		margin-bottom: 15px !important;
+	}
+
+	select.minwidth100imp, select.minwidth100, select.minwidth200, .widthcentpercentminusx {
+		width: calc(100% - 30px) !important;
+		display: inline-block;
+	}
 }
 
 /* Force values for small screen 570 */
@@ -1145,6 +1160,10 @@ table[summary="list_of_modules"] .fa-cog {
 	body {
 		font-size: <?php print is_numeric($fontsize) ? ($fontsize + 3).'px' : $fontsize; ?>;
 	}
+
+	.box-flex-item {
+		margin: 3px 2px 3px 2px !important;
+	}
 	div.refidno {
 		font-size: <?php print is_numeric($fontsize) ? ($fontsize + 3).'px' : $fontsize; ?> !important;
 	}
@@ -1472,10 +1491,10 @@ body.onlinepaymentbody div.fiche {	/* For online payment page */
 	margin: 20px !important;
 }
 div.fiche>table:first-child {
-	margin-bottom: 15px !important;
+	margin-bottom: 15px;
 }
 div.fiche>table.table-fiche-title {
-	margin-bottom: 7px !important;
+	margin-bottom: 7px;
 }
 div.fichecenter {
 	width: 100%;
@@ -1607,12 +1626,6 @@ td.nobordernopadding.widthpictotitle.col-picto {
 	margin-<?php echo $right; ?>: 8px;
 	/* margin-bottom: 4px; */
 }
-@media only screen and (max-width: 767px)
-{
-	span.pictotitle {
-		margin-<?php echo $left; ?>: 0 !important;
-	}
-}
 .pictoobjectwidth {
 	width: 14px;
 }

From a83af075aa7867a404f5fb125515c120a042756f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 May 2020 00:35:05 +0200
Subject: [PATCH 125/490] Fix responsive

---
 htdocs/admin/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index 1a55fbc04ee..1a27d61e55d 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -67,12 +67,12 @@ if (!empty($conf->global->MAIN_MOTD_SETUPPAGE))
     }
 }
 
-print '<span class="opacitymedium">';
-print $langs->trans("SetupDescription1");
+print '<span class="opacitymedium hideonsmartphone">';
+print $langs->trans("SetupDescription1").' ';
 print $langs->trans("AreaForAdminOnly").' ';
 print $langs->trans("SetupDescription2", $langs->transnoentities("MenuCompanySetup"), $langs->transnoentities("Modules"));
-print '</span>';
 print "<br><br>";
+print '</span>';
 
 print '<br>';
 

From 7300b45bcd9af35dc206830d71708853615eed60 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 May 2020 01:19:33 +0200
Subject: [PATCH 126/490] Responsive

---
 htdocs/adherents/index.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 44fcb397ddc..6d069386592 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -1,9 +1,9 @@
 <?php
 /* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2003		Jean-Louis Bergamo	<jlb@j1b.org>
- * Copyright (C) 2004-2017	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2020	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin		<regis.houssin@inodbox.com>
- * Copyright (C) 2019           Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 2019       Nicolas ZABOURI         <info@inovea-conseil.com>
  *
  * 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
@@ -22,7 +22,7 @@
 /**
  *       \file       htdocs/adherents/index.php
  *       \ingroup    member
- *       \brief      Page accueil module adherents
+ *       \brief      Home page of membership module
  */
 
 require '../main.inc.php';
@@ -339,7 +339,7 @@ if ($resql)
 			$staticmember->ref = $staticmember->getFullName($langs);
 			$statictype->id = $obj->typeid;
 			$statictype->label = $obj->label;
-			print '<td>'.$staticmember->getNomUrl(1, 32).'</td>';
+			print '<td class="nowraponall">'.$staticmember->getNomUrl(1, 32).'</td>';
 			print '<td>'.$statictype->getNomUrl(1, 32).'</td>';
 			print '<td>'.dol_print_date($db->jdate($obj->datem), 'dayhour').'</td>';
 			print '<td class="right">'.$staticmember->LibStatut($obj->statut, ($obj->subscription == 'yes' ? 1 : 0), $db->jdate($obj->date_end_subscription), 3).'</td>';
@@ -399,12 +399,12 @@ if ($resql)
 				$staticmember->name = $obj->company;
 			}
 			$staticmember->ref = $staticmember->getFullName($langs);
-			print '<td>'.$subscriptionstatic->getNomUrl(1).'</td>';
-			print '<td>'.$staticmember->getNomUrl(1, 32, 'subscription').'</td>';
-			print '<td>'.get_date_range($db->jdate($obj->date_start), $db->jdate($obj->date_end)).'</td>';
+			print '<td class="nowraponall">'.$subscriptionstatic->getNomUrl(1).'</td>';
+			print '<td class="nowraponall">'.$staticmember->getNomUrl(1, 32, 'subscription').'</td>';
+			print '<td class="nowraponall">'.get_date_range($db->jdate($obj->date_start), $db->jdate($obj->date_end)).'</td>';
 			print '<td class="right">'.price($obj->subscription).'</td>';
 			//print '<td class="right">'.$staticmember->LibStatut($obj->statut,($obj->subscription=='yes'?1:0),$db->jdate($obj->date_end_subscription),5).'</td>';
-			print '<td class="right">'.dol_print_date($db->jdate($obj->datem ? $obj->datem : $obj->datec), 'dayhour').'</td>';
+			print '<td class="right nowraponall">'.dol_print_date($db->jdate($obj->datem ? $obj->datem : $obj->datec), 'dayhour').'</td>';
 			print '</tr>';
 			$i++;
 		}

From 02ec28281296c16044ecd714230ad935625eb3f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 May 2020 03:34:30 +0200
Subject: [PATCH 127/490] Typo

---
 htdocs/langs/en_US/admin.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 3cf6e6044db..9ad7d2cf55a 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1015,7 +1015,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes

From a8dcd2d09b2a933f1e5525340e4db31786aece88 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 May 2020 11:53:13 +0200
Subject: [PATCH 128/490] Clean code

---
 htdocs/core/class/conf.class.php  |  2 --
 htdocs/core/lib/functions.lib.php | 26 +++++++-------------------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 0a52301e608..dee4edc3298 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -690,8 +690,6 @@ class Conf
 			$this->global->AGENDA_DEFAULT_FILTER_TYPE = '0'; // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.
 		}
 
-		if (!isset($this->global->MAIN_USE_OLD_TITLE_BUTTON)) $this->global->MAIN_USE_OLD_TITLE_BUTTON = 0;
-
 		if (!isset($this->global->MAIN_JS_GRAPH)) $this->global->MAIN_JS_GRAPH = 'chart'; // Use chart.js library
 
 		if (empty($this->global->MAIN_MODULE_DOLISTORE_API_SRV)) $this->global->MAIN_MODULE_DOLISTORE_API_SRV = 'https://www.dolistore.com';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 89e76156448..5f31b07214c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4523,15 +4523,17 @@ function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $be
 	}
 	if ($page > 0)
 	{
-		print '<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page - 1).$options.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';
+		print '<li class="pagination paginationpage"><a class="paginationprevious" href="'.$file.'?page='.($page - 1).$options.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';
 	}
 	if ($betweenarrows)
 	{
+		print '<!--<div class="betweenarrows nowraponall inline-block">-->';
 		print $betweenarrows;
+		print '<!--</div>-->';
 	}
 	if ($nextpage > 0)
 	{
-		print '<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page + 1).$options.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';
+		print '<li class="pagination paginationpage"><a class="paginationnext" href="'.$file.'?page='.($page + 1).$options.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';
 	}
 	if ($afterarrows)
 	{
@@ -8623,11 +8625,8 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
     }
 
     $class = 'btnTitle';
+    if ($iconClass == 'fa fa-plus-circle') $class .= ' btnTitlePlus';
 
-    // hidden conf keep during button transition TODO: remove this block
-    if (!empty($conf->global->MAIN_USE_OLD_TITLE_BUTTON)) {
-        $class = 'butActionNew';
-    }
     if (!empty($params['morecss'])) $class .= ' '.$params['morecss'];
 
     $attr = array(
@@ -8642,11 +8641,6 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
     if ($status <= 0) {
         $attr['class'] .= ' refused';
 
-        // hidden conf keep during button transition TODO: remove this block
-        if (!empty($conf->global->MAIN_USE_OLD_TITLE_BUTTON)) {
-            $attr['class'] = 'butActionNewRefused';
-        }
-
         $attr['href'] = '';
 
         if ($status == -1) { // disable
@@ -8698,18 +8692,12 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
 
     $tag = (empty($attr['href']) ? 'span' : 'a');
 
-    $button = '<'.$tag.' '.$compiledAttributes.' >';
+    $button = '';
+    $button .= '<'.$tag.' '.$compiledAttributes.' >';
     $button .= '<span class="'.$iconClass.' valignmiddle btnTitle-icon"></span>';
     $button .= '<span class="valignmiddle text-plus-circle btnTitle-label'.(empty($params['forcenohideoftext']) ? ' hideonsmartphone' : '').'">'.$label.'</span>';
     $button .= '</'.$tag.'>';
 
-    // hidden conf keep during button transition TODO: remove this block
-    if (!empty($conf->global->MAIN_USE_OLD_TITLE_BUTTON)) {
-        $button = '<'.$tag.' '.$compiledAttributes.' ><span class="text-plus-circle">'.$label.'</span>';
-        $button .= '<span class="'.$iconClass.' valignmiddle"></span>';
-        $button .= '</'.$tag.'>';
-    }
-
     return $button;
 }
 

From a2bc46f1c012346c5c0ee5f006c5bd59ccd988ea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 May 2020 12:50:24 +0200
Subject: [PATCH 129/490] CSS

---
 htdocs/core/ajax/ajaxdirtree.php                  |  4 ++--
 htdocs/core/lib/agenda.lib.php                    |  6 +++---
 htdocs/resource/class/html.formresource.class.php |  5 +++--
 htdocs/theme/eldy/global.inc.php                  | 12 +++++++++---
 htdocs/theme/eldy/info-box.inc.php                | 11 +++++------
 5 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index 04687b77829..3e54532668a 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -428,11 +428,11 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
 						print (isset($val['cachenbofdoc']) && $val['cachenbofdoc'] >= 0) ? $val['cachenbofdoc'] : '&nbsp;';
 						print '</td>';
 						print '<td class="left">';
-						if ($nbofsubdir > 0 && $nboffilesinsubdir > 0) print '<font color="#AAAAAA">+'.$nboffilesinsubdir.'</font> ';
+						if ($nbofsubdir > 0 && $nboffilesinsubdir > 0) print '<font class="opacitymedium">+'.$nboffilesinsubdir.'</font> ';
 						print '</td>';
 
 						// Edit link
-						print '<td class="right" width="18"><a href="';
+						print '<td class="right" width="18"><a class="editfielda" href="';
 						print DOL_URL_ROOT.'/ecm/dir_card.php?module='.urlencode($modulepart).'&section='.$val['id'].'&relativedir='.urlencode($val['fullrelativename']);
 						print '&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid);
 						print '">'.img_edit($langs->trans("Edit").' - '.$langs->trans("View"), 0, 'class="valignmiddle opacitymedium"').'</a></td>';
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 532ef091698..5d450aa4b04 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -109,9 +109,9 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 
     		// Resource
     		print '<tr>';
-    		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+    		print '<td class="nowrap">';
     		print $langs->trans("Resource");
-    		print '</td><td class="nowraponall maxwidthonsmartphone">';
+    		print '</td><td class="nowraponall">';
     		print img_picto('', 'object_resource', 'class="fawidth30 inline-block"');
     		print $formresource->select_resource_list($resourceid, "search_resourceid", '', 1, 0, 0, null, '', 2, 0, 'maxwidth500');
     		print '</td></tr>';
@@ -158,7 +158,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 	{
 		// Filter on hours
 		print '<tr>';
-		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">'.$langs->trans("VisibleTimeRange").'</td>';
+		print '<td class="nowrap">'.$langs->trans("VisibleTimeRange").'</td>';
 		print "<td class='nowrap'>";
 		print '<div class="ui-grid-a"><div class="ui-block-a">';
 		print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23">';
diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php
index 36d3fc854cc..4836ed1a0f1 100644
--- a/htdocs/resource/class/html.formresource.class.php
+++ b/htdocs/resource/class/html.formresource.class.php
@@ -101,10 +101,12 @@ class FormResource
     		{
     			//$minLength = (is_numeric($conf->global->RESOURCE_USE_SEARCH_TO_SELECT)?$conf->global->RESOURCE_USE_SEARCH_TO_SELECT:2);
     			$out .= ajax_combobox($htmlname, $event, $conf->global->RESOURCE_USE_SEARCH_TO_SELECT);
+    		} else {
+    			$out .= ajax_combobox($htmlname);
     		}
 
     		// Construct $out and $outarray
-    		$out .= '<select id="'.$htmlname.'" class="flat minwidth200'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">'."\n";
+    		$out .= '<select id="'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">'."\n";
     		if ($showempty) $out .= '<option value="-1">&nbsp;</option>'."\n";
 
     		$num = 0;
@@ -137,7 +139,6 @@ class FormResource
     			}
     		}
     		$out .= '</select>'."\n";
-    		$out .= ajax_combobox($htmlname);
 
     		if ($outputmode != 2)
     		{
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index dc0c77ed67d..8a21844ca7c 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1899,8 +1899,8 @@ div.tmenuleft
 }
 div.tmenucenter
 {
-	padding-left: 0px;
-	padding-right: 3px;
+	padding-left: 2px;
+	padding-right: 2px;
 	<?php if ($disableimages) { ?>
 	padding-top: 8px;
 	height: 26px;
@@ -3600,6 +3600,12 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 
 @media only screen and (max-width: 767px)
 {
+	a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active {
+		padding: 0px 0px 0px 0px;
+	}
+	a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active {
+		padding: 0px 0px 0px 0px;
+	}
 	.boxstats, .boxstats130 {
 		margin: 3px;
     }
@@ -4882,7 +4888,7 @@ ul.ecmjqft li {
 ul.ecmjqft a {
 	line-height: 24px;
 	vertical-align: middle;
-	color: #333;
+	color: unset;
 	padding: 0px 0px;
 	font-weight:normal;
 	display: inline-block !important;
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 7f62fe39689..3138cd8bfd9 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -15,10 +15,11 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 	display: block;
     position: relative;
 	min-height: 90px;
-	background: #fff;
+	/* background: #fff; */
 	width: 100%;
-	box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.2), 0px 0px 2px rgba(0, 0, 0, 0.1);
-	border-radius: 2px;
+	box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.1);
+    border-radius: 2px;
+    border: 1px solid #eee;
 	margin-bottom: 15px;
 }
 .info-box.info-box-sm{
@@ -67,7 +68,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 	text-align: center;
 	font-size: 45px;
 	line-height: 90px;
-	background: rgba(0, 0, 0, 0.2);
+	background: rgba(0, 0, 0, 0.08) !important
 }
 .info-box-sm .info-box-icon {
     height: 80px;
@@ -203,8 +204,6 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES
 .info-box-icon {
 	<?php if ($prefix) { ?>
 	color: #fff !important;
-	<?php } else { ?>
-	background-color: #eee !important;
 	<?php } ?>
     opacity: 0.95;
 }

From 65011c28771601aab882785dd0b1621a6c1f994d Mon Sep 17 00:00:00 2001
From: Tim Otte <otte@meuser.it>
Date: Mon, 11 May 2020 15:11:23 +0200
Subject: [PATCH 130/490] Fixed the product unit translation

---
 htdocs/product/card.php                | 2 +-
 htdocs/product/class/product.class.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 87e86e8e0bc..d58e5f8f742 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -2099,7 +2099,7 @@ else
 
 				print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td><td>';
 				if ($unit !== '') {
-					print $langs->trans($unit);
+					print $unit;
 				}
 				print '</td></tr>';
 			}
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 8f2e0973ab3..44fb0865682 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -5387,11 +5387,11 @@ class Product extends CommonObject
             $label_type = 'short_label';
         }
 
-        $sql = 'select '.$label_type.' from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;
+        $sql = 'select '.$label_type.', code from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;
         $resql = $this->db->query($sql);
         if ($resql && $this->db->num_rows($resql) > 0) {
             $res = $this->db->fetch_array($resql);
-            $label = $res[$label_type];
+            $label = $label_type == 'short' ? $res[$label_type] : $langs->trans('unit' . $res['code']);
             $this->db->free($resql);
             return $label;
         }

From 64d2f906bc7cdf2c4bbcb733ca4668ce7eae868e Mon Sep 17 00:00:00 2001
From: atm-greg <gregory.blemand@atm-consulting.fr>
Date: Mon, 11 May 2020 16:35:58 +0200
Subject: [PATCH 131/490] fix visibility of extrafields in public interface

---
 htdocs/public/ticket/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 1a18954994f..a7f9b49fd58 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -235,7 +235,7 @@ if ($action == "view_ticketlist")
         if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
         	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
         		if ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate') {
-        			$arrayfields["ef.".$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'checked' => $extrafields->attributes[$object->table_element]['list'][$key], 'position' => $extrafields->attributes[$object->table_element]['pos'][$key], 'enabled' => $extrafields->attributes[$object->table_element]['perms'][$key]);
+        			$arrayfields["ef.".$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'checked' => ($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1, 'position' => $extrafields->attributes[$object->table_element]['pos'][$key], 'enabled' =>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3) && $extrafields->attributes[$object->table_element]['perms'][$key]);
                 }
             }
         }

From 097de7b3cd934e67a00cb0a9c82bc02e6c47d838 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 11 May 2020 18:34:54 +0200
Subject: [PATCH 132/490] Only add empty select if no multiselect

---
 htdocs/core/class/html.formactions.class.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 8aa51a66ab7..398e2b8a235 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -353,10 +353,13 @@ class FormActions
         require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
         $caction = new CActionComm($this->db);
 
-       	// Suggest a list with manual events or all auto events
-       	$arraylist = $caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
-       	array_unshift($arraylist, '&nbsp;'); // Add empty line at start
-       	//asort($arraylist);
+        // Suggest a list with manual events or all auto events
+        $arraylist = $caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
+        if (empty($multiselect)) {
+            // Add empty line at start only if no multiselect
+            array_unshift($arraylist, '&nbsp;');
+        }
+        //asort($arraylist);
 
        	if ($selected == 'manual') $selected = 'AC_OTH';
        	if ($selected == 'auto')   $selected = 'AC_OTH_AUTO';

From 3a46d5a3dddaf7b581f11867cbbd4ee1cd74d9b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 11 May 2020 18:46:54 +0200
Subject: [PATCH 133/490] Update agenda_other.php

---
 htdocs/admin/agenda_other.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 10bfa13d1ce..c5b196146d5 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -81,8 +81,10 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 }
 if ($action == 'set')
 {
+	$getDefaultFilter = GETPOST('AGENDA_DEFAULT_FILTER_TYPE');
+	$defaultfilter = (is_array($getDefaultFilter)) ? implode(',', $getDefaultFilter) : $getDefaultFilter;
 	dolibarr_set_const($db, 'AGENDA_USE_EVENT_TYPE_DEFAULT', GETPOST('AGENDA_USE_EVENT_TYPE_DEFAULT'), 'chaine', 0, '', $conf->entity);
-    dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', GETPOST('AGENDA_DEFAULT_FILTER_TYPE'), 'chaine', 0, '', $conf->entity);
+    dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', $defaultfilter, 'chaine', 0, '', $conf->entity);
     dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_STATUS', GETPOST('AGENDA_DEFAULT_FILTER_STATUS'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, 'AGENDA_DEFAULT_VIEW', GETPOST('AGENDA_DEFAULT_VIEW'), 'chaine', 0, '', $conf->entity);
 }
@@ -377,7 +379,12 @@ print '<tr class="oddeven">'."\n";
 print '<td>'.$langs->trans("AGENDA_DEFAULT_FILTER_TYPE").'</td>'."\n";
 print '<td class="center">&nbsp;</td>'."\n";
 print '<td class="right nowrap">'."\n";
-$formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AGENDA_DEFAULT_FILTER_TYPE", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 1);
+$multiselect = 0;
+if (!empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE)) {
+    // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
+    $multiselect = (!empty($conf->global->AGENDA_USE_EVENT_TYPE));
+}
+$formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AGENDA_DEFAULT_FILTER_TYPE", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 1, $multiselect);
 print '</td></tr>'."\n";
 
 // AGENDA_DEFAULT_FILTER_STATUS

From 44d36815bd88eff1960f560de635a37f1cfcbfc7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 May 2020 19:00:27 +0200
Subject: [PATCH 134/490] Look and feel v12

---
 htdocs/comm/mailing/card.php             |  2 +-
 htdocs/comm/mailing/list.php             |  2 +-
 htdocs/core/lib/functions.lib.php        | 10 ++++++----
 htdocs/core/modules/modCollab.class.php  |  2 +-
 htdocs/core/modules/modWebsite.class.php |  2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 68a6b8db331..e3cb5a9ad97 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -742,7 +742,7 @@ if ($action == 'create')
 
 
 	// Print mail form
-	print load_fiche_titre($langs->trans("NewMailing"), $availablelink, 'generic');
+	print load_fiche_titre($langs->trans("NewMailing"), $availablelink, 'object_email');
 
 	dol_fiche_head();
 
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 8feaa5a4d93..8119224bbfa 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -188,7 +188,7 @@ if ($resql)
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit, 0, 0, 1);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'object_email', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	$moreforfilter = '';
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5f31b07214c..20094da216c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3158,13 +3158,13 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 	        	'object_category', 'object_conversation', 'object_bookmark', 'object_bug', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_folder',
         		'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
         		'object_cash-register', 'object_company', 'object_contact', 'object_contract', 'object_donation', 'object_dynamicprice',
-        		'object_holiday', 'object_hrm', 'object_invoice', 'object_intervention', 'object_label',
+        		'object_globe', 'object_holiday', 'object_hrm', 'object_invoice', 'object_intervention', 'object_label',
         		'object_margin', 'object_money-bill-alt', 'object_multicurrency', 'object_order', 'object_payment',
         		'object_lot', 'object_mrp', 'object_payment', 'object_product', 'object_propal',
         		'object_other', 'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
         		'object_shipment', 'object_supplier_invoice', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',
         		'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member',
-        		'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email',
+        		'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website',
         		'off', 'on', 'order',
         		'paiment', 'play', 'playdisabled', 'poll', 'printer', 'product', 'propal', 'projecttask', 'stock', 'resize', 'service', 'stats', 'trip',
 				'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'wrench',
@@ -3213,7 +3213,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		    	'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
 		    	'title_agenda'=>'calendar-alt',
 		    	'uparrow'=>'mail-forward',
-		    	'jabber'=>'comment-o'
+		    	'jabber'=>'comment-o',
+		    	'website'=>'globe-americas'
 		    );
 			if ($pictowithouttext == 'off') {
 			    $fakey = 'fa-square';
@@ -3292,7 +3293,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'map-marker-alt'=>'#aaa', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'stock'=>'#a69944',
 				'other'=>'#ddd',
 				'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'resize'=>'#444', 'rss'=>'#cba',
-				'shipment'=>'#a69944', 'stats'=>'#444', 'switch_off'=>'#999', 'uparrow'=>'#555', 'globe-americas'=>'#aaa'
+				'shipment'=>'#a69944', 'stats'=>'#444', 'switch_off'=>'#999', 'uparrow'=>'#555', 'globe-americas'=>'#aaa',
+				'website'=>'#304'
 			);
 			if (isset($arrayconvpictotocolor[$pictowithouttext])) {
 				$facolor = $arrayconvpictotocolor[$pictowithouttext];
diff --git a/htdocs/core/modules/modCollab.class.php b/htdocs/core/modules/modCollab.class.php
index 5190c8c4d72..345a292cb92 100644
--- a/htdocs/core/modules/modCollab.class.php
+++ b/htdocs/core/modules/modCollab.class.php
@@ -55,7 +55,7 @@ class modCollab extends DolibarrModules
         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
         // Name of image file used for this module.
-        $this->picto = 'globe';
+        $this->picto = 'website';
 
         // Data directories to create when module is enabled
         $this->dirs = array("/collab/temp");
diff --git a/htdocs/core/modules/modWebsite.class.php b/htdocs/core/modules/modWebsite.class.php
index 3e3b4bae374..60cc93b5d39 100644
--- a/htdocs/core/modules/modWebsite.class.php
+++ b/htdocs/core/modules/modWebsite.class.php
@@ -55,7 +55,7 @@ class modWebsite extends DolibarrModules
         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
         // Name of image file used for this module.
-        $this->picto = 'globe';
+        $this->picto = 'website';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/website/temp");

From c4a7923b51a449a86f1fedc50cef32c9feb745ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 May 2020 19:02:52 +0200
Subject: [PATCH 135/490] CSS

---
 htdocs/theme/eldy/global.inc.php | 2 +-
 htdocs/theme/md/style.css.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 8a21844ca7c..b6884b164a1 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -880,7 +880,7 @@ select.flat.selectlimit {
     max-width: 0;
     overflow: auto;
 }
-.divintdwithtwolinesmax {
+.divintowithtwolinesmax {
     width: 75px;
     display: -webkit-box;
     -webkit-box-orient: vertical;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 71fbb6f50da..40e8c5e27b4 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -983,7 +983,7 @@ select.flat.selectlimit {
     max-width: 0;
     overflow: auto;
 }
-.divintdwithtwolinesmax {
+.divintodwithtwolinesmax {
     width: 75px;
     display: -webkit-box;
     -webkit-box-orient: vertical;

From 4d50ba5e370a57c7168e6f4cd2dd4f336fe3d361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 11 May 2020 20:42:47 +0200
Subject: [PATCH 136/490] Fix dolistore search with csrf active

---
 htdocs/admin/dolistore/ajax/image.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/admin/dolistore/ajax/image.php b/htdocs/admin/dolistore/ajax/image.php
index c1bb4e997dc..6349c7461b5 100644
--- a/htdocs/admin/dolistore/ajax/image.php
+++ b/htdocs/admin/dolistore/ajax/image.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017		 Oscss-Shop              <support@oscss-shop.fr>.
  * Copyright (C) 2008-2011   Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2020       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modifyion 2.0 (the "License");
  * it under the terms of the GNU General Public License as published bypliance with the License.
@@ -17,6 +18,9 @@
  */
 
 if (!defined('REQUIRE_JQUERY_BLOCKUI')) define('REQUIRE_JQUERY_BLOCKUI', 1);
+if (!defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL', 1);
+}
 
 
 /**

From 75cd7d7e723103fa0edadcb8860a77e908f7e6bb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 May 2020 03:04:48 +0200
Subject: [PATCH 137/490] Code comment

---
 htdocs/core/class/commonobjectline.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index 5a09dbfed29..f04e2da11ee 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -54,8 +54,8 @@ abstract class CommonObjectLine extends CommonObject
 	 *	Returns the translation key from units dictionary.
 	 *  A langs->trans() must be called on result to get translated value.
 	 *
-	 * 	@param	string $type Label type (long or short)
-	 *	@return	string|int <0 if ko, label if ok
+	 * 	@param	string $type 	Label type (long or short). This can be a translation key.
+	 *	@return	string|int 		<0 if ko, label if ok
 	 */
 	public function getLabelOfUnit($type = 'long')
 	{

From d459f9902c7bbc601cf4eda76a4803d65bc3f194 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 May 2020 03:06:30 +0200
Subject: [PATCH 138/490] Update card.php

---
 htdocs/product/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index d58e5f8f742..87e86e8e0bc 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -2099,7 +2099,7 @@ else
 
 				print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td><td>';
 				if ($unit !== '') {
-					print $unit;
+					print $langs->trans($unit);
 				}
 				print '</td></tr>';
 			}

From a0998583852dd9ff3a946703210be6aaed326399 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 May 2020 03:07:23 +0200
Subject: [PATCH 139/490] Update product.class.php

---
 htdocs/product/class/product.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 44fb0865682..2a56131bdd5 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -5391,7 +5391,7 @@ class Product extends CommonObject
         $resql = $this->db->query($sql);
         if ($resql && $this->db->num_rows($resql) > 0) {
             $res = $this->db->fetch_array($resql);
-            $label = $label_type == 'short' ? $res[$label_type] : $langs->trans('unit' . $res['code']);
+            $label = ($label_type == 'short' ? $res[$label_type] : 'unit'.$res['code']);
             $this->db->free($resql);
             return $label;
         }

From 92d137cde90c6e2ad9c0ac42f46157badf624708 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 May 2020 03:09:04 +0200
Subject: [PATCH 140/490] Update list.php

---
 htdocs/product/stock/list.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index c13243fc9cb..74c2c21cadf 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -549,12 +549,15 @@ if ($num)
 			{
 				print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
 				if ($key == 'statut') print $warehouse->getLibStatut(5);
-				if ($key == 'phone')
-				{
+				if ($key == 'phone') {
 					print dol_print_phone($obj->phone, '', 0, $obj->rowid, 'AC_TEL');
 				}
-				elseif ($key == 'fax') print dol_print_phone($obj->fax, '', 0, $obj->rowid, 'AC_FAX');
-				else print $warehouse->showOutputField($val, $key, $warehouse->$key, '');
+				elseif ($key == 'fax') {
+					print dol_print_phone($obj->fax, '', 0, $obj->rowid, 'AC_FAX');
+				}
+				else {
+					print $warehouse->showOutputField($val, $key, $warehouse->$key, '');
+				}
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
 				if (!empty($val['isameasure']))

From 6706d28eb7f166754cedbb64c106a1fd3c62cff3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 May 2020 03:15:19 +0200
Subject: [PATCH 141/490] Update admin.lang

---
 htdocs/langs/en_US/admin.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index e97ed8dbc54..7669378aff4 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1272,7 +1272,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Users module setup
 UserMailRequired=Email required to create a new user
-UserHideInactive=Hide inactive users
+UserHideInactive=Hide inactive users from all combo lists of users (this may means you won't be able to filter on old users)
 UsersDocModules=Document templates for documents generated from user record 
 GroupsDocModules=Document templates for documents generated from a group record 
 ##### HRM setup #####

From 3c8452aa3131eb6391ea21edf1a4315370f02d85 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 May 2020 03:17:55 +0200
Subject: [PATCH 142/490] Update admin.lang

---
 htdocs/langs/en_US/admin.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 7669378aff4..c9be1ca2f41 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1272,7 +1272,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Users module setup
 UserMailRequired=Email required to create a new user
-UserHideInactive=Hide inactive users from all combo lists of users (this may means you won't be able to filter on old users)
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record 
 GroupsDocModules=Document templates for documents generated from a group record 
 ##### HRM setup #####

From e4611f29502f5e311e45e6f2eefc23aeab796b45 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 May 2020 03:36:33 +0200
Subject: [PATCH 143/490] Fix filter on categories

---
 htdocs/compta/facture/stats/index.php | 38 +++++++++++++--------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 8606e619740..284186b73ce 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -262,33 +262,33 @@ if ($mode == 'customer') $filter = 's.client in (1,2,3)';
 if ($mode == 'supplier') $filter = 's.fournisseur = 1';
 print $form->selectarray('socid', $companies, $socid, 1, 0, 0, 'style="width: 95%"', 0, 0, 0, '', '', 1);
 print '</td></tr>';
-if(! empty($conf->category->enabled) && $mode == 'customer') {
-    // Customer Category
-    print '<tr><td>'.$langs->trans("CustomersProspectsCategoriesShort").'</td><td>';
-    $cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
-    print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, null, null, "90%");
-    print '</td></tr>';
-}
+
 // ThirdParty Type
 print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
 $sortparam_typent = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
 print $form->selectarray("typent_id", $formcompany->typent_array(0), $typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam_typent);
 if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 print '</td></tr>';
+
 // Category
-if ($mode == 'customer')
-{
-    $cat_type = Categorie::TYPE_CUSTOMER;
-    $cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Customer"));
+if (! empty($conf->category->enabled)) {
+	if ($mode == 'customer')
+	{
+	    $cat_type = Categorie::TYPE_CUSTOMER;
+	    $cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Customer"));
+	}
+	if ($mode == 'supplier')
+	{
+	    $cat_type = Categorie::TYPE_SUPPLIER;
+	    $cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Supplier"));
+	}
+	print '<tr><td>'.$cat_label.'</td><td>';
+	$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
+	print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, null, null, "90%");
+	//print $formother->select_categories($cat_type, $categ_id, 'categ_id', true);
+	print '</td></tr>';
 }
-if ($mode == 'supplier')
-{
-    $cat_type = Categorie::TYPE_SUPPLIER;
-    $cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Supplier"));
-}
-print '<tr><td>'.$cat_label.'</td><td>';
-print $formother->select_categories($cat_type, $categ_id, 'categ_id', true);
-print '</td></tr>';
+
 // User
 print '<tr><td>'.$langs->trans("CreatedBy").'</td><td>';
 print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');

From 0dccc9cbeb734ebdba69ed29354ec42fc7d3677f Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 12 May 2020 07:27:20 +0200
Subject: [PATCH 144/490] Debug colspan

---
 htdocs/accountancy/bookkeeping/balance.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 7b99057f73a..85562ebc268 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -302,12 +302,11 @@ if ($action != 'export_csv')
 			if (empty($displayed_account) || $root_account_description != $displayed_account) {
 				// Affiche un Sous-Total par compte comptable
 				if ($displayed_account != "") {
-					print '<tr class="liste_total"><td class="right" colspan="2">' . $langs->trans("SubTotal") . ':</td>';
+					print '<tr class="liste_total"><td class="right" colspan="3">' . $langs->trans("SubTotal") . ':</td>';
 					print '<td class="nowrap right">' . price($sous_total_debit) . '</td>';
 					print '<td class="nowrap right">' . price($sous_total_credit) . '</td>';
 					print '<td class="nowrap right">' . price(price2num($sous_total_credit - $sous_total_debit)) . '</td>';
 					print "<td></td>\n";
-					print "<td></td>\n";
 					print '</tr>';
 				}
 

From d9e26b8569404f2a47329c9a8ff26d5c0cd4af27 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consuliting.fr>
Date: Tue, 12 May 2020 08:38:03 +0200
Subject: [PATCH 145/490] fix template email on prpal list

---
 htdocs/comm/propal/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index eaeea9e3d43..522e8f5eaa3 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -468,7 +468,7 @@ if ($resql)
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'commercial', 0, $newcardbutton, '', $limit);
 
 	$topicmail = "SendPropalRef";
-	$modelmail = "proposal_send";
+	$modelmail = "propal_send";
 	$objecttmp = new Propal($db);
 	$trackid = 'pro'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';

From 66beb7c14f9b88bb2aa1388f3f3a1356f80e460a Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Tue, 12 May 2020 10:17:47 +0200
Subject: [PATCH 146/490] FIX: Do not show stats panel if the user does not
 have permissions

---
 htdocs/comm/card.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index fcd3823b0c2..82e331eb623 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2006      Andre Cianfarani            <acianfa@free.fr>
  * Copyright (C) 2005-2017 Regis Houssin               <regis.houssin@inodbox.com>
  * Copyright (C) 2008      Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
- * Copyright (C) 2010-2014 Juanjo Menent               <jmenent@2byte.es>
+ * Copyright (C) 2010-2020 Juanjo Menent               <jmenent@2byte.es>
  * Copyright (C) 2013      Alexandre Spangaro          <aspangaro@open-dsi.fr>
  * Copyright (C) 2015-2019 Frédéric France             <frederic.france@netlogic.fr>
  * Copyright (C) 2015      Marcos García               <marcosgdf@gmail.com>
@@ -581,7 +581,7 @@ if ($object->id > 0)
 	$boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="border boxtable boxtablenobottom boxtablenotop" width="100%">';
 	$boxstat .= '<tr class="impair"><td colspan="2" class="tdboxstats nohover">';
 
-	if (!empty($conf->propal->enabled))
+	if (!empty($conf->propal->enabled) && $user->rights->propal->lire)
 	{
 		// Box proposals
 		$tmp = $object->getOutstandingProposals();
@@ -599,7 +599,7 @@ if ($object->id > 0)
 		if ($link) $boxstat .= '</a>';
 	}
 
-	if (!empty($conf->commande->enabled))
+	if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 	{
 		// Box commandes
 		$tmp = $object->getOutstandingOrders();
@@ -617,7 +617,7 @@ if ($object->id > 0)
 		if ($link) $boxstat .= '</a>';
 	}
 
-	if (!empty($conf->facture->enabled))
+	if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	{
 		// Box factures
 		$tmp = $object->getOutstandingBills();

From e1db0ef855173bffda16735f7c4a836c8de68a50 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 12 May 2020 10:57:51 +0200
Subject: [PATCH 147/490] Update index.php

---
 htdocs/comm/mailing/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index 61187f2e647..6b765d9451f 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -157,6 +157,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 $limit = 10;
 $sql  = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat";
 $sql .= " FROM ".MAIN_DB_PREFIX."mailing as m";
+$sql .= " WHERE m.entity = ".$conf->entity;
 $sql .= " ORDER BY m.date_creat DESC";
 $sql .= " LIMIT ".$limit;
 $result = $db->query($sql);

From c6e7b2e6a3281f14bd4b325b5cf4835e4108c487 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 12 May 2020 13:39:02 +0200
Subject: [PATCH 148/490] Fix date shipment from order

better for pickup collection with date and hour from order
---
 htdocs/install/mysql/migration/11.0.0-12.0.0.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 8a68e763160..95c6658c306 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -285,3 +285,5 @@ ALTER TABLE llx_prelevement_facture ADD COLUMN fk_facture_fourn INTEGER NULL;
 ALTER TABLE llx_menu MODIFY COLUMN module varchar(255);
 
 UPDATE llx_actioncomm SET fk_action = 50 where fk_action = 40 AND code = 'TICKET_MSG'; 
+
+ALTER TABLE llx_commande MODIFY COLUMN date_livraison DATETIME;

From 014c013f834b5a90d5b8dddfc6f0af6fed6103f9 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 12 May 2020 13:40:31 +0200
Subject: [PATCH 149/490] Update card.php

---
 htdocs/commande/card.php | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 4764b53a5c9..a24e62cde97 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -557,14 +557,17 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'setdate_livraison' && $usercancreate) {
-		// print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-		$datelivraison = dol_mktime(0, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
+	elseif ($action == 'setdate_livraison' && $usercancreate)
+	{
+	    //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
+	    $datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 
-		$result = $object->set_date_livraison($user, $datelivraison);
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
+	    $object->fetch($id);
+	    $result = $object->set_date_livraison($user, $datedelivery);
+	    if ($result < 0)
+	    {
+	        setEventMessages($object->error, $object->errors, 'errors');
+	    }
 	}
 
 	elseif ($action == 'setmode' && $usercancreate) {
@@ -1681,15 +1684,14 @@ if ($action == 'create' && $usercancreate)
 	print $form->selectDate('', 're', '', '', '', "crea_commande", 1, 1); // Always autofill date with current date
 	print '</td></tr>';
 
-	// Delivery date planed
-	print "<tr><td>".$langs->trans("DateDeliveryPlanned").'</td><td>';
-	if (empty($datedelivery))
-	{
-		if (!empty($conf->global->DATE_LIVRAISON_WEEK_DELAY)) $datedelivery = time() + ((7 * $conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
-		else $datedelivery = empty($conf->global->MAIN_AUTOFILL_DATE_DELIVERY) ?-1 : '';
-	}
-	print $form->selectDate($datedelivery, 'liv_', '', '', '', "crea_commande", 1, 1);
-	print "</td></tr>";
+  // Date delivery planned
+  print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
+  print '<td colspan="3">';
+  //print dol_print_date($object->date_livraison, "day");	// date_livraison come from order and will be stored into date_delivery planed.
+  $date_delivery = ($date_delivery ? $date_delivery : $object->date_livraison); // $date_delivery comes from GETPOST
+  print $form->selectDate($date_delivery ? $date_delivery : -1, 'date_delivery', 1, 1, 1);
+  print "</td>\n";
+  print '</tr>';
 
 	// terms of the settlement
 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
@@ -2209,11 +2211,11 @@ if ($action == 'create' && $usercancreate)
 			print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdate_livraison">';
-			print $form->selectDate($object->date_livraison ? $object->date_livraison : - 1, 'liv_', '', '', '', "setdate_livraison");
+			print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
-			print $object->date_livraison ? dol_print_date($object->date_livraison, 'daytext') : '&nbsp;';
+			print $object->date_livraison ? dol_print_date($object->date_livraison, 'dayhour') : '&nbsp;';
 			if ($object->hasDelay() && !empty($object->date_livraison)) {
 				print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 			}

From 9e49e02efb3f06e515640a84c62ec7b5f022c265 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 12 May 2020 11:42:18 +0000
Subject: [PATCH 150/490] Fixing style errors.

---
 htdocs/commande/card.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index a24e62cde97..f382ac85f8e 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1684,14 +1684,14 @@ if ($action == 'create' && $usercancreate)
 	print $form->selectDate('', 're', '', '', '', "crea_commande", 1, 1); // Always autofill date with current date
 	print '</td></tr>';
 
-  // Date delivery planned
-  print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
-  print '<td colspan="3">';
-  //print dol_print_date($object->date_livraison, "day");	// date_livraison come from order and will be stored into date_delivery planed.
-  $date_delivery = ($date_delivery ? $date_delivery : $object->date_livraison); // $date_delivery comes from GETPOST
-  print $form->selectDate($date_delivery ? $date_delivery : -1, 'date_delivery', 1, 1, 1);
-  print "</td>\n";
-  print '</tr>';
+	// Date delivery planned
+	print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
+	print '<td colspan="3">';
+	//print dol_print_date($object->date_livraison, "day");	// date_livraison come from order and will be stored into date_delivery planed.
+	$date_delivery = ($date_delivery ? $date_delivery : $object->date_livraison); // $date_delivery comes from GETPOST
+	print $form->selectDate($date_delivery ? $date_delivery : -1, 'date_delivery', 1, 1, 1);
+	print "</td>\n";
+	print '</tr>';
 
 	// terms of the settlement
 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';

From e1ff1bf865ac2dc2d440569050f4acacfea1dbad Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 12 May 2020 13:42:43 +0200
Subject: [PATCH 151/490] Update card.php

---
 htdocs/commande/card.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index f382ac85f8e..800193bc61e 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1684,14 +1684,14 @@ if ($action == 'create' && $usercancreate)
 	print $form->selectDate('', 're', '', '', '', "crea_commande", 1, 1); // Always autofill date with current date
 	print '</td></tr>';
 
-	// Date delivery planned
-	print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
-	print '<td colspan="3">';
-	//print dol_print_date($object->date_livraison, "day");	// date_livraison come from order and will be stored into date_delivery planed.
-	$date_delivery = ($date_delivery ? $date_delivery : $object->date_livraison); // $date_delivery comes from GETPOST
-	print $form->selectDate($date_delivery ? $date_delivery : -1, 'date_delivery', 1, 1, 1);
-	print "</td>\n";
-	print '</tr>';
+  // Date delivery planned
+  print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
+  print '<td colspan="3">';
+  //print dol_print_date($object->date_livraison, "day");	// date_livraison come from order and will be stored into date_delivery planed.
+  $date_delivery = ($date_delivery ? $date_delivery : $object->date_livraison); // $date_delivery comes from GETPOST
+  print $form->selectDate($date_delivery ? $date_delivery : -1, 'date_delivery', 1, 1, 1);
+  print "</td>\n";
+  print '</tr>';
 
 	// terms of the settlement
 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
@@ -2211,7 +2211,7 @@ if ($action == 'create' && $usercancreate)
 			print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdate_livraison">';
-			print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
+			print $form->selectDate($object->date_livraison ? $object->date_livraison : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {

From 83ec39f55a1ed189b15b12eb4032dc3d17edb9fc Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 12 May 2020 11:44:12 +0000
Subject: [PATCH 152/490] Fixing style errors.

---
 htdocs/commande/card.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 800193bc61e..54661297939 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1684,14 +1684,14 @@ if ($action == 'create' && $usercancreate)
 	print $form->selectDate('', 're', '', '', '', "crea_commande", 1, 1); // Always autofill date with current date
 	print '</td></tr>';
 
-  // Date delivery planned
-  print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
-  print '<td colspan="3">';
-  //print dol_print_date($object->date_livraison, "day");	// date_livraison come from order and will be stored into date_delivery planed.
-  $date_delivery = ($date_delivery ? $date_delivery : $object->date_livraison); // $date_delivery comes from GETPOST
-  print $form->selectDate($date_delivery ? $date_delivery : -1, 'date_delivery', 1, 1, 1);
-  print "</td>\n";
-  print '</tr>';
+	// Date delivery planned
+	print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
+	print '<td colspan="3">';
+	//print dol_print_date($object->date_livraison, "day");	// date_livraison come from order and will be stored into date_delivery planed.
+	$date_delivery = ($date_delivery ? $date_delivery : $object->date_livraison); // $date_delivery comes from GETPOST
+	print $form->selectDate($date_delivery ? $date_delivery : -1, 'date_delivery', 1, 1, 1);
+	print "</td>\n";
+	print '</tr>';
 
 	// terms of the settlement
 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';

From 447c61cc15bcdc517db0554609424a2984493d12 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 12 May 2020 13:49:55 +0200
Subject: [PATCH 153/490] Update shipment.php

---
 htdocs/expedition/shipment.php | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 75ee2ef4da3..a40d29d1d78 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -103,16 +103,17 @@ if (empty($reshook))
     }
 
     if ($action == 'setdatedelivery' && $user->rights->commande->creer)
-    {
-    	//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-    	$datelivraison = dol_mktime(0, 0, 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
+	{
+	    //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
+	    $datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 
-    	$object = new Commande($db);
-    	$object->fetch($id);
-    	$result = $object->set_date_livraison($user, $datelivraison);
-    	if ($result < 0)
-    		setEventMessages($object->error, $object->errors, 'errors');
-    }
+	    $object->fetch($id);
+	    $result = $object->set_date_livraison($user, $datedelivery);
+	    if ($result < 0)
+	    {
+	        setEventMessages($object->error, $object->errors, 'errors');
+	    }
+	}
     /*
     if ($action == 'setdeliveryaddress' && $user->rights->commande->creer)
     {
@@ -373,13 +374,13 @@ if ($id > 0 || !empty($ref))
 			print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdatedelivery">';
-			print $form->selectDate($object->date_livraison > 0 ? $object->date_livraison : -1, 'liv_', '', '', '', "setdatedelivery");
+			print $form->selectDate($object->date_livraison ? $object->date_livraison : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		}
 		else
 		{
-			print dol_print_date($object->date_livraison, 'daytext');
+			print dol_print_date($object->date_livraison, 'dayhour');
 			if ($object->hasDelay() && !empty($object->date_livraison)) {
 			    print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 			}

From c89e8efec354070f055504c64c11e49fe1827320 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 May 2020 14:08:28 +0200
Subject: [PATCH 154/490] responsive

---
 htdocs/takepos/css/pos.css.php   | 3 +++
 htdocs/takepos/index.php         | 9 +++++++--
 htdocs/takepos/invoice.php       | 2 +-
 htdocs/theme/eldy/global.inc.php | 1 +
 htdocs/theme/md/style.css.php    | 1 +
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index 5f0006d24fe..6871fcbd68b 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -591,6 +591,9 @@ div#moreinfo, div#infowarehouse {
 		height: calc(45% - 100px);
 	}
 
+	div#moreinfo, div#infowarehouse {
+	    padding: 0 5px 0 5px;
+	}
 
 	div.div1 {
 		padding-bottom: 0;
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 0688d4a8584..8da96df54d0 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -756,8 +756,13 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 	<div class="header">
 		<div class="topnav">
 			<div class="topnav-left">
-			<div class="inline-block valignmiddle"><a class="topnav-terminalhour" onclick="TerminalsDialog();">
-			<?php echo $langs->trans("Terminal")." ";
+			<div class="inline-block valignmiddle">
+			<a class="topnav-terminalhour" onclick="TerminalsDialog();">
+			<span class="fa fa-cash-register"></span>
+			<span class="hideonsmartphone">
+			<?php echo $langs->trans("Terminal"); ?>
+			</span>
+			<?php echo " ";
 			if ($_SESSION["takeposterminal"] == "") echo "1";
 			else echo $_SESSION["takeposterminal"];
 			echo '<span class="hideonsmartphone"> - '.dol_print_date(dol_now(), "day").'</span>';
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index b1641072829..9f0e6649cf6 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -747,7 +747,7 @@ $( document ).ready(function() {
 
     $("#customerandsales").html('');
 
-	$("#customerandsales").append('<a class="valignmiddle tdoverflowmax100 minwidth100" id="customer" onclick="Customer();" title="<?php print dol_escape_js($s); ?>"><span class="fas fa-building paddingrightonly"></span><?php print dol_escape_js($s); ?></a>');
+	$("#customerandsales").append('<a class="valignmiddle tdoverflowmax100 minwidth75" id="customer" onclick="Customer();" title="<?php print dol_escape_js($s); ?>"><span class="fas fa-building paddingrightonly"></span><?php print dol_escape_js($s); ?></a>');
 
 	<?php
 	$sql = "SELECT rowid, datec, ref FROM ".MAIN_DB_PREFIX."facture";
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index b6884b164a1..68e16afecd0 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1026,6 +1026,7 @@ table[summary="list_of_modules"] .fa-cog {
 .clearboth  { clear:both; }
 .hideobject { display: none; }
 .minwidth50  { min-width: 50px; }
+.minwidth75  { min-width: 75px; }
 /* rule for not too small screen only */
 @media only screen and (min-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)
 {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 40e8c5e27b4..c7ce5709efd 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1119,6 +1119,7 @@ table[summary="list_of_modules"] .fa-cog {
 .clearboth  { clear:both; }
 .hideobject { display: none; }
 .minwidth50  { min-width: 50px; }
+.minwidth75  { min-width: 75px; }
 /* rule for not too small screen only */
 @media only screen and (min-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 7; ?>px)
 {

From 39f228b98a92140d58d82c3be1220742728e4958 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 12 May 2020 14:10:43 +0200
Subject: [PATCH 155/490] Update list.php

---
 htdocs/expedition/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 999bde3fb32..ada701750a0 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -699,7 +699,7 @@ if ($resql)
 		if (!empty($arrayfields['e.date_delivery']['checked']))
 		{
 			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->date_livraison), "day");
+			print dol_print_date($db->jdate($obj->date_livraison), "dayhour");
 			/*$now = time();
     		if ( ($now - $db->jdate($obj->date_expedition)) > $conf->warnings->lim && $obj->statutid == 1 )
     		{

From e9c405182d07497ed177b60377f44c5f225ff30a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 May 2020 14:18:31 +0200
Subject: [PATCH 156/490] css

---
 htdocs/theme/eldy/main_menu_fa_icons.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/eldy/main_menu_fa_icons.inc.php b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
index 5b9395fbc04..c344838458d 100644
--- a/htdocs/theme/eldy/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
@@ -8,7 +8,7 @@
     font-style: normal;
     font-variant: normal;
     text-rendering: auto;
-    line-height: 26px;
+    line-height: 23px;
 	font-size: <?php echo $topMenuFontSize; ?>;
     -webkit-font-smoothing: antialiased;
     text-align:center;

From a6708009d790003f14320cfbcdadc972661d494e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 May 2020 14:53:03 +0200
Subject: [PATCH 157/490] Add option PROJECT_OPEN_ALWAYS_ON_TAB

---
 htdocs/projet/class/project.class.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 1ee17511304..554bc84766a 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1044,6 +1044,9 @@ class Project extends CommonObject
         if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
         $result = '';
+        if (! empty($conf->global->PROJECT_OPEN_ALWAYS_ON_TAB)) {
+        	$option = $conf->global->PROJECT_OPEN_ALWAYS_ON_TAB;
+        }
 
         $label = '';
         if ($option != 'nolink') $label = '<u>'.$langs->trans("Project").'</u>';
@@ -1073,6 +1076,10 @@ class Project extends CommonObject
             {
                 $url = DOL_URL_ROOT.'/projet/tasks.php?id='.$this->id;
             }
+            elseif ($option == 'preview')
+            {
+            	$url = DOL_URL_ROOT.'/projet/element.php?id='.$this->id;
+            }
             else
             {
                 $url = DOL_URL_ROOT.'/projet/card.php?id='.$this->id;

From ce9b841d9f1e026f0aaa0d94890bd40c5283d4b1 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 12 May 2020 15:33:25 +0200
Subject: [PATCH 158/490] Update shipment.php

---
 htdocs/expedition/shipment.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index a40d29d1d78..3adb1820d27 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -353,7 +353,7 @@ if ($id > 0 || !empty($ref))
 		// Date
 		print '<tr><td>'.$langs->trans('Date').'</td>';
 		print '<td colspan="2">';
-		print dol_print_date($object->date, 'daytext');
+		print dol_print_date($object->date, 'dayhour');
 		if ($object->hasDelay() && empty($object->date_livraison)) {
 		    print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 		}

From f837bf043a4c642a8df8b894519b1e0960f94043 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 12 May 2020 15:34:48 +0200
Subject: [PATCH 159/490] Update shipment.php

---
 htdocs/expedition/shipment.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 3adb1820d27..99cf77ce1f3 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -353,7 +353,7 @@ if ($id > 0 || !empty($ref))
 		// Date
 		print '<tr><td>'.$langs->trans('Date').'</td>';
 		print '<td colspan="2">';
-		print dol_print_date($object->date, 'dayhour');
+		print dol_print_date($object->date, 'day');
 		if ($object->hasDelay() && empty($object->date_livraison)) {
 		    print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 		}

From 70ea77ce8f547eb775fa63e7d68e17e2262aff39 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 12 May 2020 15:37:37 +0200
Subject: [PATCH 160/490] Update list.php

---
 htdocs/commande/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 3b83e04fe3c..8b7000d8f23 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1147,7 +1147,7 @@ if ($resql)
 		if (!empty($arrayfields['c.date_delivery']['checked']))
 		{
 			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->date_delivery), 'day');
+			print dol_print_date($db->jdate($obj->date_delivery), 'dayhour');
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}

From 8bd1179b8207671f4d33d8f6d156c453b7bf8239 Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Tue, 12 May 2020 17:03:24 +0200
Subject: [PATCH 161/490] Update qr.php

---
 htdocs/takepos/genimg/qr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/takepos/genimg/qr.php b/htdocs/takepos/genimg/qr.php
index 99f7fced1d0..3f27464f5ca 100644
--- a/htdocs/takepos/genimg/qr.php
+++ b/htdocs/takepos/genimg/qr.php
@@ -33,4 +33,4 @@ $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', t
 $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 
 $module = new modTcpdfbarcode($db);
-$result = $module->buildBarCode($urlwithroot."/takepos/auto_order.php?key=".dol_encode($key), 'QRCODE', 'Y');
+$result = $module->buildBarCode($urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($key), 'QRCODE', 'Y');

From fc2f2c6da71b6c4f7f0b16216f0fba320b52ba1d Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Tue, 12 May 2020 17:41:21 +0200
Subject: [PATCH 162/490] FIX : wrong url param

---
 htdocs/compta/facture/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 9fa696c69b3..cb3aa9cd099 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4837,7 +4837,7 @@ elseif ($id > 0 || ! empty($ref))
 			{
 				if (! $objectidnext)
 				{
-					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?socid=' . $object->socid .'&amp;fac_avoir=' . $object->id . '&amp;action=create&amp;type=2'.($object->fk_project > 0 ? '&amp;projectid='.$object->fk_project : '').'' . $object->id . '&amp;action=create&amp;type=2'.($object->entity > 0 ? '&amp;originentity='.$object->entity : '').'">' . $langs->trans("CreateCreditNote") . '</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?socid=' . $object->socid .'&amp;fac_avoir=' . $object->id . '&amp;action=create&amp;type=2'.($object->fk_project > 0 ? '&amp;projectid='.$object->fk_project : '').'' . ($object->entity > 0 ? '&amp;originentity='.$object->entity : '').'">' . $langs->trans("CreateCreditNote") . '</a></div>';
 				}
 			}
 

From 366ae2f116cfaaed73e07a4b06d0a596ded92582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 12 May 2020 18:44:26 +0200
Subject: [PATCH 163/490] Update dolistore.class.php

---
 .../admin/dolistore/class/dolistore.class.php | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/dolistore/class/dolistore.class.php b/htdocs/admin/dolistore/class/dolistore.class.php
index 230c588f7e4..a229f3c985d 100644
--- a/htdocs/admin/dolistore/class/dolistore.class.php
+++ b/htdocs/admin/dolistore/class/dolistore.class.php
@@ -248,11 +248,8 @@ class Dolistore
         // phpcs:enable
 		global $langs, $conf;
 		$html       = "";
-		$parity     = "pair";
 		$last_month = time() - (30 * 24 * 60 * 60);
 		foreach ($this->products as $product) {
-			$parity = ($parity == "impair") ? 'pair' : 'impair';
-
 			// check new product ?
 			$newapp = '';
 			if ($last_month < strtotime($product->date_add)) {
@@ -267,7 +264,7 @@ class Dolistore
 			// add image or default ?
 			if ($product->id_default_image != '') {
 				$image_url = DOL_URL_ROOT.'/admin/dolistore/ajax/image.php?id_product='.$product->id.'&id_image='.$product->id_default_image;
-				$images = '<a href="'.$image_url.'" class="fancybox" rel="gallery'.$product->id.'" title="'.$product->name->language[$this->lang - 1].', '.$langs->trans('Version').' '.$product->module_version.'">';
+				$images = '<a href="'.$image_url.'" class="documentpreview" target="_blank" mime="image/png" title="'.$product->name->language[$this->lang - 1].', '.$langs->trans('Version').' '.$product->module_version.'">';
 				$images .= '<img src="'.$image_url.'&quality=home_default" style="max-height:250px;max-width: 210px;" alt="" /></a>';
 			} else {
 				$images = '<img src="'.DOL_URL_ROOT.'/admin/dolistore/img/NoImageAvailable.png" />';
@@ -306,16 +303,16 @@ class Dolistore
 			//.'<br><a class="inline-block valignmiddle" target="_blank" href="'.$this->shop_url.$product->id.'"><span class="details button">'.$langs->trans("SeeInMarkerPlace").'</span></a>
 
 			//output template
-			$html .= '<tr class="app '.$parity.' '.$compatible.'">
+			$html .= '<tr class="app oddeven '.$compatible.'">
                 <td class="center" width="210"><div class="newAppParent">'.$newapp.$images.'</div></td>
                 <td class="margeCote"><h2 class="appTitle">'.$product->name->language[$this->lang - 1]
 						.'<br/><small>'.$version.'</small></h2>
-                    <small> '.dol_print_date(dol_stringtotime($product->date_upd), 'dayhour').' - '.$langs->trans('Ref').': '.$product->reference.' - '.$langs->trans('Id').': '.$product->id.'</small><br><br>'.$product->description_short->language[$this->lang - 1].'</td>
-                <td style="display:none;" class="long_description">'.$product->description->language[$this->lang - 1].'</td>
-                <td class="margeCote center">'.$price.'
-                </td>
-                <td class="margeCote">'.$download_link.'</td>
-                </tr>';
+                    <small> '.dol_print_date(dol_stringtotime($product->date_upd), 'dayhour').' - '.$langs->trans('Ref').': '.$product->reference.' - '.$langs->trans('Id').': '.$product->id.'</small><br><br>'.$product->description_short->language[$this->lang - 1].'</td>';
+            // do not load if display none
+            //$html .= '<td style="display:none;" class="long_description">'.$product->description->language[$this->lang - 1].'</td>';
+            $html .= '<td class="margeCote center">'.$price.'</td>';
+            $html .= '<td class="margeCote">'.$download_link.'</td>';
+            $html .= '</tr>';
         }
         return $html;
     }

From 410694100d911de889d06f59f43756e6df849b4e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 May 2020 23:42:01 +0200
Subject: [PATCH 164/490] CSS

---
 htdocs/theme/eldy/global.inc.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 68e16afecd0..ef39d38a568 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1707,6 +1707,7 @@ div.statusref {
 	margin-top: 8px;
 	margin-bottom: 10px;
 	clear: both;
+    text-align: right;
 }
 div.statusref img {
     padding-left: 8px;

From 63d6b3c47d5629082628cfd08d1a15ad13309149 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 May 2020 23:44:50 +0200
Subject: [PATCH 165/490] Look and feel v12

---
 htdocs/contrat/card.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 25857767e80..9f825cdf009 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1452,7 +1452,7 @@ else
 
 		print '<table class="border tableforfield" width="100%">';
 
-		// Ligne info remises tiers
+		// Line info of thirdparty discounts
 		print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
 		if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount", $object->thirdparty->remise_percent);
 		else print $langs->trans("CompanyHasNoRelativeDiscount");
@@ -1502,8 +1502,6 @@ else
 		}
 
 
-		$colorb = '666666';
-
 		$arrayothercontracts = $object->getListOfContracts('others');
 
 		/*
@@ -1775,8 +1773,8 @@ else
 						print '<input id="buying_price" type="text" size="5" name="buying_price" value="'.price($objp->pa_ht, 0, '', 0).'"></td>';
 					}
 					print '<td class="center">';
-					print '<input type="submit" class="button" name="save" value="'.$langs->trans("Modify").'">';
-					print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+					print '<input type="submit" class="button margintoponly marginbottomonly" name="save" value="'.$langs->trans("Modify").'">';
+					print '<br><input type="submit" class="button margintoponly marginbottomonly" name="cancel" value="'.$langs->trans("Cancel").'">';
 					print '</td>';
 					print '</tr>';
 

From b5f3be4599f9f56c30c63297643c88da8d75e956 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 May 2020 00:29:46 +0200
Subject: [PATCH 166/490] Clean phpcs rule file

---
 dev/setup/codesniffer/ruleset.xml             | 77 +++++++++----------
 htdocs/compta/bank/class/account.class.php    |  3 +-
 htdocs/product/stats/commande_fournisseur.php |  4 +-
 htdocs/webservices/server_actioncomm.php      |  6 +-
 4 files changed, 43 insertions(+), 47 deletions(-)

diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index ad26c7f0bdc..41526340daf 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -272,12 +272,7 @@
 
     <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired" />
 
-    <rule ref="PEAR.Commenting.FunctionComment.WrongStyle">
-    </rule>
-
-
-
-
+    <rule ref="PEAR.Commenting.FunctionComment.WrongStyle" />
 
     <rule ref="PEAR.Commenting.FunctionComment.SpacingBeforeParamType">
         <severity>0</severity>
@@ -310,20 +305,21 @@
 	<!-- Test if () are removed for includes -->
 	<rule ref="PEAR.Files.IncludingFile" />
 
-    <!-- Disable some error messages that we do not want. -->
-
+	<!-- We disable this: We must be able to make require inside if -->
     <rule ref="PEAR.Files.IncludingFile.UseInclude">
         <severity>0</severity>
     </rule>
     
-    <!-- TODO Enable this test. We should use require for include in prior of include when out of if -->
+    <!-- We disable this. We must be allowed to use strict require instead of non strict include anywhere -->
     <rule ref="PEAR.Files.IncludingFile.UseIncludeOnce">
         <severity>0</severity>
     </rule>
+    
     <rule ref="PEAR.Files.IncludingFile.UseRequire">
-        <severity>0</severity>
+     	<severity>0</severity>
     </rule>
-    <!-- TODO Enable this test. We should use require for include in prior of include when out of if -->
+    
+    <!-- We disable this: We want to allow include_once -->
     <rule ref="PEAR.Files.IncludingFile.UseRequireOnce">
         <severity>0</severity>
     </rule>
@@ -332,27 +328,25 @@
 
 	<rule ref="PEAR.Functions.FunctionCallSignature" />
 
-    <!-- TODO Enable this test. -->
+    <!-- We disable this: It returns a lot of false positive -->
     <rule ref="PEAR.Functions.FunctionCallSignature.CloseBracketLine">
         <severity>0</severity>
     </rule>
-    <!-- TODO Enable this test. -->
+    
+    <!-- We disable this: We want to allow small function on 1 line -->
     <rule ref="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket">
         <severity>0</severity>
     </rule>
 
-	<rule ref="PEAR.Functions.FunctionCallSignature.EmptyLine">
-	    <severity>0</severity>
-	</rule>
+	<rule ref="PEAR.Functions.FunctionCallSignature.EmptyLine" />
+
+	<!-- We disable this: Too many false positive -->
 	<rule ref="PEAR.Functions.FunctionCallSignature.Indent">
-	    <severity>0</severity>
+		<severity>0</severity>
 	</rule>
-    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeOpenBracket">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterCloseBracket">
-        <severity>0</severity>
-    </rule>
+
+    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeOpenBracket" />
+    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterCloseBracket" />
 
 	<rule ref="PEAR.Functions.ValidDefaultValue" />
 
@@ -361,26 +355,26 @@
         <severity>0</severity>
 	</rule>
 
+	<!-- We disable this: there is a lot of existing method not starting with a capital letter (class modXxxx, ...) -->
 	<rule ref="PEAR.NamingConventions.ValidClassName.StartWithCapital">
-        <severity>0</severity>
+		<severity>0</severity>
 	</rule>
-	<!-- some phpcs have a typo error in rule, so we add it too -->
+	<!-- some phpcs have a typo error in rule, so we add it this rule too with term "Captial" instead of "Capital" -->
 	<rule ref="PEAR.NamingConventions.ValidClassName.StartWithCaptial">
         <severity>0</severity>
 	</rule>
 
 	<rule ref="PEAR.NamingConventions.ValidFunctionName" />
+	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionDoubleUnderscore" />
 
-	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionDoubleUnderscore">
-        <severity>0</severity>
-	</rule>
+	<!-- We disable this: there is a lot of existing function not starting with a capital letter (class modXxxx, ...) -->
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNameInvalid">
         <severity>0</severity>
 	</rule>
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNoCapital">
         <severity>0</severity>
 	</rule>
-	<!-- some phpcs have a typo error in rule, so we add it too -->
+	<!-- some phpcs have a typo error in rule, so we add it this rule too with term "Captial" instead of "Capital" -->
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNoCaptial">
         <severity>0</severity>
 	</rule>
@@ -391,16 +385,16 @@
 	<!--<rule ref="PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps">
         <severity>0</severity>
 	</rule>-->
+	
+	<!-- We disable this: We don't want to have private methods prefixed with an underscore -->
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.PrivateNoUnderscore">
         <severity>0</severity>
 	</rule>
+
 	<rule ref="PEAR.NamingConventions.ValidVariableName" />
 
-    <rule ref="PSR2.Classes.ClassDeclaration" />
-    <rule ref="PSR2.Methods.FunctionClosingBrace" />
-    <rule ref="PSR2.ControlStructures.ElseIfDeclaration.NotAllowed" />
-
 	<!-- This is not in PSR2 -->
+	<!-- We disable this: We don't want to have private methods prefixed with an underscore -->
 	<rule ref="PEAR.NamingConventions.ValidVariableName.PrivateNoUnderscore">
         <severity>0</severity>
     </rule>
@@ -411,7 +405,6 @@
 	<rule ref="PEAR.WhiteSpace.ScopeClosingBrace">
         <severity>0</severity>
     </rule>
-
     <rule ref="PEAR.WhiteSpace.ScopeClosingBrace.Line">
         <severity>0</severity>
     </rule>
@@ -421,15 +414,21 @@
 	<!-- <rule ref="PEAR.WhiteSpace.ScopeIndent" /> -->
 
 
-	<!-- Rules from Zend Standard-->
-
-    <!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
-    <rule ref="Zend.Files.ClosingTag"/>
-
+	<!--  Rules PSR 2 -->
+    <rule ref="PSR2.Classes.ClassDeclaration" />
+    <rule ref="PSR2.Methods.FunctionClosingBrace" />
+    <rule ref="PSR2.ControlStructures.ElseIfDeclaration.NotAllowed" />
     <rule ref="PSR2.Classes.ClassDeclaration" />
     <rule ref="PSR2.Methods.FunctionClosingBrace" />
     <rule ref="PSR2.Files.EndFileNewline.TooMany" />
 	<rule ref="PSR2.Files.EndFileNewline.NoneFound" />
 	<rule ref="PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket" />
 	<rule ref="PSR2.Classes.PropertyDeclaration.VarUsed" />
+	
+
+	<!-- Rules from Zend Standard-->
+
+    <!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
+    <rule ref="Zend.Files.ClosingTag"/>
+	
 </ruleset>
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 58115537b1f..3fcbffba3b2 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1672,8 +1672,7 @@ class Account extends CommonObject
 				//Replace the old AccountNumber key with the new BankAccountNumber key
 				$fieldlists = explode(
 					' ',
-                    preg_replace('/ ?[^Bank]AccountNumber ?/', 'BankAccountNumber',
-					$conf->global->BANK_SHOW_ORDER_OPTION)
+                    preg_replace('/ ?[^Bank]AccountNumber ?/', 'BankAccountNumber', $conf->global->BANK_SHOW_ORDER_OPTION)
 				);
 			}
 		}
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 61024cdd7ff..c111e075972 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -44,9 +44,7 @@ if (!empty($user->socid))
 $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array(
-		'productstatssupplyorder'
-));
+$hookmanager->initHooks(array('productstatssupplyorder'));
 
 $mesg = '';
 
diff --git a/htdocs/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php
index bc3d4a78c6a..39ed3b3cdf5 100644
--- a/htdocs/webservices/server_actioncomm.php
+++ b/htdocs/webservices/server_actioncomm.php
@@ -153,8 +153,8 @@ $server->wsdl->addComplexType(
 	'sequence',
 	'',
 	array(
-	'code' => array('name'=>'code', 'type'=>'xsd:string'),
-	'libelle' => array('name'=>'libelle', 'type'=>'xsd:string')
+		'code' => array('name'=>'code', 'type'=>'xsd:string'),
+		'libelle' => array('name'=>'libelle', 'type'=>'xsd:string')
 	)
 );
 
@@ -164,7 +164,7 @@ $server->wsdl->addComplexType(
 	'array',
 	'sequence',
 	'',
-	 array(
+	array(
         'actioncommtype' => array(
             'name' => 'actioncommtype',
             'type' => 'tns:actioncommtype',

From 22301d63d8fedaa2607167232b4ac4df76cd9593 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 May 2020 00:35:10 +0200
Subject: [PATCH 167/490] Replace a ZEND phpcs rule with a PSR2 rule

---
 dev/setup/codesniffer/ruleset.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index 41526340daf..e726df6db7c 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -424,11 +424,7 @@
 	<rule ref="PSR2.Files.EndFileNewline.NoneFound" />
 	<rule ref="PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket" />
 	<rule ref="PSR2.Classes.PropertyDeclaration.VarUsed" />
-	
-
-	<!-- Rules from Zend Standard-->
-
     <!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
-    <rule ref="Zend.Files.ClosingTag"/>
+    <rule ref="PSR2.Files.ClosingTag"/>
 	
 </ruleset>

From f0d14662b996b082c701db2318157f9f86d7c957 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 May 2020 00:38:12 +0200
Subject: [PATCH 168/490] Fix scrutinizer

---
 htdocs/takepos/genimg/qr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/takepos/genimg/qr.php b/htdocs/takepos/genimg/qr.php
index c73e874a465..c4d60a52c1b 100644
--- a/htdocs/takepos/genimg/qr.php
+++ b/htdocs/takepos/genimg/qr.php
@@ -29,5 +29,5 @@ require '../../core/modules/barcode/doc/tcpdfbarcode.modules.php';
 
 $key = GETPOST('key');
 
-$module = new modTcpdfbarcode($db);
+$module = new modTcpdfbarcode();
 $result = $module->buildBarCode("http://www.takepos.com", 'QRCODE', 'Y');

From ebbd4413f5985def5e726d974c761e193473d442 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 May 2020 00:47:27 +0200
Subject: [PATCH 169/490] Fix scrutinizer error

---
 htdocs/accountancy/admin/account.php            |  2 +-
 .../class/accountingaccount.class.php           | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 86981e5b5de..cf00519e9d7 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -161,7 +161,7 @@ if (empty($reshook))
     if ($action == 'disable') {
     	if ($accounting->fetch($id)) {
             $mode = GETPOST('mode', 'int');
-    		$result = $accounting->account_desactivate($id, $mode);
+    		$result = $accounting->accountDeactivate($id, $mode);
     	}
 
     	$action = 'update';
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index a32918cc5bf..bcd17793db1 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -553,24 +553,19 @@ class AccountingAccount extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Account deactivated
+	 * Deactivate an account (for status active or status reconcilable)
 	 *
 	 * @param  int  $id         Id
-     * @param  int  $mode       0=field active, 1=field active_customer_list, 2=field_active_supplier_list
+     * @param  int  $mode       0=field active, 1=field reconcilable
 	 * @return int              <0 if KO, >0 if OK
 	 */
-    public function account_desactivate($id, $mode = 0)
+    public function accountDeactivate($id, $mode = 0)
     {
-        // phpcs:enable
 		$result = $this->checkUsage();
 
-        if ($mode == 0)
-        {
-            $fieldtouse = 'active';
-        }
-        elseif ($mode == 1)
+		$fieldtouse = 'active';
+        if ($mode == 1)
         {
 			$fieldtouse = 'reconcilable';
         }
@@ -582,7 +577,7 @@ class AccountingAccount extends CommonObject
 			$sql .= "SET ".$fieldtouse." = '0'";
 			$sql .= " WHERE rowid = ".$this->db->escape($id);
 
-			dol_syslog(get_class($this)."::account_desactivate ".$fieldtouse." sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::accountDeactivate ".$fieldtouse." sql=".$sql, LOG_DEBUG);
 			$result = $this->db->query($sql);
 
 			if ($result) {

From 0850570e951e98b1b50de544844f9a19e669a97a Mon Sep 17 00:00:00 2001
From: "DEMAREST Maxime (Indelog)" <maxime@indelog.fr>
Date: Tue, 12 May 2020 13:15:49 +0200
Subject: [PATCH 170/490] Fix and imporve some points for
 compta/accounting-flles.php

* Fix zip generation for accouning-files if line has no document.
  The zip file generated if $filesarray contain a line with empty 'files'
  was unsustainable because it try to add empty files.

* Add clickable link to jump on card for other line than Invoice and
  Supplier Invoice

* Add various payment

* Use label as ref for paiements of salaries line to display more explicit line
---
 htdocs/compta/accounting-files.php | 64 +++++++++++++++++++++++++-----
 1 file changed, 54 insertions(+), 10 deletions(-)

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 471637461f6..9c26cc0999c 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -37,8 +37,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 
-$langs->loadLangs(array("accountancy", "bills", "companies", "salaries", "compta", "trips"));
+$langs->loadLangs(array("accountancy", "bills", "companies", "salaries", "compta", "trips", "banks"));
 
 $date_start = GETPOST('date_start', 'alpha');
 $date_startDay = GETPOST('date_startday', 'int');
@@ -176,7 +178,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 	    // Paiements of salaries
 		if (GETPOST('selectpaymentsofsalaries')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.ref as ref, 1 as paid, amount as total_ht, amount as total_ttc, 0 as total_vat, t.fk_user as fk_soc, t.datep as date, t.dateep as date_due, 'SalaryPayment' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname)  as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum";
+			$sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, amount as total_ht, amount as total_ttc, 0 as total_vat, t.fk_user as fk_soc, t.datep as date, t.dateep as date_due, 'SalaryPayment' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname)  as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
 		    $sql .= " WHERE datep between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -191,6 +193,14 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
 		    //$sql.=" AND fk_statut <> ".ChargeSociales::STATUS_DRAFT;
 		}
+	    // Various payments
+		if (GETPOST('selectvariouspayment')) {
+			if (!empty($sql)) $sql .= " UNION ALL";
+			$sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_tva, 0 as fk_soc, t.datec as date, t.datep as date_due, 'VariousPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum";
+		    $sql .= " FROM ".MAIN_DB_PREFIX."payment_various as t";
+		    $sql .= " WHERE datec between ".$wheretail;
+		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+		}
 
 		if ($sql) {
 		    $sql .= $db->order($sortfield, $sortorder);
@@ -254,6 +264,12 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		                	$upload_dir = $conf->tax->dir_output.'/'.$subdir;
 		                	$link = "document.php?modulepart=tax&file=".str_replace('/', '%2F', $subdir).'%2F';
 		                	break;
+		                case "VariousPayment":
+		                	$subdir = '';
+		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
+		                	$upload_dir = $conf->bank->dir_output.'/'.$subdir;
+                            $link = "document.php?modulepart=banque&file=".str_replace('/', '%2F', $subdir).'%2F';
+		                	break;
 		                default:
 		                    $subdir = '';
 		                    $upload_dir = '';
@@ -394,11 +410,13 @@ if ($result && $action == "dl" && !$error)
     {
         foreach ($filesarray as $key => $file)
         {
-        	foreach ($file['files'] as $filecursor) {
-        		if (file_exists($filecursor["fullname"])) {
-        			$zip->addFile($filecursor["fullname"], $filecursor["relpathnamelang"]);
-        		}
-        	}
+            if (!empty($file['files'])) {
+                foreach ($file['files'] as $filecursor) {
+                    if (file_exists($filecursor["fullname"])) {
+                        $zip->addFile($filecursor["fullname"], $filecursor["relpathnamelang"]);
+                    }
+                }
+            }
 
             $log .= '"'.$langs->trans($file['item']).'"';
             if (!empty($conf->multicompany->enabled) && is_object($mc))
@@ -448,6 +466,11 @@ $form = new Form($db);
 $userstatic = new User($db);
 $invoice = new Facture($db);
 $supplier_invoice = new FactureFournisseur($db);
+$expensereport = new ExpenseReport($db);
+$don = new Don($db);
+$salary_payment = new PaymentSalary($db);
+$charge_sociales = new ChargeSociales($db);
+$various_payment = new PaymentVarious($db);
 
 $title = $langs->trans("ComptaFiles").' - '.$langs->trans("List");
 $help_url = '';
@@ -492,7 +515,8 @@ $listofchoices = array(
 	'selectexpensereports'=>array('label'=>'ExpenseReports', 'lang'=>'trips'),
 	'selectdonations'=>array('label'=>'Donations', 'lang'=>'donation'),
 	'selectpaymentsofsalaries'=>array('label'=>'SalariesPayments', 'lang'=>'salaries'),
-	'selectsocialcontributions'=>array('label'=>'SocialContributions')
+	'selectsocialcontributions'=>array('label'=>'SocialContributions'),
+	'selectvariouspayment'=>array('label'=>'VariousPayment')
 );
 foreach ($listofchoices as $choice => $val) {
 	$checked = (((!GETPOSTISSET('search') && $action != 'searchfiles') || GETPOST($choice)) ? ' checked="checked"' : '');
@@ -592,14 +616,34 @@ if (!empty($date_start) && !empty($date_stop))
                 // Ref
                 print '<td class="nowraponall">';
 
-                if ($data['item'] == 'Invoice') {
-                	$invoice->id = $data['id'];
+            if ($data['item'] == 'Invoice') {
+                $invoice->id = $data['id'];
                 	$invoice->ref = $data['ref'];
                 	print $invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
                 } elseif ($data['item'] == 'SupplierInvoice') {
                 	$supplier_invoice->id = $data['id'];
                 	$supplier_invoice->ref = $data['ref'];
                 	print $supplier_invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+                } elseif ($data['item'] == 'ExpenseReport') {
+                    $expensereport->id = $data['id'];
+                	$expensereport->ref = $data['ref'];
+                	print $expensereport->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+                } elseif ($data['item'] == 'SalaryPayment') {
+                    $salary_payment->id = $data['id'];
+                	$salary_payment->ref = $data['ref'];
+                	print $salary_payment->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+                } elseif ($data['item'] == 'Donation') {
+                    $don->id = $data['id'];
+                	$don->ref = $data['ref'];
+                	print $don->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+                } elseif ($data['item'] == 'SocialContributions') {
+                    $charge_sociales->id = $data['id'];
+                	$charge_sociales->ref = $data['ref'];
+                	print $charge_sociales->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+                } elseif ($data['item'] == 'VariousPayment') {
+                    $various_payment->id = $data['id'];
+                	$various_payment->ref = $data['ref'];
+                	print $various_payment->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
                 } else {
                 	print $data['ref'];
                 }

From b7ae5ffa1d085661bed4906ad4540562e6134219 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 13 May 2020 06:12:45 +0000
Subject: [PATCH 171/490] Fixing style errors.

---
 htdocs/compta/accounting-files.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 9c26cc0999c..66d36df25b2 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -616,37 +616,37 @@ if (!empty($date_start) && !empty($date_stop))
                 // Ref
                 print '<td class="nowraponall">';
 
-            if ($data['item'] == 'Invoice') {
-                $invoice->id = $data['id'];
+				if ($data['item'] == 'Invoice') {
+					$invoice->id = $data['id'];
                 	$invoice->ref = $data['ref'];
                 	print $invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
-                } elseif ($data['item'] == 'SupplierInvoice') {
+				} elseif ($data['item'] == 'SupplierInvoice') {
                 	$supplier_invoice->id = $data['id'];
                 	$supplier_invoice->ref = $data['ref'];
                 	print $supplier_invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
-                } elseif ($data['item'] == 'ExpenseReport') {
+				} elseif ($data['item'] == 'ExpenseReport') {
                     $expensereport->id = $data['id'];
                 	$expensereport->ref = $data['ref'];
                 	print $expensereport->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
-                } elseif ($data['item'] == 'SalaryPayment') {
+				} elseif ($data['item'] == 'SalaryPayment') {
                     $salary_payment->id = $data['id'];
                 	$salary_payment->ref = $data['ref'];
                 	print $salary_payment->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
-                } elseif ($data['item'] == 'Donation') {
+				} elseif ($data['item'] == 'Donation') {
                     $don->id = $data['id'];
                 	$don->ref = $data['ref'];
                 	print $don->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
-                } elseif ($data['item'] == 'SocialContributions') {
+				} elseif ($data['item'] == 'SocialContributions') {
                     $charge_sociales->id = $data['id'];
                 	$charge_sociales->ref = $data['ref'];
                 	print $charge_sociales->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
-                } elseif ($data['item'] == 'VariousPayment') {
+				} elseif ($data['item'] == 'VariousPayment') {
                     $various_payment->id = $data['id'];
                 	$various_payment->ref = $data['ref'];
                 	print $various_payment->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
-                } else {
+				} else {
                 	print $data['ref'];
-                }
+				}
                 print '</td>';
 
                 // File link

From 48183b396ad674fb22e1c9415978d8414b0fd9e8 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Wed, 13 May 2020 08:54:42 +0200
Subject: [PATCH 172/490] Fix top menu search method must be GET

---
 htdocs/main.inc.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 8e05aa34ab8..2beb4f74787 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2002,7 +2002,7 @@ function top_menu_search()
 
     $defaultAction = '';
     $buttonList = '<div class="dropdown-global-search-button-list" >';
-    // Menu with all bookmarks
+    // Menu with all searchable items
     foreach ($arrayresult as $keyItem => $item)
     {
         if (empty($defaultAction)) {
@@ -2017,9 +2017,7 @@ function top_menu_search()
 
     $searchInput = '<input name="sall" id="top-global-search-input" class="dropdown-search-input" placeholder="'.$langs->trans('Search').'" autocomplete="off" >';
 
-
-    $dropDownHtml = '<!-- form with POST method by default, will be replaced with GET for external link by js -->'."\n";
-    $dropDownHtml .= '<form id="top-menu-action-bookmark" name="actionbookmark" method="POST" action="'.$defaultAction.'" >';
+    $dropDownHtml = '<form id="top-menu-action-search" name="actionsearch" method="GET" action="'.$defaultAction.'" >';
 
     $dropDownHtml .= '
         <!-- search input -->
@@ -2068,8 +2066,8 @@ function top_menu_search()
 
         // submit form action
         $(".dropdown-global-search-button-list .global-search-item").on("click", function(event) {
-            $("#top-menu-action-bookmark").attr("action", $(this).data("target"));
-            $("#top-menu-action-bookmark").submit();
+            $("#top-menu-action-search").attr("action", $(this).data("target"));
+            $("#top-menu-action-search").submit();
         });
 
         // close drop down

From fcb3b112d9b084defe46137c18f4eb67a016f190 Mon Sep 17 00:00:00 2001
From: "DEMAREST Maxime (Indelog)" <maxime@indelog.fr>
Date: Wed, 13 May 2020 09:31:14 +0200
Subject: [PATCH 173/490] Fix use datep field for various payment in
 accouting-files.php

---
 htdocs/compta/accounting-files.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 66d36df25b2..c567c5e99ee 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2019 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2017      Pierre-Henry Favre   <support@atm-consulting.fr>
+ * Copyright (C) 2020      Maxime DEMAREST      <maxime@indelog.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
@@ -196,9 +197,9 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 	    // Various payments
 		if (GETPOST('selectvariouspayment')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_tva, 0 as fk_soc, t.datec as date, t.datep as date_due, 'VariousPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum";
+			$sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_tva, 0 as fk_soc, t.datep as date, t.datep as date_due, 'VariousPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."payment_various as t";
-		    $sql .= " WHERE datec between ".$wheretail;
+		    $sql .= " WHERE datep between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
 		}
 

From bd3504c4731f68e271ce2de4b4e1183e07b8b8ee Mon Sep 17 00:00:00 2001
From: Florian Mortgat <florian.mortgat@atm-consulting.fr>
Date: Wed, 13 May 2020 10:26:44 +0200
Subject: [PATCH 174/490] FIX 9.0 - delete unused mandatory argument from
 migrate_clean_association: argument count mismatch causes a fatal error since
 php7

---
 htdocs/install/upgrade2.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index cf2a0353b4a..58e6bfb3634 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3605,10 +3605,9 @@ function migrate_mode_reglement($db,$langs,$conf)
  * @param	DoliDB		$db			Database handler
  * @param	Translate	$langs		Object langs
  * @param	Conf		$conf		Object conf
- * @param	string		$versionto	Version target
  * @return	void
  */
-function migrate_clean_association($db,$langs,$conf,$versionto)
+function migrate_clean_association($db, $langs, $conf)
 {
     $result = $db->DDLDescTable(MAIN_DB_PREFIX."categorie_association");
     if ($result)	// result defined for version 3.2 or -

From 9785e0b852bbbb9562942e3f84c748ef3ba3f0f3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 May 2020 12:30:59 +0200
Subject: [PATCH 175/490] Trans

---
 htdocs/langs/en_US/modulebuilder.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index b815cf997cc..135ac1ae9ec 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -83,7 +83,7 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
 DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)

From 8e6efba0be33b762f6fdf58321f6d1b69433be3d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 May 2020 12:49:53 +0200
Subject: [PATCH 176/490] CSS

---
 htdocs/theme/eldy/global.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index ef39d38a568..60c7ee43bb0 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1611,7 +1611,7 @@ div.nopadding {
 }
 
 td.nobordernopadding.widthpictotitle.col-picto {
-    color: var(--colortexttitlenotab);
+    color: #bbb;
     opacity: 0.85;
 }
 .table-list-of-attached-files .col-picto, .table-list-of-links .col-picto {

From 3b87b7c359a61bcfce64ec6f8366aeb5904fed0d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 May 2020 13:29:50 +0200
Subject: [PATCH 177/490] CSS

---
 htdocs/core/tpl/extrafields_view.tpl.php | 21 ++++++++++++++++++---
 htdocs/theme/eldy/global.inc.php         |  2 +-
 htdocs/theme/md/style.css.php            |  2 +-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index e6cbad245d9..198a3910747 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -52,8 +52,12 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 {
 	$lastseparatorkeyfound = '';
     $extrafields_collapse_num = '';
+    $extrafields_collapse_num_old = '';
+    $i = 0;
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
 	{
+		$i++;
+
 		// Discard if extrafield is a hidden field on form
 
 		$enabled = 1;
@@ -65,6 +69,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 		{
 			$enabled = dol_eval($extrafields->attributes[$object->table_element]['list'][$key], 1);
 		}
+
 		$perms = 1;
 		if ($perms && isset($extrafields->attributes[$object->table_element]['perms'][$key]))
 		{
@@ -87,6 +92,8 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 			$value = $object->array_options["options_".$key];
 			//var_dump($key.' - '.$value);
 		}
+
+		// Print line tr of extra field
 		if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate')
 		{
             $extrafields_collapse_num = '';
@@ -109,13 +116,20 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 		}
 		else
 		{
-            print '<tr class="trextrafields_collapse'.$extrafields_collapse_num.'">';
+			print '<tr class="trextrafields_collapse'.$extrafields_collapse_num;
+			/*if ($extrafields_collapse_num && $extrafields_collapse_num_old && $extrafields_collapse_num != $extrafields_collapse_num_old) {
+				print ' trextrafields_collapse_new';
+			}*/
+			if ($extrafields_collapse_num && $i == count($extrafields->attributes[$object->table_element]['label'])) {
+				print ' trextrafields_collapse_last';
+			}
+			print '">';
+			$extrafields_collapse_num_old = $extrafields_collapse_num;
 			print '<td class="titlefield">';
 			print '<table class="nobordernopadding centpercent">';
 			print '<tr>';
-			print '<td class="';
-			//var_dump($action);exit;
 
+			print '<td class="';
 			if ((!empty($action) && ($action == 'create' || $action == 'edit')) && !empty($extrafields->attributes[$object->table_element]['required'][$key])) print ' fieldrequired';
 			print '">';
 			if (!empty($extrafields->attributes[$object->table_element]['help'][$key])) print $form->textwithpicto($langs->trans($label), $langs->trans($extrafields->attributes[$object->table_element]['help'][$key]));
@@ -161,6 +175,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 				//print 'x'.$object->array_options['options_' . $key].'-'.$datenotinstring.' - '.dol_print_date($datenotinstring, 'dayhour');
 				$value = isset($_POST["options_".$key]) ? dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]) : $datenotinstring;
 			}
+
 			//TODO Improve element and rights detection
 			if ($action == 'edit_extras' && $permok && GETPOST('attribute', 'none') == $key)
 			{
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 60c7ee43bb0..2f5e10c1459 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1751,7 +1751,7 @@ img.photorefnoborder {
 	border-bottom: <?php echo $borderwidth ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
 	/* border-bottom: 2px solid var(--colorbackhmenu1); */
 }
-.trextrafieldseparator td {
+.trextrafieldseparator td, .trextrafields_collapse_last td {
     /* border-bottom: 2px solid var(--colorbackhmenu1) !important; */
     border-bottom: 2px solid rgb(<?php echo $colortopbordertitle1 ?>) !important;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index c7ce5709efd..da2df5eb788 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1799,7 +1799,7 @@ img.photorefnoborder {
 	border-bottom: <?php echo $borderwidth ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
 }
 
-.trextrafieldseparator td {
+.trextrafieldseparator td, .trextrafields_collapse_last td {
     border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>) !important;
 }
 .tdhrthin {

From 5f400d27b4a7909efcad5f2914cdefddb4d64983 Mon Sep 17 00:00:00 2001
From: "DEMAREST Maxime (Indelog)" <maxime@indelog.fr>
Date: Wed, 13 May 2020 15:01:32 +0200
Subject: [PATCH 178/490] Add preview file in compta/accounting-files.php

---
 htdocs/compta/accounting-files.php | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index c567c5e99ee..98d8c9b9983 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -40,6 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
 $langs->loadLangs(array("accountancy", "bills", "companies", "salaries", "compta", "trips", "banks"));
 
@@ -232,6 +233,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
 		                	$upload_dir = $conf->facture->dir_output.'/'.$subdir;
 		                	$link = "document.php?modulepart=facture&file=".str_replace('/', '%2F', $subdir).'%2F';
+                            $modulepart = "facture";
 		                	break;
 		                case "SupplierInvoice":
 		                	$tmpinvoicesupplier->fetch($objd->id);
@@ -239,18 +241,21 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
 		                	$upload_dir = $conf->fournisseur->facture->dir_output.'/'.$subdir;
 		                	$link = "document.php?modulepart=facture_fournisseur&file=".str_replace('/', '%2F', $subdir).'%2F';
+                            $modulepart = "facture_fournisseur";
 		                	break;
 		                case "ExpenseReport":
 		                	$subdir = '';
 		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
 		                	$upload_dir = $conf->expensereport->dir_output.'/'.$subdir;
 		                	$link = "document.php?modulepart=expensereport&file=".str_replace('/', '%2F', $subdir).'%2F';
+                            $modulepart = "expensereport";
 		                	break;
 		                case "SalaryPayment":
 		                	$subdir = '';
 		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
 		                	$upload_dir = $conf->salaries->dir_output.'/'.$subdir;
 		                	$link = "document.php?modulepart=salaries&file=".str_replace('/', '%2F', $subdir).'%2F';
+                            $modulepart = "salaries";
 		                	break;
 		                case "Donation":
 		                	$tmpdonation->fetch($objp->id);
@@ -258,18 +263,21 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
 		                	$upload_dir = $conf->don->dir_output.'/'.$subdir;
 		                	$link = "document.php?modulepart=don&file=".str_replace('/', '%2F', $subdir).'%2F';
+                            $modulepart = "don";
 		                	break;
 		                case "SocialContributions":
 		                	$subdir = '';
 		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
 		                	$upload_dir = $conf->tax->dir_output.'/'.$subdir;
 		                	$link = "document.php?modulepart=tax&file=".str_replace('/', '%2F', $subdir).'%2F';
+                            $modulepart = "tax";
 		                	break;
 		                case "VariousPayment":
 		                	$subdir = '';
 		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
 		                	$upload_dir = $conf->bank->dir_output.'/'.$subdir;
                             $link = "document.php?modulepart=banque&file=".str_replace('/', '%2F', $subdir).'%2F';
+                            $modulepart = "banque";
 		                	break;
 		                default:
 		                    $subdir = '';
@@ -336,7 +344,16 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		                        if (empty($filesarray[$file['item'].'_'.$file['id']]['files'])) {
 		                        	$filesarray[$file['item'].'_'.$file['id']]['files'] = array();
 		                        }
-		                        $filesarray[$file['item'].'_'.$file['id']]['files'][] = array('link' => $link.$file['name'], 'name'=>$file['name'], 'ref'=>$file['ref'], 'fullname' => $file['fullname'], 'relpathnamelang' => $langs->trans($file['item']).'/'.$file['name']);
+                                $filesarray[$file['item'].'_'.$file['id']]['files'][] = array(
+                                    'link' => $link.urlencode($file['name']),
+                                    'name'=>$file['name'],
+                                    'ref'=>$file['ref'],
+                                    'fullname' => $file['fullname'],
+                                    'relpath' => '/'.$file['name'],
+                                    'relpathnamelang' => $langs->trans($file['item']).'/'.$file['name'],
+                                    'modulepart' => $modulepart,
+                                    'subdir' => $subdir,
+                                );
 		                        //var_dump($file['item'].'_'.$file['id']);
 		                        //var_dump($filesarray[$file['item'].'_'.$file['id']]['files']);
 		                    }
@@ -463,7 +480,8 @@ if ($result && $action == "dl" && !$error)
  * View
  */
 
-$form = new Form($db);
+$form = new form($db);
+$formfile = new FormFile($db);
 $userstatic = new User($db);
 $invoice = new Facture($db);
 $supplier_invoice = new FactureFournisseur($db);
@@ -654,8 +672,8 @@ if (!empty($date_start) && !empty($date_stop))
                 print '<td>';
                 if (!empty($data['files']))
                 {
-                	foreach ($data['files'] as $filecursor) {
-                		print '<a href='.DOL_URL_ROOT.'/'.$filecursor['link'].' target="_blank">'.($filecursor['name'] ? $filecursor['name'] : $filecursor['ref']).'</a><br>';
+                	foreach ($data['files'] as $id=>$filecursor) {
+                        print '<a href='.DOL_URL_ROOT.'/'.$filecursor['link'].' target="_blank">'.($filecursor['name'] ? $filecursor['name'] : $filecursor['ref']).'</a>&nbsp;'.$formfile->showPreview($filecursor, $filecursor['modulepart'], $filecursor['subdir'].'/'.$filecursor['name']).'<br>';
                 	}
                 }
                 print "</td>\n";

From 872518a91fa2f30318f298c5bb630af616ee32e4 Mon Sep 17 00:00:00 2001
From: "DEMAREST Maxime (Indelog)" <maxime@indelog.fr>
Date: Wed, 13 May 2020 16:54:53 +0200
Subject: [PATCH 179/490] Add total by credit/debit for accounting-file.php

---
 htdocs/compta/accounting-files.php | 104 ++++++++++++++++-------------
 1 file changed, 56 insertions(+), 48 deletions(-)

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 98d8c9b9983..64332671b5d 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -42,6 +42,10 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
+// Constant to define payment sens
+const PAY_DEBIT = 0;
+const PAY_CREDIT = 1;
+
 $langs->loadLangs(array("accountancy", "bills", "companies", "salaries", "compta", "trips", "banks"));
 
 $date_start = GETPOST('date_start', 'alpha');
@@ -144,7 +148,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		// Customer invoices
 		if (GETPOST('selectinvoices')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= "SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total as total_ht, t.total_ttc, t.tva as total_vat, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'Invoice' as item, s.nom as thirdparty_name, s.code_client as thirdparty_code, c.code as country_code, s.tva_intra as vatnum";
+			$sql .= "SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total as total_ht, t.total_ttc, t.tva as total_vat, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'Invoice' as item, s.nom as thirdparty_name, s.code_client as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_CREDIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."facture as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
 		    $sql .= " WHERE datef between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -153,7 +157,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 	    // Vendor invoices
 		if (GETPOST('selectsupplierinvoices')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'SupplierInvoice' as item, s.nom as thirdparty_name, s.code_fournisseur as thirdparty_code, c.code as country_code, s.tva_intra as vatnum";
+			$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'SupplierInvoice' as item, s.nom as thirdparty_name, s.code_fournisseur as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_DEBIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
 		    $sql .= " WHERE datef between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -162,7 +166,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 	    // Expense reports
 		if (GETPOST('selectexpensereports')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.fk_user_author as fk_soc, t.date_fin as date, t.date_fin as date_due, 'ExpenseReport' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname) as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum";
+			$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.fk_user_author as fk_soc, t.date_fin as date, t.date_fin as date_due, 'ExpenseReport' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname) as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user_author LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
 		    $sql .= " WHERE date_fin between  ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -171,7 +175,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 	    // Donations
 		if (GETPOST('selectdonations')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.ref, paid, amount as total_ht, amount as total_ttc, 0 as total_vat, 0 as fk_soc, t.datedon as date, t.datedon as date_due, 'Donation' as item, t.societe as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum";
+			$sql .= " SELECT t.rowid as id, t.entity, t.ref, paid, amount as total_ht, amount as total_ttc, 0 as total_vat, 0 as fk_soc, t.datedon as date, t.datedon as date_due, 'Donation' as item, t.societe as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_CREDIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."don as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = t.fk_country";
 		    $sql .= " WHERE datedon between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -180,7 +184,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 	    // Paiements of salaries
 		if (GETPOST('selectpaymentsofsalaries')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, amount as total_ht, amount as total_ttc, 0 as total_vat, t.fk_user as fk_soc, t.datep as date, t.dateep as date_due, 'SalaryPayment' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname)  as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum";
+			$sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, amount as total_ht, amount as total_ttc, 0 as total_vat, t.fk_user as fk_soc, t.datep as date, t.dateep as date_due, 'SalaryPayment' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname)  as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
 		    $sql .= " WHERE datep between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -189,7 +193,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 	    // Social contributions
 		if (GETPOST('selectsocialcontributions')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.libelle as ref, t.paye as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_tva, 0 as fk_soc, t.date_creation as date, t.date_ech as date_due, 'SocialContributions' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum";
+			$sql .= " SELECT t.rowid as id, t.entity, t.libelle as ref, t.paye as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_tva, 0 as fk_soc, t.date_creation as date, t.date_ech as date_due, 'SocialContributions' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as t";
 		    $sql .= " WHERE date_creation between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -198,7 +202,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 	    // Various payments
 		if (GETPOST('selectvariouspayment')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_tva, 0 as fk_soc, t.datep as date, t.datep as date_due, 'VariousPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum";
+			$sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_tva, 0 as fk_soc, t.datep as date, t.datep as date_due, 'VariousPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."payment_various as t";
 		    $sql .= " WHERE datep between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -311,6 +315,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		                    $nofile['thirdparty_code'] = $objd->thirdparty_code;
 		                    $nofile['country_code'] = $objd->country_code;
 		                    $nofile['vatnum'] = $objd->vatnum;
+		                    $nofile['sens'] = $objd->sens;
 
 		                    $filesarray[$nofile['item'].'_'.$nofile['id']] = $nofile;
 		                }
@@ -329,11 +334,11 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		                        $file['ref'] = ($objd->ref ? $objd->ref : $objd->id);
 		                        $file['fk'] = $objd->fk_soc;
 		                        $file['item'] = $objd->item;
-
 		                        $file['thirdparty_name'] = $objd->thirdparty_name;
 		                        $file['thirdparty_code'] = $objd->thirdparty_code;
 		                        $file['country_code'] = $objd->country_code;
 		                        $file['vatnum'] = $objd->vatnum;
+                                $file['sens'] = $objd->sens;
 
 		                        // Save record into array (only the first time it is found)
 		                        if (empty($filesarray[$file['item'].'_'.$file['id']])) {
@@ -417,7 +422,8 @@ if ($result && $action == "dl" && !$error)
     $log .= ','.$langs->transnoentitiesnoconv("ThirdParty");
     $log .= ','.$langs->transnoentitiesnoconv("Code");
     $log .= ','.$langs->transnoentitiesnoconv("Country");
-    $log .= ','.$langs->transnoentitiesnoconv("VATIntra")."\n";
+    $log .= ','.$langs->transnoentitiesnoconv("VATIntra");
+    $log .= ','.$langs->transnoentitiesnoconv("Sens")."\n";
     $zipname = $dirfortmpfile.'/'.dol_print_date($date_start, 'dayrfc')."-".dol_print_date($date_stop, 'dayrfc').'_export.zip';
 
     dol_delete_file($zipname);
@@ -454,6 +460,7 @@ if ($result && $action == "dl" && !$error)
             $log .= ',"'.$file['thirdparty_code'].'"';
             $log .= ',"'.$file['country_code'].'"';
             $log .= ',"'.$file['vatnum'].'"';
+            $log .= ',"'.$file['sens'].'"';
             $log .= "\n";
         }
         $zip->addFromString('transactions.csv', $log);
@@ -605,11 +612,12 @@ if (!empty($date_start) && !empty($date_stop))
         {
             // Sort array by date ASC to calculate balance
 
-            $totalET = 0;
-            $totalIT = 0;
-            $totalVAT = 0;
-            $totalDebit = 0;
-            $totalCredit = 0;
+            $totalET_debit = 0;
+            $totalIT_debit = 0;
+            $totalVAT_debit = 0;
+            $totalET_credit = 0;
+            $totalIT_credit = 0;
+            $totalVAT_credit = 0;
 
             // Display array
             foreach ($TData as $data)
@@ -682,11 +690,11 @@ if (!empty($date_start) && !empty($date_stop))
                 print '<td aling="left">'.$data['paid'].'</td>';
 
                 // Total ET
-                print '<td align="right">'.price($data['amount_ht'])."</td>\n";
+                print '<td align="right">'.price($data['sens']?$data['amount_ht']:-$data['amount_ht'])."</td>\n";
                 // Total IT
-                print '<td align="right">'.price($data['amount_ttc'])."</td>\n";
+                print '<td align="right">'.price($data['sens']?$data['amount_ttc']:-$data['amount_ttc'])."</td>\n";
                 // Total VAT
-                print '<td align="right">'.price($data['amount_vat'])."</td>\n";
+                print '<td align="right">'.price($data['sens']?$data['amount_vat']:-$data['amount_vat'])."</td>\n";
 
                 print '<td>'.$data['thirdparty_name']."</td>\n";
 
@@ -696,42 +704,42 @@ if (!empty($date_start) && !empty($date_stop))
 
                 print '<td align="right">'.$data['vatnum']."</td>\n";
 
-                // Debit
-                //print '<td align="right">'.(($data['amount_ttc'] > 0) ? price(abs($data['amount_ttc'])) : '')."</td>\n";
-                // Credit
-                //print '<td align="right">'.(($data['amount_ttc'] > 0) ? '' : price(abs($data['amount_ttc'])))."</td>\n";
-
-                $totalET += $data['amount_ht'];
-                $totalIT += $data['amount_ttc'];
-                $totalVAT += $data['amount_vat'];
-
-                $totalDebit += ($data['amount_ttc'] > 0) ? abs($data['amount_ttc']) : 0;
-                $totalCredit += ($data['amount_ttc'] > 0) ? 0 : abs($data['amount_ttc']);
-
-                // Balance
-                //print '<td align="right">'.price($data['balance'])."</td>\n";
+                if ($data['sens']) {
+                    $totalET_credit += $data['amount_ht'];
+                    $totalIT_credit += $data['amount_ttc'];
+                    $totalVAT_credit += $data['amount_vat'];
+                } else {
+                    $totalET_debit -= $data['amount_ht'];
+                    $totalIT_debit -= $data['amount_ttc'];
+                    $totalVAT_debit -= $data['amount_vat'];
+                }
 
                 print "</tr>\n";
             }
 
+            // Total credits
             print '<tr class="liste_total">';
-            print '<td></td>';
-            print '<td></td>';
-            print '<td></td>';
-            print '<td></td>';
-            print '<td></td>';
-            print '<td></td>';
-            print '<td align="right">'.price(price2num($totalET, 'MT')).'</td>';
-            print '<td align="right">'.price(price2num($totalIT, 'MT')).'</td>';
-            print '<td align="right">'.price(price2num($totalVAT, 'MT')).'</td>';
-            print '<td></td>';
-            print '<td></td>';
-            print '<td></td>';
-            print '<td></td>';
-            /*print '<td align="right">'.price($totalDebit).'</td>';
-            print '<td align="right">'.price($totalCredit).'</td>';
-            print '<td align="right">'.price(price2num($totalDebit - $totalCredit, 'MT')).'</td>';
-			*/
+            print '<td colspan="6" class="right">'.$langs->trans('Total').' '.$langs->trans('Income').'</td>';
+            print '<td align="right">'.price(price2num($totalET_credit, 'MT')).'</td>';
+            print '<td align="right">'.price(price2num($totalIT_credit, 'MT')).'</td>';
+            print '<td align="right">'.price(price2num($totalVAT_credit, 'MT')).'</td>';
+            print '<td colspan="4"></td>';
+            print "</tr>\n";
+            // Total debits
+            print '<tr class="liste_total">';
+            print '<td colspan="6" class="right">'.$langs->trans('Total').' '.$langs->trans('Outcome').'</td>';
+            print '<td align="right">'.price(price2num($totalET_debit, 'MT')).'</td>';
+            print '<td align="right">'.price(price2num($totalIT_debit, 'MT')).'</td>';
+            print '<td align="right">'.price(price2num($totalVAT_debit, 'MT')).'</td>';
+            print '<td colspan="4"></td>';
+            print "</tr>\n";
+            // Balance
+            print '<tr class="liste_total">';
+            print '<td colspan="6" class="right">'.$langs->trans('Total').'</td>';
+            print '<td align="right">'.price(price2num($totalET_credit+$totalET_debit, 'MT')).'</td>';
+            print '<td align="right">'.price(price2num($totalIT_credit+$totalIT_debit, 'MT')).'</td>';
+            print '<td align="right">'.price(price2num($totalVAT_credit+$totalVAT_debit, 'MT')).'</td>';
+            print '<td colspan="4"></td>';
             print "</tr>\n";
         }
     }

From ee6e717f4632716ce1e4d6a12301882b17850524 Mon Sep 17 00:00:00 2001
From: "DEMAREST Maxime (Indelog)" <maxime@indelog.fr>
Date: Wed, 13 May 2020 17:47:30 +0200
Subject: [PATCH 180/490] Add payment loan in accounting-files.php

---
 htdocs/compta/accounting-files.php | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 64332671b5d..a97a0a815b7 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -41,12 +41,13 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/loan/class/paymentloan.class.php';
 
 // Constant to define payment sens
 const PAY_DEBIT = 0;
 const PAY_CREDIT = 1;
 
-$langs->loadLangs(array("accountancy", "bills", "companies", "salaries", "compta", "trips", "banks"));
+$langs->loadLangs(array("accountancy", "bills", "companies", "salaries", "compta", "trips", "banks", "loan"));
 
 $date_start = GETPOST('date_start', 'alpha');
 $date_startDay = GETPOST('date_startday', 'int');
@@ -207,6 +208,14 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		    $sql .= " WHERE datep between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
 		}
+        // Loan payments
+		if (GETPOST('selectloanspayment')) {
+			if (!empty($sql)) $sql .= " UNION ALL";
+			$sql .= " SELECT t.rowid as id, l.entity, l.label as ref, 1 as paid, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ht, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ttc, 0 as total_tva, 0 as fk_soc, t.datep as date, t.datep as date_due, 'LoanPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
+		    $sql .= " FROM ".MAIN_DB_PREFIX."payment_loan as t LEFT JOIN ".MAIN_DB_PREFIX."loan as l ON l.rowid = t.fk_loan";
+		    $sql .= " WHERE datep between ".$wheretail;
+		    $sql .= " AND l.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+		}
 
 		if ($sql) {
 		    $sql .= $db->order($sortfield, $sortorder);
@@ -283,6 +292,13 @@ if (($action == 'searchfiles' || $action == 'dl')) {
                             $link = "document.php?modulepart=banque&file=".str_replace('/', '%2F', $subdir).'%2F';
                             $modulepart = "banque";
 		                	break;
+		                case "LoanPayment":
+                            // Loan payment has no linked file
+		                	$subdir = '';
+		                	$upload_dir = $conf->loan->dir_output.'/'.$subdir;
+                            $link = "";
+                            $modulepart = "";
+		                	break;
 		                default:
 		                    $subdir = '';
 		                    $upload_dir = '';
@@ -497,6 +513,7 @@ $don = new Don($db);
 $salary_payment = new PaymentSalary($db);
 $charge_sociales = new ChargeSociales($db);
 $various_payment = new PaymentVarious($db);
+$payment_loan = new PaymentLoan($db);
 
 $title = $langs->trans("ComptaFiles").' - '.$langs->trans("List");
 $help_url = '';
@@ -542,7 +559,8 @@ $listofchoices = array(
 	'selectdonations'=>array('label'=>'Donations', 'lang'=>'donation'),
 	'selectpaymentsofsalaries'=>array('label'=>'SalariesPayments', 'lang'=>'salaries'),
 	'selectsocialcontributions'=>array('label'=>'SocialContributions'),
-	'selectvariouspayment'=>array('label'=>'VariousPayment')
+	'selectvariouspayment'=>array('label'=>'VariousPayment'),
+	'selectloanspayment'=>array('label'=>'PaymentLoan'),
 );
 foreach ($listofchoices as $choice => $val) {
 	$checked = (((!GETPOSTISSET('search') && $action != 'searchfiles') || GETPOST($choice)) ? ' checked="checked"' : '');
@@ -671,6 +689,10 @@ if (!empty($date_start) && !empty($date_stop))
                     $various_payment->id = $data['id'];
                 	$various_payment->ref = $data['ref'];
                 	print $various_payment->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+				} elseif ($data['item'] == 'LoanPayment') {
+                    $payment_loan->id = $data['id'];
+                	$payment_loan->ref = $data['ref'];
+                	print $payment_loan->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
 				} else {
                 	print $data['ref'];
 				}

From ac0b735131af206c67d34420ed38a3fff43a8482 Mon Sep 17 00:00:00 2001
From: "DEMAREST Maxime (Indelog)" <maxime@indelog.fr>
Date: Wed, 13 May 2020 18:01:00 +0200
Subject: [PATCH 181/490] Fix use date_ech for social contributions in
 accounting-file.php

---
 htdocs/compta/accounting-files.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index a97a0a815b7..f9bc453d999 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -194,9 +194,9 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 	    // Social contributions
 		if (GETPOST('selectsocialcontributions')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.libelle as ref, t.paye as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_tva, 0 as fk_soc, t.date_creation as date, t.date_ech as date_due, 'SocialContributions' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
+			$sql .= " SELECT t.rowid as id, t.entity, t.libelle as ref, t.paye as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_tva, 0 as fk_soc, t.date_ech as date, t.periode as date_due, 'SocialContributions' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as t";
-		    $sql .= " WHERE date_creation between ".$wheretail;
+		    $sql .= " WHERE t.date_ech between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
 		    //$sql.=" AND fk_statut <> ".ChargeSociales::STATUS_DRAFT;
 		}

From 9f6a5d4cc95097e92eeb94d6524add35ae3a5c3d Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Thu, 14 May 2020 10:50:20 +0200
Subject: [PATCH 182/490] Fix multicompany supplier product price filter

---
 htdocs/core/class/html.form.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 93061d200d8..078cfb2b5f2 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2759,7 +2759,7 @@ class Form
         }
         if (!empty($conf->barcode->enabled)) $sql .= ", pfp.barcode";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON ( p.rowid = pfp.fk_product AND pfp.entity IN (".getEntity('product').") )";
 		if ($socid) $sql .= " AND pfp.fk_soc = ".$socid;
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
         // Units

From 36b63ed921b555b297da38c2467b1e32037c9c1f Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Thu, 14 May 2020 11:37:26 +0200
Subject: [PATCH 183/490] Update list.php

---
 htdocs/product/list.php | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index f818d2f475a..d6b3def0967 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -1252,26 +1252,26 @@ if ($resql)
 			{
 				if (!empty($arrayfields['p.sellprice'.$key]['checked']))
 				{
-					$resultp = "SELECT p.rowid, p.fk_product, p.price, p.price_ttc, p.price_level, p.date_price";
-					$resultp .= " FROM ".MAIN_DB_PREFIX."product_price as p";
-					$resultp .= " WHERE fk_product = ".$obj->rowid;
-					if (!empty($conf->global->PRODUIT_MULTIPRICES)) $resultp .= " AND p.price_level = ".$key;
-					$resultp .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
-					$resultp = $db->query($resultp);
-					if ($resultp)
+					print '<td class="right nowraponall">';
+					if ($obj->tosell)
 					{
-						$objp = $db->fetch_object($resultp);
-						print '<td class="right nowraponall">';
-						if ($obj->tosell)
-							{
-							if ($obj->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
-							else print price($objp->price).' '.$langs->trans("HT");
+						$resultp = "SELECT p.rowid, p.fk_product, p.price, p.price_ttc, p.price_level, p.date_price";
+						$resultp .= " FROM ".MAIN_DB_PREFIX."product_price as p";
+						$resultp .= " WHERE fk_product = ".$obj->rowid;
+						$resultp .= " AND p.price_level = ".$key;
+						$resultp .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
+						$resultp = $db->query($resultp);
+						if ($resultp)
+						{
+							$objp = $db->fetch_object($resultp);
+								if ($obj->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
+								else print price($objp->price).' '.$langs->trans("HT");
+								$db->free($resultp);
+						} else {
+							dol_print_error($db);
 						}
-							print '</td>';
-							$db->free($resultp);
-					} else {
-						dol_print_error($db);
 					}
+					print '</td>';
 					if (!$i) $totalarray['nbfield']++;
 				}
 			}

From e3afa658808b856b4afe576787f5835b020c0998 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 14 May 2020 09:38:27 +0000
Subject: [PATCH 184/490] Fixing style errors.

---
 htdocs/product/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index d6b3def0967..97d08477946 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -1265,7 +1265,7 @@ if ($resql)
 						{
 							$objp = $db->fetch_object($resultp);
 								if ($obj->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
-								else print price($objp->price).' '.$langs->trans("HT");
+							else print price($objp->price).' '.$langs->trans("HT");
 								$db->free($resultp);
 						} else {
 							dol_print_error($db);

From 1bd00b0e8c635db1a8348c97d3933699b92d88db Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 12:28:17 +0200
Subject: [PATCH 185/490] Fix to solve feedbacks of
 https://www.dolibarr.fr/forum/t/email-collector-avec-office-365-bug-et-contournement/32726

---
 .../class/emailcollector.class.php            | 20 +++++++++++++++----
 .../install/mysql/migration/11.0.0-12.0.0.sql |  2 ++
 .../llx_emailcollector_emailcollector.sql     |  3 ++-
 htdocs/langs/en_US/admin.lang                 |  1 +
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 11cf2477720..969b83cac5a 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -100,8 +100,9 @@ class EmailCollector extends CommonObject
         'ref'           => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'help'=>'Example: MyCollector1'),
         'label'         => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1, 'searchall'=>1, 'help'=>'Example: My Email collector'),
         'description'   => array('type'=>'text', 'label'=>'Description', 'visible'=>-1, 'enabled'=>1, 'position'=>60, 'notnull'=>-1),
-        'host'          => array('type'=>'varchar(255)', 'label'=>'EMailHost', 'visible'=>1, 'enabled'=>1, 'position'=>100, 'notnull'=>1, 'searchall'=>1, 'comment'=>"IMAP server", 'help'=>'Example: imap.gmail.com'),
-        'login'         => array('type'=>'varchar(128)', 'label'=>'Login', 'visible'=>1, 'enabled'=>1, 'position'=>101, 'notnull'=>-1, 'index'=>1, 'comment'=>"IMAP login", 'help'=>'Example: myaccount@gmail.com'),
+        'host'          => array('type'=>'varchar(255)', 'label'=>'EMailHost', 'visible'=>1, 'enabled'=>1, 'position'=>90, 'notnull'=>1, 'searchall'=>1, 'comment'=>"IMAP server", 'help'=>'Example: imap.gmail.com'),
+    	'hostcharset'   => array('type'=>'varchar(16)', 'label'=>'HostCharset', 'visible'=>-1, 'enabled'=>1, 'position'=>91, 'notnull'=>0, 'searchall'=>0, 'comment'=>"IMAP server charset", 'help'=>'Example: "UTF-8" (May be "US-ASCII" with some Office365)'),
+    	'login'         => array('type'=>'varchar(128)', 'label'=>'Login', 'visible'=>1, 'enabled'=>1, 'position'=>101, 'notnull'=>-1, 'index'=>1, 'comment'=>"IMAP login", 'help'=>'Example: myaccount@gmail.com'),
         'password'      => array('type'=>'password', 'label'=>'Password', 'visible'=>-1, 'enabled'=>1, 'position'=>102, 'notnull'=>-1, 'comment'=>"IMAP password", 'help'=>'WithGMailYouCanCreateADedicatedPassword'),
         'source_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxSourceDirectory', 'visible'=>-1, 'enabled'=>1, 'position'=>103, 'notnull'=>1, 'default' => 'Inbox', 'help'=>'Example: INBOX'),
         //'filter' => array('type'=>'text', 'label'=>'Filter', 'visible'=>1, 'enabled'=>1, 'position'=>105),
@@ -173,6 +174,7 @@ class EmailCollector extends CommonObject
 
 
     public $host;
+    public $hostcharset;
     public $login;
     public $password;
     public $source_directory;
@@ -985,9 +987,10 @@ class EmailCollector extends CommonObject
         $nbemailprocessed = 0;
         $nbemailok = 0;
         $nbactiondone = 0;
+        $charset = ($this->hostcharset ? $this->hostcharset : "UTF-8");
 
         // Scan IMAP inbox
-        $arrayofemail = imap_search($connection, $search, null, "UTF-8");
+        $arrayofemail = imap_search($connection, $search, null, $charset);
         if ($arrayofemail === false)
         {
             // Nothing found or search string not understood
@@ -1086,6 +1089,7 @@ class EmailCollector extends CommonObject
                 }
 
                 $header = imap_fetchheader($connection, $imapemail, 0);
+                $header = preg_replace('/\r\n\s+/m', ' ', $header);	// When a header line is on several lines, merge lines
                 $matches = array();
                 preg_match_all('/([^: ]+): (.+?(?:\r\n\s(?:.+?))*)\r\n/m', $header, $matches);
                 $headers = array_combine($matches[1], $matches[2]);
@@ -1132,7 +1136,10 @@ class EmailCollector extends CommonObject
                 // Can use also imap_mime_header_decode($str)
                 // Can use also mb_decode_mimeheader($str)
                 // Can use also iconv_mime_decode($str, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8')
-                if (function_exists('imap_mime_header_decode')) {
+                if (function_exists('iconv_mime_decode')) {
+                	$overview[0]->subject = iconv_mime_decode($overview[0]->subject, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');
+                }
+                elseif (function_exists('imap_mime_header_decode')) {
                 	$elements = imap_mime_header_decode($overview[0]->subject);
                 	$newstring = '';
                 	if (!empty($elements)) {
@@ -1146,6 +1153,8 @@ class EmailCollector extends CommonObject
                 elseif (function_exists('mb_decode_mimeheader')) {
                 	$overview[0]->subject = mb_decode_mimeheader($overview[0]->subject);
                 }
+                // Removed emojis
+                $overview[0]->subject = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $overview[0]->subject);
 
                 // Parse IMAP email structure
                 global $htmlmsg, $plainmsg, $charset, $attachments;
@@ -1153,6 +1162,9 @@ class EmailCollector extends CommonObject
 
                 //$htmlmsg,$plainmsg,$charset,$attachments
                 $messagetext = $plainmsg ? $plainmsg : dol_string_nohtmltag($htmlmsg, 0);
+                // Removed emojis
+                $messagetext = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $messagetext);
+
                 /*var_dump($plainmsg);
                 var_dump($htmlmsg);
                 var_dump($messagetext);*/
diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 8a68e763160..7daf41a05d3 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -285,3 +285,5 @@ ALTER TABLE llx_prelevement_facture ADD COLUMN fk_facture_fourn INTEGER NULL;
 ALTER TABLE llx_menu MODIFY COLUMN module varchar(255);
 
 UPDATE llx_actioncomm SET fk_action = 50 where fk_action = 40 AND code = 'TICKET_MSG'; 
+
+ALTER TABLE llx_emailcollector_emailcollector ADD COLUMN hostcharset varchar(16) DEFAULT 'UTF-8';
diff --git a/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql b/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
index 10f3e4f8b9b..87581f418e8 100644
--- a/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
+++ b/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
@@ -21,7 +21,8 @@ CREATE TABLE llx_emailcollector_emailcollector(
         ref varchar(128) NOT NULL,
         label varchar(255), 
         description text,
-        host varchar(255), 
+        host varchar(255),
+        hostcharset varchar(16) DEFAULT 'UTF-8',
         login varchar(128), 
         password varchar(128),
         source_directory varchar(255) NOT NULL,
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1bd7f3d0297..5ce79a12231 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web server user/group
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Module <b>%s</b> must be enabled

From bcaa83eeeca16486d5d3d511ea7290b25146aba5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 14:10:04 +0200
Subject: [PATCH 186/490] FIX dol_concatdesc to escape < Better help

---
 htdocs/admin/emailcollector_card.php                 | 4 ++--
 htdocs/core/class/translate.class.php                | 2 +-
 htdocs/core/lib/functions.lib.php                    | 9 +++++----
 htdocs/emailcollector/class/emailcollector.class.php | 9 +++++++--
 htdocs/langs/en_US/admin.lang                        | 2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index 74592ff777a..80161eaadc6 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -592,7 +592,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<input type="text" name="operationparam">';
 	$htmltext = $langs->transnoentitiesnoconv("OperationParamDesc");
 	//var_dump($htmltext);
-	print $form->textwithpicto('', $htmltext);
+	print $form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'operationparamtt');
 	print '</td>';
 	print '<td></td>';
 	print '<td class="right"><input type="submit" name="addoperation" id="addoperation" class="flat button" value="'.$langs->trans("Add").'"></td>';
@@ -643,7 +643,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '</td>';
 		// Delete
 		print '<td class="right nowraponall">';
-		print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editoperation&operationid='.$ruleaction['id'].'">'.img_edit().'</a>';
+		print '<a class="editfielda marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editoperation&operationid='.$ruleaction['id'].'">'.img_edit().'</a>';
 		print ' <a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deleteoperation&operationid='.$ruleaction['id'].'">'.img_delete().'</a>';
 		print '</td>';
 		print '</tr>';
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 4f3930a4588..3fc3151030a 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -308,7 +308,7 @@ class Translate
 									    continue;
 									}
 									else {
-										// Convert some strings: Parse and render carriage returns. Also, change '\\s' int '\s' because transifex sync pull the string '\s' into string '\\s'
+										// Convert some strings: Parse and render carriage returns. Also, change '\\s' into '\s' because transifex sync pull the string '\s' into string '\\s'
 										$this->tab_translate[$key] = str_replace(array('\\n', '\\\\s'), array("\n", '\s'), $value);
 										if ($usecachekey) {
 											$tabtranslatedomain[$key] = $value;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 20094da216c..31716dc3f3c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5794,7 +5794,8 @@ function dolGetFirstLineOfText($text, $nboflines = 1, $charset = 'UTF-8')
 
 
 /**
- * Replace CRLF in string with a HTML BR tag
+ * Replace CRLF in string with a HTML BR tag.
+ * WARNING: The content after operation contains some HTML tags (the <br>) so be sure to also have encode the special chars of stringtoencode into HTML before.
  *
  * @param	string	$stringtoencode		String to encode
  * @param	int     $nl2brmode			0=Adding br before \n, 1=Replacing \n by br
@@ -6048,7 +6049,7 @@ function dol_textishtml($msg, $option = 0)
  *
  *  @param  string  $text1          Text 1
  *  @param  string  $text2          Text 2
- *  @param  bool    $forxml         false=Use <br>instead of \n if html content detected, true=Use <br /> instead of \n if html content detected
+ *  @param  bool    $forxml         true=Use <br /> instead of <br> if we have to add a br tag
  *  @param  bool    $invert         invert order of description lines (we often use config MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION in this parameter)
  *  @return string                  Text 1 + new line + Text2
  *  @see    dol_textishtml()
@@ -6063,9 +6064,9 @@ function dol_concatdesc($text1, $text2, $forxml = false, $invert = false)
     }
 
     $ret = '';
-    $ret .= (!dol_textishtml($text1) && dol_textishtml($text2)) ?dol_nl2br($text1, 0, $forxml) : $text1;
+    $ret .= (!dol_textishtml($text1) && dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text1, 0, 1, '', 1), 0, $forxml) : $text1;
     $ret .= (!empty($text1) && !empty($text2)) ? ((dol_textishtml($text1) || dol_textishtml($text2)) ? ($forxml ? "<br \>\n" : "<br>\n") : "\n") : "";
-    $ret .= (dol_textishtml($text1) && !dol_textishtml($text2)) ?dol_nl2br($text2, 0, $forxml) : $text2;
+    $ret .= (dol_textishtml($text1) && !dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text2, 0, 1, '', 1), 0, $forxml) : $text2;
     return $ret;
 }
 
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 969b83cac5a..2bc6d6db962 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -937,8 +937,8 @@ class EmailCollector extends CommonObject
         }
         imap_errors(); // Clear stack of errors.
 
-        // $conf->global->MAIL_PREFIX_FOR_EMAIL_ID must be defined
         $host = dol_getprefix('email');
+		//$host = '123456';
 
         // Define the IMAP search string
         // See https://tools.ietf.org/html/rfc3501#section-6.4.4 for IMAPv4 (PHP not yet compatible)
@@ -1081,6 +1081,7 @@ class EmailCollector extends CommonObject
 
             dol_syslog("Start of loop on email", LOG_INFO, 1);
 
+            $i = 0;
             foreach ($arrayofemail as $imapemail)
             {
                 if ($nbemailprocessed > 1000)
@@ -1088,6 +1089,8 @@ class EmailCollector extends CommonObject
                     break; // Do not process more than 1000 email per launch (this is a different protection than maxnbcollectedpercollect
                 }
 
+                $i++;
+
                 $header = imap_fetchheader($connection, $imapemail, 0);
                 $header = preg_replace('/\r\n\s+/m', ' ', $header);	// When a header line is on several lines, merge lines
                 $matches = array();
@@ -1095,6 +1098,8 @@ class EmailCollector extends CommonObject
                 $headers = array_combine($matches[1], $matches[2]);
                 //var_dump($headers);
 
+                dol_syslog("** Process email ".$i." References: ".$headers['References']);
+
                 // If there is a filter on trackid
                 if ($searchfilterdoltrackid > 0)
                 {
@@ -1130,7 +1135,7 @@ class EmailCollector extends CommonObject
                 // GET Email meta datas
                 $overview = imap_fetch_overview($connection, $imapemail, 0);
 
-                dol_syslog("** Process email - msgid=".$overview[0]->message_id." date=".dol_print_date($overview[0]->udate, 'dayrfc', 'gmt')." subject=".$overview[0]->subject);
+                dol_syslog("msgid=".$overview[0]->message_id." date=".dol_print_date($overview[0]->udate, 'dayrfc', 'gmt')." subject=".$overview[0]->subject);
 
                 // Decode $overview[0]->subject according to RFC2047
                 // Can use also imap_mime_header_decode($str)
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 5ce79a12231..6c139a0f10c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1939,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\s([^\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\s*([^\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\s([^\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module

From 4a65b629ee3c93266226208d24806aee8243e168 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 14:29:14 +0200
Subject: [PATCH 187/490] Position of fields

---
 htdocs/index.php                 | 4 ++--
 htdocs/theme/eldy/global.inc.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/index.php b/htdocs/index.php
index 36aae1f25b8..7f6e462839b 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -142,11 +142,11 @@ if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
     		'orders',
     		'invoices',
     		'donations',
-    		'contracts',
-    		'interventions',
     		'supplier_proposals',
     		'supplier_orders',
     		'supplier_invoices',
+    		'contracts',
+    		'interventions',
     		'ticket'
     	);
 
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 2f5e10c1459..afb154408c5 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3643,7 +3643,7 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 	box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.20);
 }
 span.boxstatstext {
-	opacity: 0.7;
+	opacity: 0.5;
     line-height: 18px;
     color: var(--colortext);
 }

From 72c6aa81bb146813ab52f6a95f321ba9918c687c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 May 2020 12:30:59 +0200
Subject: [PATCH 188/490] Trans

---
 htdocs/langs/en_US/modulebuilder.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index b815cf997cc..135ac1ae9ec 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -83,7 +83,7 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
 DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)

From 4a04cecbaae3c6deea391462718f08323965805d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 May 2020 12:49:53 +0200
Subject: [PATCH 189/490] CSS

---
 htdocs/theme/eldy/global.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index ef39d38a568..60c7ee43bb0 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1611,7 +1611,7 @@ div.nopadding {
 }
 
 td.nobordernopadding.widthpictotitle.col-picto {
-    color: var(--colortexttitlenotab);
+    color: #bbb;
     opacity: 0.85;
 }
 .table-list-of-attached-files .col-picto, .table-list-of-links .col-picto {

From 0b3e917155c8e4f9f4a6fe676268fd357f6e8df0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 May 2020 13:29:50 +0200
Subject: [PATCH 190/490] CSS

---
 htdocs/core/tpl/extrafields_view.tpl.php | 21 ++++++++++++++++++---
 htdocs/theme/eldy/global.inc.php         |  2 +-
 htdocs/theme/md/style.css.php            |  2 +-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index e6cbad245d9..198a3910747 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -52,8 +52,12 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 {
 	$lastseparatorkeyfound = '';
     $extrafields_collapse_num = '';
+    $extrafields_collapse_num_old = '';
+    $i = 0;
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
 	{
+		$i++;
+
 		// Discard if extrafield is a hidden field on form
 
 		$enabled = 1;
@@ -65,6 +69,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 		{
 			$enabled = dol_eval($extrafields->attributes[$object->table_element]['list'][$key], 1);
 		}
+
 		$perms = 1;
 		if ($perms && isset($extrafields->attributes[$object->table_element]['perms'][$key]))
 		{
@@ -87,6 +92,8 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 			$value = $object->array_options["options_".$key];
 			//var_dump($key.' - '.$value);
 		}
+
+		// Print line tr of extra field
 		if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate')
 		{
             $extrafields_collapse_num = '';
@@ -109,13 +116,20 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 		}
 		else
 		{
-            print '<tr class="trextrafields_collapse'.$extrafields_collapse_num.'">';
+			print '<tr class="trextrafields_collapse'.$extrafields_collapse_num;
+			/*if ($extrafields_collapse_num && $extrafields_collapse_num_old && $extrafields_collapse_num != $extrafields_collapse_num_old) {
+				print ' trextrafields_collapse_new';
+			}*/
+			if ($extrafields_collapse_num && $i == count($extrafields->attributes[$object->table_element]['label'])) {
+				print ' trextrafields_collapse_last';
+			}
+			print '">';
+			$extrafields_collapse_num_old = $extrafields_collapse_num;
 			print '<td class="titlefield">';
 			print '<table class="nobordernopadding centpercent">';
 			print '<tr>';
-			print '<td class="';
-			//var_dump($action);exit;
 
+			print '<td class="';
 			if ((!empty($action) && ($action == 'create' || $action == 'edit')) && !empty($extrafields->attributes[$object->table_element]['required'][$key])) print ' fieldrequired';
 			print '">';
 			if (!empty($extrafields->attributes[$object->table_element]['help'][$key])) print $form->textwithpicto($langs->trans($label), $langs->trans($extrafields->attributes[$object->table_element]['help'][$key]));
@@ -161,6 +175,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 				//print 'x'.$object->array_options['options_' . $key].'-'.$datenotinstring.' - '.dol_print_date($datenotinstring, 'dayhour');
 				$value = isset($_POST["options_".$key]) ? dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]) : $datenotinstring;
 			}
+
 			//TODO Improve element and rights detection
 			if ($action == 'edit_extras' && $permok && GETPOST('attribute', 'none') == $key)
 			{
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 60c7ee43bb0..2f5e10c1459 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1751,7 +1751,7 @@ img.photorefnoborder {
 	border-bottom: <?php echo $borderwidth ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
 	/* border-bottom: 2px solid var(--colorbackhmenu1); */
 }
-.trextrafieldseparator td {
+.trextrafieldseparator td, .trextrafields_collapse_last td {
     /* border-bottom: 2px solid var(--colorbackhmenu1) !important; */
     border-bottom: 2px solid rgb(<?php echo $colortopbordertitle1 ?>) !important;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index c7ce5709efd..da2df5eb788 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1799,7 +1799,7 @@ img.photorefnoborder {
 	border-bottom: <?php echo $borderwidth ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
 }
 
-.trextrafieldseparator td {
+.trextrafieldseparator td, .trextrafields_collapse_last td {
     border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>) !important;
 }
 .tdhrthin {

From a796122f7b0e1050df2fe5ac635107e4aa3750be Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 12:28:17 +0200
Subject: [PATCH 191/490] Fix to solve feedbacks of
 https://www.dolibarr.fr/forum/t/email-collector-avec-office-365-bug-et-contournement/32726

---
 .../class/emailcollector.class.php            | 20 +++++++++++++++----
 .../install/mysql/migration/11.0.0-12.0.0.sql |  2 ++
 .../llx_emailcollector_emailcollector.sql     |  3 ++-
 htdocs/langs/en_US/admin.lang                 |  1 +
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 11cf2477720..969b83cac5a 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -100,8 +100,9 @@ class EmailCollector extends CommonObject
         'ref'           => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'help'=>'Example: MyCollector1'),
         'label'         => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1, 'searchall'=>1, 'help'=>'Example: My Email collector'),
         'description'   => array('type'=>'text', 'label'=>'Description', 'visible'=>-1, 'enabled'=>1, 'position'=>60, 'notnull'=>-1),
-        'host'          => array('type'=>'varchar(255)', 'label'=>'EMailHost', 'visible'=>1, 'enabled'=>1, 'position'=>100, 'notnull'=>1, 'searchall'=>1, 'comment'=>"IMAP server", 'help'=>'Example: imap.gmail.com'),
-        'login'         => array('type'=>'varchar(128)', 'label'=>'Login', 'visible'=>1, 'enabled'=>1, 'position'=>101, 'notnull'=>-1, 'index'=>1, 'comment'=>"IMAP login", 'help'=>'Example: myaccount@gmail.com'),
+        'host'          => array('type'=>'varchar(255)', 'label'=>'EMailHost', 'visible'=>1, 'enabled'=>1, 'position'=>90, 'notnull'=>1, 'searchall'=>1, 'comment'=>"IMAP server", 'help'=>'Example: imap.gmail.com'),
+    	'hostcharset'   => array('type'=>'varchar(16)', 'label'=>'HostCharset', 'visible'=>-1, 'enabled'=>1, 'position'=>91, 'notnull'=>0, 'searchall'=>0, 'comment'=>"IMAP server charset", 'help'=>'Example: "UTF-8" (May be "US-ASCII" with some Office365)'),
+    	'login'         => array('type'=>'varchar(128)', 'label'=>'Login', 'visible'=>1, 'enabled'=>1, 'position'=>101, 'notnull'=>-1, 'index'=>1, 'comment'=>"IMAP login", 'help'=>'Example: myaccount@gmail.com'),
         'password'      => array('type'=>'password', 'label'=>'Password', 'visible'=>-1, 'enabled'=>1, 'position'=>102, 'notnull'=>-1, 'comment'=>"IMAP password", 'help'=>'WithGMailYouCanCreateADedicatedPassword'),
         'source_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxSourceDirectory', 'visible'=>-1, 'enabled'=>1, 'position'=>103, 'notnull'=>1, 'default' => 'Inbox', 'help'=>'Example: INBOX'),
         //'filter' => array('type'=>'text', 'label'=>'Filter', 'visible'=>1, 'enabled'=>1, 'position'=>105),
@@ -173,6 +174,7 @@ class EmailCollector extends CommonObject
 
 
     public $host;
+    public $hostcharset;
     public $login;
     public $password;
     public $source_directory;
@@ -985,9 +987,10 @@ class EmailCollector extends CommonObject
         $nbemailprocessed = 0;
         $nbemailok = 0;
         $nbactiondone = 0;
+        $charset = ($this->hostcharset ? $this->hostcharset : "UTF-8");
 
         // Scan IMAP inbox
-        $arrayofemail = imap_search($connection, $search, null, "UTF-8");
+        $arrayofemail = imap_search($connection, $search, null, $charset);
         if ($arrayofemail === false)
         {
             // Nothing found or search string not understood
@@ -1086,6 +1089,7 @@ class EmailCollector extends CommonObject
                 }
 
                 $header = imap_fetchheader($connection, $imapemail, 0);
+                $header = preg_replace('/\r\n\s+/m', ' ', $header);	// When a header line is on several lines, merge lines
                 $matches = array();
                 preg_match_all('/([^: ]+): (.+?(?:\r\n\s(?:.+?))*)\r\n/m', $header, $matches);
                 $headers = array_combine($matches[1], $matches[2]);
@@ -1132,7 +1136,10 @@ class EmailCollector extends CommonObject
                 // Can use also imap_mime_header_decode($str)
                 // Can use also mb_decode_mimeheader($str)
                 // Can use also iconv_mime_decode($str, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8')
-                if (function_exists('imap_mime_header_decode')) {
+                if (function_exists('iconv_mime_decode')) {
+                	$overview[0]->subject = iconv_mime_decode($overview[0]->subject, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');
+                }
+                elseif (function_exists('imap_mime_header_decode')) {
                 	$elements = imap_mime_header_decode($overview[0]->subject);
                 	$newstring = '';
                 	if (!empty($elements)) {
@@ -1146,6 +1153,8 @@ class EmailCollector extends CommonObject
                 elseif (function_exists('mb_decode_mimeheader')) {
                 	$overview[0]->subject = mb_decode_mimeheader($overview[0]->subject);
                 }
+                // Removed emojis
+                $overview[0]->subject = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $overview[0]->subject);
 
                 // Parse IMAP email structure
                 global $htmlmsg, $plainmsg, $charset, $attachments;
@@ -1153,6 +1162,9 @@ class EmailCollector extends CommonObject
 
                 //$htmlmsg,$plainmsg,$charset,$attachments
                 $messagetext = $plainmsg ? $plainmsg : dol_string_nohtmltag($htmlmsg, 0);
+                // Removed emojis
+                $messagetext = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $messagetext);
+
                 /*var_dump($plainmsg);
                 var_dump($htmlmsg);
                 var_dump($messagetext);*/
diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 8a68e763160..7daf41a05d3 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -285,3 +285,5 @@ ALTER TABLE llx_prelevement_facture ADD COLUMN fk_facture_fourn INTEGER NULL;
 ALTER TABLE llx_menu MODIFY COLUMN module varchar(255);
 
 UPDATE llx_actioncomm SET fk_action = 50 where fk_action = 40 AND code = 'TICKET_MSG'; 
+
+ALTER TABLE llx_emailcollector_emailcollector ADD COLUMN hostcharset varchar(16) DEFAULT 'UTF-8';
diff --git a/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql b/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
index 10f3e4f8b9b..87581f418e8 100644
--- a/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
+++ b/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
@@ -21,7 +21,8 @@ CREATE TABLE llx_emailcollector_emailcollector(
         ref varchar(128) NOT NULL,
         label varchar(255), 
         description text,
-        host varchar(255), 
+        host varchar(255),
+        hostcharset varchar(16) DEFAULT 'UTF-8',
         login varchar(128), 
         password varchar(128),
         source_directory varchar(255) NOT NULL,
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1bd7f3d0297..5ce79a12231 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web server user/group
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Module <b>%s</b> must be enabled

From ae0e6e4dc8e449be6c0354d1849bc71f80c35355 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 14:10:04 +0200
Subject: [PATCH 192/490] FIX dol_concatdesc to escape < Better help

---
 htdocs/admin/emailcollector_card.php                 | 4 ++--
 htdocs/core/class/translate.class.php                | 2 +-
 htdocs/core/lib/functions.lib.php                    | 9 +++++----
 htdocs/emailcollector/class/emailcollector.class.php | 9 +++++++--
 htdocs/langs/en_US/admin.lang                        | 2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index 74592ff777a..80161eaadc6 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -592,7 +592,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<input type="text" name="operationparam">';
 	$htmltext = $langs->transnoentitiesnoconv("OperationParamDesc");
 	//var_dump($htmltext);
-	print $form->textwithpicto('', $htmltext);
+	print $form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'operationparamtt');
 	print '</td>';
 	print '<td></td>';
 	print '<td class="right"><input type="submit" name="addoperation" id="addoperation" class="flat button" value="'.$langs->trans("Add").'"></td>';
@@ -643,7 +643,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '</td>';
 		// Delete
 		print '<td class="right nowraponall">';
-		print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editoperation&operationid='.$ruleaction['id'].'">'.img_edit().'</a>';
+		print '<a class="editfielda marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editoperation&operationid='.$ruleaction['id'].'">'.img_edit().'</a>';
 		print ' <a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deleteoperation&operationid='.$ruleaction['id'].'">'.img_delete().'</a>';
 		print '</td>';
 		print '</tr>';
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 4f3930a4588..3fc3151030a 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -308,7 +308,7 @@ class Translate
 									    continue;
 									}
 									else {
-										// Convert some strings: Parse and render carriage returns. Also, change '\\s' int '\s' because transifex sync pull the string '\s' into string '\\s'
+										// Convert some strings: Parse and render carriage returns. Also, change '\\s' into '\s' because transifex sync pull the string '\s' into string '\\s'
 										$this->tab_translate[$key] = str_replace(array('\\n', '\\\\s'), array("\n", '\s'), $value);
 										if ($usecachekey) {
 											$tabtranslatedomain[$key] = $value;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 20094da216c..31716dc3f3c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5794,7 +5794,8 @@ function dolGetFirstLineOfText($text, $nboflines = 1, $charset = 'UTF-8')
 
 
 /**
- * Replace CRLF in string with a HTML BR tag
+ * Replace CRLF in string with a HTML BR tag.
+ * WARNING: The content after operation contains some HTML tags (the <br>) so be sure to also have encode the special chars of stringtoencode into HTML before.
  *
  * @param	string	$stringtoencode		String to encode
  * @param	int     $nl2brmode			0=Adding br before \n, 1=Replacing \n by br
@@ -6048,7 +6049,7 @@ function dol_textishtml($msg, $option = 0)
  *
  *  @param  string  $text1          Text 1
  *  @param  string  $text2          Text 2
- *  @param  bool    $forxml         false=Use <br>instead of \n if html content detected, true=Use <br /> instead of \n if html content detected
+ *  @param  bool    $forxml         true=Use <br /> instead of <br> if we have to add a br tag
  *  @param  bool    $invert         invert order of description lines (we often use config MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION in this parameter)
  *  @return string                  Text 1 + new line + Text2
  *  @see    dol_textishtml()
@@ -6063,9 +6064,9 @@ function dol_concatdesc($text1, $text2, $forxml = false, $invert = false)
     }
 
     $ret = '';
-    $ret .= (!dol_textishtml($text1) && dol_textishtml($text2)) ?dol_nl2br($text1, 0, $forxml) : $text1;
+    $ret .= (!dol_textishtml($text1) && dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text1, 0, 1, '', 1), 0, $forxml) : $text1;
     $ret .= (!empty($text1) && !empty($text2)) ? ((dol_textishtml($text1) || dol_textishtml($text2)) ? ($forxml ? "<br \>\n" : "<br>\n") : "\n") : "";
-    $ret .= (dol_textishtml($text1) && !dol_textishtml($text2)) ?dol_nl2br($text2, 0, $forxml) : $text2;
+    $ret .= (dol_textishtml($text1) && !dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text2, 0, 1, '', 1), 0, $forxml) : $text2;
     return $ret;
 }
 
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 969b83cac5a..2bc6d6db962 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -937,8 +937,8 @@ class EmailCollector extends CommonObject
         }
         imap_errors(); // Clear stack of errors.
 
-        // $conf->global->MAIL_PREFIX_FOR_EMAIL_ID must be defined
         $host = dol_getprefix('email');
+		//$host = '123456';
 
         // Define the IMAP search string
         // See https://tools.ietf.org/html/rfc3501#section-6.4.4 for IMAPv4 (PHP not yet compatible)
@@ -1081,6 +1081,7 @@ class EmailCollector extends CommonObject
 
             dol_syslog("Start of loop on email", LOG_INFO, 1);
 
+            $i = 0;
             foreach ($arrayofemail as $imapemail)
             {
                 if ($nbemailprocessed > 1000)
@@ -1088,6 +1089,8 @@ class EmailCollector extends CommonObject
                     break; // Do not process more than 1000 email per launch (this is a different protection than maxnbcollectedpercollect
                 }
 
+                $i++;
+
                 $header = imap_fetchheader($connection, $imapemail, 0);
                 $header = preg_replace('/\r\n\s+/m', ' ', $header);	// When a header line is on several lines, merge lines
                 $matches = array();
@@ -1095,6 +1098,8 @@ class EmailCollector extends CommonObject
                 $headers = array_combine($matches[1], $matches[2]);
                 //var_dump($headers);
 
+                dol_syslog("** Process email ".$i." References: ".$headers['References']);
+
                 // If there is a filter on trackid
                 if ($searchfilterdoltrackid > 0)
                 {
@@ -1130,7 +1135,7 @@ class EmailCollector extends CommonObject
                 // GET Email meta datas
                 $overview = imap_fetch_overview($connection, $imapemail, 0);
 
-                dol_syslog("** Process email - msgid=".$overview[0]->message_id." date=".dol_print_date($overview[0]->udate, 'dayrfc', 'gmt')." subject=".$overview[0]->subject);
+                dol_syslog("msgid=".$overview[0]->message_id." date=".dol_print_date($overview[0]->udate, 'dayrfc', 'gmt')." subject=".$overview[0]->subject);
 
                 // Decode $overview[0]->subject according to RFC2047
                 // Can use also imap_mime_header_decode($str)
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 5ce79a12231..6c139a0f10c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1939,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\s([^\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\s*([^\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\s([^\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module

From 9a8e9bdc99ccec244b6b8ae43c5869f0192789a1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 14:29:14 +0200
Subject: [PATCH 193/490] Position of fields

---
 htdocs/index.php                 | 4 ++--
 htdocs/theme/eldy/global.inc.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/index.php b/htdocs/index.php
index 36aae1f25b8..7f6e462839b 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -142,11 +142,11 @@ if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
     		'orders',
     		'invoices',
     		'donations',
-    		'contracts',
-    		'interventions',
     		'supplier_proposals',
     		'supplier_orders',
     		'supplier_invoices',
+    		'contracts',
+    		'interventions',
     		'ticket'
     	);
 
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 2f5e10c1459..afb154408c5 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3643,7 +3643,7 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 	box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.20);
 }
 span.boxstatstext {
-	opacity: 0.7;
+	opacity: 0.5;
     line-height: 18px;
     color: var(--colortext);
 }

From 68512e0281da45963a89c6ce890c080062fc61e2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 14:56:15 +0200
Subject: [PATCH 194/490] Look and feel v12

---
 .../core/boxes/box_accountancy_last_manual_entries.php |  5 ++++-
 htdocs/core/boxes/box_boms.php                         |  5 ++++-
 htdocs/core/boxes/box_clients.php                      |  5 ++++-
 htdocs/core/boxes/box_commandes.php                    |  5 ++++-
 htdocs/core/boxes/box_factures_imp.php                 |  5 ++++-
 htdocs/core/boxes/box_ficheinter.php                   |  9 ++++++---
 htdocs/core/boxes/box_fournisseurs.php                 |  2 +-
 htdocs/core/boxes/box_goodcustomers.php                |  5 ++++-
 htdocs/core/boxes/box_mos.php                          |  5 ++++-
 htdocs/core/boxes/box_prospect.php                     |  4 ++--
 htdocs/core/boxes/box_services_contracts.php           |  5 ++++-
 htdocs/core/boxes/box_shipments.php                    |  5 ++++-
 htdocs/core/tools.php                                  |  2 +-
 htdocs/install/default.css                             |  2 +-
 htdocs/install/step5.php                               | 10 +++++-----
 15 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/htdocs/core/boxes/box_accountancy_last_manual_entries.php b/htdocs/core/boxes/box_accountancy_last_manual_entries.php
index f1ee00c6c59..6198c90e663 100644
--- a/htdocs/core/boxes/box_accountancy_last_manual_entries.php
+++ b/htdocs/core/boxes/box_accountancy_last_manual_entries.php
@@ -140,7 +140,10 @@ class box_accountancy_last_manual_entries extends ModeleBoxes
                     $line++;
                 }
 
-                if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'class="center"', 'text'=>$langs->trans("NoRecordedManualEntries"));
+                if ($num == 0) $this->info_box_contents[$line][0] = array(
+                	'td' => 'class="center opacitymedium"',
+                	'text'=>$langs->trans("NoRecordedManualEntries")
+                );
 
                 $this->db->free($result);
             } else {
diff --git a/htdocs/core/boxes/box_boms.php b/htdocs/core/boxes/box_boms.php
index 57c5ce2e2e2..c75c4c24e8f 100644
--- a/htdocs/core/boxes/box_boms.php
+++ b/htdocs/core/boxes/box_boms.php
@@ -153,7 +153,10 @@ class box_boms extends ModeleBoxes
                     $line++;
                 }
 
-                if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'class="center"', 'text'=>$langs->trans("NoRecordedOrders"));
+                if ($num == 0) $this->info_box_contents[$line][0] = array(
+                	'td' => 'class="center opacitymedium"',
+                	'text'=>$langs->trans("NoRecordedOrders")
+                );
 
                 $this->db->free($result);
             } else {
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index d82a4aee71e..70718db55b5 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -148,7 +148,10 @@ class box_clients extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'class="center"', 'text'=>$langs->trans("NoRecordedCustomers"));
+				if ($num == 0) $this->info_box_contents[$line][0] = array(
+					'td' => 'class="center opacitymedium"',
+					'text'=>$langs->trans("NoRecordedCustomers")
+				);
 
 				$this->db->free($result);
 			}
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index 37a25c8084d..7ec5071b6e3 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -174,7 +174,10 @@ class box_commandes extends ModeleBoxes
                     $line++;
                 }
 
-                if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'class="center"', 'text'=>$langs->trans("NoRecordedOrders"));
+                if ($num == 0) $this->info_box_contents[$line][0] = array(
+                	'td' => 'class="center opacitymedium"',
+                	'text'=>$langs->trans("NoRecordedOrders")
+                );
 
                 $this->db->free($result);
             } else {
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 0a44105a853..a374094ea89 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -180,7 +180,10 @@ class box_factures_imp extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'class="center"', 'text'=>$langs->trans("NoUnpaidCustomerBills"));
+				if ($num == 0) $this->info_box_contents[$line][0] = array(
+					'td' => 'class="center opacitymedium"',
+					'text'=>$langs->trans("NoUnpaidCustomerBills")
+				);
 
 				$this->db->free($result);
 			}
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index e289c83d541..4125ce92eaa 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -145,13 +145,16 @@ class box_ficheinter extends ModeleBoxes
 					$i++;
 				}
 
-				if ($num == 0) $this->info_box_contents[$i][] = array('td' => 'class="center"', 'text'=>$langs->trans("NoRecordedInterventions"));
+				if ($num == 0) $this->info_box_contents[$i][0] = array(
+					'td' => 'class="center opacitymedium"',
+					'text'=>$langs->trans("NoRecordedInterventions")
+				);
 
 				$this->db->free($resql);
 			}
 			else
 			{
-				$this->info_box_contents[0][] = array(
+				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql),
@@ -160,7 +163,7 @@ class box_ficheinter extends ModeleBoxes
 		}
 		else
 		{
-			$this->info_box_contents[0][] = array(
+			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
 			    'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 2f55a379362..44dd891bfb8 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -136,7 +136,7 @@ class box_fournisseurs extends ModeleBoxes
                 }
 
                 if ($num == 0) $this->info_box_contents[$line][0] = array(
-                    'td' => 'class="center"',
+                    'td' => 'class="center opacitymedium"',
                     'text'=>$langs->trans("NoRecordedSuppliers"),
                 );
 
diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index 79eb6f9ab8e..46dfdff6d23 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -142,7 +142,10 @@ class box_goodcustomers extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'class="center"', 'text'=>$langs->trans("NoRecordedCustomers"));
+				if ($num == 0) $this->info_box_contents[$line][0] = array(
+					'td' => 'class="center opacitymedium"',
+					'text'=>$langs->trans("NoRecordedCustomers")
+				);
 
 				$this->db->free($result);
 			}
diff --git a/htdocs/core/boxes/box_mos.php b/htdocs/core/boxes/box_mos.php
index 9b863aa2d5a..ec21d5d00cf 100644
--- a/htdocs/core/boxes/box_mos.php
+++ b/htdocs/core/boxes/box_mos.php
@@ -149,7 +149,10 @@ class box_mos extends ModeleBoxes
                     $line++;
                 }
 
-                if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'class="center"', 'text'=>$langs->trans("NoRecordedOrders"));
+                if ($num == 0) $this->info_box_contents[$line][0] = array(
+                	'td' => 'class="center opacitymedium"',
+                	'text'=>$langs->trans("NoRecordedOrders")
+                );
 
                 $this->db->free($result);
             } else {
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 54ed1c76051..1024ef1d4ec 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -149,8 +149,8 @@ class box_prospect extends ModeleBoxes
 
                 if ($num == 0) {
                     $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoRecordedProspects"),
+                        'td' => 'class="center opacitymedium"',
+                        'text'=> $langs->trans("NoRecordedProspects"),
                     );
                 }
 
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index f8e6dd22452..7167097672b 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -223,7 +223,10 @@ class box_services_contracts extends ModeleBoxes
 
 					$i++;
 				}
-				if ($num == 0) $this->info_box_contents[$i][0] = array('td' => 'class="center"', 'text'=>$langs->trans("NoContractedProducts"));
+				if ($num == 0) $this->info_box_contents[$i][0] = array(
+					'td' => 'class="center opacitymedium"',
+					'text'=>$langs->trans("NoContractedProducts")
+				);
 
 				$this->db->free($result);
 			}
diff --git a/htdocs/core/boxes/box_shipments.php b/htdocs/core/boxes/box_shipments.php
index 26f45bc08db..278ad974cf5 100644
--- a/htdocs/core/boxes/box_shipments.php
+++ b/htdocs/core/boxes/box_shipments.php
@@ -158,7 +158,10 @@ class box_shipments extends ModeleBoxes
                     $line++;
                 }
 
-                if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'class="center"', 'text'=>$langs->trans("NoRecordedShipments"));
+                if ($num == 0) $this->info_box_contents[$line][0] = array(
+                	'td' => 'class="center opacitymedium"',
+                	'text'=>$langs->trans("NoRecordedShipments")
+                );
 
                 $this->db->free($result);
             } else {
diff --git a/htdocs/core/tools.php b/htdocs/core/tools.php
index 348417dd345..accb8eeed00 100644
--- a/htdocs/core/tools.php
+++ b/htdocs/core/tools.php
@@ -46,7 +46,7 @@ $text = $langs->trans("Tools");
 print load_fiche_titre($text, '', 'wrench');
 
 // Show description of content
-print '<div class="justify">'.$langs->trans("ToolsDesc").'</div><br><br>';
+print '<div class="justify opacitymedium">'.$langs->trans("ToolsDesc").'</div><br><br>';
 
 
 // Show logo
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index f0e51caecab..f363789c129 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -53,7 +53,7 @@ div.titre {
 }
 
 span.titre {
-	font-weight: bold;
+	/* font-weight: bold; */
 	background: #FFFFFF;
 	color: rgb(0,113,121);
 	border: 1px solid #bbb;
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index 1609035e415..b74594ce8da 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -384,10 +384,10 @@ if ($action == "set" && $success)
 
 		print "<br>";
 
-		print $langs->trans("YouNeedToPersonalizeSetup")."<br><br>";
+		print $langs->trans("YouNeedToPersonalizeSetup")."<br><br><br>";
 
 		print '<div class="center"><a href="../admin/index.php?mainmenu=home&leftmenu=setup'.(isset($login) ? '&username='.urlencode($login) : '').'">';
-		print $langs->trans("GoToSetupArea");
+		print '<span class="fas fa-external-link-alt"></span> '.$langs->trans("GoToSetupArea");
 		print '</a></div>';
 	}
 	else
@@ -399,7 +399,7 @@ if ($action == "set" && $success)
 		print "<br>";
 
 		print '<div class="center"><a href="'.$dolibarr_main_url_root.'/install/index.php">';
-		print $langs->trans("GoToUpgradePage");
+		print '<span class="fas fa-link-alt"></span> '.$langs->trans("GoToUpgradePage");
 		print '</a></div>';
 	}
 }
@@ -435,7 +435,7 @@ elseif (empty($action) || preg_match('/upgrade/i', $action))
 		print "<br><br>";
 
 		print '<div class="center"><a href="../index.php?mainmenu=home'.(isset($login) ? '&username='.urlencode($login) : '').'">';
-		print $langs->trans("GoToDolibarr").'...';
+		print '<span class="fas fa-link-alt"></span> '.$langs->trans("GoToDolibarr").'...';
 		print '</a></div><br>';
 	}
 	else
@@ -447,7 +447,7 @@ elseif (empty($action) || preg_match('/upgrade/i', $action))
 		print "<br>";
 
 		print '<div class="center"><a href="../install/index.php">';
-		print $langs->trans("GoToUpgradePage");
+		print '<span class="fas fa-link-alt"></span> '.$langs->trans("GoToUpgradePage");
 		print '</a></div>';
 	}
 }

From 6ec5dd02b61a21154b55812660f09b57b87994dd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 15:27:10 +0200
Subject: [PATCH 195/490] Fix Fatal error with bad triggers

---
 htdocs/core/class/interfaces.class.php        | 89 +++++++++++--------
 htdocs/core/modules/DolibarrModules.class.php | 10 ++-
 .../interface_80_modStripe_Stripe.class.php   |  2 +-
 htdocs/theme/eldy/info-box.inc.php            |  4 +-
 4 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index f1daafeb9e7..9302ed09afb 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -328,48 +328,59 @@ class Interfaces
                 continue;
             }
 
-            $objMod = new $modName($db);
+            try {
+	            $objMod = new $modName($db);
 
-            // Define disabledbyname and disabledbymodule
-            $disabledbyname = 0;
-            $disabledbymodule = 1;
-            $module = '';
+	            if (is_subclass_of($objMod, 'DolibarrTriggers'))
+	            {
+		            // Define disabledbyname and disabledbymodule
+		            $disabledbyname = 0;
+		            $disabledbymodule = 1;
+		            $module = '';
 
-            // Check if trigger file is disabled by name
-            if (preg_match('/NORUN$/i', $files[$key])) $disabledbyname = 1;
-            // Check if trigger file is for a particular module
-            if (preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/i', $files[$key], $reg))
-            {
-                $module = preg_replace('/^mod/i', '', $reg[2]);
-                $constparam = 'MAIN_MODULE_'.strtoupper($module);
-                if (strtolower($module) == 'all') $disabledbymodule = 0;
-                elseif (empty($conf->global->$constparam)) $disabledbymodule = 2;
-                $triggers[$j]['module'] = strtolower($module);
+		            // Check if trigger file is disabled by name
+		            if (preg_match('/NORUN$/i', $files[$key])) $disabledbyname = 1;
+		            // Check if trigger file is for a particular module
+		            if (preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/i', $files[$key], $reg))
+		            {
+		                $module = preg_replace('/^mod/i', '', $reg[2]);
+		                $constparam = 'MAIN_MODULE_'.strtoupper($module);
+		                if (strtolower($module) == 'all') $disabledbymodule = 0;
+		                elseif (empty($conf->global->$constparam)) $disabledbymodule = 2;
+		                $triggers[$j]['module'] = strtolower($module);
+		            }
+
+		            // We set info of modules
+		            $triggers[$j]['picto'] = $objMod->picto ?img_object('', $objMod->picto, 'class="valignmiddle pictomodule "') : img_object('', 'generic', 'class="valignmiddle pictomodule "');
+		            $triggers[$j]['file'] = $files[$key];
+		            $triggers[$j]['fullpath'] = $fullpath[$key];
+		            $triggers[$j]['relpath'] = $relpath[$key];
+		            $triggers[$j]['iscoreorexternal'] = $iscoreorexternal[$key];
+		            $triggers[$j]['version'] = $objMod->getVersion();
+		            $triggers[$j]['status'] = img_picto($langs->trans("Active"), 'tick');
+		            if ($disabledbyname > 0 || $disabledbymodule > 1) $triggers[$j]['status'] = '';
+
+		            $text = '<b>'.$langs->trans("Description").':</b><br>';
+		            $text .= $objMod->getDesc().'<br>';
+		            $text .= '<br><b>'.$langs->trans("Status").':</b><br>';
+		            if ($disabledbyname == 1)
+		            {
+		                $text .= $langs->trans("TriggerDisabledByName").'<br>';
+		                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
+		            }
+		            else
+		            {
+		                if ($disabledbymodule == 0) $text .= $langs->trans("TriggerAlwaysActive").'<br>';
+		                if ($disabledbymodule == 1) $text .= $langs->trans("TriggerActiveAsModuleActive", $module).'<br>';
+		                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
+		            }
+	            }
+	            else {
+	            	print 'Error: Trigger '.$modName.' does not extends DolibarrTriggers<br>';
+	            }
             }
-
-            // We set info of modules
-            $triggers[$j]['picto'] = $objMod->picto ?img_object('', $objMod->picto, 'class="valignmiddle pictomodule "') : img_object('', 'generic', 'class="valignmiddle pictomodule "');
-            $triggers[$j]['file'] = $files[$key];
-            $triggers[$j]['fullpath'] = $fullpath[$key];
-            $triggers[$j]['relpath'] = $relpath[$key];
-            $triggers[$j]['iscoreorexternal'] = $iscoreorexternal[$key];
-            $triggers[$j]['version'] = $objMod->getVersion();
-            $triggers[$j]['status'] = img_picto($langs->trans("Active"), 'tick');
-            if ($disabledbyname > 0 || $disabledbymodule > 1) $triggers[$j]['status'] = '';
-
-            $text = '<b>'.$langs->trans("Description").':</b><br>';
-            $text .= $objMod->getDesc().'<br>';
-            $text .= '<br><b>'.$langs->trans("Status").':</b><br>';
-            if ($disabledbyname == 1)
-            {
-                $text .= $langs->trans("TriggerDisabledByName").'<br>';
-                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
-            }
-            else
-            {
-                if ($disabledbymodule == 0) $text .= $langs->trans("TriggerAlwaysActive").'<br>';
-                if ($disabledbymodule == 1) $text .= $langs->trans("TriggerActiveAsModuleActive", $module).'<br>';
-                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
+            catch(Exception $e) {
+            	print $e->getMessage();
             }
 
             $triggers[$j]['info'] = $text;
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 9543cf74442..f9d27fedfa4 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -2295,9 +2295,11 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		{
 			print img_object($alttext, 'generic', 'class="inline-block valignmiddle"');
 		}
-		print '<span class="info-box-icon-version" title="'.$langs->trans("Version").' '.$this->getVersion(1).'">';
-		print $this->getVersion(1);
-		print '</span>';
+		if ($this->isCoreOrExternalModule() == 'external') {
+			print '<span class="info-box-icon-version" title="'.$langs->trans("Version").' '.$this->getVersion(1).'">';
+			print $this->getVersion(1);
+			print '</span>';
+		}
 
 		/*print '<span class="info-box-icon-action">';
 		print '<div class="valignmiddle inline-block">';
@@ -2313,7 +2315,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 		print '</div>
 	    <div class="info-box-content info-box-text-module">
-	    <span class="info-box-title">'.$this->getName().'</span>
+	    <span class="info-box-title marginbottomonly">'.$this->getName().'</span>
 	    <span class="info-box-desc twolinesmax opacitymedium" title="'.dol_escape_htmltag($this->getDesc()).'">'.nl2br($this->getDesc()).'</span>';
 
 		/*print '<span class="info-box-icon-version" title="'.$langs->trans("Version").' '.$this->getVersion(1).'">';
diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index 27138e6099f..e6c2df36ee1 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
 /**
  *  Class of triggers for stripe module
  */
-class InterfaceStripe
+class InterfaceStripe extends DolibarrTriggers
 {
     /**
      * @var DoliDB Database handler.
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 3138cd8bfd9..3d9c392f32b 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -8,7 +8,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
  */
 
 .info-box-module-external span.info-box-icon-version {
-    background: #999;
+    background: #bbb;
 }
 
 .info-box {
@@ -74,7 +74,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
     height: 80px;
     width: 80px;
     font-size: 25px;
-    line-height: 80px;
+    line-height: 100px;
 }
 .info-box-module .info-box-icon {
 	height: 106px;

From 7c01b54d73237b39e8ee45ca0e5784ba8c666adc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 15:42:37 +0200
Subject: [PATCH 196/490] Fix version on module list

---
 htdocs/admin/modules.php                      |  4 +++-
 htdocs/core/modules/DolibarrModules.class.php | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 6a0ff450346..c0f1991835b 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -680,7 +680,9 @@ if ($mode == 'common' || $mode == 'commonkanban')
 		if (preg_match('/development/i', $version))  $versiontrans .= img_warning($langs->trans("Development"), 'style="float: left"');
 		if (preg_match('/experimental/i', $version)) $versiontrans .= img_warning($langs->trans("Experimental"), 'style="float: left"');
 		if (preg_match('/deprecated/i', $version))   $versiontrans .= img_warning($langs->trans("Deprecated"), 'style="float: left"');
-		$versiontrans .= $objMod->getVersion(1);
+		if ($objMod->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
+			$versiontrans .= $objMod->getVersion(1);
+		}
 
 		// Define imginfo
 		$imginfo = "info";
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index f9d27fedfa4..384c4fc3a7e 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -2295,8 +2295,14 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		{
 			print img_object($alttext, 'generic', 'class="inline-block valignmiddle"');
 		}
-		if ($this->isCoreOrExternalModule() == 'external') {
-			print '<span class="info-box-icon-version" title="'.$langs->trans("Version").' '.$this->getVersion(1).'">';
+
+		$version = $this->getVersion(0);
+		$versiontrans = '';
+		if (preg_match('/development/i', $version))  $versiontrans .= 'warning';
+		if (preg_match('/experimental/i', $version)) $versiontrans .= 'warning';
+		if (preg_match('/deprecated/i', $version))   $versiontrans .= 'warning';
+		if ($this->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
+			print '<span class="info-box-icon-version'.($versiontrans? ' '.$versiontrans : '').'" title="'.$langs->trans("Version").' '.$this->getVersion(1).'">';
 			print $this->getVersion(1);
 			print '</span>';
 		}

From 3d26351c6b4de6444a4f7230cbfa0d93d165e7e5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 16:03:31 +0200
Subject: [PATCH 197/490] Fix function if hours.

---
 htdocs/core/lib/date.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index ae138bcceec..a751f584564 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -912,7 +912,7 @@ function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0,
 
 		$nbOpenDay=$lastday;
 
-		if ($inhour == 1) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
+		if ($inhour == 1) $nbOpenDay = ($nbOpenDay * 24);
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
 	}
 	else

From b26c1757e6ab26142aa57ab27e53cb847db47b93 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 16:07:23 +0200
Subject: [PATCH 198/490] Prepare v13

---
 .../install/mysql/migration/12.0.0-13.0.0.sql | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 htdocs/install/mysql/migration/12.0.0-13.0.0.sql

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
new file mode 100644
index 00000000000..210fe31d1ef
--- /dev/null
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -0,0 +1,36 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 13.0.0 or higher.
+--
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To create a unique index ALTER TABLE llx_table ADD UNIQUE INDEX uk_table_field (field);
+-- To drop an index:        -- VMYSQL4.1 DROP INDEX nomindex on llx_table
+-- To drop an index:        -- VPGSQL8.2 DROP INDEX nomindex
+-- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_table CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres):
+-- -- VPGSQL8.2 CREATE SEQUENCE llx_table_rowid_seq OWNED BY llx_table.rowid;
+-- -- VPGSQL8.2 ALTER TABLE llx_table ADD PRIMARY KEY (rowid);
+-- -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN rowid SET DEFAULT nextval('llx_table_rowid_seq');
+-- -- VPGSQL8.2 SELECT setval('llx_table_rowid_seq', MAX(rowid)) FROM llx_table;
+-- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
+-- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
+-- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
+-- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- Note: fields with type BLOB/TEXT can't have default value.
+
+
+-- Missing in v12
+
+
+-- For v13
+
+

From 9becb24073c6fc90230289ee0b33170ff517d6a1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 16:40:40 +0200
Subject: [PATCH 199/490] Prepare v13

---
 htdocs/filefunc.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 0780154118e..b70419de5f4 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -31,7 +31,7 @@
  */
 
 if (!defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE', 'Dolibarr');
-if (!defined('DOL_VERSION')) define('DOL_VERSION', '12.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+if (!defined('DOL_VERSION')) define('DOL_VERSION', '13.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 
 if (!defined('EURO')) define('EURO', chr(128));
 

From 215cf9e6f804cba007c44cc7c08a68e3b2b38a9a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 16:45:32 +0200
Subject: [PATCH 200/490] Prepare v13

---
 htdocs/install/check.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 95e3082cb56..408f4b2a1a8 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -479,7 +479,8 @@ else
 								array('from'=>'8.0.0', 'to'=>'9.0.0'),
 								array('from'=>'9.0.0', 'to'=>'10.0.0'),
 								array('from'=>'10.0.0', 'to'=>'11.0.0'),
-								array('from'=>'11.0.0', 'to'=>'12.0.0')
+								array('from'=>'11.0.0', 'to'=>'12.0.0'),
+								array('from'=>'12.0.0', 'to'=>'13.0.0')
 		);
 
 		$count = 0;

From 499c2ea30a63c4b5b575576ce02f37f7e554e9b4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 16:52:21 +0200
Subject: [PATCH 201/490] FIX #13855

---
 htdocs/core/lib/ajax.lib.php | 2 +-
 htdocs/main.inc.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 64f442633de..1d3e80b90be 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -20,7 +20,7 @@
 
 /**
  *  \file		htdocs/core/lib/ajax.lib.php
- *  \brief		Page called by Ajax request for produts
+ *  \brief		Page called to enhance interface with Javascript and Ajax features.
  */
 
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index d4d1f84a344..49c48e34ec1 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -317,7 +317,7 @@ if (!defined('NOLOGIN') && !defined('NOIPCHECK') && !empty($dolibarr_main_restri
 
 // Loading of additional presentation includes
 if (!defined('NOREQUIREHTML')) require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; // Need 660ko memory (800ko in 2.2)
-if (!defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; // Need 22ko memory
+require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; // Need 22ko memory
 
 // If install or upgrade process not done or not completely finished, we call the install page.
 if (!empty($conf->global->MAIN_NOT_INSTALLED) || !empty($conf->global->MAIN_NOT_UPGRADED))

From 949e0f2326a6f3268b511110903aec472315b5b4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 17:27:12 +0200
Subject: [PATCH 202/490] Fix filter on language

---
 htdocs/website/class/websitepage.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 84eaf0efb27..c63823f51a1 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -332,7 +332,11 @@ class WebsitePage extends CommonObject
 				if ($key == 't.rowid' || $key == 't.fk_website') {
 					$sqlwhere[] = $key.'='.$value;
 				} elseif ($key == 'lang' || $key == 't.lang') {
-					$sqlwhere[] = $key." = '".$this->db->escape(substr($value, 0, 2))."'";
+					$listoflang = array();
+					foreach(explode(',', $value) as $tmpvalue) {
+						$listoflang[] = "'".$this->db->escape(substr(str_replace("'", '', $tmpvalue), 0, 2))."'";
+					}
+					$sqlwhere[] = $key." IN (".join(',', $listoflang).")";
 				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}

From 991996697dd5e1f529d9e1a36eff465e4256ebf3 Mon Sep 17 00:00:00 2001
From: "jove@bisquerra.com" <jove@bisquerra.com>
Date: Thu, 14 May 2020 18:03:22 +0200
Subject: [PATCH 203/490] Public photos for customers with TakePOS

---
 htdocs/takepos/genimg/index.php      |  6 +++---
 htdocs/takepos/phone.php             |  4 ++--
 htdocs/takepos/public/auto_order.php |  1 +
 htdocs/viewimage.php                 | 12 ++++++++++++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/htdocs/takepos/genimg/index.php b/htdocs/takepos/genimg/index.php
index a5686054193..c2bb62b9322 100644
--- a/htdocs/takepos/genimg/index.php
+++ b/htdocs/takepos/genimg/index.php
@@ -25,7 +25,7 @@ if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
 if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
 if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
 
-require '../../main.inc.php'; // Load $user and permissions
+if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) require '../../main.inc.php'; // Load $user and permissions
 
 $id = GETPOST('id', 'int');
 $w = GETPOST('w', 'int');
@@ -72,12 +72,12 @@ elseif ($query == "pro")
 
 	$objProd = new Product($db);
 	$objProd->fetch($id);
-	$image = $objProd->show_photos('product', $conf->product->multidir_output[$entity], 'small', 1);
+	$image = $objProd->show_photos('product', $conf->product->multidir_output[$objProd->entity], 'small', 1);
 
 	preg_match('@src="([^"]+)"@', $image, $match);
 	$file = array_pop($match);
 	if ($file == "") header('Location: ../../public/theme/common/nophoto.png');
-	else header('Location: '.$file.'&cache=1');
+	else header('Location: '.$file.'&cache=1&publictakepos=1');
 }
 else
 {
diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 8714173e45f..d506c64d2fc 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -77,7 +77,7 @@ if ($action=="productinfo"){
 	$prod = new Product($db);
     $prod->fetch($idproduct);
 	print "<b>".$prod->label."</b><br>";
-	print '<img class="imgwrapper" width="60%" src="'.DOL_URL_ROOT.'/takepos/genimg/index.php?query=pro&id='.$idproduct.'">';
+	print '<img class="imgwrapper" width="60%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=pro&query=pro&id='.$idproduct.'">';
 	print "<br>".$prod->description;
 	print "<br><b>".price($prod->price_ttc, 1, $langs, 1, -1, -1, $conf->currency)."</b>";
 	print '<br>';
@@ -95,7 +95,7 @@ elseif ($action=="editline"){
 			$prod = new Product($db);
 			$prod->fetch($line->fk_product);
 			print "<b>".$prod->label."</b><br>";
-			print '<img class="imgwrapper" width="60%" src="genimg/index.php?query=pro&id='.$line->fk_product.'">';
+			print '<img class="imgwrapper" width="60%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=pro&query=pro&id='.$line->fk_product.'">';
 			print "<br>".$prod->description;
 			print "<br><b>".price($prod->price_ttc, 1, $langs, 1, -1, -1, $conf->currency)."</b>";
 			print '<br>';
diff --git a/htdocs/takepos/public/auto_order.php b/htdocs/takepos/public/auto_order.php
index c7612711df0..910c00327b4 100644
--- a/htdocs/takepos/public/auto_order.php
+++ b/htdocs/takepos/public/auto_order.php
@@ -33,4 +33,5 @@ $_SESSION["takeposterminal"] = 1;
 
 define('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE', 1);
 if (GETPOSTISSET("mobilepage")) require '../invoice.php';
+elseif (GETPOSTISSET("genimg")) require DOL_DOCUMENT_ROOT.'/takepos/genimg/index.php';
 else require '../phone.php';
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 3cb23b36fbc..39795b62fd8 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -59,6 +59,14 @@ if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias'))
 	if (!defined("NOIPCHECK"))		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
 }
 
+// Used by TakePOS Auto Order
+if (isset($_GET["publictakepos"]))
+{
+	if (!defined("NOLOGIN"))		define("NOLOGIN", 1);
+	if (!defined("NOCSRFCHECK"))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+	if (!defined("NOIPCHECK"))		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
+
 // For multicompany
 $entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) define("DOLENTITY", $entity);
@@ -195,6 +203,10 @@ if (!empty($hashp))
 	$accessallowed = 1; // When using hashp, link is public so we force $accessallowed
 	$sqlprotectagainstexternals = '';
 }
+elseif ($conf->global->TAKEPOS_AUTO_ORDER && isset($_GET["publictakepos"]))
+{
+	$accessallowed = 1; // Only if TakePOS Public Auto Order is enabled and received publictakepos variable
+}
 else
 {
 	// Basic protection (against external users only)

From 1bf677f53735d66bbb4e0a7e9c9a8896ec99e95d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 18:14:55 +0200
Subject: [PATCH 204/490] Can set status of a websitepage

---
 htdocs/core/ajax/objectonoff.php         | 11 ++++++++---
 htdocs/core/class/commonobject.class.php |  5 ++++-
 htdocs/core/lib/security.lib.php         |  1 +
 htdocs/website/index.php                 | 14 +++++++++++++-
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index dd39bce6d4e..6466df89a07 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -43,9 +43,9 @@ if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
 
-if (empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+/*if (empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
 	accessforbidden('Calling this file is allowed only when MAIN_DIRECT_STATUS_UPDATE is set');
-}
+}*/
 
 
 /*
@@ -75,5 +75,10 @@ if (($action == 'set') && !empty($id)) {
 		$triggerkey = 'COMPANY_UPDATE';
 	}
 
-	$object->setValueFrom($field, $value, $element, $id, $user, $triggerkey);
+	$tablename = $element;
+	if ($tablename == 'websitepage') $tablename = 'website_page';
+
+	$format = 'int';
+
+	$object->setValueFrom($field, $value, $tablename, $id, $format, '', $user, $triggerkey);
 }
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f3f1b9eaee3..6148b55a5cf 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8070,7 +8070,10 @@ abstract class CommonObject
 	{
 		if (empty($id) && empty($ref) && empty($morewhere)) return -1;
 
-		$sql = 'SELECT '.$this->getFieldList();
+		$fieldlist = $this->getFieldList();
+		if (empty($fieldlist)) return 0;
+
+		$sql = 'SELECT '.$fieldlist;
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
 
 		if (!empty($id))  $sql .= ' WHERE rowid = '.$id;
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 6749f32ffbe..03f1525eb91 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -192,6 +192,7 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 	if ($features == 'mo') $features = 'mrp';
 	if ($features == 'member') $features = 'adherent';
 	if ($features == 'subscription') { $features = 'adherent'; $feature2 = 'cotisation'; };
+	if ($features == 'websitepage') $features = 'website';
 
 	// Get more permissions checks from hooks
 	$parameters = array('features'=>$features, 'objectid'=>$objectid, 'idtype'=>$dbt_select);
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 690dc0efe3b..ac26f2ee7bb 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -3170,6 +3170,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 		$pageauthorid = $objectpage->fk_user_creat;
 		$pageusermodifid = $objectpage->fk_user_modif;
 		$pageauthoralias = $objectpage->author_alias;
+ 		$pagestatus = $objectpage->status;
 	}
 	else
 	{
@@ -3178,6 +3179,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 		$pageauthorid = $user->id;
 		$pageusermodifid = 0;
 		$pageauthoralias = '';
+		$pagestatus = 1;
 	}
 	if (GETPOST('WEBSITE_TITLE', 'alpha'))       $pagetitle = GETPOST('WEBSITE_TITLE', 'alpha');
 	if (GETPOST('WEBSITE_PAGENAME', 'alpha'))    $pageurl = GETPOST('WEBSITE_PAGENAME', 'alpha');
@@ -3186,7 +3188,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	if (GETPOST('WEBSITE_IMAGE', 'alpha'))       $pageimage = GETPOST('WEBSITE_IMAGE', 'alpha');
 	if (GETPOST('WEBSITE_KEYWORDS', 'alpha'))    $pagekeywords = GETPOST('WEBSITE_KEYWORDS', 'alpha');
 	if (GETPOST('WEBSITE_LANG', 'aZ09'))         $pagelang = GETPOST('WEBSITE_LANG', 'aZ09');
-	if (GETPOST('htmlheader', 'none'))			$pagehtmlheader = GETPOST('htmlheader', 'none');
+	if (GETPOST('htmlheader', 'none'))			 $pagehtmlheader = GETPOST('htmlheader', 'none');
 
 	// Title
 	print '<tr><td class="fieldrequired">';
@@ -3381,6 +3383,16 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	print $doleditor->Create(1, '', true, 'HTML Header', 'html');
 	print '</td></tr>';
 
+	if ($action != 'createcontainer')
+	{
+		print '<tr><td>';
+		print $langs->trans('Status');
+		print '</td><td>';
+		print ajax_object_onoff($objectpage, 'status', 'status', 'Enabled', 'Disabled');
+		//print dol_print_date($pagedatecreation, 'dayhour');
+		print '</td></tr>';
+	}
+
 	print '</table>';
 	if ($action == 'createcontainer')
 	{

From 7daef0d146d1e5145ab44f6a46c52b15a5b525a8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 18:17:08 +0200
Subject: [PATCH 205/490] Fix bad parameters of function

---
 htdocs/core/ajax/objectonoff.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index dd39bce6d4e..f7bf1d6299c 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -75,5 +75,10 @@ if (($action == 'set') && !empty($id)) {
 		$triggerkey = 'COMPANY_UPDATE';
 	}
 
-	$object->setValueFrom($field, $value, $element, $id, $user, $triggerkey);
+	$tablename = $element;
+	if ($tablename == 'websitepage') $tablename = 'website_page';
+
+	$format = 'int';
+
+	$object->setValueFrom($field, $value, $tablename, $id, $format, '', $user, $triggerkey);
 }

From d8ee049b4c57491112ecfbbb42e9d3949e0d4468 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 18:41:31 +0200
Subject: [PATCH 206/490] Can select not defined language

---
 htdocs/website/class/websitepage.class.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index c63823f51a1..edf1eed51a7 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -333,10 +333,17 @@ class WebsitePage extends CommonObject
 					$sqlwhere[] = $key.'='.$value;
 				} elseif ($key == 'lang' || $key == 't.lang') {
 					$listoflang = array();
+					$foundnull = 0;
 					foreach(explode(',', $value) as $tmpvalue) {
+						if ($tmpvalue == 'null') {
+							$foundnull++;
+							continue;
+						}
 						$listoflang[] = "'".$this->db->escape(substr(str_replace("'", '', $tmpvalue), 0, 2))."'";
 					}
-					$sqlwhere[] = $key." IN (".join(',', $listoflang).")";
+					$stringtouse = $key." IN (".join(',', $listoflang).")";
+					if ($foundnull) $stringtouse = '('.$stringtouse.' OR '.$key.' IS NULL)';
+					$sqlwhere[] = $stringtouse;
 				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}

From 4cf7f68b6cbc3d3b7d2d9c9d0655468690f9214b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 18:44:05 +0200
Subject: [PATCH 207/490] Fix search on pages

---
 htdocs/website/class/websitepage.class.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index c63823f51a1..3e518d4d633 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -329,14 +329,23 @@ class WebsitePage extends CommonObject
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid' || $key == 't.fk_website') {
+				if ($key == 't.rowid' || $key == 't.fk_website' || $key == 'status') {
 					$sqlwhere[] = $key.'='.$value;
+				} elseif ($key == 'type_container') {
+					$sqlwhere[] = $key."='".$value."'";
 				} elseif ($key == 'lang' || $key == 't.lang') {
 					$listoflang = array();
+					$foundnull = 0;
 					foreach(explode(',', $value) as $tmpvalue) {
+						if ($tmpvalue == 'null') {
+							$foundnull++;
+							continue;
+						}
 						$listoflang[] = "'".$this->db->escape(substr(str_replace("'", '', $tmpvalue), 0, 2))."'";
 					}
-					$sqlwhere[] = $key." IN (".join(',', $listoflang).")";
+					$stringtouse = $key." IN (".join(',', $listoflang).")";
+					if ($foundnull) $stringtouse = '('.$stringtouse.' OR '.$key.' IS NULL)';
+					$sqlwhere[] = $stringtouse;
 				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}

From 40fa0933ebfe2e128e8282999e126c136f0c2511 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 18:44:21 +0200
Subject: [PATCH 208/490] Fix on sarch pages

---
 htdocs/website/class/websitepage.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index edf1eed51a7..3e518d4d633 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -329,8 +329,10 @@ class WebsitePage extends CommonObject
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid' || $key == 't.fk_website') {
+				if ($key == 't.rowid' || $key == 't.fk_website' || $key == 'status') {
 					$sqlwhere[] = $key.'='.$value;
+				} elseif ($key == 'type_container') {
+					$sqlwhere[] = $key."='".$value."'";
 				} elseif ($key == 'lang' || $key == 't.lang') {
 					$listoflang = array();
 					$foundnull = 0;

From a660fd61c9495f4faa3ca10eda2333d86bd1ca7c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 18:55:20 +0200
Subject: [PATCH 209/490] Fix lang must be set to null and not 0 when not
 defined

---
 htdocs/website/class/websitepage.class.php | 25 +++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 3e518d4d633..2a72a222265 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -108,6 +108,29 @@ class WebsitePage extends CommonObject
 	const STATUS_VALIDATED = 1;
 
 
+	/**
+	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
+	 *  'help' is a string visible as a tooltip on field
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
@@ -122,7 +145,7 @@ class WebsitePage extends CommonObject
 	    'description'    =>array('type'=>'varchar(255)', 'label'=>'Description', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1),
 		'image'          =>array('type'=>'varchar(255)', 'label'=>'Image', 'enabled'=>1, 'visible'=>1, 'position'=>32, 'searchall'=>0, 'help'=>'Relative path of media. Used if Type is "blogpost"'),
 		'keywords'       =>array('type'=>'varchar(255)', 'label'=>'Keywords', 'enabled'=>1, 'visible'=>1, 'position'=>45, 'searchall'=>0),
-		'lang'           =>array('type'=>'varchar(6)', 'label'=>'Lang', 'enabled'=>1, 'visible'=>1, 'position'=>45, 'searchall'=>0),
+		'lang'           =>array('type'=>'varchar(6)', 'label'=>'Lang', 'enabled'=>1, 'notnull'=>-1, 'visible'=>1, 'position'=>45, 'searchall'=>0),
 		//'status'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'index'=>true,   'position'=>1000),
 	    'fk_website'     =>array('type'=>'integer', 'label'=>'WebsiteId', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>40, 'searchall'=>0, 'foreignkey'=>'websitepage.rowid'),
 	    'fk_page'        =>array('type'=>'integer', 'label'=>'ParentPageId', 'enabled'=>1, 'visible'=>1, 'notnull'=>-1, 'position'=>45, 'searchall'=>0, 'foreignkey'=>'website.rowid'),

From 0842259012f041d7f0ed33dbcf9be5d0fc97ddd3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 18:55:20 +0200
Subject: [PATCH 210/490] Fix lang must be set to null and not 0 when not
 defined

---
 htdocs/website/class/websitepage.class.php | 25 +++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 3e518d4d633..2a72a222265 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -108,6 +108,29 @@ class WebsitePage extends CommonObject
 	const STATUS_VALIDATED = 1;
 
 
+	/**
+	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
+	 *  'help' is a string visible as a tooltip on field
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
@@ -122,7 +145,7 @@ class WebsitePage extends CommonObject
 	    'description'    =>array('type'=>'varchar(255)', 'label'=>'Description', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1),
 		'image'          =>array('type'=>'varchar(255)', 'label'=>'Image', 'enabled'=>1, 'visible'=>1, 'position'=>32, 'searchall'=>0, 'help'=>'Relative path of media. Used if Type is "blogpost"'),
 		'keywords'       =>array('type'=>'varchar(255)', 'label'=>'Keywords', 'enabled'=>1, 'visible'=>1, 'position'=>45, 'searchall'=>0),
-		'lang'           =>array('type'=>'varchar(6)', 'label'=>'Lang', 'enabled'=>1, 'visible'=>1, 'position'=>45, 'searchall'=>0),
+		'lang'           =>array('type'=>'varchar(6)', 'label'=>'Lang', 'enabled'=>1, 'notnull'=>-1, 'visible'=>1, 'position'=>45, 'searchall'=>0),
 		//'status'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'index'=>true,   'position'=>1000),
 	    'fk_website'     =>array('type'=>'integer', 'label'=>'WebsiteId', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>40, 'searchall'=>0, 'foreignkey'=>'websitepage.rowid'),
 	    'fk_page'        =>array('type'=>'integer', 'label'=>'ParentPageId', 'enabled'=>1, 'visible'=>1, 'notnull'=>-1, 'position'=>45, 'searchall'=>0, 'foreignkey'=>'website.rowid'),

From 3811586cd0654ef0d99c6369177d7b96cf35b50d Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 14 May 2020 20:34:48 +0200
Subject: [PATCH 211/490] FIX Site ec.europa.eu has moved to https://

---
 htdocs/societe/checkvat/checkVatPopup.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index 689df14f3d7..e1f940cfab8 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -28,9 +28,9 @@ require_once NUSOAP_PATH.'/nusoap.php';
 $langs->load("companies");
 
 //http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl
-$WS_DOL_URL='http://ec.europa.eu/taxation_customs/vies/services/checkVatService';
+$WS_DOL_URL='https://ec.europa.eu/taxation_customs/vies/services/checkVatService';
 //$WS_DOL_URL_WSDL=$WS_DOL_URL.'?wsdl';
-$WS_DOL_URL_WSDL='http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl';
+$WS_DOL_URL_WSDL='https://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl';
 $WS_METHOD ='checkVat';
 
 

From cb98ec4d232b0be9d776e5b50a0745f307f5b016 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Fri, 15 May 2020 01:18:53 +0200
Subject: [PATCH 212/490] Fix datapolicycron

---
 htdocs/datapolicy/class/datapolicycron.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php
index 0d241f75334..81e9d009a56 100644
--- a/htdocs/datapolicy/class/datapolicycron.class.php
+++ b/htdocs/datapolicy/class/datapolicycron.class.php
@@ -461,7 +461,7 @@ class DataPolicyCron
                 )
             ),
         );
-
+		
         $this->db->begin();
 
         foreach ($arrayofparameters as $key => $params)
@@ -470,15 +470,15 @@ class DataPolicyCron
             {
                 $sql = sprintf($params['sql'], (int) $conf->entity, (int) $conf->global->$key, (int) $conf->global->$key);
 
-                $resql = $db->query($sql);
+                $resql = $this->db->query($sql);
 
-                if ($resql && $db->num_rows($resql) > 0)
+                if ($resql && $this->db->num_rows($resql) > 0)
                 {
-                    $num = $db->num_rows($resql);
+                    $num = $this->db->num_rows($resql);
                     $i = 0;
 
                     require_once $params['file'];
-                    $object = new $params['class']($db);
+                    $object = new $params['class']($this->db);
 
                     while ($i < $num && ! $error)
                     {

From e691045c3d6ef5ad11fd9539fc702ed706229165 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 14 May 2020 23:20:39 +0000
Subject: [PATCH 213/490] Fixing style errors.

---
 htdocs/datapolicy/class/datapolicycron.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php
index 81e9d009a56..ac364c78f30 100644
--- a/htdocs/datapolicy/class/datapolicycron.class.php
+++ b/htdocs/datapolicy/class/datapolicycron.class.php
@@ -461,7 +461,7 @@ class DataPolicyCron
                 )
             ),
         );
-		
+
         $this->db->begin();
 
         foreach ($arrayofparameters as $key => $params)

From 100bfb921f0cdb97ed919ce858e8804ecc3bd68d Mon Sep 17 00:00:00 2001
From: Langlais115 <Langlais115@users.noreply.github.com>
Date: Fri, 15 May 2020 10:25:56 +0200
Subject: [PATCH 214/490] Fix  #13805

Add proper type check to "seuil_stock_alerte" parameter.
---
 htdocs/product/class/product.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index bb2a1652d8f..7b6892552d1 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1015,7 +1015,7 @@ class Product extends CommonObject
             $sql .= ", volume = ".($this->volume != '' ? "'".$this->db->escape($this->volume)."'" : 'null');
             $sql .= ", volume_units = ".($this->volume_units != '' ? "'".$this->db->escape($this->volume_units)."'" : 'null');
             $sql .= ", fk_default_warehouse = ".($this->fk_default_warehouse > 0 ? $this->db->escape($this->fk_default_warehouse) : 'null');
-            $sql .= ", seuil_stock_alerte = ".((isset($this->seuil_stock_alerte) && $this->seuil_stock_alerte != '') ? "'".$this->db->escape($this->seuil_stock_alerte)."'" : "null");
+            $sql .= ", seuil_stock_alerte = ".((isset($this->seuil_stock_alerte) && is_numeric($this->seuil_stock_alerte)) ? (int) $this->seuil_stock_alerte : 'null');
             $sql .= ", description = '".$this->db->escape($this->description)."'";
             $sql .= ", url = ".($this->url ? "'".$this->db->escape($this->url)."'" : 'null');
             $sql .= ", customcode = '".$this->db->escape($this->customcode)."'";

From bfca151d8553e7e8fe4487d7cf5d73c8459e520f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 11:58:50 +0200
Subject: [PATCH 215/490] Responsive

---
 htdocs/public/demo/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index c470055dbce..cbed76af71f 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -280,7 +280,7 @@ print '</div>';
 
 print '<div class="demobantext" style="max-width: 1024px;">';
 print '<div style="font-size: 20px; padding: 40px;">';
-print '<div style="text-align: justify;">'.$langs->trans("DemoDesc").'</div><br>';
+print '<div class="hideonsmartphone" style="text-align: justify;">'.$langs->trans("DemoDesc").'</div><br>';
 print '<div class="titre"><font style="font-size: 20px">'.$langs->trans("ChooseYourDemoProfil").'</font></div>';
 print '</div>';
 print '</div>';

From ad906fc508d3a712ddcd2133299bf0827d16a0b2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 12:43:48 +0200
Subject: [PATCH 216/490] Fix use SVG logo instead of PNG

---
 htdocs/cache.manifest                      |   2 +-
 htdocs/core/lib/ticket.lib.php             |   6 +++---
 htdocs/opensurvey/fonctions.php            |   2 +-
 htdocs/public/demo/index.php               |   2 +-
 htdocs/public/members/new.php              |   6 +++---
 htdocs/public/onlinesign/newonlinesign.php |   2 +-
 htdocs/public/payment/newpayment.php       |   2 +-
 htdocs/public/payment/paymentko.php        |   2 +-
 htdocs/public/payment/paymentok.php        |   2 +-
 htdocs/theme/dolibarr_logo.png             | Bin 9663 -> 14082 bytes
 htdocs/user/passwordforgotten.php          |   8 ++++----
 11 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/htdocs/cache.manifest b/htdocs/cache.manifest
index ebbf1aab4eb..5e514a32a47 100644
--- a/htdocs/cache.manifest
+++ b/htdocs/cache.manifest
@@ -8,7 +8,7 @@ CACHE MANIFEST
 # Files listed under CACHE will be ALWAYS cached after they are loaded.
 # And they will be always used from Cache after (even after refresh).
 CACHE:
-theme/dolibarr_logo.png
+theme/dolibarr_logo.svg
 support/
 support/index.php
 
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 0a50eb7407f..1b2a5c1245f 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -230,8 +230,8 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
         	} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
         		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$mysoc->logo);
         		$width = 150;
-        	} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png')) {
-        		$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.png';
+        	} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) {
+        		$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
         	}
         }
     }
@@ -254,7 +254,7 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
     	}
     	print '</div>';
     	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-    		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" width="80px"></a></div>';
+    		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
     	}
     	print '</div>';
     }
diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php
index 30529b49f56..31ec69f3a42 100644
--- a/htdocs/opensurvey/fonctions.php
+++ b/htdocs/opensurvey/fonctions.php
@@ -121,7 +121,7 @@ function llxHeaderSurvey($title, $head = "", $disablejs = 0, $disablehead = 0, $
 		print '>';
 		print '</div>';
 		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-			print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" width="80px"></a></div>';
+			print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 		}
 		print '</div>';
 	}
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index cbed76af71f..f0caf948770 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -274,7 +274,7 @@ print "\n";
 
 print '<div class="demoban demobackground">';
 print '<div class="right" style="padding-right: 30px; padding-top: 30px;">';
-print '<a alt="Official portal of your ERP CRM application" targe="_blank" href="https://www.dolibarr.org"><img class="demologo" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" alt="Dolibarr logo"></a>';
+print '<a alt="Official portal of your ERP CRM application" targe="_blank" href="https://www.dolibarr.org"><img class="demologo" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" alt="Dolibarr logo"></a>';
 print '</div>';
 print '</div>';
 
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 5b456893bf9..7f788a84671 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -113,9 +113,9 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
         $urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
         $width = 150;
     }
-    elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))
+    elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
     {
-        $urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.png';
+        $urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
         $width = 150;
     }
 
@@ -130,7 +130,7 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
     	print '>';
     	print '</div>';
     	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-    		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" width="80px"></a></div>';
+    		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
     	}
     	print '</div>';
     }
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index 83e757b78f8..2378728a8d3 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -191,7 +191,7 @@ if ($urllogo)
 	print '>';
 	print '</div>';
 	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" width="80px"></a></div>';
+		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index ddd1943329e..ea7fd71c9e6 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -793,7 +793,7 @@ if ($urllogo)
 	print '>';
 	print '</div>';
 	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" width="80px"></a></div>';
+		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index 2610219d69d..a3f6d733fcb 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -245,7 +245,7 @@ if ($urllogo)
 	print '>';
 	print '</div>';
 	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" width="80px"></a></div>';
+		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 6b7805cf473..b1d6c149a51 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -181,7 +181,7 @@ if ($urllogo)
 	print '>';
 	print '</div>';
 	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" width="80px"></a></div>';
+		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
diff --git a/htdocs/theme/dolibarr_logo.png b/htdocs/theme/dolibarr_logo.png
index 77c2146191034eb2b02c61b2f67c26fcf5d6aa19..c15f03c821baf1e72192ebaee9c73477f5668810 100644
GIT binary patch
literal 14082
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
XceF3C*bLCO$6(~7m8GgBOuzp>ibZ10

literal 9663
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
BfOh}@

diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index b0f3a5aab6c..83289521538 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -192,13 +192,13 @@ elseif (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
 	$width = 128;
 }
-elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png'))
+elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.svg'))
 {
-	$urllogo = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png';
+	$urllogo = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.svg';
 }
-elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))
+elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
 {
-	$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.png';
+	$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
 }
 
 // Security graphical code

From 8a2741650a6096bdad3f165ce12aa98d54aa051b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 12:46:55 +0200
Subject: [PATCH 217/490] Fix css

---
 htdocs/theme/eldy/global.inc.php | 3 +++
 htdocs/theme/md/style.css.php    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index afb154408c5..a6e9258ea39 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1362,6 +1362,9 @@ td.showDragHandle {
 	transition: left 0.5s ease;
 }
 
+.demologo {
+	width: 200px;
+}
 div.blockvmenulogo
 {
 	border-bottom: 0 !important;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index da2df5eb788..38a9ec38fe5 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2471,6 +2471,9 @@ font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
 
 a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { text-align: <?php print $left; ?>; font-weight: normal; color: #999; text-decoration: none; }
 
+.demologo {
+	width: 200px;
+}
 div.blockvmenulogo
 {
 	border-bottom: 0 !important;

From 949ef8d7d89f413cd8b3c72eb5c5f85a9c409e20 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 12:49:22 +0200
Subject: [PATCH 218/490] Fix css

---
 htdocs/public/demo/demo.css      | 5 ++++-
 htdocs/theme/eldy/global.inc.php | 3 ---
 htdocs/theme/md/style.css.php    | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/htdocs/public/demo/demo.css b/htdocs/public/demo/demo.css
index 9328a8ecd1b..b185f8c933f 100644
--- a/htdocs/public/demo/demo.css
+++ b/htdocs/public/demo/demo.css
@@ -105,8 +105,11 @@ img.demothumb {
     object-fit: contain;
     height: 140px;
     background-position-y: bottom;
+	background-position-x: right;
+}
+.demologo {
+	width: 200px;
 }
-
 
 @media only screen and (max-width: 767px)
 {
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index a6e9258ea39..afb154408c5 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1362,9 +1362,6 @@ td.showDragHandle {
 	transition: left 0.5s ease;
 }
 
-.demologo {
-	width: 200px;
-}
 div.blockvmenulogo
 {
 	border-bottom: 0 !important;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 38a9ec38fe5..da2df5eb788 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2471,9 +2471,6 @@ font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
 
 a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { text-align: <?php print $left; ?>; font-weight: normal; color: #999; text-decoration: none; }
 
-.demologo {
-	width: 200px;
-}
 div.blockvmenulogo
 {
 	border-bottom: 0 !important;

From 91f87d6834ad67d11caf7edc7b932993a0999029 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 13:52:35 +0200
Subject: [PATCH 219/490] Fix bad param of getNomUrl

---
 htdocs/compta/accounting-files.php      | 12 +++----
 htdocs/don/class/don.class.php          | 22 +++++++++----
 htdocs/loan/class/paymentloan.class.php | 42 ++++++++++++++++---------
 3 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index f9bc453d999..7d8b819b75c 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -672,27 +672,27 @@ if (!empty($date_start) && !empty($date_stop))
 				} elseif ($data['item'] == 'ExpenseReport') {
                     $expensereport->id = $data['id'];
                 	$expensereport->ref = $data['ref'];
-                	print $expensereport->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+                	print $expensereport->getNomUrl(1, 0, 0, '', 0, 0);
 				} elseif ($data['item'] == 'SalaryPayment') {
                     $salary_payment->id = $data['id'];
                 	$salary_payment->ref = $data['ref'];
-                	print $salary_payment->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+                	print $salary_payment->getNomUrl(1, '', 0, '', 0);
 				} elseif ($data['item'] == 'Donation') {
                     $don->id = $data['id'];
                 	$don->ref = $data['ref'];
-                	print $don->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+                	print $don->getNomUrl(1, 0, '', 0);
 				} elseif ($data['item'] == 'SocialContributions') {
                     $charge_sociales->id = $data['id'];
                 	$charge_sociales->ref = $data['ref'];
-                	print $charge_sociales->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+                	print $charge_sociales->getNomUrl(1, 0, 0, 0, 0);
 				} elseif ($data['item'] == 'VariousPayment') {
                     $various_payment->id = $data['id'];
                 	$various_payment->ref = $data['ref'];
-                	print $various_payment->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+                	print $various_payment->getNomUrl(1, '', 0, 0);
 				} elseif ($data['item'] == 'LoanPayment') {
                     $payment_loan->id = $data['id'];
                 	$payment_loan->ref = $data['ref'];
-                	print $payment_loan->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+                	print $payment_loan->getNomUrl(1, 0, 0, '', 0);
 				} else {
                 	print $data['ref'];
 				}
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 77dbd177cbd..59c293e6386 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -916,11 +916,13 @@ class Don extends CommonObject
     /**
      *	Return clicable name (with picto eventually)
      *
-     *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-     *	@param	int  	$notooltip		1=Disable tooltip
-     *	@return	string					Chaine avec URL
+     *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
+     *	@param	int  	$notooltip					1=Disable tooltip
+     *	@param	string	$moretitle					Add more text to title tooltip
+     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+     *	@return	string								Chaine avec URL
      */
-    public function getNomUrl($withpicto = 0, $notooltip = 0)
+    public function getNomUrl($withpicto = 0, $notooltip = 0, $moretitle = '', $save_lastsearch_value = -1)
     {
         global $conf, $langs;
 
@@ -928,10 +930,18 @@ class Don extends CommonObject
 
         $result = '';
         $label = '<u>'.$langs->trans("Donation").'</u>';
-        if (!empty($this->id))
+        if (!empty($this->id)) {
         	$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->id;
+        }
+        if ($moretitle) $label .= ' - '.$moretitle;
 
-        $linkstart = '<a href="'.DOL_URL_ROOT.'/don/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+        $url = DOL_URL_ROOT.'/don/card.php?id='.$this->id;
+
+       	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+       	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+       	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+
+        $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
         $linkend = '</a>';
 
         $result .= $linkstart;
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index 485d48dc443..ce152317710 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -507,25 +507,39 @@ class PaymentLoan extends CommonObject
 	/**
 	 *  Return clicable name (with eventually a picto)
 	 *
-	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=No picto
-	 * 	@param	int		$maxlen			Max length label
-	 *	@return	string					Chaine with URL
+	 *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=No picto
+	 * 	@param	int		$maxlen						Max length label
+     *	@param	int  	$notooltip					1=Disable tooltip
+     *	@param	string	$moretitle					Add more text to title tooltip
+     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return	string								String with URL
 	 */
-	public function getNomUrl($withpicto = 0, $maxlen = 0)
+	public function getNomUrl($withpicto = 0, $maxlen = 0, $notooltip = 0, $moretitle = '', $save_lastsearch_value = -1)
 	{
-		global $langs;
+		global $langs, $conf;
+
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
 		$result = '';
-
-		if (!empty($this->id))
-		{
-			$link = '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$this->id.'">';
-			$linkend = '</a>';
-
-			if ($withpicto) $result .= ($link.img_object($langs->trans("ShowPayment").': '.$this->ref, 'payment').$linkend.' ');
-			if ($withpicto && $withpicto != 2) $result .= ' ';
-			if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+		$label = '<u>'.$langs->trans("Loan").'</u>';
+		if (!empty($this->id)) {
+			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->id;
 		}
+		if ($moretitle) $label .= ' - '.$moretitle;
+
+		$url = DOL_URL_ROOT.'/loan/payment/card.php?id='.$this->id;
+
+		$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+		if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+		if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+
+		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$linkend = '</a>';
+
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
+		$result .= $linkend;
 
 		return $result;
 	}

From 02b40ae8f60cfd76c70453d631af0c21618655ab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 13:54:05 +0200
Subject: [PATCH 220/490] Fix scrutinizer

---
 htdocs/core/class/interfaces.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 9302ed09afb..4199e51cb68 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -328,6 +328,8 @@ class Interfaces
                 continue;
             }
 
+            $text = '';
+
             try {
 	            $objMod = new $modName($db);
 

From 9699ee7263ec8b591b569251c78d5932dd630da2 Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Fri, 15 May 2020 11:55:31 +0000
Subject: [PATCH 221/490] Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
 htdocs/accountancy/bookkeeping/balance.php    | 16 ++++----
 htdocs/compta/accounting-files.php            | 12 +++---
 htdocs/core/class/interfaces.class.php        |  2 +-
 htdocs/core/lib/date.lib.php                  |  2 +-
 htdocs/core/modules/DolibarrModules.class.php |  2 +-
 .../modules/rapport/pdf_paiement.class.php    | 28 +++++++-------
 .../class/emailcollector.class.php            |  2 +-
 htdocs/takepos/invoice.php                    |  2 +-
 htdocs/takepos/phone.php                      | 38 +++++++++----------
 9 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 85562ebc268..f443fded501 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -296,23 +296,23 @@ if ($action != 'export_csv')
 		}
 		print '<tr class="oddeven">';
 
-		if(!empty($show_subgroup))
+		if (!empty($show_subgroup))
 		{
 			// Permet d'afficher le compte comptable
 			if (empty($displayed_account) || $root_account_description != $displayed_account) {
 				// Affiche un Sous-Total par compte comptable
 				if ($displayed_account != "") {
-					print '<tr class="liste_total"><td class="right" colspan="3">' . $langs->trans("SubTotal") . ':</td>';
-					print '<td class="nowrap right">' . price($sous_total_debit) . '</td>';
-					print '<td class="nowrap right">' . price($sous_total_credit) . '</td>';
-					print '<td class="nowrap right">' . price(price2num($sous_total_credit - $sous_total_debit)) . '</td>';
+					print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("SubTotal").':</td>';
+					print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
+					print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
+					print '<td class="nowrap right">'.price(price2num($sous_total_credit - $sous_total_debit)).'</td>';
 					print "<td></td>\n";
 					print '</tr>';
 				}
 
 				// Show first line of a break
 				print '<tr class="trforbreak">';
-				print '<td colspan="7" style="font-weight:bold; border-bottom: 1pt solid black;">' . $line->numero_compte . ($root_account_description ? ' - ' . $root_account_description : '') . '</td>';
+				print '<td colspan="7" style="font-weight:bold; border-bottom: 1pt solid black;">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
 				print '</tr>';
 
 				$displayed_account = $root_account_description;
@@ -337,9 +337,9 @@ if ($action != 'export_csv')
 		$sous_total_credit += $line->credit;
 	}
 
-	if(!empty($show_subgroup))
+	if (!empty($show_subgroup))
 	{
-		print '<tr class="liste_total"><td class="right" colspan="3">' . $langs->trans("SubTotal") . ':</td><td class="nowrap right">' . price($sous_total_debit) . '</td><td class="nowrap right">' . price($sous_total_credit) . '</td><td class="nowrap right">' . price(price2num($sous_total_debit - $sous_total_credit)) . '</td>';
+		print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td><td class="nowrap right">'.price(price2num($sous_total_debit - $sous_total_credit)).'</td>';
 		print "<td></td>\n";
 		print '</tr>';
 	}
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index f9bc453d999..6b9be4d285c 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -712,11 +712,11 @@ if (!empty($date_start) && !empty($date_stop))
                 print '<td aling="left">'.$data['paid'].'</td>';
 
                 // Total ET
-                print '<td align="right">'.price($data['sens']?$data['amount_ht']:-$data['amount_ht'])."</td>\n";
+                print '<td align="right">'.price($data['sens'] ? $data['amount_ht'] : -$data['amount_ht'])."</td>\n";
                 // Total IT
-                print '<td align="right">'.price($data['sens']?$data['amount_ttc']:-$data['amount_ttc'])."</td>\n";
+                print '<td align="right">'.price($data['sens'] ? $data['amount_ttc'] : -$data['amount_ttc'])."</td>\n";
                 // Total VAT
-                print '<td align="right">'.price($data['sens']?$data['amount_vat']:-$data['amount_vat'])."</td>\n";
+                print '<td align="right">'.price($data['sens'] ? $data['amount_vat'] : -$data['amount_vat'])."</td>\n";
 
                 print '<td>'.$data['thirdparty_name']."</td>\n";
 
@@ -758,9 +758,9 @@ if (!empty($date_start) && !empty($date_stop))
             // Balance
             print '<tr class="liste_total">';
             print '<td colspan="6" class="right">'.$langs->trans('Total').'</td>';
-            print '<td align="right">'.price(price2num($totalET_credit+$totalET_debit, 'MT')).'</td>';
-            print '<td align="right">'.price(price2num($totalIT_credit+$totalIT_debit, 'MT')).'</td>';
-            print '<td align="right">'.price(price2num($totalVAT_credit+$totalVAT_debit, 'MT')).'</td>';
+            print '<td align="right">'.price(price2num($totalET_credit + $totalET_debit, 'MT')).'</td>';
+            print '<td align="right">'.price(price2num($totalIT_credit + $totalIT_debit, 'MT')).'</td>';
+            print '<td align="right">'.price(price2num($totalVAT_credit + $totalVAT_debit, 'MT')).'</td>';
             print '<td colspan="4"></td>';
             print "</tr>\n";
         }
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 9302ed09afb..7c010ea742c 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -379,7 +379,7 @@ class Interfaces
 	            	print 'Error: Trigger '.$modName.' does not extends DolibarrTriggers<br>';
 	            }
             }
-            catch(Exception $e) {
+            catch (Exception $e) {
             	print $e->getMessage();
             }
 
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index a751f584564..b44d7260e97 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -910,7 +910,7 @@ function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0,
 			if ($numholidays == 1) return 0;
 		}
 
-		$nbOpenDay=$lastday;
+		$nbOpenDay = $lastday;
 
 		if ($inhour == 1) $nbOpenDay = ($nbOpenDay * 24);
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 384c4fc3a7e..24811ad854d 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -2302,7 +2302,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		if (preg_match('/experimental/i', $version)) $versiontrans .= 'warning';
 		if (preg_match('/deprecated/i', $version))   $versiontrans .= 'warning';
 		if ($this->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
-			print '<span class="info-box-icon-version'.($versiontrans? ' '.$versiontrans : '').'" title="'.$langs->trans("Version").' '.$this->getVersion(1).'">';
+			print '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').'" title="'.$langs->trans("Version").' '.$this->getVersion(1).'">';
 			print $this->getVersion(1);
 			print '</span>';
 		}
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 024310abb09..103d0fdffba 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -465,14 +465,14 @@ class pdf_paiement
 				if ($yp > $this->tab_height - 15)
 				{
                     $pdf->SetFillColor(255, 255, 255);
-                    $pdf->Rect($this->marge_gauche +1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite -3, $this->line_height, 'F', array(), array());
+                    $pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
                     $pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
                     $pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
                     $pdf->SetFont('', 'B', $default_font_size - 1);
-                    $pdf->SetXY($this->posxdate -1, $this->tab_top + 10 + $yp);
+                    $pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
                     $pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('SubTotal')." : ", 0, 'R', 1);
-                    $pdf->SetXY($this->posxpaymentamount -1, $this->tab_top + 10 + $yp);
-                    $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount +1, $this->line_height, price($total_page), 0, 'R', 1);
+                    $pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
+                    $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total_page), 0, 'R', 1);
                     $pdf->SetFont('', '', $default_font_size - 1);
                     $pdf->SetFillColor(220, 220, 220);
 					$page++;
@@ -523,19 +523,19 @@ class pdf_paiement
 			}
 
             // Add line to add total by payment mode if mode reglement for nex line change
-            if ((($this->doc_type == 'client' && !empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) || ($this->doc_type == 'fourn' && !empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))) && ($mod != $lines[$j+1][2]))
+            if ((($this->doc_type == 'client' && !empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) || ($this->doc_type == 'fourn' && !empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))) && ($mod != $lines[$j + 1][2]))
             {
                 $pdf->SetFillColor(245, 245, 245);
-                $pdf->Rect($this->marge_gauche +1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite -3, $this->line_height, 'F', array(), array());
+                $pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
                 $pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
                 $pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
-                $pdf->SetXY($this->posxdate -1, $this->tab_top + 10 + $yp);
+                $pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
 				$pdf->SetFont('', 'I', $default_font_size - 1);
                 $pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('Total').' '.$mod." : ", 0, 'R', 1);
-                $pdf->SetXY($this->posxpaymentamount -1, $this->tab_top + 10 + $yp);
-                $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount +1, $this->line_height, price($total_mod), 0, 'R', 1);
+                $pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
+                $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total_mod), 0, 'R', 1);
 				$pdf->SetFont('', '', $default_font_size - 1);
-                $mod = $lines[$j+1][2];
+                $mod = $lines[$j + 1][2];
                 $total_mod = 0;
 				$yp = $yp + 5;
                 if ($yp > $this->tab_height - 5)
@@ -551,14 +551,14 @@ class pdf_paiement
 		}
 		$total += $total_page;
         $pdf->SetFillColor(255, 255, 255);
-        $pdf->Rect($this->marge_gauche +1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite -3, $this->line_height, 'F', array(), array());
+        $pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
         $pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
         $pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
-        $pdf->SetXY($this->posxdate -1, $this->tab_top + 10 + $yp);
+        $pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
         $pdf->SetFont('', 'B');
         $pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('Total')." : ", 0, 'R', 1);
-        $pdf->SetXY($this->posxpaymentamount -1, $this->tab_top + 10 + $yp);
-        $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount +1, $this->line_height, price($total), 0, 'R', 1);
+        $pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
+        $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total), 0, 'R', 1);
         $pdf->SetFillColor(220, 220, 220);
 	}
 }
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 2bc6d6db962..bf1a4e26de7 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -1092,7 +1092,7 @@ class EmailCollector extends CommonObject
                 $i++;
 
                 $header = imap_fetchheader($connection, $imapemail, 0);
-                $header = preg_replace('/\r\n\s+/m', ' ', $header);	// When a header line is on several lines, merge lines
+                $header = preg_replace('/\r\n\s+/m', ' ', $header); // When a header line is on several lines, merge lines
                 $matches = array();
                 preg_match_all('/([^: ]+): (.+?(?:\r\n\s(?:.+?))*)\r\n/m', $header, $matches);
                 $headers = array_combine($matches[1], $matches[2]);
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 3d6cec96319..16012022dc9 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -625,7 +625,7 @@ $(document).ready(function() {
         else selectedline=this.id;
         selectedtext=$('#'+selectedline).find("td:first").html();
 		<?php
-		if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+		if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 			print '$("#phonediv1").load("auto_order.php?action=editline&placeid="+placeid+"&selectedline="+selectedline, function() {
 			});';
 		}
diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 8714173e45f..b06bdd0bfed 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 	// Decode place if it is an order from customer phone
 	$key = GETPOST('key');
-	$place=dol_decode($key);
+	$place = dol_decode($key);
 }
 else $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
 $action = GETPOST('action', 'alpha');
@@ -73,7 +73,7 @@ top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
 print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/takepos/css/phone.css">';
 
-if ($action=="productinfo"){
+if ($action == "productinfo") {
 	$prod = new Product($db);
     $prod->fetch($idproduct);
 	print "<b>".$prod->label."</b><br>";
@@ -83,7 +83,7 @@ if ($action=="productinfo"){
 	print '<br>';
 	print '<button type="button" class="publicphonebutton2" onclick="AddProductConfirm(place, '.$idproduct.');">'.$langs->trans('Add').'</button>';
 }
-elseif ($action=="editline"){
+elseif ($action == "editline") {
 	$placeid = GETPOST('placeid', 'int');
 	$selectedline = GETPOST('selectedline', 'int');
 	$invoice = new Facture($db);
@@ -99,8 +99,8 @@ elseif ($action=="editline"){
 			print "<br>".$prod->description;
 			print "<br><b>".price($prod->price_ttc, 1, $langs, 1, -1, -1, $conf->currency)."</b>";
 			print '<br>';
-			print '<button type="button" class="publicphonebutton2" onclick="SetQty(place, '.$selectedline.', '.($line->qty-1).');">-</button>';
-			print '<button type="button" class="publicphonebutton2" onclick="SetQty(place, '.$selectedline.', '.($line->qty+1).');">+</button>';
+			print '<button type="button" class="publicphonebutton2" onclick="SetQty(place, '.$selectedline.', '.($line->qty - 1).');">-</button>';
+			print '<button type="button" class="publicphonebutton2" onclick="SetQty(place, '.$selectedline.', '.($line->qty + 1).');">+</button>';
 			print '<button type="button" class="publicphonebutton2" onclick="SetNote(place, '.$selectedline.');">'.$langs->trans('Note').'</button>';
         }
     }
@@ -168,11 +168,11 @@ $( document ).ready(function() {
 function LoadPlace(placeid){
     place=placeid;
 	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&place="+place, function() {
 		});';
 	}
-	else{
+	else {
 		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&place="+place, function() {
 		});';
 	}
@@ -183,12 +183,12 @@ function LoadPlace(placeid){
 function AddProduct(placeid, productid){
 	<?php
 	// If is a public terminal first show product information
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		print 'place=placeid;
 		$("#phonediv1").load("auto_order.php?action=productinfo&place="+place+"&idproduct="+productid, function() {
 		});';
 	}
-	else{
+	else {
 		print 'AddProductConfirm(placeid, productid);';
 	}
 	?>
@@ -197,11 +197,11 @@ function AddProduct(placeid, productid){
 function AddProductConfirm(placeid, productid){
 	place=placeid;
 	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
 		});';
 	}
-	else{
+	else {
 		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
 		});';
 	}
@@ -229,11 +229,11 @@ function SetNote(place, selectedline){
 
 function LoadCats(){
 	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv1").load("auto_order.php?mobilepage=cats&place="+place, function() {
 		});';
 	}
-	else{
+	else {
 		echo '$("#phonediv1").load("invoice.php?mobilepage=cats&place="+place, function() {
 		});';
 	}
@@ -243,11 +243,11 @@ function LoadCats(){
 function LoadProducts(idcat){
     
 	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv1").load("auto_order.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
 		});';
 	}
-	else{
+	else {
 		echo '$("#phonediv1").load("invoice.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
 		});';
 	}
@@ -262,11 +262,11 @@ function LoadPlacesList(){
 function TakeposPrintingOrder(){
     console.log("TakeposPrintingOrder");
 	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv2").load("auto_order.php?action=order&place="+place, function() {
 		});';
 	}
-	else{
+	else {
 		echo '$("#phonediv2").load("invoice.php?action=order&place="+place, function() {
 		});';
 	}
@@ -294,13 +294,13 @@ function CheckPlease(){
 <div class="container">
 	<div class="phonebuttonsrow">
 		<?php
-		if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+		if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 			print '<button type="button" class="phonebutton" onclick="LoadPlacesList();">'.strtoupper(substr($langs->trans('Floors'), 0, 3)).'</button>';
 			print '<button type="button" class="phonebutton" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 3)).'</button>';
 			print '<button type="button" class="phonebutton" onclick="TakeposPrintingOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 3)).'</button>';
 			print '<button type="button" class="phonebutton" onclick="Exit();">'.strtoupper(substr($langs->trans('Logout'), 0, 3)).'</button>';
 		}
-		else{
+		else {
 			print '<button type="button" class="publicphonebutton" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 5)).'</button>';
 			print '<button type="button" class="publicphonebutton" onclick="TakeposPrintingOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 5)).'</button>';
 			print '<button type="button" class="publicphonebutton" onclick="CheckPlease();">'.strtoupper(substr($langs->trans('Payment'), 0, 5)).'</button>';

From 672ea60ffd471b2156bf45c28c60c3dc57223906 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 13:58:34 +0200
Subject: [PATCH 222/490] FIX #13896

---
 htdocs/modulebuilder/template/class/myobject.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index fad19564fdc..2070bedf568 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -440,7 +440,7 @@ class MyObject extends CommonObject
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < min($limit, $num))
+			while ($i < ($limit ? min($limit, $num) : $num))
 			{
 				$obj = $this->db->fetch_object($resql);
 

From dc6ae70aa6ddc311b8967dd9bf8d445e70c815a1 Mon Sep 17 00:00:00 2001
From: Langlais115 <Langlais115@users.noreply.github.com>
Date: Fri, 15 May 2020 10:25:56 +0200
Subject: [PATCH 223/490] Fix  #13805

Add proper type check to "seuil_stock_alerte" parameter.
---
 htdocs/product/class/product.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index bb2a1652d8f..7b6892552d1 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1015,7 +1015,7 @@ class Product extends CommonObject
             $sql .= ", volume = ".($this->volume != '' ? "'".$this->db->escape($this->volume)."'" : 'null');
             $sql .= ", volume_units = ".($this->volume_units != '' ? "'".$this->db->escape($this->volume_units)."'" : 'null');
             $sql .= ", fk_default_warehouse = ".($this->fk_default_warehouse > 0 ? $this->db->escape($this->fk_default_warehouse) : 'null');
-            $sql .= ", seuil_stock_alerte = ".((isset($this->seuil_stock_alerte) && $this->seuil_stock_alerte != '') ? "'".$this->db->escape($this->seuil_stock_alerte)."'" : "null");
+            $sql .= ", seuil_stock_alerte = ".((isset($this->seuil_stock_alerte) && is_numeric($this->seuil_stock_alerte)) ? (int) $this->seuil_stock_alerte : 'null');
             $sql .= ", description = '".$this->db->escape($this->description)."'";
             $sql .= ", url = ".($this->url ? "'".$this->db->escape($this->url)."'" : 'null');
             $sql .= ", customcode = '".$this->db->escape($this->customcode)."'";

From 3295b0d669541c24849f51f772d4487b708ddf3b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 14:14:05 +0200
Subject: [PATCH 224/490] Update viewimage.php

---
 htdocs/viewimage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 39795b62fd8..c72a4e0424e 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -203,7 +203,7 @@ if (!empty($hashp))
 	$accessallowed = 1; // When using hashp, link is public so we force $accessallowed
 	$sqlprotectagainstexternals = '';
 }
-elseif ($conf->global->TAKEPOS_AUTO_ORDER && isset($_GET["publictakepos"]))
+elseif (! empty($conf->global->TAKEPOS_AUTO_ORDER) && isset($_GET["publictakepos"]))
 {
 	$accessallowed = 1; // Only if TakePOS Public Auto Order is enabled and received publictakepos variable
 }

From f35a618699830aadfaedbf5fbcf9bc8dc7b307db Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 14:29:04 +0200
Subject: [PATCH 225/490] Update index.php

---
 htdocs/takepos/genimg/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/takepos/genimg/index.php b/htdocs/takepos/genimg/index.php
index c2bb62b9322..e668b01aacb 100644
--- a/htdocs/takepos/genimg/index.php
+++ b/htdocs/takepos/genimg/index.php
@@ -77,7 +77,7 @@ elseif ($query == "pro")
 	preg_match('@src="([^"]+)"@', $image, $match);
 	$file = array_pop($match);
 	if ($file == "") header('Location: ../../public/theme/common/nophoto.png');
-	else header('Location: '.$file.'&cache=1&publictakepos=1');
+	else header('Location: '.$file.'&cache=1&publictakepos=1&modulepart=product');
 }
 else
 {

From b8d7a4373c2deeba697b592eb6eb23fa19812e85 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 14:34:24 +0200
Subject: [PATCH 226/490] Update viewimage.php

---
 htdocs/viewimage.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index c72a4e0424e..b2534ee92dd 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -52,7 +52,7 @@ if (isset($_GET["hashp"]) && !defined("NOLOGIN"))
 	if (!defined("NOIPCHECK"))		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
 }
 // Some value of modulepart can be used to get resources that are public so no login are required.
-if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias'))
+if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias')
 {
 	if (!defined("NOLOGIN"))		define("NOLOGIN", 1);
 	if (!defined("NOCSRFCHECK"))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
@@ -60,7 +60,7 @@ if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias'))
 }
 
 // Used by TakePOS Auto Order
-if (isset($_GET["publictakepos"]))
+if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'product' && isset($_GET["publictakepos"]))
 {
 	if (!defined("NOLOGIN"))		define("NOLOGIN", 1);
 	if (!defined("NOCSRFCHECK"))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
@@ -203,9 +203,11 @@ if (!empty($hashp))
 	$accessallowed = 1; // When using hashp, link is public so we force $accessallowed
 	$sqlprotectagainstexternals = '';
 }
-elseif (! empty($conf->global->TAKEPOS_AUTO_ORDER) && isset($_GET["publictakepos"]))
+elseif (isset($_GET["publictakepos"]))
 {
-	$accessallowed = 1; // Only if TakePOS Public Auto Order is enabled and received publictakepos variable
+	if (! empty($conf->global->TAKEPOS_AUTO_ORDER)) {
+		$accessallowed = 1; // Only if TakePOS Public Auto Order is enabled and received publictakepos variable
+	}
 }
 else
 {

From 895833effc017ad4c2817e16d0a9e947b49b497a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 15:00:58 +0200
Subject: [PATCH 227/490] FIX #13864

---
 htdocs/projet/card.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index e41c3da3e88..ae91ac0cfac 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -639,20 +639,20 @@ if ($action == 'create' && $user->rights->projet->creer)
 
 		// Opportunity probability
 		print '<tr><td>'.$langs->trans("OpportunityProbability").'</td>';
-		print '<td><input size="5" type="text" id="opp_percent" name="opp_percent" value="'.dol_escape_htmltag(GETPOST('opp_percent') != '' ?GETPOST('opp_percent') : '').'"><span class="hideonsmartphone"> %</span>';
-		print '<input type="hidden" name="opp_percent_not_set" id="opp_percent_not_set" value="'.dol_escape_htmltag(GETPOST('opp_percent') != '' ? '0' : '1').'">';
+		print '<td><input size="5" type="text" id="opp_percent" name="opp_percent" value="'.dol_escape_htmltag(GETPOSTISSET('opp_percent') ? GETPOST('opp_percent') : '').'"><span class="hideonsmartphone"> %</span>';
+		print '<input type="hidden" name="opp_percent_not_set" id="opp_percent_not_set" value="'.dol_escape_htmltag(GETPOSTISSET('opp_percent') ? '0' : '1').'">';
 		print '</td>';
 		print '</tr>';
 
 		// Opportunity amount
 		print '<tr><td>'.$langs->trans("OpportunityAmount").'</td>';
-		print '<td><input size="5" type="text" name="opp_amount" value="'.dol_escape_htmltag(GETPOST('opp_amount') != '' ?GETPOST('opp_amount') : '').'"></td>';
+		print '<td><input size="5" type="text" name="opp_amount" value="'.dol_escape_htmltag(GETPOSTISSET('opp_amount') ? GETPOST('opp_amount') : '').'"></td>';
 		print '</tr>';
 	}
 
 	// Budget
 	print '<tr><td>'.$langs->trans("Budget").'</td>';
-	print '<td><input size="5" type="text" name="budget_amount" value="'.dol_escape_htmltag(GETPOST('budget_amount') != '' ?GETPOST('budget_amount') : '').'"></td>';
+	print '<td><input size="5" type="text" name="budget_amount" value="'.dol_escape_htmltag(GETPOSTISSET('budget_amount') ? GETPOST('budget_amount') : '').'"></td>';
 	print '</tr>';
 
 	// Description
@@ -897,14 +897,14 @@ elseif ($object->id > 0)
 
 		    // Opportunity probability
 		    print '<tr><td>'.$langs->trans("OpportunityProbability").'</td>';
-		    print '<td><input size="5" type="text" id="opp_percent" name="opp_percent" value="'.(isset($_POST['opp_percent']) ?GETPOST('opp_percent') : (strcmp($object->opp_percent, '') ?vatrate($object->opp_percent) : '')).'"> %';
+		    print '<td><input size="5" type="text" id="opp_percent" name="opp_percent" value="'.(GETPOSTISSET('opp_percent') ? GETPOST('opp_percent') : (strcmp($object->opp_percent, '') ?vatrate($object->opp_percent) : '')).'"> %';
             print '<span id="oldopppercent"></span>';
 		    print '</td>';
 		    print '</tr>';
 
 		    // Opportunity amount
 		    print '<tr><td>'.$langs->trans("OpportunityAmount").'</td>';
-		    print '<td><input size="5" type="text" name="opp_amount" value="'.(isset($_POST['opp_amount']) ?GETPOST('opp_amount') : (strcmp($object->opp_amount, '') ?price2num($object->opp_amount) : '')).'"></td>';
+		    print '<td><input size="5" type="text" name="opp_amount" value="'.(GETPOSTISSET('opp_amount') ? GETPOST('opp_amount') : (strcmp($object->opp_amount, '') ? price2num($object->opp_amount) : '')).'"></td>';
 		    print '</tr>';
 	    }
 
@@ -923,7 +923,7 @@ elseif ($object->id > 0)
 
 		// Budget
 		print '<tr><td>'.$langs->trans("Budget").'</td>';
-		print '<td><input size="5" type="text" name="budget_amount" value="'.(isset($_POST['budget_amount']) ?GETPOST('budget_amount') : (strcmp($object->budget_amount, '') ?price($object->budget_amount, 0, $langs, 1, 0) : '')).'"></td>';
+		print '<td><input size="5" type="text" name="budget_amount" value="'.(GETPOSTISSET('budget_amount') ? GETPOST('budget_amount') : (strcmp($object->budget_amount, '') ? price2num($object->budget_amount) : '')).'"></td>';
 		print '</tr>';
 
 		// Description

From 99db3a2991b4b74a38f1c99379f6c06a0c097ca8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 15:15:07 +0200
Subject: [PATCH 228/490] Fix field for opportunities must be visible only if
 we use opportinities

---
 htdocs/projet/card.php | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index ae91ac0cfac..6918e6fd57c 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -833,9 +833,22 @@ elseif ($object->id > 0)
 		print '<td>';
 		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 		{
-			print '<input type="checkbox" name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
+			print '<input type="checkbox" id="usage_opportunity" name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectFollowOpportunity");
 			print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+			print '<script>';
+			print '$( document ).ready(function() {
+				jQuery("#usage_opportunity").change(function() {
+					if (jQuery("#usage_opportunity").prop("checked")) {
+						console.log("Show opportunities fields");
+						jQuery(".classuseopportunity").show();
+					} else {
+						console.log("Hide opportunities fields "+jQuery("#usage_opportunity").prop("checked"));
+						jQuery(".classuseopportunity").hide();
+					}
+				});
+			});';
+			print '</script>';
 			print '<br>';
 		}
 		if (empty($conf->global->PROJECT_HIDE_TASKS))
@@ -884,8 +897,9 @@ elseif ($object->id > 0)
 
 		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 		{
+			$classfortr = ($object->usage_opportunity ? '' : ' hideobject');
 			// Opportunity status
-			print '<tr><td>'.$langs->trans("OpportunityStatus").'</td>';
+			print '<tr class="classuseopportunity'.$classfortr.'"><td>'.$langs->trans("OpportunityStatus").'</td>';
 			print '<td>';
 			print $formproject->selectOpportunityStatus('opp_status', $object->opp_status, 1, 0, 0, 0, 'inline-block valignmiddle');
 			print '<div id="divtocloseproject" class="inline-block valign" style="display: none;"> &nbsp; &nbsp; ';
@@ -896,14 +910,14 @@ elseif ($object->id > 0)
 			print '</tr>';
 
 		    // Opportunity probability
-		    print '<tr><td>'.$langs->trans("OpportunityProbability").'</td>';
+		    print '<tr class="classuseopportunity'.$classfortr.'"><td>'.$langs->trans("OpportunityProbability").'</td>';
 		    print '<td><input size="5" type="text" id="opp_percent" name="opp_percent" value="'.(GETPOSTISSET('opp_percent') ? GETPOST('opp_percent') : (strcmp($object->opp_percent, '') ?vatrate($object->opp_percent) : '')).'"> %';
             print '<span id="oldopppercent"></span>';
 		    print '</td>';
 		    print '</tr>';
 
 		    // Opportunity amount
-		    print '<tr><td>'.$langs->trans("OpportunityAmount").'</td>';
+		    print '<tr class="classuseopportunity'.$classfortr.'"><td>'.$langs->trans("OpportunityAmount").'</td>';
 		    print '<td><input size="5" type="text" name="opp_amount" value="'.(GETPOSTISSET('opp_amount') ? GETPOST('opp_amount') : (strcmp($object->opp_amount, '') ? price2num($object->opp_amount) : '')).'"></td>';
 		    print '</tr>';
 	    }

From 38059ab86190b32c9a5834062b10864ce91fc010 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 15:17:37 +0200
Subject: [PATCH 229/490] Fix trans

---
 htdocs/langs/en_US/projects.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index cdc0e6b3c95..bb42bff3c87 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks

From 86ff60f16152235e51709c4d91effdff8026822f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 15:50:50 +0200
Subject: [PATCH 230/490] Fix break line and set of opportunity fields

---
 htdocs/accountancy/bookkeeping/balance.php  |  2 +-
 htdocs/core/class/html.formprojet.class.php |  6 ++++--
 htdocs/langs/en_US/accountancy.lang         |  1 +
 htdocs/projet/card.php                      | 19 ++++++++++++++++---
 htdocs/theme/eldy/global.inc.php            |  3 ++-
 htdocs/theme/eldy/theme_vars.inc.php        |  2 +-
 htdocs/theme/md/style.css.php               | 20 +++++++++++---------
 htdocs/theme/md/theme_vars.inc.php          |  2 +-
 8 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index b2a25b00ce2..456da29d954 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -294,7 +294,7 @@ if ($action != 'export_csv')
 		{
 			// Affiche un Sous-Total par compte comptable
 			if ($displayed_account != "") {
-				print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td><td class="nowrap right">'.price(price2num($sous_total_credit - $sous_total_debit)).'</td>';
+				print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td><td class="nowrap right">'.price(price2num($sous_total_credit - $sous_total_debit)).'</td>';
 				print "<td>&nbsp;</td>\n";
 				print '</tr>';
 			}
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index b6c7017e408..bf3db0cc65c 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -620,11 +620,12 @@ class FormProjets
 	 *    @param   int         $showallnone        Add choice "All" and "None"
 	 *    @param   int         $showpercent        Show default probability for status
 	 *    @param   string      $morecss            Add more css
+	 * 	  @param   int	       $noadmininfo        0=Add admin info, 1=Disable admin info
 	 *    @return  int|string                      The HTML select list of element or '' if nothing or -1 if KO
 	 */
-	public function selectOpportunityStatus($htmlname, $preselected = '-1', $showempty = 1, $useshortlabel = 0, $showallnone = 0, $showpercent = 0, $morecss = '')
+	public function selectOpportunityStatus($htmlname, $preselected = '-1', $showempty = 1, $useshortlabel = 0, $showallnone = 0, $showpercent = 0, $morecss = '', $noadmininfo = 0)
 	{
-		global $conf, $langs;
+		global $conf, $langs, $user;
 
 		$sql = "SELECT rowid, code, label, percent";
 		$sql .= " FROM ".MAIN_DB_PREFIX.'c_lead_status';
@@ -670,6 +671,7 @@ class FormProjets
 					$i++;
 				}
 				$sellist .= '</select>';
+				if ($user->admin && !$noadmininfo) $sellist .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			}
 			/*else
 			{
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index adf2309ad07..92cc0f0c79e 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -234,6 +234,7 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 6918e6fd57c..15d1d6d9563 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -558,6 +558,19 @@ if ($action == 'create' && $user->rights->projet->creer)
 		print '<input type="checkbox" id="usage_opportunity" name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ' checked="checked"').'"> ';
 		$htmltext = $langs->trans("ProjectFollowOpportunity");
 		print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+		print '<script>';
+		print '$( document ).ready(function() {
+				jQuery("#usage_opportunity").change(function() {
+					if (jQuery("#usage_opportunity").prop("checked")) {
+						console.log("Show opportunities fields");
+						jQuery(".classuseopportunity").show();
+					} else {
+						console.log("Hide opportunities fields "+jQuery("#usage_opportunity").prop("checked"));
+						jQuery(".classuseopportunity").hide();
+					}
+				});
+			});';
+		print '</script>';
 		print '<br>';
 	}
 	if (empty($conf->global->PROJECT_HIDE_TASKS))
@@ -632,20 +645,20 @@ if ($action == 'create' && $user->rights->projet->creer)
 	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 	{
 		// Opportunity status
-		print '<tr><td>'.$langs->trans("OpportunityStatus").'</td>';
+		print '<tr class="classuseopportunity"><td>'.$langs->trans("OpportunityStatus").'</td>';
 		print '<td class="maxwidthonsmartphone">';
 		print $formproject->selectOpportunityStatus('opp_status', GETPOST('opp_status') ?GETPOST('opp_status') : $object->opp_status);
 		print '</tr>';
 
 		// Opportunity probability
-		print '<tr><td>'.$langs->trans("OpportunityProbability").'</td>';
+		print '<tr class="classuseopportunity"><td>'.$langs->trans("OpportunityProbability").'</td>';
 		print '<td><input size="5" type="text" id="opp_percent" name="opp_percent" value="'.dol_escape_htmltag(GETPOSTISSET('opp_percent') ? GETPOST('opp_percent') : '').'"><span class="hideonsmartphone"> %</span>';
 		print '<input type="hidden" name="opp_percent_not_set" id="opp_percent_not_set" value="'.dol_escape_htmltag(GETPOSTISSET('opp_percent') ? '0' : '1').'">';
 		print '</td>';
 		print '</tr>';
 
 		// Opportunity amount
-		print '<tr><td>'.$langs->trans("OpportunityAmount").'</td>';
+		print '<tr class="classuseopportunity"><td>'.$langs->trans("OpportunityAmount").'</td>';
 		print '<td><input size="5" type="text" name="opp_amount" value="'.dol_escape_htmltag(GETPOSTISSET('opp_amount') ? GETPOST('opp_amount') : '').'"></td>';
 		print '</tr>';
 	}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index afb154408c5..3e213c3d8e2 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -17,6 +17,7 @@
 	--colorbacklinepair2: rgb(<?php print $colorbacklinepair2; ?>);
 	--colorbacklinepairhover: rgb(<?php print $colorbacklinepairhover; ?>);
 	--colorbacklinepairchecked: rgb(<?php print $colorbacklinepairchecked; ?>);
+	--colorbacklinebreak: rgb(<?php print $colorbacklinebreak; ?>);
 	--colorbackbody: rgb(<?php print $colorbackbody; ?>);
 	--colortexttitlenotab: rgb(<?php print $colortexttitlenotab; ?>);
 	--colortexttitle: rgb(<?php print $colortexttitle; ?>);
@@ -3289,7 +3290,7 @@ td.evenodd, tr.nohoverpair td, #trlinefordates td {
 .trforbreak td {
 	font-weight: 500;
     border-bottom: 1pt solid black !important;
-	/* background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinebreak)); ?> !important; */
+	background-color: var(--colorbacklinebreak) !important; !important;
 }
 .trforbreak.nobold td a, .trforbreak.nobold span.secondary {
     font-weight: normal !important;
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 823b8168b4c..d2a11725ecf 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -65,7 +65,7 @@ $colorbacklinepair1 = '251,251,251'; // line pair
 $colorbacklinepair2 = '251,251,251'; // line pair
 $colorbacklinepairhover = '230,237,244'; // line hover
 $colorbacklinepairchecked = '230,237,244'; // line checked
-$colorbacklinebreak = '233,228,230'; // line break
+$colorbacklinebreak = '253,251,250'; // line break
 $colorbackbody = '255,255,255';
 $colortexttitlenotab = '0,113,120'; // 150,90,121 140,80,10 or 10,140,80  #875a7b  green=0,113,120, violet: 0,50,120
 $colortexttitle = '0,0,0';
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index da2df5eb788..36fb265c42a 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -242,6 +242,7 @@ print '*/'."\n";
 	--colorbacklinepair2: rgb(<?php print $colorbacklinepair2; ?>);
 	--colorbacklinepairhover: rgb(<?php print $colorbacklinepairhover; ?>);
 	--colorbacklinepairchecked: rgb(<?php print $colorbacklinepairchecked; ?>);
+	--colorbacklinebreak: rgb(<?php print $colorbacklinebreak; ?>);
 	--colorbackbody: rgb(<?php print $colorbackbody; ?>);
 	--colortexttitlenotab: rgb(<?php print $colortexttitlenotab; ?>);
 	--colortexttitle: rgb(<?php print $colortexttitle; ?>);
@@ -3284,10 +3285,10 @@ ul.noborder li:nth-child(odd):not(.liste_titre) {
 }
 .impair, .nohover .impair:hover, tr.impair td.nohover
 {
-	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
+	background: var(--colorbacklineimpair1);
 }
 #GanttChartDIV {
-	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
+	background-color: var(--colorbacklineimpair1);
 }
 
 .oddeven, .evenodd, .pair, .nohover .pair:hover, tr.pair td.nohover, .tagtr.oddeven {
@@ -3296,25 +3297,26 @@ ul.noborder li:nth-child(odd):not(.liste_titre) {
 	color: #202020;
 }
 .pair, .nohover .pair:hover, tr.pair td.nohover {
-	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?>;
+	background-color: var(--colorbacklinepair1);
 }
+
 table.dataTable tr.oddeven {
-	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
+	background-color: var(--colorbacklinepair1) !important;
 }
 
 /* For no hover style */
 td.oddeven, table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.impair td, table.nohover tr.pair td, tr.nohover td, form.nohover, form.nohover:hover {
-	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
-	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
+	background-color: var(--colorbacklineimpair1) !important; !important;
+	background: var(--colorbacklineimpair1) !important; !important;
 }
 td.evenodd, tr.nohoverpair td, #trlinefordates td {
-	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
-	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
+	background-color: var(--colorbacklinepair1) !important; !important;
+	background: var(--colorbacklinepair1) !important; !important;
 }
 .trforbreak td {
 	font-weight: bold;
     border-bottom: 1pt solid black !important;
-	/* background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinebreak)); ?> !important; */
+	background-color: var(--colorbacklinebreak) !important;
 }
 
 table.dataTable td {
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index 6cdd37fe913..ffad2cc66b5 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -61,7 +61,7 @@ $colorbacklinepair1 = '248,248,248'; // line pair
 $colorbacklinepair2 = '246,246,246'; // line pair
 $colorbacklinepairhover = '230,237,244'; // line hover
 $colorbacklinepairchecked = '230,237,244'; // line checked
-$colorbacklinebreak = '214,218,220';
+$colorbacklinebreak = '250,246,251';
 $colorbackbody = '248,248,248';
 $colortexttitlenotab = '80,71,5';
 $colortexttitle = '20,20,20';

From 1453b8469ea6dad679dc652bc0fa4a175f081cae Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Fri, 15 May 2020 15:56:16 +0200
Subject: [PATCH 231/490] Update 11.0.0-12.0.0.sql

---
 htdocs/install/mysql/migration/11.0.0-12.0.0.sql | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 95c6658c306..8a68e763160 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -285,5 +285,3 @@ ALTER TABLE llx_prelevement_facture ADD COLUMN fk_facture_fourn INTEGER NULL;
 ALTER TABLE llx_menu MODIFY COLUMN module varchar(255);
 
 UPDATE llx_actioncomm SET fk_action = 50 where fk_action = 40 AND code = 'TICKET_MSG'; 
-
-ALTER TABLE llx_commande MODIFY COLUMN date_livraison DATETIME;

From 703fee0635d4deccccccc7a1ac1f88ebe287f397 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Fri, 15 May 2020 15:58:01 +0200
Subject: [PATCH 232/490] Update llx_commande.sql

---
 htdocs/install/mysql/tables/llx_commande.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql
index 676e768c73b..aa237383452 100644
--- a/htdocs/install/mysql/tables/llx_commande.sql
+++ b/htdocs/install/mysql/tables/llx_commande.sql
@@ -64,8 +64,8 @@ create table llx_commande
   fk_currency				varchar(3),						-- currency code
   fk_cond_reglement			integer,						-- condition de reglement
   fk_mode_reglement			integer,						-- mode de reglement
-  
-  date_livraison			date 	  default NULL,
+
+  date_livraison			datetime 	  default NULL,
   fk_shipping_method		integer,						-- shipping method id
   fk_warehouse				integer default NULL,
   fk_availability			integer NULL,

From 6a0bc86ea6a77c000eb1092a8fafdd97fa6ddc50 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Fri, 15 May 2020 16:03:03 +0200
Subject: [PATCH 233/490] Create 12.0.0.-13.0.0.sql

---
 .../mysql/migration/12.0.0.-13.0.0.sql        | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 htdocs/install/mysql/migration/12.0.0.-13.0.0.sql

diff --git a/htdocs/install/mysql/migration/12.0.0.-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0.-13.0.0.sql
new file mode 100644
index 00000000000..e0bf956bb43
--- /dev/null
+++ b/htdocs/install/mysql/migration/12.0.0.-13.0.0.sql
@@ -0,0 +1,35 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 13.0.0 or higher.
+--
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To create a unique index ALTER TABLE llx_table ADD UNIQUE INDEX uk_table_field (field);
+-- To drop an index:        -- VMYSQL4.1 DROP INDEX nomindex on llx_table
+-- To drop an index:        -- VPGSQL8.2 DROP INDEX nomindex
+-- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_table CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres):
+-- -- VPGSQL8.2 CREATE SEQUENCE llx_table_rowid_seq OWNED BY llx_table.rowid;
+-- -- VPGSQL8.2 ALTER TABLE llx_table ADD PRIMARY KEY (rowid);
+-- -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN rowid SET DEFAULT nextval('llx_table_rowid_seq');
+-- -- VPGSQL8.2 SELECT setval('llx_table_rowid_seq', MAX(rowid)) FROM llx_table;
+-- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
+-- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
+-- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
+-- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- Note: fields with type BLOB/TEXT can't have default value.
+
+
+-- Missing in v12
+
+
+-- For v13
+  ALTER TABLE llx_commande MODIFY COLUMN date_livraison DATETIME;

From e00152a8459f51eb9fb9619f06d6d75888f56063 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Fri, 15 May 2020 16:03:38 +0200
Subject: [PATCH 234/490] Rename 12.0.0.-13.0.0.sql to 12.0.0-13.0.0.sql

---
 .../mysql/migration/{12.0.0.-13.0.0.sql => 12.0.0-13.0.0.sql}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename htdocs/install/mysql/migration/{12.0.0.-13.0.0.sql => 12.0.0-13.0.0.sql} (100%)

diff --git a/htdocs/install/mysql/migration/12.0.0.-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
similarity index 100%
rename from htdocs/install/mysql/migration/12.0.0.-13.0.0.sql
rename to htdocs/install/mysql/migration/12.0.0-13.0.0.sql

From 8d242cacae0ab85f988adc3110141c12a28cb918 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Fri, 15 May 2020 16:04:36 +0200
Subject: [PATCH 235/490] Update 12.0.0-13.0.0.sql

update sql
---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index e0bf956bb43..d2ee477afa3 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -32,4 +32,5 @@
 
 
 -- For v13
+
   ALTER TABLE llx_commande MODIFY COLUMN date_livraison DATETIME;

From 5fe9c45fb25a952c9b38d2f815354ec19c7df1e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 16:07:39 +0200
Subject: [PATCH 236/490] Fix look and feel v12

---
 htdocs/core/lib/functions.lib.php |  2 +-
 htdocs/projet/card.php            |  4 +--
 htdocs/societe/card.php           | 51 +++++--------------------------
 3 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 31716dc3f3c..878b85993b5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3149,7 +3149,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
         if (empty($srconly) && in_array($pictowithouttext, array(
         		'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
         		'accountancy', 'address', 'bank_account', 'barcode', 'bank', 'bill', 'bookmark', 'bom', 'building',
-        		'cash-register', 'check', 'close_title', 'company', 'contact', 'contract', 'cubes',
+        		'cash-register', 'category', 'check', 'close_title', 'company', 'contact', 'contract', 'cubes',
         		'delete', 'dolly', 'dollyrevert', 'edit', 'ellipsis-h', 'external-link-alt', 'external-link-square-alt',
         		'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'help',
         		'intervention', 'label', 'language', 'list', 'listlight', 'lot',
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 15d1d6d9563..e79d5bafa59 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -604,7 +604,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 		print '</td><td class="maxwidthonsmartphone">';
 		$filteronlist = '';
 		if (!empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) $filteronlist = $conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
-	   	$text = $form->select_company(GETPOST('socid', 'int'), 'socid', $filteronlist, 'SelectThirdParty', 1, 0, array(), 0, 'minwidth300');
+	   	$text = img_picto('', 'company').$form->select_company(GETPOST('socid', 'int'), 'socid', $filteronlist, 'SelectThirdParty', 1, 0, array(), 0, 'minwidth300 widthcentpercentminusx');
 		if (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) && empty($conf->dol_use_jmobile))
 		{
 			$texthelp = $langs->trans("IfNeedToUseOtherObjectKeepEmpty");
@@ -680,7 +680,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 		print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PROJECT, '', 'parent', 64, 0, 1);
 		$arrayselected = GETPOST('categories', 'array');
-		print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+		print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'widthcentpercentminusx', 0, 0);
 		print "</td></tr>";
 	}
 
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 195d4df88bb..6abb7aa9647 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1331,7 +1331,7 @@ else
         // Country
         print '<tr><td>'.$form->editfieldkey('Country', 'selectcountry_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
         print img_picto('', 'globe-americas', 'class="paddingrightonly"');
-        print $form->select_country((GETPOST('country_id') != '' ?GETPOST('country_id') : $object->country_id));
+        print $form->select_country((GETPOST('country_id') != '' ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx');
         if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
         print '</td></tr>';
 
@@ -1354,16 +1354,16 @@ else
 
         // Phone / Fax
         print '<tr><td>'.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td>';
-        print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>'.img_picto('', 'object_phoning').' <input type="text" name="phone" id="phone" class="maxwidth200" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
+        print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>'.img_picto('', 'object_phoning').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
         if ($conf->browser->layout == 'phone') print '</tr><tr>';
         print '<td>'.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
-        print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>'.img_picto('', 'object_phoning_fax').' <input type="text" name="fax" id="fax" class="maxwidth200" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
+        print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>'.img_picto('', 'object_phoning_fax').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
 
         // Email / Web
         print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', $conf->global->SOCIETE_EMAIL_MANDATORY).'</td>';
-	    print '<td colspan="3">'.img_picto('', 'object_email').' <input type="text" name="email" id="email" value="'.$object->email.'"></td></tr>';
+	    print '<td colspan="3">'.img_picto('', 'object_email').' <input type="text" class="widthcentpercentminusx" name="email" id="email" value="'.$object->email.'"></td></tr>';
         print '<tr><td>'.$form->editfieldkey('Web', 'url', '', $object, 0).'</td>';
-	    print '<td colspan="3">'.img_picto('', 'globe').' <input type="text" name="url" id="url" value="'.$object->url.'"></td></tr>';
+	    print '<td colspan="3">'.img_picto('', 'globe').' <input type="text" class="widthcentpercentminusx" name="url" id="url" value="'.$object->url.'"></td></tr>';
 
         if (!empty($conf->socialnetworks->enabled)) {
             foreach ($socialnetworks as $key => $value) {
@@ -1380,42 +1380,6 @@ else
             }
         }
 
-        // if (! empty($conf->socialnetworks->enabled))
-        // {
-        // 	// Skype
-        // 	if (! empty($conf->global->SOCIALNETWORKS_SKYPE))
-        // 	{
-        // 		print '<tr><td>'.$form->editfieldkey('Skype', 'skype', '', $object, 0).'</td>';
-		// 		print '<td colspan="3">';
-		// 		print '<input type="text" name="skype" class="minwidth100" maxlength="80" id="skype" value="'.dol_escape_htmltag(GETPOSTISSET("skype")?GETPOST("skype", 'alpha'):$object->skype).'">';
-		// 		print '</td></tr>';
-        // 	}
-        // 	// Twitter
-        // 	if (! empty($conf->global->SOCIALNETWORKS_TWITTER))
-        // 	{
-        // 		print '<tr><td>'.$form->editfieldkey('Twitter', 'twitter', '', $object, 0).'</td>';
-		// 		print '<td colspan="3">';
-		// 		print '<input type="text" name="twitter" class="minwidth100" maxlength="80" id="twitter" value="'.dol_escape_htmltag(GETPOSTISSET("twitter")?GETPOST("twitter", 'alpha'):$object->twitter).'">';
-		// 		print '</td></tr>';
-        // 	}
-        // 	// Facebook
-        //     if (! empty($conf->global->SOCIALNETWORKS_FACEBOOK))
-        //     {
-        //         print '<tr><td>'.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).'</td>';
-        //         print '<td colspan="3">';
-        //         print '<input type="text" name="facebook" class="minwidth100" maxlength="80" id="facebook" value="'.dol_escape_htmltag(GETPOSTISSET("facebook")?GETPOST("facebook", 'alpha'):$object->facebook).'">';
-        //         print '</td></tr>';
-        //     }
-        //     // LinkedIn
-        //     if (! empty($conf->global->SOCIALNETWORKS_LINKEDIN))
-        //     {
-        //         print '<tr><td>'.$form->editfieldkey('LinkedIn', 'linkedin', '', $object, 0).'</td>';
-        //         print '<td colspan="3">';
-        //         print '<input type="text" name="linkedin" class="minwidth100" maxlength="80" id="linkedin" value="'.dol_escape_htmltag(GETPOSTISSET("linkedin")?GETPOST("linkedin", 'alpha'):$object->linkedin).'">';
-        //         print '</td></tr>';
-        //     }
-        // }
-
         // Prof ids
         $i = 1; $j = 0; $NBCOLS = ($conf->browser->layout == 'phone' ? 1 : 2);
         while ($i <= 6)
@@ -1481,9 +1445,10 @@ else
         //TODO: Place into a function to control showing by country or study better option
         if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
         {
-            print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
+            print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td colspan="3">';
             print $form->selectyesno('localtax1assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1 : 0), 1);
-            print '</td><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
+            print '</td></tr>';
+            print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td colspan="3">';
             print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1);
             print '</td></tr>';
         }

From c43813ccbb7f5671b0d79291066ded0e35abef30 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 16:23:24 +0200
Subject: [PATCH 237/490] Fix responsive of edition of thirdparties

---
 htdocs/societe/card.php | 62 +++++++++++++++--------------------------
 1 file changed, 22 insertions(+), 40 deletions(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 6abb7aa9647..96a9dd7deed 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1396,7 +1396,7 @@ else
 
                 print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
                 print '</td>';
-                if (($j % 2) == 1) print '</tr>';
+                if (($j % $NBCOLS) == ($NBCOLS - 1)) print '</tr>';
                 $j++;
             }
             $i++;
@@ -1448,6 +1448,7 @@ else
             print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td colspan="3">';
             print $form->selectyesno('localtax1assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1 : 0), 1);
             print '</td></tr>';
+            if ($conf->browser->layout == 'phone') print '</tr><tr>';
             print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td colspan="3">';
             print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1);
             print '</td></tr>';
@@ -1848,6 +1849,7 @@ else
 	        print '<td class="maxwidthonsmartphone">';
 	        print $formcompany->selectProspectCustomerType($object->client);
             print '</td>';
+            if ($conf->browser->layout == 'phone') print '</tr><tr>';
             print '<td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
 
             print '<table class="nobordernopadding"><tr><td>';
@@ -1879,15 +1881,18 @@ else
             	|| (!empty($conf->supplier_proposal->enabled) && !empty($user->rights->supplier_proposal->lire)))
             {
                 print '<tr>';
-                print '<td>'.$form->editfieldkey('Supplier', 'fournisseur', '', $object, 0, 'string', '', 1).'</td><td class="maxwidthonsmartphone">';
+                print '<td>'.$form->editfieldkey('Supplier', 'fournisseur', '', $object, 0, 'string', '', 1).'</td>';
+                print '<td class="maxwidthonsmartphone">';
                 print $form->selectyesno("fournisseur", $object->fournisseur, 1);
                 print '</td>';
+                if ($conf->browser->layout == 'phone') print '</tr><tr>';
                 print '<td>';
                 if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
                 {
                 	print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
                 }
-                print '</td><td>';
+                print '</td>';
+                print '<td>';
                 print '<table class="nobordernopadding"><tr><td>';
                 if ((!$object->code_fournisseur || $object->code_fournisseur == -1) && $modCodeFournisseur->code_auto)
                 {
@@ -1936,7 +1941,9 @@ else
             // Zip / Town
             print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td>';
             print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth50onsmartphone');
-            print '</td><td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td>';
+            print '</td>';
+            if ($conf->browser->layout == 'phone') print '</tr><tr>';
+            print '<td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td>';
             print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
             print $form->widgetForTranslation("town", $object, $permissiontoadd, 'string', 'alphanohtml', 'maxwidth100 quatrevingtpercent');
             print '</td></tr>';
@@ -1944,7 +1951,7 @@ else
             // Country
             print '<tr><td>'.$form->editfieldkey('Country', 'selectcounty_id', '', $object, 0).'</td><td colspan="3">';
             print img_picto('', 'globe-americas', 'class="paddingrightonly"');
-            print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id');
+            print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx');
             if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
             print '</td></tr>';
 
@@ -1966,15 +1973,16 @@ else
 
             // Phone / Fax
             print '<tr><td>'.$form->editfieldkey('Phone', 'phone', GETPOST('phone', 'alpha'), $object, 0).'</td>';
-            print '<td>'.img_picto('', 'object_phoning').' <input type="text" name="phone" id="phone" class="maxwidth200" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
+            print '<td>'.img_picto('', 'object_phoning').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
+            if ($conf->browser->layout == 'phone') print '</tr><tr>';
             print '<td>'.$form->editfieldkey('Fax', 'fax', GETPOST('fax', 'alpha'), $object, 0).'</td>';
-            print '<td>'.img_picto('', 'object_phoning_fax').' <input type="text" name="fax" id="fax" class="maxwidth200" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
+            print '<td>'.img_picto('', 'object_phoning_fax').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
 
             // EMail / Web
             print '<tr><td>'.$form->editfieldkey('EMail', 'email', GETPOST('email', 'alpha'), $object, 0, 'string', '', (!empty($conf->global->SOCIETE_EMAIL_MANDATORY))).'</td>';
-            print '<td colspan="3">'.img_picto('', 'object_email').' <input type="text" name="email" id="email" class="maxwidth100onsmartphone quatrevingtpercent" value="'.(GETPOSTISSET('email') ?GETPOST('email', 'alpha') : $object->email).'"></td></tr>';
+            print '<td colspan="3">'.img_picto('', 'object_email').' <input type="text" name="email" id="email" class="maxwidth200onsmartphone widthcentpercentminusx" value="'.(GETPOSTISSET('email') ?GETPOST('email', 'alpha') : $object->email).'"></td></tr>';
 	        print '<tr><td>'.$form->editfieldkey('Web', 'url', GETPOST('url', 'alpha'), $object, 0).'</td>';
-	        print '<td colspan="3">'.img_picto('', 'globe').' <input type="text" name="url" id="url" class="maxwidth100onsmartphone quatrevingtpercent" value="'.(GETPOSTISSET('url') ?GETPOST('url', 'alpha') : $object->url).'"></td></tr>';
+	        print '<td colspan="3">'.img_picto('', 'globe').' <input type="text" name="url" id="url" class="maxwidth200onsmartphone widthcentpercentminusx " value="'.(GETPOSTISSET('url') ?GETPOST('url', 'alpha') : $object->url).'"></td></tr>';
 
             if (!empty($conf->socialnetworks->enabled)) {
                 foreach ($socialnetworks as $key => $value) {
@@ -1990,36 +1998,9 @@ else
                     }
                 }
             }
-	        // if (! empty($conf->socialnetworks->enabled))
-	        // {
-	        // 	// Skype
-	        // 	if (! empty($conf->global->SOCIALNETWORKS_SKYPE))
-	        // 	{
-	        // 		print '<tr><td>'.$form->editfieldkey('Skype', 'skype', '', $object, 0).'</td>';
-	        // 		print '<td colspan="3"><input type="text" name="skype" id="skype" value="'.$object->skype.'"></td></tr>';
-	        // 	}
-	        // 	// Twitter
-	        // 	if (! empty($conf->global->SOCIALNETWORKS_TWITTER))
-	        // 	{
-	        // 		print '<tr><td>'.$form->editfieldkey('Twitter', 'twitter', '', $object, 0).'</td>';
-	        // 		print '<td colspan="3"><input type="text" name="twitter" id="twitter" value="'.$object->twitter.'"></td></tr>';
-	        // 	}
-	        // 	// Facebook
-	        // 	if (! empty($conf->global->SOCIALNETWORKS_FACEBOOK))
-	        // 	{
-	        // 		print '<tr><td>'.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).'</td>';
-	        // 		print '<td colspan="3"><input type="text" name="facebook" id="facebook" value="'.$object->facebook.'"></td></tr>';
-	        // 	}
-            //     // LinkedIn
-            //     if (! empty($conf->global->SOCIALNETWORKS_LINKEDIN))
-            //     {
-            //         print '<tr><td>'.$form->editfieldkey('LinkedIn', 'linkedin', '', $object, 0).'</td>';
-            //         print '<td colspan="3"><input type="text" name="linkedin" id="linkedin" value="'.$object->linkedin.'"></td></tr>';
-            //     }
-	        // }
 
             // Prof ids
-            $i = 1; $j = 0;
+            $i = 1; $j = 0; $NBCOLS = ($conf->browser->layout == 'phone' ? 1 : 2);
             while ($i <= 6)
             {
                 $idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
@@ -2027,13 +2008,13 @@ else
                 {
 	                $key = 'idprof'.$i;
 
-	                if (($j % 2) == 0) print '<tr>';
+	                if (($j % $NBCOLS) == 0) print '<tr>';
 
 	                $idprof_mandatory = 'SOCIETE_IDPROF'.($i).'_MANDATORY';
 	                print '<td>'.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', !(empty($conf->global->$idprof_mandatory) || !$object->isACompany())).'</td><td>';
 	                print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
                     print '</td>';
-                    if (($j % 2) == 1) print '</tr>';
+                    if (($j % $NBCOLS) == ($NBCOLS - 1)) print '</tr>';
                     $j++;
                 }
                 $i++;
@@ -2058,7 +2039,7 @@ else
                     print '</span>';
                 }
                 print '</td>';
-
+                if ($conf->browser->layout == 'phone') print '</tr><tr>';
                 print '<td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td>';
                 print $form->selectyesno('localtax2assuj_value', $object->localtax2_assuj, 1);
                 if (!isOnlyOneLocalTax(2))
@@ -2132,6 +2113,7 @@ else
             print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
             if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
             print '</td>';
+            if ($conf->browser->layout == 'phone') print '</tr><tr>';
             print '<td>'.$form->editfieldkey('Staff', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
             print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
             if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

From bfbe0037b6147c0611642ce10d00141e26e6f8cb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 16:29:18 +0200
Subject: [PATCH 238/490] Fix responsive

---
 htdocs/projet/card.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index e79d5bafa59..c4a1eb9a71d 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -680,7 +680,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 		print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PROJECT, '', 'parent', 64, 0, 1);
 		$arrayselected = GETPOST('categories', 'array');
-		print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'widthcentpercentminusx', 0, 0);
+		print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 		print "</td></tr>";
 	}
 
@@ -963,14 +963,14 @@ elseif ($object->id > 0)
 		// Tags-Categories
 		if ($conf->categorie->enabled)
 		{
-			print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td>';
+			print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_PROJECT, '', 'parent', 64, 0, 1);
 			$c = new Categorie($db);
 			$cats = $c->containing($object->id, Categorie::TYPE_PROJECT);
 			foreach ($cats as $cat) {
 				$arrayselected[] = $cat->id;
 			}
-			print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+			print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, '0');
 			print "</td></tr>";
 		}
 

From 9fb1766266877f15742627356a680d8c7babb537 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 17:14:28 +0200
Subject: [PATCH 239/490] CSS

---
 htdocs/core/lib/project.lib.php       | 4 ++--
 htdocs/projet/class/project.class.php | 8 +++++---
 htdocs/projet/index.php               | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 940c22a59e0..f3690694b01 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2226,10 +2226,10 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 				print '<tr class="oddeven">';
 
 				print '<td>';
-				print $projectstatic->getNomUrl(1);
+				print $projectstatic->getNomUrl(1, '', 0, '', '-', 0 , -1, 'nowraponall');
 				if (!in_array('projectlabel', $hiddenfields)) print '<br><span class="opacitymedium">'.dol_trunc($objp->title, 24).'</span>';
 				print '</td>';
-				print '<td>';
+				print '<td class="nowraponall tdoverflowmax100">';
 				if ($objp->fk_soc > 0)
 				{
 					$thirdpartystatic->id = $objp->fk_soc;
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 554bc84766a..417a825a77d 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1026,18 +1026,19 @@ class Project extends CommonObject
     }
 
     /**
-     * 	Return clicable name (with picto eventually)
+     * 	Return clickable name (with picto eventually)
      *
      * 	@param	int		$withpicto		          0=No picto, 1=Include picto into link, 2=Only picto
-     * 	@param	string	$option			          Variant ('', 'nolink')
+     * 	@param	string	$option			          Variant where the link point to ('', 'nolink')
      * 	@param	int		$addlabel		          0=Default, 1=Add label into string, >1=Add first chars into string
      *  @param	string	$moreinpopup	          Text to add into popup
      *  @param	string	$sep			          Separator between ref and label if option addlabel is set
      *  @param	int   	$notooltip		          1=Disable tooltip
      *  @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+     *  @param	string	$morecss				  More css on a link
      * 	@return	string					          String with URL
      */
-    public function getNomUrl($withpicto = 0, $option = '', $addlabel = 0, $moreinpopup = '', $sep = ' - ', $notooltip = 0, $save_lastsearch_value = -1)
+    public function getNomUrl($withpicto = 0, $option = '', $addlabel = 0, $moreinpopup = '', $sep = ' - ', $notooltip = 0, $save_lastsearch_value = -1, $morecss = '')
     {
         global $conf, $langs, $user, $hookmanager;
 
@@ -1115,6 +1116,7 @@ class Project extends CommonObject
         if (!$this->public) $picto = 'project';
 
         $linkstart = '<a href="'.$url.'"';
+        $linkstart .= ($morecss ? ' class="'.$morecss.'"' : '');
         $linkstart .= $linkclose.'>';
         $linkend = '</a>';
 
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 3d6903065ab..f9cab81f43c 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -318,7 +318,7 @@ if ($resql)
 		}
 
 		print '<tr class="oddeven">';
-		print '<td class="nowrap">';
+		print '<td class="nowraponall tdoverflowmax100">';
 		if ($obj->socid)
 		{
 			$companystatic->id = $obj->socid;

From 4a9960797bc84dd65c74131382ec7eede79a342d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 17:27:12 +0200
Subject: [PATCH 240/490] responsive

---
 htdocs/societe/card.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 96a9dd7deed..681d4a37fc9 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1401,7 +1401,7 @@ else
             }
             $i++;
         }
-        if ($j % 2 == 1) print '<td colspan="2"></td></tr>';
+        if ($NBCOLS > 1 && ($j % 2 == 1)) print '<td colspan="2"></td></tr>';
 
         // Vat is used
         print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td>';
@@ -1445,11 +1445,11 @@ else
         //TODO: Place into a function to control showing by country or study better option
         if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
         {
-            print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td colspan="3">';
+            print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
             print $form->selectyesno('localtax1assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1 : 0), 1);
-            print '</td></tr>';
+            print '</td>';
             if ($conf->browser->layout == 'phone') print '</tr><tr>';
-            print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td colspan="3">';
+            print '<td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
             print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1);
             print '</td></tr>';
         }
@@ -2019,7 +2019,7 @@ else
                 }
                 $i++;
             }
-            if ($j % 2 == 1) print '<td colspan="2"></td></tr>';
+            if ($NBCOLS > 0 && $j % 2 == 1) print '<td colspan="2"></td></tr>';
 
             // VAT is used
             print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td><td colspan="3">';

From e583dc0a7ff7e183062f49cb56eb887df1cfd758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 15 May 2020 18:07:17 +0200
Subject: [PATCH 241/490] enhance free email

---
 htdocs/core/class/html.form.class.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 999e0463789..d6a4c437c50 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6690,6 +6690,14 @@ class Form
 											text: $.trim(match[1]) + " <" + match[2] + ">"
 										}
 									}
+									var match = params.term.match(new RegExp("^" + REGEX_EMAIL + "$", "i"));
+									// console.log(match);
+									if (match !== null) {
+										return {
+											id: $.trim(match[1]) + " <" + match[1] + ">",
+											text: $.trim(match[1]) + " <" + match[1] + ">"
+										}
+									}
 									return null;
 								}';
 				}

From 762ca96203f6bd92050ca547a9dbe48c3324f2a3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 18:28:15 +0200
Subject: [PATCH 242/490] FIX #13841

---
 htdocs/admin/dict.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 2ad521f79a2..b7f65ddf91f 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -644,6 +644,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue;
         if ($value == 'color' && empty($_POST['color'])) continue;
 		if ($value == 'formula' && empty($_POST['formula'])) continue;
+		if ($value == 'dayrule' && empty($_POST['dayrule'])) continue;
 		if ($value == 'sortorder') continue; // For a column name 'sortorder', we use the field name 'position'
 		if ((!isset($_POST[$value]) || $_POST[$value] == '')
         	&& (!in_array($listfield[$f], array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking'))  // Fields that are not mandatory

From a73eccf70d937f15bd9ebb4040e766845f177c9f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 18:41:46 +0200
Subject: [PATCH 243/490] FIX env of browser not loaded in website

---
 htdocs/core/website.inc.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index b5053fcc814..a00de6a3b01 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -27,6 +27,18 @@
 include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
 include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
 
+// Detection browser (copy of code from main.inc.php)
+if (isset($_SERVER["HTTP_USER_AGENT"]) && is_object($conf) && empty($conf->browser->name))
+{
+	$tmp = getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
+	$conf->browser->name = $tmp['browsername'];
+	$conf->browser->os = $tmp['browseros'];
+	$conf->browser->version = $tmp['browserversion'];
+	$conf->browser->layout = $tmp['layout']; // 'classic', 'phone', 'tablet'
+	//var_dump($conf->browser);
+
+	if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover = 1;
+}
 // Define $website
 if (!is_object($website))
 {

From 1bc87652918b53acae42d2eae34e3eb17fdd801d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 15 May 2020 18:42:41 +0200
Subject: [PATCH 244/490] enhance free email

---
 htdocs/core/class/html.form.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 95ed7e26a13..1097692d61a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6692,6 +6692,10 @@ class Form
 											text: $.trim(match[1]) + " <" + match[2] + ">"
 										}
 									}
+									if (params.term.indexOf("<") >= 0) {
+										// Return null to disable tag creation
+										return null;
+									}
 									var match = params.term.match(new RegExp("^" + REGEX_EMAIL + "$", "i"));
 									// console.log(match);
 									if (match !== null) {

From 76bb57bc6bfed3726d11b6c0c02a510b04139ec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 15 May 2020 18:50:37 +0200
Subject: [PATCH 245/490] enhance free email

---
 htdocs/core/class/html.form.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1097692d61a..49758d55be7 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6699,9 +6699,10 @@ class Form
 									var match = params.term.match(new RegExp("^" + REGEX_EMAIL + "$", "i"));
 									// console.log(match);
 									if (match !== null) {
+										var pos = params.term.indexOf("@");
 										return {
-											id: $.trim(match[1]) + " <" + match[1] + ">",
-											text: $.trim(match[1]) + " <" + match[1] + ">"
+											id: $.trim(match[1].substring(0, pos)) + " <" + match[1] + ">",
+											text: $.trim(match[1].substring(0, pos)) + " <" + match[1] + ">"
 										}
 									}
 									return null;

From 62e0bfbb5f4e42e0cd4d1220fc8d111f1706f316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 15 May 2020 18:53:59 +0200
Subject: [PATCH 246/490] enhance free email

---
 htdocs/core/lib/project.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index f3690694b01..b0179c966c7 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2226,7 +2226,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 				print '<tr class="oddeven">';
 
 				print '<td>';
-				print $projectstatic->getNomUrl(1, '', 0, '', '-', 0 , -1, 'nowraponall');
+				print $projectstatic->getNomUrl(1, '', 0, '', '-', 0, -1, 'nowraponall');
 				if (!in_array('projectlabel', $hiddenfields)) print '<br><span class="opacitymedium">'.dol_trunc($objp->title, 24).'</span>';
 				print '</td>';
 				print '<td class="nowraponall tdoverflowmax100">';
@@ -2288,7 +2288,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 					$total_plannedworkload += $plannedworkload;
 					if (!in_array('plannedworkload', $hiddenfields))
 					{
-						print '<td class="right">'.($plannedworkload ?convertSecondToTime($plannedworkload) : '').'</td>';
+						print '<td class="right">'.($plannedworkload ? convertSecondToTime($plannedworkload) : '').'</td>';
 					}
 					if (!in_array('declaredprogress', $hiddenfields))
 					{

From ff84fd8118ebe747a9eb07eda0d5dfca19db0cb0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 19:01:12 +0200
Subject: [PATCH 247/490] Fix default language of user. Must separate weblangs
 and pagelangs.

---
 htdocs/core/website.inc.php     | 7 ++++++-
 htdocs/langs/en_US/website.lang | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index a00de6a3b01..6456fabf5b3 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -60,11 +60,16 @@ if (!is_object($weblangs))
 {
 	$weblangs = new Translate('', $conf);
 }
+if (!is_object($pagelangs))
+{
+	$pagelangs = new Translate('', $conf);
+}
 if ($pageid > 0)
 {
 	$websitepage->fetch($pageid);
 
-	$weblangs->setDefaultLang($websitepage->lang ? $websitepage->lang : 'auto');
+	$weblangs->setDefaultLang(empty($_COOKIE['weblangs-shortcode']) ? 'auto' : $_COOKIE['weblangs-shortcode']);
+	$pagelangs->setDefaultLang($websitepage->lang ? $websitepage->lang : $weblangs->shortlang);
 
 	if (!defined('USEDOLIBARREDITOR') && in_array($websitepage->type_container, array('menu', 'other')))
 	{
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index f4d88b0d606..2c555b40c20 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added

From 8b79b7f074335f2cc3ea77a8b936121cd0b93fd6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 20:00:59 +0200
Subject: [PATCH 248/490] Update changelog

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index bcbfb1a959c..67cf9513a4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -78,7 +78,7 @@ FIX: we must export company mail address on contact vcard only if contact email
 FIX: when we filter a list on a view status, we want this filter to be on bookmark that we create
 FIX: Wrong Sql on getListOfTowns api method
 FIX: wrong user right's name to top menu "commercial"
-FIX: XSS Vulnerability
+FIX: XSS Vulnerability reported by Mehmet Kelepçe / Gais Cyber Security
 
 ***** ChangeLog for 11.0.3 compared to 11.0.2 *****
 FIX: unit price for selected supplier products not set. NaN was used.

From 791c4b48b64feba1da952d1aef43d79a3d3fb199 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 20:08:35 +0200
Subject: [PATCH 249/490] Fix

---
 htdocs/projet/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index c4a1eb9a71d..6af779a2295 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -580,7 +580,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 		print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 		print '<br>';
 	}
-	if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
+	if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT))
 	{
 		print '<input type="checkbox" id="usage_bill_time" name="usage_bill_time"'.(GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '').'"> ';
 		$htmltext = $langs->trans("ProjectBillTimeDescription");
@@ -871,7 +871,7 @@ elseif ($object->id > 0)
 			print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 			print '<br>';
 		}
-		if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
+		if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT))
 		{
 			print '<input type="checkbox" name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectBillTimeDescription");

From 0847f5350a62f44ca098668611a6ab7d4a39eb2a Mon Sep 17 00:00:00 2001
From: "jove@bisquerra.com" <jove@bisquerra.com>
Date: Fri, 15 May 2020 23:44:19 +0200
Subject: [PATCH 250/490] TakePOS Auto Order improvements

---
 htdocs/takepos/css/phone.css    | 96 +++++++++++++++++++++++++++++++--
 htdocs/takepos/genimg/index.php |  5 +-
 htdocs/takepos/invoice.php      | 30 ++++++-----
 htdocs/takepos/phone.php        | 76 +++++++++++++++++---------
 4 files changed, 164 insertions(+), 43 deletions(-)

diff --git a/htdocs/takepos/css/phone.css b/htdocs/takepos/css/phone.css
index 0f3606071f0..37434cfc707 100644
--- a/htdocs/takepos/css/phone.css
+++ b/htdocs/takepos/css/phone.css
@@ -4,6 +4,7 @@ html,body {
     margin:0;
     height:100%;
 	width:100%;
+	background-color: #FFF !important;
 }
 
 .container{
@@ -17,14 +18,14 @@ html,body {
 .phonerow1{
 	margin: 0 auto;
 	width: 100%;
-	height: 40%;
+	height: auto;
 	min-height: 40%;
 }
 
 .phonerow2{
 	margin: 0 auto;
 	width: 100%;
-	height: 40%;
+	height: auto;
 }
 
 .phonebuttonsrow{
@@ -90,7 +91,71 @@ button.publicphonebutton {
 	text-align: center;
 	overflow: visible; /* removes extra width in IE */
 	width:33%;
-	height:90%;
+	height:50px;
+	font-weight: bold;
+	color: #fff;
+}
+
+.phoneblue{
+	color: #fff;
+	background-color: #428bca;
+	border-color: #357ebd;
+}
+
+.phonegreen{
+	color: #fff;
+	background-color: #5cb85c;
+	border-color: #4cae4c;
+	font-size:20px;
+	text-align:center;
+	width:20px;
+}
+
+.phonetable{
+	width:130px;
+}
+
+.phoneqty{
+	font-size:24px;
+	font-weight: bold;
+	
+	
+}
+
+.phonered{
+	color: #fff;
+	background-color: #dc3545;
+	border-color: #dc3545;
+	font-size:20px;
+	text-align:center;
+	width:20px;
+}
+
+.phoneorange{
+	color: #fff;
+	background-color: #f0ad4e;
+	border-color: #eea236;
+}
+
+.total{
+	width:100% !important;
+	font-size:24px;
+}
+
+.width24{
+		font-size:24px;
+}
+
+.leftcat{
+	margin-top:15px;
+	float:left;
+	width: 50%;
+	text-align:center;
+	height:150px;;
+	overflow:hidden;
+	margin-bottom:5px;
+	font-size:18px;
+	color:#5B5858;
 	font-weight: bold;
 }
 
@@ -107,3 +172,28 @@ button.publicphonebutton2 {
 	font-weight: bold;
 	padding: 8px 16px;
 }
+
+.div-table-responsive-no-min{
+	margin-top:20px;
+}
+
+.comment {
+    float: left;
+    width: 100%;
+    height: auto;
+}
+
+.comment-text-area {
+    float: left;
+    width: 80%;
+    height: auto;
+}
+
+.textinput {
+    float: left;
+    width: 100%;
+    min-height: 75px;
+    outline: none;
+    resize: none;
+    border: 1px solid grey;
+}
\ No newline at end of file
diff --git a/htdocs/takepos/genimg/index.php b/htdocs/takepos/genimg/index.php
index e668b01aacb..fbb388b9aec 100644
--- a/htdocs/takepos/genimg/index.php
+++ b/htdocs/takepos/genimg/index.php
@@ -77,7 +77,10 @@ elseif ($query == "pro")
 	preg_match('@src="([^"]+)"@', $image, $match);
 	$file = array_pop($match);
 	if ($file == "") header('Location: ../../public/theme/common/nophoto.png');
-	else header('Location: '.$file.'&cache=1&publictakepos=1&modulepart=product');
+	else{
+		if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) header('Location: '.$file.'&cache=1');
+		else header('Location: '.$file.'&cache=1&publictakepos=1&modulepart=product');
+	}
 }
 else
 {
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 16012022dc9..3b486b7a3bc 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -70,10 +70,12 @@ if (($conf->global->TAKEPOS_PHONE_BASIC_LAYOUT == 1 && $conf->browser->layout ==
 	<meta name="apple-mobile-web-app-capable" content="yes">
 	<meta name="mobile-web-app-capable" content="yes">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
+	$arrayofcss = array(
+	'/takepos/css/pos.css.php',
+	'/takepos/js/jquery.colorbox-min.js'
+	);
+	$arrayofjs = array('/takepos/js/jquery.colorbox-min.js');
 	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
-	print '<link rel="stylesheet" href="css/pos.css.php">
-	<link rel="stylesheet" href="css/colorbox.css" type="text/css" media="screen" />
-	<script type="text/javascript" src="js/jquery.colorbox-min.js"></script>';
 }
 
 /**
@@ -877,6 +879,7 @@ if ($_SESSION["basiclayout"] != 1)
 	print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
 	print '<td class="linecolht right nowraponall">'.$langs->trans('TotalTTCShort').'</td>';
 }
+else print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
 print "</tr>\n";
 
 
@@ -889,12 +892,11 @@ if ($_SESSION["basiclayout"] == 1)
         $categories = $categorie->get_full_arbo('product');
 		$htmlforlines = '';
         foreach ($categories as $row) {
-			$htmlforlines .= '<tr class="drag drop oddeven posinvoiceline';
+			$htmlforlines .= '<div class="leftcat';
 			$htmlforlines .= '" onclick="LoadProducts('.$row['id'].');">';
-			$htmlforlines .= '<td class="left">';
+			$htmlforlines .= '<img class="imgwrapper" width="33%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=cat&query=cat&id='.$row['id'].'"><br>';
 			$htmlforlines .= $row['label'];
-			$htmlforlines .= '</td>';
-			$htmlforlines .= '</tr>'."\n";
+			$htmlforlines .= '</div>'."\n";
 		}
 		$htmlforlines .= '</table>';
 		$htmlforlines .= '</table>';
@@ -910,12 +912,11 @@ if ($_SESSION["basiclayout"] == 1)
 		$prods = $object->getObjectsInCateg("product");
 		$htmlforlines = '';
 		foreach ($prods as $row) {
-			$htmlforlines .= '<tr class="drag drop oddeven posinvoiceline';
+			$htmlforlines .= '<div class="leftcat';
 			$htmlforlines .= '" onclick="AddProduct(\''.$place.'\', '.$row->id.')">';
-			$htmlforlines .= '<td class="left">';
-			$htmlforlines .= $row->label;
-			$htmlforlines .= '<div class="right">'.price($row->price_ttc, 1, $langs, 1, -1, -1, $conf->currency).'</div>';
-			$htmlforlines .= '</tr>'."\n";
+			$htmlforlines .= '<img class="imgwrapper" width="33%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=pro&query=pro&id='.$row->id.'"><br>';
+			$htmlforlines .= $row->label.''.price($row->price_ttc, 1, $langs, 1, -1, -1, $conf->currency);
+			$htmlforlines .= '</div>'."\n";
 		}
 		$htmlforlines .= '</table>';
 		print $htmlforlines;
@@ -991,7 +992,7 @@ if ($placeid > 0)
             }
             $htmlforlines .= '" id="'.$line->id.'">';
             $htmlforlines .= '<td class="left">';
-			if ($_SESSION["basiclayout"] == 1) $htmlforlines .= $line->qty." x ";
+			if ($_SESSION["basiclayout"] == 1) $htmlforlines .= '<span class="phoneqty">'.$line->qty."</span> x ";
             //if ($line->product_label) $htmlforlines.= '<b>'.$line->product_label.'</b>';
             if (isset($line->product_type))
             {
@@ -1026,7 +1027,8 @@ if ($placeid > 0)
 	            }
             }
             if (!empty($line->array_options['options_order_notes'])) $htmlforlines .= "<br>(".$line->array_options['options_order_notes'].")";
-            if ($_SESSION["basiclayout"] != 1)
+            if ($_SESSION["basiclayout"] == 1) $htmlforlines .= '</td><td class="right phonetable"><button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty-1).');" class="publicphonebutton2 phonered">-</button>&nbsp;&nbsp;<button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty+1).');" class="publicphonebutton2 phonegreen">+</button>';
+			if ($_SESSION["basiclayout"] != 1)
 			{
 				$moreinfo = '';
 				$moreinfo .= $langs->transcountry("TotalHT", $mysoc->country_code).': '.price($line->total_ht);
diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 90f0aa363dc..113e92ec3bb 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -62,26 +62,34 @@ if (empty($user->rights->takepos->run) && !defined('INCLUDE_PHONEPAGE_FROM_PUBLI
  * View
  */
 
-// Title
-$title = 'TakePOS - Dolibarr '.DOL_VERSION;
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
-$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="mobile-web-app-capable" content="yes">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
-top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
-
-print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/takepos/css/phone.css">';
-
 if ($action == "productinfo") {
 	$prod = new Product($db);
     $prod->fetch($idproduct);
-	print "<b>".$prod->label."</b><br>";
+	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="AddProductConfirm(place, '.$idproduct.');">'.$langs->trans('Add').'</button>';
+	print "<br><b>".$prod->label."</b><br>";
 	print '<img class="imgwrapper" width="60%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=pro&query=pro&id='.$idproduct.'">';
 	print "<br>".$prod->description;
 	print "<br><b>".price($prod->price_ttc, 1, $langs, 1, -1, -1, $conf->currency)."</b>";
 	print '<br>';
-	print '<button type="button" class="publicphonebutton2" onclick="AddProductConfirm(place, '.$idproduct.');">'.$langs->trans('Add').'</button>';
+}
+elseif ($action == "publicpreorder") {
+	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="TakeposPrintingOrder();">'.$langs->trans('Confirm').'</button>';
+	print "<br><br>";
+	print 	'<div class="comment">
+            <textarea class="textinput" placeholder="'.$langs->trans('Note').'"></textarea>
+			</div>';
+	print '<br>';
+}
+elseif ($action == "publicpayment") {
+	$langs->loadLangs(array("orders"));
+	print '<h1>'.$langs->trans('StatusOrderDelivered').'</h1>';
+	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease();">'.$langs->trans('Payment').'</button>';
+	print '<br>';
+}
+elseif ($action == "checkplease") {
+	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease();">'.$langs->trans('Cash').'</button>';
+	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease();">'.$langs->trans('CreditCard').'</button>';
+	print '<br>';
 }
 elseif ($action == "editline") {
 	$placeid = GETPOST('placeid', 'int');
@@ -99,13 +107,22 @@ elseif ($action == "editline") {
 			print "<br>".$prod->description;
 			print "<br><b>".price($prod->price_ttc, 1, $langs, 1, -1, -1, $conf->currency)."</b>";
 			print '<br>';
-			print '<button type="button" class="publicphonebutton2" onclick="SetQty(place, '.$selectedline.', '.($line->qty - 1).');">-</button>';
-			print '<button type="button" class="publicphonebutton2" onclick="SetQty(place, '.$selectedline.', '.($line->qty + 1).');">+</button>';
-			print '<button type="button" class="publicphonebutton2" onclick="SetNote(place, '.$selectedline.');">'.$langs->trans('Note').'</button>';
+			print '<button type="button" class="publicphonebutton2 phonered width24" onclick="SetQty(place, '.$selectedline.', '.($line->qty - 1).');">-</button>';
+			print '<button type="button" class="publicphonebutton2 phonegreen width24" onclick="SetQty(place, '.$selectedline.', '.($line->qty + 1).');">+</button>';
+			print '<button type="button" class="publicphonebutton2 phoneblue width24" onclick="SetNote(place, '.$selectedline.');">'.$langs->trans('Note').'</button>';
         }
     }
 }
 else {
+// Title
+$title = 'TakePOS - Dolibarr '.DOL_VERSION;
+if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="mobile-web-app-capable" content="yes">
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
+$arrayofcss = array('/takepos/css/phone.css');
+top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 	?>
 <script language="javascript">
 	<?php
@@ -194,6 +211,11 @@ function AddProduct(placeid, productid){
 	?>
 }
 
+function PublicPreOrder(){ //echo '$("#phonediv1").load("auto_order.php?mobilepage=cats&place="+place, function() {
+	$("#phonediv1").load("auto_order.php?action=publicpreorder&place="+place, function() {
+	});
+}
+
 function AddProductConfirm(placeid, productid){
 	place=placeid;
 	<?php
@@ -263,7 +285,9 @@ function TakeposPrintingOrder(){
     console.log("TakeposPrintingOrder");
 	<?php
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		echo '$("#phonediv2").load("auto_order.php?action=order&place="+place, function() {
+		echo '$("#phonediv2").load("auto_order.php?action=order&mobilepage=order&place="+place, function() {
+		});';
+		echo '$("#phonediv1").load("auto_order.php?action=publicpayment&place="+place, function() {
 		});';
 	}
 	else {
@@ -278,6 +302,8 @@ function Exit(){
 }
 
 function CheckPlease(){
+	$("#phonediv1").load("auto_order.php?action=checkplease&place="+place, function() {
+	});
 	console.log("Request the check to the waiter");
 	$.ajax({
 		type: "GET",
@@ -287,7 +313,7 @@ function CheckPlease(){
 
 </script>
 
-<body style="overflow: hidden; background-color:#D1D1D1;">
+<body style="background-color:#D1D1D1;">
 	<?php
 	if ($conf->global->TAKEPOS_NUM_TERMINALS != "1" && $_SESSION["takeposterminal"] == "") print '<div class="dialog-info-takepos-terminal" id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>';
 	?>
@@ -301,18 +327,18 @@ function CheckPlease(){
 			print '<button type="button" class="phonebutton" onclick="Exit();">'.strtoupper(substr($langs->trans('Logout'), 0, 3)).'</button>';
 		}
 		else {
-			print '<button type="button" class="publicphonebutton" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 5)).'</button>';
-			print '<button type="button" class="publicphonebutton" onclick="TakeposPrintingOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 5)).'</button>';
-			print '<button type="button" class="publicphonebutton" onclick="CheckPlease();">'.strtoupper(substr($langs->trans('Payment'), 0, 5)).'</button>';
+			print '<button type="button" class="publicphonebutton phoneblue" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 5)).'</button>';
+			print '<button type="button" class="publicphonebutton phoneorange" onclick="PublicPreOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 5)).'</button>';
+			print '<button type="button" class="publicphonebutton phonegreen" onclick="CheckPlease();">'.strtoupper(substr($langs->trans('Payment'), 0, 5)).'</button>';
 		}
 		?>
 	</div>
-	<div class="row1">
-		<div id="phonediv1" class="phonediv1"></div>
-	</div>
-	<div class="row2">
+	<div class="phonerow2">
 		<div id="phonediv2" class="phonediv2"></div>
 	</div>
+	<div class="phonerow1">
+		<div id="phonediv1" class="phonediv1"></div>
+	</div>
 </div>
 </body>
 	<?php

From ceafbb9855748ad431b9b978a6e812affb109193 Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sat, 16 May 2020 00:07:13 +0200
Subject: [PATCH 251/490] Fix travis

---
 htdocs/takepos/phone.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 113e92ec3bb..b876b42bc98 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -114,15 +114,15 @@ elseif ($action == "editline") {
     }
 }
 else {
-// Title
-$title = 'TakePOS - Dolibarr '.DOL_VERSION;
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
-$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
+	// Title
+	$title = 'TakePOS - Dolibarr '.DOL_VERSION;
+	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+	$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="mobile-web-app-capable" content="yes">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
-$arrayofcss = array('/takepos/css/phone.css');
-top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+	$arrayofcss = array('/takepos/css/phone.css');
+	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 	?>
 <script language="javascript">
 	<?php
@@ -211,7 +211,7 @@ function AddProduct(placeid, productid){
 	?>
 }
 
-function PublicPreOrder(){ //echo '$("#phonediv1").load("auto_order.php?mobilepage=cats&place="+place, function() {
+function PublicPreOrder(){
 	$("#phonediv1").load("auto_order.php?action=publicpreorder&place="+place, function() {
 	});
 }

From 38346afe0e57094e3934cd60fae43c2785cadac5 Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sat, 16 May 2020 00:26:42 +0200
Subject: [PATCH 252/490] Clean

---
 htdocs/takepos/phone.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index b876b42bc98..32074b43d74 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -243,7 +243,7 @@ function SetQty(place, selectedline, qty){
 }
 
 function SetNote(place, selectedline){
-	var note = prompt("<?php $langs->trans('Note'); ?>", "Harry Potter");
+	var note = prompt("<?php $langs->trans('Note'); ?>", "");
 	$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=updateqty&place="+place+"&idline="+selectedline+"&number="+qty, function() {
     });
 	LoadCats();

From 24f4a0be1fc420e0f09090b6e1485a895143228b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 May 2020 04:24:23 +0200
Subject: [PATCH 253/490] exclude other log files

---
 htdocs/admin/tools/export_files.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index d9a010019a5..89abae78117 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -135,7 +135,7 @@ elseif (in_array($compression, array('gz', 'bz')))
 
     $file .= '.tar';
     // We also exclude '/temp/' dir and 'documents/admin/documents'
-    $cmd = "tar -cf ".$outputdir."/".$file." --exclude-vcs --exclude 'temp' --exclude 'dolibarr.log' --exclude='documents/admin/documents' -C ".dirname(DOL_DATA_ROOT)." ".basename(DOL_DATA_ROOT);
+    $cmd = "tar -cf ".$outputdir."/".$file." --exclude-vcs --exclude 'temp' --exclude 'dolibarr.log' --exclude 'dolibarr_*.log' --exclude='documents/admin/documents' -C ".dirname(DOL_DATA_ROOT)." ".basename(DOL_DATA_ROOT);
 
     $result = $utils->executeCLI($cmd, $outputfile);
 

From 75ac3773523fc6cd4f2c6c5ef729a14259ede352 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 May 2020 04:26:43 +0200
Subject: [PATCH 254/490] Fix tar command

---
 htdocs/admin/tools/export_files.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index 89abae78117..de10759c92d 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -135,7 +135,7 @@ elseif (in_array($compression, array('gz', 'bz')))
 
     $file .= '.tar';
     // We also exclude '/temp/' dir and 'documents/admin/documents'
-    $cmd = "tar -cf ".$outputdir."/".$file." --exclude-vcs --exclude 'temp' --exclude 'dolibarr.log' --exclude 'dolibarr_*.log' --exclude='documents/admin/documents' -C ".dirname(DOL_DATA_ROOT)." ".basename(DOL_DATA_ROOT);
+    $cmd = "tar -cf ".$outputdir."/".$file." --exclude-vcs --exclude 'temp' --exclude 'dolibarr.log' --exclude 'dolibarr_*.log' --exclude 'documents/admin/documents' -C ".dirname(DOL_DATA_ROOT)." ".basename(DOL_DATA_ROOT);
 
     $result = $utils->executeCLI($cmd, $outputfile);
 

From 0781e9e227443a7b31a376335517b1c99921fee3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 May 2020 14:47:12 +0200
Subject: [PATCH 255/490] CSS

---
 htdocs/theme/eldy/info-box.inc.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 3d9c392f32b..ca849c58f4b 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -76,6 +76,9 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
     font-size: 25px;
     line-height: 100px;
 }
+.opened-dash-board-wrap .info-box-sm .info-box-icon {
+    line-height: 80px;
+}
 .info-box-module .info-box-icon {
 	height: 106px;
 }
@@ -200,6 +203,7 @@ if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) $prefix = 'backgro
 if (!isset($conf->global->THEME_AGRESSIVENESS_RATIO) && $prefix) $conf->global->THEME_AGRESSIVENESS_RATIO = -50;
 if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENESS_RATIO = GETPOST('THEME_AGRESSIVENESS_RATIO', 'int');
 //var_dump($conf->global->THEME_AGRESSIVENESS_RATIO);
+
 ?>
 .info-box-icon {
 	<?php if ($prefix) { ?>

From c85233e779099d637c18b3db4d9ba347360750ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 May 2020 15:12:28 +0200
Subject: [PATCH 256/490] Fix CSS

---
 htdocs/theme/eldy/info-box.inc.php |   3 +-
 htdocs/theme/md/info-box.inc.php   | 109 +++++++++++++++++++++++++++--
 2 files changed, 104 insertions(+), 8 deletions(-)

diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index ca849c58f4b..98130f1d03a 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -80,7 +80,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
     line-height: 80px;
 }
 .info-box-module .info-box-icon {
-	height: 106px;
+	height: 107px;
 }
 .info-box-icon > img {
 	max-width: 100%;
@@ -175,6 +175,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 .info-box-title{
 	text-transform: uppercase;
 	font-weight: bold;
+	padding-bottom: 4px;
 }
 .info-box-text{
 	font-size: 0.92em;
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index d866cab96a6..a382173bfde 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -8,21 +8,25 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
  */
 
 .info-box-module-external span.info-box-icon-version {
-    background: #999;
-}
-
-span.info-box-icon-text {	/* hide box text number due to problems */
-    display: none;
+    background: #bbb;
 }
 
 .info-box {
 	display: block;
+	position: relative;
 	min-height: 90px;
 	background: #fff;
 	width: 100%;
+	/* box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.1); */
+	border-radius: 2px;
 	margin-bottom: 15px;
 	border: 1px solid #ddd;
 }
+.info-box.info-box-sm{
+    min-height: 80px;
+    margin-bottom: 10px;
+}
+
 .info-box small {
 	font-size: 14px;
 }
@@ -53,14 +57,26 @@ span.info-box-icon-text {	/* hide box text number due to problems */
 }
 .info-box-icon {
 	display: block;
+	overflow: hidden;
 	float: left;
-	height: 90px;
+	/* height: 90px; */
 	width: 90px;
 	text-align: center;
 	font-size: 45px;
 	line-height: 90px;
 	background: #eee;
 }
+.info-box-sm .info-box-icon {
+    width: 80px;
+    font-size: 25px;
+    line-height: 100px;
+}
+.opened-dash-board-wrap .info-box-sm .info-box-icon {
+    line-height: 80px;
+}
+.info-box-module .info-box-icon {
+	height: 108px;
+}
 .info-box-icon > img {
 	max-width: 100%;
 }
@@ -71,6 +87,74 @@ span.info-box-icon-text {	/* hide box text number due to problems */
 	padding: 5px 10px;
 	margin-left: 90px;
 }
+
+.info-box-icon-text{
+    box-sizing: border-box;
+    display: block;
+    position: absolute;
+    width: 90px;
+    bottom: 0px;
+    color: #ffffff;
+    background-color: rgba(0,0,0,0.1);
+    cursor: default;
+
+    font-size: 10px;
+    line-height: 15px;
+    padding: 0px 3px;
+    text-align: center;
+    opacity: 0;
+    -webkit-transition: opacity 0.5s, visibility 0s 0.5s;
+    transition: opacity 0.5s, visibility 0s 0.5s;
+}
+
+.info-box-icon-version {
+    box-sizing: border-box;
+    display: block;
+    position: absolute;
+    width: 90px;
+    bottom: 0px;
+    color: #ffffff;
+    background-color: rgba(0,0,0,0.1);
+    cursor: default;
+
+    font-size: 10px;
+    line-height: 22px;
+    padding: 0px 3px;
+    text-align: center;
+    opacity: 1;
+    -webkit-transition: opacity 0.5s, visibility 0s 0.5s;
+    transition: opacity 0.5s, visibility 0s 0.5s;
+}
+
+.box-flex-item.info-box-module.info-box-module-disabled {
+    /* opacity: 0.6; */
+}
+
+.info-box-actions {
+	position: absolute;
+    right: 0;
+    bottom: 0;
+}
+
+<?php if (empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS) && !empty($conf->global->MAIN_INCLUDE_GLOBAL_STATS_IN_OPENED_DASHBOARD)) { ?>
+.info-box-icon-text{
+    opacity: 1;
+}
+<?php } ?>
+
+.info-box-sm .info-box-icon-text, .info-box-sm .info-box-icon-version{
+    overflow: hidden;
+    width: 80px;
+}
+.info-box:hover .info-box-icon-text{
+    opacity: 1;
+}
+
+.info-box-content {
+	padding: 5px 10px;
+	margin-left: 90px;
+}
+
 .info-box-number {
 	display: block;
 	font-weight: bold;
@@ -88,6 +172,7 @@ span.info-box-icon-text {	/* hide box text number due to problems */
 .info-box-title{
 	text-transform: uppercase;
 	font-weight: bold;
+	padding-bottom: 5px;
 }
 .info-box-text{
 	font-size: 12px;
@@ -152,7 +237,7 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES
 }
 .fa-dol-propal:before,
 .fa-dol-supplier_proposal:before {
-	content: "\f2b5";
+	content: "\f573";
 }
 .fa-dol-facture:before,
 .fa-dol-invoice_supplier:before {
@@ -168,6 +253,9 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES
 .fa-dol-contrat:before {
 	content: "\f1e6";
 }
+.fa-dol-ticket:before {
+	content: "\f3ff";
+}
 .fa-dol-bank_account:before {
 	content: "\f19c";
 }
@@ -261,3 +349,10 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES
 	height: 0;
 }
 
+.info-box-module {
+	min-width: 350px;
+    max-width: 350px;
+}
+.info-box-module .info-box-content {
+	height: 7em;
+}

From bd4251237b8f72de09541c7dd9abecf7e37c7596 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 May 2020 15:16:40 +0200
Subject: [PATCH 257/490] css

---
 htdocs/theme/eldy/global.inc.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 3e213c3d8e2..c4f223ebf1f 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1624,6 +1624,13 @@ td.nobordernopadding.widthpictotitle.col-picto {
 	width: unset;
     color: #999;
 }
+
+span.widthpictotitle.pictotitle {
+/*    background: var(--colortexttitlenotab);
+    color: #fff;
+    padding: 10px;
+    border-radius: 2px;*/
+}
 .pictotitle {
 	margin-<?php echo $right; ?>: 8px;
 	/* margin-bottom: 4px; */

From ce0d00a0ae89dd014d9bd95cac70ec660e7a2a25 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 May 2020 15:50:46 +0200
Subject: [PATCH 258/490] CSS

---
 htdocs/theme/md/info-box.inc.php | 45 +++++++++++++++++++++++++++++---
 htdocs/theme/md/style.css.php    |  4 +--
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index a382173bfde..2dec0087a1b 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -2,10 +2,47 @@
 if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 /* <style type="text/css" > */
 
-/*
- * Component: Info Box
- * -------------------
- */
+
+/* ICONS INFO BOX */
+<?php
+include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+$prefix = '';
+//$prefix = 'background-';
+if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) $prefix = 'background-';
+?>
+
+.bg-infobox-project{
+	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#6c6aa8', $conf->global->THEME_AGRESSIVENESS_RATIO); ?> !important;
+}
+.bg-infobox-action{
+	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#a47080', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+}
+.bg-infobox-propal,
+.bg-infobox-facture,
+.bg-infobox-commande{
+	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#99a17d', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+}
+.bg-infobox-supplier_proposal,
+.bg-infobox-invoice_supplier,
+.bg-infobox-order_supplier{
+	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#599caf', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+}
+.bg-infobox-contrat, .bg-infobox-ticket{
+	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#46a676', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+}
+.bg-infobox-bank_account{
+	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#b0a53e', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+}
+.bg-infobox-adherent{
+	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#79633f', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+}
+.bg-infobox-expensereport{
+	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#79633f', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+}
+.bg-infobox-holiday{
+	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#755114', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+}
 
 .info-box-module-external span.info-box-icon-version {
     background: #bbb;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 36fb265c42a..f6b42dc3e55 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2058,8 +2058,8 @@ div.mainmenu.members {
 
 div.mainmenu.menu {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/menu.png', 1) ?>);
-	top: 7px;
-	left: 5px;
+	top: 10px;
+	left: 1px;
 }
 
 div.mainmenu.products {

From 783b71a9da7ca6d0016db78bb79c466632866da2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 May 2020 16:27:23 +0200
Subject: [PATCH 259/490] Fix language set

---
 htdocs/core/website.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 6456fabf5b3..5c618b089a3 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -68,7 +68,7 @@ if ($pageid > 0)
 {
 	$websitepage->fetch($pageid);
 
-	$weblangs->setDefaultLang(empty($_COOKIE['weblangs-shortcode']) ? 'auto' : $_COOKIE['weblangs-shortcode']);
+	$weblangs->setDefaultLang(GETPOSTISSET('lang') ? GETPOST('lang', 'aZ09') : (empty($_COOKIE['weblangs-shortcode']) ? 'auto' : $_COOKIE['weblangs-shortcode']));
 	$pagelangs->setDefaultLang($websitepage->lang ? $websitepage->lang : $weblangs->shortlang);
 
 	if (!defined('USEDOLIBARREDITOR') && in_array($websitepage->type_container, array('menu', 'other')))

From 54af917afb333d91300fc2203914d3231896dd08 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 16 May 2020 20:04:07 +0200
Subject: [PATCH 260/490] Fix cron globals reload, missing mysoc and langs

---
 scripts/cron/cron_run_jobs.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index 635c128a89f..104443feba1 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -191,11 +191,12 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs)>0))
 		// Force reload of setup for the current entity
 		if ($line->entity != $conf->entity)
 		{
-		    dol_syslog("cron_run_jobs.php we work on another entity so we reload user and conf", LOG_DEBUG);
-		    echo " -> we change entity so we reload user and conf";
+		    dol_syslog("cron_run_jobs.php we work on another entity so we reload mysoc, langs, user and conf", LOG_DEBUG);
+		    echo " -> we change entity so we reload mysoc, langs, user and conf";
 
 		    $conf->entity = (empty($line->entity)?1:$line->entity);
 		    $conf->setValues($db);        // This make also the $mc->setValues($conf); that reload $mc->sharings
+		    $mysoc->setMysoc($conf);
 
 		    // Force recheck that user is ok for the entity to process and reload permission for entity
 		    if ($conf->entity != $user->entity && $user->entity != 0)
@@ -218,6 +219,11 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs)>0))
     		    }
     		    $user->getrights();
 		    }
+
+		    // Reload langs
+		    $langcode = (empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT);
+		    if (! empty($user->conf->MAIN_LANG_DEFAULT)) $langcode = $user->conf->MAIN_LANG_DEFAULT;
+		    if($langs->getDefaultLang() != $langcode) $langs->setDefaultLang($langcode);
 		}
 
 		//If date_next_jobs is less of current date, execute the program, and store the execution time of the next execution in database

From af46108cc429b4ee6f6f0cc1ab8125a358ef809d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 May 2020 13:34:16 +0200
Subject: [PATCH 261/490] Look and feel v12

---
 htdocs/accountancy/bookkeeping/card.php         | 10 +++++-----
 htdocs/bom/lib/bom.lib.php                      |  2 +-
 htdocs/bookmarks/card.php                       |  2 +-
 htdocs/categories/viewcat.php                   |  4 ++--
 htdocs/compta/bank/categ.php                    |  7 +++----
 htdocs/compta/bank/info.php                     |  2 +-
 htdocs/compta/bank/line.php                     |  2 +-
 htdocs/compta/cashcontrol/cashcontrol_card.php  |  2 +-
 htdocs/compta/payment_sc/card.php               |  2 +-
 htdocs/compta/prelevement/card.php              |  1 +
 htdocs/compta/prelevement/line.php              |  2 +-
 htdocs/contact/card.php                         |  2 +-
 htdocs/core/lib/accounting.lib.php              |  2 +-
 htdocs/core/lib/bank.lib.php                    |  4 ++--
 htdocs/core/lib/categories.lib.php              |  2 +-
 htdocs/core/lib/company.lib.php                 |  4 ++--
 htdocs/core/lib/contact.lib.php                 |  2 +-
 htdocs/core/lib/donation.lib.php                |  2 +-
 htdocs/core/lib/ecm.lib.php                     |  6 +++---
 htdocs/core/lib/expensereport.lib.php           |  4 ++--
 htdocs/core/lib/fichinter.lib.php               |  2 +-
 htdocs/core/lib/fiscalyear.lib.php              |  2 +-
 htdocs/core/lib/functions.lib.php               |  6 +++---
 htdocs/core/lib/holiday.lib.php                 |  2 +-
 htdocs/core/lib/hrm.lib.php                     |  2 +-
 htdocs/core/lib/member.lib.php                  |  6 +++---
 htdocs/core/lib/payments.lib.php                |  4 ++--
 htdocs/core/lib/prelevement.lib.php             |  2 +-
 htdocs/core/lib/product.lib.php                 |  4 ++--
 htdocs/core/lib/project.lib.php                 |  2 +-
 htdocs/core/lib/salaries.lib.php                |  2 +-
 htdocs/core/lib/stock.lib.php                   |  2 +-
 htdocs/core/lib/ticket.lib.php                  |  2 +-
 htdocs/core/lib/trip.lib.php                    |  2 +-
 htdocs/don/payment/card.php                     |  2 +-
 .../emailcollector/lib/emailcollector.lib.php   |  4 ++--
 htdocs/langs/en_US/companies.lang               |  4 ++--
 htdocs/loan/payment/card.php                    |  2 +-
 htdocs/mrp/lib/mrp_mo.lib.php                   |  2 +-
 htdocs/opensurvey/fonctions.php                 |  2 +-
 htdocs/theme/eldy/global.inc.php                | 17 +++++++++++++++++
 htdocs/theme/md/style.css.php                   | 12 ++++++++++++
 htdocs/variants/card.php                        |  2 +-
 htdocs/variants/create_val.php                  |  2 +-
 htdocs/website/lib/websiteaccount.lib.php       |  2 +-
 45 files changed, 92 insertions(+), 63 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 26476119cca..f8fa0774400 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -438,7 +438,7 @@ if ($action == 'create')
 		print $langs->trans('Docdate');
 		print '</td>';
 		if ($action != 'editdate')
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;piece_num='.$object->piece_num.'&amp;mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('SetDate'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;piece_num='.$object->piece_num.'&amp;mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('SetDate'), 1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td colspan="3">';
 		if ($action == 'editdate') {
@@ -462,7 +462,7 @@ if ($action == 'create')
 		print $langs->trans('Codejournal');
 		print '</td>';
 		if ($action != 'editjournal')
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editjournal&amp;piece_num='.$object->piece_num.'&amp;mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editjournal&amp;piece_num='.$object->piece_num.'&amp;mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editjournal') {
@@ -486,7 +486,7 @@ if ($action == 'create')
 		print $langs->trans('Piece');
 		print '</td>';
 		if ($action != 'editdocref')
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdocref&amp;piece_num='.$object->piece_num.'&amp;mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdocref&amp;piece_num='.$object->piece_num.'&amp;mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editdocref') {
@@ -650,8 +650,8 @@ if ($action == 'create')
 						print '<td class="nowrap right">'.price($line->credit).'</td>';
 
 						print '<td class="center">';
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action=update&id='.$line->id.'&piece_num='.$line->piece_num.'&mode='.$mode.'">';
-						print img_edit();
+						print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=update&id='.$line->id.'&piece_num='.$line->piece_num.'&mode='.$mode.'">';
+						print img_edit('', 0, 'class="marginrightonly"');
 						print '</a> &nbsp;';
 
 						$actiontodelete = 'delete';
diff --git a/htdocs/bom/lib/bom.lib.php b/htdocs/bom/lib/bom.lib.php
index 92f43ec3fce..4d5f980de83 100644
--- a/htdocs/bom/lib/bom.lib.php
+++ b/htdocs/bom/lib/bom.lib.php
@@ -79,7 +79,7 @@ function bomPrepareHead($object)
     $head = array();
 
     $head[$h][0] = DOL_URL_ROOT."/bom/bom_card.php?id=".$object->id;
-    $head[$h][1] = $langs->trans("Card");
+    $head[$h][1] = $langs->trans("BOM");
     $head[$h][2] = 'card';
     $h++;
 
diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 6ab6bc283b6..385dd506031 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -135,7 +135,7 @@ $head = array();
 $h = 1;
 
 $head[$h][0] = $_SERVER["PHP_SELF"].($object->id ? 'id='.$object->id : '');
-$head[$h][1] = $langs->trans("Card");
+$head[$h][1] = $langs->trans("Bookmark");
 $head[$h][2] = 'card';
 $h++;
 
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index c4366ebf19c..803b4ae34ab 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -735,7 +735,7 @@ if ($type == Categorie::TYPE_CONTACT)
 		$num = count($contacts);
 		$nbtotalofrecords = '';
 		$newcardbutton = '';
-		print_barre_liste($langs->trans("Contact"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'contacts', 0, $newcardbutton, '', $limit);
+		print_barre_liste($langs->trans("Contact"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'contact', 0, $newcardbutton, '', $limit);
 
 		print '<table class="noborder centpercent">'."\n";
 		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Ref").'</td></tr>'."\n";
@@ -989,7 +989,7 @@ if ($type == Categorie::TYPE_WAREHOUSE)
 		print '<br>';
 		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($objects); $nbtotalofrecords = ''; $newcardbutton = '';
 
-		print_barre_liste($langs->trans("Warehouses"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit);
+		print_barre_liste($langs->trans("Warehouses"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'stock', 0, $newcardbutton, '', $limit);
 
 		print "<table class='noborder' width='100%'>\n";
 		print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Ref").'</td></tr>'."\n";
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index 29701f57c59..308dad5dbca 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -131,15 +131,14 @@ if ($result)
 			print '<input type="hidden" name="categid" value="'.$objp->rowid.'">';
 			print '<input name="label" type="text" size=45 value="'.$objp->label.'">';
 			print '<input type="submit" name="update" class="button" value="'.$langs->trans("Edit").'">';
-
 			print "</td>";
 		}
 		else
 		{
 			print "<td >".$objp->label."</td>";
-			print '<td style="text-align: center;">';
-			print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?categid='.$objp->rowid.'&amp;action=edit">'.img_edit().'</a>&nbsp;&nbsp;';
-			print '<a href="'.$_SERVER["PHP_SELF"].'?categid='.$objp->rowid.'&amp;action=delete">'.img_delete().'</a>';
+			print '<td class="center">';
+			print '<a class="editfielda reposition marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?categid='.$objp->rowid.'&amp;action=edit">'.img_edit().'</a>';
+			print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?categid='.$objp->rowid.'&amp;action=delete">'.img_delete().'</a>';
 			print '</td>';
 		}
 		print "</tr>";
diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php
index abab3b4ff9c..6f6d7236f15 100644
--- a/htdocs/compta/bank/info.php
+++ b/htdocs/compta/bank/info.php
@@ -46,7 +46,7 @@ $object->info($id);
 $h = 0;
 
 $head[$h][0] = DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$id;
-$head[$h][1] = $langs->trans("Card");
+$head[$h][1] = $langs->trans("BankTransaction");
 $h++;
 
 $head[$h][0] = DOL_URL_ROOT.'/compta/bank/info.php?rowid='.$id;
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index 6e53dd00c37..bf8dc6f5649 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -257,7 +257,7 @@ foreach ($cats as $cat) {
 $tabs = array(
     array(
         DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$rowid,
-        $langs->trans('Card')
+        $langs->trans('BankTransaction')
     ),
     array(
         DOL_URL_ROOT.'/compta/bank/info.php?rowid='.$rowid,
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 70a26d231e1..3780fbc1afe 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -612,7 +612,7 @@ if (empty($action) || $action == "view" || $action == "close")
     else {
     	$head = array();
     	$head[0][0] = DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_card.php?id='.$object->id;
-    	$head[0][1] = $langs->trans("Card");
+    	$head[0][1] = $langs->trans("CashControl");
     	$head[0][2] = 'cashcontrol';
 
 	    dol_fiche_head($head, 'cashcontrol', $langs->trans("CashControl"), -1, 'account');
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index bf790bb9a9d..5fdfe327056 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -128,7 +128,7 @@ $form = new Form($db);
 $h = 0;
 
 $head[$h][0] = DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$id;
-$head[$h][1] = $langs->trans("Card");
+$head[$h][1] = $langs->trans("PaymentSocialContribution");
 $hselected = $h;
 $h++;
 
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 4dcd9f33388..cb3205a0e70 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -65,6 +65,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 
 $hookmanager->initHooks(array('directdebitprevcard', 'globalcard', 'directdebitprevlist'));
 
+
 /*
  * Actions
  */
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index 29bb5c435e3..9169f71a377 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -126,7 +126,7 @@ llxHeader('', $langs->trans("StandingOrder"));
 
 $h = 0;
 $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$id;
-$head[$h][1] = $langs->trans("Card");
+$head[$h][1] = $langs->trans("StandingOrder");
 $hselected = $h;
 $h++;
 
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index ce948211c46..a6e5bee1898 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1454,7 +1454,7 @@ else
         print '<tr><td>';
         print $langs->trans("VCard").'</td><td colspan="3">';
 		print '<a href="'.DOL_URL_ROOT.'/contact/vcard.php?id='.$object->id.'">';
-		print img_picto($langs->trans("Download"), 'vcard.png').' ';
+		print img_picto($langs->trans("Download"), 'vcard.png', 'class="paddingrightonly"');
 		print $langs->trans("Download");
 		print '</a>';
         print '</td></tr>';
diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index 21682a4abe6..317c639ad91 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -56,7 +56,7 @@ function accounting_prepare_head(AccountingAccount $object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("Asset");
 	$head[$h][2] = 'card';
 	$h++;
 
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index da51589b8ac..d0f102a4e78 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -39,7 +39,7 @@ function bank_prepare_head(Account $object)
     $head = array();
 
     $head[$h][0] = DOL_URL_ROOT.'/compta/bank/card.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("Card");
+    $head[$h][1] = $langs->trans("BankAccount");
     $head[$h][2] = 'bankname';
     $h++;
 
@@ -211,7 +211,7 @@ function various_payment_prepare_head($object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("VariousPayment");
 	$head[$h][2] = 'card';
 	$h++;
 
diff --git a/htdocs/core/lib/categories.lib.php b/htdocs/core/lib/categories.lib.php
index e0945f9a029..e900e6ff424 100644
--- a/htdocs/core/lib/categories.lib.php
+++ b/htdocs/core/lib/categories.lib.php
@@ -40,7 +40,7 @@ function categories_prepare_head(Categorie $object, $type)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&amp;type='.$type;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("Category");
 	$head[$h][2] = 'card';
 	$h++;
 
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 17597c41c38..4b0a2d5b131 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -46,7 +46,7 @@ function societe_prepare_head(Societe $object)
     $head = array();
 
     $head[$h][0] = DOL_URL_ROOT.'/societe/card.php?socid='.$object->id;
-    $head[$h][1] = $langs->trans("Card");
+    $head[$h][1] = $langs->trans("ThirdParty");
     $head[$h][2] = 'card';
     $h++;
 
@@ -367,7 +367,7 @@ function societe_prepare_head2($object)
     $head = array();
 
     $head[$h][0] = DOL_URL_ROOT.'/societe/card.php?socid='.$object->id;
-    $head[$h][1] = $langs->trans("Card");
+    $head[$h][1] = $langs->trans("ThirdParty");
     $head[$h][2] = 'company';
     $h++;
 
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index 901a5992494..1589809dd6b 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -38,7 +38,7 @@ function contact_prepare_head(Contact $object)
 	$head = array();
 
 	$head[$tab][0] = DOL_URL_ROOT.'/contact/card.php?id='.$object->id;
-	$head[$tab][1] = $langs->trans("Card");
+	$head[$tab][1] = $langs->trans("Contact");
 	$head[$tab][2] = 'card';
 	$tab++;
 
diff --git a/htdocs/core/lib/donation.lib.php b/htdocs/core/lib/donation.lib.php
index b2280657481..425dd05fbb5 100644
--- a/htdocs/core/lib/donation.lib.php
+++ b/htdocs/core/lib/donation.lib.php
@@ -68,7 +68,7 @@ function donation_prepare_head($object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/don/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("Donation");
 	$head[$h][2] = 'card';
 	$h++;
 
diff --git a/htdocs/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php
index 4dbb418855a..3d14f14a7df 100644
--- a/htdocs/core/lib/ecm.lib.php
+++ b/htdocs/core/lib/ecm.lib.php
@@ -81,14 +81,14 @@ function ecm_prepare_head($object, $module = 'ecm', $section = '')
 	if ($module == 'ecm')
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/ecm/dir_card.php?section='.$object->id;
-		$head[$h][1] = $langs->trans("Card");
+		$head[$h][1] = $langs->trans("Directory");
 		$head[$h][2] = 'card';
 		$h++;
 	}
 	else
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/ecm/dir_card.php?section='.$section.'&module='.$module;
-		$head[$h][1] = $langs->trans("Card");
+		$head[$h][1] = $langs->trans("Directory");
 		$head[$h][2] = 'card';
 		$h++;
 	}
@@ -109,7 +109,7 @@ function ecm_file_prepare_head($object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/ecm/file_card.php?section='.$object->section_id.'&urlfile='.urlencode($object->label);
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("File");
 	$head[$h][2] = 'card';
 	$h++;
 
diff --git a/htdocs/core/lib/expensereport.lib.php b/htdocs/core/lib/expensereport.lib.php
index 2767af2e792..4c54ca09e31 100644
--- a/htdocs/core/lib/expensereport.lib.php
+++ b/htdocs/core/lib/expensereport.lib.php
@@ -35,7 +35,7 @@ function expensereport_prepare_head($object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("ExpenseReport");
 	$head[$h][2] = 'card';
 	$h++;
 
@@ -94,7 +94,7 @@ function payment_expensereport_prepare_head(PaymentExpenseReport $object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("ExpenseReport");
 	$head[$h][2] = 'payment';
 	$h++;
 
diff --git a/htdocs/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php
index 8d0809f9768..260bbf980f8 100644
--- a/htdocs/core/lib/fichinter.lib.php
+++ b/htdocs/core/lib/fichinter.lib.php
@@ -42,7 +42,7 @@ function fichinter_prepare_head($object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("Intervention");
 	$head[$h][2] = 'card';
 	$h++;
 
diff --git a/htdocs/core/lib/fiscalyear.lib.php b/htdocs/core/lib/fiscalyear.lib.php
index f54772c2339..8bd3ff55624 100644
--- a/htdocs/core/lib/fiscalyear.lib.php
+++ b/htdocs/core/lib/fiscalyear.lib.php
@@ -35,7 +35,7 @@ function fiscalyear_prepare_head(Fiscalyear $object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/fiscalyear_card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("FiscalPeriod");
 	$head[$h][2] = 'card';
 	$h++;
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 878b85993b5..c2cad773af6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3167,7 +3167,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
         		'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website',
         		'off', 'on', 'order',
         		'paiment', 'play', 'playdisabled', 'poll', 'printer', 'product', 'propal', 'projecttask', 'stock', 'resize', 'service', 'stats', 'trip',
-				'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'wrench',
+				'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
 				'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top',
 				'home', 'companies', 'products', 'commercial', 'invoicing', 'preview', 'project', 'projectpub', 'supplier_invoice', 'hrm', 'members', 'ticket', 'generic',
@@ -3178,7 +3178,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			$fakey = $pictowithouttext;
 			$facolor = ''; $fasize = '';
 			$fa = 'fas';
-			if (in_array($pictowithouttext, array('object_generic', 'note', 'off', 'on', 'object_bookmark', 'bookmark'))) {
+			if (in_array($pictowithouttext, array('object_generic', 'note', 'off', 'on', 'object_bookmark', 'bookmark', 'vcard'))) {
 				$fa = 'far';
 			}
 			if (in_array($pictowithouttext, array('skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp'))) {
@@ -3212,7 +3212,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		    	'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
 		    	'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
 		    	'title_agenda'=>'calendar-alt',
-		    	'uparrow'=>'mail-forward',
+		    	'uparrow'=>'mail-forward', 'vcard'=>'address-card',
 		    	'jabber'=>'comment-o',
 		    	'website'=>'globe-americas'
 		    );
diff --git a/htdocs/core/lib/holiday.lib.php b/htdocs/core/lib/holiday.lib.php
index 987895c27d8..bb114b6a62e 100644
--- a/htdocs/core/lib/holiday.lib.php
+++ b/htdocs/core/lib/holiday.lib.php
@@ -35,7 +35,7 @@ function holiday_prepare_head($object)
 	$head = array();
 
     $head[$h][0] = DOL_URL_ROOT.'/holiday/card.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("Card");
+    $head[$h][1] = $langs->trans("Holiday");
     $head[$h][2] = 'card';
     $h++;
 
diff --git a/htdocs/core/lib/hrm.lib.php b/htdocs/core/lib/hrm.lib.php
index 83eafa2548f..3b336fee8d3 100644
--- a/htdocs/core/lib/hrm.lib.php
+++ b/htdocs/core/lib/hrm.lib.php
@@ -37,7 +37,7 @@ function establishment_prepare_head($object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/hrm/establishment/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("Establishment");
 	$head[$h][2] = 'card';
 	$h++;
 
diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php
index d6993845488..815060c8022 100644
--- a/htdocs/core/lib/member.lib.php
+++ b/htdocs/core/lib/member.lib.php
@@ -38,7 +38,7 @@ function member_prepare_head(Adherent $object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/adherents/card.php?rowid='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("Member");
 	$head[$h][2] = 'general';
 	$h++;
 
@@ -124,7 +124,7 @@ function member_type_prepare_head(AdherentType $object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/adherents/type.php?rowid='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("MemberType");
 	$head[$h][2] = 'card';
 	$h++;
 
@@ -276,7 +276,7 @@ function subscription_prepare_head(Subscription $object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/adherents/subscription/card.php?rowid='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("Subscription");
 	$head[$h][2] = 'general';
 	$h++;
 
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 80aed36f674..d031984552e 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -34,7 +34,7 @@ function payment_prepare_head(Paiement $object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("Payment");
 	$head[$h][2] = 'payment';
 	$h++;
 
@@ -69,7 +69,7 @@ function payment_supplier_prepare_head(Paiement $object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("Payment");
 	$head[$h][2] = 'payment';
 	$h++;
 
diff --git a/htdocs/core/lib/prelevement.lib.php b/htdocs/core/lib/prelevement.lib.php
index eca43aef3f6..a404e19184e 100644
--- a/htdocs/core/lib/prelevement.lib.php
+++ b/htdocs/core/lib/prelevement.lib.php
@@ -40,7 +40,7 @@ function prelevement_prepare_head(BonPrelevement $object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("WithdrawalsReceipts");
 	$head[$h][2] = 'prelevement';
 	$h++;
 
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 0615ff127b0..43acb16ba2a 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -41,7 +41,7 @@ function product_prepare_head($object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT."/product/card.php?id=".$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("ProductOrService");
 	$head[$h][2] = 'card';
 	$h++;
 
@@ -216,7 +216,7 @@ function productlot_prepare_head($object)
     $head = array();
 
     $head[$h][0] = DOL_URL_ROOT."/product/stock/productlot_card.php?id=".$object->id;
-    $head[$h][1] = $langs->trans("Card");
+    $head[$h][1] = $langs->trans("Lot");
     $head[$h][2] = 'card';
 	$h++;
 
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index f3690694b01..bf60968387a 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -168,7 +168,7 @@ function task_prepare_head($object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/task.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("Project");
 	$head[$h][2] = 'task_task';
 	$h++;
 
diff --git a/htdocs/core/lib/salaries.lib.php b/htdocs/core/lib/salaries.lib.php
index 0e2328bc7e7..5a94e025097 100644
--- a/htdocs/core/lib/salaries.lib.php
+++ b/htdocs/core/lib/salaries.lib.php
@@ -34,7 +34,7 @@ function salaries_prepare_head($object)
     $head = array();
 
     $head[$h][0] = DOL_URL_ROOT.'/salaries/card.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("Card");
+    $head[$h][1] = $langs->trans("SalaryPayment");
     $head[$h][2] = 'card';
     $h++;
 
diff --git a/htdocs/core/lib/stock.lib.php b/htdocs/core/lib/stock.lib.php
index 988c7a2d78c..0b9deb7779b 100644
--- a/htdocs/core/lib/stock.lib.php
+++ b/htdocs/core/lib/stock.lib.php
@@ -35,7 +35,7 @@ function stock_prepare_head($object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/product/stock/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("Warehouse");
 	$head[$h][2] = 'card';
 	$h++;
 
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 1b2a5c1245f..cf6607e6960 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -78,7 +78,7 @@ function ticket_prepare_head($object)
     $h = 0;
     $head = array();
     $head[$h][0] = DOL_URL_ROOT.'/ticket/card.php?action=view&track_id='.$object->track_id;
-    $head[$h][1] = $langs->trans("Card");
+    $head[$h][1] = $langs->trans("Ticket");
     $head[$h][2] = 'tabTicket';
     $h++;
 
diff --git a/htdocs/core/lib/trip.lib.php b/htdocs/core/lib/trip.lib.php
index ec8c6a6858f..cdc7360fbf8 100644
--- a/htdocs/core/lib/trip.lib.php
+++ b/htdocs/core/lib/trip.lib.php
@@ -35,7 +35,7 @@ function trip_prepare_head(Deplacement $object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/deplacement/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("Trip");
 	$head[$h][2] = 'card';
 	$h++;
 
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 0017f0a8556..e1784dc4b8b 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -122,7 +122,7 @@ $form = new Form($db);
 $h = 0;
 
 $head[$h][0] = DOL_URL_ROOT.'/don/payment/card.php?id='.$id;
-$head[$h][1] = $langs->trans("Card");
+$head[$h][1] = $langs->trans("DonationPayment");
 $hselected = $h;
 $h++;
 
diff --git a/htdocs/emailcollector/lib/emailcollector.lib.php b/htdocs/emailcollector/lib/emailcollector.lib.php
index 089545e8d7e..fe4a5f1b19c 100644
--- a/htdocs/emailcollector/lib/emailcollector.lib.php
+++ b/htdocs/emailcollector/lib/emailcollector.lib.php
@@ -26,7 +26,7 @@
  * Prepare array of tabs for EmailCollector
  *
  * @param	EmailCollector	$object		EmailCollector
- * @return 	array					Array of tabs
+ * @return 	array						Array of tabs
  */
 function emailcollectorPrepareHead($object)
 {
@@ -38,7 +38,7 @@ function emailcollectorPrepareHead($object)
 	$head = array();
 
 	$head[$h][0] = dol_buildpath("/admin/emailcollector_card.php", 1).'?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("EmailCollector");
 	$head[$h][2] = 'card';
 	$h++;
 
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 0fad58c9389..1a9208bcf85 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -19,7 +19,6 @@ ProspectionArea=Prospection area
 IdThirdParty=Id third party
 IdCompany=Company Id
 IdContact=Contact Id
-Contacts=Contacts/Addresses
 ThirdPartyContacts=Third-party contacts
 ThirdPartyContact=Third-party contact/address
 Company=Company
@@ -298,7 +297,8 @@ AddContact=Create contact
 AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
-Contact=Contact
+Contact=Contact/Address
+Contacts=Contacts/Addresses
 ContactId=Contact id
 ContactsAddresses=Contacts/Addresses
 FromContactName=Name:
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index 4798366d087..b739b81ca54 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -122,7 +122,7 @@ $form = new Form($db);
 $h = 0;
 
 $head[$h][0] = DOL_URL_ROOT.'/loan/payment/card.php?id='.$id;
-$head[$h][1] = $langs->trans("Card");
+$head[$h][1] = $langs->trans("PaymentLoan");
 $hselected = $h;
 $h++;
 
diff --git a/htdocs/mrp/lib/mrp_mo.lib.php b/htdocs/mrp/lib/mrp_mo.lib.php
index 241a036cc44..f203633584e 100644
--- a/htdocs/mrp/lib/mrp_mo.lib.php
+++ b/htdocs/mrp/lib/mrp_mo.lib.php
@@ -37,7 +37,7 @@ function moPrepareHead($object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/mrp/mo_card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("MO");
 	$head[$h][2] = 'card';
 	$h++;
 
diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php
index 31ec69f3a42..2fa067ba9a3 100644
--- a/htdocs/opensurvey/fonctions.php
+++ b/htdocs/opensurvey/fonctions.php
@@ -38,7 +38,7 @@ function opensurvey_prepare_head(Opensurveysondage $object)
 	$head = array();
 
 	$head[0][0] = 'card.php?id='.$object->id_sondage;
-	$head[0][1] = $langs->trans("Card");
+	$head[0][1] = $langs->trans("Survey");
 	$head[0][2] = 'general';
 	$h++;
 
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index c4f223ebf1f..961735f7b99 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -2731,9 +2731,15 @@ a.tabTitle {
     text-decoration: none;
     white-space: nowrap;
 }
+.tabTitleText {
+	display: none;
+}
 .imgTabTitle {
 	max-height: 14px;
 }
+div.tabs div.tabsElem:first-of-type a.tab {
+    margin-left: 0px !important;
+}
 
 a.tabunactive {
     color: var(--colortextlink) !important;
@@ -3608,8 +3614,19 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
     margin-right: 8px;
 }
 
+
 @media only screen and (max-width: 767px)
 {
+	div.tabs {
+		padding-left: 0 !important;
+		padding-right: 0!important;
+		margin-left: 0 !important;
+		margin-right: 0 !important;
+	}
+
+	a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
+		padding: 12px 12px 13px;
+	}
 	a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active {
 		padding: 0px 0px 0px 0px;
 	}
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index f6b42dc3e55..43005809374 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2756,9 +2756,15 @@ a.tabTitle {
     text-decoration: none;
     white-space: nowrap;
 }
+.tabTitleText {
+	display: hidden;
+}
 .imgTabTitle {
 	max-height: 14px;
 }
+div.tabs div.tabsElem:first-of-type a.tab {
+    margin-left: 0px !important;
+}
 
 a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 	font-family: <?php print $fontlist ?>;
@@ -3588,6 +3594,12 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 }
 @media only screen and (max-width: 767px)
 {
+	div.tabs {
+		padding-left: 0 !important;
+		margin-left: 0 !important;
+		margin-right: 0 !important;
+	}
+
 	.boxstats, .boxstats130 {
 		margin: 3px;
 	    border: 1px solid #ddd;
diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index 5dd3521b4e1..399be5de0ee 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -133,7 +133,7 @@ llxHeader('', $title);
 
 $h = 0;
 $head[$h][0] = DOL_URL_ROOT.'/variants/card.php?id='.$object->id;
-$head[$h][1] = $langs->trans("Card");
+$head[$h][1] = $langs->trans("ProductAttributeName");
 $head[$h][2] = 'variant';
 $h++;
 
diff --git a/htdocs/variants/create_val.php b/htdocs/variants/create_val.php
index 2d10213f82f..e724b5693c4 100644
--- a/htdocs/variants/create_val.php
+++ b/htdocs/variants/create_val.php
@@ -83,7 +83,7 @@ llxHeader('', $title);
 
 $h = 0;
 $head[$h][0] = DOL_URL_ROOT.'/variants/card.php?id='.$object->id;
-$head[$h][1] = $langs->trans("Card");
+$head[$h][1] = $langs->trans("ProductAttributeName");
 $head[$h][2] = 'variant';
 $h++;
 
diff --git a/htdocs/website/lib/websiteaccount.lib.php b/htdocs/website/lib/websiteaccount.lib.php
index 4c2048798a5..e0538e73a99 100644
--- a/htdocs/website/lib/websiteaccount.lib.php
+++ b/htdocs/website/lib/websiteaccount.lib.php
@@ -35,7 +35,7 @@ function websiteaccountPrepareHead($object)
 	$head = array();
 
 	$head[$h][0] = dol_buildpath("/website/websiteaccount_card.php", 1).'?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("WebsiteAccount");
 	$head[$h][2] = 'card';
 	$h++;
 

From 106fe7bde65f4197db7df5ee510f3b1804041a12 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 May 2020 15:06:09 +0200
Subject: [PATCH 262/490] Clean conflict between direct debit and direct credit
 orders.

---
 htdocs/compta/paymentbybanktransfer/index.php | 234 ++++++++++++++++++
 htdocs/core/menus/standard/eldy.lib.php       |  27 +-
 .../modPaymentByBankTransfer.class.php        | 148 +++++++++++
 htdocs/core/modules/modPrelevement.class.php  |  17 +-
 htdocs/langs/en_US/admin.lang                 |   4 +-
 htdocs/langs/en_US/banks.lang                 |   2 +
 htdocs/langs/en_US/bills.lang                 |   2 +
 htdocs/langs/en_US/modulebuilder.lang         |   2 +-
 htdocs/langs/en_US/withdrawals.lang           |   6 +
 htdocs/theme/eldy/global.inc.php              |   1 -
 htdocs/website/index.php                      |  15 +-
 11 files changed, 430 insertions(+), 28 deletions(-)
 create mode 100644 htdocs/compta/paymentbybanktransfer/index.php
 create mode 100644 htdocs/core/modules/modPaymentByBankTransfer.class.php

diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php
new file mode 100644
index 00000000000..fd87dd5e447
--- /dev/null
+++ b/htdocs/compta/paymentbybanktransfer/index.php
@@ -0,0 +1,234 @@
+<?php
+/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2011      Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2013      Florian Henry		<florian.henry@open-concept.pro>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/compta/paymentbybanktransfer/index.php
+ *  \ingroup    paymentbybanktransfer
+ *	\brief      Payment by bank transfer index page
+ */
+
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('banks', 'categories', 'withdrawals'));
+
+// Security check
+$socid = GETPOST('socid', 'int');
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'paymentbybanktransfer', '', '');
+
+
+/*
+ * Actions
+ */
+
+
+
+
+/*
+ * View
+ */
+
+llxHeader('', $langs->trans("SuppliersStandingOrdersArea"));
+
+if (prelevement_check_config() < 0)
+{
+	$langs->load("errors");
+	setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Withdraw")), null, 'errors');
+}
+
+print load_fiche_titre($langs->trans("SuppliersStandingOrdersArea"));
+
+
+print '<div class="fichecenter"><div class="fichethirdleft">';
+
+
+$thirdpartystatic = new Societe($db);
+$invoicestatic = new Facture($db);
+$bprev = new BonPrelevement($db);
+
+print '<div class="div-table-responsive-no-min">';
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
+
+print '<tr class="oddeven"><td>'.$langs->trans("NbOfInvoiceToWithdraw").'</td>';
+print '<td class="right">';
+print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/demandes.php?status=0">';
+print $bprev->NbFactureAPrelever();
+print '</a>';
+print '</td></tr>';
+
+print '<tr class="oddeven"><td>'.$langs->trans("AmountToWithdraw").'</td>';
+print '<td class="right">';
+print price($bprev->SommeAPrelever(), '', '', 1, -1, -1, 'auto');
+print '</td></tr></table></div><br>';
+
+
+
+/*
+ * Invoices waiting for withdraw
+ */
+$sql = "SELECT f.ref, f.rowid, f.total_ttc, f.fk_statut, f.paye, f.type,";
+$sql .= " pfd.date_demande, pfd.amount,";
+$sql .= " s.nom as name, s.rowid as socid";
+$sql .= " FROM ".MAIN_DB_PREFIX."facture as f,";
+$sql .= " ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql .= " , ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+$sql .= " WHERE s.rowid = f.fk_soc";
+$sql .= " AND f.entity IN (".getEntity('invoice').")";
+$sql .= " AND f.total_ttc > 0";
+if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS))
+{
+	$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
+}
+$sql .= " AND pfd.traite = 0 AND pfd.fk_facture_fourn = f.rowid";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+
+$resql = $db->query($sql);
+if ($resql)
+{
+    $num = $db->num_rows($resql);
+    $i = 0;
+
+    print '<div class="div-table-responsive-no-min">';
+    print '<table class="noborder centpercent">';
+    print '<tr class="liste_titre">';
+    print '<th colspan="5">'.$langs->trans("SupplierInvoiceWaitingWithdraw").' ('.$num.')</th></tr>';
+    if ($num)
+    {
+        while ($i < $num && $i < 20)
+        {
+            $obj = $db->fetch_object($resql);
+
+            $invoicestatic->id = $obj->rowid;
+            $invoicestatic->ref = $obj->ref;
+            $invoicestatic->statut = $obj->fk_statut;
+            $invoicestatic->paye = $obj->paye;
+            $invoicestatic->type = $obj->type;
+            $alreadypayed = $invoicestatic->getSommePaiement();
+
+
+            print '<tr class="oddeven"><td>';
+            print $invoicestatic->getNomUrl(1, 'withdraw');
+            print '</td>';
+
+            print '<td>';
+            $thirdpartystatic->id = $obj->socid;
+            $thirdpartystatic->name = $obj->name;
+            print $thirdpartystatic->getNomUrl(1, 'customer');
+            print '</td>';
+
+            print '<td class="right">';
+            print price($obj->amount);
+            print '</td>';
+
+            print '<td class="right">';
+            print dol_print_date($db->jdate($obj->date_demande), 'day');
+            print '</td>';
+
+            print '<td class="right">';
+            print $invoicestatic->getLibStatut(3, $alreadypayed);
+            print '</td>';
+            print '</tr>';
+            $i++;
+        }
+    }
+    else
+    {
+        print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoSupplierInvoiceToWithdraw", $langs->transnoentitiesnoconv("BankTransfer")).'</td></tr>';
+    }
+    print "</table></div><br>";
+}
+else
+{
+    dol_print_error($db);
+}
+
+
+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+
+
+/*
+ * Withdraw receipts
+ */
+$limit = 5;
+$sql = "SELECT p.rowid, p.ref, p.amount, p.datec, p.statut";
+$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
+$sql .= " ORDER BY datec DESC";
+$sql .= $db->plimit($limit);
+
+$result = $db->query($sql);
+if ($result)
+{
+    $num = $db->num_rows($result);
+    $i = 0;
+
+    print"\n<!-- debut table -->\n";
+    print '<div class="div-table-responsive-no-min">';
+    print '<table class="noborder centpercent">';
+    print '<tr class="liste_titre"><th>'.$langs->trans("LatestBankTransferReceipts", $limit).'</th>';
+    print '<th>'.$langs->trans("Date").'</th>';
+    print '<th class="right">'.$langs->trans("Amount").'</th>';
+    print '<th class="right">'.$langs->trans("Status").'</th>';
+    print '</tr>';
+
+    while ($i < min($num, $limit))
+    {
+        $obj = $db->fetch_object($result);
+
+
+        print '<tr class="oddeven">';
+
+        print "<td>";
+        $bprev->id = $obj->rowid;
+        $bprev->ref = $obj->ref;
+        $bprev->statut = $obj->statut;
+        print $bprev->getNomUrl(1);
+        print "</td>\n";
+        print '<td>'.dol_print_date($db->jdate($obj->datec), "dayhour")."</td>\n";
+        print '<td class="right">'.price($obj->amount)."</td>\n";
+        print '<td class="right">'.$bprev->getLibStatut(3)."</td>\n";
+
+        print "</tr>\n";
+        $i++;
+    }
+    print "</table></div><br>";
+    $db->free($result);
+}
+else
+{
+    dol_print_error($db);
+}
+
+
+print '</div></div></div>';
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index cc27a4ae825..3f539260856 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -308,8 +308,8 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Bank
 	$tmpentry = array(
 	    'enabled'=>(!empty($conf->banque->enabled) || !empty($conf->prelevement->enabled)),
-	    'perms'=>(!empty($user->rights->banque->lire) || !empty($user->rights->prelevement->lire)),
-	    'module'=>'banque|prelevement'
+		'perms'=>(!empty($user->rights->banque->lire) || !empty($user->rights->prelevement->lire) || !empty($user->rights->paymentbybanktransfer->read)),
+	    'module'=>'banque|prelevement|paymentbybanktransfer'
 	);
 	$menu_arr[] = array(
 		'name' => 'Bank',
@@ -1464,7 +1464,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			// Load translation files required by the page
 			$langs->loadLangs(array("withdrawals", "banks", "bills", "categories"));
 
-			// Bank-Caisse
+			// Bank-Cash account
 			if (!empty($conf->banque->enabled))
 			{
 				$newmenu->add("/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank", $langs->trans("MenuBankCash"), 0, $user->rights->banque->lire, '', $mainmenu, 'bank');
@@ -1484,14 +1484,12 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/compta/bank/categ.php", $langs->trans("RubriquesTransactions"), 1, $user->rights->categorie->creer, '', $mainmenu, 'tags');
 			}
 
-			// Prelevements
+			// Direct debit order
 			if (!empty($conf->prelevement->enabled))
 			{
 				$newmenu->add("/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank", $langs->trans("StandingOrders"), 0, $user->rights->prelevement->bons->lire, '', $mainmenu, 'withdraw');
 
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "withdraw") {
-                    //$newmenu->add("/compta/prelevement/demandes.php?status=0&amp;mainmenu=bank",$langs->trans("StandingOrderToProcess"),1,$user->rights->prelevement->bons->lire);
-
 				    $newmenu->add("/compta/prelevement/create.php?mainmenu=bank", $langs->trans("NewStandingOrder"), 1, $user->rights->prelevement->bons->creer);
 
 				    $newmenu->add("/compta/prelevement/bons.php?mainmenu=bank", $langs->trans("WithdrawalsReceipts"), 1, $user->rights->prelevement->bons->lire);
@@ -1503,7 +1501,22 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
                 }
 			}
 
-			// Gestion cheques
+			// Bank transfer order
+			if (!empty($conf->paymentbybanktransfer->enabled))
+			{
+				$newmenu->add("/compta/paymentbybanktransfer/index.php?leftmenu=banktransfer&amp;mainmenu=bank", $langs->trans("PaymentByBankTransfer"), 0, $user->rights->paymentbybanktransfer->read, '', $mainmenu, 'banktransfer');
+
+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "banktransfer") {
+					$newmenu->add("/compta/paymentbybanktransfer/create.php?mainmenu=bank", $langs->trans("NewPaymentByBankTransfer"), 1, $user->rights->paymentbybanktransfer->create);
+
+					$newmenu->add("/compta/paymentbybanktransfer/bons.php?mainmenu=bank", $langs->trans("PaymentByBankTransferReceipts"), 1, $user->rights->paymentbybanktransfer->read);
+					$newmenu->add("/compta/paymentbybanktransfer/list.php?mainmenu=bank", $langs->trans("PaymentByBankTransferLines"), 1, $user->rights->paymentbybanktransfer->read);
+					$newmenu->add("/compta/paymentbybanktransfer/rejets.php?mainmenu=bank", $langs->trans("Rejects"), 1, $user->rights->paymentbybanktransfer->read);
+					$newmenu->add("/compta/paymentbybanktransfer/stats.php?mainmenu=bank", $langs->trans("Statistics"), 1, $user->rights->paymentbybanktransfer->read);
+				}
+			}
+
+			// Management of checks
 			if (empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && !empty($conf->banque->enabled) && (!empty($conf->facture->enabled) || !empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)))
 			{
 				$newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank", $langs->trans("MenuChequeDeposits"), 0, $user->rights->banque->cheque, '', $mainmenu, 'checks');
diff --git a/htdocs/core/modules/modPaymentByBankTransfer.class.php b/htdocs/core/modules/modPaymentByBankTransfer.class.php
new file mode 100644
index 00000000000..d68274e2dee
--- /dev/null
+++ b/htdocs/core/modules/modPaymentByBankTransfer.class.php
@@ -0,0 +1,148 @@
+<?php
+/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2010-2011 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\defgroup   	paymentbybanktransfer     Module paymentbybanktransfer
+ *	\brief      	Module to manage payment by bank transfer
+ *	\file       	htdocs/core/modules/modPaymentByBankTransfer.class.php
+ *	\ingroup    	paymentbybanktransfer
+ *	\brief      	File to describe and activate the module PaymentByBankTransfer
+ */
+
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
+
+
+/**
+ *	Class to describe and enable module of payment by Bank transfer
+ */
+class modPaymentByBankTransfer extends DolibarrModules
+{
+
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf;
+
+		$this->db = $db;
+		$this->numero = 56;
+
+		$this->family = "financial";
+		$this->module_position = '52';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Management of payment by bank transfer";
+
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'development';
+
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of png file (without png) used for this module
+		$this->picto = 'payment';
+
+		// Data directories to create when module is enabled
+		$this->dirs = array("/paymentbybanktransfer/temp", "/paymentbybanktransfer/receipts");
+
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array("modFournisseur", "modBanque"); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+
+		// Config pages
+		$this->config_page_url = array("paymentbybanktransfer.php");
+
+		// Constants
+		$this->const = array();
+		$r = 0;
+
+		/*$this->const[$r][0] = "BANK_ADDON_PDF";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "sepamandate";
+		$this->const[$r][3] = 'Name of manager to generate SEPA mandate';
+		$this->const[$r][4] = 0;
+		$r++;*/
+
+
+		// Boxes
+		$this->boxes = array();
+
+		// Permissions
+		$this->rights = array();
+		$this->rights_class = 'paymentbybanktransfer';
+		$r = 0;
+		$r++;
+		$this->rights[$r][0] = 561;
+		$this->rights[$r][1] = 'Read bank transfer payment orders';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'read';
+
+		$r++;
+		$this->rights[$r][0] = 562;
+		$this->rights[$r][1] = 'Create/modify a bank transfer payment order';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'create';
+
+		$r++;
+		$this->rights[$r][0] = 563;
+		$this->rights[$r][1] = 'Send/Transmit bank transfer payment order';
+		$this->rights[$r][2] = 'a';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'send';
+
+		$r++;
+		$this->rights[$r][0] = 564;
+		$this->rights[$r][1] = 'Record Debits/Rejects of bank transfer payment order';
+		$this->rights[$r][2] = 'a';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'debit';
+
+        // Menus
+        //-------
+        $this->menu = 1; // This module add menu entries. They are coded into menu manager.
+    }
+
+
+    /**
+     *  Function called when module is enabled.
+     *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *  It also creates data directories
+     *
+     *  @param      string	$options    Options when enabling module ('', 'noboxes')
+     *  @return     int             	1 if OK, 0 if KO
+     */
+    public function init($options = '')
+    {
+        global $conf;
+
+        // Permissions
+        $this->remove($options);
+
+        $sql = array();
+
+        return $this->_init($sql, $options);
+    }
+}
diff --git a/htdocs/core/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php
index 4eb1ce3a171..00259fec22c 100644
--- a/htdocs/core/modules/modPrelevement.class.php
+++ b/htdocs/core/modules/modPrelevement.class.php
@@ -20,17 +20,17 @@
 
 /**
  *	\defgroup   	prelevement     Module prelevement
- *	\brief      	Module de gestion des prelevements bancaires
+ *	\brief      	Module to manage Direct debit orders
  *	\file       	htdocs/core/modules/modPrelevement.class.php
  *	\ingroup    	prelevement
- *	\brief      	Fichier de description et activation du module Prelevement
+ *	\brief      	File to describe and enable the module Prelevement
  */
 
 include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *	Class to describe and enable module Prelevement
+ *	Class to describe and enable module of payment by Direct Debit
  */
 class modPrelevement extends DolibarrModules
 {
@@ -51,7 +51,7 @@ class modPrelevement extends DolibarrModules
 		$this->module_position = '52';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
-		$this->description = "Gestion des Prelevements";
+		$this->description = "Management of Direct Debit orders";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
@@ -124,15 +124,6 @@ class modPrelevement extends DolibarrModules
 		$this->rights[$r][4] = 'bons';
 		$this->rights[$r][5] = 'credit';
 
-        /*
-        $this->rights[2][0] = 154;
-        $this->rights[2][1] = 'Setup withdraw account';
-        $this->rights[2][2] = 'w';
-        $this->rights[2][3] = 0;
-        $this->rights[2][4] = 'bons';
-        $this->rights[2][5] = 'configurer';
-        */
-
         // Menus
         //-------
         $this->menu = 1; // This module add menu entries. They are coded into menu manager.
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 6c139a0f10c..5e485c86dbc 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -541,8 +541,8 @@ Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
+Module56Name=Payment by bank transfer
+Module56Desc=Management of payment by bank transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Bank Direct Debit payments
 Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index e54239e9fb2..48bd2b81c2e 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -37,6 +37,8 @@ IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct Debit orders
 StandingOrder=Direct debit order
+PaymentByBankTransfers=Payments by bank transfer
+PaymentByBankTransfer=Payment by bank transfer
 AccountStatement=Account statement
 AccountStatementShort=Statement
 AccountStatements=Account statements
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 55de1591689..cb592b5e2a5 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -243,6 +243,8 @@ SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Direct debit orders
 StandingOrder=Direct debit order
+PaymentByBankTransfers=Payments by bank transfer
+PaymentByBankTransfer=Payment by bank transfer
 NoDraftBills=No draft invoices
 NoOtherDraftBills=No other draft invoices
 NoDraftInvoices=No draft invoices
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 135ac1ae9ec..b89e1fb0a38 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -27,7 +27,7 @@ DangerZone=Danger zone
 BuildPackage=Build package
 BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
-ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here
 ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index b1d6e30e329..ad51b045a37 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -4,9 +4,13 @@ SuppliersStandingOrdersArea=Direct credit payment orders area
 StandingOrdersPayment=Direct debit payment orders
 StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
+NewPaymentByBankTransfer=New payment by bank transfer
 StandingOrderToProcess=To process
+PaymentByBankTransferReceipts=Bank transfer orders
+PaymentByBankTransferLines=Bank transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
+LatestBankTransferReceipts=Latest %s bank transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLines=Direct debit order lines
 RequestStandingOrderToTreat=Request for direct debit payment order to process
@@ -14,10 +18,12 @@ RequestStandingOrderTreated=Request for direct debit payment order processed
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
 NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
 NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
+SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by bank transfer 
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
+NoSupplierInvoiceToWithdraw=No supplier invoice with open 'Direct credit requests' is waiting. Go on tab '%s' on invoice card to make a request.
 ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 961735f7b99..67114ccae47 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -6393,7 +6393,6 @@ div.tabsElem a.tab {
 	    word-break: break-word;
 	}
 	.badge {
-		line-height: 1.2em;
 		min-width: auto;
 		font-size: 12px;
 	}
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 690dc0efe3b..4f7cba09e89 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2207,17 +2207,24 @@ if (!GETPOST('hide_websitemenu'))
 
 		print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditCss")).'" name="editcss">';
 
+		$importlabel = $langs->trans("ImportSite");
+		$exportlabel = $langs->trans("ExportSite");
+		if (! empty($conf->dol_optimize_smallscreen)) {
+			$importlabel = $langs->trans("Import");
+			$exportlabel = $langs->trans("Export");
+		}
+
 		if ($atleastonepage)
 		{
-			print '<input type="submit" class="button bordertransp" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("ImportSite")).'" name="importsite">';
+			print '<input type="submit" class="button bordertransp" disabled="disabled" value="'.dol_escape_htmltag($importlabel).'" name="importsite">';
 		}
 		else
 		{
-			print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("ImportSite")).'" name="importsite">';
+			print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($importlabel).'" name="importsite">';
 		}
 
 		//print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditMenu")).'" name="editmenu">';
-		print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("ExportSite")).'" name="exportsite">';
+		print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($exportlabel).'" name="exportsite">';
 		print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("CloneSite")).'" name="createfromclone">';
 
 		print '<input type="submit" class="buttonDelete bordertransp" name="deletesite" value="'.$langs->trans("Delete").'"'.($atleastonepage ? ' disabled="disabled"' : '').'>';
@@ -2261,7 +2268,7 @@ if (!GETPOST('hide_websitemenu'))
 
 		print '<span class="websiteinputurl valignmiddle" id="websiteinputurl">';
 		$linktotestonwebserver = '<a href="'.($virtualurl ? $virtualurl : '#').'" class="valignmiddle">';
-		$linktotestonwebserver .= $langs->trans("TestDeployOnWeb", $virtualurl).' '.img_picto('', 'globe');
+		$linktotestonwebserver .= '<span class="hideonsmartphone">'.$langs->trans("TestDeployOnWeb", $virtualurl).' </span>'.img_picto('', 'globe');
 		$linktotestonwebserver .= '</a>';
 		$htmltext = '';
 		if (empty($object->fk_default_home))

From 608d3ce32fca1170550c85608dfb4ae8530b50f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 May 2020 16:10:29 +0200
Subject: [PATCH 263/490] Responsive

---
 htdocs/takepos/index.php         |  6 ++++--
 htdocs/theme/eldy/global.inc.php | 12 ++++++++++++
 htdocs/theme/md/style.css.php    | 13 +++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 8da96df54d0..dbc68afeaf4 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -772,15 +772,17 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			<div class="inline-block valignmiddle" id="customerandsales">
 			</div>
 			<!-- More info about customer -->
-			<div class="inline-block valignmiddle" id="moreinfo"></div>
-			<div class="inline-block valignmiddle" id="infowarehouse"></div>
+			<div class="inline-block valignmiddle tdoverflowmax150onsmartphone" id="moreinfo"></div>
+			<div class="inline-block valignmiddle tdoverflowmax150onsmartphone" id="infowarehouse"></div>
 			</div>
 			<div class="topnav-right">
 				<div class="login_block_other">
 				<input type="text" id="search" name="search" onkeyup="Search2(<?php echo $keyCodeForEnter; ?>);"  placeholder="<?php echo $langs->trans("Search"); ?>" autofocus>
 				<a onclick="ClearSearch();"><span class="fa fa-backspace"></span></a>
 				<a onclick="window.location.href='<?php echo DOL_URL_ROOT; ?>';"><span class="fas fa-home"></span></a>
+				<?php if (empty($conf->dol_use_jmobile)) { ?>
 				<a onclick="FullScreen();"><span class="fa fa-expand-arrows-alt"></span></a>
+				<?php } ?>
 				</div>
 				<div class="login_block_user">
 				<?php
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 67114ccae47..2430257b268 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1189,6 +1189,18 @@ table[summary="list_of_modules"] .fa-cog {
         text-overflow: ellipsis;
         white-space: nowrap;
     }
+    .tdoverflowmax100onsmartphone {			/* For tdoverflow, the max-midth become a minimum ! */
+	    max-width: 100px;
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	    white-space: nowrap;
+	}
+    .tdoverflowmax150onsmartphone {			/* For tdoverflow, the max-midth become a minimum ! */
+	    max-width: 100px;
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	    white-space: nowrap;
+	}
     .border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
     	height: 40px !important;
     }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 43005809374..c43fa9cd7d9 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1251,6 +1251,19 @@ table[summary="list_of_modules"] .fa-cog {
         text-overflow: ellipsis;
         white-space: nowrap;
     }
+    .tdoverflowmax100onsmartphone {			/* For tdoverflow, the max-midth become a minimum ! */
+	    max-width: 100px;
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	    white-space: nowrap;
+	}
+    .tdoverflowmax150onsmartphone {			/* For tdoverflow, the max-midth become a minimum ! */
+	    max-width: 100px;
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	    white-space: nowrap;
+	}
+
 	div.fiche {
 		    margin-top: <?php print ($dol_hide_topmenu ? '12' : '6'); ?>px !important;
 	}

From 6be60efaba6434ac214dde360a82f1eba88267e4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 May 2020 19:09:22 +0200
Subject: [PATCH 264/490] Fix bad link in json-ld

---
 htdocs/core/lib/website.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 5eac4469c4e..9d916a46b38 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -609,7 +609,7 @@ function getStructuredData($type, $data = array())
 				     "name": "'.dol_escape_json($companyname).'",
 				     "logo": {
 				        "@type": "ImageObject",
-				        "url": "/viewimage.php?modulepart=mycompany&file=logos%2F'.urlencode($mysoc->logo).'"
+				        "url": "/wrapper.php?modulepart=mycompany&file=logos%2F'.urlencode($mysoc->logo).'"
 				     }
 				   },
 				  "description": "'.dol_escape_json($description).'"

From 8a6ae84fb0f9d390a02813ecc3313022d77c02e2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 May 2020 20:02:01 +0200
Subject: [PATCH 265/490] Fix getStructuredData for organization

---
 htdocs/core/lib/website.lib.php        | 57 +++++++++++++++++++++++---
 htdocs/societe/class/societe.class.php |  7 ++++
 2 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 9d916a46b38..b3419d2faae 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -540,7 +540,7 @@ function includeContainer($containerref)
  */
 function getStructuredData($type, $data = array())
 {
-	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running inluded containers.
+	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs; // Very important. Required to have var available when running inluded containers.
 
 	if ($type == 'software')
 	{
@@ -565,6 +565,41 @@ function getStructuredData($type, $data = array())
 		}'."\n";
 		$ret .= '</script>'."\n";
 	}
+	elseif ($type == 'organization')
+	{
+		$companyname = $mysoc->name;
+		$url = $mysoc->url;
+
+		$ret = '<!-- Add structured data for blog post -->'."\n";
+		$ret .= '<script type="application/ld+json">'."\n";
+		$ret .= '{
+			"@context": "https://schema.org",
+			"@type": "Organization",
+			"name": "'.dol_escape_json($companyname).'",
+			"url": "'.$url.'",
+			"logo": "/wrapper.php?modulepart=mycompany&file=logos%2F'.urlencode($mysoc->logo).'",
+			"contactPoint": {
+				"@type": "ContactPoint",
+				"contactType": "Contact",
+				"email": "'.dol_escape_json($mysoc->email).'"
+			},';
+		if (is_array($mysoc->socialnetworks) && count($mysoc->socialnetworks) > 0) {
+			$ret .= '"sameAs": [';
+			$i = 0;
+			foreach($mysoc->socialnetworks as $key => $value) {
+				if ($key == 'linkedin') {
+					$ret.= '"https://www.'.$key.'.com/company/'.dol_escape_json($value).'"';
+				} else {
+					$ret.= '"https://www.'.$key.'.com/'.dol_escape_json($value).'"';
+				}
+				$i++;
+				if ($i < count($mysoc->socialnetworks)) $ret .= ', ';
+			}
+			$ret .= '],'."\n";
+		}
+		$ret .= "\n".'}'."\n";
+		$ret .= '</script>'."\n";
+	}
 	elseif ($type == 'blogpost')
 	{
 		if (!empty($websitepage->author_alias))
@@ -581,7 +616,7 @@ function getStructuredData($type, $data = array())
 
 			$pageurl = str_replace('__WEBSITE_KEY__', $website->ref, $pageurl);
 			$title = str_replace('__WEBSITE_KEY__', $website->ref, $title);
-			$image = str_replace('__WEBSITE_KEY__', $website->ref, $image);
+			$image = 'medias/'.str_replace('__WEBSITE_KEY__', $website->ref, $image);
 			$companyname = str_replace('__WEBSITE_KEY__', $website->ref, $companyname);
 			$description = str_replace('__WEBSITE_KEY__', $website->ref, $description);
 
@@ -598,6 +633,7 @@ function getStructuredData($type, $data = array())
 				  "image": [
 				    "'.dol_escape_json($image).'"
 				   ],
+				  "dateCreated": "'.dol_print_date($websitepage->date_creation, 'dayhourrfc').'",
 				  "datePublished": "'.dol_print_date($websitepage->date_creation, 'dayhourrfc').'",
 				  "dateModified": "'.dol_print_date($websitepage->date_modification, 'dayhourrfc').'",
 				  "author": {
@@ -611,9 +647,20 @@ function getStructuredData($type, $data = array())
 				        "@type": "ImageObject",
 				        "url": "/wrapper.php?modulepart=mycompany&file=logos%2F'.urlencode($mysoc->logo).'"
 				     }
-				   },
-				  "description": "'.dol_escape_json($description).'"
-				}'."\n";
+				   },'."\n";
+			if ($websitepage->keywords) {
+				$ret .= '"keywords": [';
+				$i = 0;
+				$arrayofkeywords = explode(',', $websitepage->keywords);
+				foreach($arrayofkeywords as $keyword) {
+					$ret.= '"'.dol_escape_json($keyword).'"';
+					$i++;
+					if ($i < count($arrayofkeywords)) $ret .= ', ';
+				}
+				$ret .= '],'."\n";
+			}
+			$ret .= '"description": "'.dol_escape_json($description).'"';
+			$ret .= "\n".'}'."\n";
 			$ret .= '</script>'."\n";
 		}
 	}
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 62140ba5d89..de65e05d41e 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3745,6 +3745,13 @@ class Societe extends CommonObject
 		$this->instagram_url = empty($conf->global->MAIN_INFO_SOCIETE_INSTAGRAM_URL) ? '' : $conf->global->MAIN_INFO_SOCIETE_INSTAGRAM_URL;
 		$this->youtube_url = empty($conf->global->MAIN_INFO_SOCIETE_YOUTUBE_URL) ? '' : $conf->global->MAIN_INFO_SOCIETE_YOUTUBE_URL;
 		$this->github_url = empty($conf->global->MAIN_INFO_SOCIETE_GITHUB_URL) ? '' : $conf->global->MAIN_INFO_SOCIETE_GITHUB_URL;
+		$this->socialnetworks = array();
+		if (! empty($this->facebook_url)) $this->socialnetworks['facebook'] = $this->facebook_url;
+		if (! empty($this->twitter_url)) $this->socialnetworks['twitter'] = $this->twitter_url;
+		if (! empty($this->linkedin_url)) $this->socialnetworks['linkedin'] = $this->linkedin_url;
+		if (! empty($this->instagram_url)) $this->socialnetworks['instagram'] = $this->instagram_url;
+		if (! empty($this->youtube_url)) $this->socialnetworks['youtube'] = $this->youtube_url;
+		if (! empty($this->github_url)) $this->socialnetworks['github'] = $this->github_url;
 
 		// Id prof generiques
 		$this->idprof1 = empty($conf->global->MAIN_INFO_SIREN) ? '' : $conf->global->MAIN_INFO_SIREN;

From 9370f71d018f5cd486850255b707af6a8dda58a7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 May 2020 20:03:56 +0200
Subject: [PATCH 266/490] Fix hardcoded value

---
 htdocs/core/lib/website.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index b3419d2faae..f83a38e83cd 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -551,7 +551,7 @@ function getStructuredData($type, $data = array())
 			"@type": "SoftwareApplication",
 			"name": "'.dol_escape_json($data['name']).'",
 			"operatingSystem": "'.dol_escape_json($data['os']).'",
-			"applicationCategory": "https://schema.org/GameApplication",
+			"applicationCategory": "https://schema.org/'.$data['applicationCategory'].'",
 			"aggregateRating": {
 				"@type": "AggregateRating",
 				"ratingValue": "'.$data['ratingvalue'].'",

From 02d4ecb21c6b4b858e13443ba8b0d592e4972aa6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 May 2020 20:08:01 +0200
Subject: [PATCH 267/490] Fix url for youtube

---
 htdocs/core/lib/website.lib.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index f83a38e83cd..aa65e80086f 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -582,14 +582,17 @@ function getStructuredData($type, $data = array())
 				"@type": "ContactPoint",
 				"contactType": "Contact",
 				"email": "'.dol_escape_json($mysoc->email).'"
-			},';
+			},'."\n";
 		if (is_array($mysoc->socialnetworks) && count($mysoc->socialnetworks) > 0) {
 			$ret .= '"sameAs": [';
 			$i = 0;
 			foreach($mysoc->socialnetworks as $key => $value) {
 				if ($key == 'linkedin') {
 					$ret.= '"https://www.'.$key.'.com/company/'.dol_escape_json($value).'"';
-				} else {
+				} elseif ($key == 'youtube') {
+					$ret.= '"https://www.'.$key.'.com/user/'.dol_escape_json($value).'"';
+				}
+				else {
 					$ret.= '"https://www.'.$key.'.com/'.dol_escape_json($value).'"';
 				}
 				$i++;

From cf96383bf92b93b6492ba89172c00b0f8caf4262 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 18 May 2020 10:44:55 +0200
Subject: [PATCH 268/490] Fix : entity was missing in actioncomm fetch

---
 htdocs/comm/action/class/actioncomm.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 98b910fdfca..1d86f1eba08 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -572,6 +572,7 @@ class ActionComm extends CommonObject
 
         $sql = "SELECT a.id,";
         $sql.= " a.id as ref,";
+		$sql.= " a.entity,";
         $sql.= " a.ref_ext,";
         $sql.= " a.datep,";
         $sql.= " a.datep2,";
@@ -608,6 +609,7 @@ class ActionComm extends CommonObject
                 $obj = $this->db->fetch_object($resql);
 
                 $this->id         = $obj->id;
+				$this->entity     = $obj->entity;
                 $this->ref        = $obj->ref;
                 $this->ref_ext    = $obj->ref_ext;
 

From baa502a224c92fb795abf3599f08fb67e783d835 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 18 May 2020 10:54:25 +0200
Subject: [PATCH 269/490] Fix third merge issue with contact roles

---
 htdocs/contact/class/contact.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index a2235097811..8a1b26e9d33 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -1576,7 +1576,7 @@ class Contact extends CommonObject
 	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
 	{
 		$tables = array(
-			'socpeople'
+			'socpeople', 'societe_contacts'
 		);
 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);

From 3d9d5d0ad522a76a65d8a9daaf35b2b693c5a138 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 18 May 2020 11:03:32 +0200
Subject: [PATCH 270/490] Fix : entity was missing in expedition fetch

---
 htdocs/expedition/class/expedition.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 70e3683b22c..838cbd87152 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -527,7 +527,7 @@ class Expedition extends CommonObject
 		// Check parameters
 		if (empty($id) && empty($ref) && empty($ref_ext) && empty($ref_int)) return -1;
 
-		$sql = "SELECT e.rowid, e.ref, e.fk_soc as socid, e.date_creation, e.ref_customer, e.ref_ext, e.ref_int, e.fk_user_author, e.fk_statut, e.fk_projet, e.billed";
+		$sql = "SELECT e.rowid, e.entity, e.ref, e.fk_soc as socid, e.date_creation, e.ref_customer, e.ref_ext, e.ref_int, e.fk_user_author, e.fk_statut, e.fk_projet, e.billed";
 		$sql.= ", e.weight, e.weight_units, e.size, e.size_units, e.width, e.height";
 		$sql.= ", e.date_expedition as date_expedition, e.model_pdf, e.fk_address, e.date_delivery";
 		$sql.= ", e.fk_shipping_method, e.tracking_number";
@@ -555,6 +555,7 @@ class Expedition extends CommonObject
 				$obj = $this->db->fetch_object($result);
 
 				$this->id                   = $obj->rowid;
+				$this->entity               = $obj->entity;
 				$this->ref                  = $obj->ref;
 				$this->socid                = $obj->socid;
 				$this->ref_customer	    = $obj->ref_customer;

From 729cc4fd6fee89f9957d3d588e491f5d8ac74315 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 May 2020 13:26:33 +0200
Subject: [PATCH 271/490] Fix do not show full path

---
 htdocs/core/lib/website.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index aa65e80086f..baee3bd9bd5 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -520,7 +520,7 @@ function includeContainer($containerref)
 	$tmpoutput = ob_get_contents();
 	ob_end_clean();
 
-	print "\n".'<!-- include '.$fullpathfile.' level = '.$includehtmlcontentopened.' -->'."\n";
+	print "\n".'<!-- include '.$websitekey.'/'.$containerref.' level = '.$includehtmlcontentopened.' -->'."\n";
 	print preg_replace(array('/^.*<body[^>]*>/ims', '/<\/body>.*$/ims'), array('', ''), $tmpoutput);
 
 	if (!$res)

From a9d1519f966163a092a6d994fe6cbb13f472090d Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 18 May 2020 14:52:33 +0200
Subject: [PATCH 272/490] FIX php error if multicompany disabled

---
 htdocs/compta/paiement/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 848cc20d483..27086713b07 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -342,7 +342,7 @@ if ($resql)
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans('Bill').'</td>';
 	print '<td>'.$langs->trans('Company').'</td>';
-	if($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED )print '<td>'.$langs->trans('Entity').'</td>';
+	if (!empty($conf->multicompany->enabled) && $conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED ) print '<td>'.$langs->trans('Entity').'</td>';
 	print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
     print '<td class="right">'.$langs->trans('PayedByThisPayment').'</td>';
     print '<td class="right">'.$langs->trans('RemainderToPay').'</td>';
@@ -379,7 +379,7 @@ if ($resql)
 			print '</td>';
 
 			// Expected to pay
-			if($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED ){
+			if(!empty($conf->multicompany->enabled) && $conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED ){
 				print '<td>';
 				$mc->getInfo($objp->entity);
 				print $mc->label;

From d3ac33ce20040c0d192d59a2a20f130c6bde6386 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 May 2020 14:53:35 +0200
Subject: [PATCH 273/490] Fix json-ld file

---
 htdocs/core/lib/website.lib.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index baee3bd9bd5..782c22a7d33 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -533,8 +533,9 @@ function includeContainer($containerref)
 
 /**
  * Return HTML content to add structured data for an article, news or Blog Post.
+ * Use the json-ld format.
  *
- * @param 	string		$type				'blogpost', 'product', 'software'...
+ * @param 	string		$type				'blogpost', 'product', 'software', 'organization', ...
  * @param	array		$data				Array of data parameters for structured data
  * @return  string							HTML content
  */
@@ -575,13 +576,13 @@ function getStructuredData($type, $data = array())
 		$ret .= '{
 			"@context": "https://schema.org",
 			"@type": "Organization",
-			"name": "'.dol_escape_json($companyname).'",
-			"url": "'.$url.'",
-			"logo": "/wrapper.php?modulepart=mycompany&file=logos%2F'.urlencode($mysoc->logo).'",
+			"name": "'.dol_escape_json($data['name'] ? $data['name'] : $companyname).'",
+			"url": "'.dol_escape_json($data['url'] ? $data['url'] : $url).'",
+			"logo": "'.($data['logo'] ? dol_escape_json($data['logo']) : '/wrapper.php?modulepart=mycompany&file=logos%2F'.urlencode($mysoc->logo)).'",
 			"contactPoint": {
 				"@type": "ContactPoint",
 				"contactType": "Contact",
-				"email": "'.dol_escape_json($mysoc->email).'"
+				"email": "'.dol_escape_json($data['email'] ? $data['email'] : $mysoc->email).'"
 			},'."\n";
 		if (is_array($mysoc->socialnetworks) && count($mysoc->socialnetworks) > 0) {
 			$ret .= '"sameAs": [';

From 18a19dafe513942a8a099cac13e60303a7eb3dc1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 May 2020 15:01:29 +0200
Subject: [PATCH 274/490] Update cron_run_jobs.php

---
 scripts/cron/cron_run_jobs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index 104443feba1..6438b13e884 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -223,7 +223,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs)>0))
 		    // Reload langs
 		    $langcode = (empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT);
 		    if (! empty($user->conf->MAIN_LANG_DEFAULT)) $langcode = $user->conf->MAIN_LANG_DEFAULT;
-		    if($langs->getDefaultLang() != $langcode) $langs->setDefaultLang($langcode);
+		    if ($langs->getDefaultLang() != $langcode) $langs->setDefaultLang($langcode);
 		}
 
 		//If date_next_jobs is less of current date, execute the program, and store the execution time of the next execution in database

From 756c1fd73d4f9993379b7c63018f19f67699f63d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 May 2020 15:26:04 +0200
Subject: [PATCH 275/490] Fix tooltip message

---
 htdocs/admin/security_other.php | 7 +++++--
 htdocs/langs/en_US/admin.lang   | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index f0ad4352b60..f642cd64182 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -177,7 +177,11 @@ $sessiontimeout = ini_get("session.gc_maxlifetime");
 if (empty($conf->global->MAIN_SESSION_TIMEOUT)) $conf->global->MAIN_SESSION_TIMEOUT = $sessiontimeout;
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("SessionTimeOut").'</td><td class="right">';
-print $form->textwithpicto('', $langs->trans("SessionExplanation", ini_get("session.gc_probability"), ini_get("session.gc_divisor")));
+if (ini_get("session.gc_probability") == 0) {
+	print $form->textwithpicto('', $langs->trans("SessionsPurgedByExternalSystem", ini_get("session.gc_maxlifetime")));
+} else {
+	print $form->textwithpicto('', $langs->trans("SessionExplanation", ini_get("session.gc_probability"), ini_get("session.gc_divisor"), ini_get("session.gc_maxlifetime")));
+}
 print '</td>';
 print '<td class="nowrap">';
 print '<input class="flat" name="MAIN_SESSION_TIMEOUT" type="text" size="6" value="'.htmlentities($conf->global->MAIN_SESSION_TIMEOUT).'"> '.strtolower($langs->trans("Seconds"));
@@ -185,7 +189,6 @@ print '</td>';
 print '</tr>';
 
 
-$sessiontimeout = ini_get("session.gc_maxlifetime");
 if (empty($conf->global->MAIN_APPLICATION_TITLE)) $conf->global->MAIN_APPLICATION_TITLE = "";
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MAIN_APPLICATION_TITLE").'</td><td class="right">';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 5e485c86dbc..84c64a23615 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1145,6 +1145,7 @@ AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
 SessionTimeOut=Time out for session
 SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
+SessionsPurgedByExternalSystem=Sessions on this server seems to be cleaned by an external mechanism (cron under debian, ubuntu ...), probably every <b>%s</b> seconds (= value of parameter <b>session.gc_maxlifetime</b>), so changing the value here has no effect. You must ask the server administrator to change session delay.
 TriggersAvailable=Available triggers
 TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
 TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.

From 514009ca6d65fee96e48b89f0b79784fda4cf924 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 May 2020 15:47:21 +0200
Subject: [PATCH 276/490] Add field position in llx_website

---
 .travis.yml                                      | 4 ++++
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 2 +-
 htdocs/install/mysql/tables/llx_website.sql      | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 688d706331d..9958556d42d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -404,6 +404,10 @@ script:
   php upgrade.php 11.0.0 12.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade11001200.log
   php upgrade2.php 11.0.0 12.0.0 > $TRAVIS_BUILD_DIR/upgrade11001200-2.log
   php step5.php 11.0.0 12.0.0 > $TRAVIS_BUILD_DIR/upgrade11001200-3.log
+  php upgrade.php 12.0.0 13.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade12001300.log
+  php upgrade2.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-2.log
+  php step5.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-3.log
+
   # Enable modules not enabled into original dump
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKETSUP,MAIN_MODULE_ACCOUNTING > $TRAVIS_BUILD_DIR/enablemodule.log
   echo $?
diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 210fe31d1ef..782516353b2 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -33,4 +33,4 @@
 
 -- For v13
 
-
+ALTER TABLE llx_website ADD COLUMN position integer DEFAULT 0;
diff --git a/htdocs/install/mysql/tables/llx_website.sql b/htdocs/install/mysql/tables/llx_website.sql
index 743d4ec9ca8..717052f795c 100644
--- a/htdocs/install/mysql/tables/llx_website.sql
+++ b/htdocs/install/mysql/tables/llx_website.sql
@@ -35,6 +35,7 @@ CREATE TABLE llx_website
     fk_user_creat integer,
     fk_user_modif integer,
     date_creation datetime,
+    position      integer DEFAULT 0,
 	tms           timestamp,
     import_key    varchar(14)      -- import key	
 ) ENGINE=innodb;

From 76663ae3e8a82dd7489ffc3438f4d481f12985e5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 May 2020 22:40:32 +0200
Subject: [PATCH 277/490] Fix canonical tag

---
 htdocs/core/lib/website2.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index fc56a489d75..0ab35c55fd8 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -196,7 +196,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
 		else dol_print_error($db);
 	}
 	// Add canonical reference
-	$tplcontent .= '<link href="'.(($objectpage->id == $object->fk_default_home) ? '/' : (($shortlangcode != substr($object->lang, 0, 2) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php')).'" rel="canonical" />'."\n";
+	$tplcontent .= '<link rel="canonical" href="'.(($objectpage->id == $object->fk_default_home) ? '/' : (($shortlangcode != substr($object->lang, 0, 2) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php')).'" />'."\n";
 	// Add manifest.json on homepage
 	$tplcontent .= '<?php if ($website->use_manifest) { print \'<link rel="manifest" href="/manifest.json.php" />\'."\n"; } ?>'."\n";
 	$tplcontent .= '<!-- Include link to CSS file -->'."\n";

From 7b29ce036a06325e464d39ff7c08af6e13103bac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 19 May 2020 00:50:30 +0200
Subject: [PATCH 278/490] Fix input of virtual host and canonical url

---
 htdocs/core/lib/website2.lib.php | 4 +++-
 htdocs/website/index.php         | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 0ab35c55fd8..ce1f27b49fc 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -196,7 +196,9 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
 		else dol_print_error($db);
 	}
 	// Add canonical reference
-	$tplcontent .= '<link rel="canonical" href="'.(($objectpage->id == $object->fk_default_home) ? '/' : (($shortlangcode != substr($object->lang, 0, 2) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php')).'" />'."\n";
+	if ($object->virtualhost) {
+		$tplcontent .= '<link rel="canonical" href="'.$object->virtualhost.(($objectpage->id == $object->fk_default_home) ? '/' : (($shortlangcode != substr($object->lang, 0, 2) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php')).'" />'."\n";
+	}
 	// Add manifest.json on homepage
 	$tplcontent .= '<?php if ($website->use_manifest) { print \'<link rel="manifest" href="/manifest.json.php" />\'."\n"; } ?>'."\n";
 	$tplcontent .= '<!-- Include link to CSS file -->'."\n";
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 4f7cba09e89..70cfe780f55 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -681,6 +681,7 @@ if ($action == 'addcontainer')
 				//$objectpage->htmlheader = preg_replace('/<meta name="msvalidate.01[^>]*>\n*/ims', '', $objectpage->htmlheader);
 				$objectpage->htmlheader = preg_replace('/<title>[^<]*<\/title>\n*/ims', '', $objectpage->htmlheader);
 				$objectpage->htmlheader = preg_replace('/<link[^>]*rel="shortcut[^>]*>\n/ims', '', $objectpage->htmlheader);
+				$objectpage->htmlheader = preg_replace('/<link[^>]*rel="alternate[^>]*>\n/ims', '', $objectpage->htmlheader);
 				$objectpage->htmlheader = preg_replace('/<link[^>]*rel="canonical[^>]*>\n/ims', '', $objectpage->htmlheader);
 
 				// Now loop to fetch JS
@@ -1155,7 +1156,8 @@ if ($action == 'updatecss')
 
 		if (GETPOSTISSET('virtualhost'))
 		{
-		    if (GETPOST('virtualhost', 'alpha') && !preg_match('/^http/', GETPOST('virtualhost', 'alpha')))
+			$tmpvirtualhost = preg_replace('/\/$/', '', GETPOST('virtualhost', 'alpha'));
+			if ($tmpvirtualhost && !preg_match('/^http/', $tmpvirtualhost))
     		{
     		    $error++;
     		    setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
@@ -1169,7 +1171,7 @@ if ($action == 'updatecss')
     				$arrayotherlang[$key] = substr(trim($val), 0, 2); // Kept short language code only
     			}
 
-    		    $object->virtualhost = GETPOST('virtualhost', 'alpha');
+    			$object->virtualhost = $tmpvirtualhost;
     		    $object->lang = GETPOST('WEBSITE_LANG', 'aZ09');
     		    $object->otherlang = join(',', $arrayotherlang);
     		    $object->use_manifest = GETPOST('use_manifest', 'alpha');

From d35a24ee76b0639d7b3697ba95e0149b053421fe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 19 May 2020 01:36:33 +0200
Subject: [PATCH 279/490] Removed not expected file

---
 htdocs/website/index.html | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 htdocs/website/index.html

diff --git a/htdocs/website/index.html b/htdocs/website/index.html
deleted file mode 100644
index e69de29bb2d..00000000000

From 3e187f8ce06325d0a4e3fca35205006640abe290 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 19 May 2020 03:36:29 +0200
Subject: [PATCH 280/490] Fix add check on size limit

---
 htdocs/compta/prelevement/card.php | 4 ----
 htdocs/website/index.php           | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index cb3205a0e70..d81e101be3d 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -272,10 +272,6 @@ if ($id > 0 || $ref)
 		print '<tr class="oddeven"><td>'.$langs->trans("TransMetod").'</td><td>';
 		print $form->selectarray("methode", $object->methodes_trans);
 		print '</td></tr>';
-        /*print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
-		print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
-		print '<input class="flat" type="file" name="userfile"><br>';
-		print '</td></tr>';*/
 		print '</table><br>';
 		print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("SetToStatusSent")).'"></div>';
 		print '</form>';
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 70cfe780f55..a48b6d92548 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -3069,6 +3069,7 @@ if ($action == 'importsite')
 
 	print '<span class="opacitymedium">'.$langs->trans("ZipOfWebsitePackageToImport").'</span><br><br>';
 
+	print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
 	print '<input class="flat minwidth400" type="file" name="userfile[]" accept=".zip">';
 	print '<input type="submit" class="button" name="buttonsubmitimportfile" value="'.dol_escape_htmltag($langs->trans("Upload")).'">';
 	print '<input type="submit" class="button" name="preview" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';

From b3a17c8da4550e620fd7e87c9a473d9c3ae09053 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 19 May 2020 04:21:38 +0200
Subject: [PATCH 281/490] Look and feel v12

---
 htdocs/admin/security.php      | 14 +++++++-------
 htdocs/admin/security_file.php |  4 ++--
 htdocs/langs/en_US/admin.lang  |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index f016c305a15..d9d61673c5e 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -168,9 +168,9 @@ elseif ($action == 'disable_MAIN_SECURITY_DISABLEFORGETPASSLINK')
 	exit;
 }
 
-if ($action == 'maj_pattern')
+if ($action == 'updatepattern')
 {
-    $pattern = GETPOST("pattern");
+    $pattern = GETPOST("pattern", "alpha");
     $explodePattern = explode(';', $pattern);
 
     $patternInError = false;
@@ -184,6 +184,7 @@ if ($action == 'maj_pattern')
 
     if (!$patternInError) {
 	    dolibarr_set_const($db, "USER_PASSWORD_PATTERN", $pattern, 'chaine', 0, '', $conf->entity);
+	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	    header("Location: security.php");
 	    exit;
     }
@@ -336,11 +337,9 @@ if ($conf->global->USER_PASSWORD_GENERATED == "Perso") {
 	print '</table>';
 
 	print '<br>';
-	print '<table class="right">';
-	print '<tr><td>';
+	print '<div class="center">';
 	print '<a class="button" id="linkChangePattern">'.$langs->trans("Save").'</a>';
-	print '</td></tr>';
-	print '</table>';
+	print '</div>';
 	print '<br><br>';
 
 	print '<script type="text/javascript">';
@@ -369,10 +368,11 @@ if ($conf->global->USER_PASSWORD_GENERATED == "Perso") {
 	print '	}';
 
 	print '	function generatelink(){';
-	print '		return "security.php?action=maj_pattern&pattern="+getStringArg();';
+	print '		return "security.php?action=updatepattern&pattern="+getStringArg();';
 	print '	}';
 
 	print '	function valuePatternChange(){';
+	print '     console.log("valuePatternChange");';
 	print '		var lang_save = "'.$langs->trans("Save").'";';
 	print '		var lang_error = "'.$langs->trans("Error").'";';
 	print '		var lang_Disabled = "'.$langs->trans("Disabled").'";';
diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index 039f6c80331..0f3c5e4a851 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -138,7 +138,7 @@ print '</tr>';
 
 print '<tr class="oddeven">';
 print '<td colspan="2">'.$langs->trans("AntiVirusCommand").'<br>';
-print $langs->trans("AntiVirusCommandExample");
+print '<span class="opacitymedium">'.$langs->trans("AntiVirusCommandExample").'</span>';
 // Check command in inside safe_mode
 print '</td>';
 print '<td>';
@@ -161,7 +161,7 @@ print '</tr>';
 
 print '<tr class="oddeven">';
 print '<td colspan="2">'.$langs->trans("AntiVirusParam").'<br>';
-print $langs->trans("AntiVirusParamExample");
+print '<span class="opacitymedium">'.$langs->trans("AntiVirusParamExample").'</span>';
 print '</td>';
 print '<td>';
 print '<input type="text" name="MAIN_ANTIVIRUS_PARAM" class="minwidth500imp" value="'.(!empty($conf->global->MAIN_ANTIVIRUS_PARAM) ?dol_escape_htmltag($conf->global->MAIN_ANTIVIRUS_PARAM) : '').'">';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 84c64a23615..fef27b5b7de 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -95,7 +95,7 @@ NextValueForInvoices=Next value (invoices)
 NextValueForCreditNotes=Next value (credit notes)
 NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+MustBeLowerThanPHPLimit=Note: your PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
 UseCaptchaCode=Use graphical code (CAPTCHA) on login page

From 2d0abebca301cc88afb503b5786bef802661c436 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 19 May 2020 04:40:08 +0200
Subject: [PATCH 282/490] CSS

---
 htdocs/hrm/index.php             |  2 +-
 htdocs/theme/eldy/global.inc.php | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index ba33ecbbdb3..e31266f755c 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -77,7 +77,7 @@ $childids[] = $user->id;
 
 llxHeader('', $langs->trans('HRMArea'));
 
-print load_fiche_titre($langs->trans("HRMArea"), '', 'hrm');
+print load_fiche_titre($langs->trans("HRMArea"), '', 'user');
 
 
 if (!empty($setupcompanynotcomplete))
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 2430257b268..fc365ae5812 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1638,10 +1638,14 @@ td.nobordernopadding.widthpictotitle.col-picto {
 }
 
 span.widthpictotitle.pictotitle {
-/*    background: var(--colortexttitlenotab);
-    color: #fff;
-    padding: 10px;
-    border-radius: 2px;*/
+	/* background: rgba(70, 3, 62, 0.5); */
+    background: var(--colortexttitlenotab);
+    opacity: 0.8;
+    color: #fff !important;
+    padding: 7px;
+    border-radius: 2px;
+    min-width: 30px;
+    text-align: center;
 }
 .pictotitle {
 	margin-<?php echo $right; ?>: 8px;
@@ -3913,7 +3917,7 @@ div.boximport {
 
 .fieldrequired { font-weight: bold; color: var(--fieldrequiredcolor); }
 
-.widthpictotitle { width: 26px; text-align: <?php echo $left; ?>; }
+td.widthpictotitle { width: 26px; text-align: <?php echo $left; ?>; }
 span.widthpictotitle { font-size: 1.7em; };
 
 .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; }

From 223224d12c21791162343ee88370eebbe91c2f93 Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Tue, 19 May 2020 08:07:21 +0200
Subject: [PATCH 283/490] Add function to update the event percent + const

---
 htdocs/comm/action/class/actioncomm.class.php | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index bf906989d16..6df61e3bc72 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -343,6 +343,20 @@ class ActionComm extends CommonObject
      */
     public $errors_to;
 
+	/**
+	 * Typical value for a event that is in a todo state
+	 */
+	const EVENT_TODO = 0;
+
+	/**
+	 * Typical value for a event that is in a progress state
+	 */
+	const EVENT_IN_PROGRESS = 50;
+
+	/**
+	 * Typical value for a event that is in a finished state
+	 */
+	const EVENT_FINISHED = 100;
 
     /**
      *      Constructor
@@ -2021,4 +2035,32 @@ class ActionComm extends CommonObject
 
         return $error;
     }
+	
+	/**
+	 * Udpate the percent value of a event with the given id
+	 *
+	 * @param int		$id			The id of the event
+	 * @param int		$percent	The new percent value for the event
+	 * @return int					1 when update of the event was suscessfull, otherwise -1
+	 */
+	public function updatePercent($id, $percent)
+	{
+		$this->db->begin();
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
+		$sql .= " SET percent = '".$percent."'";
+		$sql .= " WHERE id=".$id;
+
+		if ($this->db->query($sql))
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->db->rollback();
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 }

From 7fd6151c432957d94232c5fba8d46dc799ebd9e6 Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Tue, 19 May 2020 08:18:38 +0200
Subject: [PATCH 284/490] Add massactions for event list

---
 htdocs/comm/action/list.php | 60 +++++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 2391f9ca491..be841ea8506 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2017      Open-DSI             <support@open-dsi.fr>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2020		Tobias Sekan		<tobias.sekan@startmail.com>
  *
  * 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 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 $langs->loadLangs(array("users", "companies", "agenda", "commercial", "other"));
 
 $action = GETPOST('action', 'alpha');
+$massaction = GETPOST('massaction', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'actioncommlist'; // To manage different context of search
 $resourceid = GETPOST("search_resourceid", "int") ?GETPOST("search_resourceid", "int") : GETPOST("resourceid", "int");
 $pid = GETPOST("search_projectid", 'int', 3) ?GETPOST("search_projectid", 'int', 3) : GETPOST("projectid", 'int', 3);
@@ -49,6 +51,8 @@ $optioncss = GETPOST('optioncss', 'alpha');
 $year = GETPOST("year", 'int');
 $month = GETPOST("month", 'int');
 $day = GETPOST("day", 'int');
+$toselect = GETPOST('toselect', 'array');
+
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
 if (GETPOST('search_actioncode', 'array'))
 {
@@ -185,9 +189,42 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
     $datestart = '';
     $dateend = '';
     $search_status = '';
+	$toselect = '';
     $search_array_options = array();
 }
 
+if (empty($reshook) && !empty($massaction))
+{
+	unset($percent);
+
+	switch ($massaction)
+	{
+		case 'set_all_events_to_todo':
+			$percent = ActionComm::EVENT_TODO;
+			break;
+
+		case 'set_all_events_to_in_progress':
+			$percent = ActionComm::EVENT_IN_PROGRESS;
+			break;
+
+		case 'set_all_events_to_finished':
+			$percent = ActionComm::EVENT_FINISHED;
+			break;
+	}
+
+	if(isset($percent))
+	{
+		foreach ($toselect as $toselectid)
+		{
+			$result = $object->updatePercent($toselectid, $percent);
+			if($result < 0)
+			{
+				dol_print_error($db);
+				break;
+			}
+		}
+	}
+}
 
 /*
  *  View
@@ -239,6 +276,15 @@ if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
+// List of mass actions available
+$arrayofmassactions = array(
+	'set_all_events_to_todo' => $langs->trans("SetAllEventsToTodo"),
+	'set_all_events_to_in_progress' => $langs->trans("SetAllEventsToInProgress"),
+	'set_all_events_to_finished' => $langs->trans("SetAllEventsToFinished"),
+);
+
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+
 $sql = "SELECT";
 if ($usergroup > 0) $sql .= " DISTINCT";
 $sql .= " s.nom as societe, s.rowid as socid, s.client, s.email as socemail,";
@@ -366,6 +412,8 @@ if ($resql)
 
 	$num = $db->num_rows($resql);
 
+	$arrayofselected = is_array($toselect) ? $toselect : array();
+
 	// Local calendar
 	$newtitle = '<div class="nowrap clear inline-block minheight20"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; </div>';
 	//$newtitle=$langs->trans($title);
@@ -436,7 +484,7 @@ if ($resql)
         $newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : '')));
     }
 
-    print_barre_liste($s, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, $nav.$newcardbutton, '', $limit, 0, 0, 1);
+    print_barre_liste($s, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, -1 * $nbtotalofrecords, '', 0, $nav.$newcardbutton, '', $limit, 0, 0, 1);
 
     $moreforfilter = '';
 
@@ -740,7 +788,15 @@ if ($resql)
 			$datep = $db->jdate($obj->datep);
 			print '<td align="center" class="nowrap">'.$actionstatic->LibStatut($obj->percent, 5, 0, $datep).'</td>';
 		}
-		print '<td></td>';
+		// Action column
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		{
+			$selected = 0;
+			if (in_array($obj->id, $arrayofselected)) $selected = 1;
+			print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
 
 		print "</tr>\n";
 		$i++;

From 0cba74277a69a49e4b46aba10b89b74a7ee98a87 Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Tue, 19 May 2020 08:19:14 +0200
Subject: [PATCH 285/490] Update agenda.lang

---
 htdocs/langs/en_US/agenda.lang | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index f4c8c5b4fbc..869a312910e 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -152,3 +152,6 @@ EveryMonth=Every month
 DayOfMonth=Day of month
 DayOfWeek=Day of week
 DateStartPlusOne=Date start + 1 hour
+SetAllEventsToTodo=Set all events to todo
+SetAllEventsToInProgress=Set all events to in progress
+SetAllEventsToFinished=Set all events to finished

From f0bb7d233fb211d706dc70be9a0147c54e700a08 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 19 May 2020 06:29:23 +0000
Subject: [PATCH 286/490] Fixing style errors.

---
 htdocs/comm/action/class/actioncomm.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 6df61e3bc72..dadc180ce08 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -2035,7 +2035,7 @@ class ActionComm extends CommonObject
 
         return $error;
     }
-	
+
 	/**
 	 * Udpate the percent value of a event with the given id
 	 *

From 1f46c57c0b07b1bbef56a53d013b6c6ac726ef38 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 19 May 2020 09:36:07 +0200
Subject: [PATCH 287/490] NEW Add employee in expense report binding page

---
 htdocs/accountancy/customer/lines.php      | 66 +++++++++--------
 htdocs/accountancy/expensereport/lines.php | 85 ++++++++++++++++------
 htdocs/accountancy/expensereport/list.php  | 37 +++++++++-
 htdocs/accountancy/supplier/lines.php      | 50 +++++++------
 htdocs/accountancy/supplier/list.php       |  2 +-
 5 files changed, 160 insertions(+), 80 deletions(-)

diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 45b0c909016..0bbb8800425 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -324,7 +325,7 @@ if ($result) {
 	//print '<input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '">';
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tvaintra" value="'.dol_escape_htmltag($search_tvaintra).'"></td>';
-	print '<td class="liste_titre center"><input type="text" class="flat maxwidth50" name="search_account" value="'.dol_escape_htmltag($search_account).'"></td>';
+	print '<td class="liste_titre center"><input type="text" class="flat maxwidth100" name="search_account" value="'.dol_escape_htmltag($search_account).'"></td>';
 	print '<td class="liste_titre center">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
@@ -342,37 +343,41 @@ if ($result) {
 	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("AccountAccounting", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
 	$clickpicto = $form->showCheckAddButtons();
 	print_liste_field_titre($clickpicto, '', '', '', '', '', '', '', 'center ');
 	print "</tr>\n";
 
-	$thirdpartystatic=new Societe($db);
-	$facture_static = new Facture($db);
-	$product_static = new Product($db);
+    $thirdpartystatic=new Societe($db);
+    $facturestatic = new Facture($db);
+	$productstatic = new Product($db);
+    $accountingaccountstatic = new AccountingAccount($db);
 
-	while ($objp = $db->fetch_object($result)) {
-		$codecompta = length_accountg($objp->account_number).' - <span class="opacitymedium">'.$objp->label_compte.'</span>';
+	while ($objp = $db->fetch_object($result))
+    {
+        $accountingaccountstatic->account_number = $objp->account_number;
+        $accountingaccountstatic->label = $objp->label_account;
+        $accountingaccountstatic->labelshort = $objp->labelshort_account;
 
-		$facture_static->ref = $objp->ref;
-		$facture_static->id = $objp->facid;
-		$facture_static->type = $objp->ftype;
+		$facturestatic->ref = $objp->ref;
+		$facturestatic->id = $objp->facid;
+		$facturestatic->type = $objp->ftype;
 
-		$thirdpartystatic->id = $objp->socid;
-		$thirdpartystatic->name = $objp->name;
-		$thirdpartystatic->client = $objp->client;
-		$thirdpartystatic->fournisseur = $objp->fournisseur;
-		$thirdpartystatic->code_client = $objp->code_client;
-		$thirdpartystatic->code_compta_client = $objp->code_compta_client;
-		$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
-		$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
-		$thirdpartystatic->email = $objp->email;
-		$thirdpartystatic->country_code = $objp->country_code;
+        $thirdpartystatic->id = $objp->socid;
+        $thirdpartystatic->name = $objp->name;
+        $thirdpartystatic->client = $objp->client;
+        $thirdpartystatic->fournisseur = $objp->fournisseur;
+        $thirdpartystatic->code_client = $objp->code_client;
+        $thirdpartystatic->code_compta_client = $objp->code_compta_client;
+        $thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+        $thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+        $thirdpartystatic->email = $objp->email;
+        $thirdpartystatic->country_code = $objp->country_code;
 
-		$product_static->ref = $objp->product_ref;
-		$product_static->id = $objp->product_id;
-		$product_static->label = $objp->product_label;
-		$product_static->type = $objp->line_type;
+		$productstatic->ref = $objp->product_ref;
+		$productstatic->id = $objp->product_id;
+		$productstatic->label = $objp->product_label;
+		$productstatic->type = $objp->line_type;
 
 		print '<tr class="oddeven">';
 
@@ -380,16 +385,16 @@ if ($result) {
 		print '<td>'.$objp->rowid.'</td>';
 
 		// Ref Invoice
-		print '<td class="nowraponall">'.$facture_static->getNomUrl(1).'</td>';
+		print '<td class="nowraponall">'.$facturestatic->getNomUrl(1).'</td>';
 
 		// Date invoice
 		print '<td class="center">'.dol_print_date($db->jdate($objp->datef), 'day').'</td>';
 
 		// Ref Product
 		print '<td>';
-		if ($product_static->id > 0) print $product_static->getNomUrl(1);
-		if ($product_static->id > 0 && $objp->product_label) print '<br>';
-		if ($objp->product_label) print '<span class="opacitymedium">'.$objp->product_label.'</span>';
+		if ($productstatic->id > 0) print $productstatic->getNomUrl(1);
+		if ($productstatic->id > 0 && $objp->product_label) print '<br>';
+		if ($objp->product_label) print $objp->product_label;
 		print '</td>';
 
 		print '<td class="tdoverflowonsmartphone">';
@@ -415,8 +420,9 @@ if ($result) {
 
 		print '<td>'.$objp->tva_intra.'</td>';
 
-		print '<td>';
-		print $codecompta.' <a class="editfielda" href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
+		print '<td class="center">';
+        print $accountingaccountstatic->getNomUrl(0, 1, 1, '', 1);
+		print ' <a class="editfielda" href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
 		print img_edit();
 		print '</a>';
 		print '</td>';
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 4cd51fb3a63..1940d382737 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -28,19 +28,22 @@ require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("compta", "bills", "other", "accountancy", "trips", "productbatch"));
+$langs->loadLangs(array("compta", "bills", "other", "accountancy", "trips", "productbatch", "hrm"));
 
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 $account_parent = GETPOST('account_parent', 'int');
 $changeaccount = GETPOST('changeaccount');
 // Search Getpost
+$search_login = GETPOST('search_login', 'alpha');
 $search_expensereport = GETPOST('search_expensereport', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
 $search_desc = GETPOST('search_desc', 'alpha');
@@ -84,7 +87,8 @@ $formaccounting = new FormAccounting($db);
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
 {
-	$search_expensereport = '';
+    $search_login = '';
+    $search_expensereport = '';
 	$search_label = '';
 	$search_desc = '';
 	$search_amount = '';
@@ -162,14 +166,21 @@ print '<script type="text/javascript">
  */
 $sql = "SELECT er.ref, er.rowid as erid,";
 $sql .= " erd.rowid, erd.fk_c_type_fees, erd.comments, erd.total_ht, erd.fk_code_ventilation, erd.tva_tx, erd.vat_src_code, erd.date,";
-$sql .= " aa.label, aa.account_number,";
-$sql .= " f.id as type_fees_id, f.code as type_fees_code, f.label as type_fees_label";
+$sql .= " f.id as type_fees_id, f.code as type_fees_code, f.label as type_fees_label,";
+$sql .= " u.rowid, u.login, u.lastname, u.firstname, u.email, u.gender, u.employee, u.photo, u.statut,";
+$sql .= " aa.label as label_account, aa.labelshort as labelshort_account, aa.account_number";
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as er";
-$sql .= " , ".MAIN_DB_PREFIX."accounting_account as aa";
-$sql .= " , ".MAIN_DB_PREFIX."expensereport_det as erd";
+$sql .= " INNER JOIN ".MAIN_DB_PREFIX."expensereport_det as erd ON er.rowid = erd.fk_expensereport";
+$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = erd.fk_code_ventilation";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_fees as f ON f.id = erd.fk_c_type_fees";
-$sql .= " WHERE er.rowid = erd.fk_expensereport and er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseReport::STATUS_CLOSED.") AND erd.fk_code_ventilation <> 0 ";
-$sql .= " AND aa.rowid = erd.fk_code_ventilation";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = er.fk_user_author";
+$sql .= " WHERE erd.fk_code_ventilation > 0";
+$sql .= " AND er.entity IN (".getEntity('expensereport', 0).")"; // We don't share object for accountancy
+$sql .= " AND er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseReport::STATUS_CLOSED.")";
+// Add search filter like
+if (strlen(trim($search_login))) {
+    $sql .= natural_search("u.login", $search_login);
+}
 if (strlen(trim($search_expensereport))) {
 	$sql .= natural_search("er.ref", $search_expensereport);
 }
@@ -218,6 +229,7 @@ if ($result) {
 	$param = '';
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+    if ($search_login)       $param .= '&search_login='.urlencode($search_login);
 	if ($search_expensereport) $param .= "&search_expensereport=".urlencode($search_expensereport);
 	if ($search_label)		$param .= "&search_label=".urlencode($search_label);
 	if ($search_desc)		$param .= "&search_desc=".urlencode($search_desc);
@@ -250,7 +262,8 @@ if ($result) {
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre"></td>';
+    print '<td class="liste_titre"><input type="text" name="search_login" class="maxwidth50" value="'.$search_login.'"></td>';
+    print '<td class="liste_titre"></td>';
 	print '<td><input type="text" class="flat maxwidth50" name="search_expensereport" value="'.dol_escape_htmltag($search_expensereport).'"></td>';
 	if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
 		print '<td class="liste_titre"></td>';
@@ -264,8 +277,7 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="'.dol_escape_htmltag($search_desc).'"></td>';
 	print '<td class="liste_titre right"><input type="text" class="flat maxwidth50" name="search_amount" value="'.dol_escape_htmltag($search_amount).'"></td>';
 	print '<td class="liste_titre center"><input type="text" class="flat maxwidth50" name="search_vat" size="1" placeholder="%" value="'.dol_escape_htmltag($search_vat).'"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_account" value="'.dol_escape_htmltag($search_account).'"></td>';
-    print '<td class="liste_titre right"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_account" value="'.dol_escape_htmltag($search_account).'"></td>';
     print '<td class="liste_titre right">';
     $searchpicto = $form->showFilterButtons();
     print $searchpicto;
@@ -273,7 +285,8 @@ if ($result) {
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
-	print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "erd.rowid", "", $param, '', $sortfield, $sortorder);
+    print_liste_field_titre("Employees", $_SERVER['PHP_SELF'], "u.login", $param, "", "", $sortfield, $sortorder);
+    print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "erd.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("ExpenseReport", $_SERVER["PHP_SELF"], "er.ref", "", $param, '', $sortfield, $sortorder);
 	if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
 		print_liste_field_titre("DateValidation", $_SERVER["PHP_SELF"], "er.date_valid", "", $param, '', $sortfield, $sortorder, 'center ');
@@ -283,27 +296,48 @@ if ($result) {
 	print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "erd.comments", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "erd.total_ht", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "erd.tva_tx", "", $param, '', $sortfield, $sortorder, 'center ');
-	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre('');
+	print_liste_field_titre("AccountAccounting", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
     $checkpicto = $form->showCheckAddButtons();
 	print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
 	print "</tr>\n";
 
-	$expensereport_static = new ExpenseReport($db);
+	$expensereportstatic = new ExpenseReport($db);
+	$accountingaccountstatic = new AccountingAccount($db);
+    $userstatic = new User($db);
 
 	while ($i < min($num_lines, $limit)) {
 		$objp = $db->fetch_object($result);
-		$codeCompta = length_accountg($objp->account_number).' - <span class="opacitymedium">'.$objp->label.'</span>';
 
-		$expensereport_static->ref = $objp->ref;
-		$expensereport_static->id = $objp->erid;
+        $accountingaccountstatic->account_number = $objp->account_number;
+        $accountingaccountstatic->label = $objp->label_account;
+		$accountingaccountstatic->labelshort = $objp->labelshort_account;
+
+		$expensereportstatic->ref = $objp->ref;
+		$expensereportstatic->id = $objp->erid;
+
+        $userstatic->id = $objp->rowid;
+        $userstatic->ref = $objp->label;
+        $userstatic->login = $objp->login;
+        $userstatic->statut = $objp->statut;
+        $userstatic->email = $objp->email;
+        $userstatic->gender = $objp->gender;
+        $userstatic->firstname = $objp->firstname;
+        $userstatic->lastname = $objp->lastname;
+        $userstatic->employee = $objp->employee;
+        $userstatic->photo = $objp->photo;
 
 		print '<tr class="oddeven">';
 
+        // Login
+        print '<td class="nowraponall">';
+        print $userstatic->getNomUrl(-1, '', 0, 0, 24, 1, 'login', '', 1);
+        print '</td>';
+
+        // Line id
 		print '<td>'.$objp->rowid.'</td>';
 
-		// Ref Invoice
-		print '<td>'.$expensereport_static->getNomUrl(1).'</td>';
+        // Ref Expense report
+		print '<td>'.$expensereportstatic->getNomUrl(1).'</td>';
 
 		// Date validation
 		if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
@@ -312,21 +346,26 @@ if ($result) {
 
 		print '<td class="center">'.dol_print_date($db->jdate($objp->date), 'day').'</td>';
 
+        // Fees label
 		print '<td class="tdoverflow">'.($langs->trans($objp->type_fees_code) == $objp->type_fees_code ? $objp->type_fees_label : $langs->trans(($objp->type_fees_code))).'</td>';
 
+        // Fees description -- Can be null
 		print '<td>';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->comments));
 		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->comments);
 		print '</td>';
 
+		// Amount without taxes
 		print '<td class="nowrap right">'.price($objp->total_ht).'</td>';
 
+        // Vat rate
 		print '<td class="center">'.vatrate($objp->tva_tx.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : '')).'</td>';
 
-		print '<td>'.$codeCompta.'</td>';
-
-		print '<td class="left"><a class="editfielda" href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
+		// Accounting account affected
+		print '<td class="center">';
+		print $accountingaccountstatic->getNomUrl(0, 1, 1, '', 1);
+        print ' <a class="editfielda reposition marginleftonly marginrightonly" href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
 		print img_edit();
 		print '</a></td>';
 
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 96eebd49b36..7f6885e1b62 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -28,6 +28,7 @@
 require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
@@ -35,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other", "trips", "productbatch"));
+$langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other", "trips", "productbatch", "hrm"));
 
 $action = GETPOST('action', 'alpha');
 $massaction = GETPOST('massaction', 'alpha');
@@ -50,6 +51,7 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ''
 $mesCasesCochees = GETPOST('toselect', 'array');
 
 // Search Getpost
+$search_login = GETPOST('search_login', 'alpha');
 $search_lineid = GETPOST('search_lineid', 'alpha');
 $search_expensereport = GETPOST('search_expensereport', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -100,6 +102,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
 {
+    $search_login = '';
     $search_expensereport = '';
     $search_label = '';
     $search_desc = '';
@@ -189,13 +192,18 @@ if (empty($chartaccountcode))
 $sql = "SELECT er.ref, er.rowid as erid, er.date_debut, er.date_valid,";
 $sql .= " erd.rowid, erd.fk_c_type_fees, erd.comments, erd.total_ht as price, erd.fk_code_ventilation, erd.tva_tx as tva_tx_line, erd.vat_src_code, erd.date,";
 $sql .= " f.id as type_fees_id, f.code as type_fees_code, f.label as type_fees_label, f.accountancy_code as code_buy,";
+$sql .= " u.rowid, u.login, u.lastname, u.firstname, u.email, u.gender, u.employee, u.photo, u.statut,";
 $sql .= " aa.rowid as aarowid";
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as er";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."expensereport_det as erd ON er.rowid = erd.fk_expensereport";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_fees as f ON f.id = erd.fk_c_type_fees";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = er.fk_user_author";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON f.accountancy_code = aa.account_number AND aa.fk_pcg_version = '".$chartaccountcode."' AND aa.entity = ".$conf->entity;
 $sql .= " WHERE er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseReport::STATUS_CLOSED.") AND erd.fk_code_ventilation <= 0";
 // Add search filter like
+if (strlen(trim($search_login))) {
+    $sql .= natural_search("u.login", $search_login);
+}
 if (strlen(trim($search_expensereport))) {
     $sql .= natural_search("er.ref", $search_expensereport);
 }
@@ -243,8 +251,9 @@ if ($result) {
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
 	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+    if ($search_login)       $param .= '&search_login='.urlencode($search_login);
 	if ($search_lineid)      $param .= '&search_lineid='.urlencode($search_lineid);
 	if ($search_day)         $param .= '&search_day='.urlencode($search_day);
 	if ($search_month)       $param .= '&search_month='.urlencode($search_month);
@@ -289,6 +298,7 @@ if ($result) {
 
 	// We add search filter
 	print '<tr class="liste_titre_filter">';
+    print '<td class="liste_titre"><input type="text" name="search_login" class="maxwidth50" value="'.$search_login.'"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_expensereport" value="'.dol_escape_htmltag($search_expensereport).'"></td>';
 	if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
@@ -312,6 +322,7 @@ if ($result) {
 	print '</tr>';
 
 	print '<tr class="liste_titre">';
+    print_liste_field_titre("Employee", $_SERVER['PHP_SELF'], "u.login", $param, "", "", $sortfield, $sortorder);
 	print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "erd.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("ExpenseReport", $_SERVER["PHP_SELF"], "er.ref", "", $param, '', $sortfield, $sortorder);
 	if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
@@ -331,6 +342,7 @@ if ($result) {
 
 
 	$expensereport_static = new ExpenseReport($db);
+	$userstatic = new User($db);
 	$form = new Form($db);
 
 	while ($i < min($num_lines, $limit)) {
@@ -342,7 +354,23 @@ if ($result) {
 		$expensereport_static->ref = $objp->ref;
 		$expensereport_static->id = $objp->erid;
 
-		print '<tr class="oddeven">';
+        $userstatic->id = $objp->rowid;
+        $userstatic->ref = $objp->label;
+        $userstatic->login = $objp->login;
+        $userstatic->statut = $objp->statut;
+        $userstatic->email = $objp->email;
+        $userstatic->gender = $objp->gender;
+        $userstatic->firstname = $objp->firstname;
+        $userstatic->lastname = $objp->lastname;
+        $userstatic->employee = $objp->employee;
+        $userstatic->photo = $objp->photo;
+
+        print '<tr class="oddeven">';
+
+        // Login
+        print '<td class="nowraponall">';
+        print $userstatic->getNomUrl(-1, '', 0, 0, 24, 1, 'login', '', 1);
+        print '</td>';
 
 		// Line id
 		print '<td>'.$objp->rowid.'</td>';
@@ -370,6 +398,7 @@ if ($result) {
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->comments);
 		print '</td>';
 
+        // Amount without taxes
 		print '<td class="nowrap right">';
 		print price($objp->price);
 		print '</td>';
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index f3a4b255f3e..b1978079871 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
@@ -326,7 +327,7 @@ if ($result) {
 	//	print '<input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '">';
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tvaintra" value="'.dol_escape_htmltag($search_tvaintra).'"></td>';
-	print '<td class="liste_titre center"><input type="text" class="flat maxwidth50" name="search_account" value="'.dol_escape_htmltag($search_account).'"></td>';
+	print '<td class="liste_titre center"><input type="text" class="flat maxwidth100" name="search_account" value="'.dol_escape_htmltag($search_account).'"></td>';
 	print '<td class="liste_titre center">';
     $searchpicto = $form->showFilterButtons();
     print $searchpicto;
@@ -346,38 +347,42 @@ if ($result) {
 	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("AccountAccounting", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
 	$checkpicto = $form->showCheckAddButtons();
 	print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
 	print "</tr>\n";
 
-	$thirdpartystatic = new Societe($db);
+    $thirdpartystatic = new Societe($db);
 	$facturefournisseur_static = new FactureFournisseur($db);
-	$product_static = new ProductFournisseur($db);
+	$productstatic = new ProductFournisseur($db);
+    $accountingaccountstatic = new AccountingAccount($db);
 
-	while ($i < min($num_lines, $limit)) {
+	while ($i < min($num_lines, $limit))
+    {
 		$objp = $db->fetch_object($result);
 
-		$codecompta = length_accountg($objp->account_number).' - <span class="opacitymedium">'.$objp->label.'</span>';
+        $accountingaccountstatic->account_number = $objp->account_number;
+        $accountingaccountstatic->label = $objp->label_account;
+        $accountingaccountstatic->labelshort = $objp->labelshort_account;
 
 		$facturefournisseur_static->ref = $objp->ref;
 		$facturefournisseur_static->id = $objp->facid;
 
-		$thirdpartystatic->id = $objp->socid;
-		$thirdpartystatic->name = $objp->name;
-		$thirdpartystatic->client = $objp->client;
-		$thirdpartystatic->fournisseur = $objp->fournisseur;
-		$thirdpartystatic->code_client = $objp->code_client;
-		$thirdpartystatic->code_compta_client = $objp->code_compta_client;
-		$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
-		$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
-		$thirdpartystatic->email = $objp->email;
-		$thirdpartystatic->country_code = $objp->country_code;
+        $thirdpartystatic->id = $objp->socid;
+        $thirdpartystatic->name = $objp->name;
+        $thirdpartystatic->client = $objp->client;
+        $thirdpartystatic->fournisseur = $objp->fournisseur;
+        $thirdpartystatic->code_client = $objp->code_client;
+        $thirdpartystatic->code_compta_client = $objp->code_compta_client;
+        $thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+        $thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+        $thirdpartystatic->email = $objp->email;
+        $thirdpartystatic->country_code = $objp->country_code;
 
-		$product_static->ref = $objp->product_ref;
-		$product_static->id = $objp->product_id;
-		$product_static->label = $objp->product_label;
-		$product_static->type = $objp->line_type;
+		$productstatic->ref = $objp->product_ref;
+		$productstatic->id = $objp->product_id;
+		$productstatic->label = $objp->product_label;
+		$productstatic->type = $objp->line_type;
 
 		print '<tr class="oddeven">';
 
@@ -425,8 +430,9 @@ if ($result) {
 
 		print '<td>'.$objp->tva_intra.'</td>';
 
-		print '<td>';
-		print $codecompta.' <a class="editfielda" href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
+		print '<td class="center">';
+        print $accountingaccountstatic->getNomUrl(0, 1, 1, '', 1);
+		print ' <a href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
 		print img_edit();
 		print '</a></td>';
 		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="'.$objp->rowid.'"/></td>';
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 6ef942bea89..95afd80caf5 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -320,7 +320,7 @@ if ($result) {
 	$param = '';
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($search_societe)     $param.='&search_societe='.urlencode($search_societe);
+	if ($search_societe)     $param .= '&search_societe='.urlencode($search_societe);
 	if ($search_lineid)      $param .= '&search_lineid='.urlencode($search_lineid);
 	if ($search_day)         $param .= '&search_day='.urlencode($search_day);
 	if ($search_month)       $param .= '&search_month='.urlencode($search_month);

From f073b7023a52e6acec529466567ae593bbed7272 Mon Sep 17 00:00:00 2001
From: atm-quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Tue, 19 May 2020 09:45:02 +0200
Subject: [PATCH 288/490] FIX missing GetNomURL Hook in warehouse class

---
 htdocs/product/stock/class/entrepot.class.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 03ba46a4068..47606388b52 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -692,7 +692,7 @@ class Entrepot extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $showfullpath = 0, $notooltip = 0)
 	{
-		global $conf, $langs;
+		global $conf, $langs, $hookmanager;
 		$langs->load("stocks");
 
         if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
@@ -731,6 +731,16 @@ class Entrepot extends CommonObject
         if ($withpicto != 2) $result.= ($showfullpath ? $this->get_full_arbo() : (empty($this->label)?$this->libelle:$this->label));
         $result .= $linkend;
 
+        global $action;
+        $hookmanager->initHooks(array('warehousedao'));
+        $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+        $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+        if ($reshook > 0) {
+            $result = $hookmanager->resPrint;
+        } else {
+            $result .= $hookmanager->resPrint;
+        }
+
 		return $result;
 	}
 

From e39774a508433ff096e33b83607e0e20de6d68ba Mon Sep 17 00:00:00 2001
From: atm-quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Tue, 19 May 2020 10:04:41 +0200
Subject: [PATCH 289/490] add more hook param

---
 htdocs/product/stock/class/entrepot.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 47606388b52..0b259018cfc 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -733,7 +733,7 @@ class Entrepot extends CommonObject
 
         global $action;
         $hookmanager->initHooks(array('warehousedao'));
-        $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+        $parameters = array('id'=>$this->id, 'getnomurl'=>$result, 'withpicto' => $withpicto, 'option' => $option, 'showfullpath' => $showfullpath, 'notooltip'=> $notooltip);
         $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
         if ($reshook > 0) {
             $result = $hookmanager->resPrint;

From 24ff047ad76ed503e5ea4209217275ab2bcbdfaf Mon Sep 17 00:00:00 2001
From: altairis <contact@altairis.fr>
Date: Tue, 19 May 2020 10:34:55 +0200
Subject: [PATCH 290/490] add tracking number

---
 htdocs/expedition/list.php | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 999bde3fb32..a0501c3dd99 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -56,6 +56,7 @@ $search_ref_exp = GETPOST("search_ref_exp", 'alpha');
 $search_ref_liv = GETPOST('search_ref_liv', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
 $search_company = GETPOST("search_company", 'alpha');
+$search_tracking = GETPOST("search_tracking", 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
 $search_state = trim(GETPOST("search_state"));
@@ -106,6 +107,7 @@ $fieldstosearchall = array(
 	'e.ref'=>"Ref",
 	's.nom'=>"ThirdParty",
 	'e.note_public'=>'NotePublic',
+	'e.tracking_number'=>"TrackingNumber",
 );
 if (empty($user->socid)) $fieldstosearchall["e.note_private"] = "NotePrivate";
 
@@ -120,6 +122,7 @@ $arrayfields = array(
 	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
 	'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
 	'e.date_delivery'=>array('label'=>$langs->trans("DateDeliveryPlanned"), 'checked'=>1),
+	'e.tracking_number'=>array('label'=>$langs->trans("TrackingNumber"), 'checked'=>1),
 	'e.weight'=>array('label'=>$langs->trans("Weight"), 'checked'=>0),
 	'e.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	'e.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
@@ -172,6 +175,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_state = "";
 	$search_type = '';
 	$search_country = '';
+	$search_tracking='';
 	$search_type_thirdparty = '';
 	$search_billed = '';
 	$search_datedelivery_start = '';
@@ -214,7 +218,7 @@ llxHeader('', $langs->trans('ListOfSendings'), $helpurl);
 
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
-$sql .= " e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.weight, e.weight_units, e.date_delivery as date_livraison, l.date_delivery as date_reception, e.fk_statut, e.billed,";
+$sql .= " e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.weight, e.weight_units, e.date_delivery as date_livraison, l.date_delivery as date_reception, e.fk_statut, e.billed, e.tracking_number,";
 $sql .= " s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, ";
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
@@ -273,6 +277,7 @@ if ($search_town)  $sql .= natural_search('s.town', $search_town);
 if ($search_zip)   $sql .= natural_search("s.zip", $search_zip);
 if ($search_state) $sql .= natural_search("state.nom", $search_state);
 if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
+if ($search_tracking)   $sql.= natural_search("e.tracking_number", $search_tracking);
 if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
 if ($search_sale > 0)                        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
 if ($search_ref_exp) $sql .= natural_search('e.ref', $search_ref_exp);
@@ -330,6 +335,7 @@ if ($resql)
 	if ($search_user > 0) 			$param .= '&search_user='.urlencode($search_user);
 	if ($search_sale > 0) 			$param .= '&search_sale='.urlencode($search_sale);
 	if ($search_company)   $param .= "&amp;search_company=".urlencode($search_company);
+	if ($search_tracking)   $param.= "&amp;search_tracking=".urlencode($search_tracking);
 	if ($search_town)      $param .= '&search_town='.urlencode($search_town);
 	if ($search_zip)       $param .= '&search_zip='.urlencode($search_zip);
 
@@ -507,6 +513,13 @@ if ($resql)
 		print '</div>';
 		print '</td>';
 	}
+	// Tracking number
+	if (! empty($arrayfields['e.tracking_number']['checked']))
+	{
+		print '<td class="liste_titre center">';
+		print '<input class="flat" size="6" type="text" name="search_tracking" value="'.dol_escape_htmltag($search_tracking).'">';
+		print '</td>';
+	}
 	if (!empty($arrayfields['l.ref']['checked']))
 	{
 		// Delivery ref
@@ -579,6 +592,7 @@ if ($resql)
 	if (!empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['e.weight']['checked']))         print_liste_field_titre($arrayfields['e.weight']['label'], $_SERVER["PHP_SELF"], "e.weight", "", $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['e.date_delivery']['checked']))  print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"], "e.date_delivery", "", $param, '', $sortfield, $sortorder, 'center ');
+	if (! empty($arrayfields['e.tracking_number']['checked']))  print_liste_field_titre($arrayfields['e.tracking_number']['label'], $_SERVER["PHP_SELF"], "e.tracking_number", "", $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['l.ref']['checked']))            print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"], "l.ref", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['l.date_delivery']['checked']))  print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"], "l.date_delivery", "", $param, '', $sortfield, $sortorder, 'center ');
 	// Extra fields
@@ -706,6 +720,12 @@ if ($resql)
     		}*/
 			print "</td>\n";
 		}
+		// Tracking number
+		if (! empty($arrayfields['e.tracking_number']['checked']))
+		{
+			print '<td class="center">'.$obj->tracking_number."</td>\n";
+			if (! $i) $totalarray['nbfield']++;
+		}
 
 		if (!empty($arrayfields['l.ref']['checked']) || !empty($arrayfields['l.date_delivery']['checked']))
 		{

From d61cef28d7fe5b054290b03a6828a7e67afb9da8 Mon Sep 17 00:00:00 2001
From: atm-quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Tue, 19 May 2020 11:05:45 +0200
Subject: [PATCH 291/490] NEW conf to allow show full arbo in getnomurl

---
 htdocs/admin/stock.php                        | 12 +++++++++++-
 htdocs/langs/en_US/stocks.lang                |  1 +
 htdocs/langs/fr_FR/stocks.lang                |  1 +
 htdocs/product/stock/class/entrepot.class.php |  2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 43e610c3052..ef592df3767 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -458,7 +458,17 @@ if ($conf->use_javascript_ajax) {
 }
 print "</td>\n";
 print "</tr>\n";
-
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("AlwaysShowFullArbo").'</td>';
+print '<td class="right">';
+if ($conf->use_javascript_ajax) {
+    print ajax_constantonoff('STOCK_ALWAYS_SHOW_FULL_ARBO');
+} else {
+    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+    print $form->selectarray("STOCK_ALWAYS_SHOW_FULL_ARBO", $arrval, $conf->global->STOCK_ALWAYS_SHOW_FULL_ARBO);
+}
+print "</td>\n";
+print "</tr>\n";
 print '</table>';
 
 /*
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 9856649b834..54b7389aaf5 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -218,3 +218,4 @@ InventoryForASpecificWarehouse=Inventory for a specific warehouse
 InventoryForASpecificProduct=Inventory for a specific product
 StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
 ForceTo=Force to
+AlwaysShowFullArbo=Always display full tree on card link
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index b3ea9e04c13..63e966fc0aa 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -218,3 +218,4 @@ InventoryForASpecificWarehouse=Inventaire pour un entrepôt spécifique
 InventoryForASpecificProduct=Inventaire pour un produit spécifique
 StockIsRequiredToChooseWhichLotToUse=Le module Stock est requis pour choisir une lot
 ForceTo=Forcer à
+AlwaysShowFullArbo=Toujours afficher l'arborescence complète dans le lien vers la fiche
\ No newline at end of file
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 56938d08979..b37420ffc7f 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -745,7 +745,7 @@ class Entrepot extends CommonObject
 
         $result .= $linkstart;
         if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2) $result .= ($showfullpath ? $this->get_full_arbo() : (empty($this->label) ? $this->libelle : $this->label));
+        if ($withpicto != 2) $result.= (($showfullpath || !empty($conf->global->STOCK_ALWAYS_SHOW_FULL_ARBO))? $this->get_full_arbo() : (empty($this->label)?$this->libelle:$this->label));
         $result .= $linkend;
 
 		return $result;

From b79a30c0f96d701171ec52bf3d30d395b3df04d2 Mon Sep 17 00:00:00 2001
From: altairis <contact@altairis.fr>
Date: Tue, 19 May 2020 14:18:06 +0200
Subject: [PATCH 292/490] edit and delete dispatched lines

---
 htdocs/fourn/commande/dispatch.php | 126 ++++++++++++++++++++++++++---
 1 file changed, 113 insertions(+), 13 deletions(-)

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index d132a87233f..596e657f2e3 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2016      Florian Henry        <florian.henry@atm-consulting.fr>
  * Copyright (C) 2017      Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2018      Frédéric France      <frederic.france@netlogic.fr>
- * Copyright (C) 2019      Christophe Battarel	<christophe@altairis.fr>
+ * Copyright (C) 2019-2020 Christophe Battarel	<christophe@altairis.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
@@ -53,6 +53,8 @@ $ref = GETPOST('ref');
 $lineid = GETPOST('lineid', 'int');
 $action = GETPOST('action', 'aZ09');
 $fk_default_warehouse = GETPOST('fk_default_warehouse', 'int');
+$cancel = GETPOST('cancel', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
 
 if ($user->socid)
 	$socid = $user->socid;
@@ -366,6 +368,34 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 	}
 }
 
+// Remove a dispatched line
+if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fournisseur->commande->receptionner)
+{
+	$supplierorderdispatch = new CommandeFournisseurDispatch($db);
+	$result = $supplierorderdispatch->fetch($lineid);
+	if ($result > 0) $result = $supplierorderdispatch->delete($user);
+	if ($result < 0)
+	{
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+}
+
+// Update a dispatched line
+if ($action == 'updateline' && $user->rights->fournisseur->commande->receptionner)
+{
+	$supplierorderdispatch = new CommandeFournisseurDispatch($db);
+	$result = $supplierorderdispatch->fetch($lineid);
+	if ($result > 0)
+	{
+		$supplierorderdispatch->qty = GETPOST('qty', 'int');
+		$supplierorderdispatch->fk_entrepot = GETPOST('fk_entrepot');
+		$result = $supplierorderdispatch->update($user);
+	}
+	if ($result < 0)
+	{
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+}
 
 /*
  * View
@@ -379,7 +409,7 @@ $warehouse_static = new Entrepot($db);
 $supplierorderdispatch = new CommandeFournisseurDispatch($db);
 
 $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
-llxHeader('', $langs->trans("Order"), $help_url, '', 0, 0, array('/fourn/js/lib_dispatch.js.php'));
+llxHeader('', $langs->trans("OrderDispatch"), $help_url, '', 0, 0, array('/fourn/js/lib_dispatch.js.php'));
 
 if ($id > 0 || !empty($ref)) {
 	$soc = new Societe($db);
@@ -393,6 +423,23 @@ if ($id > 0 || !empty($ref)) {
 	$title = $langs->trans("SupplierOrder");
 	dol_fiche_head($head, 'dispatch', $title, -1, 'order');
 
+	$formconfirm='';
+
+	// Confirmation to delete line
+	if ($action == 'ask_deleteline')
+	{
+		$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
+	}
+
+	// Call Hook formConfirm
+	$parameters = array('lineid' => $lineid);
+	// Note that $action and $object may be modified by hook
+	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action);
+	if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
+	elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
+
+	// Print form confirm
+	print $formconfirm;
 
 	// Supplier order card
 
@@ -493,6 +540,9 @@ if ($id > 0 || !empty($ref)) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
 		$formproduct->loadWarehouses();
+		$entrepot = new Entrepot($db);
+		$listwarehouses=$entrepot->list_array(1);
+
 
 		if (empty($conf->reception->enabled))print '<form method="POST" action="dispatch.php?id='.$object->id.'">';
         else print '<form method="post" action="'.dol_buildpath('/reception/card.php', 1).'?originid='.$object->id.'&origin=supplierorder">';
@@ -567,8 +617,6 @@ if ($id > 0 || !empty($ref)) {
 			$i = 0;
 
 			if ($num) {
-				$entrepot = new Entrepot($db);
-				$listwarehouses = $entrepot->list_array(1);
 
 				print '<tr class="liste_titre">';
 
@@ -965,7 +1013,6 @@ if ($id > 0 || !empty($ref)) {
 				print '<td class="dispatch_dlc_title">'.$langs->trans("SellByDate").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("QtyDispatched").'</td>';
-			print '<td></td>';
 			print '<td>'.$langs->trans("Warehouse").'</td>';
 			print '<td>'.$langs->trans("Comment").'</td>';
 
@@ -977,14 +1024,23 @@ if ($id > 0 || !empty($ref)) {
 				print '<td class="center"></td>';
 			}
 
-			print '<td class="center"></td>';
+			print '<td class="center" colspan="2"></td>';
 
 			print "</tr>\n";
 
 			while ($i < $num) {
 				$objp = $db->fetch_object($resql);
 
-				print "<tr ".$bc[$var].">";
+				if ($action == 'editline' && $lineid == $objp->dispatchlineid)
+				{
+					print '<form name="editdispatchedlines" id="editdispatchedlines" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '#line_' . GETPOST('lineid') . '" method="POST">
+					<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
+					<input type="hidden" name="action" value="updateline">
+					<input type="hidden" name="mode" value="">
+					<input type="hidden" name="lineid" value="' . $objp->dispatchlineid . '">';
+				}
+
+				print '<tr ' . $bc[$var] . ' id="line_'.$objp->dispatchlineid.'" >';
 
 				if (!empty($conf->reception->enabled)) {
 					print '<td>';
@@ -1011,14 +1067,34 @@ if ($id > 0 || !empty($ref)) {
 				}
 
 				// Qty
-				print '<td class="right">'.$objp->qty.'</td>';
-				print '<td>&nbsp;</td>';
+				if ($action == 'editline' && $lineid == $objp->dispatchlineid)
+				{
+					print '<td class="right"><input style="width: 50px;" type="number" min="1" name="qty" value="' . $objp->qty . '" /></td>';
+				}
+				else
+				{
+					print '<td class="right">'.$objp->qty.'</td>';
+				}
 
 				// Warehouse
 				print '<td>';
-				$warehouse_static->id = $objp->warehouse_id;
-				$warehouse_static->libelle = $objp->entrepot;
-				print $warehouse_static->getNomUrl(1);
+				if ($action == 'editline' && $lineid == $objp->dispatchlineid)
+				{
+					if (count($listwarehouses) > 1) {
+						print $formproduct->selectWarehouses(GETPOST("fk_entrepot")?GETPOST("fk_entrepot"):($objp->warehouse_id?$objp->warehouse_id:''), "fk_entrepot", '', 1, 0, $objp->fk_product, '', 1, 1, null, 'csswarehouse');
+					} elseif (count($listwarehouses) == 1) {
+						print $formproduct->selectWarehouses(GETPOST("fk_entrepot")?GETPOST("fk_entrepot"):($objp->warehouse_id?$objp->warehouse_id:''), "fk_entrepot", '', 0, 0, $objp->fk_product, '', 1, 1, null, 'csswarehouse');
+					} else {
+						$langs->load("errors");
+						print $langs->trans("ErrorNoWarehouseDefined");
+					}
+				}
+				else
+				{
+					$warehouse_static->id = $objp->warehouse_id;
+					$warehouse_static->libelle = $objp->entrepot;
+					print $warehouse_static->getNomUrl(1);
+				}
 				print '</td>';
 
 				// Comment
@@ -1069,9 +1145,33 @@ if ($id > 0 || !empty($ref)) {
 					print '</td>';
 				}
 
-				print '<td class="center"></td>';
+				if ($action != 'editline' ||  && $lineid != $objp->dispatchlineid)
+				{
+					print '<td class="linecoledit center">';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid=' . $objp->dispatchlineid .'#line_'. $objp->dispatchlineid . '">';
+					print img_edit();
+					print '</a>';
+					print '</td>';
+
+					print '<td class="linecoldelete center">';
+					print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=ask_deleteline&amp;lineid=' . $objp->dispatchlineid . '#dispatch_received_products">';
+					print img_delete();
+					print '</a>';
+					print '</td>';
+				}
+				else
+				{
+					print '<td class="center valignmiddle">';
+					print '<input type="submit" class="button" id="savelinebutton" name="save" value="'.$langs->trans("Save").'" />';
+					print '</td>';
+					print '<td class="center valignmiddle">';
+					print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="'. $langs->trans("Cancel").'" />';
+					print '</td>';
+				}
+
 
 				print "</tr>\n";
+				if ($action == 'editline' && $lineid == $objp->dispatchlineid)  print '</form>';
 
 				$i++;
 			}

From f3582d891ae8d57d905a2ac253b21e5ad01064c7 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Tue, 19 May 2020 15:35:37 +0200
Subject: [PATCH 293/490] FIX : We must only rename current bank receipt

---
 htdocs/compta/bank/releve.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index a16927bda0b..5ef3fbf0953 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -179,7 +179,7 @@ $sqlrequestforbankline = $sql;
 if ($action == 'confirm_editbankreceipt' && !empty($oldbankreceipt) && !empty($newbankreceipt))
 {
 	// TODO Add a test to check newbankreceipt does not exists yet
-	$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX.'bank SET num_releve = "'.$db->escape($newbankreceipt).'" WHERE num_releve = "'.$db->escape($oldbankreceipt).'"';
+	$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX.'bank SET num_releve = "'.$db->escape($newbankreceipt).'" WHERE num_releve = "'.$db->escape($oldbankreceipt).'" AND fk_account = '.$id;
 	$result = $db->query($sqlupdate);
 	if ($result < 0) dol_print_error($db);
 

From 80c56b30179b9c5baa619a9c7be1d1cb41f6a88b Mon Sep 17 00:00:00 2001
From: altairis <contact@altairis.fr>
Date: Tue, 19 May 2020 15:59:03 +0200
Subject: [PATCH 294/490] manage stock on edit and delete dispatched lines

---
 htdocs/fourn/commande/dispatch.php | 109 +++++++++++++++++++++++++++--
 1 file changed, 104 insertions(+), 5 deletions(-)

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 596e657f2e3..088cff61ee6 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -38,6 +38,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+require_once DOL_DOCUMENT_ROOT . '/product/stock/class/mouvementstock.class.php';
+
 if (!empty($conf->projet->enabled))
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
@@ -371,29 +373,121 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 // Remove a dispatched line
 if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fournisseur->commande->receptionner)
 {
+	$db->begin();
+
 	$supplierorderdispatch = new CommandeFournisseurDispatch($db);
 	$result = $supplierorderdispatch->fetch($lineid);
-	if ($result > 0) $result = $supplierorderdispatch->delete($user);
+	if ($result > 0)
+	{
+		$qty = $supplierorderdispatch->qty;
+		$entrepot = $supplierorderdispatch->fk_entrepot;
+		$product = $supplierorderdispatch->fk_product;
+		$price = GETPOST('price');
+		$comment = $supplierorderdispatch->comment;
+		$eatby = $supplierorderdispatch->fk_product;
+		$sellby = $supplierorderdispatch->sellby;
+		$batch = $supplierorderdispatch->batch;
+
+		$result = $supplierorderdispatch->delete($user);
+	}
 	if ($result < 0)
 	{
-		setEventMessages($object->error, $object->errors, 'errors');
+		$errors = $object->errors;
+		$error++;
+	}
+	else
+	{
+		// If module stock is enabled and the stock increase is done on purchase order dispatching
+		if ($entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
+		{
+			$mouv = new MouvementStock($db);
+			if ($product > 0)
+			{
+				$mouv->origin = &$object;
+				$result=$mouv->livraison($user, $product, $entrepot, $qty, $price, $comment, '', $eatby, $sellby, $batch);
+				if ($result < 0)
+				{
+					$errors=$mouv->errors;
+					$error++;
+				}
+			}
+		}
+	}
+	if ($error > 0)
+	{
+		$db->rollback();
+		setEventMessages($error, $errors, 'errors');
+	}
+	else
+	{
+		$db->commit();
 	}
 }
 
 // Update a dispatched line
 if ($action == 'updateline' && $user->rights->fournisseur->commande->receptionner)
 {
+	$db->begin();
+	$error = 0;
+
 	$supplierorderdispatch = new CommandeFournisseurDispatch($db);
 	$result = $supplierorderdispatch->fetch($lineid);
 	if ($result > 0)
 	{
+		$qty = $supplierorderdispatch->qty;
+		$entrepot = $supplierorderdispatch->fk_entrepot;
+		$product = $supplierorderdispatch->fk_product;
+		$price = GETPOST('price');
+		$comment = $supplierorderdispatch->comment;
+		$eatby = $supplierorderdispatch->fk_product;
+		$sellby = $supplierorderdispatch->sellby;
+		$batch = $supplierorderdispatch->batch;
+
 		$supplierorderdispatch->qty = GETPOST('qty', 'int');
 		$supplierorderdispatch->fk_entrepot = GETPOST('fk_entrepot');
 		$result = $supplierorderdispatch->update($user);
 	}
 	if ($result < 0)
 	{
-		setEventMessages($object->error, $object->errors, 'errors');
+		$error++;
+		$errors=$supplierorderdispatch->errors;
+	}
+	else
+	{
+		// If module stock is enabled and the stock increase is done on purchase order dispatching
+		if ($entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
+		{
+			$mouv = new MouvementStock($db);
+			if ($product > 0)
+			{
+				$mouv->origin = &$object;
+				$result=$mouv->livraison($user, $product, $entrepot, $qty, $price, $comment, '', $eatby, $sellby, $batch);
+				if ($result < 0)
+				{
+					$errors=$mouv->errors;
+					$error++;
+				}
+				else
+				{
+					$mouv->origin = &$object;
+					$result=$mouv->reception($user, $product, $supplierorderdispatch->fk_entrepot, $supplierorderdispatch->qty, $price, $comment, $eatby, $sellby, $batch);
+					if ($result < 0)
+					{
+						$errors=$mouv->errors;
+						$error++;
+					}
+				}
+			}
+		}
+	}
+	if ($error > 0)
+	{
+		$db->rollback();
+		setEventMessages($error, $errors, 'errors');
+	}
+	else
+	{
+		$db->commit();
 	}
 }
 
@@ -979,9 +1073,11 @@ if ($id > 0 || !empty($ref)) {
 	$sql = "SELECT p.ref, p.label,";
 	$sql .= " e.rowid as warehouse_id, e.ref as entrepot,";
 	$sql .= " cfd.rowid as dispatchlineid, cfd.fk_product, cfd.qty, cfd.eatby, cfd.sellby, cfd.batch, cfd.comment, cfd.status, cfd.datec";
+	$sql.=" ,cd.rowid, cd.subprice";
 	if ($conf->reception->enabled)$sql .= " ,cfd.fk_reception, r.date_delivery";
 	$sql .= " FROM ".MAIN_DB_PREFIX."product as p,";
 	$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "commande_fournisseurdet as cd ON cd.rowid = cfd.fk_commandefourndet";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e ON cfd.fk_entrepot = e.rowid";
 	if ($conf->reception->enabled)$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."reception as r ON cfd.fk_reception = r.rowid";
 	$sql .= " WHERE cfd.fk_commande = ".$object->id;
@@ -1067,14 +1163,17 @@ if ($id > 0 || !empty($ref)) {
 				}
 
 				// Qty
+				print '<td class="right">';
 				if ($action == 'editline' && $lineid == $objp->dispatchlineid)
 				{
-					print '<td class="right"><input style="width: 50px;" type="number" min="1" name="qty" value="' . $objp->qty . '" /></td>';
+					print '<input style="width: 50px;" type="number" min="1" name="qty" value="' . $objp->qty . '" />';
 				}
 				else
 				{
-					print '<td class="right">'.$objp->qty.'</td>';
+					print $objp->qty;
 				}
+				print '<input type="hidden" name="price" value="'.$objp->subprice.'" />';
+				print '</td>';
 
 				// Warehouse
 				print '<td>';

From bf9756b8c4dab60d712efaf59bfb2e0694bc77e8 Mon Sep 17 00:00:00 2001
From: atm-lena <lena@atm-consulting.fr>
Date: Tue, 19 May 2020 16:05:13 +0200
Subject: [PATCH 295/490] Add Hook "Massstockmove"

---
 htdocs/product/stock/massstockmove.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 8d98f028d23..7a0472e226d 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -34,6 +34,9 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'stocks', 'orders', 'productbatch'));
 
+//init Hook
+$hookmanager->initHooks(array('massstockmove'));
+
 // Security check
 if ($user->socid) {
     $socid = $user->socid;

From 00d7947ee8e8c9d7ec058c956c4e5947a729c686 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 19 May 2020 19:55:28 +0200
Subject: [PATCH 296/490] Fix link replaced twice

---
 htdocs/core/lib/website.lib.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 782c22a7d33..1075a91ebc0 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -219,10 +219,13 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 {
 	global $db, $langs, $conf, $user;
 	global $dolibarr_main_url_root, $dolibarr_main_data_root;
+	global $includehtmlcontentopened;
 
 	$nbrep = 0;
 
-	dol_syslog("dolWebsiteOutput start (contenttype=".$contenttype." containerid=".$containerid." USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR') ? '1' : '')." USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER') ? '1' : '').')');
+	dol_syslog("dolWebsiteOutput start - contenttype=".$contenttype." containerid=".$containerid." USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR') ? '1' : '')." USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER') ? '1' : '').' includehtmlcontentopened='.$includehtmlcontentopened);
+
+	//print $containerid.' '.$content;
 
 	// Define $urlwithroot
 	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -259,6 +262,8 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 		// Replace relative link /xxx.php#aaa or /xxx.php with dolibarr URL:  ...href="....php" (we discard param ?...)
 		$content = preg_replace('/(href=")\/?([^:\"\!]*)\.php(#[^\"<>]*)?\"/', '\1!~!~!~'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2\3"', $content, -1, $nbrep);
 		// Replace relative link /xxx.php?a=b&c=d#aaa or /xxx.php?a=b&c=d with dolibarr URL
+		// Warning: we may replace twice if href="..." was inside an include (dolWebsiteOutput called by include and the by final page), that's why
+		// at end we replace the '!~!~!~' only if we are in final parent page.
 		$content = preg_replace('/(href=")\/?([^:\"\!]*)\.php\?([^#\"<>]*)(#[^\"<>]*)?\"/', '\1!~!~!~'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2&\3\4"', $content, -1, $nbrep);
 		// Replace relative link without .php like /xxx#aaa or /xxx with dolibarr URL:  ...href="....php"
 		$content = preg_replace('/(href=")\/?([a-zA-Z0-9\-_#]+)(\"|\?)/', '\1!~!~!~'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2\3', $content, -1, $nbrep);
@@ -291,8 +296,10 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 		$content = str_replace('src="!~!~!~/viewimage.php', 'src="!~!~!~'.DOL_URL_ROOT.'/viewimage.php', $content);
 		$content = str_replace('href="!~!~!~/document.php', 'href="!~!~!~'.DOL_URL_ROOT.'/document.php', $content);
 
-		// Remove the protection tag !~!~!~
-		$content = str_replace('!~!~!~', '', $content);
+		// Remove the protection tag !~!~!~, but only if this is the parent page and not an include
+		if (empty($includehtmlcontentopened)) {
+			$content = str_replace('!~!~!~', '', $content);
+		}
 	}
 	else									// REPLACEMENT OF LINKS When page called from virtual host
 	{
@@ -511,6 +518,9 @@ function includeContainer($containerref)
 		print 'ERROR: RECURSIVE CONTENT LEVEL. Depth of recursive call is more than the limit of '.$MAXLEVEL.".\n";
 		return;
 	}
+
+	//dol_syslog("Include container ".$containerref.' includehtmlcontentopened='.$includehtmlcontentopened);
+
 	// file_get_contents is not possible. We must execute code with include
 	//$content = file_get_contents($fullpathfile);
 	//print preg_replace(array('/^.*<body[^>]*>/ims','/<\/body>.*$/ims'), array('', ''), $content);*/
@@ -520,7 +530,7 @@ function includeContainer($containerref)
 	$tmpoutput = ob_get_contents();
 	ob_end_clean();
 
-	print "\n".'<!-- include '.$websitekey.'/'.$containerref.' level = '.$includehtmlcontentopened.' -->'."\n";
+	print "\n".'<!-- include '.$websitekey.'/'.$containerref.(is_object($websitepage) ? ' parent id='.$websitepage->id : '').' level = '.$includehtmlcontentopened.' -->'."\n";
 	print preg_replace(array('/^.*<body[^>]*>/ims', '/<\/body>.*$/ims'), array('', ''), $tmpoutput);
 
 	if (!$res)

From 0ac82797e74813bad9997bd4b8e0097924a43830 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 19 May 2020 19:14:20 +0000
Subject: [PATCH 297/490] Fixing style errors.

---
 htdocs/product/stock/class/entrepot.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index e7d94e7119e..93288a92f6c 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -291,7 +291,7 @@ class Entrepot extends CommonObject
 
 		$this->label = trim(!empty($this->label) ? $this->label : $this->libelle);
 
-    $this->description = trim($this->description);
+		$this->description = trim($this->description);
 
 		$this->lieu = trim($this->lieu);
 

From cd240efadf464e4971f17e56fd738636d14aa3b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 19 May 2020 21:28:47 +0200
Subject: [PATCH 298/490] Update entrepot.class.php

---
 htdocs/product/stock/class/entrepot.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 93288a92f6c..e7db566cf30 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -244,7 +244,7 @@ class Entrepot extends CommonObject
 					dol_syslog(get_class($this)."::create return -3");
 					$this->db->rollback();
 					return -3;
-				}gateway-addon
+				}
 			}
 			else {
 				$this->error = "Failed to get insert id";

From 2ba9d7f288c1ff442185056766e3218981906d9d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 19 May 2020 21:38:42 +0200
Subject: [PATCH 299/490] Fix translation

---
 htdocs/langs/en_US/projects.lang      | 2 +-
 htdocs/projet/card.php                | 2 +-
 htdocs/projet/class/project.class.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index bb42bff3c87..e145647baa4 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -115,7 +115,7 @@ ChildOfTask=Child of task
 TaskHasChild=Task has child
 NotOwnerOfProject=Not owner of this private project
 AffectedTo=Allocated to
-CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See tab '%s'.
 ValidateProject=Validate projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Close project
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 6af779a2295..c9007dc6d8a 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -106,7 +106,7 @@ if (empty($reshook))
 			else
 			{
 				dol_syslog($object->error, LOG_DEBUG);
-				setEventMessages($langs->trans("CantRemoveProject"), null, 'errors');
+				setEventMessages($langs->trans("CantRemoveProject", $langs->transnoentitiesnoconv("ProjectOverview")), null, 'errors');
 			}
 		}
 		if ($backtopage)
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 417a825a77d..449050d94c5 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -764,7 +764,7 @@ class Project extends CommonObject
 	        $resql = $this->db->query($sql);
 	        if (!$resql)
 	        {
-	        	$this->errors[] = $langs->trans("CantRemoveProject");
+	        	$this->errors[] = $langs->trans("CantRemoveProject", $langs->transnoentitiesnoconv("ProjectOverview"));
 	        	$error++;
 	        }
         }

From 18ec65b4aff5b58923f44449295c6df5fd0c4d69 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 19 May 2020 22:06:17 +0200
Subject: [PATCH 300/490] Fix: action on an ID must not include test on entity.

---
 htdocs/projet/class/project.class.php | 3555 ++++++++++++-------------
 1 file changed, 1777 insertions(+), 1778 deletions(-)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 5802ad20e56..78f5bac2fe7 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -34,27 +34,27 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 class Project extends CommonObject
 {
 
-    /**
+	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'project';
 
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'projet';
 
-    /**
+	/**
 	 * @var int    Name of subtable line
 	 */
 	public $table_element_line = 'projet_task';
 
-    /**
+	/**
 	 * @var int    Name of field date
 	 */
 	public $table_element_date;
 
-    /**
+	/**
 	 * @var int Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_projet';
@@ -63,19 +63,19 @@ class Project extends CommonObject
 	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 	 * @var int
 	 */
-    public $ismultientitymanaged = 1;
+	public $ismultientitymanaged = 1;
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'projectpub';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'projectpub';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $table_ref_field = 'ref';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'ref';
 
-    /**
+	/**
 	 * @var string description
 	 */
 	public $description;
@@ -83,41 +83,41 @@ class Project extends CommonObject
 	/**
 	 * @var string
 	 */
-    public $title;
+	public $title;
 
-    public $date_start;
-    public $date_end;
-    public $date_close;
+	public $date_start;
+	public $date_end;
+	public $date_close;
 
-    public $socid; // To store id of thirdparty
-    public $thirdparty_name; // To store name of thirdparty (defined only in some cases)
+	public $socid; // To store id of thirdparty
+	public $thirdparty_name; // To store name of thirdparty (defined only in some cases)
 
-    public $user_author_id; //!< Id of project creator. Not defined if shared project.
+	public $user_author_id; //!< Id of project creator. Not defined if shared project.
 
-    /**
-     * @var int user close id
-     */
-    public $fk_user_close;
+	/**
+	 * @var int user close id
+	 */
+	public $fk_user_close;
 
-    /**
-     * @var int user close id
-     */
+	/**
+	 * @var int user close id
+	 */
 	public $user_close_id;
-    public $public; //!< Tell if this is a public or private project
-    public $budget_amount;
-    public $usage_bill_time; // Is the time spent on project must be invoiced or not
+	public $public; //!< Tell if this is a public or private project
+	public $budget_amount;
+	public $usage_bill_time; // Is the time spent on project must be invoiced or not
 
-    public $statuts_short;
-    public $statuts_long;
+	public $statuts_short;
+	public $statuts_long;
 
-    public $statut; // 0=draft, 1=opened, 2=closed
-    public $opp_status; // opportunity status, into table llx_c_lead_status
+	public $statut; // 0=draft, 1=opened, 2=closed
+	public $opp_status; // opportunity status, into table llx_c_lead_status
 	public $opp_percent; // opportunity probability
 
-    public $oldcopy;
+	public $oldcopy;
 
-    public $weekWorkLoad; // Used to store workload details of a projet
-    public $weekWorkLoadPerTask; // Used to store workload details of tasks of a projet
+	public $weekWorkLoad; // Used to store workload details of a projet
+	public $weekWorkLoadPerTask; // Used to store workload details of tasks of a projet
 
 	/**
 	 * @var int Creation date
@@ -196,406 +196,406 @@ class Project extends CommonObject
 	);
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        $this->statuts_short = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed');
-        $this->statuts_long = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed');
-    }
+		$this->statuts_short = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed');
+		$this->statuts_long = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed');
+	}
 
-    /**
-     *    Create a project into database
-     *
-     *    @param    User	$user       	User making creation
-     *    @param	int		$notrigger		Disable triggers
-     *    @return   int         			<0 if KO, id of created project if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-        global $conf, $langs;
+	/**
+	 *    Create a project into database
+	 *
+	 *    @param    User	$user       	User making creation
+	 *    @param	int		$notrigger		Disable triggers
+	 *    @return   int         			<0 if KO, id of created project if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 
-        $error = 0;
-        $ret = 0;
+		$error = 0;
+		$ret = 0;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        // Clean parameters
-        $this->note_private = dol_substr($this->note_private, 0, 65535);
-        $this->note_public = dol_substr($this->note_public, 0, 65535);
+		// Clean parameters
+		$this->note_private = dol_substr($this->note_private, 0, 65535);
+		$this->note_public = dol_substr($this->note_public, 0, 65535);
 
-        // Check parameters
-        if (!trim($this->ref))
-        {
-            $this->error = 'ErrorFieldsRequired';
-            dol_syslog(get_class($this)."::create error -1 ref null", LOG_ERR);
-            return -1;
-        }
-        if (!empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) && !($this->socid > 0))
-        {
-            $this->error = 'ErrorFieldsRequired';
-            dol_syslog(get_class($this)."::create error -1 thirdparty not defined and option PROJECT_THIRDPARTY_REQUIRED is set", LOG_ERR);
-            return -1;
-        }
+		// Check parameters
+		if (!trim($this->ref))
+		{
+			$this->error = 'ErrorFieldsRequired';
+			dol_syslog(get_class($this)."::create error -1 ref null", LOG_ERR);
+			return -1;
+		}
+		if (!empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) && !($this->socid > 0))
+		{
+			$this->error = 'ErrorFieldsRequired';
+			dol_syslog(get_class($this)."::create error -1 thirdparty not defined and option PROJECT_THIRDPARTY_REQUIRED is set", LOG_ERR);
+			return -1;
+		}
 
-        // Create project
-        $this->db->begin();
+		// Create project
+		$this->db->begin();
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."projet (";
-        $sql .= "ref";
-        $sql .= ", title";
-        $sql .= ", description";
-        $sql .= ", fk_soc";
-        $sql .= ", fk_user_creat";
-        $sql .= ", fk_statut";
-        $sql .= ", fk_opp_status";
-        $sql .= ", opp_percent";
-        $sql .= ", public";
-        $sql .= ", datec";
-        $sql .= ", dateo";
-        $sql .= ", datee";
-        $sql .= ", opp_amount";
-        $sql .= ", budget_amount";
-        $sql .= ", usage_opportunity";
-        $sql .= ", usage_task";
-        $sql .= ", usage_bill_time";
-        $sql .= ", usage_organize_event";
-        $sql .= ", note_private";
-        $sql .= ", note_public";
-        $sql .= ", entity";
-        $sql .= ") VALUES (";
-        $sql .= "'".$this->db->escape($this->ref)."'";
-        $sql .= ", '".$this->db->escape($this->title)."'";
-        $sql .= ", '".$this->db->escape($this->description)."'";
-        $sql .= ", ".($this->socid > 0 ? $this->socid : "null");
-        $sql .= ", ".$user->id;
-        $sql .= ", ".(is_numeric($this->statut) ? $this->statut : '0');
-        $sql .= ", ".((is_numeric($this->opp_status) && $this->opp_status > 0) ? $this->opp_status : 'NULL');
-        $sql .= ", ".(is_numeric($this->opp_percent) ? $this->opp_percent : 'NULL');
-        $sql .= ", ".($this->public ? 1 : 0);
-        $sql .= ", '".$this->db->idate($now)."'";
-        $sql .= ", ".($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : 'null');
-        $sql .= ", ".($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null');
-        $sql .= ", ".(strcmp($this->opp_amount, '') ? price2num($this->opp_amount) : 'null');
-        $sql .= ", ".(strcmp($this->budget_amount, '') ? price2num($this->budget_amount) : 'null');
-        $sql .= ", ".($this->usage_opportunity ? 1 : 0);
-        $sql .= ", ".($this->usage_task ? 1 : 0);
-        $sql .= ", ".($this->usage_bill_time ? 1 : 0);
-        $sql .= ", ".($this->usage_organize_event ? 1 : 0);
-        $sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : 'null');
-        $sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : 'null');
-        $sql .= ", ".$conf->entity;
-        $sql .= ")";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."projet (";
+		$sql .= "ref";
+		$sql .= ", title";
+		$sql .= ", description";
+		$sql .= ", fk_soc";
+		$sql .= ", fk_user_creat";
+		$sql .= ", fk_statut";
+		$sql .= ", fk_opp_status";
+		$sql .= ", opp_percent";
+		$sql .= ", public";
+		$sql .= ", datec";
+		$sql .= ", dateo";
+		$sql .= ", datee";
+		$sql .= ", opp_amount";
+		$sql .= ", budget_amount";
+		$sql .= ", usage_opportunity";
+		$sql .= ", usage_task";
+		$sql .= ", usage_bill_time";
+		$sql .= ", usage_organize_event";
+		$sql .= ", note_private";
+		$sql .= ", note_public";
+		$sql .= ", entity";
+		$sql .= ") VALUES (";
+		$sql .= "'".$this->db->escape($this->ref)."'";
+		$sql .= ", '".$this->db->escape($this->title)."'";
+		$sql .= ", '".$this->db->escape($this->description)."'";
+		$sql .= ", ".($this->socid > 0 ? $this->socid : "null");
+		$sql .= ", ".$user->id;
+		$sql .= ", ".(is_numeric($this->statut) ? $this->statut : '0');
+		$sql .= ", ".((is_numeric($this->opp_status) && $this->opp_status > 0) ? $this->opp_status : 'NULL');
+		$sql .= ", ".(is_numeric($this->opp_percent) ? $this->opp_percent : 'NULL');
+		$sql .= ", ".($this->public ? 1 : 0);
+		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", ".($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : 'null');
+		$sql .= ", ".($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null');
+		$sql .= ", ".(strcmp($this->opp_amount, '') ? price2num($this->opp_amount) : 'null');
+		$sql .= ", ".(strcmp($this->budget_amount, '') ? price2num($this->budget_amount) : 'null');
+		$sql .= ", ".($this->usage_opportunity ? 1 : 0);
+		$sql .= ", ".($this->usage_task ? 1 : 0);
+		$sql .= ", ".($this->usage_bill_time ? 1 : 0);
+		$sql .= ", ".($this->usage_organize_event ? 1 : 0);
+		$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : 'null');
+		$sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : 'null');
+		$sql .= ", ".$conf->entity;
+		$sql .= ")";
 
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet");
-            $ret = $this->id;
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet");
+			$ret = $this->id;
 
-            if (!$notrigger)
-            {
-                // Call trigger
-                $result = $this->call_trigger('PROJECT_CREATE', $user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            $this->errno = $this->db->lasterrno();
-            $error++;
-        }
+			if (!$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('PROJECT_CREATE', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
+		}
+		else
+		{
+			$this->error = $this->db->lasterror();
+			$this->errno = $this->db->lasterrno();
+			$error++;
+		}
 
-        // Update extrafield
-        if (!$error) {
-        	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-        	{
-        		$result = $this->insertExtraFields();
-        		if ($result < 0)
-        		{
-        			$error++;
-        		}
-        	}
-        }
+		// Update extrafield
+		if (!$error) {
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			{
+				$result = $this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+		}
 
-        if (!$error && !empty($conf->global->MAIN_DISABLEDRAFTSTATUS))
-        {
-            $res = $this->setValid($user);
-            if ($res < 0) $error++;
-        }
+		if (!$error && !empty($conf->global->MAIN_DISABLEDRAFTSTATUS))
+		{
+			$res = $this->setValid($user);
+			if ($res < 0) $error++;
+		}
 
-        if (!$error)
-        {
-            $this->db->commit();
-            return $ret;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		if (!$error)
+		{
+			$this->db->commit();
+			return $ret;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    /**
-     * Update a project
-     *
-     * @param  User		$user       User object of making update
-     * @param  int		$notrigger  1=Disable all triggers
-     * @return int                  <=0 if KO, >0 if OK
-     */
-    public function update($user, $notrigger = 0)
-    {
-        global $langs, $conf;
+	/**
+	 * Update a project
+	 *
+	 * @param  User		$user       User object of making update
+	 * @param  int		$notrigger  1=Disable all triggers
+	 * @return int                  <=0 if KO, >0 if OK
+	 */
+	public function update($user, $notrigger = 0)
+	{
+		global $langs, $conf;
 
-        $error = 0;
+		$error = 0;
 
-        // Clean parameters
-        $this->title = trim($this->title);
-        $this->description = trim($this->description);
+		// Clean parameters
+		$this->title = trim($this->title);
+		$this->description = trim($this->description);
 		if ($this->opp_amount < 0) $this->opp_amount = '';
 		if ($this->opp_percent < 0) $this->opp_percent = '';
-        if ($this->date_end && $this->date_end < $this->date_start)
-        {
-            $this->error = $langs->trans("ErrorDateEndLowerThanDateStart");
-            $this->errors[] = $this->error;
-            $this->db->rollback();
-            dol_syslog(get_class($this)."::update error -3 ".$this->error, LOG_ERR);
-            return -3;
-        }
+		if ($this->date_end && $this->date_end < $this->date_start)
+		{
+			$this->error = $langs->trans("ErrorDateEndLowerThanDateStart");
+			$this->errors[] = $this->error;
+			$this->db->rollback();
+			dol_syslog(get_class($this)."::update error -3 ".$this->error, LOG_ERR);
+			return -3;
+		}
 
-        if (dol_strlen(trim($this->ref)) > 0)
-        {
-            $this->db->begin();
+		if (dol_strlen(trim($this->ref)) > 0)
+		{
+			$this->db->begin();
 
-            $sql = "UPDATE ".MAIN_DB_PREFIX."projet SET";
-            $sql .= " ref='".$this->db->escape($this->ref)."'";
-            $sql .= ", title = '".$this->db->escape($this->title)."'";
-            $sql .= ", description = '".$this->db->escape($this->description)."'";
-            $sql .= ", fk_soc = ".($this->socid > 0 ? $this->socid : "null");
-            $sql .= ", fk_statut = ".$this->statut;
-            $sql .= ", fk_opp_status = ".((is_numeric($this->opp_status) && $this->opp_status > 0) ? $this->opp_status : 'null');
+			$sql = "UPDATE ".MAIN_DB_PREFIX."projet SET";
+			$sql .= " ref='".$this->db->escape($this->ref)."'";
+			$sql .= ", title = '".$this->db->escape($this->title)."'";
+			$sql .= ", description = '".$this->db->escape($this->description)."'";
+			$sql .= ", fk_soc = ".($this->socid > 0 ? $this->socid : "null");
+			$sql .= ", fk_statut = ".$this->statut;
+			$sql .= ", fk_opp_status = ".((is_numeric($this->opp_status) && $this->opp_status > 0) ? $this->opp_status : 'null');
 			$sql .= ", opp_percent = ".((is_numeric($this->opp_percent) && $this->opp_percent != '') ? $this->opp_percent : 'null');
-            $sql .= ", public = ".($this->public ? 1 : 0);
-            $sql .= ", datec=".($this->date_c != '' ? "'".$this->db->idate($this->date_c)."'" : 'null');
-            $sql .= ", dateo=".($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : 'null');
-            $sql .= ", datee=".($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null');
-            $sql .= ", date_close=".($this->date_close != '' ? "'".$this->db->idate($this->date_close)."'" : 'null');
-            $sql .= ", fk_user_close=".($this->fk_user_close > 0 ? $this->fk_user_close : "null");
-            $sql .= ", opp_amount = ".(strcmp($this->opp_amount, '') ? price2num($this->opp_amount) : "null");
-            $sql .= ", budget_amount = ".(strcmp($this->budget_amount, '') ? price2num($this->budget_amount) : "null");
-            $sql .= ", fk_user_modif = ".$user->id;
-            $sql .= ", usage_opportunity = ".($this->usage_opportunity ? 1 : 0);
-            $sql .= ", usage_task = ".($this->usage_task ? 1 : 0);
-            $sql .= ", usage_bill_time = ".($this->usage_bill_time ? 1 : 0);
-            $sql .= ", usage_organize_event = ".($this->usage_organize_event ? 1 : 0);
-            $sql .= " WHERE rowid = ".$this->id;
+			$sql .= ", public = ".($this->public ? 1 : 0);
+			$sql .= ", datec=".($this->date_c != '' ? "'".$this->db->idate($this->date_c)."'" : 'null');
+			$sql .= ", dateo=".($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : 'null');
+			$sql .= ", datee=".($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null');
+			$sql .= ", date_close=".($this->date_close != '' ? "'".$this->db->idate($this->date_close)."'" : 'null');
+			$sql .= ", fk_user_close=".($this->fk_user_close > 0 ? $this->fk_user_close : "null");
+			$sql .= ", opp_amount = ".(strcmp($this->opp_amount, '') ? price2num($this->opp_amount) : "null");
+			$sql .= ", budget_amount = ".(strcmp($this->budget_amount, '') ? price2num($this->budget_amount) : "null");
+			$sql .= ", fk_user_modif = ".$user->id;
+			$sql .= ", usage_opportunity = ".($this->usage_opportunity ? 1 : 0);
+			$sql .= ", usage_task = ".($this->usage_task ? 1 : 0);
+			$sql .= ", usage_bill_time = ".($this->usage_bill_time ? 1 : 0);
+			$sql .= ", usage_organize_event = ".($this->usage_organize_event ? 1 : 0);
+			$sql .= " WHERE rowid = ".$this->id;
 
-            dol_syslog(get_class($this)."::update", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                // Update extrafield
-                if (!$error)
-                {
-                	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-                	{
-                		$result = $this->insertExtraFields();
-                		if ($result < 0)
-                		{
-                			$error++;
-                		}
-                	}
-                }
+			dol_syslog(get_class($this)."::update", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				// Update extrafield
+				if (!$error)
+				{
+					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+					{
+						$result = $this->insertExtraFields();
+						if ($result < 0)
+						{
+							$error++;
+						}
+					}
+				}
 
-                if (!$error && !$notrigger)
-                {
-                	// Call trigger
-                	$result = $this->call_trigger('PROJECT_MODIFY', $user);
-                	if ($result < 0) { $error++; }
-                	// End call triggers
-                }
+				if (!$error && !$notrigger)
+				{
+					// Call trigger
+					$result = $this->call_trigger('PROJECT_MODIFY', $user);
+					if ($result < 0) { $error++; }
+					// End call triggers
+				}
 
-                if (!$error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref))
-                {
-                	// We remove directory
-                	if ($conf->projet->dir_output)
-                	{
-                		$olddir = $conf->projet->dir_output."/".dol_sanitizeFileName($this->oldcopy->ref);
-                		$newdir = $conf->projet->dir_output."/".dol_sanitizeFileName($this->ref);
-                		if (file_exists($olddir))
-                		{
+				if (!$error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref))
+				{
+					// We remove directory
+					if ($conf->projet->dir_output)
+					{
+						$olddir = $conf->projet->dir_output."/".dol_sanitizeFileName($this->oldcopy->ref);
+						$newdir = $conf->projet->dir_output."/".dol_sanitizeFileName($this->ref);
+						if (file_exists($olddir))
+						{
 							include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 							$res = @rename($olddir, $newdir);
 							if (!$res)
-                			{
-							    $langs->load("errors");
+							{
+								$langs->load("errors");
 								$this->error = $langs->trans('ErrorFailToRenameDir', $olddir, $newdir);
-                				$error++;
-                			}
-                		}
-                	}
-                }
-                if (!$error)
-                {
-                    $this->db->commit();
-                    $result = 1;
-                }
-                else
+								$error++;
+							}
+						}
+					}
+				}
+				if (!$error)
 				{
-                    $this->db->rollback();
-                    $result = -1;
-                }
-            }
-            else
+					$this->db->commit();
+					$result = 1;
+				}
+				else
+				{
+					$this->db->rollback();
+					$result = -1;
+				}
+			}
+			else
 			{
-		        $this->error = $this->db->lasterror();
-		        $this->errors[] = $this->error;
-		        $this->db->rollback();
-			    if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-			    {
-			        $result = -4;
-			    }
-			    else
-			    {
-			        $result = -2;
-			    }
-		        dol_syslog(get_class($this)."::update error ".$result." ".$this->error, LOG_ERR);
-            }
-        }
-        else
-        {
-            dol_syslog(get_class($this)."::update ref null");
-            $result = -1;
-        }
+				$this->error = $this->db->lasterror();
+				$this->errors[] = $this->error;
+				$this->db->rollback();
+				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+				{
+					$result = -4;
+				}
+				else
+				{
+					$result = -2;
+				}
+				dol_syslog(get_class($this)."::update error ".$result." ".$this->error, LOG_ERR);
+			}
+		}
+		else
+		{
+			dol_syslog(get_class($this)."::update ref null");
+			$result = -1;
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * 	Get object from database
-     *
-     * 	@param      int		$id       	Id of object to load
-     * 	@param		string	$ref		Ref of project
-     * 	@return     int      		   	>0 if OK, 0 if not found, <0 if KO
-     */
-    public function fetch($id, $ref = '')
-    {
-        global $conf;
+	/**
+	 * 	Get object from database
+	 *
+	 * 	@param      int		$id       	Id of object to load
+	 * 	@param		string	$ref		Ref of project
+	 * 	@return     int      		   	>0 if OK, 0 if not found, <0 if KO
+	 */
+	public function fetch($id, $ref = '')
+	{
+		global $conf;
 
-        if (empty($id) && empty($ref)) return -1;
+		if (empty($id) && empty($ref)) return -1;
 
-        $sql = "SELECT rowid, ref, title, description, public, datec, opp_amount, budget_amount,";
-        $sql .= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_modif, fk_user_close, fk_statut, fk_opp_status, opp_percent,";
-        $sql .= " note_private, note_public, model_pdf, usage_opportunity, usage_task, usage_bill_time, usage_organize_event, entity";
-        $sql .= " FROM ".MAIN_DB_PREFIX."projet";
-        if (!empty($id))
-        {
-        	$sql .= " WHERE rowid=".$id;
-        }
-        elseif (!empty($ref))
-        {
-        	$sql .= " WHERE ref='".$this->db->escape($ref)."'";
-        	$sql .= " AND entity IN (".getEntity('project').")";
-        }
+		$sql = "SELECT rowid, ref, title, description, public, datec, opp_amount, budget_amount,";
+		$sql .= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_modif, fk_user_close, fk_statut, fk_opp_status, opp_percent,";
+		$sql .= " note_private, note_public, model_pdf, usage_opportunity, usage_task, usage_bill_time, usage_organize_event, entity";
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet";
+		if (!empty($id))
+		{
+			$sql .= " WHERE rowid=".$id;
+		}
+		elseif (!empty($ref))
+		{
+			$sql .= " WHERE ref='".$this->db->escape($ref)."'";
+			$sql .= " AND entity IN (".getEntity('project').")";
+		}
 
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num_rows = $this->db->num_rows($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num_rows = $this->db->num_rows($resql);
 
-            if ($num_rows)
-            {
-                $obj = $this->db->fetch_object($resql);
+			if ($num_rows)
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
-                $this->ref = $obj->ref;
-                $this->title = $obj->title;
-                $this->description = $obj->description;
-                $this->date_c = $this->db->jdate($obj->datec);
-                $this->datec = $this->db->jdate($obj->datec); // TODO deprecated
-                $this->date_m = $this->db->jdate($obj->tms);
-                $this->datem = $this->db->jdate($obj->tms); // TODO deprecated
-                $this->date_start = $this->db->jdate($obj->dateo);
-                $this->date_end = $this->db->jdate($obj->datee);
-                $this->date_close = $this->db->jdate($obj->date_close);
-                $this->note_private = $obj->note_private;
-                $this->note_public = $obj->note_public;
-                $this->socid = $obj->fk_soc;
-                $this->user_author_id = $obj->fk_user_creat;
-                $this->user_modification_id = $obj->fk_user_modif;
-                $this->user_close_id = $obj->fk_user_close;
-                $this->public = $obj->public;
-                $this->statut = $obj->fk_statut;
-                $this->opp_status = $obj->fk_opp_status;
-                $this->opp_amount	= $obj->opp_amount;
-                $this->opp_percent = $obj->opp_percent;
-                $this->budget_amount = $obj->budget_amount;
-                $this->modelpdf = $obj->model_pdf;
-                $this->usage_opportunity = (int) $obj->usage_opportunity;
-                $this->usage_task = (int) $obj->usage_task;
-                $this->usage_bill_time = (int) $obj->usage_bill_time;
-                $this->usage_organize_event = (int) $obj->usage_organize_event;
-                $this->entity = $obj->entity;
+				$this->id = $obj->rowid;
+				$this->ref = $obj->ref;
+				$this->title = $obj->title;
+				$this->description = $obj->description;
+				$this->date_c = $this->db->jdate($obj->datec);
+				$this->datec = $this->db->jdate($obj->datec); // TODO deprecated
+				$this->date_m = $this->db->jdate($obj->tms);
+				$this->datem = $this->db->jdate($obj->tms); // TODO deprecated
+				$this->date_start = $this->db->jdate($obj->dateo);
+				$this->date_end = $this->db->jdate($obj->datee);
+				$this->date_close = $this->db->jdate($obj->date_close);
+				$this->note_private = $obj->note_private;
+				$this->note_public = $obj->note_public;
+				$this->socid = $obj->fk_soc;
+				$this->user_author_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
+				$this->user_close_id = $obj->fk_user_close;
+				$this->public = $obj->public;
+				$this->statut = $obj->fk_statut;
+				$this->opp_status = $obj->fk_opp_status;
+				$this->opp_amount	= $obj->opp_amount;
+				$this->opp_percent = $obj->opp_percent;
+				$this->budget_amount = $obj->budget_amount;
+				$this->modelpdf = $obj->model_pdf;
+				$this->usage_opportunity = (int) $obj->usage_opportunity;
+				$this->usage_task = (int) $obj->usage_task;
+				$this->usage_bill_time = (int) $obj->usage_bill_time;
+				$this->usage_organize_event = (int) $obj->usage_organize_event;
+				$this->entity = $obj->entity;
 
-                $this->db->free($resql);
+				$this->db->free($resql);
 
-                // Retreive all extrafield
-                // fetch optionals attributes and labels
-                $this->fetch_optionals();
+				// Retreive all extrafield
+				// fetch optionals attributes and labels
+				$this->fetch_optionals();
 
-                return 1;
-            }
+				return 1;
+			}
 
-            $this->db->free($resql);
+			$this->db->free($resql);
 
-            return 0;
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+			return 0;
+		}
+		else
+		{
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * 	Return list of elements for type, linked to a project
-     *
-     * 	@param		string		$type			'propal','order','invoice','order_supplier','invoice_supplier',...
-     * 	@param		string		$tablename		name of table associated of the type
-     * 	@param		string		$datefieldname	name of date field for filter
-     *  @param		int			$dates			Start date
-     *  @param		int			$datee			End date
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * 	Return list of elements for type, linked to a project
+	 *
+	 * 	@param		string		$type			'propal','order','invoice','order_supplier','invoice_supplier',...
+	 * 	@param		string		$tablename		name of table associated of the type
+	 * 	@param		string		$datefieldname	name of date field for filter
+	 *  @param		int			$dates			Start date
+	 *  @param		int			$datee			End date
 	 *	@param		string		$projectkey		Equivalent key  to fk_projet for actual type
-     * 	@return		mixed						Array list of object ids linked to project, < 0 or string if error
-     */
-    public function get_element_list($type, $tablename, $datefieldname = '', $dates = '', $datee = '', $projectkey = 'fk_projet')
-    {
-        // phpcs:enable
-        $elements = array();
+	 * 	@return		mixed						Array list of object ids linked to project, < 0 or string if error
+	 */
+	public function get_element_list($type, $tablename, $datefieldname = '', $dates = '', $datee = '', $projectkey = 'fk_projet')
+	{
+		// phpcs:enable
+		$elements = array();
 
-        if ($this->id <= 0) return $elements;
+		if ($this->id <= 0) return $elements;
 
-        $ids = $this->id;
+		$ids = $this->id;
 
 		if ($type == 'agenda')
-        {
-        	$sql = "SELECT id as rowid FROM ".MAIN_DB_PREFIX."actioncomm WHERE fk_project IN (".$ids.") AND entity IN (".getEntity('agenda').")";
-        }
-        elseif ($type == 'expensereport')
 		{
-            $sql = "SELECT ed.rowid FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."expensereport_det as ed WHERE e.rowid = ed.fk_expensereport AND e.entity IN (".getEntity('expensereport').") AND ed.fk_projet IN (".$ids.")";
+			$sql = "SELECT id as rowid FROM ".MAIN_DB_PREFIX."actioncomm WHERE fk_project IN (".$ids.") AND entity IN (".getEntity('agenda').")";
 		}
-        elseif ($type == 'project_task')
+		elseif ($type == 'expensereport')
+		{
+			$sql = "SELECT ed.rowid FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."expensereport_det as ed WHERE e.rowid = ed.fk_expensereport AND e.entity IN (".getEntity('expensereport').") AND ed.fk_projet IN (".$ids.")";
+		}
+		elseif ($type == 'project_task')
 		{
 			$sql = "SELECT DISTINCT pt.rowid FROM ".MAIN_DB_PREFIX."projet_task as pt WHERE pt.fk_projet IN (".$ids.")";
 		}
@@ -607,18 +607,18 @@ class Project extends CommonObject
 		{
 			$sql = 'SELECT ms.rowid, ms.fk_user_author as fk_user FROM '.MAIN_DB_PREFIX."stock_mouvement as ms, ".MAIN_DB_PREFIX."entrepot as e WHERE e.rowid = ms.fk_entrepot AND e.entity IN (".getEntity('stock').") AND ms.origintype = 'project' AND ms.fk_origin IN (".$ids.") AND ms.type_mouvement = 1";
 		}
-        elseif ($type == 'loan')
-        {
-            $sql = 'SELECT l.rowid, l.fk_user_author as fk_user FROM '.MAIN_DB_PREFIX."loan as l WHERE l.entity IN (".getEntity('loan').") AND l.fk_projet IN (".$ids.")";
-        }
-        else
+		elseif ($type == 'loan')
 		{
-            $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$tablename." WHERE ".$projectkey." IN (".$ids.") AND entity IN (".getEntity($type).")";
-        }
+			$sql = 'SELECT l.rowid, l.fk_user_author as fk_user FROM '.MAIN_DB_PREFIX."loan as l WHERE l.entity IN (".getEntity('loan').") AND l.fk_projet IN (".$ids.")";
+		}
+		else
+		{
+			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$tablename." WHERE ".$projectkey." IN (".$ids.") AND entity IN (".getEntity($type).")";
+		}
 
-        if($dates > 0 && $type == 'loan'){
-            $sql .= " AND (dateend > '".$this->db->idate($dates)."' OR dateend IS NULL)";
-        }
+		if($dates > 0 && $type == 'loan'){
+			$sql .= " AND (dateend > '".$this->db->idate($dates)."' OR dateend IS NULL)";
+		}
 		elseif ($dates > 0 && ($type != 'project_task'))	// For table project_taks, we want the filter on date apply on project_time_spent table
 		{
 			if (empty($datefieldname) && !empty($this->table_element_date)) $datefieldname = $this->table_element_date;
@@ -626,10 +626,10 @@ class Project extends CommonObject
 			$sql .= " AND (".$datefieldname." >= '".$this->db->idate($dates)."' OR ".$datefieldname." IS NULL)";
 		}
 
-        if($datee > 0 && $type == 'loan'){
-            $sql .= " AND (datestart < '".$this->db->idate($datee)."' OR datestart IS NULL)";
-        }
-        elseif ($datee > 0 && ($type != 'project_task'))	// For table project_taks, we want the filter on date apply on project_time_spent table
+		if($datee > 0 && $type == 'loan'){
+			$sql .= " AND (datestart < '".$this->db->idate($datee)."' OR datestart IS NULL)";
+		}
+		elseif ($datee > 0 && ($type != 'project_task'))	// For table project_taks, we want the filter on date apply on project_time_spent table
 		{
 			if (empty($datefieldname) && !empty($this->table_element_date)) $datefieldname = $this->table_element_date;
 			if (empty($datefieldname)) return 'Error this object has no date field defined';
@@ -637,94 +637,94 @@ class Project extends CommonObject
 		}
 		if (!$sql) return -1;
 
-        //print $sql;
-        dol_syslog(get_class($this)."::get_element_list", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $nump = $this->db->num_rows($result);
-            if ($nump)
-            {
-                $i = 0;
-                while ($i < $nump)
-                {
-                    $obj = $this->db->fetch_object($result);
+		//print $sql;
+		dol_syslog(get_class($this)."::get_element_list", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$nump = $this->db->num_rows($result);
+			if ($nump)
+			{
+				$i = 0;
+				while ($i < $nump)
+				{
+					$obj = $this->db->fetch_object($result);
 
-                    $elements[$i] = $obj->rowid.(empty($obj->fk_user) ? '' : '_'.$obj->fk_user);
+					$elements[$i] = $obj->rowid.(empty($obj->fk_user) ? '' : '_'.$obj->fk_user);
 
-                    $i++;
-                }
-                $this->db->free($result);
-            }
+					$i++;
+				}
+				$this->db->free($result);
+			}
 
-            /* Return array even if empty*/
-            return $elements;
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-    }
+			/* Return array even if empty*/
+			return $elements;
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
 
-    /**
-     *    Delete a project from database
-     *
-     *    @param       User		$user            User
-     *    @param       int		$notrigger       Disable triggers
-     *    @return      int       			      <0 if KO, 0 if not possible, >0 if OK
-     */
-    public function delete($user, $notrigger = 0)
-    {
-        global $langs, $conf;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	/**
+	 *    Delete a project from database
+	 *
+	 *    @param       User		$user            User
+	 *    @param       int		$notrigger       Disable triggers
+	 *    @return      int       			      <0 if KO, 0 if not possible, >0 if OK
+	 */
+	public function delete($user, $notrigger = 0)
+	{
+		global $langs, $conf;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $error = 0;
+		$error = 0;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        if (!$error)
-        {
-            // Delete linked contacts
-            $res = $this->delete_linked_contact();
-            if ($res < 0)
-            {
-                $this->error = 'ErrorFailToDeleteLinkedContact';
-                //$error++;
-                $this->db->rollback();
-                return 0;
-            }
-        }
+		if (!$error)
+		{
+			// Delete linked contacts
+			$res = $this->delete_linked_contact();
+			if ($res < 0)
+			{
+				$this->error = 'ErrorFailToDeleteLinkedContact';
+				//$error++;
+				$this->db->rollback();
+				return 0;
+			}
+		}
 
-        // Set fk_projet into elements to null
-        $listoftables = array(
-        		'propal'=>'fk_projet', 'commande'=>'fk_projet', 'facture'=>'fk_projet',
-        		'supplier_proposal'=>'fk_projet', 'commande_fournisseur'=>'fk_projet', 'facture_fourn'=>'fk_projet',
-        		'expensereport_det'=>'fk_projet', 'contrat'=>'fk_projet', 'fichinter'=>'fk_projet', 'don'=>'fk_projet',
-        		'actioncomm'=>'fk_project'
-        		);
-        foreach ($listoftables as $key => $value)
-        {
-   	        $sql = "UPDATE ".MAIN_DB_PREFIX.$key." SET ".$value." = NULL where ".$value." = ".$this->id;
-	        $resql = $this->db->query($sql);
-	        if (!$resql)
-	        {
-	        	$this->errors[] = $this->db->lasterror();
-	        	$error++;
-	        	break;
-	        }
-        }
+		// Set fk_projet into elements to null
+		$listoftables = array(
+			'propal'=>'fk_projet', 'commande'=>'fk_projet', 'facture'=>'fk_projet',
+			'supplier_proposal'=>'fk_projet', 'commande_fournisseur'=>'fk_projet', 'facture_fourn'=>'fk_projet',
+			'expensereport_det'=>'fk_projet', 'contrat'=>'fk_projet', 'fichinter'=>'fk_projet', 'don'=>'fk_projet',
+			'actioncomm'=>'fk_project'
+		);
+		foreach ($listoftables as $key => $value)
+		{
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$key." SET ".$value." = NULL where ".$value." = ".$this->id;
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[] = $this->db->lasterror();
+				$error++;
+				break;
+			}
+		}
 
-        // Remove linked categories.
-        if (!$error) {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_project";
-            $sql .= " WHERE fk_project = ".$this->id;
+		// Remove linked categories.
+		if (!$error) {
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_project";
+			$sql .= " WHERE fk_project = ".$this->id;
 
-            $result = $this->db->query($sql);
-            if (!$result) {
-                $error++;
-                $this->errors[] = $this->db->lasterror();
-            }
-        }
+			$result = $this->db->query($sql);
+			if (!$result) {
+				$error++;
+				$this->errors[] = $this->db->lasterror();
+			}
+		}
 
 		// Fetch tasks
 		$this->getLinesArray($user);
@@ -754,1334 +754,1333 @@ class Project extends CommonObject
 
 
 
-        // Delete project
-        if (!$error)
-        {
-	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet";
-	        $sql .= " WHERE rowid=".$this->id;
+		// Delete project
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet";
+			$sql .= " WHERE rowid=".$this->id;
 
-	        $resql = $this->db->query($sql);
-	        if (!$resql)
-	        {
-	        	$this->errors[] = $langs->trans("CantRemoveProject");
-	        	$error++;
-	        }
-        }
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[] = $langs->trans("CantRemoveProject");
+				$error++;
+			}
+		}
 
-        if (!$error)
-        {
-	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_extrafields";
-	        $sql .= " WHERE fk_object=".$this->id;
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_extrafields";
+			$sql .= " WHERE fk_object=".$this->id;
 
-	        $resql = $this->db->query($sql);
-	        if (!$resql)
-	        {
-	        	$this->errors[] = $this->db->lasterror();
-	        	$error++;
-	        }
-        }
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[] = $this->db->lasterror();
+				$error++;
+			}
+		}
 
-        if (empty($error)) {
-            // We remove directory
-            $projectref = dol_sanitizeFileName($this->ref);
-            if ($conf->projet->dir_output) {
-                $dir = $conf->projet->dir_output."/".$projectref;
-                if (file_exists($dir)) {
-                    $res = @dol_delete_dir_recursive($dir);
-                    if (!$res) {
-                        $this->errors[] = 'ErrorFailToDeleteDir';
-                        $error++;
-                    }
-                }
-            }
+		if (empty($error)) {
+			// We remove directory
+			$projectref = dol_sanitizeFileName($this->ref);
+			if ($conf->projet->dir_output) {
+				$dir = $conf->projet->dir_output."/".$projectref;
+				if (file_exists($dir)) {
+					$res = @dol_delete_dir_recursive($dir);
+					if (!$res) {
+						$this->errors[] = 'ErrorFailToDeleteDir';
+						$error++;
+					}
+				}
+			}
 
-            if (!$notrigger)
-            {
-                // Call trigger
-                $result = $this->call_trigger('PROJECT_DELETE', $user);
+			if (!$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('PROJECT_DELETE', $user);
 
-                if ($result < 0) {
-                    $error++;
-                }
-                // End call triggers
-            }
-        }
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
+			}
+		}
 
-    	if (empty($error))
-    	{
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            foreach ($this->errors as $errmsg)
-            {
+		if (empty($error))
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			foreach ($this->errors as $errmsg)
+			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
-            dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    /**
-     * 		Delete tasks with no children first, then task with children recursively
-     *
-     *  	@param     	User		$user		User
-     *		@return		int				<0 if KO, 1 if OK
-     */
-    public function deleteTasks($user)
-    {
-        $countTasks = count($this->lines);
-        $deleted = false;
-        if ($countTasks)
-        {
-            foreach ($this->lines as $task)
-            {
-                if ($task->hasChildren() <= 0) {		// If there is no children (or error to detect them)
-                    $deleted = true;
-                    $ret = $task->delete($user);
-                    if ($ret <= 0)
-                    {
-                        $this->errors[] = $this->db->lasterror();
-                        return -1;
-                    }
-                }
-            }
-        }
-        $this->getLinesArray($user);
-        if ($deleted && count($this->lines) < $countTasks)
-        {
-            if (count($this->lines)) $this->deleteTasks($this->lines);
-        }
-
-        return 1;
-    }
-
-    /**
-     * 		Validate a project
-     *
-     * 		@param		User	$user		   User that validate
-     *      @param      int     $notrigger     1=Disable triggers
-     * 		@return		int					   <0 if KO, >0 if OK
-     */
-    public function setValid($user, $notrigger = 0)
-    {
-        global $langs, $conf;
-
-		$error = 0;
-
-        if ($this->statut != 1)
-        {
-            // Check parameters
-            if (preg_match('/^'.preg_quote($langs->trans("CopyOf").' ').'/', $this->title))
-            {
-                $this->error = $langs->trans("ErrorFieldFormat", $langs->transnoentities("Label")).'. '.$langs->trans('RemoveString', $langs->transnoentitiesnoconv("CopyOf"));
-                return -1;
-            }
-
-            $this->db->begin();
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."projet";
-            $sql .= " SET fk_statut = 1";
-            $sql .= " WHERE rowid = ".$this->id;
-            $sql .= " AND entity = ".$conf->entity;
-
-            dol_syslog(get_class($this)."::setValid", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                // Call trigger
-                if (empty($notrigger))
-                {
-                    $result = $this->call_trigger('PROJECT_VALIDATE', $user);
-                    if ($result < 0) { $error++; }
-                    // End call triggers
-                }
-
-                if (!$error)
-                {
-                	$this->statut = 1;
-                	$this->db->commit();
-                    return 1;
-                }
-                else
-                {
-                    $this->db->rollback();
-                    $this->error = join(',', $this->errors);
-                    dol_syslog(get_class($this)."::setValid ".$this->error, LOG_ERR);
-                    return -1;
-                }
-            }
-            else
-            {
-                $this->db->rollback();
-                $this->error = $this->db->lasterror();
-                return -1;
-            }
-        }
-    }
-
-    /**
-     * 		Close a project
-     *
-     * 		@param		User	$user		User that close project
-     * 		@return		int					<0 if KO, 0 if already closed, >0 if OK
-     */
-    public function setClose($user)
-    {
-        global $langs, $conf;
-
-        $now = dol_now();
-
-		$error = 0;
-
-        if ($this->statut != 2)
-        {
-            $this->db->begin();
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."projet";
-            $sql .= " SET fk_statut = 2, fk_user_close = ".$user->id.", date_close = '".$this->db->idate($now)."'";
-            $sql .= " WHERE rowid = ".$this->id;
-            $sql .= " AND entity = ".$conf->entity;
-            $sql .= " AND fk_statut = 1";
-
-            if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-            {
-            	// TODO What to do if fk_opp_status is not code 'WON' or 'LOST'
-            }
-
-            dol_syslog(get_class($this)."::setClose", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                // Call trigger
-                $result = $this->call_trigger('PROJECT_CLOSE', $user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-
-                if (!$error)
-                {
-                    $this->statut = 2;
-                    $this->db->commit();
-                    return 1;
-                }
-                else
-                {
-                    $this->db->rollback();
-                    $this->error = join(',', $this->errors);
-                    dol_syslog(get_class($this)."::setClose ".$this->error, LOG_ERR);
-                    return -1;
-                }
-            }
-            else
-            {
-                $this->db->rollback();
-                $this->error = $this->db->lasterror();
-                return -1;
-            }
-        }
-
-        return 0;
-    }
-
-    /**
-     *  Return status label of object
-     *
-     *  @param  int			$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
-     * 	@return string      			Label
-     */
-    public function getLibStatut($mode = 0)
-    {
-        return $this->LibStatut($this->statut, $mode);
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Renvoi status label for a status
-     *
-     *  @param	int		$status     id status
-     *  @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
-     * 	@return string				Label
-     */
-    public function LibStatut($status, $mode = 0)
-    {
-        // phpcs:enable
-        global $langs;
-
-        $statustrans = array(
-            0 => 'status0',
-            1 => 'status4',
-            2 => 'status6',
-        );
-
-        $statusClass = 'status0';
-        if (!empty($statustrans[$status])) {
-            $statusClass = $statustrans[$status];
-        }
-
-        return dolGetStatus($langs->trans($this->statuts_long[$status]), $langs->trans($this->statuts_short[$status]), '', $statusClass, $mode);
-    }
-
-    /**
-     * 	Return clicable name (with picto eventually)
-     *
-     * 	@param	int		$withpicto		          0=No picto, 1=Include picto into link, 2=Only picto
-     * 	@param	string	$option			          Variant ('', 'nolink')
-     * 	@param	int		$addlabel		          0=Default, 1=Add label into string, >1=Add first chars into string
-     *  @param	string	$moreinpopup	          Text to add into popup
-     *  @param	string	$sep			          Separator between ref and label if option addlabel is set
-     *  @param	int   	$notooltip		          1=Disable tooltip
-     *  @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     * 	@return	string					          String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $addlabel = 0, $moreinpopup = '', $sep = ' - ', $notooltip = 0, $save_lastsearch_value = -1)
-    {
-        global $conf, $langs, $user, $hookmanager;
-
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
-
-        $result = '';
-
-        $label = '';
-        if ($option != 'nolink') $label = '<u>'.$langs->trans("ShowProject").'</u>';
-        $label .= ($label ? '<br>' : '').'<b>'.$langs->trans('Ref').': </b>'.$this->ref; // The space must be after the : to not being explode when showing the title in img_picto
-        $label .= ($label ? '<br>' : '').'<b>'.$langs->trans('Label').': </b>'.$this->title; // The space must be after the : to not being explode when showing the title in img_picto
-        if (!empty($this->thirdparty_name))
-            $label .= ($label ? '<br>' : '').'<b>'.$langs->trans('ThirdParty').': </b>'.$this->thirdparty_name; // The space must be after the : to not being explode when showing the title in img_picto
-        if (!empty($this->dateo))
-            $label .= ($label ? '<br>' : '').'<b>'.$langs->trans('DateStart').': </b>'.dol_print_date($this->dateo, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
-        if (!empty($this->datee))
-            $label .= ($label ? '<br>' : '').'<b>'.$langs->trans('DateEnd').': </b>'.dol_print_date($this->datee, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
-        if ($moreinpopup) $label .= '<br>'.$moreinpopup;
-
-        $url = '';
-        if ($option != 'nolink')
-        {
-            if (preg_match('/\.php$/', $option)) {
-                $url = dol_buildpath($option, 1).'?id='.$this->id;
-            }
-            elseif ($option == 'task')
-            {
-                $url = DOL_URL_ROOT.'/projet/tasks.php?id='.$this->id;
-            }
-            else
-            {
-                $url = DOL_URL_ROOT.'/projet/card.php?id='.$this->id;
-            }
-            // Add param to save lastsearch_values or not
-            $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-            if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-            if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
-
-        $linkclose = '';
-        if (empty($notooltip) && $user->rights->projet->lire)
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowProject");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip"';
-
-			/*
-			$hookmanager->initHooks(array('projectdao'));
-			$parameters=array('id'=>$this->id);
-			// Note that $action and $object may have been modified by some hooks
-			$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);
-			if ($reshook > 0)
-				$linkclose = $hookmanager->resPrint;
-			*/
-		}
-
-        $picto = 'projectpub';
-        if (!$this->public) $picto = 'project';
-
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
-        $linkend = '</a>';
-
-        $result .= $linkstart;
-        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2) $result .= $this->ref;
-        $result .= $linkend;
-        if ($withpicto != 2) $result .= (($addlabel && $this->title) ? $sep.dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : '');
-
-        global $action;
-        $hookmanager->initHooks(array('projectdao'));
-        $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
-        $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-        if ($reshook > 0) $result = $hookmanager->resPrint;
-        else $result .= $hookmanager->resPrint;
-
-        return $result;
-    }
-
-    /**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     * 	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    public function initAsSpecimen()
-    {
-        global $user, $langs, $conf;
-
-        $now = dol_now();
-
-        // Initialise parameters
-        $this->id = 0;
-        $this->ref = 'SPECIMEN';
-        $this->specimen = 1;
-        $this->socid = 1;
-        $this->date_c = $now;
-        $this->date_m = $now;
-        $this->date_start = $now;
-        $this->date_end = $now + (3600 * 24 * 365);
-        $this->note_public = 'SPECIMEN';
-		$this->fk_ele = 20000;
-        $this->opp_amount = 20000;
-        $this->budget_amount = 10000;
-
-        $this->usage_opportunity = 1;
-        $this->usage_task = 1;
-        $this->usage_bill_time = 1;
-        $this->usage_organize_event = 1;
-
-        /*
-        $nbp = mt_rand(1, 9);
-        $xnbp = 0;
-        while ($xnbp < $nbp)
-        {
-            $line = new Task($this->db);
-            $line->fk_project = 0;
-            $line->label = $langs->trans("Label") . " " . $xnbp;
-            $line->description = $langs->trans("Description") . " " . $xnbp;
-
-            $this->lines[]=$line;
-            $xnbp++;
-        }
-        */
-    }
-
-    /**
-     * 	Check if user has permission on current project
-     *
-     * 	@param	User	$user		Object user to evaluate
-     * 	@param  string	$mode		Type of permission we want to know: 'read', 'write'
-     * 	@return	int					>0 if user has permission, <0 if user has no permission
-     */
-    public function restrictedProjectArea($user, $mode = 'read')
-    {
-        // To verify role of users
-        $userAccess = 0;
-        if (($mode == 'read' && !empty($user->rights->projet->all->lire)) || ($mode == 'write' && !empty($user->rights->projet->all->creer)) || ($mode == 'delete' && !empty($user->rights->projet->all->supprimer)))
-        {
-            $userAccess = 1;
-        }
-        elseif ($this->public && (($mode == 'read' && !empty($user->rights->projet->lire)) || ($mode == 'write' && !empty($user->rights->projet->creer)) || ($mode == 'delete' && !empty($user->rights->projet->supprimer))))
-        {
-            $userAccess = 1;
-        }
-        else
-		{
-            foreach (array('internal', 'external') as $source)
-            {
-                $userRole = $this->liste_contact(4, $source);
-                $num = count($userRole);
-
-                $nblinks = 0;
-                while ($nblinks < $num)
-                {
-                    if ($source == 'internal' && preg_match('/^PROJECT/', $userRole[$nblinks]['code']) && $user->id == $userRole[$nblinks]['id'])
-                    {
-                        if ($mode == 'read' && $user->rights->projet->lire)      $userAccess++;
-                        if ($mode == 'write' && $user->rights->projet->creer)     $userAccess++;
-                        if ($mode == 'delete' && $user->rights->projet->supprimer) $userAccess++;
-                    }
-                    $nblinks++;
-                }
-            }
-            //if (empty($nblinks))	// If nobody has permission, we grant creator
-            //{
-            //	if ((!empty($this->user_author_id) && $this->user_author_id == $user->id))
-            //	{
-            //		$userAccess = 1;
-            //	}
-            //}
-        }
-
-        return ($userAccess ? $userAccess : -1);
-    }
-
-    /**
-     * Return array of projects a user has permission on, is affected to, or all projects
-     *
-     * @param 	User	$user			User object
-     * @param 	int		$mode			0=All project I have permission on (assigned to me or public), 1=Projects assigned to me only, 2=Will return list of all projects with no test on contacts
-     * @param 	int		$list			0=Return array, 1=Return string list
-     * @param	int		$socid			0=No filter on third party, id of third party
-     * @param	string	$filter			additionnal filter on project (statut, ref, ...)
-     * @return 	array or string			Array of projects id, or string with projects id separated with "," if list is 1
-     */
-    public function getProjectsAuthorizedForUser($user, $mode = 0, $list = 0, $socid = 0, $filter = '')
-    {
-        $projects = array();
-        $temp = array();
-
-        $sql = "SELECT ".(($mode == 0 || $mode == 1) ? "DISTINCT " : "")."p.rowid, p.ref";
-        $sql.= " FROM " . MAIN_DB_PREFIX . "projet as p";
-        if ($mode == 0)
-        {
-            $sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "element_contact as ec ON ec.element_id = p.rowid";
-        }
-        elseif ($mode == 1)
-        {
-        	$sql.= ", " . MAIN_DB_PREFIX . "element_contact as ec";
-        }
-        elseif ($mode == 2)
-        {
-        	// No filter. Use this if user has permission to see all project
-        }
-        $sql.= " WHERE p.entity IN (".getEntity('project').")";
-        // Internal users must see project he is contact to even if project linked to a third party he can't see.
-        //if ($socid || ! $user->rights->societe->client->voir)	$sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-        if ($socid > 0) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
-
-        // Get id of types of contacts for projects (This list never contains a lot of elements)
-        $listofprojectcontacttype=array();
-        $sql2 = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
-        $sql2.= " WHERE ctc.element = '" . $this->db->escape($this->element) . "'";
-        $sql2.= " AND ctc.source = 'internal'";
-        $resql = $this->db->query($sql2);
-        if ($resql)
-        {
-            while($obj = $this->db->fetch_object($resql))
-            {
-                $listofprojectcontacttype[$obj->rowid]=$obj->code;
-            }
-        }
-        else dol_print_error($this->db);
-        if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0]='0';    // To avoid syntax error if not found
-
-        if ($mode == 0)
-        {
-            $sql.= " AND ( p.public = 1";
-            $sql.= " OR ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
-            $sql.= " AND ec.fk_socpeople = ".$user->id.")";
-            $sql.= " )";
-        }
-        elseif ($mode == 1)
-        {
-            $sql.= " AND ec.element_id = p.rowid";
-            $sql.= " AND (";
-            $sql.= "  ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
-            $sql.= " AND ec.fk_socpeople = ".$user->id.")";
-            $sql.= " )";
-        }
-        elseif ($mode == 2)
-        {
-            // No filter. Use this if user has permission to see all project
-        }
-
-		$sql.= $filter;
-        //print $sql;
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num)
-            {
-                $row = $this->db->fetch_row($resql);
-                $projects[$row[0]] = $row[1];
-                $temp[] = $row[0];
-                $i++;
-            }
-
-            $this->db->free($resql);
-
-            if ($list)
-            {
-                if (empty($temp)) return '0';
-                $result = implode(',', $temp);
-                return $result;
-            }
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-
-        return $projects;
-    }
-
-     /**
-     * Load an object from its id and create a new one in database
-	 *
-	 *  @param	User	$user		          User making the clone
-	 *  @param	int		$fromid     	      Id of object to clone
-	 *  @param	bool	$clone_contact	      Clone contact of project
-	 *  @param	bool	$clone_task		      Clone task of project
-	 *  @param	bool	$clone_project_file	  Clone file of project
-	 *  @param	bool	$clone_task_file	  Clone file of task (if task are copied)
-     *  @param	bool	$clone_note		      Clone note of project
-     *  @param	bool	$move_date		      Move task date on clone
-     *  @param	integer	$notrigger		      No trigger flag
-     *  @param  int     $newthirdpartyid      New thirdparty id
-	 *  @return	int						      New id of clone
-	 */
-    public function createFromClone(User $user, $fromid, $clone_contact = false, $clone_task = true, $clone_project_file = false, $clone_task_file = false, $clone_note = true, $move_date = true, $notrigger = 0, $newthirdpartyid = 0)
-    {
-		global $langs, $conf;
-
-		$error = 0;
-
-		dol_syslog("createFromClone clone_contact=".$clone_contact." clone_task=".$clone_task." clone_project_file=".$clone_project_file." clone_note=".$clone_note." move_date=".$move_date, LOG_DEBUG);
-
-		$now = dol_mktime(0, 0, 0, idate('m', dol_now()), idate('d', dol_now()), idate('Y', dol_now()));
-
-		$clone_project = new Project($this->db);
-
-		$clone_project->context['createfromclone'] = 'createfromclone';
-
-		$this->db->begin();
-
-		// Load source object
-		$clone_project->fetch($fromid);
-		$clone_project->fetch_optionals();
-		if ($newthirdpartyid > 0) $clone_project->socid = $newthirdpartyid;
-		$clone_project->fetch_thirdparty();
-
-		$orign_dt_start = $clone_project->date_start;
-		$orign_project_ref = $clone_project->ref;
-
-		$clone_project->id = 0;
-		if ($move_date) {
-	        $clone_project->date_start = $now;
-	        if (!(empty($clone_project->date_end)))
-	        {
-	        	$clone_project->date_end = $clone_project->date_end + ($now - $orign_dt_start);
-	        }
-		}
-
-        $clone_project->datec = $now;
-
-        if (!$clone_note)
-        {
-        	    $clone_project->note_private = '';
-    			$clone_project->note_public = '';
-        }
-
-		//Generate next ref
-		$defaultref = '';
-    	$obj = empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
-    	// Search template files
-    	$file = ''; $classname = ''; $filefound = 0;
-    	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-    	foreach ($dirmodels as $reldir)
-    	{
-    	    $file = dol_buildpath($reldir."core/modules/project/".$obj.'.php', 0);
-    	    if (file_exists($file))
-    	    {
-    	        $filefound = 1;
-    	        dol_include_once($reldir."core/modules/project/".$obj.'.php');
-            	$modProject = new $obj;
-            	$defaultref = $modProject->getNextValue(is_object($clone_project->thirdparty) ? $clone_project->thirdparty : null, $clone_project);
-            	break;
-    	    }
-    	}
-    	if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
-
-		$clone_project->ref = $defaultref;
-		$clone_project->title = $langs->trans("CopyOf").' '.$clone_project->title;
-
-		// Create clone
-		$result = $clone_project->create($user, $notrigger);
-
-		// Other options
-		if ($result < 0)
-		{
-			$this->error .= $clone_project->error;
-			$error++;
-		}
-
-		if (!$error)
-		{
-			//Get the new project id
-			$clone_project_id = $clone_project->id;
-
-			//Note Update
-            if (!$clone_note)
-            {
-        	    $clone_project->note_private = '';
-    			$clone_project->note_public = '';
-            }
-        	else
-        	{
-        		$this->db->begin();
-				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_public, ENT_QUOTES), '_public');
-				if ($res < 0)
-				{
-					$this->error .= $clone_project->error;
-					$error++;
-					$this->db->rollback();
-				}
-				else
-				{
-					$this->db->commit();
-				}
-
-				$this->db->begin();
-				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_private, ENT_QUOTES), '_private');
-				if ($res < 0)
-				{
-					$this->error .= $clone_project->error;
-					$error++;
-					$this->db->rollback();
-				}
-				else
-				{
-					$this->db->commit();
-				}
-        	}
-
-			//Duplicate contact
-			if ($clone_contact)
-			{
-				$origin_project = new Project($this->db);
-				$origin_project->fetch($fromid);
-
-				foreach (array('internal', 'external') as $source)
-				{
-					$tab = $origin_project->liste_contact(-1, $source);
-
-					foreach ($tab as $contacttoadd)
-					{
-						$clone_project->add_contact($contacttoadd['id'], $contacttoadd['code'], $contacttoadd['source'], $notrigger);
-						if ($clone_project->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-						{
-							$langs->load("errors");
-							$this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
-							$error++;
-						}
-						else
-						{
-							if ($clone_project->error != '')
-							{
-								$this->error .= $clone_project->error;
-								$error++;
-							}
-						}
-					}
-				}
-			}
-
-			//Duplicate file
-			if ($clone_project_file)
-			{
-				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-				$clone_project_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($defaultref);
-				$ori_project_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($orign_project_ref);
-
-				if (dol_mkdir($clone_project_dir) >= 0)
-				{
-					$filearray = dol_dir_list($ori_project_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', '', SORT_ASC, 1);
-					foreach ($filearray as $key => $file)
-					{
-						$rescopy = dol_copy($ori_project_dir.'/'.$file['name'], $clone_project_dir.'/'.$file['name'], 0, 1);
-						if (is_numeric($rescopy) && $rescopy < 0)
-						{
-							$this->error .= $langs->trans("ErrorFailToCopyFile", $ori_project_dir.'/'.$file['name'], $clone_project_dir.'/'.$file['name']);
-							$error++;
-						}
-					}
-				}
-				else
-				{
-					$this->error .= $langs->trans('ErrorInternalErrorDetected').':dol_mkdir';
-					$error++;
-				}
-			}
-
-			//Duplicate task
-			if ($clone_task)
-			{
-				require_once DOL_DOCUMENT_ROOT . '/projet/class/task.class.php';
-
-				$taskstatic = new Task($this->db);
-
-				// Security check
-				$socid=0;
-				if ($user->socid > 0) $socid = $user->socid;
-
-				$tasksarray=$taskstatic->getTasksArray(0, 0, $fromid, $socid, 0);
-
-				$tab_conv_child_parent=array();
-
-				// Loop on each task, to clone it
-			    foreach ($tasksarray as $tasktoclone)
-			    {
-					$result_clone = $taskstatic->createFromClone($user, $tasktoclone->id, $clone_project_id, $tasktoclone->fk_parent, $move_date, true, false, $clone_task_file, true, false);
-					if ($result_clone <= 0)
-				    {
-				    	$this->error .= $result_clone->error;
-						$error++;
-				    }
-				    else
-				    {
-				    	$new_task_id = $result_clone;
-				    	$taskstatic->fetch($tasktoclone->id);
-
-				    	//manage new parent clone task id
-				    	// if the current task has child we store the original task id and the equivalent clone task id
-						if (($taskstatic->hasChildren()) && !array_key_exists($tasktoclone->id, $tab_conv_child_parent))
-						{
-							$tab_conv_child_parent[$tasktoclone->id] = $new_task_id;
-						}
-				    }
-			    }
-
-			    //Parse all clone node to be sure to update new parent
-			    $tasksarray = $taskstatic->getTasksArray(0, 0, $clone_project_id, $socid, 0);
-			    foreach ($tasksarray as $task_cloned)
-			    {
-			    	$taskstatic->fetch($task_cloned->id);
-			    	if ($taskstatic->fk_task_parent != 0)
-			    	{
-			    		$taskstatic->fk_task_parent = $tab_conv_child_parent[$taskstatic->fk_task_parent];
-			    	}
-			    	$res = $taskstatic->update($user, $notrigger);
-			    	if ($result_clone <= 0)
-				    {
-				    	$this->error .= $taskstatic->error;
-						$error++;
-				    }
-			    }
-			}
-		}
-
-		unset($clone_project->context['createfromclone']);
-
-		if (!$error)
-		{
-			$this->db->commit();
-			return $clone_project_id;
-		}
-		else
-		{
+			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 			$this->db->rollback();
-			dol_syslog(get_class($this)."::createFromClone nbError: ".$error." error : ".$this->error, LOG_ERR);
 			return -1;
 		}
-    }
+	}
 
-
-    /**
-	 *    Shift project task date from current date to delta
+	/**
+	 * 		Delete tasks with no children first, then task with children recursively
 	 *
-	 *    @param	integer		$old_project_dt_start	Old project start date
-	 *    @return	int				                    1 if OK or < 0 if KO
+	 *  	@param     	User		$user		User
+	 *		@return		int				<0 if KO, 1 if OK
 	 */
-    public function shiftTaskDate($old_project_dt_start)
-    {
-		global $user, $langs, $conf;
-
-		$error=0;
-
-		$taskstatic = new Task($this->db);
-
-		// Security check
-		$socid=0;
-		if ($user->socid > 0) $socid = $user->socid;
-
-		$tasksarray=$taskstatic->getTasksArray(0, 0, $this->id, $socid, 0);
-
-	    foreach ($tasksarray as $tasktoshiftdate)
-	    {
-	    	$to_update=false;
-	    	// Fetch only if update of date will be made
-	    	if ((!empty($tasktoshiftdate->date_start)) || (!empty($tasktoshiftdate->date_end)))
-	    	{
-	    		//dol_syslog(get_class($this)."::shiftTaskDate to_update", LOG_DEBUG);
-	    		$to_update=true;
-		    	$task = new Task($this->db);
-		    	$result = $task->fetch($tasktoshiftdate->id);
-		    	if (!$result)
-		    	{
-		    		$error++;
-		    		$this->error.=$task->error;
-		    	}
-	    	}
-			//print "$this->date_start + $tasktoshiftdate->date_start - $old_project_dt_start";exit;
-
-	    	//Calcultate new task start date with difference between old proj start date and origin task start date
-	    	if (!empty($tasktoshiftdate->date_start))
-	    	{
-				$task->date_start = $this->date_start + ($tasktoshiftdate->date_start - $old_project_dt_start);
-	    	}
-
-	    	//Calcultate new task end date with difference between origin proj end date and origin task end date
-	    	if (!empty($tasktoshiftdate->date_end))
-	    	{
-				$task->date_end = $this->date_start + ($tasktoshiftdate->date_end - $old_project_dt_start);
-	    	}
-
-			if ($to_update)
+	public function deleteTasks($user)
+	{
+		$countTasks = count($this->lines);
+		$deleted = false;
+		if ($countTasks)
+		{
+			foreach ($this->lines as $task)
 			{
-		    	$result = $task->update($user);
-		    	if (!$result)
-		    	{
-		    		$error++;
-		    		$this->error .= $task->error;
-		    	}
-			}
-	    }
-	    if ($error != 0)
-	    {
-	    	return -1;
-	    }
-	    return $result;
-	}
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *    Associate element to a project
-	 *
-	 *    @param	string	$tableName			Table of the element to update
-	 *    @param	int		$elementSelectId	Key-rowid of the line of the element to update
-	 *    @return	int							1 if OK or < 0 if KO
-     */
-	public function update_element($tableName, $elementSelectId)
-	{
-        // phpcs:enable
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$tableName;
-
-		if ($tableName == "actioncomm")
-		{
-			$sql .= " SET fk_project=".$this->id;
-			$sql .= " WHERE id=".$elementSelectId;
-		}
-		else
-		{
-			$sql .= " SET fk_projet=".$this->id;
-			$sql .= " WHERE rowid=".$elementSelectId;
-		}
-
-		dol_syslog(get_class($this)."::update_element", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$this->error = $this->db->lasterror();
-			return -1;
-		} else {
-			return 1;
-		}
-	}
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *    Associate element to a project
-	 *
-	 *    @param	string	$tableName			Table of the element to update
-	 *    @param	int		$elementSelectId	Key-rowid of the line of the element to update
-	 *    @param	string	$projectfield	    The column name that stores the link with the project
-     *
-	 *    @return	int							1 if OK or < 0 if KO
-	 */
-	public function remove_element($tableName, $elementSelectId, $projectfield = 'fk_projet')
-	{
-        // phpcs:enable
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$tableName;
-
-		if ($tableName == "actioncomm")
-		{
-			$sql .= " SET fk_project=NULL";
-			$sql .= " WHERE id=".$elementSelectId;
-		} else
-		{
-			$sql .= " SET ".$projectfield."=NULL";
-			$sql .= " WHERE rowid=".$elementSelectId;
-		}
-
-		dol_syslog(get_class($this)."::remove_element", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$this->error = $this->db->lasterror();
-			return -1;
-		} else {
-			return 1;
-		}
-	}
-
-	/**
-	 *  Create an intervention document on disk using template defined into PROJECT_ADDON_PDF
-	 *
-	 *  @param	string		$modele			Force template to use ('' by default)
-	 *  @param	Translate	$outputlangs	Objet lang to use for translation
-	 *  @param  int			$hidedetails    Hide details of lines
-	 *  @param  int			$hidedesc       Hide description
-	 *  @param  int			$hideref        Hide ref
-	 *  @return int         				0 if KO, 1 if OK
-	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-	{
-		global $conf,$langs;
-
-		$langs->load("projects");
-
-		if (! dol_strlen($modele)) {
-			$modele = 'baleine';
-
-			if ($this->modelpdf) {
-				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->PROJECT_ADDON_PDF)) {
-				$modele = $conf->global->PROJECT_ADDON_PDF;
-			}
-		}
-
-		$modelpath = "core/modules/project/doc/";
-
-		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
-	}
-
-
-	/**
-	 * Load time spent into this->weekWorkLoad and this->weekWorkLoadPerTask for all day of a week of project.
-	 * Note: array weekWorkLoad and weekWorkLoadPerTask are reset and filled at each call.
-	 *
-	 * @param 	int		$datestart		First day of week (use dol_get_first_day to find this date)
-	 * @param 	int		$taskid			Filter on a task id
-	 * @param 	int		$userid			Time spent by a particular user
-	 * @return 	int						<0 if OK, >0 if KO
-	 */
-    public function loadTimeSpent($datestart, $taskid = 0, $userid = 0)
-    {
-        $error=0;
-
-        $this->weekWorkLoad=array();
-        $this->weekWorkLoadPerTask=array();
-
-        if (empty($datestart)) dol_print_error('', 'Error datestart parameter is empty');
-
-        $sql = "SELECT ptt.rowid as taskid, ptt.task_duration, ptt.task_date, ptt.task_datehour, ptt.fk_task";
-        $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time AS ptt, ".MAIN_DB_PREFIX."projet_task as pt";
-        $sql.= " WHERE ptt.fk_task = pt.rowid";
-        $sql.= " AND pt.fk_projet = ".$this->id;
-        $sql.= " AND (ptt.task_date >= '".$this->db->idate($datestart)."' ";
-        $sql.= " AND ptt.task_date <= '".$this->db->idate(dol_time_plus_duree($datestart, 1, 'w') - 1)."')";
-        if ($taskid) $sql.= " AND ptt.fk_task=".$taskid;
-        if (is_numeric($userid)) $sql.= " AND ptt.fk_user=".$userid;
-
-        //print $sql;
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-				$daylareadyfound=array();
-
-                $num = $this->db->num_rows($resql);
-                $i = 0;
-                // Loop on each record found, so each couple (project id, task id)
-			while ($i < $num)
-                {
-					$obj=$this->db->fetch_object($resql);
-					$day=$this->db->jdate($obj->task_date);		// task_date is date without hours
-				if (empty($daylareadyfound[$day]))
+				if ($task->hasChildren() <= 0) {		// If there is no children (or error to detect them)
+					$deleted = true;
+					$ret = $task->delete($user);
+					if ($ret <= 0)
 					{
-					$this->weekWorkLoad[$day] = $obj->task_duration;
-					$this->weekWorkLoadPerTask[$day][$obj->fk_task] = $obj->task_duration;
+						$this->errors[] = $this->db->lasterror();
+						return -1;
+					}
 				}
-				else
-					{
-					$this->weekWorkLoad[$day] += $obj->task_duration;
-					$this->weekWorkLoadPerTask[$day][$obj->fk_task] += $obj->task_duration;
-				}
-					$daylareadyfound[$day]=1;
-					$i++;
 			}
-                $this->db->free($resql);
-                return 1;
-        }
-        else
-        {
-                $this->error = "Error ".$this->db->lasterror();
-                dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
-                return -1;
-        }
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
-     *
-     * @param	User	$user   Objet user
-     * @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
-     */
-    public function load_board($user)
-    {
-        // phpcs:enable
-        global $conf, $langs;
-
-        // For external user, no check is done on company because readability is managed by public status of project and assignement.
-        //$socid=$user->socid;
-
-		$projectsListId = null;
-        if (!$user->rights->projet->all->lire) $projectsListId = $this->getProjectsAuthorizedForUser($user, 0, 1);
-
-        $sql = "SELECT p.rowid, p.fk_statut as status, p.fk_opp_status, p.datee as datee";
-        $sql .= " FROM (".MAIN_DB_PREFIX."projet as p";
-        $sql .= ")";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
-        // For external user, no check is done on company permission because readability is managed by public status of project and assignement.
-        //if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
-        $sql .= " WHERE p.fk_statut = 1";
-        $sql .= " AND p.entity IN (".getEntity('project').')';
-        if (!empty($projectsListId)) $sql .= " AND p.rowid IN (".$projectsListId.")";
-        // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
-        //if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-        // For external user, no check is done on company permission because readability is managed by public status of project and assignement.
-        //if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
-
-        //print $sql;
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $project_static = new Project($this->db);
-
-            $response = new WorkboardResponse();
-            $response->warning_delay = $conf->projet->warning_delay / 60 / 60 / 24;
-            $response->label = $langs->trans("OpenedProjects");
-            $response->labelShort = $langs->trans("Opened");
-            if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/list.php?search_status=1&mainmenu=project';
-            else $response->url = DOL_URL_ROOT.'/projet/list.php?search_project_user=-1&search_status=1&mainmenu=project';
-            $response->img = img_object('', "projectpub");
-
-            // This assignment in condition is not a bug. It allows walking the results.
-            while ($obj = $this->db->fetch_object($resql))
-            {
-                $response->nbtodo++;
-
-                $project_static->statut = $obj->status;
-                $project_static->opp_status = $obj->opp_status;
-                $project_static->datee = $this->db->jdate($obj->datee);
-
-                if ($project_static->hasDelay()) {
-                    $response->nbtodolate++;
-                }
-            }
-
-            return $response;
-        }
-        else
-        {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
-
-
-	/**
-	 * Function used to replace a thirdparty id with another one.
-	 *
-	 * @param DoliDB $db Database handler
-	 * @param int $origin_id Old thirdparty id
-	 * @param int $dest_id New thirdparty id
-	 * @return bool
-	 */
-	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
-	{
-		$tables = array(
-			'projet'
-		);
-
-		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
-	}
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 * Charge indicateurs this->nb pour le tableau de bord
-	 *
-	 * @return     int         <0 if KO, >0 if OK
-	 */
-	public function load_state_board()
-	{
-        // phpcs:enable
-	    global $user;
-
-	    $this->nb = array();
-
-	    $sql = "SELECT count(p.rowid) as nb";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
-	    $sql .= " WHERE";
-	    $sql .= " p.entity IN (".getEntity('project').")";
-		if (!$user->rights->projet->all->lire)
+		}
+		$this->getLinesArray($user);
+		if ($deleted && count($this->lines) < $countTasks)
 		{
-			$projectsListId = $this->getProjectsAuthorizedForUser($user, 0, 1);
-			$sql .= "AND p.rowid IN (".$projectsListId.")";
-		}
-
-	    $resql = $this->db->query($sql);
-	    if ($resql)
-	    {
-	        while ($obj = $this->db->fetch_object($resql))
-	        {
-	            $this->nb["projects"] = $obj->nb;
-	        }
-	        $this->db->free($resql);
-	        return 1;
-	    }
-	    else
-	    {
-	        dol_print_error($this->db);
-	        $this->error = $this->db->error();
-	        return -1;
-	    }
-	}
-
-
-	/**
-	 * Is the project delayed?
-	 *
-	 * @return bool
-	 */
-	public function hasDelay()
-	{
-	    global $conf;
-
-        if (!($this->statut == self::STATUS_VALIDATED)) return false;
-        if (!$this->datee && !$this->date_end) return false;
-
-        $now = dol_now();
-
-        return ($this->datee ? $this->datee : $this->date_end) < ($now - $conf->projet->warning_delay);
-	}
-
-
-	/**
-	 *	Charge les informations d'ordre info dans l'objet commande
-	 *
-	 *	@param  int		$id       Id of order
-	 *	@return	void
-	 */
-	public function info($id)
-	{
-	    $sql = 'SELECT c.rowid, datec as datec, tms as datem,';
-	    $sql .= ' date_close as datecloture,';
-	    $sql .= ' fk_user_creat as fk_user_author, fk_user_close as fk_use_cloture';
-	    $sql .= ' FROM '.MAIN_DB_PREFIX.'projet as c';
-	    $sql .= ' WHERE c.rowid = '.$id;
-	    $result = $this->db->query($sql);
-	    if ($result)
-	    {
-	        if ($this->db->num_rows($result))
-	        {
-	            $obj = $this->db->fetch_object($result);
-	            $this->id = $obj->rowid;
-	            if ($obj->fk_user_author)
-	            {
-	                $cuser = new User($this->db);
-	                $cuser->fetch($obj->fk_user_author);
-	                $this->user_creation = $cuser;
-	            }
-
-	            if ($obj->fk_user_cloture)
-	            {
-	                $cluser = new User($this->db);
-	                $cluser->fetch($obj->fk_user_cloture);
-	                $this->user_cloture = $cluser;
-	            }
-
-	            $this->date_creation     = $this->db->jdate($obj->datec);
-	            $this->date_modification = $this->db->jdate($obj->datem);
-	            $this->date_cloture      = $this->db->jdate($obj->datecloture);
-	        }
-
-	        $this->db->free($result);
-	    }
-	    else
-	    {
-	        dol_print_error($this->db);
-	    }
-	}
-
-	/**
-	 * Sets object to supplied categories.
-	 *
-	 * Deletes object from existing categories not supplied.
-	 * Adds it to non existing supplied categories.
-	 * Existing categories are left untouch.
-	 *
-	 * @param int[]|int $categories Category or categories IDs
-     * @return void
-	 */
-	public function setCategories($categories)
-	{
-		$type_categ = Categorie::TYPE_PROJECT;
-
-		// Handle single category
-		if (!is_array($categories)) {
-			$categories = array($categories);
-		}
-
-		// Get current categories
-		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$c = new Categorie($this->db);
-		$existing = $c->containing($this->id, $type_categ, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
-		}
-
-		// Process
-		foreach ($to_del as $del) {
-			if ($c->fetch($del) > 0) {
-				$result = $c->del_type($this, $type_categ);
-				if ($result < 0) {
-					$this->errors = $c->errors;
-					$this->error = $c->error;
-					return -1;
-				}
-			}
-		}
-		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0) {
-				$result = $c->add_type($this, $type_categ);
-				if ($result < 0) {
-					$this->errors = $c->errors;
-					$this->error = $c->error;
-					return -1;
-				}
-			}
+			if (count($this->lines)) $this->deleteTasks($this->lines);
 		}
 
 		return 1;
 	}
 
+	/**
+	 * 		Validate a project
+	 *
+	 * 		@param		User	$user		   User that validate
+	 *      @param      int     $notrigger     1=Disable triggers
+	 * 		@return		int					   <0 if KO, >0 if OK
+	 */
+	public function setValid($user, $notrigger = 0)
+	{
+		global $langs, $conf;
+
+		$error = 0;
+
+		if ($this->statut != 1)
+		{
+			// Check parameters
+			if (preg_match('/^'.preg_quote($langs->trans("CopyOf").' ').'/', $this->title))
+			{
+				$this->error = $langs->trans("ErrorFieldFormat", $langs->transnoentities("Label")).'. '.$langs->trans('RemoveString', $langs->transnoentitiesnoconv("CopyOf"));
+				return -1;
+			}
+
+			$this->db->begin();
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."projet";
+			$sql .= " SET fk_statut = 1";
+			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " AND entity = ".$conf->entity;
+
+			dol_syslog(get_class($this)."::setValid", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				// Call trigger
+				if (empty($notrigger))
+				{
+					$result = $this->call_trigger('PROJECT_VALIDATE', $user);
+					if ($result < 0) { $error++; }
+					// End call triggers
+				}
+
+				if (!$error)
+				{
+					$this->statut = 1;
+					$this->db->commit();
+					return 1;
+				}
+				else
+				{
+					$this->db->rollback();
+					$this->error = join(',', $this->errors);
+					dol_syslog(get_class($this)."::setValid ".$this->error, LOG_ERR);
+					return -1;
+				}
+			}
+			else
+			{
+				$this->db->rollback();
+				$this->error = $this->db->lasterror();
+				return -1;
+			}
+		}
+	}
 
 	/**
-	 * 	Create an array of tasks of current project
+	 * 		Close a project
 	 *
-	 *  @param  User   $user       Object user we want project allowed to
-	 * 	@return int		           >0 if OK, <0 if KO
+	 * 		@param		User	$user		User that close project
+	 * 		@return		int					<0 if KO, 0 if already closed, >0 if OK
 	 */
-	public function getLinesArray($user)
+	public function setClose($user)
 	{
-	    require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
-	    $taskstatic = new Task($this->db);
+		global $langs, $conf;
 
-	    $this->lines = $taskstatic->getTasksArray(0, $user, $this->id, 0, 0);
+		$now = dol_now();
+
+		$error = 0;
+
+		if ($this->statut != self::STATUS_CLOSED)
+		{
+			$this->db->begin();
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."projet";
+			$sql .= " SET fk_statut = ".self::STATUS_CLOSED.", fk_user_close = ".$user->id.", date_close = '".$this->db->idate($now)."'";
+			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " AND fk_statut = ".self::STATUS_VALIDATED;
+
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+			{
+				// TODO What to do if fk_opp_status is not code 'WON' or 'LOST'
+			}
+
+			dol_syslog(get_class($this)."::setClose", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				// Call trigger
+				$result = $this->call_trigger('PROJECT_CLOSE', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+
+				if (!$error)
+				{
+					$this->statut = 2;
+					$this->db->commit();
+					return 1;
+				}
+				else
+				{
+					$this->db->rollback();
+					$this->error = join(',', $this->errors);
+					dol_syslog(get_class($this)."::setClose ".$this->error, LOG_ERR);
+					return -1;
+				}
+			}
+			else
+			{
+				$this->db->rollback();
+				$this->error = $this->db->lasterror();
+				return -1;
+			}
+		}
+
+		return 0;
 	}
+
+	/**
+	 *  Return status label of object
+	 *
+	 *  @param  int			$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+	 * 	@return string      			Label
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->statut, $mode);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Renvoi status label for a status
+	 *
+	 *  @param	int		$status     id status
+	 *  @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 * 	@return string				Label
+	 */
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		global $langs;
+
+		$statustrans = array(
+			0 => 'status0',
+			1 => 'status4',
+			2 => 'status6',
+		);
+
+		$statusClass = 'status0';
+		if (!empty($statustrans[$status])) {
+			$statusClass = $statustrans[$status];
+		}
+
+		return dolGetStatus($langs->trans($this->statuts_long[$status]), $langs->trans($this->statuts_short[$status]), '', $statusClass, $mode);
+	}
+
+	/**
+	 * 	Return clicable name (with picto eventually)
+	 *
+	 * 	@param	int		$withpicto		          0=No picto, 1=Include picto into link, 2=Only picto
+	 * 	@param	string	$option			          Variant ('', 'nolink')
+	 * 	@param	int		$addlabel		          0=Default, 1=Add label into string, >1=Add first chars into string
+	 *  @param	string	$moreinpopup	          Text to add into popup
+	 *  @param	string	$sep			          Separator between ref and label if option addlabel is set
+	 *  @param	int   	$notooltip		          1=Disable tooltip
+	 *  @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 * 	@return	string					          String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $addlabel = 0, $moreinpopup = '', $sep = ' - ', $notooltip = 0, $save_lastsearch_value = -1)
+	{
+		global $conf, $langs, $user, $hookmanager;
+
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+
+		$result = '';
+
+		$label = '';
+		if ($option != 'nolink') $label = '<u>'.$langs->trans("ShowProject").'</u>';
+		$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('Ref').': </b>'.$this->ref; // The space must be after the : to not being explode when showing the title in img_picto
+		$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('Label').': </b>'.$this->title; // The space must be after the : to not being explode when showing the title in img_picto
+		if (!empty($this->thirdparty_name))
+			$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('ThirdParty').': </b>'.$this->thirdparty_name; // The space must be after the : to not being explode when showing the title in img_picto
+			if (!empty($this->dateo))
+				$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('DateStart').': </b>'.dol_print_date($this->dateo, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
+				if (!empty($this->datee))
+					$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('DateEnd').': </b>'.dol_print_date($this->datee, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
+					if ($moreinpopup) $label .= '<br>'.$moreinpopup;
+
+					$url = '';
+					if ($option != 'nolink')
+					{
+						if (preg_match('/\.php$/', $option)) {
+							$url = dol_buildpath($option, 1).'?id='.$this->id;
+						}
+						elseif ($option == 'task')
+						{
+							$url = DOL_URL_ROOT.'/projet/tasks.php?id='.$this->id;
+						}
+						else
+						{
+							$url = DOL_URL_ROOT.'/projet/card.php?id='.$this->id;
+						}
+						// Add param to save lastsearch_values or not
+						$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+						if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+						if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+					}
+
+					$linkclose = '';
+					if (empty($notooltip) && $user->rights->projet->lire)
+					{
+						if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+						{
+							$label = $langs->trans("ShowProject");
+							$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+						}
+						$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+						$linkclose .= ' class="classfortooltip"';
+
+						/*
+						 $hookmanager->initHooks(array('projectdao'));
+						 $parameters=array('id'=>$this->id);
+						 // Note that $action and $object may have been modified by some hooks
+						 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);
+						 if ($reshook > 0)
+						 $linkclose = $hookmanager->resPrint;
+						 */
+					}
+
+					$picto = 'projectpub';
+					if (!$this->public) $picto = 'project';
+
+					$linkstart = '<a href="'.$url.'"';
+					$linkstart .= $linkclose.'>';
+					$linkend = '</a>';
+
+					$result .= $linkstart;
+					if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+					if ($withpicto != 2) $result .= $this->ref;
+					$result .= $linkend;
+					if ($withpicto != 2) $result .= (($addlabel && $this->title) ? $sep.dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : '');
+
+					global $action;
+					$hookmanager->initHooks(array('projectdao'));
+					$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+					$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+					if ($reshook > 0) $result = $hookmanager->resPrint;
+					else $result .= $hookmanager->resPrint;
+
+					return $result;
+	}
+
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 * 	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	public function initAsSpecimen()
+	{
+		global $user, $langs, $conf;
+
+		$now = dol_now();
+
+		// Initialise parameters
+		$this->id = 0;
+		$this->ref = 'SPECIMEN';
+		$this->specimen = 1;
+		$this->socid = 1;
+		$this->date_c = $now;
+		$this->date_m = $now;
+		$this->date_start = $now;
+		$this->date_end = $now + (3600 * 24 * 365);
+		$this->note_public = 'SPECIMEN';
+		$this->fk_ele = 20000;
+		$this->opp_amount = 20000;
+		$this->budget_amount = 10000;
+
+		$this->usage_opportunity = 1;
+		$this->usage_task = 1;
+		$this->usage_bill_time = 1;
+		$this->usage_organize_event = 1;
+
+		/*
+		 $nbp = mt_rand(1, 9);
+		 $xnbp = 0;
+		 while ($xnbp < $nbp)
+		 {
+		 $line = new Task($this->db);
+		 $line->fk_project = 0;
+		 $line->label = $langs->trans("Label") . " " . $xnbp;
+		 $line->description = $langs->trans("Description") . " " . $xnbp;
+
+		 $this->lines[]=$line;
+		 $xnbp++;
+		 }
+		 */
+	}
+
+	/**
+	 * 	Check if user has permission on current project
+	 *
+	 * 	@param	User	$user		Object user to evaluate
+	 * 	@param  string	$mode		Type of permission we want to know: 'read', 'write'
+	 * 	@return	int					>0 if user has permission, <0 if user has no permission
+	 */
+	public function restrictedProjectArea($user, $mode = 'read')
+	{
+		// To verify role of users
+		$userAccess = 0;
+		if (($mode == 'read' && !empty($user->rights->projet->all->lire)) || ($mode == 'write' && !empty($user->rights->projet->all->creer)) || ($mode == 'delete' && !empty($user->rights->projet->all->supprimer)))
+		{
+			$userAccess = 1;
+		}
+		elseif ($this->public && (($mode == 'read' && !empty($user->rights->projet->lire)) || ($mode == 'write' && !empty($user->rights->projet->creer)) || ($mode == 'delete' && !empty($user->rights->projet->supprimer))))
+		{
+			$userAccess = 1;
+		}
+		else
+		{
+			foreach (array('internal', 'external') as $source)
+			{
+				$userRole = $this->liste_contact(4, $source);
+				$num = count($userRole);
+
+				$nblinks = 0;
+				while ($nblinks < $num)
+				{
+					if ($source == 'internal' && preg_match('/^PROJECT/', $userRole[$nblinks]['code']) && $user->id == $userRole[$nblinks]['id'])
+					{
+						if ($mode == 'read' && $user->rights->projet->lire)      $userAccess++;
+						if ($mode == 'write' && $user->rights->projet->creer)     $userAccess++;
+						if ($mode == 'delete' && $user->rights->projet->supprimer) $userAccess++;
+					}
+					$nblinks++;
+				}
+			}
+			//if (empty($nblinks))	// If nobody has permission, we grant creator
+			//{
+			//	if ((!empty($this->user_author_id) && $this->user_author_id == $user->id))
+			//	{
+			//		$userAccess = 1;
+				//	}
+				//}
+			}
+
+			return ($userAccess ? $userAccess : -1);
+		}
+
+		/**
+		 * Return array of projects a user has permission on, is affected to, or all projects
+		 *
+		 * @param 	User	$user			User object
+		 * @param 	int		$mode			0=All project I have permission on (assigned to me or public), 1=Projects assigned to me only, 2=Will return list of all projects with no test on contacts
+		 * @param 	int		$list			0=Return array, 1=Return string list
+		 * @param	int		$socid			0=No filter on third party, id of third party
+		 * @param	string	$filter			additionnal filter on project (statut, ref, ...)
+		 * @return 	array or string			Array of projects id, or string with projects id separated with "," if list is 1
+		 */
+		public function getProjectsAuthorizedForUser($user, $mode = 0, $list = 0, $socid = 0, $filter = '')
+		{
+			$projects = array();
+			$temp = array();
+
+			$sql = "SELECT ".(($mode == 0 || $mode == 1) ? "DISTINCT " : "")."p.rowid, p.ref";
+			$sql.= " FROM " . MAIN_DB_PREFIX . "projet as p";
+			if ($mode == 0)
+			{
+				$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "element_contact as ec ON ec.element_id = p.rowid";
+			}
+			elseif ($mode == 1)
+			{
+				$sql.= ", " . MAIN_DB_PREFIX . "element_contact as ec";
+			}
+			elseif ($mode == 2)
+			{
+				// No filter. Use this if user has permission to see all project
+			}
+			$sql.= " WHERE p.entity IN (".getEntity('project').")";
+			// Internal users must see project he is contact to even if project linked to a third party he can't see.
+			//if ($socid || ! $user->rights->societe->client->voir)	$sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+			if ($socid > 0) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
+
+			// Get id of types of contacts for projects (This list never contains a lot of elements)
+			$listofprojectcontacttype=array();
+			$sql2 = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
+			$sql2.= " WHERE ctc.element = '" . $this->db->escape($this->element) . "'";
+			$sql2.= " AND ctc.source = 'internal'";
+			$resql = $this->db->query($sql2);
+			if ($resql)
+			{
+				while($obj = $this->db->fetch_object($resql))
+				{
+					$listofprojectcontacttype[$obj->rowid]=$obj->code;
+				}
+			}
+			else dol_print_error($this->db);
+			if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0]='0';    // To avoid syntax error if not found
+
+			if ($mode == 0)
+			{
+				$sql.= " AND ( p.public = 1";
+				$sql.= " OR ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
+				$sql.= " AND ec.fk_socpeople = ".$user->id.")";
+				$sql.= " )";
+			}
+			elseif ($mode == 1)
+			{
+				$sql.= " AND ec.element_id = p.rowid";
+				$sql.= " AND (";
+				$sql.= "  ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
+				$sql.= " AND ec.fk_socpeople = ".$user->id.")";
+				$sql.= " )";
+			}
+			elseif ($mode == 2)
+			{
+				// No filter. Use this if user has permission to see all project
+			}
+
+			$sql.= $filter;
+			//print $sql;
+
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$num = $this->db->num_rows($resql);
+				$i = 0;
+				while ($i < $num)
+				{
+					$row = $this->db->fetch_row($resql);
+					$projects[$row[0]] = $row[1];
+					$temp[] = $row[0];
+					$i++;
+				}
+
+				$this->db->free($resql);
+
+				if ($list)
+				{
+					if (empty($temp)) return '0';
+					$result = implode(',', $temp);
+					return $result;
+				}
+			}
+			else
+			{
+				dol_print_error($this->db);
+			}
+
+			return $projects;
+		}
+
+		/**
+		 * Load an object from its id and create a new one in database
+		 *
+		 *  @param	User	$user		          User making the clone
+		 *  @param	int		$fromid     	      Id of object to clone
+		 *  @param	bool	$clone_contact	      Clone contact of project
+		 *  @param	bool	$clone_task		      Clone task of project
+		 *  @param	bool	$clone_project_file	  Clone file of project
+		 *  @param	bool	$clone_task_file	  Clone file of task (if task are copied)
+		 *  @param	bool	$clone_note		      Clone note of project
+		 *  @param	bool	$move_date		      Move task date on clone
+		 *  @param	integer	$notrigger		      No trigger flag
+		 *  @param  int     $newthirdpartyid      New thirdparty id
+		 *  @return	int						      New id of clone
+		 */
+		public function createFromClone(User $user, $fromid, $clone_contact = false, $clone_task = true, $clone_project_file = false, $clone_task_file = false, $clone_note = true, $move_date = true, $notrigger = 0, $newthirdpartyid = 0)
+		{
+			global $langs, $conf;
+
+			$error = 0;
+
+			dol_syslog("createFromClone clone_contact=".$clone_contact." clone_task=".$clone_task." clone_project_file=".$clone_project_file." clone_note=".$clone_note." move_date=".$move_date, LOG_DEBUG);
+
+			$now = dol_mktime(0, 0, 0, idate('m', dol_now()), idate('d', dol_now()), idate('Y', dol_now()));
+
+			$clone_project = new Project($this->db);
+
+			$clone_project->context['createfromclone'] = 'createfromclone';
+
+			$this->db->begin();
+
+			// Load source object
+			$clone_project->fetch($fromid);
+			$clone_project->fetch_optionals();
+			if ($newthirdpartyid > 0) $clone_project->socid = $newthirdpartyid;
+			$clone_project->fetch_thirdparty();
+
+			$orign_dt_start = $clone_project->date_start;
+			$orign_project_ref = $clone_project->ref;
+
+			$clone_project->id = 0;
+			if ($move_date) {
+				$clone_project->date_start = $now;
+				if (!(empty($clone_project->date_end)))
+				{
+					$clone_project->date_end = $clone_project->date_end + ($now - $orign_dt_start);
+				}
+			}
+
+			$clone_project->datec = $now;
+
+			if (!$clone_note)
+			{
+				$clone_project->note_private = '';
+				$clone_project->note_public = '';
+			}
+
+			//Generate next ref
+			$defaultref = '';
+			$obj = empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
+			// Search template files
+			$file = ''; $classname = ''; $filefound = 0;
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir)
+			{
+				$file = dol_buildpath($reldir."core/modules/project/".$obj.'.php', 0);
+				if (file_exists($file))
+				{
+					$filefound = 1;
+					dol_include_once($reldir."core/modules/project/".$obj.'.php');
+					$modProject = new $obj;
+					$defaultref = $modProject->getNextValue(is_object($clone_project->thirdparty) ? $clone_project->thirdparty : null, $clone_project);
+					break;
+				}
+			}
+			if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
+
+			$clone_project->ref = $defaultref;
+			$clone_project->title = $langs->trans("CopyOf").' '.$clone_project->title;
+
+			// Create clone
+			$result = $clone_project->create($user, $notrigger);
+
+			// Other options
+			if ($result < 0)
+			{
+				$this->error .= $clone_project->error;
+				$error++;
+			}
+
+			if (!$error)
+			{
+				//Get the new project id
+				$clone_project_id = $clone_project->id;
+
+				//Note Update
+				if (!$clone_note)
+				{
+					$clone_project->note_private = '';
+					$clone_project->note_public = '';
+				}
+				else
+				{
+					$this->db->begin();
+					$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_public, ENT_QUOTES), '_public');
+					if ($res < 0)
+					{
+						$this->error .= $clone_project->error;
+						$error++;
+						$this->db->rollback();
+					}
+					else
+					{
+						$this->db->commit();
+					}
+
+					$this->db->begin();
+					$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_private, ENT_QUOTES), '_private');
+					if ($res < 0)
+					{
+						$this->error .= $clone_project->error;
+						$error++;
+						$this->db->rollback();
+					}
+					else
+					{
+						$this->db->commit();
+					}
+				}
+
+				//Duplicate contact
+				if ($clone_contact)
+				{
+					$origin_project = new Project($this->db);
+					$origin_project->fetch($fromid);
+
+					foreach (array('internal', 'external') as $source)
+					{
+						$tab = $origin_project->liste_contact(-1, $source);
+
+						foreach ($tab as $contacttoadd)
+						{
+							$clone_project->add_contact($contacttoadd['id'], $contacttoadd['code'], $contacttoadd['source'], $notrigger);
+							if ($clone_project->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+							{
+								$langs->load("errors");
+								$this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
+								$error++;
+							}
+							else
+							{
+								if ($clone_project->error != '')
+								{
+									$this->error .= $clone_project->error;
+									$error++;
+								}
+							}
+						}
+					}
+				}
+
+				//Duplicate file
+				if ($clone_project_file)
+				{
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+					$clone_project_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($defaultref);
+					$ori_project_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($orign_project_ref);
+
+					if (dol_mkdir($clone_project_dir) >= 0)
+					{
+						$filearray = dol_dir_list($ori_project_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', '', SORT_ASC, 1);
+						foreach ($filearray as $key => $file)
+						{
+							$rescopy = dol_copy($ori_project_dir.'/'.$file['name'], $clone_project_dir.'/'.$file['name'], 0, 1);
+							if (is_numeric($rescopy) && $rescopy < 0)
+							{
+								$this->error .= $langs->trans("ErrorFailToCopyFile", $ori_project_dir.'/'.$file['name'], $clone_project_dir.'/'.$file['name']);
+								$error++;
+							}
+						}
+					}
+					else
+					{
+						$this->error .= $langs->trans('ErrorInternalErrorDetected').':dol_mkdir';
+						$error++;
+					}
+				}
+
+				//Duplicate task
+				if ($clone_task)
+				{
+					require_once DOL_DOCUMENT_ROOT . '/projet/class/task.class.php';
+
+					$taskstatic = new Task($this->db);
+
+					// Security check
+					$socid=0;
+					if ($user->socid > 0) $socid = $user->socid;
+
+					$tasksarray=$taskstatic->getTasksArray(0, 0, $fromid, $socid, 0);
+
+					$tab_conv_child_parent=array();
+
+					// Loop on each task, to clone it
+					foreach ($tasksarray as $tasktoclone)
+					{
+						$result_clone = $taskstatic->createFromClone($user, $tasktoclone->id, $clone_project_id, $tasktoclone->fk_parent, $move_date, true, false, $clone_task_file, true, false);
+						if ($result_clone <= 0)
+						{
+							$this->error .= $result_clone->error;
+							$error++;
+						}
+						else
+						{
+							$new_task_id = $result_clone;
+							$taskstatic->fetch($tasktoclone->id);
+
+							//manage new parent clone task id
+							// if the current task has child we store the original task id and the equivalent clone task id
+							if (($taskstatic->hasChildren()) && !array_key_exists($tasktoclone->id, $tab_conv_child_parent))
+							{
+								$tab_conv_child_parent[$tasktoclone->id] = $new_task_id;
+							}
+						}
+					}
+
+					//Parse all clone node to be sure to update new parent
+					$tasksarray = $taskstatic->getTasksArray(0, 0, $clone_project_id, $socid, 0);
+					foreach ($tasksarray as $task_cloned)
+					{
+						$taskstatic->fetch($task_cloned->id);
+						if ($taskstatic->fk_task_parent != 0)
+						{
+							$taskstatic->fk_task_parent = $tab_conv_child_parent[$taskstatic->fk_task_parent];
+						}
+						$res = $taskstatic->update($user, $notrigger);
+						if ($result_clone <= 0)
+						{
+							$this->error .= $taskstatic->error;
+							$error++;
+						}
+					}
+				}
+			}
+
+			unset($clone_project->context['createfromclone']);
+
+			if (!$error)
+			{
+				$this->db->commit();
+				return $clone_project_id;
+			}
+			else
+			{
+				$this->db->rollback();
+				dol_syslog(get_class($this)."::createFromClone nbError: ".$error." error : ".$this->error, LOG_ERR);
+				return -1;
+			}
+		}
+
+
+		/**
+		 *    Shift project task date from current date to delta
+		 *
+		 *    @param	integer		$old_project_dt_start	Old project start date
+		 *    @return	int				                    1 if OK or < 0 if KO
+		 */
+		public function shiftTaskDate($old_project_dt_start)
+		{
+			global $user, $langs, $conf;
+
+			$error=0;
+
+			$taskstatic = new Task($this->db);
+
+			// Security check
+			$socid=0;
+			if ($user->socid > 0) $socid = $user->socid;
+
+			$tasksarray=$taskstatic->getTasksArray(0, 0, $this->id, $socid, 0);
+
+			foreach ($tasksarray as $tasktoshiftdate)
+			{
+				$to_update=false;
+				// Fetch only if update of date will be made
+				if ((!empty($tasktoshiftdate->date_start)) || (!empty($tasktoshiftdate->date_end)))
+				{
+					//dol_syslog(get_class($this)."::shiftTaskDate to_update", LOG_DEBUG);
+					$to_update=true;
+					$task = new Task($this->db);
+					$result = $task->fetch($tasktoshiftdate->id);
+					if (!$result)
+					{
+						$error++;
+						$this->error.=$task->error;
+					}
+				}
+				//print "$this->date_start + $tasktoshiftdate->date_start - $old_project_dt_start";exit;
+
+				//Calcultate new task start date with difference between old proj start date and origin task start date
+				if (!empty($tasktoshiftdate->date_start))
+				{
+					$task->date_start = $this->date_start + ($tasktoshiftdate->date_start - $old_project_dt_start);
+				}
+
+				//Calcultate new task end date with difference between origin proj end date and origin task end date
+				if (!empty($tasktoshiftdate->date_end))
+				{
+					$task->date_end = $this->date_start + ($tasktoshiftdate->date_end - $old_project_dt_start);
+				}
+
+				if ($to_update)
+				{
+					$result = $task->update($user);
+					if (!$result)
+					{
+						$error++;
+						$this->error .= $task->error;
+					}
+				}
+			}
+			if ($error != 0)
+			{
+				return -1;
+			}
+			return $result;
+		}
+
+
+		// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+		/**
+		 *    Associate element to a project
+		 *
+		 *    @param	string	$tableName			Table of the element to update
+		 *    @param	int		$elementSelectId	Key-rowid of the line of the element to update
+		 *    @return	int							1 if OK or < 0 if KO
+		 */
+		public function update_element($tableName, $elementSelectId)
+		{
+			// phpcs:enable
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tableName;
+
+			if ($tableName == "actioncomm")
+			{
+				$sql .= " SET fk_project=".$this->id;
+				$sql .= " WHERE id=".$elementSelectId;
+			}
+			else
+			{
+				$sql .= " SET fk_projet=".$this->id;
+				$sql .= " WHERE rowid=".$elementSelectId;
+			}
+
+			dol_syslog(get_class($this)."::update_element", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$this->error = $this->db->lasterror();
+				return -1;
+			} else {
+				return 1;
+			}
+		}
+
+		// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+		/**
+		 *    Associate element to a project
+		 *
+		 *    @param	string	$tableName			Table of the element to update
+		 *    @param	int		$elementSelectId	Key-rowid of the line of the element to update
+		 *    @param	string	$projectfield	    The column name that stores the link with the project
+		 *
+		 *    @return	int							1 if OK or < 0 if KO
+		 */
+		public function remove_element($tableName, $elementSelectId, $projectfield = 'fk_projet')
+		{
+			// phpcs:enable
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tableName;
+
+			if ($tableName == "actioncomm")
+			{
+				$sql .= " SET fk_project=NULL";
+				$sql .= " WHERE id=".$elementSelectId;
+			} else
+			{
+				$sql .= " SET ".$projectfield."=NULL";
+				$sql .= " WHERE rowid=".$elementSelectId;
+			}
+
+			dol_syslog(get_class($this)."::remove_element", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$this->error = $this->db->lasterror();
+				return -1;
+			} else {
+				return 1;
+			}
+		}
+
+		/**
+		 *  Create an intervention document on disk using template defined into PROJECT_ADDON_PDF
+		 *
+		 *  @param	string		$modele			Force template to use ('' by default)
+		 *  @param	Translate	$outputlangs	Objet lang to use for translation
+		 *  @param  int			$hidedetails    Hide details of lines
+		 *  @param  int			$hidedesc       Hide description
+		 *  @param  int			$hideref        Hide ref
+		 *  @return int         				0 if KO, 1 if OK
+		 */
+		public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+		{
+			global $conf,$langs;
+
+			$langs->load("projects");
+
+			if (! dol_strlen($modele)) {
+				$modele = 'baleine';
+
+				if ($this->modelpdf) {
+					$modele = $this->modelpdf;
+				} elseif (! empty($conf->global->PROJECT_ADDON_PDF)) {
+					$modele = $conf->global->PROJECT_ADDON_PDF;
+				}
+			}
+
+			$modelpath = "core/modules/project/doc/";
+
+			return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+		}
+
+
+		/**
+		 * Load time spent into this->weekWorkLoad and this->weekWorkLoadPerTask for all day of a week of project.
+		 * Note: array weekWorkLoad and weekWorkLoadPerTask are reset and filled at each call.
+		 *
+		 * @param 	int		$datestart		First day of week (use dol_get_first_day to find this date)
+		 * @param 	int		$taskid			Filter on a task id
+		 * @param 	int		$userid			Time spent by a particular user
+		 * @return 	int						<0 if OK, >0 if KO
+		 */
+		public function loadTimeSpent($datestart, $taskid = 0, $userid = 0)
+		{
+			$error=0;
+
+			$this->weekWorkLoad=array();
+			$this->weekWorkLoadPerTask=array();
+
+			if (empty($datestart)) dol_print_error('', 'Error datestart parameter is empty');
+
+			$sql = "SELECT ptt.rowid as taskid, ptt.task_duration, ptt.task_date, ptt.task_datehour, ptt.fk_task";
+			$sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time AS ptt, ".MAIN_DB_PREFIX."projet_task as pt";
+			$sql.= " WHERE ptt.fk_task = pt.rowid";
+			$sql.= " AND pt.fk_projet = ".$this->id;
+			$sql.= " AND (ptt.task_date >= '".$this->db->idate($datestart)."' ";
+			$sql.= " AND ptt.task_date <= '".$this->db->idate(dol_time_plus_duree($datestart, 1, 'w') - 1)."')";
+			if ($taskid) $sql.= " AND ptt.fk_task=".$taskid;
+			if (is_numeric($userid)) $sql.= " AND ptt.fk_user=".$userid;
+
+			//print $sql;
+			$resql=$this->db->query($sql);
+			if ($resql)
+			{
+				$daylareadyfound=array();
+
+				$num = $this->db->num_rows($resql);
+				$i = 0;
+				// Loop on each record found, so each couple (project id, task id)
+				while ($i < $num)
+				{
+					$obj=$this->db->fetch_object($resql);
+					$day=$this->db->jdate($obj->task_date);		// task_date is date without hours
+					if (empty($daylareadyfound[$day]))
+					{
+						$this->weekWorkLoad[$day] = $obj->task_duration;
+						$this->weekWorkLoadPerTask[$day][$obj->fk_task] = $obj->task_duration;
+					}
+					else
+					{
+						$this->weekWorkLoad[$day] += $obj->task_duration;
+						$this->weekWorkLoadPerTask[$day][$obj->fk_task] += $obj->task_duration;
+					}
+					$daylareadyfound[$day]=1;
+					$i++;
+				}
+				$this->db->free($resql);
+				return 1;
+			}
+			else
+			{
+				$this->error = "Error ".$this->db->lasterror();
+				dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
+				return -1;
+			}
+		}
+
+
+		// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+		/**
+		 * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+		 *
+		 * @param	User	$user   Objet user
+		 * @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+		 */
+		public function load_board($user)
+		{
+			// phpcs:enable
+			global $conf, $langs;
+
+			// For external user, no check is done on company because readability is managed by public status of project and assignement.
+			//$socid=$user->socid;
+
+			$projectsListId = null;
+			if (!$user->rights->projet->all->lire) $projectsListId = $this->getProjectsAuthorizedForUser($user, 0, 1);
+
+			$sql = "SELECT p.rowid, p.fk_statut as status, p.fk_opp_status, p.datee as datee";
+			$sql .= " FROM (".MAIN_DB_PREFIX."projet as p";
+			$sql .= ")";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
+			// For external user, no check is done on company permission because readability is managed by public status of project and assignement.
+			//if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+			$sql .= " WHERE p.fk_statut = 1";
+			$sql .= " AND p.entity IN (".getEntity('project').')';
+			if (!empty($projectsListId)) $sql .= " AND p.rowid IN (".$projectsListId.")";
+			// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
+			//if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+			// For external user, no check is done on company permission because readability is managed by public status of project and assignement.
+			//if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
+
+			//print $sql;
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$project_static = new Project($this->db);
+
+				$response = new WorkboardResponse();
+				$response->warning_delay = $conf->projet->warning_delay / 60 / 60 / 24;
+				$response->label = $langs->trans("OpenedProjects");
+				$response->labelShort = $langs->trans("Opened");
+				if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/list.php?search_status=1&mainmenu=project';
+				else $response->url = DOL_URL_ROOT.'/projet/list.php?search_project_user=-1&search_status=1&mainmenu=project';
+				$response->img = img_object('', "projectpub");
+
+				// This assignment in condition is not a bug. It allows walking the results.
+				while ($obj = $this->db->fetch_object($resql))
+				{
+					$response->nbtodo++;
+
+					$project_static->statut = $obj->status;
+					$project_static->opp_status = $obj->opp_status;
+					$project_static->datee = $this->db->jdate($obj->datee);
+
+					if ($project_static->hasDelay()) {
+						$response->nbtodolate++;
+					}
+				}
+
+				return $response;
+			}
+			else
+			{
+				$this->error = $this->db->error();
+				return -1;
+			}
+		}
+
+
+		/**
+		 * Function used to replace a thirdparty id with another one.
+		 *
+		 * @param DoliDB $db Database handler
+		 * @param int $origin_id Old thirdparty id
+		 * @param int $dest_id New thirdparty id
+		 * @return bool
+		 */
+		public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+		{
+			$tables = array(
+				'projet'
+			);
+
+			return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+		}
+
+
+		// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+		/**
+		 * Charge indicateurs this->nb pour le tableau de bord
+		 *
+		 * @return     int         <0 if KO, >0 if OK
+		 */
+		public function load_state_board()
+		{
+			// phpcs:enable
+			global $user;
+
+			$this->nb = array();
+
+			$sql = "SELECT count(p.rowid) as nb";
+			$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+			$sql .= " WHERE";
+			$sql .= " p.entity IN (".getEntity('project').")";
+			if (!$user->rights->projet->all->lire)
+			{
+				$projectsListId = $this->getProjectsAuthorizedForUser($user, 0, 1);
+				$sql .= "AND p.rowid IN (".$projectsListId.")";
+			}
+
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				while ($obj = $this->db->fetch_object($resql))
+				{
+					$this->nb["projects"] = $obj->nb;
+				}
+				$this->db->free($resql);
+				return 1;
+			}
+			else
+			{
+				dol_print_error($this->db);
+				$this->error = $this->db->error();
+				return -1;
+			}
+		}
+
+
+		/**
+		 * Is the project delayed?
+		 *
+		 * @return bool
+		 */
+		public function hasDelay()
+		{
+			global $conf;
+
+			if (!($this->statut == self::STATUS_VALIDATED)) return false;
+			if (!$this->datee && !$this->date_end) return false;
+
+			$now = dol_now();
+
+			return ($this->datee ? $this->datee : $this->date_end) < ($now - $conf->projet->warning_delay);
+		}
+
+
+		/**
+		 *	Charge les informations d'ordre info dans l'objet commande
+		 *
+		 *	@param  int		$id       Id of order
+		 *	@return	void
+		 */
+		public function info($id)
+		{
+			$sql = 'SELECT c.rowid, datec as datec, tms as datem,';
+			$sql .= ' date_close as datecloture,';
+			$sql .= ' fk_user_creat as fk_user_author, fk_user_close as fk_use_cloture';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as c';
+			$sql .= ' WHERE c.rowid = '.$id;
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				if ($this->db->num_rows($result))
+				{
+					$obj = $this->db->fetch_object($result);
+					$this->id = $obj->rowid;
+					if ($obj->fk_user_author)
+					{
+						$cuser = new User($this->db);
+						$cuser->fetch($obj->fk_user_author);
+						$this->user_creation = $cuser;
+					}
+
+					if ($obj->fk_user_cloture)
+					{
+						$cluser = new User($this->db);
+						$cluser->fetch($obj->fk_user_cloture);
+						$this->user_cloture = $cluser;
+					}
+
+					$this->date_creation     = $this->db->jdate($obj->datec);
+					$this->date_modification = $this->db->jdate($obj->datem);
+					$this->date_cloture      = $this->db->jdate($obj->datecloture);
+				}
+
+				$this->db->free($result);
+			}
+			else
+			{
+				dol_print_error($this->db);
+			}
+		}
+
+		/**
+		 * Sets object to supplied categories.
+		 *
+		 * Deletes object from existing categories not supplied.
+		 * Adds it to non existing supplied categories.
+		 * Existing categories are left untouch.
+		 *
+		 * @param int[]|int $categories Category or categories IDs
+		 * @return void
+		 */
+		public function setCategories($categories)
+		{
+			$type_categ = Categorie::TYPE_PROJECT;
+
+			// Handle single category
+			if (!is_array($categories)) {
+				$categories = array($categories);
+			}
+
+			// Get current categories
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+			$c = new Categorie($this->db);
+			$existing = $c->containing($this->id, $type_categ, 'id');
+
+			// Diff
+			if (is_array($existing)) {
+				$to_del = array_diff($existing, $categories);
+				$to_add = array_diff($categories, $existing);
+			} else {
+				$to_del = array(); // Nothing to delete
+				$to_add = $categories;
+			}
+
+			// Process
+			foreach ($to_del as $del) {
+				if ($c->fetch($del) > 0) {
+					$result = $c->del_type($this, $type_categ);
+					if ($result < 0) {
+						$this->errors = $c->errors;
+						$this->error = $c->error;
+						return -1;
+					}
+				}
+			}
+			foreach ($to_add as $add) {
+				if ($c->fetch($add) > 0) {
+					$result = $c->add_type($this, $type_categ);
+					if ($result < 0) {
+						$this->errors = $c->errors;
+						$this->error = $c->error;
+						return -1;
+					}
+				}
+			}
+
+			return 1;
+		}
+
+
+		/**
+		 * 	Create an array of tasks of current project
+		 *
+		 *  @param  User   $user       Object user we want project allowed to
+		 * 	@return int		           >0 if OK, <0 if KO
+		 */
+		public function getLinesArray($user)
+		{
+			require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+			$taskstatic = new Task($this->db);
+
+			$this->lines = $taskstatic->getTasksArray(0, $user, $this->id, 0, 0);
+		}
 }

From c5e341883dbafe48040d28e12dd81c0e581c50cf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 19 May 2020 23:22:40 +0200
Subject: [PATCH 301/490] Fix popup of supplier invoice

---
 htdocs/core/lib/functions.lib.php                | 10 ++++++----
 htdocs/fourn/class/fournisseur.facture.class.php |  6 +++---
 htdocs/fourn/facture/list.php                    |  3 +++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c2cad773af6..e3059ade21e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3162,7 +3162,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
         		'object_margin', 'object_money-bill-alt', 'object_multicurrency', 'object_order', 'object_payment',
         		'object_lot', 'object_mrp', 'object_payment', 'object_product', 'object_propal',
         		'object_other', 'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
-        		'object_shipment', 'object_supplier_invoice', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',
+        		'object_shipment', 'object_supplier_invoice', 'object_supplier_invoicea', 'object_supplier_invoiced', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',
         		'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member',
         		'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website',
         		'off', 'on', 'order',
@@ -3189,7 +3189,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 		    $arrayconvpictotofa = array(
 		    	'account'=>'university', 'accountancy'=>'money-check-alt', 'action'=>'calendar-alt', 'address'=> 'address-book',
-		    	'bank_account'=>'university', 'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'billd'=>'file-medical', 'bom'=>'cubes',
+		    	'bank_account'=>'university', 'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'supplier_invoicea'=>'file-excel', 'billd'=>'file-medical', 'supplier_invoiced'=>'file-medical', 'bom'=>'cubes',
 		    	'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'conversation'=>'comments', 'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd',
 		    	'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins',
 		    	'accounting'=>'chart-line', 'category'=>'tag', 'dollyrevert'=>'dolly',
@@ -3263,7 +3263,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			// Add CSS
 			$arrayconvpictotomorcess = array(
 				'action'=>'bg-infobox-action', 'account'=>'bg-infobox-bank_account', 'accountancy'=>'bg-infobox-bank_account',
-				'bank_account'=>'bg-infobox-bank_account', 'bill'=>'bg-infobox-commande', 'billa'=>'bg-infobox-commande', 'billd'=>'bg-infobox-commande',
+				'bank_account'=>'bg-infobox-bank_account',
+				'bill'=>'bg-infobox-commande', 'billa'=>'bg-infobox-commande', 'billd'=>'bg-infobox-commande',
 				'cash-register'=>'bg-infobox-bank_account', 'contract'=>'bg-infobox-contrat', 'check'=>'font-status4', 'conversation'=>'bg-infobox-contrat',
 				'donation'=>'bg-infobox-commande', 'dollyrevert'=>'flip', 'ecm'=>'bg-infobox-action',
 				'hrm'=>'bg-infobox-adherent', 'group'=>'bg-infobox-adherent', 'intervention'=>'bg-infobox-contrat',
@@ -3275,7 +3276,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'holiday'=>'bg-infobox-holiday', 'invoice'=>'bg-infobox-commande',
 				'payment'=>'bg-infobox-bank_account', 'poll'=>'bg-infobox-adherent', 'project'=>'bg-infobox-project', 'projecttask'=>'bg-infobox-project', 'propal'=>'bg-infobox-propal',
 				'resource'=>'bg-infobox-action',
-				'supplier_invoice'=>'bg-infobox-order_supplier', 'supplier_order'=>'bg-infobox-order_supplier', 'supplier_proposal'=>'bg-infobox-supplier_proposal',
+				'supplier_invoice'=>'bg-infobox-order_supplier', 'supplier_invoicea'=>'bg-infobox-order_supplier', 'supplier_invoiced'=>'bg-infobox-order_supplier',
+				'supplier_order'=>'bg-infobox-order_supplier', 'supplier_proposal'=>'bg-infobox-supplier_proposal',
 				'ticket'=>'bg-infobox-contrat', 'title_accountancy'=>'bg-infobox-bank_account', 'title_hrm'=>'bg-infobox-holiday', 'trip'=>'bg-infobox-expensereport', 'title_agenda'=>'bg-infobox-action',
 				//'title_setup'=>'bg-infobox-action', 'tools'=>'bg-infobox-action',
 				'list-alt'=>'imgforviewmode', 'calendar'=>'imgforviewmode', 'calendarweek'=>'imgforviewmode', 'calendarmonth'=>'imgforviewmode', 'calendarday'=>'imgforviewmode', 'calendarperuser'=>'imgforviewmode'
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 52d1b9bf326..37dbc2752ca 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -2356,6 +2356,9 @@ class FactureFournisseur extends CommonInvoice
         if ($this->type == self::TYPE_DEPOSIT)     $picto .= 'd'; // Deposit invoice
 
         $label = '<u>'.$langs->trans("SupplierInvoice").'</u>';
+        if ($this->type == self::TYPE_REPLACEMENT) $label = '<u>'.$langs->transnoentitiesnoconv("InvoiceReplace").'</u>';
+        elseif ($this->type == self::TYPE_CREDIT_NOTE) $label = '<u>'.$langs->transnoentitiesnoconv("CreditNote").'</u>';
+        elseif ($this->type == self::TYPE_DEPOSIT)     $label = '<u>'.$langs->transnoentitiesnoconv("Deposit").'</u>';
         if (!empty($this->ref))
             $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
         if (!empty($this->ref_supplier))
@@ -2370,9 +2373,6 @@ class FactureFournisseur extends CommonInvoice
             $label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
         if (!empty($this->total_ttc))
             $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-        if ($this->type == self::TYPE_REPLACEMENT) $label = $langs->transnoentitiesnoconv("ShowInvoiceReplace").': '.$this->ref;
-        elseif ($this->type == self::TYPE_CREDIT_NOTE) $label = $langs->transnoentitiesnoconv("ShowInvoiceAvoir").': '.$this->ref;
-        elseif ($this->type == self::TYPE_DEPOSIT)     $label = $langs->transnoentitiesnoconv("ShowInvoiceDeposit").': '.$this->ref;
         if ($moretitle) $label .= ' - '.$moretitle;
         if (isset($this->statut) && isset($this->alreadypaid)) {
         	$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5, $this->alreadypaid);
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index e3f331757ba..164255d4a61 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -955,6 +955,9 @@ if ($resql)
 			$multicurrency_remaintopay = price2num($facturestatic->multicurrency_total_ttc - $multicurrency_totalpay);
 
 			$facturestatic->alreadypaid = ($paiement ? $paiement : 0);
+			$facturestatic->paye = $obj->paye;
+			$facturestatic->statut = $obj->fk_statut;
+			$facturestatic->type = $obj->type;
 
 
             //If invoice has been converted and the conversion has been used, we dont have remain to pay on invoice

From 51ed77fbf7c5ecf9e3b9b01d7decc2f470f35863 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 May 2020 09:59:01 +0200
Subject: [PATCH 302/490] Fix

---
 htdocs/install/mysql/migration/11.0.0-12.0.0.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 7daf41a05d3..b20d3d9c782 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -64,6 +64,9 @@ create table llx_facturedet_rec_extrafields
 
 ALTER TABLE llx_facturedet_rec_extrafields ADD INDEX idx_facturedet_rec_extrafields (fk_object);
 
+-- This var is per entity now, so we remove const if global if exists
+delete from llx_const where name = 'PROJECT_HIDE_TASKS' and entity = 0;
+
 
 -- For v12
 

From 66df82f9e0e6137cc88fd4e7f4e97904920a7e83 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 May 2020 12:38:38 +0200
Subject: [PATCH 303/490] Better management of absolute url for canonical link
 tag

---
 htdocs/core/lib/website.lib.php  | 8 ++++++--
 htdocs/core/lib/website2.lib.php | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 1075a91ebc0..1864ca27bea 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -219,6 +219,7 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 {
 	global $db, $langs, $conf, $user;
 	global $dolibarr_main_url_root, $dolibarr_main_data_root;
+	global $website;
 	global $includehtmlcontentopened;
 
 	$nbrep = 0;
@@ -244,8 +245,6 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 	}
 	elseif (defined('USEDOLIBARRSERVER'))	// REPLACEMENT OF LINKS When page called from Dolibarr server
 	{
-		global $website;
-
 		$content = str_replace('<link rel="stylesheet" href="/styles.css', '<link rel="stylesheet" href="styles.css', $content);
 
 		// Protect the link styles.css.php to any replacement that we make after.
@@ -304,6 +303,11 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 	else									// REPLACEMENT OF LINKS When page called from virtual host
 	{
 		$symlinktomediaexists = 1;
+		if ($website->virtualhost) {
+			$content = preg_replace('/^(<link[^>]*rel="canonical" href=")\//m', '\1'.$website->virtualhost.'/', $content, -1, $nbrep);
+		}
+		//print 'rrrrrrrrr'.$website->virtualhost.$content;
+
 
 		// Make a change into HTML code to allow to include images from medias directory correct with direct link for virtual server
 		// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index ce1f27b49fc..33093fb953c 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -197,7 +197,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
 	}
 	// Add canonical reference
 	if ($object->virtualhost) {
-		$tplcontent .= '<link rel="canonical" href="'.$object->virtualhost.(($objectpage->id == $object->fk_default_home) ? '/' : (($shortlangcode != substr($object->lang, 0, 2) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php')).'" />'."\n";
+		$tplcontent .= '<link rel="canonical" href="'.(($objectpage->id == $object->fk_default_home) ? '/' : (($shortlangcode != substr($object->lang, 0, 2) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php')).'" />'."\n";
 	}
 	// Add manifest.json on homepage
 	$tplcontent .= '<?php if ($website->use_manifest) { print \'<link rel="manifest" href="/manifest.json.php" />\'."\n"; } ?>'."\n";

From 00f189c921ff237c360b6525c53387017d5a5694 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 May 2020 13:19:32 +0200
Subject: [PATCH 304/490] Introduce button to allow migration of files from old
 version at once

---
 htdocs/website/class/website.class.php | 82 +++++++++++++++++++++++++-
 htdocs/website/index.php               | 21 ++++++-
 2 files changed, 100 insertions(+), 3 deletions(-)

diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index be91f6640a1..d579a8b3153 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -1206,12 +1206,12 @@ class Website extends CommonObject
 					$newid = ($reg[2] + $maxrowid);
 					$aliasesarray = explode(',', $reg[3]);
 
-					$objectpagestatic->fetch($newid);
-
 					dol_syslog("Found ID ".$oldid." to replace with ID ".$newid." and shortcut aliases to create: ".$reg[3]);
 
 					dol_move($conf->website->dir_output.'/'.$object->ref.'/page'.$oldid.'.tpl.php', $conf->website->dir_output.'/'.$object->ref.'/page'.$newid.'.tpl.php', 0, 1, 0, 0);
 
+					$objectpagestatic->fetch($newid);
+
 					// The move is not enough, so we regenerate page
 					$filetpl = $conf->website->dir_output.'/'.$object->ref.'/page'.$newid.'.tpl.php';
 					$result = dolSavePageContent($filetpl, $object, $objectpagestatic);
@@ -1270,6 +1270,84 @@ class Website extends CommonObject
 		}
 	}
 
+	/**
+	 * Rebuild all files of a containers of a website. TODO Add other files too.
+	 * Note: Files are already regenerated during importWebSite so this function is useless when importing a website.
+	 *
+	 * @return 	int						<0 if KO, >0 if OK
+	 */
+	public function rebuildWebSiteFiles()
+	{
+		global $conf;
+
+		$error = 0;
+
+		$object = $this;
+		if (empty($object->ref))
+		{
+			$this->error = 'Function importWebSite called on object not loaded (object->ref is empty)';
+			return -1;
+		}
+
+		$objectpagestatic = new WebsitePage($this->db);
+
+		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'website_page WHERE fk_website = '.$this->id;
+
+		$resql = $this->db->query($sql);
+		if (! $resql) {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+
+		$num = $this->db->num_rows($resql);
+
+		$i=0;
+		while ($i < $num) {
+			$obj = $this->db->fetch_object($resql);
+
+			$newid = $obj->rowid;
+
+			$objectpagestatic->fetch($newid);
+
+			$aliasesarray = explode(',', $objectpagestatic->aliasalt);
+
+			$filetpl = $conf->website->dir_output.'/'.$object->ref.'/page'.$newid.'.tpl.php';
+			$result = dolSavePageContent($filetpl, $object, $objectpagestatic);
+			if (!$result) {
+				$this->errors[] = 'Failed to write file '.basename($filetpl);
+				$error++;
+			}
+
+			// Regenerate alternative aliases pages
+			if (is_array($aliasesarray))
+			{
+				foreach ($aliasesarray as $aliasshortcuttocreate)
+				{
+					if (trim($aliasshortcuttocreate))
+					{
+						$filealias = $conf->website->dir_output.'/'.$object->ref.'/'.trim($aliasshortcuttocreate).'.php';
+						$result = dolSavePageAlias($filealias, $object, $objectpagestatic);
+						if (!$result) {
+							$this->errors[] = 'Failed to write file '.basename($filealias);
+							$error++;
+						}
+					}
+				}
+			}
+
+			$i++;
+		}
+
+		if ($error)
+		{
+			return -1;
+		}
+		else
+		{
+			return 1;
+		}
+	}
+
 	/**
 	 * Return if web site is a multilanguage web site. Return false if there is only 0 or 1 language.
 	 *
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index a48b6d92548..8a6aa296efb 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -1946,7 +1946,23 @@ if ($action == 'exportsite')
 	else
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
-		$action = '';
+		$action = 'preview';
+	}
+}
+
+// Regenerate site
+if ($action == 'regeneratesite')
+{
+	$result = $object->rebuildWebSiteFiles();
+	if ($result > 0)
+	{
+		setEventMessages($langs->trans("PagesRegenerated"), null, 'mesgs');
+		$action = 'preview';
+	}
+	else
+	{
+		setEventMessages($object->error, $object->errors, 'errors');
+		$action = 'preview';
 	}
 }
 
@@ -2254,6 +2270,9 @@ if (!GETPOST('hide_websitemenu'))
 		*/
 
 		print '<a href="'.$_SERVER["PHP_SEFL"].'?action=replacesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("ReplaceWebsiteContent")).'"><span class="fa fa-search"><span></a>';
+		if (! empty($conf->global->WEBSITE_ADD_REGENERATE_BUTTON)) {
+			print '<a href="'.$_SERVER["PHP_SEFL"].'?action=regeneratesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("RegenerateWebsiteContent")).'"><span class="fa fa-cogs"><span></a>';
+		}
 	}
 
 	print '</span>';

From 55def0248ce74e462536cdc7ad2b798e2fb1853b Mon Sep 17 00:00:00 2001
From: altairis <contact@altairis.fr>
Date: Wed, 20 May 2020 14:37:35 +0200
Subject: [PATCH 305/490] fix missing rollbacks

---
 htdocs/fourn/class/fournisseur.commande.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 538af54fe23..092c3df8dc2 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1815,7 +1815,6 @@ class CommandeFournisseur extends CommonOrder
 					if ($result < 0)
                     {
                         $error++;
-                        return -1;
                     }
 					// End call triggers
                 }
@@ -1923,6 +1922,7 @@ class CommandeFournisseur extends CommonOrder
             {
             	$this->errors[]='ErrorWhenRunningTrigger';
             	dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
+            	$this->db->rollback();
             	return -1;
             }
             // End call triggers

From 434341316bbee837d24e168e7f261f2cff3ac451 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 May 2020 19:51:04 +0200
Subject: [PATCH 306/490] suggest some fix to debug situation invoices

---
 htdocs/core/tpl/objectline_title.tpl.php  | 2 +-
 htdocs/install/mysql/migration/repair.sql | 5 +++++
 htdocs/langs/en_US/bills.lang             | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index fd848764721..c2f2dbb3d42 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -83,7 +83,7 @@ print '<td class="linecoldiscount right">'.$langs->trans('ReductionShort').'</td
 // Fields for situation invoice
 if ($this->situation_cycle_ref) {
 	print '<td class="linecolcycleref right">' . $langs->trans('Progress') . '</td>';
-	print '<td class="linecolcycleref2 right">' . $langs->trans('TotalHT100Short') . '</td>';
+	print '<td class="linecolcycleref2 right">' . $form->textwithpicto($langs->trans('TotalHT100Short'), $langs->trans('UnitPriceXQtyLessDiscount')) . '</td>';
 }
 
 if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 64e81e30329..fe0eaff767a 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -475,6 +475,11 @@ UPDATE llx_accounting_bookkeeping set date_creation = tms where date_creation IS
 -- UPDATE llx_facturedet_rec set label = NULL WHERE label IS NOT NULL;
 
 
+-- Test inconsistency of data into situation invoices: If it differs, it may be the total_ht that is wrong and situation_percent that is good.
+-- select f.rowid, f.type, qty, subprice, situation_percent, total_ht, total_ttc, total_tva, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc, (situation_percent  / 100 * subprice * qty * (1 - (fd.remise_percent / 100)))
+-- from llx_facturedet as fd, llx_facture as f where fd.fk_facture = f.rowid AND (total_ht - situation_percent  / 100 * subprice * qty * (1 - (fd.remise_percent / 100))) > 0.01 and f.type = 5;
+
+
 
 -- Note to migrate from old counter aquarium to new one
 -- drop table tmp;
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index ddef01b17c1..3f6dc358d2f 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -554,4 +554,5 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
-BILL_DELETEInDolibarr=Invoice deleted
\ No newline at end of file
+BILL_DELETEInDolibarr=Invoice deleted
+UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
\ No newline at end of file

From 16cc94660893f1fe3e7e14c999dba0f82bcc430a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 20 May 2020 20:13:42 +0200
Subject: [PATCH 307/490] Update datapolicycron.class.php

---
 htdocs/datapolicy/class/datapolicycron.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php
index 409df1362e9..8e3cfe10874 100644
--- a/htdocs/datapolicy/class/datapolicycron.class.php
+++ b/htdocs/datapolicy/class/datapolicycron.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2018       Nicolas ZABOURI     <info@inovea-conseil.com>
- * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France     <frederic.france@netlogic.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
@@ -482,7 +482,7 @@ class DataPolicyCron
 
                     while ($i < $num && !$error)
                     {
-                        $obj = $db->fetch_object($resql);
+                        $obj = $this->db->fetch_object($resql);
 
                         $object->fetch($obj->rowid);
                         $object->id = $obj->rowid;

From e7714acc77395b602616e9391d5b1400c0f16f50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 20 May 2020 20:19:00 +0200
Subject: [PATCH 308/490] Update paymentloan.class.php

same picto in loan
---
 htdocs/loan/class/paymentloan.class.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index ce152317710..0aa5b2dbf62 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2014-2018  Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2015-2018  Frederic France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2015-2020  Frederic France      <frederic.france@netlogic.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 +40,11 @@ class PaymentLoan extends CommonObject
 	 */
 	public $table_element = 'payment_loan';
 
+    /**
+     * @var string String with name of icon for PaymentLoan
+     */
+    public $picto = 'money-bill-alt';
+
     /**
      * @var int Loan ID
      */

From d66f54d06d9622b2b41da7d046c1eaa7671233d8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 May 2020 22:45:43 +0200
Subject: [PATCH 309/490] Clean home page

---
 htdocs/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/index.php b/htdocs/index.php
index 7f6e462839b..2301a841ddc 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -80,7 +80,7 @@ llxHeader('', $title);
 $resultboxes = FormOther::getBoxesArea($user, "0"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
 
 
-print load_fiche_titre($langs->trans("HomeArea"), $resultboxes['selectboxlist'], 'home', 0, '', 'titleforhome');
+print load_fiche_titre('&nbsp;', $resultboxes['selectboxlist'], '', 0, '', 'titleforhome');
 
 if (!empty($conf->global->MAIN_MOTD))
 {

From 358054908fbb5e966cb9fc26c685b39e92abca39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 20 May 2020 22:59:23 +0200
Subject: [PATCH 310/490] Update AccountingAccountTest.php

---
 test/phpunit/AccountingAccountTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/AccountingAccountTest.php b/test/phpunit/AccountingAccountTest.php
index b4367e96f49..622bd346872 100644
--- a/test/phpunit/AccountingAccountTest.php
+++ b/test/phpunit/AccountingAccountTest.php
@@ -204,7 +204,7 @@ class AccountingAccountTest extends PHPUnit\Framework\TestCase
         $localobject->label='New label';
         $result=$localobject->update($user);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 
         return $localobject->id;

From 86e220dd40be45b964177e8623cd3b8f67435c6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 20 May 2020 23:00:52 +0200
Subject: [PATCH 311/490] Update ActionCommTest.php

---
 test/phpunit/ActionCommTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/ActionCommTest.php b/test/phpunit/ActionCommTest.php
index 0dd4946f69c..abebfd728bf 100644
--- a/test/phpunit/ActionCommTest.php
+++ b/test/phpunit/ActionCommTest.php
@@ -223,7 +223,7 @@ class ActionCommTest extends PHPUnit\Framework\TestCase
     	$result=$localobject->update($user);
 
     	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
+    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
     	return $localobject->id;
     }
 

From 3ea613896e253d3f3913498829735de49259386b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 20 May 2020 23:04:38 +0200
Subject: [PATCH 312/490] Update CommandeTest.php

---
 test/phpunit/CommandeTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/CommandeTest.php b/test/phpunit/CommandeTest.php
index 990ef41f0b7..1decbe4e201 100644
--- a/test/phpunit/CommandeTest.php
+++ b/test/phpunit/CommandeTest.php
@@ -196,7 +196,7 @@ class CommandeTest extends PHPUnit\Framework\TestCase
     	$result=$localobject->update($user);
 
     	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
+    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
     	return $localobject;
     }
 

From c4d1db263c4e1dc961e0b1f21da104863175be91 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 May 2020 23:15:18 +0200
Subject: [PATCH 313/490] Fix end of workflow of MO

---
 htdocs/langs/en_US/agenda.lang |  2 ++
 htdocs/mrp/class/mo.class.php  |  6 +++---
 htdocs/mrp/mo_card.php         | 34 +++++++++++++++++++++++++++++++++-
 htdocs/mrp/mo_production.php   | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index f4c8c5b4fbc..6463b4eb9a0 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -112,8 +112,10 @@ BOM_CLOSEInDolibarr=BOM disabled
 BOM_REOPENInDolibarr=BOM reopen
 BOM_DELETEInDolibarr=BOM deleted
 MRP_MO_VALIDATEInDolibarr=MO validated
+MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
+MRP_MO_CANCELInDolibarr=MO canceled
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 07c6eae52a1..e16f7fec71a 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -929,7 +929,7 @@ class Mo extends CommonObject
 		 return -1;
 		 }*/
 
-		return $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'MO_UNVALIDATE');
+		return $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'MRP_MO_UNVALIDATE');
 	}
 
 	/**
@@ -954,7 +954,7 @@ class Mo extends CommonObject
 		 return -1;
 		 }*/
 
-		return $this->setStatusCommon($user, self::STATUS_CANCELED, $notrigger, 'MO_CLOSE');
+		return $this->setStatusCommon($user, self::STATUS_CANCELED, $notrigger, 'MRP_MO_CANCEL');
 	}
 
 	/**
@@ -967,7 +967,7 @@ class Mo extends CommonObject
 	public function reopen($user, $notrigger = 0)
 	{
 		// Protection
-		if ($this->status != self::STATUS_CANCELED)
+		if ($this->status != self::STATUS_PRODUCED && $this->status != self::STATUS_CANCELED)
 		{
 			return 0;
 		}
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 86b2b886dea..0e2cc09e811 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -169,6 +169,35 @@ if (empty($reshook))
     {
     	$object->setProject(GETPOST('projectid', 'int'));
     }
+
+    // Action close produced
+    if ($action == 'confirm_produced' && $confirm == 'yes' && $permissiontoadd)
+    {
+    	$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
+    	if ($result >= 0)
+    	{
+    		// Define output language
+    		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+    		{
+    			$outputlangs = $langs;
+    			$newlang = '';
+    			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+    			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+    			if (!empty($newlang)) {
+    				$outputlangs = new Translate("", $conf);
+    				$outputlangs->setDefaultLang($newlang);
+    			}
+    			$model = $object->modelpdf;
+    			$ret = $object->fetch($id); // Reload to get new records
+
+    			$object->generateDocument($model, $outputlangs, 0, 0, 0);
+    		}
+    	}
+    	else
+    	{
+    		setEventMessages($object->error, $object->errors, 'errors');
+    	}
+    }
 }
 
 
@@ -630,10 +659,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		{
     			if ($object->status == $object::STATUS_VALIDATED || $object->status == $object::STATUS_INPROGRESS)
     			{
+    				// TODO If production is already > 1, show only close, else show cancel
+    				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_produced&confirm=yes">'.$langs->trans("Close").'</a>'."\n";
+
     				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_close&confirm=yes">'.$langs->trans("Cancel").'</a>'."\n";
     			}
 
-    			if ($object->status == $object::STATUS_CANCELED)
+    			if ($object->status == $object::STATUS_PRODUCED || $object->status == $object::STATUS_CANCELED)
     			{
     				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen&confirm=yes">'.$langs->trans("Re-Open").'</a>'."\n";
     			}
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index f762ca9291c..9f05283345a 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -383,6 +383,35 @@ if (empty($reshook))
     		exit;
     	}
     }
+
+    // Action close produced
+    if ($action == 'confirm_produced' && $confirm == 'yes' && $permissiontoadd)
+    {
+    	$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
+    	if ($result >= 0)
+    	{
+    		// Define output language
+    		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+    		{
+    			$outputlangs = $langs;
+    			$newlang = '';
+    			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+    			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+    			if (!empty($newlang)) {
+    				$outputlangs = new Translate("", $conf);
+    				$outputlangs->setDefaultLang($newlang);
+    			}
+    			$model = $object->modelpdf;
+    			$ret = $object->fetch($id); // Reload to get new records
+
+    			$object->generateDocument($model, $outputlangs, 0, 0, 0);
+    		}
+    	}
+    	else
+    	{
+    		setEventMessages($object->error, $object->errors, 'errors');
+    	}
+    }
 }
 
 
@@ -599,6 +628,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			{
 				if ($object->status == $object::STATUS_VALIDATED || $object->status == $object::STATUS_INPROGRESS)
 				{
+					// TODO If production is already > 1, show only close, else show cancel
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_produced&confirm=yes">'.$langs->trans("Close").'</a>'."\n";
+
 					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_close&confirm=yes">'.$langs->trans("Cancel").'</a>'."\n";
 				}
 

From e42fb1b57d299d6ba8a7fb2742460fc71dc1ef36 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 May 2020 23:15:56 +0200
Subject: [PATCH 314/490] Fix trigger name

---
 htdocs/mrp/class/mo.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index e16f7fec71a..89e9b25abef 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -979,7 +979,7 @@ class Mo extends CommonObject
 		 return -1;
 		 }*/
 
-		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'MO_REOPEN');
+		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'MRP_MO_REOPEN');
 	}
 
     /**

From 650bddde0d6942fcaa7fe2d383a2ebb7b2d485e1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 May 2020 23:25:10 +0200
Subject: [PATCH 315/490] Fix phpcs

---
 htdocs/projet/class/project.class.php | 125 +++++++++++++-------------
 1 file changed, 64 insertions(+), 61 deletions(-)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 78f5bac2fe7..1e6c675d6fe 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1047,76 +1047,79 @@ class Project extends CommonObject
 		if ($option != 'nolink') $label = '<u>'.$langs->trans("ShowProject").'</u>';
 		$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('Ref').': </b>'.$this->ref; // The space must be after the : to not being explode when showing the title in img_picto
 		$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('Label').': </b>'.$this->title; // The space must be after the : to not being explode when showing the title in img_picto
-		if (!empty($this->thirdparty_name))
+		if (!empty($this->thirdparty_name)) {
 			$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('ThirdParty').': </b>'.$this->thirdparty_name; // The space must be after the : to not being explode when showing the title in img_picto
-			if (!empty($this->dateo))
-				$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('DateStart').': </b>'.dol_print_date($this->dateo, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
-				if (!empty($this->datee))
-					$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('DateEnd').': </b>'.dol_print_date($this->datee, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
-					if ($moreinpopup) $label .= '<br>'.$moreinpopup;
+		}
+		if (!empty($this->dateo)) {
+			$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('DateStart').': </b>'.dol_print_date($this->dateo, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
+		}
+		if (!empty($this->datee)) {
+			$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('DateEnd').': </b>'.dol_print_date($this->datee, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
+		}
+		if ($moreinpopup) $label .= '<br>'.$moreinpopup;
 
-					$url = '';
-					if ($option != 'nolink')
-					{
-						if (preg_match('/\.php$/', $option)) {
-							$url = dol_buildpath($option, 1).'?id='.$this->id;
-						}
-						elseif ($option == 'task')
-						{
-							$url = DOL_URL_ROOT.'/projet/tasks.php?id='.$this->id;
-						}
-						else
-						{
-							$url = DOL_URL_ROOT.'/projet/card.php?id='.$this->id;
-						}
-						// Add param to save lastsearch_values or not
-						$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-						if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-						if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-					}
+		$url = '';
+		if ($option != 'nolink')
+		{
+			if (preg_match('/\.php$/', $option)) {
+				$url = dol_buildpath($option, 1).'?id='.$this->id;
+			}
+			elseif ($option == 'task')
+			{
+				$url = DOL_URL_ROOT.'/projet/tasks.php?id='.$this->id;
+			}
+			else
+			{
+				$url = DOL_URL_ROOT.'/projet/card.php?id='.$this->id;
+			}
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-					$linkclose = '';
-					if (empty($notooltip) && $user->rights->projet->lire)
-					{
-						if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-						{
-							$label = $langs->trans("ShowProject");
-							$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-						}
-						$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-						$linkclose .= ' class="classfortooltip"';
+		$linkclose = '';
+		if (empty($notooltip) && $user->rights->projet->lire)
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowProject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip"';
 
-						/*
-						 $hookmanager->initHooks(array('projectdao'));
-						 $parameters=array('id'=>$this->id);
-						 // Note that $action and $object may have been modified by some hooks
-						 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);
-						 if ($reshook > 0)
-						 $linkclose = $hookmanager->resPrint;
-						 */
-					}
+			/*
+			 $hookmanager->initHooks(array('projectdao'));
+			 $parameters=array('id'=>$this->id);
+			 // Note that $action and $object may have been modified by some hooks
+			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);
+			 if ($reshook > 0)
+			 $linkclose = $hookmanager->resPrint;
+			 */
+		}
 
-					$picto = 'projectpub';
-					if (!$this->public) $picto = 'project';
+		$picto = 'projectpub';
+		if (!$this->public) $picto = 'project';
 
-					$linkstart = '<a href="'.$url.'"';
-					$linkstart .= $linkclose.'>';
-					$linkend = '</a>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
-					$result .= $linkstart;
-					if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-					if ($withpicto != 2) $result .= $this->ref;
-					$result .= $linkend;
-					if ($withpicto != 2) $result .= (($addlabel && $this->title) ? $sep.dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : '');
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
+		$result .= $linkend;
+		if ($withpicto != 2) $result .= (($addlabel && $this->title) ? $sep.dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : '');
 
-					global $action;
-					$hookmanager->initHooks(array('projectdao'));
-					$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
-					$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-					if ($reshook > 0) $result = $hookmanager->resPrint;
-					else $result .= $hookmanager->resPrint;
+		global $action;
+		$hookmanager->initHooks(array('projectdao'));
+		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook > 0) $result = $hookmanager->resPrint;
+		else $result .= $hookmanager->resPrint;
 
-					return $result;
+		return $result;
 	}
 
 	/**

From de11fb2783198bbc4fd0ff2c0458f1132af336aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 May 2020 23:32:13 +0200
Subject: [PATCH 316/490] Fix phpcs

---
 htdocs/core/lib/project.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index bf60968387a..bef3d9fd0dc 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2226,7 +2226,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 				print '<tr class="oddeven">';
 
 				print '<td>';
-				print $projectstatic->getNomUrl(1, '', 0, '', '-', 0 , -1, 'nowraponall');
+				print $projectstatic->getNomUrl(1, '', 0, '', '-', 0, -1, 'nowraponall');
 				if (!in_array('projectlabel', $hiddenfields)) print '<br><span class="opacitymedium">'.dol_trunc($objp->title, 24).'</span>';
 				print '</td>';
 				print '<td class="nowraponall tdoverflowmax100">';

From 92cbff7749c569fea6fb6f66e6c71d7f5beeeccc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 May 2020 23:40:04 +0200
Subject: [PATCH 317/490] Clean code

---
 htdocs/comm/action/class/actioncomm.class.php | 21 ++++---------------
 htdocs/core/modules/action/rapport.pdf.php    |  1 -
 ...terface_50_modAgenda_ActionsAuto.class.php |  1 -
 .../install/mysql/tables/llx_actioncomm.sql   |  1 -
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index bf906989d16..3c060ffdc39 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -177,12 +177,6 @@ class ActionComm extends CommonObject
      */
     public $fulldayevent = 0;
 
-    /**
-     * @var int Milestone
-     * @deprecated Milestone is already event with end date = start date
-     */
-    public $punctual = 1;
-
     /**
      * @var integer Percentage
      */
@@ -384,7 +378,6 @@ class ActionComm extends CommonObject
         if (empty($this->percentage))   $this->percentage = 0;
         if (empty($this->priority) || !is_numeric($this->priority)) $this->priority = 0;
         if (empty($this->fulldayevent)) $this->fulldayevent = 0;
-        if (empty($this->punctual))     $this->punctual = 0;
         if (empty($this->transparency)) $this->transparency = 0;
         if ($this->percentage > 100) $this->percentage = 100;
         //if ($this->percentage == 100 && ! $this->dateend) $this->dateend = $this->date;
@@ -462,7 +455,7 @@ class ActionComm extends CommonObject
         $sql .= "fk_user_author,";
         $sql .= "fk_user_action,";
         $sql .= "fk_user_done,";
-        $sql .= "label,percent,priority,fulldayevent,location,punctual,";
+        $sql .= "label,percent,priority,fulldayevent,location,";
         $sql .= "transparency,";
         $sql .= "fk_element,";
         $sql .= "elementtype,";
@@ -492,7 +485,7 @@ class ActionComm extends CommonObject
         $sql .= (isset($user->id) && $user->id > 0 ? $user->id : "null").", ";
         $sql .= ($userownerid > 0 ? $userownerid : "null").", ";
         $sql .= ($userdoneid > 0 ? $userdoneid : "null").", ";
-        $sql .= "'".$this->db->escape($this->label)."','".$this->db->escape($this->percentage)."','".$this->db->escape($this->priority)."','".$this->db->escape($this->fulldayevent)."','".$this->db->escape($this->location)."','".$this->db->escape($this->punctual)."', ";
+        $sql .= "'".$this->db->escape($this->label)."','".$this->db->escape($this->percentage)."','".$this->db->escape($this->priority)."','".$this->db->escape($this->fulldayevent)."','".$this->db->escape($this->location)."', ";
         $sql .= "'".$this->db->escape($this->transparency)."', ";
         $sql .= (!empty($this->fk_element) ? $this->fk_element : "null").", ";
         $sql .= (!empty($this->elementtype) ? "'".$this->db->escape($this->elementtype)."'" : "null").", ";
@@ -693,7 +686,7 @@ class ActionComm extends CommonObject
         $sql .= " a.fk_user_action, a.fk_user_done,";
         $sql .= " a.fk_contact, a.percent as percentage,";
         $sql .= " a.fk_element as elementid, a.elementtype,";
-        $sql .= " a.priority, a.fulldayevent, a.location, a.punctual, a.transparency,";
+        $sql .= " a.priority, a.fulldayevent, a.location, a.transparency,";
         $sql .= " c.id as type_id, c.code as type_code, c.libelle as type_label, c.color as type_color, c.picto as type_picto,";
         $sql .= " s.nom as socname,";
         $sql .= " u.firstname, u.lastname as lastname";
@@ -758,7 +751,6 @@ class ActionComm extends CommonObject
                 $this->fulldayevent			= $obj->fulldayevent;
                 $this->location				= $obj->location;
                 $this->transparency			= $obj->transparency;
-                $this->punctual				= $obj->punctual; // deprecated
 
                 $this->socid = $obj->fk_soc; // To have fetch_thirdparty method working
                 $this->contactid			= $obj->fk_contact; // To have fetch_contact method working
@@ -1612,7 +1604,7 @@ class ActionComm extends CommonObject
             $sql .= " a.fk_user_action,";
             $sql .= " a.fk_contact, a.percent as percentage,";
             $sql .= " a.fk_element, a.elementtype,";
-            $sql .= " a.priority, a.fulldayevent, a.location, a.punctual, a.transparency,";
+            $sql .= " a.priority, a.fulldayevent, a.location, a.transparency,";
             $sql .= " u.firstname, u.lastname, u.email,";
             $sql .= " s.nom as socname,";
             $sql .= " c.id as type_id, c.code as type_code, c.libelle as type_label";
@@ -1719,7 +1711,6 @@ class ActionComm extends CommonObject
                     $event['fulldayevent'] = $obj->fulldayevent;
                     $event['location'] = $obj->location;
                     $event['transparency'] = (($obj->transparency > 0) ? 'OPAQUE' : 'TRANSPARENT'); // OPAQUE (busy) or TRANSPARENT (not busy)
-                    $event['punctual'] = $obj->punctual;
                     $event['category'] = $obj->type_label;
                     $event['email'] = $obj->email;
 					// Define $urlwithroot
@@ -1929,11 +1920,7 @@ class ActionComm extends CommonObject
         $this->datem = $now;
         $this->datep = $now;
         $this->datef = $now;
-        $this->author = $user;
-        $this->usermod = $user;
-        $this->usertodo = $user;
         $this->fulldayevent = 0;
-        $this->punctual = 0;
         $this->percentage = 0;
         $this->location = 'Location';
         $this->transparency = 1; // 1 means opaque
diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php
index 1fb4e33a6c6..b978bed1eab 100644
--- a/htdocs/core/modules/action/rapport.pdf.php
+++ b/htdocs/core/modules/action/rapport.pdf.php
@@ -255,7 +255,6 @@ class CommActionRapport
 				$eventstatic->id = $obj->id;
 				$eventstatic->percentage = $obj->percent;
 				$eventstatic->fulldayevent = $obj->fulldayevent;
-				$eventstatic->punctual = $obj->punctual;
 
 				$y = max($y, $pdf->GetY(), $y0, $y1, $y2, $y3);
 
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 3206e9377d3..49939277f49 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -898,7 +898,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		$actioncomm->datep       = $now;
 		$actioncomm->datef       = $now;
 		$actioncomm->durationp   = 0;
-		$actioncomm->punctual    = 1;
 		$actioncomm->percentage  = -1; // Not applicable
 		$actioncomm->socid       = $societeforaction->id;
 		$actioncomm->contactid   = $contactforaction->id;
diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql
index 1cd3c9cf27e..8c50964eb59 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.sql
@@ -48,7 +48,6 @@ create table llx_actioncomm
   priority			smallint,						-- priority (ical standard)
   visibility		varchar(12) DEFAULT 'default',	-- visibility (ical standard) - 'default', 'public', 'private', 'confidential'
   fulldayevent		smallint NOT NULL default 0,    -- full day (ical standard)
-  punctual			smallint NOT NULL default 1,    -- deprecated. milestone is event with date start (datep) = date end (datep2)
   percent			smallint NOT NULL default 0,
   location			varchar(128),
   durationp			real,							-- planed duration

From 662970f2328e99dd0165f685442f5c74ee9f9e6e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 May 2020 23:42:28 +0200
Subject: [PATCH 318/490] Clean sql file

---
 htdocs/install/mysql/migration/11.0.0-12.0.0.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index b20d3d9c782..e2112b020b0 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -74,6 +74,8 @@ delete from llx_const where name = 'PROJECT_HIDE_TASKS' and entity = 0;
 -- VMYSQL4.1 DROP INDEX ix_fk_product_stock on llx_product_batch;
 -- VPGSQL8.2 DROP INDEX ix_fk_product_stock
 
+ALTER TABLE llx_actioncomm DROP COLUMN punctual;
+
 DELETE FROM llx_menu where module='supplier_proposal';
 
 UPDATE llx_website SET lang = 'en' WHERE lang like 'en_%';

From 036617570e1649df540a7c8c3f413567b4692fd8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 May 2020 23:46:48 +0200
Subject: [PATCH 319/490] Doc

---
 htdocs/core/class/conf.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index dee4edc3298..10d6fedf0e0 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -1,4 +1,6 @@
 <?php
+use Splash\Tests\WsObjects\O00ObjectBaseTest;
+
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Xavier Dutoit        <doli@sydesy.com>
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
@@ -37,7 +39,7 @@ class Conf
     public $file;
 
     /**
-     * @var DoliDB Database handler.
+     * @var Object 	Associative array with some properties ->type, ->db, ...
      */
     public $db;
 

From a78bc86465e35bc411b70012bb29e0d62f2fa3eb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 May 2020 23:51:46 +0200
Subject: [PATCH 320/490] Trans

---
 htdocs/langs/en_US/accountancy.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 92cc0f0c79e..fea7bf9d0ef 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -58,8 +58,8 @@ AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in f
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
 
 AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
-AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
-AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
+AccountancyAreaDescChartModel=STEP %s: Check that a model of chart of account exists or create one from menu %s
+AccountancyAreaDescChart=STEP %s: Select and|or complete your chart of account from menu %s
 
 AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
 AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.

From 9e3e8df60fa6260ae2581b8212a55c163ae7e6cb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 May 2020 23:56:06 +0200
Subject: [PATCH 321/490] Fix phpcs

---
 htdocs/projet/class/project.class.php | 1576 ++++++++++++-------------
 1 file changed, 788 insertions(+), 788 deletions(-)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 1e6c675d6fe..a5e1c197f8b 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1215,875 +1215,875 @@ class Project extends CommonObject
 			//		$userAccess = 1;
 				//	}
 				//}
-			}
-
-			return ($userAccess ? $userAccess : -1);
 		}
 
-		/**
-		 * Return array of projects a user has permission on, is affected to, or all projects
-		 *
-		 * @param 	User	$user			User object
-		 * @param 	int		$mode			0=All project I have permission on (assigned to me or public), 1=Projects assigned to me only, 2=Will return list of all projects with no test on contacts
-		 * @param 	int		$list			0=Return array, 1=Return string list
-		 * @param	int		$socid			0=No filter on third party, id of third party
-		 * @param	string	$filter			additionnal filter on project (statut, ref, ...)
-		 * @return 	array or string			Array of projects id, or string with projects id separated with "," if list is 1
-		 */
-		public function getProjectsAuthorizedForUser($user, $mode = 0, $list = 0, $socid = 0, $filter = '')
+		return ($userAccess ? $userAccess : -1);
+	}
+
+	/**
+	 * Return array of projects a user has permission on, is affected to, or all projects
+	 *
+	 * @param 	User	$user			User object
+	 * @param 	int		$mode			0=All project I have permission on (assigned to me or public), 1=Projects assigned to me only, 2=Will return list of all projects with no test on contacts
+	 * @param 	int		$list			0=Return array, 1=Return string list
+	 * @param	int		$socid			0=No filter on third party, id of third party
+	 * @param	string	$filter			additionnal filter on project (statut, ref, ...)
+	 * @return 	array or string			Array of projects id, or string with projects id separated with "," if list is 1
+	 */
+	public function getProjectsAuthorizedForUser($user, $mode = 0, $list = 0, $socid = 0, $filter = '')
+	{
+		$projects = array();
+		$temp = array();
+
+		$sql = "SELECT ".(($mode == 0 || $mode == 1) ? "DISTINCT " : "")."p.rowid, p.ref";
+		$sql.= " FROM " . MAIN_DB_PREFIX . "projet as p";
+		if ($mode == 0)
 		{
-			$projects = array();
-			$temp = array();
+			$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "element_contact as ec ON ec.element_id = p.rowid";
+		}
+		elseif ($mode == 1)
+		{
+			$sql.= ", " . MAIN_DB_PREFIX . "element_contact as ec";
+		}
+		elseif ($mode == 2)
+		{
+			// No filter. Use this if user has permission to see all project
+		}
+		$sql.= " WHERE p.entity IN (".getEntity('project').")";
+		// Internal users must see project he is contact to even if project linked to a third party he can't see.
+		//if ($socid || ! $user->rights->societe->client->voir)	$sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+		if ($socid > 0) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
 
-			$sql = "SELECT ".(($mode == 0 || $mode == 1) ? "DISTINCT " : "")."p.rowid, p.ref";
-			$sql.= " FROM " . MAIN_DB_PREFIX . "projet as p";
-			if ($mode == 0)
+		// Get id of types of contacts for projects (This list never contains a lot of elements)
+		$listofprojectcontacttype=array();
+		$sql2 = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
+		$sql2.= " WHERE ctc.element = '" . $this->db->escape($this->element) . "'";
+		$sql2.= " AND ctc.source = 'internal'";
+		$resql = $this->db->query($sql2);
+		if ($resql)
+		{
+			while($obj = $this->db->fetch_object($resql))
 			{
-				$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "element_contact as ec ON ec.element_id = p.rowid";
+				$listofprojectcontacttype[$obj->rowid]=$obj->code;
 			}
-			elseif ($mode == 1)
-			{
-				$sql.= ", " . MAIN_DB_PREFIX . "element_contact as ec";
-			}
-			elseif ($mode == 2)
-			{
-				// No filter. Use this if user has permission to see all project
-			}
-			$sql.= " WHERE p.entity IN (".getEntity('project').")";
-			// Internal users must see project he is contact to even if project linked to a third party he can't see.
-			//if ($socid || ! $user->rights->societe->client->voir)	$sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-			if ($socid > 0) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
+		}
+		else dol_print_error($this->db);
+		if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0]='0';    // To avoid syntax error if not found
 
-			// Get id of types of contacts for projects (This list never contains a lot of elements)
-			$listofprojectcontacttype=array();
-			$sql2 = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
-			$sql2.= " WHERE ctc.element = '" . $this->db->escape($this->element) . "'";
-			$sql2.= " AND ctc.source = 'internal'";
-			$resql = $this->db->query($sql2);
-			if ($resql)
-			{
-				while($obj = $this->db->fetch_object($resql))
-				{
-					$listofprojectcontacttype[$obj->rowid]=$obj->code;
-				}
-			}
-			else dol_print_error($this->db);
-			if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0]='0';    // To avoid syntax error if not found
-
-			if ($mode == 0)
-			{
-				$sql.= " AND ( p.public = 1";
-				$sql.= " OR ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
-				$sql.= " AND ec.fk_socpeople = ".$user->id.")";
-				$sql.= " )";
-			}
-			elseif ($mode == 1)
-			{
-				$sql.= " AND ec.element_id = p.rowid";
-				$sql.= " AND (";
-				$sql.= "  ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
-				$sql.= " AND ec.fk_socpeople = ".$user->id.")";
-				$sql.= " )";
-			}
-			elseif ($mode == 2)
-			{
-				// No filter. Use this if user has permission to see all project
-			}
-
-			$sql.= $filter;
-			//print $sql;
-
-			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				$num = $this->db->num_rows($resql);
-				$i = 0;
-				while ($i < $num)
-				{
-					$row = $this->db->fetch_row($resql);
-					$projects[$row[0]] = $row[1];
-					$temp[] = $row[0];
-					$i++;
-				}
-
-				$this->db->free($resql);
-
-				if ($list)
-				{
-					if (empty($temp)) return '0';
-					$result = implode(',', $temp);
-					return $result;
-				}
-			}
-			else
-			{
-				dol_print_error($this->db);
-			}
-
-			return $projects;
+		if ($mode == 0)
+		{
+			$sql.= " AND ( p.public = 1";
+			$sql.= " OR ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
+			$sql.= " AND ec.fk_socpeople = ".$user->id.")";
+			$sql.= " )";
+		}
+		elseif ($mode == 1)
+		{
+			$sql.= " AND ec.element_id = p.rowid";
+			$sql.= " AND (";
+			$sql.= "  ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
+			$sql.= " AND ec.fk_socpeople = ".$user->id.")";
+			$sql.= " )";
+		}
+		elseif ($mode == 2)
+		{
+			// No filter. Use this if user has permission to see all project
 		}
 
-		/**
-		 * Load an object from its id and create a new one in database
-		 *
-		 *  @param	User	$user		          User making the clone
-		 *  @param	int		$fromid     	      Id of object to clone
-		 *  @param	bool	$clone_contact	      Clone contact of project
-		 *  @param	bool	$clone_task		      Clone task of project
-		 *  @param	bool	$clone_project_file	  Clone file of project
-		 *  @param	bool	$clone_task_file	  Clone file of task (if task are copied)
-		 *  @param	bool	$clone_note		      Clone note of project
-		 *  @param	bool	$move_date		      Move task date on clone
-		 *  @param	integer	$notrigger		      No trigger flag
-		 *  @param  int     $newthirdpartyid      New thirdparty id
-		 *  @return	int						      New id of clone
-		 */
-		public function createFromClone(User $user, $fromid, $clone_contact = false, $clone_task = true, $clone_project_file = false, $clone_task_file = false, $clone_note = true, $move_date = true, $notrigger = 0, $newthirdpartyid = 0)
+		$sql.= $filter;
+		//print $sql;
+
+		$resql = $this->db->query($sql);
+		if ($resql)
 		{
-			global $langs, $conf;
-
-			$error = 0;
-
-			dol_syslog("createFromClone clone_contact=".$clone_contact." clone_task=".$clone_task." clone_project_file=".$clone_project_file." clone_note=".$clone_note." move_date=".$move_date, LOG_DEBUG);
-
-			$now = dol_mktime(0, 0, 0, idate('m', dol_now()), idate('d', dol_now()), idate('Y', dol_now()));
-
-			$clone_project = new Project($this->db);
-
-			$clone_project->context['createfromclone'] = 'createfromclone';
-
-			$this->db->begin();
-
-			// Load source object
-			$clone_project->fetch($fromid);
-			$clone_project->fetch_optionals();
-			if ($newthirdpartyid > 0) $clone_project->socid = $newthirdpartyid;
-			$clone_project->fetch_thirdparty();
-
-			$orign_dt_start = $clone_project->date_start;
-			$orign_project_ref = $clone_project->ref;
-
-			$clone_project->id = 0;
-			if ($move_date) {
-				$clone_project->date_start = $now;
-				if (!(empty($clone_project->date_end)))
-				{
-					$clone_project->date_end = $clone_project->date_end + ($now - $orign_dt_start);
-				}
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$row = $this->db->fetch_row($resql);
+				$projects[$row[0]] = $row[1];
+				$temp[] = $row[0];
+				$i++;
 			}
 
-			$clone_project->datec = $now;
+			$this->db->free($resql);
 
+			if ($list)
+			{
+				if (empty($temp)) return '0';
+				$result = implode(',', $temp);
+				return $result;
+			}
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+
+		return $projects;
+	}
+
+	/**
+	 * Load an object from its id and create a new one in database
+	 *
+	 *  @param	User	$user		          User making the clone
+	 *  @param	int		$fromid     	      Id of object to clone
+	 *  @param	bool	$clone_contact	      Clone contact of project
+	 *  @param	bool	$clone_task		      Clone task of project
+	 *  @param	bool	$clone_project_file	  Clone file of project
+	 *  @param	bool	$clone_task_file	  Clone file of task (if task are copied)
+	 *  @param	bool	$clone_note		      Clone note of project
+	 *  @param	bool	$move_date		      Move task date on clone
+	 *  @param	integer	$notrigger		      No trigger flag
+	 *  @param  int     $newthirdpartyid      New thirdparty id
+	 *  @return	int						      New id of clone
+	 */
+	public function createFromClone(User $user, $fromid, $clone_contact = false, $clone_task = true, $clone_project_file = false, $clone_task_file = false, $clone_note = true, $move_date = true, $notrigger = 0, $newthirdpartyid = 0)
+	{
+		global $langs, $conf;
+
+		$error = 0;
+
+		dol_syslog("createFromClone clone_contact=".$clone_contact." clone_task=".$clone_task." clone_project_file=".$clone_project_file." clone_note=".$clone_note." move_date=".$move_date, LOG_DEBUG);
+
+		$now = dol_mktime(0, 0, 0, idate('m', dol_now()), idate('d', dol_now()), idate('Y', dol_now()));
+
+		$clone_project = new Project($this->db);
+
+		$clone_project->context['createfromclone'] = 'createfromclone';
+
+		$this->db->begin();
+
+		// Load source object
+		$clone_project->fetch($fromid);
+		$clone_project->fetch_optionals();
+		if ($newthirdpartyid > 0) $clone_project->socid = $newthirdpartyid;
+		$clone_project->fetch_thirdparty();
+
+		$orign_dt_start = $clone_project->date_start;
+		$orign_project_ref = $clone_project->ref;
+
+		$clone_project->id = 0;
+		if ($move_date) {
+			$clone_project->date_start = $now;
+			if (!(empty($clone_project->date_end)))
+			{
+				$clone_project->date_end = $clone_project->date_end + ($now - $orign_dt_start);
+			}
+		}
+
+		$clone_project->datec = $now;
+
+		if (!$clone_note)
+		{
+			$clone_project->note_private = '';
+			$clone_project->note_public = '';
+		}
+
+		//Generate next ref
+		$defaultref = '';
+		$obj = empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
+		// Search template files
+		$file = ''; $classname = ''; $filefound = 0;
+		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+		foreach ($dirmodels as $reldir)
+		{
+			$file = dol_buildpath($reldir."core/modules/project/".$obj.'.php', 0);
+			if (file_exists($file))
+			{
+				$filefound = 1;
+				dol_include_once($reldir."core/modules/project/".$obj.'.php');
+				$modProject = new $obj;
+				$defaultref = $modProject->getNextValue(is_object($clone_project->thirdparty) ? $clone_project->thirdparty : null, $clone_project);
+				break;
+			}
+		}
+		if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
+
+		$clone_project->ref = $defaultref;
+		$clone_project->title = $langs->trans("CopyOf").' '.$clone_project->title;
+
+		// Create clone
+		$result = $clone_project->create($user, $notrigger);
+
+		// Other options
+		if ($result < 0)
+		{
+			$this->error .= $clone_project->error;
+			$error++;
+		}
+
+		if (!$error)
+		{
+			//Get the new project id
+			$clone_project_id = $clone_project->id;
+
+			//Note Update
 			if (!$clone_note)
 			{
 				$clone_project->note_private = '';
 				$clone_project->note_public = '';
 			}
-
-			//Generate next ref
-			$defaultref = '';
-			$obj = empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
-			// Search template files
-			$file = ''; $classname = ''; $filefound = 0;
-			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-			foreach ($dirmodels as $reldir)
+			else
 			{
-				$file = dol_buildpath($reldir."core/modules/project/".$obj.'.php', 0);
-				if (file_exists($file))
+				$this->db->begin();
+				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_public, ENT_QUOTES), '_public');
+				if ($res < 0)
 				{
-					$filefound = 1;
-					dol_include_once($reldir."core/modules/project/".$obj.'.php');
-					$modProject = new $obj;
-					$defaultref = $modProject->getNextValue(is_object($clone_project->thirdparty) ? $clone_project->thirdparty : null, $clone_project);
-					break;
-				}
-			}
-			if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
-
-			$clone_project->ref = $defaultref;
-			$clone_project->title = $langs->trans("CopyOf").' '.$clone_project->title;
-
-			// Create clone
-			$result = $clone_project->create($user, $notrigger);
-
-			// Other options
-			if ($result < 0)
-			{
-				$this->error .= $clone_project->error;
-				$error++;
-			}
-
-			if (!$error)
-			{
-				//Get the new project id
-				$clone_project_id = $clone_project->id;
-
-				//Note Update
-				if (!$clone_note)
-				{
-					$clone_project->note_private = '';
-					$clone_project->note_public = '';
+					$this->error .= $clone_project->error;
+					$error++;
+					$this->db->rollback();
 				}
 				else
 				{
-					$this->db->begin();
-					$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_public, ENT_QUOTES), '_public');
-					if ($res < 0)
-					{
-						$this->error .= $clone_project->error;
-						$error++;
-						$this->db->rollback();
-					}
-					else
-					{
-						$this->db->commit();
-					}
-
-					$this->db->begin();
-					$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_private, ENT_QUOTES), '_private');
-					if ($res < 0)
-					{
-						$this->error .= $clone_project->error;
-						$error++;
-						$this->db->rollback();
-					}
-					else
-					{
-						$this->db->commit();
-					}
+					$this->db->commit();
 				}
 
-				//Duplicate contact
-				if ($clone_contact)
+				$this->db->begin();
+				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_private, ENT_QUOTES), '_private');
+				if ($res < 0)
 				{
-					$origin_project = new Project($this->db);
-					$origin_project->fetch($fromid);
-
-					foreach (array('internal', 'external') as $source)
-					{
-						$tab = $origin_project->liste_contact(-1, $source);
-
-						foreach ($tab as $contacttoadd)
-						{
-							$clone_project->add_contact($contacttoadd['id'], $contacttoadd['code'], $contacttoadd['source'], $notrigger);
-							if ($clone_project->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-							{
-								$langs->load("errors");
-								$this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
-								$error++;
-							}
-							else
-							{
-								if ($clone_project->error != '')
-								{
-									$this->error .= $clone_project->error;
-									$error++;
-								}
-							}
-						}
-					}
+					$this->error .= $clone_project->error;
+					$error++;
+					$this->db->rollback();
 				}
-
-				//Duplicate file
-				if ($clone_project_file)
+				else
 				{
-					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-					$clone_project_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($defaultref);
-					$ori_project_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($orign_project_ref);
-
-					if (dol_mkdir($clone_project_dir) >= 0)
-					{
-						$filearray = dol_dir_list($ori_project_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', '', SORT_ASC, 1);
-						foreach ($filearray as $key => $file)
-						{
-							$rescopy = dol_copy($ori_project_dir.'/'.$file['name'], $clone_project_dir.'/'.$file['name'], 0, 1);
-							if (is_numeric($rescopy) && $rescopy < 0)
-							{
-								$this->error .= $langs->trans("ErrorFailToCopyFile", $ori_project_dir.'/'.$file['name'], $clone_project_dir.'/'.$file['name']);
-								$error++;
-							}
-						}
-					}
-					else
-					{
-						$this->error .= $langs->trans('ErrorInternalErrorDetected').':dol_mkdir';
-						$error++;
-					}
+					$this->db->commit();
 				}
+			}
 
-				//Duplicate task
-				if ($clone_task)
+			//Duplicate contact
+			if ($clone_contact)
+			{
+				$origin_project = new Project($this->db);
+				$origin_project->fetch($fromid);
+
+				foreach (array('internal', 'external') as $source)
 				{
-					require_once DOL_DOCUMENT_ROOT . '/projet/class/task.class.php';
+					$tab = $origin_project->liste_contact(-1, $source);
 
-					$taskstatic = new Task($this->db);
-
-					// Security check
-					$socid=0;
-					if ($user->socid > 0) $socid = $user->socid;
-
-					$tasksarray=$taskstatic->getTasksArray(0, 0, $fromid, $socid, 0);
-
-					$tab_conv_child_parent=array();
-
-					// Loop on each task, to clone it
-					foreach ($tasksarray as $tasktoclone)
+					foreach ($tab as $contacttoadd)
 					{
-						$result_clone = $taskstatic->createFromClone($user, $tasktoclone->id, $clone_project_id, $tasktoclone->fk_parent, $move_date, true, false, $clone_task_file, true, false);
-						if ($result_clone <= 0)
+						$clone_project->add_contact($contacttoadd['id'], $contacttoadd['code'], $contacttoadd['source'], $notrigger);
+						if ($clone_project->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 						{
-							$this->error .= $result_clone->error;
+							$langs->load("errors");
+							$this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
 							$error++;
 						}
 						else
 						{
-							$new_task_id = $result_clone;
-							$taskstatic->fetch($tasktoclone->id);
-
-							//manage new parent clone task id
-							// if the current task has child we store the original task id and the equivalent clone task id
-							if (($taskstatic->hasChildren()) && !array_key_exists($tasktoclone->id, $tab_conv_child_parent))
+							if ($clone_project->error != '')
 							{
-								$tab_conv_child_parent[$tasktoclone->id] = $new_task_id;
+								$this->error .= $clone_project->error;
+								$error++;
 							}
 						}
 					}
+				}
+			}
 
-					//Parse all clone node to be sure to update new parent
-					$tasksarray = $taskstatic->getTasksArray(0, 0, $clone_project_id, $socid, 0);
-					foreach ($tasksarray as $task_cloned)
+			//Duplicate file
+			if ($clone_project_file)
+			{
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+				$clone_project_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($defaultref);
+				$ori_project_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($orign_project_ref);
+
+				if (dol_mkdir($clone_project_dir) >= 0)
+				{
+					$filearray = dol_dir_list($ori_project_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', '', SORT_ASC, 1);
+					foreach ($filearray as $key => $file)
 					{
-						$taskstatic->fetch($task_cloned->id);
-						if ($taskstatic->fk_task_parent != 0)
+						$rescopy = dol_copy($ori_project_dir.'/'.$file['name'], $clone_project_dir.'/'.$file['name'], 0, 1);
+						if (is_numeric($rescopy) && $rescopy < 0)
 						{
-							$taskstatic->fk_task_parent = $tab_conv_child_parent[$taskstatic->fk_task_parent];
-						}
-						$res = $taskstatic->update($user, $notrigger);
-						if ($result_clone <= 0)
-						{
-							$this->error .= $taskstatic->error;
+							$this->error .= $langs->trans("ErrorFailToCopyFile", $ori_project_dir.'/'.$file['name'], $clone_project_dir.'/'.$file['name']);
 							$error++;
 						}
 					}
 				}
-			}
-
-			unset($clone_project->context['createfromclone']);
-
-			if (!$error)
-			{
-				$this->db->commit();
-				return $clone_project_id;
-			}
-			else
-			{
-				$this->db->rollback();
-				dol_syslog(get_class($this)."::createFromClone nbError: ".$error." error : ".$this->error, LOG_ERR);
-				return -1;
-			}
-		}
-
-
-		/**
-		 *    Shift project task date from current date to delta
-		 *
-		 *    @param	integer		$old_project_dt_start	Old project start date
-		 *    @return	int				                    1 if OK or < 0 if KO
-		 */
-		public function shiftTaskDate($old_project_dt_start)
-		{
-			global $user, $langs, $conf;
-
-			$error=0;
-
-			$taskstatic = new Task($this->db);
-
-			// Security check
-			$socid=0;
-			if ($user->socid > 0) $socid = $user->socid;
-
-			$tasksarray=$taskstatic->getTasksArray(0, 0, $this->id, $socid, 0);
-
-			foreach ($tasksarray as $tasktoshiftdate)
-			{
-				$to_update=false;
-				// Fetch only if update of date will be made
-				if ((!empty($tasktoshiftdate->date_start)) || (!empty($tasktoshiftdate->date_end)))
+				else
 				{
-					//dol_syslog(get_class($this)."::shiftTaskDate to_update", LOG_DEBUG);
-					$to_update=true;
-					$task = new Task($this->db);
-					$result = $task->fetch($tasktoshiftdate->id);
-					if (!$result)
+					$this->error .= $langs->trans('ErrorInternalErrorDetected').':dol_mkdir';
+					$error++;
+				}
+			}
+
+			//Duplicate task
+			if ($clone_task)
+			{
+				require_once DOL_DOCUMENT_ROOT . '/projet/class/task.class.php';
+
+				$taskstatic = new Task($this->db);
+
+				// Security check
+				$socid=0;
+				if ($user->socid > 0) $socid = $user->socid;
+
+				$tasksarray=$taskstatic->getTasksArray(0, 0, $fromid, $socid, 0);
+
+				$tab_conv_child_parent=array();
+
+				// Loop on each task, to clone it
+				foreach ($tasksarray as $tasktoclone)
+				{
+					$result_clone = $taskstatic->createFromClone($user, $tasktoclone->id, $clone_project_id, $tasktoclone->fk_parent, $move_date, true, false, $clone_task_file, true, false);
+					if ($result_clone <= 0)
 					{
+						$this->error .= $result_clone->error;
 						$error++;
-						$this->error.=$task->error;
-					}
-				}
-				//print "$this->date_start + $tasktoshiftdate->date_start - $old_project_dt_start";exit;
-
-				//Calcultate new task start date with difference between old proj start date and origin task start date
-				if (!empty($tasktoshiftdate->date_start))
-				{
-					$task->date_start = $this->date_start + ($tasktoshiftdate->date_start - $old_project_dt_start);
-				}
-
-				//Calcultate new task end date with difference between origin proj end date and origin task end date
-				if (!empty($tasktoshiftdate->date_end))
-				{
-					$task->date_end = $this->date_start + ($tasktoshiftdate->date_end - $old_project_dt_start);
-				}
-
-				if ($to_update)
-				{
-					$result = $task->update($user);
-					if (!$result)
-					{
-						$error++;
-						$this->error .= $task->error;
-					}
-				}
-			}
-			if ($error != 0)
-			{
-				return -1;
-			}
-			return $result;
-		}
-
-
-		// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-		/**
-		 *    Associate element to a project
-		 *
-		 *    @param	string	$tableName			Table of the element to update
-		 *    @param	int		$elementSelectId	Key-rowid of the line of the element to update
-		 *    @return	int							1 if OK or < 0 if KO
-		 */
-		public function update_element($tableName, $elementSelectId)
-		{
-			// phpcs:enable
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tableName;
-
-			if ($tableName == "actioncomm")
-			{
-				$sql .= " SET fk_project=".$this->id;
-				$sql .= " WHERE id=".$elementSelectId;
-			}
-			else
-			{
-				$sql .= " SET fk_projet=".$this->id;
-				$sql .= " WHERE rowid=".$elementSelectId;
-			}
-
-			dol_syslog(get_class($this)."::update_element", LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$this->error = $this->db->lasterror();
-				return -1;
-			} else {
-				return 1;
-			}
-		}
-
-		// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-		/**
-		 *    Associate element to a project
-		 *
-		 *    @param	string	$tableName			Table of the element to update
-		 *    @param	int		$elementSelectId	Key-rowid of the line of the element to update
-		 *    @param	string	$projectfield	    The column name that stores the link with the project
-		 *
-		 *    @return	int							1 if OK or < 0 if KO
-		 */
-		public function remove_element($tableName, $elementSelectId, $projectfield = 'fk_projet')
-		{
-			// phpcs:enable
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tableName;
-
-			if ($tableName == "actioncomm")
-			{
-				$sql .= " SET fk_project=NULL";
-				$sql .= " WHERE id=".$elementSelectId;
-			} else
-			{
-				$sql .= " SET ".$projectfield."=NULL";
-				$sql .= " WHERE rowid=".$elementSelectId;
-			}
-
-			dol_syslog(get_class($this)."::remove_element", LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$this->error = $this->db->lasterror();
-				return -1;
-			} else {
-				return 1;
-			}
-		}
-
-		/**
-		 *  Create an intervention document on disk using template defined into PROJECT_ADDON_PDF
-		 *
-		 *  @param	string		$modele			Force template to use ('' by default)
-		 *  @param	Translate	$outputlangs	Objet lang to use for translation
-		 *  @param  int			$hidedetails    Hide details of lines
-		 *  @param  int			$hidedesc       Hide description
-		 *  @param  int			$hideref        Hide ref
-		 *  @return int         				0 if KO, 1 if OK
-		 */
-		public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-		{
-			global $conf,$langs;
-
-			$langs->load("projects");
-
-			if (! dol_strlen($modele)) {
-				$modele = 'baleine';
-
-				if ($this->modelpdf) {
-					$modele = $this->modelpdf;
-				} elseif (! empty($conf->global->PROJECT_ADDON_PDF)) {
-					$modele = $conf->global->PROJECT_ADDON_PDF;
-				}
-			}
-
-			$modelpath = "core/modules/project/doc/";
-
-			return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
-		}
-
-
-		/**
-		 * Load time spent into this->weekWorkLoad and this->weekWorkLoadPerTask for all day of a week of project.
-		 * Note: array weekWorkLoad and weekWorkLoadPerTask are reset and filled at each call.
-		 *
-		 * @param 	int		$datestart		First day of week (use dol_get_first_day to find this date)
-		 * @param 	int		$taskid			Filter on a task id
-		 * @param 	int		$userid			Time spent by a particular user
-		 * @return 	int						<0 if OK, >0 if KO
-		 */
-		public function loadTimeSpent($datestart, $taskid = 0, $userid = 0)
-		{
-			$error=0;
-
-			$this->weekWorkLoad=array();
-			$this->weekWorkLoadPerTask=array();
-
-			if (empty($datestart)) dol_print_error('', 'Error datestart parameter is empty');
-
-			$sql = "SELECT ptt.rowid as taskid, ptt.task_duration, ptt.task_date, ptt.task_datehour, ptt.fk_task";
-			$sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time AS ptt, ".MAIN_DB_PREFIX."projet_task as pt";
-			$sql.= " WHERE ptt.fk_task = pt.rowid";
-			$sql.= " AND pt.fk_projet = ".$this->id;
-			$sql.= " AND (ptt.task_date >= '".$this->db->idate($datestart)."' ";
-			$sql.= " AND ptt.task_date <= '".$this->db->idate(dol_time_plus_duree($datestart, 1, 'w') - 1)."')";
-			if ($taskid) $sql.= " AND ptt.fk_task=".$taskid;
-			if (is_numeric($userid)) $sql.= " AND ptt.fk_user=".$userid;
-
-			//print $sql;
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				$daylareadyfound=array();
-
-				$num = $this->db->num_rows($resql);
-				$i = 0;
-				// Loop on each record found, so each couple (project id, task id)
-				while ($i < $num)
-				{
-					$obj=$this->db->fetch_object($resql);
-					$day=$this->db->jdate($obj->task_date);		// task_date is date without hours
-					if (empty($daylareadyfound[$day]))
-					{
-						$this->weekWorkLoad[$day] = $obj->task_duration;
-						$this->weekWorkLoadPerTask[$day][$obj->fk_task] = $obj->task_duration;
 					}
 					else
 					{
-						$this->weekWorkLoad[$day] += $obj->task_duration;
-						$this->weekWorkLoadPerTask[$day][$obj->fk_task] += $obj->task_duration;
-					}
-					$daylareadyfound[$day]=1;
-					$i++;
-				}
-				$this->db->free($resql);
-				return 1;
-			}
-			else
-			{
-				$this->error = "Error ".$this->db->lasterror();
-				dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
-				return -1;
-			}
-		}
+						$new_task_id = $result_clone;
+						$taskstatic->fetch($tasktoclone->id);
 
-
-		// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-		/**
-		 * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
-		 *
-		 * @param	User	$user   Objet user
-		 * @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
-		 */
-		public function load_board($user)
-		{
-			// phpcs:enable
-			global $conf, $langs;
-
-			// For external user, no check is done on company because readability is managed by public status of project and assignement.
-			//$socid=$user->socid;
-
-			$projectsListId = null;
-			if (!$user->rights->projet->all->lire) $projectsListId = $this->getProjectsAuthorizedForUser($user, 0, 1);
-
-			$sql = "SELECT p.rowid, p.fk_statut as status, p.fk_opp_status, p.datee as datee";
-			$sql .= " FROM (".MAIN_DB_PREFIX."projet as p";
-			$sql .= ")";
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
-			// For external user, no check is done on company permission because readability is managed by public status of project and assignement.
-			//if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
-			$sql .= " WHERE p.fk_statut = 1";
-			$sql .= " AND p.entity IN (".getEntity('project').')';
-			if (!empty($projectsListId)) $sql .= " AND p.rowid IN (".$projectsListId.")";
-			// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
-			//if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-			// For external user, no check is done on company permission because readability is managed by public status of project and assignement.
-			//if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
-
-			//print $sql;
-			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				$project_static = new Project($this->db);
-
-				$response = new WorkboardResponse();
-				$response->warning_delay = $conf->projet->warning_delay / 60 / 60 / 24;
-				$response->label = $langs->trans("OpenedProjects");
-				$response->labelShort = $langs->trans("Opened");
-				if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/list.php?search_status=1&mainmenu=project';
-				else $response->url = DOL_URL_ROOT.'/projet/list.php?search_project_user=-1&search_status=1&mainmenu=project';
-				$response->img = img_object('', "projectpub");
-
-				// This assignment in condition is not a bug. It allows walking the results.
-				while ($obj = $this->db->fetch_object($resql))
-				{
-					$response->nbtodo++;
-
-					$project_static->statut = $obj->status;
-					$project_static->opp_status = $obj->opp_status;
-					$project_static->datee = $this->db->jdate($obj->datee);
-
-					if ($project_static->hasDelay()) {
-						$response->nbtodolate++;
+						//manage new parent clone task id
+						// if the current task has child we store the original task id and the equivalent clone task id
+						if (($taskstatic->hasChildren()) && !array_key_exists($tasktoclone->id, $tab_conv_child_parent))
+						{
+							$tab_conv_child_parent[$tasktoclone->id] = $new_task_id;
+						}
 					}
 				}
 
-				return $response;
-			}
-			else
-			{
-				$this->error = $this->db->error();
-				return -1;
-			}
-		}
-
-
-		/**
-		 * Function used to replace a thirdparty id with another one.
-		 *
-		 * @param DoliDB $db Database handler
-		 * @param int $origin_id Old thirdparty id
-		 * @param int $dest_id New thirdparty id
-		 * @return bool
-		 */
-		public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
-		{
-			$tables = array(
-				'projet'
-			);
-
-			return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
-		}
-
-
-		// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-		/**
-		 * Charge indicateurs this->nb pour le tableau de bord
-		 *
-		 * @return     int         <0 if KO, >0 if OK
-		 */
-		public function load_state_board()
-		{
-			// phpcs:enable
-			global $user;
-
-			$this->nb = array();
-
-			$sql = "SELECT count(p.rowid) as nb";
-			$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
-			$sql .= " WHERE";
-			$sql .= " p.entity IN (".getEntity('project').")";
-			if (!$user->rights->projet->all->lire)
-			{
-				$projectsListId = $this->getProjectsAuthorizedForUser($user, 0, 1);
-				$sql .= "AND p.rowid IN (".$projectsListId.")";
-			}
-
-			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				while ($obj = $this->db->fetch_object($resql))
+				//Parse all clone node to be sure to update new parent
+				$tasksarray = $taskstatic->getTasksArray(0, 0, $clone_project_id, $socid, 0);
+				foreach ($tasksarray as $task_cloned)
 				{
-					$this->nb["projects"] = $obj->nb;
-				}
-				$this->db->free($resql);
-				return 1;
-			}
-			else
-			{
-				dol_print_error($this->db);
-				$this->error = $this->db->error();
-				return -1;
-			}
-		}
-
-
-		/**
-		 * Is the project delayed?
-		 *
-		 * @return bool
-		 */
-		public function hasDelay()
-		{
-			global $conf;
-
-			if (!($this->statut == self::STATUS_VALIDATED)) return false;
-			if (!$this->datee && !$this->date_end) return false;
-
-			$now = dol_now();
-
-			return ($this->datee ? $this->datee : $this->date_end) < ($now - $conf->projet->warning_delay);
-		}
-
-
-		/**
-		 *	Charge les informations d'ordre info dans l'objet commande
-		 *
-		 *	@param  int		$id       Id of order
-		 *	@return	void
-		 */
-		public function info($id)
-		{
-			$sql = 'SELECT c.rowid, datec as datec, tms as datem,';
-			$sql .= ' date_close as datecloture,';
-			$sql .= ' fk_user_creat as fk_user_author, fk_user_close as fk_use_cloture';
-			$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as c';
-			$sql .= ' WHERE c.rowid = '.$id;
-			$result = $this->db->query($sql);
-			if ($result)
-			{
-				if ($this->db->num_rows($result))
-				{
-					$obj = $this->db->fetch_object($result);
-					$this->id = $obj->rowid;
-					if ($obj->fk_user_author)
+					$taskstatic->fetch($task_cloned->id);
+					if ($taskstatic->fk_task_parent != 0)
 					{
-						$cuser = new User($this->db);
-						$cuser->fetch($obj->fk_user_author);
-						$this->user_creation = $cuser;
+						$taskstatic->fk_task_parent = $tab_conv_child_parent[$taskstatic->fk_task_parent];
 					}
-
-					if ($obj->fk_user_cloture)
+					$res = $taskstatic->update($user, $notrigger);
+					if ($result_clone <= 0)
 					{
-						$cluser = new User($this->db);
-						$cluser->fetch($obj->fk_user_cloture);
-						$this->user_cloture = $cluser;
+						$this->error .= $taskstatic->error;
+						$error++;
 					}
-
-					$this->date_creation     = $this->db->jdate($obj->datec);
-					$this->date_modification = $this->db->jdate($obj->datem);
-					$this->date_cloture      = $this->db->jdate($obj->datecloture);
 				}
-
-				$this->db->free($result);
-			}
-			else
-			{
-				dol_print_error($this->db);
 			}
 		}
 
-		/**
-		 * Sets object to supplied categories.
-		 *
-		 * Deletes object from existing categories not supplied.
-		 * Adds it to non existing supplied categories.
-		 * Existing categories are left untouch.
-		 *
-		 * @param int[]|int $categories Category or categories IDs
-		 * @return void
-		 */
-		public function setCategories($categories)
+		unset($clone_project->context['createfromclone']);
+
+		if (!$error)
 		{
-			$type_categ = Categorie::TYPE_PROJECT;
+			$this->db->commit();
+			return $clone_project_id;
+		}
+		else
+		{
+			$this->db->rollback();
+			dol_syslog(get_class($this)."::createFromClone nbError: ".$error." error : ".$this->error, LOG_ERR);
+			return -1;
+		}
+	}
 
-			// Handle single category
-			if (!is_array($categories)) {
-				$categories = array($categories);
-			}
 
-			// Get current categories
-			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-			$c = new Categorie($this->db);
-			$existing = $c->containing($this->id, $type_categ, 'id');
+	/**
+	 *    Shift project task date from current date to delta
+	 *
+	 *    @param	integer		$old_project_dt_start	Old project start date
+	 *    @return	int				                    1 if OK or < 0 if KO
+	 */
+	public function shiftTaskDate($old_project_dt_start)
+	{
+		global $user, $langs, $conf;
 
-			// Diff
-			if (is_array($existing)) {
-				$to_del = array_diff($existing, $categories);
-				$to_add = array_diff($categories, $existing);
-			} else {
-				$to_del = array(); // Nothing to delete
-				$to_add = $categories;
-			}
+		$error=0;
 
-			// Process
-			foreach ($to_del as $del) {
-				if ($c->fetch($del) > 0) {
-					$result = $c->del_type($this, $type_categ);
-					if ($result < 0) {
-						$this->errors = $c->errors;
-						$this->error = $c->error;
-						return -1;
-					}
+		$taskstatic = new Task($this->db);
+
+		// Security check
+		$socid=0;
+		if ($user->socid > 0) $socid = $user->socid;
+
+		$tasksarray=$taskstatic->getTasksArray(0, 0, $this->id, $socid, 0);
+
+		foreach ($tasksarray as $tasktoshiftdate)
+		{
+			$to_update=false;
+			// Fetch only if update of date will be made
+			if ((!empty($tasktoshiftdate->date_start)) || (!empty($tasktoshiftdate->date_end)))
+			{
+				//dol_syslog(get_class($this)."::shiftTaskDate to_update", LOG_DEBUG);
+				$to_update=true;
+				$task = new Task($this->db);
+				$result = $task->fetch($tasktoshiftdate->id);
+				if (!$result)
+				{
+					$error++;
+					$this->error.=$task->error;
 				}
 			}
-			foreach ($to_add as $add) {
-				if ($c->fetch($add) > 0) {
-					$result = $c->add_type($this, $type_categ);
-					if ($result < 0) {
-						$this->errors = $c->errors;
-						$this->error = $c->error;
-						return -1;
-					}
-				}
+			//print "$this->date_start + $tasktoshiftdate->date_start - $old_project_dt_start";exit;
+
+			//Calcultate new task start date with difference between old proj start date and origin task start date
+			if (!empty($tasktoshiftdate->date_start))
+			{
+				$task->date_start = $this->date_start + ($tasktoshiftdate->date_start - $old_project_dt_start);
 			}
 
+			//Calcultate new task end date with difference between origin proj end date and origin task end date
+			if (!empty($tasktoshiftdate->date_end))
+			{
+				$task->date_end = $this->date_start + ($tasktoshiftdate->date_end - $old_project_dt_start);
+			}
+
+			if ($to_update)
+			{
+				$result = $task->update($user);
+				if (!$result)
+				{
+					$error++;
+					$this->error .= $task->error;
+				}
+			}
+		}
+		if ($error != 0)
+		{
+			return -1;
+		}
+		return $result;
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Associate element to a project
+	 *
+	 *    @param	string	$tableName			Table of the element to update
+	 *    @param	int		$elementSelectId	Key-rowid of the line of the element to update
+	 *    @return	int							1 if OK or < 0 if KO
+	 */
+	public function update_element($tableName, $elementSelectId)
+	{
+		// phpcs:enable
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$tableName;
+
+		if ($tableName == "actioncomm")
+		{
+			$sql .= " SET fk_project=".$this->id;
+			$sql .= " WHERE id=".$elementSelectId;
+		}
+		else
+		{
+			$sql .= " SET fk_projet=".$this->id;
+			$sql .= " WHERE rowid=".$elementSelectId;
+		}
+
+		dol_syslog(get_class($this)."::update_element", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->error = $this->db->lasterror();
+			return -1;
+		} else {
 			return 1;
 		}
+	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Associate element to a project
+	 *
+	 *    @param	string	$tableName			Table of the element to update
+	 *    @param	int		$elementSelectId	Key-rowid of the line of the element to update
+	 *    @param	string	$projectfield	    The column name that stores the link with the project
+	 *
+	 *    @return	int							1 if OK or < 0 if KO
+	 */
+	public function remove_element($tableName, $elementSelectId, $projectfield = 'fk_projet')
+	{
+		// phpcs:enable
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$tableName;
 
-		/**
-		 * 	Create an array of tasks of current project
-		 *
-		 *  @param  User   $user       Object user we want project allowed to
-		 * 	@return int		           >0 if OK, <0 if KO
-		 */
-		public function getLinesArray($user)
+		if ($tableName == "actioncomm")
 		{
-			require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
-			$taskstatic = new Task($this->db);
-
-			$this->lines = $taskstatic->getTasksArray(0, $user, $this->id, 0, 0);
+			$sql .= " SET fk_project=NULL";
+			$sql .= " WHERE id=".$elementSelectId;
+		} else
+		{
+			$sql .= " SET ".$projectfield."=NULL";
+			$sql .= " WHERE rowid=".$elementSelectId;
 		}
+
+		dol_syslog(get_class($this)."::remove_element", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->error = $this->db->lasterror();
+			return -1;
+		} else {
+			return 1;
+		}
+	}
+
+	/**
+	 *  Create an intervention document on disk using template defined into PROJECT_ADDON_PDF
+	 *
+	 *  @param	string		$modele			Force template to use ('' by default)
+	 *  @param	Translate	$outputlangs	Objet lang to use for translation
+	 *  @param  int			$hidedetails    Hide details of lines
+	 *  @param  int			$hidedesc       Hide description
+	 *  @param  int			$hideref        Hide ref
+	 *  @return int         				0 if KO, 1 if OK
+	 */
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		global $conf,$langs;
+
+		$langs->load("projects");
+
+		if (! dol_strlen($modele)) {
+			$modele = 'baleine';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->PROJECT_ADDON_PDF)) {
+				$modele = $conf->global->PROJECT_ADDON_PDF;
+			}
+		}
+
+		$modelpath = "core/modules/project/doc/";
+
+		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	}
+
+
+	/**
+	 * Load time spent into this->weekWorkLoad and this->weekWorkLoadPerTask for all day of a week of project.
+	 * Note: array weekWorkLoad and weekWorkLoadPerTask are reset and filled at each call.
+	 *
+	 * @param 	int		$datestart		First day of week (use dol_get_first_day to find this date)
+	 * @param 	int		$taskid			Filter on a task id
+	 * @param 	int		$userid			Time spent by a particular user
+	 * @return 	int						<0 if OK, >0 if KO
+	 */
+	public function loadTimeSpent($datestart, $taskid = 0, $userid = 0)
+	{
+		$error=0;
+
+		$this->weekWorkLoad=array();
+		$this->weekWorkLoadPerTask=array();
+
+		if (empty($datestart)) dol_print_error('', 'Error datestart parameter is empty');
+
+		$sql = "SELECT ptt.rowid as taskid, ptt.task_duration, ptt.task_date, ptt.task_datehour, ptt.fk_task";
+		$sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time AS ptt, ".MAIN_DB_PREFIX."projet_task as pt";
+		$sql.= " WHERE ptt.fk_task = pt.rowid";
+		$sql.= " AND pt.fk_projet = ".$this->id;
+		$sql.= " AND (ptt.task_date >= '".$this->db->idate($datestart)."' ";
+		$sql.= " AND ptt.task_date <= '".$this->db->idate(dol_time_plus_duree($datestart, 1, 'w') - 1)."')";
+		if ($taskid) $sql.= " AND ptt.fk_task=".$taskid;
+		if (is_numeric($userid)) $sql.= " AND ptt.fk_user=".$userid;
+
+		//print $sql;
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$daylareadyfound=array();
+
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			// Loop on each record found, so each couple (project id, task id)
+			while ($i < $num)
+			{
+				$obj=$this->db->fetch_object($resql);
+				$day=$this->db->jdate($obj->task_date);		// task_date is date without hours
+				if (empty($daylareadyfound[$day]))
+				{
+					$this->weekWorkLoad[$day] = $obj->task_duration;
+					$this->weekWorkLoadPerTask[$day][$obj->fk_task] = $obj->task_duration;
+				}
+				else
+				{
+					$this->weekWorkLoad[$day] += $obj->task_duration;
+					$this->weekWorkLoadPerTask[$day][$obj->fk_task] += $obj->task_duration;
+				}
+				$daylareadyfound[$day]=1;
+				$i++;
+			}
+			$this->db->free($resql);
+			return 1;
+		}
+		else
+		{
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
+			return -1;
+		}
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+	 *
+	 * @param	User	$user   Objet user
+	 * @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 */
+	public function load_board($user)
+	{
+		// phpcs:enable
+		global $conf, $langs;
+
+		// For external user, no check is done on company because readability is managed by public status of project and assignement.
+		//$socid=$user->socid;
+
+		$projectsListId = null;
+		if (!$user->rights->projet->all->lire) $projectsListId = $this->getProjectsAuthorizedForUser($user, 0, 1);
+
+		$sql = "SELECT p.rowid, p.fk_statut as status, p.fk_opp_status, p.datee as datee";
+		$sql .= " FROM (".MAIN_DB_PREFIX."projet as p";
+		$sql .= ")";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
+		// For external user, no check is done on company permission because readability is managed by public status of project and assignement.
+		//if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+		$sql .= " WHERE p.fk_statut = 1";
+		$sql .= " AND p.entity IN (".getEntity('project').')';
+		if (!empty($projectsListId)) $sql .= " AND p.rowid IN (".$projectsListId.")";
+		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
+		//if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+		// For external user, no check is done on company permission because readability is managed by public status of project and assignement.
+		//if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
+
+		//print $sql;
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$project_static = new Project($this->db);
+
+			$response = new WorkboardResponse();
+			$response->warning_delay = $conf->projet->warning_delay / 60 / 60 / 24;
+			$response->label = $langs->trans("OpenedProjects");
+			$response->labelShort = $langs->trans("Opened");
+			if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/list.php?search_status=1&mainmenu=project';
+			else $response->url = DOL_URL_ROOT.'/projet/list.php?search_project_user=-1&search_status=1&mainmenu=project';
+			$response->img = img_object('', "projectpub");
+
+			// This assignment in condition is not a bug. It allows walking the results.
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$response->nbtodo++;
+
+				$project_static->statut = $obj->status;
+				$project_static->opp_status = $obj->opp_status;
+				$project_static->datee = $this->db->jdate($obj->datee);
+
+				if ($project_static->hasDelay()) {
+					$response->nbtodolate++;
+				}
+			}
+
+			return $response;
+		}
+		else
+		{
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
+
+
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'projet'
+		);
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Charge indicateurs this->nb pour le tableau de bord
+	 *
+	 * @return     int         <0 if KO, >0 if OK
+	 */
+	public function load_state_board()
+	{
+		// phpcs:enable
+		global $user;
+
+		$this->nb = array();
+
+		$sql = "SELECT count(p.rowid) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+		$sql .= " WHERE";
+		$sql .= " p.entity IN (".getEntity('project').")";
+		if (!$user->rights->projet->all->lire)
+		{
+			$projectsListId = $this->getProjectsAuthorizedForUser($user, 0, 1);
+			$sql .= "AND p.rowid IN (".$projectsListId.")";
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$this->nb["projects"] = $obj->nb;
+			}
+			$this->db->free($resql);
+			return 1;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
+
+
+	/**
+	 * Is the project delayed?
+	 *
+	 * @return bool
+	 */
+	public function hasDelay()
+	{
+		global $conf;
+
+		if (!($this->statut == self::STATUS_VALIDATED)) return false;
+		if (!$this->datee && !$this->date_end) return false;
+
+		$now = dol_now();
+
+		return ($this->datee ? $this->datee : $this->date_end) < ($now - $conf->projet->warning_delay);
+	}
+
+
+	/**
+	 *	Charge les informations d'ordre info dans l'objet commande
+	 *
+	 *	@param  int		$id       Id of order
+	 *	@return	void
+	 */
+	public function info($id)
+	{
+		$sql = 'SELECT c.rowid, datec as datec, tms as datem,';
+		$sql .= ' date_close as datecloture,';
+		$sql .= ' fk_user_creat as fk_user_author, fk_user_close as fk_use_cloture';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as c';
+		$sql .= ' WHERE c.rowid = '.$id;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+				if ($obj->fk_user_author)
+				{
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+
+				if ($obj->fk_user_cloture)
+				{
+					$cluser = new User($this->db);
+					$cluser->fetch($obj->fk_user_cloture);
+					$this->user_cloture = $cluser;
+				}
+
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_cloture      = $this->db->jdate($obj->datecloture);
+			}
+
+			$this->db->free($result);
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * Sets object to supplied categories.
+	 *
+	 * Deletes object from existing categories not supplied.
+	 * Adds it to non existing supplied categories.
+	 * Existing categories are left untouch.
+	 *
+	 * @param int[]|int $categories Category or categories IDs
+	 * @return void
+	 */
+	public function setCategories($categories)
+	{
+		$type_categ = Categorie::TYPE_PROJECT;
+
+		// Handle single category
+		if (!is_array($categories)) {
+			$categories = array($categories);
+		}
+
+		// Get current categories
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		$c = new Categorie($this->db);
+		$existing = $c->containing($this->id, $type_categ, 'id');
+
+		// Diff
+		if (is_array($existing)) {
+			$to_del = array_diff($existing, $categories);
+			$to_add = array_diff($categories, $existing);
+		} else {
+			$to_del = array(); // Nothing to delete
+			$to_add = $categories;
+		}
+
+		// Process
+		foreach ($to_del as $del) {
+			if ($c->fetch($del) > 0) {
+				$result = $c->del_type($this, $type_categ);
+				if ($result < 0) {
+					$this->errors = $c->errors;
+					$this->error = $c->error;
+					return -1;
+				}
+			}
+		}
+		foreach ($to_add as $add) {
+			if ($c->fetch($add) > 0) {
+				$result = $c->add_type($this, $type_categ);
+				if ($result < 0) {
+					$this->errors = $c->errors;
+					$this->error = $c->error;
+					return -1;
+				}
+			}
+		}
+
+		return 1;
+	}
+
+
+	/**
+	 * 	Create an array of tasks of current project
+	 *
+	 *  @param  User   $user       Object user we want project allowed to
+	 * 	@return int		           >0 if OK, <0 if KO
+	 */
+	public function getLinesArray($user)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+		$taskstatic = new Task($this->db);
+
+		$this->lines = $taskstatic->getTasksArray(0, $user, $this->id, 0, 0);
+	}
 }

From 43dcd9beb51781717595ae5db746a01792b62767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 00:02:33 +0200
Subject: [PATCH 322/490] add new rule

---
 dev/setup/codesniffer/ruleset.xml             |  25 +-
 htdocs/accountancy/admin/account.php          |   6 +-
 htdocs/accountancy/admin/accountmodel.php     |  18 +-
 htdocs/accountancy/admin/card.php             |  12 +-
 htdocs/accountancy/admin/categories_list.php  |  26 +-
 htdocs/accountancy/admin/journals_list.php    |  12 +-
 htdocs/accountancy/admin/productaccount.php   |   4 +-
 htdocs/accountancy/bookkeeping/card.php       |   9 +-
 htdocs/accountancy/bookkeeping/list.php       |  30 +--
 .../accountancy/bookkeeping/listbyaccount.php |  18 +-
 .../class/accountancycategory.class.php       |  21 +-
 .../class/accountancyexport.class.php         |  33 ++-
 .../class/accountingjournal.class.php         |   3 +-
 .../accountancy/class/bookkeeping.class.php   |   3 +-
 htdocs/accountancy/closure/index.php          |   3 +-
 htdocs/accountancy/closure/validate.php       |   3 +-
 htdocs/accountancy/customer/card.php          |   3 +-
 htdocs/accountancy/customer/index.php         |   3 +-
 htdocs/accountancy/customer/list.php          |   3 +-
 htdocs/accountancy/expensereport/card.php     |   3 +-
 htdocs/accountancy/expensereport/index.php    |   3 +-
 htdocs/accountancy/expensereport/list.php     |   3 +-
 htdocs/accountancy/index.php                  |   3 +-
 htdocs/accountancy/journal/bankjournal.php    |  33 +--
 .../journal/expensereportsjournal.php         |  15 +-
 .../accountancy/journal/purchasesjournal.php  |  21 +-
 htdocs/accountancy/journal/sellsjournal.php   |  24 +-
 htdocs/accountancy/supplier/card.php          |   3 +-
 htdocs/accountancy/supplier/index.php         |   3 +-
 htdocs/accountancy/supplier/list.php          |   3 +-
 htdocs/accountancy/tpl/export_journal.tpl.php |   3 +-
 htdocs/adherents/type.php                     |  36 +--
 htdocs/adherents/type_ldap.php                |   9 +-
 htdocs/adherents/type_translation.php         |  15 +-
 .../datapolicy/class/datapolicycron.class.php |   6 +-
 htdocs/modulebuilder/admin/setup.php          |   4 +-
 htdocs/modulebuilder/index.php                | 239 ++++++------------
 htdocs/modulebuilder/template/admin/setup.php |   6 +-
 .../template/class/actions_mymodule.class.php |   5 +-
 .../template/class/api_mymodule.class.php     |   6 +-
 .../template/class/myobject.class.php         |  18 +-
 .../mailinglist_mymodule_myobject.modules.php |   3 +-
 .../doc/doc_generic_myobject_odt.modules.php  |  39 ++-
 .../mymodule/mod_myobject_standard.php        |   3 +-
 .../template/myobject_agenda.php              |  11 +-
 .../modulebuilder/template/myobject_card.php  |   9 +-
 .../template/myobject_document.php            |   4 +-
 .../modulebuilder/template/myobject_list.php  |   4 +-
 .../template/scripts/mymodule.php             |   3 +-
 test/phpunit/CodingPhpTest.php                |  16 +-
 test/phpunit/CodingSqlTest.php                |  10 +-
 test/phpunit/ExportTest.php                   |   4 +-
 test/phpunit/FactureRecTest.php               |   5 +-
 test/phpunit/FactureTest.php                  |   5 +-
 test/phpunit/LangTest.php                     |   2 +-
 test/phpunit/ModulesTest.php                  |   2 +-
 test/phpunit/UserTest.php                     |   2 +-
 test/phpunit/WebservicesInvoicesTest.php      |   7 +-
 test/phpunit/WebservicesOrdersTest.php        |   2 +-
 test/phpunit/WebservicesOtherTest.php         |   4 +-
 test/phpunit/WebservicesProductsTest.php      |   6 +-
 test/phpunit/WebservicesThirdpartyTest.php    |   8 +-
 test/phpunit/WebservicesUserTest.php          |   4 +-
 63 files changed, 315 insertions(+), 534 deletions(-)

diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index e726df6db7c..a6a915094e2 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -27,7 +27,7 @@
 
 
 	<!-- Rules from Generic Standard -->
-	
+
 	<!-- We want to allow empty statement: It allows to put some code comments into the else for examples -->
 	<rule ref="Generic.CodeAnalysis.EmptyStatement">
         <exclude name="Generic.CodeAnalysis.EmptyStatement.DetectedIf"/>
@@ -101,7 +101,7 @@
 			<property name="error" value="false"/>
 		</properties>
 		</rule>
-	-->    
+	-->
 	<!--  We want to allow 'if () { ...small code... }' on same line for better code compacity and readability -->
 	<rule ref="Generic.Formatting.DisallowMultipleStatements">
 		<severity>0</severity>
@@ -117,7 +117,7 @@
 		</properties>
 		</rule>
 	-->
-	
+
 	<rule ref="Generic.Formatting.SpaceAfterCast" />
 
     <rule ref="Generic.Functions.CallTimePassByReference" />
@@ -188,8 +188,8 @@
 	</rule>
 
     <!-- Check for duplicate class names -->
-    <!-- Disabled: We need this for dependency injection. 
-    <rule ref="Generic.Classes.DuplicateClassName" /> 
+    <!-- Disabled: We need this for dependency injection.
+    <rule ref="Generic.Classes.DuplicateClassName" />
     -->
 
 
@@ -213,6 +213,9 @@
     <rule ref="Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen" />
     <rule ref="Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose" />
 
+    <!-- <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseParenthesis" /> -->
+    <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword" />
+
     <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration.SpaceAfterOpen" />
     <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration.SpaceBeforeClose" />
 
@@ -309,16 +312,16 @@
     <rule ref="PEAR.Files.IncludingFile.UseInclude">
         <severity>0</severity>
     </rule>
-    
+
     <!-- We disable this. We must be allowed to use strict require instead of non strict include anywhere -->
     <rule ref="PEAR.Files.IncludingFile.UseIncludeOnce">
         <severity>0</severity>
     </rule>
-    
+
     <rule ref="PEAR.Files.IncludingFile.UseRequire">
      	<severity>0</severity>
     </rule>
-    
+
     <!-- We disable this: We want to allow include_once -->
     <rule ref="PEAR.Files.IncludingFile.UseRequireOnce">
         <severity>0</severity>
@@ -332,7 +335,7 @@
     <rule ref="PEAR.Functions.FunctionCallSignature.CloseBracketLine">
         <severity>0</severity>
     </rule>
-    
+
     <!-- We disable this: We want to allow small function on 1 line -->
     <rule ref="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket">
         <severity>0</severity>
@@ -385,7 +388,7 @@
 	<!--<rule ref="PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps">
         <severity>0</severity>
 	</rule>-->
-	
+
 	<!-- We disable this: We don't want to have private methods prefixed with an underscore -->
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.PrivateNoUnderscore">
         <severity>0</severity>
@@ -426,5 +429,5 @@
 	<rule ref="PSR2.Classes.PropertyDeclaration.VarUsed" />
     <!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
     <rule ref="PSR2.Files.ClosingTag"/>
-	
+
 </ruleset>
diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index cf00519e9d7..d131e228f44 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -144,8 +144,7 @@ if (empty($reshook))
 				{
 					setEventMessages($langs->trans("ChartLoaded"), null, 'mesgs');
 				}
-				else
-				{
+				else {
 					setEventMessages($langs->trans("ErrorDuringChartLoad"), null, 'warnings');
 				}
 			}
@@ -432,8 +431,7 @@ if ($resql)
 				print "</td>\n";
 				if (!$i) $totalarray['nbfield']++;
 			}
-			else
-			{
+			else {
 				print '<td>&nbsp;</td>';
 				if (!$i) $totalarray['nbfield']++;
 			}
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index b31cd23dfa4..66f1e3c0fa3 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -246,8 +246,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
 			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
 		}
-		else
-		{
+		else {
 			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
 			}
@@ -319,8 +318,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 		{
 			setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -582,8 +580,7 @@ if ($id)
 					print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth200 maxwidthonsmartphone');
 					print '</td>';
 				}
-				else
-				{
+				else {
 					print '<td class="liste_titre"></td>';
 				}
 			}
@@ -630,8 +627,7 @@ if ($id)
 					print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
 					print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
 				}
-				else
-				{
+				else {
 				  	$tmpaction = 'view';
 					$parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
 					$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
@@ -665,8 +661,7 @@ if ($id)
 								{
 									$valuetoshow = '-';
 								}
-								else
-								{
+								else {
 									$key = $langs->trans("Country".strtoupper($obj->country_code));
 									$valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
 								}
@@ -785,8 +780,7 @@ function fieldListAccountModel($fieldlist, $obj = '', $tabname = '', $context =
 		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
 			print '<td><input type="text" class="flat" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" size="10" name="'.$fieldlist[$field].'"></td>';
 		}
-		else
-		{
+		else {
 			print '<td>';
 			$size = ''; $class = '';
 			if ($fieldlist[$field] == 'code') $size = 'size="8" ';
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 708165fc757..0fc2f9001a1 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -76,8 +76,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		{
 			$account_number = GETPOST('account_number', 'string');
 		}
-		else
-		{
+		else {
 			$account_number = clean_account(GETPOST('account_number', 'string'));
 		}
 
@@ -85,8 +84,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		{
 			$account_parent = 0;
 		}
-		else
-		{
+		else {
 			$account_parent = GETPOST('account_parent', 'int');
 		}
 
@@ -141,8 +139,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		{
 			$account_number = GETPOST('account_number', 'string');
 		}
-		else
-		{
+		else {
 			$account_number = clean_account(GETPOST('account_number', 'string'));
 		}
 
@@ -150,8 +147,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		{
 			$account_parent = 0;
 		}
-		else
-		{
+		else {
 			$account_parent = GETPOST('account_parent', 'int');
 		}
 
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 1b2733e2045..04c8cbce12a 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -236,8 +236,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
             setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
         	$_POST = array('id'=>$id); // Clean $_POST array, we keep only
         }
-        else
-        {
+        else {
             if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                 setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
             }
@@ -309,8 +308,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
         {
             setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
         }
-        else
-        {
+        else {
             dol_print_error($db);
         }
     }
@@ -598,8 +596,7 @@ if ($id)
                     print '</td>';
                     $filterfound++;
                 }
-                else
-                {
+                else {
                     print '<td class="liste_titre"></td>';
                 }
             }
@@ -727,9 +724,8 @@ if ($id)
                     print '</td>';
                     print '<td></td>';
                 }
-                else
-                {
-	              	$tmpaction = 'view';
+                else {
+                    $tmpaction = 'view';
                     $parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
                     $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
@@ -754,8 +750,7 @@ if ($id)
                                 {
                                     $valuetoshow = '-';
                                 }
-                                else
-                                {
+                                else {
                                     $key = $langs->trans("Country".strtoupper($obj->country_code));
                                     $valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
                                 }
@@ -799,8 +794,7 @@ if ($id)
                     // Active
                     print '<td class="center" class="nowrap">';
                     if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
-                    else
-                 	{
+                    else {
                     	print $langs->trans("AlwaysActive");
                     }
                     print "</td>";
@@ -883,8 +877,7 @@ function fieldListAccountingCategories($fieldlist, $obj = '', $tabname = '', $co
 				$fieldname = 'country_id';
 				print $form->select_country(GETPOST('country_id', 'int'), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
 			}
-			else
-			{
+			else {
 				print $form->select_country((!empty($obj->country_code) ? $obj->country_code : (!empty($obj->country) ? $obj->country : $mysoc->country_code)), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
 			}
 			print '</td>';
@@ -907,8 +900,7 @@ function fieldListAccountingCategories($fieldlist, $obj = '', $tabname = '', $co
 		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
 			print '<td><input type="text" class="flat minwidth100" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'"></td>';
 		}
-		else
-		{
+		else {
 			print '<td>';
 			$size = ''; $class = '';
 			if ($fieldlist[$field] == 'code') $class = 'maxwidth100';
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index e34ce8094dd..93942946b26 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -239,8 +239,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
 			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
 		}
-		else
-		{
+		else {
 			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
 			}
@@ -314,8 +313,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 		{
 			setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -596,8 +594,7 @@ if ($id)
 					print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
 					print '</td>';
 				}
-				else
-				{
+				else {
 				  	$tmpaction = 'view';
 					$parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
 					$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
@@ -728,8 +725,7 @@ function fieldListJournal($fieldlist, $obj = '', $tabname = '', $context = '')
 		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
 			print '<td><input type="text" class="flat minwidth100" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'"></td>';
 		}
-		else
-		{
+		else {
 			print '<td>';
 			$size = ''; $class = '';
 			if ($fieldlist[$field] == 'code')  $class = 'maxwidth100';
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index e32e47b169d..6006e97b8da 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -268,9 +268,7 @@ elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL')
 elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA')
 {
     $sql .= " p.accountancy_code_sell_intra = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
-}
-else
-{
+} else {
     $sql .= " p.accountancy_code_sell_export = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
 }
 $sql .= ' WHERE p.entity IN ('.getEntity('product').')';
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index f8fa0774400..8ab554c08e7 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -629,8 +629,7 @@ if ($action == 'create')
 						{
 							print $formaccounting->select_auxaccount((GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account), 'subledger_account', 1);
 						}
-						else
-						{
+						else {
 							print '<input type="text" class="maxwidth150" name="subledger_account" value="'.(GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account).'">';
 						}
 						print '</td>';
@@ -686,8 +685,7 @@ if ($action == 'create')
 					{
 						print $formaccounting->select_auxaccount('', 'subledger_account', 1);
 					}
-					else
-					{
+					else {
 						print '<input type="text" class="maxwidth150" name="subledger_account" value="">';
 					}
 					print '</td>';
@@ -708,8 +706,7 @@ if ($action == 'create')
 					{
 						print '<a class="button" href="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'&action=valid">'.$langs->trans("ValidTransaction").'</a>';
 					}
-					else
-					{
+					else {
 						print '<input type="submit" class="button" disabled="disabled" href="#" title="'.dol_escape_htmltag($langs->trans("MvtNotCorrectlyBalanced", $debit, $credit)).'" value="'.dol_escape_htmltag($langs->trans("ValidTransaction")).'">';
 					}
 
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 2889fbf4ef1..87808e95500 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -352,8 +352,7 @@ if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouveme
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-		else
-		{
+		else {
 			setEventMessages("RecordDeleted", null, 'mesgs');
 		}
 
@@ -361,8 +360,7 @@ if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouveme
 		header("Location: list.php".($param ? '?'.$param : ''));
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages("NoRecordDeleted", null, 'warnings');
 	}
 }
@@ -374,8 +372,7 @@ if ($action == 'delmouvconfirm' && $user->rights->accounting->mouvements->suppri
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		}
 
@@ -481,8 +478,7 @@ if ($action == 'export_file' && $user->rights->accounting->mouvements->export) {
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
-	else
-	{
+	else {
 	    // Export files
 		$accountancyexport = new AccountancyExport($db);
 		$accountancyexport->export($object->lines, $formatexportset);
@@ -491,8 +487,7 @@ if ($action == 'export_file' && $user->rights->accounting->mouvements->export) {
         {
             setEventMessages('', $accountancyexport->errors, 'errors');
         }
-        else
-        {
+        else {
             // Specify as export : update field date_export
             $error = 0;
             $db->begin();
@@ -522,8 +517,7 @@ if ($action == 'export_file' && $user->rights->accounting->mouvements->export) {
             	$db->commit();
             	// setEventMessages($langs->trans("AllExportedMovementsWereRecordedAsExported"), null, 'mesgs');
             }
-            else
-            {
+            else {
             	$error++;
             	$db->rollback();
             	setEventMessages($langs->trans("NotAllExportedMovementsCouldBeRecordedAsExported"), null, 'errors');
@@ -560,8 +554,7 @@ if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
 }
-else
-{
+else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -722,8 +715,7 @@ if (!empty($arrayfields['t.subledger_account']['checked']))
 	{
 		print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
 	}
-	else
-	{
+	else {
 		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_start" value="'.$search_accountancy_aux_code_start.'">';
 	}
 	print '</div>';
@@ -735,8 +727,7 @@ if (!empty($arrayfields['t.subledger_account']['checked']))
 	{
 		print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
 	}
-	else
-	{
+	else {
 		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_end" value="'.$search_accountancy_aux_code_end.'">';
 	}
 	print '</div>';
@@ -958,8 +949,7 @@ while ($i < min($num, $limit))
             $urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
             $documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
         }
-        else
-        {
+        else {
             // Other type
         }
 
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 25f664d955e..a2b456b52b3 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -255,8 +255,7 @@ if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouveme
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-		else
-		{
+		else {
 			setEventMessages("RecordDeleted", null, 'mesgs');
 		}
 
@@ -264,8 +263,7 @@ if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouveme
 		header("Location: listbyaccount.php".($param ? '?'.$param : ''));
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages("NoRecordDeleted", null, 'warnings');
 	}
 }
@@ -277,8 +275,7 @@ if ($action == 'delmouvconfirm' && $user->rights->accounting->mouvements->suppri
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		}
 
@@ -538,8 +535,7 @@ while ($i < min($num, $limit))
 				print '</td>';
 				print '<td></td>';
 			}
-			else
-			{
+			else {
 				print '<td></td>';
 				print '<td class="nowraponall right">';
 				print price($sous_total_credit - $sous_total_debit);
@@ -640,8 +636,7 @@ while ($i < min($num, $limit))
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
 		}
-		else
-		{
+		else {
 			// Other type
 		}
 
@@ -743,8 +738,7 @@ if ($balance > 0 )
 	print '</td>';
 	print '<td></td>';
 }
-else
-{
+else {
 	print '<td></td>';
 	print '<td class="nowraponall right">';
 	print price($sous_total_credit - $sous_total_debit);
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index cc93232dcdc..0150e1d155d 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -210,8 +210,7 @@ class AccountancyCategory // extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return $this->id;
 		}
@@ -241,8 +240,7 @@ class AccountancyCategory // extends CommonObject
 		$sql .= " t.active";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as t";
 		if ($id)   $sql .= " WHERE t.rowid = ".$id;
-		else
-		{
+		else {
 			$sql .= " WHERE t.entity IN (".getEntity('c_accounting_category').")"; // Dont't use entity if you use rowid
 			if ($code) $sql .= " AND t.code = '".$this->db->escape($code)."'";
 			elseif ($label) $sql .= " AND t.label = '".$this->db->escape($label)."'";
@@ -271,8 +269,7 @@ class AccountancyCategory // extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -336,8 +333,7 @@ class AccountancyCategory // extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -376,8 +372,7 @@ class AccountancyCategory // extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -710,8 +705,7 @@ class AccountancyCategory // extends CommonObject
 			}
 			$sql .= " AND t.numero_compte IN (".$listofaccount.")";
 		}
-		else
-		{
+		else {
 			$sql .= " AND t.numero_compte = '".$this->db->escape($cpt)."'";
 		}
 		if (!empty($date_start) && !empty($date_end) && (empty($month) || empty($year)))	// If month/year provided, it is stronger than filter date_start/date_end
@@ -834,8 +828,7 @@ class AccountancyCategory // extends CommonObject
 			$sql .= " AND t.entity = ".$conf->entity;
 			$sql .= " ORDER BY t.account_number";
 		}
-		else
-		{
+		else {
 			$sql = "SELECT t.rowid, t.account_number, t.label as account_label";
 			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as t";
 			$sql .= " WHERE ".$predefinedgroupwhere;
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 3bf41e6326f..33c2537f600 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -518,11 +518,12 @@ class AccountancyExport
 			$Tab['contrepartie'] = str_repeat(' ', 8);
 
 			// elarifr:  date format must be fixed format : 6 char ddmmyy = %d%m%yand not defined by user / dolibarr setting
-			if (!empty($data->date_echeance))
+			if (!empty($data->date_echeance)) {
 				//$Tab['date_echeance'] = dol_print_date($data->date_echeance, $conf->global->ACCOUNTING_EXPORT_DATE);
 				$Tab['date_echeance'] = dol_print_date($data->date_echeance, '%d%m%y'); // elarifr:  format must be ddmmyy
-			else
+			} else {
 				$Tab['date_echeance'] = '000000';
+			}
 
 			//elarifr please keep quadra named field lettrage(2) + codestat(3) instead of fake lettrage(5)
 			//$Tab['lettrage'] = str_repeat(' ', 5);
@@ -597,12 +598,12 @@ class AccountancyExport
 
 			$Tab['num_compte'] = str_pad(self::trunc($code_compta, 6), 6, '0');
 
-			if($data->sens == 'D'){
+			if ($data->sens == 'D') {
 				$Tab['montant_debit']  =  str_pad(number_format(abs($data->montant), 2, ',', ''), 13, ' ', STR_PAD_LEFT);
 
 				$Tab['montant_crebit'] = str_pad(number_format(0, 2, ',', ''), 13, ' ', STR_PAD_LEFT);
 			}
-			else{
+			else {
 				$Tab['montant_debit']  = str_pad(number_format(0, 2, ',', ''), 13, ' ', STR_PAD_LEFT);
 
 				$Tab['montant_crebit'] = str_pad(number_format(abs($data->montant), 2, ',', ''), 13, ' ', STR_PAD_LEFT);
@@ -616,11 +617,12 @@ class AccountancyExport
 
 			$Tab['code_stat'] = str_repeat(' ', 4);
 
-			if (!empty($data->date_echeance))
+			if (!empty($data->date_echeance)) {
 				//$Tab['date_echeance'] = dol_print_date($data->date_echeance, $conf->global->ACCOUNTING_EXPORT_DATE);
 				$Tab['date_echeance'] = dol_print_date($data->date_echeance, '%d%m%Y');
-			else
+			} else {
 				$Tab['date_echeance'] = dol_print_date($data->doc_date, '%d%m%Y');
+			}
 
 			$Tab['monnaie'] = '1';
 
@@ -925,8 +927,7 @@ class AccountancyExport
             {
                 print 'S'.$this->separator;
             }
-            else
-            {
+            else {
                 print 'H'.$this->separator;
             }
             //Grp
@@ -938,13 +939,11 @@ class AccountancyExport
                 {
                     print length_accounta($thisPieceAccountNr).$this->separator;
                 }
-                else
-                {
+                else {
                     print "div".$this->separator;
                 }
             }
-            else
-            {
+            else {
                 print length_accounta($line->code_tiers).$this->separator;
             }
             //SId
@@ -961,8 +960,7 @@ class AccountancyExport
             {
                 print "2".$this->separator;
             }
-            else
-            {
+            else {
                 print "1".$this->separator;
             }
             // Code
@@ -972,8 +970,7 @@ class AccountancyExport
             {
                 print $line->montant.$this->separator;
             }
-            else
-            {
+            else {
                 print ($line->montant * -1).$this->separator;
             }
             // Steuer
@@ -1458,7 +1455,9 @@ class AccountancyExport
 			print self::trunc($line->code_journal, 6).$separator; //Journal code
 
 			if (!empty($line->subledger_account)) $account = $line->subledger_account;
-			else  $account = $line->numero_compte;
+			else {
+				$account = $line->numero_compte;
+			}
 			print self::trunc($account, 15).$separator; //Account number
 
 			print self::trunc($line->label_compte, 60).$separator; //Account label
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 727e68346fa..7b78cbca84b 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -137,8 +137,7 @@ class AccountingJournal extends CommonObject
 					return 0;
 				}
 			}
-			else
-			{
+			else {
 				$this->error = "Error ".$this->db->lasterror();
 				$this->errors[] = "Error ".$this->db->lasterror();
 			}
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 0162a98394e..2f197d7919f 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -259,8 +259,7 @@ class BookKeeping extends CommonObject
 			{
 				$this->errors[] = $langs->trans('ErrorFieldAccountNotDefinedForBankLine', $this->fk_docdet, $this->doc_type);
 			}
-			else
-			{
+			else {
 				//$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->doc_ref,  $this->label_compte);
 				$mesg = $this->doc_ref.', '.$langs->trans("AccountAccounting").': '.$this->numero_compte;
 				if ($this->subledger_account && $this->subledger_account != $this->numero_compte)
diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php
index 39ed325b5fe..ed8fc8ecc7e 100644
--- a/htdocs/accountancy/closure/index.php
+++ b/htdocs/accountancy/closure/index.php
@@ -42,8 +42,7 @@ if (!$user->rights->accounting->fiscalyear->write)
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else
-{
+else {
 	$year_start = dol_print_date(dol_now(), '%Y');
 	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
 }
diff --git a/htdocs/accountancy/closure/validate.php b/htdocs/accountancy/closure/validate.php
index fe7fda5054f..808ccfba0ef 100644
--- a/htdocs/accountancy/closure/validate.php
+++ b/htdocs/accountancy/closure/validate.php
@@ -42,8 +42,7 @@ if ($user->socid > 0)
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else
-{
+else {
 	$year_start = dol_print_date(dol_now(), '%Y');
 	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
 }
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index 0a39fbc8254..7c184cced45 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -60,8 +60,7 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 		if (!$resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
 		}
-		else
-		{
+		else {
 		    setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 		    if ($backtopage)
 		    {
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index eff348816fb..c2ba41d7368 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -47,8 +47,7 @@ if (!$user->rights->accounting->bind->write)
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else
-{
+else {
 	$year_start = dol_print_date(dol_now(), '%Y');
 	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
 }
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 1d93a0fea17..4e551fef9e8 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -160,8 +160,7 @@ if ($massaction == 'ventil') {
                 $msg .= '<div><font color="red">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'</font></div>';
                 $ko++;
             }
-            else
-            {
+            else {
                 $sql = " UPDATE ".MAIN_DB_PREFIX."facturedet";
                 $sql .= " SET fk_code_ventilation = ".$monCompte;
                 $sql .= " WHERE rowid = ".$monId;
diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php
index 36d587e0c99..acea87f95a6 100644
--- a/htdocs/accountancy/expensereport/card.php
+++ b/htdocs/accountancy/expensereport/card.php
@@ -64,8 +64,7 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 		if (!$resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 			if ($backtopage)
 			{
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 387cfd0fb8e..9573cbfc257 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -43,8 +43,7 @@ if (!$user->rights->accounting->bind->write)
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else
-{
+else {
 	$year_start = dol_print_date(dol_now(), '%Y');
 	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
 }
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 96eebd49b36..706bd41f2b0 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -139,8 +139,7 @@ if ($massaction == 'ventil') {
                 $msg .= '<div><font color="red">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'</font></div>';
                 $ko++;
             }
-            else
-            {
+            else {
                 $sql = " UPDATE ".MAIN_DB_PREFIX."expensereport_det";
                 $sql .= " SET fk_code_ventilation = ".$monCompte;
                 $sql .= " WHERE rowid = ".$monId;
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 56cf674505b..2fbbfe4b104 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -241,8 +241,7 @@ if ($conf->accounting->enabled)
 
     print '</div>';
 }
-else
-{
+else {
     print load_fiche_titre($langs->trans("AccountancyArea"), '', 'accountancy');
 
 	print $langs->trans("Module10Desc")."<br>\n";
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 3372105cd85..96fa45bcfd1 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -550,8 +550,7 @@ if (!$error && $action == 'writebookkeeping') {
 							$errorforline++;
 							setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 						}
-						else
-						{
+						else {
 							$error++;
 							$errorforline++;
 							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -576,8 +575,7 @@ if (!$error && $action == 'writebookkeeping') {
 						{
 							$reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
 						}
-						else
-						{
+						else {
 							$reflabel .= dol_string_nohtmltag($val['soclib']);
 						}
 
@@ -700,8 +698,7 @@ if (!$error && $action == 'writebookkeeping') {
 								$errorforline++;
 								setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 							}
-							else
-							{
+							else {
 								$error++;
 								$errorforline++;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -748,8 +745,7 @@ if (!$error && $action == 'writebookkeeping') {
 								$errorforline++;
 								setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 							}
-							else
-							{
+							else {
 								$error++;
 								$errorforline++;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -771,8 +767,7 @@ if (!$error && $action == 'writebookkeeping') {
 		{
 			$db->commit();
 		}
-		else
-		{
+		else {
 			//print 'KO for line '.$key.' '.$error.'<br>';
 			$db->rollback();
 
@@ -792,8 +787,7 @@ if (!$error && $action == 'writebookkeeping') {
 	{
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
@@ -880,8 +874,7 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 					{
 						$reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
 					}
-					else
-					{
+					else {
 						$reflabel .= dol_string_nohtmltag($val['soclib']);
 					}
 
@@ -1105,8 +1098,7 @@ if (empty($action) || $action == 'view') {
 					{
 						$reflabel .= $langs->trans('TransitionalAccount').' '.$account_transfer;
 					}
-					else
-					{
+					else {
 						$reflabel .= $val['soclib'];
 					}
 
@@ -1135,13 +1127,11 @@ if (empty($action) || $action == 'view') {
 							{
 								print '<span class="error">'.$langs->trans('UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking').'</span>';
 							}
-							else
-							{
+							else {
 								print '<span class="warning">'.$langs->trans('UnknownAccountForThirdparty', length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE)).'</span>'; // We will use a waiting account
 							}
 						}
-						else
-						{
+						else {
 							// We will refuse writing
 							$errorstring = 'UnknownAccountForThirdpartyBlocking';
 							if ($tabtype[$key] == 'payment')				$errorstring = 'MainAccountForCustomersNotDefined';
@@ -1178,8 +1168,7 @@ if (empty($action) || $action == 'view') {
 										print '<span class="warning">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknown", $tabcompany[$key]['code_compta']).'</span>';
 									}
 								}
-								else
-								{
+								else {
 									print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking").'</span>';
 								}
 							}
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 4be0b133143..6ed33f56ef1 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -232,8 +232,7 @@ if ($action == 'writebookkeeping') {
 							$errorforline++;
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 						}
-						else
-						{
+						else {
 							$error++;
 							$errorforline++;
 							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -282,8 +281,7 @@ if ($action == 'writebookkeeping') {
 								$errorforline++;
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 							}
-							else
-							{
+							else {
 								$error++;
 								$errorforline++;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -342,8 +340,7 @@ if ($action == 'writebookkeeping') {
 								$errorforline++;
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 							}
-							else
-							{
+							else {
 								$error++;
 								$errorforline++;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -366,8 +363,7 @@ if ($action == 'writebookkeeping') {
 		{
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 
 			if ($error >= 10)
@@ -387,8 +383,7 @@ if ($action == 'writebookkeeping') {
 	{
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 42bff74097f..c7cff6443ca 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -152,8 +152,9 @@ if ($result) {
 		if (empty($compta_prod)) {
 			if ($obj->product_type == 0)
 				$compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : 'NotDefined';
-			else
+			else {
 				$compta_prod = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : 'NotDefined';
+			}
 		}
 
 		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), $mysoc, $mysoc, 0);
@@ -332,8 +333,7 @@ if ($action == 'writebookkeeping') {
 						$errorforinvoice[$key] = 'alreadyjournalized';
 						//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 					}
-					else
-					{
+					else {
 						$error++;
 						$errorforline++;
 						$errorforinvoice[$key] = 'other';
@@ -384,8 +384,7 @@ if ($action == 'writebookkeeping') {
 							$errorforinvoice[$key] = 'alreadyjournalized';
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 						}
-						else
-						{
+						else {
 							$error++;
 							$errorforline++;
 							$errorforinvoice[$key] = 'other';
@@ -447,8 +446,7 @@ if ($action == 'writebookkeeping') {
 								$errorforinvoice[$key] = 'alreadyjournalized';
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 							}
-							else
-							{
+							else {
 								$error++;
 								$errorforline++;
 								$errorforinvoice[$key] = 'other';
@@ -500,8 +498,7 @@ if ($action == 'writebookkeeping') {
 							$errorforinvoice[$key] = 'alreadyjournalized';
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 						}
-						else
-						{
+						else {
 							$error++;
 							$errorforline++;
 							$errorforinvoice[$key] = 'other';
@@ -525,8 +522,7 @@ if ($action == 'writebookkeeping') {
 		{
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 
 			if ($error >= 10)
@@ -546,8 +542,7 @@ if ($action == 'writebookkeeping') {
 	{
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index c3c9f45ed5a..9bfa10dd3f1 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -158,8 +158,9 @@ if ($result) {
 		if (empty($compta_prod)) {
 			if ($obj->product_type == 0)
 				$compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : 'NotDefined';
-			else
+			else {
 				$compta_prod = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : 'NotDefined';
+			}
 		}
 
 		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), $mysoc, $mysoc, 0);
@@ -343,8 +344,7 @@ if ($action == 'writebookkeeping') {
 						$errorforinvoice[$key] = 'alreadyjournalized';
 						//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 					}
-					else
-					{
+					else {
 						$error++;
 						$errorforline++;
 						$errorforinvoice[$key] = 'other';
@@ -395,8 +395,7 @@ if ($action == 'writebookkeeping') {
 							$errorforinvoice[$key] = 'alreadyjournalized';
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 						}
-						else
-						{
+						else {
 							$error++;
 							$errorforline++;
 							$errorforinvoice[$key] = 'other';
@@ -457,8 +456,7 @@ if ($action == 'writebookkeeping') {
 								$errorforinvoice[$key] = 'alreadyjournalized';
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 							}
-							else
-							{
+							else {
 								$error++;
 								$errorforline++;
 								$errorforinvoice[$key] = 'other';
@@ -483,8 +481,7 @@ if ($action == 'writebookkeeping') {
 		{
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 
 			if ($error >= 10)
@@ -500,12 +497,10 @@ if ($action == 'writebookkeeping') {
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
-	elseif (count($tabpay) == $error)
-	{
+	elseif (count($tabpay) == $error) {
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
@@ -659,8 +654,9 @@ if (empty($action) || $action == 'view') {
 	$description .= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 		$description .= $langs->trans("DepositsAreNotIncluded");
-	else
+	else {
 		$description .= $langs->trans("DepositsAreIncluded");
+	}
 
 	$listofchoices = array('notyet'=>$langs->trans("NotYetInGeneralLedger"), 'already'=>$langs->trans("AlreadyInGeneralLedger"));
     $period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index 6140f90fe8d..b8d32e690a1 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -64,8 +64,7 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 		if (!$resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
 		}
-		else
-		{
+		else {
 		    setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 		    if ($backtopage)
 		    {
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 07877378ce1..9cd2b0c61e4 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -45,8 +45,7 @@ if (!$user->rights->accounting->bind->write)
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else
-{
+else {
 	$year_start = dol_print_date(dol_now(), '%Y');
 	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
 }
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 6ef942bea89..2c7110bf65d 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -164,8 +164,7 @@ if ($massaction == 'ventil') {
                 $msg .= '<div><font color="red">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'</font></div>';
                 $ko++;
             }
-            else
-            {
+            else {
                 $sql = " UPDATE ".MAIN_DB_PREFIX."facture_fourn_det";
                 $sql .= " SET fk_code_ventilation = ".$monCompte;
                 $sql .= " WHERE rowid = ".$monId;
diff --git a/htdocs/accountancy/tpl/export_journal.tpl.php b/htdocs/accountancy/tpl/export_journal.tpl.php
index fb957db2233..a6addb536a2 100644
--- a/htdocs/accountancy/tpl/export_journal.tpl.php
+++ b/htdocs/accountancy/tpl/export_journal.tpl.php
@@ -59,8 +59,7 @@ if ($accountancyexport->getFormatCode($formatexportset) == $accountancyexport::$
 
 	$completefilename = $siren."FEC".$endaccountingperiod.".txt";
 }
-else
-{
+else {
 	$completefilename = ($code ? $code."_" : "").($prefix ? $prefix."_" : "").$filename.($nodateexport ? "" : $date_export).".".$format;
 }
 
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index c190398c1db..5f89f06b22f 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -146,14 +146,12 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'create';
 		}
 	}
-	else
-	{
+	else {
 		$action = 'create';
 	}
 }
@@ -184,8 +182,7 @@ if ($action == 'update' && $user->rights->adherent->configurer)
 	{
 		setEventMessages($langs->trans("MemberTypeModified"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 
@@ -204,8 +201,7 @@ if ($action == 'confirm_delete' && $user->rights->adherent->configurer)
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("MemberTypeCanNotBeDeleted"), null, 'errors');
 		$action = '';
 	}
@@ -244,8 +240,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
 		$newcardbutton = '';
-		if ($user->rights->adherent->configurer)
-		{
+		if ($user->rights->adherent->configurer) {
             $newcardbutton .= dolGetButtonTitle($langs->trans('NewMemberType'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/type.php?action=create');
         }
 
@@ -300,8 +295,9 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 			print '<td class="center">'.$membertype->getLibStatut(5).'</td>';
 			if ($user->rights->adherent->configurer)
 				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
-			else
+			else {
 				print '<td class="right">&nbsp;</td>';
+			}
 			print "</tr>";
 			$i++;
 		}
@@ -310,8 +306,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 
 		print '</form>';
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -665,8 +660,7 @@ if ($rowid > 0)
 		        {
 		            print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"), "user").' '.$adh->getFullName($langs, 0, -1, 20).' / '.dol_trunc($objp->societe, 12).'</a></td>'."\n";
 		        }
-		        else
-		        {
+		        else {
 		            print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"), "user").' '.$adh->getFullName($langs, 0, -1, 32).'</a></td>'."\n";
 		        }
 
@@ -700,22 +694,19 @@ if ($rowid > 0)
 		            {
 		                print dol_print_date($datefin, 'day')." ".img_warning($langs->trans("SubscriptionLate"));
 		            }
-		            else
-		            {
+		            else {
 		                print dol_print_date($datefin, 'day');
 		            }
 		            print '</td>';
 		        }
-		        else
-		        {
+		        else {
 			        print '<td class="nowrap left">';
 			        if ($objp->subscription == 'yes')
 			        {
 		                print $langs->trans("SubscriptionNotReceived");
 		                if ($objp->statut > 0) print " ".img_warning();
 			        }
-			        else
-			        {
+			        else {
 			            print '&nbsp;';
 			        }
 		            print '</td>';
@@ -747,8 +738,7 @@ if ($rowid > 0)
 			    print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
 			}
 		}
-		else
-		{
+		else {
 		    dol_print_error($db);
 		}
 	}
diff --git a/htdocs/adherents/type_ldap.php b/htdocs/adherents/type_ldap.php
index bfb81e8d5c4..9e52f05739e 100644
--- a/htdocs/adherents/type_ldap.php
+++ b/htdocs/adherents/type_ldap.php
@@ -167,21 +167,18 @@ if ($result > 0)
         {
             print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
         }
-        else
-        {
+        else {
             $result = show_ldap_content($records, 0, $records['count'], true);
         }
     }
-    else
-    {
+    else {
         print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
     }
 
     $ldap->unbind();
     $ldap->close();
 }
-else
-{
+else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
 
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index 4c68b82784f..0e81240a020 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -77,8 +77,7 @@ if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->ad
 		$object->description = dol_htmlcleanlastbr($_POST["desc"]);
 		$object->other			= dol_htmlcleanlastbr($_POST["other"]);
 	}
-	else
-	{
+	else {
 		$object->multilangs[$_POST["forcelangprod"]]["label"]		= $_POST["libelle"];
 		$object->multilangs[$_POST["forcelangprod"]]["description"] = dol_htmlcleanlastbr($_POST["desc"]);
 		$object->multilangs[$_POST["forcelangprod"]]["other"]		= dol_htmlcleanlastbr($_POST["other"]);
@@ -89,8 +88,7 @@ if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->ad
 	{
 		$action = '';
 	}
-	else
-	{
+	else {
 		$action = 'add';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -111,8 +109,7 @@ if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && $user->rights->a
 			$object->description = dol_htmlcleanlastbr($_POST["desc-".$key]);
 			$object->other			= dol_htmlcleanlastbr($_POST["other-".$key]);
 		}
-		else
-		{
+		else {
 			$object->multilangs[$key]["label"]			= $_POST["libelle-".$key];
 			$object->multilangs[$key]["description"] = dol_htmlcleanlastbr($_POST["desc-".$key]);
 			$object->multilangs[$key]["other"]			= dol_htmlcleanlastbr($_POST["other-".$key]);
@@ -123,8 +120,7 @@ if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && $user->rights->a
 	{
 		$action = '';
 	}
-	else
-	{
+	else {
 		$action = 'edit';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -142,8 +138,7 @@ if ($action == 'vdelete' && $cancel != $langs->trans("Cancel") && $user->rights-
 	{
 		$action = '';
 	}
-	else
-	{
+	else {
 		$action = 'edit';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php
index 409df1362e9..ba93638455e 100644
--- a/htdocs/datapolicy/class/datapolicycron.class.php
+++ b/htdocs/datapolicy/class/datapolicycron.class.php
@@ -506,8 +506,7 @@ class DataPolicyCron
 	                                }
 	                            }
                             }
-                            else
-                            {
+                            else {
                             	$errormsg = $object->error;
                             	$error++;
                             }
@@ -539,8 +538,7 @@ class DataPolicyCron
         {
         	$this->output = $nbupdated.' record updated, '.$nbdeleted.' record deleted';
         }
-        else
-        {
+        else {
         	$this->error = $errormsg;
         }
 
diff --git a/htdocs/modulebuilder/admin/setup.php b/htdocs/modulebuilder/admin/setup.php
index db30c32607f..45f6dd91b66 100644
--- a/htdocs/modulebuilder/admin/setup.php
+++ b/htdocs/modulebuilder/admin/setup.php
@@ -48,9 +48,7 @@ if ($action == "update")
     if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0 || $res7 < 0 || $res8 < 0) {
         setEventMessages('ErrorFailedToSaveDate', null, 'errors');
         $db->rollback();
-    }
-    else
-    {
+    } else {
         setEventMessages('RecordModifiedSuccessfully', null, 'mesgs');
         $db->commit();
     }
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index d813c3b291b..02bd9c387b4 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -129,8 +129,8 @@ if ($dirins && $action == 'initmodule' && $modulename)
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorFailToCopyDir", $srcdir, $destdir), null, 'errors');
 			}
-			else	// $result == 0
-			{
+			else {
+				// $result == 0
 				setEventMessages($langs->trans("AllFilesDidAlreadyExist", $srcdir, $destdir), null, 'warnings');
 			}
 		}
@@ -271,8 +271,7 @@ if ($dirins && $action == 'initapi' && !empty($module))
 
 		dolReplaceInFile($destfile, $arrayreplacement);
 	}
-	else
-	{
+	else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -308,14 +307,12 @@ if ($dirins && $action == 'initphpunit' && !empty($module))
 
 		dolReplaceInFile($destfile, $arrayreplacement);
 	}
-	else
-	{
+	else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
 }
-if ($dirins && $action == 'initsqlextrafields' && !empty($module))
-{
+if ($dirins && $action == 'initsqlextrafields' && !empty($module)) {
 	$modulename = ucfirst($module); // Force first letter in uppercase
 	$objectname = $tabobj;
 
@@ -354,8 +351,7 @@ if ($dirins && $action == 'initsqlextrafields' && !empty($module))
 		dolReplaceInFile($destfile1, $arrayreplacement);
 		dolReplaceInFile($destfile2, $arrayreplacement);
 	}
-	else
-	{
+	else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', ''), null, 'errors');
 	}
@@ -389,8 +385,7 @@ if ($dirins && $action == 'inithook' && !empty($module))
 
 		dolReplaceInFile($destfile, $arrayreplacement);
 	}
-	else
-	{
+	else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -423,8 +418,7 @@ if ($dirins && $action == 'inittrigger' && !empty($module))
 
 		dolReplaceInFile($destfile, $arrayreplacement);
 	}
-	else
-	{
+	else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -438,8 +432,7 @@ if ($dirins && $action == 'initwidget' && !empty($module))
 	//var_dump($srcfile);var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$modulename = ucfirst($module); // Force first letter in uppercase
 
 		//var_dump($phpfileval['fullname']);
@@ -456,9 +449,7 @@ if ($dirins && $action == 'initwidget' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -496,8 +487,7 @@ if ($dirins && $action == 'initcss' && !empty($module))
 		$arrayreplacement = array('/\/\/\s*\''.preg_quote('/'.strtolower($module).'/css/'.strtolower($module).'.css.php', '/').'\'/' => '\'/'.strtolower($module).'/css/'.strtolower($module).'.css.php\'');
 		dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
 	}
-	else
-	{
+	else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -535,8 +525,7 @@ if ($dirins && $action == 'initjs' && !empty($module))
 		$arrayreplacement = array('/\/\/\s*\''.preg_quote('/'.strtolower($module).'/js/'.strtolower($module).'.js.php', '/').'\'/' => '\'/'.strtolower($module).'/js/'.strtolower($module).'.js.php\'');
 		dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
 	}
-	else
-	{
+	else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -574,14 +563,12 @@ if ($dirins && $action == 'initcli' && !empty($module))
 
 		dolReplaceInFile($destfile, $arrayreplacement);
 	}
-	else
-	{
+	else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
 }
-if ($dirins && $action == 'initdoc' && !empty($module))
-{
+if ($dirins && $action == 'initdoc' && !empty($module)) {
 	dol_mkdir($dirins.'/'.strtolower($module).'/doc');
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/doc/Documentation.asciidoc';
@@ -589,8 +576,7 @@ if ($dirins && $action == 'initdoc' && !empty($module))
 	//var_dump($srcfile);var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$modulename = ucfirst($module); // Force first letter in uppercase
 		$modulelowercase = strtolower($module);
 
@@ -625,8 +611,7 @@ if ($dirins && $action == 'initdoc' && !empty($module))
 		dol_delete_file($outputfiledoc, 0, 0, 0, null, false, 0);
 		dol_delete_file($outputfiledocpdf, 0, 0, 0, null, false, 0);
 	}
-	else
-	{
+	else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -671,8 +656,7 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
 	{
 		setEventMessages($langs->trans("ErrorTableNotFound", $tablename), null, 'errors');
 	}
-	else
-	{
+	else {
 		/**
 		 *  'type' if the field format ('integer', 'integer:Class:pathtoclass', 'varchar(x)', 'double(24,8)', 'text', 'html', 'datetime', 'timestamp', 'float')
 		 *  'label' the translation key.
@@ -882,8 +866,8 @@ if ($dirins && $action == 'initobject' && $module && $objectname)
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorFailToCopyFile", $srcdir.'/'.$srcfile, $destdir.'/'.$destfile), null, 'errors');
 				}
-				else	// $result == 0
-				{
+				else {
+					// $result == 0
 					setEventMessages($langs->trans("FileAlreadyExists", $destfile), null, 'warnings');
 				}
 			}
@@ -1066,14 +1050,12 @@ if ($dirins && ($action == 'droptable' || $action == 'droptableextrafields') &&
 				$nb = $obj->nb;
 			}
 		}
-		else
-		{
+		else {
 			if ($db->lasterrno() == 'DB_ERROR_NOSUCHTABLE')
 			{
 				setEventMessages($langs->trans("TableDoesNotExists", $tabletodrop), null, 'warnings');
 			}
-			else
-			{
+			else {
 				dol_print_error($db);
 			}
 		}
@@ -1231,8 +1213,7 @@ if ($dirins && $action == 'confirm_deletemodule')
 		{
 			setEventMessages($langs->trans("DirWasRemoved", $modulelowercase), null);
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans("PurgeNothingToDelete"), null, 'warnings');
 		}
 	}
@@ -1291,8 +1272,7 @@ if ($dirins && $action == 'confirm_deleteobject' && $objectname)
 		{
 			setEventMessages($langs->trans("FilesDeleted"), null);
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans("ErrorSomeFilesCouldNotBeDeleted"), null, 'warnings');
 		}
 	}
@@ -1326,8 +1306,7 @@ if ($dirins && $action == 'generatepackage')
 			dol_print_error($e->getMessage());
 		}
 	}
-	else
-	{
+	else {
 		$error++;
 		$langs->load("errors");
 		dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
@@ -1346,8 +1325,7 @@ if ($dirins && $action == 'generatepackage')
 			if (!dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule);
 			$result = dol_compress_dir($dir, $outputfilezip, 'zip', '', $modulelowercase);
 		}
-		else
-		{
+		else {
 			$result = -1;
 		}
 
@@ -1355,15 +1333,13 @@ if ($dirins && $action == 'generatepackage')
 		{
 			setEventMessages($langs->trans("ZipFileGeneratedInto", $outputfilezip), null);
 		}
-		else
-		{
+		else {
 			$error++;
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFailToGenerateFile", $outputfilezip), null, 'errors');
 		}
 	}
-	else
-	{
+	else {
 		$error++;
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorCheckVersionIsDefined"), null, 'errors');
@@ -1382,8 +1358,7 @@ if ($dirins && $action == 'generatedoc')
 	{
 		setEventMessages($langs->trans("DocFileGeneratedInto", $dirofmodule), null);
 	}
-	else
-	{
+	else {
 		setEventMessages($util->error, $util->errors, 'errors');
 	}
 }
@@ -1421,13 +1396,11 @@ if ($action == 'savefile' && empty($cancel))
 
 				setEventMessages($langs->trans("FileSaved"), null);
 			}
-			else
-			{
+			else {
 				setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 			}
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans("ContentCantBeEmpty"), null, 'errors');
 			//$action='editfile';
 			$error++;
@@ -1446,8 +1419,7 @@ if ($action == 'set' && $user->admin)
 	$value = GETPOST('value', 'alpha');
 	$resarray = activateModule($value);
 	if (!empty($resarray['errors'])) setEventMessages('', $resarray['errors'], 'errors');
-	else
-	{
+	else {
 		//var_dump($resarray);exit;
 		if ($resarray['nbperms'] > 0)
 		{
@@ -1595,8 +1567,7 @@ if (!$dirins)
 	$message = info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
 	$allowfromweb = -1;
 }
-else
-{
+else {
 	if ($dirins_ok)
 	{
 		if (!is_writable(dol_osencode($dirins)))
@@ -1606,8 +1577,7 @@ else
 			$allowfromweb = 0;
 		}
 	}
-	else
-	{
+	else {
 		$message = info_admin($langs->trans("NotExistsDirect", $dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
 		$allowfromweb = 0;
 	}
@@ -1645,8 +1615,7 @@ if (!empty($module) && $module != 'initmodule' && $module != 'deletemodule')
 			print $e->getMessage();
 		}
 	}
-	else
-	{
+	else {
 		if (empty($forceddirread)) $error++;
 		$langs->load("errors");
 		print img_warning('').' '.$langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module).'<br>';
@@ -1703,28 +1672,24 @@ if (is_array($listofmodules) && count($listofmodules) > 0) {
 					$linktoenabledisable .= ' <a href="'.$urlpage.'" title="'.$langs->trans($page).'">'.img_picto(ucfirst($page), "setup").'</a>';
 					//    print '<a href="'.$page.'">'.ucfirst($page).'</a>&nbsp;';
 				}
-				else
-				{
+				else {
 					if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs))
 					{
 						$urltouse = dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1);
 						$linktoenabledisable .= ' &nbsp; <a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a>';
 					}
-					else
-					{
+					else {
 						$urltouse = $urlpage;
 						$linktoenabledisable .= ' &nbsp; <a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a>';
 					}
 				}
 			}
 		}
-		elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs))
-		{
+		elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs)) {
 			$linktoenabledisable .= ' &nbsp; <a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1).'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a>';
 		}
 	}
-	else
-	{
+	else {
 		$linktoenabledisable .= '<a class="reposition asetresetmodule" href="'.$_SERVER["PHP_SELF"].'?id='.$moduleobj->numero.'&action=set&value=mod'.$module.$param.'">';
 		$linktoenabledisable .= img_picto($langs->trans("ModuleIsNotActive", $urltomodulesetup), 'switch_off', '', false, 0, 0, '', 'classfortooltip', 1);
 		$linktoenabledisable .= "</a>\n";
@@ -1775,8 +1740,7 @@ if ($module == 'initmodule')
 	print '<br><input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
 	print '</form>';
 }
-elseif ($module == 'deletemodule')
-{
+elseif ($module == 'deletemodule') {
 	print '<!-- Form to init a module -->'."\n";
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="delete">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -1789,8 +1753,7 @@ elseif ($module == 'deletemodule')
 	print '<input type="submit" class="buttonDelete" value="'.$langs->trans("Delete").'"'.($dirins ? '' : ' disabled="disabled"').'>';
 	print '</form>';
 }
-elseif (!empty($module))
-{
+elseif (!empty($module)) {
 	// Tabs for module
 	if (!$error)
 	{
@@ -1978,8 +1941,7 @@ elseif (!empty($module))
 
 					print '</table>';
 				}
-				else
-				{
+				else {
 					print $langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module).'<br>';
 				}
 
@@ -2006,8 +1968,7 @@ elseif (!empty($module))
 
 				dol_fiche_end();
 			}
-			else
-			{
+			else {
 				$fullpathoffile = dol_buildpath($file, 0, 1); // Description - level 2
 
 				if ($fullpathoffile)
@@ -2039,8 +2000,7 @@ elseif (!empty($module))
 				print '</form>';
 			}
 		}
-		else
-		{
+		else {
 			dol_fiche_head($head2, $tab, '', -1, ''); // Level 2
 		}
 
@@ -2078,8 +2038,7 @@ elseif (!empty($module))
 				}
 				print '</table>';
 			}
-			else
-			{
+			else {
 				// Edit text language file
 
 				//print $langs->trans("UseAsciiDocFormat").'<br>';
@@ -2208,8 +2167,7 @@ elseif (!empty($module))
 						$i++;
 					}
 				}
-				else
-				{
+				else {
 					print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
 				}
 
@@ -2218,8 +2176,7 @@ elseif (!empty($module))
 
 				print '</form>';
 			}
-			else
-			{
+			else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -2324,8 +2281,7 @@ elseif (!empty($module))
 
 				print '</form>';
 			}
-			elseif ($tabobj == 'deleteobject')
-			{
+			elseif ($tabobj == 'deleteobject') {
 				// Delete object tab
 				print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -2339,8 +2295,8 @@ elseif (!empty($module))
 				print '<input type="submit" class="buttonDelete" name="delete" value="'.dol_escape_htmltag($langs->trans("Delete")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
 				print '</form>';
 			}
-			else
-			{	// tabobj = module
+			else {
+				// tabobj = module
 				if ($action == 'deleteproperty')
 				{
 					$formconfirm = $form->formconfirm(
@@ -2413,13 +2369,11 @@ elseif (!empty($module))
 		   					{
 		   						print '<a href="#" target="apiexplorer" title="'.$langs->trans("ModuleMustBeEnabled").'"><strike>'.$langs->trans("GoToApiExplorer").'</strike></a>';
 		   					}
-		   					else
-		   					{
+		   					else {
 		   						print '<a href="'.DOL_URL_ROOT.'/api/index.php/explorer/" target="apiexplorer">'.$langs->trans("GoToApiExplorer").'</a>';
 		   					}
 						}
-						else
-						{
+						else {
 							//print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span> ';
 							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initapi&format=php&file='.urlencode($pathtoapi).'"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a>';
 						}
@@ -2433,8 +2387,7 @@ elseif (!empty($module))
 							print ' ';
 							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&file='.urlencode($pathtophpunit).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 						}
-						else
-						{
+						else {
 							//print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span> ';
 							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initphpunit&format=php&file='.urlencode($pathtophpunit).'"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a>';
 						}
@@ -2542,8 +2495,7 @@ elseif (!empty($module))
 						{
 							$result = dol_include_once($pathtoclass);
 						}
-						else
-						{
+						else {
 							$result = @include_once $dirread.'/'.$pathtoclass;
 						}
 						if (class_exists($tabobj))
@@ -2748,8 +2700,7 @@ elseif (!empty($module))
 									print '</tr>';
 								}
 							}
-							else
-							{
+							else {
 								if ($tab == 'specifications')
 								{
 									if ($action != 'editfile' || empty($file))
@@ -2769,8 +2720,7 @@ elseif (!empty($module))
 											print '<br>';
 										}
 									}
-									else
-									{
+									else {
 										// Use MD or asciidoc
 
 										//print $langs->trans("UseAsciiDocFormat").'<br>';
@@ -2806,8 +2756,7 @@ elseif (!empty($module))
 
 							print '</form>';
 						}
-						else
-						{
+						else {
 							print '<tr><td><span class="warning">'.$langs->trans('Failed to init the object with the new.').'</warning></td></tr>';
 						}
 					}
@@ -2816,14 +2765,12 @@ elseif (!empty($module))
 						print $e->getMessage();
 					}
 				}
-				else
-				{
+				else {
 					if (empty($forceddirread))
 					{
 						$fullpathoffile = dol_buildpath($file, 0);
 					}
-					else
-					{
+					else {
 						$fullpathoffile = $dirread.'/'.$file;
 					}
 
@@ -2957,9 +2904,8 @@ elseif (!empty($module))
 						print '</tr>';
 					}
 				}
-				else
-				{
-				 	 print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
+				else {
+				 	print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
 				}
 
 				print '</table>';
@@ -2967,8 +2913,7 @@ elseif (!empty($module))
 
 				print '</form>';
 			}
-			else
-			{
+			else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3057,9 +3002,8 @@ elseif (!empty($module))
 						print '</tr>';
 					}
 				}
-				else
-				{
-					 print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("None").'</td></tr>';
+				else {
+					print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("None").'</td></tr>';
 				}
 
 				print '</table>';
@@ -3067,8 +3011,7 @@ elseif (!empty($module))
 
 				print '</form>';
 			}
-			else
-			{
+			else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3120,16 +3063,14 @@ elseif (!empty($module))
 					print '<td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a> ';
 					print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 				}
-				else
-				{
+				else {
 					print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 					print '<a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=inithook&format=php&file='.urlencode($pathtohook).'"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a></td>';
 					print '<td></td>';
 				}
 				print '</tr>';
 			}
-			else
-			{
+			else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3189,8 +3130,7 @@ elseif (!empty($module))
 						print '</tr>';
 					}
 				}
-				else
-				{
+				else {
 					print '<tr><td>';
 					print '<span class="fa fa-file-o"></span> '.$langs->trans("NoTrigger");
 					print '<a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=inittrigger&format=php"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a></td>';
@@ -3200,8 +3140,7 @@ elseif (!empty($module))
 
 				print '</table>';
 			}
-			else
-			{
+			else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3245,15 +3184,13 @@ elseif (!empty($module))
 					print '</td><td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
 					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 				}
-				else
-				{
+				else {
 					print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initcss&format=php&file='.urlencode($pathtohook).'"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a></td>';
 				}
 				print '</tr>';
 			}
-			else
-			{
+			else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3297,15 +3234,13 @@ elseif (!empty($module))
 					print '</td><td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
 					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 				}
-				else
-				{
+				else {
 					print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initjs&format=php&file='.urlencode($pathtohook).'"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a></td>';
 				}
 				print '</tr>';
 			}
-			else
-			{
+			else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3355,16 +3290,14 @@ elseif (!empty($module))
 						print '</tr>';
 					}
 				}
-				else
-				{
+				else {
 					print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("NoWidget");
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initwidget&format=php"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a>';
 					print '</td></tr>';
 				}
 				print '</table>';
 			}
-			else
-			{
+			else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3441,16 +3374,14 @@ elseif (!empty($module))
 						print '</tr>';
 					}
 				}
-				else
-				{
+				else {
 					print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("NoCLIFile");
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initcli&format=php"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a>';
 					print '</td></tr>';
 				}
 				print '</table>';
 			}
-			else
-			{
+			else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3561,8 +3492,7 @@ elseif (!empty($module))
 						print '</tr>';
 					}
 				}
-				else
-				{
+				else {
 					print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
 				}
 
@@ -3571,8 +3501,7 @@ elseif (!empty($module))
 
 				print '</form>';
 			}
-			else
-			{
+			else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3622,8 +3551,7 @@ elseif (!empty($module))
 						print '</tr>';
 					}
 				}
-				else
-				{
+				else {
 					print '<tr><td>';
 					print '<span class="fa fa-file-o"></span> '.$langs->trans("FileNotYetGenerated");
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initdoc&format=php"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a></td>';
@@ -3631,8 +3559,7 @@ elseif (!empty($module))
 				}
 				print '</table>';
 			}
-			else
-			{
+			else {
 				// Use MD or asciidoc
 
 				//print $langs->trans("UseAsciiDocFormat").'<br>';
@@ -3735,14 +3662,12 @@ elseif (!empty($module))
 				try {
 					$moduleobj = new $class($db);
 				}
-				catch (Exception $e)
-				{
+				catch (Exception $e) {
 					$error++;
 					dol_print_error($e->getMessage());
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$langs->load("errors");
 				dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 05b2c56ffb8..642fa838783 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -116,8 +116,7 @@ if ($action == 'edit')
 	print '</form>';
 	print '<br>';
 }
-else
-{
+else {
 	if (!empty($arrayofparameters))
 	{
 		print '<table class="noborder centpercent">';
@@ -137,8 +136,7 @@ else
 		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
 		print '</div>';
 	}
-	else
-	{
+	else {
 		print '<br>'.$langs->trans("NothingToSetup");
 	}
 }
diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index 10bca2e8b9a..13a2b8e895c 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -165,6 +165,7 @@ class ActionsMyModule
 		global $conf, $user, $langs;
 
 		$error = 0; // Error counter
+		$disabled = 1;
 
 		/* print_r($parameters); print_r($object); echo "action: " . $action; */
 		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
@@ -231,8 +232,8 @@ class ActionsMyModule
 		dol_syslog(get_class($this).'::executeHooks action='.$action);
 
 		/* print_r($parameters); print_r($object); echo "action: " . $action; */
-		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
-		{
+		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {
+			// do something only for the context 'somecontext1' or 'somecontext2'
 		}
 
 		return $ret;
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index f84210b9198..40af5ce2f0d 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -159,6 +159,7 @@ class MyModuleApi extends DolibarrApi
 		}
 
 		$result = $db->query($sql);
+		$i = 0;
 		if ($result)
 		{
 			$num = $db->num_rows($result);
@@ -239,12 +240,11 @@ class MyModuleApi extends DolibarrApi
 			$this->myobject->$field = $value;
 		}
 
-		if ($this->myobject->update($id, DolibarrApiAccess::$user) > 0)
+		if ($this->myobject->update(DolibarrApiAccess::$user, false) > 0)
 		{
 			return $this->get($id);
 		}
-		else
-		{
+		else {
 			throw new RestException(500, $this->myobject->error);
 		}
 	}
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 2070bedf568..6f1d45fee9f 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -546,8 +546,7 @@ class MyObject extends CommonObject
 		{
 			$num = $this->getNextNumRef();
 		}
-		else
-		{
+		else {
 			$num = $this->ref;
 		}
 		$this->newref = $num;
@@ -631,8 +630,7 @@ class MyObject extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -900,8 +898,7 @@ class MyObject extends CommonObject
 
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -935,8 +932,7 @@ class MyObject extends CommonObject
 			$this->errors = $this->errors;
 			return $result;
 		}
-		else
-		{
+		else {
 			$this->lines = $result;
 			return $this->lines;
 		}
@@ -987,8 +983,7 @@ class MyObject extends CommonObject
 				{
 					return $numref;
 				}
-				else
-				{
+				else {
 					$this->error = $obj->error;
 					//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 					return "";
@@ -998,8 +993,7 @@ class MyObject extends CommonObject
 				return "";
 			}
 		}
-		else
-		{
+		else {
 			print $langs->trans("ErrorNumberingModuleNotSetup", $this->element);
 			return "";
 		}
diff --git a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
index 39b325924fc..e7d407dc8c9 100644
--- a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
@@ -147,8 +147,7 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog($this->db->error());
 			$this->error = $this->db->error();
 			return -1;
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index 98c2c94bc7b..74a05a6b5e7 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -136,9 +136,9 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -275,8 +275,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
-				else
-				{
+				else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -309,18 +308,17 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 						$contactobject = $object->contact;
 					}
 				}
-				else
-				{
+				else {
 					$socobject = $object->thirdparty;
 				}
 
 				// Make substitution
 				$substitutionarray = array(
-				'__FROM_NAME__' => $this->emetteur->name,
-				'__FROM_EMAIL__' => $this->emetteur->email,
-				'__TOTAL_TTC__' => $object->total_ttc,
-				'__TOTAL_HT__' => $object->total_ht,
-				'__TOTAL_VAT__' => $object->total_vat
+					'__FROM_NAME__' => $this->emetteur->name,
+					'__FROM_EMAIL__' => $this->emetteur->email,
+					'__TOTAL_TTC__' => $object->total_ttc,
+					'__TOTAL_HT__' => $object->total_ht,
+					'__TOTAL_VAT__' => $object->total_vat
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
@@ -392,13 +390,13 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				foreach ($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
+						if (preg_match('/logo$/', $key)) {
+							// Image
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else    // Text
-						{
+						else {
+							// Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					}
@@ -408,8 +406,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
@@ -433,8 +430,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
 								catch (OdfException $e)
@@ -508,8 +504,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 
 				return 1; // Success
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
index a611b6210bc..526c7c11213 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
@@ -141,8 +141,7 @@ class mod_myobject_standard extends ModeleNumRefMyObject
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
 		}
-		else
-		{
+		else {
 			dol_syslog("mod_myobject_standard::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 9b71971b6cf..4da40f0eb9a 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -54,13 +54,10 @@ $action = GETPOST('action', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-if (GETPOST('actioncode', 'array'))
-{
+if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -226,9 +223,7 @@ if ($object->id > 0)
 		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
 		{
 			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
 		}
 	}
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index e92c88f1364..a31e9f6acdd 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -479,8 +479,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			{
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit">'.$langs->trans("Modify").'</a>'."\n";
 			}
-			else
-			{
+			else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
 			}
 
@@ -493,8 +492,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					{
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes">'.$langs->trans("Validate").'</a>';
 					}
-					else
-					{
+					else {
 						$langs->load("errors");
 						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
 					}
@@ -537,8 +535,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			{
 				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
 			}
-			else
-			{
+			else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
 			}
 		}
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 63b114ffc10..186edc11da1 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -199,9 +199,7 @@ if ($object->id)
 	$relativepathwithnofile = 'myobject/'.dol_sanitizeFileName($object->ref).'/';
 
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index a0fcb744bb1..a37890649e2 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -292,9 +292,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
diff --git a/htdocs/modulebuilder/template/scripts/mymodule.php b/htdocs/modulebuilder/template/scripts/mymodule.php
index 02024759058..aab823d1cb0 100644
--- a/htdocs/modulebuilder/template/scripts/mymodule.php
+++ b/htdocs/modulebuilder/template/scripts/mymodule.php
@@ -164,8 +164,7 @@ if (!$error)
 	$db->commit();
 	print '--- end ok'."\n";
 }
-else
-{
+else {
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 5c3c6d7d54e..c28021a6957 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -154,7 +154,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
         include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
         $filesarray = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, '\.php', null, 'fullname');
 
-        foreach($filesarray as $key => $file)
+        foreach ($filesarray as $key => $file)
         {
             if (preg_match('/\/htdocs\/includes\//', $file['fullname'])) continue;
             if (preg_match('/\/htdocs\/custom\//', $file['fullname'])) continue;
@@ -170,7 +170,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/'.preg_quote('get_class($this)."::".__METHOD__', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
            		$ok=false;
            		break;
@@ -183,7 +183,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/(..)\s*\.\s*\$this->db->idate\(/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
                 if ($val[1] != '\'"' && $val[1] != '\'\'')
                 {
@@ -201,7 +201,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/(=|sql.+)\s*\'"\s*\.\s*\$this->(....)/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
                 if ($val[2] != 'db->' && $val[2] != 'esca')
                 {
@@ -220,7 +220,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/(..............)\$_SERVER\[\'QUERY_STRING\'\]/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
                 if ($val[1] != 'scape_htmltag(' && $val[1] != 'ing_nohtmltag(' && $val[1] != 'dol_escape_js(')
                 {
@@ -236,7 +236,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/print_liste_field_titre\(\$langs/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
                    $ok=false;
                    break;
@@ -249,7 +249,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/<br \/>/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
                 if ($file['name'] != 'functions.lib.php')
                 {
@@ -265,7 +265,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/@var\s+array\(/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
                 $ok=false;
                 break;
diff --git a/test/phpunit/CodingSqlTest.php b/test/phpunit/CodingSqlTest.php
index f56d00b5bcd..c9a5d12f3fc 100644
--- a/test/phpunit/CodingSqlTest.php
+++ b/test/phpunit/CodingSqlTest.php
@@ -158,7 +158,7 @@ class CodingSqlTest extends PHPUnit\Framework\TestCase
             print 'Process dir '.$dir."\n";
             $filesarray = scandir($dir);
 
-            foreach($filesarray as $key => $file)
+            foreach ($filesarray as $key => $file)
             {
                 if (! preg_match('/\.sql$/', $file))
                     continue;
@@ -206,14 +206,12 @@ class CodingSqlTest extends PHPUnit\Framework\TestCase
                 {
                     // Test for data files only
                 }
-                else
-                {
+                else {
                     if (preg_match('/\.key\.sql$/', $file))
                     {
                         // Test for key files only
                     }
-                    else
-                    {
+                    else {
                         // Test for non key files only
                         $result=(strpos($filecontent, 'KEY ') && strpos($filecontent, 'PRIMARY KEY') == 0);
                         print __METHOD__." Result for checking we don't have ' KEY ' instead of a sql file to create index = ".$result."\n";
@@ -244,7 +242,7 @@ class CodingSqlTest extends PHPUnit\Framework\TestCase
         $db=$this->savdb;
 
         $filesarray = scandir(DOL_DOCUMENT_ROOT.'/../dev/initdemo');
-        foreach($filesarray as $key => $file) {
+        foreach ($filesarray as $key => $file) {
             if (! preg_match('/\.sql$/', $file))
                 continue;
 
diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php
index 590accccbed..cf1cafe74b1 100644
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@@ -342,7 +342,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
         $result=$objexport->load_arrays($user, $filterdatatoexport);	// This load ->array_export_xxx properties for datatoexport
 
         // Loop on each dataset
-        foreach($objexport->array_export_code as $key => $datatoexport)
+        foreach ($objexport->array_export_code as $key => $datatoexport)
         {
         	$exportfile=$conf->export->dir_temp.'/'.$user->id.'/export_'.$datatoexport.'.csv';
 	        print "Process export for dataset ".$datatoexport." into ".$exportfile."\n";
@@ -351,7 +351,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
 	        // Generate $array_selected
 	        $i=0;
 	        $array_selected=array();
-			foreach($objexport->array_export_fields[$key] as $key => $val)
+			foreach ($objexport->array_export_fields[$key] as $key => $val)
 			{
 				$array_selected[$key]=$i++;
 			}
diff --git a/test/phpunit/FactureRecTest.php b/test/phpunit/FactureRecTest.php
index f89ab4b1f13..fa44fda619f 100644
--- a/test/phpunit/FactureRecTest.php
+++ b/test/phpunit/FactureRecTest.php
@@ -187,12 +187,11 @@ class FactureRecTest extends PHPUnit\Framework\TestCase
         {
             $retAr[]="Supplied objects are not of same class.";
         }
-        else
-        {
+        else {
             $oVarsA=get_object_vars($oA);
             $oVarsB=get_object_vars($oB);
             $aKeys=array_keys($oVarsA);
-            foreach($aKeys as $sKey)
+            foreach ($aKeys as $sKey)
             {
                 if (in_array($sKey, $fieldstoignorearray)) continue;
                 if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey])
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index 47f3a639b29..83a7c0cfbe9 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -366,12 +366,11 @@ class FactureTest extends PHPUnit\Framework\TestCase
         {
             $retAr[]="Supplied objects are not of same class.";
         }
-        else
-        {
+        else {
             $oVarsA=get_object_vars($oA);
             $oVarsB=get_object_vars($oB);
             $aKeys=array_keys($oVarsA);
-            foreach($aKeys as $sKey)
+            foreach ($aKeys as $sKey)
             {
                 if (in_array($sKey, $fieldstoignorearray)) continue;
                 if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey])
diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index f4a14373ebe..92e96fc1ad4 100644
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -154,7 +154,7 @@ class LangTest extends PHPUnit\Framework\TestCase
         include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 
 		$filesarray = scandir(DOL_DOCUMENT_ROOT.'/langs');
-		foreach($filesarray as $key => $code)
+		foreach ($filesarray as $key => $code)
 		{
 			if (! preg_match('/^[a-z]+_[A-Z]+$/', $code)) continue;
 
diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php
index f8feaa8f829..32652200c2c 100755
--- a/test/phpunit/ModulesTest.php
+++ b/test/phpunit/ModulesTest.php
@@ -144,7 +144,7 @@ class ModulesTest extends PHPUnit\Framework\TestCase
 		'Mailing','MailmanSpip','Margin','ModuleBuilder','MultiCurrency',
 		'Notification','Oauth','OpenSurvey','Paybox','Paypal','Prelevement','Printing','Product','ProductBatch','Projet','Propale','ReceiptPrinter','Resource',
 		'Salaries','Service','SocialNetworks','Societe','Stock','Stripe','SupplierProposal','Syslog','TakePos','Tax','Ticket','User','Variants','WebServices','WebServicesClient','Website','Workflow');
-		foreach($modulelist as $modlabel)
+		foreach ($modulelist as $modlabel)
 		{
     		require_once DOL_DOCUMENT_ROOT.'/core/modules/mod'.$modlabel.'.class.php';
             $class='mod'.$modlabel;
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index 10b0bd7b0b7..08338de949b 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -339,7 +339,7 @@ class UserTest extends PHPUnit\Framework\TestCase
             $oVarsA=get_object_vars($oA);
             $oVarsB=get_object_vars($oB);
             $aKeys=array_keys($oVarsA);
-            foreach($aKeys as $sKey) {
+            foreach ($aKeys as $sKey) {
                 if (in_array($sKey, $fieldstoignorearray))
                     continue;
                 if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey]) {
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index 8aada2fc03a..dc6cc93c8a5 100644
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -256,7 +256,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
     	}
-    	catch(SoapFault $exception)
+    	catch (SoapFault $exception)
     	{
     		echo $exception;
     		$result=0;
@@ -314,7 +314,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
     	}
-    	catch(SoapFault $exception)
+    	catch (SoapFault $exception)
     	{
     		echo $exception;
     		$result=0;
@@ -414,7 +414,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
     	}
-    	catch(SoapFault $exception)
+    	catch (SoapFault $exception)
     	{
     		echo $exception;
     		$result=0;
@@ -433,7 +433,6 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     	$this->assertEquals('OK', $result['result']['result_code']);
     	$this->assertEquals('ref-phpunit-2', $result['ref_ext']);
 
-
     	return $result;
     }
 }
diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php
index 33d842f6d39..803247e2598 100644
--- a/test/phpunit/WebservicesOrdersTest.php
+++ b/test/phpunit/WebservicesOrdersTest.php
@@ -169,7 +169,7 @@ class WebservicesOrdersTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php
index 34686cbec92..10c74bb1821 100644
--- a/test/phpunit/WebservicesOtherTest.php
+++ b/test/phpunit/WebservicesOtherTest.php
@@ -170,7 +170,7 @@ class WebservicesOtherTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
@@ -198,7 +198,7 @@ class WebservicesOtherTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index 70a8c12a498..90911b289bc 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -188,7 +188,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
@@ -251,7 +251,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
@@ -314,7 +314,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php
index 1106164b4ee..285fc6d5ddb 100644
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@@ -214,7 +214,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
-    	} catch(SoapFault $exception) {
+    	} catch (SoapFault $exception) {
     		echo $exception;
     		$result=0;
     	}
@@ -268,7 +268,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $this->soapclient->call($WS_METHOD, $parameters, $this->_ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
@@ -330,7 +330,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->_ns, '');
-    	} catch(SoapFault $exception) {
+    	} catch (SoapFault $exception) {
     		echo $exception;
     		$result=0;
     	}
@@ -390,7 +390,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->_ns, '');
-    	} catch(SoapFault $exception) {
+    	} catch (SoapFault $exception) {
     		echo $exception;
     		$result=0;
     	}
diff --git a/test/phpunit/WebservicesUserTest.php b/test/phpunit/WebservicesUserTest.php
index bb68f413741..f78386fc5bf 100644
--- a/test/phpunit/WebservicesUserTest.php
+++ b/test/phpunit/WebservicesUserTest.php
@@ -170,7 +170,7 @@ class WebservicesUserTest extends PHPUnit\Framework\TestCase
         print __METHOD__."Call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
@@ -197,7 +197,7 @@ class WebservicesUserTest extends PHPUnit\Framework\TestCase
         print __METHOD__."Call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }

From ccadb1ec7a88f667ec95a11a898dc17759638be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 00:47:16 +0200
Subject: [PATCH 323/490] add new rule

---
 htdocs/adherents/admin/adherent.php           |  16 +-
 htdocs/adherents/admin/adherent_emails.php    |   7 +-
 htdocs/adherents/admin/website.php            |  12 +-
 htdocs/adherents/agenda.php                   |   4 +-
 .../actions_adherentcard_common.class.php     |  12 +-
 .../actions_adherentcard_default.class.php    |   4 +-
 htdocs/adherents/card.php                     | 140 +++++-------------
 htdocs/adherents/cartes/carte.php             |  10 +-
 htdocs/adherents/class/adherent.class.php     |  22 +--
 .../adherents/class/adherent_type.class.php   |  52 ++-----
 htdocs/adherents/class/api_members.class.php  |   6 +-
 .../class/api_memberstypes.class.php          |   6 +-
 .../class/api_subscriptions.class.php         |   6 +-
 htdocs/adherents/class/subscription.class.php |  32 +---
 htdocs/adherents/document.php                 |   8 +-
 htdocs/adherents/htpasswd.php                 |   4 +-
 htdocs/adherents/index.php                    |  12 +-
 htdocs/adherents/ldap.php                     |  16 +-
 htdocs/adherents/list.php                     |  16 +-
 htdocs/adherents/stats/byproperties.php       |  11 +-
 htdocs/adherents/stats/geo.php                |  11 +-
 htdocs/adherents/subscription.php             |  72 +++------
 htdocs/adherents/subscription/card.php        |  32 +---
 htdocs/core/lib/functions.lib.php             |   4 +-
 24 files changed, 149 insertions(+), 366 deletions(-)

diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 6b2d432fe46..ca5011849b1 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -71,9 +71,7 @@ if ($action == 'updateall')
     {
         setEventMessages('ErrorFailedToSaveDate', null, 'errors');
         $db->rollback();
-    }
-    else
-    {
+    } else {
         setEventMessages('RecordModifiedSuccessfully', null, 'mesgs');
         $db->commit();
     }
@@ -101,9 +99,7 @@ if ($action == 'update' || $action == 'add')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -199,9 +195,7 @@ if ($conf->facture->enabled)
 		print '<td>';
 		print $form->selectarray('ADHERENT_VAT_FOR_SUBSCRIPTIONS', array('0'=>$langs->trans("NoVatOnSubscription"), 'defaultforfoundationcountry'=>$langs->trans("Default")), (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) ? '0' : $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS), 0);
 		print '</td>';
-	}
-	else
-	{
+	} else {
 		print '<td class="right">';
 		print $langs->trans("WarningModuleNotActive", $langs->transnoentities("Module85Name"));
 		print '</td>';
@@ -234,12 +228,12 @@ print '<br>';
  */
 $constantes = array(
 		'ADHERENT_CARD_TYPE',
-//		'ADHERENT_CARD_BACKGROUND',
+		//'ADHERENT_CARD_BACKGROUND',
 		'ADHERENT_CARD_HEADER_TEXT',
 		'ADHERENT_CARD_TEXT',
 		'ADHERENT_CARD_TEXT_RIGHT',
 		'ADHERENT_CARD_FOOTER_TEXT'
-		);
+);
 
 print load_fiche_titre($langs->trans("MembersCards"), '', '');
 
diff --git a/htdocs/adherents/admin/adherent_emails.php b/htdocs/adherents/admin/adherent_emails.php
index e0675a6124a..f59a27c170b 100644
--- a/htdocs/adherents/admin/adherent_emails.php
+++ b/htdocs/adherents/admin/adherent_emails.php
@@ -74,9 +74,7 @@ if ($action == 'updateall')
     {
         setEventMessages('ErrorFailedToSaveDate', null, 'errors');
         $db->rollback();
-    }
-    else
-    {
+    } else {
         setEventMessages('RecordModifiedSuccessfully', null, 'mesgs');
         $db->commit();
     }
@@ -102,8 +100,7 @@ if ($action == 'update' || $action == 'add')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index a8cdc06784e..50a7f58e8c5 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -61,16 +61,16 @@ if ($action == 'update')
     $res = dolibarr_set_const($db, "MEMBER_NEWFORM_EDITAMOUNT", $editamount, 'chaine', 0, '', $conf->entity);
     $res = dolibarr_set_const($db, "MEMBER_NEWFORM_PAYONLINE", $payonline, 'chaine', 0, '', $conf->entity);
     if ($forcetype < 0) $res = dolibarr_del_const($db, "MEMBER_NEWFORM_FORCETYPE", $conf->entity);
-    else                $res = dolibarr_set_const($db, "MEMBER_NEWFORM_FORCETYPE", $forcetype, 'chaine', 0, '', $conf->entity);
+    else {
+        $res = dolibarr_set_const($db, "MEMBER_NEWFORM_FORCETYPE", $forcetype, 'chaine', 0, '', $conf->entity);
+    }
 
     if (!$res > 0) $error++;
 
  	if (!$error)
     {
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
 	    setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -145,9 +145,7 @@ if (empty($conf->global->MEMBER_ENABLE_PUBLIC))
 	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMEMBER_ENABLE_PUBLIC&value=1'.$param.'">';
 	$enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
 	$enabledisablehtml .= '</a>';
-}
-else
-{
+} else {
 	// Button on, click to disable
 	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMEMBER_ENABLE_PUBLIC&value=0'.$param.'">';
 	$enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index 20d712e6179..f1d83a4b314 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -53,9 +53,7 @@ if (GETPOST('actioncode', 'array'))
 {
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index eeee48e2138..44046d5a26e 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -118,9 +118,7 @@ abstract class ActionsAdherentCardCommon
         	{
         		$this->tpl['company'] = $objsoc->getNomUrl(1);
         		$this->tpl['company_id'] = $objsoc->id;
-        	}
-        	else
-        	{
+        	} else {
         		$this->tpl['company'] = $form->select_company($this->object->socid, 'socid', '', 1);
         	}
 
@@ -190,9 +188,7 @@ abstract class ActionsAdherentCardCommon
 
         		$objsoc->fetch($this->object->socid);
         		$this->tpl['company'] = $objsoc->getNomUrl(1);
-        	}
-        	else
-        	{
+        	} else {
         		$this->tpl['company'] = $langs->trans("AdherentNotLinkedToThirdParty");
         	}
 
@@ -273,9 +269,7 @@ abstract class ActionsAdherentCardCommon
 
                 $this->object->country_code = $obj->code;
                 $this->object->country = $langs->trans("Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->libelle;
-            }
-            else
-            {
+            } else {
                 dol_print_error($this->db);
             }
         }
diff --git a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
index 60bb2ecd034..f248256a547 100644
--- a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
+++ b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
@@ -105,9 +105,7 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
             $this->tpl['actionstodo'] = show_actions_todo($conf, $langs, $db, $objsoc, $this->object, 1);
 
             $this->tpl['actionsdone'] = show_actions_done($conf, $langs, $db, $objsoc, $this->object, 1);
-		}
-		else
-		{
+        } else {
 			// Confirm delete contact
         	if ($action == 'delete' && $user->rights->adherent->supprimer)
         	{
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index c913d6a1b49..7a5880fc317 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -209,9 +209,7 @@ if (empty($reshook))
 				$langs->load("errors");
 				setEventMessages($langs->trans($nuser->error), null, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -231,9 +229,7 @@ if (empty($reshook))
 				setEventMessages($langs->trans($company->error), null, 'errors');
 				setEventMessages($company->error, $company->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -376,21 +372,15 @@ if (empty($reshook))
 							if (!dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1, 0, $_FILES['photo']['error']) > 0)
 							{
 								setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
-							}
-							else
-							{
+							} else {
 							    // Create thumbs
 							    $object->addThumbs($newfile);
 							}
 						}
-					}
-					else
-					{
+					} else {
 						setEventMessages("ErrorBadImageFormat", null, 'errors');
 					}
-				}
-				else
-				{
+				} else {
 					switch ($_FILES['photo']['error'])
 					{
 						case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
@@ -412,15 +402,11 @@ if (empty($reshook))
 					header("Location: ".$backtopage);
 					exit;
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$action = '';
 			}
-		}
-		else
-		{
+		} else {
 			$action = 'edit';
 		}
 	}
@@ -527,8 +513,7 @@ if (empty($reshook))
 			if (empty($login)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login")), null, 'errors');
-			}
-			else {
+			} else {
 				$sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$db->escape($login)."'";
 				$result = $db->query($sql);
 				if ($result) {
@@ -588,9 +573,7 @@ if (empty($reshook))
 				$rowid = $object->id;
 				$id = $object->id;
 				$action = '';
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 
 				if ($object->error) {
@@ -616,15 +599,11 @@ if (empty($reshook))
 			{
 				header("Location: ".$backtopage);
 				exit;
-			}
-			else
-			{
+			} else {
 				header("Location: list.php");
 				exit;
 			}
-		}
-		else
-		{
+		} else {
 			$errmesg = $object->error;
 		}
 	}
@@ -689,9 +668,7 @@ if (empty($reshook))
 					}
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			if ($object->error) {
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -703,9 +680,7 @@ if (empty($reshook))
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 		$action = '';
@@ -770,9 +745,7 @@ if (empty($reshook))
 						}
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 
 				if ($object->error) {
@@ -857,9 +830,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 	}
    	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
     $objcanvas->display_canvas($action); // Show template
-}
-else
-{
+} else {
 	// -----------------------------------------
 	// When used in standard mode
 	// -----------------------------------------
@@ -1027,9 +998,7 @@ else
 			if ($object->country_id)
 			{
 				print $formcompany->select_state(GETPOST('state_id', 'int') ?GETPOST('state_id', 'int') : $object->state_id, $object->country_code);
-			}
-			else
-			{
+			} else {
 				print $countrynotdefined;
 			}
 			print '</td></tr>';
@@ -1084,9 +1053,7 @@ else
 		if (!empty($backtopage))
 		{
 			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
-		}
-		else
-		{
+		} else {
 			print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		}
 		print '</div>';
@@ -1123,9 +1090,7 @@ else
 			if ($resql)
 			{
 				$obj = $db->fetch_object($resql);
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 			$object->country_id = $obj->rowid;
@@ -1204,9 +1169,7 @@ else
 		if ($user->rights->adherent->creer)
 		{
 			print $form->selectarray("typeid", $adht->liste_array(), (GETPOSTISSET("typeid") ?GETPOST("typeid", 'int') : $object->typeid));
-		}
-		else
-		{
+		} else {
 			print $adht->getNomUrl(1);
 			print '<input type="hidden" name="typeid" value="'.$object->typeid.'">';
 		}
@@ -1334,9 +1297,7 @@ else
 				$company = new Societe($db);
 				$result = $company->fetch($object->socid);
 				print $company->getNomUrl(1);
-			}
-			else
-			{
+			} else {
 				print $langs->trans("NoThirdPartyAssociatedToMember");
 			}
 			print '</td></tr>';
@@ -1432,9 +1393,7 @@ else
 			{
 				$companyname = $object->company;
 				if (!empty($fullname)) $companyalias = $fullname;
-			}
-			else
-			{
+			} else {
 				$companyname = $fullname;
 				if (!empty($object->company)) $companyalias = $object->company;
 			}
@@ -1629,8 +1588,7 @@ else
 		{
 			print '<tr><td>'.$langs->trans("Password").'</td><td>'.preg_replace('/./i', '*', $object->pass);
 			if ($object->pass) print preg_replace('/./i', '*', $object->pass);
-			else
-			{
+			else {
 			    if ($user->admin) print $langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
 			    else print $langs->trans("Hidden");
 			}
@@ -1651,9 +1609,7 @@ else
 			if ($object->hasDelay()) {
 				print " ".img_warning($langs->trans("Late"));
 			}
-		}
-		else
-		{
+		} else {
 			if ($object->need_subscription == 0)
             {
                 print $langs->trans("SubscriptionNotNeeded");
@@ -1662,9 +1618,7 @@ else
 			{
 				print $langs->trans("SubscriptionNotRecorded");
 				if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
-			}
-			else
-			{
+			} else {
 				print $langs->trans("SubscriptionNotReceived");
 				if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
 			}
@@ -1691,17 +1645,12 @@ else
 				print '</td>';
 				print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 				print '</tr></table></form>';
-			}
-			else
-			{
-				if ($object->socid)
-				{
+			} else {
+				if ($object->socid) {
 					$company = new Societe($db);
 					$result = $company->fetch($object->socid);
 					print $company->getNomUrl(1);
-				}
-				else
-				{
+				} else {
 					print $langs->trans("NoThirdPartyAssociatedToMember");
 				}
 			}
@@ -1716,14 +1665,13 @@ else
 		if ($action == 'editlogin')
 		{
 			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'userid', '');
-		}
-		else
-		{
+		} else {
 			if ($object->user_id)
 			{
 				$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'none');
+			} else {
+				print $langs->trans("NoDolibarrAccess");
 			}
-			else print $langs->trans("NoDolibarrAccess");
 		}
 		print '</td></tr>';
 
@@ -1803,9 +1751,7 @@ else
 				if ($user->rights->adherent->creer)
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=edit">'.$langs->trans("Modify")."</a></div>";
-				}
-				else
-				{
+				} else {
 					print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Modify").'</font></div>';
 				}
 
@@ -1815,9 +1761,7 @@ else
 					if ($user->rights->adherent->creer)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Validate")."</a></div>\n";
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Validate").'</font></div>';
 					}
 				}
@@ -1828,9 +1772,7 @@ else
 					if ($user->rights->adherent->creer)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Reenable")."</a></div>\n";
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Reenable")."</font></div>";
 					}
 				}
@@ -1841,9 +1783,7 @@ else
 					if ($user->rights->adherent->supprimer)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=resign">'.$langs->trans("Resiliate")."</a></div>\n";
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Resiliate")."</font></div>";
 					}
 				}
@@ -1855,9 +1795,7 @@ else
 					{
 						if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
 						else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrThirdParty")."</font></div>";
 					}
 				}
@@ -1869,9 +1807,7 @@ else
 					{
 						if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
 						else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrLogin")."</font></div>";
 					}
 				}
@@ -1880,9 +1816,7 @@ else
 				if ($user->rights->adherent->supprimer)
 				{
 					print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete">'.$langs->trans("Delete")."</a></div>\n";
-				}
-				else
-				{
+				} else {
 					print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Delete")."</font></div>";
 				}
 
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index 86bf523ac51..345542f8cba 100644
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -162,11 +162,9 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
                             'photo'=>$objp->photo
                         );
                     }
-                }
-                else
-                {
+                } else {
                     $arrayofmembers[] = array(
-                    	'textleft'=>$textleft,
+                        'textleft'=>$textleft,
                         'textheader'=>$textheader,
                         'textfooter'=>$textfooter,
                         'textright'=>$textright,
@@ -226,9 +224,7 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
     	{
     		dol_print_error('', $result);
     	}
-    }
-    else
-    {
+    } else {
     	dol_print_error($db);
     }
 
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 55504a547c2..a7410d87973 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1282,10 +1282,11 @@ class Adherent extends CommonObject
 
 				$this->country_id = $obj->country_id;
 				$this->country_code = $obj->country_code;
-				if ($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code)
+				if ($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code) {
 					$this->country = $langs->transnoentitiesnoconv("Country".$obj->country_code);
-				else
+				} else {
 					$this->country = $obj->country;
+				}
 
 				$this->phone = $obj->phone;
 				$this->phone_perso = $obj->phone_perso;
@@ -2037,12 +2038,13 @@ class Adherent extends CommonObject
 		if ($withpictoimg > -2 && $withpictoimg != 2) {
 			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result .= '<span class="nopadding valignmiddle'.((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled').
 				($morecss ? ' usertext'.$morecss : '').'">';
-			if ($mode == 'login')
+			if ($mode == 'login') {
 				$result .= dol_trunc($this->login, $maxlen);
-			elseif ($mode == 'ref')
+			} elseif ($mode == 'ref') {
 				$result .= $this->id;
-			else
+			} else {
 				$result .= $this->getFullName($langs, '', ($mode == 'firstname' ? 2 : -1), $maxlen);
+			}
 			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result .= '</span>';
 		}
 		if ($withpictoimg) $result .= '</div>';
@@ -2803,10 +2805,11 @@ class Adherent extends CommonObject
 						$listofids .= ', ...';
 						break;
 					}
-					if (empty($listofids))
+					if (empty($listofids)) {
 						$listofids .= ' [';
-					else
+					} else {
 						$listofids .= ', ';
+					}
 					$listofids .= $idmember;
 					$i++;
 				}
@@ -2823,10 +2826,11 @@ class Adherent extends CommonObject
 							$listofids .= ', ...';
 							break;
 						}
-						if (empty($listofids))
+						if (empty($listofids)) {
 							$listofids .= ' [';
-						else
+						} else {
 							$listofids .= ', ';
+						}
 						$listofids .= $idmember;
 						$i++;
 					}
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 4af80ab4a63..199bd5e8a51 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -146,9 +146,7 @@ class AdherentType extends CommonObject
                 $this->multilangs["$obj->lang"]["email"] = $obj->email;
             }
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = "Error: ".$this->db->lasterror()." - ".$sql;
             return -1;
         }
@@ -184,9 +182,7 @@ class AdherentType extends CommonObject
                     $sql2 .= " label='".$this->db->escape($this->label)."',";
                     $sql2 .= " description='".$this->db->escape($this->description)."'";
                     $sql2 .= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($key)."'";
-                }
-                else
-                {
+                } else {
                     $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type_lang (fk_type, lang, label, description";
                     $sql2 .= ")";
                     $sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->label)."',";
@@ -214,9 +210,7 @@ class AdherentType extends CommonObject
                     $sql2 .= " label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
                     $sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
                     $sql2 .= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($key)."'";
-                }
-                else
-                {
+                } else {
                     $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type_lang (fk_type, lang, label, description";
                     $sql2 .= ")";
                     $sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->multilangs["$key"]["label"])."',";
@@ -231,9 +225,7 @@ class AdherentType extends CommonObject
                         return -1;
                     }
                 }
-            }
-            else
-            {
+            } else {
                 // language is not current language and we didn't provide a multilang description for this language
             }
         }
@@ -274,9 +266,7 @@ class AdherentType extends CommonObject
             }
             // End call triggers
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this).'::delMultiLangs error='.$this->error, LOG_ERR);
             return -1;
@@ -336,16 +326,12 @@ class AdherentType extends CommonObject
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -418,16 +404,12 @@ class AdherentType extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 				return -$error;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -458,9 +440,7 @@ class AdherentType extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -511,9 +491,7 @@ class AdherentType extends CommonObject
 			}
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -552,9 +530,7 @@ class AdherentType extends CommonObject
 					$i++;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			print $this->db->error();
 		}
 		return $adherenttypes;
@@ -608,9 +584,7 @@ class AdherentType extends CommonObject
 			$this->members = $ret;
 
 			return $ret;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 8e2e0d278f0..a5d72f3b78f 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -239,10 +239,8 @@ class Members extends DolibarrApi
         if ($member->update(DolibarrApiAccess::$user) >= 0)
         {
             return $this->get($id);
-        }
-        else
-        {
-        	throw new RestException(500, $member->error);
+        } else {
+            throw new RestException(500, $member->error);
         }
     }
 
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index 98cb25b7fc3..c9d12206962 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -207,10 +207,8 @@ class MembersTypes extends DolibarrApi
         if ($membertype->update(DolibarrApiAccess::$user) >= 0)
         {
             return $this->get($id);
-        }
-        else
-        {
-        	throw new RestException(500, $membertype->error);
+        } else {
+            throw new RestException(500, $membertype->error);
         }
     }
 
diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
index c9804e5d802..11ac1f17113 100644
--- a/htdocs/adherents/class/api_subscriptions.class.php
+++ b/htdocs/adherents/class/api_subscriptions.class.php
@@ -196,10 +196,8 @@ class Subscriptions extends DolibarrApi
         if ($subscription->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else
-        {
-        	throw new RestException(500, $subscription->error);
+        } else {
+            throw new RestException(500, $subscription->error);
         }
     }
 
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index e512e1152bb..e1ec3bd1753 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -232,14 +232,10 @@ class Subscription extends CommonObject
                 $this->note           = $obj->note;
                 $this->fk_bank        = $obj->fk_bank;
                 return 1;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -286,9 +282,7 @@ class Subscription extends CommonObject
                 if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
                 // End call triggers
             }
-        }
-        else
-        {
+        } else {
             $error++;
             $this->error = $this->db->lasterror();
         }
@@ -355,28 +349,20 @@ class Subscription extends CommonObject
                         {
                             $this->db->commit();
                             return 1;
-                        }
-                        else
-                        {
+                        } else {
                             $this->error = $accountline->error;
                             $this->db->rollback();
                             return -1;
                         }
-                    }
-                    else
-                    {
+                    } else {
                         $this->db->commit();
                         return 1;
                     }
-                }
-                else
-                {
+                } else {
                     $this->db->commit();
                     return 0;
                 }
-            }
-            else
-            {
+            } else {
                 $error++;
                 $this->error = $this->db->lasterror();
             }
@@ -488,9 +474,7 @@ class Subscription extends CommonObject
             }
 
             $this->db->free($result);
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
     }
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index 05ccf20169c..291b1916e55 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -158,14 +158,10 @@ if ($id > 0)
 		$param = '&id='.$object->id;
 		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 		print "<br><br>";
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
-}
-else
-{
+} else {
     $langs->load("errors");
 	print $langs->trans("ErrorRecordNotFound");
 }
diff --git a/htdocs/adherents/htpasswd.php b/htdocs/adherents/htpasswd.php
index b7aa8da5d14..385e34d6538 100644
--- a/htdocs/adherents/htpasswd.php
+++ b/htdocs/adherents/htpasswd.php
@@ -79,9 +79,7 @@ if ($resql)
 		$i++;
 	}
 	print "<hr>\n";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 6d069386592..001730d67b1 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -331,9 +331,7 @@ if ($resql)
 				$staticmember->fk_soc = $obj->fk_soc;
 				$staticmember->fetch_thirdparty();
 				$staticmember->name = $staticmember->thirdparty->name;
-			}
-			else
-			{
+			} else {
 				$staticmember->name = $obj->company;
 			}
 			$staticmember->ref = $staticmember->getFullName($langs);
@@ -349,9 +347,7 @@ if ($resql)
 	}
 	print "</table></div>";
 	print "<br>";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -411,9 +407,7 @@ if ($resql)
 	}
 	print "</table></div>";
 	print "<br>";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index 6a49f99fbf4..43d6a34fcf9 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -176,9 +176,7 @@ if ($result > 0)
 	{
 	    $langs->load("errors");
 	    print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Member")).'</font></td></tr>';
-	}
-    else
-    {
+	} else {
     	$records = $ldap->getAttribute($dn, $search);
 
     	//print_r($records);
@@ -189,23 +187,17 @@ if ($result > 0)
     		if (!is_array($records))
     		{
     			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
-    		}
-    		else
-    		{
+    		} else {
     			$result = show_ldap_content($records, 0, $records['count'], true);
     		}
-    	}
-    	else
-    	{
+    	} else {
     		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
     	}
     }
 
 	$ldap->unbind();
 	$ldap->close();
-}
-else
-{
+} else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
 
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 6cb34192845..72745b54614 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -214,9 +214,7 @@ if (empty($reshook))
             if ($result < 0 && !count($tmpmember->errors))
     	    {
     	        setEventMessages($tmpmember->error, $tmpmember->errors, 'errors');
-    	    }
-    	    else
-    	    {
+    	    } else {
     	        if ($result > 0) $nbclose++;
     	    }
         }
@@ -226,9 +224,7 @@ if (empty($reshook))
             setEventMessages($langs->trans("XMembersClosed", $nbclose), null, 'mesgs');
 
             $db->commit();
-        }
-        else
-        {
+        } else {
             $db->rollback();
         }
 	}
@@ -858,17 +854,13 @@ while ($i < min($num, $limit))
 				print " ".img_warning($langs->trans("SubscriptionLate").$textlate);
 			}
 			print '</td>';
-		}
-		else
-		{
+		} else {
 			print '<td class="nowrap left">';
 			if ($obj->subscription == 'yes')
 			{
 				print $langs->trans("SubscriptionNotReceived");
 				if ($obj->statut > 0) print " ".img_warning();
-			}
-			else
-			{
+			} else {
 				print '&nbsp;';
 			}
 			print '</td>';
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index 7927c2e3f00..70c6ab0689b 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -93,9 +93,7 @@ if ($resql)
 		$i++;
 	}
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -106,13 +104,10 @@ dol_fiche_head($head, 'statsbyproperties', $langs->trans("Statistics"), -1, 'use
 
 
 // Print title
-if (!count($data))
-{
+if (!count($data)) {
 	print $langs->trans("NoValidatedMemberYet").'<br>';
 	print '<br>';
-}
-else
-{
+} else {
 	print $langs->trans("MembersByNature").'<br>';
 	print '<br>';
 }
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 5b51008a9a2..bde4d5c949c 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -200,9 +200,7 @@ if ($mode)
             $i++;
         }
         $db->free($resql);
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
@@ -218,15 +216,12 @@ if ($mode && !count($data))
 {
     print $langs->trans("NoValidatedMemberYet").'<br>';
     print '<br>';
-}
-else
-{
+} else {
     if ($mode == 'memberbycountry') print $langs->trans("MembersByCountryDesc").'<br>';
     elseif ($mode == 'memberbystate') print $langs->trans("MembersByStateDesc").'<br>';
     elseif ($mode == 'memberbytown') print $langs->trans("MembersByTownDesc").'<br>';
     elseif ($mode == 'memberbyregion') print $langs->trans("MembersByRegion").'<br>'; //+
-    else
-    {
+    else {
         print $langs->trans("MembersStatisticsDesc").'<br>';
         print '<br>';
         print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbycountry">'.$langs->trans("MembersStatisticsByCountries").'</a><br>';
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 47866fc8981..3bf821db04e 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -128,13 +128,11 @@ if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights
 			$langs->load("errors");
 			setEventMessages($company->error, $company->errors, 'errors');
 		}
-		else
-		{
+		else {
 			$action = 'addsubscription';
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -276,8 +274,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
             $error++;
             $action = 'addsubscription';
         }
-        else
-        {
+        else {
             if (!empty($conf->banque->enabled) && $_POST["paymentsave"] != 'none')
             {
                 if ($_POST["subscription"])
@@ -286,8 +283,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                     if ($_POST["paymentsave"] != 'invoiceonly' && !$_POST["operation"]) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
                     if ($_POST["paymentsave"] != 'invoiceonly' && !($_POST["accountid"] > 0)) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("FinancialAccount"));
                 }
-                else
-                {
+                else {
                     if ($_POST["accountid"])   $errmsg = $langs->trans("ErrorDoNotProvideAccountsIfNullAmount");
                 }
                 if ($errmsg)
@@ -323,8 +319,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-			else
-			{
+			else {
 				// If an invoice was created, it is into $object->invoice
 			}
         }
@@ -333,8 +328,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
         {
             $db->commit();
         }
-        else
-        {
+        else {
             $db->rollback();
             $action = 'addsubscription';
         }
@@ -403,13 +397,11 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                 	$errmsg = $object->error;
                 	setEventMessages($object->error, $object->errors, 'errors');
                 }
-                else
-                {
+                else {
                 	setEventMessages($langs->trans("EmailSentToMember", $object->email), null, 'mesgs');
                 }
             }
-            else
-            {
+            else {
             	setEventMessages($langs->trans("NoEmailSentToMember"), null, 'mesgs');
             }
         }
@@ -548,15 +540,13 @@ if ($rowid > 0)
 	        print " ".img_warning($langs->trans("Late"));
 	    }
 	}
-	else
-	{
+	else {
 	    if (!$adht->subscription)
 	    {
 	        print $langs->trans("SubscriptionNotRecorded");
 	        if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
 	    }
-	    else
-	    {
+	    else {
 	        print $langs->trans("SubscriptionNotReceived");
 	        if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
 	    }
@@ -587,16 +577,14 @@ if ($rowid > 0)
 			print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
 		}
-		else
-		{
+		else {
 			if ($object->fk_soc)
 			{
 				$company = new Societe($db);
 				$result = $company->fetch($object->fk_soc);
 				print $company->getNomUrl(1);
 			}
-			else
-			{
+			else {
 				print $langs->trans("NoThirdPartyAssociatedToMember");
 			}
 		}
@@ -623,8 +611,7 @@ if ($rowid > 0)
 	{
 		$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'userid', '');
 	}
-	else
-	{
+	else {
 		if ($object->user_id)
 		{
 			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'none');
@@ -755,9 +742,7 @@ if ($rowid > 0)
 
                         $accountstatic->ref = $objp->ref;
                         print $accountstatic->getNomUrl(1);
-                    }
-                    else
-                    {
+                    } else {
                         print '&nbsp;';
                     }
                     print '</td>';
@@ -773,9 +758,7 @@ if ($rowid > 0)
             }
 
             print "</table>";
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
     }
@@ -814,9 +797,7 @@ if ($rowid > 0)
         	if (GETPOST('paymentsave') == 'bankdirect')     $bankdirect = 1;
         	if (GETPOST('paymentsave') == 'invoiceonly')    $invoiceonly = 1;
         	if (GETPOST('paymentsave') == 'bankviainvoice') $bankviainvoice = 1;
-        }
-        else
-        {
+        } else {
         	if (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankviainvoice' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) $bankviainvoice = 1;
         	elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankdirect' && !empty($conf->banque->enabled)) $bankdirect = 1;
         	elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'invoiceonly' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) $invoiceonly = 1;
@@ -870,9 +851,7 @@ if ($rowid > 0)
 			{
 				$companyname = $object->company;
 				if (!empty($fullname)) $companyalias = $fullname;
-			}
-			else
-			{
+			} else {
 				$companyname = $fullname;
 				if (!empty($object->company)) $companyalias = $object->company;
 			}
@@ -999,8 +978,7 @@ if ($rowid > 0)
                     //if (empty($object->fk_soc)) print ' disabled';
                     print '> '.$langs->trans("MoreActionInvoiceOnly");
                     if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
-                    else
-					{
+                    else {
                     	print ' (';
                     	if (empty($object->fk_soc)) print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
                     	print $langs->trans("NoThirdPartyAssociatedToMember");
@@ -1009,8 +987,7 @@ if ($rowid > 0)
                     	print '</a>)';
                     }
                     if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
-					if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (!empty($conf->product->enabled) || !empty($conf->service->enabled)))
-					{
+					if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
 						$prodtmp = new Product($db);
 						$prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
 						print '. '.$langs->transnoentitiesnoconv("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(1)); // must use noentitiesnoconv to avoid to encode html into getNomUrl of product
@@ -1024,8 +1001,7 @@ if ($rowid > 0)
                     //if (empty($object->fk_soc)) print ' disabled';
                     print '> '.$langs->trans("MoreActionBankViaInvoice");
                     if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
-                    else
-					{
+                    else {
                     	print ' (';
                     	if (empty($object->fk_soc)) print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
                     	print $langs->trans("NoThirdPartyAssociatedToMember");
@@ -1083,9 +1059,7 @@ if ($rowid > 0)
         if (!$object->email)
         {
             print $langs->trans("NoEMail");
-        }
-        else
-        {
+        } else {
             $adht = new AdherentType($db);
             $adht->fetch($object->typeid);
 
@@ -1158,9 +1132,7 @@ if ($rowid > 0)
 
     //print '</td></tr>';
     //print '</table>';
-}
-else
-{
+} else {
     $langs->load("errors");
     print $langs->trans("ErrorRecordNotFound");
 }
diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index 02941cb9967..303a4aa7b5a 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -85,9 +85,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 			if ($accountline->rappro)
 			{
 				$errmsg = $langs->trans("SubscriptionLinkedToConciliatedTransaction");
-			}
-			else
-			{
+			} else {
 				$accountline->datev = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
 				$accountline->dateo = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
 				$accountline->amount = $_POST["amount"];
@@ -116,17 +114,13 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 
 				header("Location: card.php?rowid=".$object->id);
 				exit;
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 
 			    if ($object->error)
 				{
 					$errmsg = $object->error;
-				}
-				else
-				{
+				} else {
 					foreach ($object->errors as $error)
 					{
 						if ($errmsg) $errmsg .= '<br>';
@@ -135,9 +129,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 				}
 				$action = '';
 			}
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 	}
@@ -151,9 +143,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->adherent-
     {
     	header("Location: ".DOL_URL_ROOT."/adherents/card.php?rowid=".$object->fk_adherent);
     	exit;
-    }
-    else
-    {
+    } else {
     	$mesg = $adh->error;
     }
 }
@@ -248,9 +238,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit')
 				$bankline = new AccountLine($db);
 				$result = $bankline->fetch($object->fk_bank);
 				print $bankline->getNomUrl(1, 0, 'showall');
-			}
-			else
-			{
+			} else {
 				print $langs->trans("NoneF");
 			}
 			print '</td></tr>';
@@ -355,9 +343,7 @@ if ($rowid && $action != 'edit')
 				$bankline = new AccountLine($db);
 				$result = $bankline->fetch($object->fk_bank);
 				print $bankline->getNomUrl(1, 0, 'showall');
-			}
-			else
-			{
+			} else {
 				print $langs->trans("NoneF");
 			}
 			print '</td></tr>';
@@ -382,9 +368,7 @@ if ($rowid && $action != 'edit')
 		if (!$bankline->rappro)
 		{
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id."&action=edit\">".$langs->trans("Modify")."</a></div>";
-		}
-		else
-		{
+		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.$langs->trans("BankLineConciliated")."\" href=\"#\">".$langs->trans("Modify")."</a></div>";
 		}
 	}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e3059ade21e..66d8c6b773a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4047,8 +4047,8 @@ function dol_print_error($db = '', $error = '', $errors = null)
 	}
 
 	if (empty($dolibarr_main_prod)) print $out;
-	else	// This should not happen, except if there is a bug somewhere. Enabled and check log in such case.
-	{
+	else {
+		// This should not happen, except if there is a bug somewhere. Enabled and check log in such case.
 		print 'This website or feature is currently temporarly not available.<br><br>This may be due to a maintenance operation. Current status of operation are on next line...<br><br>'."\n";
 		$langs->load("errors");
 		print $langs->trans("DolibarrHasDetectedError").'. ';

From 4be4f975b00db33cc4d7ffed32ce419a5ae34991 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 01:03:03 +0200
Subject: [PATCH 324/490] add new rule

---
 htdocs/index.php      |  4 +-
 htdocs/main.inc.php   | 85 +++++++++++++------------------------------
 htdocs/master.inc.php | 16 +++-----
 htdocs/viewimage.php  | 25 ++++---------
 4 files changed, 40 insertions(+), 90 deletions(-)

diff --git a/htdocs/index.php b/htdocs/index.php
index 7f6e462839b..38fde99682c 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -301,9 +301,7 @@ if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
 	                $board = new $class($db);
 	                $board->load_state_board($user);
 	                $boardloaded[$class] = $board;
-	            }
-	            else
-	            {
+	            } else {
 	                $board = $boardloaded[$class];
 	            }
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 49c48e34ec1..733ded3e447 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -131,17 +131,13 @@ function analyseVarsForSqlAndScriptsInjection(&$var, $type)
 			if (analyseVarsForSqlAndScriptsInjection($key, $type) && analyseVarsForSqlAndScriptsInjection($value, $type))
 			{
 				//$var[$key] = $value;	// This is useless
-			}
-			else
-			{
+			} else {
 				print 'Access refused by SQL/Script injection protection in main.inc.php (type='.htmlentities($type).' key='.htmlentities($key).' value='.htmlentities($value).' page='.htmlentities($_SERVER["REQUEST_URI"]).')';
 				exit;
 			}
 		}
 		return true;
-	}
-	else
-	{
+	} else {
 		return (testSqlAndScriptInject($var, $type) <= 0);
 	}
 }
@@ -271,13 +267,11 @@ if (!empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERV
 				$newurl = preg_replace('/^http:/i', 'https:', $_SERVER["SCRIPT_URI"]);
 			}
 		}
-		else	// Check HTTPS environment variable (Apache/mod_ssl only)
-		{
+		else {
+			// Check HTTPS environment variable (Apache/mod_ssl only)
 			$newurl = preg_replace('/^http:/i', 'https:', DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
 		}
-	}
-	else
-	{
+	} else {
 		// Check HTTPS environment variable (Apache/mod_ssl only)
 		$newurl = $conf->file->main_force_https.$_SERVER["REQUEST_URI"];
 	}
@@ -288,9 +282,7 @@ if (!empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERV
 		dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);
 		header("Location: ".$newurl);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_syslog("main.inc: dolibarr_main_force_https is on but we failed to forge new https url so no redirect is done", LOG_WARNING);
 	}
 }
@@ -432,9 +424,7 @@ if (!defined('NOLOGIN'))
 	if (defined('MAIN_AUTHENTICATION_MODE'))
 	{
 		$dolibarr_main_authentication = constant('MAIN_AUTHENTICATION_MODE');
-	}
-	else
-	{
+	} else {
 		// Authentication mode
 		if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr';
 		// Authentication mode: forceuser
@@ -658,9 +648,7 @@ if (!defined('NOLOGIN'))
 			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
 			exit;
 		}
-	}
-	else
-	{
+	} else {
 		// We are already into an authenticated session
 		$login = $_SESSION["dol_login"];
 		$entity = $_SESSION["dol_entity"];
@@ -710,9 +698,7 @@ if (!defined('NOLOGIN'))
 			if (GETPOST('lang', 'aZ09'))       $paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');
 			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
 			exit;
-		}
-		else
-		{
+		} else {
 		    // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 		    $hookmanager->initHooks(array('main'));
 
@@ -814,9 +800,7 @@ if (!defined('NOLOGIN'))
 			session_destroy();
 			dol_print_error($db, 'Error in some triggers USER_LOGIN or in some hooks afterLogin');
 			exit;
-		}
-		else
-		{
+		} else {
 			$db->commit();
 		}
 
@@ -986,9 +970,7 @@ if (empty($conf->browser->firefox))
 	define('ROWS_7', 7);
 	define('ROWS_8', 8);
 	define('ROWS_9', 9);
-}
-else
-{
+} else {
 	define('ROWS_1', 0);
 	define('ROWS_2', 1);
 	define('ROWS_3', 2);
@@ -1008,9 +990,8 @@ if (!defined('NOREQUIREMENU'))
 	if (empty($user->socid))    // If internal user or not defined
 	{
 		$conf->standard_menu = (empty($conf->global->MAIN_MENU_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENU_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENU_STANDARD) : $conf->global->MAIN_MENU_STANDARD_FORCED);
-	}
-	else                        // If external user
-	{
+	} else {
+		// If external user
 		$conf->standard_menu = (empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENUFRONT_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENUFRONT_STANDARD) : $conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
 	}
 
@@ -1333,9 +1314,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			    if (preg_match('/^(http|\/\/)/i', $cssfile))
 			    {
 			        $urltofile = $cssfile;
-			    }
-			    else
-			    {
+			    } else {
 			        $urltofile = dol_buildpath($cssfile, 1);
 			    }
 				print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.$urltofile;
@@ -1457,9 +1436,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
                 if (GETPOST('mode', 'aZ09') == 'Full_inline')
                 {
                 	print 'CKEDITOR.disableAutoInline = false;'."\n";
-                }
-                else
-                {
+                } else {
                 	print 'CKEDITOR.disableAutoInline = true;'."\n";
                 }
                 print '</script>'."\n";
@@ -1505,9 +1482,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
                     if (preg_match('/^(http|\/\/)/i', $jsfile))
                     {
                         print '<script src="'.$jsfile.'"></script>'."\n";
-                    }
-                    else
-                    {
+                    } else {
                         print '<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
                     }
                 }
@@ -1606,9 +1581,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 				$logouttext .= '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/logout.php">';
 				$logouttext .= img_picto($langs->trans('Logout'), 'sign-out', '', false, 0, 0, '', 'atoplogin');
 				$logouttext .= '</a>';
-			}
-			else
-			{
+			} else {
 				$logouthtmltext .= $langs->trans("NoLogoutProcessWithAuthMode", $_SESSION["dol_authmode"]);
 				$logouttext .= img_picto($langs->trans('Logout'), 'sign-out', '', false, 0, 0, '', 'atoplogin opacitymedium');
 			}
@@ -1625,11 +1598,10 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		{
 			if ($result == 0)
 				$toprightmenu .= $hookmanager->resPrint; // add
-			else
+			else {
 				$toprightmenu = $hookmanager->resPrint; // replace
-		}
-		else
-		{
+			}
+		} else {
 			$toprightmenu .= $result; // For backward compatibility
 		}
 
@@ -2362,8 +2334,9 @@ function main_area($title = '')
             print '<table class="centpercent div-table-responsive">'."\n";
             print '<tbody>';
             print '<tr><td rowspan="0" class="width20p">';
-            if ($conf->global->MAIN_SHOW_LOGO && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($conf->global->MAIN_INFO_SOCIETE_LOGO))
+            if ($conf->global->MAIN_SHOW_LOGO && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($conf->global->MAIN_INFO_SOCIETE_LOGO)) {
                 print '<img id="mysoc-info-header-logo" style="max-width:100%" alt="" src="'.DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_LOGO)).'">';
+            }
             print '</td><td  rowspan="0" class="width50p"></td></tr>'."\n";
             print '<tr><td class="titre bold">'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM).'</td></tr>'."\n";
             print '<tr><td>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ADDRESS).'<br>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP).' '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN).'</td></tr>'."\n";
@@ -2398,9 +2371,7 @@ function getHelpParamFor($helppagename, $langs)
 		$helpbaseurl = '%s';
 		$helppage = $helppagename;
 		$mode = 'local';
-	}
-	else
-	{
+	} else {
 		// If WIKI URL
 		$reg = array();
 		if (preg_match('/^es/i', $langs->defaultlang))
@@ -2538,10 +2509,8 @@ if (!function_exists("llxFooter"))
 			{
 				$title = img_warning().' '.$langs->trans('CoreErrorTitle');
 				print ajax_dialog($title, $langs->trans('CoreErrorMessage'));
-			}
-			// html version
-			else
-			{
+			} else {
+				// html version
 				$msg = img_warning().' '.$langs->trans('CoreErrorMessage');
 				print '<div class="error">'.$msg.'</div>';
 			}
@@ -2683,9 +2652,7 @@ if (!function_exists("llxFooter"))
 			    			</script>
 						<?php
 					}
-				}
-				else
-				{
+				} else {
 					$now = dol_now();
 					print "\n<!-- NO JS CODE TO ENABLE the anonymous Ping. It was disabled -->\n";
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 4005e6a2ed5..1ef1f9c1f50 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -60,14 +60,14 @@ if (defined('TEST_DB_FORCE_TYPE')) $conf->db->type = constant('TEST_DB_FORCE_TYP
 
 // Set properties specific to conf file
 $conf->file->main_limit_users = $dolibarr_main_limit_users;
-$conf->file->mailing_limit_sendbyweb	= $dolibarr_mailing_limit_sendbyweb;
-$conf->file->mailing_limit_sendbycli	= $dolibarr_mailing_limit_sendbycli;
+$conf->file->mailing_limit_sendbyweb = $dolibarr_mailing_limit_sendbyweb;
+$conf->file->mailing_limit_sendbycli = $dolibarr_mailing_limit_sendbycli;
 $conf->file->main_authentication = empty($dolibarr_main_authentication) ? '' : $dolibarr_main_authentication; // Identification mode
 $conf->file->main_force_https = empty($dolibarr_main_force_https) ? '' : $dolibarr_main_force_https; // Force https
-$conf->file->strict_mode 				= empty($dolibarr_strict_mode) ? '' : $dolibarr_strict_mode; // Force php strict mode (for debug)
+$conf->file->strict_mode = empty($dolibarr_strict_mode) ? '' : $dolibarr_strict_mode; // Force php strict mode (for debug)
 $conf->file->instance_unique_id = empty($dolibarr_main_instance_unique_id) ? (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id; // Unique id of instance
 $conf->file->dol_document_root = array('main' => (string) DOL_DOCUMENT_ROOT); // Define array of document root directories ('/home/htdocs')
-$conf->file->dol_url_root				= array('main' => (string) DOL_URL_ROOT); // Define array of url root path ('' or '/dolibarr')
+$conf->file->dol_url_root = array('main' => (string) DOL_URL_ROOT); // Define array of url root path ('' or '/dolibarr')
 if (!empty($dolibarr_main_document_root_alt))
 {
 	// dolibarr_main_document_root_alt can contains several directories
@@ -132,9 +132,7 @@ if (!defined('NOREQUIREDB'))
 				$langs->setDefaultLang('auto');
 				$langs->load("website");
 				print $langs->trans("SorryWebsiteIsCurrentlyOffLine");
-			}
-			else
-			{
+			} else {
 				print "SorryWebsiteIsCurrentlyOffLine";
 			}
 			print '</div>';
@@ -225,9 +223,7 @@ if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
 			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
 			$nexturl = DOL_URL_ROOT.'/user/logout.php';
 			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
-		}
-		else
-		{
+		} else {
 			print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
 			$nexturl = DOL_URL_ROOT.'/';
 			print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index b2534ee92dd..9970026a524 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -155,20 +155,14 @@ if (!empty($hashp))
 				// We remove first level of directory
 				$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 				//var_dump($original_file); exit;
-			}
-			else
-			{
+			} else {
 				accessforbidden('Bad link. File is from another module part.', 0, 0, 1);
 			}
-		}
-		else
-		{
+		} else {
 			$modulepart = $moduleparttocheck;
 			$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 		}
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"), 0, 0, 1);
 	}
@@ -208,9 +202,7 @@ elseif (isset($_GET["publictakepos"]))
 	if (! empty($conf->global->TAKEPOS_AUTO_ORDER)) {
 		$accessallowed = 1; // Only if TakePOS Public Auto Order is enabled and received publictakepos variable
 	}
-}
-else
-{
+} else {
 	// Basic protection (against external users only)
 	if ($user->socid > 0)
 	{
@@ -290,9 +282,8 @@ if ($modulepart == 'barcode')
     {
         $result = $module->buildBarCode($code, $encoding, $readable);
     }
-}
-else					// Open and return file
-{
+} else {
+    // Open and return file
     clearstatcache();
 
     $filename = basename($fullpath_original_file);
@@ -314,9 +305,7 @@ else					// Open and return file
     {
         top_httphead($type);
         header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');
-    }
-    else
-    {
+    } else {
         top_httphead('image/png');
         header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');
     }

From b70efb5d7b4bdbb76afd8549b62ba64a0b4ca2f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 01:10:33 +0200
Subject: [PATCH 325/490] add new rule

---
 .travis.yml                        |  4 ++--
 htdocs/filefunc.inc.php            | 11 +++--------
 htdocs/zapier/admin/setup.php      |  3 +--
 htdocs/zapier/class/hook.class.php |  2 +-
 htdocs/zapier/hook_agenda.php      |  8 ++------
 htdocs/zapier/hook_card.php        |  8 ++------
 htdocs/zapier/hook_document.php    |  4 +---
 7 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9958556d42d..752dd572371 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -291,8 +291,8 @@ script:
   # Ensure we catch errors
   set -e
   # Exclusions are defined in the ruleset.xml file
-  #phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
-  if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .; fi
+  phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
+  #if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .; fi
   set +e
   echo
 
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index b70419de5f4..d1a33d24344 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -87,9 +87,7 @@ if (!$result && !empty($_SERVER["GATEWAY_INTERFACE"]))    // If install not done
     	// Note: If calling page was an index.php not into htdocs (ie comm/index.php, ...), then this redirect will fails,
     	// but we don't want to change this because when URL is correct, we must be sure the redirect to install/index.php will be correct.
         $path = '';
-    }
-    else
-    {
+    } else {
         // If what we look is not index.php, we can try to guess location of root. May not work all the time.
     	// There is no real solution, because the only way to know the apache url relative path is to have it into conf file.
     	// If it fails to find correct $path, then only solution is to ask user to enter the correct URL to index.php or install/index.php
@@ -114,9 +112,7 @@ if (!$result && !empty($_SERVER["GATEWAY_INTERFACE"]))    // If install not done
 if (!empty($dolibarr_strict_mode))
 {
 	error_reporting(E_ALL | E_STRICT);
-}
-else
-{
+} else {
 	error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED));
 }
 
@@ -156,8 +152,7 @@ if (!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck))
     {
     	$csrfattack = false;
     	if (empty($_SERVER['HTTP_REFERER'])) $csrfattack = true; // An evil browser was used
-    	else
-    	{
+    	else {
     		$tmpa = parse_url($_SERVER['HTTP_HOST']);
     		$tmpb = parse_url($_SERVER['HTTP_REFERER']);
     		if ((empty($tmpa['host']) ? $tmpa['path'] : $tmpa['host']) != (empty($tmpb['host']) ? $tmpb['path'] : $tmpb['host'])) $csrfattack = true;
diff --git a/htdocs/zapier/admin/setup.php b/htdocs/zapier/admin/setup.php
index e608ece5bb7..8a74b525c2b 100644
--- a/htdocs/zapier/admin/setup.php
+++ b/htdocs/zapier/admin/setup.php
@@ -110,8 +110,7 @@ if ($action == 'edit') {
         print '<div class="tabsAction">';
         print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
         print '</div>';
-    } else
-    {
+    } else {
         print '<br>'.$langs->trans("NothingToSetup");
     }
 }
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index b985c77434e..280780f8f25 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -398,7 +398,7 @@ class Hook extends CommonObject
     {
         $result = $this->fetchCommon($id, $ref);
         if ($result > 0 && !empty($this->table_element_line)) {
-            $this->fetchLines();
+            //$this->fetchLines();
         }
         return $result;
     }
diff --git a/htdocs/zapier/hook_agenda.php b/htdocs/zapier/hook_agenda.php
index ca046392cec..b036057cb04 100644
--- a/htdocs/zapier/hook_agenda.php
+++ b/htdocs/zapier/hook_agenda.php
@@ -45,9 +45,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -217,9 +215,7 @@ if ($object->id > 0)
     	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
     	{
         	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
-    	}
-    	else
-    	{
+    	} else {
         	print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
     	}
     }
diff --git a/htdocs/zapier/hook_card.php b/htdocs/zapier/hook_card.php
index c2755892716..660e972cf28 100644
--- a/htdocs/zapier/hook_card.php
+++ b/htdocs/zapier/hook_card.php
@@ -338,9 +338,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		if ($user->rights->mymodule->write)
     		{
     			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-    		}
-    		else
-    		{
+    		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
     		}
 
@@ -367,9 +365,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		if ($user->rights->mymodule->delete)
     		{
     			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
-    		}
-    		else
-    		{
+    		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
     		}
     	}
diff --git a/htdocs/zapier/hook_document.php b/htdocs/zapier/hook_document.php
index cdc5f8c7ddf..4c390a118e2 100644
--- a/htdocs/zapier/hook_document.php
+++ b/htdocs/zapier/hook_document.php
@@ -132,9 +132,7 @@ if ($object->id)
 	print '</div>';
 
 	dol_fiche_end();
-}
-else
-{
+} else {
 	accessforbidden('', 0, 0);
 }
 

From ee6fadd0d57dd74c8ecfa52f6f18c530c6928486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 01:41:27 +0200
Subject: [PATCH 326/490] add new rule

---
 dev/tools/dolibarr-postgres2mysql.php         |   21 +-
 dev/translation/autotranslator.class.php      |   19 +-
 dev/translation/sanity_check_en_langfiles.php |    6 +-
 dev/translation/strip_language_file.php       |    9 +-
 htdocs/admin/agenda.php                       |    6 +-
 htdocs/admin/agenda_extsites.php              |    9 +-
 htdocs/admin/agenda_other.php                 |   30 +-
 htdocs/admin/agenda_reminder.php              |   12 +-
 htdocs/admin/agenda_xcal.php                  |    3 +-
 htdocs/admin/bank.php                         |   12 +-
 htdocs/admin/barcode.php                      |   15 +-
 htdocs/admin/bom.php                          |   33 +-
 htdocs/admin/boxes.php                        |   15 +-
 htdocs/admin/chequereceipts.php               |   12 +-
 htdocs/admin/clicktodial.php                  |    6 +-
 htdocs/admin/commande.php                     |   48 +-
 htdocs/admin/company.php                      |   42 +-
 htdocs/admin/compta.php                       |    3 +-
 htdocs/admin/confexped.php                    |    3 +-
 htdocs/admin/const.php                        |   21 +-
 htdocs/admin/contract.php                     |   30 +-
 htdocs/admin/dav.php                          |    9 +-
 htdocs/admin/debugbar.php                     |    3 +-
 htdocs/admin/defaultvalues.php                |   24 +-
 htdocs/admin/delais.php                       |    3 +-
 htdocs/admin/dict.php                         |   42 +-
 .../class/PSWebServiceLibrary.class.php       |   22 +-
 .../admin/dolistore/class/dolistore.class.php |    6 +-
 htdocs/admin/ecm.php                          |    9 +-
 htdocs/admin/emailcollector_card.php          |   30 +-
 htdocs/admin/emailcollector_list.php          |    3 +-
 htdocs/admin/expedition.php                   |   27 +-
 htdocs/admin/expensereport.php                |   30 +-
 htdocs/admin/expensereport_ik.php             |    3 +-
 htdocs/admin/expensereport_rules.php          |   27 +-
 htdocs/admin/external_rss.php                 |   21 +-
 htdocs/admin/facture.php                      |   48 +-
 htdocs/admin/fckeditor.php                    |    9 +-
 htdocs/admin/fichinter.php                    |   36 +-
 htdocs/admin/geoipmaxmind.php                 |    6 +-
 htdocs/admin/holiday.php                      |   30 +-
 htdocs/admin/ihm.php                          |    6 +-
 htdocs/admin/ldap.php                         |   21 +-
 htdocs/admin/ldap_contacts.php                |    9 +-
 htdocs/admin/ldap_groups.php                  |    9 +-
 htdocs/admin/ldap_members.php                 |    9 +-
 htdocs/admin/ldap_members_types.php           |    9 +-
 htdocs/admin/ldap_users.php                   |   15 +-
 htdocs/admin/limits.php                       |    9 +-
 htdocs/admin/livraison.php                    |   30 +-
 htdocs/admin/loan.php                         |    6 +-
 htdocs/admin/mailing.php                      |    3 +-
 htdocs/admin/mailman.php                      |   15 +-
 htdocs/admin/mails.php                        |   42 +-
 htdocs/admin/mails_emailing.php               |   39 +-
 htdocs/admin/mails_senderprofile_list.php     |    3 +-
 htdocs/admin/mails_templates.php              |   45 +-
 htdocs/admin/menus.php                        |    3 +-
 htdocs/admin/menus/edit.php                   |   30 +-
 htdocs/admin/menus/index.php                  |    6 +-
 htdocs/admin/menus/other.php                  |    3 +-
 htdocs/admin/modulehelp.php                   |   18 +-
 htdocs/admin/modules.php                      |   65 +-
 htdocs/admin/mrp.php                          |   33 +-
 htdocs/admin/multicurrency.php                |    9 +-
 htdocs/admin/notification.php                 |    9 +-
 htdocs/admin/oauth.php                        |    3 +-
 htdocs/admin/oauthlogintokens.php             |   15 +-
 htdocs/admin/payment.php                      |    6 +-
 htdocs/admin/pdf.php                          |    3 +-
 htdocs/admin/perms.php                        |    3 +-
 htdocs/admin/prelevement.php                  |    3 +-
 htdocs/admin/propal.php                       |   48 +-
 htdocs/admin/receiptprinter.php               |    6 +-
 htdocs/admin/reception_setup.php              |   24 +-
 htdocs/admin/resource.php                     |    3 +-
 htdocs/admin/security.php                     |   24 +-
 htdocs/admin/security_other.php               |   21 +-
 htdocs/admin/sms.php                          |    9 +-
 htdocs/admin/socialnetworks.php               |    6 +-
 htdocs/admin/spip.php                         |    6 +-
 htdocs/admin/stock.php                        |   30 +-
 htdocs/admin/supplier_invoice.php             |   27 +-
 htdocs/admin/supplier_order.php               |   36 +-
 htdocs/admin/supplier_payment.php             |   21 +-
 htdocs/admin/supplier_proposal.php            |   45 +-
 htdocs/admin/syslog.php                       |    6 +-
 htdocs/admin/system/about.php                 |    3 +-
 htdocs/admin/system/constall.php              |    6 +-
 htdocs/admin/system/database-tables.php       |    6 +-
 htdocs/admin/system/database.php              |    3 +-
 htdocs/admin/system/dbtable.php               |    3 +-
 htdocs/admin/system/dolibarr.php              |   18 +-
 htdocs/admin/system/filecheck.php             |   33 +-
 htdocs/admin/system/modules.php               |    9 +-
 htdocs/admin/system/perf.php                  |   36 +-
 htdocs/admin/system/phpinfo.php               |   21 +-
 htdocs/admin/system/xdebug.php                |    6 +-
 htdocs/admin/taxes.php                        |   18 +-
 htdocs/admin/ticket.php                       |    3 +-
 htdocs/admin/ticket_public.php                |    3 +-
 htdocs/admin/tools/dolibarr_export.php        |   17 +-
 htdocs/admin/tools/dolibarr_import.php        |    3 +-
 htdocs/admin/tools/export.php                 |    3 +-
 htdocs/admin/tools/export_files.php           |    3 +-
 htdocs/admin/tools/listevents.php             |    6 +-
 htdocs/admin/tools/listsessions.php           |    6 +-
 htdocs/admin/tools/update.php                 |    6 +-
 htdocs/admin/translation.php                  |   30 +-
 htdocs/admin/user.php                         |   33 +-
 htdocs/admin/usergroup.php                    |   18 +-
 htdocs/admin/website.php                      |   24 +-
 htdocs/admin/website_options.php              |    3 +-
 htdocs/admin/workflow.php                     |    9 +-
 htdocs/api/admin/index.php                    |   12 +-
 htdocs/api/class/api.class.php                |    3 +-
 htdocs/api/class/api_access.class.php         |    3 +-
 htdocs/api/class/api_login.class.php          |    3 +-
 htdocs/api/class/api_setup.class.php          |   33 +-
 htdocs/api/index.php                          |    3 +-
 htdocs/asset/admin/setup.php                  |    3 +-
 htdocs/asset/card.php                         |    6 +-
 htdocs/asset/class/asset.class.php            |    3 +-
 htdocs/asset/class/asset_type.class.php       |   24 +-
 htdocs/asset/document.php                     |    3 +-
 htdocs/asset/list.php                         |    3 +-
 htdocs/asset/type.php                         |   18 +-
 htdocs/asterisk/cidlookup.php                 |    3 +-
 htdocs/asterisk/wrapper.php                   |    6 +-
 htdocs/barcode/codeinit.php                   |   15 +-
 htdocs/barcode/printsheet.php                 |    3 +-
 htdocs/blockedlog/admin/blockedlog.php        |    6 +-
 htdocs/blockedlog/admin/blockedlog_list.php   |   24 +-
 htdocs/blockedlog/ajax/block-info.php         |    3 +-
 htdocs/blockedlog/class/authority.class.php   |   15 +-
 htdocs/blockedlog/class/blockedlog.class.php  |   20 +-
 htdocs/bom/bom_agenda.php                     |    6 +-
 htdocs/bom/bom_card.php                       |   15 +-
 htdocs/bom/bom_document.php                   |    3 +-
 htdocs/bom/bom_list.php                       |   15 +-
 htdocs/bom/class/api_boms.class.php           |    3 +-
 htdocs/bom/class/bom.class.php                |   21 +-
 htdocs/bom/tpl/objectline_create.tpl.php      |    3 +-
 htdocs/bookmarks/admin/bookmark.php           |    3 +-
 htdocs/bookmarks/bookmarks.lib.php            |    6 +-
 htdocs/bookmarks/card.php                     |   18 +-
 htdocs/bookmarks/class/bookmark.class.php     |   15 +-
 htdocs/bookmarks/list.php                     |   12 +-
 htdocs/cashdesk/admin/cashdesk.php            |    9 +-
 htdocs/cashdesk/affContenu.php                |    6 +-
 htdocs/cashdesk/class/Auth.class.php          |    3 +-
 htdocs/cashdesk/class/Facturation.class.php   |   18 +-
 htdocs/cashdesk/facturation.php               |   12 +-
 htdocs/cashdesk/facturation_dhtml.php         |    6 +-
 htdocs/cashdesk/facturation_verif.php         |   15 +-
 htdocs/cashdesk/index.php                     |    6 +-
 htdocs/cashdesk/index_verif.php               |    6 +-
 htdocs/cashdesk/tpl/liste_articles.tpl.php    |    3 +-
 htdocs/cashdesk/tpl/validation1.tpl.php       |    3 +-
 htdocs/cashdesk/validation_verif.php          |   18 +-
 htdocs/comm/action/card.php                   |   66 +-
 htdocs/comm/action/class/actioncomm.class.php |   69 +-
 .../comm/action/class/cactioncomm.class.php   |    9 +-
 htdocs/comm/action/class/ical.class.php       |    9 +-
 htdocs/comm/action/document.php               |    6 +-
 htdocs/comm/action/index.php                  |   82 +-
 htdocs/comm/action/list.php                   |   21 +-
 htdocs/comm/action/pertype.php                |   36 +-
 htdocs/comm/action/peruser.php                |   42 +-
 htdocs/comm/action/rapport/index.php          |    3 +-
 htdocs/comm/card.php                          |   54 +-
 htdocs/comm/contact.php                       |    3 +-
 htdocs/comm/index.php                         |   36 +-
 htdocs/comm/mailing/advtargetemailing.php     |    3 +-
 htdocs/comm/mailing/card.php                  |   99 +-
 htdocs/comm/mailing/cibles.php                |   39 +-
 .../mailing/class/advtargetemailing.class.php |   21 +-
 .../html.formadvtargetemailing.class.php      |    6 +-
 htdocs/comm/mailing/class/mailing.class.php   |   39 +-
 htdocs/comm/mailing/index.php                 |    9 +-
 htdocs/comm/mailing/list.php                  |    9 +-
 htdocs/comm/multiprix.php                     |    3 +-
 htdocs/comm/propal/card.php                   |   45 +-
 .../comm/propal/class/api_proposals.class.php |    6 +-
 htdocs/comm/propal/class/propal.class.php     |  200 +-
 htdocs/comm/propal/contact.php                |   12 +-
 htdocs/comm/propal/document.php               |    3 +-
 htdocs/comm/propal/index.php                  |    6 +-
 htdocs/comm/propal/list.php                   |   15 +-
 htdocs/comm/propal/stats/index.php            |    9 +-
 htdocs/comm/prospect/index.php                |    3 +-
 htdocs/comm/prospect/recap-prospect.php       |    3 +-
 htdocs/comm/recap-client.php                  |    3 +-
 htdocs/comm/remise.php                        |   18 +-
 htdocs/comm/remx.php                          |   60 +-
 htdocs/commande/card.php                      |   63 +-
 htdocs/commande/class/api_orders.class.php    |    3 +-
 htdocs/commande/class/commande.class.php      |  200 +-
 htdocs/commande/contact.php                   |   12 +-
 htdocs/commande/customer.php                  |    3 +-
 htdocs/commande/document.php                  |    6 +-
 htdocs/commande/index.php                     |    6 +-
 htdocs/commande/list.php                      |    9 +-
 htdocs/commande/orderstoinvoice.php           |   27 +-
 htdocs/commande/stats/index.php               |    9 +-
 htdocs/core/actions_addupdatedelete.inc.php   |   41 +-
 htdocs/core/actions_builddoc.inc.php          |    6 +-
 htdocs/core/actions_comments.inc.php          |    9 +-
 htdocs/core/actions_extrafields.inc.php       |   33 +-
 htdocs/core/actions_fetchobject.inc.php       |    3 +-
 htdocs/core/actions_linkedfiles.inc.php       |   17 +-
 htdocs/core/actions_massactions.inc.php       |   78 +-
 htdocs/core/actions_sendmails.inc.php         |   15 +-
 htdocs/core/actions_setmoduleoptions.inc.php  |    9 +-
 htdocs/core/ajax/ajaxdirpreview.php           |   14 +-
 htdocs/core/ajax/ajaxdirtree.php              |    2 +-
 htdocs/core/ajax/check_notifications.php      |    6 +-
 htdocs/core/ajax/loadinplace.php              |    6 +-
 htdocs/core/ajax/saveinplace.php              |   15 +-
 htdocs/core/ajax/vatrates.php                 |    3 +-
 htdocs/core/ajax/ziptown.php                  |    5 +-
 htdocs/core/boxes/box_actions.php             |    3 +-
 htdocs/core/boxes/box_activity.php            |    3 +-
 htdocs/core/boxes/box_bookmarks.php           |    3 +-
 htdocs/core/boxes/box_external_rss.php        |    3 +-
 htdocs/core/boxes/box_factures_imp.php        |    3 +-
 htdocs/core/boxes/box_ficheinter.php          |    6 +-
 .../boxes/box_graph_invoices_permonth.php     |   12 +-
 .../box_graph_invoices_supplier_permonth.php  |   12 +-
 .../core/boxes/box_graph_orders_permonth.php  |   12 +-
 .../box_graph_orders_supplier_permonth.php    |   12 +-
 .../boxes/box_graph_product_distribution.php  |    6 +-
 .../boxes/box_graph_propales_permonth.php     |   12 +-
 htdocs/core/boxes/box_produits.php            |    3 +-
 .../core/boxes/box_produits_alerte_stock.php  |    6 +-
 htdocs/core/boxes/box_project.php             |    3 +-
 htdocs/core/boxes/box_services_contracts.php  |    6 +-
 htdocs/core/boxes/box_services_expired.php    |    6 +-
 htdocs/core/boxes/box_supplier_orders.php     |    3 +-
 ...box_supplier_orders_awaiting_reception.php |    3 +-
 htdocs/core/boxes/modules_boxes.php           |    9 +-
 htdocs/core/class/CMailFile.class.php         |   51 +-
 htdocs/core/class/CSMSFile.class.php          |   15 +-
 htdocs/core/class/ccountry.class.php          |   12 +-
 htdocs/core/class/comment.class.php           |    9 +-
 .../core/class/commondocgenerator.class.php   |    5 +-
 htdocs/core/class/commoninvoice.class.php     |   39 +-
 htdocs/core/class/commonobject.class.php      |  383 +--
 htdocs/core/class/commonobjectline.class.php  |    3 +-
 htdocs/core/class/conf.class.php              |    3 +-
 htdocs/core/class/coreobject.class.php        |   33 +-
 htdocs/core/class/cstate.class.php            |    9 +-
 htdocs/core/class/ctypent.class.php           |   12 +-
 htdocs/core/class/cunits.class.php            |   24 +-
 htdocs/core/class/discount.class.php          |   51 +-
 htdocs/core/class/dolgeoip.class.php          |   18 +-
 htdocs/core/class/dolgraph.class.php          |   33 +-
 .../core/class/emailsenderprofile.class.php   |    3 +-
 htdocs/core/class/evalmath.class.php          |    6 +-
 htdocs/core/class/events.class.php            |    6 +-
 htdocs/core/class/extrafields.class.php       |   88 +-
 htdocs/core/class/extralanguages.class.php    |   37 +-
 htdocs/core/class/fileupload.class.php        |    9 +-
 htdocs/core/class/fiscalyear.class.php        |   18 +-
 htdocs/core/class/hookmanager.class.php       |    3 +-
 htdocs/core/class/html.form.class.php         |  398 +--
 .../core/class/html.formaccounting.class.php  |   18 +-
 htdocs/core/class/html.formactions.class.php  |   12 +-
 htdocs/core/class/html.formadmin.class.php    |   12 +-
 htdocs/core/class/html.formcompany.class.php  |   36 +-
 htdocs/core/class/html.formcontract.class.php |   12 +-
 htdocs/core/class/html.formfile.class.php     |  138 +-
 .../class/html.formintervention.class.php     |   12 +-
 htdocs/core/class/html.formmail.class.php     |   54 +-
 htdocs/core/class/html.formmargin.class.php   |    3 +-
 htdocs/core/class/html.formother.class.php    |   56 +-
 htdocs/core/class/html.formprojet.class.php   |   36 +-
 htdocs/core/class/html.formpropal.class.php   |    9 +-
 htdocs/core/class/html.formsms.class.php      |   30 +-
 .../class/html.formsocialcontrib.class.php    |    9 +-
 htdocs/core/class/html.formwebsite.class.php  |   18 +-
 htdocs/core/class/infobox.class.php           |   20 +-
 htdocs/core/class/interfaces.class.php        |   15 +-
 htdocs/core/class/ldap.class.php              |   92 +-
 htdocs/core/class/lessc.class.php             | 2663 +++++++++--------
 htdocs/core/class/link.class.php              |   18 +-
 htdocs/core/class/menubase.class.php          |   21 +-
 htdocs/core/class/notify.class.php            |   30 +-
 htdocs/core/class/openid.class.php            |   12 +-
 htdocs/core/class/rssparser.class.php         |   36 +-
 htdocs/core/class/smtps.class.php             |   51 +-
 htdocs/core/class/stats.class.php             |   21 +-
 htdocs/core/class/translate.class.php         |   17 +-
 htdocs/core/class/utils.class.php             |   44 +-
 htdocs/core/commonfieldsinexport.inc.php      |    3 +-
 htdocs/core/datepicker.php                    |   18 +-
 htdocs/core/db/DoliDB.class.php               |   17 +-
 htdocs/core/db/mssql.class.php                |   57 +-
 htdocs/core/db/mysqli.class.php               |   27 +-
 htdocs/core/db/pgsql.class.php                |   24 +-
 htdocs/core/db/sqlite3.class.php              |   15 +-
 htdocs/core/extrafieldsinexport.inc.php       |    3 +-
 .../filemanagerdol/connectors/php/basexml.php |    6 +-
 .../connectors/php/commands.php               |   24 +-
 .../core/filemanagerdol/connectors/php/io.php |   12 +-
 .../filemanagerdol/connectors/php/util.php    |    6 +-
 htdocs/core/get_info.php                      |    5 +-
 htdocs/core/get_menudiv.php                   |    2 +-
 htdocs/core/lib/admin.lib.php                 |   63 +-
 htdocs/core/lib/agenda.lib.php                |    6 +-
 htdocs/core/lib/ajax.lib.php                  |    3 +-
 htdocs/core/lib/bank.lib.php                  |    3 +-
 htdocs/core/lib/barcode.lib.php               |    9 +-
 htdocs/core/lib/company.lib.php               |   39 +-
 htdocs/core/lib/cron.lib.php                  |    3 +-
 htdocs/core/lib/date.lib.php                  |   33 +-
 htdocs/core/lib/doc.lib.php                   |    9 +-
 htdocs/core/lib/doleditor.lib.php             |    3 +-
 htdocs/core/lib/ecm.lib.php                   |    3 +-
 htdocs/core/lib/files.lib.php                 |  101 +-
 htdocs/core/lib/format_cards.lib.php          |    3 +-
 htdocs/core/lib/functions.lib.php             |  247 +-
 htdocs/core/lib/functions2.lib.php            |   68 +-
 htdocs/core/lib/functionsnumtoword.lib.php    |    3 +-
 htdocs/core/lib/geturl.lib.php                |   12 +-
 htdocs/core/lib/images.lib.php                |   12 +-
 htdocs/core/lib/invoice2.lib.php              |    6 +-
 htdocs/core/lib/json.lib.php                  |    8 +-
 htdocs/core/lib/ldap.lib.php                  |    3 +-
 htdocs/core/lib/memory.lib.php                |   18 +-
 htdocs/core/lib/modulebuilder.lib.php         |   15 +-
 htdocs/core/lib/parsemd.lib.php               |    3 +-
 htdocs/core/lib/payments.lib.php              |   15 +-
 htdocs/core/lib/pdf.lib.php                   |   52 +-
 htdocs/core/lib/price.lib.php                 |   20 +-
 htdocs/core/lib/product.lib.php               |    3 +-
 htdocs/core/lib/project.lib.php               |   27 +-
 htdocs/core/lib/security.lib.php              |   18 +-
 htdocs/core/lib/security2.lib.php             |   23 +-
 htdocs/core/lib/sendings.lib.php              |   12 +-
 htdocs/core/lib/signature.lib.php             |    6 +-
 htdocs/core/lib/tax.lib.php                   |   33 +-
 htdocs/core/lib/ticket.lib.php                |   21 +-
 htdocs/core/lib/treeview.lib.php              |    9 +-
 htdocs/core/lib/usergroups.lib.php            |  105 +-
 htdocs/core/lib/website.lib.php               |   47 +-
 htdocs/core/lib/xcal.lib.php                  |    9 +-
 htdocs/core/login/functions_dolibarr.php      |   12 +-
 htdocs/core/login/functions_ldap.php          |    6 +-
 htdocs/core/login/functions_openid.php        |    6 +-
 htdocs/core/menus/standard/auguria.lib.php    |   12 +-
 htdocs/core/menus/standard/auguria_menu.php   |   26 +-
 htdocs/core/menus/standard/eldy.lib.php       |   18 +-
 htdocs/core/menus/standard/eldy_menu.php      |   26 +-
 htdocs/core/menus/standard/empty.php          |   20 +-
 htdocs/core/modules/DolibarrModules.class.php |   89 +-
 htdocs/core/modules/action/modules_action.php |    9 +-
 htdocs/core/modules/action/rapport.pdf.php    |    3 +-
 .../core/modules/bank/doc/pdf_ban.modules.php |   15 +-
 .../bank/doc/pdf_sepamandate.modules.php      |   15 +-
 .../barcode/mod_barcode_product_standard.php  |   18 +-
 .../bom/doc/doc_generic_bom_odt.modules.php   |   20 +-
 htdocs/core/modules/bom/mod_bom_standard.php  |    3 +-
 .../modules/cheque/mod_chequereceipt_mint.php |    3 +-
 .../modules/cheque/modules_chequereceipts.php |    9 +-
 .../doc/doc_generic_order_odt.modules.php     |   20 +-
 .../commande/doc/pdf_einstein.modules.php     |   38 +-
 .../commande/doc/pdf_eratosthene.modules.php  |   53 +-
 .../modules/commande/mod_commande_marbre.php  |    3 +-
 .../doc/doc_generic_contract_odt.modules.php  |   20 +-
 .../contract/doc/pdf_strato.modules.php       |   32 +-
 .../modules/contract/mod_contract_serpis.php  |    3 +-
 .../modules/dons/html_cerfafr.modules.php     |   30 +-
 .../doc/doc_generic_shipment_odt.modules.php  |   25 +-
 .../expedition/doc/pdf_espadon.modules.php    |   53 +-
 .../expedition/doc/pdf_merou.modules.php      |   30 +-
 .../expedition/doc/pdf_rouget.modules.php     |   50 +-
 .../expedition/mod_expedition_safor.php       |    3 +-
 .../doc/pdf_standard.modules.php              |   38 +-
 .../expensereport/mod_expensereport_jade.php  |    3 +-
 .../modules/export/export_csv.modules.php     |    6 +-
 .../export/export_excel2007new.modules.php    |   12 +-
 .../doc/doc_generic_invoice_odt.modules.php   |   17 +-
 .../modules/facture/doc/pdf_crabe.modules.php |   47 +-
 .../facture/doc/pdf_sponge.modules.php        |   59 +-
 .../core/modules/facture/mod_facture_mars.php |    3 +-
 .../modules/facture/mod_facture_terre.php     |    3 +-
 .../fichinter/doc/pdf_soleil.modules.php      |   29 +-
 htdocs/core/modules/fichinter/mod_pacific.php |    3 +-
 .../modules/fichinter/modules_fichinter.php   |    9 +-
 .../modules/holiday/mod_holiday_madonna.php   |    3 +-
 .../modules/import/import_csv.modules.php     |   50 +-
 .../modules/import/import_xlsx.modules.php    |   41 +-
 .../livraison/doc/pdf_typhon.modules.php      |   32 +-
 .../modules/livraison/mod_livraison_jade.php  |    3 +-
 .../mailings/advthirdparties.modules.php      |    9 +-
 .../modules/mailings/contacts1.modules.php    |   12 +-
 .../core/modules/mailings/fraise.modules.php  |    9 +-
 .../modules/mailings/modules_mailings.php     |    6 +-
 .../core/modules/mailings/pomme.modules.php   |    3 +-
 .../modules/mailings/thirdparties.modules.php |   15 +-
 .../thirdparties_services_expired.modules.php |    6 +-
 .../modules/mailings/xinputfile.modules.php   |   11 +-
 .../modules/mailings/xinputuser.modules.php   |    6 +-
 .../modules/member/doc/pdf_standard.class.php |   19 +-
 htdocs/core/modules/member/modules_cards.php  |    9 +-
 htdocs/core/modules/modAgenda.class.php       |    3 +-
 htdocs/core/modules/modBlockedLog.class.php   |    3 +-
 .../mrp/doc/doc_generic_mo_odt.modules.php    |   20 +-
 htdocs/core/modules/mrp/mod_mo_standard.php   |    3 +-
 .../modules/oauth/github_oauthcallback.php    |    3 +-
 .../modules/oauth/google_oauthcallback.php    |    3 +-
 .../oauth/stripelive_oauthcallback.php        |    3 +-
 .../oauth/stripetest_oauthcallback.php        |    3 +-
 .../modules/payment/mod_payment_cicada.php    |    3 +-
 .../modules/printing/printgcp.modules.php     |   15 +-
 .../modules/printing/printipp.modules.php     |    6 +-
 .../doc/pdf_standardlabel.class.php           |   10 +-
 .../printsheet/doc/pdf_tcpdflabel.class.php   |   10 +-
 .../modules/printsheet/modules_labels.php     |    9 +-
 .../doc/doc_generic_product_odt.modules.php   |   20 +-
 .../product/doc/pdf_standard.modules.php      |   18 +-
 .../product/mod_codeproduct_elephant.php      |    9 +-
 .../modules/product/modules_product.class.php |    3 +-
 .../doc/doc_generic_project_odt.modules.php   |   47 +-
 .../project/doc/pdf_baleine.modules.php       |   29 +-
 .../project/doc/pdf_beluga.modules.php        |   26 +-
 .../project/doc/pdf_timespent.modules.php     |   29 +-
 .../modules/project/mod_project_simple.php    |    6 +-
 .../task/doc/doc_generic_task_odt.modules.php |   29 +-
 .../modules/project/task/mod_task_simple.php  |    6 +-
 .../doc/doc_generic_proposal_odt.modules.php  |   20 +-
 .../modules/propale/doc/pdf_azur.modules.php  |   53 +-
 .../modules/propale/doc/pdf_cyan.modules.php  |   56 +-
 .../modules/propale/mod_propale_marbre.php    |    6 +-
 .../modules/rapport/pdf_paiement.class.php    |    9 +-
 .../doc/doc_generic_reception_odt.modules.php |   23 +-
 .../reception/doc/pdf_squille.modules.php     |   47 +-
 .../modules/reception/mod_reception_beryl.php |    3 +-
 .../societe/doc/doc_generic_odt.modules.php   |   17 +-
 .../societe/mod_codeclient_elephant.php       |    9 +-
 .../modules/societe/mod_codeclient_monkey.php |   24 +-
 .../societe/mod_codecompta_aquarium.php       |   12 +-
 .../societe/mod_codecompta_digitaria.php      |   15 +-
 .../modules/societe/modules_societe.class.php |    3 +-
 .../doc/doc_generic_stock_odt.modules.php     |   20 +-
 .../stock/doc/pdf_standard.modules.php        |   47 +-
 .../stock/doc/pdf_stdmovement.modules.php     |   53 +-
 .../doc/pdf_canelle.modules.php               |   35 +-
 .../mod_facture_fournisseur_cactus.php        |    3 +-
 ...doc_generic_supplier_order_odt.modules.php |   23 +-
 .../supplier_order/doc/pdf_cornas.modules.php |   50 +-
 .../doc/pdf_muscadet.modules.php              |   47 +-
 .../mod_commande_fournisseur_muguet.php       |    3 +-
 .../doc/pdf_standard.modules.php              |   32 +-
 .../mod_supplier_payment_bronan.php           |    3 +-
 ..._generic_supplier_proposal_odt.modules.php |   23 +-
 .../doc/pdf_aurore.modules.php                |   47 +-
 .../mod_supplier_proposal_marbre.php          |    6 +-
 .../core/modules/syslog/mod_syslog_file.php   |    3 +-
 .../core/modules/syslog/mod_syslog_syslog.php |    3 +-
 .../user/doc/doc_generic_user_odt.modules.php |   14 +-
 .../doc/doc_generic_usergroup_odt.modules.php |   23 +-
 htdocs/core/photos_resize.php                 |   17 +-
 htdocs/core/search.php                        |    3 +-
 htdocs/core/search_page.php                   |    3 +-
 .../core/tpl/admin_extrafields_edit.tpl.php   |    3 +-
 .../core/tpl/admin_extrafields_view.tpl.php   |    3 +-
 htdocs/core/tpl/bloc_comment.tpl.php          |    6 +-
 htdocs/core/tpl/card_presend.tpl.php          |    9 +-
 htdocs/core/tpl/contacts.tpl.php              |    3 +-
 .../tpl/extrafields_list_print_fields.tpl.php |    3 +-
 .../tpl/extrafields_list_search_input.tpl.php |    3 +-
 .../tpl/extrafields_list_search_title.tpl.php |    3 +-
 htdocs/core/tpl/extrafields_view.tpl.php      |    9 +-
 htdocs/core/tpl/filemanager.tpl.php           |    5 +-
 htdocs/core/tpl/list_print_total.tpl.php      |    3 +-
 htdocs/core/tpl/login.tpl.php                 |    3 +-
 htdocs/core/tpl/massactions_pre.tpl.php       |    6 +-
 htdocs/core/tpl/object_discounts.tpl.php      |    3 +-
 htdocs/core/tpl/objectline_create.tpl.php     |   21 +-
 htdocs/core/tpl/objectline_edit.tpl.php       |    6 +-
 htdocs/core/tpl/objectline_view.tpl.php       |   12 +-
 htdocs/core/tpl/resource_view.tpl.php         |    3 +-
 .../interface_20_all_Logevents.class.php      |    3 +-
 ...terface_50_modAgenda_ActionsAuto.class.php |   14 +-
 ..._modBlockedlog_ActionsBlockedLog.class.php |    3 +-
 ...odMailmanspip_Mailmanspipsynchro.class.php |   18 +-
 ...terface_50_modTicket_TicketEmail.class.php |    3 +-
 .../interface_80_modStripe_Stripe.class.php   |    3 +-
 htdocs/core/website.inc.php                   |    3 +-
 htdocs/stripe/admin/stripe.php                |   18 +-
 htdocs/stripe/charge.php                      |   12 +-
 htdocs/stripe/class/actions_stripe.class.php  |    6 +-
 htdocs/stripe/class/stripe.class.php          |   36 +-
 htdocs/stripe/config.php                      |    3 +-
 htdocs/stripe/payout.php                      |    6 +-
 htdocs/stripe/transaction.php                 |    6 +-
 htdocs/supplier_proposal/card.php             |   33 +-
 .../class/supplier_proposal.class.php         |  156 +-
 htdocs/supplier_proposal/contact.php          |   12 +-
 htdocs/supplier_proposal/document.php         |    3 +-
 htdocs/supplier_proposal/index.php            |    6 +-
 htdocs/supplier_proposal/list.php             |    6 +-
 htdocs/support/inc.php                        |    6 +-
 htdocs/takepos/admin/bar.php                  |    3 +-
 htdocs/takepos/admin/orderprinters.php        |    6 +-
 htdocs/takepos/admin/receipt.php              |   18 +-
 htdocs/takepos/admin/setup.php                |    6 +-
 htdocs/takepos/admin/terminal.php             |    9 +-
 htdocs/takepos/ajax/ajax.php                  |    3 +-
 htdocs/takepos/genimg/index.php               |    6 +-
 htdocs/takepos/index.php                      |   12 +-
 htdocs/takepos/invoice.php                    |   36 +-
 htdocs/takepos/pay.php                        |    6 +-
 htdocs/takepos/phone.php                      |    3 +-
 htdocs/takepos/reduction.php                  |    6 +-
 htdocs/theme/eldy/global.inc.php              |    6 +-
 htdocs/theme/eldy/theme_vars.inc.php          |    3 +-
 htdocs/theme/md/style.css.php                 |    6 +-
 htdocs/theme/md/theme_vars.inc.php            |    3 +-
 htdocs/ticket/agenda.php                      |    3 +-
 htdocs/ticket/card.php                        |    3 +-
 htdocs/ticket/class/actions_ticket.class.php  |    3 +-
 htdocs/ticket/class/ticket.class.php          |   12 +-
 htdocs/ticket/document.php                    |    3 +-
 htdocs/ticket/list.php                        |    3 +-
 htdocs/ticket/messaging.php                   |    3 +-
 htdocs/ticket/stats/index.php                 |    9 +-
 htdocs/user/bank.php                          |   18 +-
 htdocs/user/card.php                          |  180 +-
 htdocs/user/class/api_users.class.php         |    6 +-
 htdocs/user/class/user.class.php              |  179 +-
 htdocs/user/class/userbankaccount.class.php   |   12 +-
 htdocs/user/class/usergroup.class.php         |   39 +-
 htdocs/user/clicktodial.php                   |    8 +-
 htdocs/user/document.php                      |    3 +-
 htdocs/user/group/card.php                    |   36 +-
 htdocs/user/group/ldap.php                    |   12 +-
 htdocs/user/group/list.php                    |    6 +-
 htdocs/user/group/perms.php                   |    9 +-
 htdocs/user/hierarchy.php                     |    9 +-
 htdocs/user/home.php                          |   15 +-
 htdocs/user/ldap.php                          |   12 +-
 htdocs/user/list.php                          |    6 +-
 htdocs/user/note.php                          |    3 +-
 htdocs/user/notify/card.php                   |   27 +-
 htdocs/user/param_ihm.php                     |    9 +-
 htdocs/user/passwordforgotten.php             |   24 +-
 htdocs/user/perms.php                         |   12 +-
 htdocs/variants/combinations.php              |   12 +-
 htdocs/variants/create.php                    |    3 +-
 htdocs/webservices/admin/index.php            |    3 +-
 htdocs/webservices/server_actioncomm.php      |   15 +-
 htdocs/webservices/server_category.php        |    6 +-
 htdocs/webservices/server_contact.php         |   12 +-
 htdocs/webservices/server_invoice.php         |   21 +-
 htdocs/webservices/server_order.php           |   24 +-
 htdocs/webservices/server_other.php           |    3 +-
 htdocs/webservices/server_payment.php         |    3 +-
 .../webservices/server_productorservice.php   |   42 +-
 htdocs/webservices/server_project.php         |   15 +-
 .../webservices/server_supplier_invoice.php   |    9 +-
 htdocs/webservices/server_thirdparty.php      |   24 +-
 htdocs/webservices/server_user.php            |   42 +-
 565 files changed, 5190 insertions(+), 8632 deletions(-)

diff --git a/dev/tools/dolibarr-postgres2mysql.php b/dev/tools/dolibarr-postgres2mysql.php
index f2794455ca3..c17a73dfe12 100644
--- a/dev/tools/dolibarr-postgres2mysql.php
+++ b/dev/tools/dolibarr-postgres2mysql.php
@@ -76,14 +76,12 @@ function getfieldname($l)
 	if (preg_match("/`(.*)`/", $l, $regs)) {
 		if ($regs[1])
 			return $regs[1];
-		else
-			return null;
+		else return null;
 	} // if its not in quotes, then it should (we hope!) be the first "word" on the line, up to the first space.
 	elseif (preg_match("/([^\ ]*)/", trim($l), $regs)) {
 		if ($regs[1])
 			return $regs[1];
-		else
-			return null;
+		else return null;
 	}
 }
 
@@ -102,8 +100,7 @@ function formatsize($s)
 		return sprintf("%.1f", round($s / 1024, 1)) . "K";
 	elseif ($s < pow(2, 30))
 		return sprintf("%.1f", round($s / 1024 / 1024, 1)) . "M";
-	else
-		return sprintf("%.1f", round($s / 1024 / 1024 / 1024, 1)) . "G";
+	else return sprintf("%.1f", round($s / 1024 / 1024 / 1024, 1)) . "G";
 }
 
 /**
@@ -146,8 +143,7 @@ function pg2mysql_large($infilename, $outfilename)
 		if ($c % 2 != 0) {
 			if ($inquotes)
 				$inquotes = false;
-			else
-				$inquotes = true;
+			else $inquotes = true;
 		}
 
 		if ($linenum % 10000 == 0) {
@@ -329,8 +325,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 				$num = $regs[1];
 				if ($num <= 255)
 					$line = preg_replace("/ character varying\([0-9]*\)/", " varchar($num)", $line);
-				else
-					$line = preg_replace("/ character varying\([0-9]*\)/", " text", $line);
+				else $line = preg_replace("/ character varying\([0-9]*\)/", " text", $line);
 			}
 			// character varying with no size, we will default to varchar(255)
 			if (preg_match("/ character varying/", $line)) {
@@ -352,8 +347,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 				$num = $regs[1];
 				if ($num <= 255)
 					$line = preg_replace("/ character\([0-9]*\)/", " varchar($num)", $line);
-				else
-					$line = preg_replace("/ character\([0-9]*\)/", " text", $line);
+				else $line = preg_replace("/ character\([0-9]*\)/", " text", $line);
 			}
 			// timestamps
 			$line = str_replace(" timestamp with time zone", " datetime", $line);
@@ -465,8 +459,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 					if ($c % 2 != 0) {
 						if ($inquotes)
 							$inquotes = false;
-						else
-							$inquotes = true;
+						else $inquotes = true;
 						// echo "inquotes=$inquotes\n";
 					}
 				} while (substr($lines[$linenumber], - 3, - 1) != ");" || $inquotes);
diff --git a/dev/translation/autotranslator.class.php b/dev/translation/autotranslator.class.php
index f9657482c86..b51515a42cb 100644
--- a/dev/translation/autotranslator.class.php
+++ b/dev/translation/autotranslator.class.php
@@ -77,7 +77,7 @@ class autoTranslator
 
 		$files = $this->getTranslationFilesArray($this->_refLang);
 		$counter = 1;
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
 			if ($this->_limittofile && $this->_limittofile != $file) continue;
 			$counter++;
@@ -94,7 +94,7 @@ class autoTranslator
 
 				// If we must process all languages
 				$arraytmp=dol_dir_list($this->_langDir, 'directories', 0);
-				foreach($arraytmp as $dirtmp)
+				foreach ($arraytmp as $dirtmp)
 				{
 					if ($dirtmp['name'] === $this->_refLang) continue;	// We discard source language
 					$tmppart=explode('_', $dirtmp['name']);
@@ -112,7 +112,7 @@ class autoTranslator
 			}
 
 			// Process translation of source file for each target languages
-			foreach($targetlangs as $my_destlang)
+			foreach ($targetlangs as $my_destlang)
 			{
 				$this->_translatedFiles = array();
 
@@ -124,15 +124,14 @@ class autoTranslator
 					echo "File not found: " . $destPath . ". We generate it.<br>\n";
 					$this->createTranslationFile($destPath, $my_destlang);
 				}
-				else
-				{
+				else {
 					echo "Updating file: " . $destPath . "<br>\n";
 				}
 
 				// Translate lines
 				$fileContentDest = file($destPath, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
 				$newlines=0;
-				foreach($fileContent as $line){
+				foreach ($fileContent as $line){
 					$key = $this->getLineKey($line);
 					$value = $this->getLineValue($line);
 					if ($key && $value)
@@ -167,7 +166,7 @@ class autoTranslator
 			fwrite($fp, "\n");
 			fwrite($fp, "// START - Lines generated via autotranslator.php tool (".$this->_time.").\n");
 			fwrite($fp, "// Reference language: ".$this->_refLang." -> ".$my_destlang."\n");
-			foreach($this->_translatedFiles[$file] as $line) {
+			foreach ($this->_translatedFiles[$file] as $line) {
 				fwrite($fp, $line . "\n");
 			}
 			fwrite($fp, "// STOP - Lines generated via autotranslator.php tool (".$this->_time_end.").\n");
@@ -209,7 +208,7 @@ class autoTranslator
 	{
 
 		//print "key    =".$key."\n";
-		foreach($content as $line) {
+		foreach ($content as $line) {
 			$destKey = $this->getLineKey($line);
 			$destValue = $this->getLineValue($line);
 			// If translated return
@@ -273,8 +272,8 @@ class autoTranslator
 	private function getTranslationFilesArray($lang)
 	{
 		$dir = new DirectoryIterator($this->_langDir.$lang);
-		while($dir->valid()) {
-			if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./', $dir->getFilename())) {
+		while ($dir->valid()) {
+			if (!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./', $dir->getFilename())) {
 				$files[] =  $dir->getFilename();
 			}
 			$dir->next();
diff --git a/dev/translation/sanity_check_en_langfiles.php b/dev/translation/sanity_check_en_langfiles.php
index f568ba2b04b..0268fc94ed8 100755
--- a/dev/translation/sanity_check_en_langfiles.php
+++ b/dev/translation/sanity_check_en_langfiles.php
@@ -360,16 +360,14 @@ if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($a
    			$unused[$value] = $line;
        		echo $line;        // $trad contains the \n
 		}
-		else
-		{
+		else {
 		    unset($output);
 		    //print 'X'.$output.'Y';
 		}
 	}
 
 	if (empty($unused)) print "No string not used found.\n";
-	else
-	{
+	else {
         $filetosave='/tmp/'.($argv[2]?$argv[2]:"").'notused.lang';
         print "Strings in en_US that are never used are saved into file ".$filetosave.":\n";
         file_put_contents($filetosave, implode("", $unused));
diff --git a/dev/translation/strip_language_file.php b/dev/translation/strip_language_file.php
index ce28ca5de63..5a94192b2bd 100755
--- a/dev/translation/strip_language_file.php
+++ b/dev/translation/strip_language_file.php
@@ -80,8 +80,8 @@ $aEnglish = array();
 if ($filesToProcess == 'all')
 {
 	$dir = new DirectoryIterator('htdocs/langs/'.$lPrimary);
-	while($dir->valid()) {
-		if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./', $dir->getFilename())) {
+	while ($dir->valid()) {
+		if (!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./', $dir->getFilename())) {
 			$files[] =  $dir->getFilename();
 		}
 		$dir->next();
@@ -94,7 +94,7 @@ else $filesToProcess=explode(',', $filesToProcess);
 
 
 // Loop on each file
-foreach($filesToProcess as $fileToProcess)
+foreach ($filesToProcess as $fileToProcess)
 {
 	$lPrimaryFile = 'htdocs/langs/'.$lPrimary.'/'.$fileToProcess;
 	$lSecondaryFile = 'htdocs/langs/'.$lSecondary.'/'.$fileToProcess;
@@ -285,8 +285,7 @@ foreach($filesToProcess as $fileToProcess)
 				print "Key $key is redundant in file $lPrimaryFile (line: $cnt) - Already found into ".$fileFirstFound[$key]." (line: ".$lineFirstFound[$key].").\n";
 				continue;
 			}
-			else
-			{
+			else {
 				$fileFirstFound[$key] = $fileToProcess;
 				$lineFirstFound[$key] = $cnt;
 			}
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index b6231a45a10..52a1adc4fd2 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -62,8 +62,7 @@ if ($resql)
 	}
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -108,8 +107,7 @@ if ($action == "save" && empty($cancel))
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
         $db->commit();
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
         $db->rollback();
     }
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 77113ff1e13..dd5d04732ff 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -108,8 +108,7 @@ if ($actionsave)
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         $db->rollback();
         if (empty($errorsaved))	setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -163,14 +162,12 @@ if ($conf->use_javascript_ajax)
 {
 	print ajax_constantonoff('AGENDA_DISABLE_EXT', array('enabled'=>array(0=>'.hideifnotset')), null, 1);
 }
-else
-{
+else {
 	if (empty($conf->global->AGENDA_DISABLE_EXT))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?save=1&AGENDA_DISABLE_EXT=1">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
-	else
-	{
+	else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?save=1&AGENDA_DISABLE_EXT=0">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	}
 }
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index c5b196146d5..a9e5bccd71b 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -60,8 +60,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -74,8 +73,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -121,14 +119,12 @@ elseif ($action == 'specimen')  // For orders
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=action&file=SPECIMEN.pdf");
     		return;
     	}
-    	else
-    	{
+    	else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
     }
-    else
-    {
+    else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -214,8 +210,7 @@ if ($resql)
         $i++;
     }
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
@@ -263,8 +258,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             			$module = new $classname($db, $specimenthirdparty);
             			if (method_exists($module, 'info'))
             				print $module->info($langs);
-            			else
-            				print $module->description;
+            			else print $module->description;
             			print "</td>\n";
 
             			// Active
@@ -277,14 +271,12 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             				    print img_picto($langs->trans("Enabled"), 'switch_on');
             				    print '</a>';
             			    }
-            			    else
-            			    {
+            			    else {
             				    print img_picto($langs->trans("Enabled"), 'switch_on');
             			    }
             				print "</td>";
             			}
-            			else
-            			{
+            			else {
             				print '<td class="center">'."\n";
             				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
             				print "</td>";
@@ -296,8 +288,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             			{
             				print img_picto($langs->trans("Default"), 'on');
             			}
-            			else
-            			{
+            			else {
             				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
             			}
             			print '</td>';
@@ -347,8 +338,7 @@ if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_USE_EVENT_TYPE">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 }
-else
-{
+else {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_USE_EVENT_TYPE">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 }
 print '</td></tr>'."\n";
diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index 3d51bd3158c..d9b7ead6f2e 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -55,8 +55,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -69,8 +68,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -114,14 +112,12 @@ elseif ($action == 'specimen')  // For orders
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=action&file=SPECIMEN.pdf");
     		return;
     	}
-    	else
-    	{
+    	else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
     }
-    else
-    {
+    else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 7df74ba6a9d..b6d0472c3af 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -55,8 +55,7 @@ if ($actionsave)
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         $db->rollback();
         setEventMessages($langs->trans("SaveFailed"), null, 'errors');
     }
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index b048dea9565..662dc517436 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -128,8 +128,7 @@ if ($actionsave)
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         $db->rollback();
         if (empty($errorsaved))	setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -359,8 +358,7 @@ foreach ($dirmodels as $reldir) {
                                 print "</td><td>\n";
                                 if (method_exists($module, 'info'))
                                     print $module->info($langs);
-                                else
-                                    print $module->description;
+                                else print $module->description;
                                 print '</td>';
 
                                 // Active
@@ -448,8 +446,7 @@ if ($conf->global->BANK_COLORIZE_MOVEMENT) {
     print '</a>';
     print '</td>';
 }
-else
-{
+else {
     print '<td class="center">'."\n";
     print '<a href="'.$_SERVER["PHP_SELF"].'?action=setbankcolorizemovement">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
     print "</td>";
@@ -509,8 +506,7 @@ if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE) {
     print '</a>';
     print '</td>';
 }
-else
-{
+else {
     print '<td class="center">'."\n";
     print '<a href="'.$_SERVER["PHP_SELF"].'?action=setreportlastnumreleve">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
     print "</td>";
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index e577942ab21..90a2525de05 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -81,8 +81,7 @@ elseif ($action == 'update')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -265,19 +264,16 @@ if ($resql)
 						//print $url;
 						print '<img src="'.$url.'" title="'.$obj->example.'" border="0">';
 					}
-					else
-					{
+					else {
 						print $langs->trans("FormatNotSupportedByGenerator");
 					}
 				}
-				else
-				{
+				else {
 					print 'ErrorClassNotFoundInModule '.$classname.' '.$obj->coder;
 				}
 			}
 		}
-		else
-		{
+		else {
 			print $langs->trans("ChooseABarCode");
 		}
 		print '</td>';
@@ -412,8 +408,7 @@ if ($conf->product->enabled)
 	    				print img_picto($langs->trans("Activated"), 'switch_on');
 	    				print '</a></td>';
 	    			}
-	    			else
-	    			{
+	    			else {
 	    				print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproducton&amp;value='.$file.'">';
 	    				print img_picto($langs->trans("Disabled"), 'switch_off');
 	    				print '</a></td>';
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index 6d37def3187..26f3fe75858 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -58,8 +58,7 @@ if ($action == 'updateMask')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -96,14 +95,12 @@ elseif ($action == 'specimen')
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=bom&file=SPECIMEN.pdf");
 			return;
 		}
-		else
-		{
+		else {
 			setEventMessages($module->error, null, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -161,8 +158,7 @@ elseif ($action == 'set_BOM_DRAFT_WATERMARK')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -179,8 +175,7 @@ elseif ($action == 'set_BOM_FREE_TEXT')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -262,8 +257,7 @@ foreach ($dirmodels as $reldir)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						}
-						else
-						{
+						else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -328,8 +322,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -399,8 +392,7 @@ foreach ($dirmodels as $reldir)
 	                            	print '</a>';
 	                            	print '</td>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -412,8 +404,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -442,8 +433,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -489,8 +479,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 }
-else
-{
+else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index c6ff9e94749..46f91e8b366 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -84,8 +84,7 @@ if ($action == 'add') {
                             $i++;
                         }
                     }
-                    else
-                    {
+                    else {
                         setEventMessages($db->lasterror(), null, 'errors');
                         $error++;
                     }
@@ -135,8 +134,7 @@ if ($action == 'add') {
         $db->commit();
         $action = '';
     }
-    else
-    {
+    else {
         $db->rollback();
     }
 }
@@ -205,8 +203,7 @@ if ($action == 'switch')
 	{
 		$db->commit();
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 }
@@ -346,8 +343,7 @@ foreach ($boxtoadd as $box)
     {
         $logo = $box->boximg;
     }
-    else
-    {
+    else {
         $logo = preg_replace("/^object_/i", "", $box->boximg);
     }
 
@@ -411,8 +407,7 @@ foreach ($boxactivated as $key => $box)
 	{
 		$logo = $box->boximg;
 	}
-	else
-	{
+	else {
 		$logo = preg_replace("/^object_/i", "", $box->boximg);
 	}
 
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index 8b5e7c433bf..397f289eaee 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -61,8 +61,7 @@ if ($action == 'updateMask')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -84,8 +83,7 @@ if ($action == 'set_BANK_CHEQUERECEIPT_FREE_TEXT')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -182,8 +180,7 @@ foreach ($dirmodels as $reldir)
 							{
 								print img_picto($langs->trans("Activated"), 'switch_on');
 							}
-							else
-							{
+							else {
 								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							}
 							print '</td>';
@@ -260,8 +257,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
 	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 }
-else
-{
+else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 36205697e89..56f4f076e54 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -47,8 +47,7 @@ if ($action == 'setvalue' && $user->admin)
     {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -134,8 +133,7 @@ if (!empty($conf->global->CLICKTODIAL_URL))
 	{
 		print $langs->trans("LinkToTest", $user->login).': '.dol_print_phone($phonefortest, '', 0, 0, 'AC_TEL');
 	}
-	else
-	{
+	else {
 		$langs->load("errors");
 		print '<div class="warning">'.$langs->trans("WarningClickToDialUserSetupNotComplete").'</div>';
 	}
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 76f04d94c15..f1f22203fa2 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -67,8 +67,7 @@ if ($action == 'updateMask')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -105,14 +104,12 @@ elseif ($action == 'specimen')
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=commande&file=SPECIMEN.pdf");
 			return;
 		}
-		else
-		{
+		else {
 			setEventMessages($module->error, null, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -170,8 +167,7 @@ elseif ($action == 'set_COMMANDE_DRAFT_WATERMARK')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -188,8 +184,7 @@ elseif ($action == 'set_ORDER_FREE_TEXT')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -218,8 +213,7 @@ elseif ($action == 'setribchq')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -235,8 +229,7 @@ elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_ORDER')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -252,8 +245,7 @@ elseif ($action == 'set_WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -335,8 +327,7 @@ foreach ($dirmodels as $reldir)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						}
-						else
-						{
+						else {
 							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -401,8 +392,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -472,8 +462,7 @@ foreach ($dirmodels as $reldir)
 	                            	print '</a>';
 	                            	print '</td>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -485,8 +474,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -520,8 +508,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -595,14 +582,12 @@ if (empty($conf->facture->enabled))
 				}
 				print "</select>";
 			}
-			else
-			{
+			else {
 				print "<i>".$langs->trans("NoActiveBankAccountDefined")."</i>";
 			}
 		}
 	}
-	else
-	{
+	else {
 		print '<span class="opacitymedium">'.$langs->trans("BankModuleNotActive").'</span>';
 	}
 }
@@ -682,8 +667,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 }
-else
-{
+else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index f33a3ea6f93..b5ae98378c9 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -85,8 +85,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 		$s = $mysoc->state_id.':'.$mysoc->state_code.':'.$mysoc->state_label;
 		dolibarr_set_const($db, "MAIN_INFO_SOCIETE_STATE", $s, 'chaine', 0, '', $conf->entity);
 	}
-	else
-	{
+	else {
 		dolibarr_del_const($db, "MAIN_INFO_SOCIETE_STATE", $conf->entity);
 	}
 
@@ -165,14 +164,12 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 						$tmparray = explode(':', $result);
 						setEventMessages($langs->trans('ErrorFileIsInfectedWithAVirus', $tmparray[1]), null, 'errors');
 					}
-					else
-					{
+					else {
 						$error++;
 						setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 					}
 				}
-				else
-				{
+				else {
 					$error++;
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
@@ -229,8 +226,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 		{
 			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX1", 0, 'chaine', 0, '', $conf->entity);
 		}
-		else
-		{
+		else {
 			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX1", GETPOST('lt1', 'aZ09'), 'chaine', 0, '', $conf->entity);
 		}
 		dolibarr_set_const($db, "MAIN_INFO_LOCALTAX_CALC1", GETPOST("clt1", 'aZ09'), 'chaine', 0, '', $conf->entity);
@@ -241,8 +237,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 		{
 			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX2", 0, 'chaine', 0, '', $conf->entity);
 		}
-		else
-		{
+		else {
 			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX2", GETPOST('lt2', 'aZ09'), 'chaine', 0, '', $conf->entity);
 		}
 		dolibarr_set_const($db, "MAIN_INFO_LOCALTAX_CALC2", GETPOST("clt2", 'aZ09'), 'chaine', 0, '', $conf->entity);
@@ -252,8 +247,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 	{
 		$db->commit();
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 
@@ -302,16 +296,14 @@ if ($action == 'addthumb' || $action == 'addthumbsquarred')  // Regenerate thumb
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
 		}
-		else
-		{
+		else {
 			$error++;
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
 			dol_syslog($langs->transnoentities("ErrorBadImageFormat"), LOG_INFO);
 		}
 	}
-	else
-	{
+	else {
 		$error++;
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFileDoesNotExists", $_GET["file"]), null, 'errors');
@@ -583,8 +575,7 @@ if ($langs->transcountry("ProfId1", $mysoc->country_code) != '-')
 	{
 		print '<input name="siren" id="profid1" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SIREN) ? $conf->global->MAIN_INFO_SIREN : '').'">';
 	}
-	else
-	{
+	else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -598,8 +589,7 @@ if ($langs->transcountry("ProfId2", $mysoc->country_code) != '-')
 	{
 		print '<input name="siret" id="profid2" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SIRET) ? $conf->global->MAIN_INFO_SIRET : '').'">';
 	}
-	else
-	{
+	else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -613,8 +603,7 @@ if ($langs->transcountry("ProfId3", $mysoc->country_code) != '-')
 	{
 		print '<input name="ape" id="profid3" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_APE) ? $conf->global->MAIN_INFO_APE : '').'">';
 	}
-	else
-	{
+	else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -628,8 +617,7 @@ if ($langs->transcountry("ProfId4", $mysoc->country_code) != '-')
 	{
 		print '<input name="rcs" id="profid4" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_RCS) ? $conf->global->MAIN_INFO_RCS : '').'">';
 	}
-	else
-	{
+	else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -643,8 +631,7 @@ if ($langs->transcountry("ProfId5", $mysoc->country_code) != '-')
 	{
 		print '<input name="MAIN_INFO_PROFID5" id="profid5" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_PROFID5) ? $conf->global->MAIN_INFO_PROFID5 : '').'">';
 	}
-	else
-	{
+	else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -658,8 +645,7 @@ if ($langs->transcountry("ProfId6", $mysoc->country_code) != '-')
 	{
 		print '<input name="MAIN_INFO_PROFID6" id="profid6" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_PROFID6) ? $conf->global->MAIN_INFO_PROFID6 : '').'">';
 	}
-	else
-	{
+	else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 3ccc2a213ac..7c1c64369ad 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -102,8 +102,7 @@ if ($action == 'update')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index fd93b0fa83d..3f5cc1cd920 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -136,8 +136,7 @@ if (empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
 {
 	print '<a href="confexped.php?action=activate_delivery">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 }
-else
-{
+else {
 	print '<a href="confexped.php?action=disable_delivery">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 }
 
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index bc22a2020fb..9da7fb10bbf 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -86,8 +86,7 @@ if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 			$constvalue = "";
 			$constnote = "";
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -105,8 +104,7 @@ if (!empty($consts) && $action == 'update')
 			{
 				$nbmodified++;
 			}
-			else
-			{
+			else {
 				dol_print_error($db);
 			}
 		}
@@ -127,8 +125,7 @@ if (!empty($consts) && $action == 'delete')
 			{
 				$nbdeleted++;
 			}
-			else
-			{
+			else {
 				dol_print_error($db);
 			}
 		}
@@ -144,8 +141,7 @@ if ($action == 'delete')
 	{
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -231,8 +227,7 @@ if (!empty($conf->multicompany->enabled) && !$user->entity)
 	print '</td>';
 	print '<td class="center">';
 }
-else
-{
+else {
 	print '<td class="center">';
 	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
 }
@@ -298,8 +293,7 @@ if ($result)
 			print '</td>';
 			print '<td class="center">';
 		}
-		else
-		{
+		else {
 			print '<td class="center">';
 			print '<input type="hidden" name="const['.$i.'][entity]" value="'.$obj->entity.'">';
 		}
@@ -308,8 +302,7 @@ if ($result)
 		{
 			print '<input type="checkbox" class="flat checkboxfordelete" id="check_'.$i.'" name="const['.$i.'][check]" value="1">';
 		}
-		else
-		{
+		else {
 			print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
 		}
 
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index ae0c9c89b38..f3c50287107 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -63,8 +63,7 @@ if ($action == 'updateMask')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -101,14 +100,12 @@ elseif ($action == 'specimen') // For contract
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=contract&file=SPECIMEN.pdf");
 			return;
 		}
-		else
-		{
+		else {
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -169,8 +166,7 @@ elseif ($action == 'set_other')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -252,8 +248,7 @@ foreach ($dirmodels as $reldir)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						}
-						else
-						{
+						else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -317,8 +312,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -388,8 +382,7 @@ foreach ($dirmodels as $reldir)
 	                            	print '</a>';
 	                            	print '</td>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -401,8 +394,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -434,8 +426,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -483,8 +474,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 }
-else
-{
+else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index bb7e82901f5..b7cb424d2cb 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -101,8 +101,7 @@ if ($action == 'edit')
 		{
 			print $form->selectyesno($key, $conf->global->$key, 1);
 		}
-		else
-		{
+		else {
 			print '<input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->$key.'">';
 		}
 		print '</td></tr>';
@@ -117,8 +116,7 @@ if ($action == 'edit')
 	print '</form>';
 	print '<br>';
 }
-else
-{
+else {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
@@ -141,8 +139,7 @@ else
 		{
 			print yn($conf->global->$key);
 		}
-		else
-		{
+		else {
 			print $conf->global->$key;
 		}
 		print '</td></tr>';
diff --git a/htdocs/admin/debugbar.php b/htdocs/admin/debugbar.php
index 926080cb9b5..dad99b2ab39 100644
--- a/htdocs/admin/debugbar.php
+++ b/htdocs/admin/debugbar.php
@@ -59,8 +59,7 @@ if ($action == 'set')
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		setEventMessages($error, null, 'errors');
 	}
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 094c4a8dd7c..2622d5ca514 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -151,8 +151,7 @@ if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('ac
 			$defaultkey = '';
 			$defaultvalue = '';
 		}
-		else
-		{
+		else {
 	        $db->rollback();
 		    setEventMessages($db->lasterror(), null, 'errors');
 			$action = '';
@@ -170,8 +169,7 @@ if ($action == 'delete')
 	{
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -198,8 +196,7 @@ if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))
     $enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
     $enabledisablehtml .= '</a>';
 }
-else
-{
+else {
     // Button on, click to disable
     $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&value=0'.$param.'">';
     $enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
@@ -261,8 +258,7 @@ if ($mode != 'sortorder')
 {
     $textkey = $form->textwithpicto($langs->trans("Field"), $texthelp);
 }
-else
-{
+else {
     $texthelp = 'field or alias.field';
     $textkey = $form->textwithpicto($langs->trans("Field"), $texthelp);
 }
@@ -281,8 +277,7 @@ if ($mode != 'focus' && $mode != 'mandatory')
         }
         $textvalue = $form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, 'subsitutiontooltip');
     }
-    else
-    {
+    else {
         $texthelp = 'ASC or DESC';
         $textvalue = $form->textwithpicto($langs->trans("SortOrder"), $texthelp);
     }
@@ -322,8 +317,7 @@ if (!empty($conf->multicompany->enabled) && !$user->entity)
 	print '<input type="text" class="flat" size="1" disabled name="entity" value="'.$conf->entity.'">'; // We see environment, but to change it we must switch on other entity
 	print '</td>';
 }
-else
-{
+else {
 	print '<td class="center">';
 	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
 	print '</td>';
@@ -394,8 +388,7 @@ if ($result)
     		print ' &nbsp; ';
     		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=delete'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
 		}
-		else
-		{
+		else {
 		    print '<input type="hidden" name="page" value="'.$page.'">';
 		    print '<input type="hidden" name="rowid" value="'.$id.'">';
 		    print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : 'none').'"></div>';
@@ -409,8 +402,7 @@ if ($result)
 		$i++;
 	}
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 3ee262b464a..26f2f87e2d5 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -250,8 +250,7 @@ if ($action == 'edit')
 
 	print '</table>';
 }
-else
-{
+else {
     /*
      * Show parameters
      */
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index cce441c4052..7ed84b59629 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -698,8 +698,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
     	{
     		$_POST["country"] = '';
     	}
-    	else
-    	{
+    	else {
         	$ok = 0;
         	setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Country")), null, 'errors');
     	}
@@ -792,8 +791,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
             setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
         	$_POST = array('id'=>$id); // Clean $_POST array, we keep only
         }
-        else
-        {
+        else {
             if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                 setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
             }
@@ -883,8 +881,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
         {
             setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
         }
-        else
-        {
+        else {
             dol_print_error($db);
         }
     }
@@ -1302,8 +1299,7 @@ if ($id)
                     print '</td>';
                     $filterfound++;
                 }
-                else
-                {
+                else {
                     print '<td class="liste_titre">';
                     print '</td>';
                 }
@@ -1439,8 +1435,7 @@ if ($id)
                     print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
                     print '</td>';
                 }
-                else
-                {
+                else {
 	              	$tmpaction = 'view';
                     $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
                     $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
@@ -1479,8 +1474,7 @@ if ($id)
                                 {
                                     $valuetoshow = '-';
                                 }
-                                else
-                                {
+                                else {
                                     $key = $langs->trans("Country".strtoupper($obj->country_code));
                                     $valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
                                 }
@@ -1605,15 +1599,13 @@ if ($id)
 							elseif ($fieldlist[$field] == 'localtax1_type') {
                                 if ($obj->localtax1 != 0)
 							        $valuetoshow = $localtax_typeList[$valuetoshow];
-							    else
-							        $valuetoshow = '';
+							    else $valuetoshow = '';
 							    $class = "center";
 							}
 							elseif ($fieldlist[$field] == 'localtax2_type') {
 							    if ($obj->localtax2 != 0)
 							        $valuetoshow = $localtax_typeList[$valuetoshow];
-							    else
-							        $valuetoshow = '';
+							    else $valuetoshow = '';
 							    $class = "center";
 							}
 							elseif ($fieldlist[$field] == 'taux') {
@@ -1709,8 +1701,7 @@ if ($id)
                     // Active
                     print '<td class="nowrap center">';
                     if ($canbedisabled) print '<a class="reposition" href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
-                    else
-                 	{
+                    else {
                  		if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO'))) print $langs->trans("AlwaysActive");
                  		elseif (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active)) print $langs->trans("Deprecated");
                   		elseif (isset($obj->type) && in_array($obj->type, array('system')) && !empty($obj->active) && $obj->code != 'AC_OTH') print $langs->trans("UsedOnlyWithTypeOption");
@@ -1747,8 +1738,7 @@ if ($id)
 
     print '</form>';
 }
-else
-{
+else {
     /*
      * Show list of dictionary to show
      */
@@ -1782,8 +1772,7 @@ else
             {
                 print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">'.$langs->trans($tablib[$i]).'</a>';
             }
-            else
-            {
+            else {
                 print $langs->trans($tablib[$i]);
             }
             print '</td>';
@@ -1796,8 +1785,7 @@ else
             print '<td>'.$tabname[$i].'</td></tr>';
             $lastlineisempty = false;
         }
-        else
-        {
+        else {
             if (!$lastlineisempty)
             {
                 $showemptyline = 1;
@@ -2003,8 +1991,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				$accountancy_account = (!empty($obj->$fieldname) ? $obj->$fieldname : 0);
 				print $formaccounting->select_account($accountancy_account, '.'.$fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
 			}
-			else
-			{
+			else {
 			    $fieldname = $fieldlist[$field];
 			    print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldname) ? $obj->$fieldname : '').'" name="'.$fieldlist[$field].'">';
 			}
@@ -2028,8 +2015,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print $form->selectExpenseRanges($obj->fk_range);
 			print '</td>';
 		}
-		else
-		{
+		else {
             $fieldValue = isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'';
 
 			if ($fieldlist[$field] == 'sortorder')
diff --git a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
index 3c735707c4a..6eaf1cf375a 100644
--- a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
+++ b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
@@ -136,8 +136,9 @@ class PrestaShopWebservice
 		{
 			if (isset($curl_params[$defkey]))
 				$curl_options[$defkey] = $curl_params[$defkey];
-			else
+			else {
 				$curl_options[$defkey] = $defaultParams[$defkey];
+			}
 		}
 		foreach ($curl_params as $defkey => $defval)
 			if (!isset($curl_options[$defkey]))
@@ -237,8 +238,9 @@ class PrestaShopWebservice
 			}
 			return $xml;
 		}
-		else
+		else {
 			throw new PrestaShopWebserviceException('HTTP response is empty');
+		}
 	}
 
 	/**
@@ -264,9 +266,7 @@ class PrestaShopWebservice
 				$url .= '&id_shop='.$options['id_shop'];
 			if (isset($options['id_group_shop']))
 				$url .= '&id_group_shop='.$options['id_group_shop'];
-		}
-		else
-		{
+		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
 		}
 		$request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'POST', CURLOPT_POSTFIELDS => $xml));
@@ -323,9 +323,9 @@ class PrestaShopWebservice
 						$url_params[$k] = $options[$k];
 			if (count($url_params) > 0)
 				$url .= '?'.http_build_query($url_params);
-		}
-		else
+		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given ');
+		}
 
 		$request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'GET'));
 		self::checkStatusCode($request['status_code']); // check the response validity
@@ -356,9 +356,9 @@ class PrestaShopWebservice
 						$url_params[$k] = $options[$k];
 			if (count($url_params) > 0)
 				$url .= '?'.http_build_query($url_params);
-		}
-		else
+		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
+		}
 		$request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'HEAD', CURLOPT_NOBODY => true));
 		self::checkStatusCode($request['status_code']); // check the response validity
 		return $request['header'];
@@ -387,9 +387,9 @@ class PrestaShopWebservice
 				$url .= '&id_shop='.$options['id_shop'];
 			if (isset($options['id_group_shop']))
 				$url .= '&id_group_shop='.$options['id_group_shop'];
-		}
-		else
+		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
+		}
 
 		$request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'PUT', CURLOPT_POSTFIELDS => $xml));
 		self::checkStatusCode($request['status_code']); // check the response validity
diff --git a/htdocs/admin/dolistore/class/dolistore.class.php b/htdocs/admin/dolistore/class/dolistore.class.php
index a229f3c985d..1d764a849be 100644
--- a/htdocs/admin/dolistore/class/dolistore.class.php
+++ b/htdocs/admin/dolistore/class/dolistore.class.php
@@ -101,8 +101,7 @@ class Dolistore
 	        $trace = $e->getTrace();
 	        if ($trace[0]['args'][0] == 404) die('Bad ID');
 	        elseif ($trace[0]['args'][0] == 401) die('Bad auth key');
-	        else
-	        {
+	        else {
 	            print 'Can not access to '.$conf->global->MAIN_MODULE_DOLISTORE_API_SRV.'<br>';
 	            print $e->getMessage();
 	        }
@@ -183,8 +182,7 @@ class Dolistore
 			$trace = $e->getTrace();
 			if ($trace[0]['args'][0] == 404) die('Bad ID');
 			elseif ($trace[0]['args'][0] == 401) die('Bad auth key');
-			else
-			{
+			else {
 				print 'Can not access to '.$conf->global->MAIN_MODULE_DOLISTORE_API_SRV.'<br>';
 				print $e->getMessage();
 			}
diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php
index 0c348b25f60..b9af92dc8a5 100644
--- a/htdocs/admin/ecm.php
+++ b/htdocs/admin/ecm.php
@@ -42,8 +42,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -56,8 +55,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -94,8 +92,7 @@ if ($conf->use_javascript_ajax)
 {
 	print ajax_constantonoff('ECM_AUTO_TREE_ENABLED');
 }
-else
-{
+else {
 	if (empty($conf->global->ECM_AUTO_TREE_ENABLED))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ECM_AUTO_TREE_ENABLED">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index 80161eaadc6..a554354420d 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -127,8 +127,7 @@ if (GETPOST('addfilter', 'alpha'))
 	{
 		$object->fetchFilters();
 	}
-	else
-	{
+	else {
 		setEventMessages($emailcollectorfilter->errors, $emailcollectorfilter->error, 'errors');
 	}
 }
@@ -142,8 +141,7 @@ if ($action == 'deletefilter')
 	{
 		$object->fetchFilters();
 	}
-	else
-	{
+	else {
 		setEventMessages($emailcollectorfilter->errors, $emailcollectorfilter->error, 'errors');
 	}
 }
@@ -163,8 +161,7 @@ if (GETPOST('addoperation', 'alpha'))
 	{
 		$object->fetchActions();
 	}
-	else
-	{
+	else {
 		setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
 	}
 }
@@ -182,8 +179,7 @@ if ($action == 'updateoperation')
     {
         $object->fetchActions();
     }
-    else
-    {
+    else {
         setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
     }
 }
@@ -196,8 +192,7 @@ if ($action == 'deleteoperation')
 	{
 		$object->fetchActions();
 	}
-	else
-	{
+	else {
 		setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
 	}
 }
@@ -212,8 +207,7 @@ if ($action == 'confirm_collect')
 	    $debuginfo = $object->debuginfo;
 	    setEventMessages($object->lastresult, null, 'mesgs');
 	}
-	else
-	{
+	else {
 	    $debuginfo = $object->debuginfo;
 	    setEventMessages($object->error, null, 'errors');
 	}
@@ -440,8 +434,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		$morehtml .= $form->textwithpicto('', 'connect string '.$connectstringserver);
 	}
-	else
-	{
+	else {
 		$morehtml .= 'IMAP functions not available on your PHP';
 	}
 
@@ -449,8 +442,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	{
 		$morehtml .= 'Failed to open IMAP connection '.$connectstringsource;
 	}
-	else
-	{
+	else {
 		$morehtml .= imap_num_msg($connection);
 	}
 
@@ -582,8 +574,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if ($res)
 		$arrayoftypes = $hookmanager->resArray;
-	else
-		foreach ($hookmanager->resArray as $k=>$desc)
+	else foreach ($hookmanager->resArray as $k=>$desc)
 			$arrayoftypes[$k] = $desc;
 
 
@@ -626,8 +617,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		    print '<input type="hidden" name="rowidoperation2" value="'.$ruleaction['id'].'"><br>';
 		    print '<input type="submit" class="button" name="saveoperation2" value="'.$langs->trans("Save").'"> <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 		}
-		else
-		{
+		else {
 		    print $ruleaction['actionparam'];
 		}
 		print '</td>';
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index f180cdf10cf..bb17bbdca05 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -242,8 +242,7 @@ if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
 }
-else
-{
+else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index be9e7091300..cd9a2976e11 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -69,8 +69,7 @@ if ($action == 'updateMask')
 	{
 		if ($res > 0)
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		else
-			setEventMessages($langs->trans("Error"), null, 'errors');
+		else setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
@@ -130,14 +129,12 @@ elseif ($action == 'specimen')
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=expedition&file=SPECIMEN.pdf");
 			return;
 		}
-		else
-		{
+		else {
 			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -259,8 +256,7 @@ foreach ($dirmodels as $reldir)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						}
-						else
-						{
+						else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;value='.$file.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -327,8 +323,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -396,8 +391,7 @@ foreach ($dirmodels as $reldir)
 	                            	print '</a>';
 	                            	print '</td>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -409,8 +403,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -439,8 +432,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'sending').'</a>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -487,8 +479,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 }
-else
-{
+else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index d076e77bf44..20f85dc6a29 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -64,8 +64,7 @@ if ($action == 'updateMask')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -104,14 +103,12 @@ elseif ($action == 'specimen') // For fiche inter
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=expensereport&file=SPECIMEN.pdf");
 			return;
 		}
-		else
-		{
+		else {
 			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -179,8 +176,7 @@ elseif ($action == 'setoptions')
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         $db->rollback();
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -264,8 +260,7 @@ foreach ($dirmodels as $reldir)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						}
-						else
-						{
+						else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -329,8 +324,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -396,8 +390,7 @@ foreach ($dirmodels as $reldir)
 		    					print '</a>';
 		    					print "</td>";
 		    				}
-		    				else
-		    				{
+		    				else {
 		    					print '<td class="center">'."\n";
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 		    					print "</td>";
@@ -409,8 +402,7 @@ foreach ($dirmodels as $reldir)
 		    				{
 		    					print img_picto($langs->trans("Default"), 'on');
 		    				}
-		    				else
-		    				{
+		    				else {
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		    				}
 		    				print '</td>';
@@ -435,8 +427,7 @@ foreach ($dirmodels as $reldir)
 		    				{
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'intervention').'</a>';
 		    				}
-		    				else
-		    				{
+		    				else {
 		    					print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 		    				}
 		    				print '</td>';
@@ -485,8 +476,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 }
-else
-{
+else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/expensereport_ik.php b/htdocs/admin/expensereport_ik.php
index 83bb28ca440..2b089335c40 100644
--- a/htdocs/admin/expensereport_ik.php
+++ b/htdocs/admin/expensereport_ik.php
@@ -162,8 +162,7 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab)
 				echo '<input id="" class="button" name="save" value="'.$langs->trans('Save').'" type="submit" />';
 				echo '<input class="button" value="'.$langs->trans('Cancel').'" onclick="javascript:history.go(-1)" type="button" />';
 			}
-			else
-			{
+			else {
 				echo '<a href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$range->ik->id.'&fk_c_exp_tax_cat='.$range->fk_c_exp_tax_cat.'&fk_range='.$range->rowid.'">'.img_edit().'</a>';
 				if (!empty($range->ik->id)) echo '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$range->ik->id.'">'.img_delete().'</a>';
 				// TODO add delete link
diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php
index a40e8d95520..0c99b4e4dda 100644
--- a/htdocs/admin/expensereport_rules.php
+++ b/htdocs/admin/expensereport_rules.php
@@ -229,8 +229,7 @@ foreach ($rules as $rule)
 		echo '<div id="user" class="float">'.$form->select_dolusers($object->fk_user, 'fk_user').'</div>';
 		echo '<div id="group" class="float">'.$form->select_dolgroups($object->fk_usergroup, 'fk_usergroup').'</div>';
 	}
-	else
-	{
+	else {
 		if ($rule->is_for_all > 0) echo $tab_apply['A'];
 		elseif ($rule->fk_usergroup > 0) echo $tab_apply['G'].' ('.$rule->getGroupLabel().')';
 		elseif ($rule->fk_user > 0) echo $tab_apply['U'].' ('.$rule->getUserName().')';
@@ -243,11 +242,9 @@ foreach ($rules as $rule)
 	{
 		echo $form->selectExpense($object->fk_c_type_fees, 'fk_c_type_fees', 0, 1, 1);
 	}
-	else
-	{
+	else {
 		if ($rule->fk_c_type_fees == -1) echo $langs->trans('AllExpenseReport');
-		else
-		{
+		else {
 			$key = getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'code', $rule->fk_c_type_fees, false, 'id');
 			if ($key != $langs->trans($key)) echo $langs->trans($key);
 			else echo $langs->trans(getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'label', $rule->fk_c_type_fees, false, 'id')); // TODO check to return trans of 'code'
@@ -261,8 +258,7 @@ foreach ($rules as $rule)
 	{
 		echo $form->selectarray('code_expense_rules_type', $tab_rules_type, $object->code_expense_rules_type, 0);
 	}
-	else
-	{
+	else {
 		echo $tab_rules_type[$rule->code_expense_rules_type];
 	}
 	echo '</td>';
@@ -273,8 +269,7 @@ foreach ($rules as $rule)
 	{
 		print $form->selectDate(strtotime(date('Y-m-d', $object->dates)), 'start', '', '', 0, '', 1, 0);
 	}
-	else
-	{
+	else {
 		echo dol_print_date($rule->dates, 'day');
 	}
 	echo '</td>';
@@ -285,8 +280,7 @@ foreach ($rules as $rule)
 	{
 		print $form->selectDate(strtotime(date('Y-m-d', $object->datee)), 'end', '', '', 0, '', 1, 0);
 	}
-	else
-	{
+	else {
 		echo dol_print_date($rule->datee, 'day');
 	}
 	echo '</td>';
@@ -297,8 +291,7 @@ foreach ($rules as $rule)
 	{
 		echo '<input type="text" value="'.price2num($object->amount).'" name="amount" class="amount" />'.$conf->currency;
 	}
-	else
-	{
+	else {
 		echo price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency);
 	}
 	echo '</td>';
@@ -309,8 +302,7 @@ foreach ($rules as $rule)
 	{
 		echo $form->selectyesno('restrictive', $object->restrictive, 1);
 	}
-	else
-	{
+	else {
 		echo yn($rule->restrictive, 1, 1);
 	}
 	echo '</td>';
@@ -322,8 +314,7 @@ foreach ($rules as $rule)
 		echo '<a href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$rule->id.'">'.img_edit().'</a>&nbsp;';
 		echo '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$rule->id.'">'.img_delete().'</a>';
 	}
-	else
-	{
+	else {
 		echo '<input type="submit" class="button" value="'.$langs->trans('Update').'" />&nbsp;';
 		echo '<a href="'.$_SERVER['PHP_SELF'].'" class="button">'.$langs->trans('Cancel').'</a>';
 	}
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 8aa1a425778..eac6d7eb8e9 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -61,8 +61,7 @@ if ($result)
         if ($reg[1] && $reg[1] > $lastexternalrss) $lastexternalrss = $reg[1];
     }
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
@@ -93,8 +92,7 @@ if ($action == 'add' || GETPOST("modify"))
 	        }
             */
 		}
-		else
-		{
+		else {
 			// Ajoute boite box_external_rss dans definition des boites
 	        $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (file, note)";
 			$sql .= " VALUES ('box_external_rss.php','".$db->escape(GETPOST("norss", 'int').' ('.GETPOST($external_rss_title, 'alpha')).")')";
@@ -114,8 +112,7 @@ if ($action == 'add' || GETPOST("modify"))
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
         }
-        else
-        {
+        else {
             $db->rollback();
             dol_print_error($db);
         }
@@ -162,8 +159,7 @@ if ($_POST["delete"])
 
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			dol_print_error($db, "sql=".$sql);
 			exit;
@@ -179,8 +175,7 @@ if ($_POST["delete"])
             header("Location: external_rss.php");
             exit;
         }
-        else
-        {
+        else {
             $db->rollback();
             dol_print_error($db);
         }
@@ -293,8 +288,7 @@ if ($resql)
 	    {
 			print '<font class="ok">'.$langs->trans("Online").'</div>';
 		}
-		else
-		{
+		else {
 			print '<font class="error">'.$langs->trans("Offline");
 			$langs->load("errors");
 			if ($rssparser->error) print ' - '.$langs->trans($rssparser->error);
@@ -332,8 +326,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 1a484ec8c7e..6c0c03b6dda 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -72,8 +72,7 @@ if ($action == 'updateMask')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -109,14 +108,12 @@ elseif ($action == 'specimen')
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=facture&file=SPECIMEN.pdf");
     		return;
     	}
-    	else
-    	{
+    	else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
     }
-    else
-    {
+    else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -173,8 +170,7 @@ elseif ($action == 'setribchq')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -190,8 +186,7 @@ elseif ($action == 'set_FACTURE_DRAFT_WATERMARK')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -208,8 +203,7 @@ elseif ($action == 'set_INVOICE_FREE_TEXT')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -225,8 +219,7 @@ elseif ($action == 'setforcedate')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -248,8 +241,7 @@ elseif ($action == 'setDefaultPDFModulesByType')
         {
             setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
         }
-        else
-        {
+        else {
             setEventMessages($langs->trans("Error"), null, 'errors');
         }
     }
@@ -350,8 +342,7 @@ foreach ($dirmodels as $reldir)
                             {
                                 print img_picto($langs->trans("Activated"), 'switch_on');
                             }
-                            else
-                            {
+                            else {
                                 print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                             }
                             print '</td>';
@@ -463,8 +454,7 @@ if ($resql)
         $i++;
     }
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
@@ -535,8 +525,7 @@ foreach ($dirmodels as $reldir)
 	                            	print '</a>';
 	                            	print '</td>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("SetAsDefault"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -548,8 +537,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("SetAsDefault"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -583,8 +571,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -691,14 +678,12 @@ if (!empty($conf->banque->enabled))
             }
             print "</select>";
         }
-        else
-        {
+        else {
         	print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
         }
     }
 }
-else
-{
+else {
     print $langs->trans("BankModuleNotActive");
 }
 print "</td></tr>";
@@ -777,8 +762,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 }
-else
-{
+else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 00995a302a5..9dfc2cff6d1 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -127,8 +127,7 @@ if (GETPOST('save', 'alpha'))
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -147,8 +146,7 @@ if (empty($conf->use_javascript_ajax))
 {
 	setEventMessages(array($langs->trans("NotAvailable"), $langs->trans("JavascriptDisabled")), null, 'errors');
 }
-else
-{
+else {
     print '<table class="noborder centpercent">';
     print '<tr class="liste_titre">';
     print '<td colspan="2">'.$langs->trans("ActivateFCKeditor").'</td>';
@@ -212,8 +210,7 @@ else
         $editor = new DolEditor('formtestfield', isset($conf->global->FCKEDITOR_TEST) ? $conf->global->FCKEDITOR_TEST : 'Test', '', 200, $mode, 'In', true, $uselocalbrowser, 1, 120, 8, $readonly);
         $editor->Create();
     }
-    else
-    {
+    else {
         print '<div style="border: 1px solid #888;" contenteditable="true">';
         print $conf->global->FCKEDITOR_TEST;
         print '</div>';
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 055384c0084..602570194fd 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -64,8 +64,7 @@ if ($action == 'updateMask')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -102,14 +101,12 @@ elseif ($action == 'specimen') // For fiche inter
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=ficheinter&file=SPECIMEN.pdf");
 			return;
 		}
-		else
-		{
+		else {
 			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -167,8 +164,7 @@ elseif ($action == 'set_FICHINTER_FREE_TEXT')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -184,8 +180,7 @@ elseif ($action == 'set_FICHINTER_DRAFT_WATERMARK')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -201,8 +196,7 @@ elseif ($action == 'set_FICHINTER_PRINT_PRODUCTS')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 } elseif ($action == 'set_FICHINTER_USE_SERVICE_DURATION') {
@@ -325,8 +319,7 @@ foreach ($dirmodels as $reldir)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						}
-						else
-						{
+						else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 						}
 						print '</td>';
@@ -389,8 +382,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -458,8 +450,7 @@ foreach ($dirmodels as $reldir)
 		    					print '</a>';
 		    					print "</td>";
 		    				}
-		    				else
-		    				{
+		    				else {
 		    					print "<td align=\"center\">\n";
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 		    					print "</td>";
@@ -471,8 +462,7 @@ foreach ($dirmodels as $reldir)
 		    				{
 		    					print img_picto($langs->trans("Default"), 'on');
 		    				}
-		    				else
-		    				{
+		    				else {
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		    				}
 		    				print '</td>';
@@ -499,8 +489,7 @@ foreach ($dirmodels as $reldir)
 		    				{
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'intervention').'</a>';
 		    				}
-		    				else
-		    				{
+		    				else {
 		    					print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 		    				}
 		    				print '</td>';
@@ -545,8 +534,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 }
-else
-{
+else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index a661f3a8e9a..ba602c4b609 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -65,8 +65,7 @@ if ($action == 'set')
 		{
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
@@ -183,8 +182,7 @@ if ($geoip)
 		if ($result) print $result;
 		else print $langs->trans("Error");
 	}
-	else
-	{
+	else {
 		print '<br>'.$ip.' -> ';
 		$result = dol_print_ip($ip, 1);
 		if ($result) print $result;
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index aafe01bf5bd..58f39e30ff2 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -65,8 +65,7 @@ if ($action == 'updateMask')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -103,14 +102,12 @@ elseif ($action == 'specimen') // For contract
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=holiday&file=SPECIMEN.pdf");
 			return;
 		}
-		else
-		{
+		else {
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -171,8 +168,7 @@ elseif ($action == 'set_other')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -255,8 +251,7 @@ foreach ($dirmodels as $reldir)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						}
-						else
-						{
+						else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -332,8 +327,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -404,8 +398,7 @@ foreach ($dirmodels as $reldir)
 	                            	print '</a>';
 	                            	print '</td>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -417,8 +410,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -450,8 +442,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -502,8 +493,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 }
-else
-{
+else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 1b088f0c2b9..8df8a120c05 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -197,14 +197,12 @@ if ($action == 'update')
 					$tmparray = explode(':', $result);
 					setEventMessages($langs->trans('ErrorFileIsInfectedWithAVirus', $tmparray[1]), null, 'errors');
 				}
-				else
-				{
+				else {
 					$error++;
 					setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index bd24e793374..33f1abb251f 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -77,8 +77,7 @@ if (empty($reshook))
 			$db->commit();
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			dol_print_error($db);
 		}
@@ -215,8 +214,7 @@ if (!empty($conf->global->LDAP_SERVER_PORT))
 {
 	print '<input size="25" type="text" name="port" value="'.$conf->global->LDAP_SERVER_PORT.'">';
 }
-else
-{
+else {
 	print '<input size="25" type="text" name="port" value="389">';
 }
 print '</td><td>'.$langs->trans("LDAPServerPortExample").'</td></tr>';
@@ -249,8 +247,7 @@ if (!empty($conf->global->LDAP_ADMIN_PASS))
 {
 	print '<input size="25" type="password" name="pass" value="'.$conf->global->LDAP_ADMIN_PASS.'">'; // je le met en visible pour test
 }
-else
-{
+else {
 	print '<input size="25" type="text" name="pass" value="'.$conf->global->LDAP_ADMIN_PASS.'">';
 }
 print '</td><td>'.$langs->trans('Password').' (ex: secret)</td></tr>';
@@ -296,8 +293,7 @@ if (function_exists("ldap_connect"))
 					print '<font class="ok">'.$langs->trans("LDAPBindOK", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT, $conf->global->LDAP_ADMIN_DN, preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)).'</font>';
 					print '<br>';
 				}
-				else
-				{
+				else {
 					print img_picto('', 'error').' ';
 					print '<font class="error">'.$langs->trans("LDAPBindKO", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT, $conf->global->LDAP_ADMIN_DN, preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)).'</font>';
 					print '<br>';
@@ -305,8 +301,7 @@ if (function_exists("ldap_connect"))
 					print '<br>';
 				}
 			}
-			else
-			{
+			else {
 				print img_picto('', 'warning').' ';
 				print '<font class="warning">'.$langs->trans("LDAPNoUserOrPasswordProvidedAccessIsReadOnly").'</font>';
 				print '<br>';
@@ -320,8 +315,7 @@ if (function_exists("ldap_connect"))
 				print '<font class="ok">'.$langs->trans("LDAPSetupForVersion3").'</font>';
 				print '<br>';
 			}
-			else
-			{
+			else {
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSetupForVersion2").'</font>';
 				print '<br>';
@@ -329,8 +323,7 @@ if (function_exists("ldap_connect"))
 
 			$unbind = $ldap->unbind();
 		}
-		else
-		{
+		else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPTCPConnectKO", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT).'</font>';
 			print '<br>';
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 834bde4eea5..58eb04e595d 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -79,8 +79,7 @@ if ($action == 'setvalue' && $user->admin)
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -293,8 +292,7 @@ if (function_exists("ldap_connect"))
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
 			}
-			else
-			{
+			else {
 				print img_picto('', 'error').' ';
 				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
@@ -307,8 +305,7 @@ if (function_exists("ldap_connect"))
 			print nl2br($ldap->dump_content($dn, $info));
 			print "\n<br>";
 		}
-		else
-		{
+		else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index fb49c947411..a301738db94 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -71,8 +71,7 @@ if ($action == 'setvalue' && $user->admin)
     	$db->commit();
     	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
     	$db->rollback();
     	dol_print_error($db);
     }
@@ -234,8 +233,7 @@ if (function_exists("ldap_connect"))
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
 			}
-			else
-			{
+			else {
 				print img_picto('', 'error').' ';
 				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
@@ -248,8 +246,7 @@ if (function_exists("ldap_connect"))
 			print nl2br($ldap->dump_content($dn, $info));
 			print "\n<br>";
 		}
-		else
-		{
+		else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index f6fa74cb79d..eba84afe925 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -96,8 +96,7 @@ if ($action == 'setvalue' && $user->admin)
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -416,8 +415,7 @@ if (function_exists("ldap_connect"))
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
 			}
-			else
-			{
+			else {
 				print img_picto('', 'error').' ';
 				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
@@ -430,8 +428,7 @@ if (function_exists("ldap_connect"))
 			print nl2br($ldap->dump_content($dn, $info));
 			print "\n<br>";
 		}
-		else
-		{
+		else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
diff --git a/htdocs/admin/ldap_members_types.php b/htdocs/admin/ldap_members_types.php
index 6628dd4d144..6913c477b38 100644
--- a/htdocs/admin/ldap_members_types.php
+++ b/htdocs/admin/ldap_members_types.php
@@ -69,8 +69,7 @@ if ($action == 'setvalue' && $user->admin)
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -216,8 +215,7 @@ if (function_exists("ldap_connect"))
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
 			}
-			else
-			{
+			else {
 				print img_picto('', 'error').' ';
 				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
@@ -230,8 +228,7 @@ if (function_exists("ldap_connect"))
 			print nl2br($ldap->dump_content($dn, $info));
 			print "\n<br>";
 		}
-		else
-		{
+		else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 7781cf45676..d0d3bb50d0d 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -90,8 +90,7 @@ if ($action == 'setvalue' && $user->admin)
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -396,8 +395,7 @@ if (function_exists("ldap_connect"))
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
 			}
-			else
-			{
+			else {
 				print img_picto('', 'error').' ';
 				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
@@ -410,8 +408,7 @@ if (function_exists("ldap_connect"))
 			print nl2br($ldap->dump_content($dn, $info));
 			print "\n<br>";
 		}
-		else
-		{
+		else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
@@ -477,8 +474,7 @@ if (function_exists("ldap_connect"))
 					$liste[$key] = $label;
 				}
 			}
-			else
-		    {
+			else {
 				setEventMessages($ldap->error, $ldap->errors, 'errors');
 			}
 
@@ -491,8 +487,7 @@ if (function_exists("ldap_connect"))
 			print "=> ".count($liste)." records<br>\n";
 			print "\n<br>";
 		}
-		else
-		{
+		else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index 0646c7f6d46..b03067bd581 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -163,8 +163,7 @@ if ($action == 'edit')
     print '</form>';
     print '<br>';
 }
-else
-{
+else {
     print '<table class="noborder centpercent">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
@@ -204,8 +203,7 @@ if (empty($mysoc->country_code))
 	$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"));
 	print '<br><a href="'.DOL_URL_ROOT.'/admin/company.php?mainmenu=home">'.$warnpicto.' '.$langs->trans("WarningMandatorySetupNotComplete").'</a>';
 }
-else
-{
+else {
 	// Show examples
 	print load_fiche_titre($langs->trans("ExamplesWithCurrentSetup"), '', '');
 
@@ -270,8 +268,7 @@ else
 	        }
 	    }
 	}
-	else
-	{
+	else {
 	    // More examples if not specific vat rate found
 	    // This example must be kept for test purpose with current value because value used (2/7, 10/3, and vat 0, 10)
 	    // were calculated to show all possible cases of rounding. If we change this, examples becomes useless or show the same rounding rule.
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 4cd8f4841e5..f6e3c0e63f9 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -64,8 +64,7 @@ if ($action == 'updateMask')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -81,8 +80,7 @@ if ($action == 'set_DELIVERY_FREE_TEXT')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -119,14 +117,12 @@ if ($action == 'specimen')
             header("Location: ".DOL_URL_ROOT."/document.php?modulepart=livraison&file=SPECIMEN.pdf");
             return;
         }
-        else
-        {
+        else {
             setEventMessages($module->error, $module->errors, 'errors');
             dol_syslog($module->error, LOG_ERR);
         }
     }
-    else
-    {
+    else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
         dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -250,8 +246,7 @@ foreach ($dirmodels as $reldir)
                         {
                             print img_picto($langs->trans("Activated"), 'switch_on');
                         }
-                        else
-                        {
+                        else {
                             print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         }
                         print '</td>';
@@ -317,8 +312,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -384,8 +378,7 @@ foreach ($dirmodels as $reldir)
 		    					print '</a>';
 		    					print "</td>";
 		    				}
-		    				else
-		    				{
+		    				else {
 		    					print "<td align=\"center\">\n";
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 		    					print "</td>";
@@ -397,8 +390,7 @@ foreach ($dirmodels as $reldir)
 		    				{
 		    					print img_picto($langs->trans("Default"), 'on');
 		    				}
-		    				else
-		    				{
+		    				else {
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		    				}
 		    				print '</td>';
@@ -418,8 +410,7 @@ foreach ($dirmodels as $reldir)
 		    				{
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'sending').'</a>';
 		    				}
-		    				else
-		    				{
+		    				else {
 		    					print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 		    				}
 		    				print '</td>';
@@ -463,8 +454,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 }
-else
-{
+else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php
index 45202de342b..23cd1fd6bba 100644
--- a/htdocs/admin/loan.php
+++ b/htdocs/admin/loan.php
@@ -64,8 +64,7 @@ if ($action == 'update')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -108,8 +107,7 @@ foreach ($list as $key)
 	{
 		print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
 	}
-	else
-	{
+	else {
 		print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
 	}
 	print '</td></tr>';
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 921a4a6338c..020c1ef5241 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -66,8 +66,7 @@ if ($action == 'setvalue')
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php
index 05c36128e8d..100b5cf3224 100644
--- a/htdocs/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@@ -66,8 +66,7 @@ if ($action == 'update' || $action == 'add')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -100,8 +99,7 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && !empty($conf
         $langs->load("errors");
         setEventMessages($langs->trans("ErrorBadEMail", $email), null, 'errors');
     }
-    else
-    {
+    else {
         include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
         $mailmanspip = new MailmanSpip($db);
 
@@ -119,8 +117,7 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && !empty($conf
 				$error++;
 				setEventMessages($mailmanspip->error, $mailmanspip->errors, 'errors');
 			}
-			else
-			{
+			else {
 				setEventMessages($langs->trans("MailmanCreationSuccess"), null);
 			}
         }
@@ -132,8 +129,7 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && !empty($conf
 				$error++;
 				setEventMessages($mailmanspip->error, $mailmanspip->errors, 'errors');
 			}
-			else
-			{
+			else {
 				setEventMessages($langs->trans("MailmanDeletionSuccess"), null);
 			}
         }
@@ -212,8 +208,7 @@ if (!empty($conf->global->ADHERENT_USE_MAILMAN))
 
     print '</form>';
 }
-else
-{
+else {
     dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user');
 
     $link = '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value=1&name=ADHERENT_USE_MAILMAN">';
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 5502d44dae0..42ddb907b7d 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -170,8 +170,7 @@ if ($action == 'edit')
                             jQuery("#smtp_server_mess").show();
                             jQuery("#smtp_port_mess").show();';
 		}
-		else
-		{
+		else {
             print '
                             jQuery("#MAIN_MAIL_SMTP_SERVER").prop("disabled", true);
                             jQuery("#MAIN_MAIL_SMTP_PORT").prop("disabled", true);
@@ -287,8 +286,7 @@ if ($action == 'edit')
 	{
 		print $form->selectarray('MAIN_MAIL_SENDMODE', $listofmethods, $conf->global->MAIN_MAIL_SENDMODE);
 	}
-	else
-	{
+	else {
 		$text = $listofmethods[$conf->global->MAIN_MAIL_SENDMODE];
 		if (empty($text)) $text = $langs->trans("Undefined");
 		$htmltext = $langs->trans("ContactSuperAdminForChange");
@@ -305,8 +303,7 @@ if ($action == 'edit')
 		print '</td><td>';
 		print '<span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
 	}
-	else
-	{
+	else {
 		$mainserver = (!empty($conf->global->MAIN_MAIL_SMTP_SERVER) ? $conf->global->MAIN_MAIL_SMTP_SERVER : '');
 		$smtpserver = ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined");
 		if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
@@ -319,8 +316,7 @@ if ($action == 'edit')
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_sav" name="MAIN_MAIL_SMTP_SERVER_sav" value="'.$mainserver.'">';
 			print '<span id="smtp_server_mess" class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
 		}
-		else
-		{
+		else {
 			$text = !empty($mainserver) ? $mainserver : $smtpserver;
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
@@ -337,8 +333,7 @@ if ($action == 'edit')
 		print '</td><td>';
 		print '<span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
 	}
-	else
-	{
+	else {
 		$mainport = (!empty($conf->global->MAIN_MAIL_SMTP_PORT) ? $conf->global->MAIN_MAIL_SMTP_PORT : '');
 		$smtpport = ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined");
 		if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
@@ -351,8 +346,7 @@ if ($action == 'edit')
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_sav" name="MAIN_MAIL_SMTP_PORT_sav" value="'.$mainport.'">';
 			print '<span id="smtp_port_mess" class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
 		}
-		else
-		{
+		else {
 			$text = (!empty($mainport) ? $mainport : $smtpport);
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
@@ -371,8 +365,7 @@ if ($action == 'edit')
 		{
 			print '<input class="flat" name="MAIN_MAIL_SMTPS_ID" size="32" value="'.$mainstmpid.'">';
 		}
-		else
-		{
+		else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_ID, $htmltext, 1, 'superadmin');
 			print '<input type="hidden" name="MAIN_MAIL_SMTPS_ID" value="'.$mainstmpid.'">';
@@ -392,8 +385,7 @@ if ($action == 'edit')
 		{
 			print '<input class="flat" type="password" name="MAIN_MAIL_SMTPS_PW" size="32" value="'.$mainsmtppw.'" autocomplete="off">';
 		}
-		else
-		{
+		else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW, $htmltext, 1, 'superadmin');
 			print '<input type="hidden" name="MAIN_MAIL_SMTPS_PW" value="'.$mainsmtppw.'">';
@@ -497,8 +489,7 @@ if ($action == 'edit')
 
 	print '</form>';
 }
-else
-{
+else {
 	dol_fiche_head($head, 'common', '', -1);
 
 	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
@@ -539,8 +530,7 @@ else
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td><span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span></td></tr>';
 	}
-	else
-	{
+	else {
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER", ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_SERVER) ? $conf->global->MAIN_MAIL_SMTP_SERVER : '').'</td></tr>';
 	}
 
@@ -549,8 +539,7 @@ else
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td><span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span></td></tr>';
 	}
-	else
-	{
+	else {
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT", ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_PORT) ? $conf->global->MAIN_MAIL_SMTP_PORT : '').'</td></tr>';
 	}
 
@@ -699,8 +688,7 @@ else
 		print $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 		if (!isValidEmail($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print img_warning($langs->trans("ErrorBadEMail"));
 	}
-	else
-	{
+	else {
 		print '&nbsp;';
 	}
 	print '</td></tr>';
@@ -722,8 +710,7 @@ else
 			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testconnect#formmailbeforetitle">'.$langs->trans("DoTestServerAvailability").'</a>';
 		}
 	}
-	else
-	{
+	else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("FeatureNotAvailableOnLinux").'">'.$langs->trans("DoTestServerAvailability").'</a>';
 	}
 
@@ -795,8 +782,7 @@ else
 		$mail = new CMailFile('', '', '', '', array(), array(), array(), '', '', 0, '', '', '', '', $trackid, $sendcontext);
 		$result = $mail->check_server_port($server, $port);
 		if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort", $server, $port).'</div>';
-		else
-		{
+		else {
 			$errormsg = $langs->trans("ServerNotAvailableOnIPOrPort", $server, $port);
 
 			if ($mail->error) {
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index 84a0d2a0893..98c44f2b503 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -157,8 +157,7 @@ if ($action == 'edit')
 			               jQuery("#smtp_port_mess").show();
 			               ';
 		}
-		else
-		{
+		else {
 			print '
 			               jQuery("#MAIN_MAIL_SMTP_SERVER_EMAILING").prop("disabled", true);
 			               jQuery("#MAIN_MAIL_SMTP_PORT_EMAILING").prop("disabled", true);
@@ -237,8 +236,7 @@ if ($action == 'edit')
 	{
 		print $form->selectarray('MAIN_MAIL_SENDMODE_EMAILING', $listofmethods, $conf->global->MAIN_MAIL_SENDMODE_EMAILING);
 	}
-	else
-	{
+	else {
 		$text = $listofmethods[$conf->global->MAIN_MAIL_SENDMODE_EMAILING];
 		if (empty($text)) $text = $langs->trans("Undefined");
 		$htmltext = $langs->trans("ContactSuperAdminForChange");
@@ -256,8 +254,7 @@ if ($action == 'edit')
 		print '</td><td>';
 		print $langs->trans("SeeLocalSendMailSetup");
 	}
-	else
-	{
+	else {
 		$mainserver = (!empty($conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING) ? $conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING : '');
 		$smtpserver = ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined");
 		if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
@@ -270,8 +267,7 @@ if ($action == 'edit')
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_EMAILING_sav" name="MAIN_MAIL_SMTP_SERVER_EMAILING_sav" value="'.$mainserver.'">';
 			print '<span id="smtp_server_mess">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
 		}
-		else
-		{
+		else {
 			$text = !empty($mainserver) ? $mainserver : $smtpserver;
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
@@ -289,8 +285,7 @@ if ($action == 'edit')
 		print '</td><td>';
 		print $langs->trans("SeeLocalSendMailSetup");
 	}
-	else
-	{
+	else {
 		$mainport = (!empty($conf->global->MAIN_MAIL_SMTP_PORT_EMAILING) ? $conf->global->MAIN_MAIL_SMTP_PORT_EMAILING : '');
 		$smtpport = ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined");
 		if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
@@ -303,8 +298,7 @@ if ($action == 'edit')
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_EMAILING_sav" name="MAIN_MAIL_SMTP_PORT_EMAILING_sav" value="'.$mainport.'">';
 			print '<span id="smtp_port_mess">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
 		}
-		else
-		{
+		else {
 			$text = (!empty($mainport) ? $mainport : $smtpport);
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
@@ -323,8 +317,7 @@ if ($action == 'edit')
 		{
 			print '<input class="flat" name="MAIN_MAIL_SMTPS_ID_EMAILING" size="32" value="'.$mainstmpid.'">';
 		}
-		else
-		{
+		else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_ID_EMAILING, $htmltext, 1, 'superadmin');
 			print '<input type="hidden" name="MAIN_MAIL_SMTPS_ID_EMAILING" value="'.$mainstmpid.'">';
@@ -342,8 +335,7 @@ if ($action == 'edit')
 		{
 			print '<input class="flat" type="password" name="MAIN_MAIL_SMTPS_PW_EMAILING" size="32" value="'.$mainsmtppw.'">';
 		}
-		else
-		{
+		else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW_EMAILING, $htmltext, 1, 'superadmin');
 			print '<input type="hidden" name="MAIN_MAIL_SMTPS_PW_EMAILING" value="'.$mainsmtppw.'">';
@@ -391,8 +383,7 @@ if ($action == 'edit')
 
 	print '</form>';
 }
-else
-{
+else {
     dol_fiche_head($head, 'common_emailing', '', -1);
 
     print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
@@ -415,8 +406,7 @@ else
 		{
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER", ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING) ? $conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING : '').'</td></tr>';
 		}
 
@@ -425,8 +415,7 @@ else
 		{
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT", ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_PORT_EMAILING) ? $conf->global->MAIN_MAIL_SMTP_PORT_EMAILING : '').'</td></tr>';
 		}
 
@@ -507,8 +496,7 @@ else
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testconnect">'.$langs->trans("DoTestServerAvailability").'</a>';
 			}
 		}
-		else
-		{
+		else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("FeatureNotAvailableOnLinux").'">'.$langs->trans("DoTestServerAvailability").'</a>';
 		}
 
@@ -539,8 +527,7 @@ else
 
 		$result = $mail->check_server_port($server, $port);
 		if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort", $server, $port).'</div>';
-		else
-		{
+		else {
 			$errormsg = $langs->trans("ServerNotAvailableOnIPOrPort", $server, $port);
 
 			if ($mail->error) {
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 1c50ebf0949..fd5f4e3b1a7 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -282,8 +282,7 @@ if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit
 {
 	$num = $nbtotalofrecords;
 }
-else
-{
+else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 37d1f903b4a..1dcc621095c 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -123,8 +123,7 @@ if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
     	$helpsubstitforlines .= $key.' -> '.$val.'<br>';
     }
 }
-else
-{
+else {
     $tmp = FormMail::getAvailableSubstitKey('formemailwithlines');
     $tmp['__(AnyTranslationKey)__'] = 'Translation';
     $helpsubstit = $langs->trans("AvailableVariables").':<br>';
@@ -297,8 +296,7 @@ if (empty($reshook))
                 setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
             	$_POST = array('id'=>$id); // Clean $_POST array, we keep only id
             }
-            else
-            {
+            else {
                 if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                     setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
                 }
@@ -356,8 +354,7 @@ if (empty($reshook))
             {
             	setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
             }
-            else
-            {
+            else {
                 setEventMessages($db->error(), null, 'errors');
             }
         }
@@ -377,8 +374,7 @@ if (empty($reshook))
             {
                 setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
             }
-            else
-            {
+            else {
                 dol_print_error($db);
             }
         }
@@ -577,8 +573,7 @@ foreach ($fieldsforcontent as $tmpfieldlist)
 	elseif ($tmpfieldlist == 'joinfiles') {
 		print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'" value="'.(isset($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '1').'">';
 	}
-	else
-	{
+	else {
 		if ($context != 'hide') {
 			// print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
 			$okforextended = true;
@@ -587,8 +582,7 @@ foreach ($fieldsforcontent as $tmpfieldlist)
 			$doleditor = new DolEditor($tmpfieldlist, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 120, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_4, '90%');
 			print $doleditor->Create(1);
 		}
-		else
-			print '&nbsp;';
+		else print '&nbsp;';
 	}
 	print '</td>';
 	if ($tmpfieldlist == 'topic') {
@@ -802,8 +796,7 @@ if ($resql)
 
                 print "</tr>\n";
             }
-            else
-            {
+            else {
             	$keyforobj = 'type_template';
             	if (!in_array($obj->$keyforobj, array_keys($elementList)))
             	{
@@ -989,15 +982,13 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			{
 				print $form->select_dolusers($obj->{$fieldlist[$field]}, 'fk_user', 1, null, 0, '', null, 0, 0, 1, '', 0, '', 'maxwidth200');
 			}
-			else
-			{
+			else {
 				if ($context == 'add')	// I am not admin and we show the add form
 				{
 					print $user->getNomUrl(1); // Me
 					$forcedvalue = $user->id;
 				}
-				else
-				{
+				else {
 					if ($obj && !empty($obj->{$fieldlist[$field]}) && $obj->{$fieldlist[$field]} > 0)
 					{
 						$fuser = new User($db);
@@ -1005,8 +996,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 						print $fuser->getNomUrl(1);
 						$forcedvalue = $fuser->id;
 					}
-					else
-					{
+					else {
 						$forcedvalue = $obj->{$fieldlist[$field]};
 					}
 				}
@@ -1024,8 +1014,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				if ($context == 'edit') $selectedlang = $obj->{$fieldlist[$field]};
 				print $formadmin->select_language($selectedlang, 'langcode', 0, null, 1, 0, 0, 'maxwidth150');
 			}
-			else
-			{
+			else {
 				if (!empty($obj->{$fieldlist[$field]}))
 				{
 					print $obj->{$fieldlist[$field]}.' - '.$langs->trans('Language_'.$obj->{$fieldlist[$field]});
@@ -1046,8 +1035,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				print '<input type="hidden" name="type_template" value="'.$obj->{$fieldlist[$field]}.'">';
 				print $obj->{$fieldlist[$field]};
 			}
-			else
-			{
+			else {
 				print $form->selectarray('type_template', $elementList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150 maxwidth100onsmartphone');
 			}
 			print '</td>';
@@ -1055,8 +1043,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 		elseif ($context == 'add' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
 		elseif ($context == 'edit' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
 		elseif ($context == 'hide' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
-		else
-		{
+		else {
 			$size = ''; $class = ''; $classtd = '';
 			if ($fieldlist[$field] == 'code') $class = 'maxwidth100';
 			if ($fieldlist[$field] == 'label') $class = 'maxwidth100';
@@ -1073,14 +1060,12 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				{
 					print $form->selectyesno($fieldlist[$field], '1', 1);
 				}
-				else
-				{
+				else {
 					//print '<input type="text" '.$size.'class="flat'.($class?' '.$class:'').'" value="1" name="'.$fieldlist[$field].'">';
 					print $form->selectyesno($fieldlist[$field], (isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1);
 				}
 			}
-			else
-			{
+			else {
 				print '<input type="text" '.$size.'class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
 			}
 			print '</td>';
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index 856ad50c28b..b66ab89075f 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -97,8 +97,7 @@ if ($action == 'update' && !$cancel)
 				{
 					$db->commit();
 				}
-				else
-				{
+				else {
 					$error++;
 					setEventMessages($langs->trans("FailedToInitializeMenu").' '.$key, null, 'errors');
 					$db->rollback();
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index ef58c1042d4..a059a76b40c 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -103,9 +103,7 @@ if ($action == 'update')
             if (is_numeric(GETPOST('menuIdParent', 'alpha')))
             {
             	$menu->fk_menu = GETPOST('menuIdParent', 'alpha');
-            }
-            else
-            {
+            } else {
     	       	if (GETPOST('type', 'alpha') == 'top') $menu->fk_menu = 0;
     	       	else $menu->fk_menu = -1;
             	$menu->fk_mainmenu = $mainmenu;
@@ -116,14 +114,10 @@ if ($action == 'update')
             if ($result > 0)
             {
 	            setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-            }
-            else
-            {
+            } else {
 	            setEventMessages($menu->error, $menu->errors, 'errors');
             }
-        }
-        else
-        {
+        } else {
 	        setEventMessages($menu->error, $menu->errors, 'errors');
         }
         $action = "edit";
@@ -131,8 +125,7 @@ if ($action == 'update')
         header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler);
         exit;
     }
-    else
-    {
+    else {
         header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler);
         exit;
     }
@@ -222,8 +215,7 @@ if ($action == 'add')
         {
         	$menu->fk_menu = GETPOST('menuId', 'alpha', 3);
         }
-        else
-        {
+        else {
             if (GETPOST('type', 'alpha') == 'top') $menu->fk_menu = 0;
             else $menu->fk_menu = -1;
             $menu->fk_mainmenu = $mainmenu;
@@ -236,8 +228,7 @@ if ($action == 'add')
             header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".GETPOST('menu_handler', 'aZ09'));
             exit;
         }
-        else
-        {
+        else {
             $action = 'create';
 	        setEventMessages($menu->error, $menu->errors, 'errors');
         }
@@ -261,8 +252,7 @@ if ($action == 'confirm_delete' && $_POST["confirm"] == 'yes')
         llxFooter();
         exit;
     }
-    else
-    {
+    else {
         $this->db->rollback();
 
         $reload = 0;
@@ -359,8 +349,7 @@ if ($action == 'create')
         print $langs->trans('Left');
         print '<input type="hidden" name="type" value="left">';
     }
-    else
-    {
+    else {
         print '<select name="type" class="flat" id="topleft">';
         print '<option value="">&nbsp;</option>';
         print '<option value="top"'.($_POST["type"] && $_POST["type"] == 'top' ? ' selected' : '').'>'.$langs->trans('Top').'</option>';
@@ -382,8 +371,7 @@ if ($action == 'create')
     {
         print '<td>'.$parent_rowid.'<input type="hidden" name="menuId" value="'.$parent_rowid.'"></td>';
     }
-    else
-    {
+    else {
         print '<td><input type="text" class="minwidth300" id="menuId" name="menuId" value="'.(GETPOST("menuId", 'int') ?GETPOST("menuId", 'int') : '').'"></td>';
     }
     print '<td>'.$langs->trans('DetailMenuIdParent');
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index 97f0246ac88..f27968d462d 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -192,8 +192,7 @@ elseif ($action == 'confirm_delete' && $confirm == 'yes')
 		header("Location: ".DOL_URL_ROOT.'/admin/menus/index.php?menu_handler='.$menu_handler);
 		exit;
 	}
-	else
-	{
+	else {
 		$db->rollback();
 
 		$reload = 0;
@@ -409,8 +408,7 @@ if ($conf->use_javascript_ajax)
 
 	print '</div>';
 }
-else
-{
+else {
 	$langs->load("errors");
 	setEventMessages($langs->trans("ErrorFeatureNeedJavascript"), null, 'errors');
 }
diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php
index ed35f48d90e..145ec566057 100644
--- a/htdocs/admin/menus/other.php
+++ b/htdocs/admin/menus/other.php
@@ -95,8 +95,7 @@ if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))
 {
 	print '<a href="'.$_SERVER["PHP_SELF"].'?action=activate_hidemenu">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 }
-else
-{
+else {
 	print '<a href="'.$_SERVER["PHP_SELF"].'?action=disable_hidemenu">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 }
 print "</td>";
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index d5bf12f1061..7b64dd08bd0 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -105,8 +105,7 @@ foreach ($modulesdir as $dir)
 						continue;
 		        	}
 
-		            try
-		            {
+		            try {
 		                $res = include_once $dir.$file;
 		                if (class_exists($modName))
 						{
@@ -141,8 +140,7 @@ foreach ($modulesdir as $dir)
 		    					        {
 		    					            $arrayofnatures['external_'.$publisher] = $langs->trans("External").' - '.$publisher;
 		    					        }
-		    					        else
-		    					        {
+		    					        else {
 		    					            $arrayofnatures['external_'] = $langs->trans("External").' - '.$langs->trans("UnknownPublishers");
 		    					        }
 		    					    }
@@ -188,8 +186,7 @@ foreach ($modulesdir as $dir)
 		            		     dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 		            		}
 						}
-		            	else
-						{
+		            	else {
 							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
 						}
 					}
@@ -202,8 +199,7 @@ foreach ($modulesdir as $dir)
 		}
 		closedir($handle);
 	}
-	else
-	{
+	else {
 		dol_syslog("htdocs/admin/modulehelp.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
 	}
 }
@@ -332,8 +328,7 @@ if ($mode == 'desc')
         $text .= $textexternal;
         $text .= '<br>';
     }
-    else
-    {
+    else {
         $text .= '<br><span class="opacitymedium">'.$langs->trans("Origin").':</span> '.$langs->trans("Core").'<br>';
     }
 
@@ -450,8 +445,7 @@ if ($mode == 'feature')
     {
     	$yesno = 'Yes';
     }
-    else
-    {
+    else {
     	$yesno = 'No';
     }
     require_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index c0f1991835b..dba149a2bb0 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -126,8 +126,7 @@ if ($action == 'install')
 		setEventMessages($langs->trans("ErrorModuleFileRequired"), null, 'warnings');
 		$error++;
 	}
-	else
-	{
+	else {
 		if (!$error && !preg_match('/\.zip$/i', $original_file))
 		{
 			$langs->load("errors");
@@ -174,8 +173,7 @@ if ($action == 'install')
 				setEventMessages($langs->trans($result['error'], $original_file), null, 'errors');
 				$error++;
 			}
-			else
-			{
+			else {
 				// Now we move the dir of the module
 				$modulename = preg_replace('/module_/', '', $original_file);
 				$modulename = preg_replace('/\-([0-9][0-9\.]*)\.zip$/i', '', $modulename);
@@ -231,8 +229,7 @@ if ($action == 'install')
 				}
 			}
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans("ErrorFailToRenameFile", $_FILES['fileinstall']['tmp_name'], $newfile), null, 'errors');
 			$error++;
 		}
@@ -248,8 +245,7 @@ if ($action == 'set' && $user->admin)
 {
 	$resarray = activateModule($value);
 	if (!empty($resarray['errors'])) setEventMessages('', $resarray['errors'], 'errors');
-	else
-	{
+	else {
 		//var_dump($resarray);exit;
 		if ($resarray['nbperms'] > 0)
 		{
@@ -341,8 +337,7 @@ foreach ($modulesdir as $dir)
 						continue;
 					}
 
-					try
-					{
+					try {
 						$res = include_once $dir.$file; // A class already exists in a different file will send a non catchable fatal error.
 						if (class_exists($modName))
 						{
@@ -376,8 +371,7 @@ foreach ($modulesdir as $dir)
 										{
 											$arrayofnatures['external_'.$publisher] = $langs->trans("External").' - '.$publisher;
 										}
-										else
-										{
+										else {
 											$arrayofnatures['external_'] = $langs->trans("External").' - '.$langs->trans("UnknownPublishers");
 										}
 									}
@@ -438,8 +432,7 @@ foreach ($modulesdir as $dir)
 								 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 							}
 						}
-						else
-						{
+						else {
 							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
 						}
 					}
@@ -452,8 +445,7 @@ foreach ($modulesdir as $dir)
 		}
 		closedir($handle);
 	}
-	else
-	{
+	else {
 		dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
 	}
 }
@@ -716,8 +708,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
 				}
 				if (!empty($conf->multicompany->enabled) && $user->entity) $disableSetup++;
 			}
-			else
-			{
+			else {
 				if (!empty($objMod->warnings_unactivation[$mysoc->country_code]) && method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {
 					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset_confirm&amp;confirm_message_code='.$objMod->warnings_unactivation[$mysoc->country_code].'&amp;value='.$modName.'&amp;mode='.$mode.$param.'">';
 					$codeenabledisable .= img_picto($langs->trans("Activated"), 'switch_on');
@@ -752,15 +743,13 @@ if ($mode == 'common' || $mode == 'commonkanban')
 							$codetoconfig .= '<a href="'.$urlpage.'" title="'.$langs->trans($page).'">'.img_picto(ucfirst($page), "setup").'</a>';
 							//    print '<a href="'.$page.'">'.ucfirst($page).'</a>&nbsp;';
 						}
-						else
-						{
+						else {
 							if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs))
 							{
 								$urltouse = dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1);
 								$codetoconfig .= '<a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
 							}
-							else
-							{
+							else {
 								$urltouse = $urlpage;
 								$codetoconfig .= '<a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
 							}
@@ -771,17 +760,15 @@ if ($mode == 'common' || $mode == 'commonkanban')
 				{
 					$codetoconfig .= '<a class="valignmiddle" href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1).'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
 				}
-				else
-				{
+				else {
 					$codetoconfig .= '<a class="valignmiddle" href="'.$objMod->config_page_url.'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
 				}
 			}
-			else
-			{
+			else {
 				$codetoconfig .= img_picto($langs->trans("NothingToSetup"), "setup", 'class="opacitytransp" style="padding-right: 6px"', false, 0, 0, '', 'fa-15');
 			}
 		}
-		else	// Module not yet activated
+		else // Module not yet activated
 		{
 			// Set $codeenabledisable
 			if (!empty($objMod->always_enabled))
@@ -792,8 +779,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
 			{
 				$codeenabledisable .= $langs->trans("Disabled");
 			}
-			else
-			{
+			else {
 				// Module qualified for activation
 				$warningmessage = '';
 				if (!empty($arrayofwarnings[$modName]))
@@ -857,8 +843,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
 				if (preg_match('/^\//i', $objMod->picto)) print img_picto($alttext, $objMod->picto, 'class="valignmiddle pictomodule paddingrightonly"', 1);
 				else print img_object($alttext, $objMod->picto, 'class="valignmiddle pictomodule paddingrightonly"');
 			}
-			else
-			{
+			else {
 				print img_object($alttext, 'generic', 'class="valignmiddle paddingrightonly"');
 			}
 			print ' <span class="valignmiddle">'.$objMod->getName().'</span>';
@@ -1028,8 +1013,7 @@ if ($mode == 'deploy')
 			$message = info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
 			$allowfromweb = -1;
 		}
-		else
-		{
+		else {
 			if ($dirins_ok)
 			{
 				if (!is_writable(dol_osencode($dirins)))
@@ -1039,15 +1023,13 @@ if ($mode == 'deploy')
 					$allowfromweb = 0;
 				}
 			}
-			else
-			{
+			else {
 				$message = info_admin($langs->trans("NotExistsDirect", $dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
 				$allowfromweb = 0;
 			}
 		}
 	}
-	else
-	{
+	else {
 		$message = info_admin($langs->trans("InstallModuleFromWebHasBeenDisabledByFile", $dolibarrdataroot.'/installmodules.lock'));
 		$allowfromweb = 0;
 	}
@@ -1068,8 +1050,7 @@ if ($mode == 'deploy')
 		{
 			//print $langs->trans("ThisIsProcessToFollow").'<br>';
 		}
-		else
-		{
+		else {
 			print $langs->trans("ThisIsAlternativeProcessToFollow").'<br>';
 			print '<b>'.$langs->trans("StepNb", 1).'</b>: ';
 			print $langs->trans("FindPackageFromWebSite", $fullurl).'<br>';
@@ -1150,8 +1131,7 @@ if ($mode == 'deploy')
 					print info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow, $maxphptoshowparam), 1);
 				}
 			}
-			else
-			{
+			else {
 				print ' ('.$langs->trans("UploadDisabled").')';
 			}
 
@@ -1162,8 +1142,7 @@ if ($mode == 'deploy')
 
 			print '<div class="center"><div class="logo_setup"></div></div>';
 		}
-		else
-		{
+		else {
 			print $langs->trans("UnpackPackageInModulesRoot", $dirins).'<br>';
 			print '<b>'.$langs->trans("StepNb", 4).'</b>: ';
 			print $langs->trans("SetupIsReadyForUse").'<br>';
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index 9c59b5cf6da..ddf55993fd7 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -59,8 +59,7 @@ if ($action == 'updateMask')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -97,14 +96,12 @@ elseif ($action == 'specimen')
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=mrp&file=SPECIMEN.pdf");
 			return;
 		}
-		else
-		{
+		else {
 			setEventMessages($module->error, null, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -162,8 +159,7 @@ elseif ($action == 'set_MRP_MO_DRAFT_WATERMARK')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -180,8 +176,7 @@ elseif ($action == 'set_MRP_MO_FREE_TEXT')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -263,8 +258,7 @@ foreach ($dirmodels as $reldir)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						}
-						else
-						{
+						else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -329,8 +323,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -400,8 +393,7 @@ foreach ($dirmodels as $reldir)
 	                            	print '</a>';
 	                            	print '</td>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -413,8 +405,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -443,8 +434,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -490,8 +480,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 }
-else
-{
+else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index 4ba581398ee..1b912b27b5e 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -54,8 +54,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	{
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
         setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -67,8 +66,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 	{
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
         setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -146,8 +144,7 @@ elseif ($action == 'setapilayer')
         dolibarr_set_const($db, 'MULTICURRENCY_APP_SOURCE', GETPOST('MULTICURRENCY_APP_SOURCE', 'alpha'));
         //dolibarr_set_const($db, 'MULTICURRENCY_ALTERNATE_SOURCE', GETPOST('MULTICURRENCY_ALTERNATE_SOURCE', 'alpha'));
     }
-    else
-    {
+    else {
         $result = MultiCurrency::syncRates($conf->global->MULTICURRENCY_APP_ID);
         if ($result > 0) {
         	setEventMessages($langs->trans("CurrencyRateSyncSucceed"), null, "mesgs");
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index ba92aa1ec21..859d36b7c36 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -85,8 +85,7 @@ if ($action == 'settemplates')
 
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		$db->rollback();
 
 		setEventMessages($langs->trans("Error"), null, 'errors');
@@ -107,8 +106,7 @@ if ($action == 'setvalue' && $user->admin)
 
     	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
     	$db->rollback();
 
     	setEventMessages($langs->trans("Error"), null, 'errors');
@@ -161,8 +159,7 @@ if ($action == 'setfixednotif' && $user->admin)
 
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-	{
+    else {
 		$db->rollback();
 
         setEventMessages($langs->trans("Error"), null, 'errors');
diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 785a77ac043..85f9ebf0409 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -120,8 +120,7 @@ foreach ($list as $key)
         print '<td><input style="width: 80%" type"text" name="uri'.$key[0].'" value="'.$redirect_uri.'">';
         print '</td></tr>';
     }
-    else
-    {
+    else {
         print '<tr class="oddeven value">';
         print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
         print '<td>'.$langs->trans("FeatureNotYetSupported").'</td>';
diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index d8c65f9a2c5..f0d3c530b71 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -79,8 +79,7 @@ if ($action == 'setconst' && $user->admin)
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null);
     }
-    else
-    {
+    else {
         $db->rollback();
         dol_print_error($db);
     }
@@ -99,8 +98,7 @@ if ($action == 'setvalue' && $user->admin)
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null);
     }
-    else
-    {
+    else {
         $db->rollback();
         dol_print_error($db);
     }
@@ -179,8 +177,7 @@ if ($mode == 'setup' && $user->admin)
         	$urltodelete = '';
         	$urltocheckperms = '';
         }
-        else
-		{
+        else {
 			$urltorenew = '';
 			$urltodelete = '';
 			$urltocheckperms = '';
@@ -194,8 +191,7 @@ if ($mode == 'setup' && $user->admin)
         require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
         // Dolibarr storage
         $storage = new DoliStorage($db, $conf);
-        try
-        {
+        try {
             $tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME);
         }
         catch (Exception $e)
@@ -226,8 +222,7 @@ if ($mode == 'setup' && $user->admin)
                 {
                     $expiredat = $langs->trans("Unknown");
                 }
-                else
-                {
+                else {
                     $expiredat = dol_print_date($endoflife, "dayhour");
                 }
             }
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index a5b494b62e2..2873cf5d15f 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -57,8 +57,7 @@ if ($action == 'updateMask')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -184,8 +183,7 @@ foreach ($dirmodels as $reldir)
                             {
                                 print img_picto($langs->trans("Activated"), 'switch_on');
                             }
-                            else
-                            {
+                            else {
                                 print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                             }
                             print '</td>';
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 496a32923f7..ec4015f6e98 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -190,8 +190,7 @@ for ($i = 1; $i <= 6; $i++)
 		$pid = $langs->transcountry("ProfId".$i, $mysoc->country_code);
 		if ($pid == '-') $pid = false;
 	}
-	else
-	{
+	else {
 		$pid = img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
 	}
 	if ($pid)
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 0486edebeec..7dcaf0fba47 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -230,8 +230,7 @@ if ($result)
 			print img_picto($langs->trans("Active"), 'tick');
 			print '</td>';
 		}
-		else
-		{
+		else {
 			print '<td>';
 			print '<a class="reposition" href="perms.php?pid='.$obj->id.'&amp;action=add">'.img_edit_add().'</a>';
 			print '</td>';
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index e9795304ad3..b33b2396aa2 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -101,8 +101,7 @@ if ($action == "set")
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 73703829b8c..f2c748b4ce2 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -64,8 +64,7 @@ if ($action == 'updateMask')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -101,14 +100,12 @@ elseif ($action == 'specimen')
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=propal&file=SPECIMEN.pdf");
 			return;
 		}
-		else
-		{
+		else {
 			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -127,8 +124,7 @@ elseif ($action == 'setribchq')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -143,8 +139,7 @@ elseif ($action == 'set_PROPALE_DRAFT_WATERMARK')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -160,8 +155,7 @@ elseif ($action == 'set_PROPOSAL_FREE_TEXT')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -175,8 +169,7 @@ elseif ($action == 'setdefaultduration')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -191,8 +184,7 @@ elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -311,8 +303,7 @@ foreach ($dirmodels as $reldir)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						}
-						else
-						{
+						else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -377,8 +368,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -449,8 +439,7 @@ foreach ($dirmodels as $reldir)
 	                            	print '</a>';
 	                            	print '</td>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print "<td align=\"center\">\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -462,8 +451,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -497,8 +485,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -572,14 +559,12 @@ if (empty($conf->facture->enabled))
 				}
 				print "</select>";
 			}
-			else
-			{
+			else {
 				print "<i>".$langs->trans("NoActiveBankAccountDefined")."</i>";
 			}
 		}
 	}
-	else
-	{
+	else {
 		print '<span class="opacitymedium">'.$langs->trans("BankModuleNotActive").'</span>';
 	}
 }
@@ -686,8 +671,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 }
-else
-{
+else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index 8730f148c07..dc6aa5da33b 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -90,8 +90,7 @@ if ($action == 'addprinter' && $user->admin) {
             $db->commit();
             setEventMessages($langs->trans("PrinterAdded", $printername), null);
         }
-        else
-        {
+        else {
             $db->rollback();
             dol_print_error($db);
         }
@@ -116,8 +115,7 @@ if ($action == 'deleteprinter' && $user->admin) {
             $db->commit();
             setEventMessages($langs->trans("PrinterDeleted", $printername), null);
         }
-        else
-        {
+        else {
             $db->rollback();
             dol_print_error($db);
         }
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index 312038d3fcc..68f8f0e62ee 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -72,8 +72,7 @@ if ($action == 'updateMask')
 	{
 		if ($res > 0)
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		else
-			setEventMessages($langs->trans("Error"), null, 'errors');
+		else setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
@@ -133,14 +132,12 @@ elseif ($action == 'specimen')
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=reception&file=SPECIMEN.pdf");
 			return;
 		}
-		else
-		{
+		else {
 			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -264,8 +261,7 @@ foreach ($dirmodels as $reldir)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						}
-						else
-						{
+						else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;value='.$file.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -332,8 +328,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -402,8 +397,7 @@ foreach ($dirmodels as $reldir)
 	                            	print '</a>';
 	                            	print '</td>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -415,8 +409,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -447,8 +440,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'reception').'</a>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php
index 3efdd05bdc7..04ff3861c7f 100644
--- a/htdocs/admin/resource.php
+++ b/htdocs/admin/resource.php
@@ -92,8 +92,7 @@ if (empty($conf->use_javascript_ajax))
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print '</td>';
 }
-else
-{
+else {
 	print '<td width="60" class="right">';
 	$arrval = array(
 			'0'=>$langs->trans("No"),
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index d9d61673c5e..161b521337b 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -46,8 +46,7 @@ if ($action == 'setgeneraterule')
 	{
 		dol_print_error($db);
 	}
-	else
-	{
+	else {
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
@@ -102,8 +101,7 @@ if ($action == 'activate_encrypt')
 		header("Location: security.php");
 	    exit;
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		dol_print_error($db, '');
 	}
@@ -132,8 +130,7 @@ if ($action == 'activate_encryptdbpassconf')
 		header("Location: security.php");
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans('InstrucToEncodePass', dol_encode($dolibarr_main_db_pass)), null, 'warnings');
 	}
 }
@@ -149,8 +146,7 @@ elseif ($action == 'disable_encryptdbpassconf')
 		header("Location: security.php");
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans('InstrucToClearPass', $dolibarr_main_db_pass), null, 'warnings');
 	}
 }
@@ -278,8 +274,7 @@ foreach ($arrayhandler as $key => $module)
         {
             print img_picto('', 'tick');
         }
-        else
-        {
+        else {
             print '<a href="'.$_SERVER['PHP_SELF'].'?action=setgeneraterule&amp;value='.$key.'">'.$langs->trans("Activate").'</a>';
         }
         print "</td></tr>\n";
@@ -436,8 +431,7 @@ if (!empty($conf->global->DATABASE_PWD_ENCRYPTED))
 	  	//Do not allow "disable encryption" as passwords cannot be decrypted
 	  	print '<a href="security.php?action=disable_encrypt">'.$langs->trans("Disable").'</a>';
 	}
-	else
-	{
+	else {
 		print '-';
 	}
 	print "</td>";
@@ -463,8 +457,7 @@ if (empty($dolibarr_main_db_pass) && empty($dolibarr_main_db_encrypted_pass))
 	$langs->load("errors");
 	print img_warning($langs->trans("WarningPassIsEmpty"));
 }
-else
-{
+else {
 	if (empty($dolibarr_main_db_encrypted_pass))
 	{
 		print '<a href="security.php?action=activate_encryptdbpassconf">'.$langs->trans("Activate").'</a>';
@@ -516,8 +509,7 @@ if (GETPOST('info', 'int') > 0)
     {
         print $langs->trans("Note: The function password_hash exists on your PHP")."<br>\n";
     }
-    else
-    {
+    else {
         print $langs->trans("Note: The function password_hash does not exists on your PHP")."<br>\n";
     }
     print 'MAIN_SECURITY_HASH_ALGO = '.$conf->global->MAIN_SECURITY_HASH_ALGO."<br>\n";
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index f642cd64182..b6674f00c5c 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -51,8 +51,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 } elseif (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg)) {
@@ -62,8 +61,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -119,20 +117,17 @@ if (function_exists("imagecreatefrompng"))
 	{
 		print ajax_constantonoff('MAIN_SECURITY_ENABLECAPTCHA');
 	}
-	else
-	{
+	else {
 		if (empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
 		{
 			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_MAIN_SECURITY_ENABLECAPTCHA">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		}
-		else
-		{
+		else {
 			print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_MAIN_SECURITY_ENABLECAPTCHA">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 		}
 	}
 }
-else
-{
+else {
     $desc = $form->textwithpicto('', $langs->transnoentities("EnableGDLibraryDesc"), 1, 'warning');
     print $desc;
 }
@@ -146,14 +141,12 @@ if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('MAIN_USE_ADVANCED_PERMS');
 }
-else
-{
+else {
 	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_MAIN_USE_ADVANCED_PERMS">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	}
-	else
-	{
+	else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_MAIN_USE_ADVANCED_PERMS">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index 09cc0debfd5..0745203f365 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -123,8 +123,7 @@ if ($action == 'send' && !$_POST['cancel'])
 			setEventMessages($langs->trans("SmsSuccessfulySent", $smsfrom, $sendto), null, 'mesgs');
 			setEventMessages($smsfile->error, $smsfile->errors, 'mesgs');
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans("ResultKo"), null, 'errors');
 			setEventMessages($smsfile->error, $smsfile->errors, 'errors');
 		}
@@ -206,8 +205,7 @@ if ($action == 'edit')
 	print '</form>';
 	print '<br>';
 }
-else
-{
+else {
 	if (!count($listofmethods)) print '<div class="warning">'.$langs->trans("NoSmsEngine", '<a target="_blank" href="http://www.dolistore.com/search.php?orderby=position&orderway=desc&search_query=smsmanager">DoliStore</a>').'</div>';
 
 	print '<table class="noborder centpercent">';
@@ -265,8 +263,7 @@ else
 	{
 	    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=test&amp;mode=init">'.$langs->trans("DoTestSend").'</a>';
 	}
-	else
-	{
+	else {
         print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("DoTestSend").'</a>';
 	}
 	print '</div>';
diff --git a/htdocs/admin/socialnetworks.php b/htdocs/admin/socialnetworks.php
index d2a92aed9e8..fd4329b7023 100644
--- a/htdocs/admin/socialnetworks.php
+++ b/htdocs/admin/socialnetworks.php
@@ -49,8 +49,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 }
@@ -63,8 +62,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 }
diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php
index 2ed43e97efd..6c1d1837ea8 100644
--- a/htdocs/admin/spip.php
+++ b/htdocs/admin/spip.php
@@ -74,8 +74,7 @@ if ($action == 'update' || $action == 'add')
         {
             setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
         }
-        else
-        {
+        else {
             setEventMessages($langs->trans("Error"), null, 'errors');
         }
     }
@@ -154,8 +153,7 @@ if (!empty($conf->global->ADHERENT_USE_SPIP))
 
     print '</form>';
 }
-else
-{
+else {
     dol_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user');
 
     $link = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&value=1&name=ADHERENT_USE_SPIP">';
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 43e610c3052..d3b9061eecc 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -49,8 +49,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 }
@@ -63,8 +62,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 }
@@ -120,8 +118,7 @@ if (!empty($conf->facture->enabled))
         print $form->selectarray("STOCK_CALCULATE_ON_BILL", $arrval, $conf->global->STOCK_CALCULATE_ON_BILL);
     }
 }
-else
-{
+else {
     print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module30Name"));
 }
 print "</td>\n</tr>\n";
@@ -140,8 +137,7 @@ if (!empty($conf->commande->enabled))
         print $form->selectarray("STOCK_CALCULATE_ON_VALIDATE_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER);
     }
 }
-else
-{
+else {
     print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module25Name"));
 }
 print "</td>\n</tr>\n";
@@ -162,8 +158,7 @@ if (!empty($conf->expedition->enabled))
         print $form->selectarray("STOCK_CALCULATE_ON_SHIPMENT", $arrval, $conf->global->STOCK_CALCULATE_ON_SHIPMENT);
     }
 }
-else
-{
+else {
     print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module80Name"));
 }
 print "</td>\n</tr>\n";
@@ -182,8 +177,7 @@ if (!empty($conf->expedition->enabled))
         print $form->selectarray("STOCK_CALCULATE_ON_SHIPMENT_CLOSE", $arrval, $conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE);
     }
 }
-else
-{
+else {
     print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module80Name"));
 }
 print "</td>\n</tr>\n";
@@ -222,8 +216,7 @@ if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUP
         print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_BILL", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL);
     }
 }
-else
-{
+else {
     print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module40Name"));
 }
 print "</td>\n</tr>\n";
@@ -243,8 +236,7 @@ if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUP
         print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER);
     }
 }
-else
-{
+else {
     print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module40Name"));
 }
 print "</td>\n</tr>\n";
@@ -280,8 +272,7 @@ if (!empty($conf->reception->enabled))
 	print "</td>\n</tr>\n";
 	$found++;
 }
-else
-{
+else {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("ReStockOnDispatchOrder").'</td>';
     print '<td class="right">';
@@ -294,8 +285,7 @@ else
             print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER);
         }
 	}
-	else
-	{
+	else {
 		print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module40Name"));
 	}
 	print "</td>\n</tr>\n";
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 977b99d0c99..c52f4296429 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -71,8 +71,7 @@ if ($action == 'updateMask')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -110,14 +109,12 @@ if ($action == 'specimen')  // For invoices
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=facture_fournisseur&file=SPECIMEN.pdf");
     		return;
     	}
-    	else
-    	{
+    	else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
     }
-    else
-    {
+    else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -186,8 +183,7 @@ if ($action == 'set_SUPPLIER_INVOICE_FREE_TEXT')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -273,8 +269,7 @@ foreach ($dirmodels as $reldir)
                         {
                             print img_picto($langs->trans("Activated"), 'switch_on');
                         }
-                        else
-                        {
+                        else {
                             print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         }
                         print '</td>';
@@ -341,8 +336,7 @@ if ($resql)
         $i++;
     }
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
@@ -410,8 +404,7 @@ foreach ($dirmodels as $reldir)
                         }*/
                         print "</td>";
                     }
-                    else
-                    {
+                    else {
                         print '<td class="center">'."\n";
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         print "</td>";
@@ -425,8 +418,7 @@ foreach ($dirmodels as $reldir)
                         // Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
                     }
-                    else
-                    {
+                    else {
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
                     }
                     print '</td>';
@@ -488,8 +480,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 }
-else
-{
+else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index db9b3e257f6..f282ee8d7ca 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -69,8 +69,7 @@ if ($action == 'updateMask')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -108,14 +107,12 @@ elseif ($action == 'specimen')  // For orders
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=commande_fournisseur&file=SPECIMEN.pdf");
     		return;
     	}
-    	else
-    	{
+    	else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
     }
-    else
-    {
+    else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -197,8 +194,7 @@ elseif ($action == 'set_SUPPLIER_ORDER_OTHER')
     	// Insert
     	$newmodule->insert_permissions(1);
     }
-    else
-    {
+    else {
     	// Remove all rights with Permission1190
     	$newmodule->delete_permissions();
 
@@ -218,8 +214,7 @@ elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -305,8 +300,7 @@ foreach ($dirmodels as $reldir)
                         {
                             print img_picto($langs->trans("Activated"), 'switch_on');
                         }
-                        else
-                        {
+                        else {
                             print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         }
                         print '</td>';
@@ -371,8 +365,7 @@ if ($resql)
         $i++;
     }
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
@@ -430,14 +423,12 @@ foreach ($dirmodels as $reldir)
                             print img_picto($langs->trans("Enabled"), 'switch_on');
                             print '</a>';
                         }
-                        else
-                        {
+                        else {
                             print img_picto($langs->trans("Enabled"), 'switch_on');
                         }
                         print "</td>";
                     }
-                    else
-                    {
+                    else {
                         print '<td class="center">'."\n";
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         print "</td>";
@@ -449,8 +440,7 @@ foreach ($dirmodels as $reldir)
                     {
                         print img_picto($langs->trans("Default"), 'on');
                     }
-                    else
-                    {
+                    else {
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
                     }
                     print '</td>';
@@ -554,8 +544,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 }
-else
-{
+else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
@@ -573,8 +562,7 @@ if ($conf->reception->enabled)
 {
 	print '<span class="opacitymedium">'.$langs->trans("FeatureNotAvailableWithReceptionModule").'</span>';
 }
-else
-{
+else {
 	if ($conf->use_javascript_ajax) {
 		print ajax_constantonoff('SUPPLIER_ORDER_USE_DISPATCH_STATUS');
 	} else {
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index 5d7a0d0b8d5..1c4cfd5905e 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -58,8 +58,7 @@ if ($action == 'updateMask')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }elseif ($action == 'setmod')
@@ -132,14 +131,12 @@ elseif ($action == 'specimen')
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=supplier_payment&file=SPECIMEN.pdf");
     		return;
     	}
-    	else
-    	{
+    	else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
     }
-    else
-    {
+    else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -207,8 +204,7 @@ if ($resql)
         $i++;
     }
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
@@ -283,8 +279,7 @@ foreach ($dirmodels as $reldir)
                             {
                                 print img_picto($langs->trans("Activated"), 'switch_on');
                             }
-                            else
-                            {
+                            else {
                                 print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                             }
                             print '</td>';
@@ -399,8 +394,7 @@ foreach ($dirmodels as $reldir)
                         }*/
                         print "</td>";
                     }
-                    else
-                    {
+                    else {
                         print '<td class="center">'."\n";
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         print "</td>";
@@ -414,8 +408,7 @@ foreach ($dirmodels as $reldir)
                         // Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
                     }
-                    else
-                    {
+                    else {
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
                     }
                     print '</td>';
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index c1007623a54..bb3454de4f7 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -61,8 +61,7 @@ if ($action == 'updateMask')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -99,14 +98,12 @@ if ($action == 'specimen')
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=supplier_proposal&file=SPECIMEN.pdf");
 			return;
 		}
-		else
-		{
+		else {
 			setEventMessages($module->error, null, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -123,8 +120,7 @@ if ($action == 'set_SUPPLIER_PROPOSAL_DRAFT_WATERMARK')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -141,8 +137,7 @@ if ($action == 'set_SUPPLIER_PROPOSAL_FREE_TEXT')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -157,8 +152,7 @@ if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -279,8 +273,7 @@ foreach ($dirmodels as $reldir)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						}
-						else
-						{
+						else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -344,8 +337,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -415,8 +407,7 @@ foreach ($dirmodels as $reldir)
 	                            	print '</a>';
 	                            	print '</td>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print "<td align=\"center\">\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -428,8 +419,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -463,8 +453,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -512,8 +501,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 }
-else
-{
+else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
@@ -544,21 +532,18 @@ if ($conf->banque->enabled)
     {
         print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL');
     }
-    else
-    {
+    else {
         if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL))
         {
             print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL&amp;value=1">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
         }
-        else
-        {
+        else {
             print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL&amp;value=0">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
         }
     }
     print '</td></tr>';
 }
-else
-{
+else {
     print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 16b273cd6db..44143afb270 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -127,8 +127,7 @@ if ($action == 'set')
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		setEventMessages($error, $errors, 'errors');
 	}
@@ -156,8 +155,7 @@ if ($action == 'setlevel')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index 3d0dddd6d10..db7559de17a 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -201,8 +201,7 @@ if ($showpromotemessage)
             print $langs->trans("ExampleOfNewsMessageForMajorRelease", DOL_VERSION, DOL_VERSION);
             print '</textarea>';
         }
-        else
-        {
+        else {
             print $langs->trans("TitleExampleForMaintenanceRelease").':<br>';
             print '<textarea style="width:80%; min-height: 60px">';
             print $langs->trans("ExampleOfNewsMessageForMaintenanceRelease", DOL_VERSION, DOL_VERSION);
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index c52af371dbc..ebf3366bf74 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -174,8 +174,7 @@ foreach ($configfileparameters as $key)
 		{
 			print '<td colspan="3">&nbsp;</td>';
 		}
-		else
-		{
+		else {
 			// Label
 			print "<td>".$configfilelib[$i].'</td>';
 			// Key
@@ -220,8 +219,7 @@ if (empty($conf->multicompany->enabled))
 	// If no multicompany mode, admins can see global and their constantes
 	$sql .= " WHERE entity IN (0,".$conf->entity.")";
 }
-else
-{
+else {
 	// If multicompany mode, superadmin (user->entity=0) can see everything, admin are limited to their entities.
 	if ($user->entity) $sql .= " WHERE entity IN (".$user->entity.",".$conf->entity.")";
 }
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 323d9b4c115..e3aa6eb020e 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -83,8 +83,7 @@ if (!$base)
 {
 	print $langs->trans("FeatureNotAvailableWithThisDatabaseDriver");
 }
-else
-{
+else {
 	if ($base == 1)
 	{
         print '<div class="div-table-responsive-no-min">';
@@ -121,8 +120,7 @@ else
 				{
 				    print '<td><a class="reposition" href="database-tables.php?action=convert&amp;table='.$obj->Name.'">'.$langs->trans("Convert").' InnoDB</a></td>';
 				}
-				else
-				{
+				else {
 					print '<td>&nbsp;</td>';
 				}
 				print '<td>'.$obj->Row_format.'</td>';
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index ef62c9aa34e..3706642226f 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -74,8 +74,7 @@ if (!count($listofvars) && !count($listofstatus))
 {
 	print $langs->trans("FeatureNotAvailableWithThisDatabaseDriver");
 }
-else
-{
+else {
 	foreach ($arraylist as $listname)
 	{
 		print '<br>';
diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index 90f788f3825..42f8b8834b3 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -60,8 +60,7 @@ if (!$base)
 {
 	print $langs->trans("FeatureNotAvailableWithThisDatabaseDriver");
 }
-else
-{
+else {
 	$resql = $db->query($sql);
 	if ($resql)
 	{
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 0796d934a74..3e5ef397797 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -77,8 +77,7 @@ if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE))
     // Compare version with last install database version (upgrades never occured)
     if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_INSTALL) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_INSTALL));
 }
-else
-{
+else {
     // Compare version with last upgrade database version
     if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_UPGRADE));
 }
@@ -108,13 +107,11 @@ if (function_exists('curl_init'))
             // Show version
             print $langs->trans("LastStableVersion").' : <b>'.(($version != '0.0') ? $version : $langs->trans("Unknown")).'</b>';
         }
-        else
-        {
+        else {
             print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("UpdateServerOffline").'</b>';
         }
     }
-    else
-    {
+    else {
         print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="butAction">'.$langs->trans("Check").'</a>';
     }
 }
@@ -366,8 +363,7 @@ foreach ($configfileparameters as $key => $value)
 		{
 			print '<td colspan="3">&nbsp;</td>';
 		}
-		else
-		{
+		else {
 			// Label
 			print "<td>".$value.'</td>';
 			// Key
@@ -403,8 +399,7 @@ foreach ($configfileparameters as $key => $value)
 			    }
 			    print ' &nbsp; <span class="opacitymedium">('.$langs->trans("HashForPing").'='.md5('dolibarr'.$valuetoshow).')</span>';
 			}
-			else
-			{
+			else {
 			    print ${$newkey};
 			}
 			if ($newkey == 'dolibarr_main_url_root' && ${$newkey} != DOL_MAIN_URL_ROOT) print ' (currently overwritten by autodetected value: '.DOL_MAIN_URL_ROOT.')';
@@ -442,8 +437,7 @@ if (empty($conf->multicompany->enabled))
 	// If no multicompany mode, admins can see global and their constantes
 	$sql .= " WHERE entity IN (0,".$conf->entity.")";
 }
-else
-{
+else {
 	// If multicompany mode, superadmin (user->entity=0) can see everything, admin are limited to their entities.
 	if ($user->entity) $sql .= " WHERE entity IN (".$user->entity.",".$conf->entity.")";
 }
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index b1124e88add..791772f0da6 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -99,8 +99,7 @@ if (dol_is_file($xmlfile))
     print '<input name="xmlshortfile" class="flat minwidth400" value="'.dol_escape_htmltag($xmlshortfile).'">';
     print '<br>';
 }
-else
-{
+else {
     print '<input type="radio" name="target" value="local"> '.$langs->trans("LocalSignature").' = ';
     print '<input name="xmlshortfile" class="flat minwidth400" value="'.dol_escape_htmltag($xmlshortfile).'">';
     print ' <span class="warning">('.$langs->trans("AvailableOnlyOnPackagedVersions").')</span>';
@@ -112,8 +111,7 @@ if ($enableremotecheck)
     print '<input type="radio" name="target" value="remote"'.(GETPOST('target') == 'remote' ? 'checked="checked"' : '').'> '.$langs->trans("RemoteSignature").' = ';
     print '<input name="xmlremote" class="flat minwidth400" value="'.dol_escape_htmltag($xmlremote).'"><br>';
 }
-else
-{
+else {
     print '<input type="radio" name="target" value="remote" disabled="disabled"> '.$langs->trans("RemoteSignature").' = '.$xmlremote;
     if (!GETPOST('xmlremote')) print ' <span class="warning">('.$langs->trans("FeatureAvailableOnlyOnStable").')</span>';
     print '<br>';
@@ -141,8 +139,7 @@ if (GETPOST('target') == 'local')
     	}
         $xml = simplexml_load_file($xmlfile);
     }
-    else
-    {
+    else {
         print $langs->trans('XmlNotFound').': '.$xmlfile;
         $error++;
     }
@@ -158,8 +155,7 @@ if (GETPOST('target') == 'remote')
         //print "xmlfilestart".$xmlfile."xmlfileend";
         $xml = simplexml_load_string($xmlfile);
     }
-    else
-    {
+    else {
         $errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
         setEventMessages($errormsg, null, 'errors');
         $error++;
@@ -271,8 +267,7 @@ if (!$error && $xml)
 	            $out .= "</tr>\n";
 	        }
         }
-        else
-        {
+        else {
             $out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         $out .= '</table>';
@@ -326,8 +321,7 @@ if (!$error && $xml)
             $out .= '<td class="right"></td>'."\n";
             $out .= "</tr>\n";
         }
-        else
-        {
+        else {
             $out .= '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         $out .= '</table>';
@@ -381,8 +375,7 @@ if (!$error && $xml)
             $out .= '<td class="right"></td>'."\n";
             $out .= "</tr>\n";
         }
-        else
-        {
+        else {
             $out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         $out .= '</table>';
@@ -394,13 +387,11 @@ if (!$error && $xml)
         {
             setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
         }
-        else
-        {
+        else {
             setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
         }
     }
-    else
-    {
+    else {
         print 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile;
         $error++;
     }
@@ -434,15 +425,13 @@ if (!$error && $xml)
     		$resultcomment = 'FileIntegrityIsOkButFilesWereAdded';
     		$outcurrentchecksum = $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
     	}
-    	else
-    	{
+    	else {
     		$resultcode = 'ok';
     		$resultcomment = 'Success';
     		$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
     	}
     }
-    else
-    {
+    else {
     	$resultcode = 'error';
     	$resultcomment = 'Error';
     	$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 61de00287e9..786b8b7306c 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -70,8 +70,7 @@ foreach ($modulesdir as $dir)
 						// File duplicate
 						print "Warning duplicate file found : ".$file." (Found ".$dir.$file.", already found ".$modules_fullpath[$file].")<br>";
 					}
-					else
-					{
+					else {
 						// File to load
 						$res = include_once $dir.$file;
 						if (class_exists($modName))
@@ -90,8 +89,7 @@ foreach ($modulesdir as $dir)
 								dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 							}
 						}
-						else
-						{
+						else {
 							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
 						}
 					}
@@ -125,8 +123,7 @@ foreach ($sortorder as $numero=>$name)
 	   	if (preg_match('/^\//', $picto[$numero])) print img_picto($alt, $picto[$numero], 'width="14px"', 1);
 	   	else print img_object($alt, $picto[$numero], 'width="14px"');
 	}
-	else
-	{
+	else {
 	  	print img_object($alt, $picto[$numero], 'width="14px"');
 	}
 	print ' '.$modules[$numero]->getName();
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index dd77c41a673..2c6e20f0d22 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -63,8 +63,7 @@ print '<br>';
 print '<strong>'.$langs->trans("XDebug").'</strong>: ';
 $test = !function_exists('xdebug_is_enabled');
 if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
-else
-{
+else {
 	print img_picto('', 'warning').' '.$langs->trans("ModuleActivated", $langs->transnoentities("XDebug"));
 	print ' - '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php">XDebug admin page</a>';
 }
@@ -75,8 +74,7 @@ print '<br>';
 print '<strong>'.$langs->trans("Syslog").'</strong>: ';
 $test = empty($conf->syslog->enabled);
 if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
-else
-{
+else {
 	print img_picto('', 'warning').' '.$langs->trans("ModuleActivated", $langs->transnoentities("Syslog"));
 	//print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
 }
@@ -87,8 +85,7 @@ print '<br>';
 print '<strong>'.$langs->trans("DebugBar").'</strong>: ';
 $test = empty($conf->debugbar->enabled);
 if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
-else
-{
+else {
 	print img_picto('', 'warning').' '.$langs->trans("ModuleActivated", $langs->transnoentities("DebugBar"));
     //print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
 }
@@ -105,8 +102,7 @@ if ($test)
 		print img_picto('', 'tick.png').' '.$langs->trans("MemcachedAvailableAndSetup");
 		print ' '.$langs->trans("MoreInformation").' <a href="'.dol_buildpath('/memcached/admin/memcached.php', 1).'">Memcached module admin page</a>';
 	}
-	else
-	{
+	else {
 		print img_picto('', 'warning').' '.$langs->trans("MemcachedModuleAvailableButNotSetup");
 		print ' <a href="'.dol_buildpath('/memcached/admin/memcached.php', 1).'">Memcached module admin page</a>';
 	}
@@ -148,8 +144,7 @@ if (!$foundcache && $test)
 		$foundcache++;
 		print img_picto('', 'tick.png').' '.$langs->trans("APCInstalled");
 	}
-	else
-	{
+	else {
 		print img_picto('', 'warning').' '.$langs->trans("APCCacheInstalledButDisabled");
 	}
 }
@@ -163,8 +158,7 @@ if (ini_get('opcache.preload'))
 	print '<strong>'.$langs->trans("PreloadOPCode").'</strong>: ';
 	print ini_get('opcache.preload');
 }
-else
-{
+else {
 	print '<br>';
 	print '<strong>'.$langs->trans("PreloadOPCode").'</strong>: ';
 	print $langs->trans("No");
@@ -469,8 +463,7 @@ if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
 	{
 		print img_picto('', 'tick.png').' '.$langs->trans("YouUseBestDriver", $conf->db->type);
 	}
-	else
-	{
+	else {
 		print img_picto('', 'warning.png').' '.$langs->trans("YouDoNotUseBestDriver", $conf->db->type, 'mysqli');
 	}
 	print '<br>';
@@ -496,13 +489,11 @@ if ($resql)
 		{
 			print img_picto('', 'warning.png').' '.$langs->trans("YouHaveXObjectUseSearchOptim", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUCT_DONOTSEARCH_ANYWHERE');
 		}
-		else
-		{
+		else {
 			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"));
 		}
 	}
-	else
-	{
+	else {
 		print img_picto('', 'tick.png').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"));
 	}
 	print '<br>';
@@ -526,13 +517,11 @@ if ($resql)
 		{
 			print img_picto('', 'warning.png').' '.$langs->trans("YouHaveXObjectUseSearchOptim", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_DONOTSEARCH_ANYWHERE');
 		}
-		else
-		{
+		else {
 			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ThirdParties"));
 		}
 	}
-	else
-	{
+	else {
 		print img_picto('', 'tick.png').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ThirdParties"));
 	}
 	print '<br>';
@@ -546,8 +535,7 @@ if (!in_array($conf->browser->name, array('chrome', 'opera', 'safari', 'firefox'
 {
 	print img_picto('', 'warning.png').' '.$langs->trans("BrowserIsKO", $conf->browser->name);
 }
-else
-{
+else {
 	print img_picto('', 'tick.png').' '.$langs->trans("BrowserIsOK", $conf->browser->name);
 }
 print '<br>';
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 04439d11710..8015f16a572 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -90,8 +90,7 @@ elseif (versioncompare(versionphparray(), $arrayphpminversionwarning) < 0)
 {
 	print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionwarning));
 }
-else
-{
+else {
 	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.versiontostring(versionphparray());
 }
 
@@ -103,8 +102,7 @@ if (!isset($_GET["testget"]) && !isset($_POST["testpost"]) && !isset($_GET["main
 	print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("PHPSupportPOSTGETKo");
 	print ' (<a href="'.$_SERVER["PHP_SELF"].'?testget=ok">'.$langs->trans("Recheck").'</a>)';
 }
-else
-{
+else {
 	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportPOSTGETOk");
 }
 
@@ -115,8 +113,7 @@ if (!function_exists("session_id"))
 {
 	print '<img src="'.$ErrorPicturePath.'" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportSessions");
 }
-else
-{
+else {
 	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportSessions");
 }
 
@@ -127,8 +124,7 @@ if (!function_exists("utf8_encode"))
 {
 	print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPDoesNotSupportUTF8");
 }
-else
-{
+else {
 	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportUTF8");
 }
 
@@ -229,8 +225,7 @@ foreach ($phparray as $key => $value)
 			print '</td>';
 			print '</tr>';
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven">';
 			print '<td>'.$keyparam.'</td>';
 			$i = 0;
@@ -346,8 +341,7 @@ function getTableColumn($name, array $list)
 	{
 		$html .= '<img src="../../theme/eldy/img/tick.png" alt="Ok">';
 	}
-	else
-	{
+	else {
 		$html .= '<img src="../../theme/eldy/img/warning.png" alt="Warning">';
 	}
 
@@ -382,8 +376,7 @@ function getTableColumnFunction(array $functions)
 	{
 		$html .= '<img src="../../theme/eldy/img/tick.png" alt="Ok">';
 	}
-	else
-	{
+	else {
 		$html .= '<img src="../../theme/eldy/img/warning.png" alt="Warning">';
 	}
 
diff --git a/htdocs/admin/system/xdebug.php b/htdocs/admin/system/xdebug.php
index 5e4e9eff82f..3358fb980fe 100644
--- a/htdocs/admin/system/xdebug.php
+++ b/htdocs/admin/system/xdebug.php
@@ -109,16 +109,14 @@ xdebug.auto_trace=0
 	         Allow Remote debug=yes or prompt<br>'."\n";
 		print "<br>\n";
 	}
-	else
-	{
+	else {
 		print socket_strerror(socket_last_error());
 		echo "Failed to connect to address=".$address." port=".$port."<br>\n";
 		echo "There is no Remote debug server at this address.\n";
 	}
 	socket_close($socket);
 }
-else
-{
+else {
 	print "Can't test if PHPDebug is OK as PHP socket functions are not enabled.";
 }
 
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index f9bb8f39641..1999fbab8f0 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -131,8 +131,7 @@ if (empty($mysoc->tva_assuj))
 {
 	print $langs->trans("YourCompanyDoesNotUseVAT").'<br>';
 }
-else
-{
+else {
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
@@ -151,8 +150,7 @@ else
 		print $langs->trans("NotAvailableWhenAjaxDisabled");
 		print "</td>";
 	}
-	else
-	{
+	else {
 		print '<td width="120">';
 		$listval = array(
 			'0'=>$langs->trans(""),
@@ -206,8 +204,7 @@ else
 		print $langs->trans("OnPayment");
 		print ' ('.$langs->trans("SupposedToBePaymentDate").')';
 	}
-	else
-	{
+	else {
 		print $langs->trans("OnDelivery");
 		print ' ('.$langs->trans("SupposedToBeInvoiceDate").')';
 	}
@@ -218,8 +215,7 @@ else
 		print $langs->trans("OnPayment");
 		print ' ('.$langs->trans("SupposedToBePaymentDate").')';
 	}
-	else
-	{
+	else {
 		print $langs->trans("OnDelivery");
 		print ' ('.$langs->trans("SupposedToBeInvoiceDate").')';
 	}
@@ -233,8 +229,7 @@ else
 		print $langs->trans("OnPayment");
 		print ' ('.$langs->trans("SupposedToBePaymentDate").')';
 	}
-	else
-	{
+	else {
 		print $langs->trans("OnInvoice");
 		print ' ('.$langs->trans("InvoiceDateUsed").')';
 	}
@@ -245,8 +240,7 @@ else
 		print $langs->trans("OnPayment");
 		print ' ('.$langs->trans("SupposedToBePaymentDate").')';
 	}
-	else
-	{
+	else {
 		print $langs->trans("OnInvoice");
 		print ' ('.$langs->trans("InvoiceDateUsed").')';
 	}
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index 981ce2a0ccf..152aed7d5e7 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -64,8 +64,7 @@ if ($action == 'updateMask') {
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 } elseif ($action == 'setmod') {
diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
index 6b8a23c94fc..032762ec98c 100644
--- a/htdocs/admin/ticket_public.php
+++ b/htdocs/admin/ticket_public.php
@@ -180,8 +180,7 @@ if (empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
     $enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
     $enabledisablehtml .= '</a>';
 }
-else
-{
+else {
     // Button on, click to disable
     $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setTICKET_ENABLE_PUBLIC_INTERFACE&value=0'.$param.'">';
     $enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 1ad21490e4b..4a659d38fc8 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -57,8 +57,7 @@ if ($action == 'delete')
 		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
 		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
 	}
-	else
-	{
+	else {
 		$file = $conf->admin->dir_output.'/documents/'.basename(GETPOST('urlfile', 'alpha'));
 		$ret = dol_delete_file($file, 1);
 		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
@@ -188,8 +187,7 @@ if (in_array($type, array('mysql', 'mysqli'))) {
     {
         $fullpathofmysqldump = $db->getPathOfDump();
     }
-    else
-    {
+    else {
         $fullpathofmysqldump = $conf->global->SYSTEMTOOLS_MYSQLDUMP;
     }
     print '<br>';
@@ -339,8 +337,7 @@ if (in_array($type, array('pgsql'))) {
     if (empty($conf->global->SYSTEMTOOLS_POSTGRESQLDUMP)) {
         $fullpathofpgdump = $db->getPathOfDump();
     }
-    else
-    {
+    else {
         $fullpathofpgdump = $conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
     }
     print '<br>';
@@ -434,8 +431,7 @@ if (in_array($type, array('mysql', 'mysqli'))) {
     	'label' => $langs->trans("None")
     );
 }
-else
-{
+else {
 	$compression['none'] = array(
 		'function' => '',
 		'id' => 'radio_compression_none',
@@ -464,8 +460,7 @@ foreach ($compression as $key => $val)
 		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'"'.$checked.'>';
 		print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
 	}
-	else
-	{
+	else {
 		// Disabled export format
 		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'" disabled>';
 		print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
@@ -584,7 +579,7 @@ foreach ($filecompression as $key => $val)
         print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'"'.$checked.'>';
         print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
     }
-    else	// Disabled export format
+    else // Disabled export format
     {
         print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'" disabled>';
         print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
index e9885e82bfe..c1518901013 100644
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -115,8 +115,7 @@ print $langs->trans("RestoreDesc3", $dolibarr_main_db_name).'<br><br>';
     </div>
         <?php
     }
-    else
-    {
+    else {
         print 'No method available with database '.$label;
     }
     ?>
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index dc0f7a27f8a..7133b16e1b4 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -204,8 +204,7 @@ if ($errormsg)
 
     $_SESSION["commandbackupresult"] = $resultstring;
 }
-else
-{
+else {
 	if ($what)
 	{
         setEventMessages($langs->trans("BackupFileSuccessfullyCreated").'.<br>'.$langs->trans("YouCanDownloadBackupFile"), null, 'mesgs');
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index de10759c92d..36e488127d0 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -146,8 +146,7 @@ elseif (in_array($compression, array('gz', 'bz')))
         dol_syslog("Documents tar retval after exec=".$retval, LOG_ERR);
         $errormsg = 'Error tar generation return '.$retval;
     }
-    else
-    {
+    else {
         if ($compression == 'gz')
         {
             $cmd = "gzip -f ".$outputdir."/".$file;
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index f57a16332df..3fd93e7989e 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -147,8 +147,7 @@ if ($action == 'confirm_purge' && $confirm == 'yes' && $user->admin)
 	    $db->commit();
 		dol_syslog($text, LOG_WARNING);
 	}
-	else
-	{
+	else {
 		$error++;
 		dol_syslog($securityevent->error, LOG_ERR);
 		$db->rollback();
@@ -380,8 +379,7 @@ if ($result)
 	print "</form>";
 	$db->free($result);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index 253f4919092..ff86beef550 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -172,8 +172,7 @@ if ($savehandler == 'files')
 	}
 	print "</table>";
 }
-else
-{
+else {
 	print $langs->trans("NoSessionListWithThisHandler");
 }
 
@@ -188,8 +187,7 @@ if (empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
 {
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=lock">'.$langs->trans("LockNewSessions").'</a>';
 }
-else
-{
+else {
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=confirm_unlock">'.$langs->trans("UnlockNewSessions").'</a>';
 }
 
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index 260b4afe2d0..f06e67aa676 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -99,13 +99,11 @@ if (function_exists('curl_init'))
 			// Show version
 			print $langs->trans("LastStableVersion").' : <b>'.(($version != '0.0') ? $version : $langs->trans("Unknown")).'</b><br>';
 		}
-		else
-		{
+		else {
 			print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("UpdateServerOffline").'</b><br>';
 		}
 	}
-	else
-	{
+	else {
 		print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="button">'.$langs->trans("Check").'</a><br>';
 	}
 }
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index c17c2bdcee6..2f89e3cd300 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -106,15 +106,13 @@ if ($action == 'update')
 			$transkey = "";
 			$transvalue = "";
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				setEventMessages($langs->trans("WarningAnEntryAlreadyExistForTransKey"), null, 'warnings');
 			}
-			else
-			{
+			else {
 				setEventMessages($db->lasterror(), null, 'errors');
 			}
 			$action = '';
@@ -155,15 +153,13 @@ if ($action == 'add')
 			$transkey = "";
 			$transvalue = "";
 		}
-		else
-		{
+		else {
 		    $db->rollback();
 		    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		    {
 		        setEventMessages($langs->trans("WarningAnEntryAlreadyExistForTransKey"), null, 'warnings');
 		    }
-		    else
-		    {
+		    else {
 		        setEventMessages($db->lasterror(), null, 'errors');
             }
 			$action = '';
@@ -180,8 +176,7 @@ if ($action == 'delete')
 	{
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -211,8 +206,7 @@ if (empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
     $enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
     $enabledisablehtml .= '</a>';
 }
-else
-{
+else {
     // Button on, click to disable
     $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=0'.$param.'">';
     $enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
@@ -349,8 +343,7 @@ if ($mode == 'overwrite')
     		{
     			print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.dol_escape_htmltag($obj->transvalue).'">';
     		}
-    		else
-    		{
+    		else {
     			print dol_escape_htmltag($obj->transvalue);
     		}
     		print '</td>';
@@ -363,8 +356,7 @@ if ($mode == 'overwrite')
     			print ' &nbsp; ';
     			print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
     		}
-    		else
-    		{
+    		else {
     			print '<a class="reposition editfielda paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=edit'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
 				print ' &nbsp; ';
     			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
@@ -408,8 +400,7 @@ if ($mode == 'searchkey')
     {
         setEventMessages($langs->trans("WarningAtLeastKeyOrTranslationRequired"), null, 'warnings');
     }
-    else
-    {
+    else {
         // Search into dir of modules (the $modulesdir is already a list that loop on $conf->file->dol_document_root)
         $i = 0;
         foreach ($modulesdir as $keydir => $tmpsearchdir)
@@ -553,8 +544,7 @@ if ($mode == 'searchkey')
             	print ' &nbsp; <a href="'.$transifexurl.'" target="transifex">'.img_picto('FixOnTransifex', 'globe').'</a>';
             }
         }
-        else
-        {
+        else {
             $htmltext = $langs->trans("TransKeyWithoutOriginalValue", $key);
             print $form->textwithpicto('', $htmltext, 1, 'warning');
         }
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 60cbadcdd3a..ad8e5f6876d 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -93,8 +93,7 @@ elseif (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 }
@@ -107,8 +106,7 @@ elseif (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 }
@@ -122,8 +120,7 @@ elseif ($action == 'sethideinactiveuser')
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -164,14 +161,12 @@ if ($conf->use_javascript_ajax)
 {
 	print ajax_constantonoff('USER_MAIL_REQUIRED');
 }
-else
-{
+else {
 	if (empty($conf->global->USER_MAIL_REQUIRED))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_USER_MAIL_REQUIRED">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	}
-	else
-	{
+	else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_USER_MAIL_REQUIRED">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
@@ -188,14 +183,12 @@ if ($conf->use_javascript_ajax)
 {
 	print ajax_constantonoff('USER_HIDE_INACTIVE_IN_COMBOBOX');
 }
-else
-{
+else {
 	if (empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_USER_HIDE_INACTIVE_IN_COMBOBOX">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	}
-	else
-	{
+	else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_USER_HIDE_INACTIVE_IN_COMBOBOX">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
@@ -225,8 +218,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -295,8 +287,7 @@ foreach ($dirmodels as $reldir)
 	                            	print '</a>';
 	                            	print '</td>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -308,8 +299,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -336,8 +326,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index 4f556ff19b3..2b3d9e680ba 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -90,8 +90,7 @@ elseif (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 }
@@ -104,8 +103,7 @@ elseif (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 }
@@ -147,8 +145,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -217,8 +214,7 @@ foreach ($dirmodels as $reldir)
 	                            	print '</a>';
 	                            	print '</td>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -230,8 +226,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -258,8 +253,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index dd7fd353ea2..c2ee5e2677c 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -213,8 +213,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
             setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
         	unset($_POST); // Clean $_POST array, we keep only
         }
-        else
-        {
+        else {
             if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                 setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
             }
@@ -274,8 +273,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
             		$error++;
             		setEventMessages($langs->trans('ErrorDirAlreadyExists', $destfile), null, 'errors');
             	}
-            	else
-            	{
+            	else {
 	                @rename($srcfile, $destfile);
 
 		            // We must now rename $website->ref into $newname inside files
@@ -288,8 +286,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
             	}
             }
         }
-        else
-        {
+        else {
         	$error++;
             setEventMessages($db->lasterror(), null, 'errors');
         }
@@ -298,8 +295,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
         {
         	$db->commit();
         }
-        else
-        {
+        else {
         	$db->rollback();
         }
     }
@@ -338,8 +334,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 	        {
 	            setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
 	        }
-	        else
-	        {
+	        else {
 	            dol_print_error($db);
 	        }
 	    }
@@ -349,8 +344,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 	    	dol_delete_dir_recursive($conf->website->dir_output.'/'.$website->ref);
 	    }
     }
-    else
-    {
+    else {
     	dol_print_error($db, 'Failed to load website with id '.$rowid);
     }
 }
@@ -587,8 +581,7 @@ if ($id)
                     print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
                     print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
                 }
-                else
-                {
+                else {
 	              	$tmpaction = 'view';
                     $parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
                     $reshook = $hookmanager->executeHooks('viewWebsiteFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
@@ -680,8 +673,7 @@ function fieldListWebsites($fieldlist, $obj = '', $tabname = '', $context = '')
 		elseif ($fieldlist[$field] == 'code' && isset($obj->$fieldname)) {
 			print '<td><input type="text" class="flat" value="'.(!empty($obj->$fieldname) ? $obj->$fieldname : '').'" size="10" name="'.$fieldlist[$field].'"></td>';
 		}
-		else
-		{
+		else {
 			print '<td>';
 			$size = '';
 			if ($fieldlist[$field] == 'code') $size = 'size="8" ';
diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php
index 7d16aa3963b..828ebf6dca9 100644
--- a/htdocs/admin/website_options.php
+++ b/htdocs/admin/website_options.php
@@ -122,8 +122,7 @@ if ($action == 'edit')
 	print '</form>';
 	print '<br>';
 }
-else
-{
+else {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index 99185cce733..96413b21c19 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -144,8 +144,7 @@ foreach ($workflowcodes as $key => $params)
 			if ($reg[1] == 'supplier_order') print ' - '.$langs->trans('SupplierOrder');
 			if ($reg[1] == 'reception') print ' - '.$langs->trans('Reception');
 		}
-		else
-		{
+		else {
 			print $langs->trans("Description");
 		}
 		print '</td>';
@@ -167,16 +166,14 @@ foreach ($workflowcodes as $key => $params)
    	{
    		print ajax_constantonoff($key);
    	}
-   	else
-   	{
+   	else {
    		if (!empty($conf->global->$key))
    		{
    			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=del'.$key.'">';
   			print img_picto($langs->trans("Activated"), 'switch_on');
    			print '</a>';
    		}
-   		else
-   		{
+   		else {
    			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=set'.$key.'">';
   			print img_picto($langs->trans("Disabled"), 'switch_off');
    			print '</a>';
diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index d0a0e79c855..25481ccb39d 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -55,8 +55,7 @@ if ($action == 'setproductionmode')
 				$error++;
 			}
 		}
-		else
-		{
+		else {
 			// Delete the cache file otherwise it does not update
 			$result = dol_delete_file($conf->api->dir_temp.'/routes.php');
 			if ($result < 0)
@@ -72,8 +71,7 @@ if ($action == 'setproductionmode')
 	   	    exit;
 	    }
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -120,8 +118,7 @@ if ($production_mode)
     print img_picto($langs->trans("Activated"), 'switch_on');
     print '</a></td>';
 }
-else
-{
+else {
     print '<td><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i + 1).'&status=1">';
     print img_picto($langs->trans("Disabled"), 'switch_off');
     print '</a></td>';
@@ -166,8 +163,7 @@ if (dol_is_dir(DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/e
     $url = DOL_MAIN_URL_ROOT.'/api/index.php/explorer';
     print img_picto('', 'globe').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
 }
-else
-{
+else {
     print $langs->trans("NotAvailableWithThisDistribution");
 }
 
diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 5e051420748..fa96788f585 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -318,8 +318,7 @@ class DolibarrApi
 	    {
 	        $tmpescaped = "'".$db->escape($regbis[1])."'";
 	    }
-	    else
-	    {
+	    else {
 	        $tmpescaped = $db->escape($tmpescaped);
 	    }
 	    return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php
index 339ddfd2ad6..e0551cf07d9 100644
--- a/htdocs/api/class/api_access.class.php
+++ b/htdocs/api/class/api_access.class.php
@@ -158,8 +158,7 @@ class DolibarrApiAccess implements iAuthenticate
 				static::$role = 'admin';
             }
         }
-		else
-		{
+		else {
 		    throw new RestException(401, "Failed to login to API. No parameter 'HTTP_DOLAPIKEY' on HTTP header (and no parameter DOLAPIKEY in URL).");
 		}
 
diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index 74aeec42dc1..0a9b8b63e7b 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -123,8 +123,7 @@ class Login
     			throw new RestException(500, 'Error when updating api_key for user :'.$this->db->lasterror());
     		}
 		}
-		else
-		{
+		else {
             $token = $tmpuser->api_key;
 		}
 
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index fd6432b553f..e5bf7a00eea 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -879,8 +879,7 @@ class Setup extends DolibarrApi
         		}
         	}
         }
-        else
-        {
+        else {
             throw new RestException(503, 'Error when retrieving list of extra fields : '.$this->db->lasterror());
         }
 
@@ -1485,13 +1484,11 @@ class Setup extends DolibarrApi
     		{
     			$xml = simplexml_load_file($xmlfile);
     		}
-    		else
-    		{
+    		else {
     			throw new RestException(500, $langs->trans('XmlNotFound').': '.$xmlfile);
     		}
     	}
-    	else
-    	{
+    	else {
     		$xmlarray = getURLContent($xmlremote);
 
     		// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
@@ -1501,8 +1498,7 @@ class Setup extends DolibarrApi
     			//print "xmlfilestart".$xmlfile."endxmlfile";
     			$xml = simplexml_load_string($xmlfile);
     		}
-    		else
-    		{
+    		else {
     			$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
     			throw new RestException(500, $errormsg);
     		}
@@ -1610,8 +1606,7 @@ class Setup extends DolibarrApi
     					$out .= "</tr>\n";
     				}
     			}
-    			else
-    			{
+    			else {
     				$out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
     			$out .= '</table>';
@@ -1660,8 +1655,7 @@ class Setup extends DolibarrApi
     				$out .= '<td class="right"></td>'."\n";
     				$out .= "</tr>\n";
     			}
-    			else
-    			{
+    			else {
     				$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
     			$out .= '</table>';
@@ -1710,8 +1704,7 @@ class Setup extends DolibarrApi
     				$out .= '<td class="right"></td>'."\n";
     				$out .= "</tr>\n";
     			}
-    			else
-    			{
+    			else {
     				$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
     			$out .= '</table>';
@@ -1723,13 +1716,11 @@ class Setup extends DolibarrApi
     			{
     				//setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
     			}
-    			else
-    			{
+    			else {
     				//setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
     			}
     		}
-    		else
-    		{
+    		else {
     			throw new RestException(500, 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile);
     		}
 
@@ -1752,16 +1743,14 @@ class Setup extends DolibarrApi
     				//$outcurrentchecksum =  $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
     				$outcurrentchecksum = $checksumget;
     			}
-    			else
-    			{
+    			else {
     				$resultcode = 'ok';
     				$resultcomment = 'Success';
     				//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
     				$outcurrentchecksum = $checksumget;
     			}
     		}
-    		else
-    		{
+    		else {
     			$resultcode = 'error';
     			$resultcomment = 'Error';
     			//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index c5edbc74d66..fca0e027081 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -208,8 +208,7 @@ if (!empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $
                                         //dol_syslog("Found API by index.php: classname=".$classname." for module ".$dir." into ".$dir_part.$file_searched);
                                         $listofapis[strtolower($classname)] = $classname;
                                     }
-                                    else
-                                    {
+                                    else {
                                         dol_syslog("We found an api_xxx file (".$file_searched.") but class ".$classname." does not exists after loading file", LOG_WARNING);
                                     }
                                 }
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 752d569c7d1..12f5fb1fbc7 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -88,8 +88,7 @@ if ($action == 'edit')
 	print '</form>';
 	print '<br>';
 }
-else
-{
+else {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php
index 110d662c9e8..fc42f0b00d6 100644
--- a/htdocs/asset/card.php
+++ b/htdocs/asset/card.php
@@ -315,8 +315,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			{
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
 			}
-			else
-			{
+			else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
 			}
 
@@ -324,8 +323,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			{
 				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
 			}
-			else
-			{
+			else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
 			}
 		}
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 7c9d91d79e7..1570fe438ad 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -470,8 +470,7 @@ class Asset extends CommonObject
 
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/asset/class/asset_type.class.php b/htdocs/asset/class/asset_type.class.php
index bfb0c7d073a..2e275ae1e65 100644
--- a/htdocs/asset/class/asset_type.class.php
+++ b/htdocs/asset/class/asset_type.class.php
@@ -155,15 +155,13 @@ class AssetType extends CommonObject
 				$this->db->commit();
 				return $this->id;
 			}
-			else
-			{
+			else {
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -224,15 +222,13 @@ class AssetType extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 				return -$error;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -264,8 +260,7 @@ class AssetType extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -304,8 +299,7 @@ class AssetType extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -345,8 +339,7 @@ class AssetType extends CommonObject
 				}
 			}
 		}
-		else
-		{
+		else {
 			print $this->db->error();
 		}
 		return $assettypes;
@@ -401,8 +394,7 @@ class AssetType extends CommonObject
 
 			return $ret;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index 4724173cd19..9b5294605ba 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -145,8 +145,7 @@ if ($object->id)
 
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index 39fd0e0761d..da2a4d80b27 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -254,8 +254,7 @@ if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit
 {
 	$num = $nbtotalofrecords;
 }
-else
-{
+else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
diff --git a/htdocs/asset/type.php b/htdocs/asset/type.php
index 8df5ffe8c40..f9931a927b4 100644
--- a/htdocs/asset/type.php
+++ b/htdocs/asset/type.php
@@ -129,14 +129,12 @@ if ($action == 'add' && $user->rights->asset->write)
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'create';
 		}
 	}
-	else
-	{
+	else {
 		$action = 'create';
 	}
 }
@@ -163,8 +161,7 @@ if ($action == 'update' && $user->rights->asset->write)
 	{
 		setEventMessages($langs->trans("AssetsTypeModified"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 
@@ -183,8 +180,7 @@ if ($action == 'confirm_delete' && $user->rights->asset->write)
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("AssetsTypeCanNotBeDeleted"), null, 'errors');
 		$action = '';
 	}
@@ -308,8 +304,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 
 			if ($user->rights->asset->write)
 				print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
-			else
-				print '<td class="right">&nbsp;</td>';
+			else print '<td class="right">&nbsp;</td>';
 			print "</tr>";
 			$i++;
 		}
@@ -318,8 +313,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 
 		print '</form>';
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php
index fd27abb6ceb..29cd34db6a8 100644
--- a/htdocs/asterisk/cidlookup.php
+++ b/htdocs/asterisk/cidlookup.php
@@ -68,8 +68,7 @@ if ($resql)
 	}
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db, 'Error');
 	$found = 'Error';
 }
diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php
index 5facd5d1bbf..9f360294fc9 100644
--- a/htdocs/asterisk/wrapper.php
+++ b/htdocs/asterisk/wrapper.php
@@ -138,8 +138,7 @@ if ($resql)
 	}
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db, 'Error');
 	$found = 'Error';
 }
@@ -165,8 +164,7 @@ if (!empty($number))
             dol_syslog($txt, LOG_ERR);
             print '</body>'."\n";
         }
-        else
-        {
+        else {
             $txt = "Call Asterisk dialer for caller: ".$caller.", called: ".$called." clicktodiallogin: ".$login;
             dol_syslog($txt);
             print '<body onload="javascript:history.go(-1);">'."\n";
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index d2afa5e6871..f77b50924e2 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -110,14 +110,12 @@ if ($action == 'initbarcodeproducts')
 			{
 				setEventMessages($langs->trans("AllBarcodeReset"), null, 'mesgs');
 			}
-			else
-			{
+			else {
 				$error++;
 				dol_print_error($db);
 			}
 		}
-		else
-		{
+		else {
 			$sql = "SELECT rowid, ref, fk_product_type";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product";
 			$sql .= " WHERE barcode IS NULL or barcode = ''";
@@ -151,8 +149,7 @@ if ($action == 'initbarcodeproducts')
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				dol_print_error($db);
 			}
@@ -168,8 +165,7 @@ if ($action == 'initbarcodeproducts')
 			//$db->rollback();
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 		}
 	}
@@ -295,8 +291,7 @@ if ($conf->product->enabled || $conf->product->service)
 		print '<b>'.(isset($modBarCodeProduct->name) ? $modBarCodeProduct->name : $modBarCodeProduct->nom).'</b> - '.$langs->trans("NextValue").': <b>'.$modBarCodeProduct->getNextValue($objproduct).'</b><br>';
 		$disabled = 0;
 	}
-	else
-	{
+	else {
 		$disabled = 1;
 		$titleno = $langs->trans("NoBarcodeNumberingTemplateDefined");
 		print '<font class="warning">'.$langs->trans("NoBarcodeNumberingTemplateDefined").'</font> (<a href="'.DOL_URL_ROOT.'/admin/barcode.php">'.$langs->trans("ToGenerateCodeDefineAutomaticRuleFirst").'</a>)<br>';
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index 5cd988a5bed..7c692998723 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -162,8 +162,7 @@ if ($action == 'builddoc')
 					setEventMessages($module->error, null, 'errors');
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				setEventMessages("Error, encoding ".$encoding." is not supported by encoder ".$generator.'. You must choose another barcode type or install a barcode generation engine that support '.$encoding, null, 'errors');
 			}
diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php
index 1ef35942d1e..0a649a380cf 100644
--- a/htdocs/blockedlog/admin/blockedlog.php
+++ b/htdocs/blockedlog/admin/blockedlog.php
@@ -52,8 +52,7 @@ if (preg_match('/set_(.*)/', $action, $reg))
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -66,8 +65,7 @@ if (preg_match('/del_(.*)/', $action, $reg))
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 66cc3b44848..10b14a29039 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -134,14 +134,12 @@ if ($action === 'downloadblockchain') {
 				$previoushash = $block_static->getPreviousHash(0, $obj->rowid);
 				$firstid = $obj->rowid;
 			}
-			else
-			{	// If not data found for filter, we do not need previoushash neither firstid
+			else {	// If not data found for filter, we do not need previoushash neither firstid
 				$previoushash = 'nodata';
 				$firstid = '';
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			setEventMessages($db->lasterror, null, 'errors');
 		}
@@ -212,8 +210,7 @@ if ($action === 'downloadblockchain') {
 					if ($loweridinerror > 0) $statusofrecordnote = 'ValidButFoundAPreviousKO';
 					else $statusofrecordnote = '';
 				}
-				else
-				{
+				else {
 					$statusofrecord = 'KO';
 					$statusofrecordnote = 'LineCorruptedOrNotMatchingPreviousOne';
 					$loweridinerror = $obj->rowid;
@@ -246,8 +243,7 @@ if ($action === 'downloadblockchain') {
 
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($db->lasterror, null, 'errors');
 		}
 	}
@@ -264,8 +260,7 @@ if (GETPOST('withtab', 'alpha'))
 {
 	$title = $langs->trans("ModuleSetup").' '.$langs->trans('BlockedLog');
 }
-else
-{
+else {
 	$title = $langs->trans("BrowseBlockedLog");
 }
 
@@ -280,8 +275,7 @@ if (!is_array($blocks))
 	{
 		setEventMessages($langs->trans("TooManyRecordToScanRestrictFilters", $MAXLINES), null, 'errors');
 	}
-	else
-	{
+	else {
 		dol_print_error($block_static->db, $block_static->error, $block_static->errors);
 		exit;
 	}
@@ -441,8 +435,7 @@ if (!empty($conf->global->BLOCKEDLOG_SCAN_ALL_FOR_LOWERIDINERROR)) {
 	// TODO Make a full scan of table in reverse order of id of $block, so we can use the parameter $previoushash into checkSignature to save requests
 	// to find the $loweridinerror.
 }
-else
-{
+else {
 	// This is version that optimize the memory (but will not report errors that are outside the filter range)
 	$loweridinerror = 0;
 	$checkresult = array();
@@ -511,8 +504,7 @@ if (is_array($blocks))
 		   		if ($checkresult[$block->id]) print img_picto($langs->trans('OkCheckFingerprintValidityButChainIsKo'), 'statut4');
 		   		else print img_picto($langs->trans('KoCheckFingerprintValidity'), 'statut8');
 		   	}
-		   	else
-		   	{
+		   	else {
 		   		print img_picto($langs->trans('OkCheckFingerprintValidity'), 'statut4');
 		   	}
 
diff --git a/htdocs/blockedlog/ajax/block-info.php b/htdocs/blockedlog/ajax/block-info.php
index eaf1b17ed08..e2d588f1798 100644
--- a/htdocs/blockedlog/ajax/block-info.php
+++ b/htdocs/blockedlog/ajax/block-info.php
@@ -95,8 +95,7 @@ function formatObject($objtoshow, $prefix)
 					var_dump($val);*/
 					$s .= dol_print_date($val, 'dayhour');
 				}
-				else
-				{
+				else {
 					$s .= $val;
 				}
 				$s .= '</td></tr>';
diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index 234aeceb2a6..95106bba4d2 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -180,14 +180,12 @@ class BlockedLogAuthority
 
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = $langs->trans("RecordNotFound");
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -233,14 +231,12 @@ class BlockedLogAuthority
 
 				return $this->id;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -277,8 +273,7 @@ class BlockedLogAuthority
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index be017f22600..0226486116b 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -303,8 +303,7 @@ class BlockedLog
 			if ($this->signature == '0000000000') {
 				return '<i class="opacitymedium">System to track events into unalterable logs were disabled after some recording were done. We saved a special Fingerprint to track the chain as broken.</i>';
 			}
-			else
-			{
+			else {
 				return '<i class="opacitymedium">System to track events into unalterable logs were disabled. This is possible because no record were done yet.</i>';
 			}
 		}
@@ -640,7 +639,7 @@ class BlockedLog
 
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
 		}
-		else 	// Generic case
+		else // Generic case
 		{
 			foreach ($object as $key=>$value)
 			{
@@ -714,14 +713,12 @@ class BlockedLog
 
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = $langs->trans("RecordNotFound");
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -865,14 +862,12 @@ class BlockedLog
 
 				return $this->id;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -954,8 +949,7 @@ class BlockedLog
 	 			$previoussignature = $obj->signature;
 	 		}
 	 	}
-	 	else
-	 	{
+	 	else {
 	 		dol_print_error($this->db);
 	 		exit;
 	 	}
diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index a5b66b9886f..68c09977cbd 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -46,8 +46,7 @@ if (GETPOST('actioncode', 'array'))
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
 }
-else
-{
+else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -217,8 +216,7 @@ if ($object->id > 0)
     	{
         	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
     	}
-    	else
-    	{
+    	else {
         	print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
     	}
     }
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 48e9c9d965a..f0f4a2f7b7d 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -177,8 +177,7 @@ if (empty($reshook))
     			setEventMessages($bomline->error, $bomline->errors, 'errors');
     			$action = '';
     		}
-    		else
-    		{
+    		else {
     			unset($_POST['idprod']);
     			unset($_POST['qty']);
     			unset($_POST['qty_frozen']);
@@ -217,8 +216,7 @@ if (empty($reshook))
 			setEventMessages($bomline->error, $bomline->errors, 'errors');
 			$action = '';
 		}
-		else
-		{
+		else {
 			unset($_POST['idprod']);
 			unset($_POST['qty']);
 			unset($_POST['qty_frozen']);
@@ -621,8 +619,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    		{
 	    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
 	    		}
-	    		else
-	    		{
+	    		else {
 	    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
 	    		}
     		}
@@ -636,8 +633,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    			{
 	    				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
 	    			}
-	    			else
-	    			{
+	    			else {
 	    				$langs->load("errors");
 	    				print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
 	    			}
@@ -689,8 +685,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		{
     			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
     		}
-    		else
-    		{
+    		else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
     		}
     	}
diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index a7dca41fff6..0a68c799171 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -142,8 +142,7 @@ if ($object->id)
 
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index e2bafbecb48..2159564aeed 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -199,8 +199,7 @@ if (empty($reshook))
 					}
 					else $nbok++;
 				}
-				else
-				{
+				else {
 					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 					$error++;
 					break;
@@ -213,8 +212,7 @@ if (empty($reshook))
 				else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 				$db->commit();
 			}
-			else
-			{
+			else {
 				$db->rollback();
 			}
 			//var_dump($listofobjectthirdparties);exit;
@@ -254,8 +252,7 @@ if (empty($reshook))
 					}
 					else $nbok++;
 				}
-				else
-				{
+				else {
 					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 					$error++;
 					break;
@@ -268,8 +265,7 @@ if (empty($reshook))
 				else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 				$db->commit();
 			}
-			else
-			{
+			else {
 				$db->rollback();
 			}
 			//var_dump($listofobjectthirdparties);exit;
@@ -365,8 +361,7 @@ if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit
 {
 	$num = $nbtotalofrecords;
 }
-else
-{
+else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index d21d82b5ca9..995f2c29f3a 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -229,8 +229,7 @@ class Boms extends DolibarrApi
         {
             return $this->get($id);
         }
-        else
-        {
+        else {
             throw new RestException(500, $this->bom->error);
         }
     }
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 3e522b3c11f..c3e7faede2c 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -514,15 +514,13 @@ class BOM extends CommonObject
 	        {
 	            return $numref;
 	        }
-	        else
-	        {
+	        else {
 	            $this->error = $obj->error;
 	            //dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 	            return "";
 	        }
 	    }
-	    else
-	    {
+	    else {
 	        print $langs->trans("Error")." ".$langs->trans("Error_BOM_ADDON_NotDefined");
 	        return "";
 	    }
@@ -568,8 +566,7 @@ class BOM extends CommonObject
 	        $this->fetch_product();
 	        $num = $this->getNextNumRef($this->product);
 	    }
-	    else
-	    {
+	    else {
 	        $num = $this->ref;
 	    }
 	    $this->newref = dol_sanitizeFileName($num);
@@ -651,8 +648,7 @@ class BOM extends CommonObject
 	        $this->db->commit();
 	        return 1;
 	    }
-	    else
-	    {
+	    else {
 	        $this->db->rollback();
 	        return -1;
 	    }
@@ -896,8 +892,7 @@ class BOM extends CommonObject
 
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -920,8 +915,7 @@ class BOM extends CommonObject
 	        $this->errors = $this->errors;
 	        return $result;
 	    }
-	    else
-	    {
+	    else {
 	        $this->lines = $result;
 	        return $this->lines;
 	    }
@@ -1429,8 +1423,7 @@ class BOMLine extends CommonObjectLine
 
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index eeffb625381..1019911b89f 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -100,8 +100,7 @@ if (!empty($conf->product->enabled) || !empty($conf->service->enabled))
 		// hide products in closed warehouse, but show products for internal transfer
 		$form->select_produits(GETPOST('idprod', 'int'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
 	}
-	else
-	{
+	else {
 		$form->select_produits(GETPOST('idprod', 'int'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOST('combinations', 'array'));
 	}
 
diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php
index bc0c0c37fc2..60e4a1b9756 100644
--- a/htdocs/bookmarks/admin/bookmark.php
+++ b/htdocs/bookmarks/admin/bookmark.php
@@ -45,8 +45,7 @@ if ($action == 'setvalue')
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 93283cab815..10452ddbd05 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -42,8 +42,7 @@ function printDropdownBookmarksList()
     {
         $url .= (dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '');
     }
-    else
-    {
+    else {
         global $sortfield, $sortorder;
         $tmpurl = '';
         // No urlencode, all param $url will be urlencoded later
@@ -123,8 +122,7 @@ function printDropdownBookmarksList()
     		$searchForm .= '</select>';
     	}
     }
-    else
-    {
+    else {
     	dol_print_error($db);
     }
 
diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 385dd506031..28ce42b6b70 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -101,22 +101,19 @@ if ($action == 'add' || $action == 'addproduct' || $action == 'update')
 			header("Location: ".$backtopage);
 			exit;
 		}
-		else
-		{
+		else {
 			if ($object->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				$langs->load("errors");
 				setEventMessages($langs->transnoentities("WarningBookmarkAlreadyExists"), null, 'warnings');
 			}
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 			$action = $invertedaction;
 		}
 	}
-	else
-	{
+	else {
 		$action = $invertedaction;
 	}
 }
@@ -266,8 +263,7 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 		$liste = array(1=>$langs->trans("OpenANewWindow"), 0=>$langs->trans("ReplaceWindow"));
 		print $form->selectarray('target', $liste, isset($_POST["target"]) ? $_POST["target"] : $object->target);
 	}
-	else
-	{
+	else {
 		if ($object->target == 0) print $langs->trans("ReplaceWindow");
 		if ($object->target == 1) print $langs->trans("OpenANewWindow");
 	}
@@ -278,16 +274,14 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 	{
 		print img_picto('', 'user').' '.$form->select_dolusers(isset($_POST['userid']) ? $_POST['userid'] : ($object->fk_user ? $object->fk_user : ''), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 	}
-	else
-	{
+	else {
 		if ($object->fk_user > 0)
 		{
 			$fuser = new User($db);
 			$fuser->fetch($object->fk_user);
 			print $fuser->getNomUrl(1);
 		}
-		else
-		{
+		else {
 			print $langs->trans("Public");
 		}
 	}
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index 2667208fc44..3a00d38eedc 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -128,8 +128,7 @@ class Bookmark extends CommonObject
             $this->db->free($resql);
             return $this->id;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return -1;
         }
@@ -175,16 +174,14 @@ class Bookmark extends CommonObject
                 $this->db->commit();
                 return $id;
             }
-            else
-            {
+            else {
                 $this->error = $this->db->lasterror();
                 $this->errno = $this->db->lasterrno();
                 $this->db->rollback();
                 return -2;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             $this->errno = $this->db->lasterrno();
             $this->db->rollback();
@@ -219,8 +216,7 @@ class Bookmark extends CommonObject
         {
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -243,8 +239,7 @@ class Bookmark extends CommonObject
         {
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             return -1;
         }
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 5dd1718b263..ad944d93208 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -73,8 +73,7 @@ if ($action == 'delete')
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -116,8 +115,7 @@ if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
 }
-else
-{
+else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -231,8 +229,7 @@ while ($i < min($num, $limit))
 		$tmpuser = $cacheOfUsers[$obj->fk_user];
 		print $tmpuser->getNomUrl(1);
 	}
-	else
-	{
+	else {
 		print $langs->trans("Public");
 	}
 	print "</td>\n";
@@ -253,8 +250,7 @@ while ($i < min($num, $limit))
 	{
 		print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$obj->rowid.'">'.img_delete().'</a>';
 	}
-	else
-	{
+	else {
 		print "&nbsp;";
 	}
 	print "</td>";
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index 7c72858387a..9542d0f2b48 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -69,8 +69,7 @@ if (GETPOST('action', 'alpha') == 'set')
         $db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         $db->rollback();
 	    setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -150,8 +149,7 @@ if (!empty($conf->stock->enabled))
 	if (empty($conf->productbatch->enabled)) {
 	    print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK', $conf->global->CASHDESK_NO_DECREASE_STOCK, 1);
 	}
-	else
-	{
+	else {
 	    if (!$conf->global->CASHDESK_NO_DECREASE_STOCK) {
 	        $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity);
 	    }
@@ -170,8 +168,7 @@ if (!empty($conf->stock->enabled))
 		print $formproduct->selectWarehouses($conf->global->CASHDESK_ID_WAREHOUSE, 'CASHDESK_ID_WAREHOUSE', '', 1, $disabled);
 		print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">('.$langs->trans("Create").')</a>';
 	}
-	else
-	{
+	else {
 		print '<span class="opacitymedium">'.$langs->trans("StockDecreaseForPointOfSaleDisabled").'</span>';
 	}
 	print '</td></tr>';
diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php
index 41ba5ffcb39..bfad032c0b5 100644
--- a/htdocs/cashdesk/affContenu.php
+++ b/htdocs/cashdesk/affContenu.php
@@ -37,8 +37,7 @@ if (isset($_SESSION['serObjFacturation']))
     $obj_facturation = unserialize($_SESSION['serObjFacturation']);
     unset($_SESSION['serObjFacturation']);
 }
-else
-{
+else {
 	// ... sinon, c'est une nouvelle vente
 	$obj_facturation = new Facturation();
 }
@@ -73,8 +72,7 @@ if (in_array(
 {
 	include $page.'.php';
 }
-else
-{
+else {
 	dol_print_error('', 'menu param '.$page.' is not inside allowed list');
 }
 
diff --git a/htdocs/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php
index 164d229cf8d..f5de48aa3cb 100644
--- a/htdocs/cashdesk/class/Auth.class.php
+++ b/htdocs/cashdesk/class/Auth.class.php
@@ -130,8 +130,7 @@ class Auth
                 $this->passwd($aPasswd);
                 $ret = 0;
             }
-            else
-            {
+            else {
                 $ret = -1;
             }
         }
diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
index 10573f9d917..a3c4f7e0a48 100644
--- a/htdocs/cashdesk/class/Facturation.class.php
+++ b/htdocs/cashdesk/class/Facturation.class.php
@@ -299,8 +299,7 @@ class Facturation
         {
             $this->id = null;
         }
-        else
-        {
+        else {
             $this->id = $aId;
         }
     }
@@ -322,8 +321,7 @@ class Facturation
         {
             $this->ref = null;
         }
-        else
-        {
+        else {
             $this->ref = $aRef;
         }
     }
@@ -344,8 +342,7 @@ class Facturation
         {
             $this->qte = null;
         }
-        else
-        {
+        else {
             $this->qte = $aQte;
         }
     }
@@ -367,8 +364,7 @@ class Facturation
         {
             $this->stock = null;
         }
-        else
-        {
+        else {
             $this->stock = $aStock;
         }
     }
@@ -390,8 +386,7 @@ class Facturation
         {
             $this->remise_percent = null;
         }
-        else
-        {
+        else {
             $this->remise_percent = $aRemisePercent;
         }
     }
@@ -587,8 +582,7 @@ class Facturation
         {
             $this->prix_total_ttc = null;
         }
-        else
-        {
+        else {
             $this->prix_total_ttc = $aTotalTtc;
         }
     }
diff --git a/htdocs/cashdesk/facturation.php b/htdocs/cashdesk/facturation.php
index 3c4a4dd6c7a..fd49ad952b4 100644
--- a/htdocs/cashdesk/facturation.php
+++ b/htdocs/cashdesk/facturation.php
@@ -81,8 +81,7 @@ if (GETPOST('filtre', 'alpha')) {
 		}
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 	$tab_designations = $ret;
@@ -116,8 +115,7 @@ if (GETPOST('filtre', 'alpha')) {
 		}
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 	$tab_designations = $ret;
@@ -131,8 +129,7 @@ if ($nbr_enreg > 1)
 	{
 		$top_liste_produits = '----- '.$conf_taille_listes.' '.$langs->transnoentitiesnoconv("CashDeskProducts").' '.$langs->trans("CashDeskOn").' '.$nbr_enreg.' -----';
 	}
-	else
-	{
+	else {
 		$top_liste_produits = '----- '.$nbr_enreg.' '.$langs->transnoentitiesnoconv("CashDeskProducts").' '.$langs->trans("CashDeskOn").' '.$nbr_enreg.' -----';
 	}
 }
@@ -140,8 +137,7 @@ elseif ($nbr_enreg == 1)
 {
 	$top_liste_produits = '----- 1 '.$langs->transnoentitiesnoconv("ProductFound").' -----';
 }
-else
-{
+else {
 	$top_liste_produits = '----- '.$langs->transnoentitiesnoconv("NoProductFound").' -----';
 }
 
diff --git a/htdocs/cashdesk/facturation_dhtml.php b/htdocs/cashdesk/facturation_dhtml.php
index 98ed2bf0173..0235c3dd788 100644
--- a/htdocs/cashdesk/facturation_dhtml.php
+++ b/htdocs/cashdesk/facturation_dhtml.php
@@ -56,8 +56,7 @@ if (dol_strlen($search) >= 0)	// If search criteria is on char length at least
 		if (!empty($conf->barcode->enabled)) $sql .= " OR p.barcode LIKE '".$db->escape($search)."%'";
 		$sql .= ")";
 	}
-	else
-	{
+	else {
 		$sql .= " AND (p.ref LIKE '%".$db->escape($search)."%' OR p.label LIKE '%".$db->escape($search)."%'";
 		if (!empty($conf->barcode->enabled)) $sql .= " OR p.barcode LIKE '%".$db->escape($search)."%'";
 		$sql .= ")";
@@ -99,8 +98,7 @@ if (dol_strlen($search) >= 0)	// If search criteria is on char length at least
 
 			print $resultat;
 		}
-		else
-		{
+		else {
 			$langs->load("cashdesk");
 
 			print '<ul class="dhtml_bloc">';
diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
index 6a7a9bae366..c92f1e31366 100644
--- a/htdocs/cashdesk/facturation_verif.php
+++ b/htdocs/cashdesk/facturation_verif.php
@@ -124,8 +124,7 @@ switch ($action)
 					            if (empty($tva_tx)) $tva_npr = 0;
 					        }
 					    }
-					    else
-					    {
+					    else {
 					        setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 					    }
 					}
@@ -170,27 +169,23 @@ switch ($action)
 
 					$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation&filtre='.$filtre;
 				}
-				else
-				{
+				else {
 					$obj_facturation->raz();
 
 					if ($_POST['hdnSource'] == 'REF')
 					{
 						$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation&filtre='.$_POST['txtRef'];
 					}
-					else
-					{
+					else {
 						$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation';
 					}
 				}
 			}
-			else
-			{
+			else {
 				dol_print_error($db);
 			}
 		}
-		else
-		{
+		else {
 			$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation';
 		}
 
diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php
index 6c74b268ec9..4038b130d63 100644
--- a/htdocs/cashdesk/index.php
+++ b/htdocs/cashdesk/index.php
@@ -76,8 +76,7 @@ if (!empty($mysoc->logo_small))
 {
 	print '<img class="logopos" alt="Logo company" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small).'">';
 }
-else
-{
+else {
 	print '<div class="logopos">'.$mysoc->name.'</div>';
 }
 ?>
@@ -204,8 +203,7 @@ if ($_GET['err'] < 0)
 	echo ('	document.getElementById(\'frmLogin\').pwdPassword.focus();');
 	echo ('</script>');
 }
-else
-{
+else {
 	echo ('<script type="text/javascript">');
 	echo ('	document.getElementById(\'frmLogin\').txtUsername.focus();');
 	echo ('</script>');
diff --git a/htdocs/cashdesk/index_verif.php b/htdocs/cashdesk/index_verif.php
index 251b3f2e997..0545c149dfa 100644
--- a/htdocs/cashdesk/index_verif.php
+++ b/htdocs/cashdesk/index_verif.php
@@ -117,13 +117,11 @@ if ($retour >= 0)
 		header('Location: '.DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation&id=NOUV');
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
-else
-{
+else {
 	// Load translation files required by the page
     $langs->loadLangs(array("other", "errors"));
 	$retour = $langs->trans("ErrorBadLoginPassword");
diff --git a/htdocs/cashdesk/tpl/liste_articles.tpl.php b/htdocs/cashdesk/tpl/liste_articles.tpl.php
index 6fffbd3ed52..bd73954f6a0 100644
--- a/htdocs/cashdesk/tpl/liste_articles.tpl.php
+++ b/htdocs/cashdesk/tpl/liste_articles.tpl.php
@@ -49,8 +49,7 @@ $tab = (!empty($_SESSION['poscart']) ? $_SESSION['poscart'] : array());
 
 $tab_size = count($tab);
 if ($tab_size <= 0) print '<div class="center">'.$langs->trans("NoArticle").'</div><br>';
-else
-{
+else {
     for ($i = 0; $i < $tab_size; $i++)
     {
         echo ('<div class="cadre_article">'."\n");
diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php
index 3b38aba3159..d60d370172d 100644
--- a/htdocs/cashdesk/tpl/validation1.tpl.php
+++ b/htdocs/cashdesk/tpl/validation1.tpl.php
@@ -41,8 +41,7 @@ $langs->loadLangs(array("main", "bills", "banks"));
 if ($obj_facturation->montantTva()) {
 	echo ('<tr><td class="resume_label">'.$langs->trans("VAT").'</td><td>'.price(price2num($obj_facturation->montantTva(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency).'</td></tr>');
 }
-else
-{
+else {
 	echo ('<tr><td class="resume_label">'.$langs->trans("VAT").'</td><td>'.$langs->trans("NoVAT").'</td></tr>');
 }
 ?>
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index bc67350bbf1..a7a938fd828 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -97,8 +97,7 @@ switch ($action)
 
 			$obj_facturation->montantRendu($encaisse - $total);
 		}
-		else
-		{
+		else {
 		    //$txtDatePaiement=$_POST['txtDatePaiement'];
 		    $datePaiement = dol_mktime(0, 0, 0, $_POST['txtDatePaiementmonth'], $_POST['txtDatePaiementday'], $_POST['txtDatePaiementyear']);
 		    $txtDatePaiement = dol_print_date($datePaiement, 'dayrfc');
@@ -253,16 +252,14 @@ switch ($action)
 					}
 				}
 			}
-			else
-			{
+			else {
 				setEventMessages($invoice->error, $invoice->errors, 'errors');
 			    $error++;
 			}
 
 			$id = $invoice->id;
 		}
-		else
-		{
+		else {
 		    $resultcreate = $invoice->create($user, 0, 0);
 			if ($resultcreate > 0)
 			{
@@ -331,14 +328,12 @@ switch ($action)
                     	}
                     }
 				}
-				else
-				{
+				else {
 				    setEventMessages($invoice->error, $invoice->errors, 'errors');
 				    $error++;
 				}
 			}
-			else
-			{
+			else {
 				setEventMessages($invoice->error, $invoice->errors, 'errors');
 			    $error++;
 			}
@@ -350,8 +345,7 @@ switch ($action)
 			$db->commit();
 			$redirection = 'affIndex.php?menutpl=validation_ok&facid='.$id; // Ajout de l'id de la facture, pour l'inclure dans un lien pointant directement vers celle-ci dans Dolibarr
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			$redirection = 'affIndex.php?facid='.$id.'&error=1&mesg=ErrorFailedToCreateInvoice'; // Ajout de l'id de la facture, pour l'inclure dans un lien pointant directement vers celle-ci dans Dolibarr
 		}
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 716e02ae678..8a4018a5458 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -173,8 +173,7 @@ if (empty($reshook) && $action == 'confirm_clone' && $confirm == 'yes')
 	{
 		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 	}
-	else
-	{
+	else {
 		if ($id > 0) {
 			//$object->fetch($id);
             if (!empty($object->socpeopleassigned)) {
@@ -243,8 +242,7 @@ if (empty($reshook) && $action == 'add')
 		$action = 'create';
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 	}
-	else
-	{
+	else {
 		$object->type_code = GETPOST('actioncode', 'aZ09');
 	}
 
@@ -263,8 +261,7 @@ if (empty($reshook) && $action == 'add')
 			{
 				$object->label = $langs->transnoentitiesnoconv("TaskRDVWith", $contact->getFullName($langs));
 			}
-			else
-			{
+			else {
 				if ($langs->trans("Action".$object->type_code) != "Action".$object->type_code)
 				{
 					$object->label = $langs->transnoentitiesnoconv("Action".$object->type_code)."\n";
@@ -394,14 +391,12 @@ if (empty($reshook) && $action == 'add')
 				{
 					header("Location: ".DOL_URL_ROOT.'/comm/action/card.php?id='.$idaction.($moreparam ? '&'.$moreparam : ''));
 				}
-				else
-				{
+				else {
 					header("Location: ".DOL_URL_ROOT.'/comm/action/index.php'.($moreparam ? '?'.$moreparam : ''));
 				}
 				exit;
 			}
-			else
-			{
+			else {
 				// If error
 				$db->rollback();
 				$langs->load("errors");
@@ -410,8 +405,7 @@ if (empty($reshook) && $action == 'add')
 				$action = 'create'; $donotclearsession = 1;
 			}
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'create'; $donotclearsession = 1;
@@ -517,8 +511,7 @@ if (empty($reshook) && $action == 'update')
 			$action = 'edit';
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 		}
-		else
-		{
+		else {
 			$result = $cactioncomm->fetch(GETPOST('actioncode', 'aZ09'));
 		}
 		if (empty($object->userownerid))
@@ -607,8 +600,7 @@ if (empty($reshook) && $action == 'update')
 
 				$db->commit();
 			}
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
 			}
@@ -646,8 +638,7 @@ if (empty($reshook) && $action == 'confirm_delete' && GETPOST("confirm") == 'yes
 			header("Location: index.php");
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -756,8 +747,7 @@ if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate')
         header("Location: ".$backtopage);
         exit;
     }
-    else
-    {
+    else {
         $action = '';
     }
 }
@@ -957,8 +947,7 @@ if ($action == 'create')
 	$percent = -1;
 	if (isset($_GET['status']) || isset($_POST['status'])) $percent = GETPOST('status');
 	elseif (isset($_GET['percentage']) || isset($_POST['percentage'])) $percent = GETPOST('percentage');
-	else
-	{
+	else {
 		if (GETPOST('complete') == '0' || GETPOST("afaire") == 1) $percent = '0';
 		elseif (GETPOST('complete') == 100 || GETPOST("afaire") == 2) $percent = 100;
 	}
@@ -981,8 +970,7 @@ if ($action == 'create')
 		$listofuserid[$user->id]['transparency'] = GETPOSTISSET('transparency') ?GETPOST('transparency', 'alpha') : 1; // 1 by default at first init
 		$_SESSION['assignedtouser'] = json_encode($listofuserid);
 	}
-	else
-	{
+	else {
 		if (!empty($_SESSION['assignedtouser']))
 		{
 			$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -1035,8 +1023,7 @@ if ($action == 'create')
 			print $societe->getNomUrl(1);
 			print '<input type="hidden" id="socid" name="socid" value="'.GETPOST('socid', 'int').'">';
 		}
-		else
-		{
+		else {
 			$events = array();
 			$events[] = array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php?showempty=1', 1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
 			//For external user force the company to user company
@@ -1266,8 +1253,7 @@ if ($id > 0)
 		    {
 		    	$formactions->select_type_actions(GETPOST("actioncode", 'aZ09') ?GETPOST("actioncode", 'aZ09') : $object->type_code, "actioncode", "systemauto");
 		    }
-		    else
-		    {
+		    else {
                 print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">'.$langs->trans("Action".$object->type_code);
 		    }
 			print '</td></tr>';
@@ -1398,8 +1384,7 @@ if ($id > 0)
 	    	}
 	    	$_SESSION['assignedtouser'] = json_encode($listofuserid);
 	    }
-	    else
-	    {
+	    else {
 	    	if (!empty($_SESSION['assignedtouser']))
 	    	{
 	    		$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -1523,8 +1508,7 @@ if ($id > 0)
 
 			    print '</td>';
 			}
-			else
-			{
+			else {
 			    print '<td>';
 			    print dolGetElementUrl($object->fk_element, $object->elementtype, 1);
 			    print '<input type="hidden" name="fk_element" value="'.$object->fk_element.'">';
@@ -1564,8 +1548,7 @@ if ($id > 0)
 
 		print '</form>';
 	}
-	else
-	{
+	else {
 		dol_fiche_head($head, 'card', $langs->trans("Action"), -1, 'action');
 
 
@@ -1709,8 +1692,7 @@ if ($id > 0)
 			}
 			$_SESSION['assignedtouser'] = json_encode($listofuserid);
 		}
-		else
-		{
+		else {
 			if (!empty($_SESSION['assignedtouser']))
 			{
 				$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -1797,8 +1779,7 @@ if ($id > 0)
 					}
 				}
 			}
-			else
-			{
+			else {
 				print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
 			}
 			print '</td></tr>';
@@ -1856,8 +1837,7 @@ if ($id > 0)
 			{
 				print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=edit&id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
 			}
-			else
-			{
+			else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Modify").'</a></div>';
 			}
 
@@ -1866,8 +1846,7 @@ if ($id > 0)
 			{
 				print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=clone&object='.$object->element.'&id='.$object->id.'">'.$langs->trans("ToClone").'</a></div>';
 			}
-			else
-			{
+			else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("ToClone").'</a></div>';
 			}
 
@@ -1876,8 +1855,7 @@ if ($id > 0)
 			{
 				print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?action=delete&id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';
 			}
-			else
-			{
+			else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Delete").'</a></div>';
 			}
 		}
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 3c060ffdc39..2c21f311e5d 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -423,8 +423,7 @@ class ActionComm extends CommonObject
                 $this->error = 'Failed to get record with id '.$this->type_id.' code '.$this->type_code.' from dictionary "type of events"';
                 return -1;
             }
-            else
-			{
+            else {
                 $this->error = $cactioncomm->error;
                 return -1;
             }
@@ -579,14 +578,12 @@ class ActionComm extends CommonObject
             	$this->db->commit();
             	return $this->id;
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 return -1;
             }
         }
-        else
-        {
+        else {
             $this->db->rollback();
             $this->error = $this->db->lasterror();
             return -1;
@@ -651,8 +648,7 @@ class ActionComm extends CommonObject
             $this->db->commit();
             return $this->id;
         }
-        else
-        {
+        else {
             $this->db->rollback();
             return -1;
         }
@@ -767,8 +763,7 @@ class ActionComm extends CommonObject
             }
             $this->db->free($resql);
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -814,8 +809,7 @@ class ActionComm extends CommonObject
 
         	return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -869,8 +863,7 @@ class ActionComm extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return -1;
         }
@@ -953,14 +946,12 @@ class ActionComm extends CommonObject
                 $this->db->commit();
                 return 1;
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 return -2;
             }
         }
-        else
-        {
+        else {
             $this->db->rollback();
             $this->error = $this->db->lasterror();
             return -1;
@@ -1107,15 +1098,13 @@ class ActionComm extends CommonObject
                 $this->db->commit();
                 return 1;
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 dol_syslog(get_class($this)."::update ".join(',', $this->errors), LOG_ERR);
                 return -2;
             }
         }
-        else
-        {
+        else {
             $this->db->rollback();
             $this->error = $this->db->lasterror();
             return -1;
@@ -1175,8 +1164,7 @@ class ActionComm extends CommonObject
             $db->free($resql);
             return $resarray;
         }
-        else
-        {
+        else {
             return $db->lasterror();
         }
     }
@@ -1236,8 +1224,7 @@ class ActionComm extends CommonObject
     		if (empty($load_state_board)) return $response;
     		else return 1;
     	}
-    	else
-    	{
+    	else {
     		dol_print_error($this->db);
     		$this->error = $this->db->error();
     		return -1;
@@ -1288,8 +1275,7 @@ class ActionComm extends CommonObject
             }
             $this->db->free($result);
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
         }
     }
@@ -1426,8 +1412,7 @@ class ActionComm extends CommonObject
 			$url = DOL_URL_ROOT.'/contact/perso.php?id='.$this->id;
 		elseif ($option == 'holiday')
             $url = DOL_URL_ROOT.'/holiday/card.php?id='.$this->id;
-		else
-			$url = DOL_URL_ROOT.'/comm/action/card.php?id='.$this->id;
+		else $url = DOL_URL_ROOT.'/comm/action/card.php?id='.$this->id;
 		if ($option !== 'nolink')
 		{
 			// Add param to save lastsearch_values or not
@@ -1451,8 +1436,7 @@ class ActionComm extends CommonObject
             if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle = $labeltype;
             $libelleshort = '';
         }
-        else
-        {
+        else {
             $libelle = (empty($this->libelle) ? $label : $this->libelle.(($label && $label != $this->libelle) ? ' '.$label : ''));
             if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) $libelle = $labeltype;
             if ($maxlength < 0) $libelleshort = $this->ref;
@@ -1694,8 +1678,7 @@ class ActionComm extends CommonObject
                         $dateend = $this->db->jdate($obj->datep2)
                                  - (empty($conf->global->AGENDA_EXPORT_FIX_TZ) ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
                     }
-                    else
-                    {
+                    else {
                         // use start date as fall-back to avoid import erros on empty end date
                         $dateend = $datestart;
                     }
@@ -1752,8 +1735,7 @@ class ActionComm extends CommonObject
 					$eventarray = $hookmanager->resArray;
 				}
             }
-            else
-            {
+            else {
                 $this->error = $this->db->lasterror();
                 return -1;
             }
@@ -1794,8 +1776,7 @@ class ActionComm extends CommonObject
                             $timestampStart = dol_stringtotime($obj->date_start." 12:00:00", 0);
                             $timestampEnd   = dol_stringtotime($obj->date_end." 23:59:59", 0);
                         }
-                        else
-                        {
+                        else {
                             $event['fulldayevent'] = true;
 
                             $timestampStart = dol_stringtotime($obj->date_start." 00:00:00", 0);
@@ -1830,8 +1811,7 @@ class ActionComm extends CommonObject
                             // 2 = leave wait for approval
                             $event['summary'] = $title." - ".$obj->lastname." (wait for approval)";
                         }
-                        else
-                        {
+                        else {
                             // 3 = leave approved
                             $event['summary'] = $title." - ".$obj->lastname;
                         }
@@ -1857,8 +1837,7 @@ class ActionComm extends CommonObject
                 $desc = $more;
                 $desc .= ' ('.$mysoc->name.' - built by Dolibarr)';
             }
-            else
-            {
+            else {
                 $title = 'Dolibarr actions '.$mysoc->name;
                 $desc = $langs->transnoentities('ListOfActions');
                 $desc .= ' ('.$mysoc->name.' - built by Dolibarr)';
@@ -1876,16 +1855,14 @@ class ActionComm extends CommonObject
             if ($result >= 0)
             {
                 if (dol_move($outputfiletmp, $outputfile, 0, 1)) $result = 1;
-                else
-                {
+                else {
                 	$this->error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
                     dol_syslog(get_class($this)."::build_exportfile ".$this->error, LOG_ERR);
                     dol_delete_file($outputfiletmp, 0, 1);
                     $result = -1;
                 }
             }
-            else
-            {
+            else {
                 dol_syslog(get_class($this)."::build_exportfile build_xxxfile function fails to for format=".$format." outputfiletmp=".$outputfile, LOG_ERR);
                 dol_delete_file($outputfiletmp, 0, 1);
                 $langs->load("errors");
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index c8041c4ea16..d3e4f93b5f7 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -105,14 +105,12 @@ class CActionComm
                 $this->db->free($resql);
                 return 1;
             }
-            else
-			{
+            else {
                 $this->db->free($resql);
                 return 0;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -209,8 +207,7 @@ class CActionComm
             if ($idorcode == 'code') $this->liste_array = $repcode;
             return $this->liste_array;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             return -1;
         }
diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index e985b8ea09e..2b74c4793d9 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -187,8 +187,7 @@ class ICal
                     			$tmpkey = $key;
                     			$tmpvalue = $tmpvalue.preg_replace('/=$/', "", $value); // We must wait to have next line to have complete message
                     		}
-                    		else
-                    		{
+                    		else {
                     			$value = quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i', '', $tmpvalue.$value));
                     		}
                     	}                    	//$value=quotedPrintDecode($tmpvalue.$value);
@@ -237,8 +236,7 @@ class ICal
         	{
         		list($key, $value) = array($key, $value);
         	}
-        	else
-        	{
+        	else {
         		list($key, $value) = $this->ical_dt_date($key, $value);
         	}
         }
@@ -378,8 +376,7 @@ class ICal
             usort($temp, array(&$this, "ical_dtstart_compare"));
             return $temp;
         }
-        else
-        {
+        else {
             return false;
         }
     }
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 9e770f70a93..3bd141ca964 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -216,8 +216,7 @@ if ($object->id > 0)
 		}
 		$_SESSION['assignedtouser'] = json_encode($listofuserid);
 	}
-	else
-	{
+	else {
 		if (!empty($_SESSION['assignedtouser']))
 		{
 			$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -264,8 +263,7 @@ if ($object->id > 0)
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index b480586bc6a..7b45b3f6ceb 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -96,8 +96,7 @@ if (GETPOST('search_actioncode', 'array'))
     $actioncode = GETPOST('search_actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
 }
-else
-{
+else {
 	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
@@ -466,7 +465,7 @@ if (!empty($conf->use_javascript_ajax))	// If javascript on
     	$s = $hookmanager->resPrint;
     }
 }
-else 									// If javascript off
+else // If javascript off
 {
 	$newparam = $param; // newparam is for birthday links
     $newparam = preg_replace('/showbirthday=[0-1]/i', 'showbirthday='.(empty($showbirthday) ? 1 : 0), $newparam);
@@ -512,24 +511,20 @@ if (!empty($actioncode))
     {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else
-        {
+        else {
             if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
             if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
         }
     }
-    else
-    {
+    else {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else
-        {
+        else {
             if (is_array($actioncode))
             {
 	        	$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
             }
-            else
-            {
+            else {
 	        	$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
             }
         }
@@ -554,8 +549,7 @@ if ($action == 'show_day')
     $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
     $sql .= ')';
 }
-else
-{
+else {
     // To limit array
     $sql .= " AND (";
     $sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, 1, $year) - (60 * 60 * 24 * 7))."'"; // Start 7 days before
@@ -652,8 +646,7 @@ if ($resql)
         {
             // This record is out of visible range
         }
-        else
-        {
+        else {
             if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar = $firstdaytoshow;
             if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
 
@@ -666,8 +659,7 @@ if ($resql)
             // Loop on each day covered by action to prepare an index to show on calendar
             $loop = true; $j = 0;
             $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
-            do
-            {
+            do {
                 //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
 
                 $eventarray[$daykey][] = $event;
@@ -684,8 +676,7 @@ if ($resql)
         $i++;
     }
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
@@ -702,8 +693,7 @@ if ($showbirthday)
         $sql .= ' AND MONTH(birthday) = '.$month;
         $sql .= ' AND DAY(birthday) = '.$day;
     }
-    else
-    {
+    else {
         $sql .= ' AND MONTH(birthday) = '.$month;
     }
     $sql .= ' ORDER BY birthday';
@@ -741,8 +731,7 @@ if ($showbirthday)
 
             $loop = true;
             $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
-            do
-            {
+            do {
                 $eventarray[$daykey][] = $event;
                 $daykey += 60 * 60 * 24;
                 if ($daykey > $event->date_end_in_calendar) $loop = false;
@@ -751,8 +740,7 @@ if ($showbirthday)
             $i++;
         }
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 }
@@ -822,8 +810,7 @@ if ($conf->global->AGENDA_SHOW_HOLIDAYS)
             {
                 $event->label = $obj->lastname.' ('.$langs->trans("Afternoon").')';
             }
-            else
-            {
+            else {
                 $event->label = $obj->lastname;
             }
 
@@ -832,8 +819,7 @@ if ($conf->global->AGENDA_SHOW_HOLIDAYS)
             $jour   = date('d', $event->date_start_in_calendar);
             $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
 
-            do
-            {
+            do {
                 $eventarray[$daykey][] = $event;
 
                 $daykey += 60 * 60 * 24;
@@ -903,8 +889,7 @@ if (count($listofextcals))
                         // datecurstart and datecurend are now GMT date
                         //var_dump($datecurstart); var_dump($datecurend); exit;
                     }
-                    else
-                    {
+                    else {
                         // Not a recongized record
                         dol_syslog("Found a not recognized repeatable record with unknown date start", LOG_ERR);
                         continue;
@@ -929,8 +914,7 @@ if (count($listofextcals))
                                 $newevent['DTSTART;VALUE=DATE'] = dol_print_date($datecurstart, '%Y%m%d');
                                 $newevent['DTEND;VALUE=DATE'] = dol_print_date($datecurend + 1, '%Y%m%d');
                             }
-                            else
-                            {
+                            else {
                                 $newevent['DTSTART'] = $datecurstart;
                                 $newevent['DTEND'] = $datecurend;
                             }
@@ -1067,8 +1051,7 @@ if (count($listofextcals))
                         //print 'x'.$datestart.'-'.$dateend;exit;
                         // This record is out of visible range
                     }
-                    else
-                    {
+                    else {
                         if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar = $firstdaytoshow;
                         if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
 
@@ -1083,8 +1066,7 @@ if (count($listofextcals))
                         // daykey must be date that represent day box in calendar so must be a user time
                         $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
                         $daykeygmt = dol_mktime(0, 0, 0, $mois, $jour, $annee, true, 0);
-                        do
-                        {
+                        do {
                             //if ($event->fulldayevent) print dol_print_date($daykeygmt,'dayhour','gmt').'-'.dol_print_date($daykey,'dayhour','gmt').'-'.dol_print_date($event->date_end_in_calendar,'dayhour','gmt').' ';
                             $eventarray[$daykey][] = $event;
                             $daykey += 60 * 60 * 24; $daykeygmt += 60 * 60 * 24; // Add one day
@@ -1201,8 +1183,7 @@ if (empty($action) || $action == 'show_month')      // View by month
                 echo "  </td>\n";
             }
             /* Show days after the current month (next month) */
-            else
-			{
+            else {
                 $style = 'cal_other_month';
                 if ($iter_day == 6) $style .= ' cal_other_month_right';
                 echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
@@ -1275,7 +1256,7 @@ elseif ($action == 'show_week') // View by week
     echo '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';
     echo '<input type="hidden" name="newdate" id="newdate">';
 }
-else    // View by day
+else // View by day
 {
     $newparam = $param; // newparam is for birthday links
     $newparam = preg_replace('/action=show_month&?/i', '', $newparam);
@@ -1350,8 +1331,7 @@ else    // View by day
 
 		print '</div>';
     }
-    else
-    {
+    else {
     	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 
     	show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 0);
@@ -1490,8 +1470,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     {
                     	$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unmovable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
                     }
-                    else
-               	    {
+                    else {
                     	$numother++;
                     	$color = ($event->icalcolor ? $event->icalcolor : -1);
                     	$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');
@@ -1516,8 +1495,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     	{
                     		$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
                     	}
-                    	else
-                    	{
+                    	else {
                    			$colorindex = $nextindextouse;
                    			$colorindexused[$idusertouse] = $colorindex;
                     		if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
@@ -1580,8 +1558,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     {
                     	print 'border: 2px solid #'.$colortouse.';';
                     }
-                    else
-                    {
+                    else {
                     	print 'background: #'.$colortouse.';';
                     	print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($colortouse, -3).'), to(#'.dol_color_minus($colortouse, -1).'));';
                     }
@@ -1649,8 +1626,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                                 $daterange .= dol_print_date($event->date_end_in_calendar, '%H:%M'); // Il faudrait utiliser ici tzuser, mais si on ne peut pas car qd on rentre un date dans fiche action, en input la conversion local->gmt se base sur le TZ server et non user
                             }
                         }
-                        else
-						{
+                        else {
                             if ($showinfo)
                             {
                                 print $langs->trans("EventOnFullDay")."<br>\n";
@@ -1755,8 +1731,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     print '</div><!-- end event '.$i.' -->'."\n";
                     $i++;
                 }
-                else
-                {
+                else {
                 	print '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action='.$action.'&maxprint=0&month='.$monthshown.'&year='.$year;
                     print ($status ? '&status='.$status : '').($filter ? '&filter='.$filter : '');
                     print ($filtert ? '&search_filtert='.$filtert : '');
@@ -1818,8 +1793,7 @@ function dol_color_minus($color, $minus, $minusunit = 16)
     	$newcolor[2] = dechex(max(min(hexdec($newcolor[2]) - $minus, 15), 0));
     	$newcolor[4] = dechex(max(min(hexdec($newcolor[4]) - $minus, 15), 0));
 	}
-	else
-	{
+	else {
 	    // Not yet implemented
 	}
 	return $newcolor;
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 2391f9ca491..2c9061b7ec8 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -55,8 +55,7 @@ if (GETPOST('search_actioncode', 'array'))
     $actioncode = GETPOST('search_actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
 }
-else
-{
+else {
     $actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
@@ -279,24 +278,20 @@ if (!empty($actioncode))
     {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
-        else
-        {
+        else {
             if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'";
             if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'";
         }
     }
-    else
-    {
+    else {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
-        else
-        {
+        else {
             if (is_array($actioncode))
             {
                 $sql .= " AND c.code IN ('".implode("','", $actioncode)."')";
             }
-            else
-            {
+            else {
                 $sql .= " AND c.code IN ('".implode("','", explode(',', $actioncode))."')";
             }
         }
@@ -699,8 +694,7 @@ if ($resql)
 				$contactstatic->country_id = $obj->country_id;
 				print $contactstatic->getNomUrl(1, '', 0);
 			}
-			else
-			{
+			else {
 				print "&nbsp;";
 			}
 			print '</td>';
@@ -751,8 +745,7 @@ if ($resql)
 
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 6dfbc6c7f9c..bc859ba6d2d 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -94,8 +94,7 @@ if (GETPOST('actioncode', 'array'))
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
 }
-else
-{
+else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
@@ -372,18 +371,15 @@ if (!empty($actioncode))
     {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else
-        {
+        else {
             if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
             if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
         }
     }
-    else
-    {
+    else {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else
-        {
+        else {
             $sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
         }
     }
@@ -407,8 +403,7 @@ if ($action == 'show_day')
     $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
     $sql .= ')';
 }
-else
-{
+else {
     // To limit array
     $sql .= " AND (";
     $sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, 1, 1, $year) - (60 * 60 * 24 * 7))."'"; // Start 7 days before
@@ -491,8 +486,7 @@ if ($resql)
         	if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
         	else $event->date_end_in_calendar = $datep;
         }
-        else
-        {
+        else {
         	$event->date_start_in_calendar = $datep;
         	if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
         	else $event->date_end_in_calendar = $datep;
@@ -510,8 +504,7 @@ if ($resql)
             // This record is out of visible range
         	unset($event);
         }
-        else
-		{
+        else {
 			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
 			$event->fetch_userassigned(); // This load $event->userassigned
 
@@ -527,8 +520,7 @@ if ($resql)
             // Loop on each day covered by action to prepare an index to show on calendar
             $loop = true; $j = 0;
             $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
-            do
-			{
+            do {
                 //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
 
                 $eventarray[$daykey][] = $event;
@@ -545,8 +537,7 @@ if ($resql)
         $i++;
     }
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
@@ -827,8 +818,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 				{
 					$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unsortable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
 				}
-				else
-				{
+				else {
 					$numother++; $cssclass = 'family_other';
 					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color = $event->type_color;
 				}
@@ -841,8 +831,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 					{
 						$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
 					}
-					else
-					{
+					else {
 						$colorindex = $nextindextouse;
 						$colorindexused[$idusertouse] = $colorindex;
 						if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
@@ -961,8 +950,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 							}
 						}
 					}
-					else
-					{
+					else {
 						$busy = $event->transparency;
 						$cases1[$h][$event->id]['busy'] = $busy;
 						$cases2[$h][$event->id]['busy'] = $busy;
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index f2cce5c8023..da5020cef39 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -95,8 +95,7 @@ if (GETPOST('search_actioncode', 'array'))
     $actioncode = GETPOST('search_actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
 }
-else
-{
+else {
     $actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
@@ -431,24 +430,20 @@ if (!empty($actioncode))
     {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else
-        {
+        else {
             if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
             if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
         }
     }
-    else
-    {
+    else {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else
-        {
+        else {
             if (is_array($actioncode))
             {
   	        	$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
             }
-            else
-            {
+            else {
   	        	$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
             }
         }
@@ -473,8 +468,7 @@ if ($action == 'show_day')
     $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
     $sql .= ')';
 }
-else
-{
+else {
     // To limit array
     $sql .= " AND (";
     $sql .= " (a.datep BETWEEN '".$db->idate($firstdaytoshow - (60 * 60 * 24 * 2))."'"; // Start 2 day before $firstdaytoshow
@@ -558,8 +552,7 @@ if ($resql)
             if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
             else $event->date_end_in_calendar = $datep;
         }
-        else
-		{
+        else {
             $event->date_start_in_calendar = $datep;
             if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
             else $event->date_end_in_calendar = $datep;
@@ -577,8 +570,7 @@ if ($resql)
             // This record is out of visible range
             unset($event);
         }
-        else
-		{
+        else {
 			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
         	$event->fetch_userassigned(); // This load $event->userassigned
 
@@ -594,8 +586,7 @@ if ($resql)
             // Loop on each day covered by action to prepare an index to show on calendar
             $loop = true; $j = 0;
             $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
-            do
-			{
+            do {
                 //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
 
                 $eventarray[$daykey][] = $event;
@@ -613,8 +604,7 @@ if ($resql)
     }
     $db->free($resql);
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
@@ -721,8 +711,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 		}
 	}
 	/* Use this list to have for all users */
-	else
-	{
+	else {
 		$sql = "SELECT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";
 		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 		if ($usergroup > 0)	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user";
@@ -1011,8 +1000,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 				{
 					$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unsortable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
 				}
-				else
-				{
+				else {
 					$numother++;
 					$color = ($event->icalcolor ? $event->icalcolor : -1);
 					$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');
@@ -1039,8 +1027,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 					{
 						$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
 					}
-					else
-					{
+					else {
 						$colorindex = $nextindextouse;
 						$colorindexused[$idusertouse] = $colorindex;
 						if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
@@ -1159,8 +1146,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 							}
 						}
 					}
-					else
-					{
+					else {
 						$busy = $event->transparency;
 						$cases1[$h][$event->id]['busy'] = $busy;
 						$cases2[$h][$event->id]['busy'] = $busy;
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 82477d307fc..c3192f2286e 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -203,8 +203,7 @@ if ($resql)
 
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 4ff16cd7c03..17eae67eb2e 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -331,8 +331,7 @@ if ($object->id > 0)
 	{
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_id, 'cond_reglement_id', 1);
 	}
-	else
-	{
+	else {
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_id, 'none');
 	}
 	print "</td>";
@@ -350,8 +349,7 @@ if ($object->id > 0)
 	{
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
 	}
-	else
-	{
+	else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_id, 'none');
 	}
 	print "</td>";
@@ -371,8 +369,7 @@ if ($object->id > 0)
 		{
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_account, 'fk_account', 1);
 		}
-		else
-		{
+		else {
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_account, 'none');
 		}
 		print "</td>";
@@ -479,8 +476,7 @@ if ($object->id > 0)
         {
             $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
         }
-        else
-        {
+        else {
             $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'none');
         }
         print "</td>";
@@ -518,8 +514,7 @@ if ($object->id > 0)
             $adh->ref = $adh->getFullName($langs);
             print $adh->getNomUrl(1);
         }
-        else
-        {
+        else {
             print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
         }
         print '</td>';
@@ -547,8 +542,7 @@ if ($object->id > 0)
 	    {
 	        $formcompany->form_prospect_level($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_prospectlevel, 'prospect_level_id', 1);
 	    }
-	    else
-	    {
+	    else {
 	        print $object->getLibProspLevel();
 	    }
         print "</td>";
@@ -732,8 +726,7 @@ if ($object->id > 0)
 				print '</div>';
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -818,8 +811,7 @@ if ($object->id > 0)
 				print '</div>';
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -961,8 +953,7 @@ if ($object->id > 0)
 				print '</div>';
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -1022,8 +1013,7 @@ if ($object->id > 0)
 				print '</div>';
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -1093,14 +1083,12 @@ if ($object->id > 0)
 				{
 					print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_last_gen), 'day').'</td>';
 				}
-				else
-				{
+				else {
 					if ($objp->dc > 0)
 					{
 						print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->dc), 'day').'</td>';
 					}
-					else
-					{
+					else {
 						print '<td class="right"><b>!!!</b></td>';
 					}
 				}
@@ -1130,8 +1118,7 @@ if ($object->id > 0)
 				print '</div>';
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -1195,8 +1182,7 @@ if ($object->id > 0)
 				{
 					print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->df), 'day').'</td>';
 				}
-				else
-				{
+				else {
 					print '<td class="right"><b>!!!</b></td>';
 				}
 				print '<td class="right" style="min-width: 60px">';
@@ -1222,8 +1208,7 @@ if ($object->id > 0)
 				print '</div>';
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -1289,8 +1274,7 @@ if ($object->id > 0)
     			{
     			    print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
     			}
-    			else
-    			{
+    			else {
     				$langs->load("bills");
     				$langs->load("orders");
 
@@ -1317,8 +1301,7 @@ if ($object->id > 0)
     		{
     			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a></div>';
     		}
-    		else
-    		{
+    		else {
     			print '<div class="inline-block divButAction"><a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a></div>';
     		}
     	}
@@ -1343,8 +1326,7 @@ if ($object->id > 0)
 		show_actions_done($conf, $langs, $db, $object);
 	}
 }
-else
-{
+else {
 	$langs->load("errors");
 	print $langs->trans('ErrorRecordNotFound');
 }
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 8c9a63d97e2..da7248dbecb 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -171,8 +171,7 @@ if ($resql)
 
 	$db->free($resql);
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index af5b4ac41a5..99eddda9cad 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -215,16 +215,14 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire)
 				print '<tr class="liste_total"><td colspan="2" class="right">'.$langs->trans("Total").'</td><td class="right">'.price($total)."</td></tr>";
 			}
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoProposal").'</td></tr>';
 		}
 		print "</table></div><br>";
 
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -303,16 +301,14 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
                 print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td><td colspan="2" class="right">'.price($total)."</td></tr>";
             }
         }
-        else
-        {
+        else {
             print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoProposal").'</td></tr>';
         }
         print "</table></div><br>";
 
         $db->free($resql);
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 }
@@ -395,8 +391,7 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
                 print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td><td colspan="2" class="right">'.price($total)."</td></tr>";
 			}
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoOrder").'</td></tr>';
 		}
 		print "</table>";
@@ -404,8 +399,7 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -488,8 +482,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
                 print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td><td colspan="2" class="right">'.price($total)."</td></tr>";
             }
         }
-        else
-        {
+        else {
             print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoSupplierOrder").'</td></tr>';
         }
         print "</table>";
@@ -571,8 +564,7 @@ if (!empty($conf->societe->enabled) && $user->rights->societe->lire)
 
 			$db->free($resql);
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print "</table>";
@@ -630,8 +622,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print '</table>';
@@ -718,8 +709,7 @@ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TOD
 			print "</div><br>";
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -826,8 +816,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire)
 			print "</div><br>";
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -934,8 +923,7 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 			print "</div><br>";
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index d4db9fc6ea9..d16c3e9e7da 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -88,8 +88,7 @@ if ($result < 0)
 {
 	setEventMessages($advTarget->error, $advTarget->errors, 'errors');
 }
-else
-{
+else {
 	if (!empty($advTarget->id)) {
 		$array_query = json_decode($advTarget->filtervalue, true);
 	}
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index e3cb5a9ad97..1e7f5fa6385 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -94,16 +94,14 @@ if (empty($reshook))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		}
-		else
-		{
+		else {
 			$result = $object->createFromClone($user, $object->id, GETPOST("clone_content", 'alpha'), GETPOST("clone_receivers", 'alpha'));
 			if ($result > 0)
 			{
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 				exit;
 			}
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -126,8 +124,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans("NotEnoughPermissions"), null, 'warnings');
 			$action = '';
 		}
-		else
-		{
+		else {
 			$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
 			if ($object->statut == 0)
@@ -236,8 +233,7 @@ if (empty($reshook))
 								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 							}
-							else
-							{
+							else {
 								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'order'.$obj->source_id, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
@@ -317,8 +313,7 @@ if (empty($reshook))
 							{
 								dol_print_error($db);
 							}
-							else
-							{
+							else {
 								//if cheack read is use then update prospect contact status
 								if (strpos($message, '__CHECK_READ__') !== false)
 								{
@@ -351,8 +346,7 @@ if (empty($reshook))
 
                         	//test if CHECK READ change statut prospect contact
 						}
-						else
-						{
+						else {
 							// Mail failed
 							$nbko++;
 
@@ -370,8 +364,7 @@ if (empty($reshook))
 						$i++;
 					}
 				}
-				else
-				{
+				else {
 					setEventMessages($langs->transnoentitiesnoconv("NoMoreRecipientToSendTo"), null, 'mesgs');
 				}
 
@@ -382,15 +375,13 @@ if (empty($reshook))
 					if ($nbok > 0) 	setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
 					else setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
 				}
-				else
-				{
+				else {
 					if ($nbok >= $num)
 					{
 						$statut = 3; // Send to everybody
 						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
 					}
-					else
-					{
+					else {
 						$statut = 2; // Status 'sent partially' (because not send to everybody)
 						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
 					}
@@ -404,8 +395,7 @@ if (empty($reshook))
 					dol_print_error($db);
 				}
 			}
-			else
-			{
+			else {
 				dol_syslog($db->error());
 				dol_print_error($db);
 			}
@@ -473,8 +463,7 @@ if (empty($reshook))
 				setEventMessages($langs->trans("MailSuccessfulySent", $mailfile->getValidAddress($object->email_from, 2), $mailfile->getValidAddress($object->sendto, 2)), null, 'mesgs');
 				$action = '';
 			}
-			else
-			{
+			else {
 				setEventMessages($langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result, null, 'errors');
 				$action = 'test';
 			}
@@ -612,8 +601,7 @@ if (empty($reshook))
 			setEventMessages($mesg, $mesgs, 'errors');
 			$action = "edit";
 		}
-		else
-		{
+		else {
 			$action = "edit";
 		}
 	}
@@ -628,8 +616,7 @@ if (empty($reshook))
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -646,13 +633,11 @@ if (empty($reshook))
     			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
     			exit;
             }
-            else
-            {
+            else {
                 setEventMessages($object->error, $object->errors, 'errors');
             }
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -676,14 +661,12 @@ if (empty($reshook))
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -784,8 +767,7 @@ if ($action == 'create')
 
 	print '</form>';
 }
-else
-{
+else {
 	if ($object->id > 0)
 	{
 		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
@@ -856,8 +838,7 @@ else
 					}
 					$_GET["action"] = '';
 				}
-				else
-				{
+				else {
 				    if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
 				    if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
 
@@ -940,8 +921,7 @@ else
     				{
     					$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
     				}
-    				else
-    				{
+    				else {
     					$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
     				}
 			    }
@@ -950,8 +930,7 @@ else
     			{
     			    print $form->textwithpicto($nbemail, $text, 1, 'warning');
     			}
-    			else
-    			{
+    			else {
     				print $nbemail;
     			}
 			}
@@ -999,8 +978,7 @@ else
 					{
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditWithEditor").'</a>';
 					}
-					else
-					{
+					else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditWithTextEditor").'</a>';
 					}
 
@@ -1013,8 +991,7 @@ else
 				{
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("TestMailing").'</a>';
 				}
-				else
-				{
+				else {
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=test&amp;id='.$object->id.'">'.$langs->trans("TestMailing").'</a>';
 				}
 
@@ -1028,8 +1005,7 @@ else
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ValidMailing").'</a>';
 					}
-					else
-					{
+					else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=valid&amp;id='.$object->id.'">'.$langs->trans("ValidMailing").'</a>';
 					}
 				}
@@ -1044,8 +1020,7 @@ else
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("SendMailing").'</a>';
 					}
-					else
-					{
+					else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=sendall&amp;id='.$object->id.'">'.$langs->trans("SendMailing").'</a>';
 					}
 				}
@@ -1061,8 +1036,7 @@ else
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ResetMailing").'</a>';
 					}
-					else
-					{
+					else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=reset&amp;id='.$object->id.'">'.$langs->trans("ResetMailing").'</a>';
 					}
 				}
@@ -1073,8 +1047,7 @@ else
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("DeleteMailing").'</a>';
 					}
-					else
-					{
+					else {
 						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.(!empty($urlfrom) ? '&urlfrom='.$urlfrom : '').'">'.$langs->trans("DeleteMailing").'</a>';
 					}
 				}
@@ -1154,8 +1127,7 @@ else
 					print '<br>';
 				}
 			}
-			else
-			{
+			else {
 				print '<span class="opacitymedium">'.$langs->trans("NoAttachedFiles").'</span><br>';
 			}
 			print '</td></tr>';
@@ -1182,8 +1154,7 @@ else
 
 			dol_fiche_end();
 		}
-		else
-		{
+		else {
 			/*
 			 * Mailing en mode edition (CKeditor or HTML source)
 			 */
@@ -1230,8 +1201,7 @@ else
 					{
 						$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
 					}
-					else
-					{
+					else {
 						$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
 					}
 				}
@@ -1240,8 +1210,7 @@ else
 				{
 					print $form->textwithpicto($nbemail, $text, 1, 'warning');
 				}
-				else
-				{
+				else {
 					print $nbemail;
 				}
 			}
@@ -1316,8 +1285,7 @@ else
 					$out .= '<br></div>';
 				}
 			}
-			else
-			{
+			else {
 				$out .= $langs->trans("NoAttachedFiles").'<br>';
 			}
 			// Add link to add file
@@ -1367,8 +1335,7 @@ else
 			print '<br>';
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db, $object->error);
 	}
 }
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index d8d9873b88b..e89a645cf20 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -161,8 +161,7 @@ if (GETPOST('exportcsv', 'int'))
 
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 	exit;
@@ -182,14 +181,12 @@ if ($action == 'delete')
 
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		}
-		else
-		{
+		else {
 			header("Location: list.php");
 			exit;
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -294,8 +291,7 @@ if ($object->fetch($id) >= 0)
 			{
 				$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
 			}
-			else
-			{
+			else {
 				$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
 			}
 		}
@@ -304,8 +300,7 @@ if ($object->fetch($id) >= 0)
 		{
 			print $form->textwithpicto($nbemail, $text, 1, 'warning');
 		}
-		else
-		{
+		else {
 			print $nbemail;
 		}
 	}
@@ -406,8 +401,7 @@ if ($object->fetch($id) >= 0)
 						print '<form '.$bctag[$var].' name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
 						print '<input type="hidden" name="token" value="'.newToken().'">';
 					}
-					else
-					{
+					else {
 					    print '<div '.$bctag[$var].'>';
 					}
 
@@ -431,8 +425,7 @@ if ($object->fetch($id) >= 0)
 					{
 						print $nbofrecipient;
 					}
-					else
-					{
+					else {
 						print $langs->trans("Error").' '.img_error($obj->error);
 					}
 					print '</div>';
@@ -457,8 +450,7 @@ if ($object->fetch($id) >= 0)
 					{
 						print '<input type="submit" class="button" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
 					}
-					else
-					{
+					else {
 					    print '<input type="submit" class="button disabled" disabled="disabled" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
 						//print $langs->trans("MailNoChangePossible");
 						print "&nbsp;";
@@ -633,8 +625,7 @@ if ($object->fetch($id) >= 0)
                 {
                     print empty($obj->source_url) ? '' : $obj->source_url; // For backward compatibility
                 }
-                else
-                {
+                else {
                     if ($obj->source_type == 'member')
                     {
 						$objectstaticmember->fetch($obj->source_id);
@@ -655,8 +646,7 @@ if ($object->fetch($id) >= 0)
                     	$objectstaticcontact->fetch($obj->source_id);
                     	print $objectstaticcontact->getNomUrl(1);
                     }
-                    else
-                    {
+                    else {
                         print $obj->source_url;
                     }
                 }
@@ -677,8 +667,7 @@ if ($object->fetch($id) >= 0)
 					print $object::libStatutDest($obj->statut, 2, '');
 					print '</td>';
 				}
-				else
-				{
+				else {
 					// Date sent
 					print '<td class="center">'.$obj->date_envoi.'</td>';
 
@@ -705,8 +694,7 @@ if ($object->fetch($id) >= 0)
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			if ($object->statut < 2)
 			{
 			    print '<tr><td colspan="9" class="opacitymedium">';
@@ -721,8 +709,7 @@ if ($object->fetch($id) >= 0)
 
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 
diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index 7700ca6ee43..dd6f59e80b9 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -166,8 +166,7 @@ class AdvanceTargetingMailing extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return $this->id;
 		}
@@ -222,8 +221,7 @@ class AdvanceTargetingMailing extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
@@ -285,8 +283,7 @@ class AdvanceTargetingMailing extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
@@ -352,8 +349,7 @@ class AdvanceTargetingMailing extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
@@ -412,8 +408,7 @@ class AdvanceTargetingMailing extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -454,8 +449,7 @@ class AdvanceTargetingMailing extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -690,8 +684,7 @@ class AdvanceTargetingMailing extends CommonObject
 				{
 					$tmpwhere .= "(t.email IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE t.entity IN (".getEntity('mailing').") AND email = '".$this->db->escape($arrayquery['contact_no_email'])."'))";
 				}
-				else
-				{
+				else {
 					$tmpwhere .= "(t.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE t.entity IN (".getEntity('mailing').") AND email = '".$this->db->escape($arrayquery['contact_no_email'])."'))";
 				}
 				$sqlwhere[] = $tmpwhere;
diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
index b9782515735..fd674945beb 100644
--- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
@@ -315,8 +315,7 @@ class FormAdvTargetEmailing extends Form
 				}
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
@@ -401,8 +400,7 @@ class FormAdvTargetEmailing extends Form
 				}
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 56a115a2fea..a6c44c96a8d 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -145,8 +145,7 @@ class Mailing extends CommonObject
 			{
 				$this->db->commit();
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -1;
@@ -154,8 +153,7 @@ class Mailing extends CommonObject
 
 			return $this->id;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -187,8 +185,7 @@ class Mailing extends CommonObject
 		{
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -254,14 +251,12 @@ class Mailing extends CommonObject
 
 				return 1;
 			}
-			else
-			{
+			else {
 				dol_syslog(get_class($this)."::fetch Erreur -1");
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog(get_class($this)."::fetch Erreur -2");
 			return -2;
 		}
@@ -369,8 +364,7 @@ class Mailing extends CommonObject
 						}
 					}
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->lasterror();
 					return -1;
 				}
@@ -387,8 +381,7 @@ class Mailing extends CommonObject
 			$this->db->commit();
 			return $object->id;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -413,8 +406,7 @@ class Mailing extends CommonObject
 		{
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -438,8 +430,7 @@ class Mailing extends CommonObject
 		{
 			return $this->delete_targets();
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -463,8 +454,7 @@ class Mailing extends CommonObject
 		{
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return 0;
 		}
@@ -491,8 +481,7 @@ class Mailing extends CommonObject
 		{
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -512,8 +501,7 @@ class Mailing extends CommonObject
 	    if ($mode == 'alreadysent') $sql .= " AND statut <> 0";
 	    elseif ($mode == 'alreadysentok') $sql .= " AND statut > 0";
 	    elseif ($mode == 'alreadysentko') $sql .= " AND statut = -1";
-	    else
-	    {
+	    else {
 	        $this->error = 'BadValueForParameterMode';
 	        return -2;
 	    }
@@ -524,8 +512,7 @@ class Mailing extends CommonObject
 	        $obj = $this->db->fetch_object($resql);
 	        if ($obj) return $obj->nb;
 	    }
-	    else
-	    {
+	    else {
 	        $this->error = $this->db->lasterror();
 	        return -1;
 	    }
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index 6b765d9451f..edcb12d1bb2 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -130,8 +130,7 @@ if (is_resource($handle))
 
                             $db->free($result);
                         }
-                        else
-                        {
+                        else {
                             dol_print_error($db);
                         }
                         print '</tr>';
@@ -192,15 +191,13 @@ if ($result) {
 	        $i++;
 	    }
     }
-    else
-    {
+    else {
         print '<tr><td class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
     print "</table></div><br>";
     $db->free($result);
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 8119224bbfa..dcba1333b11 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -131,8 +131,7 @@ if ($filteremail)
 	if (!$sortorder) $sortorder = "ASC";
 	if (!$sortfield) $sortfield = "m.rowid";
 }
-else
-{
+else {
 	$sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi";
 	$sql .= " FROM ".MAIN_DB_PREFIX."mailing as m";
 	$sql .= " WHERE m.entity = ".$conf->entity;
@@ -275,8 +274,7 @@ if ($resql)
 		{
 			print $email::libStatutDest($obj->sendstatut, 2);
 		}
-		else
-		{
+		else {
 			print $email->LibStatut($obj->statut, 5);
 		}
 		print '</td>';
@@ -298,8 +296,7 @@ if ($resql)
 
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php
index 6d80626242d..964663a976b 100644
--- a/htdocs/comm/multiprix.php
+++ b/htdocs/comm/multiprix.php
@@ -153,8 +153,7 @@ if ($_socid > 0)
 		$db->free($resql);
 		print "</table>";
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index bd5430c440a..6b9ed10f18a 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -162,8 +162,7 @@ if (empty($reshook))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		}
-		else
-		{
+		else {
 			if ($object->id > 0) {
 				if (!empty($conf->global->PROPAL_CLONE_DATE_DELIVERY)) {
 					//Get difference between old and new delivery date and change lines according to difference
@@ -550,8 +549,7 @@ if (empty($reshook))
 						$error++;
 					}
 				} 			// Standard creation
-				else
-				{
+				else {
 					$id = $object->create($user);
 				}
 
@@ -603,14 +601,12 @@ if (empty($reshook))
 						header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
 						exit();
 					}
-					else
-					{
+					else {
 						$db->rollback();
 						$action = 'create';
 					}
 				}
-				else
-				{
+				else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$db->rollback();
 					$action = 'create';
@@ -635,8 +631,7 @@ if (empty($reshook))
 		{
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 		}
 	}
@@ -663,8 +658,7 @@ if (empty($reshook))
 				{
 					$db->commit();
 				}
-				else
-				{
+				else {
 					$db->rollback();
 				}
 			}
@@ -689,8 +683,7 @@ if (empty($reshook))
 			{
 				$db->commit();
 			}
-			else
-			{
+			else {
 				$db->rollback();
 			}
 		}
@@ -831,8 +824,7 @@ if (empty($reshook))
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 		}
-		else
-		{
+		else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
@@ -965,8 +957,7 @@ if (empty($reshook))
 							{
 								$pu_ht = $priceforthequantityarray['unitprice'];
 							}
-							else
-							{
+							else {
 								$pu_ttc = $priceforthequantityarray['unitprice'];
 							}
 							// Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST.
@@ -991,8 +982,7 @@ if (empty($reshook))
 							{
 								$pu_ht = $priceforthequantityarray['unitprice'];
 							}
-							else
-							{
+							else {
 								$pu_ttc = $priceforthequantityarray['unitprice'];
 							}
 							// Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST.
@@ -1534,8 +1524,7 @@ if ($action == 'create')
 			}
 		}
 	}
-	else
-	{
+	else {
 		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
 	}
 
@@ -2310,8 +2299,7 @@ if ($action == 'create')
 		{
 			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 		}
-		else
-		{
+		else {
 			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 		}
 		print '</td></tr>';
@@ -2479,8 +2467,7 @@ if ($action == 'create')
 					{
 						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate">'.$langs->trans('Validate').'</a>';
 					}
-					else
-						print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Validate').'</a>';
+					else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Validate').'</a>';
 				}
 				// Create event
 				/*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
@@ -2503,8 +2490,7 @@ if ($action == 'create')
 					if ($object->statut == Propal::STATUS_VALIDATED || $object->statut == Propal::STATUS_SIGNED || !empty($conf->global->PROPOSAL_SENDBYEMAIL_FOR_ALL_STATUS)) {
 						if ($usercansend) {
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-						} else
-							print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('SendMail').'</a>';
+						} else print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('SendMail').'</a>';
 					}
 				}
 
@@ -2557,8 +2543,7 @@ if ($action == 'create')
 						{
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled&amp;socid='.$object->socid.'">'.$langs->trans("ClassifyBilled").'</a>';
 						}
-						else
-						{
+						else {
 							print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("ClassifyBilled").'</a>';
 						}
 					}
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 87c91d0f621..563e71d79d3 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -457,8 +457,7 @@ class Proposals extends DolibarrApi
 		if ($updateRes > 0) {
 			return $this->get($id);
 		}
-		else
-		{
+		else {
 			throw new RestException(405, $this->propal->error);
 		}
 	}
@@ -589,8 +588,7 @@ class Proposals extends DolibarrApi
 		{
 			return $this->get($id);
 		}
-		else
-		{
+		else {
 			throw new RestException(500, $this->propal->error);
 		}
 	}
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 3c7cfe0006c..0827ddd64c7 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -391,8 +391,7 @@ class Propal extends CommonObject
 			{
 				$price = $prod->multiprices[$this->thirdparty->price_level];
 			}
-			else
-			{
+			else {
 				$price = $prod->price;
 			}
 
@@ -474,21 +473,18 @@ class Propal extends CommonObject
 					$this->db->commit();
 					return 1;
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					return -1;
 				}
 			}
-			else
-			{
+			else {
 				$this->error = $line->error;
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -2;
 		}
@@ -562,8 +558,7 @@ class Propal extends CommonObject
 			{
 				$pu = $pu_ht;
 			}
-			else
-			{
+			else {
 				$pu = $pu_ttc;
 			}
 
@@ -716,22 +711,19 @@ class Propal extends CommonObject
                     $this->db->commit();
                     return $this->line->id;
                 }
-                else
-                {
+                else {
                     $this->error = $this->db->error();
                     $this->db->rollback();
                     return -1;
                 }
             }
-            else
-            {
+            else {
                 $this->error = $this->line->error;
                 $this->db->rollback();
                 return -2;
             }
         }
-		else
-		{
+		else {
 			dol_syslog(get_class($this)."::addline status of proposal must be Draft to allow use of ->addline()", LOG_ERR);
 			return -3;
 		}
@@ -918,16 +910,14 @@ class Propal extends CommonObject
 				$this->db->commit();
 				return $result;
 			}
-			else
-			{
+			else {
 				$this->error = $this->line->error;
 
 				$this->db->rollback();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog(get_class($this)."::updateline Erreur -2 Propal en mode incompatible pour cette action");
 			return -2;
 		}
@@ -960,14 +950,12 @@ class Propal extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -2;
 		}
@@ -1142,7 +1130,7 @@ class Propal extends CommonObject
                 				}
                 			}
                 		}
-                		else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+                		else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
                 		{
                 			$origin_id = $tmp_origin_id;
                 			$ret = $this->add_object_linked($origin, $origin_id);
@@ -1170,8 +1158,7 @@ class Propal extends CommonObject
                         {   // Convert into object this->lines[$i].
                             $line = (object) $this->lines[$i];
                         }
-                        else
-                        {
+                        else {
                             $line = $this->lines[$i];
                         }
 						// Reset fk_parent_line for line that are not child lines or special product
@@ -1268,15 +1255,13 @@ class Propal extends CommonObject
 							// End call triggers
 						}
 					}
-					else
-					{
+					else {
 						$this->error = $this->db->lasterror();
 						$error++;
 					}
 				}
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
@@ -1287,14 +1272,12 @@ class Propal extends CommonObject
 				dol_syslog(get_class($this)."::create done id=".$this->id);
 				return $this->id;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1375,8 +1358,7 @@ class Propal extends CommonObject
 
 			// TODO Change product price if multi-prices
 		}
-		else
-		{
+		else {
 		    $objsoc->fetch($object->socid);
 		}
 
@@ -1445,8 +1427,7 @@ class Propal extends CommonObject
 			$this->db->commit();
 			return $object->id;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1612,8 +1593,7 @@ class Propal extends CommonObject
 			$this->error = "Record Not Found";
 			return 0;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1708,8 +1688,7 @@ class Propal extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1838,8 +1817,7 @@ class Propal extends CommonObject
 
 			return $num;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -3;
 		}
@@ -1888,8 +1866,7 @@ class Propal extends CommonObject
 		{
 			$num = $this->getNextNumRef($soc);
 		}
-		else
-		{
+		else {
 			$num = $this->ref;
 		}
 		$this->newref = dol_sanitizeFileName($num);
@@ -1963,8 +1940,7 @@ class Propal extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -2027,8 +2003,7 @@ class Propal extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2089,8 +2064,7 @@ class Propal extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2151,8 +2125,7 @@ class Propal extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2214,8 +2187,7 @@ class Propal extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2225,8 +2197,7 @@ class Propal extends CommonObject
 				return -1 * $error;
 			}
 		}
-		else
-		{
+		else {
 			$error_str = 'Propal status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -2287,8 +2258,7 @@ class Propal extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2298,8 +2268,7 @@ class Propal extends CommonObject
 				return -1 * $error;
 			}
 		}
-		else
-		{
+		else {
 			$error_str = 'Propal status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -2356,8 +2325,7 @@ class Propal extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2367,8 +2335,7 @@ class Propal extends CommonObject
 				return -1 * $error;
 			}
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 	}
@@ -2426,8 +2393,7 @@ class Propal extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2494,8 +2460,7 @@ class Propal extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2562,8 +2527,7 @@ class Propal extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -2657,8 +2621,7 @@ class Propal extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->statut = $this->oldcopy->statut;
 				$this->date_cloture = $this->oldcopy->date_cloture;
 				$this->note_private = $this->oldcopy->note_private;
@@ -2667,8 +2630,7 @@ class Propal extends CommonObject
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -2718,8 +2680,7 @@ class Propal extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2785,8 +2746,7 @@ class Propal extends CommonObject
 		    $this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2857,8 +2817,7 @@ class Propal extends CommonObject
 					{
 						$ga[$obj->propalid] = $obj->ref.' ('.$obj->name.')';
 					}
-					else
-					{
+					else {
 						$ga[$i]['id'] = $obj->propalid;
 						$ga[$i]['ref'] 	= $obj->ref;
 						$ga[$i]['name'] = $obj->name;
@@ -2869,8 +2828,7 @@ class Propal extends CommonObject
 			}
 			return $ga;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -2912,8 +2870,7 @@ class Propal extends CommonObject
 					$linkedInvoices[] = $object;
 				}
 				// Cas des factures liees par un autre objet (ex: commande)
-				else
-				{
+				else {
 					$this->fetchObjectLinked($object, $objecttype);
 					foreach ($this->linkedObjectsIds as $subobjecttype => $subobjectid)
 					{
@@ -2965,8 +2922,7 @@ class Propal extends CommonObject
 				}
 				return $ga;
 			}
-			else
-			{
+			else {
 				return -1;
 			}
 		}
@@ -3068,29 +3024,25 @@ class Propal extends CommonObject
 						$this->db->commit();
 						return 1;
 					}
-					else
-					{
+					else {
 						$this->error = $this->db->lasterror();
 						$this->db->rollback();
 						return 0;
 					}
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -3;
 				}
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -3145,8 +3097,7 @@ class Propal extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -3156,8 +3107,7 @@ class Propal extends CommonObject
 				return -1 * $error;
 			}
 		}
-		else
-		{
+		else {
 			$error_str = 'Propal status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -3217,8 +3167,7 @@ class Propal extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -3228,8 +3177,7 @@ class Propal extends CommonObject
 				return -1 * $error;
 			}
 		}
-		else
-		{
+		else {
 			$error_str = 'Propal status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -3287,8 +3235,7 @@ class Propal extends CommonObject
 			}
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3424,8 +3371,7 @@ class Propal extends CommonObject
 
 			return $response;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -3504,8 +3450,7 @@ class Propal extends CommonObject
 				$line->total_tva = 10;
 				$line->remise_percent = 50;
 			}
-			else
-			{
+			else {
 				$line->total_ht = 100;
 				$line->total_ttc = 120;
 				$line->total_tva = 20;
@@ -3565,8 +3510,7 @@ class Propal extends CommonObject
 			$this->db->free($resql);
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -3617,15 +3561,13 @@ class Propal extends CommonObject
 			{
 				return $numref;
 			}
-			else
-			{
+			else {
 				$this->error = $obj->error;
 				//dol_print_error($db,"Propale::getNextNumRef ".$obj->error);
 				return "";
 			}
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Proposal"));
 			return "";
@@ -4029,13 +3971,11 @@ class PropaleLigne extends CommonObjectLine
 
 				return 1;
 			}
-			else
-			{
+			else {
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 	}
@@ -4085,8 +4025,7 @@ class PropaleLigne extends CommonObjectLine
 			{
 				return $result;
 			}
-			else
-			{
+			else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -4174,8 +4113,7 @@ class PropaleLigne extends CommonObjectLine
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -4228,8 +4166,7 @@ class PropaleLigne extends CommonObjectLine
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -4277,8 +4214,7 @@ class PropaleLigne extends CommonObjectLine
 			{
 				return $result;
 			}
-			else
-			{
+			else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -4356,8 +4292,7 @@ class PropaleLigne extends CommonObjectLine
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -4391,8 +4326,7 @@ class PropaleLigne extends CommonObjectLine
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index da86625b78f..ac6f500cce2 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -66,8 +66,7 @@ if (!$error)
 {
 	$object->fetch_thirdparty();
 }
-else
-{
+else {
 	header('Location: '.DOL_URL_ROOT.'/comm/propal/list.php');
 	exit;
 }
@@ -90,15 +89,13 @@ if ($action == 'addcontact' && $user->rights->propale->creer)
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -123,8 +120,7 @@ elseif ($action == 'deletecontact' && $user->rights->propale->creer)
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index d9d12c5efb4..f9d89ca981d 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -180,8 +180,7 @@ if ($object->id > 0)
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index a320d2b83b9..d456a507f19 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -164,8 +164,7 @@ if ($resql)
     print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
     print "</table></div><br>";
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
@@ -403,8 +402,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 			print "</div><br>";
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 76914e2c13a..9c31bd72bf7 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -415,8 +415,7 @@ if ($resql)
 		$title = $langs->trans('ListOfProposals').' - '.$soc->name;
 		if (empty($search_societe)) $search_societe = $soc->name;
 	}
-	else
-	{
+	else {
 		$title = $langs->trans('ListOfProposals');
 	}
 
@@ -1029,8 +1028,7 @@ if ($resql)
 				print '<td class="center">'.dol_print_date($db->jdate($obj->dfv), 'day');
 				print '</td>';
 			}
-			else
-			{
+			else {
 				print '<td>&nbsp;</td>';
 			}
 			if (!$i) $totalarray['nbfield']++;
@@ -1043,8 +1041,7 @@ if ($resql)
 				print '<td class="center">'.dol_print_date($db->jdate($obj->ddelivery), 'day');
 				print '</td>';
 			}
-			else
-			{
+			else {
 				print '<td>&nbsp;</td>';
 			}
 			if (!$i) $totalarray['nbfield']++;
@@ -1193,8 +1190,7 @@ if ($resql)
 				}
 				//else print $langs->trans("NoSalesRepresentativeAffected");
 			}
-			else
-			{
+			else {
 				print '&nbsp';
 			}
 			print '</td>';
@@ -1280,8 +1276,7 @@ if ($resql)
 
 	print $formfile->showdocuments('massfilesarea_proposals', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index add31f13f08..c4f92d36b6a 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -113,8 +113,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filenamenb = $dir.'/proposalsnbinyear-'.$user->id.'-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsnbinyear-'.$user->id.'-'.$year.'.png';
 }
-else
-{
+else {
     $filenamenb = $dir.'/proposalsnbinyear-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsnbinyear-'.$year.'.png';
 }
@@ -153,8 +152,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filenameamount = $dir.'/proposalsamountinyear-'.$user->id.'-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsamountinyear-'.$user->id.'-'.$year.'.png';
 }
-else
-{
+else {
     $filenameamount = $dir.'/proposalsamountinyear-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsamountinyear-'.$year.'.png';
 }
@@ -193,8 +191,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
 }
-else
-{
+else {
     $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index ff0beef4037..386e27f0ec3 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -224,8 +224,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 			print "</table><br>";
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php
index b3b852c591a..2edc331d71e 100644
--- a/htdocs/comm/prospect/recap-prospect.php
+++ b/htdocs/comm/prospect/recap-prospect.php
@@ -84,8 +84,7 @@ if ($socid > 0)
 
 	print $langs->trans("FeatureNotYetAvailable");
 }
-else
-{
+else {
   	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php
index 09f5e46f94b..170eb5b247a 100644
--- a/htdocs/comm/recap-client.php
+++ b/htdocs/comm/recap-client.php
@@ -84,8 +84,7 @@ if ($socid > 0)
 
 	print $langs->trans("FeatureNotYetAvailable");
 }
-else
-{
+else {
   	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index dc41845516a..a735cd07028 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -71,14 +71,12 @@ if (GETPOST('action', 'aZ09') == 'setremise')
     		header("Location: ".$backtopage);
     		exit;
 	    }
-	    else
-	    {
+	    else {
     		header("Location: remise.php?id=".$_GET["id"]);
     		exit;
 	    }
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -253,15 +251,13 @@ if ($socid > 0)
 	    			$i++;
 	    		}
 			}
-			else
-			{
+			else {
 			    print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 			$db->free($resql);
 			print "</table>";
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -312,15 +308,13 @@ if ($socid > 0)
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 			$db->free($resql);
 			print "</table>";
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index c312591aeec..62b38f9e390 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -106,8 +106,7 @@ if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes')
 			$newdiscount1->description = $discount->description;
 			$newdiscount2->description = $discount->description;
 		}
-		else
-		{
+		else {
 			$newdiscount1->description = $discount->description.' (1)';
 			$newdiscount2->description = $discount->description.' (2)';
 		}
@@ -151,8 +150,7 @@ if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes')
 			header("Location: ".$_SERVER["PHP_SELF"].'?id='.$id.($backtopage ? '&backtopage='.urlencode($backtopage) : '')); // To avoid pb whith back
 			exit;
 		}
-		else
-		{
+		else {
 			$db->rollback();
 		}
 	}
@@ -190,21 +188,18 @@ if ($action == 'setremise' && $user->rights->societe->creer)
 			        header("Location: ".$backtopage.'&discountid='.$discountid);
 			        exit;
 			    }
-				else
-				{
+				else {
 				    header("Location: remx.php?id=".$id);
 				    exit;
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				setEventMessages($soc->error, $soc->errors, 'errors');
 			}
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("ErrorFieldFormat", $langs->transnoentitiesnoconv("AmountHT")), null, 'errors');
 	}
 }
@@ -225,8 +220,7 @@ if (GETPOST('action', 'aZ09') == 'confirm_remove' && GETPOST("confirm") == 'yes'
 		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$id); // To avoid pb whith back
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($discount->error, $discount->errors, 'errors');
 		$db->rollback();
 	}
@@ -301,8 +295,7 @@ if ($socid > 0)
 			$remise_all += $obj->amount;
 			if ($obj->fk_user == $user->id) $remise_user += $obj->amount;
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -333,8 +326,7 @@ if ($socid > 0)
 			$remise_all += $obj->amount;
 			if ($obj->fk_user == $user->id) $remise_user += $obj->amount;
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -508,8 +500,7 @@ if ($socid > 0)
 	    				print preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $obj->description).' '.$facturestatic->getNomURl(1);
 	    				print '</td>';
 	    			}
-	    			else
-	    			{
+	    			else {
 	    				print '<td class="minwidth100">';
 	    				print $obj->description;
 	    				print '</td>';
@@ -547,8 +538,7 @@ if ($socid > 0)
 	    			$i++;
 	    		}
 			}
-			else
-			{
+			else {
 				$colspan = 8;
 				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
 			    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -570,8 +560,7 @@ if ($socid > 0)
 				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&remid='.$showconfirminfo['rowid'].($backtopage ? '&backtopage='.urlencode($backtopage) : ''), $langs->trans('SplitDiscount'), $langs->trans('ConfirmSplitDiscount', price($showconfirminfo['amount_ttc']), $langs->transnoentities("Currency".$conf->currency)), 'confirm_split', $formquestion, '', 0);
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -665,8 +654,7 @@ if ($socid > 0)
 						print preg_replace('/\(EXCESS PAID\)/', $langs->trans("ExcessPaid"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
 					}
-					else
-					{
+					else {
 						print '<td class="minwidth100">';
 						print $obj->description;
 						print '</td>';
@@ -704,8 +692,7 @@ if ($socid > 0)
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				$colspan = 8;
 				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
 				print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -727,8 +714,7 @@ if ($socid > 0)
 				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&remid='.$showconfirminfo['rowid'].($backtopage ? '&backtopage='.urlencode($backtopage) : ''), $langs->trans('SplitDiscount'), $langs->trans('ConfirmSplitDiscount', price($showconfirminfo['amount_ttc']), $langs->transnoentities("Currency".$conf->currency)), 'confirm_split', $formquestion, 0, 0);
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -876,8 +862,7 @@ if ($socid > 0)
 	    				print preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("Invoice"), $obj->description).' '.$facturestatic->getNomURl(1);
 	    				print '</td>';
 	    			}
-	    			else
-	    			{
+	    			else {
 	    				print '<td class="minwidth100">';
 	    				print $obj->description;
 	    				print '</td>';
@@ -907,8 +892,7 @@ if ($socid > 0)
 	    			$i++;
 	    		}
 			}
-			else
-			{
+			else {
 				$colspan = 8;
 				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
 			    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -917,8 +901,7 @@ if ($socid > 0)
 			print "</table>";
 			print '</div>';
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -1054,8 +1037,7 @@ if ($socid > 0)
 						print preg_replace('/\(EXCESS PAID\)/', $langs->trans("Invoice"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
 					}
-					else
-					{
+					else {
 						print '<td class="minwidth100">';
 						print $obj->description;
 						print '</td>';
@@ -1084,8 +1066,7 @@ if ($socid > 0)
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				$colspan = 8;
 				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
 				print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -1094,8 +1075,7 @@ if ($socid > 0)
 			print "</table>";
 			print '</div>';
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 4764b53a5c9..2dfb0b67c6e 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -155,8 +155,7 @@ if (empty($reshook))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		}
-		else
-		{
+		else {
 			if ($object->id > 0)
 			{
 				// Because createFromClone modifies the object, we must clone it so that we can restore it later
@@ -168,8 +167,7 @@ if (empty($reshook))
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit;
 				}
-				else
-				{
+				else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$object = $orig;
 					$action = '';
@@ -188,8 +186,7 @@ if (empty($reshook))
 			{
 				setEventMessages($langs->trans('OrderReopened', $object->ref), null);
 			}
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -204,8 +201,7 @@ if (empty($reshook))
 			header('Location: list.php?restore_lastsearch_values=1');
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -235,8 +231,7 @@ if (empty($reshook))
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -675,8 +670,7 @@ if (empty($reshook))
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 		}
-		else
-		{
+		else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
@@ -725,8 +719,7 @@ if (empty($reshook))
 				if ($res = $prodcomb->fetchByProductCombination2ValuePairs($idprod, $combinations)) {
 					$idprod = $res->fk_product_child;
 				}
-				else
-				{
+				else {
 					setEventMessages($langs->trans('ErrorProductCombinationNotFound'), null, 'errors');
 					$error++;
 				}
@@ -795,8 +788,7 @@ if (empty($reshook))
 							if (empty($tva_tx)) $tva_npr = 0;
 						}
 					}
-					else
-					{
+					else {
 						setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 					}
 				}
@@ -817,8 +809,7 @@ if (empty($reshook))
 							{
 								$pu_ht = $priceforthequantityarray['unitprice'];
 							}
-							else
-							{
+							else {
 								$pu_ttc = $priceforthequantityarray['unitprice'];
 							}
 							// Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST.
@@ -842,8 +833,7 @@ if (empty($reshook))
 							{
 								$pu_ht = $priceforthequantityarray['unitprice'];
 							}
-							else
-							{
+							else {
 								$pu_ttc = $priceforthequantityarray['unitprice'];
 							}
 							// Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST.
@@ -1167,8 +1157,7 @@ if (empty($reshook))
 		{
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
 		}
-		else
-		{
+		else {
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -1204,8 +1193,7 @@ if (empty($reshook))
 					$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
 			}
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -1220,8 +1208,7 @@ if (empty($reshook))
 		{
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
 		}
-		else
-		{
+		else {
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -1276,8 +1263,7 @@ if (empty($reshook))
 		{
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
 		}
-		else
-		{
+		else {
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -1584,8 +1570,7 @@ if ($action == 'create' && $usercancreate)
 			$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);
 		}
 	}
-	else
-	{
+	else {
 		$cond_reglement_id  = $soc->cond_reglement_id;
 		$mode_reglement_id  = $soc->mode_reglement_id;
 		$fk_account         = $soc->fk_account;
@@ -1623,8 +1608,7 @@ if ($action == 'create' && $usercancreate)
 	print '<tr><td>'.$langs->trans('RefCustomer').'</td><td>';
 	if (!empty($conf->global->MAIN_USE_PROPAL_REFCLIENT_FOR_ORDER) && !empty($origin) && !empty($originid))
 		print '<input type="text" name="ref_client" value="'.$ref_client.'"></td>';
-	else
-		print '<input type="text" name="ref_client" value="'.GETPOST('ref_client').'"></td>';
+	else print '<input type="text" name="ref_client" value="'.GETPOST('ref_client').'"></td>';
 	print '</tr>';
 
 	// Thirdparty
@@ -1958,8 +1942,7 @@ if ($action == 'create' && $usercancreate)
 			{
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
 			}
-			else
-			{
+			else {
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
@@ -1990,8 +1973,7 @@ if ($action == 'create' && $usercancreate)
 			{
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
 			}
-			else
-			{
+			else {
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
@@ -2032,8 +2014,7 @@ if ($action == 'create' && $usercancreate)
 			{
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
 			}
-			else
-			{
+			else {
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
@@ -2388,8 +2369,7 @@ if ($action == 'create' && $usercancreate)
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 			}
-			else
-			{
+			else {
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 			}
 			print '</td></tr>';
@@ -2561,8 +2541,7 @@ if ($action == 'create' && $usercancreate)
 					if ($object->statut > Commande::STATUS_DRAFT || !empty($conf->global->COMMANDE_SENDBYEMAIL_FOR_ALL_STATUS)) {
 						if ($usercansend) {
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-						} else
-							print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
+						} else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
 					}
 				}
 
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index ab0abb3d151..2ba223b3866 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -570,8 +570,7 @@ class Orders extends DolibarrApi
         {
             return $this->get($id);
         }
-        else
-        {
+        else {
         	throw new RestException(500, $this->commande->error);
         }
     }
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index b911a03e3ad..3f86ce9de5b 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -407,15 +407,13 @@ class Commande extends CommonOrder
 			{
 				return $numref;
 			}
-			else
-			{
+			else {
 				$this->error = $obj->error;
 				//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
 		}
-		else
-		{
+		else {
 			print $langs->trans("Error")." ".$langs->trans("Error_COMMANDE_ADDON_NotDefined");
 			return "";
 		}
@@ -469,8 +467,7 @@ class Commande extends CommonOrder
 		{
 			$num = $this->getNextNumRef($soc);
 		}
-		else
-		{
+		else {
 			$num = $this->ref;
 		}
 		$this->newref = dol_sanitizeFileName($num);
@@ -582,8 +579,7 @@ class Commande extends CommonOrder
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -669,8 +665,7 @@ class Commande extends CommonOrder
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -712,8 +707,7 @@ class Commande extends CommonOrder
 			if ($result < 0) $error++;
 			// End call triggers
 		}
-		else
-		{
+		else {
 			$error++;
 			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
@@ -727,8 +721,7 @@ class Commande extends CommonOrder
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::set_reopen ".$errmsg, LOG_ERR);
@@ -784,14 +777,12 @@ class Commande extends CommonOrder
 					$this->db->commit();
 					return 1;
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					return -1;
 				}
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror();
 
 				$this->db->rollback();
@@ -862,8 +853,7 @@ class Commande extends CommonOrder
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(get_class($this)."::cancel ".$errmsg, LOG_ERR);
@@ -873,8 +863,7 @@ class Commande extends CommonOrder
 				return -1 * $error;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -1101,7 +1090,7 @@ class Commande extends CommonOrder
 									}
 								}
 							}
-							else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+							else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
 							{
 								$origin_id = $tmp_origin_id;
 								$ret = $this->add_object_linked($origin, $origin_id);
@@ -1170,22 +1159,19 @@ class Commande extends CommonOrder
 						$this->db->commit();
 						return $this->id;
 					}
-					else
-					{
+					else {
 						$this->db->rollback();
 						return -1 * $error;
 					}
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -1;
 				}
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->db->rollback();
 			return -1;
@@ -1289,8 +1275,7 @@ class Commande extends CommonOrder
 			$this->db->commit();
 			return $this->id;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1505,8 +1490,7 @@ class Commande extends CommonOrder
 			{
 				$pu = $pu_ht;
 			}
-			else
-			{
+			else {
 				$pu = $pu_ttc;
 			}
 			$label = trim($label);
@@ -1666,22 +1650,19 @@ class Commande extends CommonOrder
 					$this->db->commit();
 					return $this->line->id;
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					return -1;
 				}
 			}
-			else
-			{
+			else {
 				$this->error = $this->line->error;
 				dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog(get_class($this)."::addline status of order must be Draft to allow use of ->addline()", LOG_ERR);
 			return -3;
 		}
@@ -1921,14 +1902,12 @@ class Commande extends CommonOrder
 				}
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = 'Order with id '.$id.' not found sql='.$sql;
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1993,21 +1972,18 @@ class Commande extends CommonOrder
 					$this->db->commit();
 					return 1;
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					return -1;
 				}
 			}
-			else
-			{
+			else {
 				$this->error = $line->error;
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -2;
 		}
@@ -2133,8 +2109,7 @@ class Commande extends CommonOrder
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -3;
 		}
@@ -2198,8 +2173,7 @@ class Commande extends CommonOrder
 			$this->db->free($resql);
 			return $nb;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -2245,8 +2219,7 @@ class Commande extends CommonOrder
 			$this->db->free($resql);
 			return $num;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -2363,35 +2336,30 @@ class Commande extends CommonOrder
 							$this->db->commit();
 							return 1;
 						}
-						else
-						{
+						else {
 							$this->db->rollback();
 							$this->error = $this->db->lasterror();
 							return -1;
 						}
 					}
-					else
-					{
+					else {
 						$this->db->rollback();
 						$this->error = $line->error;
 						return -1;
 					}
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					return 0;
 				}
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -1;
 		}
@@ -2451,8 +2419,7 @@ class Commande extends CommonOrder
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2519,8 +2486,7 @@ class Commande extends CommonOrder
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2582,8 +2548,7 @@ class Commande extends CommonOrder
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2593,8 +2558,7 @@ class Commande extends CommonOrder
 				return -1 * $error;
 			}
 		}
-		else
-		{
+		else {
 			return -2;
 		}
 	}
@@ -2648,8 +2612,7 @@ class Commande extends CommonOrder
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2659,8 +2622,7 @@ class Commande extends CommonOrder
 				return -1 * $error;
 			}
 		}
-		else
-		{
+		else {
 			return -2;
 		}
 	}
@@ -2722,8 +2684,7 @@ class Commande extends CommonOrder
 					{
 						$ga[$obj->cid] = $obj->ref.' ('.$obj->name.')';
 					}
-					else
-					{
+					else {
 						$ga[$i]['id'] = $obj->cid;
 						$ga[$i]['ref'] 	= $obj->ref;
 						$ga[$i]['name'] = $obj->name;
@@ -2733,8 +2694,7 @@ class Commande extends CommonOrder
 			}
 			return $ga;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -2789,8 +2749,7 @@ class Commande extends CommonOrder
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2800,8 +2759,7 @@ class Commande extends CommonOrder
 				return -1 * $error;
 			}
 		}
-		else
-		{
+		else {
 			$error_str = 'Command status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -2861,8 +2819,7 @@ class Commande extends CommonOrder
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2872,8 +2829,7 @@ class Commande extends CommonOrder
 				return -1 * $error;
 			}
 		}
-		else
-		{
+		else {
 			$error_str = 'order status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -2930,8 +2886,7 @@ class Commande extends CommonOrder
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2941,8 +2896,7 @@ class Commande extends CommonOrder
 				return -1 * $error;
 			}
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 	}
@@ -2985,8 +2939,7 @@ class Commande extends CommonOrder
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(get_class($this)."::classifyBilled ".$errmsg, LOG_ERR);
@@ -2996,8 +2949,7 @@ class Commande extends CommonOrder
 				return -1 * $error;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -3040,8 +2992,7 @@ class Commande extends CommonOrder
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(get_class($this)."::classifyUnBilled ".$errmsg, LOG_ERR);
@@ -3051,8 +3002,7 @@ class Commande extends CommonOrder
 				return -1 * $error;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -3161,8 +3111,7 @@ class Commande extends CommonOrder
 			{
 				$subprice = $pu_ttc;
 			}
-			else
-			{
+			else {
 				$subprice = $pu_ht;
 			}
 			$remise = 0;
@@ -3266,16 +3215,14 @@ class Commande extends CommonOrder
 				$this->db->commit();
 				return $result;
 			}
-			else
-			{
+			else {
 				$this->error = $this->line->error;
 
 				$this->db->rollback();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = get_class($this)."::updateline Order status makes operation forbidden";
 			$this->errors = array('OrderStatusMakeOperationForbidden');
 			return -2;
@@ -3370,8 +3317,7 @@ class Commande extends CommonOrder
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -3504,8 +3450,7 @@ class Commande extends CommonOrder
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			foreach ($this->errors as $errmsg)
 			{
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
@@ -3571,8 +3516,7 @@ class Commande extends CommonOrder
 
 			return $response;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -3820,8 +3764,7 @@ class Commande extends CommonOrder
 
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3896,8 +3839,7 @@ class Commande extends CommonOrder
 				$line->total_tva = 10;
 				$line->remise_percent = 50;
 			}
-			else
-			{
+			else {
 				$line->total_ht = 100;
 				$line->total_ttc = 120;
 				$line->total_tva = 20;
@@ -3956,8 +3898,7 @@ class Commande extends CommonOrder
 			$this->db->free($resql);
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -4209,8 +4150,7 @@ class OrderLine extends CommonOrderLine
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -4297,8 +4237,7 @@ class OrderLine extends CommonOrderLine
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -4344,8 +4283,7 @@ class OrderLine extends CommonOrderLine
 			{
 				return $result;
 			}
-			else
-			{
+			else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -4441,8 +4379,7 @@ class OrderLine extends CommonOrderLine
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -4490,8 +4427,7 @@ class OrderLine extends CommonOrderLine
 			{
 				return $result;
 			}
-			else
-			{
+			else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -4575,8 +4511,7 @@ class OrderLine extends CommonOrderLine
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -4616,8 +4551,7 @@ class OrderLine extends CommonOrderLine
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index 6b9e3ae039a..4fd050799dc 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -64,15 +64,13 @@ if ($action == 'addcontact' && $user->rights->commande->creer)
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -85,8 +83,7 @@ elseif ($action == 'swapstatut' && $user->rights->commande->creer)
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -207,8 +204,7 @@ if ($id > 0 || !empty($ref))
 		    if ($res) break;
 		}
 	}
-	else
-	{
+	else {
 		// Contact not found
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 1e445a602f7..020b1654ac9 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -185,8 +185,7 @@ if ($resql)
 
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 9d188cda104..516dcd56fc0 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -183,13 +183,11 @@ if ($id > 0 || !empty($ref))
 		$param = '&id='.$object->id.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity);
 		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
-else
-{
+else {
 	header('Location: index.php');
 	exit;
 }
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 13d67c942ed..53f6b20b4f6 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -174,8 +174,7 @@ if ($resql)
     print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
     print "</table></div><br>";
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
@@ -233,8 +232,7 @@ if (!empty($conf->commande->enabled))
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven"><td colspan="3">'.$langs->trans("NoOrder").'</td></tr>';
 		}
 		print "</table></div><br>";
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 3b83e04fe3c..088512d6fa2 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -396,8 +396,7 @@ if ($resql)
 		$title = $langs->trans('ListOfOrders').' - '.$soc->name;
 		if (empty($search_company)) $search_company = $soc->name;
 	}
-	else
-	{
+	else {
 		$title = $langs->trans('ListOfOrders');
 	}
 	if (strval($search_status) == '0')
@@ -542,8 +541,7 @@ if ($resql)
 			print $form->selectyesno('validate_invoices', 0, 1, 1);
 			print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
 		}
-		else
-		{
+		else {
 			print $form->selectyesno('validate_invoices', 0, 1);
 		}
 		if (!empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER)) print ' &nbsp; &nbsp; <span class="opacitymedium">'.$langs->trans("IfValidateInvoiceIsNoOrderStayUnbilled").'</span>';
@@ -1311,8 +1309,7 @@ if ($resql)
 
 	print $formfile->showdocuments('massfilesarea_orders', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index f230f7935a5..cae54d69bbd 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -84,8 +84,7 @@ if ($action == 'create')
 		$error++;
 		setEventMessages($langs->trans('Error_OrderNotChecked'), null, 'errors');
 	}
-	else
-	{
+	else {
 		$origin = GETPOST('origin');
 		$originid = GETPOST('originid');
 	}
@@ -210,8 +209,7 @@ if (($action == 'create' || $action == 'add') && !$error)
 							{
 								$db->commit();
 							}
-							else
-							{
+							else {
 								$db->rollback();
 							}
 						}
@@ -257,15 +255,13 @@ if (($action == 'create' || $action == 'add') && !$error)
 											$result = $object->insert_discount($discountid);
 											//$result=$discount->link_to_invoice($lineid,$id);
 										}
-										else
-										{
+										else {
 											setEventMessages($discount->error, $discount->errors, 'errors');
 											$error++;
 											break;
 										}
 									}
-									else
-									{
+									else {
 										// Positive line
 										$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 										// Date start
@@ -321,8 +317,7 @@ if (($action == 'create' || $action == 'add') && !$error)
 										{
 											$lineid = $result;
 										}
-										else
-										{
+										else {
 											$lineid = 0;
 											$error++;
 											break;
@@ -335,16 +330,14 @@ if (($action == 'create' || $action == 'add') && !$error)
 									}
 								}
 							}
-							else
-							{
+							else {
 								setEventMessages($objectsrc->error, $objectsrc->errors, 'errors');
 								$error++;
 							}
 							$ii++;
 						}
 					}
-					else
-					{
+					else {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
 					}
@@ -359,8 +352,7 @@ if (($action == 'create' || $action == 'add') && !$error)
 			header('Location: '.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$id);
 			exit;
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			$action = 'create';
 			$_GET["origin"] = $_POST["origin"];
@@ -730,8 +722,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
 
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 4e7ed481882..35f9f60020c 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -115,8 +115,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersnbinyear-'.$user->id.'-'.$year.'.png';
 }
-else
-{
+else {
     $filenamenb = $dir.'/ordersnbinyear-'.$year.'.png';
     if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$year.'.png';
     if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersnbinyear-'.$year.'.png';
@@ -158,8 +157,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersamountinyear-'.$user->id.'-'.$year.'.png';
 }
-else
-{
+else {
     $filenameamount = $dir.'/ordersamountinyear-'.$year.'.png';
     if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$year.'.png';
     if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersamountinyear-'.$year.'.png';
@@ -199,8 +197,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
 }
-else
-{
+else {
     $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 66ed09413ef..2d6695ff6cb 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -107,16 +107,14 @@ if ($action == 'add' && !empty($permissiontoadd))
 			header("Location: ".$urltogo);
 			exit;
 		}
-		else
-		{
+		else {
 			// Creation KO
 			if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else  setEventMessages($object->error, null, 'errors');
+			else setEventMessages($object->error, null, 'errors');
 			$action = 'create';
 		}
 	}
-	else
-	{
+	else {
 		$action = 'create';
 	}
 }
@@ -181,15 +179,13 @@ if ($action == 'update' && !empty($permissiontoadd))
 		{
 			$action = 'view';
 		}
-		else
-		{
+		else {
 			// Creation KO
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'edit';
 		}
 	}
-	else
-	{
+	else {
 		$action = 'edit';
 	}
 }
@@ -209,8 +205,7 @@ if ($action == "update_extras" && !empty($permissiontoadd))
 		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 		$action = 'view';
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit_extras';
 	}
@@ -233,8 +228,7 @@ if ($action == 'confirm_delete' && !empty($permissiontodelete))
 		header("Location: ".$backurlforlist);
 		exit;
 	}
-	else
-	{
+	else {
 		if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 		else setEventMessages($object->error, null, 'errors');
 	}
@@ -270,8 +264,7 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && !empty($permissionto
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -299,8 +292,7 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $permissiontoadd)
 			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -328,8 +320,7 @@ if ($action == 'confirm_close' && $confirm == 'yes' && $permissiontoadd)
 			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -342,8 +333,7 @@ if ($action == 'confirm_setdraft' && $confirm == 'yes' && $permissiontoadd)
 	{
 		// Nothing else done
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -371,8 +361,7 @@ if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd)
 			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -384,8 +373,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && !empty($permissiontoadd))
 	{
 		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 	}
-	else
-	{
+	else {
 	    $objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone or if createFromClone modifies the object. We use native clone to keep this->db valid.
 		//$objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
         // ...
@@ -398,8 +386,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && !empty($permissiontoadd))
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid); // Open record of new object
 			exit;
 		}
-		else
-		{
+		else {
 		    setEventMessages($objectutil->error, $objectutil->errors, 'errors');
 			$action = '';
 		}
diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php
index ce582040ac9..f4b5f1fbb4c 100644
--- a/htdocs/core/actions_builddoc.inc.php
+++ b/htdocs/core/actions_builddoc.inc.php
@@ -38,8 +38,7 @@ if ($action == 'builddoc' && $permissiontoadd)
     {
         $error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Model"));
     }
-    else
-    {
+    else {
    		// Reload to get all modified line records and be ready for hooks
         $ret = $object->fetch($id);
         $ret = $object->fetch_thirdparty();
@@ -90,8 +89,7 @@ if ($action == 'builddoc' && $permissiontoadd)
             setEventMessages($object->error, $object->errors, 'errors');
             $action = '';
         }
-        else
-        {
+        else {
         	if (empty($donotredirect))	// This is set when include is done by bulk action "Bill Orders"
         	{
 	            setEventMessages($langs->trans("FileGenerated"), null);
diff --git a/htdocs/core/actions_comments.inc.php b/htdocs/core/actions_comments.inc.php
index 07829999c10..3d18c2d7c24 100644
--- a/htdocs/core/actions_comments.inc.php
+++ b/htdocs/core/actions_comments.inc.php
@@ -50,8 +50,7 @@ if ($action == 'addcomment')
 			header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1' : ''));
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($comment->error, $comment->errors, 'errors');
 			$action = '';
 		}
@@ -68,8 +67,7 @@ if ($action === 'updatecomment')
             header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1#comment' : ''));
             exit;
         }
-        else
-        {
+        else {
             setEventMessages($comment->error, $comment->errors, 'errors');
             $action = '';
         }
@@ -85,8 +83,7 @@ if ($action == 'deletecomment')
 			header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1' : ''));
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($comment->error, $comment->errors, 'errors');
 			$action = '';
 		}
diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index bb5a7516fb2..5a044d7a464 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -123,8 +123,7 @@ if ($action == 'add')
 	    					$action = 'create';
 	    				}
 	    			}
-	    			else
-	    			{
+	    			else {
 	    				$error++;
 	    				$langs->load("errors");
 	    				$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
@@ -150,8 +149,7 @@ if ($action == 'add')
     					$params['options'] = array($parameters=>null);
     				}
     			}
-    			else
-    			{
+    			else {
     				//Esle it's separated key/value and coma list
     				foreach ($parameters_array as $param_ligne)
     				{
@@ -192,15 +190,13 @@ if ($action == 'add')
     				header("Location: ".$_SERVER["PHP_SELF"]);
     				exit;
     			}
-    			else
-    			{
+    			else {
                     $error++;
     			    $mesg = $extrafields->error;
                     setEventMessages($mesg, null, 'errors');
     			}
     		}
-    		else
-    		{
+    		else {
                 $error++;
     		    $langs->load("errors");
     			$mesg = $langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters", $langs->transnoentities("AttributeCode"));
@@ -208,8 +204,7 @@ if ($action == 'add')
     			$action = 'create';
     		}
 	    }
-	    else
-	    {
+	    else {
 	    	setEventMessages($mesg, null, 'errors');
 	    }
 	}
@@ -294,8 +289,7 @@ if ($action == 'update')
 	        				$action = 'edit';
 	        			}
 	        		}
-	        		else
-	        		{
+	        		else {
 	        			$error++;
 	        			$langs->load("errors");
 	        			$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
@@ -320,8 +314,7 @@ if ($action == 'update')
     					$params['options'] = array($parameters=>null);
     				}
     			}
-    			else
-    			{
+    			else {
     				//Esle it's separated key/value and coma list
     				foreach ($parameters_array as $param_ligne)
     				{
@@ -362,23 +355,20 @@ if ($action == 'update')
     				header("Location: ".$_SERVER["PHP_SELF"]);
     				exit;
     			}
-    			else
-    			{
+    			else {
                     $error++;
     			    $mesg = $extrafields->error;
     			    setEventMessages($mesg, null, 'errors');
     			}
     		}
-    		else
-    		{
+    		else {
     		    $error++;
     			$langs->load("errors");
     			$mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode"));
     			setEventMessages($mesg, null, 'errors');
     		}
 	    }
-	    else
-	    {
+	    else {
 	    	setEventMessages($mesg, null, 'errors');
 	    }
 	}
@@ -397,8 +387,7 @@ if ($action == 'delete')
         }
         else $mesg = $extrafields->error;
 	}
-	else
-	{
+	else {
 	    $error++;
 		$langs->load("errors");
 		$mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode"));
diff --git a/htdocs/core/actions_fetchobject.inc.php b/htdocs/core/actions_fetchobject.inc.php
index 268d37d92d2..6da2b0e674e 100644
--- a/htdocs/core/actions_fetchobject.inc.php
+++ b/htdocs/core/actions_fetchobject.inc.php
@@ -38,8 +38,7 @@ if (($id > 0 || (!empty($ref) && !in_array($action, array('create', 'createtask'
 	        $object->fetch_thirdparty();
 	        $id = $object->id;
 	    }
-	    else
-	    {
+	    else {
 	    	if (empty($object->error) && !count($object->errors))
 	    	{
 	    		if ($ret < 0)	// if $ret == 0, it means not found.
diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index 2542cf23268..aeb86f9c609 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -87,7 +87,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
         // For a delete from the ECM module, upload_dir is ECM root dir and urlfile contains relative path from upload_dir
         $file = $upload_dir.(preg_match('/\/$/', $upload_dir) ? '' : '/').$urlfile;
     }
-    else								// For a delete from the file manager into another module, or from documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
+    else // For a delete from the file manager into another module, or from documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
 	{
        	$urlfile = basename($urlfile);
        	$file = $upload_dir.(preg_match('/\/$/', $upload_dir) ? '' : '/').$urlfile;
@@ -149,8 +149,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
         	header('Location: '.$backtopage);
             exit;
         }
-        else
-        {
+        else {
         	$tmpurl = $_SERVER["PHP_SELF"].'?id='.$object->id.(GETPOST('section_dir', 'alpha') ? '&section_dir='.urlencode(GETPOST('section_dir', 'alpha')) : '').(!empty($withproject) ? '&withproject=1' : '');
         	header('Location: '.$tmpurl);
             exit;
@@ -177,8 +176,7 @@ elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('
             setEventMessages($langs->trans("ErrorFailedToUpdateLink", $link->label), null, 'mesgs');
         }
     }
-    else
-    {
+    else {
         //error fetching
     }
 }
@@ -236,14 +234,12 @@ elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha'))
 
 			                setEventMessages($langs->trans("FileRenamed"), null);
 			            }
-			            else
-			            {
+			            else {
 			                $langs->load("errors"); // key must be loaded because we can't rely on loading during output, we need var substitution to be done now.
 			                setEventMessages($langs->trans("ErrorFailToRenameFile", $filenamefrom, $filenameto), null, 'errors');
 			            }
 	            	}
-	            	else
-	            	{
+	            	else {
 	            		$langs->load("errors"); // key must be loaded because we can't rely on loading during output, we need var substitution to be done now.
 	            		setEventMessages($langs->trans("ErrorDestinationAlreadyExists", $filenameto), null, 'errors');
 	            	}
@@ -270,8 +266,7 @@ elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha'))
 		    		$ecmfile->share = getRandomPassword(true);
 		    	}
 		    }
-		    else
-		    {
+		    else {
 		    	$ecmfile->share = '';
 		    }
 		    $result = $ecmfile->update($user);
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index ebae28e9582..41660a47815 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -284,8 +284,7 @@ if (!$error && $massaction == 'confirm_presend')
 							$sendto = implode(',', $emails_to_sends);
 						}
 					}
-					else
-					{
+					else {
 						$objectobj->fetch_thirdparty();
 						$sendto = $objectobj->thirdparty->email;
 					}
@@ -337,8 +336,7 @@ if (!$error && $massaction == 'confirm_presend')
 							'mimes'=>array($mime)
 						);
 					}
-					else
-					{
+					else {
 							$nbignored++;
 							$langs->load("errors");
 							$resaction .= '<div class="error">'.$langs->trans('ErrorCantReadFile', $file).'</div><br>';
@@ -413,8 +411,7 @@ if (!$error && $massaction == 'confirm_presend')
 					    $looparray[$key]->thirdparty = $thirdparty; // Force thirdparty on object
 					}
 				}
-				else
-				{
+				else {
 					$objectforloop = new $objectclass($db);
 					$objectforloop->thirdparty = $thirdparty; // Force thirdparty on object (even if object was not loaded)
 					$looparray[0] = $objectforloop;
@@ -482,8 +479,7 @@ if (!$error && $massaction == 'confirm_presend')
 					    if ($objecttmp->element == 'expensereport') $trackid = 'use'.$thirdparty->id;
 					    if ($objecttmp->element == 'holiday') $trackid = 'use'.$thirdparty->id;
 					}
-					else
-					{
+					else {
 					    $trackid = strtolower(get_class($objecttmp));
 					    if (get_class($objecttmp) == 'Contrat')  $trackid = 'con';
 					    if (get_class($objecttmp) == 'Propal')   $trackid = 'pro';
@@ -508,8 +504,7 @@ if (!$error && $massaction == 'confirm_presend')
 					{
 						$resaction .= '<div class="error">'.$mailfile->error.'</div>';
 					}
-					else
-					{
+					else {
 						$result = $mailfile->sendfile();
 						if ($result)
 						{
@@ -575,16 +570,14 @@ if (!$error && $massaction == 'confirm_presend')
 								$nbsent++; // Nb of object sent
 							}
 						}
-						else
-						{
+						else {
 							$langs->load("other");
 							if ($mailfile->error)
 							{
 								$resaction .= $langs->trans('ErrorFailedToSendMail', $from, $sendto);
 								$resaction .= '<br><div class="error">'.$mailfile->error.'</div>';
 							}
-							else
-							{
+							else {
 								$resaction .= '<div class="warning">No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS</div>';
 							}
 						}
@@ -606,8 +599,7 @@ if (!$error && $massaction == 'confirm_presend')
 			setEventMessages($langs->trans("EMailSentForNElements", $nbsent.'/'.count($toselect)), null, 'mesgs');
 			setEventMessages($resaction, null, 'mesgs');
 		}
-		else
-		{
+		else {
 			//setEventMessages($langs->trans("EMailSentToNRecipients", 0), null, 'warnings');  // May be object has no generated PDF file
 			setEventMessages($resaction, null, 'warnings');
 		}
@@ -723,15 +715,13 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 							$result = $objecttmp->insert_discount($discountid);
 							//$result=$discount->link_to_invoice($lineid,$id);
 						}
-						else
-						{
+						else {
 							setEventMessages($discount->error, $discount->errors, 'errors');
 							$error++;
 							break;
 						}
 					}
-					else
-					{
+					else {
 						// Positive line
 						$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 						// Date start
@@ -790,8 +780,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 						{
 							$lineid = $result;
 						}
-						else
-						{
+						else {
 							$lineid = 0;
 							$error++;
 							break;
@@ -882,8 +871,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 		header("Location: ".$_SERVER['PHP_SELF'].'?'.$param);
 		exit;
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		$action = 'create';
 		$_GET["origin"] = $_POST["origin"];
@@ -914,8 +902,7 @@ if (!$error && $massaction == 'cancelorders')
 			$error++;
 			break;
 		}
-		else
-			$result = $cmd->cancel();
+		else $result = $cmd->cancel();
 
 		if ($result < 0)
 		{
@@ -923,19 +910,16 @@ if (!$error && $massaction == 'cancelorders')
 			$error++;
 			break;
 		}
-		else
-			$nbok++;
+		else $nbok++;
 	}
 	if (!$error)
 	{
 		if ($nbok > 1)
 			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-		else
-			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 		$db->commit();
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 }
@@ -1037,8 +1021,7 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 			$langs->load("exports");
 			setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
 		}
 	}
@@ -1100,8 +1083,7 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 			$langs->load("exports");
 			setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
 		}
-		else
-		{
+		else {
             setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
 		}
 	}
@@ -1166,8 +1148,7 @@ if (!$error && $massaction == 'validate' && $permissiontoadd)
 				}
 				else $nbok++;
 			}
-			else
-			{
+			else {
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 				$error++;
 				break;
@@ -1180,8 +1161,7 @@ if (!$error && $massaction == 'validate' && $permissiontoadd)
 			else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 		}
 		//var_dump($listofobjectthirdparties);exit;
@@ -1202,8 +1182,7 @@ if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permissio
                 setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
                 $error++;
                 break;
-            } else
-                $nbok++;
+            } else $nbok++;
         }
         else {
             setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
@@ -1215,8 +1194,7 @@ if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permissio
     if (!$error) {
         if ($nbok > 1)
             setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-        else
-            setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+        else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
         $db->commit();
     }
     else {
@@ -1269,8 +1247,7 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 			}
 			else $nbok++;
 		}
-		else
-		{
+		else {
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 			$error++;
 			break;
@@ -1283,8 +1260,7 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 		else setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
 		$db->commit();
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 	//var_dump($listofobjectthirdparties);exit;
@@ -1331,8 +1307,7 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread)
             }
             else $nbok++;
         }
-        else
-        {
+        else {
             setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
             $error++;
             break;
@@ -1345,8 +1320,7 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread)
         else setEventMessages($langs->trans("RecordGenerated", $nbok), null, 'mesgs');
         $db->commit();
     }
-    else
-    {
+    else {
         $db->rollback();
     }
 }
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index e23d2ce01a9..df461e47a95 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -420,8 +420,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
 				$action = 'presend';
 			}
-			else
-			{
+			else {
 				$result = $mailfile->sendfile();
 				if ($result)
 				{
@@ -480,8 +479,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 		  			header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname ? $paramname : 'id').'='.(is_object($object) ? $object->id : '').$moreparam);
 			  		exit;
 				}
-				else
-				{
+				else {
 					$langs->load("other");
 					$mesg = '<div class="error">';
 					if ($mailfile->error)
@@ -489,8 +487,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 						$mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto));
 						$mesg .= '<br>'.$mailfile->error;
 					}
-					else
-					{
+					else {
 						$mesg .= 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 					}
 					$mesg .= '</div>';
@@ -500,16 +497,14 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				}
 			}
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("MailTo")), null, 'warnings');
 			dol_syslog('Try to send email with no recipient defined', LOG_WARNING);
 			$action = 'presend';
 		}
 	}
-	else
-	{
+	else {
 		$langs->load("other");
 		setEventMessages($langs->trans('ErrorFailedToReadObject', $object->element), null, 'errors');
 		dol_syslog('Failed to read data of object id='.$object->id.' element='.$object->element);
diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
index 313375d1aa1..ea407375e12 100644
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -51,8 +51,7 @@ if ($action == 'update' && is_array($arrayofparameters))
 		$db->commit();
 		if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
 	}
@@ -96,8 +95,7 @@ if ($action == 'setModuleOptions')
                 unset($listofdir[$key]); continue;
             }
             if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-            else
-            {
+            else {
                 $upload_dir = $tmpdir;
             }
         }
@@ -113,8 +111,7 @@ if ($action == 'setModuleOptions')
         $db->commit();
         if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         $db->rollback();
         if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
     }
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index bb6a8de30d4..d5cf3ae1b48 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -69,7 +69,7 @@ if (!isset($mode) || $mode != 'noajax')    // For ajax call
         //exit;
     }
 }
-else    // For no ajax call
+else // For no ajax call
 {
 	$rootdirfordoc = $conf->ecm->dir_output;
 
@@ -234,8 +234,7 @@ if ($type == 'directory')
         $formfile->list_of_autoecmfiles($upload_dir, $filearray, $module, $param, 1, '', $perm, 1, $textifempty, $maxlengthname, $url, 1);
     }
     // Manual list
-    else
-    {
+    else {
     	if ($module == 'medias')
     	{
     		/*
@@ -260,8 +259,7 @@ if ($type == 'directory')
 	    		//if (!preg_match('/backtopage=/',$param)) $param.='&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid);
 	    	}
     	}
-    	else
-    	{
+    	else {
         	$relativepath = $ecmdir->getRelativePath();
         	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
     	}
@@ -271,8 +269,7 @@ if ($type == 'directory')
         {
             $filearray = array();
         }
-        else
-        {
+        else {
         	$filearray = dol_dir_list($upload_dir, "files", 0, '', array('^\.', '(\.meta|_preview.*\.png)$', '^temp$', '^CVS$'), $sortfield, $sorting, 1);
         }
 
@@ -321,8 +318,7 @@ if ($type == 'directory')
             $modulepart = 'ecm';
             $title = ''; // Use default
         }
-        else
-        {
+        else {
             $useinecm = 5;
             $modulepart = 'ecm';
             $perm = $user->rights->ecm->upload;
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index 3e54532668a..f5ac3e2e422 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -50,7 +50,7 @@ if (!isset($mode) || $mode != 'noajax')    // For ajax call
 
 	if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/', '', $selecteddir); // We removed last '/' except if it is '/'
 }
-else    // For no ajax call
+else // For no ajax call
 {
 	//if (GETPOST('preopened')) { $_GET['dir'] = $_POST['dir'] = GETPOST('preopened'); }
 
diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index d8f4985f6d8..674dab95842 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -61,8 +61,7 @@ if ($time >= $_SESSION['auto_check_events_not_before'])
             $starttime = $time;
         }
     }
-    else
-    {
+    else {
         $starttime = $time;
     }
 
@@ -110,8 +109,7 @@ if ($time >= $_SESSION['auto_check_events_not_before'])
             $eventfound[] = $event;
         }
     }
-    else
-    {
+    else {
         dol_syslog("Error sql = ".$db->lasterror(), LOG_ERR);
     }
 }
diff --git a/htdocs/core/ajax/loadinplace.php b/htdocs/core/ajax/loadinplace.php
index 14258e1ebb1..742e22a5a9f 100644
--- a/htdocs/core/ajax/loadinplace.php
+++ b/htdocs/core/ajax/loadinplace.php
@@ -100,15 +100,13 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 				if ($ret > 0) echo json_encode($object->$cachename);
 			}
 		}
-		else
-		{
+		else {
 			$object = new GenericObject($db);
 			$value = $object->$loadmethod($table_element, $fk_element, $field);
 			echo $value;
 		}
 	}
-	else
-	{
+	else {
 		echo $langs->transnoentities('NotEnoughPermissions');
 	}
 }
diff --git a/htdocs/core/ajax/saveinplace.php b/htdocs/core/ajax/saveinplace.php
index 0eb0545a9ea..4c5e472d878 100644
--- a/htdocs/core/ajax/saveinplace.php
+++ b/htdocs/core/ajax/saveinplace.php
@@ -158,14 +158,12 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 						$view = $loadview[$newvalue];
 					}
 				}
-				else
-				{
+				else {
 					$error++;
 					$return['error'] = $form->error;
 				}
 			}
-			else
-			{
+			else {
 				$module = $subelement = $ext_element;
 				if (preg_match('/^([^_]+)_([^_]+)/i', $ext_element, $regs))
 				{
@@ -188,8 +186,7 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 						$view = $loadview[$newvalue];
 					}
 				}
-				else
-				{
+				else {
 					$error++;
 					$return['error'] = $object->error;
 				}
@@ -216,16 +213,14 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 				$return['value'] = $value;
 				$return['view'] = (!empty($view) ? $view : $value);
 			}
-			else
-			{
+			else {
 				$return['error'] = $object->error;
 			}
 		}
 
 		echo json_encode($return);
 	}
-	else
-	{
+	else {
 		echo $langs->trans('NotEnoughPermissions');
 	}
 }
diff --git a/htdocs/core/ajax/vatrates.php b/htdocs/core/ajax/vatrates.php
index 9edcad9f4fa..92dd41fd64e 100644
--- a/htdocs/core/ajax/vatrates.php
+++ b/htdocs/core/ajax/vatrates.php
@@ -53,8 +53,7 @@ if (!empty($id) && !empty($action) && !empty($htmlname))
 		$seller = $mysoc;
 		$buyer = $soc;
 	}
-	else
-	{
+	else {
 		$buyer = $mysoc;
 		$seller = $soc;
 	}
diff --git a/htdocs/core/ajax/ziptown.php b/htdocs/core/ajax/ziptown.php
index 850d25bae47..6c04318bd7f 100644
--- a/htdocs/core/ajax/ziptown.php
+++ b/htdocs/core/ajax/ziptown.php
@@ -76,7 +76,7 @@ if (!empty($_GET['zipcode']) || !empty($_GET['town']))
 		$sql .= " ORDER BY z.zip, z.town";
 		$sql .= $db->plimit(100); // Avoid pb with bad criteria
 	}
-	else                                               // Use table of third parties
+	else // Use table of third parties
 	{
 		$sql = "SELECT DISTINCT s.zip, s.town, s.fk_departement as fk_county, s.fk_pays as fk_country";
 		$sql .= ", c.code as country_code, c.label as country";
@@ -129,8 +129,7 @@ if (!empty($_GET['zipcode']) || !empty($_GET['town']))
 
 	echo json_encode($return_arr);
 }
-else
-{
+else {
 }
 
 $db->close();
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index 448e7d915c9..9c4fafd0bbd 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -245,8 +245,7 @@ class box_actions extends ModeleBoxes
 				}
 				$out .= '</script>';
 			}
-			else
-			{
+			else {
 				$out .= '<script>';
 				$out .= '$("#dialogboxaction").dialog({ autoOpen: false });';
 				$out .= '</script>';
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 8fc7b8766e4..29b249ce2c4 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -142,8 +142,7 @@ class box_activity extends ModeleBoxes
         			dol_print_error($this->db);
         		}
         	}
-        	else
-        	{
+        	else {
         		$data = dol_readcachefile($cachedir, $filename);
         	}
 
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index f5bbf7021e9..5b3b81f7865 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -80,8 +80,7 @@ class box_bookmarks extends ModeleBoxes
 			$this->info_box_head['subpicto'] = 'bookmark';
 			$this->info_box_head['subtext'] = $langs->trans("BookmarksManagement");
 		}
-		else
-		{
+		else {
 			$this->info_box_head['subpicto'] = 'bookmark';
 			$this->info_box_head['subtext'] = $langs->trans("ListOfBookmark");
 		}
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index 93ac43d6c22..f4220377d77 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -104,8 +104,7 @@ class box_external_rss extends ModeleBoxes
             $title .= " ".img_error($langs->trans("FailedToRefreshDataInfoNotUpToDate", ($rssparser->getLastFetchDate() ?dol_print_date($rssparser->getLastFetchDate(), "dayhourtext") : $langs->trans("Unknown"))));
             $this->info_box_head = array('text' => $title, 'limit' => 0);
         }
-        else
-        {
+        else {
             $this->info_box_head = array(
                 'text' => $title,
                 'sublink' => $link,
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index a374094ea89..581baddd7b5 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -187,8 +187,7 @@ class box_factures_imp extends ModeleBoxes
 
 				$this->db->free($result);
 			}
-			else
-			{
+			else {
                 $this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index 4125ce92eaa..365a9ff8b48 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -152,8 +152,7 @@ class box_ficheinter extends ModeleBoxes
 
 				$this->db->free($resql);
 			}
-			else
-			{
+			else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
@@ -161,8 +160,7 @@ class box_ficheinter extends ModeleBoxes
                 );
 			}
 		}
-		else
-		{
+		else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
 			    'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index e78b6e235b1..6f3005262a8 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -112,8 +112,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			}
-			else
-			{
+			else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 				$endyear = $tmparray['year'];
 				$shownb = $tmparray['shownb'];
@@ -154,8 +153,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						}
-						else
-						{
+						else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -201,8 +199,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						}
-						else
-						{
+						else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -271,8 +268,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 				}
 				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover center"', 'textnoformat'=>$stringtoshow);
 			}
-			else
-			{
+			else {
 				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover left"', 'maxlength'=>500, 'text' => $mesg);
 			}
 		}
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index 52dcdc995cd..44c8831ddfe 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -109,8 +109,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			}
-			else
-			{
+			else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 				$endyear = $tmparray['year'];
 				$shownb = $tmparray['shownb'];
@@ -152,8 +151,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						}
-						else
-						{
+						else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -198,8 +196,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						}
-						else
-						{
+						else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -268,8 +265,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				}
 				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover center"', 'textnoformat'=>$stringtoshow);
 			}
-			else
-			{
+			else {
 				$this->info_box_contents[0][0] = array(
                     'tr'=>'class="oddeven nohover"',
                     'td' => 'class="nohover left"',
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index 45459805f00..ecc80696534 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -112,8 +112,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			}
-			else
-			{
+			else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 				$endyear = $tmparray['year'];
 				$shownb = $tmparray['shownb'];
@@ -153,8 +152,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						}
-						else
-						{
+						else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -197,8 +195,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						}
-						else
-						{
+						else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -271,8 +268,7 @@ class box_graph_orders_permonth extends ModeleBoxes
                     'textnoformat'=>$stringtoshow,
                 );
 			}
-			else
-			{
+			else {
 				$this->info_box_contents[0][0] = array(
                     'tr'=>'class="oddeven nohover"',
                     'td' => 'class="nohover left"',
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index 99426be8cb1..845f93b9edf 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -111,8 +111,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			}
-			else
-			{
+			else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 				$endyear = $tmparray['year'];
 				$shownb = $tmparray['shownb'];
@@ -152,8 +151,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						}
-						else
-						{
+						else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -196,8 +194,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						}
-						else
-						{
+						else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -270,8 +267,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
                     'textnoformat'=>$stringtoshow,
                 );
 			}
-			else
-			{
+			else {
 				$this->info_box_contents[0][0] = array(
                     'tr'=>'class="oddeven nohover"',
                     'td' => 'class="nohover left"',
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index e8337d74303..9e9c81ab8b9 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -95,8 +95,7 @@ class box_graph_product_distribution extends ModeleBoxes
 			$showpropalnb = GETPOST($param_showpropalnb, 'alpha');
 			$showordernb = GETPOST($param_showordernb, 'alpha');
 		}
-		else
-		{
+		else {
 			$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 			$year = $tmparray['year'];
 			$showinvoicenb = $tmparray['showinvoicenb'];
@@ -394,8 +393,7 @@ class box_graph_product_distribution extends ModeleBoxes
                 'textnoformat'=>$stringtoshow,
             );
 		}
-		else
-		{
+		else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
 				'maxlength'=>500,
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index 42b95e516b5..4d5e8be37b8 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -112,8 +112,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			}
-			else
-			{
+			else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 				$endyear = $tmparray['year'];
 				$shownb = $tmparray['shownb'];
@@ -151,8 +150,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						}
-						else
-						{
+						else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -197,8 +195,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 						{
                             $legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						}
-						else
-						{
+						else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -271,8 +268,7 @@ class box_graph_propales_permonth extends ModeleBoxes
                     'textnoformat'=>$stringtoshow,
                 );
 			}
-			else
-			{
+			else {
 				$this->info_box_contents[0][0] = array(
                     'tr'=>'class="oddeven nohover"',
                     'td' => 'class="nohover left"',
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 374e9ab1bae..58e6aa70157 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -160,8 +160,7 @@ class box_produits extends ModeleBoxes
 							{
 								$price_base_type = $langs->trans("HT");
 							}
-							else
-							{
+							else {
 								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
 								$price_base_type = $langs->trans("TTC");
 							}
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index f4a433c013d..48cd8c0d893 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -169,8 +169,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 							{
 								$price_base_type = $langs->trans("HT");
 							}
-							else
-							{
+							else {
 								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
 								$price_base_type = $langs->trans("TTC");
 							}
@@ -216,8 +215,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 
 				$this->db->free($result);
 			}
-			else
-			{
+			else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index c99f07ff311..e8b056322da 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -146,8 +146,7 @@ class box_project extends ModeleBoxes
                                 'td' => 'class="right"',
                                 'text' => round($objTask->totprogress / $objTask->nb, 0)."%",
                             );
-                        else
-                            $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
+                        else $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
                         $totalnbTask += $objTask->nb;
                     } else {
                         $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => round(0));
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index 7167097672b..0b5044cf5f6 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -187,8 +187,7 @@ class box_services_contracts extends ModeleBoxes
 
 						$s = $form->textwithtooltip($text, $description, 3, '', '', $cursorline, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
 					}
-					else
-					{
+					else {
 						$s = img_object($langs->trans("ShowProductOrService"), ($objp->product_type ? 'service' : 'product')).' '.dol_htmlentitiesbr($objp->description);
 					}
 
@@ -230,8 +229,7 @@ class box_services_contracts extends ModeleBoxes
 
 				$this->db->free($result);
 			}
-			else
-			{
+			else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength' => 500,
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index 94b4764eeae..ba7eed039e3 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -171,8 +171,7 @@ class box_services_expired extends ModeleBoxes
 
 				$this->db->free($resql);
     		}
-    		else
-    		{
+    		else {
     			$this->info_box_contents[0][] = array(
                     'td' => '',
                     'maxlength'=>500,
@@ -180,8 +179,7 @@ class box_services_expired extends ModeleBoxes
                 );
     		}
     	}
-    	else
-    	{
+    	else {
     		$this->info_box_contents[0][0] = array(
     		    'td' => 'class="nohover opacitymedium left"',
     		    'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index c019062313c..14facd65886 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -168,8 +168,7 @@ class box_supplier_orders extends ModeleBoxes
                 );
             }
         }
-        else
-        {
+        else {
             $this->info_box_contents[0][] = array(
                 'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
index f70f5bef450..c1a31616f56 100644
--- a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
+++ b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
@@ -175,8 +175,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
                 );
             }
         }
-        else
-        {
+        else {
             $this->info_box_contents[0][] = array(
                 'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 01fbcdef47b..1ed28d34a7f 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -162,13 +162,11 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 				$this->fk_user = $obj->fk_user;
 				return 1;
 			}
-			else
-			{
+			else {
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 	}
@@ -439,8 +437,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateWidget", $modName, "").'</div>';
 						}
-						else
-						{
+						else {
 							try {
 								include_once $newdir.'/'.$file;
 							}
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 5c7251c40e2..cd0bc4f5e47 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -216,8 +216,7 @@ class CMailFile
 			$this->msgishtml = 0;
 			if (dol_textishtml($msg)) $this->msgishtml = 1;
 		}
-		else
-		{
+		else {
 			$this->msgishtml = $msgishtml;
 		}
 
@@ -500,8 +499,7 @@ class CMailFile
 			//if (! empty($errors_to)) $this->message->setErrorsTo($this->getArrayAddress($errors_to);
 			if (isset($deliveryreceipt) && $deliveryreceipt == 1) $this->message->setReadReceiptTo($this->getArrayAddress($from));
 		}
-		else
-		{
+		else {
 			// Send mail method not correctly defined
 			// --------------------------------------
 			$this->error = 'Bad value for sendmode';
@@ -708,8 +706,7 @@ class CMailFile
 						$this->error .= $langs->trans("ErrorPhpMailDelivery");
 						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					}
-					else
-					{
+					else {
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 					}
 				}
@@ -795,8 +792,7 @@ class CMailFile
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 						$res = true;
 					}
-					else
-					{
+					else {
 						if (empty($this->error)) $this->error = $result;
 						dol_syslog("CMailFile::sendfile: mail end error with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>".$this->error, LOG_ERR);
 						$res = false;
@@ -861,13 +857,11 @@ class CMailFile
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res = false;
 				}
-				else
-				{
+				else {
 					dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 				}
 			}
-			else
-			{
+			else {
 				// Send mail method not correctly defined
 				// --------------------------------------
 
@@ -884,8 +878,7 @@ class CMailFile
 				return $reshook;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 			dol_syslog("CMailFile::sendfile: ".$this->error, LOG_WARNING);
 		}
@@ -925,8 +918,7 @@ class CMailFile
 			$encoded = chunk_split(base64_encode($contents), 76, $this->eol); // 76 max is defined into http://tools.ietf.org/html/rfc2047
 			return $encoded;
 		}
-		else
-		{
+		else {
 			$this->error = "Error: Can't read file '".$sourcefile."' into _encode_file";
 			dol_syslog("CMailFile::encode_file: ".$this->error, LOG_ERR);
 			return -1;
@@ -992,8 +984,7 @@ class CMailFile
 			$out .= $msg;
 			$out .= "</body></html>";
 		}
-		else
-		{
+		else {
 			$out = $msg;
 		}
 
@@ -1075,8 +1066,7 @@ class CMailFile
 			$out .= 'References: <'.$this->msgid.">".$this->eol2;
 			$out .= 'X-Dolibarr-TRACKID: '.$trackid.'@'.$host.$this->eol2;
 		}
-		else
-		{
+		else {
 			$this->msgid = time().'.phpmail@'.$host;
 			$out .= 'Message-ID: <'.$this->msgid.">".$this->eol2;
 		}
@@ -1206,8 +1196,7 @@ class CMailFile
 				$out .= "--".$this->alternative_boundary."--".$this->eol;
 			}
 		}
-		else
-		{
+		else {
 			$out .= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
 			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
 			$out .= $this->eol.$strContent.$this->eol;
@@ -1266,8 +1255,7 @@ class CMailFile
 					$out .= $this->eol;
 					//$out.= $this->eol;
 				}
-				else
-				{
+				else {
 					return $encoded;
 				}
 			}
@@ -1366,8 +1354,7 @@ class CMailFile
 				// Check response from Server
 				if ($_retVal = $this->server_parse($socket, "220")) $_retVal = $socket;
 			}
-			else
-			{
+			else {
 				$this->error = utf8_check('Error '.$errno.' - '.$errstr) ? 'Error '.$errno.' - '.$errstr : utf8_encode('Error '.$errno.' - '.$errstr);
 			}
 		}
@@ -1488,15 +1475,13 @@ class CMailFile
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				return -1;
 			}
 
 			return 1;
 		}
-		else
-		{
+		else {
 			return 0;
 		}
 	}
@@ -1533,8 +1518,7 @@ class CMailFile
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
 			}
-			else
-			{
+			else {
 				$name  = '';
 				$email = trim($val);
 			}
@@ -1604,8 +1588,7 @@ class CMailFile
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
 			}
-			else
-			{
+			else {
 				$name  = null;
 				$email = trim($val);
 			}
diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
index 4cd06a81233..429abb8c20d 100644
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
@@ -141,8 +141,7 @@ class CSMSFile
 					$this->error = $sms->error;
 					dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
 				}
-				else
-				{
+				else {
 					dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
 					//var_dump($res);        // 1973128
 					if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
@@ -153,8 +152,7 @@ class CSMSFile
 		        $tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
 		        $classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
 		        dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
-		        try
-		        {
+		        try {
 		            $classname = ucfirst($classfile);
 		            $sms = new $classname($this->db);
 		            $sms->expe = $this->addr_from;
@@ -177,8 +175,7 @@ class CSMSFile
     				{
     					dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
     				}
-    				else
-    				{
+    				else {
     					dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
     					//var_dump($res);        // 1973128
     					if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
@@ -189,16 +186,14 @@ class CSMSFile
 		            dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
 		        }
 		    }
-			else
-			{
+			else {
 				// Send sms method not correctly defined
 				// --------------------------------------
 
 				return 'Bad value for MAIN_SMS_SENDMODE constant';
 			}
 		}
-		else
-		{
+		else {
 			$this->error = 'No sms sent. Feature is disabled by option MAIN_DISABLE_ALL_SMS';
 			dol_syslog("CSMSFile::sendfile: ".$this->error, LOG_WARNING);
 		}
diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index a70a2f9cafc..ecec6a415f5 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -139,8 +139,7 @@ class Ccountry // extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -189,8 +188,7 @@ class Ccountry // extends CommonObject
                 return 0;
             }
         }
-        else
-        {
+        else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -244,8 +242,7 @@ class Ccountry // extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -284,8 +281,7 @@ class Ccountry // extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
diff --git a/htdocs/core/class/comment.class.php b/htdocs/core/class/comment.class.php
index eff934b635f..e7c53ce7ad6 100644
--- a/htdocs/core/class/comment.class.php
+++ b/htdocs/core/class/comment.class.php
@@ -157,8 +157,7 @@ class Comment extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return $this->id;
 		}
@@ -217,8 +216,7 @@ class Comment extends CommonObject
 			if ($num_rows) return 1;
 			else return 0;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -281,8 +279,7 @@ class Comment extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index df80aab7a1f..112c4044b17 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -818,8 +818,7 @@ abstract class CommonDocGenerator
 						$object->array_options['options_'.$key.'_locale'] = dol_print_date($date, 'day', 'tzserver', $outputlangs); // using output language format
 						$object->array_options['options_'.$key.'_rfc'] = dol_print_date($date, 'dayrfc'); // international format
 					}
-					else
-					{
+					else {
 						$object->array_options['options_'.$key] = '';
 						$object->array_options['options_'.$key.'_locale'] = '';
 						$object->array_options['options_'.$key.'_rfc'] = '';
@@ -1389,7 +1388,7 @@ abstract class CommonDocGenerator
         if (!empty($this->cols[$colKey]['status'])) {
             return true;
         }
-        else  return  false;
+        else return  false;
     }
 
     /**
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index c37ece437d4..120a670b64a 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -141,8 +141,7 @@ abstract class CommonInvoice extends CommonObject
 			if ($multicurrency) return $obj->multicurrency_amount;
 			else return $obj->amount;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -171,8 +170,7 @@ abstract class CommonInvoice extends CommonObject
 	    {
 	        return $result;
 	    }
-	    else
-	    {
+	    else {
 	        $this->error = $discountstatic->error;
 	        return -1;
 	    }
@@ -194,8 +192,7 @@ abstract class CommonInvoice extends CommonObject
 	    {
 	        return $result;
 	    }
-	    else
-	    {
+	    else {
 	        $this->error = $discountstatic->error;
 	        return -1;
 	    }
@@ -217,8 +214,7 @@ abstract class CommonInvoice extends CommonObject
 	    {
 	        return $result;
 	    }
-	    else
-	    {
+	    else {
 	        $this->error = $discountstatic->error;
 	        return -1;
 	    }
@@ -249,8 +245,7 @@ abstract class CommonInvoice extends CommonObject
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 		return $idarray;
@@ -285,14 +280,12 @@ abstract class CommonInvoice extends CommonObject
 				// If there is any
 				return $obj->rowid;
 			}
-			else
-			{
+			else {
 				// If no invoice replaces it
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 	}
@@ -379,8 +372,7 @@ abstract class CommonInvoice extends CommonObject
 						$i++;
 					}
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->lasterror();
 					dol_print_error($this->db);
 					return array();
@@ -390,8 +382,7 @@ abstract class CommonInvoice extends CommonObject
 
 			return $retarray;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
 			return array();
@@ -483,8 +474,7 @@ abstract class CommonInvoice extends CommonObject
 				$alreadydispatched = $obj->nb;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -571,8 +561,7 @@ abstract class CommonInvoice extends CommonObject
 		        $statusType = 'status3';
 		    }
 		}
-		else
-		{
+		else {
 		    $statusType = 'status6';
 
 		    if ($type == self::TYPE_CREDIT_NOTE) {
@@ -630,8 +619,7 @@ abstract class CommonInvoice extends CommonObject
 				$cdr_decalage = $obj->decalage;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -658,8 +646,7 @@ abstract class CommonInvoice extends CommonObject
 				$mois = 1;
 				$annee += 1;
 			}
-			else
-			{
+			else {
 				$mois += 1;
 			}
 			// We move at the beginning of the next month, and we take a day off
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 6148b55a5cf..8364cedac2d 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -868,8 +868,7 @@ abstract class CommonObject
 		{
 			$linktoreturn = 'document.php'.($paramlink ? '?'.$paramlink : '');
 		}
-		else
-		{
+		else {
 			$linktoreturn = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
 		}
 
@@ -917,8 +916,7 @@ abstract class CommonObject
 		{
 			$id_type_contact = $type_contact;
 		}
-		else
-		{
+		else {
 			// We look for id type_contact
 			$sql = "SELECT tc.rowid";
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
@@ -982,8 +980,7 @@ abstract class CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$this->error = $this->db->errno();
@@ -991,8 +988,7 @@ abstract class CommonObject
 					echo 'err rollback';
 					return -2;
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->error();
 					$this->db->rollback();
 					return -1;
@@ -1048,8 +1044,7 @@ abstract class CommonObject
 		{
 			return 0;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1086,8 +1081,7 @@ abstract class CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1124,8 +1118,7 @@ abstract class CommonObject
 		{
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1186,8 +1179,7 @@ abstract class CommonObject
 								   'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact,
 								   'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact);
 				}
-				else
-				{
+				else {
 					$tab[$i] = $obj->id;
 				}
 
@@ -1196,8 +1188,7 @@ abstract class CommonObject
 
 			return $tab;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
 			return -1;
@@ -1232,8 +1223,7 @@ abstract class CommonObject
 			$this->db->free($resql);
 			return $result;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			dol_print_error($this->db);
 			return -1;
@@ -1286,8 +1276,7 @@ abstract class CommonObject
 			}
 			return $tab;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			//dol_print_error($this->db);
 			return null;
@@ -1369,8 +1358,7 @@ abstract class CommonObject
 			}
 			return $tab;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return null;
 		}
@@ -1431,8 +1419,7 @@ abstract class CommonObject
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return null;
 		}
@@ -1493,8 +1480,7 @@ abstract class CommonObject
 			}
 
 			return $result;
-		} else
-			return -1;
+		} else return -1;
 	}
 
 
@@ -1565,8 +1551,7 @@ abstract class CommonObject
 					$this->barcode_type_coder = $obj->coder;
 					return 1;
 				}
-				else
-				{
+				else {
 					dol_print_error($this->db);
 					return -1;
 				}
@@ -1774,8 +1759,7 @@ abstract class CommonObject
 				{
 					$result = $this->fetch($id);
 				}
-				else
-				{
+				else {
 					$result = $this->fetchCommon($id);
 				}
 				if ($result >= 0) $result = $this->call_trigger($trigkey, (!empty($fuser) && is_object($fuser)) ? $fuser : $user); // This may set this->errors
@@ -1788,14 +1772,12 @@ abstract class CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1954,7 +1936,7 @@ abstract class CommonObject
 		while ($i < $num)
 		{
 			if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];
-			else  $contactAlreadySelected[$i] = $tab[$i]['id'];
+			else $contactAlreadySelected[$i] = $tab[$i]['id'];
 			$i++;
 		}
 		return $contactAlreadySelected;
@@ -1988,7 +1970,7 @@ abstract class CommonObject
 			else $sql .= ' SET fk_project = NULL';
 			$sql .= ' WHERE id = '.$this->id;
 		}
-		else											// Special case for old architecture objects
+		else // Special case for old architecture objects
 		{
 			if ($projectid) $sql .= ' SET fk_projet = '.$projectid;
 			else $sql .= ' SET fk_projet = NULL';
@@ -2001,8 +1983,7 @@ abstract class CommonObject
 			$this->fk_project = $projectid;
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -2035,15 +2016,13 @@ abstract class CommonObject
 				if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;
 				return 1;
 			}
-			else
-			{
+			else {
 				dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible');
 			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
@@ -2076,15 +2055,13 @@ abstract class CommonObject
 
 				return 1;
 			}
-			else
-			{
+			else {
 				dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog(get_class($this).'::setMulticurrencyCode, status of the object is incompatible');
 			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
@@ -2184,15 +2161,13 @@ abstract class CommonObject
 
 				return 1;
 			}
-			else
-			{
+			else {
 				dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog(get_class($this).'::setMulticurrencyRate, status of the object is incompatible');
 			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
@@ -2227,15 +2202,13 @@ abstract class CommonObject
 				$this->cond_reglement = $id; // for compatibility
 				return 1;
 			}
-			else
-			{
+			else {
 				dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog(get_class($this).'::setPaymentTerms, status of the object is incompatible');
 			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
@@ -2265,15 +2238,13 @@ abstract class CommonObject
 	            $this->retained_warranty_fk_cond_reglement = $id;
 	            return 1;
 	        }
-	        else
-	        {
+	        else {
 	            dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms Erreur '.$sql.' - '.$this->db->error());
 	            $this->error = $this->db->error();
 	            return -1;
 	        }
 	    }
-	    else
-	    {
+	    else {
 	        dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms, status of the object is incompatible');
 	        $this->error = 'Status of the object is incompatible '.$this->statut;
 	        return -2;
@@ -2300,8 +2271,7 @@ abstract class CommonObject
 			$this->fk_delivery_address = $id;
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);
 			return -1;
@@ -2426,8 +2396,7 @@ abstract class CommonObject
 			$this->modelpdf = $modelpdf;
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return 0;
 		}
@@ -2470,8 +2439,7 @@ abstract class CommonObject
 			$this->error = $this->db->lasterror();
 			$error++;
 		}
-		else
-		{
+		else {
 			if (!$notrigger)
 			{
 				// Call trigger
@@ -2486,8 +2454,7 @@ abstract class CommonObject
 			$this->db->rollback();
 			return -1;
 		}
-		else
-		{
+		else {
 			$this->fk_account = ($fk_account == 'NULL') ?null:$fk_account;
 			$this->db->commit();
 			return 1;
@@ -2578,8 +2545,7 @@ abstract class CommonObject
 					}
 				}
 			}
-			else
-			{
+			else {
 				dol_print_error($this->db);
 			}
 		}
@@ -2726,8 +2692,7 @@ abstract class CommonObject
 					dol_print_error($this->db);
 				}
 			}
-			else
-			{
+			else {
 				dol_print_error($this->db);
 			}
 		}
@@ -2760,8 +2725,7 @@ abstract class CommonObject
 					dol_print_error($this->db);
 				}
 			}
-			else
-			{
+			else {
 				dol_print_error($this->db);
 			}
 		}
@@ -2835,15 +2799,13 @@ abstract class CommonObject
 				{
 					return $row[0];
 				}
-				else
-				{
+				else {
 					return $this->getRangOfLine($fk_parent_line);
 				}
 			}
 		}
 		// If not, search the last rang of element
-		else
-		{
+		else {
 			$sql = 'SELECT max('.$positionfield.') FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
 
@@ -2883,8 +2845,7 @@ abstract class CommonObject
 			$this->ref_ext = $ref_ext;
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2929,15 +2890,13 @@ abstract class CommonObject
 		{
 			if ($suffix == '_public') $this->note_public = $note;
 			elseif ($suffix == '_private') $this->note_private = $note;
-			else
-			{
+			else {
 				$this->note = $note; // deprecated
 				$this->note_private = $note;
 			}
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -3198,13 +3157,11 @@ abstract class CommonObject
 			{
 				return 1;
 			}
-			else
-			{
+			else {
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db, 'Bad request in update_price');
 			return -1;
 		}
@@ -3250,8 +3207,7 @@ abstract class CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return 0;
@@ -3331,8 +3287,7 @@ abstract class CommonObject
 				if ($withsourcetype) $sql .= " AND sourcetype = '".$sourcetype."'";
 			}
 		}
-		else
-		{
+		else {
 			$sql .= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";
 			$sql .= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";
 		}
@@ -3358,8 +3313,7 @@ abstract class CommonObject
 						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid] = $obj->fk_source;
 					}
 				}
-				else
-				{
+				else {
 					if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype)
 					{
 						$this->linkedObjectsIds[$obj->targettype][$obj->rowid] = $obj->fk_target;
@@ -3465,16 +3419,14 @@ abstract class CommonObject
 							}
 						}
 					}
-					else
-					{
+					else {
 						unset($this->linkedObjectsIds[$objecttype]);
 					}
 				}
 			}
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3519,8 +3471,7 @@ abstract class CommonObject
 		{
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -3556,8 +3507,7 @@ abstract class CommonObject
 		{
 			$sql .= " rowid = ".$rowid;
 		}
-		else
-		{
+		else {
 			if ($deletesource)
 			{
 				$sql .= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
@@ -3568,8 +3518,7 @@ abstract class CommonObject
 				$sql .= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
 				$sql .= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";
 			}
-			else
-			{
+			else {
 				$sql .= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";
 				$sql .= " OR";
 				$sql .= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";
@@ -3581,8 +3530,7 @@ abstract class CommonObject
 		{
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->error;
 			return -1;
@@ -3660,15 +3608,13 @@ abstract class CommonObject
 
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::setStatut ".$this->error, LOG_ERR);
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -3710,8 +3656,7 @@ abstract class CommonObject
 			}
 			else return 0;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3785,15 +3730,14 @@ abstract class CommonObject
 					{
 						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
 					}
-					else	// new usage: $elementname=Translation key
+					else // new usage: $elementname=Translation key
 					{
 						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));
 					}
 					break; // We found at least one, we stop here
 				}
 			}
-			else
-			{
+			else {
 				$this->errors[] = $this->db->lasterror();
 				return -1;
 			}
@@ -3956,8 +3900,7 @@ abstract class CommonObject
 				//print $line->volume;
 				$totalVolume += $volume * $qty * $trueVolumeUnit;
 			}
-			else
-			{
+			else {
 				$totalVolume += $volume * $qty; // This may be wrong if we mix different units
 			}
 		}
@@ -3989,8 +3932,7 @@ abstract class CommonObject
 			$this->db->rollback();
 			return -1;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -4042,13 +3984,11 @@ abstract class CommonObject
 				$res = $this->db->fetch_object($resql);
 				return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;
 			}
-			else
-			{
+			else {
 				return '';
 			}
 		}
-		else
-		{
+		else {
 			$this->errors[] = $this->db->lasterror();
 			return false;
 		}
@@ -4085,8 +4025,7 @@ abstract class CommonObject
 				}
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->errors[] = $this->db->lasterror();
 				return -1;
 			}
@@ -4133,8 +4072,7 @@ abstract class CommonObject
 			{
 				$tpl = dol_buildpath($reldir.'/objectline_create.tpl.php');
 			}
-			else
-			{
+			else {
 				$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_create.tpl.php';
 			}
 
@@ -4200,8 +4138,7 @@ abstract class CommonObject
 				{
 					$tpl = dol_buildpath($reldir.'/objectline_title.tpl.php');
 				}
-				else
-				{
+				else {
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_title.tpl.php';
 				}
 				if (empty($conf->file->strict_mode)) {
@@ -4229,8 +4166,7 @@ abstract class CommonObject
 					$parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element);
 					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				}
-				else
-				{
+				else {
 					$parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element, 'fk_parent_line'=>$line->fk_parent_line);
 					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				}
@@ -4312,8 +4248,7 @@ abstract class CommonObject
 
 					$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;
 				}
-				else
-				{
+				else {
 					$label = $line->product_label;
 				}
 
@@ -4333,8 +4268,7 @@ abstract class CommonObject
 				{
 					$tpl = dol_buildpath($reldir.'/objectline_view.tpl.php');
 				}
-				else
-				{
+				else {
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_view.tpl.php';
 				}
 
@@ -4364,8 +4298,7 @@ abstract class CommonObject
 				{
 					$tpl = dol_buildpath($reldir.'/objectline_edit.tpl.php');
 				}
-				else
-				{
+				else {
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_edit.tpl.php';
 				}
 
@@ -4426,8 +4359,7 @@ abstract class CommonObject
 						$hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 					}
 				}
-				else
-				{
+				else {
 					$this->printOriginLine($line, '', $restrictlist, '/core/tpl', $selectedLines);
 				}
 
@@ -4458,8 +4390,7 @@ abstract class CommonObject
 		{
 			$date_start = $line->date_start;
 		}
-		else
-		{
+		else {
 			$date_start = $line->date_debut_prevue;
 			if ($line->date_debut_reel) $date_start = $line->date_debut_reel;
 		}
@@ -4467,8 +4398,7 @@ abstract class CommonObject
 		{
 			$date_end = $line->date_end;
 		}
-		else
-		{
+		else {
 			$date_end = $line->date_fin_prevue;
 			if ($line->date_fin_reel) $date_end = $line->date_fin_reel;
 		}
@@ -4503,8 +4433,7 @@ abstract class CommonObject
 				$this->tpl['label'] .= get_date_range($date_start, $date_end);
 			}
 		}
-		else
-		{
+		else {
 			$this->tpl['label'] .= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''), 'service') : img_object($langs->trans(''), 'product')));
 			if (!empty($line->desc)) {
 				$this->tpl['label'] .= $line->desc;
@@ -4545,13 +4474,11 @@ abstract class CommonObject
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
 			}
-			else
-			{
+			else {
 				$this->tpl['description'] = dol_trunc($line->desc, 60);
 			}
 		}
-		else
-		{
+		else {
 			$this->tpl['description'] = '&nbsp;';
 		}
 
@@ -4579,8 +4506,7 @@ abstract class CommonObject
 			{
 				$tpl = dol_buildpath($reldir.'/originproductline.tpl.php');
 			}
-			else
-			{
+			else {
 				$tpl = DOL_DOCUMENT_ROOT.$reldir.'/originproductline.tpl.php';
 			}
 
@@ -4632,8 +4558,7 @@ abstract class CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return  0;
@@ -4668,8 +4593,7 @@ abstract class CommonObject
 			$this->db->rollback();
 			return -1;
 		}
-		else
-		{
+		else {
 			if (!$notrigger)
 			{
 				$result = $this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);
@@ -4833,8 +4757,7 @@ abstract class CommonObject
 				    $arrayofrecords = array(); // The write_file of templates of adherent class need this var
 				    $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
 			    }
-			    else
-			    {
+			    else {
 				     $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);
 			    }
 			    // After call of write_file $obj->result['fullpath'] is set with generated file. It will be used to update the ECM database index.
@@ -4903,8 +4826,7 @@ abstract class CommonObject
 								    setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 							    }
 						    }
-						    else
-						    {
+						    else {
 							    $ecmfile->entity = $conf->entity;
 							    $ecmfile->filepath = $rel_dir;
 							    $ecmfile->filename = $filename;
@@ -4944,8 +4866,7 @@ abstract class CommonObject
 						    }
 					    }
 				    }
-				    else
-				    {
+				    else {
 					    dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING);
 				    }
 
@@ -4954,15 +4875,13 @@ abstract class CommonObject
 
 				    return 1;
 			    }
-			    else
-			    {
+			    else {
 				    $outputlangs->charset_output = $sav_charset_output;
 				    dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);
 				    return -1;
 			    }
 		    }
-		    else
-		    {
+		    else {
 			    $this->error = $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 			    dol_print_error('', $this->error);
 			    return -1;
@@ -5074,8 +4993,7 @@ abstract class CommonObject
 			{
 				$this->errors = array_unique(array_merge($this->errors, $interface->errors)); // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.
 			}
-			else
-			{
+			else {
 				$this->errors = $interface->errors;
 			}
 		}
@@ -5137,8 +5055,7 @@ abstract class CommonObject
 					{
 						$this->array_languages[$key][$codelang] = $this->db->jdate($value);
 					}
-					else
-					{
+					else {
 						$this->array_languages[$key][$codelang] = $value;
 					}
 
@@ -5151,8 +5068,7 @@ abstract class CommonObject
 			if ($numrows) return $numrows;
 			else return 0;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -5222,8 +5138,7 @@ abstract class CommonObject
 				$value_arr = GETPOST($postfieldkey, 'alpha');
 				$value_key = price2num($value_arr);
 			}
-			else
-			{
+			else {
 				$value_key = GETPOST($postfieldkey);
 				if (in_array($key_type, array('link')) && $value_key == '-1') $value_key = '';
 			}
@@ -5304,8 +5219,7 @@ abstract class CommonObject
 			}
 			$optionsArray = (!empty($extrafields->attributes[$this->table_element]['label']) ? $extrafields->attributes[$this->table_element]['label'] : null);
 		}
-		else
-		{
+		else {
 			global $extrafields;
 			dol_syslog("Warning: fetch_optionals was called with param optionsArray defined when you should pass null now", LOG_WARNING);
 		}
@@ -5347,8 +5261,7 @@ abstract class CommonObject
 								//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);
 								$this->array_options["options_".$key] = $this->db->jdate($value);
 							}
-							else
-							{
+							else {
 								$this->array_options["options_".$key] = $value;
 							}
 
@@ -5373,8 +5286,7 @@ abstract class CommonObject
 				if ($numrows) return $numrows;
 				else return 0;
 			}
-			else
-			{
+			else {
 				dol_print_error($this->db);
 				return -1;
 			}
@@ -5408,8 +5320,7 @@ abstract class CommonObject
 			$this->db->rollback();
 			return -1;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -5485,8 +5396,7 @@ abstract class CommonObject
 					    dol_syslog($langs->trans("Extrafieldcomputed")." sur ".$attributeLabel."(".$value.")", LOG_DEBUG);
 					    $new_array_options[$key] = $value;
 					}
-					else
-					{
+					else {
 						$new_array_options[$key] = null;
 					}
 				}
@@ -5544,20 +5454,18 @@ abstract class CommonObject
 				   					{
 				   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept
 				   					}
-									else
-									{
+									else {
 										// var_dump($algo);
 										$newvalue = dol_hash($this->array_options[$key], $algo);
 										$new_array_options[$key] = $newvalue;
 									}
 			   					}
-			   					else
-			   					{
+			   					else {
 			   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept
 			   					}
 			   				}
 			   			}
-			   			else	// Common usage
+			   			else // Common usage
 			   			{
 			   				$new_array_options[$key] = $this->array_options[$key];
 			   			}
@@ -5592,16 +5500,14 @@ abstract class CommonObject
 								else $res = $object->fetch('', $value);
 
 								if ($res > 0) $new_array_options[$key] = $object->id;
-								else
-								{
+								else {
 									$this->error = "Id/Ref '".$value."' for object '".$object->element."' not found";
 									$this->db->rollback();
 									return -1;
 								}
 							}
 						}
-						else
-						{
+						else {
 							dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 						}
 						break;
@@ -5649,8 +5555,7 @@ abstract class CommonObject
 					{
 						$sql .= ",'".$this->db->escape($new_array_options[$key])."'";
 					}
-					else
-					{
+					else {
 						$sql .= ",null";
 					}
 				}
@@ -5692,8 +5597,7 @@ abstract class CommonObject
 				$this->db->rollback();
 				return -1;
 			}
-			else
-			{
+			else {
 				$this->db->commit();
 				return 1;
 			}
@@ -5815,8 +5719,7 @@ abstract class CommonObject
 				$this->db->rollback();
 				return -1;
 			}
-			else
-			{
+			else {
 				$this->db->commit();
 				return 1;
 			}
@@ -5945,8 +5848,7 @@ abstract class CommonObject
 				$this->db->rollback();
 				return -1;
 			}
-			else
-			{
+			else {
 				$this->db->commit();
 				return 1;
 			}
@@ -6084,8 +5986,7 @@ abstract class CommonObject
 			{
 				$morecss = '';
 			}
-			else
-			{
+			else {
 				if (round($size) < 12)
 				{
 					$morecss = 'minwidth100';
@@ -6094,8 +5995,7 @@ abstract class CommonObject
 				{
 					$morecss = 'minwidth200';
 				}
-				else
-				{
+				else {
 					$morecss = 'minwidth400';
 				}
 			}
@@ -6144,8 +6044,7 @@ abstract class CommonObject
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
 			}
-			else
-			{
+			else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
 		}
@@ -6157,8 +6056,7 @@ abstract class CommonObject
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
 			}
-			else
-			{
+			else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
 		}
@@ -6276,13 +6174,11 @@ abstract class CommonObject
 						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
 						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
 					}
-					else
-					{
+					else {
 						$sqlwhere .= ' WHERE '.$InfoFieldList[4];
 					}
 				}
-				else
-				{
+				else {
 					$sqlwhere .= ' WHERE 1=1';
 				}
 				// Some tables may have field, some other not. For the moment we disable it.
@@ -6318,8 +6214,7 @@ abstract class CommonObject
 								$labeltoshow .= $obj->$field_toshow.' ';
 							}
 						}
-						else
-						{
+						else {
 							$labeltoshow = $obj->{$InfoFieldList[1]};
 						}
 						$labeltoshow = dol_trunc($labeltoshow, 45);
@@ -6337,8 +6232,7 @@ abstract class CommonObject
 							}
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 						}
-						else
-						{
+						else {
 							if (!$notrans)
 							{
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
@@ -6705,8 +6599,7 @@ abstract class CommonObject
 			{
 				$morecss = '';
 			}
-			else
-			{
+			else {
 				if (round($size) < 12)
 				{
 					$morecss = 'minwidth100';
@@ -6715,8 +6608,7 @@ abstract class CommonObject
 				{
 					$morecss = 'minwidth200';
 				}
-				else
-				{
+				else {
 					$morecss = 'minwidth400';
 				}
 			}
@@ -6846,8 +6738,7 @@ abstract class CommonObject
 						}
 					}
 				}
-				else
-				{
+				else {
 					$translabel = '';
 					if (!empty($obj->{$InfoFieldList[1]})) {
 						$translabel = $langs->trans($obj->{$InfoFieldList[1]});
@@ -6969,8 +6860,7 @@ abstract class CommonObject
 						$value = $object->getNomUrl($getnomurlparam);
 					}
 				}
-				else
-				{
+				else {
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 					return 'Error bad setup of extrafield';
 				}
@@ -7116,8 +7006,7 @@ abstract class CommonObject
 
 					$out .= $extrafields->showSeparator($key, $this, ($colspan + 1));
 				}
-				else
-				{
+				else {
 					$class = (!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
 					$csstyle = '';
 					if (is_array($params) && count($params) > 0) {
@@ -7315,8 +7204,7 @@ abstract class CommonObject
 		{
 			$buyPrice = $unitPrice * (1 - $discountPercent / 100);
 		}
-		else
-		{
+		else {
 			// Get cost price for margin calculation
 			if (!empty($fk_product))
 			{
@@ -7509,14 +7397,12 @@ abstract class CommonObject
 									$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
 								}
 							}
-							else
-							{
+							else {
 								$return .= '<!-- Show nophoto file (because file is not shared) -->';
 								$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
 							}
 						}
-						else
-						{
+						else {
 							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
 							{
 								$return .= '<!-- Show thumb -->';
@@ -7769,8 +7655,7 @@ abstract class CommonObject
 				{
 					$queryarray[$field] = null;
 				}
-				else
-				{
+				else {
 					$queryarray[$field] = $this->db->idate($this->{$field});
 				}
 			}
@@ -7794,8 +7679,7 @@ abstract class CommonObject
 			elseif ($this->isInt($info) || $this->isFloat($info))
 			{
 				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field] = $conf->entity;
-				else
-				{
+				else {
 					// $this->{$field} may be null, '', 0, '0', 123, '123'
 					if ($this->{$field} != '' || !empty($info['notnull'])) {
 						if ($this->isInt($info)) $queryarray[$field] = (int) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
@@ -7804,8 +7688,7 @@ abstract class CommonObject
 					else $queryarray[$field] = null;
 				}
 			}
-			else
-			{
+			else {
 				$queryarray[$field] = $this->{$field};
 			}
 
@@ -7844,15 +7727,13 @@ abstract class CommonObject
 			elseif ($this->isInt($info))
 			{
 				if ($field == 'rowid') $this->id = (int) $obj->{$field};
-				else
-				{
+				else {
 					if ($this->isForcedToNullIfZero($info))
 					{
 						if (empty($obj->{$field})) $this->{$field} = null;
 						else $this->{$field} = (double) $obj->{$field};
 					}
-					else
-					{
+					else {
 						if (!is_null($obj->{$field}) || (isset($info['notnull']) && $info['notnull'] == 1)) {
 							$this->{$field} = (int) $obj->{$field};
 						} else {
@@ -7868,8 +7749,7 @@ abstract class CommonObject
 					if (empty($obj->{$field})) $this->{$field} = null;
 					else $this->{$field} = (double) $obj->{$field};
 				}
-				else
-				{
+				else {
 					if (!is_null($obj->{$field}) || (isset($info['notnull']) && $info['notnull'] == 1)) {
 						$this->{$field} = (double) $obj->{$field};
 					} else {
@@ -7877,8 +7757,7 @@ abstract class CommonObject
 					}
 				}
 			}
-			else
-			{
+			else {
 				$this->{$field} = $obj->{$field};
 			}
 		}
@@ -8092,13 +7971,11 @@ abstract class CommonObject
 				$this->setVarsFromFetchObj($obj);
 				return $this->id;
 			}
-			else
-			{
+			else {
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->error;
 			return -1;
@@ -8147,8 +8024,7 @@ abstract class CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->error;
 			return -1;
@@ -8443,8 +8319,7 @@ abstract class CommonObject
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index f04e2da11ee..9edbe27aae0 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -83,8 +83,7 @@ abstract class CommonObjectLine extends CommonObject
 			$this->db->free($resql);
 			return $label;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error().' sql='.$sql;
 			dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
 			return -1;
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 10d6fedf0e0..e535a4f0ca4 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -335,8 +335,7 @@ class Conf
 							// For backward compatibility
 							$this->$module->$dirname = $rootfordata."/".$name;
 						}
-						else
-						{
+						else {
 							// For multicompany sharings
 							$this->$module->$multidirname = array($this->entity => $rootfortemp."/".$name."/temp");
 
diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 999b01341f0..0b017022e41 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -75,8 +75,7 @@ class CoreObject extends CommonObject
 
             return true;
         }
-        else
-        {
+        else {
             return false;
         }
     }
@@ -94,8 +93,7 @@ class CoreObject extends CommonObject
         {
             return $this->{'is_'.$type}($this->fields[$field]);
         }
-        else
-        {
+        else {
             return false;
         }
     }
@@ -200,8 +198,7 @@ class CoreObject extends CommonObject
                         $this->{$className}[] = $o;
                     }
                 }
-                else
-                {
+                else {
                     $this->errors[] = $this->db->lasterror();
                 }
             }
@@ -257,8 +254,7 @@ class CoreObject extends CommonObject
             if ($result < 0) $error++;
             else $this->saveChild($user);
         }
-        else
-        {
+        else {
             $error++;
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->error;
@@ -269,8 +265,7 @@ class CoreObject extends CommonObject
             $this->db->commit();
             return $this->id;
         }
-        else
-        {
+        else {
             $this->db->rollback();
             return -1;
         }
@@ -298,8 +293,7 @@ class CoreObject extends CommonObject
             if ($result < 0) $error++;
             else $this->saveChild($user);
         }
-        else
-        {
+        else {
             $error++;
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->error;
@@ -310,8 +304,7 @@ class CoreObject extends CommonObject
             $this->db->commit();
             return $this->id;
         }
-        else
-        {
+        else {
             $this->db->rollback();
             return -1;
         }
@@ -357,8 +350,7 @@ class CoreObject extends CommonObject
             $this->db->commit();
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->error;
             $this->db->rollback();
@@ -377,8 +369,7 @@ class CoreObject extends CommonObject
     public function getDate($field, $format = '')
     {
         if (empty($this->{$field})) return '';
-        else
-        {
+        else {
             return dol_print_date($this->{$field}, $format);
         }
     }
@@ -396,8 +387,7 @@ class CoreObject extends CommonObject
         {
             $this->{$field} = 0;
         }
-        else
-        {
+        else {
             require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
             $this->{$field} = dol_stringtotime($date);
         }
@@ -427,8 +417,7 @@ class CoreObject extends CommonObject
             elseif ($this->checkFieldType($key, 'int')) {
                 $this->{$key} = (int) price2num($value);
             }
-            else
-            {
+            else {
             	$this->{$key} = dol_string_nohtmltag($value);
             }
         }
diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php
index 406615aada6..9f49e77f35a 100644
--- a/htdocs/core/class/cstate.class.php
+++ b/htdocs/core/class/cstate.class.php
@@ -133,8 +133,7 @@ class Cstate // extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -177,8 +176,7 @@ class Cstate // extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -265,8 +263,7 @@ class Cstate // extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php
index 2524445b294..8e567a552b2 100644
--- a/htdocs/core/class/ctypent.class.php
+++ b/htdocs/core/class/ctypent.class.php
@@ -137,8 +137,7 @@ class Ctypent // extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -186,8 +185,7 @@ class Ctypent // extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -241,8 +239,7 @@ class Ctypent // extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -281,8 +278,7 @@ class Ctypent // extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
         }
-        else
-        {
+        else {
             $this->db->commit();
             return 1;
         }
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index 096ae47a7b8..0b56b4c0831 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -136,8 +136,7 @@ class CUnits // extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -196,8 +195,7 @@ class CUnits // extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -340,8 +338,7 @@ class CUnits // extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -380,8 +377,7 @@ class CUnits // extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -397,10 +393,10 @@ class CUnits // extends CommonObject
 	public function getUnitFromCode($code, $mode = 'code')
 	{
 
-		if($mode == 'short_label'){
+		if ($mode == 'short_label'){
 			return dol_getIdFromCode($this->db, $code, 'c_units', 'short_label', 'rowid');
 		}
-		elseif($mode == 'code'){
+		elseif ($mode == 'code'){
 			return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid');
 		}
 
@@ -424,10 +420,10 @@ class CUnits // extends CommonObject
 
 		// convert to standard unit
 		$value  = $value * $scaleUnitPow;
-		if($fk_new_unit !=0 ){
+		if ($fk_new_unit !=0 ){
 			// Calcul en unité de base
 			$scaleUnitPow = $this->scaleOfUnitPow($fk_new_unit);
-			if(!empty($scaleUnitPow))
+			if (!empty($scaleUnitPow))
 			{
 				// convert to new unit
 				$value  = $value / $scaleUnitPow;
@@ -448,9 +444,9 @@ class CUnits // extends CommonObject
 		$base = 10;
 		// TODO : add base col into unit dictionary table
 		$unit = $this->db->getRow('SELECT scale, unit_type from '.MAIN_DB_PREFIX.'c_units WHERE rowid = '.intval($id));
-		if($unit){
+		if ($unit){
 			// TODO : if base exist in unit dictionary table remove this convertion exception and update convertion infos in database exemple time hour currently scale 3600 will become scale 2 base 60
-			if($unit->unit_type == 'time'){
+			if ($unit->unit_type == 'time'){
 				return doubleval($unit->scale);
 			}
 
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 724b2a778d8..8cf13771d35 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -188,14 +188,12 @@ class DiscountAbsolute
                 $this->db->free($resql);
                 return 1;
             }
-            else
-            {
+            else {
                 $this->db->free($resql);
                 return 0;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -265,8 +263,7 @@ class DiscountAbsolute
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
             return $this->id;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror().' - sql='.$sql;
             return -1;
         }
@@ -304,8 +301,7 @@ class DiscountAbsolute
                     return -2;
                 }
             }
-            else
-            {
+            else {
                 dol_print_error($this->db);
                 return -1;
             }
@@ -332,8 +328,7 @@ class DiscountAbsolute
         			return -2;
         		}
         	}
-        	else
-        	{
+        	else {
         		dol_print_error($this->db);
         		return -1;
         	}
@@ -369,8 +364,7 @@ class DiscountAbsolute
                     $this->db->commit();
                     return 1;
                 }
-                else
-                {
+                else {
                     $this->error = $this->db->lasterror();
                     $this->db->rollback();
                     return -1;
@@ -388,21 +382,18 @@ class DiscountAbsolute
             		$this->db->commit();
             		return 1;
             	}
-            	else
-            	{
+            	else {
             		$this->error = $this->db->lasterror();
             		$this->db->rollback();
             		return -1;
             	}
             }
-            else
-            {
+            else {
                 $this->db->commit();
                 return 1;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -459,8 +450,7 @@ class DiscountAbsolute
         	}
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -3;
         }
@@ -491,8 +481,7 @@ class DiscountAbsolute
         {
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -3;
         }
@@ -576,8 +565,7 @@ class DiscountAbsolute
             $sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
             $sql .= ' AND f.type = 3';
         }
-        else
-        {
+        else {
             $this->error = get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
             return -1;
@@ -590,8 +578,7 @@ class DiscountAbsolute
             if ($multicurrency == 1) return $obj->multicurrency_amount;
 			else return $obj->amount;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -622,8 +609,7 @@ class DiscountAbsolute
             $sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
             $sql .= ' AND f.type IN ('.$invoice::TYPE_STANDARD.', '.$invoice::TYPE_CREDIT_NOTE.')'; // Find discount coming from credit note or excess paid
         }
-        else
-        {
+        else {
             $this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
             return -1;
@@ -636,8 +622,7 @@ class DiscountAbsolute
             if ($multicurrency == 1) return $obj->multicurrency_amount;
 			else return $obj->amount;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -665,8 +650,7 @@ class DiscountAbsolute
             $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
             $sql .= ' WHERE rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_source = '.$invoice->id;
         }
-        else
-        {
+        else {
             $this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
             return -1;
@@ -679,8 +663,7 @@ class DiscountAbsolute
             if ($multicurrency) return $obj->multicurrency_amount;
 			else return $obj->amount;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             return -1;
         }
diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
index 24e0a6de275..743f2968289 100644
--- a/htdocs/core/class/dolgeoip.class.php
+++ b/htdocs/core/class/dolgeoip.class.php
@@ -97,8 +97,7 @@ class DolGeoIP
 		{
 			$this->gi = geoip_open($datfile, GEOIP_STANDARD);
 		}
-		else
-		{
+		else {
 		    $this->gi = 'NOGI'; // We are using embedded php geoip functions
 		    //print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name');
 		    //print geoip_database_info();
@@ -127,8 +126,7 @@ class DolGeoIP
 		    // geoip_country_code_by_addr does not exists
     		return strtolower(geoip_country_code_by_name($ip));
 		}
-		else
-		{
+		else {
 			if (preg_match('/^[0-9]+.[0-9]+\.[0-9]+\.[0-9]+/', $ip))
 			{
 				if ($geoipversion == '2')
@@ -142,14 +140,12 @@ class DolGeoIP
 						return '';
 					}
 				}
-				else
-				{
+				else {
 			    	if (!function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
 			    	return strtolower(geoip_country_code_by_addr($this->gi, $ip));
 				}
 			}
-			else
-			{
+			else {
 				if ($geoipversion == '2')
 				{
 					try {
@@ -161,8 +157,7 @@ class DolGeoIP
 						return '';
 					}
 				}
-				else
-				{
+				else {
 					if (!function_exists('geoip_country_code_by_addr_v6')) return strtolower(geoip_country_code_by_name_v6($this->gi, $ip));
 					return strtolower(geoip_country_code_by_addr_v6($this->gi, $ip));
 				}
@@ -199,8 +194,7 @@ class DolGeoIP
 				return '';
 			}
 		}
-		else
-		{
+		else {
 			return geoip_country_code_by_name($this->gi, $name);
 		}
 	}
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 551fe2b82c0..b840f767a97 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -473,13 +473,11 @@ class DolGraph
 				//print 'ee'.join(',',$theme_bgcoloronglet);
 				$this->bgcolor = $theme_bgcoloronglet;
 			}
-			else
-			{
+			else {
 				$this->bgcolor = $theme_bgcolor;
 			}
 		}
-		else
-		{
+		else {
 			$this->bgcolor = $bg_color;
 		}
 	}
@@ -503,13 +501,11 @@ class DolGraph
 				//print 'ee'.join(',',$theme_bgcoloronglet);
 				$this->bgcolorgrid = $theme_bgcoloronglet;
 			}
-			else
-			{
+			else {
 				$this->bgcolorgrid = $theme_bgcolor;
 			}
 		}
-		else
-		{
+		else {
 			$this->bgcolorgrid = $bg_colorgrid;
 		}
 	}
@@ -726,8 +722,7 @@ class DolGraph
 					if (isset($y)) $serie[$i] .= 'd'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";
 				}
 			}
-			else
-			{
+			else {
 				foreach ($values as $x => $y) {
 					if (isset($y)) $serie[$i] .= 'd'.$i.'.push(['.$x.', '.$y.']);'."\n";
 				}
@@ -759,8 +754,7 @@ class DolGraph
 		{
 			$this->stringtoshow .= '<!-- No series of data -->'."\n";
 		}
-		else
-		{
+		else {
 			while ($i < $nblot)
 			{
 				$this->stringtoshow .= '<!-- Serie '.$i.' -->'."\n";
@@ -835,8 +829,7 @@ class DolGraph
 		}'."\n";
 		}
 		// Other cases, graph of type 'bars', 'lines'
-		else
-		{
+		else {
 			// Add code to support tooltips
 		    // TODO: remove js css and use graph-tooltip-inner class instead by adding css in each themes
 			$this->stringtoshow .= '
@@ -895,9 +888,9 @@ class DolGraph
 				$color = sprintf("%02x%02x%02x", $this->datacolor[$i][0], $this->datacolor[$i][1], $this->datacolor[$i][2]);
 				$this->stringtoshow .= '{ ';
 				if (! isset($this->type[$i]) || $this->type[$i] == 'bars') {
-                    if($nblot == 3) {
-                        if($i == $firstlot) $align = 'right';
-                        elseif($i == $firstlot + 1) $align = 'center';
+                    if ($nblot == 3) {
+                        if ($i == $firstlot) $align = 'right';
+                        elseif ($i == $firstlot + 1) $align = 'center';
                         else $align = 'left';
                         $this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "'.$align.'", barWidth: 0.45 }, ';
                     }
@@ -1059,8 +1052,7 @@ class DolGraph
 		{
 			$this->stringtoshow .= '<!-- No series of data -->';
 		}
-		else
-		{
+		else {
 			while ($i < $nblot)
 			{
 				//$this->stringtoshow .= '<!-- Series '.$i.' -->'."\n";
@@ -1170,8 +1162,7 @@ class DolGraph
 			$this->stringtoshow .= '});'."\n";
 		}
 		// Other cases, graph of type 'bars', 'lines', 'linesnopoint'
-		else
-		{
+		else {
 			$type = 'bar';
 			if (!isset($this->type[$firstlot]) || $this->type[$firstlot] == 'bars') $type = 'bar';
 			if (isset($this->type[$firstlot]) && ($this->type[$firstlot] == 'lines' || $this->type[$firstlot] == 'linesnopoint')) $type = 'line';
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index 3bac7c8c2cc..e390565748a 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -425,8 +425,7 @@ class EmailSenderProfile extends CommonObject
 
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/core/class/evalmath.class.php b/htdocs/core/class/evalmath.class.php
index b0fcc963eba..4b261a0f3c6 100644
--- a/htdocs/core/class/evalmath.class.php
+++ b/htdocs/core/class/evalmath.class.php
@@ -272,8 +272,7 @@ class EvalMath
 				while (($o2 = $stack->pop()) != '(') { // pop off the stack back to the last (
 					if (is_null($o2))
 						return $this->trigger(5, "unexpected ')'", ")");
-					else
-						$output[] = $o2;
+					else $output[] = $o2;
 				}
 				if (preg_match("/^([a-z]\w*)\($/", $stack->last(2), $matches)) { // did we just close a function?
 					$fnn = $matches[1]; // get the function name
@@ -295,8 +294,7 @@ class EvalMath
 				while (($o2 = $stack->pop()) != '(') {
 					if (is_null($o2))
 						return $this->trigger(5, "unexpected ','", ","); // oops, never had a (
-					else
-						$output[] = $o2; // pop the argument expression stuff and push onto the output
+					else $output[] = $o2; // pop the argument expression stuff and push onto the output
 				}
 				// make sure there was a function
 				if (!preg_match("/^([a-z]\w*)\($/", $stack->last(2), $matches))
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index 9c2e5b145dd..cd6e3b42e0a 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -174,8 +174,7 @@ class Events // extends CommonObject
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
 			return $this->id;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -261,8 +260,7 @@ class Events // extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 18dd686367b..1458bc14d52 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -256,8 +256,7 @@ class ExtraFields
 			}
 			else return -2;
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 	}
@@ -339,15 +338,13 @@ class ExtraFields
 				}
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror();
 				$this->errno = $this->db->lasterrno();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			return 0;
 		}
 	}
@@ -406,8 +403,7 @@ class ExtraFields
 			{
 				$params = trim($param);
 			}
-			else
-			{
+			else {
 				$params = '';
 			}
 
@@ -466,8 +462,7 @@ class ExtraFields
 			{
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror();
 				$this->errno = $this->db->lasterrno();
 				return -1;
@@ -528,8 +523,7 @@ class ExtraFields
 
 			return $result;
 		}
-		else
-		{
+		else {
 			return 0;
 		}
 	}
@@ -563,14 +557,12 @@ class ExtraFields
 			{
 				return 1;
 			}
-			else
-			{
+			else {
 				dol_print_error($this->db);
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			return 0;
 		}
 	}
@@ -660,28 +652,24 @@ class ExtraFields
 					{
 						$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
 					}
-					else
-					{
+					else {
 						$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
 					}
 					dol_syslog(get_class($this).'::update', LOG_DEBUG);
 					$resql = $this->db->query($sql, 1, 'dml');
 					return 1;
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->lasterror();
 					return -1;
 				}
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			return 0;
 		}
 	}
@@ -744,8 +732,7 @@ class ExtraFields
 			{
 				$params = trim($param);
 			}
-			else
-			{
+			else {
 				$params = '';
 			}
 
@@ -757,8 +744,7 @@ class ExtraFields
 				$sql_del .= " AND entity IN (0, ".($entity === '' ? $conf->entity : $entity).")";
 				$sql_del .= " AND elementtype = '".$elementtype."'";
 			}
-			else
-			{
+			else {
 				// We want on all entities ($entities = '0'), we delete on all only (we keep setup specific to each entity)
 				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
 				$sql_del .= " WHERE name = '".$attrname."'";
@@ -824,15 +810,13 @@ class ExtraFields
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				dol_print_error($this->db);
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			return 0;
 		}
 	}
@@ -933,8 +917,7 @@ class ExtraFields
 			}
 			if ($elementtype) $this->attributes[$elementtype]['loaded'] = 1; // If nothing found, we also save tag 'loaded'
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch_name_optionals_label ".$this->error, LOG_ERR);
 		}
@@ -992,7 +975,7 @@ class ExtraFields
 			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
 			$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
-		else	// Old usage
+		else // Old usage
 		{
 			$label = $this->attribute_label[$key];
 			$type = $this->attribute_type[$key];
@@ -1041,8 +1024,7 @@ class ExtraFields
 			{
 				$morecss = '';
 			}
-			else
-			{
+			else {
 				if (round($size) < 12)
 				{
 					$morecss = 'minwidth100';
@@ -1051,8 +1033,7 @@ class ExtraFields
 				{
 					$morecss = 'minwidth200';
 				}
-				else
-				{
+				else {
 					$morecss = 'minwidth400';
 				}
 			}
@@ -1093,8 +1074,7 @@ class ExtraFields
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
 			}
-			else
-			{
+			else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
 		}
@@ -1106,8 +1086,7 @@ class ExtraFields
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
 			}
-			else
-			{
+			else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
 		}
@@ -1123,8 +1102,7 @@ class ExtraFields
 				}
 				$out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';
 			}
-			else
-			{
+			else {
 				$out .= $form->selectyesno($keyprefix.$key.$keysuffix, $value, 1, false, 1);
 			}
 		}
@@ -1603,7 +1581,7 @@ class ExtraFields
 			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
 			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
-		else	// Old usage
+		else // Old usage
 		{
 			//dol_syslog("Warning: parameter 'extrafieldsobjectkey' is missing", LOG_WARNING);
 			$label = $this->attribute_label[$key];
@@ -1741,8 +1719,7 @@ class ExtraFields
 						}
 					}
 				}
-				else
-				{
+				else {
 					$translabel = '';
 					if (!empty($obj->{$InfoFieldList[1]})) {
 						$translabel = $langs->trans($obj->{$InfoFieldList[1]});
@@ -1863,8 +1840,7 @@ class ExtraFields
 						$value = $object->getNomUrl(3);
 					}
 				}
-				else
-				{
+				else {
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 					return 'Error bad setup of extrafield';
 				}
@@ -1882,8 +1858,7 @@ class ExtraFields
 		{
 			$value = dol_trunc(preg_replace('/./i', '*', $value), 8, 'right', 'UTF-8', 1);
 		}
-		else
-		{
+		else {
 			$showsize = round($size);
 			if ($showsize > 48) $showsize = 48;
 		}
@@ -2086,8 +2061,7 @@ class ExtraFields
 					$value_arr = GETPOST("options_".$key, 'alpha');
 					$value_key = price2num($value_arr);
 				}
-				else
-				{
+				else {
 					$value_key = GETPOST("options_".$key);
 					if (in_array($key_type, array('link')) && $value_key == '-1') $value_key = '';
 				}
@@ -2125,8 +2099,7 @@ class ExtraFields
 		{
 			$extralabels = $this->attributes[$extrafieldsobjectkey]['label'];
 		}
-		else
-		{
+		else {
 			$extralabels = $extrafieldsobjectkey;
 		}
 
@@ -2163,8 +2136,7 @@ class ExtraFields
 					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
 					$value_key = price2num($value_arr);
 				}
-				else
-				{
+				else {
 					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
 					$value_key = GETPOST($keysuffix."options_".$key.$keyprefix);
 				}
diff --git a/htdocs/core/class/extralanguages.class.php b/htdocs/core/class/extralanguages.class.php
index 71a6fa8c1aa..4401eaaecbb 100644
--- a/htdocs/core/class/extralanguages.class.php
+++ b/htdocs/core/class/extralanguages.class.php
@@ -162,7 +162,7 @@ class ExtraLanguages
 			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
 			$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
-		else	// Old usage
+		else // Old usage
 		{
 			$label = $this->attribute_label[$key];
 			$type = $this->attribute_type[$key];
@@ -211,8 +211,7 @@ class ExtraLanguages
 			{
 				$morecss = '';
 			}
-			else
-			{
+			else {
 				if (round($size) < 12)
 				{
 					$morecss = 'minwidth100';
@@ -221,8 +220,7 @@ class ExtraLanguages
 				{
 					$morecss = 'minwidth200';
 				}
-				else
-				{
+				else {
 					$morecss = 'minwidth400';
 				}
 			}
@@ -263,8 +261,7 @@ class ExtraLanguages
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
 			}
-			else
-			{
+			else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
 		}
@@ -276,8 +273,7 @@ class ExtraLanguages
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
 			}
-			else
-			{
+			else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
 		}
@@ -293,8 +289,7 @@ class ExtraLanguages
 				}
 				$out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';
 			}
-			else
-			{
+			else {
 				$out .= $form->selectyesno($keyprefix.$key.$keysuffix, $value, 1, false, 1);
 			}
 		}
@@ -773,7 +768,7 @@ class ExtraLanguages
 			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
 			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
-		else	// Old usage
+		else // Old usage
 		{
 			//dol_syslog("Warning: parameter 'extrafieldsobjectkey' is missing", LOG_WARNING);
 			$label = $this->attribute_label[$key];
@@ -910,8 +905,7 @@ class ExtraLanguages
 						}
 					}
 				}
-				else
-				{
+				else {
 					$translabel = '';
 					if (!empty($obj->{$InfoFieldList[1]})) {
 						$translabel = $langs->trans($obj->{$InfoFieldList[1]});
@@ -1032,8 +1026,7 @@ class ExtraLanguages
 						$value = $object->getNomUrl(3);
 					}
 				}
-				else
-				{
+				else {
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 					return 'Error bad setup of extrafield';
 				}
@@ -1051,8 +1044,7 @@ class ExtraLanguages
 		{
 			$value = dol_trunc(preg_replace('/./i', '*', $value), 8, 'right', 'UTF-8', 1);
 		}
-		else
-		{
+		else {
 			$showsize = round($size);
 			if ($showsize > 48) $showsize = 48;
 		}
@@ -1255,8 +1247,7 @@ class ExtraLanguages
 					$value_arr = GETPOST("options_".$key, 'alpha');
 					$value_key = price2num($value_arr);
 				}
-				else
-				{
+				else {
 					$value_key = GETPOST("options_".$key);
 					if (in_array($key_type, array('link')) && $value_key == '-1') $value_key = '';
 				}
@@ -1294,8 +1285,7 @@ class ExtraLanguages
 		{
 			$extralabels = $this->attributes[$extrafieldsobjectkey]['label'];
 		}
-		else
-		{
+		else {
 			$extralabels = $extrafieldsobjectkey;
 		}
 
@@ -1332,8 +1322,7 @@ class ExtraLanguages
 					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
 					$value_key = price2num($value_arr);
 				}
-				else
-				{
+				else {
 					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
 					$value_key = GETPOST($keysuffix."options_".$key.$keyprefix);
 				}
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index c9bb7372bd2..f549c7520f7 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -299,8 +299,7 @@ class FileUpload
 			if (preg_match('/error/i', $res)) return false;
 			return true;
 		}
-		else
-		{
+		else {
 			return false;
 		}
 	}
@@ -452,8 +451,7 @@ class FileUpload
 					dol_move_uploaded_file($uploaded_file, $file_path, 1, 0, 0, 0, 'userfile');
 				}
 			}
-			else
-			{
+			else {
 				// Non-multipart uploads (PUT method support)
 				file_put_contents($file_path, fopen('php://input', 'r'), $append_file ? FILE_APPEND : 0);
 			}
@@ -494,8 +492,7 @@ class FileUpload
 		{
 			$info = $this->getFileObject($file_name);
 		}
-		else
-		{
+		else {
 			$info = $this->getFileObjects();
 		}
 		header('Content-type: application/json');
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index 514782593d9..a09d0bc3e30 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -158,15 +158,13 @@ class Fiscalyear extends CommonObject
 				$this->db->commit();
 				return $this->id;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return $result;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -207,8 +205,7 @@ class Fiscalyear extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			dol_syslog($this->error, LOG_ERR);
 			$this->db->rollback();
@@ -243,8 +240,7 @@ class Fiscalyear extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -269,8 +265,7 @@ class Fiscalyear extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -370,8 +365,7 @@ class Fiscalyear extends CommonObject
 			}
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index e24bce5e247..97c45e2f926 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -266,8 +266,7 @@ class HookManager
                     	if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
                     }
                     // Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
-                    else
-					{
+                    else {
                     	// TODO. this test should be done into the method of hook by returning nothing
                     	if (is_array($parameters) && !empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 32abc8f7240..977c1dc3268 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -125,8 +125,7 @@ class Form
 				if ($fieldrequired) $ret .= '</span>';
 				$ret .= '</div>'."\n";
 			}
-			else
-			{
+			else {
 				if ($fieldrequired) $ret .= '<span class="fieldrequired">';
 				if ($help) {
 					$ret .= $this->textwithpicto($langs->trans($text), $help);
@@ -136,8 +135,7 @@ class Form
 				if ($fieldrequired) $ret .= '</span>';
 			}
 		}
-		else
-		{
+		else {
 			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
 			if ($fieldrequired) $ret .= '<span class="fieldrequired">';
 			if ($help) {
@@ -191,8 +189,7 @@ class Form
 		{
 			$ret .= $this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $custommsg);
 		}
-		else
-		{
+		else {
 			if (GETPOST('action', 'aZ09') == 'edit'.$htmlname)
 			{
 				$ret .= "\n";
@@ -271,8 +268,7 @@ class Form
 				if (empty($notabletag)) $ret .= '</tr></table>'."\n";
 				$ret .= '</form>'."\n";
 			}
-			else
-			{
+			else {
 				if (preg_match('/^(email)/', $typeofdata))              $ret .= dol_print_email($value, 0, 0, 0, 0, 1);
 				elseif (preg_match('/^(amount|numeric)/', $typeofdata)) $ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');
 				elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))  $ret .= dol_htmlentitiesbr($value);
@@ -475,8 +471,7 @@ class Form
 				{
 					$out .= '<input id="ckeditor_toolbar" value="'.$toolbar.'" type="hidden"/>'."\n";
 				}
-				else
-				{
+				else {
 					$inputType = 'textarea';
 				}
 			}
@@ -496,8 +491,7 @@ class Form
 						if (!empty($custommsg['error']))
 							$out .= '<input id="errormsg_'.$htmlname.'" value="'.$custommsg['error'].'" type="hidden"/>'."\n";
 				}
-				else
-					$out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";
+				else $out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";
 			}
 			if ($inputType == 'textarea') {
 				$out .= '<input id="textarea_'.$htmlname.'_rows" value="'.$rows.'" type="hidden"/>'."\n";
@@ -506,8 +500,7 @@ class Form
 			$out .= '<span id="viewval_'.$htmlname.'" class="viewval_'.$inputType.($button_only ? ' inactive' : ' active').'">'.$value.'</span>'."\n";
 			$out .= '<span id="editval_'.$htmlname.'" class="editval_'.$inputType.($button_only ? ' inactive' : ' active').' hideobject">'.(!empty($editvalue) ? $editvalue : $value).'</span>'."\n";
 		}
-		else
-		{
+		else {
 			$out = $value;
 		}
 
@@ -556,8 +549,7 @@ class Form
 		{
 			$htmltext = str_replace('"', '&quot;', $htmltext);
 		}
-		else
-		{
+		else {
 			$classfortooltip = 'classfortooltiponclick';
 			$textfordialog .= '<div style="display: none;" id="idfortooltiponclick_'.$tooltiptrigger.'" class="classfortooltiponclicktext">'.$htmltext.'</div>';
 		}
@@ -629,8 +621,7 @@ class Form
 		if (empty($conf->use_javascript_ajax))
 		{
 			if ($type == 'info' || $type == 'infoclickable' || $type == 'help' || $type == 'helpclickable')	return $text;
-			else
-			{
+			else {
 				$alt = $htmltext;
 				$htmltext = '';
 			}
@@ -857,8 +848,7 @@ class Form
 						$foundselected = true;
 						$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'" selected>';
 					}
-					else
-					{
+					else {
 						$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'">';
 					}
 					if ($row['label']) $out .= dol_trunc($row['label'], $maxlength, 'middle');
@@ -869,8 +859,7 @@ class Form
 			}
 			$out .= '</select>';
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
@@ -948,8 +937,7 @@ class Form
 					{
 						$out .= '<option value="'.$row['rowid'].'" selected>';
 					}
-					else
-					{
+					else {
 						$out .= '<option value="'.$row['rowid'].'">';
 					}
 
@@ -967,8 +955,7 @@ class Form
 				$out .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'"></form>';
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
@@ -1074,8 +1061,7 @@ class Form
 
 			return $num;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1195,8 +1181,7 @@ class Form
 				$out .= img_picto($langs->trans("Search"), 'search');
 			}
 		}
-		else
-		{
+		else {
 			// Immediate load of all database
 			$out .= $this->select_thirdparty_list($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events, '', 0, $limit, $morecss, $moreparam, $multiple);
 		}
@@ -1327,8 +1312,7 @@ class Form
 						}
 						$label .= ' '.$obj->name;
 					}
-					else
-					{
+					else {
 						$label = $obj->name;
 					}
 
@@ -1358,13 +1342,11 @@ class Form
 						{
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
 						}
-						else
-						{
+						else {
 							$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';
 						}
 					}
-					else
-					{
+					else {
 						array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));
 					}
 
@@ -1374,8 +1356,7 @@ class Form
 			}
 			$out .= '</select>'."\n";
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
@@ -1456,8 +1437,7 @@ class Form
 			print '</select>';
 			return $qualifiedlines;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1588,8 +1568,7 @@ class Form
 								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
 								$out .= '</option>';
 							}
-							else
-							{
+							else {
 								$out .= '<option value="'.$obj->rowid.'"';
 								if ($disabled) $out .= ' disabled';
 								$out .= '>';
@@ -1599,8 +1578,7 @@ class Form
 								$out .= '</option>';
 							}
 						}
-						else
-						{
+						else {
 							if (in_array($obj->rowid, $selected))
 							{
 								$out .= $contactstatic->getFullName($langs);
@@ -1612,8 +1590,7 @@ class Form
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				$out .= '<option value="-1"'.(($showempty == 2 || $multiple) ? '' : ' selected').' disabled>';
 				$out .= ($socid != -1) ? ($langs->trans($socid ? "NoContactDefinedForThirdParty" : "NoContactDefined")) : $langs->trans('SelectAThirdPartyFirst');
 				$out .= '</option>';
@@ -1638,8 +1615,7 @@ class Form
 			$this->num = $num;
 			return $out;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1736,16 +1712,14 @@ class Form
 			if ($force_entity) $sql .= " WHERE u.entity IN (0,".$force_entity.")";
 			else $sql .= " WHERE u.entity IS NOT NULL";
 		}
-		else
-		{
+		else {
 			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 			{
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug";
 				$sql .= " ON ug.fk_user = u.rowid";
 				$sql .= " WHERE ug.entity = ".$conf->entity;
 			}
-			else
-			{
+			else {
 				$sql .= " WHERE u.entity IN (0,".$conf->entity.")";
 			}
 		}
@@ -1763,8 +1737,7 @@ class Form
 		{
 			$sql .= " ORDER BY u.firstname ASC";
 		}
-		else
-		{
+		else {
 			$sql .= " ORDER BY u.lastname ASC";
 		}
 
@@ -1804,8 +1777,7 @@ class Form
 						if ($disableline) $out .= ' disabled';
 						$out .= ' selected>';
 					}
-					else
-					{
+					else {
 						$out .= '<option value="'.$obj->rowid.'"';
 						if ($disableline) $out .= ' disabled';
 						$out .= '>';
@@ -1846,8 +1818,7 @@ class Form
 							$out .= ($moreinfo ? ' - ' : ' (').$langs->trans("AllEntities");
 							$moreinfo++;
 						}
-						else
-						{
+						else {
 							$out .= ($moreinfo ? ' - ' : ' (').($obj->label ? $obj->label : $langs->trans("EntityNameNotDefined"));
 							$moreinfo++;
 						}
@@ -1863,15 +1834,13 @@ class Form
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				$out .= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'" disabled>';
 				$out .= '<option value="">'.$langs->trans("None").'</option>';
 			}
 			$out .= '</select>';
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
@@ -1917,8 +1886,7 @@ class Form
 		{
 			$out .= '';
 		}
-		else
-		{
+		else {
 			$out .= '<input type="hidden" class="removedassignedhidden" name="removedassigned" value="">';
 			$out .= '<script type="text/javascript" language="javascript">jQuery(document).ready(function () {    jQuery(".removedassigned").click(function() {        jQuery(".removedassignedhidden").val(jQuery(this).val());    });})</script>';
 			$out .= $this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);
@@ -2129,8 +2097,7 @@ class Form
 				print img_picto($langs->trans("Search"), 'search');
 			}
 		}
-		else
-		{
+		else {
 			print $this->select_produits_list($selected, $htmlname, $filtertype, $limit, $price_level, '', $status, $finished, 0, $socid, $showempty, $forcecombo, $morecss, $hidepriceinlabel, $warehouseStatus);
 		}
 	}
@@ -2195,8 +2162,7 @@ class Form
 		{
 		    $selectFieldsGrouped = ", sum(".$db->ifsql("e.statut IS NULL", "0", "ps.reel").") as stock"; // e.statut is null if there is no record in stock
 		}
-		else
-		{
+		else {
 		    $selectFieldsGrouped = ", ".$db->ifsql("p.stock IS NULL", 0, "p.stock")." AS stock";
 		}
 
@@ -2343,8 +2309,7 @@ class Form
 			//ASC OR DESC order
 			($conf->global->PRODUCT_SORT_BY_CATEGORY == 1) ? $sql .= "ASC" : $sql .= "DESC";
 		}
-		else
-		{
+		else {
 			$sql .= $db->order("p.ref");
 		}
 
@@ -2379,8 +2344,7 @@ class Form
 				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
 				else $textifempty .= $langs->trans("All");
 			}
-			else
-			{
+			else {
 			    if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
 			}
 			if ($showempty) $out .= '<option value="0" selected>'.$textifempty.'</option>';
@@ -2432,8 +2396,7 @@ class Form
 						}
 					}
 				}
-				else
-				{
+				else {
 					if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_price_expression)) {
 						$price_product = new Product($this->db);
 						$price_product->fetch($objp->rowid, '', '', 1);
@@ -2466,8 +2429,7 @@ class Form
 			if (empty($outputmode)) return $out;
 			return $outarray;
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -2618,8 +2580,7 @@ class Form
 						$opt .= ' - '.price($objp2->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
 						$outval .= ' - '.price($objp2->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
 					}
-					else
-					{
+					else {
 						$opt .= ' - '.price($objp2->price_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
 						$outval .= ' - '.price($objp2->price_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
 					}
@@ -2629,8 +2590,7 @@ class Form
 					$outtva_tx = $objp2->tva_tx;
 				}
 			}
-			else
-			{
+			else {
 				dol_print_error($this->db);
 			}
 		}
@@ -2648,8 +2608,7 @@ class Form
 				$opt .= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding
 				$outval .= $langs->transnoentities("Unit");
 			}
-			else
-			{
+			else {
 				$opt .= ' - '.price($objp->price, 1, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
 				$outval .= ' - '.price($objp->price, 0, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
 				$opt .= $langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding
@@ -2684,8 +2643,7 @@ class Form
 					$opt .= ' - '.price($objp->custprice, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
 					$outval .= ' - '.price($objp->custprice, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
 				}
-				else
-				{
+				else {
 					$opt .= ' - '.price($objp->custprice_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
 					$outval .= ' - '.price($objp->custprice_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
 				}
@@ -2705,8 +2663,7 @@ class Form
 				$opt .= ' - '.price($objp->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
 				$outval .= ' - '.price($objp->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
 			}
-			else
-			{
+			else {
 				$opt .= ' - '.price($objp->price_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
 				$outval .= ' - '.price($objp->price_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
 			}
@@ -2795,8 +2752,7 @@ class Form
 			print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
 			print ($hidelabel ? '' : $langs->trans("RefOrLabel").' : ').'<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'">';
 		}
-		else
-		{
+		else {
 			print $this->select_produits_fournisseurs_list($socid, $selected, $htmlname, $filtertype, $filtre, '', -1, 0, 0, $alsoproductwithnosupplierprice, $morecss);
 		}
 	}
@@ -3006,8 +2962,7 @@ class Form
 						$optlabel .= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding
 						$outvallabel .= $langs->transnoentities("Unit");
 					}
-					else
-					{
+					else {
 						$optlabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
 						$outvallabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
 						$optlabel .= ' '.$langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding
@@ -3043,14 +2998,13 @@ class Form
 						$outvallabel .= " - ".$reputations[$objp->supplier_reputation];
 					}
 				}
-				else
-				{
+				else {
 					if (empty($alsoproductwithnosupplierprice))     // No supplier price defined for couple product/supplier
 					{
 						$optlabel .= " - <span class='opacitymedium'>".$langs->trans("NoPriceDefinedForThisSupplier").'</span>';
 						$outvallabel .= ' - '.$langs->transnoentities("NoPriceDefinedForThisSupplier");
 					}
-					else                                            // No supplier price defined for product, even on other suppliers
+					else // No supplier price defined for product, even on other suppliers
 					{
 						$optlabel .= " - <span class='opacitymedium'>".$langs->trans("NoPriceDefinedForThisSupplier").'</span>';
 						$outvallabel .= ' - '.$langs->transnoentities("NoPriceDefinedForThisSupplier");
@@ -3099,8 +3053,7 @@ class Form
 			if (empty($outputmode)) return $out;
 			return $outarray;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3146,8 +3099,7 @@ class Form
 			{
 				$form .= '<option value="0">-- '.$langs->trans("NoSupplierPriceDefinedForThisProduct").' --</option>';
 			}
-			else
-			{
+			else {
 				require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
 				$form .= '<option value="0">&nbsp;</option>';
 
@@ -3191,8 +3143,7 @@ class Form
 					{
 						$opt .= $langs->trans("Unit");
 					}
-					else
-					{
+					else {
 						$opt .= $langs->trans("Units");
 					}
 					if ($objp->quantity > 1)
@@ -3212,8 +3163,7 @@ class Form
 			$this->db->free($result);
 			return $form;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3255,8 +3205,7 @@ class Form
 					{
 						print '<option value="'.$obj->rowid.'" selected>'.$obj->label.'</option>';
 					}
-					else
-					{
+					else {
 						print '<option value="'.$obj->rowid.'">'.$obj->label.'</option>';
 					}
 					$i++;
@@ -3265,8 +3214,7 @@ class Form
 			print '</select>';
 			return $num;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3314,8 +3262,7 @@ class Form
 
 			return $num;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3363,8 +3310,7 @@ class Form
 
 			return $num;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3395,8 +3341,7 @@ class Form
 			{
 				print '<option value="'.$id.'" selected>';
 			}
-			else
-			{
+			else {
 				print '<option value="'.$id.'">';
 			}
 			print $arrayavailability['label'];
@@ -3448,8 +3393,7 @@ class Form
 			unset($tmparray);
 			return $num;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3481,8 +3425,7 @@ class Form
 			{
 				print '<option value="'.$arraydemandreason['id'].'" selected>';
 			}
-			else
-			{
+			else {
 				print '<option value="'.$arraydemandreason['id'].'">';
 			}
 			$label = $arraydemandreason['label']; // Translation of label was already done into the ->loadCacheInputReason
@@ -3539,8 +3482,7 @@ class Form
 
 			return $num;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3581,8 +3523,7 @@ class Form
 			{
 				print '<option value="'.$id.'" selected>';
 			}
-			else
-			{
+			else {
 				print '<option value="'.$id.'">';
 			}
 			print $arrayconditions['label'];
@@ -3686,8 +3627,7 @@ class Form
 			{
 				$return .= '<option value="'.$id.'" selected>'.$value;
 			}
-			else
-			{
+			else {
 				$return .= '<option value="'.$id.'">'.$value;
 			}
 			$return .= '</option>';
@@ -3829,8 +3769,7 @@ class Form
 				}
 			}
 		}
-		else
-		{
+		else {
 				dol_syslog("Error sql=".$sql.", error=".$this->error, LOG_ERR);
 		}
 		if ($opt == '<option value ="" selected></option>')
@@ -3876,8 +3815,7 @@ class Form
 				{
 				    $return .= '<option value="'.$res->rowid.'" selected>'.$unitLabel.'</option>';
 				}
-				else
-				{
+				else {
 				    $return .= '<option value="'.$res->rowid.'">'.$unitLabel.'</option>';
 				}
 			}
@@ -3936,8 +3874,7 @@ class Form
 					{
 						print '<option value="'.$obj->rowid.'" selected>';
 					}
-					else
-					{
+					else {
 						print '<option value="'.$obj->rowid.'">';
 					}
 					print trim($obj->label);
@@ -3948,8 +3885,7 @@ class Form
 				}
 				print "</select>";
 			}
-			else
-			{
+			else {
 				if ($status == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
 				else print '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';
 			}
@@ -4008,8 +3944,7 @@ class Form
 					{
 						print '<option value="'.$obj->rowid.'" selected>';
 					}
-					else
-					{
+					else {
 						print '<option value="'.$obj->rowid.'">';
 					}
 					print trim($obj->name);
@@ -4019,8 +3954,7 @@ class Form
 				}
 				print "</select>";
 			}
-			else
-			{
+			else {
 				if ($status == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveEstablishmentDefined").'</span>';
 				else print '<span class="opacitymedium">'.$langs->trans("NoEstablishmentFound").'</span>';
 			}
@@ -4119,8 +4053,7 @@ class Form
 			}
 			else dol_print_error($this->db);
 		}
-		else
-		{
+		else {
 			$cat = new Categorie($this->db);
             $cate_arbo = $cat->get_full_arbo($type, $markafterid, $include);
 		}
@@ -4130,8 +4063,7 @@ class Form
 		if (is_array($cate_arbo))
 		{
 			if (!count($cate_arbo)) $output .= '<option value="-1" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
-			else
-			{
+			else {
 				$output .= '<option value="-1">&nbsp;</option>';
 				foreach ($cate_arbo as $key => $value)
 				{
@@ -4139,8 +4071,7 @@ class Form
 					{
 						$add = 'selected ';
 					}
-					else
-					{
+					else {
 						$add = '';
 					}
 					$output .= '<option '.$add.'value="'.$cate_arbo[$key]['id'].'">'.dol_trunc($cate_arbo[$key]['fulllabel'], $maxlength, 'middle').'</option>';
@@ -4439,8 +4370,7 @@ class Form
             </script>';
 			$formconfirm .= "<!-- end ajax formconfirm -->\n";
 		}
-		else
-		{
+		else {
 			$formconfirm .= "\n<!-- begin formconfirm page=".$page." -->\n";
 
 			if (empty($disableformtag)) $formconfirm .= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";
@@ -4524,8 +4454,7 @@ class Form
 			$out .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 			$out .= '</form>';
 		}
-		else
-		{
+		else {
 			if ($selected)
 			{
 				$projet = new Project($this->db);
@@ -4533,8 +4462,7 @@ class Form
 				//print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
 				$out .= $projet->getNomUrl(0, '', 1);
 			}
-			else
-			{
+			else {
 				$out .= "&nbsp;";
 			}
 		}
@@ -4570,8 +4498,7 @@ class Form
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		}
-		else
-		{
+		else {
 			if ($selected)
 			{
 				$this->load_cache_conditions_paiements();
@@ -4605,8 +4532,7 @@ class Form
 			print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		}
-		else
-		{
+		else {
 			if ($selected)
 			{
 				$this->load_cache_availability();
@@ -4639,8 +4565,7 @@ class Form
 			print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		}
-		else
-		{
+		else {
 			if ($selected)
 			{
 				$this->loadCacheInputReason();
@@ -4690,8 +4615,7 @@ class Form
 			$ret .= '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			$ret .= '</tr></table></form>';
 		}
-		else
-		{
+		else {
 			if ($displayhour) $ret .= dol_print_date($selected, 'dayhour');
 			else $ret .= dol_print_date($selected, 'day');
 		}
@@ -4726,8 +4650,7 @@ class Form
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		}
-		else
-		{
+		else {
 			if ($selected)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -4766,8 +4689,7 @@ class Form
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		}
-		else
-		{
+		else {
 			if ($selected)
 			{
 				$this->load_cache_types_paiements();
@@ -4800,8 +4722,7 @@ class Form
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		}
-		else
-		{
+		else {
 			dol_include_once('/core/lib/company.lib.php');
 			print !empty($selected) ? currency_name($selected, 1) : '&nbsp;';
 		}
@@ -4835,15 +4756,13 @@ class Form
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		}
-		else
-		{
+		else {
 			if (!empty($rate))
 			{
 				print price($rate, 1, $langs, 1, 0);
 				if ($currency && $rate != 1) print ' &nbsp; ('.price($rate, 1, $langs, 1, 0).' '.$currency.' = 1 '.$conf->currency.')';
 			}
-			else
-			{
+			else {
 				print 1;
 			}
 		}
@@ -4882,8 +4801,7 @@ class Form
 					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL") $translationKey = 'HasAbsoluteDiscountFromSupplier'; // If we want deposit to be substracted to payments only and not to total of final invoice
 					else $translationKey = 'HasCreditNoteFromSupplier';
 				}
-				else
-				{
+				else {
 					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") $translationKey = 'HasAbsoluteDiscountFromSupplier';
 					else $translationKey = 'HasCreditNoteFromSupplier';
 				}
@@ -4893,8 +4811,7 @@ class Form
 					if (!$filter || $filter == "fk_facture_source IS NULL") $translationKey = 'CompanyHasAbsoluteDiscount'; // If we want deposit to be substracted to payments only and not to total of final invoice
 					else $translationKey = 'CompanyHasCreditNote';
 				}
-				else
-				{
+				else {
 					if (!$filter || $filter == "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") $translationKey = 'CompanyHasAbsoluteDiscount';
 					else $translationKey = 'CompanyHasCreditNote';
 				}
@@ -4933,14 +4850,12 @@ class Form
 			}
 			print '</form>';
 		}
-		else
-		{
+		else {
 			if ($selected)
 			{
 				print $selected;
 			}
-			else
-			{
+			else {
 				print "0";
 			}
 		}
@@ -4979,8 +4894,7 @@ class Form
 			print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
 		}
-		else
-		{
+		else {
 			if ($selected)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -5023,8 +4937,7 @@ class Form
 			$out .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			$out .= '</form>';
 		}
-		else
-		{
+		else {
 			if ($selected)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
@@ -5032,8 +4945,7 @@ class Form
 				$soc->fetch($selected);
 				$out .= $soc->getNomUrl($langs);
 			}
-			else
-			{
+			else {
 				$out .= "&nbsp;";
 			}
 		}
@@ -5082,8 +4994,7 @@ class Form
 			{
 				$out .= '<option value="'.$code_iso.'" selected>';
 			}
-			else
-			{
+			else {
 				$out .= '<option value="'.$code_iso.'">';
 			}
 			$out .= $currency['label'];
@@ -5091,8 +5002,7 @@ class Form
 			{
 			    $out .= ' ('.$code_iso.')';
 			}
-			else
-			{
+			else {
                 $out .= ' ('.$langs->getCurrencySymbol($code_iso).')';
 			}
 			$out .= '</option>';
@@ -5217,14 +5127,12 @@ class Form
 
 				return $num;
 			}
-			else
-			{
+			else {
 				$this->error = '<font class="error">'.$langs->trans("ErrorNoVATRateDefinedForSellerCountry", $country_code).'</font>';
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = '<font class="error">'.$this->db->error().'</font>';
 			return -2;
 		}
@@ -5280,8 +5188,7 @@ class Form
 			{
 				$return .= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</font>';
 			}
-			else
-			{
+			else {
 				$return .= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</font>';
 			}
 			return $return;
@@ -5297,8 +5204,7 @@ class Form
 		{
 			$code_country = "'".$societe_vendeuse->country_code."'";
 		}
-		else
-		{
+		else {
 			$code_country = "'".$mysoc->country_code."'"; // Pour compatibilite ascendente
 		}
 		if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC))    // If option to have vat for end customer for services is on
@@ -5318,8 +5224,7 @@ class Form
 				{
 					$code_country .= ",'".$societe_acheteuse->country_code."'";
 				}
-				else
-				{
+				else {
 					$prodstatic = new Product($this->db);
 					$prodstatic->fetch($idprod);
 					if ($prodstatic->type == Product::TYPE_SERVICE)   // We know product is a service
@@ -5406,8 +5311,7 @@ class Form
 				{
 					$return .= $rate['labelpositiverates'];
 				}
-				else
-				{
+				else {
 					$return .= vatrate($rate['label']);
 				}
 				//$return.=($rate['code']?' '.$rate['code']:'');
@@ -5418,8 +5322,7 @@ class Form
 
 			if (!$options_only) $return .= '</select>';
 		}
-		else
-		{
+		else {
 			$return .= $this->error;
 		}
 
@@ -5533,15 +5436,13 @@ class Form
 				$smin = dol_print_date($set_time, "%M");
 				$ssec = dol_print_date($set_time, "%S");
 			}
-			else
-			{
+			else {
 				$shour = '';
 				$smin = '';
 				$ssec = '';
 			}
 		}
-		else
-		{
+		else {
 			// Date est '' ou vaut -1
 			$syear = '';
 			$smonth = '';
@@ -5649,8 +5550,7 @@ class Form
                 		$retstring.='});';
                 		$retstring.="</script>";*/
 					}
-					else
-					{
+					else {
 						$retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
 					}
 
@@ -5659,14 +5559,12 @@ class Form
 					$retstring .= '<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";
 					$retstring .= '<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";
 				}
-				else
-				{
+				else {
 					$retstring .= "Bad value of MAIN_POPUP_CALENDAR";
 				}
 			}
 			// Show date with combo selects
-			else
-			{
+			else {
 				//$retstring.='<div class="inline-block">';
 				// Day
 				$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50imp" id="'.$prefix.'day" name="'.$prefix.'day">';
@@ -5703,8 +5601,7 @@ class Form
 				{
 					$retstring .= '<input'.($disabled ? ' disabled' : '').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat maxwidth50imp valignmiddle" type="number" min="0" max="3000" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">';
 				}
-				else
-				{
+				else {
 					$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'year" name="'.$prefix.'year">';
 
 					for ($year = $syear - 10; $year < $syear + 10; $year++)
@@ -6049,8 +5946,7 @@ class Form
 			if ($placeholder) $placeholder = ' placeholder="'.$placeholder.'"';
 			$out .= '<input type="text" class="'.$morecss.'"'.($disabled ? ' disabled="disabled"' : '').' name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
 		}
-		else
-		{
+		else {
 			// Immediate load of table record. Note: filter is inside $objecttmp->filter
 			$out .= $this->selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty, $searchkey, $placeholder, $morecss, $moreparams, $forcecombo, 0, $disabled);
 		}
@@ -6079,8 +5975,7 @@ class Form
 		{
 			$tmpescaped = "'".$db->escape($regbis[1])."'";
 		}
-		else
-		{
+		else {
 			$tmpescaped = $db->escape($tmpescaped);
 		}
 		return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
@@ -6123,8 +6018,7 @@ class Form
 			}
 			if ($tmpfieldstoshow) $fieldstoshow = $tmpfieldstoshow;
 		}
-        else
-        {
+        else {
 			// For backward compatibility
 			$objecttmp->fields['ref'] = array('type'=>'varchar(30)', 'label'=>'Ref', 'showoncombobox'=>1);
         }
@@ -6134,8 +6028,7 @@ class Form
 			if (isset($objecttmp->fields['ref'])) {
 				$fieldstoshow = 't.ref';
 			}
-			else
-			{
+			else {
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorNoFieldWithAttributeShowoncombobox");
 				return $langs->trans('ErrorNoFieldWithAttributeShowoncombobox');
@@ -6224,13 +6117,11 @@ class Form
 						{
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
 						}
-						else
-						{
+						else {
 							$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';
 						}
 					}
-					else
-					{
+					else {
 						array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));
 					}
 
@@ -6241,8 +6132,7 @@ class Form
 
 			$out .= '</select>'."\n";
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
@@ -6349,8 +6239,7 @@ class Form
 					if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value));
 					else $selectOptionValue = $key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value);
 				}
-				else
-				{
+				else {
 					if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($maxlen ?dol_trunc($value, $maxlen) : $value);
 					else $selectOptionValue = $maxlen ?dol_trunc($value, $maxlen) : $value;
 					if ($value == '' || $value == '-') $selectOptionValue = '&nbsp;';
@@ -6479,8 +6368,7 @@ class Form
 		{
 			$delayedhtmlcontent .= $outdelayed;
 		}
-		else
-		{
+		else {
 			$out .= $outdelayed;
 		}
 		return $out;
@@ -6597,8 +6485,7 @@ class Form
 		{
 			$delayedhtmlcontent .= $outdelayed;
 		}
-		else
-		{
+		else {
 			$out .= $outdelayed;
 		}
 		return $out;
@@ -6646,8 +6533,7 @@ class Form
 				{
 					$out .= 'return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png"> \'+record.text+\'</span>\';';
 				}
-				else
-				{
+				else {
 					$out .= 'return record.text;';
 				}
 				$out .= '};'."\n";
@@ -6656,8 +6542,7 @@ class Form
 				{
 					$out .= 'return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png"> \'+record.text+\'</span>\';';
 				}
-				else
-				{
+				else {
 					$out .= 'return record.text;';
 				}
 				$out .= '};'."\n";
@@ -7161,8 +7046,7 @@ class Form
     		</dd>
     		</dl>';
 		}
-		else
-		{
+		else {
 			$linktoelem = '';
 		}
 
@@ -7213,8 +7097,7 @@ class Form
 			$resultyesno .= '<option value="'.$yes.'" selected>'.$langs->trans("Yes").'</option>'."\n";
 			$resultyesno .= '<option value="'.$no.'">'.$langs->trans("No").'</option>'."\n";
 		}
-		else
-	    {
+		else {
 	   		$selected = (($useempty && $value != '0' && $value != 'no') ? '' : ' selected');
 			$resultyesno .= '<option value="'.$yes.'">'.$langs->trans("Yes").'</option>'."\n";
 			$resultyesno .= '<option value="'.$no.'"'.$selected.'>'.$langs->trans("No").'</option>'."\n";
@@ -7258,8 +7141,7 @@ class Form
 				{
 					print '<option value="'.$obj->rowid.'" selected>';
 				}
-				else
-				{
+				else {
 					print '<option value="'.$obj->rowid.'">';
 				}
 				print $obj->label;
@@ -7334,8 +7216,7 @@ class Form
 			{
 				$stringforfirstkey .= ' ALT + SHIFT +';
 			}
-			else
-			{
+			else {
 				$stringforfirstkey .= ' CTL +';
 			}
 
@@ -7578,8 +7459,7 @@ class Form
 			$email = $object->email;
 			$capture = 'user';
 		}
-		else
-		{
+		else {
 			// Generic case to show photos
 			$dir = $conf->$modulepart->dir_output;
 			if (!empty($object->photo))
@@ -7619,8 +7499,7 @@ class Form
 				$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Photo alt" id="photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" class="'.$cssclass.'" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($altfile).'&cache='.$cache.'">';
 				if ($addlinktofullsize) $ret .= '</a>';
 			}
-			else
-			{
+			else {
 				$nophoto = '/public/theme/common/nophoto.png';
 				if (in_array($modulepart, array('userphoto', 'contact', 'memberphoto')))	// For module that are "physical" users
 				{
@@ -7645,8 +7524,7 @@ class Form
 					$defaultimg = 'mm';
 					$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Gravatar avatar" title="'.$email.' Gravatar avatar" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="https://www.gravatar.com/avatar/'.md5(strtolower(trim($email))).'?s='.$width.'&d='.$defaultimg.'">'; // gravatar need md5 hash
 				}
-				else
-				{
+				else {
 					$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.$nophoto.'">';
 				}
 			}
@@ -7709,8 +7587,7 @@ class Form
 			if ($force_entity) $sql .= " WHERE ug.entity IN (0,".$force_entity.")";
 			else $sql .= " WHERE ug.entity IS NOT NULL";
 		}
-		else
-		{
+		else {
 			$sql .= " WHERE ug.entity IN (0,".$conf->entity.")";
 		}
 		if (is_array($exclude) && $excludeGroups) $sql .= " AND ug.rowid NOT IN ('".$excludeGroups."')";
@@ -7757,15 +7634,13 @@ class Form
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				if ($show_empty) $out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'></option>'."\n";
 				$out .= '<option value="" disabled>'.$langs->trans("NoUserGroupDefined").'</option>';
 			}
 			$out .= '</select>';
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
@@ -7933,8 +7808,7 @@ class Form
 				}
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -7969,8 +7843,7 @@ class Form
 			}
 			$out .= '</select>';
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -8012,8 +7885,7 @@ class Form
 			}
 			$out .= '</select>';
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -8110,8 +7982,7 @@ class Form
 					{
 						// Do nothing
 					}
-					else
-					{
+					else {
 						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
 						{
 							$i++;
@@ -8149,14 +8020,12 @@ class Form
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out .= '>'.$labeltoshow.'</option>';
 						}
-						else
-						{
+						else {
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
 								$resultat = '';
 							}
-							else
-							{
+							else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
@@ -8180,8 +8049,7 @@ class Form
 			$this->db->free($resql);
 			return $num;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 19fa3f6fb26..b254b74b6b9 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -83,8 +83,7 @@ class FormAccounting extends Form
 		    $options = $this->options_cache[$usecache];
 		    $selected = $selectid;
 		}
-		else
-		{
+		else {
 			$sql = "SELECT rowid, code, label, nature, entity, active";
 			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
 			$sql .= " WHERE active = 1";
@@ -171,8 +170,7 @@ class FormAccounting extends Form
             if (empty($allcountries)) $sql .= " AND c.fk_country = ".$mysoc->country_id;
             $sql .= " ORDER BY c.label ASC";
         }
-        else
-        {
+        else {
             $sql = "SELECT c.rowid, c.label as type, c.range_account";
             $sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c, ".MAIN_DB_PREFIX."c_country as co";
             $sql .= " WHERE c.active = 1";
@@ -205,13 +203,11 @@ class FormAccounting extends Form
                 $out .= '</select>';
                 //if ($user->admin && $help) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
             }
-            else
-            {
+            else {
                 $out .= $langs->trans("ErrorNoAccountingCategoryForThisCountry", $mysoc->country_code);
             }
         }
-        else
-        {
+        else {
             dol_print_error($db, $db->lasterror());
         }
 
@@ -288,8 +284,7 @@ class FormAccounting extends Form
 		    $options = $options + $this->options_cache[$usecache]; // We use + instead of array_merge because we don't want to reindex key from 0
 		    $selected = $selectid;
 		}
-		else
-		{
+		else {
     		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT) ? 50 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT;
 
     		$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.labelshort, aa.rowid, aa.fk_pcg_version";
@@ -316,8 +311,7 @@ class FormAccounting extends Form
 				{
 					$labeltoshow = $obj->label;
 				}
-				else
-				{
+				else {
 					$labeltoshow = $obj->labelshort;
 				}
 
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 398e2b8a235..75383f2825e 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -148,8 +148,7 @@ class FormActions
     	        print '<span class="hideonsmartphone hideifna">%</span>';
             }
         }
-        else
-		{
+        else {
             print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit ? '' : ' disabled').'>%';
         }
     }
@@ -248,8 +247,7 @@ class FormActions
 	        			{
 	        				$tmpuser = $cacheusers[$actioncomm->userownerid];
 	        			}
-	        			else
-	        			{
+	        			else {
 	        				$tmpuser = new User($this->db);
 	        				$tmpuser->fetch($actioncomm->userownerid);
 	        				$cacheusers[$actioncomm->userownerid] = $tmpuser;
@@ -310,8 +308,7 @@ class FormActions
 	        		$cursorevent++;
 	        	}
         	}
-        	else
-        	{
+        	else {
         		print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         	}
 
@@ -373,8 +370,7 @@ class FormActions
 	        if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
 			$out .= $form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
 		}
-		else
-		{
+		else {
 			$out .= $form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200'.($morecss ? ' '.$morecss : ''), 1);
 		}
 
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index 16e9a70ab56..27f622bed5b 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -115,8 +115,7 @@ class FormAdmin
 			{
 				$out .= '<option value="'.$keytouse.'" selected>'.$valuetoshow.'</option>';
 			}
-			else
-			{
+			else {
 				$out .= '<option value="'.$keytouse.'">'.$valuetoshow.'</option>';
 			}
 		}
@@ -185,8 +184,7 @@ class FormAdmin
     	                        {
     	        					$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'" selected>'.$filelib.'</option>';
     	                        }
-    	                        else
-    	                        {
+    	                        else {
     	                            $menuarray[$prefix.'_'.$file] = '<option value="'.$file.'">'.$filelib.'</option>';
     	                        }
     	                    }
@@ -386,8 +384,7 @@ class FormAdmin
                 $i++;
             }
         }
-        else
-		{
+        else {
 			dol_print_error($this->db);
 			return '';
 		}
@@ -406,8 +403,7 @@ class FormAdmin
 			{
 				$out .= '<option value="'.$key.'" selected>'.$value.'</option>';
 			}
-			else
-			{
+			else {
 				$out .= '<option value="'.$key.'">'.$value.'</option>';
 			}
 		}
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 6fb02454311..a5e31916827 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -257,8 +257,7 @@ class FormCompany extends Form
 						{
 							$out .= '<option value="'.$obj->rowid.'" selected>';
 						}
-						else
-						{
+						else {
 							$out .= '<option value="'.$obj->rowid.'">';
 						}
 
@@ -289,8 +288,7 @@ class FormCompany extends Form
 			if (!empty($htmlname)) $out .= '</select>';
 			if (!empty($htmlname) && $user->admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
@@ -357,8 +355,7 @@ class FormCompany extends Form
 						{
 							print '<option value="'.$obj->code.'" selected>'.$obj->label.'</option>';
 						}
-						else
-						{
+						else {
 							print '<option value="'.$obj->code.'">'.$obj->label.'</option>';
 						}
 					}
@@ -367,8 +364,7 @@ class FormCompany extends Form
 			}
 			print '</select>';
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -410,8 +406,7 @@ class FormCompany extends Form
 					{
 						$out .= '<option value="'.$obj->code.'" selected>';
 					}
-					else
-					{
+					else {
 						$out .= '<option value="'.$obj->code.'">';
 					}
 					// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
@@ -423,8 +418,7 @@ class FormCompany extends Form
 			$out .= '</select>';
 			if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
@@ -526,8 +520,7 @@ class FormCompany extends Form
 					{
 						$out .= '<option value="'.$val['code'].'" selected>';
 					}
-					else
-					{
+					else {
 						$out .= '<option value="'.$val['code'].'">';
 					}
 					// If translation exists, we use it, otherwise we use default label in database
@@ -544,8 +537,7 @@ class FormCompany extends Form
 
 			$out .= '</div>';
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
@@ -653,8 +645,7 @@ class FormCompany extends Form
 			print ajax_autocompleter(($socid ? $socid : -1), $htmlname, DOL_URL_ROOT.'/societe/ajaxcompanies.php', '', $minLength, 0);
 			return $socid;
 		}
-		else
-		{
+		else {
 			// Search to list thirdparties
 			$sql = "SELECT s.rowid, s.nom as name FROM";
 			$sql .= " ".MAIN_DB_PREFIX."societe as s";
@@ -693,8 +684,7 @@ class FormCompany extends Form
 							print ' selected>'.dol_trunc($obj->name, 24).'</option>';
 							$firstCompany = $obj->rowid;
 						}
-						else
-						{
+						else {
 							print '<option value="'.$obj->rowid.'"';
 							if ($disabled) print ' disabled';
 							print '>'.dol_trunc($obj->name, 24).'</option>';
@@ -706,8 +696,7 @@ class FormCompany extends Form
 				print ajax_combobox($htmlname);
 				return $firstCompany;
 			}
-			else
-			{
+			else {
 				dol_print_error($this->db);
 				return 0;
 			}
@@ -914,8 +903,7 @@ class FormCompany extends Form
     				{
     					print '<option value="'.$valors[$i].'" selected>';
     				}
-    				else
-    				{
+    				else {
     					print '<option value="'.$valors[$i].'">';
     				}
     				print $valors[$i];
diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index 2235ac6b335..75586e65b04 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -104,8 +104,7 @@ class FormContract
 					{
 						// Do nothing
 					}
-					else
-					{
+					else {
 						$labeltoshow = dol_trunc($obj->ref, 18);
 						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 						//else $labeltoshow.=' ('.$langs->trans("Private").')';
@@ -113,8 +112,7 @@ class FormContract
 						{
 							print '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 						}
-						else
-						{
+						else {
 							$disabled = 0;
 							if ($obj->statut == 0)
 							{
@@ -131,8 +129,7 @@ class FormContract
 							{
 								$resultat = '';
 							}
-							else
-							{
+							else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
@@ -158,8 +155,7 @@ class FormContract
 
 			return $num;
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 			return -1;
 		}
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 26abcf2e721..b2e8b9763b9 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -102,8 +102,7 @@ class FormFile
 			// TODO: This break feature to upload links too
 			return $this->_formAjaxFileUpload($object);
 		}
-		else
-	   	{
+		else {
 			//If there is no permission and the option to hide unauthorized actions is enabled, then nothing is printed
 			if (!$perm && !empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
 				return 1;
@@ -197,8 +196,7 @@ class FormFile
 					$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow), 1);
 				}
 			}
-			else
-			{
+			else {
 				$out .= ' ('.$langs->trans("UploadDisabled").')';
 			}
 			$out .= "</td></tr>";
@@ -424,8 +422,7 @@ class FormFile
 			{
 				$showempty = 1;
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php';
 					$modellist = ModeleThirdPartyDoc::liste_modeles($this->db);
 				}
@@ -433,8 +430,7 @@ class FormFile
 			elseif ($modulepart == 'propal')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
 					$modellist = ModelePDFPropales::liste_modeles($this->db);
 				}
@@ -442,8 +438,7 @@ class FormFile
 			elseif ($modulepart == 'supplier_proposal')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php';
 					$modellist = ModelePDFSupplierProposal::liste_modeles($this->db);
 				}
@@ -451,8 +446,7 @@ class FormFile
 			elseif ($modulepart == 'commande')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
 					$modellist = ModelePDFCommandes::liste_modeles($this->db);
 				}
@@ -460,8 +454,7 @@ class FormFile
 			elseif ($modulepart == 'expedition')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
 					$modellist = ModelePDFExpedition::liste_modeles($this->db);
 				}
@@ -469,8 +462,7 @@ class FormFile
             elseif ($modulepart == 'reception')
             {
                 if (is_array($genallowed)) $modellist = $genallowed;
-                else
-                {
+                else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
 					$modellist = ModelePdfReception::liste_modeles($this->db);
 				}
@@ -478,8 +470,7 @@ class FormFile
 			elseif ($modulepart == 'livraison')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
 					$modellist = ModelePDFDeliveryOrder::liste_modeles($this->db);
 				}
@@ -487,8 +478,7 @@ class FormFile
 			elseif ($modulepart == 'ficheinter')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
 					$modellist = ModelePDFFicheinter::liste_modeles($this->db);
 				}
@@ -496,8 +486,7 @@ class FormFile
 			elseif ($modulepart == 'facture')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 					$modellist = ModelePDFFactures::liste_modeles($this->db);
 				}
@@ -505,8 +494,7 @@ class FormFile
 			elseif ($modulepart == 'contract')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
 					$modellist = ModelePDFContract::liste_modeles($this->db);
 				}
@@ -514,8 +502,7 @@ class FormFile
 			elseif ($modulepart == 'project')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
 					$modellist = ModelePDFProjects::liste_modeles($this->db);
 				}
@@ -523,8 +510,7 @@ class FormFile
 			elseif ($modulepart == 'project_task')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
 					$modellist = ModelePDFTask::liste_modeles($this->db);
 				}
@@ -532,8 +518,7 @@ class FormFile
 			elseif ($modulepart == 'product')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
 					$modellist = ModelePDFProduct::liste_modeles($this->db);
 				}
@@ -541,8 +526,7 @@ class FormFile
 			elseif ($modulepart == 'product_batch')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/product_batch/modules_product_batch.class.php';
 					$modellist = ModelePDFProductBatch::liste_modeles($this->db);
 				}
@@ -550,8 +534,7 @@ class FormFile
 			elseif ($modulepart == 'stock')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_stock.php';
 					$modellist = ModelePDFStock::liste_modeles($this->db);
 				}
@@ -559,8 +542,7 @@ class FormFile
 			elseif ($modulepart == 'movement')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_movement.php';
 					$modellist = ModelePDFMovement::liste_modeles($this->db);
 				}
@@ -568,8 +550,7 @@ class FormFile
 			elseif ($modulepart == 'export')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
 					$modellist = ModeleExports::liste_modeles($this->db);
 				}
@@ -577,8 +558,7 @@ class FormFile
 			elseif ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
 					$modellist = ModelePDFSuppliersOrders::liste_modeles($this->db);
 				}
@@ -586,8 +566,7 @@ class FormFile
 			elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
 					$modellist = ModelePDFSuppliersInvoices::liste_modeles($this->db);
 				}
@@ -595,8 +574,7 @@ class FormFile
 			elseif ($modulepart == 'supplier_payment')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
 					$modellist = ModelePDFSuppliersPayments::liste_modeles($this->db);
 				}
@@ -604,8 +582,7 @@ class FormFile
 			elseif ($modulepart == 'remisecheque')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
 					$modellist = ModeleChequeReceipts::liste_modeles($this->db);
 				}
@@ -613,8 +590,7 @@ class FormFile
 			elseif ($modulepart == 'donation')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
 					$modellist = ModeleDon::liste_modeles($this->db);
 				}
@@ -622,8 +598,7 @@ class FormFile
 			elseif ($modulepart == 'member')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_cards.php';
 					$modellist = ModelePDFCards::liste_modeles($this->db);
 				}
@@ -631,8 +606,7 @@ class FormFile
 			elseif ($modulepart == 'agenda' || $modulepart == 'actions')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/action/modules_action.php';
 					$modellist = ModeleAction::liste_modeles($this->db);
 				}
@@ -640,8 +614,7 @@ class FormFile
 			elseif ($modulepart == 'expensereport')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
 					$modellist = ModeleExpenseReport::liste_modeles($this->db);
 				}
@@ -653,8 +626,7 @@ class FormFile
 			elseif ($modulepart == 'user')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/user/modules_user.class.php';
 					$modellist = ModelePDFUser::liste_modeles($this->db);
 				}
@@ -662,14 +634,12 @@ class FormFile
 			elseif ($modulepart == 'usergroup')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/usergroup/modules_usergroup.class.php';
 					$modellist = ModelePDFUserGroup::liste_modeles($this->db);
 				}
 			}
-			else
-			{
+			else {
 			    $submodulepart = $modulepart;
 
 			    // modulepart = 'nameofmodule' or 'nameofmodule:nameofsubmodule'
@@ -686,8 +656,7 @@ class FormFile
 					$res = include_once $file;
 				}
 				// For normalized external modules.
-				else
-				{
+				else {
 				    $file = dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.$submodulepart.'.php', 0);
 					$res = include_once $file;
 				}
@@ -697,8 +666,7 @@ class FormFile
 				{
 					$modellist = call_user_func($class.'::liste_modeles', $this->db);
 				}
-				else
-				{
+				else {
 					dol_print_error($this->db, "Bad value for modulepart '".$modulepart."' in showdocuments");
 					return -1;
 				}
@@ -743,8 +711,7 @@ class FormFile
 					$out .= ajax_combobox('model');
 				}
 			}
-			else
-			{
+			else {
 				$out .= '<div class="float">'.$langs->trans("Files").'</div>';
 			}
 
@@ -758,8 +725,7 @@ class FormFile
 				if ($conf->browser->layout == 'phone') $morecss = 'maxwidth100';
 				$out .= $formadmin->select_language($defaultlang, 'lang_id', 0, null, 0, 0, 0, $morecss);
 			}
-			else
-			{
+			else {
 				$out .= '&nbsp;';
 			}
 
@@ -896,8 +862,7 @@ class FormFile
 							$out .= $hookmanager->resPrint; // Complete line
 							$out .= '</tr>';
 						}
-						else
-						{
+						else {
 							$out = $hookmanager->resPrint; // Replace all $out
 						}
 			  		}
@@ -984,8 +949,7 @@ class FormFile
 		{
 			$filterforfilesearch = preg_quote(basename($modulesubdir), '/');
 		}
-		else
-		{
+		else {
 			$filterforfilesearch = preg_quote(basename($modulesubdir), '/').'[^\-]+';
 		}
 		$file_list = dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$'); // We also discard .meta and .png preview
@@ -1053,8 +1017,7 @@ class FormFile
 
 			if (!$found) $out = '';
 		}
-		else
-		{
+		else {
 			// TODO Add link to regenerate doc ?
 			//$out.= '<div id="gen_pdf_'.$modulesubdir.'" class="linkobject hideobject">'.img_picto('', 'refresh').'</div>'."\n";
 		}
@@ -1153,8 +1116,7 @@ class FormFile
 		{
 			return $reshook;
 		}
-		else
-		{
+		else {
 			if (!is_object($form))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; // The compoent may be included into ajax page that does not include the Form class
@@ -1275,8 +1237,7 @@ class FormFile
 						print '<input type="text" name="renamefileto" class="quatrevingtpercent" value="'.dol_escape_htmltag($file['name']).'">';
 						$editline = 1;
 					}
-					else
-					{
+					else {
 						print dol_trunc($file['name'], 200);
 						print '</a>';
 					}
@@ -1310,8 +1271,7 @@ class FormFile
 						    {
 						        $smallfile = getImageFileNameForSize($file['name'], ''); // There is no thumb for ECM module and Media filemanager, so we use true image
 						    }
-						    else
-						    {
+						    else {
 						        $smallfile = getImageFileNameForSize($file['name'], '_small'); // For new thumbs using same ext (in lower case however) than original
 						    }
 						    if (!dol_is_file($file['path'].'/'.$smallfile)) $smallfile = getImageFileNameForSize($file['name'], '_small', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
@@ -1340,8 +1300,7 @@ class FormFile
 							print $langs->trans("FileSharedViaALink").' ';
 							print '<input class="inline-block" type="checkbox" name="shareenabled"'.($file['share'] ? ' checked="checked"' : '').' /> ';
 						}
-						else
-						{
+						else {
 							if ($file['share'])
 							{
 								// Define $urlwithroot
@@ -1360,8 +1319,7 @@ class FormFile
 								print img_picto($langs->trans("FileSharedViaALink"), 'globe').' ';
 								print '<input type="text" class="quatrevingtpercent minwidth200imp" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
 							}
-							else
-							{
+							else {
 								//print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
 							}
 						}
@@ -1426,8 +1384,7 @@ class FormFile
 							}
 					    }
 					}
-					else
-					{
+					else {
 						print '<td class="right">';
 						print '<input type="hidden" name="ecmfileid" value="'.$filearray[$key]['rowid'].'">';
 						print '<input type="submit" class="button" name="renamefilesave" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -1641,8 +1598,7 @@ class FormFile
 				{
 					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : '');
 				}
-				else
-				{
+				else {
 				    //print 'Error: Value for modulepart = '.$modulepart.' is not yet implemented in function list_of_autoecmfiles'."\n";
 				}
 
@@ -1652,8 +1608,7 @@ class FormFile
 				{
 					$found = 1;
 				}
-				else
-				{
+				else {
 					//print 'Fetch '.$id." - ".$ref.'<br>';
 
 					if ($id) {
@@ -1875,8 +1830,7 @@ class FormFile
 				print '<input type="submit" name="cancel" class="button" value="'.dol_escape_htmltag($langs->trans('Cancel')).'">';
 				print '</td>';
 			}
-			else
-			{
+			else {
 				print '<td>';
 				print img_picto('', 'globe').' ';
 				print '<a data-ajax="false" href="'.$link->url.'" target="_blank">';
diff --git a/htdocs/core/class/html.formintervention.class.php b/htdocs/core/class/html.formintervention.class.php
index 32a3488b939..8f12c5a72d4 100644
--- a/htdocs/core/class/html.formintervention.class.php
+++ b/htdocs/core/class/html.formintervention.class.php
@@ -97,15 +97,13 @@ class FormIntervention
 					{
 						// Do nothing
 					}
-					else
-					{
+					else {
 						$labeltoshow = dol_trunc($obj->ref, 18);
 						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
 						{
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 						}
-						else
-						{
+						else {
 							$disabled = 0;
 							if (!$obj->fk_statut > 0)
 							{
@@ -122,8 +120,7 @@ class FormIntervention
 							{
 								$resultat = '';
 							}
-							else
-							{
+							else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								$resultat .= '>'.$labeltoshow;
@@ -139,8 +136,7 @@ class FormIntervention
 			$db->free($resql);
 			return $out;
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 			return '';
 		}
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index d961cd20536..bc5731c58c4 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -344,8 +344,7 @@ class FormMail extends Form
 		{
 			return $hookmanager->resPrint;
 		}
-		else
-		{
+		else {
 			$out = '';
 
 			$disablebademails = 1;
@@ -435,8 +434,7 @@ class FormMail extends Form
 					{
 						$modelmail_array[$line->id] = $langs->trans($reg[1]); // langs->trans when label is __(xxx)__
 					}
-					else
-					{
+					else {
 						$modelmail_array[$line->id] = $line->label;
 					}
 					if ($line->lang) $modelmail_array[$line->id] .= ' ('.$line->lang.')';
@@ -520,8 +518,7 @@ class FormMail extends Form
 						{
 							$out .= ' &lt;'.$this->frommail.'&gt;';
 						}
-						else
-						{
+						else {
 							if ($this->fromtype)
 							{
 								$langs->load('errors');
@@ -537,8 +534,7 @@ class FormMail extends Form
 							$langs->load('errors');
 							$liste['user'] = $user->getFullName($langs).' &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt;';
 						}
-						else
-						{
+						else {
 							$liste['user'] = $user->getFullName($langs).' &lt;'.$user->email.'&gt;';
 						}
 
@@ -616,8 +612,7 @@ class FormMail extends Form
 
 					$out .= "</td></tr>\n";
 				}
-				else
-				{
+				else {
 					$out .= '<tr><td class="fieldrequired width200">'.$langs->trans("MailFrom")."</td><td>";
 					$out .= $langs->trans("Name").':<input type="text" id="fromname" name="fromname" class="maxwidth200onsmartphone" value="'.$this->fromname.'" />';
 					$out .= '&nbsp; &nbsp; ';
@@ -651,8 +646,7 @@ class FormMail extends Form
 							$contact->fetch($this->toid);
 							$out .= $contact->getNomUrl(1);
 						}
-						else
-						{
+						else {
 							$out .= $this->toname;
 						}
 						$out .= ' &lt;'.$this->tomail.'&gt;';
@@ -661,14 +655,12 @@ class FormMail extends Form
 							$out .= '<br>'.$langs->trans("and").' <input class="minwidth200" id="sendto" name="sendto" value="'.(!is_array($this->withto) && !is_numeric($this->withto) ? (isset($_REQUEST["sendto"]) ? $_REQUEST["sendto"] : $this->withto) : "").'" />';
 						}
 					}
-					else
-					{
+					else {
 						// Note withto may be a text like 'AllRecipientSelected'
 						$out .= (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";
 					}
 				}
-				else
-				{
+				else {
 					// The free input of email
 					if (!empty($this->withtofree))
 					{
@@ -742,8 +734,7 @@ class FormMail extends Form
 				{
 					$out .= (!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : "";
 				}
-				else
-				{
+				else {
 				    $out .= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.(GETPOST("sendtocc", "alpha") ? GETPOST("sendtocc", "alpha") : ((!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : '')).'" />';
 					if (!empty($this->withtocc) && is_array($this->withtocc))
 					{
@@ -886,8 +877,7 @@ class FormMail extends Form
 						$out .= '<input class="button" type="submit" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
 					}
 				}
-				else
-				{
+				else {
 					$out .= $this->withfile;
 				}
 
@@ -913,8 +903,7 @@ class FormMail extends Form
 				{
 					$paymenturl = '';
 				}
-				else
-				{
+				else {
 					// Set the online payment url link into __ONLINE_PAYMENT_URL__ key
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 					$langs->loadLangs(array('paypal', 'other'));
@@ -934,8 +923,7 @@ class FormMail extends Form
 					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = str_replace('\n', "\n", $langs->transnoentities("PredefinedMailContentLink", $paymenturl));
 					$this->substit['__ONLINE_PAYMENT_URL__'] = $paymenturl;
 				}
-				else
-				{
+				else {
 					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = '';
 					$this->substit['__ONLINE_PAYMENT_URL__'] = '';
 				}
@@ -962,8 +950,7 @@ class FormMail extends Form
 				}
 
 				if (isset($_POST["message"]) && !$_POST['modelselected']) $defaultmessage = $_POST["message"];
-				else
-				{
+				else {
 					$defaultmessage = make_substitutions($defaultmessage, $this->substit);
 					// Clean first \n and br (to avoid empty line when CONTACTCIVNAME is empty)
 					$defaultmessage = preg_replace("/^(<br>)+/", "", $defaultmessage);
@@ -979,8 +966,7 @@ class FormMail extends Form
 					$out .= nl2br($defaultmessage);
 					$out .= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />';
 				}
-				else
-				{
+				else {
 					if (!isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes';
 
 					// Editor wysiwyg
@@ -1255,8 +1241,7 @@ class FormMail extends Form
 			$db->free($resql);
 			return $ret;
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 			return -1;
 		}
@@ -1291,8 +1276,7 @@ class FormMail extends Form
 			$this->db->free($resql);
 			return $num;
 		}
-		else
-		{
+		else {
 			$this->error = get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
 			return -1;
 		}
@@ -1345,8 +1329,7 @@ class FormMail extends Form
 			$this->db->free($resql);
 			return $num;
 		}
-		else
-		{
+		else {
 			$this->error = get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
 			return -1;
 		}
@@ -1477,8 +1460,7 @@ class FormMail extends Form
 					if ($conf->contrat->enabled)  $tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'SecureKeyPAYMENTUniquePerContractLine';
 				}
 			}
-			else
-			{
+			else {
 				/* No need to show into tooltip help, option is not enabled
 				$vars['__SECUREKEYPAYMENT__']='';
 				$vars['__SECUREKEYPAYMENT_MEMBER__']='';
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index 83923ffa6c7..db2bd566e52 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -228,8 +228,7 @@ class FormMargin
 		print '<td class="liste_titre right">'.$langs->trans('SellingPrice').'</td>';
 		if ($conf->global->MARGIN_TYPE == "1")
 			print '<td class="liste_titre right">'.$langs->trans('BuyingPrice').'</td>';
-		else
-			print '<td class="liste_titre right">'.$langs->trans('CostPrice').'</td>';
+		else print '<td class="liste_titre right">'.$langs->trans('CostPrice').'</td>';
 		print '<td class="liste_titre right">'.$langs->trans('Margin').'</td>';
 		if (!empty($conf->global->DISPLAY_MARGIN_RATES))
 			print '<td class="liste_titre right">'.$langs->trans('MarginRate').'</td>';
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 726ea5feb78..358b85fad59 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -107,8 +107,7 @@ class FormOther
                 {
                     print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';
                 }
-                else
-                {
+                else {
                     print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';
                 }
                 print $label;
@@ -174,8 +173,7 @@ class FormOther
                 {
                     print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';
                 }
-                else
-                {
+                else {
                     print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';
                 }
                 print $label;
@@ -227,8 +225,7 @@ class FormOther
                     {
                         print '<option value="'.$obj->rowid.'" selected>';
                     }
-                    else
-                    {
+                    else {
                         print '<option value="'.$obj->rowid.'">';
                         //print '<option onmouseover="showtip(\''.$obj->label.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
                     }
@@ -241,8 +238,7 @@ class FormOther
             print '</select>';
             return 0;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return 1;
         }
@@ -287,8 +283,7 @@ class FormOther
     				{
     					$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';
     				}
-    				else
-    				{
+    				else {
     					$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';
     					//print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
     				}
@@ -300,8 +295,7 @@ class FormOther
     		$out .= '</select>';
     		return $out;
     	}
-    	else
-    	{
+    	else {
     		dol_print_error($this->db);
     		return '';
     	}
@@ -333,8 +327,7 @@ class FormOther
             {
                 $return .= '<option value="'.$i.'" selected>';
             }
-            else
-            {
+            else {
                 $return .= '<option value="'.$i.'">';
             }
             $return .= $i.' % ';
@@ -460,8 +453,7 @@ class FormOther
         		$sql_usr .= " OR u.entity = 0"; // Show always superadmin
         	}
         }
-        else
-        {
+        else {
         	$sql_usr .= " WHERE u.entity IN (".getEntity('user').")";
         }
 
@@ -486,8 +478,7 @@ class FormOther
             		$sql_usr .= " WHERE EXISTS (SELECT ug2.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug2 WHERE u2.rowid = ug2.fk_user AND ug2.entity IN (".getEntity('usergroup')."))";
             	}
             }
-            else
-            {
+            else {
             	$sql_usr .= " WHERE u2.entity IN (".getEntity('user').")";
             }
 
@@ -535,8 +526,7 @@ class FormOther
             }
             $this->db->free($resql_usr);
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
         }
 
@@ -586,8 +576,7 @@ class FormOther
 
             print ajax_combobox($htmlname);
         }
-        else
-        {
+        else {
             print '<div class="warning">'.$langs->trans("NoProject").'</div>';
         }
     }
@@ -629,8 +618,7 @@ class FormOther
                         {
                             print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
                         }
-                        else
-                        {
+                        else {
                             print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
                         }
                         //print '-'.$parent.'-'.$lines[$i]->fk_project.'-'.$lastprojectid;
@@ -664,8 +652,7 @@ class FormOther
                     {
                         print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
                     }
-                    else
-                    {
+                    else {
                         print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
                     }
                     if ($lines[$i]->id) print ' > ';
@@ -794,7 +781,7 @@ class FormOther
             }
             $out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss ? ' '.$morecss : '').'" type="text" value="'.dol_escape_htmltag($set_color).'" />';
         }
-        else  // In most cases, this is not used. We used instead function with no specific list of colors
+        else // In most cases, this is not used. We used instead function with no specific list of colors
         {
         	if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax))
             {
@@ -900,8 +887,7 @@ class FormOther
             {
                 $select_week .= '<option value="'.$key.'" selected>';
             }
-            else
-            {
+            else {
                 $select_week .= '<option value="'.$key.'">';
             }
             $select_week .= $val;
@@ -943,8 +929,7 @@ class FormOther
             {
                 $select_month .= '<option value="'.$key.'" selected>';
             }
-            else
-            {
+            else {
                 $select_month .= '<option value="'.$key.'">';
             }
             $select_month .= $val;
@@ -1014,8 +999,7 @@ class FormOther
                 $out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
             }
         }
-        else
-        {
+        else {
             for ($y = $min_year; $y <= $max_year; $y++)
             {
                 $selected_html = '';
@@ -1289,8 +1273,7 @@ class FormOther
                     {
                         print '<option value="'.$obj->$keyfield.'" selected>';
                     }
-                    else
-                    {
+                    else {
                         print '<option value="'.$obj->$keyfield.'">';
                     }
                     print $obj->$labelfield;
@@ -1337,8 +1320,7 @@ class FormOther
 			$resultautomanual .= '<option value="'.$automatic.'" selected>'.$langs->trans("Automatic").'</option>'."\n";
 			$resultautomanual .= '<option value="'.$manual.'">'.$langs->trans("Manual").'</option>'."\n";
 		}
-		else
-	    {
+		else {
 	   		$selected = (($useempty && $value != '0' && $value != 'manual') ? '' : ' selected');
 			$resultautomanual .= '<option value="'.$automatic.'">'.$langs->trans("Automatic").'</option>'."\n";
 			$resultautomanual .= '<option value="'.$manual.'"'.$selected.'>'.$langs->trans("Manual").'</option>'."\n";
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index bf3db0cc65c..2b6357e1c6e 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -98,8 +98,7 @@ class FormProjets
 
 			$out .= '<input type="text" class="minwidth200'.($morecss ? ' '.$morecss : '').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
 		}
-		else
-		{
+		else {
 			$out .= $this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, abs($discard_closed), $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid, $morecss);
 		}
 		if ($discard_closed > 0)
@@ -209,8 +208,7 @@ class FormProjets
 					{
 						// Do nothing
 					}
-					else
-					{
+					else {
 						if ($discard_closed == 1 && $obj->fk_statut == 2 && $obj->rowid != $selected) // We discard closed except if selected
 						{
 							$i++;
@@ -250,14 +248,12 @@ class FormProjets
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out .= '>'.$labeltoshow.'</option>';
 						}
-						else
-						{
+						else {
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
 								$resultat = '';
 							}
-							else
-							{
+							else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
@@ -295,8 +291,7 @@ class FormProjets
 				return $outarray;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -395,8 +390,7 @@ class FormProjets
 					{
 						// Do nothing
 					}
-					else
-					{
+					else {
 						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
 						{
 							$i++;
@@ -442,14 +436,12 @@ class FormProjets
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out .= '>'.$labeltoshow.'</option>';
 						}
-						else
-						{
+						else {
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
 								$resultat = '';
 							}
-							else
-							{
+							else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
@@ -473,8 +465,7 @@ class FormProjets
 			$this->db->free($resql);
 			return $num;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -599,8 +590,7 @@ class FormProjets
 
 			return $sellist;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->db->lasterror();
@@ -661,8 +651,7 @@ class FormProjets
 					{
 						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
 					}
-					else
-					{
+					else {
 						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
 						if ($showpercent) $finallabel .= ' ('.$obj->percent.'%)';
 					}
@@ -683,8 +672,7 @@ class FormProjets
 
 			return $sellist;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->db->lasterror();
 			dol_syslog(get_class($this)."::selectOpportunityStatus ".$this->error, LOG_ERR);
diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index 979d8a71ca8..607d7f2f6e2 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -98,8 +98,7 @@ class FormPropal
                     }
                 }
             }
-            else
-            {
+            else {
                 dol_print_error($this->db);
             }
         }
@@ -121,8 +120,7 @@ class FormPropal
             {
                 print '<option value="'.$obj['id'].'" selected>';
             }
-            else
-            {
+            else {
                 print '<option value="'.$obj['id'].'">';
             }
             $key = $obj['code'];
@@ -130,8 +128,7 @@ class FormPropal
             {
                 print $langs->trans($prefix.$key.($short ? 'Short' : ''));
             }
-            else
-            {
+            else {
                 $conv_to_new_code = array('PR_DRAFT'=>'Draft', 'PR_OPEN'=>'Validated', 'PR_CLOSED'=>'Closed', 'PR_SIGNED'=>'Signed', 'PR_NOTSIGNED'=>'NotSigned', 'PR_FAC'=>'Billed');
                 if (!empty($conv_to_new_code[$obj['code']])) $key = $conv_to_new_code[$obj['code']];
 
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index 669928cb3e9..abad56441a9 100644
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
@@ -180,8 +180,7 @@ function limitChars(textarea, limit, infodiv)
                 {
                     print $this->fromsms;
                 }
-                else
-                {
+                else {
                     if ($this->fromtype)
                     {
                         $langs->load("errors");
@@ -191,22 +190,19 @@ function limitChars(textarea, limit, infodiv)
                 print "</td></tr>\n";
                 print "</td></tr>\n";
             }
-            else
-            {
+            else {
                 print '<tr><td class="'.$morecss.'">'.$langs->trans("SmsFrom")."</td><td>";
                 //print '<input type="text" name="fromname" size="30" value="'.$this->fromsms.'">';
                 if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')        // For backward compatibility        @deprecated
                 {
                     dol_include_once('/ovh/class/ovhsms.class.php');
-                    try
-                    {
+                    try {
                         $sms = new OvhSms($this->db);
                         if (empty($conf->global->OVHSMS_ACCOUNT))
                         {
                             $resultsender = 'ErrorOVHSMS_ACCOUNT not defined';
                         }
-                        else
-                        {
+                        else {
                             $resultsender = $sms->SmsSenderList();
                         }
                     }
@@ -220,16 +216,14 @@ function limitChars(textarea, limit, infodiv)
                     $tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
                     $classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
                     dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
-                    try
-                    {
+                    try {
                         $classname = ucfirst($classfile);
                         if (class_exists($classname))
                         {
                         	$sms = new $classname($this->db);
                         	$resultsender = $sms->SmsSenderList();
                         }
-                        else
-                        {
+                        else {
                         	$sms = new stdClass();
                         	$sms->error = 'The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
                         }
@@ -240,8 +234,7 @@ function limitChars(textarea, limit, infodiv)
                         exit;
                     }
                 }
-                else
-                {
+                else {
                     dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);
 	                $resultsender = array();
                     $resultsender[0]->number = $this->fromsms;
@@ -256,8 +249,7 @@ function limitChars(textarea, limit, infodiv)
                     }
                     print '</select>';
                 }
-                else
-                {
+                else {
                     print '<span class="error">'.$langs->trans("SmsNoPossibleSenderFound");
                     if (is_object($sms) && !empty($sms->error)) print ' '.$sms->error;
                     print '</span>';
@@ -279,8 +271,7 @@ function limitChars(textarea, limit, infodiv)
             {
                 print (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";
             }
-            else
-            {
+            else {
                 print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(!is_array($this->withto) && $this->withto != '1' ? (isset($_REQUEST["sendto"]) ?GETPOST("sendto") : $this->withto) : "+")."\">";
                 if (!empty($this->withtosocid) && $this->withtosocid > 0)
                 {
@@ -318,8 +309,7 @@ function limitChars(textarea, limit, infodiv)
                 print nl2br($defaultmessage);
                 print '<input type="hidden" name="message" value="'.dol_escape_htmltag($defaultmessage).'">';
             }
-            else
-            {
+            else {
                 print '<textarea class="quatrevingtpercent" name="message" id="message" rows="'.ROWS_4.'" onkeyup="limitChars(this, 160, \'charlimitinfospan\')">'.$defaultmessage.'</textarea>';
                 print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160 - dol_strlen($defaultmessage)).'</span></div></td>';
             }
diff --git a/htdocs/core/class/html.formsocialcontrib.class.php b/htdocs/core/class/html.formsocialcontrib.class.php
index 5ecef635d73..ddc79a3c9cf 100644
--- a/htdocs/core/class/html.formsocialcontrib.class.php
+++ b/htdocs/core/class/html.formsocialcontrib.class.php
@@ -80,8 +80,7 @@ class FormSocialContrib
             $sql .= " AND c.fk_pays = ".$mysoc->country_id;
             $sql .= " ORDER BY c.libelle ASC";
         }
-        else
-        {
+        else {
             $sql = "SELECT c.id, c.libelle as type";
             $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
             $sql .= " WHERE c.active = 1 AND c.fk_pays = co.rowid";
@@ -112,13 +111,11 @@ class FormSocialContrib
                 if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
                 if (!empty($conf->use_javascript_ajax)) print ajax_combobox($htmlname);
             }
-            else
-            {
+            else {
                 print $langs->trans("ErrorNoSocialContributionForSellerCountry", $mysoc->country_code);
             }
         }
-        else
-        {
+        else {
             dol_print_error($db, $db->lasterror());
         }
     }
diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index 7b067fa11d6..e666260325c 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -80,8 +80,7 @@ class FormWebsite
                 {
                     $out .= '<option value="'.$obj->rowid.'" selected>';
                 }
-                else
-                {
+                else {
                     $out .= '<option value="'.$obj->rowid.'">';
                 }
                 $out .= $obj->ref;
@@ -139,8 +138,7 @@ class FormWebsite
     				{
     					print '<option value="'.$obj->code.'" selected>';
     				}
-    				else
-    				{
+    				else {
     					print '<option value="'.$obj->code.'">';
     				}
     				print $obj->label;
@@ -150,8 +148,7 @@ class FormWebsite
     			print "</select>";
     			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
     		}
-    		else
-    		{
+    		else {
     			print $langs->trans("NoTypeOfPagePleaseEditDictionary");
     		}
     	}
@@ -206,8 +203,7 @@ class FormWebsite
     		{
     			$out .= '<option value="'.$key.'" selected>';
     		}
-    		else
-    		{
+    		else {
     			$out .= '<option value="'.$key.'">';
     		}
     		$out .= $langs->trans($val);
@@ -243,8 +239,7 @@ class FormWebsite
 	    {
 	    	$out .= '<select name="'.$htmlname.'" id="'.$htmlname.'" class="maxwidth300'.($morecss ? ' '.$morecss : '').'">';
 	    }
-	    else
-	    {
+	    else {
 	    	$out .= '<select name="pageidbis" id="pageid" class="maxwidth300'.($morecss ? ' '.$morecss : '').'" disabled="disabled">';
 	    }
 
@@ -293,8 +288,7 @@ class FormWebsite
 	    {
 	    	$out .= ajax_combobox($htmlname);
 	    }
-	    else
-	    {
+	    else {
 	    	$out .= '<input type="hidden" name="'.$htmlname.'" value="'.$pageid.'">';
 	    	$out .= ajax_combobox($htmlname);
 	    }
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index de00ea85e6f..ca51c8b8c97 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -44,8 +44,7 @@ class InfoBox
         		27 => 'Accountancy Home'
         	);
 		}
-		else
-		{
+		else {
 			return array(
 				0 => 'Home',
 				1 => 'userhome',
@@ -109,7 +108,7 @@ class InfoBox
             else $sql .= " AND b.fk_user = 0";
             $sql .= " ORDER BY b.box_order";
         }
-        else	// available
+        else // available
         {
             $sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";
             $sql .= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
@@ -134,8 +133,7 @@ class InfoBox
                         $module = $regs[2];
                         $relsourcefile = "/".$module."/core/boxes/".$boxname.".php";
                     }
-                    else
-                    {
+                    else {
                         $boxname = preg_replace('/\.php$/i', '', $obj->file);
                         $relsourcefile = "/core/boxes/".$boxname.".php";
                     }
@@ -200,16 +198,14 @@ class InfoBox
                         if ($enabled && ($includehidden || empty($box->hidden))) $boxes[] = $box;
                         else unset($box);
                     }
-                    else
-                    {
+                    else {
                         dol_syslog("Failed to load box '".$boxname."' into file '".$relsourcefile."'", LOG_WARNING);
                     }
                 }
                 $j++;
             }
         }
-        else
-        {
+        else {
             dol_syslog($db->lasterror(), LOG_ERR);
             return array('error'=>$db->lasterror());
         }
@@ -308,14 +304,12 @@ class InfoBox
                 $db->rollback();
                 return -2;
             }
-            else
-            {
+            else {
                 $db->commit();
                 return 1;
             }
         }
-        else
-        {
+        else {
             $error = $db->lasterror();
             $db->rollback();
             dol_syslog(get_class()."::saveboxorder ".$error);
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 5befc8ddb9c..09f05a143a8 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -193,8 +193,7 @@ class Interfaces
                     dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);
                     $result = $objMod->run_trigger($action, $object, $user, $langs, $conf);
                 }
-                else
-                {
+                else {
                     dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);
                 }
 
@@ -220,8 +219,7 @@ class Interfaces
                     //dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($this->errors), LOG_ERR);
                 }
             }
-            else
-            {
+            else {
                 dol_syslog(get_class($this)."::run_triggers action=".$action." Failed to instantiate trigger for file '".$files[$key]."'", LOG_ERR);
             }
         }
@@ -231,8 +229,7 @@ class Interfaces
             dol_syslog(get_class($this)."::run_triggers action=".$action." Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko." - Nb of error string returned in this->errors = ".count($this->errors), LOG_ERR);
             return -$nbko;
         }
-        else
-        {
+        else {
             //dol_syslog(get_class($this)."::run_triggers Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko, LOG_DEBUG);
             return $nbok;
         }
@@ -292,8 +289,7 @@ class Interfaces
                             $langs->load("errors");
                             print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger", $modName, "/htdocs/core/triggers/").'</div>';
                         }
-                        else
-                        {
+                        else {
                             include_once $newdir.'/'.$file;
                         }
 
@@ -370,8 +366,7 @@ class Interfaces
 		                $text .= $langs->trans("TriggerDisabledByName").'<br>';
 		                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
 		            }
-		            else
-		            {
+		            else {
 		                if ($disabledbymodule == 0) $text .= $langs->trans("TriggerAlwaysActive").'<br>';
 		                if ($disabledbymodule == 1) $text .= $langs->trans("TriggerActiveAsModuleActive", $module).'<br>';
 		                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index ea4ec500405..4a46f6a500a 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -222,13 +222,11 @@ class Ldap
 							$connected = 2;
 							break;
 						}
-						else
-						{
+						else {
 							$this->error = ldap_errno($this->connection).' '.ldap_error($this->connection);
 						}
 					}
-					else
-					{
+					else {
 						// Try in auth mode
 						if ($this->searchUser && $this->searchPassword)
 						{
@@ -240,8 +238,7 @@ class Ldap
 								$connected = 2;
 								break;
 							}
-							else
-							{
+							else {
 								$this->error = ldap_errno($this->connection).' '.ldap_error($this->connection);
 							}
 						}
@@ -256,8 +253,7 @@ class Ldap
 								$connected = 1;
 								break;
 							}
-							else
-							{
+							else {
 								$this->error = ldap_errno($this->connection).' '.ldap_error($this->connection);
 							}
 						}
@@ -273,8 +269,7 @@ class Ldap
 			$return = $connected;
 			dol_syslog(get_class($this)."::connect_bind return=".$return, LOG_DEBUG);
 		}
-		else
-		{
+		else {
 			$this->error = 'Failed to connect to LDAP'.($this->error ? ': '.$this->error : '');
 			$return = -1;
 			dol_syslog(get_class($this)."::connect_bind return=".$return.' - '.$this->error, LOG_WARNING);
@@ -296,8 +291,7 @@ class Ldap
 		{
 			return false;
 		}
-		else
-		{
+		else {
 			return true;
 		}
 	}
@@ -317,8 +311,7 @@ class Ldap
 			$this->error = $this->ldapErrorCode." ".$this->ldapErrorText;
 			return false;
 		}
-		else
-		{
+		else {
 			return true;
 		}
 	}
@@ -342,8 +335,7 @@ class Ldap
 			$this->error = $this->ldapErrorCode." ".$this->ldapErrorText;
 			return false;
 		}
-		else
-		{
+		else {
 			return true;
 		}
 	}
@@ -445,8 +437,7 @@ class Ldap
 			dol_syslog(get_class($this)."::add successfull", LOG_DEBUG);
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->ldapErrorCode = @ldap_errno($this->connection);
 			$this->ldapErrorText = @ldap_error($this->connection);
 			$this->error = $this->ldapErrorCode." ".$this->ldapErrorText;
@@ -499,8 +490,7 @@ class Ldap
 			dol_syslog(get_class($this)."::modify successfull", LOG_DEBUG);
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::modify failed: ".$this->error, LOG_ERR);
 			return -1;
@@ -549,8 +539,7 @@ class Ldap
 			dol_syslog(get_class($this)."::rename successfull", LOG_DEBUG);
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::rename failed: ".$this->error, LOG_ERR);
 			return -1;
@@ -594,15 +583,13 @@ class Ldap
 				// This function currently only works with LDAPv3
 				$result = $this->rename($olddn, $newrdn, $newparent, $user, true);
 			}
-			else
-			{
+			else {
 				// If change we make is rename the key of LDAP record, we create new one and if ok, we delete old one.
 				$result = $this->add($dn, $info, $user);
 				if ($result > 0 && $olddn && $olddn != $dn) $result = $this->delete($olddn); // If add fails, we do not try to delete old one
 			}
 		}
-		else
-		{
+		else {
 			//$result = $this->delete($olddn);
 			$result = $this->add($dn, $info, $user); // If record has been deleted from LDAP, we recreate it. We ignore error if it already exists.
 			$result = $this->modify($dn, $info, $user); // We use add/modify instead of delete/add when olddn is received
@@ -614,8 +601,7 @@ class Ldap
 			//print_r($info);
 			return -1;
 		}
-		else
-		{
+		else {
 			dol_syslog(get_class($this)."::update done successfully");
 			return 1;
 		}
@@ -674,8 +660,7 @@ class Ldap
 		{
 			$target = "-H ".join(',', $this->server);
 		}
-		else
-		{
+		else {
 			$target = "-h ".join(',', $this->server)." -p ".$this->serverPort;
 		}
 		$content .= "# ldapadd $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
@@ -689,8 +674,7 @@ class Ldap
 			{
 				$content .= "$key: $value\n";
 			}
-			else
-			{
+			else {
 				foreach ($value as $valuekey => $valuevalue)
 				{
 					$content .= "$key: $valuevalue\n";
@@ -727,8 +711,7 @@ class Ldap
 			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 			return 1;
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 	}
@@ -806,8 +789,7 @@ class Ldap
 			dol_syslog(get_class($this)."::add_attribute successfull", LOG_DEBUG);
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::add_attribute failed: ".$this->error, LOG_ERR);
 			return -1;
@@ -858,8 +840,7 @@ class Ldap
 			dol_syslog(get_class($this)."::updateAttribute successfull", LOG_DEBUG);
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::updateAttribute failed: ".$this->error, LOG_ERR);
 			return -1;
@@ -910,8 +891,7 @@ class Ldap
 			dol_syslog(get_class($this)."::deleteAttribute successfull", LOG_DEBUG);
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::deleteAttribute failed: ".$this->error, LOG_ERR);
 			return -1;
@@ -1039,13 +1019,12 @@ class Ldap
 			{
 				$filter = '('.$this->filtermember.')';
 			}
-			else	// If this->filter is empty, make fiter on * (all)
+			else // If this->filter is empty, make fiter on * (all)
 			{
 				$filter = '('.$useridentifier.'=*)';
 			}
 		}
-		else
-		{
+		else {
 			$filter = '('.$useridentifier.'='.$search.')';
 		}
 
@@ -1057,8 +1036,7 @@ class Ldap
 			//var_dump($attributeArray);
 			$this->result = @ldap_search($this->connection, $userDn, $filter, $attributeArray);
 		}
-		else
-		{
+		else {
 			// Return list with fields selected by default
 			dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter);
 			$this->result = @ldap_search($this->connection, $userDn, $filter);
@@ -1096,8 +1074,7 @@ class Ldap
 						$objectsid = $this->getObjectSid($recordid);
 						$fulllist[$recordid][$attributeArray[$j]] = $objectsid;
 					}
-					else
-					{
+					else {
 						if (in_array($attributeArray[$j], $attributeAsArray) && is_array($info[$i][$keyattributelower])) {
 							$valueTab = array();
 							foreach ($info[$i][$keyattributelower] as $key => $value) {
@@ -1171,8 +1148,7 @@ class Ldap
 				$searchDN = $this->domain;
 				$i++;
 			}
-			else
-			{
+			else {
 				$i++;
 				$i++;
 			}
@@ -1184,8 +1160,7 @@ class Ldap
 			$SIDText = $this->binSIDtoText($ldapBinary[0]);
 			return $SIDText;
 		}
-		else
-		{
+		else {
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return '?';
 		}
@@ -1244,8 +1219,7 @@ class Ldap
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return -1;
 		}
-		else
-		{
+		else {
 			ldap_free_result($this->result);
 			return $result;
 		}
@@ -1284,8 +1258,7 @@ class Ldap
 				else dol_syslog('Ldap::fetch search returns but found no records');
 				//var_dump($result);exit;
 			}
-			else
-			{
+			else {
 				$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 				dol_syslog(get_class($this)."::fetch search fails");
 				return -1;
@@ -1297,8 +1270,7 @@ class Ldap
 				$searchDN = $this->domain;
 				$i++;
 			}
-			else
-			{
+			else {
 				break;
 			}
 		}
@@ -1308,8 +1280,7 @@ class Ldap
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return -1;
 		}
-		else
-		{
+		else {
 			$this->name       = $this->convToOutputCharset($result[0][$this->attr_name][0], $this->ldapcharset);
 			$this->firstname  = $this->convToOutputCharset($result[0][$this->attr_firstname][0], $this->ldapcharset);
 			$this->login      = $this->convToOutputCharset($result[0][$this->attr_login][0], $this->ldapcharset);
@@ -1324,8 +1295,7 @@ class Ldap
 			{
 				$this->pwdlastset = ($result[0]["pwdlastset"][0] != 0) ? $this->convert_time($this->convToOutputCharset($result[0]["pwdlastset"][0], $this->ldapcharset)) : 0;
 			}
-			else
-			{
+			else {
 				$this->pwdlastset = -1;
 			}
 			if (!$this->name && !$this->login) $this->pwdlastset = -1;
diff --git a/htdocs/core/class/lessc.class.php b/htdocs/core/class/lessc.class.php
index 210c3d3c29d..185cd3782e5 100644
--- a/htdocs/core/class/lessc.class.php
+++ b/htdocs/core/class/lessc.class.php
@@ -35,7 +35,8 @@
  * The `lessc_formatter` takes a CSS tree, and dumps it to a formatted string,
  * handling things like indentation.
  */
-class Lessc {
+class Lessc
+{
 	public static $VERSION = "v0.5.0";
 
 	public static $TRUE = array("keyword", "true");
@@ -64,7 +65,8 @@ class Lessc {
 	protected static $nextImportId = 0; // uniquely identify imports
 
 	// attempts to find the path of an import url, returns null for css files
-	protected function findImport($url) {
+	protected function findImport($url)
+	{
 		foreach ((array) $this->importDir as $dir) {
 			$full = $dir.(substr($dir, -1) != '/' ? '/' : '').$url;
 			if ($this->fileExists($file = $full.'.less') || $this->fileExists($file = $full)) {
@@ -81,20 +83,24 @@ class Lessc {
 	 * @param 	string 	$name	Filename
 	 * @return 	boolean
 	 */
-	protected function fileExists($name) {
+	protected function fileExists($name)
+	{
 		return is_file($name);
 	}
 
-	public static function compressList($items, $delim) {
+	public static function compressList($items, $delim)
+	{
 		if (!isset($items[1]) && isset($items[0])) return $items[0];
 		else return array('list', $delim, $items);
 	}
 
-	public static function preg_quote($what) {
+	public static function preg_quote($what)
+	{
 		return preg_quote($what, '/');
 	}
 
-	protected function tryImport($importPath, $parentBlock, $out) {
+	protected function tryImport($importPath, $parentBlock, $out)
+	{
 		if ($importPath[0] == "function" && $importPath[1] == "url") {
 			$importPath = $this->flattenList($importPath[2]);
 		}
@@ -152,7 +158,8 @@ class Lessc {
 		return array(true, $bottom, $parser, $dir);
 	}
 
-	protected function compileImportedProps($props, $block, $out, $sourceParser, $importDir) {
+	protected function compileImportedProps($props, $block, $out, $sourceParser, $importDir)
+	{
 		$oldSourceParser = $this->sourceParser;
 
 		$oldImport = $this->importDir;
@@ -190,7 +197,8 @@ class Lessc {
 	 * See lessc::compileProp()
 	 *
 	 */
-	protected function compileBlock($block) {
+	protected function compileBlock($block)
+	{
 		switch ($block->type) {
 			case "root":
 				$this->compileRoot($block);
@@ -214,7 +222,8 @@ class Lessc {
 		}
 	}
 
-	protected function compileCSSBlock($block) {
+	protected function compileCSSBlock($block)
+	{
 		$env = $this->pushEnv();
 
 		$selectors = $this->compileSelectors($block->tags);
@@ -228,7 +237,8 @@ class Lessc {
 		$this->popEnv();
 	}
 
-	protected function compileMedia($media) {
+	protected function compileMedia($media)
+	{
 		$env = $this->pushEnv($media);
 		$parentScope = $this->mediaParent($this->scope);
 
@@ -253,7 +263,8 @@ class Lessc {
 		$this->popEnv();
 	}
 
-	protected function mediaParent($scope) {
+	protected function mediaParent($scope)
+	{
 		while (!empty($scope->parent)) {
 			if (!empty($scope->type) && $scope->type != "media") {
 				break;
@@ -264,7 +275,8 @@ class Lessc {
 		return $scope;
 	}
 
-	protected function compileNestedBlock($block, $selectors) {
+	protected function compileNestedBlock($block, $selectors)
+	{
 		$this->pushEnv($block);
 		$this->scope = $this->makeOutputBlock($block->type, $selectors);
 		$this->scope->parent->children[] = $this->scope;
@@ -275,14 +287,16 @@ class Lessc {
 		$this->popEnv();
 	}
 
-	protected function compileRoot($root) {
+	protected function compileRoot($root)
+	{
 		$this->pushEnv();
 		$this->scope = $this->makeOutputBlock($root->type);
 		$this->compileProps($root, $this->scope);
 		$this->popEnv();
 	}
 
-	protected function compileProps($block, $out) {
+	protected function compileProps($block, $out)
+	{
 		foreach ($this->sortProps($block->props) as $prop) {
 			$this->compileProp($prop, $block, $out);
 		}
@@ -294,7 +308,8 @@ class Lessc {
 	 * duplicate rule is detected, the comments immediately preceding each
 	 * occurence are consolidated.
 	 */
-	protected function deduplicate($lines) {
+	protected function deduplicate($lines)
+	{
 		$unique = array();
 		$comments = array();
 
@@ -312,7 +327,8 @@ class Lessc {
 		return array_merge($unique, $comments);
 	}
 
-	protected function sortProps($props, $split = false) {
+	protected function sortProps($props, $split = false)
+	{
 		$vars = array();
 		$imports = array();
 		$other = array();
@@ -356,7 +372,8 @@ class Lessc {
 		}
 	}
 
-	protected function compileMediaQuery($queries) {
+	protected function compileMediaQuery($queries)
+	{
 		$compiledQueries = array();
 		foreach ($queries as $query) {
 			$parts = array();
@@ -392,34 +409,36 @@ class Lessc {
 		return $out;
 	}
 
-	protected function multiplyMedia($env, $childQueries = null) {
+	protected function multiplyMedia($env, $childQueries = null)
+	{
 		if (is_null($env) ||
 			!empty($env->block->type) && $env->block->type != "media"
 			) {
 				return $childQueries;
-			}
+		}
 
 			// plain old block, skip
-			if (empty($env->block->type)) {
-				return $this->multiplyMedia($env->parent, $childQueries);
-			}
+		if (empty($env->block->type)) {
+			return $this->multiplyMedia($env->parent, $childQueries);
+		}
 
 			$out = array();
 			$queries = $env->block->queries;
-			if (is_null($childQueries)) {
-				$out = $queries;
-			} else {
-				foreach ($queries as $parent) {
-					foreach ($childQueries as $child) {
-						$out[] = array_merge($parent, $child);
-					}
+		if (is_null($childQueries)) {
+			$out = $queries;
+		} else {
+			foreach ($queries as $parent) {
+				foreach ($childQueries as $child) {
+					$out[] = array_merge($parent, $child);
 				}
 			}
+		}
 
 			return $this->multiplyMedia($env->parent, $out);
 	}
 
-	protected function expandParentSelectors(&$tag, $replace) {
+	protected function expandParentSelectors(&$tag, $replace)
+	{
 		$parts = explode("$&$", $tag);
 		$count = 0;
 		foreach ($parts as &$part) {
@@ -430,7 +449,8 @@ class Lessc {
 		return $count;
 	}
 
-	protected function findClosestSelectors() {
+	protected function findClosestSelectors()
+	{
 		$env = $this->env;
 		$selectors = null;
 		while ($env !== null) {
@@ -446,7 +466,8 @@ class Lessc {
 
 
 	// multiply $selectors against the nearest selectors in env
-	protected function multiplySelectors($selectors) {
+	protected function multiplySelectors($selectors)
+	{
 		// find parent selectors
 
 		$parentSelectors = $this->findClosestSelectors();
@@ -477,7 +498,8 @@ class Lessc {
 	}
 
 	// reduces selector expressions
-	protected function compileSelectors($selectors) {
+	protected function compileSelectors($selectors)
+	{
 		$out = array();
 
 		foreach ($selectors as $s) {
@@ -492,11 +514,13 @@ class Lessc {
 		return $out;
 	}
 
-	protected function eq($left, $right) {
+	protected function eq($left, $right)
+	{
 		return $left == $right;
 	}
 
-	protected function patternMatch($block, $orderedArgs, $keywordArgs) {
+	protected function patternMatch($block, $orderedArgs, $keywordArgs)
+	{
 		// match the guards if it has them
 		// any one of the groups must have all its guards pass for a match
 		if (!empty($block->guards)) {
@@ -579,7 +603,8 @@ class Lessc {
 		}
 	}
 
-	protected function patternMatchAll($blocks, $orderedArgs, $keywordArgs, $skip = array()) {
+	protected function patternMatchAll($blocks, $orderedArgs, $keywordArgs, $skip = array())
+	{
 		$matches = null;
 		foreach ($blocks as $block) {
 			// skip seen blocks that don't have arguments
@@ -596,7 +621,8 @@ class Lessc {
 	}
 
 	// attempt to find blocks matched by path and args
-	protected function findBlocks($searchIn, $path, $orderedArgs, $keywordArgs, $seen = array()) {
+	protected function findBlocks($searchIn, $path, $orderedArgs, $keywordArgs, $seen = array())
+	{
 		if ($searchIn == null) return null;
 		if (isset($seen[$searchIn->id])) return null;
 		$seen[$searchIn->id] = true;
@@ -634,7 +660,8 @@ class Lessc {
 
 	// sets all argument names in $args to either the default value
 	// or the one passed in through $values
-	protected function zipSetArgs($args, $orderedValues, $keywordValues) {
+	protected function zipSetArgs($args, $orderedValues, $keywordValues)
+	{
 		$assignedValues = array();
 
 		$i = 0;
@@ -676,7 +703,8 @@ class Lessc {
 	}
 
 	// compile a prop and update $lines or $blocks appropriately
-	protected function compileProp($prop, $block, $out) {
+	protected function compileProp($prop, $block, $out)
+	{
 		// set error position context
 		$this->sourceLoc = isset($prop[-1]) ? $prop[-1] : -1;
 
@@ -756,7 +784,7 @@ class Lessc {
 									'list', ' ',
 									array($subProp[2], array('keyword', $suffix))
 								);
-							}
+						}
 
 							$this->compileProp($subProp, $mixin, $out);
 					}
@@ -822,7 +850,8 @@ class Lessc {
 	 * The input is expected to be reduced. This function will not work on
 	 * things like expressions and variables.
 	 */
-	public function compileValue($value) {
+	public function compileValue($value)
+	{
 		switch ($value[0]) {
 			case 'list':
 				// [1] - delimiter
@@ -886,52 +915,63 @@ class Lessc {
 		}
 	}
 
-	protected function lib_pow($args) {
+	protected function lib_pow($args)
+	{
 		list($base, $exp) = $this->assertArgs($args, 2, "pow");
 		return pow($this->assertNumber($base), $this->assertNumber($exp));
 	}
 
-	protected function lib_pi() {
+	protected function lib_pi()
+	{
 		return pi();
 	}
 
-	protected function lib_mod($args) {
+	protected function lib_mod($args)
+	{
 		list($a, $b) = $this->assertArgs($args, 2, "mod");
 		return $this->assertNumber($a) % $this->assertNumber($b);
 	}
 
-	protected function lib_tan($num) {
+	protected function lib_tan($num)
+	{
 		return tan($this->assertNumber($num));
 	}
 
-	protected function lib_sin($num) {
+	protected function lib_sin($num)
+	{
 		return sin($this->assertNumber($num));
 	}
 
-	protected function lib_cos($num) {
+	protected function lib_cos($num)
+	{
 		return cos($this->assertNumber($num));
 	}
 
-	protected function lib_atan($num) {
+	protected function lib_atan($num)
+	{
 		$num = atan($this->assertNumber($num));
 		return array("number", $num, "rad");
 	}
 
-	protected function lib_asin($num) {
+	protected function lib_asin($num)
+	{
 		$num = asin($this->assertNumber($num));
 		return array("number", $num, "rad");
 	}
 
-	protected function lib_acos($num) {
+	protected function lib_acos($num)
+	{
 		$num = acos($this->assertNumber($num));
 		return array("number", $num, "rad");
 	}
 
-	protected function lib_sqrt($num) {
+	protected function lib_sqrt($num)
+	{
 		return sqrt($this->assertNumber($num));
 	}
 
-	protected function lib_extract($value) {
+	protected function lib_extract($value)
+	{
 		list($list, $idx) = $this->assertArgs($value, 2, "extract");
 		$idx = $this->assertNumber($idx);
 		// 1 indexed
@@ -940,39 +980,48 @@ class Lessc {
 		}
 	}
 
-	protected function lib_isnumber($value) {
+	protected function lib_isnumber($value)
+	{
 		return $this->toBool($value[0] == "number");
 	}
 
-	protected function lib_isstring($value) {
+	protected function lib_isstring($value)
+	{
 		return $this->toBool($value[0] == "string");
 	}
 
-	protected function lib_iscolor($value) {
+	protected function lib_iscolor($value)
+	{
 		return $this->toBool($this->coerceColor($value));
 	}
 
-	protected function lib_iskeyword($value) {
+	protected function lib_iskeyword($value)
+	{
 		return $this->toBool($value[0] == "keyword");
 	}
 
-	protected function lib_ispixel($value) {
+	protected function lib_ispixel($value)
+	{
 		return $this->toBool($value[0] == "number" && $value[2] == "px");
 	}
 
-	protected function lib_ispercentage($value) {
+	protected function lib_ispercentage($value)
+	{
 		return $this->toBool($value[0] == "number" && $value[2] == "%");
 	}
 
-	protected function lib_isem($value) {
+	protected function lib_isem($value)
+	{
 		return $this->toBool($value[0] == "number" && $value[2] == "em");
 	}
 
-	protected function lib_isrem($value) {
+	protected function lib_isrem($value)
+	{
 		return $this->toBool($value[0] == "number" && $value[2] == "rem");
 	}
 
-	protected function lib_rgbahex($color) {
+	protected function lib_rgbahex($color)
+	{
 		$color = $this->coerceColor($color);
 		if (is_null($color)) {
 			$this->throwError("color expected for rgbahex");
@@ -986,7 +1035,8 @@ class Lessc {
 			);
 	}
 
-	protected function lib_argb($color) {
+	protected function lib_argb($color)
+	{
 		return $this->lib_rgbahex($color);
 	}
 
@@ -996,7 +1046,8 @@ class Lessc {
 	 * @param  array  $value either an argument list (two strings) or a single string
 	 * @return string        formatted url(), either as a link or base64-encoded
 	 */
-	protected function lib_data_uri($value) {
+	protected function lib_data_uri($value)
+	{
 		$mime = ($value[0] === 'list') ? $value[2][0][2] : null;
 		$url = ($value[0] === 'list') ? $value[2][1][2][0] : $value[2][0];
 
@@ -1024,7 +1075,8 @@ class Lessc {
 	}
 
 	// utility func to unquote a string
-	protected function lib_e($arg) {
+	protected function lib_e($arg)
+	{
 		switch ($arg[0]) {
 			case "list":
 				$items = $arg[2];
@@ -1043,7 +1095,8 @@ class Lessc {
 		}
 	}
 
-	protected function lib__sprintf($args) {
+	protected function lib__sprintf($args)
+	{
 		if ($args[0] != "list") return $args;
 		$values = $args[2];
 		$string = array_shift($values);
@@ -1072,17 +1125,20 @@ class Lessc {
 		return array("string", $d, array($template));
 	}
 
-	protected function lib_floor($arg) {
+	protected function lib_floor($arg)
+	{
 		$value = $this->assertNumber($arg);
 		return array("number", floor($value), $arg[2]);
 	}
 
-	protected function lib_ceil($arg) {
+	protected function lib_ceil($arg)
+	{
 		$value = $this->assertNumber($arg);
 		return array("number", ceil($value), $arg[2]);
 	}
 
-	protected function lib_round($arg) {
+	protected function lib_round($arg)
+	{
 		if ($arg[0] != "list") {
 			$value = $this->assertNumber($arg);
 			return array("number", round($value), $arg[2]);
@@ -1093,7 +1149,8 @@ class Lessc {
 		}
 	}
 
-	protected function lib_unit($arg) {
+	protected function lib_unit($arg)
+	{
 		if ($arg[0] == "list") {
 			list($number, $newUnit) = $arg[2];
 			return array("number", $this->assertNumber($number),
@@ -1107,7 +1164,8 @@ class Lessc {
 	 * Helper function to get arguments for color manipulation functions.
 	 * takes a list that contains a color like thing and a percentage
 	 */
-	public function colorArgs($args) {
+	public function colorArgs($args)
+	{
 		if ($args[0] != 'list' || count($args[2]) < 2) {
 			return array(array('color', 0, 0, 0), 0);
 		}
@@ -1118,7 +1176,8 @@ class Lessc {
 		return array($color, $delta);
 	}
 
-	protected function lib_darken($args) {
+	protected function lib_darken($args)
+	{
 		list($color, $delta) = $this->colorArgs($args);
 
 		$hsl = $this->toHSL($color);
@@ -1126,7 +1185,8 @@ class Lessc {
 		return $this->toRGB($hsl);
 	}
 
-	protected function lib_lighten($args) {
+	protected function lib_lighten($args)
+	{
 		list($color, $delta) = $this->colorArgs($args);
 
 		$hsl = $this->toHSL($color);
@@ -1134,7 +1194,8 @@ class Lessc {
 		return $this->toRGB($hsl);
 	}
 
-	protected function lib_saturate($args) {
+	protected function lib_saturate($args)
+	{
 		list($color, $delta) = $this->colorArgs($args);
 
 		$hsl = $this->toHSL($color);
@@ -1142,7 +1203,8 @@ class Lessc {
 		return $this->toRGB($hsl);
 	}
 
-	protected function lib_desaturate($args) {
+	protected function lib_desaturate($args)
+	{
 		list($color, $delta) = $this->colorArgs($args);
 
 		$hsl = $this->toHSL($color);
@@ -1150,7 +1212,8 @@ class Lessc {
 		return $this->toRGB($hsl);
 	}
 
-	protected function lib_spin($args) {
+	protected function lib_spin($args)
+	{
 		list($color, $delta) = $this->colorArgs($args);
 
 		$hsl = $this->toHSL($color);
@@ -1163,49 +1226,57 @@ class Lessc {
 		return $this->toRGB($hsl);
 	}
 
-	protected function lib_fadeout($args) {
+	protected function lib_fadeout($args)
+	{
 		list($color, $delta) = $this->colorArgs($args);
 		$color[4] = $this->clamp((isset($color[4]) ? $color[4] : 1) - $delta / 100);
 		return $color;
 	}
 
-	protected function lib_fadein($args) {
+	protected function lib_fadein($args)
+	{
 		list($color, $delta) = $this->colorArgs($args);
 		$color[4] = $this->clamp((isset($color[4]) ? $color[4] : 1) + $delta / 100);
 		return $color;
 	}
 
-	protected function lib_hue($color) {
+	protected function lib_hue($color)
+	{
 		$hsl = $this->toHSL($this->assertColor($color));
 		return round($hsl[1]);
 	}
 
-	protected function lib_saturation($color) {
+	protected function lib_saturation($color)
+	{
 		$hsl = $this->toHSL($this->assertColor($color));
 		return round($hsl[2]);
 	}
 
-	protected function lib_lightness($color) {
+	protected function lib_lightness($color)
+	{
 		$hsl = $this->toHSL($this->assertColor($color));
 		return round($hsl[3]);
 	}
 
 	// get the alpha of a color
 	// defaults to 1 for non-colors or colors without an alpha
-	protected function lib_alpha($value) {
+	protected function lib_alpha($value)
+	{
 		if (!is_null($color = $this->coerceColor($value))) {
 			return isset($color[4]) ? $color[4] : 1;
 		}
 	}
 
 	// set the alpha of the color
-	protected function lib_fade($args) {
+	protected function lib_fade($args)
+	{
 		list($color, $alpha) = $this->colorArgs($args);
 		$color[4] = $this->clamp($alpha / 100.0);
 		return $color;
 	}
 
-	protected function lib_percentage($arg) {
+	protected function lib_percentage($arg)
+	{
 		$num = $this->assertNumber($arg);
 		return array("number", $num * 100, "%");
 	}
@@ -1221,7 +1292,8 @@ class Lessc {
 	 *
 	 * @return array Color
 	 */
-	protected function lib_tint($args) {
+	protected function lib_tint($args)
+	{
 		$white = ['color', 255, 255, 255];
 		if ($args[0] == 'color') {
 			return $this->lib_mix(['list', ',', [$white, $args]]);
@@ -1243,7 +1315,8 @@ class Lessc {
 	 *
 	 * @return array Color
 	 */
-	protected function lib_shade($args) {
+	protected function lib_shade($args)
+	{
 		$black = ['color', 0, 0, 0];
 		if ($args[0] == 'color') {
 			return $this->lib_mix(['list', ',', [$black, $args]]);
@@ -1257,7 +1330,8 @@ class Lessc {
 	// mixes two colors by weight
 	// mix(@color1, @color2, [@weight: 50%]);
 	// http://sass-lang.com/docs/yardoc/Sass/Script/Functions.html#mix-instance_method
-	protected function lib_mix($args) {
+	protected function lib_mix($args)
+	{
 		if ($args[0] != "list" || count($args[2]) < 2)
 			$this->throwError("mix expects (color1, color2, weight)");
 
@@ -1268,11 +1342,11 @@ class Lessc {
 			$first_a = $this->lib_alpha($first);
 			$second_a = $this->lib_alpha($second);
 
-			if (isset($args[2][2])) {
-				$weight = $args[2][2][1] / 100.0;
-			} else {
-				$weight = 0.5;
-			}
+		if (isset($args[2][2])) {
+			$weight = $args[2][2][1] / 100.0;
+		} else {
+			$weight = 0.5;
+		}
 
 			$w = $weight * 2 - 1;
 			$a = $first_a - $second_a;
@@ -1286,14 +1360,15 @@ class Lessc {
 				$w1 * $first[3] + $w2 * $second[3],
 			);
 
-			if ($first_a != 1.0 || $second_a != 1.0) {
-				$new[] = $first_a * $weight + $second_a * ($weight - 1);
-			}
+		if ($first_a != 1.0 || $second_a != 1.0) {
+			$new[] = $first_a * $weight + $second_a * ($weight - 1);
+		}
 
 			return $this->fixColor($new);
 	}
 
-	protected function lib_contrast($args) {
+	protected function lib_contrast($args)
+	{
 		$darkColor  = array('color', 0, 0, 0);
 		$lightColor = array('color', 255, 255, 255);
 		$threshold  = 0.43;
@@ -1326,7 +1401,8 @@ class Lessc {
 		return $darkColor;
 	}
 
-	private function toLuma($color) {
+	private function toLuma($color)
+	{
 		list(, $r, $g, $b) = $this->coerceColor($color);
 
 		$r = $r / 255;
@@ -1340,23 +1416,27 @@ class Lessc {
 		return (0.2126 * $r) + (0.7152 * $g) + (0.0722 * $b);
 	}
 
-	protected function lib_luma($color) {
+	protected function lib_luma($color)
+	{
 		return array("number", round($this->toLuma($color) * 100, 8), "%");
 	}
 
 
-	public function assertColor($value, $error = "expected color value") {
+	public function assertColor($value, $error = "expected color value")
+	{
 		$color = $this->coerceColor($value);
 		if (is_null($color)) $this->throwError($error);
 		return $color;
 	}
 
-	public function assertNumber($value, $error = "expecting number") {
+	public function assertNumber($value, $error = "expecting number")
+	{
 		if ($value[0] == "number") return $value[1];
 		$this->throwError($error);
 	}
 
-	public function assertArgs($value, $expectedArgs, $name = "") {
+	public function assertArgs($value, $expectedArgs, $name = "")
+	{
 		if ($expectedArgs == 1) {
 			return $value;
 		} else {
@@ -1375,7 +1455,8 @@ class Lessc {
 		}
 	}
 
-	protected function toHSL($color) {
+	protected function toHSL($color)
+	{
 		if ($color[0] === 'hsl') {
 			return $color;
 		}
@@ -1403,7 +1484,6 @@ class Lessc {
 			} elseif ($b == $max) {
 				$H = 4.0 + ($r - $g) / ($max - $min);
 			}
-
 		}
 
 		$out = array('hsl',
@@ -1419,7 +1499,8 @@ class Lessc {
 		return $out;
 	}
 
-	protected function toRGB_helper($comp, $temp1, $temp2) {
+	protected function toRGB_helper($comp, $temp1, $temp2)
+	{
 		if ($comp < 0) {
 			$comp += 1.0;
 		} elseif ($comp > 1) {
@@ -1443,7 +1524,8 @@ class Lessc {
 	 * Converts a hsl array into a color value in rgb.
 	 * Expects H to be in range of 0 to 360, S and L in 0 to 100
 	 */
-	protected function toRGB($color) {
+	protected function toRGB($color)
+	{
 		if ($color[0] === 'color') {
 			return $color;
 		}
@@ -1474,7 +1556,8 @@ class Lessc {
 		return $out;
 	}
 
-	protected function clamp($v, $max = 1, $min = 0) {
+	protected function clamp($v, $max = 1, $min = 0)
+	{
 		return min($max, max($min, $v));
 	}
 
@@ -1482,7 +1565,8 @@ class Lessc {
 	 * Convert the rgb, rgba, hsl color literals of function type
 	 * as returned by the parser into values of color type.
 	 */
-	protected function funcToColor($func) {
+	protected function funcToColor($func)
+	{
 		$fname = $func[1];
 		if ($func[2][0] != 'list') {
 			// need a list of arguments
@@ -1513,7 +1597,6 @@ class Lessc {
 				$hsl[] = 0;
 			}
 			return $this->toRGB($hsl);
-
 		} elseif ($fname == 'rgb' || $fname == 'rgba') {
 			$components = array();
 			$i = 1;
@@ -1545,7 +1628,8 @@ class Lessc {
 		return false;
 	}
 
-	protected function reduce($value, $forExpression = false) {
+	protected function reduce($value, $forExpression = false)
+	{
 		switch ($value[0]) {
 			case "interpolate":
 				$reduced = $this->reduce($value[1]);
@@ -1611,18 +1695,18 @@ class Lessc {
 
 						$ret = call_user_func($f, $this->reduce($args, true), $this);
 
-						if (is_null($ret)) {
-							return array("string", "", array(
-								$name, "(", $args, ")"
-							));
-						}
+					if (is_null($ret)) {
+						return array("string", "", array(
+							$name, "(", $args, ")"
+						));
+					}
 
 						// convert to a typed value if the result is a php primitive
-						if (is_numeric($ret)) {
-							$ret = array('number', $ret, "");
-						} elseif (!is_array($ret)) {
-							$ret = array('keyword', $ret);
-						}
+					if (is_numeric($ret)) {
+						$ret = array('number', $ret, "");
+					} elseif (!is_array($ret)) {
+						$ret = array('keyword', $ret);
+					}
 
 						return $ret;
 				}
@@ -1663,7 +1747,8 @@ class Lessc {
 
 
 	// coerce a value for use in color operation
-	protected function coerceColor($value) {
+	protected function coerceColor($value)
+	{
 		switch ($value[0]) {
 			case 'color': return $value;
 			case 'raw_color':
@@ -1695,7 +1780,8 @@ class Lessc {
 	}
 
 	// make something string like into a string
-	protected function coerceString($value) {
+	protected function coerceString($value)
+	{
 		switch ($value[0]) {
 			case "string":
 				return $value;
@@ -1706,19 +1792,22 @@ class Lessc {
 	}
 
 	// turn list of length 1 into value type
-	protected function flattenList($value) {
+	protected function flattenList($value)
+	{
 		if ($value[0] == "list" && count($value[2]) == 1) {
 			return $this->flattenList($value[2][0]);
 		}
 		return $value;
 	}
 
-	public function toBool($a) {
+	public function toBool($a)
+	{
 		return $a ? self::$TRUE : self::$FALSE;
 	}
 
 	// evaluate an expression
-	protected function evaluate($exp) {
+	protected function evaluate($exp)
+	{
 		list(, $op, $left, $right, $whiteBefore, $whiteAfter) = $exp;
 
 		$left = $this->reduce($left, true);
@@ -1767,7 +1856,8 @@ class Lessc {
 		return array("string", "", array($left, $paddedOp, $right));
 	}
 
-	protected function stringConcatenate($left, $right) {
+	protected function stringConcatenate($left, $right)
+	{
 		if ($strLeft = $this->coerceString($left)) {
 			if ($right[0] == "string") {
 				$right[1] = "";
@@ -1784,7 +1874,8 @@ class Lessc {
 
 
 	// make sure a color's components don't go out of bounds
-	protected function fixColor($c) {
+	protected function fixColor($c)
+	{
 		foreach (range(1, 3) as $i) {
 			if ($c[$i] < 0) $c[$i] = 0;
 			if ($c[$i] > 255) $c[$i] = 255;
@@ -1793,20 +1884,23 @@ class Lessc {
 		return $c;
 	}
 
-	protected function op_number_color($op, $lft, $rgt) {
+	protected function op_number_color($op, $lft, $rgt)
+	{
 		if ($op == '+' || $op == '*') {
 			return $this->op_color_number($op, $rgt, $lft);
 		}
 	}
 
-	protected function op_color_number($op, $lft, $rgt) {
+	protected function op_color_number($op, $lft, $rgt)
+	{
 		if ($rgt[0] == '%') $rgt[1] /= 100;
 
 		return $this->op_color_color($op, $lft,
 			array_fill(1, count($lft) - 1, $rgt[1]));
 	}
 
-	protected function op_color_color($op, $left, $right) {
+	protected function op_color_color($op, $left, $right)
+	{
 		$out = array('color');
 		$max = count($left) > count($right) ? count($left) : count($right);
 		foreach (range(1, $max - 1) as $i) {
@@ -1838,7 +1932,8 @@ class Lessc {
 		return $this->fixColor($out);
 	}
 
-	public function lib_red($color) {
+	public function lib_red($color)
+	{
 		$color = $this->coerceColor($color);
 		if (is_null($color)) {
 			$this->throwError('color expected for red()');
@@ -1847,7 +1942,8 @@ class Lessc {
 		return $color[1];
 	}
 
-	public function lib_green($color) {
+	public function lib_green($color)
+	{
 		$color = $this->coerceColor($color);
 		if (is_null($color)) {
 			$this->throwError('color expected for green()');
@@ -1856,7 +1952,8 @@ class Lessc {
 		return $color[2];
 	}
 
-	public function lib_blue($color) {
+	public function lib_blue($color)
+	{
 		$color = $this->coerceColor($color);
 		if (is_null($color)) {
 			$this->throwError('color expected for blue()');
@@ -1867,7 +1964,8 @@ class Lessc {
 
 
 	// operator on two numbers
-	protected function op_number_number($op, $left, $right) {
+	protected function op_number_number($op, $left, $right)
+	{
 		$unit = empty($left[2]) ? $right[2] : $left[2];
 
 		$value = 0;
@@ -1906,7 +2004,8 @@ class Lessc {
 
 	/* environment functions */
 
-	protected function makeOutputBlock($type, $selectors = null) {
+	protected function makeOutputBlock($type, $selectors = null)
+	{
 		$b = new stdclass;
 		$b->lines = array();
 		$b->children = array();
@@ -1917,7 +2016,8 @@ class Lessc {
 	}
 
 	// the state of execution
-	protected function pushEnv($block = null) {
+	protected function pushEnv($block = null)
+	{
 		$e = new stdclass;
 		$e->parent = $this->env;
 		$e->store = array();
@@ -1928,20 +2028,23 @@ class Lessc {
 	}
 
 	// pop something off the stack
-	protected function popEnv() {
+	protected function popEnv()
+	{
 		$old = $this->env;
 		$this->env = $this->env->parent;
 		return $old;
 	}
 
 	// set something in the current env
-	protected function set($name, $value) {
+	protected function set($name, $value)
+	{
 		$this->env->store[$name] = $value;
 	}
 
 
 	// get the highest occurrence entry for a name
-	protected function get($name) {
+	protected function get($name)
+	{
 		$current = $this->env;
 
 		$isArguments = $name == $this->vPrefix.'arguments';
@@ -1962,7 +2065,8 @@ class Lessc {
 	}
 
 	// inject array of unparsed strings into environment as variables
-	protected function injectVariables($args) {
+	protected function injectVariables($args)
+	{
 		$this->pushEnv();
 		$parser = new lessc_parser($this, __METHOD__);
 		foreach ($args as $name => $strValue) {
@@ -1983,14 +2087,16 @@ class Lessc {
 	 * Initialize any static state, can initialize parser for a file
 	 * $opts isn't used yet
 	 */
-	public function __construct($fname = null) {
+	public function __construct($fname = null)
+	{
 		if ($fname !== null) {
 			// used for deprecated parse method
 			$this->_parseFile = $fname;
 		}
 	}
 
-	public function compile($string, $name = null) {
+	public function compile($string, $name = null)
+	{
 		$locale = setlocale(LC_NUMERIC, 0);
 		setlocale(LC_NUMERIC, "C");
 
@@ -2016,7 +2122,8 @@ class Lessc {
 		return $out;
 	}
 
-	public function compileFile($fname, $outFname = null) {
+	public function compileFile($fname, $outFname = null)
+	{
 		if (!is_readable($fname)) {
 			throw new Exception('load error: failed to find '.$fname);
 		}
@@ -2042,7 +2149,8 @@ class Lessc {
 	}
 
 	// compile only if changed input has changed or output doesn't exist
-	public function checkedCompile($in, $out) {
+	public function checkedCompile($in, $out)
+	{
 		if (!is_file($out) || filemtime($in) > filemtime($out)) {
 			$this->compileFile($in, $out);
 			return true;
@@ -2070,7 +2178,8 @@ class Lessc {
 	 * @param bool $force Force rebuild?
 	 * @return array lessphp cache structure
 	 */
-	public function cachedCompile($in, $force = false) {
+	public function cachedCompile($in, $force = false)
+	{
 		// assume no root
 		$root = null;
 
@@ -2111,12 +2220,12 @@ class Lessc {
 			// we were given initially.
 			return $in;
 		}
-
 	}
 
 	// parse and compile buffer
 	// This is deprecated
-	public function parse($str = null, $initialVariables = null) {
+	public function parse($str = null, $initialVariables = null)
+	{
 		if (is_array($str)) {
 			$initialVariables = $str;
 			$str = null;
@@ -2141,18 +2250,21 @@ class Lessc {
 		return $out;
 	}
 
-	protected function makeParser($name) {
+	protected function makeParser($name)
+	{
 		$parser = new lessc_parser($this, $name);
 		$parser->writeComments = $this->preserveComments;
 
 		return $parser;
 	}
 
-	public function setFormatter($name) {
+	public function setFormatter($name)
+	{
 		$this->formatterName = $name;
 	}
 
-	protected function newFormatter() {
+	protected function newFormatter()
+	{
 		$className = "lessc_formatter_lessjs";
 		if (!empty($this->formatterName)) {
 			if (!is_string($this->formatterName))
@@ -2163,47 +2275,57 @@ class Lessc {
 		return new $className;
 	}
 
-	public function setPreserveComments($preserve) {
+	public function setPreserveComments($preserve)
+	{
 		$this->preserveComments = $preserve;
 	}
 
-	public function registerFunction($name, $func) {
+	public function registerFunction($name, $func)
+	{
 		$this->libFunctions[$name] = $func;
 	}
 
-	public function unregisterFunction($name) {
+	public function unregisterFunction($name)
+	{
 		unset($this->libFunctions[$name]);
 	}
 
-	public function setVariables($variables) {
+	public function setVariables($variables)
+	{
 		$this->registeredVars = array_merge($this->registeredVars, $variables);
 	}
 
-	public function unsetVariable($name) {
+	public function unsetVariable($name)
+	{
 		unset($this->registeredVars[$name]);
 	}
 
-	public function setImportDir($dirs) {
+	public function setImportDir($dirs)
+	{
 		$this->importDir = (array) $dirs;
 	}
 
-	public function addImportDir($dir) {
+	public function addImportDir($dir)
+	{
 		$this->importDir = (array) $this->importDir;
 		$this->importDir[] = $dir;
 	}
 
-	public function allParsedFiles() {
+	public function allParsedFiles()
+	{
 		return $this->allParsedFiles;
 	}
 
-	public function addParsedFile($file) {
+	public function addParsedFile($file)
+	{
 		$this->allParsedFiles[realpath($file)] = filemtime($file);
 	}
 
 	/**
 	 * Uses the current value of $this->count to show line and line number
 	 */
-	public function throwError($msg = null) {
+	public function throwError($msg = null)
+	{
 		if ($this->sourceLoc >= 0) {
 			$this->sourceParser->throwError($msg, $this->sourceLoc);
 		}
@@ -2212,14 +2334,16 @@ class Lessc {
 
 	// compile file $in to file $out if $in is newer than $out
 	// returns true when it compiles, false otherwise
-	public static function ccompile($in, $out, $less = null) {
+	public static function ccompile($in, $out, $less = null)
+	{
 		if ($less === null) {
 			$less = new self;
 		}
 		return $less->checkedCompile($in, $out);
 	}
 
-	public static function cexecute($in, $force = false, $less = null) {
+	public static function cexecute($in, $force = false, $less = null)
+	{
 		if ($less === null) {
 			$less = new self;
 		}
@@ -2380,7 +2504,8 @@ class Lessc {
 
 // responsible for taking a string of LESS code and converting it into a
 // syntax tree
-class lessc_parser {
+class lessc_parser
+{
 	protected static $nextBlockId = 0; // used to uniquely identify blocks
 
 	protected static $precedence = array(
@@ -2428,7 +2553,8 @@ class lessc_parser {
 	// caches preg escaped literals
 	protected static $literalCache = array();
 
-	public function __construct($lessc, $sourceName = null) {
+	public function __construct($lessc, $sourceName = null)
+	{
 		$this->eatWhiteDefault = true;
 		// reference to less needed for vPrefix, mPrefix, and parentSelector
 		$this->lessc = $lessc;
@@ -2458,7 +2584,8 @@ class lessc_parser {
 	 * @throws exception
 	 * @return NULL|stdclass
 	 */
-	public function parse($buffer) {
+	public function parse($buffer)
+	{
 		$this->count = 0;
 		$this->line = 1;
 
@@ -2478,19 +2605,19 @@ class lessc_parser {
 			// parse the entire file
 			while (false !== $this->parseChunk());
 
-			if ($this->count != strlen($this->buffer))
+		if ($this->count != strlen($this->buffer))
 			{
-				$this->throwError('parse error count '.$this->count.' != len buffer '.strlen($this->buffer));
-			}
+			$this->throwError('parse error count '.$this->count.' != len buffer '.strlen($this->buffer));
+		}
 
 			// TODO report where the block was opened
-			if (!property_exists($this->env, 'parent') || !is_null($this->env->parent))
+		if (!property_exists($this->env, 'parent') || !is_null($this->env->parent))
 			{
-				throw new exception('parse error: unclosed block');
-			}
+			throw new exception('parse error: unclosed block');
+		}
 
 			return $this->env;
-		}
+	}
 
 		/**
 		 * Parse a single chunk off the head of the buffer and append it to the
@@ -2528,1257 +2655,1300 @@ class lessc_parser {
 		 * position into $s. Then if a chain fails, use $this->seek($s) to
 		 * go back where we started.
 		 */
-		protected function parseChunk() {
-			if (empty($this->buffer)) return false;
-			$s = $this->seek();
+	protected function parseChunk()
+	{
+		if (empty($this->buffer)) return false;
+		$s = $this->seek();
 
-			if ($this->whitespace()) {
-				return true;
-			}
-
-			// setting a property
-			if ($this->keyword($key) && $this->assign() &&
-				$this->propertyValue($value, $key) && $this->end()
-				) {
-					$this->append(array('assign', $key, $value), $s);
-					return true;
-				} else {
-					$this->seek($s);
-				}
-
-
-				// look for special css blocks
-				if ($this->literal('@', false)) {
-					$this->count--;
-
-					// media
-					if ($this->literal('@media')) {
-						if (($this->mediaQueryList($mediaQueries) || true)
-							&& $this->literal('{')
-							) {
-								$media = $this->pushSpecialBlock("media");
-								$media->queries = is_null($mediaQueries) ? array() : $mediaQueries;
-								return true;
-							} else {
-								$this->seek($s);
-								return false;
-							}
-					}
-
-					if ($this->literal("@", false) && $this->keyword($dirName)) {
-						if ($this->isDirective($dirName, $this->blockDirectives)) {
-							if (($this->openString("{", $dirValue, null, array(";")) || true) &&
-								$this->literal("{")
-								) {
-									$dir = $this->pushSpecialBlock("directive");
-									$dir->name = $dirName;
-									if (isset($dirValue)) $dir->value = $dirValue;
-									return true;
-								}
-						} elseif ($this->isDirective($dirName, $this->lineDirectives)) {
-							if ($this->propertyValue($dirValue) && $this->end()) {
-								$this->append(array("directive", $dirName, $dirValue));
-								return true;
-							}
-						}
-					}
-
-					$this->seek($s);
-				}
-
-				// setting a variable
-				if ($this->variable($var) && $this->assign() &&
-					$this->propertyValue($value) && $this->end()
-					) {
-						$this->append(array('assign', $var, $value), $s);
-						return true;
-					} else {
-						$this->seek($s);
-					}
-
-					if ($this->import($importValue)) {
-						$this->append($importValue, $s);
-						return true;
-					}
-
-					// opening parametric mixin
-					if ($this->tag($tag, true) && $this->argumentDef($args, $isVararg) &&
-						($this->guards($guards) || true) &&
-						$this->literal('{')
-						) {
-							$block = $this->pushBlock($this->fixTags(array($tag)));
-							$block->args = $args;
-							$block->isVararg = $isVararg;
-							if (!empty($guards)) $block->guards = $guards;
-							return true;
-						} else {
-							$this->seek($s);
-						}
-
-						// opening a simple block
-						if ($this->tags($tags) && $this->literal('{', false)) {
-							$tags = $this->fixTags($tags);
-							$this->pushBlock($tags);
-							return true;
-						} else {
-							$this->seek($s);
-						}
-
-						// closing a block
-						if ($this->literal('}', false)) {
-							try {
-								$block = $this->pop();
-							} catch (exception $e) {
-								$this->seek($s);
-								$this->throwError($e->getMessage());
-							}
-
-							$hidden = false;
-							if (is_null($block->type)) {
-								$hidden = true;
-								if (!isset($block->args)) {
-									foreach ($block->tags as $tag) {
-										if (!is_string($tag) || $tag{0} != $this->lessc->mPrefix) {
-											$hidden = false;
-											break;
-										}
-									}
-								}
-
-								foreach ($block->tags as $tag) {
-									if (is_string($tag)) {
-										$this->env->children[$tag][] = $block;
-									}
-								}
-							}
-
-							if (!$hidden) {
-								$this->append(array('block', $block), $s);
-							}
-
-							// this is done here so comments aren't bundled into he block that
-							// was just closed
-							$this->whitespace();
-							return true;
-						}
-
-						// mixin
-						if ($this->mixinTags($tags) &&
-							($this->argumentDef($argv, $isVararg) || true) &&
-							($this->keyword($suffix) || true) && $this->end()
-							) {
-								$tags = $this->fixTags($tags);
-								$this->append(array('mixin', $tags, $argv, $suffix), $s);
-								return true;
-							} else {
-								$this->seek($s);
-							}
-
-							// spare ;
-							if ($this->literal(';')) return true;
-
-							return false; // got nothing, throw error
-		}
-
-		protected function isDirective($dirname, $directives) {
-			// TODO: cache pattern in parser
-			$pattern = implode("|",
-				array_map(array("lessc", "preg_quote"), $directives));
-			$pattern = '/^(-[a-z-]+-)?('.$pattern.')$/i';
-
-			return preg_match($pattern, $dirname);
-		}
-
-		protected function fixTags($tags) {
-			// move @ tags out of variable namespace
-			foreach ($tags as &$tag) {
-				if ($tag{0} == $this->lessc->vPrefix)
-					$tag[0] = $this->lessc->mPrefix;
-			}
-			return $tags;
-		}
-
-		// a list of expressions
-		protected function expressionList(&$exps) {
-			$values = array();
-
-			while ($this->expression($exp)) {
-				$values[] = $exp;
-			}
-
-			if (count($values) == 0) return false;
-
-			$exps = lessc::compressList($values, ' ');
+		if ($this->whitespace()) {
 			return true;
 		}
 
+		// setting a property
+		if ($this->keyword($key) && $this->assign() &&
+			$this->propertyValue($value, $key) && $this->end()
+			) {
+				$this->append(array('assign', $key, $value), $s);
+				return true;
+		} else {
+			$this->seek($s);
+		}
+
+
+			// look for special css blocks
+		if ($this->literal('@', false)) {
+			$this->count--;
+
+			// media
+			if ($this->literal('@media')) {
+				if (($this->mediaQueryList($mediaQueries) || true)
+					&& $this->literal('{')
+					) {
+						$media = $this->pushSpecialBlock("media");
+						$media->queries = is_null($mediaQueries) ? array() : $mediaQueries;
+						return true;
+				} else {
+					$this->seek($s);
+					return false;
+				}
+			}
+
+			if ($this->literal("@", false) && $this->keyword($dirName)) {
+				if ($this->isDirective($dirName, $this->blockDirectives)) {
+					if (($this->openString("{", $dirValue, null, array(";")) || true) &&
+						$this->literal("{")
+						) {
+							$dir = $this->pushSpecialBlock("directive");
+							$dir->name = $dirName;
+							if (isset($dirValue)) $dir->value = $dirValue;
+							return true;
+					}
+				} elseif ($this->isDirective($dirName, $this->lineDirectives)) {
+					if ($this->propertyValue($dirValue) && $this->end()) {
+						$this->append(array("directive", $dirName, $dirValue));
+						return true;
+					}
+				}
+			}
+
+			$this->seek($s);
+		}
+
+			// setting a variable
+		if ($this->variable($var) && $this->assign() &&
+				$this->propertyValue($value) && $this->end()
+				) {
+				$this->append(array('assign', $var, $value), $s);
+				return true;
+		} else {
+			$this->seek($s);
+		}
+
+		if ($this->import($importValue)) {
+			$this->append($importValue, $s);
+			return true;
+		}
+
+				// opening parametric mixin
+		if ($this->tag($tag, true) && $this->argumentDef($args, $isVararg) &&
+					($this->guards($guards) || true) &&
+					$this->literal('{')
+					) {
+				$block = $this->pushBlock($this->fixTags(array($tag)));
+				$block->args = $args;
+				$block->isVararg = $isVararg;
+				if (!empty($guards)) $block->guards = $guards;
+				return true;
+		} else {
+			$this->seek($s);
+		}
+
+					// opening a simple block
+		if ($this->tags($tags) && $this->literal('{', false)) {
+			$tags = $this->fixTags($tags);
+			$this->pushBlock($tags);
+			return true;
+		} else {
+			$this->seek($s);
+		}
+
+					// closing a block
+		if ($this->literal('}', false)) {
+			try {
+				$block = $this->pop();
+			} catch (exception $e) {
+				$this->seek($s);
+				$this->throwError($e->getMessage());
+			}
+
+			$hidden = false;
+			if (is_null($block->type)) {
+				$hidden = true;
+				if (!isset($block->args)) {
+					foreach ($block->tags as $tag) {
+						if (!is_string($tag) || $tag{0} != $this->lessc->mPrefix) {
+							$hidden = false;
+							break;
+						}
+					}
+				}
+
+				foreach ($block->tags as $tag) {
+					if (is_string($tag)) {
+						$this->env->children[$tag][] = $block;
+					}
+				}
+			}
+
+			if (!$hidden) {
+				$this->append(array('block', $block), $s);
+			}
+
+			// this is done here so comments aren't bundled into he block that
+			// was just closed
+			$this->whitespace();
+			return true;
+		}
+
+					// mixin
+		if ($this->mixinTags($tags) &&
+						($this->argumentDef($argv, $isVararg) || true) &&
+						($this->keyword($suffix) || true) && $this->end()
+						) {
+				$tags = $this->fixTags($tags);
+				$this->append(array('mixin', $tags, $argv, $suffix), $s);
+				return true;
+		} else {
+			$this->seek($s);
+		}
+
+						// spare ;
+						if ($this->literal(';')) return true;
+
+						return false; // got nothing, throw error
+	}
+
+	protected function isDirective($dirname, $directives)
+	{
+		// TODO: cache pattern in parser
+		$pattern = implode("|",
+			array_map(array("lessc", "preg_quote"), $directives));
+		$pattern = '/^(-[a-z-]+-)?('.$pattern.')$/i';
+
+		return preg_match($pattern, $dirname);
+	}
+
+	protected function fixTags($tags)
+	{
+		// move @ tags out of variable namespace
+		foreach ($tags as &$tag) {
+			if ($tag{0} == $this->lessc->vPrefix)
+				$tag[0] = $this->lessc->mPrefix;
+		}
+		return $tags;
+	}
+
+		// a list of expressions
+	protected function expressionList(&$exps)
+	{
+		$values = array();
+
+		while ($this->expression($exp)) {
+			$values[] = $exp;
+		}
+
+		if (count($values) == 0) return false;
+
+		$exps = lessc::compressList($values, ' ');
+		return true;
+	}
+
 		/**
 		 * Attempt to consume an expression.
 		 * @link http://en.wikipedia.org/wiki/Operator-precedence_parser#Pseudo-code
 		 */
-		protected function expression(&$out) {
-			if ($this->value($lhs)) {
-				$out = $this->expHelper($lhs, 0);
+	protected function expression(&$out)
+	{
+		if ($this->value($lhs)) {
+			$out = $this->expHelper($lhs, 0);
 
-				// look for / shorthand
-				if (!empty($this->env->supressedDivision)) {
-					unset($this->env->supressedDivision);
-					$s = $this->seek();
-					if ($this->literal("/") && $this->value($rhs)) {
-						$out = array("list", "",
-							array($out, array("keyword", "/"), $rhs));
-					} else {
-						$this->seek($s);
-					}
+			// look for / shorthand
+			if (!empty($this->env->supressedDivision)) {
+				unset($this->env->supressedDivision);
+				$s = $this->seek();
+				if ($this->literal("/") && $this->value($rhs)) {
+					$out = array("list", "",
+						array($out, array("keyword", "/"), $rhs));
+				} else {
+					$this->seek($s);
 				}
-
-				return true;
 			}
-			return false;
+
+			return true;
 		}
+		return false;
+	}
 
 		/**
 		 * recursively parse infix equation with $lhs at precedence $minP
 		 */
-		protected function expHelper($lhs, $minP) {
-			$this->inExp = true;
-			$ss = $this->seek();
+	protected function expHelper($lhs, $minP)
+	{
+		$this->inExp = true;
+		$ss = $this->seek();
 
-			while (true) {
-				$whiteBefore = isset($this->buffer[$this->count - 1]) &&
-				ctype_space($this->buffer[$this->count - 1]);
+		while (true) {
+			$whiteBefore = isset($this->buffer[$this->count - 1]) &&
+			ctype_space($this->buffer[$this->count - 1]);
 
-				// If there is whitespace before the operator, then we require
-				// whitespace after the operator for it to be an expression
-				$needWhite = $whiteBefore && !$this->inParens;
+			// If there is whitespace before the operator, then we require
+			// whitespace after the operator for it to be an expression
+			$needWhite = $whiteBefore && !$this->inParens;
 
-				if ($this->match(self::$operatorString.($needWhite ? '\s' : ''), $m) && self::$precedence[$m[1]] >= $minP) {
-					if (!$this->inParens && isset($this->env->currentProperty) && $m[1] == "/" && empty($this->env->supressedDivision)) {
-						foreach (self::$supressDivisionProps as $pattern) {
-							if (preg_match($pattern, $this->env->currentProperty)) {
-								$this->env->supressedDivision = true;
-								break 2;
-							}
+			if ($this->match(self::$operatorString.($needWhite ? '\s' : ''), $m) && self::$precedence[$m[1]] >= $minP) {
+				if (!$this->inParens && isset($this->env->currentProperty) && $m[1] == "/" && empty($this->env->supressedDivision)) {
+					foreach (self::$supressDivisionProps as $pattern) {
+						if (preg_match($pattern, $this->env->currentProperty)) {
+							$this->env->supressedDivision = true;
+							break 2;
 						}
 					}
-
-
-					$whiteAfter = isset($this->buffer[$this->count - 1]) &&
-					ctype_space($this->buffer[$this->count - 1]);
-
-					if (!$this->value($rhs)) break;
-
-					// peek for next operator to see what to do with rhs
-					if ($this->peek(self::$operatorString, $next) && self::$precedence[$next[1]] > self::$precedence[$m[1]]) {
-						$rhs = $this->expHelper($rhs, self::$precedence[$next[1]]);
-					}
-
-					$lhs = array('expression', $m[1], $lhs, $rhs, $whiteBefore, $whiteAfter);
-					$ss = $this->seek();
-
-					continue;
 				}
 
+
+				$whiteAfter = isset($this->buffer[$this->count - 1]) &&
+				ctype_space($this->buffer[$this->count - 1]);
+
+				if (!$this->value($rhs)) break;
+
+				// peek for next operator to see what to do with rhs
+				if ($this->peek(self::$operatorString, $next) && self::$precedence[$next[1]] > self::$precedence[$m[1]]) {
+					$rhs = $this->expHelper($rhs, self::$precedence[$next[1]]);
+				}
+
+				$lhs = array('expression', $m[1], $lhs, $rhs, $whiteBefore, $whiteAfter);
+				$ss = $this->seek();
+
+				continue;
+			}
+
+			break;
+		}
+
+		$this->seek($ss);
+
+		return $lhs;
+	}
+
+		// consume a list of values for a property
+	public function propertyValue(&$value, $keyName = null)
+	{
+		$values = array();
+
+		if ($keyName !== null) $this->env->currentProperty = $keyName;
+
+		$s = null;
+		while ($this->expressionList($v)) {
+			$values[] = $v;
+			$s = $this->seek();
+			if (!$this->literal(',')) break;
+		}
+
+		if ($s) $this->seek($s);
+
+		if ($keyName !== null) unset($this->env->currentProperty);
+
+		if (count($values) == 0) return false;
+
+		$value = lessc::compressList($values, ', ');
+		return true;
+	}
+
+	protected function parenValue(&$out)
+	{
+		$s = $this->seek();
+
+		// speed shortcut
+		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "(") {
+			return false;
+		}
+
+		$inParens = $this->inParens;
+		if ($this->literal("(") &&
+			($this->inParens = true) && $this->expression($exp) &&
+			$this->literal(")")
+			) {
+				$out = $exp;
+				$this->inParens = $inParens;
+				return true;
+		} else {
+			$this->inParens = $inParens;
+			$this->seek($s);
+		}
+
+			return false;
+	}
+
+		// a single value
+	protected function value(&$value)
+	{
+		$s = $this->seek();
+
+		// speed shortcut
+		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "-") {
+			// negation
+			if ($this->literal("-", false) &&
+				(($this->variable($inner) && $inner = array("variable", $inner)) ||
+					$this->unit($inner) ||
+					$this->parenValue($inner))
+				) {
+					$value = array("unary", "-", $inner);
+					return true;
+			} else {
+				$this->seek($s);
+			}
+		}
+
+		if ($this->parenValue($value)) return true;
+		if ($this->unit($value)) return true;
+		if ($this->color($value)) return true;
+		if ($this->func($value)) return true;
+		if ($this->string($value)) return true;
+
+		if ($this->keyword($word)) {
+			$value = array('keyword', $word);
+			return true;
+		}
+
+		// try a variable
+		if ($this->variable($var)) {
+			$value = array('variable', $var);
+			return true;
+		}
+
+		// unquote string (should this work on any type?
+		if ($this->literal("~") && $this->string($str)) {
+			$value = array("escape", $str);
+			return true;
+		} else {
+			$this->seek($s);
+		}
+
+		// css hack: \0
+		if ($this->literal('\\') && $this->match('([0-9]+)', $m)) {
+			$value = array('keyword', '\\'.$m[1]);
+			return true;
+		} else {
+			$this->seek($s);
+		}
+
+		return false;
+	}
+
+		// an import statement
+	protected function import(&$out)
+	{
+		if (!$this->literal('@import')) return false;
+
+		// @import "something.css" media;
+		// @import url("something.css") media;
+		// @import url(something.css) media;
+
+		if ($this->propertyValue($value)) {
+			$out = array("import", $value);
+			return true;
+		}
+	}
+
+	protected function mediaQueryList(&$out)
+	{
+		if ($this->genericList($list, "mediaQuery", ",", false)) {
+			$out = $list[2];
+			return true;
+		}
+		return false;
+	}
+
+	protected function mediaQuery(&$out)
+	{
+		$s = $this->seek();
+
+		$expressions = null;
+		$parts = array();
+
+		if (($this->literal("only") && ($only = true) || $this->literal("not") && ($not = true) || true) && $this->keyword($mediaType)) {
+			$prop = array("mediaType");
+			if (isset($only)) $prop[] = "only";
+			if (isset($not)) $prop[] = "not";
+			$prop[] = $mediaType;
+			$parts[] = $prop;
+		} else {
+			$this->seek($s);
+		}
+
+
+		if (!empty($mediaType) && !$this->literal("and")) {
+			// ~
+		} else {
+			$this->genericList($expressions, "mediaExpression", "and", false);
+			if (is_array($expressions)) $parts = array_merge($parts, $expressions[2]);
+		}
+
+		if (count($parts) == 0) {
+			$this->seek($s);
+			return false;
+		}
+
+		$out = $parts;
+		return true;
+	}
+
+	protected function mediaExpression(&$out)
+	{
+		$s = $this->seek();
+		$value = null;
+		if ($this->literal("(") &&
+			$this->keyword($feature) &&
+			($this->literal(":") && $this->expression($value) || true) &&
+			$this->literal(")")
+			) {
+				$out = array("mediaExp", $feature);
+				if ($value) $out[] = $value;
+				return true;
+		} elseif ($this->variable($variable)) {
+			$out = array('variable', $variable);
+			return true;
+		}
+
+			$this->seek($s);
+			return false;
+	}
+
+		// an unbounded string stopped by $end
+	protected function openString($end, &$out, $nestingOpen = null, $rejectStrs = null)
+	{
+		$oldWhite = $this->eatWhiteDefault;
+		$this->eatWhiteDefault = false;
+
+		$stop = array("'", '"', "@{", $end);
+		$stop = array_map(array("lessc", "preg_quote"), $stop);
+		// $stop[] = self::$commentMulti;
+
+		if (!is_null($rejectStrs)) {
+			$stop = array_merge($stop, $rejectStrs);
+		}
+
+		$patt = '(.*?)('.implode("|", $stop).')';
+
+		$nestingLevel = 0;
+
+		$content = array();
+		while ($this->match($patt, $m, false)) {
+			if (!empty($m[1])) {
+				$content[] = $m[1];
+				if ($nestingOpen) {
+					$nestingLevel += substr_count($m[1], $nestingOpen);
+				}
+			}
+
+			$tok = $m[2];
+
+			$this->count -= strlen($tok);
+			if ($tok == $end) {
+				if ($nestingLevel == 0) {
+					break;
+				} else {
+					$nestingLevel--;
+				}
+			}
+
+			if (($tok == "'" || $tok == '"') && $this->string($str)) {
+				$content[] = $str;
+				continue;
+			}
+
+			if ($tok == "@{" && $this->interpolation($inter)) {
+				$content[] = $inter;
+				continue;
+			}
+
+			if (!empty($rejectStrs) && in_array($tok, $rejectStrs)) {
 				break;
 			}
 
-			$this->seek($ss);
-
-			return $lhs;
+			$content[] = $tok;
+			$this->count += strlen($tok);
 		}
 
-		// consume a list of values for a property
-		public function propertyValue(&$value, $keyName = null) {
-			$values = array();
+		$this->eatWhiteDefault = $oldWhite;
 
-			if ($keyName !== null) $this->env->currentProperty = $keyName;
+		if (count($content) == 0) return false;
 
-			$s = null;
-			while ($this->expressionList($v)) {
-				$values[] = $v;
-				$s = $this->seek();
-				if (!$this->literal(',')) break;
-			}
-
-			if ($s) $this->seek($s);
-
-			if ($keyName !== null) unset($this->env->currentProperty);
-
-			if (count($values) == 0) return false;
-
-			$value = lessc::compressList($values, ', ');
-			return true;
+		// trim the end
+		if (is_string(end($content))) {
+			$content[count($content) - 1] = rtrim(end($content));
 		}
 
-		protected function parenValue(&$out) {
-			$s = $this->seek();
-
-			// speed shortcut
-			if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "(") {
-				return false;
-			}
-
-			$inParens = $this->inParens;
-			if ($this->literal("(") &&
-				($this->inParens = true) && $this->expression($exp) &&
-				$this->literal(")")
-				) {
-					$out = $exp;
-					$this->inParens = $inParens;
-					return true;
-				} else {
-					$this->inParens = $inParens;
-					$this->seek($s);
-				}
-
-				return false;
-		}
-
-		// a single value
-		protected function value(&$value) {
-			$s = $this->seek();
-
-			// speed shortcut
-			if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "-") {
-				// negation
-				if ($this->literal("-", false) &&
-					(($this->variable($inner) && $inner = array("variable", $inner)) ||
-						$this->unit($inner) ||
-						$this->parenValue($inner))
-					) {
-						$value = array("unary", "-", $inner);
-						return true;
-					} else {
-						$this->seek($s);
-					}
-			}
-
-			if ($this->parenValue($value)) return true;
-			if ($this->unit($value)) return true;
-			if ($this->color($value)) return true;
-			if ($this->func($value)) return true;
-			if ($this->string($value)) return true;
-
-			if ($this->keyword($word)) {
-				$value = array('keyword', $word);
-				return true;
-			}
-
-			// try a variable
-			if ($this->variable($var)) {
-				$value = array('variable', $var);
-				return true;
-			}
-
-			// unquote string (should this work on any type?
-			if ($this->literal("~") && $this->string($str)) {
-				$value = array("escape", $str);
-				return true;
-			} else {
-				$this->seek($s);
-			}
-
-			// css hack: \0
-			if ($this->literal('\\') && $this->match('([0-9]+)', $m)) {
-				$value = array('keyword', '\\'.$m[1]);
-				return true;
-			} else {
-				$this->seek($s);
-			}
+		$out = array("string", "", $content);
+		return true;
+	}
 
+	protected function string(&$out)
+	{
+		$s = $this->seek();
+		if ($this->literal('"', false)) {
+			$delim = '"';
+		} elseif ($this->literal("'", false)) {
+			$delim = "'";
+		} else {
 			return false;
 		}
 
-		// an import statement
-		protected function import(&$out) {
-			if (!$this->literal('@import')) return false;
+		$content = array();
 
-			// @import "something.css" media;
-			// @import url("something.css") media;
-			// @import url(something.css) media;
+		// look for either ending delim , escape, or string interpolation
+		$patt = '([^\n]*?)(@\{|\\\\|'.
+			lessc::preg_quote($delim).')';
 
-			if ($this->propertyValue($value)) {
-				$out = array("import", $value);
-				return true;
-			}
-		}
-
-		protected function mediaQueryList(&$out) {
-			if ($this->genericList($list, "mediaQuery", ",", false)) {
-				$out = $list[2];
-				return true;
-			}
-			return false;
-		}
-
-		protected function mediaQuery(&$out) {
-			$s = $this->seek();
-
-			$expressions = null;
-			$parts = array();
-
-			if (($this->literal("only") && ($only = true) || $this->literal("not") && ($not = true) || true) && $this->keyword($mediaType)) {
-				$prop = array("mediaType");
-				if (isset($only)) $prop[] = "only";
-				if (isset($not)) $prop[] = "not";
-				$prop[] = $mediaType;
-				$parts[] = $prop;
-			} else {
-				$this->seek($s);
-			}
-
-
-			if (!empty($mediaType) && !$this->literal("and")) {
-				// ~
-			} else {
-				$this->genericList($expressions, "mediaExpression", "and", false);
-				if (is_array($expressions)) $parts = array_merge($parts, $expressions[2]);
-			}
-
-			if (count($parts) == 0) {
-				$this->seek($s);
-				return false;
-			}
-
-			$out = $parts;
-			return true;
-		}
-
-		protected function mediaExpression(&$out) {
-			$s = $this->seek();
-			$value = null;
-			if ($this->literal("(") &&
-				$this->keyword($feature) &&
-				($this->literal(":") && $this->expression($value) || true) &&
-				$this->literal(")")
-				) {
-					$out = array("mediaExp", $feature);
-					if ($value) $out[] = $value;
-					return true;
-				} elseif ($this->variable($variable)) {
-					$out = array('variable', $variable);
-					return true;
-				}
-
-				$this->seek($s);
-				return false;
-		}
-
-		// an unbounded string stopped by $end
-		protected function openString($end, &$out, $nestingOpen = null, $rejectStrs = null) {
 			$oldWhite = $this->eatWhiteDefault;
 			$this->eatWhiteDefault = false;
 
-			$stop = array("'", '"', "@{", $end);
-			$stop = array_map(array("lessc", "preg_quote"), $stop);
-			// $stop[] = self::$commentMulti;
-
-			if (!is_null($rejectStrs)) {
-				$stop = array_merge($stop, $rejectStrs);
-			}
-
-			$patt = '(.*?)('.implode("|", $stop).')';
-
-			$nestingLevel = 0;
-
-			$content = array();
-			while ($this->match($patt, $m, false)) {
-				if (!empty($m[1])) {
-					$content[] = $m[1];
-					if ($nestingOpen) {
-						$nestingLevel += substr_count($m[1], $nestingOpen);
-					}
-				}
-
-				$tok = $m[2];
-
-				$this->count -= strlen($tok);
-				if ($tok == $end) {
-					if ($nestingLevel == 0) {
-						break;
-					} else {
-						$nestingLevel--;
-					}
-				}
-
-				if (($tok == "'" || $tok == '"') && $this->string($str)) {
-					$content[] = $str;
-					continue;
-				}
-
-				if ($tok == "@{" && $this->interpolation($inter)) {
+		while ($this->match($patt, $m, false)) {
+			$content[] = $m[1];
+			if ($m[2] == "@{") {
+				$this->count -= strlen($m[2]);
+				if ($this->interpolation($inter)) {
 					$content[] = $inter;
-					continue;
+				} else {
+					$this->count += strlen($m[2]);
+					$content[] = "@{"; // ignore it
 				}
-
-				if (!empty($rejectStrs) && in_array($tok, $rejectStrs)) {
-					break;
+			} elseif ($m[2] == '\\') {
+				$content[] = $m[2];
+				if ($this->literal($delim, false)) {
+					$content[] = $delim;
 				}
-
-				$content[] = $tok;
-				$this->count += strlen($tok);
+			} else {
+				$this->count -= strlen($delim);
+				break; // delim
 			}
+		}
 
 			$this->eatWhiteDefault = $oldWhite;
 
-			if (count($content) == 0) return false;
-
-			// trim the end
-			if (is_string(end($content))) {
-				$content[count($content) - 1] = rtrim(end($content));
-			}
-
-			$out = array("string", "", $content);
+		if ($this->literal($delim)) {
+			$out = array("string", $delim, $content);
 			return true;
 		}
 
-		protected function string(&$out) {
-			$s = $this->seek();
-			if ($this->literal('"', false)) {
-				$delim = '"';
-			} elseif ($this->literal("'", false)) {
-				$delim = "'";
-			} else {
-				return false;
-			}
-
-			$content = array();
-
-			// look for either ending delim , escape, or string interpolation
-			$patt = '([^\n]*?)(@\{|\\\\|'.
-				lessc::preg_quote($delim).')';
-
-				$oldWhite = $this->eatWhiteDefault;
-				$this->eatWhiteDefault = false;
-
-				while ($this->match($patt, $m, false)) {
-					$content[] = $m[1];
-					if ($m[2] == "@{") {
-						$this->count -= strlen($m[2]);
-						if ($this->interpolation($inter)) {
-							$content[] = $inter;
-						} else {
-							$this->count += strlen($m[2]);
-							$content[] = "@{"; // ignore it
-						}
-					} elseif ($m[2] == '\\') {
-						$content[] = $m[2];
-						if ($this->literal($delim, false)) {
-							$content[] = $delim;
-						}
-					} else {
-						$this->count -= strlen($delim);
-						break; // delim
-					}
-				}
-
-				$this->eatWhiteDefault = $oldWhite;
-
-				if ($this->literal($delim)) {
-					$out = array("string", $delim, $content);
-					return true;
-				}
-
-				$this->seek($s);
-				return false;
-		}
-
-		protected function interpolation(&$out) {
-			$oldWhite = $this->eatWhiteDefault;
-			$this->eatWhiteDefault = true;
-
-			$s = $this->seek();
-			if ($this->literal("@{") &&
-				$this->openString("}", $interp, null, array("'", '"', ";")) &&
-				$this->literal("}", false)
-				) {
-					$out = array("interpolate", $interp);
-					$this->eatWhiteDefault = $oldWhite;
-					if ($this->eatWhiteDefault) $this->whitespace();
-					return true;
-				}
-
-				$this->eatWhiteDefault = $oldWhite;
-				$this->seek($s);
-				return false;
-		}
-
-		protected function unit(&$unit) {
-			// speed shortcut
-			if (isset($this->buffer[$this->count])) {
-				$char = $this->buffer[$this->count];
-				if (!ctype_digit($char) && $char != ".") return false;
-			}
-
-			if ($this->match('([0-9]+(?:\.[0-9]*)?|\.[0-9]+)([%a-zA-Z]+)?', $m)) {
-				$unit = array("number", $m[1], empty($m[2]) ? "" : $m[2]);
-				return true;
-			}
+			$this->seek($s);
 			return false;
+	}
+
+	protected function interpolation(&$out)
+	{
+		$oldWhite = $this->eatWhiteDefault;
+		$this->eatWhiteDefault = true;
+
+		$s = $this->seek();
+		if ($this->literal("@{") &&
+			$this->openString("}", $interp, null, array("'", '"', ";")) &&
+			$this->literal("}", false)
+			) {
+				$out = array("interpolate", $interp);
+				$this->eatWhiteDefault = $oldWhite;
+				if ($this->eatWhiteDefault) $this->whitespace();
+				return true;
 		}
 
+			$this->eatWhiteDefault = $oldWhite;
+			$this->seek($s);
+			return false;
+	}
+
+	protected function unit(&$unit)
+	{
+		// speed shortcut
+		if (isset($this->buffer[$this->count])) {
+			$char = $this->buffer[$this->count];
+			if (!ctype_digit($char) && $char != ".") return false;
+		}
+
+		if ($this->match('([0-9]+(?:\.[0-9]*)?|\.[0-9]+)([%a-zA-Z]+)?', $m)) {
+			$unit = array("number", $m[1], empty($m[2]) ? "" : $m[2]);
+			return true;
+		}
+		return false;
+	}
+
 		// a # color
-		protected function color(&$out) {
-			if ($this->match('(#(?:[0-9a-f]{8}|[0-9a-f]{6}|[0-9a-f]{3}))', $m)) {
-				if (strlen($m[1]) > 7) {
-					$out = array("string", "", array($m[1]));
-				} else {
-					$out = array("raw_color", $m[1]);
-				}
-				return true;
+	protected function color(&$out)
+	{
+		if ($this->match('(#(?:[0-9a-f]{8}|[0-9a-f]{6}|[0-9a-f]{3}))', $m)) {
+			if (strlen($m[1]) > 7) {
+				$out = array("string", "", array($m[1]));
+			} else {
+				$out = array("raw_color", $m[1]);
 			}
-
-			return false;
+			return true;
 		}
 
+		return false;
+	}
+
 		// consume an argument definition list surrounded by ()
 		// each argument is a variable name with optional value
 		// or at the end a ... or a variable named followed by ...
 		// arguments are separated by , unless a ; is in the list, then ; is the
 		// delimiter.
-		protected function argumentDef(&$args, &$isVararg) {
-			$s = $this->seek();
-			if (!$this->literal('(')) {
-				return false;
+	protected function argumentDef(&$args, &$isVararg)
+	{
+		$s = $this->seek();
+		if (!$this->literal('(')) {
+			return false;
+		}
+
+		$values = array();
+		$delim = ",";
+		$method = "expressionList";
+
+		$isVararg = false;
+		while (true) {
+			if ($this->literal("...")) {
+				$isVararg = true;
+				break;
 			}
 
-			$values = array();
-			$delim = ",";
-			$method = "expressionList";
+			if ($this->$method($value)) {
+				if ($value[0] == "variable") {
+					$arg = array("arg", $value[1]);
+					$ss = $this->seek();
 
-			$isVararg = false;
-			while (true) {
-				if ($this->literal("...")) {
-					$isVararg = true;
-					break;
-				}
-
-				if ($this->$method($value)) {
-					if ($value[0] == "variable") {
-						$arg = array("arg", $value[1]);
-						$ss = $this->seek();
-
-						if ($this->assign() && $this->$method($rhs)) {
-							$arg[] = $rhs;
-						} else {
-							$this->seek($ss);
-							if ($this->literal("...")) {
-								$arg[0] = "rest";
-								$isVararg = true;
-							}
-						}
-
-						$values[] = $arg;
-						if ($isVararg) {
-							break;
-						}
-						continue;
+					if ($this->assign() && $this->$method($rhs)) {
+						$arg[] = $rhs;
 					} else {
-						$values[] = array("lit", $value);
+						$this->seek($ss);
+						if ($this->literal("...")) {
+							$arg[0] = "rest";
+							$isVararg = true;
+						}
 					}
-				}
 
-
-				if (!$this->literal($delim)) {
-					if ($delim == "," && $this->literal(";")) {
-						// found new delim, convert existing args
-						$delim = ";";
-						$method = "propertyValue";
-
-						// transform arg list
-						if (isset($values[1])) { // 2 items
-							$newList = array();
-							foreach ($values as $i => $arg) {
-								switch ($arg[0]) {
-									case "arg":
-										if ($i) {
-											$this->throwError("Cannot mix ; and , as delimiter types");
-										}
-										$newList[] = $arg[2];
-										break;
-									case "lit":
-										$newList[] = $arg[1];
-										break;
-									case "rest":
-										$this->throwError("Unexpected rest before semicolon");
-								}
-							}
-
-							$newList = array("list", ", ", $newList);
-
-							switch ($values[0][0]) {
-								case "arg":
-									$newArg = array("arg", $values[0][1], $newList);
-									break;
-								case "lit":
-									$newArg = array("lit", $newList);
-									break;
-							}
-
-						} elseif ($values) { // 1 item
-							$newArg = $values[0];
-						}
-
-						if ($newArg) {
-							$values = array($newArg);
-						}
-					} else {
+					$values[] = $arg;
+					if ($isVararg) {
 						break;
 					}
+					continue;
+				} else {
+					$values[] = array("lit", $value);
 				}
 			}
 
-			if (!$this->literal(')')) {
-				$this->seek($s);
-				return false;
-			}
 
-			$args = $values;
+			if (!$this->literal($delim)) {
+				if ($delim == "," && $this->literal(";")) {
+					// found new delim, convert existing args
+					$delim = ";";
+					$method = "propertyValue";
 
-			return true;
-		}
-
-		// consume a list of tags
-		// this accepts a hanging delimiter
-		protected function tags(&$tags, $simple = false, $delim = ',') {
-			$tags = array();
-			while ($this->tag($tt, $simple)) {
-				$tags[] = $tt;
-				if (!$this->literal($delim)) break;
-			}
-			if (count($tags) == 0) return false;
-
-			return true;
-		}
-
-		// list of tags of specifying mixin path
-		// optionally separated by > (lazy, accepts extra >)
-		protected function mixinTags(&$tags) {
-			$tags = array();
-			while ($this->tag($tt, true)) {
-				$tags[] = $tt;
-				$this->literal(">");
-			}
-
-			if (!$tags) {
-				return false;
-			}
-
-			return true;
-		}
-
-		// a bracketed value (contained within in a tag definition)
-		protected function tagBracket(&$parts, &$hasExpression) {
-			// speed shortcut
-			if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "[") {
-				return false;
-			}
-
-			$s = $this->seek();
-
-			$hasInterpolation = false;
-
-			if ($this->literal("[", false)) {
-				$attrParts = array("[");
-				// keyword, string, operator
-				while (true) {
-					if ($this->literal("]", false)) {
-						$this->count--;
-						break; // get out early
-					}
-
-					if ($this->match('\s+', $m)) {
-						$attrParts[] = " ";
-						continue;
-					}
-					if ($this->string($str)) {
-						// escape parent selector, (yuck)
-						foreach ($str[2] as &$chunk) {
-							$chunk = str_replace($this->lessc->parentSelector, "$&$", $chunk);
+					// transform arg list
+					if (isset($values[1])) { // 2 items
+						$newList = array();
+						foreach ($values as $i => $arg) {
+							switch ($arg[0]) {
+								case "arg":
+									if ($i) {
+										$this->throwError("Cannot mix ; and , as delimiter types");
+									}
+									$newList[] = $arg[2];
+									break;
+								case "lit":
+									$newList[] = $arg[1];
+									break;
+								case "rest":
+									$this->throwError("Unexpected rest before semicolon");
+							}
 						}
 
-						$attrParts[] = $str;
-						$hasInterpolation = true;
-						continue;
+						$newList = array("list", ", ", $newList);
+
+						switch ($values[0][0]) {
+							case "arg":
+								$newArg = array("arg", $values[0][1], $newList);
+								break;
+							case "lit":
+								$newArg = array("lit", $newList);
+								break;
+						}
+					} elseif ($values) { // 1 item
+						$newArg = $values[0];
 					}
 
-					if ($this->keyword($word)) {
-						$attrParts[] = $word;
-						continue;
+					if ($newArg) {
+						$values = array($newArg);
 					}
-
-					if ($this->interpolation($inter)) {
-						$attrParts[] = $inter;
-						$hasInterpolation = true;
-						continue;
-					}
-
-					// operator, handles attr namespace too
-					if ($this->match('[|-~\$\*\^=]+', $m)) {
-						$attrParts[] = $m[0];
-						continue;
-					}
-
+				} else {
 					break;
 				}
-
-				if ($this->literal("]", false)) {
-					$attrParts[] = "]";
-					foreach ($attrParts as $part) {
-						$parts[] = $part;
-					}
-					$hasExpression = $hasExpression || $hasInterpolation;
-					return true;
-				}
-				$this->seek($s);
 			}
+		}
 
+		if (!$this->literal(')')) {
 			$this->seek($s);
 			return false;
 		}
 
-		// a space separated list of selectors
-		protected function tag(&$tag, $simple = false) {
-			if ($simple) {
-				$chars = '^@,:;{}\][>\(\) "\'';
-			} else {
-				$chars = '^@,;{}["\'';
-			}
-			$s = $this->seek();
+		$args = $values;
 
-			$hasExpression = false;
-			$parts = array();
-			while ($this->tagBracket($parts, $hasExpression));
+		return true;
+	}
 
-			$oldWhite = $this->eatWhiteDefault;
-			$this->eatWhiteDefault = false;
+		// consume a list of tags
+		// this accepts a hanging delimiter
+	protected function tags(&$tags, $simple = false, $delim = ',')
+	{
+		$tags = array();
+		while ($this->tag($tt, $simple)) {
+			$tags[] = $tt;
+			if (!$this->literal($delim)) break;
+		}
+		if (count($tags) == 0) return false;
 
+		return true;
+	}
+
+		// list of tags of specifying mixin path
+		// optionally separated by > (lazy, accepts extra >)
+	protected function mixinTags(&$tags)
+	{
+		$tags = array();
+		while ($this->tag($tt, true)) {
+			$tags[] = $tt;
+			$this->literal(">");
+		}
+
+		if (!$tags) {
+			return false;
+		}
+
+		return true;
+	}
+
+		// a bracketed value (contained within in a tag definition)
+	protected function tagBracket(&$parts, &$hasExpression)
+	{
+		// speed shortcut
+		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "[") {
+			return false;
+		}
+
+		$s = $this->seek();
+
+		$hasInterpolation = false;
+
+		if ($this->literal("[", false)) {
+			$attrParts = array("[");
+			// keyword, string, operator
 			while (true) {
-				if ($this->match('(['.$chars.'0-9]['.$chars.']*)', $m)) {
-					$parts[] = $m[1];
-					if ($simple) break;
+				if ($this->literal("]", false)) {
+					$this->count--;
+					break; // get out early
+				}
 
-					while ($this->tagBracket($parts, $hasExpression));
+				if ($this->match('\s+', $m)) {
+					$attrParts[] = " ";
+					continue;
+				}
+				if ($this->string($str)) {
+					// escape parent selector, (yuck)
+					foreach ($str[2] as &$chunk) {
+						$chunk = str_replace($this->lessc->parentSelector, "$&$", $chunk);
+					}
+
+					$attrParts[] = $str;
+					$hasInterpolation = true;
 					continue;
 				}
 
-				if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "@") {
-					if ($this->interpolation($interp)) {
-						$hasExpression = true;
-						$interp[2] = true; // don't unescape
-						$parts[] = $interp;
-						continue;
-					}
-
-					if ($this->literal("@")) {
-						$parts[] = "@";
-						continue;
-					}
+				if ($this->keyword($word)) {
+					$attrParts[] = $word;
+					continue;
 				}
 
-				if ($this->unit($unit)) { // for keyframes
-					$parts[] = $unit[1];
-					$parts[] = $unit[2];
+				if ($this->interpolation($inter)) {
+					$attrParts[] = $inter;
+					$hasInterpolation = true;
+					continue;
+				}
+
+				// operator, handles attr namespace too
+				if ($this->match('[|-~\$\*\^=]+', $m)) {
+					$attrParts[] = $m[0];
 					continue;
 				}
 
 				break;
 			}
 
-			$this->eatWhiteDefault = $oldWhite;
-			if (!$parts) {
-				$this->seek($s);
-				return false;
+			if ($this->literal("]", false)) {
+				$attrParts[] = "]";
+				foreach ($attrParts as $part) {
+					$parts[] = $part;
+				}
+				$hasExpression = $hasExpression || $hasInterpolation;
+				return true;
 			}
-
-			if ($hasExpression) {
-				$tag = array("exp", array("string", "", $parts));
-			} else {
-				$tag = trim(implode($parts));
-			}
-
-			$this->whitespace();
-			return true;
+			$this->seek($s);
 		}
 
-		// a css function
-		protected function func(&$func) {
-			$s = $this->seek();
+		$this->seek($s);
+		return false;
+	}
 
-			if ($this->match('(%|[\w\-_][\w\-_:\.]+|[\w_])', $m) && $this->literal('(')) {
-				$fname = $m[1];
+		// a space separated list of selectors
+	protected function tag(&$tag, $simple = false)
+	{
+		if ($simple) {
+			$chars = '^@,:;{}\][>\(\) "\'';
+		} else {
+			$chars = '^@,;{}["\'';
+		}
+		$s = $this->seek();
 
-				$sPreArgs = $this->seek();
+		$hasExpression = false;
+		$parts = array();
+		while ($this->tagBracket($parts, $hasExpression));
 
-				$args = array();
-				while (true) {
-					$ss = $this->seek();
-					// this ugly nonsense is for ie filter properties
-					if ($this->keyword($name) && $this->literal('=') && $this->expressionList($value)) {
-						$args[] = array("string", "", array($name, "=", $value));
-					} else {
-						$this->seek($ss);
-						if ($this->expressionList($value)) {
-							$args[] = $value;
-						}
-					}
+		$oldWhite = $this->eatWhiteDefault;
+		$this->eatWhiteDefault = false;
 
-					if (!$this->literal(',')) break;
+		while (true) {
+			if ($this->match('(['.$chars.'0-9]['.$chars.']*)', $m)) {
+				$parts[] = $m[1];
+				if ($simple) break;
+
+				while ($this->tagBracket($parts, $hasExpression));
+				continue;
+			}
+
+			if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "@") {
+				if ($this->interpolation($interp)) {
+					$hasExpression = true;
+					$interp[2] = true; // don't unescape
+					$parts[] = $interp;
+					continue;
 				}
-				$args = array('list', ',', $args);
 
-				if ($this->literal(')')) {
-					$func = array('function', $fname, $args);
-					return true;
-				} elseif ($fname == 'url') {
-					// couldn't parse and in url? treat as string
-					$this->seek($sPreArgs);
-					if ($this->openString(")", $string) && $this->literal(")")) {
-						$func = array('function', $fname, $string);
-						return true;
-					}
+				if ($this->literal("@")) {
+					$parts[] = "@";
+					continue;
 				}
 			}
 
+			if ($this->unit($unit)) { // for keyframes
+				$parts[] = $unit[1];
+				$parts[] = $unit[2];
+				continue;
+			}
+
+			break;
+		}
+
+		$this->eatWhiteDefault = $oldWhite;
+		if (!$parts) {
 			$this->seek($s);
 			return false;
 		}
 
-		// consume a less variable
-		protected function variable(&$name) {
-			$s = $this->seek();
-			if ($this->literal($this->lessc->vPrefix, false) &&
-				($this->variable($sub) || $this->keyword($name))
-				) {
-					if (!empty($sub)) {
-						$name = array('variable', $sub);
-					} else {
-						$name = $this->lessc->vPrefix.$name;
+		if ($hasExpression) {
+			$tag = array("exp", array("string", "", $parts));
+		} else {
+			$tag = trim(implode($parts));
+		}
+
+		$this->whitespace();
+		return true;
+	}
+
+		// a css function
+	protected function func(&$func)
+	{
+		$s = $this->seek();
+
+		if ($this->match('(%|[\w\-_][\w\-_:\.]+|[\w_])', $m) && $this->literal('(')) {
+			$fname = $m[1];
+
+			$sPreArgs = $this->seek();
+
+			$args = array();
+			while (true) {
+				$ss = $this->seek();
+				// this ugly nonsense is for ie filter properties
+				if ($this->keyword($name) && $this->literal('=') && $this->expressionList($value)) {
+					$args[] = array("string", "", array($name, "=", $value));
+				} else {
+					$this->seek($ss);
+					if ($this->expressionList($value)) {
+						$args[] = $value;
 					}
-					return true;
 				}
 
-				$name = null;
-				$this->seek($s);
-				return false;
+				if (!$this->literal(',')) break;
+			}
+			$args = array('list', ',', $args);
+
+			if ($this->literal(')')) {
+				$func = array('function', $fname, $args);
+				return true;
+			} elseif ($fname == 'url') {
+				// couldn't parse and in url? treat as string
+				$this->seek($sPreArgs);
+				if ($this->openString(")", $string) && $this->literal(")")) {
+					$func = array('function', $fname, $string);
+					return true;
+				}
+			}
 		}
 
+		$this->seek($s);
+		return false;
+	}
+
+		// consume a less variable
+	protected function variable(&$name)
+	{
+		$s = $this->seek();
+		if ($this->literal($this->lessc->vPrefix, false) &&
+			($this->variable($sub) || $this->keyword($name))
+			) {
+			if (!empty($sub)) {
+				$name = array('variable', $sub);
+			} else {
+				$name = $this->lessc->vPrefix.$name;
+			}
+				return true;
+		}
+
+			$name = null;
+			$this->seek($s);
+			return false;
+	}
+
 		/**
 		 * Consume an assignment operator
 		 * Can optionally take a name that will be set to the current property name
 		 */
-		protected function assign($name = null) {
-			if ($name) $this->currentProperty = $name;
-			return $this->literal(':') || $this->literal('=');
-		}
+	protected function assign($name = null)
+	{
+		if ($name) $this->currentProperty = $name;
+		return $this->literal(':') || $this->literal('=');
+	}
 
 		// consume a keyword
-		protected function keyword(&$word) {
-			if ($this->match('([\w_\-\*!"][\w\-_"]*)', $m)) {
-				$word = $m[1];
-				return true;
-			}
-			return false;
+	protected function keyword(&$word)
+	{
+		if ($this->match('([\w_\-\*!"][\w\-_"]*)', $m)) {
+			$word = $m[1];
+			return true;
 		}
+		return false;
+	}
 
 		// consume an end of statement delimiter
-		protected function end() {
-			if ($this->literal(';', false)) {
-				return true;
-			} elseif ($this->count == strlen($this->buffer) || $this->buffer[$this->count] == '}') {
-				// if there is end of file or a closing block next then we don't need a ;
-				return true;
-			}
-			return false;
-		}
-
-		protected function guards(&$guards) {
-			$s = $this->seek();
-
-			if (!$this->literal("when")) {
-				$this->seek($s);
-				return false;
-			}
-
-			$guards = array();
-
-			while ($this->guardGroup($g)) {
-				$guards[] = $g;
-				if (!$this->literal(",")) break;
-			}
-
-			if (count($guards) == 0) {
-				$guards = null;
-				$this->seek($s);
-				return false;
-			}
-
+	protected function end()
+	{
+		if ($this->literal(';', false)) {
+			return true;
+		} elseif ($this->count == strlen($this->buffer) || $this->buffer[$this->count] == '}') {
+			// if there is end of file or a closing block next then we don't need a ;
 			return true;
 		}
+		return false;
+	}
 
-		// a bunch of guards that are and'd together
-		// TODO rename to guardGroup
-		protected function guardGroup(&$guardGroup) {
-			$s = $this->seek();
-			$guardGroup = array();
-			while ($this->guard($guard)) {
-				$guardGroup[] = $guard;
-				if (!$this->literal("and")) break;
-			}
-
-			if (count($guardGroup) == 0) {
-				$guardGroup = null;
-				$this->seek($s);
-				return false;
-			}
-
-			return true;
-		}
-
-		protected function guard(&$guard) {
-			$s = $this->seek();
-			$negate = $this->literal("not");
-
-			if ($this->literal("(") && $this->expression($exp) && $this->literal(")")) {
-				$guard = $exp;
-				if ($negate) $guard = array("negate", $guard);
-				return true;
-			}
+	protected function guards(&$guards)
+	{
+		$s = $this->seek();
 
+		if (!$this->literal("when")) {
 			$this->seek($s);
 			return false;
 		}
 
-		/* raw parsing functions */
+		$guards = array();
 
-		protected function literal($what, $eatWhitespace = null) {
-			if ($eatWhitespace === null) $eatWhitespace = $this->eatWhiteDefault;
-
-			// shortcut on single letter
-			if (!isset($what[1]) && isset($this->buffer[$this->count])) {
-				if ($this->buffer[$this->count] == $what) {
-					if (!$eatWhitespace) {
-						$this->count++;
-						return true;
-					}
-					// goes below...
-				} else {
-					return false;
-				}
-			}
-
-			if (!isset(self::$literalCache[$what])) {
-				self::$literalCache[$what] = lessc::preg_quote($what);
-			}
-
-			return $this->match(self::$literalCache[$what], $m, $eatWhitespace);
+		while ($this->guardGroup($g)) {
+			$guards[] = $g;
+			if (!$this->literal(",")) break;
 		}
 
-		protected function genericList(&$out, $parseItem, $delim = "", $flatten = true) {
-			$s = $this->seek();
-			$items = array();
-			while ($this->$parseItem($value)) {
-				$items[] = $value;
-				if ($delim) {
-					if (!$this->literal($delim)) break;
-				}
-			}
+		if (count($guards) == 0) {
+			$guards = null;
+			$this->seek($s);
+			return false;
+		}
 
-			if (count($items) == 0) {
-				$this->seek($s);
-				return false;
-			}
+		return true;
+	}
 
-			if ($flatten && count($items) == 1) {
-				$out = $items[0];
-			} else {
-				$out = array("list", $delim, $items);
-			}
+		// a bunch of guards that are and'd together
+		// TODO rename to guardGroup
+	protected function guardGroup(&$guardGroup)
+	{
+		$s = $this->seek();
+		$guardGroup = array();
+		while ($this->guard($guard)) {
+			$guardGroup[] = $guard;
+			if (!$this->literal("and")) break;
+		}
 
+		if (count($guardGroup) == 0) {
+			$guardGroup = null;
+			$this->seek($s);
+			return false;
+		}
+
+		return true;
+	}
+
+	protected function guard(&$guard)
+	{
+		$s = $this->seek();
+		$negate = $this->literal("not");
+
+		if ($this->literal("(") && $this->expression($exp) && $this->literal(")")) {
+			$guard = $exp;
+			if ($negate) $guard = array("negate", $guard);
 			return true;
 		}
 
+		$this->seek($s);
+		return false;
+	}
+
+		/* raw parsing functions */
+
+	protected function literal($what, $eatWhitespace = null)
+	{
+		if ($eatWhitespace === null) $eatWhitespace = $this->eatWhiteDefault;
+
+		// shortcut on single letter
+		if (!isset($what[1]) && isset($this->buffer[$this->count])) {
+			if ($this->buffer[$this->count] == $what) {
+				if (!$eatWhitespace) {
+					$this->count++;
+					return true;
+				}
+				// goes below...
+			} else {
+				return false;
+			}
+		}
+
+		if (!isset(self::$literalCache[$what])) {
+			self::$literalCache[$what] = lessc::preg_quote($what);
+		}
+
+		return $this->match(self::$literalCache[$what], $m, $eatWhitespace);
+	}
+
+	protected function genericList(&$out, $parseItem, $delim = "", $flatten = true)
+	{
+		$s = $this->seek();
+		$items = array();
+		while ($this->$parseItem($value)) {
+			$items[] = $value;
+			if ($delim) {
+				if (!$this->literal($delim)) break;
+			}
+		}
+
+		if (count($items) == 0) {
+			$this->seek($s);
+			return false;
+		}
+
+		if ($flatten && count($items) == 1) {
+			$out = $items[0];
+		} else {
+			$out = array("list", $delim, $items);
+		}
+
+		return true;
+	}
+
 
 		// advance counter to next occurrence of $what
 		// $until - don't include $what in advance
 		// $allowNewline, if string, will be used as valid char set
-		protected function to($what, &$out, $until = false, $allowNewline = false) {
-			if (is_string($allowNewline)) {
-				$validChars = $allowNewline;
-			} else {
-				$validChars = $allowNewline ? "." : "[^\n]";
-			}
-			if (!$this->match('('.$validChars.'*?)'.lessc::preg_quote($what), $m, !$until)) return false;
-			if ($until) $this->count -= strlen($what); // give back $what
-			$out = $m[1];
-			return true;
+	protected function to($what, &$out, $until = false, $allowNewline = false)
+	{
+		if (is_string($allowNewline)) {
+			$validChars = $allowNewline;
+		} else {
+			$validChars = $allowNewline ? "." : "[^\n]";
 		}
+		if (!$this->match('('.$validChars.'*?)'.lessc::preg_quote($what), $m, !$until)) return false;
+		if ($until) $this->count -= strlen($what); // give back $what
+		$out = $m[1];
+		return true;
+	}
 
 		// try to match something on head of buffer
-		protected function match($regex, &$out, $eatWhitespace = null) {
-			if ($eatWhitespace === null) $eatWhitespace = $this->eatWhiteDefault;
+	protected function match($regex, &$out, $eatWhitespace = null)
+	{
+		if ($eatWhitespace === null) $eatWhitespace = $this->eatWhiteDefault;
 
-			$r = '/'.$regex.($eatWhitespace && !$this->writeComments ? '\s*' : '').'/Ais';
-			if (preg_match($r, $this->buffer, $out, null, $this->count)) {
-				$this->count += strlen($out[0]);
-				if ($eatWhitespace && $this->writeComments) $this->whitespace();
-				return true;
-			}
-			return false;
-		}
-
-		// match some whitespace
-		protected function whitespace() {
-			if ($this->writeComments) {
-				$gotWhite = false;
-				while (preg_match(self::$whitePattern, $this->buffer, $m, null, $this->count)) {
-					if (isset($m[1]) && empty($this->seenComments[$this->count])) {
-						$this->append(array("comment", $m[1]));
-						$this->seenComments[$this->count] = true;
-					}
-					$this->count += strlen($m[0]);
-					$gotWhite = true;
-				}
-				return $gotWhite;
-			} else {
-				$this->match("", $m);
-				return strlen($m[0]) > 0;
-			}
-		}
-
-		// match something without consuming it
-		protected function peek($regex, &$out = null, $from = null) {
-			if (is_null($from)) $from = $this->count;
-			$r = '/'.$regex.'/Ais';
-			$result = preg_match($r, $this->buffer, $out, null, $from);
-
-			return $result;
-		}
-
-		// seek to a spot in the buffer or return where we are on no argument
-		protected function seek($where = null) {
-			if ($where === null) return $this->count;
-			else $this->count = $where;
+		$r = '/'.$regex.($eatWhitespace && !$this->writeComments ? '\s*' : '').'/Ais';
+		if (preg_match($r, $this->buffer, $out, null, $this->count)) {
+			$this->count += strlen($out[0]);
+			if ($eatWhitespace && $this->writeComments) $this->whitespace();
 			return true;
 		}
+		return false;
+	}
+
+		// match some whitespace
+	protected function whitespace()
+	{
+		if ($this->writeComments) {
+			$gotWhite = false;
+			while (preg_match(self::$whitePattern, $this->buffer, $m, null, $this->count)) {
+				if (isset($m[1]) && empty($this->seenComments[$this->count])) {
+					$this->append(array("comment", $m[1]));
+					$this->seenComments[$this->count] = true;
+				}
+				$this->count += strlen($m[0]);
+				$gotWhite = true;
+			}
+			return $gotWhite;
+		} else {
+			$this->match("", $m);
+			return strlen($m[0]) > 0;
+		}
+	}
+
+		// match something without consuming it
+	protected function peek($regex, &$out = null, $from = null)
+	{
+		if (is_null($from)) $from = $this->count;
+		$r = '/'.$regex.'/Ais';
+		$result = preg_match($r, $this->buffer, $out, null, $from);
+
+		return $result;
+	}
+
+		// seek to a spot in the buffer or return where we are on no argument
+	protected function seek($where = null)
+	{
+		if ($where === null) return $this->count;
+		else $this->count = $where;
+		return true;
+	}
 
 		/* misc functions */
 
-		public function throwError($msg = "parse error", $count = null) {
-			$count = is_null($count) ? $this->count : $count;
+	public function throwError($msg = "parse error", $count = null)
+	{
+		$count = is_null($count) ? $this->count : $count;
 
-			$line = $this->line +
-			substr_count(substr($this->buffer, 0, $count), "\n");
+		$line = $this->line +
+		substr_count(substr($this->buffer, 0, $count), "\n");
 
-			if (!empty($this->sourceName)) {
-				$loc = "$this->sourceName on line $line";
-			} else {
-				$loc = "line: $line";
-			}
-
-			// TODO this depends on $this->count
-			if ($this->peek("(.*?)(\n|$)", $m, $count)) {
-				throw new exception("$msg: failed at `$m[1]` $loc");
-			} else {
-				throw new exception("$msg: $loc");
-			}
+		if (!empty($this->sourceName)) {
+			$loc = "$this->sourceName on line $line";
+		} else {
+			$loc = "line: $line";
 		}
 
-		protected function pushBlock($selectors = null, $type = null) {
-			$b = new stdclass;
-			$b->parent = $this->env;
-
-			$b->type = $type;
-			$b->id = self::$nextBlockId++;
-
-			$b->isVararg = false; // TODO: kill me from here
-			$b->tags = $selectors;
-
-			$b->props = array();
-			$b->children = array();
-
-			$this->env = $b;
-			return $b;
+		// TODO this depends on $this->count
+		if ($this->peek("(.*?)(\n|$)", $m, $count)) {
+			throw new exception("$msg: failed at `$m[1]` $loc");
+		} else {
+			throw new exception("$msg: $loc");
 		}
+	}
+
+	protected function pushBlock($selectors = null, $type = null)
+	{
+		$b = new stdclass;
+		$b->parent = $this->env;
+
+		$b->type = $type;
+		$b->id = self::$nextBlockId++;
+
+		$b->isVararg = false; // TODO: kill me from here
+		$b->tags = $selectors;
+
+		$b->props = array();
+		$b->children = array();
+
+		$this->env = $b;
+		return $b;
+	}
 
 		// push a block that doesn't multiply tags
-		protected function pushSpecialBlock($type) {
-			return $this->pushBlock(null, $type);
-		}
+	protected function pushSpecialBlock($type)
+	{
+		return $this->pushBlock(null, $type);
+	}
 
 		// append a property to the current block
-		protected function append($prop, $pos = null) {
-			if ($pos !== null) $prop[-1] = $pos;
-			$this->env->props[] = $prop;
-		}
+	protected function append($prop, $pos = null)
+	{
+		if ($pos !== null) $prop[-1] = $pos;
+		$this->env->props[] = $prop;
+	}
 
 		// pop something off the stack
-		protected function pop() {
-			$old = $this->env;
-			$this->env = $this->env->parent;
-			return $old;
-		}
+	protected function pop()
+	{
+		$old = $this->env;
+		$this->env = $this->env->parent;
+		return $old;
+	}
 
 		// remove comments from $text
 		// todo: make it work for all functions, not just url
-		protected function removeComments($text) {
-			$look = array(
-				'url(', '//', '/*', '"', "'"
-			);
+	protected function removeComments($text)
+	{
+		$look = array(
+			'url(', '//', '/*', '"', "'"
+		);
 
-			$out = '';
-			$min = null;
-			while (true) {
-				// find the next item
-				foreach ($look as $token) {
-					$pos = strpos($text, $token);
-					if ($pos !== false) {
-						if (!isset($min) || $pos < $min[1]) $min = array($token, $pos);
-					}
+		$out = '';
+		$min = null;
+		while (true) {
+			// find the next item
+			foreach ($look as $token) {
+				$pos = strpos($text, $token);
+				if ($pos !== false) {
+					if (!isset($min) || $pos < $min[1]) $min = array($token, $pos);
 				}
-
-				if (is_null($min)) break;
-
-				$count = $min[1];
-				$skip = 0;
-				$newlines = 0;
-				switch ($min[0]) {
-					case 'url(':
-						if (preg_match('/url\(.*?\)/', $text, $m, 0, $count))
-							$count += strlen($m[0]) - strlen($min[0]);
-							break;
-					case '"':
-					case "'":
-						if (preg_match('/'.$min[0].'.*?(?<!\\\\)'.$min[0].'/', $text, $m, 0, $count))
-							$count += strlen($m[0]) - 1;
-							break;
-					case '//':
-						$skip = strpos($text, "\n", $count);
-						if ($skip === false) $skip = strlen($text) - $count;
-						else $skip -= $count;
-						break;
-					case '/*':
-						if (preg_match('/\/\*.*?\*\//s', $text, $m, 0, $count)) {
-							$skip = strlen($m[0]);
-							$newlines = substr_count($m[0], "\n");
-						}
-						break;
-				}
-
-				if ($skip == 0) $count += strlen($min[0]);
-
-				$out .= substr($text, 0, $count).str_repeat("\n", $newlines);
-				$text = substr($text, $count + $skip);
-
-				$min = null;
 			}
 
-			return $out.$text;
+			if (is_null($min)) break;
+
+			$count = $min[1];
+			$skip = 0;
+			$newlines = 0;
+			switch ($min[0]) {
+				case 'url(':
+					if (preg_match('/url\(.*?\)/', $text, $m, 0, $count))
+						$count += strlen($m[0]) - strlen($min[0]);
+						break;
+				case '"':
+				case "'":
+					if (preg_match('/'.$min[0].'.*?(?<!\\\\)'.$min[0].'/', $text, $m, 0, $count))
+						$count += strlen($m[0]) - 1;
+						break;
+				case '//':
+					$skip = strpos($text, "\n", $count);
+					if ($skip === false) $skip = strlen($text) - $count;
+					else $skip -= $count;
+					break;
+				case '/*':
+					if (preg_match('/\/\*.*?\*\//s', $text, $m, 0, $count)) {
+						$skip = strlen($m[0]);
+						$newlines = substr_count($m[0], "\n");
+					}
+					break;
+			}
+
+			if ($skip == 0) $count += strlen($min[0]);
+
+			$out .= substr($text, 0, $count).str_repeat("\n", $newlines);
+			$text = substr($text, $count + $skip);
+
+			$min = null;
 		}
 
+		return $out.$text;
+	}
 }
 
-class lessc_formatter_classic {
+class lessc_formatter_classic
+{
 	public $indentChar = "  ";
 
 	public $break = "\n";
@@ -3795,19 +3965,23 @@ class lessc_formatter_classic {
 
 	public $compressColors = false;
 
-	public function __construct() {
+	public function __construct()
+	{
 		$this->indentLevel = 0;
 	}
 
-	public function indentStr($n = 0) {
+	public function indentStr($n = 0)
+	{
 		return str_repeat($this->indentChar, max($this->indentLevel + $n, 0));
 	}
 
-	public function property($name, $value) {
+	public function property($name, $value)
+	{
 		return $name.$this->assignSeparator.$value.";";
 	}
 
-	protected function isEmpty($block) {
+	protected function isEmpty($block)
+	{
 		if (empty($block->lines)) {
 			foreach ($block->children as $child) {
 				if (!$this->isEmpty($child)) return false;
@@ -3818,7 +3992,8 @@ class lessc_formatter_classic {
 		return false;
 	}
 
-	public function block($block) {
+	public function block($block)
+	{
 		if ($this->isEmpty($block)) return;
 
 		$inner = $pre = $this->indentStr();
@@ -3844,7 +4019,6 @@ class lessc_formatter_classic {
 				echo $this->open.$this->break;
 				$inner = $this->indentStr();
 			}
-
 		}
 
 		if (!empty($block->lines)) {
@@ -3876,7 +4050,8 @@ class lessc_formatter_classic {
 /**
  *	Class for compressed result
  */
-class lessc_formatter_compressed extends lessc_formatter_classic {
+class lessc_formatter_compressed extends lessc_formatter_classic
+{
 	public $disableSingle = true;
 	public $open = "{";
 	public $selectorSeparator = ",";
@@ -3884,7 +4059,8 @@ class lessc_formatter_compressed extends lessc_formatter_classic {
 	public $break = "";
 	public $compressColors = true;
 
-	public function indentStr($n = 0) {
+	public function indentStr($n = 0)
+	{
 		return "";
 	}
 }
@@ -3892,7 +4068,8 @@ class lessc_formatter_compressed extends lessc_formatter_classic {
 /**
  *	Class for lessjs
  */
-class lessc_formatter_lessjs extends lessc_formatter_classic {
+class lessc_formatter_lessjs extends lessc_formatter_classic
+{
 	public $disableSingle = true;
 	public $breakSelectors = true;
 	public $assignSeparator = ": ";
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index 1a844f86f2b..61b3a8a134a 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -124,22 +124,19 @@ class Link extends CommonObject
                 $this->db->commit();
                 return $this->id;
             }
-            else
-            {
+            else {
                 dol_syslog(get_class($this)."::Create echec update ".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -3;
             }
         }
-        else
-        {
+        else {
             if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
             {
                 $this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name);
                 $result = -1;
             }
-            else
-            {
+            else {
                 $this->error = $this->db->lasterror();
                 $result = -2;
             }
@@ -212,16 +209,14 @@ class Link extends CommonObject
                 return -1;
             }
         }
-        else
-        {
+        else {
             if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
             {
                 // Doublon
                 $this->error = $langs->trans("ErrorDuplicateField");
                 $result = -1;
             }
-            else
-            {
+            else {
                 $this->error = $langs->trans("Error sql = ".$sql);
                 $result = -2;
             }
@@ -343,8 +338,7 @@ class Link extends CommonObject
                 $this->objectid = $obj->objectid;
                 return 1;
             }
-            else
-			{
+            else {
                 return 0;
             }
         } else {
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 72ff932bfa6..6a37c5235d4 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -281,21 +281,18 @@ class Menubase
 
 		            return $this->id;
 		        }
-		        else
-		        {
+		        else {
 		            $this->error = "Error ".$this->db->lasterror();
 		            return -1;
 		        }
         	}
-        	else
-        	{
+        	else {
         		dol_syslog(get_class($this)."::create menu entry already exists", LOG_WARNING);
         		$this->error = 'Error Menu entry already exists';
         		return 0;
         	}
         }
-        else
-        {
+        else {
         	return -1;
         }
     }
@@ -432,8 +429,7 @@ class Menubase
 
             return 1;
         }
-        else
-        {
+        else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -575,8 +571,7 @@ class Menubase
         			$this->newmenu->add($val['url'], $val['titre'], 0, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
         			//var_dump($this->newmenu->liste);
         		}
-        		else
-        		{
+        		else {
         			// Search first menu with this couple (mainmenu,leftmenu)=(fk_mainmenu,fk_leftmenu)
         			$searchlastsub = 0; $lastid = 0; $nextid = 0; $found = 0;
         			foreach ($this->newmenu->liste as $keyparent => $valparent)
@@ -702,8 +697,7 @@ class Menubase
                         	$title_enabled = verifCond($alt_title[1]);
                         	$title = ($title_enabled ? $langs->trans($alt_title[0]) : $langs->trans($tab_title[0]));
                         }
-                        else
-                        {
+                        else {
                             $title = $langs->trans($menu['titre']);
                         }
                     }
@@ -745,8 +739,7 @@ class Menubase
 
             return 1;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return -1;
         }
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index a930cc97d2d..126e526abf5 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -195,8 +195,7 @@ class Notify
 						$i++;
 					}
 				}
-				else
-				{
+				else {
 					$error++;
 					$this->error = $this->db->lasterror();
 				}
@@ -240,8 +239,7 @@ class Notify
 						$i++;
 					}
 				}
-				else
-				{
+				else {
 					$error++;
 					$this->error = $this->db->lasterror();
 				}
@@ -259,8 +257,7 @@ class Notify
 					{
 						if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
 					}
-					else
-					{
+					else {
 						if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
 					}
 
@@ -523,8 +520,7 @@ class Notify
 							// We can't add PDF as it is not generated yet.
 							$filepdf = '';
 						}
-						else
-						{
+						else {
 							$filepdf = $pdf_path;
 						}
 
@@ -577,26 +573,22 @@ class Notify
 								dol_print_error($this->db);
 							}
 						}
-						else
-						{
+						else {
 							$error++;
 							$this->errors[] = $mailfile->error;
 						}
 					}
-					else
-				    {
+					else {
 						dol_syslog("No notification sent for ".$sendto." because email is empty");
 					}
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				dol_syslog("No notification to thirdparty sent, nothing into notification setup for the thirdparty socid = ".$object->socid);
 			}
 		}
-		else
-		{
+		else {
 	   		$error++;
 			$this->errors[] = $this->db->lasterror();
 			dol_syslog("Failed to get list of notification to send ".$this->db->lasterror(), LOG_ERR);
@@ -744,8 +736,7 @@ class Notify
 					// We can't add PDF as it is not generated yet.
 					$filepdf = '';
 				}
-				else
-				{
+				else {
 					$filepdf = $pdf_path;
 				}
 
@@ -809,8 +800,7 @@ class Notify
 							dol_print_error($this->db);
 						}
 					}
-					else
-					{
+					else {
 						$error++;
 						$this->errors[] = $mailfile->error;
 					}
diff --git a/htdocs/core/class/openid.class.php b/htdocs/core/class/openid.class.php
index ed684529f33..93167289266 100644
--- a/htdocs/core/class/openid.class.php
+++ b/htdocs/core/class/openid.class.php
@@ -219,8 +219,7 @@ class SimpleOpenID
         {
             return true;
         }
-        else
-        {
+        else {
             return false;
         }
     }
@@ -459,8 +458,7 @@ class SimpleOpenID
             echo $redirect_to;
             echo '\';</script>';
         }
-        else
-        {	// Default Header Redirect
+        else {	// Default Header Redirect
             header('Location: '.$redirect_to);
         }
     }
@@ -503,8 +501,7 @@ class SimpleOpenID
         {
             return true;
         }
-        else
-        {
+        else {
             return false;
         }
     }
@@ -555,8 +552,7 @@ class SimpleOpenID
             $this->ErrorStore('OPENID_NOSERVERSFOUND');
             return false;
         }
-        else
-        {
+        else {
             dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS found endpoint = '.$server);
             $this->SetOpenIDServer($server);
             return $server;
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index dd02bf365c1..b9d733a7f3e 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -219,8 +219,7 @@ class RssParser
 
 				$this->_lastfetchdate = $filedate;
 			}
-			else
-			{
+			else {
 				dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
 			}
 		}
@@ -230,8 +229,7 @@ class RssParser
 		{
 			$str = file_get_contents($newpathofdestfile);
 		}
-		else
-		{
+		else {
 			try {
 				ini_set("user_agent", "Dolibarr ERP-CRM RSS reader");
 				ini_set("max_execution_time", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
@@ -259,8 +257,7 @@ class RssParser
 				libxml_use_internal_errors(false);
 				$rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
 			}
-			else
-			{
+			else {
 				$xmlparser = xml_parser_create('');
 				if (!is_resource($xmlparser)) {
 					$this->error = "ErrorFailedToCreateParser"; return -1;
@@ -294,8 +291,7 @@ class RssParser
 
 					$this->_lastfetchdate = $nowgmt;
 				}
-				else
-				{
+				else {
 					print 'Error, failed to open file '.$newpathofdestfile.' for write';
 				}
 			}
@@ -325,8 +321,7 @@ class RssParser
 					if (!empty($rss->channel->title))         $this->_title = (string) $rss->channel->title;
 					if (!empty($rss->channel->description))	  $this->_description = (string) $rss->channel->description;
 				}
-				else
-				{
+				else {
 					//var_dump($rss->channel);
 					if (!empty($rss->channel['language']))      $this->_language = (string) $rss->channel['language'];
 					if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
@@ -353,8 +348,7 @@ class RssParser
 					if (!empty($rss->title))         $this->_title = (string) $rss->title;
 					if (!empty($rss->description))	 $this->_description = (string) $rss->description;
 				}
-				else
-				{
+				else {
 					//if (!empty($rss->channel['rss_language']))	$this->_language = (string) $rss->channel['rss_language'];
 					if (!empty($rss->channel['generator']))			$this->_generator = (string) $rss->channel['generator'];
 					//if (!empty($rss->channel['rss_copyright']))	$this->_copyright = (string) $rss->channel['rss_copyright'];
@@ -392,8 +386,7 @@ class RssParser
 							$itemId = '';
 							$itemAuthor = '';
 						}
-						else
-						{
+						else {
 							$itemLink = (string) $item['link'];
 							$itemTitle = (string) $item['title'];
 							$itemDescription = (string) $item['description'];
@@ -423,8 +416,7 @@ class RssParser
 							$itemId = (string) $item['id'];
 							$itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
 						}
-						else
-						{
+						else {
 							$itemLink = (isset($item['link']) ? (string) $item['link'] : '');
 							$itemTitle = (string) $item['title'];
 							$itemDescription = $this->getAtomItemDescription($item);
@@ -454,8 +446,7 @@ class RssParser
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = 'ErrorFailedToLoadRSSFile';
 			return -1;
 		}
@@ -574,8 +565,7 @@ class RssParser
 			{
 				$link_el = 'link';
 			}
-			else
-			{
+			else {
 				$link_el = 'link_'.$attrs['rel'];
 			}
 
@@ -603,8 +593,7 @@ class RssParser
 		{
 			$this->append_content($text);
 		}
-		else
-		{
+		else {
 			$current_el = join('_', array_reverse($this->stack));
 			$this->append($current_el, $text);
 		}
@@ -851,8 +840,7 @@ function xml2php($xml)
 			//Add an element in an existing array
 			$array[$key][] = $child;
 		}
-		else
-		{
+		else {
 			//Add a simple element
 			$array[$key] = $child;
 		}
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 51e375c5279..e4a68d2ad5e 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -316,8 +316,7 @@ class SMTPs
 
         if ($_part === true)
         $_retValue = $this->_errorsTo;
-        else
-        $_retValue = $this->_errorsTo[$_part];
+        else $_retValue = $this->_errorsTo[$_part];
 
         return $_retValue;
     }
@@ -374,8 +373,7 @@ class SMTPs
             $this->_setErr(99, $host.' is either offline or is an invalid host name.');
             $_retVal = false;
         }
-        else
-        {
+        else {
             //See if we can connect to the SMTP server
             if ($this->socket = @fsockopen(
                 preg_replace('@tls://@i', '', $this->getHost()), // Host to 'hit', IP or domain
@@ -395,8 +393,7 @@ class SMTPs
                 $_retVal = $this->socket;
             }
             // This connection attempt failed.
-            else
-            {
+            else {
                 // @CHANGE LDR
                 if (empty($this->errstr)) $this->errstr = 'Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
                 $this->_setErr($this->errno, $this->errstr);
@@ -522,8 +519,7 @@ class SMTPs
                 $this->_setErr(130, 'Invalid Authentication Credentials.');
 			}
         }
-        else
-        {
+        else {
             $this->_setErr(126, '"'.$host.'" does not support authenticated connections.');
         }
 
@@ -555,8 +551,7 @@ class SMTPs
             }
 
             // This is a "normal" SMTP Server "handshack"
-            else
-            {
+            else {
                 // Send the RFC821 specified HELO.
                 $host = $this->getHost();
                 $usetls = preg_match('@tls://@i', $host);
@@ -682,8 +677,7 @@ class SMTPs
         }
 
         // Read the Systems php.ini file
-        else
-        {
+        else {
             // Set these properties ONLY if they are set in the php.ini file.
             // Otherwise the default values will be used.
             if ($_host = ini_get('SMTPs'))
@@ -950,8 +944,7 @@ class SMTPs
 
         if ($_part === true)
         $_retValue = $this->_msgFrom;
-        else
-        $_retValue = $this->_msgFrom[$_part];
+        else $_retValue = $this->_msgFrom[$_part];
 
         return $_retValue;
     }
@@ -980,8 +973,7 @@ class SMTPs
 
         if ($_part === true)
             $_retValue = $this->_msgReplyTo;
-        else
-            $_retValue = $this->_msgReplyTo[$_part];
+        else $_retValue = $this->_msgReplyTo[$_part];
 
         return $_retValue;
     }
@@ -1015,8 +1007,7 @@ class SMTPs
                 $_addrList = explode(',', $_addrList);
 
                 // Stick it in an array
-                else
-                $_addrList = array($_addrList);
+                else $_addrList = array($_addrList);
             }
 
             // take the array of addresses and split them further
@@ -1037,8 +1028,7 @@ class SMTPs
                     $aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = $_tmpaddr[0];
                 }
                 // We only have an eMail address
-                else
-                {
+                else {
                     // Strip off the beggining '<'
                     $_strAddr = str_replace('<', '', $_strAddr);
 
@@ -1095,8 +1085,7 @@ class SMTPs
 
             $_aryEmail['addr'] = $_tmpAry[1];
         }
-        else
-        $_aryEmail['addr'] = $_tmpAry[0];
+        else $_aryEmail['addr'] = $_tmpAry[0];
 
         // Pull User Name and Host.tld apart
         list($_aryEmail['user'], $_aryEmail['host']) = explode('@', $_aryEmail['addr']);
@@ -1168,8 +1157,7 @@ class SMTPs
                                 $_realName = '"'.$_realName.'"';
                                 $_RCPT_list[] = $_realName.' <'.$_addr.'@'.$_host.'>';
                             }
-                            else
-                            {
+                            else {
                                 $_RCPT_list[] = $_addr.'@'.$_host;
                             }
                         }
@@ -1178,14 +1166,12 @@ class SMTPs
 
                 return implode(', ', $_RCPT_list);
             }
-            else
-            {
+            else {
                 $this->_setErr(101, 'No eMail Address for message to be sent to.');
                 return false;
             }
         }
-        else
-        {
+        else {
             $this->_setErr(102, 'eMail type not defined.');
             return false;
         }
@@ -1319,8 +1305,7 @@ class SMTPs
             $_header .= 'References: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
             $_header .= 'X-Dolibarr-TRACKID: '.$trackid.'@'.$host."\r\n";
         }
-        else
-        {
+        else {
             $_header .= 'Message-ID: <'.time().'.SMTPs@'.$host.">\r\n";
         }
         if (!empty($_SERVER['REMOTE_ADDR'])) $_header .= "X-RemoteAddr: ".$_SERVER['REMOTE_ADDR']."\r\n";
@@ -1367,8 +1352,7 @@ class SMTPs
         //{
         if ($strType == 'html')
         $strMimeType = 'text/html';
-        else
-        $strMimeType = 'text/plain';
+        else $strMimeType = 'text/plain';
 
         // Make RFC821 Compliant, replace bare linefeeds
         $strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $strContent);
@@ -1511,8 +1495,7 @@ class SMTPs
                     $content .= "\r\n--".$this->_getBoundary('alternative')."--\r\n";
                     $content .= "\r\n";
                 }
-                else
-                {
+                else {
                     if (key_exists('image', $this->_msgContent))
                     {
                         $content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index 9620612cb2e..b884f54e04a 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -74,8 +74,7 @@ abstract class Stats
 
 				$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
 			}
-			else
-			{
+			else {
 				dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
 			}
 		}
@@ -85,8 +84,7 @@ abstract class Stats
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
 		}
-		else
-		{
+		else {
 			$year = $startyear;
 			$sm = $startmonth - 1;
 			if ($sm != 0) $year = $year - 1;
@@ -171,8 +169,7 @@ abstract class Stats
 
         		$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
         	}
-        	else
-        	{
+        	else {
         		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
         	}
         }
@@ -183,8 +180,7 @@ abstract class Stats
         	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
         	$data = json_decode(file_get_contents($newpathofdestfile), true);
         }
-        else
-		{
+        else {
 			$year = $startyear;
 			$sm = $startmonth - 1;
 			if ($sm != 0) $year = $year - 1;
@@ -300,8 +296,7 @@ abstract class Stats
 
         		$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
         	}
-        	else
-        	{
+        	else {
         		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
         	}
         }
@@ -312,8 +307,7 @@ abstract class Stats
         	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
         	$data = json_decode(file_get_contents($newpathofdestfile), true);
         }
-        else
-		{
+        else {
 			$data = $this->getAllByProduct($year, $limit);
 			//					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
 		}
@@ -450,8 +444,7 @@ abstract class Stats
 			}
 			$this->db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 3fc3151030a..582883f3ae9 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -516,8 +516,7 @@ class Translate
     				}
     			}
 		    }
-		    else
-		    {
+		    else {
 		        dol_print_error($db);
 		    }
 		}
@@ -637,7 +636,7 @@ class Translate
 
 			return $str;
 		}
-		else								// Translation is not available
+		else // Translation is not available
 		{
 		    //if ($key[0] == '$') { return dol_eval($key,1); }
 			return $this->getTradFromKey($key);
@@ -708,8 +707,7 @@ class Translate
 
             return $str;
 		}
-		else
-		{
+		else {
 		    if ($key[0] == '$') { return dol_eval($key, 1); }
 			return $this->getTradFromKey($key);
 		}
@@ -826,8 +824,7 @@ class Translate
 				{
 				    $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir), $maxlength);
 				}
-				else
-				{
+				else {
 					$langs_available[$dir] = $this->trans('Language_'.$dir);
 				}
 				if ($mainlangonly) {
@@ -957,8 +954,7 @@ class Translate
 			$db->free($resql);
 			return $this->cache_labels[$tablename][$key];
 		}
-		else
-		{
+		else {
 			$this->error = $db->lasterror();
 			return -1;
 		}
@@ -1057,8 +1053,7 @@ class Translate
 			//var_dump($this->cache_currencies);	$this->cache_currencies is now sorted onto label
 			return $num;
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 			return -1;
 		}
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 6dc243d3723..182cd9aa326 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -145,8 +145,7 @@ class Utils
 							$count++;
 							$countdeleted++;
 						}
-						else
-						{
+						else {
 							$counterror++;
 						}
 					}
@@ -266,10 +265,9 @@ class Utils
 			if (GETPOST("sql_structure", "alpha") || $usedefault)
 			{
 				if (GETPOST("drop", "alpha") || $usedefault)	$param .= " --add-drop-table=TRUE";
-				else 				       	         		    $param .= " --add-drop-table=FALSE";
+				else $param .= " --add-drop-table=FALSE";
 			}
-			else
-			{
+			else {
 				$param .= " -t";
 			}
 			if (GETPOST("disable-add-locks", "alpha")) $param .= " --add-locks=FALSE";
@@ -283,8 +281,7 @@ class Utils
 				if (GETPOST("sql_ignore", "alpha"))	 $param .= " --insert-ignore";
 				if (GETPOST("hexforbinary", "alpha") || $usedefault) $param .= " --hex-blob";
 			}
-			else
-			{
+			else {
 				$param .= " -d"; // No row information (no data)
 			}
 			$param .= " --default-character-set=utf8"; // We always save output into utf8 charset
@@ -326,8 +323,7 @@ class Utils
 						$errormsg = 'Error '.$retval;
 						$ok = 0;
 					}
-					else
-					{
+					else {
 						$i = 0;
 						if (!empty($output_arr))
 						{
@@ -367,8 +363,7 @@ class Utils
 				if (!empty($conf->global->MAIN_UMASK))
 					@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 			}
-			else
-			{
+			else {
 				$langs->load("errors");
 				dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
 				$errormsg = $langs->trans("ErrorFailedToWriteInDir");
@@ -391,8 +386,7 @@ class Utils
 				if ($ok && preg_match('/^-- (MySql|MariaDB)/i', $errormsg)) {	// No error
 					$errormsg = '';
 				}
-				else
-				{
+				else {
 					// Renommer fichier sortie en fichier erreur
 					//print "$outputfile -> $outputerror";
 					@dol_delete_file($outputerror, 1, 0, 0, null, false, 0);
@@ -431,8 +425,7 @@ class Utils
 				dol_compress_file($outputfiletemp, $outputfile, $compression);
 				unlink($outputfiletemp);
 			}
-			else
-			{
+			else {
 				$this->backupTables($outputfile);
 			}
 
@@ -619,8 +612,7 @@ class Utils
 				dol_print_error($e->getMessage());
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$langs->load("errors");
 			dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
@@ -690,8 +682,7 @@ class Utils
 						{
 							fwrite($fhandle, ($i ? "\n<<<\n\n" : "").$filecursor."\n");
 						}
-						else
-						{
+						else {
 							$this->error = 'Failed to concat content of file '.$spec['fullname'];
 							return -1;
 						}
@@ -760,8 +751,7 @@ class Utils
 
 				chdir($currentdir);
 			}
-			else
-			{
+			else {
 				$result = 0;
 			}
 
@@ -769,15 +759,13 @@ class Utils
 			{
 				return 1;
 			}
-			else
-			{
+			else {
 				$error++;
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorFailToGenerateFile", $outputfiledoc);
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorCheckVersionIsDefined");
@@ -935,8 +923,7 @@ class Utils
 				$tables[] = $row[0];
 			}
 		}
-		else
-		{
+		else {
 			$tables = is_array($tables) ? $tables : explode(',', $tables);
 		}
 
@@ -997,8 +984,7 @@ class Utils
 			{
 				fwrite($handle, "\n-- WARNING: Show create table ".$table." return empy string when it should not.\n");
 			}
-			else
-			{
+			else {
 				fwrite($handle, $row2[1].";\n");
 				//fwrite($handle,"/*!40101 SET character_set_client = @saved_cs_client */;\n\n");
 
diff --git a/htdocs/core/commonfieldsinexport.inc.php b/htdocs/core/commonfieldsinexport.inc.php
index 204a30b4829..7ec7021f020 100644
--- a/htdocs/core/commonfieldsinexport.inc.php
+++ b/htdocs/core/commonfieldsinexport.inc.php
@@ -59,8 +59,7 @@ if (class_exists($keyforclass))
 		}
 	}
 }
-else
-{
+else {
 	dol_print_error($this->db, 'Failed to find class '.$keyforclass.', even after the include of '.$keyforclassfile);
 }
 // End add common fields
diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index 3a75b4bdc90..51f71ea2b50 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -60,8 +60,7 @@ if (GETPOST('mode') && GETPOST('mode') == 'test')
 {
 	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php"></script>'."\n";
 }
-else
-{
+else {
 	print '<title>'.$langs->trans("Calendar").'</title>';
 }
 
@@ -110,8 +109,7 @@ if ($qualified)
 	//print $_GET["cm"].",".$_GET["sd"].",".$_GET["m"].",".$_GET["y"];exit;
 	displayBox(GETPOST("sd", 'alpha'), GETPOST("m", 'int'), GETPOST("y", 'int'));
 }
-else
-{
+else {
 	dol_print_error('', 'ErrorBadParameters');
 }
 
@@ -155,8 +153,7 @@ function displayBox($selectedDate, $month, $year)
 		$selDate = xyzToUnixTimestamp($selectedDate);
 		$xyz = dol_print_date($selDate, "%Y%m%d");
 	}
-	else
-	{
+	else {
 		$selDate = 0;
 		$xyz = 0;
 	}
@@ -221,8 +218,7 @@ function displayBox($selectedDate, $month, $year)
 				$cols++;
 			}
 		}
-		else
-		{
+		else {
 			if ($mydate["wday"] == $startday)
 			{
 				echo "<tr class=\"dpWeek\">";
@@ -256,8 +252,7 @@ function displayBox($selectedDate, $month, $year)
 		{
 			$stoploop = 1;
 		}
-		else
-		{
+		else {
 			$mydate = dol_getdate($thedate);
 			if ($firstdate["month"] != $mydate["month"]) $stoploop = 1;
 		}
@@ -278,8 +273,7 @@ function displayBox($selectedDate, $month, $year)
 			print sprintf("%02s", $tempDate["mday"]);
 			print ", ".$selectYear;
 		}
-		else
-		{
+		else {
 			print "Click a Date";
 		}
 		?></td>
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 2818eff65e2..f37d3a4b69d 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -121,8 +121,7 @@ abstract class DoliDB implements Database
 			}
 			return $ret;
 		}
-		else
-		{
+		else {
 			$this->transaction_opened++;
 			dol_syslog('', 0, 1);
 			return 1;
@@ -147,13 +146,11 @@ abstract class DoliDB implements Database
 				dol_syslog("COMMIT Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
 				return 1;
 			}
-			else
-			{
+			else {
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->transaction_opened--;
 			return 1;
 		}
@@ -175,8 +172,7 @@ abstract class DoliDB implements Database
 			dol_syslog("ROLLBACK Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
 			return $ret;
 		}
-		else
-		{
+		else {
 			$this->transaction_opened--;
 			return 1;
 		}
@@ -253,8 +249,7 @@ abstract class DoliDB implements Database
 			}
 			return $return;
 		}
-		else
-		{
+		else {
 			return '';
 		}
 	}
@@ -331,7 +326,7 @@ abstract class DoliDB implements Database
 		if ($res)
 		{
 			$results = array();
-			if($this->num_rows($res) > 0){
+			if ($this->num_rows($res) > 0){
 				while ($obj = $this->fetch_object($res)){
 					$results[] = $obj;
 				}
diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php
index 667f1986815..e5bd6c22e36 100644
--- a/htdocs/core/db/mssql.class.php
+++ b/htdocs/core/db/mssql.class.php
@@ -91,8 +91,7 @@ class DoliDBMssql extends DoliDB
 			$this->connected = true;
 			$this->ok = true;
 		}
-		else
-		{
+		else {
 			// host, login ou password incorrect
 			$this->connected = false;
 			$this->ok = false;
@@ -109,8 +108,7 @@ class DoliDBMssql extends DoliDB
 				$this->database_name = $name;
 				$this->ok = true;
 			}
-			else
-			{
+			else {
 				$this->database_selected = false;
 				$this->database_name = '';
 				$this->ok = false;
@@ -118,8 +116,7 @@ class DoliDBMssql extends DoliDB
 				dol_syslog(get_class($this)."::DoliDBMssql : Erreur Select_db ".$this->error, LOG_ERR);
 			}
 		}
-		else
-		{
+		else {
 			// Pas de selection de base demandee, ok ou ko
 			$this->database_selected = false;
 		}
@@ -250,8 +247,7 @@ class DoliDBMssql extends DoliDB
 			}
 			return $ret;
 		}
-		else
-		{
+		else {
 			return true;
 		}
 	}
@@ -276,8 +272,7 @@ class DoliDBMssql extends DoliDB
 				dol_syslog("COMMIT Transaction", LOG_DEBUG);
 				return true;
 			}
-			else
-			{
+			else {
 				return false;
 			}
 		}
@@ -368,8 +363,7 @@ class DoliDBMssql extends DoliDB
                         $query .= " WHERE ".implode(" AND ", $query_comp);
                 }
     		}
-    		else
-    		{
+    		else {
                 if (preg_match('/ALTER TABLE\h+(\w+?)\h+ADD\h+PRIMARY\h+KEY\h+(\w+?)\h*\((.+)\)/is', $query, $matches))
                 {
                     $original_query = $query;
@@ -432,8 +426,7 @@ class DoliDBMssql extends DoliDB
 			// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
 			$ret = mssql_query($query, $this->db);
 		}
-		else
-		{
+		else {
 			$ret = mssql_query($query, $this->db);
 		}
 
@@ -598,8 +591,7 @@ class DoliDBMssql extends DoliDB
 			// Si il y a eu echec de connexion, $this->db n'est pas valide.
 			return 'DB_ERROR_FAILED_TO_CONNECT';
 		}
-		else
-		{
+		else {
 			// Constants to convert a MSSql error code to a generic Dolibarr error code
 			$errorcode_map = array(
 			1004 => 'DB_ERROR_CANNOT_CREATE',
@@ -671,8 +663,7 @@ class DoliDBMssql extends DoliDB
 		{
 			return $data["id"];
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 	}
@@ -849,8 +840,7 @@ class DoliDBMssql extends DoliDB
 			{
 				if (preg_match("/null/i", $field_desc['default']))
 				$sqlfields[$i]  .= " default ".$field_desc['default'];
-				else
-				$sqlfields[$i]  .= " default '".$field_desc['default']."'";
+				else $sqlfields[$i]  .= " default '".$field_desc['default']."'";
 			}
 			elseif (preg_match("/^[^\s]/i", $field_desc['null']))
 			    $sqlfields[$i] .= " ".$field_desc['null'];
@@ -892,8 +882,7 @@ class DoliDBMssql extends DoliDB
 		dol_syslog($sql);
 		if (!$this -> query($sql))
 		return -1;
-		else
-		return 1;
+		else return 1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -910,8 +899,7 @@ class DoliDBMssql extends DoliDB
 
 		if (!$this->query($sql))
 			return -1;
-		else
-			return 1;
+		else return 1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -958,16 +946,14 @@ class DoliDBMssql extends DoliDB
 		if (preg_match("/^[^\s]/i", $field_desc['default']))
 		if (preg_match("/null/i", $field_desc['default']))
 		$sql  .= " default ".$field_desc['default'];
-		else
-		$sql  .= " default '".$field_desc['default']."'";
+		else $sql  .= " default '".$field_desc['default']."'";
 		if (preg_match("/^[^\s]/i", $field_desc['extra']))
 		$sql  .= " ".$field_desc['extra'];
 		$sql .= " ".$field_position;
 
 		if (!$this -> query($sql))
 		return -1;
-		else
-		return 1;
+		else return 1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -991,8 +977,7 @@ class DoliDBMssql extends DoliDB
 		dol_syslog($sql, LOG_DEBUG);
 		if (!$this->query($sql))
 		return -1;
-		else
-		return 1;
+		else return 1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1038,8 +1023,7 @@ class DoliDBMssql extends DoliDB
             {
 	            return -1;
             }
-            else
-			{
+            else {
             	// If user already exists, we continue to set permissions
             	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
             }
@@ -1051,8 +1035,7 @@ class DoliDBMssql extends DoliDB
             dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
             return -1;
         }
-        else
-        {
+        else {
             if ($num)
             {
                 $this->select_db($dolibarr_main_db_name);
@@ -1207,8 +1190,7 @@ class DoliDBMssql extends DoliDB
 	    {
 	        $where = " IN ('".implode("','", $fields)."')";
 	    }
-	    else
-	    {
+	    else {
 	        $where = "='".$this->escape($fields)."'";
 	    }
 	    $result = array();
@@ -1220,8 +1202,7 @@ class DoliDBMssql extends DoliDB
 	            $result[] = $obj;
 	        }
 	    }
-	    else
-	        return false;
+	    else return false;
 
 	    return $result;
 	}
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 7c0d680662d..5f797b14c07 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -122,8 +122,7 @@ class DoliDBMysqli extends DoliDB
 					if (!preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
 				}
             }
-            else
-            {
+            else {
                 $this->database_selected = false;
                 $this->database_name = '';
                 $this->ok = false;
@@ -131,8 +130,7 @@ class DoliDBMysqli extends DoliDB
                 dol_syslog(get_class($this)."::DoliDBMysqli : Select_db error ".$this->error, LOG_ERR);
             }
         }
-        else
-        {
+        else {
             // Pas de selection de base demandee, ok ou ko
             $this->database_selected = false;
 
@@ -270,8 +268,7 @@ class DoliDBMysqli extends DoliDB
             // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
             $ret = $this->db->query($query);
         }
-        else
-        {
+        else {
             $ret = $this->db->query($query);
         }
 
@@ -342,8 +339,7 @@ class DoliDBMysqli extends DoliDB
             if (!is_object($resultset)) { $resultset = $this->_results; }
             return $resultset->fetch_row();
         }
-        else
-        {
+        else {
             // si le curseur est un booleen on retourne la valeur 0
             return 0;
         }
@@ -747,8 +743,7 @@ class DoliDBMysqli extends DoliDB
 
         if (!$this->query($sql))
         return -1;
-        else
-        return 1;
+        else return 1;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -765,8 +760,7 @@ class DoliDBMysqli extends DoliDB
 
 		if (!$this->query($sql))
  			return -1;
-    	else
-    		return 1;
+    	else return 1;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -823,8 +817,7 @@ class DoliDBMysqli extends DoliDB
         {
             if (preg_match("/null/i", $field_desc['default']))
             $sql .= " default ".$field_desc['default'];
-            else
-            $sql .= " default '".$field_desc['default']."'";
+            else $sql .= " default '".$field_desc['default']."'";
         }
         if (isset($field_desc['extra']) && preg_match("/^[^\s]/i", $field_desc['extra']))
         {
@@ -882,8 +875,7 @@ class DoliDBMysqli extends DoliDB
         dol_syslog(get_class($this)."::DDLUpdateField ".$sql, LOG_DEBUG);
         if (!$this->query($sql))
         return -1;
-        else
-        return 1;
+        else return 1;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -929,8 +921,7 @@ class DoliDBMysqli extends DoliDB
             {
             	return -1;
             }
-            else
-			{
+            else {
             	// If user already exists, we continue to set permissions
             	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
             }
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index bf9b468d4a8..f2378bcb998 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -105,8 +105,7 @@ class DoliDBPgsql extends DoliDB
 			$this->connected = true;
 			$this->ok = true;
 		}
-		else
-		{
+		else {
 			// host, login ou password incorrect
 			$this->connected = false;
 			$this->ok = false;
@@ -123,8 +122,7 @@ class DoliDBPgsql extends DoliDB
 				$this->database_name = $name;
 				$this->ok = true;
 			}
-			else
-			{
+			else {
 				$this->database_selected = false;
 				$this->database_name = '';
 				$this->ok = false;
@@ -132,8 +130,7 @@ class DoliDBPgsql extends DoliDB
 				dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Select_db ".$this->error, LOG_ERR);
 			}
 		}
-		else
-		{
+		else {
 			// Pas de selection de base demandee, ok ou ko
 			$this->database_selected = false;
 		}
@@ -998,8 +995,7 @@ class DoliDBPgsql extends DoliDB
 			{
 				if (preg_match("/null/i", $field_desc['default']))
 				    $sqlfields[$i] .= " default ".$field_desc['default'];
-				else
-				    $sqlfields[$i] .= " default '".$field_desc['default']."'";
+				else $sqlfields[$i] .= " default '".$field_desc['default']."'";
 			}
 			elseif (preg_match("/^[^\s]/i", $field_desc['null']))
 			    $sqlfields[$i]  .= " ".$field_desc['null'];
@@ -1041,8 +1037,7 @@ class DoliDBPgsql extends DoliDB
 		dol_syslog($sql, LOG_DEBUG);
 		if (!$this->query($sql))
 		return -1;
-		else
-		return 1;
+		else return 1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1059,8 +1054,7 @@ class DoliDBPgsql extends DoliDB
 
 		if (!$this->query($sql))
 			return -1;
-		else
-			return 1;
+		else return 1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1313,8 +1307,7 @@ class DoliDBPgsql extends DoliDB
 		{
 		    $fullpathofdump = '/usr/bin/pg_dump';
 		}
-		else
-		{
+		else {
             // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
 		    $resql = $this->query('SHOW data_directory');
     		if ($resql)
@@ -1344,8 +1337,7 @@ class DoliDBPgsql extends DoliDB
         {
             $fullpathofdump = '/usr/bin/'.$tool;
         }
-        else
-        {
+        else {
             // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
             $resql = $this->query('SHOW data_directory');
             if ($resql)
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index 2d24c232797..e5c9ef6b751 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -112,8 +112,7 @@ class DoliDBSqlite3 extends DoliDB
             $this->addCustomFunction('date_format');
             //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         }
-        else
-        {
+        else {
             // host, login ou password incorrect
             $this->connected = false;
             $this->ok = false;
@@ -554,8 +553,7 @@ class DoliDBSqlite3 extends DoliDB
             if (!is_object($resultset)) { $resultset = $this->_results; }
             return $resultset->fetchArray(SQLITE3_NUM);
         }
-        else
-        {
+        else {
             // si le curseur est un booleen on retourne la valeur 0
             return false;
         }
@@ -931,8 +929,7 @@ class DoliDBSqlite3 extends DoliDB
             {
                 if (preg_match("/null/i", $field_desc['default']))
                     $sqlfields[$i] .= " default ".$field_desc['default'];
-                else
-                    $sqlfields[$i] .= " default '".$field_desc['default']."'";
+                else $sqlfields[$i] .= " default '".$field_desc['default']."'";
             }
             elseif (preg_match("/^[^\s]/i", $field_desc['null']))
                 $sqlfields[$i] .= " ".$field_desc['null'];
@@ -991,8 +988,7 @@ class DoliDBSqlite3 extends DoliDB
 
     	if (!$this->query($sql))
     		return -1;
-    	else
-    		return 1;
+    	else return 1;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1043,8 +1039,7 @@ class DoliDBSqlite3 extends DoliDB
         {
             if (preg_match("/null/i", $field_desc['default']))
             $sql .= " default ".$field_desc['default'];
-            else
-            $sql .= " default '".$field_desc['default']."'";
+            else $sql .= " default '".$field_desc['default']."'";
         }
         if (preg_match("/^[^\s]/i", $field_desc['extra']))
         $sql .= " ".$field_desc['extra'];
diff --git a/htdocs/core/extrafieldsinexport.inc.php b/htdocs/core/extrafieldsinexport.inc.php
index 4f85610e657..db926a2b6bc 100644
--- a/htdocs/core/extrafieldsinexport.inc.php
+++ b/htdocs/core/extrafieldsinexport.inc.php
@@ -63,8 +63,7 @@ if ($resql)    // This can fail when class is used on old database (during migra
     			$this->export_entities_array[$r][$fieldname] = $keyforelement;
 		    }
 			// If this is a computed field
-			else
-			{
+			else {
 			    $this->export_fields_array[$r][$fieldname] = $fieldlabel;
 			    $this->export_TypeFields_array[$r][$fieldname] = $typeFilter.'Compute';
 			    $this->export_special_array[$r][$fieldname] = $obj->fieldcomputed;
diff --git a/htdocs/core/filemanagerdol/connectors/php/basexml.php b/htdocs/core/filemanagerdol/connectors/php/basexml.php
index 0f50f33e988..22eae8093d4 100644
--- a/htdocs/core/filemanagerdol/connectors/php/basexml.php
+++ b/htdocs/core/filemanagerdol/connectors/php/basexml.php
@@ -98,8 +98,7 @@ function SendError($number, $text)
 		SendErrorNode($number, $text);
 		CreateXmlFooter();
 	}
-	else
-	{
+	else {
 		SetXmlHeaders();
 
 		dol_syslog('Error: '.$number.' '.$text, LOG_ERR);
@@ -127,6 +126,5 @@ function SendErrorNode($number, $text)
 {
 	if ($text)
 		echo '<Error number="'.$number.'" text="'.htmlspecialchars($text).'" />';
-	else
-		echo '<Error number="'.$number.'" />';
+	else echo '<Error number="'.$number.'" />';
 }
diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php
index dcc1650d4cd..01a4caf9420 100644
--- a/htdocs/core/filemanagerdol/connectors/php/commands.php
+++ b/htdocs/core/filemanagerdol/connectors/php/commands.php
@@ -86,8 +86,7 @@ function GetFoldersAndFiles($resourceType, $currentFolder)
 			{
 				if (is_dir($sServerDir.$sFile))
 					$aFolders[] = '<Folder name="'.ConvertToXmlAttribute($sFile).'" />';
-				else
-				{
+				else {
 					$iFileSize = @filesize($sServerDir.$sFile);
 					if (!$iFileSize) {
 						$iFileSize = 0;
@@ -147,8 +146,7 @@ function CreateFolder($resourceType, $currentFolder)
 
 		if (strpos($sNewFolderName, '..') !== false)
 			$sErrorNumber = '102'; // Invalid folder name.
-		else
-		{
+		else {
 			// Map the virtual path to the local server path of the current folder.
 			$sServerDir = ServerMapFolder($resourceType, $currentFolder, 'CreateFolder');
 
@@ -172,12 +170,10 @@ function CreateFolder($resourceType, $currentFolder)
 						break;
 				}
 			}
-			else
-				$sErrorNumber = '103';
+			else $sErrorNumber = '103';
 		}
 	}
-	else
-		$sErrorNumber = '102';
+	else $sErrorNumber = '102';
 
 	// Create the "Error" node.
 	echo '<Error number="'.$sErrorNumber.'" />';
@@ -255,8 +251,7 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 					$sFileName = RemoveExtension($sOriginalFileName).'('.$iCounter.').'.$sExtension;
 					$sErrorNumber = '201';
 				}
-				else
-				{
+				else {
 					move_uploaded_file($oFile['tmp_name'], $sFilePath);
 
 					if (is_file($sFilePath))
@@ -297,11 +292,9 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 				}
 			}
 		}
-		else
-			$sErrorNumber = '202';
+		else $sErrorNumber = '202';
 	}
-	else
-		$sErrorNumber = '202';
+	else $sErrorNumber = '202';
 
 
 	$sFileUrl = CombinePaths(GetResourceTypePath($resourceType, $sCommand), $currentFolder);
@@ -315,8 +308,7 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
         // this line already exists so wrap the if block around it
         SendUploadResults($sErrorNumber, $sFileUrl, $sFileName);
     }
-    else
-	{
+    else {
 	    //issue the CKEditor Callback
         SendCKEditorResults(
 			$CKEcallback,
diff --git a/htdocs/core/filemanagerdol/connectors/php/io.php b/htdocs/core/filemanagerdol/connectors/php/io.php
index 2a9ac9f146b..2da8b4d5baa 100644
--- a/htdocs/core/filemanagerdol/connectors/php/io.php
+++ b/htdocs/core/filemanagerdol/connectors/php/io.php
@@ -46,8 +46,7 @@ function GetResourceTypePath($resourceType, $sCommand)
 
 	if ($sCommand == "QuickUpload")
 		return $Config['QuickUploadPath'][$resourceType];
-	else
-		return $Config['FileTypesPath'][$resourceType];
+	else return $Config['FileTypesPath'][$resourceType];
 }
 
 /**
@@ -68,8 +67,7 @@ function GetResourceTypeDirectory($resourceType, $sCommand)
 		// Map the "UserFiles" path to a local directory.
 		return Server_MapPath($Config['QuickUploadPath'][$resourceType]);
 	}
-	else
-	{
+	else {
 		if (strlen($Config['FileTypesAbsolutePath'][$resourceType]) > 0)
 			return $Config['FileTypesAbsolutePath'][$resourceType];
 
@@ -179,8 +177,7 @@ function CreateServerFolder($folderPath, $lastFolder = null)
 		{
 			mkdir($folderPath);
 		}
-		else
-		{
+		else {
 			$permissions = '0777';
 			if (isset($Config['ChmodOnFolderCreate']) && $Config['ChmodOnFolderCreate'])
 			{
@@ -203,8 +200,7 @@ function CreateServerFolder($folderPath, $lastFolder = null)
 
 		return $sErrorMsg;
 	}
-	else
-		return '';
+	else return '';
 }
 
 /**
diff --git a/htdocs/core/filemanagerdol/connectors/php/util.php b/htdocs/core/filemanagerdol/connectors/php/util.php
index 1349ed00dad..5af89333a48 100644
--- a/htdocs/core/filemanagerdol/connectors/php/util.php
+++ b/htdocs/core/filemanagerdol/connectors/php/util.php
@@ -82,8 +82,7 @@ function ConvertToXmlAttribute($value)
 	{
 		$os = PHP_OS;
 	}
-	else
-	{
+	else {
 		$os = php_uname();
 	}
 
@@ -91,8 +90,7 @@ function ConvertToXmlAttribute($value)
 	{
 		return (utf8_encode(htmlspecialchars($value)));
 	}
-	else
-	{
+	else {
 		return (htmlspecialchars($value));
 	}
 }
diff --git a/htdocs/core/get_info.php b/htdocs/core/get_info.php
index 1564fc3f9bc..969de383da0 100644
--- a/htdocs/core/get_info.php
+++ b/htdocs/core/get_info.php
@@ -90,8 +90,7 @@ if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 		$logouttext .= '<span class="fa fa-sign-out atoplogin"></span>';
 		$logouttext .= '</a>';
 	}
-	else
-	{
+	else {
 		$logouthtmltext .= $langs->trans("NoLogoutProcessWithAuthMode", $_SESSION["dol_authmode"]);
 		$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
 	}
@@ -118,7 +117,7 @@ $result = $hookmanager->executeHooks('printTopRightMenu', $parameters); // Note
 if (is_numeric($result))
 {
 	if (empty($result)) $toprightmenu .= $hookmanager->resPrint; // add
-	else  $toprightmenu = $hookmanager->resPrint; // replace
+	else $toprightmenu = $hookmanager->resPrint; // replace
 }
 else $toprightmenu .= $result; // For backward compatibility
 
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index 92b8dc34a0e..6a034377ce7 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -178,7 +178,7 @@ if (empty($user->socid))	// If internal user or not defined
 {
 	$conf->standard_menu = (empty($conf->global->MAIN_MENU_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENU_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENU_STANDARD) : $conf->global->MAIN_MENU_STANDARD_FORCED);
 }
-else                        	// If external user
+else // If external user
 {
 	$conf->standard_menu = (empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENUFRONT_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENUFRONT_STANDARD) : $conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
 }
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index b78c0478370..d86f823f4c9 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -186,7 +186,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 			                	$qualified = 0;
 			                }
             			}
-            			else						// This is a test on a constant. For example when we have -- VMYSQLUTF8UNICODE, we test constant $conf->global->UTF8UNICODE
+            			else // This is a test on a constant. For example when we have -- VMYSQLUTF8UNICODE, we test constant $conf->global->UTF8UNICODE
             			{
             				$dbcollation = strtoupper(preg_replace('/_/', '', $conf->db->dolibarr_main_db_collation));
             				//var_dump($reg[2]);
@@ -226,8 +226,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
         if ($buffer) $arraysql[$i] = $buffer;
         fclose($fp);
     }
-    else
-    {
+    else {
         dol_syslog("Admin.lib::run_sql failed to open file ".$sqlfile, LOG_ERR);
     }
 
@@ -252,8 +251,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
                     $listofmaxrowid[$table] = $obj->max;
                     if (empty($listofmaxrowid[$table])) $listofmaxrowid[$table] = 0;
                 }
-                else
-                {
+                else {
                     if (!$silent) print '<tr><td class="tdtop" colspan="2">';
                     if (!$silent) print '<div class="error">'.$langs->trans("Failed to get max rowid for ".$table)."</div></td>";
                     if (!$silent) print '</tr>';
@@ -370,8 +368,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
                 }
                 // 	          print '<td class="right">OK</td>';
             }
-            else
-            {
+            else {
                 $errno = $db->errno();
                 if (!$silent) print '<!-- Result = '.$errno.' -->'."\n";
 
@@ -414,8 +411,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
         if (!$silent) print '<td class="right">'.$langs->trans("OK").'</td></tr>'."\n";
         $ok = 1;
     }
-    else
-    {
+    else {
         if (!$silent) print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
         if (!$silent) print '<td class="right"><font class="error">'.$langs->trans("KO").'</font></td></tr>'."\n";
         $ok = 0;
@@ -458,8 +454,7 @@ function dolibarr_del_const($db, $name, $entity = 1)
         $conf->global->$name = '';
         return 1;
     }
-    else
-    {
+    else {
         dol_print_error($db);
         return -1;
     }
@@ -555,8 +550,7 @@ function dolibarr_set_const($db, $name, $value, $type = 'chaine', $visible = 0,
         $conf->global->$name = $value;
         return 1;
     }
-    else
-    {
+    else {
         $error = $db->lasterror();
         $db->rollback();
         return -1;
@@ -971,8 +965,7 @@ function activateModule($value, $withdeps = 1)
     {
         $ret['errors'][] = $objMod->error;
     }
-    else
-    {
+    else {
         if ($withdeps)
         {
             if (isset($objMod->depends) && is_array($objMod->depends) && !empty($objMod->depends))
@@ -1009,8 +1002,7 @@ function activateModule($value, $withdeps = 1)
     				    $ret['nbmodules'] += $resarray['nbmodules'];
     				    $ret['nbperms'] += $resarray['nbperms'];
     				}
-    				else
-    				{
+    				else {
     				    $ret['errors'][] = $langs->trans('activateModuleDependNotSatisfied', $objMod->name, $modulestring);
     				}
                 }
@@ -1082,7 +1074,7 @@ function unActivateModule($value, $requiredby = 1)
         $result = $objMod->remove();
         if ($result <= 0) $ret = $objMod->error;
     }
-    else    // We come here when we try to unactivate a module when module does not exists anymore in sources
+    else // We come here when we try to unactivate a module when module does not exists anymore in sources
     {
         //print $dir.$modFile;exit;
     	// TODO Replace this after DolibarrModules is moved as abstract class with a try catch to show module we try to disable has not been found or could not be loaded
@@ -1163,8 +1155,7 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
                         {
                             $j = $objMod->numero;
                         }
-                        else
-                        {
+                        else {
                             $j = 1000 + $i;
                         }
 
@@ -1210,8 +1201,7 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
                                     print 'Error in descriptor of module '.$const_name.'. Array ->dictionaries has not same number of record for key "tabname", "tablib", "tabsql" and "tabsqlsort"';
                                     //print "$const_name: $nbtabname=$nbtablib=$nbtabsql=$nbtabsqlsort=$nbtabfield=$nbtabfieldvalue=$nbtabfieldinsert=$nbtabrowid=$nbtabcond=$nbtabfieldcheck=$nbtabhelp\n";
                                 }
-                                else
-                                {
+                                else {
                                 	$taborder[] = 0; // Add an empty line
                                 }
                             }
@@ -1225,8 +1215,7 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
             }
             closedir($handle);
         }
-        else
-        {
+        else {
             dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
         }
     }
@@ -1291,8 +1280,7 @@ function activateModulesRequiredByCountry($country_code)
 			}
 			closedir($handle);
 		}
-		else
-		{
+		else {
 			dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
 		}
 	}
@@ -1348,8 +1336,7 @@ function complete_elementList_with_modules(&$elementList)
                         {
                             $j = $objMod->numero;
                         }
-                        else
-                        {
+                        else {
                             $j = 1000 + $i;
                         }
 
@@ -1393,8 +1380,7 @@ function complete_elementList_with_modules(&$elementList)
             }
             closedir($handle);
         }
-        else
-        {
+        else {
             dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
         }
     }
@@ -1448,16 +1434,14 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
     	if (is_numeric($key)) {		// Very old behaviour
     		$type = 'string';
     	}
-    	else
-    	{
+    	else {
     		if (is_array($const))
     		{
     			$type = $const['type'];
 				$label = $const['label'];
     			$const = $key;
     		}
-    		else
-    		{
+    		else {
     			$type = $const;
     			$const = $key;
     		}
@@ -1549,8 +1533,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
                 print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
                 print '</td>';
             }
-            else
-            {
+            else {
                 print '<td>';
                 print '<input type="hidden" name="consttype'.(empty($strictw3c) ? '' : '[]').'" value="'.($obj->type ? $obj->type : 'string').'">';
                 print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
@@ -1595,7 +1578,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
                 	//var_dump($arrayofmessagename);
                 	print $form->selectarray('constvalue_'.$obj->name, $arrayofmessagename, $obj->value.':'.$tmp[1], 'None', 0, 0, '', 0, 0, 0, '', '', 1);
                 }
-                else	// type = 'string' ou 'chaine'
+                else // type = 'string' ou 'chaine'
                 {
                     print '<input type="text" class="flat" size="48" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" value="'.dol_escape_htmltag($obj->value).'">';
                 }
@@ -1685,8 +1668,7 @@ function addDocumentModel($name, $type, $label = '', $description = '')
 		$db->commit();
 		return 1;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 		$db->rollback();
 		return -1;
@@ -1718,8 +1700,7 @@ function delDocumentModel($name, $type)
 		$db->commit();
 		return 1;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 		$db->rollback();
 		return -1;
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 5d450aa4b04..6070264d487 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -305,8 +305,7 @@ function show_array_actions_to_do($max = 5)
 
 	    $db->free($resql);
 	}
-	else
-	{
+	else {
 	    dol_print_error($db);
 	}
 }
@@ -394,8 +393,7 @@ function show_array_last_actions_done($max = 5)
 
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 1d3e80b90be..e917f99defb 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -495,8 +495,7 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 		if (empty($conf->global->$code)) print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		else print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
-	else
-	{
+	else {
 		$out = "\n<!-- Ajax code to switch constant ".$code." -->".'
 		<script>
 			$(document).ready(function() {
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index d0f102a4e78..387d705780a 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -334,8 +334,7 @@ function checkBanForAccount($account)
             return false; // Sould be 6 but can be 123-456
         elseif (strlen($account->code_banque) < 6)
             return false; // Sould be 6
-        else
-            return true;
+        else return true;
     }
 
     // No particular rule
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index a4d7a077aab..b781051a442 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -134,8 +134,7 @@ function barcode_encode($code, $encoding)
         dol_syslog("barcode.lib.php::barcode_encode Use genbarcode ".$genbarcode_loc." code=".$code." encoding=".$encoding);
         $bars = barcode_encode_genbarcode($code, $encoding);
     }
-    else
-    {
+    else {
         print "barcode_encode needs an external programm for encodings other then EAN/ISBN (code=".$code.", encoding=".$encoding.")<BR>\n";
         print "<UL>\n";
         print "<LI>download gnu-barcode from <A href=\"https://www.gnu.org/software/barcode/\">www.gnu.org/software/barcode/</A>\n";
@@ -264,8 +263,7 @@ function barcode_encode_genbarcode($code, $encoding)
         $encoding = fgets($fp, 1024);
         pclose($fp);
     }
-    else
-    {
+    else {
         dol_syslog("barcode.lib.php::barcode_encode_genbarcode failed to run popen ".$fullcommandclear, LOG_ERR);
         return false;
     }
@@ -406,8 +404,7 @@ function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0,
     {
         imagepng($im, $filebarcode);
     }
-    else
-    {
+    else {
         header("Content-Type: image/png; name=\"barcode.png\"");
         imagepng($im);
     }
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 4b0a2d5b131..50b6d6683be 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -74,8 +74,7 @@ function societe_prepare_head(Societe $object)
 		    $h++;
 		}
     }
-    else
-	{
+    else {
 		$head[$h][0] = DOL_URL_ROOT.'/societe/societecontact.php?socid='.$object->id;
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][1] = $langs->trans("ContactsAddresses");
@@ -475,8 +474,7 @@ function getCountry($searchkey, $withcode = '', $dbtouse = 0, $outputlangs = '',
             elseif ($withcode === 'all') $result = array('id'=>$obj->rowid, 'code'=>$obj->code, 'label'=>$label);
             else $result = $label;
         }
-        else
-        {
+        else {
             $result = 'NotDefined';
         }
         $dbtouse->free($resql);
@@ -561,8 +559,7 @@ function getState($id, $withcode = '', $dbtouse = 0, $withregion = 0, $outputlan
                 }
             }
         }
-        else
-        {
+        else {
             return $langs->transnoentitiesnoconv("NotDefined");
         }
     }
@@ -607,8 +604,7 @@ function currency_name($code_iso, $withcode = '', $outputlangs = null)
             if ($withcode) return ($label == $code_iso) ? "$code_iso" : "$code_iso - $label";
             else return $label;
         }
-        else
-        {
+        else {
             return $code_iso;
         }
     }
@@ -642,8 +638,7 @@ function getFormeJuridiqueLabel($code)
             $label = ($obj->libelle != '-' ? $obj->libelle : '');
             return $label;
         }
-        else
-        {
+        else {
             return $langs->trans("NotDefined");
         }
     }
@@ -832,14 +827,12 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
                     $i++;
                 }
             }
-            else
-			{
+            else {
             	print '<tr class="oddeven"><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
             }
             $db->free($result);
         }
-        else
-        {
+        else {
             dol_print_error($db);
         }
         print "</table>";
@@ -1239,8 +1232,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
             $i++;
         }
     }
-    else
-	{
+    else {
 		$colspan = 1;
 		foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
 		print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -1327,8 +1319,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
         if (is_object($objcon) && $objcon->id > 0) {
             $sql = "SELECT DISTINCT a.id, a.label as label,";
         }
-        else
-        {
+        else {
             $sql = "SELECT a.id, a.label as label,";
         }
         $sql .= " a.datep as dp,";
@@ -1425,14 +1416,12 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
             {
                 if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
                 elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
-                else
-                {
+                else {
                     if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'";
                     elseif ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'";
                 }
             }
-            else
-            {
+            else {
                 if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
                 elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
                 else $sql .= " AND c.code = '".$db->escape($actioncode)."'";
@@ -1550,8 +1539,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 	            $i++;
 	        }
 	    }
-	    else
-	    {
+	    else {
 	        dol_print_error($db);
 	    }
     }
@@ -1577,8 +1565,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
         {
             $out .= '<input type="hidden" name="id" value="'.$objcon->id.'" />';
         }
-        else
-        {
+        else {
             $out .= '<input type="hidden" name="id" value="'.$filterobj->id.'" />';
         }
         if ($filterobj && get_class($filterobj) == 'Societe') $out .= '<input type="hidden" name="socid" value="'.$filterobj->id.'" />';
diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php
index 33ad0a85229..685403b7651 100644
--- a/htdocs/core/lib/cron.lib.php
+++ b/htdocs/core/lib/cron.lib.php
@@ -124,8 +124,7 @@ function dol_print_cron_urls()
     		print '<br>';
     		print '<textarea class="quatrevingtpercent">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
     	}
-    	else
-    	{
+    	else {
     		print $langs->trans("CronExplainHowToRunWin");
     	}
 	}
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index b44d7260e97..343aa02e10d 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -95,8 +95,7 @@ function getServerTimeZoneInt($refgmtdate = 'now')
         $tmp = -1 * $localtz->getOffset($localdt);
         //print $refgmtdate.'='.$tmp;
     }
-    else
-    {
+    else {
     	$tmp = 0;
     	dol_print_error('', 'PHP version must be 5.3+');
     }
@@ -300,8 +299,7 @@ function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date, $exclu
 		} elseif ($year_date > 0 && !empty($day_date)) {
 			$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date, $day_date, $year_date));
 			$sqldate .= "' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date, $day_date, $year_date))."'";
-		} else
-			$sqldate .= ($excludefirstand ? "" : " AND ")." date_format( ".$datefield.", '%c') = '".$db->escape($month_date)."'";
+		} else $sqldate .= ($excludefirstand ? "" : " AND ")." date_format( ".$datefield.", '%c') = '".$db->escape($month_date)."'";
 	} elseif ($year_date > 0) {
 		$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, 1, false));
 		$sqldate .= "' AND '".$db->idate(dol_get_last_day($year_date, 12, false))."'";
@@ -412,8 +410,7 @@ function dol_get_prev_month($month, $year)
 		$prev_month = 12;
 		$prev_year  = $year - 1;
 	}
-	else
-	{
+	else {
 		$prev_month = $month - 1;
 		$prev_year  = $year;
 	}
@@ -433,8 +430,7 @@ function dol_get_next_month($month, $year)
 		$next_month = 1;
 		$next_year  = $year + 1;
 	}
-	else
-	{
+	else {
 		$next_month = $month + 1;
 		$next_year  = $year;
 	}
@@ -509,8 +505,7 @@ function dol_get_last_day($year, $month = 12, $gm = false)
 		$month = 1;
 		$year += 1;
 	}
-	else
-	{
+	else {
 		$month += 1;
 	}
 
@@ -564,8 +559,7 @@ function dol_get_first_day_week($day, $month, $year, $gm = false)
     		$prev_year  = $year - 1;
     	}
     }
-    else
-    {
+    else {
     	$prev_month = $month;
 		$prev_year = $year;
     }
@@ -648,8 +642,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 				{
 					if ($tmp[0] == $annee && $tmp[1] == $mois && $tmp[2] == $jour) $ferie = true;
 				}
-				else
-				{
+				else {
 					if ($tmp[0] == $mois && $tmp[1] == $jour) $ferie = true;
 				}
 			}
@@ -675,8 +668,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 				{
 					$specialdayrule[$obj->dayrule] = $obj->dayrule;
 				}
-				else
-				{
+				else {
 					$match = 1;
 					if (!empty($obj->year) && $obj->year != $annee) $match = 0;
 					if ($obj->month != $mois) $match = 0;
@@ -688,8 +680,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog($db->lasterror(), LOG_ERR);
 			return 'Error sql '.$db->lasterror();
 		}
@@ -858,8 +849,7 @@ function num_between_day($timestampStart, $timestampEnd, $lastday = 0)
 		{
 			$bit = 0;
 		}
-		else
-		{
+		else {
 			$bit = 1;
 		}
 		$nbjours = (int) floor(($timestampEnd - $timestampStart) / (60 * 60 * 24)) + 1 - $bit;
@@ -915,8 +905,7 @@ function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0,
 		if ($inhour == 1) $nbOpenDay = ($nbOpenDay * 24);
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
 	}
-	else
-	{
+	else {
 		return $langs->trans("Error");
 	}
 }
diff --git a/htdocs/core/lib/doc.lib.php b/htdocs/core/lib/doc.lib.php
index 38e847bb3c1..6761c3668c3 100644
--- a/htdocs/core/lib/doc.lib.php
+++ b/htdocs/core/lib/doc.lib.php
@@ -97,14 +97,12 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
 			$discount->fetch($line->fk_remise_except);
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid", $discount->ref_invoice_supplier_source);
 		}
-		else
-		{
+		else {
 			if ($idprod)
 			{
 				if (empty($hidedesc)) $libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
 			}
-			else
-			{
+			else {
 				$libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
 			}
 		}
@@ -124,8 +122,7 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
 				{
 					$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
 				}
-				else
-				{
+				else {
 					$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." ";
 				}
 			}
diff --git a/htdocs/core/lib/doleditor.lib.php b/htdocs/core/lib/doleditor.lib.php
index df9e3d94619..28042a48bf2 100644
--- a/htdocs/core/lib/doleditor.lib.php
+++ b/htdocs/core/lib/doleditor.lib.php
@@ -112,8 +112,7 @@ function show_skin($fuser, $edit = 0)
     					{
     						print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" checked name="fckeditor_skin" value="'.$subdir.'"> <b>'.$subdir.'</b>';
     					}
-    					else
-    					{
+    					else {
     						print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" name="fckeditor_skin" value="'.$subdir.'"> '.$subdir;
     					}
 						print '</div>';
diff --git a/htdocs/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php
index 3d14f14a7df..b724af345bb 100644
--- a/htdocs/core/lib/ecm.lib.php
+++ b/htdocs/core/lib/ecm.lib.php
@@ -85,8 +85,7 @@ function ecm_prepare_head($object, $module = 'ecm', $section = '')
 		$head[$h][2] = 'card';
 		$h++;
 	}
-	else
-	{
+	else {
 		$head[$h][0] = DOL_URL_ROOT.'/ecm/dir_card.php?section='.$section.'&module='.$module;
 		$head[$h][1] = $langs->trans("Directory");
 		$head[$h][2] = 'card';
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index dbea182fb9b..9771eef442b 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -280,8 +280,7 @@ function dol_dir_list_in_database($path, $filter = "", $excludefilter = null, $s
 
 		return $file_list;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 		return array();
 	}
@@ -373,13 +372,11 @@ function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
 				{
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 				}
-				else
-				{
+				else {
 					$filearray[$key]['rowid'] = $result;
 				}
 			}
-			else
-			{
+			else {
 				$filearray[$key]['rowid'] = 0; // Should not happened
 			}
 		}
@@ -513,8 +510,7 @@ function dol_dir_is_emtpy($folder)
 		if ($folder_content == "...") return true;
 		else return false;
 	}
-	else
-		return true; // Dir does not exists
+	else return true; // Dir does not exists
 }
 
 /**
@@ -541,8 +537,7 @@ function dol_count_nb_of_line($file)
 		}
 		fclose($fp);
 	}
-	else
-	{
+	else {
 		$nb = -1;
 	}
 
@@ -626,8 +621,7 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile = '', $newmask
 	{
 		$content = make_substitutions($content, $arrayreplacement, null);
 	}
-	else
-	{
+	else {
 		foreach ($arrayreplacement as $key => $value)
 		{
 			$content = preg_replace($key, $value, $content);
@@ -774,8 +768,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 						$tmpresult = dolCopyDir($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists, $arrayreplacement, $excludesubdir);
 					}
 				}
-				else
-				{
+				else {
 					$newfile = $file;
 					// Replace destination filename with a new one
 					if (is_array($arrayreplacement))
@@ -792,8 +785,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 				{
 					// Do nothing, so we don't set result to 0 if tmpresult is 0 and result was success in a previous pass
 				}
-				else
-				{
+				else {
 					$result = $tmpresult;
 				}
 				if ($result < 0) break;
@@ -801,8 +793,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 		}
 		closedir($dir_handle);
 	}
-	else
-	{
+	else {
 		// Source directory does not exists
 		$result = -2;
 	}
@@ -1123,8 +1114,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);
 			return 1; // Success
 		}
-		else
-		{
+		else {
 			dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR);
 			return -3; // Unknown error
 		}
@@ -1183,8 +1173,7 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 		if ($reshook < 0) return false;
 		return true;
 	}
-	else
-	{
+	else {
 		$error = 0;
 
 		//print "x".$file." ".$disableglob;exit;
@@ -1228,8 +1217,7 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 							}
 						}
 					}
-					else
-					{
+					else {
 						dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
 						// TODO Failure to remove can be because file was already removed or because of permission
 						// If error because it does not exists, we should return true, and we should return false if this is a permission problem
@@ -1238,8 +1226,7 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 			}
 			else dol_syslog("No files to delete found", LOG_DEBUG);
 		}
-		else
-		{
+		else {
 			$ok = false;
 			if ($nophperrors) $ok = @unlink($file_osencoded);
 			else $ok = unlink($file_osencoded);
@@ -1302,8 +1289,7 @@ function dol_delete_dir_recursive($dir, $count = 0, $nophperrors = 0, $onlysub =
 					{
 						$count = dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
 					}
-					else
-					{
+					else {
 						$result = dol_delete_file("$dir/$item", 1, $nophperrors);
 						$count++;
 						if ($result) $countdeleted++;
@@ -1384,8 +1370,7 @@ function dol_delete_preview($object)
 			return 0;
 		}
 	}
-	else
-	{
+	else {
 		$multiple = $filepreviewold.".";
 		for ($i = 0; $i < 20; $i++)
 		{
@@ -1474,8 +1459,7 @@ function dol_meta_create($object)
 
 			return 1;
 	}
-	else
-	{
+	else {
 		dol_syslog('FailedToDetectDirInDolMetaCreateFor'.$object->element, LOG_WARNING);
 	}
 
@@ -1627,8 +1611,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 
 					$nbok++;
 				}
-				else
-				{
+				else {
 					$langs->load("errors");
 					if ($resupload < 0)	// Unknown error
 					{
@@ -1638,7 +1621,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 					{
 						setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 					}
-					else	// Known error
+					else // Known error
 					{
 						setEventMessages($langs->trans($resupload), null, 'errors');
 					}
@@ -1666,8 +1649,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 			setEventMessages($langs->trans("ErrorFileNotLinked"), null, 'errors');
 		}
 	}
-	else
-	{
+	else {
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("File")), null, 'errors');
 	}
@@ -1876,25 +1858,21 @@ function dol_convert_file($fileinput, $ext = 'png', $fileoutput = '', $page = ''
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
 				}
-				else
-				{
+				else {
 					dol_syslog("Warning: Failed to write cache preview file '.$fileoutput.'. Check permission on file/dir", LOG_ERR);
 				}
 				if ($ret) return $count;
 				else return -3;
 			}
-			else
-			{
+			else {
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 	}
-	else
-	{
+	else {
 		return 0;
 	}
 }
@@ -1916,8 +1894,7 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 
 	$foundhandler = 0;
 
-	try
-	{
+	try {
 		dol_syslog("dol_compress_file mode=".$mode." inputfile=".$inputfile." outputfile=".$outputfile);
 
 		$data = implode("", file(dol_osencode($inputfile)));
@@ -1996,8 +1973,7 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 					dol_syslog("dol_compress_file failure - ".$errormsg, LOG_ERR);
 					return -3;
 				}
-				else
-				{
+				else {
 					dol_syslog("dol_compress_file success - ".count($result)." files");
 					return 1;
 				}
@@ -2011,8 +1987,7 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 			fclose($fp);
 			return 1;
 		}
-		else
-		{
+		else {
 			$errorstring = "Try to zip with format ".$mode." with no handler for this format";
 			dol_syslog($errorstring, LOG_ERR);
 
@@ -2052,8 +2027,7 @@ function dol_uncompress($inputfile, $outputdir)
 		$result = $archive->extract(PCLZIP_OPT_PATH, $outputdir);
 		//var_dump($result);
 		if (!is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
-		else
-		{
+		else {
 			$ok = 1; $errmsg = '';
 			// Loop on each file to check result for unzipping file
 			foreach ($result as $key => $val)
@@ -2083,8 +2057,7 @@ function dol_uncompress($inputfile, $outputdir)
 			$zip->close();
 			return array();
 		}
-		else
-		{
+		else {
 			return array('error'=>'ErrUnzipFails');
 		}
 	}
@@ -2117,8 +2090,7 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 		return -3;
 	}
 
-	try
-	{
+	try {
 		if ($mode == 'gz') { $foundhandler = 0; }
 		elseif ($mode == 'bz') { $foundhandler = 0; }
 		elseif ($mode == 'zip')
@@ -2186,8 +2158,7 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 			dol_syslog("Try to zip with format ".$mode." with no handler for this format", LOG_ERR);
 			return -2;
 		}
-		else
-		{
+		else {
 			return 0;
 		}
 	}
@@ -2925,8 +2896,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	// If modulepart=module_temp		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp
 	// If modulepart=module_user		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/iduser
 	// If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
-	else
-	{
+	else {
 		if (preg_match('/^specimen/i', $original_file))	$accessallowed = 1; // If link to a file called specimen. Test must be done before changing $original_file int full path.
 		if ($fuser->admin) $accessallowed = 1; // If user is admin
 
@@ -2975,8 +2945,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			}
 			$original_file = $conf->{$reg[1]}->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 		}
-		else
-		{
+		else {
 			if (empty($conf->$modulepart->dir_output))	// modulepart not supported
 			{
 				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.'). The module for this modulepart value may not be activated.');
@@ -3106,16 +3075,14 @@ function getFilesUpdated(&$file_list, SimpleXMLElement $dir, $path = '', $pathre
 		{
 			$file_list['missing'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'expectedsize'=>$expectedsize);
 		}
-		else
-		{
+		else {
 			$md5_local = md5_file($pathref.'/'.$filename);
 
 			if ($conffile == '/etc/dolibarr/conf.php' && $filename == '/filefunc.inc.php')	// For install with deb or rpm, we ignore test on filefunc.inc.php that was modified by package
 			{
 				$checksumconcat[] = $expectedmd5;
 			}
-			else
-			{
+			else {
 				if ($md5_local != $expectedmd5) $file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'expectedsize'=>$expectedsize, 'md5'=>(string) $md5_local);
 				$checksumconcat[] = $md5_local;
 			}
diff --git a/htdocs/core/lib/format_cards.lib.php b/htdocs/core/lib/format_cards.lib.php
index c46cd150a51..1c274464673 100644
--- a/htdocs/core/lib/format_cards.lib.php
+++ b/htdocs/core/lib/format_cards.lib.php
@@ -56,8 +56,7 @@ if ($resql)
         $_Avery_Labels[$row['code']]['custom_y'] = $row['custom_y'];
     }
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 66d8c6b773a..f0b85a45b73 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -85,8 +85,7 @@ function getEntity($element, $shared = 1, $currentobject = null)
 	{
 		return $mc->getEntity($element, $shared, $currentobject);
 	}
-	else
-	{
+	else {
 		$out = '';
 		$addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values');
 		if (in_array($element, $addzero)) $out .= '0,';
@@ -109,8 +108,7 @@ function setEntity($currentobject)
 	{
 		return $mc->setEntity($currentobject);
 	}
-	else
-	{
+	else {
 		return ((is_object($currentobject) && $currentobject->id > 0 && $currentobject->entity > 0) ? $currentobject->entity : $conf->entity);
 	}
 }
@@ -489,8 +487,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 											$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
 										}
 									}
-									else
-									{
+									else {
 										$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
 										$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
 									}
@@ -747,7 +744,7 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0)
 			if ($returnemptyifnotfound == 1 || !file_exists($res)) return '';
 		}
 	}
-	else				// For an url path
+	else // For an url path
 	{
 		// We try to get local path of file on filesystem from url
 		// Note that trying to know if a file on disk exist by forging path on disk from url
@@ -825,8 +822,7 @@ function dol_clone($object, $native = 0)
 	{
 		$myclone = unserialize(serialize($object));
 	}
-	else
-	{
+	else {
 		$myclone = clone $object; // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)
 	}
 
@@ -918,8 +914,7 @@ function dol_string_unaccent($str)
 		$string = strtr($string, $replacements);
 		return rawurldecode($string);
 	}
-	else
-	{
+	else {
 		// See http://www.ascii-code.com/
         $string = strtr(
 			$str,
@@ -1268,8 +1263,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 				{
 					$out .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
 				}
-				else
-				{
+				else {
 					$out .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";
 				}
 			}
@@ -1282,8 +1276,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 					$out .= $links[$i][1];
 					$out .= '</a>'."\n";
 				}
-				else
-				{
+				else {
 					$out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabunactive tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';
 					$out .= $links[$i][1];
 					$out .= '</a>'."\n";
@@ -1291,8 +1284,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 			}
 			$out .= '</div>';
 		}
-		else
-		{
+		else {
 			// The popup with the other tabs
 			if (!$popuptab)
 			{
@@ -1304,8 +1296,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 			{
 				if (!empty($links[$i][0]))
 					$outmore .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
-				else
-					$outmore .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";
+				else $outmore .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";
 			}
 			elseif (!empty($links[$i][1]))
 			{
@@ -1439,8 +1430,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		$maxvisiblephotos = (isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? $conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5);
 		if ($conf->browser->layout == 'phone') $maxvisiblephotos = 1;
 		if ($showimage) $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';
-		else
-		{
+		else {
 			if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {
 				$nophoto = '';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';
@@ -1464,8 +1454,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 			{
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$showphoto.'</div>';
 			}
-			else
-			{
+			else {
 				$showimage = 0;
 			}
 		}
@@ -1481,8 +1470,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 			}
 		}
 	}
-	else
-	{
+	else {
 		if ($showimage)
 		{
 			if ($modulepart != 'unknown')
@@ -1498,8 +1486,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 						$subdir = get_exdir($object->id, 2, 0, 1, $object, $modulepart);
 						$subdir .= ((!empty($subdir) && !preg_match('/\/$/', $subdir)) ? '/' : '').$objectref; // the objectref dir is not included into get_exdir when used with level=2, so we add it at end
 					}
-					else
-					{
+					else {
 						$subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);
 					}
 					if (empty($subdir)) $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path
@@ -1565,8 +1552,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 					$cssclass = 'photorefcenter';
 					$nophoto = img_picto('No photo', 'title_agenda');
 				}
-				else
-				{
+				else {
 					$width = 14; $cssclass = 'photorefcenter';
 					$picto = $object->picto;
 					if ($object->element == 'project' && !$object->public) $picto = 'project'; // instead of projectpub
@@ -1781,7 +1767,7 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 		$ret .= ($town ? (($object->zip ? ' ' : '').$town) : '');
 		$ret .= ($object->state_code ? (' '.($object->state_code)) : '');
 	}
-	else                                        		// Other: title firstname name \n address lines \n zip town \n country
+	else // Other: title firstname name \n address lines \n zip town \n country
 	{
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= $object->zip ? (($ret ? $sep : '').$object->zip) : '';
@@ -1941,8 +1927,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang
 	    $time = dol_mktime($shour, $smin, $ssec, $smonth, $sday, $syear, true);
 	    $ret = adodb_strftime($format, $time + $offsettz + $offsetdst, $to_gmt);
 	}
-	else
-	{
+	else {
 		// Date is a timestamps
 		if ($time < 100000000000)	// Protection against bad date values
 		{
@@ -1965,8 +1950,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang
 			$monthtext = $outputlangs->transnoentities('Month'.$month);
 			$monthtextshort = $outputlangs->transnoentities('MonthShort'.$month);
 		}
-		else
-		{
+		else {
 			$monthtext = $outputlangs->transnoentitiesnoconv('Month'.$month);
 			$monthtextshort = $outputlangs->transnoentitiesnoconv('MonthShort'.$month);
 		}
@@ -2035,8 +2019,7 @@ function dol_getdate($timestamp, $fast = false)
 	{
 		$arrayinfo = adodb_getdate($timestamp, $fast);
 	}
-	else
-	{
+	else {
 		$arrayinfo = getdate($timestamp);
 	}
 
@@ -2104,8 +2087,7 @@ function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = false, $
 	elseif (strrpos($gm, "tz,") !== false)
 	{
 		$timezone = str_replace("tz,", "", $gm); // Example 'tz,Europe/Berlin'
-		try
-		{
+		try {
 			$localtz = new DateTimeZone($timezone);
 		}
 		catch (Exception $e)
@@ -2188,8 +2170,7 @@ function dol_print_size($size, $shortvalue = 0, $shortunit = 0)
 		$textunitshort = $langs->trans("b");
 		$textunitlong = $langs->trans("Bytes");
 	}
-	else
-	{
+	else {
 		$ret = round($size / $level, 0);
 		$textunitshort = $langs->trans("Kb");
 		$textunitlong = $langs->trans("KiloBytes");
@@ -2269,8 +2250,7 @@ function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64,
 			if ($link) $newemail = '<div>'.$newemail.' '.$link.'</div>';
 		}
 	}
-	else
-	{
+	else {
 		if ($showinvalid && !isValidEmail($email))
 		{
 			$langs->load("errors");
@@ -2363,8 +2343,7 @@ function dol_print_socialnetworks($value, $cid, $socid, $type)
 		}
 		$htmllink .= '</div>';
 	}
-	else
-	{
+	else {
 		$langs->load("errors");
 		$htmllink .= img_warning($langs->trans("ErrorBadSocialNetworkValue", $value));
 	}
@@ -2795,8 +2774,7 @@ function dol_print_ip($ip, $mode = 0)
 			}
 			else $ret .= ' ('.$countrycode.')';
 		}
-		else
-		{
+		else {
 			// Nothing
 		}
 	}
@@ -3019,19 +2997,16 @@ function dol_substr($string, $start, $length, $stringencoding = '', $trunconbyte
 		{
 			$ret = mb_substr($string, $start, $length, $stringencoding);
 		}
-		else
-		{
+		else {
 			$ret = substr($string, $start, $length);
 		}
 	}
-	else
-	{
+	else {
 		if (function_exists('mb_strcut'))
 		{
 			$ret = mb_strcut($string, $start, $length, $stringencoding);
 		}
-		else
-		{
+		else {
 			$ret = substr($string, $start, $length);
 		}
 	}
@@ -3068,8 +3043,7 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
 		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
 		if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
 		return dol_substr($newstring, 0, $size, $stringencoding).($nodot ? '' : '...');
-		else
-		//return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;
+		else //return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;
 		return $string;
 	}
 	elseif ($trunc == 'middle')
@@ -3081,24 +3055,21 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
 			$size2 = round($size / 2);
 			return dol_substr($newstring, 0, $size1, $stringencoding).'...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);
 		}
-		else
-		return $string;
+		else return $string;
 	}
 	elseif ($trunc == 'left')
 	{
 		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
 		if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
 		return '...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);
-		else
-		return $string;
+		else return $string;
 	}
 	elseif ($trunc == 'wrap')
 	{
 		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
 		if (dol_strlen($newstring, $stringencoding) > ($size + 1))
 		return dol_substr($newstring, 0, $size, $stringencoding)."\n".dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);
-		else
-		return $string;
+		else return $string;
 	}
 	else return 'BadParam3CallingDolTrunc';
 }
@@ -3434,8 +3405,7 @@ function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0
 	if (!preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
 
 	if ($pictoisfullpath) $path = $picto;
-	else
-	{
+	else {
 		$path = DOL_URL_ROOT.'/theme/common/'.$picto;
 
 		if (!empty($conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS))
@@ -3979,7 +3949,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 		$syslog .= "url=".dol_escape_htmltag($_SERVER["REQUEST_URI"]);
 		$syslog .= ", query_string=".dol_escape_htmltag($_SERVER["QUERY_STRING"]);
 	}
-	else                              // Mode CLI
+	else // Mode CLI
 	{
 		$out .= '> '.$langs->transnoentities("ErrorInternalErrorDetected").":\n".$argv[0]."\n";
 		$syslog .= "pid=".dol_getmypid();
@@ -4000,7 +3970,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 			$out .= "<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror() ?dol_escape_htmltag($db->lasterror()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out .= "<br>\n";
 		}
-		else                            // Mode CLI
+		else // Mode CLI
 		{
 			// No dol_escape_htmltag for output, we are in CLI mode
 			$out .= '> '.$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";
@@ -4029,7 +3999,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 			{
 				$out .= "<b>".$langs->trans("Message").":</b> ".dol_escape_htmltag($msg)."<br>\n";
 			}
-			else                        // Mode CLI
+			else // Mode CLI
 			{
 				$out .= '> '.$langs->transnoentities("Message").":\n".$msg."\n";
 			}
@@ -4178,19 +4148,18 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 			{
 				$sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field)));
 			}
-			else		// We reverse the var $sortordertouseinlink
+			else // We reverse the var $sortordertouseinlink
 			{
 				$sortordertouseinlink .= str_repeat('asc,', count(explode(',', $field)));
 			}
 		}
-		else                        // We are on field that is the first current sorting criteria
+		else // We are on field that is the first current sorting criteria
 		{
 			if (preg_match('/^ASC/i', $sortorder))	// We reverse the var $sortordertouseinlink
 			{
 				$sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field)));
 			}
-			else
-			{
+			else {
 				$sortordertouseinlink .= str_repeat('asc,', count(explode(',', $field)));
 			}
 		}
@@ -4220,8 +4189,7 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 			//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
 			//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';
 		}
-		else
-		{
+		else {
 			if (preg_match('/^DESC/', $sortorder)) {
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",1).'</a>';
@@ -4351,8 +4319,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 	{
 		$nextpage = 1;
 	}
-	else
-	{
+	else {
 		$nextpage = 0;
 	}
 	//print 'totalnboflines='.$totalnboflines.'-savlimit='.$savlimit.'-limit='.$limit.'-num='.$num.'-nextpage='.$nextpage;
@@ -4402,8 +4369,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 				}
 			}
 
-			do
-			{
+			do {
 				if ($pagenavastextinput) {
 					if ($cpt == $page)
 					{
@@ -4416,8 +4382,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 					{
 						$pagelist .= '<li class="pagination"><span class="active">'.($page + 1).'</span></li>';
 					}
-					else
-					{
+					else {
 						$pagelist .= '<li class="pagination"><a href="'.$file.'?page='.$cpt.$options.'">'.($cpt + 1).'</a></li>';
 					}
 				}
@@ -4439,8 +4404,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 				//}
 			}
 		}
-		else
-		{
+		else {
 			$pagelist .= '<li class="pagination"><span class="active">'.($page + 1)."</li>";
 		}
 	}
@@ -4581,8 +4545,7 @@ function vatrate($rate, $addpercent = false, $info_bits = 0, $usestarfornpr = 0)
 
 	// If rate is '9/9/9' we don't change it.  If rate is '9.000' we apply price()
 	if (!preg_match('/\//', $rate)) $ret = price($rate, 0, '', 0, 0).($addpercent ? '%' : '');
-	else
-	{
+	else {
 		// TODO Split on / and output with a price2num to have clean numbers without ton of 000.
 		$ret = $rate.($addpercent ? '%' : '');
 	}
@@ -4673,8 +4636,7 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
 		{
 		    $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);
 		}
-		else
-		{
+		else {
 			$tmpcur = $outlangs->getCurrencySymbol($currency_code);
 			$cursymbolafter .= ($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur);
 		}
@@ -4875,8 +4837,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 			{
 				if (!$thirdparty_buyer->localtax1_assuj) return 0;
 			}
-			else
-			{
+			else {
 				if (!$thirdparty_seller->localtax1_assuj) return 0;
 			}
 		}
@@ -4889,14 +4850,12 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 			{
 				if (!$thirdparty_buyer->localtax2_assuj) return 0;
 			}
-			else
-			{
+			else {
 				if (!$thirdparty_seller->localtax2_assuj) return 0;
 			}
 		}
 	}
-	else
-	{
+	else {
 		if ($local == 1 && !$thirdparty_seller->localtax1_assuj) return 0;
 		if ($local == 2 && !$thirdparty_seller->localtax2_assuj) return 0;
 	}
@@ -4919,7 +4878,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 					return $thirdparty_seller->localtax1_value;
 				}
 			}
-			else  // i am the seller
+			else // i am the seller
 			{
 				if (!isOnlyOneLocalTax($local))  // TODO If seller is me, why not always returning this, even if there is only one locatax vat.
 				{
@@ -4937,14 +4896,13 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 					return $thirdparty_seller->localtax2_value;
 				}
 			}
-			else  // i am the seller
+			else // i am the seller
 			{
 				if (in_array($mysoc->country_code, array('ES')))
 				{
 					return $thirdparty_buyer->localtax2_value;
 				}
-				else
-				{
+				else {
 					return $conf->global->MAIN_INFO_VALUE_LOCALTAX2;
 				}
 			}
@@ -4990,8 +4948,7 @@ function isOnlyOneLocalTax($local)
 	{
 		return false;
 	}
-	else
-	{
+	else {
 		return true;
 	}
 }
@@ -5045,8 +5002,7 @@ function getTaxesFromId($vatrate, $buyer = null, $seller = null, $firstparamisid
 	$sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";
 	if ($firstparamisid) $sql .= " WHERE t.rowid = ".(int) $vatrate;
-	else
-	{
+	else {
 		$vatratecleaned = $vatrate;
 		$vatratecode = '';
 		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
@@ -5101,8 +5057,7 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 	$sql  = "SELECT t.taux as rate, t.code, t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";
 	if ($firstparamisid) $sql .= " WHERE t.rowid = ".(int) $vatrate;
-	else
-	{
+	else {
 		$vatratecleaned = $vatrate;
 		$vatratecode = '';
 		$reg = array();
@@ -5134,8 +5089,7 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 		{
 			return array($obj->localtax2_type, get_localtax($vateratestring, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
 		}
-		else
-		{
+		else {
 			return array($obj->localtax1_type, get_localtax($vateratestring, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vateratestring, 2, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
 		}
 	}
@@ -5176,15 +5130,13 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr
 				$ret = $product->vatrate_supplier;
 				if ($product->default_vat_code) $ret .= ' ('.$product->default_vat_code.')';
 			}
-			else
-			{
+			else {
 				$ret = $product->tva_tx; // Default vat of product we defined
 				if ($product->default_vat_code) $ret .= ' ('.$product->default_vat_code.')';
 			}
 			$found = 1;
 		}
-		else
-		{
+		else {
 			// TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet.
 			// May be usefull/required if hidden option SERVICE_ARE_ECOMMERCE_200238EC is on
 		}
@@ -5255,8 +5207,7 @@ function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)
 			$found=1;
 			*/
 		}
-		else
-		{
+		else {
 			// TODO Read default product vat according to countrycode and product
 		}
 	}
@@ -5361,8 +5312,7 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 			//print 'VATRULE 3';
 			return 0;
 		}
-		else
-		{
+		else {
 			//print 'VATRULE 4';
 			return get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
 		}
@@ -5442,8 +5392,7 @@ function get_default_localtax($thirdparty_seller, $thirdparty_buyer, $local, $id
 		{
 			if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) return 0;
 		}
-		else
-		{
+		else {
 			// Si vendeur non assujeti a Localtax1, localtax1 par default=0
 			if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) return 0;
 			if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') return 0;
@@ -5532,8 +5481,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)
 		if ($level == 2) $path = substr($num, 1, 1).'/'.substr($num, 0, 1);
 		if ($level == 3) $path = substr($num, 2, 1).'/'.substr($num, 1, 1).'/'.substr($num, 0, 1);
 	}
-	else
-	{
+	else {
 		// TODO
 		// We will enhance here a common way of forging path for document storage
 		// Here, object->id, object->ref and modulepart are required.
@@ -5606,15 +5554,13 @@ function dol_mkdir($dir, $dataroot = '', $newmask = null)
 					dol_syslog("functions.lib::dol_mkdir: Fails to create directory '".$ccdir."' or directory already exists.", LOG_WARNING);
 					$nberr++;
 				}
-				else
-				{
+				else {
 					dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' created", LOG_DEBUG);
 					$nberr = 0; // On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignore
 					$nbcreated++;
 				}
 			}
-			else
-			{
+			else {
 				$nberr = 0; // On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignores
 			}
 		}
@@ -5755,14 +5701,12 @@ function dolGetFirstLineOfText($text, $nboflines = 1, $charset = 'UTF-8')
 			$firstline = preg_replace('/<br[^>]*>.*$/s', '', $text); // The s pattern modifier means the . can match newline characters
 			$firstline = preg_replace('/<div[^>]*>.*$/s', '', $firstline); // The s pattern modifier means the . can match newline characters
 		}
-		else
-		{
+		else {
 			$firstline = preg_replace('/[\n\r].*/', '', $text);
 		}
 		return $firstline.((strlen($firstline) != strlen($text)) ? '...' : '');
 	}
-	else
-	{
+	else {
 		$ishtml = 0;
 		if (dol_textishtml($text))
 		{
@@ -5770,8 +5714,7 @@ function dolGetFirstLineOfText($text, $nboflines = 1, $charset = 'UTF-8')
 			$ishtml = 1;
 			$repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
 		}
-		else
-		{
+		else {
 			$repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " ");
 		}
 
@@ -5844,8 +5787,7 @@ function dol_htmlentitiesbr($stringtoencode, $nl2brmode = 0, $pagecodefrom = 'UT
 		$newstring = dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom); // Make entity encoding
 		$newstring = strtr($newstring, array('__and__'=>'&', '__lt__'=>'<', '__gt__'=>'>', '__dquot__'=>'"'));
 	}
-	else
-	{
+	else {
 		if ($removelasteolbr) $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); // Remove last \n (may remove several)
 		$newstring = dol_nl2br(dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom), $nl2brmode);
 	}
@@ -6022,8 +5964,7 @@ function dol_textishtml($msg, $option = 0)
 		elseif (preg_match('/<br/i', $msg))				return true;
 		return false;
 	}
-	else
-	{
+	else {
 		if (preg_match('/<html/i', $msg))				return true;
 		elseif (preg_match('/<body/i', $msg))			return true;
 		elseif (preg_match('/<\/textarea/i', $msg))	  return true;
@@ -6217,8 +6158,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__SHIPPINGTRACKNUMURL__'] = 'Shipping tracking url';
 			}
 		}
-		else
-		{
+		else {
 			$substitutionarray['__ID__'] = $object->id;
 			$substitutionarray['__REF__'] = $object->ref;
 			$substitutionarray['__REF_CLIENT__'] = (isset($object->ref_client) ? $object->ref_client : (isset($object->ref_customer) ? $object->ref_customer : null));
@@ -6388,8 +6328,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			{
 				$paymenturl = '';
 			}
-			else
-			{
+			else {
 				// Set the online payment url link into __ONLINE_PAYMENT_URL__ key
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 				$outputlangs->loadLangs(array('paypal', 'other'));
@@ -6704,8 +6643,7 @@ function dolGetFirstLastname($firstname, $lastname, $nameorder = -1)
 	    	$ret .= $lastname;
 	    }
 	}
-	else
-	{
+	else {
 		$ret .= $lastname;
 		if ($firstname && $lastname) $ret .= ' ';
 		$ret .= $firstname;
@@ -6731,7 +6669,7 @@ function setEventMessage($mesgs, $style = 'mesgs')
 	{
 		if ($mesgs) $_SESSION['dol_events'][$style][] = $mesgs;
 	}
-	else						// If mesgs is an array
+	else // If mesgs is an array
 	{
 		foreach ($mesgs as $mesg)
 		{
@@ -6757,8 +6695,7 @@ function setEventMessages($mesg, $mesgs, $style = 'mesgs', $messagekey = '')
 	{
 		dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);
 	}
-	else
-	{
+	else {
 		if ($messagekey)
 		{
 			// Complete message with a js link to set a cookie "DOLHIDEMESSAGE".$messagekey;
@@ -6769,8 +6706,7 @@ function setEventMessages($mesg, $mesgs, $style = 'mesgs', $messagekey = '')
 		{
 			if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) dol_print_error('', 'Bad parameter style='.$style.' for setEventMessages');
 			if (empty($mesgs)) setEventMessage($mesg, $style);
-			else
-			{
+			else {
 				if (!empty($mesg) && !in_array($mesg, $mesgs)) setEventMessage($mesg, $style); // Add message string if not already into array
 				setEventMessage($mesgs, $style);
 			}
@@ -6878,8 +6814,7 @@ function get_htmloutput_mesg($mesgstring = '', $mesgarray = '', $style = 'ok', $
 					});
 				</script>';
 		}
-		else
-		{
+		else {
 			$return = $out;
 		}
 	}
@@ -6954,8 +6889,7 @@ function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $style = 'o
 					$tmpmesgstring = preg_replace('/<\/div>/', '', $tmpmesgstring);
 					$newmesgarray[] = $tmpmesgstring;
 				}
-				else
-				{
+				else {
 					dol_syslog("Error call of dol_htmloutput_mesg with an array with a value that is not a string", LOG_WARNING);
 				}
 			}
@@ -7012,8 +6946,7 @@ function dol_sort_array(&$array, $index, $order = 'asc', $natsort = 0, $case_sen
 				{
 					$temp[$key] = $array[$key]->$index;
 				}
-				else
-				{
+				else {
 					$temp[$key] = $array[$key][$index];
 				}
 			}
@@ -7149,8 +7082,7 @@ function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid =
 		$db->free($resql);
 		return $cache_codes[$tablename][$key][$fieldid];
 	}
-	else
-	{
+	else {
 		return -1;
 	}
 }
@@ -7204,8 +7136,7 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1)
 		if ($hideerrors) return @eval('return '.$s.';');
 		else return eval('return '.$s.';');
 	}
-	else
-	{
+	else {
 		if ($hideerrors) @eval($s);
 		else eval($s);
 	}
@@ -7249,8 +7180,7 @@ function picto_from_langcode($codelang, $moreatt = '')
 	);
 
 	if (isset($langtocountryflag[$codelang])) $flagImage = $langtocountryflag[$codelang];
-	else
-	{
+	else {
 		$tmparray = explode('_', $codelang);
 		$flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];
 	}
@@ -7469,8 +7399,7 @@ function getLanguageCodeFromCountryCode($countrycode)
     		}
     	}
 	}
-	else
-	{
+	else {
         dol_syslog("Warning Exention php-intl is not available", LOG_WARNING);
 	}
 
@@ -7913,8 +7842,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 					{
 						$newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$numnewcrit;
 					}
-					else
-					{
+					else {
 						$newres .= ($i2 > 0 ? ' OR ' : '').'1 = 2'; // force false
 					}
 					$i2++; // a criteria was added to string
@@ -7965,7 +7893,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 			        }
 			    }
 			}
-			else    // $mode=0
+			else // $mode=0
 			{
 				$tmpcrits = explode('|', $crit);
 				$i3 = 0;
@@ -7979,8 +7907,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 					{
 						$newres .= $field." = ".(is_numeric(trim($tmpcrit)) ?trim($tmpcrit) : '0');
 					}
-					else
-					{
+					else {
 						$newres .= $field." LIKE '";
 
 						$tmpcrit = trim($tmpcrit);
@@ -8271,8 +8198,7 @@ function getDictvalue($tablename, $field, $id, $checkentity = false, $rowidfield
 				$dictvalues[$tablename][$obj->{$rowidfield}] = $obj;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -8305,8 +8231,7 @@ function colorIsLight($stringcolor)
 			$g = $tmp[1];
 			$b = $tmp[2];
 		}
-		else
-		{
+		else {
 			$hexr = $stringcolor[0].$stringcolor[1];
 			$hexg = $stringcolor[2].$stringcolor[3];
 			$hexb = $stringcolor[4].$stringcolor[5];
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 531e0fe242c..dcdd31a1cc2 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -233,8 +233,7 @@ function dol_print_object_info($object, $usetable = 0)
         	if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
         }
-        else
-        {
+        else {
             $userstatic = new User($db);
             $userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);
             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
@@ -269,8 +268,7 @@ function dol_print_object_info($object, $usetable = 0)
         	if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
         }
-        else
-        {
+        else {
             $userstatic = new User($db);
             $userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);
             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
@@ -305,8 +303,7 @@ function dol_print_object_info($object, $usetable = 0)
             if ($object->user_validation->id) print $object->user_validation->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
         }
-        else
-        {
+        else {
             $userstatic = new User($db);
             $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
@@ -341,8 +338,7 @@ function dol_print_object_info($object, $usetable = 0)
             if ($object->user_approve->id) print $object->user_approve->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
         }
-        else
-        {
+        else {
             $userstatic = new User($db);
             $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
@@ -405,8 +401,7 @@ function dol_print_object_info($object, $usetable = 0)
 			if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
         }
-        else
-        {
+        else {
             $userstatic = new User($db);
             $userstatic->fetch($object->user_cloture);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
@@ -441,8 +436,7 @@ function dol_print_object_info($object, $usetable = 0)
 			if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
         }
-        else
-        {
+        else {
             $userstatic = new User($db);
             $userstatic->fetch($object->user_rappro);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
@@ -760,8 +754,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
         $maskcounter = $reg[1];
         $hasglobalcounter = true;
     }
-    else
-    {
+    else {
         // setting some defaults so the rest of the code won't fail if there is a third party counter
         $masktri = '00000';
         $maskcounter = '00000';
@@ -799,8 +792,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
         $masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdpaty typent_code (where n is length in mask)
         $masktype_value = str_pad($masktype_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
     }
-    else
-    {
+    else {
     	$masktype = '';
     	$masktype_value = '';
     }
@@ -815,8 +807,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
     	$maskuser_value = substr($lastname, 0, dol_strlen($regType[1])); // get n first characters of user firstname (where n is length in mask)
     	$maskuser_value = str_pad($maskuser_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
     }
-    else
-    {
+    else {
     	$maskuser = '';
     	$maskuser_value = '';
     }
@@ -961,7 +952,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 			$sqlwhere .= "(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
             $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
 		}
-        else   // reset is done on january
+        else // reset is done on january
         {
             $sqlwhere .= '(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";
         }
@@ -974,8 +965,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
     	{
     	$posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 'UTF-8');
 	}
-	else
-	{
+	else {
     	$posnumstart = strrpos($maskwithnocode, $maskcounter);
 	}	// Pos of counter in final string (from 0 to ...)
     if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';
@@ -1142,7 +1132,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
         	$numFinal = preg_replace('/\{yy\}/i', date("y", $date) + $yearoffset, $numFinal);
         	$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1) + $yearoffset, $numFinal);
 		}
-		else	// we want yyyy to be current year
+		else // we want yyyy to be current year
 		{
         	$numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date), $numFinal);
         	$numFinal = preg_replace('/\{yy\}/i', date("y", $date), $numFinal);
@@ -1224,8 +1214,7 @@ function check_value($mask, $value)
         $maskcounter = $reg[1];
         $hasglobalcounter = true;
     }
-    else
-    {
+    else {
         // setting some defaults so the rest of the code won't fail if there is a third party counter
         $masktri = '00000';
         $maskcounter = '00000';
@@ -1422,8 +1411,7 @@ function numero_semaine($time)
         {
             $numeroSemaine = 53;
         }
-        else
-        {
+        else {
             $numeroSemaine = 1;
         }
     }
@@ -1528,8 +1516,7 @@ function dol_set_user_param($db, $conf, &$user, $tab)
             $user->conf->$key = $value;
             //print "key=".$key." user->conf->key=".$user->conf->$key;
         }
-        else
-        {
+        else {
             unset($user->conf->$key);
         }
     }
@@ -1552,8 +1539,7 @@ function dol_print_reduction($reduction, $langs)
     {
         $string = $langs->transnoentities("Offered");
     }
-    else
-    {
+    else {
     	$string = vatrate($reduction, true);
     }
 
@@ -1674,13 +1660,11 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
                         $liste[$obj->id.':'.$record['fullname']] = dol_trunc($record['name'], $max, 'middle');
                     }
                 }
-                else
-                {
+                else {
                     $liste[0] = $obj->label.': '.$langs->trans("None");
                 }
             }
-            else
-            {
+            else {
             	if ($type == 'member' && $obj->doc_template_name == 'standard')   // Special case, if member template, we add variant per format
                 {
                     global $_Avery_Labels;
@@ -1690,7 +1674,7 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
                     	$liste[$obj->id.':'.$key] = ($obj->label ? $obj->label : $obj->doc_template_name).' '.$val['name'];
                     }
                 }
-                else    // Common usage
+                else // Common usage
                 {
                 	$liste[$obj->id] = $obj->label ? $obj->label : $obj->doc_template_name;
                 }
@@ -1698,8 +1682,7 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
             $i++;
         }
     }
-    else
-    {
+    else {
         dol_print_error($db);
         return -1;
     }
@@ -1777,8 +1760,7 @@ function getSoapParams()
                       'trace'		   => 1
         );
     }
-    else
-    {
+    else {
         $params = array('connection_timeout'=>$timeout,
                       'response_timeout'=>$response_timeout,
                       'proxy_use'      => 0,
@@ -1968,8 +1950,7 @@ function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
 			$i++;
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 
@@ -2148,7 +2129,7 @@ function colorAgressiveness($hex, $ratio = -50, $brightness = 0)
 			if ($color > 127) $color += ((255 - $color) * ($ratio / 100));
 			if ($color < 128) $color -= ($color * ($ratio / 100));
 		}
-		else			// We decrease agressiveness
+		else // We decrease agressiveness
 		{
 			if ($color > 128) $color -= (($color - 128) * (abs($ratio) / 100));
 			if ($color < 127) $color += ((128 - $color) * (abs($ratio) / 100));
@@ -2157,8 +2138,7 @@ function colorAgressiveness($hex, $ratio = -50, $brightness = 0)
 		{
 			$color = ($color * (100 + abs($brightness)) / 100);
 		}
-		else
-		{
+		else {
 			$color = ($color * (100 - abs($brightness)) / 100);
 		}
 
diff --git a/htdocs/core/lib/functionsnumtoword.lib.php b/htdocs/core/lib/functionsnumtoword.lib.php
index 26db2bbec90..f3dfa25c05c 100644
--- a/htdocs/core/lib/functionsnumtoword.lib.php
+++ b/htdocs/core/lib/functionsnumtoword.lib.php
@@ -213,8 +213,7 @@ function dolNumberToWord($numero, $langs, $numorcurrency = 'number')
 				$entexto .= hundreds2text($CdMILLON, $DdMILLON, $udMILLON);
 				if (!$CdMMillon && !$DdMMillon && !$UdMMillon && !$CdMILLON && !$DdMILLON && $udMILLON == 1)
 					$entexto .= " MILL&OacuteN ";
-				else
-					$entexto .= " MILLONES ";
+				else $entexto .= " MILLONES ";
 			}
 			if ($number >= 1000) {
 				$cdm = (int) ($numero / 100000);
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index ae0eb86882e..0175ed83e61 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -88,8 +88,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
         $array_param = null;
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
     	if (!is_array($param)) parse_str($param, $array_param);
-    	else
-    	{
+    	else {
     	    dol_syslog("parameter param must be a string", LOG_WARNING);
     	    $array_param = $param;
     	}
@@ -109,8 +108,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE'); // POST
     }
-    else
-    {
+    else {
     	curl_setopt($ch, CURLOPT_POST, 0); // GET
     }
 
@@ -144,8 +142,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 
 		dol_syslog("getURLContent response array is ".join(',', $rep));
     }
-    else
-    {
+    else {
     	$info = curl_getinfo($ch);
 
     	// Ad keys to $rep
@@ -183,8 +180,7 @@ function getDomainFromURL($url, $mode = 0)
 	{
 		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)\.([^\.]+)$/', '\1.\2.\3', $tmpdomain); // Remove part 'www.' before 'abc.mydomain.com'
 	}
-	else
-	{
+	else {
 		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)$/', '\1.\2', $tmpdomain); // Remove part 'www.abc.' before 'mydomain.com'
 	}
 	if (empty($mode))
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 4f65ca3a2bf..c13c9c0f56c 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -221,8 +221,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 		// Compatibilite image GIF
 		$imgThumb = imagecreate($newWidth, $newHeight);
 	}
-	else
-	{
+	else {
 		$imgThumb = imagecreatetruecolor($newWidth, $newHeight);
 	}
 
@@ -359,8 +358,7 @@ function correctExifImageOrientation($fileSource, $fileDest, $quality = 95)
 				if ($fileDest === false) {
 					return $img;
 				}
-				else
-				{
+				else {
 					// In fact there exif is only for JPG but just in case
 					// Create image on disk
 					$image = false;
@@ -597,8 +595,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 		$thumbWidth  = $maxWidth;
 		$thumbHeight = $thumbWidth / $imgWhFact;
 	}
-	else
-	{
+	else {
 		// Si hauteur determinante
 		$thumbHeight = $maxHeight;
 		$thumbWidth  = $thumbHeight * $imgWhFact;
@@ -615,8 +612,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 		// Compatibilite image GIF
 		$imgThumb = imagecreate($thumbWidth, $thumbHeight);
 	}
-	else
-	{
+	else {
 		$imgThumb = imagecreatetruecolor($thumbWidth, $thumbHeight);
 	}
 
diff --git a/htdocs/core/lib/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php
index d5ca3431845..64ecdcf9e69 100644
--- a/htdocs/core/lib/invoice2.lib.php
+++ b/htdocs/core/lib/invoice2.lib.php
@@ -262,15 +262,13 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 
 			$result = 1;
 		}
-		else
-		{
+		else {
 			if ($usestdout) print "No invoices found for criteria.\n";
 			else dol_syslog("No invoices found for criteria");
 			$result = 0;
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 		dol_syslog("scripts/invoices/rebuild_merge.php: Error");
 		$error++;
diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index 44ad9cc6ff1..9bf2db7278c 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -54,8 +54,7 @@ function dol_json_encode($elements)
 	{
 		foreach ($elements as $key => $value) $num++;
 	}
-	else
-	{
+	else {
 	    $num = count($elements);
 	}
 	//var_dump($num);
@@ -75,8 +74,7 @@ function dol_json_encode($elements)
 		}
 		$output .= ']';
 	}
-	else
-	{
+	else {
 		// associative (object)
 		$output = '{';
 		$last = $num - 1;
@@ -201,7 +199,7 @@ function _val($val)
 	elseif (is_int($val)) return sprintf('%d', $val);
 	elseif (is_float($val)) return sprintf('%F', $val);
 	elseif (is_bool($val)) return ($val ? 'true' : 'false');
-	else  return 'null';
+	else return 'null';
 }
 
 if (!function_exists('json_decode'))
diff --git a/htdocs/core/lib/ldap.lib.php b/htdocs/core/lib/ldap.lib.php
index 038791ce1cc..b5ea5faf3c5 100644
--- a/htdocs/core/lib/ldap.lib.php
+++ b/htdocs/core/lib/ldap.lib.php
@@ -122,8 +122,7 @@ function show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass)
 		$langs->load("errors");
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('ErrorLDAPSetupNotComplete').'">'.$butlabel.'</a>';
 	}
-	else
-	{
+	else {
 		print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action='.$testlabel.'">'.$butlabel.'</a>';
 	}
 	print '<br><br>';
diff --git a/htdocs/core/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php
index a301ac40a2b..6ed00c10b34 100644
--- a/htdocs/core/lib/memory.lib.php
+++ b/htdocs/core/lib/memory.lib.php
@@ -64,8 +64,7 @@ function dol_setcache($memoryid, $data)
 		{
 			return count($data);
 		}
-		else
-		{
+		else {
 			return -$rescode;
 		}
 	}
@@ -87,8 +86,7 @@ function dol_setcache($memoryid, $data)
 		{
 			return count($data);
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 	}
@@ -134,8 +132,7 @@ function dol_getcache($memoryid)
 		{
 			return $data;
 		}
-		else
-		{
+		else {
 			return -$rescode;
 		}
 	}
@@ -159,8 +156,7 @@ function dol_getcache($memoryid)
 		{
 			return $data;
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 	}
@@ -236,8 +232,7 @@ function dol_setshmop($memoryid, $data)
 		shmop_close($handle);
 		return ($shm_bytes_written1 + $shm_bytes_written2);
 	}
-	else
-	{
+	else {
 		print 'Error in shmop_open for memoryid='.$memoryid.' shmkey='.$shmkey.' 6+size=6+'.$size;
 		return -1;
 	}
@@ -264,8 +259,7 @@ function dol_getshmop($memoryid)
 		else return -1;
 		shmop_close($handle);
 	}
-	else
-	{
+	else {
 		return -2;
 	}
 	return $data;
diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index b9a958160d4..373e80e2a67 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -83,8 +83,7 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 	//$pathoffiletoedittmp=$destdir.'/class/'.strtolower($objectname).'.class.php.tmp';
 	//dol_delete_file($pathoffiletoedittmp, 0, 1, 1);
 
-	try
-	{
+	try {
 		include_once $pathoffiletoeditsrc;
 		if (class_exists($objectname)) $object = new $objectname($db);
 		else return -4;
@@ -234,8 +233,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 	}
 
 	// Load object from myobject.class.php
-	try
-	{
+	try {
 		if (!is_object($object))
 		{
 			include_once $pathoffiletoclasssrc;
@@ -270,8 +268,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 			$texttoinsert .= "\t".$key." ".$type;
 			if ($key == 'rowid')  $texttoinsert .= ' AUTO_INCREMENT PRIMARY KEY';
 			if ($key == 'entity') $texttoinsert .= ' DEFAULT 1';
-			else
-			{
+			else {
 				if ($val['default'] != '')
 				{
 					if (preg_match('/^null$/i', $val['default'])) $texttoinsert .= " DEFAULT NULL";
@@ -293,8 +290,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 	{
 		@chmod($pathoffiletoedittarget, octdec($newmask));
 	}
-	else
-	{
+	else {
 		$error++;
 	}
 
@@ -338,8 +334,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 	{
 		@chmod($pathoffiletoedittarget, octdec($newmask));
 	}
-	else
-	{
+	else {
 		$error++;
 	}
 
diff --git a/htdocs/core/lib/parsemd.lib.php b/htdocs/core/lib/parsemd.lib.php
index 7dfd025609c..6a83fad87be 100644
--- a/htdocs/core/lib/parsemd.lib.php
+++ b/htdocs/core/lib/parsemd.lib.php
@@ -46,8 +46,7 @@ function dolMd2Html($content, $parser = 'parsedown', $replaceimagepath = null)
         $Parsedown = new Parsedown();
         $content = $Parsedown->text($content);
     }
-    else
-    {
+    else {
         $content = nl2br($content);
     }
 
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index d031984552e..eedc8034d01 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -190,8 +190,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
+			else {
 				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
 				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
 				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
@@ -208,8 +207,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
+			else {
 				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
 				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
 				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
@@ -226,8 +224,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
+			else {
 				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
 				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
 				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
@@ -244,8 +241,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
+			else {
 				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
 				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + member_ref)";
 				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
@@ -262,8 +258,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
+			else {
 				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
 				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + donation_ref)";
 				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 63789a18e62..bfa49911b02 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -55,8 +55,7 @@ function pdf_getFormat(Translate $outputlangs = null, $mode = 'setup')
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 		$pdfformat = dol_getDefaultFormat($outputlangs);
 	}
-	else
-	{
+	else {
 		$pdfformat = $conf->global->MAIN_PDF_FORMAT;
 	}
 
@@ -306,8 +305,7 @@ function pdfGetHeightForHtmlContent(&$pdf, $htmlcontent)
     if ($end_page == $start_page) {
         $height = $end_y - $start_y;
     }
-    else
-    {
+    else {
         for ($page = $start_page; $page <= $end_page; ++$page) {
         	$pdf->setPage($page);
         	$tmpm = $pdf->getMargins();
@@ -514,8 +512,7 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
     			    }
     			}
     		}
-    		else
-    		{
+    		else {
     			$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcompany));
     			// Country
     			if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
@@ -804,8 +801,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
     		$cury += 8;
 		}
 	}
-	else
-	{
+	else {
 		$pdf->SetFont('', 'B', $default_font_size - $diffsizecontent);
 		$pdf->SetXY($curx, $cury);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': '.$outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
@@ -1059,8 +1055,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
     		}
 		    $freetextheight = $pdf->getStringHeight($width, $line);
 		}
-		else
-		{
+		else {
             $freetextheight = pdfGetHeightForHtmlContent($pdf, dol_htmlentitiesbr($line, 1, 'UTF-8', 0)); // New method (works for HTML content)
             //print '<br>'.$freetextheight;exit;
 		}
@@ -1076,8 +1071,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 		{
             $pdf->MultiCell(0, 3, $line, 0, $align, 0);
 		}
-		else
-		{
+		else {
             $pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk'] - $marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
 		}
 		$posy -= $freetextheight;
@@ -1245,8 +1239,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 		$prodser = new ProductFournisseur($db);
 	}
-	else
-	{
+	else {
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		$prodser = new Product($db);
 	}
@@ -1328,8 +1321,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid", $discount->ref_invoice_supplier_source);
 		}
-		else
-		{
+		else {
 			if ($idprod)
 			{
 				if (empty($hidedesc))
@@ -1338,14 +1330,12 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 					{
 						$libelleproduitservice = $desc."\n".$libelleproduitservice;
 					}
-					else
-					{
+					else {
 						$libelleproduitservice .= $desc;
 					}
 				}
 			}
-			else
-			{
+			else {
 				$libelleproduitservice .= $desc;
 			}
 		}
@@ -1360,8 +1350,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		{
 			$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
 		}
-		else
-		{
+		else {
 			$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." ";
 		}
 	}
@@ -1374,14 +1363,13 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 				$ref_prodserv = $ref_supplier;
 			elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 2)
 				$ref_prodserv = $ref_supplier.' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';
-			else	// Common case
+			else // Common case
 			{
 				$ref_prodserv = $prodser->ref; // Show local ref
 				if ($ref_supplier) $ref_prodserv .= ($prodser->ref ? ' (' : '').$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.($prodser->ref ? ')' : '');
 			}
 		}
-		else
-		{
+		else {
 			$ref_prodserv = $prodser->ref; // Show local ref only
 		}
 
@@ -1944,8 +1932,7 @@ function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookm
 				}
 			 	$result = ($object->lines[$i]->situation_percent - $prev_progress).'%';
 			}
-			else
-				$result = $object->lines[$i]->situation_percent.'%';
+			else $result = $object->lines[$i]->situation_percent.'%';
 	  	}
 	}
 	return $result;
@@ -2001,8 +1988,7 @@ function pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails = 0)
         		}
 				$result .= price($sign * ($total_ht / ($object->lines[$i]->situation_percent / 100)) * $progress, 0, $outputlangs);
         	}
-        	else
-        	{
+        	else {
                 $result .= price($sign * $total_ht, 0, $outputlangs);
         	}
         }
@@ -2187,8 +2173,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
 			        //if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / ';
 			        //$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
 			    }
-			    else
-			    {
+			    else {
 			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending");
 			        if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '');
 			        $linkedobjects[$objecttype]['ref_value'] .= ' / '.$outputlangs->transnoentities($elementobject->ref);
@@ -2235,7 +2220,7 @@ function pdf_getSizeForImage($realpath)
 			$width = $maxwidth;
 			$height = (int) round($maxwidth * $tmp['height'] / $tmp['width']);
 		}
-		else	// No pb with maxheight
+		else // No pb with maxheight
 		{
 			$height = $maxheight;
 		}
@@ -2261,8 +2246,7 @@ function pdfGetLineTotalDiscountAmount($object, $i, $outputlangs, $hidedetails =
 	{
 		return $outputlangs->transnoentities("Option");
 	}
-	else
-	{
+	else {
 		if (is_object($hookmanager))
 		{
 			$special_code = $object->lines[$i]->special_code;
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index c06c4431562..8f77d24bdab 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -132,7 +132,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		$localtax2_type = $localtaxes_array[2];
 		$localtax2_rate = $localtaxes_array[3];
 	}
-	else	// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate using the full vat rate (including text code)
+	else // deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate using the full vat rate (including text code)
 	{
 	    dol_syslog("Price.lib::calcul_price_total search vat information using old deprecated method", LOG_WARNING);
 
@@ -159,8 +159,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	// pu calculation from pu_devise if pu empty
 	if (empty($pu) && !empty($pu_devise)) {
 		if (!empty($multicurrency_tx)) $pu = $pu_devise / $multicurrency_tx;
-		else
-		{
+		else {
 			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (multicurrency_tx empty when pu_devise not) ', LOG_ERR);
 			return array();
 		}
@@ -169,8 +168,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	// pu_devise calculation from pu
 	if (empty($pu_devise) && !empty($multicurrency_tx)) {
 		if (is_numeric($pu) && is_numeric($multicurrency_tx)) $pu_devise = $pu * $multicurrency_tx;
-		else
-		{
+		else {
 			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (pu or multicurrency_tx are not numeric)', LOG_ERR);
 			return array();
 		}
@@ -193,8 +191,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
     	$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)), 'MU');
     	$pu_wt = price2num($pu * (1 + ($txtva / 100)), 'MU');
     }
-    else
-    {
+    else {
     	$tot_sans_remise_wt = $tot_sans_remise;
     	$tot_avec_remise_wt = $tot_avec_remise;
     	$pu_wt = $pu;
@@ -269,8 +266,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		$result5bis = price2num($pu * (1 + ($txtva / 100)) + $localtaxes[2], 'MU'); // Si TVA consideree normale (non NPR)
 		$result[4] = price2num($result5bis - ($result[3] + $localtaxes[2]), 'MU');
 	}
-	else
-	{
+	else {
 		// We work to define prices using the price with tax
 		$result[8] = price2num($tot_sans_remise + $localtaxes[0], 'MT');
 		$result[6] = price2num($tot_sans_remise / (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)), 'MT'); // Selon TVA NPR ou non
@@ -355,8 +351,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 			$result[9] = round($result[9] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[10] = round($result[10] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
 		}
-		else
-		{
+		else {
 			$result[1] = round($result[1] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[2] = round($result[2] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[0] = price2num($result[2] - $result[1], 'MT');
@@ -406,8 +401,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		$result[25] = $newresult[9];
 		$result[26] = $newresult[10];
 	}
-	else
-	{
+	else {
 		$result[16] = $result[0];
 		$result[17] = $result[1];
 		$result[18] = $result[2];
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 43acb16ba2a..e1ed6efc805 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -553,8 +553,7 @@ function measuringUnitString($unit, $measuring_style = '', $scale = '', $use_sho
 				't.active' => 1
 			);
 		}
-		else
-		{
+		else {
 			$arrayforfilter = array(
 				't.rowid' => $unit,
 				't.unit_type' => $measuring_style,
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index bef3d9fd0dc..c84762f8575 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -419,14 +419,12 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 					{
 						$showlineingray = 1; // We will show line but in gray
 					}
-					else
-					{
+					else {
 						$showline = 0; // No reason to show line
 					}
 				}
 			}
-			else
-			{
+			else {
 				// Caller did not ask to filter on tasks of a specific user (this probably means he want also tasks of all users, into public project
 				// or into all other projects if user has permission to).
 				if (empty($user->rights->projet->all->lire))
@@ -682,8 +680,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
                 if ($lines[$i]->planned_workload) $total_projectlinesa_declared_if_planned += $lines[$i]->planned_workload * $lines[$i]->progress / 100;
 			}
 		}
-		else
-		{
+		else {
 			//$level--;
 		}
 	}
@@ -1380,8 +1377,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 			}
 			$level--;
 		}
-		else
-		{
+		else {
 			//$level--;
 		}
 	}
@@ -1745,8 +1741,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 			}
 			$level--;
 		}
-		else
-		{
+		else {
 			//$level--;
 		}
 	}
@@ -2006,8 +2001,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 			}
 			$level--;
 		}
-		else
-		{
+		else {
 			//$level--;
 		}
 	}
@@ -2110,8 +2104,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 		$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 		$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
 	}
-	else
-	{
+	else {
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
 	}
 	$sql .= " WHERE p.entity IN (".getEntity('project').")";
@@ -2339,8 +2332,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 
@@ -2475,8 +2467,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 		}
     	$out .= '        </div>';
     }
-    else
-    {
+    else {
     	// bad
     	$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.doubleval($progressCalculated).'%" title="'.doubleval($progressCalculated).'%">';
     	$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.($task->progress ? doubleval($task->progress / $progressCalculated * 100).'%' : '1px').'" title="'.doubleval($task->progress).'%"></div>';
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 03f1525eb91..76ce3cb5b01 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -504,8 +504,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 						$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 						$sql .= " AND dbt.entity IS NOT NULL";
 					}
-					else
-					{
+					else {
 						$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
 						$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 						$sql .= " AND ((ug.fk_user = dbt.rowid";
@@ -518,8 +517,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 					$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 				}
 			}
-			else
-			{
+			else {
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
@@ -590,8 +588,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$tmparray = explode(',', $tmps);
 				if (!in_array($objectid, $tmparray)) return false;
 			}
-			else
-			{
+			else {
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
@@ -611,8 +608,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$tmparray = explode(',', $tmps);
 				if (!in_array($task->fk_project, $tmparray)) return false;
 			}
-			else
-			{
+			else {
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
@@ -662,8 +658,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$obj = $db->fetch_object($resql);
 				if (!$obj || $obj->nb < count(explode(',', $objectid))) return false;
 			}
-			else
-			{
+			else {
 				return false;
 			}
 		}
@@ -723,8 +718,7 @@ function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $sho
 				print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';
 				print $langs->trans("ErrorForbidden2", $langs->transnoentitiesnoconv("Home"), $langs->transnoentitiesnoconv("Users"));
 			}
-			else
-			{
+			else {
 				print $langs->trans("ErrorForbidden3");
 			}
 		}
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 04d16084365..fba8ba346c6 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -102,8 +102,7 @@ function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $auth
     					$dol_screenheight = GETPOST('screenheight');
     				}
     			}
-    			else
-    			{
+    			else {
     				dol_syslog("Authentication KO - failed to load file '".$authfile."'", LOG_ERR);
     				sleep(1);
     				// Load translation files required by the page
@@ -180,8 +179,7 @@ if (!function_exists('dol_loginfunction'))
 				if (file_exists($tmp)) { $template_dir = preg_replace('/login\.tpl\.php$/', '', $tmp); break; }
 			}
 		}
-		else
-		{
+		else {
 			$template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
 		}
 
@@ -376,8 +374,7 @@ function encodedecode_dbpassconf($level = 0)
 					$val = dol_decode($val);
 					$passwd = $val;
 				}
-				else
-				{
+				else {
 					$passwd = $val;
 					$val = dol_encode($val);
 					$passwd_crypted = $val;
@@ -401,8 +398,7 @@ function encodedecode_dbpassconf($level = 0)
 				//print 'passwd = '.$passwd.' - passwd_crypted = '.$passwd_crypted;
 				//exit;
 			}
-			else
-			{
+			else {
 				$config .= $buffer;
 			}
 		}
@@ -423,14 +419,12 @@ function encodedecode_dbpassconf($level = 0)
 
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_syslog("encodedecode_dbpassconf Failed to open conf.php file for writing", LOG_WARNING);
 			return -1;
 		}
 	}
-	else
-	{
+	else {
 		dol_syslog("encodedecode_dbpassconf Failed to read conf.php", LOG_ERR);
 		return -2;
 	}
@@ -476,7 +470,7 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 
 			$generated_password = str_shuffle($randomCode);
 		}
-		else	// Old platform, non cryptographic random
+		else // Old platform, non cryptographic random
 		{
 			$max = strlen($lowercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
@@ -514,8 +508,7 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		{
 			$generated_password = str_replace($replaceambiguouschars, $numbers{random_int(0, $max)}, $generated_password);
 		}
-		else
-		{
+		else {
 			$generated_password = str_replace($replaceambiguouschars, $numbers{mt_rand(0, $max)}, $generated_password);
 		}
 	}
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index ad1e6304d03..541aab2358e 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -305,8 +305,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 
 						$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
 					}
-					else
-					{
+					else {
 						$label = (!empty($objp->label) ? $objp->label : $objp->product_label);
 					}
 
@@ -333,8 +332,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 
 					print '</td>';
 				}
-				else
-				{
+				else {
 					print "<td>";
 					if ($objp->fk_product_type == 1) $text = img_object($langs->trans('Service'), 'service');
 					else $text = img_object($langs->trans('Product'), 'product');
@@ -440,8 +438,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 						print dol_print_date($receiving->date_delivery, 'day');
 						print '</td>';
 					}
-					else
-					{
+					else {
 						//print '<td>&nbsp;</td>';
 						print '<td>&nbsp;</td>';
 						print '<td>&nbsp;</td>';
@@ -455,8 +452,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 		}
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 
diff --git a/htdocs/core/lib/signature.lib.php b/htdocs/core/lib/signature.lib.php
index 837f505c132..8dd24c87df6 100644
--- a/htdocs/core/lib/signature.lib.php
+++ b/htdocs/core/lib/signature.lib.php
@@ -63,8 +63,7 @@ function getOnlineSignatureUrl($mode, $type, $ref = '')
 		if ($mode == 0) $out .= urlencode($ref);
 		$out .= ($mode ? '</font>' : '');
 		if ($mode == 1) $out .= '&hashp=<font color="#666666">hash_of_file</font>';
-		else
-		{
+		else {
 			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$propaltmp = new Propal($db);
 			$res = $propaltmp->fetch(0, $ref);
@@ -81,8 +80,7 @@ function getOnlineSignatureUrl($mode, $type, $ref = '')
 				$out = $langs->trans("FeatureOnlineSignDisabled");
 				return $out;
 			}
-			else
-			{
+			else {
 				$out .= '&hashp='.$hashp;
 			}
 		}
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index cdf9fe29b1c..46682addf2c 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -175,8 +175,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
     	$sql .= " ORDER BY d.rowid, d.".$fk_facture;
     }
-    else
-    {
+    else {
     	// Count on payments date
     	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
     	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
@@ -274,8 +273,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     			$company_id = $assoc['company_id'];
     		}
     	}
-    	else
-    	{
+    	else {
     		dol_print_error($db);
     		return -3;
     	}
@@ -323,8 +321,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
     	$sql .= " ORDER BY d.rowid, d.".$fk_facture;
     }
-    else
-    {
+    else {
     	// Count on payments date
     	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
     	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
@@ -425,8 +422,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     			$company_id = $assoc['company_id'];
     		}
     	}
-    	else
-    	{
+    	else {
     		dol_print_error($db);
     		return -3;
     	}
@@ -529,8 +525,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     				$company_id = $assoc['company_id'];
     			}
     		}
-    		else
-    		{
+    		else {
     			dol_print_error($db);
     			return -3;
     		}
@@ -580,8 +575,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         $paymentfacturetable = 'paiement_facture';
         $invoicefieldref = 'ref';
     }
-    else
-    {
+    else {
         $invoicetable = 'facture_fourn';
         $invoicedettable = 'facture_fourn_det';
         $fk_facture = 'fk_facture_fourn';
@@ -644,8 +638,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
         $sql .= " ORDER BY d.rowid, d.".$fk_facture;
     }
-    else
-    {
+    else {
     	// Count on payments date
     	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
     	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
@@ -743,8 +736,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
                 $rate = $assoc['rate'];
             }
         }
-        else
-        {
+        else {
             dol_print_error($db);
             return -3;
         }
@@ -792,8 +784,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
         $sql .= " ORDER BY d.rowid, d.".$fk_facture;
     }
-    else
-    {
+    else {
         // Count on payments date
         $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
         $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
@@ -894,8 +885,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
                 $rate = $assoc['rate'];
             }
         }
-        else
-        {
+        else {
             dol_print_error($db);
             return -3;
         }
@@ -998,8 +988,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 					$rate = $assoc['rate'];
 				}
 			}
-			else
-			{
+			else {
 				dol_print_error($db);
 				return -3;
 			}
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index cf6607e6960..4ed30dbcb2f 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -163,16 +163,14 @@ function showDirectPublicLink($object)
 	{
 		$out .= '<span class="opacitymedium">'.$langs->trans("PublicInterfaceNotEnabled").'</span>';
 	}
-	else
-	{
+	else {
 		$out .= img_picto('', 'object_globe.png').' '.$langs->trans("TicketPublicAccess").':<br>';
 		if ($url)
 		{
 			$out .= '<input type="text" id="directpubliclink" class="quatrevingtpercent" value="'.$url.'">';
 			$out .= ajax_autoselect("directpubliclink", 0);
 		}
-		else
-		{
+		else {
 			$out .= '<span class="opacitymedium">'.$langs->trans("TicketNotCreatedFromPublicInterface").'</span>';
 		}
 	}
@@ -315,8 +313,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
         if (is_object($objcon) && $objcon->id > 0) {
             $sql = "SELECT DISTINCT a.id, a.label as label,";
         }
-        else
-        {
+        else {
             $sql = "SELECT a.id, a.label as label,";
         }
         $sql .= " a.datep as dp,";
@@ -402,14 +399,12 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
             {
                 if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
                 elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
-                else
-                {
+                else {
                     if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'";
                     elseif ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'";
                 }
             }
-            else
-            {
+            else {
                 if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
                 elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
                 else $sql .= " AND c.code = '".$db->escape($actioncode)."'";
@@ -527,8 +522,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
             $i++;
         }
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 
@@ -555,8 +549,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 		{
 			$out .= '<input type="hidden" name="id" value="'.$objcon->id.'" />';
 		}
-		else
-		{
+		else {
 			$out .= '<input type="hidden" name="id" value="'.$filterobj->id.'" />';
 		}
 		if ($filterobj && get_class($filterobj) == 'Societe') $out .= '<input type="hidden" name="socid" value="'.$filterobj->id.'" />';
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index 0dcb6e8242d..8f7f6152c97 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -80,8 +80,7 @@ function tree_showpad(&$fulltree, $key, $silent = 0)
     			if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branch.gif');
     			else print img_picto_common('', 'treemenu/line.gif');
     		}
-    		else
-    		{
+    		else {
     			if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branchbottom.gif');
     			else print img_picto_common('', 'treemenu/linebottom.gif');
     		}
@@ -175,8 +174,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 			    print $tab[$x]['buttons'];
 			    print '</td></tr></table>';
 			}
-			else
-			{
+			else {
 			    print $tab[$x]['entry'];
 			}
 			//print ' -> A '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
@@ -211,8 +209,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 			    print $tab[$x]['buttons'];
 			    print '</td></tr></table>';
 			}
-			else
-			{
+			else {
 			    print $tab[$x]['entry'];
 			}
 			//print ' -> B '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 9ac9383e516..2fbc6eee325 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -347,8 +347,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>&nbsp;</td>';
 		print '</tr>';
 	}
-	else
-	{
+	else {
 		$dirthemestring = '';
 		foreach ($dirthemes as $dirtheme)
 		{
@@ -404,8 +403,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 						{
 							print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" checked name="main_theme" value="'.$subdir.'"> <b>'.$subdir.'</b>';
 						}
-						else
-						{
+						else {
 							print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;
 						}
 						print '</div>';
@@ -442,8 +440,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	{
 		// Nothing
 	}
-	else
-	{
+	else {
 		// Show logo
 		print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("EnableShowLogo").'</td><td>';
 		if ($edit)
@@ -451,8 +448,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 			print ajax_constantonoff('MAIN_SHOW_LOGO', array(), null, 0, 0, 1);
 			//print $form->selectyesno('MAIN_SHOW_LOGO', $conf->global->MAIN_SHOW_LOGO, 1);
 		}
-		else
-		{
+		else {
 			print  yn($conf->global->MAIN_SHOW_LOGO);
 		}
 		print '</td>';
@@ -487,8 +483,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
          if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
          print '</td>';*/
 	}
-	else
-	{
+	else {
 		$default = $langs->trans('No');
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
@@ -498,8 +493,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 			print ajax_constantonoff('THEME_TOPMENU_DISABLE_IMAGE', array(), null, 0, 0, 1);
 			//print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
 		}
-		else
-		{
+		else {
 			print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
@@ -532,8 +526,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
     	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    print '</td>';*/
 	}
-	else
-	{
+	else {
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
@@ -542,8 +535,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), ''), 'THEME_ELDY_BACKBODY', 'formcolor', 1).' ';
 		}
-	   	else
-	   	{
+	   	else {
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
@@ -578,8 +570,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
     	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    print '</td>';*/
 	}
-	else
-	{
+	else {
 		$default = (empty($colorbackhmenu1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbackhmenu1)));
 
 		print '<tr class="oddeven">';
@@ -589,8 +580,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), ''), 'THEME_ELDY_TOPMENU_BACK1', 'formcolor', 1).' ';
 		}
-	   	else
-	   	{
+	   	else {
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
@@ -625,8 +615,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		 if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 		 print '</td>';*/
 	}
-	else
-	{
+	else {
 		$default = (empty($colorbackvmenu1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbackvmenu1)));
 
 		print '<tr class="oddeven">';
@@ -636,8 +625,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), ''), 'THEME_ELDY_VERMENU_BACK1', 'formcolor', 1).' ';
 		}
-		else
-		{
+		else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
@@ -652,8 +640,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	if ($foruserprofile)
 	{
 	}
-	else
-	{
+	else {
 		$default = (empty($colortexttitlenotab) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitlenotab)));
 
 		print '<tr class="oddeven">';
@@ -663,8 +650,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB, array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', 'formcolor', 1).' ';
 		}
-		else
-		{
+		else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #'.$default.'">'.$default.'</span></strong> ';
@@ -678,8 +664,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	if ($foruserprofile)
 	{
 	}
-	else
-	{
+	else {
 		$default = (empty($colorbacktitle1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacktitle1)));
 
 		print '<tr class="oddeven">';
@@ -689,8 +674,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1, array()), ''), 'THEME_ELDY_BACKTITLE1', 'formcolor', 1).' ';
 		}
-	   	else
-	   	{
+	   	else {
 	   		print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
 	   	}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> '; // $colorbacktitle1 in CSS
@@ -704,8 +688,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	if ($foruserprofile)
 	{
 	}
-	else
-	{
+	else {
 		$default = (empty($colortexttitle) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitle)));
 
 		print '<tr class="oddeven">';
@@ -715,8 +698,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE, array()), ''), 'THEME_ELDY_TEXTTITLE', 'formcolor', 1).' ';
 		}
-		else
-		{
+		else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLE, $langs->trans("Default"));
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #'.$default.'">'.$default.'</span></strong> ';
@@ -730,8 +712,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	if ($foruserprofile)
 	{
 	}
-	else
-	{
+	else {
 		$default=(empty($colortexttitlelink) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitlelink)));
 
 		print '<tr class="oddeven">';
@@ -741,8 +722,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLELINK, array()), ''), 'THEME_ELDY_TEXTTITLELINK', 'formcolor', 1).' ';
 		}
-		else
-		{
+		else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLELINK, $langs->trans("Default"));
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #'.$default.'">'.$default.'</span></strong> ';
@@ -757,8 +737,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	if ($foruserprofile)
 	{
 	}
-	else
-	{
+	else {
 		$default = (empty($colorbacklineimpair1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklineimpair1)));
 
 		print '<tr class="oddeven">';
@@ -768,8 +747,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), ''), 'THEME_ELDY_LINEIMPAIR1', 'formcolor', 1).' ';
 		}
-		else
-		{
+		else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
@@ -784,8 +762,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	if ($foruserprofile)
 	{
 	}
-	else
-	{
+	else {
 		$default = (empty($colorbacklinepair1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepair1)));
 
 		print '<tr class="oddeven">';
@@ -795,8 +772,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), ''), 'THEME_ELDY_LINEPAIR1', 'formcolor', 1).' ';
 		}
-		else
-		{
+		else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
@@ -831,8 +807,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	    	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    	print '</td>';*/
 	}
-	else
-	{
+	else {
 		$default = (empty($colortextlink) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortextlink)));
 
 		print '<tr class="oddeven">';
@@ -842,12 +817,10 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), ''), 'THEME_ELDY_TEXTLINK', 'formcolor', 1).' ';
 		}
-		else
-		{
+		else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else
-			{
+			else {
 				//print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
 				//print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
 				print $langs->trans("Default");
@@ -887,8 +860,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
 			print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', 'formcolor', 1).' ';
 		}
-		else
-		{
+		else {
 			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
 			if ($color)
@@ -917,8 +889,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	     print '</tr>';
 	     */
 	}
-	else
-	{
+	else {
 		$default = (empty($colorbacklinepairchecked) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepairchecked)));
 
 		print '<tr class="oddeven">';
@@ -932,8 +903,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');
 			print $formother->selectColor($color, 'THEME_ELDY_USE_CHECKED', 'formcolor', 1).' ';
 		}
-		else
-		{
+		else {
 			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');
 			if ($color)
@@ -962,14 +932,12 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
    	    {
    	        print $form->selectyesno('MAIN_OPTIMIZEFORTEXTBROWSER', $fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER, 1);
    	    }
-   	    else
-   	    {
+   	    else {
    	        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
    	        {
    	            print yn($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER);
    	        }
-   	        else
-   	        {
+   	        else {
    	            print yn(1);
    	            if (empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) print ' ('.$langs->trans("ForcedByGlobalSetup").')';
    	        }
@@ -979,8 +947,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	    print '</td>';
 	    print '</tr>';
 	}
-	else
-	{
+	else {
 	    /*var_dump($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
 	    $default=$langs->trans('No');
 	    print '<tr class="oddeven">';
@@ -1024,8 +991,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		{
 			print $form->selectArray('MAIN_OPTIMIZEFORCOLORBLIND', $colorBlindOptions, $fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND, 0);
 		}
-		else
-		{
+		else {
 			if (!empty($fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND) && isset($colorBlindOptions[$fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND])) {
 				print $colorBlindOptions[$fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND];
 			}
@@ -1038,8 +1004,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '</td>';
 		print '</tr>';
 	}
-	else
-	{
+	else {
 	}
 	print '</table>';
 }
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 1864ca27bea..9dd7708c36d 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -94,8 +94,7 @@ function dolKeepOnlyPhpCode($str)
 			{
 				$newstr .= $partlings[0].'?>';
 			}
-			else
-			{
+			else {
 				$newstr .= $part.'?>';
 			}
 		}
@@ -300,7 +299,7 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 			$content = str_replace('!~!~!~', '', $content);
 		}
 	}
-	else									// REPLACEMENT OF LINKS When page called from virtual host
+	else // REPLACEMENT OF LINKS When page called from virtual host
 	{
 		$symlinktomediaexists = 1;
 		if ($website->virtualhost) {
@@ -336,8 +335,7 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 			$content = preg_replace('/(<img[^>]*src=")\/?viewimage\.php/', '\1/wrapper.php', $content, -1, $nbrep);
 			$content = preg_replace('/(<a[^>]*href=")\/?documents\.php/', '\1/wrapper.php', $content, -1, $nbrep);
 		}
-		else
-		{
+		else {
 			// <img src="image.png... => <img src="medias/image.png...
 			$content = preg_replace('/(<img[^>]*src=")\/?image\//', '\1/medias/image/', $content, -1, $nbrep);
 			$content = preg_replace('/(url\(["\']?)\/?image\//', '\1/medias/image/', $content, -1, $nbrep);
@@ -426,8 +424,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 		{
 			$containerref = $tmpwebsitepage->pageurl;
 		}
-		else
-		{
+		else {
 			print "Error, page contains a redirect to the alternative alias '".$containeraliasalt."' that does not exists in web site (".$website->id." / ".$website->ref.")";
 			exit;
 		}
@@ -464,18 +461,16 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 					print "Error, page with uri '.$currenturi.' try a redirect to the same alias page '".$containerref."' in web site '".$website->ref."'";
 					exit;
 				}
-				else
-				{
+				else {
 					$newurl = preg_replace('/&pageref=([^&]+)/', '&pageref='.$containerref, $currenturi);
 				}
 			}
-			else
-			{
+			else {
 				$newurl = $currenturi.'&pageref='.urlencode($containerref);
 			}
 		}
 	}
-	else								// When page called from virtual host server
+	else // When page called from virtual host server
 	{
 		$newurl = '/'.$containerref.'.php';
 	}
@@ -488,8 +483,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 		header("Location: ".$newurl);
 		exit;
 	}
-	else
-	{
+	else {
 		print "Error, page contains a redirect to the alias page '".$containerref."' that does not exists in web site (".$website->id." / ".$website->ref.")";
 		exit;
 	}
@@ -601,7 +595,7 @@ function getStructuredData($type, $data = array())
 		if (is_array($mysoc->socialnetworks) && count($mysoc->socialnetworks) > 0) {
 			$ret .= '"sameAs": [';
 			$i = 0;
-			foreach($mysoc->socialnetworks as $key => $value) {
+			foreach ($mysoc->socialnetworks as $key => $value) {
 				if ($key == 'linkedin') {
 					$ret.= '"https://www.'.$key.'.com/company/'.dol_escape_json($value).'"';
 				} elseif ($key == 'youtube') {
@@ -670,7 +664,7 @@ function getStructuredData($type, $data = array())
 				$ret .= '"keywords": [';
 				$i = 0;
 				$arrayofkeywords = explode(',', $websitepage->keywords);
-				foreach($arrayofkeywords as $keyword) {
+				foreach ($arrayofkeywords as $keyword) {
 					$ret.= '"'.dol_escape_json($keyword).'"';
 					$i++;
 					if ($i < count($arrayofkeywords)) $ret .= ', ';
@@ -810,8 +804,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 		$arrayresult['code'] = 'KO';
 		$arrayresult['message'] = $weblangs->trans("ErrorSearchCriteriaTooSmall");
 	}
-	else
-	{
+	else {
 		$tmparrayoftype = explode(',', $type);
 		foreach ($tmparrayoftype as $tmptype) {
 			if (!in_array($tmptype, array('', 'page', 'blogpost'))) {
@@ -873,8 +866,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$arrayresult['code'] = $db->lasterrno();
 			$arrayresult['message'] = $db->lasterror();
@@ -934,8 +926,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 				$arrayresult['message'] = $weblangs->trans("NoRecordFound");
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$arrayresult['code'] = 'KO';
 			$arrayresult['message'] = 'No supported algorithm found';
@@ -985,8 +976,7 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 			$urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
 			$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
 		}
-		else
-		{
+		else {
 			$urltograbbis = $urltograb.'/'.$regs[2][$key]; // We use dir of grabbed file
 		}
 
@@ -1029,8 +1019,7 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
 					$action = 'create';
 				}
-				else
-				{
+				else {
 					$alreadygrabbed[$urltograbbis] = 1; // Track that file was alreay grabbed.
 
 					dol_mkdir(dirname($filetosave));
@@ -1062,8 +1051,7 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 			$urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
 			$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
 		}
-		else
-		{
+		else {
 			$urltograbbis = $urltograb.'/'.$regs[2][$key]; // We use dir of grabbed file
 		}
 
@@ -1108,8 +1096,7 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
 					$action = 'create';
 				}
-				else
-				{
+				else {
 					$alreadygrabbed[$urltograbbis] = 1; // Track that file was alreay grabbed.
 
 					dol_mkdir(dirname($filetosave));
diff --git a/htdocs/core/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php
index 440f1147cbf..33db8490a75 100644
--- a/htdocs/core/lib/xcal.lib.php
+++ b/htdocs/core/lib/xcal.lib.php
@@ -230,8 +230,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 						$enddate = dol_time_plus_duree($startdate, 1, "d");
 					}
 				}
-				else
-				{
+				else {
 					if (empty($enddate))
 					{
 						$enddate = $startdate + $duration;
@@ -316,8 +315,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 		}
 	}
-	else
-	{
+	else {
 		dol_syslog("xcal.lib.php::build_calfile Failed to open file ".$outputfile." for writing");
 		return -2;
 	}
@@ -526,8 +524,7 @@ function calEncode($line)
 
 		$out .= $newpara;
 	}
-	else
-	{
+	else {
 		$strlength = dol_strlen($line);
 
 		for ($j = 0; $j < $strlength; $j++)
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index ea3fa2f3a19..333e4741cd1 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -107,8 +107,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 				{
 					$login = $obj->login;
 				}
-				else
-				{
+				else {
 				    sleep(2); // Anti brut force protection
 				    dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO bad password for '".$usertotest."', cryptType=".$cryptType, LOG_NOTICE);
 
@@ -124,8 +123,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 					global $mc;
 
 					if (!isset($mc)) $conf->multicompany->enabled = false; // Global not available, disable $conf->multicompany->enabled for safety
-					else
-					{
+					else {
 						$ret = $mc->checkRight($obj->rowid, $entitytotest);
 						if ($ret < 0)
 						{
@@ -135,8 +133,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 					}
 				}
 			}
-			else
-			{
+			else {
 				dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO user not found for '".$usertotest."'", LOG_NOTICE);
 				sleep(1);
 
@@ -146,8 +143,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO db error for '".$usertotest."' error=".$db->lasterror(), LOG_ERR);
 			sleep(1);
 			$_SESSION["dol_loginmesg"] = $db->lasterror();
diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index 3a8b274c109..9f7f5f1d81c 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -127,8 +127,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 					return '';
 				}
 			}
-			else
-			{
+			else {
 				 if ($ldapdebug) print "DEBUG: ".$ldap->error."<br>\n";
 			}
 			$ldap->close();
@@ -219,8 +218,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 			}
 		}
-		else
-		{
+		else {
 			/* Login failed. Return false, together with the error code and text from
              ** the LDAP server. The common error codes and reasons are listed below :
              ** (for iPlanet, other servers may differ)
diff --git a/htdocs/core/login/functions_openid.php b/htdocs/core/login/functions_openid.php
index a401dfd7764..c354d2d8d0e 100644
--- a/htdocs/core/login/functions_openid.php
+++ b/htdocs/core/login/functions_openid.php
@@ -57,8 +57,7 @@ function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
             $openid->SetApprovedURL($protocol.$_SERVER["HTTP_HOST"].$_SERVER["SCRIPT_NAME"]); // Send Response from OpenID server to this script
             $openid->Redirect(); // This will redirect user to OpenID Server
         }
-        else
-        {
+        else {
             $error = $openid->GetError();
             return false;
         }
@@ -96,8 +95,7 @@ function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
             $error = $openid->GetError();
             return false;
         }
-        else
-        {
+        else {
             // Signature Verification Failed
             //echo "INVALID AUTHORIZATION";
             return false;
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 4b4a4c54151..c58c8049c27 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -145,8 +145,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 		 {
 		 $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
 		 }*/
-		else
-		{
+		else {
 			$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo_squarred_alpha.png';
 			$logoContainerAdditionalClass = '';
 		}
@@ -411,8 +410,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				// Should not happend. Entries are added
 				$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
 			}
@@ -474,8 +472,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 				{
 					print '<div class="blockvmenu blockvmenuimpair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
 				}
-				else
-				{
+				else {
 					print '<div class="blockvmenu blockvmenupair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
 				}
 			}
@@ -539,8 +536,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
 					$lastlevel0 = 'greyed';
 				}
-				else
-				{
+				else {
 				    $lastlevel0 = 'hidden';
 				}
 				if ($showmenu)
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 2a67d43c1e3..c654e823b5c 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -79,8 +79,7 @@ class MenuManager
     		$_SESSION["mainmenu"] = $mainmenu;
     		$_SESSION["leftmenuopened"] = "";
     	}
-    	else
-    	{
+    	else {
     		// On va le chercher en session si non defini par le lien
     		$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
     	}
@@ -97,8 +96,7 @@ class MenuManager
     			//$leftmenu="";
     			$_SESSION["leftmenuopened"] = "";
     		}
-    		else
-    		{
+    		else {
     			$_SESSION["leftmenuopened"] = $leftmenu;
     		}
     	} else {
@@ -146,8 +144,7 @@ class MenuManager
         	if ($mode == 'top')  print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
         	if ($mode == 'left') print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
         }
-        else
-        {
+        else {
         	$conf->global->MAIN_SHOW_LOGO = 0;
         	if ($mode == 'top')  print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
         	if ($mode == 'left') print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
@@ -226,8 +223,7 @@ class MenuManager
 					    {
 					        $lastlevel[0] = 'greyed';
 					    }
-					    else
-					    {
+					    else {
 					        $lastlevel[0] = 'hidden';
 					    }
 					}
@@ -259,8 +255,7 @@ class MenuManager
        						{
        							$relurl2 = dol_buildpath($val2['url'], 1);
        						}
-       						else
-       						{
+       						else {
        							$relurl2 = $val2['url'];
        						}
 	        				$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
@@ -286,20 +281,18 @@ class MenuManager
 		        					print '>';
 		        					$lastlevel2[$val2['level']] = 'enabled';
 	        					}
-	        					else					// Not allowed but visible (greyed)
+	        					else // Not allowed but visible (greyed)
 	        					{
 				        			print '<a href="#" class="vsmenudisabled">';
 				        			$lastlevel2[$val2['level']] = 'greyed';
 	        					}
 	        				}
-	        				else
-	        				{
+	        				else {
 	        				    if ($val2['enabled'])	// Allowed
 	        				    {
 	        				        $lastlevel2[$val2['level']] = 'enabled';
 	        				    }
-	        				    else
-	        				    {
+	        				    else {
 	        				        $lastlevel2[$val2['level']] = 'greyed';
 	        				    }
 	        				}
@@ -308,8 +301,7 @@ class MenuManager
 	        				{
 	        					if ($val2['enabled'])	// Allowed
 	        						print '</a>';
-	        					else
-	        						print '</a>';
+	        					else print '</a>';
 	        				}
 	        				print '</li>'."\n";
        					}
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 3f539260856..39f94d6eb2f 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -440,8 +440,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 					$mtitle .= $langs->trans($item);
 				}
 			}
-			else
-			{
+			else {
 				$mtitle = $langs->trans($smenu->title);
 			}
 			// Add item
@@ -512,8 +511,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		{
 			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
 		}*/
-		else
-		{
+		else {
 			$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo_squarred_alpha.png';
 			$logoContainerAdditionalClass = '';
 		}
@@ -1309,8 +1307,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 								$i++;
 							}
 						}
-						else
-						{
+						else {
 							// Should not happend. Entries are added
 							$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
 						}
@@ -1625,8 +1622,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 						$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
 						$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
 					}
-					else
-					{
+					else {
 						$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock');
 						$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write);
 						$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read);
@@ -1987,8 +1983,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				{
 					print '<div class="blockvmenu blockvmenuimpair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
 				}
-				else
-				{
+				else {
 					print '<div class="blockvmenu blockvmenupair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
 				}
 			}
@@ -2052,8 +2047,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
 					$lastlevel0 = 'greyed';
 				}
-				else
-				{
+				else {
 				    $lastlevel0 = 'hidden';
 				}
 				if ($showmenu)
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 5276a509ae5..2d62f9f7275 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -78,8 +78,7 @@ class MenuManager
         	$_SESSION["mainmenu"] = $mainmenu;
         	$_SESSION["leftmenuopened"] = "";
         }
-        else
-        {
+        else {
         	// On va le chercher en session si non defini par le lien
         	$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
         }
@@ -96,8 +95,7 @@ class MenuManager
         		//$leftmenu="";
         		$_SESSION["leftmenuopened"] = "";
         	}
-        	else
-        	{
+        	else {
         		$_SESSION["leftmenuopened"] = $leftmenu;
         	}
         } else {
@@ -147,8 +145,7 @@ class MenuManager
         	if ($mode == 'top')  print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
         	if ($mode == 'left') print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
         }
-        else
-		{
+        else {
         	$conf->global->MAIN_SHOW_LOGO = 0;
         	if ($mode == 'top')  print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
         	if ($mode == 'left') print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
@@ -231,8 +228,7 @@ class MenuManager
         			    {
         			        $lastlevel[0] = 'greyed';
         			    }
-        			    else
-        			    {
+        			    else {
         			        $lastlevel[0] = 'hidden';
         			    }
         			}
@@ -264,8 +260,7 @@ class MenuManager
        						{
        							$relurl2 = dol_buildpath($val2['url'], 1);
        						}
-       						else
-       						{
+       						else {
        							$relurl2 = $val2['url'];
        						}
 	        				$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
@@ -291,20 +286,18 @@ class MenuManager
 		        					print '>';
 		        					$lastlevel2[$val2['level']] = 'enabled';
 	        					}
-	        					else					// Not allowed but visible (greyed)
+	        					else // Not allowed but visible (greyed)
 	        					{
 				        			print '<a href="#" class="vsmenudisabled">';
 				        			$lastlevel2[$val2['level']] = 'greyed';
 	        					}
 	        				}
-	        				else
-	        				{
+	        				else {
 	        				    if ($val2['enabled'])	// Allowed
 	        				    {
 	        				        $lastlevel2[$val2['level']] = 'enabled';
 	        				    }
-	        				    else
-	        				    {
+	        				    else {
 	        				        $lastlevel2[$val2['level']] = 'greyed';
 	        				    }
 	        				}
@@ -313,8 +306,7 @@ class MenuManager
 	        				{
 	        					if ($val2['enabled'])	// Allowed
 	        						print '</a>';
-	        					else
-	        						print '</a>';
+	        					else print '</a>';
 	        				}
 	        				print '</li>'."\n";
        					}
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 923f4e84965..2b2a000fa3b 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -231,8 +231,7 @@ class MenuManager
 		                {
 		                    $lastlevel[0] = 'greyed';
 		                }
-		                else
-		                {
+		                else {
 		                    $lastlevel[0] = 'hidden';
 		                }
 		            }
@@ -282,20 +281,18 @@ class MenuManager
 		                            print '>';
 		                            $lastlevel2[$val2['level']] = 'enabled';
 		                        }
-		                        else					// Not allowed but visible (greyed)
+		                        else // Not allowed but visible (greyed)
 		                        {
 		                            print '<a href="#" class="vsmenudisabled">';
 		                            $lastlevel2[$val2['level']] = 'greyed';
 		                        }
 		                    }
-		                    else
-		                    {
+		                    else {
 		                        if ($val2['enabled'])	// Allowed
 		                        {
 		                            $lastlevel2[$val2['level']] = 'enabled';
 		                        }
-		                        else
-		                        {
+		                        else {
 		                            $lastlevel2[$val2['level']] = 'greyed';
 		                        }
 		                    }
@@ -376,8 +373,7 @@ class MenuManager
 						{
 							print '<div class="blockvmenub lockvmenuimpair blockvmenuunique'.($lastopened ? ' blockvmenulast' : '').($alt == 1 ? ' blockvmenufirst' : '').'">'."\n";
 						}
-						else
-						{
+						else {
 							print '<div class="blockvmenu blockvmenupair blockvmenuunique'.($lastopened ? ' blockvmenulast' : '').($alt == 1 ? ' blockvmenufirst' : '').'">'."\n";
 						}
 					}
@@ -398,8 +394,7 @@ class MenuManager
 						{
 							print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'], 1).'"'.($this->menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>'.$this->menu->liste[$i]['titre'].'</a></div>'."\n";
 						}
-						else
-						{
+						else {
 							print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$this->menu->liste[$i]['titre'].'</font></div>'."\n";
 						}
 						print '<div class="menu_top"></div>'."\n";
@@ -420,8 +415,7 @@ class MenuManager
 							if ($this->menu->liste[$i]['url']) print $this->menu->liste[$i]['titre'].'</a>';
 							else print '</span>';
 						}
-						else
-						{
+						else {
 							print $tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$this->menu->liste[$i]['titre'].'</font>';
 						}
 
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 24811ad854d..0911dc85719 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -438,8 +438,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                          $this->error = $this->db->lasterror();
                          $err++;
                     }
-                    else
-                    {
+                    else {
                          dol_syslog(get_class($this)."::_init Warning ".$this->db->lasterror(), LOG_WARNING);
                     }
                 }
@@ -451,8 +450,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
             $this->db->commit();
             return 1;
         }
-        else
-        {
+        else {
             $this->db->rollback();
             return 0;
         }
@@ -538,8 +536,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
             $this->db->commit();
             return 1;
         }
-        else
-        {
+        else {
             $this->db->rollback();
             return 0;
         }
@@ -561,8 +558,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
             // If module name translation exists
             return $langs->transnoentitiesnoconv("Module".$this->numero."Name");
         }
-        else
-        {
+        else {
             // If module name translation using it's unique id does not exist, we try to use its name to find translation
             if (is_array($this->langfiles)) {
                 foreach ($this->langfiles as $val)
@@ -597,8 +593,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
             // If module description translation exists
             return $langs->transnoentitiesnoconv("Module".$this->numero."Desc");
         }
-        else
-        {
+        else {
             // If module description translation does not exist using its unique id, we can use its name to find translation
             if (is_array($this->langfiles)) {
                 foreach ($this->langfiles as $val)
@@ -651,13 +646,11 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                     )
                 );
             }
-            else
-            {
+            else {
                 $content = nl2br($content);
             }
         }
-        else
-        {
+        else {
             // Mostly for internal modules
             if (!empty($this->descriptionlong)) {
                 if (is_array($this->langfiles)) {
@@ -746,8 +739,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                 @include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
                 $content = dolMd2Html($content, 'parsedown', array('doc/'=>dol_buildpath(strtolower($this->name).'/doc/', 1)));
             }
-            else
-            {
+            else {
                 $content = nl2br($content);
             }
         }
@@ -859,8 +851,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
             // Translation not found
             return $langs->trans($this->export_label[$r]);
         }
-        else
-        {
+        else {
             // Translation found
             return $langs->trans($langstring);
         }
@@ -884,8 +875,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
             // Translation not found
             return $langs->transnoentitiesnoconv($this->import_label[$r]);
         }
-        else
-        {
+        else {
             // Translation found
             return $langs->transnoentitiesnoconv($langstring);
         }
@@ -913,8 +903,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         {
             $err++;
         }
-        else
-        {
+        else {
             $obj = $this->db->fetch_object($resql);
             if ($obj) {
                 return $this->db->jdate($obj->tms);
@@ -946,8 +935,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         {
             $err++;
         }
-        else
-        {
+        else {
             $obj = $this->db->fetch_object($resql);
             $tmp = array();
             if ($obj->note) {
@@ -1233,16 +1221,14 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                         if (!$err) {
                             $this->db->commit();
                         }
-                        else
-                        {
+                        else {
                                   $this->error = $this->db->lasterror();
                                   $this->db->rollback();
                         }
                     }
                     // else box already registered into database
                 }
-                else
-                {
+                else {
                     $this->error = $this->db->lasterror();
                     $err++;
                 }
@@ -1428,16 +1414,14 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                         if (!$err) {
                             $this->db->commit();
                         }
-                        else
-                        {
+                        else {
                             $this->error = $this->db->lasterror();
                             $this->db->rollback();
                         }
                     }
                     // else box already registered into database
                 }
-                else
-                {
+                else {
                     $this->error = $this->db->lasterror();
                     $err++;
                 }
@@ -1629,13 +1613,11 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                         $err++;
                     }
                 }
-                else
-                {
+                else {
                     dol_syslog(get_class($this)."::insert_const constant '".$name."' already exists", LOG_WARNING);
                 }
             }
-            else
-            {
+            else {
                 $err++;
             }
         }
@@ -1738,16 +1720,14 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                                     $sql .= " VALUES ";
                                     $sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."','".$r_subperms."')";
                                 }
-                                else
-                                   {
+                                else {
                                     $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def";
                                     $sql .= " (id, entity, libelle, module, type, bydefault, perms)";
                                     $sql .= " VALUES ";
                                     $sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."')";
                                 }
                             }
-                            else
-                            {
+                            else {
                                  $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def ";
                                  $sql .= " (id, entity, libelle, module, type, bydefault)";
                                  $sql .= " VALUES ";
@@ -1793,15 +1773,13 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                                 if ($result > 0) {
                                     $tmpuser->addrights($r_id, '', '', 0, 1);
                                 }
-                                else
-                                 {
+                                else {
                                     dol_syslog(get_class($this)."::insert_permissions Failed to add the permission to user because fetch return an error", LOG_ERR);
                                 }
                                  $i++;
                             }
                         }
-                        else
-                        {
+                        else {
                             dol_print_error($this->db);
                         }
                     }
@@ -1816,8 +1794,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
             }
             $this->db->free($resql);
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             $err++;
         }
@@ -1885,8 +1862,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
             if (!$this->menu[$key]['fk_menu']) {
                 $menu->fk_menu = 0;
             }
-            else
-            {
+            else {
                 $foundparent = 0;
                 $fk_parent = $this->menu[$key]['fk_menu'];
                 if (preg_match('/^r=/', $fk_parent))    // old deprecated method
@@ -1934,8 +1910,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                 if ($result > 0) {
                     $this->menu[$key]['rowid'] = $result;
                 }
-                else
-                {
+                else {
                     $this->error = $menu->error;
                     dol_syslog(get_class($this).'::insert_menus result='.$result." ".$this->error, LOG_ERR);
                     $err++;
@@ -1947,8 +1922,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         if (!$err) {
             $this->db->commit();
         }
-        else
-        {
+        else {
             dol_syslog(get_class($this)."::insert_menus ".$this->error, LOG_ERR);
             $this->db->rollback();
         }
@@ -2081,8 +2055,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                 $this->db->query($sql);
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             $err++;
         }
@@ -2153,7 +2126,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                         if (isset($value['entity'])) { $entity = $value['entity'];
                         }
                     }
-                    else    // when hook is declared with syntax 'hook'=>array('hookcontext1','hookcontext2',...)
+                    else // when hook is declared with syntax 'hook'=>array('hookcontext1','hookcontext2',...)
                     {
                         $newvalue = json_encode($value);
                     }
@@ -2184,8 +2157,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                          $error++;
                          $this->error = $this->db->lasterror();
                     }
-                    else
-                    {
+                    else {
                          dol_syslog(get_class($this)."::insert_module_parts for ".$this->const_name."_".strtoupper($key)." Record already exists.", LOG_WARNING);
                     }
                 }
@@ -2291,8 +2263,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 			if (preg_match('/^\//i', $this->picto)) print img_picto($alttext, $this->picto, 'class="inline-block valignmiddle"', 1);
 			else print img_object($alttext, $this->picto, 'class="inline-block valignmiddle"');
 		}
-		else
-		{
+		else {
 			print img_object($alttext, 'generic', 'class="inline-block valignmiddle"');
 		}
 
diff --git a/htdocs/core/modules/action/modules_action.php b/htdocs/core/modules/action/modules_action.php
index bf957175f84..ea3b961b63f 100644
--- a/htdocs/core/modules/action/modules_action.php
+++ b/htdocs/core/modules/action/modules_action.php
@@ -86,8 +86,7 @@ function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $h
 		{
 			$modele = $conf->global->ACTION_EVENT_ADDON_PDF;
 		}
-		else
-		{
+		else {
 			$modele = 'soleil';
 		}
 	}
@@ -142,15 +141,13 @@ function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $h
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$outputlangs->charset_output = $sav_charset_output;
 			dol_print_error($db, "action_pdf_create Error: ".$obj->error);
 			return 0;
 		}
 	}
-	else
-	{
+	else {
 		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 		return 0;
 	}
diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php
index b978bed1eab..0b489e7202c 100644
--- a/htdocs/core/modules/action/rapport.pdf.php
+++ b/htdocs/core/modules/action/rapport.pdf.php
@@ -295,8 +295,7 @@ class CommActionRapport
 				if ($obj->dp2) {
 					if (dol_print_date($this->db->jdate($obj->dp), "day") != dol_print_date($this->db->jdate($obj->dp2), "day"))
 						$textdate .= " -> ".dol_print_date($this->db->jdate($obj->dp2), "day")." - ".dol_print_date($this->db->jdate($obj->dp2), "hour");
-					else
-						$textdate .= " -> ".dol_print_date($this->db->jdate($obj->dp2), "hour");
+					else $textdate .= " -> ".dol_print_date($this->db->jdate($obj->dp2), "hour");
 				}
 				$textdate = $outputlangs->trans("ID").' '.$obj->id.' - '.$textdate;
 				$pdf->MultiCell(45 - $this->marge_gauche, $height, $textdate, 0, 'L', 0);
diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
index 1bf2b836269..dc19b2c0907 100644
--- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
@@ -119,8 +119,7 @@ class pdf_ban extends ModeleBankAccountDoc
 		        $dir = $conf->bank->dir_output;
 		        $file = $dir."/SPECIMEN.pdf";
 		    }
-		    else
-		    {
+		    else {
 		        $objectref = dol_sanitizeFileName($object->ref);
 		        $dir = $conf->bank->dir_output."/".$objectref;
 		        $file = $dir."/".$objectref.".pdf";
@@ -204,8 +203,7 @@ class pdf_ban extends ModeleBankAccountDoc
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
 				}
-				else
-				{
+				else {
 					$height_note = 0;
 				}
 
@@ -224,8 +222,7 @@ class pdf_ban extends ModeleBankAccountDoc
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
-				else
-				{
+				else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -263,8 +260,7 @@ class pdf_ban extends ModeleBankAccountDoc
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
@@ -332,8 +328,7 @@ class pdf_ban extends ModeleBankAccountDoc
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
-			else
-			{
+			else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index 23868eef643..8bcb06b72da 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -124,8 +124,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 		        else $dir = $conf->bank->dir_output;
 		        $file = $dir."/SPECIMEN.pdf";
 		    }
-		    else
-		    {
+		    else {
 		        $objectref = dol_sanitizeFileName($object->ref);
 		        if (!empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
 		        else $dir = $conf->bank->dir_output."/".$objectref;
@@ -210,8 +209,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
 				}
-				else
-				{
+				else {
 					$height_note = 0;
 				}
 
@@ -368,8 +366,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
-				else
-				{
+				else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -416,8 +413,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
@@ -567,8 +563,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
-			else
-			{
+			else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index 5b561f90c1c..b01df64c088 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -209,8 +209,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		{
 			$result = -2;
 		}
-		else
-		{
+		else {
 			if ($this->verif_syntax($code, $type) >= 0)
 			{
 				$is_dispo = $this->verif_dispo($db, $code, $product);
@@ -218,19 +217,16 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 				{
 					$result = -3;
 				}
-				else
-				{
+				else {
 					$result = 0;
 				}
 			}
-			else
-			{
+			else {
 				if (dol_strlen($code) == 0)
 				{
 					$result = -2;
 				}
-				else
-				{
+				else {
 					$result = -1;
 				}
 			}
@@ -264,13 +260,11 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 			{
 				return 0;
 			}
-			else
-			{
+			else {
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			return -2;
 		}
 	}
diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
index 9755369793e..4260cd4d8c4 100644
--- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
+++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
@@ -130,8 +130,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -268,8 +267,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
-				else
-				{
+				else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -302,8 +300,7 @@ class doc_generic_bom_odt extends ModelePDFBom
             			$contactobject = $object->contact;
                     }
 				}
-				else
-				{
+				else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -386,7 +383,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else    // Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -397,8 +394,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
@@ -422,8 +418,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
 								catch (OdfException $e)
@@ -497,8 +492,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 
 				return 1; // Success
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/bom/mod_bom_standard.php b/htdocs/core/modules/bom/mod_bom_standard.php
index 08acd30451c..2246412997b 100644
--- a/htdocs/core/modules/bom/mod_bom_standard.php
+++ b/htdocs/core/modules/bom/mod_bom_standard.php
@@ -130,8 +130,7 @@ class mod_bom_standard extends ModeleNumRefboms
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
 		}
-		else
-		{
+		else {
 			dol_syslog("mod_bom_standard::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
index daa2e04366d..ea431b5a2ce 100644
--- a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
@@ -127,8 +127,7 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
 		}
-		else
-		{
+		else {
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/cheque/modules_chequereceipts.php b/htdocs/core/modules/cheque/modules_chequereceipts.php
index 7cc72a865d8..bbe9bc119a4 100644
--- a/htdocs/core/modules/cheque/modules_chequereceipts.php
+++ b/htdocs/core/modules/cheque/modules_chequereceipts.php
@@ -179,8 +179,7 @@ function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs)
 		{
 			$modele = $conf->global->CHEQUERECEIPT_ADDON_PDF;
 		}
-		else
-		{
+		else {
 			//print $langs->trans("Error")." ".$langs->trans("Error_FACTURE_ADDON_PDF_NotDefined");
 			//return 0;
 			$modele = 'blochet';
@@ -204,15 +203,13 @@ function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs)
 			$outputlangs->charset_output = $sav_charset_output;
 			return 1;
 		}
-		else
-		{
+		else {
 			$outputlangs->charset_output = $sav_charset_output;
 			dol_print_error($db, "chequereceipt_pdf_create Error: ".$obj->error);
 			return -1;
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error('', $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $dir.$file));
 		return -1;
 	}
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 75c5103c4ab..f992996403a 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -137,8 +137,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -280,8 +279,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
-				else
-				{
+				else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -314,8 +312,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
             			$contactobject = $object->contact;
                     }
 				}
-				else
-				{
+				else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -402,7 +399,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else    // Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -413,8 +410,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
@@ -438,8 +434,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
 								catch (OdfException $e)
@@ -513,8 +508,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 
 				return 1; // Success
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 3838b9146e6..f5568452221 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -173,8 +173,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$this->posxqty = 135;
 			$this->posxunit = 151;
 		}
-		else
-		{
+		else {
 			$this->posxtva = 110;
 			$this->posxup = 126;
 			$this->posxqty = 145;
@@ -240,8 +239,7 @@ class pdf_einstein extends ModelePDFCommandes
 				$dir = $conf->commande->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->commande->multidir_output[$object->entity]."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -441,17 +439,15 @@ class pdf_einstein extends ModelePDFCommandes
 								$pdf->setPage($pageposafter + 1);
 							}
 						}
-						else
-						{
+						else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 						}
 					}
-					else	// No pagebreak
+					else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -567,8 +563,7 @@ class pdf_einstein extends ModelePDFCommandes
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -583,8 +578,7 @@ class pdf_einstein extends ModelePDFCommandes
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -599,8 +593,7 @@ class pdf_einstein extends ModelePDFCommandes
 				// Show square
 				if ($pagenb == 1)
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
-				else
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+				else $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 				$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
 				// Affiche zone infos
@@ -643,14 +636,12 @@ class pdf_einstein extends ModelePDFCommandes
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "COMMANDE_OUTPUTDIR");
 			return 0;
 		}
@@ -915,8 +906,7 @@ class pdf_einstein extends ModelePDFCommandes
 			{
 				// Nothing to do
 			}
-			else
-			{
+			else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1282,16 +1272,14 @@ class pdf_einstein extends ModelePDFCommandes
 				    $height = pdf_getHeightForLogo($logo);
 				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 				}
-				else
-				{
+				else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
 			}
-			else
-			{
+			else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 1910dd0c048..dc13ad237b7 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -233,8 +233,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		            $pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 		            $pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 		        }
-		        else
-		        {
+		        else {
 		            $pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
 		            $pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 		        }
@@ -254,13 +253,11 @@ class pdf_eratosthene extends ModelePDFCommandes
 		                        {
 		                            $filename = $obj['photo_vignette'];
 		                        }
-		                        else
-		                        {
+		                        else {
 		                            $filename = $obj['photo'];
 		                        }
 		                    }
-		                    else
-		                    {
+		                    else {
 		                        $filename = $obj['photo'];
 		                    }
 
@@ -289,8 +286,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$dir = $conf->commande->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->commande->multidir_output[$object->entity]."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -532,8 +528,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				    $tab_height = $tab_height - $height_note;
 				    $tab_top = $posyafter + 6;
 				}
-				else
-				{
+				else {
 					$height_note = 0;
 				}
 
@@ -583,8 +578,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 					    }
 
 					    if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
@@ -622,17 +616,15 @@ class pdf_eratosthene extends ModelePDFCommandes
     								$pdf->setPage($pageposafter + 1);
     							}
     						}
-    						else
-    						{
+    						else {
     							// We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
-								else
-									$showpricebeforepagebreak = 0;
+								else $showpricebeforepagebreak = 0;
     						}
     					}
-    					else	// No pagebreak
+    					else // No pagebreak
     					{
     						$pdf->commitTransaction();
     					}
@@ -785,8 +777,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 						{
 						    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -801,8 +792,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 						{
 						    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
 					    }
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -817,8 +807,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				// Show square
 				if ($pagenb == $pageposbeforeprintlines)
 				    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
-				else
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+				else $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 				$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
 				// Affiche zone infos
@@ -861,14 +850,12 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "COMMANDE_OUTPUTDIR");
 			return 0;
 		}
@@ -1130,8 +1117,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			{
 				// Nothing to do
 			}
-			else
-			{
+			else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1450,16 +1436,14 @@ class pdf_eratosthene extends ModelePDFCommandes
 				    $height = pdf_getHeightForLogo($logo);
 				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 				}
-				else
-				{
+				else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
 			}
-			else
-			{
+			else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
@@ -1853,8 +1837,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 	    {
 	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 	    }
-	    else
-	    {
+	    else {
 	        $this->cols = $hookmanager->resArray;
 	    }
     }
diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php
index 87e5666be4b..a5558f2d0b2 100644
--- a/htdocs/core/modules/commande/mod_commande_marbre.php
+++ b/htdocs/core/modules/commande/mod_commande_marbre.php
@@ -130,8 +130,7 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
 		}
-		else
-		{
+		else {
 			dol_syslog("mod_commande_marbre::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index c938f40cfb2..b5bc55633ee 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -136,8 +136,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -267,8 +266,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
-				else
-				{
+				else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -301,8 +299,7 @@ class doc_generic_contract_odt extends ModelePDFContract
                         $contactobject = $object->contact;
                     }
 				}
-				else
-				{
+				else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -382,7 +379,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else    // Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -394,8 +391,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				}
 
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
@@ -419,8 +415,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
 								catch (OdfException $e)
@@ -490,8 +485,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 
 				return 1; // Success
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index f8b7908654b..68c8cd1b96c 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -194,8 +194,7 @@ class pdf_strato extends ModelePDFContract
 				$dir = $conf->contrat->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->contrat->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -388,18 +387,16 @@ class pdf_strato extends ModelePDFContract
 									$pdf->setPage($pageposafter + 1);
 								}
 							}
-							else
-							{
+							else {
 								// We found a page break
 
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
-								else
-									$showpricebeforepagebreak = 0;
+								else $showpricebeforepagebreak = 0;
 							}
 						}
-						else	// No pagebreak
+						else // No pagebreak
 						{
 							$pdf->commitTransaction();
 						}
@@ -426,8 +423,7 @@ class pdf_strato extends ModelePDFContract
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext, 0, $outputlangs, 0, 1);
 							}
-							else
-							{
+							else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter - $heightforfreetext, 0, $outputlangs, 1, 1);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -442,8 +438,7 @@ class pdf_strato extends ModelePDFContract
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext, 0, $outputlangs, 0, 1);
 							}
-							else
-							{
+							else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter - $heightforfreetext, 0, $outputlangs, 1, 1);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -462,8 +457,7 @@ class pdf_strato extends ModelePDFContract
 					$this->tabSignature($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, $outputlangs);
 					$bottomlasttab = $this->page_hauteur - $heightforfooter - $heightforfooter + 1;
 				}
-				else
-				{
+				else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$this->tabSignature($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, $outputlangs);
 					$bottomlasttab = $this->page_hauteur - $heightforfooter - $heightforfooter + 1;
@@ -499,14 +493,12 @@ class pdf_strato extends ModelePDFContract
 
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "CONTRACT_OUTPUTDIR");
 			return 0;
 		}
@@ -636,16 +628,14 @@ class pdf_strato extends ModelePDFContract
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
-			else
-			{
+			else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
 		}
-		else
-		{
+		else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php
index 52950778738..2becdf52219 100644
--- a/htdocs/core/modules/contract/mod_contract_serpis.php
+++ b/htdocs/core/modules/contract/mod_contract_serpis.php
@@ -139,8 +139,7 @@ class mod_contract_serpis extends ModelNumRefContracts
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
 		}
-		else
-		{
+		else {
 			dol_syslog("mod_contract_serpis::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index 4c025750f04..d3ee39e8a5f 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -104,8 +104,7 @@ class html_cerfafr extends ModeleDon
 				$dir = $conf->don->dir_output;
 				$file = $dir."/SPECIMEN.html";
 			}
-			else
-			{
+			else {
 				$donref = dol_sanitizeFileName($don->ref);
 				$dir = $conf->don->dir_output."/".$donref;
 				$file = $dir."/".$donref.".html";
@@ -142,8 +141,7 @@ class html_cerfafr extends ModeleDon
 				elseif ($don->modepaymentcode == 'VIR' || $don->modepaymentcode == 'PRE' || $don->modepaymentcode == 'CB') {
 					$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox" checked="checked"> Virement, prélèvement, carte bancaire</td>';
 				}
-				else
-				{
+				else {
 					$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
 				}
 
@@ -217,8 +215,7 @@ class html_cerfafr extends ModeleDon
 					{
 						$art200 = '<input type="checkbox" disabled="true" checked="checked" >200 du CGI';
 					}
-					else
-					{
+					else {
 						$art200 = '<input type="checkbox" disabled="true">200 du CGI';
 					}
 				}
@@ -230,8 +227,7 @@ class html_cerfafr extends ModeleDon
 					{
 						$art238 = '<input type="checkbox" disabled="true" checked="checked" >238 bis du CGI';
 					}
-					else
-					{
+					else {
 						$art238 = '<input type="checkbox" disabled="true">238 bis du CGI';
 					}
 				}
@@ -243,8 +239,7 @@ class html_cerfafr extends ModeleDon
 					{
 						$art978 = '<input type="checkbox" disabled="true" checked="checked" >978 du CGI';
 					}
-					else
-					{
+					else {
 						$art978 = '<input type="checkbox" disabled="true">978 du CGI';
 					}
 				}
@@ -262,14 +257,12 @@ class html_cerfafr extends ModeleDon
 
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "DON_OUTPUTDIR");
 			return 0;
 		}
@@ -412,15 +405,13 @@ class html_cerfafr extends ModeleDon
 			$somme = $trio[3].'  '.$secon[3].' '.$prim[3].' million ';
 		elseif (($cent[3] != 0 && $cent[3] != '') || ($dix[3] != 0 && $dix[3] != '') || ($unite[3] != 0 && $unite[3] != ''))
 			$somme = $trio[3].' '.$secon[3].' '.$prim[3].' millions ';
-		else
-			$somme = $trio[3].' '.$secon[3].' '.$prim[3];
+		else $somme = $trio[3].' '.$secon[3].' '.$prim[3];
 
 		if (($cent[2] == 0 || $cent[2] == '') && ($dix[2] == 0 || $dix[2] == '') && ($unite[2] == 1))
 			$somme = $somme.' mille ';
 		elseif (($cent[2] != 0 && $cent[2] != '') || ($dix[2] != 0 && $dix[2] != '') || ($unite[2] != 0 && $unite[2] != ''))
 			$somme = $somme.$trio[2].' '.$secon[2].' '.$prim[2].' milles ';
-		else
-			$somme = $somme.$trio[2].' '.$secon[2].' '.$prim[2];
+		else $somme = $somme.$trio[2].' '.$secon[2].' '.$prim[2];
 
 		$somme = $somme.$trio[1].' '.$secon[1].' '.$prim[1];
 
@@ -428,7 +419,6 @@ class html_cerfafr extends ModeleDon
 
 		if (($cent_c == '0' || $cent_c == '') && ($dix_c == '0' || $dix_c == ''))
 			return $somme.' et z&eacute;ro '.$dev2;
-		else
-			return $somme.$trio_c.' '.$secon_c.' '.$dev2;
+		else return $somme.$trio_c.' '.$secon_c.' '.$dev2;
 	}
 }
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index 1ea817709e1..a9be573f80d 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -138,8 +138,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -280,8 +279,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
-				else
-				{
+				else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -385,7 +383,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else    // Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -407,7 +405,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else	// Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -431,7 +429,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else	// Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -452,7 +450,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 								if (file_exists($value)) $odfHandler->setImage($key, $value);
 								else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-							else	// Text
+							else // Text
 							{
 								$odfHandler->setVars($key, $value, true, 'UTF-8');
 							}
@@ -478,7 +476,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else    // Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -489,8 +487,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
@@ -512,8 +509,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
 								catch (OdfException $e)
@@ -585,8 +581,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 
 				return 1; // Success
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index c232edbe81c..2aa28f3b7db 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -196,8 +196,7 @@ class pdf_espadon extends ModelePdfExpedition
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product') . $object->lines[$i]->fk_product ."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
-				else
-				{
+				else {
 					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product') . dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
@@ -212,13 +211,11 @@ class pdf_espadon extends ModelePdfExpedition
                         {
                             $filename = $obj['photo_vignette'];
                         }
-                        else
-                        {
+                        else {
                             $filename = $obj['photo'];
                         }
                     }
-                    else
-                    {
+                    else {
                         $filename = $obj['photo'];
                     }
 
@@ -241,8 +238,7 @@ class pdf_espadon extends ModelePdfExpedition
 				$dir = $conf->expedition->dir_output."/sending";
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$expref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output."/sending/".$expref;
 				$file = $dir."/".$expref.".pdf";
@@ -413,8 +409,7 @@ class pdf_espadon extends ModelePdfExpedition
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
 				}
-				else
-				{
+				else {
 					$height_note = 0;
 				}
 
@@ -464,8 +459,7 @@ class pdf_espadon extends ModelePdfExpedition
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 					    }
 
 
@@ -504,17 +498,15 @@ class pdf_espadon extends ModelePdfExpedition
 					                $pdf->setPage($pageposafter + 1);
 					            }
 					        }
-					        else
-					        {
+					        else {
 					            // We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
-								else
-									$showpricebeforepagebreak = 0;
+								else $showpricebeforepagebreak = 0;
 					        }
 					    }
-					    else	// No pagebreak
+					    else // No pagebreak
 					    {
 					        $pdf->commitTransaction();
 					    }
@@ -608,8 +600,7 @@ class pdf_espadon extends ModelePdfExpedition
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -624,8 +615,7 @@ class pdf_espadon extends ModelePdfExpedition
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -643,8 +633,7 @@ class pdf_espadon extends ModelePdfExpedition
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
-				else
-				{
+				else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -678,14 +667,12 @@ class pdf_espadon extends ModelePdfExpedition
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "EXP_OUTPUTDIR");
 			return 0;
 		}
@@ -889,16 +876,14 @@ class pdf_espadon extends ModelePdfExpedition
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
-			else
-			{
+			else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
 		}
-		else
-		{
+		else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -908,8 +893,7 @@ class pdf_espadon extends ModelePdfExpedition
 		{
 			$posx = 105;
 		}
-		else
-		{
+		else {
 			$posx = $this->marge_gauche + 3;
 		}
 		//$pdf->Rect($this->marge_gauche, $this->marge_haute, $this->page_largeur-$this->marge_gauche-$this->marge_droite, 30);
@@ -1275,8 +1259,7 @@ class pdf_espadon extends ModelePdfExpedition
 	    {
 	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 	    }
-	    else
-	    {
+	    else {
 	        $this->cols = $hookmanager->resArray;
 	    }
 	}
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index 7899df494fc..bd698d72519 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -193,8 +193,7 @@ class pdf_merou extends ModelePdfExpedition
 				$dir = $conf->expedition->dir_output."/sending";
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$expref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output."/sending/".$expref;
 				$file = $dir."/".$expref.".pdf";
@@ -288,8 +287,7 @@ class pdf_merou extends ModelePdfExpedition
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
 				}
-				else
-				{
+				else {
 					$height_note = 0;
 				}
 
@@ -366,8 +364,7 @@ class pdf_merou extends ModelePdfExpedition
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -381,8 +378,7 @@ class pdf_merou extends ModelePdfExpedition
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -398,8 +394,7 @@ class pdf_merou extends ModelePdfExpedition
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
-				else
-				{
+				else {
 					$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -435,14 +430,12 @@ class pdf_merou extends ModelePdfExpedition
 
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = $outputlangs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $outputlangs->transnoentities("ErrorConstantNotDefined", "EXP_OUTPUTDIR");
 			return 0;
 		}
@@ -564,16 +557,14 @@ class pdf_merou extends ModelePdfExpedition
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, 10, 5, 0, $height); // width=0 (auto)
 			}
-			else
-			{
+			else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
 		}
-		else
-		{
+		else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(70, 3, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -673,8 +664,7 @@ class pdf_merou extends ModelePdfExpedition
 				}
 			}
 		}
-		else
-		{
+		else {
 			$pdf->MultiCell(50, 8, $outputlangs->transnoentities("Deliverer")." ".$outputlangs->convToOutputCharset($this->livreur->getFullName($outputlangs)), '', 'L');
 		}
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 2e0733f1ba2..99dfd20301f 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -219,8 +219,7 @@ class pdf_rouget extends ModelePdfExpedition
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
-				else
-				{
+				else {
 					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
@@ -234,13 +233,11 @@ class pdf_rouget extends ModelePdfExpedition
                         {
                             $filename = $obj['photo_vignette'];
                         }
-                        else
-                        {
+                        else {
                             $filename = $obj['photo'];
                         }
                     }
-                    else
-                    {
+                    else {
                         $filename = $obj['photo'];
                     }
 
@@ -262,8 +259,7 @@ class pdf_rouget extends ModelePdfExpedition
 				$dir = $conf->expedition->dir_output."/sending";
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$expref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output."/sending/".$expref;
 				$file = $dir."/".$expref.".pdf";
@@ -422,8 +418,7 @@ class pdf_rouget extends ModelePdfExpedition
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
 				}
-				else
-				{
+				else {
 					$height_note = 0;
 				}
 
@@ -463,8 +458,7 @@ class pdf_rouget extends ModelePdfExpedition
 						// Allows data in the first page if description is long enough to break in multiples pages
 						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 							$showpricebeforepagebreak = 1;
-						else
-							$showpricebeforepagebreak = 0;
+						else $showpricebeforepagebreak = 0;
 					}
 
 					if (isset($imglinesize['width']) && isset($imglinesize['height']))
@@ -503,18 +497,16 @@ class pdf_rouget extends ModelePdfExpedition
 								$pdf->setPage($pageposafter + 1);
 							}
 						}
-						else
-						{
+						else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 						}
 					}
-					else	// No pagebreak
+					else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -599,8 +591,7 @@ class pdf_rouget extends ModelePdfExpedition
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -615,8 +606,7 @@ class pdf_rouget extends ModelePdfExpedition
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -634,8 +624,7 @@ class pdf_rouget extends ModelePdfExpedition
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
-				else
-				{
+				else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -669,14 +658,12 @@ class pdf_rouget extends ModelePdfExpedition
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "EXP_OUTPUTDIR");
 			return 0;
 		}
@@ -924,16 +911,14 @@ class pdf_rouget extends ModelePdfExpedition
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
-			else
-			{
+			else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
 		}
-		else
-		{
+		else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -943,8 +928,7 @@ class pdf_rouget extends ModelePdfExpedition
 		{
 			$posx = 105;
 		}
-		else
-		{
+		else {
 			$posx = $this->marge_gauche + 3;
 		}
 		//$pdf->Rect($this->marge_gauche, $this->marge_haute, $this->page_largeur-$this->marge_gauche-$this->marge_droite, 30);
diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php
index afbeec748ea..f2d49ba6409 100644
--- a/htdocs/core/modules/expedition/mod_expedition_safor.php
+++ b/htdocs/core/modules/expedition/mod_expedition_safor.php
@@ -134,8 +134,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
 		}
-		else
-		{
+		else {
 			dol_syslog("mod_expedition_safor::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 3a66a8ae961..91539b979c2 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -227,8 +227,7 @@ class pdf_standard extends ModeleExpenseReport
 				$dir = $conf->expensereport->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expensereport->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -340,8 +339,7 @@ class pdf_standard extends ModeleExpenseReport
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
 				}
-				else
-				{
+				else {
 					$height_note = 0;
 				}
 
@@ -410,17 +408,15 @@ class pdf_standard extends ModeleExpenseReport
 								$pdf->setPage($pageposafter + 1);
 							}
 						}
-						else
-						{
+						else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 						}
 					}
-					else	// No pagebreak
+					else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -459,8 +455,7 @@ class pdf_standard extends ModeleExpenseReport
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -475,8 +470,7 @@ class pdf_standard extends ModeleExpenseReport
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -493,8 +487,7 @@ class pdf_standard extends ModeleExpenseReport
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
-				else
-				{
+				else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -561,14 +554,12 @@ class pdf_standard extends ModeleExpenseReport
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "EXPENSEREPORT_OUTPUTDIR");
 			return 0;
 		}
@@ -710,8 +701,7 @@ class pdf_standard extends ModeleExpenseReport
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
 		}
-		else
-		{
+		else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -858,8 +848,7 @@ class pdf_standard extends ModeleExpenseReport
 					$pdf->MultiCell(96, 4, $outputlangs->transnoentities("DATE_CANCEL")." : ".dol_print_date($object->date_cancel, "day", false, $outputlangs), 0, 'L');
 				}
 			}
-			else
-			{
+			else {
 				if ($object->fk_user_approve > 0) {
 					$userfee = new User($this->db);
 					$userfee->fetch($object->fk_user_approve); $posy += 6;
@@ -1106,8 +1095,7 @@ class pdf_standard extends ModeleExpenseReport
 				$pdf->MultiCell(30, 4, $outputlangs->transnoentitiesnoconv("RemainderToPay"), 0, 'L', 0);
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_jade.php b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
index 9093e55f78f..bae163227e4 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_jade.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
@@ -187,8 +187,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
 		}
-		else
-		{
+		else {
 			dol_syslog("mod_expensereport_jade::getNextValue", LOG_DEBUG);
 			return 0;
 		}
diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php
index 5124cb3f160..0e57634f488 100644
--- a/htdocs/core/modules/export/export_csv.modules.php
+++ b/htdocs/core/modules/export/export_csv.modules.php
@@ -218,8 +218,7 @@ class ExportCsv extends ModeleExports
 		{
 			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
 		}
-		else
-		{
+		else {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -254,8 +253,7 @@ class ExportCsv extends ModeleExports
 		{
 			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
 		}
-		else
-		{
+		else {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
diff --git a/htdocs/core/modules/export/export_excel2007new.modules.php b/htdocs/core/modules/export/export_excel2007new.modules.php
index 779f2240155..a96d51634b0 100644
--- a/htdocs/core/modules/export/export_excel2007new.modules.php
+++ b/htdocs/core/modules/export/export_excel2007new.modules.php
@@ -274,8 +274,7 @@ class ExportExcel2007new extends ModeleExports
     		{
     			$this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
     		}
-    		else
-    		{
+    		else {
                 $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $outputlangs->transnoentities($alias));
     		    if (!empty($array_types[$code]) && in_array($array_types[$code], array('Date', 'Numeric', 'TextAuto')))		// Set autowidth for some types
                 {
@@ -333,8 +332,7 @@ class ExportExcel2007new extends ModeleExports
 			{
 				$newvalue = $outputlangs->transnoentities($reg[1]);
 			}
-			else
-			{
+			else {
 				$newvalue = $outputlangs->convToOutputCharset($newvalue);
 			}
 
@@ -352,8 +350,7 @@ class ExportExcel2007new extends ModeleExports
         	    $coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
         	    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd h:mm:ss');
 			}
-			else
-			{
+			else {
     	    	if ($typefield == 'Text' || $typefield == 'TextAuto')
     	    	{
     	    		//$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->setValueExplicit($newvalue, PHPExcel_Cell_DataType::TYPE_STRING);
@@ -362,8 +359,7 @@ class ExportExcel2007new extends ModeleExports
     	    		$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
     	    		$this->workbook->getActiveSheet()->getStyle($coord)->getAlignment()->setHorizontal(PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_LEFT);
     	    	}
-    	    	else
-    	    	{
+    	    	else {
     	    		$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $newvalue);
     	    	}
 			}
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index acbebd54da8..a25f07384a3 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -137,8 +137,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -280,8 +279,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
-				else
-				{
+				else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -410,7 +408,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else    // Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -421,8 +419,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
@@ -446,8 +443,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
 								catch (OdfException $e)
@@ -519,8 +515,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 
 				return 1; // Success
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index cf91ec4806c..ea5376981a4 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -184,8 +184,7 @@ class pdf_crabe extends ModelePDFFactures
 			$this->posxqty = 135;
 			$this->posxunit = 151;
 		}
-		else
-		{
+		else {
 			$this->posxtva = 110;
 			$this->posxup = 126;
 			$this->posxqty = 145;
@@ -288,8 +287,7 @@ class pdf_crabe extends ModelePDFFactures
 				$dir = $conf->facture->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->facture->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -518,8 +516,7 @@ class pdf_crabe extends ModelePDFFactures
 						// Allows data in the first page if description is long enough to break in multiples pages
 						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 							$showpricebeforepagebreak = 1;
-						else
-							$showpricebeforepagebreak = 0;
+						else $showpricebeforepagebreak = 0;
 					}
 
 					if (isset($imglinesize['width']) && isset($imglinesize['height']))
@@ -556,18 +553,16 @@ class pdf_crabe extends ModelePDFFactures
 								$pdf->setPage($pageposafter + 1);
 							}
 						}
-						else
-						{
+						else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 						}
 					}
-					else	// No pagebreak
+					else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -701,8 +696,7 @@ class pdf_crabe extends ModelePDFFactures
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -717,8 +711,7 @@ class pdf_crabe extends ModelePDFFactures
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -736,8 +729,7 @@ class pdf_crabe extends ModelePDFFactures
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
-				else
-				{
+				else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -780,14 +772,12 @@ class pdf_crabe extends ModelePDFFactures
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
 			return 0;
 		}
@@ -882,8 +872,7 @@ class pdf_crabe extends ModelePDFFactures
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -936,8 +925,7 @@ class pdf_crabe extends ModelePDFFactures
 
 			return $tab3_top + $y + 3;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1216,8 +1204,7 @@ class pdf_crabe extends ModelePDFFactures
 			{
 				// Nothing to do
 			}
-			else
-			{
+			else {
 			    // FIXME amount of vat not supported with multicurrency
 
 				//Local tax 1 before VAT
@@ -1663,16 +1650,14 @@ class pdf_crabe extends ModelePDFFactures
 				    $height = pdf_getHeightForLogo($logo);
 					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 				}
-				else
-				{
+				else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
 			}
-			else
-			{
+			else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 8f48f31fddb..acdb6063d5f 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -251,8 +251,7 @@ class pdf_sponge extends ModelePDFFactures
 	                $pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 	                $pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 	            }
-	            else
-	            {
+	            else {
 	                $pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
 	                $pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 	            }
@@ -272,13 +271,11 @@ class pdf_sponge extends ModelePDFFactures
 	                            {
 	                                $filename = $obj['photo_vignette'];
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                $filename = $obj['photo'];
 	                            }
 	                        }
-	                        else
-	                        {
+	                        else {
 	                            $filename = $obj['photo'];
 	                        }
 
@@ -309,8 +306,7 @@ class pdf_sponge extends ModelePDFFactures
 	            $dir = $conf->facture->dir_output;
 	            $file = $dir."/SPECIMEN.pdf";
 	        }
-	        else
-	        {
+	        else {
 	            $objectref = dol_sanitizeFileName($object->ref);
 	            $dir = $conf->facture->dir_output."/".$objectref;
 	            $file = $dir."/".$objectref.".pdf";
@@ -586,8 +582,7 @@ class pdf_sponge extends ModelePDFFactures
 	                $tab_height = $tab_height - $height_note;
 	                $tab_top = $posyafter + 6;
 	            }
-	            else
-	            {
+	            else {
 	                $height_note = 0;
 	            }
 
@@ -635,8 +630,7 @@ class pdf_sponge extends ModelePDFFactures
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
     	                }
 
     	                if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
@@ -674,17 +668,15 @@ class pdf_sponge extends ModelePDFFactures
     	                            $pdf->setPage($pageposafter + 1);
     	                        }
     	                    }
-    	                    else
-    	                    {
+    	                    else {
     	                        // We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
-								else
-									$showpricebeforepagebreak = 0;
+								else $showpricebeforepagebreak = 0;
     	                    }
     	                }
-    	                else	// No pagebreak
+    	                else // No pagebreak
     	                {
     	                    $pdf->commitTransaction();
     	                }
@@ -849,8 +841,7 @@ class pdf_sponge extends ModelePDFFactures
                         if ($pagenb == $pageposbeforeprintlines) {
                             $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
                         }
-                        else
-                        {
+                        else {
                         	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
                         }
                         $this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -864,8 +855,7 @@ class pdf_sponge extends ModelePDFFactures
                         if ($pagenb == $pageposafter) {
                         	$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
                         }
-                        else
-                        {
+                        else {
                         	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
                         }
                         $this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -883,8 +873,7 @@ class pdf_sponge extends ModelePDFFactures
 	            	$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code, $outputlangsbis);
 	                $bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 	            }
-	            else
-	            {
+	            else {
 	            	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code, $outputlangsbis);
 	                $bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 	            }
@@ -927,14 +916,12 @@ class pdf_sponge extends ModelePDFFactures
 
 	                return 1; // No error
 	        }
-	        else
-	        {
+	        else {
 	            $this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 	            return 0;
 	        }
 	    }
-	    else
-	    {
+	    else {
 	        $this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
 	        return 0;
 	    }
@@ -1032,8 +1019,7 @@ class pdf_sponge extends ModelePDFFactures
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1075,8 +1061,7 @@ class pdf_sponge extends ModelePDFFactures
 
 			return $tab3_top + $y + 3;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1474,8 +1459,7 @@ class pdf_sponge extends ModelePDFFactures
 			{
 				// Nothing to do
 			}
-			else
-			{
+			else {
 			    // FIXME amount of vat not supported with multicurrency
 
 				//Local tax 1 before VAT
@@ -1909,16 +1893,14 @@ class pdf_sponge extends ModelePDFFactures
 				    $height = pdf_getHeightForLogo($logo);
 					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 				}
-				else
-				{
+				else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
 			}
-			else
-			{
+			else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
@@ -2396,8 +2378,7 @@ class pdf_sponge extends ModelePDFFactures
 	    {
 	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 	    }
-	    else
-	    {
+	    else {
 	        $this->cols = $hookmanager->resArray;
 	    }
 	}
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index 6b4b5f0451d..ae349f6f5cb 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -174,8 +174,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index caa47db3529..c16e751d7db 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -203,8 +203,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index d7509feff7c..a88e3c32bf3 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -186,8 +186,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				$dir = $conf->ficheinter->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->ficheinter->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -289,8 +288,7 @@ class pdf_soleil extends ModelePDFFicheinter
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
 				}
-				else
-				{
+				else {
 					$height_note = 0;
 				}
 
@@ -378,7 +376,7 @@ class pdf_soleil extends ModelePDFFicheinter
 								}
 							}
 						}
-						else	// No pagebreak
+						else // No pagebreak
 						{
 							$pdf->commitTransaction();
 						}
@@ -404,8 +402,7 @@ class pdf_soleil extends ModelePDFFicheinter
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 							}
-							else
-							{
+							else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -420,8 +417,7 @@ class pdf_soleil extends ModelePDFFicheinter
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 							}
-							else
-							{
+							else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -440,8 +436,7 @@ class pdf_soleil extends ModelePDFFicheinter
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
-				else
-				{
+				else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -470,14 +465,12 @@ class pdf_soleil extends ModelePDFFicheinter
 
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "FICHEINTER_OUTPUTDIR");
 			return 0;
 		}
@@ -591,16 +584,14 @@ class pdf_soleil extends ModelePDFFicheinter
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
-			else
-			{
+			else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
 		}
-		else
-		{
+		else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php
index b592e65b0d3..5a56b849e5f 100644
--- a/htdocs/core/modules/fichinter/mod_pacific.php
+++ b/htdocs/core/modules/fichinter/mod_pacific.php
@@ -107,8 +107,7 @@ class mod_pacific extends ModeleNumRefFicheinter
 		{
 			return true;
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php
index 140ce27cf03..b3b5906f683 100644
--- a/htdocs/core/modules/fichinter/modules_fichinter.php
+++ b/htdocs/core/modules/fichinter/modules_fichinter.php
@@ -179,8 +179,7 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails = 0,
 		{
 			$modele = $conf->global->FICHEINTER_ADDON_PDF;
 		}
-		else
-		{
+		else {
 			$modele = 'soleil';
 		}
 	}
@@ -235,15 +234,13 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails = 0,
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$outputlangs->charset_output = $sav_charset_output;
 			dol_print_error($db, "fichinter_pdf_create Error: ".$obj->error);
 			return 0;
 		}
 	}
-	else
-	{
+	else {
 		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 		return 0;
 	}
diff --git a/htdocs/core/modules/holiday/mod_holiday_madonna.php b/htdocs/core/modules/holiday/mod_holiday_madonna.php
index 3de92c4a05e..90c419bd260 100644
--- a/htdocs/core/modules/holiday/mod_holiday_madonna.php
+++ b/htdocs/core/modules/holiday/mod_holiday_madonna.php
@@ -140,8 +140,7 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
 		}
-		else
-		{
+		else {
 			dol_syslog("mod_holiday_madonna::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index de32e84d43a..2e8d1d80097 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -199,8 +199,7 @@ class ImportCsv extends ModeleImports
 			$this->error = $langs->trans("ErrorFailToOpenFile", $file);
 			$ret = -1;
 		}
-		else
-		{
+		else {
 			$this->file = $file;
 		}
 
@@ -265,21 +264,19 @@ class ImportCsv extends ModeleImports
 						$newarrayres[$key]['val'] = $val;
 						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					}
-					else
-					{
+					else {
 						$newarrayres[$key]['val'] = utf8_encode($val);
 						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					}
 				}
-				else	// Autodetect format (UTF8 or ISO)
+				else // Autodetect format (UTF8 or ISO)
 				{
 					if (utf8_check($val))
 					{
 						$newarrayres[$key]['val'] = $val;
 						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					}
-					else
-					{
+					else {
 						$newarrayres[$key]['val'] = utf8_encode($val);
 						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					}
@@ -347,8 +344,7 @@ class ImportCsv extends ModeleImports
 			$this->warnings[$warning]['type'] = 'EMPTY';
 			$warning++;
 		}
-		else
-		{
+		else {
 			$last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
 			$updatedone = false;
 			$insertdone = false;
@@ -375,8 +371,7 @@ class ImportCsv extends ModeleImports
 					}
 					else dol_print_error($this->db);
 				}
-				else
-				{
+				else {
 					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
 				}
 
@@ -411,8 +406,7 @@ class ImportCsv extends ModeleImports
 							$error++;
 						}
 						// Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
-						else
-						{
+						else {
 						    // We convert field if required
 						    if (!empty($objimport->array_import_convertvalue[0][$val]))
 						    {
@@ -438,8 +432,7 @@ class ImportCsv extends ModeleImports
                                         {
                                         	$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
                                         }
-                                        else
-										{
+                                        else {
                                             $resultload = dol_include_once($file);
                                             if (empty($resultload))
                                             {
@@ -478,8 +471,7 @@ class ImportCsv extends ModeleImports
                                             {
                                                 $newval = $classinstance->id;
                                             }
-                                            else
-                                            {
+                                            else {
                                                 if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
                                                 elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
                                                 else $this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
@@ -542,8 +534,7 @@ class ImportCsv extends ModeleImports
                                 	{
                                 		$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval];
                                 	}
-                                	else
-                                	{
+                                	else {
                                 		$resultload = dol_include_once($file);
                                 		if (empty($resultload))
                                 		{
@@ -560,8 +551,7 @@ class ImportCsv extends ModeleImports
                                 		{
                                 			$newval = $scaleorid ? $scaleorid : 0;
                                 		}
-                                		else
-                                		{
+                                		else {
                                 			if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
                                 			else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
                                 			$this->errors[$error]['type'] = 'FOREIGNKEY';
@@ -688,8 +678,7 @@ class ImportCsv extends ModeleImports
 												$i++;
 											}
 										}
-										else
-										{
+										else {
 											dol_print_error($this->db);
 										}
 									}
@@ -761,8 +750,7 @@ class ImportCsv extends ModeleImports
     				    	$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
     				    	$listvalues[] = "'".$tmp[1]."'";
     				    }
-    				    else
-    				    {
+    				    else {
     				    	$this->errors[$error]['lib'] = 'Bad value of profile setup '.$val.' for array_import_fieldshidden';
     				    	$this->errors[$error]['type'] = 'Import profile setup';
     				    	$error++;
@@ -812,8 +800,7 @@ class ImportCsv extends ModeleImports
 										// No record found with filters, insert will be tried below
 									}
 								}
-								else
-								{
+								else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -841,8 +828,7 @@ class ImportCsv extends ModeleImports
 										$lastinsertid = 0;
 									}
 								}
-								else
-								{
+								else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -872,8 +858,7 @@ class ImportCsv extends ModeleImports
 									// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
 									$updatedone = true;
 								}
-								else
-								{
+								else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -907,8 +892,7 @@ class ImportCsv extends ModeleImports
 								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
 								    $insertdone = true;
 								}
-								else
-								{
+								else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 35aee35869e..dc5bac9568c 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -375,8 +375,7 @@ class ImportXlsx extends ModeleImports
 			$this->warnings[$warning]['type'] = 'EMPTY';
 			$warning++;
 		}
-		else
-		{
+		else {
 			$last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
 			$updatedone = false;
 			$insertdone = false;
@@ -403,8 +402,7 @@ class ImportXlsx extends ModeleImports
 					}
 					else dol_print_error($this->db);
 				}
-				else
-				{
+				else {
 					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
 				}
 
@@ -439,8 +437,7 @@ class ImportXlsx extends ModeleImports
 							$error++;
 						}
 						// Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
-						else
-						{
+						else {
 						    // We convert field if required
 						    if (!empty($objimport->array_import_convertvalue[0][$val]))
 						    {
@@ -465,8 +462,7 @@ class ImportXlsx extends ModeleImports
                                         {
                                         	$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
                                         }
-                                        else
-										{
+                                        else {
                                             $resultload = dol_include_once($file);
                                             if (empty($resultload))
                                             {
@@ -505,8 +501,7 @@ class ImportXlsx extends ModeleImports
                                             {
                                                 $newval = $classinstance->id;
                                             }
-                                            else
-                                            {
+                                            else {
                                                 if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
                                                 elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
                                                 else $this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
@@ -569,8 +564,7 @@ class ImportXlsx extends ModeleImports
                                 	{
                                 		$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval];
                                 	}
-                                	else
-                                	{
+                                	else {
                                 		$resultload = dol_include_once($file);
                                 		if (empty($resultload))
                                 		{
@@ -587,8 +581,7 @@ class ImportXlsx extends ModeleImports
                                         {
                                         	$newval = $scaleorid ? $scaleorid : 0;
                                         }
-                                        else
-                                        {
+                                        else {
                                         	if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
                                         	else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
                                 			$this->errors[$error]['type'] = 'FOREIGNKEY';
@@ -715,8 +708,7 @@ class ImportXlsx extends ModeleImports
 												$i++;
 											}
 										}
-										else
-										{
+										else {
 											dol_print_error($this->db);
 										}
 									}
@@ -752,7 +744,7 @@ class ImportXlsx extends ModeleImports
 						// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
 						if (empty($newval) && $arrayrecord[($key - 1)]['type'] < 0)		 $listvalues[] = ($newval == '0' ? $newval : "null");
 						elseif (empty($newval) && $arrayrecord[($key - 1)]['type'] == 0)	 $listvalues[] = "''";
-						else															 $listvalues[] = "'".$this->db->escape($newval)."'";
+						else $listvalues[] = "'".$this->db->escape($newval)."'";
 					}
 					$i++;
 				}
@@ -784,8 +776,7 @@ class ImportXlsx extends ModeleImports
     				    	$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
     				    	$listvalues[] = "'".$tmp[1]."'";
     				    }
-    				    else
-    				    {
+    				    else {
     				    	$this->errors[$error]['lib'] = 'Bad value of profile setup '.$val.' for array_import_fieldshidden';
     				    	$this->errors[$error]['type'] = 'Import profile setup';
     				    	$error++;
@@ -834,8 +825,7 @@ class ImportXlsx extends ModeleImports
 										// No record found with filters, insert will be tried below
 									}
 								}
-								else
-								{
+								else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -863,8 +853,7 @@ class ImportXlsx extends ModeleImports
 										$lastinsertid = 0;
 									}
 								}
-								else
-								{
+								else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -894,8 +883,7 @@ class ImportXlsx extends ModeleImports
 									// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
 									$updatedone = true;
 								}
-								else
-								{
+								else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -929,8 +917,7 @@ class ImportXlsx extends ModeleImports
 								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
 								    $insertdone = true;
 								}
-								else
-								{
+								else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
index cda16561f8d..2a1b79bf4f3 100644
--- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
@@ -205,8 +205,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				$dir = $conf->expedition->dir_output."/receipt";
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output."/receipt/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -358,8 +357,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
 				}
-				else
-				{
+				else {
 					$height_note = 0;
 				}
 
@@ -404,17 +402,15 @@ class pdf_typhon extends ModelePDFDeliveryOrder
                     			$pdf->setPage($pageposafter + 1);
                     		}
                     	}
-                    	else
-                    	{
+                    	else {
                     		// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
                     	}
                     }
-                    else	// No pagebreak
+                    else // No pagebreak
                     {
                     	$pdf->commitTransaction();
                     }
@@ -490,8 +486,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -506,8 +501,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -525,8 +519,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
-				else
-				{
+				else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -627,8 +620,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
@@ -775,8 +767,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
-			else
-			{
+			else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
@@ -799,8 +790,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		{
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date_delivery, "%d %b %Y", false, $outputlangs, true), '', 'R');
 		}
-		else
-		{
+		else {
 			$pdf->SetTextColor(255, 0, 0);
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DeliveryNotValidated"), '', 'R');
 			$pdf->SetTextColor(0, 0, 60);
diff --git a/htdocs/core/modules/livraison/mod_livraison_jade.php b/htdocs/core/modules/livraison/mod_livraison_jade.php
index 840b6a6f0a6..599a33578f5 100644
--- a/htdocs/core/modules/livraison/mod_livraison_jade.php
+++ b/htdocs/core/modules/livraison/mod_livraison_jade.php
@@ -143,8 +143,7 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 
diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
index 464c657fa7b..858e44693b4 100644
--- a/htdocs/core/modules/mailings/advthirdparties.modules.php
+++ b/htdocs/core/modules/mailings/advthirdparties.modules.php
@@ -114,8 +114,7 @@ class mailing_advthirdparties extends MailingTargets
     					$i++;
     				}
     			}
-    			else
-    			{
+    			else {
     				dol_syslog($this->db->error());
     				$this->error = $this->db->error();
     				return -1;
@@ -169,8 +168,7 @@ class mailing_advthirdparties extends MailingTargets
     					$i++;
     				}
     			}
-    			else
-    			{
+    			else {
     				dol_syslog($this->db->error());
     				$this->error = $this->db->error();
     				return -1;
@@ -273,8 +271,7 @@ class mailing_advthirdparties extends MailingTargets
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 9d7a23ce9fd..1a4570df63f 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -191,8 +191,7 @@ class mailing_contacts1 extends MailingTargets
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				$s .= '<option value="-1" disabled="disabled">'.$langs->trans("NoContactWithCategoryFound").'</option>';
 			}
 		}
@@ -266,8 +265,7 @@ class mailing_contacts1 extends MailingTargets
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				$s .= '<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
 			}
 		}
@@ -308,8 +306,7 @@ class mailing_contacts1 extends MailingTargets
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				$s .= '<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
 			}
 		}
@@ -448,8 +445,7 @@ class mailing_contacts1 extends MailingTargets
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog($this->db->error());
 			$this->error = $this->db->error();
 			return -1;
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index 8a504ff28b5..e94fe57aa3b 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -155,8 +155,7 @@ class mailing_fraise extends MailingTargets
                 $i++;
             }
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
         }
 
@@ -194,8 +193,7 @@ class mailing_fraise extends MailingTargets
         		$i++;
         	}
         }
-        else
-        {
+        else {
         	dol_print_error($this->db);
         }
 
@@ -314,8 +312,7 @@ class mailing_fraise extends MailingTargets
                 $i++;
             }
         }
-        else
-        {
+        else {
             dol_syslog($this->db->error());
             $this->error = $this->db->error();
             return -1;
diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index ffba2571d23..9c042de1112 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -99,8 +99,7 @@ class MailingTargets // This can't be abstract as it is used for some method
             $obj = $this->db->fetch_object($result);
             return $obj->nb;
         }
-        else
-        {
+        else {
         	$this->error = $this->db->lasterror();
             return -1;
         }
@@ -193,8 +192,7 @@ class MailingTargets // This can't be abstract as it is used for some method
         		{
         			$j++;
         		}
-        		else
-        		{
+        		else {
         			if ($this->db->errno() != 'DB_ERROR_RECORD_ALREADY_EXISTS')
         			{
         				// Si erreur autre que doublon
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
index aa3e9bbc703..1f80623bece 100644
--- a/htdocs/core/modules/mailings/pomme.modules.php
+++ b/htdocs/core/modules/mailings/pomme.modules.php
@@ -214,8 +214,7 @@ class mailing_pomme extends MailingTargets
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog($this->db->error());
 			$this->error = $this->db->error();
 			return -1;
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 05e9f4f12c4..4773203e5ad 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -80,8 +80,7 @@ class mailing_thirdparties extends MailingTargets
 		    $sql .= " AND s.entity IN (".getEntity('societe').")";
 		    $sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
 		}
-		else
-		{
+		else {
             $addFilter = "";
             if (isset($_POST["filter_client"]) && $_POST["filter_client"] <> '-1')
             {
@@ -103,8 +102,7 @@ class mailing_thirdparties extends MailingTargets
                 {
                     $addDescription .= $langs->trans('ProspectCustomer');
                 }
-                else
-                {
+                else {
                     $addDescription .= "Unknown status ".$_POST["filter_client"];
                 }
             }
@@ -120,8 +118,7 @@ class mailing_thirdparties extends MailingTargets
                     $addFilter .= " AND s.status=1";
                     $addDescription .= $langs->trans("Enabled");
                 }
-                else
-                {
+                else {
                     $addFilter .= " AND s.status=0";
                     $addDescription .= $langs->trans("Disabled");
                 }
@@ -187,8 +184,7 @@ class mailing_thirdparties extends MailingTargets
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog($this->db->error());
 			$this->error = $this->db->error();
 			return -1;
@@ -286,8 +282,7 @@ class mailing_thirdparties extends MailingTargets
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index 866712d4bb0..1c76a924883 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -74,8 +74,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
                 $this->arrayofproducts[$i] = $obj->ref;
             }
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
         }
     }
@@ -154,8 +153,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
                 $i++;
             }
         }
-        else
-        {
+        else {
             dol_syslog($this->db->lasterror());
             $this->error = $this->db->lasterror();
             return -1;
diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php
index 9d08cb3565d..040baddd7c2 100644
--- a/htdocs/core/modules/mailings/xinputfile.modules.php
+++ b/htdocs/core/modules/mailings/xinputfile.modules.php
@@ -180,8 +180,7 @@ class mailing_xinputfile extends MailingTargets
 									$j++;
 								}
 					        }
-					        else
-					        {
+					        else {
 					        	$i++;
 					        	$langs->load("errors");
                                 $msg = $langs->trans("ErrorFoundBadEmailInFile", $i, $cpt, $email);
@@ -197,16 +196,14 @@ class mailing_xinputfile extends MailingTargets
 				    	return -$i;
 				    }
 				}
-				else
-				{
+				else {
 					$this->error = $langs->trans("ErrorFaildToOpenFile");
 					return -1;
 				}
 
 				dol_syslog(get_class($this)."::add_to_target mailing ".$cpt." targets found");
 			}
-			else
-			{
+			else {
 				$langs->load("errors");
 				if ($resupload < 0)	// Unknown error
 				{
@@ -216,7 +213,7 @@ class mailing_xinputfile extends MailingTargets
 				{
 					$this->error = '<div class="error">'.$langs->trans("ErrorFileIsInfectedWithAVirus").'</div>';
 				}
-				else	// Known error
+				else // Known error
 				{
 					$this->error = '<div class="error">'.$langs->trans($resupload).'</div>';
 				}
diff --git a/htdocs/core/modules/mailings/xinputuser.modules.php b/htdocs/core/modules/mailings/xinputuser.modules.php
index 0875b02ed56..56bbaa58137 100644
--- a/htdocs/core/modules/mailings/xinputuser.modules.php
+++ b/htdocs/core/modules/mailings/xinputuser.modules.php
@@ -149,15 +149,13 @@ class mailing_xinputuser extends MailingTargets
 
 				return parent::addTargetsToDatabase($mailing_id, $cibles);
 			}
-			else
-			{
+			else {
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorBadEMail", $email);
 				return -1;
 			}
 		}
-		else
-		{
+		else {
             $langs->load("errors");
             $this->error = $langs->trans("ErrorBadEmail", $email);
 			return -1;
diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php
index 1582b1c1c34..e586de52b38 100644
--- a/htdocs/core/modules/member/doc/pdf_standard.class.php
+++ b/htdocs/core/modules/member/doc/pdf_standard.class.php
@@ -166,8 +166,7 @@ class pdf_standard extends CommonStickerGenerator
 			// Output left area
 			if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			elseif ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			else
-			{
+			else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
@@ -188,7 +187,7 @@ class pdf_standard extends CommonStickerGenerator
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $widthtouse - $xleft - $xleft - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
-			else	// text on halft left and text on half right
+			else // text on halft left and text on half right
 			{
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
@@ -196,13 +195,12 @@ class pdf_standard extends CommonStickerGenerator
 				$pdf->MultiCell(round($this->_Width / 2) - 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
 		}
-		else	// Only a right part
+		else // Only a right part
 		{
 			// Output right area
 			if ($textright == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			elseif ($textright == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			else
-			{
+			else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
@@ -306,8 +304,7 @@ class pdf_standard extends CommonStickerGenerator
 
     		$arrayofrecords = $arrayofmembers;
 		}
-		else
-		{
+		else {
 		    $arrayofrecords = $object;
 		}
 
@@ -337,8 +334,7 @@ class pdf_standard extends CommonStickerGenerator
 			$title = $outputlangs->transnoentities('MembersCards');
 			$keywords = $outputlangs->transnoentities('MembersCards')." ".$outputlangs->transnoentities("Foundation")." ".$outputlangs->convToOutputCharset($mysoc->name);
 		}
-		else
-		{
+		else {
 			dol_print_error('', 'Bad value for $mode');
 			return -1;
 		}
@@ -350,8 +346,7 @@ class pdf_standard extends CommonStickerGenerator
 		    $dir = $outputdir."/".get_exdir(0, 0, 0, 0, $object, 'member');
 		    $file = $dir.'/'.$filename;
 		}
-		else
-		{
+		else {
 		    $outputdir = $conf->adherent->dir_temp;
 		    $dir = $outputdir;
 		    $file = $dir.'/'.$filename;
diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php
index f9bdd58af24..5f2f7f8b8ae 100644
--- a/htdocs/core/modules/member/modules_cards.php
+++ b/htdocs/core/modules/member/modules_cards.php
@@ -100,8 +100,7 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o
 		{
 			$code = $conf->global->ADHERENT_CARDS_ADDON_PDF;
 		}
-		else
-		{
+		else {
 			$code = $modele;
 		}
 	}
@@ -154,16 +153,14 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o
 			$outputlangs->charset_output = $sav_charset_output;
 			return 1;
 		}
-		else
-		{
+		else {
 			$outputlangs->charset_output = $sav_charset_output;
 			dol_print_error($db, "members_card_pdf_create Error: ".$obj->error);
 			return -1;
 		}
 	}
 
-	else
-	{
+	else {
 		dol_print_error('', $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file));
 		return -1;
 	}
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 2184500db8c..04283daf8b4 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -98,8 +98,7 @@ class modAgenda extends DolibarrModules
 		        $this->const[] = array('MAIN_AGENDA_ACTIONAUTO_'.$obj->code, "chaine", "1", '', 0, 'current');
 		    }
 		}
-		else
-		{
+		else {
 		    dol_print_error($this->db->lasterror());
 		}
 
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index 5b645747380..4527b620074 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -234,8 +234,7 @@ class modBlockedLog extends DolibarrModules
         {
             $res = $b->create($user, '0000000000'); // If already used for something else than SET or UNSET, we log with error
         }
-        else
-        {
+        else {
             $res = $b->create($user);
         }
         if ($res <= 0) {
diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index e276fe1f5f7..ec0b497e7cd 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -137,8 +137,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -275,8 +274,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
-				else
-				{
+				else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -309,8 +307,7 @@ class doc_generic_mo_odt extends ModelePDFMo
             			$contactobject = $object->contact;
                     }
 				}
-				else
-				{
+				else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -393,7 +390,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else    // Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -404,8 +401,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
@@ -429,8 +425,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
 								catch (OdfException $e)
@@ -504,8 +499,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 
 				return 1; // Success
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/mrp/mod_mo_standard.php b/htdocs/core/modules/mrp/mod_mo_standard.php
index 3fd3b1ad87e..8b0edd9c129 100644
--- a/htdocs/core/modules/mrp/mod_mo_standard.php
+++ b/htdocs/core/modules/mrp/mod_mo_standard.php
@@ -130,8 +130,7 @@ class mod_mo_standard extends ModeleNumRefMos
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
 		}
-		else
-		{
+		else {
 			dol_syslog("mod_mo_standard::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/oauth/github_oauthcallback.php b/htdocs/core/modules/oauth/github_oauthcallback.php
index 4320481abb1..766d615f884 100644
--- a/htdocs/core/modules/oauth/github_oauthcallback.php
+++ b/htdocs/core/modules/oauth/github_oauthcallback.php
@@ -153,8 +153,7 @@ else // If entry on page with no parameter, we arrive here
     {
         $url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
     }
-    else
-    {
+    else {
         $url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
     }
 
diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index 68aba389f31..0af4113fb0a 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -151,8 +151,7 @@ else // If entry on page with no parameter, we arrive here
     {
     	$url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
     }
-    else
-    {
+    else {
         $url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
     }
 
diff --git a/htdocs/core/modules/oauth/stripelive_oauthcallback.php b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
index b2ff4165563..8be1be11cc8 100644
--- a/htdocs/core/modules/oauth/stripelive_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
@@ -157,8 +157,7 @@ else // If entry on page with no parameter, we arrive here
     {
         $url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
     }
-    else
-    {
+    else {
         //$url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
     	//https://connect.stripe.com/oauth/authorize?response_type=code&client_id=ca_AX27ut70tJ1j6eyFCV3ObEXhNOo2jY6V&scope=read_write
     	$url = 'https://connect.stripe.com/oauth/authorize?response_type=code&client_id='.$conf->global->OAUTH_STRIPE_LIVE_ID.'&scope=read_write';
diff --git a/htdocs/core/modules/oauth/stripetest_oauthcallback.php b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
index 925a55c7ca1..4374f65746e 100644
--- a/htdocs/core/modules/oauth/stripetest_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
@@ -157,8 +157,7 @@ else // If entry on page with no parameter, we arrive here
 	{
 		$url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
 	}
-	else
-	{
+	else {
 		//$url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
 		//https://connect.stripe.com/oauth/authorize?response_type=code&client_id=ca_AX27ut70tJ1j6eyFCV3ObEXhNOo2jY6V&scope=read_write
 		$url = 'https://connect.stripe.com/oauth/authorize?response_type=code&client_id='.$conf->global->OAUTH_STRIPE_TEST_ID.'&scope=read_write';
diff --git a/htdocs/core/modules/payment/mod_payment_cicada.php b/htdocs/core/modules/payment/mod_payment_cicada.php
index 5650ad43707..b9909d64fea 100644
--- a/htdocs/core/modules/payment/mod_payment_cicada.php
+++ b/htdocs/core/modules/payment/mod_payment_cicada.php
@@ -137,8 +137,7 @@ class mod_payment_cicada extends ModeleNumRefPayments
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
 		}
-		else
-		{
+		else {
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 1a225518518..90f3825d007 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -157,8 +157,7 @@ class printing_printgcp extends PrintingDriver
                     {
                         $expiredat = $langs->trans("Unknown");
                     }
-                    else
-                    {
+                    else {
                         $expiredat = dol_print_date($endoflife, "dayhour");
                     }
 
@@ -220,8 +219,7 @@ class printing_printgcp extends PrintingDriver
             {
                 $html .= img_picto($langs->trans("Default"), 'on');
             }
-            else
-                $html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+            else $html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
             $html .= '</td>';
             $html .= '</tr>'."\n";
         }
@@ -326,14 +324,12 @@ class printing_printgcp extends PrintingDriver
             {
                 $printer_id = $obj->printer_id;
             }
-            else
-            {
+            else {
                 if (!empty($conf->global->PRINTING_GCP_DEFAULT))
                 {
                     $printer_id = $conf->global->PRINTING_GCP_DEFAULT;
                 }
-                else
-                {
+                else {
                     $this->errors[] = 'NoDefaultPrinterDefined';
                     $error++;
                     return $error;
@@ -507,8 +503,7 @@ class printing_printgcp extends PrintingDriver
                 $html .= '</tr>';
             }
         }
-        else
-        {
+        else {
                 $html .= '<tr class="oddeven">';
                 $html .= '<td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td>';
                 $html .= '</tr>';
diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php
index 5a3d2481c6d..a305b648cfe 100644
--- a/htdocs/core/modules/printing/printipp.modules.php
+++ b/htdocs/core/modules/printing/printipp.modules.php
@@ -116,15 +116,13 @@ class printing_printipp extends PrintingDriver
             	dol_syslog("Found a default printer for user ".$user->id." = ".$obj->printer_id);
                 $ipp->setPrinterURI($obj->printer_id);
             }
-            else
-            {
+            else {
                 if (!empty($conf->global->PRINTIPP_URI_DEFAULT))
                 {
                     dol_syslog("Will use default printer conf->global->PRINTIPP_URI_DEFAULT = ".$conf->global->PRINTIPP_URI_DEFAULT);
                     $ipp->setPrinterURI($conf->global->PRINTIPP_URI_DEFAULT);
                 }
-                else
-                {
+                else {
                     $this->errors[] = 'NoDefaultPrinterDefined';
                     $error++;
                     return $error;
diff --git a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
index f85984ab9bd..9155baa8aac 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
@@ -153,8 +153,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 			// Output left area
 			if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			elseif ($textleft == '%PHOTO%' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			else
-			{
+			else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
@@ -175,7 +174,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $widthtouse - $xleft - $xleft - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
-			else	// text on halft left and text on half right
+			else // text on halft left and text on half right
 			{
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
@@ -183,13 +182,12 @@ class pdf_standardlabel extends CommonStickerGenerator
 				$pdf->MultiCell(round($this->_Width / 2) - 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
 		}
-		else	// Only a right part
+		else // Only a right part
 		{
 			// Output right area
 			if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			elseif ($textright == '%PHOTO%' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			else
-			{
+			else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
diff --git a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
index 568d850765f..3a877049a26 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
@@ -167,8 +167,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 			{
 				$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			}
-			else
-			{
+			else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
@@ -219,7 +218,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 					$pdf->MultiCell($widthtouse - $logoWidth - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 				}
 			}
-			else	// text on halft left and text on half right
+			else // text on halft left and text on half right
 			{
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
@@ -227,7 +226,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 				$pdf->MultiCell(round($this->_Width / 2) - 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
 		}
-		else	// Only a right part
+		else // Only a right part
 		{
 			// Output right area
 			if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, 0, $logoHeight);
@@ -235,8 +234,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 			{
 				$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			}
-			else
-			{
+			else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
diff --git a/htdocs/core/modules/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php
index f99ddafc4b8..ddf6d73a2a3 100644
--- a/htdocs/core/modules/printsheet/modules_labels.php
+++ b/htdocs/core/modules/printsheet/modules_labels.php
@@ -101,8 +101,7 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 		{
 			$code = $conf->global->ADHERENT_ETIQUETTE_TYPE;
 		}
-		else
-		{
+		else {
 			$code = $modele;
 		}
 	}
@@ -156,15 +155,13 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 			$outputlangs->charset_output = $sav_charset_output;
 			return 1;
 		}
-		else
-		{
+		else {
 			$outputlangs->charset_output = $sav_charset_output;
 			dol_print_error($db, "doc_label_pdf_create Error: ".$obj->error);
 			return -1;
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error('', $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file));
 		return -1;
 	}
diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
index c0fa4d0f6eb..3965bd1be5d 100644
--- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -141,8 +141,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -294,8 +293,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
-				else
-				{
+				else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -329,8 +327,7 @@ class doc_generic_product_odt extends ModelePDFProduct
                         $contactobject = $object->contact;
                     }
 				}
-				else
-				{
+				else {
 					$socobject = $object->thirdparty;
 				}
 				// Make substitution
@@ -417,7 +414,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else    // Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -428,8 +425,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('supplierprices');
 					if (!empty($object->supplierprices)) {
 						foreach ($object->supplierprices as $supplierprice)
@@ -441,8 +437,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($array_lines as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
 								catch (OdfException $e)
@@ -514,8 +509,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 
 				return 1; // Success
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index cbe618b488f..20c3ba9c087 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -182,8 +182,7 @@ class pdf_standard extends ModelePDFProduct
 				$dir = $conf->product->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->product->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -335,8 +334,7 @@ class pdf_standard extends ModelePDFProduct
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
 				}
-				else
-				{
+				else {
 					$height_note = 0;
 				}
 
@@ -574,14 +572,12 @@ class pdf_standard extends ModelePDFProduct
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PRODUCT_OUTPUTDIR");
 			return 0;
 		}
@@ -741,16 +737,14 @@ class pdf_standard extends ModelePDFProduct
 	            $height = pdf_getHeightForLogo($logo);
 	            $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 	        }
-	        else
-	        {
+	        else {
 	            $pdf->SetTextColor(200, 0, 0);
 	            $pdf->SetFont('', 'B', $default_font_size - 2);
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 	        }
 	    }
-	    else
-	    {
+	    else {
 	        $text = $this->emetteur->name;
 	        $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 	    }
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index ba6329004e3..dc6d7bfd6ef 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -280,8 +280,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 		{
 			$result = -2;
 		}
-		else
-		{
+		else {
 			// Get Mask value
 			$mask = '';
 			if ($type == 0) $mask = empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT) ? '' : $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
@@ -328,13 +327,11 @@ class mod_codeproduct_elephant extends ModeleProductCode
 			{
 				return 0;
 			}
-			else
-			{
+			else {
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			return -2;
 		}
 	}
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index 80bc9f7ce0a..1ecd734dec2 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -170,8 +170,7 @@ abstract class ModeleProductCode
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 		return $liste;
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 542ea728f84..585edee00ee 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -408,8 +408,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -544,8 +543,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
-				else
-				{
+				else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -636,7 +634,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else    // Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -648,8 +646,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				}
 
 				// Replace tags of lines for tasks
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('tasks');
 
 					$taskstatic = new Task($this->db);
@@ -667,8 +664,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 						//complete_substitutions_array($tmparray, $outputlangs, $object, $task, "completesubstitutionarray_lines");
 						foreach ($tmparray as $key => $val)
 						{
-							try
-							{
+							try {
 								$listlines->setVars($key, $val, true, 'UTF-8');
 							}
 							catch (OdfException $e)
@@ -718,8 +714,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 								foreach ($tmparray as $key => $val)
 								{
-									try
-									{
+									try {
 										$listlinestaskres->setVars($key, $val, true, 'UTF-8');
 									}
 									catch (OdfException $e)
@@ -768,8 +763,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 								$tmparray = $this->get_substitutionarray_taskstime($row, $outputlangs);
 								foreach ($tmparray as $key => $val)
 								{
-									try
-									{
+									try {
 										$listlinestasktime->setVars($key, $val, true, 'UTF-8');
 									}
 									catch (OdfException $e)
@@ -808,8 +802,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 								foreach ($tmparray as $key => $val)
 								{
-									try
-									{
+									try {
 										$listlinestasktime->setVars($key, $val, true, 'UTF-8');
 									}
 									catch (OdfException $e)
@@ -841,8 +834,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 							//dol_syslog(get_class($this).'::main $tmparray'.var_export($tmparray,true));
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listtasksfiles->setVars($key, $val, true, 'UTF-8');
 								}
 								catch (OdfException $e)
@@ -873,8 +865,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				}
 
 				// Replace tags of project files
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('projectfiles');
 
 					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
@@ -887,8 +878,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 						foreach ($tmparray as $key => $val)
 						{
-							try
-							{
+							try {
 								$listlines->setVars($key, $val, true, 'UTF-8');
 							}
 							catch (OdfException $e)
@@ -923,8 +913,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				}
 				if ((is_array($contact_arrray) && count($contact_arrray) > 0))
 				{
-					try
-					{
+					try {
 						$listlines = $odfHandler->setSegment('projectcontacts');
 
 						foreach ($contact_arrray as $contact)
@@ -946,8 +935,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 							$tmparray = $this->get_substitutionarray_project_contacts($contact, $outputlangs);
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
 								catch (OdfException $e)
@@ -1084,8 +1072,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				);
 
 				//Insert reference
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('projectrefs');
 
 					foreach ($listofreferent as $keyref => $valueref)
@@ -1147,8 +1134,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 									foreach ($tmparray as $key => $val)
 									{
-										try
-										{
+										try {
 											$listlines->setVars($key, $val, true, 'UTF-8');
 										}
 										catch (OdfException $e)
@@ -1217,8 +1203,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 				return 1; // Success
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index 59e3f855ebf..53b81ef5419 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -301,8 +301,7 @@ class pdf_baleine extends ModelePDFProjects
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
 				}
-				else
-				{
+				else {
 					$height_note = 0;
 				}
 
@@ -359,15 +358,13 @@ class pdf_baleine extends ModelePDFProjects
 								$pdf->setPage($pageposafter + 1);
 							}
 						}
-						else
-						{
+						else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 
 							$forcedesconsamepage = 1;
 							if ($forcedesconsamepage)
@@ -397,7 +394,7 @@ class pdf_baleine extends ModelePDFProjects
 						}
 						//var_dump($i.' '.$posybefore.' '.$posyafter.' '.($this->page_hauteur -  ($heightforfooter + $heightforfreetext + $heightforinfotot)).' '.$showpricebeforepagebreak);
 					}
-					else	// No pagebreak
+					else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -452,8 +449,7 @@ class pdf_baleine extends ModelePDFProjects
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -468,8 +464,7 @@ class pdf_baleine extends ModelePDFProjects
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -484,8 +479,7 @@ class pdf_baleine extends ModelePDFProjects
 				// Show square
 				if ($pagenb == 1)
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-				else
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+				else $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 				$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
 				// Footer of the page
@@ -514,14 +508,12 @@ class pdf_baleine extends ModelePDFProjects
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "PROJECT_OUTPUTDIR");
 			return 0;
 		}
@@ -613,8 +605,7 @@ class pdf_baleine extends ModelePDFProjects
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
-			else
-			{
+			else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 4044676461e..0888a029d5b 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -274,8 +274,7 @@ class pdf_beluga extends ModelePDFProjects
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
 				}
-				else
-				{
+				else {
 					$height_note = 0;
 				}
 
@@ -509,15 +508,13 @@ class pdf_beluga extends ModelePDFProjects
 								            $pdf->setPage($pageposafter + 1);
 							            }
 						            }
-						            else
-						            {
+						            else {
 							            // We found a page break
 
 										// Allows data in the first page if description is long enough to break in multiples pages
 										if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 											$showpricebeforepagebreak = 1;
-										else
-											$showpricebeforepagebreak = 0;
+										else $showpricebeforepagebreak = 0;
 
 							            $forcedesconsamepage = 1;
 							            if ($forcedesconsamepage)
@@ -547,7 +544,7 @@ class pdf_beluga extends ModelePDFProjects
 						            }
 						            //var_dump($i.' '.$posybefore.' '.$posyafter.' '.($this->page_hauteur -  ($heightforfooter + $heightforfreetext + $heightforinfotot)).' '.$showpricebeforepagebreak);
 					            }
-					            else	// No pagebreak
+					            else // No pagebreak
 					            {
 						            $pdf->commitTransaction();
 					            }
@@ -590,8 +587,7 @@ class pdf_beluga extends ModelePDFProjects
 						            $fuser->fetch($element->fk_user_author);
 						            $pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, $fuser->getFullName($outputlangs), 1, 'L');
 					            }
-					            else
-					            {
+					            else {
 						            $pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, (is_object($element->thirdparty) ? $element->thirdparty->name : ''), 1, 'L');
 					            }
 
@@ -608,8 +604,7 @@ class pdf_beluga extends ModelePDFProjects
                                 		$textforamount = dol_trunc($element->label, 26);
                                 		$pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, $textforamount, 1, 'L');
                                 	}
-                                	else
-                                	{
+                                	else {
 	                                    $pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, "", 1, 'R');
                                 	}
                                 }
@@ -688,14 +683,12 @@ class pdf_beluga extends ModelePDFProjects
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "PROJECT_OUTPUTDIR");
 			return 0;
 		}
@@ -787,8 +780,7 @@ class pdf_beluga extends ModelePDFProjects
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
-			else
-			{
+			else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
index 2a13aa8ab57..0b0190cffd2 100644
--- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
@@ -232,8 +232,7 @@ class pdf_timespent extends ModelePDFProjects
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
 				}
-				else
-				{
+				else {
 					$height_note = 0;
 				}
 
@@ -290,15 +289,13 @@ class pdf_timespent extends ModelePDFProjects
 								$pdf->setPage($pageposafter + 1);
 							}
 						}
-						else
-						{
+						else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 
 							$forcedesconsamepage = 1;
 							if ($forcedesconsamepage)
@@ -328,7 +325,7 @@ class pdf_timespent extends ModelePDFProjects
 						}
 						//var_dump($i.' '.$posybefore.' '.$posyafter.' '.($this->page_hauteur -  ($heightforfooter + $heightforfreetext + $heightforinfotot)).' '.$showpricebeforepagebreak);
 					}
-					else	// No pagebreak
+					else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -383,8 +380,7 @@ class pdf_timespent extends ModelePDFProjects
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -399,8 +395,7 @@ class pdf_timespent extends ModelePDFProjects
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -415,8 +410,7 @@ class pdf_timespent extends ModelePDFProjects
 				// Show square
 				if ($pagenb == 1)
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-				else
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+				else $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 				$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
 				// Pied de page
@@ -445,14 +439,12 @@ class pdf_timespent extends ModelePDFProjects
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "PROJECT_OUTPUTDIR");
 			return 0;
 		}
@@ -544,8 +536,7 @@ class pdf_timespent extends ModelePDFProjects
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
-			else
-			{
+			else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php
index 301e226020c..9929dd357cb 100644
--- a/htdocs/core/modules/project/mod_project_simple.php
+++ b/htdocs/core/modules/project/mod_project_simple.php
@@ -107,8 +107,7 @@ class mod_project_simple extends ModeleNumRefProjects
 		{
 			return true;
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -141,8 +140,7 @@ class mod_project_simple extends ModeleNumRefProjects
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
 		}
-		else
-		{
+		else {
 			dol_syslog("mod_project_simple::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 9b7b15a884d..eee9945bb8a 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -377,8 +377,7 @@ class doc_generic_task_odt extends ModelePDFTask
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -565,7 +564,7 @@ class doc_generic_task_odt extends ModelePDFTask
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else    // Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -575,8 +574,7 @@ class doc_generic_task_odt extends ModelePDFTask
 				}
 
 				// Replace tags of lines for tasks
-				try
-				{
+				try {
 					// Security check
 					$socid = 0;
 					if (!empty($project->fk_soc)) $socid = $project->fk_soc;
@@ -674,8 +672,7 @@ class doc_generic_task_odt extends ModelePDFTask
 
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlinestasktime->setVars($key, $val, true, 'UTF-8');
 								}
 								catch (OdfException $e)
@@ -709,8 +706,7 @@ class doc_generic_task_odt extends ModelePDFTask
 						//dol_syslog(get_class($this).'::main $tmparray'.var_export($tmparray,true));
 						foreach ($tmparray as $key => $val)
 						{
-							try
-							{
+							try {
 								$listtasksfiles->setVars($key, $val, true, 'UTF-8');
 							}
 							catch (OdfException $e)
@@ -738,8 +734,7 @@ class doc_generic_task_odt extends ModelePDFTask
 
 
 				// Replace tags of project files
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('projectfiles');
 
 					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
@@ -753,8 +748,7 @@ class doc_generic_task_odt extends ModelePDFTask
 
 						foreach ($tmparray as $key => $val)
 						{
-							try
-							{
+							try {
 								$listlines->setVars($key, $val, true, 'UTF-8');
 							}
 							catch (OdfException $e)
@@ -789,8 +783,7 @@ class doc_generic_task_odt extends ModelePDFTask
 				}
 				if ((is_array($contact_arrray) && count($contact_arrray) > 0))
 				{
-					try
-					{
+					try {
 						$listlines = $odfHandler->setSegment('projectcontacts');
 
 						foreach ($contact_arrray as $contact)
@@ -813,8 +806,7 @@ class doc_generic_task_odt extends ModelePDFTask
 
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
 								catch (OdfException $e)
@@ -875,8 +867,7 @@ class doc_generic_task_odt extends ModelePDFTask
 
 				return 1; // Success
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/project/task/mod_task_simple.php b/htdocs/core/modules/project/task/mod_task_simple.php
index cb186594b84..8a409765526 100644
--- a/htdocs/core/modules/project/task/mod_task_simple.php
+++ b/htdocs/core/modules/project/task/mod_task_simple.php
@@ -108,8 +108,7 @@ class mod_task_simple extends ModeleNumRefTask
 		{
 			return true;
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -141,8 +140,7 @@ class mod_task_simple extends ModeleNumRefTask
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
 		}
-		else
-		{
+		else {
 			dol_syslog("mod_task_simple::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index 33850c5d882..e0bcefbd880 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -140,8 +140,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -309,8 +308,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
-				else
-				{
+				else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -343,8 +341,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
                         $contactobject = $object->contact;
                     }
 				}
-				else
-				{
+				else {
 					$socobject = $object->thirdparty;
 				}
 				// Make substitution
@@ -431,7 +428,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else    // Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -442,8 +439,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
@@ -467,8 +463,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
 								catch (OdfException $e)
@@ -540,8 +535,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 
 				return 1; // Success
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index c285f560678..409df828876 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -173,8 +173,7 @@ class pdf_azur extends ModelePDFPropales
 			$this->posxqty = 135;
 			$this->posxunit = 151;
 		}
-		else
-		{
+		else {
 			$this->posxtva = 110;
 			$this->posxup = 126;
 			$this->posxqty = 145;
@@ -245,8 +244,7 @@ class pdf_azur extends ModelePDFPropales
 					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 				}
-				else
-				{
+				else {
 					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
 					$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 				}
@@ -270,13 +268,11 @@ class pdf_azur extends ModelePDFPropales
 								{
 									$filename = $obj['photo_vignette'];
 								}
-								else
-								{
+								else {
 									$filename = $obj['photo'];
 								}
 							}
-							else
-							{
+							else {
 								$filename = $obj['photo'];
 							}
 
@@ -304,8 +300,7 @@ class pdf_azur extends ModelePDFPropales
 				$dir = $conf->propal->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->propal->multidir_output[$object->entity]."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -509,8 +504,7 @@ class pdf_azur extends ModelePDFPropales
 						// Allows data in the first page if description is long enough to break in multiples pages
 						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 							$showpricebeforepagebreak = 1;
-						else
-							$showpricebeforepagebreak = 0;
+						else $showpricebeforepagebreak = 0;
 					}
 
 					if (isset($imglinesize['width']) && isset($imglinesize['height']))
@@ -548,18 +542,16 @@ class pdf_azur extends ModelePDFPropales
 								$pdf->setPage($pageposafter + 1);
 							}
 						}
-						else
-						{
+						else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 						}
 					}
-					else	// No pagebreak
+					else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -677,8 +669,7 @@ class pdf_azur extends ModelePDFPropales
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -693,8 +684,7 @@ class pdf_azur extends ModelePDFPropales
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -712,8 +702,7 @@ class pdf_azur extends ModelePDFPropales
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
 				}
-				else
-				{
+				else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
 				}
@@ -782,8 +771,7 @@ class pdf_azur extends ModelePDFPropales
 												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file].'/'.get_exdir($product->id, 2, 0, 0, $product, 'product').$product->id."/photos";
 											}
 										}
-										else
-										{
+										else {
 											if (!empty($conf->product->enabled)) {
 												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file].'/'.get_exdir(0, 0, 0, 0, $product, 'product').dol_sanitizeFileName($product->ref);
 											} elseif (!empty($conf->service->enabled)) {
@@ -836,14 +824,12 @@ class pdf_azur extends ModelePDFPropales
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PROP_OUTPUTDIR");
 			return 0;
 		}
@@ -1101,8 +1087,7 @@ class pdf_azur extends ModelePDFPropales
 			{
 				// Nothing to do
 			}
-			else
-			{
+			else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1494,16 +1479,14 @@ class pdf_azur extends ModelePDFPropales
 				    $height = pdf_getHeightForLogo($logo);
 				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 				}
-				else
-				{
+				else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
 			}
-			else
-			{
+			else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 1af66ca645e..1490dfe4adc 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -232,8 +232,7 @@ class pdf_cyan extends ModelePDFPropales
 					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 				}
-				else
-				{
+				else {
 					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
 					$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 				}
@@ -257,13 +256,11 @@ class pdf_cyan extends ModelePDFPropales
 								{
 									$filename = $obj['photo_vignette'];
 								}
-								else
-								{
+								else {
 									$filename = $obj['photo'];
 								}
 							}
-							else
-							{
+							else {
 								$filename = $obj['photo'];
 							}
 
@@ -292,8 +289,7 @@ class pdf_cyan extends ModelePDFPropales
 				$dir = $conf->propal->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->propal->multidir_output[$object->entity]."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -551,8 +547,7 @@ class pdf_cyan extends ModelePDFPropales
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $posyafter + 6;
 				}
-				else
-				{
+				else {
 					$height_note = 0;
 				}
 
@@ -602,8 +597,7 @@ class pdf_cyan extends ModelePDFPropales
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
     					}
 
 
@@ -644,17 +638,15 @@ class pdf_cyan extends ModelePDFPropales
     								$pdf->setPage($pageposafter + 1);
     							}
     						}
-    						else
-    						{
+    						else {
     							// We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
-								else
-									$showpricebeforepagebreak = 0;
+								else $showpricebeforepagebreak = 0;
     						}
     					}
-    					else	// No pagebreak
+    					else // No pagebreak
     					{
     						$pdf->commitTransaction();
     					}
@@ -808,8 +800,7 @@ class pdf_cyan extends ModelePDFPropales
 						{
 						    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -824,8 +815,7 @@ class pdf_cyan extends ModelePDFPropales
 						{
 						    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -843,8 +833,7 @@ class pdf_cyan extends ModelePDFPropales
 				    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
 				}
-				else
-				{
+				else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
 				}
@@ -913,8 +902,7 @@ class pdf_cyan extends ModelePDFPropales
 												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file].'/'.get_exdir($product->id, 2, 0, 0, $product, 'product').$product->id."/photos";
 											}
 										}
-										else
-										{
+										else {
 											if (!empty($conf->product->enabled)) {
 												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file].'/'.get_exdir(0, 0, 0, 0, $product, 'product').dol_sanitizeFileName($product->ref);
 											} elseif (!empty($conf->service->enabled)) {
@@ -967,14 +955,12 @@ class pdf_cyan extends ModelePDFPropales
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PROP_OUTPUTDIR");
 			return 0;
 		}
@@ -1232,8 +1218,7 @@ class pdf_cyan extends ModelePDFPropales
 			{
 				// Nothing to do
 			}
-			else
-			{
+			else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1568,16 +1553,14 @@ class pdf_cyan extends ModelePDFPropales
 				    $height = pdf_getHeightForLogo($logo);
 				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 				}
-				else
-				{
+				else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
 			}
-			else
-			{
+			else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
@@ -2006,8 +1989,7 @@ class pdf_cyan extends ModelePDFPropales
 	    {
 	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 	    }
-	    else
-	    {
+	    else {
 	        $this->cols = $hookmanager->resArray;
 	    }
 	}
diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php
index 4dde423a5e6..d342f9d6a4a 100644
--- a/htdocs/core/modules/propale/mod_propale_marbre.php
+++ b/htdocs/core/modules/propale/mod_propale_marbre.php
@@ -109,8 +109,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
 		{
 			return true;
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -142,8 +141,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
 		}
-		else
-		{
+		else {
 			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 103d0fdffba..4f8c8221e79 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -211,8 +211,7 @@ class pdf_paiement
 				// If global param PAYMENTS_REPORT_GROUP_BY_MOD is set, payement are ordered by paiement_code
 				if (!empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD))
 					$sql .= " ORDER BY paiement_code ASC, p.datep ASC, pf.fk_paiement ASC";
-				else
-					$sql .= " ORDER BY p.datep ASC, pf.fk_paiement ASC";
+				else $sql .= " ORDER BY p.datep ASC, pf.fk_paiement ASC";
 				break;
 			case "fourn":
 				$sql = "SELECT p.datep as dp, f.ref as ref";
@@ -245,8 +244,7 @@ class pdf_paiement
                 // If global param PAYMENTS_FOURN_REPORT_GROUP_BY_MOD is set, payement fourn are ordered by paiement_code
 				if (!empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))
 					$sql .= " ORDER BY paiement_code ASC, p.datep ASC, pf.fk_paiementfourn ASC";
-				else
-					$sql .= " ORDER BY p.datep ASC, pf.fk_paiementfourn ASC";
+				else $sql .= " ORDER BY p.datep ASC, pf.fk_paiementfourn ASC";
 				break;
 		}
 
@@ -274,8 +272,7 @@ class pdf_paiement
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
index 89a532c2556..1a7076095ec 100644
--- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
+++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
@@ -132,8 +132,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -272,8 +271,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
-				else
-				{
+				else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -301,8 +299,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
 					else $socobject = $object->thirdparty;
 				}
-				else
-				{
+				else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -371,7 +368,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else    // Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -391,7 +388,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else	// Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -409,7 +406,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else	// Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -431,7 +428,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else    // Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -440,8 +437,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('lines');
 					foreach ($object->lines as $line)
 					{
@@ -513,8 +509,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 
 				return 1; // Success
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 25b7b62388f..1901a9fc044 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -149,13 +149,11 @@ class pdf_squille extends ModelePdfReception
                         {
                             $filename = $obj['photo_vignette'];
                         }
-                        else
-                        {
+                        else {
                             $filename = $obj['photo'];
                         }
                     }
-                    else
-                    {
+                    else {
                         $filename = $obj['photo'];
                     }
 
@@ -177,8 +175,7 @@ class pdf_squille extends ModelePdfReception
 				$dir = $conf->reception->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$rcpref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->reception->dir_output."/".$rcpref;
 				$file = $dir."/".$rcpref.".pdf";
@@ -336,8 +333,7 @@ class pdf_squille extends ModelePdfReception
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
 				}
-				else
-				{
+				else {
 					$height_note = 0;
 				}
 
@@ -378,8 +374,7 @@ class pdf_squille extends ModelePdfReception
 						// Allows data in the first page if description is long enough to break in multiples pages
 						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 							$showpricebeforepagebreak = 1;
-						else
-							$showpricebeforepagebreak = 0;
+						else $showpricebeforepagebreak = 0;
 					}
 
 					if (isset($imglinesize['width']) && isset($imglinesize['height']))
@@ -419,18 +414,16 @@ class pdf_squille extends ModelePdfReception
 								$pdf->setPage($pageposafter + 1);
 							}
 						}
-						else
-						{
+						else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 						}
 					}
-					else	// No pagebreak
+					else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -512,8 +505,7 @@ class pdf_squille extends ModelePdfReception
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -527,8 +519,7 @@ class pdf_squille extends ModelePdfReception
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -545,8 +536,7 @@ class pdf_squille extends ModelePdfReception
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
-				else
-				{
+				else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -578,14 +568,12 @@ class pdf_squille extends ModelePdfReception
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "EXP_OUTPUTDIR");
 			return 0;
 		}
@@ -822,16 +810,14 @@ class pdf_squille extends ModelePdfReception
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
-			else
-			{
+			else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
 		}
-		else
-		{
+		else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -841,8 +827,7 @@ class pdf_squille extends ModelePdfReception
 		{
 			$posx = 105;
 		}
-		else
-		{
+		else {
 			$posx = $this->marge_gauche + 3;
 		}
 		//$pdf->Rect($this->marge_gauche, $this->marge_haute, $this->page_largeur-$this->marge_gauche-$this->marge_droite, 30);
diff --git a/htdocs/core/modules/reception/mod_reception_beryl.php b/htdocs/core/modules/reception/mod_reception_beryl.php
index 66576eaab76..ee3122749a3 100644
--- a/htdocs/core/modules/reception/mod_reception_beryl.php
+++ b/htdocs/core/modules/reception/mod_reception_beryl.php
@@ -114,8 +114,7 @@ class mod_reception_beryl extends ModelNumRefReception
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
 		}
-		else
-		{
+		else {
 			dol_syslog("mod_reception_beryl::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index 2a7e0cf287f..cff1ae3f897 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -117,8 +117,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) { unset($listofdir[$key]); continue; }
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0, true); // Disable hook for the moment
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -250,8 +249,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
-				else
-				{
+				else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -313,8 +311,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
                 }
                 if ((is_array($contact_arrray) && count($contact_arrray) > 0))
                 {
-                	try
-                	{
+                	try {
                 		$listlines = $odfHandler->setSegment('companycontacts');
 
                 		foreach ($contact_arrray as $array_key => $contact_id)
@@ -323,8 +320,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
                 			$tmparray = $this->get_substitutionarray_contact($contactstatic, $outputlangs, 'contact');
                 			foreach ($tmparray as $key => $val)
                 			{
-                				try
-                				{
+                				try {
                 					$listlines->setVars($key, $val, true, 'UTF-8');
                 				}
                 				catch (OdfException $e)
@@ -370,7 +366,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else	// Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -439,8 +435,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 
 				return 1; // Success
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 22ec06c8aa6..ce85de4670d 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -286,8 +286,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 		{
 			$result = -2;
 		}
-		else
-		{
+		else {
 			// Get Mask value
 			$mask = '';
 			if ($type == 0) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
@@ -336,13 +335,11 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 			{
 				return 0;
 			}
-			else
-			{
+			else {
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			return -2;
 		}
 	}
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index 15519688f98..5582e6459af 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -145,8 +145,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 
@@ -189,8 +188,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		{
 			$result = -2;
 		}
-		else
-		{
+		else {
 			if ($this->verif_syntax($code) >= 0)
 			{
 				$is_dispo = $this->verif_dispo($db, $code, $soc, $type);
@@ -198,19 +196,16 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 				{
 					$result = -3;
 				}
-				else
-				{
+				else {
 					$result = 0;
 				}
 			}
-			else
-			{
+			else {
 				if (dol_strlen($code) == 0)
 				{
 					$result = -2;
 				}
-				else
-				{
+				else {
 					$result = -1;
 				}
 			}
@@ -250,13 +245,11 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 			{
 				return 0;
 			}
-			else
-			{
+			else {
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			return -2;
 		}
 	}
@@ -278,8 +271,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		{
 			$res = -1;
 		}
-		else
-		{
+		else {
 			$res = 0;
 		}
 		return $res;
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
index 78b0e2fae8e..27b1572555e 100644
--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -147,8 +147,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 			$codetouse = (!empty($societe->code_fournisseur) ? $societe->code_fournisseur : 'SUPPCODE');
 			$prefix = $this->prefixsupplieraccountancycode;
 		}
-		else
-		{
+		else {
 			$this->error = 'Bad value for parameter type';
 			return -1;
 		}
@@ -172,8 +171,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		{
 			$this->code = $codetouse;
 		}
-		else
-		{
+		else {
 			// Pour retour
 			$this->code = $codetouse;
 		}
@@ -211,14 +209,12 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' available");
 				return 1; // Dispo
 			}
-			else
-			{
+			else {
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' not available");
 				return 0; // Non dispo
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $db->error()." sql=".$sql;
 			return -1; // Erreur
 		}
diff --git a/htdocs/core/modules/societe/mod_codecompta_digitaria.php b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
index d97ac5df0ff..3a689b8df93 100644
--- a/htdocs/core/modules/societe/mod_codecompta_digitaria.php
+++ b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
@@ -170,8 +170,7 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
                 $prefix = $this->prefixcustomeraccountancycode;
                 $width = $this->customeraccountancycodecharacternumber;
             }
-            else
-            {
+            else {
                 $this->error = 'Bad value for parameter type';
                 return -1;
             }
@@ -221,8 +220,7 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
         {
             return 0; // return ok
         }
-        else
-        {
+        else {
             return -1; // return ko
         }
 	}
@@ -245,8 +243,7 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
         {
             $typethirdparty = 'code_compta';
         }
-        else
-        {
+        else {
             $this->error = 'Bad value for parameter type';
             return -1;
         }
@@ -262,14 +259,12 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
                 dol_syslog("mod_codecompta_digitaria::checkIfAccountancyCodeIsAlreadyUsed '".$code."' available");
                 return 0; // Available
             }
-            else
-            {
+            else {
                 dol_syslog("mod_codecompta_digitaria::checkIfAccountancyCodeIsAlreadyUsed '".$code."' not available");
                 return -1; // Not available
             }
         }
-        else
-        {
+        else {
             $this->error = $db->error()." sql=".$sql;
             return -2; // Error
         }
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index a6df7aaea20..ea10843a94a 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -173,8 +173,7 @@ abstract class ModeleThirdPartyCode
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 		return $liste;
diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
index d5ccf5dbd89..c68d1c37642 100644
--- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
+++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
@@ -141,8 +141,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -295,8 +294,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
-				else
-				{
+				else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -330,8 +328,7 @@ class doc_generic_stock_odt extends ModelePDFStock
                         $contactobject = $object->contact;
                     }
 				}
-				else
-				{
+				else {
 					$socobject = $object->thirdparty;
 				}
 				// Make substitution
@@ -418,7 +415,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else    // Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -429,8 +426,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('supplierprices');
 					if (!empty($object->supplierprices)) {
 						foreach ($object->supplierprices as $supplierprice)
@@ -442,8 +438,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($array_lines as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
 								catch (OdfException $e)
@@ -515,8 +510,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 
 				return 1; // Success
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index c50f3d2a2f8..708f06a4491 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -211,8 +211,7 @@ class pdf_standard extends ModelePDFStock
 				$dir = $conf->stock->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->stock->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -380,18 +379,16 @@ class pdf_standard extends ModelePDFStock
 									$pdf->setPage($pageposafter + 1);
 								}
 							}
-							else
-							{
+							else {
 								// We found a page break
 
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
-								else
-									$showpricebeforepagebreak = 0;
+								else $showpricebeforepagebreak = 0;
 							}
 						}
-						else	// No pagebreak
+						else // No pagebreak
 						{
 							$pdf->commitTransaction();
 						}
@@ -476,8 +473,7 @@ class pdf_standard extends ModelePDFStock
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 							}
-							else
-							{
+							else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -492,8 +488,7 @@ class pdf_standard extends ModelePDFStock
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 							}
-							else
-							{
+							else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -544,8 +539,7 @@ class pdf_standard extends ModelePDFStock
 						$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, price(price2num($totalvaluesell, 'MT'), 0, $outputlangs), 0, 'R', 0);
 					}
 				}
-				else
-				{
+				else {
 					dol_print_error($db);
 				}
 
@@ -570,8 +564,7 @@ class pdf_standard extends ModelePDFStock
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
 				}
-				else
-				{
+				else {
 					$height_note = 0;
 				}
 
@@ -705,8 +698,7 @@ class pdf_standard extends ModelePDFStock
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
-				else
-				{
+				else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -745,14 +737,12 @@ class pdf_standard extends ModelePDFStock
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PRODUCT_OUTPUTDIR");
 			return 0;
 		}
@@ -913,16 +903,14 @@ class pdf_standard extends ModelePDFStock
 	            $height = pdf_getHeightForLogo($logo);
 	            $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 	        }
-	        else
-	        {
+	        else {
 	            $pdf->SetTextColor(200, 0, 0);
 	            $pdf->SetFont('', 'B', $default_font_size - 2);
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 	        }
 	    }
-	    else
-	    {
+	    else {
 	        $text = $this->emetteur->name;
 	        $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 	    }
@@ -965,8 +953,7 @@ class pdf_standard extends ModelePDFStock
 		{
 			$pdf->MultiCell(150, 3, $e->label, '', 'R');
 		}
-		else
-		{
+		else {
 			$pdf->MultiCell(150, 3, $outputlangs->transnoentities("None"), '', 'R');
 		}
 
@@ -1004,8 +991,7 @@ class pdf_standard extends ModelePDFStock
 			$obj = $db->fetch_object($resqlbis);
 			$lastmovementdate = $db->jdate($obj->datem);
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -1013,8 +999,7 @@ class pdf_standard extends ModelePDFStock
 		{
 			$toWrite = dol_print_date($lastmovementdate, 'dayhour').' ';
 		}
-		else
-		{
+		else {
 			$toWrite = $outputlangs->transnoentities("None");
 		}
 
diff --git a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
index d0e9ba9d1e4..dcf461fd9c0 100644
--- a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
@@ -286,8 +286,7 @@ class pdf_stdmovement extends ModelePDFMovement
 		{
 			if ($year > 0)
 			$sql .= " AND m.datem BETWEEN '".$db->idate(dol_get_first_day($year, $month, false))."' AND '".$db->idate(dol_get_last_day($year, $month, false))."'";
-			else
-			$sql .= " AND date_format(m.datem, '%m') = '$month'";
+			else $sql .= " AND date_format(m.datem, '%m') = '$month'";
 		}
 		elseif ($year > 0)
 		{
@@ -363,8 +362,7 @@ class pdf_stdmovement extends ModelePDFMovement
 				$i = 0;
 				$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
 				if ($msid) $texte = $langs->trans('StockMovementForId', $msid);
-				else
-				{
+				else {
 					$texte = $langs->trans("ListOfStockMovements");
 					if ($id) $texte .= ' ('.$langs->trans("ForThisWarehouse").')';
 				}
@@ -376,8 +374,7 @@ class pdf_stdmovement extends ModelePDFMovement
 				$dir = $conf->stock->dir_output."/movement";
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				if (!empty($search_inventorycode)) $objectref .= "_".$id."_".$search_inventorycode;
 				if ($search_type_mouvement) $objectref .= "_".$search_type_mouvement;
@@ -540,18 +537,16 @@ class pdf_stdmovement extends ModelePDFMovement
 									$pdf->setPage($pageposafter + 1);
 								}
 							}
-							else
-							{
+							else {
 								// We found a page break
 
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
-								else
-									$showpricebeforepagebreak = 0;
+								else $showpricebeforepagebreak = 0;
 							}
 						}
-						else	// No pagebreak
+						else // No pagebreak
 						{
 							$pdf->commitTransaction();
 						}
@@ -667,8 +662,7 @@ class pdf_stdmovement extends ModelePDFMovement
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 							}
-							else
-							{
+							else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -683,8 +677,7 @@ class pdf_stdmovement extends ModelePDFMovement
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 							}
-							else
-							{
+							else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -720,8 +713,7 @@ class pdf_stdmovement extends ModelePDFMovement
 					$pdf->SetXY($this->postotalht, $curY);
 					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $totalunit, 0, 'R', 0);
 				}
-				else
-				{
+				else {
 					dol_print_error($db);
 				}
 
@@ -746,8 +738,7 @@ class pdf_stdmovement extends ModelePDFMovement
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
 				}
-				else
-				{
+				else {
 					$height_note = 0;
 				}
 
@@ -763,8 +754,7 @@ class pdf_stdmovement extends ModelePDFMovement
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
-				else
-				{
+				else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -803,14 +793,12 @@ class pdf_stdmovement extends ModelePDFMovement
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PRODUCT_OUTPUTDIR");
 			return 0;
 		}
@@ -994,16 +982,14 @@ class pdf_stdmovement extends ModelePDFMovement
 	            $height = pdf_getHeightForLogo($logo);
 	            $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 	        }
-	        else
-	        {
+	        else {
 	            $pdf->SetTextColor(200, 0, 0);
 	            $pdf->SetFont('', 'B', $default_font_size - 2);
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 	        }
 	    }
-	    else
-	    {
+	    else {
 	        $text = $this->emetteur->name;
 	        $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 	    }
@@ -1046,8 +1032,7 @@ class pdf_stdmovement extends ModelePDFMovement
 		{
 			$pdf->MultiCell(150, 3, $e->label, '', 'R');
 		}
-		else
-		{
+		else {
 			$pdf->MultiCell(150, 3, $outputlangs->transnoentities("None"), '', 'R');
 		}
 
@@ -1085,8 +1070,7 @@ class pdf_stdmovement extends ModelePDFMovement
 			$obj = $db->fetch_object($resqlbis);
 			$lastmovementdate = $db->jdate($obj->datem);
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -1094,8 +1078,7 @@ class pdf_stdmovement extends ModelePDFMovement
 		{
 			$toWrite = dol_print_date($lastmovementdate, 'dayhour').' ';
 		}
-		else
-		{
+		else {
 			$toWrite = $outputlangs->transnoentities("None");
 		}
 
diff --git a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
index 2e3b4e177d7..551d960008a 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -234,8 +234,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$dir = $conf->fournisseur->facture->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
                 $dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$objectref;
@@ -425,17 +424,15 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 								$pdf->setPage($pageposafter + 1);
 							}
 						}
-						else
-						{
+						else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 						}
 					}
-					else	// No pagebreak
+					else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -536,8 +533,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -552,8 +548,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -571,8 +566,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
-				else
-				{
+				else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -615,14 +609,12 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "SUPPLIER_OUTPUTDIR");
 			return 0;
 		}
@@ -733,8 +725,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2, 0, $outputlangs), 0, 'R', 1);
 			}
 		}
-		else
-		{
+		else {
 			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 			//{
 			//Local tax 1
@@ -1049,8 +1040,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1148,8 +1138,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 		}
-		else
-		{
+		else {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(255, 0, 0);
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
index c821e6b60aa..70c20a77fb3 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
@@ -193,8 +193,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
         	if ($obj) $max = intval($obj->max);
         	else $max = 0;
         }
-        else
-        {
+        else {
         	return -1;
         }
 
diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index d7f48915308..7be80850526 100644
--- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
@@ -138,8 +138,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -239,8 +238,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				$dir = $conf->fournisseur->commande->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->fournisseur->commande->dir_output.'/'.$objectref;
@@ -274,8 +272,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
-				else
-				{
+				else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -308,8 +305,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
             			$contactobject = $object->contact;
                     }
 				}
-				else
-				{
+				else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -396,7 +392,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else    // Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -407,8 +403,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
@@ -432,8 +427,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
 								catch (OdfException $e)
@@ -507,8 +501,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 
 				return 1; // Success
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 657160a9a1b..b08adfcb97c 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -222,8 +222,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
-				else
-				{
+				else {
 					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
@@ -258,8 +257,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$dir = $conf->fournisseur->commande->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->fournisseur->commande->dir_output.'/'.$objectref;
@@ -491,8 +489,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				    $tab_height = $tab_height - $height_note;
 				    $tab_top = $posyafter + 6;
 				}
-				else
-				{
+				else {
 				    $height_note = 0;
 				}
 
@@ -535,8 +532,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 						// Allows data in the first page if description is long enough to break in multiples pages
 						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 							$showpricebeforepagebreak = 1;
-						else
-							$showpricebeforepagebreak = 0;
+						else $showpricebeforepagebreak = 0;
 					}
 
 					if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
@@ -574,17 +570,15 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					                $pdf->setPage($pageposafter + 1);
 					            }
 					        }
-					        else
-					        {
+					        else {
 					            // We found a page break
 					        	// Allows data in the first page if description is long enough to break in multiples pages
 					        	if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 					        		$showpricebeforepagebreak = 1;
-					        	else
-					        		$showpricebeforepagebreak = 0;
+					        	else $showpricebeforepagebreak = 0;
 					        }
 					    }
-					    else	// No pagebreak
+					    else // No pagebreak
 					    {
 					        $pdf->commitTransaction();
 					    }
@@ -734,8 +728,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					    {
 					        $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
 					    }
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -750,8 +743,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					    {
 					        $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
 					    }
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -769,8 +761,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 			    }
-				else
-				{
+				else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -813,14 +804,12 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "SUPPLIER_OUTPUTDIR");
 			return 0;
 		}
@@ -1009,8 +998,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
 			}
 		}
-		else
-		{
+		else {
 			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 			//{
     			//Local tax 1
@@ -1243,16 +1231,14 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
-			else
-			{
+			else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
 		}
-		else
-		{
+		else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -1296,8 +1282,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date_commande, "day", false, $outputlangs, true), '', 'R');
 		}
-		else
-		{
+		else {
 			$posy += 5;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(255, 0, 0);
@@ -1645,8 +1630,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	    {
 	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 	    }
-	    else
-	    {
+	    else {
 	        $this->cols = $hookmanager->resArray;
 	    }
 	}
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
index 4a27b58f8ae..c2a6af6c05e 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -238,8 +238,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
-				else
-				{
+				else {
 					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
@@ -274,8 +273,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$dir = $conf->fournisseur->commande->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->fournisseur->commande->dir_output.'/'.$objectref;
@@ -447,8 +445,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						// Allows data in the first page if description is long enough to break in multiples pages
 						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 							$showpricebeforepagebreak = 1;
-						else
-							$showpricebeforepagebreak = 0;
+						else $showpricebeforepagebreak = 0;
 					}
 
 					if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
@@ -467,8 +464,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					{
 						$descWidth = $this->posxpicture - $curX;
 					}
-					else
-					{
+					else {
 						$descWidth = $this->posxtva - $curX;
 					}
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $descWidth, 3, $curX, $curY, $hideref, $hidedesc, 1);
@@ -492,17 +488,15 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 								$pdf->setPage($pageposafter + 1);
 							}
 						}
-						else
-						{
+						else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 						}
 					}
-					else	// No pagebreak
+					else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -617,8 +611,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -633,8 +626,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -652,8 +644,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
-				else
-				{
+				else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -696,14 +687,12 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "SUPPLIER_OUTPUTDIR");
 			return 0;
 		}
@@ -892,8 +881,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
 			}
 		}
-		else
-		{
+		else {
 			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 			//{
     			//Local tax 1
@@ -1159,16 +1147,14 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
-			else
-			{
+			else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
 		}
-		else
-		{
+		else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -1212,8 +1198,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date_commande, "day", false, $outputlangs, true), '', 'R');
 		}
-		else
-		{
+		else {
 			$posy += 5;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(255, 0, 0);
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
index df4a60b10e2..c8129f1e491 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
@@ -117,8 +117,7 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 		{
 			return true;
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
index 0ad8b391faf..060394beca6 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -231,8 +231,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 				$dir = $conf->fournisseur->payment->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
                 $dir = $conf->fournisseur->payment->dir_output.'/'.$objectref;
@@ -360,17 +359,15 @@ class pdf_standard extends ModelePDFSuppliersPayments
 								$pdf->setPage($pageposafter + 1);
 							}
 						}
-						else
-						{
+						else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 						}
 					}
-					else	// No pagebreak
+					else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -433,8 +430,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -449,8 +445,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -468,8 +463,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
-				else
-				{
+				else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -506,14 +500,12 @@ class pdf_standard extends ModelePDFSuppliersPayments
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "SUPPLIER_OUTPUTDIR");
 			return 0;
 		}
@@ -663,16 +655,14 @@ class pdf_standard extends ModelePDFSuppliersPayments
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
-			else
-			{
+			else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
 		}
-		else
-		{
+		else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
index 9baa8d2dafe..4ee8ed90490 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
@@ -137,8 +137,7 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
 		}
-		else
-		{
+		else {
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index c97d2f94d63..8b0d7f108a1 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -142,8 +142,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -307,8 +306,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
-				else
-				{
+				else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -338,15 +336,13 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 					{
 						$socobject = $object->contact;
 					}
-					else
-					{
+					else {
 						$socobject = $object->thirdparty;
 						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				}
-				else
-				{
+				else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -432,7 +428,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else    // Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -443,8 +439,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
@@ -468,8 +463,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
 								catch (OdfException $e)
@@ -541,8 +535,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 
 				return 1; // Success
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index afaf4987e04..fd5fb653a5a 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -234,8 +234,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
-				else
-				{
+				else {
 					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
@@ -266,8 +265,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$dir = $conf->supplier_proposal->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			}
-			else
-			{
+			else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->supplier_proposal->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -432,8 +430,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						// Allows data in the first page if description is long enough to break in multiples pages
 						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 							$showpricebeforepagebreak = 1;
-						else
-							$showpricebeforepagebreak = 0;
+						else $showpricebeforepagebreak = 0;
 					}
 
 					if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
@@ -452,8 +449,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					{
 						$descWidth = $this->posxpicture - $curX;
 					}
-					else
-					{
+					else {
 						$descWidth = $this->posxtva - $curX;
 					}
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $descWidth, 3, $curX, $curY, $hideref, $hidedesc, 1);
@@ -480,17 +476,15 @@ class pdf_aurore extends ModelePDFSupplierProposal
 								$pdf->setPage($pageposafter + 1);
 							}
 						}
-						else
-						{
+						else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 						}
 					}
-					else	// No pagebreak
+					else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -613,8 +607,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -629,8 +622,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						}
-						else
-						{
+						else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -648,8 +640,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
-				else
-				{
+				else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -694,14 +685,12 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 				return 1; // No error
 			}
-			else
-			{
+			else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "SUPPLIER_PROPOSAL_OUTPUTDIR");
 			return 0;
 		}
@@ -943,8 +932,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			{
 				// Nothing to do
 			}
-			else
-			{
+			else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1315,16 +1303,14 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
-			else
-			{
+			else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
 		}
-		else
-		{
+		else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -1453,8 +1439,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				else $socname = $object->thirdparty->name;
 				$carac_client_name = $outputlangs->convToOutputCharset($socname);
 			}
-			else
-			{
+			else {
 				$carac_client_name = $outputlangs->convToOutputCharset($object->thirdparty->name);
 			}
 
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
index 37ba98b0058..02b1c5a6684 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
@@ -109,8 +109,7 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 		{
 			return true;
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -142,8 +141,7 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
 		}
-		else
-		{
+		else {
 			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index dedf0844245..76869791d93 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -152,8 +152,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 				print 'Failed to open log file '.($dolibarr_main_prod ?basename($logfile) : $logfile);
 			}
 		}
-		else
-		{
+		else {
 			$logLevels = array(
 				LOG_EMERG => 'EMERG',
 				LOG_ALERT => 'ALERT',
diff --git a/htdocs/core/modules/syslog/mod_syslog_syslog.php b/htdocs/core/modules/syslog/mod_syslog_syslog.php
index 56ca1825ab4..d2f1200cc08 100644
--- a/htdocs/core/modules/syslog/mod_syslog_syslog.php
+++ b/htdocs/core/modules/syslog/mod_syslog_syslog.php
@@ -93,8 +93,7 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 
 			dol_syslog("admin/syslog: facility ".$facility);
 		}
-		else
-		{
+		else {
 		    $errors[] = $langs->trans("ErrorUnknownSyslogConstant", $facility);
 		}
 
diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
index 881ba4cb469..5c2468e29c6 100644
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -139,8 +139,7 @@ class doc_generic_user_odt extends ModelePDFUser
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -289,8 +288,7 @@ class doc_generic_user_odt extends ModelePDFUser
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
-				else
-				{
+				else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -322,8 +320,7 @@ class doc_generic_user_odt extends ModelePDFUser
                         $contactobject = $object->contact;
                     }
 				}
-				else
-				{
+				else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -370,7 +367,7 @@ class doc_generic_user_odt extends ModelePDFUser
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else    // Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -429,8 +426,7 @@ class doc_generic_user_odt extends ModelePDFUser
 
 				return 1; // Success
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
index 1b1d6ba1dab..9e227a43588 100644
--- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
+++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
@@ -142,8 +142,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -292,8 +291,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
-				else
-				{
+				else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -325,8 +323,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
                         $contactobject = $object->contact;
                     }
 				}
-				else
-				{
+				else {
 					$socobject = $object->thirdparty;
 				}
 				// Make substitution
@@ -402,14 +399,13 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				foreach ($tmparray as $key=>$value)
 				{
-					try
-					{
+					try {
 						if (preg_match('/logo$/', $key)) // Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 						}
-						else    // Text
+						else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -420,8 +416,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
@@ -445,8 +440,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									if (!is_array($val)) {
 										$listlines->setVars($key, $val, true, 'UTF-8');
 									}
@@ -520,8 +514,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 
 				return 1; // Success
 			}
-			else
-			{
+			else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 2686efa6419..959d944352b 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -87,7 +87,7 @@ elseif ($modulepart == 'bank')
 	if (!$user->rights->banque->lire) accessforbidden();
 	$accessallowed = 1;
 }
-else	// ticket, holiday, expensereport, societe...
+else // ticket, holiday, expensereport, societe...
 {
 	$result = restrictedArea($user, $modulepart, $id, $modulepart);
 	if (empty($user->rights->$modulepart->read) && empty($user->rights->$modulepart->lire)) accessforbidden();
@@ -286,8 +286,7 @@ if ($cancel)
 		header("Location: ".$backtourl);
 		exit;
 	}
-	else
-	{
+	else {
 	    dol_print_error('', 'Cancel on photo_resize with a not supported value of modulepart='.$modulepart);
 	    exit;
 	}
@@ -347,14 +346,12 @@ if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex")
 			header("Location: ".$backtourl);
 			exit;
 		}
-		else
-		{
+		else {
     	    dol_print_error('', 'confirm_resize on photo_resize without backtourl defined for modulepart='.$modulepart);
     	    exit;
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($result, null, 'errors');
 		$_GET['file'] = $_POST["file"];
 		$action = '';
@@ -417,14 +414,12 @@ if ($action == 'confirm_crop')
 			header("Location: ".$backtourl);
 			exit;
 		}
-		else
-		{
+		else {
     	    dol_print_error('', 'confirm_crop on photo_resize without backtourl defined for modulepart='.$modulepart);
     	    exit;
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($result, null, 'errors');
 		$_GET['file'] = $_POST["file"];
 		$action = '';
diff --git a/htdocs/core/search.php b/htdocs/core/search.php
index b82536edbd2..01c7c078214 100644
--- a/htdocs/core/search.php
+++ b/htdocs/core/search.php
@@ -148,7 +148,6 @@ if (!empty($_SERVER['HTTP_REFERER']))
 	header("Location: ".$_SERVER['HTTP_REFERER']);
 	exit;
 }
-else
-{
+else {
 	print 'The wrapper search.php was called without any search criteria';
 }
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index 119d7ff9a41..5d61ccecdb3 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -75,8 +75,7 @@ if ($conf->use_javascript_ajax && 1 == 2)   // select2 is ko with jmobile
 	$selected = -1;
 	$searchform .= '<br><br>'.$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'minwidth300', 1, $langs->trans("Search"), 0);
 }
-else
-{
+else {
 	$usedbyinclude = 1; // Used into next include
 	$showtitlebefore = GETPOST('showtitlebefore', 'int');
 	include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 80a7cac7de3..960e0e57401 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -218,8 +218,7 @@ if (in_array($type, array_keys($typewecanchangeinto)))
     }
     print '</select>';
 }
-else
-{
+else {
 	print $type2label[$type];
     print '<input type="hidden" name="type" id="type" value="'.$type.'">';
 }
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index 96620da28d9..4a6c7d67494 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -118,8 +118,7 @@ if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafiel
 		print "</tr>";
 	}
 }
-else
-{
+else {
 	$colspan = 13;
 	if (!empty($conf->multicompany->enabled))  $colspan++;
 
diff --git a/htdocs/core/tpl/bloc_comment.tpl.php b/htdocs/core/tpl/bloc_comment.tpl.php
index 0e9e63bff12..d20894d6a03 100644
--- a/htdocs/core/tpl/bloc_comment.tpl.php
+++ b/htdocs/core/tpl/bloc_comment.tpl.php
@@ -112,8 +112,7 @@ if (!empty($object->comments))
             $doleditor = new DolEditor('comment_description', $comment->description, '', 80, 'dolibarr_notes', 'In', 0, true, true, ROWS_3, '100%');
             print $doleditor->Create(1);
         }
-        else
-        {
+        else {
             print $comment->description;
         }
 		print '</div>'; // End comment-description
@@ -125,8 +124,7 @@ if (!empty($object->comments))
 
             print '</form>';
         }
-        else
-        {
+        else {
             if ($fk_user == $user->id || $user->admin == 1)
             {
                 print '<a class="comment-edit comment-cell" href="'.$varpage.'?action=editcomment&id='.$id.'&withproject=1&idcomment='.$comment->id.'#comment" title="'.$langs->trans('Edit').'">';
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 7e2dc1f420e..6087ca6e906 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -52,8 +52,7 @@ if ($action == 'presend')
 		{
 			$fileparams = dol_most_recent_file($diroutput.'/'.get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+');
 		}
-		else
-		{
+		else {
 			$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
 		}
 
@@ -104,8 +103,7 @@ if ($action == 'presend')
 			{
 				$fileparams = dol_most_recent_file($diroutput.'/'.get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+');
 			}
-			else
-			{
+			else {
 				$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
 			}
 
@@ -161,8 +159,7 @@ if ($action == 'presend')
 	{
 		$liste['thirdparty'] = $object->getFullName($outputlangs)." <".$object->email.">";
 	}
-	else
-	{
+	else {
 		if (is_object($object->thirdparty))
 		{
 			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) {
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index e9f881accd2..0c1931d480f 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -178,8 +178,7 @@ foreach (array('internal', 'external') as $source)
 	{
 		$contactlist = $objectsrc->liste_contact(-1, $source);
 	}
-	else
-	{
+	else {
 		$contactlist = $object->liste_contact(-1, $source);
 	}
 
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index 0d2949b4e24..efb89043b6b 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -36,8 +36,7 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
 					}
 					$value = $datenotinstring;
 				}
-				else
-				{
+				else {
 					$value = $obj->$tmpkey;
 				}
 				// If field is a computed field, we make computation to get value
diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
index d6ebb8b919f..b3512136a10 100644
--- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
@@ -39,8 +39,7 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
                 	// TODO
                 	// Use showInputField in a particular manner to have input with a comparison operator, not input for a specific value date-hour-minutes
                 }
-                else
-                {
+                else {
                     // for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
                     $morecss = '';
                     if (in_array($typeofextrafield, array('link', 'sellist'))) $morecss = 'maxwidth200';
diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
index 9a83cbb42aa..169dd34fee1 100644
--- a/htdocs/core/tpl/extrafields_list_search_title.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
@@ -27,8 +27,7 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
 				if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') {
 					print '<th class="liste_titre thseparator"></th>';
 				}
-				else
-				{
+				else {
 					$tooltip = empty($extrafields->attributes[$extrafieldsobjectkey]['help'][$key]) ? '' : $extrafields->attributes[$extrafieldsobjectkey]['help'][$key];
 
 					print getTitleFieldOfList($extrafields->attributes[$extrafieldsobjectkey]['label'][$key], 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align ? 'align="'.$align.'" data-titlekey="'.$key.'"' : 'data-titlekey="'.$key.'"'), $sortfield, $sortorder, '', $disablesortlink, $tooltip)."\n";
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 198a3910747..a7379a69d94 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -87,8 +87,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 		{
 			$value = (isset($_POST["options_".$key]) ? $_POST["options_".$key] : $object->array_options["options_".$key]);
 		}
-		else
-		{
+		else {
 			$value = $object->array_options["options_".$key];
 			//var_dump($key.' - '.$value);
 		}
@@ -114,8 +113,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 
 			$lastseparatorkeyfound = $key;
 		}
-		else
-		{
+		else {
 			print '<tr class="trextrafields_collapse'.$extrafields_collapse_num;
 			/*if ($extrafields_collapse_num && $extrafields_collapse_num_old && $extrafields_collapse_num != $extrafields_collapse_num_old) {
 				print ' trextrafields_collapse_new';
@@ -192,8 +190,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 
 				print '</form>';
 			}
-			else
-			{
+			else {
 				//var_dump($key.'-'.$value.'-'.$object->table_element);
 				print $extrafields->showOutputField($key, $value, '', $object->table_element);
 			}
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index b7d083e8626..46790c28209 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -78,8 +78,7 @@ if ($permtoadd)
     print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
     print '</a>';
 }
-else
-{
+else {
     print '<a href="#" class="inline-block valignmiddle toolbarbutton" title="'.$langs->trans("NotAllowed").'">';
     print '<img class="toolbarbutton disabled" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
     print '</a>';
@@ -178,7 +177,7 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
 
 	    print '</td></tr>';
     }
-    else	// Show filtree when ajax is disabled (rare)
+    else // Show filtree when ajax is disabled (rare)
     {
         print '<tr><td style="padding-left: 20px">';
 
diff --git a/htdocs/core/tpl/list_print_total.tpl.php b/htdocs/core/tpl/list_print_total.tpl.php
index 33be5fb99d1..f4f6974ac08 100644
--- a/htdocs/core/tpl/list_print_total.tpl.php
+++ b/htdocs/core/tpl/list_print_total.tpl.php
@@ -15,8 +15,7 @@ if (isset($totalarray['pos']))
 	{
 		$i++;
 		if (!empty($totalarray['pos'][$i]))  print '<td class="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
-		else
-		{
+		else {
 			if ($i == 1)
 			{
 				if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 97bece99852..e0245175768 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -254,8 +254,7 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->fil
 
 	$url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
 	if (!empty($url)) print '<a class="alogin" href="'.$url.'">'.$langs->trans("LoginUsingOpenID").'</a>';
-	else
-	{
+	else {
 		$langs->load("errors");
 		print '<font class="warning">'.$langs->trans("ErrorOpenIDSetupNotComplete", 'MAIN_AUTHENTICATION_OPENID_URL').'</font>';
 	}
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 492590c65e4..c507144b151 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -99,8 +99,7 @@ if ($massaction == 'presend')
 			$fuser->fetch($thirdpartyid);
 			$liste['thirdparty'] = $fuser->getFullName($langs)." &lt;".$fuser->email."&gt;";
 		}
-		else
-		{
+		else {
 			$soc = new Societe($db);
 			$soc->fetch($thirdpartyid);
 			foreach ($soc->thirdparty_and_contact_email_array(1) as $key => $value) {
@@ -159,8 +158,7 @@ if ($massaction == 'presend')
 		print ' - <a href="javascript: window.history.go(-1)">'.$langs->trans("GoBack").'</a>';
 		$arrayofmassactions = array();
 	}
-	else
-	{
+	else {
 		print $formmail->get_form();
 	}
 
diff --git a/htdocs/core/tpl/object_discounts.tpl.php b/htdocs/core/tpl/object_discounts.tpl.php
index 8af029ce071..10db8476bef 100644
--- a/htdocs/core/tpl/object_discounts.tpl.php
+++ b/htdocs/core/tpl/object_discounts.tpl.php
@@ -43,8 +43,7 @@ if ($fixedDiscount > 0)
 	$translationKey = (!empty($discount_type)) ? 'HasRelativeDiscountFromSupplier' : 'CompanyHasRelativeDiscount';
 	print $langs->trans($translationKey, $fixedDiscount).'.';
 }
-else
-{
+else {
 	$translationKey = (!empty($discount_type)) ? 'HasNoRelativeDiscountFromSupplier' : 'CompanyHasNoRelativeDiscount';
 	print $langs->trans($translationKey).'.';
 }
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 0fb1aff011d..baa57c7d1c9 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -136,8 +136,7 @@ if ($nolinesbefore) {
 				print '<td class="margininfos linecolmargin1 right">';
 				if ($conf->global->MARGIN_TYPE == "1")
 					echo $langs->trans('BuyingPrice');
-				else
-					echo $langs->trans('CostPrice');
+				else echo $langs->trans('CostPrice');
 				echo '</td>';
 				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) echo '<td class="margininfos linecolmargin2 right"><span class="np_marginRate">'.$langs->trans('MarginRate').'</span></td>';
 				if (!empty($conf->global->DISPLAY_MARK_RATES)) echo '<td class="margininfos linecolmargin2 right"><span class="np_markRate">'.$langs->trans('MarkRate').'</span></td>';
@@ -187,8 +186,7 @@ if ($nolinesbefore) {
 				echo '</label>';
 				echo ' ';
 			}
-			else
-			{
+			else {
 				echo '<input type="hidden" id="prod_entry_mode_free" name="prod_entry_mode" value="free">';
 				// Show type selector
 				if ($forceall >= 0)
@@ -214,8 +212,7 @@ if ($nolinesbefore) {
 				elseif ((empty($conf->product->enabled) && !empty($conf->service->enabled)) || ($object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))) echo $langs->trans('PredefinedServicesToSell');
 				else echo $langs->trans('PredefinedProductsAndServicesToSell');
 			}
-			else
-			{
+			else {
 				if (!empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToPurchase');
 				elseif (empty($conf->product->enabled) && !empty($conf->service->enabled)) echo $langs->trans('PredefinedServicesToPurchase');
 				else echo $langs->trans('PredefinedProductsAndServicesToPurchase');
@@ -232,8 +229,7 @@ if ($nolinesbefore) {
 					// hide products in closed warehouse, but show products for internal transfer
 					$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
 				}
-				else
-				{
+				else {
 					$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOST('combinations', 'array'));
 				}
 				if (!empty($conf->global->MAIN_AUTO_OPEN_SELECT2_ON_FOCUS_FOR_CUSTOMER_PRODUCTS))
@@ -255,8 +251,7 @@ if ($nolinesbefore) {
 					<?php
 				}
 			}
-			else
-			{
+			else {
 				// $senderissupplier=2 is the same as 1 but disables test on minimum qty and disable autofill qty with minimum
 				if ($senderissupplier != 2)
 				{
@@ -267,8 +262,7 @@ if ($nolinesbefore) {
 					);
 					$alsoproductwithnosupplierprice = 0;
 				}
-				else
-				{
+				else {
 					$ajaxoptions = array(
 					'update' => array('remise_percent' => 'discount')			// html id tags that will be edited with each ajax json response key
 					);
@@ -449,8 +443,7 @@ if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dat
 		print ' &nbsp; '.$langs->trans("DateEndPlanned").' ';
 		print $form->selectDate($date_end, "date_end", $usehm, $usehm, 1, "addproduct");
 	}
-	else
-	{
+	else {
 		print $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
 		print $form->selectDate($date_start, 'date_start', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, 1, "addproduct", 1, 0);
 		print ' '.$langs->trans('to').' ';
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index d316afb6966..8957021d359 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -231,8 +231,7 @@ $coldisplay++;
 				// if credit note, dont allow to modify margin
 				if ($line->subprice < 0)
 					echo '<td class="right nowrap margininfos">'.$margin_rate.'<span class="hideonsmartphone">%</span></td>';
-				else
-					echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
+				else echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
 				$coldisplay++;
 			}
 			elseif (!empty($conf->global->DISPLAY_MARK_RATES))
@@ -241,8 +240,7 @@ $coldisplay++;
 				// if credit note, dont allow to modify margin
 				if ($line->subprice < 0)
 					echo '<td class="right nowrap margininfos">'.$mark_rate.'<span class="hideonsmartphone">%</span></td>';
-				else
-					echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';
+				else echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';
 				$coldisplay++;
 			}
 		}
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 8849020b885..34f78ae7fcc 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -111,22 +111,19 @@ if (($line->info_bits & 2) == 2) {
 			$discount->fetch($line->fk_remise_except);
 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
 		}
-		else
-		{
+		else {
 			print ($txt ? ' - ' : '').dol_htmlentitiesbr($line->description);
 		}
 	}
 }
-else
-{
+else {
 	$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE ? 'dayhour' : 'day';
 
     if ($line->fk_product > 0)
 	{
 		print $form->textwithtooltip($text, $description, 3, '', '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
 	}
-	else
-	{
+	else {
 		$type = (!empty($line->product_type) ? $line->product_type : $line->fk_product_type);
 		if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
 		else $text = img_object($langs->trans('Product'), 'product');
@@ -178,8 +175,7 @@ if ($user->rights->fournisseur->lire && $line->fk_fournprice > 0)
 	{
 		print $productfourn->getNomUrl();
 	}
-	else
-	{
+	else {
 		print $productfourn->ref_supplier;
 	}
 }
diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index 2680a763a59..3e92af33a4d 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -50,8 +50,7 @@ if ((array) $linked_resources && count($linked_resources) > 0)
 			print '<div class="tagtd right"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div>';
 			print '</div>';
 		}
-		else
-		{
+		else {
 			$class = '';
 			if ($linked_resource['rowid'] == GETPOST('lineid'))
 				$class = 'highlight';
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index fceb1552f0b..591939c6156 100644
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -203,8 +203,7 @@ class InterfaceLogevents extends DolibarrTriggers
         {
             return 1;
         }
-        else
-        {
+        else {
             $error = "Failed to insert security event: ".$event->error;
             $this->errors[] = $error;
             $this->error = $error;
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 49939277f49..46a5df282d2 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -812,8 +812,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		        $tmpuser->fetch($object->oldcopy->fk_user_assign);
 		        $object->actionmsg .= "\n".$langs->transnoentities("OldUser").': '.$tmpuser->getFullName($langs);
 		    }
-		    else
-		    {
+		    else {
 		        $object->actionmsg .= "\n".$langs->transnoentities("OldUser").': '.$langs->trans("None");
 		    }
 		    if ($object->fk_user_assign > 0)
@@ -822,14 +821,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		        $tmpuser->fetch($object->fk_user_assign);
 		        $object->actionmsg .= "\n".$langs->transnoentities("NewUser").': '.$tmpuser->getFullName($langs);
 		    }
-		    else
-		    {
+		    else {
 		        $object->actionmsg .= "\n".$langs->transnoentities("NewUser").': '.$langs->trans("None");
 		    }
 		    $object->sendtoid = 0;
 		}
 		// TODO Merge all previous cases into this generic one
-		else	// $action = BILL_DELETE, TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, ...
+		else // $action = BILL_DELETE, TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, ...
 		{
 		    // Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at begining of this function).
 		    // Note that these key can be set in agenda setup, only if defined into c_action_trigger
@@ -867,8 +865,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         {
             if (count($object->sendtoid) == 1) $contactforaction->fetch(reset($object->sendtoid));
         }
-        else
-        {
+        else {
             if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
         }
         // Set societeforaction.
@@ -952,8 +949,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$_SESSION['LAST_ACTION_CREATED'] = $ret;
 			return 1;
 		}
-		else
-		{
+		else {
             $this->error = "Failed to insert event : ".$actioncomm->error." ".join(',', $actioncomm->errors);
             $this->errors = $actioncomm->errors;
 
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 2135f463ca7..7740191c94b 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -143,8 +143,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 			$this->errors = $b->errors;
 			return -1;
 		}
-		else
-		{
+		else {
 			return 1;
 		}
     }
diff --git a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
index be5465c06f2..ce9e156883d 100644
--- a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
@@ -72,8 +72,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
     			$this->errors = $object->context['linkto']->errors;
     			$return = -1;
     		}
-			else
-			{
+			else {
 				$return = 1;
 			}
 
@@ -90,8 +89,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
         		$this->errors = $object->context['unlinkoff']->errors;
         		$return = -1;
         	}
-        	else
-        	{
+        	else {
         		$return = 1;
         	}
 
@@ -110,8 +108,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
                 if (!empty($object->error)) $this->errors[] = $object->error;
                 $return = -1;
             }
-            else
-            {
+            else {
                 $return = 1;
             }
 
@@ -133,8 +130,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
                         if (!empty($object->oldcopy->error)) $this->errors[] = $object->oldcopy->error;
                         $return = -1;
                     }
-                    else
-                    {
+                    else {
                         $return = 1;
                     }
                 }
@@ -145,8 +141,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
                     if (!empty($object->error)) $this->errors[] = $object->error;
                     $return = -1;
                 }
-                else
-                {
+                else {
                     $return = 1;
                 }
             }
@@ -165,8 +160,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 				if (!empty($object->error)) $this->errors[] = $object->error;
 				$return = -1;
 			}
-			else
-			{
+			else {
 				$return = 1;
 			}
 
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 6bd33c5b2f9..b3625c09e47 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -171,8 +171,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 
 						$ok = 1;
 					}
-					else
-					{
+					else {
 						$this->error = $userstat->error;
 						$this->errors = $userstat->errors;
 					}
diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index e6c2df36ee1..303f4a523ad 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -178,8 +178,7 @@ class InterfaceStripe extends DolibarrTriggers
 										$customer->createTaxId($customer->id, array('type'=>'eu_vat', 'value'=>$vatcleaned));
 									}
 								}
-								else
-								{
+								else {
 									$taxids = $customer->allTaxIds($customer->id);
 									if (is_array($taxids->data))
 									{
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 5c618b089a3..4ac9d00ca53 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -118,8 +118,7 @@ if ($_SERVER['PHP_SELF'] != DOL_URL_ROOT.'/website/index.php')	// If we browsing
 						header("Location: ".DOL_URL_ROOT.'/public/website/index.php?website='.$websitekey.'&pageid='.$newpageid.'&l='.GETPOST('l', 'aZ09'));
 						exit;
 					}
-					else
-					{
+					else {
 						$newpageref = $obj->pageurl;
 						header("Location: ".$newpageref.'.php?l='.GETPOST('l', 'aZ09'));
 						exit;
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index a8bca51dda3..f20ac732fd4 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -137,8 +137,7 @@ if ($action == "setlive")
 	if ($res > 0) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -238,15 +237,13 @@ if (empty($conf->stripeconnect->enabled))
             	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
             	print img_picto($langs->trans("Activated"), 'switch_on');
             }
-            else
-            {
+            else {
             	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=1">';
             	print img_picto($langs->trans("Disabled"), 'switch_off');
             }
             //print $endpoint;
         }
-        else
-        {
+        else {
             print img_picto($langs->trans("inactive"), 'statut5');
         }
 	}
@@ -311,22 +308,19 @@ if (empty($conf->stripeconnect->enabled))
                 print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
                 print img_picto($langs->trans("Activated"), 'switch_on');
             }
-            else
-            {
+            else {
                 print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=1">';
                 print img_picto($langs->trans("Disabled"), 'switch_off');
             }
             //print $endpoint;
         }
-        else
-        {
+        else {
             print img_picto($langs->trans("inactive"), 'statut5');
         }
 	}
     print '</td></tr>';
 }
-else
-{
+else {
 	print '<tr class="oddeven"><td>'.$langs->trans("StripeConnect").'</td>';
 	print '<td>'.$langs->trans("StripeConnect_Mode").'</td><td></td></tr>';
 }
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 44c7db306a2..74fa1aafc43 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -66,8 +66,7 @@ if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETP
 	$servicestatus = '0';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
 }
-else
-{
+else {
 	$service = 'StripeLive';
 	$servicestatus = '1';
 }
@@ -86,8 +85,7 @@ if (!$rowid)
 	{
 		$list = \Stripe\Charge::all($option, array("stripe_account" => $stripeacc));
 	}
-	else
-	{
+	else {
 		$list = \Stripe\Charge::all($option);
 	}
 
@@ -184,16 +182,14 @@ if (!$rowid)
 		{
 			$societestatic->fetch($charge->metadata->dol_thirdparty_id);
 		}
-		else
-		{
+		else {
 			$societestatic->id = 0;
 		}
 		if (!empty($tmparray['MEM']) && $tmparray['MEM'] > 0)
 		{
 			$memberstatic->fetch($tmparray['MEM']);
 		}
-		else
-		{
+		else {
 			$memberstatic->id = 0;
 		}
 
diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php
index 33b19384085..4b68ad72b09 100644
--- a/htdocs/stripe/class/actions_stripe.class.php
+++ b/htdocs/stripe/class/actions_stripe.class.php
@@ -76,8 +76,7 @@ class ActionsStripeconnect
 			$service = 'StripeTest';
 			dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
 		}
-		else
-		{
+		else {
 			$service = 'StripeLive';
 		}
 
@@ -209,8 +208,7 @@ class ActionsStripeconnect
 						$langs->load("withdrawals");
 						print '<a class="butActionDelete" href="'.dol_buildpath('/stripeconnect/payment.php?facid='.$object->id.'&action=create', 1).'" title="'.dol_escape_htmltag($langs->trans("StripeConnectPay")).'">'.$langs->trans("StripeConnectPay").'</a>';
 					}
-					else
-					{
+					else {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
 					}
 				}
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index a72e5291f58..4a56a2a1542 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -261,8 +261,7 @@ class Stripe extends CommonObject
 				}
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
@@ -499,8 +498,7 @@ class Stripe extends CommonObject
 	    				}
     				}
     			}
-    			else
-    			{
+    			else {
     			    $_SESSION["stripe_payment_intent"] = $paymentintent;
     			}
     		}
@@ -532,8 +530,7 @@ class Stripe extends CommonObject
 		{
 			return $paymentintent;
 		}
-		else
-		{
+		else {
 			return null;
 		}
 	}
@@ -675,8 +672,7 @@ class Stripe extends CommonObject
 			dol_syslog("getSetupIntent ".(is_object($setupintent) ? $setupintent->id : ''), LOG_INFO, -1);
 			return $setupintent;
 		}
-		else
-		{
+		else {
 			dol_syslog("getSetupIntent return error=".$error, LOG_INFO, -1);
 			return null;
 		}
@@ -721,8 +717,7 @@ class Stripe extends CommonObject
 							{
 								$card = $cu->sources->retrieve($cardref);
 							}
-							else
-							{
+							else {
 								$card = \Stripe\PaymentMethod::retrieve($cardref);
 							}
 						} else {
@@ -769,8 +764,7 @@ class Stripe extends CommonObject
 									$this->error = 'Creation of card on Stripe has failed';
 								}
 							}
-							else
-							{
+							else {
 								$connect = '';
 								if (!empty($stripeacc)) $connect = $stripeacc.'/';
 								$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$cu->id;
@@ -793,8 +787,7 @@ class Stripe extends CommonObject
 									$this->error = 'Creation of card on Stripe has failed';
 								}
 							}
-							else
-							{
+							else {
 								$connect = '';
 								if (!empty($stripeacc)) $connect = $stripeacc.'/';
 								$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$cu->id;
@@ -832,8 +825,7 @@ class Stripe extends CommonObject
 				}
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
@@ -944,8 +936,7 @@ class Stripe extends CommonObject
 					{
 						$charge->status = 'ok';
 					}
-					else
-					{
+					else {
 						$charge->status = 'failed';
 						$charge->failure_code = $stripe->code;
 						$charge->failure_message = $stripe->error;
@@ -1039,16 +1030,14 @@ class Stripe extends CommonObject
 						$charge->status = 'ok';
 						$charge->id = $paymentintent->id;
 					}
-					else
-					{
+					else {
 						$charge->status = 'failed';
 						$charge->failure_code = $stripe->code;
 						$charge->failure_message = $stripe->error;
 						$charge->failure_declinecode = $stripe->declinecode;
 					}
 				}
-				else
-				{
+				else {
 					$charge = \Stripe\Charge::create($paymentarray, array("idempotency_key" => "$description", "stripe_account" => "$account"));
 				}
 			}
@@ -1061,8 +1050,7 @@ class Stripe extends CommonObject
 			{
 				$return->message = 'Payment retreived by card status = '.$charge->status;
 			}
-			else
-			{
+			else {
 				if ($charge->source->type == 'card') {
 					$return->message = $charge->source->card->brand." ....".$charge->source->card->last4;
 				} elseif ($charge->source->type == 'three_d_secure') {
diff --git a/htdocs/stripe/config.php b/htdocs/stripe/config.php
index 730203245f4..1efe9a7f386 100644
--- a/htdocs/stripe/config.php
+++ b/htdocs/stripe/config.php
@@ -48,8 +48,7 @@ if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))
 {
 	$stripearrayofkeys = $stripearrayofkeysbyenv[0]; // Test
 }
-else
-{
+else {
 	$stripearrayofkeys = $stripearrayofkeysbyenv[1]; // Live
 }
 
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index 17f2423327f..741921ac63c 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -65,8 +65,7 @@ if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETP
 	$servicestatus = '0';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
 }
-else
-{
+else {
 	$service = 'StripeLive';
 	$servicestatus = '1';
 }
@@ -115,8 +114,7 @@ if (!$rowid) {
 	{
 		$payout = \Stripe\Payout::all(array("limit" => $limit), array("stripe_account" => $stripeacc));
 	}
-	else
-	{
+	else {
 		$payout = \Stripe\Payout::all(array("limit" => $limit));
 	}
 
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 3829eba4d0d..eb0ce7df09e 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -66,8 +66,7 @@ if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETP
 	$servicestatus = '0';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
 }
-else
-{
+else {
 	$service = 'StripeLive';
 	$servicestatus = '1';
 }
@@ -114,8 +113,7 @@ if (!$rowid) {
 	{
 		$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripeacc));
 	}
-	else
-	{
+	else {
 		$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit));
 	}
 
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 08479b95871..d911e310d90 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -134,16 +134,14 @@ if (empty($reshook))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		}
-		else
-		{
+		else {
 			if ($object->id > 0) {
 				$result = $object->createFromClone($user, $socid);
 				if ($result > 0) {
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit();
 				}
-				else
-				{
+				else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$action = '';
 				}
@@ -411,8 +409,7 @@ if (empty($reshook))
 						$error++;
 					}
 				} 			// Standard creation
-				else
-				{
+				else {
 					$id = $object->create($user);
 				}
 
@@ -443,14 +440,12 @@ if (empty($reshook))
 						header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
 						exit();
 					}
-					else
-					{
+					else {
 						$db->rollback();
 						$action = 'create';
 					}
 				}
-				else
-				{
+				else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$db->rollback();
 					$action = 'create';
@@ -552,8 +547,7 @@ if (empty($reshook))
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 		}
-		else
-		{
+		else {
 			$idprod = GETPOST('idprod', 'int');
 			$price_ht = '';
 			$tva_tx = '';
@@ -622,8 +616,7 @@ if (empty($reshook))
 							$productsupplier->ref_supplier = '';
 						}
 					}
-					else
-					{
+					else {
 						$fksoctosearch = $object->thirdparty->id;
 						$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 					}
@@ -738,8 +731,7 @@ if (empty($reshook))
 				{
 					$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
 				}
-				else
-				{
+				else {
 					$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 					$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
 				}
@@ -835,8 +827,7 @@ if (empty($reshook))
 				unset($_POST['date_endmonth']);
 				unset($_POST['date_endyear']);
 			}
-			else
-			{
+			else {
 				$db->rollback();
 
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -1139,8 +1130,7 @@ if ($action == 'create')
 			if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx))	$currency_tx = $objectsrc->multicurrency_tx;
 		}
 	}
-	else
-	{
+	else {
 		$cond_reglement_id 	= $soc->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $soc->mode_reglement_supplier_id;
 		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
@@ -1895,8 +1885,7 @@ if ($action == 'create')
 					if ($object->statut == SupplierProposal::STATUS_VALIDATED || $object->statut == SupplierProposal::STATUS_SIGNED) {
 						if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send_advance) {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-						} else
-							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
+						} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
 					}
 				}
 
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 97c0ee27e4e..42c30c333d6 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -274,8 +274,7 @@ class SupplierProposal extends CommonObject
             {
                 $price = $prod->multiprices[$this->thirdparty->price_level];
             }
-            else
-            {
+            else {
                 $price = $prod->price;
             }
 
@@ -347,21 +346,18 @@ class SupplierProposal extends CommonObject
                     $this->db->commit();
                     return 1;
                 }
-                else
-                {
+                else {
                     $this->db->rollback();
                     return -1;
                 }
             }
-            else
-            {
+            else {
                 $this->error = $supplier_proposalligne->error;
                 $this->db->rollback();
                 return -2;
             }
         }
-        else
-        {
+        else {
             $this->db->rollback();
             return -2;
         }
@@ -431,8 +427,7 @@ class SupplierProposal extends CommonObject
         {
             $pu = $pu_ht;
         }
-        else
-        {
+        else {
             $pu = $pu_ttc;
         }
 
@@ -493,16 +488,14 @@ class SupplierProposal extends CommonObject
                             return -1;
                         }
                     }
-                    else
-                    {
+                    else {
                         $this->error = $prod->error;
                         $this->db->rollback();
                         return -1;
                     }
                 }
             }
-            else
-            {
+            else {
                 $product_type = $type;
             }
 
@@ -623,22 +616,19 @@ class SupplierProposal extends CommonObject
                     $this->db->commit();
                     return $this->line->id;
                 }
-                else
-                {
+                else {
                     $this->error = $this->db->error();
                     $this->db->rollback();
                     return -1;
                 }
             }
-            else
-            {
+            else {
                 $this->error = $this->line->error;
                 $this->db->rollback();
                 return -2;
             }
         }
-        else
-        {
+        else {
         	$this->error = 'BadStatusOfObjectToAddLine';
         	return -5;
         }
@@ -809,15 +799,13 @@ class SupplierProposal extends CommonObject
                 $this->db->commit();
                 return $result;
             }
-            else
-            {
+            else {
                 $this->error = $this->db->error();
                 $this->db->rollback();
                 return -1;
             }
         }
-        else
-        {
+        else {
             dol_syslog(get_class($this)."::updateline Erreur -2 SupplierProposal en mode incompatible pour cette action");
             return -2;
         }
@@ -845,13 +833,11 @@ class SupplierProposal extends CommonObject
 
                 return 1;
             }
-            else
-            {
+            else {
                 return -1;
             }
         }
-        else
-        {
+        else {
             return -2;
         }
     }
@@ -1080,15 +1066,13 @@ class SupplierProposal extends CommonObject
                             // End call triggers
                         }
                     }
-                    else
-                    {
+                    else {
                         $this->error = $this->db->lasterror();
                         $error++;
                     }
                 }
             }
-            else
-            {
+            else {
                 $this->error = $this->db->lasterror();
                 $error++;
             }
@@ -1099,14 +1083,12 @@ class SupplierProposal extends CommonObject
                 dol_syslog(get_class($this)."::create done id=".$this->id);
                 return $this->id;
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 return -2;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -1168,8 +1150,7 @@ class SupplierProposal extends CommonObject
 
             // TODO Change product price if multi-prices
         }
-        else
-        {
+        else {
             $objsoc->fetch($this->socid);
         }
 
@@ -1218,8 +1199,7 @@ class SupplierProposal extends CommonObject
             $this->db->commit();
             return $this->id;
         }
-        else
-        {
+        else {
             $this->db->rollback();
             return -1;
         }
@@ -1411,8 +1391,7 @@ class SupplierProposal extends CommonObject
                     }
                     $this->db->free($result);
                 }
-                else
-                {
+                else {
                     $this->error = $this->db->error();
                     return -1;
                 }
@@ -1427,8 +1406,7 @@ class SupplierProposal extends CommonObject
             $this->error = "Record Not Found";
             return 0;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -1464,8 +1442,7 @@ class SupplierProposal extends CommonObject
             {
                 $num = $this->getNextNumRef($soc);
             }
-            else
-            {
+            else {
                 $num = $this->ref;
             }
             $this->newref = dol_sanitizeFileName($num);
@@ -1539,14 +1516,12 @@ class SupplierProposal extends CommonObject
                 $this->db->commit();
                 return 1;
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 return -1;
             }
         }
-        else
-        {
+        else {
             dol_syslog("You don't have permission to validate supplier proposal", LOG_WARNING);
             return -2;
         }
@@ -1574,8 +1549,7 @@ class SupplierProposal extends CommonObject
                 $this->date_livraison = $date_livraison;
                 return 1;
             }
-            else
-            {
+            else {
                 $this->error = $this->db->error();
                 dol_syslog(get_class($this)."::set_date_livraison Erreur SQL");
                 return -1;
@@ -1609,8 +1583,7 @@ class SupplierProposal extends CommonObject
                 $this->update_price(1);
                 return 1;
             }
-            else
-            {
+            else {
                 $this->error = $this->db->error();
                 return -1;
             }
@@ -1645,8 +1618,7 @@ class SupplierProposal extends CommonObject
                 $this->update_price(1);
                 return 1;
             }
-            else
-            {
+            else {
                 $this->error = $this->db->error();
                 return -1;
             }
@@ -1709,8 +1681,7 @@ class SupplierProposal extends CommonObject
             $this->db->rollback();
             return -1 * $error;
         }
-        else
-        {
+        else {
             $this->db->commit();
             return 1;
         }
@@ -1783,14 +1754,12 @@ class SupplierProposal extends CommonObject
                 $this->db->commit();
                 return 1;
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 return -1;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->db->lasterror();
             $this->db->rollback();
@@ -1958,8 +1927,7 @@ class SupplierProposal extends CommonObject
                 return -1;
             }
         }
-        else
-        {
+        else {
             return -1;
         }
     }
@@ -2024,8 +1992,7 @@ class SupplierProposal extends CommonObject
                     {
                         $ga[$obj->supplier_proposalid] = $obj->ref.' ('.$obj->name.')';
                     }
-                    else
-                    {
+                    else {
                         $ga[$i]['id'] = $obj->supplier_proposalid;
                         $ga[$i]['ref'] 	= $obj->ref;
                         $ga[$i]['name'] = $obj->name;
@@ -2036,8 +2003,7 @@ class SupplierProposal extends CommonObject
             }
             return $ga;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return -1;
         }
@@ -2134,29 +2100,25 @@ class SupplierProposal extends CommonObject
                         $this->db->commit();
                         return 1;
                     }
-                    else
-                    {
+                    else {
                         $this->error = $this->db->lasterror();
                         $this->db->rollback();
                         return 0;
                     }
                 }
-                else
-                {
+                else {
                     $this->error = $this->db->lasterror();
                     $this->db->rollback();
                     return -3;
                 }
             }
-            else
-            {
+            else {
                 $this->error = $this->db->lasterror();
                 $this->db->rollback();
                 return -2;
             }
         }
-        else
-        {
+        else {
             $this->db->rollback();
             return -1;
         }
@@ -2210,8 +2172,7 @@ class SupplierProposal extends CommonObject
             }
             $this->db->free($result);
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
         }
     }
@@ -2341,8 +2302,7 @@ class SupplierProposal extends CommonObject
             }
             return $response;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -2410,8 +2370,7 @@ class SupplierProposal extends CommonObject
                 $line->total_tva = 9.8;
                 $line->remise_percent = 50;
             }
-            else
-            {
+            else {
                 $line->total_ht = 100;
                 $line->total_ttc = 119.6;
                 $line->total_tva = 19.6;
@@ -2470,8 +2429,7 @@ class SupplierProposal extends CommonObject
             $this->db->free($resql);
             return 1;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             $this->error = $this->db->lasterror();
             return -1;
@@ -2521,14 +2479,12 @@ class SupplierProposal extends CommonObject
             {
                 return $numref;
             }
-            else
-            {
+            else {
                 $this->error = $obj->error;
                 return "";
             }
         }
-        else
-        {
+        else {
             $langs->load("errors");
             print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("SupplierProposal"));
             return "";
@@ -2699,8 +2655,7 @@ class SupplierProposal extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -2995,8 +2950,7 @@ class SupplierProposalLine extends CommonObjectLine
 
             $this->db->free($result);
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
         }
     }
@@ -3042,8 +2996,7 @@ class SupplierProposalLine extends CommonObjectLine
             {
                 return $result;
             }
-            else
-            {
+            else {
                 $this->pa_ht = $result;
             }
         }
@@ -3130,8 +3083,7 @@ class SupplierProposalLine extends CommonObjectLine
             $this->db->commit();
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error()." sql=".$sql;
             $this->db->rollback();
             return -1;
@@ -3178,8 +3130,7 @@ class SupplierProposalLine extends CommonObjectLine
 
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error()." sql=".$sql;
             $this->db->rollback();
             return -1;
@@ -3225,8 +3176,7 @@ class SupplierProposalLine extends CommonObjectLine
             {
                 return $result;
             }
-            else
-            {
+            else {
                 $this->pa_ht = $result;
             }
         }
@@ -3301,8 +3251,7 @@ class SupplierProposalLine extends CommonObjectLine
             $this->db->commit();
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
@@ -3336,8 +3285,7 @@ class SupplierProposalLine extends CommonObjectLine
             $this->db->commit();
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index 43c9b91f563..8f606ad4f67 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -66,15 +66,13 @@ if ($action == 'addcontact' && $permissiontoedit)
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -87,8 +85,7 @@ elseif ($action == 'swapstatut' && $permissiontoedit)
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -195,8 +192,7 @@ if ($id > 0 || !empty($ref))
 		// Contacts lines
 		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
 	}
-	else
-	{
+	else {
 		// Contact not found
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 3f471e28b3f..3096e6fbbdb 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -167,8 +167,7 @@ if ($object->id > 0)
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index e8432ad8fe4..7a575007be2 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -163,8 +163,7 @@ if ($resql)
     print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
     print "</table></div><br>";
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
@@ -384,8 +383,7 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 			print "</table></div><br>";
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index ded5d9ca2bf..eba1db92a94 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -359,8 +359,7 @@ if ($resql)
 		$soc->fetch($socid);
 		$title = $langs->trans('ListOfSupplierProposals').' - '.$soc->name;
 	}
-	else
-	{
+	else {
 		$title = $langs->trans('ListOfSupplierProposals');
 	}
 
@@ -951,8 +950,7 @@ if ($resql)
 
 	print $formfile->showdocuments('massfilesarea_supplier_proposal', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index 7e5b6aaf531..3f09ac541d3 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -111,13 +111,11 @@ if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) >
 				}
 			}
 		}
-		else
-		{
+		else {
 			$includeconferror = 'ErrorBadValueForDolibarrMainDocumentRoot';
 		}
 	}
-	else
-	{
+	else {
 		$includeconferror = 'ErrorBadFormatForConfFile';
 	}
 }
diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index 2508ab56040..a33f337cc96 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -53,8 +53,7 @@ if (GETPOST('action', 'alpha') == 'set')
         $db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         $db->rollback();
 	    setEventMessages($langs->trans("Error"), null, 'errors');
     }
diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php
index 566f18ac1a4..f0410f812d9 100644
--- a/htdocs/takepos/admin/orderprinters.php
+++ b/htdocs/takepos/admin/orderprinters.php
@@ -147,8 +147,7 @@ if ($nbofentries > 0)
 	}
 	print '</td></tr>';
 }
-else
-{
+else {
 	print '<tr class="pair">';
 	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
 	print '<td valign="middle">';
@@ -177,8 +176,7 @@ if ($nbofentries > 0)
 	}
 	print '</td></tr>';
 }
-else
-{
+else {
 	print '<tr class="pair">';
 	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
 	print '<td valign="middle">';
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 83b31569a7b..7ed4f2786b2 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -58,8 +58,7 @@ if (GETPOST('action', 'alpha') == 'set')
         $db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         $db->rollback();
 	    setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -105,8 +104,7 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "browser")
 {
     print img_picto($langs->trans("Activated"), 'switch_on');
 }
-else
-{
+else {
     print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&value=browser">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 }
 print "</td></tr>\n";
@@ -122,8 +120,7 @@ if ($conf->receiptprinter->enabled) {
 	{
 		print img_picto($langs->trans("Activated"), 'switch_on');
 	}
-	else
-	{
+	else {
 		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&value=receiptprinter">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	}
 	print "</td></tr>\n";
@@ -139,8 +136,7 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector")
 {
     print img_picto($langs->trans("Activated"), 'switch_on');
 }
-else
-{
+else {
     print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&value=takeposconnector">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 }
 print "</td></tr>\n";
@@ -176,8 +172,7 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "browser" || $conf->global->TAKEPOS_P
 	{
 		print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 	}
-	else
-	{
+	else {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
 		print $doleditor->Create();
@@ -192,8 +187,7 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "browser" || $conf->global->TAKEPOS_P
 	{
 		print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 	}
-	else
-	{
+	else {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
 		print $doleditor->Create();
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 85406c46faa..f4e86677a1b 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -97,8 +97,7 @@ if ($action == 'set')
     {
         $db->commit();
     }
-    else
-    {
+    else {
         $db->rollback();
     }
 } elseif ($action == 'updateMask') {
@@ -196,8 +195,7 @@ foreach ($dirmodels as $reldir)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						}
-						else
-						{
+						else {
 							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setrefmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index 46d168ddd24..e2996ad763d 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -103,8 +103,7 @@ if (GETPOST('action', 'alpha') == 'set')
         $db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         $db->rollback();
 	    setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -188,8 +187,7 @@ if (!empty($conf->stock->enabled))
 	if (empty($conf->productbatch->enabled) || !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK)) {
 	    print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK'.$terminal, $conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}, 1);
 	}
-	else
-	{
+	else {
 	    if (!$conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}) {
 	        $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK".$terminal, 1, 'chaine', 0, '', $conf->entity);
 	    }
@@ -208,8 +206,7 @@ if (!empty($conf->stock->enabled))
 		print $formproduct->selectWarehouses($conf->global->{'CASHDESK_ID_WAREHOUSE'.$terminal}, 'CASHDESK_ID_WAREHOUSE'.$terminal, '', 1, $disabled);
 		print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"]).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
 	}
-	else
-	{
+	else {
 		print '<span class="opacitymedium">'.$langs->trans("StockDecreaseForPointOfSaleDisabled").'</span>';
 	}
 	print '</td></tr>';
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index d1f59325c1f..75c40e6607e 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -65,8 +65,7 @@ if ($action == 'getProducts') {
 	    }
     	echo json_encode($prods);
     }
-    else
-    {
+    else {
     	echo 'Failed to load category with id='.$category;
     }
 }
diff --git a/htdocs/takepos/genimg/index.php b/htdocs/takepos/genimg/index.php
index e668b01aacb..8a752a5d3a5 100644
--- a/htdocs/takepos/genimg/index.php
+++ b/htdocs/takepos/genimg/index.php
@@ -56,8 +56,7 @@ if ($query == "cat")
 		{
 			$filename = $obj['photo_vignette'];
 		}
-		else
-		{
+		else {
 			$filename = $obj['photo'];
 		}
 		$file = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$filename);
@@ -79,8 +78,7 @@ elseif ($query == "pro")
 	if ($file == "") header('Location: ../../public/theme/common/nophoto.png');
 	else header('Location: '.$file.'&cache=1&publictakepos=1&modulepart=product');
 }
-else
-{
+else {
     // TODO We don't need this. Size of image must be defined on HTML page, image must NOT be resize when downloaded.
 
 	// The file
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index dbc68afeaf4..94cc526434e 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -135,8 +135,7 @@ foreach ($categories as $key => $categorycursor)
     {
         $maincategories[$key] = $categorycursor;
     }
-    else
-    {
+    else {
         $subcategories[$key] = $categorycursor;
     }
 }
@@ -858,8 +857,7 @@ if (empty($conf->global->TAKEPOS_BAR_RESTAURANT))
 {
     $menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("New").'</div>', 'action'=>'New();');
 }
-else
-{
+else {
     // BAR RESTAURANT specific menu
     $menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("Place").'</div>', 'action'=>'Floors();');
 }
@@ -988,8 +986,7 @@ if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 				    //echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="catimg'.$count.'" />';
 				    echo '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';
 				}
-				else
-				{
+				else {
 				    echo '<img class="imgwrapper" height="100%" id="catimg'.$count.'" />';
 				}
 				?>
@@ -1023,8 +1020,7 @@ if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
     				    //echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="proimg'.$count.'" />';
     					print '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';
     				}
-    				else
-    				{
+    				else {
     					print '<div class="" id="proprice'.$count.'"></div>';
     					print '<img class="imgwrapper" height="100%" title="" id="proimg'.$count.'">';
     				}
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 16012022dc9..274e47a1185 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -57,8 +57,7 @@ if (($conf->global->TAKEPOS_PHONE_BASIC_LAYOUT == 1 && $conf->browser->layout ==
 	if ($_SESSION["takeposterminal"] == "")
 	{
 		if ($conf->global->TAKEPOS_NUM_TERMINALS == "1") $_SESSION["takeposterminal"] = 1;
-		else
-		{
+		else {
 			header("Location: ".DOL_URL_ROOT."/takepos/index.php");
 			exit;
 		}
@@ -118,8 +117,7 @@ if ($invoiceid > 0)
 {
     $ret = $invoice->fetch($invoiceid);
 }
-else
-{
+else {
     $ret = $invoice->fetch('', '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')');
 }
 if ($ret > 0)
@@ -143,8 +141,7 @@ if ($action == 'valid' && $user->rights->facture->creer)
     if ($pay == "cash") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]};            // For backward compatibility
     elseif ($pay == "card") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$_SESSION["takeposterminal"]};          // For backward compatibility
     elseif ($pay == "cheque") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]};    // For backward compatibility
-    else
-    {
+    else {
         $accountname = "CASHDESK_ID_BANKACCOUNT_".$pay.$_SESSION["takeposterminal"];
     	$bankaccount = $conf->global->$accountname;
     }
@@ -211,8 +208,7 @@ if ($action == 'valid' && $user->rights->facture->creer)
 
 		$conf->global->STOCK_CALCULATE_ON_BILL = $savconst;
 	}
-	else
-	{
+	else {
 	    $res = $invoice->validate($user);
 	}
 
@@ -275,8 +271,7 @@ if (($action == "addline" || $action == "freezone") && $placeid == 0)
 		$langs->load('errors');
 		dol_htmloutput_errors($langs->trans("ErrorModuleSetupNotComplete", "TakePos"), null, 1);
 	}
-	else
-	{
+	else {
 		$placeid = $invoice->create($user);
 		if ($placeid < 0)
 		{
@@ -421,8 +416,7 @@ if ($action == "delete") {
             {
             	$db->commit();
             }
-            else
-            {
+            else {
             	$db->rollback();
             }
 
@@ -581,8 +575,7 @@ if ($action == "valid" || $action == "history")
     {
         $sectionwithinvoicelink .= $langs->trans('RemainToPay').': <span class="amountremaintopay" style="font-size: unset">'.price($remaintopay, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
     }
-    else
-    {
+    else {
         if ($invoice->paye) $sectionwithinvoicelink .= '<span class="amountpaymentcomplete" style="font-size: unset">'.$langs->trans("Paid").'</span>';
         else $sectionwithinvoicelink .= $langs->trans('BillShortStatusValidated');
     }
@@ -814,14 +807,12 @@ $( document ).ready(function() {
 					$s .= " ".img_warning($langs->trans("Late"));
 				}
 			}
-			else
-			{
+			else {
 				$s .= '<br>'.$langs->trans("SubscriptionNotReceived");
 				if ($adh->statut > 0) $s .= " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
 			}
 		}
-		else
-		{
+		else {
 			$s .= '<br>'.$langs->trans("ThirdpartyNotLinkedToMember");
 		}
 		$s .= '</span>';
@@ -968,8 +959,7 @@ if ($placeid > 0)
 					{
 						$htmlsupplements[$line->fk_parent_line] .= $form->textwithpicto(dolGetFirstLineOfText($line->desc), $line->desc);
 					}
-					else
-					{
+					else {
 						$htmlsupplements[$line->fk_parent_line] .= $line->desc;
 					}
 				}
@@ -1019,8 +1009,7 @@ if ($placeid > 0)
 	                {
 	                    $htmlforlines .= $form->textwithpicto(dolGetFirstLineOfText($line->desc), $line->desc);
 	                }
-	                else
-	                {
+	                else {
 	                    $htmlforlines .= $line->desc;
 	                }
 	            }
@@ -1048,8 +1037,7 @@ if ($placeid > 0)
             print $htmlforlines;
         }
     }
-    else
-    {
+    else {
         print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td></tr>';
     }
 }
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index b2534272ae2..f370387d72e 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -52,8 +52,7 @@ if ($invoiceid > 0)
 {
     $invoice->fetch($invoiceid);
 }
-else
-{
+else {
     $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
     $resql = $db->query($sql);
     $obj = $db->fetch_object($resql);
@@ -65,8 +64,7 @@ else
     {
         $invoiceid = 0; // Invoice does not exist yet
     }
-    else
-    {
+    else {
         $invoice->fetch($invoiceid);
     }
 }
diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 90f0aa363dc..1cad9a9ede4 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -136,8 +136,7 @@ else {
     	{
         	$maincategories[$key] = $categorycursor;
     	}
-    	else
-    	{
+    	else {
         	$subcategories[$key] = $categorycursor;
     	}
 	}
diff --git a/htdocs/takepos/reduction.php b/htdocs/takepos/reduction.php
index 7be5ee85938..4d11663ea85 100644
--- a/htdocs/takepos/reduction.php
+++ b/htdocs/takepos/reduction.php
@@ -52,8 +52,7 @@ if ($invoiceid > 0)
 {
     $invoice->fetch($invoiceid);
 }
-else
-{
+else {
     $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
     $resql = $db->query($sql);
     $obj = $db->fetch_object($resql);
@@ -65,8 +64,7 @@ else
     {
         $invoiceid = 0; // Invoice does not exist yet
     }
-    else
-    {
+    else {
         $invoice->fetch($invoiceid);
     }
 }
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index fc365ae5812..dc25fa4b44a 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -2120,8 +2120,7 @@ a.tmenuimage:hover{
                     content: "\f249";
                 }'."\n";
             }
-            else
-            {
+            else {
                 print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
                 $url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1);
                 print "div.mainmenu.".$val." {\n";
@@ -2130,8 +2129,7 @@ a.tmenuimage:hover{
             }
             $generic++;
         }
-        else
-        {
+        else {
             print "div.mainmenu.".$val." {\n";
             print "	background-image: url(".$url.");\n";
             print "}\n";
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index d2a11725ecf..6a4f1ebf7e1 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -41,8 +41,7 @@ if (!defined('ISLOADEDBYSTEELSHEET'))	// File is run after an include of a php p
 		{
 			$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250, 190, 30), array(221, 75, 57), array(0, 166, 90), array(140, 140, 220), array(190, 120, 120), array(190, 190, 100), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
 		}
-		else
-		{
+		else {
 			// for now we use the same configuration for all types of color blind
 			$theme_datacolor = array(array(248, 220, 1), array(9, 85, 187), array(42, 208, 255), array(0, 0, 0), array(169, 169, 169), array(253, 102, 136), array(120, 154, 190), array(146, 146, 55), array(0, 52, 251), array(196, 226, 161), array(222, 160, 41), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
 		}
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index c43fa9cd7d9..a7b759cfea0 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2148,8 +2148,7 @@ div.mainmenu.website {
 	                    content: "\f249";
 	                }';
 		    }
-		    else
-		    {
+		    else {
 		    	print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one. */\n";
 		    	print "/* Overwrite this definition in your own css with a different content to use your own font awesome icon. */\n";
 		        $url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1);
@@ -2159,8 +2158,7 @@ div.mainmenu.website {
 	    	}
 	    	$generic++;
 		}
-		else
-		{
+		else {
 			print "div.mainmenu.".$val." {\n";
 			print "	background-image: url(".$url.");\n";
 			print "}\n";
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index ffad2cc66b5..7d492bcae6a 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -37,8 +37,7 @@ if (!defined('ISLOADEDBYSTEELSHEET'))	// File is run after an include of a php p
 		{
 			$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250, 190, 30), array(221, 75, 57), array(0, 166, 90), array(140, 140, 220), array(190, 120, 120), array(190, 190, 100), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
 		}
-		else
-		{
+		else {
 			// for now we use the same configuration for all types of color blind
 			$theme_datacolor = array(array(248, 220, 1), array(9, 85, 187), array(42, 208, 255), array(0, 0, 0), array(169, 169, 169), array(253, 102, 136), array(120, 154, 190), array(146, 146, 55), array(0, 52, 251), array(196, 226, 161), array(222, 160, 41), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
 		}
diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index 2c473a9de54..2fd3b2643e0 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -57,8 +57,7 @@ if (GETPOST('actioncode', 'array'))
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
 }
-else
-{
+else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 6e400b3eeaa..2e61ce15045 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1207,8 +1207,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 			}
 			print '</div>'."\n";
 		}
-		else
-		{
+		else {
 			print '<br>';
 		}
 
diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php
index 0fb5835cb4c..f701fabc2c0 100644
--- a/htdocs/ticket/class/actions_ticket.class.php
+++ b/htdocs/ticket/class/actions_ticket.class.php
@@ -397,8 +397,7 @@ class ActionsTicket
 				{
 					$urlforbutton = $_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'&action=mark_ticket_read'; // To set as read, we use a dedicated action
 				}
-				else
-				{
+				else {
 					$urlforbutton = $_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'&action=set_status&new_status='.$status;
 				}
 
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 4db98cfe7ad..0f6994d6a03 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -542,8 +542,7 @@ class Ticket extends CommonObject
 				$this->db->free($resql);
 				return 1;
 			}
-			else
-			{
+			else {
 				return 0;
 			}
 		} else {
@@ -1354,8 +1353,7 @@ class Ticket extends CommonObject
 		{
 			$sql .= " SET fk_user_assign=".$id_assign_user.", fk_statut = ".Ticket::STATUS_ASSIGNED;
 		}
-		else
-		{
+		else {
 			$sql .= " SET fk_user_assign=null, fk_statut = ".Ticket::STATUS_READ;
 		}
 		$sql .= " WHERE rowid = ".$this->id;
@@ -2767,8 +2765,7 @@ class Ticket extends CommonObject
 			}
 			return $response;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -2810,8 +2807,7 @@ class Ticket extends CommonObject
 			$this->db->free($resql);
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = $this->db->lasterror();
 			return -1;
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index d48001a680e..86f671d876b 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -196,8 +196,7 @@ if ($object->id)
 
   	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
     accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 1331e2be12e..4d1cb7a5d60 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -286,8 +286,7 @@ if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
 }
-else
-{
+else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index 0a6c8067db5..c35b60ab42e 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -57,8 +57,7 @@ if (GETPOST('actioncode', 'array'))
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
 }
-else
-{
+else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php
index b39ba0fd366..e6760ba9c4d 100644
--- a/htdocs/ticket/stats/index.php
+++ b/htdocs/ticket/stats/index.php
@@ -85,8 +85,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filenamenb = $dir.'/ticketsnbinyear-'.$user->id.'-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsnbinyear-'.$user->id.'-'.$year.'.png';
 }
-else
-{
+else {
     $filenamenb = $dir.'/ticketsnbinyear-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsnbinyear-'.$year.'.png';
 }
@@ -126,8 +125,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filenameamount = $dir.'/ticketsamountinyear-'.$user->id.'-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$user->id.'-'.$year.'.png';
 }
-else
-{
+else {
     $filenameamount = $dir.'/ticketsamountinyear-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$year.'.png';
 }
@@ -165,8 +163,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filename_avg = $dir.'/ticketsaverage-'.$user->id.'-'.$year.'.png';
     $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsaverage-'.$user->id.'-'.$year.'.png';
 }
-else
-{
+else {
     $filename_avg = $dir.'/ticketsaverage-'.$year.'.png';
     $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsaverage-'.$year.'.png';
 }
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 3bdc6b5390c..a02e2c17ec6 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -72,8 +72,7 @@ if (!$bankid)
 {
 	$account->fetch(0, '', $id);
 }
-else
-{
+else {
 	$account->fetch($bankid);
 }
 if (empty($account->userid)) $account->userid = $object->id;
@@ -107,8 +106,7 @@ if ($action == 'add' && !$cancel)
 		setEventMessages($account->error, $account->errors, 'errors');
 		$action = 'edit'; // Force chargement page edition
 	}
-	else
-	{
+	else {
         setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
         $action = '';
 	}
@@ -138,8 +136,7 @@ if ($action == 'update' && !$cancel)
 		setEventMessages($account->error, $account->errors, 'errors');
 		$action = 'edit'; // Force chargement page edition
 	}
-	else
-	{
+	else {
         setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
         $action = '';
     }
@@ -284,8 +281,7 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 			if ($num <= 0) print '<td colspan="4" class="opacitymedium">'.$langs->trans("None").'</a>';
 			print "</table>";
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -340,8 +336,7 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 			if ($num <= 0) print '<td colspan="4" class="opacitymedium">'.$langs->trans("None").'</a>';
 			print "</table>";
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -395,8 +390,7 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 			if ($num <= 0) print '<td colspan="4" class="opacitymedium">'.$langs->trans("None").'</a>';
 			print "</table>";
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index cd115dbe292..3e7b36e5189 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -295,8 +295,7 @@ if (empty($reshook)) {
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
 				exit;
 			}
-			else
-			{
+			else {
 				$langs->load("errors");
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -326,8 +325,7 @@ if (empty($reshook)) {
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
 				exit;
 			}
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -429,13 +427,11 @@ if (empty($reshook)) {
 					{
 						$object->entity = 1; // all users in master entity
 					}
-					else
-					{
+					else {
 						$object->entity = (!GETPOST('entity', 'int') ? 0 : GETPOST('entity', 'int'));
 					}
 				}
-				else
-				{
+				else {
 					$object->entity = (!GETPOST('entity', 'int') ? 0 : GETPOST('entity', 'int'));
 				}
 
@@ -455,8 +451,7 @@ if (empty($reshook)) {
 				    {
     					$object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
 				    }
-				    else
-				    {
+				    else {
 				        $error++;
 				        $langs->load("errors");
 				        setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
@@ -472,8 +467,7 @@ if (empty($reshook)) {
 							$langs->load("errors");
 							setEventMessages($langs->trans("ErrorLoginAlreadyExists", $object->login), null, 'errors');
 						}
-						else
-						{
+						else {
 							setEventMessages($object->error, $object->errors, 'errors');
 						}
 					}
@@ -565,8 +559,7 @@ if (empty($reshook)) {
 				}
 			}
 		}
-		else
-		{
+		else {
 			if ($caneditpassword)    // Case we can edit only password
 			{
 				dol_syslog("Not allowed to change fields, only password");
@@ -603,13 +596,11 @@ if (empty($reshook)) {
 				{
 					setEventMessages($langs->trans("PasswordChangedAndSentTo", $object->email), null, 'mesgs');
 				}
-				else
-				{
+				else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
-			else
-			{
+			else {
 				setEventMessages($langs->trans("PasswordChangedTo", $newpassword), null, 'warnings');
 			}
 		}
@@ -666,8 +657,7 @@ if (empty($reshook)) {
 				}
 			}
 		}
-		else
-		{
+		else {
 			setEventMessages($ldap->error, $ldap->errors, 'errors');
 		}
 	}
@@ -765,13 +755,11 @@ if ($action == 'create' || $action == 'adduserldap')
 					$liste[$key] = $label;
 				}
 			}
-			else
-			{
+			else {
 				setEventMessages($ldap->error, $ldap->errors, 'errors');
 			}
 		}
-		else
-		{
+		else {
 			setEventMessages($ldap->error, $ldap->errors, 'errors');
 		}
 
@@ -822,8 +810,7 @@ if ($action == 'create' || $action == 'adduserldap')
 		print '<input type="hidden" id="lastname" name="lastname" value="'.dol_escape_htmltag($ldap_lastname).'">';
 		print $ldap_lastname;
 	}
-	else
-	{
+	else {
 		print '<input class="minwidth100" type="text" id="lastname" name="lastname" value="'.dol_escape_htmltag(GETPOST('lastname', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -836,8 +823,7 @@ if ($action == 'create' || $action == 'adduserldap')
 		print '<input type="hidden" name="firstname" value="'.dol_escape_htmltag($ldap_firstname).'">';
 		print $ldap_firstname;
 	}
-	else
-	{
+	else {
 		print '<input class="minwidth100" type="text" name="firstname" value="'.dol_escape_htmltag(GETPOST('firstname', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -855,8 +841,7 @@ if ($action == 'create' || $action == 'adduserldap')
 		print '<input type="hidden" name="login" value="'.dol_escape_htmltag($ldap_loginsmb).'">';
 		print $ldap_loginsmb;
 	}
-	else
-	{
+	else {
 		print '<input class="maxwidth200" maxsize="24" type="text" name="login" value="'.dol_escape_htmltag(GETPOST('login', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -887,8 +872,7 @@ if ($action == 'create' || $action == 'adduserldap')
 			$valuetoshow .= ($valuetoshow ? ', ' : '').'<input type="hidden" name="password" value="'.$ldap_pass.'">'; // Dolibarr password is preffiled with LDAP known password
 			$valuetoshow .= preg_replace('/./i', '*', $ldap_pass);
 		}
-		else
-		{
+		else {
 			// We do not use a field password but a field text to show new password to use.
 			$valuetoshow .= ($valuetoshow ? ', ' : '').'<input size="30" maxsize="32" type="text" name="password" value="'.$password.'" autocomplete="new-password">';
 		}
@@ -914,8 +898,7 @@ if ($action == 'create' || $action == 'adduserldap')
 			print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
 		print '</td></tr>';
 	}
-	else
-	{
+	else {
 		// PARTIAL WORKAROUND
 		$generated_fake_api_key = getRandomPassword(false);
 		print '<input type="hidden" name="api_key" value="'.$generated_fake_api_key.'">';
@@ -1060,8 +1043,7 @@ if ($action == 'create' || $action == 'adduserldap')
 		print '<input type="hidden" name="office_phone" value="'.dol_escape_htmltag($ldap_phone).'">';
 		print $ldap_phone;
 	}
-	else
-	{
+	else {
 		print '<input size="20" type="text" name="office_phone" value="'.dol_escape_htmltag(GETPOST('office_phone', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -1074,8 +1056,7 @@ if ($action == 'create' || $action == 'adduserldap')
 		print '<input type="hidden" name="user_mobile" value="'.dol_escape_htmltag($ldap_mobile).'">';
 		print $ldap_mobile;
 	}
-	else
-	{
+	else {
 		print '<input size="20" type="text" name="user_mobile" value="'.dol_escape_htmltag(GETPOST('user_mobile', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -1088,8 +1069,7 @@ if ($action == 'create' || $action == 'adduserldap')
 		print '<input type="hidden" name="office_fax" value="'.dol_escape_htmltag($ldap_fax).'">';
 		print $ldap_fax;
 	}
-	else
-	{
+	else {
 		print '<input size="20" type="text" name="office_fax" value="'.dol_escape_htmltag(GETPOST('office_fax', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -1102,8 +1082,7 @@ if ($action == 'create' || $action == 'adduserldap')
 		print '<input type="hidden" name="email" value="'.dol_escape_htmltag($ldap_mail).'">';
 		print $ldap_mail;
 	}
-	else
-	{
+	else {
 		print '<input size="40" type="text" name="email" value="'.dol_escape_htmltag(GETPOST('email', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -1237,8 +1216,7 @@ if ($action == 'create' || $action == 'adduserldap')
 				 print "<td>".$mc->select_entities($conf->entity);
 				 print "</td></tr>\n";
 			}
-			else
-			{
+			else {
 				 print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
 			}
 		}
@@ -1358,8 +1336,7 @@ if ($action == 'create' || $action == 'adduserldap')
 
 	print "</form>";
 }
-else
-{
+else {
 	/* ************************************************************************** */
 	/*                                                                            */
 	/* View and edition                                                            */
@@ -1411,8 +1388,7 @@ else
 						}
 					}
 				}
-				else
-				{
+				else {
 					$userDisabled = 1;
 					$statutUACF = "ACCOUNTDISABLE";
 				}
@@ -1430,8 +1406,7 @@ else
 			$title = $langs->trans("Employee");
 			$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/employee/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 		}
-		else
-		{
+		else {
 			$title = $langs->trans("User");
 			$linkback = '';
 
@@ -1503,8 +1478,7 @@ else
 			{
 				print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
 			}
-			else
-			{
+			else {
 				print '<td>'.$object->login.'</td>';
 			}
 			print '</tr>'."\n";
@@ -1530,13 +1504,11 @@ else
 					{
 						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<span class="warning">'.$langs->trans("LdapUacf_".$statutUACF, $ldap->domainFQDN).'</span>';
 					}
-					else
-					{
+					else {
 						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("PasswordOfUserInLDAP");
 					}
 				}
-				else
-				{
+				else {
 					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("PasswordOfUserInLDAP");
 				}
 			}
@@ -1547,8 +1519,7 @@ else
 			if (preg_match('/dolibarr/', $dolibarr_main_authentication))
 			{
 				if ($object->pass) $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').preg_replace('/./i', '*', $object->pass);
-				else
-				{
+				else {
 					if ($user->admin) $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
 					else $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
 				}
@@ -1582,8 +1553,7 @@ else
 			{
 				print $form->textwithpicto(yn($object->admin), $langs->trans("AdministratorDesc"), 1, "admin");
 			}
-			else
-			{
+			else {
 				print yn($object->admin);
 			}
 			print '</td></tr>'."\n";
@@ -1826,8 +1796,7 @@ else
 					$societe->fetch($object->socid);
 					print $societe->getNomUrl(1, '');
 				}
-				else
-				{
+				else {
 					print $langs->trans("ThisUserIsNot");
 				}
 				if (!empty($object->contactid))
@@ -1855,8 +1824,7 @@ else
 					$adh->ref = $adh->getFullname($langs); // Force to show login instead of id
 					print $adh->getNomUrl(1);
 				}
-				else
-				{
+				else {
 					print $langs->trans("UserNotLinkedToMember");
 				}
 				print '</td>';
@@ -1894,8 +1862,7 @@ else
 						$langs->load("mails");
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
 					}
-					else
-					{
+					else {
 						$langs->load("mails");
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
 					}
@@ -1907,8 +1874,7 @@ else
 					{
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("DisabledInMonoUserMode")).'">'.$langs->trans("Modify").'</a></div>';
 					}
-					else
-					{
+					else {
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>';
 					}
 				}
@@ -1955,8 +1921,7 @@ else
 				{
 					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&amp;id='.$object->id.'">'.$langs->trans("DisableUser").'</a></div>';
 				}
-				else
-				{
+				else {
 				    if ($user->id == $id)
 				    {
 				        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("CantDisableYourself").'">'.$langs->trans("DisableUser").'</a></div>';
@@ -1970,8 +1935,7 @@ else
 					{
 						print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("DeleteUser").'</a></div>';
 					}
-					else
-					{
+					else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("MustBeAdminToDeleteOtherAdmin")).'">'.$langs->trans("DeleteUser").'</a></div>';
 					}
 				}
@@ -2055,8 +2019,7 @@ else
 								{
 									print $group->getNomUrl(1);
 								}
-								else
-								{
+								else {
 									print img_object($langs->trans("ShowGroup"), "group").' '.$group->name;
 								}
 								print '</td>';
@@ -2067,15 +2030,13 @@ else
 									print img_picto($langs->trans("RemoveFromGroup"), 'unlink');
 									print '</a>';
 								}
-								else
-								{
+								else {
 									print "&nbsp;";
 								}
 								print "</td></tr>\n";
 							}
 						}
-						else
-						{
+						else {
 							print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 						}
 
@@ -2123,8 +2084,7 @@ else
 			{
 				print '<input class="minwidth100" type="text" class="flat" name="lastname" value="'.$object->lastname.'">';
 			}
-			else
-			{
+			else {
 				print '<input type="hidden" name="lastname" value="'.$object->lastname.'">';
 				print $object->lastname;
 			}
@@ -2138,8 +2098,7 @@ else
 			{
 				print '<input class="minwidth100" type="text" class="flat" name="firstname" value="'.$object->firstname.'">';
 			}
-			else
-			{
+			else {
 				print '<input type="hidden" name="firstname" value="'.$object->firstname.'">';
 				print $object->firstname;
 			}
@@ -2152,8 +2111,7 @@ else
 			{
 				print '<input maxlength="50" type="text" class="flat" name="login" value="'.$object->login.'">';
 			}
-			else
-			{
+			else {
 				print '<input type="hidden" name="login" value="'.$object->login.'">';
 				print $object->login;
 			}
@@ -2178,8 +2136,7 @@ else
 				{
 					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<input maxlength="32" type="password" class="flat" name="password" value="'.$object->pass.'" autocomplete="new-password">';
 				}
-				else
-				{
+				else {
 					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').preg_replace('/./i', '*', $object->pass);
 				}
 			}
@@ -2214,8 +2171,7 @@ else
 				print ' ('.$langs->trans("ExternalUser").')';
 				print '</td></tr>';
 			}
-			else
-			{
+			else {
 				print '<td>';
 				$nbAdmin = $user->getNbOfUsers('active', '', 1);
 				$nbSuperAdmin = $user->getNbOfUsers('active', 'superadmin', 1);
@@ -2276,8 +2232,7 @@ else
 						print '<input type="checkbox" name="superadmin" value="1"'.$checked.' /> '.$langs->trans("SuperAdministrator");
 					}
 				}
-				else
-				{
+				else {
 					$yn = yn($object->admin);
 					print '<input type="hidden" name="admin" value="'.$object->admin.'">';
 					print '<input type="hidden" name="superadmin" value="'.(empty($object->entity) ? 1 : 0).'">';
@@ -2298,8 +2253,7 @@ else
 			   	print $form->textwithpicto($type, $langs->trans("InternalExternalDesc"));
 			   	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
 		   	}
-		   	else
-			{
+		   	else {
 				// Select mode
 				$type = 0;
 				if ($object->contactid) $type = $object->contactid;
@@ -2351,8 +2305,7 @@ else
 		   	{
 		   		print $form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
 		   	}
-		   	else
-		   	{
+		   	else {
 		   		print '<input type="hidden" name="fk_user" value="'.$object->fk_user.'">';
 		   		$huser = new User($db);
 		   		$huser->fetch($object->fk_user);
@@ -2371,8 +2324,7 @@ else
 			{
 				print $form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
 			}
-			else
-			{
+			else {
 				print '<input type="hidden" name="fk_user_expense_validator" value="'.$object->fk_user_expense_validator.'">';
 				$evuser = new User($db);
 				$evuser->fetch($object->fk_user_expense_validator);
@@ -2391,8 +2343,7 @@ else
 			{
 				print $form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
 			}
-			else
-			{
+			else {
 				print '<input type="hidden" name="fk_user_holiday_validator" value="'.$object->fk_user_holiday_validator.'">';
 				$hvuser = new User($db);
 				$hvuser->fetch($object->fk_user_holiday_validator);
@@ -2461,8 +2412,7 @@ else
 			{
 				print '<input size="20" type="text" name="office_phone" class="flat" value="'.$object->office_phone.'">';
 			}
-			else
-			{
+			else {
 				print '<input type="hidden" name="office_phone" value="'.$object->office_phone.'">';
 				print $object->office_phone;
 			}
@@ -2475,8 +2425,7 @@ else
 			{
 				print '<input size="20" type="text" name="user_mobile" class="flat" value="'.$object->user_mobile.'">';
 			}
-			else
-			{
+			else {
 				print '<input type="hidden" name="user_mobile" value="'.$object->user_mobile.'">';
 				print $object->user_mobile;
 			}
@@ -2489,8 +2438,7 @@ else
 			{
 				print '<input size="20" type="text" name="office_fax" class="flat" value="'.$object->office_fax.'">';
 			}
-			else
-			{
+			else {
 				print '<input type="hidden" name="office_fax" value="'.$object->office_fax.'">';
 				print $object->office_fax;
 			}
@@ -2503,8 +2451,7 @@ else
 			{
 				print '<input class="minwidth100" type="text" name="email" class="flat" value="'.$object->email.'">';
 			}
-			else
-			{
+			else {
 				print '<input type="hidden" name="email" value="'.$object->email.'">';
 				print $object->email;
 			}
@@ -2538,8 +2485,7 @@ else
 				{
 					print '<input class="minwidth100" type="url" name="openid" class="flat" value="'.$object->openid.'">';
 				}
-				else
-				{
+				else {
 					print '<input type="hidden" name="openid" value="'.$object->openid.'">';
 					print $object->openid;
 				}
@@ -2558,8 +2504,7 @@ else
 				{
 					print '<input size="30" type="text" class="flat" name="accountancy_code" value="'.$object->accountancy_code.'">';
 				}
-				else
-				{
+				else {
 					print '<input type="hidden" name="accountancy_code" value="'.$object->accountancy_code.'">';
 					print $object->accountancy_code;
 				}
@@ -2632,8 +2577,7 @@ else
 						print ' / <a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$object->contactid.'">'.img_object($langs->trans("ShowContact"), 'contact').' '.dol_trunc($contact->getFullName($langs), 32).'</a>';
 					}
 				}
-				else
-				{
+				else {
 					print $langs->trans("ThisUserIsNot");
 				}
 				print ' ('.$langs->trans("UseTypeFieldToChange").')';
@@ -2654,8 +2598,7 @@ else
 					$adh->ref = $adh->login; // Force to show login instead of id
 					print $adh->getNomUrl(1);
 				}
-				else
-				{
+				else {
 					print $langs->trans("UserNotLinkedToMember");
 				}
 				print '</td>';
@@ -2675,8 +2618,7 @@ else
 	            		print "<td>".$mc->select_entities($object->entity, 'entity', '', 0, 1, false, false, 1); // last parameter 1 means, show also a choice 0=>'all entities'
 	            		print "</td></tr>\n";
 	            	}
-	            	else
-	            	{
+	            	else {
 	            		print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
 	            	}
 	            }
@@ -2705,8 +2647,7 @@ else
 				$doleditor = new DolEditor('signature', $object->signature, '', 138, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) ? 0 : 1, ROWS_4, '90%');
 				print $doleditor->Create(1);
 			}
-			else
-			{
+			else {
 				print dol_htmlentitiesbr($object->signature);
 			}
 			print '</td></tr>';
@@ -2733,8 +2674,7 @@ else
             {
             	print '<input size="30" type="text" name="job" value="'.$object->job.'">';
             }
-            else
-            {
+            else {
             	print '<input type="hidden" name="job" value="'.$object->job.'">';
             	print $object->job;
             }
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 46022d066f3..54681974e04 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -289,8 +289,7 @@ class Users extends DolibarrApi
 		{
 			return $this->get($id);
 		}
-		else
-		{
+		else {
 			throw new RestException(500, $this->useraccount->error);
 		}
     }
@@ -364,8 +363,7 @@ class Users extends DolibarrApi
 		{
 			$entity = (!empty($entity) ? $entity : $conf->entity);
 		}
-		else
-		{
+		else {
 			// When using API, action is done on entity of logged user because a user of entity X with permission to create user should not be able to
 			// hack the security by giving himself permissions on another entity.
 			$entity = (DolibarrApiAccess::$user->entity > 0 ? DolibarrApiAccess::$user->entity : $conf->entity);
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 11d0cec3654..a4daebe3b9a 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -295,17 +295,15 @@ class User extends CommonObject
 			{
 				$sql .= " WHERE u.entity IN (0,".$conf->entity.")";
 			}
-			else
-			{
+			else {
 				$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
 			}
 		}
-		else  // The fetch was forced on an entity
+		else // The fetch was forced on an entity
 		{
 			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 				$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
-			else
-				$sql .= " WHERE u.entity IN (0, ".(($entity != '' && $entity >= 0) ? $entity : $conf->entity).")"; // search in entity provided in parameter
+			else $sql .= " WHERE u.entity IN (0, ".(($entity != '' && $entity >= 0) ? $entity : $conf->entity).")"; // search in entity provided in parameter
 		}
 
 		if ($sid)    // permet une recherche du user par son SID ActiveDirectory ou Samba
@@ -320,8 +318,7 @@ class User extends CommonObject
 		{
 			$sql .= " AND u.email = '".$this->db->escape($email)."'";
 		}
-		else
-		{
+		else {
 			$sql .= " AND u.rowid = ".$id;
 		}
 		$sql .= " ORDER BY u.entity ASC"; // Avoid random result when there is 2 login in 2 different entities
@@ -420,8 +417,7 @@ class User extends CommonObject
 
 				$this->db->free($result);
 			}
-			else
-			{
+			else {
 				$this->error = "USERNOTFOUND";
 				dol_syslog(get_class($this)."::fetch user not found", LOG_DEBUG);
 
@@ -429,8 +425,7 @@ class User extends CommonObject
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -457,8 +452,7 @@ class User extends CommonObject
 				}
 				$this->db->free($resql);
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror();
 				return -2;
 			}
@@ -525,8 +519,7 @@ class User extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -592,8 +585,7 @@ class User extends CommonObject
 				{
 					$whereforadd = 'allmodules';
 				}
-				else
-				{
+				else {
 					$whereforadd = "module='".$this->db->escape($allmodule)."'";
 					if (!empty($allperms))  $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
 				}
@@ -629,8 +621,7 @@ class User extends CommonObject
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -713,8 +704,7 @@ class User extends CommonObject
 				{
 					$wherefordel = 'allmodules';
 				}
-				else
-				{
+				else {
 					$wherefordel = "module='".$this->db->escape($allmodule)."'";
 					if (!empty($allperms))  $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
 				}
@@ -750,8 +740,7 @@ class User extends CommonObject
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -833,8 +822,7 @@ class User extends CommonObject
 		{
 			$sql .= " AND r.entity IN (0,".(!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? "1," : "").$conf->entity.")";
 		}
-		else
-		{
+		else {
 			$sql .= " AND ur.entity = ".$conf->entity;
 		}
 		$sql .= " AND ur.fk_user= ".$this->id;
@@ -866,8 +854,7 @@ class User extends CommonObject
 							if (empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
 							$this->rights->$module->$perms->$subperms = 1;
 						}
-						else
-						{
+						else {
 							if (empty($this->rights->$module->$perms)) $this->nb_rights++;
 							$this->rights->$module->$perms = 1;
 						}
@@ -892,8 +879,7 @@ class User extends CommonObject
 				$sql .= " AND r.entity = ".$conf->entity;
 			}
 		}
-		else
-		{
+		else {
 			$sql .= " AND gr.entity = ".$conf->entity;
 			$sql .= " AND gu.entity = ".$conf->entity;
 			$sql .= " AND r.entity = ".$conf->entity;
@@ -926,8 +912,7 @@ class User extends CommonObject
 						if (empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
 						$this->rights->$module->$perms->$subperms = 1;
 					}
-					else
-					{
+					else {
 						if (empty($this->rights->$module->$perms)) $this->nb_rights++;
 						// if we have already define a subperm like this $this->rights->$module->level1->level2 with llx_user_rights, we don't want override level1 because the level2 can be not define on user group
 						if (!is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = 1;
@@ -948,8 +933,7 @@ class User extends CommonObject
 			// que les droits sont en cache (car tous charges) pour cet instance de user
 			$this->all_permissions_are_loaded = 1;
 		}
-		else
-		{
+		else {
 			// If module defined, we flag it as loaded into cache
 			$this->_tab_loaded[$moduletag] = 1;
 		}
@@ -993,8 +977,7 @@ class User extends CommonObject
 			$this->db->rollback();
 			return -$error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1133,8 +1116,7 @@ class User extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1200,8 +1182,7 @@ class User extends CommonObject
 				$this->db->rollback();
 				return -6;
 			}
-			else
-			{
+			else {
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."user (datec,login,ldap_sid,entity)";
 				$sql .= " VALUES('".$this->db->idate($this->datec)."','".$this->db->escape($this->login)."','".$this->db->escape($this->ldap_sid)."',".$this->db->escape($this->entity).")";
 				$result = $this->db->query($sql);
@@ -1253,24 +1234,21 @@ class User extends CommonObject
 						$this->db->commit();
 						return $this->id;
 					}
-					else
-					{
+					else {
 						//$this->error=$interface->error;
 						dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 						$this->db->rollback();
 						return -3;
 					}
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -2;
 				}
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1339,16 +1317,14 @@ class User extends CommonObject
 				$this->db->commit();
 				return $this->id;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->error();
 
 				$this->db->rollback();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			// $this->error deja positionne
 			dol_syslog(get_class($this)."::create_from_contact - 0");
 
@@ -1424,8 +1400,7 @@ class User extends CommonObject
 					$this->db->commit();
 					return $this->id;
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->lasterror();
 
 					$this->db->rollback();
@@ -1439,8 +1414,7 @@ class User extends CommonObject
 			$this->db->commit();
 			return $this->id;
 		}
-		else
-		{
+		else {
 			// $this->error deja positionne
 			$this->db->rollback();
 			return -2;
@@ -1752,8 +1726,7 @@ class User extends CommonObject
 							$error++;
 						}
 					}
-					else
-					{
+					else {
 						$this->error = $tmpobj->error;
 						$this->errors = $tmpobj->errors;
 						$error++;
@@ -1786,15 +1759,13 @@ class User extends CommonObject
 				$this->db->commit();
 				return $nbrowsaffected;
 			}
-			else
-			{
+			else {
 				dol_syslog(get_class($this)."::update error=".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -2;
@@ -1827,8 +1798,7 @@ class User extends CommonObject
 			$this->datelastlogin = $now;
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror().' sql='.$sql;
 			return -1;
 		}
@@ -1877,8 +1847,7 @@ class User extends CommonObject
 			{
 				$sql .= ", pass = null";
 			}
-			else
-			{
+			else {
 				$sql .= ", pass = '".$this->db->escape($password)."'";
 			}
 			$sql .= " WHERE rowid = ".$this->id;
@@ -1912,8 +1881,7 @@ class User extends CommonObject
 								$error++;
 							}
 						}
-						else
-						{
+						else {
 							$this->error = $adh->error;
 							$error++;
 						}
@@ -1932,21 +1900,18 @@ class User extends CommonObject
 					$this->db->commit();
 					return $this->pass;
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					return 0;
 				}
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				dol_print_error($this->db);
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			// We store clear password in password temporary field.
 			// After receiving confirmation link, we will crypt it and store it in pass_crypted
 			$sql = "UPDATE ".MAIN_DB_PREFIX."user";
@@ -1959,8 +1924,7 @@ class User extends CommonObject
 			{
 				return $password;
 			}
-			else
-			{
+			else {
 				dol_print_error($this->db);
 				return -3;
 			}
@@ -2001,8 +1965,7 @@ class User extends CommonObject
 		if ($this->conf->MAIN_LANG_DEFAULT) {
             $outputlangs->setDefaultLang($this->conf->MAIN_LANG_DEFAULT);
         }
-		else
-		{	// If user has not defined its own language, we used current language
+		else {	// If user has not defined its own language, we used current language
 			$outputlangs = $langs;
 		}
 
@@ -2033,8 +1996,7 @@ class User extends CommonObject
 
 			dol_syslog(get_class($this)."::send_password changelater is off, url=".$url);
 		}
-		else
-		{
+		else {
 			$url = $urlwithroot.'/user/passwordforgotten.php?action=validatenewpassword&username='.urlencode($this->login)."&passwordhash=".dol_hash($password);
 
 			$mesg .= $outputlangs->transnoentitiesnoconv("RequestToResetPasswordReceived")."\n";
@@ -2072,8 +2034,7 @@ class User extends CommonObject
 		{
 			return 1;
 		}
-		else
-		{
+		else {
 			$langs->trans("errors");
 			$this->error = $langs->trans("ErrorFailedToSendPassword").' '.$mailfile->error;
 			return -1;
@@ -2122,8 +2083,7 @@ class User extends CommonObject
 			$this->db->free($resql);
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2161,8 +2121,7 @@ class User extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -2217,15 +2176,13 @@ class User extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				dol_syslog(get_class($this)."::SetInGroup ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -2274,15 +2231,13 @@ class User extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				dol_syslog(get_class($this)."::RemoveFromGroup ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -2774,8 +2729,7 @@ class User extends CommonObject
 
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -2802,8 +2756,7 @@ class User extends CommonObject
 			$this->db->free($resql);
 			return $nb;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2828,8 +2781,7 @@ class User extends CommonObject
 			$sql .= " WHERE entity = 0";
 			if ($admin >= 0) $sql .= " AND admin = ".$admin;
 		}
-		else
-		{
+		else {
 			$sql .= " WHERE entity IN (".getEntity('user', 0).")";
 			if ($limitTo == 'active') $sql .= " AND statut = 1";
 			if ($admin >= 0) $sql .= " AND admin = ".$admin;
@@ -2844,8 +2796,7 @@ class User extends CommonObject
 			$this->db->free($resql);
 			return $nb;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -2917,8 +2868,7 @@ class User extends CommonObject
 			}
 			return $users;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -2952,8 +2902,7 @@ class User extends CommonObject
 			}
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3023,8 +2972,7 @@ class User extends CommonObject
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3083,8 +3031,7 @@ class User extends CommonObject
 		{
 			$childids = $this->cache_childids[$this->id];
 		}
-		else
-		{
+		else {
 			// Init this->users
 			$this->get_full_tree();
 
@@ -3196,8 +3143,7 @@ class User extends CommonObject
 			$this->db->free($resql);
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -3228,8 +3174,7 @@ class User extends CommonObject
 			{
 				$modele = $conf->global->USER_ADDON_PDF;
 			}
-			else
-			{
+			else {
 				$modele = 'bluesky';
 			}
 		}
@@ -3272,8 +3217,7 @@ class User extends CommonObject
 			}
 			return $user_property;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3310,13 +3254,11 @@ class User extends CommonObject
 					$sql .= " OR t.entity = 0)"; // Show always superadmin
 				}
 			}
-			else
-			{
+			else {
 				$sql .= " WHERE t.entity IN (".getEntity('user').")";
 			}
 		}
-		else
-		{
+		else {
 			$sql .= " WHERE 1";
 		}
 
@@ -3365,8 +3307,7 @@ class User extends CommonObject
 			}
 			return $num;
 		}
-		else
-		{
+		else {
             $this->errors[] = $this->db->lasterror();
             return -1;
         }
diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index 79df9d287ec..02a046a60ad 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -105,8 +105,7 @@ class UserBankAccount extends Account
                 return $this->update($user);
             }
         }
-        else
-        {
+        else {
             print $this->db->error();
             return 0;
         }
@@ -142,8 +141,7 @@ class UserBankAccount extends Account
 
         if (trim($this->label) != '')
             $sql .= ",label = '".$this->db->escape($this->label)."'";
-        else
-            $sql .= ",label = NULL";
+        else $sql .= ",label = NULL";
         $sql .= " WHERE rowid = ".$this->id;
 
         $result = $this->db->query($sql);
@@ -151,8 +149,7 @@ class UserBankAccount extends Account
         {
             return 1;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return 0;
         }
@@ -204,8 +201,7 @@ class UserBankAccount extends Account
 
             return 1;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return -1;
         }
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index bc5396e9f51..f56358963c9 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -155,8 +155,7 @@ class UserGroup extends CommonObject
 		{
 			$result = $this->fetchCommon(0, '', ' AND nom = \''.$this->db->escape($groupname).'\'');
 		}
-		else
-		{
+		else {
 			$result = $this->fetchCommon($id);
 		}
 
@@ -171,8 +170,7 @@ class UserGroup extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -201,8 +199,7 @@ class UserGroup extends CommonObject
 		{
 			$sql .= " AND g.entity IS NOT NULL";
 		}
-		else
-		{
+		else {
 			$sql .= " AND g.entity IN (0,".$conf->entity.")";
 		}
 		$sql .= " ORDER BY g.nom";
@@ -227,8 +224,7 @@ class UserGroup extends CommonObject
 
 			return $ret;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -258,8 +254,7 @@ class UserGroup extends CommonObject
 		{
 			$sql .= " AND u.entity IS NOT NULL";
 		}
-		else
-		{
+		else {
 			$sql .= " AND u.entity IN (0,".$conf->entity.")";
 		}
 		if (!empty($excludefilter)) $sql .= ' AND ('.$excludefilter.')';
@@ -290,8 +285,7 @@ class UserGroup extends CommonObject
 
 			return $ret;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -357,8 +351,7 @@ class UserGroup extends CommonObject
 				{
 					$whereforadd = 'allmodules';
 				}
-				else
-				{
+				else {
 					$whereforadd = "module='".$this->db->escape($allmodule)."'";
 					if (!empty($allperms))  $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
 				}
@@ -394,8 +387,7 @@ class UserGroup extends CommonObject
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -481,8 +473,7 @@ class UserGroup extends CommonObject
 				{
 					$wherefordel = 'allmodules';
 				}
-				else
-				{
+				else {
 					$wherefordel = "module='".$this->db->escape($allmodule)."'";
 					if (!empty($allperms))  $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
 				}
@@ -518,8 +509,7 @@ class UserGroup extends CommonObject
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -605,8 +595,7 @@ class UserGroup extends CommonObject
 						if (empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
 						$this->rights->$module->$perms->$subperms = 1;
 					}
-					else
-					{
+					else {
 						if (empty($this->rights->$module->$perms)) $this->nb_rights++;
 						$this->rights->$module->$perms = 1;
 					}
@@ -623,8 +612,7 @@ class UserGroup extends CommonObject
 			// que les droits sont en cache (car tous charges) pour cet instance de group
 			$this->all_permissions_are_loaded = 1;
 		}
-		else
-		{
+		else {
 			// If module defined, we flag it as loaded into cache
 		    $this->_tab_loaded[$moduletag] = 1;
 		}
@@ -902,8 +890,7 @@ class UserGroup extends CommonObject
 			{
 				$modele = $conf->global->USERGROUP_ADDON_PDF;
 			}
-			else
-			{
+			else {
 				$modele = 'grass';
 			}
 		}
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index c81e4068558..302e0729bb8 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -122,8 +122,7 @@ if ($id > 0)
                 $langs->load("errors");
                 print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</font>';
             }
-            else
-            {
+            else {
                 print ' &nbsp; &nbsp; '.$form->textwithpicto($langs->trans("KeepEmptyToUseDefault").': '.$conf->global->CLICKTODIAL_URL, $langs->trans("ClickToDialUrlDesc"));
             }
             print '</td>';
@@ -147,7 +146,7 @@ if ($id > 0)
 
         print '</table>';
     }
-    else	// View mode
+    else // View mode
     {
         print '<table class="border centpercent tableforfield">';
 
@@ -162,8 +161,7 @@ if ($id > 0)
         	    $langs->load("errors");
         	    print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</font>';
         	}
-        	else
-        	{
+        	else {
         		print $form->textwithpicto((empty($object->clicktodial_url) ? $langs->trans("DefaultLink").': ' : '').$url, $langs->trans("ClickToDialUrlDesc"));
         	}
         	print '</td>';
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 2b8c67d7ae6..912675dd636 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -172,8 +172,7 @@ if ($object->id)
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 1cd3b3edc37..524fc25b51a 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -115,8 +115,7 @@ if (empty($reshook)) {
 			header("Location: ".DOL_URL_ROOT."/user/group/list.php?restore_lastsearch_values=1");
 			exit;
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorForbidden'), null, 'errors');
 		}
@@ -153,8 +152,7 @@ if (empty($reshook)) {
 					header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
 				}
-				else
-				{
+				else {
 					$db->rollback();
 
 					$langs->load("errors");
@@ -163,8 +161,7 @@ if (empty($reshook)) {
 				}
 			}
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorForbidden'), null, 'errors');
 		}
@@ -190,14 +187,12 @@ if (empty($reshook)) {
 					header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
 				}
-				else
-				{
+				else {
 					setEventMessages($edituser->error, $edituser->errors, 'errors');
 				}
 			}
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorForbidden'), null, 'errors');
 		}
@@ -232,14 +227,12 @@ if (empty($reshook)) {
 				setEventMessages($langs->trans("GroupModified"), null, 'mesgs');
 				$db->commit();
 			}
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
 			}
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorForbidden'), null, 'mesgs');
 		}
@@ -287,8 +280,7 @@ if ($action == 'create')
 			print "<td>".$mc->select_entities($conf->entity);
 			print "</td></tr>\n";
 		}
-		else
-		{
+		else {
 			print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
 		}
 	}
@@ -318,8 +310,7 @@ if ($action == 'create')
 /* Visu et edition                                                            */
 /*                                                                            */
 /* ************************************************************************** */
-else
-{
+else {
     if ($id)
     {
 		$res = $object->fetch_optionals();
@@ -488,15 +479,13 @@ else
 							print img_picto($langs->trans("RemoveFromGroup"), 'unlink');
 							print '</a>';
 						}
-						else
-						{
+						else {
 							print "-";
 						}
 						print "</td></tr>\n";
 					}
 				}
-				else
-				{
+				else {
 					print '<tr><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 				}
 				print "</table>";
@@ -557,8 +546,7 @@ else
 					print "<td>".$mc->select_entities($object->entity);
 					print "</td></tr>\n";
 				}
-				else
-				{
+				else {
 					print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
 				}
 			}
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index 5462167b4af..b72fc7718f9 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -84,8 +84,7 @@ if ($action == 'dolibarr2ldap')
 	{
 		setEventMessages($langs->trans("GroupSynchronized"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($ldap->error, $ldap->errors, 'errors');
 	}
 }
@@ -196,20 +195,17 @@ if ($result > 0)
 		{
 			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
 		}
-		else
-		{
+		else {
 			$result = show_ldap_content($records, 0, $records['count'], true);
 		}
 	}
-	else
-	{
+	else {
 		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
 	}
 	$ldap->unbind();
 	$ldap->close();
 }
-else
-{
+else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
 
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 1701d2ae9c1..48c56a20218 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -117,8 +117,7 @@ if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global
 {
 	$sql .= " WHERE g.entity IS NOT NULL";
 }
-else
-{
+else {
 	$sql .= " WHERE g.entity IN (0,".$conf->entity.")";
 }
 if (!empty($search_group)) natural_search(array("g.nom", "g.note"), $search_group);
@@ -222,8 +221,7 @@ if ($resql)
 
     $db->free($resql);
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 70030dbf1af..8c8a59fa536 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -189,8 +189,7 @@ if ($object->id > 0)
     	}
     	$db->free($result);
     }
-    else
-    {
+    else {
     	dol_print_error($db);
     }
 
@@ -325,8 +324,7 @@ if ($object->id > 0)
             		print img_picto($langs->trans("Active"), 'tick');
             		print '</td>';
             	}
-            	else
-            	{
+            	else {
             		// Do not own permission
             		if ($caneditperms)
             		{
@@ -335,8 +333,7 @@ if ($object->id > 0)
             		print '<td>&nbsp</td>';
             	}
             }
-            else
-            {
+            else {
             	// Do not own permission
             	if ($caneditperms)
             	{
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 3a05bb3d640..520821ad84f 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -80,8 +80,7 @@ if (!is_array($user_arbo) && $user_arbo < 0)
 {
     setEventMessages($userstatic->error, $userstatic->errors, 'warnings');
 }
-else
-{
+else {
     // Define fulltree array
     $fulltree = $user_arbo;
     //var_dump($fulltree);
@@ -113,8 +112,7 @@ else
     		{
     			$entitystring = $langs->trans("AllEntities");
     		}
-    		else
-    		{
+    		else {
     			$mc->getInfo($entity);
     			$entitystring = $mc->label;
     		}
@@ -197,8 +195,7 @@ else
     	print '<td></td>';
     	print '</tr>';
     }
-    else
-    {
+    else {
     	print '<tr '.$bc[true].'>';
     	print '<td colspan="3">';
     	print '<table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 4c46c502acc..cec26f72dcc 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -170,8 +170,7 @@ if ($resql)
 		{
             print $companystatic->getNomUrl(1);
 		}
-		else
-		{
+		else {
 			print $langs->trans("InternalUser");
 		}
 		if ($obj->ldap_sid)
@@ -188,8 +187,7 @@ if ($resql)
 			{
 				$entitystring = $langs->trans("AllEntities");
 			}
-			else
-			{
+			else {
 				$mc->getInfo($entity);
 				$entitystring = $mc->label;
 			}
@@ -210,8 +208,7 @@ if ($resql)
 
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -229,8 +226,7 @@ if ($canreadperms)
 	{
 		$sql .= " WHERE g.entity IS NOT NULL";
 	}
-	else
-	{
+	else {
 		$sql .= " WHERE g.entity IN (0,".$conf->entity.")";
 	}
 	$sql .= $db->order("g.datec", "DESC");
@@ -284,8 +280,7 @@ if ($canreadperms)
 
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index 71410eb223a..674ef0f64b6 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -114,8 +114,7 @@ if ($object->ldap_sid)
 {
 	print '<td class="warning">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
 }
-else
-{
+else {
 	print '<td>'.$object->login.'</td>';
 }
 print '</tr>';
@@ -199,21 +198,18 @@ if ($result > 0)
 		{
 			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
 		}
-		else
-		{
+		else {
 			$result = show_ldap_content($records, 0, $records['count'], true);
 		}
 	}
-	else
-	{
+	else {
 		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
 	}
 
 	$ldap->unbind();
 	$ldap->close();
 }
-else
-{
+else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
 
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index ef6e205fd0d..ca2f39b4e9f 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -580,8 +580,7 @@ while ($i < min($num, $limit))
 		{
 			print $langs->trans("DomainUser");
 		}
-		else
-	    {
+		else {
 			print $langs->trans("InternalUser");
 		}
 		print '</td>';
@@ -597,8 +596,7 @@ while ($i < min($num, $limit))
 			{
 				print $langs->trans("AllEntities");
 			}
-			else
-			{
+			else {
 				$mc->getInfo($obj->entity);
 				print $mc->label;
 			}
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index ab4df07e193..988b879653f 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -121,8 +121,7 @@ if ($id)
 		$doleditor = new DolEditor('note_private', $object->note_private, '', 280, 'dolibarr_notes', 'In', true, false, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_8, '90%');
 		$doleditor->Create();
 	}
-	else
-	{
+	else {
 		print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_private));
 	}
 	print "</td></tr>";
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 84fbf2793e3..33dded8a304 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -88,8 +88,7 @@ if ($action == 'add')
                 dol_print_error($db);
             }
         }
-        else
-        {
+        else {
             dol_print_error($db);
         }
 
@@ -97,8 +96,7 @@ if ($action == 'add')
         {
             $db->commit();
         }
-        else
-        {
+        else {
             $db->rollback();
         }
     }
@@ -152,8 +150,7 @@ if ($result > 0)
     {
         print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
     }
-    else
-    {
+    else {
         print '<td>'.$object->login.'</td>';
     }
     print '</tr>'."\n";
@@ -228,8 +225,7 @@ if ($result > 0)
         {
             print ' &lt;'.$object->email.'&gt;';
         }
-        else
-        {
+        else {
             $langs->load("errors");
             print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $object->email);
         }
@@ -244,8 +240,7 @@ if ($result > 0)
         print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
         print '</tr>';
     }
-    else
-    {
+    else {
         print '<tr class="oddeven"><td colspan="4">';
         print $langs->trans("YouMustAssignUserMailFirst");
         print '</td></tr>';
@@ -272,8 +267,7 @@ if ($result > 0)
     {
         $num = $db->num_rows($resql);
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 
@@ -312,8 +306,7 @@ if ($result > 0)
                 {
                     print ' &lt;'.$obj->email.'&gt;';
                 }
-                else
-                {
+                else {
                     $langs->load("errors");
                     print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
                 }
@@ -421,8 +414,7 @@ if ($result > 0)
     {
         $num = $db->num_rows($resql);
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 
@@ -471,8 +463,7 @@ if ($result > 0)
 	            print $userstatic->getNomUrl(1);
 	            print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
             }
-            else
-			{
+            else {
 				print $obj->email;
             }
             print '</td>';
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index f9ebd310cfa..068ea0047b1 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -325,8 +325,7 @@ if ($action == 'edit')
     print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
     print '</div>';
 }
-else
-{
+else {
     dol_fiche_head($head, 'guisetup', $title, -1, 'user');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
@@ -397,14 +396,12 @@ else
     {
         print "<a class=\"butActionRefused classfortooltip\" title=\"".$langs->trans("FeatureDisabledInDemo")."\" href=\"#\">".$langs->trans("Modify")."</a>";
     }
-    else
-    {
+    else {
         if ($caneditfield || !empty($user->admin))       // Si utilisateur edite = utilisateur courant (pas besoin de droits particulier car il s'agit d'une page de modif d'output et non de données) ou si admin
         {
             print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a>';
         }
-        else
-        {
+        else {
             print "<a class=\"butActionRefused classfortooltip\" title=\"".$langs->trans("NotEnoughPermissions")."\" href=\"#\">".$langs->trans("Modify")."</a>";
         }
     }
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 83289521538..43202a01028 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -73,8 +73,7 @@ if ($action == 'validatenewpassword' && $username && $passwordhash)
     {
         $message = '<div class="error">'.$langs->trans("ErrorLoginDoesNotExists", $username).'</div>';
     }
-    else
-    {
+    else {
         if (dol_verifyHash($edituser->pass_temp, $passwordhash))
         {
         	// Clear session
@@ -86,8 +85,7 @@ if ($action == 'validatenewpassword' && $username && $passwordhash)
             header("Location: ".DOL_URL_ROOT.'/');
             exit;
         }
-        else
-        {
+        else {
         	$langs->load("errors");
             $message = '<div class="error">'.$langs->trans("ErrorFailedToValidatePasswordReset").'</div>';
         }
@@ -104,8 +102,7 @@ if ($action == 'buildnewpassword' && $username)
     {
         $message = '<div class="error">'.$langs->trans("ErrorBadValueForCode").'</div>';
     }
-    else
-    {
+    else {
         $edituser = new User($db);
         $result = $edituser->fetch('', $username, '', 1);
         if ($result == 0 && preg_match('/@/', $username))
@@ -118,30 +115,26 @@ if ($action == 'buildnewpassword' && $username)
             $message = '<div class="error">'.$langs->trans("ErrorLoginDoesNotExists", $username).'</div>';
             $username = '';
         }
-        else
-        {
+        else {
             if (!$edituser->email)
             {
                 $message = '<div class="error">'.$langs->trans("ErrorLoginHasNoEmail").'</div>';
             }
-            else
-            {
+            else {
                 $newpassword = $edituser->setPassword($user, '', 1);
                 if ($newpassword < 0)
                 {
                     // Failed
                     $message = '<div class="error">'.$langs->trans("ErrorFailedToChangePassword").'</div>';
                 }
-                else
-                {
+                else {
                     // Success
                     if ($edituser->send_password($user, $newpassword, 1) > 0)
                     {
                     	$message = '<div class="ok'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">'.$langs->trans("PasswordChangeRequestSent", $edituser->login, dolObfuscateEmail($edituser->email)).'</div>';
                         $username = '';
                     }
-                    else
-                    {
+                    else {
                         $message .= '<div class="error">'.$edituser->error.'</div>';
                     }
                 }
@@ -166,8 +159,7 @@ if (file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/passwordforgotten
 {
     $template_dir = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/";
 }
-else
-{
+else {
     $template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
 }
 
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 5d06973abf6..408900eb406 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -209,8 +209,7 @@ if ($result)
 	}
 	$db->free($result);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -240,8 +239,7 @@ if ($result)
 	}
 	$db->free($result);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -411,8 +409,7 @@ if ($result)
 	        	print img_picto($langs->trans("Active"), 'tick');
 	        	print '</td>';
 	        }
-	        else
-	        {
+	        else {
 	        	// Do not own permission
 	        	if ($caneditperms)
 	        	{
@@ -421,8 +418,7 @@ if ($result)
 	        	print '<td>&nbsp</td>';
 	        }
         }
-        else
-        {
+        else {
         	// Do not own permission
         	if ($caneditperms)
         	{
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 15e019dd311..f29cc49f35b 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -106,8 +106,7 @@ if ($_POST) {
 		if (!$features) {
 			setEventMessages($langs->trans('ErrorFieldsRequired'), null, 'errors');
 		}
-		else
-		{
+		else {
 			$reference = trim($reference);
 		    if (empty($reference)) {
 		        $reference = false;
@@ -361,8 +360,7 @@ if (!empty($id) || !empty($ref))
 	{
 		print $object->weight." ".measuringUnitString(0, "weight", $object->weight_units);
 	}
-	else
-	{
+	else {
 		print '&nbsp;';
 	}
 	print "</td></tr>\n";
@@ -628,8 +626,7 @@ if (!empty($id) || !empty($ref))
 
         print '</form>';
 	}
-	else
-	{
+	else {
 		if ($action === 'delete') {
 			if ($prodcomb->fetch($valueid) > 0) {
 				$prodstatic->fetch($prodcomb->fk_product_child);
@@ -801,8 +798,7 @@ if (!empty($id) || !empty($ref))
     			print '</tr>';
 		    }
 		}
-		else
-		{
+		else {
 		     print '<tr><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 		}
 		print '</table>';
diff --git a/htdocs/variants/create.php b/htdocs/variants/create.php
index 55bf1c81f34..567dc902a5a 100644
--- a/htdocs/variants/create.php
+++ b/htdocs/variants/create.php
@@ -43,8 +43,7 @@ if ($_POST) {
 			{
 				header('Location: '.$backtopage);
 			}
-			else
-			{
+			else {
 				header('Location: '.DOL_URL_ROOT.'/variants/card.php?id='.$resid.'&backtopage='.urlencode($backtopage));
 			}
 			exit;
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index 819694f5041..cb0940bb61c 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -48,8 +48,7 @@ if ($actionsave)
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         $db->rollback();
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
diff --git a/htdocs/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php
index 39ed3b3cdf5..10ef9cfbd7e 100644
--- a/htdocs/webservices/server_actioncomm.php
+++ b/htdocs/webservices/server_actioncomm.php
@@ -328,14 +328,12 @@ function getActionComm($authentication, $id)
 			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
 			        'actioncomm'=>$actioncomm_result_fields);
             }
-            else
-            {
+            else {
                 $error++;
                 $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
             }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
         }
@@ -389,14 +387,12 @@ function getListActionCommType($authentication)
 			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
 			        'actioncommtypes'=>$resultarray);
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
@@ -482,8 +478,7 @@ function createActionComm($authentication, $actioncomm)
 			$db->commit();
 			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id);
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			$error++;
 			$errorcode = 'KO';
diff --git a/htdocs/webservices/server_category.php b/htdocs/webservices/server_category.php
index de1fb73d3c0..d7382447749 100644
--- a/htdocs/webservices/server_category.php
+++ b/htdocs/webservices/server_category.php
@@ -262,14 +262,12 @@ function getCategory($authentication, $id)
 					'categorie'=> $cat
 			    );
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php
index 804cb3f7db1..023cdc1c4ac 100644
--- a/htdocs/webservices/server_contact.php
+++ b/htdocs/webservices/server_contact.php
@@ -333,14 +333,12 @@ function getContact($authentication, $id, $ref_ext)
 			        'contact'=>$contact_result_fields
                 );
 	        }
-	        else
-	        {
+	        else {
 	            $error++;
 	            $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 	        }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref_ext='.$ref_ext;
         }
@@ -451,8 +449,7 @@ function createContact($authentication, $contact)
 			$db->commit();
 			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			$error++;
 			$errorcode = 'KO';
@@ -584,8 +581,7 @@ function getContactsForThirdParty($authentication, $idthirdparty)
 
 			);
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
 		}
diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 46590688f88..8b15ade0a6a 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -370,14 +370,12 @@ function getInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 			        	'lines' => $linesresp
 			        ));
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
@@ -511,8 +509,7 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
 
 			);
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
 		}
@@ -627,8 +624,7 @@ function createInvoice($authentication, $invoice)
             $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$new_invoice->id,
             		'ref'=>$new_invoice->ref, 'ref_ext'=>$new_invoice->ref_ext);
         }
-        else
-        {
+        else {
             $db->rollback();
             $error++;
             $errorcode = 'KO';
@@ -707,14 +703,12 @@ function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = ''
 					}
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id_order.' nor ref='.$ref_order.' nor ref_ext='.$ref_ext_order;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
@@ -724,8 +718,7 @@ function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = ''
 	{
 		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
-	else
-	{
+	else {
 		$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref, 'ref_ext'=>$newobject->ref_ext);
 	}
 
diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index 0b22ea9aab6..7018f5fb5c8 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -473,15 +473,13 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
 					));
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND';
                 $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED';
             $errorlabel = 'User does not have permission for this request';
@@ -640,8 +638,7 @@ function getOrdersForThirdParty($authentication, $idthirdparty)
 
 			);
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
 		}
@@ -786,8 +783,7 @@ function createOrder($authentication, $order)
 			$db->commit();
 			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
 		}
-		else
-		{
+		else {
 			dol_syslog("Webservice server_order:: order creation or validation failed, rollback", LOG_ERR);
 			$db->rollback();
 			$error++;
@@ -848,24 +844,21 @@ function validOrder($authentication, $id = '', $id_warehouse = 0)
 					$outputlangs = $langs;
 					$order->generateDocument($order->modelpdf, $outputlangs);
 				}
-				else
-				{
+				else {
 					$db->rollback();
 					$error++;
 					$errorcode = 'KO';
 					$errorlabel = $order->error;
 				}
 			}
-			else
-			{
+			else {
 				$db->rollback();
 				$error++;
 				$errorcode = 'KO';
 				$errorlabel = $order->error;
 			}
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			$error++;
 			$errorcode = 'KO';
@@ -877,8 +870,7 @@ function validOrder($authentication, $id = '', $id_warehouse = 0)
 	{
 		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
-	else
-	{
+	else {
 		$db->commit();
 		$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''));
 	}
diff --git a/htdocs/webservices/server_other.php b/htdocs/webservices/server_other.php
index 4ae702ade15..71ee78d3c4d 100644
--- a/htdocs/webservices/server_other.php
+++ b/htdocs/webservices/server_other.php
@@ -304,8 +304,7 @@ function getDocument($authentication, $modulepart, $file, $refname = '')
 					'document'=>$objectret
 				);
 			}
-			else
-			{
+			else {
 				dol_syslog("File doesn't exist ".$original_file);
 				$errorcode = 'NOT_FOUND';
 				$errorlabel = '';
diff --git a/htdocs/webservices/server_payment.php b/htdocs/webservices/server_payment.php
index 38dab505bac..5145c4a3b7b 100644
--- a/htdocs/webservices/server_payment.php
+++ b/htdocs/webservices/server_payment.php
@@ -197,8 +197,7 @@ function createPayment($authentication, $payment)
             $db->commit();
             $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$new_payment->id);
         }
-        else
-        {
+        else {
             $db->rollback();
             $error++;
             $errorcode = 'KO';
diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index a98d8b2a6cd..68563bfab38 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -450,14 +450,12 @@ function getProductOrService($authentication, $id = '', $ref = '', $ref_ext = ''
 			        'product'=>$productorservice_result_fields
                 );
             }
-            else
-            {
+            else {
                 $error++;
                 $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
             }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
         }
@@ -613,8 +611,7 @@ function createProductOrService($authentication, $product)
 							$newobject->error = 'You set a different value for stock, but correction of stock count (before='.$getstockreal.', after='.$savstockreal.') fails with error '.$newobject->error;
 						}
 					}
-					else
-					{
+					else {
 						$error++;
 						$newobject->error = 'You set a different value for stock but we failed to find warehouse '.$product['warehouse_ref'].' to make correction.';
 					}
@@ -627,8 +624,7 @@ function createProductOrService($authentication, $product)
             $db->commit();
             $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
         }
-        else
-        {
+        else {
             $db->rollback();
             $error++;
             $errorcode = 'KO';
@@ -754,8 +750,7 @@ function updateProductOrService($authentication, $product)
         {
             $error++;
         }
-        else
-		{
+        else {
         	// Update stock if stock count is provided and differs from database after creation or update
 			if (isset($product['stock_real']) && $product['stock_real'] != '' && !empty($conf->global->stock->enabled))
 			{
@@ -785,8 +780,7 @@ function updateProductOrService($authentication, $product)
 							$newobject->error = 'You set a different value for stock, but correction of stock count (before='.$getstockreal.', after='.$savstockreal.') fails with error '.$newobject->error;
 						}
 					}
-					else
-					{
+					else {
 						$error++;
 						$newobject->error = 'You set a different value for stock but we failed to find warehouse '.$product['warehouse_ref'].' to make correction.';
 					}
@@ -819,8 +813,7 @@ function updateProductOrService($authentication, $product)
             $db->commit();
             $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
         }
-        else
-		{
+        else {
             $db->rollback();
             $error++;
             $errorcode = 'KO';
@@ -890,8 +883,7 @@ function deleteProductOrService($authentication, $listofidstring)
 		        $firsterror = 'Product or service with id '.$id.' not found';
 		        break;
 	        }
-	        else
-			{
+	        else {
 		        $result = $newobject->delete($user);
 		        if ($result <= 0)
 		        {
@@ -910,8 +902,7 @@ function deleteProductOrService($authentication, $listofidstring)
             //$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'listofid'=>$listofiddeleted);
             $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'nbdeleted'=>count($listofiddeleted));
 	    }
-	    else
-	    {
+	    else {
 	    	$db->rollback();
 	        $error++;
 	        $errorcode = 'KO';
@@ -983,8 +974,7 @@ function getListOfProductsOrServices($authentication, $filterproduct)
          		$i++;
          	}
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = $db->lasterrno();
             $errorlabel = $db->lasterror();
@@ -998,8 +988,7 @@ function getListOfProductsOrServices($authentication, $filterproduct)
         	'products'=>$arrayproducts
         );
     }
-    else
-    {
+    else {
         $objectresp = array(
 			'result'=>array('result_code' => 'OK', 'result_label' => ''),
         	'products'=>$arrayproducts
@@ -1139,21 +1128,18 @@ function getProductsForCategory($authentication, $id, $lang = '')
 					'products'=> $products
 					);
 				}
-				else
-				{
+				else {
 					$errorcode = 'NORECORDS_FOR_ASSOCIATION'; $errorlabel = 'No products associated'.$sql;
 					$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
 					dol_syslog("getProductsForCategory:: ".$errorcode, LOG_DEBUG);
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
diff --git a/htdocs/webservices/server_project.php b/htdocs/webservices/server_project.php
index 5bbaaaf035a..dc8fc81db2c 100644
--- a/htdocs/webservices/server_project.php
+++ b/htdocs/webservices/server_project.php
@@ -298,8 +298,7 @@ function createProject($authentication, $project)
                     $error++;
                 }
             }
-            else
-            {
+            else {
                 $error++;
             }
 
@@ -308,16 +307,14 @@ function createProject($authentication, $project)
                 $db->commit();
                 $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
             }
-            else
-            {
+            else {
                 $db->rollback();
                 $error++;
                 $errorcode = 'KO';
                 $errorlabel = $newobject->error;
             }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
         }
@@ -424,14 +421,12 @@ function getProject($authentication, $id = '', $ref = '')
                     'project'=>$project_result_fields
                 );
             }
-            else
-            {
+            else {
                 $error++;
                 $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref;
             }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
         }
diff --git a/htdocs/webservices/server_supplier_invoice.php b/htdocs/webservices/server_supplier_invoice.php
index 78a00ced40e..ecf2c51fd1f 100644
--- a/htdocs/webservices/server_supplier_invoice.php
+++ b/htdocs/webservices/server_supplier_invoice.php
@@ -303,14 +303,12 @@ function getSupplierInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 
 			    ));
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
@@ -441,8 +439,7 @@ function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 
 			);
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
 		}
diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index d69b481323e..1e9f8355d52 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -378,14 +378,12 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
 			        'thirdparty'=>$thirdparty_result_fields);
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
@@ -515,8 +513,7 @@ function createThirdParty($authentication, $thirdparty)
 
             $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
         }
-        else
-        {
+        else {
             $db->rollback();
             $error++;
             $errorcode = 'KO';
@@ -750,8 +747,7 @@ function getListOfThirdParties($authentication, $filterthirdparty)
                 $i++;
             }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = $db->lasterrno();
             $errorlabel = $db->lasterror();
@@ -765,8 +761,7 @@ function getListOfThirdParties($authentication, $filterthirdparty)
             'thirdparties'=>$arraythirdparties
         );
     }
-    else
-    {
+    else {
         $objectresp = array(
             'result'=>array('result_code' => 'OK', 'result_label' => ''),
             'thirdparties'=>$arraythirdparties
@@ -828,8 +823,7 @@ function deleteThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 
 					$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''));
 				}
-				else
-				{
+				else {
 					$db->rollback();
 					$error++;
 					$errorcode = 'KO';
@@ -837,14 +831,12 @@ function deleteThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 					dol_syslog("Function: deleteThirdParty cant delete");
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php
index 8793d2f02fa..c37e920f61d 100644
--- a/htdocs/webservices/server_user.php
+++ b/htdocs/webservices/server_user.php
@@ -372,14 +372,12 @@ function getUser($authentication, $id, $ref = '', $ref_ext = '')
                     )
                 );
             }
-            else
-            {
+            else {
                 $error++;
                 $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
             }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
         }
@@ -426,8 +424,7 @@ function getListOfGroups($authentication)
 		{
 			$sql .= " WHERE g.entity IS NOT NULL";
 		}
-		else
-		{
+		else {
 			$sql .= " WHERE g.entity IN (0,".$conf->entity.")";
 		}
 		$sql .= " GROUP BY g.rowid, g.nom, g.entity, g.datec";
@@ -444,8 +441,7 @@ function getListOfGroups($authentication)
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = $db->lasterrno();
 			$errorlabel = $db->lasterror();
@@ -459,8 +455,7 @@ function getListOfGroups($authentication)
 		'groups'=>$arraygroups
 		);
 	}
-	else
-	{
+	else {
 		$objectresp = array(
 		'result'=>array('result_code' => 'OK', 'result_label' => ''),
 		'groups'=>$arraygroups
@@ -526,8 +521,7 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 					$error++;
 					$errorcode = 'ALREADY_EXIST'; $errorlabel = 'Object not create : company or contact exists '.$thirdpartywithuser['email'];
 				}
-				else
-				{
+				else {
 					$db->begin();
 					/*
 					 * Company creation
@@ -633,14 +627,12 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 								if ($thirdpartywithuser['group_id'] > 0)
 									$edituser->SetInGroup($thirdpartywithuser['group_id'], $conf->entity);
 							}
-							else
-							{
+							else {
 								$error++;
 								$errorcode = 'NOT_CREATE'; $errorlabel = 'Object not create : '.$edituser->error;
 							}
 						}
-						else
-						{
+						else {
 							$error++;
 							$errorcode = 'NOT_CREATE'; $errorlabel = 'Object not create : '.$contact->error;
 						}
@@ -651,22 +643,19 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 							$error = 0;
 						}
 					}
-					else
-					{
+					else {
 						$error++;
 						$errors = ($thirdparty->error ? array($thirdparty->error) : $thirdparty->errors);
 					}
 				}
 			}
-			else
-			{
+			else {
 				// retour creation KO
 				$error++;
 				$errorcode = 'NOT_CREATE'; $errorlabel = 'Object not create';
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
@@ -732,20 +721,17 @@ function setUserPassword($authentication, $shortuser)
 						'groups'=>$arraygroups
 					);
 				}
-				else
-				{
+				else {
 					$error++;
 					$errorcode = 'NOT_MODIFIED'; $errorlabel = 'Error when changing password';
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'User not found';
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}

From f5688b2eecf8a56effd263936ac1ac8bf0dbdf6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 01:52:25 +0200
Subject: [PATCH 327/490] add new rule

---
 htdocs/compta/accounting-files.php            |  12 +-
 htdocs/compta/ajaxpayment.php                 |   6 +-
 htdocs/compta/bank/annuel.php                 |  27 +--
 htdocs/compta/bank/bankentries_list.php       |  71 ++----
 htdocs/compta/bank/budget.php                 |   3 +-
 htdocs/compta/bank/card.php                   |  30 +--
 htdocs/compta/bank/categ.php                  |   3 +-
 htdocs/compta/bank/class/account.class.php    |  72 ++----
 .../bank/class/api_bankaccounts.class.php     |   9 +-
 .../bank/class/paymentvarious.class.php       |  24 +-
 htdocs/compta/bank/graph.php                  |  54 ++---
 htdocs/compta/bank/line.php                   |  51 ++---
 htdocs/compta/bank/list.php                   |   6 +-
 htdocs/compta/bank/releve.php                 |  24 +-
 htdocs/compta/bank/transfer.php               |   9 +-
 htdocs/compta/bank/treso.php                  |   9 +-
 htdocs/compta/bank/various_payment/card.php   |  21 +-
 .../compta/bank/various_payment/document.php  |   3 +-
 htdocs/compta/bank/various_payment/list.php   |   6 +-
 .../compta/cashcontrol/cashcontrol_card.php   |  24 +-
 .../compta/cashcontrol/cashcontrol_list.php   |   3 +-
 htdocs/compta/cashcontrol/report.php          |   6 +-
 htdocs/compta/charges/index.php               |  18 +-
 htdocs/compta/clients.php                     |   3 +-
 htdocs/compta/deplacement/card.php            |  45 ++--
 .../deplacement/class/deplacement.class.php   |  21 +-
 htdocs/compta/deplacement/document.php        |   3 +-
 htdocs/compta/deplacement/index.php           |   3 +-
 htdocs/compta/deplacement/list.php            |   3 +-
 htdocs/compta/deplacement/stats/index.php     |   3 +-
 htdocs/compta/facture/card-rec.php            |  99 +++-----
 htdocs/compta/facture/card.php                | 131 ++++-------
 .../facture/class/api_invoices.class.php      |   9 +-
 .../facture/class/facture-rec.class.php       |  97 +++-----
 htdocs/compta/facture/class/facture.class.php | 214 ++++++------------
 .../facture/class/paymentterm.class.php       |  18 +-
 htdocs/compta/facture/contact.php             |  12 +-
 htdocs/compta/facture/document.php            |   6 +-
 .../compta/facture/invoicetemplate_list.php   |  15 +-
 htdocs/compta/facture/list.php                |  21 +-
 htdocs/compta/facture/prelevement.php         |  48 ++--
 htdocs/compta/facture/stats/index.php         |   9 +-
 .../facture/tpl/linkedobjectblock.tpl.php     |   3 +-
 htdocs/compta/index.php                       |  48 ++--
 htdocs/compta/journal/purchasesjournal.php    |   5 +-
 htdocs/compta/journal/sellsjournal.php        |   5 +-
 htdocs/compta/localtax/card.php               |  15 +-
 .../compta/localtax/class/localtax.class.php  |  45 ++--
 htdocs/compta/localtax/clients.php            |  24 +-
 htdocs/compta/localtax/index.php              |  12 +-
 htdocs/compta/localtax/list.php               |   3 +-
 htdocs/compta/localtax/quadri_detail.php      |  21 +-
 htdocs/compta/paiement.php                    |  21 +-
 htdocs/compta/paiement/card.php               |  24 +-
 htdocs/compta/paiement/cheque/card.php        |  60 ++---
 .../cheque/class/remisecheque.class.php       |  75 ++----
 htdocs/compta/paiement/cheque/index.php       |   6 +-
 htdocs/compta/paiement/cheque/list.php        |   6 +-
 .../compta/paiement/class/paiement.class.php  |  69 ++----
 htdocs/compta/paiement/list.php               |   8 +-
 htdocs/compta/paiement/rapport.php            |   3 +-
 htdocs/compta/paiement/tovalidate.php         |   3 +-
 htdocs/compta/paiement_charge.php             |   9 +-
 htdocs/compta/payment_sc/card.php             |   9 +-
 htdocs/compta/paymentbybanktransfer/index.php |   9 +-
 htdocs/compta/prelevement/bons.php            |   3 +-
 htdocs/compta/prelevement/card.php            |   6 +-
 .../class/bonprelevement.class.php            | 123 ++++------
 .../class/ligneprelevement.class.php          |   6 +-
 .../class/rejetprelevement.class.php          |  27 +--
 htdocs/compta/prelevement/create.php          |  18 +-
 htdocs/compta/prelevement/demandes.php        |   6 +-
 htdocs/compta/prelevement/factures.php        |   6 +-
 htdocs/compta/prelevement/fiche-rejet.php     |   9 +-
 htdocs/compta/prelevement/fiche-stat.php      |   6 +-
 htdocs/compta/prelevement/index.php           |   9 +-
 htdocs/compta/prelevement/line.php            |  24 +-
 htdocs/compta/prelevement/list.php            |   3 +-
 htdocs/compta/prelevement/rejets.php          |   3 +-
 htdocs/compta/prelevement/stats.php           |   6 +-
 htdocs/compta/recap-compta.php                |   9 +-
 htdocs/compta/resultat/clientfourn.php        |  53 ++---
 htdocs/compta/resultat/index.php              |  26 +--
 htdocs/compta/resultat/result.php             |   4 +-
 htdocs/compta/sociales/card.php               |  30 +--
 .../sociales/class/chargesociales.class.php   |  27 +--
 .../class/paymentsocialcontribution.class.php |  27 +--
 htdocs/compta/sociales/document.php           |   3 +-
 htdocs/compta/sociales/list.php               |  12 +-
 htdocs/compta/sociales/payments.php           |  18 +-
 htdocs/compta/stats/byratecountry.php         |   3 +-
 htdocs/compta/stats/cabyprodserv.php          |   3 +-
 htdocs/compta/stats/cabyuser.php              |   5 +-
 htdocs/compta/stats/casoc.php                 |   5 +-
 htdocs/compta/stats/index.php                 |  23 +-
 htdocs/compta/stats/supplier_turnover.php     |  18 +-
 .../stats/supplier_turnover_by_prodserv.php   |   3 +-
 .../stats/supplier_turnover_by_thirdparty.php |   3 +-
 htdocs/compta/tva/card.php                    |  18 +-
 htdocs/compta/tva/class/tva.class.php         |  51 ++---
 htdocs/compta/tva/clients.php                 |  12 +-
 htdocs/compta/tva/document.php                |   3 +-
 htdocs/compta/tva/index.php                   |  12 +-
 htdocs/compta/tva/list.php                    |   9 +-
 htdocs/compta/tva/quadri_detail.php           |  18 +-
 htdocs/contact/agenda.php                     |   6 +-
 .../actions_contactcard_common.class.php      |   9 +-
 .../actions_contactcard_default.class.php     |   3 +-
 htdocs/contact/card.php                       |  69 ++----
 htdocs/contact/class/contact.class.php        |  60 ++---
 htdocs/contact/consumption.php                |  12 +-
 htdocs/contact/ldap.php                       |  15 +-
 htdocs/contact/list.php                       |   9 +-
 htdocs/contact/perso.php                      |  24 +-
 htdocs/contact/vcard.php                      |   3 +-
 htdocs/contrat/agenda.php                     |   3 +-
 htdocs/contrat/card.php                       | 102 +++------
 htdocs/contrat/class/api_contracts.class.php  |   6 +-
 htdocs/contrat/class/contrat.class.php        | 113 ++++-----
 htdocs/contrat/contact.php                    |   6 +-
 htdocs/contrat/document.php                   |   3 +-
 htdocs/contrat/index.php                      |  33 +--
 htdocs/contrat/list.php                       |   3 +-
 htdocs/contrat/services_list.php              |  12 +-
 htdocs/cron/admin/cron.php                    |   6 +-
 htdocs/cron/card.php                          |  33 +--
 htdocs/cron/class/cronjob.class.php           |  42 ++--
 htdocs/cron/list.php                          |  15 +-
 htdocs/dav/dav.class.php                      |  30 +--
 htdocs/dav/dav.lib.php                        |   6 +-
 .../class/DataCollector/DolLogsCollector.php  |   3 +-
 htdocs/ecm/ajax/ecmdatabase.php               |   9 +-
 htdocs/ecm/class/ecmdirectory.class.php       |  48 ++--
 htdocs/ecm/class/ecmfiles.class.php           |   6 +-
 htdocs/ecm/class/htmlecm.form.class.php       |   6 +-
 htdocs/ecm/dir_add_card.php                   |  16 +-
 htdocs/ecm/dir_card.php                       |  46 ++--
 htdocs/ecm/file_card.php                      |  27 +--
 htdocs/ecm/index.php                          |  15 +-
 htdocs/ecm/index_auto.php                     |  15 +-
 .../class/emailcollector.class.php            |  72 ++----
 .../class/emailcollectoraction.class.php      |   3 +-
 .../class/emailcollectorfilter.class.php      |   3 +-
 htdocs/expedition/card.php                    | 150 ++++--------
 .../expedition/class/api_shipments.class.php  |   6 +-
 htdocs/expedition/class/expedition.class.php  | 174 +++++---------
 .../class/expeditionbatch.class.php           |  12 +-
 htdocs/expedition/contact.php                 |   3 +-
 htdocs/expedition/index.php                   |   3 +-
 htdocs/expedition/list.php                    |   6 +-
 htdocs/expedition/shipment.php                |  33 +--
 htdocs/expedition/stats/index.php             |   3 +-
 htdocs/expensereport/ajax/ajaxik.php          |  12 +-
 htdocs/expensereport/ajax/ajaxprojet.php      |   6 +-
 htdocs/expensereport/card.php                 | 159 +++++--------
 .../class/api_expensereports.class.php        |   3 +-
 .../class/expensereport.class.php             | 192 ++++++----------
 .../class/expensereport_ik.class.php          |  12 +-
 .../class/expensereport_rule.class.php        |   9 +-
 .../class/paymentexpensereport.class.php      |  30 +--
 htdocs/expensereport/document.php             |   3 +-
 htdocs/expensereport/index.php                |   3 +-
 htdocs/expensereport/list.php                 |  18 +-
 htdocs/expensereport/payment/card.php         |  12 +-
 htdocs/expensereport/payment/payment.php      |   6 +-
 htdocs/expensereport/stats/index.php          |   3 +-
 .../tpl/expensereport_linktofile.tpl.php      |   6 +-
 htdocs/fichinter/card-rec.php                 |  21 +-
 htdocs/fichinter/card.php                     |  72 ++----
 htdocs/fichinter/class/fichinter.class.php    |  87 +++----
 htdocs/fichinter/contact.php                  |   3 +-
 htdocs/fichinter/document.php                 |   3 +-
 htdocs/fichinter/index.php                    |   3 +-
 htdocs/fichinter/list.php                     |   3 +-
 htdocs/fichinter/stats/index.php              |   9 +-
 htdocs/fourn/card.php                         |  36 +--
 .../class/api_supplier_invoices.class.php     |   3 +-
 htdocs/fourn/class/fournisseur.class.php      |  12 +-
 .../class/fournisseur.commande.class.php      | 210 ++++++-----------
 .../fournisseur.commande.dispatch.class.php   |  15 +-
 .../fourn/class/fournisseur.facture.class.php | 133 ++++-------
 .../fourn/class/fournisseur.product.class.php |  44 ++--
 htdocs/fourn/class/paiementfourn.class.php    |  48 ++--
 htdocs/fourn/commande/card.php                | 144 ++++--------
 htdocs/fourn/commande/contact.php             |  12 +-
 htdocs/fourn/commande/dispatch.php            |  24 +-
 htdocs/fourn/commande/document.php            |   3 +-
 htdocs/fourn/commande/index.php               |   9 +-
 htdocs/fourn/commande/info.php                |   6 +-
 htdocs/fourn/commande/list.php                |  18 +-
 htdocs/fourn/commande/note.php                |   3 +-
 htdocs/fourn/commande/orderstoinvoice.php     |   6 +-
 htdocs/fourn/contact.php                      |   3 +-
 htdocs/fourn/facture/card.php                 | 131 ++++-------
 htdocs/fourn/facture/contact.php              |  12 +-
 htdocs/fourn/facture/document.php             |   3 +-
 htdocs/fourn/facture/impayees.php             |   3 +-
 htdocs/fourn/facture/list.php                 |   6 +-
 htdocs/fourn/facture/paiement.php             |  27 +--
 htdocs/fourn/facture/rapport.php              |   3 +-
 .../facture/tpl/linkedobjectblock.tpl.php     |   3 +-
 htdocs/fourn/index.php                        |   9 +-
 htdocs/fourn/paiement/card.php                |  24 +-
 htdocs/fourn/product/list.php                 |   3 +-
 htdocs/fourn/recap-fourn.php                  |   9 +-
 htdocs/ftp/admin/ftpclient.php                |  15 +-
 htdocs/ftp/index.php                          |  71 ++----
 htdocs/holiday/card.php                       |  78 +++----
 htdocs/holiday/class/holiday.class.php        | 108 +++------
 htdocs/holiday/define_holiday.php             |  12 +-
 htdocs/holiday/document.php                   |  12 +-
 htdocs/holiday/list.php                       |   9 +-
 htdocs/holiday/month_report.php               |   3 +-
 htdocs/imports/class/import.class.php         |  12 +-
 htdocs/imports/import.php                     |  71 ++----
 215 files changed, 1910 insertions(+), 3784 deletions(-)

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index faf2feeb7a0..b14e3adafad 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -335,8 +335,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 
 		                    $filesarray[$nofile['item'].'_'.$nofile['id']] = $nofile;
 		                }
-		                else
-		                {
+		                else {
 		                    foreach ($files as $key => $file)
 		                    {
 		                    	$file['id'] = $objd->id;
@@ -384,8 +383,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		            $i++;
 		        }
 		    }
-		    else
-		    {
+		    else {
 		        dol_print_error($db);
 		    }
 
@@ -492,8 +490,7 @@ if ($result && $action == "dl" && !$error)
 
         exit();
     }
-    else
-    {
+    else {
     	setEventMessages($langs->trans("FailedToOpenFile", $zipname), null, 'errors');
     }
 }
@@ -626,8 +623,7 @@ if (!empty($date_start) && !empty($date_stop))
         {
             print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoItem").'</td></tr>';
         }
-        else
-        {
+        else {
             // Sort array by date ASC to calculate balance
 
             $totalET_debit = 0;
diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php
index f380d8b4ee5..0129d1e5f43 100644
--- a/htdocs/compta/ajaxpayment.php
+++ b/htdocs/compta/ajaxpayment.php
@@ -81,13 +81,11 @@ if ($currentInvId)																	// Here to breakdown
 			$remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount
 			$result += $remainAmount; // result must be deduced by
 			$currentAmount += $remainAmount; // curAmount put to curRemain
-		} else
-		{
+		} else {
 			$currentAmount = $currentRemain;
 			$result += $currentRemain;
 		}
-	} else
-	{
+	} else {
 		// Reset the substraction for this amount
 		$result += price2num($currentAmount);
 		$currentAmount = 0;
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index 1f6e5e6620c..51d838878b8 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -51,8 +51,7 @@ if (!$year_start)
 	$year_start = $year_current - 2;
 	$year_end = $year_current;
 }
-else
-{
+else {
 	$year_end = $year_start + 2;
 }
 
@@ -108,8 +107,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -136,8 +134,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -158,8 +155,7 @@ if (!empty($id))
     {
         dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
     }
-    else
-    {
+    else {
         $bankaccount = new Account($db);
         $listid = explode(',', $id);
         foreach ($listid as $key => $aId)
@@ -171,8 +167,7 @@ if (!empty($id))
         }
     }
 }
-else
-{
+else {
 	print $langs->trans("AllAccounts");
 }
 
@@ -281,8 +276,7 @@ if ($result < 0)
 	$error++;
 	setEventMessages($langs->trans("ErrorFailedToCreateDir"), null, 'errors');
 }
-else
-{
+else {
 	// Calcul de $min et $max
 	$sql = "SELECT MIN(b.datev) as min, MAX(b.datev) as max";
 	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
@@ -299,8 +293,7 @@ else
 		$min = $db->jdate($obj->min);
 		$max = $db->jdate($obj->max);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 	$log = "graph.php: min=".$min." max=".$max;
@@ -339,8 +332,7 @@ else
 			}
 			$db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -426,8 +418,7 @@ else
 			}
 			$db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 7d059734126..d5fb533016e 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -69,8 +69,7 @@ if ($fielvalue)
 	if ($user->socid) $socid = $user->socid;
 	$result = restrictedArea($user, 'banque', $fieldvalue, 'bank_account&bank_account', '', '', $fieldtype);
 }
-else
-{
+else {
 	if ($user->socid) $socid = $user->socid;
 	$result = restrictedArea($user, 'banque');
 }
@@ -242,15 +241,13 @@ if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', '
                 }
             }
         }
-        else
-        {
+        else {
             $error++;
             $langs->load("errors");
             setEventMessages($langs->trans("NoRecordSelected"), null, 'errors');
         }
     }
-    else
-    {
+    else {
         $error++;
         $langs->load("errors");
         setEventMessages($langs->trans("ErrorPleaseTypeBankTransactionReportName"), null, 'errors');
@@ -287,8 +284,7 @@ if (GETPOST('save') && !$cancel && $user->rights->banque->modifier)
     {
         $amount = price2num($_POST["addcredit"]);
     }
-    else
-    {
+    else {
         $amount = - price2num($_POST["adddebit"]);
     }
 
@@ -338,13 +334,11 @@ if (GETPOST('save') && !$cancel && $user->rights->banque->modifier)
             header("Location: ".$_SERVER['PHP_SELF'].($id ? "?id=".$id : ''));
             exit;
         }
-        else
-        {
+        else {
             setEventMessages($object->error, $object->errors, 'errors');
         }
     }
-    else
-    {
+    else {
         $action = 'addline';
     }
 }
@@ -469,8 +463,7 @@ if ($id > 0 || !empty($ref))
         }
     }
 }
-else
-{
+else {
 	llxHeader('', $langs->trans("BankTransactions"), '', '', 0, 0, array(), array(), $param);
 }
 
@@ -675,8 +668,7 @@ if ($resql)
 	        print $liste;
 	        if ($numr <= 0) print '<b>'.$langs->trans("None").'</b>';
 	    }
-	    else
-	    {
+	    else {
 	        dol_print_error($db);
 	    }
 
@@ -793,13 +785,12 @@ if ($resql)
 			{
 			    $newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&accountid='.$search_account.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.urlencode($search_account)), '', $user->rights->banque->modifier);
 			}
-			else												// If direct entries is not done using miscellaneous payments
+			else // If direct entries is not done using miscellaneous payments
 			{
                 $newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', $user->rights->banque->modifier);
 			}
 		}
-		else
-		{
+		else {
             $newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', -1);
 		}
 	}
@@ -1041,8 +1032,7 @@ if ($resql)
                 		$balancebefore = $objforbalance->previoustotal + ($sign * $objp->amount);
                 	}
                 	// If sort is asc,asc,asc then total of previous date is balance of line before the next line to show
-                	else
-                	{
+                	else {
                 		$balance = $objforbalance->previoustotal;
                 	}
                 }
@@ -1129,8 +1119,7 @@ if ($resql)
         	$balance = price2num($balancebefore, 'MT'); // balance = balancebefore of previous line (sort is desc)
         	$balancebefore = price2num($balancebefore - ($sign * $objp->amount), 'MT');
         }
-		else
-		{
+		else {
 			$balancebefore = price2num($balance, 'MT'); // balancebefore = balance of previous line (sort is asc)
 			$balance = price2num($balance + ($sign * $objp->amount), 'MT');
 		}
@@ -1142,8 +1131,7 @@ if ($resql)
             $cachebankaccount[$objp->bankid] = $bankaccounttmp;
             $bankaccount = $bankaccounttmp;
         }
-        else
-        {
+        else {
             $bankaccount = $cachebankaccount[$objp->bankid];
         }
 
@@ -1279,8 +1267,7 @@ if ($resql)
     	                print $bankstatic->getNomUrl(1, '');
     	                print ')';
     	            }
-    	            else
-    	            {
+    	            else {
     	                $bankstatic->id = $objp->bankid;
     	                $bankstatic->label = $objp->bankref;
     	                print ' ('.$langs->trans("TransferFrom").' ';
@@ -1306,8 +1293,7 @@ if ($resql)
     	        elseif ($links[$key]['type'] == 'sc')
     	        {
     	        }
-    	        else
-    	        {
+    	        else {
     	            // Show link with label $links[$key]['label']
     	            if (!empty($objp->label) && !empty($links[$key]['label'])) print ' - ';
     	            print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
@@ -1317,8 +1303,7 @@ if ($resql)
     	                if ($reg[1] == 'paiement') $reg[1] = 'Payment';
     	                print ' '.$langs->trans($reg[1]);
     	            }
-    	            else
-    	            {
+    	            else {
     	                print ' '.$links[$key]['label'];
     	            }
     	            print '</a>';
@@ -1396,8 +1381,7 @@ if ($resql)
 				$companystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
 				print $companystatic->getNomUrl(1);
 			}
-			else
-			{
+			else {
 				print '&nbsp;';
 			}
 			print '</td>';
@@ -1450,13 +1434,11 @@ if ($resql)
     			{
     				print '<td class="nowrap right">&nbsp;'.price($balancebefore).'</td>';
     			}
-    			else
-    			{
+    			else {
     				print '<td class="error nowrap right">&nbsp;'.price($balancebefore).'</td>';
     			}
     		}
-    		else
-    		{
+    		else {
     			print '<td class="right">-</td>';
     		}
     		if (!$i) $totalarray['nbfield']++;
@@ -1470,13 +1452,11 @@ if ($resql)
     			{
     				print '<td class="nowrap right">&nbsp;'.price($balance).'</td>';
     			}
-    			else
-    			{
+    			else {
     				print '<td class="error nowrap right">&nbsp;'.price($balance).'</td>';
     			}
     		}
-    		else
-    		{
+    		else {
     			print '<td class="right">-</td>';
     		}
     		if (!$i) $totalarray['nbfield']++;
@@ -1523,16 +1503,14 @@ if ($resql)
     	    print img_edit();
     	    print '</a>';
     	}
-    	else
-    	{
+    	else {
     	    if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
     	    {
     	        print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
     	        print img_edit();
     	        print '</a>';
     	    }
-    	    else
-    	    {
+    	    else {
     	        print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
     	        print img_view();
     	        print '</a>';
@@ -1610,8 +1588,7 @@ if ($resql)
     print '</form>';
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php
index 042117808d5..3a15ddf72e1 100644
--- a/htdocs/compta/bank/budget.php
+++ b/htdocs/compta/bank/budget.php
@@ -90,8 +90,7 @@ if ($result)
 	print '<td class="liste_total right">'.price($total).'</td>';
 	print '<td colspan="2" class="liste_total right">'.price($totalnb ?price2num($total / $totalnb, 'MT') : 0).'</td></tr>';
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 print "</table>";
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 593893878e0..3af40ffb2a0 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -100,8 +100,7 @@ if ($action == 'add')
 	{
 		$object->account_number = '';
 	}
-	else
-	{
+	else {
 		$object->account_number = $account_number;
 	}
 	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal', 'int');
@@ -168,8 +167,7 @@ if ($action == 'add')
 	{
 		$db->commit();
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 }
@@ -206,8 +204,7 @@ if ($action == 'update')
 	{
 		$object->account_number = '';
 	}
-	else
-	{
+	else {
 		$object->account_number = $account_number;
 	}
 	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal', 'int');
@@ -260,8 +257,7 @@ if ($action == 'update')
 
 			$_GET["id"] = $_POST["id"]; // Force chargement page en mode visu
 		}
-		else
-		{
+		else {
 			$error++;
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'edit'; // Force chargement page edition
@@ -272,8 +268,7 @@ if ($action == 'update')
 	{
 		$db->commit();
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 }
@@ -291,8 +286,7 @@ if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->
 		header("Location: ".DOL_URL_ROOT."/compta/bank/list.php");
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = '';
 	}
@@ -399,8 +393,7 @@ if ($action == 'create')
 	{
 		$formcompany->select_departement(isset($_POST["account_state_id"]) ? $_POST["account_state_id"] : '', $selectedcode, 'account_state_id');
 	}
-	else
-	{
+	else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -545,8 +538,7 @@ if ($action == 'create')
 		print $formaccounting->select_account($object->account_number, 'account_number', 1, '', 1, 1);
 		print '</td></tr>';
 	}
-	else
-	{
+	else {
 		print '<tr><td class="'.$fieldrequired.'titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
 		print '<td><input type="text" name="account_number" value="'.(GETPOST("account_number") ?GETPOST('account_number', 'alpha') : $object->account_number).'"></td></tr>';
 	}
@@ -577,8 +569,7 @@ if ($action == 'create')
 /* Visu et edition                                                            */
 /*                                                                            */
 /* ************************************************************************** */
-else
-{
+else {
 	if (($_GET["id"] || $_GET["ref"]) && $action != 'edit')
 	{
 		$object = new Account($db);
@@ -887,8 +878,7 @@ else
 		{
 			print $formcompany->select_state(isset($_POST["account_state_id"]) ? $_POST["account_state_id"] : $object->state_id, $selectedcode, 'account_state_id');
 		}
-		else
-		{
+		else {
 			print $countrynotdefined;
 		}
 		print '</td></tr>';
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index 308dad5dbca..b7bbb4d157e 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -133,8 +133,7 @@ if ($result)
 			print '<input type="submit" name="update" class="button" value="'.$langs->trans("Edit").'">';
 			print "</td>";
 		}
-		else
-		{
+		else {
 			print "<td >".$objp->label."</td>";
 			print '<td class="center">';
 			print '<a class="editfielda reposition marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?categid='.$objp->rowid.'&amp;action=edit">'.img_edit().'</a>';
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 3fcbffba3b2..cae83563b42 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -404,8 +404,7 @@ class Account extends CommonObject
 			$rowid = $this->db->last_insert_id(MAIN_DB_PREFIX."bank_url");
 			return $rowid;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -510,8 +509,7 @@ class Account extends CommonObject
 				$obj = $this->db->fetch_object($resql);
 				$oper = $obj->code;
 			}
-			else
-			{
+			else {
 				dol_print_error($this->db, 'Failed to get payment type code');
 				return -1;
 			}
@@ -721,13 +719,11 @@ class Account extends CommonObject
 					// End call triggers
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 			}
 		}
-		else
-		{
+		else {
 			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				$this->error = $langs->trans("ErrorBankLabelAlreadyExists");
@@ -744,8 +740,7 @@ class Account extends CommonObject
 			$this->db->commit();
 			return $this->id;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1 * $error;
 		}
@@ -837,8 +832,7 @@ class Account extends CommonObject
 				// End call triggers
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
@@ -849,8 +843,7 @@ class Account extends CommonObject
 			$this->db->commit();
 			return $this->id;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1 * $error;
 		}
@@ -908,8 +901,7 @@ class Account extends CommonObject
 		{
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
 			return -1;
@@ -1007,13 +999,11 @@ class Account extends CommonObject
 
 				return 1;
 			}
-			else
-			{
+			else {
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror;
 			$this->errors[] = $this->error;
 			return -1;
@@ -1114,8 +1104,7 @@ class Account extends CommonObject
 					}
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$this->error = "Error ".$this->db->lasterror();
 			}
@@ -1126,8 +1115,7 @@ class Account extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1292,8 +1280,7 @@ class Account extends CommonObject
 
 			return $response;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -1331,8 +1318,7 @@ class Account extends CommonObject
 			}
 			$this->db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -1476,8 +1462,7 @@ class Account extends CommonObject
 		{
 			return 1;
 		}
-		else
-		{
+		else {
 			return 0;
 		}
 	}
@@ -1897,8 +1882,7 @@ class AccountLine extends CommonObject
 			$this->db->free($result);
 			return $ret;
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 	}
@@ -2015,8 +1999,7 @@ class AccountLine extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -$nbko;
 		}
@@ -2054,8 +2037,7 @@ class AccountLine extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -$nbko;
 		}
@@ -2086,8 +2068,7 @@ class AccountLine extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			$this->error = $this->db->error();
 			return -1;
@@ -2152,8 +2133,7 @@ class AccountLine extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -2190,8 +2170,7 @@ class AccountLine extends CommonObject
 					return 1;
 				}
 			}
-			else
-			{
+			else {
 				dol_print_error($this->db);
 				return 0;
 			}
@@ -2257,8 +2236,7 @@ class AccountLine extends CommonObject
 					return 1;
 				}
 			}
-			else
-			{
+			else {
 				dol_print_error($this->db);
 				return 0;
 			}
@@ -2334,8 +2312,7 @@ class AccountLine extends CommonObject
 			}
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -2477,8 +2454,7 @@ class AccountLine extends CommonObject
 				$alreadydispatched = $obj->nb;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index ad75559b362..6943d2bc5e1 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -226,8 +226,7 @@ class BankAccounts extends DolibarrApi
         {
             $amount_to = $amount;
         }
-        else
-        {
+        else {
             if (!$amount_to || empty($amount_to))
             {
                 throw new RestException(422, 'You must provide amount_to value since bankaccount_from and bankaccount_to does not share the same currency.');
@@ -304,8 +303,7 @@ class BankAccounts extends DolibarrApi
                 )
             );
         }
-        else
-        {
+        else {
             $this->db->rollback();
             throw new RestException(500, $accountfrom->error.' '.$accountto->error);
         }
@@ -339,8 +337,7 @@ class BankAccounts extends DolibarrApi
         {
             return $this->get($id);
         }
-        else
-        {
+        else {
             throw new RestException(500, $account->error);
         }
     }
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 6af394ad4b4..ec88fea3f84 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -170,8 +170,7 @@ class PaymentVarious extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -245,8 +244,7 @@ class PaymentVarious extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -431,8 +429,7 @@ class PaymentVarious extends CommonObject
 					{
 						$this->update_fk_bank($bank_line_id);
 					}
-					else
-					{
+					else {
 						$this->error = $acc->error;
 						$error++;
 					}
@@ -469,14 +466,12 @@ class PaymentVarious extends CommonObject
 				$this->db->commit();
 				return $this->id;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -500,8 +495,7 @@ class PaymentVarious extends CommonObject
 		{
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -677,8 +671,7 @@ class PaymentVarious extends CommonObject
 			}
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -706,8 +699,7 @@ class PaymentVarious extends CommonObject
 				$alreadydispatched = $obj->nb;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 347353be84f..796529a24d9 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -85,8 +85,7 @@ if ($result < 0)
 	$error++;
 	setEventMessages($langs->trans("ErrorFailedToCreateDir"), null, 'errors');
 }
-else
-{
+else {
 	// Calcul $min and $max
 	$sql = "SELECT MIN(b.datev) as min, MAX(b.datev) as max";
 	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
@@ -103,8 +102,7 @@ else
 		$min = $db->jdate($obj->min);
 		$max = $db->jdate($obj->max);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 	if (empty($min)) $min = dol_now() - 3600 * 24;
@@ -152,8 +150,7 @@ else
 			}
 			$db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -175,8 +172,7 @@ else
 			$solde = $row[0];
 			$db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -200,8 +196,7 @@ else
 			{
 				$datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph
 			}
-			else
-			{
+			else {
 				$datas[$i] = $solde + $subtotal;
 			}
 			$datamin[$i] = $object->min_desired;
@@ -295,8 +290,7 @@ else
 			}
 			$db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -318,8 +312,7 @@ else
 			$solde = $row[0];
 			$db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -344,8 +337,7 @@ else
 			{
 				$datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph
 			}
-			else
-			{
+			else {
 				$datas[$i] = $solde + $subtotal;
 			}
 			$datamin[$i] = $object->min_desired;
@@ -432,8 +424,7 @@ else
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -460,8 +451,7 @@ else
 			{
 				$datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph
 			}
-			else
-			{
+			else {
 				$datas[$i] = 0 + $solde + $subtotal;
 			}
 			$datamin[$i] = $object->min_desired;
@@ -558,8 +548,7 @@ else
 			}
 			$db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -592,8 +581,7 @@ else
 			}
 			$db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -675,8 +663,7 @@ else
 			}
 			$db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 		$sql = "SELECT date_format(b.datev,'%m')";
@@ -700,8 +687,7 @@ else
 			}
 			$db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -771,15 +757,13 @@ if ($account)
 			$morehtml = '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.'&option=all'.$moreparam.'">'.$langs->trans("ShowAllAccounts").'</a>';
     		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', '', $moreparam, 0, '', '', 1);
 		}
-		else
-		{
+		else {
 			$morehtml = '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.$moreparam.'">'.$langs->trans("BackToAccount").'</a>';
 			print $langs->trans("AllAccounts");
 			//print $morehtml;
 		}
 	}
-	else
-	{
+	else {
 	    $bankaccount = new Account($db);
 		$listid = explode(',', $account);
 		foreach ($listid as $key => $id)
@@ -791,8 +775,7 @@ if ($account)
 		}
 	}
 }
-else
-{
+else {
 	print $langs->trans("AllAccounts");
 }
 
@@ -809,8 +792,7 @@ if ($mode == 'showalltime')
 	print $langs->trans("GoBack");
 	print '</a>';
 }
-else
-{
+else {
 	print '<a href="'.$_SERVER["PHP_SELF"].'?mode=showalltime&account='.$account.'">';
 	print $langs->trans("ShowAllTimeBalance");
 	print '</a>';
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index bf8dc6f5649..a1c37d59050 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -100,8 +100,7 @@ if ($action == 'confirm_delete_categ' && $confirm == "yes" && $user->rights->ban
         	dol_print_error($db);
     	}
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("MissingIds"), null, 'errors');
 	}
 }
@@ -121,8 +120,7 @@ if ($user->rights->banque->modifier && $action == "update")
 	{
 		$actarget->fetch(GETPOST('accountid', 'int'));
 	}
-	else
-	{
+	else {
 		$actarget->fetch($id);
 	}
 
@@ -192,8 +190,7 @@ if ($user->rights->banque->modifier && $action == "update")
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			dol_print_error($db);
 		}
@@ -230,8 +227,7 @@ if ($user->rights->banque->consolidate && ($action == 'num_releve' || $action ==
 	        setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
             $db->commit();
         }
-        else
-        {
+        else {
             $db->rollback();
             dol_print_error($db);
         }
@@ -325,8 +321,7 @@ if ($result)
         {
         	$form->select_comptes($acct->id, 'accountid', 0, '', 0);
         }
-        else
-        {
+        else {
         	print $acct->getNomUrl(1, 'transactions', 'reflabel');
         }
         print '</td>';
@@ -464,8 +459,7 @@ if ($result)
             }
             print '</td>';
         }
-        else
-        {
+        else {
             print '<td>'.$objp->fk_type.' '.$objp->num_chq.'</td>';
         }
         print "</tr>";
@@ -480,8 +474,7 @@ if ($result)
             print '<input type="text" class="flat minwidth200" name="emetteur" value="'.(empty($objp->emetteur) ? '' : stripslashes($objp->emetteur)).'">';
             print '</td>';
         }
-        else
-        {
+        else {
             print '<td>'.$objp->emetteur.'</td>';
         }
         print "</tr>";
@@ -496,8 +489,7 @@ if ($result)
         	print '<input type="text" class="flat minwidth200" name="banque" value="'.(empty($objp->banque) ? '' : $objp->banque).'">';
         	print '</td>';
         }
-        else
-        {
+        else {
         	print '<td>'.$objp->banque.'</td>';
         }
         print "</tr>";
@@ -518,8 +510,7 @@ if ($result)
             }
             print '</td>';
         }
-        else
-        {
+        else {
             print '<td>';
             print dol_print_date($db->jdate($objp->do), "day");
             print '</td>';
@@ -542,8 +533,7 @@ if ($result)
             }
             print '</td>';
         }
-        else
-        {
+        else {
             print '<td>';
             print dol_print_date($db->jdate($objp->dv), "day");
             print '</td>';
@@ -561,23 +551,20 @@ if ($result)
                 // Label generique car entre parentheses. On l'affiche en le traduisant
                 print $langs->trans($reg[1]);
             }
-            else
-            {
+            else {
                 print $objp->label;
             }
             print '">';
             print '</td>';
         }
-        else
-        {
+        else {
             print '<td>';
             if (preg_match('/^\((.*)\)$/i', $objp->label, $reg))
             {
                 // Label generique car entre parentheses. On l'affiche en le traduisant
                 print $langs->trans($reg[1]);
             }
-            else
-            {
+            else {
                 print $objp->label;
             }
             print '</td>';
@@ -592,8 +579,7 @@ if ($result)
             print '<input name="amount" class="flat maxwidth100" '.($objp->rappro ? ' disabled' : '').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$acct->currency_code);
             print '</td>';
         }
-        else
-        {
+        else {
             print '<td>';
             print price($objp->amount);
             print '</td>';
@@ -650,15 +636,13 @@ if ($result)
                     print $langs->trans("AccountStatement").' <input name="num_rel_bis" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro ? ' disabled' : '').'>';
                     print '<input name="num_rel" type="hidden" value="'.$objp->num_releve.'">';
                 }
-                else
-                {
+                else {
                     print $langs->trans("AccountStatement").' <input name="num_rel" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro ? ' disabled' : '').'>';
                 }
                 if ($objp->num_releve) print ' &nbsp; (<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?num='.$objp->num_releve.'&account='.$acct->id.'">'.$langs->trans("AccountStatement").' '.$objp->num_releve.')</a>';
                 print '</td>';
             }
-            else
-            {
+            else {
                 print '<td>'.$objp->num_releve.'&nbsp;</td>';
             }
             print '</tr>';
@@ -670,8 +654,7 @@ if ($result)
                 print '<input type="checkbox" name="reconciled" class="flat" '.(isset($_POST["reconciled"]) ? ($_POST["reconciled"] ? ' checked="checked"' : '') : ($objp->rappro ? ' checked="checked"' : '')).'">';
                 print '</td>';
             }
-            else
-            {
+            else {
                 print '<td>'.yn($objp->rappro).'</td>';
             }
             print '</tr>';
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index b1c76c529ad..bc45c708f33 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -488,8 +488,7 @@ foreach ($accounts as $key=>$type)
     		$accountingaccount->fetch('', $objecttmp->account_number, 1);
     		print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
     	}
-    	else
-    	{
+    	else {
     		print $objecttmp->account_number;
     	}
     	print '</td>';
@@ -506,8 +505,7 @@ foreach ($accounts as $key=>$type)
     		$accountingjournal->fetch($objecttmp->fk_accountancy_journal);
     		print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
     	}
-    	else
-    	{
+    	else {
     		print '';
     	}
     	print '</td>';
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index c737af4a89e..65476665963 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -296,16 +296,14 @@ if (empty($numref))
 			{
 				//
 			}
-			else
-			{
+			else {
 				print '<tr class="oddeven">';
 				print '<td>';
 				if ($action != 'editbankreceipt' || $objp->numr != $brref)
 				{
 					print '<a href="releve.php?num='.$objp->numr.'&account='.$object->id.'">'.$objp->numr.'</a>';
 				}
-				else
-				{
+				else {
 					print '<input type="hidden" name="oldbankreceipt" value="'.$objp->numr.'">';
 					print '<input type="text" name="newbankreceipt" value="'.$objp->numr.'">';
 					print '<input type="submit" class="button" name="actionnewbankreceipt" value="'.$langs->trans("Rename").'">';
@@ -356,13 +354,11 @@ if (empty($numref))
 
 		print "\n</div>\n";
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
-else
-{
+else {
 	/**
 	 *   Show list of record into a bank statement
 	 */
@@ -554,8 +550,7 @@ else
 						print $bankstatic->getNomUrl(1, '');
 						print ')';
 					}
-					else
-					{
+					else {
 						$bankstatic->id = $objp->bankid;
 						$bankstatic->label = $objp->bankref;
 						print ' ('.$langs->trans("from").' ';
@@ -626,8 +621,7 @@ else
 						$ii++;
 					}
 				}
-				else
-				{
+				else {
 					dol_print_error($db);
 				}
 			}
@@ -639,8 +633,7 @@ else
 				$totald = $totald + abs($objp->amount);
 				print '<td class="nowrap right">'.price($objp->amount * -1)."</td><td>&nbsp;</td>\n";
 			}
-			else
-			{
+			else {
 				$totalc = $totalc + abs($objp->amount);
 				print '<td>&nbsp;</td><td class="nowrap right">'.price($objp->amount)."</td>\n";
 			}
@@ -653,8 +646,7 @@ else
 				print img_edit();
 				print "</a></td>";
 			}
-			else
-			{
+			else {
 				print "<td class=\"center\">&nbsp;</td>";
 			}
 			print "</tr>";
diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index aa4c39e55ee..99a66321648 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -88,8 +88,7 @@ if ($action == 'add')
 		{
 			$amountto = $amount;
 		}
-		else
-		{
+		else {
 			if (!$amountto)
 			{
 				$error++;
@@ -131,14 +130,12 @@ if ($action == 'add')
 				setEventMessages($mesgs, null, 'mesgs');
 				$db->commit();
 			}
-			else
-			{
+			else {
 				setEventMessages($accountfrom->error.' '.$accountto->error, null, 'errors');
 				$db->rollback();
 			}
 		}
-		else
-		{
+		else {
 		    $error++;
 			setEventMessages($langs->trans("ErrorFromToAccountsMustDiffers"), null, 'errors');
 		}
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index b8d259cdc8d..929a1611775 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -73,8 +73,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 	{
 		$viewline = $vline;
 	}
-	else
-	{
+	else {
 		$viewline = 20;
 	}
 
@@ -305,8 +304,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 			$i++;
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 
@@ -327,8 +325,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 	print "</table>";
     print "</div>";
 }
-else
-{
+else {
 	print $langs->trans("ErrorBankAccountNotFound");
 }
 
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index c4fdc3be56a..ffabd082bfa 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -164,8 +164,7 @@ if (empty($reshook))
 				header("Location: ".$urltogo);
 				exit;
 			}
-			else
-			{
+			else {
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 				$action = "create";
@@ -199,21 +198,18 @@ if (empty($reshook))
 					header("Location: ".DOL_URL_ROOT.'/compta/bank/various_payment/list.php');
 					exit;
 				}
-				else
-				{
+				else {
 					$object->error = $accountline->error;
 					$db->rollback();
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
-			else
-			{
+			else {
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-		else
-		{
+		else {
 			setEventMessages('Error try do delete a line linked to a conciliated bank transaction', null, 'errors');
 		}
 	}
@@ -392,8 +388,7 @@ if ($action == 'create')
         {
             print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1, '');
         }
-        else
-        {
+        else {
             print '<input type="text" class="maxwidth200 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
         }
         print '</td></tr>';
@@ -565,13 +560,11 @@ if ($id)
 				print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a></div>';
 			}
 		}
-		else
-		{
+		else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("NotAllowed"))).'">'.$langs->trans("Delete").'</a></div>';
 		}
 	}
-	else
-	{
+	else {
 		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("LinkedToAConciliatedTransaction").'">'.$langs->trans("Delete").'</a></div>';
 	}
 
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index d81b9bdd41a..624ead86073 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -150,8 +150,7 @@ if ($object->id)
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 5f68440809c..5fa44ba8555 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -76,8 +76,7 @@ if (!GETPOST('typeid'))
 		if ($part[0] == 'v.fk_typepayment') $typeid = $part[1];
 	}
 }
-else
-{
+else {
 	$typeid = GETPOST('typeid');
 }
 
@@ -374,8 +373,7 @@ if ($result)
 
 	$db->free($result);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 3780fbc1afe..fce50a977e4 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -178,8 +178,7 @@ elseif ($action == "add")
 			$db->commit();
 			$action = "view";
 		}
-		else
-		{
+		else {
 			$db->rollback;
 			$action = "view";
 		}
@@ -218,8 +217,7 @@ if ($action == "valid")	// validate = close
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("CashFenceDone"), null);
 		$db->commit();
 	}
@@ -254,8 +252,7 @@ if ($action == 'confirm_delete' && !empty($permissiontodelete))
         header("Location: ".$backurlforlist);
         exit;
     }
-    else
-    {
+    else {
         if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
         else setEventMessages($object->error, null, 'errors');
     }
@@ -330,8 +327,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
     			}
     			else dol_print_error($db);
 			}
-			else
-			{
+			else {
 				setEventMessages($langs->trans("SetupOfTerminalNotComplete", $terminaltouse), null, 'errors');
 			    $error++;
 			}
@@ -350,8 +346,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 			if ($key == 'cash')       $sql .= " AND cp.code = 'LIQ'";
 			elseif ($key == 'cheque') $sql .= " AND cp.code = 'CHQ'";
 			elseif ($key == 'card')   $sql .= " AND cp.code = 'CB'";
-			else
-			{
+			else {
 				dol_print_error('Value for key = '.$key.' not supported');
 				exit;
 			}
@@ -394,8 +389,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 	    	print '<input type="hidden" name="action" value="valid">';
 			print '<input type="hidden" name="id" value="'.$id.'">';
 	    }
-		else
-	    {
+		else {
 	    	print '<input type="hidden" name="action" value="start">';
 	    }
 
@@ -470,8 +464,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 		{
 			print '';
 		}
-		else
-		{
+		else {
 			print '<input type="submit" name="add" class="button" value="'.$langs->trans("Start").'">';
 		}
 		print '</td>';
@@ -712,8 +705,7 @@ if (empty($action) || $action == "view" || $action == "close")
 	    		print '<input type="hidden" name="action" value="valid">';
 	    		print '<input type="hidden" name="id" value="'.$id.'">';
 	    	}
-	    	else
-	    	{
+	    	else {
 	    		print '<input type="hidden" name="action" value="start">';
 	    	}
 
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index a98c9ea83f5..5269c07bab2 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -260,8 +260,7 @@ if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
 }
-else
-{
+else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index 1ea06eba9e9..5b9079f9d72 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -173,8 +173,7 @@ if ($resql)
             $cachebankaccount[$objp->bankid] = $bankaccounttmp;
             $bankaccount = $bankaccounttmp;
         }
-        else
-        {
+        else {
             $bankaccount = $cachebankaccount[$objp->bankid];
         }
 
@@ -312,8 +311,7 @@ if ($resql)
 
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 93065219248..991d039d1fb 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -104,8 +104,7 @@ if ($mode != 'sconly')
     $center = ($year ? '<a href="index.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="index.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'object_payment', 0, '', '', $limit, 1);
 }
-else
-{
+else {
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'object_payment', 0, '', '', $limit, 0);
 }
 
@@ -241,8 +240,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 	    print '<td class="liste_total right">'.price($totalpaye)."</td>";
 		print "</tr>";
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 	print '</table>';
@@ -357,8 +355,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 		    print "</table>";
 		    $db->free($result);
 		}
-		else
-		{
+		else {
 		    dol_print_error($db);
 		}
 	}
@@ -380,8 +377,7 @@ elseif ($mysoc->localtax2_assuj == "1")
 	$j = 2;
 	$numlt = 3;
 }
-else
-{
+else {
 	$j = 0;
 	$numlt = 0;
 }
@@ -452,8 +448,7 @@ while ($j < $numlt)
 			print "</table>";
 			$db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -566,8 +561,7 @@ if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
 
             print "<br>";
         }
-        else
-        {
+        else {
             dol_print_error($db);
         }
     }
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 6c1439d5466..74cc0d594e5 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -197,8 +197,7 @@ if ($resql)
 
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 463d9ea699f..b688bd17907 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -71,8 +71,7 @@ if ($action == 'validate' && $user->rights->deplacement->creer)
             header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
             exit;
         }
-        else
-        {
+        else {
 	        setEventMessages($object->error, $object->errors, 'errors');
         }
     }
@@ -89,8 +88,7 @@ elseif ($action == 'classifyrefunded' && $user->rights->deplacement->creer)
             header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
             exit;
         }
-        else
-        {
+        else {
 	        setEventMessages($object->error, $object->errors, 'errors');
         }
     }
@@ -104,8 +102,7 @@ elseif ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->depla
         header("Location: index.php");
         exit;
     }
-    else
-    {
+    else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -150,19 +147,16 @@ elseif ($action == 'add' && $user->rights->deplacement->creer)
                 header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
                 exit;
             }
-            else
-            {
+            else {
 	            setEventMessages($object->error, $object->errors, 'errors');
                 $action = 'create';
             }
         }
-        else
-        {
+        else {
             $action = 'create';
         }
     }
-    else
-    {
+    else {
         header("Location: index.php");
         exit;
     }
@@ -190,13 +184,11 @@ elseif ($action == 'update' && $user->rights->deplacement->creer)
             header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
             exit;
         }
-        else
-        {
+        else {
 	        setEventMessages($object->error, $object->errors, 'errors');
         }
     }
-    else
-    {
+    else {
         header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
         exit;
     }
@@ -413,8 +405,7 @@ elseif ($id)
 
             print '</div>';
         }
-        else
-        {
+        else {
             /*
              * Confirm delete trip
              */
@@ -493,8 +484,7 @@ elseif ($id)
                 {
                     $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1);
                 }
-                else
-                {
+                else {
                     $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0);
                 }
                 print '</td>';
@@ -529,8 +519,7 @@ elseif ($id)
 	            {
 	                print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
 	            }
-	            else
-	            {
+	            else {
 	                print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Modify').'</a>';
 	            }
             }
@@ -541,8 +530,7 @@ elseif ($id)
                 {
                     print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=validate&id='.$id.'">'.$langs->trans('Validate').'</a>';
                 }
-                else
-                {
+                else {
                     print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Validate').'</a>';
                 }
             }
@@ -553,8 +541,7 @@ elseif ($id)
                 {
                     print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=classifyrefunded&id='.$id.'">'.$langs->trans('ClassifyRefunded').'</a>';
                 }
-                else
-                {
+                else {
                     print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('ClassifyRefunded').'</a>';
                 }
             }
@@ -563,16 +550,14 @@ elseif ($id)
             {
                 print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$id.'">'.$langs->trans('Delete').'</a>';
             }
-            else
-            {
+            else {
                 print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Delete').'</a>';
             }
 
             print '</div>';
         }
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 }
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index ec4610179e2..8051d074db5 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -200,15 +200,13 @@ class Deplacement extends CommonObject
 				$this->db->commit();
 				return $this->id;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->error();
 				$this->db->rollback();
 				return $result;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -268,8 +266,7 @@ class Deplacement extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -313,8 +310,7 @@ class Deplacement extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -339,8 +335,7 @@ class Deplacement extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -461,8 +456,7 @@ class Deplacement extends CommonObject
                 $i++;
             }
         }
-        else
-        {
+        else {
         	dol_print_error($this->db);
         }
 
@@ -508,8 +502,7 @@ class Deplacement extends CommonObject
 			}
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index 2cef0b3e6cd..4ad2044c0f1 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -124,8 +124,7 @@ if ($object->id)
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 9d45bafd20f..9ed6e430c4c 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -193,8 +193,7 @@ if ($result)
             $i++;
         }
     }
-    else
-    {
+    else {
         print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
     print '</table><br>';
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index a4cc8f24019..1ebaeb5c6fa 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -197,8 +197,7 @@ if ($resql)
     print "</form>\n";
     $db->free($resql);
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index cf745b784fc..91c6546a83c 100644
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -168,8 +168,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
 }
-else
-{
+else {
     $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index cad443940f4..8256aeacc5a 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -239,8 +239,7 @@ if (empty($reshook))
 					$action = "create";
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 				$action = "create";
@@ -253,8 +252,7 @@ if (empty($reshook))
 				header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$object->id);
 	   			exit;
 			}
-			else
-			{
+			else {
 				$db->rollback();
 
 				$error++;
@@ -357,8 +355,7 @@ if (empty($reshook))
 		{
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -381,8 +378,7 @@ if (empty($reshook))
 		{
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -419,14 +415,12 @@ if (empty($reshook))
 				$db->commit();
 				$object->fetch($object->id); // Reload lines
 			}
-			else
-			{
+			else {
 				$db->rollback();
 				setEventMessages($db->lasterror(), null, 'errors');
 			}
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			setEventMessages($line->error, $line->errors, 'errors');
 		}
@@ -467,8 +461,7 @@ if (empty($reshook))
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0);
 		}
-		else
-		{
+		else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
@@ -579,8 +572,7 @@ if (empty($reshook))
 					{
 						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
 					}
-					else
-					{
+					else {
 						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 					}
 				}
@@ -604,8 +596,7 @@ if (empty($reshook))
 
 					$desc = (!empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
 				}
-				else
-				{
+				else {
 					$desc = $prod->description;
 				}
 
@@ -641,8 +632,7 @@ if (empty($reshook))
 				$type = $prod->type;
 				$fk_unit = $prod->fk_unit;
 			}
-			else
-			{
+			else {
 				$pu_ht = price2num($price_ht, 'MU');
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 				$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
@@ -673,8 +663,7 @@ if (empty($reshook))
 				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
 				setEventMessages($mesg, null, 'errors');
 			}
-			else
-			{
+			else {
 				// Insert line
 				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $info_bits, '', $pu_ttc, $type, - 1, $special_code, $label, $fk_unit, 0, $date_start_fill, $date_end_fill, $fournprice, $buyingprice);
 
@@ -739,8 +728,7 @@ if (empty($reshook))
 					unset($_POST['situations']);
 					unset($_POST['progress']);
 				}
-				else
-				{
+				else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 
@@ -948,8 +936,7 @@ if (empty($reshook))
 				unset($_POST['situations']);
 				unset($_POST['progress']);
 			}
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -1145,8 +1132,7 @@ if ($action == 'create')
 			print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf'));
 			print "</td></tr>";
 		}
-		else
-		{
+		else {
 			print '<input type="hidden" name="generate_pdf" value="1">';
 		}
 
@@ -1199,13 +1185,11 @@ if ($action == 'create')
 		print '</div>';
 		print "</form>\n";
 	}
-	else
-	{
+	else {
 		dol_print_error('', "Error, no invoice ".$object->id);
 	}
 }
-else
-{
+else {
 	/*
 	 * View mode
 	 */
@@ -1329,8 +1313,7 @@ else
 			{
 				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
 			}
-			else
-			{
+			else {
 				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->cond_reglement_id, 'none');
 			}
 		} else {
@@ -1351,8 +1334,7 @@ else
 		{
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
 		}
-		else
-		{
+		else {
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'none');
 		}
 		print '</td></tr>';
@@ -1460,8 +1442,7 @@ else
 		{
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
 		}
-		else
-		{
+		else {
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
 		}
 		print "</td>";
@@ -1487,8 +1468,7 @@ else
             $select = 'select;'.implode(',', $list);
             print $form->editfieldval($langs->trans("Model"), 'modelpdf', $object->modelpdf, $object, $user->rights->facture->creer, $select);
         }
-        else
-        {
+        else {
             print $object->modelpdf;
         }
         print "</td>";
@@ -1537,14 +1517,12 @@ else
 			print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
 		}
-		else
-		{
+		else {
 			if ($object->frequency > 0)
 			{
 				print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
 			}
-			else
-			{
+			else {
 				print $langs->trans("NotARecurringInvoiceTemplate");
 			}
 		}
@@ -1556,8 +1534,7 @@ else
 		{
 			print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'day');
 		}
-		else
-		{
+		else {
 			print $langs->trans("NextDateToExecution");
 		}
 		print '</td><td>';
@@ -1570,8 +1547,7 @@ else
 		{
 			if (!$object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) print img_warning($langs->trans("Late"));
 		}
-		else
-		{
+		else {
 			print img_info($langs->trans("MaxNumberOfGenerationReached"));
 		}
 		print '</td>';
@@ -1583,8 +1559,7 @@ else
 		{
 			print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
 		}
-		else
-		{
+		else {
 			print $langs->trans("MaxPeriodNumber");
 		}
 		print '</td><td>';
@@ -1592,8 +1567,7 @@ else
 		{
 			  print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max ? $object->nb_gen_max : '', $object, $user->rights->facture->creer);
 		}
-		else
-		{
+		else {
 			print '';
 		}
 		print '</td>';
@@ -1603,8 +1577,7 @@ else
 		print '<tr><td>';
 		if ($action == 'auto_validate' || $object->frequency > 0)
 			print $form->editfieldkey($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer);
-		else
-			print $langs->trans("StatusOfGeneratedInvoices");
+		else print $langs->trans("StatusOfGeneratedInvoices");
 		print '</td><td>';
 		$select = 'select;0:'.$langs->trans('BillStatusDraft').',1:'.$langs->trans('BillStatusValidated');
 		if ($action == 'auto_validate' || $object->frequency > 0)
@@ -1619,8 +1592,7 @@ else
 			print '<td>';
 			if ($action == 'generate_pdf' || $object->frequency > 0)
 				print $form->editfieldkey($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $user->rights->facture->creer);
-			else
-				print $langs->trans("StatusOfGeneratedDocuments");
+			else print $langs->trans("StatusOfGeneratedDocuments");
 			print '</td>';
 			print '<td>';
 			$select = 'select;0:'.$langs->trans('DoNotGenerateDoc').',1:'.$langs->trans('AutogenerateDoc');
@@ -1631,8 +1603,7 @@ else
 			print '</td>';
 			print '</tr>';
 		}
-		else
-		{
+		else {
 			print '<input type="hidden" name="generate_pdf" value="1">';
 		}
 
@@ -1734,20 +1705,17 @@ else
 				{
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("MaxGenerationReached")).'">'.$langs->trans("CreateBill").'</a></div>';
 				}
-				else
-				{
+				else {
 					if (empty($object->frequency) || $object->date_when <= $today)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->thirdparty->id.'&fac_rec='.$object->id.'">'.$langs->trans("CreateBill").'</a></div>';
 					}
-					else
-					{
+					else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("DateIsNotEnough")).'">'.$langs->trans("CreateBill").'</a></div>';
 					}
 				}
 			}
-			else
-			{
+			else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateBill").'</a></div>';
 			}
 		}
@@ -1758,8 +1726,7 @@ else
 			{
 				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.DOL_URL_ROOT.'/compta/facture/card-rec.php?action=disable&id='.$object->id.'">'.$langs->trans("Disable").'</a></div>';
 			}
-			else
-			{
+			else {
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card-rec.php?action=enable&id='.$object->id.'">'.$langs->trans("Enable").'</a></div>';
 			}
 		}
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index ab2262844bf..68b1a6e91df 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -619,8 +619,7 @@ if (empty($reshook))
 					}
 				}
 			}
-			else
-			{
+			else {
 				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
 				if ($key == 'EMAIL')
 				{
@@ -696,8 +695,7 @@ if (empty($reshook))
 					if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
-			else
-			{
+			else {
 				if (count($object->errors)) setEventMessages(null, $object->errors, 'errors');
 				else setEventMessages($object->error, $object->errors, 'errors');
 			}
@@ -972,8 +970,7 @@ if (empty($reshook))
 					{
 						$db->commit();
 					}
-					else
-					{
+					else {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$db->rollback();
 					}
@@ -981,8 +978,7 @@ if (empty($reshook))
 					$db->commit();
 				}
 			}
-			else
-			{
+			else {
 				setEventMessages($discount->error, $discount->errors, 'errors');
 				$db->rollback();
 			}
@@ -1176,8 +1172,7 @@ if (empty($reshook))
 							                $searchPreviousInvoice = false; // find, exit;
 							                break;
 							            }
-							            else
-							            {
+							            else {
 							                $lineIndex--; // go to previous invoice in cycle
 							            }
 							        }
@@ -1470,8 +1465,7 @@ if (empty($reshook))
 									$amountdeposit[$tva] += $am / (1 + $tva / 100); // Convert into HT for the addline
 								}
 							}
-							else
-							{
+							else {
 								if ($typeamount == 'amount')
 								{
 									$amountdeposit[0] = $valuedeposit;
@@ -1725,8 +1719,7 @@ if (empty($reshook))
 						$error++;
 					}
 				}
-				else
-				{   // If some invoice's lines coming from page
+				else {   // If some invoice's lines coming from page
 					$id = $object->create($user);
 
 					for ($i = 1; $i <= $NBLINES; $i++) {
@@ -1853,8 +1846,7 @@ if (empty($reshook))
 				{
 					$mesg = $object->error;
 				}
-				else
-				{
+				else {
 					$nextSituationInvoice = new Facture($db);
 					$nextSituationInvoice->fetch($id);
 
@@ -1895,8 +1887,7 @@ if (empty($reshook))
 			header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id);
 			exit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			$action = 'create';
 			$_GET["origin"] = $_POST["origin"];
@@ -1922,8 +1913,7 @@ if (empty($reshook))
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0);
 		}
-		else
-		{
+		else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
@@ -1971,8 +1961,7 @@ if (empty($reshook))
 				}
 				$error++;
 			}
-			else
-			{
+			else {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
 				$error++;
 			}
@@ -1999,8 +1988,7 @@ if (empty($reshook))
 				if ($res = $prodcomb->fetchByProductCombination2ValuePairs($idprod, $combinations)) {
 					$idprod = $res->fk_product_child;
 				}
-				else
-				{
+				else {
 					setEventMessages($langs->trans('ErrorProductCombinationNotFound'), null, 'errors');
 					$error++;
 				}
@@ -2065,8 +2053,7 @@ if (empty($reshook))
 					{
 						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
 					}
-					else
-					{
+					else {
 						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 					}
 				}
@@ -2357,8 +2344,7 @@ if (empty($reshook))
 				}
 				$error++;
 			}
-			else
-			{
+			else {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
 				$error++;
 			}
@@ -2458,8 +2444,7 @@ if (empty($reshook))
                     $mesg = $langs->trans("Line").' '.$i.' : '.$langs->trans("CantBeLessThanMinPercent");
                     setEventMessages($mesg, null, 'warnings');
 					$result = -1;
-				} else
-					$object->update_percent($line, $_POST['all_progress']);
+				} else $object->update_percent($line, $_POST['all_progress']);
 			}
 		}
 	}
@@ -2540,8 +2525,7 @@ if (empty($reshook))
                                         $searchPreviousInvoice = false; // find, exit;
                                         break;
                                     }
-                                    else
-                                    {
+                                    else {
                                         $lineIndex--; // go to previous invoice in cycle
                                     }
                                 }
@@ -2569,18 +2553,15 @@ if (empty($reshook))
                         setEventMessages($langs->trans('Updated'), '', 'mesgs');
                         header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
                     }
-                    else
-                    {
+                    else {
                         setEventMessages($langs->trans('ErrorOutingSituationInvoiceCreditNote'), array(), 'errors');
                     }
 	            }
-	            else
-	            {
+	            else {
 	                setEventMessages($langs->trans('ErrorOutingSituationInvoiceOnUpdate'), array(), 'errors');
 	            }
 	        }
-	        else
-	        {
+	        else {
 	            setEventMessages($langs->trans('ErrorFindNextSituationInvoice'), array(), 'errors');
 	        }
 	    }
@@ -2875,8 +2856,7 @@ if ($action == 'create')
 				$expesrc->fetch_optionals();
 				$object->array_options = $expesrc->array_options;
 			}
-			else
-			{
+			else {
 				$cond_reglement_id 	= (!empty($objectsrc->cond_reglement_id) ? $objectsrc->cond_reglement_id : (!empty($soc->cond_reglement_id) ? $soc->cond_reglement_id : 0));
 				$mode_reglement_id 	= (!empty($objectsrc->mode_reglement_id) ? $objectsrc->mode_reglement_id : (!empty($soc->mode_reglement_id) ? $soc->mode_reglement_id : 0));
 				$fk_account         = (!empty($objectsrc->fk_account) ? $objectsrc->fk_account : (!empty($soc->fk_account) ? $soc->fk_account : 0));
@@ -2895,8 +2875,7 @@ if ($action == 'create')
 			}
 		}
 	}
-	else
-	{
+	else {
 		$cond_reglement_id 	= $soc->cond_reglement_id;
 		$mode_reglement_id 	= $soc->mode_reglement_id;
 		$fk_account        	= $soc->fk_account;
@@ -2979,8 +2958,7 @@ if ($action == 'create')
 		print '</td>';
 		print '</tr>'."\n";
 	}
-	else
-	{
+	else {
 		print '<tr><td class="fieldrequired">'.$langs->trans('Customer').'</td>';
 		print '<td colspan="2">';
 		print $form->select_company($soc->id, 'socid', '((s.client = 1 OR s.client = 3) AND s.status=1)', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
@@ -3204,8 +3182,7 @@ if ($action == 'create')
 			print '</div></div>';
 		}
 	}
-	else
-	{
+	else {
 	    if (!empty($conf->global->INVOICE_USE_SITUATION))
 	    {
     	    print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
@@ -3311,8 +3288,7 @@ if ($action == 'create')
     			print '</div></div>';
     		}
 		}
-		else
-		{
+		else {
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			if (empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) $tmp = '<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
 			else $tmp = '<input type="radio" name="type" id="radio_creditnote" value="2" > ';
@@ -3790,8 +3766,7 @@ elseif ($id > 0 || !empty($ref))
 				);
 				$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $langs->trans('DeleteBill'), $text, 'confirm_delete', $formquestion, "yes", 1);
 			}
-			else
-			{
+			else {
 				$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $langs->trans('DeleteBill'), $text, 'confirm_delete', '', 'no', 1);
 			}
 		} else {
@@ -4128,8 +4103,7 @@ elseif ($id > 0 || !empty($ref))
 		foreach ($facidavoir as $id) {
 			if ($i == 0)
 				print ' ';
-			else
-				print ',';
+			else print ',';
 			$facavoir = new Facture($db);
 			$facavoir->fetch($id);
 			print $facavoir->getNomUrl(1);
@@ -4274,8 +4248,7 @@ elseif ($id > 0 || !empty($ref))
 	{
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
 	}
-	else
-	{
+	else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'none', 'CRDT');
 	}
 	print '</td></tr>';
@@ -4339,8 +4312,7 @@ elseif ($id > 0 || !empty($ref))
 	{
 		$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
 	}
-	else
-	{
+	else {
 		$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
 	}
 	print "</td>";
@@ -4362,8 +4334,7 @@ elseif ($id > 0 || !empty($ref))
 		{
 			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 		}
-		else
-		{
+		else {
 			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 		}
 		print '</td></tr>';
@@ -4377,7 +4348,7 @@ elseif ($id > 0 || !empty($ref))
 			$displayWarranty = false;
 		}
 
-		if($displayWarranty) {
+		if ($displayWarranty) {
 			// Retained Warranty
 			print '<tr class="retained-warranty-lines"  ><td>';
 			print '<table id="retained-warranty-table" class="nobordernopadding" width="100%"><tr><td>';
@@ -4398,8 +4369,7 @@ elseif ($id > 0 || !empty($ref))
 		        print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 		        print '</form>';
 		    }
-		    else
-		    {
+		    else {
 		        print price($object->retained_warranty).'%';
 		    }
 		    print '</td></tr>';
@@ -4433,8 +4403,7 @@ elseif ($id > 0 || !empty($ref))
 		        print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 		        print '</form>';
 		    }
-		    else
-		    {
+		    else {
 		        $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->retained_warranty_fk_cond_reglement, 'none');
 		        if (!$displayWarranty) {
 		            print img_picto($langs->trans('RetainedWarrantyNeed100Percent'), 'warning.png', 'class="pictowarning valignmiddle" ');
@@ -4468,8 +4437,7 @@ elseif ($id > 0 || !empty($ref))
                 print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
                 print '</form>';
             }
-            else
-            {
+            else {
                 print dol_print_date($object->retained_warranty_date_limit, 'day');
             }
             print '</td></tr>';
@@ -4831,8 +4799,7 @@ elseif ($id > 0 || !empty($ref))
 		print '<tr><td colspan="'.$nbcols.'" class="right">';
 		if ($object->type != Facture::TYPE_DEPOSIT)
 			print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits');
-		else
-			print $langs->trans('AlreadyPaid');
+		else print $langs->trans('AlreadyPaid');
 		print ' :</td><td class="right'.(($totalpaye > 0) ? ' amountalreadypaid' : '').'">'.price($totalpaye).'</td><td>&nbsp;</td></tr>';
 
 		$resteapayeraffiche = $resteapayer;
@@ -4928,8 +4895,7 @@ elseif ($id > 0 || !empty($ref))
 		    {
 		        $retainedWarranty = $total_global_ttc * $object->retained_warranty / 100;
 		    }
-		    else
-		    {
+		    else {
 		        // Because one day retained warranty could be used on standard invoices
 		        $retainedWarranty = $object->total_ttc * $object->retained_warranty / 100;
 		    }
@@ -5119,8 +5085,7 @@ elseif ($id > 0 || !empty($ref))
 						}
 					}
 				}
-				else
-				{
+				else {
 					print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Modify').'</span>';
 				}
 			}
@@ -5159,8 +5124,7 @@ elseif ($id > 0 || !empty($ref))
 					} else {
 						if ($usercansend) {
 							print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-						} else
-							print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
+						} else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
 					}
 				}
 			}
@@ -5179,13 +5143,11 @@ elseif ($id > 0 || !empty($ref))
 							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('MakeWithdrawRequest').'</span>';
 						}
 					}
-					else
-					{
+					else {
 						//print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
 					}
 				}
-				else
-				{
+				else {
 					//print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("AmountMustBePositive")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
 				}
 			}
@@ -5220,8 +5182,7 @@ elseif ($id > 0 || !empty($ref))
 					{
 						print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPaymentBack').'</span>';
 					}
-					else
-					{
+					else {
 						print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/paiement.php?facid='.$object->id.'&amp;action=create&amp;accountid='.$object->fk_account.'">'.$langs->trans('DoPaymentBack').'</a>';
 					}
 				}
@@ -5261,16 +5222,14 @@ elseif ($id > 0 || !empty($ref))
 					// If one payment or one credit note was linked to this invoice
 					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaidPartially').'</a>';
 				}
-				else
-				{
+				else {
 					if (empty($conf->global->INVOICE_CAN_NEVER_BE_CANCELED))
 					{
 						if ($objectidnext)
 						{
 							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('ClassifyCanceled').'</span>';
 						}
-						else
-						{
+						else {
 							print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=canceled">'.$langs->trans('ClassifyCanceled').'</a>';
 						}
 					}
@@ -5333,8 +5292,7 @@ elseif ($id > 0 || !empty($ref))
 			    {
 			        print '<a id="butSituationOut" class="butAction" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=situationout">'.$langs->trans("RemoveSituationFromCycle").'</a>';
 			    }
-			    else
-			    {
+			    else {
 			        print '<a id="butSituationOutRefused" class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotEnouthCreditNote").'" >'.$langs->trans("RemoveSituationFromCycle").'</a>';
 			    }
 			}
@@ -5375,8 +5333,7 @@ elseif ($id > 0 || !empty($ref))
 				{
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('Delete').'</a>';
 				}
-				else
-				{
+				else {
 					print '<a class="butActionDelete'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
 				}
 			} else {
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 85da9cd5c37..d56d1b5cfef 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -549,8 +549,7 @@ class Invoices extends DolibarrApi
     	if ($updateRes > 0) {
     		return $this->get($id);
     	}
-    	else
-    	{
+    	else {
     		throw new RestException(405, $this->invoice->error);
     	}
     }
@@ -1125,8 +1124,7 @@ class Invoices extends DolibarrApi
                     {
                         $this->db->commit();
                     }
-                    else
-                    {
+                    else {
                         $this->db->rollback();
                         throw new RestException(500, 'Could not set paid');
                     }
@@ -1134,8 +1132,7 @@ class Invoices extends DolibarrApi
                     $this->db->commit();
                 }
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 throw new RestException(500, 'Discount creation error');
             }
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 71be89f30f5..904f59ea432 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -378,7 +378,7 @@ class FactureRec extends CommonInvoice
 					            }
 					        }
 					    }
-					    else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+					    else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
 					    {
 					        $origin_id = $tmp_origin_id;
 	    					$ret = $this->add_object_linked($origin, $origin_id);
@@ -395,21 +395,18 @@ class FactureRec extends CommonInvoice
 				{
 					$this->db->rollback();
 				}
-				else
-				{
+				else {
 					$this->db->commit();
 					return $this->id;
 				}
 			}
-			else
-			{
+			else {
 			    $this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -461,8 +458,7 @@ class FactureRec extends CommonInvoice
 	        $this->db->commit();
 	        return 1;
 	    }
-	    else
-	    {
+	    else {
 	        $this->error = $this->db->lasterror();
 	        $this->db->rollback();
 	        return -2;
@@ -585,15 +581,13 @@ class FactureRec extends CommonInvoice
 				}
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = 'Bill with id '.$rowid.' or ref '.$ref.' not found sql='.$sql;
 				dol_syslog('Facture::Fetch Error '.$this->error, LOG_ERR);
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -723,8 +717,7 @@ class FactureRec extends CommonInvoice
 			$this->db->free($result);
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -3;
 		}
@@ -767,14 +760,12 @@ class FactureRec extends CommonInvoice
                 $res = $this->deleteExtraFields();
                 if ($res < 0) $error = -4;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror();
 				$error = -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$error = -2;
 		}
@@ -784,8 +775,7 @@ class FactureRec extends CommonInvoice
 		    $this->db->commit();
 		    return 1;
 		}
-		else
-		{
+		else {
 	        $this->db->rollback();
 	        return $error;
 		}
@@ -861,8 +851,7 @@ class FactureRec extends CommonInvoice
 			{
 				$pu = $pu_ht;
 			}
-			else
-			{
+			else {
 				$pu = $pu_ttc;
 			}
 
@@ -970,8 +959,7 @@ class FactureRec extends CommonInvoice
 				$this->update_price();
 				return $lineId;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror();
 				return -1;
 			}
@@ -1046,8 +1034,7 @@ class FactureRec extends CommonInvoice
 	        {
 	            $pu = $pu_ht;
 	        }
-	        else
-	        {
+	        else {
 	            $pu = $pu_ttc;
 	        }
 
@@ -1132,8 +1119,7 @@ class FactureRec extends CommonInvoice
 	            $this->update_price();
 	            return 1;
 	        }
-	        else
-	        {
+	        else {
 	            $this->error = $this->db->lasterror();
 	            return -1;
 	        }
@@ -1226,8 +1212,7 @@ class FactureRec extends CommonInvoice
 
 			if ($num)
 				$this->output .= $langs->trans("FoundXQualifiedRecurringInvoiceTemplate", $num)."\n";
-			else
-				$this->output .= $langs->trans("NoQualifiedRecurringInvoiceTemplateFound");
+			else $this->output .= $langs->trans("NoQualifiedRecurringInvoiceTemplateFound");
 
 			$saventity = $conf->entity;
 
@@ -1289,8 +1274,7 @@ class FactureRec extends CommonInvoice
 						}
 					}
 				}
-				else
-				{
+				else {
 					$error++;
 					$this->error = "Failed to load invoice template with id=".$line->rowid.", entity=".$conf->entity."\n";
 					$this->errors[] = "Failed to load invoice template with id=".$line->rowid.", entity=".$conf->entity;
@@ -1304,8 +1288,7 @@ class FactureRec extends CommonInvoice
 					$nb_create++;
 					$this->output .= $langs->trans("InvoiceGeneratedFromTemplate", $facture->ref, $facturerec->ref)."\n";
 				}
-				else
-				{
+				else {
 					$db->rollback("createRecurringInvoices Process invoice template id=".$facturerec->id.", ref=".$facturerec->ref);
 				}
 
@@ -1435,8 +1418,7 @@ class FactureRec extends CommonInvoice
 					$labelStatus = $langs->trans('Active');
 				}
 			}
-			else
-			{
+			else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$labelStatus = $langs->trans('Disabled');
 				}
@@ -1457,8 +1439,7 @@ class FactureRec extends CommonInvoice
 					$labelStatus = $langs->trans('Active');
 				}
 			}
-			else
-			{
+			else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$labelStatus = $langs->trans('Disabled');
 				}
@@ -1480,8 +1461,7 @@ class FactureRec extends CommonInvoice
 					$labelStatus = $langs->trans('Active');
 				}
 			}
-			else
-			{
+			else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
@@ -1506,8 +1486,7 @@ class FactureRec extends CommonInvoice
 					$labelStatus = $langs->trans('Active');
 				}
 			}
-			else
-			{
+			else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
@@ -1532,8 +1511,7 @@ class FactureRec extends CommonInvoice
 					$labelStatus = $langs->trans('Active');
 				}
 			}
-			else
-			{
+			else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
@@ -1559,8 +1537,7 @@ class FactureRec extends CommonInvoice
 					$labelStatus = $langs->trans('Active');
 				}
 			}
-			else
-			{
+			else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
@@ -1672,7 +1649,7 @@ class FactureRec extends CommonInvoice
 					$line->total_tva = 9.8;
 					$line->remise_percent = 50;
 				}
-				else    // (product line)
+				else // (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product = $prodids[$prodid];
@@ -1762,8 +1739,7 @@ class FactureRec extends CommonInvoice
             if (!empty($unit)) $this->unit_frequency = $unit;
             return 1;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1795,8 +1771,7 @@ class FactureRec extends CommonInvoice
             if ($increment_nb_gen_done > 0) $this->nb_gen_done++;
             return 1;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1828,8 +1803,7 @@ class FactureRec extends CommonInvoice
             $this->nb_gen_max = $nb;
             return 1;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1859,8 +1833,7 @@ class FactureRec extends CommonInvoice
             $this->auto_validate = $validate;
             return 1;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1890,8 +1863,7 @@ class FactureRec extends CommonInvoice
             $this->generate_pdf = $validate;
             return 1;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1921,8 +1893,7 @@ class FactureRec extends CommonInvoice
             $this->modelpdf = $model;
             return 1;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return -1;
         }
@@ -2068,8 +2039,7 @@ class FactureLigneRec extends CommonInvoiceLine
     		$this->db->free($result);
     		return 1;
     	}
-    	else
-    	{
+    	else {
     		$this->error = $this->db->lasterror();
     		return -3;
     	}
@@ -2150,8 +2120,7 @@ class FactureLigneRec extends CommonInvoiceLine
             $this->db->commit();
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -2;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index fd6a6d32642..55adb5eb138 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -679,7 +679,7 @@ class Facture extends CommonInvoice
 				            }
 				        }
 				    }
-				    else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+				    else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
 				    {
 				        $origin_id = $tmp_origin_id;
     					$ret = $this->add_object_linked($origin, $origin_id);
@@ -988,28 +988,24 @@ class Facture extends CommonInvoice
 						$this->db->commit();
 						return $this->id;
 					}
-					else
-					{
+					else {
 						$this->db->rollback();
 						return -4;
 					}
 				}
-				else
-				{
+				else {
 					$this->error = $langs->trans('FailedToUpdatePrice');
 					$this->db->rollback();
 					return -3;
 				}
 			}
-			else
-			{
+			else {
 				dol_syslog(get_class($this)."::create error ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -1241,8 +1237,7 @@ class Facture extends CommonInvoice
 			$this->db->commit();
 			return $object->id;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1646,15 +1641,13 @@ class Facture extends CommonInvoice
 				}
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = 'Invoice with id='.$rowid.' or ref='.$ref.' or ref_ext='.$ref_ext.' not found';
 				dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1776,8 +1769,7 @@ class Facture extends CommonInvoice
 			$this->db->free($result);
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -3;
 		}
@@ -1816,8 +1808,7 @@ class Facture extends CommonInvoice
 					{
 					    $this->tab_previous_situation_invoice[] = $invoice;
 					}
-					else
-					{
+					else {
 					    $this->tab_next_situation_invoice[] = $invoice;
 					}
 				}
@@ -1934,8 +1925,7 @@ class Facture extends CommonInvoice
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -2022,22 +2012,19 @@ class Facture extends CommonInvoice
 					$this->db->commit();
 					return 1;
 				}
-				else
-				{
+				else {
 					$this->error = $facligne->error;
 					$this->db->rollback();
 					return -1;
 				}
 			}
-			else
-			{
+			else {
 				$this->error = $facligne->error;
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -3;
 		}
@@ -2063,8 +2050,7 @@ class Facture extends CommonInvoice
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
 		if (empty($ref_client))
 			$sql .= ' SET ref_client = NULL';
-		else
-			$sql .= ' SET ref_client = \''.$this->db->escape($ref_client).'\'';
+		else $sql .= ' SET ref_client = \''.$this->db->escape($ref_client).'\'';
 		$sql .= ' WHERE rowid = '.$this->id;
 
 		dol_syslog(__METHOD__.' this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
@@ -2095,8 +2081,7 @@ class Facture extends CommonInvoice
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2261,22 +2246,19 @@ class Facture extends CommonInvoice
 					$this->db->commit();
 					return 1;
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->lasterror()." sql=".$sql;
 					$this->db->rollback();
 					return -6;
 				}
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror()." sql=".$sql;
 				$this->db->rollback();
 				return -4;
 			}
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -2;
 		}
@@ -2322,8 +2304,7 @@ class Facture extends CommonInvoice
 	            if ($result < 0) $error++;
 	            // End call triggers
 			}
-			else
-			{
+			else {
 				$error++;
 				$this->error = $this->db->lasterror();
 			}
@@ -2333,14 +2314,12 @@ class Facture extends CommonInvoice
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			return 0;
 		}
 	}
@@ -2377,8 +2356,7 @@ class Facture extends CommonInvoice
             if ($result < 0) $error++;
             // End call triggers
 		}
-		else
-		{
+		else {
 			$error++;
 			$this->error = $this->db->error();
 			dol_print_error($this->db);
@@ -2389,8 +2367,7 @@ class Facture extends CommonInvoice
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -2446,15 +2423,13 @@ class Facture extends CommonInvoice
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->error()." sql=".$sql;
 				$this->db->rollback();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -2;
@@ -2573,8 +2548,7 @@ class Facture extends CommonInvoice
 			}
 			$num = $this->getNextNumRef($this->thirdparty);
 		}
-		else
-		{
+		else {
 			$num = $this->ref;
 		}
 		$this->newref = dol_sanitizeFileName($num);
@@ -2804,8 +2778,7 @@ class Facture extends CommonInvoice
                 }
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 		}
 
@@ -2814,8 +2787,7 @@ class Facture extends CommonInvoice
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -2943,14 +2915,12 @@ class Facture extends CommonInvoice
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -3070,8 +3040,7 @@ class Facture extends CommonInvoice
 			{
 				$pu = $pu_ht;
 			}
-			else
-			{
+			else {
 				$pu = $pu_ttc;
 			}
 
@@ -3213,22 +3182,19 @@ class Facture extends CommonInvoice
 					$this->db->commit();
 					return $this->line->id;
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -1;
 				}
 			}
-			else
-			{
+			else {
 				$this->error = $this->line->error;
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog(get_class($this)."::addline status of order must be Draft to allow use of ->addline()", LOG_ERR);
 			return -3;
 		}
@@ -3444,15 +3410,13 @@ class Facture extends CommonInvoice
 				$this->db->commit();
 				return $result;
 			}
-			else
-			{
+			else {
 			    $this->error = $this->line->error;
 				$this->db->rollback();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = "Invoice statut makes operation forbidden";
 			return -2;
 		}
@@ -3573,15 +3537,13 @@ class Facture extends CommonInvoice
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			$this->error = $line->error;
 			return -1;
@@ -3640,8 +3602,7 @@ class Facture extends CommonInvoice
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -3709,8 +3670,7 @@ class Facture extends CommonInvoice
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -3869,8 +3829,7 @@ class Facture extends CommonInvoice
 			}
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3933,8 +3892,7 @@ class Facture extends CommonInvoice
 					{
 						$ga[$obj->fid] = $obj->ref.' ('.$obj->name.')';
 					}
-					else
-					{
+					else {
 						$ga[$i]['id'] = $obj->fid;
 						$ga[$i]['ref'] 	= $obj->ref;
 						$ga[$i]['name'] = $obj->name;
@@ -3944,8 +3902,7 @@ class Facture extends CommonInvoice
 			}
 			return $ga;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3994,8 +3951,7 @@ class Facture extends CommonInvoice
 			//print_r($return);
 			return $return;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -4042,8 +3998,7 @@ class Facture extends CommonInvoice
 		    $sqlSit .= " ORDER BY fs.situation_counter";
             $sql .= " AND ( f.type != ".self::TYPE_SITUATION." OR f.rowid IN (".$sqlSit.") )"; // Type non 5 si facture non avoir
 		}
-		else
-		{
+		else {
 		    $sql .= " AND f.type != ".self::TYPE_SITUATION; // Type non 5 si facture non avoir
 		}
 
@@ -4069,8 +4024,7 @@ class Facture extends CommonInvoice
 
 			return $return;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -4147,8 +4101,7 @@ class Facture extends CommonInvoice
 						    $error++;
 						}
 					}
-					else
-					{
+					else {
 						$this->error = 'WithdrawRequestErrorNilAmount';
 	                    dol_syslog(get_class($this).'::demandeprelevement WithdrawRequestErrorNilAmount');
 	                    $error++;
@@ -4167,22 +4120,19 @@ class Facture extends CommonInvoice
                     if ($error) return -1;
                     return 1;
                 }
-                else
-                {
+                else {
                     $this->error = "A request already exists";
                     dol_syslog(get_class($this).'::demandeprelevement Impossible de creer une demande, demande deja en cours');
                     return 0;
                 }
             }
-            else
-            {
+            else {
                 $this->error = $this->db->error();
                 dol_syslog(get_class($this).'::demandeprelevement Erreur -2');
                 return -2;
             }
         }
-        else
-        {
+        else {
             $this->error = "Status of invoice does not allow this";
             dol_syslog(get_class($this)."::demandeprelevement ".$this->error." $this->statut, $this->paye, $this->mode_reglement_id");
             return -3;
@@ -4207,8 +4157,7 @@ class Facture extends CommonInvoice
 		{
 			return 0;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this).'::demande_prelevement_delete Error '.$this->error);
 			return -1;
@@ -4274,8 +4223,7 @@ class Facture extends CommonInvoice
 
 			return $response;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -4419,7 +4367,7 @@ class Facture extends CommonInvoice
 					$line->multicurrency_total_tva = 19.6;
 					$line->remise_percent = 50;
 				}
-				else    // (product line)
+				else // (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product = $prodids[$prodid];
@@ -4506,8 +4454,7 @@ class Facture extends CommonInvoice
             $this->db->free($resql);
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -4669,8 +4616,7 @@ class Facture extends CommonInvoice
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -4760,8 +4706,7 @@ class Facture extends CommonInvoice
 		        {
 		            $hasDelay = 1;
 		        }
-		        else
-		        {
+		        else {
 		            $hasDelay = 0;
 		        }
 		    }
@@ -4852,8 +4797,7 @@ class Facture extends CommonInvoice
 	            return -1;
 	        }
 	    }
-	    else
-	    {
+	    else {
 	        // Because one day retained warranty could be used on standard invoices
 	        $retainedWarrantyAmount = $this->total_ttc * $this->retained_warranty / 100;
 	    }
@@ -4890,15 +4834,13 @@ class Facture extends CommonInvoice
 	            $this->retained_warranty = floatval($value);
 	            return 1;
 	        }
-	        else
-	        {
+	        else {
 	            dol_syslog(get_class($this).'::setRetainedWarranty Erreur '.$sql.' - '.$this->db->error());
 	            $this->error = $this->db->error();
 	            return -1;
 	        }
 	    }
-	    else
-	    {
+	    else {
 	        dol_syslog(get_class($this).'::setRetainedWarranty, status of the object is incompatible');
 	        $this->error = 'Status of the object is incompatible '.$this->statut;
 	        return -2;
@@ -4933,15 +4875,13 @@ class Facture extends CommonInvoice
 	            $this->retained_warranty_date_limit = $timestamp;
 	            return 1;
 	        }
-	        else
-	        {
+	        else {
 	            dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit Erreur '.$sql.' - '.$this->db->error());
 	            $this->error = $this->db->error();
 	            return -1;
 	        }
 	    }
-	    else
-	    {
+	    else {
 	        dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit, status of the object is incompatible');
 	        $this->error = 'Status of the object is incompatible '.$this->statut;
 	        return -2;
@@ -5123,8 +5063,7 @@ class FactureLigne extends CommonInvoiceLine
 
 			return 1;
 		}
-		else
-		{
+		else {
 		    $this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -5178,8 +5117,7 @@ class FactureLigne extends CommonInvoiceLine
 			{
 				return $result;
 			}
-			else
-			{
+			else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -5296,8 +5234,7 @@ class FactureLigne extends CommonInvoiceLine
     							return -3;
 						    }
 						}
-						else
-						{
+						else {
 							$result = $discount->link_to_invoice($this->rowid, 0);
 							if ($result < 0)
 							{
@@ -5308,16 +5245,14 @@ class FactureLigne extends CommonInvoiceLine
 							}
 						}
 					}
-					else
-					{
+					else {
 						$this->error = $langs->trans("ErrorADiscountThatHasBeenRemovedIsIncluded");
 						dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 						$this->db->rollback();
 						return -3;
 					}
 				}
-				else
-				{
+				else {
 					$this->error = $discount->error;
 					dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 					$this->db->rollback();
@@ -5340,8 +5275,7 @@ class FactureLigne extends CommonInvoiceLine
 			$this->db->commit();
 			return $this->id;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -2;
@@ -5395,8 +5329,7 @@ class FactureLigne extends CommonInvoiceLine
 			{
 				return $result;
 			}
-			else
-			{
+			else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -5475,8 +5408,7 @@ class FactureLigne extends CommonInvoiceLine
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -5519,8 +5451,7 @@ class FactureLigne extends CommonInvoiceLine
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -5561,8 +5492,7 @@ class FactureLigne extends CommonInvoiceLine
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php
index 427daf445c5..1fddf20b023 100644
--- a/htdocs/compta/facture/class/paymentterm.class.php
+++ b/htdocs/compta/facture/class/paymentterm.class.php
@@ -146,8 +146,7 @@ class PaymentTerm // extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -203,8 +202,7 @@ class PaymentTerm // extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -240,8 +238,7 @@ class PaymentTerm // extends CommonObject
 			$this->db->free($resql);
 			return $ret;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -306,8 +303,7 @@ class PaymentTerm // extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -346,8 +342,7 @@ class PaymentTerm // extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -397,8 +392,7 @@ class PaymentTerm // extends CommonObject
 			$this->db->commit();
 			return $object->id;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 8eb47268186..77ff0f813c3 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -70,15 +70,13 @@ if ($action == 'addcontact' && $user->rights->facture->creer)
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -91,8 +89,7 @@ elseif ($action == 'swapstatut' && $user->rights->facture->creer)
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -208,8 +205,7 @@ if ($id > 0 || !empty($ref))
 		    if ($res) break;
 		}
 	}
-	else
-	{
+	else {
 		// Record not found
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index a901b985342..7e95b92cc3d 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -182,13 +182,11 @@ if ($id > 0 || !empty($ref))
 		$param = '&id='.$object->id;
 		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
-else
-{
+else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 65e9044f4f7..8275dbcf450 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -610,8 +610,7 @@ if ($resql)
 				{
 					if (!$objp->suspended && $objp->frequency > 0 && $db->jdate($objp->date_when) && $db->jdate($objp->date_when) < $now) print img_warning($langs->trans("Late"));
 				}
-				else
-				{
+				else {
 					print img_info($langs->trans("MaxNumberOfGenerationReached"));
 				}
 				print '</div>';
@@ -660,13 +659,11 @@ if ($resql)
 					print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
 					print $langs->trans("CreateBill").'</a>';
 				}
-				else
-				{
+				else {
 					print $form->textwithpicto('', $langs->trans("DateIsNotEnough"));
 				}
 			}
-			else
-			{
+			else {
 				print "&nbsp;";
 			}
 			if (!$i) $totalarray['nbfield']++;
@@ -677,8 +674,7 @@ if ($resql)
 			$i++;
 		}
 	}
-	else
-	{
+	else {
 		$colspan = 1;
 		foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
 		print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
@@ -694,8 +690,7 @@ if ($resql)
 
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 8b9e204f17e..7b3025db810 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -314,8 +314,7 @@ elseif ($massaction == 'withdrawrequest')
 		$error++;
 		setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
 	}
-	else
-	{
+	else {
 		//Checking error
 		$error = 0;
 
@@ -387,8 +386,7 @@ elseif ($massaction == 'withdrawrequest')
 					$db->commit();
 					$nbwithdrawrequestok++;
 				}
-				else
-				{
+				else {
 					$db->rollback();
 					setEventMessages($aBill->error, $aBill->errors, 'errors');
 				}
@@ -516,8 +514,7 @@ if ($search_status != '-1' && $search_status != '')
 		if ($search_status == '2') $sql .= " AND f.fk_statut = 2"; // payed     Not that some corrupted data may contains f.fk_statut = 1 AND f.paye = 1 (it means payed too but should not happend. If yes, reopen and reclassify billed)
 		if ($search_status == '3') $sql .= " AND f.fk_statut = 3"; // abandonned
 	}
-	else
-	{
+	else {
 		$sql .= " AND f.fk_statut IN (".$db->escape($search_status).")"; // When search_status is '1,2' for example
 	}
 }
@@ -564,8 +561,7 @@ if (!$sall)
 		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key : '');
 	}
 }
-else
-{
+else {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
 
@@ -1220,8 +1216,7 @@ if ($resql)
                 {
                     print $obj->ref;
                 }
-                else
-                {
+                else {
                     print $facturestatic->getNomUrl(1, '', 200, 0, '', 0, 1);
                 }
 
@@ -1317,8 +1312,7 @@ if ($resql)
 				{
 				    print $thirdpartystatic->name;
 				}
-				else
-				{
+				else {
 				    print $thirdpartystatic->getNomUrl(1, 'customer');
 				}
 				print '</td>';
@@ -1620,8 +1614,7 @@ if ($resql)
 
 	print $formfile->showdocuments('massfilesarea_invoices', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 74de1c640d4..109231a240d 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -87,8 +87,7 @@ if (empty($reshook))
 
                 setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
             }
-            else
-            {
+            else {
                 $db->rollback();
                 setEventMessages($object->error, $object->errors, 'errors');
             }
@@ -293,13 +292,11 @@ if ($object->id > 0)
 		{
 			$form->form_date($_SERVER['PHP_SELF'].'?id='.$object->id, $object->date, 'invoicedate');
 		}
-		else
-		{
+		else {
 			print dol_print_date($object->date, 'daytext');
 		}
 	}
-	else
-	{
+	else {
 		print dol_print_date($object->date, 'daytext');
 	}
 	print '</td>';
@@ -319,13 +316,11 @@ if ($object->id > 0)
 		{
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
 		}
-		else
-		{
+		else {
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
 		}
 	}
-	else
-	{
+	else {
 		print '&nbsp;';
 	}
 	print '</td></tr>';
@@ -344,16 +339,14 @@ if ($object->id > 0)
 		{
 			$form->form_date($_SERVER['PHP_SELF'].'?id='.$object->id, $object->date_lim_reglement, 'paymentterm');
 		}
-		else
-		{
+		else {
 			print dol_print_date($object->date_lim_reglement, 'daytext');
 			if ($object->hasDelay()) {
 				print img_warning($langs->trans('Late'));
 			}
 		}
 	}
-	else
-	{
+	else {
 		print '&nbsp;';
 	}
 	print '</td></tr>';
@@ -370,8 +363,7 @@ if ($object->id > 0)
 	{
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id');
 	}
-	else
-	{
+	else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
 	}
 	print '</td></tr>';
@@ -389,8 +381,7 @@ if ($object->id > 0)
 	{
 	    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
 	}
-	else
-	{
+	else {
 	    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
 	}
 	print "</td>";
@@ -503,8 +494,7 @@ if ($object->id > 0)
 		$num = $db->num_rows($result_sql);
 		$numopen = $num;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 
@@ -521,8 +511,7 @@ if ($object->id > 0)
 		$obj = $db->fetch_object($result_sql);
 		if ($obj) $pending = $obj->amount;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 
@@ -550,18 +539,15 @@ if ($object->id > 0)
     			print '<input type="submit" class="butAction" value="'.$langs->trans("MakeWithdrawRequest").'" />';
     			print '</form>';
     		}
-    		else
-    		{
+    		else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
     		}
 	    }
-	    else
-        {
+	    else {
             print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("AmountMustBePositive")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
         }
 	}
-	else
-	{
+	else {
 		if ($num == 0)
 		{
 			if ($object->statut > Facture::STATUS_DRAFT) print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("AlreadyPaid")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
@@ -635,8 +621,7 @@ if ($object->id > 0)
 
 		$db->free($result_sql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 
@@ -697,8 +682,7 @@ if ($object->id > 0)
 
 		$db->free($result);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 284186b73ce..d0c7eacffc6 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
-if(!empty($conf->category->enabled)) require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+if (!empty($conf->category->enabled)) require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
@@ -60,7 +60,7 @@ if ($user->socid > 0)
 
 $nowyear = strftime("%Y", dol_now());
 $year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
-if(!empty($conf->global->INVOICE_STATS_GRAPHS_SHOW_2_YEARS)) $startyear=$year-2;
+if (!empty($conf->global->INVOICE_STATS_GRAPHS_SHOW_2_YEARS)) $startyear=$year-2;
 else $startyear=$year-1;
 $endyear = $year;
 
@@ -68,7 +68,7 @@ $endyear = $year;
 /*
  * View
  */
-if(!empty($conf->category->enabled)) $langs->load('categories');
+if (!empty($conf->category->enabled)) $langs->load('categories');
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 $formother = new FormOther($db);
@@ -181,8 +181,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
 }
-else
-{
+else {
     $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index a02a0fc1682..571a00d6b47 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -79,8 +79,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
     		$total = $total + $sign * $objectlink->total_ht;
     		echo price($objectlink->total_ht);
     	}
-    	else
-    	{
+    	else {
     		echo '<strike>'.price($objectlink->total_ht).'</strike>';
     	}
 	}
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 00b4987ad66..2efe20a2fc5 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -215,15 +215,13 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 			print '<td colspan="2" class="right">'.price($tot_ttc).'</td>';
 			print '</tr>';
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print "</table></div><br>";
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -303,15 +301,13 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 			print '<td colspan="2" class="right">'.price($tot_ttc).'</td>';
 			print '</tr>';
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print "</table></div><br>";
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -429,8 +425,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			$colspan = 5;
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
@@ -438,8 +433,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 		print '</table></div><br>';
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -530,16 +524,14 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			$colspan = 5;
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table></div><br>';
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -609,8 +601,7 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire)
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print '</table></div><br>';
@@ -687,15 +678,13 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 				print '<td class="right">&nbsp;</td>';
 				print '</tr>';
 			}
-			else
-			{
+			else {
 				print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 			print "</table></div><br>";
 			$db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -816,8 +805,7 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 		}
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -940,8 +928,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 			print '<td>&nbsp;</td>';
 			print '</tr>';
 		}
-		else
-		{
+		else {
 			$colspan = 6;
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
@@ -949,8 +936,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 		print '</table></div><br>';
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -1050,16 +1036,14 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 			print '<td>&nbsp;</td>';
 			print '</tr>';
 		}
-		else
-		{
+		else {
 			$colspan = 6;
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table></div><br>';
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
index 1459bbf2402..91d855d4454 100644
--- a/htdocs/compta/journal/purchasesjournal.php
+++ b/htdocs/compta/journal/purchasesjournal.php
@@ -91,7 +91,7 @@ $exportlink = '';
 $builddate = dol_now();
 $description = $langs->trans("DescPurchasesJournal").'<br>';
 if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-else  $description .= $langs->trans("DepositsAreIncluded");
+else $description .= $langs->trans("DepositsAreIncluded");
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink);
@@ -239,8 +239,7 @@ foreach ($tabfac as $key => $val)
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
 	    			print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
 				}
-				else
-				{
+				else {
 					print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
 				}
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index 98bd5e989f7..a7eb09de31a 100644
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -93,7 +93,7 @@ $exportlink = '';
 $builddate = dol_now();
 $description = $langs->trans("DescSellsJournal").'<br>';
 if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-else  $description .= $langs->trans("DepositsAreIncluded");
+else $description .= $langs->trans("DepositsAreIncluded");
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink);
 
@@ -269,8 +269,7 @@ foreach ($tabfac as $key => $val)
 					print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
 				}
-				else
-				{
+				else {
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
 	    			print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
 				}
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 51275c7159f..e5a20b5486b 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -81,8 +81,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
         header("Location: list.php?localTaxType=".$lttype);
         exit;
     }
-    else
-    {
+    else {
         $db->rollback();
         setEventMessages($object->error, $object->errors, 'errors');
         $_GET["action"] = "create";
@@ -114,21 +113,18 @@ if ($action == 'delete')
 				header("Location: ".DOL_URL_ROOT.'/compta/localtax/list.php?localTaxType='.$object->ltt);
 				exit;
 			}
-			else
-			{
+			else {
 				$object->error = $accountline->error;
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 	    }
-	    else
-	    {
+	    else {
 	        $db->rollback();
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
-	else
-	{
+	else {
         $mesg = 'Error try do delete a line linked to a conciliated bank transaction';
         setEventMessages($mesg, null, 'errors');
 	}
@@ -290,8 +286,7 @@ if ($id)
 	{
 		print '<a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a>';
 	}
-	else
-	{
+	else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("LinkedToAConcialitedTransaction").'">'.$langs->trans("Delete").'</a>';
 	}
 	print "</div>";
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 6aa7c2b1a87..59adc220c8f 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -138,14 +138,12 @@ class Localtax extends CommonObject
             	$this->db->commit();
             	return $this->id;
             }
-            else
-			{
+            else {
 				$this->db->rollback();
 				return -1;
             }
         }
-        else
-		{
+        else {
             $this->error = "Error ".$this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -207,8 +205,7 @@ class Localtax extends CommonObject
     		$this->db->commit();
     		return 1;
     	}
-    	else
-    	{
+    	else {
     		$this->db->rollback();
     		return -1;
     	}
@@ -271,8 +268,7 @@ class Localtax extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -378,14 +374,12 @@ class Localtax extends CommonObject
                 $this->db->free($result);
                 return $ret;
             }
-            else
-			{
+            else {
             	$this->db->free($result);
 				return 0;
             }
         }
-        else
-		{
+        else {
             print $this->db->lasterror();
             return -1;
         }
@@ -419,14 +413,12 @@ class Localtax extends CommonObject
                 $this->db->free($result);
                 return $ret;
             }
-            else
-			{
+            else {
             	$this->db->free($result);
             	return 0;
             }
         }
-        else
-        {
+        else {
             print $this->db->lasterror();
             return -1;
         }
@@ -462,14 +454,12 @@ class Localtax extends CommonObject
             	$this->db->free($result);
                 return $ret;
             }
-            else
-			{
+            else {
             	$this->db->free($result);
 				return 0;
             }
         }
-        else
-        {
+        else {
             print $this->db->lasterror();
             return -1;
         }
@@ -548,8 +538,7 @@ class Localtax extends CommonObject
 					{
                         $this->update_fk_bank($bank_line_id);
                     }
-					else
-					{
+					else {
 						$this->error = $acc->error;
 						$ok = 0;
 					}
@@ -568,21 +557,18 @@ class Localtax extends CommonObject
 					$this->db->commit();
 					return $this->id;
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					return -3;
 				}
             }
-            else
-            {
+            else {
                 $this->error = $this->db->lasterror();
                 $this->db->rollback();
                 return -2;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -605,8 +591,7 @@ class Localtax extends CommonObject
 		if ($result) {
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php
index 61a11a042f2..12112766c24 100644
--- a/htdocs/compta/localtax/clients.php
+++ b/htdocs/compta/localtax/clients.php
@@ -54,16 +54,14 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
     if (empty($q))
 	{
 		if (GETPOST("month")) { $date_start = dol_get_first_day($year_start, GETPOST("month"), false); $date_end = dol_get_last_day($year_start, GETPOST("month"), false); }
-		else
-		{
+		else {
 			$date_start = dol_get_first_day($year_start, empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START, false);
 			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) $date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
 			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) $date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
 			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) $date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
 		}
 	}
-	else
-	{
+	else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -202,8 +200,7 @@ if ($calc == 0 || $calc == 2)
 					{
 						$intra = $langs->trans('Unknown');
 					}
-					else
-					{
+					else {
 						$intra = '';
 					}
 				}
@@ -230,15 +227,13 @@ if ($calc == 0 || $calc == 2)
 		print '<td class="nowrap right">'.price($total).'</td>';
 		print '</tr>';
 	}
-	else
-	{
+	else {
 		$langs->load("errors");
 		if ($coll_list == -1)
 			print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
 		elseif ($coll_list == -2)
 			print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-		else
-			print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
+		else print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
 	}
 }
 
@@ -275,8 +270,7 @@ if ($calc == 0 || $calc == 1) {
 					{
 						$intra = $langs->trans('Unknown');
 					}
-					else
-					{
+					else {
 						$intra = '';
 					}
 				}
@@ -305,15 +299,13 @@ if ($calc == 0 || $calc == 1) {
 
 		print '</table>';
 	}
-	else
-	{
+	else {
 		$langs->load("errors");
 		if ($coll_list == -1)
 			print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
 		elseif ($coll_list == -2)
 			print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-		else
-			print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
+		else print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
 	}
 }
 
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index a08ac99d6bd..b8a906ac818 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -53,14 +53,12 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	if (empty($q))
 	{
 		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); }
-		else
-		{
+		else {
 			$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
 			$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
 		}
 	}
-	else
-	{
+	else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -153,8 +151,7 @@ function pt($db, $sql, $date)
             	$previousmode = '';
             	$previousmonth = '';
             }
-            else
-            {
+            else {
             	$previousmode = $obj->mode;
             	$previousmonth = $obj->dm;
             }
@@ -389,8 +386,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 				//'link'				=>$expensereport->getNomUrl(1)
 				);
 			}
-			else
-			{
+			else {
 				//$invoice_supplier->id=$x_paye[$my_paye_rate]['facid'][$id];
 				//$invoice_supplier->ref=$x_paye[$my_paye_rate]['facnum'][$id];
 				//$invoice_supplier->type=$x_paye[$my_paye_rate]['type'][$id];
diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index 47a0f44be47..58ec8cb090e 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -96,8 +96,7 @@ if ($result)
     print "</table>";
     $db->free($result);
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
index 8e2e871251f..45d34f10cce 100644
--- a/htdocs/compta/localtax/quadri_detail.php
+++ b/htdocs/compta/localtax/quadri_detail.php
@@ -64,16 +64,14 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	if (empty($q))
 	{
 		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); }
-		else
-		{
+		else {
 			$date_start = dol_get_first_day($year_start, empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START, false);
 			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) $date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
 			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) $date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
 			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) $date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
 		}
 	}
-	else
-	{
+	else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -222,11 +220,9 @@ if (!is_array($x_coll) || !is_array($x_paye))
 		print '<tr><td colspan="'.$columns.'">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
 	elseif ($x_coll == -2)
 		print '<tr><td colspan="'.$columns.'">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-	else
-		print '<tr><td colspan="'.$columns.'">'.$langs->trans("Error").'</td></tr>';
+	else print '<tr><td colspan="'.$columns.'">'.$langs->trans("Error").'</td></tr>';
 }
-else
-{
+else {
 	$x_both = array();
 
 	//now, from these two arrays, get another array with one rate per line
@@ -373,8 +369,7 @@ else
 						print $product_static->getNomUrl(1);
 						if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
 					}
-					else
-					{
+					else {
 						if ($type) $text = img_object($langs->trans('Service'), 'service');
 						else $text = img_object($langs->trans('Product'), 'product');
 			            if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg))
@@ -533,8 +528,7 @@ else
 						print $product_static->getNomUrl(1);
 						if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
 					}
-					else
-					{
+					else {
 						if ($type) $text = img_object($langs->trans('Service'), 'service');
 						else $text = img_object($langs->trans('Product'), 'product');
 						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
@@ -573,8 +567,7 @@ else
 						{
 							print $langs->trans("NA");
 						}
-						else
-						{
+						else {
 							print price(price2num($fields['payment_amount'], 'MT'));
 							if (isset($fields['payment_amount'])) {
 								print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 4a7e387987c..5c0f258a091 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -313,8 +313,7 @@ if (empty($reshook))
 	        header('Location: '.$loc);
 	        exit;
 	    }
-	    else
-	    {
+	    else {
 	        $db->rollback();
 	    }
 	}
@@ -504,8 +503,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
             $form->select_comptes($accountid, 'accountid', 0, '', 2);
             print '</td>';
         }
-        else
-        {
+        else {
             print '<td>&nbsp;</td>';
         }
         print "</tr>\n";
@@ -561,8 +559,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
         {
             $sql .= ' AND type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
         }
-        else
-        {
+        else {
             $sql .= ' AND type = 2'; // If paying back a credit note, we show all credit notes
         }
         // Sort invoices by date and serial number: the older one comes first
@@ -666,8 +663,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
                         print '</td>';
                     }
-                    else
-                    {
+                    else {
                         print '<td align="center"></td>';
                     }
 
@@ -711,8 +707,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
    				    			print '<input type="text" class="maxwidth75 multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
    				    			print '<input type="hidden" class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
     				    	}
-    				    	else
-    				    	{
+    				    	else {
     				    		print '<input type="text" class="maxwidth75" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>';
     				    		print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
     				    	}
@@ -747,8 +742,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                         print '<input type="text" class="maxwidth75 amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
                         print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
                     }
-                    else
-                    {
+                    else {
                         print '<input type="text" class="maxwidth75" name="'.$namef.'_disabled" value="'.dol_escape_htmltag(GETPOST($namef)).'" disabled>';
                         print '<input type="hidden" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
                     }
@@ -804,8 +798,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
             }
             $db->free($resql);
         }
-        else
-		{
+        else {
             dol_print_error($db);
         }
 
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index e14581f6531..f67a2e2c12a 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -66,8 +66,7 @@ if ($action == 'setnote' && $user->rights->facture->paiement)
         $db->commit();
         $action = '';
     }
-    else
-    {
+    else {
 	    setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
     }
@@ -88,14 +87,12 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture->
         	header("Location: ".$backtopage);
         	exit;
         }
-        else
-        {
+        else {
         	header("Location: list.php");
         	exit;
         }
 	}
-	else
-	{
+	else {
 	    $langs->load("errors");
 		setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
@@ -132,8 +129,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->facture->
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 	    $langs->load("errors");
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
@@ -148,8 +144,7 @@ if ($action == 'setnum_paiement' && !empty($_POST['num_paiement']))
 	{
 		setEventMessages($langs->trans('PaymentNumberUpdateSucceeded'), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans('PaymentNumberUpdateFailed'), null, 'errors');
 	}
 }
@@ -163,8 +158,7 @@ if ($action == 'setdatep' && !empty($_POST['datepday']))
 	{
 		setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans('PaymentDateUpdateFailed'), null, 'errors');
 	}
 }
@@ -414,8 +408,7 @@ if ($resql)
 
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -446,8 +439,7 @@ if ($user->socid == 0 && $action == '')
 		{
 			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
 		}
-		else
-		{
+		else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$title_button.'">'.$langs->trans('Delete').'</a>';
 		}
 	}
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index eeb578ad731..44a160b35e0 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -80,8 +80,7 @@ if ($action == 'setdate' && $user->rights->banque->cheque)
 			setEventMessages($object->error, $object->errors, 'errors');
         }
     }
-    else
-    {
+    else {
         setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -99,8 +98,7 @@ if ($action == 'setrefext' && $user->rights->banque->cheque)
             setEventMessages($object->error, $object->errors, 'errors');
         }
     }
-    else
-    {
+    else {
         setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -118,8 +116,7 @@ if ($action == 'setref' && $user->rights->banque->cheque)
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -150,13 +147,11 @@ if ($action == 'create' && $_POST["accountid"] > 0 && $user->rights->banque->che
        		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
         	exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("ErrorSelectAtLeastOne"), null, 'mesgs');
 	    $action = 'new';
 	}
@@ -171,8 +166,7 @@ if ($action == 'remove' && $id > 0 && $_GET["lineid"] > 0 && $user->rights->banq
 		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -186,8 +180,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->c
 		header("Location: index.php");
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($paiement->error, $paiement->errors, 'errors');
 	}
 }
@@ -213,8 +206,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->banque->c
         header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -233,8 +225,7 @@ if ($action == 'confirm_reject_check' && $confirm == 'yes' && $user->rights->ban
 		//exit;
 		$action = '';
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = '';
 	}
@@ -262,8 +253,7 @@ if ($action == 'builddoc' && $user->rights->banque->cheque)
 		dol_print_error($db, $object->error);
 		exit;
 	}
-	else
-	{
+	else {
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc'));
 		exit;
 	}
@@ -315,8 +305,7 @@ if ($action == 'new')
 
 	print load_fiche_titre($langs->trans("Cheques"), '', 'bank_account');
 }
-else
-{
+else {
 	$result = $object->fetch($id, $ref);
 	if ($result < 0)
 	{
@@ -510,8 +499,7 @@ if ($action == 'new')
 				{
 					print $paymentstatic->getNomUrl(1);
 				}
-				else
-				{
+				else {
 					print '&nbsp;';
 				}
 				print '</td>';
@@ -522,8 +510,7 @@ if ($action == 'new')
 				{
 					print $accountlinestatic->getNomUrl(1);
 				}
-				else
-				{
+				else {
 					print '&nbsp;';
 				}
 				print '</td>';
@@ -544,16 +531,14 @@ if ($action == 'new')
 		{
 			print '<input type="submit" class="button" value="'.$langs->trans('NewCheckDepositOn', $account_label).'">';
 		}
-		else
-		{
+		else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('NewCheckDepositOn', $account_label).'</a>';
 		}
 		print '</div><br>';
 		print '</form>';
 	}
 }
-else
-{
+else {
 	$paymentstatic = new Paiement($db);
 	$accountlinestatic = new AccountLine($db);
 	$accountstatic = new Account($db);
@@ -588,8 +573,7 @@ else
         print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
         print '</form>';
     }
-    else
-    {
+    else {
         print $object->date_bordereau ? dol_print_date($object->date_bordereau, 'day') : '&nbsp;';
     }
 
@@ -700,8 +684,7 @@ else
     			{
     				print $paymentstatic->getNomUrl(1);
     			}
-    			else
-    			{
+    			else {
     				print '&nbsp;';
     			}
     			print '</td>';
@@ -712,8 +695,7 @@ else
     			{
     				print $accountlinestatic->getNomUrl(1);
     			}
-    			else
-    			{
+    			else {
     				print '&nbsp;';
     			}
     			print '</td>';
@@ -737,8 +719,7 @@ else
     			$i++;
     		}
         }
-        else
-        {
+        else {
             print '<td colspan="8" class="opacitymedium">';
             print $langs->trans("None");
             print '</td>';
@@ -756,8 +737,7 @@ else
 
 		print "</div>";
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 746065647d5..9d252a7456e 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -121,8 +121,7 @@ class RemiseCheque extends CommonObject
 				{
 					$this->ref = "(PROV".$this->id.")";
 				}
-				else
-				{
+				else {
 					$this->ref = $obj->ref;
 				}
 			}
@@ -130,8 +129,7 @@ class RemiseCheque extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 		    $this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -228,8 +226,7 @@ class RemiseCheque extends CommonObject
 					}
 					$this->db->free($resql);
 				}
-				else
-				{
+				else {
 					$this->errno = -1026;
 					dol_syslog("RemiseCheque::Create Error ".$this->errno, LOG_ERR);
 				}
@@ -270,8 +267,7 @@ class RemiseCheque extends CommonObject
 				}
 			}
 		}
-		else
-		{
+		else {
 			$this->errno = -1;
 			$this->error = $this->db->lasterror();
 			$this->errno = $this->db->lasterrno();
@@ -289,8 +285,7 @@ class RemiseCheque extends CommonObject
             dol_syslog("RemiseCheque::Create end", LOG_DEBUG);
             return $this->id;
         }
-        else
-        {
+        else {
             $this->db->rollback();
             dol_syslog("RemiseCheque::Create end", LOG_DEBUG);
             return $this->errno;
@@ -342,8 +337,7 @@ class RemiseCheque extends CommonObject
 		{
 			$this->db->commit();
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			dol_syslog("RemiseCheque::Delete ROLLBACK ($this->errno)");
 		}
@@ -386,14 +380,12 @@ class RemiseCheque extends CommonObject
 				    $this->ref = $numref;
 					$this->statut = 1;
 				}
-				else
-				{
+				else {
 					$this->errno = -1029;
 					dol_syslog("Remisecheque::Validate Error ".$this->errno, LOG_ERR);
 				}
 			}
-			else
-			{
+			else {
 				$this->errno = -1033;
 				dol_syslog("Remisecheque::Validate Error ".$this->errno, LOG_ERR);
 			}
@@ -405,8 +397,7 @@ class RemiseCheque extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			dol_syslog("RemiseCheque::Validate ".$this->errno, LOG_ERR);
             return $this->errno;
@@ -489,8 +480,7 @@ class RemiseCheque extends CommonObject
 
 			return $numref;
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Bank"));
 			return "";
@@ -545,8 +535,7 @@ class RemiseCheque extends CommonObject
 
 			return $response;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -585,8 +574,7 @@ class RemiseCheque extends CommonObject
 			$this->db->free($resql);
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -665,16 +653,14 @@ class RemiseCheque extends CommonObject
 				//$outputlangs->charset_output=$sav_charset_output;
 				return 1;
 			}
-			else
-			{
+			else {
 				//$outputlangs->charset_output=$sav_charset_output;
 				dol_syslog("Error");
 				dol_print_error($this->db, $docmodel->error);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->trans("ErrorFileDoesNotExists", $dir.$file);
 			return -1;
 		}
@@ -721,8 +707,7 @@ class RemiseCheque extends CommonObject
 				dol_syslog("RemiseCheque::updateAmount ERREUR UPDATE ($this->errno)");
 			}
 		}
-		else
-		{
+		else {
 			$this->errno = -1031;
 			dol_syslog("RemiseCheque::updateAmount ERREUR SELECT ($this->errno)");
 		}
@@ -731,8 +716,7 @@ class RemiseCheque extends CommonObject
 		{
 			$this->db->commit();
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			dol_syslog("RemiseCheque::updateAmount ROLLBACK ($this->errno)");
 		}
@@ -762,8 +746,7 @@ class RemiseCheque extends CommonObject
 			{
 				$this->updateAmount();
 			}
-			else
-			{
+			else {
 				$this->errno = -1032;
 				dol_syslog("RemiseCheque::removeCheck ERREUR UPDATE ($this->errno)");
 			}
@@ -839,30 +822,26 @@ class RemiseCheque extends CommonObject
     					$this->db->commit();
     					return $rejectedPayment->id;
 					}
-					else
-					{
+					else {
                         $this->db->rollback();
 					    return -1;
 					}
 				}
-				else
-				{
+				else {
 				    $this->error = $rejectedPayment->error;
 				    $this->errors = $rejectedPayment->errors;
 				    $this->db->rollback();
 					return -1;
 				}
 			}
-			else
-			{
+			else {
 				$this->error = $rejectedPayment->error;
 				$this->errors = $rejectedPayment->errors;
 			    $this->db->rollback();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -936,14 +915,12 @@ class RemiseCheque extends CommonObject
                 $this->date_bordereau = $date;
                 return 1;
             }
-            else
-            {
+            else {
                 $this->error = $this->db->error();
                 return -1;
             }
         }
-        else
-        {
+        else {
             return -2;
         }
     }
@@ -971,14 +948,12 @@ class RemiseCheque extends CommonObject
 			{
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->error();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			return -2;
 		}
 	}
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index c85553d59a8..7971a34db0d 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -77,8 +77,7 @@ if ($resql) {
     print '</td></tr>';
     print "</table>\n";
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
@@ -141,8 +140,7 @@ if ($resql)
 
 	$db->free($resql);
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index fe1f7c31050..cda8c2a679d 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -222,8 +222,7 @@ if ($resql)
     		$i++;
     	}
     }
-    else
-    {
+    else {
    		print '<tr class="oddeven">';
    		print '<td colspan="7" class="opacitymedium">'.$langs->trans("None")."</td>";
    		print '</tr>';
@@ -232,8 +231,7 @@ if ($resql)
 	print "</div>";
 	print "</form>\n";
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 9b0ee645fc7..99250bd9373 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -201,14 +201,12 @@ class Paiement extends CommonObject
 				$this->db->free($resql);
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->db->free($resql);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -243,8 +241,7 @@ class Paiement extends CommonObject
 			$amounts = &$this->amounts;
 			$amounts_to_update = &$this->multicurrency_amounts;
 		}
-		else
-		{
+		else {
 			$amounts = &$this->multicurrency_amounts;
 			$amounts_to_update = &$this->amounts;
 		}
@@ -283,8 +280,7 @@ class Paiement extends CommonObject
 			$total = $totalamount;
 			$mtotal = $totalamount_converted; // Maybe use price2num with MT for the converted value
 		}
-		else
-		{
+		else {
 			$total = $totalamount_converted; // Maybe use price2num with MT for the converted value
 			$mtotal = $totalamount;
 		}
@@ -340,8 +336,7 @@ class Paiement extends CommonObject
                             if (!in_array($invoice->type, $affected_types)) dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice, nor situation invoice. We do nothing more.");
                             elseif ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
                             //else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
-                            else
-                            {
+                            else {
                                 // If invoice is a down payment, we also convert down payment to discount
                                 if ($invoice->type == Facture::TYPE_DEPOSIT)
                                 {
@@ -430,14 +425,12 @@ class Paiement extends CommonObject
                             }
                         }
 					}
-					else
-					{
+					else {
 						$this->error = $this->db->lasterror();
 						$error++;
 					}
 				}
-				else
-				{
+				else {
 					dol_syslog(get_class($this).'::Create Amount line '.$key.' not a number. We discard it.');
 				}
 			}
@@ -450,8 +443,7 @@ class Paiement extends CommonObject
 				// Fin appel triggers
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$error++;
 		}
@@ -464,8 +456,7 @@ class Paiement extends CommonObject
 			$this->db->commit();
 			return $this->id;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -502,8 +493,7 @@ class Paiement extends CommonObject
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -2;
 		}
@@ -568,8 +558,7 @@ class Paiement extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error;
 			$this->db->rollback();
 			return -5;
@@ -731,8 +720,7 @@ class Paiement extends CommonObject
 				    // Fin appel triggers
 				}
             }
-            else
-			{
+            else {
                 $this->error = $acc->error;
                 $error++;
             }
@@ -741,8 +729,7 @@ class Paiement extends CommonObject
             {
             	$this->db->commit();
             }
-            else
-			{
+            else {
             	$this->db->rollback();
             }
         }
@@ -751,8 +738,7 @@ class Paiement extends CommonObject
         {
             return $bank_line_id;
         }
-        else
-        {
+        else {
             return -1;
         }
     }
@@ -777,8 +763,7 @@ class Paiement extends CommonObject
 		{
 			return 1;
 		}
-		else
-		{
+		else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this).'::update_fk_bank '.$this->error);
 			return -1;
@@ -840,8 +825,7 @@ class Paiement extends CommonObject
                 $this->db->commit();
                 return 0;
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 return -2;
             }
@@ -871,8 +855,7 @@ class Paiement extends CommonObject
             	$this->num_payment = $this->db->escape($num);
                 return 0;
             }
-            else
-            {
+            else {
                 $this->error = 'Error -1 '.$this->db->error();
                 return -2;
             }
@@ -896,8 +879,7 @@ class Paiement extends CommonObject
 		{
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this).'::valide '.$this->error);
 			return -1;
@@ -920,8 +902,7 @@ class Paiement extends CommonObject
 		{
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this).'::reject '.$this->error);
 			return -1;
@@ -966,8 +947,7 @@ class Paiement extends CommonObject
 			}
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
     }
@@ -1000,8 +980,7 @@ class Paiement extends CommonObject
 
 			return $billsarray;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this).'::getBillsArray Error '.$this->error.' -', LOG_DEBUG);
 			return -1;
@@ -1034,8 +1013,7 @@ class Paiement extends CommonObject
 
     		return $amounts;
     	}
-    	else
-    	{
+    	else {
     		$this->error = $this->db->error();
     		dol_syslog(get_class($this).'::getAmountsArray Error '.$this->error.' -', LOG_DEBUG);
     		return -1;
@@ -1119,8 +1097,7 @@ class Paiement extends CommonObject
 
 			return $numref;
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Invoice"));
 			return "";
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 20401d81a1a..dbdf4f4675e 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -130,8 +130,7 @@ if (GETPOST("orphelins", "alpha"))
 	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
 }
-else
-{
+else {
     $sql = "SELECT DISTINCT p.rowid, p.ref, p.datep as dp, p.amount,"; // DISTINCT is to avoid duplicate when there is a link to sales representatives
     $sql .= " p.statut, p.num_paiement as num_payment,";
     $sql .= " c.code as paiement_code,";
@@ -161,7 +160,7 @@ else
     if ($userid)
     {
         if ($userid == -1) $sql .= " AND f.fk_user_author IS NULL";
-        else  $sql .= " AND f.fk_user_author = ".$userid;
+        else $sql .= " AND f.fk_user_author = ".$userid;
     }
     // Search criteria
     $sql .= dolSqlDateFilter("p.datep", $day, $month, $year);
@@ -379,8 +378,7 @@ if ($resql)
     print "</div>";
     print "</form>\n";
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 76a1ce72d76..66f239fdf96 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -71,8 +71,7 @@ if ($action == 'builddoc')
     {
         $outputlangs->charset_output = $sav_charset_output;
     }
-    else
-    {
+    else {
         $outputlangs->charset_output = $sav_charset_output;
         dol_print_error($db, $obj->error);
     }
diff --git a/htdocs/compta/paiement/tovalidate.php b/htdocs/compta/paiement/tovalidate.php
index 91ef2c215e6..b978fc8e218 100644
--- a/htdocs/compta/paiement/tovalidate.php
+++ b/htdocs/compta/paiement/tovalidate.php
@@ -127,8 +127,7 @@ if ($resql)
         {
             print '<a href="card.php?id='.$objp->rowid.'&amp;action=valide">'.$langs->trans("PaymentStatusToValidShort").'</a>';
         }
-        else
-        {
+        else {
             print "-";
         }
 
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 509e20f3613..d1b448c5932 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -142,8 +142,7 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
                 header('Location: '.$loc);
                 exit;
             }
-            else
-            {
+            else {
                 $db->rollback();
             }
         }
@@ -284,8 +283,7 @@ if ($action == 'create')
 		{
 			print '<td class="left">'.dol_print_date($objp->date_ech, 'day').'</td>'."\n";
 		}
-		else
-		{
+		else {
 			print "<td align=\"center\"><b>!!!</b></td>\n";
 		}
 
@@ -306,8 +304,7 @@ if ($action == 'create')
 			print '<input type=hidden class="sum_remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
 			print '<input type="text" size="8" name="'.$namef.'" id="'.$namef.'">';
 		}
-		else
-		{
+		else {
 			print '-';
 		}
 		print "</td>";
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index 5fdfe327056..69b425356d1 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -67,8 +67,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->tax->char
         header("Location: ".DOL_URL_ROOT."/compta/sociales/payments.php?mode=sconly");
         exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
 	}
@@ -284,8 +283,7 @@ if ($resql)
 	print "</table>\n";
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -317,8 +315,7 @@ if ($action == '')
 		{
 			print '<a class="butActionDelete" href="card.php?id='.$_GET['id'].'&amp;action=delete">'.$langs->trans('Delete').'</a>';
 		}
-		else
-		{
+		else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
 		}
 	}
diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php
index fd87dd5e447..d2611e8a354 100644
--- a/htdocs/compta/paymentbybanktransfer/index.php
+++ b/htdocs/compta/paymentbybanktransfer/index.php
@@ -159,14 +159,12 @@ if ($resql)
             $i++;
         }
     }
-    else
-    {
+    else {
         print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoSupplierInvoiceToWithdraw", $langs->transnoentitiesnoconv("BankTransfer")).'</td></tr>';
     }
     print "</table></div><br>";
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
@@ -221,8 +219,7 @@ if ($result)
     print "</table></div><br>";
     $db->free($result);
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index c7c717e702b..106f848f732 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -191,8 +191,7 @@ if ($result)
 
     $db->free($result);
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index d81e101be3d..d5051e06bfa 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -409,8 +409,7 @@ if ($id > 0 || $ref)
 			{
 		  		print '<b>'.$langs->trans("StatusRefused").'</b>';
 			}
-			else
-			{
+			else {
 		  		print "&nbsp;";
 			}
 
@@ -443,8 +442,7 @@ if ($id > 0 || $ref)
 
 		$db->free($result);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 0c21a3e6d2b..91a165ee454 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -152,20 +152,17 @@ class BonPrelevement extends CommonObject
 				{
 					$result = 0;
 				}
-				else
-				{
+				else {
 					$result = -1;
 					dol_syslog(get_class($this)."::AddFacture Erreur $result");
 				}
 			}
-			else
-			{
+			else {
 				$result = -2;
 				dol_syslog(get_class($this)."::AddFacture Erreur $result");
 			}
 		}
-		else
-		{
+		else {
 			$result = -3;
 			dol_syslog(get_class($this)."::AddFacture Erreur $result");
 		}
@@ -209,13 +206,11 @@ class BonPrelevement extends CommonObject
 			{
 				$num = $this->db->num_rows($resql);
 			}
-			else
-			{
+			else {
 				$result = -1;
 			}
 		}
-		else
-		{
+		else {
 			/*
 			 * No aggregate
 			 */
@@ -244,8 +239,7 @@ class BonPrelevement extends CommonObject
 				$line_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_lignes");
 				$result = 0;
 			}
-			else
-			{
+			else {
 				dol_syslog(get_class($this)."::addline Error -2");
 				$result = -2;
 			}
@@ -321,14 +315,12 @@ class BonPrelevement extends CommonObject
 
 				return 1;
 			}
-			else
-			{
+			else {
 				dol_syslog(get_class($this)."::Fetch Erreur aucune ligne retournee");
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			return -2;
 		}
 	}
@@ -397,16 +389,14 @@ class BonPrelevement extends CommonObject
 				$this->db->commit();
 				return 0;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::set_credite ROLLBACK ");
 
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog(get_class($this)."::set_credite Ouverture transaction SQL impossible ");
 			return -2;
 		}
@@ -491,8 +481,7 @@ class BonPrelevement extends CommonObject
 								dol_syslog(get_class($this)."::set_infocredit AddPayment Error");
 								$error++;
 							}
-							else
-							{
+							else {
 								$result = $paiement->addPaymentToBank($user, 'payment', '(WithdrawalPayment)', $bankaccount, '', '');
 								if ($result < 0)
 								{
@@ -517,8 +506,7 @@ class BonPrelevement extends CommonObject
 							$error++;
 						}
 					}
-					else
-					{
+					else {
 						dol_syslog(get_class($this)."::set_infocredit Update Bons Error");
 						$error++;
 					}
@@ -534,27 +522,23 @@ class BonPrelevement extends CommonObject
 						$this->db->commit();
 						return 0;
 					}
-					else
-					{
+					else {
 						$this->db->rollback();
 						dol_syslog("bon-prelevment::set_infocredit ROLLBACK ");
 						return -1;
 					}
 				}
-				else
-				{
+				else {
 					dol_syslog(get_class($this)."::set_infocredit 1025 Open SQL transaction impossible ");
 					return -1025;
 				}
 			}
-			else
-			{
+			else {
 				dol_syslog("bon-prelevment::set_infocredit 1027 Date de credit < Date de trans ");
 				return -1027;
 			}
 		}
-		else
-		{
+		else {
 			return -1026;
 		}
 	}
@@ -597,8 +581,7 @@ class BonPrelevement extends CommonObject
 
 				// TODO Call trigger to create a notification using notification module
 			}
-			else
-			{
+			else {
 				$error++;
 			}
 
@@ -610,16 +593,14 @@ class BonPrelevement extends CommonObject
 
 				return 0;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::set_infotrans ROLLBACK", LOG_ERR);
 
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog(get_class($this)."::set_infotrans Ouverture transaction SQL impossible", LOG_CRIT);
 			return -2;
 		}
@@ -664,8 +645,7 @@ class BonPrelevement extends CommonObject
 				{
 					$row = $this->db->fetch_row($resql);
 					if (!$amounts) $arr[$i] = $row[0];
-					else
-					{
+					else {
 						$arr[$i] = array(
 							$row[0],
 							$row[1]
@@ -676,8 +656,7 @@ class BonPrelevement extends CommonObject
 			}
 			$this->db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_syslog(get_class($this)."::getListInvoices Erreur");
 		}
 
@@ -715,8 +694,7 @@ class BonPrelevement extends CommonObject
 
 			return $obj->nb;
 		}
-		else
-		{
+		else {
 			$error = 1;
 			dol_syslog(get_class($this)."::SommeAPrelever Erreur -1");
 			dol_syslog($this->db->error());
@@ -760,8 +738,7 @@ class BonPrelevement extends CommonObject
 
 			return $obj->nb;
 		}
-		else
-		{
+		else {
 			$this->error = get_class($this)."::NbFactureAPrelever Erreur -1 sql=".$this->db->error();
 			return -1;
 		}
@@ -849,8 +826,7 @@ class BonPrelevement extends CommonObject
 				$this->db->free($resql);
 				dol_syslog(__METHOD__."::Read invoices, ".$i." invoices to withdraw", LOG_DEBUG);
 			}
-			else
-			{
+			else {
 				$error++;
 				dol_syslog(__METHOD__."::Read invoices error ".$this->db->error(), LOG_ERR);
 			}
@@ -895,26 +871,22 @@ class BonPrelevement extends CommonObject
 								$i++;
 								//dol_syslog(__METHOD__."::RIB is ok", LOG_DEBUG);
 							}
-							else
-							{
+							else {
 								dol_syslog(__METHOD__."::Check RIB Error on default bank number IBAN/BIC for thirdparty reported by verif() ".$fact->socid." ".$soc->name, LOG_WARNING);
 								$this->invoice_in_error[$fac[0]] = "Error on default bank number IBAN/BIC for invoice ".$fact->getNomUrl(0)." for thirdparty ".$soc->getNomUrl(0);
 								$this->thirdparty_in_error[$soc->id] = "Error on default bank number IBAN/BIC for invoice ".$fact->getNomUrl(0)." for thirdparty ".$soc->getNomUrl(0);
 							}
 						}
-						else
-						{
+						else {
 							dol_syslog(__METHOD__."::Check RIB Failed to read company", LOG_WARNING);
 						}
 					}
-					else
-					{
+					else {
 						dol_syslog(__METHOD__."::Check RIB Failed to read invoice", LOG_WARNING);
 					}
 				}
 			}
-			else
-			{
+			else {
 				dol_syslog(__METHOD__."::Check RIB No invoice to process", LOG_WARNING);
 			}
 		}
@@ -941,8 +913,7 @@ class BonPrelevement extends CommonObject
 			{
 				$ok = 1;
 			}
-			else
-			{
+			else {
 				print $langs->trans("ModeWarning"); //"Option for real mode was not set, we stop after this simulation\n";
 			}
 		}
@@ -1000,14 +971,12 @@ class BonPrelevement extends CommonObject
 						$this->id = $prev_id;
 						$this->ref = $ref;
 					}
-					else
-					{
+					else {
 						$error++;
 						dol_syslog(__METHOD__."::Create withdraw receipt ".$this->db->lasterror(), LOG_ERR);
 					}
 				}
-				else
-				{
+				else {
 					$error++;
 					dol_syslog(__METHOD__."::Get last withdraw receipt ".$this->db->lasterror(), LOG_ERR);
 				}
@@ -1129,15 +1098,13 @@ class BonPrelevement extends CommonObject
 			{
 				$this->db->commit();
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 			}
 
 			return count($factures_prev);
 		}
-		else
-		{
+		else {
 			return 0;
 		}
 	}
@@ -1198,8 +1165,7 @@ class BonPrelevement extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1301,8 +1267,7 @@ class BonPrelevement extends CommonObject
 		{
 			return 0;
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 	}
@@ -1327,8 +1292,7 @@ class BonPrelevement extends CommonObject
 		{
 			return 0;
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 	}
@@ -1359,8 +1323,7 @@ class BonPrelevement extends CommonObject
 			{
 				$result = 0;
 			}
-			else
-			{
+			else {
 				$result = -1;
 				dol_syslog(get_class($this)."::AddNotification Error $result");
 			}
@@ -1464,8 +1427,7 @@ class BonPrelevement extends CommonObject
 				}
 				$nbtotalDrctDbtTxInf = $i;
 			}
-			else
-			{
+			else {
 				fputs($this->file, 'ERROR DEBITOR '.$sql.$CrLf); // DEBITOR = Customers
 				$result = -2;
 			}
@@ -1475,8 +1437,7 @@ class BonPrelevement extends CommonObject
 			{
 				$fileEmetteurSection .= $this->EnregEmetteurSEPA($conf, $date_actu, $nbtotalDrctDbtTxInf, $this->total, $CrLf, $format);
 			}
-			else
-			{
+			else {
 				fputs($this->file, 'ERROR CREDITOR'.$CrLf); // CREDITOR = My company
 			}
 
@@ -1543,8 +1504,7 @@ class BonPrelevement extends CommonObject
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				$result = -2;
 			}
 
@@ -1915,8 +1875,7 @@ class BonPrelevement extends CommonObject
 			$XML_SEPA_INFO .= '				</Id>'.$CrLf;
 			$XML_SEPA_INFO .= '			</CdtrSchmeId>'.$CrLf;
 		}
-		else
-		{
+		else {
 			fputs($this->file, 'INCORRECT EMETTEUR '.$XML_SEPA_INFO.$CrLf);
 			$result = -2;
 		}
diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php
index 88b612554df..accd64e2694 100644
--- a/htdocs/compta/prelevement/class/ligneprelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php
@@ -97,16 +97,14 @@ class LignePrelevement
 				$this->bon_ref         = $obj->ref;
 				$this->bon_rowid       = $obj->bon_rowid;
 			}
-			else
-			{
+			else {
 				$result++;
 				dol_syslog("LignePrelevement::Fetch rowid=$rowid numrows=0");
 			}
 
 			$this->db->free($resql);
 		}
-		else
-		{
+		else {
 			$result++;
 			dol_syslog("LignePrelevement::Fetch rowid=$rowid");
 			dol_syslog($this->db->error());
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index 8c033353637..1edd942fc42 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -161,8 +161,7 @@ class RejetPrelevement
 				$error++;
 				dol_syslog("RejetPrelevement::Create Error creation payment invoice ".$facs[$i][0]);
 			}
-			else
-			{
+			else {
 				$result = $pai->addPaymentToBank($user, 'payment', '(InvoiceRefused)', $bankaccount, '', '');
 				if ($result < 0)
 				{
@@ -192,8 +191,7 @@ class RejetPrelevement
 			dol_syslog("RejetPrelevement::Create Commit");
 			$this->db->commit();
 		}
-		else
-		{
+		else {
 			dol_syslog("RejetPrelevement::Create Rollback");
 			$this->db->rollback();
 		}
@@ -228,8 +226,7 @@ class RejetPrelevement
 				$userid = $row[0];
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog("RejetPrelevement::_send_email Erreur lecture user");
 		}
 
@@ -266,13 +263,11 @@ class RejetPrelevement
 			{
 				dol_syslog("RejetPrelevement::_send_email email envoye");
 			}
-			else
-			{
+			else {
 				dol_syslog("RejetPrelevement::_send_email Erreur envoi email");
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog("RejetPrelevement::_send_email Userid invalide");
 		}
 	}
@@ -310,8 +305,7 @@ class RejetPrelevement
 				{
 					$row = $this->db->fetch_row($resql);
 					if (!$amounts) $arr[$i] = $row[0];
-					else
-					{
+					else {
 						$arr[$i] = array(
 							$row[0],
 							$row[1]
@@ -322,8 +316,7 @@ class RejetPrelevement
 			}
 			$this->db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_syslog("getListInvoices", LOG_ERR);
 		}
 
@@ -359,14 +352,12 @@ class RejetPrelevement
 
 				return 0;
 			}
-			else
-			{
+			else {
 				dol_syslog("RejetPrelevement::Fetch Erreur rowid=$rowid numrows=0");
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog("RejetPrelevement::Fetch Erreur rowid=$rowid");
 			return -2;
 		}
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 5306b6799b9..505ad070645 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -94,8 +94,7 @@ if (empty($reshook))
 				$mesg .= '<span class="warning">'.$val."</span><br>\n";
 			}
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans("DirectDebitOrderCreated", $bprev->getNomUrl(1)), null);
 		}
 	}
@@ -175,21 +174,18 @@ if ($nb) {
             print '<a class="butAction"  type="submit" href="create.php?action=create&format=ALL">'.$langs->trans("CreateAll")."</a>\n";
 		}
 	}
-	else
-	{
+	else {
 		if ($mysoc->isInEEC())
 		{
 			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateForSepaFRST")."</a>\n";
 			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateForSepaRCUR")."</a>\n";
 		}
-		else
-		{
+		else {
 			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateAll")."</a>\n";
 		}
 	}
 }
-else
-{
+else {
     print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoInvoiceToWithdraw", $langs->transnoentitiesnoconv("StandingOrders"))).'">'.$langs->trans("CreateAll")."</a>\n";
 }
 
@@ -308,16 +304,14 @@ if ($resql)
 			$i++;
 		}
 	}
-	else
-	{
+	else {
 		print '<tr class="oddeven"><td colspan="6"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 	}
 	print "</table>";
 	print "</form>";
 	print "<br>\n";
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 181f71a678c..64ac904db6c 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -89,8 +89,7 @@ if (!$status)
 {
 	$title = $langs->trans("RequestStandingOrderToTreat");
 }
-else
-{
+else {
 	$title = $langs->trans("RequestStandingOrderTreated");
 }
 
@@ -143,8 +142,7 @@ if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
 }
-else
-{
+else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index fb0a5548426..bb3cced3eb4 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -135,8 +135,7 @@ if ($prev_id > 0 || $ref)
 
 		dol_fiche_end();
     }
-  	else
-    {
+  	else {
       	dol_print_error($db);
     }
 }
@@ -290,8 +289,7 @@ if ($result)
 
   	$db->free($result);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 1cc454a3d4d..4bfc07b0292 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -136,8 +136,7 @@ if ($prev_id > 0 || $ref)
 
 		dol_fiche_end();
     }
-  	else
-    {
+  	else {
       	dol_print_error($db);
     }
 }
@@ -221,8 +220,7 @@ if ($resql)
     		$i++;
     	}
 	}
-	else
-	{
+	else {
 	    print '<tr><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 	}
 
@@ -239,8 +237,7 @@ if ($resql)
 
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 18028e2059a..5dd01bad41d 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -133,8 +133,7 @@ if ($prev_id > 0 || $ref)
 
 		dol_fiche_end();
 	}
-	else
-	{
+	else {
 		$langs->load("errors");
 		print $langs->trans("Error");
 	}
@@ -186,8 +185,7 @@ if ($prev_id > 0 || $ref)
 		print "</table>";
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		print $db->error().' '.$sql;
 	}
 }
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index eb2932fd4cb..faa56184891 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -159,14 +159,12 @@ if ($resql)
             $i++;
         }
     }
-    else
-    {
+    else {
         print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoInvoiceToWithdraw", $langs->transnoentitiesnoconv("StandingOrders")).'</td></tr>';
     }
     print "</table></div><br>";
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
@@ -221,8 +219,7 @@ if ($result)
     print "</table></div><br>";
     $db->free($result);
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index 9169f71a377..89d6ad93636 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -103,13 +103,11 @@ if ($action == 'confirm_rejet')
 				exit;
 			}
 		}
-		else
-		{
+		else {
 			$action = "rejet";
 		}
 	}
-	else
-	{
+	else {
 		header("Location: line.php?id=".$id);
 		exit;
 	}
@@ -162,15 +160,13 @@ if ($id)
 					/* Historique pour certaines install */
 					print $langs->trans("Unknown");
 				}
-				else
-				{
+				else {
 					print dol_print_date($rej->date_rejet, 'day');
 				}
 				print '</td></tr>';
 				print '<tr><td width="20%">'.$langs->trans("RefusedInvoicing").'</td><td>'.$rej->invoicing.'</td></tr>';
 			}
-			else
-			{
+			else {
 				print '<tr><td width="20%">'.$resf.'</td></tr>';
 			}
 		}
@@ -178,8 +174,7 @@ if ($id)
 		print '</table>';
 		dol_fiche_end();
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 
@@ -246,13 +241,11 @@ if ($id)
 			{
 	  			print "<a class=\"butAction\" href=\"line.php?action=rejet&amp;id=$lipre->id\">".$langs->trans("StandingOrderReject")."</a>";
 			}
-			else
-			{
+			else {
 				print "<a class=\"butActionRefused classfortooltip\" href=\"#\" title=\"".$langs->trans("NotAllowed")."\">".$langs->trans("StandingOrderReject")."</a>";
 			}
 		}
-		else
-		{
+		else {
 			print "<a class=\"butActionRefused classfortooltip\" href=\"#\" title=\"".$langs->trans("NotPossibleForThisStatusOfWithdrawReceiptORLine")."\">".$langs->trans("StandingOrderReject")."</a>";
 		}
 	}
@@ -330,8 +323,7 @@ if ($id)
 
 		$db->free($result);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 48f9bcc7c54..b93042df8e6 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -236,8 +236,7 @@ if ($result)
 
     $db->free($result);
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 6d1994b7a4b..a7e7a6f3a53 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -118,8 +118,7 @@ if ($result)
 	print "</table>";
 	$db->free($result);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index c6d1962ff46..609c75e065d 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -126,8 +126,7 @@ if ($resql)
 	print "</tr></table>";
 	$db->free();
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -220,8 +219,7 @@ if ($resql)
 	print "</tr></table>";
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 3f2112537b1..83388f21e49 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -212,14 +212,12 @@ if ($id > 0)
 
 					$db->free($resqlp);
 				}
-				else
-				{
+				else {
 					dol_print_error($db);
 				}
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -289,8 +287,7 @@ if ($id > 0)
 		print "</table>";
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 27bc4526a3e..8d7c0343b30 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -151,7 +151,7 @@ if ($modecompta == "CREANCES-DETTES")
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] - 1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] + 1)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
     $description = $langs->trans("RulesResultDue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-	else  $description .= $langs->trans("DepositsAreIncluded");
+	else $description .= $langs->trans("DepositsAreIncluded");
     $builddate = dol_now();
     //$exportlink=$langs->trans("NotYetAvailable");
 }
@@ -213,8 +213,7 @@ if ($modecompta == 'BOOKKEEPING')
 {
 	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], 'amount', '', $param, 'class="right"', $sortfield, $sortorder);
 }
-else
-{
+else {
 	if ($modecompta == 'CREANCES-DETTES')
 	{
 		print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], 'amount_ht', '', $param, 'class="right"', $sortfield, $sortorder);
@@ -313,15 +312,13 @@ if ($modecompta == 'BOOKKEEPING')
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			print '<tr><td colspan="4" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 		}
 	}
 	else dol_print_error($db);
 }
-else
-{
+else {
 	/*
 	 * Factures clients
 	 */
@@ -336,8 +333,7 @@ else
 	    $sql .= " AND f.fk_statut IN (1,2)";
 	    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 	    	$sql .= " AND f.type IN (0,1,2,5)";
-		else
-			$sql .= " AND f.type IN (0,1,2,3,5)";
+		else $sql .= " AND f.type IN (0,1,2,3,5)";
 	    if (!empty($date_start) && !empty($date_end))
 	    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	}
@@ -463,8 +459,7 @@ else
 	    $sql .= " AND f.fk_statut IN (1,2)";
 	    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 	    	$sql .= " AND f.type IN (0,1,2)";
-		else
-			$sql .= " AND f.type IN (0,1,2,3)";
+		else $sql .= " AND f.type IN (0,1,2,3)";
 	    if (!empty($date_start) && !empty($date_end))
 	    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	}
@@ -518,8 +513,7 @@ else
 	            $i++;
 	        }
 	    }
-	    else
-	    {
+	    else {
 	        print '<tr class="oddeven"><td>&nbsp;</td>';
 	        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 	        print '</tr>';
@@ -768,15 +762,13 @@ else
 		            $i++;
 		        }
 		    }
-		    else
-		    {
+		    else {
 		        print '<tr class="oddeven"><td>&nbsp;</td>';
 		        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 		        print '</tr>';
 		    }
 		}
-		else
-		{
+		else {
 		    dol_print_error($db);
 		}
 		print '<tr class="liste_total">';
@@ -854,15 +846,13 @@ else
 					print '</tr>';
 				}
 			}
-			else
-			{
+			else {
 				print '<tr class="oddeven"><td>&nbsp;</td>';
 				print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 				print '</tr>';
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 		print '<tr class="liste_total">';
@@ -888,8 +878,7 @@ else
 		    	$sql .= " WHERE p.entity IN (".getEntity('donation').")";
 		    	$sql .= " AND fk_statut in (1,2)";
 			}
-			else
-			{
+			else {
 			    $sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
 			    $sql .= " FROM ".MAIN_DB_PREFIX."don as p";
 			    $sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
@@ -936,15 +925,13 @@ else
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				print '<tr class="oddeven"><td>&nbsp;</td>';
 				print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 				print '</tr>';
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 		print '<tr class="liste_total">';
@@ -1083,8 +1070,7 @@ else
 		    $sql .= " WHERE f.fk_statut IN (1,2)";
 		    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 		    	$sql .= " AND f.type IN (0,1,2,5)";
-			else
-				$sql .= " AND f.type IN (0,1,2,3,5)";
+			else $sql .= " AND f.type IN (0,1,2,3,5)";
 		    if (!empty($date_start) && !empty($date_end))
 		    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 		    $sql .= " AND f.entity IN (".getEntity('invoice').")";
@@ -1131,8 +1117,7 @@ else
 		    $sql .= " WHERE f.fk_statut IN (1,2)";
 		    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 		    	$sql .= " AND f.type IN (0,1,2)";
-			else
-				$sql .= " AND f.type IN (0,1,2,3)";
+			else $sql .= " AND f.type IN (0,1,2,3)";
 		    if (!empty($date_start) && !empty($date_end))
 		    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 		    $sql .= " AND f.entity = ".$conf->entity;
@@ -1173,8 +1158,7 @@ else
 		    print '<td class="right">'.price($amount)."</td>\n";
 		    print "</tr>\n";
 		}
-		else
-		{
+		else {
 		    // VAT really already paid
 		    $amount = 0;
 		    $sql = "SELECT date_format(t.datev,'%Y-%m') as dm, sum(t.amount) as amount";
@@ -1254,8 +1238,7 @@ else
 		        }
 		        $db->free($result);
 		    }
-		    else
-		    {
+		    else {
 		        dol_print_error($db);
 		    }
 		    print '<tr class="oddeven"><td>&nbsp;</td>';
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index ad81a3943c1..04bed25d6b2 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -131,7 +131,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	$description = $langs->trans("RulesAmountWithTaxIncluded");
 	$description .= '<br>'.$langs->trans("RulesResultDue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= "<br>".$langs->trans("DepositsAreNotIncluded");
-	else  $description .= "<br>".$langs->trans("DepositsAreIncluded");
+	else $description .= "<br>".$langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
 }
@@ -724,8 +724,7 @@ if (!empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES' |
 			}
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -786,8 +785,7 @@ if (!empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
     		}
     	}
     }
-    else
-    {
+    else {
     	dol_print_error($db);
     }
 }
@@ -826,8 +824,7 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->ba
     		}
     	}
     }
-    else
-    {
+    else {
     	dol_print_error($db);
     }
 
@@ -856,8 +853,7 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->ba
     		}
     	}
     }
-    else
-    {
+    else {
     	dol_print_error($db);
     }
 }
@@ -894,8 +890,7 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan
     		}
     	}
     }
-    else
-    {
+    else {
     	dol_print_error($db);
     }
 }
@@ -961,8 +956,7 @@ if (!empty($conf->accounting->enabled) && ($modecompta == 'BOOKKEEPING'))
 			}
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -1042,8 +1036,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				$totsorties[$annee] += $decaiss[$case];
 			}
 		}
-		else
-		{
+		else {
 			if (isset($decaiss_ttc[$case]) && $decaiss_ttc[$case] != 0)
 			{
 				print '<a href="clientfourn.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price(price2num($decaiss_ttc[$case], 'MT')).'</a>';
@@ -1063,8 +1056,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				$totentrees[$annee] += $encaiss[$case];
 			}
 		}
-		else
-		{
+		else {
 			if (isset($encaiss_ttc[$case]))
 			{
 				print '<a href="clientfourn.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price(price2num($encaiss_ttc[$case], 'MT')).'</a>';
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 66adea3371f..172929aabff 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -178,7 +178,7 @@ if ($modecompta == "CREANCES-DETTES")
 	//$periodlink='<a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
 	$description = $langs->trans("RulesResultDue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-	else  $description .= $langs->trans("DepositsAreIncluded");
+	else $description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
 }
@@ -375,7 +375,7 @@ elseif ($modecompta == "BOOKKEEPING")
 				print "</tr>\n";
 
 				//var_dump($sommes);
-			} else            // normal category
+			} else // normal category
 			{
 				$code = $cat['code']; // Category code we process
 
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index d7f20622a43..0cb706d3177 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -129,8 +129,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')
 		header("Location: list.php");
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -166,8 +165,7 @@ if ($action == 'add' && $user->rights->tax->charges->creer)
 		setEventMessages($langs->trans("ErrorFieldMustBeANumeric", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
 	}
-	else
-	{
+	else {
 		$object->type = $actioncode;
 		$object->label = GETPOST('label', 'alpha');
 		$object->date_ech = $dateech;
@@ -211,8 +209,7 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->cre
 		setEventMessages($langs->trans("ErrorFieldMustBeANumeric", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
 	}
-	else
-	{
+	else {
 		$result = $object->fetch($id);
 
 		$object->date_ech = $dateech;
@@ -272,8 +269,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
 				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 				exit;
 			}
-			else
-			{
+			else {
 				$id = $originalId;
 				$db->rollback();
 
@@ -281,8 +277,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
 			}
 		}
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		dol_print_error($db, $object->error);
 	}
@@ -432,8 +427,7 @@ if ($id > 0)
 			{
 				$formquestion[] = array('type' => 'checkbox', 'name' => 'clone_for_next_month', 'label' => $langs->trans("CloneTaxForNextMonth"), 'value' => 1);
 			}
-			else
-			{
+			else {
 				$formquestion[] = array('type' => 'date', 'name' => 'clone_date_ech', 'label' => $langs->trans("Date"), 'value' => -1);
 				$formquestion[] = array('type' => 'date', 'name' => 'clone_period', 'label' => $langs->trans("PeriodEndDate"), 'value' => -1);
 			}
@@ -536,8 +530,7 @@ if ($id > 0)
 		{
 			print $form->selectDate($object->periode, 'period', 0, 0, 0, 'charge', 1);
 		}
-		else
-		{
+		else {
 			print dol_print_date($object->periode, "day");
 		}
 		print "</td></tr>";
@@ -675,8 +668,7 @@ if ($id > 0)
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				print '<tr class="oddeven"><td><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 				print '<td></td><td></td><td></td><td></td>';
 				print '</tr>';
@@ -696,8 +688,7 @@ if ($id > 0)
 
 			$db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -768,8 +759,7 @@ if ($id > 0)
 			print "</div>";
 		}
 	}
-	else
-	{
+	else {
 		/* Social contribution not found */
 		dol_print_error('', $object->error);
 	}
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 6d3f4dffa4a..0c709c031d5 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -172,13 +172,11 @@ class ChargeSociales extends CommonObject
 
                 return 1;
             }
-            else
-            {
+            else {
                 return 0;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -258,8 +256,7 @@ class ChargeSociales extends CommonObject
 				return -1 * $error;
 			}
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
@@ -329,8 +326,7 @@ class ChargeSociales extends CommonObject
             $this->db->commit();
             return 1;
         }
-        else
-        {
+        else {
             $this->db->rollback();
             return -1;
         }
@@ -387,8 +383,7 @@ class ChargeSociales extends CommonObject
             $this->db->rollback();
             return -1 * $error;
         }
-        else
-        {
+        else {
             $this->db->commit();
             return 1;
         }
@@ -422,13 +417,11 @@ class ChargeSociales extends CommonObject
                 $this->db->free($result);
                 return $obj->amount;
             }
-            else
-            {
+            else {
                 return 0;
             }
         }
-        else
-        {
+        else {
             print $this->db->error();
             return -1;
         }
@@ -613,8 +606,7 @@ class ChargeSociales extends CommonObject
             $this->db->free($resql);
             return $amount;
         }
-        else
-        {
+        else {
             return -1;
         }
     }
@@ -668,8 +660,7 @@ class ChargeSociales extends CommonObject
 
             $this->db->free($result);
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
         }
     }
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index bae8d28a756..9164ab39f1e 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -200,8 +200,7 @@ class PaymentSocialContribution extends CommonObject
 					}
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 			}
 		}
@@ -216,8 +215,7 @@ class PaymentSocialContribution extends CommonObject
 		    $this->db->commit();
 			return $this->id;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -287,8 +285,7 @@ class PaymentSocialContribution extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -359,8 +356,7 @@ class PaymentSocialContribution extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -415,8 +411,7 @@ class PaymentSocialContribution extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -466,8 +461,7 @@ class PaymentSocialContribution extends CommonObject
 			$this->db->commit();
 			return $object->id;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -578,8 +572,7 @@ class PaymentSocialContribution extends CommonObject
                     }
                 }
             }
-            else
-            {
+            else {
                 $this->error = $acc->error;
                 $error++;
             }
@@ -589,8 +582,7 @@ class PaymentSocialContribution extends CommonObject
         {
             return 1;
         }
-        else
-        {
+        else {
             return -1;
         }
     }
@@ -614,8 +606,7 @@ class PaymentSocialContribution extends CommonObject
 		{
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return 0;
 		}
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 3c73c8e6614..e63c5f354d0 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -164,8 +164,7 @@ if ($object->id)
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
     print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 9d210c23d85..be5f7e6f973 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -81,8 +81,7 @@ if (!GETPOSTISSET('search_typeid'))
 		if ($part[0] == 'cs.fk_type') $search_typeid = $part[1];
 	}
 }
-else
-{
+else {
 	$search_typeid = GETPOST('search_typeid', 'int');
 }
 
@@ -209,8 +208,7 @@ if ($resql)
 		print $countrynotdefined;
 		print '</div>';
 	}
-	else
-	{
+	else {
 	    print '<div class="div-table-responsive">';
 	    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
@@ -314,8 +312,7 @@ if ($resql)
 			{
 				print '<a href="list.php?year='.strftime("%Y", $db->jdate($obj->periode)).'">'.dol_print_date($db->jdate($obj->periode), 'day').'</a>';
 			}
-			else
-			{
+			else {
 				print '&nbsp;';
 			}
 			print "</td>\n";
@@ -346,8 +343,7 @@ if ($resql)
 	}
 	print '</form>';
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index 5cfa5df06ed..05808877df9 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -93,8 +93,7 @@ if ($mode != 'sconly')
     $center = ($year ? '<a href="list.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="list.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'title_accountancy', 0, '', '', $limit, 1);
 }
-else
-{
+else {
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'title_accountancy', 0, '', '', $limit);
 }
 
@@ -209,8 +208,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 	    print '<td class="liste_total right">'.price($totalpaye)."</td>";
 		print "</tr>";
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 	print '</table>';
@@ -288,8 +286,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 		    print "</table>";
 		    $db->free($result);
 		}
-		else
-		{
+		else {
 		    dol_print_error($db);
 		}
 	}
@@ -311,8 +308,7 @@ elseif ($mysoc->localtax2_assuj == "1")
 	$j = 2;
 	$numlt = 3;
 }
-else
-{
+else {
 	$j = 0;
 	$numlt = 0;
 }
@@ -389,8 +385,7 @@ while ($j < $numlt)
 			print "</table>";
 			$db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -473,8 +468,7 @@ if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
 
             print "<br>";
         }
-        else
-        {
+        else {
             dol_print_error($db);
         }
     }
diff --git a/htdocs/compta/stats/byratecountry.php b/htdocs/compta/stats/byratecountry.php
index acd58f90217..3859b19df91 100644
--- a/htdocs/compta/stats/byratecountry.php
+++ b/htdocs/compta/stats/byratecountry.php
@@ -78,8 +78,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	}
-	else
-	{
+	else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 5831467ce63..513b0ffa350 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -104,8 +104,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	}
-	else
-	{
+	else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 4d4f56a1354..6d720b4f96d 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -97,8 +97,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
 	if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
 }
-else
-{
+else {
 	// TODO We define q
 }
 // $date_start and $date_end are defined. We force $year_start and $nbofyear
@@ -154,7 +153,7 @@ if ($modecompta == "CREANCES-DETTES") {
     //$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
     $description = $langs->trans("RulesCADue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-	else  $description .= $langs->trans("DepositsAreIncluded");
+	else $description .= $langs->trans("DepositsAreIncluded");
     $builddate = dol_now();
     //$exportlink=$langs->trans("NotYetAvailable");
 }
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index bec20998cfa..85a27c7574a 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -114,8 +114,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
 	if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
 }
-else
-{
+else {
 	// TODO We define q
 }
 
@@ -180,7 +179,7 @@ if ($modecompta == "CREANCES-DETTES")
 	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
 	$description = $langs->trans("RulesCADue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-	else  $description .= $langs->trans("DepositsAreIncluded");
+	else $description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
 }
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index d1a64e218d2..cfc521c7c13 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -124,7 +124,7 @@ if ($modecompta == "CREANCES-DETTES")
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesCADue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-	else  $description .= $langs->trans("DepositsAreIncluded");
+	else $description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
 }
@@ -260,8 +260,7 @@ if ($modecompta == 'RECETTES-DEPENSES')
 			$i++;
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -340,8 +339,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 					$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
 					print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price($cum_ht[$case], 1).'</a>';
 				}
-				else
-				{
+				else {
 					if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; }
 					else { print '&nbsp;'; }
 				}
@@ -357,8 +355,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				print price($cum[$case], 1);
 				if ($modecompta != 'BOOKKEEPING') print '</a>';
 			}
-			else
-			{
+			else {
 				if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; }
 				else { print '&nbsp;'; }
 			}
@@ -391,8 +388,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 					print '<td class="borderrightlight right">-</td>';
 				}
 			}
-			else
-			{
+			else {
 				print '<td class="borderrightlight right">';
 				if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; }
 				else { print '&nbsp;'; }
@@ -484,8 +480,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 		{
 			print '<td class="nowrap right">'.($total_ht[$annee] ?price($total_ht[$annee]) : "0")."</td>";
 		}
-		else
-		{
+		else {
 			print '<td>&nbsp;</td>';
 		}
 	}
@@ -495,8 +490,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 	{
 		print '<td class="nowrap right">'.($total[$annee] ?price($total[$annee]) : "0")."</td>";
 	}
-	else
-	{
+	else {
 		print '<td>&nbsp;</td>';
 	}
 
@@ -520,8 +514,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 			print '<td class="borderrightlight right">+0%</td>';
 		}
 	}
-	else
-	{
+	else {
 		print '<td class="borderrightlight right">';
 		if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; }
 		else { print '&nbsp;'; }
diff --git a/htdocs/compta/stats/supplier_turnover.php b/htdocs/compta/stats/supplier_turnover.php
index 3ff41f4d114..e9e0ec5926c 100644
--- a/htdocs/compta/stats/supplier_turnover.php
+++ b/htdocs/compta/stats/supplier_turnover.php
@@ -290,8 +290,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 					$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
 					print '<a href="supplier_turnover_by_thirdparty.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price($cum_ht[$case], 1).'</a>';
 				}
-				else
-				{
+				else {
 					if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; }
 					else { print '&nbsp;'; }
 				}
@@ -307,8 +306,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				print price($cum[$case], 1);
 				if ($modecompta != 'BOOKKEEPING') print '</a>';
 			}
-			else
-			{
+			else {
 				if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; }
 				else { print '&nbsp;'; }
 			}
@@ -341,8 +339,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 					print '<td class="borderrightlight right">-</td>';
 				}
 			}
-			else
-			{
+			else {
 				print '<td class="borderrightlight right">';
 				if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; }
 				else { print '&nbsp;'; }
@@ -369,8 +366,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 		{
 			print '<td class="nowrap right">'.($total_ht[$annee] ?price($total_ht[$annee]) : "0")."</td>";
 		}
-		else
-		{
+		else {
 			print '<td>&nbsp;</td>';
 		}
 	}
@@ -380,8 +376,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 	{
 		print '<td class="nowrap right">'.($total[$annee] ?price($total[$annee]) : "0")."</td>";
 	}
-	else
-	{
+	else {
 		print '<td>&nbsp;</td>';
 	}
 
@@ -405,8 +400,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 			print '<td class="borderrightlight right">+0%</td>';
 		}
 	}
-	else
-	{
+	else {
 		print '<td class="borderrightlight right">';
 		if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; }
 		else { print '&nbsp;'; }
diff --git a/htdocs/compta/stats/supplier_turnover_by_prodserv.php b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
index fafb967ace1..9b25488c280 100644
--- a/htdocs/compta/stats/supplier_turnover_by_prodserv.php
+++ b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
@@ -101,8 +101,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	}
-	else
-	{
+	else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index fcae12f744b..76f9c246e87 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -108,8 +108,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
 	if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
 }
-else
-{
+else {
 	// TODO We define q
 }
 
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 658c9353a00..3df7419019a 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -132,8 +132,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 			header("Location: list.php");
 			exit;
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = "create";
@@ -167,21 +166,18 @@ if ($action == 'delete')
 				header("Location: ".DOL_URL_ROOT.'/compta/tva/list.php');
 				exit;
 			}
-			else
-			{
+			else {
 				$object->error = $accountline->error;
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 	    }
-	    else
-	    {
+	    else {
 	        $db->rollback();
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
-	else
-	{
+	else {
 		$mesg = 'Error try do delete a line linked to a conciliated bank transaction';
 		setEventMessages($mesg, null, 'errors');
 	}
@@ -389,13 +385,11 @@ if ($id)
 		{
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a></div>';
 		}
-		else
-		{
+		else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("NotAllowed"))).'">'.$langs->trans("Delete").'</a></div>';
 		}
 	}
-	else
-	{
+	else {
 		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("LinkedToAConciliatedTransaction").'">'.$langs->trans("Delete").'</a></div>';
 	}
 	print "</div>";
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index c01408f3c9a..baeaff7a5d6 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -151,14 +151,12 @@ class Tva extends CommonObject
             	$this->db->commit();
             	return $this->id;
             }
-            else
-			{
+            else {
 				$this->db->rollback();
 				return -1;
             }
         }
-        else
-		{
+        else {
 			$this->error = "Error ".$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -225,8 +223,7 @@ class Tva extends CommonObject
     		$this->db->commit();
     		return 1;
     	}
-    	else
-    	{
+    	else {
     		$this->db->rollback();
     		return -1;
     	}
@@ -294,8 +291,7 @@ class Tva extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -405,14 +401,12 @@ class Tva extends CommonObject
                 $this->db->free($result);
                 return $ret;
             }
-            else
-			{
+            else {
                 $this->db->free($result);
 				return 0;
             }
         }
-        else
-        {
+        else {
             print $this->db->lasterror();
             return -1;
         }
@@ -446,14 +440,12 @@ class Tva extends CommonObject
             	$this->db->free($result);
                 return $ret;
             }
-            else
-			{
+            else {
             	$this->db->free($result);
 				return 0;
             }
         }
-        else
-        {
+        else {
             print $this->db->lasterror();
             return -1;
         }
@@ -489,14 +481,12 @@ class Tva extends CommonObject
             	$this->db->free($result);
                 return $ret;
             }
-            else
-			{
+            else {
             	$this->db->free($result);
 				return 0;
             }
         }
-        else
-        {
+        else {
             print $this->db->lasterror();
             return -1;
         }
@@ -613,8 +603,7 @@ class Tva extends CommonObject
 					{
                         $this->update_fk_bank($bank_line_id);
                     }
-					else
-					{
+					else {
 						$this->error = $acc->error;
 						$ok = 0;
 					}
@@ -633,20 +622,17 @@ class Tva extends CommonObject
 					$this->db->commit();
 					return $this->id;
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					return -3;
 				}
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 return -2;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
@@ -670,8 +656,7 @@ class Tva extends CommonObject
 		{
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -753,8 +738,7 @@ class Tva extends CommonObject
             $this->db->free($resql);
             return $amount;
         }
-        else
-        {
+        else {
             return -1;
         }
     }
@@ -800,8 +784,7 @@ class Tva extends CommonObject
 
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index bcedba7a074..158c974114d 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -67,8 +67,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
     if (empty($q))
     {
         if (GETPOST("month", 'int')) { $date_start = dol_get_first_day($year_start, GETPOST("month", 'int'), false); $date_end = dol_get_last_day($year_start, GETPOST("month", 'int'), false); }
-        else
-        {
+        else {
             if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
             	$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
             	$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
@@ -92,8 +91,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
             }
         }
     }
-    else
-    {
+    else {
         if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
         if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
         if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -322,8 +320,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
                     'link'				=>$expensereport->getNomUrl(1)
                 );
             }
-            else
-            {
+            else {
                 $invoice_supplier->id = $x_paye[$my_paye_thirdpartyid]['facid'][$id];
                 $invoice_supplier->ref = $x_paye[$my_paye_thirdpartyid]['facnum'][$id];
                 $invoice_supplier->type = $x_paye[$my_paye_thirdpartyid]['type'][$id];
@@ -694,8 +691,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
                         {
                             print $langs->trans("NA");
                         }
-                        else
-                        {
+                        else {
                             if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
                                 $ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
                             }
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index fabaf1ee705..45efc9681d8 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -149,8 +149,7 @@ if ($object->id)
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
     print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index 0a785aa78cd..c85f2bbdb8f 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -58,8 +58,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	if (empty($q))
 	{
 		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); }
-		else
-		{
+		else {
 			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
 				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
 				$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
@@ -83,8 +82,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			}
 		}
 	}
-	else
-	{
+	else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -177,8 +175,7 @@ function pt($db, $sql, $date)
             	$previousmode = '';
             	$previousmonth = '';
             }
-            else
-            {
+            else {
             	$previousmode = $obj->mode;
             	$previousmonth = $obj->dm;
             }
@@ -372,8 +369,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 				//'link'				=>$expensereport->getNomUrl(1)
 				);
 			}
-			else
-			{
+			else {
 				//$invoice_supplier->id=$x_paye[$my_paye_rate]['facid'][$id];
 				//$invoice_supplier->ref=$x_paye[$my_paye_rate]['facnum'][$id];
 				//$invoice_supplier->type=$x_paye[$my_paye_rate]['type'][$id];
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 003a7eabcad..98eede887c8 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -73,8 +73,7 @@ if (empty($_REQUEST['typeid']))
 		if ($part[0] == 't.fk_typepayment') $typeid = $part[1];
 	}
 }
-else
-{
+else {
 	$typeid = $_REQUEST['typeid'];
 }
 
@@ -229,8 +228,7 @@ if ($result)
 		{
 			$type = '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
 		}
-		else
-		{
+		else {
 			$type = '<td>&nbsp;</td>';
 		}
 
@@ -292,8 +290,7 @@ if ($result)
 
     $db->free($result);
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index 79ee69a030c..6e16165ab6c 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -67,8 +67,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	if (empty($q))
 	{
 		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); }
-		else
-		{
+		else {
 			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
 				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
 				$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
@@ -92,8 +91,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			}
 		}
 	}
-	else
-	{
+	else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -316,8 +314,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 				'link'				=>$expensereport->getNomUrl(1)
 				);
 			}
-			else
-			{
+			else {
 				$invoice_supplier->id = $x_paye[$my_paye_rate]['facid'][$id];
 				$invoice_supplier->ref = $x_paye[$my_paye_rate]['facnum'][$id];
 				$invoice_supplier->type = $x_paye[$my_paye_rate]['type'][$id];
@@ -440,8 +437,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 						print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 					}
 				}
-				else
-				{
+				else {
 					if ($type) {
 						$text = img_object($langs->trans('Service'), 'service');
 					} else {
@@ -621,8 +617,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 						print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 					}
 				}
-				else
-				{
+				else {
 					if ($type) {
 						$text = img_object($langs->trans('Service'), 'service');
 					} else {
@@ -674,8 +669,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 					{
 						print $langs->trans("NA");
 					}
-					else
-					{
+					else {
 						if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
 							$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
 						}
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 625cf524169..874a964a965 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -77,8 +77,7 @@ if (GETPOST('actioncode', 'array'))
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
 }
-else
-{
+else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -160,8 +159,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
    	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
     $objcanvas->display_canvas($action); // Show template
 }
-else
-{
+else {
     // -----------------------------------------
     // When used in standard mode
     // -----------------------------------------
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index fbd31812fe8..e005d3dca7b 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -120,8 +120,7 @@ abstract class ActionsContactCardCommon
         		$this->tpl['company'] = $objsoc->getNomUrl(1);
         		$this->tpl['company_id'] = $objsoc->id;
         	}
-        	else
-        	{
+        	else {
         		$this->tpl['company'] = $form->select_company($this->object->socid, 'socid', '', 1);
         	}
 
@@ -223,8 +222,7 @@ abstract class ActionsContactCardCommon
         		$objsoc->fetch($this->object->socid);
         		$this->tpl['company'] = $objsoc->getNomUrl(1);
         	}
-        	else
-        	{
+        	else {
         		$this->tpl['company'] = $langs->trans("ContactNotLinkedToCompany");
         	}
 
@@ -310,8 +308,7 @@ abstract class ActionsContactCardCommon
             {
                 $obj = $this->db->fetch_object($resql);
             }
-            else
-            {
+            else {
                 dol_print_error($this->db);
             }
             $this->object->country_id = $langs->trans("Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->label;
diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
index 54b3f137967..6ac81ac8bd4 100644
--- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php
+++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
@@ -105,8 +105,7 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
 
             $this->tpl['actionsdone'] = show_actions_done($conf, $langs, $db, $objsoc, $this->object, 1);
 		}
-		else
-		{
+		else {
 			// Confirm delete contact
         	if ($action == 'delete' && $user->rights->societe->contact->supprimer)
         	{
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index a6e5bee1898..885878138ba 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -129,20 +129,17 @@ if (empty($reshook))
                 {
                     $db->commit();
                 }
-                else
-                {
+                else {
                     $error = $nuser->error; $errors = $nuser->errors;
                     $db->rollback();
                 }
             }
-            else
-            {
+            else {
                 $error = $nuser->error; $errors = $nuser->errors;
                 $db->rollback();
             }
         }
-        else
-        {
+        else {
             $error = $object->error; $errors = $object->errors;
         }
     }
@@ -156,8 +153,7 @@ if (empty($reshook))
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-		else
-		{
+		else {
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
 			exit;
 		}
@@ -171,8 +167,7 @@ if (empty($reshook))
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-		else
-		{
+		else {
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
 			exit;
 		}
@@ -278,8 +273,7 @@ if (empty($reshook))
             header("Location: ".$url);
             exit;
         }
-        else
-        {
+        else {
             $db->rollback();
         }
     }
@@ -300,14 +294,12 @@ if (empty($reshook))
         		header("Location: ".$backtopage);
         		exit;
         	}
-        	else
-        	{
+        	else {
         		header("Location: ".DOL_URL_ROOT.'/contact/list.php');
         		exit;
         	}
         }
-        else
-        {
+        else {
             setEventMessages($object->error, $object->errors, 'errors');
         }
     }
@@ -351,8 +343,7 @@ if (empty($reshook))
                         {
                             $errors[] = "ErrorFailedToSaveFile";
                         }
-                        else
-                        {
+                        else {
                             $object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
 
     					    // Create thumbs
@@ -360,13 +351,11 @@ if (empty($reshook))
                         }
                     }
                 }
-                else
-                {
+                else {
                     $errors[] = "ErrorBadImageFormat";
                 }
             }
-            else
-            {
+            else {
                 switch ($_FILES['photo']['error'])
                 {
                     case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
@@ -452,8 +441,7 @@ if (empty($reshook))
 	    						}
 	    					}
 	    				}
-	    				else
-	    				{
+	    				else {
 	    					$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = '".$db->escape($object->email)."' AND entity = ".$db->escape(getEntity('mailing', 0));
 	    					$resql = $db->query($sql);
 	    				}
@@ -465,8 +453,7 @@ if (empty($reshook))
     				$object->old_firstname = '';
     				$action = 'view';
     			}
-    			else
-    			{
+    			else {
     				setEventMessages($object->error, $object->errors, 'errors');
     				$action = 'edit';
     			}
@@ -526,8 +513,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
    	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
     $objcanvas->display_canvas($action); // Show template
 }
-else
-{
+else {
     // -----------------------------------------
     // When used in standard mode
     // -----------------------------------------
@@ -703,8 +689,7 @@ else
                 {
                     print '<tr><td><label for="state_id">'.$langs->trans('Region-State').'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
                 }
-                else
-                {
+                else {
                     print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
                 }
 
@@ -712,8 +697,7 @@ else
                 {
                     print $formcompany->select_state(GETPOST("state_id", 'alpha') ? GETPOST("state_id", 'alpha') : $object->state_id, $object->country_code, 'state_id');
                 }
-                else
-                {
+                else {
                     print $countrynotdefined;
                 }
                 print '</td></tr>';
@@ -871,8 +855,7 @@ else
             {
                 print $form->selectDate($object->birthday, 'birthday', 0, 0, 0, "perso", 1, 0);
             }
-            else
-            {
+            else {
                 print $form->selectDate('', 'birthday', 0, 0, 1, "perso", 1, 0);
             }
             print '</td>';
@@ -882,8 +865,7 @@ else
             {
                 print '<input type="checkbox" name="birthday_alert" id="birthday_alert" checked>';
             }
-            else
-            {
+            else {
                 print '<input type="checkbox" name="birthday_alert" id="birthday_alert">';
             }
             print '</td>';
@@ -900,8 +882,7 @@ else
                 print ' &nbsp; &nbsp; ';
                 print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
             }
-            else
-            {
+            else {
                 print ' &nbsp; &nbsp; ';
                 print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
             }
@@ -1031,8 +1012,7 @@ else
                 {
                     print '<tr><td><label for="state_id">'.$langs->trans('Region-State').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
                 }
-                else
-                {
+                else {
                     print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
                 }
 
@@ -1070,8 +1050,7 @@ else
                 print '<td class="nowrap">'.$langs->trans("NbOfEMailingsSend").'</td>';
                 print '<td>'.$object->getNbOfEMailings().'</td>';
             }
-            else
-			{
+            else {
 				print '<td colspan="2"></td>';
             }
             print '</tr>';
@@ -1096,8 +1075,7 @@ else
             	print '<td><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
 	            print '<td>'.$form->selectyesno('no_email', (GETPOSTISSET("no_email") ?GETPOST("no_email", 'alpha') : $noemail), 1).'</td>';
             }
-            else
-			{
+            else {
 				print '<td colspan="2"></td>';
 			}
             print '</tr>';
@@ -1479,8 +1457,7 @@ else
 					$langs->load("mails");
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
 				}
-				else
-				{
+				else {
 					$langs->load("mails");
 					print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
 				}
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index d9753001db2..fc640e7e032 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -288,8 +288,7 @@ class Contact extends CommonObject
 			$this->db->free($resql);
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -389,15 +388,13 @@ class Contact extends CommonObject
                 $this->db->commit();
                 return $this->id;
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
                 return -2;
             }
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 
 			$this->db->rollback();
@@ -597,15 +594,13 @@ class Contact extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				dol_syslog(get_class($this)."::update Error ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -$error;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror().' sql='.$sql;
             $this->db->rollback();
 			return -1;
@@ -762,13 +757,11 @@ class Contact extends CommonObject
                     $this->error = $this->db->lasterror();
 				}
 			}
-			else
-			{
+			else {
 				$result = true;
 			}
 		}
-		else
-		{
+		else {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_alert ";
 			$sql .= "WHERE type=1 AND fk_contact=".$this->db->escape($id)." AND fk_user=".$user->id;
 			$result = $this->db->query($sql);
@@ -792,8 +785,7 @@ class Contact extends CommonObject
 		    $this->db->commit();
 		    return 1;
 		}
-		else
-		{
+		else {
 		    dol_syslog(get_class($this)."::update Error ".$this->error, LOG_ERR);
 		    $this->db->rollback();
 		    return -$error;
@@ -846,8 +838,7 @@ class Contact extends CommonObject
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON c.rowid = u.fk_socpeople";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
 		if ($id) $sql .= " WHERE c.rowid = ".$id;
-		else
-		{
+		else {
 			$sql .= " WHERE c.entity IN (".getEntity($this->element).")";
 			if ($ref_ext) {
 				$sql .= " AND c.ref_ext = '".$this->db->escape($ref_ext)."'";
@@ -943,8 +934,7 @@ class Contact extends CommonObject
 					}
 					$this->db->free($resql);
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->error();
 					return -1;
 				}
@@ -971,8 +961,7 @@ class Contact extends CommonObject
 						}
 						$this->db->free($resql);
 					}
-					else
-					{
+					else {
 						$this->error = $this->db->error();
 						return -1;
 					}
@@ -988,14 +977,12 @@ class Contact extends CommonObject
 
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = $langs->trans("RecordNotFound");
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1062,8 +1049,7 @@ class Contact extends CommonObject
 			$this->db->free($resql);
 			return 0;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1119,8 +1105,7 @@ class Contact extends CommonObject
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$this->error = $this->db->error().' sql='.$sql;
 			}
@@ -1187,8 +1172,7 @@ class Contact extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			dol_syslog("Error ".$this->error, LOG_ERR);
 			return -1;
@@ -1236,8 +1220,7 @@ class Contact extends CommonObject
 
 			$this->db->free($resql);
 		}
-		else
-		{
+		else {
 			print $this->db->error();
 		}
 	}
@@ -1263,8 +1246,7 @@ class Contact extends CommonObject
 			$this->db->free($resql);
 			return $nb;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1526,8 +1508,7 @@ class Contact extends CommonObject
 			$this->db->rollback();
 			return -$error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1681,8 +1662,7 @@ class Contact extends CommonObject
 
 			return $tab;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			dol_print_error($this->db);
 			return -1;
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index ad4b5ca08f5..ff3570e7e82 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -424,8 +424,7 @@ if ($sql_select)
 		{
 			print $documentstaticline->getLibStatut(2);
 		}
-		else
-		{
+		else {
 			print $documentstatic->getLibStatut(2);
 		}
 		print '</td>';
@@ -468,8 +467,7 @@ if ($sql_select)
 
 				$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
 			}
-			else
-			{
+			else {
 				$label = $objp->product_label;
 			}
 
@@ -516,14 +514,12 @@ if ($sql_select)
 					// Add date of deposit
 					if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
 				}
-				else
-				{
+				else {
 					echo ($txt ? ' - ' : '').dol_htmlentitiesbr($objp->description);
 				}
 			}
 		}
-		else
-		{
+		else {
 			if ($objp->fk_product > 0) {
 				echo $form->textwithtooltip($text, $description, 3, '', '', $i, 0, '');
 
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index 842d03cb3a6..7934bbd5996 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -68,8 +68,7 @@ if ($action == 'dolibarr2ldap')
 		setEventMessages($langs->trans("ContactSynchronized"), null, 'mesgs');
 		$db->commit();
 	}
-	else
-	{
+	else {
 		setEventMessages($ldap->error, $ldap->errors, 'errors');
 		$db->rollback();
 	}
@@ -107,8 +106,7 @@ if ($object->socid > 0)
 
 	print '<tr><td class="titlefield">'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$thirdparty->getNomUrl(1).'</td></tr>';
 }
-else
-{
+else {
 	print '<tr><td class="titlefield">'.$langs->trans("ThirdParty").'</td><td colspan="3">';
 	print $langs->trans("ContactNotLinkedToCompany");
 	print '</td></tr>';
@@ -184,21 +182,18 @@ if ($result > 0)
 		{
 			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
 		}
-		else
-		{
+		else {
 			$result = show_ldap_content($records, 0, $records['count'], true);
 		}
 	}
-	else
-	{
+	else {
 		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
 	}
 
 	$ldap->unbind();
 	$ldap->close();
 }
-else
-{
+else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
 
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 9e7485d189f..a6add5c7d75 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -327,8 +327,7 @@ if ($search_priv != '0' && $search_priv != '1')
 {
 	$sql .= " AND (p.priv='0' OR (p.priv='1' AND p.fk_user_creat=".$user->id."))";
 }
-else
-{
+else {
 	if ($search_priv == '0') $sql .= " AND p.priv='0'";
 	if ($search_priv == '1') $sql .= " AND (p.priv='1' AND p.fk_user_creat=".$user->id.")";
 }
@@ -404,8 +403,7 @@ if ($view == "recent")
 {
 	$sql .= $db->order("p.datec", "DESC");
 }
-else
-{
+else {
 	$sql .= $db->order($sortfield, $sortorder);
 }
 
@@ -923,8 +921,7 @@ while ($i < min($num, $limit))
 		    $objsoc->fetch($obj->socid);
 		    print $objsoc->getNomUrl(1);
 		}
-		else
-			print '&nbsp;';
+		else print '&nbsp;';
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 5a6ea3eb032..5665030b6d5 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -86,20 +86,17 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->societe->contact-
 					{
 						setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 					}
-					else
-					{
+					else {
 					    // Create thumbs
 					    $object->addThumbs($newfile);
 					}
 				}
 			}
-			else
-			{
+			else {
 				setEventMessages("ErrorBadImageFormat", null, 'errors');
 			}
 		}
-		else
-		{
+		else {
 			switch ($_FILES['photo']['error'])
 			{
 				case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
@@ -112,8 +109,7 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->societe->contact-
 			}
 		}
 	}
-	else
-	{
+	else {
 		$error = $object->error;
 	}
 }
@@ -184,8 +180,7 @@ if ($action == 'edit')
 
             print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td>';
         }
-        else
-        {
+        else {
             print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
             print $langs->trans("ContactNotLinkedToCompany");
             print '</td></tr>';
@@ -208,8 +203,7 @@ if ($action == 'edit')
     {
         print '<input type="checkbox" name="birthday_alert" checked></td>';
     }
-    else
-    {
+    else {
         print '<input type="checkbox" name="birthday_alert"></td>';
     }
     print '</tr>';
@@ -226,8 +220,7 @@ if ($action == 'edit')
 
     print "</form>";
 }
-else
-{
+else {
     // View mode
 
     dol_fiche_head($head, 'perso', $title, -1, 'contact');
@@ -302,8 +295,7 @@ else
         else print $langs->trans("BirthdayAlertOff");
         print '</td>';
     }
-    else
-    {
+    else {
         print '<td>'.$langs->trans("DateToBirth").'</td><td colspan="3"></td>';
     }
     print "</tr>";
diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php
index 75362491424..ee325317033 100644
--- a/htdocs/contact/vcard.php
+++ b/htdocs/contact/vcard.php
@@ -102,8 +102,7 @@ if ($company->id)
 		$v->setEmail($company->email, 'INTERNET');
 	}
 	// when e-mail of contact and company complete different use company e-mail at first (and contact e-mail at second)
-	else
-	{
+	else {
 		$v->setEmail($company->email);
 
 		// support by Microsoft Outlook (2019 and possible earlier)
diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index 0055b0ba428..36a9c950069 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -40,8 +40,7 @@ if (GETPOST('actioncode', 'array'))
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
 }
-else
-{
+else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 9f825cdf009..7a2f8cf311f 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -133,8 +133,7 @@ if (empty($reshook))
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -303,8 +302,7 @@ if (empty($reshook))
 
 										$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $lines[$i]->product_label;
 									}
-									else
-									{
+									else {
 										$label = $lines[$i]->product_label;
 									}
 									$desc = ($lines[$i]->desc && $lines[$i]->desc != $lines[$i]->libelle) ?dol_htmlentitiesbr($lines[$i]->desc) : '';
@@ -355,8 +353,7 @@ if (empty($reshook))
 							}
 						}
 					}
-					else
-					{
+					else {
 						setEventMessages($srcobject->error, $srcobject->errors, 'errors');
 						$error++;
 					}
@@ -368,14 +365,12 @@ if (empty($reshook))
 					if ($reshook < 0)
 						$error++;
 				}
-				else
-				{
+				else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 				}
 			}
-			else
-			{
+			else {
 				$result = $object->create($user);
 				if ($result > 0)
 				{
@@ -408,8 +403,7 @@ if (empty($reshook))
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0);
 		}
-		else
-		{
+		else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
@@ -514,8 +508,7 @@ if (empty($reshook))
 					{
 						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
 					}
-					else
-				    {
+					else {
 						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 					}
 				}
@@ -526,8 +519,7 @@ if (empty($reshook))
 
 				$fk_unit = $prod->fk_unit;
 			}
-			else
-			{
+			else {
 				$pu_ht = GETPOST('price_ht');
 				$price_base_type = 'HT';
 				$tva_tx = GETPOST('tva_tx') ?str_replace('*', '', GETPOST('tva_tx')) : 0; // tva_tx field may be disabled, so we use vat rate 0
@@ -543,8 +535,7 @@ if (empty($reshook))
 			$fk_fournprice = $_POST['fournprice'];
 			if (!empty($_POST['buying_price']))
 			  $pa_ht = $_POST['buying_price'];
-			else
-			  $pa_ht = null;
+			else $pa_ht = null;
 
 			$info_bits = 0;
 			if ($tva_npr) $info_bits |= 0x01;
@@ -555,8 +546,7 @@ if (empty($reshook))
 				$object->error = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
 				$result = -1;
 			}
-			else
-			{
+			else {
 				// Insert line
 				$result = $object->addline(
 					$desc,
@@ -630,8 +620,7 @@ if (empty($reshook))
 				unset($_POST['date_endmonth']);
 				unset($_POST['date_endyear']);
 			}
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -692,8 +681,7 @@ if (empty($reshook))
 			$fk_fournprice = $_POST['fournprice'];
 			if (!empty($_POST['buying_price']))
 			  $pa_ht = $_POST['buying_price'];
-			else
-			  $pa_ht = null;
+			else $pa_ht = null;
 
 			$fk_unit = GETPOST('unit', 'alpha');
 
@@ -745,8 +733,7 @@ if (empty($reshook))
 		{
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 		}
 	}
@@ -760,8 +747,7 @@ if (empty($reshook))
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -789,8 +775,7 @@ if (empty($reshook))
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -832,8 +817,7 @@ if (empty($reshook))
 			header("Location: list.php?restore_lastsearch_values=1");
 			return;
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -851,13 +835,11 @@ if (empty($reshook))
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 				return;
 			}
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("RefNewContract")), null, 'errors');
 		}
 	}
@@ -1015,15 +997,13 @@ if (empty($reshook))
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
-			else
-			{
+			else {
 				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 				}
-				else
-				{
+				else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
@@ -1058,8 +1038,7 @@ if (empty($reshook))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		}
-		else
-		{
+		else {
 			if ($object->id > 0) {
 				$result = $object->createFromClone($user, $socid);
 				if ($result > 0) {
@@ -1120,8 +1099,7 @@ if ($action == 'create')
 		{
 			$projectid = GETPOST('originid');
 		}
-		else
-		{
+		else {
 			// For compatibility
 			if ($element == 'order' || $element == 'commande') { $element = $subelement = 'commande'; }
 			if ($element == 'propal') { $element = 'comm/propal'; $subelement = 'propal'; }
@@ -1196,8 +1174,7 @@ if ($action == 'create')
 		print '<input type="hidden" name="socid" value="'.$soc->id.'">';
 		print '</td>';
 	}
-	else
-	{
+	else {
 		print '<td>';
 		print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300');
 		print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="valignmiddle text-plus-circle">'.$langs->trans("AddThirdParty").'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
@@ -1292,8 +1269,7 @@ if ($action == 'create')
 
 	print "</form>\n";
 }
-else
-/* *************************************************************************** */
+else /* *************************************************************************** */
 /*                                                                             */
 /* Mode vue et edition                                                         */
 /*                                                                             */
@@ -1600,8 +1576,7 @@ else
 
 						print '</td>';
 					}
-					else
-					{
+					else {
 						print '<td>'.img_object($langs->trans("ShowProductOrService"), ($objp->product_type ? 'service' : 'product')).' '.dol_htmlentitiesbr($objp->description)."</td>\n";
 					}
 					// VAT
@@ -1623,8 +1598,7 @@ else
 					{
 						print '<td class="right">'.$objp->remise_percent."%</td>\n";
 					}
-					else
-					{
+					else {
 						print '<td>&nbsp;</td>';
 					}
 
@@ -1709,8 +1683,7 @@ else
 					}
 				}
 				// Line in mode update
-				else
-				{
+				else {
 					// Ligne carac
 					print '<tr class="oddeven">';
 					print '<td>';
@@ -1724,8 +1697,7 @@ else
 						print $objp->label ? ' - '.dol_trunc($objp->label, 32) : '';
 						print '<br>';
 					}
-					else
-					{
+					else {
 						print $objp->label ? $objp->label.'<br>' : '';
 					}
 
@@ -1802,8 +1774,7 @@ else
 
 				$db->free($result);
 			}
-			else
-			{
+			else {
 				dol_print_error($db);
 			}
 
@@ -1874,8 +1845,7 @@ else
 				{
 					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEndReal")), null, 'errors');
 				}
-				else
-				{
+				else {
 					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne', 'int')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService", dol_print_date($dateactend, "%A %d %B %Y")), "confirm_closeline", '', 0, 1);
 				}
 				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
@@ -2112,8 +2082,7 @@ else
 					if ($object->statut == 1) {
 						if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-						} else
-							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
+						} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
 					}
 				}
 
@@ -2153,8 +2122,7 @@ else
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" id="btnactivateall" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=activate">'.$langs->trans("ActivateAllContracts").'</a></div>';
 					}
-					else
-					{
+					else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" id="btnactivateall" href="#">'.$langs->trans("ActivateAllContracts").'</a></div>';
 					}
 				}
@@ -2164,8 +2132,7 @@ else
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" id="btncloseall" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=close">'.$langs->trans("CloseAllContracts").'</a></div>';
 					}
-					else
-					{
+					else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" id="btncloseall" href="#">'.$langs->trans("CloseAllContracts").'</a></div>';
 					}
 
@@ -2185,8 +2152,7 @@ else
 				{
 					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a></div>';
 				}
-				else
-				{
+				else {
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("Delete").'</a></div>';
 				}
 			}
diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php
index a35d3c871de..9caa33fca2d 100644
--- a/htdocs/contrat/class/api_contracts.class.php
+++ b/htdocs/contrat/class/api_contracts.class.php
@@ -465,8 +465,7 @@ class Contracts extends DolibarrApi
         if ($updateRes > 0) {
             return $this->get($id);
         }
-        else
-        {
+        else {
               throw new RestException(405, $this->contract->error);
         }
     }
@@ -502,8 +501,7 @@ class Contracts extends DolibarrApi
         {
             return $this->get($id);
         }
-        else
-        {
+        else {
             throw new RestException(500, $this->contract->error);
         }
     }
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 1dec473edac..304628d97cc 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -299,15 +299,13 @@ class Contrat extends CommonObject
 			{
 				return $numref;
 			}
-			else
-			{
+			else {
 				$this->error = $obj->error;
 				dol_print_error($db, get_class($this)."::getNextValue ".$obj->error);
 				return "";
 			}
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Contract"));
 			return "";
@@ -411,8 +409,7 @@ class Contrat extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -468,8 +465,7 @@ class Contrat extends CommonObject
             $this->db->commit();
             return 1;
         }
-        else
-        {
+        else {
             $this->db->rollback();
             return -1;
         }
@@ -513,8 +509,7 @@ class Contrat extends CommonObject
 		{
 			$num = $this->getNextNumRef($this->thirdparty);
 		}
-		else
-		{
+		else {
 			$num = $this->ref;
 		}
         $this->newref = dol_sanitizeFileName($num);
@@ -592,8 +587,7 @@ class Contrat extends CommonObject
 				$this->date_validation = $now;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 		}
 
@@ -602,8 +596,7 @@ class Contrat extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -667,8 +660,7 @@ class Contrat extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -771,15 +763,13 @@ class Contrat extends CommonObject
 					return $this->id;
 				}
 			}
-			else
-			{
+			else {
 				dol_syslog(get_class($this)."::fetch Contract not found");
 				$this->error = "Contract not found";
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog(get_class($this)."::fetch Error searching contract");
 			$this->error = $this->db->error();
 			return -1;
@@ -940,8 +930,7 @@ class Contrat extends CommonObject
 			}
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_syslog(get_class($this)."::Fetch Error when reading lines of contracts linked to products");
 			return -3;
 		}
@@ -1082,7 +1071,7 @@ class Contrat extends CommonObject
     			                }
     			            }
     			        }
-    			        else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+    			        else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
     			        {
     			            $origin_id = $tmp_origin_id;
     			            $ret = $this->add_object_linked($origin, $origin_id);
@@ -1146,23 +1135,20 @@ class Contrat extends CommonObject
 					$this->db->commit();
 					return $this->id;
 				}
-				else
-				{
+				else {
 					dol_syslog(get_class($this)."::create - 30 - ".$this->error, LOG_ERR);
 					$this->db->rollback();
 					return -3;
 				}
 			}
-			else
-			{
+			else {
 				$this->error = "Failed to add contract";
 				dol_syslog(get_class($this)."::create - 20 - ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $langs->trans("UnknownError: ".$this->db->error()." -", LOG_DEBUG);
 
 			$this->db->rollback();
@@ -1332,8 +1318,7 @@ class Contrat extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1427,8 +1412,7 @@ class Contrat extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1506,8 +1490,7 @@ class Contrat extends CommonObject
 			{
 				$pu = $pu_ht;
 			}
-			else
-			{
+			else {
 				$pu = $pu_ttc;
 			}
 
@@ -1559,8 +1542,7 @@ class Contrat extends CommonObject
 				{
 					return $result;
 				}
-				else
-				{
+				else {
 					$pa_ht = $result;
 				}
 			}
@@ -1632,21 +1614,18 @@ class Contrat extends CommonObject
 					$this->db->rollback();
 					return -1;
 				}
-				else
-				{
+				else {
 					$this->db->commit();
 					return $contractlineid;
 				}
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				$this->error = $this->db->error()." sql=".$sql;
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog(get_class($this)."::addline ErrorTryToAddLineOnValidatedContract", LOG_ERR);
 			return -2;
 		}
@@ -1699,8 +1678,7 @@ class Contrat extends CommonObject
 			$remise = round(($pu * $remise_percent / 100), 2);
 			$price = $pu - $remise;
 		}
-		else
-		{
+		else {
 			$remise_percent = 0;
 		}
 
@@ -1751,8 +1729,7 @@ class Contrat extends CommonObject
 			{
 				return $result;
 			}
-			else
-			{
+			else {
 				$pa_ht = $result;
 			}
 		}
@@ -1826,15 +1803,13 @@ class Contrat extends CommonObject
 					return 1;
 				}
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::updateline Erreur -2");
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this)."::updateline Erreur -1");
@@ -1896,8 +1871,7 @@ class Contrat extends CommonObject
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -2;
 		}
@@ -1994,8 +1968,7 @@ class Contrat extends CommonObject
 			$text .= ($mode == 7 ? '</span>' : '');
 			return $text;
 		}
-		else
-		{
+		else {
 			return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 		}
 	}
@@ -2114,8 +2087,7 @@ class Contrat extends CommonObject
 
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -2151,8 +2123,7 @@ class Contrat extends CommonObject
 			}
 			return $tab;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2189,8 +2160,7 @@ class Contrat extends CommonObject
 			}
 			return $tab;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2291,8 +2261,7 @@ class Contrat extends CommonObject
 
 			return $response;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -2334,8 +2303,7 @@ class Contrat extends CommonObject
             $this->db->free($resql);
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -2960,8 +2928,7 @@ class ContratLigne extends CommonObjectLine
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -3047,8 +3014,7 @@ class ContratLigne extends CommonObjectLine
 			{
 				return $result;
 			}
-			else
-			{
+			else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -3196,8 +3162,7 @@ class ContratLigne extends CommonObjectLine
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -3279,8 +3244,7 @@ class ContratLigne extends CommonObjectLine
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			$this->error = $this->db->error()." sql=".$sql;
 			return -1;
@@ -3334,8 +3298,7 @@ class ContratLigne extends CommonObjectLine
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				return -1;
 			}
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 1da2416ce84..250d89e3e88 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -71,8 +71,7 @@ if ($action == 'addcontact' && $user->rights->contrat->creer)
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			$msg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
@@ -91,8 +90,7 @@ if ($action == 'swapstatut' && $user->rights->contrat->creer)
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
 	}
-	else
-	{
+	else {
 		dol_print_error($db, $object->error);
 	}
 }
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index fd3b3f66e4a..e43db63826f 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -194,8 +194,7 @@ if ($object->id)
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 2a7c9c0d91a..4530d01a6af 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -141,8 +141,7 @@ if ($resql)
 	}
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 // Search by status (only expired)
@@ -180,8 +179,7 @@ if ($resql)
     }
     $db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -299,15 +297,13 @@ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoContracts").'</td></tr>';
 		}
 		print "</table></div><br>";
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -384,8 +380,7 @@ if ($result)
 
 	print "</table></div>";
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -440,8 +435,7 @@ if ($resql)
 			$productstatic->entity = $obj->pentity;
             print $productstatic->getNomUrl(1, '', 20);
 		}
-		else
-		{
+		else {
 		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
             if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
             else print '</a> '.dol_trunc($obj->note, 20);
@@ -463,8 +457,7 @@ if ($resql)
 
 	print "</table></div>";
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -520,8 +513,7 @@ if ($resql)
 			$productstatic->entity = $obj->pentity;
             print $productstatic->getNomUrl(1, '', 20);
 		}
-		else
-		{
+		else {
 		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
             if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
             else print '</a> '.dol_trunc($obj->note, 20);
@@ -542,8 +534,7 @@ if ($resql)
 
 	print "</table></div>";
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -600,8 +591,7 @@ if ($resql)
 			$productstatic->entity = $obj->pentity;
             print $productstatic->getNomUrl(1, '', 20);
 		}
-		else
-		{
+		else {
 		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
             if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
             else print '</a> '.dol_trunc($obj->note, 20);
@@ -622,8 +612,7 @@ if ($resql)
 
 	print "</table></div>";
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index a7205730817..5053b703966 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -732,8 +732,7 @@ while ($i < min($num, $limit))
 			}
 			//else print $langs->trans("NoSalesRepresentativeAffected");
 		}
-		else
-		{
+		else {
 			print '&nbsp';
 		}
 		print '</td>';
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 2b81ceff5fa..62a853270e1 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -98,14 +98,12 @@ if ($search_status != '')
 	$tmp = explode('&', $search_status);
 	$mode = $tmp[0];
 	if (empty($tmp[1])) $filter = '';
-	else
-	{
+	else {
 		if ($tmp[1] == 'filter=notexpired') $filter = 'notexpired';
 		if ($tmp[1] == 'filter=expired') $filter = 'expired';
 	}
 }
-else
-{
+else {
 	$search_status = $mode;
 	if ($filter == 'expired') $search_status .= '&filter=expired';
 	if ($filter == 'notexpired') $search_status .= '&filter=notexpired';
@@ -598,8 +596,7 @@ while ($i < min($num, $limit))
 			print $obj->label ? ' - '.dol_trunc($obj->label, 16) : '';
 			if (!empty($obj->description) && !empty($conf->global->PRODUCT_DESC_IN_LIST)) print '<br>'.dol_nl2br($obj->description);
 		}
-		else
-		{
+		else {
 			if ($obj->type == 0) print img_object($obj->description, 'product').' '.dol_trunc($obj->description, 24);
 			if ($obj->type == 1) print img_object($obj->description, 'service').' '.dol_trunc($obj->description, 24);
 		}
@@ -725,8 +722,7 @@ while ($i < min($num, $limit))
 			// If contract is draft, we say line is also draft
 		    print $contractstatic->LibStatut(0, 5);
 	    }
-	    else
-	    {
+	    else {
 		    print $staticcontratligne->LibStatut($obj->statut, 5, ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now) ? 1 : 0);
 	    }
 	    print '</td>';
diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php
index b9c00885d69..fe5b015214a 100644
--- a/htdocs/cron/admin/cron.php
+++ b/htdocs/cron/admin/cron.php
@@ -51,8 +51,7 @@ if (!empty($actionsave))
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -97,8 +96,7 @@ if (empty($conf->global->CRON_DISABLE_KEY_CHANGE))
     if (!empty($conf->use_javascript_ajax))
     	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
 }
-else
-{
+else {
     print (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '');
     print '<input type="hidden" id="CRON_KEY" name="CRON_KEY" value="'.(GETPOST('CRON_KEY') ?GETPOST('CRON_KEY') : (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '')).'">';
 }
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 9ebbcda6c44..0d2455ae620 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -66,15 +66,13 @@ if (!empty($cancel))
 	{
 		$action = '';
 	}
-	else
-	{
+	else {
 	    if ($backtourl)
 	    {
 	        header("Location: ".$backtourl);
 	        exit;
 	    }
-	    else
-	    {
+	    else {
 	        header("Location: ".DOL_URL_ROOT.'/cron/list.php');
 		    exit;
 	    }
@@ -91,8 +89,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->del
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit';
 	}
-	else
-	{
+	else {
 		Header("Location: ".DOL_URL_ROOT.'/cron/list.php');
 		exit;
 	}
@@ -106,8 +103,7 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
         setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
         $action = '';
     }
-    else
-    {
+    else {
         $now = dol_now(); // Date we start
 
     	$result = $object->run_jobs($user->login);
@@ -117,8 +113,7 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
     		setEventMessages($object->error, $object->errors, 'errors');
     		$action = '';
     	}
-    	else
-    	{
+    	else {
     		$res = $object->reprogram_jobs($user->login, $now);
     		if ($res > 0)
     		{
@@ -126,8 +121,7 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
     			else setEventMessages($langs->trans("JobFinished"), null, 'mesgs');
     			$action = '';
     		}
-    		else
-    		{
+    		else {
     			setEventMessages($object->error, $object->errors, 'errors');
     			$action = '';
     		}
@@ -416,8 +410,7 @@ if (($action == "create") || ($action == "edit"))
 	    {
 	        print "<option value='".$i."' selected>".$i."</option>";
 	    }
-	    else
-	    {
+	    else {
 	        print "<option value='".$i."'>".$i."</option>";
 	    }
 	}
@@ -473,8 +466,7 @@ if (($action == "create") || ($action == "edit"))
 	{
         print $form->selectDate($object->datestart, 'datestart', 1, 1, '', "cronform");
 	}
-	else
-	{
+	else {
         print $form->selectDate('', 'datestart', 1, 1, '', "cronform");
 	}
 	print "</td>";
@@ -527,8 +519,7 @@ if (($action == "create") || ($action == "edit"))
 	{
         print $form->selectDate($object->datenextrun, 'datenextrun', 1, 1, '', "cronform");
 	}
-	else
-	{
+	else {
         print $form->selectDate(-1, 'datenextrun', 1, 1, '', "cronform");
 	}
 	print "</td>";
@@ -548,8 +539,7 @@ if (($action == "create") || ($action == "edit"))
 
 	print "</form>\n";
 }
-else
-{
+else {
 	/*
 	 * view card
 	 */
@@ -622,8 +612,7 @@ else
 		{
 			print $langs->trans("AllEntities");
 		}
-		else
-		{
+		else {
 			$mc->getInfo($object->entity);
 			print $mc->label;
 		}
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 92a132a6789..f3c02c72cbb 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -280,8 +280,7 @@ class Cronjob extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -378,8 +377,7 @@ class Cronjob extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -518,8 +516,7 @@ class Cronjob extends CommonObject
 
     		return 1;
     	}
-    	else
-    	{
+    	else {
     		$this->error = "Error ".$this->db->lasterror();
     		return -1;
     	}
@@ -655,8 +652,7 @@ class Cronjob extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -697,8 +693,7 @@ class Cronjob extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -753,8 +748,7 @@ class Cronjob extends CommonObject
 			$this->db->commit();
 			return $object->id;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -895,8 +889,7 @@ class Cronjob extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -952,8 +945,7 @@ class Cronjob extends CommonObject
 			$conf->entity = $savcurrententity;
 			return -1;
 		}
-		else
-		{
+		else {
 			if (empty($user->id))
 			{
 				$this->error = " User user login:".$userlogin." do not exists";
@@ -1057,8 +1049,7 @@ class Cronjob extends CommonObject
 				{
 					$result = call_user_func(array($object, $this->methodename), $this->params);
 				}
-				else
-				{
+				else {
 					$result = call_user_func_array(array($object, $this->methodename), $params_arr);
 				}
 
@@ -1079,8 +1070,7 @@ class Cronjob extends CommonObject
 		            $retval = $this->lastresult;
 		            $error++;
 				}
-				else
-				{
+				else {
 					dol_syslog(get_class($this)."::run_jobs END");
 				    $this->lastoutput = $object->output;
 					$this->lastresult = var_export($result, true);
@@ -1117,8 +1107,7 @@ class Cronjob extends CommonObject
 			{
 				$result = call_user_func($this->methodename, $this->params);
 			}
-			else
-			{
+			else {
 				$result = call_user_func_array($this->methodename, $params_arr);
 			}
 
@@ -1132,8 +1121,7 @@ class Cronjob extends CommonObject
 			    $retval = $this->lastresult;
 			    $error++;
 			}
-			else
-			{
+			else {
                 $this->lastoutput = var_export($result, true);
                 $this->lastresult = var_export($result, true); // Return code
                 $retval = $this->lastresult;
@@ -1202,8 +1190,7 @@ class Cronjob extends CommonObject
 			dol_syslog(get_class($this)."::reprogram_jobs ".$this->error, LOG_ERR);
 			return -1;
 		}
-		else
-		{
+		else {
 			if (empty($user->id))
 			{
 				$this->error = " User user login:".$userlogin." do not exists";
@@ -1230,8 +1217,7 @@ class Cronjob extends CommonObject
 		        // TODO For exact frequency (every month, every year, ...), use instead a dol_time_plus_duree($time, $duration_value, $duration_unit)
 		    }
 		}
-		else
-		{
+		else {
 			//$this->datenextrun=$this->datenextrun + ($this->frequency * $this->unitfrequency);
 		    dol_syslog(get_class($this)."::reprogram_jobs datenextrun is already in future, we do not change it");
 		}
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index e9afad3b48b..a91dd4b9d66 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -133,8 +133,7 @@ if (empty($reshook))
 	        setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
 	        $action = '';
 	    }
-	    else
-	    {
+	    else {
 	        $object = new Cronjob($db);
 	    	$job = $object->fetch($id);
 
@@ -156,8 +155,7 @@ if (empty($reshook))
 	    		}
 	    		$action = '';
 	    	}
-	    	else
-	    	{
+	    	else {
 	    		setEventMessages($object->error, $object->errors, 'errors');
 	    		$action = '';
 	    	}
@@ -197,8 +195,7 @@ if (empty($reshook))
 				//else dol_print_error($db, 'Bad value for massaction');
 				if ($result < 0) setEventMessages($tmpcron->error, $tmpcron->errors, 'errors');
 			}
-			else
-			{
+			else {
 				$error++;
 			}
 		}
@@ -445,8 +442,7 @@ if ($num > 0)
 			print $object->getNomUrl(0, '', 1);
 			$object->ref = $obj->rowid;
 		}
-		else
-		{
+		else {
 			//print $langs->trans('CronNone');
 		}
 		print '</td>';
@@ -587,8 +583,7 @@ if ($num > 0)
 		$i++;
 	}
 }
-else
-{
+else {
 	print '<tr><td colspan="9" class="opacitymedium">'.$langs->trans('CronNoJobs').'</td></tr>';
 }
 
diff --git a/htdocs/dav/dav.class.php b/htdocs/dav/dav.class.php
index 60912b86a8a..673c42e27a0 100644
--- a/htdocs/dav/dav.class.php
+++ b/htdocs/dav/dav.class.php
@@ -89,8 +89,7 @@ class CdavLib
 					LEFT JOIN '.MAIN_DB_PREFIX.'socpeople AS sp ON (sp.fk_soc = sc.fk_soc AND sp.rowid = a.fk_contact)
 					LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_cdav AS ac ON (a.id = ac.fk_object)';
 		}
-		else
-		{
+		else {
 			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = a.fk_soc)
 					LEFT JOIN '.MAIN_DB_PREFIX.'socpeople AS sp ON (sp.rowid = a.fk_contact)
 					LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_cdav AS ac ON (a.id = ac.fk_object)';
@@ -106,8 +105,7 @@ class CdavLib
 			{
 				$sql .= ' AND a.id = '.intval($oid);
 			}
-			else
-			{
+			else {
 				$sql .= ' AND (a.id = '.intval($oid).' OR ac.uuidext = \''.$this->db->escape($ouri).'\')';
 			}
 		}
@@ -161,8 +159,7 @@ class CdavLib
 
 		if ($obj->percent == -1 && trim($obj->datep) != '')
 			$type = 'VEVENT';
-		else
-			$type = 'VTODO';
+		else $type = 'VTODO';
 
 		$timezone = date_default_timezone_get();
 
@@ -176,8 +173,7 @@ class CdavLib
 		$caldata .= "DTSTAMP:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
 		if ($obj->sourceuid == '')
 			$caldata .= "UID:".$obj->id.'-ev-'.$calid.'-cal-'.constant('CDAV_URI_KEY')."\n";
-		else
-			$caldata .= "UID:".$obj->sourceuid."\n";
+		else $caldata .= "UID:".$obj->sourceuid."\n";
 		$caldata .= "SUMMARY:".$obj->label."\n";
 		$caldata .= "LOCATION:".$location."\n";
 		$caldata .= "PRIORITY:".$obj->priority."\n";
@@ -188,21 +184,18 @@ class CdavLib
 			{
 				if (trim($obj->datep2) != '')
 					$caldata .= "DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep2) + 1)."\n";
-				else
-					$caldata .= "DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep) + (25 * 3600))."\n";
+				else $caldata .= "DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep) + (25 * 3600))."\n";
 			}
 			elseif (trim($obj->datep2) != '')
 				$caldata .= "DUE;VALUE=DATE:".date('Ymd', strtotime($obj->datep2) + 1)."\n";
 		}
-		else
-		{
+		else {
 			$caldata .= "DTSTART;TZID=".$timezone.":".strtr($obj->datep, array(" "=>"T", ":"=>"", "-"=>""))."\n";
 			if ($type == 'VEVENT')
 			{
 				if (trim($obj->datep2) != '')
 					$caldata .= "DTEND;TZID=".$timezone.":".strtr($obj->datep2, array(" "=>"T", ":"=>"", "-"=>""))."\n";
-				else
-					$caldata .= "DTEND;TZID=".$timezone.":".strtr($obj->datep, array(" "=>"T", ":"=>"", "-"=>""))."\n";
+				else $caldata .= "DTEND;TZID=".$timezone.":".strtr($obj->datep, array(" "=>"T", ":"=>"", "-"=>""))."\n";
 			}
 			elseif (trim($obj->datep2) != '')
 				$caldata .= "DUE;TZID=".$timezone.":".strtr($obj->datep2, array(" "=>"T", ":"=>"", "-"=>""))."\n";
@@ -210,8 +203,7 @@ class CdavLib
 		$caldata .= "CLASS:PUBLIC\n";
 		if ($obj->transparency == 1)
 			$caldata .= "TRANSP:TRANSPARENT\n";
-		else
-			$caldata .= "TRANSP:OPAQUE\n";
+		else $caldata .= "TRANSP:OPAQUE\n";
 
 		if ($type == 'VEVENT')
 			$caldata .= "STATUS:CONFIRMED\n";
@@ -219,8 +211,7 @@ class CdavLib
 			$caldata .= "STATUS:NEEDS-ACTION\n";
 		elseif ($obj->percent == 100)
 			$caldata .= "STATUS:COMPLETED\n";
-		else
-		{
+		else {
 			$caldata .= "STATUS:IN-PROCESS\n";
 			$caldata .= "PERCENT-COMPLETE:".$obj->percent."\n";
 		}
@@ -285,8 +276,7 @@ class CdavLib
 						'component' => strpos($calendardata, 'BEGIN:VEVENT') > 0 ? 'vevent' : 'vtodo',
 					);
 				}
-				else
-				{
+				else {
 					$calevents[] = array(
 						// 'calendardata' => $calendardata,  not necessary because etag+size are present
 						'uri' => $obj->id.'-ev-'.constant('CDAV_URI_KEY'),
diff --git a/htdocs/dav/dav.lib.php b/htdocs/dav/dav.lib.php
index b306ec7161a..bb4835c4d52 100644
--- a/htdocs/dav/dav.lib.php
+++ b/htdocs/dav/dav.lib.php
@@ -26,8 +26,7 @@ if (!defined('CDAV_CONTACT_TAG'))
 {
 	if (isset($conf->global->CDAV_CONTACT_TAG))
 		define('CDAV_CONTACT_TAG', $conf->global->CDAV_CONTACT_TAG);
-	else
-		define('CDAV_CONTACT_TAG', '');
+	else define('CDAV_CONTACT_TAG', '');
 }
 
 // define CDAV_URI_KEY if not
@@ -35,8 +34,7 @@ if (!defined('CDAV_URI_KEY'))
 {
 	if (isset($conf->global->CDAV_URI_KEY))
 		define('CDAV_URI_KEY', $conf->global->CDAV_URI_KEY);
-	else
-		define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']), 0, 8));
+	else define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']), 0, 8));
 }
 
 
diff --git a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
index fd9f993e1e8..03d91fff140 100644
--- a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
@@ -78,8 +78,7 @@ class DolLogsCollector extends MessagesCollector
 		{
     		$this->getStorageLogs($this->path);
 		}
-		else
-		{
+		else {
     	    $log_levels = $this->getLevels();
 
     	    foreach ($conf->logbuffer as $line) {
diff --git a/htdocs/ecm/ajax/ecmdatabase.php b/htdocs/ecm/ajax/ecmdatabase.php
index 9f4820cd723..91564ec8f80 100644
--- a/htdocs/ecm/ajax/ecmdatabase.php
+++ b/htdocs/ecm/ajax/ecmdatabase.php
@@ -115,14 +115,12 @@ if (isset($action) && !empty($action))
 						$fk_parent = $parentdirisindatabase;
 						//break;  // We found parent, we can stop the while loop
 					}
-					else
-					{
+					else {
 						dol_syslog("No");
 						//print "No<br>\n";
 					}
 				}
-				else
-				{
+				else {
 					dol_syslog("Parent is root");
 					$fk_parent = 0; // Parent is root
 				}
@@ -149,8 +147,7 @@ if (isset($action) && !empty($action))
 						//var_dump($sqltree);
 						$adirwascreated = 1;
 					}
-					else
-					{
+					else {
 						dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR);
 					}
 				}
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 3bddd70bfaa..fc450e9864e 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -165,8 +165,7 @@ class EcmDirectory // extends CommonObject
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
 			return -1;
 		}
-		else
-		{
+		else {
 			$this->db->begin();
 
 			// Insert request
@@ -208,14 +207,12 @@ class EcmDirectory // extends CommonObject
 					$this->db->commit();
 					return $this->id;
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					return -1;
 				}
 			}
-			else
-			{
+			else {
 				$this->error = "Error ".$this->db->lasterror();
 				$this->db->rollback();
 				return -1;
@@ -274,8 +271,7 @@ class EcmDirectory // extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -303,8 +299,7 @@ class EcmDirectory // extends CommonObject
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
-		else
-		{
+		else {
 		    if (preg_match('/[0-9]+/', $value)) $this->cachenbofdoc = (int) $value;
 		    elseif ($value == '+') $this->cachenbofdoc++;
 		    elseif ($value == '-') $this->cachenbofdoc--;
@@ -359,8 +354,7 @@ class EcmDirectory // extends CommonObject
 
 			return $obj ? 1 : 0;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -399,8 +393,7 @@ class EcmDirectory // extends CommonObject
 			$this->error = "Error ".$this->db->lasterror();
 			return -2;
 		}
-		else
-		{
+		else {
             // Call trigger
             $result = $this->call_trigger('MYECMDIR_DELETE', $user);
             if ($result < 0)
@@ -418,8 +411,7 @@ class EcmDirectory // extends CommonObject
 			{
 				$result = @dol_delete_dir_recursive($file, 0, 0);
 			}
-			else
-			{
+			else {
 				$result = @dol_delete_dir($file, 0);
 			}
 		}
@@ -428,8 +420,7 @@ class EcmDirectory // extends CommonObject
 		{
 			$this->db->commit();
 		}
-		else
-		{
+		else {
 			$this->error = 'ErrorFailToDeleteDir';
 			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 			$this->db->rollback();
@@ -565,8 +556,7 @@ class EcmDirectory // extends CommonObject
 			}
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -673,8 +663,7 @@ class EcmDirectory // extends CommonObject
 						//print "this->cats[$i]['id_children'] est deja un tableau de $newelem elements<br>";
 						$this->cats[$obj->rowid]['id_children'][$newelempos] = $obj->rowid_fille;
 					}
-					else
-					{
+					else {
 						//print "this->cats[".$obj->rowid."]['id_children'] n'est pas encore un tableau<br>";
 						$this->cats[$obj->rowid]['id_children'] = array($obj->rowid_fille);
 					}
@@ -682,8 +671,7 @@ class EcmDirectory // extends CommonObject
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -723,8 +711,7 @@ class EcmDirectory // extends CommonObject
 			$this->cats[$id_categ]['fulllabel'] = $this->cats[$this->cats[$id_categ]['id_mere']]['fulllabel'];
 			$this->cats[$id_categ]['fulllabel'] .= ' >> '.$this->cats[$id_categ]['label'];
 		}
-		else
-		{
+		else {
 			$this->cats[$id_categ]['fullpath'] = '_'.$id_categ;
             $this->cats[$id_categ]['fullrelativename'] = $this->cats[$id_categ]['label'];
 			$this->cats[$id_categ]['fulllabel'] = $this->cats[$id_categ]['label'];
@@ -768,8 +755,7 @@ class EcmDirectory // extends CommonObject
 		{
 			$sql .= " WHERE rowid = ".$this->id;
 		}
-		else
-		{
+		else {
 			$sql .= " WHERE entity = ".$conf->entity;
 		}
 
@@ -780,8 +766,7 @@ class EcmDirectory // extends CommonObject
 			$this->cachenbofdoc = count($filelist);
 			return $this->cachenbofdoc;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -813,8 +798,7 @@ class EcmDirectory // extends CommonObject
             {
                 $this->errors = array_merge($this->errors, $interface->errors);
             }
-            else
-            {
+            else {
                 $this->errors = $interface->errors;
             }
         }
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 6921b8aabd6..e24af560143 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -200,15 +200,13 @@ class EcmFiles extends CommonObject
 				$obj = $this->db->fetch_object($resql);
 				$maxposition = (int) $obj->maxposition;
 			}
-			else
-			{
+			else {
 				$this->errors[] = 'Error '.$this->db->lasterror();
 				return --$error;
 			}
 			$maxposition = $maxposition + 1;
 		}
-		else
-		{
+		else {
 			$maxposition = $this->position;
 		}
 
diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php
index de9f289eb79..e1e7bf40873 100644
--- a/htdocs/ecm/class/htmlecm.form.class.php
+++ b/htdocs/ecm/class/htmlecm.form.class.php
@@ -81,8 +81,7 @@ class FormEcm
 		if (is_array($cate_arbo))
 		{
 			if (!count($cate_arbo)) $output .= '<option value="-1" disabled>'.$langs->trans("NoDirectoriesFound").'</option>';
-			else
-			{
+			else {
 				$output .= '<option value="-1">&nbsp;</option>';
 				foreach ($cate_arbo as $key => $value)
 				{
@@ -91,8 +90,7 @@ class FormEcm
 					{
 						$add = 'selected ';
 					}
-					else
-					{
+					else {
 						$add = '';
 					}
 					$output .= '<option '.$add.'value="'.dol_escape_htmltag($valueforoption).'">'.(empty($cate_arbo[$key]['fulllabel']) ? $cate_arbo[$key]['relativename'] : $cate_arbo[$key]['fulllabel']).'</option>';
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index 4d6f2bdce5a..9eb95c1f198 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -57,7 +57,7 @@ if ($module == 'ecm')
 {
 	$upload_dir = $conf->ecm->dir_output.'/'.$urlsection;
 }
-else	// For example $module == 'medias'
+else // For example $module == 'medias'
 {
 	$upload_dir = $conf->medias->multidir_output[$conf->entity];
 }
@@ -116,8 +116,7 @@ if ($action == 'add' && $permtoadd)
 			header("Location: ".$backtopage);
 			exit;
 		}
-		else
-		{
+		else {
 			header("Location: ".DOL_URL_ROOT.'/ecm/index.php?action=file_manager'.($module ? '&module='.$module : ''));
 			exit;
 		}
@@ -156,7 +155,7 @@ if ($action == 'add' && $permtoadd)
 				$action = 'create';
 			}
 		}
-		else	// For example $module == 'medias'
+		else // For example $module == 'medias'
 		{
 			$dirfornewdir = '';
 			if ($module == 'medias')
@@ -178,8 +177,7 @@ if ($action == 'add' && $permtoadd)
 					setEventMessages($langs->trans('ErrorFailToCreateDir', $label), null, 'errors');
 					$error++;
 				}
-				else
-				{
+				else {
 					setEventMessages($langs->trans("ECMSectionWasCreated", $label), null, 'mesgs');
 				}
 			}
@@ -193,8 +191,7 @@ if ($action == 'add' && $permtoadd)
 			header("Location: ".$backtopage);
 			exit;
 		}
-		else
-		{
+		else {
 			header("Location: ".DOL_URL_ROOT.'/ecm/index.php?action=file_manager');
 			exit;
 		}
@@ -302,8 +299,7 @@ if (empty($action) || $action == 'delete_section')
 	{
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=delete_section">'.$langs->trans('Delete').'</a>';
 	}
-	else
-	{
+	else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
 	}
 	print '</div>';
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index 9b3da9d8aae..78b7d16bb5d 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -75,7 +75,7 @@ if ($module == 'ecm')
 	$relativepath = $ecmdir->getRelativePath();
 	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
 }
-else	// For example $module == 'medias'
+else // For example $module == 'medias'
 {
 	$relativepath = $section;
 	$upload_dir = $conf->medias->multidir_output[$conf->entity].'/'.$relativepath;
@@ -111,8 +111,7 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 		{
 			$result = $ecmdir->changeNbOfFiles('+');
 		}
-		else
-		{
+		else {
    			$langs->load("errors");
 			if ($resupload < 0)	// Unknown error
 			{
@@ -121,14 +120,13 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 				// Files infected by a virus
 				setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 			}
-			else	// Known error
+			else // Known error
 			{
 				setEventMessages($langs->trans($resupload), null, 'errors');
 			}
 		}
 	}
-	else
-	{
+	else {
 		// Failed transfer (exceeding the limit file?)
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFailToCreateDir", $upload_dir), null, 'errors');
@@ -168,19 +166,16 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes')
 			setEventMessages($langs->trans($ecmdir->error, $ecmdir->label), null, 'errors');
 		}
 	}
-	else
-	{
+	else {
 		if ($deletedirrecursive)
 		{
 			$resbool = dol_delete_dir_recursive($upload_dir, 0, 1);
 		}
-		else
-		{
+		else {
 			$resbool = dol_delete_dir($upload_dir, 1);
 		}
 		if ($resbool) $result = 1;
-		else
-		{
+		else {
 			$langs->load('errors');
 			setEventMessages($langs->trans("ErrorFailToDeleteDir", $upload_dir), null, 'errors');
 			$result = 0;
@@ -204,8 +199,7 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha'))
 		$olddir = $ecmdir->getRelativePath(0);
 		$olddir = $conf->ecm->dir_output.'/'.$olddir;
 	}
-	else
-	{
+	else {
 		$olddir = GETPOST('section', 'alpha');
 		$olddir = $conf->medias->multidir_output[$conf->entity].'/'.$relativepath;
 	}
@@ -243,19 +237,16 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha'))
 				$relativepath = $ecmdir->getRelativePath();
 				$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
 			}
-			else
-			{
+			else {
 				$db->rollback();
 			}
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			setEventMessages($ecmdir->error, $ecmdir->errors, 'errors');
 		}
 	}
-	else
-	{
+	else {
 		$newdir = $conf->medias->multidir_output[$conf->entity].'/'.GETPOST('oldrelparentdir', 'alpha').'/'.GETPOST('label', 'alpha');
 
 		$result = @rename($olddir, $newdir);
@@ -341,8 +332,7 @@ if ($module == 'ecm')
 			$s = ' -> '.$s;
 			$result = $tmpecmdir->fetch($tmpecmdir->fk_parent);
 		}
-		else
-		{
+		else {
 			$tmpecmdir = 0;
 		}
 		$i++;
@@ -412,8 +402,7 @@ if ($module == 'ecm')
 {
 	print dol_print_date($ecmdir->date_c, 'dayhour');
 }
-else
-{
+else {
 	//var_dump($upload_dir);
 	print dol_print_date(dol_filemtime($upload_dir), 'dayhour');
 }
@@ -423,8 +412,7 @@ if ($module == 'ecm')
 {
 	print '/ecm/'.$relativepath;
 }
-else
-{
+else {
 	print '/'.$module.'/'.$relativepath;
 }
 print '</td></tr>';
@@ -478,8 +466,7 @@ if ($action != 'edit' && $action != 'delete')
 	{
 		print '<a class="butAction" href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create'.($module ? '&module='.$module : '').'&catParent='.$section.'">'.$langs->trans('ECMAddSection').'</a>';
 	}
-	else
-	{
+	else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('ECMAddSection').'</a>';
 	}
 
@@ -489,8 +476,7 @@ if ($action != 'edit' && $action != 'delete')
 	{
 		print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete_dir'.($module ? '&module='.$module : '').'&section='.$section.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.$langs->trans('Delete').'</a>';
 	}
-	else
-	{
+	else {
 		print '<a class="butActionDeleteRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
 	}
 	/*}
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 1c94fd1700b..bddbd0f6294 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -114,8 +114,7 @@ if ($cancel)
         header("Location: ".$backtopage);
         exit;
     }
-    else
-    {
+    else {
     	header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'&section='.urlencode($section).($module ? '&module='.urlencode($module) : ''));
         exit;
     }
@@ -171,8 +170,7 @@ if ($action == 'update')
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 			$object->share = getRandomPassword(true);
 		}
-		else
-		{
+		else {
 			$object->share = '';
 		}
 
@@ -185,8 +183,7 @@ if ($action == 'update')
 				setEventMessages($object->error, $object->errors, 'warnings');
 			}
 		}
-		else
-		{
+		else {
 			// Call create to insert record
 			$object->entity = $conf->entity;
 			$object->filepath = preg_replace('/[\\/]+$/', '', $newdirrelativetodocument);
@@ -212,8 +209,7 @@ if ($action == 'update')
         header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'&section='.urlencode($section));
         exit;
     }
-    else
-    {
+    else {
         $db->rollback();
     }
 }
@@ -258,8 +254,7 @@ while ($tmpecmdir && $result > 0)
 		$s = ' -> '.$s;
 		$result = $tmpecmdir->fetch($tmpecmdir->fk_parent);
 	}
-	else
-	{
+	else {
 		$tmpecmdir = 0;
 	}
 	$i++;
@@ -299,8 +294,7 @@ if (!empty($object->label))
 {
 	print $object->label;
 }
-else
-{
+else {
 	print img_warning().' '.$langs->trans("FileNotYetIndexedInDatabase");
 }
 print '</td></tr>';
@@ -349,19 +343,16 @@ if (!empty($object->share))
 		else print $fulllink;
 		if ($action != 'edit') print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>'; // No target here
 	}
-	else
-	{
+	else {
 		print '<input type="checkbox" name="shareenabled"'.($object->share ? ' checked="checked"' : '').' /> ';
 	}
 }
-else
-{
+else {
 	if ($action != 'edit')
 	{
 		print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
 	}
-	else
-	{
+	else {
 		print '<input type="checkbox" name="shareenabled"'.($object->share ? ' checked="checked"' : '').' /> ';
 	}
 }
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 43b9ca6dcce..09350d2b245 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -136,8 +136,7 @@ if ($action == 'confirm_deletefile')
 			setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile', 'alpha')), null, 'mesgs');
 			$result = $ecmdir->changeNbOfFiles('-');
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile', 'alpha')), null, 'errors');
 		}
 
@@ -159,8 +158,7 @@ if ($action == 'add' && $user->rights->ecm->setup)
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages('Error '.$langs->trans($ecmdir->error), null, 'errors');
 		$action = "create";
 	}
@@ -247,14 +245,12 @@ if ($action == 'refreshmanual')
                     $fk_parent = $parentdirisindatabase;
                     //break;  // We found parent, we can stop the while loop
                 }
-                else
-				{
+                else {
                     dol_syslog("No");
                     //print "No<br>\n";
                 }
             }
-            else
-            {
+            else {
                 dol_syslog("Parent is root");
                 $fk_parent = 0; // Parent is root
             }
@@ -281,8 +277,7 @@ if ($action == 'refreshmanual')
                     //var_dump($sqltree);
                     $adirwascreated = 1;
                 }
-                else
-                {
+                else {
                     dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR);
                 }
             }
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 39bdc9a1612..9b8c82ca05e 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -103,8 +103,7 @@ if ($action == 'add' && $user->rights->ecm->setup)
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages('Error '.$langs->trans($ecmdir->error), null, 'errors');
 		$action = "create";
 	}
@@ -222,14 +221,12 @@ if ($action == 'refreshmanual')
                     $fk_parent = $parentdirisindatabase;
                     //break;  // We found parent, we can stop the while loop
                 }
-                else
-				{
+                else {
                     dol_syslog("No");
                     //print "No<br>\n";
                 }
             }
-            else
-            {
+            else {
                 dol_syslog("Parent is root");
                 $fk_parent = 0; // Parent is root
             }
@@ -256,8 +253,7 @@ if ($action == 'refreshmanual')
                     //var_dump($sqltree);
                     $adirwascreated = 1;
                 }
-                else
-                {
+                else {
                     dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR);
                 }
             }
@@ -419,8 +415,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 			    print $val['label'];
    			    print '</a>';
 			}
-			else
-			{
+			else {
 			    print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
 			    print $val['label'];
 			    print '</a>';
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index bf1a4e26de7..1cbd01d39e8 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -586,8 +586,7 @@ class EmailCollector extends CommonObject
 
             $this->db->free($result);
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
         }
     }
@@ -773,8 +772,7 @@ class EmailCollector extends CommonObject
                 $tmpclass = $tmparray[0];
                 $tmpproperty = $tmparray[1];
             }
-            else
-            {
+            else {
                 $tmpproperty = $tmparray[0];
             }
             if ($tmpclass && ($tmpclass != $object->element)) continue; // Property is for another type of object
@@ -818,14 +816,12 @@ class EmailCollector extends CommonObject
                             // Overwrite param $tmpproperty
                             $object->$tmpproperty = isset($regforval[count($regforval) - 1]) ?trim($regforval[count($regforval) - 1]) : null;
                         }
-                        else
-                        {
+                        else {
                             // Regex not found
                             $object->$tmpproperty = null;
                         }
                     }
-                    else
-                    {
+                    else {
                         // Nothing can be done for this param
                         $errorforthisaction++;
                         $this->error = 'The extract rule to use has on an unknown source (must be HEADER, SUBJECT or BODY)';
@@ -863,8 +859,7 @@ class EmailCollector extends CommonObject
                         else $object->$tmpproperty = $valuetouse;
                     }
                 }
-                else
-                {
+                else {
                     $errorforthisaction++;
                     $this->error = 'Bad syntax for description of action parameters: '.$actionparam;
                     $this->errors[] = $this->error;
@@ -1239,8 +1234,7 @@ class EmailCollector extends CommonObject
                     $from = $reg[2];
                     $fromtext = $reg[1];
                 }
-                else
-                {
+                else {
                     $from = $fromstring;
                     $fromtext = '';
                 }
@@ -1313,8 +1307,7 @@ class EmailCollector extends CommonObject
                     {
                         $result = $projectstatic->fetch($projectid);
                         if ($result <= 0) $projectstatic->id = 0;
-                        else
-                        {
+                        else {
                             $projectid = $projectstatic->id;
                             $projectfoundby = 'trackid ('.$trackid.')';
                             if (empty($contactid)) $contactid = $projectstatic->fk_contact;
@@ -1326,8 +1319,7 @@ class EmailCollector extends CommonObject
                     {
                         $result = $contactstatic->fetch($contactid);
                         if ($result <= 0) $contactstatic->id = 0;
-                        else
-                        {
+                        else {
                             $contactid = $contactstatic->id;
                             $contactfoundby = 'trackid ('.$trackid.')';
                             if (empty($thirdpartyid)) $thirdpartyid = $contactstatic->fk_soc;
@@ -1338,8 +1330,7 @@ class EmailCollector extends CommonObject
                     {
                         $result = $thirdpartystatic->fetch($thirdpartyid);
                         if ($result <= 0) $thirdpartystatic->id = 0;
-                        else
-                        {
+                        else {
                             $thirdpartyid = $thirdpartystatic->id;
                             $thirdpartyfoundby = 'trackid ('.$trackid.')';
                         }
@@ -1409,8 +1400,7 @@ class EmailCollector extends CommonObject
                             $this->error = "Action loadthirdparty or loadandcreatethirdparty has empty parameter. Must be 'SET:xxx' or 'EXTRACT:(body|subject):regex' to define how to extract data";
                             $this->errors[] = $this->error;
                         }
-                        else
-                        {
+                        else {
                             $actionparam = $operation['actionparam'];
                             $nametouseforthirdparty = '';
 
@@ -1445,15 +1435,13 @@ class EmailCollector extends CommonObject
                                             // Overwrite param $tmpproperty
                                             $nametouseforthirdparty = isset($regforval[count($regforval) - 1]) ?trim($regforval[count($regforval) - 1]) : null;
                                         }
-                                        else
-                                        {
+                                        else {
                                             // Regex not found
                                             $nametouseforthirdparty = null;
                                         }
                                         //var_dump($object->$tmpproperty);exit;
                                     }
-                                    else
-                                    {
+                                    else {
                                         // Nothing can be done for this param
                                         $errorforactions++;
                                         $this->error = 'The extract rule to use to load thirdparty has on an unknown source (must be HEADER, SUBJECT or BODY)';
@@ -1466,8 +1454,7 @@ class EmailCollector extends CommonObject
                                     //else $object->$tmpproperty = $reg[1];
                                     $nametouseforthirdparty = $reg[2];
                                 }
-                                else
-                                {
+                                else {
                                     $errorforactions++;
                                     $this->error = 'Bad syntax for description of action parameters: '.$actionparam;
                                     $this->errors[] = $this->error;
@@ -1511,8 +1498,7 @@ class EmailCollector extends CommonObject
                                         {
                                             $errorforactions++;
                                         }
-                                        else
-                                        {
+                                        else {
                                             $result = $thirdpartystatic->create($user);
                                             if ($result <= 0)
                                             {
@@ -1598,8 +1584,7 @@ class EmailCollector extends CommonObject
 	                        {
 	                            $errorforactions++;
 	                        }
-	                        else
-	                        {
+	                        else {
 	                            $result = $actioncomm->create($user);
 	                            if ($result <= 0)
 	                            {
@@ -1701,15 +1686,13 @@ class EmailCollector extends CommonObject
                         {
                             $errorforactions++;
                         }
-                        else
-                        {
+                        else {
                             if (empty($projecttocreate->ref) || (is_numeric($projecttocreate->ref) && $projecttocreate->ref <= 0))
                             {
                                 $errorforactions++;
                                 $this->error = 'Failed to create project: Can\'t get a valid value for the field ref with numbering template = '.$modele.', thirdparty id = '.$thirdpartystatic->id;
                             }
-                            else
-                            {
+                            else {
                                 // Create project
                                 $result = $projecttocreate->create($user);
                                 if ($result <= 0)
@@ -1849,15 +1832,13 @@ class EmailCollector extends CommonObject
                         {
                             $errorforactions++;
                         }
-                        else
-                        {
+                        else {
                             if (is_numeric($tickettocreate->ref) && $tickettocreate->ref <= 0)
                             {
                                 $errorforactions++;
                                 $this->error = 'Failed to create ticket: Can\'t get a valid value for the field ref with numbering template = '.$modele.', thirdparty id = '.$thirdpartystatic->id;
                             }
-                            else
-                            {
+                            else {
                                 // Create project
                                 $result = $tickettocreate->create($user);
                                 if ($result <= 0)
@@ -1890,13 +1871,11 @@ class EmailCollector extends CommonObject
                             dol_syslog(imap_last_error());
                         }
                     }
-                    else
-                    {
+                    else {
                         dol_syslog("EmailCollector::doCollectOneCollector message ".$imapemail." to ".$connectstringtarget." was set to read", LOG_DEBUG);
                     }
                 }
-                else
-                {
+                else {
                     $errorforemail++;
                 }
 
@@ -1921,8 +1900,7 @@ class EmailCollector extends CommonObject
                         break;
                     }
                 }
-                else
-                {
+                else {
                     $error++;
 
                     $this->db->rollback();
@@ -1933,8 +1911,7 @@ class EmailCollector extends CommonObject
 
             dol_syslog("End of loop on emails", LOG_INFO, -1);
         }
-        else
-        {
+        else {
             $output = $langs->trans('NoNewEmailToProcess');
         }
 
@@ -2071,8 +2048,7 @@ class EmailCollector extends CommonObject
             // so append parts together with blank row.
             if (strtolower($p->subtype) == 'plain')
                 $plainmsg .= trim($data)."\n\n";
-            else
-                $htmlmsg .= $data."<br><br>";
+            else $htmlmsg .= $data."<br><br>";
             $charset = $params['charset']; // assume all parts are same charset
         }
 
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index d0d6239a7f2..b4fdf52ca5b 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -504,8 +504,7 @@ class EmailCollectorAction extends CommonObject
 
             $this->db->free($result);
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
         }
     }
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index 63521e81c3a..106d57c23c5 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -479,8 +479,7 @@ class EmailCollectorFilter extends CommonObject
 
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 95b6f6208a5..cdc4da7fe51 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -266,8 +266,7 @@ if (empty($reshook))
 
     				$totalqty += $subtotalqty;
 			    }
-			    else
-			    {
+			    else {
 			        // No detail were provided for lots
 			        if (!empty($_POST[$qty]))
 			        {
@@ -296,8 +295,7 @@ if (empty($reshook))
 			        $qty = "qtyl".$i.'_'.$j;
 			    }
 			}
-			else
-			{
+			else {
 			    //var_dump(GETPOST($qty,'int')); var_dump($_POST); var_dump($batch);exit;
 				//shipment line for product with no batch management and no multiple stock location
 				if (GETPOST($qty, 'int') > 0) $totalqty += GETPOST($qty, 'int');
@@ -342,8 +340,7 @@ if (empty($reshook))
     					    }
     					}
 					}
-					else
-					{
+					else {
 						if (GETPOST($qty, 'int') > 0 || (GETPOST($qty, 'int') == 0 && $conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS))
 						{
 							$ent = "entl".$i;
@@ -361,8 +358,7 @@ if (empty($reshook))
 						}
 					}
 				}
-				else
-				{
+				else {
 					// batch mode
 					if ($batch_line[$i]['qty'] > 0)
 					{
@@ -389,8 +385,7 @@ if (empty($reshook))
 	            }
 	        }
 	    }
-	    else
-	    {
+	    else {
 	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("QtyToShip").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 	        $error++;
 	    }
@@ -401,8 +396,7 @@ if (empty($reshook))
 	        header("Location: card.php?id=".$object->id);
 	        exit;
 	    }
-	    else
-	    {
+	    else {
 	        $db->rollback();
 	        $_GET["commande_id"] = GETPOST('commande_id', 'int');
 	        $action = 'create';
@@ -420,8 +414,7 @@ if (empty($reshook))
 	        header("Location: ".DOL_URL_ROOT.'/livraison/card.php?action=create_delivery&id='.$result);
 	        exit;
 	    }
-	    else
-	    {
+	    else {
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
@@ -440,8 +433,7 @@ if (empty($reshook))
 			$langs->load("errors");
 			setEventMessages($langs->trans($object->error), $object->errors, 'errors');
 	    }
-	    else
-	    {
+	    else {
 	    	// Define output language
 	    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 	    	{
@@ -470,8 +462,7 @@ if (empty($reshook))
 	    {
 	        $result = $object->setStatut(-1);
 	    }
-	    else
-		{
+	    else {
 			setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
@@ -485,8 +476,7 @@ if (empty($reshook))
 	        header("Location: ".DOL_URL_ROOT.'/expedition/index.php');
 	        exit;
 	    }
-	    else
-		{
+	    else {
 			setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
@@ -601,8 +591,7 @@ if (empty($reshook))
 						}
 					}
 				}
-				else
-				{
+				else {
 					// delete single warehouse line
 					$line->id = $line_id;
 					if (!$error && $line->delete($user) < 0)
@@ -618,8 +607,7 @@ if (empty($reshook))
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
 		}
-		else
-		{
+		else {
 			setEventMessages($line->error, $line->errors, 'errors');
 		}
 	}
@@ -684,8 +672,7 @@ if (empty($reshook))
 									$error++;
 								}
 							}
-							else
-							{
+							else {
 								setEventMessages($lotStock->error, $lotStock->errors, 'errors');
 								$error++;
 							}
@@ -738,14 +725,12 @@ if (empty($reshook))
 										$error++;
 									}
 								}
-								else
-								{
+								else {
 									setEventMessages($line->error, $line->errors, 'errors');
 									$error++;
 								}
 							}
-							else
-							{
+							else {
 								// create new line with new lot
 								$line->origin_line_id = $lines[$i]->origin_line_id;
 								$line->entrepot_id = $lotStock->warehouseid;
@@ -761,15 +746,13 @@ if (empty($reshook))
 								}
 							}
 						}
-						else
-						{
+						else {
 							setEventMessages($lotStock->error, $lotStock->errors, 'errors');
 							$error++;
 						}
 					}
 				}
-				else
-				{
+				else {
 					if ($lines[$i]->fk_product > 0)
 					{
 						// line without lot
@@ -813,8 +796,7 @@ if (empty($reshook))
 							}
 						}
 					}
-					else
-					{
+					else {
                         // Product no predefined
 						$qty = "qtyl".$line_id;
 						$line->id = $line_id;
@@ -850,8 +832,7 @@ if (empty($reshook))
 				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
-		else
-		{
+		else {
 			header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // To redisplay the form being edited
 			exit();
 		}
@@ -1133,8 +1114,7 @@ if ($action == 'create')
 					{
                     	print '<td class="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
 					}
-					else
-					{
+					else {
 						print '<td class="left">'.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").')</td>';
 					}
                 }
@@ -1195,8 +1175,7 @@ if ($action == 'create')
 
 	                    print '</td>';
 	                }
-	                else
-					{
+	                else {
 					    print "<td>";
 	                    if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
 	                    else $text = img_object($langs->trans('Product'), 'product');
@@ -1232,8 +1211,7 @@ if ($action == 'create')
 					{
 						$quantityToBeDelivered = 0;
 					}
-					else
-					{
+					else {
 						$quantityToBeDelivered = $quantityAsked - $quantityDelivered;
 					}
 	                $warehouse_id = GETPOST('entrepot_id', 'int');
@@ -1289,8 +1267,7 @@ if ($action == 'create')
 										}
 									}
 								}
-								else
-								{
+								else {
 									print $langs->trans("Service");
 								}
 								print '</td>';
@@ -1321,8 +1298,7 @@ if ($action == 'create')
 								}
 							}
 						}
-						else
-						{
+						else {
 						    // Product need lot
 							print '<td></td><td></td></tr>'; // end line and start a new one for lot/serial
 							print '<!-- Case product need lot -->';
@@ -1377,8 +1353,7 @@ if ($action == 'create')
 									print '</td></tr>';
 								}
 							}
-							else
-							{
+							else {
 							    print '<!-- Case there is no details of lot at all -->';
 							    print '<tr class="oddeven"><td colspan="3"></td><td class="center">';
 							    print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0" disabled="disabled"> ';
@@ -1390,8 +1365,7 @@ if ($action == 'create')
 							}
 						}
 					}
-					else
-					{
+					else {
 						// ship from multiple locations
 						if (empty($conf->productbatch->enabled) || !$product->hasbatch())
 						{
@@ -1440,8 +1414,7 @@ if ($action == 'create')
 											print '<!-- Show details of stock -->';
 											print '('.$stock.')';
 										}
-										else
-										{
+										else {
 											print $langs->trans("Service");
 										}
 										print '</td>';
@@ -1480,8 +1453,7 @@ if ($action == 'create')
 								}
 							}
 						}
-						else
-						{
+						else {
 						    print '<!-- Case warehouse not already known and product need lot -->';
 						    print '<td></td><td></td></tr>'; // end line and start a new one for lot/serial
 
@@ -1553,8 +1525,7 @@ if ($action == 'create')
 							    }
 	    						print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0"'.($disabled ? ' '.$disabled : '').'> ';
 							}
-							else
-							{
+							else {
 							    print $langs->trans("NA");
 							}
 							print '</td>';
@@ -1569,14 +1540,12 @@ if ($action == 'create')
 	    							$warehouseObject->fetch($warehouse_selected_id);
 	    							print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->label);
 	    						}
-	    						else
-	    						{
+	    						else {
 	    						    if ($line->fk_product) print img_warning().' '.$langs->trans("StockTooLow");
 	    						    else print '';
 	    						}
 							}
-							else
-							{
+							else {
 							    print $langs->trans("Service");
 							}
 							print '</td>';
@@ -1617,8 +1586,7 @@ if ($action == 'create')
 
             print '<br>';
         }
-        else
-		{
+        else {
             dol_print_error($db);
         }
     }
@@ -1687,8 +1655,7 @@ elseif ($id || $ref)
 			{
 				$numref = $object->getNextNumRef($soc);
 			}
-			else
-			{
+			else {
 				$numref = $object->ref;
 			}
 
@@ -1834,8 +1801,7 @@ elseif ($id || $ref)
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		}
-		else
-		{
+		else {
 			print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
 		}
 		print '</td>';
@@ -1858,8 +1824,7 @@ elseif ($id || $ref)
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
 		}
-		else
-		{
+		else {
 			print $object->trueWeight;
 			print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
 		}
@@ -1893,8 +1858,7 @@ elseif ($id || $ref)
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
 		}
-		else
-		{
+		else {
 			print $object->trueHeight;
 			print ($object->trueHeight && $object->height_units != '') ? ' '.measuringUnitString(0, "size", $object->height_units) : '';
 		}
@@ -1971,8 +1935,7 @@ elseif ($id || $ref)
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		}
-		else
-		{
+		else {
 			if ($object->shipping_method_id > 0)
 			{
 				// Get code using getLabelFromKey
@@ -2004,8 +1967,7 @@ elseif ($id || $ref)
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 			}
-			else
-			{
+			else {
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 			}
 	        print '</td></tr>';
@@ -2065,8 +2027,7 @@ elseif ($id || $ref)
 			{
 				print $langs->trans("QtyToShip").' - ';
 			}
-			else
-			{
+			else {
 				print $langs->trans("QtyShipped").' - ';
 			}
 			if (!empty($conf->stock->enabled))
@@ -2079,14 +2040,12 @@ elseif ($id || $ref)
 			}
 			print '</td>';
 		}
-		else
-		{
+		else {
 			if ($object->statut <= 1)
 			{
 				print '<td class="center linecolqtytoship">'.$langs->trans("QtyToShip").'</td>';
 			}
-			else
-			{
+			else {
 				print '<td class="center linecolqtyshipped">'.$langs->trans("QtyShipped").'</td>';
 			}
 			if (!empty($conf->stock->enabled))
@@ -2196,8 +2155,7 @@ elseif ($id || $ref)
 						$prod->fetch($lines[$i]->fk_product);
 						$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
 					}
-					else
-						$label = (!empty($lines[$i]->label) ? $lines[$i]->label : $lines[$i]->product_label);
+					else $label = (!empty($lines[$i]->label) ? $lines[$i]->label : $lines[$i]->product_label);
 
 					print '<td class="linecoldescription">';
 
@@ -2231,8 +2189,7 @@ elseif ($id || $ref)
 					}
 					print "</td>\n";
 				}
-				else
-				{
+				else {
 					print '<td class="linecoldescription" >';
 					if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'), 'service');
 					else $text = img_object($langs->trans('Product'), 'product');
@@ -2343,14 +2300,12 @@ elseif ($id || $ref)
 									print '</tr>';
 								}
 							}
-							else
-							{
+							else {
 								print '<!-- case edit 4 -->';
 								print '<tr><td colspan="3">'.$langs->trans("NotEnoughStock").'</td></tr>';
 							}
 						}
-						else
-						{
+						else {
 							print '<!-- case edit 5 -->';
 							print '<tr>';
 							// Qty to ship or shipped
@@ -2365,8 +2320,7 @@ elseif ($id || $ref)
 
 					print '</table></td>';
 				}
-				else
-				{
+				else {
 					// Qty to ship or shipped
 					print '<td class="linecolqtytoship center">'.$lines[$i]->qty_shipped.'</td>';
 
@@ -2417,8 +2371,7 @@ elseif ($id || $ref)
 								}
 								print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $detail);
 							}
-							else
-							{
+							else {
 								print $langs->trans("NA");
 							}
 							print '</td>';
@@ -2484,8 +2437,7 @@ elseif ($id || $ref)
 					{
 						print $lines[$i]->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), $indiceAsked);
 					}
-					else
-					{
+					else {
 						print $lines[$i]->showOptionals($extrafields, 'view', array('colspan'=>$colspan), $indiceAsked);
 					}
 				}
@@ -2526,8 +2478,7 @@ elseif ($id || $ref)
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
 				}
-				else
-				{
+				else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
 				}
 			}
@@ -2540,8 +2491,7 @@ elseif ($id || $ref)
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ClassifyUnbilled").'</a>';
 				}
-				else
-				{
+				else {
 			    	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
 				}
 			}
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index e337ee5ffb8..42cb273fbcd 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -399,8 +399,7 @@ class Shipments extends DolibarrApi
         if ($updateRes > 0) {
             return $this->get($id);
         }
-        else
-        {
+        else {
             throw new RestException(405, $this->shipment->error);
         }
     }
@@ -436,8 +435,7 @@ class Shipments extends DolibarrApi
         {
             return $this->get($id);
         }
-        else
-        {
+        else {
             throw new RestException(500, $this->shipment->error);
         }
     }
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 1ccfe9944f7..3250ba8aa5e 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -252,14 +252,12 @@ class Expedition extends CommonObject
 			{
 				return $numref;
 			}
-			else
-			{
+			else {
 				dol_print_error($this->db, get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
 		}
-		else
-		{
+		else {
 			print $langs->trans("Error")." ".$langs->trans("Error_EXPEDITION_ADDON_NUMBER_NotDefined");
 			return "";
 		}
@@ -366,8 +364,7 @@ class Expedition extends CommonObject
 							$error++;
 						}
 					}
-					else
-					{	// with batch management
+					else {	// with batch management
 						if (!$this->create_line_batch($this->lines[$i], $this->lines[$i]->array_options) > 0)
 						{
 							$error++;
@@ -406,8 +403,7 @@ class Expedition extends CommonObject
 						$this->db->commit();
 						return $this->id;
 					}
-					else
-					{
+					else {
 						foreach ($this->errors as $errmsg)
 						{
 							dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
@@ -417,24 +413,21 @@ class Expedition extends CommonObject
 						return -1 * $error;
 					}
 				}
-				else
-				{
+				else {
 					$error++;
 					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -3;
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$this->error = $this->db->error()." - sql=$sql";
 			$this->db->rollback();
@@ -504,8 +497,7 @@ class Expedition extends CommonObject
 			{
 				$error++;
 			}
-			else
-			{
+			else {
 				// create shipment batch lines for stockLocation
 				foreach ($tab as $detbatch)
 				{
@@ -647,15 +639,13 @@ class Expedition extends CommonObject
 
 				return 1;
 			}
-			else
-			{
+			else {
 				dol_syslog(get_class($this).'::Fetch no expedition found', LOG_ERR);
 				$this->error = 'Delivery with id '.$id.' not found';
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -707,8 +697,7 @@ class Expedition extends CommonObject
 		{
 			$numref = $this->getNextNumRef($soc);
 		}
-		else
-		{
+		else {
 			$numref = "EXP".$this->id;
 		}
 		$this->newref = dol_sanitizeFileName($numref);
@@ -760,8 +749,7 @@ class Expedition extends CommonObject
 					{
 						$qty = $obj->qty;
 					}
-					else
-					{
+					else {
 						$qty = $obj->edbqty;
 					}
 					if ($qty <= 0) continue;
@@ -784,8 +772,7 @@ class Expedition extends CommonObject
 							break;
 						}
 					}
-					else
-					{
+					else {
 						// line with batch detail
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
@@ -800,8 +787,7 @@ class Expedition extends CommonObject
 					}
 				}
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -2;
@@ -876,8 +862,7 @@ class Expedition extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1 * $error;
 		}
@@ -908,8 +893,7 @@ class Expedition extends CommonObject
 				{
 					return $result;
 				}
-				else
-				{
+				else {
 					$this->error = $delivery->error;
 					return $result;
 				}
@@ -968,8 +952,7 @@ class Expedition extends CommonObject
 					$product->load_stock('warehouseopen');
 					$product_stock = $product->stock_warehouse[$entrepot_id]->real;
 				}
-				else
-					$product_stock = $product->stock_reel;
+				else $product_stock = $product->stock_reel;
 
 				$product_type = $product->type;
 				if ($product_type == 0 && $product_stock < $qty)
@@ -1165,8 +1148,7 @@ class Expedition extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1261,8 +1243,7 @@ class Expedition extends CommonObject
 							break;
 						}
 					}
-					else
-					{
+					else {
 						// We increment stock of batches
 						// We use warehouse selected for each line
 						foreach ($lotArray as $lot)
@@ -1278,8 +1259,7 @@ class Expedition extends CommonObject
 					}
 				}
 			}
-			else
-			{
+			else {
 				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
@@ -1358,35 +1338,30 @@ class Expedition extends CommonObject
 
 							return 1;
 						}
-						else
-						{
+						else {
 							$this->db->rollback();
 							return -1;
 						}
 					}
-					else
-					{
+					else {
 						$this->error = $this->db->lasterror()." - sql=$sql";
 						$this->db->rollback();
 						return -3;
 					}
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -2;
 				}//*/
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1481,8 +1456,7 @@ class Expedition extends CommonObject
 							break;
 						}
 					}
-					else
-					{
+					else {
 						// We increment stock of batches
 						// We use warehouse selected for each line
 						foreach ($lotArray as $lot)
@@ -1498,8 +1472,7 @@ class Expedition extends CommonObject
 					}
 				}
 			}
-			else
-			{
+			else {
 				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
@@ -1584,35 +1557,30 @@ class Expedition extends CommonObject
 
 							return 1;
 						}
-						else
-						{
+						else {
 							$this->db->rollback();
 							return -1;
 						}
 					}
-					else
-					{
+					else {
 						$this->error = $this->db->lasterror()." - sql=$sql";
 						$this->db->rollback();
 						return -3;
 					}
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -2;
 				}
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1770,8 +1738,7 @@ class Expedition extends CommonObject
 						{
 							$line->detail_batch = $newdetailbatch;
 						}
-						else
-						{
+						else {
 							$line->detail_batch = array_merge($line->detail_batch, $newdetailbatch);
 						}
 					}
@@ -1782,8 +1749,7 @@ class Expedition extends CommonObject
 					$this->lines[$lineindex] = $line;
 					$lineindex++;
 				}
-				else
-				{
+				else {
 					$line->total_ht += $tabprice[0];
 					$line->total_localtax1 	+= $tabprice[9];
 					$line->total_localtax2 	+= $tabprice[10];
@@ -1797,8 +1763,7 @@ class Expedition extends CommonObject
 			$this->db->free($resql);
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -3;
 		}
@@ -1831,14 +1796,12 @@ class Expedition extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -2;
 		}
@@ -2039,14 +2002,12 @@ class Expedition extends CommonObject
 				$this->date_delivery = $date_livraison;
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->error();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			return -2;
 		}
 	}
@@ -2132,8 +2093,7 @@ class Expedition extends CommonObject
 			$sql .= " VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
 			$resql = $this->db->query($sql);
 		}
-		else
-		{
+		else {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
 			$sql .= " code='".$this->db->escape($this->update['code'])."'";
 			$sql .= ",libelle='".$this->db->escape($this->update['libelle'])."'";
@@ -2208,8 +2168,7 @@ class Expedition extends CommonObject
 			$url = str_replace('{TRACKID}', $value, $tracking);
 			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value ? $value : 'url').'</a>', $url, $url);
 		}
-		else
-		{
+		else {
 			$this->tracking_url = $value;
 		}
 	}
@@ -2300,8 +2259,7 @@ class Expedition extends CommonObject
 						{
 							$qty = $obj->qty;
 						}
-						else
-						{
+						else {
 							$qty = $obj->edbqty;
 						}
 						if ($qty <= 0) continue;
@@ -2322,8 +2280,7 @@ class Expedition extends CommonObject
 								$error++; break;
 							}
 						}
-						else
-						{
+						else {
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -2336,8 +2293,7 @@ class Expedition extends CommonObject
 						}
 					}
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->lasterror();
 					$error++;
 				}
@@ -2352,8 +2308,7 @@ class Expedition extends CommonObject
 				}
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$error++;
 		}
@@ -2363,8 +2318,7 @@ class Expedition extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->statut = self::STATUS_VALIDATED;
 			$this->db->rollback();
 			return -1;
@@ -2408,8 +2362,7 @@ class Expedition extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->statut = self::STATUS_VALIDATED;
 			$this->billed = 0;
 			$this->db->rollback();
@@ -2477,8 +2430,7 @@ class Expedition extends CommonObject
 						{
 							$qty = $obj->qty;
 						}
-						else
-						{
+						else {
 							$qty = $obj->edbqty;
 						}
 						if ($qty <= 0) continue;
@@ -2500,8 +2452,7 @@ class Expedition extends CommonObject
 								$error++; break;
 							}
 						}
-						else
-						{
+						else {
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -2514,8 +2465,7 @@ class Expedition extends CommonObject
 						}
 					}
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->lasterror();
 					$error++;
 				}
@@ -2538,8 +2488,7 @@ class Expedition extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->statut = self::STATUS_CLOSED;
 			$this->billed = $oldbilled;
 			$this->db->rollback();
@@ -2792,8 +2741,7 @@ class ExpeditionLigne extends CommonObjectLine
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->errors[] = $this->db->lasterror();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -2886,8 +2834,7 @@ class ExpeditionLigne extends CommonObjectLine
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$error++;
 		}
 	}
@@ -2947,8 +2894,7 @@ class ExpeditionLigne extends CommonObjectLine
 				// End call triggers
 			}
 		}
-		else
-		{
+		else {
 			$this->errors[] = $this->db->lasterror()." - sql=$sql";
 			$error++;
 		}
@@ -2957,8 +2903,7 @@ class ExpeditionLigne extends CommonObjectLine
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
@@ -3001,8 +2946,7 @@ class ExpeditionLigne extends CommonObjectLine
 				$this->errors[] = 'ErrorBadParameters';
 				$error++;
 			}
-			else
-			{
+			else {
 				$batch = $this->detail_batch[0]->batch;
 				$batch_id = $this->detail_batch[0]->fk_origin_stock;
 				$expedition_batch_id = $this->detail_batch[0]->id;
@@ -3057,8 +3001,7 @@ class ExpeditionLigne extends CommonObjectLine
 				$this->errors[] = $this->db->lasterror()." - ExpeditionLineBatch::fetchAll";
 				$error++;
 			}
-			else
-			{
+			else {
 				// caculate new total line qty
 				foreach ($lotArray as $lot)
 				{
@@ -3156,8 +3099,7 @@ class ExpeditionLigne extends CommonObjectLine
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php
index 6c9942dd9a8..131d2abc261 100644
--- a/htdocs/expedition/class/expeditionbatch.class.php
+++ b/htdocs/expedition/class/expeditionbatch.class.php
@@ -91,8 +91,7 @@ class ExpeditionLineBatch extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -136,8 +135,7 @@ class ExpeditionLineBatch extends CommonObject
 			$this->fk_expeditiondet = $id_line_expdet;
 			return $this->id;
 		}
-		else
-		{
+		else {
 			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
@@ -167,8 +165,7 @@ class ExpeditionLineBatch extends CommonObject
 		{
 			return 1;
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 	}
@@ -231,8 +228,7 @@ class ExpeditionLineBatch extends CommonObject
 			$db->free($resql);
 			return $ret;
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 			return -1;
 		}
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 36d471b59d3..1ea47ea199b 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -88,8 +88,7 @@ if ($action == 'addcontact' && $user->rights->expedition->creer)
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index d3fec260d95..15dc8168a54 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -120,8 +120,7 @@ if ($resql)
 			print '</td></tr>';
 			$i++;
 		}
-	} else
-	{
+	} else {
 		print '<tr><td>'.$langs->trans("None").'</td><td></td><td></td></tr>';
 	}
 
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 999bde3fb32..b6de8adc74d 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -687,8 +687,7 @@ if ($resql)
 				print showDimensionInBestUnit($tmparray['weight'], 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');
 				print $form->textwithpicto('', $langs->trans('EstimatedWeight'), 1);
 			}
-			else
-			{
+			else {
 				print $object->trueWeight;
 				print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
 			}
@@ -804,8 +803,7 @@ if ($resql)
 
 	print $formfile->showdocuments('massfilesarea_sendings', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 75ee2ef4da3..1c874d402b5 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -377,8 +377,7 @@ if ($id > 0 || !empty($ref))
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		}
-		else
-		{
+		else {
 			print dol_print_date($object->date_livraison, 'daytext');
 			if ($object->hasDelay() && !empty($object->date_livraison)) {
 			    print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
@@ -531,8 +530,7 @@ if ($id > 0 || !empty($ref))
 		    {
 		        print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 		    }
-		    else
-		    {
+		    else {
 		        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 		    }
 		    print '</td></tr>';
@@ -644,8 +642,7 @@ if ($id > 0 || !empty($ref))
 			{
 				print '<td class="center">'.$langs->trans("RealStock").'</td>';
 			}
-			else
-			{
+			else {
 				print '<td>&nbsp;</td>';
 			}
 			print "</tr>\n";
@@ -697,8 +694,7 @@ if ($id > 0 || !empty($ref))
 
 							$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
 						}
-						else
-							$label = (!empty($objp->label) ? $objp->label : $objp->product_label);
+						else $label = (!empty($objp->label) ? $objp->label : $objp->product_label);
 
 						print '<td>';
 						print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
@@ -739,8 +735,7 @@ if ($id > 0 || !empty($ref))
 
 						print '</td>';
 					}
-					else
-					{
+					else {
 						print "<td>";
 						if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
 						else $text = img_object($langs->trans('Product'), 'product');
@@ -776,8 +771,7 @@ if ($id > 0 || !empty($ref))
 						$toBeShippedTotal += $toBeShipped[$objp->fk_product];
 						print $toBeShipped[$objp->fk_product];
 					}
-					else
-					{
+					else {
 						print '0 ('.$langs->trans("Service").')';
 					}
 					print '</td>';
@@ -799,8 +793,7 @@ if ($id > 0 || !empty($ref))
 						}
 						print '</td>';
 					}
-					else
-					{
+					else {
 						print '<td>&nbsp;</td>';
 					}
 					print "</tr>\n";
@@ -844,8 +837,7 @@ if ($id > 0 || !empty($ref))
 
 			print "</table>";
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -871,8 +863,7 @@ if ($id > 0 || !empty($ref))
 						print ' '.img_warning($langs->trans("WarningNoQtyLeftToSend"));
 					}
 				}
-				else
-				{
+				else {
 					print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateShipment").'</a>';
 				}
 			}
@@ -935,8 +926,7 @@ if ($id > 0 || !empty($ref))
 
 				$somethingshown = 1;
 			}
-			else
-			{
+			else {
 				print '<div class="tabsAction">';
 				print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateShipment").'</a>';
 				print '</div>';
@@ -945,8 +935,7 @@ if ($id > 0 || !empty($ref))
 
 		show_list_sending_receive('commande', $object->id);
 	}
-	else
-	{
+	else {
 		/* Order not found */
 		setEventMessages($langs->trans("NonExistentOrder"), null, 'errors');
 	}
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index db28b094e65..ce305ea41bb 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -75,8 +75,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
 }
-else
-{
+else {
     $filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
 }
 
diff --git a/htdocs/expensereport/ajax/ajaxik.php b/htdocs/expensereport/ajax/ajaxik.php
index b2c89f68e41..413bc061fbf 100644
--- a/htdocs/expensereport/ajax/ajaxik.php
+++ b/htdocs/expensereport/ajax/ajaxik.php
@@ -52,22 +52,18 @@ $fk_c_exp_tax_cat = GETPOST('fk_c_exp_tax_cat');
 
 if (empty($fk_expense) || $fk_expense < 0) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_expense, 'fk_expense')));
 elseif (empty($fk_c_exp_tax_cat) || $fk_c_exp_tax_cat < 0) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat')));
-else
-{
+else {
 	// @see ndfp.class.php:3576 (method: compute_total_km)
 	$expense = new ExpenseReport($db);
 	if ($expense->fetch($fk_expense) <= 0) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'fk_expense' => $fk_expense));
-	else
-	{
+	else {
 		$userauthor = new User($db);
 		if ($userauthor->fetch($expense->fk_user_author) <= 0) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'fk_user_author' => $expense->fk_user_author));
-		else
-		{
+		else {
 			$range = ExpenseReportIk::getRangeByUser($userauthor, $fk_c_exp_tax_cat);
 
 			if (empty($range)) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'range' => $range));
-			else
-			{
+			else {
 				$ikoffset = price($range->ikoffset, 0, $langs, 1, -1, -1, $conf->currency);
 				echo json_encode(array('up' => $range->coef, 'ikoffset' => $range->ikoffset, 'title' => $langs->transnoentitiesnoconv('ExpenseRangeOffset', $offset), 'comment' => 'offset should be apply on addline or updateline'));
 			}
diff --git a/htdocs/expensereport/ajax/ajaxprojet.php b/htdocs/expensereport/ajax/ajaxprojet.php
index 2fdb0cd4fdb..57b86ac9c7f 100644
--- a/htdocs/expensereport/ajax/ajaxprojet.php
+++ b/htdocs/expensereport/ajax/ajaxprojet.php
@@ -77,12 +77,10 @@ if (GETPOST('fk_projet') != '')
 
 	    echo json_encode($return_arr);
 	}
-	else
-	{
+	else {
 	    echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
 	}
 }
-else
-{
+else {
     echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
 }
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 2a0f804b196..c4a2d176e59 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -178,8 +178,7 @@ if (empty($reshook))
         {
             setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
         }
-        else
-        {
+        else {
             if ($object->id > 0)
             {
                 // Because createFromClone modifies the object, we must clone it so that we can restore it later if it fails
@@ -191,8 +190,7 @@ if (empty($reshook))
                     header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
                     exit;
                 }
-                else
-                {
+                else {
                     setEventMessages($object->error, $object->errors, 'errors');
                     $object = $orig;
                     $action = '';
@@ -211,8 +209,7 @@ if (empty($reshook))
     		header("Location: index.php");
     		exit;
     	}
-    	else
-    	{
+    	else {
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
@@ -265,8 +262,7 @@ if (empty($reshook))
     			Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
     			exit;
     		}
-    		else
-    		{
+    		else {
     			setEventMessages($object->error, $object->errors, 'errors');
     			$db->rollback();
     			$action = 'create';
@@ -298,8 +294,7 @@ if (empty($reshook))
     		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_POST['id']);
     		exit;
     	}
-    	else
-    	{
+    	else {
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
@@ -357,8 +352,7 @@ if (empty($reshook))
     			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		}
     	}
-    	else
-    	{
+    	else {
     		setEventMessages($object->error, $object->errors, 'errors');
     		$error++;
     	}
@@ -416,8 +410,7 @@ if (empty($reshook))
     					$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
     					setEventMessages($mesg, null, 'mesgs');
     				}
-    				else
-    				{
+    				else {
     					$langs->load("other");
     					if ($mailfile->error)
     					{
@@ -426,20 +419,17 @@ if (empty($reshook))
     						$mesg .= '<br>'.$mailfile->error;
     						setEventMessages($mesg, null, 'errors');
     					}
-    					else
-    					{
+    					else {
     						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
     					}
     				}
     			}
-    			else
-    			{
+    			else {
     				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
     				$action = '';
     			}
     		}
-    		else
-    		{
+    		else {
     			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
     			$action = '';
     		}
@@ -451,8 +441,7 @@ if (empty($reshook))
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 			exit;
 		}
-		else
-		{
+		else {
 			$db->rollback();
 		}
     }
@@ -543,8 +532,7 @@ if (empty($reshook))
     					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
     					exit;
     				}
-    				else
-    				{
+    				else {
     					$langs->load("other");
     					if ($mailfile->error)
     					{
@@ -553,26 +541,22 @@ if (empty($reshook))
     						$mesg .= '<br>'.$mailfile->error;
     						setEventMessages($mesg, null, 'errors');
     					}
-    					else
-    					{
+    					else {
     						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
     					}
     				}
     			}
-    			else
-    			{
+    			else {
     				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
     				$action = '';
     			}
     		}
-    		else
-    		{
+    		else {
     			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
     			$action = '';
     		}
     	}
-    	else
-    	{
+    	else {
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
@@ -666,8 +650,7 @@ if (empty($reshook))
        					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
        					exit;
        				}
-       				else
-       				{
+       				else {
        					$langs->load("other");
        					if ($mailfile->error)
        					{
@@ -676,26 +659,22 @@ if (empty($reshook))
        						$mesg .= '<br>'.$mailfile->error;
        						setEventMessages($mesg, null, 'errors');
        					}
-       					else
-       					{
+       					else {
        						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
        					}
        				}
        			}
-       			else
-       			{
+       			else {
        				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
        				$action = '';
        			}
    			}
-    		else
-    		{
+    		else {
     			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
     			$action = '';
     		}
     	}
-   		else
-   		{
+   		else {
    			setEventMessages($langs->trans("FailedtoSetToApprove"), null, 'warnings');
    			$action = '';
    		}
@@ -787,8 +766,7 @@ if (empty($reshook))
         				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
         				exit;
         			}
-        			else
-        			{
+        			else {
         				$langs->load("other");
         				if ($mailfile->error)
         				{
@@ -797,26 +775,22 @@ if (empty($reshook))
         					$mesg .= '<br>'.$mailfile->error;
         					setEventMessages($mesg, null, 'errors');
         				}
-        				else
-        				{
+        				else {
         					setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
         				}
         			}
         		}
-        		else
-        		{
+        		else {
         			setEventMessages($mailfile->error, $mailfile->errors, 'errors');
         			$action = '';
         		}
         	}
-        	else
-        	{
+        	else {
         		setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
         		$action = '';
         	}
     	}
-    	else
-    	{
+    	else {
     	    setEventMessages($langs->trans("FailedtoSetToDeny"), null, 'warnings');
     	    $action = '';
     	}
@@ -829,8 +803,7 @@ if (empty($reshook))
     	{
     		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Comment")), null, 'errors');
     	}
-    	else
-    	{
+    	else {
 	    	$object = new ExpenseReport($db);
 	    	$object->fetch($id);
 
@@ -917,8 +890,7 @@ if (empty($reshook))
 	        					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 	        					exit;
 	        				}
-	        				else
-	        				{
+	        				else {
 	        					$langs->load("other");
 	        					if ($mailfile->error)
 	        					{
@@ -927,32 +899,27 @@ if (empty($reshook))
 	        						$mesg .= '<br>'.$mailfile->error;
 	        						setEventMessages($mesg, null, 'errors');
 	        					}
-	        					else
-	        					{
+	        					else {
 	        						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
 	        					}
 	        				}
 	        			}
-	        			else
-	        			{
+	        			else {
 	        				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
 	        				$action = '';
 	        			}
 	    			}
-	    			else
-	    			{
+	    			else {
 	    			    setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
 	    			    $action = '';
 	    			}
 	    		}
-	    		else
-	    		{
+	    		else {
 	    			setEventMessages($langs->trans("FailedToSetToCancel"), null, 'warnings');
 	    			$action = '';
 	    		}
 	    	}
-	    	else
-	    	{
+	    	else {
 	    		setEventMessages($object->error, $object->errors, 'errors');
 	    	}
     	}
@@ -991,13 +958,11 @@ if (empty($reshook))
     			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
     			exit;
     		}
-    		else
-    		{
+    		else {
     			setEventMessages($object->error, $object->errors, 'errors');
     		}
     	}
-    	else
-    	{
+    	else {
     		setEventMessages("NOT_AUTHOR", '', 'errors');
     	}
     }
@@ -1132,8 +1097,7 @@ if (empty($reshook))
         				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
         				exit;
         			}
-        			else
-        			{
+        			else {
     					$langs->load("other");
         				if ($mailfile->error)
         				{
@@ -1142,26 +1106,22 @@ if (empty($reshook))
         					$mesg .= '<br>'.$mailfile->error;
         					setEventMessages($mesg, null, 'errors');
         				}
-        				else
-        				{
+        				else {
         					setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
         				}
         			}
         		}
-        		else
-        		{
+        		else {
         			setEventMessages($mailfile->error, $mailfile->errors, 'errors');
         			$action = '';
         		}
     		}
-    		else
-    		{
+    		else {
     		    setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
     		    $action = '';
     		}
     	}
-    	else
-    	{
+    	else {
     		setEventMessages($langs->trans("FailedToSetPaid"), null, 'warnings');
     		$action = '';
     	}
@@ -1313,8 +1273,7 @@ if (empty($reshook))
     		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_GET['id']);
     		exit;
     	}
-    	else
-    	{
+    	else {
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
@@ -1408,8 +1367,7 @@ if (empty($reshook))
     			//header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
     			//exit;
     		}
-    		else
-    		{
+    		else {
     			setEventMessages($object->error, $object->errors, 'errors');
     		}
     	}
@@ -1497,8 +1455,7 @@ if ($action == 'create')
 	$object = new ExpenseReport($db);
 	$include_users = $object->fetch_users_approver_expensereport();
 	if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateExpenseReport");
-	else
-	{
+	else {
     	$defaultselectuser = (empty($user->fk_user_expense_validator) ? $user->fk_user : $user->fk_user_expense_validator); // Will work only if supervisor has permission to approve so is inside include_users
     	if (!empty($conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR)) $defaultselectuser = $conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR; // Can force default approver
     	if (GETPOST('fk_user_validator', 'int') > 0) $defaultselectuser = GETPOST('fk_user_validator', 'int');
@@ -1559,8 +1516,7 @@ if ($action == 'create')
 
 	print '</form>';
 }
-else
-{
+else {
 	if ($id > 0 || $ref)
 	{
 		$result = $object->fetch($id, $ref);
@@ -1602,8 +1558,7 @@ else
 				{
 					print '<input type="hidden" name="action" value="updateFromRefuse">';
 				}
-				else
-				{
+				else {
 					print '<input type="hidden" name="action" value="update">';
 				}
 
@@ -1661,8 +1616,7 @@ else
 					print '</td>';
 					print '</tr>';
 				}
-				else
-				{
+				else {
 					print '<tr>';
 					print '<td>'.$langs->trans("VALIDOR").'</td>';
 					print '<td>';
@@ -1698,8 +1652,7 @@ else
 
 				print '</form>';
 			}
-			else
-			{
+			else {
 				dol_fiche_head($head, 'card', $langs->trans("ExpenseReport"), -1, 'trip');
 
 				// Clone confirmation
@@ -1894,8 +1847,7 @@ else
 					print '<td>'.dol_print_date($object->date_cancel, 'dayhour').'</td></tr>';
 					print '</tr>';
 				}
-				else
-				{
+				else {
 					print '<tr>';
 					print '<td>'.$langs->trans("ApprovedBy").'</td>';
 					print '<td>';
@@ -2093,8 +2045,7 @@ else
 
 				    $db->free($resql);
 				}
-				else
-				{
+				else {
 				    dol_print_error($db);
 				}
 				print "</table>";
@@ -2201,8 +2152,7 @@ else
 							{
 							    print price($line->value_unit_ht);
 							}
-							else
-							{
+							else {
 							    $tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $line->vatrate));
 							    $pricenettoshow = price2num($line->value_unit / (1 + $tmpvat / 100), 'MU');
 							    print $pricenettoshow;
@@ -2246,8 +2196,7 @@ else
                                         print '<img class="photo" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.'/'.$minifile).'" title="">';
                                         print '</a>';
                                     }
-                                    else
-                                    {
+                                    else {
                                         $modulepart = 'expensereport';
                                         $thumbshown = 0;
                                         if (preg_match('/\.pdf$/i', $ecmfilesstatic->filename))
@@ -2625,8 +2574,7 @@ else
 				dol_fiche_end();
 			} // end edit or not edit
 		}	// end of if result
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	} //fin si id > 0
@@ -2749,8 +2697,7 @@ if ($action != 'create' && $action != 'edit')
 		{
 			print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPayment').'</span></div>';
 		}
-		else
-		{
+		else {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/expensereport/payment/payment.php?id='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a></div>';
 		}
 	}
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 18fef29e04c..050a7902a43 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -412,8 +412,7 @@ class ExpenseReports extends DolibarrApi
         {
             return $this->get($id);
         }
-        else
-        {
+        else {
             throw new RestException(500, $this->expensereport->error);
         }
     }
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 70d8a3d9b59..124a1fe4e7d 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -352,27 +352,23 @@ class ExpenseReport extends CommonObject
 						$this->db->commit();
 						return $this->id;
 					}
-					else
-					{
+					else {
 						$this->db->rollback();
 						return -4;
 					}
                 }
-                else
-                {
+                else {
                     $this->db->rollback();
                     return -3;
                 }
             }
-            else
-            {
+            else {
                 dol_syslog(get_class($this)."::create error ".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -2;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror()." sql=".$sql;
             $this->db->rollback();
             return -1;
@@ -441,8 +437,7 @@ class ExpenseReport extends CommonObject
             $this->db->commit();
             return $this->id;
         }
-        else
-        {
+        else {
             $this->db->rollback();
             return -1;
         }
@@ -505,15 +500,13 @@ class ExpenseReport extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -2;
 			}
         }
-        else
-        {
+        else {
 			$this->db->rollback();
             $this->error = $this->db->error();
             return -1;
@@ -606,13 +599,11 @@ class ExpenseReport extends CommonObject
 
                 return $result;
             }
-            else
-            {
+            else {
                 return 0;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -659,21 +650,18 @@ class ExpenseReport extends CommonObject
 					$this->db->commit();
 					return 1;
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					$this->error = $this->db->error();
 					return -2;
 				}
             }
-            else
-            {
+            else {
 				$this->db->commit();
                 return 0;
             }
         }
-        else
-        {
+        else {
 			$this->db->rollback();
             dol_print_error($this->db);
             return -1;
@@ -781,8 +769,7 @@ class ExpenseReport extends CommonObject
             }
             $this->db->free($resql);
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
         }
     }
@@ -947,8 +934,7 @@ class ExpenseReport extends CommonObject
                 print '<td>&nbsp;</td>';
                 print '</tr>';
             }
-            else
-            {
+            else {
                 $this->error = $db->lasterror();
                 return -1;
             }
@@ -992,14 +978,13 @@ class ExpenseReport extends CommonObject
             if ($result):
                 $this->db->free($result);
                 return 1;
-            else:
+            else :
                 $this->error = $this->db->lasterror();
                 dol_syslog(get_class($this)."::recalculer: Error ".$this->error, LOG_ERR);
                 return -3;
             endif;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this)."::recalculer: Error ".$this->error, LOG_ERR);
             return -3;
@@ -1032,8 +1017,7 @@ class ExpenseReport extends CommonObject
         {
         	$sql .= ' ORDER BY de.rang ASC, de.rowid ASC';
         }
-        else
-        {
+        else {
         	$sql .= ' ORDER BY de.rang ASC, de.date ASC';
         }
 
@@ -1083,8 +1067,7 @@ class ExpenseReport extends CommonObject
             $this->db->free($resql);
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this)."::fetch_lines: Error ".$this->error, LOG_ERR);
             return -3;
@@ -1114,16 +1097,14 @@ class ExpenseReport extends CommonObject
                 $this->db->commit();
                 return 1;
             }
-            else
-            {
+            else {
                 $this->error = $this->db->error()." sql=".$sql;
                 dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -6;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->error()." sql=".$sql;
             dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
             $this->db->rollback();
@@ -1159,8 +1140,7 @@ class ExpenseReport extends CommonObject
         {
             $num = $this->getNextNumRef();
         }
-        else
-		{
+        else {
             $num = $this->ref;
         }
         if (empty($num) || $num < 0) return -1;
@@ -1244,15 +1224,13 @@ class ExpenseReport extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -2;
 			}
         }
-        else
-        {
+        else {
 			$this->db->rollback();
             $this->error = $this->db->lasterror();
             return -1;
@@ -1294,14 +1272,12 @@ class ExpenseReport extends CommonObject
             {
                 return 1;
             }
-            else
-            {
+            else {
                 $this->error = $this->db->lasterror();
                 return -1;
             }
         }
-        else
-        {
+        else {
             dol_syslog(get_class($this)."::set_save_from_refuse expensereport already with save status", LOG_WARNING);
         }
     }
@@ -1346,22 +1322,19 @@ class ExpenseReport extends CommonObject
 					$this->db->commit();
 					return 1;
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					$this->error = $this->db->error();
 					return -2;
 				}
             }
-            else
-            {
+            else {
 				$this->db->rollback();
                 $this->error = $this->db->lasterror();
                 return -1;
             }
         }
-        else
-        {
+        else {
             dol_syslog(get_class($this)."::setApproved expensereport already with approve status", LOG_WARNING);
         }
 
@@ -1413,22 +1386,19 @@ class ExpenseReport extends CommonObject
 					$this->db->commit();
 					return 1;
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					$this->error = $this->db->error();
 					return -2;
 				}
             }
-            else
-            {
+            else {
 				$this->db->rollback();
                 $this->error = $this->db->lasterror();
                 return -1;
             }
         }
-        else
-        {
+        else {
             dol_syslog(get_class($this)."::setDeny expensereport already with refuse status", LOG_WARNING);
         }
     }
@@ -1474,22 +1444,19 @@ class ExpenseReport extends CommonObject
 					$this->db->commit();
 					return 1;
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					$this->error = $this->db->error();
 					return -2;
 				}
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -1;
 			}
         }
-        else
-        {
+        else {
             dol_syslog(get_class($this)."::set_unpaid expensereport already with unpaid status", LOG_WARNING);
         }
     }
@@ -1538,22 +1505,19 @@ class ExpenseReport extends CommonObject
 					$this->db->commit();
 					return 1;
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					$this->error = $this->db->error();
 					return -2;
 				}
             }
-            else
-            {
+            else {
 				$this->db->rollback();
                 $this->error = $this->db->error();
                 return -1;
             }
         }
-        else
-        {
+        else {
             dol_syslog(get_class($this)."::set_cancel expensereport already with cancel status", LOG_WARNING);
         }
     }
@@ -1597,16 +1561,14 @@ class ExpenseReport extends CommonObject
             {
             	return $numref;
             }
-            else
-			{
+            else {
 				$this->error = $obj->error;
 				$this->errors = $obj->errors;
             	//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
             	return -1;
             }
         }
-        else
-        {
+        else {
             $this->error = "Error_EXPENSEREPORT_ADDON_NotDefined";
             return -2;
         }
@@ -1703,7 +1665,7 @@ class ExpenseReport extends CommonObject
         $result = $this->db->query($sql);
         if ($result):
             return 1;
-        else:
+        else :
             $this->error = $this->db->error();
             return -1;
         endif;
@@ -1733,7 +1695,7 @@ class ExpenseReport extends CommonObject
         $result = $this->db->query($sql);
         if ($result):
             return 1;
-        else:
+        else :
             $this->error = $this->db->error();
             return -1;
         endif;
@@ -1823,22 +1785,19 @@ class ExpenseReport extends CommonObject
                     $this->db->commit();
                     return $this->line->id;
                 }
-                else
-                {
+                else {
                     $this->db->rollback();
                     return -1;
                 }
             }
-            else
-            {
+            else {
                 $this->error = $this->line->error;
                 dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -2;
             }
 		}
-		else
-        {
+		else {
             dol_syslog(get_class($this)."::addline status of expense report must be Draft to allow use of ->addline()", LOG_ERR);
 			$this->error = 'ErrorExpenseNotDraft';
             return -3;
@@ -1888,8 +1847,7 @@ class ExpenseReport extends CommonObject
 					$new_current_total_ttc -= $amount_to_test - $rule->amount; // ex, entered 16€, limit 12€, subtracts 4€;
 					$rule_warning_message_tab[] = $langs->trans('ExpenseReportConstraintViolationError', $rule->id, price($amount_to_test, 0, $langs, 1, -1, -1, $conf->currency), price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency), $langs->trans('by'.$rule->code_expense_rules_type, price($new_current_total_ttc, 0, $langs, 1, -1, -1, $conf->currency)));
 				}
-				else
-				{
+				else {
 					$this->error = 'ExpenseReportConstraintViolationWarning';
 					$this->errors[] = $this->error;
 
@@ -1985,8 +1943,7 @@ class ExpenseReport extends CommonObject
 			$num = $this->db->num_rows($resql);
 			if ($num > 0) return true;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
@@ -2106,8 +2063,7 @@ class ExpenseReport extends CommonObject
                 $this->db->commit();
                 return 1;
             }
-            else
-            {
+            else {
                 $this->error = $this->line->error;
                 $this->errors = $this->line->errors;
                 $this->db->rollback();
@@ -2188,13 +2144,11 @@ class ExpenseReport extends CommonObject
                 if ($existe) return 1;
                 else return 0;
             }
-            else
-            {
+            else {
                 return 0;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this)."::periode_existe  Error ".$this->error, LOG_ERR);
             return -1;
@@ -2236,8 +2190,7 @@ class ExpenseReport extends CommonObject
             }
             return $users_validator;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this)."::fetch_users_approver_expensereport  Error ".$this->error, LOG_ERR);
             return -1;
@@ -2302,8 +2255,7 @@ class ExpenseReport extends CommonObject
                 $i++;
             }
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
         }
         return $ret;
@@ -2335,8 +2287,7 @@ class ExpenseReport extends CommonObject
             $this->db->free($resql);
             return 1;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -2383,8 +2334,7 @@ class ExpenseReport extends CommonObject
 	            $response->labelShort = $langs->trans("ToApprove");
 	            $response->url = DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&amp;statut=2';
 	        }
-	        else
-	        {
+	        else {
 	            $response->warning_delay = $conf->expensereport->payment->warning_delay / 60 / 60 / 24;
 	            $response->label = $langs->trans("ExpenseReportsToPay");
 	            $response->labelShort = $langs->trans("StatusToPay");
@@ -2402,8 +2352,7 @@ class ExpenseReport extends CommonObject
 	                    $response->nbtodolate++;
 	                }
 	            }
-	            else
-	            {
+	            else {
                     if ($this->db->jdate($obj->date_valid) < ($now - $conf->expensereport->payment->warning_delay)) {
     	                $response->nbtodolate++;
                     }
@@ -2412,8 +2361,7 @@ class ExpenseReport extends CommonObject
 
             return $response;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -2439,8 +2387,7 @@ class ExpenseReport extends CommonObject
         {
             return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->approve->warning_delay);
         }
-        else
-            return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->payment->warning_delay);
+        else return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->payment->warning_delay);
     }
 
     /**
@@ -2464,8 +2411,7 @@ class ExpenseReport extends CommonObject
     			$alreadydispatched = $obj->nb;
     		}
     	}
-    	else
-    	{
+    	else {
     		$this->error = $this->db->lasterror();
     		return -1;
     	}
@@ -2499,8 +2445,7 @@ class ExpenseReport extends CommonObject
 			$this->db->free($resql);
 			return $obj->amount;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -2695,8 +2640,7 @@ class ExpenseReportLine
 				}
 			}
         }
-		else
-		{
+		else {
 			$error++;
 		}
 
@@ -2705,8 +2649,7 @@ class ExpenseReportLine
             $this->db->commit();
             return $this->id;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             dol_syslog("ExpenseReportLine::insert Error ".$this->error, LOG_ERR);
             $this->db->rollback();
@@ -2748,8 +2691,7 @@ class ExpenseReportLine
 				$amount = (double) $obj->total_amount;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
@@ -2813,15 +2755,13 @@ class ExpenseReportLine
                     $this->errors = $tmpparent->errors;
                 }
             }
-            else
-            {
+            else {
                 $error++;
                 $this->error = $tmpparent->error;
                 $this->errors = $tmpparent->errors;
             }
         }
-        else
-        {
+        else {
             $error++;
             dol_print_error($this->db);
         }
@@ -2831,8 +2771,7 @@ class ExpenseReportLine
             $this->db->commit();
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             dol_syslog("ExpenseReportLine::update Error ".$this->error, LOG_ERR);
             $this->db->rollback();
@@ -2868,8 +2807,7 @@ function select_expensereport_statut($selected = '', $htmlname = 'fk_statut', $u
         {
             print '<option value="'.$key.'" selected>';
         }
-        else
-        {
+        else {
             print '<option value="'.$key.'">';
         }
         print $langs->trans($val);
diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index c7bf959e27e..74bfdaf8bb8 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -123,8 +123,7 @@ class ExpenseReportIk extends CoreObject
 				$categories[$obj->rowid] = $obj;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -183,8 +182,7 @@ class ExpenseReportIk extends CoreObject
 				}
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -223,8 +221,7 @@ class ExpenseReportIk extends CoreObject
 				$ranges[$obj->fk_c_exp_tax_cat]['ranges'][] = $obj;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -256,8 +253,7 @@ class ExpenseReportIk extends CoreObject
 			$obj = $db->fetch_object($resql);
 			return $obj->nbRange;
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
diff --git a/htdocs/expensereport/class/expensereport_rule.class.php b/htdocs/expensereport/class/expensereport_rule.class.php
index b98552f681d..33fc152d2b7 100644
--- a/htdocs/expensereport/class/expensereport_rule.class.php
+++ b/htdocs/expensereport/class/expensereport_rule.class.php
@@ -186,8 +186,7 @@ class ExpenseReportRule extends CoreObject
 				else dol_print_error($db);
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -210,8 +209,7 @@ class ExpenseReportRule extends CoreObject
 			{
 				return $group->nom;
 			}
-			else
-			{
+			else {
 				$this->error = $group->error;
 				$this->errors[] = $this->error;
 			}
@@ -236,8 +234,7 @@ class ExpenseReportRule extends CoreObject
 			{
 				return dolGetFirstLastname($u->firstname, $u->lastname);
 			}
-			else
-			{
+			else {
 				$this->error = $u->error;
 				$this->errors[] = $this->error;
 			}
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index d06303364dd..174e6ab05e7 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -160,8 +160,7 @@ class PaymentExpenseReport extends CommonObject
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_expensereport");
 			}
-			else
-			{
+			else {
 				$error++;
 			}
 		}
@@ -172,8 +171,7 @@ class PaymentExpenseReport extends CommonObject
 		    $this->db->commit();
 			return $this->id;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -241,8 +239,7 @@ class PaymentExpenseReport extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -312,8 +309,7 @@ class PaymentExpenseReport extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -369,8 +365,7 @@ class PaymentExpenseReport extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -420,8 +415,7 @@ class PaymentExpenseReport extends CommonObject
 			$this->db->commit();
 			return $object->id;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -575,8 +569,7 @@ class PaymentExpenseReport extends CommonObject
                     }
                 }
             }
-            else
-            {
+            else {
                 $this->error = $acc->error;
                 $error++;
             }
@@ -586,8 +579,7 @@ class PaymentExpenseReport extends CommonObject
         {
             return 1;
         }
-        else
-        {
+        else {
             return -1;
         }
     }
@@ -611,8 +603,7 @@ class PaymentExpenseReport extends CommonObject
 		{
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return 0;
 		}
@@ -685,8 +676,7 @@ class PaymentExpenseReport extends CommonObject
 			}
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
     }
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index 17b7eb57619..ef344d8cadc 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -134,8 +134,7 @@ if ($object->id)
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 0597d1b29a2..7442aa7dc78 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -234,8 +234,7 @@ if ($result)
             $i++;
         }
     }
-    else
-    {
+    else {
         print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
     print '</table></div><br>';
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 07f0e332276..60b3575f0b6 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -227,8 +227,7 @@ if (empty($reshook))
     						$langs->load("errors");
     						setEventMessages($langs->trans("ErrorLoginAlreadyExists", $objectuser->login), null, 'errors');
     					}
-    					else
-    					{
+    					else {
     						setEventMessages($objectuser->error, $objectuser->errors, 'errors');
     					}
     				}
@@ -408,8 +407,7 @@ if ($resql)
 				print $form->selectarray('default_range', range(0, $maxRangeNum), $fuser->default_range);
 				print '</td></tr>';
 			}
-			else
-			{
+			else {
 				print '<tr><td class="titlefield">'.$langs->trans("DefaultCategoryCar").'</td>';
 				print '<td class="fk_c_exp_tax_cat">';
 				print dol_getIdFromCode($db, $fuser->default_c_exp_tax_cat, 'c_exp_tax_cat', 'rowid', 'label');
@@ -459,15 +457,13 @@ if ($resql)
 
 			print '</div>';
 		}
-		else
-		{
+		else {
 			print '<div class="center">';
 			print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 			print '</div><br>';
 		}
 	}
-	else
-	{
+	else {
 		$title = $langs->trans("ListTripsAndExpenses");
 
 		$newcardbutton = '';
@@ -806,8 +802,7 @@ if ($resql)
 			$i++;
 		}
 	}
-	else
-	{
+	else {
 		$colspan = 1;
 		foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
 		print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
@@ -843,8 +838,7 @@ if ($resql)
 		print $formfile->showdocuments('massfilesarea_expensereport', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index 85bc3cc300c..61e0d7326ca 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -65,8 +65,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expensere
         header("Location: ".DOL_URL_ROOT."/expensereport/index.php");
         exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
 	}
@@ -103,8 +102,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->expensere
 		header('Location: card.php?id='.$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -281,8 +279,7 @@ if ($resql)
 
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -301,8 +298,7 @@ if ($action == '')
 		{
 			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
 		}
-		else
-		{
+		else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($title_button).'">'.$langs->trans('Delete').'</a>';
 		}
 	}
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index 872bd5a0792..62b52ee3ed8 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -159,8 +159,7 @@ if ($action == 'add_payment')
                 header('Location: '.$loc);
                 exit;
             }
-            else
-            {
+            else {
                 $db->rollback();
             }
         }
@@ -322,8 +321,7 @@ if ($action == 'create' || empty($action))
 			print '<input type=hidden class="sum_remain" name="'.$nameRemain.'" value="'.$remaintopay.'">'; // autofill remainder amount
 			print '<input type="text" size="8" name="'.$namef.'" id="'.$namef.'">';
 		}
-		else
-		{
+		else {
 			print '-';
 		}
 		print "</td>";
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index 3b931bd4418..4218ebcbbd3 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -152,8 +152,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
 }
-else
-{
+else {
     $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index d0096390489..205afc61df3 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -43,8 +43,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
                 print '</div>';
                 print '</a>';
             }
-            else
-            {
+            else {
                 $error = 0;
                 $thumbshown = '';
 
@@ -133,8 +132,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
 
         print '</td></tr>';
     }
-    else
-    {
+    else {
         print '<tr class="oddeven nohover trattachnewfilenow"'.(!GETPOSTISSET('sendit') && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
         print '<td colspan="'.$colspan.'">';
         print '<span class="opacitymedium">'.$langs->trans("NoFilesUploadedYet").'</span>';
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index b5b259f2430..96febdcf34f 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -596,8 +596,7 @@ if ($action == 'create') {
 			} else {
 				if ($object->frequency > 0)
 					print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
-				else
-					print $langs->trans("NotARecurringInterventionalTemplate");
+				else print $langs->trans("NotARecurringInterventionalTemplate");
 			}
 			print '</td></tr>';
 
@@ -619,15 +618,13 @@ if ($action == 'create') {
 			print '<tr><td>';
 			if ($user->rights->ficheinter->creer && ($action == 'nb_gen_max' || $object->frequency > 0)) {
 				print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
-			} else
-				print $langs->trans("MaxPeriodNumber");
+			} else print $langs->trans("MaxPeriodNumber");
 
 			print '</td><td>';
 			if ($action == 'nb_gen_max' || $object->frequency > 0) {
 				print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max ? $object->nb_gen_max : '', $object, $user->rights->facture->creer);
 			}
-			else
-				print '';
+			else print '';
 
 			print '</td>';
 			print '</tr>';
@@ -693,8 +690,7 @@ if ($action == 'create') {
 				// Show product and description
 				if (isset($object->lines[$i]->product_type))
 					$type = $object->lines[$i]->product_type;
-				else
-					$object->lines[$i]->fk_product_type;
+				else $object->lines[$i]->fk_product_type;
 				// Try to enhance type detection using date_start and date_end for free lines when type
 				// was not saved.
 				if (!empty($objp->date_start)) $type = 1;
@@ -731,8 +727,7 @@ if ($action == 'create') {
 				print $langs->trans('Delete').'</a></div>';
 			}
 			print '</div>';
-		} else
-			print $langs->trans("ErrorRecordNotFound");
+		} else print $langs->trans("ErrorRecordNotFound");
 	} else {
 		/*
 		 *  List mode
@@ -860,10 +855,8 @@ if ($action == 'create') {
 								print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=createfrommodel';
 								print '&socid='.$objp->socid.'&id='.$objp->fich_rec.'">';
 								print $langs->trans("CreateFichInter").'</a>';
-							} else
-								print $langs->trans("DateIsNotEnough");
-						} else
-							print "&nbsp;";
+							} else print $langs->trans("DateIsNotEnough");
+						} else print "&nbsp;";
 
 						print "</td>";
 
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 28878443518..cb2022e511c 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -130,8 +130,7 @@ if (empty($reshook))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		}
-		else
-		{
+		else {
 			if ($object->id > 0)
 			{
 				// Because createFromClone modifies the object, we must clone it so that we can restore it later
@@ -143,8 +142,7 @@ if (empty($reshook))
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit;
 				}
-				else
-				{
+				else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$object = $orig;
 					$action = '';
@@ -177,8 +175,7 @@ if (empty($reshook))
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		}
-		else
-		{
+		else {
 			$mesg = '<div class="error">'.$object->error.'</div>';
 		}
 	}
@@ -206,8 +203,7 @@ if (empty($reshook))
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		}
-		else
-		{
+		else {
 			$mesg = '<div class="error">'.$object->error.'</div>';
 		}
 	}
@@ -384,20 +380,17 @@ if (empty($reshook))
 							}
 						}
 		            }
-		            else
-		            {
+		            else {
 		                $mesg = $srcobject->error;
 		                $error++;
 		            }
 		        }
-		        else
-		        {
+		        else {
 		            $mesg = $object->error;
 		            $error++;
 		        }
 		    }
-		    else
-		    {
+		    else {
 		    	// Fill array 'array_options' with data from add form
 		    	$ret = $extrafields->setOptionalsFromPost(null, $object);
 		    	if ($ret < 0) {
@@ -417,8 +410,7 @@ if (empty($reshook))
 		    		{
 		    			$id = $result; // Force raffraichissement sur fiche venant d'etre cree
 		    		}
-		    		else
-		    		{
+		    		else {
 		    			$langs->load("errors");
 		    			setEventMessages($object->error, $object->errors, 'errors');
 		    			$action = 'create';
@@ -426,8 +418,7 @@ if (empty($reshook))
 		    	}
 	        }
 	    }
-	    else
-	    {
+	    else {
 	    	$mesg = '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")).'</div>';
 	        $action = 'create';
 	    }
@@ -538,8 +529,7 @@ if (empty($reshook))
 				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 				exit;
 			}
-			else
-			{
+			else {
 				$mesg = $object->error;
 				$db->rollback();
 			}
@@ -555,8 +545,7 @@ if (empty($reshook))
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -570,8 +559,7 @@ if (empty($reshook))
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		}
-		else
-		{
+		else {
 			$mesg = '<div class="error">'.$object->error.'</div>';
 		}
 	}
@@ -585,8 +573,7 @@ if (empty($reshook))
 	        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	        exit;
 	    }
-	    else
-	    {
+	    else {
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
@@ -770,15 +757,13 @@ if (empty($reshook))
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
-			else
-			{
+			else {
 				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("errors");
 					$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
 				}
-				else
-				{
+				else {
 					$mesg = '<div class="error">'.$object->error.'</div>';
 				}
 			}
@@ -846,8 +831,7 @@ if ($action == 'create')
         {
             $projectid = GETPOST('originid', 'int');
         }
-        else
-		{
+        else {
             // For compatibility
 			if ($element == 'order' || $element == 'commande') {
 				$element = $subelement = 'commande';
@@ -1062,8 +1046,7 @@ if ($action == 'create')
 			print '</table>';
 		}
 	}
-	else
-	{
+	else {
 		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 
@@ -1135,8 +1118,7 @@ elseif ($id > 0 || !empty($ref))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-		else
-		{
+		else {
 			$numref = $object->ref;
 		}
 		$text = $langs->trans('ConfirmValidateIntervention', $numref);
@@ -1291,8 +1273,7 @@ elseif ($id > 0 || !empty($ref))
 			$formcontract = new Formcontract($db);
 			$formcontract->formSelectContract($_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, $object->fk_contrat, 'contratid', 0, 1);
 		}
-		else
-		{
+		else {
 			if ($object->fk_contrat)
             {
                 $contratstatic = new Contrat($db);
@@ -1300,8 +1281,7 @@ elseif ($id > 0 || !empty($ref))
                 //print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
                 print $contratstatic->getNomUrl(0, '', 1);
             }
-            else
-            {
+            else {
                 print "&nbsp;";
             }
 		}
@@ -1364,8 +1344,7 @@ elseif ($id > 0 || !empty($ref))
 			print '<input type="hidden" name="action" value="updateline">';
 			print '<input type="hidden" name="line_id" value="'.GETPOST('line_id', 'int').'">';
 		}
-		else
-		{
+		else {
 			print '<input type="hidden" name="action" value="addline">';
 		}
 
@@ -1447,8 +1426,7 @@ elseif ($id > 0 || !empty($ref))
 						}
 						print '</td>';
 					}
-					else
-					{
+					else {
 						print '<td colspan="2">&nbsp;</td>';
 					}
 
@@ -1585,8 +1563,7 @@ elseif ($id > 0 || !empty($ref))
 
 			if ($num) print '</table>';
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -1675,8 +1652,7 @@ elseif ($id > 0 || !empty($ref))
 						{
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("InterventionClassifyBilled").'</a></div>';
 						}
-						else
-						{
+						else {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifyunbilled">'.$langs->trans("InterventionClassifyUnBilled").'</a></div>';
 						}
 					}
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 1f14d8aa4c8..0574c38cdfb 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -207,8 +207,7 @@ class Fichinter extends CommonObject
 			$this->db->free($resql);
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -335,16 +334,14 @@ class Fichinter extends CommonObject
 				$this->db->commit();
 				return $this->id;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				$this->error = join(',', $this->errors);
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -405,8 +402,7 @@ class Fichinter extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -481,8 +477,7 @@ class Fichinter extends CommonObject
 				return 1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -536,8 +531,7 @@ class Fichinter extends CommonObject
 			    return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -569,8 +563,7 @@ class Fichinter extends CommonObject
 			{
 				$num = $this->getNextNumRef($this->thirdparty);
 			}
-			else
-			{
+			else {
 				$num = $this->ref;
 			}
 			$this->newref = dol_sanitizeFileName($num);
@@ -656,8 +649,7 @@ class Fichinter extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::setValid ".$this->error, LOG_ERR);
 				return -1;
@@ -878,14 +870,12 @@ class Fichinter extends CommonObject
 			{
 				return $numref;
 			}
-			else
-			{
+			else {
 				dol_print_error($db, "Fichinter::getNextNumRef ".$obj->error);
 				return "";
 			}
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("Error_FICHEINTER_ADDON_NotDefined");
 			return "";
@@ -944,8 +934,7 @@ class Fichinter extends CommonObject
 			}
 			$this->db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -1065,8 +1054,7 @@ class Fichinter extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1097,8 +1085,7 @@ class Fichinter extends CommonObject
 				$this->date_delivery = $date_delivery;
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->error();
 				dol_syslog("Fichinter::set_date_delivery Erreur SQL");
 				return -1;
@@ -1131,8 +1118,7 @@ class Fichinter extends CommonObject
 				$this->description = $description;
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->error();
 				dol_syslog("Fichinter::set_description Erreur SQL");
 				return -1;
@@ -1165,8 +1151,7 @@ class Fichinter extends CommonObject
 				$this->fk_contrat = $contractid;
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->error();
 				return -1;
 			}
@@ -1257,8 +1242,7 @@ class Fichinter extends CommonObject
 			$this->db->commit();
 			return $this->id;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1303,8 +1287,7 @@ class Fichinter extends CommonObject
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->error();
 				$this->db->rollback();
 				return -1;
@@ -1396,8 +1379,7 @@ class Fichinter extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1501,8 +1483,7 @@ class FichinterLigne extends CommonObjectLine
 			$this->db->free($result);
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error().' sql='.$sql;
 			return -1;
 		}
@@ -1537,8 +1518,7 @@ class FichinterLigne extends CommonObjectLine
 				$obj = $this->db->fetch_object($resql);
 				$rangToUse = $obj->max + 1;
 			}
-			else
-			{
+			else {
 				dol_print_error($this->db);
 				$this->db->rollback();
 				return -1;
@@ -1591,14 +1571,12 @@ class FichinterLigne extends CommonObjectLine
 				$this->db->commit();
 				return $result;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -1659,15 +1637,13 @@ class FichinterLigne extends CommonObjectLine
 				$this->db->commit();
 				return $result;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1712,15 +1688,13 @@ class FichinterLigne extends CommonObjectLine
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->error();
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -1771,21 +1745,18 @@ class FichinterLigne extends CommonObjectLine
 					$this->db->commit();
 					return $result;
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					return -1;
 				}
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->error()." sql=".$sql;
 				$this->db->rollback();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			return -2;
 		}
 	}
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index fa0ec89d558..bf0ec43cce2 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -67,8 +67,7 @@ if ($action == 'addcontact' && $user->rights->ficheinter->creer)
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			$mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index a6b4c88ed09..099d542b462 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -171,8 +171,7 @@ if ($object->id)
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 1ee24997e87..42649efb2f2 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -180,8 +180,7 @@ if ($resql)
     print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
     print "</table></div><br>";
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 64a3c3812bb..481c7c075a1 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -653,8 +653,7 @@ if ($resql)
 
 	print $formfile->showdocuments('massfilesarea_interventions', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index 0ca948312c6..a761cdff622 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -82,8 +82,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filenamenb = $dir.'/interventionsnbinyear-'.$user->id.'-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsnbinyear-'.$user->id.'-'.$year.'.png';
 }
-else
-{
+else {
     $filenamenb = $dir.'/interventionsnbinyear-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsnbinyear-'.$year.'.png';
 }
@@ -122,8 +121,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filenameamount = $dir.'/interventionsamountinyear-'.$user->id.'-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsamountinyear-'.$user->id.'-'.$year.'.png';
 }
-else
-{
+else {
     $filenameamount = $dir.'/interventionsamountinyear-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsamountinyear-'.$year.'.png';
 }
@@ -161,8 +159,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filename_avg = $dir.'/interventionsaverage-'.$user->id.'-'.$year.'.png';
     $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsaverage-'.$user->id.'-'.$year.'.png';
 }
-else
-{
+else {
     $filename_avg = $dir.'/interventionsaverage-'.$year.'.png';
     $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsaverage-'.$year.'.png';
 }
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 6470b7db313..535fcae5e75 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -236,8 +236,7 @@ if ($object->id > 0)
 	{
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_supplier_id, 'cond_reglement_supplier_id', -1, 1);
 	}
-	else
-	{
+	else {
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_supplier_id, 'none');
 	}
 	print "</td>";
@@ -255,8 +254,7 @@ if ($object->id > 0)
 	{
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_supplier_id, 'mode_reglement_supplier_id', 'DBIT', 1, 1);
 	}
-	else
-	{
+	else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_supplier_id, 'none');
 	}
 	print "</td>";
@@ -335,8 +333,7 @@ if ($object->id > 0)
             $adh->ref = $adh->getFullName($langs);
             print $adh->getNomUrl(1);
         }
-        else
-        {
+        else {
             print $langs->trans("ThirdpartyNotLinkedToMember");
         }
         print '</td>';
@@ -567,8 +564,7 @@ if ($object->id > 0)
 	            {
 	                print dol_print_date($db->jdate($obj->dc), 'day');
 	            }
-	            else
-	            {
+	            else {
 	                print "-";
 	            }
 	            print '</td>';
@@ -580,8 +576,7 @@ if ($object->id > 0)
 
 	        if ($num > 0) print "</table>";
 	    }
-	    else
-	    {
+	    else {
 	        dol_print_error($db);
 	    }
 	}
@@ -607,8 +602,7 @@ if ($object->id > 0)
 		{
 			$sql2 .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY.")"; //  Must match filter in htdocs/fourn/orderstoinvoice.php
 		}
-		else
-		{
+		else {
 			// CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.", ".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY
 			$sql2 .= " AND c.fk_statut IN (".$db->escape($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS).")";
 		}
@@ -678,8 +672,7 @@ if ($object->id > 0)
 				{
 					print dol_print_date($db->jdate($obj->dc), 'day');
 				}
-				else
-				{
+				else {
 					print "-";
 				}
 				print '</td>';
@@ -691,8 +684,7 @@ if ($object->id > 0)
 
 			if ($num > 0) print "</table>";
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -762,8 +754,7 @@ if ($object->id > 0)
 			$db->free($resql);
 			if ($num > 0) print '</table>';
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	}
@@ -818,8 +809,7 @@ if ($object->id > 0)
 					// Company is open
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/orderstoinvoice.php?socid='.$object->id.'">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
 				}
-				else
-				{
+				else {
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
 				}
 			}
@@ -843,8 +833,7 @@ if ($object->id > 0)
         	{
             	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a>';
         	}
-        	else
-        	{
+        	else {
             	print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
         	}
     	}
@@ -871,8 +860,7 @@ if ($object->id > 0)
     	show_actions_done($conf, $langs, $db, $object);
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 1f20965fab3..c69b9aa701d 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -670,8 +670,7 @@ class SupplierInvoices extends DolibarrApi
     	if ($updateRes > 0) {
     		return $this->get($id);
     	}
-    	else
-    	{
+    	else {
     		throw new RestException(405, $this->invoice->error);
     	}
     }
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index 30995b3b0df..70f4fcfe233 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -96,8 +96,7 @@ class Fournisseur extends Societe
 			$obj = $this->db->fetch_object($resql);
 			return $obj->nb;
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 	}
@@ -137,8 +136,7 @@ class Fournisseur extends Societe
             $this->db->free($resql);
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -167,8 +165,7 @@ class Fournisseur extends Societe
 			dol_syslog("Fournisseur::CreateCategory : Success");
 			return 0;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			dol_syslog("Fournisseur::CreateCategory : Failed (".$this->error.")");
 			return -1;
@@ -205,8 +202,7 @@ class Fournisseur extends Societe
 				$arr[$obj->rowid] = $obj->name;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = $this->db->lasterror();
 		}
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 19060b9a393..59f4e583e14 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -423,13 +423,11 @@ class CommandeFournisseur extends CommonOrder
             {
             	return -1;
             }
-            else
-            {
+            else {
             	return 1;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->error()." sql=".$sql;
             return -1;
         }
@@ -548,8 +546,7 @@ class CommandeFournisseur extends CommonOrder
 
     		return $num;
     	}
-    	else
-    	{
+    	else {
     		$this->error = $this->db->error()." sql=".$sql;
     		return -1;
     	}
@@ -586,8 +583,7 @@ class CommandeFournisseur extends CommonOrder
             {
                 $num = $this->getNextNumRef($soc);
             }
-            else
-			{
+            else {
                 $num = $this->ref;
             }
             $this->newref = dol_sanitizeFileName($num);
@@ -667,14 +663,12 @@ class CommandeFournisseur extends CommonOrder
                 $this->db->commit();
                 return 1;
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 return -1;
             }
         }
-        else
-        {
+        else {
             $this->error = 'NotAuthorized';
             dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
             return -1;
@@ -882,14 +876,12 @@ class CommandeFournisseur extends CommonOrder
             {
                 return $numref;
             }
-            else
-			{
+            else {
                 $this->error = $obj->error;
                 return -1;
             }
         }
-        else
-		{
+        else {
             $this->error = "Error_COMMANDE_SUPPLIER_ADDON_NotDefined";
             return -2;
         }
@@ -924,14 +916,12 @@ class CommandeFournisseur extends CommonOrder
         	    $this->db->commit();
         	    return 1;
         	}
-        	else
-        	{
+        	else {
         	    $this->db->rollback();
                 return -1;
         	}
         }
-        else
-        {
+        else {
         	dol_print_error($this->db);
 
         	$this->db->rollback();
@@ -971,8 +961,7 @@ class CommandeFournisseur extends CommonOrder
             {
                 $num = $this->getNextNumRef($soc);
             }
-            else
-			{
+            else {
                 $num = $this->ref;
             }
             $this->newref = dol_sanitizeFileName($num);
@@ -996,7 +985,7 @@ class CommandeFournisseur extends CommonOrder
     	        	}
     	        }
 			}
-			else	// request a second level approval
+			else // request a second level approval
 			{
             	$sql .= " date_approve2='".$this->db->idate($now)."',";
             	$sql .= " fk_user_approve2 = ".$user->id;
@@ -1064,7 +1053,7 @@ class CommandeFournisseur extends CommonOrder
 			            $this->date_approve = $now;
 		    	        $this->user_approve_id = $user->id;
 					}
-					else	// request a second level approval
+					else // request a second level approval
 					{
 			            $this->date_approve2 = $now;
 		    	        $this->user_approve_id2 = $user->id;
@@ -1073,21 +1062,18 @@ class CommandeFournisseur extends CommonOrder
                     $this->db->commit();
                     return 1;
                 }
-                else
-                {
+                else {
                     $this->db->rollback();
                     return -1;
                 }
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 $this->error = $this->db->lasterror();
                 return -1;
             }
         }
-        else
-        {
+        else {
             dol_syslog(get_class($this)."::approve Not Authorized", LOG_ERR);
         }
         return -1;
@@ -1127,21 +1113,18 @@ class CommandeFournisseur extends CommonOrder
                         $error++;
                         $this->db->rollback();
                     }
-                    else
-                    	$this->db->commit();
+                    else $this->db->commit();
 					// End call triggers
                 }
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 $this->error = $this->db->lasterror();
                 dol_syslog(get_class($this)."::refuse Error -1");
                 $result = -1;
             }
         }
-        else
-        {
+        else {
             dol_syslog(get_class($this)."::refuse Not Authorized");
         }
         return $result;
@@ -1188,22 +1171,19 @@ class CommandeFournisseur extends CommonOrder
                     $this->db->commit();
                     return 1;
                 }
-                else
-                {
+                else {
                     $this->db->rollback();
                     return -1;
                 }
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 $this->error = $this->db->lasterror();
                 dol_syslog(get_class($this)."::cancel ".$this->error);
                 return -1;
             }
         }
-        else
-        {
+        else {
             dol_syslog(get_class($this)."::cancel Not Authorized");
             return -1;
         }
@@ -1248,8 +1228,7 @@ class CommandeFournisseur extends CommonOrder
                 if ($result < 0) $error++;
                 // End call triggers
             }
-            else
-            {
+            else {
                 $error++;
                 $this->error = $this->db->lasterror();
                 $this->errors[] = $this->db->lasterror();
@@ -1259,13 +1238,11 @@ class CommandeFournisseur extends CommonOrder
             {
                 $this->db->commit();
             }
-            else
-            {
+            else {
                 $this->db->rollback();
             }
         }
-        else
-        {
+        else {
             $error++;
             $this->error = $langs->trans('NotAuthorized');
             $this->errors[] = $langs->trans('NotAuthorized');
@@ -1429,7 +1406,7 @@ class CommandeFournisseur extends CommonOrder
 							            }
 							        }
 							    }
-							    else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+							    else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
 							    {
 							        $origin_id = $tmp_origin_id;
 									$ret = $this->add_object_linked($origin, $origin_id);
@@ -1464,16 +1441,14 @@ class CommandeFournisseur extends CommonOrder
 	                $this->db->commit();
 	                return $this->id;
 	            }
-	            else
-	            {
+	            else {
 	                $this->error = $this->db->lasterror();
 	                $this->db->rollback();
 	                return -2;
 	            }
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -1558,8 +1533,7 @@ class CommandeFournisseur extends CommonOrder
             $this->db->commit();
             return $this->id;
         }
-        else
-        {
+        else {
             $this->db->rollback();
             return -1;
         }
@@ -1627,8 +1601,7 @@ class CommandeFournisseur extends CommonOrder
 			{
 				$pu = $pu_ht;
 			}
-			else
-			{
+			else {
 				$pu = $pu_ttc;
 			}
 			$desc = trim($desc);
@@ -1699,8 +1672,7 @@ class CommandeFournisseur extends CommonOrder
                             return -1;
                         }
                     }
-                    else
-    				{
+                    else {
                         $this->error = $prod->error;
                         $this->db->rollback();
                         return -1;
@@ -1716,8 +1688,7 @@ class CommandeFournisseur extends CommonOrder
 					{
 						$qty = $prod->packaging;
 					}
-					else
-					{
+					else {
 						if (($qty % $prod->packaging) > 0)
 						{
 							$coeff = intval($qty / $prod->packaging) + 1;
@@ -1727,8 +1698,7 @@ class CommandeFournisseur extends CommonOrder
 					}
 				}
             }
-            else
-            {
+            else {
                 $product_type = $type;
             }
 
@@ -1842,14 +1812,12 @@ class CommandeFournisseur extends CommonOrder
                     $this->db->commit();
                     return $this->line->id;
                 }
-                else
-                {
+                else {
                     $this->db->rollback();
                     return -1;
                 }
             }
-            else
-            {
+            else {
                 $this->error = $this->line->error;
                 $this->errors = $this->line->errors;
                 dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
@@ -1927,8 +1895,7 @@ class CommandeFournisseur extends CommonOrder
 					// End call triggers
                 }
             }
-            else
-			{
+            else {
                 $this->error = $this->db->lasterror();
                 $error++;
             }
@@ -1957,14 +1924,12 @@ class CommandeFournisseur extends CommonOrder
                 $this->db->commit();
                 return 1;
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 return -1;
             }
         }
-        else
-		{
+        else {
             $this->error = 'BadStatusForObject';
             return -2;
         }
@@ -1993,15 +1958,13 @@ class CommandeFournisseur extends CommonOrder
                 $this->update_price();
                 return 1;
             }
-            else
-            {
+            else {
                 $this->error = $line->error;
                 $this->errors = $line->errors;
                 return -1;
             }
         }
-        else
-        {
+        else {
             return -2;
         }
     }
@@ -2066,8 +2029,7 @@ class CommandeFournisseur extends CommonOrder
                 $error++;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->db->lasterror();
             $error++;
@@ -2130,8 +2092,7 @@ class CommandeFournisseur extends CommonOrder
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -$error;
@@ -2167,8 +2128,7 @@ class CommandeFournisseur extends CommonOrder
             }
             return 0;
         }
-        else
-        {
+        else {
             return -1;
         }
     }
@@ -2316,24 +2276,21 @@ class CommandeFournisseur extends CommonOrder
                     {
                         $this->db->commit();
                     }
-                    else
-                    {
+                    else {
                         $this->statut = $old_statut;
                         $this->db->rollback();
                         $this->error = $this->db->lasterror();
                         $result = -1;
                     }
                 }
-                else
-                {
+                else {
                     $this->db->rollback();
                     $this->error = $this->db->lasterror();
                     $result = -1;
                 }
             }
         }
-        else
-        {
+        else {
             $this->error = $langs->trans('NotAuthorized');
             $this->errors[] = $langs->trans('NotAuthorized');
             dol_syslog(get_class($this)."::Livraison Not Authorized");
@@ -2391,8 +2348,7 @@ class CommandeFournisseur extends CommonOrder
         		$this->db->commit();
         		return 1;
         	}
-        	else
-        	{
+        	else {
         		foreach ($this->errors as $errmsg)
         		{
         			dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2402,8 +2358,7 @@ class CommandeFournisseur extends CommonOrder
         		return -1 * $error;
         	}
         }
-        else
-        {
+        else {
             return -2;
         }
     }
@@ -2458,8 +2413,7 @@ class CommandeFournisseur extends CommonOrder
             	$this->db->commit();
             	return 1;
             }
-            else
-            {
+            else {
             	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2469,8 +2423,7 @@ class CommandeFournisseur extends CommonOrder
             	return -1 * $error;
             }
         }
-        else
-        {
+        else {
             return -2;
         }
     }
@@ -2558,8 +2511,7 @@ class CommandeFournisseur extends CommonOrder
             if ($result < 0) { $error++; }
             // End call triggers
         }
-        else
-        {
+        else {
             $error++;
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this)."::setStatus ".$this->error);
@@ -2571,8 +2523,7 @@ class CommandeFournisseur extends CommonOrder
             $this->db->commit();
             return 1;
         }
-        else
-        {
+        else {
             $this->db->rollback();
             return -1;
         }
@@ -2696,8 +2647,7 @@ class CommandeFournisseur extends CommonOrder
 				{
 					$qty = $this->line->packaging;
 				}
-				else
-				{
+				else {
 					if (($qty % $this->line->packaging) > 0)
 					{
 						$coeff = intval($qty / $this->line->packaging) + 1;
@@ -2763,15 +2713,13 @@ class CommandeFournisseur extends CommonOrder
 				$this->db->commit();
 				return $result;
             }
-            else
-            {
+            else {
                 $this->error = $this->db->lasterror();
                 $this->db->rollback();
                 return -1;
             }
         }
-        else
-        {
+        else {
             $this->error = "Order status makes operation forbidden";
             dol_syslog(get_class($this)."::updateline ".$this->error, LOG_ERR);
             return -2;
@@ -2850,8 +2798,7 @@ class CommandeFournisseur extends CommonOrder
                 $line->total_tva = 9.8;
                 $line->remise_percent = 50;
             }
-            else
-            {
+            else {
                 $line->total_ht = 100;
                 $line->total_ttc = 119.6;
                 $line->total_tva = 19.6;
@@ -2903,8 +2850,7 @@ class CommandeFournisseur extends CommonOrder
             }
             $this->db->free($result);
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
         }
     }
@@ -2944,8 +2890,7 @@ class CommandeFournisseur extends CommonOrder
             $this->db->free($resql);
             return 1;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -3017,8 +2962,7 @@ class CommandeFournisseur extends CommonOrder
 
             return $response;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -3219,8 +3163,7 @@ class CommandeFournisseur extends CommonOrder
     			$this->error = $supplierorderdispatch->error; $this->errors = $supplierorderdispatch->errors;
     			return $ret;
     		}
-    		else
-    		{
+    		else {
     			if (is_array($supplierorderdispatch->lines) && count($supplierorderdispatch->lines) > 0)
     			{
     				$date_liv = dol_now();
@@ -3254,8 +3197,7 @@ class CommandeFournisseur extends CommonOrder
         					}
     					    return 5;
     					}
-    					else
-    					{
+    					else {
     					    //Diff => received partially
     					    //$ret=$this->setStatus($user,4);
     						$ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
@@ -3294,8 +3236,7 @@ class CommandeFournisseur extends CommonOrder
         					    }
     					        return 5;
     					    }
-    					    else
-    					    {
+    					    else {
     					        //Diff => received partially
     					        $ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
 							    if ($ret < 0) {
@@ -3304,8 +3245,7 @@ class CommandeFournisseur extends CommonOrder
 							    return 4;
 						    }
 					    }
-					    else
-					    {
+					    else {
                             //all the products are not received
 						    $ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
 						    if ($ret < 0) {
@@ -3314,8 +3254,7 @@ class CommandeFournisseur extends CommonOrder
 						    return 4;
 					    }
 				    }
-    				else
-    				{
+    				else {
     					//Diff => received partially
     					$ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
     					if ($ret < 0) {
@@ -3371,8 +3310,7 @@ class CommandeFournisseur extends CommonOrder
 
             return $num;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -3534,15 +3472,13 @@ class CommandeFournisseurLigne extends CommonOrderLine
 	            $this->db->free($result);
     	        return 1;
             }
-    	    else
-    	    {
+    	    else {
     	        $this->error = 'Supplier order line  with id='.$rowid.' not found';
     	        dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR);
     	        return 0;
     	    }
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return -1;
         }
@@ -3667,8 +3603,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
             $this->db->rollback();
             return -1 * $error;
         }
-        else
-        {
+        else {
             $this->errors[] = $this->db->error();
             $this->db->rollback();
             return -2;
@@ -3754,14 +3689,12 @@ class CommandeFournisseurLigne extends CommonOrderLine
                 $this->db->commit();
                 return 1;
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 return -1;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -3818,8 +3751,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
             $this->db->rollback();
             return -1 * $error;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             return -1;
         }
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index 19ea5880346..335ac1fcbac 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -228,8 +228,7 @@ class CommandeFournisseurDispatch extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -298,8 +297,7 @@ class CommandeFournisseurDispatch extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -393,8 +391,7 @@ class CommandeFournisseurDispatch extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -460,8 +457,7 @@ class CommandeFournisseurDispatch extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -515,8 +511,7 @@ class CommandeFournisseurDispatch extends CommonObject
 			$this->db->commit();
 			return $object->id;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 37dbc2752ca..5415b9bea9a 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -456,7 +456,7 @@ class FactureFournisseur extends CommonInvoice
 				            }
 				        }
 				    }
-				    else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+				    else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
 				    {
 				        $origin_id = $tmp_origin_id;
     					$ret = $this->add_object_linked($origin, $origin_id);
@@ -503,15 +503,14 @@ class FactureFournisseur extends CommonInvoice
                             $this->lines[$i]->pu_ht_devise
                         );
                     }
-                    else
-                    {
+                    else {
                         $this->error = $this->db->lasterror();
                         $this->db->rollback();
                         return -5;
                     }
                 }
 			}
-			else	// If this->lines is an array of invoice line arrays
+			else // If this->lines is an array of invoice line arrays
 			{
 			    dol_syslog("There is ".count($this->lines)." lines that are array lines");
 			    foreach ($this->lines as $i => $val)
@@ -544,8 +543,7 @@ class FactureFournisseur extends CommonInvoice
 			                $line->product_type
 			                );
 			        }
-			        else
-			        {
+			        else {
 			            $this->error = $this->db->lasterror();
 			            $this->db->rollback();
 			            return -5;
@@ -580,29 +578,25 @@ class FactureFournisseur extends CommonInvoice
                     $this->db->commit();
                     return $this->id;
                 }
-                else
-                {
+                else {
                     $this->db->rollback();
                     return -4;
                 }
             }
-            else
-            {
+            else {
                 $this->error = $langs->trans('FailedToUpdatePrice');
                 $this->db->rollback();
                 return -3;
             }
         }
-        else
-        {
+        else {
             if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
             {
                 $this->error = $langs->trans('ErrorRefAlreadyExists');
                 $this->db->rollback();
                 return -1;
             }
-            else
-            {
+            else {
                 $this->error = $this->db->lasterror();
                 $this->db->rollback();
                 return -2;
@@ -758,8 +752,7 @@ class FactureFournisseur extends CommonInvoice
                     return -3;
                 }
             }
-            else
-            {
+            else {
                 $this->error = 'Bill with id '.$id.' not found';
                 dol_syslog(get_class($this).'::fetch '.$this->error);
                 return 0;
@@ -768,8 +761,7 @@ class FactureFournisseur extends CommonInvoice
             $this->db->free($resql);
             return 1;
         }
-        else
-        {
+        else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -870,8 +862,7 @@ class FactureFournisseur extends CommonInvoice
             $this->db->free($resql_rows);
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -3;
         }
@@ -1008,8 +999,7 @@ class FactureFournisseur extends CommonInvoice
             $this->db->rollback();
             return -1 * $error;
         }
-        else
-        {
+        else {
             $this->db->commit();
             return 1;
         }
@@ -1097,22 +1087,19 @@ class FactureFournisseur extends CommonInvoice
     				$this->db->commit();
     				return 1;
     			}
-    			else
-    			{
+    			else {
     				$this->error = $facligne->error;
     				$this->db->rollback();
     				return -1;
     			}
     		}
-    		else
-    		{
+    		else {
     			$this->error = $facligne->error;
     			$this->db->rollback();
     			return -2;
     		}
     	}
-    	else
-    	{
+    	else {
     		$this->db->rollback();
     		return -3;
     	}
@@ -1263,8 +1250,7 @@ class FactureFournisseur extends CommonInvoice
         	$this->db->commit();
         	return 1;
         }
-        else
-        {
+        else {
         	$this->error = $this->db->lasterror();
         	$this->db->rollback();
         	return -$error;
@@ -1302,8 +1288,7 @@ class FactureFournisseur extends CommonInvoice
             if ($result < 0) $error++;
             // End call triggers
         }
-        else
-        {
+        else {
             $error++;
             $this->error = $this->db->error();
             dol_print_error($this->db);
@@ -1314,8 +1299,7 @@ class FactureFournisseur extends CommonInvoice
             $this->db->commit();
             return 1;
         }
-        else
-        {
+        else {
             $this->db->rollback();
             return -1;
         }
@@ -1352,8 +1336,7 @@ class FactureFournisseur extends CommonInvoice
             if ($result < 0) $error++;
             // End call triggers
         }
-        else
-        {
+        else {
             $error++;
             $this->error = $this->db->lasterror();
             dol_syslog("FactureFournisseur::set_unpaid ".$this->error);
@@ -1364,8 +1347,7 @@ class FactureFournisseur extends CommonInvoice
             $this->db->commit();
             return 1;
         }
-        else
-        {
+        else {
             $this->db->rollback();
             return -1;
         }
@@ -1425,8 +1407,7 @@ class FactureFournisseur extends CommonInvoice
         {
             $num = $this->getNextNumRef($this->thirdparty);
         }
-        else
-		{
+        else {
             $num = $this->ref;
         }
         $this->newref = dol_sanitizeFileName($num);
@@ -1526,14 +1507,12 @@ class FactureFournisseur extends CommonInvoice
                 $this->db->commit();
                 return 1;
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 return -1;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
@@ -1608,14 +1587,12 @@ class FactureFournisseur extends CommonInvoice
                 $this->db->commit();
                 return 1;
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 return -1;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
@@ -1740,16 +1717,14 @@ class FactureFournisseur extends CommonInvoice
 	        				return -1;
 	        			}
 	        		}
-	        		else
-	        		{
+	        		else {
 	        			$this->error = $prod->error;
 	        			$this->db->rollback();
 	        			return -1;
 	        		}
 	        	}
 	        }
-	        else
-	        {
+	        else {
 	        	$product_type = $type;
 	        }
 
@@ -1862,23 +1837,20 @@ class FactureFournisseur extends CommonInvoice
 					$this->db->commit();
 					return $this->line->id;
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->error();
 					$this->db->rollback();
 					return -1;
 				}
 			}
-			else
-			{
+			else {
 				$this->error = $this->line->error;
 				$this->errors = $this->line->errors;
 				$this->db->rollback();
 				return -2;
 			}
         }
-        else
-        {
+        else {
         	return 0;
         }
     }
@@ -1977,8 +1949,7 @@ class FactureFournisseur extends CommonInvoice
             $result = $product->fetch($idproduct);
             $product_type = $product->type;
         }
-        else
-        {
+        else {
             $product_type = $type;
         }
 
@@ -2093,8 +2064,7 @@ class FactureFournisseur extends CommonInvoice
 				$this->db->commit();
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -4;
@@ -2147,8 +2117,7 @@ class FactureFournisseur extends CommonInvoice
             }
             $this->db->free($result);
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
         }
     }
@@ -2197,8 +2166,7 @@ class FactureFournisseur extends CommonInvoice
 			//print_r($return);
 			return $return;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2250,8 +2218,7 @@ class FactureFournisseur extends CommonInvoice
 
 			return $return;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2309,8 +2276,7 @@ class FactureFournisseur extends CommonInvoice
             $this->db->free($resql);
             return $response;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -2465,8 +2431,7 @@ class FactureFournisseur extends CommonInvoice
         {
         	return $numref;
         }
-        else
-        {
+        else {
             $this->error = $obj->error;
             //dol_print_error($db,get_class($this)."::getNextNumRef ".$obj->error);
             return false;
@@ -2550,8 +2515,7 @@ class FactureFournisseur extends CommonInvoice
 				    $line->total_tva = 9.8;
 	    			$line->remise_percent = 50;
 				}
-				else
-				{
+				else {
 				    $line->total_ht = 100;
 				    $line->total_ttc = 119.6;
 				    $line->total_tva = 19.6;
@@ -2617,8 +2581,7 @@ class FactureFournisseur extends CommonInvoice
             $this->db->free($resql);
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -2694,8 +2657,7 @@ class FactureFournisseur extends CommonInvoice
             $this->db->commit();
             return $object->id;
         }
-        else
-        {
+        else {
             $this->db->rollback();
             return -1;
         }
@@ -2725,8 +2687,7 @@ class FactureFournisseur extends CommonInvoice
 			{
 				$modele = $conf->global->INVOICE_SUPPLIER_ADDON_PDF;
 			}
-			else
-			{
+			else {
 				$modele = ''; // No default value. For supplier invoice, we allow to disable all PDF generation
 			}
 		}
@@ -2735,8 +2696,7 @@ class FactureFournisseur extends CommonInvoice
 		{
 		    return 0;
 		}
-		else
-		{
+		else {
             $modelpath = "core/modules/supplier_invoice/doc/";
 
             return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
@@ -3177,8 +3137,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -3435,8 +3394,7 @@ class SupplierInvoiceLine extends CommonObjectLine
             $this->db->commit();
             return $this->id;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
@@ -3471,8 +3429,7 @@ class SupplierInvoiceLine extends CommonObjectLine
             $this->db->commit();
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index c00ee77df53..497e9d7af77 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -150,8 +150,7 @@ class ProductFournisseur extends Product
             $this->db->commit();
             return 1;
         }
-        else
-        {
+        else {
             $this->db->rollback();
             return -1;
         }
@@ -288,7 +287,7 @@ class ProductFournisseur extends Product
 			$localtaxtype2 = $localtaxes_array['2'];
 			$localtax2 = $localtaxes_array['3'];
 		}
-		else     // old method. deprecated because ot can't retreive type
+		else // old method. deprecated because ot can't retreive type
 		{
 			$localtaxtype1 = '0';
 			$localtax1 = get_localtax($newvat, 1);
@@ -385,21 +384,18 @@ class ProductFournisseur extends Product
 					$this->db->commit();
 					return $this->product_fourn_price_id;
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					return -1;
 				}
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->error()." sql=".$sql;
 				$this->db->rollback();
 				return -2;
 			}
         }
-        else
-        {
+        else {
             dol_syslog(get_class($this).'::update_buyprice without knowing id of line, so we delete from company, quantity and supplier_ref and insert again', LOG_DEBUG);
 
             // Delete price for this quantity
@@ -567,8 +563,7 @@ class ProductFournisseur extends Product
 	                    {
 	                        $this->fourn_unitprice = price2num($this->fourn_price / $this->fourn_qty, 'MU');
 	                    }
-	                    else
-	                    {
+	                    else {
 	                        $this->fourn_unitprice = "";
 	                    }
                     }
@@ -576,13 +571,11 @@ class ProductFournisseur extends Product
 
             	return 1;
             }
-            else
-            {
+            else {
                 return 0;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -686,8 +679,7 @@ class ProductFournisseur extends Product
                     {
                         $prodfourn->fourn_unitprice = price2num($prodfourn->fourn_price / $prodfourn->fourn_qty, 'MU');
                     }
-                    else
-                    {
+                    else {
                         $prodfourn->fourn_unitprice = "";
                     }
                 }
@@ -698,8 +690,7 @@ class ProductFournisseur extends Product
             $this->db->free($resql);
             return $retarray;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -776,8 +767,7 @@ class ProductFournisseur extends Product
                 $this->db->free($resql);
                 return 0;
             }
-            else
-            {
+            else {
                 $min = -1;
                 foreach ($record_array as $record)
                 {
@@ -799,8 +789,7 @@ class ProductFournisseur extends Product
                             {
                                 $fourn_unitprice = price2num($fourn_price / $record["quantity"], 'MU');
                             }
-                            else
-                            {
+                            else {
                                 $fourn_unitprice = $fourn_price;
                             }
                         }
@@ -836,8 +825,7 @@ class ProductFournisseur extends Product
             $this->db->free($resql);
             return 1;
         }
-        else
-		{
+        else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -869,8 +857,7 @@ class ProductFournisseur extends Product
             $this->db->commit();
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error()." sql=".$sql;
             $this->db->rollback();
             return -1;
@@ -998,8 +985,7 @@ class ProductFournisseur extends Product
             $this->db->free($resql);
             return $retarray;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -1;
         }
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index a95aefede0f..bf9affbc455 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -132,14 +132,12 @@ class PaiementFourn extends Paiement
 				$this->statut         = $obj->statut;
 				$error = 1;
 			}
-			else
-			{
+			else {
 				$error = -2; // TODO Use 0 instead
 			}
 			$this->db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$error = -1;
 		}
@@ -172,8 +170,7 @@ class PaiementFourn extends Paiement
 			$amounts = &$this->amounts;
 			$amounts_to_update = &$this->multicurrency_amounts;
 		}
-		else
-		{
+		else {
 			$amounts = &$this->multicurrency_amounts;
 			$amounts_to_update = &$this->amounts;
 		}
@@ -203,8 +200,7 @@ class PaiementFourn extends Paiement
 				$total = $totalamount;
 				$mtotal = $totalamount_converted; // Maybe use price2num with MT for the converted value
 			}
-			else
-			{
+			else {
 				$total = $totalamount_converted; // Maybe use price2num with MT for the converted value
 				$mtotal = $totalamount;
 			}
@@ -269,14 +265,12 @@ class PaiementFourn extends Paiement
 								}
 							}
 						}
-						else
-						{
+						else {
 							$this->error = $this->db->lasterror();
 							$error++;
 						}
 					}
-					else
-					{
+					else {
 						dol_syslog(get_class($this).'::Create Amount line '.$key.' not a number. We discard it.');
 					}
 				}
@@ -289,14 +283,12 @@ class PaiementFourn extends Paiement
 					// End call triggers
 				}
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = "ErrorTotalIsNull";
 			dol_syslog('PaiementFourn::Create Error '.$this->error, LOG_ERR);
 			$error++;
@@ -311,8 +303,7 @@ class PaiementFourn extends Paiement
 			dol_syslog('PaiementFourn::Create Ok Total = '.$this->total);
 			return $this->id;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -347,8 +338,7 @@ class PaiementFourn extends Paiement
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -2;
 		}
@@ -415,8 +405,7 @@ class PaiementFourn extends Paiement
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error;
 			$this->db->rollback();
 			return -5;
@@ -461,8 +450,7 @@ class PaiementFourn extends Paiement
 			}
 			$this->db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -497,8 +485,7 @@ class PaiementFourn extends Paiement
 
 			return $billsarray;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this).'::getBillsArray Error '.$this->error);
 			return -1;
@@ -706,8 +693,7 @@ class PaiementFourn extends Paiement
 
 			return $numref;
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Supplier"));
 			return "";
@@ -738,8 +724,7 @@ class PaiementFourn extends Paiement
 			{
 				$modele = $conf->global->SUPPLIER_PAYMENT_ADDON_PDF;
 			}
-			else
-			{
+			else {
 				$modele = ''; // No default value. For supplier invoice, we allow to disable all PDF generation
 			}
 		}
@@ -748,8 +733,7 @@ class PaiementFourn extends Paiement
 		{
 			return 0;
 		}
-		else
-		{
+		else {
 			$modelpath = "core/modules/supplier_payment/doc/";
 
 			return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 0cd823304ee..bf91a0fdd50 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -317,8 +317,7 @@ if (empty($reshook))
 				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 				exit;
 			}
-			else
-			{
+			else {
 				$db->rollback();
 
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -357,8 +356,7 @@ if (empty($reshook))
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 		}
-		else
-		{
+		else {
 			$idprod = GETPOST('idprod', 'int');
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = '';
@@ -442,8 +440,7 @@ if (empty($reshook))
 						$productsupplier->ref_supplier = '';
 					}
 				}
-				else
-				{
+				else {
 					$fksoctosearch = $object->thirdparty->id;
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 				}
@@ -556,8 +553,7 @@ if (empty($reshook))
 			{
 				$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
 			}
-			else
-			{
+			else {
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 				$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
 			}
@@ -624,8 +620,7 @@ if (empty($reshook))
 			unset($_POST['date_endmonth']);
 			unset($_POST['date_endyear']);
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -675,8 +670,7 @@ if (empty($reshook))
 			$price_base_type = 'HT';
 			$ht = price2num(GETPOST('price_ht'));
 		}
-		else
-		{
+		else {
 			$vatratecleaned = $vat_rate;
 			if (preg_match('/^(.*)\s*\((.*)\)$/', $vat_rate, $reg))      // If vat is "xx (yy)"
 			{
@@ -769,8 +763,7 @@ if (empty($reshook))
 				if ($result < 0) dol_print_error($db, $result);
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db, $object->error);
 			exit;
 		}
@@ -801,8 +794,7 @@ if (empty($reshook))
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			/* Fix bug 1485 : Reset action to avoid asking again confirmation on failure */
 			$action = '';
@@ -837,8 +829,7 @@ if (empty($reshook))
 				if ($result < 0) dol_print_error($db, $result);
 			}
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 
@@ -858,8 +849,7 @@ if (empty($reshook))
 		{
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
 		}
-		else
-		{
+		else {
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -893,8 +883,7 @@ if (empty($reshook))
 				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 				exit;
 			}
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -908,8 +897,7 @@ if (empty($reshook))
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -945,8 +933,7 @@ if (empty($reshook))
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -960,8 +947,7 @@ if (empty($reshook))
 			header("Location: ".DOL_URL_ROOT.'/fourn/commande/list.php?restore_lastsearch_values=1');
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -973,8 +959,7 @@ if (empty($reshook))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		}
-		else
-		{
+		else {
 			if ($object->id > 0)
 			{
 				$orig = clone $object;
@@ -985,8 +970,7 @@ if (empty($reshook))
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit;
 				}
-				else
-				{
+				else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$object = $orig;
 					$action = '';
@@ -1013,13 +997,11 @@ if (empty($reshook))
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Delivery")), null, 'errors');
 		}
 	}
@@ -1032,8 +1014,7 @@ if (empty($reshook))
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -1134,8 +1115,7 @@ if (empty($reshook))
 						$classname = 'Commande';
 						$element = $subelement = 'commande';
 					}
-					else
-					{
+					else {
 						$classname = 'SupplierProposal';
 						$element = 'supplier_proposal';
 						$subelement = 'supplier_proposal';
@@ -1208,8 +1188,7 @@ if (empty($reshook))
 										$product_fourn_price_id = $productsupplier->product_fourn_price_id;
 									}
 								}
-								else
-								{
+								else {
 									$ref_supplier = $lines[$i]->ref_fourn;
 									$product_fourn_price_id = 0;
 								}
@@ -1277,8 +1256,7 @@ if (empty($reshook))
 						$error++;
 					}
 				}
-				else
-				{
+				else {
 			   		$id = $object->create($user);
 					if ($id < 0)
 					{
@@ -1295,8 +1273,7 @@ if (empty($reshook))
 				$action = 'create';
 				$_GET['socid'] = $_POST['socid'];
 			}
-			else
-			{
+			else {
 				$db->commit();
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 				exit;
@@ -1388,8 +1365,7 @@ if (empty($reshook))
 			{
 				setEventMessages($langs->trans("SOAPError")." '".$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", null, 'errors');
 			}
-			else
-			{
+			else {
 				setEventMessages($langs->trans("RemoteOrderRef")." ".$result_order["ref"], null, 'mesgs');
 			}
 		}
@@ -1410,15 +1386,13 @@ if (empty($reshook))
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
-			else
-			{
+			else {
 				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 				}
-				else
-				{
+				else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
@@ -1498,8 +1472,7 @@ if ($action == 'create')
 			$classname = 'Commande';
 			$element = $subelement = 'commande';
 		}
-		else
-		{
+		else {
 			$classname = 'SupplierProposal';
 			$element = 'supplier_proposal';
 			$subelement = 'supplier_proposal';
@@ -1545,8 +1518,7 @@ if ($action == 'create')
 		// Object source contacts list
 		$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);
 	}
-	else
-	{
+	else {
 		$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
 
@@ -1585,8 +1557,7 @@ if ($action == 'create')
 		print $societe->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$socid.'">';
 	}
-	else
-	{
+	else {
 		print $form->select_company((empty($socid) ? '' : $socid), 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve customer informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE))
@@ -1827,8 +1798,7 @@ elseif (!empty($object->id))
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
-		else
-		{
+		else {
 			$text = $langs->trans('ConfirmValidateOrder', $newref);
 			if (!empty($conf->notification->enabled))
 			{
@@ -1850,8 +1820,7 @@ elseif (!empty($object->id))
 		{
 			$qualified_for_stock_change = $object->hasProductsOrServices(2);
 		}
-		else
-		{
+		else {
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -2045,8 +2014,7 @@ elseif (!empty($object->id))
 	{
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
 	}
-	else
-	{
+	else {
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
 	}
 	print "</td>";
@@ -2065,8 +2033,7 @@ elseif (!empty($object->id))
 	{
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT', 1, 1);
 	}
-	else
-	{
+	else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
 	}
 	print '</td></tr>';
@@ -2160,8 +2127,7 @@ elseif (!empty($object->id))
 		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	}
-	else
-	{
+	else {
 		$usehourmin = 'day';
 		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin = 'dayhour';
 		print $object->date_livraison ? dol_print_date($object->date_livraison, $usehourmin) : '&nbsp;';
@@ -2193,8 +2159,7 @@ elseif (!empty($object->id))
 		{
 			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 		}
-		else
-		{
+		else {
 			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 		}
 		print '</td></tr>';
@@ -2394,13 +2359,11 @@ elseif (!empty($object->id))
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("FirstApprovalAlreadyDone")).'">'.$langs->trans("ApproveOrder").'</a>';
 					}
-					else
-					{
+					else {
 						print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=approve">'.$langs->trans("ApproveOrder").'</a>';
 					}
 				}
-				else
-				{
+				else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("ApproveOrder").'</a>';
 				}
 			}
@@ -2416,13 +2379,11 @@ elseif (!empty($object->id))
 						{
 							print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("SecondApprovalAlreadyDone")).'">'.$langs->trans("Approve2Order").'</a>';
 						}
-						else
-						{
+						else {
 							print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=approve2">'.$langs->trans("Approve2Order").'</a>';
 						}
 					}
-					else
-					{
+					else {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("Approve2Order").'</a>';
 					}
 				}
@@ -2435,8 +2396,7 @@ elseif (!empty($object->id))
 				{
 					print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=refuse">'.$langs->trans("RefuseOrder").'</a>';
 				}
-				else
-				{
+				else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("RefuseOrder").'</a>';
 				}
 			}
@@ -2504,8 +2464,7 @@ elseif (!empty($object->id))
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=makeorder#makeorder">'.$langs->trans("MakeOrder").'</a></div>';
 				}
-				else
-				{
+				else {
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("MakeOrder").'</a></div>';
 				}
 			}
@@ -2538,8 +2497,7 @@ elseif (!empty($object->id))
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
 				}
-				else
-				{
+				else {
 					if (!empty($object->linkedObjectsIds['invoice_supplier']))
 					{
 						if ($user->rights->fournisseur->facture->creer)
@@ -2547,8 +2505,7 @@ elseif (!empty($object->id))
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
 						}
 					}
-					else
-					{
+					else {
 						print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NeedAtLeastOneInvoice")).'">'.$langs->trans("ClassifyBilled").'</a>';
 					}
 				}
@@ -2734,8 +2691,7 @@ elseif (!empty($object->id))
 					print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
 					print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 				}
-				else
-				{
+				else {
 					$textinput_size = "50";
 					// Webservice url
 					print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td colspan="3">'.dol_print_url($ws_url).'</td></tr>';
@@ -2783,8 +2739,7 @@ elseif (!empty($object->id))
 						setEventMessages($langs->trans("RemoteUserMissingAssociatedSoc"), null, 'errors');
 						$error_occurred = true;
 					}
-					else
-					{
+					else {
 						//Create SOAP client and connect it to product/service
 						$soapclient_product = new nusoap_client($ws_url."/webservices/server_productorservice.php");
 						$soapclient_product->soap_defencoding = 'UTF-8';
@@ -2820,8 +2775,7 @@ elseif (!empty($object->id))
 								{
 									setEventMessages($line_id.$langs->trans("SupplierMissingRef")." '".$ref_supplier."'", null, 'warnings');
 								}
-								else
-								{
+								else {
 									setEventMessages($line_id.$langs->trans("ResponseNonOK")." '".$status_code."' - '".$result_product["result"]["result_label"]."'", null, 'errors');
 									$error_occurred = true;
 									break;
@@ -2867,8 +2821,7 @@ elseif (!empty($object->id))
 					setEventMessages($langs->trans("RemoteUserBadCredentials"), null, 'errors');
 					$error_occurred = true;
 				}
-				else
-				{
+				else {
 					setEventMessages($langs->trans("ResponseNonOK")." '".$user_status_code."'", null, 'errors');
 					$error_occurred = true;
 				}
@@ -2886,8 +2839,7 @@ elseif (!empty($object->id))
 				{
 					print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
 				}
-				else
-				{
+				else {
 					print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("Confirm").'">';
 					print ' &nbsp; &nbsp; ';
 				}
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 7ff0dd1c85a..682d933f6dd 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -66,15 +66,13 @@ if ($action == 'addcontact' && $user->rights->fournisseur->commande->creer)
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -87,8 +85,7 @@ elseif ($action == 'swapstatut' && $user->rights->fournisseur->commande->creer)
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -194,8 +191,7 @@ if ($id > 0 || !empty($ref))
 		// Contacts lines
 		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
 	}
-	else
-	{
+	else {
 		// Contact not found
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index d132a87233f..19b308c996b 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -129,8 +129,7 @@ if ($action == 'checkdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_
 	{
 		$db->commit();
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 }
@@ -172,8 +171,7 @@ if ($action == 'uncheckdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCE
 	{
 		$db->commit();
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 }
@@ -215,8 +213,7 @@ if ($action == 'denydispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_P
 	{
 		$db->commit();
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 }
@@ -579,8 +576,7 @@ if ($id > 0 || !empty($ref)) {
 					print '<td class="dispatch_dluo_title">'.$langs->trans("EatByDate").'</td>';
 					print '<td class="dispatch_dlc_title">'.$langs->trans("SellByDate").'</td>';
 				}
-				else
-				{
+				else {
 					print '<td></td>';
 					print '<td></td>';
 					print '<td></td>';
@@ -735,8 +731,7 @@ if ($id > 0 || !empty($ref)) {
 							{
 							    print $langs->trans("BuyingPrice").': <input class="maxwidth75" name="pu'.$suffix.'" type="text" value="'.price2num($up_ht_disc, 'MU').'">';
 							}
-							else
-							{
+							else {
 							    print '<input class="maxwidth75" name="pu'.$suffix.'" type="hidden" value="'.price2num($up_ht_disc, 'MU').'">';
 							}
 
@@ -791,8 +786,7 @@ if ($id > 0 || !empty($ref)) {
 							{
 							    print $langs->trans("BuyingPrice").': <input class="maxwidth75" name="pu'.$suffix.'" type="text" value="'.price2num($up_ht_disc, 'MU').'">';
 							}
-							else
-							{
+							else {
 							    print '<input class="maxwidth75" name="pu'.$suffix.'" type="hidden" value="'.price2num($up_ht_disc, 'MU').'">';
 							}
 
@@ -809,8 +803,7 @@ if ($id > 0 || !empty($ref)) {
 						    $type = 'batch';
 						    print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"');
 						}
-						else
-						{
+						else {
 						    $type = 'dispatch';
 						    print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"');
 						}
@@ -908,8 +901,7 @@ if ($id > 0 || !empty($ref)) {
 		    print "<br>\n";
 		    if (empty($conf->global->SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED))
 				print '<div class="opacitymedium">'.$langs->trans("NoPredefinedProductToDispatch").'</div>'; // No predefined line at all
-			else
-				print '<div class="opacitymedium">'.$langs->trans("NoMorePredefinedProductToDispatch").'</div>'; // No predefined line that remain to be dispatched.
+			else print '<div class="opacitymedium">'.$langs->trans("NoMorePredefinedProductToDispatch").'</div>'; // No predefined line that remain to be dispatched.
 		}
 
 		print '</form>';
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 7db240abf94..569a5b72576 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -178,8 +178,7 @@ if ($object->id > 0)
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	header('Location: index.php');
 	exit;
 }
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index c0272d58a03..8f79b1b077e 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -161,8 +161,7 @@ if ($resql)
 
 	print "</table></div><br>";
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -227,8 +226,7 @@ if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_T
 	$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
 	$sql .= " OR u.entity = 0)"; // Show always superadmin
 }
-else
-{
+else {
 	$sql .= " WHERE (u.entity IN (".getEntity('user')."))";
 }
 $sql .= " AND u.fk_soc IS NULL"; // An external user can not approved
@@ -270,8 +268,7 @@ if ($resql)
 	print "</table></div><br>";
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index f41e9e3fece..859d05bb775 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -56,8 +56,7 @@ if (GETPOST('actioncode', 'array'))
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
 }
-else
-{
+else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -197,8 +196,7 @@ if (!empty($conf->agenda->enabled))
     {
         print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("AddAction").'</a>';
     }
-    else
-    {
+    else {
         print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
     }
 }
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index acd79212052..c4895064ce0 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -336,15 +336,13 @@ if (empty($reshook))
 								$result = $object->insert_discount($discountid);
 								//$result=$discount->link_to_invoice($lineid,$id);
 							}
-							else
-							{
+							else {
 								setEventMessages($discount->error, $discount->errors, 'errors');
 								$error++;
 								break;
 							}
 						}
-						else
-						{
+						else {
 							// Positive line
 							$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 							// Date start
@@ -392,8 +390,7 @@ if (empty($reshook))
 							{
 								$lineid = $result;
 							}
-							else
-							{
+							else {
 								$lineid = 0;
 								$error++;
 								break;
@@ -448,8 +445,7 @@ if (empty($reshook))
 			$db->commit();
 			setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs');
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			$action = 'create';
 			$_GET["origin"] = $_POST["origin"];
@@ -597,8 +593,7 @@ if ($resql)
 		$soc->fetch($socid);
 		$title = $langs->trans('ListOfSupplierOrders').' - '.$soc->name;
 	}
-	else
-	{
+	else {
 		$title = $langs->trans('ListOfSupplierOrders');
 	}
 
@@ -1262,8 +1257,7 @@ if ($resql)
 
 	print $formfile->showdocuments('massfilesarea_supplier_order', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index 87effcd5863..e1d5b03db14 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -146,8 +146,7 @@ if ($id > 0 || !empty($ref))
 
         dol_fiche_end();
     }
-    else
-    {
+    else {
         /* Order not found */
         $langs->load("errors");
         print $langs->trans("ErrorRecordNotFound");
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index 909dec03796..efacacc8277 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -84,8 +84,7 @@ if ($action == 'create')
 	{
 		$action = '';
 	}
-	else
-	{
+	else {
 		if (!is_array($selected))
 		{
 			//$error++;
@@ -449,8 +448,7 @@ if (($action != 'create' && $action != 'add') && !$error) {
 	{
 		$sql .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY.")"; // Must match filter in htdocs/fourn/card.php
 	}
-	else
-	{
+	else {
 		// CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.", ".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY
 		$sql .= " AND c.fk_statut IN (".$db->escape($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS).")";
 	}
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index 40773f0eca6..f550595237c 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -125,8 +125,7 @@ if ($result)
     print "</table>";
     $db->free($result);
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 6e8f259bc01..87591071105 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -155,8 +155,7 @@ if (empty($reshook))
         	header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
         	exit;
         }
-        else
-        {
+        else {
         	$langs->load("errors");
         	setEventMessages($objectutil->error, $objectutil->errors, 'errors');
         	$action = '';
@@ -178,8 +177,7 @@ if (empty($reshook))
 		{
 			$qualified_for_stock_change = $object->hasProductsOrServices(2);
 		}
-		else
-		{
+		else {
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -239,8 +237,7 @@ if (empty($reshook))
 				header('Location: list.php?restore_lastsearch_values=1');
 				exit;
 			}
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -271,8 +268,7 @@ if (empty($reshook))
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			/* Fix bug 1485 : Reset action to avoid asking again confirmation on failure */
 			$action = '';
@@ -305,8 +301,7 @@ if (empty($reshook))
 		if ($object->update($user) < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-		else
-		{
+		else {
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = '';
@@ -595,8 +590,7 @@ if (empty($reshook))
 					{
 						$db->commit();
 					}
-					else
-					{
+					else {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$db->rollback();
 					}
@@ -604,8 +598,7 @@ if (empty($reshook))
 					$db->commit();
 				}
 			}
-			else
-			{
+			else {
 				setEventMessages($discount->error, $discount->errors, 'errors');
 				$db->rollback();
 			}
@@ -973,8 +966,7 @@ if (empty($reshook))
 									$pu = 0;
 									$pu_currency = $lines[$i]->multicurrency_subprice;
 								}
-								else
-								{
+								else {
 									$pu = $lines[$i]->subprice;
 									$pu_currency = 0;
 								}
@@ -1015,13 +1007,11 @@ if (empty($reshook))
 							// Now reload line
 							$object->fetch_lines();
 						}
-						else
-						{
+						else {
 							$error++;
 						}
 					}
-					else
-					{
+					else {
 						$error++;
 					}
 				}
@@ -1045,8 +1035,7 @@ if (empty($reshook))
 			$action = 'create';
 			$_GET['socid'] = $_POST['socid'];
 		}
-		else
-		{
+		else {
 			$db->commit();
 
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
@@ -1079,8 +1068,7 @@ if (empty($reshook))
 			$up = price2num(GETPOST('price_ht'));
 			$price_base_type = 'HT';
 		}
-		else
-		{
+		else {
 			$up = price2num(GETPOST('price_ttc'));
 			$price_base_type = 'TTC';
 		}
@@ -1103,8 +1091,7 @@ if (empty($reshook))
 
 			$type = $prod->type;
 		}
-		else
-		{
+		else {
 			$label = $_POST['product_desc'];
 			$type = $_POST["type"] ? $_POST["type"] : 0;
 		}
@@ -1155,8 +1142,7 @@ if (empty($reshook))
 
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -1190,8 +1176,7 @@ if (empty($reshook))
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 		}
-		else
-		{
+		else {
 			$idprod = GETPOST('idprod', 'int');
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = '';
@@ -1275,8 +1260,7 @@ if (empty($reshook))
 						$productsupplier->ref_supplier = '';
 					}
 				}
-				else
-				{
+				else {
 					$fksoctosearch = $object->thirdparty->id;
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 				}
@@ -1387,8 +1371,7 @@ if (empty($reshook))
 			{
 				$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
 			}
-			else
-			{
+			else {
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 				$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
 			}
@@ -1454,8 +1437,7 @@ if (empty($reshook))
 			unset($_POST['date_endmonth']);
 			unset($_POST['date_endyear']);
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -1495,8 +1477,7 @@ if (empty($reshook))
 	            {
 	                $qualified_for_stock_change = $object->hasProductsOrServices(2);
 	            }
-	            else
-	            {
+	            else {
 	                $qualified_for_stock_change = $object->hasProductsOrServices(1);
 	            }
 
@@ -1550,8 +1531,7 @@ if (empty($reshook))
 				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
 				exit;
 			}
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -1628,15 +1608,13 @@ if (empty($reshook))
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
-			else
-			{
+			else {
 				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 				}
-				else
-				{
+				else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
@@ -1649,8 +1627,7 @@ if (empty($reshook))
 			{
 				$result = $object->swapContactStatus(GETPOST('ligne'));
 			}
-			else
-			{
+			else {
 				dol_print_error($db);
 			}
 		}
@@ -1767,8 +1744,7 @@ if ($action == 'create')
 		$objectsrc->fetch_optionals();
 		$object->array_options = $objectsrc->array_options;
 	}
-	else
-	{
+	else {
 		$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
 		$fk_account         = $societe->fk_account;
@@ -1805,8 +1781,7 @@ if ($action == 'create')
 		print $societe->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$societe->id.'">';
 	}
-	else
-	{
+	else {
 		print $form->select_company($societe->id, 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve supplier informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE))
@@ -2017,8 +1992,7 @@ if ($action == 'create')
 				print '</div></div>';
 			}
 		}
-		else
-		{
+		else {
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			$tmp = '<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
 			$text = $tmp.$langs->trans("InvoiceAvoir").' ';
@@ -2222,8 +2196,7 @@ if ($action == 'create')
 		print '</table>';
 	}
 }
-else
-{
+else {
 	if ($id > 0 || !empty($ref))
 	{
 		/* *************************************************************************** */
@@ -2317,8 +2290,7 @@ else
 				$savdate = $object->date;
 				$numref = $object->getNextNumRef($societe);
 			}
-			else
-			{
+			else {
 				$numref = $object->ref;
 			}
 
@@ -2337,8 +2309,7 @@ else
 			{
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
 			}
-			else
-			{
+			else {
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
@@ -2374,8 +2345,7 @@ else
             {
                 $qualified_for_stock_change = $object->hasProductsOrServices(2);
             }
-            else
-            {
+            else {
                 $qualified_for_stock_change = $object->hasProductsOrServices(1);
             }
             if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
@@ -2583,8 +2553,7 @@ else
 		{
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
 		}
-		else
-		{
+		else {
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
 		}
 		print "</td>";
@@ -2605,8 +2574,7 @@ else
 		{
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT', 1, 1);
 		}
-		else
-		{
+		else {
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
 		}
 		print '</td></tr>';
@@ -2693,8 +2661,7 @@ else
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 			}
-			else
-			{
+			else {
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 			}
 			print '</td></tr>';
@@ -2737,7 +2704,7 @@ else
 		if (GETPOST('calculationrule')) $calculationrule = GETPOST('calculationrule', 'alpha');
 		else $calculationrule = (empty($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND) ? 'totalofround' : 'roundoftotal');
 		if ($calculationrule == 'totalofround') $calculationrulenum = 1;
-		else  $calculationrulenum = 2;
+		else $calculationrulenum = 2;
 		// Show link for "recalculate"
 		if ($object->getVentilExportCompta() == 0) {
 			$s = $langs->trans("ReCalculate").' ';
@@ -2867,8 +2834,7 @@ else
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				print '<tr class="oddeven"><td colspan="'.$nbcols.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td><td></td><td></td></tr>';
 			}
 
@@ -2887,8 +2853,7 @@ else
 
 			$db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -2898,8 +2863,7 @@ else
 			print '<tr><td colspan="'.$nbcols.'" class="right">';
 			if ($object->type != FactureFournisseur::TYPE_DEPOSIT)
 				print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits');
-			else
-				print $langs->trans('AlreadyPaid');
+			else print $langs->trans('AlreadyPaid');
 			print ' :</td><td class="right"'.(($totalpaye > 0) ? ' class="amountalreadypaid"' : '').'>'.price($totalpaye).'</td><td>&nbsp;</td></tr>';
 
 			//$resteapayer = $object->total_ttc - $totalpaye;
@@ -2988,8 +2952,7 @@ else
 			print '<tr><td colspan="'.$nbcols.'" class="right">';
 			if ($resteapayeraffiche >= 0)
 				print $langs->trans('RemainderToPay');
-			else
-				print $langs->trans('ExcessPaid');
+			else print $langs->trans('ExcessPaid');
 			print ' :</td>';
 			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td>';
 			print '<td class="nowrap">&nbsp;</td></tr>';
@@ -3010,8 +2973,7 @@ else
 			print '<tr><td colspan="'.$nbcols.'" class="right">';
 			if ($resteapayeraffiche <= 0)
 				print $langs->trans('RemainderToPayBack');
-			else
-				print $langs->trans('ExcessPaid');
+			else print $langs->trans('ExcessPaid');
 			print ' :</td>';
 			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($sign * $resteapayeraffiche).'</td>';
 			print '<td class="nowrap">&nbsp;</td></tr>';
@@ -3119,8 +3081,7 @@ else
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans('Modify').'</a></div>';
 					}
-					else
-					{
+					else {
 						print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Modify').'</span></div>';
 					}
 				}
@@ -3137,8 +3098,7 @@ else
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans('ReOpen').'</a></div>';
 					}
-					else
-					{
+					else {
 						if ($user->rights->fournisseur->facture->creer) {
 							print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('ReOpen').'</span></div>';
 						} elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
@@ -3183,8 +3143,7 @@ else
 						{
 							print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPaymentBack').'</span></div>';
 						}
-						else
-						{
+						else {
 							print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?facid='.$object->id.'&amp;action=create&amp;accountid='.$object->fk_account.'">'.$langs->trans('DoPaymentBack').'</a></div>';
 						}
 					}
@@ -3218,8 +3177,7 @@ else
 	                        print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid"';
 	                        print '>'.$langs->trans('Validate').'</a></div>';
 	                    }
-	                    else
-	                    {
+	                    else {
 	                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'"';
 	                        print '>'.$langs->trans('Validate').'</a></div>';
 	                    }
@@ -3268,8 +3226,7 @@ else
 	            	{
 	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotErasable").'">'.$langs->trans('Delete').'</a></div>';
 	            	}
-                    else
-                    {
+                    else {
     	                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>';
                     }
 	            }
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index ebe3573bd99..007fadc1e36 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -66,15 +66,13 @@ if ($action == 'addcontact' && $user->rights->fournisseur->facture->creer)
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -87,8 +85,7 @@ elseif ($action == 'swapstatut' && $user->rights->fournisseur->facture->creer)
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -268,8 +265,7 @@ if ($id > 0 || !empty($ref))
 		// Contacts lines
 		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
 	}
-	else
-	{
+	else {
 		print "ErrorRecordNotFound";
 	}
 }
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 022028bb483..3c08c2e4e68 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -254,8 +254,7 @@ if ($object->id > 0)
 	$param = '&facid='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
     print $langs->trans('ErrorUnknown');
 }
 
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index 5368b491728..8b0cbac2586 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -291,8 +291,7 @@ if ($user->rights->fournisseur->facture->lire)
 
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 164255d4a61..c573cb5d938 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -415,8 +415,7 @@ if (!$search_all)
 		}
 	}
 }
-else
-{
+else {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
 
@@ -1302,8 +1301,7 @@ if ($resql)
 
     print $formfile->showdocuments('massfilesarea_supplier_invoice', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index e26357bd4ca..7ececacbf33 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -346,8 +346,7 @@ if (empty($reshook))
 	            header('Location: '.$loc);
 	            exit;
 	        }
-	        else
-	        {
+	        else {
 	            $db->rollback();
 	        }
 	    }
@@ -498,8 +497,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                 $form->select_comptes(empty($accountid) ? $obj->fk_account : $accountid, 'accountid', 0, '', 2);
                 print '</td></tr>';
             }
-            else
-            {
+            else {
                 print '<tr><td>&nbsp;</td></tr>';
             }
             print '<tr><td>'.$langs->trans('Numero').'</td><td><input name="num_paiement" type="text" value="'.(empty($_POST['num_paiement']) ? '' : $_POST['num_paiement']).'"></td></tr>';
@@ -532,8 +530,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	            {
 	                $sql .= ' AND f.type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
 	            }
-	            else
-	            {
+	            else {
 	                $sql .= ' AND f.type = 2'; // If paying back a credit note, we show all credit notes
 	            }
                 // Group by because we have a total
@@ -628,8 +625,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                            print '<td class="center nowraponall">';
 	                            print dol_print_date($db->jdate($objp->df), 'day').'</td>';
 	                        }
-	                        else
-	                        {
+	                        else {
 	                            print '<td class="center"><b>!!!</b></td>';
 	                        }
 
@@ -646,8 +642,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 	                            print '</td>';
 	                        }
-	                        else
-	                        {
+	                        else {
 	                            print '<td class="center"><b>--</b></td>';
 	                        }
 
@@ -701,8 +696,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                        		print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
 	                        		print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
 	                        }
-	                        else
-	                        {
+	                        else {
 	                        	print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.dol_escape_htmltag(GETPOST($namef)).'" disabled>';
 	                        	print '<input type="hidden" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
 	                        }
@@ -726,8 +720,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 											print '<input type=hidden class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
 											print '<input type="text" size="8" class="multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
 									}
-									else
-									{
+									else {
 										print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>';
 										print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
 									}
@@ -768,8 +761,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                }
 	                $db->free($resql);
 	            }
-	            else
-	            {
+	            else {
 	                dol_print_error($db);
 	            }
 			}
@@ -1051,8 +1043,7 @@ if (empty($action) || $action == 'list')
         print "</div>";
         print "</form>\n";
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 }
diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
index 9f38c4c4f9e..78acbbd32f2 100644
--- a/htdocs/fourn/facture/rapport.php
+++ b/htdocs/fourn/facture/rapport.php
@@ -73,8 +73,7 @@ if ($action == 'builddoc')
     {
         $outputlangs->charset_output = $sav_charset_output;
     }
-    else
-    {
+    else {
         $outputlangs->charset_output = $sav_charset_output;
         dol_print_error($db, $obj->error);
     }
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index 1b85082616a..dd1f792853d 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -60,8 +60,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
     			$total = $total + $sign * $objectlink->total_ht;
     			echo price($objectlink->total_ht);
     		}
-    		else
-    		{
+    		else {
     			echo '<strike>'.price($objectlink->total_ht).'</strike>';
     		}
     	} ?></td>
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index 31638abf848..4cd4063f72b 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -90,8 +90,7 @@ if ($resql)
 	print "<br>\n";
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -211,8 +210,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 		}
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -265,8 +263,7 @@ if ($resql)
 
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index 09ed7acc1e4..a4c53d573c9 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -60,8 +60,7 @@ if ($action == 'setnote' && $user->rights->fournisseur->facture->creer)
 		$db->commit();
 		$action = '';
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -79,8 +78,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisse
 		header('Location: '.DOL_URL_ROOT.'/fourn/facture/paiement.php');
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -100,8 +98,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' &&
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -115,8 +112,7 @@ if ($action == 'setnum_paiement' && !empty($_POST['num_paiement']))
 	{
 		setEventMessages($langs->trans('PaymentNumberUpdateSucceeded'), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans('PaymentNumberUpdateFailed'), null, 'errors');
 	}
 }
@@ -130,8 +126,7 @@ if ($action == 'setdatep' && !empty($_POST['datepday']))
 	{
 		setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans('PaymentDateUpdateFailed'), null, 'errors');
 	}
 }
@@ -327,8 +322,7 @@ if ($result > 0)
 		print "</table>\n";
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 
@@ -359,8 +353,7 @@ if ($result > 0)
 			{
 				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
 			}
-			else
-			{
+			else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$title_button.'">'.$langs->trans('Delete').'</a>';
 			}
 		}
@@ -398,8 +391,7 @@ if ($result > 0)
 
 	print '</div></div></div>';
 }
-else
-{
+else {
 	$langs->load("errors");
 	print $langs->trans("ErrorRecordNotFound");
 }
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 5e83ae93923..7621a5ea5f3 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -332,8 +332,7 @@ if ($resql)
 
 	print '</form>';
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index 8cda5a20d98..87088ba91c0 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -174,22 +174,19 @@ if ($socid > 0)
 
                     $db->free($resqlp);
                 }
-                else
-                {
+                else {
                     dol_print_error($db);
                 }
             }
         }
-        else
-        {
+        else {
             dol_print_error($db);
         }
 
         print "</table>";
     }
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index 39f5cc61bd2..ba4dbc3925b 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -51,8 +51,7 @@ if ($result)
 	preg_match('/([0-9]+)$/i', $obj->name, $reg);
 	if ($reg[1]) $lastftpentry = $reg[1];
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -97,8 +96,7 @@ if ($action == 'add' || GETPOST('modify', 'alpha'))
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			dol_print_error($db);
 		}
@@ -124,8 +122,7 @@ if (GETPOST('delete', 'alpha'))
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
         }
-        else
-        {
+        else {
             $db->rollback();
             dol_print_error($db);
         }
@@ -149,8 +146,7 @@ if (!function_exists('ftp_connect'))
 {
 	print $langs->trans("FTPFeatureNotSupportedByYourPHP");
 }
-else
-{
+else {
 	// Formulaire ajout
 	print '<form name="ftpconfig" action="ftpclient.php" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -301,8 +297,7 @@ else
 			$i++;
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index 0c7f8409992..cf5ad19e553 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -112,14 +112,13 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
                 // Files infected by a virus
 				setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 			}
-			else	// Known error
+			else // Known error
 			{
 				setEventMessages($langs->trans($resupload), null, 'errors');
 			}
 		}
 	}
-	else
-	{
+	else {
 		// Echec transfert (fichier depassant la limite ?)
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFailToCreateDir", $upload_dir), null, 'errors');
@@ -139,8 +138,7 @@ if ($action == 'add' && $user->rights->ftp->setup)
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("ErrorFailToCreateDir"), null, 'errors');
 		$action = "create";
 	}
@@ -175,8 +173,7 @@ if ($action == 'confirm_deletefile' && $_REQUEST['confirm'] == 'yes')
 		{
 			setEventMessages($langs->trans("FileWasRemoved", $file), null, 'mesgs');
 		}
-		else
-		{
+		else {
 			dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
 			setEventMessages($langs->trans("FTPFailedToRemoveFile", $file), null, 'errors');
 		}
@@ -185,8 +182,7 @@ if ($action == 'confirm_deletefile' && $_REQUEST['confirm'] == 'yes')
 
 		$action = '';
 	}
-	else
-	{
+	else {
 		dol_print_error('', $mesg);
 	}
 }
@@ -225,8 +221,7 @@ if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("De
 				{
 					setEventMessages($langs->trans("FileWasRemoved", $file), null, 'mesgs');
 				}
-				else
-				{
+				else {
 					dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
 					setEventMessages($langs->trans("FTPFailedToRemoveFile", $file), null, 'errors');
 				}
@@ -237,8 +232,7 @@ if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("De
 			}
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error('', $mesg);
 	}
 }
@@ -268,8 +262,7 @@ if ($action == 'confirm_deletesection' && $confirm == 'yes')
 		{
 			setEventMessages($langs->trans("DirWasRemoved", $file), null, 'mesgs');
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans("FTPFailedToRemoveDir", $file), null, 'errors');
 		}
 
@@ -277,8 +270,7 @@ if ($action == 'confirm_deletesection' && $confirm == 'yes')
 
 		$action = '';
 	}
-	else
-	{
+	else {
 		dol_print_error('', $mesg);
 	}
 }
@@ -335,13 +327,11 @@ if ($action == 'download')
 
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->transnoentitiesnoconv('FailedToGetFile', $remotefile), null, 'errors');
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error('', $mesg);
 	}
 
@@ -399,8 +389,7 @@ if (!function_exists('ftp_connect'))
 {
 	print $langs->trans("FTPFeatureNotSupportedByYourPHP");
 }
-else
-{
+else {
     if (!empty($ftp_server))
 	{
 		// Confirm remove file
@@ -498,8 +487,7 @@ else
                     $buff[$i] = "---------- - root root 1234 Aug 01 2000 ".$key;
                 }
     		}
-    		else
-    		{
+    		else {
                 $buff = ftp_rawlist($conn_id, $newsectioniso);
                 $contents = ftp_nlist($conn_id, $newsectioniso); // Sometimes rawlist fails but never nlist
         		//var_dump($contents);
@@ -535,8 +523,7 @@ else
 					if (preg_match('/^d/', $vals[0])) $is_directory = 1;
 					if (preg_match('/^l/', $vals[0])) $is_link = 1;
 				}
-				else
-				{
+				else {
 					// Remote file
 					$filename = $file;
 					//print "section=".$section.' file='.$file.'X';
@@ -593,8 +580,7 @@ else
 					$newfile = preg_replace('/ ->.*/', '', $newfile);
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($newfile).'">'.img_delete().'</a>';
 				}
-				else
-				{
+				else {
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=download&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_picto('', 'file').'</a>';
 					print ' &nbsp; ';
 					print '<input type="checkbox" class="flat checkboxfordelete" id="check_'.$i.'" name="const['.$i.'][check]" value="1">';
@@ -636,8 +622,7 @@ else
 
 		print "</form>";
 	}
-	else
-	{
+	else {
 		$foundsetup = false;
 		$MAXFTP = 20;
 		$i = 1;
@@ -656,8 +641,7 @@ else
 	    {
             print $langs->trans("SetupOfFTPClientModuleNotComplete");
 	    }
-	    else
-	    {
+	    else {
 	        print $langs->trans("ChooseAFTPEntryIntoMenu");
 	    }
 	}
@@ -675,8 +659,7 @@ if ($conn_id)
     {
         ftp_close($conn_id);
     }
-    else
-    {
+    else {
         ftp_close($conn_id);
     }
 }
@@ -724,8 +707,7 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
 		    dol_syslog('Try to connect with ftp_ssl_connect');
 		    $conn_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout);
 		}
-		else
-		{
+		else {
 		    dol_syslog('Try to connect with ftp_connect');
 		    $conn_id = ftp_connect($ftp_server, $ftp_port, $connecttimeout);
 		}
@@ -751,15 +733,13 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
         				    $error++;
 		                }
     				}
-    				else
-    				{
+    				else {
     					$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
 	   				    $ok = 0;
     				    $error++;
     				}
 				}
-				else
-				{
+				else {
 				    if (ftp_login($conn_id, $ftp_user, $ftp_password))
     				{
     					// Turn on passive mode transfers (must be after a successful login
@@ -769,8 +749,7 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
     					$newsectioniso = utf8_decode($section);
     					ftp_chdir($conn_id, $newsectioniso);
     				}
-    				else
-    				{
+    				else {
     					$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
 	   				    $ok = 0;
     				    $error++;
@@ -778,8 +757,7 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
 				}
 			}
 		}
-		else
-		{
+		else {
 		    dol_syslog('FailedToConnectToFTPServer '.$ftp_server.' '.$ftp_port, LOG_ERR);
 			$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServer", $ftp_server, $ftp_port);
 			$ok = 0;
@@ -805,8 +783,7 @@ function ftp_isdir($connect_id, $dir)
 		ftp_cdup($connect_id);
 		return 1;
 	}
-	else
-	{
+	else {
 		return 0;
 	}
 }
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index c5554a40fb1..8a72ac7284e 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -229,8 +229,7 @@ if (empty($reshook))
 		    	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 		        exit;
 		    }
-		    else
-			{
+		    else {
 		    	$db->rollback();
 		    }
 	    }
@@ -253,8 +252,7 @@ if (empty($reshook))
 	            setEventMessages($object->error, $object->errors, 'warnings');
 	            $action = 'editvalidator';
 	        }
-	        else
-	        {
+	        else {
 	            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	            exit;
 	        }
@@ -340,20 +338,17 @@ if (empty($reshook))
 					setEventMessages($object->error, $object->errors, 'warnings');
 					$action = 'edit';
 				}
-				else
-				{
+				else {
 					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 					exit;
 				}
 	        }
-	        else
-	        {
+	        else {
 	        	setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
 	        	$action = '';
 	        }
 	    }
-	    else
-	    {
+	    else {
 	    	setEventMessages($langs->trans("ErrorBadStatus"), null, 'errors');
 	    	$action = '';
 	    }
@@ -376,8 +371,7 @@ if (empty($reshook))
 			{
 				$result = $object->delete($user);
 			}
-			else
-			{
+			else {
 				$error++;
 				setEventMessages($langs->trans('ErrorCantDeleteCP'), null, 'errors');
 				$action = '';
@@ -390,8 +384,7 @@ if (empty($reshook))
 			header('Location: list.php?restore_lastsearch_values=1');
 			exit;
 		}
-		else
-		{
+		else {
 			$db->rollback();
 		}
 	}
@@ -485,14 +478,12 @@ if (empty($reshook))
 	                setEventMessages($mail->error, $mail->errors, 'warnings');
 	                $action = '';
 	            }
-	            else
-	            {
+	            else {
 	            	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	            	exit;
 	            }
 	        }
-	        else
-	        {
+	        else {
 	        	setEventMessages($object->error, $object->errors, 'errors');
 	        	$action = '';
 	        }
@@ -581,8 +572,7 @@ if (empty($reshook))
 	            {
 	                dol_syslog("User that request leave has no email, so we redirect directly to finished page without sending email");
 	            }
-	            else
-	            {
+	            else {
 	                // From
 	                $expediteur = new User($db);
 	                $expediteur->fetch($object->fk_validator);
@@ -626,8 +616,7 @@ if (empty($reshook))
 	           	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	           	exit;
 	        }
-	        else
-	        {
+	        else {
 	            $db->rollback();
 	        	$action = '';
 	        }
@@ -669,8 +658,7 @@ if (empty($reshook))
 	                {
 	                    dol_syslog("User that request leave has no email, so we redirect directly to finished page without sending email");
 	                }
-	                else
-	                {
+	                else {
 	                    // From
 	                    $expediteur = new User($db);
 	                    $expediteur->fetch($object->fk_validator);
@@ -707,8 +695,7 @@ if (empty($reshook))
 	                    }
 	                }
 	            }
-	            else
-	            {
+	            else {
 	            	$action = '';
 	            }
 
@@ -719,8 +706,7 @@ if (empty($reshook))
 	                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	                exit;
 	            }
-	            else
-	            {
+	            else {
 	                $db->rollback();
 	                $action = '';
 	            }
@@ -756,8 +742,7 @@ if (empty($reshook))
 	        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	        exit;
 	    }
-	    else
-	    {
+	    else {
 	        $db->rollback();
 	    }
 	}
@@ -806,8 +791,7 @@ if (empty($reshook))
 	        {
 	        	$db->commit();
 	        }
-	        else
-	        {
+	        else {
 	        	$db->rollback();
 	        }
 
@@ -858,8 +842,7 @@ if (empty($reshook))
 	            	setEventMessages($mail->error, $mail->errors, 'warnings');
 	            	$action = '';
 	            }
-	            else
-	            {
+	            else {
 	            	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	            	exit;
 	            }
@@ -904,8 +887,7 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $
     {
         $errors[] = $langs->trans('CantCreateCP');
     }
-    else
-    {
+    else {
         // Formulaire de demande de congés payés
         print load_fiche_titre($langs->trans('MenuAddCP'), '', 'title_hrm.png');
 
@@ -1089,8 +1071,7 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $
         $object = new Holiday($db);
         $include_users = $object->fetch_users_approver_holiday();
         if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
-        else
-        {
+        else {
         	$defaultselectuser = (empty($user->fk_user_holiday_validator) ? $user->fk_user : $user->fk_user_holiday_validator); // Will work only if supervisor has permission to approve so is inside include_users
         	if (!empty($conf->global->HOLIDAY_DEFAULT_VALIDATOR)) $defaultselectuser = $conf->global->HOLIDAY_DEFAULT_VALIDATOR; // Can force default approver
         	if (GETPOST('valideur', 'int') > 0) $defaultselectuser = GETPOST('valideur', 'int');
@@ -1127,8 +1108,7 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $
         print '</from>'."\n";
     }
 }
-else
-{
+else {
     if ($error)
     {
         print '<div class="tabBar">';
@@ -1136,8 +1116,7 @@ else
         print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
         print '</div>';
     }
-    else
-    {
+    else {
         // Affichage de la fiche d'une demande de congés payés
         if (($id > 0) || $ref)
         {
@@ -1247,8 +1226,7 @@ else
                     print '</td>';
                     print '</tr>';
                 }
-                else
-                {
+                else {
                     print '<tr>';
                     print '<td class="nowrap">'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
                     print '<td>';
@@ -1269,8 +1247,7 @@ else
                     print '</td>';
                     print '</tr>';
                 }
-                else
-                {
+                else {
                     print '<tr>';
                     print '<td class="nowrap">'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
                     print '<td>';
@@ -1312,8 +1289,7 @@ else
                     print '<td>'.nl2br($object->description).'</td>';
                     print '</tr>';
                 }
-                else
-                {
+                else {
                     print '<tr>';
                     print '<td>'.$langs->trans('DescCP').'</td>';
                     print '<td class="tdtop">';
@@ -1373,8 +1349,7 @@ else
                         $include_users[] = $object->fk_validator;
                     }
                     if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
-                    else
-                    {
+                    else {
                     	$arrayofvalidatorstoexclude = (($user->admin || ($user->id != $userRequest->id)) ? '' : array($user->id)); // Nobody if we are admin or if we are not the user of the leave.
                     	$s = $form->select_dolusers($object->fk_validator, "valideur", (($action == 'editvalidator') ? 0 : 1), $arrayofvalidatorstoexclude, 0, $include_users);
                     	print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
@@ -1498,8 +1473,7 @@ else
                             print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=valid" class="butAction">'.$langs->trans("Approve").'</a>';
                             print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=refuse" class="butAction">'.$langs->trans("ActionRefuseCP").'</a>';
                         }
-                        else
-                        {
+                        else {
                             print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("Approve").'</a>';
                             print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("ActionRefuseCP").'</a>';
                         }
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 4e306943b4b..838e65968ef 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -205,15 +205,13 @@ class Holiday extends CommonObject
 			{
 				return $numref;
 			}
-			else
-			{
+			else {
 				$this->error = $obj->error;
 				//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
 		}
-		else
-		{
+		else {
 			print $langs->trans("Error")." ".$langs->trans("Error_HOLIDAY_ADDON_NotDefined");
 			return "";
 		}
@@ -239,8 +237,7 @@ class Holiday extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -345,8 +342,7 @@ class Holiday extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return $this->id;
 		}
@@ -435,8 +431,7 @@ class Holiday extends CommonObject
 
 			return $result;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -561,8 +556,7 @@ class Holiday extends CommonObject
 			$this->holiday = $tab_result;
 			return 1;
 		}
-		else
-		{
+		else {
 			// SQL Error
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
@@ -686,8 +680,7 @@ class Holiday extends CommonObject
 			$this->holiday = $tab_result;
 			return 1;
 		}
-		else
-		{
+		else {
 			// SQL Error
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
@@ -712,8 +705,7 @@ class Holiday extends CommonObject
 		{
 			$num = $this->getNextNumRef(null);
 		}
-		else
-		{
+		else {
 			$num = $this->ref;
 		}
 		$this->newref = dol_sanitizeFileName($num);
@@ -758,8 +750,7 @@ class Holiday extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -872,8 +863,7 @@ class Holiday extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -985,8 +975,7 @@ class Holiday extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1038,8 +1027,7 @@ class Holiday extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1121,8 +1109,7 @@ class Holiday extends CommonObject
 					if ($dateEnd > $infos_CP['date_debut'] || in_array($infos_CP['halfday'], array(0, 1))) return false;
 				}
 			}
-			else
-			{
+			else {
 				dol_print_error('', 'Bad value of parameter halfday when calling function verifDateHolidayCP');
 			}
 		}
@@ -1371,19 +1358,16 @@ class Holiday extends CommonObject
 					{
 						return $createifnotfound;
 					}
-					else
-					{
+					else {
 						$this->error = $this->db->lasterror();
 						return -2;
 					}
 				}
-				else
-				{
+				else {
 					return '';
 				}
 			}
-			else
-			{
+			else {
 				return $obj->value;
 			}
 		} else {
@@ -1464,8 +1448,7 @@ class Holiday extends CommonObject
 					$this->db->commit();
 					return 1;
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					return -1;
 				}
@@ -1473,8 +1456,7 @@ class Holiday extends CommonObject
 
 			return 0;
 		}
-		else
-		{
+		else {
 			// Mise à jour pour un utilisateur
 			$nbHoliday = price2num($nbHoliday, 5);
 
@@ -1498,8 +1480,7 @@ class Holiday extends CommonObject
 						$this->errors[] = $this->db->lasterror();
 					}
 				}
-				else
-				{
+				else {
 					// Insert for user
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users(nb_holiday, fk_user, fk_type) VALUES (";
 					$sql .= $nbHoliday;
@@ -1512,8 +1493,7 @@ class Holiday extends CommonObject
 					}
 				}
 			}
-			else
-			{
+			else {
 				$this->errors[] = $this->db->lasterror();
 				$error++;
 			}
@@ -1522,8 +1502,7 @@ class Holiday extends CommonObject
 			{
 				return 1;
 			}
-			else
-			{
+			else {
 				return -1;
 			}
 		}
@@ -1580,8 +1559,7 @@ class Holiday extends CommonObject
 				if (!$resql) dol_print_error($this->db);
 			}
 		}
-		else
-		{
+		else {
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users";
 			$sql .= " (fk_user, nb_holiday)";
 			$sql .= " VALUES ('".$userid."','0')";
@@ -1630,8 +1608,7 @@ class Holiday extends CommonObject
 			if ($obj) return $obj->nb_holiday;
 			else return null;
 		}
-		else
-		{
+		else {
 			return null;
 		}
 	}
@@ -1669,8 +1646,7 @@ class Holiday extends CommonObject
 					$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
 					$sql .= " OR u.entity = 0)"; // Show always superadmin
 				}
-				else
-				{
+				else {
 					$sql .= " WHERE u.entity IN (".getEntity('user').")";
 				}
 				$sql .= " AND u.statut > 0";
@@ -1700,15 +1676,13 @@ class Holiday extends CommonObject
 					// Retoune le tableau des utilisateurs
 					return $stringlist;
 				}
-				else
-				{
+				else {
 					// Erreur SQL
 					$this->error = "Error ".$this->db->lasterror();
 					return -1;
 				}
 			}
-			else
-			{
+			else {
 				// We want only list of vacation balance for user ids
 				$sql = "SELECT DISTINCT cpu.fk_user";
 				$sql .= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
@@ -1739,16 +1713,14 @@ class Holiday extends CommonObject
 					// Retoune le tableau des utilisateurs
 					return $stringlist;
 				}
-				else
-				{
+				else {
 					// Erreur SQL
 					$this->error = "Error ".$this->db->lasterror();
 					return -1;
 				}
 			}
 		}
-		else
-		{
+		else {
 			// Si faux donc return array
 			// List for Dolibarr users
 			if ($type)
@@ -1768,8 +1740,7 @@ class Holiday extends CommonObject
 					$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
 					$sql .= " OR u.entity = 0)"; // Show always superadmin
 				}
-				else
-				{
+				else {
 					$sql .= " WHERE u.entity IN (".getEntity('user').")";
 				}
 
@@ -1811,8 +1782,7 @@ class Holiday extends CommonObject
 					return -1;
 				}
 			}
-			else
-			{
+			else {
 				// List of vacation balance users
 				$sql = "SELECT cpu.fk_type, cpu.nb_holiday, u.rowid, u.lastname, u.firstname, u.gender, u.photo, u.employee, u.statut, u.fk_user";
 				$sql .= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
@@ -1851,8 +1821,7 @@ class Holiday extends CommonObject
 					// Retoune le tableau des utilisateurs
 					return $tab_result;
 				}
-				else
-				{
+				else {
 					// Erreur SQL
 					$this->error = "Error ".$this->db->lasterror();
 					return -1;
@@ -1896,8 +1865,7 @@ class Holiday extends CommonObject
 			}
 			return $users_validator;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch_users_approver_holiday  Error ".$this->error, LOG_ERR);
 			return -1;
@@ -2019,8 +1987,7 @@ class Holiday extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return $this->optRowid;
 		}
@@ -2092,8 +2059,7 @@ class Holiday extends CommonObject
 			$this->logs = $tab_result;
 			return 1;
 		}
-		else
-		{
+		else {
 			// Erreur SQL
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
@@ -2188,8 +2154,7 @@ class Holiday extends CommonObject
             $this->db->free($resql);
             return 1;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -2244,8 +2209,7 @@ class Holiday extends CommonObject
 
             return $response;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index d957ade168e..f0f2a588c18 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -233,8 +233,7 @@ if (count($typeleaves) == 0)
     print $langs->trans("GoIntoDictionaryHolidayTypes");
     //print '</div>';
 }
-else
-{
+else {
     $canedit = 0;
     if (!empty($user->rights->holiday->define_holiday)) $canedit = 1;
 
@@ -261,8 +260,7 @@ else
             print '<td class="liste_titre" style="text-align:center"></td>';
         }
     }
-    else
-    {
+    else {
         print '<td class="liste_titre"></td>';
     }
     print '<td class="liste_titre"></td>';
@@ -286,8 +284,7 @@ else
         	print_liste_field_titre($labeltype, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'center ');
         }
     }
-    else
-    {
+    else {
         print_liste_field_titre('NoLeaveWithCounterDefined', $_SERVER["PHP_SELF"], '', '', '', '');
     }
     print_liste_field_titre((empty($user->rights->holiday->define_holiday) ? '' : 'Note'), $_SERVER["PHP_SELF"]);
@@ -343,8 +340,7 @@ else
             	print '</td>'."\n";
         	}
         }
-        else
-        {
+        else {
             print '<td></td>';
         }
 
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index a0f8723b92d..af55e42137e 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -147,8 +147,7 @@ if ($object->id)
         print '</td>';
         print '</tr>';
     }
-    else
-    {
+    else {
         print '<tr>';
         print '<td>'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
         print '<td>';
@@ -169,8 +168,7 @@ if ($object->id)
         print '</td>';
         print '</tr>';
     }
-    else
-    {
+    else {
         print '<tr>';
         print '<td>'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
         print '<td>';
@@ -201,8 +199,7 @@ if ($object->id)
         print '<td>'.nl2br($object->description).'</td>';
         print '</tr>';
     }
-    else
-    {
+    else {
         print '<tr>';
         print '<td>'.$langs->trans('DescCP').'</td>';
         print '<td><textarea name="description" class="flat" rows="'.ROWS_3.'" cols="70">'.$object->description.'</textarea></td>';
@@ -290,8 +287,7 @@ if ($object->id)
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 42faecc5588..3f17a16c05d 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -430,8 +430,7 @@ if ($resql)
 
 		print '</div>';
 	}
-	else
-	{
+	else {
 		$title = $langs->trans("ListeCP");
 
 		$newcardbutton = '';
@@ -524,8 +523,7 @@ if ($resql)
 		    print $form->select_dolusers($search_valideur, "search_valideur", 1, "", 0, $valideurarray, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
 		    print '</td>';
 		}
-		else
-		{
+		else {
 		    print '<td class="liste_titre">&nbsp;</td>';
 		}
 	}
@@ -794,8 +792,7 @@ if ($resql)
 
 	print '</form>';
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index 0444157704b..4bdc3012d74 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -121,8 +121,7 @@ if ($num == 0)
 {
     print '<tr><td colspan="10" class="opacitymedium">'.$langs->trans('None').'</td></tr>';
 }
-else
-{
+else {
     while ($obj = $db->fetch_object($resql))
     {
         $user = new User($db);
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index f2aad5baee3..98b923f0be5 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -261,8 +261,7 @@ class Import
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->errno = $this->db->lasterrno();
 			$this->db->rollback();
@@ -296,14 +295,12 @@ class Import
 				$this->fk_user              = $obj->fk_user;
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = "Model not found";
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -3;
 		}
@@ -354,8 +351,7 @@ class Import
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index a84b255601d..e78ea433057 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -142,8 +142,7 @@ if ($action == 'builddoc')
 	{
 		setEventMessages($objimport->error, $objimport->errors, 'errors');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("FileSuccessfullyBuilt"), null, 'mesgs');
 	}
 }
@@ -179,8 +178,7 @@ if ($action == 'add_import_model')
 		{
 			setEventMessages($langs->trans("ImportModelSaved", $objimport->model_name), null, 'mesgs');
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
 			if ($objimport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
@@ -191,8 +189,7 @@ if ($action == 'add_import_model')
 			}
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ImportModelName")), null, 'errors');
 	}
 }
@@ -209,8 +206,7 @@ if ($step == 3 && $datatoimport)
 		{
 			dol_syslog("File ".$fullpath." was added for import");
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 		}
@@ -372,15 +368,13 @@ if ($step == 1 || !$datatoimport)
 			{
 				print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=2&datatoimport='.$objimport->array_import_code[$key].$param.'">'.img_picto($langs->trans("NewImport"), 'filenew').'</a>';
 			}
-			else
-			{
+			else {
 				print $langs->trans("NotEnoughPermissions");
 			}
 			print '</td></tr>';
 		}
 	}
-	else
-	{
+	else {
 		print '<tr><td class="oddeven" colspan="3">'.$langs->trans("NoImportableData").'</td></tr>';
 	}
 	print '</table>';
@@ -613,8 +607,7 @@ if ($step == 3 && $datatoimport)
         $out .= ' ';
         $out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow), 1);
 	}
-	else
-	{
+	else {
 	    $out .= ' ('.$langs->trans("UploadDisabled").')';
 	}
 	print $out;
@@ -976,15 +969,13 @@ if ($step == 4 && $datatoimport)
 		// Source field info
 		$htmltext = '<b><u>'.$langs->trans("FieldSource").'</u></b><br>';
 		if ($filecolumn > count($fieldssource)) $htmltext .= $langs->trans("DataComeFromNoWhere").'<br>';
-		else
-		{
+		else {
 			if (empty($objimport->array_import_convertvalue[0][$code]))	// If source file does not need convertion
 			{
 				$filecolumntoshow = $filecolumn;
 				$htmltext .= $langs->trans("DataComeFromFileFieldNb", $filecolumntoshow).'<br>';
 			}
-			else
-			{
+			else {
 				if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromref')    $htmltext .= $langs->trans("DataComeFromIdFoundFromRef", $filecolumn, $langs->transnoentitiesnoconv($entitylang)).'<br>';
 				if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromcodeid') $htmltext .= $langs->trans("DataComeFromIdFoundFromCodeId", $filecolumn, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$code]['dict'])).'<br>';
 			}
@@ -997,8 +988,7 @@ if ($step == 4 && $datatoimport)
 		{
 		    if ($example) $htmltext .= $langs->trans("SourceExample").': <b>'.$example.'</b><br>';
 		}
-		else
-		{
+		else {
 		    if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromref')        $htmltext .= $langs->trans("SourceExample").': <b>'.$langs->transnoentitiesnoconv("ExampleAnyRefFoundIntoElement", $entitylang).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.$example.')' : '').'</b><br>';
 		    elseif ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromcodeid') $htmltext .= $langs->trans("SourceExample").': <b>'.$langs->trans("ExampleAnyCodeOrIdFoundIntoDictionary", $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$code]['dict'])).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.$example.')' : '').'</b><br>';
 		    elseif ($example) $htmltext .= $langs->trans("SourceExample").': <b>'.$example.'</b><br>';
@@ -1015,8 +1005,7 @@ if ($step == 4 && $datatoimport)
 		{
 			$htmltext .= $langs->trans("DataIsInsertedInto").'<br>';
 		}
-		else
-		{
+		else {
 			if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromref')    $htmltext .= $langs->trans("DataIDSourceIsInsertedInto").'<br>';
 			if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromcodeid') $htmltext .= $langs->trans("DataCodeIDSourceIsInsertedInto").'<br>';
 		}
@@ -1127,8 +1116,7 @@ if ($step == 4 && $datatoimport)
 		{
 			print '<a class="butAction" href="import.php?step=5'.$param.'&filetoimport='.urlencode($filetoimport).'">'.$langs->trans("NextStep").'</a>';
 		}
-		else
-		{
+		else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("SomeMandatoryFieldHaveNoSource")).'">'.$langs->trans("NextStep").'</a>';
 		}
 	}
@@ -1327,8 +1315,7 @@ if ($step == 5 && $datatoimport)
 	    print '<input type="number" class="maxwidth50" name="excludefirstlinebis" disabled="disabled" value="'.$excludefirstline.'">';
 	    print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
 	}
-	else
-	{
+	else {
 	    print '<input type="number" class="maxwidth50" name="excludefirstline" value="'.$excludefirstline.'">';
 	    print $form->textwithpicto("", $langs->trans("SetThisValueTo2ToExcludeFirstLine"));
 	}
@@ -1338,8 +1325,7 @@ if ($step == 5 && $datatoimport)
 	    print '<input type="text" class="maxwidth50" name="endatlinenbbis" disabled="disabled" value="'.$endatlinenb.'">';
 	    print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
 	}
-	else
-	{
+	else {
 	    print '<input type="text" class="maxwidth50" name="endatlinenb" value="'.$endatlinenb.'">';
 	    print $form->textwithpicto("", $langs->trans("KeepEmptyToGoToEndOfFile"));
 	}
@@ -1355,8 +1341,7 @@ if ($step == 5 && $datatoimport)
 		{
 			print $form->multiselectarray('updatekeysbis', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '80%', 'disabled');
 		}
-		else
-		{
+		else {
 			print '<span class="opacitymedium">'.$langs->trans("NoUpdateAttempt").'</span> &nbsp; -';
 		}
 		foreach ($updatekeys as $val) {
@@ -1369,8 +1354,7 @@ if ($step == 5 && $datatoimport)
 			print $form->multiselectarray('updatekeys', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '80%');
 			print $form->textwithpicto("", $langs->trans("SelectPrimaryColumnsForUpdateAttempt"));
 		}
-		else
-		{
+		else {
 			print '<span class="opacitymedium">'.$langs->trans("UpdateNotYetSupportedForThisImport").'</span>';
 		}
 	}
@@ -1469,14 +1453,12 @@ if ($step == 5 && $datatoimport)
         {
             print '<input type="submit" class="butAction" value="'.$langs->trans("RunSimulateImportFile").'">';
         }
-        else
-        {
+        else {
             print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunSimulateImportFile").'</a>';
         }
         print '</div>';
     }
-    else
-    {
+    else {
         // Launch import
         $arrayoferrors = array();
         $arrayofwarnings = array();
@@ -1527,8 +1509,7 @@ if ($step == 5 && $datatoimport)
             // Close file
             $obj->import_close_file();
         }
-        else
-        {
+        else {
             print $langs->trans("ErrorFailedToOpenFile", $pathfile);
         }
 
@@ -1627,15 +1608,13 @@ if ($step == 5 && $datatoimport)
             {
                 print '<a class="butAction" href="'.DOL_URL_ROOT.'/imports/import.php?leftmenu=import&step=6&importid='.$importid.$param.'">'.$langs->trans("RunImportFile").'</a>';
             }
-            else
-            {
+            else {
                 //print '<input type="submit" class="butAction" value="'.dol_escape_htmltag($langs->trans("RunSimulateImportFile")).'">';
 
                 print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("CorrectErrorBeforeRunningImport")).'">'.$langs->trans("RunImportFile").'</a>';
             }
         }
-        else
-        {
+        else {
             print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunSimulateImportFile").'</a>';
 
             print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunImportFile").'</a>';
@@ -1895,14 +1874,12 @@ if ($step == 6 && $datatoimport)
 		// Close file
 		$obj->import_close_file();
 	}
-	else
-	{
+	else {
 		print $langs->trans("ErrorFailedToOpenFile", $pathfile);
 	}
 
 	if (count($arrayoferrors) > 0) $db->rollback(); // We force rollback because this was errors.
-	else
-	{
+	else {
 	    $error = 0;
 
 		// Run the sql after import if defined
@@ -1999,7 +1976,7 @@ function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
 		print '</td>';
 		print '</tr>';
 	}
-	else	// Print field of source file
+	else // Print field of source file
 	{
 		print '<tr'.($nostyle ? '' : ' '.$bc[$var]).' style="height:'.$height.'">';
 		print '<td class="nocellnopadding" width="16" style="font-weight: normal">';

From a25ed0e041034a88e297286e3f8e9505d15bcf82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 01:56:06 +0200
Subject: [PATCH 328/490] add new rule

---
 .travis.yml                                   |   2 +-
 htdocs/product/admin/dynamic_prices.php       |   6 +-
 htdocs/product/admin/product.php              |  44 ++--
 htdocs/product/admin/product_tools.php        |  15 +-
 htdocs/product/agenda.php                     |   3 +-
 htdocs/product/ajax/products.php              |   3 +-
 .../product/actions_card_product.class.php    |   6 +-
 .../service/actions_card_service.class.php    |   6 +-
 htdocs/product/card.php                       | 126 ++++------
 htdocs/product/class/api_products.class.php   |   8 +-
 .../product/class/html.formproduct.class.php  |  24 +-
 htdocs/product/class/product.class.php        | 221 ++++++------------
 htdocs/product/class/productbatch.class.php   |  21 +-
 .../class/propalmergepdfproduct.class.php     |  24 +-
 htdocs/product/composition/card.php           |  39 ++--
 htdocs/product/document.php                   |   6 +-
 .../class/price_expression.class.php          |  24 +-
 .../class/price_global_variable.class.php     |  18 +-
 .../price_global_variable_updater.class.php   |  27 +--
 htdocs/product/dynamic_price/editor.php       |  21 +-
 htdocs/product/fournisseurs.php               |  39 ++--
 htdocs/product/index.php                      |  12 +-
 .../product/inventory/ajax/ajax.inventory.php |   6 +-
 htdocs/product/inventory/card.php             |  15 +-
 .../inventory/class/inventory.class.php       |   3 +-
 htdocs/product/inventory/inventory.php        |  12 +-
 htdocs/product/inventory/list.php             |   6 +-
 htdocs/product/list.php                       |   9 +-
 htdocs/product/popucom.php                    |   6 +-
 htdocs/product/popuprop.php                   |   6 +-
 htdocs/product/price.php                      |  57 ++---
 htdocs/product/reassort.php                   |   6 +-
 htdocs/product/reassortlot.php                |   6 +-
 htdocs/product/stats/card.php                 |  21 +-
 htdocs/product/stats/contrat.php              |   6 +-
 htdocs/product/stats/mo.php                   |   6 +-
 htdocs/product/stock/card.php                 |  27 +--
 htdocs/product/stock/class/entrepot.class.php |  30 +--
 htdocs/product/stock/fiche-valo.php           |   3 +-
 htdocs/product/stock/index.php                |   3 +-
 .../product/stock/lib/replenishment.lib.php   |   3 +-
 htdocs/product/stock/list.php                 |   3 +-
 htdocs/product/stock/massstockmove.php        |  18 +-
 htdocs/product/stock/movement_card.php        |  36 +--
 htdocs/product/stock/movement_list.php        |  36 +--
 htdocs/product/stock/product.php              |  51 ++--
 htdocs/product/stock/productlot_card.php      |  14 +-
 htdocs/product/stock/productlot_document.php  |   3 +-
 htdocs/product/stock/productlot_list.php      |   3 +-
 htdocs/product/stock/replenish.php            |  12 +-
 htdocs/product/stock/replenishorders.php      |   3 +-
 .../product/stock/tpl/stocktransfer.tpl.php   |   6 +-
 htdocs/product/stock/valo.php                 |   3 +-
 htdocs/product/traduction.php                 |  15 +-
 54 files changed, 378 insertions(+), 751 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 752dd572371..1112454c991 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -291,7 +291,7 @@ script:
   # Ensure we catch errors
   set -e
   # Exclusions are defined in the ruleset.xml file
-  phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
+  phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .
   #if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .; fi
   set +e
   echo
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index a50e22315d5..a1077a4f845 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -183,8 +183,7 @@ if ($action != 'create_updater' && $action != 'edit_updater')
 	        print '</tr>';
 	    }
     }
-    else
-    {
+    else {
     	print '<tr colspan="7"><td class="opacitymedium">';
     	print $langs->trans("None");
     	print '</td></tr>';
@@ -276,8 +275,7 @@ if ($action != 'create_variable' && $action != 'edit_variable')
 	        print '</tr>';
 	    }
     }
-    else
-    {
+    else {
     	print '<tr><td colspan="7" class="opacitymedium">';
     	print $langs->trans("None");
     	print '</td></tr>';
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index e1fe84600d1..8ac181e64c9 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -82,8 +82,7 @@ if ($action == 'setcodeproduct')
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -112,8 +111,7 @@ if ($action == 'other')
 				$res = dolibarr_set_const($db, 'PRODUIT_CUSTOMER_PRICES', 0, 'chaine', 0, '', $conf->entity);
 				dolibarr_set_const($db, 'PRODUCT_PRICE_UNIQ', 1, 'chaine', 0, '', $conf->entity);
 			}
-			else
-			{
+			else {
 				$multirule = explode('&', $princingrules);
 				foreach ($multirule as $rulesselected)
 				{
@@ -121,7 +119,7 @@ if ($action == 'other')
 				}
 			}
 		}
-		else	// We clear this mode
+		else // We clear this mode
 		{
 			if (strpos($rule, '&') === false) {
 				$res = dolibarr_set_const($db, $rule, 0, 'chaine', 0, '', $conf->entity);
@@ -202,14 +200,12 @@ if ($action == 'specimen') // For products
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=product&file=SPECIMEN.pdf");
 			return;
 		}
-		else
-		{
+		else {
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -271,8 +267,7 @@ if ($action)
     {
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
 	    setEventMessages($langs->trans("SetupNotError"), null, 'errors');
     }
 }
@@ -362,8 +357,7 @@ foreach ($dirproduct as $dirroot)
     				print img_picto($langs->trans("Activated"), 'switch_on');
     				print "</td>\n";
     			}
-    			else
-    			{
+    			else {
     				$disabled = false;
     				if (!empty($conf->multicompany->enabled) && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true);
     				print '<td class="center">';
@@ -404,8 +398,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -476,8 +469,7 @@ foreach ($dirmodels as $reldir)
 	                            	print '</a>';
 	                            	print '</td>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -489,8 +481,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -517,8 +508,7 @@ foreach ($dirmodels as $reldir)
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -572,8 +562,7 @@ if (empty($conf->multicompany->enabled))
 {
 	print '<td>'.$langs->trans("PricingRule").'</td>';
 }
-else
-{
+else {
 	print '<td>'.$form->textwithpicto($langs->trans("PricingRule"), $langs->trans("SamePriceAlsoForSharedCompanies"), 1).'</td>';
 }
 print '<td width="60" class="right">';
@@ -617,8 +606,7 @@ if (empty($conf->use_javascript_ajax))
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print '</td>';
 }
-else
-{
+else {
 	print '<td width="60" class="right">';
 	$arrval = array(
 		'0'=>$langs->trans("No"),
@@ -743,8 +731,7 @@ if (!empty($conf->global->PRODUCT_CANVAS_ABILITY))
     						print '</td><td class="right">';
     						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;spe='.$file.'&amp;value=0">'.$langs->trans("Disable").'</a>';
     					}
-    					else
-    					{
+    					else {
     						print '&nbsp;</td><td class="right">';
     						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;spe='.$file.'&amp;value=1">'.$langs->trans("Activate").'</a>';
     					}
@@ -756,8 +743,7 @@ if (!empty($conf->global->PRODUCT_CANVAS_ABILITY))
 		    closedir($handle);
         }
 	}
-	else
-	{
+	else {
 		setEventMessages($dir.' '.$langs->trans("IsNotADir"), null, 'errors');
 	}
 }
diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php
index 4ce4a067e5c..898d23ae8fb 100644
--- a/htdocs/product/admin/product_tools.php
+++ b/htdocs/product/admin/product_tools.php
@@ -121,8 +121,7 @@ if ($action == 'convert')
 								$newprice = price2num($objectstatic->multiprices_ttc[$level], 'MU'); // Second param must be MU (we want a unit price so 'MU'. If unit price was on 4 decimal, we must keep 4 decimals)
 								$newminprice = $objectstatic->multiprices_min_ttc[$level];
 							}
-							else
-							{
+							else {
 								$newprice = price2num($objectstatic->multiprices[$level], 'MU'); // Second param must be MU (we want a unit price so 'MU'. If unit price was on 4 decimal, we must keep 4 decimals)
 								$newminprice = $objectstatic->multiprices_min[$level];
 							}
@@ -152,8 +151,7 @@ if ($action == 'convert')
 							$newprice = price2num($objectstatic->price_ttc, 'MU'); // Second param must be MU (we want a unit price so 'MU'. If unit price was on 4 decimal, we must keep 4 decimals)
 							$newminprice = $objectstatic->price_min_ttc;
 						}
-						else
-						{
+						else {
 							$newprice = price2num($objectstatic->price, 'MU'); // Second param must be MU (we want a unit price so 'MU'. If unit price was on 4 decimal, we must keep 4 decimals)
 							$newminprice = $objectstatic->price_min;
 						}
@@ -252,8 +250,7 @@ if ($action == 'convert')
 		{
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 		}
 
@@ -263,8 +260,7 @@ if ($action == 'convert')
 			if ($nbrecordsmodified > 0) setEventMessages($langs->trans("RecordsModified", $nbrecordsmodified), null, 'mesgs');
 			else setEventMessages($langs->trans("NoRecordFound"), null, 'warnings');
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
@@ -290,8 +286,7 @@ if (empty($mysoc->country_code))
 	$warnpicto = img_error($langs->trans("WarningMandatorySetupNotComplete"));
 	print '<br><a href="'.DOL_URL_ROOT.'/admin/company.php?mainmenu=home">'.$warnpicto.' '.$langs->trans("WarningMandatorySetupNotComplete").'</a>';
 }
-else
-{
+else {
 	print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'" />';
 	print '<input type="hidden" name="action" value="convert" />';
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index 808ba9739ba..3d0dc302283 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -41,8 +41,7 @@ if (GETPOST('actioncode', 'array'))
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
 }
-else
-{
+else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 918950179c7..219e68171d2 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -163,8 +163,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 
 	echo json_encode($outjson);
 }
-else
-{
+else {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 	$langs->loadLangs(array("main", "products"));
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index 1612448c1bb..da99efc337d 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -288,8 +288,7 @@ class ActionsCardProduct
 			}
 			$this->db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db, $sql);
 		}
 	}
@@ -428,8 +427,7 @@ class ActionsCardProduct
 			}
 			$this->db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index 331cecb3071..aaf9b584068 100644
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -268,8 +268,7 @@ class ActionsCardService
 			}
 			$this->db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db, $sql);
 		}
 	}
@@ -361,8 +360,7 @@ class ActionsCardService
 			}
 			$this->db->free($resql);
 		}
-		else
-		{
+		else {
 			print $sql;
 		}
 	}
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 87e86e8e0bc..bd18737bd6b 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -175,8 +175,7 @@ if (empty($reshook))
 	    	header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 	    	exit;
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
         	if ($result == -1) $errors[] = 'ErrorBadBarCodeSyntax';
         	elseif ($result == -2) $errors[] = 'ErrorBarCodeRequired';
@@ -222,12 +221,10 @@ if (empty($reshook))
 
             if ($object->price_base_type == 'TTC')
             	$object->price_ttc = GETPOST('price');
-            else
-            	$object->price = GETPOST('price');
+            else $object->price = GETPOST('price');
             if ($object->price_base_type == 'TTC')
             	$object->price_min_ttc = GETPOST('price_min');
-            else
-            	$object->price_min = GETPOST('price_min');
+            else $object->price_min = GETPOST('price_min');
 
 	        $tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
 
@@ -340,8 +337,7 @@ if (empty($reshook))
                         $object->multiprices["$i"] = price2num($_POST["price_".$i], 'MU');
                         $object->multiprices_base_type["$i"] = $_POST["multiprices_base_type_".$i];
                     }
-                    else
-                    {
+                    else {
                         $object->multiprices["$i"] = "";
                     }
                 }
@@ -369,14 +365,12 @@ if (empty($reshook))
 					header("Location: ".$backtopage);
 					exit;
 				}
-				else
-				{
+				else {
                 	header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
                 	exit;
 				}
             }
-            else
-			{
+            else {
             	if (count($object->errors)) setEventMessages($object->error, $object->errors, 'errors');
 				else setEventMessages($langs->trans($object->error), null, 'errors');
                 $action = "create";
@@ -391,8 +385,7 @@ if (empty($reshook))
         {
             $action = '';
         }
-        else
-        {
+        else {
             if ($object->id > 0)
             {
 				$object->oldcopy = clone $object;
@@ -489,15 +482,13 @@ if (empty($reshook))
 
                         $action = 'view';
                     }
-                    else
-					{
+                    else {
 						if (count($object->errors)) setEventMessages($object->error, $object->errors, 'errors');
                     	else setEventMessages($langs->trans($object->error), null, 'errors');
                         $action = 'edit';
                     }
                 }
-                else
-				{
+                else {
 					if (count($object->errors)) setEventMessages($object->error, $object->errors, 'errors');
                 	else setEventMessages($langs->trans("ErrorProductBadRefOrLabel"), null, 'errors');
                     $action = 'edit';
@@ -514,8 +505,7 @@ if (empty($reshook))
         {
         	setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
         }
-        else
-        {
+        else {
             $db->begin();
 
             $originalId = $id;
@@ -578,8 +568,7 @@ if (empty($reshook))
                         header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
                         exit;
                     }
-                    else
-                    {
+                    else {
                         $id = $originalId;
 
                         if ($object->error == 'ErrorProductAlreadyExists')
@@ -594,16 +583,14 @@ if (empty($reshook))
                             setEventMessages($mesg, null, 'errors');
                             $object->fetch($id);
                         }
-                        else
-                     	{
+                        else {
                             $db->rollback();
                             if (count($object->errors))
                             {
                             	setEventMessages($object->error, $object->errors, 'errors');
                             	dol_print_error($db, $object->errors);
                             }
-                            else
-                            {
+                            else {
                             	setEventMessages($langs->trans($object->error), null, 'errors');
                             	dol_print_error($db, $object->error);
                             }
@@ -613,8 +600,7 @@ if (empty($reshook))
                     unset($object->context['createfromclone']);
                 }
             }
-            else
-            {
+            else {
                 $db->rollback();
                 dol_print_error($db, $object->error);
             }
@@ -632,8 +618,7 @@ if (empty($reshook))
             header('Location: '.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'&delprod='.urlencode($object->ref));
             exit;
         }
-        else
-        {
+        else {
         	setEventMessages($langs->trans($object->error), null, 'errors');
             $reload = 0;
             $action = '';
@@ -743,8 +728,7 @@ if (empty($reshook))
                     dol_syslog($langs->trans('FailedToGetCostPrice'));
                     setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
                 }
-                else
-                {
+                else {
                     $buyprice = $result;
                 }
 
@@ -786,8 +770,7 @@ if (empty($reshook))
                     dol_syslog($langs->trans('FailedToGetCostPrice'));
                     setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
                 }
-                else
-                {
+                else {
                     $buyprice = $result;
                 }
 
@@ -829,8 +812,7 @@ if (empty($reshook))
                     dol_syslog($langs->trans('FailedToGetCostPrice'));
                     setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
                 }
-                else
-                {
+                else {
                     $buyprice = $result;
                 }
 
@@ -937,8 +919,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
 	$objcanvas->display_canvas($action); // Show template
 }
-else
-{
+else {
     // -----------------------------------------
     // When used in standard mode
     // -----------------------------------------
@@ -1030,8 +1011,7 @@ else
 	        {
 	         	$fk_barcode_type = GETPOST('fk_barcode_type');
 	        }
-	        else
-	        {
+	        else {
 	        	if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
 	        }
 	        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
@@ -1080,8 +1060,7 @@ else
             print '<input name="desiredstock" class="maxwidth50" value="'.GETPOST('desiredstock').'">';
             print '</td></tr>';
         }
-        else
-        {
+        else {
             print '<input name="seuil_stock_alerte" type="hidden" value="0">';
             print '<input name="desiredstock" type="hidden" value="0">';
         }
@@ -1215,8 +1194,7 @@ else
 
             print '<br>';
         }
-        else
-		{
+        else {
             print '<table class="border centpercent">';
 
             // Price
@@ -1416,8 +1394,7 @@ else
                 print '<option value="1" selected>'.$langs->trans("OnSell").'</option>';
                 print '<option value="0">'.$langs->trans("NotOnSell").'</option>';
             }
-            else
-            {
+            else {
                 print '<option value="1">'.$langs->trans("OnSell").'</option>';
                 print '<option value="0" selected>'.$langs->trans("NotOnSell").'</option>';
             }
@@ -1432,8 +1409,7 @@ else
                 print '<option value="1" selected>'.$langs->trans("ProductStatusOnBuy").'</option>';
                 print '<option value="0">'.$langs->trans("ProductStatusNotOnBuy").'</option>';
             }
-            else
-            {
+            else {
                 print '<option value="1">'.$langs->trans("ProductStatusOnBuy").'</option>';
                 print '<option value="0" selected>'.$langs->trans("ProductStatusNotOnBuy").'</option>';
             }
@@ -1463,8 +1439,7 @@ else
 		        {
 		         	$fk_barcode_type = GETPOST('fk_barcode_type');
 		        }
-		        else
-		        {
+		        else {
 	        		$fk_barcode_type = $object->barcode_type;
 		        	if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
 		        }
@@ -1526,8 +1501,7 @@ else
                 print $formproduct->selectMeasuringUnits("duration_unit", "time", $object->duration_unit, 0, 1);
                 print '</td></tr>';
             }
-            else
-            {
+            else {
                 // Nature
                 print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';
                 $statutarray = array('-1'=>'&nbsp;', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
@@ -1734,8 +1708,7 @@ else
 			print '</form>';
 		}
         // Fiche en mode visu
-        else
-		{
+        else {
             $showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
             if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;
 
@@ -1791,8 +1764,7 @@ else
                 {
                     print $formbarcode->formBarcodeType($_SERVER['PHP_SELF'].'?id='.$object->id, $object->barcode_type, 'fk_barcode_type');
                 }
-                else
-                {
+                else {
                     $object->fetch_barcode();
                     print $object->barcode_type_label ? $object->barcode_type_label : ($object->barcode ? '<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>' : '');
                 }
@@ -1819,8 +1791,7 @@ else
 					print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 					print '</form>';
                 }
-                else
-                {
+                else {
 					print $object->barcode;
                 }
                 print '</td></tr>'."\n";
@@ -2012,8 +1983,7 @@ else
 
                 print '</td></tr>';
             }
-            else
-            {
+            else {
                 // Nature
                 print '<tr><td class="titlefield">'.$langs->trans("Nature").'</td><td colspan="2">';
                 print $object->getLibFinished();
@@ -2025,8 +1995,7 @@ else
                 {
                 	print $object->weight." ".measuringUnitString(0, "weight", $object->weight_units);
                 }
-                else
-                {
+                else {
                     print '&nbsp;';
                 }
                 print "</td></tr>\n";
@@ -2042,8 +2011,7 @@ else
                         if ($object->height) print " x ".$object->height;
                         print ' '.measuringUnitString(0, "size", $object->length_units);
                     }
-                    else
-                    {
+                    else {
                         print '&nbsp;';
                     }
                     print "</td></tr>\n";
@@ -2056,8 +2024,7 @@ else
                     {
                     	print $object->surface." ".measuringUnitString(0, "surface", $object->surface_units);
                     }
-                    else
-                    {
+                    else {
                         print '&nbsp;';
                     }
                     print "</td></tr>\n";
@@ -2070,8 +2037,7 @@ else
                     {
                     	print $object->volume." ".measuringUnitString(0, "volume", $object->volume_units);
                     }
-                    else
-                    {
+                    else {
                         print '&nbsp;';
                     }
                     print "</td></tr>\n";
@@ -2085,8 +2051,7 @@ else
                 	{
                 		print $object->net_measure." ".measuringUnitString($object->net_measure_units);
                 	}
-                	else
-                	{
+                	else {
                 		print '&nbsp;';
                 	}
                 }
@@ -2215,8 +2180,7 @@ if ($action != 'create' && $action != 'edit')
                 {
                     print '<span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span>'."\n";
                 }
-                else
-    			{
+                else {
                     print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a>';
                 }
             }
@@ -2231,18 +2195,15 @@ if ($action != 'create' && $action != 'edit')
                 {
                     print '<span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span>'."\n";
                 }
-                else
-    			{
+                else {
                     print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("Delete").'</a>';
                 }
             }
-            else
-    		{
+            else {
                 print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ProductIsUsed").'">'.$langs->trans("Delete").'</a>';
             }
         }
-        else
-    	{
+        else {
             print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Delete").'</a>';
         }
     }
@@ -2276,8 +2237,7 @@ if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action ==
         	$html .= $form->selectarray("propalid", $otherprop, 0, 1);
         	$html .= '</td></tr>';
         }
-        else
-		{
+        else {
         	$html .= '<tr><td style="width: 200px;">';
         	$html .= $langs->trans("AddToDraftProposals").'</td><td>';
         	$html .= $langs->trans("NoDraftProposals");
@@ -2300,8 +2260,7 @@ if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action ==
         	$html .= $form->selectarray("commandeid", $othercom, 0, 1);
         	$html .= '</td></tr>';
         }
-        else
-		{
+        else {
         	$html .= '<tr><td style="width: 200px;">';
         	$html .= $langs->trans("AddToDraftOrders").'</td><td>';
         	$html .= $langs->trans("NoDraftOrders");
@@ -2324,8 +2283,7 @@ if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action ==
     		$html .= $form->selectarray("factureid", $otherinvoice, 0, 1);
     		$html .= '</td></tr>';
     	}
-    	else
-    	{
+    	else {
     		$html .= '<tr><td style="width: 200px;">';
     		$html .= $langs->trans("AddToDraftInvoices").'</td><td>';
     		$html .= $langs->trans("NoDraftInvoices");
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index b04560dab32..66cef158439 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -303,8 +303,7 @@ class Products extends DolibarrApi
             // We update price only if it was changed
             $pricemodified = false;
             if ($this->product->price_base_type != $oldproduct->price_base_type) { $pricemodified = true;
-            } else
-            {
+            } else {
                 if ($this->product->tva_tx != $oldproduct->tva_tx) { $pricemodified = true;
                 }
                 if ($this->product->tva_npr != $oldproduct->tva_npr) { $pricemodified = true;
@@ -318,8 +317,7 @@ class Products extends DolibarrApi
                     if ($this->product->price_min_ttc != $oldproduct->price_min_ttc) { $pricemodified = true;
                     }
                 }
-                else
-                {
+                else {
                     if ($this->product->price != $oldproduct->price) { $pricemodified = true;
                     }
                     if ($this->product->price_min != $oldproduct->price_min) { $pricemodified = true;
@@ -805,7 +803,7 @@ class Products extends DolibarrApi
 
     			$product_fourn = new ProductFournisseur($this->db);
     			$product_fourn_list = $product_fourn->list_product_fournisseur_price($obj->rowid, '', '', 0, 0);
-    			foreach($product_fourn_list as $tmpobj) {
+    			foreach ($product_fourn_list as $tmpobj) {
     				$this->_cleanObjectDatas($tmpobj);
     			}
     				//var_dump($product_fourn_list->db);exit;
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 0eeddd15c07..b38501cb788 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -102,8 +102,7 @@ class FormProduct
 			{
 				$sql .= ", pb.qty as stock";
 			}
-			else
-			{
+			else {
 				$sql .= ", ps.reel as stock";
 			}
 		}
@@ -126,8 +125,7 @@ class FormProduct
 		{
 			$sql .= " AND e.statut IN (".$this->db->escape(implode(',', $warehouseStatus)).")";
 		}
-		else
-		{
+		else {
 			$sql .= " AND e.statut = 1";
 		}
 
@@ -179,8 +177,7 @@ class FormProduct
 
 			return $num;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -271,8 +268,7 @@ class FormProduct
 				if ($arraytypes['stock'] <= 0) {
 					$label .= ' <span class= \'text-warning\'>('.$langs->trans("Stock").':'.$arraytypes['stock'].')</span>';
 				}
-				else
-				{
+				else {
 					$label .= ' <span class=\'opacitymedium\'>('.$langs->trans("Stock").':'.$arraytypes['stock'].')</span>';
 				}
 			}
@@ -437,8 +433,7 @@ class FormProduct
 		{
 			if (!empty($fk_product)) $productIdArray[] = $fk_product;
 		}
-		else
-		{
+		else {
 			foreach ($objectLines as $line) {
 				if ($line->fk_product) $productIdArray[] = $line->fk_product;
 			}
@@ -459,8 +454,7 @@ class FormProduct
 		{
 			$productIdArray = array($fk_product); // only show lot stock for product
 		}
-		else
-		{
+		else {
 			foreach ($this->cache_lot as $key => $value)
 			{
 				$productIdArray[] = $key;
@@ -527,8 +521,7 @@ class FormProduct
 		{
 			return count($this->cache_lot);
 		}
-		else
-		{
+		else {
 			// clear cache
 			$this->cache_lot = array();
 			$productIdList = implode(',', $productIdArray);
@@ -561,8 +554,7 @@ class FormProduct
 
 				return $num;
 			}
-			else
-			{
+			else {
 				dol_print_error($this->db);
 				return -1;
 			}
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 7b6892552d1..f072d04916e 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -457,8 +457,7 @@ class Product extends CommonObject
         if ($err > 0) {
             return 0;
         }
-        else
-        {
+        else {
             return 1;
         }
     }
@@ -683,34 +682,29 @@ class Product extends CommonObject
                                     $error++;
                                 }
                             }
-                            else
-                            {
+                            else {
                                 $error++;
                                 $this->error = $this->db->lasterror();
                             }
                         }
-                        else
-                        {
+                        else {
                             $error++;
                             $this->error = 'ErrorFailedToGetInsertedId';
                         }
                     }
-                    else
-                    {
+                    else {
                         $error++;
                         $this->error = $this->db->lasterror();
                     }
                 }
-                else
-                {
+                else {
                     // Product already exists with this ref
                     $langs->load("products");
                     $error++;
                     $this->error = "ErrorProductAlreadyExists";
                 }
             }
-            else
-            {
+            else {
                 $error++;
                 $this->error = $this->db->lasterror();
             }
@@ -727,14 +721,12 @@ class Product extends CommonObject
                 $this->db->commit();
                 return $this->id;
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 return -$error;
             }
         }
-        else
-          {
+        else {
             $this->db->rollback();
             dol_syslog(get_class($this)."::Create fails verify ".join(',', $this->errors), LOG_WARNING);
             return -3;
@@ -811,8 +803,7 @@ class Product extends CommonObject
             $result = $mod->verif($this->db, $valuetotest, $this, 0, $typefortest);
             return $result;
         }
-        else
-        {
+        else {
             return 0;
         }
     }
@@ -1104,14 +1095,12 @@ class Product extends CommonObject
                     $this->db->commit();
                     return 1;
                 }
-                else
-                {
+                else {
                     $this->db->rollback();
                     return -$error;
                 }
             }
-            else
-            {
+            else {
                 if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                     $langs->load("errors");
                     if (empty($conf->barcode->enabled) || empty($this->barcode)) {
@@ -1123,8 +1112,7 @@ class Product extends CommonObject
                     $this->db->rollback();
                     return -1;
                 }
-                else
-                {
+                else {
                     $this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
                     $this->errors[] = $this->error;
                     $this->db->rollback();
@@ -1132,8 +1120,7 @@ class Product extends CommonObject
                 }
             }
         }
-        else
-          {
+        else {
             $this->db->rollback();
             dol_syslog(get_class($this)."::Update fails verify ".join(',', $this->errors), LOG_WARNING);
             return -3;
@@ -1281,8 +1268,7 @@ class Product extends CommonObject
                 $this->db->commit();
                 return 1;
             }
-            else
-            {
+            else {
                 foreach ($this->errors as $errmsg)
                 {
                     dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
@@ -1292,8 +1278,7 @@ class Product extends CommonObject
                 return -$error;
             }
         }
-        else
-        {
+        else {
             $this->error = "ErrorRecordIsUsedCantDelete";
             return 0;
         }
@@ -1332,8 +1317,7 @@ class Product extends CommonObject
                     }
                     $sql2 .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";
                 }
-                else
-                {
+                else {
                     $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description";
                     if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", note";
                     }
@@ -1370,8 +1354,7 @@ class Product extends CommonObject
                     }
                     $sql2 .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";
                 }
-                else
-                {
+                else {
                     $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description";
                     if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", note";
                     }
@@ -1392,8 +1375,7 @@ class Product extends CommonObject
                     }
                 }
             }
-            else
-            {
+            else {
                 // language is not current language and we didn't provide a multilang description for this language
             }
         }
@@ -1435,8 +1417,7 @@ class Product extends CommonObject
             // End call triggers
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this).'::delMultiLangs error='.$this->error, LOG_ERR);
             return -1;
@@ -1498,8 +1479,7 @@ class Product extends CommonObject
             $this->db->commit();
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -1538,8 +1518,7 @@ class Product extends CommonObject
             }
             return 1;
         }
-        else
-        {
+        else {
             $this->error = "Error: ".$this->db->lasterror()." - ".$sql;
             return -1;
         }
@@ -1581,8 +1560,7 @@ class Product extends CommonObject
             dol_print_error($this->db);
             return -1;
         }
-        else
-        {
+        else {
             return 1;
         }
     }
@@ -1609,8 +1587,7 @@ class Product extends CommonObject
         if ($resql) {
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -1687,8 +1664,7 @@ class Product extends CommonObject
 					{
 						$pu_ht = $priceforthequantityarray['unitprice'];
 					}
-					else
-					{
+					else {
 						$pu_ttc = $priceforthequantityarray['unitprice'];
 					}
 					break;
@@ -1708,8 +1684,7 @@ class Product extends CommonObject
 					{
 						$pu_ht = $priceforthequantityarray['unitprice'];
 					}
-					else
-					{
+					else {
 						$pu_ttc = $priceforthequantityarray['unitprice'];
 					}
 					break;
@@ -1852,20 +1827,17 @@ class Product extends CommonObject
 						$result = $obj->fk_product;
                         return $result;
                     }
-                    else
-                    {
+                    else {
                         return -1; // Ce produit n'existe pas avec cet id tarif fournisseur ou existe mais qte insuffisante, ni pour le couple produit/ref fournisseur dans la quantité.
                     }
                 }
-                else
-                {
+                else {
                     $this->error = $this->db->lasterror();
                     return -3;
                 }
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             return -2;
         }
@@ -1937,14 +1909,12 @@ class Product extends CommonObject
                     $price_min = price2num($newminprice) / (1 + ($newvat / 100));
                     $price_min = price2num($price_min, 'MU');
                 }
-                else
-                {
+                else {
                     $price_min = 0;
                     $price_min_ttc = 0;
                 }
             }
-            else
-            {
+            else {
                 $price = price2num($newprice, 'MU');
                 $price_ttc = ($newnpr != 1) ? price2num($newprice) * (1 + ($newvat / 100)) : $price;
                 $price_ttc = price2num($price_ttc, 'MU');
@@ -1955,8 +1925,7 @@ class Product extends CommonObject
                     $price_min_ttc = price2num($price_min_ttc, 'MU');
                     //print 'X'.$newminprice.'-'.$price_min;
                 }
-                else
-                {
+                else {
                     $price_min = 0;
                     $price_min_ttc = 0;
                 }
@@ -1969,7 +1938,7 @@ class Product extends CommonObject
                 $localtaxtype2 = $localtaxes_array['2'];
                 $localtax2 = $localtaxes_array['3'];
             }
-            else     // old method. deprecated because ot can't retreive type
+            else // old method. deprecated because ot can't retreive type
             {
                 $localtaxtype1 = '0';
                 $localtax1 = get_localtax($newvat, 1);
@@ -2045,8 +2014,7 @@ class Product extends CommonObject
 
                 $this->db->commit();
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 dol_print_error($this->db);
             }
@@ -2281,8 +2249,7 @@ class Product extends CommonObject
                             }
                             }*/
                         }
-                        else
-                        {
+                        else {
                             dol_print_error($this->db);
                             return -1;
                         }
@@ -2330,15 +2297,13 @@ class Product extends CommonObject
                                 }
                                 $this->prices_by_qty_list[0] = $resultat;
                             }
-                            else
-                            {
+                            else {
                                     dol_print_error($this->db);
                                     return -1;
                             }
                         }
                     }
-                    else
-                    {
+                    else {
                         dol_print_error($this->db);
                         return -1;
                     }
@@ -2394,15 +2359,13 @@ class Product extends CommonObject
                                     }
                                     $this->prices_by_qty_list[$i] = $resultat;
                                 }
-                                else
-                                         {
+                                else {
                                     dol_print_error($this->db);
                                     return -1;
                                 }
                             }
                         }
-                        else
-                        {
+                        else {
                             dol_print_error($this->db);
                             return -1;
                         }
@@ -2427,13 +2390,11 @@ class Product extends CommonObject
 
                 return 1;
             }
-            else
-            {
+            else {
                 return 0;
             }
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return -1;
         }
@@ -2507,8 +2468,7 @@ class Product extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -2558,8 +2518,7 @@ class Product extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -2661,8 +2620,7 @@ class Product extends CommonObject
             if ($reshook > 0) $this->stats_commande = $hookmanager->resArray['stats_commande'];
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -2718,8 +2676,7 @@ class Product extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error().' sql='.$sql;
             return -1;
         }
@@ -2802,8 +2759,7 @@ class Product extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -2855,8 +2811,7 @@ class Product extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -2946,8 +2901,7 @@ class Product extends CommonObject
 
     		return 1;
     	}
-    	else
-    	{
+    	else {
     		$this->error = $this->db->error();
     		return -1;
     	}
@@ -3020,8 +2974,7 @@ class Product extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error().' sql='.$sql;
             return -1;
         }
@@ -3094,8 +3047,7 @@ class Product extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -3147,8 +3099,7 @@ class Product extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -3182,8 +3133,7 @@ class Product extends CommonObject
                 $i++;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->error().' sql='.$sql;
             return -1;
         }
@@ -3192,8 +3142,7 @@ class Product extends CommonObject
             $year = strftime('%Y', time());
             $month = strftime('%m', time());
         }
-        else
-        {
+        else {
             $month = 12; // We imagine we are at end of year, so we get last 12 month before, so all correct year.
         }
         $result = array();
@@ -3674,8 +3623,7 @@ class Product extends CommonObject
             dol_print_error($this->db);
             return -1;
         }
-        else
-        {
+        else {
             $result = $this->db->query($sql);
             if ($result) {
                 $num = $this->db->num_rows($result);
@@ -3683,16 +3631,14 @@ class Product extends CommonObject
                     $this->error = "isFatherOfThis";
                     return -1;
                 }
-                else
-                {
+                else {
                     $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_association(fk_product_pere,fk_product_fils,qty,incdec)';
                     $sql .= ' VALUES ('.$id_pere.', '.$id_fils.', '.$qty.', '.$incdec.')';
                     if (!$this->db->query($sql)) {
                          dol_print_error($this->db);
                          return -1;
                     }
-                    else
-                    {
+                    else {
                          return 1;
                     }
                 }
@@ -3736,8 +3682,7 @@ class Product extends CommonObject
             dol_print_error($this->db);
             return -1;
         }
-        else
-        {
+        else {
             return 1;
         }
     }
@@ -3800,13 +3745,11 @@ class Product extends CommonObject
 
                 return true;
             }
-            else
-            {
+            else {
                 return false;
             }
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return -1;
         }
@@ -3896,21 +3839,18 @@ class Product extends CommonObject
                     $this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_fournisseur_price");
                     return 1;
                 }
-                else
-                {
+                else {
                     $this->error = $this->db->lasterror();
                     return -1;
                 }
             }
             // If the supplier price already exists for this product and quantity
-            else
-            {
+            else {
                 $this->product_fourn_price_id = $obj->rowid;
                 return 0;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             return -2;
         }
@@ -4106,8 +4046,7 @@ class Product extends CommonObject
             $this->db->rollback();
             return -1;
         }
-        else
-        {
+        else {
             $this->db->commit();
             return 1;
         }
@@ -4218,8 +4157,7 @@ class Product extends CommonObject
             if ($obj) { $nb = $obj->nb;
             }
         }
-        else
-        {
+        else {
             return -1;
         }
 
@@ -4304,8 +4242,7 @@ class Product extends CommonObject
             }
             return $prods;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return -1;
         }
@@ -4369,8 +4306,7 @@ class Product extends CommonObject
 
             return $prods;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return -1;
         }
@@ -4498,8 +4434,7 @@ class Product extends CommonObject
             $linkclose .= ' title="'.dol_escape_htmltag($label, 1, 1).'"';
             $linkclose .= ' class="nowraponall classfortooltip"';
         }
-        else
-        {
+        else {
         	$linkclose = ' class="nowraponall"';
         }
 
@@ -4574,8 +4509,7 @@ class Product extends CommonObject
             if (!empty($conf->global->PRODUCT_ADDON_PDF)) {
                 $modele = $conf->global->PRODUCT_ADDON_PDF;
             }
-            else
-            {
+            else {
                 $modele = 'strato';
             }
         }
@@ -4744,8 +4678,7 @@ class Product extends CommonObject
                 $this->db->commit();
                 return 1;
             }
-            else
-            {
+            else {
                 $this->error = $movementstock->error;
                 $this->errors = $movementstock->errors;
 
@@ -4792,8 +4725,7 @@ class Product extends CommonObject
                 $this->db->commit();
                 return 1;
             }
-            else
-            {
+            else {
                 $this->error = $movementstock->error;
                 $this->errors = $movementstock->errors;
 
@@ -4872,8 +4804,7 @@ class Product extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -5019,8 +4950,7 @@ class Product extends CommonObject
             }
             return $result;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             $this->db->rollback();
             return array();
@@ -5258,8 +5188,7 @@ class Product extends CommonObject
             $this->db->free($resql);
             return 1;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -5395,8 +5324,7 @@ class Product extends CommonObject
             $this->db->free($resql);
             return $label;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error().' sql='.$sql;
             dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
             return -1;
@@ -5629,8 +5557,7 @@ class Product extends CommonObject
 
             $this->db->free($result);
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
         }
     }
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index 05cfd7523e0..3c56221863c 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -120,8 +120,7 @@ class Productbatch extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -179,8 +178,7 @@ class Productbatch extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -233,8 +231,7 @@ class Productbatch extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -275,8 +272,7 @@ class Productbatch extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -331,8 +327,7 @@ class Productbatch extends CommonObject
 			$this->db->commit();
 			return $object->id;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -425,8 +420,7 @@ class Productbatch extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -495,8 +489,7 @@ class Productbatch extends CommonObject
 
             return $ret;
         }
-        else
-        {
+        else {
             $error = "Error ".$db->lasterror();
             return -1;
         }
diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php
index 9ca53d167cf..26c627ee0e4 100644
--- a/htdocs/product/class/propalmergepdfproduct.class.php
+++ b/htdocs/product/class/propalmergepdfproduct.class.php
@@ -140,8 +140,7 @@ class Propalmergepdfproduct extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -199,8 +198,7 @@ class Propalmergepdfproduct extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
       	    $this->error = "Error ".$this->db->lasterror();
             dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
@@ -273,8 +271,7 @@ class Propalmergepdfproduct extends CommonObject
 
     		return 1;
     	}
-    	else
-    	{
+    	else {
     		$this->error = "Error ".$this->db->lasterror();
     		dol_syslog(get_class($this)."::fetch_by_product ".$this->error, LOG_ERR);
     		return -1;
@@ -334,8 +331,7 @@ class Propalmergepdfproduct extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -377,8 +373,7 @@ class Propalmergepdfproduct extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -427,8 +422,7 @@ class Propalmergepdfproduct extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -470,8 +464,7 @@ class Propalmergepdfproduct extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -526,8 +519,7 @@ class Propalmergepdfproduct extends CommonObject
 			$this->db->commit();
 			return $object->id;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index dbdb6cb6f42..194a342d391 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -81,27 +81,23 @@ if ($action == 'add_prod' && ($user->rights->produit->creer || $user->rights->se
 				//var_dump($i.' '.GETPOST("prod_id_".$i, 'int'), $qty, GETPOST("prod_incdec_".$i, 'int'));
 				$action = 'edit';
 			}
-			else
-			{
+			else {
 				$error++;
 				$action = 're-edit';
 				if ($object->error == "isFatherOfThis") {
 					setEventMessages($langs->trans("ErrorAssociationIsFatherOfThis"), null, 'errors');
 				}
-				else
-				{
+				else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
 		}
-		else
-		{
+		else {
 			if ($object->del_sousproduit($id, GETPOST("prod_id_".$i, 'int')) > 0)
 			{
 				$action = 'edit';
 			}
-			else
-			{
+			else {
 				$error++;
 				$action = 're-edit';
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -235,8 +231,7 @@ if ($id > 0 || !empty($ref))
     			{
     				print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
     			}
-    			else
-    			{
+    			else {
     				print price($object->price).' '.$langs->trans($object->price_base_type ? $object->price_base_type : 'HT');
     			}
     			print '</td></tr>';
@@ -247,8 +242,7 @@ if ($id > 0 || !empty($ref))
     			{
     				print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
     			}
-    			else
-    			{
+    			else {
     				print price($object->price_min).' '.$langs->trans($object->price_base_type ? $object->price_base_type : 'HT');
     			}
     			print '</td></tr>';
@@ -299,8 +293,7 @@ if ($id > 0 || !empty($ref))
 				print '</tr>';
 			}
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven">';
 			print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 			print '</tr>';
@@ -378,8 +371,7 @@ if ($id > 0 || !empty($ref))
 					{
 						$pricesell = 'Variable';
 					}
-					else
-					{
+					else {
 						$totallinesell = price2num($value['nb'] * ($pricesell), 'MT');
 						$totalsell += $totallinesell;
 					}
@@ -405,8 +397,7 @@ if ($id > 0 || !empty($ref))
 
 					print '</tr>'."\n";
 				}
-				else
-				{
+				else {
 					$hide = '';
 					if (empty($conf->global->PRODUCT_SHOW_SUB_SUB_PRODUCTS)) $hide = ' hideobject'; // By default, we do not show this. It makes screen very difficult to understand
 
@@ -469,8 +460,7 @@ if ($id > 0 || !empty($ref))
 			print '</td>';
 			print '</tr>'."\n";
 		}
-		else
-		{
+		else {
 			$colspan = 8;
 			if (!empty($conf->stock->enabled)) $colspan++;
 
@@ -600,8 +590,7 @@ if ($id > 0 || !empty($ref))
 							$qty = $object->is_sousproduit_qty;
 							$incdec = $object->is_sousproduit_incdec;
 						}
-						else
-						{
+						else {
 							//$addchecked = '';
 							$qty = 0;
 							$incdec = 0;
@@ -615,8 +604,7 @@ if ($id > 0 || !empty($ref))
 						// Inc Dec
 						print '<td class="center">';
 						if ($qty) print '<input type="checkbox" name="prod_incdec_'.$i.'" value="1" '.($incdec ? 'checked' : '').'>';
-						else
-						{
+						else {
 							// TODO Hide field and show it when setting a qty
 							print '<input type="checkbox" name="prod_incdec_'.$i.'" value="1" checked>';
 							//print '<input type="checkbox" disabled name="prod_incdec_'.$i.'" value="1" checked>';
@@ -636,8 +624,7 @@ if ($id > 0 || !empty($ref))
 					print '</tr>';
 				}
 			}
-			else
-			{
+			else {
 				dol_print_error($db);
 			}
 			print '</table>';
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index e5702078dd2..db233fbe84c 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -314,8 +314,7 @@ if ($object->id)
     						$checked = ' checked ';
     					}
     				}
-    				else
-    				{
+    				else {
     					if (array_key_exists($filetoadd['name'], $filetomerge->lines))
     					{
     						$checked = ' checked ';
@@ -338,8 +337,7 @@ if ($object->id)
     	}
     }
 }
-else
-{
+else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/product/dynamic_price/class/price_expression.class.php b/htdocs/product/dynamic_price/class/price_expression.class.php
index 420d5aaddb2..4f40e2b6c6f 100644
--- a/htdocs/product/dynamic_price/class/price_expression.class.php
+++ b/htdocs/product/dynamic_price/class/price_expression.class.php
@@ -124,8 +124,7 @@ class PriceExpression
             $this->db->rollback();
             return -1 * $error;
         }
-        else
-        {
+        else {
             $this->db->commit();
             return $this->id;
         }
@@ -163,13 +162,11 @@ class PriceExpression
                 $this->expression = $obj->expression;
                 return 1;
             }
-            else
-            {
+            else {
                 return 0;
             }
         }
-        else
-        {
+        else {
               $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -206,8 +203,7 @@ class PriceExpression
             $this->db->free($resql);
             return $retarray;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -237,13 +233,11 @@ class PriceExpression
             {
                 return (int) $obj->rowid;
             }
-            else
-            {
+            else {
                 return 0;
             }
         }
-        else
-        {
+        else {
               $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -302,8 +296,7 @@ class PriceExpression
             $this->db->rollback();
             return -1 * $error;
         }
-        else
-        {
+        else {
             $this->db->commit();
             return 1;
         }
@@ -360,8 +353,7 @@ class PriceExpression
             $this->db->rollback();
             return -1 * $error;
         }
-        else
-        {
+        else {
             $this->db->commit();
             return 1;
         }
diff --git a/htdocs/product/dynamic_price/class/price_global_variable.class.php b/htdocs/product/dynamic_price/class/price_global_variable.class.php
index acede724da5..7f241518e4c 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable.class.php
@@ -129,8 +129,7 @@ class PriceGlobalVariable
             $this->db->rollback();
             return -1 * $error;
         }
-        else
-        {
+        else {
             $this->db->commit();
             return $this->id;
         }
@@ -163,13 +162,11 @@ class PriceGlobalVariable
                 $this->checkParameters();
                 return 1;
             }
-            else
-            {
+            else {
                 return 0;
             }
         }
-        else
-        {
+        else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -226,8 +223,7 @@ class PriceGlobalVariable
             $this->db->rollback();
             return -1 * $error;
         }
-        else
-        {
+        else {
             $this->db->commit();
             return 1;
         }
@@ -283,8 +279,7 @@ class PriceGlobalVariable
             $this->db->rollback();
             return -1 * $error;
         }
-        else
-        {
+        else {
             $this->db->commit();
             return 1;
         }
@@ -350,8 +345,7 @@ class PriceGlobalVariable
             $this->db->free($resql);
             return $retarray;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -1;
         }
diff --git a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
index 0c8e25e8751..12e497c0f2c 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
@@ -145,8 +145,7 @@ class PriceGlobalVariableUpdater
             $this->db->rollback();
             return -1 * $error;
         }
-        else
-        {
+        else {
             $this->db->commit();
             return $this->id;
         }
@@ -183,13 +182,11 @@ class PriceGlobalVariableUpdater
                 $this->checkParameters();
                 return 1;
             }
-            else
-            {
+            else {
                 return 0;
             }
         }
-        else
-        {
+        else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -250,8 +247,7 @@ class PriceGlobalVariableUpdater
             $this->db->rollback();
             return -1 * $error;
         }
-        else
-        {
+        else {
             $this->db->commit();
             return 1;
         }
@@ -306,8 +302,7 @@ class PriceGlobalVariableUpdater
             $this->db->rollback();
             return -1 * $error;
         }
-        else
-        {
+        else {
             $this->db->commit();
             return 1;
         }
@@ -400,8 +395,7 @@ class PriceGlobalVariableUpdater
             $this->db->free($resql);
             return $retarray;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -442,8 +436,7 @@ class PriceGlobalVariableUpdater
             $this->db->free($resql);
             return $retarray;
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -599,8 +592,7 @@ class PriceGlobalVariableUpdater
             $this->db->rollback();
             return -1 * $error;
         }
-        else
-        {
+        else {
             $this->db->commit();
             return 1;
         }
@@ -645,8 +637,7 @@ class PriceGlobalVariableUpdater
             $this->db->rollback();
             return -1 * $error;
         }
-        else
-        {
+        else {
             $this->db->commit();
             return 1;
         }
diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php
index bf2f58f63f3..778f749f983 100644
--- a/htdocs/product/dynamic_price/editor.php
+++ b/htdocs/product/dynamic_price/editor.php
@@ -78,8 +78,7 @@ if ($action == 'add')
 			if ($price_result < 0) { //Expression is not valid
 				setEventMessages($priceparser->translatedError(), null, 'errors');
 			}
-			else
-			{
+			else {
 				$price_expression->title = $title;
 				$price_expression->expression = $expression;
 				$result = $price_expression->create($user);
@@ -88,8 +87,7 @@ if ($action == 'add')
 					$eid = $price_expression->id;
 					setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 				}
-				else
-				{
+				else {
 					setEventMessages("add: ".$price_expression->error, $price_expression->errors, 'errors');
 				}
 			}
@@ -98,8 +96,7 @@ if ($action == 'add')
 		{
 			setEventMessages("add find: ".$price_expression->error, $price_expression->errors, 'errors');
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans("ErrorRecordAlreadyExists"), null, 'errors');
 		}
 	}
@@ -118,8 +115,7 @@ if ($action == 'update')
 			if ($price_result < 0) { //Expression is not valid
 				setEventMessages($priceparser->translatedError(), null, 'errors');
 			}
-			else
-			{
+			else {
 				$price_expression->id = $eid;
 				$price_expression->title = $title;
 				$price_expression->expression = $expression;
@@ -128,8 +124,7 @@ if ($action == 'update')
 				{
 					setEventMessages("update: ".$price_expression->error, $price_expression->errors, 'errors');
 				}
-				else
-				{
+				else {
 					setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 				}
 			}
@@ -138,8 +133,7 @@ if ($action == 'update')
 		{
 			setEventMessages("update find: ".$price_expression->error, $price_expression->errors, 'errors');
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans("ErrorRecordAlreadyExists"), null, 'errors');
 		}
 	}
@@ -221,8 +215,7 @@ if ($eid == 0)
 {
 	print '<div class="inline-block divButAction"><span id="action-delete" class="butActionRefused classfortooltip">'.$langs->trans('Delete').'</span></div>'."\n";
 }
-else
-{
+else {
 	print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;tab='.$tab.'&amp;eid='.$eid.'&amp;action=delete">'.$langs->trans("Delete").'</a></div>';
 }
 print '</div>';
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 7cc5d3966c1..3c4ebfc6acb 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -128,8 +128,7 @@ if (empty($reshook))
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 		        $action = '';
 			}
-			else
-			{
+			else {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
@@ -211,8 +210,7 @@ if (empty($reshook))
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Price")), null, 'errors');
 			}
-			else
-			{
+			else {
 				$_POST["price"] = 0;
 			}
 		}
@@ -316,8 +314,7 @@ if (empty($reshook))
 					$error++;
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
-				else
-				{
+				else {
 					if (!empty($conf->dynamicprices->enabled) && $price_expression !== '')
 					{
 						//Check the expression validity by parsing it
@@ -347,13 +344,11 @@ if (empty($reshook))
 				$db->commit();
 				$action = '';
 			}
-			else
-			{
+			else {
 				$db->rollback();
 			}
 		}
-		else
-		{
+		else {
 			$action = 'add_price';
 		}
 	}
@@ -453,8 +448,7 @@ if ($id > 0 || $ref)
 					$object->fetch_product_fournisseur_price($rowid, 1); //Ignore the math expression when getting the price
 					print load_fiche_titre($langs->trans("ChangeSupplierPrice"));
 				}
-				else
-				{
+				else {
 					print load_fiche_titre($langs->trans("AddSupplierPrice"));
 				}
 
@@ -478,8 +472,7 @@ if ($id > 0 || $ref)
 					print '<input type="hidden" name="rowid" value="'.$rowid.'">';
 					print '<input type="hidden" name="socid" value="'.$socid.'">';
 				}
-				else
-				{
+				else {
 					$events = array();
 					$events[] = array('method' => 'getVatRates', 'url' => dol_buildpath('/core/ajax/vatrates.php', 1), 'htmlname' => 'tva_tx', 'params' => array());
 					print $form->select_company(GETPOST("id_fourn", 'alpha'), 'id_fourn', 'fournisseur=1', 'SelectThirdParty', 0, 0, $events);
@@ -503,8 +496,7 @@ if ($id > 0 || $ref)
                     print '<input type="hidden" name="ref_fourn_old" value="'.$object->ref_supplier.'">';
                     print '<input class="flat" name="ref_fourn" size="12" value="'.$object->ref_supplier.'">';
 				}
-				else
-				{
+				else {
 					print '<input class="flat" name="ref_fourn" size="12" value="'.(GETPOST("ref_fourn") ?GETPOST("ref_fourn") : '').'">';
 				}
 				print '</td>';
@@ -529,8 +521,7 @@ if ($id > 0 || $ref)
 					print '<input type="hidden" name="qty" value="'.$object->fourn_qty.'">';
 					print $object->fourn_qty;
 				}
-				else
-				{
+				else {
 					print '<input class="flat" name="qty" size="5" value="'.$quantity.'">';
 				}
                 // Units
@@ -564,8 +555,7 @@ if ($id > 0 || $ref)
 					$default_vat = $tmpproductsupplier->fourn_tva_tx;
 					$default_npr = $tmpproductsupplier->fourn_tva_npr;
 				}
-				else
-				{
+				else {
                     if (empty($default_vat))
                     {
                         $default_vat = $object->tva_tx;
@@ -945,8 +935,7 @@ SCRIPT;
 						{
 							print '<td class="left">'.$productfourn->getNomUrl().'</td>';
 						}
-						else
-						{
+						else {
 							print '<td class="left">'.$productfourn->fourn_ref.'</td>';
 						}
 
@@ -1099,8 +1088,7 @@ SCRIPT;
 						print '</tr>';
 					}
 				}
-				else
-				{
+				else {
 				    dol_print_error($db);
 				}
 
@@ -1110,8 +1098,7 @@ SCRIPT;
 		}
 	}
 }
-else
-{
+else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 3067cc63733..ebe55716bae 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -226,8 +226,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 				{
 					$dataseries[] = array($obj->label, round($obj->nb));
 				}
-				else
-				{
+				else {
 					$rest += $obj->nb;
 				}
 				$total += $obj->nb;
@@ -248,8 +247,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 			$dolgraph->draw('idstatscategproduct');
 			print $dolgraph->show($total ? 0 : 1);
 		}
-		else
-		{
+		else {
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($result);
@@ -386,8 +384,7 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us
 			print '<br>';
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -457,8 +454,7 @@ function activitytrim($product_type)
 
 			if ($product_type == 0)
 				print '<tr class="liste_titre"><td class=left>'.$langs->trans("ProductSellByQuarterHT").'</td>';
-			else
-				print '<tr class="liste_titre"><td class=left>'.$langs->trans("ServiceSellByQuarterHT").'</td>';
+			else print '<tr class="liste_titre"><td class=left>'.$langs->trans("ServiceSellByQuarterHT").'</td>';
 			print '<td class=right>'.$langs->trans("Quarter1").'</td>';
 			print '<td class=right>'.$langs->trans("Quarter2").'</td>';
 			print '<td class=right>'.$langs->trans("Quarter3").'</td>';
diff --git a/htdocs/product/inventory/ajax/ajax.inventory.php b/htdocs/product/inventory/ajax/ajax.inventory.php
index 1ea99480bd6..c258b63de2b 100644
--- a/htdocs/product/inventory/ajax/ajax.inventory.php
+++ b/htdocs/product/inventory/ajax/ajax.inventory.php
@@ -21,8 +21,7 @@ switch ($put)
 
 			echo $det->qty_view;
 		}
-		else
-		{
+		else {
 			echo -2;
 		}
 
@@ -41,8 +40,7 @@ switch ($put)
 
 			echo $det->new_pmp;
 		}
-		else
-		{
+		else {
 			echo -2;
 		}
 
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 0e8ab8bda55..a5084c296a1 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -42,8 +42,7 @@ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
 	$result = restrictedArea($user, 'stock', $id);
 }
-else
-{
+else {
 	$result = restrictedArea($user, 'stock', $id, '', 'inventory_advance');
 }
 
@@ -81,8 +80,7 @@ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 	$permissiontoadd = $user->rights->stock->creer;
 	$permissiontodelete = $user->rights->stock->supprimer;
 }
-else
-{
+else {
 	$permissiontoadd = $user->rights->stock->inventory_advance->write;
 	$permissiontodelete = $user->rights->stock->inventory_advance->write;
 }
@@ -337,8 +335,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		{
     			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
     		}
-    		else
-    		{
+    		else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
     		}
 
@@ -346,8 +343,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		{
     			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Validate").'</a>'."\n";
     		}
-    		else
-    		{
+    		else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Validate').'</a>'."\n";
     		}
 
@@ -355,8 +351,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		{
     			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
     		}
-    		else
-    		{
+    		else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
     		}
     	}
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index e24fe4e0ad2..381c40d0aa4 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -466,8 +466,7 @@ class Inventory extends CommonObject
 
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 3f0989251b5..373164eeae4 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -42,8 +42,7 @@ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
 	$result = restrictedArea($user, 'stock', $id);
 }
-else
-{
+else {
 	$result = restrictedArea($user, 'stock', $id, '', 'inventory_advance');
 }
 
@@ -81,8 +80,7 @@ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 	$permissiontoadd = $user->rights->stock->creer;
 	$permissiontodelete = $user->rights->stock->supprimer;
 }
-else
-{
+else {
 	$permissiontoadd = $user->rights->stock->inventory_advance->write;
 	$permissiontodelete = $user->rights->stock->inventory_advance->write;
 }
@@ -283,8 +281,7 @@ if ($object->id > 0)
     			{
     				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Edit").'</a>'."\n";
     			}
-    			else
-    			{
+    			else {
     				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Edit').'</a>'."\n";
     			}
     		}
@@ -295,8 +292,7 @@ if ($object->id > 0)
 	    		{
 	    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate">'.$langs->trans("Validate").'</a>'."\n";
 	    		}
-	    		else
-	    		{
+	    		else {
 	    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Validate').'</a>'."\n";
 	    		}
     		}
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index f3f7621b821..c799ab7da87 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -77,8 +77,7 @@ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
 	$result = restrictedArea($user, 'stock', $objectid);
 }
-else
-{
+else {
 	$result = restrictedArea($user, 'stock', $objectid, '', 'inventory_advance');
 }
 
@@ -256,8 +255,7 @@ if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit
 {
 	$num = $nbtotalofrecords;
 }
-else
-{
+else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 17dd18b567b..347281f0c75 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -292,13 +292,11 @@ if ($search_type != '' && $search_type != '-1')
 	{
 		$texte = $langs->trans("Services");
 	}
-	else
-	{
+	else {
 		$texte = $langs->trans("Products");
 	}
 }
-else
-{
+else {
 	$texte = $langs->trans("ProductsAndServices");
 }
 
@@ -1411,8 +1409,7 @@ if ($resql)
 	print "</div>";
 	print '</form>';
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/product/popucom.php b/htdocs/product/popucom.php
index 2c28266ad15..c21afa711e7 100644
--- a/htdocs/product/popucom.php
+++ b/htdocs/product/popucom.php
@@ -67,8 +67,7 @@ elseif ($type == '1')
 {
     $helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 }
-else
-{
+else {
     $helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 }
 $title = $langs->trans("Statistics");
@@ -153,8 +152,7 @@ if ($resql)
     }
     $db->free($resql);
 }
-else
-{
+else {
     dol_print_error($db);
 }
 //var_dump($infoprod);
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index bf2ae9020ec..92de8b33546 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -67,8 +67,7 @@ elseif ($type == '1')
 {
 	$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 }
-else
-{
+else {
 	$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 }
 $title = $langs->trans("Statistics");
@@ -153,8 +152,7 @@ if ($resql)
 	}
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 //var_dump($infoprod);
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index f2109b94795..1db2219bf63 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -170,8 +170,7 @@ if (empty($reshook))
 	    {
 	        $db->commit();
 	    }
-	    else
-	    {
+	    else {
 	        $db->rollback();
 	    }
 
@@ -767,8 +766,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			//print vatrate($object->multiprices_tva_tx[$soc->price_level], true);
 			print '</td></tr>';
 		}
-		else
-		{
+		else {
         	// TVA
         	print '<tr><td>'.$langs->trans("DefaultTaxRate").'</td><td>';
 
@@ -787,8 +785,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
         	print '</td></tr>';
 		}
 	}
-	else
-	{
+	else {
 		if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
 		{
 			// We show only vat for level 1
@@ -796,8 +793,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			print '<td colspan="2">'.vatrate($object->multiprices_tva_tx[1], true).'</td>';
 			print '</tr>';
 		}
-		else
-		{
+		else {
             // TVA
 	        print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td><td>';
 
@@ -846,8 +842,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			    print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 			    print '</form>';
 			}
-			else
-			{
+			else {
 			    print $langs->trans("SellingPrice").' '.$i;
 			    if (!empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
 			}
@@ -872,8 +867,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			{
 				print price($object->multiprices_min_ttc[$i]).' '.$langs->trans($object->multiprices_base_type[$i]);
 			}
-			else
-			{
+			else {
 				print price($object->multiprices_min[$i]).' '.$langs->trans($object->multiprices_base_type[$i]);
 			}
 			print '</td></tr>';
@@ -954,8 +948,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 		}
 	}
 }
-else
-{
+else {
 	// TVA
 	print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td><td>';
 
@@ -998,8 +991,7 @@ else
 		if ($object->prices_by_qty[0] == 0) {
 			print '&nbsp; <a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=activate_price_by_qty&level=1">('.$langs->trans("Activate").')';
 		}
-		else
-		{
+		else {
 			print '&nbsp; <a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=disable_price_by_qty&level=1">('.$langs->trans("DisablePriceByQty").')';
 		}
 		print '</td><td>';
@@ -1289,8 +1281,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 
 		print '<br></form>';
 	}
-	else
-	{
+	else {
 	    print '<!-- Edit price per level -->'."\n";
 	    ?>
 		<script>
@@ -1551,8 +1542,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
     				print '<td class="right"></td>';
     				print '<td class="right">'.$title."</td>";
     			}
-    			else
-    			{
+    			else {
     				print '<td class="right">';
     				if (empty($objp->price_by_qty)) {
     					print price($objp->price);
@@ -1606,8 +1596,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
     					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$object->id.'&amp;lineid='.$objp->rowid.'">';
     					print img_delete();
     					print '</a>';
-    				} else
-    					print '&nbsp;'; // Can not delete last price (it's current price)
+    				} else print '&nbsp;'; // Can not delete last price (it's current price)
     				print '</td>';
     			}
 
@@ -1877,8 +1866,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				//print '<td class="right">' . $langs->trans("INCVATONLY") . '</td>';
 				print '<td class="right">'.$langs->trans("INCT").'</td>';
 			}
-			else
-			{
+			else {
 				print '<td class="right">'.$langs->trans("TTC").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
@@ -1900,8 +1888,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
 				    $pu = $line->price;
 				}
-				else
-				{
+				else {
 				    $pu = $line->price_ttc;
 				}
 
@@ -1940,8 +1927,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 					//print '<td class="right">' . price($line->price_ttc) . "</td>";
 					print '<td class="right">'.price($resultarray[2]).'</td>';
 				}
-				else
-				{
+				else {
 					print '<td class="right">'.price($line->price_ttc)."</td>";
 				}
 
@@ -2014,8 +2000,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 			//print '<td class="right">' . $langs->trans("INCVATONLY") . '</td>';
 			print '<td class="right">'.$langs->trans("INCT").'</td>';
 		}
-		else
-		{
+		else {
 			print '<td class="right">'.$langs->trans("TTC").'</td>';
 		}
 
@@ -2030,8 +2015,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		{
 		    $pu = $object->price;
 		}
-		else
-		{
+		else {
 		    $pu = $object->price_ttc;
 		}
 
@@ -2071,8 +2055,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 			//print '<td class="right">' . price($object->price_ttc) . "</td>";
 			print '<td class="right">'.price($resultarray[2]).'</td>';
 		}
-		else
-		{
+		else {
 			print '<td class="right">'.price($object->price_ttc)."</td>";
 		}
 
@@ -2111,8 +2094,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
 				    $pu = $line->price;
 				}
-				else
-				{
+				else {
 				    $pu = $line->price_ttc;
 				}
 
@@ -2150,8 +2132,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 					//print '<td class="right">' . price($line->price_ttc) . "</td>";
 					print '<td class="right">'.price($resultarray[2]).'</td>';
 				}
-				else
-				{
+				else {
 					print '<td class="right">'.price($line->price_ttc)."</td>";
 				}
 
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 94d2e80c303..a3c5da0c8e6 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -137,8 +137,7 @@ if (dol_strlen($type))
     {
         $sql .= " AND p.fk_product_type = '1'";
     }
-    else
-    {
+    else {
         $sql .= " AND p.fk_product_type <> '1'";
     }
 }
@@ -404,8 +403,7 @@ if ($resql)
 
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 0fec39d1708..76184f4025d 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -140,8 +140,7 @@ if (dol_strlen($type))
     {
         $sql .= " AND p.fk_product_type = '1'";
     }
-    else
-    {
+    else {
         $sql .= " AND p.fk_product_type <> '1'";
     }
 }
@@ -423,8 +422,7 @@ if ($resql)
 
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 4600baa1597..6e18bea494e 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -97,8 +97,7 @@ if (!$id && empty($ref))
         //$title=$langs->trans("StatisticsOfServices");
         $title = $langs->trans("Statistics");
     }
-    else
-    {
+    else {
         $helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
         //$title=$langs->trans("StatisticsOfProductsOrServices");
         $title = $langs->trans("Statistics");
@@ -109,8 +108,7 @@ if (!$id && empty($ref))
 
     print load_fiche_titre($title, $mesg, $picto);
 }
-else
-{
+else {
     $result = $object->fetch($id, $ref);
 
 	$title = $langs->trans('ProductServiceCard');
@@ -325,8 +323,7 @@ if ($result || empty($id))
 				{
 					// TODO Load cachefile $graphfiles[$key]['file']
 				}
-				else
-				{
+				else {
 				    $morefilters = '';
 				    if ($search_categ > 0)
 				    {
@@ -371,8 +368,7 @@ if ($result || empty($id))
 					$graphfiles[$key]['total'] = $px->total();
 					$graphfiles[$key]['output'] = $px->show();
 				}
-				else
-				{
+				else {
 					dol_print_error($db, 'Error for calculating graph on key='.$key.' - '.$object->error);
 				}
 			}
@@ -402,8 +398,7 @@ if ($result || empty($id))
 			{
 				print "\n".'<div class="fichecenter"><div class="fichehalfleft">'."\n";
 			}
-			else
-			{
+			else {
 				print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
 			}
 
@@ -413,8 +408,7 @@ if ($result || empty($id))
 			    if (file_exists($dir."/".$graphfiles[$key]['file']) && filemtime($dir."/".$graphfiles[$key]['file'])) $dategenerated = $langs->trans("GeneratedOn", dol_print_date(filemtime($dir."/".$graphfiles[$key]['file']), "dayhour"));
 			    else $dategenerated = $langs->trans("GeneratedOn", dol_print_date(dol_now(), "dayhour"));
 			}
-			else
-			{
+			else {
 			    $dategenerated = ($mesg ? '<font class="error">'.$mesg.'</font>' : $langs->trans("ChartNotGenerated"));
 			}
 			$linktoregenerate = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id') ?GETPOST('id') : $object->id).((string) $type != '' ? '&type='.$type : '').'&action=recalcul&mode='.$mode.'&search_year='.$search_year.'&search_categ='.$search_categ.'">'.img_picto($langs->trans("ReCalculate").' ('.$dategenerated.')', 'refresh').'</a>';
@@ -437,8 +431,7 @@ if ($result || empty($id))
 			{
 				print "\n".'</div>'."\n";
 			}
-			else
-			{
+			else {
 				print "\n".'</div></div></div>';
 				print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
 			}
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 8f88044d913..41da6fc1f33 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -221,15 +221,13 @@ if ($id > 0 || !empty($ref))
 			print '</div>';
 			print '</form>';
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 		$db->free($result);
 	}
 }
-else
-{
+else {
 	dol_print_error();
 }
 
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index 51e91aeaaac..e2be34d6e85 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -214,15 +214,13 @@ if ($id > 0 || !empty($ref))
 			print '</div>';
 			print '</form>';
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 		$db->free($result);
 	}
 }
-else
-{
+else {
 	dol_print_error();
 }
 
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 0665cc48e06..117ff5801d9 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -137,8 +137,7 @@ if (empty($reshook))
 	            }
 	        }
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans("ErrorWarehouseRefRequired"), null, 'errors');
 			$action = "create"; // Force retour sur page creation
 		}
@@ -155,8 +154,7 @@ if (empty($reshook))
 			header("Location: ".DOL_URL_ROOT.'/product/stock/list.php?restore_lastsearch_values=1');
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
@@ -197,8 +195,7 @@ if (empty($reshook))
 	            $action = '';
 	        }
 		}
-		else
-		{
+		else {
 			$action = 'edit';
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -316,8 +313,7 @@ if ($action == 'create')
 		{
 			print '<option value="'.$key.'" selected>'.$langs->trans($value).'</option>';
 		}
-		else
-		{
+		else {
 			print '<option value="'.$key.'">'.$langs->trans($value).'</option>';
 		}
 	}
@@ -346,8 +342,7 @@ if ($action == 'create')
 
 	print '</form>';
 }
-else
-{
+else {
     $id = GETPOST("id", 'int');
 	if ($id > 0 || $ref)
 	{
@@ -499,13 +494,11 @@ else
 				{
 					if ($user->rights->stock->creer)
 						print "<a class=\"butAction\" href=\"card.php?action=edit&id=".$object->id."\">".$langs->trans("Modify")."</a>";
-					else
-						print "<a class=\"butActionRefused classfortooltip\" href=\"#\">".$langs->trans("Modify")."</a>";
+					else print "<a class=\"butActionRefused classfortooltip\" href=\"#\">".$langs->trans("Modify")."</a>";
 
 					if ($user->rights->stock->supprimer)
 						print "<a class=\"butActionDelete\" href=\"card.php?action=delete&id=".$object->id."\">".$langs->trans("Delete")."</a>";
-					else
-						print "<a class=\"butActionRefused classfortooltip\" href=\"#\">".$langs->trans("Delete")."</a>";
+					else print "<a class=\"butActionRefused classfortooltip\" href=\"#\">".$langs->trans("Delete")."</a>";
 				}
 			}
 
@@ -671,8 +664,7 @@ else
 				print '<td class="liste_total">&nbsp;</td>';
 				print '</tr>';
 			}
-			else
-			{
+			else {
 				dol_print_error($db);
 			}
 			print "</table>\n";
@@ -751,8 +743,7 @@ else
 				{
 					print '<option value="'.$key.'" selected>'.$langs->trans($value).'</option>';
 				}
-				else
-				{
+				else {
 					print '<option value="'.$key.'">'.$langs->trans($value).'</option>';
 				}
 			}
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 56938d08979..5df50b1ae23 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -166,8 +166,7 @@ class Entrepot extends CommonObject
 			$this->statuts[self::STATUS_OPEN_ALL] = 'OpenAll';
 			$this->statuts[self::STATUS_OPEN_INTERNAL] = 'OpenInternal';
 		}
-		else
-		{
+		else {
 			$this->statuts[self::STATUS_OPEN_ALL] = 'Opened';
 		}
 	}
@@ -236,8 +235,7 @@ class Entrepot extends CommonObject
 					$this->db->commit();
 					return $id;
 				}
-				else
-				{
+				else {
 					dol_syslog(get_class($this)."::create return -3");
 					$this->db->rollback();
 					return -3;
@@ -249,8 +247,7 @@ class Entrepot extends CommonObject
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this)."::create Error ".$this->db->error());
 			$this->db->rollback();
@@ -426,8 +423,7 @@ class Entrepot extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -461,8 +457,7 @@ class Entrepot extends CommonObject
 		{
 			$sql .= " WHERE rowid = '".$id."'";
 		}
-		else
-		{
+		else {
 			$sql .= " WHERE entity = ".$conf->entity;
 			if ($ref) $sql .= " AND ref = '".$this->db->escape($ref)."'";
 		}
@@ -500,14 +495,12 @@ class Entrepot extends CommonObject
 
 				return 1;
 			}
-			else
-			{
+			else {
                 $this->error = "Record Not Found";
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -554,8 +547,7 @@ class Entrepot extends CommonObject
 
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 	        dol_print_error($this->db);
 		}
 	}
@@ -619,8 +611,7 @@ class Entrepot extends CommonObject
 			$ret['nb'] = $obj->nb;
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -654,8 +645,7 @@ class Entrepot extends CommonObject
 			$ret['value'] = $obj->value;
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/product/stock/fiche-valo.php b/htdocs/product/stock/fiche-valo.php
index 807d9f36a4f..5fd74431fe6 100644
--- a/htdocs/product/stock/fiche-valo.php
+++ b/htdocs/product/stock/fiche-valo.php
@@ -131,8 +131,7 @@ if ($_GET["id"])
 			print '<br><img src="'.$url.'" alt="Valorisation du stock annee '.($year - 1).'">';
 		}
 	}
-	else
-	{
+	else {
 		$langs->load("errors");
 		print $langs->trans("FeatureNotYetAvailable");
 	}
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index 92b68da7d10..75b15ad777c 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -122,8 +122,7 @@ if ($result)
     print "</table>";
     print '</div>';
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/product/stock/lib/replenishment.lib.php b/htdocs/product/stock/lib/replenishment.lib.php
index d73c5e9c907..c63878aebbe 100644
--- a/htdocs/product/stock/lib/replenishment.lib.php
+++ b/htdocs/product/stock/lib/replenishment.lib.php
@@ -142,8 +142,7 @@ function ordered($product_id)
 			return null; //img_picto('', 'stcomm-1');
 		}
 	}
-	else
-	{
+	else {
 		$error = $db->lasterror();
 		dol_print_error($db);
 
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 78418f90db6..0fc6e5cdb6f 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -293,8 +293,7 @@ if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
 }
-else
-{
+else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 41dee3c6d34..bb9493c05d4 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -126,8 +126,7 @@ if ($action == 'addline')
 		if ($producttmp->hasbatch())
 		{
 		}
-		else
-		{
+		else {
 		}
 	}
 
@@ -226,8 +225,7 @@ if ($action == 'createmovements')
 						setEventMessages($product->errors, $product->errorss, 'errors');
 					}
 				}
-				else
-				{
+				else {
 					$arraybatchinfo = $product->loadBatchInfo($batch);
 					if (count($arraybatchinfo) > 0)
 					{
@@ -236,8 +234,7 @@ if ($action == 'createmovements')
 						$dluo = $firstrecord['sellby'];
 						//var_dump($batch); var_dump($arraybatchinfo); var_dump($firstrecord); var_dump($dlc); var_dump($dluo); exit;
 					}
-					else
-					{
+					else {
 						$dlc = '';
 						$dluo = '';
 					}
@@ -281,8 +278,7 @@ if ($action == 'createmovements')
 					}
 				}
 			}
-			else
-			{
+			else {
 				// dol_print_error('',"Bad value saved into sessions");
 				$error++;
 			}
@@ -298,8 +294,7 @@ if ($action == 'createmovements')
 		header("Location: ".DOL_URL_ROOT.'/product/stock/index.php'); // Redirect to avoid pb when using back
 		exit;
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -364,8 +359,7 @@ if (!empty($conf->global->STOCK_SUPPORTS_SERVICES)) $filtertype = '';
 if ($conf->global->PRODUIT_LIMIT_SIZE <= 0) {
 	$limit = '';
 }
-else
-{
+else {
 	$limit = $conf->global->PRODUIT_LIMIT_SIZE;
 }
 
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index 03171fbeac5..9bf5ede3bce 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -208,8 +208,7 @@ if ($action == "correct_stock")
 	        	$origin_id
 	        ); // We do not change value of stock for a correction
         }
-        else
-		{
+        else {
 	        $result = $product->correct_stock(
 	            $user,
 	            $id,
@@ -228,8 +227,7 @@ if ($action == "correct_stock")
             header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
             exit;
         }
-        else
-        {
+        else {
             $error++;
             setEventMessages($product->error, $product->errors, 'errors');
             $action = 'correction';
@@ -313,14 +311,12 @@ if ($action == "transfert_stock" && !$cancel)
                         $eatby = $pdluo->eatby;
                         $sellby = $pdluo->sellby;
                     }
-                    else
-                    {
+                    else {
                         setEventMessages($pdluo->error, $pdluo->errors, 'errors');
                         $error++;
                     }
                 }
-                else
-                {
+                else {
                     $srcwarehouseid = $id;
                     $batch = GETPOST('batch_number', 'alpha');
                     $eatby = $d_eatby;
@@ -357,8 +353,7 @@ if ($action == "transfert_stock" && !$cancel)
                     );
                 }
             }
-            else
-            {
+            else {
                 // Remove stock
                 $result1 = $product->correct_stock(
                     $user,
@@ -390,14 +385,12 @@ if ($action == "transfert_stock" && !$cancel)
                     header("Location: ".$backtopage);
                     exit;
                 }
-                else
-                {
+                else {
                     header("Location: movement_list.php?id=".$object->id);
                     exit;
                 }
             }
-            else
-            {
+            else {
                 setEventMessages($product->error, $product->errors, 'errors');
                 $db->rollback();
                 $action = 'transfert';
@@ -506,8 +499,7 @@ if (empty($search_inventorycode))
 {
 	$sql .= $db->plimit($limit + 1, $offset);
 }
-else
-{
+else {
 	$limit = 0;
 }
 
@@ -543,8 +535,7 @@ if ($resql)
     $i = 0;
     $help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
     if ($msid) $texte = $langs->trans('StockMovementForId', $msid);
-	else
-	{
+	else {
 		$texte = $langs->trans("ListOfStockMovements");
 		if ($id) $texte .= ' ('.$langs->trans("ForThisWarehouse").')';
 	}
@@ -621,8 +612,7 @@ if ($resql)
             $obj = $db->fetch_object($resqlbis);
             $lastmovementdate = $db->jdate($obj->datem);
         }
-        else
-        {
+        else {
             dol_print_error($db);
         }
 
@@ -631,8 +621,7 @@ if ($resql)
         {
             print dol_print_date($lastmovementdate, 'dayhour');
         }
-        else
-        {
+        else {
             print $langs->trans("None");
         }
         print "</td></tr>";
@@ -1150,8 +1139,7 @@ if ($resql)
         //print '</td></tr>';
     }
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 535a0533249..d17fce1e580 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -231,8 +231,7 @@ if ($action == "correct_stock")
 	        	$origin_id
 	        ); // We do not change value of stock for a correction
         }
-        else
-		{
+        else {
 			$result = $product->correct_stock(
 	            $user,
 	            $id,
@@ -251,8 +250,7 @@ if ($action == "correct_stock")
             header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
             exit;
         }
-        else
-        {
+        else {
             $error++;
             setEventMessages($product->error, $product->errors, 'errors');
             $action = 'correction';
@@ -336,14 +334,12 @@ if ($action == "transfert_stock" && !$cancel)
                         $eatby = $pdluo->eatby;
                         $sellby = $pdluo->sellby;
                     }
-                    else
-                    {
+                    else {
                         setEventMessages($pdluo->error, $pdluo->errors, 'errors');
                         $error++;
                     }
                 }
-                else
-                {
+                else {
                     $srcwarehouseid = $id;
                     $batch = GETPOST('batch_number', 'alphanohtml');
                     $eatby = $d_eatby;
@@ -376,8 +372,7 @@ if ($action == "transfert_stock" && !$cancel)
                         );
                 }
             }
-            else
-            {
+            else {
                 // Remove stock
                 $result1 = $product->correct_stock(
                     $user,
@@ -409,14 +404,12 @@ if ($action == "transfert_stock" && !$cancel)
                     header("Location: ".$backtopage);
                     exit;
                 }
-                else
-                {
+                else {
                     header("Location: movement_list.php?id=".$object->id);
                     exit;
                 }
             }
-            else
-            {
+            else {
                 setEventMessages($product->error, $product->errors, 'errors');
                 $db->rollback();
                 $action = 'transfert';
@@ -504,8 +497,7 @@ if (empty($search_inventorycode))
 {
 	$sql .= $db->plimit($limit + 1, $offset);
 }
-else
-{
+else {
 	$limit = 0;
 }
 
@@ -541,8 +533,7 @@ if ($resql)
     $i = 0;
     $help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
     if ($msid) $texte = $langs->trans('StockMovementForId', $msid);
-	else
-	{
+	else {
 		$texte = $langs->trans("ListOfStockMovements");
 		if ($id) $texte .= ' ('.$langs->trans("ForThisWarehouse").')';
 	}
@@ -619,8 +610,7 @@ if ($resql)
             $objbis = $db->fetch_object($resqlbis);
             $lastmovementdate = $db->jdate($objbis->datem);
         }
-        else
-        {
+        else {
             dol_print_error($db);
         }
 
@@ -629,8 +619,7 @@ if ($resql)
         {
             print dol_print_date($lastmovementdate, 'dayhour');
         }
-        else
-        {
+        else {
             print $langs->trans("None");
         }
         print "</td></tr>";
@@ -1194,8 +1183,7 @@ if ($resql)
     	//print '</td></tr>';
     }
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index fcd08f8b662..0894ac2ce8b 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -256,8 +256,7 @@ if ($action == "correct_stock" && !$cancel)
 					$origin_id
 				); // We do not change value of stock for a correction
 			}
-			else
-			{
+			else {
 				$result = $object->correct_stock(
 		    		$user,
 		    		GETPOST("id_entrepot"),
@@ -278,14 +277,12 @@ if ($action == "correct_stock" && !$cancel)
 					header("Location: ".$backtopage);
 					exit;
 				}
-				else
-				{
+				else {
 	            	header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 					exit;
 				}
 			}
-			else
-			{
+			else {
 			    setEventMessages($object->error, $object->errors, 'errors');
 			    $action = 'correction';
 			}
@@ -357,14 +354,12 @@ if ($action == "transfert_stock" && !$cancel)
 						$eatby = $pdluo->eatby;
 						$sellby = $pdluo->sellby;
 					}
-					else
-					{
+					else {
 						setEventMessages($pdluo->error, $pdluo->errors, 'errors');
 						$error++;
 					}
 				}
-				else
-				{
+				else {
 					$srcwarehouseid = GETPOST('id_entrepot', 'int');
 					$batch = $batchnumber;
 					$eatby = $d_eatby;
@@ -402,8 +397,7 @@ if ($action == "transfert_stock" && !$cancel)
 					if ($result2 < 0) $error++;
 				}
 			}
-			else
-			{
+			else {
 				if (!$error)
 				{
     			    // Remove stock
@@ -444,14 +438,12 @@ if ($action == "transfert_stock" && !$cancel)
 					header("Location: ".$backtopage);
 					exit;
 				}
-				else
-				{
+				else {
 					header("Location: product.php?id=".$object->id);
 					exit;
 				}
 			}
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
 				$action = 'transfert';
@@ -473,8 +465,7 @@ if ($action == 'updateline' && GETPOST('save') == $langs->trans('Save'))
             if ((!GETPOST("sellby")) && (!GETPOST("eatby")) && (!$batchnumber)) {
                 setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("atleast1batchfield")), null, 'errors');
             }
-            else
-            {
+            else {
                 $d_eatby = dol_mktime(0, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
                 $d_sellby = dol_mktime(0, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
                 $pdluo->batch = $batchnumber;
@@ -487,13 +478,11 @@ if ($action == 'updateline' && GETPOST('save') == $langs->trans('Save'))
                 }
             }
         }
-        else
-        {
+        else {
             setEventMessages($langs->trans('BatchInformationNotfound'), null, 'errors');
         }
     }
-    else
-    {
+    else {
         setEventMessages($pdluo->error, null, 'errors');
     }
     header("Location: product.php?id=".$id);
@@ -754,8 +743,7 @@ if ($id > 0 || $ref)
 		print '<br><br>';
 	}
 }
-else
-{
+else {
 	dol_print_error();
 }
 
@@ -780,13 +768,11 @@ if (empty($reshook))
 			if (!$variants || !empty($conf->global->VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT)) {
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=correction">'.$langs->trans("CorrectStock").'</a>';
 			}
-			else
-			{
+			else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ActionAvailableOnVariantProductOnly").'">'.$langs->trans("CorrectStock").'</a>';
 			}
 		}
-		else
-		{
+		else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CorrectStock").'</a>';
 		}
 
@@ -796,13 +782,11 @@ if (empty($reshook))
 			if (!$variants || !empty($conf->global->VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT)) {
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=transfert">'.$langs->trans("TransferStock").'</a>';
 			}
-			else
-			{
+			else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ActionAvailableOnVariantProductOnly").'">'.$langs->trans("TransferStock").'</a>';
 			}
 		}
-		else
-		{
+		else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CorrectStock").'</a>';
 		}
 
@@ -1093,8 +1077,7 @@ if (!$variants) {
 			print '<td></td>';
 			print '</tr>';
 		}
-		else
-		{
+		else {
 			print '<tr><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 		}
 		?>
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 17004a39a71..6318c059458 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -180,12 +180,11 @@ if (empty($reshook))
 			{
 				// Creation KO
 				if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else  setEventMessages($object->error, null, 'errors');
+			else setEventMessages($object->error, null, 'errors');
 				$action = 'create';
 			}
 		}
-		else
-		{
+		else {
 			$action = 'create';
 		}
 	}
@@ -218,16 +217,14 @@ if (empty($reshook))
 			{
 				$action = 'view';
 			}
-			else
-			{
+			else {
 				// Creation KO
 				if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 				else setEventMessages($object->error, null, 'errors');
 				$action = 'edit';
 			}
 		}
-		else
-		{
+		else {
 			$action = 'edit';
 		}
 	}
@@ -243,8 +240,7 @@ if (empty($reshook))
 			header("Location: ".dol_buildpath('/stock/list.php', 1));
 			exit;
 		}
-		else
-		{
+		else {
 			if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 			else setEventMessages($object->error, null, 'errors');
 		}
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index 1dbb8a900e6..d3927d113b4 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -155,8 +155,7 @@ if ($object->id)
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 5977f1854f7..5a600b619ba 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -542,8 +542,7 @@ if ($resql)
 	print $formfile->showdocuments('massfilesarea_orders','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
 	*/
 }
-else
-{
+else {
 	$error++;
 	dol_print_error($db);
 }
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 97d3871c027..f87891666df 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -182,8 +182,7 @@ if ($action == 'order' && isset($_POST['valid']))
 				{
 					$errorQty++;
 				}
-                else
-				{
+                else {
                     $error = $db->lasterror();
                     dol_print_error($db);
                 }
@@ -273,8 +272,7 @@ if ($action == 'order' && isset($_POST['valid']))
             header('Location: replenishorders.php');
             exit;
         }
-        else
-        {
+        else {
         	$db->rollback();
         }
     }
@@ -420,8 +418,7 @@ if ($usevirtualstock)
 		$sqlProductionToProduce .= " AND mp5.fk_product = p.rowid";
 		$sqlProductionToProduce .= " AND mp5.role IN ('toproduce', 'produced')";
 		$sqlProductionToProduce .= " AND mm5.status IN (1,2))";
-	} else
-	{
+	} else {
 		$sqlProductionToConsume = '0';
 		$sqlProductionToProduce = '0';
 	}
@@ -673,8 +670,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 			// If option to increase/decrease is not on an object validation, virtual stock may differs from physical stock.
 			$stock = $prod->stock_theorique;
 		}
-		else
-		{
+		else {
 			$stock = $prod->stock_reel;
 		}
 
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 42469b4dd2a..9913e612435 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -315,8 +315,7 @@ if ($resql)
 
     dol_fiche_end();
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index dffd18e0176..56580c7df53 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -47,8 +47,7 @@ if ($pdluoid > 0)
 	{
 		$pdluoid = $pdluo->id;
 	}
-	else
-	{
+	else {
 		dol_print_error($db, $pdluo->error, $pdluo->errors);
 	}
 }
@@ -105,8 +104,7 @@ if (!empty($conf->productbatch->enabled) &&
 		print '<input type="text" name="batch_number_bis" size="40" disabled="disabled" value="'.(GETPOST('batch_number') ?GETPOST('batch_number') : $pdluo->batch).'">';
 		print '<input type="hidden" name="batch_number" value="'.(GETPOST('batch_number') ?GETPOST('batch_number') : $pdluo->batch).'">';
 	}
-	else
-	{
+	else {
 		print '<input type="text" name="batch_number" size="40" value="'.(GETPOST('batch_number') ?GETPOST('batch_number') : $pdluo->batch).'">';
 	}
 	print '</td>';
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 816d97351b4..74c7fb21d5f 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -150,8 +150,7 @@ if ($result)
         print '<br><img src="'.$url.'">';
     }
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index c4b93b55969..c803ea7adf1 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -79,8 +79,7 @@ $cancel != $langs->trans("Cancel") &&
 		$object->description = dol_htmlcleanlastbr($_POST["desc"]);
 		$object->other			= dol_htmlcleanlastbr($_POST["other"]);
 	}
-	else
-	{
+	else {
 		$object->multilangs[$_POST["forcelangprod"]]["label"]		= $_POST["libelle"];
 		$object->multilangs[$_POST["forcelangprod"]]["description"] = dol_htmlcleanlastbr($_POST["desc"]);
 		$object->multilangs[$_POST["forcelangprod"]]["other"]		= dol_htmlcleanlastbr($_POST["other"]);
@@ -91,8 +90,7 @@ $cancel != $langs->trans("Cancel") &&
 	{
 		$action = '';
 	}
-	else
-	{
+	else {
 		$action = 'add';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -115,8 +113,7 @@ $cancel != $langs->trans("Cancel") &&
 			$object->description = dol_htmlcleanlastbr($_POST["desc-".$key]);
 			$object->other			= dol_htmlcleanlastbr($_POST["other-".$key]);
 		}
-		else
-		{
+		else {
 			$object->multilangs[$key]["label"]			= $_POST["libelle-".$key];
 			$object->multilangs[$key]["description"] = dol_htmlcleanlastbr($_POST["desc-".$key]);
 			$object->multilangs[$key]["other"]			= dol_htmlcleanlastbr($_POST["other-".$key]);
@@ -127,8 +124,7 @@ $cancel != $langs->trans("Cancel") &&
 	{
 		$action = '';
 	}
-	else
-	{
+	else {
 		$action = 'edit';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -148,8 +144,7 @@ $cancel != $langs->trans("Cancel") &&
 	{
 		$action = '';
 	}
-	else
-	{
+	else {
 		$action = 'edit';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}

From e5fc928fda2dcf02a0249be9e3d2c97507b34a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 02:02:54 +0200
Subject: [PATCH 329/490] add new rule

---
 htdocs/externalsite/admin/externalsite.php    |   3 +-
 htdocs/externalsite/frames.php                |   9 +-
 htdocs/hrm/admin/admin_establishment.php      |   6 +-
 htdocs/hrm/class/establishment.class.php      |  12 +-
 htdocs/hrm/establishment/card.php             |  15 +-
 htdocs/hrm/index.php                          |   6 +-
 htdocs/livraison/card.php                     |  29 ++--
 htdocs/livraison/class/livraison.class.php    |  48 ++----
 htdocs/loan/card.php                          |  63 +++----
 htdocs/loan/class/loan.class.php              |  24 +--
 htdocs/loan/class/loanschedule.class.php      |  18 +-
 htdocs/loan/class/paymentloan.class.php       |  24 +--
 htdocs/loan/document.php                      |   3 +-
 htdocs/loan/list.php                          |   6 +-
 htdocs/loan/payment/card.php                  |  12 +-
 htdocs/loan/payment/payment.php               |  15 +-
 .../mailmanspip/class/mailmanspip.class.php   |  12 +-
 htdocs/margin/admin/margin.php                |  33 ++--
 htdocs/margin/agentMargins.php                |  17 +-
 htdocs/margin/checkMargins.php                |   2 +-
 htdocs/margin/customerMargins.php             |  17 +-
 htdocs/margin/lib/margins.lib.php             |   9 +-
 htdocs/margin/productMargins.php              |  20 +--
 htdocs/margin/tabs/productMargins.php         |   3 +-
 htdocs/margin/tabs/thirdpartyMargins.php      |   9 +-
 htdocs/mrp/ajax/ajax_bom.php                  |   3 +-
 htdocs/mrp/class/mo.class.php                 |  21 +--
 htdocs/mrp/index.php                          |   9 +-
 htdocs/mrp/mo_agenda.php                      |   6 +-
 htdocs/mrp/mo_card.php                        |  12 +-
 htdocs/mrp/mo_document.php                    |   3 +-
 htdocs/mrp/mo_list.php                        |   3 +-
 htdocs/mrp/mo_movements.php                   |   3 +-
 htdocs/mrp/mo_production.php                  |   6 +-
 .../class/multicurrency.class.php             |   9 +-
 htdocs/opensurvey/card.php                    |   9 +-
 .../class/opensurveysondage.class.php         |  15 +-
 htdocs/opensurvey/exportcsv.php               |   3 +-
 htdocs/opensurvey/list.php                    |   3 +-
 htdocs/opensurvey/results.php                 |  21 +--
 htdocs/opensurvey/wizard/choix_date.php       |   3 +-
 htdocs/opensurvey/wizard/create_survey.php    |   6 +-
 htdocs/paybox/admin/paybox.php                |   3 +-
 htdocs/paypal/admin/paypal.php                |   9 +-
 htdocs/paypal/lib/paypal.lib.php              |  27 +--
 htdocs/paypal/lib/paypalfunctions.lib.php     |   3 +-
 htdocs/printing/admin/printing.php            |  18 +-
 htdocs/projet/activity/index.php              |  18 +-
 htdocs/projet/activity/perday.php             |  30 ++--
 htdocs/projet/activity/permonth.php           |  24 +--
 htdocs/projet/activity/perweek.php            |  24 +--
 htdocs/projet/admin/project.php               |  57 ++----
 htdocs/projet/card.php                        |  54 ++----
 htdocs/projet/class/api_projects.class.php    |   3 +-
 htdocs/projet/class/api_tasks.class.php       |   3 +-
 htdocs/projet/class/project.class.php         | 105 ++++-------
 htdocs/projet/class/projectstats.class.php    |   9 +-
 htdocs/projet/class/task.class.php            |  86 ++++-----
 htdocs/projet/class/taskstats.class.php       |   3 +-
 htdocs/projet/comment.php                     |   3 +-
 htdocs/projet/contact.php                     |  12 +-
 htdocs/projet/document.php                    |   3 +-
 htdocs/projet/element.php                     |  38 ++--
 htdocs/projet/ganttchart.inc.php              |   6 +-
 htdocs/projet/ganttview.php                   |   6 +-
 htdocs/projet/graph_opportunities.inc.php     |   3 +-
 htdocs/projet/index.php                       |   9 +-
 htdocs/projet/info.php                        |   3 +-
 htdocs/projet/list.php                        |  15 +-
 htdocs/projet/tasks.php                       |  24 +--
 htdocs/projet/tasks/comment.php               |   3 +-
 htdocs/projet/tasks/contact.php               |  24 +--
 htdocs/projet/tasks/document.php              |   9 +-
 htdocs/projet/tasks/list.php                  |  12 +-
 htdocs/projet/tasks/note.php                  |   6 +-
 htdocs/projet/tasks/task.php                  |  21 +--
 htdocs/projet/tasks/time.php                  | 113 ++++--------
 htdocs/public/agenda/agendaexport.php         |   6 +-
 htdocs/public/cron/cron_run_jobs.php          |  15 +-
 htdocs/public/demo/index.php                  |  12 +-
 htdocs/public/donations/donateurs_code.php    |   9 +-
 htdocs/public/members/new.php                 |  30 ++--
 htdocs/public/members/public_card.php         |   3 +-
 htdocs/public/members/public_list.php         |   6 +-
 htdocs/public/notice.php                      |   3 +-
 htdocs/public/onlinesign/newonlinesign.php    |   9 +-
 htdocs/public/opensurvey/studs.php            |  18 +-
 htdocs/public/payment/newpayment.php          |  82 +++------
 htdocs/public/payment/paymentko.php           |   6 +-
 htdocs/public/payment/paymentok.php           |  69 +++-----
 htdocs/public/stripe/confirm_payment.php      |   6 +-
 htdocs/public/stripe/ipn.php                  |  18 +-
 htdocs/public/test/test_arrays.php            |   3 +-
 htdocs/public/ticket/view.php                 |   6 +-
 htdocs/public/website/index.php               |   6 +-
 htdocs/public/website/styles.css.php          |   3 +-
 htdocs/reception/card.php                     |  87 ++++------
 htdocs/reception/class/reception.class.php    |  96 ++++-------
 htdocs/reception/contact.php                  |   3 +-
 htdocs/reception/list.php                     |  18 +-
 htdocs/reception/stats/index.php              |   3 +-
 htdocs/resource/agenda.php                    |   3 +-
 htdocs/resource/card.php                      |  27 +--
 htdocs/resource/class/dolresource.class.php   |  33 ++--
 .../class/html.formresource.class.php         |   6 +-
 htdocs/resource/contact.php                   |   3 +-
 htdocs/resource/document.php                  |   3 +-
 htdocs/resource/element_resource.php          |  18 +-
 htdocs/resource/list.php                      |   3 +-
 htdocs/salaries/admin/salaries.php            |   6 +-
 htdocs/salaries/card.php                      |  18 +-
 htdocs/salaries/class/paymentsalary.class.php |  21 +--
 htdocs/salaries/document.php                  |   3 +-
 htdocs/salaries/list.php                      |   6 +-
 htdocs/societe/admin/societe.php              |  90 ++++------
 htdocs/societe/agenda.php                     |   3 +-
 htdocs/societe/ajax/company.php               |   3 +-
 htdocs/societe/ajaxcompanies.php              |   9 +-
 .../canvas/actions_card_common.class.php      |   6 +-
 .../company/actions_card_company.class.php    |  21 +--
 .../actions_card_individual.class.php         |   3 +-
 htdocs/societe/card.php                       | 111 ++++--------
 htdocs/societe/checkvat/checkVatPopup.php     |  12 +-
 .../societe/class/api_thirdparties.class.php  |   9 +-
 htdocs/societe/class/client.class.php         |   3 +-
 .../class/companybankaccount.class.php        |  36 ++--
 .../class/companypaymentmode.class.php        |  12 +-
 htdocs/societe/class/societe.class.php        | 163 ++++++------------
 htdocs/societe/class/societeaccount.class.php |   3 +-
 htdocs/societe/consumption.php                |  12 +-
 htdocs/societe/document.php                   |   3 +-
 htdocs/societe/index.php                      |  12 +-
 htdocs/societe/list.php                       |   3 +-
 htdocs/societe/note.php                       |   3 +-
 htdocs/societe/notify/card.php                |  21 +--
 htdocs/societe/paymentmodes.php               |  54 ++----
 htdocs/societe/price.php                      |   9 +-
 htdocs/societe/societecontact.php             |  18 +-
 138 files changed, 880 insertions(+), 1742 deletions(-)

diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php
index b1e3dc7fac8..70f235f4a27 100644
--- a/htdocs/externalsite/admin/externalsite.php
+++ b/htdocs/externalsite/admin/externalsite.php
@@ -60,8 +60,7 @@ if ($action == 'update')
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		setEventMessages($db->lasterror(), null, 'errors');
 	}
diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php
index 3a1b1c04b82..5393f68b640 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -69,8 +69,7 @@ if (!empty($keyforcontent))
 		$langs->load("errors");
 		print $langs->trans("ErrorVariableKeyForContentMustBeSet", 'EXTERNAL_SITE_CONTENT_'.$keyforcontent, 'EXTERNAL_SITE_URL_'.$keyforcontent);
 	}
-	else
-	{
+	else {
 		if (preg_match('/EXTERNAL_SITE_CONTENT_/', $keyforcontent))
 		{
 			print $conf->global->$keyforcontent;
@@ -115,8 +114,7 @@ if (!empty($keyforcontent))
 	print '<div>';
 	llxFooter();
 }
-else
-{
+else {
 	if (preg_match('/^\//', $conf->global->EXTERNALSITE_URL) || preg_match('/^http/i', $conf->global->EXTERNALSITE_URL))
 	{
 		print "
@@ -151,8 +149,7 @@ else
 	</html>
 	";
 	}
-	else
-	{
+	else {
 		llxHeader();
 		print '<div class="framecontent" style="height: '.($_SESSION['dol_screenheight'] - 90).'px">';
 		print $conf->global->EXTERNALSITE_URL;
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index ba98812f1b2..cd24a6bce0c 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -130,15 +130,13 @@ if ($result)
             $i++;
         }
     }
-    else
-    {
+    else {
         print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
 
 	print '</table>';
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index 621f93ca247..caba1b87925 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -261,8 +261,7 @@ class Establishment extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -287,8 +286,7 @@ class Establishment extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -389,8 +387,7 @@ class Establishment extends CommonObject
 			}
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -418,8 +415,7 @@ class Establishment extends CommonObject
 			}
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 0122e92090f..8199e3bbccc 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -64,8 +64,7 @@ if ($action == 'confirm_delete' && $confirm == "yes")
         header("Location: ../admin/admin_establishment.php");
         exit;
     }
-    else
-    {
+    else {
         setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -101,18 +100,15 @@ elseif ($action == 'add')
                 header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
                 exit;
 			}
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
         }
-        else
-        {
+        else {
             $action = 'create';
         }
     }
-    else
-    {
+    else {
         header("Location: ../admin/admin_establishment.php");
         exit;
     }
@@ -148,8 +144,7 @@ elseif ($action == 'update')
                 header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_POST['id']);
                 exit;
             }
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index e31266f755c..1f61b920eb8 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -242,8 +242,7 @@ if (!empty($conf->holiday->enabled) && $user->rights->holiday->read)
                 $i++;
             }
         }
-        else
-        {
+        else {
             print '<tr class="oddeven"><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         print '</table>';
@@ -315,8 +314,7 @@ if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print '</table>';
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 82c6521e00f..80f30552473 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -119,8 +119,7 @@ if ($action == 'add')
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 
@@ -167,8 +166,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expeditio
 		else header("Location: ".DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1');
 		exit;
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 }
@@ -262,7 +260,7 @@ $formfile = new FormFile($db);
 if ($action == 'create')    // Create. Seems to no be used
 {
 }
-else	// View
+else // View
 {
 	if ($object->id > 0)
 	{
@@ -453,8 +451,7 @@ else	// View
 				print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 				print '</form>';
 			}
-			else
-			{
+			else {
 				print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
 			}
 			print '</td>';
@@ -476,8 +473,7 @@ else	// View
 				{
 					print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 				}
-				else
-				{
+				else {
 					print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 				}
 		        print '</td></tr>';
@@ -575,8 +571,7 @@ else	// View
 
 							$label = (!empty($product->multilangs[$outputlangs->defaultlang]["label"])) ? $product->multilangs[$outputlangs->defaultlang]["label"] : $object->lines[$i]->product_label;
 						}
-						else
-						{
+						else {
 							$label = (!empty($object->lines[$i]->label) ? $object->lines[$i]->label : $object->lines[$i]->product_label);
 						}
 
@@ -597,8 +592,7 @@ else	// View
 							print (!empty($object->lines[$i]->description) && $object->lines[$i]->description != $object->lines[$i]->product_label) ? '<br>'.dol_htmlentitiesbr($object->lines[$i]->description) : '';
 						}
 					}
-					else
-					{
+					else {
 						print "<td>";
 						if ($object->lines[$i]->fk_product_type == 1) $text = img_object($langs->trans('Service'), 'service');
 						else $text = img_object($langs->trans('Product'), 'product');
@@ -675,8 +669,7 @@ else	// View
 					{
 						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;expid='.$object->origin_id.'&amp;action=delete&amp;backtopage='.urlencode(DOL_URL_ROOT.'/expedition/card.php?id='.$object->origin_id).'">'.$langs->trans("Delete").'</a>';
 					}
-					else
-					{
+					else {
 						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
 					}
 				}
@@ -720,14 +713,12 @@ else	// View
 
 			print '</td></tr></table>';
 		}
-		else
-		{
+		else {
 			/* Expedition non trouvee */
 			print "Expedition inexistante ou acces refuse";
 		}
 	}
-	else
-	{
+	else {
 		/* Expedition non trouvee */
 		print "Expedition inexistante ou acces refuse";
 	}
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index acfe8b29d05..4d00c414cb1 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -216,24 +216,21 @@ class Livraison extends CommonObject
 					$this->db->commit();
 					return $this->id;
 				}
-				else
-				{
+				else {
 					$error++;
 					$this->error = $this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 					$this->db->rollback();
 					return -3;
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$this->error = $this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$this->error = $this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 			$this->db->rollback();
@@ -345,15 +342,13 @@ class Livraison extends CommonObject
 
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = 'Delivery with id '.$id.' not found sql='.$sql;
 				dol_syslog(get_class($this).'::fetch Error '.$this->error, LOG_ERR);
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -400,8 +395,7 @@ class Livraison extends CommonObject
 		            {
 		                $numref = $objMod->livraison_get_num($soc, $this);
 		            }
-		            else
-					{
+		            else {
 		                $numref = $this->ref;
 		            }
             		$this->newref = dol_sanitizeFileName($numref);
@@ -501,16 +495,14 @@ class Livraison extends CommonObject
 			            $this->db->commit();
 			            return 1;
 			        }
-			        else
-					{
+			        else {
 			            $this->db->rollback();
 			            return -1;
 			        }
 				}
 			}
 		}
-		else
-		{
+		else {
 			$this->error = "Non autorise";
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 			return -1;
@@ -634,8 +626,7 @@ class Livraison extends CommonObject
 
 				return 1;
 			}
-			else
-			{
+			else {
 				return 0;
 			}
 		}
@@ -705,22 +696,19 @@ class Livraison extends CommonObject
 
 					return 1;
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -3;
 				}
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror()." - sql=$sql";
 			$this->db->rollback();
 			return -1;
@@ -991,8 +979,7 @@ class Livraison extends CommonObject
 					{
 						$array[$i]['qty'] = $objSourceLine->qty - $row[1];
 					}
-					else
-					{
+					else {
 						$array[$i]['qty'] = $objSourceLine->qty;
 					}
 
@@ -1010,8 +997,7 @@ class Livraison extends CommonObject
 			}
 			return $array;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error()." - sql=$sqlSourceLine";
 			return -1;
 		}
@@ -1041,14 +1027,12 @@ class Livraison extends CommonObject
 				$this->date_delivery = $date_livraison;
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->error();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			return -2;
 		}
 	}
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 56b12321bb2..266b7d2bc09 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -69,8 +69,7 @@ if (empty($reshook))
 		{
 			setEventMessages($langs->trans('LoanPaid'), null, 'mesgs');
 		}
-		else
-		{
+		else {
 			setEventMessages($loan->error, null, 'errors');
 		}
 	}
@@ -86,8 +85,7 @@ if (empty($reshook))
 			header("Location: index.php");
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($loan->error, null, 'errors');
 		}
 	}
@@ -154,8 +152,7 @@ if (empty($reshook))
 				}
 			}
 		}
-		else
-		{
+		else {
 			header("Location: index.php");
 			exit();
 		}
@@ -177,8 +174,7 @@ if (empty($reshook))
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("LoanCapital")), null, 'errors');
 				$action = 'edit';
 			}
-			else
-			{
+			else {
 				$object->datestart = $datestart;
 				$object->dateend	        = $dateend;
 				$object->capital	        = $capital;
@@ -202,14 +198,12 @@ if (empty($reshook))
 				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 				exit;
 			}
-			else
-			{
+			else {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-		else
-		{
+		else {
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 			exit;
 		}
@@ -275,8 +269,7 @@ if ($action == 'create')
 		$form->select_comptes(GETPOST("accountid"), "accountid", 0, "courant=1", 1); // Show list of bank account with courant
 		print '</td></tr>';
 	}
-	else
-	{
+	else {
 		print '<tr><td>'.$langs->trans("Account").'</td><td>';
 		print $langs->trans("NoBankAccountDefined");
 		print '</td></tr>';
@@ -484,8 +477,7 @@ if ($id > 0)
 			print '<input name="capital" size="10" value="'.$object->capital.'"></td></tr>';
 			print '</td></tr>';
 		}
-		else
-		{
+		else {
 			print '<tr><td class="titlefield">'.$langs->trans("LoanCapital").'</td><td>'.price($object->capital, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 		}
 
@@ -496,8 +488,7 @@ if ($id > 0)
 		    print '<input name="insurance_amount" size="10" value="'.$object->insurance_amount.'"></td></tr>';
 		    print '</td></tr>';
 		}
-		else
-		{
+		else {
 		    print '<tr><td class="titlefield">'.$langs->trans("Insurance").'</td><td>'.price($object->insurance_amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 		}
 
@@ -508,8 +499,7 @@ if ($id > 0)
 		{
 			print $form->selectDate($object->datestart, 'start', 0, 0, 0, 'update', 1, 0);
 		}
-		else
-		{
+		else {
 			print dol_print_date($object->datestart, "day");
 		}
 		print "</td></tr>";
@@ -521,8 +511,7 @@ if ($id > 0)
 		{
 			print $form->selectDate($object->dateend, 'end', 0, 0, 0, 'update', 1, 0);
 		}
-		else
-		{
+		else {
 			print dol_print_date($object->dateend, "day");
 		}
 		print "</td></tr>";
@@ -534,8 +523,7 @@ if ($id > 0)
 		{
 			print '<input name="nbterm" size="4" value="'.$object->nbterm.'">';
 		}
-		else
-		{
+		else {
 			print $object->nbterm;
 		}
 		print '</td></tr>';
@@ -547,8 +535,7 @@ if ($id > 0)
 		{
 			print '<input name="rate" size="4" value="'.$object->rate.'">%';
 		}
-		else
-		{
+		else {
 			print price($object->rate).'%';
 		}
 		print '</td></tr>';
@@ -565,14 +552,12 @@ if ($id > 0)
 			{
 				print $formaccounting->select_account($object->account_capital, 'accountancy_account_capital', 1, '', 1, 1);
 			}
-			else
-			{
+			else {
 				print '<input name="accountancy_account_capital" size="16" value="'.$object->account_capital.'">';
 			}
 			print '</td>';
 		}
-		else
-		{
+		else {
 			print '<td class="nowrap">';
 			print $langs->trans("LoanAccountancyCapitalCode");
 			print '</td><td>';
@@ -603,14 +588,12 @@ if ($id > 0)
 			{
 				print $formaccounting->select_account($object->account_insurance, 'accountancy_account_insurance', 1, '', 1, 1);
 			}
-			else
-			{
+			else {
 				print '<input name="accountancy_account_insurance" size="16" value="'.$object->account_insurance.'">';
 			}
 			print '</td>';
 		}
-		else
-		{
+		else {
 			print '<td class="nowrap">';
 			print $langs->trans("LoanAccountancyInsuranceCode");
 			print '</td><td>';
@@ -641,14 +624,12 @@ if ($id > 0)
 			{
 				print $formaccounting->select_account($object->account_interest, 'accountancy_account_interest', 1, '', 1, 1);
 			}
-			else
-			{
+			else {
 				print '<input name="accountancy_account_interest" size="16" value="'.$object->account_interest.'">';
 			}
 			print '</td>';
 		}
-		else
-		{
+		else {
 			print '<td class="nowrap">';
 			print $langs->trans("LoanAccountancyInterestCode");
 			print '</td><td>';
@@ -743,8 +724,7 @@ if ($id > 0)
 
 			$db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -805,8 +785,7 @@ if ($id > 0)
 			}
 		}
 	}
-	else
-	{
+	else {
 		// Loan not found
 		dol_print_error('', $object->error);
 	}
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 1a24eb6be11..d38593c9710 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -161,14 +161,12 @@ class Loan extends CommonObject
 				$this->db->free($resql);
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->db->free($resql);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -259,8 +257,7 @@ class Loan extends CommonObject
 			$this->db->commit();
 			return $this->id;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -330,8 +327,7 @@ class Loan extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -376,8 +372,7 @@ class Loan extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -572,8 +567,7 @@ class Loan extends CommonObject
 			$this->db->free($resql);
 			return $amount;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -619,14 +613,12 @@ class Loan extends CommonObject
 				$this->db->free($result);
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->db->free($result);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/loan/class/loanschedule.class.php b/htdocs/loan/class/loanschedule.class.php
index 3299e810991..8089dc3e176 100644
--- a/htdocs/loan/class/loanschedule.class.php
+++ b/htdocs/loan/class/loanschedule.class.php
@@ -171,8 +171,7 @@ class LoanSchedule extends CommonObject
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_loan");
 			}
-			else
-			{
+			else {
                 $this->error = $this->db->lasterror();
 				$error++;
 			}
@@ -184,8 +183,7 @@ class LoanSchedule extends CommonObject
 		    $this->db->commit();
 			return $this->id;
 		}
-		else
-		{
+		else {
 			$this->errors[] = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -258,8 +256,7 @@ class LoanSchedule extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -322,8 +319,7 @@ class LoanSchedule extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -364,8 +360,7 @@ class LoanSchedule extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -451,8 +446,7 @@ class LoanSchedule extends CommonObject
 			$this->db->free($resql);
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index ce152317710..5c50a1fea89 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -166,8 +166,7 @@ class PaymentLoan extends CommonObject
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_loan");
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
@@ -179,8 +178,7 @@ class PaymentLoan extends CommonObject
 			$this->db->commit();
 			return $this->id;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -255,8 +253,7 @@ class PaymentLoan extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -327,8 +324,7 @@ class PaymentLoan extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -380,8 +376,7 @@ class PaymentLoan extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -460,8 +455,7 @@ class PaymentLoan extends CommonObject
 					if ($result <= 0) dol_print_error($this->db);
 				}
 			}
-			else
-			{
+			else {
 				$this->error = $acc->error;
 				$error++;
 			}
@@ -471,8 +465,7 @@ class PaymentLoan extends CommonObject
 		{
 			return 1;
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 	}
@@ -497,8 +490,7 @@ class PaymentLoan extends CommonObject
 		    $this->fk_bank = $id_bank;
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return 0;
 		}
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 6ae646a93a1..93eca8cb7b4 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -159,8 +159,7 @@ if ($object->id)
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
     print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index 3f87f322ccb..5a4b9364555 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -121,8 +121,7 @@ if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit
 {
 	$num = $nbtotalofrecords;
 }
-else
-{
+else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -262,8 +261,7 @@ if ($resql)
 
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index b739b81ca54..6d912cc7149 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -64,8 +64,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->loan->del
 		header("Location: ".DOL_URL_ROOT."/loan/list.php");
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($payment->error, $payment->errors, 'errors');
 		$db->rollback();
 	}
@@ -102,8 +101,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->loan->wri
 		header('Location: card.php?id='.$payment->id);
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($payment->error, $payment->errors, 'errors');
 		$db->rollback();
 	}
@@ -255,8 +253,7 @@ if ($resql)
 	print "</table>\n";
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -287,8 +284,7 @@ if (empty($action) && !empty($user->rights->loan->delete))
 	{
 		print '<a class="butActionDelete" href="card.php?id='.$id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
 	}
-	else
-	{
+	else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
 	}
 }
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index ea37a298d49..3ccc6a77b3f 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -170,8 +170,7 @@ if ($action == 'add_payment')
 				header('Location: '.$loc);
 				exit;
 			}
-			else
-			{
+			else {
 				$db->rollback();
 			}
 		}
@@ -291,8 +290,7 @@ if ($action == 'create')
 	{
 		print '<td class="left" valign="center">'.dol_print_date($loan->datestart, 'day').'</td>';
 	}
-	else
-	{
+	else {
 		print '<td class="center" valign="center"><b>!!!</b></td>';
 	}
 
@@ -307,8 +305,7 @@ if ($action == 'create')
 	{
 	    print $langs->trans("LoanCapital").': <input type="text" size="8" name="amount_capital" value="'.$amount_capital.'">';
 	}
-	else
-	{
+	else {
 		print '-';
 	}
 	print '<br>';
@@ -316,8 +313,7 @@ if ($action == 'create')
 	{
 		print $langs->trans("Insurance").': <input type="text" size="8" name="amount_insurance" value="'.$amount_insurance.'">';
 	}
-	else
-	{
+	else {
 		print '-';
 	}
 	print '<br>';
@@ -325,8 +321,7 @@ if ($action == 'create')
 	{
 		print $langs->trans("Interest").': <input type="text" size="8" name="amount_interest" value="'.$amount_interest.'">';
 	}
-	else
-	{
+	else {
 		print '-';
 	}
 	print "</td>";
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index 41a221a7e72..dec81411a33 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -291,15 +291,13 @@ class MailmanSpip
                             $mydb->close($result);
                             return 1;
                         }
-                        else
-                        {
+                        else {
                             // nous n'avons pas de reponse => n'existe pas
                             $mydb->close($result);
                             return 0;
                         }
                     }
-                    else
-                    {
+                    else {
                         $this->error = $mydb->lasterror();
                         $mydb->close();
                     }
@@ -378,8 +376,7 @@ class MailmanSpip
 	            }
 	            return count($lists);
 	        }
-	        else
-	        {
+	        else {
 	            $this->error = "ADHERENT_MAILMAN_URL not defined";
 	            return -1;
 	        }
@@ -452,8 +449,7 @@ class MailmanSpip
 	            }
 	            return count($lists);
 	        }
-	        else
-			{
+	        else {
 	            $this->error = "ADHERENT_MAILMAN_UNSUB_URL not defined";
 	            return -1;
 	        }
diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index 5b6cd01ba97..e174e383993 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -48,8 +48,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -62,8 +61,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -74,8 +72,7 @@ if ($action == 'remises')
 	{
 		  setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -86,8 +83,7 @@ if ($action == 'typemarges')
 	{
 		  setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -98,8 +94,7 @@ if ($action == 'contact')
 	{
 		  setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -167,14 +162,12 @@ if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('DISPLAY_MARGIN_RATES');
 }
-else
-{
+else {
 	if (empty($conf->global->DISPLAY_MARGIN_RATES))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARGIN_RATES">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	}
-	else
-	{
+	else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARGIN_RATES">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
@@ -190,14 +183,12 @@ if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('DISPLAY_MARK_RATES');
 }
-else
-{
+else {
 	if (empty($conf->global->DISPLAY_MARK_RATES))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	}
-	else
-	{
+	else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
@@ -213,14 +204,12 @@ if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('ForceBuyingPriceIfNull');
 }
-else
-{
+else {
 	if (empty($conf->global->ForceBuyingPriceIfNull))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	}
-	else
-	{
+	else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index cf1d70db91a..8dfaecc7d41 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -48,8 +48,7 @@ if (!$sortfield)
 {
 	if ($agentid > 0)
 		$sortfield = "s.nom";
-	else
-	    $sortfield = "u.lastname";
+	else $sortfield = "u.lastname";
 }
 
 $startdate = $enddate = '';
@@ -156,16 +155,14 @@ $sql .= " AND sc.fk_soc = f.fk_soc";
 $sql .= " AND (d.product_type = 0 OR d.product_type = 1)";
 if (!empty($conf->global->AGENT_CONTACT_TYPE))
 	$sql .= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = u.rowid) OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = u.rowid))";
-else
-	$sql .= " AND sc.fk_user = u.rowid";
+else $sql .= " AND sc.fk_user = u.rowid";
 $sql .= " AND f.fk_statut NOT IN (".implode(', ', $invoice_status_except_list).")";
 $sql .= ' AND s.entity IN ('.getEntity('societe').')';
 $sql .= " AND d.fk_facture = f.rowid";
 if ($agentid > 0) {
 	if (!empty($conf->global->AGENT_CONTACT_TYPE))
   		$sql .= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = ".$agentid.") OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = ".$agentid."))";
-	else
-	    $sql .= " AND sc.fk_user = ".$agentid;
+	else $sql .= " AND sc.fk_user = ".$agentid;
 }
 if (!empty($startdate))
   $sql .= " AND f.datef >= '".$db->idate($startdate)."'";
@@ -205,7 +202,7 @@ if ($result)
 
 	if ($conf->global->MARGIN_TYPE == "1")
 	    $labelcostprice = 'BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
+	else // value is 'costprice' or 'pmp'
 	    $labelcostprice = 'CostPrice';
 
 	$moreforfilter = '';
@@ -217,8 +214,7 @@ if ($result)
 	print '<tr class="liste_titre">';
 	if ($agentid > 0)
 		print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
-	else
-		print_liste_field_titre("SalesRepresentative", $_SERVER["PHP_SELF"], "u.lastname", "", $param, '', $sortfield, $sortorder);
+	else print_liste_field_titre("SalesRepresentative", $_SERVER["PHP_SELF"], "u.lastname", "", $param, '', $sortfield, $sortorder);
 
 	print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "buying_price", "", $param, '', $sortfield, $sortorder, 'right ');
@@ -308,8 +304,7 @@ if ($result)
 	print "</table>";
 	print '</div>';
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 $db->free($result);
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 337791238ce..83e743e0d68 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -222,7 +222,7 @@ if ($result) {
 
 	if ($conf->global->MARGIN_TYPE == "1")
 	    $labelcostprice = 'BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
+	else // value is 'costprice' or 'pmp'
 	    $labelcostprice = 'CostPrice';
 
 	$moreforfilter = '';
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 3cdd9c3c650..20d2b2a1b52 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -126,8 +126,7 @@ if (!$sortfield)
 		$sortfield = "f.datef";
 		$sortorder = "DESC";
 	}
-	else
-	{
+	else {
 	    $sortfield = "s.nom";
 	    $sortorder = "ASC";
 	}
@@ -255,7 +254,7 @@ if ($result)
 
 	if ($conf->global->MARGIN_TYPE == "1")
 	    $labelcostprice = 'BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
+	else // value is 'costprice' or 'pmp'
 	    $labelcostprice = 'CostPrice';
 
 	$moreforfilter = '';
@@ -269,8 +268,7 @@ if ($result)
   		print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&amp;socid=".$socid, '', $sortfield, $sortorder);
   		print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;socid=".$socid, 'align="center"', $sortfield, $sortorder);
 	}
-	else
-  		print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "s.nom", "", "&amp;socid=".$socid, '', $sortfield, $sortorder);
+	else print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "s.nom", "", "&amp;socid=".$socid, '', $sortfield, $sortorder);
 	print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;socid=".$socid, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "buying_price", "", "&amp;socid=".$socid, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;socid=".$socid, 'align="right"', $sortfield, $sortorder);
@@ -298,8 +296,7 @@ if ($result)
 				$marginRate = ($pa != 0) ?-1 * (100 * $marge / $pa) : '';
 				$markRate = ($pv != 0) ?-1 * (100 * $marge / $pv) : '';
 			}
-			else
-			{
+			else {
 				$marginRate = ($pa != 0) ? (100 * $marge / $pa) : '';
 				$markRate = ($pv != 0) ? (100 * $marge / $pv) : '';
 			}
@@ -353,8 +350,7 @@ if ($result)
 	print '<tr class="liste_total">';
 	if ($client)
 	    print '<td colspan=2>';
-  	else
-    	print '<td>';
+  	else print '<td>';
   	print $langs->trans('TotalMargin')."</td>";
 	print "<td class=\"right\">".price($cumul_vente, null, null, null, null, $rounding)."</td>\n";
 	print "<td class=\"right\">".price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
@@ -368,8 +364,7 @@ if ($result)
 	print "</table>";
 	print '</div>';
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 $db->free($result);
diff --git a/htdocs/margin/lib/margins.lib.php b/htdocs/margin/lib/margins.lib.php
index 1f1d6def849..41618b174fa 100644
--- a/htdocs/margin/lib/margins.lib.php
+++ b/htdocs/margin/lib/margins.lib.php
@@ -128,13 +128,11 @@ function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localta
 		{
 			$paht_ret = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
 		}
-		else
-		{
+		else {
 			$paht_ret = $paht;
 		}
 	}
-	else
-	{
+	else {
 		$paht_ret = $paht;
 	}
 
@@ -147,8 +145,7 @@ function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localta
 	// calcul marge
 	if ($pu_ht_remise < 0)
 		$marge = -1 * (abs($pu_ht_remise) - $paht_ret);
-	else
-		$marge = $pu_ht_remise - $paht_ret;
+	else $marge = $pu_ht_remise - $paht_ret;
 
 	// calcul taux marge
 	if ($paht_ret != 0)
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index d4df22475d4..3e2fd804ff6 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -62,8 +62,7 @@ if (!$sortfield)
 		$sortfield = "f.datef";
 		$sortorder = "DESC";
 	}
-	else
-	{
+	else {
 	    $sortfield = "p.ref";
 	    $sortorder = "ASC";
 	}
@@ -226,7 +225,7 @@ if ($result)
 	//var_dump($conf->global->MARGIN_TYPE);
 	if ($conf->global->MARGIN_TYPE == "1")
 	    $labelcostprice = 'BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
+	else // value is 'costprice' or 'pmp'
 	    $labelcostprice = 'CostPrice';
 
 	$moreforfilter = '';
@@ -240,8 +239,7 @@ if ($result)
   		print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&amp;id=".$id, '', $sortfield, $sortorder);
   		print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;id=".$id, 'align="center"', $sortfield, $sortorder);
   	}
-  	else
-  	{
+  	else {
   		print_liste_field_titre("ProductService", $_SERVER["PHP_SELF"], "p.ref", "", "&amp;id=".$id, '', $sortfield, $sortorder);
   	}
 	print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;id=".$id, 'align="right"', $sortfield, $sortorder);
@@ -270,8 +268,7 @@ if ($result)
 				$marginRate = ($pa != 0) ?-1 * (100 * $marge / $pa) : '';
 				$markRate = ($pv != 0) ?-1 * (100 * $marge / $pv) : '';
 			}
-			else
-			{
+			else {
 				$marginRate = ($pa != 0) ? (100 * $marge / $pa) : '';
 				$markRate = ($pv != 0) ? (100 * $marge / $pv) : '';
 			}
@@ -298,8 +295,7 @@ if ($result)
     				$text = $product_static->getNomUrl(1);
     				print $text .= ' - '.$objp->label;
 				}
-				else
-				{
+				else {
 				    print img_object('', 'product').' '.$langs->trans("NotPredefinedProducts");
 				}
 				print "</td>\n";
@@ -330,8 +326,7 @@ if ($result)
 	print '<tr class="liste_total">';
 	if ($id > 0)
 		print '<td colspan=2>';
-	else
-		print '<td>';
+	else print '<td>';
 	print $langs->trans('TotalMargin')."</td>";
 	print "<td class=\"right\">".price(price2num($cumul_vente, 'MT'))."</td>\n";
 	print "<td class=\"right\">".price(price2num($cumul_achat, 'MT'))."</td>\n";
@@ -345,8 +340,7 @@ if ($result)
 	print "</table>";
 	print '</div>';
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 $db->free($result);
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index e68a042ace2..489946e43fe 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -230,8 +230,7 @@ if ($id > 0 || !empty($ref))
                     $marginRate = ($cumul_achat != 0) ?-1 * (100 * $totalMargin / $cumul_achat) : '';
                     $markRate = ($cumul_vente != 0) ?-1 * (100 * $totalMargin / $cumul_vente) : '';
                 }
-                else
-                {
+                else {
                     $marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
                     $markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
                 }
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index ecb8a3ce764..c04537fa99e 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -236,8 +236,7 @@ if ($socid > 0)
     		$marginRate = ($cumul_achat != 0) ?-1 * (100 * $totalMargin / $cumul_achat) : '';
     		$markRate = ($cumul_vente != 0) ?-1 * (100 * $totalMargin / $cumul_vente) : '';
     	}
-    	else
-    	{
+    	else {
     		$marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
     		$markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
     	}
@@ -255,8 +254,7 @@ if ($socid > 0)
     	print '<td class="right">&nbsp;</td>';
     	print "</tr>\n";
     }
-    else
-    {
+    else {
     	dol_print_error($db);
     }
     print "</table>";
@@ -265,8 +263,7 @@ if ($socid > 0)
     print '<br>';
     $db->free($result);
 }
-else
-{
+else {
 	dol_print_error('', 'Parameter socid not defined');
 }
 
diff --git a/htdocs/mrp/ajax/ajax_bom.php b/htdocs/mrp/ajax/ajax_bom.php
index 19fea01aa60..d5c1355d361 100644
--- a/htdocs/mrp/ajax/ajax_bom.php
+++ b/htdocs/mrp/ajax/ajax_bom.php
@@ -50,7 +50,6 @@ if ($result > 0)
 	unset($object->db);
 	echo json_encode($object);
 }
-else
-{
+else {
    	echo 'Failed to load category with id='.$idbom;
 }
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 89e9b25abef..5cf3d5798f8 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -763,15 +763,13 @@ class Mo extends CommonObject
 			{
 				return $numref;
 			}
-			else
-			{
+			else {
 				$this->error = $obj->error;
 				//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
 		}
-		else
-		{
+		else {
 			print $langs->trans("Error")." ".$langs->trans("Error_MRP_MO_ADDON_NotDefined");
 			return "";
 		}
@@ -817,8 +815,7 @@ class Mo extends CommonObject
 			$this->fetch_product();
 			$num = $this->getNextNumRef($this->product);
 		}
-		else
-		{
+		else {
 			$num = $this->ref;
 		}
 		$this->newref = $num;
@@ -900,8 +897,7 @@ class Mo extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1146,8 +1142,7 @@ class Mo extends CommonObject
 
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -1181,8 +1176,7 @@ class Mo extends CommonObject
 	        $this->errors = $this->errors;
 	        return $result;
 	    }
-	    else
-	    {
+	    else {
 	        $this->lines = $result;
 	        return $this->lines;
 	    }
@@ -1329,8 +1323,7 @@ class Mo extends CommonObject
 			$this->tpl['label'] .= $productstatic->getNomUrl(1);
 			//$this->tpl['label'].= ' - '.$productstatic->label;
 		}
-		else
-		{
+		else {
 			// If origin MRP line is not a product, but another MRP
 			// TODO
 		}
diff --git a/htdocs/mrp/index.php b/htdocs/mrp/index.php
index f0bdc8ba62d..e05a93494f3 100644
--- a/htdocs/mrp/index.php
+++ b/htdocs/mrp/index.php
@@ -137,8 +137,7 @@ if ($conf->use_javascript_ajax)
 
     	print "<br>";
     }
-    else
-    {
+    else {
     	dol_print_error($db);
     }
 }
@@ -196,8 +195,7 @@ if ($resql)
 	print "</table></div>";
 	print "<br>";
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -249,8 +247,7 @@ if ($resql)
     print "</table></div>";
     print "<br>";
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php
index eee839c8a83..5b18f18d1ca 100644
--- a/htdocs/mrp/mo_agenda.php
+++ b/htdocs/mrp/mo_agenda.php
@@ -49,8 +49,7 @@ if (GETPOST('actioncode', 'array'))
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
 }
-else
-{
+else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -217,8 +216,7 @@ if ($object->id > 0)
     	{
         	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
     	}
-    	else
-    	{
+    	else {
         	print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
     	}
     }
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 0e2cc09e811..eda7d0c30ca 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -193,8 +193,7 @@ if (empty($reshook))
     			$object->generateDocument($model, $outputlangs, 0, 0, 0);
     		}
     	}
-    	else
-    	{
+    	else {
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
@@ -625,8 +624,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    		{
 	    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
 	    		}
-	    		else
-	    		{
+	    		else {
 	    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
 	    		}
     		}
@@ -640,8 +638,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    		    {
 	    		        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
 	    		    }
-	    		    else
-	    		    {
+	    		    else {
 	    		    	$langs->load("errors");
 	    		        print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
 	    		    }
@@ -676,8 +673,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		{
     			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete">'.$langs->trans('Delete').'</a>'."\n";
     		}
-    		else
-    		{
+    		else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
     		}
     	}
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index 48031b6f372..9ed658ab1c1 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -184,8 +184,7 @@ if ($object->id)
 
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 4807c47fb53..9866dabf8e0 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -280,8 +280,7 @@ if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit
 {
 	$num = $nbtotalofrecords;
 }
-else
-{
+else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index 2448d43bda7..2ec9f603b84 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -790,8 +790,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print '<td class="center nowraponall">';
 			if ($productlot->id > 0)
 				print $productlot->getNomUrl(1);
-			else
-				print $productlot->batch; // the id may not be defined if movement was entered when lot was not saved or if lot was removed after movement.
+			else print $productlot->batch; // the id may not be defined if movement was entered when lot was not saved or if lot was removed after movement.
 			print '</td>';
 		}
 		if (!empty($arrayfields['pl.eatby']['checked'])) {
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 9f05283345a..6c800446595 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -407,8 +407,7 @@ if (empty($reshook))
     			$object->generateDocument($model, $outputlangs, 0, 0, 0);
     		}
     	}
-    	else
-    	{
+    	else {
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
@@ -593,8 +592,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					{
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
 					}
-					else
-					{
+					else {
 						$langs->load("errors");
 						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
 					}
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index 513c4537358..50bd5d6cdcf 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -410,8 +410,7 @@ class MultiCurrency extends CommonObject
 			$this->rate = $currencyRate;
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->rate = null;
 			$this->errors = $currencyRate->errors;
 			return -1;
@@ -533,8 +532,7 @@ class MultiCurrency extends CommonObject
 		$resql = $db->query($sql1.$sql2.$sql3);
 
 		if ($resql && $obj = $db->fetch_object($resql)) return array($obj->rowid, $obj->rate);
-		else
-		{
+		else {
 			if (!empty($conf->global->MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE))
 			{
 				$resql = $db->query($sql1.$sql3);
@@ -669,8 +667,7 @@ class MultiCurrency extends CommonObject
 
 			return 1;
         }
-		else
-		{
+		else {
 		    dol_syslog("Failed to call endpoint ".$response->error->info, LOG_WARNING);
 			setEventMessages($langs->trans('multicurrency_syncronize_error', $response->error->info), null, 'errors');
 
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 32dde7ddb3e..1a794ac76d9 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -252,8 +252,7 @@ if ($action == 'edit')
 	$doleditor = new DolEditor('nouveauxcommentaires', $object->description, '', 120, 'dolibarr_notes', 'In', 1, 1, 1, ROWS_7, '90%');
 	$doleditor->Create(0, '');
 }
-else
-{
+else {
 	print (dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true));
 }
 print '</td></tr>';
@@ -309,8 +308,7 @@ print '</td></tr>';
 // Expire date
 print '<tr><td>'.$langs->trans('ExpireDate').'</td><td colspan="2">';
 if ($action == 'edit') print $form->selectDate($expiredate ? $expiredate : $object->date_fin, 'expire', 0, 0, 0, '', 1, 0);
-else
-{
+else {
     print dol_print_date($object->date_fin, 'day');
     if ($object->date_fin && $object->date_fin < dol_now() && $object->status == Opensurveysondage::STATUS_VALIDATED) print img_warning($langs->trans("Expired"));
 }
@@ -410,8 +408,7 @@ if ($comments) {
 		print dol_htmlentities($comment->usercomment).': '.dol_nl2br(dol_htmlentities($comment->comment))." <br>";
 	}
 }
-else
-{
+else {
 	print $langs->trans("NoCommentYet").'<br>';
 }
 
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index d9af22ed78e..f7541f2ebe0 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -200,8 +200,7 @@ class Opensurveysondage extends CommonObject
             $this->db->rollback();
             return -1 * $error;
         }
-        else
-        {
+        else {
             $this->db->commit();
             return $this->id;
         }
@@ -263,8 +262,7 @@ class Opensurveysondage extends CommonObject
                 $this->date_m = $this->db->jdate($obj->tls);
                 $ret = 1;
             }
-            else
-            {
+            else {
                 $sondage = ($id ? 'id='.$id : 'sondageid='.$numsurvey);
                 $this->error = 'Fetch no poll found for '.$sondage;
                 dol_syslog($this->error, LOG_ERR);
@@ -273,8 +271,7 @@ class Opensurveysondage extends CommonObject
 
             $this->db->free($resql);
         }
-        else
-        {
+        else {
               $this->error = "Error ".$this->db->lasterror();
             $ret = -1;
         }
@@ -343,8 +340,7 @@ class Opensurveysondage extends CommonObject
             $this->db->rollback();
             return -1 * $error;
         }
-        else
-        {
+        else {
             $this->db->commit();
             return 1;
         }
@@ -409,8 +405,7 @@ class Opensurveysondage extends CommonObject
             $this->db->rollback();
             return -1 * $error;
         }
-        else
-        {
+        else {
             $this->db->commit();
             return 1;
         }
diff --git a/htdocs/opensurvey/exportcsv.php b/htdocs/opensurvey/exportcsv.php
index 34e5b666710..2125ac76774 100644
--- a/htdocs/opensurvey/exportcsv.php
+++ b/htdocs/opensurvey/exportcsv.php
@@ -114,8 +114,7 @@ if ($resql)
 				$input .= 'KO;';
 				$somme[$k]++;
 			}
-			else
-			{
+			else {
 				$input .= ';';
 			}
 		}
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 442fc1b539b..918c8e20ef9 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -191,8 +191,7 @@ if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
 }
-else
-{
+else {
     $sql .= $db->plimit($limit + 1, $offset);
 
     $resql = $db->query($sql);
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index 337ccb3e435..c86c6919f00 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -94,8 +94,7 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 			setEventMessages($langs->trans("VoteNameAlreadyExists"), null, 'errors');
 			$error++;
 		}
-		else
-		{
+		else {
 			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'opensurvey_user_studs (nom, id_sondage, reponses)';
 			$sql .= " VALUES ('".$db->escape($nom)."', '".$db->escape($numsondage)."','".$db->escape($nouveauchoix)."')";
 			$resql = $db->query($sql);
@@ -262,8 +261,7 @@ if (isset($_POST["ajoutercolonne"]) && $object->format == "D")
 
 		$adresseadmin = $object->mail_admin;
 	}
-	else
-	{
+	else {
 		$erreur_ajout_date = "yes";
 	}
 }
@@ -536,8 +534,7 @@ if (GETPOST('ajoutsujet'))
 		print '<input type="submit" class="button" name="retoursondage" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 		print '<br><br>'."\n";
 	}
-	else
-	{
+	else {
 		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 		$formother = new FormOther($db);
@@ -753,8 +750,7 @@ if ($object->format == "D")
 		print '</tr>'."\n";
 	}
 }
-else
-{
+else {
 	// Show titles
 	print '<tr>'."\n";
 	print '<td></td>'."\n";
@@ -841,8 +837,7 @@ while ($compteur < $num)
 			}
 		}
 	}
-	else
-	{
+	else {
 		//sinon on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs
 		if ($compteur == $ligneamodifier)
 		{
@@ -869,8 +864,7 @@ while ($compteur < $num)
 				print '</td>'."\n";
 			}
 		}
-		else
-		{
+		else {
 			for ($i = 0; $i < $nbcolonnes; $i++)
 			{
 				$car = substr($ensemblereponses, $i, 1);
@@ -1065,8 +1059,7 @@ for ($i = 0; $i < $nbcolonnes; $i++)
 				$meilleursujet .= dol_print_date($toutsujet[$i], 'daytext').($toutsujet[$i] ? ' ('.dol_print_date($toutsujet[$i], '%A').')' : '');
 			}
 		}
-		else
-		{
+		else {
 			$tmps = explode('@', $toutsujet[$i]);
 			$meilleursujet .= dol_htmlentities($tmps[0]);
 		}
diff --git a/htdocs/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php
index 17c5bdea251..4254199ec96 100644
--- a/htdocs/opensurvey/wizard/choix_date.php
+++ b/htdocs/opensurvey/wizard/choix_date.php
@@ -320,8 +320,7 @@ if (is_integer($_SESSION["mois"]) && $_SESSION["mois"] > 0 && $_SESSION["mois"]
 {
 	$motmois = dol_print_date(mktime(0, 0, 0, $_SESSION["mois"], 10), '%B');
 }
-else
-{
+else {
 	$motmois = dol_print_date(dol_now(), '%B');
 }
 
diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
index 7bb7861edbe..9752a4c43c4 100644
--- a/htdocs/opensurvey/wizard/create_survey.php
+++ b/htdocs/opensurvey/wizard/create_survey.php
@@ -89,8 +89,7 @@ if (GETPOST("creation_sondage_date") || GETPOST("creation_sondage_autre"))
 			$testdate = true;
 			$_SESSION['champdatefin'] = dol_print_date($champdatefin, 'dayrfc');
 		}
-		else
-		{
+		else {
 			$testdate = true;
 			$_SESSION['champdatefin'] = dol_print_date($champdatefin, 'dayrfc');
 			//$testdate = false;
@@ -193,8 +192,7 @@ if (GETPOST('choix_sondage'))
 	print '<input type="hidden" name="choix_sondage" value="'.GETPOST('choix_sondage').'">';
 	print '<br><input type="submit" class="button" name="submit" value="'.$langs->trans("CreatePoll").' ('.(GETPOST('choix_sondage') == 'date' ? $langs->trans("TypeDate") : $langs->trans("TypeClassic")).')">';
 }
-else
-{
+else {
 	// Show image to selecte between date survey or other survey
 	print '<br><table>'."\n";
 	print '<tr><td>'.$langs->trans("CreateSurveyDate").'</td><td></td> '."\n";
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index 13306deea32..5e21326062c 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -80,8 +80,7 @@ if ($action == 'setvalue' && $user->admin)
   		$db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
   	}
-  	else
-  	{
+  	else {
   		$db->rollback();
 		dol_print_error($db);
     }
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 0af8262c54a..94dff45e543 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -80,8 +80,7 @@ if ($action == 'setvalue' && $user->admin)
   		$db->commit();
   		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
   	}
-  	else
-  	{
+  	else {
   		$db->rollback();
 		dol_print_error($db);
     }
@@ -96,8 +95,7 @@ if ($action == "setlive")
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -152,8 +150,7 @@ if (empty($conf->global->PAYPAL_API_SANDBOX))
     print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=0">';
     print img_picto($langs->trans("Activated"), 'switch_on');
 }
-else
-{
+else {
     print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=1">';
     print img_picto($langs->trans("Disabled"), 'switch_off');
 }
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index ab9ba921e16..6da045aaf4f 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -112,8 +112,7 @@ function getPaypalPaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
         if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
         {
     	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
-            {
+            else {
                 $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
                 if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + order_ref)";
                 if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
@@ -130,8 +129,7 @@ function getPaypalPaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
         if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
         {
     	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
-            {
+            else {
                 $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
                 if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
                 if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
@@ -148,8 +146,7 @@ function getPaypalPaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
         if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
         {
     	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
-            {
+            else {
                 $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
                 if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
                 if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
@@ -166,8 +163,7 @@ function getPaypalPaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
         if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
         {
     	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
-            {
+            else {
                 $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
                 if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + member_ref)";
                 if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
@@ -264,8 +260,7 @@ function print_paypal_redirect($paymentAmount, $currencyCodeType, $paymentType,
         header("Location: ".$payPalURL);
         exit;
     }
-    else
-    {
+    else {
         //Display a user friendly Error on the page using any of the following error information returned by PayPal
         $ErrorCode = urldecode($resArray["L_ERRORCODE0"]);
         $ErrorShortMsg = urldecode($resArray["L_SHORTMESSAGE0"]);
@@ -276,8 +271,7 @@ function print_paypal_redirect($paymentAmount, $currencyCodeType, $paymentType,
         {
         	$mesg .= "PayPal can't accept payments for this thirdparty. An address is defined but is not complete (missing State).<br>Ask system administrator to fix address or to setup Paypal module to accept payments even on not complete addresses (remove option PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS).<br>\n";
         }
-        else
-        {
+        else {
         	$mesg = $langs->trans('SetExpressCheckoutAPICallFailed')."<br>\n";
         	$mesg .= $langs->trans('DetailedErrorMessage').": ".$ErrorLongMsg."<br>\n";
         	$mesg .= $langs->trans('ShortErrorMessage').": ".$ErrorShortMsg."<br>\n";
@@ -352,8 +346,7 @@ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType,
     {
     	$nvpstr = $nvpstr."&NOSHIPPING=1"; // An empty or not complete shipping address will be accepted
     }
-    else
-    {
+    else {
     	$nvpstr = $nvpstr."&NOSHIPPING=0"; // A valid shipping address is required (full required fields mandatory)
     }
     $nvpstr = $nvpstr."&SOLUTIONTYPE=".urlencode($solutionType);
@@ -597,8 +590,7 @@ function hash_call($methodName, $nvpStr)
 	    $API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
 	    $API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
 	}
-	else
-	{
+	else {
 	    $API_Endpoint = "https://api-3t.paypal.com/nvp";
 	    $API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
 	}
@@ -677,8 +669,7 @@ function hash_call($methodName, $nvpStr)
 
         //Execute the Error handling module to display errors.
     }
-    else
-    {
+    else {
         //closing the curl
         curl_close($ch);
     }
diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php
index 8b30e33704d..1c495bdb5ae 100644
--- a/htdocs/paypal/lib/paypalfunctions.lib.php
+++ b/htdocs/paypal/lib/paypalfunctions.lib.php
@@ -53,8 +53,7 @@ if (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'alpha'
 	$API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
 	$API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
 }
-else
-{
+else {
 	$API_Endpoint = "https://api-3t.paypal.com/nvp";
 	$API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
 }
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index ab655d790f6..5282684f81f 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -74,8 +74,7 @@ if ($action == 'setconst' && $user->admin)
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null);
     }
-    else
-    {
+    else {
         $db->rollback();
         dol_print_error($db);
     }
@@ -94,8 +93,7 @@ if ($action == 'setvalue' && $user->admin)
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null);
     }
-    else
-    {
+    else {
         $db->rollback();
         dol_print_error($db);
     }
@@ -162,8 +160,7 @@ if ($mode == 'setup' && $user->admin)
                     {
                         print $langs->trans("IsTokenGenerated");
                     }
-                    else
-                    {
+                    else {
                         print $langs->trans($key['varname']);
                     }
                     print '</td>';
@@ -197,8 +194,7 @@ if ($mode == 'setup' && $user->admin)
                 $tokenobj = null;
                 // Dolibarr storage
                 $storage = new DoliStorage($db, $conf);
-                try
-                {
+                try {
                     $tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME_GOOGLE);
                 }
                 catch (Exception $e)
@@ -268,14 +264,12 @@ if ($mode == 'config' && $user->admin)
         {
             print ajax_constantonoff($printer->active);
         }
-        else
-        {
+        else {
             if (empty($conf->global->{$printer->conf}))
             {
                 print '<a href="'.$_SERVER['PHP_SELF'].'?action=setvalue&amp;varname='.$printer->active.'&amp;value=1">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
             }
-            else
-            {
+            else {
                 print '<a href="'.$_SERVER['PHP_SELF'].'?action=setvalue&amp;varname='.$printer->active.'&amp;value=0">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
             }
         }
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 107bcb4e4e3..c8bc07400b5 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -86,8 +86,7 @@ $morehtml .= '</SELECT>';
 $morehtml .= '<input type="submit" class="button" name="refresh" value="'.$langs->trans("Refresh").'">';
 
 if ($mine) $tooltiphelp = $langs->trans("MyTasksDesc");
-else
-{
+else {
 	if ($user->rights->projet->all->lire && !$socid) $tooltiphelp = $langs->trans("TasksDesc");
 	else $tooltiphelp = $langs->trans("TasksPublicDesc");
 }
@@ -171,8 +170,7 @@ if ($resql)
 
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 print '<tr class="liste_total">';
@@ -228,8 +226,7 @@ if ($resql)
 
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 print '<tr class="liste_total">';
@@ -340,8 +337,7 @@ if (!empty($conf->global->PROJECT_TASK_TIME_MONTH))
     	}
     	$db->free($resql);
     }
-    else
-    {
+    else {
     	dol_print_error($db);
     }
     print '<tr class="liste_total">';
@@ -392,8 +388,7 @@ if (!empty($conf->global->PROJECT_TASK_TIME_YEAR))
 		}
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 	print '<tr class="liste_total">';
@@ -581,8 +576,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 1e0c147c82a..61738d29ebf 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -100,8 +100,7 @@ elseif ($search_usertoprocessid > 0)
 	$usertoprocess->fetch($search_usertoprocessid);
 	$search_usertoprocessid = $usertoprocess->id;
 }
-else
-{
+else {
 	$usertoprocess = new User($db);
 }
 
@@ -194,8 +193,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		$result = $object->fetch($taskid, $ref);
 		if ($result < 0) $error++;
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), '', 'errors');
 		$error++;
 	}
@@ -232,8 +230,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 					}
 				}
 			}
-			else
-			{
+			else {
 				dol_print_error($db);
 			}
 		}
@@ -247,8 +244,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorTaskAlreadyAssigned"), null, 'warnings');
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -306,8 +302,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 				$object->timespent_datehour = dol_mktime(GETPOST($key."hour"), GETPOST($key."min"), 0, $monthofday, $dayofday, $yearofday);
 				$object->timespent_withhour = 1;
 			}
-			else
-			{
+			else {
 				$object->timespent_datehour = dol_mktime(12, 0, 0, $monthofday, $dayofday, $yearofday);
 			}
 			$object->timespent_date = $object->timespent_datehour;
@@ -316,8 +311,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 			{
 				$result = $object->addTimeSpent($user);
 			}
-			else
-			{
+			else {
 				setEventMessages("ErrorBadDate", null, 'errors');
 				$error++;
 				break;
@@ -340,8 +334,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 			exit;
 		}
 	}
-	else
-	{
+	else {
    		setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
 	}
 }
@@ -466,8 +459,7 @@ dol_fiche_head($head, 'inputperday', $langs->trans('TimeSpent'), -1, 'task');
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
 if ($mine || ($usertoprocess->id == $user->id)) print $langs->trans("MyTasksDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
-else
-{
+else {
 	if (empty($usertoprocess->id) || $usertoprocess->id < 0)
 	{
 		if ($user->rights->projet->all->lire && !$socid) print $langs->trans("ProjectsDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
@@ -478,8 +470,7 @@ if ($mine || ($usertoprocess->id == $user->id))
 {
 	print $langs->trans("OnlyYourTaskAreVisible").'<br>';
 }
-else
-{
+else {
 	print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>';
 }
 print '</div>';
@@ -789,8 +780,7 @@ if (count($tasksarray) > 0)
                 </tr>';
 	}
 }
-else
-{
+else {
 	print '<tr><td colspan="14"><span class="opacitymedium">'.$langs->trans("NoAssignedTasks").'</span></td></tr>';
 }
 print "</table>";
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index ae4eed48515..b6466e4ad72 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -103,8 +103,7 @@ elseif ($search_usertoprocessid > 0)
 	$usertoprocess->fetch($search_usertoprocessid);
 	$search_usertoprocessid = $usertoprocess->id;
 }
-else
-{
+else {
 	$usertoprocess = new User($db);
 }
 
@@ -150,8 +149,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		$result = $object->fetch($taskid, $ref);
 		if ($result < 0) $error++;
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), '', 'errors');
 		$error++;
 	}
@@ -189,8 +187,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 					}
 				}
 			}
-			else
-			{
+			else {
 				dol_print_error($db);
 			}
 		}
@@ -204,8 +201,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorTaskAlreadyAssigned"), null, 'warnings');
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -226,8 +222,7 @@ if ($action == 'addtime' && $user->rights->projet->lire)
 	{
 		setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
 	}
-	else
-	{
+	else {
 		foreach ($timetoadd as $taskid => $value)     // Loop on each task
 		{
 			$updateoftaskdone = 0;
@@ -389,8 +384,7 @@ dol_fiche_head($head, 'inputpermonth', $langs->trans('TimeSpent'), -1, 'task');
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
 if ($mine || ($usertoprocess->id == $user->id)) print $langs->trans("MyTasksDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
-else
-{
+else {
 	if (empty($usertoprocess->id) || $usertoprocess->id < 0)
 	{
 		if ($user->rights->projet->all->lire && !$socid) print $langs->trans("ProjectsDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
@@ -401,8 +395,7 @@ if ($mine || ($usertoprocess->id == $user->id))
 {
 	print $langs->trans("OnlyYourTaskAreVisible").'<br>';
 }
-else
-{
+else {
 	print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>';
 }
 print '</div>';
@@ -610,8 +603,7 @@ if (count($tasksarray) > 0)
     	</tr>';
 	}
 }
-else
-{
+else {
 	print '<tr><td colspan="15"><span class="opacitymedium">'.$langs->trans("NoAssignedTasks").'</span></td></tr>';
 }
 print "</table>";
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 3a5ae388f9f..f2342d15787 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -111,8 +111,7 @@ elseif ($search_usertoprocessid > 0)
 	$usertoprocess->fetch($search_usertoprocessid);
 	$search_usertoprocessid = $usertoprocess->id;
 }
-else
-{
+else {
 	$usertoprocess = new User($db);
 }
 
@@ -206,8 +205,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		$result = $object->fetch($taskid, $ref);
 		if ($result < 0) $error++;
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), '', 'errors');
 		$error++;
 	}
@@ -245,8 +243,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 					}
 				}
 			}
-			else
-			{
+			else {
 				dol_print_error($db);
 			}
 		}
@@ -260,8 +257,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorTaskAlreadyAssigned"), null, 'warnings');
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -282,8 +278,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 	{
 		setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
 	}
-	else
-	{
+	else {
 		foreach ($timetoadd as $taskid => $value)     // Loop on each task
 		{
 			$updateoftaskdone = 0;
@@ -482,8 +477,7 @@ dol_fiche_head($head, 'inputperweek', $langs->trans('TimeSpent'), -1, 'task');
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
 if ($mine || ($usertoprocess->id == $user->id)) print $langs->trans("MyTasksDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
-else
-{
+else {
 	if (empty($usertoprocess->id) || $usertoprocess->id < 0)
 	{
 		if ($user->rights->projet->all->lire && !$socid) print $langs->trans("ProjectsDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
@@ -494,8 +488,7 @@ if ($mine || ($usertoprocess->id == $user->id))
 {
 	print $langs->trans("OnlyYourTaskAreVisible").'<br>';
 }
-else
-{
+else {
 	print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>';
 }
 print '</div>';
@@ -838,8 +831,7 @@ if (count($tasksarray) > 0)
     	</tr>';
 	}
 }
-else
-{
+else {
 	print '<tr><td colspan="15"><span class="opacitymedium">'.$langs->trans("NoAssignedTasks").'</span></td></tr>';
 }
 print "</table>";
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index cfd10d2c1fa..77e96a9a616 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -64,8 +64,7 @@ if ($action == 'updateMask')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -83,8 +82,7 @@ if ($action == 'updateMaskTask')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -121,14 +119,12 @@ elseif ($action == 'specimen')
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=project&file=SPECIMEN.pdf");
 			return;
 		}
-		else
-		{
+		else {
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -166,14 +162,12 @@ elseif ($action == 'specimentask')
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=project_task&file=SPECIMEN.pdf");
 			return;
 		}
-		else
-		{
+		else {
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -385,8 +379,7 @@ foreach ($dirmodels as $reldir)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						}
-						else
-						{
+						else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 						}
 						print '</td>';
@@ -405,8 +398,7 @@ foreach ($dirmodels as $reldir)
 							{
 								$htmltooltip .= $nextval.'<br>';
 							}
-							else
-							{
+							else {
 								$htmltooltip .= $langs->trans($module->error).'<br>';
 							}
 						}
@@ -486,8 +478,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 							{
 								print img_picto($langs->trans("Activated"), 'switch_on');
 							}
-							else
-							{
+							else {
 								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodtask&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							}
 							print '</td>';
@@ -506,8 +497,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 								{
 									$htmltooltip .= $nextval.'<br>';
 								}
-								else
-								{
+								else {
 									$htmltooltip .= $langs->trans($module->error).'<br>';
 								}
 							}
@@ -556,8 +546,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -625,8 +614,7 @@ foreach ($dirmodels as $reldir)
 									print '</a>';
 									print "</td>";
 								}
-								else
-								{
+								else {
 									print "<td class=\"center\">\n";
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 									print "</td>";
@@ -638,8 +626,7 @@ foreach ($dirmodels as $reldir)
 								{
 									print img_picto($langs->trans("Default"), 'on');
 								}
-								else
-								{
+								else {
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 								}
 								print '</td>';
@@ -664,8 +651,7 @@ foreach ($dirmodels as $reldir)
 								{
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
 								}
-								else
-								{
+								else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
 								print '</td>';
@@ -713,8 +699,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 			$i++;
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 
@@ -782,8 +767,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 										print '</a>';
 										print "</td>";
 									}
-									else
-									{
+									else {
 										print "<td class=\"center\">\n";
 										print '<a href="'.$_SERVER["PHP_SELF"].'?action=settask&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 										print "</td>";
@@ -795,8 +779,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 									{
 										print img_picto($langs->trans("Default"), 'on');
 									}
-									else
-									{
+									else {
 										print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoctask&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 									}
 									print '</td>';
@@ -821,8 +804,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 									{
 										print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimentask&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
 									}
-									else
-									{
+									else {
 										print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 									}
 									print '</td>';
@@ -863,8 +845,7 @@ if (!$conf->use_javascript_ajax)
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
 }
-else
-{
+else {
 	print '<td width="60" class="right">';
 	$arrval = array('0'=>$langs->trans("No"),
 		'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index c9007dc6d8a..54012b583f1 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -103,8 +103,7 @@ if (empty($reshook))
 				header("Location: index.php");
 				exit;
 			}
-			else
-			{
+			else {
 				dol_syslog($object->error, LOG_DEBUG);
 				setEventMessages($langs->trans("CantRemoveProject", $langs->transnoentitiesnoconv("ProjectOverview")), null, 'errors');
 			}
@@ -184,8 +183,7 @@ if (empty($reshook))
 					$error++;
 				}
 			}
-			else
-			{
+			else {
 				$langs->load("errors");
 				setEventMessages($langs->trans($object->error), null, 'errors');
 				$error++;
@@ -213,21 +211,18 @@ if (empty($reshook))
 					header("Location: ".$backtopage);
 					exit;
 				}
-				else
-				{
+				else {
 					header("Location:card.php?id=".$object->id);
 					exit;
 				}
 			}
-			else
-			{
+			else {
 				$db->rollback();
 
 				$action = 'create';
 			}
 		}
-		else
-		{
+		else {
 			$action = 'create';
 		}
 	}
@@ -335,8 +330,7 @@ if (empty($reshook))
 			$db->rollback();
 			$action = 'edit';
 		}
-		else
-		{
+		else {
 			$db->commit();
 
 			if (GETPOST('socid', 'int') > 0) $object->fetch_thirdparty(GETPOST('socid', 'int'));
@@ -377,8 +371,7 @@ if (empty($reshook))
 			$ret = dol_delete_file($file, 0, 0, 0, $object);
 			if ($ret)
 				setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
-			else
-				setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
+			else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
 			$action = '';
 		}
 	}
@@ -421,8 +414,7 @@ if (empty($reshook))
 			header("Location: list.php?restore_lastsearch_values=1");
 			exit;
 		}
-		else
-		{
+		else {
 			dol_syslog($object->error, LOG_DEBUG);
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -443,8 +435,7 @@ if (empty($reshook))
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-		else
-		{
+		else {
 			// Load new object
 			$newobject = new Project($db);
 			$newobject->fetch($result);
@@ -704,8 +695,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 		print ' &nbsp; &nbsp; ';
 		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 	}
-	else
-	{
+	else {
 		print ' &nbsp; &nbsp; ';
 		print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	}
@@ -985,8 +975,7 @@ elseif ($object->id > 0)
 
 		print '</table>';
 	}
-	else
-	{
+	else {
 		dol_fiche_head($head, 'project', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
 
 		// Project card
@@ -1240,8 +1229,7 @@ elseif ($object->id > 0)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
 				}
-				else
-				{
+				else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Modify').'</a>';
 				}
 			}
@@ -1253,8 +1241,7 @@ elseif ($object->id > 0)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
 				}
-				else
-				{
+				else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Validate').'</a>';
 				}
 			}
@@ -1266,8 +1253,7 @@ elseif ($object->id > 0)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=close">'.$langs->trans("Close").'</a>';
 				}
-				else
-				{
+				else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Close').'</a>';
 				}
 			}
@@ -1279,8 +1265,7 @@ elseif ($object->id > 0)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
 				}
-				else
-				{
+				else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('ReOpen').'</a>';
 				}
 			}
@@ -1347,8 +1332,7 @@ elseif ($object->id > 0)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&action=clone">'.$langs->trans('ToClone').'</a>';
 				}
-				else
-				{
+				else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('ToClone').'</a>';
 				}
 			}
@@ -1360,8 +1344,7 @@ elseif ($object->id > 0)
 				{
 					print '<a class="butActionDelete" href="card.php?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
 				}
-				else
-				{
+				else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Delete').'</a>';
 				}
 			}
@@ -1419,8 +1402,7 @@ elseif ($object->id > 0)
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('mainCardTabAddMore', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 }
-else
-{
+else {
 	print $langs->trans("RecordNotFound");
 }
 
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index f8a076c89ee..77feddb91bd 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -453,8 +453,7 @@ class Projects extends DolibarrApi
         {
             return $this->get($id);
         }
-        else
-        {
+        else {
             throw new RestException(500, $this->project->error);
         }
     }
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index 65060f4d8ff..1a16d9ce199 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -451,8 +451,7 @@ class Tasks extends DolibarrApi
         {
             return $this->get($id);
         }
-        else
-        {
+        else {
             throw new RestException(500, $this->task->error);
         }
     }
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 03aac96db68..8337a625415 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -307,8 +307,7 @@ class Project extends CommonObject
 				// End call triggers
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->errno = $this->db->lasterrno();
 			$error++;
@@ -334,8 +333,7 @@ class Project extends CommonObject
 			$this->db->commit();
 			return $ret;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -442,14 +440,12 @@ class Project extends CommonObject
 					$this->db->commit();
 					$result = 1;
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					$result = -1;
 				}
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror();
 				$this->errors[] = $this->error;
 				$this->db->rollback();
@@ -457,15 +453,13 @@ class Project extends CommonObject
 				{
 					$result = -4;
 				}
-				else
-				{
+				else {
 					$result = -2;
 				}
 				dol_syslog(get_class($this)."::update error ".$result." ".$this->error, LOG_ERR);
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog(get_class($this)."::update ref null");
 			$result = -1;
 		}
@@ -554,8 +548,7 @@ class Project extends CommonObject
 
 			return 0;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -606,12 +599,11 @@ class Project extends CommonObject
 		{
 			$sql = 'SELECT l.rowid, l.fk_user_author as fk_user FROM '.MAIN_DB_PREFIX."loan as l WHERE l.entity IN (".getEntity('loan').") AND l.fk_projet IN (".$ids.")";
 		}
-		else
-		{
+		else {
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$tablename." WHERE ".$projectkey." IN (".$ids.") AND entity IN (".getEntity($type).")";
 		}
 
-		if($dates > 0 && $type == 'loan'){
+		if ($dates > 0 && $type == 'loan'){
 			$sql .= " AND (dateend > '".$this->db->idate($dates)."' OR dateend IS NULL)";
 		}
 		elseif ($dates > 0 && ($type != 'project_task'))	// For table project_taks, we want the filter on date apply on project_time_spent table
@@ -621,7 +613,7 @@ class Project extends CommonObject
 			$sql .= " AND (".$datefieldname." >= '".$this->db->idate($dates)."' OR ".$datefieldname." IS NULL)";
 		}
 
-		if($datee > 0 && $type == 'loan'){
+		if ($datee > 0 && $type == 'loan'){
 			$sql .= " AND (datestart < '".$this->db->idate($datee)."' OR datestart IS NULL)";
 		}
 		elseif ($datee > 0 && ($type != 'project_task'))	// For table project_taks, we want the filter on date apply on project_time_spent table
@@ -655,8 +647,7 @@ class Project extends CommonObject
 			/* Return array even if empty*/
 			return $elements;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -807,8 +798,7 @@ class Project extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
@@ -901,16 +891,14 @@ class Project extends CommonObject
 					$this->db->commit();
 					return 1;
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					$this->error = join(',', $this->errors);
 					dol_syslog(get_class($this)."::setValid ".$this->error, LOG_ERR);
 					return -1;
 				}
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -1;
@@ -961,16 +949,14 @@ class Project extends CommonObject
 					$this->db->commit();
 					return 1;
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					$this->error = join(',', $this->errors);
 					dol_syslog(get_class($this)."::setClose ".$this->error, LOG_ERR);
 					return -1;
 				}
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -1;
@@ -1077,8 +1063,7 @@ class Project extends CommonObject
 			{
 				$url = DOL_URL_ROOT.'/projet/element.php?id='.$this->id;
 			}
-			else
-			{
+			else {
 				$url = DOL_URL_ROOT.'/projet/card.php?id='.$this->id;
 			}
 			// Add param to save lastsearch_values or not
@@ -1199,8 +1184,7 @@ class Project extends CommonObject
 		{
 			$userAccess = 1;
 		}
-		else
-		{
+		else {
 			foreach (array('internal', 'external') as $source)
 			{
 				$userRole = $this->liste_contact(4, $source);
@@ -1272,7 +1256,7 @@ class Project extends CommonObject
 		$resql = $this->db->query($sql2);
 		if ($resql)
 		{
-			while($obj = $this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
 				$listofprojectcontacttype[$obj->rowid]=$obj->code;
 			}
@@ -1325,8 +1309,7 @@ class Project extends CommonObject
 				return $result;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
@@ -1434,8 +1417,7 @@ class Project extends CommonObject
 				$clone_project->note_private = '';
 				$clone_project->note_public = '';
 			}
-			else
-			{
+			else {
 				$this->db->begin();
 				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_public, ENT_QUOTES), '_public');
 				if ($res < 0)
@@ -1444,8 +1426,7 @@ class Project extends CommonObject
 					$error++;
 					$this->db->rollback();
 				}
-				else
-				{
+				else {
 					$this->db->commit();
 				}
 
@@ -1457,8 +1438,7 @@ class Project extends CommonObject
 					$error++;
 					$this->db->rollback();
 				}
-				else
-				{
+				else {
 					$this->db->commit();
 				}
 			}
@@ -1482,8 +1462,7 @@ class Project extends CommonObject
 							$this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
 							$error++;
 						}
-						else
-						{
+						else {
 							if ($clone_project->error != '')
 							{
 								$this->error .= $clone_project->error;
@@ -1515,8 +1494,7 @@ class Project extends CommonObject
 						}
 					}
 				}
-				else
-				{
+				else {
 					$this->error .= $langs->trans('ErrorInternalErrorDetected').':dol_mkdir';
 					$error++;
 				}
@@ -1546,8 +1524,7 @@ class Project extends CommonObject
 						$this->error .= $result_clone->error;
 						$error++;
 					}
-					else
-					{
+					else {
 						$new_task_id = $result_clone;
 						$taskstatic->fetch($tasktoclone->id);
 
@@ -1586,8 +1563,7 @@ class Project extends CommonObject
 			$this->db->commit();
 			return $clone_project_id;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::createFromClone nbError: ".$error." error : ".$this->error, LOG_ERR);
 			return -1;
@@ -1681,8 +1657,7 @@ class Project extends CommonObject
 			$sql .= " SET fk_project=".$this->id;
 			$sql .= " WHERE id=".$elementSelectId;
 		}
-		else
-		{
+		else {
 			$sql .= " SET fk_projet=".$this->id;
 			$sql .= " WHERE rowid=".$elementSelectId;
 		}
@@ -1716,8 +1691,7 @@ class Project extends CommonObject
 		{
 			$sql .= " SET fk_project=NULL";
 			$sql .= " WHERE id=".$elementSelectId;
-		} else
-		{
+		} else {
 			$sql .= " SET ".$projectfield."=NULL";
 			$sql .= " WHERE rowid=".$elementSelectId;
 		}
@@ -1809,8 +1783,7 @@ class Project extends CommonObject
 					$this->weekWorkLoad[$day] = $obj->task_duration;
 					$this->weekWorkLoadPerTask[$day][$obj->fk_task] = $obj->task_duration;
 				}
-				else
-				{
+				else {
 					$this->weekWorkLoad[$day] += $obj->task_duration;
 					$this->weekWorkLoadPerTask[$day][$obj->fk_task] += $obj->task_duration;
 				}
@@ -1820,8 +1793,7 @@ class Project extends CommonObject
 			$this->db->free($resql);
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
@@ -1876,8 +1848,7 @@ class Project extends CommonObject
 					$this->monthWorkLoad[$week_number] = $obj->task_duration;
 					$this->monthWorkLoadPerTask[$week_number][$obj->fk_task] = $obj->task_duration;
 				}
-				else
-				{
+				else {
 					$this->monthWorkLoad[$week_number] += $obj->task_duration;
 					$this->monthWorkLoadPerTask[$week_number][$obj->fk_task] += $obj->task_duration;
 				}
@@ -1887,8 +1858,7 @@ class Project extends CommonObject
 			$this->db->free($resql);
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
@@ -1958,8 +1928,7 @@ class Project extends CommonObject
 
 			return $response;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2017,8 +1986,7 @@ class Project extends CommonObject
 			$this->db->free($resql);
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -2085,8 +2053,7 @@ class Project extends CommonObject
 
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index 22868e96899..1452b0e919f 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -93,8 +93,7 @@ class ProjectStats extends Stats
 					$row[0]
 					);
 				}
-				else
-					$other += $row[1];
+				else $other += $row[1];
 					$i++;
 			}
 			if ($num > $limit)
@@ -282,8 +281,7 @@ class ProjectStats extends Stats
 
 				$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
 			}
-			else
-			{
+			else {
 				dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
 			}
 		}
@@ -294,8 +292,7 @@ class ProjectStats extends Stats
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
 		}
-		else
-		{
+		else {
 			$year = $startyear;
 			while ($year <= $endyear)
 			{
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 41f6a76afb2..cc74e565385 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -226,8 +226,7 @@ class Task extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return $this->id;
 		}
@@ -329,8 +328,7 @@ class Task extends CommonObject
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -440,8 +438,7 @@ class Task extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -544,8 +541,7 @@ class Task extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			//Delete associated link file
 			if ($conf->projet->dir_output)
 			{
@@ -590,8 +586,7 @@ class Task extends CommonObject
 		dol_syslog(get_class($this)."::hasChildren", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-		else
-		{
+		else {
 			$obj = $this->db->fetch_object($resql);
 			if ($obj) $ret = $obj->nb;
 			$this->db->free($resql);
@@ -601,8 +596,7 @@ class Task extends CommonObject
 		{
 			return $ret;
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 	}
@@ -624,8 +618,7 @@ class Task extends CommonObject
 		dol_syslog(get_class($this)."::hasTimeSpent", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-		else
-		{
+		else {
 			$obj = $this->db->fetch_object($resql);
 			if ($obj) $ret = $obj->nb;
 			$this->db->free($resql);
@@ -635,8 +628,7 @@ class Task extends CommonObject
 		{
 			return $ret;
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 	}
@@ -817,8 +809,7 @@ class Task extends CommonObject
 				$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec2";
 				$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
 			}
-			else
-			{
+			else {
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
 				if ($includebilltime)
 				{
@@ -975,8 +966,7 @@ class Task extends CommonObject
 			}
 			$this->db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
@@ -1055,8 +1045,7 @@ class Task extends CommonObject
 			}
 			$this->db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 
@@ -1080,7 +1069,7 @@ class Task extends CommonObject
 		while ($i < $num)
 		{
 			if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];
-			else  $contactAlreadySelected[$i] = $tab[$i]['id'];
+			else $contactAlreadySelected[$i] = $tab[$i]['id'];
 			$i++;
 		}
 		return $contactAlreadySelected;
@@ -1148,8 +1137,7 @@ class Task extends CommonObject
 				// End call triggers
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$ret = -1;
 		}
@@ -1185,8 +1173,7 @@ class Task extends CommonObject
 		{
 			$this->db->commit();
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 		}
 		return $ret;
@@ -1247,8 +1234,7 @@ class Task extends CommonObject
 
 			$this->db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 		return $result;
@@ -1304,8 +1290,7 @@ class Task extends CommonObject
 			$this->db->free($resql);
 			return $result;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return $result;
 		}
@@ -1357,8 +1342,7 @@ class Task extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -1444,8 +1428,7 @@ class Task extends CommonObject
 
 			$this->db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
@@ -1511,8 +1494,7 @@ class Task extends CommonObject
 			}
 			else $ret = 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			$ret = -1;
@@ -1583,8 +1565,7 @@ class Task extends CommonObject
 			{
 				$result = 0;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror();
 				$result = -2;
 			}
@@ -1601,8 +1582,7 @@ class Task extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1715,8 +1695,7 @@ class Task extends CommonObject
 				$clone_task->note_private = '';
 				$clone_task->note_public = '';
 			}
-			else
-			{
+			else {
 				$this->db->begin();
 				$res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_public, ENT_QUOTES), '_public');
 				if ($res < 0)
@@ -1725,8 +1704,7 @@ class Task extends CommonObject
 					$error++;
 					$this->db->rollback();
 				}
-				else
-				{
+				else {
 					$this->db->commit();
 				}
 
@@ -1738,8 +1716,7 @@ class Task extends CommonObject
 					$error++;
 					$this->db->rollback();
 				}
-				else
-				{
+				else {
 					$this->db->commit();
 				}
 			}
@@ -1759,8 +1736,7 @@ class Task extends CommonObject
 					$projectstatic->fetch($project_id);
 					$clone_project_ref = $projectstatic->ref;
 				}
-				else
-				{
+				else {
 					$clone_project_ref = $ori_project_ref;
 				}
 
@@ -1808,8 +1784,7 @@ class Task extends CommonObject
 							$this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
 							$error++;
 						}
-						else
-						{
+						else {
 							if ($clone_task->error != '')
 							{
 								$this->error .= $clone_task->error;
@@ -1834,8 +1809,7 @@ class Task extends CommonObject
 			$this->db->commit();
 			return $clone_task_id;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::createFromClone nbError: ".$error." error : ".$this->error, LOG_ERR);
 			return -1;
@@ -2039,8 +2013,7 @@ class Task extends CommonObject
 
 			return $response;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2088,8 +2061,7 @@ class Task extends CommonObject
 			$this->db->free($resql);
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
diff --git a/htdocs/projet/class/taskstats.class.php b/htdocs/projet/class/taskstats.class.php
index 12d6395af66..1ab6189674a 100644
--- a/htdocs/projet/class/taskstats.class.php
+++ b/htdocs/projet/class/taskstats.class.php
@@ -83,8 +83,7 @@ class TaskStats extends Stats
 						$row[0]
 					);
 				}
-				else
-					$other += $row[1];
+				else $other += $row[1];
 				$i++;
 			}
 			if ($num > $limit)
diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php
index d16dca5ceb1..04e306f9dfb 100644
--- a/htdocs/projet/comment.php
+++ b/htdocs/projet/comment.php
@@ -123,8 +123,7 @@ print '<table class="border centpercent">';
 // Visibility
 print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
 if ($object->public) print $langs->trans('SharedProject');
-else
-	print $langs->trans('PrivateProject');
+else print $langs->trans('PrivateProject');
 print '</td></tr>';
 
 // Date start - end
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 93ced9392c4..fde1563eac2 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -74,15 +74,13 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -95,8 +93,7 @@ if ($action == 'swapstatut' && $user->rights->projet->creer)
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne', 'int'));
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -112,8 +109,7 @@ if (($action == 'deleteline' || $action == 'deletecontact') && $user->rights->pr
 		header("Location: contact.php?id=".$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 9b4c852100d..5b0409d7246 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -158,8 +158,7 @@ if ($object->id > 0)
 	$permtoedit = ($userWrite > 0);
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	dol_print_error('', 'NoRecordFound');
 }
 
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 23fa6551656..3907259e230 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -528,24 +528,24 @@ $listofreferent = array(
 
 // Change rules for benefit calculation
 if (! empty($conf->global->PROJECT_ELEMENTS_FOR_PLUS_MARGIN)) {
-	foreach($listofreferent as $key => $element) {
+	foreach ($listofreferent as $key => $element) {
 		if ($listofreferent[$key]['margin'] == 'add') {
 			unset($listofreferent[$key]['margin']);
 		}
 	}
 	$newelementforplusmargin = explode(',', $conf->global->PROJECT_ELEMENTS_FOR_PLUS_MARGIN);
-	foreach($newelementforplusmargin as $value) {
+	foreach ($newelementforplusmargin as $value) {
 		$listofreferent[$value]['margin']='add';
 	}
 }
 if (! empty($conf->global->PROJECT_ELEMENTS_FOR_MINUS_MARGIN)) {
-	foreach($listofreferent as $key => $element) {
+	foreach ($listofreferent as $key => $element) {
 		if ($listofreferent[$key]['margin'] == 'add') {
 			unset($listofreferent[$key]['margin']);
 		}
 	}
 	$newelementforplusmargin = explode(',', $conf->global->PROJECT_ELEMENTS_FOR_MINUS_MARGIN);
-	foreach($newelementforplusmargin as $value) {
+	foreach ($newelementforplusmargin as $value) {
 		$listofreferent[$value]['margin']='minus';
 	}
 }
@@ -686,8 +686,7 @@ foreach ($listofreferent as $key => $value)
 						$tmp = $element->getSumOfAmount($elementuser, $dates, $datee);
 						$total_ht_by_line = price2num($tmp['amount'], 'MT');
 					}
-					else
-					{
+					else {
 						$tmp = $element->getSumOfAmount('', $dates, $datee);
 						$total_ht_by_line = price2num($tmp['amount'], 'MT');
 					}
@@ -953,8 +952,7 @@ foreach ($listofreferent as $key => $value)
 				{
 					if (method_exists($element, 'fetch_thirdparty')) $element->fetch_thirdparty();
 				}
-				else
-				{
+				else {
 					$expensereport = new ExpenseReport($db);
 					$expensereport->fetch($element->fk_expensereport);
 				}
@@ -1000,8 +998,7 @@ foreach ($listofreferent as $key => $value)
 				{
 					print $expensereport->getNomUrl(1);
 				}
-				else
-				{
+				else {
 					// Show ref with link
 					if ($element instanceof Task)
 					{
@@ -1054,8 +1051,7 @@ foreach ($listofreferent as $key => $value)
     				elseif ($tablename == 'supplier_proposal') $date = $element->date_validation; // There is no other date for this
     				elseif ($tablename == 'fichinter') $date = $element->datev; // There is no other date for this
     				elseif ($tablename == 'projet_task') $date = ''; // We show no date. Showing date of beginning of task make user think it is date of time consumed
-					else
-					{
+					else {
     					$date = $element->date; // invoice, ...
     					if (empty($date)) $date = $element->date_contrat;
     					if (empty($date)) $date = $element->datev;
@@ -1145,14 +1141,12 @@ foreach ($listofreferent as $key => $value)
     							$warning = $langs->trans("WarningSomeLinesWithNullHourlyRate", $conf->currency);
     						}
 					    }
-					    else
-					    {
+					    else {
 					        $othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
 					    }
 					}
                     elseif ($key == 'loan') $total_ht_by_line = $element->capital;
-					else
-					{
+					else {
 						$total_ht_by_line = $element->total_ht;
 					}
 
@@ -1193,14 +1187,12 @@ foreach ($listofreferent as $key => $value)
     						$defaultvat = get_default_tva($mysoc, $mysoc);
     						$total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)), 'MT');
 					    }
-					    else
-					    {
+					    else {
 					        $othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
 					    }
 					}
                     elseif ($key == 'loan') $total_ttc_by_line = $element->capital - $element->getSumPayment();
-					else
-					{
+					else {
 						$total_ttc_by_line = $element->total_ttc;
 					}
 
@@ -1248,8 +1240,7 @@ foreach ($listofreferent as $key => $value)
 				{
 					print $element->getLibStatut(3);
 				}
-				else
-				{
+				else {
 					print $element->getLibStatut(5);
 				}
 				print '</td>';
@@ -1324,8 +1315,7 @@ foreach ($listofreferent as $key => $value)
 			print '<td>&nbsp;</td>';
 			print '</tr>';
 		}
-		else
-		{
+		else {
 			if (!is_array($elementarray))	// error
 			{
 				print $elementarray;
diff --git a/htdocs/projet/ganttchart.inc.php b/htdocs/projet/ganttchart.inc.php
index babacbd27bf..5f88db6344d 100644
--- a/htdocs/projet/ganttchart.inc.php
+++ b/htdocs/projet/ganttchart.inc.php
@@ -196,8 +196,7 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level = 0, $proje
 	{
 		$parent = '-'.$project_id;
 	}
-	else
-	{
+	else {
 		$parent = $task["task_parent_alternate_id"];
 		//$parent = $task["task_parent"];
 	}
@@ -209,8 +208,7 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level = 0, $proje
 		//$link=DOL_URL_ROOT.'/projet/tasks.php?withproject=1&id='.abs($task["task_id"]);
 		$link = '';
 	}
-	else
-	{
+	else {
 		$link = DOL_URL_ROOT.'/projet/tasks/contact.php?withproject=1&id='.$task["task_id"];
 	}
 
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 314f945e604..2cecf9c85ba 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -380,14 +380,12 @@ if (count($tasksarray) > 0)
 
 		print '</div>';
 	}
-	else
-	{
+	else {
 		$langs->load("admin");
 		print $langs->trans("AvailableOnlyIfJavascriptAndAjaxNotDisabled");
 	}
 }
-else
-{
+else {
 	print '<div class="opacitymedium">'.$langs->trans("NoTasks").'</div>';
 }
 
diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php
index 8d0e7bb1e02..90f172f2fe2 100644
--- a/htdocs/projet/graph_opportunities.inc.php
+++ b/htdocs/projet/graph_opportunities.inc.php
@@ -99,8 +99,7 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 
 	    print "<br>";
 	}
-	else
-	{
+	else {
 	    dol_print_error($db);
 	}
 }
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index f9cab81f43c..261b7529907 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -89,8 +89,7 @@ $morehtml .= '<input type="submit" class="button" name="refresh" value="'.$langs
 $morehtml .= '</form>';
 
 if ($mine) $tooltiphelp = $langs->trans("MyProjectsDesc");
-else
-{
+else {
 	if (!empty($user->rights->projet->all->lire) && !$socid) $tooltiphelp = $langs->trans("ProjectsDesc");
 	else $tooltiphelp = $langs->trans("ProjectsPublicDesc");
 }
@@ -328,8 +327,7 @@ if ($resql)
 
 			print $companystatic->getNomUrl(1);
 		}
-		else
-		{
+		else {
 			print $langs->trans("OthersNotLinkedToThirdParty");
 		}
 		print '</td>';
@@ -354,8 +352,7 @@ if ($resql)
 
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 print "</table>";
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index 0058a5a94dd..772188ec261 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -53,8 +53,7 @@ if (GETPOST('actioncode', 'array'))
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
 }
-else
-{
+else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 43d0e0b7f7f..98d9d49fd8e 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -234,8 +234,7 @@ if (empty($reshook))
                     setEventMessages($langs->trans("DontHaveTheValidateStatus", $objecttmp->ref), null, 'warnings');
                 }
             }
-            else
-            {
+            else {
                 setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
                 $error++;
                 break;
@@ -248,8 +247,7 @@ if (empty($reshook))
             else setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
             $db->commit();
         }
-        else
-        {
+        else {
             $db->rollback();
         }
     }
@@ -459,8 +457,7 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 // Show description of content
 $texthelp = '';
 if ($search_project_user == $user->id) $texthelp .= $langs->trans("MyProjectsDesc");
-else
-{
+else {
     if ($user->rights->projet->all->lire && !$socid) $texthelp .= $langs->trans("ProjectsDesc");
     else $texthelp .= $langs->trans("ProjectsPublicDesc");
 }
@@ -753,8 +750,7 @@ while ($i < min($num, $limit))
 			{
 				print $socstatic->getNomUrl(1);
 			}
-			else
-			{
+			else {
 				print '&nbsp;';
 			}
 			print '</td>';
@@ -795,8 +791,7 @@ while ($i < min($num, $limit))
 				}
 				//else print $langs->trans("NoSalesRepresentativeAffected");
 			}
-			else
-			{
+			else {
 				print '&nbsp';
 			}
 			print '</td>';
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index ebc6a7dc556..c70a9b042d5 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -274,16 +274,14 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 			{
 				$result = $task->add_contact($_POST["userid"], 'TASKEXECUTIVE', 'internal');
 			}
-			else
-			{
+			else {
 				if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("projects");
 					setEventMessages($langs->trans('NewTaskRefSuggested'), '', 'warnings');
 					$duplicate_code_error = true;
 				}
-				else
-				{
+				else {
 					setEventMessages($task->error, $task->errors, 'errors');
 				}
 				$action = 'create';
@@ -306,8 +304,7 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 			$id = $projectid;
 		}
 	}
-	else
-	{
+	else {
 		if (!empty($backtopage))
 		{
 			header("Location: ".$backtopage);
@@ -508,8 +505,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 		print $langs->trans("WarningProjectClosed");
 		print '</div>';
 	}
-	else
-	{
+	else {
 		print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="createtask">';
@@ -537,8 +533,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 		{
 			print (GETPOSTISSET("ref") ?GETPOST("ref", 'alpha') : $defaultref);
 		}
-		else
-		{
+		else {
 			print $defaultref;
 		}
 		print '<input type="hidden" name="taskref" value="'.($_POST["ref"] ? $_POST["ref"] : $defaultref).'">';
@@ -559,8 +554,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 		{
 			print $form->select_dolusers($user->id, 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, '', 'maxwidth300');
 		}
-		else
-		{
+		else {
 			print $langs->trans("NoUserAssignedToTheProject");
 		}
 		print '</td></tr>';
@@ -812,8 +806,7 @@ elseif ($id > 0 || !empty($ref))
 		$j = 0; $level = 0;
 		$nboftaskshown = projectLinesa($j, 0, $tasksarray, $level, true, 0, $tasksrole, $object->id, 1, $object->id, $filterprogresscalc, ($object->usage_bill_time ? 1 : 0), $arrayfields);
 	}
-	else
-	{
+	else {
 		$colspan = 10;
 		if ($object->usage_bill_time) $colspan += 2;
 		print '<tr class="oddeven nobottom"><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoTasks").'</span></td></tr>';
@@ -837,8 +830,7 @@ elseif ($id > 0 || !empty($ref))
 				cleanCorruptedTree($db, 'projet_task', 'fk_task_parent');
 			}
 		}
-		else
-		{
+		else {
 			if ($nboftaskshown < count($tasksarray) && !GETPOST('search_user_id', 'int'))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php
index 82b4d8fdc10..905a6adedbf 100644
--- a/htdocs/projet/tasks/comment.php
+++ b/htdocs/projet/tasks/comment.php
@@ -75,8 +75,7 @@ if (!empty($project_ref) && !empty($withproject))
 		{
 			$id = $objectsarray[0]->id;
 		}
-		else
-		{
+		else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode) ? '' : '&mode='.$mode));
 		}
 	}
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 415859127db..303ee19425a 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -69,8 +69,7 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
     		{
     			dol_print_error($db, $projectstatic->error, $projectstatic->errors);
     		}
-    		else
-    		{
+    		else {
     			$contactsofproject = $projectstatic->getListContactId('internal');
     			foreach ($contactsofproject as $key => $val)
     			{
@@ -78,8 +77,7 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
     			}
     		}
     	}
-    	else
-    	{
+    	else {
   			$result = $object->add_contact($idfortaskuser, GETPOST("type"), GETPOST("source"));
     	}
     }
@@ -89,15 +87,13 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id.($withproject ? '&withproject=1' : ''));
 		exit;
 	}
-	else
-	{
+	else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -110,8 +106,7 @@ if ($action == 'swapstatut' && $user->rights->projet->creer)
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -127,8 +122,7 @@ if ($action == 'deleteline' && $user->rights->projet->creer)
 		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id.($withproject ? '&withproject=1' : ''));
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -143,8 +137,7 @@ if (!empty($project_ref) && !empty($withproject))
 		{
 			$id = $tasksarray[0]->id;
 		}
-		else
-		{
+		else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject ? '&withproject=1' : '').(empty($mode) ? '' : '&mode='.$mode));
 			exit;
 		}
@@ -546,8 +539,7 @@ if ($id > 0 || !empty($ref))
 		}
 		print "</table>";
 	}
-	else
-	{
+	else {
 		print "ErrorRecordNotFound";
 	}
 }
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index bd4335f747f..80183db3d60 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -80,8 +80,7 @@ if (!empty($project_ref) && !empty($withproject))
 			$id = $tasksarray[0]->id;
 			$object->fetch($id);
 		}
-		else
-		{
+		else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject ? '&withproject=1' : '').(empty($mode) ? '' : '&mode='.$mode));
 			exit;
 		}
@@ -104,8 +103,7 @@ if ($id > 0 || !empty($ref))
 
 		$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -319,8 +317,7 @@ if ($object->id > 0)
 	$relativepathwithnofile = dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref).'/';
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	header('Location: index.php');
 	exit;
 }
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 0aefa412571..c25546bccbf 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -437,8 +437,7 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 // Show description of content
 $texthelp = '';
 if ($search_task_user == $user->id) $texthelp .= $langs->trans("MyTasksDesc");
-else
-{
+else {
     if ($user->rights->projet->all->lire && !$socid) $texthelp .= $langs->trans("TasksOnProjectsDesc");
     else $texthelp .= $langs->trans("TasksOnProjectsPublicDesc");
 }
@@ -754,8 +753,7 @@ while ($i < min($num, $limit))
 				$socstatic->name = $obj->name;
 				print $socstatic->getNomUrl(1);
 			}
-			else
-			{
+			else {
 				print '&nbsp;';
 			}
 			print '</td>';
@@ -857,8 +855,7 @@ while ($i < min($num, $limit))
 		        $totalarray['val']['t.tobill'] += $obj->tobill;
 		        $totalarray['totaltobill'] += $obj->tobill;
 		    }
-		    else
-		    {
+		    else {
 		        print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
 		    }
 		    print '</td>';
@@ -876,8 +873,7 @@ while ($i < min($num, $limit))
 		        $totalarray['val']['t.billed'] += $obj->billed;
 		        $totalarray['totalbilled'] += $obj->billed;
 		    }
-		    else
-		    {
+		    else {
 		        print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
 		    }
 		    print '</td>';
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 4967257570e..737346570f4 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -58,8 +58,7 @@ if ($id > 0 || !empty($ref))
 
 		$object->project = clone $projectstatic;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -76,8 +75,7 @@ if (!empty($project_ref) && !empty($withproject))
 			$id = $tasksarray[0]->id;
 			$object->fetch($id);
 		}
-		else
-		{
+		else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode) ? '' : '&mode='.$mode));
 		}
 	}
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index da15a73f66f..93f3ca3b01e 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -114,8 +114,7 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->projet->creer)
 			}
 		}
 	}
-	else
-	{
+	else {
 		$action = 'edit';
 	}
 }
@@ -132,8 +131,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->s
 			header('Location: '.DOL_URL_ROOT.'/projet/tasks.php?restore_lastsearch_values=1&id='.$projectstatic->id.($withproject ? '&withproject=1' : ''));
 			exit;
 		}
-		else
-		{
+		else {
 		    setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
@@ -150,8 +148,7 @@ if (!empty($project_ref) && !empty($withproject))
 		{
 			$id = $tasksarray[0]->id;
 		}
-		else
-		{
+		else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode) ? '' : '&mode='.$mode));
 		}
 	}
@@ -463,8 +460,7 @@ if ($id > 0 || !empty($ref))
 
 			print '</form>';
 		}
-		else
-		{
+		else {
 			/*
 			 * Fiche tache en mode visu
 			 */
@@ -606,8 +602,7 @@ if ($id > 0 || !empty($ref))
 				{
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit&amp;withproject='.$withproject.'">'.$langs->trans('Modify').'</a>';
 				}
-				else
-				{
+				else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Modify').'</a>';
 				}
 
@@ -618,13 +613,11 @@ if ($id > 0 || !empty($ref))
 				    {
 						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;withproject='.$withproject.'">'.$langs->trans('Delete').'</a>';
 				    }
-				    else
-				    {
+				    else {
 				        print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("TaskHasChild").'">'.$langs->trans('Delete').'</a>';
 				    }
 				}
-				else
-				{
+				else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
 				}
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 78f5039fe8a..95c50b9b62d 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -155,16 +155,14 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 		{
 			$object->fetch($id, $ref);
 		}
-		else
-		{
+		else {
 			if (!GETPOST('taskid', 'int') || GETPOST('taskid', 'int') < 0)
 			{
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), null, 'errors');
 				$action = 'createtime';
 				$error++;
 			}
-			else
-			{
+			else {
 				$object->fetch(GETPOST('taskid', 'int'));
 			}
 		}
@@ -179,8 +177,7 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 				$action = 'createtime';
 				$error++;
 			}
-			else
-			{
+			else {
 				$object->timespent_note = $_POST["timespent_note"];
 				if (GETPOST('progress', 'int') > 0) $object->progress = GETPOST('progress', 'int'); // If progress is -1 (not defined), we do not change value
 				$object->timespent_duration = $_POST["timespent_durationhour"] * 60 * 60; // We store duration in seconds
@@ -190,8 +187,7 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 					$object->timespent_date = dol_mktime(GETPOST("timehour"), GETPOST("timemin"), 0, GETPOST("timemonth"), GETPOST("timeday"), GETPOST("timeyear"));
 					$object->timespent_withhour = 1;
 				}
-				else
-				{
+				else {
 					$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timemonth"), GETPOST("timeday"), GETPOST("timeyear"));
 				}
 				$object->timespent_fk_user = $_POST["userid"];
@@ -200,16 +196,14 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 				{
 					setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 				}
-				else
-				{
+				else {
 					setEventMessages($langs->trans($object->error), null, 'errors');
 					$error++;
 				}
 			}
 		}
 	}
-	else
-	{
+	else {
 		if (empty($id)) $action = 'createtime';
 		else $action = 'createtime';
 	}
@@ -245,8 +239,7 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$_POST["cancel
 				$object->timespent_date = dol_mktime(GETPOST("timelinehour"), GETPOST("timelinemin"), 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 				$object->timespent_withhour = 1;
 			}
-			else
-			{
+			else {
 				$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 			}
 			$object->timespent_fk_user = $_POST["userid_line"];
@@ -255,14 +248,12 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$_POST["cancel
 			{
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			}
-			else
-			{
+			else {
 				setEventMessages($langs->trans($object->error), null, 'errors');
 				$error++;
 			}
 		}
-		else
-		{
+		else {
 			$object->fetch($id, $ref);
 			// TODO Check that ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids))
 
@@ -276,8 +267,7 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$_POST["cancel
 				$object->timespent_date = dol_mktime(GETPOST("timelinehour"), GETPOST("timelinemin"), 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 				$object->timespent_withhour = 1;
 			}
-			else
-			{
+			else {
 				$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 			}
 			$object->timespent_fk_user = $_POST["userid_line"];
@@ -287,15 +277,13 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$_POST["cancel
 			{
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			}
-			else
-			{
+			else {
 				setEventMessages($langs->trans($object->error), null, 'errors');
 				$error++;
 			}
 		}
 	}
-	else
-	{
+	else {
 		$action = '';
 	}
 }
@@ -313,8 +301,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->l
 		$error++;
 		$action = '';
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 	}
 }
@@ -329,8 +316,7 @@ if (!empty($project_ref) && !empty($withproject))
 		{
 			$id = $tasksarray[0]->id;
 		}
-		else
-		{
+		else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject ? '&withproject=1' : '').(empty($mode) ? '' : '&mode='.$mode));
 			exit;
 		}
@@ -368,8 +354,7 @@ if ($action == 'confirm_generateinvoice')
 	{
 		setEventMessages($langs->trans("ThirdPartyRequiredToGenerateInvoice"), null, 'errors');
 	}
-	else
-	{
+	else {
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -408,8 +393,7 @@ if ($action == 'confirm_generateinvoice')
 			$localtax1 = $dataforprice['localtax1'];
 			$localtax2 = $dataforprice['localtax2'];
 		}
-		else
-		{
+		else {
 			$pu_ht = 0;
 			$txtva = get_default_tva($mysoc, $projectstatic->thirdparty);
 			$localtax1 = get_default_localtax($mysoc, $projectstatic->thirdparty, 1);
@@ -570,8 +554,7 @@ if ($action == 'confirm_generateinvoice')
 
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 		}
 	}
@@ -760,14 +743,13 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					$backtourl = $_SERVER['PHP_SELF'].'?projectid='.$projectstatic->id.($withproject ? '&withproject=1' : '');
 					$linktocreatetimeUrl = $_SERVER['PHP_SELF'].'?'.($withproject ? 'withproject=1' : '').'&projectid='.$projectstatic->id.'&action=createtime'.$param.'&backtopage='.urlencode($backtourl);
 				}
-				else									// We are on tab 'Time Spent' of task
+				else // We are on tab 'Time Spent' of task
 				{
 					$backtourl = $_SERVER['PHP_SELF'].'?id='.$object->id.($withproject ? '&withproject=1' : '');
 					$linktocreatetimeUrl = $_SERVER['PHP_SELF'].'?'.($withproject ? 'withproject=1' : '').($object->id > 0 ? '&id='.$object->id : '&projectid='.$projectstatic->id).'&action=createtime'.$param.'&backtopage='.urlencode($backtourl);
 				}
 			}
-			else
-			{
+			else {
 				$linktocreatetimeBtnStatus = -2;
 				$linktocreatetimeHelpText = $langs->trans("NotOwnerOfProject");
 			}
@@ -1070,8 +1052,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		{
 			$num = $nbtotalofrecords;
 		}
-		else
-		{
+		else {
 			$sql .= $db->plimit($limit + 1, $offset);
 
 			$resql = $db->query($sql);
@@ -1094,8 +1075,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 
 				print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $linktocreatetime, '', $limit);
 			}
-			else
-			{
+			else {
 				print '<!-- List of time spent for project -->'."\n";
 
 				$title = $langs->trans("ListTaskTimeForTask");
@@ -1112,8 +1092,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			}
 			$db->free($resql);
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 
@@ -1172,8 +1151,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				if ($projectstatic->public) $contactsofproject = array();
 				print $form->select_dolusers((GETPOST('userid', 'int') ? GETPOST('userid', 'int') : $userid), 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, $langs->trans("ResourceNotAssignedToProject"), 'maxwidth200');
 			}
-			else
-			{
+			else {
 				if ($nboftasks) {
 					print img_error($langs->trans('FirstAddRessourceToAllocateTime')).' '.$langs->trans('FirstAddRessourceToAllocateTime');
 				}
@@ -1335,8 +1313,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					}
 					else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
 				}
-				else
-				{
+				else {
 					print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
 				}
 				print '</td>';
@@ -1353,8 +1330,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					{
 						$formproject->selectTasks(-1, GETPOST('taskid', 'int') ?GETPOST('taskid', 'int') : $task_time->fk_task, 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, '');
 					}
-					else
-					{
+					else {
 						$tasktmp->id = $task_time->fk_task;
 						$tasktmp->ref = $task_time->ref;
 						$tasktmp->label = $task_time->label;
@@ -1395,8 +1371,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 						print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
 					}
 				}
-				else
-				{
+				else {
 					$userstatic->id = $task_time->fk_user;
 					$userstatic->lastname = $task_time->lastname;
 					$userstatic->firstname = $task_time->firstname;
@@ -1416,8 +1391,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				{
 					print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
 				}
-				else
-				{
+				else {
 					print dol_nl2br($task_time->note);
 				}
 				print '</td>';
@@ -1437,8 +1411,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					print '<input type="hidden" name="old_duration" value="'.$task_time->task_duration.'">';
 					print $form->select_duration('new_duration', $task_time->task_duration, 0, 'text');
 				}
-				else
-				{
+				else {
 					print convertSecondToTime($task_time->task_duration, 'allhourmin');
 				}
 				print '</td>';
@@ -1479,13 +1452,11 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 								print $tmpinvoice->getNomUrl(1);
 							}
 						}
-						else
-						{
+						else {
 							print $langs->trans("No");
 						}
 					}
-					else
-					{
+					else {
 						print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
 					}
 				}
@@ -1569,8 +1540,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 						}
 						else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
 					}
-					else
-					{
+					else {
 						print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
 					}
 					print '</td>';
@@ -1619,8 +1589,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 							print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
 						}
 					}
-					else
-					{
+					else {
 						$userstatic->id = $task_time->fk_user;
 						$userstatic->lastname = $task_time->lastname;
 						$userstatic->firstname = $task_time->firstname;
@@ -1639,8 +1608,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					{
 						print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
 					}
-					else
-					{
+					else {
 						print dol_nl2br($task_time->note);
 					}
 					print '</td>';
@@ -1659,8 +1627,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 						print '<input type="hidden" name="old_duration" value="'.$task_time->task_duration.'">';
 						print $form->select_duration('new_duration', $task_time->task_duration, 0, 'text');
 					}
-					else
-					{
+					else {
 						print convertSecondToTime($task_time->task_duration, 'allhourmin');
 					}
 					print '</td>';
@@ -1717,8 +1684,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 						}
 						else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline_2', 1, 1, 2, "timespent_date", 1, 0);
 					}
-					else
-					{
+					else {
 						print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
 					}
 					print '</td>';
@@ -1767,8 +1733,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 							print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
 						}
 					}
-					else
-					{
+					else {
 						$userstatic->id = $task_time->fk_user;
 						$userstatic->lastname = $task_time->lastname;
 						$userstatic->firstname = $task_time->firstname;
@@ -1787,8 +1752,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					{
 						print '<textarea name="timespent_note_line_2" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
 					}
-					else
-					{
+					else {
 						print dol_nl2br($task_time->note);
 					}
 					print '</td>';
@@ -1807,8 +1771,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 						print '<input type="hidden" name="old_duration_2" value="0">';
 						print $form->select_duration('new_duration_2', 0, 0, 'text');
 					}
-					else
-					{
+					else {
 						print convertSecondToTime($task_time->task_duration, 'allhourmin');
 					}
 					print '</td>';
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index a7eef6c2ede..ff8611ee0a4 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -189,8 +189,7 @@ if ($format == 'ical' || $format == 'vcal')
 		//header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
 	}
-	else
-	{
+	else {
 		print 'Error '.$agenda->error;
 
 		exit;
@@ -227,8 +226,7 @@ if ($format == 'rss')
 		// header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
 	}
-	else
-	{
+	else {
 		print 'Error '.$agenda->error;
 
 		exit;
diff --git a/htdocs/public/cron/cron_run_jobs.php b/htdocs/public/cron/cron_run_jobs.php
index 1cfe1d4b0b3..13419207e07 100644
--- a/htdocs/public/cron/cron_run_jobs.php
+++ b/htdocs/public/cron/cron_run_jobs.php
@@ -91,8 +91,7 @@ if ($result < 0)
 	dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
 	exit;
 }
-else
-{
+else {
 	if (empty($user->id))
 	{
 		echo " User login:".$userlogin." do not exists";
@@ -168,8 +167,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 		            dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
 		            exit(-1);
 		        }
-		        else
-		        {
+		        else {
 		            if ($result == 0)
 		            {
 		                echo "\nUser login: ".$userlogin." does not exists for entity ".$conf->entity."\n";
@@ -207,8 +205,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 			    dol_syslog("cron_run_jobs.php::run_jobs Error".$cronjob->error, LOG_ERR);
 				$nbofjobslaunchedko++;
 			}
-			else
-			{
+			else {
 				$nbofjobslaunchedok++;
 			}
 
@@ -226,8 +223,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 
 			echo " - reprogrammed\n";
 		}
-		else
-		{
+		else {
 		    echo " - not qualified\n";
 
 		    dol_syslog("cron_run_jobs.php job not qualified line->datenextrun:".dol_print_date($line->datenextrun, 'dayhourrfc')." line->datestart:".dol_print_date($line->datestart, 'dayhourrfc')." line->dateend:".dol_print_date($line->dateend, 'dayhourrfc')." now:".dol_print_date($now, 'dayhourrfc'));
@@ -238,8 +234,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 
 	echo "Result: ".($nbofjobs)." jobs - ".($nbofjobslaunchedok + $nbofjobslaunchedko)." launched = ".$nbofjobslaunchedok." OK + ".$nbofjobslaunchedko." KO";
 }
-else
-{
+else {
 	echo "Result: No active jobs found.";
 }
 
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index f0caf948770..7e4f1b1b0d7 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -144,8 +144,7 @@ foreach ($modulesdir as $dir)
 
                 if ($modName)
                 {
-		            try
-		            {
+		            try {
                         include_once $dir.$file;
                         $objMod = new $modName($db);
 
@@ -153,8 +152,7 @@ foreach ($modulesdir as $dir)
                         {
                             $j = $objMod->numero;
                         }
-                        else
-                        {
+                        else {
                             $j = 1000 + $i;
                         }
 
@@ -381,8 +379,7 @@ foreach ($demoprofiles as $profilearray)
                     print "\n".'<!-- Module '.$modulekeyname.' hidden and always checked -->';
                     print '<input type="hidden" name="'.$modulekeyname.'" value="1">';
                 }
-                else
-                {
+                else {
                     $modulo = ($j % $nbcolsmod);
         		    //if ($modulo == 0) print '<tr>';
                     print '<!-- id='.$val->numero.' -->';
@@ -435,8 +432,7 @@ if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AD_CLIEN
 		print '</script>'."\n";
 		print '</div>'."\n";
 	}
-	else
-	{
+	else {
 		print '<!-- google js advert tag disabled with jmobile -->'."\n";
 	}
 }
diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php
index c92108d7723..045f726fe1d 100644
--- a/htdocs/public/donations/donateurs_code.php
+++ b/htdocs/public/donations/donateurs_code.php
@@ -88,8 +88,7 @@ if ($resql)
 			{
 				print "<td>".dolGetFirstLastname($objp->firstname, $objp->lastname)." ".$objp->societe."</td>\n";
 			}
-			else
-			{
+			else {
 				print "<td>Anonyme Anonyme</td>\n";
 			}
 			print "<td>".dol_print_date($db->jdate($objp->datedon))."</td>\n";
@@ -99,13 +98,11 @@ if ($resql)
 		}
 		print "</table>";
 	}
-	else
-	{
+	else {
 		print "Aucun don publique";
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 7f788a84671..71e28c94da8 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -391,8 +391,7 @@ if ($action == 'add')
                         {
                     	    $urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
                         }
-                        else
-                        {
+                        else {
                             $urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
                         }
                     }
@@ -408,8 +407,7 @@ if ($action == 'add')
                     	{
                     		$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
                     	}
-                    	else
-                    	{
+                    	else {
                     		$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
                     	}
                     }
@@ -425,8 +423,7 @@ if ($action == 'add')
                         {
                         	$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
                         }
-                        else
-                        {
+                        else {
                         	$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
                         }
                     }
@@ -442,14 +439,12 @@ if ($action == 'add')
                         {
                         	$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
                         }
-                        else
-                        {
+                        else {
                         	$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
                         }
                     }
                 }
-                else
-                {
+                else {
                     dol_print_error('', "Autosubscribe form is setup to ask an online payment for a not managed online payment");
                     exit;
                 }
@@ -458,8 +453,7 @@ if ($action == 'add')
             if (!empty($entity)) $urlback .= '&entity='.$entity;
             dol_syslog("member ".$adh->ref." was created, we redirect to ".$urlback);
         }
-        else
-        {
+        else {
         	$error++;
             $errmsg .= join('<br>', $adh->errors);
         }
@@ -472,8 +466,7 @@ if ($action == 'add')
     	Header("Location: ".$urlback);
     	exit;
     }
-    else
-    {
+    else {
     	$db->rollback();
     }
 }
@@ -575,8 +568,7 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE))
     print $form->selectarray("type", $adht->liste_array(), GETPOST('type') ?GETPOST('type') : $defaulttype, $isempty);
     print '</td></tr>'."\n";
 }
-else
-{
+else {
     $adht->fetch($conf->global->MEMBER_NEWFORM_FORCETYPE);
     print '<input type="hidden" id="type" name="type" value="'.$conf->global->MEMBER_NEWFORM_FORCETYPE.'">';
 }
@@ -589,8 +581,7 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY))
     print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
     print '</td></tr>'."\n";
 }
-else
-{
+else {
     print $morphys[$conf->global->MEMBER_NEWFORM_FORCEMORPHY];
     print '<input type="hidden" id="morphy" name="morphy" value="'.$conf->global->MEMBER_NEWFORM_FORCEMORPHY.'">';
 }
@@ -733,8 +724,7 @@ if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)
     {
         print '<input type="text" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
     }
-    else
-    {
+    else {
         print '<input type="text" name="amount" id="amounthidden" class="flat amount" disabled size="6" value="'.$amount.'">';
         print '<input type="hidden" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
     }
diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php
index 04fe1f75fca..a955c9605f2 100644
--- a/htdocs/public/members/public_card.php
+++ b/htdocs/public/members/public_card.php
@@ -85,8 +85,7 @@ if ($id > 0)
 	{
 		 print $langs->trans("ErrorThisMemberIsNotPublic");
 	}
-	else
-	{
+	else {
 		print '<table class="public_border" cellspacing="0" width="100%" cellpadding="3">';
 
 		print '<tr><td width="15%">'.$langs->trans("Type").'</td><td class="valeur">'.$object->type."</td></tr>\n";
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index 459926707b8..1a885ed3596 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -153,8 +153,7 @@ if ($result)
 			print $form->showphoto('memberphoto', $objp, 64);
 			print '</td>'."\n";
 		}
-		else
-		{
+		else {
 			print "<td>&nbsp;</td>\n";
 		}
 		print "</tr>";
@@ -162,8 +161,7 @@ if ($result)
 	}
 	print "</table>";
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/public/notice.php b/htdocs/public/notice.php
index 626aba2cd32..b3b362fa6b2 100644
--- a/htdocs/public/notice.php
+++ b/htdocs/public/notice.php
@@ -39,8 +39,7 @@ if (!GETPOST('transkey', 'alphanohtml') && !GETPOST('transphrase', 'alphanohtml'
 	print 'Sorry, it seems your internet connexion is off.<br>';
 	print 'You need to be connected to network to use this software.<br>';
 }
-else
-{
+else {
 	$langs->load("error");
 	$langs->load("other");
 
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index 2378728a8d3..20b029f960d 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -236,8 +236,7 @@ if ($source == 'proposal')
 		$mesg = $proposal->error;
 		$error++;
 	}
-	else
-	{
+	else {
 		$result = $proposal->fetch_thirdparty($proposal->socid);
 	}
 
@@ -277,13 +276,11 @@ if ($action != 'dosign')
     if ($found && !$error)	// We are in a management option and no error
     {
     }
-    else
-    {
+    else {
     	dol_print_error_email('ERRORNEWONLINESIGN');
     }
 }
-else
-{
+else {
     // Print
 }
 
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index d0ce716bb7d..f26d31c483d 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -133,8 +133,7 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 			setEventMessages($langs->trans("VoteNameAlreadyExists"), null, 'errors');
 			$error++;
 		}
-		else
-		{
+		else {
 			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'opensurvey_user_studs (nom, id_sondage, reponses)';
 			$sql .= " VALUES ('".$db->escape($nom)."', '".$db->escape($numsondage)."','".$db->escape($nouveauchoix)."')";
 			$resql = $db->query($sql);
@@ -173,8 +172,7 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 			else dol_print_error($db);
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Name")), null, 'errors');
 	}
 }
@@ -392,8 +390,7 @@ if ($object->format == "D")
 		print '</tr>'."\n";
 	}
 }
-else
-{
+else {
 	//display of survey topics
 	print '<tr>'."\n";
 	print '<td></td>'."\n";
@@ -481,8 +478,7 @@ while ($compteur < $num)
 			}
 		}
 	}
-	else
-	{
+	else {
 		//sinon on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs
 		if ($compteur == $ligneamodifier)
 		{
@@ -509,8 +505,7 @@ while ($compteur < $num)
 				print '</td>'."\n";
 			}
 		}
-		else
-		{
+		else {
 			for ($i = 0; $i < $nbcolonnes; $i++)
 			{
 				$car = substr($ensemblereponses, $i, 1);
@@ -695,8 +690,7 @@ if ($object->allow_spy) {
 					$meilleursujet .= dol_print_date($toutsujet[$i], 'daytext').' ('.dol_print_date($toutsujet[$i], '%A').')';
 				}
 			}
-			else
-			{
+			else {
 				$tmps = explode('@', $toutsujet[$i]);
 				$meilleursujet .= dol_htmlentities($tmps[0]);
 			}
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index ea7fd71c9e6..b82dcc3360b 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -211,8 +211,7 @@ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		if ($source && $REF) $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$source.$REF, 2); // Use the source in the hash to avoid duplicates if the references are identical
 		else $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 	}
-	else
-	{
+	else {
 		$token = $conf->global->PAYMENT_SECURITY_TOKEN;
 	}
 	if ($SECUREKEY != $token)
@@ -371,8 +370,7 @@ if ($action == 'dopayment')
 	if ($paymentmethod == 'stripe')
 	{
 		if (GETPOST('newamount', 'alpha')) $amount = price2num(GETPOST('newamount', 'alpha'), 'MT');
-		else
-		{
+		else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
 			$action = '';
 		}
@@ -469,8 +467,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
 	    				setEventMessages('Failed to create card record', null, 'errors');
 	    				$action = '';
 	    			}
-	    			else
-	    			{
+	    			else {
 	    				if (!empty($FULLTAG))       $metadata["FULLTAG"] = $FULLTAG;
 	    				if (!empty($dol_id))        $metadata["dol_id"] = $dol_id;
 	    				if (!empty($dol_type))      $metadata["dol_type"] = $dol_type;
@@ -497,8 +494,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
 	    			}
     			}
     		}
-    		else
-    		{
+    		else {
     			$vatcleaned = $vatnumber ? $vatnumber : null;
 
     			/*$taxinfo = array('type'=>'vat');
@@ -670,8 +666,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
             setEventMessages($paymentintent->status, null, 'errors');
             $action = '';
         }
-        else
-        {
+        else {
         	// TODO We can alse record the payment mode into llx_societe_rib with stripe $paymentintent->payment_method
         	// Note that with other old Stripe architecture (using Charge API), the payment mode was not recorded, so it is not mandatory to do it here.
         	//dol_syslog("Create payment_method for ".$paymentintent->payment_method, LOG_DEBUG, 0, '_stripe');
@@ -701,8 +696,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
 		header("Location: ".$urlko);
 		exit;
 	}
-	else
-	{
+	else {
 		header("Location: ".$urlok);
 		exit;
 	}
@@ -914,8 +908,7 @@ if ($source == 'order')
 		$mesg = $order->error;
 		$error++;
 	}
-	else
-	{
+	else {
 		$result = $order->fetch_thirdparty($order->socid);
 	}
 	$object = $order;
@@ -1009,8 +1002,7 @@ if ($source == 'order')
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
 	}
-	else
-	{
+	else {
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	if (is_object($order->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$order->thirdparty->id.'">'."\n";
@@ -1037,8 +1029,7 @@ if ($source == 'invoice')
 		$mesg = $invoice->error;
 		$error++;
 	}
-	else
-	{
+	else {
 		$result = $invoice->fetch_thirdparty($invoice->socid);
 	}
 	$object = $invoice;
@@ -1103,8 +1094,7 @@ if ($source == 'invoice')
 			print '<input type="hidden" name="newamount" value="'.$amount.'">';
 		}
 	}
-	else
-	{
+	else {
 		print '<b>'.price($object->total_ttc, 1, $langs).'</b>';
 	}
 	// Currency
@@ -1139,8 +1129,7 @@ if ($source == 'invoice')
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
 	}
-	else
-	{
+	else {
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	if (is_object($invoice->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$invoice->thirdparty->id.'">'."\n";
@@ -1168,8 +1157,7 @@ if ($source == 'contractline')
 		$mesg = $contractline->error;
 		$error++;
 	}
-	else
-	{
+	else {
 		if ($contractline->fk_contrat > 0)
 		{
 			$result = $contract->fetch($contractline->fk_contrat);
@@ -1177,14 +1165,12 @@ if ($source == 'contractline')
 			{
 				$result = $contract->fetch_thirdparty($contract->socid);
 			}
-			else
-			{
+			else {
 				$mesg = $contract->error;
 				$error++;
 			}
 		}
-		else
-		{
+		else {
 			$mesg = 'ErrorRecordNotFound';
 			$error++;
 		}
@@ -1207,8 +1193,7 @@ if ($source == 'contractline')
 				$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
 				$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
 			}
-			else
-			{
+			else {
 				$pu_ht = $product->price;
 				$pu_ttc = $product->price_ttc;
 				$price_base_type = $product->price_base_type;
@@ -1294,8 +1279,7 @@ if ($source == 'contractline')
 			{
 				$dur = array("h"=>$langs->trans("Hours"), "d"=>$langs->trans("DurationDays"), "w"=>$langs->trans("DurationWeeks"), "m"=>$langs->trans("DurationMonths"), "y"=>$langs->trans("DurationYears"));
 			}
-			else
-			{
+			else {
 				$dur = array("h"=>$langs->trans("Hour"), "d"=>$langs->trans("DurationDay"), "w"=>$langs->trans("DurationWeek"), "m"=>$langs->trans("DurationMonth"), "y"=>$langs->trans("DurationYear"));
 			}
 			$duration = $contractline->product->duration_value.' '.$dur[$contractline->product->duration_unit];
@@ -1352,8 +1336,7 @@ if ($source == 'contractline')
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
 	}
-	else
-	{
+	else {
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	if (is_object($contract->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$contract->thirdparty->id.'">'."\n";
@@ -1380,8 +1363,7 @@ if ($source == 'membersubscription')
 		$mesg = $member->error;
 		$error++;
 	}
-	else
-	{
+	else {
 		$member->fetch_thirdparty();
 		$subscription = new Subscription($db);
 	}
@@ -1523,8 +1505,7 @@ if ($source == 'membersubscription')
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
 	}
-	else
-	{
+	else {
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	if (is_object($member->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$member->thirdparty->id.'">'."\n";
@@ -1549,8 +1530,7 @@ if ($source == 'donation')
 		$mesg = $don->error;
 		$error++;
 	}
-	else
-	{
+	else {
 		$don->fetch_thirdparty();
 	}
 	$object = $don;
@@ -1668,8 +1648,7 @@ if ($source == 'donation')
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
 	}
-	else
-	{
+	else {
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	if (is_object($don->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$don->thirdparty->id.'">'."\n";
@@ -1705,8 +1684,7 @@ if ($action != 'dopayment')
 		{
 			print '<br><br><span class="amountpaymentcomplete">'.$langs->trans("DonationPaid").'</span>';
 		}
-		else
-		{
+		else {
 		    // Membership can be paid and we still allow to make renewal
 		    if ($source == 'membersubscription' && $object->datefin > dol_now())
 		    {
@@ -1796,13 +1774,11 @@ if ($action != 'dopayment')
 			}
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error_email('ERRORNEWPAYMENT');
 	}
 }
-else
-{
+else {
 	// Print
 }
 
@@ -1940,8 +1916,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 		    {
                 print '<center>'.$langs->trans("Error").'</center>';
 		    }
-		    else
-		    {
+		    else {
 		        print '<input type="hidden" name="paymentintent_id" value="'.$paymentintent->id.'">';
 		        //$_SESSION["paymentintent_id"] = $paymentintent->id;
 		    }
@@ -1956,8 +1931,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 			$langs->load("errors");
 			print info_admin($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Stripe")), 0, 0, 'error');
 		}
-		else
-		{
+		else {
 			print '<!-- JS Code for Stripe components -->';
     		print '<script src="https://js.stripe.com/v3/"></script>'."\n";
     		print '<!-- urllogofull = '.$urllogofull.' -->'."\n";
@@ -2173,7 +2147,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 
     			<?php
     		}
-    		else		// Old method (not SCA ready)
+    		else // Old method (not SCA ready)
     		{
     			?>
     		// Old code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION off and STRIPE_USE_NEW_CHECKOUT off
@@ -2241,7 +2215,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
     				});
     				<?php
     			}
-    			else											// Ask credit card with 3DS test
+    			else // Ask credit card with 3DS test
     			{
     				?>
     				/* Use 3DS source */
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index a3f6d733fcb..a261c6101a0 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -78,8 +78,7 @@ if (empty($paymentmethod))
     dol_print_error(null, 'The back url does not contains a parameter fulltag that should help us to find the payment method used');
     exit;
 }
-else
-{
+else {
     dol_syslog("paymentmethod=".$paymentmethod);
 }
 
@@ -187,8 +186,7 @@ if (!empty($_SESSION['ipaddress']))      // To avoid to make action twice
     	{
     		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
     	}
-    	else
-    	{
+    	else {
     		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
     	}
     }
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index b1d6c149a51..a1d562b8690 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -222,8 +222,7 @@ if (!empty($conf->paypal->enabled))
 		        	// Nothing to do
 		        	dol_syslog("Call to GetExpressCheckoutDetails return ".$ack, LOG_DEBUG, 0, '_payment');
 		        }
-		        else
-		        {
+		        else {
 		        	dol_syslog("Call to GetExpressCheckoutDetails return error: ".json_encode($resArray), LOG_WARNING, '_payment');
 		        }
 
@@ -251,8 +250,7 @@ if (!empty($conf->paypal->enabled))
 
 		            $ispaymentok = true;
 		        }
-		        else
-		        {
+		        else {
 		        	dol_syslog("Call to DoExpressCheckoutPayment return error: ".json_encode($resArray2), LOG_WARNING, 0, '_payment');
 
 		            //Display a user friendly Error on the page using any of the following error information returned by PayPal
@@ -262,13 +260,11 @@ if (!empty($conf->paypal->enabled))
 		            $ErrorSeverityCode = urldecode($resArray2["L_SEVERITYCODE0"]);
 		        }
 		    }
-		    else
-		    {
+		    else {
 		        dol_print_error('', 'Session expired');
 		    }
 		}
-		else
-		{
+		else {
 		    dol_print_error('', '$PAYPALTOKEN not defined');
 		}
 	}
@@ -420,8 +416,7 @@ if ($ispaymentok)
 						$postactionmessages[] = $errmsg;
 						$ispostactionok = -1;
 					}
-					else
-					{
+					else {
 						$postactionmessages[] = 'Subscription created';
 						$ispostactionok = 1;
 					}
@@ -443,8 +438,7 @@ if ($ispaymentok)
 						$postactionmessages = array_merge($postactionmessages, $object->errors);
 						$ispostactionok = -1;
 					}
-					else
-					{
+					else {
 						if ($option == 'bankviainvoice')
 						{
 							$postactionmessages[] = 'Invoice, payment and bank record created';
@@ -523,8 +517,7 @@ if ($ispaymentok)
 				{
 					$db->commit();
 				}
-				else
-				{
+				else {
 					$db->rollback();
 				}
 
@@ -590,8 +583,7 @@ if ($ispaymentok)
 							$postactionmessages[] = $errmsg;
 							$ispostactionok = -1;
 						}
-						else
-						{
+						else {
 							if ($file) $postactionmessages[] = 'Email sent to member (with invoice document attached)';
 							else $postactionmessages[] = 'Email sent to member (without any attached document)';
 
@@ -600,14 +592,12 @@ if ($ispaymentok)
 					}
 				}
 			}
-			else
-			{
+			else {
 				$postactionmessages[] = 'Failed to get a valid value for "amount paid" or "payment type" to record the payment of subscription for member '.$tmptag['MEM'].'. May be payment was already recorded.';
 				$ispostactionok = -1;
 			}
 		}
-		else
-		{
+		else {
 			$postactionmessages[] = 'Member '.$tmptag['MEM'].' for subscription payed was not found';
 			$ispostactionok = -1;
 		}
@@ -648,8 +638,7 @@ if ($ispaymentok)
 				{
 					$paiement->amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching with invoice id
 				}
-				else
-				{
+				else {
 					$paiement->multicurrency_amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching
 
 					$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
@@ -672,8 +661,7 @@ if ($ispaymentok)
 						$ispostactionok = -1;
 						$error++;
 					}
-					else
-					{
+					else {
 						$postactionmessages[] = 'Payment created';
 						$ispostactionok = 1;
 					}
@@ -697,14 +685,12 @@ if ($ispaymentok)
 							$ispostactionok = -1;
 							$error++;
 						}
-						else
-						{
+						else {
 							$postactionmessages[] = 'Bank transaction of payment created';
 							$ispostactionok = 1;
 						}
 					}
-					else
-					{
+					else {
 						$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
 						$ispostactionok = -1;
 						$error++;
@@ -715,25 +701,21 @@ if ($ispaymentok)
 				{
 					$db->commit();
 				}
-				else
-				{
+				else {
 					$db->rollback();
 				}
 			}
-			else
-			{
+			else {
 				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of invoice '.$tmptag['INV'].'. May be payment was already recorded.';
 				$ispostactionok = -1;
 			}
 		}
-		else
-		{
+		else {
 			$postactionmessages[] = 'Invoice payed '.$tmptag['INV'].' was not found';
 			$ispostactionok = -1;
 		}
 	}
-	else
-	{
+	else {
 		// Nothing done
 	}
 }
@@ -811,8 +793,7 @@ if ($ispaymentok)
 			//$content.=$companylangs->trans("ThirdPartyId").': '.$tmptag['CUS']."<br>\n";
 			$content .= $companylangs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
 		}
-		else
-		{
+		else {
 			$content .= $companylangs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
 		}
 		$content .= $companylangs->transnoentities("PostActionAfterPayment").' : ';
@@ -825,8 +806,7 @@ if ($ispaymentok)
 		{
 			$content .= $companylangs->transnoentitiesnoconv("None");
 		}
-		else
-		{
+		else {
 			$topic .= ($ispostactionok ? '' : ' ('.$companylangs->trans("WarningPostActionErrorAfterPayment").')');
 			$content .= '<font color="red">'.$companylangs->transnoentitiesnoconv("Error").'</font>';
 		}
@@ -865,15 +845,13 @@ if ($ispaymentok)
 			dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
 			//dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0);
 		}
-		else
-		{
+		else {
 			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 			//dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0);
 		}
 	}
 }
-else
-{
+else {
     // Get on url call
 	$onlinetoken = empty($PAYPALTOKEN) ? $_SESSION['onlinetoken'] : $PAYPALTOKEN;
     $payerID            = empty($PAYPALPAYERID) ? $_SESSION['payerID'] : $PAYPALPAYERID;
@@ -952,8 +930,7 @@ else
         {
             dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
         }
-        else
-        {
+        else {
             dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
         }
     }
diff --git a/htdocs/public/stripe/confirm_payment.php b/htdocs/public/stripe/confirm_payment.php
index 9a45a2cbeec..9c6346842c8 100644
--- a/htdocs/public/stripe/confirm_payment.php
+++ b/htdocs/public/stripe/confirm_payment.php
@@ -49,8 +49,7 @@ if (isset($_GET['connect']))
 		$service = 'StripeTest';
 		$servicestatus = 0;
 	}
-	else
-	{
+	else {
 		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_CONNECT_KEY;
 		$service = 'StripeLive';
         $servicestatus = 1;
@@ -63,8 +62,7 @@ else {
 		$service = 'StripeTest';
 		$servicestatus = 0;
 	}
-	else
-	{
+	else {
 		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_KEY;
 		$service = 'StripeLive';
 		$servicestatus = 1;
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 4291cb6f834..e3cc21b327b 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -49,8 +49,7 @@ if (isset($_GET['connect']))
 		$service = 'StripeTest';
 		$servicestatus = 0;
 	}
-	else
-	{
+	else {
 		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_CONNECT_KEY;
 		$service = 'StripeLive';
         $servicestatus = 1;
@@ -63,8 +62,7 @@ else {
 		$service = 'StripeTest';
 		$servicestatus = 0;
 	}
-	else
-	{
+	else {
 		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_KEY;
 		$service = 'StripeLive';
 		$servicestatus = 1;
@@ -189,8 +187,7 @@ if ($event->type == 'payout.created') {
         http_response_code(200); // PHP 5.4 or greater
         return 1;
 	}
-	else
-	{
+	else {
 		$error++;
 		http_response_code(500); // PHP 5.4 or greater
 		return -1;
@@ -270,8 +267,7 @@ elseif ($event->type == 'payout.paid') {
 		http_response_code(200); // PHP 5.4 or greater
 		return 1;
 	}
-	else
-	{
+	else {
 		$error++;
 		http_response_code(500); // PHP 5.4 or greater
 		return -1;
@@ -344,8 +340,7 @@ elseif ($event->type == 'payment_method.attached') {
 		{
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 		}
 	}
@@ -381,8 +376,7 @@ elseif ($event->type == 'payment_method.updated') {
 	{
 		$db->commit();
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 }
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index c326b4a6bd2..cbe88b006d4 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -46,8 +46,7 @@ if (empty($usedolheader))
 
 	<?php
 }
-else
-{
+else {
 	$arraycss = array();
 	$arrayjs = array();
 	/*
diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index af656e69ab0..51e120cdbd5 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -188,8 +188,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		{
 			$action = 'presend';
 		}
-		else
-		{
+		else {
 			$action = '';
 		}
 	}
@@ -373,8 +372,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		print load_fiche_titre($langs->trans('TicketMessagesList'), '', 'object_conversation');
 		$object->viewTicketMessages(false, true, $object->dao);
 	}
-	else
-	{
+	else {
 		print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->dao->track_id.'">'.$langs->trans('Back').'</a></div>';
 	}
 } else {
diff --git a/htdocs/public/website/index.php b/htdocs/public/website/index.php
index 95f2efa492a..2f18de010a0 100644
--- a/htdocs/public/website/index.php
+++ b/htdocs/public/website/index.php
@@ -106,8 +106,7 @@ if (empty($pageid))
 			}
 		}
 	}
-	else
-	{
+	else {
 		if ($object->fk_default_home > 0)
 		{
 			$result = $objectpage->fetch($object->fk_default_home);
@@ -165,8 +164,7 @@ if ($pageid == 'css')   // No more used ?
 	header('Cache-Control: no-cache');
 	$original_file = $dolibarr_main_data_root.'/website/'.$websitekey.'/styles.css.php';
 }
-else
-{
+else {
 	$original_file = $dolibarr_main_data_root.'/website/'.$websitekey.'/page'.$pageid.'.tpl.php';
 }
 
diff --git a/htdocs/public/website/styles.css.php b/htdocs/public/website/styles.css.php
index ce416bdd7b6..24125178f5d 100644
--- a/htdocs/public/website/styles.css.php
+++ b/htdocs/public/website/styles.css.php
@@ -78,8 +78,7 @@ if (empty($pageid))
         $object->fetch($websiteid);
         $website = $object->ref;
     }
-    else
-    {
+    else {
         $object->fetch(0, $website);
     }
 
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 3d8547f9322..2ada4b1c447 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -233,8 +233,7 @@ if (empty($reshook))
 
 		if ($object->origin == "supplierorder")
 			$classname = 'CommandeFournisseur';
-		else
-			$classname = ucfirst($object->origin);
+		else $classname = ucfirst($object->origin);
 		$objectsrc = new $classname($db);
 		$objectsrc->fetch($object->origin_id);
 
@@ -354,8 +353,7 @@ if (empty($reshook))
 	            }
 	        }
 	    }
-	    else
-	    {
+	    else {
 	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("QtyToReceive").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 	        $error++;
 	    }
@@ -366,8 +364,7 @@ if (empty($reshook))
 	        header("Location: card.php?id=".$object->id);
 	        exit;
 	    }
-	    else
-	    {
+	    else {
 	        $db->rollback();
 	        $_GET["commande_id"] = GETPOST('commande_id', 'int');
 	        $action = 'create';
@@ -388,8 +385,7 @@ if (empty($reshook))
 			$langs->load("errors");
 	        setEventMessages($langs->trans($object->error), null, 'errors');
 	    }
-	    else
-	    {
+	    else {
 	    	// Define output language
 	    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 	    	{
@@ -418,8 +414,7 @@ if (empty($reshook))
 	        header("Location: ".DOL_URL_ROOT.'/reception/index.php');
 	        exit;
 	    }
-	    else
-		{
+	    else {
 			setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
@@ -567,8 +562,7 @@ if (empty($reshook))
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
 		}
-		else
-		{
+		else {
 			setEventMessages($line->error, $line->errors, 'errors');
 		}
 	}
@@ -667,8 +661,7 @@ if (empty($reshook))
 				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
-		else
-		{
+		else {
 			header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 			exit();
 		}
@@ -1049,8 +1042,7 @@ if ($action == 'create')
 
                     print '</td>';
                 }
-                else
-				{
+                else {
 				    print "<td>";
                     if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
                     else $text = img_object($langs->trans('Product'), 'product');
@@ -1089,8 +1081,7 @@ if ($action == 'create')
 				{
 					$quantityToBeDelivered = 0;
 				}
-				else
-				{
+				else {
 					$quantityToBeDelivered = $dispatchLines[$indiceAsked]['qty'];
 				}
                 $warehouse_id = $dispatchLines[$indiceAsked]['ent'];
@@ -1131,8 +1122,7 @@ if ($action == 'create')
 								print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 0, 0, $line->fk_product, '', 1);
 							}
 						}
-						else
-						{
+						else {
 							print $langs->trans("Service");
 						}
 						print '</td>';
@@ -1195,8 +1185,7 @@ if ($action == 'create')
 
             print '<br>';
         }
-        else
-		{
+        else {
             dol_print_error($db);
         }
     }
@@ -1247,8 +1236,7 @@ elseif ($id || $ref)
 			{
 				$numref = $object->getNextNumRef($soc);
 			}
-			else
-			{
+			else {
 				$numref = $object->ref;
 			}
 
@@ -1413,8 +1401,7 @@ elseif ($id || $ref)
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		}
-		else
-		{
+		else {
 			print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
 		}
 		print '</td>';
@@ -1437,8 +1424,7 @@ elseif ($id || $ref)
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
 		}
-		else
-		{
+		else {
 			print $object->trueWeight;
 			print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
 		}
@@ -1472,8 +1458,7 @@ elseif ($id || $ref)
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
 		}
-		else
-		{
+		else {
 			print $object->trueHeight;
 			print ($object->trueHeight && $object->height_units != '') ? ' '.measuringUnitString(0, "size", $object->height_units) : '';
 		}
@@ -1551,8 +1536,7 @@ elseif ($id || $ref)
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		}
-		else
-		{
+		else {
 			if ($object->shipping_method_id > 0)
 			{
 				// Get code using getLabelFromKey
@@ -1585,8 +1569,7 @@ elseif ($id || $ref)
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 			}
-			else
-			{
+			else {
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 			}
 	        print '</td></tr>';
@@ -1640,8 +1623,7 @@ elseif ($id || $ref)
 			{
 				print $langs->trans("QtyToReceive").' - ';
 			}
-			else
-			{
+			else {
 				print $langs->trans("QtyReceived").' - ';
 			}
 			if (!empty($conf->stock->enabled))
@@ -1654,14 +1636,12 @@ elseif ($id || $ref)
 			}
 			print '</td>';
 		}
-		else
-		{
+		else {
 			if ($object->statut <= 1)
 			{
 				print '<td class="center">'.$langs->trans("QtyToReceive").'</td>';
 			}
-			else
-			{
+			else {
 				print '<td class="center">'.$langs->trans("QtyReceived").'</td>';
 			}
 			if (!empty($conf->stock->enabled))
@@ -1769,8 +1749,7 @@ elseif ($id || $ref)
 					$prod->fetch($lines[$i]->fk_product);
 					$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product->label;
 				}
-				else
-					$label = (!empty($lines[$i]->product->label) ? $lines[$i]->product->label : $lines[$i]->product->product_label);
+				else $label = (!empty($lines[$i]->product->label) ? $lines[$i]->product->label : $lines[$i]->product->product_label);
 
 				print '<td>';
 
@@ -1785,8 +1764,7 @@ elseif ($id || $ref)
 				}
 				print "</td>\n";
 			}
-			else
-			{
+			else {
 				print "<td>";
 				if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'), 'service');
 				else $text = img_object($langs->trans('Product'), 'product');
@@ -1806,8 +1784,7 @@ elseif ($id || $ref)
 			{
 				print '<td ><textarea name="comment'.$line_id.'" id="comment'.$line_id.'" /> '.$lines[$i]->comment.'</textarea></td>';
 			}
-			else
-			{
+			else {
 				print '<td style="white-space: pre-wrap;max-width: 200px;" >'.$lines[$i]->comment.'</td>';
 			}
 
@@ -1873,8 +1850,7 @@ elseif ($id || $ref)
 						}
 						print '</tr>';
 					}
-					else
-					{
+					else {
 						print '<!-- case edit 2 -->';
 						print '<tr>';
 						// Qty to receive or received
@@ -1888,8 +1864,7 @@ elseif ($id || $ref)
 				}
 				print '</table></td>';
 			}
-			else
-			{
+			else {
 				// Qty to receive or received
 				print '<td class="center">'.$lines[$i]->qty.'</td>';
 
@@ -1926,8 +1901,7 @@ elseif ($id || $ref)
 
 							print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $detail);
 						}
-						else
-						{
+						else {
 							print $langs->trans("NA");
 						}
 						print '</td>';
@@ -1988,8 +1962,7 @@ elseif ($id || $ref)
 				{
 					print $line->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), $indiceAsked);
 				}
-				else
-				{
+				else {
 					print $line->showOptionals($extrafields, 'view', array('colspan'=>$colspan), $indiceAsked);
 				}
 			}
@@ -2027,8 +2000,7 @@ elseif ($id || $ref)
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
 				}
-				else
-				{
+				else {
 					print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
 				}
 			}
@@ -2045,8 +2017,7 @@ elseif ($id || $ref)
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ClassifyUnbilled").'</a>';
 				}
-				else
-				{
+				else {
 			    	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
 				}
 			}
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index a95d6217c1c..111846347be 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -179,14 +179,12 @@ class Reception extends CommonObject
 			{
 				return $numref;
 			}
-			else
-			{
+			else {
 				dol_print_error($this->db, get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
         }
-	    else
-	    {
+	    else {
 		    print $langs->trans("Error")." ".$langs->trans("Error_RECEPTION_ADDON_NUMBER_NotDefined");
 		    return "";
 	    }
@@ -325,8 +323,7 @@ class Reception extends CommonObject
 					$this->db->commit();
 					return $this->id;
 				}
-				else
-				{
+				else {
 					foreach ($this->errors as $errmsg)
 					{
 						dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
@@ -336,16 +333,14 @@ class Reception extends CommonObject
 					return -1 * $error;
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$this->error = $this->db->error()." - sql=$sql";
 			$this->db->rollback();
@@ -473,15 +468,13 @@ class Reception extends CommonObject
 
 				return 1;
 			}
-			else
-			{
+			else {
 				dol_syslog(get_class($this).'::Fetch no reception found', LOG_ERR);
 				$this->error = 'Delivery with id '.$id.' not found';
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -602,8 +595,7 @@ class Reception extends CommonObject
 							break;
 						}
 					}
-					else
-					{
+					else {
 						// line with batch detail
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
@@ -618,8 +610,7 @@ class Reception extends CommonObject
 					}
 				}
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -2;
@@ -694,8 +685,7 @@ class Reception extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::valid ".$errmsg, LOG_ERR);
@@ -867,8 +857,7 @@ class Reception extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -922,8 +911,7 @@ class Reception extends CommonObject
 					$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ReceptionDeletedInDolibarr", $this->ref), '', $obj->eatby, $obj->sellby, $obj->batch); // Price is set to 0, because we don't want to see WAP changed
 				}
 			}
-			else
-			{
+			else {
 				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
@@ -1000,35 +988,30 @@ class Reception extends CommonObject
 
 							return 1;
 						}
-						else
-						{
+						else {
 							$this->db->rollback();
 							return -1;
 						}
 					}
-					else
-					{
+					else {
 						$this->error = $this->db->lasterror()." - sql=$sql";
 						$this->db->rollback();
 						return -3;
 					}
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -2;
 				}
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1274,14 +1257,12 @@ class Reception extends CommonObject
 				$this->date_delivery = $date_livraison;
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->error();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			return -2;
 		}
 	}
@@ -1365,8 +1346,7 @@ class Reception extends CommonObject
             $sql .= " VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
             $resql = $this->db->query($sql);
         }
-        else
-        {
+        else {
             $sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
             $sql .= " code='".$this->db->escape($this->update['code'])."'";
             $sql .= ",libelle='".$this->db->escape($this->update['libelle'])."'";
@@ -1442,8 +1422,7 @@ class Reception extends CommonObject
 			$url = str_replace('{TRACKID}', $value, $tracking);
 			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value ? $value : 'url').'</a>', $url, $url);
 		}
-		else
-		{
+		else {
 			$this->tracking_url = $value;
 		}
 	}
@@ -1545,8 +1524,7 @@ class Reception extends CommonObject
 								$error++; break;
 							}
 						}
-						else
-						{
+						else {
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -1560,8 +1538,7 @@ class Reception extends CommonObject
 						}
 					}
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->lasterror();
 					$error++;
 				}
@@ -1576,8 +1553,7 @@ class Reception extends CommonObject
     			}
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
             $error++;
 		}
@@ -1587,8 +1563,7 @@ class Reception extends CommonObject
 		    $this->db->commit();
 		    return 1;
 		}
-		else
-		{
+		else {
 		    $this->db->rollback();
 		    return -1;
 		}
@@ -1633,8 +1608,7 @@ class Reception extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1710,8 +1684,7 @@ class Reception extends CommonObject
 								$error++; break;
 							}
 						}
-						else
-						{
+						else {
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -1724,8 +1697,7 @@ class Reception extends CommonObject
 						}
 					}
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->lasterror();
 					$error++;
 				}
@@ -1755,8 +1727,7 @@ class Reception extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1846,8 +1817,7 @@ class Reception extends CommonObject
 								break;
 							}
 						}
-						else
-						{
+						else {
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -1860,8 +1830,7 @@ class Reception extends CommonObject
 						}
 					}
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->lasterror();
 					$error++;
 				}
@@ -1912,8 +1881,7 @@ class Reception extends CommonObject
                 return -1;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index b2d30bf7c7f..b5e526bb1b3 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -91,8 +91,7 @@ if ($action == 'addcontact' && $user->rights->reception->creer)
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index c6cfcd5264c..c753cf3e873 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -279,15 +279,13 @@ if (empty($reshook))
 	    						$result = $object->insert_discount($discountid);
 	    						//$result=$discount->link_to_invoice($lineid,$id);
 	    					}
-	    					else
-	    					{
+	    					else {
 	    						setEventMessages($discount->error, $discount->errors, 'errors');
 	    						$error++;
 	    						break;
 	    					}
 	    				}
-	    				else
-	    				{
+	    				else {
 	    					// Positive line
 	    					$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 	    					// Date start
@@ -335,8 +333,7 @@ if (empty($reshook))
 	    					{
 	    						$lineid = $result;
 	    					}
-	    					else
-	    					{
+	    					else {
 	    						$lineid = 0;
 	    						$error++;
 	    						break;
@@ -391,8 +388,7 @@ if (empty($reshook))
     		$db->commit();
     		setEventMessage($langs->trans('BillCreated', $nb_bills_created));
     	}
-    	else
-    	{
+    	else {
     		$db->rollback();
     		$action = 'create';
     		$_GET["origin"] = $_POST["origin"];
@@ -585,8 +581,7 @@ if ($resql)
 		    print $form->selectyesno('validate_invoices', 0, 1, 1);
 		    print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
 		}
-		else
-		{
+		else {
             print $form->selectyesno('validate_invoices', 0, 1);
 		}
 		print '</td>';
@@ -937,8 +932,7 @@ if ($resql)
 	print '</form>';
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/reception/stats/index.php b/htdocs/reception/stats/index.php
index e7e8ef7e090..4a0bcb4fd04 100644
--- a/htdocs/reception/stats/index.php
+++ b/htdocs/reception/stats/index.php
@@ -78,8 +78,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenamenb = $dir.'/receptionsnbinyear-'.$user->id.'-'.$year.'.png';
 }
-else
-{
+else {
     $filenamenb = $dir.'/receptionsnbinyear-'.$year.'.png';
 }
 
diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php
index 1035d17d5f9..fa99e4610d5 100644
--- a/htdocs/resource/agenda.php
+++ b/htdocs/resource/agenda.php
@@ -49,8 +49,7 @@ if (GETPOST('actioncode', 'array'))
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
 }
-else
-{
+else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index b403c0516f9..9f2a044525d 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -100,8 +100,7 @@ if (empty($reshook))
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
 				$action = 'create';
 			}
-			else
-			{
+			else {
 				$object->ref                    = $ref;
 				$object->description            = $description;
 				$object->fk_code_type_resource  = $fk_code_type_resource;
@@ -119,16 +118,14 @@ if (empty($reshook))
 					Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
 				}
-				else
-				{
+				else {
 					// Creation KO
 					setEventMessages($object->error, $object->errors, 'errors');
 					$action = 'create';
 				}
 			}
 		}
-		else
-		{
+		else {
 			Header("Location: list.php");
 			exit;
 		}
@@ -166,14 +163,12 @@ if (empty($reshook))
 					Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
 				}
-				else
-				{
+				else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 				}
 			}
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
@@ -198,13 +193,11 @@ if (empty($reshook))
 				Header('Location: '.DOL_URL_ROOT.'/resource/list.php');
 				exit;
 			}
-			else
-			{
+			else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -228,8 +221,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 		print load_fiche_titre($title, '', 'object_resource');
 		dol_fiche_head('');
 	}
-	else
-	{
+	else {
 		$head = resource_prepare_head($object);
 		dol_fiche_head($head, 'resource', $title, -1, 'resource');
 	}
@@ -292,8 +284,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 
 		print '</form>';
 	}
-	else
-	{
+	else {
 		$formconfirm = '';
 
 		// Confirm deleting resource line
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 1b4223e1fff..41c0db7ec15 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -165,8 +165,7 @@ class Dolresource extends CommonObject
     		$this->db->rollback();
     		return -1 * $error;
     	}
-    	else
-    	{
+    	else {
     		$this->db->commit();
     		return $this->id;
     	}
@@ -224,8 +223,7 @@ class Dolresource extends CommonObject
 
     		return $this->id;
     	}
-    	else
-    	{
+    	else {
     		$this->error = "Error ".$this->db->lasterror();
     		dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
     		return -1;
@@ -330,8 +328,7 @@ class Dolresource extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -389,8 +386,7 @@ class Dolresource extends CommonObject
 
     		return $this->id;
     	}
-    	else
-    	{
+    	else {
     		$this->error = "Error ".$this->db->lasterror();
     		return -1;
     	}
@@ -428,8 +424,7 @@ class Dolresource extends CommonObject
 				$error++;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$error++;
 		}
@@ -476,8 +471,7 @@ class Dolresource extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -568,8 +562,7 @@ class Dolresource extends CommonObject
     		}
     		return $num;
     	}
-    	else
-    	{
+    	else {
     		$this->error = $this->db->lasterror();
     		return -1;
     	}
@@ -646,8 +639,7 @@ class Dolresource extends CommonObject
    			}
    			return $num;
    		}
-   		else
-   		{
+   		else {
    			$this->error = $this->db->lasterror();
    			return -1;
    		}
@@ -725,8 +717,7 @@ class Dolresource extends CommonObject
     		}
     		return $num;
     	}
-    	else
-    	{
+    	else {
     		$this->error = $this->db->lasterror();
     		return -1;
     	}
@@ -817,8 +808,7 @@ class Dolresource extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -925,8 +915,7 @@ class Dolresource extends CommonObject
     		}
     		return $num;
     	}
-    	else
-    	{
+    	else {
     		dol_print_error($this->db);
     		return -1;
     	}
diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php
index 4836ed1a0f1..3eeebeaee45 100644
--- a/htdocs/resource/class/html.formresource.class.php
+++ b/htdocs/resource/class/html.formresource.class.php
@@ -127,8 +127,7 @@ class FormResource
     				{
     					$out .= '<option value="'.$resourcestat->lines[$i]->id.'" selected>'.$label.'</option>';
     				}
-    				else
-    				{
+    				else {
     					$out .= '<option value="'.$resourcestat->lines[$i]->id.'">'.$label.'</option>';
     				}
 
@@ -147,8 +146,7 @@ class FormResource
         		$out .= '</form>';
     		}
     	}
-    	else
-    	{
+    	else {
     		dol_print_error($this->db);
     	}
 
diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php
index cbc94c2e843..dc916aa5f77 100644
--- a/htdocs/resource/contact.php
+++ b/htdocs/resource/contact.php
@@ -63,8 +63,7 @@ if ($action == 'addcontact' && $user->rights->resource->write)
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			$mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index d0d4e2300d8..0e6b20923b5 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -137,8 +137,7 @@ if ($object->id > 0)
 
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index 1ce3957071a..8e353b59788 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -98,8 +98,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Resource")), null, 'errors');
 			$action = '';
 		}
-		else
-		{
+		else {
 			$objstat = fetchObjectByElement($element_id, $element, $element_ref);
 			$objstat->element = $element; // For externals module, we need to keep @xx
 
@@ -266,8 +265,7 @@ if (empty($reshook))
 			header("Location: ".$_SERVER['PHP_SELF']."?element=".$element."&element_id=".$element_id);
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -298,8 +296,7 @@ if ($ret == -1) {
 if (!$ret) {
     print '<div class="warning">'.$langs->trans('NoResourceInDatabase').'</div>';
 }
-else
-{
+else {
 	// Confirmation suppression resource line
 	if ($action == 'delete_resource')
 	{
@@ -412,8 +409,7 @@ else
 				}
 				$_SESSION['assignedtouser'] = json_encode($listofuserid);
 			}
-			else
-			{
+			else {
 				if (!empty($_SESSION['assignedtouser']))
 				{
 					$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -601,8 +597,7 @@ else
 				{
 					$tpl = dol_buildpath($reldir.'/resource_'.$element_prop['element'].'_add.tpl.php');
 				}
-				else
-				{
+				else {
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/resource_add.tpl.php';
 				}
 				if (empty($conf->file->strict_mode)) {
@@ -621,8 +616,7 @@ else
 					{
 						$tpl = dol_buildpath($reldir.'/resource_'.$element_prop['element'].'_view.tpl.php');
 					}
-					else
-					{
+					else {
 						$tpl = DOL_DOCUMENT_ROOT.$reldir.'/resource_view.tpl.php';
 					}
 					if (empty($conf->file->strict_mode)) {
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 033d49ae8c8..4f94c6c3e17 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -282,8 +282,7 @@ if ($ret)
         print '</tr>';
     }
 }
-else
-{
+else {
     $colspan = 1;
     foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
     print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
diff --git a/htdocs/salaries/admin/salaries.php b/htdocs/salaries/admin/salaries.php
index 29e3c325ee0..b1f1f627a99 100644
--- a/htdocs/salaries/admin/salaries.php
+++ b/htdocs/salaries/admin/salaries.php
@@ -63,8 +63,7 @@ if ($action == 'update')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -115,8 +114,7 @@ foreach ($list as $key)
 	{
 		print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
 	}
-	else
-	{
+	else {
 		print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
 	}
 	print '</td></tr>';
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index ade8924b0d0..d7b71edbf0b 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -159,8 +159,7 @@ if ($action == 'add' && empty($cancel))
 				exit;
 			}
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = "create";
@@ -194,21 +193,18 @@ if ($action == 'delete')
 				header("Location: ".DOL_URL_ROOT.'/salaries/list.php');
 				exit;
 			}
-			else
-			{
+			else {
 				$object->error = $accountline->error;
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages('Error try do delete a line linked to a conciliated bank transaction', null, 'errors');
 	}
 }
@@ -494,13 +490,11 @@ if ($id)
 		{
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a></div>';
 		}
-		else
-		{
+		else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("NotAllowed"))).'">'.$langs->trans("Delete").'</a></div>';
 		}
 	}
-	else
-	{
+	else {
 		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("LinkedToAConciliatedTransaction").'">'.$langs->trans("Delete").'</a></div>';
 	}
 	print "</div>";
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 82cdf3c80ce..9fddd59ce51 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -183,8 +183,7 @@ class PaymentSalary extends CommonObject
             $this->db->commit();
             return 1;
         }
-        else
-        {
+        else {
             $this->db->rollback();
             return -1;
         }
@@ -264,8 +263,7 @@ class PaymentSalary extends CommonObject
 
             return 1;
         }
-        else
-        {
+        else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -481,8 +479,7 @@ class PaymentSalary extends CommonObject
                     {
                         $this->update_fk_bank($bank_line_id);
                     }
-                    else
-                    {
+                    else {
                         $this->error = $acc->error;
                         $error++;
                     }
@@ -532,14 +529,12 @@ class PaymentSalary extends CommonObject
                 $this->db->commit();
                 return $this->id;
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 return -2;
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
@@ -563,8 +558,7 @@ class PaymentSalary extends CommonObject
         {
             return 1;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return -1;
         }
@@ -676,8 +670,7 @@ class PaymentSalary extends CommonObject
             }
             $this->db->free($result);
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
         }
     }
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index ff709816d18..0e6a1bccba0 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -129,8 +129,7 @@ if ($object->id)
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index fd6e7a3ec95..b06ad2348e4 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -68,8 +68,7 @@ if (!GETPOST('typeid', 'int'))
 		if ($part[0] == 's.fk_typepayment') $typeid = $part[1];
 	}
 }
-else
-{
+else {
 	$typeid = GETPOST('typeid', 'int');
 }
 
@@ -318,8 +317,7 @@ if ($result)
 
     $db->free($result);
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index fb6663be951..307b903787e 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -54,8 +54,7 @@ if ($action == 'setcodeclient')
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -67,8 +66,7 @@ if ($action == 'setcodecompta')
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -84,8 +82,7 @@ if ($action == 'updateoptions')
 	    {
 		    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	    }
-	    else
-	    {
+	    else {
 		    setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
@@ -99,8 +96,7 @@ if ($action == 'updateoptions')
 		{
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
@@ -114,8 +110,7 @@ if ($action == 'updateoptions')
 		{
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 		}
-		else
-		{
+		else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
@@ -178,8 +173,7 @@ if ($action == 'setdoc')
 	{
 		$db->commit();
 	}
-	else
-	{
+	else {
 	    $db->rollback();
 	}
 }
@@ -193,8 +187,7 @@ if ($action == "setaddrefinlist") {
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -208,8 +201,7 @@ if ($action == "setaddadressinlist") {
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -223,8 +215,7 @@ if ($action == "setaskforshippingmet") {
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -238,8 +229,7 @@ if ($action == "setdisableprospectcustomer") {
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -255,8 +245,7 @@ if ($action == 'setprofid')
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -272,8 +261,7 @@ if ($action == 'setprofidmandatory')
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -289,8 +277,7 @@ if ($action == 'setprofidinvoicemandatory')
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -305,8 +292,7 @@ if ($action == 'sethideinactivethirdparty')
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -318,8 +304,7 @@ if ($action == 'setonsearchandlistgooncustomerorsuppliercard') {
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -412,8 +397,7 @@ foreach ($arrayofmodules as $file => $modCodeTiers)
 		print img_picto($langs->trans("Activated"), 'switch_on');
 		print "</td>\n";
 	}
-	else
-	{
+	else {
 		$disabled = (!empty($conf->multicompany->enabled) && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? true : false);
 		print '<td class="center">';
 		if (!$disabled) print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&value='.$file.'">';
@@ -498,8 +482,7 @@ foreach ($arrayofmodules as $file => $modCodeCompta)
     	print img_picto($langs->trans("Activated"), 'switch_on');
     	print '</td>';
     }
-    else
-    {
+    else {
     	print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodecompta&value='.$file.'">';
     	print img_picto($langs->trans("Disabled"), 'switch_off');
     	print '</a></td>';
@@ -538,8 +521,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -608,16 +590,14 @@ foreach ($dirsociete as $dirroot)
 						//}
 						print "</td>";
 					}
-					else
-					{
+					else {
 						if (versioncompare($module->phpmin, versionphparray()) > 0)
 						{
 							print "<td class=\"center\">\n";
 							print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion", join('.', $module->phpmin))), 'switch_off');
 							print "</td>";
 						}
-						else
-						{
+						else {
 							print "<td class=\"center\">\n";
 							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							print "</td>";
@@ -644,8 +624,7 @@ foreach ($dirsociete as $dirroot)
 					{
 						$linkspec = '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
 					}
-					else
-					{
+					else {
 						$linkspec = img_object($langs->trans("PreviewNotAvailable"), 'generic');
 					}
 					print $linkspec;
@@ -715,8 +694,7 @@ foreach ($profid as $key => $val)
 			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a></td>';
 		}
-		else
-		{
+		else {
 			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=1">';
 			print img_picto($langs->trans("Disabled"), 'switch_off');
 			print '</a></td>';
@@ -728,8 +706,7 @@ foreach ($profid as $key => $val)
 			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a></td>';
 		}
-		else
-		{
+		else {
 			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=1">';
 			print img_picto($langs->trans("Disabled"), 'switch_off');
 			print '</a></td>';
@@ -741,8 +718,7 @@ foreach ($profid as $key => $val)
 			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a></td>';
 		}
-		else
-		{
+		else {
 			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=1">';
 			print img_picto($langs->trans("Disabled"), 'switch_off');
 			print '</a></td>';
@@ -784,8 +760,7 @@ if (!$conf->use_javascript_ajax)
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
 }
-else
-{
+else {
 	print '<td width="60" class="right">';
 	$arrval = array('0'=>$langs->trans("No"),
 	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
@@ -808,8 +783,7 @@ if (!$conf->use_javascript_ajax)
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
 }
-else
-{
+else {
 	print '<td width="60" class="right">';
 	$arrval = array('0'=>$langs->trans("No"),
 	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
@@ -834,8 +808,7 @@ if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST))
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
 }
-else
-{
+else {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=1">';
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
@@ -851,8 +824,7 @@ if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST))
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
 }
-else
-{
+else {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=1">';
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
@@ -870,8 +842,7 @@ if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD))
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
 }
-else
-{
+else {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=1">';
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
@@ -888,8 +859,7 @@ if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS))
     print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&value=0">';
     print img_picto($langs->trans("Activated"), 'switch_on');
 }
-else
-{
+else {
     print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&value=1">';
     print img_picto($langs->trans("Disabled"), 'switch_off');
 }
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index dba483c52eb..4142231261d 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -39,8 +39,7 @@ if (GETPOST('actioncode', 'array'))
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
 }
-else
-{
+else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
index 4fe737ca31c..1622b81384d 100644
--- a/htdocs/societe/ajax/company.php
+++ b/htdocs/societe/ajax/company.php
@@ -68,8 +68,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 
 	echo json_encode($outjson);
 }
-else
-{
+else {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 	$langs->load("companies");
diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php
index dcf0b1a4483..0558d7d31c8 100644
--- a/htdocs/societe/ajaxcompanies.php
+++ b/htdocs/societe/ajaxcompanies.php
@@ -72,8 +72,7 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
             $sql .= " OR code_client LIKE '".$db->escape($socid)."%'";
             $sql .= " OR code_fournisseur LIKE '".$db->escape($socid)."%'";
         }
-        else
-        {
+        else {
     		$sql .= "nom LIKE '%".$db->escape($socid)."%'";
     		$sql .= " OR code_client LIKE '%".$db->escape($socid)."%'";
     		$sql .= " OR code_fournisseur LIKE '%".$db->escape($socid)."%'";
@@ -101,12 +100,10 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
 
 	    echo json_encode($return_arr);
 	}
-	else
-	{
+	else {
 	    echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
 	}
 }
-else
-{
+else {
     echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
 }
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index 70ac0577cb9..0cd103a2855 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -259,8 +259,7 @@ abstract class ActionsCardCommon
                 }
             }
         }
-        else
-        {
+        else {
             $head = societe_prepare_head($this->object);
 
             $this->tpl['showhead'] = dol_get_fiche_head($head, 'card', '', 0, 'company');
@@ -335,8 +334,7 @@ abstract class ActionsCardCommon
                     $adh->ref = $adh->getFullName($langs);
                     $this->tpl['linked_member'] = $adh->getNomUrl(1);
                 }
-                else
-                {
+                else {
                     $this->tpl['linked_member'] = $langs->trans("ThirdpartyNotLinkedToMember");
                 }
             }
diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php
index 0601760e34a..348163195d9 100644
--- a/htdocs/societe/canvas/company/actions_card_company.class.php
+++ b/htdocs/societe/canvas/company/actions_card_company.class.php
@@ -135,18 +135,15 @@ class ActionsCardCompany extends ActionsCardCommon
 					$s .= '<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
 					$this->tpl['tva_intra'] = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
 				}
-				else
-				{
+				else {
 					$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL", $this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
 				}
 			}
-			else
-			{
+			else {
 				$this->tpl['tva_intra'] = $s;
 			}
 		}
-		else
-		{
+		else {
 			// Confirm delete third party
 			if ($action == 'delete')
 			{
@@ -174,18 +171,15 @@ class ActionsCardCompany extends ActionsCardCommon
 						$s .= '<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
 						$this->tpl['tva_intra'] = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
 					}
-					else
-					{
+					else {
 						$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL", $this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
 					}
 				}
-				else
-				{
+				else {
 					$this->tpl['tva_intra'] = $s;
 				}
 			}
-			else
-			{
+			else {
 				$this->tpl['tva_intra'] = '&nbsp;';
 			}
 
@@ -197,8 +191,7 @@ class ActionsCardCompany extends ActionsCardCommon
 				$this->tpl['parent_company'] = $socm->getNomUrl(1).' '.($socm->code_client ? "(".$socm->code_client.")" : "");
 				$this->tpl['parent_company'] .= ($socm->town ? ' - '.$socm->town : '');
 			}
-			else
-			{
+			else {
 				$this->tpl['parent_company'] = $langs->trans("NoParentCompany");
 			}
 		}
diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php
index 9f236c8015e..6a93ac3e939 100644
--- a/htdocs/societe/canvas/individual/actions_card_individual.class.php
+++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php
@@ -111,8 +111,7 @@ class ActionsCardIndividual extends ActionsCardCommon
 		{
 			$this->tpl['select_civility'] = $formcompany->select_civility(GETPOST('civility_id'));
 		}
-		else
-		{
+		else {
 			// Confirm delete third party
 			if ($action == 'delete' || $conf->use_javascript_ajax)
 			{
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 681d4a37fc9..77299e3ee89 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -137,8 +137,7 @@ if (empty($reshook))
 			$langs->load('errors');
 			setEventMessages($langs->trans('ErrorThirdPartyIdIsMandatory', $langs->transnoentitiesnoconv('MergeOriginThirdparty')), null, 'errors');
 		}
-		else
-		{
+		else {
 			if (!$error && $soc_origin->fetch($soc_origin_id) < 1)
 			{
 				setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors');
@@ -302,8 +301,7 @@ if (empty($reshook))
 					setEventMessages($langs->trans('ThirdpartiesMergeSuccess'), null, 'mesgs');
 					$db->commit();
 				}
-				else
-				{
+				else {
 				    $langs->load("errors");
 					setEventMessages($langs->trans('ErrorsThirdpartyMerge'), null, 'errors');
 					$db->rollback();
@@ -404,8 +402,7 @@ if (empty($reshook))
 	            $object->name_bis = GETPOST('name', 'alpha');
 	            $object->firstname = GETPOST('firstname', 'alpha');
 	        }
-	        else
-	        {
+	        else {
 	            $object->name = GETPOST('name', 'alpha');
 	        }
 	        $object->entity					= (GETPOSTISSET('entity') ?GETPOST('entity', 'int') : $conf->entity);
@@ -609,16 +606,14 @@ if (empty($reshook))
                                 {
                                     $errors[] = "ErrorFailedToSaveFile";
                                 }
-                                else
-                                {
+                                else {
                                     // Create thumbs
                                     $object->addThumbs($newfile);
                                 }
                             }
                         }
                     }
-                    else
-					{
+                    else {
 						switch ($_FILES['photo']['error'])
 						{
 						    case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
@@ -632,8 +627,7 @@ if (empty($reshook))
 	                }
                     // Gestion du logo de la société
                 }
-                else
-				{
+                else {
 				    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
 					{
 						$duplicate_code_error = true;
@@ -656,8 +650,7 @@ if (empty($reshook))
                		    header("Location: ".$backtopage);
                     	exit;
                 	}
-                	else
-                	{
+                	else {
                 		$url = $_SERVER["PHP_SELF"]."?socid=".$object->id; // Old method
                     	if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url = DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
                     	elseif ($object->fournisseur == 1) $url = DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
@@ -666,8 +659,7 @@ if (empty($reshook))
                     	exit;
                 	}
                 }
-                else
-                {
+                else {
                     $db->rollback();
                     $action = 'create';
                 }
@@ -684,8 +676,7 @@ if (empty($reshook))
                		    header("Location: ".$backtopage);
                     	exit;
                 	}
-                	else
-                	{
+                	else {
                		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
                     	exit;
                 	}
@@ -760,8 +751,7 @@ if (empty($reshook))
                             {
                                 $errors[] = "ErrorFailedToSaveFile";
                             }
-                            else
-                            {
+                            else {
                             	// Create thumbs
                             	$object->addThumbs($newfile);
 
@@ -777,13 +767,11 @@ if (empty($reshook))
                             }
                         }
                     }
-                    else
-					{
+                    else {
                         $errors[] = "ErrorBadImageFormat";
                     }
                 }
-                else
-                {
+                else {
 					switch ($_FILES['photo']['error'])
 					{
 					    case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
@@ -818,21 +806,18 @@ if (empty($reshook))
                		    header("Location: ".$backtopage);
                     	exit;
                 	}
-                	else
-                	{
+                	else {
                		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
                     	exit;
                 	}
                 }
-                else
-                {
+                else {
                     $object->id = $socid;
                     $action = "edit";
                 }
             }
         }
-        else
-        {
+        else {
         	$action = ($action == 'add' ? 'create' : 'edit');
         }
     }
@@ -849,8 +834,7 @@ if (empty($reshook))
             header("Location: ".DOL_URL_ROOT."/societe/list.php?restore_lastsearch_values=1&delsoc=".urlencode($object->name));
             exit;
         }
-        else
-        {
+        else {
             $langs->load("errors");
            	setEventMessages($object->error, $object->errors, 'errors');
            	$error++;
@@ -920,8 +904,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
    	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
     $objcanvas->display_canvas($action); // Show template
 }
-else
-{
+else {
     // -----------------------------------------
     // When used in standard mode
     // -----------------------------------------
@@ -1062,8 +1045,7 @@ else
                     {
                         $errors[] = "ErrorFailedToSaveFile";
                     }
-                    else
-                    {
+                    else {
                         // Create thumbs
                         $object->addThumbs($newfile);
                     }
@@ -1205,8 +1187,7 @@ else
         {
 	        print '<span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName', 'name').'</span>';
         }
-        else
-		{
+        else {
 			print '<span id="TypeName" class="fieldrequired">'.$form->editfieldkey('ThirdPartyName', 'name', '', $object, 0).'</span>';
         }
 	    print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX) ? ' colspan="3"' : '').'>';
@@ -1342,8 +1323,7 @@ else
             {
                 print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
             }
-            else
-            {
+            else {
                 print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
             }
 
@@ -1432,8 +1412,7 @@ else
                 $s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
                 $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
             }
-            else
-            {
+            else {
                 $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
             }
         }
@@ -1485,8 +1464,7 @@ else
         {
             print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
         }
-        else
-        {
+        else {
             print $countrynotdefined;
         }
         print '</td></tr>';
@@ -1579,8 +1557,7 @@ else
             print ' &nbsp; &nbsp; ';
             print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
         }
-        else
-        {
+        else {
             print ' &nbsp; &nbsp; ';
             print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
         }
@@ -1837,8 +1814,7 @@ else
                     print '<input type="hidden" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'">';
                     print $object->prefix_comm;
                 }
-                else
-                {
+                else {
                     print '<input type="text" size="5" maxlength="5" name="prefix_comm" id="prefix" value="'.dol_escape_htmltag($object->prefix_comm).'">';
                 }
                 print '</td>';
@@ -1864,8 +1840,7 @@ else
             {
             	print '<input type="text" name="customer_code" id="customer_code" size="16" value="'.dol_escape_htmltag($object->code_client).'" maxlength="15">';
             }
-            else
-            {
+            else {
                 print $object->code_client;
                 print '<input type="hidden" name="customer_code" value="'.dol_escape_htmltag($object->code_client).'">';
             }
@@ -1905,8 +1880,7 @@ else
                 {
                     print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.$object->code_fournisseur.'" maxlength="15">';
                 }
-                else
-                {
+                else {
                     print $object->code_fournisseur;
                     print '<input type="hidden" name="supplier_code" value="'.$object->code_fournisseur.'">';
                 }
@@ -1962,8 +1936,7 @@ else
                 {
                     print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3">';
                 }
-                else
-                {
+                else {
                     print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3">';
                 }
 
@@ -2099,8 +2072,7 @@ else
                     $s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
                     $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
                 }
-                else
-                {
+                else {
                     $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
                 }
             }
@@ -2243,8 +2215,7 @@ else
             print '</form>';
         }
     }
-    else
-    {
+    else {
     	/*
          * View
          */
@@ -2406,8 +2377,7 @@ else
 			            $formcompany->select_localtax(1, $object->localtax1_value, "lt1");
 			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			        }
-			        else
-			        {
+			        else {
 			            print '<td>'.$object->localtax1_value.'</td>';
 			        }
 			        print '</tr></form>';
@@ -2500,15 +2470,13 @@ else
                     $s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT( $(\'#tva_intra\').val() );">'.$langs->trans("VATIntraCheck").'</a>';
                     $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
                 }
-                else
-                {
+                else {
                     $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
                 }
             }
             print $s;
         }
-        else
-        {
+        else {
             print '&nbsp;';
         }
         print '</td>';
@@ -2586,8 +2554,7 @@ else
         	{
         		print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
         	}
-        	else
-        	{
+        	else {
         		print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?socid='.$object->id);
         	}
         	print '</td></tr>';
@@ -2621,8 +2588,7 @@ else
         	{
         		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'editparentcompany', 's.rowid <> '.$object->id, 1);
         	}
-        	else
-        	{
+        	else {
         		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'none', 's.rowid <> '.$object->id, 1);
         	}
         	print '</td>';
@@ -2645,8 +2611,7 @@ else
                 $adh->ref = $adh->getFullName($langs);
                 print $adh->getNomUrl(1);
             }
-            else
-            {
+            else {
                 print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
             }
             print '</td>';
@@ -2696,8 +2661,7 @@ else
 			        	$langs->load("mails");
 			        	print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
 			        }
-			        else
-					{
+			        else {
 			        	$langs->load("mails");
 			       		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a>';
 			        }
@@ -2729,8 +2693,7 @@ else
 		            {
 		                print '<span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span>'."\n";
 		            }
-		            else
-					{
+		            else {
 		                print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
 		            }
 		        }
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index 91d0fe9bb1a..99e18f036aa 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -50,8 +50,7 @@ if (!$vatNumber)
 	print '<br>';
 	print '<font class="error">'.$langs->transnoentities("ErrorFieldRequired", $langs->trans("VATIntraShort")).'</font><br>';
 }
-else
-{
+else {
 	$vatNumber = preg_replace('/\^\w/', '', $vatNumber);
 	$vatNumber = str_replace(array(' ', '.'), '', $vatNumber);
 	$countryCode = substr($vatNumber, 0, 2);
@@ -127,8 +126,7 @@ else
 		print $langs->trans("ValueIsValid").': <font class="error">'.$langs->trans("No").'</font> (Might be a non europeen VAT)<br>';
 		//$messagetoshow=$soapclient->response;
 	}
-	else
-	{
+	else {
 		// Syntaxe ok
 		if ($result['requestDate']) print $langs->trans("Date").': '.$result['requestDate'].'<br>';
 		print $langs->trans("VATIntraSyntaxIsValid").': <font class="ok">'.$langs->trans("Yes").'</font><br>';
@@ -137,8 +135,7 @@ else
 		{
 			print '<font class="error">'.$langs->trans("ErrorVATCheckMS_UNAVAILABLE", $countryCode).'</font><br>';
 		}
-		else
-		{
+		else {
 			if (!empty($result['valid']) && ($result['valid'] == 1 || $result['valid'] == 'true'))
 			{
 				print '<font class="ok">'.$langs->trans("Yes").'</font>';
@@ -146,8 +143,7 @@ else
 				print $langs->trans("Name").': '.$result['name'].'<br>';
 				print $langs->trans("Address").': '.$result['address'].'<br>';
 			}
-			else
-			{
+			else {
 				print '<font class="error">'.$langs->trans("No").'</font>';
 				print '<br>'."\n";
 			}
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index c50a746c444..3ec6243a2c7 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -467,8 +467,7 @@ class Thirdparties extends DolibarrApi
 
 			throw new RestException(500, 'Error failed to merged thirdparty '.$this->companytoremove->id.' into '.$id.'. Enable and read log file for more information.');
 		}
-		else
-		{
+		else {
 			$db->commit();
 		}
 
@@ -1313,8 +1312,7 @@ class Thirdparties extends DolibarrApi
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			throw new RestException(404, 'Bank account not found');
 		}
 
@@ -1331,8 +1329,7 @@ class Thirdparties extends DolibarrApi
 		{
 			return array("success" => $result);
 		}
-		else
-		{
+		else {
 			throw new RestException(500);
 		}
     }
diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php
index 06c56b027cd..803d0ddebe3 100644
--- a/htdocs/societe/class/client.class.php
+++ b/htdocs/societe/class/client.class.php
@@ -84,8 +84,7 @@ class Client extends Societe
             $this->db->free($resql);
             return 1;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             $this->error = $this->db->lasterror();
             return -1;
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 7211802721e..00737c04504 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -112,19 +112,16 @@ class CompanyBankAccount extends Account
 					{
 						return 1;
 					}
-					else
-					{
+					else {
 						return 0;
 					}
 				}
-				else
-				{
+				else {
 					return 1;
 				}
 			}
 		}
-		else
-		{
+		else {
 			print $this->db->error();
 			return 0;
 		}
@@ -167,8 +164,7 @@ class CompanyBankAccount extends Account
 		}
 		if (trim($this->label) != '')
 			$sql .= ",label = '".$this->db->escape($this->label)."'";
-		else
-			$sql .= ",label = NULL";
+		else $sql .= ",label = NULL";
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$result = $this->db->query($sql);
@@ -184,18 +180,15 @@ class CompanyBankAccount extends Account
 				{
 					return 1;
 				}
-				else
-				{
+				else {
 					return -1;
 				}
 			}
-			else
-			{
+			else {
 				return 1;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -259,8 +252,7 @@ class CompanyBankAccount extends Account
 
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -308,8 +300,7 @@ class CompanyBankAccount extends Account
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1 * $error;
 		}
@@ -355,8 +346,7 @@ class CompanyBankAccount extends Account
 			{
 				return 0;
 			}
-			else
-			{
+			else {
 				$obj = $this->db->fetch_object($result1);
 
 				$this->db->begin();
@@ -377,15 +367,13 @@ class CompanyBankAccount extends Account
 					$this->db->rollback();
 					return -1;
 				}
-				else
-				{
+				else {
 					$this->db->commit();
 					return 1;
 				}
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index 5ba268f6687..ca75b904b11 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -440,8 +440,7 @@ class CompanyPaymentMode extends CommonObject
 			{
 				return 0;
 			}
-			else
-			{
+			else {
 				$obj = $this->db->fetch_object($result1);
 
 				$type = '';
@@ -467,15 +466,13 @@ class CompanyPaymentMode extends CommonObject
 					$this->db->rollback();
 					return -1;
 				}
-				else
-				{
+				else {
 					$this->db->commit();
 					return 1;
 				}
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -566,8 +563,7 @@ class CompanyPaymentMode extends CommonObject
 
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index de65e05d41e..e2b24577bf9 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -827,22 +827,19 @@ class Societe extends CommonObject
 					$this->db->commit();
 					return $this->id;
 				}
-				else
-				{
+				else {
 					dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',', $this->errors), LOG_ERR);
 					$this->db->rollback();
 					return -4;
 				}
 			}
-			else
-			{
+			else {
 				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name); // duplicate on a field (code or profid or ...)
 					$result = -1;
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->lasterror();
 					$result = -2;
 				}
@@ -850,8 +847,7 @@ class Societe extends CommonObject
 				return $result;
 			}
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::Create fails verify ".join(',', $this->errors), LOG_WARNING);
 			return -3;
@@ -1007,8 +1003,7 @@ class Societe extends CommonObject
 					}
 				}
 			}
-			else
-			{
+			else {
 				//var_dump($conf->global->SOCIETE_EMAIL_UNIQUE);
 				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
 				if ($key == 'EMAIL')
@@ -1337,8 +1332,7 @@ class Societe extends CommonObject
 						unset($this->state);
 					}
 				}
-				else
-				{
+				else {
 					unset($this->country_code); // We clean this, in the doubt, because it may have been changed after an update of country_id
 					unset($this->country);
 					unset($this->state_code);
@@ -1425,22 +1419,19 @@ class Societe extends CommonObject
 					$this->db->commit();
 					return 1;
 				}
-				else
-				{
+				else {
 					$this->db->rollback();
 					return -1;
 				}
 			}
-			else
-			{
+			else {
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					// Doublon
 					$this->error = $langs->trans("ErrorDuplicateField");
 					$result = -1;
 				}
-				else
-				{
+				else {
 					$this->error = $this->db->lasterror();
 					$result = -2;
 				}
@@ -1448,8 +1439,7 @@ class Societe extends CommonObject
 				return $result;
 			}
 		}
-		else
-	    {
+		else {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::Update fails verify ".join(',', $this->errors), LOG_WARNING);
 			return -3;
@@ -1675,15 +1665,13 @@ class Societe extends CommonObject
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 			}
-			else
-			{
+			else {
 				$result = 0;
 			}
 
 			$this->db->free($resql);
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$result = -3;
 		}
@@ -1822,8 +1810,7 @@ class Societe extends CommonObject
 
 				return 1;
 			}
-			else
-			{
+			else {
 				dol_syslog($this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
@@ -2051,8 +2038,7 @@ class Societe extends CommonObject
 			{
 				return $result;
 			}
-			else
-			{
+			else {
 				$this->error = $discount->error;
 				return -3;
 			}
@@ -2079,8 +2065,7 @@ class Societe extends CommonObject
 		{
 			return $result;
 		}
-		else
-		{
+		else {
 			$this->error = $discountstatic->error;
 			return -1;
 		}
@@ -2108,8 +2093,7 @@ class Societe extends CommonObject
 			$sql .= " AND ug.entity = ".$conf->entity.")";
 			$sql .= " OR u.admin = 1)";
 		}
-		else
-			$sql .= " WHERE entity in (0, ".$conf->entity.")";
+		else $sql .= " WHERE entity in (0, ".$conf->entity.")";
 
 		$sql .= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
 
@@ -2136,8 +2120,7 @@ class Societe extends CommonObject
 					$reparray[$i]['login'] = $obj->login;
 					$reparray[$i]['photo'] = $obj->photo;
 				}
-				else
-				{
+				else {
 					$reparray[] = $obj->rowid;
 				}
 				$i++;
@@ -2249,8 +2232,7 @@ class Societe extends CommonObject
                 $this->db->commit();
                 return 1;
 			}
-			else
-			{
+			else {
 			    $this->db->rollback();
 			    return -1;
 			}
@@ -2335,8 +2317,7 @@ class Societe extends CommonObject
 			{
 				$name = $code.' '.$name;
 			}
-			else
-			{
+			else {
 				$name = $code;
 			}
 		}
@@ -2629,8 +2610,7 @@ class Societe extends CommonObject
 						{
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).($obj->poste ? " - ".$obj->poste : "").(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
 						}
-						else
-						{
+						else {
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
 						}
 					}
@@ -2638,8 +2618,7 @@ class Societe extends CommonObject
 				}
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 		return $contact_property;
@@ -2673,8 +2652,7 @@ class Societe extends CommonObject
 				}
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 		return $contacts;
@@ -2710,8 +2688,7 @@ class Societe extends CommonObject
 				}
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 		return $contacts;
@@ -2750,8 +2727,7 @@ class Societe extends CommonObject
 			}
 			return $contact_property;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -2918,8 +2894,7 @@ class Societe extends CommonObject
 			if ($mod->code_modifiable) return 1; // A mettre en dernier
 			return 0;
 		}
-		else
-		{
+		else {
 			return 0;
 		}
 	}
@@ -2954,8 +2929,7 @@ class Societe extends CommonObject
 			if ($mod->code_modifiable) return 1; // A mettre en dernier
 			return 0;
 		}
-		else
-		{
+		else {
 			return 0;
 		}
 	}
@@ -2992,8 +2966,7 @@ class Societe extends CommonObject
 		   	$result = $mod->verif($this->db, $this->code_client, $this, 0);
 			return $result;
 		}
-		else
-		{
+		else {
 			return 0;
 		}
 	}
@@ -3029,8 +3002,7 @@ class Societe extends CommonObject
 			$result = $mod->verif($this->db, $this->code_fournisseur, $this, 1);
 			return $result;
 		}
-		else
-		{
+		else {
 			return 0;
 		}
 	}
@@ -3072,14 +3044,12 @@ class Societe extends CommonObject
 
 				return $result;
 			}
-			else
-			{
+			else {
 				$this->error = 'ErrorAccountancyCodeNotDefined';
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			if ($type == 'customer') $this->code_compta = '';
 			elseif ($type == 'supplier') $this->code_compta_fournisseur = '';
 
@@ -3109,8 +3079,7 @@ class Societe extends CommonObject
 				$this->parent = $id;
 				return 1;
 			}
-			else
-			{
+			else {
 				return -1;
 			}
 		}
@@ -3205,8 +3174,7 @@ class Societe extends CommonObject
 			$obj = $this->db->fetch_object($resql);
 			$count = $obj->idprof;
 		}
-		else
-		{
+		else {
 			$count = 0;
 			print $this->db->error();
 		}
@@ -3306,8 +3274,7 @@ class Societe extends CommonObject
 			if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string))
 				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
 					return 1;
-			else
-				return -1;
+			else return -1;
 
 			//algorithm checking type code CIF
 			$sum = $num[2] + $num[4] + $num[6];
@@ -3319,29 +3286,25 @@ class Societe extends CommonObject
 			if (preg_match('/^[KLM]{1}/', $string))
 				if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
 					return 1;
-			else
-				return -1;
+			else return -1;
 
 			//Check CIF
 			if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string))
 				if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
 					return 2;
-			else
-				return -2;
+			else return -2;
 
 			//Check NIE T
 			if (preg_match('/^[T]{1}/', $string))
 				if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
 					return 3;
-			else
-				return -3;
+			else return -3;
 
 			//Check NIE XYZ
 			if (preg_match('/^[XYZ]{1}/', $string))
 				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X', 'Y', 'Z'), array('0', '1', '2'), $string), 0, 8) % 23, 1))
 					return 3;
-			else
-				return -3;
+			else return -3;
 
 			//Can not be verified
 			return -4;
@@ -3440,8 +3403,7 @@ class Societe extends CommonObject
 			$obj = $this->db->fetch_object($resql);
 			$count = $obj->numproj;
 		}
-		else
-		{
+		else {
 			$count = 0;
 			print $this->db->error();
 		}
@@ -3491,8 +3453,7 @@ class Societe extends CommonObject
 
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3558,8 +3519,7 @@ class Societe extends CommonObject
 			}
 			return 0;
 		}
-		else
-		{
+		else {
 			return -1;
 		}
 	}
@@ -3581,8 +3541,7 @@ class Societe extends CommonObject
 
 			if ($resql = $this->db->query($sql)) return 0;
 		}
-		else
-		{
+		else {
 			return 0;
 		}
 		return -1;
@@ -3645,16 +3604,14 @@ class Societe extends CommonObject
 				$this->db->commit();
 				return $this->id;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->error();
 
 				$this->db->rollback();
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			// $this->error deja positionne
 			dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',', $this->errors), LOG_ERR);
 
@@ -3696,7 +3653,7 @@ class Societe extends CommonObject
 				$country_code = $tmp[1];
 				$country_label = $tmp[2];
 			}
-			else                    // For backward compatibility
+			else // For backward compatibility
 			{
 				dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_WARNING);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -3721,7 +3678,7 @@ class Societe extends CommonObject
 				$state_code = $tmp[1];
 				$state_label = $tmp[2];
 			}
-			else                    // For backward compatibility
+			else // For backward compatibility
 			{
 				dol_syslog("Your state setup use an old syntax. Reedit it using setup area.", LOG_ERR);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -3904,8 +3861,7 @@ class Societe extends CommonObject
 			$obj = $this->db->fetch_object($resql);
    			return (($obj->nb > 0) ?true:false);
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			return false;
 		}
@@ -3991,8 +3947,7 @@ class Societe extends CommonObject
 			elseif ($status == '1' || $status == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
 			elseif ($status == '2' || $status == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
 			elseif ($status == '3' || $status == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
-			else
-			{
+			else {
 				return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0).' '.(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label);
 			}
 		}
@@ -4003,8 +3958,7 @@ class Societe extends CommonObject
 			elseif ($status == '1' || $status == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1);
 			elseif ($status == '2' || $status == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2);
 			elseif ($status == '3' || $status == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3);
-			else
-			{
+			else {
 				return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0);
 			}
 		}
@@ -4015,8 +3969,7 @@ class Societe extends CommonObject
 			elseif ($status == '1' || $status == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
 			elseif ($status == '2' || $status == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
 			elseif ($status == '3' || $status == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
-			else
-			{
+			else {
 				return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0).' '.(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label);
 			}
 		}
@@ -4074,8 +4027,7 @@ class Societe extends CommonObject
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
 		}
-		else
-			return array();
+		else return array();
 	}
 
 	/**
@@ -4114,8 +4066,7 @@ class Societe extends CommonObject
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
 		}
-		else
-			return array();
+		else return array();
 	}
 
 	/**
@@ -4157,8 +4108,7 @@ class Societe extends CommonObject
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 				$tmpobject = new FactureFournisseur($this->db);
 			}
-			else
-			{
+			else {
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$tmpobject = new Facture($this->db);
 			}
@@ -4194,8 +4144,7 @@ class Societe extends CommonObject
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
 		}
-		else
-		{
+		else {
 			return array();
 		}
 	}
@@ -4255,8 +4204,7 @@ class Societe extends CommonObject
 			if (!$result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
 			$result = $companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
-		else
-		{
+		else {
 			// Positionne le modele sur le nom du modele a utiliser
 			if (!dol_strlen($modele))
 			{
@@ -4264,8 +4212,7 @@ class Societe extends CommonObject
 				{
 					$modele = $conf->global->COMPANY_ADDON_PDF;
 				}
-				else
-				{
+				else {
 					print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
 					return 0;
 				}
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 98bdeffa637..1f99e9bae8a 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -557,8 +557,7 @@ class SocieteAccount extends CommonObject
 
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index ad7383d81af..2660625bd1c 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -428,8 +428,7 @@ if ($sql_select)
 		{
 			print $documentstaticline->getLibStatut(2);
 		}
-		else
-		{
+		else {
 			print $documentstatic->getLibStatut(2);
 		}
 		print '</td>';
@@ -472,8 +471,7 @@ if ($sql_select)
 
 				$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
 			}
-			else
-			{
+			else {
 				$label = $objp->product_label;
 			}
 
@@ -522,14 +520,12 @@ if ($sql_select)
 					// Add date of deposit
 					if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
 				}
-				else
-				{
+				else {
 					echo ($txt ? ' - ' : '').dol_htmlentitiesbr($objp->description);
 				}
 			}
 		}
-		else
-		{
+		else {
 			if ($objp->fk_product > 0) {
 				echo $form->textwithtooltip($text, $description, 3, '', '', $i, 0, '');
 
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index d082ae6baa5..9f3751fd5b2 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -167,8 +167,7 @@ if ($object->id)
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	accessforbidden('', 0, 0);
 }
 
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 0000494a3fe..c62ec602ecd 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -120,8 +120,7 @@ if (!empty($conf->use_javascript_ajax) && ((round($third['prospect']) ? 1 : 0) +
 	print $dolgraph->show();
     print '</td></tr>'."\n";
 }
-else
-{
+else {
     if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS))
     {
         $statstring = "<tr>";
@@ -186,8 +185,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 				{
 					$dataseries[] = array($obj->label, round($obj->nb));
 				}
-				else
-				{
+				else {
 					$rest += $obj->nb;
 				}
 				$total += $obj->nb;
@@ -207,8 +205,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 			$dolgraph->draw('idgraphcateg');
 			print $dolgraph->show();
 		}
-		else
-		{
+		else {
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($result);
@@ -335,8 +332,7 @@ if ($result)
         print "<!-- End last thirdparties modified -->\n";
     }
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 1df7c38d6c5..cb94da91e2f 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -1050,8 +1050,7 @@ while ($i < min($num, $limit))
 		{
 		    print $obj->name;
 		}
-		else
-		{
+		else {
 		    print $companystatic->getNomUrl(1, '', 100, 0, 1);
 		}
 		print "</td>\n";
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index 2e3e3ec4532..48a31085eb4 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -123,8 +123,7 @@ if ($object->id > 0)
 
     dol_fiche_end();
 }
-else
-{
+else {
 	$langs->load("errors");
 	print $langs->trans("ErrorRecordNotFound");
 }
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 191f9c4bb2c..0650261cefc 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -105,8 +105,7 @@ if (empty($reshook))
                     dol_print_error($db);
                 }
             }
-            else
-            {
+            else {
                 dol_print_error($db);
             }
 
@@ -114,8 +113,7 @@ if (empty($reshook))
             {
                 $db->commit();
             }
-            else
-            {
+            else {
                 $db->rollback();
             }
         }
@@ -264,8 +262,7 @@ if ($result > 0)
         print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
         print '</tr>';
     }
-    else
-    {
+    else {
         print '<tr class="oddeven"><td colspan="4" class="opacitymedium">';
         print $langs->trans("YouMustCreateContactFirst");
         print '</td></tr>';
@@ -294,8 +291,7 @@ if ($result > 0)
     {
         $num = $db->num_rows($resql);
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 
@@ -334,8 +330,7 @@ if ($result > 0)
                 {
                     print ' &lt;'.$obj->email.'&gt;';
                 }
-                else
-                {
+                else {
                     $langs->load("errors");
                     print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
                 }
@@ -444,8 +439,7 @@ if ($result > 0)
     {
         $num = $db->num_rows($resql);
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 
@@ -494,8 +488,7 @@ if ($result > 0)
 	            print $contactstatic->getNomUrl(1);
 	            print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
             }
-            else
-			{
+            else {
 				print $obj->email;
             }
             print '</td>';
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 6385346ce5d..2d5e0612959 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -176,8 +176,7 @@ if (empty($reshook))
 			{
 				setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
 			}
-			else
-			{
+			else {
 				// If this account is the default bank account, we disable others
 				if ($companybankaccount->default_rib)
 				{
@@ -231,8 +230,7 @@ if (empty($reshook))
 			{
 				setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
 			}
-			else
-			{
+			else {
 				// If this account is the default bank account, we disable others
 				if ($companypaymentmode->default_rib)
 				{
@@ -339,8 +337,7 @@ if (empty($reshook))
 				header('Location: '.$url);
 				exit;
 			}
-			else
-			{
+			else {
 				$db->rollback();
 			}
 		}
@@ -408,8 +405,7 @@ if (empty($reshook))
 				header('Location: '.$url);
 				exit;
 			}
-			else
-			{
+			else {
 				$db->rollback();
 			}
 		}
@@ -425,8 +421,7 @@ if (empty($reshook))
 			header('Location: '.$url);
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($db->lasterror, null, 'errors');
 		}
 	}
@@ -452,13 +447,11 @@ if (empty($reshook))
 				header('Location: '.$url);
 				exit;
 			}
-			else
-			{
+			else {
 				setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
 			}
 		}
-		else
-		{
+		else {
 			setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
 		}
 	}
@@ -474,13 +467,11 @@ if (empty($reshook))
 				header('Location: '.$url);
 				exit;
 			}
-			else
-			{
+			else {
 				setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
 			}
 		}
-		else
-		{
+		else {
 			setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
 		}
 	}
@@ -516,8 +507,7 @@ if (empty($reshook))
 				$error++;
 				setEventMessages('ThisThirdpartyIsNotACustomer', null, 'errors');
 			}
-			else
-			{
+			else {
 				// Creation of Stripe customer + update of societe_account
 				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus, 1);
 				if (!$cu)
@@ -525,8 +515,7 @@ if (empty($reshook))
 					$error++;
 					setEventMessages($stripe->error, $stripe->errors, 'errors');
 				}
-				else
-				{
+				else {
 					$stripecu = $cu->id;
 				}
 			}
@@ -541,8 +530,7 @@ if (empty($reshook))
 				$error++;
 				setEventMessages('ThisPaymentModeIsNotACard', null, 'errors');
 			}
-			else
-			{
+			else {
 				// Get the Stripe customer
 				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
 				if (!$cu)
@@ -613,8 +601,7 @@ if (empty($reshook))
 				$stripecu = $newcu;
 				$db->commit();
 			}
-			else
-			{
+			else {
 				$db->rollback();
 			}
 		}
@@ -670,8 +657,7 @@ if (empty($reshook))
 				$stripesupplieracc = $newsup;
 				$db->commit();
 			}
-			else
-			{
+			else {
 				$db->rollback();
 			}
 		}
@@ -699,8 +685,7 @@ if (empty($reshook))
 				{
 					$cu->invoice_settings->default_payment_method = (string) $source; // New
 				}
-				else
-				{
+				else {
 					$cu->default_source = (string) $source; // Old
 				}
 				$result = $cu->save();
@@ -726,8 +711,7 @@ if (empty($reshook))
 					    $payment_method->detach();
 				    }
 				}
-				else
-				{
+				else {
 				    $cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
 				    $card = $cu->sources->retrieve("$source");
 				    if ($card) {
@@ -783,8 +767,7 @@ if (!$id)
 	$companybankaccount->fetch(0, $object->id);
 	$companypaymentmode->fetch(0, null, $object->id, 'card');
 }
-else
-{
+else {
 	$companybankaccount->fetch($id);
 	$companypaymentmode->fetch($id);
 }
@@ -976,8 +959,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 					{
 						$listofsources = $customerstripe->sources->data;
 					}
-					else
-					{
+					else {
 						$service = 'StripeTest';
 						$servicestatus = 0;
 						if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha'))
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 6d69e692a96..2f0595cf15d 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -467,8 +467,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			}
 			print "</table>";
 		}
-		else
-		{
+		else {
 			print $langs->trans('None');
 		}
 
@@ -476,8 +475,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'">'.$langs->trans("Ok").'</a></div>';
 		print "\n</div><br>\n";
 	}
-	else
-	{
+	else {
         // View mode
 
 		/* ************************************************************************** */
@@ -591,8 +589,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
                 print "</tr>\n";
             }
         }
-        else
-        {
+        else {
             $colspan = 9;
             if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan += 1;
             print '<tr class="oddeven"><td colspan="'.$colspan.'">'.$langs->trans('None').'</td></tr>';
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 5ff86ff0064..e25b5c5e606 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -79,15 +79,13 @@ if ($action == 'addcontact' && $user->rights->societe->creer)
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
 		}
-		else
-		{
+		else {
 			$mesg = '<div class="error">'.$object->error.'</div>';
 		}
 	}
@@ -100,8 +98,7 @@ elseif ($action == 'swapstatut' && $user->rights->societe->creer)
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -328,16 +325,14 @@ if ($id > 0 || !empty($ref))
 							}
 							print '</td>';
 						}
-						else
-						{
+						else {
 							print '<td class="left nowrap">';
 							if ($objp->subscription == 'yes')
 							{
 								print $langs->trans("SubscriptionNotReceived");
 								if ($objp->statut > 0) print " ".img_warning();
 							}
-							else
-							{
+							else {
 								print '&nbsp;';
 							}
 							print '</td>';
@@ -351,8 +346,7 @@ if ($id > 0 || !empty($ref))
 			}
 		}
 	}
-	else
-	{
+	else {
 		// Contrat non trouve
 		print "ErrorRecordNotFound";
 	}

From ae06b35c63a5adde998074a5f93958c23942155b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 02:06:40 +0200
Subject: [PATCH 330/490] add new rule

---
 htdocs/categories/admin/categorie.php         | 12 +--
 htdocs/categories/card.php                    |  6 +-
 .../categories/class/api_categories.class.php |  3 +-
 htdocs/categories/class/categorie.class.php   | 99 +++++++------------
 htdocs/categories/edit.php                    |  9 +-
 htdocs/categories/index.php                   |  5 +-
 htdocs/categories/photos.php                  |  9 +-
 htdocs/categories/viewcat.php                 | 69 +++++--------
 htdocs/collab/index.php                       |  9 +-
 htdocs/don/admin/donation.php                 | 33 +++----
 htdocs/don/card.php                           | 24 ++---
 htdocs/don/class/api_donations.class.php      |  3 +-
 htdocs/don/class/don.class.php                | 54 ++++------
 htdocs/don/class/paymentdonation.class.php    | 27 ++---
 htdocs/don/document.php                       |  3 +-
 htdocs/don/list.php                           |  3 +-
 htdocs/don/payment/card.php                   | 12 +--
 htdocs/don/payment/payment.php                |  6 +-
 htdocs/don/stats/index.php                    |  3 +-
 19 files changed, 130 insertions(+), 259 deletions(-)

diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
index 6dd313692db..017de5cd1e6 100644
--- a/htdocs/categories/admin/categorie.php
+++ b/htdocs/categories/admin/categorie.php
@@ -48,8 +48,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
     }
-    else
-    {
+    else {
         setEventMessages($db->lasterror(), null, 'errors');
     }
 }
@@ -62,8 +61,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
     }
-    else
-    {
+    else {
          setEventMessages($db->lasterror(), null, 'errors');
     }
 }
@@ -108,14 +106,12 @@ if ($conf->use_javascript_ajax)
 {
 	print ajax_constantonoff('CATEGORIE_RECURSIV_ADD');
 }
-else
-{
+else {
 	if (empty($conf->global->CATEGORIE_RECURSIV_ADD))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_CATEGORIE_RECURSIV_ADD">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	}
-	else
-	{
+	else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_CATEGORIE_RECURSIV_ADD">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index 67adacb5aae..a91a3df7827 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -119,8 +119,7 @@ if ($action == 'add' && $user->rights->categorie->creer)
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$type);
 			exit;
 		}
-		else
-		{
+		else {
 			header("Location: ".DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
 			exit;
 		}
@@ -156,8 +155,7 @@ if ($action == 'add' && $user->rights->categorie->creer)
 			$action = 'confirmed';
 			$_POST["addcat"] = '';
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index d6eff682908..205e38f3e5e 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -244,8 +244,7 @@ class Categories extends DolibarrApi
         {
             return $this->get($id);
         }
-        else
-        {
+        else {
             throw new RestException(500, $this->category->error);
         }
     }
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index dc451855c0a..d8f5ef4eeeb 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -321,8 +321,7 @@ class Categorie extends CommonObject
 		{
 			$sql .= " WHERE ref_ext LIKE '".$this->db->escape($ref_ext)."'";
 		}
-		else
-		{
+		else {
 			$sql .= " WHERE label = '".$this->db->escape($label)."' AND entity IN (".getEntity('category').")";
 			if (!is_null($type)) $sql .= " AND type = ".$this->db->escape($type);
 		}
@@ -362,13 +361,11 @@ class Categorie extends CommonObject
 
 				return 1;
 			}
-			else
-			{
+			else {
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -483,20 +480,17 @@ class Categorie extends CommonObject
     				$this->db->commit();
     				return $id;
                 }
-                else
-              	{
+                else {
                 	$this->db->rollback();
                     return -3;
                 }
 			}
-			else
-			{
+			else {
 				$this->db->rollback();
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -574,8 +568,7 @@ class Categorie extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			dol_print_error($this->db);
 			return -1;
@@ -661,8 +654,7 @@ class Categorie extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -722,8 +714,7 @@ class Categorie extends CommonObject
 						}
 					}
 				}
-				else
-				{
+				else {
 					$error++;
 					$this->error = $this->db->lasterror();
 				}
@@ -748,22 +739,19 @@ class Categorie extends CommonObject
 			    $this->db->commit();
 			    return 1;
 			}
-			else
-			{
+			else {
 			    $this->db->rollback();
 			    return -2;
 			}
 		}
-		else
-		{
+		else {
 		    $this->db->rollback();
 			if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				$this->error = $this->db->lasterrno();
 				return -3;
 			}
-			else
-			{
+			else {
 				$this->error = $this->db->lasterror();
 			}
 			return -1;
@@ -815,14 +803,12 @@ class Categorie extends CommonObject
 			    $this->db->commit();
 			    return 1;
 			}
-			else
-			{
+			else {
 			    $this->db->rollback();
                 return -2;
 			}
 		}
-		else
-		{
+		else {
 		    $this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -874,8 +860,7 @@ class Categorie extends CommonObject
 			    {
 			    	$objs[] = $rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])];
 			    }
-			    else
-			    {
+			    else {
 				    $obj = new $this->MAP_OBJ_CLASS[$type]($this->db);
 				    $obj->fetch($rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])]);
 				    $objs[] = $obj;
@@ -883,8 +868,7 @@ class Categorie extends CommonObject
 			}
 			return $objs;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error().' sql='.$sql;
 			return -1;
 		}
@@ -1046,8 +1030,7 @@ class Categorie extends CommonObject
 			}
 			return $cats;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1080,8 +1063,7 @@ class Categorie extends CommonObject
 			}
 			return 1;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1124,8 +1106,7 @@ class Categorie extends CommonObject
             {
                 $markafterid = array($markafterid);
             }
-            else
-            {
+            else {
                 $markafterid = array();
             }
         }
@@ -1166,8 +1147,7 @@ class Categorie extends CommonObject
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1312,8 +1292,7 @@ class Categorie extends CommonObject
 			}
 			return $cats;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1376,8 +1355,7 @@ class Categorie extends CommonObject
 			dol_syslog(get_class($this)."::already_exists no category with same name=".$this->label." and same parent ".$this->fk_parent." than category id=".$this->id, LOG_DEBUG);
 			return 0;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1430,8 +1408,7 @@ class Categorie extends CommonObject
 			        $linkend = '</a>';
 			        $w[] = $link.($addpicto ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
 				}
-				else
-				{
+				else {
 					$w[] = "<a href='".DOL_URL_ROOT."/".$url."?catid=".$cat->id."'>".($addpicto ? img_object('', 'category') : '').$cat->label."</a>";
 				}
 			}
@@ -1473,8 +1450,7 @@ class Categorie extends CommonObject
 			}
 			return $parents;
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1554,14 +1530,12 @@ class Categorie extends CommonObject
     				}
 		        }
 		    }
-		    else
-		    {
+		    else {
 		        dol_print_error($this->db);
 		        return -1;
 		    }
 		}
-        else
-        {
+        else {
     		$sql = "SELECT ct.fk_categorie, c.label, c.rowid";
     		$sql .= " FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type])." as ct, ".MAIN_DB_PREFIX."categorie as c";
     		$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".(int) $id." AND c.type = ".$this->MAP_ID[$type];
@@ -1583,8 +1557,7 @@ class Categorie extends CommonObject
     				}
     			}
     		}
-    		else
-    		{
+    		else {
     			dol_print_error($this->db);
     			return -1;
     		}
@@ -1632,8 +1605,7 @@ class Categorie extends CommonObject
 				$nom = '%'.str_replace('*', '%', $nom).'%';
 			if (!$case)
 				$sql .= " AND label LIKE '".$this->db->escape($nom)."'";
-			else
-				$sql .= " AND label LIKE BINARY '".$this->db->escape($nom)."'";
+			else $sql .= " AND label LIKE BINARY '".$this->db->escape($nom)."'";
 		}
 		if ($id)
 		{
@@ -1652,8 +1624,7 @@ class Categorie extends CommonObject
 
 			return $cats;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error().' sql='.$sql;
 			return -1;
 		}
@@ -1879,8 +1850,7 @@ class Categorie extends CommonObject
 	                $sql2 .= " description='".$this->db->escape($this->description)."'";
 	                $sql2 .= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";
 	            }
-	            else
-	            {
+	            else {
 	                $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";
 	                $sql2 .= " VALUES(".$this->id.",'".$key."','".$this->db->escape($this->label);
 	                $sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
@@ -1901,8 +1871,7 @@ class Categorie extends CommonObject
 	                $sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
 	                $sql2 .= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";
 	            }
-	            else
-	            {
+	            else {
 	                $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";
 	                $sql2 .= " VALUES(".$this->id.",'".$key."','".$this->db->escape($this->multilangs["$key"]["label"]);
 	                $sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
@@ -1961,8 +1930,7 @@ class Categorie extends CommonObject
 	        }
 	        return 1;
 	    }
-	    else
-	    {
+	    else {
 	        $this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
 	        return -1;
 	    }
@@ -2067,8 +2035,7 @@ class Categorie extends CommonObject
 		{
 			return " AND (".implode(' AND ', $searchCategorySqlList).")";
 		}
-		else
-		{
+		else {
 			return "";
 		}
 	}
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 48bd82b9326..dfd8f01f381 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -90,8 +90,7 @@ if ($action == 'update' && $user->rights->categorie->creer)
 
 	if ($parent != "-1")
 		$object->fk_parent = $parent;
-	else
-		$object->fk_parent = "";
+	else $object->fk_parent = "";
 
 
 	if (empty($object->label))
@@ -110,13 +109,11 @@ if ($action == 'update' && $user->rights->categorie->creer)
 			header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index b36101750f2..d88e1a0ff8c 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -54,7 +54,7 @@ $typetext = $type;
 if ($type == Categorie::TYPE_ACCOUNT) 			$title = $langs->trans('AccountsCategoriesArea');
 elseif ($type == Categorie::TYPE_WAREHOUSE) 	$title = $langs->trans('StocksCategoriesArea');
 elseif ($type == Categorie::TYPE_ACTIONCOMM)	$title = $langs->trans('ActionCommCategoriesArea');
-else 											$title = $langs->trans(ucfirst($type).'sCategoriesArea');
+else $title = $langs->trans(ucfirst($type).'sCategoriesArea');
 
 $arrayofjs = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
 $arrayofcss = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
@@ -207,8 +207,7 @@ if ($nbofentries > 0)
 	tree_recur($data, $data[0], 0);
 	print '</td></tr>';
 }
-else
-{
+else {
 	print '<tr class="pair">';
 	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
 	print '<td valign="middle">';
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index 07e5d56d268..7443bc5b532 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -180,8 +180,7 @@ if ($object->id)
 			print '<a class="butAction hideonsmartphone" href="'.$_SERVER['PHP_SELF'].'?action=ajout_photo&amp;id='.$object->id.'&amp;type='.$type.'">';
 			print $langs->trans("AddPhoto").'</a>';
 		}
-		else
-		{
+		else {
 			print '<a class="butActionRefused classfortooltip hideonsmartphone" href="#">';
 			print $langs->trans("AddPhoto").'</a>';
 		}
@@ -232,8 +231,7 @@ if ($object->id)
     			{
     				$filename = $obj['photo_vignette'];
     			}
-    			else
-    			{
+    			else {
     				$filename = $obj['photo'];
     			}
 
@@ -281,8 +279,7 @@ if ($object->id)
 		}
 	}
 }
-else
-{
+else {
     print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 803b4ae34ab..921a1f12061 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -162,8 +162,7 @@ if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confi
 		header("Location: ".DOL_URL_ROOT.'/categories/index.php?type='.$type);
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -181,14 +180,12 @@ if ($type == Categorie::TYPE_PRODUCT && $elemid && $action == 'addintocategory'
 	{
 		setEventMessages($langs->trans("WasAddedSuccessfully", $newobject->ref), null, 'mesgs');
 	}
-	else
-	{
+	else {
 		if ($cat->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			setEventMessages($langs->trans("ObjectAlreadyLinkedToCategory"), null, 'warnings');
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -337,8 +334,7 @@ elseif (count($cats) < 1)
 	print '<td colspan="3" class="opacitymedium">'.$langs->trans("NoSubCat").'</td>';
 	print '</tr>';
 }
-else
-{
+else {
 	$categstatic = new Categorie($db);
 
 	$fulltree = $categstatic->get_full_arbo($type, $object->id, 1);
@@ -408,8 +404,7 @@ else
 		print '</td>';
 		print '</tr>';
 	}
-	else
-	{
+	else {
 		print '<tr class="pair">';
 		print '<td colspan="3">';
 		print '<table class="nobordernopadding">';
@@ -451,8 +446,7 @@ if ($type == Categorie::TYPE_PRODUCT)
 	{
 		dol_print_error($db, $prods->error, $prods->errors);
 	}
-	else
-	{
+	else {
 		// Form to add record into a category
 		$showclassifyform = 1;
 		if ($showclassifyform)
@@ -515,8 +509,7 @@ if ($type == Categorie::TYPE_PRODUCT)
 				print "</tr>\n";
 			}
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -534,8 +527,7 @@ if ($type == Categorie::TYPE_SUPPLIER)
 	{
 		dol_print_error($db, $socs->error, $socs->errors);
 	}
-	else
-	{
+	else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -576,8 +568,7 @@ if ($type == Categorie::TYPE_SUPPLIER)
 				print "</tr>\n";
 			}
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -595,8 +586,7 @@ if ($type == Categorie::TYPE_CUSTOMER)
 	{
 		dol_print_error($db, $socs->error, $socs->errors);
 	}
-	else
-	{
+	else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -636,8 +626,7 @@ if ($type == Categorie::TYPE_CUSTOMER)
 				print "</tr>\n";
 			}
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -658,8 +647,7 @@ if ($type == Categorie::TYPE_MEMBER)
 	{
 		dol_print_error($db, $prods->error, $prods->errors);
 	}
-	else
-	{
+	else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -701,8 +689,7 @@ if ($type == Categorie::TYPE_MEMBER)
 				print "</tr>\n";
 			}
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -721,8 +708,7 @@ if ($type == Categorie::TYPE_CONTACT)
 	{
 		dol_print_error($db, $contacts->error, $contacts->errors);
 	}
-	else
-	{
+	else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -765,8 +751,7 @@ if ($type == Categorie::TYPE_CONTACT)
 				print "</tr>\n";
 			}
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -787,8 +772,7 @@ if ($type == Categorie::TYPE_ACCOUNT)
     {
         dol_print_error($db, $accounts->error, $accounts->errors);
     }
-    else
-    {
+    else {
     	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
     	print '<input type="hidden" name="token" value="'.newToken().'">';
     	print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -829,8 +813,7 @@ if ($type == Categorie::TYPE_ACCOUNT)
                 print "</tr>\n";
             }
         }
-        else
-        {
+        else {
             print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
         }
         print "</table>\n";
@@ -851,8 +834,7 @@ if ($type == Categorie::TYPE_PROJECT)
 	{
 		dol_print_error($db, $object->error, $object->errors);
 	}
-	else
-	{
+	else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -894,8 +876,7 @@ if ($type == Categorie::TYPE_PROJECT)
 				print "</tr>\n";
 			}
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -914,8 +895,7 @@ if ($type == Categorie::TYPE_USER)
 	{
 		dol_print_error($db, $object->error, $object->errors);
 	}
-	else
-	{
+	else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -954,8 +934,7 @@ if ($type == Categorie::TYPE_USER)
 				print "</tr>\n";
 			}
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -977,8 +956,7 @@ if ($type == Categorie::TYPE_WAREHOUSE)
 	{
 		dol_print_error($db, $object->error, $object->errors);
 	}
-	else
-	{
+	else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -1020,8 +998,7 @@ if ($type == Categorie::TYPE_WAREHOUSE)
 				print "</tr>\n";
 			}
 		}
-		else
-		{
+		else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
diff --git a/htdocs/collab/index.php b/htdocs/collab/index.php
index c570e12ba31..f6344f4ebf0 100644
--- a/htdocs/collab/index.php
+++ b/htdocs/collab/index.php
@@ -95,8 +95,7 @@ if ($action == 'add')
 		setEventMessages($langs->trans("PageAdded", $objectpage->pageurl), null, 'mesgs');
 		$action = '';
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 
@@ -130,13 +129,11 @@ if ($action == 'delete')
 			header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website);
 			exit;
 		}
-		else
-		{
+		else {
 			$db->rollback();
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index e8e7fa4f5b9..514d79dcd77 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -71,14 +71,12 @@ if ($action == 'specimen')
             header("Location: ".DOL_URL_ROOT."/document.php?modulepart=donation&file=SPECIMEN.html");
             return;
         }
-        else
-        {
+        else {
             setEventMessages($obj->error, $obj->errors, 'errors');
             dol_syslog($obj->error, LOG_ERR);
         }
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
         dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -130,8 +128,7 @@ if ($action == 'set_DONATION_ACCOUNTINGACCOUNT')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -148,8 +145,7 @@ if ($action == 'set_DONATION_MESSAGE')
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -165,8 +161,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 }
@@ -179,8 +174,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 }
@@ -223,8 +217,7 @@ if ($resql)
 		$i++;
 	}
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -276,15 +269,13 @@ if (is_resource($handle))
 						print img_picto($langs->trans("Enabled"), 'switch_on');
 						print '</td>';
 					}
-					else
-					{
+					else {
 						print "<td class=\"center\">\n";
 						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 						print '</td>';
 					}
 				}
-				else
-				{
+				else {
 					print "<td class=\"center\">\n";
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 					print "</td>";
@@ -297,8 +288,7 @@ if (is_resource($handle))
 					print img_picto($langs->trans("Default"), 'on');
 					print '</td>';
 				}
-				else
-				{
+				else {
 					print "<td class=\"center\">";
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 					print '</td>';
@@ -371,8 +361,7 @@ if (!empty($conf->accounting->enabled))
 {
 	print $formaccounting->select_account($conf->global->DONATION_ACCOUNTINGACCOUNT, 'DONATION_ACCOUNTINGACCOUNT', 1, '', 1, 1);
 }
-else
-{
+else {
 	print '<input type="text" size="10" id="DONATION_ACCOUNTINGACCOUNT" name="DONATION_ACCOUNTINGACCOUNT" value="'.$conf->global->DONATION_ACCOUNTINGACCOUNT.'">';
 }
 print '</td><td class="center">';
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 505d2fbed29..7af11d46ebf 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -181,8 +181,7 @@ if ($action == 'add')
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$res);
 			exit;
 		}
-		else
-		{
+		else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -196,8 +195,7 @@ if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights-
         header("Location: index.php");
         exit;
     }
-    else
-    {
+    else {
         dol_syslog($object->error, LOG_DEBUG);
         setEventMessages($object->error, $object->errors, 'errors');
     }
@@ -355,8 +353,7 @@ if ($action == 'create')
 			print ')';
 			print '</td>';
 		}
-		else
-		{
+		else {
 			print '<td colspan="2">';
 			print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 			// Option to reload page to retrieve customer informations. Note, this clear other input
@@ -520,8 +517,7 @@ if (!empty($id) && $action == 'edit')
 	{
 		print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.price($object->amount).'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
 	}
-	else
-	{
+	else {
 		print '<tr><td>'.$langs->trans("Amount").'</td><td>';
 		print price($object->amount, 0, $langs, 0, 0, -1, $conf->currency);
 		print '</td></tr>';
@@ -777,8 +773,7 @@ if (!empty($id) && $action != 'edit')
 		print "</table>";
 		$db->free($resql);
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 
@@ -815,8 +810,7 @@ if (!empty($id) && $action != 'edit')
 		{
 			print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPayment').'</span></div>';
 		}
-		else
-		{
+		else {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/don/payment/payment.php?rowid='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a></div>';
 		}
 	}
@@ -834,13 +828,11 @@ if (!empty($id) && $action != 'edit')
 		{
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete">'.$langs->trans("Delete")."</a></div>";
 		}
-		else
-		{
+		else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
 		}
 	}
-	else
-	{
+	else {
 		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
 	}
 
diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index 872e2009b9b..69bd1e58042 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -231,8 +231,7 @@ class Donations extends DolibarrApi
         {
             return $this->get($id);
         }
-        else
-        {
+        else {
         	throw new RestException(500, $this->don->error);
         }
     }
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 59c293e6386..f80feff1869 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -315,8 +315,7 @@ class Don extends CommonObject
             	$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Amount'));
                 $err++;
             }
-            else
-            {
+            else {
                 if ($this->amount < $minimum && $minimum > 0)
                 {
                 	$error_string[] = $langs->trans('MinimumAmount', $langs->transnoentitiesnoconv('$minimum'));
@@ -330,8 +329,7 @@ class Don extends CommonObject
             $this->errors = $error_string;
             return 0;
         }
-        else
-		{
+        else {
             return 1;
         }
     }
@@ -423,8 +421,7 @@ class Don extends CommonObject
                 // End call triggers
             }
         }
-        else
-        {
+        else {
             $this->error = $this->db->lasterror();
             $this->errno = $this->db->lasterrno();
             $error++;
@@ -453,8 +450,7 @@ class Don extends CommonObject
             $this->db->commit();
             return $ret;
         }
-        else
-        {
+        else {
             $this->db->rollback();
             return -1;
         }
@@ -534,14 +530,12 @@ class Don extends CommonObject
                 $this->db->commit();
                 $result = 1;
             }
-            else
-            {
+            else {
                 $this->db->rollback();
                 $result = -1;
             }
         }
-        else
-		{
+        else {
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->error;
             $this->db->rollback();
@@ -613,8 +607,7 @@ class Don extends CommonObject
             $this->db->commit();
             return 1;
         }
-        else
-        {
+        else {
         	foreach ($this->errors as $errmsg)
         	{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
@@ -709,8 +702,7 @@ class Don extends CommonObject
             }
             return 1;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return -1;
         }
@@ -762,8 +754,7 @@ class Don extends CommonObject
             	}
             }
         }
-        else
-        {
+        else {
             $error++;
             $this->error = $this->db->lasterror();
         }
@@ -773,8 +764,7 @@ class Don extends CommonObject
         	$this->db->commit();
         	return 1;
         }
-        else
-        {
+        else {
         	$this->db->rollback();
         	return -1;
         }
@@ -805,13 +795,11 @@ class Don extends CommonObject
             {
                 return 1;
             }
-            else
-            {
+            else {
                 return 0;
             }
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return -1;
         }
@@ -836,13 +824,11 @@ class Don extends CommonObject
             {
                 return 1;
             }
-            else
-            {
+            else {
                 return 0;
             }
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             return -1;
         }
@@ -905,8 +891,7 @@ class Don extends CommonObject
             $this->db->free($resql);
             return 1;
         }
-        else
-        {
+        else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -991,8 +976,7 @@ class Don extends CommonObject
 			}
 			$this->db->free($result);
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 		}
 	}
@@ -1089,16 +1073,14 @@ class Don extends CommonObject
 				dol_delete_preview($object);
 				return 1;
 			}
-			else
-			{
+			else {
 				$outputlangs->charset_output = $sav_charset_output;
 				dol_syslog("Erreur dans don_create");
 				dol_print_error($this->db, $obj->error);
 				return 0;
 			}
 		}
-		else
-		{
+		else {
 			print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 			return 0;
 		}
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index 64644d18971..416884c3a24 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -168,8 +168,7 @@ class PaymentDonation extends CommonObject
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_donation");
 				$this->ref = $this->id;
 			}
-			else
-			{
+			else {
 				$error++;
 			}
 		}
@@ -189,8 +188,7 @@ class PaymentDonation extends CommonObject
 		    $this->db->commit();
 			return $this->id;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -259,8 +257,7 @@ class PaymentDonation extends CommonObject
 
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -342,8 +339,7 @@ class PaymentDonation extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -412,8 +408,7 @@ class PaymentDonation extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
@@ -467,8 +462,7 @@ class PaymentDonation extends CommonObject
 			$this->db->commit();
 			return $object->id;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -593,8 +587,7 @@ class PaymentDonation extends CommonObject
                     }
                 }
             }
-            else
-            {
+            else {
                 $this->error = $acc->error;
                 $error++;
             }
@@ -604,8 +597,7 @@ class PaymentDonation extends CommonObject
         {
             return 1;
         }
-        else
-        {
+        else {
             return -1;
         }
     }
@@ -629,8 +621,7 @@ class PaymentDonation extends CommonObject
 		{
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error();
 			return 0;
 		}
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index f2994b95577..98884af9c6f 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -187,8 +187,7 @@ if ($object->id)
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
-else
-{
+else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 65ec24b1458..8c5ad9a36e0 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -284,8 +284,7 @@ if ($resql)
     print "</form>\n";
     $db->free($resql);
 }
-else
-{
+else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index e1784dc4b8b..57d5fe160a0 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -64,8 +64,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->don->supp
         header("Location: ".DOL_URL_ROOT."/don/index.php");
         exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
 	}
@@ -102,8 +101,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->don->cree
 		header('Location: card.php?id='.$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -254,8 +252,7 @@ if ($resql)
 	print "</table>\n";
 	$db->free($resql);
 }
-else
-{
+else {
 	dol_print_error($db);
 }
 
@@ -290,8 +287,7 @@ if (empty($action))
 		{
 			print '<a class="butActionDelete" href="card.php?id='.$_GET['id'].'&amp;action=delete">'.$langs->trans('Delete').'</a>';
 		}
-		else
-		{
+		else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
 		}
 	}
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index b3ab7e2d360..162193dc51d 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -138,8 +138,7 @@ if ($action == 'add_payment')
                 header('Location: '.$loc);
                 exit;
             }
-            else
-            {
+            else {
                 $db->rollback();
             }
         }
@@ -261,8 +260,7 @@ if ($action == 'create')
 			$namef = "amount_".$objp->id;
 			print '<input type="text" size="8" name="'.$namef.'">';
 		}
-		else
-		{
+		else {
 			print '-';
 		}
 		print "</td>";
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index 46b0d93d564..247656dc2ad 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -76,8 +76,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
 }
-else
-{
+else {
     $filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
 }
 

From a636f81eacac399e03d99be64dd359718736d291 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 02:17:21 +0200
Subject: [PATCH 331/490] add new rule

---
 dev/examples/code/create_invoice.php       |   9 +-
 dev/examples/code/create_order.php         |   9 +-
 dev/examples/code/create_product.php       |   6 +-
 dev/examples/code/create_user.php          |   9 +-
 dev/initdata/dbf/importdb-products.php     |   3 +-
 dev/initdata/dbf/importdb-thirdparties.php |   9 +-
 dev/initdata/dbf/includes/dbase.class.php  |   9 +-
 dev/initdata/generate-invoice.php          |   6 +-
 dev/initdata/generate-order.php            |   6 +-
 dev/initdata/generate-proposal.php         |   6 +-
 dev/initdata/generate-thirdparty.php       |   3 +-
 dev/initdata/import-products.php           |  12 +-
 dev/initdata/import-thirdparties.php       |  15 +-
 dev/initdata/import-users.php              |   6 +-
 dev/initdata/purge-data.php                |  11 +-
 htdocs/exports/class/export.class.php      |  56 +--
 htdocs/exports/export.php                  |  45 +-
 htdocs/install/check.php                   |  63 +--
 htdocs/install/inc.php                     |  12 +-
 htdocs/install/repair.php                  |  99 ++---
 htdocs/install/step1.php                   |  44 +-
 htdocs/install/step2.php                   |  51 +--
 htdocs/install/step5.php                   |  36 +-
 htdocs/install/upgrade.php                 |  15 +-
 htdocs/install/upgrade2.php                | 451 +++++++--------------
 25 files changed, 333 insertions(+), 658 deletions(-)

diff --git a/dev/examples/code/create_invoice.php b/dev/examples/code/create_invoice.php
index 1b212e0a5d7..0b2c4e54697 100755
--- a/dev/examples/code/create_invoice.php
+++ b/dev/examples/code/create_invoice.php
@@ -87,14 +87,12 @@ if ($idobject > 0)
 	// Change status to validated
 	$result=$obj->validate($user);
 	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
-	{
+	else {
 		$error++;
 		dol_print_error($db, $obj->error);
 	}
 }
-else
-{
+else {
 	$error++;
 	dol_print_error($db, $obj->error);
 }
@@ -107,8 +105,7 @@ if (! $error)
 	$db->commit();
 	print '--- end ok'."\n";
 }
-else
-{
+else {
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }
diff --git a/dev/examples/code/create_order.php b/dev/examples/code/create_order.php
index 703254ad5e9..d46913f3fcf 100755
--- a/dev/examples/code/create_order.php
+++ b/dev/examples/code/create_order.php
@@ -85,14 +85,12 @@ if ($idobject > 0)
 	// Change status to validated
 	$result=$com->valid($user);
 	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
-	{
+	else {
 		$error++;
 		dol_print_error($db, $com->error);
 	}
 }
-else
-{
+else {
 	$error++;
 	dol_print_error($db, $com->error);
 }
@@ -105,8 +103,7 @@ if (! $error)
 	$db->commit();
 	print '--- end ok'."\n";
 }
-else
-{
+else {
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }
diff --git a/dev/examples/code/create_product.php b/dev/examples/code/create_product.php
index 234658388df..fb09c5f6e43 100755
--- a/dev/examples/code/create_product.php
+++ b/dev/examples/code/create_product.php
@@ -83,8 +83,7 @@ if ($idobject > 0)
 {
 	print "OK Object created with id ".$idobject."\n";
 }
-else
-{
+else {
 	$error++;
 	dol_print_error($db, $myproduct->error);
 }
@@ -96,8 +95,7 @@ if (! $error)
 	$db->commit();
 	print '--- end ok'."\n";
 }
-else
-{
+else {
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }
diff --git a/dev/examples/code/create_user.php b/dev/examples/code/create_user.php
index 96d369085d2..79fe30b73bf 100755
--- a/dev/examples/code/create_user.php
+++ b/dev/examples/code/create_user.php
@@ -74,8 +74,7 @@ if ($idobject > 0)
 	// Change status to validated
 	$result=$obj->setStatut(1);
 	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
-	{
+	else {
 		$error++;
 		dol_print_error($db, $obj->error);
 	}
@@ -84,8 +83,7 @@ elseif ($obj->error == 'ErrorLoginAlreadyExists')
 {
      print "User with login ".$obj->login." already exists\n";
 }
-else
-{
+else {
 	$error++;
 	dol_print_error($db, $obj->error);
 }
@@ -98,8 +96,7 @@ if (! $error)
 	$db->commit();
 	print '--- end ok'."\n";
 }
-else
-{
+else {
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }
diff --git a/dev/initdata/dbf/importdb-products.php b/dev/initdata/dbf/importdb-products.php
index 845064f0688..2c06c07e103 100644
--- a/dev/initdata/dbf/importdb-products.php
+++ b/dev/initdata/dbf/importdb-products.php
@@ -227,8 +227,7 @@ while ($fields = $db->fetch_array($resql)) {
 		$error++;    // $errorrecord will be reset
 	}
 	$j++;
-} else
-    die("error : $sql");
+} else die("error : $sql");
 
 
 
diff --git a/dev/initdata/dbf/importdb-thirdparties.php b/dev/initdata/dbf/importdb-thirdparties.php
index 8f0eb0635f0..a6b2697eed8 100644
--- a/dev/initdata/dbf/importdb-thirdparties.php
+++ b/dev/initdata/dbf/importdb-thirdparties.php
@@ -179,8 +179,7 @@ while ($fields = $db->fetch_array($resql)) {
 	$object->town = trim($fields['FVILLE']);
 	if ($fields['FPAYS'])
 		$object->country_id = dol_getIdFromCode($db, trim(ucwords(strtolower($fields['FPAYS']))), 'c_country', 'label', 'rowid');
-	else
-		$object->country_id = 1;
+	else $object->country_id = 1;
 	$object->phone = trim($fields['FTEL']) ? trim($fields['FTEL']) : trim($fields['FCONTACT']);
 	$object->phone = substr($object->phone, 0, 20);
 	$object->fax = trim($fields['FFAX']) ? trim($fields['FFAX']) : trim($fields['FCONTACT']);
@@ -299,8 +298,7 @@ while ($fields = $db->fetch_array($resql)) {
 		$contact->town = trim($fields['LVILLE']);
 		if ($fields['FPAYS'])
 			$contact->country_id = dol_getIdFromCode($db, trim(ucwords(strtolower($fields['LPAYS']))), 'c_country', 'label', 'rowid');
-		else
-			$contact->country_id = 1;
+		else $contact->country_id = 1;
 		$contact->email = $fields['LMAIL'];
 		$contact->phone = trim($fields['LTEL']) ? trim($fields['LTEL']) : trim($fields['LCONTACT']);
 		$contact->fax = trim($fields['LFAX']) ? trim($fields['LFAX']) : trim($fields['LCONTACT']);
@@ -340,8 +338,7 @@ while ($fields = $db->fetch_array($resql)) {
 		$error++;    // $errorrecord will be reset
 	}
 	$j++;
-} else
-    die("error : $sql");
+} else die("error : $sql");
 
 $db->commit();
 
diff --git a/dev/initdata/dbf/includes/dbase.class.php b/dev/initdata/dbf/includes/dbase.class.php
index 0c2f6820a96..e70f18087c4 100644
--- a/dev/initdata/dbf/includes/dbase.class.php
+++ b/dev/initdata/dbf/includes/dbase.class.php
@@ -207,8 +207,7 @@ class DBase
                     $value = true;
                 elseif ($value == 'f' || $value == 'n')
                     $value = false;
-                else
-                    $value = null;
+                else $value = null;
             }
             $record[$i] = $value;
         }
@@ -295,8 +294,7 @@ class DBase
         $i = unpack("S$n", $data);
         if ($n == 1)
             return (int) $i[1];
-        else
-            return array_merge($i);
+        else return array_merge($i);
     }
 
     private static function putInt16($fd, $value)
@@ -310,8 +308,7 @@ class DBase
         $i = unpack("L$n", $data);
         if ($n == 1)
             return (int) $i[1];
-        else
-            return array_merge($i);
+        else return array_merge($i);
     }
 
     private static function putInt32($fd, $value)
diff --git a/dev/initdata/generate-invoice.php b/dev/initdata/generate-invoice.php
index 3fe058e8d3e..d4522ef047e 100755
--- a/dev/initdata/generate-invoice.php
+++ b/dev/initdata/generate-invoice.php
@@ -180,13 +180,11 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 		{
 			print " OK with ref ".$object->ref."\n";;
 		}
-		else
-		{
+		else {
 			dol_print_error($db, $object->error);
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db, $object->error);
 	}
 }
diff --git a/dev/initdata/generate-order.php b/dev/initdata/generate-order.php
index 1dc56aa5582..f63d50a1967 100755
--- a/dev/initdata/generate-order.php
+++ b/dev/initdata/generate-order.php
@@ -207,15 +207,13 @@ for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
             $db->commit();
             print " OK with ref ".$object->ref."\n";
         }
-        else
-        {
+        else {
             print " KO\n";
             $db->rollback();
             dol_print_error($db, $object->error);
         }
     }
-    else
-    {
+    else {
         print " KO\n";
         $db->rollback();
         dol_print_error($db, $object->error);
diff --git a/dev/initdata/generate-proposal.php b/dev/initdata/generate-proposal.php
index 4c5d70aadc4..60ba418b43b 100755
--- a/dev/initdata/generate-proposal.php
+++ b/dev/initdata/generate-proposal.php
@@ -211,15 +211,13 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 		    $db->commit();
 		    print " OK with ref ".$object->ref."\n";
 		}
-		else
-		{
+		else {
 		    print " KO\n";
 		    $db->rollback();
 		    dol_print_error($db, $object->error);
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db, $object->error);
 	}
 }
diff --git a/dev/initdata/generate-thirdparty.php b/dev/initdata/generate-thirdparty.php
index 05ac6416aa3..f7bde473038 100755
--- a/dev/initdata/generate-thirdparty.php
+++ b/dev/initdata/generate-thirdparty.php
@@ -137,8 +137,7 @@ for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++)
 
         print "Company ".$s." created nom=".$soc->name."\n";
     }
-    else
-    {
+    else {
     	print "Error: ".$soc->error."\n";
     }
 }
diff --git a/dev/initdata/import-products.php b/dev/initdata/import-products.php
index 4288c5bf3b1..78f3a0789f8 100755
--- a/dev/initdata/import-products.php
+++ b/dev/initdata/import-products.php
@@ -164,8 +164,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         print " - Error in create result code = ".$ret." - ".$produit->errorsToString();
         $errorrecord++;
     }
-	else
-	{
+	else {
 	    print " - Creation OK with ref ".$produit->ref." - id = ".$ret;
 	}
 
@@ -181,8 +180,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
             print " - Error in updatePrice result code = ".$ret1." ".$ret2." - ".$produit->errorsToString();
             $errorrecord++;
         }
-    	else
-    	{
+    	else {
     	    print " - updatePrice OK";
     	}
 	}
@@ -201,8 +199,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
             print " - Error in setMultiLangs result code = ".$ret." - ".$produit->errorsToString();
             $errorrecord++;
         }
-    	else
-    	{
+    	else {
     	    print " - setMultiLangs OK";
     	}
 	}
@@ -228,8 +225,7 @@ if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
     print "Rollback any changes.\n";
     $db->rollback();
 }
-else
-{
+else {
     print "Commit all changes.\n";
     $db->commit();
 }
diff --git a/dev/initdata/import-thirdparties.php b/dev/initdata/import-thirdparties.php
index ef1dfcc99ab..87fef83de0f 100755
--- a/dev/initdata/import-thirdparties.php
+++ b/dev/initdata/import-thirdparties.php
@@ -182,8 +182,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
             print " - Error in create result code = ".$ret." - ".$object->errorsToString();
             $errorrecord++;
         }
-    	else
-    	{
+    	else {
     	    print " - Creation OK with name ".$object->name." - id = ".$ret;
     	}
     }
@@ -213,8 +212,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     	    print " - Error in create link with sale representative result code = ".$result." - ".$object->errorsToString();
     	    $errorrecord++;
     	}
-    	else
-    	{
+    	else {
     	    print " - create link sale representative OK";
     	}
 	}
@@ -244,8 +242,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
             $errorrecord++;
         }
-    	else
-    	{
+    	else {
     	    print " - create contact OK";
     	}
 	}
@@ -278,8 +275,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
             $errorrecord++;
         }
-    	else
-    	{
+    	else {
     	    print " - create contact OK";
     	}
 	}
@@ -306,8 +302,7 @@ if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
     print "Rollback any changes.\n";
     $db->rollback();
 }
-else
-{
+else {
     print "Commit all changes.\n";
     $db->commit();
 }
diff --git a/dev/initdata/import-users.php b/dev/initdata/import-users.php
index 4247415288c..25fa6a69e2d 100755
--- a/dev/initdata/import-users.php
+++ b/dev/initdata/import-users.php
@@ -143,8 +143,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         print " - Error in create result code = ".$ret." - ".$object->errorsToString();
         $errorrecord++;
     }
-	else
-	{
+	else {
 	    print " - Creation OK with login ".$object->login." - id = ".$ret;
 	}
 
@@ -169,8 +168,7 @@ if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
     print "Rollback any changes.\n";
     $db->rollback();
 }
-else
-{
+else {
     print "Commit all changes.\n";
     $db->commit();
 }
diff --git a/dev/initdata/purge-data.php b/dev/initdata/purge-data.php
index b1aadd56ed8..f9d8420b1e1 100755
--- a/dev/initdata/purge-data.php
+++ b/dev/initdata/purge-data.php
@@ -198,7 +198,7 @@ if (empty($option))
 if ($option != 'all')
 {
     $listofoptions=explode(',', $option);
-    foreach($listofoptions as $cursoroption)
+    foreach ($listofoptions as $cursoroption)
     {
         if (! in_array($cursoroption, array_keys($sqls))) {
             print "Usage:  $script_file (test|confirm) (all|option) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
@@ -264,7 +264,7 @@ function processfamily($family, $date)
     global $db, $sqls;
 
     $error=0;
-    foreach($sqls[$family] as $sql)
+    foreach ($sqls[$family] as $sql)
     {
         if (preg_match('/^@/', $sql))
         {
@@ -302,10 +302,10 @@ function processfamily($family, $date)
 $db->begin();
 
 $listofoptions=explode(',', $option);
-foreach($listofoptions as $cursoroption)
+foreach ($listofoptions as $cursoroption)
 {
     $oldfamily='';
-    foreach($sqls as $family => $familysql)
+    foreach ($sqls as $family => $familysql)
     {
         if ($cursoroption && $cursoroption != 'all' && $cursoroption != $family) continue;
 
@@ -326,8 +326,7 @@ if ($error || $mode != 'confirm')
     print "\nRollback any changes.\n";
     $db->rollback();
 }
-else
-{
+else {
     print "Commit all changes.\n";
     $db->commit();
 }
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 978a3059ace..a6873f2894a 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -142,8 +142,7 @@ class Export
 	    									{
 	    										$bool = $user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
 	    									}
-	    									else
-	    									{
+	    									else {
 	    										$bool = $user->rights->{$perm[0]}->{$perm[1]};
 	    									}
 	    									if ($perm[0] == 'user' && $user->admin) $bool = true;
@@ -295,8 +294,7 @@ class Export
 			case 'Text':
 				if (!(strpos($ValueField, '%') === false))
 					$szFilterQuery .= " ".$NameField." LIKE '".$ValueField."'";
-				else
-					$szFilterQuery .= " ".$NameField." = '".$ValueField."'";
+				else $szFilterQuery .= " ".$NameField." = '".$ValueField."'";
 				break;
 			case 'Date':
 				if (strpos($ValueField, "+") > 0)
@@ -306,12 +304,10 @@ class Export
 					$szFilterQuery = "(".$this->conditionDate($NameField, trim($ValueArray[0]), ">=");
 					$szFilterQuery .= " AND ".$this->conditionDate($NameField, trim($ValueArray[1]), "<=").")";
 				}
-				else
-				{
+				else {
 					if (is_numeric(substr($ValueField, 0, 1)))
 						$szFilterQuery = $this->conditionDate($NameField, trim($ValueField), "=");
-					else
-						$szFilterQuery = $this->conditionDate($NameField, trim(substr($ValueField, 1)), substr($ValueField, 0, 1));
+					else $szFilterQuery = $this->conditionDate($NameField, trim(substr($ValueField, 1)), substr($ValueField, 0, 1));
 				}
 				break;
 			case 'Duree':
@@ -325,12 +321,10 @@ class Export
 					$szFilterQuery = "(".$NameField.">=".$ValueArray[0];
 					$szFilterQuery .= " AND ".$NameField."<=".$ValueArray[1].")";
 				}
-				else
-				{
+				else {
 					if (is_numeric(substr($ValueField, 0, 1)))
 						$szFilterQuery = " ".$NameField."=".$ValueField;
-					else
-						$szFilterQuery = " ".$NameField.substr($ValueField, 0, 1).substr($ValueField, 1);
+					else $szFilterQuery = " ".$NameField.substr($ValueField, 0, 1).substr($ValueField, 1);
 				}
 				break;
 			case 'Boolean':
@@ -343,8 +337,7 @@ class Export
 				else {
                     if (!(strpos($ValueField, '%') === false))
                         $szFilterQuery = " ".$NameField." LIKE '".$ValueField."'";
-                    else
-                        $szFilterQuery = " ".$NameField." = '".$ValueField."'";
+                    else $szFilterQuery = " ".$NameField." = '".$ValueField."'";
 				}
 				break;
 			default:
@@ -367,7 +360,7 @@ class Export
 		// TODO date_format is forbidden, not performant and not portable. Use instead BETWEEN
 		if (strlen($Value) == 4) $Condition = " date_format(".$Field.",'%Y') ".$Sens." '".$Value."'";
 		elseif (strlen($Value) == 6) $Condition = " date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'";
-		else  $Condition = " date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
+		else $Condition = " date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
 		return $Condition;
     }
 
@@ -428,8 +421,7 @@ class Export
 
 				if (!empty($InfoFieldList[3]))
 					$keyList = $InfoFieldList[3];
-				else
-					$keyList = 'rowid';
+				else $keyList = 'rowid';
 				$sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3]) ? '' : ', '.$InfoFieldList[3].' as code');
 				if ($InfoFieldList[1] == 'c_stcomm') $sql = 'SELECT id as id, '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3]) ? '' : ', '.$InfoFieldList[3].' as code');
 				if ($InfoFieldList[1] == 'c_country') $sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label, code as code';
@@ -474,8 +466,7 @@ class Export
 							{
 								$szFilterField .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 							}
-							else
-							{
+							else {
 								$szFilterField .= '<option value="'.$obj->rowid.'" >'.$labeltoshow.'</option>';
 							}
 							$i++;
@@ -564,8 +555,7 @@ class Export
 		$objmodel = new $classname($this->db);
 
 		if (!empty($sqlquery)) $sql = $sqlquery;
-        else
-		{
+        else {
 			// Define value for indice from $datatoexport
 			$foundindice = 0;
 			foreach ($this->array_export_code as $key => $dataset)
@@ -595,8 +585,7 @@ class Export
 			//$this->array_export_label[$indice]
 			if ($conf->global->EXPORT_PREFIX_SPEC)
 				$filename = $conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport;
-			else
-				$filename = "export_".$datatoexport;
+			else $filename = "export_".$datatoexport;
 			$filename .= '.'.$objmodel->getDriverExtension();
 			$dirname = $conf->export->dir_temp.'/'.$user->id;
 
@@ -665,8 +654,7 @@ class Export
 								}
 								$obj->$alias = $remaintopay;
 							}
-							else
-							{
+							else {
 							    // TODO FIXME Export of compute field does not work. $obj containt $obj->alias_field and formulat will contains $obj->field
 							    $computestring = $this->array_export_special[$indice][$key];
 							    $tmp = dol_eval($computestring, 1, 0);
@@ -689,15 +677,13 @@ class Export
 
         		return 1;
 			}
-			else
-			{
+			else {
 				$this->error = $objmodel->error;
 				dol_syslog("Export::build_file Error: ".$this->error, LOG_ERR);
 				return -1;
 			}
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->error()." - sql=".$sql;
 			return -1;
 		}
@@ -740,8 +726,7 @@ class Export
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->error = $this->db->lasterror();
 			$this->errno = $this->db->lasterrno();
 			$this->db->rollback();
@@ -777,14 +762,12 @@ class Export
 
 				return 1;
 			}
-			else
-			{
+			else {
 				$this->error = "ModelNotFound";
 				return -2;
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($this->db);
 			return -3;
 		}
@@ -823,8 +806,7 @@ class Export
 			$this->db->rollback();
 			return -1 * $error;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return 1;
 		}
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 6543747d1f7..b6b0e7b7fa5 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -174,8 +174,7 @@ if ($action == 'selectfield')     // Selection of field at step 2
 		    $_SESSION["export_selected_fields"] = $array_selected;
 		}
     }
-    else
-    {
+    else {
         $warnings = array();
 
         $array_selected[$field] = count($array_selected) + 1; // We tag the key $field as "selected"
@@ -223,8 +222,7 @@ if ($action == 'unselectfield')
 		$array_selected = array();
 		$_SESSION["export_selected_fields"] = $array_selected;
     }
-    else
-    {
+    else {
 	    unset($array_selected[$_GET["field"]]);
 	    // Renumber fields of array_selected (from 1 to nb_elements)
 	    asort($array_selected);
@@ -288,8 +286,7 @@ if ($action == 'builddoc')
 		setEventMessages($objexport->error, $objexport->errors, 'errors');
 		$sqlusedforexport = $objexport->sqlusedforexport;
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("FileSuccessfullyBuilt"), null, 'mesgs');
 	    $sqlusedforexport = $objexport->sqlusedforexport;
     }
@@ -351,17 +348,14 @@ if ($action == 'add_export_model')
 		{
 			setEventMessages($langs->trans("ExportModelSaved", $objexport->model_name), null, 'mesgs');
 		}
-		else
-		{
+		else {
 			$langs->load("errors");
 			if ($objexport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				setEventMessages($langs->trans("ErrorExportDuplicateProfil"), null, 'errors');
-			else
-				setEventMessages($objexport->error, $objexport->errors, 'errors');
+			else setEventMessages($objexport->error, $objexport->errors, 'errors');
 		}
 	}
-	else
-	{
+	else {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ExportModelName")), null, 'errors');
 	}
 }
@@ -473,15 +467,13 @@ if ($step == 1 || !$datatoexport)
             {
             	print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&module_position='.$objexport->array_export_module[$key]->module_position.'&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"), 'filenew').'</a>';
             }
-            else
-            {
+            else {
             	print $langs->trans("NotEnoughPermissions");
             }
            	print '</td></tr>';
         }
     }
-    else
-    {
+    else {
         print '<tr><td class="oddeven" colspan="3">'.$langs->trans("NoExportableData").'</td></tr>';
     }
     print '</table>';
@@ -615,8 +607,7 @@ if ($step == 2 && $datatoexport)
         {
             $htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
         }
-        else
-        {
+        else {
             $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
         }
    		if (!empty($objexport->array_export_examplevalues[0][$code]))
@@ -643,8 +634,7 @@ if ($step == 2 && $datatoexport)
 			//print ' ('.$code.')';
             print '</td>';
         }
-        else
-        {
+        else {
         	// Fields not selected
             print '<td>';
 			//print $text.'-'.$htmltext."<br>";
@@ -673,13 +663,11 @@ if ($step == 2 && $datatoexport)
 		{
 			print '<a class="butAction" href="export.php?step=3&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
 		}
-		else
-		{
+		else {
 			print '<a class="butAction" href="export.php?step=4&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
 		}
 	}
-	else
-	{
+	else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("SelectAtLeastOneField")).'">'.$langs->trans("NextStep").'</a>';
 	}
 
@@ -811,8 +799,7 @@ if ($step == 3 && $datatoexport)
 		{
 		    $htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
 		}
-		else
-		{
+		else {
 		    $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
 		}
 		if (!empty($objexport->array_export_examplevalues[0][$code]))
@@ -842,8 +829,7 @@ if ($step == 3 && $datatoexport)
 				$tmp = $objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter);
 				print $form->textwithpicto($tmp, $szInfoFiltre);
 			}
-			else
-			{
+			else {
 				print $objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter);
 			}
 		}
@@ -1006,8 +992,7 @@ if ($step == 4 && $datatoexport)
         {
             $htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
         }
-        else
-        {
+        else {
             $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
         }
         if (!empty($objexport->array_export_examplevalues[0][$code]))
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 408f4b2a1a8..792f72d8831 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -88,8 +88,7 @@ elseif (versioncompare(versionphparray(), $arrayphpminversionwarning) < 0)    //
     print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionwarning));
     $checksok = 0; // 0=error, 1=warning
 }
-else
-{
+else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPVersion")." ".versiontostring(versionphparray());
 }
 if (empty($force_install_nophpinfo)) print ' (<a href="phpinfo.php" target="_blank">'.$langs->trans("MoreInformation").'</a>)';
@@ -104,8 +103,7 @@ if (!isset($_GET["testget"]) && !isset($_POST["testpost"]))
 	print "<br>\n";
 	$checksok = 0;
 }
-else
-{
+else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportPOSTGETOk")."<br>\n";
 }
 
@@ -116,8 +114,7 @@ if (!function_exists("session_id"))
 	print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportSessions")."<br>\n";
 	$checksok = 0;
 }
-else
-{
+else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportSessions")."<br>\n";
 }
 
@@ -129,8 +126,7 @@ if (!function_exists("imagecreate"))
 	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportGD")."<br>\n";
 	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
 }
-else
-{
+else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportGD")."<br>\n";
 }
 
@@ -142,8 +138,7 @@ if (!function_exists("curl_init"))
     print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportCurl")."<br>\n";
     // $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
 }
-else
-{
+else {
     print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportCurl")."<br>\n";
 }
 
@@ -152,8 +147,7 @@ if (!function_exists("easter_date"))
 {
     print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportCalendar")."<br>\n";
 }
-else
-{
+else {
     print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportCalendar")."<br>\n";
 }
 
@@ -165,8 +159,7 @@ if (!function_exists("utf8_encode"))
 	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportUTF8")."<br>\n";
 	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
 }
-else
-{
+else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportUTF8")."<br>\n";
 }
 
@@ -180,8 +173,7 @@ if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@loc
 	    print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportIntl")."<br>\n";
 	    // $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
 	}
-	else
-	{
+	else {
 	    print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportIntl")."<br>\n";
 	}
 }
@@ -192,8 +184,7 @@ if (!class_exists('ZipArchive'))
 	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupport", "ZIP")."<br>\n";
 	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
 }
-else
-{
+else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupport", "ZIP")."<br>\n";
 }
 
@@ -215,8 +206,7 @@ if ($memmaxorig != '')
 	{
 		print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPMemoryOK", $memmaxorig, $memrequiredorig)."<br>\n";
 	}
-	else
-	{
+	else {
 		print '<img src="../theme/eldy/img/warning.png" alt="Warning"> '.$langs->trans("PHPMemoryTooLow", $memmaxorig, $memrequiredorig)."<br>\n";
 	}
 }
@@ -236,13 +226,11 @@ if (is_readable($conffile) && filesize($conffile) > 8)
 		// Already installed for all parts (config and database). We can propose upgrade.
 		$allowupgrade = true;
 	}
-	else
-	{
+	else {
 		$allowupgrade = false;
 	}
 }
-else
-{
+else {
 	// If not, we create it
 	dolibarr_install_syslog("check: we try to create conf file '".$conffile."'");
 	$confexists = 0;
@@ -253,8 +241,7 @@ else
 		// Success
 		dolibarr_install_syslog("check: successfully copied file ".$conffile.".example into ".$conffile);
 	}
-	else
-	{
+	else {
 		// If failed, we try to create an empty file
 		dolibarr_install_syslog("check: failed to copy file ".$conffile.".example into ".$conffile.". We try to create it.", LOG_WARNING);
 
@@ -285,8 +272,7 @@ if (!file_exists($conffile))
 	print $langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok');
 	$err++;
 }
-else
-{
+else {
 	if (dol_is_dir($conffile))
 	{
 		print '<img src="../theme/eldy/img/error.png" alt="Warning"> '.$langs->trans("ConfFileMustBeAFileNotADir", $conffiletoshow);
@@ -300,8 +286,7 @@ else
 		{
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileExists", $conffiletoshow);
 		}
-		else
-		{
+		else {
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileCouldBeCreated", $conffiletoshow);
 		}
 		print "<br>";
@@ -311,14 +296,12 @@ else
 		$allowinstall = 0;
 	}
 	// File exists and can be modified
-	else
-	{
+	else {
 		if ($confexists)
 		{
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileExists", $conffiletoshow);
 		}
-		else
-		{
+		else {
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileCouldBeCreated", $conffiletoshow);
 		}
 		print "<br>";
@@ -345,8 +328,7 @@ else
                     print '<span class="error">A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to '.$dolibarr_main_document_root.' that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.</span><br>'."\n";
 				    dol_syslog("A '".$conffiletoshow."' file exists with a dolibarr_main_document_root to ".$dolibarr_main_document_root." that seems wrong. Try to fix or remove the '".$conffiletoshow."' file.", LOG_WARNING);
 				}
-				else
-				{
+				else {
                     require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
 
                     // If password is encoded, we decode it
@@ -440,8 +422,7 @@ else
 		{
             $choice .= '<a class="button" href="fileconf.php?selectlang='.$setuplang.'">'.$langs->trans("Start").'</a>';
 		}
-		else
-		{
+		else {
 			$choice .= ($foundrecommandedchoice ? '<span class="warning">' : '').$langs->trans("InstallNotAllowed").($foundrecommandedchoice ? '</span>' : '');
 		}
         $choice .= '</td>'."\n";
@@ -560,13 +541,11 @@ else
                 {
                     $choice .= '<span class="opacitymedium">'.$langs->trans("NotYetAvailable").'</span>';
                 }
-				else
-                {
+				else {
                     $choice .= '<a class="button runupgrade" href="upgrade.php?action=upgrade'.($count < count($migrationscript) ? '_'.$versionto : '').'&amp;selectlang='.$setuplang.'&amp;versionfrom='.$versionfrom.'&amp;versionto='.$versionto.'">'.$langs->trans("Start").'</a>';
                 }
 			}
-			else
-			{
+			else {
                 $choice .= $langs->trans("NotAvailable");
 			}
             $choice .= '</td>';
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 3a3adc2322c..aab1615ed64 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -124,13 +124,11 @@ if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) >
                 }
             }
         }
-        else
-        {
+        else {
             $includeconferror = 'ErrorBadValueForDolibarrMainDocumentRoot';
         }
     }
-    else
-    {
+    else {
         $includeconferror = 'ErrorBadFormatForConfFile';
     }
 }
@@ -210,8 +208,7 @@ if (@file_exists($lockfile))
         print $langs->trans("ClickHereToGoToApp");
         print '</a>';
     }
-    else
-    {
+    else {
         print 'If you always reach this page, you must remove install.lock file manually.<br>';
     }
     exit;
@@ -365,8 +362,7 @@ function pHeader($subtitle, $next, $action = 'set', $param = '', $forcejqueryurl
         $jQueryCustomPath = $forcejqueryurl;
         $jQueryUiCustomPath = $forcejqueryurl;
     }
-    else
-    {
+    else {
         $jQueryCustomPath = (defined('JS_JQUERY') && constant('JS_JQUERY')) ? JS_JQUERY : false;
         $jQueryUiCustomPath = (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) ? JS_JQUERY_UI : false;
     }
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 034741c7c7e..f6f5eb83003 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -124,8 +124,7 @@ if ($db->connected)
     dolibarr_install_syslog("repair: ".$langs->transnoentities("ServerConnection").": ".$dolibarr_main_db_host.$langs->transnoentities("OK"));
     $ok = 1;
 }
-else
-{
+else {
     print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td class=\"right\">".$langs->transnoentities("Error")."</td></tr>";
     dolibarr_install_syslog("repair: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
     $ok = 0;
@@ -140,8 +139,7 @@ if ($ok)
         dolibarr_install_syslog("repair: database connection successful: ".$dolibarr_main_db_name);
         $ok = 1;
     }
-    else
-    {
+    else {
         print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td class=\"right\">".$langs->trans("Error")."</td></tr>";
         dolibarr_install_syslog("repair: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
         $ok = 0;
@@ -257,8 +255,7 @@ if ($ok && GETPOST('standard', 'alpha'))
 	                $fieldname = $obj->Field;
 	                $fieldtype = $obj->Type;
 	            }
-	            else
-	            {
+	            else {
 	                $fieldname = isset($obj->Key) ? $obj->Key : $obj->attname;
 	                $fieldtype = isset($obj->Type) ? $obj->Type : 'varchar';
 	            }
@@ -318,13 +315,11 @@ if ($ok && GETPOST('standard', 'alpha'))
 		                {
 	    	                print "KO ".$db->lasterror."<br>\n";
 	        	        }
-	            	    else
-	                	{
+	            	    else {
 	                    	print "OK<br>\n";
 		                }
 	                }
-	                else
-	                {
+	                else {
 	                	print ' - Mode test, no column added.';
 	                }
 	            }
@@ -332,8 +327,7 @@ if ($ok && GETPOST('standard', 'alpha'))
 
 	        print "</td><td>&nbsp;</td></tr>\n";
 	    }
-	    else
-	    {
+	    else {
 	    	dol_print_error($db);
 	    }
 	}
@@ -399,13 +393,11 @@ if ($ok && GETPOST('standard', 'alpha'))
 
 								print '<tr><td>Widget '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module '.$name.' not enabled in entity '.$obj->entity.', we delete record</td></tr>';
 							}
-							else
-							{
+							else {
 								print '<tr><td>Widget '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module '.$name.' not enabled in entity '.$obj->entity.', we should delete record (not done, mode test)</td></tr>';
 							}
 						}
-						else
-						{
+						else {
 							//print '<tr><td>Constant '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module found in entity '.$obj->entity.', we keep record</td></tr>';
 						}
 					}
@@ -472,13 +464,11 @@ if ($ok && GETPOST('standard', 'alpha'))
 
 								print '<tr><td>Constant '.$obj->file.' set in boxes_def for entity '.$obj->entity.' but MAIN_MODULE_'.strtoupper($module).' not defined in entity '.$obj->entity.', we delete record</td></tr>';
 							}
-							else
-							{
+							else {
 								print '<tr><td>Constant '.$obj->file.' set in boxes_def for entity '.$obj->entity.' but MAIN_MODULE_'.strtoupper($module).' not defined in entity '.$obj->entity.', we should delete record (not done, mode test)</td></tr>';
 							}
 						}
-						else
-						{
+						else {
 							//print '<tr><td>Constant '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module found in entity '.$obj->entity.', we keep record</td></tr>';
 						}
 					}
@@ -567,8 +557,7 @@ if ($ok && GETPOST('restore_thirdparties_logos'))
 			$i++;
 		}
 	}
-	else
-	{
+	else {
 		$ok = 0;
 		dol_print_error($db);
 	}
@@ -671,8 +660,7 @@ if ($ok && GETPOST('restore_user_pictures', 'alpha'))
 			$i++;
 		}
 	}
-	else
-	{
+	else {
 		$ok = 0;
 		dol_print_error($db);
 	}
@@ -730,8 +718,7 @@ if ($ok && GETPOST('rebuild_product_thumbs', 'alpha'))
             $i++;
         }
     }
-    else
-    {
+    else {
         $ok = 0;
         dol_print_error($db);
     }
@@ -816,16 +803,13 @@ if ($ok && GETPOST('clean_menus', 'alpha'))
 								$error++;
 								dol_print_error($db);
 							}
-							else
-								print ' - <span class="warning">Cleaned</span>';
+							else print ' - <span class="warning">Cleaned</span>';
 						}
-						else
-						{
+						else {
 							print ' - <span class="warning">Canceled (test mode)</span>';
 						}
 					}
-					else
-					{
+					else {
 						print ' - Module condition '.$modulecond.' is ok, we do nothing.';
 					}
 				}
@@ -840,13 +824,11 @@ if ($ok && GETPOST('clean_menus', 'alpha'))
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			print '<tr><td>No menu entries of disabled menus found</td></tr>';
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -1049,8 +1031,7 @@ if ($ok && GETPOST('clean_product_stock_batch', 'alpha'))
                                     dol_print_error($db);
                                 }
                             }
-                            else
-                            {
+                            else {
                                 $error++;
                                 dol_print_error($db);
                             }
@@ -1066,13 +1047,11 @@ if ($ok && GETPOST('clean_product_stock_batch', 'alpha'))
                 $i++;
             }
         }
-        else
-        {
+        else {
             print '<tr><td colspan="2">Nothing to do</td></tr>';
         }
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 }
@@ -1156,13 +1135,11 @@ if ($ok && GETPOST('set_empty_time_spent_amount', 'alpha'))
                 $i++;
             }
         }
-        else
-        {
+        else {
             print '<tr><td>No time spent with empty line on users with a hourly rate defined</td></tr>';
         }
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 }
@@ -1257,16 +1234,13 @@ if ($ok && GETPOST('force_disable_of_modules_not_found', 'alpha'))
 	                                    $error++;
 	                                    dol_print_error($db);
 	                                }
-	                                else
-	                                    print ' - <span class="warning">Cleaned</span>';
+	                                else print ' - <span class="warning">Cleaned</span>';
 	                            }
-	                            else
-	                            {
+	                            else {
 	                                print ' - <span class="warning">Canceled (test mode)</span>';
 	                            }
 	                        }
-	                        else
-	                        {
+	                        else {
 	                            print ' - File of '.$key.' ('.$reloffile.') found, we do nothing.';
 	                        }
 	                    }
@@ -1282,13 +1256,11 @@ if ($ok && GETPOST('force_disable_of_modules_not_found', 'alpha'))
 	                $i++;
 	            }
 	        }
-	        else
-	        {
+	        else {
 	            print '<tr><td>No active module with missing files found by searching on MAIN_MODULE_(.*)_'.strtoupper($key).'</td></tr>';
 	        }
 	    }
-	    else
-	    {
+	    else {
 	        dol_print_error($db);
 	    }
     }
@@ -1334,13 +1306,11 @@ if ($ok && GETPOST('clean_perm_table', 'alpha'))
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			print '<tr><td>No lines of a disabled external module (with id > 100000) found into table rights_def</td></tr>';
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 	}
 }
@@ -1392,8 +1362,7 @@ if ($ok && GETPOST('force_utf8_on_tables', 'alpha'))
         	$resql = $db->query($sql);
         }
     }
-    else
-    {
+    else {
         print '<tr><td colspan="2">Not available with database type '.$db->type.'</td></tr>';
     }
 }
@@ -1496,8 +1465,7 @@ if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
                 {
 	                $resql_attach = $db->query($sql_attach);
                 }
-                else
-                {
+                else {
                 	$resql_attach = true; // Force success in test mode
                 }
 
@@ -1552,8 +1520,7 @@ if ($oneoptionset)
 	print $langs->trans("GoToDolibarr");
 	print '</a></div>';
 }
-else
-{
+else {
 	print '<div class="center warning" style="padding-top: 10px">';
 	print $langs->trans("SetAtLeastOneOptionAsUrlParameter");
 	print '</div>';
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index a5e6b9d3377..6bf2e1d3dff 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -231,8 +231,7 @@ if (!$error) {
                 {
                     $databasefortest = 'postgres';
                 }
-                else
-                {
+                else {
                     $databasefortest = 'master';
                 }
             }
@@ -275,8 +274,7 @@ if (!$error) {
             }
         }
     }
-    else
-    {
+    else {
         print "<br>\nFailed to include_once(\"".$main_dir."/core/db/".$db_type.".class.php\")<br>\n";
         print '<div class="error">'.$langs->trans("ErrorWrongValueForParameter", $langs->transnoentities("WebPagesDirectory")).'</div>';
         //print '<a href="#" onClick="javascript: history.back();">';
@@ -286,8 +284,7 @@ if (!$error) {
     }
 }
 
-else
-{
+else {
     if (isset($db)) print $db->lasterror();
     if (isset($db) && !$db->connected) print '<br>'.$langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
     print $langs->trans("ErrorGoBackAndCorrectParameters");
@@ -318,7 +315,7 @@ if (!$error && $db->connected)
         $defaultCharacterSet = $db->forcecharset;
     	$defaultDBSortingCollation = $db->forcecollate;
     }
-    else	// If already created, we take current value
+    else // If already created, we take current value
     {
         $defaultCharacterSet = $db->getDefaultCharacterSetDatabase();
         $defaultDBSortingCollation = $db->getDefaultCollationDatabase();
@@ -401,8 +398,7 @@ if (!$error && $db->connected && $action == "set")
             print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
             $error++;
         }
-        else
-        {
+        else {
             // Create .htaccess file in document directory
             $pathhtaccess = $main_data_dir.'/.htaccess';
             if (!file_exists($pathhtaccess))
@@ -438,8 +434,7 @@ if (!$error && $db->connected && $action == "set")
                 {
                     dolibarr_install_syslog("step1: directory '".$dir[$i]."' exists");
                 }
-                else
-                {
+                else {
                     if (dol_mkdir($dir[$i]) < 0)
                     {
                         print "<tr><td>";
@@ -449,8 +444,7 @@ if (!$error && $db->connected && $action == "set")
                         print "</td></tr>";
                         $error++;
                     }
-                    else
-                    {
+                    else {
                         dolibarr_install_syslog("step1: directory '".$dir[$i]."' created");
                     }
                 }
@@ -472,8 +466,7 @@ if (!$error && $db->connected && $action == "set")
                 print "</td></tr>";
                 print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
             }
-            else
-            {
+            else {
             	//ODT templates
             	$srcroot = $main_dir.'/install/doctemplates';
             	$destroot = $main_data_dir.'/doctemplates';
@@ -592,8 +585,7 @@ if (!$error && $db->connected && $action == "set")
                         print '</td>';
                         print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
                     }
-                    else
-                    {
+                    else {
                         if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
                         || $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
                         || $db->errno() == 'DB_ERROR_USER_ALREADY_EXISTS')
@@ -605,8 +597,7 @@ if (!$error && $db->connected && $action == "set")
                             print '</td>';
                             print '<td>'.$langs->trans("LoginAlreadyExists").'</td></tr>';
                         }
-                        else
-                        {
+                        else {
                             dolibarr_install_syslog("step1: failed to create user", LOG_ERR);
                             print '<tr><td>';
                             print $langs->trans("UserCreation").' : ';
@@ -618,8 +609,7 @@ if (!$error && $db->connected && $action == "set")
 
                     $db->close();
                 }
-                else
-                {
+                else {
                     print '<tr><td>';
                     print $langs->trans("UserCreation").' : ';
                     print $dolibarr_main_db_user;
@@ -668,8 +658,7 @@ if (!$error && $db->connected && $action == "set")
                     //if ($check1 != $dolibarr_main_db_character_set) dolibarr_install_syslog('step1: value for character_set is not the one asked for database creation', LOG_WARNING);
                     //if ($check2 != $dolibarr_main_db_collation)     dolibarr_install_syslog('step1: value for collation is not the one asked for database creation', LOG_WARNING);
                 }
-                else
-                {
+                else {
                     // warning message
                     print '<tr><td colspan="2"><br>';
                     print $langs->trans("ErrorFailedToCreateDatabase", $dolibarr_main_db_name).'<br>';
@@ -735,8 +724,7 @@ if (!$error && $db->connected && $action == "set")
 
                     $error = 0;
                 }
-                else
-                {
+                else {
                     dolibarr_install_syslog("step1: connection to database ".$conf->db->name." by user ".$conf->db->user." failed", LOG_ERR);
                     print "<tr><td>";
                     print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
@@ -755,8 +743,7 @@ if (!$error && $db->connected && $action == "set")
                     $error++;
                 }
             }
-            else
-            {
+            else {
                 dolibarr_install_syslog("step1: connection to server by user ".$conf->db->user." failed", LOG_ERR);
                 print "<tr><td>";
                 print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
@@ -1031,8 +1018,7 @@ function write_conf_file($conffile)
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok">';
 			print "</td></tr>";
 		}
-		else
-		{
+		else {
 			$error++;
 		}
 	}
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index 5b794b781bd..f33319ba57c 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -100,8 +100,7 @@ if ($action == "set")
         print $langs->trans("ServerConnection")." : ".$conf->db->host.'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
         $ok = 1;
     }
-    else
-    {
+    else {
         print "<tr><td>Failed to connect to server : ".$conf->db->host.'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
     }
 
@@ -111,8 +110,7 @@ if ($action == "set")
         {
             dolibarr_install_syslog("step2: successful connection to database: ".$conf->db->name);
         }
-        else
-        {
+        else {
             dolibarr_install_syslog("step2: failed connection to database :".$conf->db->name, LOG_ERR);
             print "<tr><td>Failed to select database ".$conf->db->name.'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
             $ok = 0;
@@ -202,8 +200,7 @@ if ($action == "set")
                 {
                     $buffer = preg_replace('/type=innodb/i', 'ENGINE=innodb', $buffer);
                 }
-                else
-                {
+                else {
                     // Keyword ENGINE is MySQL-specific, so scrub it for
                     // other database types (mssql, pgsql)
                     $buffer = preg_replace('/type=innodb/i', '', $buffer);
@@ -226,15 +223,13 @@ if ($action == "set")
                     // print "<td>OK requete ==== $buffer</td></tr>";
                     $db->free($resql);
                 }
-                else
-                {
+                else {
                     if ($db->errno() == 'DB_ERROR_TABLE_ALREADY_EXISTS' ||
                     $db->errno() == 'DB_ERROR_TABLE_OR_KEY_ALREADY_EXISTS')
                     {
                         //print "<td>Deja existante</td></tr>";
                     }
-                    else
-                    {
+                    else {
                         print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey", $name);
                         print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer.' <br>Executed query : '.$db->lastquery;
                         print "\n</td>";
@@ -243,8 +238,7 @@ if ($action == "set")
                     }
                 }
             }
-            else
-            {
+            else {
                 print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey", $name);
                 print "</td>";
                 print '<td><span class="error">'.$langs->trans("Error").' Failed to open file '.$dir.$file.'</span></td></tr>';
@@ -262,8 +256,7 @@ if ($action == "set")
                 $ok = 1;
             }
         }
-        else
-        {
+        else {
             print '<tr><td>'.$langs->trans("ErrorFailedToFindSomeFiles", $dir).'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
             dolibarr_install_syslog("step2: failed to find files to create database in directory ".$dir, LOG_ERR);
         }
@@ -369,8 +362,7 @@ if ($action == "set")
                             //print "<td>OK requete ==== $buffer</td></tr>";
                             $db->free($resql);
                         }
-                        else
-                        {
+                        else {
                             if ($db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS' ||
                             $db->errno() == 'DB_ERROR_CANNOT_CREATE' ||
                             $db->errno() == 'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS' ||
@@ -380,8 +372,7 @@ if ($action == "set")
                                 //print "<td>Deja existante</td></tr>";
                                 $key_exists = 1;
                             }
-                            else
-                            {
+                            else {
                                 print "<tr><td>".$langs->trans("CreateOtherKeysForTable", $name);
                                 print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$db->lastqueryerror();
                                 print "\n</td>";
@@ -392,8 +383,7 @@ if ($action == "set")
                     }
                 }
             }
-            else
-            {
+            else {
                 print "<tr><td>".$langs->trans("CreateOtherKeysForTable", $name);
                 print "</td>";
                 print '<td><span class="error">'.$langs->trans("Error")." Failed to open file ".$dir.$file."</span></td></tr>";
@@ -465,15 +455,13 @@ if ($action == "set")
                         $ok = 1;
                         $db->free($resql);
                     }
-                    else
-                    {
+                    else {
                         if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
                         || $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS')
                         {
                             //print "Insert line : ".$buffer."<br>\n";
                         }
-                        else
-                        {
+                        else {
                             $ok = 0;
 
                             print "<tr><td>".$langs->trans("FunctionsCreation");
@@ -491,8 +479,7 @@ if ($action == "set")
             {
                 print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
             }
-            else
-            {
+            else {
                 print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
                 $ok = 1;
             }
@@ -589,14 +576,12 @@ if ($action == "set")
                     {
                         //$db->free($resql);     // Not required as request we launch here does not return memory needs.
                     }
-                    else
-                    {
+                    else {
                         if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
                         {
                             //print "<tr><td>Insertion ligne : $buffer</td><td>";
                         }
-                        else
-                        {
+                        else {
                             $ok = 0;
                             $okallfile = 0;
                             print '<span class="error">'.$langs->trans("ErrorSQL")." : ".$db->lasterrno()." - ".$db->lastqueryerror()." - ".$db->lasterror()."</span><br>";
@@ -614,16 +599,14 @@ if ($action == "set")
         {
             print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
         }
-        else
-        {
+        else {
             print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
             $ok = 1; // Data loading are not blocking errors
         }
     }
     print '</table>';
 }
-else
-{
+else {
     print 'Parameter action=set not defined';
 }
 
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index b74594ce8da..a30a6040fb9 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -187,8 +187,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 					dolibarr_set_const($db, "MAIN_SECURITY_SALT", dol_print_date(dol_now(), 'dayhourlog'), 'chaine', 0, '', 0); // All entities
 					if (function_exists('password_hash'))
 						dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'password_hash', 'chaine', 0, '', 0); // All entities
-					else
-						dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'sha1md5', 'chaine', 0, '', 0); // All entities
+					else dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'sha1md5', 'chaine', 0, '', 0); // All entities
 				}
 
 				dolibarr_install_syslog('step5: DATABASE_PWD_ENCRYPTED = '.$conf->global->DATABASE_PWD_ENCRYPTED.' MAIN_SECURITY_HASH_ALGO = '.$conf->global->MAIN_SECURITY_HASH_ALGO, LOG_INFO);
@@ -215,16 +214,14 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 				print $langs->trans("AdminLoginCreatedSuccessfuly", $login)."<br>";
 				$success = 1;
 			}
-			else
-			{
+			else {
 				if ($newuser->error == 'ErrorLoginAlreadyExists')
 				{
 					dolibarr_install_syslog('step5: AdminLoginAlreadyExists', LOG_WARNING);
 					print '<br><div class="warning">'.$langs->trans("AdminLoginAlreadyExists", $login)."</div><br>";
 					$success = 1;
 				}
-				else
-				{
+				else {
 					dolibarr_install_syslog('step5: FailedToCreateAdminLogin '.$newuser->error, LOG_ERR);
 					print '<br><div class="error">'.$langs->trans("FailedToCreateAdminLogin").' '.$newuser->error.'</div><br><br>';
 				}
@@ -241,8 +238,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 					$conf->global->MAIN_VERSION_FIRST_INSTALL = $targetversion;
 					$db->commit();
 				}
-				else
-				{
+				else {
 					//if (! $resql) dol_print_error($db,'Error in setup program');      // We ignore errors. Key may already exists
 					$db->commit();
 				}
@@ -293,8 +289,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 				$db->commit();
 			}
 		}
-		else
-		{
+		else {
 			print $langs->trans("ErrorFailedToConnect")."<br>";
 		}
 	}
@@ -311,8 +306,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 			// Define if we need to update the MAIN_VERSION_LAST_UPGRADE value in database
 			$tagdatabase = false;
 			if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE)) $tagdatabase = true; // We don't know what it was before, so now we consider we are version choosed.
-			else
-			{
+			else {
 				$mainversionlastupgradearray = preg_split('/[.-]/', $conf->global->MAIN_VERSION_LAST_UPGRADE);
 				$targetversionarray = preg_split('/[.-]/', $targetversion);
 				if (versioncompare($targetversionarray, $mainversionlastupgradearray) > 0) $tagdatabase = true;
@@ -327,18 +321,15 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 				if (!$resql) dol_print_error($db, 'Error in setup program');
 				$conf->global->MAIN_VERSION_LAST_UPGRADE = $targetversion;
 			}
-			else
-			{
+			else {
 				dolibarr_install_syslog('step5: we run an upgrade to version '.$targetversion.' but database was already upgraded to '.$conf->global->MAIN_VERSION_LAST_UPGRADE.'. We keep MAIN_VERSION_LAST_UPGRADE as it is.');
 			}
 		}
-		else
-		{
+		else {
 			print $langs->trans("ErrorFailedToConnect")."<br>";
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error('', 'step5.php: unknown choice of action');
 	}
 
@@ -390,8 +381,7 @@ if ($action == "set" && $success)
 		print '<span class="fas fa-external-link-alt"></span> '.$langs->trans("GoToSetupArea");
 		print '</a></div>';
 	}
-	else
-	{
+	else {
 		// If here MAIN_VERSION_LAST_UPGRADE is not empty
 		print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</span></b><br>';
 		print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b><br>';
@@ -438,8 +428,7 @@ elseif (empty($action) || preg_match('/upgrade/i', $action))
 		print '<span class="fas fa-link-alt"></span> '.$langs->trans("GoToDolibarr").'...';
 		print '</a></div><br>';
 	}
-	else
-	{
+	else {
 		// If here MAIN_VERSION_LAST_UPGRADE is not empty
 		print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</span></b><br>';
 		print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b>';
@@ -451,8 +440,7 @@ elseif (empty($action) || preg_match('/upgrade/i', $action))
 		print '</a></div>';
 	}
 }
-else
-{
+else {
 	dol_print_error('', 'step5.php: unknown choice of action');
 }
 
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index b71707bef4b..91242b7429a 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -151,8 +151,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
         dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerConnection").": $dolibarr_main_db_host ".$langs->transnoentities("OK"));
         $ok = 1;
     }
-    else
-    {
+    else {
         print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td align=\"right\">".$langs->transnoentities("Error")."</td></tr>\n";
         dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
         $ok = 0;
@@ -167,8 +166,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             dolibarr_install_syslog("upgrade: Database connection successful: ".$dolibarr_main_db_name);
             $ok = 1;
         }
-        else
-        {
+        else {
             print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>\n";
             dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
             $ok = 0;
@@ -293,8 +291,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             			}
             			$db->free($resql);
             		}
-            		else
-            		{
+            		else {
             			if ($db->lasterrno() != 'DB_ERROR_NOSUCHTABLE')
             			{
             				print '<tr><td colspan="2"><span class="error">'.$sql.' : '.$db->lasterror()."</font></td></tr>\n";
@@ -335,8 +332,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             }
             sort($filesindir);
         }
-        else
-		{
+        else {
             print '<div class="error">'.$langs->trans("ErrorCanNotReadDir", $dir).'</div>';
         }
 
@@ -357,8 +353,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
         {
         	print '<div class="error">'.$langs->trans("ErrorNoMigrationFilesFoundForParameters").'</div>';
         }
-		else
-		{
+		else {
 			$listoffileprocessed = array(); // Protection to avoid to process twice the same file
 
 	        // Loop on each migrate files
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 765a8796a76..b8e9ad30076 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -68,8 +68,7 @@ $err = error_reporting();
 error_reporting(0);
 if (!empty($conf->global->MAIN_OVERRIDE_TIME_LIMIT))
 	@set_time_limit((int) $conf->global->MAIN_OVERRIDE_TIME_LIMIT);
-else
-	@set_time_limit(600);
+else @set_time_limit(600);
 error_reporting($err);
 
 $setuplang = GETPOST("selectlang", 'aZ09', 3) ?GETPOST("selectlang", 'aZ09', 3) : 'auto';
@@ -159,8 +158,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
         {
             dolibarr_install_syslog('upgrade2: database connection successful :'.$dolibarr_main_db_name);
         }
-        else
-        {
+        else {
             $error++;
         }
     }
@@ -536,16 +534,14 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
                 print "<!-- (".$reshook.") -->";
                 print '</td></tr>';
             }
-            else
-            {
+            else {
                 print '<tr><td colspan="4">';
                 print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: OK';
                 print "<!-- (".$reshook.") -->";
                 print '</td></tr>';
             }
         }
-        else
-        {
+        else {
             //if (! empty($conf->modules))
             if (!empty($conf->modules_parts['hooks']))     // If there is at least one module with one hook, we show message to say nothing was done
             {
@@ -585,8 +581,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 
     print '<div><br>'.$langs->trans("MigrationFinished").'</div>';
 }
-else
-{
+else {
     print '<div class="error">'.$langs->trans('ErrorWrongParameters').'</div>';
     $error++;
 }
@@ -646,8 +641,7 @@ function migrate_paiements($db, $langs, $conf)
                 $i++;
             }
         }
-        else
-        {
+        else {
             dol_print_error($db);
         }
 
@@ -678,19 +672,16 @@ function migrate_paiements($db, $langs, $conf)
                 $db->commit();
                 print $langs->trans('MigrationSuccessfullUpdate')."<br>";
             }
-            else
-            {
+            else {
                 $db->rollback();
                 print $langs->trans('MigrationUpdateFailed').'<br>';
             }
         }
-        else
-        {
+        else {
             print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
         }
     }
-    else
-    {
+    else {
         print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
     }
 
@@ -753,8 +744,7 @@ function migrate_paiements_orphelins_1($db, $langs, $conf)
                 $i++;
             }
         }
-        else
-        {
+        else {
             dol_print_error($db);
         }
 
@@ -794,8 +784,7 @@ function migrate_paiements_orphelins_1($db, $langs, $conf)
                         print $langs->trans('MigrationProcessPaymentUpdate', 'facid='.$facid.'-paymentid='.$row[$i]['paymentid'].'-amount='.$row[$i]['pamount'])."<br>\n";
                     }
                 }
-                else
-                {
+                else {
                     print 'ERROR';
                 }
             }
@@ -804,20 +793,17 @@ function migrate_paiements_orphelins_1($db, $langs, $conf)
             {
                 print $langs->trans('MigrationSuccessfullUpdate')."<br>";
             }
-            else
-            {
+            else {
                 print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
             }
 
             $db->commit();
         }
-        else
-        {
+        else {
             print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
         }
     }
-    else
-    {
+    else {
         print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
     }
 
@@ -879,8 +865,7 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
                 $i++;
             }
         }
-        else
-        {
+        else {
             dol_print_error($db);
         }
 
@@ -921,8 +906,7 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
                         print $langs->trans('MigrationProcessPaymentUpdate', 'facid='.$facid.'-paymentid='.$row[$i]['paymentid'].'-amount='.$row[$i]['pamount'])."<br>\n";
                     }
                 }
-                else
-                {
+                else {
                     print 'ERROR';
                     $nberr++;
                 }
@@ -932,15 +916,13 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
             {
                 print $langs->trans('MigrationSuccessfullUpdate')."<br>";
             }
-            else
-            {
+            else {
                 print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
             }
 
             $db->commit();
         }
-        else
-        {
+        else {
             print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
         }
 
@@ -954,14 +936,12 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
         {
             $db->commit();
         }
-        else
-        {
+        else {
             print 'ERROR';
             $db->rollback();
         }
     }
-    else
-    {
+    else {
         print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
     }
 
@@ -1032,8 +1012,7 @@ function migrate_contracts_det($db, $langs, $conf)
                 {
                     print $langs->trans('MigrationContractsLineCreation', $obj->cref)."<br>\n";
                 }
-                else
-                {
+                else {
                     dol_print_error($db);
                     $nberr++;
                 }
@@ -1047,19 +1026,16 @@ function migrate_contracts_det($db, $langs, $conf)
                 $db->commit();
                 print $langs->trans('MigrationSuccessfullUpdate')."<br>";
             }
-            else
-            {
+            else {
                 $db->rollback();
                 print $langs->trans('MigrationUpdateFailed').'<br>';
             }
         }
-        else
-        {
+        else {
             print $langs->trans('MigrationContractsNothingToUpdate')."<br>\n";
         }
     }
-    else
-    {
+    else {
         print $langs->trans('MigrationContractsFieldDontExist')."<br>\n";
         //    dol_print_error($db);
     }
@@ -1133,8 +1109,7 @@ function migrate_links_transfert($db, $langs, $conf)
                 $db->commit();
                 print $langs->trans('MigrationSuccessfullUpdate')."<br>";
             }
-            else
-            {
+            else {
                 $db->rollback();
                 print $langs->trans('MigrationUpdateFailed').'<br>';
             }
@@ -1143,8 +1118,7 @@ function migrate_links_transfert($db, $langs, $conf)
             print $langs->trans('MigrationBankTransfertsNothingToUpdate')."<br>\n";
         }
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 
@@ -1172,8 +1146,7 @@ function migrate_contracts_date1($db, $langs, $conf)
     if (!$resql) dol_print_error($db);
     if ($db->affected_rows($resql) > 0)
     print $langs->trans('MigrationContractsEmptyDatesUpdateSuccess')."<br>\n";
-    else
-    print $langs->trans('MigrationContractsEmptyDatesNothingToUpdate')."<br>\n";
+    else print $langs->trans('MigrationContractsEmptyDatesNothingToUpdate')."<br>\n";
 
     $sql = "update ".MAIN_DB_PREFIX."contrat set datec=tms where datec is null";
     dolibarr_install_syslog("upgrade2::migrate_contracts_date1");
@@ -1181,8 +1154,7 @@ function migrate_contracts_date1($db, $langs, $conf)
     if (!$resql) dol_print_error($db);
     if ($db->affected_rows($resql) > 0)
     print $langs->trans('MigrationContractsEmptyCreationDatesUpdateSuccess')."<br>\n";
-    else
-    print $langs->trans('MigrationContractsEmptyCreationDatesNothingToUpdate')."<br>\n";
+    else print $langs->trans('MigrationContractsEmptyCreationDatesNothingToUpdate')."<br>\n";
 
     print '</td></tr>';
 }
@@ -1244,12 +1216,10 @@ function migrate_contracts_date2($db, $langs, $conf)
 
             if ($nbcontratsmodifie)
             print $langs->trans('MigrationContractsInvalidDatesNumber', $nbcontratsmodifie)."<br>\n";
-            else
-            print  $langs->trans('MigrationContractsInvalidDatesNothingToUpdate')."<br>\n";
+            else print  $langs->trans('MigrationContractsInvalidDatesNothingToUpdate')."<br>\n";
         }
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 
@@ -1277,8 +1247,7 @@ function migrate_contracts_date3($db, $langs, $conf)
     if (!$resql) dol_print_error($db);
     if ($db->affected_rows($resql) > 0)
     print $langs->trans('MigrationContractsIncoherentCreationDateUpdateSuccess')."<br>\n";
-    else
-    print $langs->trans('MigrationContractsIncoherentCreationDateNothingToUpdate')."<br>\n";
+    else print $langs->trans('MigrationContractsIncoherentCreationDateNothingToUpdate')."<br>\n";
 
     print '</td></tr>';
 }
@@ -1333,8 +1302,7 @@ function migrate_contracts_open($db, $langs, $conf)
 
             if ($nbcontratsmodifie)
             print $langs->trans('MigrationReopenedContractsNumber', $nbcontratsmodifie)."<br>\n";
-            else
-            print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
+            else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
         }
     }
     else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
@@ -1416,23 +1384,20 @@ function migrate_paiementfourn_facturefourn($db, $langs, $conf)
                             $nb++;
                             print '<td><span style="color:green">'.$langs->trans("OK").'</span></td>';
                         }
-                        else
-                        {
+                        else {
                             print '<td><span style="color:red">Error on insert</span></td>';
                             $error++;
                         }
                         print '</tr>';
                     }
                 }
-                else
-                {
+                else {
                     $error++;
                 }
                 $i++;
             }
         }
-        else
-        {
+        else {
             $error++;
         }
 
@@ -1447,14 +1412,12 @@ function migrate_paiementfourn_facturefourn($db, $langs, $conf)
             $sql = "ALTER TABLE ".MAIN_DB_PREFIX."paiementfourn DROP COLUMN fk_facture_fourn";
             $db->query($sql);
         }
-        else
-        {
+        else {
             print '<tr><td>'.$langs->trans("Error").'</td></tr>';
             $db->rollback();
         }
     }
-    else
-    {
+    else {
         print '<tr><td>'.$langs->trans("AlreadyDone").'</td></tr>';
     }
 }
@@ -1540,14 +1503,12 @@ function migrate_price_facture($db, $langs, $conf)
                         {
                             //print $facture->id;
                         }
-                        else
-                        {
+                        else {
                             print "Error id=".$facture->id;
                             $err++;
                         }
                     }
-                    else
-                    {
+                    else {
                         print "Error #3";
                         $err++;
                     }
@@ -1557,16 +1518,14 @@ function migrate_price_facture($db, $langs, $conf)
                 $i++;
             }
         }
-        else
-        {
+        else {
             print $langs->trans("AlreadyDone");
         }
         $db->free($resql);
 
         $db->commit();
     }
-    else
-    {
+    else {
         print "Error #1 ".$db->error();
         $err++;
 
@@ -1665,8 +1624,7 @@ function migrate_price_propal($db, $langs, $conf)
                 $i++;
             }
         }
-        else
-        {
+        else {
             print $langs->trans("AlreadyDone");
         }
 
@@ -1674,8 +1632,7 @@ function migrate_price_propal($db, $langs, $conf)
 
         $db->commit();
     }
-    else
-    {
+    else {
         print "Error #1 ".$db->error();
 
         $db->rollback();
@@ -1754,8 +1711,7 @@ function migrate_price_contrat($db, $langs, $conf)
                 $i++;
             }
         }
-        else
-        {
+        else {
             print $langs->trans("AlreadyDone");
         }
 
@@ -1763,8 +1719,7 @@ function migrate_price_contrat($db, $langs, $conf)
 
         $db->commit();
     }
-    else
-    {
+    else {
         print "Error #1 ".$db->error();
 
         $db->rollback();
@@ -1861,8 +1816,7 @@ function migrate_price_commande($db, $langs, $conf)
                 $i++;
             }
         }
-        else
-        {
+        else {
             print $langs->trans("AlreadyDone");
         }
 
@@ -1880,8 +1834,7 @@ function migrate_price_commande($db, $langs, $conf)
 
         $db->commit();
     }
-    else
-    {
+    else {
         print "Error #1 ".$db->error();
 
         $db->rollback();
@@ -1978,8 +1931,7 @@ function migrate_price_commande_fournisseur($db, $langs, $conf)
                 $i++;
             }
         }
-        else
-        {
+        else {
             print $langs->trans("AlreadyDone");
         }
 
@@ -1997,8 +1949,7 @@ function migrate_price_commande_fournisseur($db, $langs, $conf)
 
         $db->commit();
     }
-    else
-    {
+    else {
         print "Error #1 ".$db->error();
 
         $db->rollback();
@@ -2126,19 +2077,16 @@ function migrate_commande_expedition($db, $langs, $conf)
                 print $langs->trans('FieldRenamed')."<br>\n";
                 $db->query($sql);
             }
-            else
-            {
+            else {
                 $db->rollback();
             }
         }
-        else
-        {
+        else {
             dol_print_error($db);
             $db->rollback();
         }
     }
-    else
-    {
+    else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
     print '</td></tr>';
@@ -2202,8 +2150,7 @@ function migrate_commande_livraison($db, $langs, $conf)
                             dol_print_error($db);
                         }
                     }
-                    else
-                    {
+                    else {
                         $error++;
                         dol_print_error($db);
                     }
@@ -2219,19 +2166,16 @@ function migrate_commande_livraison($db, $langs, $conf)
                 print $langs->trans('FieldRenamed')."<br>\n";
                 $db->query($sql);
             }
-            else
-            {
+            else {
                 $db->rollback();
             }
         }
-        else
-        {
+        else {
             dol_print_error($db);
             $db->rollback();
         }
     }
-    else
-    {
+    else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
     print '</td></tr>';
@@ -2310,14 +2254,12 @@ function migrate_detail_livraison($db, $langs, $conf)
                                 dol_print_error($db);
                             }
                         }
-                        else
-                        {
+                        else {
                             $error++;
                             dol_print_error($db);
                         }
                     }
-                    else
-                    {
+                    else {
                         $error++;
                         dol_print_error($db);
                     }
@@ -2333,19 +2275,16 @@ function migrate_detail_livraison($db, $langs, $conf)
                 print $langs->trans('FieldRenamed')."<br>\n";
                 $db->query($sql);
             }
-            else
-            {
+            else {
                 $db->rollback();
             }
         }
-        else
-        {
+        else {
             dol_print_error($db);
             $db->rollback();
         }
     }
-    else
-    {
+    else {
         $result = $db->DDLDescTable(MAIN_DB_PREFIX."livraisondet", "fk_origin_line");
         $obj = $db->fetch_object($result);
         if (!$obj)
@@ -2402,8 +2341,7 @@ function migrate_stocks($db, $langs, $conf)
                 if ($resql2)
                 {
                 }
-                else
-                {
+                else {
                     $error++;
                     dol_print_error($db);
                 }
@@ -2416,13 +2354,11 @@ function migrate_stocks($db, $langs, $conf)
         {
             $db->commit();
         }
-        else
-        {
+        else {
             $db->rollback();
         }
     }
-    else
-    {
+    else {
         dol_print_error($db);
         $db->rollback();
     }
@@ -2478,8 +2414,7 @@ function migrate_menus($db, $langs, $conf)
                     if ($resql2)
                     {
                     }
-                    else
-                    {
+                    else {
                         $error++;
                         dol_print_error($db);
                     }
@@ -2492,19 +2427,16 @@ function migrate_menus($db, $langs, $conf)
             {
                 $db->commit();
             }
-            else
-            {
+            else {
                 $db->rollback();
             }
         }
-        else
-        {
+        else {
             dol_print_error($db);
             $db->rollback();
         }
     }
-    else
-    {
+    else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
 
@@ -2567,8 +2499,7 @@ function migrate_commande_deliveryaddress($db, $langs, $conf)
                     $i++;
                 }
             }
-            else
-            {
+            else {
                 print $langs->trans('AlreadyDone')."<br>\n";
             }
 
@@ -2576,19 +2507,16 @@ function migrate_commande_deliveryaddress($db, $langs, $conf)
             {
                 $db->commit();
             }
-            else
-            {
+            else {
                 $db->rollback();
             }
         }
-        else
-        {
+        else {
             dol_print_error($db);
             $db->rollback();
         }
     }
-    else
-    {
+    else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
 
@@ -2670,13 +2598,11 @@ function migrate_restore_missing_links($db, $langs, $conf)
         {
             $db->commit();
         }
-        else
-        {
+        else {
             $db->rollback();
         }
     }
-    else
-    {
+    else {
         dol_print_error($db);
         $db->rollback();
     }
@@ -2729,8 +2655,7 @@ function migrate_restore_missing_links($db, $langs, $conf)
                 $i++;
             }
         }
-        else
-        {
+        else {
             print $langs->trans('AlreadyDone')."<br>\n";
         }
 
@@ -2738,13 +2663,11 @@ function migrate_restore_missing_links($db, $langs, $conf)
         {
             $db->commit();
         }
-        else
-        {
+        else {
             $db->rollback();
         }
     }
-    else
-    {
+    else {
         dol_print_error($db);
         $db->rollback();
     }
@@ -2826,24 +2749,20 @@ function migrate_project_user_resp($db, $langs, $conf)
                 {
                     $db->commit();
                 }
-                else
-                {
+                else {
                     $db->rollback();
                 }
             }
-            else
-            {
+            else {
                 $db->rollback();
             }
         }
-        else
-        {
+        else {
             dol_print_error($db);
             $db->rollback();
         }
     }
-    else
-    {
+    else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
     print '</td></tr>';
@@ -2918,24 +2837,20 @@ function migrate_project_task_actors($db, $langs, $conf)
                 {
                     $db->commit();
                 }
-                else
-                {
+                else {
                     $db->rollback();
                 }
             }
-            else
-            {
+            else {
                 $db->rollback();
             }
         }
-        else
-        {
+        else {
             dol_print_error($db);
             $db->rollback();
         }
     }
-    else
-    {
+    else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
     print '</td></tr>';
@@ -3006,8 +2921,7 @@ function migrate_relationship_tables($db, $langs, $conf, $table, $fk_source, $so
                     $i++;
                 }
             }
-            else
-            {
+            else {
                 print $langs->trans('AlreadyDone')."<br>\n";
             }
 
@@ -3018,24 +2932,20 @@ function migrate_relationship_tables($db, $langs, $conf, $table, $fk_source, $so
                 {
                     $db->commit();
                 }
-                else
-                {
+                else {
                     $db->rollback();
                 }
             }
-            else
-            {
+            else {
                 $db->rollback();
             }
         }
-        else
-        {
+        else {
             dol_print_error($db);
             $db->rollback();
         }
     }
-    else
-    {
+    else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
 
@@ -3104,8 +3014,7 @@ function migrate_project_task_time($db, $langs, $conf)
                     if (!empty($totaltime[$obj->fk_task])) $totaltime[$obj->fk_task] += $newtime;
                     else $totaltime[$obj->fk_task] = $newtime;
                 }
-                else
-                {
+                else {
                     if (!empty($totaltime[$obj->fk_task])) $totaltime[$obj->fk_task] += $obj->task_duration;
                     else $totaltime[$obj->fk_task] = $obj->task_duration;
                 }
@@ -3131,23 +3040,19 @@ function migrate_project_task_time($db, $langs, $conf)
                         }
                     }
                 }
-                else
-                {
+                else {
                     print $langs->trans('AlreadyDone')."<br>\n";
                 }
             }
-            else
-            {
+            else {
                 dol_print_error($db);
             }
         }
-        else
-        {
+        else {
             print $langs->trans('AlreadyDone')."<br>\n";
         }
     }
-    else
-    {
+    else {
         dol_print_error($db);
     }
 
@@ -3155,8 +3060,7 @@ function migrate_project_task_time($db, $langs, $conf)
     {
         $db->commit();
     }
-    else
-    {
+    else {
         $db->rollback();
     }
 
@@ -3229,8 +3133,7 @@ function migrate_customerorder_shipping($db, $langs, $conf)
                         $i++;
                     }
                 }
-                else
-                {
+                else {
                     print $langs->trans('AlreadyDone')."<br>\n";
                 }
 
@@ -3238,26 +3141,22 @@ function migrate_customerorder_shipping($db, $langs, $conf)
                 {
                     $db->commit();
                 }
-                else
-                {
+                else {
                     dol_print_error($db);
                     $db->rollback();
                 }
             }
-            else
-            {
+            else {
                 dol_print_error($db);
                 $db->rollback();
             }
         }
-        else
-        {
+        else {
             dol_print_error($db);
             $db->rollback();
         }
     }
-    else
-    {
+    else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
 
@@ -3331,16 +3230,14 @@ function migrate_shipping_delivery($db, $langs, $conf)
                         }
                         print ". ";
                     }
-                    else
-                    {
+                    else {
                         $error++;
                         dol_print_error($db);
                     }
                     $i++;
                 }
             }
-            else
-            {
+            else {
                 print $langs->trans('AlreadyDone')."<br>\n";
             }
 
@@ -3355,20 +3252,17 @@ function migrate_shipping_delivery($db, $langs, $conf)
                 $sqlDrop = "ALTER TABLE ".MAIN_DB_PREFIX."livraison DROP COLUMN fk_expedition";
                 $db->query($sqlDrop);
             }
-            else
-            {
+            else {
                 dol_print_error($db);
                 $db->rollback();
             }
         }
-        else
-        {
+        else {
             dol_print_error($db);
             $db->rollback();
         }
     }
-    else
-    {
+    else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
 
@@ -3436,8 +3330,7 @@ function migrate_shipping_delivery2($db, $langs, $conf)
                 $i++;
             }
         }
-        else
-        {
+        else {
             print $langs->trans('AlreadyDone')."<br>\n";
         }
 
@@ -3445,14 +3338,12 @@ function migrate_shipping_delivery2($db, $langs, $conf)
         {
             $db->commit();
         }
-        else
-        {
+        else {
             dol_print_error($db);
             $db->rollback();
         }
     }
-    else
-    {
+    else {
         dol_print_error($db);
         $db->rollback();
     }
@@ -3511,14 +3402,12 @@ function migrate_actioncomm_element($db, $langs, $conf)
 				//$db->query($sqlDrop);
 				//print ". ";
 			}
-			else
-			{
+			else {
 				dol_print_error($db);
 				$db->rollback();
 			}
 		}
-		else
-		{
+		else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 	}
@@ -3603,14 +3492,12 @@ function migrate_mode_reglement($db, $langs, $conf)
 					{
 						$db->commit();
 					}
-					else
-					{
+					else {
 						dol_print_error($db);
 						$db->rollback();
 					}
 				}
-				else
-				{
+				else {
 					dol_print_error($db);
 					$db->rollback();
 				}
@@ -3694,16 +3581,14 @@ function migrate_clean_association($db, $langs, $conf)
                         print '<td class="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Success").' ('.$num.'=>'.count($couples).')</td></tr>';
                         $db->commit();
                     }
-                    else
-                    {
+                    else {
                         print '<tr><td>'.$langs->trans("MigrationCategorieAssociation").'</td>';
                         print '<td class="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Failed").'</td></tr>';
                         $db->rollback();
                     }
                 }
             }
-            else
-            {
+            else {
                 print '<tr><td>'.$langs->trans("Error").'</td>';
                 print '<td class="right"><div class="error">'.$db->lasterror().'</div></td></tr>';
             }
@@ -3764,8 +3649,7 @@ function migrate_categorie_association($db, $langs, $conf)
 					$i++;
 				}
 			}
-			else
-			{
+			else {
 				print $langs->trans('AlreadyDone')."<br>\n";
 			}
 
@@ -3786,19 +3670,16 @@ function migrate_categorie_association($db, $langs, $conf)
 
 				$db->commit();
 			}
-			else
-			{
+			else {
 				$db->rollback();
 			}
 		}
-		else
-		{
+		else {
 			dol_print_error($db);
 			$db->rollback();
 		}
 	}
-	else
-	{
+	else {
 		print $langs->trans('AlreadyDone')."<br>\n";
 	}
 
@@ -3858,8 +3739,7 @@ function migrate_event_assignement($db, $langs, $conf)
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
@@ -3867,13 +3747,11 @@ function migrate_event_assignement($db, $langs, $conf)
 		{
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -3935,8 +3813,7 @@ function migrate_event_assignement_contact($db, $langs, $conf)
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
@@ -3944,13 +3821,11 @@ function migrate_event_assignement_contact($db, $langs, $conf)
 		{
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4022,8 +3897,7 @@ function migrate_reset_blocked_log($db, $langs, $conf)
 							$error++;
 							dol_print_error($db);
 						}
-						else
-						{
+						else {
 							// Add set line
 							$object = new stdClass();
 							$object->id = 1;
@@ -4041,21 +3915,18 @@ function migrate_reset_blocked_log($db, $langs, $conf)
 							}
 						}
 					}
-					else
-					{
+					else {
 						print ' - '.$langs->trans('AlreadyInV7').'<br>';
 					}
 				}
-				else
-				{
+				else {
 					dol_print_error($db);
 				}
 
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			print $langs->trans('NothingToDo')."<br>\n";
 		}
 
@@ -4063,13 +3934,11 @@ function migrate_reset_blocked_log($db, $langs, $conf)
 		{
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4132,8 +4001,7 @@ function migrate_remise_entity($db, $langs, $conf)
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
@@ -4141,13 +4009,11 @@ function migrate_remise_entity($db, $langs, $conf)
 		{
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4207,8 +4073,7 @@ function migrate_remise_except_entity($db, $langs, $conf)
 					$sqlSelect2 .= " WHERE fd.rowid = ".$obj->fk_facture_line;
 					$sqlSelect2 .= " AND fd.fk_facture = f.rowid";
 				}
-				else
-				{
+				else {
 					$sqlSelect2 = "SELECT s.entity";
 					$sqlSelect2 .= " FROM ".MAIN_DB_PREFIX."societe as s";
 					$sqlSelect2 .= " WHERE s.rowid = ".$obj->fk_soc;
@@ -4233,8 +4098,7 @@ function migrate_remise_except_entity($db, $langs, $conf)
 						}
 					}
 				}
-				else
-				{
+				else {
 					$error++;
 					dol_print_error($db);
 				}
@@ -4243,8 +4107,7 @@ function migrate_remise_except_entity($db, $langs, $conf)
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
@@ -4252,13 +4115,11 @@ function migrate_remise_except_entity($db, $langs, $conf)
 		{
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4319,8 +4180,7 @@ function migrate_user_rights_entity($db, $langs, $conf)
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
@@ -4328,13 +4188,11 @@ function migrate_user_rights_entity($db, $langs, $conf)
 		{
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4395,8 +4253,7 @@ function migrate_usergroup_rights_entity($db, $langs, $conf)
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
@@ -4404,13 +4261,11 @@ function migrate_usergroup_rights_entity($db, $langs, $conf)
 		{
 			$db->commit();
 		}
-		else
-		{
+		else {
 			$db->rollback();
 		}
 	}
-	else
-	{
+	else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4774,8 +4629,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->init($reloadmode);
 			}
 		}
-		else
-		{
+		else {
 			$reg = array();
 			$tmp = preg_match('/MAIN_MODULE_([a-zA-Z0-9]+)/', $moduletoreload, $reg);
 			if (!empty($reg[1]))
@@ -4784,7 +4638,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				{
 					$moduletoreloadshort = ucfirst(strtolower($reg[1]));
 				}
-				else												// If key is a mix of up and low case
+				else // If key is a mix of up and low case
 				{
 					$moduletoreloadshort = $reg[1];
 				}
@@ -4796,8 +4650,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 					//$mod->remove('noboxes');
 					$mod->init($reloadmode);
 				}
-				else
-				{
+				else {
 					dolibarr_install_syslog('Failed to include '.DOL_DOCUMENT_ROOT.'/core/modules/mod'.$moduletoreloadshort.'.class.php');
 
 					$res = @dol_include_once(strtolower($moduletoreloadshort).'/core/modules/mod'.$moduletoreloadshort.'.class.php');
@@ -4807,14 +4660,12 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 						//$mod->remove('noboxes');
 						$mod->init($reloadmode);
 					}
-					else
-					{
+					else {
 						dolibarr_install_syslog('Failed to include '.strtolower($moduletoreloadshort).'/core/modules/mod'.$moduletoreloadshort.'.class.php');
 					}
 				}
 			}
-			else
-			{
+			else {
 				dolibarr_install_syslog("Error, can't find module with name ".$moduletoreload, LOG_WARNING);
 				print "Error, can't find module with name ".$moduletoreload;
 			}
@@ -4949,7 +4800,7 @@ function migrate_user_photospath()
 									// dol_delete_dir($origin.'/'.$file);
 			        			}
 			    			}
-			    			else								// it is a file
+			    			else // it is a file
 			    			{
 			    				if (!dol_is_file($destin.'/'.$file))
 			    				{

From def53338de2c55147ff3d7e7b95a5f5389cb2147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 09:07:10 +0200
Subject: [PATCH 332/490] add new rule

---
 build/generate_filelist_xml.php               |   4 +-
 dev/initdemo/sftpget_and_loaddump.php         |   8 +-
 dev/initdemo/updatedemo.php                   |   4 +-
 htdocs/core/class/cunits.class.php            |   8 +-
 htdocs/document.php                           |  12 +-
 htdocs/main.inc.php                           |  36 ++--
 htdocs/website/class/website.class.php        |  12 +-
 htdocs/website/class/websitepage.class.php    |   5 +-
 htdocs/website/index.php                      | 169 ++++++------------
 htdocs/website/samples/wrapper.php            |  18 +-
 .../accountancy/export-thirdpartyaccount.php  |   6 +-
 scripts/bank/export-bank-receipts.php         |   3 +-
 .../email_expire_services_to_customers.php    |  15 +-
 ...ail_expire_services_to_representatives.php |   9 +-
 scripts/cron/cron_run_jobs.php                |   9 +-
 scripts/emailings/mailing-send.php            |  15 +-
 .../email_unpaid_invoices_to_customers.php    |   9 +-
 ...ail_unpaid_invoices_to_representatives.php |   3 +-
 .../members/sync_members_ldap2dolibarr.php    |   6 +-
 .../sync_members_types_ldap2dolibarr.php      |   3 +-
 scripts/user/sync_groups_ldap2dolibarr.php    |   3 +-
 scripts/user/sync_users_ldap2dolibarr.php     |   6 +-
 22 files changed, 125 insertions(+), 238 deletions(-)

diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
index 976f2cb6ba3..581353b758b 100755
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -110,7 +110,7 @@ print "Working on files into          : ".DOL_DOCUMENT_ROOT."\n";
 print "Include custom in signature    : ".$includecustom."\n";
 print "Include constants in signature : ";
 foreach ($includeconstants as $countrycode => $tmp) {
-    foreach($tmp as $constname => $constvalue) {
+    foreach ($tmp as $constname => $constvalue) {
         print $constname.'='.$constvalue." ";
     }
 }
@@ -130,7 +130,7 @@ fputs($fp, '<checksum_list version="'.$release.'" date="'.dol_print_date(dol_now
 
 foreach ($includeconstants as $countrycode => $tmp) {
     fputs($fp, '<dolibarr_constants country="'.$countrycode.'">'."\n");
-    foreach($tmp as $constname => $constvalue) {
+    foreach ($tmp as $constname => $constvalue) {
         $valueforchecksum=(empty($constvalue)?'0':$constvalue);
         $checksumconcat[]=$valueforchecksum;
         fputs($fp, '    <constant name="'.$constname.'">'.$valueforchecksum.'</constant>'."\n");
diff --git a/dev/initdemo/sftpget_and_loaddump.php b/dev/initdemo/sftpget_and_loaddump.php
index 5b16d3afe9b..4da5ffaad58 100755
--- a/dev/initdemo/sftpget_and_loaddump.php
+++ b/dev/initdemo/sftpget_and_loaddump.php
@@ -95,8 +95,7 @@ if ($connection)
 		dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password), LOG_ERR);
 		exit(-5);
 	}
-	else
-	{
+	else {
 		//$stream = ssh2_exec($connection, '/usr/bin/php -i');
 		/*
 		print "Generate dump ".$filesys1.'.bz2'."\n";
@@ -125,14 +124,13 @@ if ($connection)
 		$return_var=0;
 		print strftime("%Y%m%d-%H%M%S").' '.$fullcommand."\n";
 		exec($fullcommand, $output, $return_var);
-		foreach($output as $line) print $line."\n";
+		foreach ($output as $line) print $line."\n";
 
 		//ssh2_sftp_unlink($sftp, $fileinstalllock);
 		//print $output;
 	}
 }
-else
-{
+else {
 	print 'Failed to connect to ssh2 to '.$server;
 	exit(-6);
 }
diff --git a/dev/initdemo/updatedemo.php b/dev/initdemo/updatedemo.php
index 0cc43a18a9d..95d5ad12c83 100755
--- a/dev/initdemo/updatedemo.php
+++ b/dev/initdemo/updatedemo.php
@@ -87,7 +87,7 @@ while ($year <= $currentyear)
 
     if ($delta1)
     {
-        foreach($tables as $tablekey => $tableval)
+        foreach ($tables as $tablekey => $tableval)
         {
             print "Correct ".$tablekey." for year ".$year." and move them to current year ".$currentyear." ";
             $sql="select rowid from ".MAIN_DB_PREFIX.$tablekey." where ".$tableval[0]." between '".$year."-01-01' and '".$year."-12-31' and ".$tableval[0]." < DATE_ADD(NOW(), INTERVAL -1 YEAR)";
@@ -105,7 +105,7 @@ while ($year <= $currentyear)
                         print ".";
                         $sql2="UPDATE ".MAIN_DB_PREFIX.$tablekey." set ";
                         $j=0;
-                        foreach($tableval as $field)
+                        foreach ($tableval as $field)
                         {
                             if ($j) $sql2.=", ";
                             $sql2.= $field." = ".$db->ifsql("DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR) > NOW()", "DATE_ADD(".$field.", INTERVAL ".$delta2." YEAR)", "DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR)");
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index 0b56b4c0831..80ea8e2f0cc 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -432,11 +432,9 @@ class CUnits // extends CommonObject
 		return round($value, 2);
 	}
 
-
-
 	/**
 	 * get scale of unit factor
-	 * @param $id int id of unit in dictionary
+	 * @param int $id id of unit in dictionary
 	 * @return float|int
 	 */
 	public function scaleOfUnitPow($id)
@@ -444,9 +442,9 @@ class CUnits // extends CommonObject
 		$base = 10;
 		// TODO : add base col into unit dictionary table
 		$unit = $this->db->getRow('SELECT scale, unit_type from '.MAIN_DB_PREFIX.'c_units WHERE rowid = '.intval($id));
-		if ($unit){
+		if ($unit) {
 			// TODO : if base exist in unit dictionary table remove this convertion exception and update convertion infos in database exemple time hour currently scale 3600 will become scale 2 base 60
-			if ($unit->unit_type == 'time'){
+			if ($unit->unit_type == 'time') {
 				return doubleval($unit->scale);
 			}
 
diff --git a/htdocs/document.php b/htdocs/document.php
index c1ed149649e..0d08296e63e 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -134,19 +134,16 @@ if (!empty($hashp))
 				$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 				//var_dump($original_file); exit;
 			}
-			else
-			{
+			else {
 				accessforbidden('Bad link. File is from another module part.', 0, 0, 1);
 			}
 		}
-		else
-		{
+		else {
 			$modulepart = $moduleparttocheck;
 			$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 		}
 	}
-	else
-	{
+	else {
 		$langs->load("errors");
 		accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"), 0, 0, 1);
 	}
@@ -185,8 +182,7 @@ if (!empty($hashp))
 	$accessallowed = 1; // When using hashp, link is public so we force $accessallowed
 	$sqlprotectagainstexternals = '';
 }
-else
-{
+else {
 	// Basic protection (against external users only)
 	if ($user->socid > 0)
 	{
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 733ded3e447..569f4aa6c57 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1340,23 +1340,17 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			else print '<script src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			if (!defined('DISABLE_JQUERY_TABLEDND')) print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			// jQuery jnotify
-			if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY'))
-			{
+			if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY')) {
 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
 			// Flot
-			if (empty($conf->global->MAIN_JS_GRAPH) || $conf->global->MAIN_JS_GRAPH == 'jflot')
-			{
-				if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && !defined('DISABLE_JQUERY_FLOT'))
-				{
-					if (constant('JS_JQUERY_FLOT'))
-					{
+			if (empty($conf->global->MAIN_JS_GRAPH) || $conf->global->MAIN_JS_GRAPH == 'jflot') {
+				if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && !defined('DISABLE_JQUERY_FLOT')) {
+					if (constant('JS_JQUERY_FLOT')) {
 						print '<script src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 						print '<script src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 						print '<script src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
-					}
-					else
-					{
+					} else {
 						print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 						print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 						print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
@@ -1375,14 +1369,12 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 				}
 			}
 			// Chart
-			if ($conf->global->MAIN_JS_GRAPH == 'chart')
-			{
+			if ($conf->global->MAIN_JS_GRAPH == 'chart') {
 				print '<script src="'.DOL_URL_ROOT.'/includes/nnnick/chartjs/dist/Chart.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
 
 			// jQuery jeditable for Edit In Place features
-			if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !defined('DISABLE_JQUERY_JEDITABLE'))
-			{
+			if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !defined('DISABLE_JQUERY_JEDITABLE')) {
 				print '<!-- JS to manage editInPlace feature -->'."\n";
 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
@@ -1401,28 +1393,26 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
             // jQuery Timepicker
-            if (!empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
-            {
+            if (!empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER')) {
             	print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
             	print '<script src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext ? '&amp;'.$ext : '').'"></script>'."\n";
             }
-            if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2", ...
-            {
+            if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) {
+                // jQuery plugin "mutiselect", "multiple-select", "select2", ...
             	$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
             	print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; // We include full because we need the support of containerCssClass
             }
 		}
 
-        if (!$disablejs && !empty($conf->use_javascript_ajax))
-        {
+        if (!$disablejs && !empty($conf->use_javascript_ajax)) {
             // CKEditor
         	if ((!empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR')) || defined('FORCE_CKEDITOR'))
             {
                 print '<!-- Includes JS for CKEditor -->'."\n";
                 $pathckeditor = DOL_URL_ROOT.'/includes/ckeditor/ckeditor/';
                 $jsckeditor = 'ckeditor.js';
-                if (constant('JS_CKEDITOR'))	// To use external ckeditor 4 js lib
-                {
+                if (constant('JS_CKEDITOR')) {
+                    // To use external ckeditor 4 js lib
                 	$pathckeditor = constant('JS_CKEDITOR');
                 }
                 print '<script><!-- enable ckeditor by main.inc.php -->';
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index d579a8b3153..51008beffd7 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -728,8 +728,7 @@ class Website extends CommonObject
 						$newidforhome = $objectpagenew->id;
 					}
 				}
-				else
-				{
+				else {
 					setEventMessages($objectpageold->error, $objectpageold->errors, 'errors');
 					$error++;
 				}
@@ -1089,8 +1088,7 @@ class Website extends CommonObject
 		{
 			return $filename;
 		}
-		else
-		{
+		else {
 			global $errormsg;
 			$this->error = $errormsg;
 			return '';
@@ -1263,8 +1261,7 @@ class Website extends CommonObject
 			$this->db->rollback();
 			return -1;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return $object->id;
 		}
@@ -1342,8 +1339,7 @@ class Website extends CommonObject
 		{
 			return -1;
 		}
-		else
-		{
+		else {
 			return 1;
 		}
 	}
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 2a72a222265..dcc7b0508fa 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -238,8 +238,7 @@ class WebsitePage extends CommonObject
 		{
 			$sql .= ' AND t.rowid = '.$id;
 		}
-		else
-		{
+		else {
 			if ($id < 0) $sql .= ' AND t.rowid <> '.abs($id);
 			if (null !== $website_id) {
 			    $sql .= " AND t.fk_website = '".$this->db->escape($website_id)."'";
@@ -359,7 +358,7 @@ class WebsitePage extends CommonObject
 				} elseif ($key == 'lang' || $key == 't.lang') {
 					$listoflang = array();
 					$foundnull = 0;
-					foreach(explode(',', $value) as $tmpvalue) {
+					foreach (explode(',', $value) as $tmpvalue) {
 						if ($tmpvalue == 'null') {
 							$foundnull++;
 							continue;
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index ba539ccb653..3d29b8ac2ea 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -144,20 +144,19 @@ if (($pageid > 0 || $pageref) && $action != 'addcontainer')
 				$res = $objectpage->fetch($object->fk_default_home, $object->id, ''); // We search first page of web site
 				if ($res > 0) $pageid = $object->fk_default_home;
 			}
-			else
-			{
+			else {
 				$res = $objectpage->fetch(0, $object->id, ''); // We search first page of web site
 				if ($res == 0)	// Page was not found, we reset it
 				{
 					$objectpage = new WebsitePage($db);
 				}
-				else			// We found a page, we set pageid to it.
+				else // We found a page, we set pageid to it.
 				{
 					$pageid = $objectpage->id;
 				}
 			}
 		}
-		else	// We have a valid page. We force pageid for the case we got the page with a fetch on ref.
+		else // We have a valid page. We force pageid for the case we got the page with a fetch on ref.
 		{
 			$pageid = $objectpage->id;
 		}
@@ -514,8 +513,7 @@ if ($action == 'addsite')
 		header("Location: ".$_SERVER["PHP_SELF"].'?website='.$tmpobject->ref);
 		exit;
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		$action = 'createsite';
 	}
@@ -609,8 +607,7 @@ if ($action == 'addcontainer')
 				setEventMessages('Error getting '.$urltograb.': '.$tmp['http_code'], null, 'errors');
 				$action = 'createcontainer';
 			}
-			else
-			{
+			else {
 				// Remove comments
 				$tmp['content'] = removeHtmlComment($tmp['content']);
 
@@ -698,8 +695,7 @@ if ($action == 'addcontainer')
 					{
 						$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
 					}
-					else
-					{
+					else {
 						$urltograbbis = $urltograbdirwithoutslash.'/'.$regs[2][$key]; // We use dir of grabbed file
 					}
 
@@ -767,8 +763,7 @@ if ($action == 'addcontainer')
 					{
 						$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
 					}
-					else
-					{
+					else {
 						$urltograbbis = $urltograbdirwithoutslash.'/'.$regs[2][$key]; // We use dir of grabbed file
 					}
 
@@ -803,8 +798,7 @@ if ($action == 'addcontainer')
 						dol_syslog('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg']);
 						$action = 'createcontainer';
 					}
-					else
-					{
+					else {
 						// Clean some comment
 						//$tmpgeturl['content'] = dol_string_is_good_iso($tmpgeturl['content'], 1);
 						//$tmpgeturl['content'] = utf8_encode(utf8_decode($tmpgeturl['content']));
@@ -872,8 +866,7 @@ if ($action == 'addcontainer')
 			}
 		}
 	}
-	else
-	{
+	else {
 		$objectpage->title = GETPOST('WEBSITE_TITLE', 'alphanohtml');
 		$objectpage->type_container = GETPOST('WEBSITE_TYPE_CONTAINER', 'aZ09');
 		$objectpage->pageurl = GETPOST('WEBSITE_PAGENAME', 'alpha');
@@ -972,8 +965,7 @@ if ($action == 'addcontainer')
 			{
 				setEventMessages($langs->trans("Saved"), null, 'mesgs');
 			}
-			else
-			{
+			else {
 				setEventMessages('Failed to write file '.$filetpl, null, 'errors');
 				$action = 'createcontainer';
 			}
@@ -985,8 +977,7 @@ if ($action == 'addcontainer')
 		setEventMessages($langs->trans("PageAdded", $objectpage->pageurl), null, 'mesgs');
 		$action = '';
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 
@@ -1097,8 +1088,7 @@ if ($action == 'confirm_deletesite' && $confirm == 'yes')
 		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -1134,8 +1124,7 @@ if ($action == 'delete')
 		header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey);
 		exit;
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -1149,8 +1138,7 @@ if ($action == 'updatecss')
 	{
 		$action = 'editcss';
 	}
-	else
-	{
+	else {
 		$res = $object->fetch(0, $websitekey);
 		$website = $object;
 
@@ -1399,8 +1387,7 @@ if ($action == 'updatecss')
 	    			exit;
 	    		}
     		}
-    		else
-    		{
+    		else {
     			$action = 'editcss';
     		}
 		}
@@ -1436,8 +1423,7 @@ if ($action == 'setashome')
 
 		$action = 'preview';
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 }
@@ -1545,8 +1531,7 @@ if ($action == 'updatemeta')
 				setEventMessages($langs->trans("ErrorAPageWithThisNameOrAliasAlreadyExists"), null, 'errors');
 				$action = 'editmeta';
 			}
-			else
-			{
+			else {
 				$error++;
 				$langs->load("errors");
 				setEventMessages($objectpage->error, $objectpage->errors, 'errors');
@@ -1559,8 +1544,7 @@ if ($action == 'updatemeta')
 	{
 		$db->commit();
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 
@@ -1631,13 +1615,11 @@ if ($action == 'updatemeta')
 				//exit;
 				$action = 'preview';
 			}
-			else
-			{
+			else {
 				$action = 'editmeta';
 			}
 		}
-		else
-		{
+		else {
 			setEventMessages('Failed to write file '.$filetpl, null, 'errors');
 			//header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
    			//exit;
@@ -1667,8 +1649,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 
 			$db->rollback();
 		}
-		else
-		{
+		else {
 			$object = $objectnew;
 			$id = $object->id;
 			$pageid = $object->fk_default_home;
@@ -1710,8 +1691,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 				$tmpwebsite->fetch($newwebsiteid);
 				$pathofwebsitenew = $dolibarr_main_data_root.'/website/'.$tmpwebsite->ref;
 			}
-			else
-			{
+			else {
 				$tmpwebsite = $object;
 			}
 
@@ -1725,8 +1705,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 
 				$db->rollback();
 			}
-			else
-			{
+			else {
 				$fileindex = $pathofwebsitenew.'/index.php';
 				$filetpl = $pathofwebsitenew.'/page'.$resultpage->id.'.tpl.php';
 				$filewrapper = $pathofwebsitenew.'/wrapper.php';
@@ -1774,8 +1753,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 		{
 			$res = $objectpage->fetch($pageid);
 		}
-		else
-		{
+		else {
 			$res = 0;
 			if ($object->fk_default_home > 0)
 			{
@@ -1886,40 +1864,34 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 							exit;
 						}
 					}
-					else
-					{
+					else {
 						if ($action == 'updatesource') $action = 'editsource';
 						if ($action == 'updatecontent') $action = 'editcontent';
 					}
 				}
-				else
-				{
+				else {
 					setEventMessages('Failed to write file '.$filetpl, null, 'errors');
 					header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
 	   				exit;
 				}
 			}
-			else
-			{
+			else {
 				$db->rollback();
 			}
 		}
-		else
-		{
+		else {
 			header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
 			exit;
 		}
 	}
-	else
-	{
+	else {
 		if (!$error)
 		{
 			if (empty($websitekey) || $websitekey == '-1')
 			{
 				setEventMessages($langs->trans("NoWebSiteCreateOneFirst"), null, 'warnings');
 			}
-			else
-			{
+			else {
 				setEventMessages($langs->trans("NoPageYet"), null, 'warnings');
 				setEventMessages($langs->trans("YouCanCreatePageOrImportTemplate"), null, 'warnings');
 			}
@@ -1943,8 +1915,7 @@ if ($action == 'exportsite')
 		readfile($fileofzip);
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'preview';
 	}
@@ -1959,8 +1930,7 @@ if ($action == 'regeneratesite')
 		setEventMessages($langs->trans("PagesRegenerated"), null, 'mesgs');
 		$action = 'preview';
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'preview';
 	}
@@ -1974,8 +1944,7 @@ if ($action == 'importsiteconfirm')
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
 		$action = 'importsite';
 	}
-	else
-	{
+	else {
 		if (!empty($_FILES) || GETPOSTISSET('templateuserfile'))
 		{
 			// Check symlink to medias and restore it if ko
@@ -2044,8 +2013,7 @@ if ($action == 'importsiteconfirm')
 					setEventMessages($object->error, $object->errors, 'errors');
 					$action = 'importsite';
 				}
-				else
-				{
+				else {
 					// Force mode dynamic on
 					dolibarr_set_const($db, 'WEBSITE_SUBCONTAINERSINLINE', 1, 'chaine', 0, '', $conf->entity);
 
@@ -2236,8 +2204,7 @@ if (!GETPOST('hide_websitemenu'))
 		{
 			print '<input type="submit" class="button bordertransp" disabled="disabled" value="'.dol_escape_htmltag($importlabel).'" name="importsite">';
 		}
-		else
-		{
+		else {
 			print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($importlabel).'" name="importsite">';
 		}
 
@@ -2300,16 +2267,14 @@ if (!GETPOST('hide_websitemenu'))
 		{
 		    //$htmltext .= '<br><span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span><br><br>';
 		}
-		else
-		{
+		else {
 		    $htmltext .= '<br><center>'.$langs->trans("GoTo").' <a href="'.$virtualurl.'" target="_website">'.$virtualurl.'</a></center><br>';
 		}
 		if (!empty($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER))
 		{
 		    $htmltext .= '<br>'.$langs->trans($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER);
 		}
-		else
-		{
+		else {
     		$htmltext .= $langs->trans("SetHereVirtualHost", $dataroot);
     		$htmltext .= '<br>';
     		$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
@@ -2380,8 +2345,7 @@ if (!GETPOST('hide_websitemenu'))
 		{
 			print '<span class="websiteselection">'.$formwebsite->selectContainer($website, 'pageid', $pageid, 0, $action, 'maxwidth200onsmartphone').'</span>';
 		}
-		else
-		{
+		else {
 			print $langs->trans("New");
 		}
 
@@ -2556,15 +2520,13 @@ if (!GETPOST('hide_websitemenu'))
 					//print '<input type="submit" class="button bordertransp" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("OnlyEditionOfSourceForGrabbedContent")).'" value="'.dol_escape_htmltag($langs->trans("EditWithEditor")).'" name="editcontent">';
 					print '<a class="nobordertransp opacitymedium nohoverborder marginleftonlyshort"'.$disabled.' href="#" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("OnlyEditionOfSourceForGrabbedContent")).'">'.img_picto($langs->trans("OnlyEditionOfSourceForGrabbedContent"), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
 				}
-				else
-				{
+				else {
 					//print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditWithEditor")).'" name="editcontent">';
 					if (empty($conf->global->WEBSITE_EDITINLINE))
 					{
 						print '<a class="nobordertransp nohoverborder marginleftonlyshort"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=seteditinline">'.img_picto($langs->trans("EditInLineOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
 					}
-					else
-					{
+					else {
 						print '<a class="nobordertransp nohoverborder marginleftonlyshort"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=unseteditinline">'.img_picto($langs->trans("EditInLineOnOff", $langs->transnoentitiesnoconv("On")), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
 					}
 				}
@@ -2576,8 +2538,7 @@ if (!GETPOST('hide_websitemenu'))
 				{
 					print '<a class="nobordertransp nohoverborder marginleftonlyshort"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=setshowsubcontainers">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
 				}
-				else
-				{
+				else {
 					print '<a class="nobordertransp nohoverborder marginleftonlyshort"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=unsetshowsubcontainers">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("On")), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
 				}
 				/*}*/
@@ -2592,8 +2553,7 @@ if (!GETPOST('hide_websitemenu'))
 					//print '<input type="submit" class="button bordertransp" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
 					print '<a href="#" class="button bordertransp disabled" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"><span></a>';
 				}
-				else
-				{
+				else {
 					//$disabled='';
 					//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
 					print '<a href="'.$_SERVER["PHP_SEFL"].'?action=setashome&website='.$website->ref.'&pageid='.$pageid.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"><span></a>';
@@ -2662,8 +2622,7 @@ if (!GETPOST('hide_websitemenu'))
             {
                 print $form->textwithpicto('', $htmltext, 1, 'help', 'inline-block', 1, 2, 'tooltipsubstitution');
             }
-            else
-            {
+            else {
             	//img_help(($tooltiptrigger != '' ? 2 : 1), $alt)
             	print $form->textwithpicto($langs->trans("SyntaxHelp").' '.img_help(2, $langs->trans("SyntaxHelp")), $htmltext, 1, 'none', 'inline-block', 1, 2, 'tooltipsubstitution');
             }
@@ -2747,8 +2706,7 @@ if ($action == 'editcss')
 		// Clean the php css file to remove php code and get only css part
 		$csscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $csscontent);
 	}
-	else
-	{
+	else {
 		$csscontent = GETPOST('WEBSITE_CSS_INLINE', 'none');
 	}
 	if (!trim($csscontent)) {
@@ -2761,8 +2719,7 @@ if ($action == 'editcss')
 		// Clean the php js file to remove php code and get only js part
 		$jscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $jscontent);
 	}
-	else
-	{
+	else {
 		$jscontent = GETPOST('WEBSITE_JS_INLINE', 'none');
 	}
 	if (!trim($jscontent)) $jscontent = '/* JS content (all pages) */'."\n";
@@ -2773,8 +2730,7 @@ if ($action == 'editcss')
 		// Clean the php htmlheader file to remove php code and get only html part
 		$htmlheadercontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $htmlheadercontent);
 	}
-	else
-	{
+	else {
 		$htmlheadercontent = GETPOST('WEBSITE_HTML_HEADER', 'none');
 	}
 	if (!trim($htmlheadercontent))
@@ -2783,8 +2739,7 @@ if ($action == 'editcss')
 		$htmlheadercontent .= $htmlheadercontentdefault;
 		$htmlheadercontent .= "</html>";
 	}
-	else
-	{
+	else {
 		$htmlheadercontent = preg_replace('/^\s*<html>/ims', '', $htmlheadercontent);
 		$htmlheadercontent = preg_replace('/<\/html>\s*$/ims', '', $htmlheadercontent);
 		$htmlheadercontent = '<html>'."\n".trim($htmlheadercontent)."\n".'</html>';
@@ -2796,8 +2751,7 @@ if ($action == 'editcss')
 		// Clean the php htmlheader file to remove php code and get only html part
 		$robotcontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $robotcontent);
 	}
-	else
-	{
+	else {
 		$robotcontent = GETPOST('WEBSITE_ROBOT', 'nothtml');
 	}
 	if (!trim($robotcontent))
@@ -2814,8 +2768,7 @@ if ($action == 'editcss')
 		// Clean the php htaccesscontent file to remove php code and get only html part
 		$htaccesscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $htaccesscontent);
 	}
-	else
-	{
+	else {
 		$htaccesscontent = GETPOST('WEBSITE_HTACCESS', 'nohtml');
 	}
 	if (!trim($htaccesscontent))
@@ -2831,8 +2784,7 @@ if ($action == 'editcss')
 		// Clean the manifestjson file to remove php code and get only html part
 		$manifestjsoncontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $manifestjsoncontent);
 	}
-	else
-	{
+	else {
 		$manifestjsoncontent = GETPOST('WEBSITE_MANIFEST_JSON', 'none');
 	}
 	if (!trim($manifestjsoncontent))
@@ -2846,8 +2798,7 @@ if ($action == 'editcss')
 		// Clean the readme file to remove php code and get only html part
 		$readmecontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $readmecontent);
 	}
-	else
-	{
+	else {
 		$readmecontent = GETPOST('WEBSITE_README', 'none');
 	}
 	if (!trim($readmecontent))
@@ -3201,8 +3152,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 		$pageauthoralias = $objectpage->author_alias;
  		$pagestatus = $objectpage->status;
 	}
-	else
-	{
+	else {
 		$type_container = 'page';
 		$pagedatecreation = dol_now();
 		$pageauthorid = $user->id;
@@ -3679,8 +3629,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 
 					print '</tr>';
 				}
-				else
-				{
+				else {
 					print '<tr>';
 
 					print '<td>';
@@ -3719,8 +3668,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 			print '</div></div>';
 			print '<br>';
 		}
-		else
-		{
+		else {
 			print $listofpages['message'];
 		}
 	}
@@ -3842,8 +3790,7 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 		    // Remove the contenteditable="true"
 			$newcontent = preg_replace('/(div|section)(\s[^\>]*)contenteditable="true"/', '\1\2', $newcontent);
 		}
-		else
-		{
+		else {
 			// Keep the contenteditable="true" when mode Edit Inline is on
 		}
 		$out .= dolWebsiteReplacementOfLinks($object, $newcontent, 0, 'html', $objectpage->id)."\n";
@@ -3884,15 +3831,13 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 		/*print '<iframe class="websiteiframenoborder centpercent" src="'.DOL_URL_ROOT.'/public/website/index.php?website='.$websitekey.'&pageid='.$pageid.'"/>';
         print '</iframe>';*/
 	}
-	else
-	{
+	else {
 		if (empty($websitekey) || $websitekey == '-1')
 		{
 			print '<br><br><div class="center previewnotyetavailable"><span class="">'.$langs->trans("NoWebSiteCreateOneFirst").'</span></div><br><br><br>';
 			print '<div class="center"><div class="logo_setup"></div></div>';
 		}
-		else
-		{
+		else {
 			print '<br><br><div class="center previewnotyetavailable"><span class="">'.$langs->trans("PreviewOfSiteNotYetAvailable", $object->ref).'</span></div><br><br><br>';
 			print '<div class="center"><div class="logo_setup"></div></div>';
 		}
diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index 25483a36f53..1f6885c98f8 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -41,19 +41,16 @@ if (!empty($hashp))
 				$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 				//var_dump($original_file); exit;
 			}
-			else
-			{
+			else {
 				print 'Bad link. File is from another module part.';
 			}
 		}
-		else
-		{
+		else {
 			$modulepart = $moduleparttocheck;
 			$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 		}
 	}
-	else
-	{
+	else {
 		print "ErrorFileNotFoundWithSharedLink";
 		exit;
 	}
@@ -156,8 +153,7 @@ if ($rss) {
 		if ($result >= 0)
 		{
 			if (dol_move($outputfiletmp, $outputfile, 0, 1)) $result = 1;
-			else
-			{
+			else {
 				$error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
 				dol_syslog("build_exportfile ".$error, LOG_ERR);
 				dol_delete_file($outputfiletmp, 0, 1);
@@ -165,8 +161,7 @@ if ($rss) {
 				exit(-1);
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog("build_exportfile build_xxxfile function fails to for format=".$format." outputfiletmp=".$outputfile, LOG_ERR);
 			dol_delete_file($outputfiletmp, 0, 1);
 			$langs->load("errors");
@@ -208,8 +203,7 @@ elseif ($modulepart == "mycompany" && preg_match('/^\/?logos\//', $original_file
 {
 	readfile(dol_osencode($conf->mycompany->dir_output."/".$original_file));
 }
-else
-{
+else {
 	// Find the subdirectory name as the reference
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $refname);
diff --git a/scripts/accountancy/export-thirdpartyaccount.php b/scripts/accountancy/export-thirdpartyaccount.php
index e24a460f61e..ba4fe922ab9 100755
--- a/scripts/accountancy/export-thirdpartyaccount.php
+++ b/scripts/accountancy/export-thirdpartyaccount.php
@@ -65,10 +65,8 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			$month_end = $month_start - 1;
 			if ($month_end < 1)
 				$month_end = 12;
-			else
-				$year_end++;
-		} else
-			$month_end = $month_start;
+			else $year_end++;
+		} else $month_end = $month_start;
 		$date_start = dol_get_first_day($year_start, $month_start, false);
 		$date_end = dol_get_last_day($year_end, $month_end, false);
 	}
diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php
index 7ddc41752dd..4f2a256275a 100755
--- a/scripts/bank/export-bank-receipts.php
+++ b/scripts/bank/export-bank-receipts.php
@@ -241,8 +241,7 @@ if ($resql) {
 		preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthese on tente recherche de traduction
 		if ($reg[1] && $langs->transnoentitiesnoconv($reg[1]) != $reg[1])
 			$description = $langs->transnoentitiesnoconv($reg[1]);
-		else
-			$description = $objp->label;
+		else $description = $objp->label;
 
 		/*
 		 * Ajout les liens (societe, company...)
diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php
index 8bd3d4a4824..ae449484e7b 100755
--- a/scripts/contracts/email_expire_services_to_customers.php
+++ b/scripts/contracts/email_expire_services_to_customers.php
@@ -137,8 +137,7 @@ if ($resql) {
 					if ($oldemail != 'none') {
 						if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail]))
 							print "- No email sent for '".$oldtarget."', total: ".$total."\n";
-						else
-							print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+						else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
 					}
 				}
 				$oldemail = $newemail;
@@ -168,8 +167,7 @@ if ($resql) {
 			print "Service to expire ".$obj->ref.", label ".dol_concatdesc($obj->plabel, $obj->description).", due date ".dol_print_date($db->jdate($obj->date_fin_validite), 'day').", customer id ".$obj->sid." ".$obj->name.", ".($obj->cid ? "contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.", " : "")."email ".$newemail.", lang ".$outputlangs->defaultlang.": ";
 			if (dol_strlen($newemail))
 				print "qualified.";
-			else
-				print "disqualified (no email).";
+			else print "disqualified (no email).";
 			print "\n";
 
 			unset($outputlangs);
@@ -189,8 +187,7 @@ if ($resql) {
 				if ($oldemail != 'none') {
 					if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail]))
 						print "- No email sent for '".$oldtarget."', total: ".$total."\n";
-					else
-						print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+					else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
 				}
 			}
 		}
@@ -233,10 +230,8 @@ function envoi_mail($mode, $oldemail, $message, $total, $userlang, $oldtarget, $
 	if ($duration_value) {
 		if ($duration_value > 0)
 			$title = $newlangs->transnoentities("ListOfServicesToExpireWithDuration", $duration_value);
-		else
-			$title = $newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg", $duration_value);
-	} else
-		$title = $newlangs->transnoentities("ListOfServicesToExpire");
+		else $title = $newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg", $duration_value);
+	} else $title = $newlangs->transnoentities("ListOfServicesToExpire");
 
 	$subject = (empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_SUBJECT) ? $title : $conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_SUBJECT);
 	$sendto = $oldemail;
diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php
index dcc21de083b..06cb67c99e9 100755
--- a/scripts/contracts/email_expire_services_to_representatives.php
+++ b/scripts/contracts/email_expire_services_to_representatives.php
@@ -133,8 +133,7 @@ if ($resql) {
 			print "Service to expire ".$obj->ref.", label ".dol_concatdesc($obj->plabel, $obj->description).", due date ".dol_print_date($db->jdate($obj->date_fin_validite), 'day')." (linked to company ".$obj->name.", sale representative ".dolGetFirstLastname($obj->firstname, $obj->lastname).", email ".$obj->email."): ";
 			if (dol_strlen($obj->email))
 				print "qualified.";
-			else
-				print "disqualified (no email).";
+			else print "disqualified (no email).";
 			print "\n";
 
 			unset($outputlangs);
@@ -192,10 +191,8 @@ function envoi_mail($mode, $oldemail, $message, $total, $userlang, $oldsalerepre
 	if ($duration_value) {
 		if ($duration_value > 0)
 			$title = $newlangs->transnoentities("ListOfServicesToExpireWithDuration", $duration_value);
-		else
-			$title = $newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg", $duration_value);
-	} else
-		$title = $newlangs->transnoentities("ListOfServicesToExpire");
+		else $title = $newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg", $duration_value);
+	} else $title = $newlangs->transnoentities("ListOfServicesToExpire");
 
 	$subject = (empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT) ? $title : $conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT);
 	$sendto = $oldemail;
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index 40421c3853e..9ec5421648b 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -106,8 +106,7 @@ if ($userlogin == 'firstadmin') {
 			$userlogin = $obj->login;
 			echo "First admin user found is login '".$userlogin."', entity ".$obj->entity."\n";
 		}
-	} else
-		dol_print_error($db);
+	} else dol_print_error($db);
 }
 
 // Check user login
@@ -193,8 +192,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
     		        dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
     		        exit(-1);
     		    }
-    		    else
-    		    {
+    		    else {
     		        if ($result == 0)
     		        {
     		            echo "\nUser login: ".$userlogin." does not exists for entity ".$conf->entity."\n";
@@ -260,8 +258,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
 
 	$conf = $savconf;
 }
-else
-{
+else {
 	echo "cron_run_jobs.php no qualified job found\n";
 }
 
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index bc7efec7dba..7cde66db687 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -42,8 +42,7 @@ if (!isset($argv[1]) || !$argv[1]) {
 $id = $argv[1];
 if (isset($argv[2]) || !empty($argv[2]))
 	$login = $argv[2];
-else
-	$login = '';
+else $login = '';
 
 require_once $path."../../htdocs/master.inc.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php";
@@ -206,23 +205,19 @@ if ($resql) {
 
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
 								$substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else
-								$substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
 
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
 								$substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else
-								$substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'order'.$obj->source_id, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'order'.$obj->source_id, 2);
 
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
 								$substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else
-								$substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
 
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
 								$substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else
-								$substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'contractline'.$obj->source_id, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'contractline'.$obj->source_id, 2);
 						}
 
 						complete_substitutions_array($substitutionarray, $langs);
diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php
index 19e3e20e156..5617751b58b 100755
--- a/scripts/invoices/email_unpaid_invoices_to_customers.php
+++ b/scripts/invoices/email_unpaid_invoices_to_customers.php
@@ -135,8 +135,7 @@ if ($resql) {
 					if ($oldemail != 'none') {
 						if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail]))
 							print "- No email sent for '".$oldtarget."', total: ".$total."\n";
-						else
-							print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+						else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
 					}
 				}
 				$oldemail = $newemail;
@@ -166,8 +165,7 @@ if ($resql) {
 			print "Unpaid invoice ".$obj->ref.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date), 'day').", customer id ".$obj->sid." ".$obj->name.", ".($obj->cid ? "contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.", " : "")."email ".$newemail.", lang ".$outputlangs->defaultlang.": ";
 			if (dol_strlen($newemail))
 				print "qualified.";
-			else
-				print "disqualified (no email).";
+			else print "disqualified (no email).";
 			print "\n";
 
 			unset($outputlangs);
@@ -187,8 +185,7 @@ if ($resql) {
 				if ($oldemail != 'none') {
 					if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail]))
 						print "- No email sent for '".$oldtarget."', total: ".$total."\n";
-					else
-						print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+					else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
 				}
 			}
 		}
diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php
index 8ca40581d2a..9bdd37ca599 100755
--- a/scripts/invoices/email_unpaid_invoices_to_representatives.php
+++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php
@@ -137,8 +137,7 @@ if ($resql) {
 			print "Unpaid invoice ".$obj->ref.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date), 'day')." (linked to company ".$obj->name.", sale representative ".dolGetFirstLastname($obj->firstname, $obj->lastname).", email ".$obj->email.", lang ".$outputlangs->defaultlang."): ";
 			if (dol_strlen($obj->email))
 				print "qualified.";
-			else
-				print "disqualified (no email).";
+			else print "disqualified (no email).";
 			print "\n";
 
 			unset($outputlangs);
diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php
index 984305c2727..4166772cb10 100755
--- a/scripts/members/sync_members_ldap2dolibarr.php
+++ b/scripts/members/sync_members_ldap2dolibarr.php
@@ -114,8 +114,7 @@ print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
 print "DN to extract=".$conf->global->LDAP_MEMBER_DN."\n";
 if (!empty($conf->global->LDAP_MEMBER_FILTER))
 	print 'Filter=('.$conf->global->LDAP_MEMBER_FILTER.')'."\n"; // Note: filter is defined into function getRecords
-else
-	print 'Filter=('.$conf->global->LDAP_KEY_MEMBERS.'=*)'."\n";
+else print 'Filter=('.$conf->global->LDAP_KEY_MEMBERS.'=*)'."\n";
 print "----- To Dolibarr database:\n";
 print "type=".$conf->db->type."\n";
 print "host=".$conf->db->host."\n";
@@ -278,8 +277,7 @@ if ($result >= 0) {
 		if (!$error || $forcecommit) {
 			if (!$error)
 				print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else
-				print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
 			$db->commit();
 		} else {
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";
diff --git a/scripts/members/sync_members_types_ldap2dolibarr.php b/scripts/members/sync_members_types_ldap2dolibarr.php
index b3c22bf65a8..547b2664070 100755
--- a/scripts/members/sync_members_types_ldap2dolibarr.php
+++ b/scripts/members/sync_members_types_ldap2dolibarr.php
@@ -162,8 +162,7 @@ if ($result >= 0) {
 		if (!$error || $forcecommit) {
 			if (!$error)
 				print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else
-				print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
 			$db->commit();
 		} else {
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";
diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php
index e98097f061e..28c580dce63 100755
--- a/scripts/user/sync_groups_ldap2dolibarr.php
+++ b/scripts/user/sync_groups_ldap2dolibarr.php
@@ -211,8 +211,7 @@ if ($result >= 0) {
 		if (!$error || $forcecommit) {
 			if (!$error)
 				print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else
-				print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
 			$db->commit();
 		} else {
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";
diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php
index 022cf9a9ed7..c8502cd1f14 100755
--- a/scripts/user/sync_users_ldap2dolibarr.php
+++ b/scripts/user/sync_users_ldap2dolibarr.php
@@ -93,8 +93,7 @@ print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
 print "DN to extract=".$conf->global->LDAP_USER_DN."\n";
 if (!empty($conf->global->LDAP_FILTER_CONNECTION))
 	print 'Filter=('.$conf->global->LDAP_FILTER_CONNECTION.')'."\n"; // Note: filter is defined into function getRecords
-else
-	print 'Filter=('.$conf->global->LDAP_KEY_USERS.'=*)'."\n";
+else print 'Filter=('.$conf->global->LDAP_KEY_USERS.'=*)'."\n";
 print "----- To Dolibarr database:\n";
 print "type=".$conf->db->type."\n";
 print "host=".$conf->db->host."\n";
@@ -254,8 +253,7 @@ if ($result >= 0) {
 		if (!$error || $forcecommit) {
 			if (!$error)
 				print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else
-				print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
 			$db->commit();
 		} else {
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";

From ccc859ec8069ce78dfeef31c1599ae0b2baf2782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 09:12:18 +0200
Subject: [PATCH 333/490] add new rule

---
 htdocs/adherents/admin/adherent.php           |  45 +-
 htdocs/adherents/admin/adherent_emails.php    |  24 +-
 .../adherents/admin/adherent_extrafields.php  |   9 +-
 .../admin/adherent_type_extrafields.php       |   9 +-
 htdocs/adherents/admin/website.php            |  21 +-
 htdocs/adherents/agenda.php                   |  26 +-
 .../actions_adherentcard_common.class.php     |  39 +-
 .../actions_adherentcard_default.class.php    |   9 +-
 .../default/tpl/adherentcard_create.tpl.php   |   3 +-
 .../default/tpl/adherentcard_edit.tpl.php     |   3 +-
 .../default/tpl/adherentcard_view.tpl.php     |   3 +-
 htdocs/adherents/card.php                     | 408 ++++++------------
 htdocs/adherents/cartes/carte.php             |  66 +--
 htdocs/adherents/class/adherent.class.php     |  18 +-
 .../adherents/class/adherent_type.class.php   |  98 ++---
 .../adherents/class/adherentstats.class.php   |   3 +-
 htdocs/adherents/class/api_members.class.php  |  21 +-
 .../class/api_memberstypes.class.php          |  18 +-
 .../class/api_subscriptions.class.php         |  18 +-
 htdocs/adherents/class/subscription.class.php |  47 +-
 htdocs/adherents/document.php                 |  15 +-
 htdocs/adherents/htpasswd.php                 |  15 +-
 htdocs/adherents/index.php                    |  68 +--
 htdocs/adherents/ldap.php                     |  30 +-
 htdocs/adherents/list.php                     | 219 ++++------
 htdocs/adherents/note.php                     |   9 +-
 htdocs/adherents/stats/byproperties.php       |  12 +-
 htdocs/adherents/stats/geo.php                |  55 +--
 htdocs/adherents/stats/index.php              |  21 +-
 htdocs/adherents/subscription.php             | 277 ++++--------
 htdocs/adherents/subscription/card.php        |  69 +--
 htdocs/adherents/subscription/list.php        | 124 ++----
 .../adherents/tpl/linkedobjectblock.tpl.php   |   6 +-
 htdocs/adherents/type.php                     | 133 ++----
 htdocs/adherents/type_ldap.php                |  21 +-
 htdocs/adherents/type_translation.php         |  66 +--
 htdocs/zapier/class/hook.class.php            |   3 +-
 htdocs/zapier/hook_agenda.php                 |  29 +-
 htdocs/zapier/hook_card.php                   |  36 +-
 htdocs/zapier/hook_document.php               |   6 +-
 htdocs/zapier/hook_list.php                   |   3 +-
 htdocs/zapier/hook_note.php                   |   3 +-
 htdocs/zapier/lib/zapier_hook.lib.php         |   3 +-
 htdocs/zapier/zapierindex.php                 |   3 +-
 44 files changed, 711 insertions(+), 1403 deletions(-)

diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index ca5011849b1..ca1d1cc2a33 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -49,8 +49,7 @@ $action = GETPOST('action', 'alpha');
  */
 
 //
-if ($action == 'updateall')
-{
+if ($action == 'updateall') {
     $db->begin();
     $res1 = $res2 = $res3 = $res4 = $res5 = $res6 = 0;
     $res1 = dolibarr_set_const($db, 'ADHERENT_LOGIN_NOT_REQUIRED', GETPOST('ADHERENT_LOGIN_NOT_REQUIRED', 'alpha') ? 0 : 1, 'chaine', 0, '', $conf->entity);
@@ -58,17 +57,14 @@ if ($action == 'updateall')
     $res3 = dolibarr_set_const($db, 'ADHERENT_DEFAULT_SENDINFOBYMAIL', GETPOST('ADHERENT_DEFAULT_SENDINFOBYMAIL', 'alpha'), 'chaine', 0, '', $conf->entity);
     $res4 = dolibarr_set_const($db, 'ADHERENT_BANK_USE', GETPOST('ADHERENT_BANK_USE', 'alpha'), 'chaine', 0, '', $conf->entity);
     // Use vat for invoice creation
-    if ($conf->facture->enabled)
-    {
+    if ($conf->facture->enabled) {
         $res4 = dolibarr_set_const($db, 'ADHERENT_VAT_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_VAT_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
         $res5 = dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
-        if (!empty($conf->product->enabled) || !empty($conf->service->enabled))
-        {
+        if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
             $res6 = dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
         }
     }
-    if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0)
-    {
+    if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0) {
         setEventMessages('ErrorFailedToSaveDate', null, 'errors');
         $db->rollback();
     } else {
@@ -78,14 +74,12 @@ if ($action == 'updateall')
 }
 
 // Action to update or add a constant
-if ($action == 'update' || $action == 'add')
-{
+if ($action == 'update' || $action == 'add') {
 	$constname = GETPOST('constname', 'alpha');
 	$constvalue = (GETPOST('constvalue_'.$constname) ? GETPOST('constvalue_'.$constname) : GETPOST('constvalue'));
 
 	if (($constname == 'ADHERENT_CARD_TYPE' || $constname == 'ADHERENT_ETIQUETTE_TYPE' || $constname == 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS') && $constvalue == -1) $constvalue = '';
-	if ($constname == 'ADHERENT_LOGIN_NOT_REQUIRED') // Invert choice
-	{
+	if ($constname == 'ADHERENT_LOGIN_NOT_REQUIRED') { // Invert choice
 		if ($constvalue) $constvalue = 0;
 		else $constvalue = 1;
 	}
@@ -96,8 +90,7 @@ if ($action == 'update' || $action == 'add')
 
 	if (!$res > 0) $error++;
 
-	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
@@ -105,21 +98,17 @@ if ($action == 'update' || $action == 'add')
 }
 
 // Action to enable of a submodule of the adherent module
-if ($action == 'set')
-{
+if ($action == 'set') {
     $result = dolibarr_set_const($db, GETPOST('name', 'alpha'), GETPOST('value'), '', 0, '', $conf->entity);
-    if ($result < 0)
-    {
+    if ($result < 0) {
         print $db->error();
     }
 }
 
 // Action to disable a submodule of the adherent module
-if ($action == 'unset')
-{
+if ($action == 'unset') {
     $result = dolibarr_del_const($db, GETPOST('name', 'alpha'), $conf->entity);
-    if ($result < 0)
-    {
+    if ($result < 0) {
         print $db->error();
     }
 }
@@ -179,19 +168,16 @@ if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty(
 if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) $arraychoices['bankviainvoice'] = $langs->trans("MoreActionBankViaInvoice");
 print '<td>';
 print $form->selectarray('ADHERENT_BANK_USE', $arraychoices, $conf->global->ADHERENT_BANK_USE, 0);
-if ($conf->global->ADHERENT_BANK_USE == 'bankdirect' || $conf->global->ADHERENT_BANK_USE == 'bankviainvoice')
-{
+if ($conf->global->ADHERENT_BANK_USE == 'bankdirect' || $conf->global->ADHERENT_BANK_USE == 'bankviainvoice') {
     print '<br><div style="padding-top: 5px;"><span class="opacitymedium">'.$langs->trans("ABankAccountMustBeDefinedOnPaymentModeSetup").'</span></div>';
 }
 print '</td>';
 print "</tr>\n";
 
 // Use vat for invoice creation
-if ($conf->facture->enabled)
-{
+if ($conf->facture->enabled) {
 	print '<tr class="oddeven"><td>'.$langs->trans("VATToUseForSubscriptions").'</td>';
-	if (!empty($conf->banque->enabled))
-	{
+	if (!empty($conf->banque->enabled)) {
 		print '<td>';
 		print $form->selectarray('ADHERENT_VAT_FOR_SUBSCRIPTIONS', array('0'=>$langs->trans("NoVatOnSubscription"), 'defaultforfoundationcountry'=>$langs->trans("Default")), (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) ? '0' : $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS), 0);
 		print '</td>';
@@ -202,8 +188,7 @@ if ($conf->facture->enabled)
 	}
 	print "</tr>\n";
 
-	if (!empty($conf->product->enabled) || !empty($conf->service->enabled))
-	{
+	if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
 		print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
 		print '<td>';
 		$form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', '', 0);
diff --git a/htdocs/adherents/admin/adherent_emails.php b/htdocs/adherents/admin/adherent_emails.php
index f59a27c170b..22519c55ab0 100644
--- a/htdocs/adherents/admin/adherent_emails.php
+++ b/htdocs/adherents/admin/adherent_emails.php
@@ -65,13 +65,11 @@ $constantes = array(
  */
 
 //
-if ($action == 'updateall')
-{
+if ($action == 'updateall') {
     $db->begin();
     $res1 = $res2 = $res3 = $res4 = $res5 = $res6 = 0;
     $res1 = dolibarr_set_const($db, 'XXXX', GETPOST('ADHERENT_LOGIN_NOT_REQUIRED', 'alpha'), 'chaine', 0, '', $conf->entity);
-    if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0)
-    {
+    if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0) {
         setEventMessages('ErrorFailedToSaveDate', null, 'errors');
         $db->rollback();
     } else {
@@ -81,8 +79,7 @@ if ($action == 'updateall')
 }
 
 // Action to update or add a constant
-if ($action == 'update' || $action == 'add')
-{
+if ($action == 'update' || $action == 'add') {
 	$constlineid = GETPOST('rowid', 'int');
 	$constname = GETPOST('constname', 'alpha');
 
@@ -96,8 +93,7 @@ if ($action == 'update' || $action == 'add')
 
 	if (!$res > 0) $error++;
 
-	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
 	else {
@@ -106,21 +102,17 @@ if ($action == 'update' || $action == 'add')
 }
 
 // Action to enable a submodule of the adherent module
-if ($action == 'set')
-{
+if ($action == 'set') {
     $result = dolibarr_set_const($db, GETPOST('name', 'alpha'), GETPOST('value'), '', 0, '', $conf->entity);
-    if ($result < 0)
-    {
+    if ($result < 0) {
         print $db->error();
     }
 }
 
 // Action to disable a submodule of the adherent module
-if ($action == 'unset')
-{
+if ($action == 'unset') {
     $result = dolibarr_del_const($db, GETPOST('name', 'alpha'), $conf->entity);
-    if ($result < 0)
-    {
+    if ($result < 0) {
         print $db->error();
     }
 }
diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php
index 73e1a519c59..d3d91ecba09 100644
--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@@ -78,8 +78,7 @@ dol_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute").'</a></div>';
 	print "</div>";
@@ -92,8 +91,7 @@ if ($action != 'create' && $action != 'edit')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print '<div name="topofform"></div><br>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -105,8 +103,7 @@ if ($action == 'create')
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print '<div name="topofform"></div><br>';
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/adherents/admin/adherent_type_extrafields.php b/htdocs/adherents/admin/adherent_type_extrafields.php
index 7864505f2e1..fe7989a70b9 100644
--- a/htdocs/adherents/admin/adherent_type_extrafields.php
+++ b/htdocs/adherents/admin/adherent_type_extrafields.php
@@ -81,8 +81,7 @@ dol_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute").'</a></div>';
 	print "</div>";
@@ -95,8 +94,7 @@ if ($action != 'create' && $action != 'edit')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print "<br>";
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -108,8 +106,7 @@ if ($action == 'create')
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index 50a7f58e8c5..0dbb998f764 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -42,14 +42,12 @@ if (!$user->admin) accessforbidden();
  * Actions
  */
 
-if ($action == 'setMEMBER_ENABLE_PUBLIC')
-{
+if ($action == 'setMEMBER_ENABLE_PUBLIC') {
 	if (GETPOST('value')) dolibarr_set_const($db, 'MEMBER_ENABLE_PUBLIC', 1, 'chaine', 0, '', $conf->entity);
 	else dolibarr_set_const($db, 'MEMBER_ENABLE_PUBLIC', 0, 'chaine', 0, '', $conf->entity);
 }
 
-if ($action == 'update')
-{
+if ($action == 'update') {
 	$public = GETPOST('MEMBER_ENABLE_PUBLIC');
 	$amount = GETPOST('MEMBER_NEWFORM_AMOUNT');
 	$editamount = GETPOST('MEMBER_NEWFORM_EDITAMOUNT');
@@ -67,8 +65,7 @@ if ($action == 'update')
 
     if (!$res > 0) $error++;
 
- 	if (!$error)
-    {
+ 	if (!$error) {
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     } else {
 	    setEventMessages($langs->trans("Error"), null, 'errors');
@@ -99,8 +96,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 
 dol_fiche_head($head, 'website', $langs->trans("Members"), -1, 'user');
 
-if ($conf->use_javascript_ajax)
-{
+if ($conf->use_javascript_ajax) {
     print "\n".'<script type="text/javascript" language="javascript">';
     print 'jQuery(document).ready(function () {
                 function initemail()
@@ -139,8 +135,7 @@ print '<span class="opacitymedium">'.$langs->trans("BlankSubscriptionFormDesc").
 
 
 $enabledisablehtml = $langs->trans("EnablePublicSubscriptionForm").' ';
-if (empty($conf->global->MEMBER_ENABLE_PUBLIC))
-{
+if (empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	// Button off, click to enable
 	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMEMBER_ENABLE_PUBLIC&value=1'.$param.'">';
 	$enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
@@ -157,8 +152,7 @@ print '<input type="hidden" id="MEMBER_ENABLE_PUBLIC" name="MEMBER_ENABLE_PUBLIC
 
 print '<br>';
 
-if (!empty($conf->global->MEMBER_ENABLE_PUBLIC))
-{
+if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	print '<br>';
 
 	print '<table class="noborder centpercent">';
@@ -219,8 +213,7 @@ dol_fiche_end();
 print '</form>';
 
 
-if (!empty($conf->global->MEMBER_ENABLE_PUBLIC))
-{
+if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	print '<br>';
 	//print $langs->trans('FollowingLinksArePublic').'<br>';
 	print img_picto('', 'globe').' '.$langs->trans('BlankSubscriptionForm').':<br>';
diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index f1d83a4b314..a7e7a6f3634 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -49,8 +49,7 @@ $pagenext = $page + 1;
 if (!$sortfield) $sortfield = 'a.datep,a.id';
 if (!$sortorder) $sortorder = 'DESC';
 
-if (GETPOST('actioncode', 'array'))
-{
+if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
 } else {
@@ -63,8 +62,7 @@ $result = restrictedArea($user, 'adherent', $id);
 
 $object = new Adherent($db);
 $result = $object->fetch($id);
-if ($result > 0)
-{
+if ($result > 0) {
 	$object->fetch_thirdparty();
 
     $adht = new AdherentType($db);
@@ -80,19 +78,16 @@ $parameters = array('id'=>$id, 'objcanvas'=>$objcanvas);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
     // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
+    if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
         header("Location: ".$backtopage);
         exit;
     }
 
     // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-    {
-        $actioncode = '';
+    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
+		$actioncode = '';
         $search_agenda_label = '';
     }
 }
@@ -110,8 +105,7 @@ $form = new Form($db);
 /*
  * Customer and/or supplier category sheet
  */
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
@@ -147,13 +141,11 @@ if ($object->id > 0)
 
 
 	$newcardbutton = '';
-    if (!empty($conf->agenda->enabled))
-    {
+    if (!empty($conf->agenda->enabled)) {
         $newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&backtopage=1&origin=member&originid='.$id);
     }
 
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-    {
+    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
     	print '<br>';
 
     	$param = '&id='.$id;
diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index 44046d5a26e..79e4cab1719 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -91,18 +91,15 @@ abstract class ActionsAdherentCardCommon
 
         if ($action == 'add' || $action == 'update') $this->assign_post();
 
-        foreach ($this->object as $key => $value)
-        {
+        foreach ($this->object as $key => $value) {
             $this->tpl[$key] = $value;
         }
 
         $this->tpl['error'] = $this->error;
         $this->tpl['errors'] = $this->errors;
 
-        if ($action == 'create' || $action == 'edit')
-        {
-        	if ($conf->use_javascript_ajax)
-			{
+        if ($action == 'create' || $action == 'edit') {
+        	if ($conf->use_javascript_ajax) {
 				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function () {
 						jQuery("#selectcountry_id").change(function() {
@@ -114,8 +111,7 @@ abstract class ActionsAdherentCardCommon
 				</script>'."\n";
 			}
 
-        	if (is_object($objsoc) && $objsoc->id > 0)
-        	{
+        	if (is_object($objsoc) && $objsoc->id > 0) {
         		$this->tpl['company'] = $objsoc->getNomUrl(1);
         		$this->tpl['company_id'] = $objsoc->id;
         	} else {
@@ -126,8 +122,7 @@ abstract class ActionsAdherentCardCommon
         	$this->tpl['select_civility'] = $formcompany->select_civility($this->object->civility_id);
 
         	// Predefined with third party
-        	if ((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE'))
-        	{
+        	if ((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE')) {
         		if (dol_strlen(trim($this->object->address)) == 0) $this->tpl['address'] = $objsoc->address;
         		if (dol_strlen(trim($this->object->zip)) == 0) $this->object->zip = $objsoc->zip;
         		if (dol_strlen(trim($this->object->town)) == 0) $this->object->town = $objsoc->town;
@@ -159,18 +154,15 @@ abstract class ActionsAdherentCardCommon
             $this->tpl['select_morphy'] = $form->selectarray('morphy', $selectarray, $this->object->morphy, 0);
         }
 
-        if ($action == 'view' || $action == 'edit' || $action == 'delete')
-        {
+        if ($action == 'view' || $action == 'edit' || $action == 'delete') {
         	// Emailing
-        	if (!empty($conf->mailing->enabled))
-			{
+        	if (!empty($conf->mailing->enabled)) {
 				$langs->load("mails");
 				$this->tpl['nb_emailing'] = $this->object->getNbOfEMailings();
 			}
 
         	// Dolibarr user
-        	if ($this->object->user_id)
-			{
+        	if ($this->object->user_id) {
 				$dolibarr_user = new User($this->db);
 				$result = $dolibarr_user->fetch($this->object->user_id);
 				$this->tpl['dolibarr_user'] = $dolibarr_user->getLoginUrl(1);
@@ -178,12 +170,10 @@ abstract class ActionsAdherentCardCommon
 			else $this->tpl['dolibarr_user'] = $langs->trans("NoDolibarrAccess");
         }
 
-        if ($action == 'view' || $action == 'delete')
-        {
+        if ($action == 'view' || $action == 'delete') {
         	$this->tpl['showrefnav'] = $form->showrefnav($this->object, 'id');
 
-        	if ($this->object->socid > 0)
-        	{
+        	if ($this->object->socid > 0) {
         		$objsoc = new Societe($this->db);
 
         		$objsoc->fetch($this->object->socid);
@@ -210,8 +200,7 @@ abstract class ActionsAdherentCardCommon
             $this->tpl['note'] = nl2br($this->object->note);
         }
 
-        if ($action == 'create_user')
-        {
+        if ($action == 'create_user') {
         	// Full firstname and lastname separated with a dot : firstname.lastname
         	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
             require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
@@ -259,12 +248,10 @@ abstract class ActionsAdherentCardCommon
         $this->object->canvas = $_POST["canvas"];
 
         // We set country_id, and country_code label of the chosen country
-        if ($this->object->country_id)
-        {
+        if ($this->object->country_id) {
             $sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_country WHERE rowid = ".$this->object->country_id;
             $resql = $this->db->query($sql);
-            if ($resql)
-            {
+            if ($resql) {
                 $obj = $this->db->fetch_object($resql);
 
                 $this->object->country_code = $obj->code;
diff --git a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
index f248256a547..db2473c55d9 100644
--- a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
+++ b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
@@ -90,8 +90,7 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
         $this->tpl['error'] = $this->error;
         $this->tpl['errors'] = $this->errors;
 
-		if ($action == 'view')
-		{
+		if ($action == 'view') {
             // Card header
             $head = member_prepare_head($this->object);
             $title = $this->getTitle($action);
@@ -107,14 +106,12 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
             $this->tpl['actionsdone'] = show_actions_done($conf, $langs, $db, $objsoc, $this->object, 1);
         } else {
 			// Confirm delete contact
-        	if ($action == 'delete' && $user->rights->adherent->supprimer)
-        	{
+        	if ($action == 'delete' && $user->rights->adherent->supprimer) {
         		$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("DeleteAdherent"), $langs->trans("ConfirmDeleteAdherent"), "confirm_delete", '', 0, 1);
         	}
 		}
 
-		if ($action == 'list')
-		{
+		if ($action == 'list') {
 	        $this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
 		}
 	}
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
index 92f1e11d7a2..b6c0b542d27 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
@@ -17,8 +17,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
index 36e2deab14c..92a4fbddd38 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
@@ -17,8 +17,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
index b738f549247..8789b2fcb34 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
@@ -17,8 +17,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 7a5880fc317..cf5253e3bf8 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -55,8 +55,7 @@ $typeid = GETPOST('typeid', 'int');
 $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
 
-if (!empty($conf->mailmanspip->enabled))
-{
+if (!empty($conf->mailmanspip->enabled)) {
 	include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
 
 	$langs->load('mailmanspip');
@@ -76,8 +75,7 @@ $socialnetworks = getArrayOfSocialNetworks();
 $object->getCanvas($id);
 $canvas = $object->canvas ? $object->canvas : GETPOST("canvas");
 $objcanvas = null;
-if (!empty($canvas))
-{
+if (!empty($canvas)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
 	$objcanvas = new Canvas($db, $action);
 	$objcanvas->getCanvas('adherent', 'membercard', $canvas);
@@ -86,16 +84,14 @@ if (!empty($canvas))
 // Security check
 $result = restrictedArea($user, 'adherent', $id, '', '', 'socid', 'rowid', $objcanvas);
 
-if ($id > 0)
-{
+if ($id > 0) {
 	// Load member
 	$result = $object->fetch($id);
 
 	// Define variables to know what current user can do on users
 	$canadduser = ($user->admin || $user->rights->user->user->creer);
 	// Define variables to know what current user can do on properties of user linked to edited member
-	if ($object->user_id)
-	{
+	if ($object->user_id) {
 		// $User is the user who edits, $object->user_id is the id of the related user in the edited member
 		$caneditfielduser = ((($user->id == $object->user_id) && $user->rights->user->self->creer)
 				|| (($user->id != $object->user_id) && $user->rights->user->user->creer));
@@ -107,8 +103,7 @@ if ($id > 0)
 // Define variables to determine what the current user can do on the members
 $canaddmember = $user->rights->adherent->creer;
 // Define variables to determine what the current user can do on the properties of a member
-if ($id)
-{
+if ($id) {
 	$caneditfieldmember = $user->rights->adherent->creer;
 }
 
@@ -125,34 +120,26 @@ $parameters = array('id'=>$id, 'rowid'=>$id, 'objcanvas'=>$objcanvas, 'confirm'=
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook))
-{
-	if ($cancel)
-	{
-		if (!empty($backtopage))
-		{
+if (empty($reshook)) {
+	if ($cancel) {
+		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
 		$action = '';
 	}
 
-	if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer))
-	{
+	if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer)) {
 		$error = 0;
-		if (empty($user->rights->user->user->creer))	// If can edit only itself user, we can link to itself only
-		{
-			if ($userid != $user->id && $userid != $object->user_id)
-			{
+		if (empty($user->rights->user->user->creer)) {	// If can edit only itself user, we can link to itself only
+			if ($userid != $user->id && $userid != $object->user_id) {
 				$error++;
 				setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors');
 			}
 		}
 
-		if (!$error)
-		{
-			if ($userid != $object->user_id)	// If link differs from currently in database
-			{
+		if (!$error) {
+			if ($userid != $object->user_id) {	// If link differs from currently in database
 				$result = $object->setUserId($userid);
 				if ($result < 0) dol_print_error($object->db, $object->error);
 				$action = '';
@@ -160,22 +147,17 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'setsocid')
-	{
+	if ($action == 'setsocid') {
 		$error = 0;
-		if (!$error)
-		{
-			if ($socid != $object->socid)	// If link differs from currently in database
-			{
+		if (!$error) {
+			if ($socid != $object->socid) {	// If link differs from currently in database
 				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
 				$sql .= " WHERE socid = '".$socid."'";
 				$sql .= " AND entity = ".$conf->entity;
 				$resql = $db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$obj = $db->fetch_object($resql);
-					if ($obj && $obj->rowid > 0)
-					{
+					if ($obj && $obj->rowid > 0) {
 						$othermember = new Adherent($db);
 						$othermember->fetch($obj->rowid);
 						$thirdparty = new Societe($db);
@@ -185,8 +167,7 @@ if (empty($reshook))
 					}
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					$result = $object->setThirdPartyId($socid);
 					if ($result < 0) dol_print_error($object->db, $object->error);
 					$action = '';
@@ -196,16 +177,13 @@ if (empty($reshook))
 	}
 
 	// Create user from a member
-	if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer)
-	{
-		if ($result > 0)
-		{
+	if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer) {
+		if ($result > 0) {
 			// Creation user
 			$nuser = new User($db);
 			$result = $nuser->create_from_member($object, GETPOST('login', 'alphanohtml'));
 
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				setEventMessages($langs->trans($nuser->error), null, 'errors');
 			}
@@ -215,16 +193,13 @@ if (empty($reshook))
 	}
 
 	// Create third party from a member
-	if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer)
-	{
-		if ($result > 0)
-		{
+	if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer) {
+		if ($result > 0) {
 			// User creation
 			$company = new Societe($db);
 			$result = $company->create_from_member($object, GETPOST('companyname', 'alpha'), GETPOST('companyalias', 'alpha'));
 
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				setEventMessages($langs->trans($company->error), null, 'errors');
 				setEventMessages($company->error, $company->errors, 'errors');
@@ -234,15 +209,13 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'update' && !$cancel && $user->rights->adherent->creer)
-	{
+	if ($action == 'update' && !$cancel && $user->rights->adherent->creer) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$birthdate = '';
 		if (isset($_POST["birthday"]) && $_POST["birthday"]
 				&& isset($_POST["birthmonth"]) && $_POST["birthmonth"]
-				&& isset($_POST["birthyear"]) && $_POST["birthyear"])
-		{
+				&& isset($_POST["birthyear"]) && $_POST["birthyear"]) {
 			$birthdate = dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
 		}
 		$lastname = $_POST["lastname"];
@@ -267,16 +240,14 @@ if (empty($reshook))
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Company")), null, 'errors');
 		}
 		// Check if the login already exists
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			if (empty($login)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login")), null, 'errors');
 			}
 		}
 		// Create new object
-		if ($result > 0 && !$error)
-		{
+		if ($result > 0 && !$error) {
 			$object->oldcopy = clone $object;
 
 			// Change values
@@ -329,32 +300,27 @@ if (empty($reshook))
 
 			// Check if we need to also synchronize user information
 			$nosyncuser = 0;
-			if ($object->user_id)	// If linked to a user
-			{
+			if ($object->user_id) {	// If linked to a user
 				if ($user->id != $object->user_id && empty($user->rights->user->user->creer)) $nosyncuser = 1; // Disable synchronizing
 			}
 
 			// Check if we need to also synchronize password information
 			$nosyncuserpass = 0;
-			if ($object->user_id)	// If linked to a user
-			{
+			if ($object->user_id) {	// If linked to a user
 				if ($user->id != $object->user_id && empty($user->rights->user->user->password)) $nosyncuserpass = 1; // Disable synchronizing
 			}
 
 			$result = $object->update($user, 0, $nosyncuser, $nosyncuserpass);
 
-			if ($result >= 0 && !count($object->errors))
-			{
+			if ($result >= 0 && !count($object->errors)) {
 				$categories = GETPOST('memcats', 'array');
 				$object->setCategories($categories);
 
 				// Logo/Photo save
 				$dir = $conf->adherent->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'member').'/photos';
 				$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
-				if ($file_OK)
-				{
-					if (GETPOST('deletephoto'))
-					{
+				if ($file_OK) {
+					if (GETPOST('deletephoto')) {
 						require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 						$fileimg = $conf->adherent->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'member').'/photos/'.$object->photo;
 						$dirthumbs = $conf->adherent->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'member').'/photos/thumbs';
@@ -362,15 +328,12 @@ if (empty($reshook))
 						dol_delete_dir_recursive($dirthumbs);
 					}
 
-					if (image_format_supported($_FILES['photo']['name']) > 0)
-					{
+					if (image_format_supported($_FILES['photo']['name']) > 0) {
 						dol_mkdir($dir);
 
-						if (@is_dir($dir))
-						{
+						if (@is_dir($dir)) {
 							$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-							if (!dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1, 0, $_FILES['photo']['error']) > 0)
-							{
+							if (!dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1, 0, $_FILES['photo']['error']) > 0) {
 								setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 							} else {
 							    // Create thumbs
@@ -381,8 +344,7 @@ if (empty($reshook))
 						setEventMessages("ErrorBadImageFormat", null, 'errors');
 					}
 				} else {
-					switch ($_FILES['photo']['error'])
-					{
+					switch ($_FILES['photo']['error']) {
 						case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
 						case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
 							$errors[] = "ErrorFileSizeTooLarge";
@@ -397,8 +359,7 @@ if (empty($reshook))
 	            $id = $object->id;
 				$action = '';
 
-				if (!empty($backtopage))
-				{
+				if (!empty($backtopage)) {
 					header("Location: ".$backtopage);
 					exit;
 				}
@@ -411,19 +372,16 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'add' && $user->rights->adherent->creer)
-	{
+	if ($action == 'add' && $user->rights->adherent->creer) {
 		if ($canvas) $object->canvas = $canvas;
 		$birthdate = '';
 		if (isset($_POST["birthday"]) && $_POST["birthday"]
 				&& isset($_POST["birthmonth"]) && $_POST["birthmonth"]
-				&& isset($_POST["birthyear"]) && $_POST["birthyear"])
-		{
+				&& isset($_POST["birthyear"]) && $_POST["birthyear"]) {
 			$birthdate = dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
 		}
 		$datesubscription = '';
-		if (isset($_POST["reday"]) && isset($_POST["remonth"]) && isset($_POST["reyear"]))
-		{
+		if (isset($_POST["reday"]) && isset($_POST["remonth"]) && isset($_POST["reyear"])) {
 			$datesubscription = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
 		}
 
@@ -508,8 +466,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MemberNature")), null, 'errors');
 		}
 		// Tests if the login already exists
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			if (empty($login)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login")), null, 'errors');
@@ -557,14 +514,12 @@ if (empty($reshook))
 		$public = 0;
 		if (isset($public)) $public = 1;
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->begin();
 
 			// Email about right and login does not exist
 			$result = $object->create($user);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				// Foundation categories
 				$memcats = GETPOST('memcats', 'array');
 				$object->setCategories($memcats);
@@ -590,13 +545,10 @@ if (empty($reshook))
 		}
 	}
 
-	if ($user->rights->adherent->supprimer && $action == 'confirm_delete' && $confirm == 'yes')
-	{
+	if ($user->rights->adherent->supprimer && $action == 'confirm_delete' && $confirm == 'yes') {
 		$result = $object->delete($id, $user);
-		if ($result > 0)
-		{
-			if (!empty($backtopage))
-			{
+		if ($result > 0) {
+			if (!empty($backtopage)) {
 				header("Location: ".$backtopage);
 				exit;
 			} else {
@@ -608,8 +560,7 @@ if (empty($reshook))
 		}
 	}
 
-	if ($user->rights->adherent->creer && $action == 'confirm_valid' && $confirm == 'yes')
-	{
+	if ($user->rights->adherent->creer && $action == 'confirm_valid' && $confirm == 'yes') {
 		$error = 0;
 
 		$db->begin();
@@ -619,11 +570,9 @@ if (empty($reshook))
 
 		$result = $object->validate($user);
 
-		if ($result >= 0 && !count($object->errors))
-		{
+		if ($result >= 0 && !count($object->errors)) {
 			// Send confirmation email (according to parameters of member type. Otherwise generic)
-			if ($object->email && GETPOST("send_mail"))
-			{
+			if ($object->email && GETPOST("send_mail")) {
 				$subject = '';
 				$msg = '';
 
@@ -641,8 +590,7 @@ if (empty($reshook))
 
 				if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-				if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-				{
+				if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 					$subject = $arraydefaultmessage->topic;
 					$msg     = $arraydefaultmessage->content;
 				}
@@ -661,8 +609,7 @@ if (empty($reshook))
 					$moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/card.php'."\r\n";
 
 					$result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 						setEventMessages($object->error, $object->errors, 'errors');
 					}
@@ -677,8 +624,7 @@ if (empty($reshook))
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->commit();
 		} else {
 			$db->rollback();
@@ -686,21 +632,17 @@ if (empty($reshook))
 		$action = '';
 	}
 
-	if ($user->rights->adherent->supprimer && $action == 'confirm_resign')
-	{
+	if ($user->rights->adherent->supprimer && $action == 'confirm_resign') {
 		$error = 0;
 
-		if ($confirm == 'yes')
-		{
+		if ($confirm == 'yes') {
 			$adht = new AdherentType($db);
 			$adht->fetch($object->typeid);
 
 			$result = $object->resiliate($user);
 
-			if ($result >= 0 && !count($object->errors))
-			{
-				if ($object->email && GETPOST("send_mail"))
-				{
+			if ($result >= 0 && !count($object->errors)) {
+				if ($object->email && GETPOST("send_mail")) {
 					$subject = '';
 					$msg = '';
 
@@ -718,8 +660,7 @@ if (empty($reshook))
 
 					if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-					if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-					{
+					if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 						$subject = $arraydefaultmessage->topic;
 						$msg     = $arraydefaultmessage->content;
 					}
@@ -738,8 +679,7 @@ if (empty($reshook))
 						$moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/card.php'."\r\n";
 
 						$result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$error++;
 							setEventMessages($object->error, $object->errors, 'errors');
 						}
@@ -756,31 +696,24 @@ if (empty($reshook))
 				$action = '';
 			}
 		}
-		if (!empty($backtopage) && !$error)
-		{
+		if (!empty($backtopage) && !$error) {
 			header("Location: ".$backtopage);
 			exit;
 		}
 	}
 
 	// SPIP Management
-	if ($user->rights->adherent->supprimer && $action == 'confirm_del_spip' && $confirm == 'yes')
-	{
-		if (!count($object->errors))
-		{
-			if (!$mailmanspip->del_to_spip($object))
-			{
+	if ($user->rights->adherent->supprimer && $action == 'confirm_del_spip' && $confirm == 'yes') {
+		if (!count($object->errors)) {
+			if (!$mailmanspip->del_to_spip($object)) {
 				setEventMessages($langs->trans('DeleteIntoSpipError').': '.$mailmanspip->error, null, 'errors');
 			}
 		}
 	}
 
-	if ($user->rights->adherent->creer && $action == 'confirm_add_spip' && $confirm == 'yes')
-	{
-		if (!count($object->errors))
-		{
-			if (!$mailmanspip->add_to_spip($object))
-			{
+	if ($user->rights->adherent->creer && $action == 'confirm_add_spip' && $confirm == 'yes') {
+		if (!count($object->errors)) {
+			if (!$mailmanspip->add_to_spip($object)) {
 				setEventMessages($langs->trans('AddIntoSpipError').': '.$mailmanspip->error, null, 'errors');
 			}
 		}
@@ -817,13 +750,11 @@ llxHeader('', $title, $help_url);
 
 $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
-{
+if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	// -----------------------------------------
 	// When used with CANVAS
 	// -----------------------------------------
-	if (empty($object->error) && $id)
-	{
+	if (empty($object->error) && $id) {
 		$object = new Adherent($db);
 		$result = $object->fetch($id);
 		if ($result <= 0) dol_print_error('', $object->error);
@@ -835,8 +766,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 	// When used in standard mode
 	// -----------------------------------------
 
-	if ($action == 'create')
-	{
+	if ($action == 'create') {
 		/* ************************************************************************** */
 		/*                                                                            */
 		/* Creation mode                                                              */
@@ -847,8 +777,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		// We set country_id, country_code and country for the selected country
 		$object->country_id = GETPOST('country_id', 'int') ?GETPOST('country_id', 'int') : $mysoc->country_id;
-		if ($object->country_id)
-		{
+		if ($object->country_id) {
 			$tmparray = getCountry($object->country_id, 'all');
 			$object->country_code = $tmparray['code'];
 			$object->country = $tmparray['label'];
@@ -858,8 +787,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
             $object = new Societe($db);
             if ($socid > 0) $object->fetch($socid);
 
-            if (!($object->id > 0))
-            {
+            if (!($object->id > 0)) {
                 $langs->load("errors");
                 print($langs->trans('ErrorRecordNotFound'));
                 exit;
@@ -870,8 +798,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		print load_fiche_titre($langs->trans("NewMember"), '', 'members');
 
-		if ($conf->use_javascript_ajax)
-		{
+		if ($conf->use_javascript_ajax) {
 			print "\n".'<script type="text/javascript" language="javascript">';
 			print 'jQuery(document).ready(function () {
 						jQuery("#selectcountry_id").change(function() {
@@ -913,14 +840,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<tbody>';
 
 		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td><input type="text" name="member_login" class="minwidth300" maxlength="50" value="'.(isset($_POST["member_login"]) ?GETPOST("member_login", 'alpha', 2) : $object->login).'" autofocus="autofocus"></td></tr>';
 		}
 
 		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 			$generated_password = getRandomPassword(false);
 			print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td>';
@@ -931,8 +856,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		// Type
 		print '<tr><td class="fieldrequired">'.$langs->trans("MemberType").'</td><td>';
 		$listetype = $adht->liste_array();
-		if (count($listetype))
-		{
+		if (count($listetype)) {
 			print $form->selectarray("typeid", $listetype, GETPOST('typeid', 'int') ?GETPOST('typeid', 'int') : $typeid, count($listetype) > 1 ? 1 : 0);
 		} else {
 			print '<font class="error">'.$langs->trans("NoTypeDefinedGoToSetup").'</font>';
@@ -992,11 +916,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '</td></tr>';
 
 		// State
-		if (empty($conf->global->MEMBER_DISABLE_STATE))
-		{
+		if (empty($conf->global->MEMBER_DISABLE_STATE)) {
 			print '<tr><td>'.$langs->trans('State').'</td><td>';
-			if ($object->country_id)
-			{
+			if ($object->country_id) {
 				print $formcompany->select_state(GETPOST('state_id', 'int') ?GETPOST('state_id', 'int') : $object->state_id, $object->country_code);
 			} else {
 				print $countrynotdefined;
@@ -1031,8 +953,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print "</td></tr>\n";
 
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-		{
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			print '<tr><td>'.$form->editfieldkey("Categories", 'memcats', '', $object, 0).'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, 'parent', null, null, 1);
 			print $form->multiselectarray('memcats', $cate_arbo, GETPOST('memcats', 'array'), null, null, null, null, '100%');
@@ -1050,8 +971,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<div class="center">';
 		print '<input type="submit" name="button" class="button" value="'.$langs->trans("AddMember").'">';
 		print '&nbsp;&nbsp;';
-		if (!empty($backtopage))
-		{
+		if (!empty($backtopage)) {
 			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
 		} else {
 			print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
@@ -1061,8 +981,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print "</form>\n";
 	}
 
-	if ($action == 'edit')
-	{
+	if ($action == 'edit') {
 		/********************************************
 		*
 		* Edition mode
@@ -1083,12 +1002,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		// We set country_id, and country_code, country of the chosen country
 		$country = GETPOST('country', 'int');
-		if (!empty($country) || $object->country_id)
-		{
+		if (!empty($country) || $object->country_id) {
 			$sql = "SELECT rowid, code, label from ".MAIN_DB_PREFIX."c_country where rowid = ".(!empty($country) ? $country : $object->country_id);
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $db->fetch_object($resql);
 			} else {
 				dol_print_error($db);
@@ -1101,8 +1018,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$head = member_prepare_head($object);
 
 
-		if ($conf->use_javascript_ajax)
-		{
+		if ($conf->use_javascript_ajax) {
 			print "\n".'<script type="text/javascript" language="javascript">';
 			print 'jQuery(document).ready(function () {
 				jQuery("#selectcountry_id").change(function() {
@@ -1147,14 +1063,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td class="valeur">'.$object->id.'</td></tr>';
 
 		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td><input type="text" name="login" class="minwidth300" maxlength="50" value="'.(isset($_POST["login"]) ?GETPOST("login", 'alpha', 2) : $object->login).'"></td></tr>';
 		}
 
 		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td><td><input type="password" name="pass" class="minwidth300" maxlength="50" value="'.(isset($_POST["pass"]) ?GETPOST("pass", '', 2) : $object->pass).'"></td></tr>';
 		}
 		// Morphy
@@ -1166,8 +1080,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		// Type
 		print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-		if ($user->rights->adherent->creer)
-		{
+		if ($user->rights->adherent->creer) {
 			print $form->selectarray("typeid", $adht->liste_array(), (GETPOSTISSET("typeid") ?GETPOST("typeid", 'int') : $object->typeid));
 		} else {
 			print $adht->getNomUrl(1);
@@ -1203,8 +1116,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<tr><td>'.$langs->trans("Photo").'</td>';
 		print '<td class="hideonsmartphone" valign="middle">';
 		print $form->showphoto('memberphoto', $object)."\n";
-		if ($caneditfieldmember)
-		{
+		if ($caneditfieldmember) {
 			if ($object->photo) print "<br>\n";
 			print '<table class="nobordernopadding">';
 			if ($object->photo) print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
@@ -1237,8 +1149,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '</td></tr>';
 
 		// State
-		if (empty($conf->global->MEMBER_DISABLE_STATE))
-		{
+		if (empty($conf->global->MEMBER_DISABLE_STATE)) {
 			print '<tr><td>'.$langs->trans('State').'</td><td>';
 			print $formcompany->select_state($object->state_id, isset($_POST["country_id"]) ?GETPOST("country_id") : $object->country_id);
 			print '</td></tr>';
@@ -1271,8 +1182,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print "</td></tr>\n";
 
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-		{
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			print '<tr><td>'.$form->editfieldkey("Categories", 'memcats', '', $object, 0).'</td>';
 			print '<td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, null, null, null, 1);
@@ -1289,11 +1199,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 
 		// Third party Dolibarr
-		if (!empty($conf->societe->enabled))
-		{
+		if (!empty($conf->societe->enabled)) {
 			print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td colspan="2" class="valeur">';
-			if ($object->socid)
-			{
+			if ($object->socid) {
 				$company = new Societe($db);
 				$result = $company->fetch($object->socid);
 				print $company->getNomUrl(1);
@@ -1305,8 +1213,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		// Login Dolibarr
 		print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td colspan="2" class="valeur">';
-		if ($object->user_id)
-		{
+		if ($object->user_id) {
 			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'none');
 		}
 		else print $langs->trans("NoDolibarrAccess");
@@ -1327,8 +1234,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '</form>';
 	}
 
-	if ($id > 0 && $action != 'edit')
-	{
+	if ($id > 0 && $action != 'edit') {
 		/* ************************************************************************** */
 		/*                                                                            */
 		/* View mode                                                                  */
@@ -1359,11 +1265,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		dol_fiche_head($head, 'general', $langs->trans("Member"), -1, 'user');
 
 		// Confirm create user
-		if ($action == 'create_user')
-		{
+		if ($action == 'create_user') {
 			$login = $object->login;
-			if (empty($login))
-			{
+			if (empty($login)) {
 				// Full firstname and name separated with a dot : firstname.name
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 				$login = dol_buildlogin($object->lastname, $object->firstname);
@@ -1375,8 +1279,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 					array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login)
 			);
 			$text = $langs->trans("ConfirmCreateLogin").'<br>';
-			if (!empty($conf->societe->enabled))
-			{
+			if (!empty($conf->societe->enabled)) {
 				if ($object->socid > 0) $text .= $langs->trans("UserWillBeExternalUser");
 				else $text .= $langs->trans("UserWillBeInternalUser");
 			}
@@ -1384,13 +1287,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 
 		// Confirm create third party
-		if ($action == 'create_thirdparty')
-		{
+		if ($action == 'create_thirdparty') {
 			$companyalias = '';
 			$fullname = $object->getFullName($langs);
 
-			if ($object->morphy == 'mor')
-			{
+			if ($object->morphy == 'mor') {
 				$companyname = $object->company;
 				if (!empty($fullname)) $companyalias = $fullname;
 			} else {
@@ -1408,8 +1309,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 
 		// Confirm validate member
-		if ($action == 'valid')
-		{
+		if ($action == 'valid') {
 			$langs->load("mails");
 
 			$adht = new AdherentType($db);
@@ -1432,8 +1332,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-			{
+			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 				$subject = $arraydefaultmessage->topic;
 				$msg     = $arraydefaultmessage->content;
 			}
@@ -1469,8 +1368,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 
 		// Confirm terminate
-		if ($action == 'resign')
-		{
+		if ($action == 'resign') {
 			$langs->load("mails");
 
 			$adht = new AdherentType($db);
@@ -1493,8 +1391,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-			{
+			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 				$subject = $arraydefaultmessage->topic;
 				$msg     = $arraydefaultmessage->content;
 			}
@@ -1525,21 +1422,18 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 
 		// Confirm remove member
-		if ($action == 'delete')
-		{
+		if ($action == 'delete') {
 			$formquestion = array();
 			if ($backtopage) $formquestion[] = array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));
 			print $form->formconfirm("card.php?rowid=".$id, $langs->trans("DeleteMember"), $langs->trans("ConfirmDeleteMember"), "confirm_delete", $formquestion, 'no', 1);
 		}
 
 		// Confirm add in spip
-		if ($action == 'add_spip')
-		{
+		if ($action == 'add_spip') {
 			print $form->formconfirm("card.php?rowid=".$id, $langs->trans('AddIntoSpip'), $langs->trans('AddIntoSpipConfirmation'), 'confirm_add_spip');
 		}
 		// Confirm removed from spip
-		if ($action == 'del_spip')
-		{
+		if ($action == 'del_spip') {
 			print $form->formconfirm("card.php?rowid=$id", $langs->trans('DeleteIntoSpip'), $langs->trans('DeleteIntoSpipConfirmation'), 'confirm_del_spip');
 		}
 
@@ -1558,8 +1452,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<table class="border tableforfield centpercent">';
 
 		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
 		}
 
@@ -1584,16 +1477,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '</tr>';
 
 		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			print '<tr><td>'.$langs->trans("Password").'</td><td>'.preg_replace('/./i', '*', $object->pass);
 			if ($object->pass) print preg_replace('/./i', '*', $object->pass);
 			else {
 			    if ($user->admin) print $langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
 			    else print $langs->trans("Hidden");
 			}
-			if ((!empty($object->pass) || !empty($object->pass_crypted)) && empty($object->user_id))
-			{
+			if ((!empty($object->pass) || !empty($object->pass_crypted)) && empty($object->user_id)) {
 			    $langs->load("errors");
 			    $htmltext = $langs->trans("WarningPasswordSetWithNoAccount");
 			    print ' '.$form->textwithpicto('', $htmltext, 1, 'warning');
@@ -1603,19 +1494,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		// Date end subscription
 		print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
-		if ($object->datefin)
-		{
+		if ($object->datefin) {
 			print dol_print_date($object->datefin, 'day');
 			if ($object->hasDelay()) {
 				print " ".img_warning($langs->trans("Late"));
 			}
 		} else {
-			if ($object->need_subscription == 0)
-            {
+			if ($object->need_subscription == 0) {
                 print $langs->trans("SubscriptionNotNeeded");
             }
-            elseif (!$adht->subscription)
-			{
+            elseif (!$adht->subscription) {
 				print $langs->trans("SubscriptionNotRecorded");
 				if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
 			} else {
@@ -1626,14 +1514,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '</td></tr>';
 
 		// Third party Dolibarr
-		if (!empty($conf->societe->enabled))
-		{
+		if (!empty($conf->societe->enabled)) {
 			print '<tr><td>';
 			$editenable = $user->rights->adherent->creer;
 			print $form->editfieldkey('LinkedToDolibarrThirdParty', 'thirdparty', '', $object, $editenable);
 			print '</td><td colspan="2" class="valeur">';
-			if ($action == 'editthirdparty')
-			{
+			if ($action == 'editthirdparty') {
 				$htmlname = 'socid';
 				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" name="form'.$htmlname.'">';
 				print '<input type="hidden" name="rowid" value="'.$object->id.'">';
@@ -1662,12 +1548,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$editenable = $user->rights->adherent->creer && $user->rights->user->user->creer;
 		print $form->editfieldkey('LinkedToDolibarrUser', 'login', '', $object, $editenable);
 		print '</td><td colspan="2" class="valeur">';
-		if ($action == 'editlogin')
-		{
+		if ($action == 'editlogin') {
 			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'userid', '');
 		} else {
-			if ($object->user_id)
-			{
+			if ($object->user_id) {
 				$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'none');
 			} else {
 				print $langs->trans("NoDolibarrAccess");
@@ -1691,8 +1575,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>';
 
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-		{
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			print '<tr><td>'.$langs->trans("Categories").'</td>';
 			print '<td colspan="2">';
 			print $form->showCategories($object->id, Categorie::TYPE_MEMBER, 1);
@@ -1718,8 +1601,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 		if (empty($reshook)) {
-			if ($action != 'editlogin' && $action != 'editthirdparty')
-			{
+			if ($action != 'editlogin' && $action != 'editthirdparty') {
 				// Send
 				if (empty($user->socid)) {
 					if ($object->statut == 1) {
@@ -1748,18 +1630,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				}*/
 
 				// Modify
-				if ($user->rights->adherent->creer)
-				{
+				if ($user->rights->adherent->creer) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=edit">'.$langs->trans("Modify")."</a></div>";
 				} else {
 					print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Modify").'</font></div>';
 				}
 
 				// Validate
-				if ($object->statut == -1)
-				{
-					if ($user->rights->adherent->creer)
-					{
+				if ($object->statut == -1) {
+					if ($user->rights->adherent->creer) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Validate")."</a></div>\n";
 					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Validate").'</font></div>';
@@ -1767,10 +1646,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				}
 
 				// Reactivate
-				if ($object->statut == 0)
-				{
-					if ($user->rights->adherent->creer)
-					{
+				if ($object->statut == 0) {
+					if ($user->rights->adherent->creer) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Reenable")."</a></div>\n";
 					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Reenable")."</font></div>";
@@ -1778,10 +1655,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				}
 
 				// Terminate
-				if ($object->statut >= 1)
-				{
-					if ($user->rights->adherent->supprimer)
-					{
+				if ($object->statut >= 1) {
+					if ($user->rights->adherent->supprimer) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=resign">'.$langs->trans("Resiliate")."</a></div>\n";
 					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Resiliate")."</font></div>";
@@ -1789,10 +1664,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				}
 
 				// Create third party
-				if (!empty($conf->societe->enabled) && !$object->socid)
-				{
-					if ($user->rights->societe->creer)
-					{
+				if (!empty($conf->societe->enabled) && !$object->socid) {
+					if ($user->rights->societe->creer) {
 						if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
 						else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
 					} else {
@@ -1801,10 +1674,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				}
 
 				// Create user
-				if (!$user->socid && !$object->user_id)
-				{
-					if ($user->rights->user->user->creer)
-					{
+				if (!$user->socid && !$object->user_id) {
+					if ($user->rights->user->user->creer) {
 						if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
 						else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
 					} else {
@@ -1813,24 +1684,20 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				}
 
 				// Delete
-				if ($user->rights->adherent->supprimer)
-				{
+				if ($user->rights->adherent->supprimer) {
 					print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete">'.$langs->trans("Delete")."</a></div>\n";
 				} else {
 					print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Delete")."</font></div>";
 				}
 
 				// Action SPIP
-				if (!empty($conf->mailmanspip->enabled) && !empty($conf->global->ADHERENT_USE_SPIP))
-				{
+				if (!empty($conf->mailmanspip->enabled) && !empty($conf->global->ADHERENT_USE_SPIP)) {
 					$isinspip = $mailmanspip->is_in_spip($object);
 
-					if ($isinspip == 1)
-					{
+					if ($isinspip == 1) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=del_spip">'.$langs->trans("DeleteIntoSpip")."</a></div>\n";
 					}
-					if ($isinspip == 0)
-					{
+					if ($isinspip == 0) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=add_spip">'.$langs->trans("AddIntoSpip")."</a></div>\n";
 					}
 				}
@@ -1838,8 +1705,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 		print '</div>';
 
-		if ($isinspip == -1)
-		{
+		if ($isinspip == -1) {
 			print '<br><br><font class="error">'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.'</font>';
 		}
 
@@ -1849,8 +1715,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			$action = 'presend';
 		}
 
-		if ($action != 'presend')
-		{
+		if ($action != 'presend') {
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 			print '<a name="builddoc"></a>'; // ancre
 
@@ -1878,8 +1743,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			// Shon online payment link
 			$useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
 
-			if ($useonlinepayment)
-			{
+			if ($useonlinepayment) {
 				print '<br>';
 
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index 345542f8cba..736cc45319e 100644
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -55,13 +55,11 @@ $extrafields->fetch_name_optionals_label($object->table_element);
  * Actions
  */
 
-if ($mode == 'cardlogin' && empty($foruserlogin))
-{
+if ($mode == 'cardlogin' && empty($foruserlogin)) {
     $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"));
 }
 
-if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
-{
+if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
     $arrayofmembers = array();
 
     // request taking into account member with up to date subscriptions
@@ -83,12 +81,10 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
 
     dol_syslog("Search members", LOG_DEBUG);
     $result = $db->query($sql);
-    if ($result)
-    {
+    if ($result) {
     	$num = $db->num_rows($result);
     	$i = 0;
-    	while ($i < $num)
-    	{
+    	while ($i < $num) {
     		$objp = $db->fetch_object($result);
 
     		if ($objp->country == '-') $objp->country = '';
@@ -98,14 +94,11 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
     		$adherentstatic->firstname = $objp->firstname;
 
             // Format extrafield so they can be parsed in function complete_substitutions_array
-    		if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']))
-            {
+    		if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
                 $adherentstatic->array_options = array();
-                foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-                {
+                foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
                     $tmpkey = 'options_'.$key;
-                    if (!empty($objp->$tmpkey))
-                    {
+                    if (!empty($objp->$tmpkey)) {
                         $adherentstatic->array_options[$tmpkey] = $objp->$tmpkey;
                     }
                     //if (!empty($objp->$key))
@@ -139,20 +132,17 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
             complete_substitutions_array($substitutionarray, $langs, $adherentstatic);
 
             // For business cards
-            if (empty($mode) || $mode == 'card' || $mode == 'cardlogin')
-            {
+            if (empty($mode) || $mode == 'card' || $mode == 'cardlogin') {
                 $textleft = make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
                 $textheader = make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
                 $textfooter = make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
                 $textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
 
-                if (is_numeric($foruserid) || $foruserlogin)
-                {
+                if (is_numeric($foruserid) || $foruserlogin) {
                     $nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY'];
                     if ($nb <= 0) $nb = 1; // Protection to avoid empty page
 
-                    for ($j = 0; $j < $nb; $j++)
-                    {
+                    for ($j = 0; $j < $nb; $j++) {
                         $arrayofmembers[] = array(
                         	'textleft'=>$textleft,
                             'textheader'=>$textheader,
@@ -175,8 +165,7 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
             }
 
             // For labels
-            if ($mode == 'label')
-            {
+            if ($mode == 'label') {
             	if (empty($conf->global->ADHERENT_ETIQUETTE_TEXT)) $conf->global->ADHERENT_ETIQUETTE_TEXT = "__FULLNAME__\n__ADDRESS__\n__ZIP__ __TOWN__\n__COUNTRY__";
                 $textleft = make_substitutions($conf->global->ADHERENT_ETIQUETTE_TEXT, $substitutionarray);
                 $textheader = '';
@@ -195,41 +184,33 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
     	}
 
     	// Build and output PDF
-        if (empty($mode) || $mode == 'card' || $mode == 'cardlogin')
-        {
-            if (!count($arrayofmembers))
-            {
+        if (empty($mode) || $mode == 'card' || $mode == 'cardlogin') {
+            if (!count($arrayofmembers)) {
                 $mesg = $langs->trans("ErrorRecordNotFound");
             }
-            if (empty($model) || $model == '-1')
-            {
+            if (empty($model) || $model == '-1') {
             	$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DescADHERENT_CARD_TYPE"));
             }
             if (!$mesg) $result = members_card_pdf_create($db, $arrayofmembers, $model, $outputlangs);
         }
-        elseif ($mode == 'label')
-        {
-            if (!count($arrayofmembers))
-            {
+        elseif ($mode == 'label') {
+            if (!count($arrayofmembers)) {
                 $mesg = $langs->trans("ErrorRecordNotFound");
             }
-        	if (empty($modellabel) || $modellabel == '-1')
-    		{
+        	if (empty($modellabel) || $modellabel == '-1') {
     			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DescADHERENT_ETIQUETTE_TYPE"));
     		}
         	if (!$mesg) $result = doc_label_pdf_create($db, $arrayofmembers, $modellabel, $outputlangs);
         }
 
-    	if ($result <= 0)
-    	{
+    	if ($result <= 0) {
     		dol_print_error('', $result);
     	}
     } else {
     	dol_print_error($db);
     }
 
-    if (!$mesg)
-    {
+    if (!$mesg) {
     	$db->close();
     	exit;
     }
@@ -262,8 +243,7 @@ print '<input type="hidden" name="action" value="builddoc">';
 print $langs->trans("DescADHERENT_CARD_TYPE").' ';
 // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
 $arrayoflabels = array();
-foreach (array_keys($_Avery_Labels) as $codecards)
-{
+foreach (array_keys($_Avery_Labels) as $codecards) {
 	$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
 }
 asort($arrayoflabels);
@@ -281,8 +261,7 @@ print '<input type="hidden" name="action" value="builddoc">';
 print $langs->trans("DescADHERENT_CARD_TYPE").' ';
 // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
 $arrayoflabels = array();
-foreach (array_keys($_Avery_Labels) as $codecards)
-{
+foreach (array_keys($_Avery_Labels) as $codecards) {
 	$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
 }
 asort($arrayoflabels);
@@ -301,8 +280,7 @@ print '<input type="hidden" name="action" value="builddoc">';
 print $langs->trans("DescADHERENT_ETIQUETTE_TYPE").' ';
 // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
 $arrayoflabels = array();
-foreach (array_keys($_Avery_Labels) as $codecards)
-{
+foreach (array_keys($_Avery_Labels) as $codecards) {
 	$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
 }
 asort($arrayoflabels);
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index a7410d87973..1f78a0d1c7b 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -660,8 +660,7 @@ class Adherent extends CommonObject
 			$action = 'update';
 
 			// Actions on extra fields
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
 				if ($result < 0) {
 					$error++;
@@ -704,8 +703,7 @@ class Adherent extends CommonObject
 				}
 			}
 
-			if (!$error && $nbrowsaffected) // If something has change in main data
-			{
+			if (!$error && $nbrowsaffected) { // If something has change in main data
 				// Update information on linked user if it is an update
 				if (!$error && $this->user_id > 0 && !$nosyncuser) {
 					require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -1555,8 +1553,7 @@ class Adherent extends CommonObject
 			$customer = new Societe($this->db);
 
 			if (!$error) {
-				if (!($this->fk_soc > 0)) // If not yet linked to a company
-				{
+				if (!($this->fk_soc > 0)) { // If not yet linked to a company
 					if ($autocreatethirdparty) {
 						// Create a linked thirdparty to member
 						$companyalias = '';
@@ -2420,8 +2417,7 @@ class Adherent extends CommonObject
 			if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD)) $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass; // this->pass = mot de passe non crypte
 			if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED)) $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass, 4); // Create OpenLDAP MD5 password (TODO add type of encryption)
 		} // Set LDAP password if possible
-		elseif ($conf->global->LDAP_SERVER_PROTOCOLVERSION !== '3') // If ldap key is modified and LDAPv3 we use ldap_rename function for avoid lose encrypt password
-		{
+		elseif ($conf->global->LDAP_SERVER_PROTOCOLVERSION !== '3') { // If ldap key is modified and LDAPv3 we use ldap_rename function for avoid lose encrypt password
 			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
 				// Just for the default MD5 !
 				if (empty($conf->global->MAIN_SECURITY_HASH_ALGO)) {
@@ -2620,8 +2616,7 @@ class Adherent extends CommonObject
 
 		$blockingerrormsg = '';
 
-		if (empty($conf->adherent->enabled)) // Should not happen. If module disabled, cron job should not be visible.
-		{
+		if (empty($conf->adherent->enabled)) { // Should not happen. If module disabled, cron job should not be visible.
 			$langs->load("agenda");
 			$this->output = $langs->trans('ModuleNotEnabled', $langs->transnoentitiesnoconv("Adherent"));
 			return 0;
@@ -2640,8 +2635,7 @@ class Adherent extends CommonObject
 		$listofmembersko = array();
 
 		$arraydaysbeforeend = explode(';', $daysbeforeendlist);
-		foreach ($arraydaysbeforeend as $daysbeforeend) // Loop on each delay
-		{
+		foreach ($arraydaysbeforeend as $daysbeforeend) { // Loop on each delay
 			dol_syslog(__METHOD__.' - Process delta = '.$daysbeforeend, LOG_DEBUG);
 
 			if (!is_numeric($daysbeforeend)) {
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 199bd5e8a51..e2ff3786a3c 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -132,12 +132,10 @@ class AdherentType extends CommonObject
 
         $result = $this->db->query($sql);
         if ($result) {
-            while ($obj = $this->db->fetch_object($result))
-            {
+            while ($obj = $this->db->fetch_object($result)) {
                 //print 'lang='.$obj->lang.' current='.$current_lang.'<br>';
-                if ($obj->lang == $current_lang)  // si on a les traduct. dans la langue courante on les charge en infos principales.
-                {
-                    $this->label        = $obj->label;
+                if ($obj->lang == $current_lang) {  // si on a les traduct. dans la langue courante on les charge en infos principales.
+					$this->label        = $obj->label;
                     $this->description = $obj->description;
                     $this->email        = $obj->email;
                 }
@@ -165,8 +163,7 @@ class AdherentType extends CommonObject
         $langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 0, 2);
         $current_lang = $langs->getDefaultLang();
 
-        foreach ($langs_available as $key => $value)
-        {
+        foreach ($langs_available as $key => $value) {
             if ($key == $current_lang) {
                 $sql = "SELECT rowid";
                 $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type_lang";
@@ -175,9 +172,8 @@ class AdherentType extends CommonObject
 
                 $result = $this->db->query($sql);
 
-                if ($this->db->num_rows($result)) // if there is already a description line for this language
-                {
-                    $sql2 = "UPDATE ".MAIN_DB_PREFIX."adherent_type_lang";
+                if ($this->db->num_rows($result)) { // if there is already a description line for this language
+					$sql2 = "UPDATE ".MAIN_DB_PREFIX."adherent_type_lang";
                     $sql2 .= " SET ";
                     $sql2 .= " label='".$this->db->escape($this->label)."',";
                     $sql2 .= " description='".$this->db->escape($this->description)."'";
@@ -203,9 +199,8 @@ class AdherentType extends CommonObject
 
                 $result = $this->db->query($sql);
 
-                if ($this->db->num_rows($result)) // if there is already a description line for this language
-                {
-                    $sql2 = "UPDATE ".MAIN_DB_PREFIX."adherent_type_lang";
+                if ($this->db->num_rows($result)) { // if there is already a description line for this language
+					$sql2 = "UPDATE ".MAIN_DB_PREFIX."adherent_type_lang";
                     $sql2 .= " SET ";
                     $sql2 .= " label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
                     $sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
@@ -303,27 +298,23 @@ class AdherentType extends CommonObject
 
 		dol_syslog("Adherent_type::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."adherent_type");
 
 			$result = $this->update($user, 1);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->db->rollback();
 				return -3;
 			}
 
-			if (!$notrigger)
-			{
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('MEMBER_TYPE_CREATE', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return $this->id;
 			} else {
@@ -368,8 +359,7 @@ class AdherentType extends CommonObject
 		$sql .= " WHERE rowid =".$this->id;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
             $this->description = $this->db->escape($this->note);
 
             // Multilangs
@@ -383,25 +373,21 @@ class AdherentType extends CommonObject
 			$action = 'update';
 
 			// Actions on extra fields
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('MEMBER_TYPE_MODIFY', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -431,8 +417,7 @@ class AdherentType extends CommonObject
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// Call trigger
 			$result = $this->call_trigger('MEMBER_TYPE_DELETE', $user);
 			if ($result < 0) { $error++; $this->db->rollback(); return -2; }
@@ -464,10 +449,8 @@ class AdherentType extends CommonObject
 		dol_syslog("Adherent_type::fetch", LOG_DEBUG);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id             = $obj->rowid;
@@ -515,15 +498,12 @@ class AdherentType extends CommonObject
 		$sql .= " WHERE entity IN (".getEntity('member_type').")";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$nump = $this->db->num_rows($resql);
 
-			if ($nump)
-			{
+			if ($nump) {
 				$i = 0;
-				while ($i < $nump)
-				{
+				while ($i < $nump) {
 					$obj = $this->db->fetch_object($resql);
 
 					$adherenttypes[$obj->rowid] = $langs->trans($obj->label);
@@ -559,14 +539,10 @@ class AdherentType extends CommonObject
 
 		dol_syslog(get_class($this)."::listUsersForGroup", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
-				if (!array_key_exists($obj->rowid, $ret))
-				{
-					if ($mode < 2)
-					{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				if (!array_key_exists($obj->rowid, $ret)) {
+					if ($mode < 2) {
 						$memberstatic = new Adherent($this->db);
 						if ($mode == 1) {
 							$memberstatic->fetch($obj->rowid, '', '', '', false, false);
@@ -659,8 +635,7 @@ class AdherentType extends CommonObject
 		$statusType = 'status4';
 		if ($status == 0) $statusType = 'status5';
 
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			$this->labelStatus[0] = $langs->trans("ActivityCeased");
 			$this->labelStatus[1] = $langs->trans("InActivity");
 			$this->labelStatusShort[0] = $langs->trans("ActivityCeased");
@@ -713,11 +688,9 @@ class AdherentType extends CommonObject
 		// Champs
 		if ($this->label && !empty($conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME)) $info[$conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME] = $this->label;
 		if ($this->note && !empty($conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note, 0, 'UTF-8', 1);
-		if (!empty($conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS))
-		{
+		if (!empty($conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS)) {
 			$valueofldapfield = array();
-			foreach ($this->members as $key=>$val)    // This is array of users for group into dolibarr database.
-			{
+			foreach ($this->members as $key=>$val) {    // This is array of users for group into dolibarr database.
 				$member = new Adherent($this->db);
 				$member->fetch($val->id, '', '', '', false, false);
 				$info2 = $member->_load_ldap_info();
@@ -767,8 +740,7 @@ class AdherentType extends CommonObject
 	{
 		global $conf;
 
-		if (!empty($this->mail_valid) && trim(dol_htmlentitiesbr_decode($this->mail_valid)))
-		{
+		if (!empty($this->mail_valid) && trim(dol_htmlentitiesbr_decode($this->mail_valid))) {
 			return $this->mail_valid;
 		}
 
@@ -785,8 +757,7 @@ class AdherentType extends CommonObject
 		global $conf;
 
 		// mail_subscription not  defined so never used
-		if (!empty($this->mail_subscription) && trim(dol_htmlentitiesbr_decode($this->mail_subscription)))  // Property not yet defined
-		{
+		if (!empty($this->mail_subscription) && trim(dol_htmlentitiesbr_decode($this->mail_subscription))) {  // Property not yet defined
 			return $this->mail_subscription;
 		}
 
@@ -803,9 +774,8 @@ class AdherentType extends CommonObject
         global $conf;
 
         // NOTE mail_resiliate not defined so never used
-        if (!empty($this->mail_resiliate) && trim(dol_htmlentitiesbr_decode($this->mail_resiliate)))  // Property not yet defined
-        {
-            return $this->mail_resiliate;
+        if (!empty($this->mail_resiliate) && trim(dol_htmlentitiesbr_decode($this->mail_resiliate))) {  // Property not yet defined
+			return $this->mail_resiliate;
         }
 
         return '';
diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index bdb174cc0bd..b3029a6bd55 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -71,8 +71,7 @@ class AdherentStats extends Stats
 		$this->where .= " m.statut != 0";
 		$this->where .= " AND p.fk_adherent = m.rowid AND m.entity IN (".getEntity('adherent').")";
 		//if (!$user->rights->societe->client->voir && !$user->socid) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($this->memberid)
-		{
+		if ($this->memberid) {
 			$this->where .= " AND m.rowid = ".$this->memberid;
 		}
         //if ($this->userid > 0) $this->where.=' AND fk_user_author = '.$this->userid;
diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index a5d72f3b78f..c69706d8a3b 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -109,8 +109,7 @@ class Members extends DolibarrApi
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_member as c";
     	}
         $sql .= ' WHERE t.entity IN ('.getEntity('adherent').')';
-        if (!empty($typeid))
-        {
+        if (!empty($typeid)) {
             $sql .= ' AND t.fk_adherent_type='.$typeid;
         }
     	// Select members of given category
@@ -119,10 +118,8 @@ class Members extends DolibarrApi
 			$sql .= " AND c.fk_member = t.rowid ";
     	}
         // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
+        if ($sqlfilters) {
+            if (!DolibarrApi::_checkFilters($sqlfilters)) {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
 	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -131,8 +128,7 @@ class Members extends DolibarrApi
 
         $sql .= $db->order($sortfield, $sortorder);
         if ($limit) {
-            if ($page < 0)
-            {
+            if ($page < 0) {
                 $page = 0;
             }
             $offset = $limit * $page;
@@ -141,13 +137,11 @@ class Members extends DolibarrApi
         }
 
         $result = $db->query($sql);
-        if ($result)
-        {
+        if ($result) {
             $i = 0;
             $num = $db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
+            while ($i < $min) {
             	$obj = $db->fetch_object($result);
                 $member = new Adherent($this->db);
                 if ($member->fetch($obj->rowid)) {
@@ -236,8 +230,7 @@ class Members extends DolibarrApi
 
         // If there is no error, update() returns the number of affected rows
         // so if the update is a no op, the return value is zero.
-        if ($member->update(DolibarrApiAccess::$user) >= 0)
-        {
+        if ($member->update(DolibarrApiAccess::$user) >= 0) {
             return $this->get($id);
         } else {
             throw new RestException(500, $member->error);
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index c9d12206962..61758255624 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -101,10 +101,8 @@ class MembersTypes extends DolibarrApi
         $sql .= ' WHERE t.entity IN ('.getEntity('member_type').')';
 
         // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
+        if ($sqlfilters) {
+            if (!DolibarrApi::_checkFilters($sqlfilters)) {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
 	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -113,8 +111,7 @@ class MembersTypes extends DolibarrApi
 
         $sql .= $db->order($sortfield, $sortorder);
         if ($limit) {
-            if ($page < 0)
-            {
+            if ($page < 0) {
                 $page = 0;
             }
             $offset = $limit * $page;
@@ -123,13 +120,11 @@ class MembersTypes extends DolibarrApi
         }
 
         $result = $db->query($sql);
-        if ($result)
-        {
+        if ($result) {
             $i = 0;
             $num = $db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
+            while ($i < $min) {
             	$obj = $db->fetch_object($result);
                 $membertype = new AdherentType($this->db);
                 if ($membertype->fetch($obj->rowid)) {
@@ -204,8 +199,7 @@ class MembersTypes extends DolibarrApi
 
         // If there is no error, update() returns the number of affected rows
         // so if the update is a no op, the return value is zero.
-        if ($membertype->update(DolibarrApiAccess::$user) >= 0)
-        {
+        if ($membertype->update(DolibarrApiAccess::$user) >= 0) {
             return $this->get($id);
         } else {
             throw new RestException(500, $membertype->error);
diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
index 11ac1f17113..79480c09fdf 100644
--- a/htdocs/adherents/class/api_subscriptions.class.php
+++ b/htdocs/adherents/class/api_subscriptions.class.php
@@ -99,10 +99,8 @@ class Subscriptions extends DolibarrApi
         $sql .= " FROM ".MAIN_DB_PREFIX."subscription as t";
         $sql .= ' WHERE 1 = 1';
         // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
+        if ($sqlfilters) {
+            if (!DolibarrApi::_checkFilters($sqlfilters)) {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
 	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -111,8 +109,7 @@ class Subscriptions extends DolibarrApi
 
         $sql .= $db->order($sortfield, $sortorder);
         if ($limit) {
-            if ($page < 0)
-            {
+            if ($page < 0) {
                 $page = 0;
             }
             $offset = $limit * $page;
@@ -121,12 +118,10 @@ class Subscriptions extends DolibarrApi
         }
 
         $result = $db->query($sql);
-        if ($result)
-        {
+        if ($result) {
             $i = 0;
             $num = $db->num_rows($result);
-            while ($i < min($limit, $num))
-            {
+            while ($i < min($limit, $num)) {
                 $obj = $db->fetch_object($result);
                 $subscription = new Subscription($this->db);
                 if ($subscription->fetch($obj->rowid)) {
@@ -193,8 +188,7 @@ class Subscriptions extends DolibarrApi
             $subscription->$field = $value;
         }
 
-        if ($subscription->update(DolibarrApiAccess::$user) > 0)
-        {
+        if ($subscription->update(DolibarrApiAccess::$user) > 0) {
             return $this->get($id);
         } else {
             throw new RestException(500, $subscription->error);
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index e1ec3bd1753..cdc70cf0cd1 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -136,8 +136,7 @@ class Subscription extends CommonObject
         $now = dol_now();
 
         // Check parameters
-        if ($this->datef <= $this->dateh)
-        {
+        if ($this->datef <= $this->dateh) {
             $this->error = $langs->trans("ErrorBadValueForDate");
             return -1;
         }
@@ -169,14 +168,12 @@ class Subscription extends CommonObject
             $this->errors[] = $this->db->lasterror();
         }
 
-        if (!$error)
-        {
+        if (!$error) {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
             $this->fk_type = $type;
         }
 
-        if (!$error && !$notrigger)
-        {
+        if (!$error && !$notrigger) {
         	$this->context = array('member'=>$member);
         	// Call triggers
             $result = $this->call_trigger('MEMBER_SUBSCRIPTION_CREATE', $user);
@@ -213,10 +210,8 @@ class Subscription extends CommonObject
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
+        if ($resql) {
+            if ($this->db->num_rows($resql)) {
                 $obj = $this->db->fetch_object($resql);
 
                 $this->id             = $obj->rowid;
@@ -268,8 +263,7 @@ class Subscription extends CommonObject
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if ($resql)
-        {
+        if ($resql) {
             require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
             $member = new Adherent($this->db);
             $result = $member->fetch($this->fk_adherent);
@@ -309,8 +303,7 @@ class Subscription extends CommonObject
         $error = 0;
 
         // It subscription is linked to a bank transaction, we get it
-        if ($this->fk_bank > 0)
-        {
+        if ($this->fk_bank > 0) {
             require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
             $accountline = new AccountLine($this->db);
             $result = $accountline->fetch($this->fk_bank);
@@ -327,26 +320,21 @@ class Subscription extends CommonObject
             }
         }
 
-        if (!$error)
-        {
+        if (!$error) {
             $sql = "DELETE FROM ".MAIN_DB_PREFIX."subscription WHERE rowid = ".$this->id;
             dol_syslog(get_class($this)."::delete", LOG_DEBUG);
             $resql = $this->db->query($sql);
-            if ($resql)
-            {
+            if ($resql) {
                 $num = $this->db->affected_rows($resql);
-                if ($num)
-                {
+                if ($num) {
                     require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
                     $member = new Adherent($this->db);
                     $result = $member->fetch($this->fk_adherent);
                     $result = $member->update_end_date($user);
 
-                    if ($this->fk_bank > 0 && is_object($accountline) && $accountline->id > 0)	// If we found bank account line (this means this->fk_bank defined)
-                    {
-                        $result = $accountline->delete($user); // Return false if refused because line is conciliated
-                        if ($result > 0)
-                        {
+                    if ($this->fk_bank > 0 && is_object($accountline) && $accountline->id > 0) {	// If we found bank account line (this means this->fk_bank defined)
+						$result = $accountline->delete($user); // Return false if refused because line is conciliated
+                        if ($result > 0) {
                             $this->db->commit();
                             return 1;
                         } else {
@@ -400,8 +388,7 @@ class Subscription extends CommonObject
 
         $url = DOL_URL_ROOT.'/adherents/subscription/card.php?rowid='.$this->id;
 
-        if ($option != 'nolink')
-        {
+        if ($option != 'nolink') {
             // Add param to save lastsearch_values or not
             $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
             if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
@@ -462,10 +449,8 @@ class Subscription extends CommonObject
         $sql .= ' WHERE c.rowid = '.$id;
 
         $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
+        if ($result) {
+            if ($this->db->num_rows($result)) {
                 $obj = $this->db->fetch_object($result);
                 $this->id = $obj->rowid;
 
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index 291b1916e55..141e19d0c96 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -61,8 +61,7 @@ $form = new Form($db);
 $object = new Adherent($db);
 $membert = new AdherentType($db);
 $result = $object->fetch($id);
-if ($result < 0)
-{
+if ($result < 0) {
 	dol_print_error($db);
 	exit;
 }
@@ -86,16 +85,13 @@ $title = $langs->trans("Member")." - ".$langs->trans("Documents");
 $helpurl = "EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros";
 llxHeader("", $title, $helpurl);
 
-if ($id > 0)
-{
+if ($id > 0) {
     $result = $membert->fetch($object->typeid);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		// Build file list
 		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 		$totalsize = 0;
-		foreach ($filearray as $key => $file)
-		{
+		foreach ($filearray as $key => $file) {
 			$totalsize += $file['size'];
 		}
 
@@ -118,8 +114,7 @@ if ($id > 0)
 		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
         // Login
-        if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-        {
+        if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
             print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
         }
 
diff --git a/htdocs/adherents/htpasswd.php b/htdocs/adherents/htpasswd.php
index 385e34d6538..fc9b2eaf7f9 100644
--- a/htdocs/adherents/htpasswd.php
+++ b/htdocs/adherents/htpasswd.php
@@ -40,13 +40,11 @@ $now = dol_now();
 
 if (empty($sortorder)) {  $sortorder = "ASC"; }
 if (empty($sortfield)) {  $sortfield = "d.login"; }
-if (!isset($statut))
-{
+if (!isset($statut)) {
 	$statut = 1;
 }
 
-if (!isset($cotis))
-{
+if (!isset($cotis)) {
 	// by default, members must be up to date of subscription
 	$cotis = 1;
 }
@@ -55,24 +53,21 @@ if (!isset($cotis))
 $sql = "SELECT d.login, d.pass, d.datefin";
 $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d ";
 $sql .= " WHERE d.statut = ".$statut;
-if ($cotis == 1)
-{
+if ($cotis == 1) {
 	$sql .= " AND datefin > '".$db->idate($now)."'";
 }
 $sql .= $db->order($sortfield, $sortorder);
 //$sql.=$db->plimit($conf->liste_limit, $offset);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
 	print_barre_liste($langs->trans("HTPasswordExport"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', 0);
 
 	print "<hr>\n";
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $db->fetch_object($result);
 		$htpass = crypt($objp->pass, makesalt());
 		print $objp->login.":".$htpass."<br>\n";
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 001730d67b1..89f95b3e3dc 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -73,12 +73,10 @@ $sql .= " GROUP BY t.rowid, t.libelle, t.subscription, d.statut";
 
 dol_syslog("index.php::select nb of members per type", LOG_DEBUG);
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $db->fetch_object($result);
 
 		$adhtype = new AdherentType($db);
@@ -110,12 +108,10 @@ $sql .= " GROUP BY d.fk_adherent_type";
 
 dol_syslog("index.php::select nb of uptodate members by type", LOG_DEBUG);
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $db->fetch_object($result);
 		$MemberUpToDate[$objp->fk_adherent_type] = $objp->somme;
 		$i++;
@@ -127,23 +123,19 @@ if ($result)
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
-{
-    // Search contact/address
-    if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire)
-    {
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is useless due to the global search combo
+	// Search contact/address
+    if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire) {
     	$listofsearchfields['search_member'] = array('text'=>'Member');
     }
 
-    if (count($listofsearchfields))
-    {
+    if (count($listofsearchfields)) {
     	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
     	print '<input type="hidden" name="token" value="'.newToken().'">';
         print '<div class="div-table-responsive-no-min">';
     	print '<table class="noborder nohover centpercent">';
     	$i = 0;
-    	foreach ($listofsearchfields as $key => $value)
-    	{
+    	foreach ($listofsearchfields as $key => $value) {
     		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
     		print '<tr class="oddeven">';
     		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
@@ -163,8 +155,7 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useles
  * Statistics
  */
 
-if ($conf->use_javascript_ajax)
-{
+if ($conf->use_javascript_ajax) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder nohover centpercent">';
     print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
@@ -177,8 +168,7 @@ if ($conf->use_javascript_ajax)
     $total = 0;
     $dataval = array();
     $i = 0;
-    foreach ($AdherentType as $key => $adhtype)
-    {
+    foreach ($AdherentType as $key => $adhtype) {
         $dataval['draft'][] = array($i, isset($MemberToValidate[$key]) ? $MemberToValidate[$key] : 0);
         $dataval['notuptodate'][] = array($i, isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0) : 0);
         $dataval['uptodate'][] = array($i, isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0);
@@ -232,12 +222,10 @@ $sql .= " AND d.rowid = c.fk_adherent";
 
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
     $num = $db->num_rows($result);
     $i = 0;
-    while ($i < $num)
-    {
+    while ($i < $num) {
         $objp = $db->fetch_object($result);
         $year = dol_print_date($db->jdate($objp->dateh), "%Y");
         $Total[$year] = (isset($Total[$year]) ? $Total[$year] : 0) + $objp->subscription;
@@ -259,10 +247,8 @@ print "</tr>\n";
 
 krsort($Total);
 $i = 0;
-foreach ($Total as $key=>$value)
-{
-	if ($i >= 8)
-	{
+foreach ($Total as $key=>$value) {
+	if ($i >= 8) {
 		print '<tr class="oddeven">';
 		print "<td>...</td>";
 		print "<td class=\"right\"></td>";
@@ -308,26 +294,22 @@ $sql .= $db->order("a.tms", "DESC");
 $sql .= $db->plimit($max, 0);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<th colspan="4">'.$langs->trans("LastMembersModified", $max).'</th></tr>';
 
 	$num = $db->num_rows($resql);
-	if ($num)
-	{
+	if ($num) {
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 			print '<tr class="oddeven">';
 			$staticmember->id = $obj->rowid;
 			$staticmember->lastname = $obj->lastname;
 			$staticmember->firstname = $obj->firstname;
-			if (!empty($obj->fk_soc))
-			{
+			if (!empty($obj->fk_soc)) {
 				$staticmember->fk_soc = $obj->fk_soc;
 				$staticmember->fetch_thirdparty();
 				$staticmember->name = $staticmember->thirdparty->name;
@@ -367,19 +349,16 @@ $sql .= $db->order("c.tms", "DESC");
 $sql .= $db->plimit($max, 0);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<th colspan="5">'.$langs->trans("LastSubscriptionsModified", $max).'</th></tr>';
 
 	$num = $db->num_rows($resql);
-	if ($num)
-	{
+	if ($num) {
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 			print '<tr class="oddeven">';
 			$subscriptionstatic->id = $obj->cid;
@@ -423,8 +402,7 @@ print '<th class=right>'.$langs->trans("MenuMembersUpToDate").'</th>';
 print '<th class=right>'.$langs->trans("MembersStatusResiliated").'</th>';
 print "</tr>\n";
 
-foreach ($AdherentType as $key => $adhtype)
-{
+foreach ($AdherentType as $key => $adhtype) {
 	print '<tr class="oddeven">';
 	print '<td>'.$adhtype->getNomUrl(1, dol_size(32)).'</td>';
 	print '<td class="right">'.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0 ? $MemberToValidate[$key] : '').' '.$staticmember->LibStatut(-1, $adhtype->subscription, 0, 3).'</td>';
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index 43d6a34fcf9..79eb8237d91 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -37,15 +37,13 @@ $action = GETPOST('action', 'aZ09');
 
 // Protection
 $socid = 0;
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
     $socid = $user->socid;
 }
 
 $object = new Adherent($db);
 $result = $object->fetch($rowid);
-if (!$result)
-{
+if (!$result) {
 	dol_print_error($db, "Failed to get adherent: ".$object->error);
 	exit;
 }
@@ -55,13 +53,11 @@ if (!$result)
  * Actions
  */
 
-if ($action == 'dolibarr2ldap')
-{
+if ($action == 'dolibarr2ldap') {
 	$ldap = new Ldap();
 	$result = $ldap->connect_bind();
 
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$info = $object->_load_ldap_info();
 		$dn = $object->_load_ldap_dn($info);
 		$olddn = $dn; // We can say that old dn = dn as we force synchro
@@ -104,8 +100,7 @@ print '<table class="border centpercent tableforfield">';
 print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
 
 // If there is a link to password not crypted, we show value in database here so we can compare because it is shown nowhere else
-if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD))
-{
+if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD)) {
 	print '<tr><td>'.$langs->trans("LDAPFieldPasswordNotCrypted").'</td>';
 	print '<td class="valeur">'.$object->pass.'</td>';
 	print "</tr>\n";
@@ -142,8 +137,7 @@ dol_fiche_end();
 
 print '<div class="tabsAction">';
 
-if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && $conf->global->LDAP_MEMBER_ACTIVE != 'ldap2dolibarr')
-{
+if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && $conf->global->LDAP_MEMBER_ACTIVE != 'ldap2dolibarr') {
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a></div>';
 }
 
@@ -166,14 +160,12 @@ print '</tr>';
 // Lecture LDAP
 $ldap = new Ldap();
 $result = $ldap->connect_bind();
-if ($result > 0)
-{
+if ($result > 0) {
 	$info = $object->_load_ldap_info();
 	$dn = $object->_load_ldap_dn($info, 1);
 	$search = "(".$object->_load_ldap_dn($info, 2).")";
 
-	if (empty($dn))
-	{
+	if (empty($dn)) {
 	    $langs->load("errors");
 	    print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Member")).'</font></td></tr>';
 	} else {
@@ -182,10 +174,8 @@ if ($result > 0)
     	//print_r($records);
 
     	// Show tree
-    	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0))
-    	{
-    		if (!is_array($records))
-    		{
+    	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
+    		if (!is_array($records)) {
     			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
     		} else {
     			$result = show_ldap_content($records, 0, $records['count'], true);
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 72745b54614..d82b7438574 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -141,10 +141,8 @@ $arrayfields = array(
 	'd.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000)
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
 			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
 	}
@@ -162,14 +160,12 @@ $parameters = array('socid'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$search = "";
 		$search_ref = "";
 		$search_lastname = "";
@@ -198,29 +194,25 @@ if (empty($reshook))
 	}
 
 	// Close
-	if ($massaction == 'close' && $user->rights->adherent->creer)
-	{
+	if ($massaction == 'close' && $user->rights->adherent->creer) {
 	    $tmpmember = new Adherent($db);
 	    $error = 0;
 	    $nbclose = 0;
 
 	    $db->begin();
 
-        foreach ($toselect as $idtoclose)
-        {
+        foreach ($toselect as $idtoclose) {
             $tmpmember->fetch($idtoclose);
             $result = $tmpmember->resiliate($user);
 
-            if ($result < 0 && !count($tmpmember->errors))
-    	    {
+            if ($result < 0 && !count($tmpmember->errors)) {
     	        setEventMessages($tmpmember->error, $tmpmember->errors, 'errors');
     	    } else {
     	        if ($result > 0) $nbclose++;
     	    }
         }
 
-        if (!$error)
-        {
+        if (!$error) {
             setEventMessages($langs->trans("XMembersClosed", $nbclose), null, 'mesgs');
 
             $db->commit();
@@ -282,8 +274,7 @@ $sql .= " AND d.entity IN (".getEntity('adherent').")";
 if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
 if ($search_type > 0) $sql .= " AND t.rowid=".$db->escape($search_type);
 if ($statut != '') $sql .= " AND d.statut in (".$db->escape($statut).")"; // Peut valoir un nombre ou liste de nombre separes par virgules
-if ($search_ref)
-{
+if ($search_ref) {
 	if (is_numeric($search_ref)) $sql .= " AND (d.rowid = ".$db->escape($search_ref).")";
 	else $sql .= " AND 1 = 2"; // Always wrong
 }
@@ -313,13 +304,11 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records with no order and no limits
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$resql = $db->query($sql);
 	if ($resql) $nbtotalofrecords = $db->num_rows($resql);
 	else dol_print_error($db);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-	{
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
@@ -329,8 +318,7 @@ $sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog("get list", LOG_DEBUG);
 $resql = $db->query($sql);
-if (!$resql)
-{
+if (!$resql) {
 	dol_print_error($db);
 	exit;
 }
@@ -339,8 +327,7 @@ $num = $db->num_rows($resql);
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
-{
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/adherents/card.php?id='.$id);
@@ -350,8 +337,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 llxHeader('', $langs->trans("Member"), 'EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros');
 
 $titre = $langs->trans("MembersList");
-if (GETPOSTISSET("statut"))
-{
+if (GETPOSTISSET("statut")) {
 	if ($statut == '-1,1') { $titre = $langs->trans("MembersListQualified"); }
 	if ($statut == '-1') { $titre = $langs->trans("MembersListToValid"); }
 	if ($statut == '1' && !$filter) { $titre = $langs->trans("MembersListValid"); }
@@ -359,13 +345,11 @@ if (GETPOSTISSET("statut"))
 	if ($statut == '1' && $filter == 'outofdate') { $titre = $langs->trans("MembersListNotUpToDate"); }
 	if ($statut == '0') { $titre = $langs->trans("MembersListResiliated"); }
 }
-elseif ($action == 'search')
-{
+elseif ($action == 'search') {
 	$titre = $langs->trans("MembersListQualified");
 }
 
-if ($search_type > 0)
-{
+if ($search_type > 0) {
 	$membertype = new AdherentType($db);
 	$result = $membertype->fetch(GETPOST("type", 'int'));
 	$titre .= " (".$membertype->label.")";
@@ -409,8 +393,7 @@ if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions =
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = '';
-if ($user->rights->adherent->creer)
-{
+if ($user->rights->adherent->creer) {
     $newcardbutton .= dolGetButtonTitle($langs->trans('NewMember'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/card.php?action=create');
 }
 
@@ -431,16 +414,14 @@ $objecttmp = new Adherent($db);
 $trackid = 'mem'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-if ($sall)
-{
+if ($sall) {
 	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
 
 // Filter on categories
 $moreforfilter = '';
-if (!empty($conf->categorie->enabled))
-{
+if (!empty($conf->categorie->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= $langs->trans('Categories').': ';
@@ -451,8 +432,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 else $moreforfilter = $hookmanager->resPrint;
-if (!empty($moreforfilter))
-{
+if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	print '</div>';
@@ -470,120 +450,100 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 print '<tr class="liste_titre_filter">';
 
 // Line numbering
-if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-{
+if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 
 // Ref
-if (!empty($arrayfields['d.ref']['checked']))
-{
+if (!empty($arrayfields['d.ref']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['d.civility']['checked']))
-{
+if (!empty($arrayfields['d.civility']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth50imp" type="text" name="search_civility" value="'.dol_escape_htmltag($search_civility).'"></td>';
 }
-if (!empty($arrayfields['d.firstname']['checked']))
-{
+if (!empty($arrayfields['d.firstname']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_firstname" value="'.dol_escape_htmltag($search_firstname).'"></td>';
 }
-if (!empty($arrayfields['d.lastname']['checked']))
-{
+if (!empty($arrayfields['d.lastname']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_lastname" value="'.dol_escape_htmltag($search_lastname).'"></td>';
 }
-if (!empty($arrayfields['d.gender']['checked']))
-{
+if (!empty($arrayfields['d.gender']['checked'])) {
 	print '<td class="liste_titre">';
 	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"));
 	print $form->selectarray('search_gender', $arraygender, $search_gender, 1);
 	print '</td>';
 }
-if (!empty($arrayfields['d.company']['checked']))
-{
+if (!empty($arrayfields['d.company']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_company" value="'.dol_escape_htmltag($search_company).'"></td>';
 }
-if (!empty($arrayfields['d.login']['checked']))
-{
+if (!empty($arrayfields['d.login']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'"></td>';
 }
-if (!empty($arrayfields['d.morphy']['checked']))
-{
+if (!empty($arrayfields['d.morphy']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '</td>';
 }
-if (!empty($arrayfields['t.libelle']['checked']))
-{
+if (!empty($arrayfields['t.libelle']['checked'])) {
 	print '<td class="liste_titre">';
 	$listetype = $membertypestatic->liste_array();
 	print $form->selectarray("search_type", $listetype, $type, 1, 0, 0, '', 0, 32);
 	print '</td>';
 }
 
-if (!empty($arrayfields['d.address']['checked']))
-{
+if (!empty($arrayfields['d.address']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_address" value="'.$search_address.'"></td>';
 }
 
-if (!empty($arrayfields['d.zip']['checked']))
-{
+if (!empty($arrayfields['d.zip']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth50imp" type="text" name="search_zip" value="'.$search_zip.'"></td>';
 }
-if (!empty($arrayfields['d.town']['checked']))
-{
+if (!empty($arrayfields['d.town']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_town" value="'.$search_town.'"></td>';
 }
 // State
-if (!empty($arrayfields['state.nom']['checked']))
-{
+if (!empty($arrayfields['state.nom']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth75imp" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 	print '</td>';
 }
 // Country
-if (!empty($arrayfields['country.code_iso']['checked']))
-{
+if (!empty($arrayfields['country.code_iso']['checked'])) {
 	print '<td class="liste_titre center">';
 	print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
 	print '</td>';
 }
 // Phone pro
-if (!empty($arrayfields['d.phone']['checked']))
-{
+if (!empty($arrayfields['d.phone']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_phone" value="'.$search_phone.'"></td>';
 }
 // Phone perso
-if (!empty($arrayfields['d.phone_perso']['checked']))
-{
+if (!empty($arrayfields['d.phone_perso']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth50" type="text" name="search_phone_perso" value="'.$search_phone_perso.'"></td>';
 }
 // Phone mobile
-if (!empty($arrayfields['d.phone_mobile']['checked']))
-{
+if (!empty($arrayfields['d.phone_mobile']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_phone_mobile" value="'.$search_phone_mobile.'"></td>';
 }
 // Email
-if (!empty($arrayfields['d.email']['checked']))
-{
+if (!empty($arrayfields['d.email']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_email" value="'.$search_email.'"></td>';
 }
 
-if (!empty($arrayfields['d.datefin']['checked']))
-{
+if (!empty($arrayfields['d.datefin']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '</td>';
 }
@@ -595,26 +555,22 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
-if (!empty($arrayfields['d.datec']['checked']))
-{
+if (!empty($arrayfields['d.datec']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 //Birthday
-if (!empty($arrayfields['d.birth']['checked']))
-{
+if (!empty($arrayfields['d.birth']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Date modification
-if (!empty($arrayfields['d.tms']['checked']))
-{
+if (!empty($arrayfields['d.tms']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Status
-if (!empty($arrayfields['d.statut']['checked']))
-{
+if (!empty($arrayfields['d.statut']['checked'])) {
 	print '<td class="liste_titre right maxwidthonsmartphone">';
 	$liststatus = array(
 		'-1'=>$langs->trans("Draft"),
@@ -669,8 +625,7 @@ print "</tr>\n";
 
 $i = 0;
 $totalarray = array();
-while ($i < min($num, $limit))
-{
+while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
 
 	$datefin = $db->jdate($obj->datefin);
@@ -698,74 +653,64 @@ while ($i < min($num, $limit))
 
 	print '<tr class="oddeven">';
 
-	if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-	{
+	if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 		print '<td class="center">'.$obj->rowid.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Ref
-	if (!empty($arrayfields['d.ref']['checked']))
-	{
+	if (!empty($arrayfields['d.ref']['checked'])) {
 		print "<td>";
 		print $memberstatic->getNomUrl(-1, 0, 'card', 'ref', '', -1, 0, 1);
 		print "</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Civility
-	if (!empty($arrayfields['d.civility']['checked']))
-	{
+	if (!empty($arrayfields['d.civility']['checked'])) {
 		print "<td>";
 		print $obj->civility;
 		print "</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Firstname
-	if (!empty($arrayfields['d.firstname']['checked']))
-	{
+	if (!empty($arrayfields['d.firstname']['checked'])) {
 		print "<td>";
 		print $obj->firstname;
 		print "</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Lastname
-	if (!empty($arrayfields['d.lastname']['checked']))
-	{
+	if (!empty($arrayfields['d.lastname']['checked'])) {
 		print "<td>";
 		print $obj->lastname;
 		print "</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Gender
-	if (!empty($arrayfields['d.gender']['checked']))
-	{
+	if (!empty($arrayfields['d.gender']['checked'])) {
 		print '<td>';
 		if ($obj->gender) print $langs->trans("Gender".$obj->gender);
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Company
-	if (!empty($arrayfields['d.company']['checked']))
-	{
+	if (!empty($arrayfields['d.company']['checked'])) {
 		print "<td>";
 		print $companyname;
 		print "</td>\n";
 	}
 	// Login
-	if (!empty($arrayfields['d.login']['checked']))
-	{
+	if (!empty($arrayfields['d.login']['checked'])) {
 		print "<td>".$obj->login."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Moral/Physique
-	if (!empty($arrayfields['d.morphy']['checked']))
-	{
+	if (!empty($arrayfields['d.morphy']['checked'])) {
 		print "<td>".$memberstatic->getmorphylib($obj->morphy)."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Type label
-	if (!empty($arrayfields['t.libelle']['checked']))
-	{
+	if (!empty($arrayfields['t.libelle']['checked'])) {
 		$membertypestatic->id = $obj->type_id;
 		$membertypestatic->label = $obj->type;
 		print '<td class="nowrap">';
@@ -774,38 +719,33 @@ while ($i < min($num, $limit))
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Address
-	if (!empty($arrayfields['d.address']['checked']))
-	{
+	if (!empty($arrayfields['d.address']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->address;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Zip
-	if (!empty($arrayfields['d.zip']['checked']))
-	{
+	if (!empty($arrayfields['d.zip']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->zip;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Town
-	if (!empty($arrayfields['d.town']['checked']))
-	{
+	if (!empty($arrayfields['d.town']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->town;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// State
-	if (!empty($arrayfields['state.nom']['checked']))
-	{
+	if (!empty($arrayfields['state.nom']['checked'])) {
 		print "<td>".$obj->state_name."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Country
-	if (!empty($arrayfields['country.code_iso']['checked']))
-	{
+	if (!empty($arrayfields['country.code_iso']['checked'])) {
 		print '<td class="center">';
 		$tmparray = getCountry($obj->country, 'all');
 		print $tmparray['label'];
@@ -813,40 +753,34 @@ while ($i < min($num, $limit))
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Phone pro
-	if (!empty($arrayfields['d.phone']['checked']))
-	{
+	if (!empty($arrayfields['d.phone']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->phone;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Phone perso
-	if (!empty($arrayfields['d.phone_perso']['checked']))
-	{
+	if (!empty($arrayfields['d.phone_perso']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->phone_perso;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Phone mobile
-	if (!empty($arrayfields['d.phone_mobile']['checked']))
-	{
+	if (!empty($arrayfields['d.phone_mobile']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->phone_mobile;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// EMail
-	if (!empty($arrayfields['d.email']['checked']))
-	{
+	if (!empty($arrayfields['d.email']['checked'])) {
 		print "<td>".dol_print_email($obj->email, 0, 0, 1)."</td>\n";
 	}
 	// End of subscription date
 	$datefin = $db->jdate($obj->datefin);
-	if (!empty($arrayfields['d.datefin']['checked']))
-	{
-		if ($datefin)
-		{
+	if (!empty($arrayfields['d.datefin']['checked'])) {
+		if ($datefin) {
 			print '<td class="nowrap center">';
 			print dol_print_date($datefin, 'day');
 			if ($memberstatic->hasDelay()) {
@@ -856,8 +790,7 @@ while ($i < min($num, $limit))
 			print '</td>';
 		} else {
 			print '<td class="nowrap left">';
-			if ($obj->subscription == 'yes')
-			{
+			if ($obj->subscription == 'yes') {
 				print $langs->trans("SubscriptionNotReceived");
 				if ($obj->statut > 0) print " ".img_warning();
 			} else {
@@ -873,32 +806,28 @@ while ($i < min($num, $limit))
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (!empty($arrayfields['d.datec']['checked']))
-	{
+	if (!empty($arrayfields['d.datec']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Birth
-	if (!empty($arrayfields['d.birth']['checked']))
-	{
+	if (!empty($arrayfields['d.birth']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->birth), 'day', 'tzuser');
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Date modification
-	if (!empty($arrayfields['d.tms']['checked']))
-	{
+	if (!empty($arrayfields['d.tms']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Status
-	if (!empty($arrayfields['d.statut']['checked']))
-	{
+	if (!empty($arrayfields['d.statut']['checked'])) {
 		print '<td class="nowrap right">';
 		print $memberstatic->LibStatut($obj->statut, $obj->subscription, $datefin, 5);
 		print '</td>';
@@ -906,8 +835,7 @@ while ($i < min($num, $limit))
 	}
 	// Action column
 	print '<td class="center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-	{
+	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 		$selected = 0;
 		if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
 		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
@@ -924,8 +852,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 
 // If no record found
-if ($num == 0)
-{
+if ($num == 0) {
 	$colspan = 1;
 	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index ee72c920e2f..819c3499627 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -39,8 +39,7 @@ $result = restrictedArea($user, 'adherent', $id);
 
 $object = new Adherent($db);
 $result = $object->fetch($id);
-if ($result > 0)
-{
+if ($result > 0) {
     $adht = new AdherentType($db);
     $result = $adht->fetch($object->typeid);
 }
@@ -64,8 +63,7 @@ llxHeader("", $title, $helpurl);
 
 $form = new Form($db);
 
-if ($id)
-{
+if ($id) {
 	$head = member_prepare_head($object);
 
 	dol_fiche_head($head, 'note', $langs->trans("Member"), -1, 'user');
@@ -83,8 +81,7 @@ if ($id)
 	print '<table class="border centpercent tableforfield">';
 
     // Login
-    if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-    {
+    if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
         print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
     }
 
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index 70c6ab0689b..8f9a46228c6 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -33,8 +33,7 @@ $mode = GETPOST('mode') ?GETPOST('mode') : '';
 
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
     $action = '';
     $socid = $user->socid;
 }
@@ -77,12 +76,10 @@ $foundphy = $foundmor = 0;
 // Define $data array
 dol_syslog("Count member", LOG_DEBUG);
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$obj = $db->fetch_object($resql);
 
 		if ($obj->code == 'phy') $foundphy++;
@@ -124,8 +121,7 @@ print '</tr>';
 if (!$foundphy) $data[] = array('label'=>'phy', 'nb'=>'0', 'lastdate'=>'', 'lastsubscriptiondate'=>'');
 if (!$foundmor) $data[] = array('label'=>'mor', 'nb'=>'0', 'lastdate'=>'', 'lastsubscriptiondate'=>'');
 
-foreach ($data as $val)
-{
+foreach ($data as $val) {
 	print '<tr class="oddeven">';
 	print '<td>'.$memberstatic->getmorphylib($val['label']).'</td>';
 	print '<td class="right">'.$val['nb'].'</td>';
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index bde4d5c949c..62f4cd63dca 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -34,8 +34,7 @@ $mode = GETPOST('mode') ?GETPOST('mode') : '';
 
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
     $action = '';
     $socid = $user->socid;
 }
@@ -68,11 +67,9 @@ print load_fiche_titre($title, '', 'object_group');
 
 dol_mkdir($dir);
 
-if ($mode)
-{
+if ($mode) {
     // Define sql
-    if ($mode == 'memberbycountry')
-    {
+    if ($mode == 'memberbycountry') {
         $label = $langs->trans("Country");
         $tab = 'statscountry';
 
@@ -87,8 +84,7 @@ if ($mode)
         //print $sql;
     }
 
-	if ($mode == 'memberbystate')
-    {
+	if ($mode == 'memberbystate') {
         $label = $langs->trans("Country");
         $label2 = $langs->trans("State");
         $tab = 'statsstate';
@@ -105,9 +101,8 @@ if ($mode)
         $sql .= " GROUP BY co.label, co.code, c.nom";
         //print $sql;
     }
-    if ($mode == 'memberbyregion') //
-    {
-        $label = $langs->trans("Country");
+    if ($mode == 'memberbyregion') { //
+		$label = $langs->trans("Country");
         $label2 = $langs->trans("Region"); //département
         $tab = 'statsregion'; //onglet
 
@@ -123,8 +118,7 @@ if ($mode)
         $sql .= " GROUP BY co.label, co.code, r.nom"; //+
         //print $sql;
     }
-    if ($mode == 'memberbytown')
-    {
+    if ($mode == 'memberbytown') {
         $label = $langs->trans("Country");
         $label2 = $langs->trans("Town");
         $tab = 'statstown';
@@ -148,15 +142,12 @@ if ($mode)
     // Define $data array
     dol_syslog("Count member", LOG_DEBUG);
     $resql = $db->query($sql);
-    if ($resql)
-    {
+    if ($resql) {
         $num = $db->num_rows($resql);
         $i = 0;
-        while ($i < $num)
-        {
+        while ($i < $num) {
             $obj = $db->fetch_object($resql);
-            if ($mode == 'memberbycountry')
-            {
+            if ($mode == 'memberbycountry') {
                 $data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
                             'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
 							'code'=>$obj->code,
@@ -165,9 +156,8 @@ if ($mode)
                             'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
                 );
             }
-            if ($mode == 'memberbyregion') //+
-            {
-                $data[] = array(
+            if ($mode == 'memberbyregion') { //+
+				$data[] = array(
                     'label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
                     'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
 				    'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
@@ -176,8 +166,7 @@ if ($mode)
                     'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
                 );
 	        }
-            if ($mode == 'memberbystate')
-            {
+            if ($mode == 'memberbystate') {
                 $data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
                             'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
 				            'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
@@ -186,8 +175,7 @@ if ($mode)
                             'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
                 );
             }
-            if ($mode == 'memberbytown')
-            {
+            if ($mode == 'memberbytown') {
                 $data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
                             'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
                             'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
@@ -212,8 +200,7 @@ dol_fiche_head($head, $tab, $langs->trans("Statistics"), -1, 'user');
 
 
 // Print title
-if ($mode && !count($data))
-{
+if ($mode && !count($data)) {
     print $langs->trans("NoValidatedMemberYet").'<br>';
     print '<br>';
 } else {
@@ -237,8 +224,7 @@ if ($mode && !count($data))
 
 
 // Show graphics
-if (count($arrayjs) && $mode == 'memberbycountry')
-{
+if (count($arrayjs) && $mode == 'memberbycountry') {
     $color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
     if (is_readable($color_file)) include_once $color_file;
 
@@ -256,8 +242,7 @@ if (count($arrayjs) && $mode == 'memberbycountry')
 
     // loop and dump
     $i = 0;
-    foreach ($data as $val)
-    {
+    foreach ($data as $val) {
         $valcountry = strtoupper($val['code']); // Should be ISO-3166 code (faster)
         //$valcountry=ucfirst($val['label_en']);
         if ($valcountry == 'Great Britain') { $valcountry = 'United Kingdom'; }    // fix case of uk (when we use labels)
@@ -286,8 +271,7 @@ if (count($arrayjs) && $mode == 'memberbycountry')
     print '<br>';
 }
 
-if ($mode)
-{
+if ($mode) {
     // Print array / Affiche le tableau
     print '<table class="liste centpercent">';
     print '<tr class="liste_titre">';
@@ -298,8 +282,7 @@ if ($mode)
     print '<td class="center">'.$langs->trans("LatestSubscriptionDate").'</td>';
     print '</tr>';
 
-    foreach ($data as $val)
-    {
+    foreach ($data as $val) {
         $year = $val['year'];
         print '<tr class="oddeven">';
         print '<td>'.$val['label'].'</td>';
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index cb0e6a463e4..892d4d10cc6 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -35,8 +35,7 @@ $userid = GETPOST('userid', 'int'); if ($userid < 0) $userid = 0;
 $socid = GETPOST('socid', 'int'); if ($socid < 0) $socid = 0;
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
     $action = '';
     $socid = $user->socid;
 }
@@ -79,12 +78,10 @@ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=memberstats&file=subscripti
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
     $px1->SetData($data);
     $i = $startyear;
-    while ($i <= $endyear)
-    {
+    while ($i <= $endyear) {
         $legend[] = $i;
         $i++;
     }
@@ -112,12 +109,10 @@ $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=memberstats&file=subscr
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
     $px2->SetData($data);
     $i = $startyear;
-    while ($i <= $endyear)
-    {
+    while ($i <= $endyear) {
         $legend[] = $i;
         $i++;
     }
@@ -175,11 +170,9 @@ print '<td class="right">'.$langs->trans("AmountAverage").'</td>';
 print '</tr>';
 
 $oldyear = 0;
-foreach ($data as $val)
-{
+foreach ($data as $val) {
     $year = $val['year'];
-    while ($oldyear > $year + 1)
-    {	// If we have empty year
+    while ($oldyear > $year + 1) {	// If we have empty year
         $oldyear--;
         print '<tr class="oddeven" height="24">';
         print '<td class="center">';
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 3bf821db04e..a3d72e600e6 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -75,16 +75,14 @@ $errmsg = '';
 $defaultdelay = 1;
 $defaultdelayunit = 'y';
 
-if ($rowid)
-{
+if ($rowid) {
     // Load member
     $result = $object->fetch($rowid);
 
     // Define variables to know what current user can do on users
     $canadduser = ($user->admin || $user->rights->user->user->creer);
     // Define variables to know what current user can do on properties of user linked to edited member
-    if ($object->user_id)
-    {
+    if ($object->user_id) {
         // $user is the user editing, $object->user_id is the user's id linked to the edited member
         $caneditfielduser = ((($user->id == $object->user_id) && $user->rights->user->self->creer)
         || (($user->id != $object->user_id) && $user->rights->user->user->creer));
@@ -96,8 +94,7 @@ if ($rowid)
 // Define variables to know what current user can do on members
 $canaddmember = $user->rights->adherent->creer;
 // Define variables to know what current user can do on properties of a member
-if ($rowid)
-{
+if ($rowid) {
     $caneditfieldmember = $user->rights->adherent->creer;
 }
 
@@ -115,16 +112,13 @@ $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($con
  */
 
 // Create third party from a member
-if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer)
-{
-	if ($result > 0)
-	{
+if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer) {
+	if ($result > 0) {
 		// Creation of thirdparty
 		$company = new Societe($db);
 		$result = $company->create_from_member($object, GETPOST('companyname', 'alpha'), GETPOST('companyalias', 'alpha'), GETPOST('customercode', 'alpha'));
 
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$langs->load("errors");
 			setEventMessages($company->error, $company->errors, 'errors');
 		}
@@ -137,23 +131,18 @@ if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights
 	}
 }
 
-if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer))
-{
+if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer)) {
     $error = 0;
-    if (empty($user->rights->user->user->creer))    // If can edit only itself user, we can link to itself only
-    {
-        if ($_POST["userid"] != $user->id && $_POST["userid"] != $object->user_id)
-        {
+    if (empty($user->rights->user->user->creer)) {    // If can edit only itself user, we can link to itself only
+		if ($_POST["userid"] != $user->id && $_POST["userid"] != $object->user_id) {
             $error++;
             setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors');
-        }
+		}
     }
 
-    if (!$error)
-    {
-        if ($_POST["userid"] != $object->user_id)  // If link differs from currently in database
-        {
-            $result = $object->setUserId($_POST["userid"]);
+    if (!$error) {
+        if ($_POST["userid"] != $object->user_id) {  // If link differs from currently in database
+			$result = $object->setUserId($_POST["userid"]);
             if ($result < 0) dol_print_error('', $object->error);
             $_POST['action'] = '';
             $action = '';
@@ -161,21 +150,16 @@ if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights
     }
 }
 
-if ($action == 'setsocid')
-{
+if ($action == 'setsocid') {
     $error = 0;
-    if (!$error)
-    {
-        if (GETPOST('socid', 'int') != $object->fk_soc)    // If link differs from currently in database
-        {
-            $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
+    if (!$error) {
+        if (GETPOST('socid', 'int') != $object->fk_soc) {    // If link differs from currently in database
+			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
             $sql .= " WHERE fk_soc = '".GETPOST('socid', 'int')."'";
             $resql = $db->query($sql);
-            if ($resql)
-            {
+            if ($resql) {
                 $obj = $db->fetch_object($resql);
-                if ($obj && $obj->rowid > 0)
-                {
+                if ($obj && $obj->rowid > 0) {
                     $othermember = new Adherent($db);
                     $othermember->fetch($obj->rowid);
                     $thirdparty = new Societe($db);
@@ -185,8 +169,7 @@ if ($action == 'setsocid')
                 }
             }
 
-            if (!$error)
-            {
+            if (!$error) {
                 $result = $object->setThirdPartyId(GETPOST('socid', 'int'));
                 if ($result < 0) dol_print_error('', $object->error);
                 $_POST['action'] = '';
@@ -196,8 +179,7 @@ if ($action == 'setsocid')
     }
 }
 
-if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !$_POST["cancel"])
-{
+if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !$_POST["cancel"]) {
     $error = 0;
 
     $langs->load("banks");
@@ -209,16 +191,13 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
     $datesubscription = 0;
     $datesubend = 0;
     $paymentdate = 0;
-    if ($_POST["reyear"] && $_POST["remonth"] && $_POST["reday"])
-    {
+    if ($_POST["reyear"] && $_POST["remonth"] && $_POST["reday"]) {
         $datesubscription = dol_mktime(0, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
     }
-    if ($_POST["endyear"] && $_POST["endmonth"] && $_POST["endday"])
-    {
+    if ($_POST["endyear"] && $_POST["endmonth"] && $_POST["endday"]) {
         $datesubend = dol_mktime(0, 0, 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
     }
-    if ($_POST["paymentyear"] && $_POST["paymentmonth"] && $_POST["paymentday"])
-    {
+    if ($_POST["paymentyear"] && $_POST["paymentmonth"] && $_POST["paymentday"]) {
         $paymentdate = dol_mktime(0, 0, 0, $_POST["paymentmonth"], $_POST["paymentday"], $_POST["paymentyear"]);
     }
     $amount = price2num(GETPOST("subscription", 'alpha')); // Amount of subscription
@@ -235,28 +214,24 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
     $sendalsoemail = GETPOST("sendmail", 'alpha');
 
     // Check parameters
-    if (!$datesubscription)
-    {
+    if (!$datesubscription) {
         $error++;
         $langs->load("errors");
         $errmsg = $langs->trans("ErrorBadDateFormat", $langs->transnoentitiesnoconv("DateSubscription"));
         setEventMessages($errmsg, null, 'errors');
         $action = 'addsubscription';
     }
-    if (GETPOST('end') && !$datesubend)
-    {
+    if (GETPOST('end') && !$datesubend) {
         $error++;
         $langs->load("errors");
         $errmsg = $langs->trans("ErrorBadDateFormat", $langs->transnoentitiesnoconv("DateEndSubscription"));
         setEventMessages($errmsg, null, 'errors');
         $action = 'addsubscription';
     }
-    if (!$datesubend)
-    {
+    if (!$datesubend) {
         $datesubend = dol_time_plus_duree(dol_time_plus_duree($datesubscription, $defaultdelay, $defaultdelayunit), -1, 'd');
     }
-    if (($option == 'bankviainvoice' || $option == 'bankdirect') && !$paymentdate)
-    {
+    if (($option == 'bankviainvoice' || $option == 'bankdirect') && !$paymentdate) {
         $error++;
         $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DatePayment"));
         setEventMessages($errmsg, null, 'errors');
@@ -264,21 +239,17 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
     }
 
     // Check if a payment is mandatory or not
-    if (!$error && $adht->subscription)	// Member type need subscriptions
-    {
-        if (!is_numeric($amount))
-        {
+    if (!$error && $adht->subscription) {	// Member type need subscriptions
+		if (!is_numeric($amount)) {
             // If field is '' or not a numeric value
             $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
         	setEventMessages($errmsg, null, 'errors');
             $error++;
             $action = 'addsubscription';
-        }
+		}
         else {
-            if (!empty($conf->banque->enabled) && $_POST["paymentsave"] != 'none')
-            {
-                if ($_POST["subscription"])
-                {
+            if (!empty($conf->banque->enabled) && $_POST["paymentsave"] != 'none') {
+                if ($_POST["subscription"]) {
                     if (!$_POST["label"])     $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
                     if ($_POST["paymentsave"] != 'invoiceonly' && !$_POST["operation"]) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
                     if ($_POST["paymentsave"] != 'invoiceonly' && !($_POST["accountid"] > 0)) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("FinancialAccount"));
@@ -286,8 +257,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                 else {
                     if ($_POST["accountid"])   $errmsg = $langs->trans("ErrorDoNotProvideAccountsIfNullAmount");
                 }
-                if ($errmsg)
-                {
+                if ($errmsg) {
                 	$error++;
         			setEventMessages($errmsg, null, 'errors');
         			$error++;
@@ -298,24 +268,20 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
     }
 
     // Record the subscription then complementary actions
-    if (!$error && $action == 'subscription')
-    {
+    if (!$error && $action == 'subscription') {
         $db->begin();
 
         // Create subscription
         $crowid = $object->subscription($datesubscription, $amount, $accountid, $operation, $label, $num_chq, $emetteur_nom, $emetteur_banque, $datesubend);
-        if ($crowid <= 0)
-        {
+        if ($crowid <= 0) {
             $error++;
             $errmsg = $object->error;
 	        setEventMessages($object->error, $object->errors, 'errors');
         }
 
-        if (!$error)
-        {
+        if (!$error) {
         	$result = $object->subscriptionComplementaryActions($crowid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom, $emetteur_banque);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
@@ -324,8 +290,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
 			}
         }
 
-        if (!$error)
-        {
+        if (!$error) {
             $db->commit();
         }
         else {
@@ -333,18 +298,15 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
             $action = 'addsubscription';
         }
 
-        if (!$error)
-        {
+        if (!$error) {
         	setEventMessages("SubscriptionRecorded", null, 'mesgs');
         }
 
         // Send email
-        if (!$error)
-        {
+        if (!$error) {
             // Send confirmation Email
-            if ($object->email && $sendalsoemail)   // $object is 'Adherent'
-            {
-            	$subject = '';
+            if ($object->email && $sendalsoemail) {   // $object is 'Adherent'
+				$subject = '';
             	$msg = '';
 
             	// Send subscription email
@@ -362,8 +324,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
 
             	if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-            	if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-            	{
+            	if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
             		$subject = $arraydefaultmessage->topic;
             		$msg     = $arraydefaultmessage->content;
             	}
@@ -378,8 +339,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                 $listofpaths = array();
                 $listofnames = array();
                 $listofmimes = array();
-                if (is_object($object->invoice))
-                {
+                if (is_object($object->invoice)) {
                 	$invoicediroutput = $conf->facture->dir_output;
                 	$fileparams = dol_most_recent_file($invoicediroutput.'/'.$object->invoice->ref, preg_quote($object->invoice->ref, '/').'[^\-]+');
                 	$file = $fileparams['fullname'];
@@ -392,8 +352,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                 $moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/subscription.php'."\r\n";
 
                 $result = $object->send_an_email($texttosend, $subjecttosend, $listofpaths, $listofmimes, $listofnames, "", "", 0, -1, '', $moreinheader);
-                if ($result < 0)
-                {
+                if ($result < 0) {
                 	$errmsg = $object->error;
                 	setEventMessages($object->error, $object->errors, 'errors');
                 }
@@ -407,8 +366,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
         }
 
         // Clean some POST vars
-        if (!$error)
-        {
+        if (!$error) {
             $_POST["subscription"] = '';
             $_POST["accountid"] = '';
             $_POST["operation"] = '';
@@ -442,8 +400,7 @@ if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 //include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 
-if ($rowid > 0)
-{
+if ($rowid > 0) {
     $res = $object->fetch($rowid);
     if ($res < 0) { dol_print_error($db, $object->error); exit; }
 
@@ -472,8 +429,7 @@ if ($rowid > 0)
     print '<table class="border centpercent tableforfield">';
 
 	// Login
-	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-	{
+	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 		print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
 	}
 
@@ -492,11 +448,9 @@ if ($rowid > 0)
 	print '</tr>';
 
 	// Password
-	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-	{
+	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 		print '<tr><td>'.$langs->trans("Password").'</td><td>'.preg_replace('/./i', '*', $object->pass);
-		if ((!empty($object->pass) || !empty($object->pass_crypted)) && empty($object->user_id))
-		{
+		if ((!empty($object->pass) || !empty($object->pass_crypted)) && empty($object->user_id)) {
 		    $langs->load("errors");
 		    $htmltext = $langs->trans("WarningPasswordSetWithNoAccount");
 		    print ' '.$form->textwithpicto('', $htmltext, 1, 'warning');
@@ -519,8 +473,7 @@ if ($rowid > 0)
 	print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>';
 
 	// Categories
-	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-	{
+	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 		print '<tr><td>'.$langs->trans("Categories").'</td>';
 		print '<td colspan="2">';
 		print $form->showCategories($object->id, Categorie::TYPE_MEMBER, 1);
@@ -533,16 +486,14 @@ if ($rowid > 0)
 
 	// Date end subscription
 	print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
-	if ($object->datefin)
-	{
+	if ($object->datefin) {
 	    print dol_print_date($object->datefin, 'day');
 	    if ($object->hasDelay()) {
 	        print " ".img_warning($langs->trans("Late"));
 	    }
 	}
 	else {
-	    if (!$adht->subscription)
-	    {
+	    if (!$adht->subscription) {
 	        print $langs->trans("SubscriptionNotRecorded");
 	        if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
 	    }
@@ -554,8 +505,7 @@ if ($rowid > 0)
 	print '</td></tr>';
 
 	// Third party Dolibarr
-	if (!empty($conf->societe->enabled))
-	{
+	if (!empty($conf->societe->enabled)) {
 		print '<tr><td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans("LinkedToDolibarrThirdParty");
@@ -563,8 +513,7 @@ if ($rowid > 0)
 		if ($action != 'editthirdparty' && $user->rights->adherent->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editthirdparty&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToThirdParty'), 1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td colspan="2" class="valeur">';
-		if ($action == 'editthirdparty')
-		{
+		if ($action == 'editthirdparty') {
 			$htmlname = 'socid';
 			print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" name="form'.$htmlname.'">';
 			print '<input type="hidden" name="rowid" value="'.$object->id.'">';
@@ -578,8 +527,7 @@ if ($rowid > 0)
 			print '</tr></table></form>';
 		}
 		else {
-			if ($object->fk_soc)
-			{
+			if ($object->fk_soc) {
 				$company = new Societe($db);
 				$result = $company->fetch($object->fk_soc);
 				print $company->getNomUrl(1);
@@ -596,24 +544,20 @@ if ($rowid > 0)
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans("LinkedToDolibarrUser");
 	print '</td>';
-	if ($action != 'editlogin' && $user->rights->adherent->creer)
-	{
+	if ($action != 'editlogin' && $user->rights->adherent->creer) {
 		print '<td class="right">';
-		if ($user->rights->user->user->creer)
-		{
+		if ($user->rights->user->user->creer) {
 			print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editlogin&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToUser'), 1).'</a>';
 		}
 		print '</td>';
 	}
 	print '</tr></table>';
 	print '</td><td colspan="2" class="valeur">';
-	if ($action == 'editlogin')
-	{
+	if ($action == 'editlogin') {
 		$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'userid', '');
 	}
 	else {
-		if ($object->user_id)
-		{
+		if ($object->user_id) {
 			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'none');
 		}
 		else print $langs->trans("NoDolibarrAccess");
@@ -635,10 +579,8 @@ if ($rowid > 0)
      */
 
     // Button to create a new subscription if member no draft neither resiliated
-    if ($user->rights->adherent->cotisation->creer)
-    {
-        if ($action != 'addsubscription' && $action != 'create_thirdparty')
-        {
+    if ($user->rights->adherent->cotisation->creer) {
+        if ($action != 'addsubscription' && $action != 'create_thirdparty') {
             print '<div class="tabsAction">';
 
             if ($object->statut > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$rowid.'&action=addsubscription">'.$langs->trans("AddSubscription")."</a></div>";
@@ -651,8 +593,7 @@ if ($rowid > 0)
     /*
      * List of subscriptions
      */
-    if ($action != 'addsubscription' && $action != 'create_thirdparty')
-    {
+    if ($action != 'addsubscription' && $action != 'create_thirdparty') {
         $sql = "SELECT d.rowid, d.firstname, d.lastname, d.societe, d.fk_adherent_type as type,";
         $sql .= " c.rowid as crowid, c.subscription,";
         $sql .= " c.datec, c.fk_type as cfk_type,";
@@ -668,8 +609,7 @@ if ($rowid > 0)
 		$sql .= $db->order($sortfield, $sortorder);
 
         $result = $db->query($sql);
-        if ($result)
-        {
+        if ($result) {
             $subscriptionstatic = new Subscription($db);
 
             $num = $db->num_rows($result);
@@ -683,8 +623,7 @@ if ($rowid > 0)
             print_liste_field_titre('DateStart', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
             print_liste_field_titre('DateEnd', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
             print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-            if (!empty($conf->banque->enabled))
-            {
+            if (!empty($conf->banque->enabled)) {
             	print_liste_field_titre('Account', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
             }
             print "</tr>\n";
@@ -694,8 +633,7 @@ if ($rowid > 0)
             $adht = new AdherentType($db);
 
             $i = 0;
-            while ($i < $num)
-            {
+            while ($i < $num) {
                 $objp = $db->fetch_object($result);
 
                 $adh->id = $objp->rowid;
@@ -705,8 +643,7 @@ if ($rowid > 0)
                 $subscriptionstatic->id = $objp->crowid;
 
                 $typeid = ($objp->cfk_type > 0 ? $objp->cfk_type : $adh->typeid);
-                if ($typeid > 0)
-                {
+                if ($typeid > 0) {
                     $adht->fetch($typeid);
                 }
 
@@ -721,19 +658,16 @@ if ($rowid > 0)
                 print '<td class="center">'.dol_print_date($db->jdate($objp->dateh), 'day')."</td>\n";
                 print '<td class="center">'.dol_print_date($db->jdate($objp->datef), 'day')."</td>\n";
                 print '<td class="right">'.price($objp->subscription).'</td>';
-				if (!empty($conf->banque->enabled))
-				{
+				if (!empty($conf->banque->enabled)) {
 					print '<td class="right">';
-					if ($objp->bid)
-					{
+					if ($objp->bid) {
 						$accountstatic->label = $objp->label;
 						$accountstatic->id = $objp->baid;
 						$accountstatic->number = $objp->number;
 						$accountstatic->account_number = $objp->account_number;
 						$accountstatic->currency_code = $objp->currency_code;
 
-						if (!empty($conf->accounting->enabled) && $objp->fk_accountancy_journal > 0)
-						{
+						if (!empty($conf->accounting->enabled) && $objp->fk_accountancy_journal > 0) {
 							$accountingjournal = new AccountingJournal($db);
 							$accountingjournal->fetch($objp->fk_accountancy_journal);
 
@@ -764,13 +698,11 @@ if ($rowid > 0)
     }
 
 
-    if (($action != 'addsubscription' && $action != 'create_thirdparty'))
-    {
+    if (($action != 'addsubscription' && $action != 'create_thirdparty')) {
 	    // Shon online payment link
 	    $useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
 
-	    if ($useonlinepayment)
-	    {
+	    if ($useonlinepayment) {
 	    	print '<br>';
 
 	    	require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
@@ -782,8 +714,7 @@ if ($rowid > 0)
     /*
      * Add new subscription form
      */
-    if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->rights->adherent->cotisation->creer)
-    {
+    if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->rights->adherent->cotisation->creer) {
         print '<br>';
 
         print load_fiche_titre($langs->trans("NewCotisation"));
@@ -792,8 +723,7 @@ if ($rowid > 0)
         $bankdirect = 0; // 1 means option by default is write to bank direct with no invoice
         $invoiceonly = 0; // 1 means option by default is invoice only
         $bankviainvoice = 0; // 1 means option by default is write to bank via invoice
-        if (GETPOST('paymentsave'))
-        {
+        if (GETPOST('paymentsave')) {
         	if (GETPOST('paymentsave') == 'bankdirect')     $bankdirect = 1;
         	if (GETPOST('paymentsave') == 'invoiceonly')    $invoiceonly = 1;
         	if (GETPOST('paymentsave') == 'bankviainvoice') $bankviainvoice = 1;
@@ -805,8 +735,7 @@ if ($rowid > 0)
 
         print "\n\n<!-- Form add subscription -->\n";
 
-        if ($conf->use_javascript_ajax)
-        {
+        if ($conf->use_javascript_ajax) {
         	//var_dump($bankdirect.'-'.$bankviainvoice.'-'.$invoiceonly.'-'.empty($conf->global->ADHERENT_BANK_USE));
             print "\n".'<script type="text/javascript" language="javascript">';
             print '$(document).ready(function () {
@@ -842,13 +771,11 @@ if ($rowid > 0)
 
 
 		// Confirm create third party
-		if ($action == 'create_thirdparty')
-		{
+		if ($action == 'create_thirdparty') {
 			$companyalias = '';
 			$fullname = $object->getFullName($langs);
 
-			if ($object->morphy == 'mor')
-			{
+			if ($object->morphy == 'mor') {
 				$companyname = $object->company;
 				if (!empty($fullname)) $companyalias = $fullname;
 			} else {
@@ -862,8 +789,7 @@ if ($rowid > 0)
 				array('label' => $langs->trans("AliasNames"), 'type' => 'text', 'name' => 'companyalias', 'value' => $companyalias, 'morecss' => 'minwidth300', 'moreattr' => 'maxlength="128"')
 			);
 			// If customer code was forced to "required", we ask it at creation to avoid error later
-			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
-			{
+			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) {
 				$tmpcompany = new Societe($db);
 				$tmpcompany->name = $companyname;
                 $tmpcompany->get_codeclient($tmpcompany, 0);
@@ -901,23 +827,19 @@ if ($rowid > 0)
         $paymentdate = -1;
 
         // Date payment
-        if (GETPOST('paymentyear') && GETPOST('paymentmonth') && GETPOST('paymentday'))
-        {
+        if (GETPOST('paymentyear') && GETPOST('paymentmonth') && GETPOST('paymentday')) {
             $paymentdate = dol_mktime(0, 0, 0, GETPOST('paymentmonth'), GETPOST('paymentday'), GETPOST('paymentyear'));
         }
 
         print '<tr>';
         // Date start subscription
         print '<td class="fieldrequired">'.$langs->trans("DateSubscription").'</td><td>';
-        if (GETPOST('reday'))
-        {
+        if (GETPOST('reday')) {
             $datefrom = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
         }
-        if (!$datefrom)
-        {
+        if (!$datefrom) {
         	$datefrom = $object->datevalid;
-        	if ($object->datefin > 0)
-            {
+        	if ($object->datefin > 0) {
                 $datefrom = dol_time_plus_duree($object->datefin, 1, 'd');
             }
         }
@@ -925,20 +847,17 @@ if ($rowid > 0)
         print "</td></tr>";
 
         // Date end subscription
-        if (GETPOST('endday'))
-        {
+        if (GETPOST('endday')) {
             $dateto = dol_mktime(0, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
         }
-        if (!$dateto)
-        {
+        if (!$dateto) {
             $dateto = -1; // By default, no date is suggested
         }
         print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td>';
         print $form->selectDate($dateto, 'end', '', '', '', "subscription", 1, 0);
         print "</td></tr>";
 
-        if ($adht->subscription)
-        {
+        if ($adht->subscription) {
             // Amount
             print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="subscription" size="6" value="'.GETPOST('subscription').'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
@@ -949,11 +868,9 @@ if ($rowid > 0)
             print '"></td></tr>';
 
             // Complementary action
-            if (!empty($conf->banque->enabled) || !empty($conf->facture->enabled))
-            {
+            if (!empty($conf->banque->enabled) || !empty($conf->facture->enabled)) {
                 $company = new Societe($db);
-                if ($object->fk_soc)
-                {
+                if ($object->fk_soc) {
                     $result = $company->fetch($object->fk_soc);
                 }
 
@@ -966,14 +883,12 @@ if ($rowid > 0)
                 print '<td>';
                 print '<input type="radio" class="moreaction" id="none" name="paymentsave" value="none"'.(empty($bankdirect) && empty($invoiceonly) && empty($bankviainvoice) ? ' checked' : '').'> '.$langs->trans("None").'<br>';
                 // Add entry into bank accoun
-                if (!empty($conf->banque->enabled))
-                {
+                if (!empty($conf->banque->enabled)) {
                     print '<input type="radio" class="moreaction" id="bankdirect" name="paymentsave" value="bankdirect"'.(!empty($bankdirect) ? ' checked' : '');
                     print '> '.$langs->trans("MoreActionBankDirect").'<br>';
                 }
                 // Add invoice with no payments
-                if (!empty($conf->societe->enabled) && !empty($conf->facture->enabled))
-                {
+                if (!empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
                     print '<input type="radio" class="moreaction" id="invoiceonly" name="paymentsave" value="invoiceonly"'.(!empty($invoiceonly) ? ' checked' : '');
                     //if (empty($object->fk_soc)) print ' disabled';
                     print '> '.$langs->trans("MoreActionInvoiceOnly");
@@ -995,8 +910,7 @@ if ($rowid > 0)
                     print '<br>';
                 }
                 // Add invoice with payments
-                if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled))
-                {
+                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"'.(!empty($bankviainvoice) ? ' checked' : '');
                     //if (empty($object->fk_soc)) print ' disabled';
                     print '> '.$langs->trans("MoreActionBankViaInvoice");
@@ -1010,8 +924,7 @@ if ($rowid > 0)
                     	print '</a>)';
                     }
                     if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
-					if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (!empty($conf->product->enabled) || !empty($conf->service->enabled)))
-					{
+					if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
 						$prodtmp = new Product($db);
 						$prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
 						print '. '.$langs->transnoentitiesnoconv("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(1)); // must use noentitiesnoconv to avoid to encode html into getNomUrl of product
@@ -1056,8 +969,7 @@ if ($rowid > 0)
 
         print '<tr><td>'.$langs->trans("SendAcknowledgementByMail").'</td>';
         print '<td>';
-        if (!$object->email)
-        {
+        if (!$object->email) {
             print $langs->trans("NoEMail");
         } else {
             $adht = new AdherentType($db);
@@ -1081,8 +993,7 @@ if ($rowid > 0)
 
             if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-            if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-            {
+            if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
             	$subject = $arraydefaultmessage->topic;
             	$msg     = $arraydefaultmessage->content;
             }
diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index 303a4aa7b5a..b7e54238c4c 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -66,39 +66,33 @@ include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, n
 //include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
 
 
-if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cancel)
-{
+if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cancel) {
 	// Load current object
 	$result = $object->fetch($rowid);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$db->begin();
 
 		$errmsg = '';
 
-		if ($object->fk_bank)
-		{
+		if ($object->fk_bank) {
 			$accountline = new AccountLine($db);
 			$result = $accountline->fetch($object->fk_bank);
 
 			// If transaction consolidated
-			if ($accountline->rappro)
-			{
+			if ($accountline->rappro) {
 				$errmsg = $langs->trans("SubscriptionLinkedToConciliatedTransaction");
 			} else {
 				$accountline->datev = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
 				$accountline->dateo = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
 				$accountline->amount = $_POST["amount"];
 				$result = $accountline->update($user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$errmsg = $accountline->error;
 				}
 			}
 		}
 
-		if (!$errmsg)
-		{
+		if (!$errmsg) {
 			// Modify values
 			$object->dateh = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
 			$object->datef = dol_mktime($_POST['datesubendhour'], $_POST['datesubendmin'], 0, $_POST['datesubendmonth'], $_POST['datesubendday'], $_POST['datesubendyear']);
@@ -108,8 +102,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 			//print 'datef='.$object->datef.' '.$_POST['datesubendday'];
 
 			$result = $object->update($user);
-			if ($result >= 0 && !count($object->errors))
-			{
+			if ($result >= 0 && !count($object->errors)) {
 				$db->commit();
 
 				header("Location: card.php?rowid=".$object->id);
@@ -117,12 +110,10 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 			} else {
 				$db->rollback();
 
-			    if ($object->error)
-				{
+			    if ($object->error) {
 					$errmsg = $object->error;
 				} else {
-					foreach ($object->errors as $error)
-					{
+					foreach ($object->errors as $error) {
 						if ($errmsg) $errmsg .= '<br>';
 						$errmsg .= $error;
 					}
@@ -135,12 +126,10 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 	}
 }
 
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->adherent->cotisation->creer)
-{
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->adherent->cotisation->creer) {
 	$result = $object->fetch($rowid);
     $result = $object->delete($user);
-    if ($result > 0)
-    {
+    if ($result > 0) {
     	header("Location: ".DOL_URL_ROOT."/adherents/card.php?rowid=".$object->fk_adherent);
     	exit;
     } else {
@@ -163,8 +152,7 @@ llxHeader('', $langs->trans("SubscriptionCard"), 'EN:Module_Foundations|FR:Modul
 dol_htmloutput_errors($errmsg);
 
 
-if ($user->rights->adherent->cotisation->creer && $action == 'edit')
-{
+if ($user->rights->adherent->cotisation->creer && $action == 'edit') {
 	/********************************************
 	 *
 	 * Subscription card in edit mode
@@ -228,13 +216,10 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit')
 	print '<input type="text" class="flat" size="60" name="note" value="'.$object->note.'"></td></tr>';
 
 	// Bank line
-	if (!empty($conf->banque->enabled))
-	{
-		if ($conf->global->ADHERENT_BANK_USE || $object->fk_bank)
-		{
+	if (!empty($conf->banque->enabled)) {
+		if ($conf->global->ADHERENT_BANK_USE || $object->fk_bank) {
 			print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur" colspan="2">';
-			if ($object->fk_bank)
-			{
+			if ($object->fk_bank) {
 				$bankline = new AccountLine($db);
 				$result = $bankline->fetch($object->fk_bank);
 				print $bankline->getNomUrl(1, 0, 'showall');
@@ -259,8 +244,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit')
 	print "\n";
 }
 
-if ($rowid && $action != 'edit')
-{
+if ($rowid && $action != 'edit') {
 	/********************************************
 	 *
 	 * Subscription card in view mode
@@ -275,8 +259,7 @@ if ($rowid && $action != 'edit')
 	dol_fiche_head($head, 'general', $langs->trans("Subscription"), -1, 'payment');
 
     // Confirmation to delete subscription
-    if ($action == 'delete')
-    {
+    if ($action == 'delete') {
 		//$formquestion=array();
         //$formquestion['text']='<b>'.$langs->trans("ThisWillAlsoDeleteBankRecord").'</b>';
 		$text = $langs->trans("ConfirmDeleteSubscription");
@@ -333,13 +316,10 @@ if ($rowid && $action != 'edit')
     print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur">'.$object->note.'</td></tr>';
 
 	// Bank line
-	if (!empty($conf->banque->enabled))
-	{
-		if ($conf->global->ADHERENT_BANK_USE || $object->fk_bank)
-		{
+	if (!empty($conf->banque->enabled)) {
+		if ($conf->global->ADHERENT_BANK_USE || $object->fk_bank) {
 			print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur">';
-			if ($object->fk_bank)
-			{
+			if ($object->fk_bank) {
 				$bankline = new AccountLine($db);
 				$result = $bankline->fetch($object->fk_bank);
 				print $bankline->getNomUrl(1, 0, 'showall');
@@ -363,10 +343,8 @@ if ($rowid && $action != 'edit')
      */
     print '<div class="tabsAction">';
 
-    if ($user->rights->adherent->cotisation->creer)
-	{
-		if (!$bankline->rappro)
-		{
+    if ($user->rights->adherent->cotisation->creer) {
+		if (!$bankline->rappro) {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id."&action=edit\">".$langs->trans("Modify")."</a></div>";
 		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.$langs->trans("BankLineConciliated")."\" href=\"#\">".$langs->trans("Modify")."</a></div>";
@@ -374,8 +352,7 @@ if ($rowid && $action != 'edit')
 	}
 
     // Delete
-    if ($user->rights->adherent->cotisation->creer)
-    {
+    if ($user->rights->adherent->cotisation->creer) {
         print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id."&action=delete\">".$langs->trans("Delete")."</a></div>\n";
     }
 
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index d2fd59b8ce5..509f00d2705 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -110,15 +110,13 @@ $parameters = array('socid'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
     // Selection of new fields
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
     // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-	    $search_type = "";
+    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		$search_type = "";
 	    $search_ref = "";
 	    $search_lastname = "";
 	    $search_firstname = "";
@@ -153,13 +151,11 @@ $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription a
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON c.fk_bank=b.rowid";
 $sql .= " WHERE d.rowid = c.fk_adherent";
 $sql .= " AND d.entity IN (".getEntity('adherent').")";
-if (isset($date_select) && $date_select != '')
-{
+if (isset($date_select) && $date_select != '') {
     $sql .= " AND c.dateadh >= '".$date_select."-01-01 00:00:00'";
     $sql .= " AND c.dateadh < '".($date_select + 1)."-01-01 00:00:00'";
 }
-if ($search_ref)
-{
+if ($search_ref) {
 	if (is_numeric($search_ref)) $sql .= " AND (c.rowid = ".$db->escape($search_ref).")";
 	else $sql .= " AND 1 = 2"; // Always wrong
 }
@@ -183,14 +179,12 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records with no order and no limits
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
     $resql = $db->query($sql);
     if ($resql) $nbtotalofrecords = $db->num_rows($resql);
     else dol_print_error($db);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
+    if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		$page = 0;
     	$offset = 0;
     }
 }
@@ -198,8 +192,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql .= $db->plimit($limit + 1, $offset);
 
 $result = $db->query($sql);
-if (!$result)
-{
+if (!$result) {
 	dol_print_error($db);
 	exit;
 }
@@ -208,8 +201,7 @@ $num = $db->num_rows($result);
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
-{
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/adherents/subscription/card.php?id='.$id);
@@ -247,8 +239,7 @@ if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions =
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = '';
-if ($user->rights->adherent->cotisation->creer)
-{
+if ($user->rights->adherent->cotisation->creer) {
     $newcardbutton .= dolGetButtonTitle($langs->trans('NewSubscription'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/list.php?status=-1,1');
 }
 
@@ -269,8 +260,7 @@ $objecttmp = new Subscription($db);
 $trackid = 'sub'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-if ($sall)
-{
+if ($sall) {
 	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
@@ -289,70 +279,59 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 print '<tr class="liste_titre_filter">';
 
 // Line numbering
-if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-{
+if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 
 // Ref
-if (!empty($arrayfields['d.ref']['checked']))
-{
+if (!empty($arrayfields['d.ref']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
 }
 
 // Type
-if (!empty($arrayfields['d.fk_type']['checked']))
-{
+if (!empty($arrayfields['d.fk_type']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth50" type="text" name="search_type" value="'.dol_escape_htmltag($search_type).'">';
 	print'</td>';
 }
 
-if (!empty($arrayfields['d.lastname']['checked']))
-{
+if (!empty($arrayfields['d.lastname']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75" type="text" name="search_lastname" value="'.dol_escape_htmltag($search_lastname).'"></td>';
 }
 
-if (!empty($arrayfields['d.firstname']['checked']))
-{
+if (!empty($arrayfields['d.firstname']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75" type="text" name="search_firstname" value="'.dol_escape_htmltag($search_firstname).'"></td>';
 }
 
-if (!empty($arrayfields['d.login']['checked']))
-{
+if (!empty($arrayfields['d.login']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'"></td>';
 }
 
-if (!empty($arrayfields['t.libelle']['checked']))
-{
+if (!empty($arrayfields['t.libelle']['checked'])) {
 	print '<td class="liste_titre">';
 	print '';
 	print '</td>';
 }
 
-if (!empty($arrayfields['d.bank']['checked']))
-{
+if (!empty($arrayfields['d.bank']['checked'])) {
 	print '<td class="liste_titre">';
 	$form->select_comptes($search_account, 'search_account', 0, '', 1, '', 0, 'maxwidth150');
 	print '</td>';
 }
 
-if (!empty($arrayfields['c.dateadh']['checked']))
-{
+if (!empty($arrayfields['c.dateadh']['checked'])) {
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 
-if (!empty($arrayfields['c.datef']['checked']))
-{
+if (!empty($arrayfields['c.datef']['checked'])) {
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 
-if (!empty($arrayfields['d.amount']['checked']))
-{
+if (!empty($arrayfields['d.amount']['checked'])) {
 	print '<td class="liste_titre right">';
 	print '<input class="flat" type="text" name="search_amount" value="'.dol_escape_htmltag($search_amount).'" size="4">';
 	print '</td>';
@@ -365,14 +344,12 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
-if (!empty($arrayfields['c.datec']['checked']))
-{
+if (!empty($arrayfields['c.datec']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Date modification
-if (!empty($arrayfields['c.tms']['checked']))
-{
+if (!empty($arrayfields['c.tms']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
@@ -412,8 +389,7 @@ print "</tr>\n";
 
 
 $totalarray = array();
-while ($i < min($num, $limit))
-{
+while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($result);
 
 	$subscription->ref = $obj->crowid;
@@ -435,17 +411,14 @@ while ($i < min($num, $limit))
 	print '<tr class="oddeven">';
 
 	// Ref
-	if (!empty($arrayfields['d.ref']['checked']))
-	{
+	if (!empty($arrayfields['d.ref']['checked'])) {
 		print '<td>'.$subscription->getNomUrl(1).'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
     // Type
-    if (!empty($arrayfields['d.fk_type']['checked']))
-	{
+    if (!empty($arrayfields['d.fk_type']['checked'])) {
         print '<td class="nowraponall">';
-        if ($typeid > 0)
-        {
+        if ($typeid > 0) {
         	print $adht->getNomUrl(1);
         }
         print '</td>';
@@ -453,30 +426,26 @@ while ($i < min($num, $limit))
 	}
 
 	// Lastname
-	if (!empty($arrayfields['d.lastname']['checked']))
-	{
+	if (!empty($arrayfields['d.lastname']['checked'])) {
 		$adherent->firstname = '';
 		print '<td>'.$adherent->getNomUrl(-1).'</td>';
 		$adherent->firstname = $obj->firstname;
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Firstname
-	if (!empty($arrayfields['d.firstname']['checked']))
-	{
+	if (!empty($arrayfields['d.firstname']['checked'])) {
 		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($adherent->firstname).'">'.$adherent->firstname.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Login
-	if (!empty($arrayfields['d.login']['checked']))
-	{
+	if (!empty($arrayfields['d.login']['checked'])) {
 		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($adherent->login).'">'.$adherent->login.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Label
-	if (!empty($arrayfields['t.libelle']['checked']))
-	{
+	if (!empty($arrayfields['t.libelle']['checked'])) {
 		print '<td>';
 		print dol_trunc($obj->note, 128);
 		print '</td>';
@@ -484,11 +453,9 @@ while ($i < min($num, $limit))
 	}
 
 	// Banque
-	if (!empty($arrayfields['d.bank']['checked']))
-	{
+	if (!empty($arrayfields['d.bank']['checked'])) {
 		print '<td class="tdmaxoverflow150">';
-		if ($obj->fk_account > 0)
-		{
+		if ($obj->fk_account > 0) {
 			$accountstatic->id = $obj->fk_account;
 			$accountstatic->fetch($obj->fk_account);
 			//$accountstatic->label=$obj->label;
@@ -499,20 +466,17 @@ while ($i < min($num, $limit))
 	}
 
 	// Date start
-	if (!empty($arrayfields['c.dateadh']['checked']))
-	{
+	if (!empty($arrayfields['c.dateadh']['checked'])) {
 		print '<td class="center">'.dol_print_date($db->jdate($obj->dateadh), 'day')."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Date end
-	if (!empty($arrayfields['c.datef']['checked']))
-	{
+	if (!empty($arrayfields['c.datef']['checked'])) {
 		print '<td class="center">'.dol_print_date($db->jdate($obj->datef), 'day')."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Price
-	if (!empty($arrayfields['d.amount']['checked']))
-	{
+	if (!empty($arrayfields['d.amount']['checked'])) {
 		print '<td class="right">'.price($obj->subscription).'</td>';
 		if (!$i) $totalarray['nbfield']++;
 		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'd.amount';
@@ -525,16 +489,14 @@ while ($i < min($num, $limit))
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (!empty($arrayfields['c.datec']['checked']))
-	{
+	if (!empty($arrayfields['c.datec']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Date modification
-	if (!empty($arrayfields['c.tms']['checked']))
-	{
+	if (!empty($arrayfields['c.tms']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 		print '</td>';
@@ -542,8 +504,7 @@ while ($i < min($num, $limit))
 	}
 	// Action column
 	print '<td class="center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-	{
+	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 		$selected = 0;
 		if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
 		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
@@ -560,8 +521,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 
 // If no record found
-if ($num == 0)
-{
+if ($num == 0) {
 	$colspan = 1;
 	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
index 16b600bfeeb..136c1dab8f4 100644
--- a/htdocs/adherents/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
@@ -18,8 +18,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -33,8 +32,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 $langs->load("members");
 
 $total = 0;
-foreach ($linkedObjectBlock as $key => $objectlink)
-{
+foreach ($linkedObjectBlock as $key => $objectlink) {
     echo '<tr class="oddeven">';
     echo '<td>'.$langs->trans("Subscription").'</td>';
     echo '<td>'.$objectlink->getNomUrl(1).'</td>';
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 5f89f06b22f..534e7c2896c 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -79,9 +79,8 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-{
-    $search_lastname = "";
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+	$search_lastname = "";
     $search_login = "";
     $search_email = "";
     $type = "";
@@ -138,11 +137,9 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$id = $object->create($user);
-		if ($id > 0)
-		{
+		if ($id > 0) {
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
 		}
@@ -156,8 +153,7 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 	}
 }
 
-if ($action == 'update' && $user->rights->adherent->configurer)
-{
+if ($action == 'update' && $user->rights->adherent->configurer) {
 	$object->fetch($rowid);
 
 	$object->oldcopy = clone $object;
@@ -178,8 +174,7 @@ if ($action == 'update' && $user->rights->adherent->configurer)
 
 	$ret = $object->update($user);
 
-	if ($ret >= 0 && !count($object->errors))
-	{
+	if ($ret >= 0 && !count($object->errors)) {
 		setEventMessages($langs->trans("MemberTypeModified"), null, 'mesgs');
 	}
 	else {
@@ -190,13 +185,11 @@ if ($action == 'update' && $user->rights->adherent->configurer)
 	exit;
 }
 
-if ($action == 'confirm_delete' && $user->rights->adherent->configurer)
-{
+if ($action == 'confirm_delete' && $user->rights->adherent->configurer) {
 	$object->fetch($rowid);
 	$res = $object->delete();
 
-	if ($res > 0)
-	{
+	if ($res > 0) {
 		setEventMessages($langs->trans("MemberTypeDeleted"), null, 'mesgs');
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
@@ -219,8 +212,7 @@ llxHeader('', $langs->trans("MembersTypeSetup"), 'EN:Module_Foundations|FR:Modul
 
 
 // List of members type
-if (!$rowid && $action != 'create' && $action != 'edit')
-{
+if (!$rowid && $action != 'create' && $action != 'edit') {
 	//dol_fiche_head('');
 
 	$sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.vote, d.statut as status, d.morphy";
@@ -228,8 +220,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 	$sql .= " WHERE d.entity IN (".getEntity('member_type').")";
 
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
 		$nbtotalofrecords = $num;
 
@@ -317,8 +308,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 /* Creation mode                                                              */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'create')
-{
+if ($action == 'create') {
 	$object = new AdherentType($db);
 
 	print load_fiche_titre($langs->trans("NewMemberType"), '', 'members');
@@ -393,10 +383,8 @@ if ($action == 'create')
 /* View mode                                                                  */
 /*                                                                            */
 /* ************************************************************************** */
-if ($rowid > 0)
-{
-	if ($action != 'edit')
-	{
+if ($rowid > 0) {
+	if ($action != 'edit') {
 		$object = new AdherentType($db);
 		$object->fetch($rowid);
 		$object->fetch_optionals();
@@ -404,8 +392,7 @@ if ($rowid > 0)
 		/*
 		 * Confirmation deletion
 		 */
-		if ($action == 'delete')
-		{
+		if ($action == 'delete') {
 			print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".$object->id, $langs->trans("DeleteAMemberType"), $langs->trans("ConfirmDeleteMemberType", $object->label), "confirm_delete", '', 0, 1);
 		}
 
@@ -435,12 +422,10 @@ if ($rowid > 0)
 		print '</tr>';
 
 		print '<tr><td class="titlefield">'.$langs->trans("Duration").'</td><td colspan="2">'.$object->duration_value.'&nbsp;';
-		if ($object->duration_value > 1)
-		{
+		if ($object->duration_value > 1) {
 			$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
 		}
-		elseif ($object->duration_value > 0)
-		{
+		elseif ($object->duration_value > 0) {
 			$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
 		}
 		print (!empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')."&nbsp;";
@@ -467,22 +452,19 @@ if ($rowid > 0)
 		print '<div class="tabsAction">';
 
 		// Edit
-		if ($user->rights->adherent->configurer)
-		{
+		if ($user->rights->adherent->configurer) {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;rowid='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
 		}
 
 		// Add
-        if ($user->rights->adherent->configurer && !empty($object->statut))
-		{
+        if ($user->rights->adherent->configurer && !empty($object->statut)) {
             print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=create&typeid='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?rowid='.$object->id).'">'.$langs->trans("AddMember").'</a></div>';
         } else {
 		    print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoAddMember")).'">'.$langs->trans("AddMember").'</a></div>';
         }
 
 		// Delete
-		if ($user->rights->adherent->configurer)
-		{
+		if ($user->rights->adherent->configurer) {
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&rowid='.$object->id.'">'.$langs->trans("DeleteType").'</a></div>';
 		}
 
@@ -503,39 +485,30 @@ if ($rowid > 0)
 		$sql .= " WHERE d.fk_adherent_type = t.rowid ";
 		$sql .= " AND d.entity IN (".getEntity('adherent').")";
 		$sql .= " AND t.rowid = ".$object->id;
-		if ($sall)
-		{
+		if ($sall) {
 			$sql .= natural_search(array("f.firstname", "d.lastname", "d.societe", "d.email", "d.login", "d.address", "d.town", "d.note_public", "d.note_private"), $sall);
 		}
-		if ($status != '')
-		{
+		if ($status != '') {
 		    $sql .= natural_search('d.statut', $status, 2);
 		}
-		if ($action == 'search')
-		{
-			if (GETPOST('search', 'alpha'))
-			{
+		if ($action == 'search') {
+			if (GETPOST('search', 'alpha')) {
 		  		$sql .= natural_search(array("d.firstname", "d.lastname"), GETPOST('search', 'alpha'));
 		  	}
 		}
-		if (!empty($search_lastname))
-		{
+		if (!empty($search_lastname)) {
 			$sql .= natural_search(array("d.firstname", "d.lastname"), $search_lastname);
 		}
-		if (!empty($search_login))
-		{
+		if (!empty($search_login)) {
 			$sql .= natural_search("d.login", $search_login);
 		}
-		if (!empty($search_email))
-		{
+		if (!empty($search_email)) {
 			$sql .= natural_search("d.email", $search_email);
 		}
-        if ($filter == 'uptodate')
-        {
+        if ($filter == 'uptodate') {
             $sql .= " AND (datefin >= '".$db->idate($now)."') OR t.subscription = 0)";
         }
-        if ($filter == 'outofdate')
-        {
+        if ($filter == 'outofdate') {
             $sql .= " AND (datefin < '".$db->idate($now)."' AND t.subscription = 1)";
         }
 
@@ -543,14 +516,12 @@ if ($rowid > 0)
 
 		// Count total nb of records
 		$nbtotalofrecords = '';
-		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-		{
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 			$resql = $db->query($sql);
 		    if ($resql) $nbtotalofrecords = $db->num_rows($result);
 		    else dol_print_error($db);
-		    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-		    {
-		    	$page = 0;
+		    if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+				$page = 0;
 		    	$offset = 0;
 		    }
 		}
@@ -558,14 +529,12 @@ if ($rowid > 0)
 		$sql .= " ".$db->plimit($conf->liste_limit + 1, $offset);
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 		    $num = $db->num_rows($resql);
 		    $i = 0;
 
 		    $titre = $langs->trans("MembersList");
-		    if ($status != '')
-		    {
+		    if ($status != '') {
 		        if ($status == '-1,1') { $titre = $langs->trans("MembersListQualified"); }
 		        elseif ($status == '-1') { $titre = $langs->trans("MembersListToValid"); }
 		        elseif ($status == '1' && !$filter) { $titre = $langs->trans("MembersListValid"); }
@@ -573,13 +542,11 @@ if ($rowid > 0)
 		        elseif ($status == '1' && $filter == 'outofdate') { $titre = $langs->trans("MembersListNotUpToDate"); }
 		        elseif ($status == '0') { $titre = $langs->trans("MembersListResiliated"); }
 		    }
-		    elseif ($action == 'search')
-		    {
+		    elseif ($action == 'search') {
 		        $titre = $langs->trans("MembersListQualified");
 		    }
 
-		    if ($type > 0)
-		    {
+		    if ($type > 0) {
 				$membertype = new AdherentType($db);
 		        $result = $membertype->fetch($type);
 				$titre .= " (".$membertype->label.")";
@@ -593,8 +560,7 @@ if ($rowid > 0)
 		    if (!empty($search_email))		$param .= "&search_email=".$search_email;
 		    if (!empty($filter))			$param .= "&filter=".$filter;
 
-		    if ($sall)
-		    {
+		    if ($sall) {
 		        print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname").", ".$langs->trans("EMail").", ".$langs->trans("Address")." ".$langs->trans("or")." ".$langs->trans("Town")."): ".$sall;
 		    }
 
@@ -644,8 +610,7 @@ if ($rowid > 0)
 		    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
 		    print "</tr>\n";
 
-		    while ($i < $num && $i < $conf->liste_limit)
-		    {
+		    while ($i < $num && $i < $conf->liste_limit) {
 		        $objp = $db->fetch_object($resql);
 
 		        $datefin = $db->jdate($objp->datefin);
@@ -656,8 +621,7 @@ if ($rowid > 0)
 
 		        // Lastname
 		        print '<tr class="oddeven">';
-		        if ($objp->company != '')
-		        {
+		        if ($objp->company != '') {
 		            print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"), "user").' '.$adh->getFullName($langs, 0, -1, 20).' / '.dol_trunc($objp->societe, 12).'</a></td>'."\n";
 		        }
 		        else {
@@ -687,11 +651,9 @@ if ($rowid > 0)
 		        print "</td>";
 
 		        // Date end subscription
-		        if ($datefin)
-		        {
+		        if ($datefin) {
 			        print '<td class="nowrap center">';
-		            if ($datefin < dol_now() && $objp->statut > 0)
-		            {
+		            if ($datefin < dol_now() && $objp->statut > 0) {
 		                print dol_print_date($datefin, 'day')." ".img_warning($langs->trans("SubscriptionLate"));
 		            }
 		            else {
@@ -701,8 +663,7 @@ if ($rowid > 0)
 		        }
 		        else {
 			        print '<td class="nowrap left">';
-			        if ($objp->subscription == 'yes')
-			        {
+			        if ($objp->subscription == 'yes') {
 		                print $langs->trans("SubscriptionNotReceived");
 		                if ($objp->statut > 0) print " ".img_warning();
 			        }
@@ -714,13 +675,11 @@ if ($rowid > 0)
 
 		        // Actions
 		        print '<td class="center">';
-				if ($user->rights->adherent->creer)
-				{
+				if ($user->rights->adherent->creer) {
 					print '<a class="editfielda" href="card.php?rowid='.$objp->rowid.'&action=edit&backtopage='.urlencode($_SERVER["PHP_SELF"].'?rowid='.$object->id).'">'.img_edit().'</a>';
 				}
 				print '&nbsp;';
-				if ($user->rights->adherent->supprimer)
-				{
+				if ($user->rights->adherent->supprimer) {
 					print '<a href="card.php?rowid='.$objp->rowid.'&action=resign">'.img_picto($langs->trans("Resiliate"), 'disable.png').'</a>';
 		        }
 				print "</td>";
@@ -733,8 +692,7 @@ if ($rowid > 0)
             print '</div>';
             print '</form>';
 
-			if ($num > $conf->liste_limit)
-			{
+			if ($num > $conf->liste_limit) {
 			    print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
 			}
 		}
@@ -749,8 +707,7 @@ if ($rowid > 0)
 	/*                                                                            */
 	/* ************************************************************************** */
 
-	if ($action == 'edit')
-	{
+	if ($action == 'edit') {
 		$object = new AdherentType($db);
 		$object->fetch($rowid);
 		$object->fetch_optionals();
diff --git a/htdocs/adherents/type_ldap.php b/htdocs/adherents/type_ldap.php
index 9e52f05739e..47dcacf1d6a 100644
--- a/htdocs/adherents/type_ldap.php
+++ b/htdocs/adherents/type_ldap.php
@@ -53,15 +53,12 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook))
-{
-	if ($action == 'dolibarr2ldap')
-	{
+if (empty($reshook)) {
+	if ($action == 'dolibarr2ldap') {
 		$ldap = new Ldap();
 		$result = $ldap->connect_bind();
 
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$object->listMembersForMemberType('', 1);
 
 			$info = $object->_load_ldap_info();
@@ -126,8 +123,7 @@ dol_fiche_end();
 
 print '<div class="tabsAction">';
 
-if ($conf->global->LDAP_MEMBER_TYPE_ACTIVE == 1)
-{
+if ($conf->global->LDAP_MEMBER_TYPE_ACTIVE == 1) {
     print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
 }
 
@@ -150,8 +146,7 @@ print '</tr>';
 // LDAP reading
 $ldap = new Ldap();
 $result = $ldap->connect_bind();
-if ($result > 0)
-{
+if ($result > 0) {
     $info = $object->_load_ldap_info();
     $dn = $object->_load_ldap_dn($info, 1);
     $search = "(".$object->_load_ldap_dn($info, 2).")";
@@ -161,10 +156,8 @@ if ($result > 0)
     //print_r($records);
 
     // Show tree
-    if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0))
-    {
-        if (!is_array($records))
-        {
+    if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
+        if (!is_array($records)) {
             print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
         }
         else {
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index 0e81240a020..1e1d06f85b8 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -51,28 +51,24 @@ $result = restrictedArea($user, 'adherent', $id, 'adherent_type');
  */
 
 // return to translation display if cancellation
-if ($cancel == $langs->trans("Cancel"))
-{
+if ($cancel == $langs->trans("Cancel")) {
 	$action = '';
 }
 
-if ($action == 'delete' && GETPOST('langtodelete', 'alpha'))
-{
+if ($action == 'delete' && GETPOST('langtodelete', 'alpha')) {
 	$object = new AdherentType($db);
 	$object->fetch($id);
 	$object->delMultiLangs(GETPOST('langtodelete', 'alpha'), $user);
 }
 
 // Add translation
-if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer)
-{
+if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer) {
 	$object = new AdherentType($db);
 	$object->fetch($id);
 	$current_lang = $langs->getDefaultLang();
 
 	// update of object
-	if ($_POST["forcelangprod"] == $current_lang)
-	{
+	if ($_POST["forcelangprod"] == $current_lang) {
 		$object->label			= $_POST["libelle"];
 		$object->description = dol_htmlcleanlastbr($_POST["desc"]);
 		$object->other			= dol_htmlcleanlastbr($_POST["other"]);
@@ -84,8 +80,7 @@ if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->ad
 	}
 
 	// backup into database
-	if ($object->setMultiLangs($user) > 0)
-	{
+	if ($object->setMultiLangs($user) > 0) {
 		$action = '';
 	}
 	else {
@@ -95,16 +90,13 @@ if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->ad
 }
 
 // Edit translation
-if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer)
-{
+if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer) {
 	$object = new AdherentType($db);
 	$object->fetch($id);
 	$current_lang = $langs->getDefaultLang();
 
-	foreach ($object->multilangs as $key => $value) // saving new values in the object
-	{
-		if ($key == $current_lang)
-		{
+	foreach ($object->multilangs as $key => $value) { // saving new values in the object
+		if ($key == $current_lang) {
 			$object->label			= $_POST["libelle-".$key];
 			$object->description = dol_htmlcleanlastbr($_POST["desc-".$key]);
 			$object->other			= dol_htmlcleanlastbr($_POST["other-".$key]);
@@ -116,8 +108,7 @@ if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && $user->rights->a
 		}
 	}
 
-	if ($object->setMultiLangs($user) > 0)
-	{
+	if ($object->setMultiLangs($user) > 0) {
 		$action = '';
 	}
 	else {
@@ -127,15 +118,13 @@ if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && $user->rights->a
 }
 
 // Delete translation
-if ($action == 'vdelete' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer)
-{
+if ($action == 'vdelete' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer) {
 	$object = new AdherentType($db);
 	$object->fetch($id);
 	$langtodelete = GETPOST('langdel', 'alpha');
 
 
-	if ($object->delMultiLangs($langtodelete, $user) > 0)
-	{
+	if ($object->delMultiLangs($langtodelete, $user) > 0) {
 		$action = '';
 	}
 	else {
@@ -169,10 +158,8 @@ $titre = $langs->trans("MemberType".$object->type);
 
 // Calculate $cnt_trans
 $cnt_trans = 0;
-if (!empty($object->multilangs))
-{
-    foreach ($object->multilangs as $key => $value)
-    {
+if (!empty($object->multilangs)) {
+    foreach ($object->multilangs as $key => $value) {
         $cnt_trans++;
     }
 }
@@ -196,10 +183,8 @@ dol_fiche_end();
 
 print "\n<div class=\"tabsAction\">\n";
 
-if ($action == '')
-{
-    if ($user->rights->produit->creer || $user->rights->service->creer)
-    {
+if ($action == '') {
+    if ($user->rights->produit->creer || $user->rights->service->creer) {
         print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=add&rowid='.$object->id.'">'.$langs->trans("Add").'</a>';
         if ($cnt_trans > 0) print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=edit&rowid='.$object->id.'">'.$langs->trans("Update").'</a>';
     }
@@ -209,8 +194,7 @@ print "\n</div>\n";
 
 
 
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	//WYSIWYG Editor
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
@@ -219,10 +203,8 @@ if ($action == 'edit')
 	print '<input type="hidden" name="action" value="vedit">';
 	print '<input type="hidden" name="rowid" value="'.$object->id.'">';
 
-	if (!empty($object->multilangs))
-	{
-		foreach ($object->multilangs as $key => $value)
-		{
+	if (!empty($object->multilangs)) {
+		foreach ($object->multilangs as $key => $value) {
 			$s = picto_from_langcode($key);
 			print "<br>".($s ? $s.' ' : '')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=delete&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"')."</a><br>";
 
@@ -248,12 +230,9 @@ if ($action == 'edit')
 
 	print '</form>';
 }
-elseif ($action != 'add')
-{
-	if (!empty($object->multilangs))
-	{
-		foreach ($object->multilangs as $key => $value)
-		{
+elseif ($action != 'add') {
+	if (!empty($object->multilangs)) {
+		foreach ($object->multilangs as $key => $value) {
 			$s = picto_from_langcode($key);
 			print ($s ? $s.' ' : '')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=delete&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"').'</a>';
 
@@ -275,8 +254,7 @@ elseif ($action != 'add')
  * Form to add a new translation
  */
 
-if ($action == 'add' && $user->rights->adherent->configurer)
-{
+if ($action == 'add' && $user->rights->adherent->configurer) {
 	//WYSIWYG Editor
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index 280780f8f25..0a6f39c777b 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -635,8 +635,7 @@ class Hook extends CommonObject
         // phpcs:enable
     	global $langs;
 
-    	if (empty($this->labelStatus) || empty($this->labelStatusShort))
-    	{
+    	if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
     		global $langs;
     		//$langs->load("mymodule");
     		$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
diff --git a/htdocs/zapier/hook_agenda.php b/htdocs/zapier/hook_agenda.php
index b036057cb04..a9b44fbd089 100644
--- a/htdocs/zapier/hook_agenda.php
+++ b/htdocs/zapier/hook_agenda.php
@@ -41,8 +41,7 @@ $action = GETPOST('action', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-if (GETPOST('actioncode', 'array'))
-{
+if (GETPOST('actioncode', 'array')) {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
 } else {
@@ -89,19 +88,16 @@ $parameters = array('id'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
     // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
+    if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
         header("Location: ".$backtopage);
         exit;
     }
 
     // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $actioncode = '';
+    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		$actioncode = '';
         $search_agenda_label = '';
     }
 }
@@ -116,8 +112,7 @@ $contactstatic = new Contact($db);
 
 $form = new Form($db);
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
 	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = '';
@@ -197,8 +192,7 @@ if ($object->id > 0)
 
     $out = '';
     $permok = $user->rights->agenda->myactions->create;
-    if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
-    {
+    if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
         //$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
         if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id;
         $out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
@@ -210,10 +204,8 @@ if ($object->id > 0)
 
 	print '<div class="tabsAction">';
 
-    if (!empty($conf->agenda->enabled))
-    {
-    	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
-    	{
+    if (!empty($conf->agenda->enabled)) {
+    	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
         	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
     	} else {
         	print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
@@ -222,8 +214,7 @@ if ($object->id > 0)
 
     print '</div>';
 
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-    {
+    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
         $param = '&socid='.$socid;
         if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
         if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
diff --git a/htdocs/zapier/hook_card.php b/htdocs/zapier/hook_card.php
index 660e972cf28..c6cfda9f539 100644
--- a/htdocs/zapier/hook_card.php
+++ b/htdocs/zapier/hook_card.php
@@ -55,8 +55,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 // Initialize array of search criterias
 $search_all = trim(GETPOST("search_all", 'alpha'));
 $search = array();
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
 }
 
@@ -82,8 +81,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
     $error = 0;
 
     $permissiontoadd = $user->rights->mymodule->write;
@@ -142,8 +140,7 @@ jQuery(document).ready(function() {
 
 
 // Part to create
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("MyObject")));
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -175,8 +172,7 @@ if ($action == 'create')
 }
 
 // Part to edit record
-if (($id || $ref) && $action == 'edit')
-{
+if (($id || $ref) && $action == 'edit') {
 	print load_fiche_titre($langs->trans("MyObject"));
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -207,8 +203,7 @@ if (($id || $ref) && $action == 'edit')
 }
 
 // Part to show record
-if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
-{
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
     $res = $object->fetch_optionals();
 
 	$head = myobjectPrepareHead($object);
@@ -217,8 +212,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$formconfirm = '';
 
 	// Confirmation to delete
-	if ($action == 'delete')
-	{
+	if ($action == 'delete') {
 	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMyObject'), $langs->trans('ConfirmDeleteMyObject'), 'confirm_delete', '', 0, 1);
 	}
 
@@ -230,8 +224,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	// Confirmation of action xxxx
-	if ($action == 'xxx')
-	{
+	if ($action == 'xxx') {
 		$formquestion = array();
 	    /*
 		$forcecombo=0;
@@ -332,19 +325,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
     	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-    	if (empty($reshook))
-    	{
+    	if (empty($reshook)) {
             // Modify
-    		if ($user->rights->mymodule->write)
-    		{
+    		if ($user->rights->mymodule->write) {
     			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
     		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
     		}
 
     		// Clone
-    		if ($user->rights->mymodule->write)
-    		{
+    		if ($user->rights->mymodule->write) {
     			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a></div>';
     		}
 
@@ -362,8 +352,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		}
     		*/
 
-    		if ($user->rights->mymodule->delete)
-    		{
+    		if ($user->rights->mymodule->delete) {
     			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
     		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
@@ -378,8 +367,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$action = 'presend';
 	}
 
-	if ($action != 'presend')
-	{
+	if ($action != 'presend') {
 	    print '<div class="fichecenter"><div class="fichehalfleft">';
 	    print '<a name="builddoc"></a>'; // ancre
 
diff --git a/htdocs/zapier/hook_document.php b/htdocs/zapier/hook_document.php
index 4c390a118e2..9b43ded60c8 100644
--- a/htdocs/zapier/hook_document.php
+++ b/htdocs/zapier/hook_document.php
@@ -92,8 +92,7 @@ $help_url = '';
 //$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
-if ($object->id)
-{
+if ($object->id) {
 	/*
 	 * Show tabs
 	 */
@@ -105,8 +104,7 @@ if ($object->id)
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
diff --git a/htdocs/zapier/hook_list.php b/htdocs/zapier/hook_list.php
index 8be913c5a8c..228d26232e8 100644
--- a/htdocs/zapier/hook_list.php
+++ b/htdocs/zapier/hook_list.php
@@ -509,8 +509,7 @@ while ($i < min($num, $limit)) {
             else print $object->showOutputField($val, $key, $obj->$key, '');
             print '</td>';
             if (!$i) $totalarray['nbfield']++;
-            if (!empty($val['isameasure']))
-            {
+            if (!empty($val['isameasure'])) {
                 if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
                 $totalarray['val']['t.'.$key] += $obj->$key;
             }
diff --git a/htdocs/zapier/hook_note.php b/htdocs/zapier/hook_note.php
index af96dfce98c..151c762be56 100644
--- a/htdocs/zapier/hook_note.php
+++ b/htdocs/zapier/hook_note.php
@@ -77,8 +77,7 @@ $form = new Form($db);
 $help_url = '';
 llxHeader('', $langs->trans('MyObject'), $help_url);
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object->fetch_thirdparty();
 
 	$head = myobjectPrepareHead($object);
diff --git a/htdocs/zapier/lib/zapier_hook.lib.php b/htdocs/zapier/lib/zapier_hook.lib.php
index 9416936e261..114e7753512 100644
--- a/htdocs/zapier/lib/zapier_hook.lib.php
+++ b/htdocs/zapier/lib/zapier_hook.lib.php
@@ -41,8 +41,7 @@ function myobjectPrepareHead($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (isset($object->fields['note_public']) || isset($object->fields['note_private']))
-	{
+	if (isset($object->fields['note_public']) || isset($object->fields['note_private'])) {
 		$nbNote = 0;
 		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
diff --git a/htdocs/zapier/zapierindex.php b/htdocs/zapier/zapierindex.php
index 6986bc8588d..760bd85322a 100644
--- a/htdocs/zapier/zapierindex.php
+++ b/htdocs/zapier/zapierindex.php
@@ -37,8 +37,7 @@ $action = GETPOST('action', 'alpha');
 // Securite acces client
 if (!$user->rights->zapier->read) accessforbidden();
 $socid = GETPOST('socid', 'int');
-if (isset($user->socid) && $user->socid > 0)
-{
+if (isset($user->socid) && $user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }

From ba8cf2b398cb7f97f89c461de9c0ce03ae678be9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 09:21:30 +0200
Subject: [PATCH 334/490] add new rule

---
 .travis.yml                                   |  4 +-
 dev/setup/codesniffer/ruleset.xml             |  1 +
 htdocs/adherents/admin/adherent_emails.php    |  3 +-
 .../actions_adherentcard_common.class.php     |  3 +-
 htdocs/adherents/card.php                     | 15 ++----
 htdocs/adherents/cartes/carte.php             |  3 +-
 .../adherents/class/adherent_type.class.php   | 10 ++--
 htdocs/adherents/class/api_members.class.php  |  3 +-
 .../class/api_memberstypes.class.php          |  3 +-
 .../class/api_subscriptions.class.php         |  3 +-
 htdocs/adherents/ldap.php                     |  3 +-
 htdocs/adherents/list.php                     |  3 +-
 htdocs/adherents/stats/index.php              |  3 +-
 htdocs/adherents/subscription.php             | 42 ++++++----------
 htdocs/adherents/type.php                     | 50 ++++++-------------
 htdocs/adherents/type_ldap.php                | 12 ++---
 htdocs/adherents/type_translation.php         | 18 +++----
 htdocs/variants/card.php                      |  3 +-
 .../variants/class/ProductAttribute.class.php |  3 +-
 htdocs/variants/combinations.php              | 18 +++----
 htdocs/variants/create.php                    |  3 +-
 21 files changed, 68 insertions(+), 138 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1112454c991..f7903361b02 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -291,8 +291,8 @@ script:
   # Ensure we catch errors
   set -e
   # Exclusions are defined in the ruleset.xml file
-  phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .
-  #if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .; fi
+  #phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .
+  if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .; fi
   set +e
   echo
 
diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index a6a915094e2..03104270dcf 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -214,6 +214,7 @@
     <rule ref="Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose" />
 
     <!-- <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseParenthesis" /> -->
+    <!-- <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace" /> -->
     <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword" />
 
     <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration.SpaceAfterOpen" />
diff --git a/htdocs/adherents/admin/adherent_emails.php b/htdocs/adherents/admin/adherent_emails.php
index 22519c55ab0..c6eec8b2d83 100644
--- a/htdocs/adherents/admin/adherent_emails.php
+++ b/htdocs/adherents/admin/adherent_emails.php
@@ -95,8 +95,7 @@ if ($action == 'update' || $action == 'add') {
 
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index 79e4cab1719..aa9797959a7 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -166,8 +166,7 @@ abstract class ActionsAdherentCardCommon
 				$dolibarr_user = new User($this->db);
 				$result = $dolibarr_user->fetch($this->object->user_id);
 				$this->tpl['dolibarr_user'] = $dolibarr_user->getLoginUrl(1);
-			}
-			else $this->tpl['dolibarr_user'] = $langs->trans("NoDolibarrAccess");
+			} else $this->tpl['dolibarr_user'] = $langs->trans("NoDolibarrAccess");
         }
 
         if ($action == 'view' || $action == 'delete') {
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index cf5253e3bf8..727a99e060c 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -539,8 +539,7 @@ if (empty($reshook)) {
 
 				$action = 'create';
 			}
-		}
-		else {
+		} else {
 			$action = 'create';
 		}
 	}
@@ -599,8 +598,7 @@ if (empty($reshook)) {
 					//fallback on the old configuration.
 					setEventMessages('WarningMandatorySetupNotComplete', null, 'errors');
 					$error++;
-				}
-				else {
+				} else {
 					$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
 					$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
@@ -669,8 +667,7 @@ if (empty($reshook)) {
 						//fallback on the old configuration.
 						setEventMessages('WarningMandatorySetupNotComplete', null, 'errors');
 						$error++;
-					}
-					else {
+					} else {
 						$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
 						complete_substitutions_array($substitutionarray, $outputlangs, $object);
 						$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
@@ -1215,8 +1212,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td colspan="2" class="valeur">';
 		if ($object->user_id) {
 			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'none');
-		}
-		else print $langs->trans("NoDolibarrAccess");
+		} else print $langs->trans("NoDolibarrAccess");
 		print '</td></tr>';
 
 		// Other attributes. Fields from hook formObjectOptions and Extrafields.
@@ -1502,8 +1498,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		} else {
 			if ($object->need_subscription == 0) {
                 print $langs->trans("SubscriptionNotNeeded");
-            }
-            elseif (!$adht->subscription) {
+            } elseif (!$adht->subscription) {
 				print $langs->trans("SubscriptionNotRecorded");
 				if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
 			} else {
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index 736cc45319e..958750178f1 100644
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -192,8 +192,7 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
             	$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DescADHERENT_CARD_TYPE"));
             }
             if (!$mesg) $result = members_card_pdf_create($db, $arrayofmembers, $model, $outputlangs);
-        }
-        elseif ($mode == 'label') {
+        } elseif ($mode == 'label') {
             if (!count($arrayofmembers)) {
                 $mesg = $langs->trans("ErrorRecordNotFound");
             }
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index e2ff3786a3c..25df072fbde 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -190,8 +190,7 @@ class AdherentType extends CommonObject
                     $this->error = $this->db->lasterror();
                     return -1;
                 }
-            }
-            elseif (isset($this->multilangs[$key])) {
+            } elseif (isset($this->multilangs[$key])) {
                 $sql = "SELECT rowid";
                 $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type_lang";
                 $sql .= " WHERE fk_type=".$this->id;
@@ -550,8 +549,7 @@ class AdherentType extends CommonObject
 							$memberstatic->fetch($obj->rowid);
 						}
 						$ret[$obj->rowid] = $memberstatic;
-					}
-					else $ret[$obj->rowid] = $obj->rowid;
+					} else $ret[$obj->rowid] = $obj->rowid;
 				}
 			}
 
@@ -575,9 +573,7 @@ class AdherentType extends CommonObject
 	public function getmorphylib($morphy = '')
 	{
 		global $langs;
-		if ($morphy == 'phy') { return $langs->trans("Physical"); }
-		elseif ($morphy == 'mor') { return $langs->trans("Moral"); }
-        else return $langs->trans("MorPhy");
+		if ($morphy == 'phy') { return $langs->trans("Physical"); } elseif ($morphy == 'mor') { return $langs->trans("Moral"); } else return $langs->trans("MorPhy");
 		//return $morphy;
 	}
 
diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index c69706d8a3b..2128abe73d6 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -149,8 +149,7 @@ class Members extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve member list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index 61758255624..6930b96e656 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -132,8 +132,7 @@ class MembersTypes extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve member type list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
index 79480c09fdf..502a855657c 100644
--- a/htdocs/adherents/class/api_subscriptions.class.php
+++ b/htdocs/adherents/class/api_subscriptions.class.php
@@ -129,8 +129,7 @@ class Subscriptions extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve subscription list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index 79eb8237d91..3094c6a50ac 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -67,8 +67,7 @@ if ($action == 'dolibarr2ldap') {
 
 	if ($result >= 0) {
 		setEventMessages($langs->trans("MemberSynchronized"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($ldap->error, $ldap->errors, 'errors');
 	}
 }
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index d82b7438574..3a254fb5c97 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -344,8 +344,7 @@ if (GETPOSTISSET("statut")) {
 	if ($statut == '1' && $filter == 'uptodate') { $titre = $langs->trans("MembersListUpToDate"); }
 	if ($statut == '1' && $filter == 'outofdate') { $titre = $langs->trans("MembersListNotUpToDate"); }
 	if ($statut == '0') { $titre = $langs->trans("MembersListResiliated"); }
-}
-elseif ($action == 'search') {
+} elseif ($action == 'search') {
 	$titre = $langs->trans("MembersListQualified");
 }
 
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index 892d4d10cc6..9177b4783a2 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -207,8 +207,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     print $px2->show();
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index a3d72e600e6..06b8cecf7f3 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -121,12 +121,10 @@ if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights
 		if ($result < 0) {
 			$langs->load("errors");
 			setEventMessages($company->error, $company->errors, 'errors');
-		}
-		else {
+		} else {
 			$action = 'addsubscription';
 		}
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -246,15 +244,13 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
         	setEventMessages($errmsg, null, 'errors');
             $error++;
             $action = 'addsubscription';
-		}
-        else {
+		} else {
             if (!empty($conf->banque->enabled) && $_POST["paymentsave"] != 'none') {
                 if ($_POST["subscription"]) {
                     if (!$_POST["label"])     $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
                     if ($_POST["paymentsave"] != 'invoiceonly' && !$_POST["operation"]) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
                     if ($_POST["paymentsave"] != 'invoiceonly' && !($_POST["accountid"] > 0)) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("FinancialAccount"));
-                }
-                else {
+                } else {
                     if ($_POST["accountid"])   $errmsg = $langs->trans("ErrorDoNotProvideAccountsIfNullAmount");
                 }
                 if ($errmsg) {
@@ -284,16 +280,14 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
 			if ($result < 0) {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
-			}
-			else {
+			} else {
 				// If an invoice was created, it is into $object->invoice
 			}
         }
 
         if (!$error) {
             $db->commit();
-        }
-        else {
+        } else {
             $db->rollback();
             $action = 'addsubscription';
         }
@@ -355,12 +349,10 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                 if ($result < 0) {
                 	$errmsg = $object->error;
                 	setEventMessages($object->error, $object->errors, 'errors');
-                }
-                else {
+                } else {
                 	setEventMessages($langs->trans("EmailSentToMember", $object->email), null, 'mesgs');
                 }
-            }
-            else {
+            } else {
             	setEventMessages($langs->trans("NoEmailSentToMember"), null, 'mesgs');
             }
         }
@@ -491,13 +483,11 @@ if ($rowid > 0) {
 	    if ($object->hasDelay()) {
 	        print " ".img_warning($langs->trans("Late"));
 	    }
-	}
-	else {
+	} else {
 	    if (!$adht->subscription) {
 	        print $langs->trans("SubscriptionNotRecorded");
 	        if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
-	    }
-	    else {
+	    } else {
 	        print $langs->trans("SubscriptionNotReceived");
 	        if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
 	    }
@@ -525,14 +515,12 @@ if ($rowid > 0) {
 			print '</td>';
 			print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
-		}
-		else {
+		} else {
 			if ($object->fk_soc) {
 				$company = new Societe($db);
 				$result = $company->fetch($object->fk_soc);
 				print $company->getNomUrl(1);
-			}
-			else {
+			} else {
 				print $langs->trans("NoThirdPartyAssociatedToMember");
 			}
 		}
@@ -555,12 +543,10 @@ if ($rowid > 0) {
 	print '</td><td colspan="2" class="valeur">';
 	if ($action == 'editlogin') {
 		$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'userid', '');
-	}
-	else {
+	} else {
 		if ($object->user_id) {
 			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'none');
-		}
-		else print $langs->trans("NoDolibarrAccess");
+		} else print $langs->trans("NoDolibarrAccess");
 	}
 	print '</td></tr>';
 
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 534e7c2896c..ed0172c1f12 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -123,8 +123,7 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 	if (empty($object->label)) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
-	}
-	else {
+	} else {
 		$sql = "SELECT libelle FROM ".MAIN_DB_PREFIX."adherent_type WHERE libelle='".$db->escape($object->label)."'";
 		$result = $db->query($sql);
 		if ($result) {
@@ -142,13 +141,11 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 		if ($id > 0) {
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'create';
 		}
-	}
-	else {
+	} else {
 		$action = 'create';
 	}
 }
@@ -176,8 +173,7 @@ if ($action == 'update' && $user->rights->adherent->configurer) {
 
 	if ($ret >= 0 && !count($object->errors)) {
 		setEventMessages($langs->trans("MemberTypeModified"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 
@@ -193,8 +189,7 @@ if ($action == 'confirm_delete' && $user->rights->adherent->configurer) {
 		setEventMessages($langs->trans("MemberTypeDeleted"), null, 'mesgs');
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("MemberTypeCanNotBeDeleted"), null, 'errors');
 		$action = '';
 	}
@@ -277,9 +272,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 			print '</td>';
 			print '<td>'.dol_escape_htmltag($objp->label).'</td>';
             print '<td class="center">';
-			if ($objp->morphy == 'phy') { print $langs->trans("Physical"); }
-			elseif ($objp->morphy == 'mor') { print $langs->trans("Moral"); }
-			else print $langs->trans("MorPhy");
+			if ($objp->morphy == 'phy') { print $langs->trans("Physical"); } elseif ($objp->morphy == 'mor') { print $langs->trans("Moral"); } else print $langs->trans("MorPhy");
             print '</td>';
 			print '<td class="center">'.yn($objp->subscription).'</td>';
 			print '<td class="center">'.yn($objp->vote).'</td>';
@@ -296,8 +289,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 		print '</div>';
 
 		print '</form>';
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -424,8 +416,7 @@ if ($rowid > 0) {
 		print '<tr><td class="titlefield">'.$langs->trans("Duration").'</td><td colspan="2">'.$object->duration_value.'&nbsp;';
 		if ($object->duration_value > 1) {
 			$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
-		}
-		elseif ($object->duration_value > 0) {
+		} elseif ($object->duration_value > 0) {
 			$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
 		}
 		print (!empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')."&nbsp;";
@@ -535,14 +526,8 @@ if ($rowid > 0) {
 
 		    $titre = $langs->trans("MembersList");
 		    if ($status != '') {
-		        if ($status == '-1,1') { $titre = $langs->trans("MembersListQualified"); }
-		        elseif ($status == '-1') { $titre = $langs->trans("MembersListToValid"); }
-		        elseif ($status == '1' && !$filter) { $titre = $langs->trans("MembersListValid"); }
-		        elseif ($status == '1' && $filter == 'uptodate') { $titre = $langs->trans("MembersListUpToDate"); }
-		        elseif ($status == '1' && $filter == 'outofdate') { $titre = $langs->trans("MembersListNotUpToDate"); }
-		        elseif ($status == '0') { $titre = $langs->trans("MembersListResiliated"); }
-		    }
-		    elseif ($action == 'search') {
+		        if ($status == '-1,1') { $titre = $langs->trans("MembersListQualified"); } elseif ($status == '-1') { $titre = $langs->trans("MembersListToValid"); } elseif ($status == '1' && !$filter) { $titre = $langs->trans("MembersListValid"); } elseif ($status == '1' && $filter == 'uptodate') { $titre = $langs->trans("MembersListUpToDate"); } elseif ($status == '1' && $filter == 'outofdate') { $titre = $langs->trans("MembersListNotUpToDate"); } elseif ($status == '0') { $titre = $langs->trans("MembersListResiliated"); }
+		    } elseif ($action == 'search') {
 		        $titre = $langs->trans("MembersListQualified");
 		    }
 
@@ -623,8 +608,7 @@ if ($rowid > 0) {
 		        print '<tr class="oddeven">';
 		        if ($objp->company != '') {
 		            print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"), "user").' '.$adh->getFullName($langs, 0, -1, 20).' / '.dol_trunc($objp->societe, 12).'</a></td>'."\n";
-		        }
-		        else {
+		        } else {
 		            print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"), "user").' '.$adh->getFullName($langs, 0, -1, 32).'</a></td>'."\n";
 		        }
 
@@ -655,19 +639,16 @@ if ($rowid > 0) {
 			        print '<td class="nowrap center">';
 		            if ($datefin < dol_now() && $objp->statut > 0) {
 		                print dol_print_date($datefin, 'day')." ".img_warning($langs->trans("SubscriptionLate"));
-		            }
-		            else {
+		            } else {
 		                print dol_print_date($datefin, 'day');
 		            }
 		            print '</td>';
-		        }
-		        else {
+		        } else {
 			        print '<td class="nowrap left">';
 			        if ($objp->subscription == 'yes') {
 		                print $langs->trans("SubscriptionNotReceived");
 		                if ($objp->statut > 0) print " ".img_warning();
-			        }
-			        else {
+			        } else {
 			            print '&nbsp;';
 			        }
 		            print '</td>';
@@ -695,8 +676,7 @@ if ($rowid > 0) {
 			if ($num > $conf->liste_limit) {
 			    print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
 			}
-		}
-		else {
+		} else {
 		    dol_print_error($db);
 		}
 	}
diff --git a/htdocs/adherents/type_ldap.php b/htdocs/adherents/type_ldap.php
index 47dcacf1d6a..433c83d72be 100644
--- a/htdocs/adherents/type_ldap.php
+++ b/htdocs/adherents/type_ldap.php
@@ -70,8 +70,7 @@ if (empty($reshook)) {
 
 		if ($result >= 0) {
 			setEventMessages($langs->trans("MemberTypeSynchronized"), null, 'mesgs');
-		}
-		else {
+		} else {
 			setEventMessages($ldap->error, $ldap->errors, 'errors');
 		}
 	}
@@ -159,19 +158,16 @@ if ($result > 0) {
     if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
         if (!is_array($records)) {
             print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
-        }
-        else {
+        } else {
             $result = show_ldap_content($records, 0, $records['count'], true);
         }
-    }
-    else {
+    } else {
         print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
     }
 
     $ldap->unbind();
     $ldap->close();
-}
-else {
+} else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
 
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index 1e1d06f85b8..b45c7cf76f5 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -72,8 +72,7 @@ if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->ad
 		$object->label			= $_POST["libelle"];
 		$object->description = dol_htmlcleanlastbr($_POST["desc"]);
 		$object->other			= dol_htmlcleanlastbr($_POST["other"]);
-	}
-	else {
+	} else {
 		$object->multilangs[$_POST["forcelangprod"]]["label"]		= $_POST["libelle"];
 		$object->multilangs[$_POST["forcelangprod"]]["description"] = dol_htmlcleanlastbr($_POST["desc"]);
 		$object->multilangs[$_POST["forcelangprod"]]["other"]		= dol_htmlcleanlastbr($_POST["other"]);
@@ -82,8 +81,7 @@ if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->ad
 	// backup into database
 	if ($object->setMultiLangs($user) > 0) {
 		$action = '';
-	}
-	else {
+	} else {
 		$action = 'add';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -100,8 +98,7 @@ if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && $user->rights->a
 			$object->label			= $_POST["libelle-".$key];
 			$object->description = dol_htmlcleanlastbr($_POST["desc-".$key]);
 			$object->other			= dol_htmlcleanlastbr($_POST["other-".$key]);
-		}
-		else {
+		} else {
 			$object->multilangs[$key]["label"]			= $_POST["libelle-".$key];
 			$object->multilangs[$key]["description"] = dol_htmlcleanlastbr($_POST["desc-".$key]);
 			$object->multilangs[$key]["other"]			= dol_htmlcleanlastbr($_POST["other-".$key]);
@@ -110,8 +107,7 @@ if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && $user->rights->a
 
 	if ($object->setMultiLangs($user) > 0) {
 		$action = '';
-	}
-	else {
+	} else {
 		$action = 'edit';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -126,8 +122,7 @@ if ($action == 'vdelete' && $cancel != $langs->trans("Cancel") && $user->rights-
 
 	if ($object->delMultiLangs($langtodelete, $user) > 0) {
 		$action = '';
-	}
-	else {
+	} else {
 		$action = 'edit';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -229,8 +224,7 @@ if ($action == 'edit') {
 	print '</div>';
 
 	print '</form>';
-}
-elseif ($action != 'add') {
+} elseif ($action != 'add') {
 	if (!empty($object->multilangs)) {
 		foreach ($object->multilangs as $key => $value) {
 			$s = picto_from_langcode($key);
diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index 399be5de0ee..744f8ea900e 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -102,8 +102,7 @@ if ($confirm == 'yes') {
 			header('Location: '.dol_buildpath('/variants/list.php', 2));
 		}
 		exit();
-	}
-	elseif ($action == 'confirm_deletevalue')
+	} elseif ($action == 'confirm_deletevalue')
 	{
 		if ($objectval->fetch($valueid) > 0) {
 			if ($objectval->delete() < 1) {
diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index 160504b518b..36b4823b51b 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -119,8 +119,7 @@ class ProductAttribute
 
     			$return[] = $tmp;
     		}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return $return;
 	}
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index f29cc49f35b..3886a8fcdce 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -105,8 +105,7 @@ if ($_POST) {
 
 		if (!$features) {
 			setEventMessages($langs->trans('ErrorFieldsRequired'), null, 'errors');
-		}
-		else {
+		} else {
 			$reference = trim($reference);
 		    if (empty($reference)) {
 		        $reference = false;
@@ -165,8 +164,7 @@ if ($_POST) {
 
 			$db->rollback();
 		}
-	}
-	elseif (!empty($massaction))
+	} elseif (!empty($massaction))
 	{
 		$bulkaction = $massaction;
 		$error = 0;
@@ -219,8 +217,7 @@ if ($_POST) {
 			$db->commit();
 			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 		}
-	}
-	elseif ($valueid > 0) {
+	} elseif ($valueid > 0) {
 		if ($prodcomb->fetch($valueid) < 0) {
 			dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
 			exit();
@@ -359,8 +356,7 @@ if (!empty($id) || !empty($ref))
 	if ($object->weight != '')
 	{
 		print $object->weight." ".measuringUnitString(0, "weight", $object->weight_units);
-	}
-	else {
+	} else {
 		print '&nbsp;';
 	}
 	print "</td></tr>\n";
@@ -625,8 +621,7 @@ if (!empty($id) || !empty($ref))
 		<?php
 
         print '</form>';
-	}
-	else {
+	} else {
 		if ($action === 'delete') {
 			if ($prodcomb->fetch($valueid) > 0) {
 				$prodstatic->fetch($prodcomb->fk_product_child);
@@ -797,8 +792,7 @@ if (!empty($id) || !empty($ref))
     			print '</td>';
     			print '</tr>';
 		    }
-		}
-		else {
+		} else {
 		     print '<tr><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 		}
 		print '</table>';
diff --git a/htdocs/variants/create.php b/htdocs/variants/create.php
index 567dc902a5a..c11f6b5f485 100644
--- a/htdocs/variants/create.php
+++ b/htdocs/variants/create.php
@@ -42,8 +42,7 @@ if ($_POST) {
 			if ($backtopage)
 			{
 				header('Location: '.$backtopage);
-			}
-			else {
+			} else {
 				header('Location: '.DOL_URL_ROOT.'/variants/card.php?id='.$resid.'&backtopage='.urlencode($backtopage));
 			}
 			exit;

From 2efe3d7da0335b2b400603e6a8b2c2dafc004775 Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Thu, 21 May 2020 09:31:06 +0200
Subject: [PATCH 335/490] Fix not wokring default values for date (re...)

---
 htdocs/compta/facture/card.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index ab2262844bf..522d4471daa 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1025,7 +1025,7 @@ if (empty($reshook))
 		// Replacement invoice
 		if ($_POST['type'] == Facture::TYPE_REPLACEMENT)
 		{
-			$dateinvoice = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+			$dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 			if (empty($dateinvoice))
 			{
 				$error++;
@@ -1086,7 +1086,7 @@ if (empty($reshook))
 				$action = 'create';
 			}
 
-			$dateinvoice = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+			$dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 			if (empty($dateinvoice))
 			{
 				$error++;
@@ -1269,7 +1269,7 @@ if (empty($reshook))
 		// Standard invoice or Deposit invoice, created from a Predefined template invoice
 		if (($_POST['type'] == Facture::TYPE_STANDARD || $_POST['type'] == Facture::TYPE_DEPOSIT) && GETPOST('fac_rec', 'int') > 0)
 		{
-			$dateinvoice = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+			$dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 			if (empty($dateinvoice))
 			{
 				$error++;
@@ -1320,7 +1320,7 @@ if (empty($reshook))
 				$action = 'create';
 			}
 
-			$dateinvoice = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+			$dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 			if (empty($dateinvoice))
 			{
 				$error++;
@@ -1745,7 +1745,7 @@ if (empty($reshook))
 		// Situation invoices
 		if (GETPOST('type') == Facture::TYPE_SITUATION && (!empty($_POST['situations'])))
 		{
-			$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+			$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 			if (empty($datefacture)) {
 				$error++;
 				$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date"));

From f4011520a3c1558e936a8d86541c8bb5f064d7b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 09:31:49 +0200
Subject: [PATCH 336/490] add new rule

---
 htdocs/adherents/type.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index ed0172c1f12..524ed0e466a 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -525,8 +525,20 @@ if ($rowid > 0) {
 		    $i = 0;
 
 		    $titre = $langs->trans("MembersList");
-		    if ($status != '') {
-		        if ($status == '-1,1') { $titre = $langs->trans("MembersListQualified"); } elseif ($status == '-1') { $titre = $langs->trans("MembersListToValid"); } elseif ($status == '1' && !$filter) { $titre = $langs->trans("MembersListValid"); } elseif ($status == '1' && $filter == 'uptodate') { $titre = $langs->trans("MembersListUpToDate"); } elseif ($status == '1' && $filter == 'outofdate') { $titre = $langs->trans("MembersListNotUpToDate"); } elseif ($status == '0') { $titre = $langs->trans("MembersListResiliated"); }
+            if ($status != '') {
+                if ($status == '-1,1') {
+                    $titre = $langs->trans("MembersListQualified");
+                } elseif ($status == '-1') {
+                    $titre = $langs->trans("MembersListToValid");
+                } elseif ($status == '1' && !$filter) {
+                    $titre = $langs->trans("MembersListValid");
+                } elseif ($status == '1' && $filter == 'uptodate') {
+                    $titre = $langs->trans("MembersListUpToDate");
+                } elseif ($status == '1' && $filter == 'outofdate') {
+                    $titre = $langs->trans("MembersListNotUpToDate");
+                } elseif ($status == '0') {
+                    $titre = $langs->trans("MembersListResiliated");
+                }
 		    } elseif ($action == 'search') {
 		        $titre = $langs->trans("MembersListQualified");
 		    }

From 44ffb8dbf7e5101ee8c812d812fd3ccd57686c1f Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Thu, 21 May 2020 09:34:20 +0200
Subject: [PATCH 337/490] Fix not working default value (re...)

---
 htdocs/fourn/facture/card.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 6e8f259bc01..91d1b333e56 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -644,7 +644,7 @@ if (empty($reshook))
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
 		if ($ret < 0) $error++;
 
-		$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+		$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		$datedue = dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']);
 
 		// Replacement invoice
@@ -1758,7 +1758,7 @@ if ($action == 'create')
 			if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx))	$currency_tx = $objectsrc->multicurrency_tx;
 		}
 
-		$datetmp = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+		$datetmp = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		$dateinvoice = ($datetmp == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datetmp);
 		$datetmp = dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']);
 		$datedue = ($datetmp == '' ?-1 : $datetmp);
@@ -1772,7 +1772,7 @@ if ($action == 'create')
 		$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
 		$fk_account         = $societe->fk_account;
-		$datetmp = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+		$datetmp = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		$dateinvoice = ($datetmp == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datetmp);
 		$datetmp = dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']);
 		$datedue = ($datetmp == '' ?-1 : $datetmp);

From 85625a46bb9d18f8ae18d6054475180a253f9b1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 09:35:30 +0200
Subject: [PATCH 338/490] add new rule

---
 htdocs/admin/agenda.php                       |   6 +-
 htdocs/admin/agenda_extsites.php              |   9 +-
 htdocs/admin/agenda_other.php                 |  34 +--
 htdocs/admin/agenda_reminder.php              |  19 +-
 htdocs/admin/agenda_xcal.php                  |   3 +-
 htdocs/admin/bank.php                         |  57 ++--
 htdocs/admin/barcode.php                      |  27 +-
 htdocs/admin/bom.php                          |  53 +---
 htdocs/admin/boxes.php                        |  33 +--
 htdocs/admin/chequereceipts.php               |  12 +-
 htdocs/admin/clicktodial.php                  |   6 +-
 htdocs/admin/commande.php                     |  80 ++---
 htdocs/admin/company.php                      |  57 ++--
 htdocs/admin/compta.php                       |   3 +-
 htdocs/admin/confexped.php                    |   6 +-
 htdocs/admin/const.php                        |  21 +-
 htdocs/admin/contract.php                     |  49 +---
 htdocs/admin/dav.php                          |  15 +-
 htdocs/admin/debugbar.php                     |   3 +-
 htdocs/admin/defaultvalues.php                |  24 +-
 htdocs/admin/delais.php                       |   3 +-
 htdocs/admin/dict.php                         | 277 ++++++------------
 .../class/PSWebServiceLibrary.class.php       |   3 +-
 htdocs/admin/ecm.php                          |  12 +-
 htdocs/admin/emailcollector_card.php          |  33 +--
 htdocs/admin/emailcollector_list.php          |   3 +-
 htdocs/admin/expedition.php                   |  43 +--
 htdocs/admin/expensereport.php                |  46 +--
 htdocs/admin/expensereport_ik.php             |   6 +-
 htdocs/admin/expensereport_rules.php          |  31 +-
 htdocs/admin/external_rss.php                 |  21 +-
 htdocs/admin/facture.php                      |  74 ++---
 htdocs/admin/facture_situation.php            |   5 +-
 htdocs/admin/fckeditor.php                    |  12 +-
 htdocs/admin/fichinter.php                    |  60 ++--
 htdocs/admin/geoipmaxmind.php                 |   6 +-
 htdocs/admin/holiday.php                      |  49 +---
 htdocs/admin/ihm.php                          |   9 +-
 htdocs/admin/ldap.php                         |  21 +-
 htdocs/admin/ldap_contacts.php                |   9 +-
 htdocs/admin/ldap_groups.php                  |   9 +-
 htdocs/admin/ldap_members.php                 |   9 +-
 htdocs/admin/ldap_members_types.php           |   9 +-
 htdocs/admin/ldap_users.php                   |  18 +-
 htdocs/admin/limits.php                       |  12 +-
 htdocs/admin/livraison.php                    |  33 +--
 htdocs/admin/loan.php                         |   6 +-
 htdocs/admin/mailing.php                      |   3 +-
 htdocs/admin/mailman.php                      |  15 +-
 htdocs/admin/mails.php                        |  87 ++----
 htdocs/admin/mails_emailing.php               |  60 ++--
 htdocs/admin/mails_senderprofile_list.php     |   9 +-
 htdocs/admin/mails_templates.php              |  81 ++---
 htdocs/admin/menus.php                        |   3 +-
 htdocs/admin/menus/edit.php                   |  21 +-
 htdocs/admin/menus/index.php                  |  14 +-
 htdocs/admin/menus/other.php                  |   6 +-
 htdocs/admin/modulehelp.php                   |  63 ++--
 htdocs/admin/modules.php                      |  87 ++----
 htdocs/admin/mrp.php                          |  53 +---
 htdocs/admin/multicurrency.php                |  21 +-
 htdocs/admin/notification.php                 |  12 +-
 htdocs/admin/oauth.php                        |   3 +-
 htdocs/admin/oauthlogintokens.php             |  30 +-
 htdocs/admin/payment.php                      |   6 +-
 htdocs/admin/pdf.php                          |   6 +-
 htdocs/admin/perms.php                        |   6 +-
 htdocs/admin/prelevement.php                  |   6 +-
 htdocs/admin/propal.php                       |  84 ++----
 htdocs/admin/receiptprinter.php               |   6 +-
 htdocs/admin/reception_setup.php              |  40 +--
 htdocs/admin/resource.php                     |   3 +-
 htdocs/admin/security.php                     |  39 +--
 htdocs/admin/security_other.php               |  25 +-
 htdocs/admin/sms.php                          |   9 +-
 htdocs/admin/socialnetworks.php               |   6 +-
 htdocs/admin/spip.php                         |   6 +-
 htdocs/admin/stock.php                        |  30 +-
 htdocs/admin/supplier_invoice.php             |  37 +--
 htdocs/admin/supplier_order.php               |  59 ++--
 htdocs/admin/supplier_payment.php             |  37 +--
 htdocs/admin/supplier_proposal.php            |  57 ++--
 htdocs/admin/syslog.php                       |   9 +-
 htdocs/admin/system/about.php                 |   3 +-
 htdocs/admin/system/constall.php              |   6 +-
 htdocs/admin/system/database-tables.php       |  15 +-
 htdocs/admin/system/database.php              |   3 +-
 htdocs/admin/system/dbtable.php               |   6 +-
 htdocs/admin/system/dolibarr.php              |  21 +-
 htdocs/admin/system/filecheck.php             |  33 +--
 htdocs/admin/system/modules.php               |  12 +-
 htdocs/admin/system/perf.php                  |  30 +-
 htdocs/admin/system/phpinfo.php               |  24 +-
 htdocs/admin/system/xdebug.php                |   6 +-
 htdocs/admin/taxes.php                        |  18 +-
 htdocs/admin/ticket.php                       |   3 +-
 htdocs/admin/ticket_public.php                |   3 +-
 htdocs/admin/tools/dolibarr_export.php        |  18 +-
 htdocs/admin/tools/dolibarr_import.php        |   9 +-
 htdocs/admin/tools/export.php                 |   3 +-
 htdocs/admin/tools/export_files.php           |  12 +-
 htdocs/admin/tools/listevents.php             |   9 +-
 htdocs/admin/tools/listsessions.php           |   9 +-
 htdocs/admin/tools/update.php                 |   6 +-
 htdocs/admin/translation.php                  |  33 +--
 htdocs/admin/user.php                         |  44 +--
 htdocs/admin/usergroup.php                    |  29 +-
 htdocs/admin/website.php                      |  51 ++--
 htdocs/admin/website_options.php              |   3 +-
 htdocs/admin/workflow.php                     |  12 +-
 htdocs/asterisk/cidlookup.php                 |   3 +-
 htdocs/asterisk/wrapper.php                   |   9 +-
 htdocs/modulebuilder/index.php                | 237 +++++----------
 htdocs/modulebuilder/template/admin/setup.php |   6 +-
 .../template/class/api_mymodule.class.php     |   6 +-
 .../template/class/myobject.class.php         |  36 +--
 .../mailinglist_mymodule_myobject.modules.php |   3 +-
 .../doc/doc_generic_myobject_odt.modules.php  |  39 +--
 .../mymodule/mod_myobject_standard.php        |   9 +-
 .../modulebuilder/template/myobject_card.php  |   9 +-
 .../modulebuilder/template/myobject_list.php  |   3 +-
 .../template/scripts/mymodule.php             |   3 +-
 122 files changed, 1031 insertions(+), 2128 deletions(-)

diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 52a1adc4fd2..382f242b7e7 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -61,8 +61,7 @@ if ($resql)
 		$i++;
 	}
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -106,8 +105,7 @@ if ($action == "save" && empty($cancel))
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
         $db->commit();
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
         $db->rollback();
     }
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index dd5d04732ff..e7e5edefaab 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -107,8 +107,7 @@ if ($actionsave)
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         $db->rollback();
         if (empty($errorsaved))	setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -161,13 +160,11 @@ print '<td class="center">';
 if ($conf->use_javascript_ajax)
 {
 	print ajax_constantonoff('AGENDA_DISABLE_EXT', array('enabled'=>array(0=>'.hideifnotset')), null, 1);
-}
-else {
+} else {
 	if (empty($conf->global->AGENDA_DISABLE_EXT))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?save=1&AGENDA_DISABLE_EXT=1">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
-	}
-	else {
+	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?save=1&AGENDA_DISABLE_EXT=0">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	}
 }
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index a9e5bccd71b..560226438c3 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -59,8 +59,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -72,8 +71,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -85,8 +83,7 @@ if ($action == 'set')
     dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', $defaultfilter, 'chaine', 0, '', $conf->entity);
     dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_STATUS', GETPOST('AGENDA_DEFAULT_FILTER_STATUS'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, 'AGENDA_DEFAULT_VIEW', GETPOST('AGENDA_DEFAULT_VIEW'), 'chaine', 0, '', $conf->entity);
-}
-elseif ($action == 'specimen')  // For orders
+} elseif ($action == 'specimen')  // For orders
 {
     $modele = GETPOST('module', 'alpha');
 
@@ -118,13 +115,11 @@ elseif ($action == 'specimen')  // For orders
     	{
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=action&file=SPECIMEN.pdf");
     		return;
-    	}
-    	else {
+    	} else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
-    }
-    else {
+    } else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -135,9 +130,7 @@ elseif ($action == 'setmodel')
 {
 	//print "sssd".$value;
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -209,8 +202,7 @@ if ($resql)
         array_push($def, $array[0]);
         $i++;
     }
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -270,13 +262,11 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             				    print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action">';
             				    print img_picto($langs->trans("Enabled"), 'switch_on');
             				    print '</a>';
-            			    }
-            			    else {
+            			    } else {
             				    print img_picto($langs->trans("Enabled"), 'switch_on');
             			    }
             				print "</td>";
-            			}
-            			else {
+            			} else {
             				print '<td class="center">'."\n";
             				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
             				print "</td>";
@@ -287,8 +277,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             			if ($conf->global->ACTION_EVENT_ADDON_PDF == "$name")
             			{
             				print img_picto($langs->trans("Default"), 'on');
-            			}
-            			else {
+            			} else {
             				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
             			}
             			print '</td>';
@@ -337,8 +326,7 @@ print '<td class="right">'."\n";
 if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_USE_EVENT_TYPE">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-}
-else {
+} else {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_USE_EVENT_TYPE">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 }
 print '</td></tr>'."\n";
diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index d9b7ead6f2e..c55e4a1afd5 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -54,8 +54,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -67,8 +66,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -78,8 +76,7 @@ if ($action == 'set')
     dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', GETPOST('AGENDA_DEFAULT_FILTER_TYPE'), 'chaine', 0, '', $conf->entity);
     dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_STATUS', GETPOST('AGENDA_DEFAULT_FILTER_STATUS'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, 'AGENDA_DEFAULT_VIEW', GETPOST('AGENDA_DEFAULT_VIEW'), 'chaine', 0, '', $conf->entity);
-}
-elseif ($action == 'specimen')  // For orders
+} elseif ($action == 'specimen')  // For orders
 {
     $modele = GETPOST('module', 'alpha');
 
@@ -111,13 +108,11 @@ elseif ($action == 'specimen')  // For orders
     	{
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=action&file=SPECIMEN.pdf");
     		return;
-    	}
-    	else {
+    	} else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
-    }
-    else {
+    } else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -128,9 +123,7 @@ elseif ($action == 'setmodel')
 {
 	//print "sssd".$value;
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index b6d0472c3af..3075be2ada5 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -54,8 +54,7 @@ if ($actionsave)
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         $db->rollback();
         setEventMessages($langs->trans("SaveFailed"), null, 'errors');
     }
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 662dc517436..6c91367f6c2 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -55,8 +55,7 @@ if ($action == 'setbankorder') {
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -67,18 +66,15 @@ if ($action == 'setreportlastnumreleve') {
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
-}
-elseif ($action == 'unsetreportlastnumreleve') {
+} elseif ($action == 'unsetreportlastnumreleve') {
     if (dolibarr_set_const($db, "BANK_REPORT_LAST_NUM_RELEVE", 0, 'chaine', 0, '', $conf->entity) > 0)
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -89,18 +85,15 @@ if ($action == 'setbankcolorizemovement') {
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
-}
-elseif ($action == 'unsetbankcolorizemovement') {
+} elseif ($action == 'unsetbankcolorizemovement') {
     if (dolibarr_set_const($db, "BANK_COLORIZE_MOVEMENT", 0, 'chaine', 0, '', $conf->entity) > 0)
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -127,8 +120,7 @@ if ($actionsave)
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         $db->rollback();
         if (empty($errorsaved))	setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -140,8 +132,7 @@ if ($action == 'specimen') {
 
     if ($modele == 'sepamandate') {
         $object = new CompanyBankAccount($db);
-    }
-    else {
+    } else {
         $object = new Account($db);
     }
     $object->initAsSpecimen();
@@ -168,13 +159,11 @@ if ($action == 'specimen') {
         if ($module->write_file($object, $langs) > 0) {
             header("Location: ".DOL_URL_ROOT."/document.php?modulepart=bank&file=SPECIMEN.pdf");
             return;
-        }
-        else {
+        } else {
             setEventMessages($module->error, null, 'errors');
             dol_syslog($module->error, LOG_ERR);
         }
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
         dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -183,8 +172,7 @@ if ($action == 'specimen') {
 // Activate a model
 if ($action == 'set') {
     $ret = addDocumentModel($value, $type, $label, $scandir);
-}
-elseif ($action == 'del') {
+} elseif ($action == 'del') {
     $ret = delDocumentModel($value, $type);
     if ($ret > 0) {
         if ($conf->global->BANKADDON_PDF == "$value")
@@ -269,8 +257,7 @@ while ($i < $nbofbank) {
         print '<td class="center">';
         print img_picto($langs->trans("Activated"), 'on');
         print '</td>';
-    }
-    else {
+    } else {
         print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setbankorder&amp;value='.$i.'">';
         print img_picto($langs->trans("Disabled"), 'off');
         print '</a></td>';
@@ -307,8 +294,7 @@ if ($resql) {
         array_push($def, $array[0]);
         $i++;
     }
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -368,8 +354,7 @@ foreach ($dirmodels as $reldir) {
                                     print img_picto($langs->trans("Enabled"), 'switch_on');
                                     print '</a>';
                                     print '</td>';
-                                }
-                                else {
+                                } else {
                                     print '<td class="center">'."\n";
                                     print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                                     print "</td>";
@@ -379,8 +364,7 @@ foreach ($dirmodels as $reldir) {
                                 print '<td class="center">';
                                 if ($conf->global->BANKADDON_PDF == $name) {
                                     print img_picto($langs->trans("Default"), 'on');
-                                }
-                                else {
+                                } else {
                                     print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
                                 }
                                 print '</td>';
@@ -408,8 +392,7 @@ foreach ($dirmodels as $reldir) {
                                 print '<td class="center">';
                                 if ($module->type == 'pdf') {
                                     print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-                                }
-                                else {
+                                } else {
                                     print img_object($langs->trans("PreviewNotAvailable"), 'generic');
                                 }
                                 print '</td>';
@@ -445,8 +428,7 @@ if ($conf->global->BANK_COLORIZE_MOVEMENT) {
     print img_picto($langs->trans("Enabled"), 'switch_on');
     print '</a>';
     print '</td>';
-}
-else {
+} else {
     print '<td class="center">'."\n";
     print '<a href="'.$_SERVER["PHP_SELF"].'?action=setbankcolorizemovement">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
     print "</td>";
@@ -505,8 +487,7 @@ if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE) {
     print img_picto($langs->trans("Enabled"), 'switch_on');
     print '</a>';
     print '</td>';
-}
-else {
+} else {
     print '<td class="center">'."\n";
     print '<a href="'.$_SERVER["PHP_SELF"].'?action=setreportlastnumreleve">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
     print "</td>";
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 90a2525de05..250e2cf6162 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -50,8 +50,7 @@ if ($action == 'setbarcodeproducton')
 	{
 	    $res = dolibarr_set_const($db, "BARCODE_STANDARD_PRODUCT_MASK", '020{000000000}', 'chaine', 0, '', $conf->entity);
 	}
-}
-elseif ($action == 'setbarcodeproductoff')
+} elseif ($action == 'setbarcodeproductoff')
 {
 	$res = dolibarr_del_const($db, "BARCODE_PRODUCT_ADDON_NUM", $conf->entity);
 }
@@ -67,8 +66,7 @@ if ($action == 'setcoder')
 
 	$resql = $db->query($sqlp);
 	if (!$resql) dol_print_error($db);
-}
-elseif ($action == 'update')
+} elseif ($action == 'update')
 {
 	$location = GETPOST('GENBARCODE_LOCATION', 'alpha');
 	$res = dolibarr_set_const($db, "GENBARCODE_LOCATION", $location, 'chaine', 0, '', $conf->entity);
@@ -80,12 +78,10 @@ elseif ($action == 'update')
 	if ($res > 0)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-elseif ($action == 'updateengine')
+} elseif ($action == 'updateengine')
 {
     $sql = "SELECT rowid, coder";
     $sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
@@ -263,17 +259,14 @@ if ($resql)
 						$url = DOL_URL_ROOT.'/viewimage.php?modulepart=barcode&amp;generator='.urlencode($obj->coder).'&amp;code='.urlencode($obj->example).'&amp;encoding='.urlencode($obj->encoding);
 						//print $url;
 						print '<img src="'.$url.'" title="'.$obj->example.'" border="0">';
-					}
-					else {
+					} else {
 						print $langs->trans("FormatNotSupportedByGenerator");
 					}
-				}
-				else {
+				} else {
 					print 'ErrorClassNotFoundInModule '.$classname.' '.$obj->coder;
 				}
 			}
-		}
-		else {
+		} else {
 			print $langs->trans("ChooseABarCode");
 		}
 		print '</td>';
@@ -388,8 +381,7 @@ if ($conf->product->enabled)
 
 	    		    try {
 	        			dol_include_once($dirroot.$file.'.php');
-	    			}
-	    			catch (Exception $e)
+	    			} catch (Exception $e)
 	    			{
 	    			    dol_syslog($e->getMessage(), LOG_ERR);
 	    			}
@@ -407,8 +399,7 @@ if ($conf->product->enabled)
 	    				print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproductoff&amp;value='.$file.'">';
 	    				print img_picto($langs->trans("Activated"), 'switch_on');
 	    				print '</a></td>';
-	    			}
-	    			else {
+	    			} else {
 	    				print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproducton&amp;value='.$file.'">';
 	    				print img_picto($langs->trans("Disabled"), 'switch_off');
 	    				print '</a></td>';
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index 26f3fe75858..46db7dd6c6c 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -57,13 +57,10 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -94,13 +91,11 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=bom&file=SPECIMEN.pdf");
 			return;
-		}
-		else {
+		} else {
 			setEventMessages($module->error, null, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -110,9 +105,7 @@ elseif ($action == 'specimen')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -137,17 +130,13 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Check if numbering module chosen can be activated
 	// by calling method canBeActivated
 
 	dolibarr_set_const($db, "BOM_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'set_BOM_DRAFT_WATERMARK')
+} elseif ($action == 'set_BOM_DRAFT_WATERMARK')
 {
 	$draft = GETPOST("BOM_DRAFT_WATERMARK");
 	$res = dolibarr_set_const($db, "BOM_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
@@ -157,13 +146,10 @@ elseif ($action == 'set_BOM_DRAFT_WATERMARK')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'set_BOM_FREE_TEXT')
+} elseif ($action == 'set_BOM_FREE_TEXT')
 {
 	$freetext = GETPOST("BOM_FREE_TEXT", 'none'); // No alpha here, we want exact string
 
@@ -174,8 +160,7 @@ elseif ($action == 'set_BOM_FREE_TEXT')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -256,8 +241,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->BOM_ADDON == $file)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else {
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -321,8 +305,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -391,8 +374,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -403,8 +385,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->BOM_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -432,8 +413,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-	                            }
-	                            else {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -478,8 +458,7 @@ $variablename = 'BOM_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else {
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 46f91e8b366..a45208db3b9 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -83,8 +83,7 @@ if ($action == 'add') {
                             $distinctfkuser[$obj->fk_user] = $obj->fk_user;
                             $i++;
                         }
-                    }
-                    else {
+                    } else {
                         setEventMessages($db->lasterror(), null, 'errors');
                         $error++;
                     }
@@ -108,8 +107,7 @@ if ($action == 'add') {
                                 if (preg_match('/A/', $boxorder)) $nbboxonleft++;
                                 if (preg_match('/B/', $boxorder)) $nbboxonright++;
                             }
-                        }
-                        else dol_print_error($db);
+                        } else dol_print_error($db);
 
                         $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (";
                         $sql .= "box_id, position, box_order, fk_user, entity";
@@ -133,8 +131,7 @@ if ($action == 'add') {
     {
         $db->commit();
         $action = '';
-    }
-    else {
+    } else {
         $db->rollback();
     }
 }
@@ -202,8 +199,7 @@ if ($action == 'switch')
 	if ($resultupdatefrom && $resultupdateto)
 	{
 		$db->commit();
-	}
-	else {
+	} else {
 		$db->rollback();
 	}
 }
@@ -285,23 +281,20 @@ if ($resql)
 						$box_order = "A0".$record['box_order'];
 						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$box_order."' WHERE entity = ".$conf->entity." AND box_order = '".$record['box_order']."'";
 						$resql = $db->query($sql);
-					}
-					elseif (preg_match("/[02468]{1}/", substr($record['box_order'], -1)))
+					} elseif (preg_match("/[02468]{1}/", substr($record['box_order'], -1)))
 					{
 						$box_order = "B0".$record['box_order'];
 						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$box_order."' WHERE entity = ".$conf->entity." AND box_order = '".$record['box_order']."'";
 						$resql = $db->query($sql);
 					}
-				}
-				elseif (dol_strlen($record['box_order']) == 2)
+				} elseif (dol_strlen($record['box_order']) == 2)
 				{
 					if (preg_match("/[13579]{1}/", substr($record['box_order'], -1)))
 					{
 						$box_order = "A".$record['box_order'];
 						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$box_order."' WHERE entity = ".$conf->entity." AND box_order = '".$record['box_order']."'";
 						$resql = $db->query($sql);
-					}
-					elseif (preg_match("/[02468]{1}/", substr($record['box_order'], -1)))
+					} elseif (preg_match("/[02468]{1}/", substr($record['box_order'], -1)))
 					{
 						$box_order = "B".$record['box_order'];
 						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$box_order."' WHERE entity = ".$conf->entity." AND box_order = '".$record['box_order']."'";
@@ -342,8 +335,7 @@ foreach ($boxtoadd as $box)
     if (preg_match('/^([^@]+)@([^@]+)$/i', $box->boximg))
     {
         $logo = $box->boximg;
-    }
-    else {
+    } else {
         $logo = preg_replace("/^object_/i", "", $box->boximg);
     }
 
@@ -357,8 +349,7 @@ foreach ($boxtoadd as $box)
     {
     	$langs->load("errors");
     	print $langs->trans("WarningUsingThisBoxSlowDown");
-    }
-	else print ($box->note ? $box->note : '&nbsp;');
+    } else print ($box->note ? $box->note : '&nbsp;');
     print '</td>'."\n";
     print '<td>'.$box->sourcefile.'</td>'."\n";
 
@@ -406,8 +397,7 @@ foreach ($boxactivated as $key => $box)
 	if (preg_match('/^([^@]+)@([^@]+)$/i', $box->boximg))
 	{
 		$logo = $box->boximg;
-	}
-	else {
+	} else {
 		$logo = preg_replace("/^object_/i", "", $box->boximg);
 	}
 
@@ -421,8 +411,7 @@ foreach ($boxactivated as $key => $box)
 	{
 		$langs->load("errors");
 		print img_warning('', 0).' '.$langs->trans("WarningUsingThisBoxSlowDown");
-	}
-	else print ($box->note ? $box->note : '&nbsp;');
+	} else print ($box->note ? $box->note : '&nbsp;');
 	print '</td>';
 	print '<td class="center">'.(empty($pos_name[$box->position]) ? '' : $langs->trans($pos_name[$box->position])).'</td>';
 	$hasnext = ($key < (count($boxactivated) - 1));
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index 397f289eaee..b619f584736 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -60,8 +60,7 @@ if ($action == 'updateMask')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -82,8 +81,7 @@ if ($action == 'set_BANK_CHEQUERECEIPT_FREE_TEXT')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -179,8 +177,7 @@ foreach ($dirmodels as $reldir)
 							if ($conf->global->CHEQUERECEIPTS_ADDON == $file || $conf->global->CHEQUERECEIPTS_ADDON.'.php' == $file)
 							{
 								print img_picto($langs->trans("Activated"), 'switch_on');
-							}
-							else {
+							} else {
 								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							}
 							print '</td>';
@@ -256,8 +253,7 @@ $variablename = 'BANK_CHEQUERECEIPT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
 	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else {
+} else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 56f4f076e54..74c49092cb3 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -46,8 +46,7 @@ if ($action == 'setvalue' && $user->admin)
     if ($result1 >= 0 && $result2 >= 0)
     {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -132,8 +131,7 @@ if (!empty($conf->global->CLICKTODIAL_URL))
 	if ($setupcomplete)
 	{
 		print $langs->trans("LinkToTest", $user->login).': '.dol_print_phone($phonefortest, '', 0, 0, 'AC_TEL');
-	}
-	else {
+	} else {
 		$langs->load("errors");
 		print '<div class="warning">'.$langs->trans("WarningClickToDialUserSetupNotComplete").'</div>';
 	}
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index f1f22203fa2..9acecc11604 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -66,13 +66,10 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -103,13 +100,11 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=commande&file=SPECIMEN.pdf");
 			return;
-		}
-		else {
+		} else {
 			setEventMessages($module->error, null, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -119,9 +114,7 @@ elseif ($action == 'specimen')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -146,17 +139,13 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Check if numbering module chosen can be activated
 	// by calling method canBeActivated
 
 	dolibarr_set_const($db, "COMMANDE_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'set_COMMANDE_DRAFT_WATERMARK')
+} elseif ($action == 'set_COMMANDE_DRAFT_WATERMARK')
 {
 	$draft = GETPOST("COMMANDE_DRAFT_WATERMARK");
 	$res = dolibarr_set_const($db, "COMMANDE_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
@@ -166,13 +155,10 @@ elseif ($action == 'set_COMMANDE_DRAFT_WATERMARK')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'set_ORDER_FREE_TEXT')
+} elseif ($action == 'set_ORDER_FREE_TEXT')
 {
 	$freetext = GETPOST("ORDER_FREE_TEXT", 'none'); // No alpha here, we want exact string
 
@@ -183,12 +169,10 @@ elseif ($action == 'set_ORDER_FREE_TEXT')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-elseif ($action == "setshippableiconinlist") {
+} elseif ($action == "setshippableiconinlist") {
     // Activate Set Shippable Icon In List
     $setshippableiconinlist = GETPOST('value', 'int');
     $res = dolibarr_set_const($db, "SHIPPABLE_ORDER_ICON_IN_LIST", $setshippableiconinlist, 'yesno', 0, '', $conf->entity);
@@ -198,8 +182,7 @@ elseif ($action == "setshippableiconinlist") {
     } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-elseif ($action == 'setribchq')
+} elseif ($action == 'setribchq')
 {
 	$rib = GETPOST('rib', 'alpha');
 	$chq = GETPOST('chq', 'alpha');
@@ -212,8 +195,7 @@ elseif ($action == 'setribchq')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -228,8 +210,7 @@ elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_ORDER')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -244,8 +225,7 @@ elseif ($action == 'set_WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -326,8 +306,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->COMMANDE_ADDON == $file)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else {
+						} else {
 							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -391,8 +370,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -461,8 +439,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -473,8 +450,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->COMMANDE_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -507,8 +483,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-	                            }
-	                            else {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -581,17 +556,14 @@ if (empty($conf->facture->enabled))
 					$i++;
 				}
 				print "</select>";
-			}
-			else {
+			} else {
 				print "<i>".$langs->trans("NoActiveBankAccountDefined")."</i>";
 			}
 		}
-	}
-	else {
+	} else {
 		print '<span class="opacitymedium">'.$langs->trans("BankModuleNotActive").'</span>';
 	}
-}
-else {
+} else {
 	print '<span class="opacitymedium">'.$langs->trans("SeeSetupOfModule", $langs->transnoentitiesnoconv("Module30Name")).'</span>';
 }
 print "</td></tr>";
@@ -628,8 +600,7 @@ if (empty($conf->facture->enabled))
 		}
 	}
 	print "</select>";
-}
-else {
+} else {
 	print '<span class="opacitymedium">'.$langs->trans("SeeSetupOfModule", $langs->transnoentitiesnoconv("Module30Name")).'</span>';
 }
 print "</td></tr>";
@@ -666,8 +637,7 @@ $variablename = 'ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else {
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index b5ae98378c9..f0aaf3fd074 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -84,8 +84,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 
 		$s = $mysoc->state_id.':'.$mysoc->state_code.':'.$mysoc->state_label;
 		dolibarr_set_const($db, "MAIN_INFO_SOCIETE_STATE", $s, 'chaine', 0, '', $conf->entity);
-	}
-	else {
+	} else {
 		dolibarr_del_const($db, "MAIN_INFO_SOCIETE_STATE", $conf->entity);
 	}
 
@@ -145,8 +144,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 							{
 								$imgThumbSmall = $reg[1]; // Save only basename
 								dolibarr_set_const($db, $constant."_SMALL", $imgThumbSmall, 'chaine', 0, '', $conf->entity);
-							}
-							else dol_syslog($imgThumbSmall);
+							} else dol_syslog($imgThumbSmall);
 
 							// Create mini thumb, Used on menu or for setup page for example
 							$imgThumbMini = vignette($dirforimage.$original_file, $maxwidthmini, $maxheightmini, '_mini', $quality);
@@ -154,22 +152,18 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 							{
 								$imgThumbMini = $reg[1]; // Save only basename
 								dolibarr_set_const($db, $constant."_MINI", $imgThumbMini, 'chaine', 0, '', $conf->entity);
-							}
-							else dol_syslog($imgThumbMini);
-						}
-						else dol_syslog("ErrorImageFormatNotSupported", LOG_WARNING);
+							} else dol_syslog($imgThumbMini);
+						} else dol_syslog("ErrorImageFormatNotSupported", LOG_WARNING);
 					} elseif (preg_match('/^ErrorFileIsInfectedWithAVirus/', $result)) {
 						$error++;
 						$langs->load("errors");
 						$tmparray = explode(':', $result);
 						setEventMessages($langs->trans('ErrorFileIsInfectedWithAVirus', $tmparray[1]), null, 'errors');
-					}
-					else {
+					} else {
 						$error++;
 						setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 					}
-				}
-				else {
+				} else {
 					$error++;
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
@@ -225,8 +219,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 		if (!isset($_REQUEST['lt1']))
 		{
 			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX1", 0, 'chaine', 0, '', $conf->entity);
-		}
-		else {
+		} else {
 			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX1", GETPOST('lt1', 'aZ09'), 'chaine', 0, '', $conf->entity);
 		}
 		dolibarr_set_const($db, "MAIN_INFO_LOCALTAX_CALC1", GETPOST("clt1", 'aZ09'), 'chaine', 0, '', $conf->entity);
@@ -236,8 +229,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 		if (!isset($_REQUEST['lt2']))
 		{
 			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX2", 0, 'chaine', 0, '', $conf->entity);
-		}
-		else {
+		} else {
 			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX2", GETPOST('lt2', 'aZ09'), 'chaine', 0, '', $conf->entity);
 		}
 		dolibarr_set_const($db, "MAIN_INFO_LOCALTAX_CALC2", GETPOST("clt2", 'aZ09'), 'chaine', 0, '', $conf->entity);
@@ -246,8 +238,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else {
+	} else {
 		$db->rollback();
 	}
 
@@ -281,8 +272,7 @@ if ($action == 'addthumb' || $action == 'addthumbsquarred')  // Regenerate thumb
 			{
 				$imgThumbSmall = $reg[1]; // Save only basename
 				dolibarr_set_const($db, $constant."_SMALL", $imgThumbSmall, 'chaine', 0, '', $conf->entity);
-			}
-			else dol_syslog($imgThumbSmall);
+			} else dol_syslog($imgThumbSmall);
 
 			// Create mini thumbs. Used on menu or for setup page for example
 			$imgThumbMini = vignette($conf->mycompany->dir_output.'/logos/'.$_GET["file"], $maxwidthmini, $maxheightmini, '_mini', $quality);
@@ -290,20 +280,17 @@ if ($action == 'addthumb' || $action == 'addthumbsquarred')  // Regenerate thumb
 			{
 				$imgThumbMini = $reg[1]; // Save only basename
 				dolibarr_set_const($db, $constant."_MINI", $imgThumbMini, 'chaine', 0, '', $conf->entity);
-			}
-			else dol_syslog($imgThumbMini);
+			} else dol_syslog($imgThumbMini);
 
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
-		}
-		else {
+		} else {
 			$error++;
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
 			dol_syslog($langs->transnoentities("ErrorBadImageFormat"), LOG_INFO);
 		}
-	}
-	else {
+	} else {
 		$error++;
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFileDoesNotExists", $_GET["file"]), null, 'errors');
@@ -574,8 +561,7 @@ if ($langs->transcountry("ProfId1", $mysoc->country_code) != '-')
 	if (!empty($mysoc->country_code))
 	{
 		print '<input name="siren" id="profid1" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SIREN) ? $conf->global->MAIN_INFO_SIREN : '').'">';
-	}
-	else {
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -588,8 +574,7 @@ if ($langs->transcountry("ProfId2", $mysoc->country_code) != '-')
 	if (!empty($mysoc->country_code))
 	{
 		print '<input name="siret" id="profid2" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SIRET) ? $conf->global->MAIN_INFO_SIRET : '').'">';
-	}
-	else {
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -602,8 +587,7 @@ if ($langs->transcountry("ProfId3", $mysoc->country_code) != '-')
 	if (!empty($mysoc->country_code))
 	{
 		print '<input name="ape" id="profid3" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_APE) ? $conf->global->MAIN_INFO_APE : '').'">';
-	}
-	else {
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -616,8 +600,7 @@ if ($langs->transcountry("ProfId4", $mysoc->country_code) != '-')
 	if (!empty($mysoc->country_code))
 	{
 		print '<input name="rcs" id="profid4" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_RCS) ? $conf->global->MAIN_INFO_RCS : '').'">';
-	}
-	else {
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -630,8 +613,7 @@ if ($langs->transcountry("ProfId5", $mysoc->country_code) != '-')
 	if (!empty($mysoc->country_code))
 	{
 		print '<input name="MAIN_INFO_PROFID5" id="profid5" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_PROFID5) ? $conf->global->MAIN_INFO_PROFID5 : '').'">';
-	}
-	else {
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -644,8 +626,7 @@ if ($langs->transcountry("ProfId6", $mysoc->country_code) != '-')
 	if (!empty($mysoc->country_code))
 	{
 		print '<input name="MAIN_INFO_PROFID6" id="profid6" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_PROFID6) ? $conf->global->MAIN_INFO_PROFID6 : '').'">';
-	}
-	else {
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 7c1c64369ad..4b98d8975eb 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -101,8 +101,7 @@ if ($action == 'update')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index 3f5cc1cd920..620a6fe01ea 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -70,8 +70,7 @@ if ($action == 'activate_delivery')
 	dolibarr_set_const($db, "MAIN_SUBMODULE_LIVRAISON", "1", 'chaine', 0, '', $conf->entity);
 	header("Location: confexped.php");
 	exit;
-}
-elseif ($action == 'disable_delivery')
+} elseif ($action == 'disable_delivery')
 {
 	dolibarr_del_const($db, "MAIN_SUBMODULE_LIVRAISON", $conf->entity);
 	header("Location: confexped.php");
@@ -135,8 +134,7 @@ print '<td class="center">';
 if (empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
 {
 	print '<a href="confexped.php?action=activate_delivery">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-}
-else {
+} else {
 	print '<a href="confexped.php?action=disable_delivery">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 }
 
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 9da7fb10bbf..18252d0849c 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -85,8 +85,7 @@ if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 			$constname = "";
 			$constvalue = "";
 			$constnote = "";
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -103,8 +102,7 @@ if (!empty($consts) && $action == 'update')
 			if (dolibarr_set_const($db, $const["name"], $const["value"], $const["type"], 1, $const["note"], $const["entity"]) >= 0)
 			{
 				$nbmodified++;
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -124,8 +122,7 @@ if (!empty($consts) && $action == 'delete')
 			if (dolibarr_del_const($db, $const["rowid"], -1) >= 0)
 			{
 				$nbdeleted++;
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -140,8 +137,7 @@ if ($action == 'delete')
 	if (dolibarr_del_const($db, $rowid, $entity) >= 0)
 	{
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -226,8 +222,7 @@ if (!empty($conf->multicompany->enabled) && !$user->entity)
 	print '<input type="text" class="flat" size="1" name="entity" value="'.$conf->entity.'">';
 	print '</td>';
 	print '<td class="center">';
-}
-else {
+} else {
 	print '<td class="center">';
 	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
 }
@@ -292,8 +287,7 @@ if ($result)
 			print '<input type="text" class="flat" size="1" name="const['.$i.'][entity]" value="'.$obj->entity.'">';
 			print '</td>';
 			print '<td class="center">';
-		}
-		else {
+		} else {
 			print '<td class="center">';
 			print '<input type="hidden" name="const['.$i.'][entity]" value="'.$obj->entity.'">';
 		}
@@ -301,8 +295,7 @@ if ($result)
 		if ($conf->use_javascript_ajax)
 		{
 			print '<input type="checkbox" class="flat checkboxfordelete" id="check_'.$i.'" name="const['.$i.'][check]" value="1">';
-		}
-		else {
+		} else {
 			print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
 		}
 
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index f3c50287107..474227349b8 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -62,13 +62,10 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'specimen') // For contract
+} elseif ($action == 'specimen') // For contract
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -99,13 +96,11 @@ elseif ($action == 'specimen') // For contract
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=contract&file=SPECIMEN.pdf");
 			return;
-		}
-		else {
+		} else {
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -115,9 +110,7 @@ elseif ($action == 'specimen') // For contract
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -142,17 +135,13 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "CONTRACT_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'set_other')
+} elseif ($action == 'set_other')
 {
 	$freetext = GETPOST('CONTRACT_FREE_TEXT', 'none'); // No alpha here, we want exact string
 	$res1 = dolibarr_set_const($db, "CONTRACT_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
@@ -165,8 +154,7 @@ elseif ($action == 'set_other')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -238,8 +226,7 @@ foreach ($dirmodels as $reldir)
 						// Show example of numbering model
 						print '<td class="nowrap">';
 						$tmp = $module->getExample();
-						if (preg_match('/^Error/', $tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
-						elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						if (preg_match('/^Error/', $tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 						else print $tmp;
 						print '</td>'."\n";
 
@@ -247,8 +234,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->CONTRACT_ADDON == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else {
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -311,8 +297,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -381,8 +366,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -393,8 +377,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->CONTRACT_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -425,8 +408,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
-	                            }
-	                            else {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -473,8 +455,7 @@ $variablename = 'CONTRACT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else {
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index b7cb424d2cb..2937de3ed51 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -96,12 +96,10 @@ if ($action == 'edit')
 		if ($key == 'DAV_ALLOW_PRIVATE_DIR')
 		{
 		    print $langs->trans("AlwaysActive");
-		}
-		elseif ($key == 'DAV_ALLOW_PUBLIC_DIR' || $key == 'DAV_ALLOW_ECM_DIR')
+		} elseif ($key == 'DAV_ALLOW_PUBLIC_DIR' || $key == 'DAV_ALLOW_ECM_DIR')
 		{
 			print $form->selectyesno($key, $conf->global->$key, 1);
-		}
-		else {
+		} else {
 			print '<input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->$key.'">';
 		}
 		print '</td></tr>';
@@ -115,8 +113,7 @@ if ($action == 'edit')
 
 	print '</form>';
 	print '<br>';
-}
-else {
+} else {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
@@ -134,12 +131,10 @@ else {
 		if ($key == 'DAV_ALLOW_PRIVATE_DIR')
 		{
 		    print $langs->trans("AlwaysActive");
-		}
-		elseif ($key == 'DAV_ALLOW_PUBLIC_DIR' || $key == 'DAV_ALLOW_ECM_DIR')
+		} elseif ($key == 'DAV_ALLOW_PUBLIC_DIR' || $key == 'DAV_ALLOW_ECM_DIR')
 		{
 			print yn($conf->global->$key);
-		}
-		else {
+		} else {
 			print $conf->global->$key;
 		}
 		print '</td></tr>';
diff --git a/htdocs/admin/debugbar.php b/htdocs/admin/debugbar.php
index dad99b2ab39..f9dae118316 100644
--- a/htdocs/admin/debugbar.php
+++ b/htdocs/admin/debugbar.php
@@ -58,8 +58,7 @@ if ($action == 'set')
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		$db->rollback();
 		setEventMessages($error, null, 'errors');
 	}
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 2622d5ca514..10b6a536e9f 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -150,8 +150,7 @@ if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('ac
 			$defaulturl = '';
 			$defaultkey = '';
 			$defaultvalue = '';
-		}
-		else {
+		} else {
 	        $db->rollback();
 		    setEventMessages($db->lasterror(), null, 'errors');
 			$action = '';
@@ -168,8 +167,7 @@ if ($action == 'delete')
 	if ($result >= 0)
 	{
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -195,8 +193,7 @@ if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))
     $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&value=1'.$param.'">';
     $enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
     $enabledisablehtml .= '</a>';
-}
-else {
+} else {
     // Button on, click to disable
     $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&value=0'.$param.'">';
     $enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
@@ -257,8 +254,7 @@ $texthelp = $langs->trans("TheKeyIsTheNameOfHtmlField");
 if ($mode != 'sortorder')
 {
     $textkey = $form->textwithpicto($langs->trans("Field"), $texthelp);
-}
-else {
+} else {
     $texthelp = 'field or alias.field';
     $textkey = $form->textwithpicto($langs->trans("Field"), $texthelp);
 }
@@ -276,8 +272,7 @@ if ($mode != 'focus' && $mode != 'mandatory')
             $texthelp .= $key.' -> '.$val.'<br>';
         }
         $textvalue = $form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, 'subsitutiontooltip');
-    }
-    else {
+    } else {
         $texthelp = 'ASC or DESC';
         $textvalue = $form->textwithpicto($langs->trans("SortOrder"), $texthelp);
     }
@@ -316,8 +311,7 @@ if (!empty($conf->multicompany->enabled) && !$user->entity)
 	print '<td>';
 	print '<input type="text" class="flat" size="1" disabled name="entity" value="'.$conf->entity.'">'; // We see environment, but to change it we must switch on other entity
 	print '</td>';
-}
-else {
+} else {
 	print '<td class="center">';
 	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
 	print '</td>';
@@ -387,8 +381,7 @@ if ($result)
     		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=edit'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
     		print ' &nbsp; ';
     		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=delete'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
-		}
-		else {
+		} else {
 		    print '<input type="hidden" name="page" value="'.$page.'">';
 		    print '<input type="hidden" name="rowid" value="'.$id.'">';
 		    print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : 'none').'"></div>';
@@ -401,8 +394,7 @@ if ($result)
 		print "\n";
 		$i++;
 	}
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 26f2f87e2d5..2ece442d74f 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -249,8 +249,7 @@ if ($action == 'edit')
 	print '</td></tr>';
 
 	print '</table>';
-}
-else {
+} else {
     /*
      * Show parameters
      */
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 7ed84b59629..7f468cc1f1a 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -697,8 +697,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
     	if (in_array($tablib[$id], array('DictionaryCompanyType', 'DictionaryHolidayTypes')))	// Field country is no mandatory for such dictionaries
     	{
     		$_POST["country"] = '';
-    	}
-    	else {
+    	} else {
         	$ok = 0;
         	setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Country")), null, 'errors');
     	}
@@ -758,8 +757,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 
             if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
             	$_POST[$keycode] = price2num($_POST[$keycode], 'MU');
-            }
-            elseif ($value == 'entity') {
+            } elseif ($value == 'entity') {
             	$_POST[$keycode] = getEntity($tabname[$id]);
             }
 
@@ -768,15 +766,12 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
             if ($keycode == 'sortorder')		// For column name 'sortorder', we use the field name 'position'
             {
             	$sql .= "'".(int) GETPOST('position', 'int')."'";
-            }
-            elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
+            } elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
             elseif ($keycode == 'content') {
             	$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-            }
-            elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
+            } elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
             	$sql .= (int) GETPOST($keycode, 'int');
-            }
-            else {
+            } else {
             	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
             }
 
@@ -790,12 +785,10 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         {
             setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
         	$_POST = array('id'=>$id); // Clean $_POST array, we keep only
-        }
-        else {
+        } else {
             if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                 setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-            }
-            else {
+            } else {
                 dol_print_error($db);
             }
         }
@@ -804,8 +797,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
     // If verif ok and action modify, modify the line
     if ($ok && GETPOST('actionmodify'))
     {
-        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-        else { $rowidcol = "rowid"; }
+        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
         // Modify entry
         $sql = "UPDATE ".$tabname[$id]." SET ";
@@ -823,8 +815,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 
             if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
             	$_POST[$keycode] = price2num($_POST[$keycode], 'MU');
-            }
-            elseif ($field == 'entity') {
+            } elseif ($field == 'entity') {
             	$_POST[$keycode] = getEntity($tabname[$id]);
             }
 
@@ -833,15 +824,12 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
             if ($listfieldvalue[$i] == 'sortorder')		// For column name 'sortorder', we use the field name 'position'
             {
             	$sql .= (int) GETPOST('position', 'int');
-            }
-            elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
+            } elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
             elseif ($keycode == 'content') {
             	$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-            }
-            elseif (in_array($keycode, array('private', 'position', 'scale'))) {
+            } elseif (in_array($keycode, array('private', 'position', 'scale'))) {
             	$sql .= (int) GETPOST($keycode, 'int');
-            }
-            else {
+            } else {
             	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
             }
 
@@ -868,8 +856,7 @@ if (GETPOST('actioncancel'))
 
 if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     $sql = "DELETE FROM ".$tabname[$id]." WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 
@@ -880,8 +867,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
         if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
         {
             setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-        }
-        else {
+        } else {
             dol_print_error($db);
         }
     }
@@ -890,13 +876,11 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 // activate
 if ($action == $acts[0])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
         $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
-    elseif ($code) {
+    } elseif ($code) {
     	$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     }
 
@@ -910,13 +894,11 @@ if ($action == $acts[0])
 // disable
 if ($action == $acts[1])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
         $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
-    elseif ($code) {
+    } elseif ($code) {
     	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     }
 
@@ -930,13 +912,11 @@ if ($action == $acts[1])
 // favorite
 if ($action == 'activate_favorite')
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
         $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
-    elseif ($code) {
+    } elseif ($code) {
     	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     }
 
@@ -950,13 +930,11 @@ if ($action == 'activate_favorite')
 // disable favorite
 if ($action == 'disable_favorite')
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
         $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
-    elseif ($code) {
+    } elseif ($code) {
     	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     }
 
@@ -1053,8 +1031,7 @@ if ($id)
         // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
         $tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i', '', $tabsqlsort[$id]);
         $tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.',/i', '', $tabsqlsort[$id]);
-    }
-    else {
+    } else {
         $sql .= " ORDER BY ";
     }
     $sql .= $tabsqlsort[$id];
@@ -1291,15 +1268,13 @@ if ($id)
                     print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth150 maxwidthonsmartphone');
                     print '</td>';
                     $filterfound++;
-                }
-                elseif ($value == 'code')
+                } elseif ($value == 'code')
                 {
                     print '<td class="liste_titre">';
                     print '<input type="text" class="maxwidth100" name="search_code" value="'.dol_escape_htmltag($search_code).'">';
                     print '</td>';
                     $filterfound++;
-                }
-                else {
+                } else {
                     print '<td class="liste_titre">';
                     print '</td>';
                 }
@@ -1434,8 +1409,7 @@ if ($id)
                     print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
                     print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
                     print '</td>';
-                }
-                else {
+                } else {
 	              	$tmpaction = 'view';
                     $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
                     $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
@@ -1461,29 +1435,23 @@ if ($id)
                             if ($value == 'element')
                             {
                                 $valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
-                            }
-                            elseif ($value == 'source')
+                            } elseif ($value == 'source')
                             {
                                 $valuetoshow = isset($sourceList[$valuetoshow]) ? $sourceList[$valuetoshow] : $valuetoshow;
-                            }
-                            elseif ($valuetoshow == 'all') {
+                            } elseif ($valuetoshow == 'all') {
                                 $valuetoshow = $langs->trans('All');
-                            }
-                            elseif ($fieldlist[$field] == 'country') {
+                            } elseif ($fieldlist[$field] == 'country') {
                                 if (empty($obj->country_code))
                                 {
                                     $valuetoshow = '-';
-                                }
-                                else {
+                                } else {
                                     $key = $langs->trans("Country".strtoupper($obj->country_code));
                                     $valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
                                 }
-                            }
-                            elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
+                            } elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
                                 $valuetoshow = yn($valuetoshow);
                                 $class = "center";
-                            }
-                            elseif ($fieldlist[$field] == 'type_cdr') {
+                            } elseif ($fieldlist[$field] == 'type_cdr') {
                 				if (empty($valuetoshow)) $valuetoshow = $langs->trans('None');
                 				elseif ($valuetoshow == 1) $valuetoshow = $langs->trans('AtEndOfMonth');
                 				elseif ($valuetoshow == 2) $valuetoshow = $langs->trans('CurrentNext');
@@ -1494,130 +1462,102 @@ if ($id)
                             if ($value == 'private')
                             {
                                 $valuetoshow = yn($elementList[$valuetoshow]);
-                            }
-                            elseif ($fieldlist[$field] == 'libelle_facture') {
+                            } elseif ($fieldlist[$field] == 'libelle_facture') {
                                 $langs->load("bills");
                                 $key = $langs->trans("PaymentCondition".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "PaymentCondition".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
                                 $valuetoshow = nl2br($valuetoshow);
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
+                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
                                 $key = $langs->trans("Country".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
+                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
                                 $langs->load("propal");
                                 $key = $langs->trans("AvailabilityType".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
+                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
                                 $key = $langs->trans("Action".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif (!empty($obj->code_iso) && $fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_currencies') {
+                            } elseif (!empty($obj->code_iso) && $fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_currencies') {
                                 $key = $langs->trans("Currency".strtoupper($obj->code_iso));
                                 $valuetoshow = ($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_typent') {
+                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_typent') {
                                 $key = $langs->trans(strtoupper($obj->code));
                                 $valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_prospectlevel') {
+                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_prospectlevel') {
                                 $key = $langs->trans(strtoupper($obj->code));
                                 $valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_civility') {
+                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_civility') {
                                 $key = $langs->trans("Civility".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "Civility".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_contact') {
+                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_contact') {
                             	$langs->load('agenda');
                                 $key = $langs->trans("TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_payment_term') {
+                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_payment_term') {
                                 $langs->load("bills");
                                 $key = $langs->trans("PaymentConditionShort".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
+                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
                                 $langs->load("bills");
                                 $key = $langs->trans("PaymentType".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "PaymentType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'type' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
+                            } elseif ($fieldlist[$field] == 'type' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
                             	$payment_type_list = array(0=>$langs->trans('PaymentTypeCustomer'), 1=>$langs->trans('PaymentTypeSupplier'), 2=>$langs->trans('PaymentTypeBoth'));
                             	$valuetoshow = $payment_type_list[$valuetoshow];
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_reason') {
+                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_reason') {
                                 $key = $langs->trans("DemandReasonType".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "DemandReasonType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_method') {
+                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_method') {
                                 $langs->load("orders");
                                 $key = $langs->trans($obj->code);
                                 $valuetoshow = ($obj->code && $key != $obj->code) ? $key : $obj->{$fieldlist[$field]};
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_shipment_mode') {
+                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_shipment_mode') {
                                 $langs->load("sendings");
                                 $key = $langs->trans("SendingMethod".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "SendingMethod".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paper_format')
+                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paper_format')
                             {
                                 $key = $langs->trans('PaperFormat'.strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees')
+                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees')
                             {
                                 $langs->load('trips');
                                 $key = $langs->trans(strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
+                            } elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
                                 $showfield = 0;
-                            }
-                            elseif ($fieldlist[$field] == 'unicode') {
+                            } elseif ($fieldlist[$field] == 'unicode') {
                             	$valuetoshow = $langs->getCurrencySymbol($obj->code, 1);
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
+                            } elseif ($fieldlist[$field] == 'label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
 	                            $langs->load("products");
 	                            $valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'short_label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
+                            } elseif ($fieldlist[$field] == 'short_label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
 	                            $langs->load("products");
 	                            $valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
-                            }
-                            elseif (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format'))
+                            } elseif (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format'))
                             {
                             	$key = $langs->trans('SizeUnit'.strtolower($obj->unit));
                                 $valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
-                            }
-							elseif ($fieldlist[$field] == 'localtax1' || $fieldlist[$field] == 'localtax2') {
+                            } elseif ($fieldlist[$field] == 'localtax1' || $fieldlist[$field] == 'localtax2') {
 							    $class = "center";
-							}
-							elseif ($fieldlist[$field] == 'localtax1_type') {
+							} elseif ($fieldlist[$field] == 'localtax1_type') {
                                 if ($obj->localtax1 != 0)
 							        $valuetoshow = $localtax_typeList[$valuetoshow];
 							    else $valuetoshow = '';
 							    $class = "center";
-							}
-							elseif ($fieldlist[$field] == 'localtax2_type') {
+							} elseif ($fieldlist[$field] == 'localtax2_type') {
 							    if ($obj->localtax2 != 0)
 							        $valuetoshow = $localtax_typeList[$valuetoshow];
 							    else $valuetoshow = '';
 							    $class = "center";
-							}
-							elseif ($fieldlist[$field] == 'taux') {
+							} elseif ($fieldlist[$field] == 'taux') {
                                 $valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
 							    $class = "center";
 							} elseif (in_array($fieldlist[$field], array('recuperableonly'))) {
 								$class = "center";
-							}
-							elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy') {
+							} elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy') {
                                 $valuetoshow = length_accountg($valuetoshow);
-                            }
-							elseif ($fieldlist[$field] == 'fk_tva')
+                            } elseif ($fieldlist[$field] == 'fk_tva')
 							{
 								foreach ($form->cache_vatrates as $key => $Tab)
 								{
@@ -1627,23 +1567,19 @@ if ($id)
 										break;
 									}
 								}
-							}
-							elseif ($fieldlist[$field] == 'fk_c_exp_tax_cat')
+							} elseif ($fieldlist[$field] == 'fk_c_exp_tax_cat')
 							{
 								$valuetoshow = getDictvalue(MAIN_DB_PREFIX.'c_exp_tax_cat', 'label', $valuetoshow);
 								$valuetoshow = $langs->trans($valuetoshow);
-							}
-							elseif ($tabname[$id] == MAIN_DB_PREFIX.'c_exp_tax_cat')
+							} elseif ($tabname[$id] == MAIN_DB_PREFIX.'c_exp_tax_cat')
 							{
 								$valuetoshow = $langs->trans($valuetoshow);
-							}
-							elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_units')
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_units')
 							{
 								$langs->load('other');
 								$key = $langs->trans($obj->label);
 								$valuetoshow = ($obj->label && $key != strtoupper($obj->label) ? $key : $obj->{$fieldlist[$field]});
-							}
-							elseif ($fieldlist[$field] == 'code' && $id == 3) {
+							} elseif ($fieldlist[$field] == 'code' && $id == 3) {
 								$valuetoshow = $obj->state_code;
 							}
                             $class .= ($class ? ' ' : '').'tddict';
@@ -1664,9 +1600,7 @@ if ($id)
                     $canbemodified = 1;
                     if (isset($obj->code) && $id != 10)
                     {
-                    	if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) { $iserasable = 0; $canbedisabled = 0; }
-                    	elseif ($obj->code == 'RECEP') { $iserasable = 0; $canbedisabled = 0; }
-                    	elseif ($obj->code == 'EF0') { $iserasable = 0; $canbedisabled = 0; }
+                    	if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) { $iserasable = 0; $canbedisabled = 0; } elseif ($obj->code == 'RECEP') { $iserasable = 0; $canbedisabled = 0; } elseif ($obj->code == 'EF0') { $iserasable = 0; $canbedisabled = 0; }
                     }
 					if ($id == 25 && in_array($obj->code, array('banner', 'blogpost', 'other', 'page')))
 					{
@@ -1720,8 +1654,7 @@ if ($id)
                         if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
                         //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
                         print '</td>';
-                    }
-                    else print '<td>&nbsp;</td>';
+                    } else print '<td>&nbsp;</td>';
 
                     print "</tr>\n";
                 }
@@ -1731,14 +1664,12 @@ if ($id)
 
         print '</table>';
         print '</div>';
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 
     print '</form>';
-}
-else {
+} else {
     /*
      * Show list of dictionary to show
      */
@@ -1771,8 +1702,7 @@ else {
             if (!empty($tabcond[$i]))
             {
                 print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">'.$langs->trans($tablib[$i]).'</a>';
-            }
-            else {
+            } else {
                 print $langs->trans($tablib[$i]);
             }
             print '</td>';
@@ -1784,8 +1714,7 @@ else {
             print '</td>';
             print '<td>'.$tabname[$i].'</td></tr>';
             $lastlineisempty = false;
-        }
-        else {
+        } else {
             if (!$lastlineisempty)
             {
                 $showemptyline = 1;
@@ -1840,8 +1769,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
             print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$hidden.'">';
             print $langs->trans($hidden);
             print '</td>';
-        }
-	    elseif ($fieldlist[$field] == 'country')
+        } elseif ($fieldlist[$field] == 'country')
 		{
 			if (in_array('region_id', $fieldlist))
 			{
@@ -1853,8 +1781,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			$fieldname = 'country';
 			print $form->select_country((!empty($obj->country_code) ? $obj->country_code : (!empty($obj->country) ? $obj->country : '')), $fieldname, '', 28, 'maxwidth150 maxwidthonsmartphone');
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'country_id')
+		} elseif ($fieldlist[$field] == 'country_id')
 		{
 			if (!in_array('country', $fieldlist))	// If there is already a field country, we don't show country_id (avoid duplicate)
 			{
@@ -1863,21 +1790,18 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
 				print '</td>';
 			}
-		}
-		elseif ($fieldlist[$field] == 'region')
+		} elseif ($fieldlist[$field] == 'region')
 		{
 			print '<td>';
 			$formcompany->select_region($region_id, 'region');
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'region_id')
+		} elseif ($fieldlist[$field] == 'region_id')
 		{
 			$region_id = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:0);
 			print '<td>';
 			print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$region_id.'">';
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'lang')
+		} elseif ($fieldlist[$field] == 'lang')
 		{
 			print '<td>';
 			print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'lang');
@@ -1896,28 +1820,24 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td>';
 			print $form->selectarray('source', $sourceList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'private')
+		} elseif ($fieldlist[$field] == 'private')
 		{
 			print '<td>';
 			print $form->selectyesno("private", (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX."c_actioncomm")
+		} elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX."c_actioncomm")
 		{
 			$type = (!empty($obj->type) ? $obj->type : 'user'); // Check if type is different of 'user' (external module)
 			print '<td>';
 			print $type.'<input type="hidden" name="type" value="'.$type.'">';
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX.'c_paiement')
+		} elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX.'c_paiement')
 		{
 			print '<td>';
 			$select_list = array(0=>$langs->trans('PaymentTypeCustomer'), 1=>$langs->trans('PaymentTypeSupplier'), 2=>$langs->trans('PaymentTypeBoth'));
 			print $form->selectarray($fieldlist[$field], $select_list, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'2'));
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'type_cdr' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
+		} elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'type_cdr' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
 		    if ($fieldlist[$field] == 'type_cdr') print '<td class="center">';
 		    else print '<td>';
 			if ($fieldlist[$field] == 'type_cdr') {
@@ -1926,15 +1846,13 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				print $form->selectyesno($fieldlist[$field], (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1);
 			}
 			print '</td>';
-		}
-		elseif (in_array($fieldlist[$field], array('nbjour', 'decalage', 'taux', 'localtax1', 'localtax2'))) {
+		} elseif (in_array($fieldlist[$field], array('nbjour', 'decalage', 'taux', 'localtax1', 'localtax2'))) {
 			$class = "left";
 			if (in_array($fieldlist[$field], array('taux', 'localtax1', 'localtax2'))) $class = "center"; // Fields aligned on right
 			print '<td class="'.$class.'">';
 			print '<input type="text" class="flat" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" size="3" name="'.$fieldlist[$field].'">';
 			print '</td>';
-		}
-		elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
+		} elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
 		    print '<td>';
 		    $transfound = 0;
 		    $transkey = '';
@@ -1952,19 +1870,15 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 		    if (!$transfound)
 		    {
 		        print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'</textarea>';
-		    }
-            else {
+		    } else {
                 print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$transkey.'">';
             }
 		    print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
+		} elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
 			print '<td><input type="text" class="flat minwidth75" value="'.price((!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'')).'" name="'.$fieldlist[$field].'"></td>';
-		}
-		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
+		} elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
 			print '<td><input type="text" class="flat minwidth75 maxwidth100" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'"></td>';
-		}
-		elseif ($fieldlist[$field] == 'unit') {
+		} elseif ($fieldlist[$field] == 'unit') {
 			print '<td>';
 			$units = array(
 					'mm' => $langs->trans('SizeUnitmm'),
@@ -1981,8 +1895,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td class="center">';
 			print $form->selectarray($fieldlist[$field], $localtax_typeList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy')
+		} elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy')
 		{
 			print '<td>';
 			if (!empty($conf->accounting->enabled))
@@ -1990,32 +1903,27 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			    $fieldname = $fieldlist[$field];
 				$accountancy_account = (!empty($obj->$fieldname) ? $obj->$fieldname : 0);
 				print $formaccounting->select_account($accountancy_account, '.'.$fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
-			}
-			else {
+			} else {
 			    $fieldname = $fieldlist[$field];
 			    print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldname) ? $obj->$fieldname : '').'" name="'.$fieldlist[$field].'">';
 			}
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'fk_tva')
+		} elseif ($fieldlist[$field] == 'fk_tva')
 		{
 			print '<td>';
 			print $form->load_tva('fk_tva', $obj->taux, $mysoc, new Societe($db), 0, 0, '', false, -1);
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'fk_c_exp_tax_cat')
+		} elseif ($fieldlist[$field] == 'fk_c_exp_tax_cat')
 		{
 			print '<td>';
 			print $form->selectExpenseCategories($obj->fk_c_exp_tax_cat);
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'fk_range')
+		} elseif ($fieldlist[$field] == 'fk_range')
 		{
 			print '<td>';
 			print $form->selectExpenseRanges($obj->fk_range);
 			print '</td>';
-		}
-		else {
+		} else {
             $fieldValue = isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'';
 
 			if ($fieldlist[$field] == 'sortorder')
@@ -2049,8 +1957,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			if (!$transfound)
 			{
                 print '<input type="text" class="flat'.($class ? ' '.$class : '').'" value="'.dol_escape_htmltag($fieldValue).'" name="'.$fieldlist[$field].'">';
-			}
-            else {
+			} else {
                 print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$transkey.'">';
             }
 			print '</td>';
diff --git a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
index 6eaf1cf375a..0227db8d969 100644
--- a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
+++ b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
@@ -237,8 +237,7 @@ class PrestaShopWebservice
 				throw new PrestaShopWebserviceException('HTTP XML response is not parsable: '.$msg);
 			}
 			return $xml;
-		}
-		else {
+		} else {
 			throw new PrestaShopWebserviceException('HTTP response is empty');
 		}
 	}
diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php
index b9af92dc8a5..145dfc6cbf8 100644
--- a/htdocs/admin/ecm.php
+++ b/htdocs/admin/ecm.php
@@ -41,8 +41,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -54,8 +53,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -91,13 +89,11 @@ print '<td class="center" width="100">';
 if ($conf->use_javascript_ajax)
 {
 	print ajax_constantonoff('ECM_AUTO_TREE_ENABLED');
-}
-else {
+} else {
 	if (empty($conf->global->ECM_AUTO_TREE_ENABLED))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ECM_AUTO_TREE_ENABLED">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	elseif (!empty($conf->global->USER_MAIL_REQUIRED))
+	} elseif (!empty($conf->global->USER_MAIL_REQUIRED))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ECM_AUTO_TREE_ENABLED">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index a554354420d..21dfb60c96e 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -126,8 +126,7 @@ if (GETPOST('addfilter', 'alpha'))
 	if ($result > 0)
 	{
 		$object->fetchFilters();
-	}
-	else {
+	} else {
 		setEventMessages($emailcollectorfilter->errors, $emailcollectorfilter->error, 'errors');
 	}
 }
@@ -140,8 +139,7 @@ if ($action == 'deletefilter')
 	if ($result > 0)
 	{
 		$object->fetchFilters();
-	}
-	else {
+	} else {
 		setEventMessages($emailcollectorfilter->errors, $emailcollectorfilter->error, 'errors');
 	}
 }
@@ -160,8 +158,7 @@ if (GETPOST('addoperation', 'alpha'))
 	if ($result > 0)
 	{
 		$object->fetchActions();
-	}
-	else {
+	} else {
 		setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
 	}
 }
@@ -178,8 +175,7 @@ if ($action == 'updateoperation')
     if ($result > 0)
     {
         $object->fetchActions();
-    }
-    else {
+    } else {
         setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
     }
 }
@@ -191,8 +187,7 @@ if ($action == 'deleteoperation')
 	if ($result > 0)
 	{
 		$object->fetchActions();
-	}
-	else {
+	} else {
 		setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
 	}
 }
@@ -206,8 +201,7 @@ if ($action == 'confirm_collect')
 	{
 	    $debuginfo = $object->debuginfo;
 	    setEventMessages($object->lastresult, null, 'mesgs');
-	}
-	else {
+	} else {
 	    $debuginfo = $object->debuginfo;
 	    setEventMessages($object->error, null, 'errors');
 	}
@@ -426,23 +420,20 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 
 			$connection = imap_open($connectstringsource, $object->login, $object->password);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			print $e->getMessage();
 		}
 
 		$morehtml .= $form->textwithpicto('', 'connect string '.$connectstringserver);
-	}
-	else {
+	} else {
 		$morehtml .= 'IMAP functions not available on your PHP';
 	}
 
 	if (!$connection)
 	{
 		$morehtml .= 'Failed to open IMAP connection '.$connectstringsource;
-	}
-	else {
+	} else {
 		$morehtml .= imap_num_msg($connection);
 	}
 
@@ -605,8 +596,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if (in_array($ruleaction['type'], array('recordevent')))
 		{
             print $form->textwithpicto('', $langs->transnoentitiesnoconv('IfTrackingIDFoundEventWillBeLinked'));
-		}
-		elseif (in_array($ruleaction['type'], array('loadthirdparty', 'loadandcreatethirdparty'))) {
+		} elseif (in_array($ruleaction['type'], array('loadthirdparty', 'loadandcreatethirdparty'))) {
 			print $form->textwithpicto('', $langs->transnoentitiesnoconv('EmailCollectorLoadThirdPartyHelp'));
 		}
 		print '</td>';
@@ -616,8 +606,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		    print '<input type="text" class="quatrevingtquinzepercent" name="operationparam2" value="'.$ruleaction['actionparam'].'"><br>';
 		    print '<input type="hidden" name="rowidoperation2" value="'.$ruleaction['id'].'"><br>';
 		    print '<input type="submit" class="button" name="saveoperation2" value="'.$langs->trans("Save").'"> <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-		}
-		else {
+		} else {
 		    print $ruleaction['actionparam'];
 		}
 		print '</td>';
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index bb17bbdca05..d2babfeaf5c 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -241,8 +241,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else {
+} else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index cd9a2976e11..21cb83c356a 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -71,9 +71,7 @@ if ($action == 'updateMask')
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 		else setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-
-elseif ($action == 'set_param')
+} elseif ($action == 'set_param')
 {
 	$freetext = GETPOST('SHIPPING_FREE_TEXT', 'none'); // No alpha here, we want exact string
 	$res = dolibarr_set_const($db, "SHIPPING_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
@@ -95,9 +93,7 @@ elseif ($action == 'set_param')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-}
-
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -128,13 +124,11 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=expedition&file=SPECIMEN.pdf");
 			return;
-		}
-		else {
+		} else {
 			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -144,9 +138,7 @@ elseif ($action == 'specimen')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -171,9 +163,7 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmodel')
+} elseif ($action == 'setmodel')
 {
 	dolibarr_set_const($db, "EXPEDITION_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
 }
@@ -246,8 +236,7 @@ foreach ($dirmodels as $reldir)
                         $tmp = $module->getExample();
                         if (preg_match('/^Error/', $tmp)) {
 							$langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
-						}
-                        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
                         else print $tmp;
                         print '</td>'."\n";
 
@@ -255,8 +244,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->EXPEDITION_ADDON_NUMBER == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else {
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;value='.$file.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -322,8 +310,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -390,8 +377,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -402,8 +388,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->EXPEDITION_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -431,8 +416,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'sending').'</a>';
-	                            }
-	                            else {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -478,8 +462,7 @@ $variablename = 'SHIPPING_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else {
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 20f85dc6a29..596428d4c7f 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -63,13 +63,10 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'specimen') // For fiche inter
+} elseif ($action == 'specimen') // For fiche inter
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -102,13 +99,11 @@ elseif ($action == 'specimen') // For fiche inter
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=expensereport&file=SPECIMEN.pdf");
 			return;
-		}
-		else {
+		} else {
 			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -122,9 +117,7 @@ elseif ($action == 'set')
 	{
 		dolibarr_set_const($db, 'EXPENSEREPORT_ADDON_PDF', $value, 'chaine', 0, '', $conf->entity);
 	}
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -149,17 +142,13 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "EXPENSEREPORT_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'setoptions')
+} elseif ($action == 'setoptions')
 {
     $db->begin();
 
@@ -175,8 +164,7 @@ elseif ($action == 'setoptions')
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         $db->rollback();
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -259,8 +247,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->EXPENSEREPORT_ADDON == $file)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else {
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -323,8 +310,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -389,8 +375,7 @@ foreach ($dirmodels as $reldir)
 		    					print img_picto($langs->trans("Enabled"), 'switch_on');
 		    					print '</a>';
 		    					print "</td>";
-		    				}
-		    				else {
+		    				} else {
 		    					print '<td class="center">'."\n";
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 		    					print "</td>";
@@ -401,8 +386,7 @@ foreach ($dirmodels as $reldir)
 		    				if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$name")
 		    				{
 		    					print img_picto($langs->trans("Default"), 'on');
-		    				}
-		    				else {
+		    				} else {
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		    				}
 		    				print '</td>';
@@ -426,8 +410,7 @@ foreach ($dirmodels as $reldir)
 		    				if ($module->type == 'pdf')
 		    				{
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'intervention').'</a>';
-		    				}
-		    				else {
+		    				} else {
 		    					print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 		    				}
 		    				print '</td>';
@@ -475,8 +458,7 @@ $variablename = 'EXPENSEREPORT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else {
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/expensereport_ik.php b/htdocs/admin/expensereport_ik.php
index 2b089335c40..ebdc1f7ed59 100644
--- a/htdocs/admin/expensereport_ik.php
+++ b/htdocs/admin/expensereport_ik.php
@@ -63,8 +63,7 @@ if ($action == 'updateik')
 
 	header('Location: '.$_SERVER['PHP_SELF']);
 	exit;
-}
-elseif ($action == 'delete') // TODO add confirm
+} elseif ($action == 'delete') // TODO add confirm
 {
 	$expIk = new ExpenseReportIk($db);
 	if ($id > 0)
@@ -161,8 +160,7 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab)
 			{
 				echo '<input id="" class="button" name="save" value="'.$langs->trans('Save').'" type="submit" />';
 				echo '<input class="button" value="'.$langs->trans('Cancel').'" onclick="javascript:history.go(-1)" type="button" />';
-			}
-			else {
+			} else {
 				echo '<a href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$range->ik->id.'&fk_c_exp_tax_cat='.$range->fk_c_exp_tax_cat.'&fk_range='.$range->rowid.'">'.img_edit().'</a>';
 				if (!empty($range->ik->id)) echo '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$range->ik->id.'">'.img_delete().'</a>';
 				// TODO add delete link
diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php
index 0c99b4e4dda..337311b85e7 100644
--- a/htdocs/admin/expensereport_rules.php
+++ b/htdocs/admin/expensereport_rules.php
@@ -100,11 +100,11 @@ if ($action == 'save')
 			$object->fk_user = (int) $fk_user;
 			$object->fk_usergroup = 0;
 			$object->is_for_all = 0;
-		}elseif ($apply_to == 'G') {
+		} elseif ($apply_to == 'G') {
 			$object->fk_usergroup = (int) $fk_usergroup;
 			$object->fk_user = 0;
 			$object->is_for_all = 0;
-		}elseif ($apply_to == 'A') {
+		} elseif ($apply_to == 'A') {
 			$object->is_for_all = 1;
 			$object->fk_user = 0;
 			$object->fk_usergroup = 0;
@@ -122,8 +122,7 @@ if ($action == 'save')
 		header('Location: '.$_SERVER['PHP_SELF']);
 		exit;
 	}
-}
-elseif ($action == 'delete')
+} elseif ($action == 'delete')
 {
 	// TODO add confirm
 	$res = $object->delete($user);
@@ -228,8 +227,7 @@ foreach ($rules as $rule)
 		echo '<div class="float">'.$form->selectarray('apply_to', $tab_apply, $selected, 0).'</div>';
 		echo '<div id="user" class="float">'.$form->select_dolusers($object->fk_user, 'fk_user').'</div>';
 		echo '<div id="group" class="float">'.$form->select_dolgroups($object->fk_usergroup, 'fk_usergroup').'</div>';
-	}
-	else {
+	} else {
 		if ($rule->is_for_all > 0) echo $tab_apply['A'];
 		elseif ($rule->fk_usergroup > 0) echo $tab_apply['G'].' ('.$rule->getGroupLabel().')';
 		elseif ($rule->fk_user > 0) echo $tab_apply['U'].' ('.$rule->getUserName().')';
@@ -241,8 +239,7 @@ foreach ($rules as $rule)
 	if ($action == 'edit' && $object->id == $rule->id)
 	{
 		echo $form->selectExpense($object->fk_c_type_fees, 'fk_c_type_fees', 0, 1, 1);
-	}
-	else {
+	} else {
 		if ($rule->fk_c_type_fees == -1) echo $langs->trans('AllExpenseReport');
 		else {
 			$key = getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'code', $rule->fk_c_type_fees, false, 'id');
@@ -257,8 +254,7 @@ foreach ($rules as $rule)
 	if ($action == 'edit' && $object->id == $rule->id)
 	{
 		echo $form->selectarray('code_expense_rules_type', $tab_rules_type, $object->code_expense_rules_type, 0);
-	}
-	else {
+	} else {
 		echo $tab_rules_type[$rule->code_expense_rules_type];
 	}
 	echo '</td>';
@@ -268,8 +264,7 @@ foreach ($rules as $rule)
 	if ($action == 'edit' && $object->id == $rule->id)
 	{
 		print $form->selectDate(strtotime(date('Y-m-d', $object->dates)), 'start', '', '', 0, '', 1, 0);
-	}
-	else {
+	} else {
 		echo dol_print_date($rule->dates, 'day');
 	}
 	echo '</td>';
@@ -279,8 +274,7 @@ foreach ($rules as $rule)
 	if ($action == 'edit' && $object->id == $rule->id)
 	{
 		print $form->selectDate(strtotime(date('Y-m-d', $object->datee)), 'end', '', '', 0, '', 1, 0);
-	}
-	else {
+	} else {
 		echo dol_print_date($rule->datee, 'day');
 	}
 	echo '</td>';
@@ -290,8 +284,7 @@ foreach ($rules as $rule)
 	if ($action == 'edit' && $object->id == $rule->id)
 	{
 		echo '<input type="text" value="'.price2num($object->amount).'" name="amount" class="amount" />'.$conf->currency;
-	}
-	else {
+	} else {
 		echo price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency);
 	}
 	echo '</td>';
@@ -301,8 +294,7 @@ foreach ($rules as $rule)
 	if ($action == 'edit' && $object->id == $rule->id)
 	{
 		echo $form->selectyesno('restrictive', $object->restrictive, 1);
-	}
-	else {
+	} else {
 		echo yn($rule->restrictive, 1, 1);
 	}
 	echo '</td>';
@@ -313,8 +305,7 @@ foreach ($rules as $rule)
 	{
 		echo '<a href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$rule->id.'">'.img_edit().'</a>&nbsp;';
 		echo '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$rule->id.'">'.img_delete().'</a>';
-	}
-	else {
+	} else {
 		echo '<input type="submit" class="button" value="'.$langs->trans('Update').'" />&nbsp;';
 		echo '<a href="'.$_SERVER['PHP_SELF'].'" class="button">'.$langs->trans('Cancel').'</a>';
 	}
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index eac6d7eb8e9..3d81ab01c43 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -60,8 +60,7 @@ if ($result)
         preg_match('/([0-9]+)$/i', $obj->name, $reg);
         if ($reg[1] && $reg[1] > $lastexternalrss) $lastexternalrss = $reg[1];
     }
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -91,8 +90,7 @@ if ($action == 'add' || GETPOST("modify"))
 				exit;
 	        }
             */
-		}
-		else {
+		} else {
 			// Ajoute boite box_external_rss dans definition des boites
 	        $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (file, note)";
 			$sql .= " VALUES ('box_external_rss.php','".$db->escape(GETPOST("norss", 'int').' ('.GETPOST($external_rss_title, 'alpha')).")')";
@@ -111,8 +109,7 @@ if ($action == 'add' || GETPOST("modify"))
             $db->commit();
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
-        }
-        else {
+        } else {
             $db->rollback();
             dol_print_error($db);
         }
@@ -158,8 +155,7 @@ if ($_POST["delete"])
 			}
 
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 			dol_print_error($db, "sql=".$sql);
 			exit;
@@ -174,8 +170,7 @@ if ($_POST["delete"])
             $db->commit();
             header("Location: external_rss.php");
             exit;
-        }
-        else {
+        } else {
             $db->rollback();
             dol_print_error($db);
         }
@@ -287,8 +282,7 @@ if ($resql)
 	    if ($result > 0 && empty($rss->error))
 	    {
 			print '<font class="ok">'.$langs->trans("Online").'</div>';
-		}
-		else {
+		} else {
 			print '<font class="error">'.$langs->trans("Offline");
 			$langs->load("errors");
 			if ($rssparser->error) print ' - '.$langs->trans($rssparser->error);
@@ -325,8 +319,7 @@ if ($resql)
 
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 6c0c03b6dda..f25a87b6a12 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -71,12 +71,10 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
     $modele = GETPOST('module', 'alpha');
 
@@ -107,13 +105,11 @@ elseif ($action == 'specimen')
     	{
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=facture&file=SPECIMEN.pdf");
     		return;
-    	}
-    	else {
+    	} else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
-    }
-    else {
+    } else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -122,9 +118,7 @@ elseif ($action == 'specimen')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -148,15 +142,13 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
     // TODO Verifier si module numerotation choisi peut etre active
     // par appel methode canBeActivated
 
     dolibarr_set_const($db, "FACTURE_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-elseif ($action == 'setribchq')
+} elseif ($action == 'setribchq')
 {
 	$rib = GETPOST('rib', 'alpha');
 	$chq = GETPOST('chq', 'alpha');
@@ -169,12 +161,10 @@ elseif ($action == 'setribchq')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-elseif ($action == 'set_FACTURE_DRAFT_WATERMARK')
+} elseif ($action == 'set_FACTURE_DRAFT_WATERMARK')
 {
 	$draft = GETPOST('FACTURE_DRAFT_WATERMARK', 'alpha');
 
@@ -185,13 +175,10 @@ elseif ($action == 'set_FACTURE_DRAFT_WATERMARK')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'set_INVOICE_FREE_TEXT')
+} elseif ($action == 'set_INVOICE_FREE_TEXT')
 {
 	$freetext = GETPOST('INVOICE_FREE_TEXT', 'none'); // No alpha here, we want exact string
 
@@ -202,12 +189,10 @@ elseif ($action == 'set_INVOICE_FREE_TEXT')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-elseif ($action == 'setforcedate')
+} elseif ($action == 'setforcedate')
 {
 	$forcedate = GETPOST('forcedate', 'alpha');
 
@@ -218,12 +203,10 @@ elseif ($action == 'setforcedate')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-elseif ($action == 'setDefaultPDFModulesByType')
+} elseif ($action == 'setDefaultPDFModulesByType')
 {
     $invoicetypemodels = GETPOST('invoicetypemodels');
 
@@ -240,8 +223,7 @@ elseif ($action == 'setDefaultPDFModulesByType')
         if (!$error)
         {
             setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-        }
-        else {
+        } else {
             setEventMessages($langs->trans("Error"), null, 'errors');
         }
     }
@@ -341,8 +323,7 @@ foreach ($dirmodels as $reldir)
                             if ($conf->global->FACTURE_ADDON == $file || $conf->global->FACTURE_ADDON.'.php' == $file)
                             {
                                 print img_picto($langs->trans("Activated"), 'switch_on');
-                            }
-                            else {
+                            } else {
                                 print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                             }
                             print '</td>';
@@ -453,8 +434,7 @@ if ($resql)
         array_push($def, $array[0]);
         $i++;
     }
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -524,8 +504,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("SetAsDefault"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -536,8 +515,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->FACTURE_ADDON_PDF == "$name")
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("SetAsDefault"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -570,8 +548,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-	                            }
-	                            else {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -677,13 +654,11 @@ if (!empty($conf->banque->enabled))
                 $i++;
             }
             print "</select>";
-        }
-        else {
+        } else {
         	print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
         }
     }
-}
-else {
+} else {
     print $langs->trans("BankModuleNotActive");
 }
 print "</td></tr>";
@@ -761,8 +736,7 @@ $variablename = 'INVOICE_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else {
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index 223045db2e9..68f8e15e81c 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -246,10 +246,9 @@ function _printInputFormPart($confkey, $title = false, $desc = '', $metas = arra
     print '<input type="hidden" name="action" value="setModuleOptions">';
     if ($type == 'textarea') {
         print '<textarea '.$metascompil.'  >'.dol_htmlentities($conf->global->{$confkey}).'</textarea>';
-	}elseif ($type == 'input') {
+	} elseif ($type == 'input') {
         print '<input '.$metascompil.'  />';
-    }
-	else {
+    } else {
 		// custom
 		print $type;
     }
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 9dfc2cff6d1..e98d02d9f9c 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -126,8 +126,7 @@ if (GETPOST('save', 'alpha'))
 	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -145,8 +144,7 @@ print '<br>';
 if (empty($conf->use_javascript_ajax))
 {
 	setEventMessages(array($langs->trans("NotAvailable"), $langs->trans("JavascriptDisabled")), null, 'errors');
-}
-else {
+} else {
     print '<table class="noborder centpercent">';
     print '<tr class="liste_titre">';
     print '<td colspan="2">'.$langs->trans("ActivateFCKeditor").'</td>';
@@ -168,8 +166,7 @@ else {
         if ($value == 0)
         {
             print '<a href="'.$_SERVER['PHP_SELF'].'?action=activate_'.strtolower($const).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-        }
-        elseif ($value == 1)
+        } elseif ($value == 1)
         {
             print '<a href="'.$_SERVER['PHP_SELF'].'?action=disable_'.strtolower($const).'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
         }
@@ -209,8 +206,7 @@ else {
         $readonly = ($mode == 'dolibarr_readonly' ? 1 : 0);
         $editor = new DolEditor('formtestfield', isset($conf->global->FCKEDITOR_TEST) ? $conf->global->FCKEDITOR_TEST : 'Test', '', 200, $mode, 'In', true, $uselocalbrowser, 1, 120, 8, $readonly);
         $editor->Create();
-    }
-    else {
+    } else {
         print '<div style="border: 1px solid #888;" contenteditable="true">';
         print $conf->global->FCKEDITOR_TEST;
         print '</div>';
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 602570194fd..c28ebcab4b2 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -63,13 +63,10 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'specimen') // For fiche inter
+} elseif ($action == 'specimen') // For fiche inter
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -100,13 +97,11 @@ elseif ($action == 'specimen') // For fiche inter
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=ficheinter&file=SPECIMEN.pdf");
 			return;
-		}
-		else {
+		} else {
 			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -116,9 +111,7 @@ elseif ($action == 'specimen') // For fiche inter
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -143,17 +136,13 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "FICHEINTER_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'set_FICHINTER_FREE_TEXT')
+} elseif ($action == 'set_FICHINTER_FREE_TEXT')
 {
 	$freetext = GETPOST('FICHINTER_FREE_TEXT', 'none'); // No alpha here, we want exact string
 	$res = dolibarr_set_const($db, "FICHINTER_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
@@ -163,13 +152,10 @@ elseif ($action == 'set_FICHINTER_FREE_TEXT')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'set_FICHINTER_DRAFT_WATERMARK')
+} elseif ($action == 'set_FICHINTER_DRAFT_WATERMARK')
 {
 	$draft = GETPOST('FICHINTER_DRAFT_WATERMARK', 'alpha');
 	$res = dolibarr_set_const($db, "FICHINTER_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
@@ -179,13 +165,10 @@ elseif ($action == 'set_FICHINTER_DRAFT_WATERMARK')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'set_FICHINTER_PRINT_PRODUCTS')
+} elseif ($action == 'set_FICHINTER_PRINT_PRODUCTS')
 {
 	$val = GETPOST('FICHINTER_PRINT_PRODUCTS', 'alpha');
 	$res = dolibarr_set_const($db, "FICHINTER_PRINT_PRODUCTS", ($val == 'on' ? 1 : 0), 'bool', 0, '', $conf->entity);
@@ -195,8 +178,7 @@ elseif ($action == 'set_FICHINTER_PRINT_PRODUCTS')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 } elseif ($action == 'set_FICHINTER_USE_SERVICE_DURATION') {
@@ -318,8 +300,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->FICHEINTER_ADDON == $classname)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else {
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 						}
 						print '</td>';
@@ -381,8 +362,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -449,8 +429,7 @@ foreach ($dirmodels as $reldir)
 		    					print img_picto($langs->trans("Enabled"), 'switch_on');
 		    					print '</a>';
 		    					print "</td>";
-		    				}
-		    				else {
+		    				} else {
 		    					print "<td align=\"center\">\n";
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 		    					print "</td>";
@@ -461,8 +440,7 @@ foreach ($dirmodels as $reldir)
 		    				if ($conf->global->FICHEINTER_ADDON_PDF == "$name")
 		    				{
 		    					print img_picto($langs->trans("Default"), 'on');
-		    				}
-		    				else {
+		    				} else {
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		    				}
 		    				print '</td>';
@@ -488,8 +466,7 @@ foreach ($dirmodels as $reldir)
 		    				if ($module->type == 'pdf')
 		    				{
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'intervention').'</a>';
-		    				}
-		    				else {
+		    				} else {
 		    					print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 		    				}
 		    				print '</td>';
@@ -533,8 +510,7 @@ $variablename = 'FICHINTER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else {
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index ba602c4b609..0a118dfe065 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -64,8 +64,7 @@ if ($action == 'set')
 		if (!$error)
 		{
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
@@ -181,8 +180,7 @@ if ($geoip)
 		$result = dol_print_ip($ip, 1);
 		if ($result) print $result;
 		else print $langs->trans("Error");
-	}
-	else {
+	} else {
 		print '<br>'.$ip.' -> ';
 		$result = dol_print_ip($ip, 1);
 		if ($result) print $result;
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index 58f39e30ff2..5ad46e5bab6 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -64,13 +64,10 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'specimen') // For contract
+} elseif ($action == 'specimen') // For contract
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -101,13 +98,11 @@ elseif ($action == 'specimen') // For contract
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=holiday&file=SPECIMEN.pdf");
 			return;
-		}
-		else {
+		} else {
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -117,9 +112,7 @@ elseif ($action == 'specimen') // For contract
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -144,17 +137,13 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "HOLIDAY_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'set_other')
+} elseif ($action == 'set_other')
 {
 	$freetext = GETPOST('HOLIDAY_FREE_TEXT', 'none'); // No alpha here, we want exact string
 	$res1 = dolibarr_set_const($db, "HOLIDAY_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
@@ -167,8 +156,7 @@ elseif ($action == 'set_other')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -241,8 +229,7 @@ foreach ($dirmodels as $reldir)
 						// Show example of numbering model
 						print '<td class="nowrap">';
 						$tmp = $module->getExample();
-						if (preg_match('/^Error/', $tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
-						elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						if (preg_match('/^Error/', $tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 						else print $tmp;
 						print '</td>'."\n";
 
@@ -250,8 +237,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->HOLIDAY_ADDON == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else {
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -326,8 +312,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -397,8 +382,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -409,8 +393,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->HOLIDAY_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -441,8 +424,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
-	                            }
-	                            else {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -492,8 +474,7 @@ $variablename = 'HOLIDAY_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else {
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 8df8a120c05..b6233f13146 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -189,20 +189,17 @@ if ($action == 'update')
 				if ($result > 0)
 				{
 					dolibarr_set_const($db, "MAIN_LOGIN_BACKGROUND", $original_file, 'chaine', 0, '', $conf->entity);
-				}
-				elseif (preg_match('/^ErrorFileIsInfectedWithAVirus/', $result))
+				} elseif (preg_match('/^ErrorFileIsInfectedWithAVirus/', $result))
 				{
 					$error++;
 					$langs->load("errors");
 					$tmparray = explode(':', $result);
 					setEventMessages($langs->trans('ErrorFileIsInfectedWithAVirus', $tmparray[1]), null, 'errors');
-				}
-				else {
+				} else {
 					$error++;
 					setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 				}
-			}
-			else {
+			} else {
 				$error++;
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 33f1abb251f..951b93f908c 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -76,8 +76,7 @@ if (empty($reshook))
 		{
 			$db->commit();
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		}
-		else {
+		} else {
 			$db->rollback();
 			dol_print_error($db);
 		}
@@ -213,8 +212,7 @@ print '<tr class="oddeven"><td>'.$langs->trans("LDAPServerPort").'</td><td>';
 if (!empty($conf->global->LDAP_SERVER_PORT))
 {
 	print '<input size="25" type="text" name="port" value="'.$conf->global->LDAP_SERVER_PORT.'">';
-}
-else {
+} else {
 	print '<input size="25" type="text" name="port" value="389">';
 }
 print '</td><td>'.$langs->trans("LDAPServerPortExample").'</td></tr>';
@@ -246,8 +244,7 @@ print '<tr class="oddeven"><td>'.$langs->trans("LDAPPassword").'</td><td>';
 if (!empty($conf->global->LDAP_ADMIN_PASS))
 {
 	print '<input size="25" type="password" name="pass" value="'.$conf->global->LDAP_ADMIN_PASS.'">'; // je le met en visible pour test
-}
-else {
+} else {
 	print '<input size="25" type="text" name="pass" value="'.$conf->global->LDAP_ADMIN_PASS.'">';
 }
 print '</td><td>'.$langs->trans('Password').' (ex: secret)</td></tr>';
@@ -292,16 +289,14 @@ if (function_exists("ldap_connect"))
 					print img_picto('', 'info').' ';
 					print '<font class="ok">'.$langs->trans("LDAPBindOK", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT, $conf->global->LDAP_ADMIN_DN, preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)).'</font>';
 					print '<br>';
-				}
-				else {
+				} else {
 					print img_picto('', 'error').' ';
 					print '<font class="error">'.$langs->trans("LDAPBindKO", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT, $conf->global->LDAP_ADMIN_DN, preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)).'</font>';
 					print '<br>';
 					print $langs->trans("Error").' '.$ldap->error;
 					print '<br>';
 				}
-			}
-			else {
+			} else {
 				print img_picto('', 'warning').' ';
 				print '<font class="warning">'.$langs->trans("LDAPNoUserOrPasswordProvidedAccessIsReadOnly").'</font>';
 				print '<br>';
@@ -314,16 +309,14 @@ if (function_exists("ldap_connect"))
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSetupForVersion3").'</font>';
 				print '<br>';
-			}
-			else {
+			} else {
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSetupForVersion2").'</font>';
 				print '<br>';
 			}
 
 			$unbind = $ldap->unbind();
-		}
-		else {
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPTCPConnectKO", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT).'</font>';
 			print '<br>';
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 58eb04e595d..54de74c6371 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -78,8 +78,7 @@ if ($action == 'setvalue' && $user->admin)
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -291,8 +290,7 @@ if (function_exists("ldap_connect"))
 			{
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
-			}
-			else {
+			} else {
 				print img_picto('', 'error').' ';
 				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
@@ -304,8 +302,7 @@ if (function_exists("ldap_connect"))
 			print "LDAP input file used for test:<br><br>\n";
 			print nl2br($ldap->dump_content($dn, $info));
 			print "\n<br>";
-		}
-		else {
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index a301738db94..4e0c430fb90 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -70,8 +70,7 @@ if ($action == 'setvalue' && $user->admin)
     {
     	$db->commit();
     	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
     	$db->rollback();
     	dol_print_error($db);
     }
@@ -232,8 +231,7 @@ if (function_exists("ldap_connect"))
 			{
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
-			}
-			else {
+			} else {
 				print img_picto('', 'error').' ';
 				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
@@ -245,8 +243,7 @@ if (function_exists("ldap_connect"))
 			print "LDAP input file used for test:<br><br>\n";
 			print nl2br($ldap->dump_content($dn, $info));
 			print "\n<br>";
-		}
-		else {
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index eba84afe925..0cd09d27f7e 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -95,8 +95,7 @@ if ($action == 'setvalue' && $user->admin)
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -414,8 +413,7 @@ if (function_exists("ldap_connect"))
 			{
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
-			}
-			else {
+			} else {
 				print img_picto('', 'error').' ';
 				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
@@ -427,8 +425,7 @@ if (function_exists("ldap_connect"))
 			print "LDAP input file used for test:<br><br>\n";
 			print nl2br($ldap->dump_content($dn, $info));
 			print "\n<br>";
-		}
-		else {
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
diff --git a/htdocs/admin/ldap_members_types.php b/htdocs/admin/ldap_members_types.php
index 6913c477b38..371437e1640 100644
--- a/htdocs/admin/ldap_members_types.php
+++ b/htdocs/admin/ldap_members_types.php
@@ -68,8 +68,7 @@ if ($action == 'setvalue' && $user->admin)
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -214,8 +213,7 @@ if (function_exists("ldap_connect"))
 			{
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
-			}
-			else {
+			} else {
 				print img_picto('', 'error').' ';
 				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
@@ -227,8 +225,7 @@ if (function_exists("ldap_connect"))
 			print "LDAP input file used for test:<br><br>\n";
 			print nl2br($ldap->dump_content($dn, $info));
 			print "\n<br>";
-		}
-		else {
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index d0d3bb50d0d..d5778fbfb1c 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -89,8 +89,7 @@ if ($action == 'setvalue' && $user->admin)
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -356,8 +355,7 @@ if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap')
 	$objectclass = $conf->global->LDAP_USER_OBJECT_CLASS;
 
 	show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass);
-}
-elseif ($conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')
+} elseif ($conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')
 {
 	$butlabel = $langs->trans("LDAPTestSearch");
 	$testlabel = 'testsearchuser';
@@ -394,8 +392,7 @@ if (function_exists("ldap_connect"))
 			{
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
-			}
-			else {
+			} else {
 				print img_picto('', 'error').' ';
 				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
@@ -407,8 +404,7 @@ if (function_exists("ldap_connect"))
 			print "LDAP input file used for test:<br><br>\n";
 			print nl2br($ldap->dump_content($dn, $info));
 			print "\n<br>";
-		}
-		else {
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
@@ -473,8 +469,7 @@ if (function_exists("ldap_connect"))
 					}
 					$liste[$key] = $label;
 				}
-			}
-			else {
+			} else {
 				setEventMessages($ldap->error, $ldap->errors, 'errors');
 			}
 
@@ -486,8 +481,7 @@ if (function_exists("ldap_connect"))
 			print "required_fields: ".implode(',', $required_fields)."<br>\n";
 			print "=> ".count($liste)." records<br>\n";
 			print "\n<br>";
-		}
-		else {
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index b03067bd581..67106282a47 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -162,8 +162,7 @@ if ($action == 'edit')
 
     print '</form>';
     print '<br>';
-}
-else {
+} else {
     print '<table class="noborder centpercent">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
@@ -202,8 +201,7 @@ if (empty($mysoc->country_code))
 	$langs->load("errors");
 	$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"));
 	print '<br><a href="'.DOL_URL_ROOT.'/admin/company.php?mainmenu=home">'.$warnpicto.' '.$langs->trans("WarningMandatorySetupNotComplete").'</a>';
-}
-else {
+} else {
 	// Show examples
 	print load_fiche_titre($langs->trans("ExamplesWithCurrentSetup"), '', '');
 
@@ -250,8 +248,7 @@ else {
 	            $vat_rates[$i] = $obj->vat_rate;
 	        }
 	    }
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	if (count($vat_rates))
 	{
@@ -267,8 +264,7 @@ else {
 	            print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
 	        }
 	    }
-	}
-	else {
+	} else {
 	    // More examples if not specific vat rate found
 	    // This example must be kept for test purpose with current value because value used (2/7, 10/3, and vat 0, 10)
 	    // were calculated to show all possible cases of rounding. If we change this, examples becomes useless or show the same rounding rule.
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index f6e3c0e63f9..66f3a44cdcf 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -63,8 +63,7 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -79,8 +78,7 @@ if ($action == 'set_DELIVERY_FREE_TEXT')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -116,13 +114,11 @@ if ($action == 'specimen')
         {
             header("Location: ".DOL_URL_ROOT."/document.php?modulepart=livraison&file=SPECIMEN.pdf");
             return;
-        }
-        else {
+        } else {
             setEventMessages($module->error, $module->errors, 'errors');
             dol_syslog($module->error, LOG_ERR);
         }
-    }
-    else {
+    } else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
         dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -236,8 +232,7 @@ foreach ($dirmodels as $reldir)
                         $tmp = $module->getExample();
                         if (preg_match('/^Error/', $tmp)) {
 							$langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
-						}
-                        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
                         else print $tmp;
                         print '</td>'."\n";
 
@@ -245,8 +240,7 @@ foreach ($dirmodels as $reldir)
                         if ($conf->global->LIVRAISON_ADDON_NUMBER == "$file")
                         {
                             print img_picto($langs->trans("Activated"), 'switch_on');
-                        }
-                        else {
+                        } else {
                             print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         }
                         print '</td>';
@@ -311,8 +305,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -377,8 +370,7 @@ foreach ($dirmodels as $reldir)
 		    					print img_picto($langs->trans("Enabled"), 'switch_on');
 		    					print '</a>';
 		    					print "</td>";
-		    				}
-		    				else {
+		    				} else {
 		    					print "<td align=\"center\">\n";
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 		    					print "</td>";
@@ -389,8 +381,7 @@ foreach ($dirmodels as $reldir)
 		    				if ($conf->global->LIVRAISON_ADDON_PDF == "$name")
 		    				{
 		    					print img_picto($langs->trans("Default"), 'on');
-		    				}
-		    				else {
+		    				} else {
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		    				}
 		    				print '</td>';
@@ -409,8 +400,7 @@ foreach ($dirmodels as $reldir)
 		    				if ($module->type == 'pdf')
 		    				{
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'sending').'</a>';
-		    				}
-		    				else {
+		    				} else {
 		    					print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 		    				}
 		    				print '</td>';
@@ -453,8 +443,7 @@ $variablename = 'DELIVERY_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else {
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php
index 23cd1fd6bba..651782bb23b 100644
--- a/htdocs/admin/loan.php
+++ b/htdocs/admin/loan.php
@@ -63,8 +63,7 @@ if ($action == 'update')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -106,8 +105,7 @@ foreach ($list as $key)
 	if (!empty($conf->accounting->enabled))
 	{
 		print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
-	}
-	else {
+	} else {
 		print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
 	}
 	print '</td></tr>';
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 020c1ef5241..7690ca02afa 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -65,8 +65,7 @@ if ($action == 'setvalue')
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php
index 100b5cf3224..cbc908f973f 100644
--- a/htdocs/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@@ -65,8 +65,7 @@ if ($action == 'update' || $action == 'add')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -98,8 +97,7 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && !empty($conf
     {
         $langs->load("errors");
         setEventMessages($langs->trans("ErrorBadEMail", $email), null, 'errors');
-    }
-    else {
+    } else {
         include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
         $mailmanspip = new MailmanSpip($db);
 
@@ -116,8 +114,7 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && !empty($conf
 			{
 				$error++;
 				setEventMessages($mailmanspip->error, $mailmanspip->errors, 'errors');
-			}
-			else {
+			} else {
 				setEventMessages($langs->trans("MailmanCreationSuccess"), null);
 			}
         }
@@ -128,8 +125,7 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && !empty($conf
 			{
 				$error++;
 				setEventMessages($mailmanspip->error, $mailmanspip->errors, 'errors');
-			}
-			else {
+			} else {
 				setEventMessages($langs->trans("MailmanDeletionSuccess"), null);
 			}
         }
@@ -207,8 +203,7 @@ if (!empty($conf->global->ADHERENT_USE_MAILMAN))
     print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
 
     print '</form>';
-}
-else {
+} else {
     dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user');
 
     $link = '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value=1&name=ADHERENT_USE_MAILMAN">';
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 42ddb907b7d..ebbd549ecf8 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -169,8 +169,7 @@ if ($action == 'edit')
                             jQuery("#MAIN_MAIL_SMTP_PORT").hide();
                             jQuery("#smtp_server_mess").show();
                             jQuery("#smtp_port_mess").show();';
-		}
-		else {
+		} else {
             print '
                             jQuery("#MAIN_MAIL_SMTP_SERVER").prop("disabled", true);
                             jQuery("#MAIN_MAIL_SMTP_PORT").prop("disabled", true);
@@ -285,8 +284,7 @@ if ($action == 'edit')
 	if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity))
 	{
 		print $form->selectarray('MAIN_MAIL_SENDMODE', $listofmethods, $conf->global->MAIN_MAIL_SENDMODE);
-	}
-	else {
+	} else {
 		$text = $listofmethods[$conf->global->MAIN_MAIL_SENDMODE];
 		if (empty($text)) $text = $langs->trans("Undefined");
 		$htmltext = $langs->trans("ContactSuperAdminForChange");
@@ -302,8 +300,7 @@ if ($action == 'edit')
 		print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
 		print '</td><td>';
 		print '<span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
-	}
-	else {
+	} else {
 		$mainserver = (!empty($conf->global->MAIN_MAIL_SMTP_SERVER) ? $conf->global->MAIN_MAIL_SMTP_SERVER : '');
 		$smtpserver = ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined");
 		if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
@@ -315,8 +312,7 @@ if ($action == 'edit')
 			print '<input class="flat" id="MAIN_MAIL_SMTP_SERVER" name="MAIN_MAIL_SMTP_SERVER" size="18" value="'.$mainserver.'" autocomplete="off">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_sav" name="MAIN_MAIL_SMTP_SERVER_sav" value="'.$mainserver.'">';
 			print '<span id="smtp_server_mess" class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
-		}
-		else {
+		} else {
 			$text = !empty($mainserver) ? $mainserver : $smtpserver;
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
@@ -332,8 +328,7 @@ if ($action == 'edit')
 		print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
 		print '</td><td>';
 		print '<span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
-	}
-	else {
+	} else {
 		$mainport = (!empty($conf->global->MAIN_MAIL_SMTP_PORT) ? $conf->global->MAIN_MAIL_SMTP_PORT : '');
 		$smtpport = ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined");
 		if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
@@ -345,8 +340,7 @@ if ($action == 'edit')
 			print '<input class="flat" id="MAIN_MAIL_SMTP_PORT" name="MAIN_MAIL_SMTP_PORT" size="3" value="'.$mainport.'">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_sav" name="MAIN_MAIL_SMTP_PORT_sav" value="'.$mainport.'">';
 			print '<span id="smtp_port_mess" class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
-		}
-		else {
+		} else {
 			$text = (!empty($mainport) ? $mainport : $smtpport);
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
@@ -364,8 +358,7 @@ if ($action == 'edit')
 		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
 		{
 			print '<input class="flat" name="MAIN_MAIL_SMTPS_ID" size="32" value="'.$mainstmpid.'">';
-		}
-		else {
+		} else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_ID, $htmltext, 1, 'superadmin');
 			print '<input type="hidden" name="MAIN_MAIL_SMTPS_ID" value="'.$mainstmpid.'">';
@@ -384,8 +377,7 @@ if ($action == 'edit')
 		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
 		{
 			print '<input class="flat" type="password" name="MAIN_MAIL_SMTPS_PW" size="32" value="'.$mainsmtppw.'" autocomplete="off">';
-		}
-		else {
+		} else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW, $htmltext, 1, 'superadmin');
 			print '<input type="hidden" name="MAIN_MAIL_SMTPS_PW" value="'.$mainsmtppw.'">';
@@ -400,10 +392,8 @@ if ($action == 'edit')
 		if (function_exists('openssl_open'))
 		{
 			print $form->selectyesno('MAIN_MAIL_EMAIL_TLS', (!empty($conf->global->MAIN_MAIL_EMAIL_TLS) ? $conf->global->MAIN_MAIL_EMAIL_TLS : 0), 1);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print yn(0).' ('.$langs->trans("NotSupported").')';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
 	// STARTTLS
@@ -413,10 +403,8 @@ if ($action == 'edit')
 		if (function_exists('openssl_open'))
 		{
 			print $form->selectyesno('MAIN_MAIL_EMAIL_STARTTLS', (!empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) ? $conf->global->MAIN_MAIL_EMAIL_STARTTLS : 0), 1);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print yn(0).' ('.$langs->trans("NotSupported").')';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
 	// DKIM
@@ -426,10 +414,8 @@ if ($action == 'edit')
 		if (function_exists('openssl_open'))
 		{
 			print $form->selectyesno('MAIN_MAIL_EMAIL_DKIM_ENABLED', (!empty($conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED) ? $conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED : 0), 1);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print yn(0).' ('.$langs->trans("NotSupported").')';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
     // DKIM Domain
@@ -488,8 +474,7 @@ if ($action == 'edit')
 	print '</div>';
 
 	print '</form>';
-}
-else {
+} else {
 	dol_fiche_head($head, 'common', '', -1);
 
 	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
@@ -529,8 +514,7 @@ else {
 	if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td><span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span></td></tr>';
-	}
-	else {
+	} else {
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER", ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_SERVER) ? $conf->global->MAIN_MAIL_SMTP_SERVER : '').'</td></tr>';
 	}
 
@@ -538,8 +522,7 @@ else {
 	if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td><span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span></td></tr>';
-	}
-	else {
+	} else {
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT", ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_PORT) ? $conf->global->MAIN_MAIL_SMTP_PORT : '').'</td></tr>';
 	}
 
@@ -562,10 +545,8 @@ else {
 		if (function_exists('openssl_open'))
 		{
 			print yn($conf->global->MAIN_MAIL_EMAIL_TLS);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
 	print '</td></tr>';
 
 	// STARTTLS
@@ -575,10 +556,8 @@ else {
 		if (function_exists('openssl_open'))
 		{
 			print yn($conf->global->MAIN_MAIL_EMAIL_STARTTLS);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
 	print '</td></tr>';
 
 
@@ -591,10 +570,8 @@ else {
 			if (function_exists('openssl_open'))
 			{
 				print yn($conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED);
-			}
-			else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-		}
-		else print yn(0).' ('.$langs->trans("NotSupported").')';
+			} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+		} else print yn(0).' ('.$langs->trans("NotSupported").')';
 		print '</td></tr>';
 
 	    // Domain
@@ -642,24 +619,20 @@ else {
 			}
 			$i++;
 		}
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	print '<tr class="oddeven"><td>'.$langs->trans('MAIN_MAIL_DEFAULT_FROMTYPE').'</td>';
 	print '<td>';
 	if ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'robot')
 	{
 		print $langs->trans('RobotEmail');
-	}
-	elseif ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'user')
+	} elseif ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'user')
 	{
 		print $langs->trans('UserEmail');
-	}
-	elseif ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'company')
+	} elseif ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'company')
 	{
 		print $langs->trans('CompanyEmail').' '.dol_escape_htmltag('<'.$mysoc->email.'>');
-	}
-	else {
+	} else {
 		$id = preg_replace('/senderprofile_/', '', $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE);
 		if ($id > 0)
 		{
@@ -687,8 +660,7 @@ else {
 	{
 		print $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 		if (!isValidEmail($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print img_warning($langs->trans("ErrorBadEMail"));
-	}
-	else {
+	} else {
 		print '&nbsp;';
 	}
 	print '</td></tr>';
@@ -709,8 +681,7 @@ else {
 		{
 			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testconnect#formmailbeforetitle">'.$langs->trans("DoTestServerAvailability").'</a>';
 		}
-	}
-	else {
+	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("FeatureNotAvailableOnLinux").'">'.$langs->trans("DoTestServerAvailability").'</a>';
 	}
 
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index 98c44f2b503..f78ef0277bb 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -156,8 +156,7 @@ if ($action == 'edit')
 			               jQuery("#smtp_server_mess").show();
 			               jQuery("#smtp_port_mess").show();
 			               ';
-		}
-		else {
+		} else {
 			print '
 			               jQuery("#MAIN_MAIL_SMTP_SERVER_EMAILING").prop("disabled", true);
 			               jQuery("#MAIN_MAIL_SMTP_PORT_EMAILING").prop("disabled", true);
@@ -235,8 +234,7 @@ if ($action == 'edit')
 	if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity))
 	{
 		print $form->selectarray('MAIN_MAIL_SENDMODE_EMAILING', $listofmethods, $conf->global->MAIN_MAIL_SENDMODE_EMAILING);
-	}
-	else {
+	} else {
 		$text = $listofmethods[$conf->global->MAIN_MAIL_SENDMODE_EMAILING];
 		if (empty($text)) $text = $langs->trans("Undefined");
 		$htmltext = $langs->trans("ContactSuperAdminForChange");
@@ -253,8 +251,7 @@ if ($action == 'edit')
 		print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
 		print '</td><td>';
 		print $langs->trans("SeeLocalSendMailSetup");
-	}
-	else {
+	} else {
 		$mainserver = (!empty($conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING) ? $conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING : '');
 		$smtpserver = ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined");
 		if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
@@ -266,8 +263,7 @@ if ($action == 'edit')
 			print '<input class="flat" id="MAIN_MAIL_SMTP_SERVER_EMAILING" name="MAIN_MAIL_SMTP_SERVER_EMAILING" size="18" value="'.$mainserver.'">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_EMAILING_sav" name="MAIN_MAIL_SMTP_SERVER_EMAILING_sav" value="'.$mainserver.'">';
 			print '<span id="smtp_server_mess">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
-		}
-		else {
+		} else {
 			$text = !empty($mainserver) ? $mainserver : $smtpserver;
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
@@ -284,8 +280,7 @@ if ($action == 'edit')
 		print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
 		print '</td><td>';
 		print $langs->trans("SeeLocalSendMailSetup");
-	}
-	else {
+	} else {
 		$mainport = (!empty($conf->global->MAIN_MAIL_SMTP_PORT_EMAILING) ? $conf->global->MAIN_MAIL_SMTP_PORT_EMAILING : '');
 		$smtpport = ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined");
 		if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
@@ -297,8 +292,7 @@ if ($action == 'edit')
 			print '<input class="flat" id="MAIN_MAIL_SMTP_PORT_EMAILING" name="MAIN_MAIL_SMTP_PORT_EMAILING" size="3" value="'.$mainport.'">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_EMAILING_sav" name="MAIN_MAIL_SMTP_PORT_EMAILING_sav" value="'.$mainport.'">';
 			print '<span id="smtp_port_mess">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
-		}
-		else {
+		} else {
 			$text = (!empty($mainport) ? $mainport : $smtpport);
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
@@ -316,8 +310,7 @@ if ($action == 'edit')
 		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
 		{
 			print '<input class="flat" name="MAIN_MAIL_SMTPS_ID_EMAILING" size="32" value="'.$mainstmpid.'">';
-		}
-		else {
+		} else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_ID_EMAILING, $htmltext, 1, 'superadmin');
 			print '<input type="hidden" name="MAIN_MAIL_SMTPS_ID_EMAILING" value="'.$mainstmpid.'">';
@@ -334,8 +327,7 @@ if ($action == 'edit')
 		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
 		{
 			print '<input class="flat" type="password" name="MAIN_MAIL_SMTPS_PW_EMAILING" size="32" value="'.$mainsmtppw.'">';
-		}
-		else {
+		} else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW_EMAILING, $htmltext, 1, 'superadmin');
 			print '<input type="hidden" name="MAIN_MAIL_SMTPS_PW_EMAILING" value="'.$mainsmtppw.'">';
@@ -351,10 +343,8 @@ if ($action == 'edit')
 		if (function_exists('openssl_open'))
 		{
 			print $form->selectyesno('MAIN_MAIL_EMAIL_TLS_EMAILING', (!empty($conf->global->MAIN_MAIL_EMAIL_TLS_EMAILING) ? $conf->global->MAIN_MAIL_EMAIL_TLS_EMAILING : 0), 1);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print yn(0).' ('.$langs->trans("NotSupported").')';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
 	// STARTTLS
@@ -365,10 +355,8 @@ if ($action == 'edit')
 		if (function_exists('openssl_open'))
 		{
 			print $form->selectyesno('MAIN_MAIL_EMAIL_STARTTLS_EMAILING', (!empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS_EMAILING) ? $conf->global->MAIN_MAIL_EMAIL_STARTTLS_EMAILING : 0), 1);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print yn(0).' ('.$langs->trans("NotSupported").')';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
     print '</table>';
@@ -382,8 +370,7 @@ if ($action == 'edit')
     print '</div>';
 
 	print '</form>';
-}
-else {
+} else {
     dol_fiche_head($head, 'common_emailing', '', -1);
 
     print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
@@ -405,8 +392,7 @@ else {
 		if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING == 'mail'))
 		{
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
-		}
-		else {
+		} else {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER", ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING) ? $conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING : '').'</td></tr>';
 		}
 
@@ -414,8 +400,7 @@ else {
 		if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING == 'mail'))
 		{
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
-		}
-		else {
+		} else {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT", ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_PORT_EMAILING) ? $conf->global->MAIN_MAIL_SMTP_PORT_EMAILING : '').'</td></tr>';
 		}
 
@@ -438,10 +423,8 @@ else {
 			if (function_exists('openssl_open'))
 			{
 				print yn($conf->global->MAIN_MAIL_EMAIL_TLS_EMAILING);
-			}
-			else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-		}
-		else print yn(0).' ('.$langs->trans("NotSupported").')';
+			} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+		} else print yn(0).' ('.$langs->trans("NotSupported").')';
 		print '</td></tr>';
 
 		// STARTTLS
@@ -451,10 +434,8 @@ else {
 			if (function_exists('openssl_open'))
 			{
 				print yn($conf->global->MAIN_MAIL_EMAIL_STARTTLS_EMAILING);
-			}
-			else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-		}
-		else print yn(0).' ('.$langs->trans("NotSupported").')';
+			} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+		} else print yn(0).' ('.$langs->trans("NotSupported").')';
 		print '</td></tr>';
 	}
 
@@ -495,8 +476,7 @@ else {
 			{
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testconnect">'.$langs->trans("DoTestServerAvailability").'</a>';
 			}
-		}
-		else {
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("FeatureNotAvailableOnLinux").'">'.$langs->trans("DoTestServerAvailability").'</a>';
 		}
 
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index fd5f4e3b1a7..bf841a03abe 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -171,8 +171,7 @@ if (empty($reshook))
 		$resql = $db->query($sql);
 		if ($resql) {
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("Error").' '.$db->lasterror(), null, 'errors');
 		}
 	}
@@ -281,8 +280,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else {
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -449,8 +447,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		}
-		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 1dcc621095c..1467c2907a7 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -122,8 +122,7 @@ if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
     	$helpsubstit .= $key.' -> '.$val.'<br>';
     	$helpsubstitforlines .= $key.' -> '.$val.'<br>';
     }
-}
-else {
+} else {
     $tmp = FormMail::getAvailableSubstitKey('formemailwithlines');
     $tmp['__(AnyTranslationKey)__'] = 'Translation';
     $helpsubstit = $langs->trans("AvailableVariables").':<br>';
@@ -277,11 +276,9 @@ if (empty($reshook))
                 elseif (GETPOST($keycode) == '0' && $keycode == 'langcode') $sql .= "''"; // langcode must be '' if not defined so the unique key that include lang will work
                 elseif ($keycode == 'content') {
                 	$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-                }
-                elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
+                } elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
                 	$sql .= (int) GETPOST($keycode, 'int');
-                }
-                else {
+                } else {
                 	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
                 }
 
@@ -295,12 +292,10 @@ if (empty($reshook))
             {
                 setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
             	$_POST = array('id'=>$id); // Clean $_POST array, we keep only id
-            }
-            else {
+            } else {
                 if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                     setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-                }
-                else {
+                } else {
                     dol_print_error($db);
                 }
             }
@@ -335,11 +330,9 @@ if (empty($reshook))
                 elseif (GETPOST($keycode) == '0' && $keycode == 'langcode') $sql .= "''"; // langcode must be '' if not defined so the unique key that include lang will work
                 elseif ($keycode == 'content') {
                 	$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-                }
-                elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
+                } elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
                 	$sql .= (int) GETPOST($keycode, 'int');
-                }
-                else {
+                } else {
                 	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
                 }
 
@@ -353,8 +346,7 @@ if (empty($reshook))
             if ($resql)
             {
             	setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-            }
-            else {
+            } else {
                 setEventMessages($db->error(), null, 'errors');
             }
         }
@@ -373,8 +365,7 @@ if (empty($reshook))
             if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
             {
                 setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-            }
-            else {
+            } else {
                 dol_print_error($db);
             }
         }
@@ -501,8 +492,7 @@ foreach ($fieldlist as $field => $value)
 		{
 			if (in_array($value, array('topic'))) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, $value); // Tooltip on click
 			else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2); // Tooltip on hover
-		}
-		else print $valuetoshow;
+		} else print $valuetoshow;
 		print '</td>';
 	}
 }
@@ -569,11 +559,9 @@ foreach ($fieldsforcontent as $tmpfieldlist)
 	// Input field
 	if ($tmpfieldlist == 'topic') {
 		print '<input type="text" class="flat minwidth500" name="'.$tmpfieldlist.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">';
-	}
-	elseif ($tmpfieldlist == 'joinfiles') {
+	} elseif ($tmpfieldlist == 'joinfiles') {
 		print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'" value="'.(isset($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '1').'">';
-	}
-	else {
+	} else {
 		if ($context != 'hide') {
 			// print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
 			$okforextended = true;
@@ -581,8 +569,7 @@ foreach ($fieldsforcontent as $tmpfieldlist)
 				$okforextended = false;
 			$doleditor = new DolEditor($tmpfieldlist, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 120, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_4, '90%');
 			print $doleditor->Create(1);
-		}
-		else print '&nbsp;';
+		} else print '&nbsp;';
 	}
 	print '</td>';
 	if ($tmpfieldlist == 'topic') {
@@ -654,8 +641,7 @@ if ($resql)
         	print '<td class="liste_titre">';
         	print $formadmin->select_language($search_lang, 'search_lang', 0, null, 1, 0, 0, 'maxwidth100');
         	print '</td>';
-        }
-        elseif ($value == 'fk_user')
+        } elseif ($value == 'fk_user')
         {
         	print '<td class="liste_titre">';
         	$restrictid = array();
@@ -663,13 +649,11 @@ if ($resql)
         	//var_dump($restrictid);
         	print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, 'hierarchyme', null, 0, 0, 1, '', 0, '', 'maxwidth100');
         	print '</td>';
-        }
-        elseif ($value == 'topic') print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
+        } elseif ($value == 'topic') print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
         elseif ($value == 'type_template')
         {
         	print '<td class="liste_titre">'.$form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100 maxwidth100onsmartphone').'</td>';
-        }
-        elseif (!in_array($value, array('content', 'content_lines'))) print '<td class="liste_titre"></td>';
+        } elseif (!in_array($value, array('content', 'content_lines'))) print '<td class="liste_titre"></td>';
     }
     if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) print '<td class="liste_titre"></td>';
     // Action column
@@ -795,8 +779,7 @@ if ($resql)
                 }
 
                 print "</tr>\n";
-            }
-            else {
+            } else {
             	$keyforobj = 'type_template';
             	if (!in_array($obj->$keyforobj, array_keys($elementList)))
             	{
@@ -938,8 +921,7 @@ if ($resql)
             $i++;
         }
     }
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -981,22 +963,19 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			if ($user->admin)
 			{
 				print $form->select_dolusers($obj->{$fieldlist[$field]}, 'fk_user', 1, null, 0, '', null, 0, 0, 1, '', 0, '', 'maxwidth200');
-			}
-			else {
+			} else {
 				if ($context == 'add')	// I am not admin and we show the add form
 				{
 					print $user->getNomUrl(1); // Me
 					$forcedvalue = $user->id;
-				}
-				else {
+				} else {
 					if ($obj && !empty($obj->{$fieldlist[$field]}) && $obj->{$fieldlist[$field]} > 0)
 					{
 						$fuser = new User($db);
 						$fuser->fetch($obj->{$fieldlist[$field]});
 						print $fuser->getNomUrl(1);
 						$forcedvalue = $fuser->id;
-					}
-					else {
+					} else {
 						$forcedvalue = $obj->{$fieldlist[$field]};
 					}
 				}
@@ -1004,8 +983,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				print '<input type="hidden" value="'.$forcedvalue.'" name="'.$keyname.'">';
 			}
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'lang')
+		} elseif ($fieldlist[$field] == 'lang')
 		{
 			print '<td>';
 			if (!empty($conf->global->MAIN_MULTILANGS))
@@ -1013,8 +991,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				$selectedlang = GETPOSTISSET('langcode') ?GETPOST('langcode', 'aZ09') : $langs->defaultlang;
 				if ($context == 'edit') $selectedlang = $obj->{$fieldlist[$field]};
 				print $formadmin->select_language($selectedlang, 'langcode', 0, null, 1, 0, 0, 'maxwidth150');
-			}
-			else {
+			} else {
 				if (!empty($obj->{$fieldlist[$field]}))
 				{
 					print $obj->{$fieldlist[$field]}.' - '.$langs->trans('Language_'.$obj->{$fieldlist[$field]});
@@ -1034,13 +1011,11 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				// Current tempalte type is an unknown type, so we must keep it as it is.
 				print '<input type="hidden" name="type_template" value="'.$obj->{$fieldlist[$field]}.'">';
 				print $obj->{$fieldlist[$field]};
-			}
-			else {
+			} else {
 				print $form->selectarray('type_template', $elementList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150 maxwidth100onsmartphone');
 			}
 			print '</td>';
-		}
-		elseif ($context == 'add' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
+		} elseif ($context == 'add' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
 		elseif ($context == 'edit' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
 		elseif ($context == 'hide' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
 		else {
@@ -1059,13 +1034,11 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				if (empty($user->admin))
 				{
 					print $form->selectyesno($fieldlist[$field], '1', 1);
-				}
-				else {
+				} else {
 					//print '<input type="text" '.$size.'class="flat'.($class?' '.$class:'').'" value="1" name="'.$fieldlist[$field].'">';
 					print $form->selectyesno($fieldlist[$field], (isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1);
 				}
-			}
-			else {
+			} else {
 				print '<input type="text" '.$size.'class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
 			}
 			print '</td>';
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index b66ab89075f..0b19285a072 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -96,8 +96,7 @@ if ($action == 'update' && !$cancel)
 				if ($result > 0)
 				{
 					$db->commit();
-				}
-				else {
+				} else {
 					$error++;
 					setEventMessages($langs->trans("FailedToInitializeMenu").' '.$key, null, 'errors');
 					$db->rollback();
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index a059a76b40c..d92a3b30504 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -124,8 +124,7 @@ if ($action == 'update')
 
         header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler);
         exit;
-    }
-    else {
+    } else {
         header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler);
         exit;
     }
@@ -214,8 +213,7 @@ if ($action == 'add')
         if (is_numeric(GETPOST('menuId', 'alpha', 3)))
         {
         	$menu->fk_menu = GETPOST('menuId', 'alpha', 3);
-        }
-        else {
+        } else {
             if (GETPOST('type', 'alpha') == 'top') $menu->fk_menu = 0;
             else $menu->fk_menu = -1;
             $menu->fk_mainmenu = $mainmenu;
@@ -227,8 +225,7 @@ if ($action == 'add')
         {
             header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".GETPOST('menu_handler', 'aZ09'));
             exit;
-        }
-        else {
+        } else {
             $action = 'create';
 	        setEventMessages($menu->error, $menu->errors, 'errors');
         }
@@ -251,8 +248,7 @@ if ($action == 'confirm_delete' && $_POST["confirm"] == 'yes')
 	    setEventMessages($langs->trans("MenuDeleted"), null, 'mesgs');
         llxFooter();
         exit;
-    }
-    else {
+    } else {
         $this->db->rollback();
 
         $reload = 0;
@@ -348,8 +344,7 @@ if ($action == 'create')
     {
         print $langs->trans('Left');
         print '<input type="hidden" name="type" value="left">';
-    }
-    else {
+    } else {
         print '<select name="type" class="flat" id="topleft">';
         print '<option value="">&nbsp;</option>';
         print '<option value="top"'.($_POST["type"] && $_POST["type"] == 'top' ? ' selected' : '').'>'.$langs->trans('Top').'</option>';
@@ -370,8 +365,7 @@ if ($action == 'create')
     if ($parent_rowid)
     {
         print '<td>'.$parent_rowid.'<input type="hidden" name="menuId" value="'.$parent_rowid.'"></td>';
-    }
-    else {
+    } else {
         print '<td><input type="text" class="minwidth300" id="menuId" name="menuId" value="'.(GETPOST("menuId", 'int') ?GETPOST("menuId", 'int') : '').'"></td>';
     }
     print '<td>'.$langs->trans('DetailMenuIdParent');
@@ -413,8 +407,7 @@ if ($action == 'create')
 	print '</div>';
 
     print '</form>';
-}
-elseif ($action == 'edit')
+} elseif ($action == 'edit')
 {
     print load_fiche_titre($langs->trans("ModifMenu"), '', 'title_setup');
     print '<br>';
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index f27968d462d..590b6eb8034 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -118,9 +118,7 @@ if ($action == 'up')
 	$sql .= " WHERE m.rowid = ".$previous['rowid']; // Descend celui du dessus
 	dol_syslog("admin/menus/index.php ".$sql);
 	$db->query($sql);
-}
-
-elseif ($action == 'down')
+} elseif ($action == 'down')
 {
 	$current = array();
 	$next = array();
@@ -174,9 +172,7 @@ elseif ($action == 'down')
 	$sql .= " WHERE m.rowid = ".$next['rowid'];
 	dol_syslog("admin/menus/index.php ".$sql);
 	$db->query($sql);
-}
-
-elseif ($action == 'confirm_delete' && $confirm == 'yes')
+} elseif ($action == 'confirm_delete' && $confirm == 'yes')
 {
 	$db->begin();
 
@@ -191,8 +187,7 @@ elseif ($action == 'confirm_delete' && $confirm == 'yes')
 
 		header("Location: ".DOL_URL_ROOT.'/admin/menus/index.php?menu_handler='.$menu_handler);
 		exit;
-	}
-	else {
+	} else {
 		$db->rollback();
 
 		$reload = 0;
@@ -407,8 +402,7 @@ if ($conf->use_javascript_ajax)
 	}
 
 	print '</div>';
-}
-else {
+} else {
 	$langs->load("errors");
 	setEventMessages($langs->trans("ErrorFeatureNeedJavascript"), null, 'errors');
 }
diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php
index 145ec566057..6d88153611d 100644
--- a/htdocs/admin/menus/other.php
+++ b/htdocs/admin/menus/other.php
@@ -41,8 +41,7 @@ if ($action == 'activate_hidemenu')
 	dolibarr_set_const($db, "MAIN_MENU_HIDE_UNAUTHORIZED", '1', 'chaine', 0, '', $conf->entity);
 	header("Location: ".$_SERVER["PHP_SELF"]);
 	exit;
-}
-elseif ($action == 'disable_hidemenu')
+} elseif ($action == 'disable_hidemenu')
 {
 	dolibarr_del_const($db, "MAIN_MENU_HIDE_UNAUTHORIZED", $conf->entity);
 	header("Location: ".$_SERVER["PHP_SELF"]);
@@ -94,8 +93,7 @@ print '<td class="center">';
 if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))
 {
 	print '<a href="'.$_SERVER["PHP_SELF"].'?action=activate_hidemenu">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-}
-else {
+} else {
 	print '<a href="'.$_SERVER["PHP_SELF"].'?action=disable_hidemenu">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 }
 print "</td>";
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 7b64dd08bd0..1cfd1c550c6 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -139,8 +139,7 @@ foreach ($modulesdir as $dir)
 		    					        if ($publisher)
 		    					        {
 		    					            $arrayofnatures['external_'.$publisher] = $langs->trans("External").' - '.$publisher;
-		    					        }
-		    					        else {
+		    					        } else {
 		    					            $arrayofnatures['external_'] = $langs->trans("External").' - '.$langs->trans("UnknownPublishers");
 		    					        }
 		    					    }
@@ -178,19 +177,15 @@ foreach ($modulesdir as $dir)
 		    			            else $categ[$specialstring] = 1;
 		    						$j++;
 		    			            $i++;
-		    					}
-		    					else dol_syslog("Module ".get_class($objMod)." not qualified");
-							}
-		            		catch (Exception $e)
+		    					} else dol_syslog("Module ".get_class($objMod)." not qualified");
+							} catch (Exception $e)
 		            		{
 		            		     dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 		            		}
-						}
-		            	else {
+						} else {
 							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
 						}
-					}
-		            catch (Exception $e)
+					} catch (Exception $e)
 		            {
 		                 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 		            }
@@ -198,8 +193,7 @@ foreach ($modulesdir as $dir)
 		    }
 		}
 		closedir($handle);
-	}
-	else {
+	} else {
 		dol_syslog("htdocs/admin/modulehelp.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
 	}
 }
@@ -327,8 +321,7 @@ if ($mode == 'desc')
         if (!empty($objMod->editor_url) && !preg_match('/dolibarr\.org/i', $objMod->editor_url)) $textexternal .= ($objMod->editor_name != 'dolibarr' ? ' - ' : '').img_picto('', 'globe').' <a href="'.$editor_url.'" target="_blank">'.$objMod->editor_url.'</a>';
         $text .= $textexternal;
         $text .= '<br>';
-    }
-    else {
+    } else {
         $text .= '<br><span class="opacitymedium">'.$langs->trans("Origin").':</span> '.$langs->trans("Core").'<br>';
     }
 
@@ -359,8 +352,7 @@ if ($mode == 'feature')
     		$i++;
     	}
     	$text .= ')';
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -373,8 +365,7 @@ if ($mode == 'feature')
             $text .= ($i ? ', ' : '').$val;
             $i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -383,8 +374,7 @@ if ($mode == 'feature')
     if (dol_is_file($filedata))
     {
         $text .= $langs->trans("Yes").' ('.$moduledir.'/sql/data.sql)';
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -402,8 +392,7 @@ if ($mode == 'feature')
            		$i++;
         	}
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -411,8 +400,7 @@ if ($mode == 'feature')
     if (isset($objMod->module_parts) && isset($objMod->module_parts['models']) && $objMod->module_parts['models'])
     {
         $text .= $langs->trans("Yes");
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -420,8 +408,7 @@ if ($mode == 'feature')
     if (isset($objMod->module_parts) && isset($objMod->module_parts['substitutions']) && $objMod->module_parts['substitutions'])
     {
         $text .= $langs->trans("Yes");
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -434,8 +421,7 @@ if ($mode == 'feature')
             $text .= ($i ? ', ' : '').($val['label']);
             $i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -444,8 +430,7 @@ if ($mode == 'feature')
     if (isset($objMod->module_parts) && isset($objMod->module_parts['triggers']) && $objMod->module_parts['triggers'])
     {
     	$yesno = 'Yes';
-    }
-    else {
+    } else {
     	$yesno = 'No';
     }
     require_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
@@ -473,8 +458,7 @@ if ($mode == 'feature')
             $text .= ($i ? ', ' : '').($val['file'] ? $val['file'] : $val[0]);
             $i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -504,8 +488,7 @@ if ($mode == 'feature')
         	$text .= ($i ? ', ' : '').($val);
         	$i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -518,8 +501,7 @@ if ($mode == 'feature')
         	$text .= ($i ? ', ' : '').($val[1]);
         	$i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -527,8 +509,7 @@ if ($mode == 'feature')
     if (isset($objMod->menu) && !empty($objMod->menu)) // objMod can be an array or just an int 1
     {
         $text .= $langs->trans("Yes");
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -541,8 +522,7 @@ if ($mode == 'feature')
             $text .= ($i ? ', ' : '').($val);
             $i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -555,8 +535,7 @@ if ($mode == 'feature')
             $text .= ($i ? ', ' : '').($val);
             $i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index dba149a2bb0..688e310b308 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -125,8 +125,7 @@ if ($action == 'install')
 		$langs->load("Error");
 		setEventMessages($langs->trans("ErrorModuleFileRequired"), null, 'warnings');
 		$error++;
-	}
-	else {
+	} else {
 		if (!$error && !preg_match('/\.zip$/i', $original_file))
 		{
 			$langs->load("errors");
@@ -172,8 +171,7 @@ if ($action == 'install')
 				$langs->load("errors");
 				setEventMessages($langs->trans($result['error'], $original_file), null, 'errors');
 				$error++;
-			}
-			else {
+			} else {
 				// Now we move the dir of the module
 				$modulename = preg_replace('/module_/', '', $original_file);
 				$modulename = preg_replace('/\-([0-9][0-9\.]*)\.zip$/i', '', $modulename);
@@ -228,8 +226,7 @@ if ($action == 'install')
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("ErrorFailToRenameFile", $_FILES['fileinstall']['tmp_name'], $newfile), null, 'errors');
 			$error++;
 		}
@@ -260,14 +257,12 @@ if ($action == 'set' && $user->admin)
 					$msg = $langs->trans('ModuleEnabledAdminMustCheckRights');
 					setEventMessages($msg, null, 'warnings');
 				}
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 		}
 	}
 	header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y ? '&page_y='.$page_y : ''));
 	exit;
-}
-elseif ($action == 'reset' && $user->admin && GETPOST('confirm') == 'yes')
+} elseif ($action == 'reset' && $user->admin && GETPOST('confirm') == 'yes')
 {
 	$result = unActivateModule($value);
 	if ($result) setEventMessages($result, null, 'errors');
@@ -370,8 +365,7 @@ foreach ($modulesdir as $dir)
 										if ($publisher)
 										{
 											$arrayofnatures['external_'.$publisher] = $langs->trans("External").' - '.$publisher;
-										}
-										else {
+										} else {
 											$arrayofnatures['external_'] = $langs->trans("External").' - '.$langs->trans("UnknownPublishers");
 										}
 									}
@@ -424,19 +418,15 @@ foreach ($modulesdir as $dir)
 									else $categ[$specialstring] = 1;
 									$j++;
 									$i++;
-								}
-								else dol_syslog("Module ".get_class($objMod)." not qualified");
-							}
-							catch (Exception $e)
+								} else dol_syslog("Module ".get_class($objMod)." not qualified");
+							} catch (Exception $e)
 							{
 								 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 							}
-						}
-						else {
+						} else {
 							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
 						}
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 					}
@@ -444,8 +434,7 @@ foreach ($modulesdir as $dir)
 			}
 		}
 		closedir($handle);
-	}
-	else {
+	} else {
 		dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
 	}
 }
@@ -698,8 +687,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
 			if (!empty($objMod->disabled))
 			{
 				$codeenabledisable .= $langs->trans("Disabled");
-			}
-			elseif (!empty($objMod->always_enabled) || ((!empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity != 1)))
+			} elseif (!empty($objMod->always_enabled) || ((!empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity != 1)))
 			{
 				if (method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) $codeenabledisable .= $langs->trans("Used");
 				else {
@@ -707,14 +695,12 @@ if ($mode == 'common' || $mode == 'commonkanban')
 					//print $langs->trans("Required");
 				}
 				if (!empty($conf->multicompany->enabled) && $user->entity) $disableSetup++;
-			}
-			else {
+			} else {
 				if (!empty($objMod->warnings_unactivation[$mysoc->country_code]) && method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {
 					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset_confirm&amp;confirm_message_code='.$objMod->warnings_unactivation[$mysoc->country_code].'&amp;value='.$modName.'&amp;mode='.$mode.$param.'">';
 					$codeenabledisable .= img_picto($langs->trans("Activated"), 'switch_on');
 					$codeenabledisable .= '</a>';
-				}
-				else {
+				} else {
 					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset&amp;value='.$modName.'&amp;mode='.$mode.'&amp;confirm=yes'.$param.'">';
 					$codeenabledisable .= img_picto($langs->trans("Activated"), 'switch_on');
 					$codeenabledisable .= '</a>';
@@ -742,44 +728,36 @@ if ($mode == 'common' || $mode == 'commonkanban')
 						{
 							$codetoconfig .= '<a href="'.$urlpage.'" title="'.$langs->trans($page).'">'.img_picto(ucfirst($page), "setup").'</a>';
 							//    print '<a href="'.$page.'">'.ucfirst($page).'</a>&nbsp;';
-						}
-						else {
+						} else {
 							if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs))
 							{
 								$urltouse = dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1);
 								$codetoconfig .= '<a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
-							}
-							else {
+							} else {
 								$urltouse = $urlpage;
 								$codetoconfig .= '<a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
 							}
 						}
 					}
-				}
-				elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs))
+				} elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs))
 				{
 					$codetoconfig .= '<a class="valignmiddle" href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1).'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
-				}
-				else {
+				} else {
 					$codetoconfig .= '<a class="valignmiddle" href="'.$objMod->config_page_url.'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
 				}
-			}
-			else {
+			} else {
 				$codetoconfig .= img_picto($langs->trans("NothingToSetup"), "setup", 'class="opacitytransp" style="padding-right: 6px"', false, 0, 0, '', 'fa-15');
 			}
-		}
-		else // Module not yet activated
+		} else // Module not yet activated
 		{
 			// Set $codeenabledisable
 			if (!empty($objMod->always_enabled))
 			{
 				// Should never happened
-			}
-			elseif (!empty($objMod->disabled))
+			} elseif (!empty($objMod->disabled))
 			{
 				$codeenabledisable .= $langs->trans("Disabled");
-			}
-			else {
+			} else {
 				// Module qualified for activation
 				$warningmessage = '';
 				if (!empty($arrayofwarnings[$modName]))
@@ -842,8 +820,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
 			{
 				if (preg_match('/^\//i', $objMod->picto)) print img_picto($alttext, $objMod->picto, 'class="valignmiddle pictomodule paddingrightonly"', 1);
 				else print img_object($alttext, $objMod->picto, 'class="valignmiddle pictomodule paddingrightonly"');
-			}
-			else {
+			} else {
 				print img_object($alttext, 'generic', 'class="valignmiddle paddingrightonly"');
 			}
 			print ' <span class="valignmiddle">'.$objMod->getName().'</span>';
@@ -1012,8 +989,7 @@ if ($mode == 'deploy')
 		{
 			$message = info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
 			$allowfromweb = -1;
-		}
-		else {
+		} else {
 			if ($dirins_ok)
 			{
 				if (!is_writable(dol_osencode($dirins)))
@@ -1022,14 +998,12 @@ if ($mode == 'deploy')
 					$message = info_admin($langs->trans("ErrorFailedToWriteInDir", $dirins), 0, 0, '1', 'warning');
 					$allowfromweb = 0;
 				}
-			}
-			else {
+			} else {
 				$message = info_admin($langs->trans("NotExistsDirect", $dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
 				$allowfromweb = 0;
 			}
 		}
-	}
-	else {
+	} else {
 		$message = info_admin($langs->trans("InstallModuleFromWebHasBeenDisabledByFile", $dolibarrdataroot.'/installmodules.lock'));
 		$allowfromweb = 0;
 	}
@@ -1049,8 +1023,7 @@ if ($mode == 'deploy')
 		if ($allowfromweb == 1)
 		{
 			//print $langs->trans("ThisIsProcessToFollow").'<br>';
-		}
-		else {
+		} else {
 			print $langs->trans("ThisIsAlternativeProcessToFollow").'<br>';
 			print '<b>'.$langs->trans("StepNb", 1).'</b>: ';
 			print $langs->trans("FindPackageFromWebSite", $fullurl).'<br>';
@@ -1130,8 +1103,7 @@ if ($mode == 'deploy')
 					print ' ';
 					print info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow, $maxphptoshowparam), 1);
 				}
-			}
-			else {
+			} else {
 				print ' ('.$langs->trans("UploadDisabled").')';
 			}
 
@@ -1141,8 +1113,7 @@ if ($mode == 'deploy')
 			print '<br>';
 
 			print '<div class="center"><div class="logo_setup"></div></div>';
-		}
-		else {
+		} else {
 			print $langs->trans("UnpackPackageInModulesRoot", $dirins).'<br>';
 			print '<b>'.$langs->trans("StepNb", 4).'</b>: ';
 			print $langs->trans("SetupIsReadyForUse").'<br>';
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index ddf55993fd7..de1a6888de0 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -58,13 +58,10 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -95,13 +92,11 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=mrp&file=SPECIMEN.pdf");
 			return;
-		}
-		else {
+		} else {
 			setEventMessages($module->error, null, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -111,9 +106,7 @@ elseif ($action == 'specimen')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -138,17 +131,13 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Check if numbering module chosen can be activated
 	// by calling method canBeActivated
 
 	dolibarr_set_const($db, "MRP_MO_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'set_MRP_MO_DRAFT_WATERMARK')
+} elseif ($action == 'set_MRP_MO_DRAFT_WATERMARK')
 {
 	$draft = GETPOST("MRP_MO_DRAFT_WATERMARK");
 	$res = dolibarr_set_const($db, "MRP_MO_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
@@ -158,13 +147,10 @@ elseif ($action == 'set_MRP_MO_DRAFT_WATERMARK')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'set_MRP_MO_FREE_TEXT')
+} elseif ($action == 'set_MRP_MO_FREE_TEXT')
 {
 	$freetext = GETPOST("MRP_MO_FREE_TEXT", 'none'); // No alpha here, we want exact string
 
@@ -175,8 +161,7 @@ elseif ($action == 'set_MRP_MO_FREE_TEXT')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -257,8 +242,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->MRP_MO_ADDON == $file)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else {
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -322,8 +306,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -392,8 +375,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -404,8 +386,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->MRP_MO_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -433,8 +414,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-	                            }
-	                            else {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -479,8 +459,7 @@ $variablename = 'MRP_MO_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else {
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index 1b912b27b5e..a7e073f08d2 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -53,8 +53,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0)
 	{
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
         setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -65,8 +64,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 	if (dolibarr_del_const($db, $code, 0) > 0)
 	{
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
         setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -94,11 +92,9 @@ if ($action == 'add_currency')
 		{
 			if ($currency->addRate($rate)) setEventMessages($langs->trans('RecordSaved'), array());
 			else setEventMessages($langs->trans('ErrorAddRateFail'), array(), 'errors');
-		}
-		else setEventMessages($langs->trans('ErrorAddCurrencyFail'), $currency->errors, 'errors');
+		} else setEventMessages($langs->trans('ErrorAddCurrencyFail'), $currency->errors, 'errors');
 	}
-}
-elseif ($action == 'update_currency')
+} elseif ($action == 'update_currency')
 {
 	$error = 0;
 
@@ -123,8 +119,7 @@ elseif ($action == 'update_currency')
 				}
 			}
 		}
-	}
-	elseif (GETPOST('deletecurrency', 'alpha'))
+	} elseif (GETPOST('deletecurrency', 'alpha'))
 	{
 		$fk_multicurrency = GETPOST('fk_multicurrency', 'int');
 		$currency = new MultiCurrency($db);
@@ -135,16 +130,14 @@ elseif ($action == 'update_currency')
 			else setEventMessages($langs->trans('ErrorDeleteCurrencyFail'), array(), 'errors');
 		}
 	}
-}
-elseif ($action == 'setapilayer')
+} elseif ($action == 'setapilayer')
 {
     if (GETPOSTISSET('modify_apilayer'))
     {
         dolibarr_set_const($db, 'MULTICURRENCY_APP_ID', GETPOST('MULTICURRENCY_APP_ID', 'alpha'));
         dolibarr_set_const($db, 'MULTICURRENCY_APP_SOURCE', GETPOST('MULTICURRENCY_APP_SOURCE', 'alpha'));
         //dolibarr_set_const($db, 'MULTICURRENCY_ALTERNATE_SOURCE', GETPOST('MULTICURRENCY_ALTERNATE_SOURCE', 'alpha'));
-    }
-    else {
+    } else {
         $result = MultiCurrency::syncRates($conf->global->MULTICURRENCY_APP_ID);
         if ($result > 0) {
         	setEventMessages($langs->trans("CurrencyRateSyncSucceed"), null, "mesgs");
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index 859d36b7c36..a32cd0fa1f5 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -84,8 +84,7 @@ if ($action == 'settemplates')
 		$db->commit();
 
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		$db->rollback();
 
 		setEventMessages($langs->trans("Error"), null, 'errors');
@@ -105,8 +104,7 @@ if ($action == 'setvalue' && $user->admin)
     	$db->commit();
 
     	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
     	$db->rollback();
 
     	setEventMessages($langs->trans("Error"), null, 'errors');
@@ -138,8 +136,7 @@ if ($action == 'setfixednotif' && $user->admin)
 				$newkey = 'NOTIFICATION_FIXEDEMAIL_'.$reg[1].'_THRESHOLD_HIGHER_'.((int) GETPOST($shortkey.'_amount'));
 				$newval = GETPOST($shortkey.'_key');
 				//print $newkey.' - '.$newval.'<br>';
-	    	}
-	    	elseif (preg_match('/^NOTIF_(.*)_new_key/', $key, $reg))
+	    	} elseif (preg_match('/^NOTIF_(.*)_new_key/', $key, $reg))
 	    	{
 	    		// Add a new entry
 	    		$newkey = 'NOTIFICATION_FIXEDEMAIL_'.$reg[1].'_THRESHOLD_HIGHER_'.((int) GETPOST($shortkey.'_amount'));
@@ -158,8 +155,7 @@ if ($action == 'setfixednotif' && $user->admin)
     	$db->commit();
 
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
 		$db->rollback();
 
         setEventMessages($langs->trans("Error"), null, 'errors');
diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 85f9ebf0409..85cd9284535 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -119,8 +119,7 @@ foreach ($list as $key)
         print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
         print '<td><input style="width: 80%" type"text" name="uri'.$key[0].'" value="'.$redirect_uri.'">';
         print '</td></tr>';
-    }
-    else {
+    } else {
         print '<tr class="oddeven value">';
         print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
         print '<td>'.$langs->trans("FeatureNotYetSupported").'</td>';
diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index f0d3c530b71..a78913b7e16 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -78,8 +78,7 @@ if ($action == 'setconst' && $user->admin)
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null);
-    }
-    else {
+    } else {
         $db->rollback();
         dol_print_error($db);
     }
@@ -97,8 +96,7 @@ if ($action == 'setvalue' && $user->admin)
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null);
-    }
-    else {
+    } else {
         $db->rollback();
         dol_print_error($db);
     }
@@ -151,8 +149,7 @@ if ($mode == 'setup' && $user->admin)
             $urltorenew = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
             $urltodelete = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
             $urltocheckperms = 'https://github.com/settings/applications/';
-        }
-        elseif ($key[0] == 'OAUTH_GOOGLE_NAME')
+        } elseif ($key[0] == 'OAUTH_GOOGLE_NAME')
         {
             $OAUTH_SERVICENAME = 'Google';
             // List of keys that will be converted into scopes (from constants 'SCOPE_state_in_uppercase' in file of service).
@@ -162,22 +159,19 @@ if ($mode == 'setup' && $user->admin)
             $urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
             $urltodelete = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
             $urltocheckperms = 'https://security.google.com/settings/security/permissions';
-        }
-        elseif ($key[0] == 'OAUTH_STRIPE_TEST_NAME')
+        } elseif ($key[0] == 'OAUTH_STRIPE_TEST_NAME')
         {
         	$OAUTH_SERVICENAME = 'StripeTest';
         	$urltorenew = $urlwithroot.'/core/modules/oauth/stripetest_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
         	$urltodelete = '';
         	$urltocheckperms = '';
-        }
-        elseif ($key[0] == 'OAUTH_STRIPE_LIVE_NAME')
+        } elseif ($key[0] == 'OAUTH_STRIPE_LIVE_NAME')
         {
         	$OAUTH_SERVICENAME = 'StripeLive';
         	$urltorenew = $urlwithroot.'/core/modules/oauth/stripelive_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
         	$urltodelete = '';
         	$urltocheckperms = '';
-        }
-        else {
+        } else {
 			$urltorenew = '';
 			$urltodelete = '';
 			$urltocheckperms = '';
@@ -193,8 +187,7 @@ if ($mode == 'setup' && $user->admin)
         $storage = new DoliStorage($db, $conf);
         try {
             $tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             // Return an error if token not found
         }
@@ -217,12 +210,10 @@ if ($mode == 'setup' && $user->admin)
                 if ($endoflife == $tokenobj::EOL_NEVER_EXPIRES)
                 {
                     $expiredat = $langs->trans("Never");
-                }
-                elseif ($endoflife == $tokenobj::EOL_UNKNOWN)
+                } elseif ($endoflife == $tokenobj::EOL_UNKNOWN)
                 {
                     $expiredat = $langs->trans("Unknown");
-                }
-                else {
+                } else {
                     $expiredat = dol_print_date($endoflife, "dayhour");
                 }
             }
@@ -367,8 +358,7 @@ if ($mode == 'test' && $user->admin)
             } else {
                 setEventMessages($printer->error, $printer->errors, 'errors');
             }
-        }
-        else {
+        } else {
             print $langs->trans('PleaseConfigureDriverfromList');
         }
     }
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index 2873cf5d15f..85d7e140a6d 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -56,8 +56,7 @@ if ($action == 'updateMask')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -182,8 +181,7 @@ foreach ($dirmodels as $reldir)
                             if ($conf->global->PAYMENT_ADDON == $file || $conf->global->PAYMENT_ADDON.'.php' == $file)
                             {
                                 print img_picto($langs->trans("Activated"), 'switch_on');
-                            }
-                            else {
+                            } else {
                                 print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                             }
                             print '</td>';
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index ec4015f6e98..ece44f66677 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -92,8 +92,7 @@ if ($action == 'activate_pdfsecurity')
 	dolibarr_set_const($db, "PDF_SECURITY_ENCRYPTION", "1", 'chaine', 0, '', $conf->entity);
 	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
 	exit;
-}
-elseif ($action == 'disable_pdfsecurity')
+} elseif ($action == 'disable_pdfsecurity')
 {
 	dolibarr_del_const($db, "PDF_SECURITY_ENCRYPTION", $conf->entity);
 	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
@@ -189,8 +188,7 @@ for ($i = 1; $i <= 6; $i++)
 	{
 		$pid = $langs->transcountry("ProfId".$i, $mysoc->country_code);
 		if ($pid == '-') $pid = false;
-	}
-	else {
+	} else {
 		$pid = img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
 	}
 	if ($pid)
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 7dcaf0fba47..d5bc8fd938b 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -229,8 +229,7 @@ if ($result)
 			print '<td class="center">';
 			print img_picto($langs->trans("Active"), 'tick');
 			print '</td>';
-		}
-		else {
+		} else {
 			print '<td>';
 			print '<a class="reposition" href="perms.php?pid='.$obj->id.'&amp;action=add">'.img_edit_add().'</a>';
 			print '</td>';
@@ -246,8 +245,7 @@ if ($result)
 
         $i++;
     }
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 print '</table>';
 print '</div>';
 
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index b33b2396aa2..e4a27a51c65 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -70,8 +70,7 @@ if ($action == "set")
         $res = dolibarr_set_const($db, "PRELEVEMENT_RAISON_SOCIALE", $account->proprio,'chaine',0,'',$conf->entity);
         if (! $res > 0) $error++;
         */
-	}
-	else $error++;
+	} else $error++;
 
 	$res = dolibarr_set_const($db, "PRELEVEMENT_ICS", GETPOST("PRELEVEMENT_ICS"), 'chaine', 0, '', $conf->entity);
 	if (!$res > 0) $error++;
@@ -100,8 +99,7 @@ if ($action == "set")
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index f2c748b4ce2..9cde0e81e56 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -63,12 +63,10 @@ if ($action == 'updateMask')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -99,18 +97,15 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=propal&file=SPECIMEN.pdf");
 			return;
-		}
-		else {
+		} else {
 			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
-}
-elseif ($action == 'setribchq')
+} elseif ($action == 'setribchq')
 {
 	$rib = GETPOST('rib', 'alpha');
 	$chq = GETPOST('chq', 'alpha');
@@ -123,12 +118,10 @@ elseif ($action == 'setribchq')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-elseif ($action == 'set_PROPALE_DRAFT_WATERMARK')
+} elseif ($action == 'set_PROPALE_DRAFT_WATERMARK')
 {
 	$draft = GETPOST('PROPALE_DRAFT_WATERMARK', 'alpha');
 
@@ -138,12 +131,10 @@ elseif ($action == 'set_PROPALE_DRAFT_WATERMARK')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-elseif ($action == 'set_PROPOSAL_FREE_TEXT')
+} elseif ($action == 'set_PROPOSAL_FREE_TEXT')
 {
 	$freetext = GETPOST('PROPOSAL_FREE_TEXT', 'none'); // No alpha here, we want exact string
 
@@ -154,12 +145,10 @@ elseif ($action == 'set_PROPOSAL_FREE_TEXT')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-elseif ($action == 'setdefaultduration')
+} elseif ($action == 'setdefaultduration')
 {
 	$res = dolibarr_set_const($db, "PROPALE_VALIDITY_DURATION", $value, 'chaine', 0, '', $conf->entity);
 
@@ -168,13 +157,10 @@ elseif ($action == 'setdefaultduration')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-
-elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL')
+} elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL')
 {
     $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL", $value, 'chaine', 0, '', $conf->entity);
 
@@ -183,8 +169,7 @@ elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -192,17 +177,14 @@ elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
         if ($conf->global->PROPALE_ADDON_PDF == "$value") dolibarr_del_const($db, 'PROPALE_ADDON_PDF', $conf->entity);
 	}
-}
-
-elseif ($action == 'setdoc')
+} elseif ($action == 'setdoc')
 {
     if (dolibarr_set_const($db, "PROPALE_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
 	{
@@ -215,9 +197,7 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
@@ -302,8 +282,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->PROPALE_ADDON == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else {
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -367,8 +346,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -438,8 +416,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else {
+	                            } else {
 	                                print "<td align=\"center\">\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -450,8 +427,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->PROPALE_ADDON_PDF == "$name")
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -484,8 +460,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-	                            }
-	                            else {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -558,17 +533,14 @@ if (empty($conf->facture->enabled))
 					$i++;
 				}
 				print "</select>";
-			}
-			else {
+			} else {
 				print "<i>".$langs->trans("NoActiveBankAccountDefined")."</i>";
 			}
 		}
-	}
-	else {
+	} else {
 		print '<span class="opacitymedium">'.$langs->trans("BankModuleNotActive").'</span>';
 	}
-}
-else {
+} else {
 	print '<span class="opacitymedium">'.$langs->trans("SeeSetupOfModule", $langs->transnoentitiesnoconv("Module30Name")).'</span>';
 }
 print "</td></tr>";
@@ -605,8 +577,7 @@ if (empty($conf->facture->enabled))
 		}
 	}
 	print "</select>";
-}
-else {
+} else {
 	print '<span class="opacitymedium">'.$langs->trans("SeeSetupOfModule", $langs->transnoentitiesnoconv("Module30Name")).'</span>';
 }
 print "</td></tr>";
@@ -670,8 +641,7 @@ $variablename = 'PROPOSAL_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else {
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index dc6aa5da33b..d1b23c485ab 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -89,8 +89,7 @@ if ($action == 'addprinter' && $user->admin) {
         {
             $db->commit();
             setEventMessages($langs->trans("PrinterAdded", $printername), null);
-        }
-        else {
+        } else {
             $db->rollback();
             dol_print_error($db);
         }
@@ -114,8 +113,7 @@ if ($action == 'deleteprinter' && $user->admin) {
         {
             $db->commit();
             setEventMessages($langs->trans("PrinterDeleted", $printername), null);
-        }
-        else {
+        } else {
             $db->rollback();
             dol_print_error($db);
         }
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index 68f8f0e62ee..7bcd054f13e 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -74,9 +74,7 @@ if ($action == 'updateMask')
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 		else setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-
-elseif ($action == 'set_param')
+} elseif ($action == 'set_param')
 {
 	$freetext = GETPOST('RECEPTION_FREE_TEXT', 'none'); // No alpha here, we want exact string
 	$res = dolibarr_set_const($db, "RECEPTION_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
@@ -98,9 +96,7 @@ elseif ($action == 'set_param')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-}
-
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -131,13 +127,11 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=reception&file=SPECIMEN.pdf");
 			return;
-		}
-		else {
+		} else {
 			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -147,9 +141,7 @@ elseif ($action == 'specimen')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -174,9 +166,7 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmodel')
+} elseif ($action == 'setmodel')
 {
 	dolibarr_set_const($db, "RECEPTION_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
 }
@@ -251,8 +241,7 @@ foreach ($dirmodels as $reldir)
                         $tmp = $module->getExample();
                         if (preg_match('/^Error/', $tmp)) {
 							$langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
-						}
-                        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
                         else print $tmp;
                         print '</td>'."\n";
 
@@ -260,8 +249,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->RECEPTION_ADDON_NUMBER == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else {
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;value='.$file.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -327,8 +315,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -396,8 +383,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -408,8 +394,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->RECEPTION_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -439,8 +424,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'reception').'</a>';
-	                            }
-	                            else {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php
index 04ff3861c7f..e9cb6b8f554 100644
--- a/htdocs/admin/resource.php
+++ b/htdocs/admin/resource.php
@@ -91,8 +91,7 @@ if (empty($conf->use_javascript_ajax))
 	print '<td class="nowrap right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print '</td>';
-}
-else {
+} else {
 	print '<td width="60" class="right">';
 	$arrval = array(
 			'0'=>$langs->trans("No"),
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 161b521337b..4dcb83c32e6 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -45,8 +45,7 @@ if ($action == 'setgeneraterule')
 	if (!dolibarr_set_const($db, 'USER_PASSWORD_GENERATED', $_GET["value"], 'chaine', 0, '', $conf->entity))
 	{
 		dol_print_error($db);
-	}
-	else {
+	} else {
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
@@ -90,8 +89,7 @@ if ($action == 'activate_encrypt')
                 $i++;
             }
         }
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
 
 	//print $error." ".$sql;
     //exit;
@@ -100,13 +98,11 @@ if ($action == 'activate_encrypt')
 		$db->commit();
 		header("Location: security.php");
 	    exit;
-	}
-	else {
+	} else {
 		$db->rollback();
 		dol_print_error($db, '');
 	}
-}
-elseif ($action == 'disable_encrypt')
+} elseif ($action == 'disable_encrypt')
 {
 	//On n'autorise pas l'annulation de l'encryption car les mots de passe ne peuvent pas etre decodes
 	//Do not allow "disable encryption" as passwords cannot be decrypted
@@ -129,12 +125,10 @@ if ($action == 'activate_encryptdbpassconf')
 		//dolibarr_set_const($db, "MAIN_DATABASE_PWD_CONFIG_ENCRYPTED", "1");
 		header("Location: security.php");
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans('InstrucToEncodePass', dol_encode($dolibarr_main_db_pass)), null, 'warnings');
 	}
-}
-elseif ($action == 'disable_encryptdbpassconf')
+} elseif ($action == 'disable_encryptdbpassconf')
 {
 	$result = encodedecode_dbpassconf(0);
 	if ($result > 0)
@@ -145,8 +139,7 @@ elseif ($action == 'disable_encryptdbpassconf')
 		//dolibarr_del_const($db, "MAIN_DATABASE_PWD_CONFIG_ENCRYPTED",$conf->entity);
 		header("Location: security.php");
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans('InstrucToClearPass', $dolibarr_main_db_pass), null, 'warnings');
 	}
 }
@@ -156,8 +149,7 @@ if ($action == 'activate_MAIN_SECURITY_DISABLEFORGETPASSLINK')
 	dolibarr_set_const($db, "MAIN_SECURITY_DISABLEFORGETPASSLINK", '1', 'chaine', 0, '', $conf->entity);
 	header("Location: security.php");
 	exit;
-}
-elseif ($action == 'disable_MAIN_SECURITY_DISABLEFORGETPASSLINK')
+} elseif ($action == 'disable_MAIN_SECURITY_DISABLEFORGETPASSLINK')
 {
 	dolibarr_del_const($db, "MAIN_SECURITY_DISABLEFORGETPASSLINK", $conf->entity);
 	header("Location: security.php");
@@ -264,8 +256,7 @@ foreach ($arrayhandler as $key => $module)
         // Show example of numbering module
         print '<td class="nowrap">';
         $tmp = $module->getExample();
-        if (preg_match('/^Error/', $tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
-        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+        if (preg_match('/^Error/', $tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
         else print $tmp;
         print '</td>'."\n";
 
@@ -273,8 +264,7 @@ foreach ($arrayhandler as $key => $module)
         if ($conf->global->USER_PASSWORD_GENERATED == $key)
         {
             print img_picto('', 'tick');
-        }
-        else {
+        } else {
             print '<a href="'.$_SERVER['PHP_SELF'].'?action=setgeneraterule&amp;value='.$key.'">'.$langs->trans("Activate").'</a>';
         }
         print "</td></tr>\n";
@@ -430,8 +420,7 @@ if (!empty($conf->global->DATABASE_PWD_ENCRYPTED))
 		//On n'autorise pas l'annulation de l'encryption car les mots de passe ne peuvent pas etre decodes
 	  	//Do not allow "disable encryption" as passwords cannot be decrypted
 	  	print '<a href="security.php?action=disable_encrypt">'.$langs->trans("Disable").'</a>';
-	}
-	else {
+	} else {
 		print '-';
 	}
 	print "</td>";
@@ -456,8 +445,7 @@ if (empty($dolibarr_main_db_pass) && empty($dolibarr_main_db_encrypted_pass))
 {
 	$langs->load("errors");
 	print img_warning($langs->trans("WarningPassIsEmpty"));
-}
-else {
+} else {
 	if (empty($dolibarr_main_db_encrypted_pass))
 	{
 		print '<a href="security.php?action=activate_encryptdbpassconf">'.$langs->trans("Activate").'</a>';
@@ -508,8 +496,7 @@ if (GETPOST('info', 'int') > 0)
     if (function_exists('password_hash'))
     {
         print $langs->trans("Note: The function password_hash exists on your PHP")."<br>\n";
-    }
-    else {
+    } else {
         print $langs->trans("Note: The function password_hash does not exists on your PHP")."<br>\n";
     }
     print 'MAIN_SECURITY_HASH_ALGO = '.$conf->global->MAIN_SECURITY_HASH_ALGO."<br>\n";
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index b6674f00c5c..363340445c2 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -50,8 +50,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 } elseif (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg)) {
@@ -60,13 +59,10 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
-}
-
-elseif ($action == 'updateform')
+} elseif ($action == 'updateform')
 {
 	$res1 = dolibarr_set_const($db, "MAIN_APPLICATION_TITLE", GETPOST("MAIN_APPLICATION_TITLE", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	$res2 = dolibarr_set_const($db, "MAIN_SESSION_TIMEOUT", GETPOST("MAIN_SESSION_TIMEOUT", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
@@ -116,18 +112,15 @@ if (function_exists("imagecreatefrompng"))
 	if (!empty($conf->use_javascript_ajax))
 	{
 		print ajax_constantonoff('MAIN_SECURITY_ENABLECAPTCHA');
-	}
-	else {
+	} else {
 		if (empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
 		{
 			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_MAIN_SECURITY_ENABLECAPTCHA">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-		}
-		else {
+		} else {
 			print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_MAIN_SECURITY_ENABLECAPTCHA">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 		}
 	}
-}
-else {
+} else {
     $desc = $form->textwithpicto('', $langs->transnoentities("EnableGDLibraryDesc"), 1, 'warning');
     print $desc;
 }
@@ -140,13 +133,11 @@ print '<td class="right">';
 if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('MAIN_USE_ADVANCED_PERMS');
-}
-else {
+} else {
 	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_MAIN_USE_ADVANCED_PERMS">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else {
+	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_MAIN_USE_ADVANCED_PERMS">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index 0745203f365..91c4003ec92 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -122,8 +122,7 @@ if ($action == 'send' && !$_POST['cancel'])
 		{
 			setEventMessages($langs->trans("SmsSuccessfulySent", $smsfrom, $sendto), null, 'mesgs');
 			setEventMessages($smsfile->error, $smsfile->errors, 'mesgs');
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("ResultKo"), null, 'errors');
 			setEventMessages($smsfile->error, $smsfile->errors, 'errors');
 		}
@@ -204,8 +203,7 @@ if ($action == 'edit')
 
 	print '</form>';
 	print '<br>';
-}
-else {
+} else {
 	if (!count($listofmethods)) print '<div class="warning">'.$langs->trans("NoSmsEngine", '<a target="_blank" href="http://www.dolistore.com/search.php?orderby=position&orderway=desc&search_query=smsmanager">DoliStore</a>').'</div>';
 
 	print '<table class="noborder centpercent">';
@@ -262,8 +260,7 @@ else {
 	if (count($listofmethods) && !empty($conf->global->MAIN_SMS_SENDMODE))
 	{
 	    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=test&amp;mode=init">'.$langs->trans("DoTestSend").'</a>';
-	}
-	else {
+	} else {
         print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("DoTestSend").'</a>';
 	}
 	print '</div>';
diff --git a/htdocs/admin/socialnetworks.php b/htdocs/admin/socialnetworks.php
index fd4329b7023..b848dccd998 100644
--- a/htdocs/admin/socialnetworks.php
+++ b/htdocs/admin/socialnetworks.php
@@ -48,8 +48,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -61,8 +60,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php
index 6c1d1837ea8..34c83dbd434 100644
--- a/htdocs/admin/spip.php
+++ b/htdocs/admin/spip.php
@@ -73,8 +73,7 @@ if ($action == 'update' || $action == 'add')
      	if (!$error)
         {
             setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-        }
-        else {
+        } else {
             setEventMessages($langs->trans("Error"), null, 'errors');
         }
     }
@@ -152,8 +151,7 @@ if (!empty($conf->global->ADHERENT_USE_SPIP))
     print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
 
     print '</form>';
-}
-else {
+} else {
     dol_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user');
 
     $link = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&value=1&name=ADHERENT_USE_SPIP">';
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index d3b9061eecc..28ba40e0b7e 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -48,8 +48,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -61,8 +60,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -117,8 +115,7 @@ if (!empty($conf->facture->enabled))
         $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
         print $form->selectarray("STOCK_CALCULATE_ON_BILL", $arrval, $conf->global->STOCK_CALCULATE_ON_BILL);
     }
-}
-else {
+} else {
     print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module30Name"));
 }
 print "</td>\n</tr>\n";
@@ -136,8 +133,7 @@ if (!empty($conf->commande->enabled))
         $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
         print $form->selectarray("STOCK_CALCULATE_ON_VALIDATE_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER);
     }
-}
-else {
+} else {
     print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module25Name"));
 }
 print "</td>\n</tr>\n";
@@ -157,8 +153,7 @@ if (!empty($conf->expedition->enabled))
         $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
         print $form->selectarray("STOCK_CALCULATE_ON_SHIPMENT", $arrval, $conf->global->STOCK_CALCULATE_ON_SHIPMENT);
     }
-}
-else {
+} else {
     print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module80Name"));
 }
 print "</td>\n</tr>\n";
@@ -176,8 +171,7 @@ if (!empty($conf->expedition->enabled))
         $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
         print $form->selectarray("STOCK_CALCULATE_ON_SHIPMENT_CLOSE", $arrval, $conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE);
     }
-}
-else {
+} else {
     print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module80Name"));
 }
 print "</td>\n</tr>\n";
@@ -215,8 +209,7 @@ if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUP
         $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
         print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_BILL", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL);
     }
-}
-else {
+} else {
     print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module40Name"));
 }
 print "</td>\n</tr>\n";
@@ -235,8 +228,7 @@ if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUP
         $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
         print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER);
     }
-}
-else {
+} else {
     print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module40Name"));
 }
 print "</td>\n</tr>\n";
@@ -271,8 +263,7 @@ if (!empty($conf->reception->enabled))
     }
 	print "</td>\n</tr>\n";
 	$found++;
-}
-else {
+} else {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("ReStockOnDispatchOrder").'</td>';
     print '<td class="right">';
@@ -284,8 +275,7 @@ else {
             $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
             print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER);
         }
-	}
-	else {
+	} else {
 		print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module40Name"));
 	}
 	print "</td>\n</tr>\n";
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index c52f4296429..59613f6af5b 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -70,8 +70,7 @@ if ($action == 'updateMask')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -108,13 +107,11 @@ if ($action == 'specimen')  // For invoices
     	{
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=facture_fournisseur&file=SPECIMEN.pdf");
     		return;
-    	}
-    	else {
+    	} else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
-    }
-    else {
+    } else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -124,9 +121,7 @@ if ($action == 'specimen')  // For invoices
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -151,8 +146,7 @@ elseif ($action == 'setdoc')
     {
         $ret = addDocumentModel($value, $type, $label, $scandir);
     }
-}
-elseif ($action == 'unsetdoc')
+} elseif ($action == 'unsetdoc')
 {
     dolibarr_del_const($db, "INVOICE_SUPPLIER_ADDON_PDF", $conf->entity);
 }
@@ -182,8 +176,7 @@ if ($action == 'set_SUPPLIER_INVOICE_FREE_TEXT')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -259,8 +252,7 @@ foreach ($dirmodels as $reldir)
                         $tmp = $module->getExample();
                         if (preg_match('/^Error/', $tmp)) {
                             $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
-                        }
-                        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+                        } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
                         else print $tmp;
                         print '</td>'."\n";
 
@@ -268,8 +260,7 @@ foreach ($dirmodels as $reldir)
                         if ($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER == "$file")
                         {
                             print img_picto($langs->trans("Activated"), 'switch_on');
-                        }
-                        else {
+                        } else {
                             print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         }
                         print '</td>';
@@ -335,8 +326,7 @@ if ($resql)
         array_push($def, $array[0]);
         $i++;
     }
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -403,8 +393,7 @@ foreach ($dirmodels as $reldir)
                             print img_picto($langs->trans("Enabled"),'switch_on');
                         }*/
                         print "</td>";
-                    }
-                    else {
+                    } else {
                         print '<td class="center">'."\n";
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         print "</td>";
@@ -417,8 +406,7 @@ foreach ($dirmodels as $reldir)
                         //print img_picto($langs->trans("Default"),'on');
                         // Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
-                    }
-                    else {
+                    } else {
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
                     }
                     print '</td>';
@@ -479,8 +467,7 @@ $variablename = 'SUPPLIER_INVOICE_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else {
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index f282ee8d7ca..a390e4a4522 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -68,13 +68,10 @@ if ($action == 'updateMask')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-
-elseif ($action == 'specimen')  // For orders
+} elseif ($action == 'specimen')  // For orders
 {
     $modele = GETPOST('module', 'alpha');
 
@@ -106,13 +103,11 @@ elseif ($action == 'specimen')  // For orders
     	{
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=commande_fournisseur&file=SPECIMEN.pdf");
     		return;
-    	}
-    	else {
+    	} else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
-    }
-    else {
+    } else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -122,9 +117,7 @@ elseif ($action == 'specimen')  // For orders
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -149,23 +142,17 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
     // TODO Verifier si module numerotation choisi peut etre active
     // par appel methode canBeActivated
 
     dolibarr_set_const($db, "COMMANDE_SUPPLIER_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'addcat')
+} elseif ($action == 'addcat')
 {
     $fourn = new Fournisseur($db);
     $fourn->CreateCategory($user, GETPOST('cat', 'alphanohtml'));
-}
-
-elseif ($action == 'set_SUPPLIER_ORDER_OTHER')
+} elseif ($action == 'set_SUPPLIER_ORDER_OTHER')
 {
     $freetext = GETPOST('SUPPLIER_ORDER_FREE_TEXT', 'none'); // No alpha here, we want exact string
 	$doubleapproval = GETPOST('SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED', 'alpha');
@@ -193,8 +180,7 @@ elseif ($action == 'set_SUPPLIER_ORDER_OTHER')
 
     	// Insert
     	$newmodule->insert_permissions(1);
-    }
-    else {
+    } else {
     	// Remove all rights with Permission1190
     	$newmodule->delete_permissions();
 
@@ -213,8 +199,7 @@ elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -290,8 +275,7 @@ foreach ($dirmodels as $reldir)
                         $tmp = $module->getExample();
                         if (preg_match('/^Error/', $tmp)) {
                             $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
-                        }
-                        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+                        } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
                         else print $tmp;
                         print '</td>'."\n";
 
@@ -299,8 +283,7 @@ foreach ($dirmodels as $reldir)
                         if ($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER == "$file")
                         {
                             print img_picto($langs->trans("Activated"), 'switch_on');
-                        }
-                        else {
+                        } else {
                             print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         }
                         print '</td>';
@@ -364,8 +347,7 @@ if ($resql)
         array_push($def, $array[0]);
         $i++;
     }
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -422,13 +404,11 @@ foreach ($dirmodels as $reldir)
                             print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier">';
                             print img_picto($langs->trans("Enabled"), 'switch_on');
                             print '</a>';
-                        }
-                        else {
+                        } else {
                             print img_picto($langs->trans("Enabled"), 'switch_on');
                         }
                         print "</td>";
-                    }
-                    else {
+                    } else {
                         print '<td class="center">'."\n";
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         print "</td>";
@@ -439,8 +419,7 @@ foreach ($dirmodels as $reldir)
                     if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF == "$name")
                     {
                         print img_picto($langs->trans("Default"), 'on');
-                    }
-                    else {
+                    } else {
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
                     }
                     print '</td>';
@@ -543,8 +522,7 @@ $variablename = 'SUPPLIER_ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else {
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
@@ -561,8 +539,7 @@ print '<td class="center">';
 if ($conf->reception->enabled)
 {
 	print '<span class="opacitymedium">'.$langs->trans("FeatureNotAvailableWithReceptionModule").'</span>';
-}
-else {
+} else {
 	if ($conf->use_javascript_ajax) {
 		print ajax_constantonoff('SUPPLIER_ORDER_USE_DISPATCH_STATUS');
 	} else {
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index 1c4cfd5905e..da74784505a 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -57,11 +57,10 @@ if ($action == 'updateMask')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
     dolibarr_set_const($db, "SUPPLIER_PAYMENT_ADDON", $value, 'chaine', 0, '', $conf->entity);
 }
@@ -70,9 +69,7 @@ if ($action == 'updateMask')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -97,9 +94,7 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
     $modele = GETPOST('module', 'alpha');
 
@@ -130,21 +125,15 @@ elseif ($action == 'specimen')
     	{
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=supplier_payment&file=SPECIMEN.pdf");
     		return;
-    	}
-    	else {
+    	} else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
-    }
-    else {
+    } else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
-}
-
-
-
-elseif ($action == 'setparams')
+} elseif ($action == 'setparams')
 {
        $res = dolibarr_set_const($db, "PAYMENTS_FOURN_REPORT_GROUP_BY_MOD", GETPOST('PAYMENTS_FOURN_REPORT_GROUP_BY_MOD', 'int'), 'chaine', 0, '', $conf->entity);
        if (!$res > 0) $error++;
@@ -203,8 +192,7 @@ if ($resql)
         array_push($def, $array[0]);
         $i++;
     }
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -278,8 +266,7 @@ foreach ($dirmodels as $reldir)
                             if ($conf->global->SUPPLIER_PAYMENT_ADDON == $file || $conf->global->SUPPLIER_PAYMENT_ADDON.'.php' == $file)
                             {
                                 print img_picto($langs->trans("Activated"), 'switch_on');
-                            }
-                            else {
+                            } else {
                                 print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                             }
                             print '</td>';
@@ -393,8 +380,7 @@ foreach ($dirmodels as $reldir)
                             print img_picto($langs->trans("Enabled"),'switch_on');
                         }*/
                         print "</td>";
-                    }
-                    else {
+                    } else {
                         print '<td class="center">'."\n";
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         print "</td>";
@@ -407,8 +393,7 @@ foreach ($dirmodels as $reldir)
                         //print img_picto($langs->trans("Default"),'on');
                         // Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
-                    }
-                    else {
+                    } else {
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
                     }
                     print '</td>';
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index bb3454de4f7..5f35f3af310 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -60,8 +60,7 @@ if ($action == 'updateMask')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -97,13 +96,11 @@ if ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=supplier_proposal&file=SPECIMEN.pdf");
 			return;
-		}
-		else {
+		} else {
 			setEventMessages($module->error, null, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -119,8 +116,7 @@ if ($action == 'set_SUPPLIER_PROPOSAL_DRAFT_WATERMARK')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -136,8 +132,7 @@ if ($action == 'set_SUPPLIER_PROPOSAL_FREE_TEXT')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -151,8 +146,7 @@ if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -161,18 +155,14 @@ if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL')
 if ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
         if ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF == "$value") dolibarr_del_const($db, 'SUPPLIER_PROPOSAL_ADDON_PDF', $conf->entity);
 	}
-}
-
-elseif ($action == 'setdoc')
+} elseif ($action == 'setdoc')
 {
     if (dolibarr_set_const($db, "SUPPLIER_PROPOSAL_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
 	{
@@ -185,9 +175,7 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
@@ -272,8 +260,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->SUPPLIER_PROPOSAL_ADDON == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else {
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -336,8 +323,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -406,8 +392,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else {
+	                            } else {
 	                                print "<td align=\"center\">\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -418,8 +403,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF == "$name")
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -452,8 +436,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-	                            }
-	                            else {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -500,8 +483,7 @@ $variablename = 'SUPPLIER_PROPOSAL_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else {
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
@@ -531,19 +513,16 @@ if ($conf->banque->enabled)
     if (!empty($conf->use_javascript_ajax))
     {
         print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL');
-    }
-    else {
+    } else {
         if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL))
         {
             print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL&amp;value=1">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-        }
-        else {
+        } else {
             print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL&amp;value=0">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
         }
     }
     print '</td></tr>';
-}
-else {
+} else {
     print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 44143afb270..f2d9e5aef60 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -126,8 +126,7 @@ if ($action == 'set')
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		$db->rollback();
 		setEventMessages($error, $errors, 'errors');
 	}
@@ -154,8 +153,7 @@ if ($action == 'setlevel')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -228,8 +226,7 @@ foreach ($syslogModules as $moduleName)
 		    {
     			if (isset($_POST[$tmpoption])) $value = $_POST[$tmpoption];
     			elseif (!empty($conf->global->$tmpoption)) $value = $conf->global->$tmpoption;
-		    }
-			else $value = (isset($option['default']) ? $option['default'] : '');
+		    } else $value = (isset($option['default']) ? $option['default'] : '');
 
 			print $option['name'].': <input type="text" class="flat" name="'.$option['constant'].'" value="'.$value.'"'.(isset($option['attr']) ? ' '.$option['attr'] : '').'>';
 			if (!empty($option['example'])) print '<br>'.$langs->trans("Example").': '.$option['example'];
diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index db7559de17a..615d353bbf1 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -200,8 +200,7 @@ if ($showpromotemessage)
             print '<textarea style="width:80%; min-height: 60px">';
             print $langs->trans("ExampleOfNewsMessageForMajorRelease", DOL_VERSION, DOL_VERSION);
             print '</textarea>';
-        }
-        else {
+        } else {
             print $langs->trans("TitleExampleForMaintenanceRelease").':<br>';
             print '<textarea style="width:80%; min-height: 60px">';
             print $langs->trans("ExampleOfNewsMessageForMaintenanceRelease", DOL_VERSION, DOL_VERSION);
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index ebf3366bf74..31c5b887122 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -173,8 +173,7 @@ foreach ($configfileparameters as $key)
 		if ($newkey == 'separator')
 		{
 			print '<td colspan="3">&nbsp;</td>';
-		}
-		else {
+		} else {
 			// Label
 			print "<td>".$configfilelib[$i].'</td>';
 			// Key
@@ -218,8 +217,7 @@ if (empty($conf->multicompany->enabled))
 {
 	// If no multicompany mode, admins can see global and their constantes
 	$sql .= " WHERE entity IN (0,".$conf->entity.")";
-}
-else {
+} else {
 	// If multicompany mode, superadmin (user->entity=0) can see everything, admin are limited to their entities.
 	if ($user->entity) $sql .= " WHERE entity IN (".$user->entity.",".$conf->entity.")";
 }
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index e3aa6eb020e..4530b7671a5 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -61,18 +61,15 @@ if (preg_match('/mysql/i', $conf->db->type))
 {
 	$sql = "SHOW TABLE STATUS";
 	$base = 1;
-}
-elseif ($conf->db->type == 'pgsql')
+} elseif ($conf->db->type == 'pgsql')
 {
 	$sql = "SELECT conname, contype FROM pg_constraint;";
 	$base = 2;
-}
-elseif ($conf->db->type == 'mssql')
+} elseif ($conf->db->type == 'mssql')
 {
 	//$sqls[0] = "";
 	//$base=3;
-}
-elseif ($conf->db->type == 'sqlite' || $conf->db->type == 'sqlite3')
+} elseif ($conf->db->type == 'sqlite' || $conf->db->type == 'sqlite3')
 {
 	//$sql = "SELECT name, type FROM sqlite_master";
 	$base = 4;
@@ -82,8 +79,7 @@ elseif ($conf->db->type == 'sqlite' || $conf->db->type == 'sqlite3')
 if (!$base)
 {
 	print $langs->trans("FeatureNotAvailableWithThisDatabaseDriver");
-}
-else {
+} else {
 	if ($base == 1)
 	{
         print '<div class="div-table-responsive-no-min">';
@@ -119,8 +115,7 @@ else {
 				if (isset($obj->Engine) && $obj->Engine == "MyISAM")
 				{
 				    print '<td><a class="reposition" href="database-tables.php?action=convert&amp;table='.$obj->Name.'">'.$langs->trans("Convert").' InnoDB</a></td>';
-				}
-				else {
+				} else {
 					print '<td>&nbsp;</td>';
 				}
 				print '<td>'.$obj->Row_format.'</td>';
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index 3706642226f..6b08fc4fe8f 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -73,8 +73,7 @@ $arraylist = array('listofvars', 'listofstatus');
 if (!count($listofvars) && !count($listofstatus))
 {
 	print $langs->trans("FeatureNotAvailableWithThisDatabaseDriver");
-}
-else {
+} else {
 	foreach ($arraylist as $listname)
 	{
 		print '<br>';
diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index 42f8b8834b3..59b16d8ad93 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -49,8 +49,7 @@ if (preg_match('/mysql/i', $conf->db->type))
 {
 	$sql = "SHOW TABLE STATUS LIKE '".$db->escape($table)."'";
 	$base = 1;
-}
-elseif ($conf->db->type == 'pgsql')
+} elseif ($conf->db->type == 'pgsql')
 {
 	$sql = "SELECT conname,contype FROM pg_constraint";
 	$base = 2;
@@ -59,8 +58,7 @@ elseif ($conf->db->type == 'pgsql')
 if (!$base)
 {
 	print $langs->trans("FeatureNotAvailableWithThisDatabaseDriver");
-}
-else {
+} else {
 	$resql = $db->query($sql);
 	if ($resql)
 	{
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 3e5ef397797..6c2d4f6cfef 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -76,8 +76,7 @@ if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE))
 {
     // Compare version with last install database version (upgrades never occured)
     if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_INSTALL) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_INSTALL));
-}
-else {
+} else {
     // Compare version with last upgrade database version
     if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_UPGRADE));
 }
@@ -106,12 +105,10 @@ if (function_exists('curl_init'))
 
             // Show version
             print $langs->trans("LastStableVersion").' : <b>'.(($version != '0.0') ? $version : $langs->trans("Unknown")).'</b>';
-        }
-        else {
+        } else {
             print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("UpdateServerOffline").'</b>';
         }
-    }
-    else {
+    } else {
         print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="butAction">'.$langs->trans("Check").'</a>';
     }
 }
@@ -362,8 +359,7 @@ foreach ($configfileparameters as $key => $value)
 		if (strpos($newkey, 'separator') !== false)
 		{
 			print '<td colspan="3">&nbsp;</td>';
-		}
-		else {
+		} else {
 			// Label
 			print "<td>".$value.'</td>';
 			// Key
@@ -387,8 +383,7 @@ foreach ($configfileparameters as $key => $value)
 					}
 					++$i;
 				}
-			}
-			elseif ($newkey == 'dolibarr_main_instance_unique_id')
+			} elseif ($newkey == 'dolibarr_main_instance_unique_id')
 			{
 			    //print $conf->file->instance_unique_id;
 			    global $dolibarr_main_cookie_cryptkey;
@@ -398,8 +393,7 @@ foreach ($configfileparameters as $key => $value)
 			        print img_warning("EditConfigFileToAddEntry", 'dolibarr_main_instance_unique_id');
 			    }
 			    print ' &nbsp; <span class="opacitymedium">('.$langs->trans("HashForPing").'='.md5('dolibarr'.$valuetoshow).')</span>';
-			}
-			else {
+			} else {
 			    print ${$newkey};
 			}
 			if ($newkey == 'dolibarr_main_url_root' && ${$newkey} != DOL_MAIN_URL_ROOT) print ' (currently overwritten by autodetected value: '.DOL_MAIN_URL_ROOT.')';
@@ -436,8 +430,7 @@ if (empty($conf->multicompany->enabled))
 {
 	// If no multicompany mode, admins can see global and their constantes
 	$sql .= " WHERE entity IN (0,".$conf->entity.")";
-}
-else {
+} else {
 	// If multicompany mode, superadmin (user->entity=0) can see everything, admin are limited to their entities.
 	if ($user->entity) $sql .= " WHERE entity IN (".$user->entity.",".$conf->entity.")";
 }
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 791772f0da6..e1f85ca77ce 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -98,8 +98,7 @@ if (dol_is_file($xmlfile))
     print '<input type="radio" name="target" value="local"'.((!GETPOST('target') || GETPOST('target') == 'local') ? 'checked="checked"' : '').'"> '.$langs->trans("LocalSignature").' = ';
     print '<input name="xmlshortfile" class="flat minwidth400" value="'.dol_escape_htmltag($xmlshortfile).'">';
     print '<br>';
-}
-else {
+} else {
     print '<input type="radio" name="target" value="local"> '.$langs->trans("LocalSignature").' = ';
     print '<input name="xmlshortfile" class="flat minwidth400" value="'.dol_escape_htmltag($xmlshortfile).'">';
     print ' <span class="warning">('.$langs->trans("AvailableOnlyOnPackagedVersions").')</span>';
@@ -110,8 +109,7 @@ if ($enableremotecheck)
 {
     print '<input type="radio" name="target" value="remote"'.(GETPOST('target') == 'remote' ? 'checked="checked"' : '').'> '.$langs->trans("RemoteSignature").' = ';
     print '<input name="xmlremote" class="flat minwidth400" value="'.dol_escape_htmltag($xmlremote).'"><br>';
-}
-else {
+} else {
     print '<input type="radio" name="target" value="remote" disabled="disabled"> '.$langs->trans("RemoteSignature").' = '.$xmlremote;
     if (!GETPOST('xmlremote')) print ' <span class="warning">('.$langs->trans("FeatureAvailableOnlyOnStable").')</span>';
     print '<br>';
@@ -138,8 +136,7 @@ if (GETPOST('target') == 'local')
     		}
     	}
         $xml = simplexml_load_file($xmlfile);
-    }
-    else {
+    } else {
         print $langs->trans('XmlNotFound').': '.$xmlfile;
         $error++;
     }
@@ -154,8 +151,7 @@ if (GETPOST('target') == 'remote')
         $xmlfile = $xmlarray['content'];
         //print "xmlfilestart".$xmlfile."xmlfileend";
         $xml = simplexml_load_string($xmlfile);
-    }
-    else {
+    } else {
         $errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
         setEventMessages($errormsg, null, 'errors');
         $error++;
@@ -266,8 +262,7 @@ if (!$error && $xml)
 	            $out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
 	            $out .= "</tr>\n";
 	        }
-        }
-        else {
+        } else {
             $out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         $out .= '</table>';
@@ -320,8 +315,7 @@ if (!$error && $xml)
             $out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
             $out .= '<td class="right"></td>'."\n";
             $out .= "</tr>\n";
-        }
-        else {
+        } else {
             $out .= '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         $out .= '</table>';
@@ -374,8 +368,7 @@ if (!$error && $xml)
             $out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
             $out .= '<td class="right"></td>'."\n";
             $out .= "</tr>\n";
-        }
-        else {
+        } else {
             $out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         $out .= '</table>';
@@ -386,12 +379,10 @@ if (!$error && $xml)
         if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
         {
             setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
-        }
-        else {
+        } else {
             setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
         }
-    }
-    else {
+    } else {
         print 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile;
         $error++;
     }
@@ -424,14 +415,12 @@ if (!$error && $xml)
     		$resultcode = 'warning';
     		$resultcomment = 'FileIntegrityIsOkButFilesWereAdded';
     		$outcurrentchecksum = $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
-    	}
-    	else {
+    	} else {
     		$resultcode = 'ok';
     		$resultcomment = 'Success';
     		$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
     	}
-    }
-    else {
+    } else {
     	$resultcode = 'error';
     	$resultcomment = 'Error';
     	$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 786b8b7306c..1e5de3b9a46 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -69,8 +69,7 @@ foreach ($modulesdir as $dir)
 					{
 						// File duplicate
 						print "Warning duplicate file found : ".$file." (Found ".$dir.$file.", already found ".$modules_fullpath[$file].")<br>";
-					}
-					else {
+					} else {
 						// File to load
 						$res = include_once $dir.$file;
 						if (class_exists($modName))
@@ -83,13 +82,11 @@ foreach ($modulesdir as $dir)
 								$modules_files[$objMod->numero] = $file;
 								$modules_fullpath[$file] = $dir.$file;
 								$picto[$objMod->numero] = (isset($objMod->picto) && $objMod->picto) ? $objMod->picto : 'generic';
-							}
-							catch (Exception $e)
+							} catch (Exception $e)
 							{
 								dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 							}
-						}
-						else {
+						} else {
 							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
 						}
 					}
@@ -122,8 +119,7 @@ foreach ($sortorder as $numero=>$name)
 	{
 	   	if (preg_match('/^\//', $picto[$numero])) print img_picto($alt, $picto[$numero], 'width="14px"', 1);
 	   	else print img_object($alt, $picto[$numero], 'width="14px"');
-	}
-	else {
+	} else {
 	  	print img_object($alt, $picto[$numero], 'width="14px"');
 	}
 	print ' '.$modules[$numero]->getName();
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 2c6e20f0d22..33295044a3e 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -101,13 +101,11 @@ if ($test)
 	{
 		print img_picto('', 'tick.png').' '.$langs->trans("MemcachedAvailableAndSetup");
 		print ' '.$langs->trans("MoreInformation").' <a href="'.dol_buildpath('/memcached/admin/memcached.php', 1).'">Memcached module admin page</a>';
-	}
-	else {
+	} else {
 		print img_picto('', 'warning').' '.$langs->trans("MemcachedModuleAvailableButNotSetup");
 		print ' <a href="'.dol_buildpath('/memcached/admin/memcached.php', 1).'">Memcached module admin page</a>';
 	}
-}
-else print img_picto('', 'warning').' '.$langs->trans("MemcachedNotAvailable");
+} else print img_picto('', 'warning').' '.$langs->trans("MemcachedNotAvailable");
 print '</br>';
 
 // OPCode cache
@@ -143,8 +141,7 @@ if (!$foundcache && $test)
 	{
 		$foundcache++;
 		print img_picto('', 'tick.png').' '.$langs->trans("APCInstalled");
-	}
-	else {
+	} else {
 		print img_picto('', 'warning').' '.$langs->trans("APCCacheInstalledButDisabled");
 	}
 }
@@ -157,8 +154,7 @@ if (ini_get('opcache.preload'))
 	print '<br>';
 	print '<strong>'.$langs->trans("PreloadOPCode").'</strong>: ';
 	print ini_get('opcache.preload');
-}
-else {
+} else {
 	print '<br>';
 	print '<strong>'.$langs->trans("PreloadOPCode").'</strong>: ';
 	print $langs->trans("No");
@@ -462,8 +458,7 @@ if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
 	if ($test)
 	{
 		print img_picto('', 'tick.png').' '.$langs->trans("YouUseBestDriver", $conf->db->type);
-	}
-	else {
+	} else {
 		print img_picto('', 'warning.png').' '.$langs->trans("YouDoNotUseBestDriver", $conf->db->type, 'mysqli');
 	}
 	print '<br>';
@@ -488,12 +483,10 @@ if ($resql)
 		if (empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE))
 		{
 			print img_picto('', 'warning.png').' '.$langs->trans("YouHaveXObjectUseSearchOptim", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUCT_DONOTSEARCH_ANYWHERE');
-		}
-		else {
+		} else {
 			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"));
 		}
-	}
-	else {
+	} else {
 		print img_picto('', 'tick.png').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"));
 	}
 	print '<br>';
@@ -516,12 +509,10 @@ if ($resql)
 		if (empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE))
 		{
 			print img_picto('', 'warning.png').' '.$langs->trans("YouHaveXObjectUseSearchOptim", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_DONOTSEARCH_ANYWHERE');
-		}
-		else {
+		} else {
 			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ThirdParties"));
 		}
-	}
-	else {
+	} else {
 		print img_picto('', 'tick.png').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ThirdParties"));
 	}
 	print '<br>';
@@ -534,8 +525,7 @@ print '<strong>'.$langs->trans("Browser").'</strong>:<br>';
 if (!in_array($conf->browser->name, array('chrome', 'opera', 'safari', 'firefox')))
 {
 	print img_picto('', 'warning.png').' '.$langs->trans("BrowserIsKO", $conf->browser->name);
-}
-else {
+} else {
 	print img_picto('', 'tick.png').' '.$langs->trans("BrowserIsOK", $conf->browser->name);
 }
 print '<br>';
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 8015f16a572..0f7016dd9d7 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -85,12 +85,10 @@ $arrayphpminversionwarning = array(5, 6, 0);
 if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0)
 {
 	print '<img src="'.$ErrorPicturePath.'" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionerror));
-}
-elseif (versioncompare(versionphparray(), $arrayphpminversionwarning) < 0)
+} elseif (versioncompare(versionphparray(), $arrayphpminversionwarning) < 0)
 {
 	print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionwarning));
-}
-else {
+} else {
 	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.versiontostring(versionphparray());
 }
 
@@ -101,8 +99,7 @@ if (!isset($_GET["testget"]) && !isset($_POST["testpost"]) && !isset($_GET["main
 {
 	print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("PHPSupportPOSTGETKo");
 	print ' (<a href="'.$_SERVER["PHP_SELF"].'?testget=ok">'.$langs->trans("Recheck").'</a>)';
-}
-else {
+} else {
 	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportPOSTGETOk");
 }
 
@@ -112,8 +109,7 @@ print '<tr><td>Sessions support</td><td>';
 if (!function_exists("session_id"))
 {
 	print '<img src="'.$ErrorPicturePath.'" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportSessions");
-}
-else {
+} else {
 	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportSessions");
 }
 
@@ -123,8 +119,7 @@ print '<tr><td>UTF-8 support</td><td>';
 if (!function_exists("utf8_encode"))
 {
 	print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPDoesNotSupportUTF8");
-}
-else {
+} else {
 	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportUTF8");
 }
 
@@ -224,8 +219,7 @@ foreach ($phparray as $key => $value)
 			print $valtoshow;
 			print '</td>';
 			print '</tr>';
-		}
-		else {
+		} else {
 			print '<tr class="oddeven">';
 			print '<td>'.$keyparam.'</td>';
 			$i = 0;
@@ -340,8 +334,7 @@ function getTableColumn($name, array $list)
 	if (in_array($name, $list))
 	{
 		$html .= '<img src="../../theme/eldy/img/tick.png" alt="Ok">';
-	}
-	else {
+	} else {
 		$html .= '<img src="../../theme/eldy/img/warning.png" alt="Warning">';
 	}
 
@@ -375,8 +368,7 @@ function getTableColumnFunction(array $functions)
 	if ($result)
 	{
 		$html .= '<img src="../../theme/eldy/img/tick.png" alt="Ok">';
-	}
-	else {
+	} else {
 		$html .= '<img src="../../theme/eldy/img/warning.png" alt="Warning">';
 	}
 
diff --git a/htdocs/admin/system/xdebug.php b/htdocs/admin/system/xdebug.php
index 3358fb980fe..aef15f11f5d 100644
--- a/htdocs/admin/system/xdebug.php
+++ b/htdocs/admin/system/xdebug.php
@@ -108,15 +108,13 @@ xdebug.auto_trace=0
 	         XDebug with same port than in php.ini<br>
 	         Allow Remote debug=yes or prompt<br>'."\n";
 		print "<br>\n";
-	}
-	else {
+	} else {
 		print socket_strerror(socket_last_error());
 		echo "Failed to connect to address=".$address." port=".$port."<br>\n";
 		echo "There is no Remote debug server at this address.\n";
 	}
 	socket_close($socket);
-}
-else {
+} else {
 	print "Can't test if PHPDebug is OK as PHP socket functions are not enabled.";
 }
 
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index 1999fbab8f0..687b43a6918 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -130,8 +130,7 @@ print load_fiche_titre($langs->trans('TaxSetup'), $linkback, 'title_setup');
 if (empty($mysoc->tva_assuj))
 {
 	print $langs->trans("YourCompanyDoesNotUseVAT").'<br>';
-}
-else {
+} else {
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
@@ -149,8 +148,7 @@ else {
 		print '<td class="nowrap right">';
 		print $langs->trans("NotAvailableWhenAjaxDisabled");
 		print "</td>";
-	}
-	else {
+	} else {
 		print '<td width="120">';
 		$listval = array(
 			'0'=>$langs->trans(""),
@@ -203,8 +201,7 @@ else {
 	{
 		print $langs->trans("OnPayment");
 		print ' ('.$langs->trans("SupposedToBePaymentDate").')';
-	}
-	else {
+	} else {
 		print $langs->trans("OnDelivery");
 		print ' ('.$langs->trans("SupposedToBeInvoiceDate").')';
 	}
@@ -214,8 +211,7 @@ else {
 	{
 		print $langs->trans("OnPayment");
 		print ' ('.$langs->trans("SupposedToBePaymentDate").')';
-	}
-	else {
+	} else {
 		print $langs->trans("OnDelivery");
 		print ' ('.$langs->trans("SupposedToBeInvoiceDate").')';
 	}
@@ -228,8 +224,7 @@ else {
 	{
 		print $langs->trans("OnPayment");
 		print ' ('.$langs->trans("SupposedToBePaymentDate").')';
-	}
-	else {
+	} else {
 		print $langs->trans("OnInvoice");
 		print ' ('.$langs->trans("InvoiceDateUsed").')';
 	}
@@ -239,8 +234,7 @@ else {
 	{
 		print $langs->trans("OnPayment");
 		print ' ('.$langs->trans("SupposedToBePaymentDate").')';
-	}
-	else {
+	} else {
 		print $langs->trans("OnInvoice");
 		print ' ('.$langs->trans("InvoiceDateUsed").')';
 	}
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index 152aed7d5e7..e27eb53ef2b 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -63,8 +63,7 @@ if ($action == 'updateMask') {
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 } elseif ($action == 'setmod') {
diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
index 032762ec98c..dfe5b47379c 100644
--- a/htdocs/admin/ticket_public.php
+++ b/htdocs/admin/ticket_public.php
@@ -179,8 +179,7 @@ if (empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
     $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setTICKET_ENABLE_PUBLIC_INTERFACE&value=1'.$param.'">';
     $enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
     $enabledisablehtml .= '</a>';
-}
-else {
+} else {
     // Button on, click to disable
     $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setTICKET_ENABLE_PUBLIC_INTERFACE&value=0'.$param.'">';
     $enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 4a659d38fc8..112cc111e29 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -56,8 +56,7 @@ if ($action == 'delete')
 		$ret = dol_delete_file($file, 1);
 		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
 		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
-	}
-	else {
+	} else {
 		$file = $conf->admin->dir_output.'/documents/'.basename(GETPOST('urlfile', 'alpha'));
 		$ret = dol_delete_file($file, 1);
 		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
@@ -186,8 +185,7 @@ if (in_array($type, array('mysql', 'mysqli'))) {
     if (empty($conf->global->SYSTEMTOOLS_MYSQLDUMP))
     {
         $fullpathofmysqldump = $db->getPathOfDump();
-    }
-    else {
+    } else {
         $fullpathofmysqldump = $conf->global->SYSTEMTOOLS_MYSQLDUMP;
     }
     print '<br>';
@@ -336,8 +334,7 @@ if (in_array($type, array('pgsql'))) {
     print '<div class="formelementrow">'.$langs->trans("FullPathToPostgreSQLdumpCommand");
     if (empty($conf->global->SYSTEMTOOLS_POSTGRESQLDUMP)) {
         $fullpathofpgdump = $db->getPathOfDump();
-    }
-    else {
+    } else {
         $fullpathofpgdump = $conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
     }
     print '<br>';
@@ -430,8 +427,7 @@ if (in_array($type, array('mysql', 'mysqli'))) {
     	'id' => 'radio_compression_none',
     	'label' => $langs->trans("None")
     );
-}
-else {
+} else {
 	$compression['none'] = array(
 		'function' => '',
 		'id' => 'radio_compression_none',
@@ -459,8 +455,7 @@ foreach ($compression as $key => $val)
 		if ($key == 'gz') $checked = ' checked';
 		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'"'.$checked.'>';
 		print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
-	}
-	else {
+	} else {
 		// Disabled export format
 		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'" disabled>';
 		print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
@@ -578,8 +573,7 @@ foreach ($filecompression as $key => $val)
     	if ($key == 'gz') $checked = ' checked';
         print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'"'.$checked.'>';
         print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
-    }
-    else // Disabled export format
+    } else // Disabled export format
     {
         print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'" disabled>';
         print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
index c1518901013..224bbc14b56 100644
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -105,8 +105,7 @@ print $langs->trans("RestoreDesc3", $dolibarr_main_db_name).'<br><br>';
         <label for="radio_dump_mysql">MySQL (mysql)</label>
     </div>
         <?php
-    }
-    elseif (in_array($type, array('pgsql')))
+    } elseif (in_array($type, array('pgsql')))
     {
         ?>
     <div class="formelementrow">
@@ -114,8 +113,7 @@ print $langs->trans("RestoreDesc3", $dolibarr_main_db_name).'<br><br>';
         <label for="radio_dump_postgresql">PostgreSQL Restore (pg_restore or psql)</label>
     </div>
         <?php
-    }
-    else {
+    } else {
         print 'No method available with database '.$label;
     }
     ?>
@@ -160,8 +158,7 @@ if (in_array($type, array('mysql', 'mysqli')))
     //else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
     print '</div>';
     print '</fieldset>';
-}
-elseif (in_array($type, array('pgsql')))
+} elseif (in_array($type, array('pgsql')))
 {
     print '<fieldset id="postgresql_options">';
     print '<legend>Restore PostgreSQL</legend>';
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 7133b16e1b4..408d82404dc 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -203,8 +203,7 @@ if ($errormsg)
     $resultstring .= '<div class="error">'.$langs->trans("Error")." : ".$errormsg.'</div>';
 
     $_SESSION["commandbackupresult"] = $resultstring;
-}
-else {
+} else {
 	if ($what)
 	{
         setEventMessages($langs->trans("BackupFileSuccessfullyCreated").'.<br>'.$langs->trans("YouCanDownloadBackupFile"), null, 'mesgs');
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index 36e488127d0..85e3b2b2e5c 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -44,8 +44,7 @@ $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (!$sortorder) $sortorder = "DESC";
 if (!$sortfield) $sortfield = "date";
-if ($page < 0) { $page = 0; }
-elseif (empty($page)) $page = 0;
+if ($page < 0) { $page = 0; } elseif (empty($page)) $page = 0;
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 
@@ -120,14 +119,12 @@ if ($compression == 'zip')
     	if ($ret == -2) {
     		$langs->load("errors");
     		$errormsg = $langs->trans("ErrNoZipEngine");
-    	}
-    	else {
+    	} else {
     		$langs->load("errors");
     		$errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputdir);
     	}
     }
-}
-elseif (in_array($compression, array('gz', 'bz')))
+} elseif (in_array($compression, array('gz', 'bz')))
 {
 	$userlogin = ($user->login ? $user->login : 'unknown');
 
@@ -145,8 +142,7 @@ elseif (in_array($compression, array('gz', 'bz')))
         $langs->load("errors");
         dol_syslog("Documents tar retval after exec=".$retval, LOG_ERR);
         $errormsg = 'Error tar generation return '.$retval;
-    }
-    else {
+    } else {
         if ($compression == 'gz')
         {
             $cmd = "gzip -f ".$outputdir."/".$file;
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 3fd93e7989e..e9d06885dfd 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -146,8 +146,7 @@ if ($action == 'confirm_purge' && $confirm == 'yes' && $user->admin)
 	{
 	    $db->commit();
 		dol_syslog($text, LOG_WARNING);
-	}
-	else {
+	} else {
 		$error++;
 		dol_syslog($securityevent->error, LOG_ERR);
 		$db->rollback();
@@ -324,8 +323,7 @@ if ($result)
 			$userstatic->id = $obj->fk_user;
 			$userstatic->login = $obj->login;
 			print $userstatic->getLoginUrl(1);
-		}
-		else print '&nbsp;';
+		} else print '&nbsp;';
 		print '</td>';
 
 		// Description
@@ -378,8 +376,7 @@ if ($result)
 
 	print "</form>";
 	$db->free($result);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index ff86beef550..07f9f1ef47c 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -115,8 +115,7 @@ if ($action == 'purge')
 {
 	$formquestion = array();
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?noparam=noparam', $langs->trans('PurgeSessions'), $langs->trans('ConfirmPurgeSessions'), 'confirm_purge', $formquestion, 'no', 2);
-}
-elseif ($action == 'lock')
+} elseif ($action == 'lock')
 {
 	$formquestion = array();
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?noparam=noparam', $langs->trans('LockNewSessions'), $langs->trans('ConfirmLockNewSessions', $user->login), 'confirm_lock', $formquestion, 'no', 1);
@@ -171,8 +170,7 @@ if ($savehandler == 'files')
 		print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoSessionFound", $savepath, $openbasedir).'</td></tr>';
 	}
 	print "</table>";
-}
-else {
+} else {
 	print $langs->trans("NoSessionListWithThisHandler");
 }
 
@@ -186,8 +184,7 @@ print '<div class="tabsAction">';
 if (empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
 {
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=lock">'.$langs->trans("LockNewSessions").'</a>';
-}
-else {
+} else {
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=confirm_unlock">'.$langs->trans("UnlockNewSessions").'</a>';
 }
 
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index f06e67aa676..67f07a4eb24 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -98,12 +98,10 @@ if (function_exists('curl_init'))
 
 			// Show version
 			print $langs->trans("LastStableVersion").' : <b>'.(($version != '0.0') ? $version : $langs->trans("Unknown")).'</b><br>';
-		}
-		else {
+		} else {
 			print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("UpdateServerOffline").'</b><br>';
 		}
-	}
-	else {
+	} else {
 		print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="button">'.$langs->trans("Check").'</a><br>';
 	}
 }
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 2f89e3cd300..4fb00dadff2 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -105,14 +105,12 @@ if ($action == 'update')
 			$action = "";
 			$transkey = "";
 			$transvalue = "";
-		}
-		else {
+		} else {
 			$db->rollback();
 			if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				setEventMessages($langs->trans("WarningAnEntryAlreadyExistForTransKey"), null, 'warnings');
-			}
-			else {
+			} else {
 				setEventMessages($db->lasterror(), null, 'errors');
 			}
 			$action = '';
@@ -152,14 +150,12 @@ if ($action == 'add')
 			$action = "";
 			$transkey = "";
 			$transvalue = "";
-		}
-		else {
+		} else {
 		    $db->rollback();
 		    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		    {
 		        setEventMessages($langs->trans("WarningAnEntryAlreadyExistForTransKey"), null, 'warnings');
-		    }
-		    else {
+		    } else {
 		        setEventMessages($db->lasterror(), null, 'errors');
             }
 			$action = '';
@@ -175,8 +171,7 @@ if ($action == 'delete')
 	if ($result >= 0)
 	{
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -205,8 +200,7 @@ if (empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
     $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=1'.$param.'">';
     $enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
     $enabledisablehtml .= '</a>';
-}
-else {
+} else {
     // Button on, click to disable
     $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=0'.$param.'">';
     $enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
@@ -342,8 +336,7 @@ if ($mode == 'overwrite')
     		if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int'))
     		{
     			print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.dol_escape_htmltag($obj->transvalue).'">';
-    		}
-    		else {
+    		} else {
     			print dol_escape_htmltag($obj->transvalue);
     		}
     		print '</td>';
@@ -355,8 +348,7 @@ if ($mode == 'overwrite')
     			print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
     			print ' &nbsp; ';
     			print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
-    		}
-    		else {
+    		} else {
     			print '<a class="reposition editfielda paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=edit'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
 				print ' &nbsp; ';
     			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
@@ -399,8 +391,7 @@ if ($mode == 'searchkey')
     if ($action == 'search' && ($nbempty > 999))    // 999 to disable this
     {
         setEventMessages($langs->trans("WarningAtLeastKeyOrTranslationRequired"), null, 'warnings');
-    }
-    else {
+    } else {
         // Search into dir of modules (the $modulesdir is already a list that loop on $conf->file->dol_document_root)
         $i = 0;
         foreach ($modulesdir as $keydir => $tmpsearchdir)
@@ -528,8 +519,7 @@ if ($mode == 'searchkey')
                 print '&nbsp;&nbsp;';
                 $htmltext = $langs->trans("OriginalValueWas", $newlangfileonly->tab_translate[$key]);
                 print $form->textwithpicto('', $htmltext, 1, 'info');
-            }
-            elseif (!empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
+            } elseif (!empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
             {
             	//print $key.'-'.$val;
                 print '<a class="reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=overwrite&amp;langcode='.$langcode.'&amp;transkey='.$key.'">'.img_edit_add($langs->trans("Overwrite")).'</a>';
@@ -543,8 +533,7 @@ if ($mode == 'searchkey')
 
             	print ' &nbsp; <a href="'.$transifexurl.'" target="transifex">'.img_picto('FixOnTransifex', 'globe').'</a>';
             }
-        }
-        else {
+        } else {
             $htmltext = $langs->trans("TransKeyWithoutOriginalValue", $key);
             print $form->textwithpicto('', $htmltext, 1, 'warning');
         }
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index ad8e5f6876d..f866b418131 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -55,9 +55,7 @@ if ($action == 'set_default')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 	$res = true;
-}
-
-elseif ($action == 'del_default')
+} elseif ($action == 'del_default')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -84,29 +82,24 @@ elseif ($action == 'setdoc')
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
 	$res = true;
-}
-elseif (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
+} elseif (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 {
     $code = $reg[1];
     if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
-}
-
-elseif (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
+} elseif (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 {
     $code = $reg[1];
     if (dolibarr_del_const($db, $code, $conf->entity) > 0)
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -119,8 +112,7 @@ elseif ($action == 'sethideinactiveuser')
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -160,13 +152,11 @@ print '<td align="center" width="100">';
 if ($conf->use_javascript_ajax)
 {
 	print ajax_constantonoff('USER_MAIL_REQUIRED');
-}
-else {
+} else {
 	if (empty($conf->global->USER_MAIL_REQUIRED))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_USER_MAIL_REQUIRED">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else {
+	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_USER_MAIL_REQUIRED">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
@@ -182,13 +172,11 @@ print '<td align="center" width="100">';
 if ($conf->use_javascript_ajax)
 {
 	print ajax_constantonoff('USER_HIDE_INACTIVE_IN_COMBOBOX');
-}
-else {
+} else {
 	if (empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_USER_HIDE_INACTIVE_IN_COMBOBOX">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else {
+	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_USER_HIDE_INACTIVE_IN_COMBOBOX">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
@@ -217,8 +205,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -286,8 +273,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -298,8 +284,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->USER_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -325,8 +310,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
-	                            }
-	                            else {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index 2b3d9e680ba..490c79a3363 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -52,9 +52,7 @@ if ($action == 'set_default')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 	$res = true;
-}
-
-elseif ($action == 'del_default')
+} elseif ($action == 'del_default')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -81,29 +79,24 @@ elseif ($action == 'setdoc')
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
 	$res = true;
-}
-elseif (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
+} elseif (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 {
     $code = $reg[1];
     if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
-}
-
-elseif (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
+} elseif (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 {
     $code = $reg[1];
     if (dolibarr_del_const($db, $code, $conf->entity) > 0)
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -144,8 +137,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -213,8 +205,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -225,8 +216,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->USERGROUP_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -252,8 +242,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
-	                            }
-	                            else {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index c2ee5e2677c..235f9eae850 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -138,8 +138,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
         	$fieldnamekey = $listfield[$f];
 	        setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
 	        break;
-    	}
-		elseif ($value == 'ref' && !preg_match('/^[a-z0-9_\-\.]+$/i', $_POST[$value]))
+    	} elseif ($value == 'ref' && !preg_match('/^[a-z0-9_\-\.]+$/i', $_POST[$value]))
 	    {
 			$ok = 0;
     	    $fieldnamekey = $listfield[$f];
@@ -212,12 +211,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
         {
             setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
         	unset($_POST); // Clean $_POST array, we keep only
-        }
-        else {
+        } else {
             if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                 setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-            }
-            else {
+            } else {
                 dol_print_error($db);
             }
         }
@@ -226,8 +223,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
     // Si verif ok et action modify, on modifie la ligne
     if ($ok && GETPOST('actionmodify', 'alpha'))
     {
-        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-        else { $rowidcol = "rowid"; }
+        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
         $db->begin();
 
@@ -272,8 +268,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
             	{
             		$error++;
             		setEventMessages($langs->trans('ErrorDirAlreadyExists', $destfile), null, 'errors');
-            	}
-            	else {
+            	} else {
 	                @rename($srcfile, $destfile);
 
 		            // We must now rename $website->ref into $newname inside files
@@ -285,8 +280,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		            }
             	}
             }
-        }
-        else {
+        } else {
         	$error++;
             setEventMessages($db->lasterror(), null, 'errors');
         }
@@ -294,8 +288,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
         if (!$error)
         {
         	$db->commit();
-        }
-        else {
+        } else {
         	$db->rollback();
         }
     }
@@ -309,8 +302,7 @@ if (GETPOST('actioncancel', 'alpha'))
 
 if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     $website = new Website($db);
     $website->fetch($rowid);
@@ -333,8 +325,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 	        if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
 	        {
 	            setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-	        }
-	        else {
+	        } else {
 	            dol_print_error($db);
 	        }
 	    }
@@ -343,8 +334,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 	    {
 	    	dol_delete_dir_recursive($conf->website->dir_output.'/'.$website->ref);
 	    }
-    }
-    else {
+    } else {
     	dol_print_error($db, 'Failed to load website with id '.$rowid);
     }
 }
@@ -352,8 +342,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 // activate
 if ($action == $acts[0])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
         $sql = "UPDATE ".$tabname[$id]." SET status = 1 WHERE rowid ='".$rowid."'";
@@ -369,8 +358,7 @@ if ($action == $acts[0])
 // disable
 if ($action == $acts[1])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
         $sql = "UPDATE ".$tabname[$id]." SET status = 0 WHERE rowid ='".$rowid."'";
@@ -469,8 +457,7 @@ if ($id)
            		{
            			if ($value == 'virtualhost') print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltipvirtual');
            			else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
-           		}
-            	else print $valuetoshow;
+           		} else print $valuetoshow;
                 print '</td>';
             }
             if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
@@ -580,8 +567,7 @@ if ($id)
 
                     print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
                     print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
-                }
-                else {
+                } else {
 	              	$tmpaction = 'view';
                     $parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
                     $reshook = $hookmanager->executeHooks('viewWebsiteFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
@@ -629,8 +615,7 @@ if ($id)
 
             print '</form>';
         }
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -669,11 +654,9 @@ function fieldListWebsites($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td>';
 			print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'lang');
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'code' && isset($obj->$fieldname)) {
+		} elseif ($fieldlist[$field] == 'code' && isset($obj->$fieldname)) {
 			print '<td><input type="text" class="flat" value="'.(!empty($obj->$fieldname) ? $obj->$fieldname : '').'" size="10" name="'.$fieldlist[$field].'"></td>';
-		}
-		else {
+		} else {
 			print '<td>';
 			$size = '';
 			if ($fieldlist[$field] == 'code') $size = 'size="8" ';
diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php
index 828ebf6dca9..6f0cffa41c8 100644
--- a/htdocs/admin/website_options.php
+++ b/htdocs/admin/website_options.php
@@ -121,8 +121,7 @@ if ($action == 'edit')
 
 	print '</form>';
 	print '<br>';
-}
-else {
+} else {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index 96413b21c19..7d2bf379282 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -134,8 +134,7 @@ foreach ($workflowcodes as $key => $params)
 		if ($family == 'create')
 		{
 			print $langs->trans("AutomaticCreation");
-		}
-		elseif (preg_match('/classify_(.*)/', $family, $reg))
+		} elseif (preg_match('/classify_(.*)/', $family, $reg))
 		{
 			print $langs->trans("AutomaticClassification");
 			if ($reg[1] == 'proposal') print ' - '.$langs->trans('Proposal');
@@ -143,8 +142,7 @@ foreach ($workflowcodes as $key => $params)
 			if ($reg[1] == 'supplier_proposal') print ' - '.$langs->trans('SupplierProposal');
 			if ($reg[1] == 'supplier_order') print ' - '.$langs->trans('SupplierOrder');
 			if ($reg[1] == 'reception') print ' - '.$langs->trans('Reception');
-		}
-		else {
+		} else {
 			print $langs->trans("Description");
 		}
 		print '</td>';
@@ -165,15 +163,13 @@ foreach ($workflowcodes as $key => $params)
    	if (!empty($conf->use_javascript_ajax))
    	{
    		print ajax_constantonoff($key);
-   	}
-   	else {
+   	} else {
    		if (!empty($conf->global->$key))
    		{
    			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=del'.$key.'">';
   			print img_picto($langs->trans("Activated"), 'switch_on');
    			print '</a>';
-   		}
-   		else {
+   		} else {
    			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=set'.$key.'">';
   			print img_picto($langs->trans("Disabled"), 'switch_off');
    			print '</a>';
diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php
index 29cd34db6a8..87aaeb6d46f 100644
--- a/htdocs/asterisk/cidlookup.php
+++ b/htdocs/asterisk/cidlookup.php
@@ -67,8 +67,7 @@ if ($resql)
 		$found = $notfound;
 	}
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db, 'Error');
 	$found = 'Error';
 }
diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php
index 9f360294fc9..ecc7c4fee6c 100644
--- a/htdocs/asterisk/wrapper.php
+++ b/htdocs/asterisk/wrapper.php
@@ -137,8 +137,7 @@ if ($resql)
 		$found = $notfound;
 	}
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db, 'Error');
 	$found = 'Error';
 }
@@ -163,8 +162,7 @@ if (!empty($number))
             print $txt;
             dol_syslog($txt, LOG_ERR);
             print '</body>'."\n";
-        }
-        else {
+        } else {
             $txt = "Call Asterisk dialer for caller: ".$caller.", called: ".$called." clicktodiallogin: ".$login;
             dol_syslog($txt);
             print '<body onload="javascript:history.go(-1);">'."\n";
@@ -186,8 +184,7 @@ if (!empty($number))
             print '</body>'."\n";
         }
     }
-}
-else {
+} else {
     print 'Bad parameters in URL. Must be '.$_SERVER['PHP_SELF'].'?caller=99999&called=99999&login=xxxxx&password=xxxxx';
 }
 
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 02bd9c387b4..7c867cdf17a 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -128,8 +128,7 @@ if ($dirins && $action == 'initmodule' && $modulename)
 				$error++;
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorFailToCopyDir", $srcdir, $destdir), null, 'errors');
-			}
-			else {
+			} else {
 				// $result == 0
 				setEventMessages($langs->trans("AllFilesDidAlreadyExist", $srcdir, $destdir), null, 'warnings');
 			}
@@ -270,8 +269,7 @@ if ($dirins && $action == 'initapi' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	}
-	else {
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -306,8 +304,7 @@ if ($dirins && $action == 'initphpunit' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	}
-	else {
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -350,8 +347,7 @@ if ($dirins && $action == 'initsqlextrafields' && !empty($module)) {
 
 		dolReplaceInFile($destfile1, $arrayreplacement);
 		dolReplaceInFile($destfile2, $arrayreplacement);
-	}
-	else {
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', ''), null, 'errors');
 	}
@@ -384,8 +380,7 @@ if ($dirins && $action == 'inithook' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	}
-	else {
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -417,8 +412,7 @@ if ($dirins && $action == 'inittrigger' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	}
-	else {
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -486,8 +480,7 @@ if ($dirins && $action == 'initcss' && !empty($module))
 		$srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
 		$arrayreplacement = array('/\/\/\s*\''.preg_quote('/'.strtolower($module).'/css/'.strtolower($module).'.css.php', '/').'\'/' => '\'/'.strtolower($module).'/css/'.strtolower($module).'.css.php\'');
 		dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
-	}
-	else {
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -524,8 +517,7 @@ if ($dirins && $action == 'initjs' && !empty($module))
 		$srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
 		$arrayreplacement = array('/\/\/\s*\''.preg_quote('/'.strtolower($module).'/js/'.strtolower($module).'.js.php', '/').'\'/' => '\'/'.strtolower($module).'/js/'.strtolower($module).'.js.php\'');
 		dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
-	}
-	else {
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -562,8 +554,7 @@ if ($dirins && $action == 'initcli' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	}
-	else {
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -610,8 +601,7 @@ if ($dirins && $action == 'initdoc' && !empty($module)) {
 
 		dol_delete_file($outputfiledoc, 0, 0, 0, null, false, 0);
 		dol_delete_file($outputfiledocpdf, 0, 0, 0, null, false, 0);
-	}
-	else {
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -655,8 +645,7 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
 	if (empty($_results))
 	{
 		setEventMessages($langs->trans("ErrorTableNotFound", $tablename), null, 'errors');
-	}
-	else {
+	} else {
 		/**
 		 *  'type' if the field format ('integer', 'integer:Class:pathtoclass', 'varchar(x)', 'double(24,8)', 'text', 'html', 'datetime', 'timestamp', 'float')
 		 *  'label' the translation key.
@@ -865,8 +854,7 @@ if ($dirins && $action == 'initobject' && $module && $objectname)
 					$error++;
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorFailToCopyFile", $srcdir.'/'.$srcfile, $destdir.'/'.$destfile), null, 'errors');
-				}
-				else {
+				} else {
 					// $result == 0
 					setEventMessages($langs->trans("FileAlreadyExists", $destfile), null, 'warnings');
 				}
@@ -1049,13 +1037,11 @@ if ($dirins && ($action == 'droptable' || $action == 'droptableextrafields') &&
 			{
 				$nb = $obj->nb;
 			}
-		}
-		else {
+		} else {
 			if ($db->lasterrno() == 'DB_ERROR_NOSUCHTABLE')
 			{
 				setEventMessages($langs->trans("TableDoesNotExists", $tabletodrop), null, 'warnings');
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -1064,8 +1050,7 @@ if ($dirins && ($action == 'droptable' || $action == 'droptableextrafields') &&
 			$resql = $db->DDLDropTable($tabletodrop);
 			//var_dump($resql);
 			setEventMessages($langs->trans("TableDropped", $tabletodrop), null, 'mesgs');
-		}
-		elseif ($nb > 0)
+		} elseif ($nb > 0)
 		{
 			setEventMessages($langs->trans("TableNotEmptyDropCanceled", $tabletodrop), null, 'warnings');
 		}
@@ -1212,8 +1197,7 @@ if ($dirins && $action == 'confirm_deletemodule')
 		if ($result > 0)
 		{
 			setEventMessages($langs->trans("DirWasRemoved", $modulelowercase), null);
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("PurgeNothingToDelete"), null, 'warnings');
 		}
 	}
@@ -1271,8 +1255,7 @@ if ($dirins && $action == 'confirm_deleteobject' && $objectname)
 		if ($resultko == 0)
 		{
 			setEventMessages($langs->trans("FilesDeleted"), null);
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("ErrorSomeFilesCouldNotBeDeleted"), null, 'warnings');
 		}
 	}
@@ -1299,14 +1282,12 @@ if ($dirins && $action == 'generatepackage')
 	{
 		try {
 			$moduleobj = new $class($db);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$error++;
 			dol_print_error($e->getMessage());
 		}
-	}
-	else {
+	} else {
 		$error++;
 		$langs->load("errors");
 		dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
@@ -1324,22 +1305,19 @@ if ($dirins && $action == 'generatepackage')
 		{
 			if (!dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule);
 			$result = dol_compress_dir($dir, $outputfilezip, 'zip', '', $modulelowercase);
-		}
-		else {
+		} else {
 			$result = -1;
 		}
 
 		if ($result > 0)
 		{
 			setEventMessages($langs->trans("ZipFileGeneratedInto", $outputfilezip), null);
-		}
-		else {
+		} else {
 			$error++;
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFailToGenerateFile", $outputfilezip), null, 'errors');
 		}
-	}
-	else {
+	} else {
 		$error++;
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorCheckVersionIsDefined"), null, 'errors');
@@ -1357,8 +1335,7 @@ if ($dirins && $action == 'generatedoc')
 	if ($result > 0)
 	{
 		setEventMessages($langs->trans("DocFileGeneratedInto", $dirofmodule), null);
-	}
-	else {
+	} else {
 		setEventMessages($util->error, $util->errors, 'errors');
 	}
 }
@@ -1395,12 +1372,10 @@ if ($action == 'savefile' && empty($cancel))
 				@chmod($pathoffile, octdec($newmask));
 
 				setEventMessages($langs->trans("FileSaved"), null);
-			}
-			else {
+			} else {
 				setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 			}
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("ContentCantBeEmpty"), null, 'errors');
 			//$action='editfile';
 			$error++;
@@ -1434,8 +1409,7 @@ if ($action == 'set' && $user->admin)
 					$msg = $langs->trans('ModuleEnabledAdminMustCheckRights');
 					setEventMessages($msg, null, 'warnings');
 				}
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 		}
 	}
 	header("Location: ".$_SERVER["PHP_SELF"]."?".$param);
@@ -1566,8 +1540,7 @@ if (!$dirins)
 {
 	$message = info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
 	$allowfromweb = -1;
-}
-else {
+} else {
 	if ($dirins_ok)
 	{
 		if (!is_writable(dol_osencode($dirins)))
@@ -1576,8 +1549,7 @@ else {
 			$message = info_admin($langs->trans("ErrorFailedToWriteInDir", $dirins));
 			$allowfromweb = 0;
 		}
-	}
-	else {
+	} else {
 		$message = info_admin($langs->trans("NotExistsDirect", $dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
 		$allowfromweb = 0;
 	}
@@ -1608,14 +1580,12 @@ if (!empty($module) && $module != 'initmodule' && $module != 'deletemodule')
 	{
 		try {
 			$moduleobj = new $class($db);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$error++;
 			print $e->getMessage();
 		}
-	}
-	else {
+	} else {
 		if (empty($forceddirread)) $error++;
 		$langs->load("errors");
 		print img_warning('').' '.$langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module).'<br>';
@@ -1671,25 +1641,21 @@ if (is_array($listofmodules) && count($listofmodules) > 0) {
 				{
 					$linktoenabledisable .= ' <a href="'.$urlpage.'" title="'.$langs->trans($page).'">'.img_picto(ucfirst($page), "setup").'</a>';
 					//    print '<a href="'.$page.'">'.ucfirst($page).'</a>&nbsp;';
-				}
-				else {
+				} else {
 					if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs))
 					{
 						$urltouse = dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1);
 						$linktoenabledisable .= ' &nbsp; <a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a>';
-					}
-					else {
+					} else {
 						$urltouse = $urlpage;
 						$linktoenabledisable .= ' &nbsp; <a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a>';
 					}
 				}
 			}
-		}
-		elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs)) {
+		} elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs)) {
 			$linktoenabledisable .= ' &nbsp; <a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1).'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a>';
 		}
-	}
-	else {
+	} else {
 		$linktoenabledisable .= '<a class="reposition asetresetmodule" href="'.$_SERVER["PHP_SELF"].'?id='.$moduleobj->numero.'&action=set&value=mod'.$module.$param.'">';
 		$linktoenabledisable .= img_picto($langs->trans("ModuleIsNotActive", $urltomodulesetup), 'switch_off', '', false, 0, 0, '', 'classfortooltip', 1);
 		$linktoenabledisable .= "</a>\n";
@@ -1739,8 +1705,7 @@ if ($module == 'initmodule')
 
 	print '<br><input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
 	print '</form>';
-}
-elseif ($module == 'deletemodule') {
+} elseif ($module == 'deletemodule') {
 	print '<!-- Form to init a module -->'."\n";
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="delete">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -1752,8 +1717,7 @@ elseif ($module == 'deletemodule') {
 	print '<input type="text" name="module" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'" value="">';
 	print '<input type="submit" class="buttonDelete" value="'.$langs->trans("Delete").'"'.($dirins ? '' : ' disabled="disabled"').'>';
 	print '</form>';
-}
-elseif (!empty($module)) {
+} elseif (!empty($module)) {
 	// Tabs for module
 	if (!$error)
 	{
@@ -1940,8 +1904,7 @@ elseif (!empty($module)) {
 					print '</td></tr>';
 
 					print '</table>';
-				}
-				else {
+				} else {
 					print $langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module).'<br>';
 				}
 
@@ -1967,8 +1930,7 @@ elseif (!empty($module)) {
 				}
 
 				dol_fiche_end();
-			}
-			else {
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0, 1); // Description - level 2
 
 				if ($fullpathoffile)
@@ -1999,8 +1961,7 @@ elseif (!empty($module)) {
 
 				print '</form>';
 			}
-		}
-		else {
+		} else {
 			dol_fiche_head($head2, $tab, '', -1, ''); // Level 2
 		}
 
@@ -2037,8 +1998,7 @@ elseif (!empty($module)) {
 					print '</td>';
 				}
 				print '</table>';
-			}
-			else {
+			} else {
 				// Edit text language file
 
 				//print $langs->trans("UseAsciiDocFormat").'<br>';
@@ -2166,8 +2126,7 @@ elseif (!empty($module)) {
 						print '</tr>';
 						$i++;
 					}
-				}
-				else {
+				} else {
 					print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
 				}
 
@@ -2175,8 +2134,7 @@ elseif (!empty($module)) {
 				print '</div>';
 
 				print '</form>';
-			}
-			else {
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -2280,8 +2238,7 @@ elseif (!empty($module)) {
 				print '<br>';
 
 				print '</form>';
-			}
-			elseif ($tabobj == 'deleteobject') {
+			} elseif ($tabobj == 'deleteobject') {
 				// Delete object tab
 				print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -2294,8 +2251,7 @@ elseif (!empty($module)) {
 				print '<input type="text" name="objectname" value="'.dol_escape_htmltag($modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ObjectKey")).'">';
 				print '<input type="submit" class="buttonDelete" name="delete" value="'.dol_escape_htmltag($langs->trans("Delete")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
 				print '</form>';
-			}
-			else {
+			} else {
 				// tabobj = module
 				if ($action == 'deleteproperty')
 				{
@@ -2368,12 +2324,10 @@ elseif (!empty($module)) {
 		   					if (empty($conf->global->$const_name))	// If module is not activated
 		   					{
 		   						print '<a href="#" target="apiexplorer" title="'.$langs->trans("ModuleMustBeEnabled").'"><strike>'.$langs->trans("GoToApiExplorer").'</strike></a>';
-		   					}
-		   					else {
+		   					} else {
 		   						print '<a href="'.DOL_URL_ROOT.'/api/index.php/explorer/" target="apiexplorer">'.$langs->trans("GoToApiExplorer").'</a>';
 		   					}
-						}
-						else {
+						} else {
 							//print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span> ';
 							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initapi&format=php&file='.urlencode($pathtoapi).'"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a>';
 						}
@@ -2386,8 +2340,7 @@ elseif (!empty($module)) {
 							print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtophpunit).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 							print ' ';
 							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&file='.urlencode($pathtophpunit).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
-						}
-						else {
+						} else {
 							//print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span> ';
 							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initphpunit&format=php&file='.urlencode($pathtophpunit).'"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a>';
 						}
@@ -2423,8 +2376,7 @@ elseif (!empty($module)) {
 							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&file='.urlencode($pathtosqlextra).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 							print ' &nbsp; ';
 							print '<a class="reposition editfielda" href="'.$_SERVER["PHP_SELF"].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=droptableextrafields">'.$langs->trans("DropTableIfEmpty").'</a>';
-						}
-						else {
+						} else {
 							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initsqlextrafields&format=sql&file='.urlencode($pathtosqlextra).'"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a>';
 						}
 						//print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("RunSql").'</a>';
@@ -2494,16 +2446,14 @@ elseif (!empty($module)) {
 						if (empty($forceddirread))
 						{
 							$result = dol_include_once($pathtoclass);
-						}
-						else {
+						} else {
 							$result = @include_once $dirread.'/'.$pathtoclass;
 						}
 						if (class_exists($tabobj))
 						{
 							try {
 								$tmpobjet = @new $tabobj($db);
-							}
-							catch (Exception $e)
+							} catch (Exception $e)
 							{
 								dol_syslog('Failed to load Constructor of class: '.$e->getMessage(), LOG_WARNING);
 							}
@@ -2699,8 +2649,7 @@ elseif (!empty($module)) {
 
 									print '</tr>';
 								}
-							}
-							else {
+							} else {
 								if ($tab == 'specifications')
 								{
 									if ($action != 'editfile' || empty($file))
@@ -2719,8 +2668,7 @@ elseif (!empty($module)) {
 											print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 											print '<br>';
 										}
-									}
-									else {
+									} else {
 										// Use MD or asciidoc
 
 										//print $langs->trans("UseAsciiDocFormat").'<br>';
@@ -2755,22 +2703,18 @@ elseif (!empty($module)) {
 							print '</div>';
 
 							print '</form>';
-						}
-						else {
+						} else {
 							print '<tr><td><span class="warning">'.$langs->trans('Failed to init the object with the new.').'</warning></td></tr>';
 						}
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						print $e->getMessage();
 					}
-				}
-				else {
+				} else {
 					if (empty($forceddirread))
 					{
 						$fullpathoffile = dol_buildpath($file, 0);
-					}
-					else {
+					} else {
 						$fullpathoffile = $dirread.'/'.$file;
 					}
 
@@ -2903,8 +2847,7 @@ elseif (!empty($module)) {
 
 						print '</tr>';
 					}
-				}
-				else {
+				} else {
 				 	print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
 				}
 
@@ -2912,8 +2855,7 @@ elseif (!empty($module)) {
 				print '</div>';
 
 				print '</form>';
-			}
-			else {
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3001,8 +2943,7 @@ elseif (!empty($module)) {
 
 						print '</tr>';
 					}
-				}
-				else {
+				} else {
 					print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("None").'</td></tr>';
 				}
 
@@ -3010,8 +2951,7 @@ elseif (!empty($module)) {
 				print '</div>';
 
 				print '</form>';
-			}
-			else {
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3062,15 +3002,13 @@ elseif (!empty($module)) {
 					print '</td>';
 					print '<td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a> ';
 					print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
-				}
-				else {
+				} else {
 					print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 					print '<a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=inithook&format=php&file='.urlencode($pathtohook).'"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a></td>';
 					print '<td></td>';
 				}
 				print '</tr>';
-			}
-			else {
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3129,8 +3067,7 @@ elseif (!empty($module)) {
 						print '<td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 						print '</tr>';
 					}
-				}
-				else {
+				} else {
 					print '<tr><td>';
 					print '<span class="fa fa-file-o"></span> '.$langs->trans("NoTrigger");
 					print '<a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=inittrigger&format=php"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a></td>';
@@ -3139,8 +3076,7 @@ elseif (!empty($module)) {
 				}
 
 				print '</table>';
-			}
-			else {
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3183,14 +3119,12 @@ elseif (!empty($module)) {
 					print '<strong>'.$pathtohook.'</strong>';
 					print '</td><td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
 					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
-				}
-				else {
+				} else {
 					print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initcss&format=php&file='.urlencode($pathtohook).'"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a></td>';
 				}
 				print '</tr>';
-			}
-			else {
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3233,14 +3167,12 @@ elseif (!empty($module)) {
 					print '<strong>'.$pathtohook.'</strong>';
 					print '</td><td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
 					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
-				}
-				else {
+				} else {
 					print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initjs&format=php&file='.urlencode($pathtohook).'"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a></td>';
 				}
 				print '</tr>';
-			}
-			else {
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3289,15 +3221,13 @@ elseif (!empty($module)) {
 						print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 						print '</tr>';
 					}
-				}
-				else {
+				} else {
 					print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("NoWidget");
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initwidget&format=php"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a>';
 					print '</td></tr>';
 				}
 				print '</table>';
-			}
-			else {
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3373,15 +3303,13 @@ elseif (!empty($module)) {
 						print '<td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 						print '</tr>';
 					}
-				}
-				else {
+				} else {
 					print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("NoCLIFile");
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initcli&format=php"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a>';
 					print '</td></tr>';
 				}
 				print '</table>';
-			}
-			else {
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3463,8 +3391,7 @@ elseif (!empty($module)) {
 							$texttoshow .= $langs->trans('CronMethod').': '.$cron['method'];
 							$texttoshow .= '<br>'.$langs->trans('CronArgs').': '.$cron['parameters'];
 							$texttoshow .= '<br>'.$langs->trans('Comment').': '.$langs->trans($cron['comment']);
-						}
-						elseif ($cron['jobtype'] == 'command')
+						} elseif ($cron['jobtype'] == 'command')
 						{
 							$text = $langs->trans('CronCommand');
 							$texttoshow = $langs->trans('CronCommand').': '.dol_trunc($cron['command']);
@@ -3491,8 +3418,7 @@ elseif (!empty($module)) {
 
 						print '</tr>';
 					}
-				}
-				else {
+				} else {
 					print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
 				}
 
@@ -3500,8 +3426,7 @@ elseif (!empty($module)) {
 				print '</div>';
 
 				print '</form>';
-			}
-			else {
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3550,16 +3475,14 @@ elseif (!empty($module)) {
 						print '<td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 						print '</tr>';
 					}
-				}
-				else {
+				} else {
 					print '<tr><td>';
 					print '<span class="fa fa-file-o"></span> '.$langs->trans("FileNotYetGenerated");
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initdoc&format=php"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a></td>';
 					print '</tr>';
 				}
 				print '</table>';
-			}
-			else {
+			} else {
 				// Use MD or asciidoc
 
 				//print $langs->trans("UseAsciiDocFormat").'<br>';
@@ -3661,13 +3584,11 @@ elseif (!empty($module)) {
 			{
 				try {
 					$moduleobj = new $class($db);
-				}
-				catch (Exception $e) {
+				} catch (Exception $e) {
 					$error++;
 					dol_print_error($e->getMessage());
 				}
-			}
-			else {
+			} else {
 				$error++;
 				$langs->load("errors");
 				dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 642fa838783..dc48d60d3c6 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -115,8 +115,7 @@ if ($action == 'edit')
 
 	print '</form>';
 	print '<br>';
-}
-else {
+} else {
 	if (!empty($arrayofparameters))
 	{
 		print '<table class="noborder centpercent">';
@@ -135,8 +134,7 @@ else {
 		print '<div class="tabsAction">';
 		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
 		print '</div>';
-	}
-	else {
+	} else {
 		print '<br>'.$langs->trans("NothingToSetup");
 	}
 }
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index 40af5ce2f0d..65998ed4390 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -172,8 +172,7 @@ class MyModuleApi extends DolibarrApi
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(503, 'Error when retrieving myobject list: '.$db->lasterror());
 		}
 		if (!count($obj_ret)) {
@@ -243,8 +242,7 @@ class MyModuleApi extends DolibarrApi
 		if ($this->myobject->update(DolibarrApiAccess::$user, false) > 0)
 		{
 			return $this->get($id);
-		}
-		else {
+		} else {
 			throw new RestException(500, $this->myobject->error);
 		}
 	}
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 6f1d45fee9f..5109f45c9ef 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -413,14 +413,11 @@ class MyObject extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				}
-				elseif (strpos($key, 'date') !== false) {
+				} elseif (strpos($key, 'date') !== false) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				}
-				elseif ($key == 'customsql') {
+				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				}
-				else {
+				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
@@ -545,8 +542,7 @@ class MyObject extends CommonObject
 		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$num = $this->getNextNumRef();
-		}
-		else {
+		} else {
 			$num = $this->ref;
 		}
 		$this->newref = $num;
@@ -629,8 +625,7 @@ class MyObject extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -757,8 +752,7 @@ class MyObject extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -782,14 +776,12 @@ class MyObject extends CommonObject
 					$pathtophoto = $class.'/'.$this->ref.'/thumbs/'.substr($filename, 0, $pospoint).'_mini'.substr($filename, $pospoint);
 					if (empty($conf->global->{strtoupper($module.'_'.$class).'_FORMATLISTPHOTOSASUSERS'})) {
 						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$module.'" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div></div>';
-					}
-					else {
+					} else {
 						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div>';
 					}
 
 					$result .= '</div>';
-				}
-				else {
+				} else {
 					$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
 				}
 			}
@@ -897,8 +889,7 @@ class MyObject extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -931,8 +922,7 @@ class MyObject extends CommonObject
 			$this->error = $this->error;
 			$this->errors = $this->errors;
 			return $result;
-		}
-		else {
+		} else {
 			$this->lines = $result;
 			return $this->lines;
 		}
@@ -982,8 +972,7 @@ class MyObject extends CommonObject
 				if ($numref != '' && $numref != '-1')
 				{
 					return $numref;
-				}
-				else {
+				} else {
 					$this->error = $obj->error;
 					//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 					return "";
@@ -992,8 +981,7 @@ class MyObject extends CommonObject
 				print $langs->trans("Error")." ".$langs->trans("ClassNotFound").' '.$classname;
 				return "";
 			}
-		}
-		else {
+		} else {
 			print $langs->trans("ErrorNumberingModuleNotSetup", $this->element);
 			return "";
 		}
diff --git a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
index e7d407dc8c9..cb6e15695c1 100644
--- a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
@@ -146,8 +146,7 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_syslog($this->db->error());
 			$this->error = $this->db->error();
 			return -1;
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index 74a05a6b5e7..d19ced0d9dc 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -274,8 +274,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
 					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else {
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -307,8 +306,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
-				}
-				else {
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -345,8 +343,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -362,8 +359,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -394,13 +390,11 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 							// Image
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else {
+						} else {
 							// Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -410,8 +404,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -432,12 +425,10 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 							{
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -446,8 +437,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -460,8 +450,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -481,8 +470,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -503,8 +491,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
index 526c7c11213..1595c0ea00d 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
@@ -91,8 +91,7 @@ class mod_myobject_standard extends ModeleNumRefMyObject
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		if ($object->ismultientitymanaged == 1) {
 			$sql .= " AND entity = ".$conf->entity;
-		}
-		elseif ($object->ismultientitymanaged == 2) {
+		} elseif ($object->ismultientitymanaged == 2) {
 			// TODO
 		}
 
@@ -129,8 +128,7 @@ class mod_myobject_standard extends ModeleNumRefMyObject
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		if ($object->ismultientitymanaged == 1) {
 			$sql .= " AND entity = ".$conf->entity;
-		}
-		elseif ($object->ismultientitymanaged == 2) {
+		} elseif ($object->ismultientitymanaged == 2) {
 			// TODO
 		}
 
@@ -140,8 +138,7 @@ class mod_myobject_standard extends ModeleNumRefMyObject
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else {
+		} else {
 			dol_syslog("mod_myobject_standard::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index a31e9f6acdd..d37cc7f5e05 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -478,8 +478,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			if ($permissiontoadd)
 			{
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit">'.$langs->trans("Modify").'</a>'."\n";
-			}
-			else {
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
 			}
 
@@ -491,8 +490,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0))
 					{
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes">'.$langs->trans("Validate").'</a>';
-					}
-					else {
+					} else {
 						$langs->load("errors");
 						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
 					}
@@ -534,8 +532,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd))
 			{
 				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
-			}
-			else {
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
 			}
 		}
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index a37890649e2..cf2ca41fe53 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -428,8 +428,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		}
-		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
diff --git a/htdocs/modulebuilder/template/scripts/mymodule.php b/htdocs/modulebuilder/template/scripts/mymodule.php
index aab823d1cb0..684d58c1c03 100644
--- a/htdocs/modulebuilder/template/scripts/mymodule.php
+++ b/htdocs/modulebuilder/template/scripts/mymodule.php
@@ -163,8 +163,7 @@ if (!$error)
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else {
+} else {
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }

From c77a1be176f2f15094fd5765890350e6227d6a96 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Thu, 21 May 2020 11:35:32 +0200
Subject: [PATCH 339/490] fix comment and add some translation

---
 htdocs/core/modules/propale/doc/pdf_azur.modules.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index c285f560678..b5000925672 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -1052,11 +1052,11 @@ class pdf_azur extends ModelePDFPropales
 	 *	Show total to pay
 	 *
 	 *	@param	PDF			$pdf            Object PDF
-	 *	@param  Facture		$object         Object invoice
-	 *	@param  int			$deja_regle     Montant deja regle
-	 *	@param	int			$posy			Position depart
+	 *	@param  Propal		$object         Object propal
+	 *	@param  int			$deja_regle     Amount already paid
+	 *	@param	int			$posy			Start position
 	 *	@param	Translate	$outputlangs	Objet langs
-	 *	@return int							Position pour suite
+	 *	@return int							Position for continuation
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
@@ -1068,7 +1068,7 @@ class pdf_azur extends ModelePDFPropales
 		$tab2_hl = 4;
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		// Tableau total
+		// Total table
 		$col1x = 120; $col2x = 170;
 		if ($this->page_largeur < 210) // To work with US executive format
 		{

From 8a481b297ce95fa5602cf0098188090ea5bfe079 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 21 May 2020 13:06:36 +0200
Subject: [PATCH 340/490] Clean CSS, clean code

---
 htdocs/core/class/extrafields.class.php    |    2 +-
 htdocs/core/class/extralanguages.class.php | 1194 +-------------------
 htdocs/core/class/html.form.class.php      |    2 +
 htdocs/index.php                           |    6 +-
 htdocs/theme/eldy/info-box.inc.php         |    7 +-
 5 files changed, 19 insertions(+), 1192 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 18dd686367b..6e0651568a1 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -43,7 +43,7 @@ class ExtraFields
     public $db;
 
 	/**
-     * @var string type of element (for what object is the extrafield)
+     * @var array Array with type of element (for what object is the extrafield)
 	 * @deprecated
      */
     public $attribute_elementtype;
diff --git a/htdocs/core/class/extralanguages.class.php b/htdocs/core/class/extralanguages.class.php
index 71a6fa8c1aa..48f2e94936a 100644
--- a/htdocs/core/class/extralanguages.class.php
+++ b/htdocs/core/class/extralanguages.class.php
@@ -18,7 +18,7 @@
 /**
  * 	\file 		htdocs/core/class/extralanguages.class.php
  *	\ingroup    core
- *	\brief      File of class to manage extra fields
+ *	\brief      File of class to manage extra languages for some fields
  */
 
 
@@ -69,7 +69,8 @@ class ExtraLanguages
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * 	Load array this->attributes with list of fields per object that need an alternate translation.
+	 * 	Load array this->attributes with list of fields per object that need an alternate translation. The object and field must be managed with
+	 *  the widgetForTranslation() method.
 	 *  You can set variable MAIN_USE_ALTERNATE_TRANSLATION_FOR=elementA:fieldname,fieldname2;elementB:...
 	 *  Example: MAIN_USE_ALTERNATE_TRANSLATION_FOR=societe:name,town;contact:firstname,lastname
 	 *
@@ -119,16 +120,16 @@ class ExtraLanguages
 	 *
 	 * @param  string  $key            			Key of attribute
 	 * @param  string  $value          			Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
+	 * @param  string  $extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
 	 * @param  string  $moreparam      			To add more parametes on html input tag
 	 * @param  string  $keysuffix      			Prefix string to add after name and id of field (can be used to avoid duplicate names)
 	 * @param  string  $keyprefix      			Suffix string to add before name and id of field (can be used to avoid duplicate names)
 	 * @param  string  $morecss        			More css (to defined size of field. Old behaviour: may also be a numeric)
 	 * @param  int     $objectid       			Current object id
-	 * @param  string  $extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
 	 * @param  string  $mode                    1=Used for search filters
 	 * @return string
 	 */
-	public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '', $objectid = 0, $extrafieldsobjectkey = '', $mode = 0)
+	public function showInputField($key, $value, $extrafieldsobjectkey, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '', $objectid = 0, $mode = 0)
 	{
 		global $conf, $langs, $form;
 
@@ -145,601 +146,7 @@ class ExtraLanguages
 			$keyprefix = $keyprefix.'options_';
 		}
 
-		if (!empty($extrafieldsobjectkey))
-		{
-			$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
-			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
-			$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];
-			$default = $this->attributes[$extrafieldsobjectkey]['default'][$key];
-			$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];
-			$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
-			$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];
-			$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];
-			$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
-			$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
-			$totalizable = $this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
-			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
-			$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-		else	// Old usage
-		{
-			$label = $this->attribute_label[$key];
-			$type = $this->attribute_type[$key];
-			$size = $this->attribute_size[$key];
-			$elementtype = $this->attribute_elementtype[$key]; // Seems not used
-			$default = $this->attribute_default[$key];
-			$computed = $this->attribute_computed[$key];
-			$unique = $this->attribute_unique[$key];
-			$required = $this->attribute_required[$key];
-			$param = $this->attribute_param[$key];
-			$langfile = $this->attribute_langfile[$key];
-			$list = $this->attribute_list[$key];
-			$totalizable = $this->attribute_totalizable[$key];
-			$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
 
-		if ($computed)
-		{
-			if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
-			else return '';
-		}
-
-		if (empty($morecss))
-		{
-			if ($type == 'date')
-			{
-				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime' || $type == 'link')
-			{
-				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type, array('int', 'integer', 'double', 'price')))
-			{
-				$morecss = 'maxwidth75';
-			}
-			elseif ($type == 'password')
-			{
-				$morecss = 'maxwidth100';
-			}
-			elseif ($type == 'url')
-			{
-				$morecss = 'minwidth400';
-			}
-			elseif ($type == 'boolean')
-			{
-				$morecss = '';
-			}
-			else
-			{
-				if (round($size) < 12)
-				{
-					$morecss = 'minwidth100';
-				}
-				elseif (round($size) <= 48)
-				{
-					$morecss = 'minwidth200';
-				}
-				else
-				{
-					$morecss = 'minwidth400';
-				}
-			}
-		}
-
-		if (in_array($type, array('date', 'datetime')))
-		{
-			$tmp = explode(',', $size);
-			$newsize = $tmp[0];
-
-			$showtime = in_array($type, array('datetime')) ? 1 : 0;
-
-			// Do not show current date when field not required (see selectDate() method)
-			if (!$required && $value == '') $value = '-1';
-
-			// TODO Must also support $moreparam
-			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
-		}
-		elseif (in_array($type, array('int', 'integer')))
-		{
-			$tmp = explode(',', $size);
-			$newsize = $tmp[0];
-			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
-		}
-		elseif (preg_match('/varchar/', $type))
-		{
-			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
-		}
-		elseif (in_array($type, array('mail', 'phone', 'url')))
-		{
-			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
-		}
-		elseif ($type == 'text')
-		{
-			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
-			{
-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
-				$out = $doleditor->Create(1);
-			}
-			else
-			{
-				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
-			}
-		}
-		elseif ($type == 'html')
-		{
-			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
-			{
-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
-				$out = $doleditor->Create(1);
-			}
-			else
-			{
-				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
-			}
-		}
-		elseif ($type == 'boolean')
-		{
-			if (empty($mode))
-			{
-				$checked = '';
-				if (!empty($value)) {
-					$checked = ' checked value="1" ';
-				} else {
-					$checked = ' value="1" ';
-				}
-				$out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';
-			}
-			else
-			{
-				$out .= $form->selectyesno($keyprefix.$key.$keysuffix, $value, 1, false, 1);
-			}
-		}
-		elseif ($type == 'price')
-		{
-			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value = price($value);
-			}
-			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.$langs->getCurrencySymbol($conf->currency);
-		}
-		elseif ($type == 'double')
-		{
-			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value = price($value);
-			}
-			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
-		}
-		elseif ($type == 'select')
-		{
-			$out = '';
-			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
-			{
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
-			}
-
-			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
-			$out .= '<option value="0">&nbsp;</option>';
-			foreach ($param['options'] as $key => $val)
-			{
-				if ((string) $key == '') continue;
-				list($val, $parent) = explode('|', $val);
-				$out .= '<option value="'.$key.'"';
-				$out .= (((string) $value == (string) $key) ? ' selected' : '');
-				$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
-				$out .= '>';
-				if ($langfile && $val) $out .= $langs->trans($val);
-				else $out .= $val;
-				$out .= '</option>';
-			}
-			$out .= '</select>';
-		}
-		elseif ($type == 'sellist')
-		{
-			$out = '';
-			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
-			{
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
-			}
-
-			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
-			if (is_array($param['options']))
-			{
-				$param_list = array_keys($param['options']);
-				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName = '';
-				$parentField = '';
-				// 0 : tableName
-				// 1 : label field name
-				// 2 : key fields name (if differ of rowid)
-				// 3 : key field parent (for dependent lists)
-				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-                // 5 : id category type
-                // 6 : ids categories list separated by comma for category root
-				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
-
-
-				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4]))
-				{
-					if (strpos($InfoFieldList[4], 'extra.') !== false)
-					{
-						$keyList = 'main.'.$InfoFieldList[2].' as rowid';
-					} else {
-						$keyList = $InfoFieldList[2].' as rowid';
-					}
-				}
-				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3]))
-				{
-					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
-					$keyList .= ', '.$parentField;
-				}
-
-                $filter_categorie = false;
-                if (count($InfoFieldList) > 5) {
-                    if ($InfoFieldList[0] == 'categorie') {
-                        $filter_categorie = true;
-                    }
-                }
-
-                if ($filter_categorie === false) {
-                    $fields_label = explode('|', $InfoFieldList[1]);
-                    if (is_array($fields_label)) {
-                        $keyList .= ', ';
-                        $keyList .= implode(', ', $fields_label);
-                    }
-
-                    $sqlwhere = '';
-                    $sql = 'SELECT '.$keyList;
-                    $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
-                    if (!empty($InfoFieldList[4])) {
-                        // can use curent entity filter
-                        if (strpos($InfoFieldList[4], '$ENTITY$') !== false) {
-                            $InfoFieldList[4] = str_replace('$ENTITY$', $conf->entity, $InfoFieldList[4]);
-                        }
-                        // can use SELECT request
-                        if (strpos($InfoFieldList[4], '$SEL$') !== false) {
-                            $InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
-                        }
-
-                        // current object id can be use into filter
-                        if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
-                            $InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
-                        } else {
-                            $InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
-                        }
-                        //We have to join on extrafield table
-                        if (strpos($InfoFieldList[4], 'extra') !== false) {
-                            $sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
-                            $sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
-                        } else {
-                            $sqlwhere .= ' WHERE '.$InfoFieldList[4];
-                        }
-                    } else {
-                        $sqlwhere .= ' WHERE 1=1';
-                    }
-                    // Some tables may have field, some other not. For the moment we disable it.
-                    if (in_array($InfoFieldList[0], array('tablewithentity'))) {
-                        $sqlwhere .= ' AND entity = '.$conf->entity;
-                    }
-                    $sql .= $sqlwhere;
-                    //print $sql;
-
-                    $sql .= ' ORDER BY '.implode(', ', $fields_label);
-
-                    dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
-                    $resql = $this->db->query($sql);
-                    if ($resql) {
-                        $out .= '<option value="0">&nbsp;</option>';
-                        $num = $this->db->num_rows($resql);
-                        $i = 0;
-                        while ($i < $num) {
-                            $labeltoshow = '';
-                            $obj = $this->db->fetch_object($resql);
-
-                            // Several field into label (eq table:code|libelle:rowid)
-                            $notrans = false;
-                            $fields_label = explode('|', $InfoFieldList[1]);
-                            if (is_array($fields_label) && count($fields_label) > 1) {
-                                $notrans = true;
-                                foreach ($fields_label as $field_toshow) {
-                                    $labeltoshow .= $obj->$field_toshow.' ';
-                                }
-                            } else {
-                                $labeltoshow = $obj->{$InfoFieldList[1]};
-                            }
-                            $labeltoshow = dol_trunc($labeltoshow, 45);
-
-                            if ($value == $obj->rowid) {
-                            	if (!$notrans) {
-	                                foreach ($fields_label as $field_toshow) {
-	                                    $translabel = $langs->trans($obj->$field_toshow);
-	                                    $labeltoshow = dol_trunc($translabel, 18).' ';
-	                                }
-                            	}
-                                $out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-                            } else {
-                                if (!$notrans) {
-                                    $translabel = $langs->trans($obj->{$InfoFieldList[1]});
-                                    $labeltoshow = dol_trunc($translabel, 18);
-                                }
-                                if (empty($labeltoshow)) $labeltoshow = '(not defined)';
-
-                                if (!empty($InfoFieldList[3]) && $parentField) {
-                                    $parent = $parentName.':'.$obj->{$parentField};
-                                }
-
-                                $out .= '<option value="'.$obj->rowid.'"';
-                                $out .= ($value == $obj->rowid ? ' selected' : '');
-                                $out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
-                                $out .= '>'.$labeltoshow.'</option>';
-                            }
-
-                            $i++;
-                        }
-                        $this->db->free($resql);
-                    } else {
-                        print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
-                    }
-                } else {
-					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-                    $data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
-                    $out .= '<option value="0">&nbsp;</option>';
-                    foreach ($data as $data_key => $data_value) {
-                        $out .= '<option value="'.$data_key.'"';
-                        $out .= ($value == $data_key ? ' selected' : '');
-                        $out .= '>'.$data_value.'</option>';
-                    }
-                }
-			}
-			$out .= '</select>';
-		}
-		elseif ($type == 'checkbox')
-		{
-			$value_arr = explode(',', $value);
-			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
-		}
-		elseif ($type == 'radio')
-		{
-			$out = '';
-			foreach ($param['options'] as $keyopt => $val)
-			{
-				$out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');
-				$out .= ' value="'.$keyopt.'"';
-				$out .= ' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
-				$out .= ($value == $keyopt ? 'checked' : '');
-				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
-			}
-		}
-		elseif ($type == 'chkbxlst')
-		{
-			if (is_array($value)) {
-				$value_arr = $value;
-			}
-			else {
-				$value_arr = explode(',', $value);
-			}
-
-			if (is_array($param['options'])) {
-				$param_list = array_keys($param['options']);
-				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName = '';
-				$parentField = '';
-				// 0 : tableName
-				// 1 : label field name
-				// 2 : key fields name (if differ of rowid)
-				// 3 : key field parent (for dependent lists)
-				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-                // 5 : id category type
-                // 6 : ids categories list separated by comma for category root
-				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
-
-				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
-					list ($parentName, $parentField) = explode('|', $InfoFieldList[3]);
-					$keyList .= ', '.$parentField;
-				}
-				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
-					if (strpos($InfoFieldList[4], 'extra.') !== false) {
-						$keyList = 'main.'.$InfoFieldList[2].' as rowid';
-					} else {
-						$keyList = $InfoFieldList[2].' as rowid';
-					}
-				}
-
-                $filter_categorie = false;
-                if (count($InfoFieldList) > 5) {
-                    if ($InfoFieldList[0] == 'categorie') {
-                        $filter_categorie = true;
-                    }
-                }
-
-                if ($filter_categorie === false) {
-                    $fields_label = explode('|', $InfoFieldList[1]);
-                    if (is_array($fields_label)) {
-                        $keyList .= ', ';
-                        $keyList .= implode(', ', $fields_label);
-                    }
-
-                    $sqlwhere = '';
-                    $sql = 'SELECT '.$keyList;
-                    $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
-                    if (!empty($InfoFieldList[4])) {
-                        // can use SELECT request
-                        if (strpos($InfoFieldList[4], '$SEL$') !== false) {
-                            $InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
-                        }
-
-                        // current object id can be use into filter
-                        if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
-                            $InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
-                        } elseif (preg_match("#^.*list.php$#", $_SERVER["PHP_SELF"])) {
-                            // Pattern for word=$ID$
-                            $word = '\b[a-zA-Z0-9-\.-_]+\b=\$ID\$';
-
-                            // Removing space arount =, ( and )
-                            $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
-
-                            $nbPreg = 1;
-                            // While we have parenthesis
-                            while ($nbPreg != 0) {
-                                // Init des compteurs
-                                $nbPregRepl = $nbPregSel = 0;
-                                // On retire toutes les parenthèses sans = avant
-                                $InfoFieldList[4] = preg_replace('#([^=])(\([^)^(]*('.$word.')[^)^(]*\))#', '$1 $3 ', $InfoFieldList[4], -1, $nbPregRepl);
-                                // On retire les espaces autour des = et parenthèses
-                                $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
-                                // On retire toutes les parenthèses avec = avant
-                                $InfoFieldList[4] = preg_replace('#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*('.$word.')[^)^(]*\)#', '$1 ', $InfoFieldList[4], -1, $nbPregSel);
-                                // On retire les espaces autour des = et parenthèses
-                                $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
-
-                                // Calcul du compteur général pour la boucle
-                                $nbPreg = $nbPregRepl + $nbPregSel;
-                            }
-
-                            // Si l'on a un AND ou un OR, avant ou après
-                            preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
-                            while (!empty($matchCondition[0])) {
-                                // If the two sides differ but are not empty
-                                if (!empty($matchCondition[1]) && !empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3]) {
-                                    // Nobody sain would do that without parentheses
-                                    $InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
-                                } else {
-                                    if (!empty($matchCondition[1])) {
-                                        $boolCond = (($matchCondition[1] == "AND") ? ' AND TRUE ' : ' OR FALSE ');
-                                        $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond.$matchCondition[3], $InfoFieldList[4]);
-                                    } elseif (!empty($matchCondition[3])) {
-                                        $boolCond = (($matchCondition[3] == "AND") ? ' TRUE AND ' : ' FALSE OR');
-                                        $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond, $InfoFieldList[4]);
-                                    } else {
-                                        $InfoFieldList[4] = " TRUE ";
-                                    }
-                                }
-
-                                // Si l'on a un AND ou un OR, avant ou après
-                                preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
-                            }
-                        } else {
-                            $InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
-                        }
-
-                        // We have to join on extrafield table
-                        if (strpos($InfoFieldList[4], 'extra.') !== false) {
-                            $sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
-                            $sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
-                        } else {
-                            $sqlwhere .= ' WHERE '.$InfoFieldList[4];
-                        }
-                    } else {
-                        $sqlwhere .= ' WHERE 1=1';
-                    }
-                    // Some tables may have field, some other not. For the moment we disable it.
-                    if (in_array($InfoFieldList[0], array('tablewithentity'))) {
-                        $sqlwhere .= ' AND entity = '.$conf->entity;
-                    }
-                    // $sql.=preg_replace('/^ AND /','',$sqlwhere);
-                    // print $sql;
-
-                    $sql .= $sqlwhere;
-                    dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);
-                    $resql = $this->db->query($sql);
-                    if ($resql) {
-                        $num = $this->db->num_rows($resql);
-                        $i = 0;
-
-                        $data = array();
-
-                        while ($i < $num) {
-                            $labeltoshow = '';
-                            $obj = $this->db->fetch_object($resql);
-
-                            $notrans = false;
-                            // Several field into label (eq table:code|libelle:rowid)
-                            $fields_label = explode('|', $InfoFieldList[1]);
-                            if (is_array($fields_label)) {
-                                $notrans = true;
-                                foreach ($fields_label as $field_toshow) {
-                                    $labeltoshow .= $obj->$field_toshow.' ';
-                                }
-                            } else {
-                                $labeltoshow = $obj->{$InfoFieldList[1]};
-                            }
-                            $labeltoshow = dol_trunc($labeltoshow, 45);
-
-                            if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-                                foreach ($fields_label as $field_toshow) {
-                                    $translabel = $langs->trans($obj->$field_toshow);
-                                    if ($translabel != $obj->$field_toshow) {
-                                        $labeltoshow = dol_trunc($translabel, 18).' ';
-                                    } else {
-                                        $labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
-                                    }
-                                }
-
-                                $data[$obj->rowid] = $labeltoshow;
-                            } else {
-                                if (!$notrans) {
-                                    $translabel = $langs->trans($obj->{$InfoFieldList[1]});
-                                    if ($translabel != $obj->{$InfoFieldList[1]}) {
-                                        $labeltoshow = dol_trunc($translabel, 18);
-                                    } else {
-                                        $labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
-                                    }
-                                }
-                                if (empty($labeltoshow))
-                                    $labeltoshow = '(not defined)';
-
-                                if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-                                    $data[$obj->rowid] = $labeltoshow;
-                                }
-
-                                if (!empty($InfoFieldList[3]) && $parentField) {
-                                    $parent = $parentName.':'.$obj->{$parentField};
-                                }
-
-                                $data[$obj->rowid] = $labeltoshow;
-                            }
-
-                            $i++;
-                        }
-                        $this->db->free($resql);
-
-                        $out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
-                    } else {
-                        print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
-                    }
-                } else {
-					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-                    $data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
-                    $out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
-                }
-			}
-		}
-		elseif ($type == 'link')
-		{
-			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
-			$showempty = (($required && $default != '') ? 0 : 1);
-			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss);
-		}
-		elseif ($type == 'password')
-		{
-			// If prefix is 'search_', field is used as a filter, we use a common text field.
-			$out = '<input style="display:none" type="text" name="fakeusernameremembered">'; // Hidden field to reduce impact of evil Google Chrome autopopulate bug.
-			$out .= '<input autocomplete="new-password" type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';
-		}
-		if (!empty($hidden)) {
-			$out = '<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
-		}
-		/* Add comments
-		 if ($type == 'date') $out.=' (YYYY-MM-DD)';
-		 elseif ($type == 'datetime') $out.=' (YYYY-MM-DD HH:MM:SS)';
-		 */
-		/*if (! empty($help) && $keyprefix != 'search_options_') {
-			$out .= $form->textwithpicto('', $help, 1, 'help', '', 0, 3);
-		}*/
 		return $out;
 	}
 
@@ -749,601 +156,16 @@ class ExtraLanguages
 	 *
 	 * @param   string	$key            		Key of attribute
 	 * @param   string	$value          		Value to show
-	 * @param	string	$moreparam				To add more parameters on html input tag (only checkbox use html input for output rendering)
 	 * @param	string	$extrafieldsobjectkey	If defined (for example $object->table_element), function uses the new method to get extrafields data
+	 * @param	string	$moreparam				To add more parameters on html input tag (only checkbox use html input for output rendering)
 	 * @return	string							Formated value
 	 */
-	public function showOutputField($key, $value, $moreparam = '', $extrafieldsobjectkey = '')
+	public function showOutputField($key, $value, $extrafieldsobjectkey, $moreparam = '')
 	{
 		global $conf, $langs;
 
-		if (!empty($extrafieldsobjectkey))
-		{
-			$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
-			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
-			$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];
-			$default = $this->attributes[$extrafieldsobjectkey]['default'][$key];
-			$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];
-			$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
-			$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];
-			$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];
-			$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
-			$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
-			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
-			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-		else	// Old usage
-		{
-			//dol_syslog("Warning: parameter 'extrafieldsobjectkey' is missing", LOG_WARNING);
-			$label = $this->attribute_label[$key];
-			$type = $this->attribute_type[$key];
-			$size = $this->attribute_size[$key];
-			$default = $this->attribute_default[$key];
-			$computed = $this->attribute_computed[$key];
-			$unique = $this->attribute_unique[$key];
-			$required = $this->attribute_required[$key];
-			$param = $this->attribute_param[$key];
-			$perms = dol_eval($this->attribute_perms[$key], 1);
-			$langfile = $this->attribute_langfile[$key];
-			$list = dol_eval($this->attribute_list[$key], 1);
-			$help = ''; // Not supported with old syntax
-			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-
-		if ($hidden) return ''; // This is a protection. If field is hidden, we should just not call this method.
-
-		//if ($computed) $value =		// $value is already calculated into $value before calling this method
-
-		$showsize = 0;
-		if ($type == 'date')
-		{
-			$showsize = 10;
-			$value = dol_print_date($value, 'day');
-		}
-		elseif ($type == 'datetime')
-		{
-			$showsize = 19;
-			$value = dol_print_date($value, 'dayhour');
-		}
-		elseif ($type == 'int')
-		{
-			$showsize = 10;
-		}
-		elseif ($type == 'double')
-		{
-			if (!empty($value)) {
-				//$value=price($value);
-				$sizeparts = explode(",", $size);
-				$number_decimals = $sizeparts[1];
-				$value = price($value, 0, $langs, 0, 0, $number_decimals, '');
-			}
-		}
-		elseif ($type == 'boolean')
-		{
-			$checked = '';
-			if (!empty($value)) {
-				$checked = ' checked ';
-			}
-			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
-		}
-		elseif ($type == 'mail')
-		{
-			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
-		}
-		elseif ($type == 'url')
-		{
-			$value = dol_print_url($value, '_blank', 32, 1);
-		}
-		elseif ($type == 'phone')
-		{
-			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 'phone');
-		}
-		elseif ($type == 'price')
-		{
-			$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
-		}
-		elseif ($type == 'select')
-		{
-			if ($langfile && $param['options'][$value]) $value = $langs->trans($param['options'][$value]);
-			else $value = $param['options'][$value];
-		}
-		elseif ($type == 'sellist')
-		{
-			$param_list = array_keys($param['options']);
-			$InfoFieldList = explode(":", $param_list[0]);
-
-			$selectkey = "rowid";
-			$keyList = 'rowid';
-
-			if (count($InfoFieldList) >= 3)
-			{
-				$selectkey = $InfoFieldList[2];
-				$keyList = $InfoFieldList[2].' as rowid';
-			}
-
-			$fields_label = explode('|', $InfoFieldList[1]);
-			if (is_array($fields_label)) {
-				$keyList .= ', ';
-				$keyList .= implode(', ', $fields_label);
-			}
-
-			$sql = 'SELECT '.$keyList;
-			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
-			if (strpos($InfoFieldList[4], 'extra') !== false)
-			{
-				$sql .= ' as main';
-			}
-			if ($selectkey == 'rowid' && empty($value)) {
-				$sql .= " WHERE ".$selectkey."=0";
-			} elseif ($selectkey == 'rowid') {
-				$sql .= " WHERE ".$selectkey."=".$this->db->escape($value);
-			} else {
-				$sql .= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
-			}
-
-			//$sql.= ' AND entity = '.$conf->entity;
-
-			dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				$value = ''; // value was used, so now we reste it to use it to build final output
-
-				$obj = $this->db->fetch_object($resql);
-
-				// Several field into label (eq table:code|libelle:rowid)
-				$fields_label = explode('|', $InfoFieldList[1]);
-
-				if (is_array($fields_label) && count($fields_label) > 1)
-				{
-					foreach ($fields_label as $field_toshow)
-					{
-						$translabel = '';
-						if (!empty($obj->$field_toshow)) {
-							$translabel = $langs->trans($obj->$field_toshow);
-						}
-						if ($translabel != $field_toshow) {
-							$value .= dol_trunc($translabel, 18).' ';
-						} else {
-							$value .= $obj->$field_toshow.' ';
-						}
-					}
-				}
-				else
-				{
-					$translabel = '';
-					if (!empty($obj->{$InfoFieldList[1]})) {
-						$translabel = $langs->trans($obj->{$InfoFieldList[1]});
-					}
-					if ($translabel != $obj->{$InfoFieldList[1]}) {
-						$value = dol_trunc($translabel, 18);
-					} else {
-						$value = $obj->{$InfoFieldList[1]};
-					}
-				}
-			}
-			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
-		}
-		elseif ($type == 'radio')
-		{
-			$value = $param['options'][$value];
-		}
-		elseif ($type == 'checkbox')
-		{
-			$value_arr = explode(',', $value);
-			$value = '';
-			$toprint = array();
-			if (is_array($value_arr))
-			{
-				foreach ($value_arr as $keyval=>$valueval) {
-					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
-				}
-			}
-			$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
-		}
-		elseif ($type == 'chkbxlst')
-		{
-			$value_arr = explode(',', $value);
-
-			$param_list = array_keys($param['options']);
-			$InfoFieldList = explode(":", $param_list[0]);
-
-			$selectkey = "rowid";
-			$keyList = 'rowid';
-
-			if (count($InfoFieldList) >= 3) {
-				$selectkey = $InfoFieldList[2];
-				$keyList = $InfoFieldList[2].' as rowid';
-			}
-
-			$fields_label = explode('|', $InfoFieldList[1]);
-			if (is_array($fields_label)) {
-				$keyList .= ', ';
-				$keyList .= implode(', ', $fields_label);
-			}
-
-			$sql = 'SELECT '.$keyList;
-			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
-			if (strpos($InfoFieldList[4], 'extra') !== false) {
-				$sql .= ' as main';
-			}
-			// $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
-			// $sql.= ' AND entity = '.$conf->entity;
-
-			dol_syslog(get_class($this).':showOutputField:$type=chkbxlst', LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if ($resql) {
-				$value = ''; // value was used, so now we reste it to use it to build final output
-				$toprint = array();
-				while ($obj = $this->db->fetch_object($resql)) {
-					// Several field into label (eq table:code|libelle:rowid)
-					$fields_label = explode('|', $InfoFieldList[1]);
-					if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-						if (is_array($fields_label) && count($fields_label) > 1) {
-							foreach ($fields_label as $field_toshow) {
-								$translabel = '';
-								if (!empty($obj->$field_toshow)) {
-									$translabel = $langs->trans($obj->$field_toshow);
-								}
-								if ($translabel != $field_toshow) {
-									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
-								} else {
-									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
-								}
-							}
-						} else {
-							$translabel = '';
-							if (!empty($obj->{$InfoFieldList[1]})) {
-								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
-							}
-							if ($translabel != $obj->{$InfoFieldList[1]}) {
-								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
-							} else {
-								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
-							}
-						}
-					}
-				}
-				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
-			} else {
-				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
-			}
-		}
-		elseif ($type == 'link')
-		{
-			$out = '';
-
-			// Only if something to display (perf)
-			if ($value)		// If we have -1 here, pb is into insert, not into ouptut (fix insert instead of changing code here to compensate)
-			{
-				$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
-
-				$InfoFieldList = explode(":", $param_list[0]);
-				$classname = $InfoFieldList[0];
-				$classpath = $InfoFieldList[1];
-				if (!empty($classpath))
-				{
-					dol_include_once($InfoFieldList[1]);
-					if ($classname && class_exists($classname))
-					{
-						$object = new $classname($this->db);
-						$object->fetch($value);
-						$value = $object->getNomUrl(3);
-					}
-				}
-				else
-				{
-					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
-					return 'Error bad setup of extrafield';
-				}
-			}
-		}
-		elseif ($type == 'text')
-		{
-			$value = dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'html')
-		{
-			$value = dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'password')
-		{
-			$value = dol_trunc(preg_replace('/./i', '*', $value), 8, 'right', 'UTF-8', 1);
-		}
-		else
-		{
-			$showsize = round($size);
-			if ($showsize > 48) $showsize = 48;
-		}
-
-		//print $type.'-'.$size;
-		$out = $value;
+		$out = $this->attributes[$extrafieldsobjectkey][$key];
 
 		return $out;
 	}
-
-	/**
-	 * Return tag to describe alignement to use for this extrafield
-	 *
-	 * @param   string	$key            		Key of attribute
-	 * @param	string	$extrafieldsobjectkey	If defined, use the new method to get extrafields data
-	 * @return	string							Formated value
-	 */
-	public function getAlignFlag($key, $extrafieldsobjectkey = '')
-	{
-		global $conf, $langs;
-
-		if (!empty($extrafieldsobjectkey)) $type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
-		else $type = $this->attribute_type[$key];
-
-		$align = '';
-
-        if ($type == 'date')
-		{
-			$align = "center";
-		}
-		elseif ($type == 'datetime')
-		{
-			$align = "center";
-		}
-		elseif ($type == 'int')
-		{
-			$align = "right";
-		}
-		elseif ($type == 'price')
-		{
-			$align = "right";
-		}
-		elseif ($type == 'double')
-		{
-			$align = "right";
-		}
-		elseif ($type == 'boolean')
-		{
-			$align = "center";
-		}
-		elseif ($type == 'radio')
-		{
-			$align = "center";
-		}
-		elseif ($type == 'checkbox')
-		{
-			$align = "center";
-		}
-		elseif ($type == 'price')
-		{
-			$align = "right";
-		}
-
-		return $align;
-	}
-
-	/**
-	 * Return HTML string to print separator extrafield
-	 *
-	 * @param   string	$key            Key of attribute
-	 * @param	string	$object			Object
-	 * @param	int		$colspan		Value of colspan to use (it must includes the first column with title)
-	 * @return 	string					HTML code with line for separator
-	 */
-	public function showSeparator($key, $object, $colspan = 2)
-	{
-		global $langs;
-
-		$out = '<tr id="trextrafieldseparator'.$key.'" class="trextrafieldseparator trextrafieldseparator'.$key.'"><td colspan="'.$colspan.'"><strong>';
-		$out .= $langs->trans($this->attributes[$object->table_element]['label'][$key]);
-		$out .= '</strong></td></tr>';
-
-        $extrafield_param = $this->attributes[$object->table_element]['param'][$key];
-        if (!empty($extrafield_param) && is_array($extrafield_param)) {
-            $extrafield_param_list = array_keys($extrafield_param['options']);
-
-            if (count($extrafield_param_list) > 0) {
-                $extrafield_collapse_display_value = intval($extrafield_param_list[0]);
-                if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {
-                	// Set the collapse_display status to cookie in priority or if ignorecollapsesetup is 1, if cookie and ignorecollapsesetup not defined, use the setup.
-                	$collapse_display = ((isset($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key]) || GETPOST('ignorecollapsesetup', 'int')) ? ($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key] ? true : false) : ($extrafield_collapse_display_value == 2 ? false : true));
-                    $extrafields_collapse_num = $this->attributes[$object->table_element]['pos'][$key];
-
-                    $out .= '<!-- Add js script to manage the collpase/uncollapse of extrafields separators '.$key.' -->';
-                    $out .= '<script type="text/javascript">';
-                    $out .= 'jQuery(document).ready(function(){';
-                    if ($collapse_display === false) {
-                        $out .= '   jQuery("#trextrafieldseparator'.$key.' td").prepend("<span class=\"cursorpointer fa fa-plus-square\"></span>&nbsp;");'."\n";
-                        $out .= '   jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").hide();'."\n";
-                    } else {
-                    	$out .= '   jQuery("#trextrafieldseparator'.$key.' td").prepend("<span class=\"cursorpointer fa fa-minus-square\"></span>&nbsp;");'."\n";
-                    	$out .= '   document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
-                    }
-                    $out .= '   jQuery("#trextrafieldseparator'.$key.'").click(function(){'."\n";
-                    $out .= '       jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").toggle(300, function(){'."\n";
-                    $out .= '           if (jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").is(":hidden")) {'."\n";
-                    $out .= '               jQuery("#trextrafieldseparator'.$key.' td span").addClass("fa-plus-square").removeClass("fa-minus-square");'."\n";
-                    $out .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=0; path='.$_SERVER["PHP_SELF"].'"'."\n";
-                    $out .= '           } else {'."\n";
-                    $out .= '               jQuery("#trextrafieldseparator'.$key.' td span").addClass("fa-minus-square").removeClass("fa-plus-square");'."\n";
-                    $out .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
-                    $out .= '           }'."\n";
-                    $out .= '       });';
-                    $out .= '   });';
-                    $out .= '});';
-                    $out .= '</script>';
-                }
-            }
-        }
-
-		return $out;
-	}
-
-	/**
-	 * Fill array_options property of object by extrafields value (using for data sent by forms)
-	 *
-	 * @param   array	$extralabels    Deprecated (old $array of extrafields, now set this to null)
-	 * @param   object	$object         Object
-	 * @param	string	$onlykey		Only the following key is filled. When we make update of only one extrafield ($action = 'update_extras'), calling page must set this to avoid to have other extrafields being reset.
-	 * @return	int						1 if array_options set, 0 if no value, -1 if error (field required missing for example)
-	 */
-	public function setOptionalsFromPost($extralabels, &$object, $onlykey = '')
-	{
-		global $_POST, $langs;
-
-		$nofillrequired = 0; // For error when required field left blank
-		$error_field_required = array();
-
-		if (is_array($this->attributes[$object->table_element]['label'])) $extralabels = $this->attributes[$object->table_element]['label'];
-
-		if (is_array($extralabels))
-		{
-			// Get extra fields
-			foreach ($extralabels as $key => $value)
-			{
-				if (!empty($onlykey) && $key != $onlykey) continue;
-
-				$key_type = $this->attributes[$object->table_element]['type'][$key];
-				if ($key_type == 'separate') continue;
-
-				$enabled = 1;
-				if (isset($this->attributes[$object->table_element]['list'][$key]))
-				{
-					$enabled = dol_eval($this->attributes[$object->table_element]['list'][$key], 1);
-				}
-				$perms = 1;
-				if (isset($this->attributes[$object->table_element]['perms'][$key]))
-				{
-					$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
-				}
-				if (empty($enabled)) continue;
-				if (empty($perms)) continue;
-
-				if ($this->attributes[$object->table_element]['required'][$key])	// Value is required
-				{
-					// Check if empty without using GETPOST, value can be alpha, int, array, etc...
-				    if ((!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] != 'select' && $_POST["options_".$key] != '0')
-				        || (!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] == 'select')
-						|| (is_array($_POST["options_".$key]) && empty($_POST["options_".$key])))
-					{
-						//print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];
-						$nofillrequired++;
-						$error_field_required[] = $langs->transnoentitiesnoconv($value);
-					}
-				}
-
-				if (in_array($key_type, array('date')))
-				{
-					// Clean parameters
-					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
-					$value_key = dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
-				}
-				elseif (in_array($key_type, array('datetime')))
-				{
-					// Clean parameters
-					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
-					$value_key = dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
-				}
-				elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
-				{
-					$value_arr = GETPOST("options_".$key, 'array'); // check if an array
-					if (!empty($value_arr)) {
-						$value_key = implode($value_arr, ',');
-					} else {
-						$value_key = '';
-					}
-				}
-				elseif (in_array($key_type, array('price', 'double')))
-				{
-					$value_arr = GETPOST("options_".$key, 'alpha');
-					$value_key = price2num($value_arr);
-				}
-				else
-				{
-					$value_key = GETPOST("options_".$key);
-					if (in_array($key_type, array('link')) && $value_key == '-1') $value_key = '';
-				}
-
-				$object->array_options["options_".$key] = $value_key;
-			}
-
-			if ($nofillrequired) {
-				$langs->load('errors');
-				setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ', $error_field_required), null, 'errors');
-				return -1;
-			}
-			else {
-				return 1;
-			}
-		}
-		else {
-			return 0;
-		}
-	}
-
-	/**
-	 * return array_options array of data of extrafields value of object sent by a search form
-	 *
-	 * @param  array|string		$extrafieldsobjectkey  	array of extrafields (old usage) or value of object->table_element (new usage)
-	 * @param  string			$keyprefix      		Prefix string to add into name and id of field (can be used to avoid duplicate names)
-	 * @param  string			$keysuffix      		Suffix string to add into name and id of field (can be used to avoid duplicate names)
-	 * @return array|int								array_options set or 0 if no value
-	 */
-	public function getOptionalsFromPost($extrafieldsobjectkey, $keyprefix = '', $keysuffix = '')
-	{
-		global $_POST;
-
-		if (is_string($extrafieldsobjectkey) && is_array($this->attributes[$extrafieldsobjectkey]['label']))
-		{
-			$extralabels = $this->attributes[$extrafieldsobjectkey]['label'];
-		}
-		else
-		{
-			$extralabels = $extrafieldsobjectkey;
-		}
-
-		if (is_array($extralabels))
-		{
-			$array_options = array();
-
-			// Get extra fields
-			foreach ($extralabels as $key => $value)
-			{
-				$key_type = '';
-				if (is_string($extrafieldsobjectkey))
-				{
-					$key_type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
-				}
-
-				if (in_array($key_type, array('date', 'datetime')))
-				{
-					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix."year")) continue; // Value was not provided, we should not set it.
-					// Clean parameters
-					$value_key = dol_mktime(GETPOST($keysuffix."options_".$key.$keyprefix."hour", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."min", 'int'), 0, GETPOST($keysuffix."options_".$key.$keyprefix."month", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."day", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."year", 'int'));
-				}
-				elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
-				{
-					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
-					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
-					// Make sure we get an array even if there's only one checkbox
-					$value_arr = (array) $value_arr;
-					$value_key = implode(',', $value_arr);
-				}
-				elseif (in_array($key_type, array('price', 'double', 'int')))
-				{
-					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
-					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
-					$value_key = price2num($value_arr);
-				}
-				else
-				{
-					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
-					$value_key = GETPOST($keysuffix."options_".$key.$keyprefix);
-				}
-
-				$array_options[$keysuffix."options_".$key] = $value_key; // No keyprefix here. keyprefix is used only for read.
-			}
-
-			return $array_options;
-		}
-
-		return 0;
-	}
 }
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 32abc8f7240..d7e46922f56 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -368,6 +368,8 @@ class Form
 
 				$s = picto_from_langcode($langcode, 'class="pictoforlang paddingright"');
 				$resultforextrlang .= $s;
+
+				// TODO Use the showInputField() method of ExtraLanguages object
 				if ($typeofdata == 'textarea') {
 					$resultforextrlang .= '<textarea name="field-'.$object->element."-".$fieldname."-".$langcode.'" id="'.$fieldname."-".$langcode.'" class="'.$morecss.'" rows="'.ROWS_2.'" wrap="soft">';
 					$resultforextrlang .= $valuetoshow;
diff --git a/htdocs/index.php b/htdocs/index.php
index 2301a841ddc..48e87ee6829 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -689,7 +689,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
                     }
                 }
 
-                $openedDashBoard .= '<div class="box-flex-item">'."\n";
+                $openedDashBoard .= '<div class="box-flex-item"><div class="box-flex-item-with-margin">'."\n";
                 $openedDashBoard .= '	<div class="info-box '.$openedDashBoardSize.'">'."\n";
                 $openedDashBoard .= '		<span class="info-box-icon bg-infobox-'.$groupKeyLowerCase.'">'."\n";
                 $openedDashBoard .= '		<i class="fa fa-dol-'.$groupKeyLowerCase.'"></i>'."\n";
@@ -736,6 +736,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 
                 $openedDashBoard .= '		</div><!-- /.info-box-content -->'."\n";
                 $openedDashBoard .= '	</div><!-- /.info-box -->'."\n";
+                $openedDashBoard .= '</div><!-- /.box-flex-item-with-margin -->'."\n";
                 $openedDashBoard .= '</div><!-- /.box-flex-item -->'."\n";
                 $openedDashBoard .= "\n";
             }
@@ -754,7 +755,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
             }
             $text .= '. '.$langs->transnoentitiesnoconv("LateDesc");
 
-            $weatherDashBoard = '<div class="box-flex-item '.$appendClass.'">'."\n";
+            $weatherDashBoard = '<div class="box-flex-item '.$appendClass.'"><div class="box-flex-item-with-margin">'."\n";
             $weatherDashBoard .= '	<div class="info-box '.$openedDashBoardSize.' info-box-weather info-box-weather-level'.$weather->level.'">'."\n";
             $weatherDashBoard .= '		<span class="info-box-icon">';
             $weatherDashBoard .= img_weather('', $weather->level, '', 0, 'valignmiddle width50');
@@ -778,6 +779,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 
             $weatherDashBoard .= '		</div><!-- /.info-box-content -->'."\n";
             $weatherDashBoard .= '	</div><!-- /.info-box -->'."\n";
+            $weatherDashBoard .= '</div><!-- /.box-flex-item-with-margin -->'."\n";
             $weatherDashBoard .= '</div><!-- /.box-flex-item -->'."\n";
             $weatherDashBoard .= "\n";
 
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 98130f1d03a..ade71d73f39 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -314,8 +314,8 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES
 	display: flex; /* or inline-flex */
 	flex-direction: row;
 	flex-wrap: wrap;
-	width: 100%;
-	margin: 0 0 0 -8px;
+	width: calc(100% + 14px);
+	margin: 0 -8px 0 -8px;
 	/*justify-content: space-between;*/
 }
 
@@ -348,7 +348,8 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES
 @media only screen and (max-width: 767px)
 {
 	.box-flex-container {
-	    margin: 0 0 0 0 !important;
+	    margin: 0 0 0 0px !important;
+	    width: 100% !important;
 	}
 
 	.info-box-module {

From b41ac00b9828e7cc6856c3da3629f7d34882090b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 15:05:19 +0200
Subject: [PATCH 341/490] add new rule

---
 dev/examples/code/create_invoice.php          |   6 +-
 dev/examples/code/create_order.php            |   6 +-
 dev/examples/code/create_product.php          |   6 +-
 dev/examples/code/create_user.php             |   9 +-
 htdocs/accountancy/admin/account.php          |  15 +-
 htdocs/accountancy/admin/accountmodel.php     |  81 +-
 htdocs/accountancy/admin/card.php             |  21 +-
 htdocs/accountancy/admin/categories_list.php  |  90 +--
 htdocs/accountancy/admin/defaultaccounts.php  |   3 +-
 htdocs/accountancy/admin/fiscalyear_card.php  |   4 +-
 htdocs/accountancy/admin/journals_list.php    |  51 +-
 htdocs/accountancy/admin/productaccount.php   |  64 +-
 htdocs/accountancy/bookkeeping/card.php       |  21 +-
 htdocs/accountancy/bookkeeping/list.php       |  36 +-
 .../accountancy/bookkeeping/listbyaccount.php |  24 +-
 .../class/accountancycategory.class.php       |  18 +-
 .../class/accountancyexport.class.php         |  26 +-
 .../class/accountingaccount.class.php         |  18 +-
 .../class/accountingjournal.class.php         |   9 +-
 .../accountancy/class/bookkeeping.class.php   |   6 +-
 htdocs/accountancy/customer/card.php          |   3 +-
 htdocs/accountancy/customer/index.php         |  15 +-
 htdocs/accountancy/customer/list.php          |   6 +-
 htdocs/accountancy/expensereport/card.php     |   3 +-
 htdocs/accountancy/expensereport/index.php    |  12 +-
 htdocs/accountancy/expensereport/list.php     |   3 +-
 htdocs/accountancy/index.php                  |   3 +-
 htdocs/accountancy/journal/bankjournal.php    |  84 +-
 .../journal/expensereportsjournal.php         |  33 +-
 .../accountancy/journal/purchasesjournal.php  |  42 +-
 htdocs/accountancy/journal/sellsjournal.php   |  36 +-
 htdocs/accountancy/supplier/card.php          |   3 +-
 htdocs/accountancy/supplier/index.php         |  15 +-
 htdocs/accountancy/supplier/list.php          |   6 +-
 htdocs/accountancy/tpl/export_journal.tpl.php |   3 +-
 htdocs/api/admin/index.php                    |  12 +-
 htdocs/api/class/api.class.php                |   6 +-
 htdocs/api/class/api_access.class.php         |   6 +-
 htdocs/api/class/api_login.class.php          |   3 +-
 htdocs/api/class/api_setup.class.php          |  36 +-
 htdocs/api/index.php                          |   6 +-
 htdocs/asset/admin/setup.php                  |   3 +-
 htdocs/asset/card.php                         |   6 +-
 htdocs/asset/class/asset.class.php            |  21 +-
 htdocs/asset/class/asset_type.class.php       |  27 +-
 htdocs/asset/document.php                     |   3 +-
 htdocs/asset/list.php                         |   6 +-
 htdocs/asset/type.php                         |  24 +-
 htdocs/barcode/codeinit.php                   |  30 +-
 htdocs/barcode/printsheet.php                 |   3 +-
 htdocs/blockedlog/admin/blockedlog.php        |   6 +-
 htdocs/blockedlog/admin/blockedlog_list.php   |  24 +-
 htdocs/blockedlog/ajax/authority.php          |   9 +-
 htdocs/blockedlog/ajax/block-info.php         |  12 +-
 htdocs/blockedlog/class/authority.class.php   |  21 +-
 htdocs/blockedlog/class/blockedlog.class.php  | 129 +--
 htdocs/bom/bom_agenda.php                     |   6 +-
 htdocs/bom/bom_card.php                       |  15 +-
 htdocs/bom/bom_document.php                   |   3 +-
 htdocs/bom/bom_list.php                       |  24 +-
 htdocs/bom/class/api_boms.class.php           |   6 +-
 htdocs/bom/class/bom.class.php                |  45 +-
 htdocs/bom/tpl/objectline_create.tpl.php      |   3 +-
 htdocs/bookmarks/admin/bookmark.php           |   3 +-
 htdocs/bookmarks/bookmarks.lib.php            |   6 +-
 htdocs/bookmarks/card.php                     |  18 +-
 htdocs/bookmarks/class/bookmark.class.php     |  18 +-
 htdocs/bookmarks/list.php                     |  12 +-
 htdocs/cashdesk/admin/cashdesk.php            |   9 +-
 htdocs/cashdesk/affContenu.php                |   6 +-
 htdocs/cashdesk/class/Auth.class.php          |   3 +-
 htdocs/cashdesk/class/Facturation.class.php   |  36 +-
 htdocs/cashdesk/facturation.php               |  15 +-
 htdocs/cashdesk/facturation_dhtml.php         |   6 +-
 htdocs/cashdesk/facturation_verif.php         |  24 +-
 htdocs/cashdesk/index.php                     |   9 +-
 htdocs/cashdesk/index_verif.php               |   6 +-
 htdocs/cashdesk/tpl/facturation1.tpl.php      |   9 +-
 htdocs/cashdesk/tpl/validation1.tpl.php       |   3 +-
 htdocs/cashdesk/validation_verif.php          |  18 +-
 htdocs/categories/admin/categorie.php         |  12 +-
 htdocs/categories/card.php                    |  45 +-
 .../categories/class/api_categories.class.php |   6 +-
 htdocs/categories/class/categorie.class.php   | 114 +--
 htdocs/categories/edit.php                    |   6 +-
 htdocs/categories/index.php                   |   6 +-
 htdocs/categories/photos.php                  |   9 +-
 htdocs/categories/traduction.php              |   3 +-
 htdocs/categories/viewcat.php                 |  93 +--
 htdocs/collab/index.php                       |   9 +-
 htdocs/comm/action/card.php                   |  72 +-
 htdocs/comm/action/class/actioncomm.class.php |  72 +-
 .../action/class/actioncommreminder.class.php |  15 +-
 .../action/class/api_agendaevents.class.php   |   3 +-
 .../comm/action/class/cactioncomm.class.php   |   9 +-
 htdocs/comm/action/class/ical.class.php       |  12 +-
 htdocs/comm/action/document.php               |   6 +-
 htdocs/comm/action/index.php                  | 136 ++--
 htdocs/comm/action/list.php                   |  33 +-
 htdocs/comm/action/pertype.php                |  45 +-
 htdocs/comm/action/peruser.php                |  51 +-
 htdocs/comm/action/rapport/index.php          |   6 +-
 htdocs/comm/card.php                          |  57 +-
 htdocs/comm/contact.php                       |   3 +-
 htdocs/comm/index.php                         |  66 +-
 htdocs/comm/mailing/advtargetemailing.php     |   3 +-
 htdocs/comm/mailing/card.php                  | 114 +--
 htdocs/comm/mailing/cibles.php                |  54 +-
 .../mailing/class/advtargetemailing.class.php |  21 +-
 .../html.formadvtargetemailing.class.php      |   6 +-
 htdocs/comm/mailing/class/mailing.class.php   |  39 +-
 htdocs/comm/mailing/index.php                 |   9 +-
 htdocs/comm/mailing/list.php                  |   9 +-
 htdocs/comm/multiprix.php                     |   3 +-
 htdocs/comm/propal/card.php                   |  75 +-
 .../comm/propal/class/api_proposals.class.php |   9 +-
 htdocs/comm/propal/class/propal.class.php     | 216 ++---
 htdocs/comm/propal/contact.php                |  15 +-
 htdocs/comm/propal/document.php               |   3 +-
 htdocs/comm/propal/index.php                  |  15 +-
 htdocs/comm/propal/list.php                   |  18 +-
 htdocs/comm/propal/stats/index.php            |  12 +-
 htdocs/comm/prospect/index.php                |   3 +-
 htdocs/comm/prospect/recap-prospect.php       |   3 +-
 htdocs/comm/recap-client.php                  |   3 +-
 htdocs/comm/remise.php                        |  18 +-
 htdocs/comm/remx.php                          |  90 +--
 htdocs/commande/card.php                      | 128 +--
 htdocs/commande/class/api_orders.class.php    |   8 +-
 htdocs/commande/class/commande.class.php      | 237 ++----
 htdocs/commande/class/commandestats.class.php |   3 +-
 htdocs/commande/contact.php                   |  15 +-
 htdocs/commande/customer.php                  |   3 +-
 htdocs/commande/document.php                  |   6 +-
 htdocs/commande/index.php                     |  15 +-
 htdocs/commande/list.php                      |  12 +-
 htdocs/commande/orderstoinvoice.php           |  27 +-
 htdocs/commande/stats/index.php               |  12 +-
 htdocs/compta/accounting-files.php            |  15 +-
 .../bank/account_statement_document.php       |   6 +-
 htdocs/compta/bank/annuel.php                 |  30 +-
 htdocs/compta/bank/bankentries_list.php       | 120 +--
 htdocs/compta/bank/budget.php                 |   3 +-
 htdocs/compta/bank/card.php                   |  33 +-
 htdocs/compta/bank/categ.php                  |   3 +-
 htdocs/compta/bank/class/account.class.php    | 103 +--
 .../bank/class/api_bankaccounts.class.php     |   9 +-
 .../bank/class/paymentvarious.class.php       |  45 +-
 htdocs/compta/bank/document.php               |   6 +-
 htdocs/compta/bank/graph.php                  |  54 +-
 htdocs/compta/bank/line.php                   | 102 +--
 htdocs/compta/bank/list.php                   |   9 +-
 htdocs/compta/bank/releve.php                 |  69 +-
 htdocs/compta/bank/transfer.php               |   9 +-
 htdocs/compta/bank/treso.php                  |  12 +-
 htdocs/compta/bank/various_payment/card.php   |  27 +-
 .../compta/bank/various_payment/document.php  |   3 +-
 htdocs/compta/bank/various_payment/list.php   |   9 +-
 .../compta/cashcontrol/cashcontrol_card.php   |  51 +-
 .../compta/cashcontrol/cashcontrol_list.php   |   3 +-
 .../cashcontrol/class/cashcontrol.class.php   |   3 +-
 htdocs/compta/cashcontrol/report.php          |   9 +-
 htdocs/compta/charges/index.php               |  33 +-
 htdocs/compta/clients.php                     |   3 +-
 htdocs/compta/deplacement/card.php            |  63 +-
 .../deplacement/class/deplacement.class.php   |  36 +-
 htdocs/compta/deplacement/document.php        |   3 +-
 htdocs/compta/deplacement/index.php           |   6 +-
 htdocs/compta/deplacement/list.php            |   3 +-
 htdocs/compta/deplacement/stats/index.php     |   6 +-
 htdocs/compta/facture/card-rec.php            | 103 +--
 htdocs/compta/facture/card.php                | 231 ++----
 .../facture/class/api_invoices.class.php      |  21 +-
 .../facture/class/facture-rec.class.php       | 159 ++--
 htdocs/compta/facture/class/facture.class.php | 246 ++----
 .../facture/class/paymentterm.class.php       |  18 +-
 htdocs/compta/facture/contact.php             |  15 +-
 htdocs/compta/facture/document.php            |   6 +-
 .../compta/facture/invoicetemplate_list.php   |  18 +-
 htdocs/compta/facture/list.php                |  33 +-
 htdocs/compta/facture/prelevement.php         |  51 +-
 htdocs/compta/facture/stats/index.php         |   6 +-
 .../facture/tpl/linkedobjectblock.tpl.php     |   3 +-
 htdocs/compta/index.php                       |  51 +-
 htdocs/compta/journal/purchasesjournal.php    |   6 +-
 htdocs/compta/journal/sellsjournal.php        |   9 +-
 htdocs/compta/localtax/card.php               |  15 +-
 .../compta/localtax/class/localtax.class.php  |  45 +-
 htdocs/compta/localtax/clients.php            |  18 +-
 htdocs/compta/localtax/index.php              |  15 +-
 htdocs/compta/localtax/list.php               |   3 +-
 htdocs/compta/localtax/quadri_detail.php      |  21 +-
 htdocs/compta/paiement.php                    |  24 +-
 htdocs/compta/paiement/card.php               |  24 +-
 htdocs/compta/paiement/cheque/card.php        |  60 +-
 .../cheque/class/remisecheque.class.php       |  78 +-
 htdocs/compta/paiement/cheque/index.php       |   6 +-
 htdocs/compta/paiement/cheque/list.php        |   6 +-
 .../compta/paiement/class/paiement.class.php  |  69 +-
 htdocs/compta/paiement/list.php               |   6 +-
 htdocs/compta/paiement/rapport.php            |   3 +-
 htdocs/compta/paiement/tovalidate.php         |   3 +-
 htdocs/compta/paiement_charge.php             |   9 +-
 htdocs/compta/payment_sc/card.php             |   9 +-
 htdocs/compta/paymentbybanktransfer/index.php |   9 +-
 htdocs/compta/prelevement/bons.php            |   3 +-
 htdocs/compta/prelevement/card.php            |   6 +-
 .../class/bonprelevement.class.php            | 123 +--
 .../class/ligneprelevement.class.php          |  15 +-
 .../class/rejetprelevement.class.php          |  24 +-
 htdocs/compta/prelevement/create.php          |  21 +-
 htdocs/compta/prelevement/demandes.php        |   6 +-
 htdocs/compta/prelevement/factures.php        |  12 +-
 htdocs/compta/prelevement/fiche-rejet.php     |   9 +-
 htdocs/compta/prelevement/fiche-stat.php      |   6 +-
 htdocs/compta/prelevement/index.php           |   9 +-
 htdocs/compta/prelevement/line.php            |  28 +-
 htdocs/compta/prelevement/list.php            |   3 +-
 htdocs/compta/prelevement/rejets.php          |   3 +-
 htdocs/compta/prelevement/stats.php           |   6 +-
 htdocs/compta/recap-compta.php                |   9 +-
 htdocs/compta/resultat/clientfourn.php        |  75 +-
 htdocs/compta/resultat/index.php              |  87 +--
 htdocs/compta/resultat/result.php             |  15 +-
 htdocs/compta/sociales/card.php               |  60 +-
 .../sociales/class/cchargesociales.class.php  |  15 +-
 .../sociales/class/chargesociales.class.php   |  30 +-
 .../class/paymentsocialcontribution.class.php |  30 +-
 htdocs/compta/sociales/document.php           |   3 +-
 htdocs/compta/sociales/list.php               |  12 +-
 htdocs/compta/sociales/payments.php           |  24 +-
 htdocs/compta/stats/byratecountry.php         |  12 +-
 htdocs/compta/stats/cabyprodserv.php          |  18 +-
 htdocs/compta/stats/cabyuser.php              |  21 +-
 htdocs/compta/stats/casoc.php                 |  24 +-
 htdocs/compta/stats/index.php                 |  51 +-
 htdocs/compta/stats/supplier_turnover.php     |  48 +-
 .../stats/supplier_turnover_by_prodserv.php   |  18 +-
 .../stats/supplier_turnover_by_thirdparty.php |  24 +-
 htdocs/compta/tva/card.php                    |  18 +-
 htdocs/compta/tva/class/tva.class.php         |  54 +-
 htdocs/compta/tva/clients.php                 |  18 +-
 htdocs/compta/tva/document.php                |   3 +-
 htdocs/compta/tva/index.php                   |  21 +-
 htdocs/compta/tva/list.php                    |  12 +-
 htdocs/compta/tva/quadri_detail.php           |  24 +-
 htdocs/contact/agenda.php                     |   6 +-
 .../actions_contactcard_common.class.php      |  12 +-
 .../actions_contactcard_default.class.php     |   3 +-
 htdocs/contact/card.php                       |  84 +-
 htdocs/contact/class/contact.class.php        |  63 +-
 htdocs/contact/consumption.php                |  33 +-
 htdocs/contact/ldap.php                       |  15 +-
 htdocs/contact/list.php                       |  24 +-
 htdocs/contact/perso.php                      |  24 +-
 htdocs/contrat/agenda.php                     |   3 +-
 htdocs/contrat/card.php                       | 173 ++---
 htdocs/contrat/class/api_contracts.class.php  |   9 +-
 htdocs/contrat/class/contrat.class.php        | 150 ++--
 htdocs/contrat/contact.php                    |   6 +-
 htdocs/contrat/document.php                   |   3 +-
 htdocs/contrat/index.php                      |  33 +-
 htdocs/contrat/list.php                       |   6 +-
 htdocs/contrat/services_list.php              |  12 +-
 htdocs/core/actions_addupdatedelete.inc.php   |  52 +-
 htdocs/core/actions_builddoc.inc.php          |   9 +-
 htdocs/core/actions_comments.inc.php          |   9 +-
 htdocs/core/actions_extrafields.inc.php       |  36 +-
 htdocs/core/actions_fetchobject.inc.php       |   6 +-
 htdocs/core/actions_linkedfiles.inc.php       |  36 +-
 htdocs/core/actions_massactions.inc.php       | 123 +--
 htdocs/core/actions_printing.inc.php          |   3 +-
 htdocs/core/actions_sendmails.inc.php         |  57 +-
 htdocs/core/actions_setmoduleoptions.inc.php  |   6 +-
 htdocs/core/ajax/ajaxdirpreview.php           |  24 +-
 htdocs/core/ajax/ajaxdirtree.php              |  15 +-
 htdocs/core/ajax/check_notifications.php      |   6 +-
 htdocs/core/ajax/constantonoff.php            |   3 +-
 htdocs/core/ajax/extraparams.php              |  13 +-
 htdocs/core/ajax/loadinplace.php              |  12 +-
 htdocs/core/ajax/objectonoff.php              |   6 +-
 htdocs/core/ajax/pingresult.php               |   3 +-
 htdocs/core/ajax/price.php                    |   3 +-
 htdocs/core/ajax/saveinplace.php              |  27 +-
 htdocs/core/ajax/selectsearchbox.php          |   3 +-
 htdocs/core/ajax/vatrates.php                 |   3 +-
 htdocs/core/ajax/ziptown.php                  |   6 +-
 htdocs/core/boxes/box_actions.php             |   3 +-
 htdocs/core/boxes/box_activity.php            |   3 +-
 htdocs/core/boxes/box_birthdays.php           |   6 +-
 htdocs/core/boxes/box_birthdays_members.php   |   6 +-
 htdocs/core/boxes/box_bookmarks.php           |   3 +-
 htdocs/core/boxes/box_clients.php             |   6 +-
 htdocs/core/boxes/box_external_rss.php        |   3 +-
 htdocs/core/boxes/box_factures_imp.php        |   6 +-
 htdocs/core/boxes/box_ficheinter.php          |   6 +-
 htdocs/core/boxes/box_goodcustomers.php       |   6 +-
 .../boxes/box_graph_invoices_permonth.php     |  15 +-
 .../box_graph_invoices_supplier_permonth.php  |  15 +-
 .../core/boxes/box_graph_orders_permonth.php  |  15 +-
 .../box_graph_orders_supplier_permonth.php    |  15 +-
 .../boxes/box_graph_product_distribution.php  |   6 +-
 .../boxes/box_graph_propales_permonth.php     |  15 +-
 htdocs/core/boxes/box_produits.php            |   6 +-
 .../core/boxes/box_produits_alerte_stock.php  |  12 +-
 htdocs/core/boxes/box_services_contracts.php  |   9 +-
 htdocs/core/boxes/box_services_expired.php    |   6 +-
 htdocs/core/boxes/box_supplier_orders.php     |   3 +-
 ...box_supplier_orders_awaiting_reception.php |   3 +-
 htdocs/core/boxes/box_task.php                |   9 +-
 htdocs/core/boxes/modules_boxes.php           |  12 +-
 htdocs/core/class/CMailFile.class.php         |  69 +-
 htdocs/core/class/CSMSFile.class.php          |  18 +-
 htdocs/core/class/ccountry.class.php          |  15 +-
 htdocs/core/class/comment.class.php           |   9 +-
 .../core/class/commondocgenerator.class.php   |  36 +-
 htdocs/core/class/commoninvoice.class.php     |  66 +-
 htdocs/core/class/commonobject.class.php      | 735 ++++++------------
 htdocs/core/class/commonobjectline.class.php  |   3 +-
 .../class/commonstickergenerator.class.php    |   3 +-
 htdocs/core/class/conf.class.php              |   6 +-
 htdocs/core/class/coreobject.class.php        |  36 +-
 htdocs/core/class/cstate.class.php            |   9 +-
 htdocs/core/class/ctypent.class.php           |  12 +-
 htdocs/core/class/cunits.class.php            |  24 +-
 htdocs/core/class/discount.class.php          |  63 +-
 htdocs/core/class/dolgeoip.class.php          |  39 +-
 htdocs/core/class/dolgraph.class.php          |  27 +-
 .../core/class/emailsenderprofile.class.php   |  18 +-
 htdocs/core/class/events.class.php            |   6 +-
 htdocs/core/class/extrafields.class.php       | 264 +++----
 htdocs/core/class/fileupload.class.php        |  42 +-
 htdocs/core/class/fiscalyear.class.php        |  39 +-
 htdocs/core/class/html.form.class.php         | 605 +++++---------
 .../core/class/html.formaccounting.class.php  |  18 +-
 htdocs/core/class/html.formactions.class.php  |  18 +-
 htdocs/core/class/html.formadmin.class.php    |  12 +-
 htdocs/core/class/html.formbarcode.class.php  |   3 +-
 htdocs/core/class/html.formcompany.class.php  |  57 +-
 htdocs/core/class/html.formcontract.class.php |  12 +-
 htdocs/core/class/html.formfile.class.php     | 195 ++---
 .../class/html.formintervention.class.php     |  12 +-
 htdocs/core/class/html.formmail.class.php     |  84 +-
 htdocs/core/class/html.formmargin.class.php   |  12 +-
 htdocs/core/class/html.formother.class.php    |  72 +-
 htdocs/core/class/html.formprojet.class.php   |  57 +-
 htdocs/core/class/html.formpropal.class.php   |   9 +-
 htdocs/core/class/html.formsms.class.php      |  33 +-
 .../class/html.formsocialcontrib.class.php    |   9 +-
 htdocs/core/class/html.formwebsite.class.php  |  24 +-
 htdocs/core/class/infobox.class.php           |  21 +-
 htdocs/core/class/interfaces.class.php        |  27 +-
 htdocs/core/class/ldap.class.php              |  99 +--
 htdocs/core/class/lessc.class.php             |   3 +-
 htdocs/core/class/link.class.php              |  18 +-
 htdocs/core/class/menubase.class.php          |  27 +-
 htdocs/core/class/notify.class.php            |  36 +-
 htdocs/core/class/openid.class.php            |  12 +-
 htdocs/core/class/rssparser.class.php         | 115 +--
 htdocs/core/class/smtps.class.php             |  24 +-
 htdocs/core/class/stats.class.php             |  39 +-
 htdocs/core/class/translate.class.php         |  48 +-
 htdocs/core/class/utils.class.php             |  51 +-
 htdocs/core/commonfieldsinexport.inc.php      |   3 +-
 htdocs/core/customreports.php                 |  39 +-
 htdocs/core/datepicker.php                    |  18 +-
 htdocs/core/db/DoliDB.class.php               |  15 +-
 htdocs/core/db/mssql.class.php                |  60 +-
 htdocs/core/db/mysqli.class.php               |  33 +-
 htdocs/core/db/pgsql.class.php                |  33 +-
 htdocs/core/db/sqlite3.class.php              |  39 +-
 .../filemanagerdol/connectors/php/basexml.php |   3 +-
 .../connectors/php/commands.php               |  21 +-
 .../core/filemanagerdol/connectors/php/io.php |   9 +-
 .../filemanagerdol/connectors/php/util.php    |   6 +-
 htdocs/core/get_info.php                      |  12 +-
 htdocs/core/get_menudiv.php                   |   3 +-
 htdocs/core/lib/admin.lib.php                 |  90 +--
 htdocs/core/lib/agenda.lib.php                |   6 +-
 htdocs/core/lib/ajax.lib.php                  |   3 +-
 htdocs/core/lib/barcode.lib.php               |  18 +-
 htdocs/core/lib/company.lib.php               | 110 +--
 htdocs/core/lib/cron.lib.php                  |   3 +-
 htdocs/core/lib/date.lib.php                  |  66 +-
 htdocs/core/lib/doc.lib.php                   |  18 +-
 htdocs/core/lib/doleditor.lib.php             |   3 +-
 htdocs/core/lib/ecm.lib.php                   |   3 +-
 htdocs/core/lib/files.lib.php                 | 182 ++---
 htdocs/core/lib/format_cards.lib.php          |   3 +-
 htdocs/core/lib/functions.lib.php             | 721 ++++++-----------
 htdocs/core/lib/functions2.lib.php            | 252 ++----
 htdocs/core/lib/functionsnumtoword.lib.php    |  18 +-
 htdocs/core/lib/geturl.lib.php                |  24 +-
 htdocs/core/lib/images.lib.php                |  45 +-
 htdocs/core/lib/invoice.lib.php               |   3 +-
 htdocs/core/lib/invoice2.lib.php              |   9 +-
 htdocs/core/lib/json.lib.php                  |  12 +-
 htdocs/core/lib/ldap.lib.php                  |  12 +-
 htdocs/core/lib/memory.lib.php                |  24 +-
 htdocs/core/lib/modulebuilder.lib.php         |  12 +-
 htdocs/core/lib/parsemd.lib.php               |   3 +-
 htdocs/core/lib/payments.lib.php              |  12 +-
 htdocs/core/lib/pdf.lib.php                   |  99 +--
 htdocs/core/lib/price.lib.php                 |  18 +-
 htdocs/core/lib/product.lib.php               |   9 +-
 htdocs/core/lib/project.lib.php               |  63 +-
 htdocs/core/lib/security.lib.php              | 117 +--
 htdocs/core/lib/security2.lib.php             |  36 +-
 htdocs/core/lib/sendings.lib.php              |  12 +-
 htdocs/core/lib/signature.lib.php             |   3 +-
 htdocs/core/lib/tax.lib.php                   |  66 +-
 htdocs/core/lib/ticket.lib.php                |  69 +-
 htdocs/core/lib/treeview.lib.php              |  12 +-
 htdocs/core/lib/usergroups.lib.php            | 117 +--
 htdocs/core/lib/website.lib.php               |  69 +-
 htdocs/core/lib/website2.lib.php              |   6 +-
 htdocs/core/lib/ws.lib.php                    |   3 +-
 htdocs/core/lib/xcal.lib.php                  |   9 +-
 htdocs/core/login/functions_dolibarr.php      |   9 +-
 htdocs/core/login/functions_ldap.php          |   6 +-
 htdocs/core/login/functions_openid.php        |  12 +-
 htdocs/core/menus/standard/auguria.lib.php    |  24 +-
 htdocs/core/menus/standard/auguria_menu.php   |  30 +-
 htdocs/core/menus/standard/eldy.lib.php       |  33 +-
 htdocs/core/menus/standard/eldy_menu.php      |  30 +-
 htdocs/core/menus/standard/empty.php          |  27 +-
 htdocs/core/modules/DolibarrModules.class.php | 102 +--
 htdocs/core/modules/action/modules_action.php |   9 +-
 .../core/modules/bank/doc/pdf_ban.modules.php |  18 +-
 .../bank/doc/pdf_sepamandate.modules.php      |  21 +-
 .../barcode/mod_barcode_product_standard.php  |  21 +-
 .../bom/doc/doc_generic_bom_odt.modules.php   |  39 +-
 htdocs/core/modules/bom/mod_bom_standard.php  |   3 +-
 .../modules/cheque/mod_chequereceipt_mint.php |   3 +-
 .../modules/cheque/modules_chequereceipts.php |   9 +-
 .../doc/doc_generic_order_odt.modules.php     |  39 +-
 .../commande/doc/pdf_einstein.modules.php     |  39 +-
 .../commande/doc/pdf_eratosthene.modules.php  |  60 +-
 .../modules/commande/mod_commande_marbre.php  |   3 +-
 .../doc/doc_generic_contract_odt.modules.php  |  39 +-
 .../contract/doc/pdf_strato.modules.php       |  30 +-
 .../modules/contract/mod_contract_olive.php   |   3 +-
 .../modules/contract/mod_contract_serpis.php  |   3 +-
 .../modules/dons/html_cerfafr.modules.php     |  75 +-
 .../doc/doc_generic_shipment_odt.modules.php  |  60 +-
 .../expedition/doc/pdf_espadon.modules.php    |  51 +-
 .../expedition/doc/pdf_merou.modules.php      |  30 +-
 .../expedition/doc/pdf_rouget.modules.php     |  45 +-
 .../expedition/mod_expedition_safor.php       |   3 +-
 .../doc/pdf_standard.modules.php              |  39 +-
 .../expensereport/mod_expensereport_jade.php  |   3 +-
 .../modules/export/export_csv.modules.php     |   6 +-
 .../export/export_excel2007new.modules.php    |  15 +-
 .../doc/doc_generic_invoice_odt.modules.php   |  36 +-
 .../modules/facture/doc/pdf_crabe.modules.php |  45 +-
 .../facture/doc/pdf_sponge.modules.php        |  78 +-
 .../core/modules/facture/mod_facture_mars.php |  12 +-
 .../modules/facture/mod_facture_mercure.php   |   3 +-
 .../modules/facture/mod_facture_terre.php     |  12 +-
 .../fichinter/doc/pdf_soleil.modules.php      |  30 +-
 htdocs/core/modules/fichinter/mod_pacific.php |   3 +-
 .../modules/fichinter/modules_fichinter.php   |   9 +-
 .../modules/holiday/mod_holiday_madonna.php   |   3 +-
 .../modules/import/import_csv.modules.php     |  87 +--
 .../modules/import/import_xlsx.modules.php    |  75 +-
 .../livraison/doc/pdf_typhon.modules.php      |  33 +-
 .../modules/livraison/mod_livraison_jade.php  |   3 +-
 .../mailings/advthirdparties.modules.php      |   9 +-
 .../modules/mailings/contacts1.modules.php    |  30 +-
 .../core/modules/mailings/fraise.modules.php  |   9 +-
 .../modules/mailings/modules_mailings.php     |   9 +-
 .../core/modules/mailings/pomme.modules.php   |   3 +-
 .../modules/mailings/thirdparties.modules.php |  24 +-
 .../thirdparties_services_expired.modules.php |   6 +-
 .../modules/mailings/xinputfile.modules.php   |  15 +-
 .../modules/mailings/xinputuser.modules.php   |   6 +-
 .../modules/member/doc/pdf_standard.class.php |  27 +-
 htdocs/core/modules/member/modules_cards.php  |  16 +-
 htdocs/core/modules/modAgenda.class.php       |   3 +-
 htdocs/core/modules/modBlockedLog.class.php   |   3 +-
 .../mrp/doc/doc_generic_mo_odt.modules.php    |  39 +-
 htdocs/core/modules/mrp/mod_mo_standard.php   |   3 +-
 .../modules/oauth/github_oauthcallback.php    |   6 +-
 .../modules/oauth/google_oauthcallback.php    |   6 +-
 .../oauth/stripelive_oauthcallback.php        |   6 +-
 .../oauth/stripetest_oauthcallback.php        |   6 +-
 .../modules/payment/mod_payment_cicada.php    |   3 +-
 .../modules/printing/printgcp.modules.php     |  18 +-
 .../modules/printing/printipp.modules.php     |   6 +-
 .../doc/pdf_standardlabel.class.php           |  18 +-
 .../printsheet/doc/pdf_tcpdflabel.class.php   |  27 +-
 .../modules/printsheet/modules_labels.php     |  15 +-
 .../doc/doc_generic_product_odt.modules.php   |  36 +-
 .../product/doc/pdf_standard.modules.php      |  18 +-
 .../product/mod_codeproduct_elephant.php      |  18 +-
 .../product/mod_codeproduct_leopard.php       |   3 +-
 .../modules/product/modules_product.class.php |   9 +-
 .../doc/doc_generic_project_odt.modules.php   |  69 +-
 .../project/doc/pdf_baleine.modules.php       |  27 +-
 .../project/doc/pdf_beluga.modules.php        |  27 +-
 .../project/doc/pdf_timespent.modules.php     |  27 +-
 .../modules/project/mod_project_simple.php    |   6 +-
 .../task/doc/doc_generic_task_odt.modules.php |  48 +-
 .../modules/project/task/mod_task_simple.php  |   6 +-
 .../doc/doc_generic_proposal_odt.modules.php  |  39 +-
 .../modules/propale/doc/pdf_azur.modules.php  |  54 +-
 .../modules/propale/doc/pdf_cyan.modules.php  |  66 +-
 .../modules/propale/mod_propale_marbre.php    |   6 +-
 .../modules/rapport/pdf_paiement.class.php    |   3 +-
 .../doc/doc_generic_reception_odt.modules.php |  30 +-
 .../reception/doc/pdf_squille.modules.php     |  42 +-
 .../modules/reception/mod_reception_beryl.php |   3 +-
 .../societe/doc/doc_generic_odt.modules.php   |  30 +-
 .../societe/mod_codeclient_elephant.php       |  18 +-
 .../societe/mod_codeclient_leopard.php        |   3 +-
 .../modules/societe/mod_codeclient_monkey.php |  27 +-
 .../societe/mod_codecompta_aquarium.php       |  15 +-
 .../societe/mod_codecompta_digitaria.php      |  21 +-
 .../modules/societe/modules_societe.class.php |   3 +-
 .../doc/doc_generic_stock_odt.modules.php     |  36 +-
 .../stock/doc/pdf_standard.modules.php        |  45 +-
 .../stock/doc/pdf_stdmovement.modules.php     |  48 +-
 .../doc/pdf_canelle.modules.php               |  33 +-
 .../mod_facture_fournisseur_cactus.php        |  12 +-
 .../mod_facture_fournisseur_tulip.php         |   3 +-
 ...doc_generic_supplier_order_odt.modules.php |  42 +-
 .../supplier_order/doc/pdf_cornas.modules.php |  54 +-
 .../doc/pdf_muscadet.modules.php              |  42 +-
 .../mod_commande_fournisseur_muguet.php       |   3 +-
 .../doc/pdf_standard.modules.php              |  30 +-
 .../mod_supplier_payment_bronan.php           |   3 +-
 ..._generic_supplier_proposal_odt.modules.php |  42 +-
 .../doc/pdf_aurore.modules.php                |  45 +-
 .../mod_supplier_proposal_marbre.php          |   6 +-
 .../core/modules/syslog/mod_syslog_file.php   |   6 +-
 .../core/modules/syslog/mod_syslog_syslog.php |   6 +-
 .../takepos/mod_takepos_ref_simple.php        |   9 +-
 .../user/doc/doc_generic_user_odt.modules.php |  24 +-
 .../doc/doc_generic_usergroup_odt.modules.php |  36 +-
 htdocs/core/photos_resize.php                 |  84 +-
 htdocs/core/search.php                        |   3 +-
 htdocs/core/search_page.php                   |   6 +-
 .../core/tpl/admin_extrafields_edit.tpl.php   |   6 +-
 .../core/tpl/admin_extrafields_view.tpl.php   |   6 +-
 htdocs/core/tpl/bloc_comment.tpl.php          |   6 +-
 htdocs/core/tpl/card_presend.tpl.php          |  18 +-
 htdocs/core/tpl/commonfields_view.tpl.php     |   3 +-
 htdocs/core/tpl/contacts.tpl.php              |  29 +-
 .../tpl/extrafields_list_print_fields.tpl.php |   3 +-
 .../tpl/extrafields_list_search_input.tpl.php |   6 +-
 .../tpl/extrafields_list_search_sql.tpl.php   |   6 +-
 .../tpl/extrafields_list_search_title.tpl.php |   3 +-
 htdocs/core/tpl/extrafields_view.tpl.php      |   9 +-
 htdocs/core/tpl/filemanager.tpl.php           |   9 +-
 htdocs/core/tpl/list_print_total.tpl.php      |   3 +-
 htdocs/core/tpl/login.tpl.php                 |   6 +-
 htdocs/core/tpl/massactions_pre.tpl.php       |   6 +-
 htdocs/core/tpl/notes.tpl.php                 |  12 +-
 htdocs/core/tpl/object_discounts.tpl.php      |   3 +-
 htdocs/core/tpl/objectline_create.tpl.php     |  42 +-
 htdocs/core/tpl/objectline_edit.tpl.php       |   3 +-
 htdocs/core/tpl/objectline_view.tpl.php       |  27 +-
 htdocs/core/tpl/passwordforgotten.tpl.php     |   6 +-
 htdocs/core/tpl/resource_view.tpl.php         |   6 +-
 .../interface_20_all_Logevents.class.php      |  21 +-
 ...terface_50_modAgenda_ActionsAuto.class.php | 180 ++---
 ..._modBlockedlog_ActionsBlockedLog.class.php |   9 +-
 ...interface_50_modLdap_Ldapsynchro.class.php |  54 +-
 ...odMailmanspip_Mailmanspipsynchro.class.php |  27 +-
 ..._50_modNotification_Notification.class.php |   3 +-
 ...terface_50_modTicket_TicketEmail.class.php |   3 +-
 .../interface_80_modStripe_Stripe.class.php   |  12 +-
 htdocs/core/website.inc.php                   |   3 +-
 htdocs/cron/admin/cron.php                    |   6 +-
 htdocs/cron/card.php                          |  72 +-
 htdocs/cron/class/cronjob.class.php           |  45 +-
 htdocs/cron/list.php                          |  18 +-
 .../datapolicy/class/datapolicycron.class.php |   6 +-
 htdocs/dav/dav.class.php                      |  18 +-
 .../class/DataCollector/DolLogsCollector.php  |   3 +-
 htdocs/don/admin/donation.php                 |  37 +-
 htdocs/don/card.php                           |  36 +-
 htdocs/don/class/api_donations.class.php      |   6 +-
 htdocs/don/class/don.class.php                |  57 +-
 htdocs/don/class/paymentdonation.class.php    |  27 +-
 htdocs/don/document.php                       |   3 +-
 htdocs/don/index.php                          |   3 +-
 htdocs/don/list.php                           |   6 +-
 htdocs/don/payment/card.php                   |  12 +-
 htdocs/don/payment/payment.php                |   6 +-
 htdocs/don/stats/index.php                    |   6 +-
 htdocs/ecm/ajax/ecmdatabase.php               |  12 +-
 htdocs/ecm/class/ecmdirectory.class.php       |  51 +-
 htdocs/ecm/class/ecmfiles.class.php           |  27 +-
 htdocs/ecm/class/htmlecm.form.class.php       |   6 +-
 htdocs/ecm/dir_add_card.php                   |  18 +-
 htdocs/ecm/dir_card.php                       |  54 +-
 htdocs/ecm/file_card.php                      |  27 +-
 htdocs/ecm/index.php                          |  21 +-
 htdocs/ecm/index_auto.php                     |  21 +-
 .../class/emailcollector.class.php            |  99 +--
 .../class/emailcollectoraction.class.php      |  24 +-
 .../class/emailcollectorfilter.class.php      |  24 +-
 htdocs/expedition/card.php                    | 206 ++---
 .../expedition/class/api_shipments.class.php  |   9 +-
 htdocs/expedition/class/expedition.class.php  | 183 ++---
 .../class/expeditionbatch.class.php           |  12 +-
 htdocs/expedition/contact.php                 |   6 +-
 htdocs/expedition/document.php                |   6 +-
 htdocs/expedition/index.php                   |   6 +-
 htdocs/expedition/list.php                    |   6 +-
 htdocs/expedition/shipment.php                |  33 +-
 htdocs/expedition/stats/index.php             |   6 +-
 htdocs/expensereport/ajax/ajaxprojet.php      |   6 +-
 htdocs/expensereport/card.php                 | 162 ++--
 .../class/api_expensereports.class.php        |   6 +-
 .../class/expensereport.class.php             | 192 ++---
 .../class/expensereport_ik.class.php          |  12 +-
 .../class/expensereport_rule.class.php        |   9 +-
 .../class/paymentexpensereport.class.php      |  30 +-
 htdocs/expensereport/document.php             |   3 +-
 htdocs/expensereport/index.php                |   6 +-
 htdocs/expensereport/list.php                 |  21 +-
 htdocs/expensereport/payment/card.php         |  12 +-
 htdocs/expensereport/payment/payment.php      |   6 +-
 htdocs/expensereport/stats/index.php          |   6 +-
 .../tpl/expensereport_linktofile.tpl.php      |   9 +-
 htdocs/exports/class/export.class.php         |  36 +-
 htdocs/exports/export.php                     |  54 +-
 htdocs/externalsite/admin/externalsite.php    |   3 +-
 htdocs/externalsite/frames.php                |  15 +-
 htdocs/fichinter/card-rec.php                 |   6 +-
 htdocs/fichinter/card.php                     | 108 +--
 .../class/api_interventions.class.php         |   3 +-
 htdocs/fichinter/class/fichinter.class.php    |  90 +--
 htdocs/fichinter/contact.php                  |   6 +-
 htdocs/fichinter/document.php                 |   3 +-
 htdocs/fichinter/index.php                    |   9 +-
 htdocs/fichinter/list.php                     |   3 +-
 htdocs/fichinter/stats/index.php              |  12 +-
 htdocs/fourn/card.php                         |  39 +-
 .../class/api_supplier_invoices.class.php     |   6 +-
 .../fourn/class/api_supplier_orders.class.php |   3 +-
 htdocs/fourn/class/fournisseur.class.php      |  12 +-
 .../class/fournisseur.commande.class.php      | 225 ++----
 .../fournisseur.commande.dispatch.class.php   |  30 +-
 .../fourn/class/fournisseur.facture.class.php | 141 ++--
 .../fourn/class/fournisseur.product.class.php |  51 +-
 htdocs/fourn/class/paiementfourn.class.php    |  51 +-
 htdocs/fourn/commande/card.php                | 204 ++---
 htdocs/fourn/commande/contact.php             |  15 +-
 htdocs/fourn/commande/dispatch.php            |  27 +-
 htdocs/fourn/commande/document.php            |   3 +-
 htdocs/fourn/commande/index.php               |  12 +-
 htdocs/fourn/commande/info.php                |   6 +-
 htdocs/fourn/commande/list.php                |  18 +-
 htdocs/fourn/commande/note.php                |   3 +-
 htdocs/fourn/commande/orderstoinvoice.php     |   6 +-
 htdocs/fourn/contact.php                      |   3 +-
 htdocs/fourn/facture/card.php                 | 179 ++---
 htdocs/fourn/facture/contact.php              |  15 +-
 htdocs/fourn/facture/document.php             |   3 +-
 htdocs/fourn/facture/impayees.php             |   3 +-
 htdocs/fourn/facture/list.php                 |   6 +-
 htdocs/fourn/facture/paiement.php             |  33 +-
 htdocs/fourn/facture/rapport.php              |   3 +-
 .../facture/tpl/linkedobjectblock.tpl.php     |   3 +-
 htdocs/fourn/index.php                        |   9 +-
 htdocs/fourn/paiement/card.php                |  24 +-
 htdocs/fourn/product/list.php                 |   3 +-
 htdocs/fourn/recap-fourn.php                  |   9 +-
 htdocs/ftp/admin/ftpclient.php                |  15 +-
 htdocs/ftp/index.php                          |  84 +-
 htdocs/holiday/card.php                       |  78 +-
 htdocs/holiday/class/holiday.class.php        | 129 +--
 htdocs/holiday/define_holiday.php             |  12 +-
 htdocs/holiday/document.php                   |  12 +-
 htdocs/holiday/list.php                       |  12 +-
 htdocs/holiday/month_report.php               |   3 +-
 htdocs/holiday/view_log.php                   |   3 +-
 htdocs/hrm/admin/admin_establishment.php      |   6 +-
 htdocs/hrm/class/establishment.class.php      |  27 +-
 htdocs/hrm/establishment/card.php             |  22 +-
 htdocs/hrm/index.php                          |  15 +-
 htdocs/imports/class/import.class.php         |  12 +-
 htdocs/imports/import.php                     |  84 +-
 htdocs/install/check.php                      |  75 +-
 htdocs/install/inc.php                        |  18 +-
 htdocs/install/lib/repair.lib.php             |   6 +-
 htdocs/install/repair.php                     | 131 ++--
 htdocs/install/step1.php                      |  58 +-
 htdocs/install/step2.php                      |  51 +-
 htdocs/install/step5.php                      |  33 +-
 htdocs/install/upgrade.php                    |  21 +-
 htdocs/install/upgrade2.php                   | 504 ++++--------
 htdocs/livraison/card.php                     |  34 +-
 htdocs/livraison/class/livraison.class.php    |  51 +-
 htdocs/loan/card.php                          |  66 +-
 htdocs/loan/class/loan.class.php              |  27 +-
 htdocs/loan/class/loanschedule.class.php      |  18 +-
 htdocs/loan/class/paymentloan.class.php       |  24 +-
 htdocs/loan/document.php                      |   3 +-
 htdocs/loan/list.php                          |   6 +-
 htdocs/loan/payment/card.php                  |  12 +-
 htdocs/loan/payment/payment.php               |  18 +-
 htdocs/loan/schedule.php                      |   3 +-
 .../mailmanspip/class/mailmanspip.class.php   |  51 +-
 htdocs/margin/admin/margin.php                |  33 +-
 htdocs/margin/agentMargins.php                |   3 +-
 htdocs/margin/customerMargins.php             |  18 +-
 htdocs/margin/lib/margins.lib.php             |   6 +-
 htdocs/margin/productMargins.php              |  21 +-
 htdocs/margin/tabs/productMargins.php         |   3 +-
 htdocs/margin/tabs/thirdpartyMargins.php      |   9 +-
 htdocs/master.inc.php                         |  19 +-
 htdocs/mrp/ajax/ajax_bom.php                  |   3 +-
 htdocs/mrp/class/mo.class.php                 |  48 +-
 htdocs/mrp/index.php                          |   9 +-
 htdocs/mrp/mo_agenda.php                      |   6 +-
 htdocs/mrp/mo_card.php                        |  12 +-
 htdocs/mrp/mo_document.php                    |   3 +-
 htdocs/mrp/mo_list.php                        |   6 +-
 htdocs/mrp/mo_production.php                  |   9 +-
 .../class/multicurrency.class.php             |  12 +-
 htdocs/opensurvey/card.php                    |  21 +-
 .../class/opensurveysondage.class.php         |  21 +-
 htdocs/opensurvey/exportcsv.php               |   9 +-
 htdocs/opensurvey/fonctions.php               |   3 +-
 htdocs/opensurvey/index.php                   |   3 +-
 htdocs/opensurvey/list.php                    |   6 +-
 htdocs/opensurvey/results.php                 |  36 +-
 htdocs/opensurvey/wizard/choix_date.php       |   6 +-
 htdocs/opensurvey/wizard/create_survey.php    |   6 +-
 htdocs/paybox/admin/paybox.php                |   3 +-
 htdocs/paypal/admin/paypal.php                |   9 +-
 htdocs/paypal/lib/paypal.lib.php              |  15 +-
 htdocs/paypal/lib/paypalfunctions.lib.php     |   3 +-
 htdocs/printing/admin/printing.php            |  21 +-
 htdocs/product/admin/dynamic_prices.php       |   6 +-
 htdocs/product/admin/product.php              |  51 +-
 htdocs/product/admin/product_extrafields.php  |   3 +-
 .../admin/product_supplier_extrafields.php    |   3 +-
 htdocs/product/admin/product_tools.php        |  21 +-
 htdocs/product/agenda.php                     |   3 +-
 htdocs/product/ajax/products.php              |   3 +-
 .../product/actions_card_product.class.php    |  12 +-
 .../service/actions_card_service.class.php    |   9 +-
 htdocs/product/card.php                       | 155 ++--
 htdocs/product/class/api_products.class.php   |   9 +-
 .../product/class/html.formproduct.class.php  |  30 +-
 htdocs/product/class/product.class.php        | 270 +++----
 htdocs/product/class/productbatch.class.php   |  21 +-
 .../class/propalmergepdfproduct.class.php     |  24 +-
 htdocs/product/composition/card.php           |  42 +-
 htdocs/product/document.php                   |   6 +-
 .../class/price_expression.class.php          |  24 +-
 .../class/price_global_variable.class.php     |  18 +-
 .../price_global_variable_updater.class.php   |  27 +-
 .../class/price_parser.class.php              |  14 +-
 htdocs/product/dynamic_price/editor.php       |  30 +-
 htdocs/product/fournisseurs.php               |  46 +-
 htdocs/product/index.php                      |   9 +-
 .../product/inventory/ajax/ajax.inventory.php |   6 +-
 htdocs/product/inventory/card.php             |  15 +-
 .../inventory/class/inventory.class.php       |   6 +-
 htdocs/product/inventory/inventory.php        |  15 +-
 htdocs/product/inventory/list.php             |   9 +-
 htdocs/product/list.php                       |  21 +-
 htdocs/product/popucom.php                    |   9 +-
 htdocs/product/popuprop.php                   |   9 +-
 htdocs/product/price.php                      |  69 +-
 htdocs/product/reassort.php                   |   9 +-
 htdocs/product/reassortlot.php                |   9 +-
 htdocs/product/stats/card.php                 |  24 +-
 htdocs/product/stats/contrat.php              |   6 +-
 htdocs/product/stats/facture.php              |   3 +-
 htdocs/product/stats/mo.php                   |   6 +-
 htdocs/product/stock/card.php                 |  24 +-
 .../stock/class/api_stockmovements.class.php  |   3 +-
 .../stock/class/api_warehouses.class.php      |   3 +-
 htdocs/product/stock/class/entrepot.class.php |  39 +-
 .../stock/class/mouvementstock.class.php      |  12 +-
 .../product/stock/class/productlot.class.php  |   3 +-
 .../class/productstockentrepot.class.php      |  15 +-
 htdocs/product/stock/fiche-valo.php           |   3 +-
 htdocs/product/stock/index.php                |   3 +-
 .../product/stock/lib/replenishment.lib.php   |   3 +-
 htdocs/product/stock/list.php                 |  12 +-
 htdocs/product/stock/massstockmove.php        |  18 +-
 htdocs/product/stock/movement_card.php        |  33 +-
 htdocs/product/stock/movement_list.php        |  33 +-
 htdocs/product/stock/product.php              |  51 +-
 htdocs/product/stock/productlot_card.php      |  12 +-
 htdocs/product/stock/productlot_document.php  |   3 +-
 htdocs/product/stock/productlot_list.php      |   3 +-
 htdocs/product/stock/replenish.php            |  15 +-
 htdocs/product/stock/replenishorders.php      |   3 +-
 .../product/stock/tpl/stocktransfer.tpl.php   |   6 +-
 htdocs/product/stock/valo.php                 |   3 +-
 htdocs/product/traduction.php                 |  18 +-
 htdocs/projet/activity/index.php              |  24 +-
 htdocs/projet/activity/perday.php             |  30 +-
 htdocs/projet/activity/permonth.php           |  24 +-
 htdocs/projet/activity/perweek.php            |  24 +-
 htdocs/projet/admin/project.php               |  84 +-
 htdocs/projet/card.php                        |  60 +-
 htdocs/projet/class/api_projects.class.php    |   6 +-
 htdocs/projet/class/api_tasks.class.php       |   6 +-
 htdocs/projet/class/project.class.php         | 144 ++--
 htdocs/projet/class/projectstats.class.php    |  12 +-
 htdocs/projet/class/task.class.php            | 114 +--
 htdocs/projet/class/taskstats.class.php       |   3 +-
 htdocs/projet/contact.php                     |  12 +-
 htdocs/projet/document.php                    |   3 +-
 htdocs/projet/element.php                     |  93 +--
 htdocs/projet/ganttchart.inc.php              |   6 +-
 htdocs/projet/ganttview.php                   |   9 +-
 htdocs/projet/graph_opportunities.inc.php     |   3 +-
 htdocs/projet/index.php                       |  12 +-
 htdocs/projet/info.php                        |   3 +-
 htdocs/projet/list.php                        |  18 +-
 htdocs/projet/stats/index.php                 |   3 +-
 htdocs/projet/tasks.php                       |  36 +-
 htdocs/projet/tasks/comment.php               |   6 +-
 htdocs/projet/tasks/contact.php               |  27 +-
 htdocs/projet/tasks/document.php              |  12 +-
 htdocs/projet/tasks/list.php                  |  18 +-
 htdocs/projet/tasks/note.php                  |   9 +-
 htdocs/projet/tasks/stats/index.php           |   3 +-
 htdocs/projet/tasks/task.php                  |  27 +-
 htdocs/projet/tasks/time.php                  | 162 ++--
 htdocs/public/agenda/agendaexport.php         |   9 +-
 htdocs/public/cron/cron_run_jobs.php          |  15 +-
 htdocs/public/demo/index.php                  |  12 +-
 htdocs/public/donations/donateurs_code.php    |   9 +-
 htdocs/public/members/new.php                 |  54 +-
 htdocs/public/members/public_card.php         |   3 +-
 htdocs/public/members/public_list.php         |   6 +-
 htdocs/public/notice.php                      |   3 +-
 htdocs/public/onlinesign/newonlinesign.php    |  12 +-
 htdocs/public/opensurvey/studs.php            |  33 +-
 htdocs/public/payment/newpayment.php          | 123 +--
 htdocs/public/payment/paymentko.php           |  15 +-
 htdocs/public/payment/paymentok.php           |  96 +--
 htdocs/public/stripe/confirm_payment.php      |   9 +-
 htdocs/public/stripe/ipn.php                  |  72 +-
 htdocs/public/test/test_arrays.php            |   3 +-
 htdocs/public/ticket/create_ticket.php        |   3 +-
 htdocs/public/ticket/view.php                 |   6 +-
 htdocs/public/website/index.php               |   9 +-
 htdocs/public/website/styles.css.php          |   3 +-
 htdocs/reception/card.php                     | 123 +--
 htdocs/reception/class/reception.class.php    | 102 +--
 htdocs/reception/contact.php                  |   6 +-
 htdocs/reception/index.php                    |   9 +-
 htdocs/reception/list.php                     |  21 +-
 htdocs/reception/stats/index.php              |   6 +-
 htdocs/resource/agenda.php                    |   3 +-
 htdocs/resource/card.php                      |  30 +-
 htdocs/resource/class/dolresource.class.php   |  48 +-
 .../class/html.formresource.class.php         |   6 +-
 htdocs/resource/contact.php                   |   6 +-
 htdocs/resource/document.php                  |   3 +-
 htdocs/resource/element_resource.php          |  21 +-
 htdocs/resource/list.php                      |   3 +-
 htdocs/salaries/admin/salaries.php            |   6 +-
 htdocs/salaries/card.php                      |  18 +-
 htdocs/salaries/class/paymentsalary.class.php |  27 +-
 htdocs/salaries/document.php                  |   3 +-
 htdocs/salaries/list.php                      |   9 +-
 htdocs/salaries/stats/index.php               |   3 +-
 htdocs/societe/admin/societe.php              |  99 +--
 htdocs/societe/agenda.php                     |   3 +-
 htdocs/societe/ajax/company.php               |   3 +-
 htdocs/societe/ajaxcompanies.php              |   9 +-
 .../canvas/actions_card_common.class.php      |  24 +-
 .../company/actions_card_company.class.php    |  21 +-
 .../actions_card_individual.class.php         |   3 +-
 htdocs/societe/card.php                       | 144 ++--
 htdocs/societe/checkvat/checkVatPopup.php     |  21 +-
 htdocs/societe/class/api_contacts.class.php   |   3 +-
 .../societe/class/api_thirdparties.class.php  |  19 +-
 htdocs/societe/class/client.class.php         |   3 +-
 .../class/companybankaccount.class.php        |  33 +-
 .../class/companypaymentmode.class.php        |  15 +-
 htdocs/societe/class/societe.class.php        | 243 ++----
 htdocs/societe/class/societeaccount.class.php |  24 +-
 htdocs/societe/consumption.php                |  24 +-
 htdocs/societe/document.php                   |   3 +-
 htdocs/societe/index.php                      |  15 +-
 htdocs/societe/list.php                       |   6 +-
 htdocs/societe/note.php                       |   3 +-
 htdocs/societe/notify/card.php                |  24 +-
 htdocs/societe/paymentmodes.php               | 123 +--
 htdocs/societe/price.php                      |   9 +-
 htdocs/societe/societecontact.php             |  21 +-
 .../tpl/linesalesrepresentative.tpl.php       |   3 +-
 htdocs/stripe/admin/stripe.php                |  18 +-
 htdocs/stripe/charge.php                      |  18 +-
 htdocs/stripe/class/actions_stripe.class.php  |  24 +-
 htdocs/stripe/class/stripe.class.php          |  81 +-
 htdocs/stripe/config.php                      |   3 +-
 htdocs/stripe/payout.php                      |   6 +-
 htdocs/stripe/transaction.php                 |   6 +-
 htdocs/supplier_proposal/card.php             |  57 +-
 .../class/api_supplier_proposals.class.php    |   3 +-
 .../class/supplier_proposal.class.php         | 162 ++--
 htdocs/supplier_proposal/contact.php          |  15 +-
 htdocs/supplier_proposal/document.php         |   3 +-
 htdocs/supplier_proposal/index.php            |  12 +-
 htdocs/supplier_proposal/list.php             |   6 +-
 htdocs/support/inc.php                        |   6 +-
 htdocs/takepos/admin/bar.php                  |   3 +-
 htdocs/takepos/admin/orderprinters.php        |  16 +-
 htdocs/takepos/admin/receipt.php              |  21 +-
 htdocs/takepos/admin/setup.php                |   6 +-
 htdocs/takepos/admin/terminal.php             |   9 +-
 htdocs/takepos/ajax/ajax.php                  |   9 +-
 htdocs/takepos/genimg/index.php               |   9 +-
 htdocs/takepos/index.php                      |  21 +-
 htdocs/takepos/invoice.php                    |  48 +-
 htdocs/takepos/pay.php                        |   6 +-
 htdocs/takepos/phone.php                      |  33 +-
 htdocs/takepos/reduction.php                  |   6 +-
 htdocs/theme/eldy/global.inc.php              |   6 +-
 htdocs/theme/eldy/style.css.php               |  12 +-
 htdocs/theme/eldy/theme_vars.inc.php          |   3 +-
 htdocs/theme/md/style.css.php                 |  18 +-
 htdocs/theme/md/theme_vars.inc.php            |   3 +-
 htdocs/ticket/agenda.php                      |   3 +-
 htdocs/ticket/card.php                        |   6 +-
 htdocs/ticket/class/actions_ticket.class.php  |   3 +-
 htdocs/ticket/class/api_tickets.class.php     |   3 +-
 htdocs/ticket/class/ticket.class.php          |  39 +-
 htdocs/ticket/document.php                    |   3 +-
 htdocs/ticket/list.php                        |  12 +-
 htdocs/ticket/messaging.php                   |   3 +-
 htdocs/ticket/stats/index.php                 |  12 +-
 htdocs/user/bank.php                          |  18 +-
 htdocs/user/card.php                          | 207 ++---
 htdocs/user/class/api_users.class.php         |  12 +-
 htdocs/user/class/user.class.php              | 210 ++---
 htdocs/user/class/userbankaccount.class.php   |   9 +-
 htdocs/user/class/usergroup.class.php         |  57 +-
 htdocs/user/clicktodial.php                   |   9 +-
 htdocs/user/document.php                      |   3 +-
 htdocs/user/group/card.php                    |  33 +-
 htdocs/user/group/ldap.php                    |  12 +-
 htdocs/user/group/list.php                    |   6 +-
 htdocs/user/group/perms.php                   |   9 +-
 htdocs/user/hierarchy.php                     |  12 +-
 htdocs/user/home.php                          |  18 +-
 htdocs/user/ldap.php                          |  15 +-
 htdocs/user/list.php                          |  15 +-
 htdocs/user/note.php                          |   3 +-
 htdocs/user/notify/card.php                   |  33 +-
 htdocs/user/param_ihm.php                     |  12 +-
 htdocs/user/passwordforgotten.php             |  33 +-
 htdocs/user/perms.php                         |  21 +-
 htdocs/viewimage.php                          |   7 +-
 scripts/cron/cron_run_jobs.php                |   6 +-
 961 files changed, 9487 insertions(+), 19110 deletions(-)

diff --git a/dev/examples/code/create_invoice.php b/dev/examples/code/create_invoice.php
index 0b2c4e54697..1acf181a4ba 100755
--- a/dev/examples/code/create_invoice.php
+++ b/dev/examples/code/create_invoice.php
@@ -91,8 +91,7 @@ if ($idobject > 0)
 		$error++;
 		dol_print_error($db, $obj->error);
 	}
-}
-else {
+} else {
 	$error++;
 	dol_print_error($db, $obj->error);
 }
@@ -104,8 +103,7 @@ if (! $error)
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else {
+} else {
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }
diff --git a/dev/examples/code/create_order.php b/dev/examples/code/create_order.php
index d46913f3fcf..7fe1a82251a 100755
--- a/dev/examples/code/create_order.php
+++ b/dev/examples/code/create_order.php
@@ -89,8 +89,7 @@ if ($idobject > 0)
 		$error++;
 		dol_print_error($db, $com->error);
 	}
-}
-else {
+} else {
 	$error++;
 	dol_print_error($db, $com->error);
 }
@@ -102,8 +101,7 @@ if (! $error)
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else {
+} else {
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }
diff --git a/dev/examples/code/create_product.php b/dev/examples/code/create_product.php
index fb09c5f6e43..20b898a92aa 100755
--- a/dev/examples/code/create_product.php
+++ b/dev/examples/code/create_product.php
@@ -82,8 +82,7 @@ $idobject = $myproduct->create($user);
 if ($idobject > 0)
 {
 	print "OK Object created with id ".$idobject."\n";
-}
-else {
+} else {
 	$error++;
 	dol_print_error($db, $myproduct->error);
 }
@@ -94,8 +93,7 @@ if (! $error)
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else {
+} else {
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }
diff --git a/dev/examples/code/create_user.php b/dev/examples/code/create_user.php
index 79fe30b73bf..d585b490a9c 100755
--- a/dev/examples/code/create_user.php
+++ b/dev/examples/code/create_user.php
@@ -78,12 +78,10 @@ if ($idobject > 0)
 		$error++;
 		dol_print_error($db, $obj->error);
 	}
-}
-elseif ($obj->error == 'ErrorLoginAlreadyExists')
+} elseif ($obj->error == 'ErrorLoginAlreadyExists')
 {
      print "User with login ".$obj->login." already exists\n";
-}
-else {
+} else {
 	$error++;
 	dol_print_error($db, $obj->error);
 }
@@ -95,8 +93,7 @@ if (! $error)
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else {
+} else {
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }
diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index d131e228f44..1b54469551c 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -119,8 +119,7 @@ if (empty($reshook))
 			{
 				$obj = $db->fetch_object($resql);
 				$country_code = $obj->code;
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 
 			// Try to load sql file
 			if ($country_code)
@@ -143,8 +142,7 @@ if (empty($reshook))
 				if ($result > 0)
 				{
 					setEventMessages($langs->trans("ChartLoaded"), null, 'mesgs');
-				}
-				else {
+				} else {
 					setEventMessages($langs->trans("ErrorDuringChartLoad"), null, 'warnings');
 				}
 			}
@@ -234,8 +232,7 @@ if (strlen(trim($search_account))) {
 			}
 			$sql .= " AND (aa.account_number LIKE '".$startchar.$search_account_tmp_clean."'";
 			$sql .= " OR aa.account_number LIKE '".$startchar.$search_account_clean."%')";
-		}
-		else $sql .= natural_search("aa.account_number", $search_account_tmp);
+		} else $sql .= natural_search("aa.account_number", $search_account_tmp);
 	}
 }
 if (strlen(trim($search_label)))			$sql .= natural_search("aa.label", $search_label);
@@ -327,8 +324,7 @@ if ($resql)
 
             $i++;
         }
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
     print "</select>";
     print ajax_combobox("chartofaccounts");
     print '<input type="'.(empty($conf->use_javascript_ajax) ? 'submit' : 'button').'" class="button" name="change_chart" id="change_chart" value="'.dol_escape_htmltag($langs->trans("ChangeAndLoad")).'">';
@@ -430,8 +426,7 @@ if ($resql)
 				print $accountparent->getNomUrl(1);
 				print "</td>\n";
 				if (!$i) $totalarray['nbfield']++;
-			}
-			else {
+			} else {
 				print '<td>&nbsp;</td>';
 				if (!$i) $totalarray['nbfield']++;
 			}
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 66f1e3c0fa3..9794198332e 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -228,8 +228,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		{
 			if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
 				$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]], 'MU');
-			}
-			elseif ($value == 'entity') {
+			} elseif ($value == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
 			if ($i) $sql .= ",";
@@ -245,12 +244,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		{
 			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
 			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
-		}
-		else {
+		} else {
 			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -259,8 +256,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 	// Si verif ok et action modify, on modifie la ligne
 	if ($ok && GETPOST('actionmodify', 'alpha'))
 	{
-		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-		else { $rowidcol = "rowid"; }
+		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 		// Modify entry
 		$sql = "UPDATE ".$tabname[$id]." SET ";
@@ -275,8 +271,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		{
 			if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
 				$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]], 'MU');
-			}
-			elseif ($field == 'entity') {
+			} elseif ($field == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
 			if ($i) $sql .= ",";
@@ -305,8 +300,7 @@ if (GETPOST('actioncancel', 'alpha'))
 
 if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 {
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-	else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 	$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
 
@@ -317,8 +311,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 		if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
 		{
 			setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -327,13 +320,11 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 // activate
 if ($action == $acts[0])
 {
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-	else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
-	}
-	elseif ($code) {
+	} elseif ($code) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$code."'";
 	}
 
@@ -347,13 +338,11 @@ if ($action == $acts[0])
 // disable
 if ($action == $acts[1])
 {
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-	else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
-	}
-	elseif ($code) {
+	} elseif ($code) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$code."'";
 	}
 
@@ -367,13 +356,11 @@ if ($action == $acts[1])
 // favorite
 if ($action == 'activate_favorite')
 {
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-	else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol."='".$rowid."'";
-	}
-	elseif ($code) {
+	} elseif ($code) {
 		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".$code."'";
 	}
 
@@ -387,13 +374,11 @@ if ($action == 'activate_favorite')
 // disable favorite
 if ($action == 'disable_favorite')
 {
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-	else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol."='".$rowid."'";
-	}
-	elseif ($code) {
+	} elseif ($code) {
 		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".$code."'";
 	}
 
@@ -579,8 +564,7 @@ if ($id)
 					print '<td class="liste_titre">';
 					print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth200 maxwidthonsmartphone');
 					print '</td>';
-				}
-				else {
+				} else {
 					print '<td class="liste_titre"></td>';
 				}
 			}
@@ -626,8 +610,7 @@ if ($id)
 
 					print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
 					print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
-				}
-				else {
+				} else {
 				  	$tmpaction = 'view';
 					$parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
 					$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
@@ -648,25 +631,20 @@ if ($id)
 							if ($value == 'element')
 							{
 								$valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
-							}
-							elseif ($value == 'source')
+							} elseif ($value == 'source')
 							{
 								$valuetoshow = isset($sourceList[$valuetoshow]) ? $sourceList[$valuetoshow] : $valuetoshow;
-							}
-							elseif ($valuetoshow == 'all') {
+							} elseif ($valuetoshow == 'all') {
 								$valuetoshow = $langs->trans('All');
-							}
-							elseif ($fieldlist[$field] == 'country') {
+							} elseif ($fieldlist[$field] == 'country') {
 								if (empty($obj->country_code))
 								{
 									$valuetoshow = '-';
-								}
-								else {
+								} else {
 									$key = $langs->trans("Country".strtoupper($obj->country_code));
 									$valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
 								}
-							}
-							elseif ($fieldlist[$field] == 'country_id') {
+							} elseif ($fieldlist[$field] == 'country_id') {
 								$showfield = 0;
 							}
 
@@ -703,8 +681,7 @@ if ($id)
 				$i++;
 			}
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
@@ -756,8 +733,7 @@ function fieldListAccountModel($fieldlist, $obj = '', $tabname = '', $context =
 			$fieldname = 'country';
 			print $form->select_country((!empty($obj->country_code) ? $obj->country_code : (!empty($obj->country) ? $obj->country : '')), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'country_id')
+		} elseif ($fieldlist[$field] == 'country_id')
 		{
 			if (!in_array('country', $fieldlist))	// If there is already a field country, we don't show country_id (avoid duplicate)
 			{
@@ -766,8 +742,7 @@ function fieldListAccountModel($fieldlist, $obj = '', $tabname = '', $context =
 				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
 				print '</td>';
 			}
-		}
-		elseif ($fieldlist[$field] == 'type_cdr') {
+		} elseif ($fieldlist[$field] == 'type_cdr') {
 			if ($fieldlist[$field] == 'type_cdr') print '<td class="center">';
 			else print '<td>';
 			if ($fieldlist[$field] == 'type_cdr') {
@@ -776,11 +751,9 @@ function fieldListAccountModel($fieldlist, $obj = '', $tabname = '', $context =
 				print $form->selectyesno($fieldlist[$field], (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1);
 			}
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
+		} elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
 			print '<td><input type="text" class="flat" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" size="10" name="'.$fieldlist[$field].'"></td>';
-		}
-		else {
+		} else {
 			print '<td>';
 			$size = ''; $class = '';
 			if ($fieldlist[$field] == 'code') $size = 'size="8" ';
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 0fc2f9001a1..bc695da0203 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -75,16 +75,14 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		if ($conf->global->ACCOUNTING_MANAGE_ZERO == 1)
 		{
 			$account_number = GETPOST('account_number', 'string');
-		}
-		else {
+		} else {
 			$account_number = clean_account(GETPOST('account_number', 'string'));
 		}
 
 		if (GETPOST('account_parent', 'int') <= 0)
 		{
 			$account_parent = 0;
-		}
-		else {
+		} else {
 			$account_parent = GETPOST('account_parent', 'int');
 		}
 
@@ -102,13 +100,11 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 			$error = 1;
 			$action = "create";
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		elseif ($res == - 4) {
+		} elseif ($res == - 4) {
 			$error = 2;
 			$action = "create";
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		elseif ($res < 0)
+		} elseif ($res < 0)
 		{
 		    $error++;
 		    setEventMessages($object->error, $object->errors, 'errors');
@@ -138,16 +134,14 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		if ($conf->global->ACCOUNTING_MANAGE_ZERO == 1)
 		{
 			$account_number = GETPOST('account_number', 'string');
-		}
-		else {
+		} else {
 			$account_number = clean_account(GETPOST('account_number', 'string'));
 		}
 
 		if (GETPOST('account_parent', 'int') <= 0)
 		{
 			$account_parent = 0;
-		}
-		else {
+		} else {
 			$account_parent = GETPOST('account_parent', 'int');
 		}
 
@@ -265,8 +259,7 @@ if ($action == 'create') {
 	print '</div>';
 
 	print '</form>';
-}
-elseif ($id > 0 || $ref) {
+} elseif ($id > 0 || $ref) {
 	$result = $object->fetch($id, $ref, 1);
 
 	if ($result > 0) {
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 04c8cbce12a..ddd4240a073 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -235,12 +235,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
         {
             setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
         	$_POST = array('id'=>$id); // Clean $_POST array, we keep only
-        }
-        else {
+        } else {
             if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                 setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-            }
-            else {
+            } else {
                 dol_print_error($db);
             }
         }
@@ -249,8 +247,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
     // Si verif ok et action modify, on modifie la ligne
     if ($ok && GETPOST('actionmodify', 'alpha'))
     {
-        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-        else { $rowidcol = "rowid"; }
+        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
         // Modify entry
         $sql = "UPDATE ".$tabname[$id]." SET ";
@@ -265,8 +262,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
         {
             if ($field == 'fk_country' && $_POST['country'] > 0) {
             	$_POST[$listfieldvalue[$i]] = $_POST['country'];
-            }
-            elseif ($field == 'entity') {
+            } elseif ($field == 'entity') {
             	$_POST[$listfieldvalue[$i]] = $conf->entity;
             }
             if ($i) $sql .= ",";
@@ -295,8 +291,7 @@ if (GETPOST('actioncancel', 'alpha'))
 
 if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
 
@@ -307,8 +302,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
         if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
         {
             setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-        }
-        else {
+        } else {
             dol_print_error($db);
         }
     }
@@ -317,13 +311,11 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 // activate
 if ($action == $acts[0])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
         $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
-    }
-    elseif ($code) {
+    } elseif ($code) {
     	$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code = '".$db->escape($code)."'";
     }
 
@@ -337,13 +329,11 @@ if ($action == $acts[0])
 // disable
 if ($action == $acts[1])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
     	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
-    }
-    elseif ($code) {
+    } elseif ($code) {
     	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code = '".$db->escape($code)."'";
     }
 
@@ -357,13 +347,11 @@ if ($action == $acts[1])
 // favorite
 if ($action == 'activate_favorite')
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
     	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
-    }
-    elseif ($code) {
+    } elseif ($code) {
     	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code = '".$db->escape($code)."'";
     }
 
@@ -377,13 +365,11 @@ if ($action == 'activate_favorite')
 // disable favorite
 if ($action == 'disable_favorite')
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
     	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
-    }
-    elseif ($code) {
+    } elseif ($code) {
     	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code = '".$db->escape($code)."'";
     }
 
@@ -595,8 +581,7 @@ if ($id)
                     print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth200 maxwidthonsmartphone');
                     print '</td>';
                     $filterfound++;
-                }
-                else {
+                } else {
                     print '<td class="liste_titre"></td>';
                 }
             }
@@ -723,8 +708,7 @@ if ($id)
                     print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
                     print '</td>';
                     print '<td></td>';
-                }
-                else {
+                } else {
                     $tmpaction = 'view';
                     $parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
                     $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
@@ -741,34 +725,27 @@ if ($id)
                             if ($value == 'category_type')
                             {
                                 $valuetoshow = yn($valuetoshow);
-                            }
-                            elseif ($valuetoshow == 'all') {
+                            } elseif ($valuetoshow == 'all') {
                                 $valuetoshow = $langs->trans('All');
-                            }
-                            elseif ($fieldlist[$field] == 'country') {
+                            } elseif ($fieldlist[$field] == 'country') {
                                 if (empty($obj->country_code))
                                 {
                                     $valuetoshow = '-';
-                                }
-                                else {
+                                } else {
                                     $key = $langs->trans("Country".strtoupper($obj->country_code));
                                     $valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
                                 }
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
+                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
                                 $key = $langs->trans("Country".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
+                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
                                 $langs->loadLangs(array("propal"));
                                 $key = $langs->trans("AvailabilityType".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
+                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
                                 $key = $langs->trans("Action".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
+                            } elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
                                 $showfield = 0;
                             }
 
@@ -810,8 +787,7 @@ if ($id)
                         if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
                         //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
                         print '</td>';
-                    }
-                    else print '<td>&nbsp;</td>';
+                    } else print '<td>&nbsp;</td>';
 
                     // Link to setup the group
                     print '<td class="center">';
@@ -827,8 +803,7 @@ if ($id)
                 $i++;
             }
         }
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 
@@ -876,13 +851,11 @@ function fieldListAccountingCategories($fieldlist, $obj = '', $tabname = '', $co
 			{
 				$fieldname = 'country_id';
 				print $form->select_country(GETPOST('country_id', 'int'), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
-			}
-			else {
+			} else {
 				print $form->select_country((!empty($obj->country_code) ? $obj->country_code : (!empty($obj->country) ? $obj->country : $mysoc->country_code)), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
 			}
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'country_id')
+		} elseif ($fieldlist[$field] == 'country_id')
 		{
 			if (!in_array('country', $fieldlist))	// If there is already a field country, we don't show country_id (avoid duplicate)
 			{
@@ -891,16 +864,13 @@ function fieldListAccountingCategories($fieldlist, $obj = '', $tabname = '', $co
 				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
 				print '</td>';
 			}
-		}
-		elseif ($fieldlist[$field] == 'category_type') {
+		} elseif ($fieldlist[$field] == 'category_type') {
 		    print '<td>';
 			print $form->selectyesno($fieldlist[$field], (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1);
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
+		} elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
 			print '<td><input type="text" class="flat minwidth100" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'"></td>';
-		}
-		else {
+		} else {
 			print '<td>';
 			$size = ''; $class = '';
 			if ($fieldlist[$field] == 'code') $class = 'maxwidth100';
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index ad22a88f415..96303f36b1d 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -193,8 +193,7 @@ foreach ($list_account as $key) {
 	$reg = array();
 	if (preg_match('/---(.*)---/', $key, $reg)) {
 		print '<tr class="liste_titre"><td>'.$langs->trans($reg[1]).'</td><td></td></tr>';
-	}
-	else {
+	} else {
 		print '<tr class="oddeven value">';
 		// Param
 		$label = $langs->trans($key);
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
index 88890aa004f..27ef1ea7bd1 100644
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -71,9 +71,7 @@ if ($action == 'confirm_delete' && $confirm == "yes") {
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
-}
-
-elseif ($action == 'add') {
+} elseif ($action == 'add') {
 	if (!GETPOST('cancel', 'alpha')) {
 		$error = 0;
 
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 93942946b26..74247c5fccd 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -238,12 +238,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		{
 			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
 			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
-		}
-		else {
+		} else {
 			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -252,8 +250,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 	// Si verif ok et action modify, on modifie la ligne
 	if ($ok && GETPOST('actionmodify', 'alpha'))
 	{
-		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-		else { $rowidcol = "rowid"; }
+		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 		// Modify entry
 		$sql = "UPDATE ".$tabname[$id]." SET ";
@@ -268,8 +265,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		{
 			if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
 				$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]], 'MU');
-			}
-			elseif ($field == 'entity') {
+			} elseif ($field == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
 			if ($i) $sql .= ",";
@@ -299,8 +295,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 
 if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 {
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-	else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 	$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
 	$sql .= " AND entity = ".$conf->entity;
@@ -312,8 +307,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 		if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
 		{
 			setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -322,13 +316,11 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 // activate
 if ($action == $acts[0])
 {
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-	else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
-	}
-	elseif ($code) {
+	} elseif ($code) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$code."'";
 	}
 	$sql .= " AND entity = ".$conf->entity;
@@ -343,13 +335,11 @@ if ($action == $acts[0])
 // disable
 if ($action == $acts[1])
 {
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-	else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
-	}
-	elseif ($code) {
+	} elseif ($code) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$code."'";
 	}
 	$sql .= " AND entity = ".$conf->entity;
@@ -593,8 +583,7 @@ if ($id)
 					print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
 					print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
 					print '</td>';
-				}
-				else {
+				} else {
 				  	$tmpaction = 'view';
 					$parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
 					$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
@@ -611,12 +600,10 @@ if ($id)
 							$valuetoshow = $obj->{$fieldlist[$field]};
 							if ($valuetoshow == 'all') {
 								$valuetoshow = $langs->trans('All');
-							}
-							elseif ($fieldlist[$field] == 'nature' && $tabname[$id] == MAIN_DB_PREFIX.'accounting_journal') {
+							} elseif ($fieldlist[$field] == 'nature' && $tabname[$id] == MAIN_DB_PREFIX.'accounting_journal') {
 								$key = $langs->trans("AccountingJournalType".strtoupper($obj->nature));
 								$valuetoshow = ($obj->nature && $key != "AccountingJournalType".strtoupper($langs->trans($obj->nature)) ? $key : $obj->{$fieldlist[$field]});
-							}
-							elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'accounting_journal') {
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'accounting_journal') {
 								$valuetoshow = $langs->trans($obj->label);
                             }
 
@@ -664,8 +651,7 @@ if ($id)
 						if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
 						//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
 						print '</td>';
-					}
-					else print '<td>&nbsp;</td>';
+					} else print '<td>&nbsp;</td>';
 
 					print '<td></td>';
 
@@ -676,8 +662,7 @@ if ($id)
 				$i++;
 			}
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
@@ -721,11 +706,9 @@ function fieldListJournal($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td>';
 			print $form->selectarray('nature', $sourceList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
+		} elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
 			print '<td><input type="text" class="flat minwidth100" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'"></td>';
-		}
-		else {
+		} else {
 			print '<td>';
 			$size = ''; $class = '';
 			if ($fieldlist[$field] == 'code')  $class = 'maxwidth100';
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 6006e97b8da..b6465b95355 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -252,20 +252,16 @@ $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON";
 if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
     $sql .= " p.accountancy_code_buy = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
-}
-elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA')
+} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA')
 {
 	$sql .= " p.accountancy_code_buy_intra = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
-}
-elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT')
+} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT')
 {
 	$sql .= " p.accountancy_code_buy_export = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
-}
-elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL')
+} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL')
 {
     $sql .= " p.accountancy_code_sell = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
-}
-elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA')
+} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA')
 {
     $sql .= " p.accountancy_code_sell_intra = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
 } else {
@@ -288,13 +284,11 @@ if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
     if (strlen(trim($search_current_account))) {
         $sql .= natural_search("p.accountancy_code_sell", $search_current_account);
     }
-}
-elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
+} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
     if (strlen(trim($search_current_account))) {
         $sql .= natural_search("p.accountancy_code_sell_intra", $search_current_account);
     }
-}
-else {
+} else {
     if (strlen(trim($search_current_account))) {
         $sql .= natural_search("p.accountancy_code_sell_export", $search_current_account);
     }
@@ -490,34 +484,27 @@ if ($result)
 			if ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_prodsell;
-			}
-			elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
 	            $compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
     	        $compta_prodsell_id = $aarowid_prodsell_intra;
-			}
-        	elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
             	$compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
             	$compta_prodsell_id = $aarowid_prodsell_export;
-        	}
-        	else {
+        	} else {
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_prodsell;
 			}
-		}
-		else {
+		} else {
 			if ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_servsell;
-			}
-			elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_servsell_intra;
-			}
-			elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_servsell_export;
-			}
-			else {
+			} else {
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_servsell;
 			}
@@ -528,34 +515,27 @@ if ($result)
 			if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_prodbuy;
-			}
-			elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_prodbuy_intra;
-			}
-			elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_prodbuy_export;
-			}
-			else {
+			} else {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_prodbuy;
 			}
-		}
-		else {
+		} else {
 			if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_servbuy;
-			}
-			elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_servbuy_intra;
-			}
-			elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_servbuy_export;
-			}
-			else {
+			} else {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_servbuy;
 			}
@@ -618,7 +598,7 @@ if ($result)
 			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
 			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
 			print '</td>';
-		}  elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
+		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
 			// Accounting account buy intra (In EEC)
 			print '<td class="left">';
 			//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha');        This is id and we need a code
@@ -628,7 +608,7 @@ if ($result)
 			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
 			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
 			print '</td>';
-		}  elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
 			// Accounting account buy export (Out of EEC)
 			print '<td class="left">';
 			//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha');        This is id and we need a code
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 8ab554c08e7..1fcce431b24 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -138,9 +138,7 @@ if ($action == "confirm_update") {
 			}
 		}
 	}
-}
-
-elseif ($action == "add") {
+} elseif ($action == "add") {
 	$error = 0;
 
 	if ((floatval($debit) != 0.0) && (floatval($credit) != 0.0))
@@ -199,9 +197,7 @@ elseif ($action == "add") {
 			$action = '';
 		}
 	}
-}
-
-elseif ($action == "confirm_delete") {
+} elseif ($action == "confirm_delete") {
 	$object = new BookKeeping($db);
 
 	$result = $object->fetch($id, null, $mode);
@@ -216,9 +212,7 @@ elseif ($action == "confirm_delete") {
 		}
 	}
 	$action = '';
-}
-
-elseif ($action == "confirm_create") {
+} elseif ($action == "confirm_create") {
 	$error = 0;
 
 	$object = new BookKeeping($db);
@@ -628,8 +622,7 @@ if ($action == 'create')
 						if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 						{
 							print $formaccounting->select_auxaccount((GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account), 'subledger_account', 1);
-						}
-						else {
+						} else {
 							print '<input type="text" class="maxwidth150" name="subledger_account" value="'.(GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account).'">';
 						}
 						print '</td>';
@@ -684,8 +677,7 @@ if ($action == 'create')
 					if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 					{
 						print $formaccounting->select_auxaccount('', 'subledger_account', 1);
-					}
-					else {
+					} else {
 						print '<input type="text" class="maxwidth150" name="subledger_account" value="">';
 					}
 					print '</td>';
@@ -705,8 +697,7 @@ if ($action == 'create')
 					if ($total_debit == $total_credit)
 					{
 						print '<a class="button" href="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'&action=valid">'.$langs->trans("ValidTransaction").'</a>';
-					}
-					else {
+					} else {
 						print '<input type="submit" class="button" disabled="disabled" href="#" title="'.dol_escape_htmltag($langs->trans("MvtNotCorrectlyBalanced", $debit, $credit)).'" value="'.dol_escape_htmltag($langs->trans("ValidTransaction")).'">';
 					}
 
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 87808e95500..3282f7f363f 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -351,16 +351,14 @@ if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouveme
 		$result = $object->deleteByYearAndJournal($delyear, $deljournal, '', ($delmonth > 0 ? $delmonth : 0));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else {
+		} else {
 			setEventMessages("RecordDeleted", null, 'mesgs');
 		}
 
 		// Make a redirect to avoid to launch the delete later after a back button
 		header("Location: list.php".($param ? '?'.$param : ''));
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages("NoRecordDeleted", null, 'warnings');
 	}
 }
@@ -371,8 +369,7 @@ if ($action == 'delmouvconfirm' && $user->rights->accounting->mouvements->suppri
 		$result = $object->deleteMvtNum($mvt_num);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		}
 
@@ -477,8 +474,7 @@ if ($action == 'export_file' && $user->rights->accounting->mouvements->export) {
 	if ($result < 0)
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
-	}
-	else {
+	} else {
 	    // Export files
 		$accountancyexport = new AccountancyExport($db);
 		$accountancyexport->export($object->lines, $formatexportset);
@@ -486,8 +482,7 @@ if ($action == 'export_file' && $user->rights->accounting->mouvements->export) {
         if (!empty($accountancyexport->errors))
         {
             setEventMessages('', $accountancyexport->errors, 'errors');
-        }
-        else {
+        } else {
             // Specify as export : update field date_export
             $error = 0;
             $db->begin();
@@ -516,8 +511,7 @@ if ($action == 'export_file' && $user->rights->accounting->mouvements->export) {
             {
             	$db->commit();
             	// setEventMessages($langs->trans("AllExportedMovementsWereRecordedAsExported"), null, 'mesgs');
-            }
-            else {
+            } else {
             	$error++;
             	$db->rollback();
             	setEventMessages($langs->trans("NotAllExportedMovementsCouldBeRecordedAsExported"), null, 'errors');
@@ -553,8 +547,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else {
+} else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -714,8 +707,7 @@ if (!empty($arrayfields['t.subledger_account']['checked']))
 	if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 	{
 		print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
-	}
-	else {
+	} else {
 		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_start" value="'.$search_accountancy_aux_code_start.'">';
 	}
 	print '</div>';
@@ -726,8 +718,7 @@ if (!empty($arrayfields['t.subledger_account']['checked']))
 	if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 	{
 		print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
-	}
-	else {
+	} else {
 		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_end" value="'.$search_accountancy_aux_code_end.'">';
 	}
 	print '</div>';
@@ -920,8 +911,7 @@ while ($i < min($num, $limit))
             $filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
             $urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
             $documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-        }
-        elseif ($line->doc_type == 'supplier_invoice')
+        } elseif ($line->doc_type == 'supplier_invoice')
         {
             $langs->loadLangs(array('bills'));
 
@@ -934,8 +924,7 @@ while ($i < min($num, $limit))
             $filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($line->fk_doc, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
             $subdir = get_exdir($objectstatic->id, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
             $documentlink = $formfile->getDocumentsLink($objectstatic->element, $subdir, $filedir);
-        }
-        elseif ($line->doc_type == 'expense_report')
+        } elseif ($line->doc_type == 'expense_report')
         {
             $langs->loadLangs(array('trips'));
 
@@ -948,8 +937,7 @@ while ($i < min($num, $limit))
             $filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
             $urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
             $documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-        }
-        else {
+        } else {
             // Other type
         }
 
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index a2b456b52b3..1f4ac513806 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -254,16 +254,14 @@ if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouveme
 		$result = $object->deleteByYearAndJournal($delyear, $deljournal, '', ($delmonth > 0 ? $delmonth : 0));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else {
+		} else {
 			setEventMessages("RecordDeleted", null, 'mesgs');
 		}
 
 		// Make a redirect to avoid to launch the delete later after a back button
 		header("Location: listbyaccount.php".($param ? '?'.$param : ''));
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages("NoRecordDeleted", null, 'warnings');
 	}
 }
@@ -274,8 +272,7 @@ if ($action == 'delmouvconfirm' && $user->rights->accounting->mouvements->suppri
 		$result = $object->deleteMvtNum($mvt_num);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		}
 
@@ -534,8 +531,7 @@ while ($i < min($num, $limit))
 				print price($sous_total_debit - $sous_total_credit);
 				print '</td>';
 				print '<td></td>';
-			}
-			else {
+			} else {
 				print '<td></td>';
 				print '<td class="nowraponall right">';
 				print price($sous_total_credit - $sous_total_debit);
@@ -607,8 +603,7 @@ while ($i < min($num, $limit))
 			$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-		}
-		elseif ($line->doc_type == 'supplier_invoice')
+		} elseif ($line->doc_type == 'supplier_invoice')
 		{
 			$langs->loadLangs(array('bills'));
 
@@ -621,8 +616,7 @@ while ($i < min($num, $limit))
 			$filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($line->fk_doc, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
 			$subdir = get_exdir($objectstatic->id, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $subdir, $filedir);
-		}
-		elseif ($line->doc_type == 'expense_report')
+		} elseif ($line->doc_type == 'expense_report')
 		{
 			$langs->loadLangs(array('trips'));
 
@@ -635,8 +629,7 @@ while ($i < min($num, $limit))
 			$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-		}
-		else {
+		} else {
 			// Other type
 		}
 
@@ -737,8 +730,7 @@ if ($balance > 0 )
 	print price($sous_total_debit - $sous_total_credit);
 	print '</td>';
 	print '<td></td>';
-}
-else {
+} else {
 	print '<td></td>';
 	print '<td class="nowraponall right">';
 	print price($sous_total_credit - $sous_total_debit);
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 0150e1d155d..c7f7f8cf68c 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -209,8 +209,7 @@ class AccountancyCategory // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return $this->id;
 		}
@@ -268,8 +267,7 @@ class AccountancyCategory // extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -332,8 +330,7 @@ class AccountancyCategory // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -371,8 +368,7 @@ class AccountancyCategory // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -704,8 +700,7 @@ class AccountancyCategory // extends CommonObject
 				$listofaccount .= "'".$cptcursor."'";
 			}
 			$sql .= " AND t.numero_compte IN (".$listofaccount.")";
-		}
-		else {
+		} else {
 			$sql .= " AND t.numero_compte = '".$this->db->escape($cpt)."'";
 		}
 		if (!empty($date_start) && !empty($date_end) && (empty($month) || empty($year)))	// If month/year provided, it is stronger than filter date_start/date_end
@@ -827,8 +822,7 @@ class AccountancyCategory // extends CommonObject
 			$sql .= " WHERE t.fk_accounting_category = ".$cat_id;
 			$sql .= " AND t.entity = ".$conf->entity;
 			$sql .= " ORDER BY t.account_number";
-		}
-		else {
+		} else {
 			$sql = "SELECT t.rowid, t.account_number, t.label as account_label";
 			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as t";
 			$sql .= " WHERE ".$predefinedgroupwhere;
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 33c2537f600..1c76d0408da 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -362,7 +362,7 @@ class AccountancyExport
 			if ($line->sens == 'D') {
 				print price($line->montant).$separator;
 				print ''.$separator;
-			}elseif ($line->sens == 'C') {
+			} elseif ($line->sens == 'C') {
 				print ''.$separator;
 				print price($line->montant).$separator;
 			}
@@ -602,8 +602,7 @@ class AccountancyExport
 				$Tab['montant_debit']  =  str_pad(number_format(abs($data->montant), 2, ',', ''), 13, ' ', STR_PAD_LEFT);
 
 				$Tab['montant_crebit'] = str_pad(number_format(0, 2, ',', ''), 13, ' ', STR_PAD_LEFT);
-			}
-			else {
+			} else {
 				$Tab['montant_debit']  = str_pad(number_format(0, 2, ',', ''), 13, ' ', STR_PAD_LEFT);
 
 				$Tab['montant_crebit'] = str_pad(number_format(abs($data->montant), 2, ',', ''), 13, ' ', STR_PAD_LEFT);
@@ -899,12 +898,10 @@ class AccountancyExport
             if ($aIndex - 2 >= 0 && $objectLines[$aIndex - 2]->piece_num == $line->piece_num)
             {
                 $sammelBuchung = true;
-            }
-            elseif ($aIndex + 2 < $aSize && $objectLines[$aIndex + 2]->piece_num == $line->piece_num)
+            } elseif ($aIndex + 2 < $aSize && $objectLines[$aIndex + 2]->piece_num == $line->piece_num)
             {
                 $sammelBuchung = true;
-            }
-            elseif ($aIndex + 1 < $aSize
+            } elseif ($aIndex + 1 < $aSize
                     && $objectLines[$aIndex + 1]->piece_num == $line->piece_num
                     && $aIndex - 1 < $aSize
                     && $objectLines[$aIndex - 1]->piece_num == $line->piece_num
@@ -926,8 +923,7 @@ class AccountancyExport
             if ($line->sens == 'D')
             {
                 print 'S'.$this->separator;
-            }
-            else {
+            } else {
                 print 'H'.$this->separator;
             }
             //Grp
@@ -938,12 +934,10 @@ class AccountancyExport
                 if ($line->piece_num == $thisPieceNum)
                 {
                     print length_accounta($thisPieceAccountNr).$this->separator;
-                }
-                else {
+                } else {
                     print "div".$this->separator;
                 }
-            }
-            else {
+            } else {
                 print length_accounta($line->code_tiers).$this->separator;
             }
             //SId
@@ -959,8 +953,7 @@ class AccountancyExport
             if ($sammelBuchung)
             {
                 print "2".$this->separator;
-            }
-            else {
+            } else {
                 print "1".$this->separator;
             }
             // Code
@@ -969,8 +962,7 @@ class AccountancyExport
             if ($line->montant >= 0)
             {
                 print $line->montant.$this->separator;
-            }
-            else {
+            } else {
                 print ($line->montant * -1).$this->separator;
             }
             // Steuer
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index bcd17793db1..6a3fa8e7998 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -609,8 +609,7 @@ class AccountingAccount extends CommonObject
         if ($mode == 0)
         {
             $fieldtouse = 'active';
-        }
-        elseif ($mode == 1)
+        } elseif ($mode == 1)
         {
             $fieldtouse = 'reconcilable';
         }
@@ -661,28 +660,23 @@ class AccountingAccount extends CommonObject
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 7b78cbca84b..6067f557cfb 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -109,8 +109,7 @@ class AccountingJournal extends CommonObject
 			$sql .= " WHERE";
 			if ($rowid) {
 				$sql .= " rowid = ".(int) $rowid;
-			}
-			elseif ($journal_code)
+			} elseif ($journal_code)
 			{
 				$sql .= " code = '".$this->db->escape($journal_code)."'";
 				$sql .= " AND entity  = ".$conf->entity;
@@ -136,8 +135,7 @@ class AccountingJournal extends CommonObject
 				} else {
 					return 0;
 				}
-			}
-			else {
+			} else {
 				$this->error = "Error ".$this->db->lasterror();
 				$this->errors[] = "Error ".$this->db->lasterror();
 			}
@@ -310,8 +308,7 @@ class AccountingJournal extends CommonObject
 			elseif ($nature == 3) return $langs->trans('AccountingJournalType3');
 			elseif ($nature == 2) return $langs->trans('AccountingJournalType2');
 			elseif ($nature == 1) return $langs->trans('AccountingJournalType1');
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($nature == 9) return $langs->trans('AccountingJournalType9');
 			elseif ($nature == 5) return $langs->trans('AccountingJournalType5');
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 2f197d7919f..713d5175d31 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -258,8 +258,7 @@ class BookKeeping extends CommonObject
 			if (in_array($this->doc_type, array('bank', 'expense_report')))
 			{
 				$this->errors[] = $langs->trans('ErrorFieldAccountNotDefinedForBankLine', $this->fk_docdet, $this->doc_type);
-			}
-			else {
+			} else {
 				//$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->doc_ref,  $this->label_compte);
 				$mesg = $this->doc_ref.', '.$langs->trans("AccountAccounting").': '.$this->numero_compte;
 				if ($this->subledger_account && $this->subledger_account != $this->numero_compte)
@@ -476,8 +475,7 @@ class BookKeeping extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index 7c184cced45..4d24110f7e6 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -59,8 +59,7 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 		$resql = $db->query($sql);
 		if (!$resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
-		}
-		else {
+		} else {
 		    setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 		    if ($backtopage)
 		    {
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index c2ba41d7368..425e8aecc81 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -201,8 +201,7 @@ if ($action == 'validatehistory') {
 	if ($error)
 	{
 		$db->rollback();
-	}
-	else {
+	} else {
 		$db->commit();
 		setEventMessages($langs->trans('AutomaticBindingDone'), null, 'mesgs');
 	}
@@ -277,15 +276,13 @@ if ($resql) {
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		}
-		else print length_accountg($row[0]);
+		} else print length_accountg($row[0]);
 		print '</td>';
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		}
-		else print $row[1];
+		} else print $row[1];
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
 			print '<td class="nowrap right">'.price($row[$i]).'</td>';
@@ -352,16 +349,14 @@ if ($resql) {
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		}
-		else print length_accountg($row[0]);
+		} else print length_accountg($row[0]);
 		print '</td>';
 
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		}
-		else print $row[1];
+		} else print $row[1];
 		print '</td>';
 
 		for ($i = 2; $i <= 12; $i++) {
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 4e551fef9e8..bf28da1d5d2 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -159,8 +159,7 @@ if ($massaction == 'ventil') {
             {
                 $msg .= '<div><font color="red">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'</font></div>';
                 $ko++;
-            }
-            else {
+            } else {
                 $sql = " UPDATE ".MAIN_DB_PREFIX."facturedet";
                 $sql .= " SET fk_code_ventilation = ".$monCompte;
                 $sql .= " WHERE rowid = ".$monId;
@@ -628,8 +627,7 @@ if ($result) {
 					$suggestedid = $tmpaccount->id;
 				}
 				$accountingaccount_codetotid_cache[$objp->code_sell_l] = $tmpaccount->id;
-			}
-			else {
+			} else {
 				$suggestedid = $accountingaccount_codetotid_cache[$objp->code_sell_l];
 			}
 		}
diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php
index acea87f95a6..8b04ca74c81 100644
--- a/htdocs/accountancy/expensereport/card.php
+++ b/htdocs/accountancy/expensereport/card.php
@@ -63,8 +63,7 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 		$resql = $db->query($sql);
 		if (!$resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 			if ($backtopage)
 			{
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 9573cbfc257..9fe07b18a37 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -189,15 +189,13 @@ if ($resql) {
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		}
-		else print length_accountg($row[0]);
+		} else print length_accountg($row[0]);
 		print '</td>';
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		}
-		else print $row[1];
+		} else print $row[1];
 		print '</td>';
     	for ($i = 2; $i <= 12; $i++) {
             print '<td class="nowrap right">'.price($row[$i]).'</td>';
@@ -260,16 +258,14 @@ if ($resql) {
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		}
-		else print length_accountg($row[0]);
+		} else print length_accountg($row[0]);
 		print '</td>';
 
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		}
-		else print $row[1];
+		} else print $row[1];
 		print '</td>';
     	for ($i = 2; $i <= 12; $i++) {
             print '<td class="nowrap right">'.price($row[$i]).'</td>';
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 706bd41f2b0..c7c3146e85a 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -138,8 +138,7 @@ if ($massaction == 'ventil') {
             {
                 $msg .= '<div><font color="red">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'</font></div>';
                 $ko++;
-            }
-            else {
+            } else {
                 $sql = " UPDATE ".MAIN_DB_PREFIX."expensereport_det";
                 $sql .= " SET fk_code_ventilation = ".$monCompte;
                 $sql .= " WHERE rowid = ".$monId;
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 2fbbfe4b104..e92d42266a8 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -240,8 +240,7 @@ if ($conf->accounting->enabled)
     print $boxlist;
 
     print '</div>';
-}
-else {
+} else {
     print load_fiche_titre($langs->trans("AccountancyArea"), '', 'accountancy');
 
 	print $langs->trans("Module10Desc")."<br>\n";
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 96fa45bcfd1..07614dcc618 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -276,8 +276,7 @@ if ($result) {
 					// We save tabtype for a future use, to remember what kind of payment it is
 					$tabpay[$obj->rowid]['type'] = $links[$key]['type'];
 					$tabtype[$obj->rowid] = $links[$key]['type'];
-				}
-				elseif (in_array($links[$key]['type'], array('company', 'user')))
+				} elseif (in_array($links[$key]['type'], array('company', 'user')))
 				{
 					if ($tabpay[$obj->rowid]['type'] == 'unknown')
 					{
@@ -549,8 +548,7 @@ if (!$error && $action == 'writebookkeeping') {
 							$error++;
 							$errorforline++;
 							setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else {
+						} else {
 							$error++;
 							$errorforline++;
 							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -574,8 +572,7 @@ if (!$error && $action == 'writebookkeeping') {
 						if ($tabtype[$key] == 'banktransfert')
 						{
 							$reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
-						}
-						else {
+						} else {
 							$reflabel .= dol_string_nohtmltag($val['soclib']);
 						}
 
@@ -697,8 +694,7 @@ if (!$error && $action == 'writebookkeeping') {
 								$error++;
 								$errorforline++;
 								setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else {
+							} else {
 								$error++;
 								$errorforline++;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -706,8 +702,7 @@ if (!$error && $action == 'writebookkeeping') {
 						}
 					}
 				}
-			}
-			else {	// If thirdparty unknown, output the waiting account
+			} else {	// If thirdparty unknown, output the waiting account
 				foreach ($tabbq[$key] as $k => $mt) {
 					if ($mt)
 					{
@@ -744,8 +739,7 @@ if (!$error && $action == 'writebookkeeping') {
 								$error++;
 								$errorforline++;
 								setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else {
+							} else {
 								$error++;
 								$errorforline++;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -766,8 +760,7 @@ if (!$error && $action == 'writebookkeeping') {
 		if (!$errorforline)
 		{
 			$db->commit();
-		}
-		else {
+		} else {
 			//print 'KO for line '.$key.' '.$error.'<br>';
 			$db->rollback();
 
@@ -782,12 +775,10 @@ if (!$error && $action == 'writebookkeeping') {
 
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-	}
-	elseif (count($tabpay) == $error)
+	} elseif (count($tabpay) == $error)
 	{
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
@@ -873,8 +864,7 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 					if ($tabtype[$key] == 'banktransfert')
 					{
 						$reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
-					}
-					else {
+					} else {
 						$reflabel .= dol_string_nohtmltag($val['soclib']);
 					}
 
@@ -972,8 +962,7 @@ if (empty($action) || $action == 'view') {
 			print '<br>'.img_warning().' '.$langs->trans("TheJournalCodeIsNotDefinedOnSomeBankAccount");
 			print ' : '.$langs->trans("AccountancyAreaDescBank", 9, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("BankAccounts").'</strong>');
 		}
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 
 	// Button to write into Ledger
@@ -992,8 +981,7 @@ if (empty($action) || $action == 'view') {
 	if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1'
 	    || ($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
 	    print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
-	}
-	else {
+	} else {
 	    if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
         else print '<a class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
 	}
@@ -1065,8 +1053,7 @@ if (empty($action) || $action == 'view') {
 				if (empty($accounttoshow) || $accounttoshow == 'NotDefined')
 				{
 					print '<span class="error">'.$langs->trans("BankAccountNotDefined").'</span>';
-				}
-				else print $accounttoshow;
+				} else print $accounttoshow;
 				print "</td>";
 				// Subledger account
 				print "<td>";
@@ -1097,8 +1084,7 @@ if (empty($action) || $action == 'view') {
 					if ($tabtype[$key] == 'banktransfert')
 					{
 						$reflabel .= $langs->trans('TransitionalAccount').' '.$account_transfer;
-					}
-					else {
+					} else {
 						$reflabel .= $val['soclib'];
 					}
 
@@ -1126,12 +1112,10 @@ if (empty($action) || $action == 'view') {
 							if (empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) || $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE == '-1')
 							{
 								print '<span class="error">'.$langs->trans('UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking').'</span>';
-							}
-							else {
+							} else {
 								print '<span class="warning">'.$langs->trans('UnknownAccountForThirdparty', length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE)).'</span>'; // We will use a waiting account
 							}
-						}
-						else {
+						} else {
 							// We will refuse writing
 							$errorstring = 'UnknownAccountForThirdpartyBlocking';
 							if ($tabtype[$key] == 'payment')				$errorstring = 'MainAccountForCustomersNotDefined';
@@ -1142,8 +1126,7 @@ if (empty($action) || $action == 'view') {
 							if ($tabtype[$key] == 'member')					$errorstring = 'MainAccountForSubscriptionPaymentNotDefined';
 							print '<span class="error">'.$langs->trans($errorstring).'</span>';
 						}
-					}
-					else print $accounttoshow;
+					} else print $accounttoshow;
 					print "</td>";
 
 					// Subledger account
@@ -1167,12 +1150,10 @@ if (empty($action) || $action == 'view') {
 									} else {
 										print '<span class="warning">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknown", $tabcompany[$key]['code_compta']).'</span>';
 									}
-								}
-								else {
+								} else {
 									print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking").'</span>';
 								}
-							}
-							else print $accounttoshowsubledger;
+							} else print $accounttoshowsubledger;
 						}
 					}
 					print "</td>";
@@ -1278,57 +1259,49 @@ function getSourceDocRef($val, $typerecord)
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiement_facture as payfac, ".MAIN_DB_PREFIX."facture as f";
 		$sqlmid .= " WHERE payfac.fk_facture = f.rowid AND payfac.fk_paiement=".$val["paymentid"];
 		$ref = $langs->transnoentitiesnoconv("Invoice");
-	}
-	elseif ($typerecord == 'payment_supplier')
+	} elseif ($typerecord == 'payment_supplier')
 	{
 		$sqlmid = 'SELECT payfac.fk_facturefourn as id, f.ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn as payfac, ".MAIN_DB_PREFIX."facture_fourn as f";
 		$sqlmid .= " WHERE payfac.fk_facturefourn = f.rowid AND payfac.fk_paiementfourn=".$val["paymentsupplierid"];
 		$ref = $langs->transnoentitiesnoconv("SupplierInvoice");
-	}
-	elseif ($typerecord == 'payment_expensereport')
+	} elseif ($typerecord == 'payment_expensereport')
 	{
 		$sqlmid = 'SELECT e.rowid as id, e.ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_expensereport as pe, ".MAIN_DB_PREFIX."expensereport as e";
 		$sqlmid .= " WHERE pe.rowid=".$val["paymentexpensereport"]." AND pe.fk_expensereport = e.rowid";
 		$ref = $langs->transnoentitiesnoconv("ExpenseReport");
-	}
-	elseif ($typerecord == 'payment_salary')
+	} elseif ($typerecord == 'payment_salary')
 	{
 		$sqlmid = 'SELECT s.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
 		$sqlmid .= " WHERE s.rowid=".$val["paymentsalid"];
 		$ref = $langs->transnoentitiesnoconv("SalaryPayment");
-	}
-	elseif ($typerecord == 'sc')
+	} elseif ($typerecord == 'sc')
 	{
 		$sqlmid = 'SELECT sc.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiementcharge as sc";
 		$sqlmid .= " WHERE sc.rowid=".$val["paymentscid"];
 		$ref = $langs->transnoentitiesnoconv("SocialContribution");
-	}
-	elseif ($typerecord == 'payment_vat')
+	} elseif ($typerecord == 'payment_vat')
 	{
 		$sqlmid = 'SELECT v.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."tva as v";
 		$sqlmid .= " WHERE v.rowid=".$val["paymentvatid"];
 		$ref = $langs->transnoentitiesnoconv("PaymentVat");
-	}
-	elseif ($typerecord == 'payment_donation')
+	} elseif ($typerecord == 'payment_donation')
 	{
 		$sqlmid = 'SELECT payd.fk_donation as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_donation as payd";
 		$sqlmid .= " WHERE payd.fk_donation=".$val["paymentdonationid"];
 		$ref = $langs->transnoentitiesnoconv("Donation");
-	}
-	elseif ($typerecord == 'payment_loan')
+	} elseif ($typerecord == 'payment_loan')
 	{
 		$sqlmid = 'SELECT l.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_loan as l";
 		$sqlmid .= " WHERE l.rowid=".$val["paymentloanid"];
 		$ref = $langs->transnoentitiesnoconv("LoanPayment");
-	}
-	elseif ($typerecord == 'payment_various')
+	} elseif ($typerecord == 'payment_various')
 	{
 		$sqlmid = 'SELECT v.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_various as v";
@@ -1351,8 +1324,7 @@ function getSourceDocRef($val, $typerecord)
 			{
 				$ref .= ' '.$objmid->ref;
 			}
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 	}
 
 	$ref = dol_trunc($langs->transnoentitiesnoconv("BankId").' '.$val['fk_bank'].' - '.$ref, 295); // 295 + 3 dots (...) is < than max size of 300
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 6ed33f56ef1..bffd533d312 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -231,8 +231,7 @@ if ($action == 'writebookkeeping') {
 							$error++;
 							$errorforline++;
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else {
+						} else {
 							$error++;
 							$errorforline++;
 							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -280,8 +279,7 @@ if ($action == 'writebookkeeping') {
 								$error++;
 								$errorforline++;
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else {
+							} else {
 								$error++;
 								$errorforline++;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -339,8 +337,7 @@ if ($action == 'writebookkeeping') {
 								$error++;
 								$errorforline++;
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else {
+							} else {
 								$error++;
 								$errorforline++;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -362,8 +359,7 @@ if ($action == 'writebookkeeping') {
 		if (!$errorforline)
 		{
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 
 			if ($error >= 10)
@@ -378,12 +374,10 @@ if ($action == 'writebookkeeping') {
 
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-	}
-	elseif (count($tabpay) == $error)
+	} elseif (count($tabpay) == $error)
 	{
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
@@ -506,8 +500,7 @@ if (empty($action) || $action == 'view') {
 	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
 	if (empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) || $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT == '-1') {
 		print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
-	}
-	else {
+	} else {
 		if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
 		else print '<a href="#" class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
 	}
@@ -577,8 +570,7 @@ if (empty($action) || $action == 'view') {
 				if (($accountoshow == "") || $accountoshow == 'NotDefined')
 				{
 					print '<span class="error">'.$langs->trans("FeeAccountNotDefined").'</span>';
-				}
-				else print $accountoshow;
+				} else print $accountoshow;
 				print '</td>';
 				// Subledger account
 				print "<td>";
@@ -607,8 +599,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("MainAccountForUsersNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print "</td>";
 			// Subledger account
 			print "<td>";
@@ -616,8 +607,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("UserAccountNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print '</td>';
 			print "<td>".$userstatic->getNomUrl(0, 'user', 16).' - '.$langs->trans("SubledgerAccount")."</td>";
 			print '<td class="right nowraponall">'.($mt < 0 ? -price(-$mt) : '')."</td>";
@@ -644,8 +634,7 @@ if (empty($action) || $action == 'view') {
 					if (($accountoshow == "") || $accountoshow == 'NotDefined')
 					{
 						print '<span class="error">'.$langs->trans("VATAccountNotDefined").'</span>';
-					}
-					else print $accountoshow;
+					} else print $accountoshow;
 					print "</td>";
 					// Subledger account
 					print "<td>";
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index c7cff6443ca..acdc3fbface 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -227,8 +227,7 @@ foreach ($tabfac as $key => $val) {		// Loop on each invoice
 		{
 			$errorforinvoice[$key] = 'somelinesarenotbound';
 		}
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 }
 //var_dump($errorforinvoice);exit;
 
@@ -332,8 +331,7 @@ if ($action == 'writebookkeeping') {
 						$errorforline++;
 						$errorforinvoice[$key] = 'alreadyjournalized';
 						//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-					}
-					else {
+					} else {
 						$error++;
 						$errorforline++;
 						$errorforinvoice[$key] = 'other';
@@ -383,8 +381,7 @@ if ($action == 'writebookkeeping') {
 							$errorforline++;
 							$errorforinvoice[$key] = 'alreadyjournalized';
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else {
+						} else {
 							$error++;
 							$errorforline++;
 							$errorforinvoice[$key] = 'other';
@@ -445,8 +442,7 @@ if ($action == 'writebookkeeping') {
 								$errorforline++;
 								$errorforinvoice[$key] = 'alreadyjournalized';
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else {
+							} else {
 								$error++;
 								$errorforline++;
 								$errorforinvoice[$key] = 'other';
@@ -497,8 +493,7 @@ if ($action == 'writebookkeeping') {
 							$errorforline++;
 							$errorforinvoice[$key] = 'alreadyjournalized';
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else {
+						} else {
 							$error++;
 							$errorforline++;
 							$errorforinvoice[$key] = 'other';
@@ -521,8 +516,7 @@ if ($action == 'writebookkeeping') {
 		if (!$errorforline)
 		{
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 
 			if ($error >= 10)
@@ -537,12 +531,10 @@ if ($action == 'writebookkeeping') {
 
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-	}
-	elseif (count($tabpay) == $error)
+	} elseif (count($tabpay) == $error)
 	{
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
@@ -738,8 +730,7 @@ if (empty($action) || $action == 'view') {
 	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
 	if (($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
 		print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
-	}
-	else {
+	} else {
 		if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
 		else print '<a href="#" class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
 	}
@@ -866,8 +857,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("MainAccountForSuppliersNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print '</td>';
 			// Subledger account
 			print "<td>";
@@ -875,8 +865,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print '</td>';
 			print "<td>".$companystatic->getNomUrl(0, 'supplier', 16).' - '.$invoicestatic->ref_supplier.' - '.$langs->trans("SubledgerAccount")."</td>";
 			print '<td class="right nowraponall">'.($mt < 0 ? price(-$mt) : '')."</td>";
@@ -899,8 +888,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("ProductAccountNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print "</td>";
 			// Subledger account
 			print "<td>";
@@ -932,8 +920,7 @@ if (empty($action) || $action == 'view') {
 					if (($accountoshow == "") || $accountoshow == 'NotDefined')
 					{
 						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("Purchase").')</span>';
-					}
-					else print $accountoshow;
+					} else print $accountoshow;
 					print "</td>";
 					// Subledger account
 					print "<td>";
@@ -963,8 +950,7 @@ if (empty($action) || $action == 'view') {
 					if ($accountoshow == '' || $accountoshow == 'NotDefined')
 					{
 						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("NPR counterpart").'). Set ACCOUNTING_COUNTERPART_VAT_NPR to the subvention account</span>';
-					}
-					else print $accountoshow;
+					} else print $accountoshow;
 					print '</td>';
 					// Subledger account
 					print "<td>";
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 9bfa10dd3f1..77a911db9b3 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -241,8 +241,7 @@ foreach ($tabfac as $key => $val) {		// Loop on each invoice
 		{
 			$errorforinvoice[$key] = 'somelinesarenotbound';
 		}
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 }
 //var_dump($errorforinvoice);exit;
 
@@ -343,8 +342,7 @@ if ($action == 'writebookkeeping') {
 						$errorforline++;
 						$errorforinvoice[$key] = 'alreadyjournalized';
 						//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-					}
-					else {
+					} else {
 						$error++;
 						$errorforline++;
 						$errorforinvoice[$key] = 'other';
@@ -394,8 +392,7 @@ if ($action == 'writebookkeeping') {
 							$errorforline++;
 							$errorforinvoice[$key] = 'alreadyjournalized';
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else {
+						} else {
 							$error++;
 							$errorforline++;
 							$errorforinvoice[$key] = 'other';
@@ -455,8 +452,7 @@ if ($action == 'writebookkeeping') {
 								$errorforline++;
 								$errorforinvoice[$key] = 'alreadyjournalized';
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else {
+							} else {
 								$error++;
 								$errorforline++;
 								$errorforinvoice[$key] = 'other';
@@ -480,8 +476,7 @@ if ($action == 'writebookkeeping') {
 		if (!$errorforline)
 		{
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 
 			if ($error >= 10)
@@ -496,11 +491,9 @@ if ($action == 'writebookkeeping') {
 
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-	}
-	elseif (count($tabpay) == $error) {
+	} elseif (count($tabpay) == $error) {
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
@@ -676,8 +669,7 @@ if (empty($action) || $action == 'view') {
 	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
 	if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
 		print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
-	}
-	else {
+	} else {
 		if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
 		else print '<a href="#" class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
 	}
@@ -803,8 +795,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("MainAccountForCustomersNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print '</td>';
 			// Subledger account
 			print "<td>";
@@ -812,8 +803,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print '</td>';
 			print "<td>".$companystatic->getNomUrl(0, 'customer', 16).' - '.$invoicestatic->ref.' - '.$langs->trans("SubledgerAccount")."</td>";
 			print '<td class="right nowraponall">'.($mt >= 0 ? price($mt) : '')."</td>";
@@ -837,8 +827,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("ProductNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print "</td>";
 			// Subledger account
 			print "<td>";
@@ -871,8 +860,7 @@ if (empty($action) || $action == 'view') {
 					if (($accountoshow == "") || $accountoshow == 'NotDefined')
 					{
 						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("Sale").')</span>';
-					}
-					else print $accountoshow;
+					} else print $accountoshow;
 					print "</td>";
 					// Subledger account
 					print "<td>";
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index b8d32e690a1..40bd99c5582 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -63,8 +63,7 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 		$resql = $db->query($sql);
 		if (!$resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
-		}
-		else {
+		} else {
 		    setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 		    if ($backtopage)
 		    {
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 9cd2b0c61e4..8b37418a3bc 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -191,8 +191,7 @@ if ($action == 'validatehistory') {
 	if ($error)
 	{
 		$db->rollback();
-	}
-	else {
+	} else {
 		$db->commit();
 		setEventMessages($langs->trans('AutomaticBindingDone'), null, 'mesgs');
 	}
@@ -261,15 +260,13 @@ if ($resql) {
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		}
-		else print length_accountg($row[0]);
+		} else print length_accountg($row[0]);
 		print '</td>';
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		}
-		else print $row[1];
+		} else print $row[1];
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
 			print '<td class="nowrap right">'.price($row[$i]).'</td>';
@@ -331,15 +328,13 @@ if ($resql) {
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		}
-		else print length_accountg($row[0]);
+		} else print length_accountg($row[0]);
 		print '</td>';
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		}
-		else print $row[1];
+		} else print $row[1];
 		print '</td>';
     	for ($i = 2; $i <= 12; $i++) {
             print '<td class="nowrap right">'.price($row[$i]).'</td>';
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 2c7110bf65d..fffef9147a9 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -163,8 +163,7 @@ if ($massaction == 'ventil') {
             {
                 $msg .= '<div><font color="red">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'</font></div>';
                 $ko++;
-            }
-            else {
+            } else {
                 $sql = " UPDATE ".MAIN_DB_PREFIX."facture_fourn_det";
                 $sql .= " SET fk_code_ventilation = ".$monCompte;
                 $sql .= " WHERE rowid = ".$monId;
@@ -608,8 +607,7 @@ if ($result) {
 					$suggestedid = $tmpaccount->id;
 				}
 				$accountingaccount_codetotid_cache[$objp->code_buy_l] = $tmpaccount->id;
-			}
-			else {
+			} else {
 				$suggestedid = $accountingaccount_codetotid_cache[$objp->code_buy_l];
 			}
 		}
diff --git a/htdocs/accountancy/tpl/export_journal.tpl.php b/htdocs/accountancy/tpl/export_journal.tpl.php
index a6addb536a2..44e103059d7 100644
--- a/htdocs/accountancy/tpl/export_journal.tpl.php
+++ b/htdocs/accountancy/tpl/export_journal.tpl.php
@@ -58,8 +58,7 @@ if ($accountancyexport->getFormatCode($formatexportset) == $accountancyexport::$
 	$endaccountingperiod = dol_print_date(dol_get_last_day($tmparray['year'], $tmparray['mon']), 'dayxcard');
 
 	$completefilename = $siren."FEC".$endaccountingperiod.".txt";
-}
-else {
+} else {
 	$completefilename = ($code ? $code."_" : "").($prefix ? $prefix."_" : "").$filename.($nodateexport ? "" : $date_export).".".$format;
 }
 
diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index 25481ccb39d..8cc22578f2a 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -54,8 +54,7 @@ if ($action == 'setproductionmode')
 				setEventMessages($langs->trans("ErrorFailedToCreateDir", $conf->api->dir_temp), null, 'errors');
 				$error++;
 			}
-		}
-		else {
+		} else {
 			// Delete the cache file otherwise it does not update
 			$result = dol_delete_file($conf->api->dir_temp.'/routes.php');
 			if ($result < 0)
@@ -70,8 +69,7 @@ if ($action == 'setproductionmode')
     		header("Location: ".$_SERVER["PHP_SELF"]);
 	   	    exit;
 	    }
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -117,8 +115,7 @@ if ($production_mode)
     print '<td><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i + 1).'&status=0">';
     print img_picto($langs->trans("Activated"), 'switch_on');
     print '</a></td>';
-}
-else {
+} else {
     print '<td><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i + 1).'&status=1">';
     print img_picto($langs->trans("Disabled"), 'switch_off');
     print '</a></td>';
@@ -162,8 +159,7 @@ if (dol_is_dir(DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/e
 {
     $url = DOL_MAIN_URL_ROOT.'/api/index.php/explorer';
     print img_picto('', 'globe').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
-}
-else {
+} else {
     print $langs->trans("NotAvailableWithThisDistribution");
 }
 
diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index fa96788f585..83bd00555d6 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -250,8 +250,7 @@ class DolibarrApi
 		$featuresarray = array($resource);
 		if (preg_match('/&/', $resource)) {
 			$featuresarray = explode("&", $resource);
-		}
-		elseif (preg_match('/\|/', $resource)) {
+		} elseif (preg_match('/\|/', $resource)) {
 			$featuresarray = explode("|", $resource);
 		}
 
@@ -317,8 +316,7 @@ class DolibarrApi
 	    if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
 	    {
 	        $tmpescaped = "'".$db->escape($regbis[1])."'";
-	    }
-	    else {
+	    } else {
 	        $tmpescaped = $db->escape($tmpescaped);
 	    }
 	    return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php
index e0551cf07d9..a6d0d72b8de 100644
--- a/htdocs/api/class/api_access.class.php
+++ b/htdocs/api/class/api_access.class.php
@@ -128,8 +128,7 @@ class DolibarrApiAccess implements iAuthenticate
 						$conf->setValues($db);
 					}
 				}
-			}
-			else {
+			} else {
 				throw new RestException(503, 'Error when fetching user api_key :'.$db->error_msg);
 			}
 
@@ -157,8 +156,7 @@ class DolibarrApiAccess implements iAuthenticate
 			if ($fuser->admin) {
 				static::$role = 'admin';
             }
-        }
-		else {
+        } else {
 		    throw new RestException(401, "Failed to login to API. No parameter 'HTTP_DOLAPIKEY' on HTTP header (and no parameter DOLAPIKEY in URL).");
 		}
 
diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index 0a9b8b63e7b..078d631aa3d 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -122,8 +122,7 @@ class Login
     		{
     			throw new RestException(500, 'Error when updating api_key for user :'.$this->db->lasterror());
     		}
-		}
-		else {
+		} else {
             $token = $tmpuser->api_key;
 		}
 
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index e5bf7a00eea..5dade088fd0 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -878,8 +878,7 @@ class Setup extends DolibarrApi
         			$list[$tab->elementtype][$tab->name]['list'] = $tab->list;
         		}
         	}
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieving list of extra fields : '.$this->db->lasterror());
         }
 
@@ -1483,12 +1482,10 @@ class Setup extends DolibarrApi
     		if (dol_is_file($xmlfile))
     		{
     			$xml = simplexml_load_file($xmlfile);
-    		}
-    		else {
+    		} else {
     			throw new RestException(500, $langs->trans('XmlNotFound').': '.$xmlfile);
     		}
-    	}
-    	else {
+    	} else {
     		$xmlarray = getURLContent($xmlremote);
 
     		// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
@@ -1497,8 +1494,7 @@ class Setup extends DolibarrApi
     			$xmlfile = $xmlarray['content'];
     			//print "xmlfilestart".$xmlfile."endxmlfile";
     			$xml = simplexml_load_string($xmlfile);
-    		}
-    		else {
+    		} else {
     			$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
     			throw new RestException(500, $errormsg);
     		}
@@ -1605,8 +1601,7 @@ class Setup extends DolibarrApi
     					$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
     					$out .= "</tr>\n";
     				}
-    			}
-    			else {
+    			} else {
     				$out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
     			$out .= '</table>';
@@ -1654,8 +1649,7 @@ class Setup extends DolibarrApi
     				$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
     				$out .= '<td class="right"></td>'."\n";
     				$out .= "</tr>\n";
-    			}
-    			else {
+    			} else {
     				$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
     			$out .= '</table>';
@@ -1703,8 +1697,7 @@ class Setup extends DolibarrApi
     				$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
     				$out .= '<td class="right"></td>'."\n";
     				$out .= "</tr>\n";
-    			}
-    			else {
+    			} else {
     				$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
     			$out .= '</table>';
@@ -1715,12 +1708,10 @@ class Setup extends DolibarrApi
     			if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
     			{
     				//setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
-    			}
-    			else {
+    			} else {
     				//setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
     			}
-    		}
-    		else {
+    		} else {
     			throw new RestException(500, 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile);
     		}
 
@@ -1742,22 +1733,19 @@ class Setup extends DolibarrApi
     				$resultcomment = 'FileIntegrityIsOkButFilesWereAdded';
     				//$outcurrentchecksum =  $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
     				$outcurrentchecksum = $checksumget;
-    			}
-    			else {
+    			} else {
     				$resultcode = 'ok';
     				$resultcomment = 'Success';
     				//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
     				$outcurrentchecksum = $checksumget;
     			}
-    		}
-    		else {
+    		} else {
     			$resultcode = 'error';
     			$resultcomment = 'Error';
     			//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
     			$outcurrentchecksum = $checksumget;
     		}
-    	}
-    	else {
+    	} else {
     		throw new RestException(404, 'No signature file known');
     	}
 
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index fca0e027081..0cc50b07302 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -202,13 +202,11 @@ if (!empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $
                                     {
                                         //dol_syslog("Found API by index.php: classname=".$classname."Api for module ".$dir." into ".$dir_part.$file_searched);
                                         $listofapis[strtolower($classname.'Api')] = $classname.'Api';
-                                    }
-                                    elseif (class_exists($classname))
+                                    } elseif (class_exists($classname))
                                     {
                                         //dol_syslog("Found API by index.php: classname=".$classname." for module ".$dir." into ".$dir_part.$file_searched);
                                         $listofapis[strtolower($classname)] = $classname;
-                                    }
-                                    else {
+                                    } else {
                                         dol_syslog("We found an api_xxx file (".$file_searched.") but class ".$classname." does not exists after loading file", LOG_WARNING);
                                     }
                                 }
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 12f5fb1fbc7..c1afe7ba472 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -87,8 +87,7 @@ if ($action == 'edit')
 
 	print '</form>';
 	print '<br>';
-}
-else {
+} else {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php
index fc42f0b00d6..540de545baf 100644
--- a/htdocs/asset/card.php
+++ b/htdocs/asset/card.php
@@ -314,16 +314,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			if ($user->rights->asset->write)
 			{
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-			}
-			else {
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
 			}
 
 			if ($user->rights->asset->delete)
 			{
 				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
-			}
-			else {
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
 			}
 		}
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 1570fe438ad..30f2a64bb0a 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -351,8 +351,7 @@ class Asset extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -395,28 +394,23 @@ class Asset extends CommonObject
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 6)
+		} elseif ($mode == 6)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
@@ -469,8 +463,7 @@ class Asset extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/asset/class/asset_type.class.php b/htdocs/asset/class/asset_type.class.php
index 2e275ae1e65..db2407a9376 100644
--- a/htdocs/asset/class/asset_type.class.php
+++ b/htdocs/asset/class/asset_type.class.php
@@ -154,14 +154,12 @@ class AssetType extends CommonObject
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else {
+			} else {
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -221,14 +219,12 @@ class AssetType extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 				return -$error;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -259,8 +255,7 @@ class AssetType extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -298,8 +293,7 @@ class AssetType extends CommonObject
 			}
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -338,8 +332,7 @@ class AssetType extends CommonObject
 					$i++;
 				}
 			}
-		}
-		else {
+		} else {
 			print $this->db->error();
 		}
 		return $assettypes;
@@ -383,8 +376,7 @@ class AssetType extends CommonObject
 							$assetstatic->fetch($obj->rowid);
 						}
 						$ret[$obj->rowid] = $assetstatic;
-					}
-					else $ret[$obj->rowid] = $obj->rowid;
+					} else $ret[$obj->rowid] = $obj->rowid;
 				}
 			}
 
@@ -393,8 +385,7 @@ class AssetType extends CommonObject
 			$this->asset = $ret;
 
 			return $ret;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index 9b5294605ba..d2890ea5b19 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -144,8 +144,7 @@ if ($object->id)
 	$relativepathwithnofile = 'asset/'.dol_sanitizeFileName($object->ref).'/';
 
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index da2a4d80b27..0f6624f1254 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -253,8 +253,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else {
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -387,8 +386,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		}
-		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
diff --git a/htdocs/asset/type.php b/htdocs/asset/type.php
index f9931a927b4..a2c6bab3f90 100644
--- a/htdocs/asset/type.php
+++ b/htdocs/asset/type.php
@@ -107,8 +107,7 @@ if ($action == 'add' && $user->rights->asset->write)
 	if (empty($object->label)) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
-	}
-	else {
+	} else {
 		$sql = "SELECT label FROM ".MAIN_DB_PREFIX."asset_type WHERE label='".$db->escape($object->label)."'";
 		$result = $db->query($sql);
 		if ($result) {
@@ -128,13 +127,11 @@ if ($action == 'add' && $user->rights->asset->write)
 		{
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'create';
 		}
-	}
-	else {
+	} else {
 		$action = 'create';
 	}
 }
@@ -160,8 +157,7 @@ if ($action == 'update' && $user->rights->asset->write)
 	if ($ret >= 0 && !count($object->errors))
 	{
 		setEventMessages($langs->trans("AssetsTypeModified"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 
@@ -179,8 +175,7 @@ if ($action == 'confirm_delete' && $user->rights->asset->write)
 		setEventMessages($langs->trans("AssetsTypeDeleted"), null, 'mesgs');
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("AssetsTypeCanNotBeDeleted"), null, 'errors');
 		$action = '';
 	}
@@ -312,8 +307,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 		print '</div>';
 
 		print '</form>';
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -361,8 +355,7 @@ if ($action == 'create')
 		print '<td>';
 		print $formaccounting->select_account($object->accountancy_code_depreciation_expense, 'accountancy_code_depreciation_expense', 1, '', 1, 1);
 		print '</td></tr>';
-	}
-	else // For external software
+	} else // For external software
 	{
 		// Accountancy_code_asset
 		print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
@@ -572,8 +565,7 @@ if ($rowid > 0)
 			print '<td>';
 			print $formaccounting->select_account($object->accountancy_code_depreciation_expense, 'accountancy_code_depreciation_expense', 1, '', 1, 1);
 			print '</td></tr>';
-		}
-		else // For external software
+		} else // For external software
 		{
 			// Accountancy_code_asset
 			print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index f77b50924e2..a70e6f8a04b 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -71,8 +71,7 @@ if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
 
 					try {
 						dol_include_once($dirroot.$file.'.php');
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						dol_syslog($e->getMessage(), LOG_ERR);
 					}
@@ -109,13 +108,11 @@ if ($action == 'initbarcodeproducts')
 			if ($resql)
 			{
 				setEventMessages($langs->trans("AllBarcodeReset"), null, 'mesgs');
-			}
-			else {
+			} else {
 				$error++;
 				dol_print_error($db);
 			}
-		}
-		else {
+		} else {
 			$sql = "SELECT rowid, ref, fk_product_type";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product";
 			$sql .= " WHERE barcode IS NULL or barcode = ''";
@@ -148,8 +145,7 @@ if ($action == 'initbarcodeproducts')
 
 					$i++;
 				}
-			}
-			else {
+			} else {
 				$error++;
 				dol_print_error($db);
 			}
@@ -164,8 +160,7 @@ if ($action == 'initbarcodeproducts')
 		{
 			//$db->rollback();
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 		}
 	}
@@ -216,8 +211,7 @@ if ($conf->societe->enabled)
 	{
 		$obj = $db->fetch_object($resql);
 		$nbno = $obj->nb;
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	$sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."societe";
 	$resql = $db->query($sql);
@@ -225,8 +219,7 @@ if ($conf->societe->enabled)
 	{
 		$obj = $db->fetch_object($resql);
 		$nbtotal = $obj->nb;
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	print $langs->trans("CurrentlyNWithoutBarCode", $nbno, $nbtotal, $langs->transnoentitiesnoconv("ThirdParties")).'<br>'."\n";
 
@@ -270,8 +263,7 @@ if ($conf->product->enabled || $conf->product->service)
 
 			$i++;
 		}
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	$sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."product";
 	$resql = $db->query($sql);
@@ -279,8 +271,7 @@ if ($conf->product->enabled || $conf->product->service)
 	{
 		$obj = $db->fetch_object($resql);
 		$nbtotal = $obj->nb;
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	print $langs->trans("CurrentlyNWithoutBarCode", $nbno, $nbtotal, $langs->transnoentitiesnoconv("ProductsOrServices")).'<br>'."\n";
 
@@ -290,8 +281,7 @@ if ($conf->product->enabled || $conf->product->service)
 		$objproduct = new Product($db);
 		print '<b>'.(isset($modBarCodeProduct->name) ? $modBarCodeProduct->name : $modBarCodeProduct->nom).'</b> - '.$langs->trans("NextValue").': <b>'.$modBarCodeProduct->getNextValue($objproduct).'</b><br>';
 		$disabled = 0;
-	}
-	else {
+	} else {
 		$disabled = 1;
 		$titleno = $langs->trans("NoBarcodeNumberingTemplateDefined");
 		print '<font class="warning">'.$langs->trans("NoBarcodeNumberingTemplateDefined").'</font> (<a href="'.DOL_URL_ROOT.'/admin/barcode.php">'.$langs->trans("ToGenerateCodeDefineAutomaticRuleFirst").'</a>)<br>';
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index 7c692998723..8c883e55e75 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -161,8 +161,7 @@ if ($action == 'builddoc')
 					setEventMessages('Failed to generate image file of barcode for code='.$code.' encoding='.$encoding.' file='.basename($barcodeimage), null, 'errors');
 					setEventMessages($module->error, null, 'errors');
 				}
-			}
-			else {
+			} else {
 				$error++;
 				setEventMessages("Error, encoding ".$encoding." is not supported by encoder ".$generator.'. You must choose another barcode type or install a barcode generation engine that support '.$encoding, null, 'errors');
 			}
diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php
index 0a649a380cf..1b6ff1fa021 100644
--- a/htdocs/blockedlog/admin/blockedlog.php
+++ b/htdocs/blockedlog/admin/blockedlog.php
@@ -51,8 +51,7 @@ if (preg_match('/set_(.*)/', $action, $reg))
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -64,8 +63,7 @@ if (preg_match('/del_(.*)/', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 10b14a29039..ab36caedba4 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -133,13 +133,11 @@ if ($action === 'downloadblockchain') {
 			{
 				$previoushash = $block_static->getPreviousHash(0, $obj->rowid);
 				$firstid = $obj->rowid;
-			}
-			else {	// If not data found for filter, we do not need previoushash neither firstid
+			} else {	// If not data found for filter, we do not need previoushash neither firstid
 				$previoushash = 'nodata';
 				$firstid = '';
 			}
-		}
-		else {
+		} else {
 			$error++;
 			setEventMessages($db->lasterror, null, 'errors');
 		}
@@ -209,8 +207,7 @@ if ($action === 'downloadblockchain') {
 					$statusofrecord = 'Valid';
 					if ($loweridinerror > 0) $statusofrecordnote = 'ValidButFoundAPreviousKO';
 					else $statusofrecordnote = '';
-				}
-				else {
+				} else {
 					$statusofrecord = 'KO';
 					$statusofrecordnote = 'LineCorruptedOrNotMatchingPreviousOne';
 					$loweridinerror = $obj->rowid;
@@ -242,8 +239,7 @@ if ($action === 'downloadblockchain') {
 			}
 
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($db->lasterror, null, 'errors');
 		}
 	}
@@ -259,8 +255,7 @@ $form = new Form($db);
 if (GETPOST('withtab', 'alpha'))
 {
 	$title = $langs->trans("ModuleSetup").' '.$langs->trans('BlockedLog');
-}
-else {
+} else {
 	$title = $langs->trans("BrowseBlockedLog");
 }
 
@@ -274,8 +269,7 @@ if (!is_array($blocks))
 	if ($blocks == -2)
 	{
 		setEventMessages($langs->trans("TooManyRecordToScanRestrictFilters", $MAXLINES), null, 'errors');
-	}
-	else {
+	} else {
 		dol_print_error($block_static->db, $block_static->error, $block_static->errors);
 		exit;
 	}
@@ -434,8 +428,7 @@ if (!empty($conf->global->BLOCKEDLOG_SCAN_ALL_FOR_LOWERIDINERROR)) {
 
 	// TODO Make a full scan of table in reverse order of id of $block, so we can use the parameter $previoushash into checkSignature to save requests
 	// to find the $loweridinerror.
-}
-else {
+} else {
 	// This is version that optimize the memory (but will not report errors that are outside the filter range)
 	$loweridinerror = 0;
 	$checkresult = array();
@@ -503,8 +496,7 @@ if (is_array($blocks))
 		   	{
 		   		if ($checkresult[$block->id]) print img_picto($langs->trans('OkCheckFingerprintValidityButChainIsKo'), 'statut4');
 		   		else print img_picto($langs->trans('KoCheckFingerprintValidity'), 'statut8');
-		   	}
-		   	else {
+		   	} else {
 		   		print img_picto($langs->trans('OkCheckFingerprintValidity'), 'statut4');
 		   	}
 
diff --git a/htdocs/blockedlog/ajax/authority.php b/htdocs/blockedlog/ajax/authority.php
index 936ad5edb9c..64992bb33d6 100644
--- a/htdocs/blockedlog/ajax/authority.php
+++ b/htdocs/blockedlog/ajax/authority.php
@@ -52,18 +52,15 @@ if ($auth->fetch(0, $signature) <= 0) {
 
 if (!empty($hash)) {
 	echo $auth->checkBlockchain($hash) ? 'hashisok' : 'hashisjunk';
-}
-elseif (!empty($newblock)) {
+} elseif (!empty($newblock)) {
 	if ($auth->checkBlock($newblock)) {
 		$auth->addBlock($newblock);
 		$auth->update($user);
 
 		echo 'blockadded';
-	}
-	else {
+	} else {
 		echo 'blockalreadyadded';
 	}
-}
-else {
+} else {
 	echo 'idontunderstandwhatihavetodo';
 }
diff --git a/htdocs/blockedlog/ajax/block-info.php b/htdocs/blockedlog/ajax/block-info.php
index e2d588f1798..e83a71ea9b7 100644
--- a/htdocs/blockedlog/ajax/block-info.php
+++ b/htdocs/blockedlog/ajax/block-info.php
@@ -51,8 +51,7 @@ if ($block->fetch($id) > 0)
 {
 	$objtoshow = $block->object_data;
 	print formatObject($objtoshow, '');
-}
-else {
+} else {
 	print 'Error, failed to get unalterable log with id '.$id;
 }
 
@@ -94,17 +93,14 @@ function formatObject($objtoshow, $prefix)
 					var_dump(@get_class($val));
 					var_dump($val);*/
 					$s .= dol_print_date($val, 'dayhour');
-				}
-				else {
+				} else {
 					$s .= $val;
 				}
 				$s .= '</td></tr>';
-			}
-			elseif (is_array($val))
+			} elseif (is_array($val))
 			{
 				$s .= formatObject($val, ($prefix ? $prefix.' > ' : '').$key);
-			}
-			elseif (is_object($val))
+			} elseif (is_object($val))
 			{
 				$s .= formatObject($val, ($prefix ? $prefix.' > ' : '').$key);
 			}
diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index 95106bba4d2..69967d503a1 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -128,8 +128,7 @@ class BlockedLogAuthority
 
 		if (!in_array($block, $blocks)) {
 			return true;
-		}
-		else {
+		} else {
 			return false;
 		}
     }
@@ -179,13 +178,11 @@ class BlockedLogAuthority
 				$this->tms = $this->db->jdate($obj->tms);
 
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = $langs->trans("RecordNotFound");
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -230,13 +227,11 @@ class BlockedLogAuthority
 				$this->db->commit();
 
 				return $this->id;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -272,8 +267,7 @@ class BlockedLogAuthority
 			$this->db->commit();
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -311,8 +305,7 @@ class BlockedLogAuthority
 			echo $block->signature.' '.$url.' '.$res.'<br>';
 			if ($res === 'blockalreadyadded' || $res === 'blockadded') {
 				$block->setCertified();
-			}
-			else {
+			} else {
 				$this->error = $langs->trans('ImpossibleToContactAuthority ', $url);
 				return -1;
 			}
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 0226486116b..44311f1a580 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -201,8 +201,7 @@ class BlockedLog
 			$object = new Facture($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
 		}
@@ -212,98 +211,80 @@ class BlockedLog
 			$object = new FactureFournisseur($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'payment') {
+		} elseif ($this->element === 'payment') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
 			$object = new Paiement($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'payment_supplier') {
+		} elseif ($this->element === 'payment_supplier') {
 			require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 
 			$object = new PaiementFourn($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'payment_donation') {
+		} elseif ($this->element === 'payment_donation') {
 			require_once DOL_DOCUMENT_ROOT.'/don/class/paymentdonation.class.php';
 
 			$object = new PaymentDonation($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'payment_various') {
+		} elseif ($this->element === 'payment_various') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 
 			$object = new PaymentVarious($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'don' || $this->element === 'donation') {
+		} elseif ($this->element === 'don' || $this->element === 'donation') {
 			require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 
 			$object = new Don($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'subscription') {
+		} elseif ($this->element === 'subscription') {
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 
 			$object = new Subscription($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'cashcontrol') {
+		} elseif ($this->element === 'cashcontrol') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php';
 
 			$object = new CashControl($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->action == 'MODULE_SET')
+		} elseif ($this->action == 'MODULE_SET')
 		{
 			return '<i class="opacitymedium">System to track events into unalterable logs were enabled</i>';
-		}
-		elseif ($this->action == 'MODULE_RESET')
+		} elseif ($this->action == 'MODULE_RESET')
 		{
 			if ($this->signature == '0000000000') {
 				return '<i class="opacitymedium">System to track events into unalterable logs were disabled after some recording were done. We saved a special Fingerprint to track the chain as broken.</i>';
-			}
-			else {
+			} else {
 				return '<i class="opacitymedium">System to track events into unalterable logs were disabled. This is possible because no record were done yet.</i>';
 			}
 		}
@@ -360,24 +341,19 @@ class BlockedLog
 		if ($object->element == 'payment' || $object->element == 'payment_supplier')
 		{
 			$this->date_object = $object->datepaye;
-		}
-		elseif ($object->element == 'payment_salary')
+		} elseif ($object->element == 'payment_salary')
 		{
 			$this->date_object = $object->datev;
-		}
-		elseif ($object->element == 'payment_donation' || $object->element == 'payment_various')
+		} elseif ($object->element == 'payment_donation' || $object->element == 'payment_various')
 		{
 			$this->date_object = $object->datepaid ? $object->datepaid : $object->datep;
-		}
-		elseif ($object->element == 'subscription')
+		} elseif ($object->element == 'subscription')
 		{
 			$this->date_object = $object->dateh;
-		}
-		elseif ($object->element == 'cashcontrol')
+		} elseif ($object->element == 'cashcontrol')
 		{
 			$this->date_object = $object->date_creation;
-		}
-		else {
+		} else {
 			$this->date_object = $object->date;
 		}
 		// ref
@@ -476,13 +452,11 @@ class BlockedLog
 							$this->object_data->invoiceline[$lineid]->{$keyline} = $valueline;
 						}
 					}
-				}
-				elseif (!is_object($value)) $this->object_data->{$key} = $value;
+				} elseif (!is_object($value)) $this->object_data->{$key} = $value;
 			}
 
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
-		}
-		elseif ($this->element == 'invoice_supplier')
+		} elseif ($this->element == 'invoice_supplier')
 		{
 			foreach ($object as $key=>$value)
 			{
@@ -494,8 +468,7 @@ class BlockedLog
 			}
 
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
-		}
-		elseif ($this->element == 'payment' || $this->element == 'payment_supplier' || $this->element == 'payment_donation' || $this->element == 'payment_various')
+		} elseif ($this->element == 'payment' || $this->element == 'payment_supplier' || $this->element == 'payment_donation' || $this->element == 'payment_various')
 		{
 			$datepayment = $object->datepaye ? $object->datepaye : ($object->datepaid ? $object->datepaid : $object->datep);
 			$paymenttypeid = $object->paiementid ? $object->paiementid : ($object->paymenttype ? $object->paymenttype : $object->type_payment);
@@ -527,18 +500,15 @@ class BlockedLog
 				{
 					include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 					$tmpobject = new FactureFournisseur($this->db);
-				}
-				elseif ($this->element == 'payment')
+				} elseif ($this->element == 'payment')
 				{
 					include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 					$tmpobject = new Facture($this->db);
-				}
-				elseif ($this->element == 'payment_donation')
+				} elseif ($this->element == 'payment_donation')
 				{
 					include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 					$tmpobject = new Don($this->db);
-				}
-				elseif ($this->element == 'payment_various')
+				} elseif ($this->element == 'payment_various')
 				{
 					include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 					$tmpobject = new PaymentVarious($this->db);
@@ -571,8 +541,7 @@ class BlockedLog
 						$this->errors[] = $this->error;
 						dol_syslog("Failed to fetch thirdparty for object with id ".$tmpobject->id, LOG_ERR);
 						return -1;
-					}
-					elseif ($result < 0)
+					} elseif ($result < 0)
 					{
 						$this->error = $tmpobject->error;
 						$this->errors = $tmpobject->errors;
@@ -619,14 +588,12 @@ class BlockedLog
 			$this->object_data->amount = $totalamount;
 
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
-		}
-		elseif ($this->element == 'payment_salary')
+		} elseif ($this->element == 'payment_salary')
 		{
 			$this->object_data->amounts = array($object->amount);
 
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
-		}
-		elseif ($this->element == 'subscription')
+		} elseif ($this->element == 'subscription')
 		{
 			foreach ($object as $key=>$value)
 			{
@@ -638,8 +605,7 @@ class BlockedLog
 			}
 
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
-		}
-		else // Generic case
+		} else // Generic case
 		{
 			foreach ($object as $key=>$value)
 			{
@@ -712,13 +678,11 @@ class BlockedLog
 				$this->certified		= ($obj->certified == 1);
 
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = $langs->trans("RecordNotFound");
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -861,13 +825,11 @@ class BlockedLog
 				$this->db->commit();
 
 				return $this->id;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -948,8 +910,7 @@ class BlockedLog
 	 		{
 	 			$previoussignature = $obj->signature;
 	 		}
-	 	}
-	 	else {
+	 	} else {
 	 		dol_print_error($this->db);
 	 		exit;
 	 	}
@@ -989,16 +950,13 @@ class BlockedLog
 		if ($element == 'all') {
 	 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity;
-		}
-		elseif ($element == 'not_certified') {
+		} elseif ($element == 'not_certified') {
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity." AND certified = 0";
-		}
-		elseif ($element == 'just_certified') {
+		} elseif ($element == 'just_certified') {
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity." AND certified = 1";
-		}
-		else {
+		} else {
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity." AND element='".$element."' AND fk_object=".(int) $fk_object;
 		}
@@ -1091,8 +1049,7 @@ class BlockedLog
 		{
 			$obj = $this->db->fetch_object($res);
 			if ($obj) $result = true;
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		dol_syslog("Module Blockedlog alreadyUsed with ignoresystem=".$ignoresystem." is ".$result);
 
diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index 68c09977cbd..a764a2cd5ae 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -45,8 +45,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else {
+} else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -215,8 +214,7 @@ if ($object->id > 0)
     	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
     	{
         	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
-    	}
-    	else {
+    	} else {
         	print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
     	}
     }
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index f0f4a2f7b7d..5d072036851 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -176,8 +176,7 @@ if (empty($reshook))
     		{
     			setEventMessages($bomline->error, $bomline->errors, 'errors');
     			$action = '';
-    		}
-    		else {
+    		} else {
     			unset($_POST['idprod']);
     			unset($_POST['qty']);
     			unset($_POST['qty_frozen']);
@@ -215,8 +214,7 @@ if (empty($reshook))
 		{
 			setEventMessages($bomline->error, $bomline->errors, 'errors');
 			$action = '';
-		}
-		else {
+		} else {
 			unset($_POST['idprod']);
 			unset($_POST['qty']);
 			unset($_POST['qty_frozen']);
@@ -618,8 +616,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    		if ($permissiontoadd)
 	    		{
 	    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-	    		}
-	    		else {
+	    		} else {
 	    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
 	    		}
     		}
@@ -632,8 +629,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    			if (is_array($object->lines) && count($object->lines) > 0)
 	    			{
 	    				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
-	    			}
-	    			else {
+	    			} else {
 	    				$langs->load("errors");
 	    				print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
 	    			}
@@ -684,8 +680,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		if ($permissiontodelete)
     		{
     			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
-    		}
-    		else {
+    		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
     		}
     	}
diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index 0a68c799171..45aedbe8ee2 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -141,8 +141,7 @@ if ($object->id)
 	$relativepathwithnofile = 'bom/'.dol_sanitizeFileName($object->ref).'/';
 
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index 2159564aeed..3ff2b2138b4 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -196,10 +196,8 @@ if (empty($reshook))
 						setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 						$error++;
 						break;
-					}
-					else $nbok++;
-				}
-				else {
+					} else $nbok++;
+				} else {
 					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 					$error++;
 					break;
@@ -211,8 +209,7 @@ if (empty($reshook))
 				if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 				else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 				$db->commit();
-			}
-			else {
+			} else {
 				$db->rollback();
 			}
 			//var_dump($listofobjectthirdparties);exit;
@@ -249,10 +246,8 @@ if (empty($reshook))
 						setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 						$error++;
 						break;
-					}
-					else $nbok++;
-				}
-				else {
+					} else $nbok++;
+				} else {
 					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 					$error++;
 					break;
@@ -264,8 +259,7 @@ if (empty($reshook))
 				if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 				else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 				$db->commit();
-			}
-			else {
+			} else {
 				$db->rollback();
 			}
 			//var_dump($listofobjectthirdparties);exit;
@@ -360,8 +354,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else {
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -495,8 +488,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		}
-		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index 995f2c29f3a..f61df86fe69 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -164,8 +164,7 @@ class Boms extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve bom list');
         }
         if (!count($obj_ret)) {
@@ -228,8 +227,7 @@ class Boms extends DolibarrApi
         if ($this->bom->update($id, DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else {
+        } else {
             throw new RestException(500, $this->bom->error);
         }
     }
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index c3e7faede2c..8d6927c10cf 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -381,14 +381,11 @@ class BOM extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				}
-				elseif (strpos($key, 'date') !== false) {
+				} elseif (strpos($key, 'date') !== false) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				}
-				elseif ($key == 'customsql') {
+				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				}
-				else {
+				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
@@ -513,14 +510,12 @@ class BOM extends CommonObject
 	        if ($numref != "")
 	        {
 	            return $numref;
-	        }
-	        else {
+	        } else {
 	            $this->error = $obj->error;
 	            //dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 	            return "";
 	        }
-	    }
-	    else {
+	    } else {
 	        print $langs->trans("Error")." ".$langs->trans("Error_BOM_ADDON_NotDefined");
 	        return "";
 	    }
@@ -565,8 +560,7 @@ class BOM extends CommonObject
 	    {
 	        $this->fetch_product();
 	        $num = $this->getNextNumRef($this->product);
-	    }
-	    else {
+	    } else {
 	        $num = $this->ref;
 	    }
 	    $this->newref = dol_sanitizeFileName($num);
@@ -647,8 +641,7 @@ class BOM extends CommonObject
 	    {
 	        $this->db->commit();
 	        return 1;
-	    }
-	    else {
+	    } else {
 	        $this->db->rollback();
 	        return -1;
 	    }
@@ -784,8 +777,7 @@ class BOM extends CommonObject
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -891,8 +883,7 @@ class BOM extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -914,8 +905,7 @@ class BOM extends CommonObject
 	        $this->error = $this->error;
 	        $this->errors = $this->errors;
 	        return $result;
-	    }
-	    else {
+	    } else {
 	        $this->lines = $result;
 	        return $this->lines;
 	    }
@@ -1207,14 +1197,11 @@ class BOMLine extends CommonObjectLine
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				}
-				elseif (strpos($key, 'date') !== false) {
+				} elseif (strpos($key, 'date') !== false) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				}
-				elseif ($key == 'customsql') {
+				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				}
-				else {
+				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
@@ -1328,8 +1315,7 @@ class BOMLine extends CommonObjectLine
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -1422,8 +1408,7 @@ class BOMLine extends CommonObjectLine
 			}
 
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index 1019911b89f..e8fbbac28d2 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -99,8 +99,7 @@ if (!empty($conf->product->enabled) || !empty($conf->service->enabled))
 	{
 		// hide products in closed warehouse, but show products for internal transfer
 		$form->select_produits(GETPOST('idprod', 'int'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
-	}
-	else {
+	} else {
 		$form->select_produits(GETPOST('idprod', 'int'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOST('combinations', 'array'));
 	}
 
diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php
index 60e4a1b9756..2d8501130dc 100644
--- a/htdocs/bookmarks/admin/bookmark.php
+++ b/htdocs/bookmarks/admin/bookmark.php
@@ -44,8 +44,7 @@ if ($action == 'setvalue')
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 10452ddbd05..0f8c3763228 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -41,8 +41,7 @@ function printDropdownBookmarksList()
     if (!empty($_SERVER["QUERY_STRING"]))
     {
         $url .= (dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '');
-    }
-    else {
+    } else {
         global $sortfield, $sortorder;
         $tmpurl = '';
         // No urlencode, all param $url will be urlencoded later
@@ -121,8 +120,7 @@ function printDropdownBookmarksList()
     		}
     		$searchForm .= '</select>';
     	}
-    }
-    else {
+    } else {
     	dol_print_error($db);
     }
 
diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 28ce42b6b70..69c7207a817 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -100,20 +100,17 @@ if ($action == 'add' || $action == 'addproduct' || $action == 'update')
 			if (empty($backtopage)) $backtopage = ($urlsource ? $urlsource : ((!empty($url) && !preg_match('/^http/i', $url)) ? $url : DOL_URL_ROOT.'/bookmarks/list.php'));
 			header("Location: ".$backtopage);
 			exit;
-		}
-		else {
+		} else {
 			if ($object->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				$langs->load("errors");
 				setEventMessages($langs->transnoentities("WarningBookmarkAlreadyExists"), null, 'warnings');
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 			$action = $invertedaction;
 		}
-	}
-	else {
+	} else {
 		$action = $invertedaction;
 	}
 }
@@ -262,8 +259,7 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 	{
 		$liste = array(1=>$langs->trans("OpenANewWindow"), 0=>$langs->trans("ReplaceWindow"));
 		print $form->selectarray('target', $liste, isset($_POST["target"]) ? $_POST["target"] : $object->target);
-	}
-	else {
+	} else {
 		if ($object->target == 0) print $langs->trans("ReplaceWindow");
 		if ($object->target == 1) print $langs->trans("OpenANewWindow");
 	}
@@ -273,15 +269,13 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 	if ($action == 'edit' && $user->admin)
 	{
 		print img_picto('', 'user').' '.$form->select_dolusers(isset($_POST['userid']) ? $_POST['userid'] : ($object->fk_user ? $object->fk_user : ''), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-	}
-	else {
+	} else {
 		if ($object->fk_user > 0)
 		{
 			$fuser = new User($db);
 			$fuser->fetch($object->fk_user);
 			print $fuser->getNomUrl(1);
-		}
-		else {
+		} else {
 			print $langs->trans("Public");
 		}
 	}
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index 3a00d38eedc..5fab4496f6e 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -127,8 +127,7 @@ class Bookmark extends CommonObject
 
             $this->db->free($resql);
             return $this->id;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -173,15 +172,13 @@ class Bookmark extends CommonObject
                 $this->id = $id;
                 $this->db->commit();
                 return $id;
-            }
-            else {
+            } else {
                 $this->error = $this->db->lasterror();
                 $this->errno = $this->db->lasterrno();
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             $this->errno = $this->db->lasterrno();
             $this->db->rollback();
@@ -215,8 +212,7 @@ class Bookmark extends CommonObject
         if ($this->db->query($sql))
         {
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -238,8 +234,7 @@ class Bookmark extends CommonObject
         if ($resql)
         {
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -315,8 +310,7 @@ class Bookmark extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index ad944d93208..a132b708c20 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -72,8 +72,7 @@ if ($action == 'delete')
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -114,8 +113,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else {
+} else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -228,8 +226,7 @@ while ($i < min($num, $limit))
 		}
 		$tmpuser = $cacheOfUsers[$obj->fk_user];
 		print $tmpuser->getNomUrl(1);
-	}
-	else {
+	} else {
 		print $langs->trans("Public");
 	}
 	print "</td>\n";
@@ -249,8 +246,7 @@ while ($i < min($num, $limit))
 	if ($user->rights->bookmark->supprimer)
 	{
 		print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$obj->rowid.'">'.img_delete().'</a>';
-	}
-	else {
+	} else {
 		print "&nbsp;";
 	}
 	print "</td>";
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index 9542d0f2b48..dfd6e99a9ea 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -68,8 +68,7 @@ if (GETPOST('action', 'alpha') == 'set')
     {
         $db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         $db->rollback();
 	    setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -148,8 +147,7 @@ if (!empty($conf->stock->enabled))
 	print '<td colspan="2">';
 	if (empty($conf->productbatch->enabled)) {
 	    print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK', $conf->global->CASHDESK_NO_DECREASE_STOCK, 1);
-	}
-	else {
+	} else {
 	    if (!$conf->global->CASHDESK_NO_DECREASE_STOCK) {
 	        $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity);
 	    }
@@ -167,8 +165,7 @@ if (!empty($conf->stock->enabled))
 	{
 		print $formproduct->selectWarehouses($conf->global->CASHDESK_ID_WAREHOUSE, 'CASHDESK_ID_WAREHOUSE', '', 1, $disabled);
 		print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">('.$langs->trans("Create").')</a>';
-	}
-	else {
+	} else {
 		print '<span class="opacitymedium">'.$langs->trans("StockDecreaseForPointOfSaleDisabled").'</span>';
 	}
 	print '</td></tr>';
diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php
index bfad032c0b5..799c95b6b5b 100644
--- a/htdocs/cashdesk/affContenu.php
+++ b/htdocs/cashdesk/affContenu.php
@@ -36,8 +36,7 @@ if (isset($_SESSION['serObjFacturation']))
 {
     $obj_facturation = unserialize($_SESSION['serObjFacturation']);
     unset($_SESSION['serObjFacturation']);
-}
-else {
+} else {
 	// ... sinon, c'est une nouvelle vente
 	$obj_facturation = new Facturation();
 }
@@ -71,8 +70,7 @@ if (in_array(
 	))
 {
 	include $page.'.php';
-}
-else {
+} else {
 	dol_print_error('', 'menu param '.$page.' is not inside allowed list');
 }
 
diff --git a/htdocs/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php
index f5de48aa3cb..cc71d1c20d8 100644
--- a/htdocs/cashdesk/class/Auth.class.php
+++ b/htdocs/cashdesk/class/Auth.class.php
@@ -129,8 +129,7 @@ class Auth
                 $this->login($aLogin);
                 $this->passwd($aPasswd);
                 $ret = 0;
-            }
-            else {
+            } else {
                 $ret = -1;
             }
         }
diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
index a3c4f7e0a48..2fc93b0d155 100644
--- a/htdocs/cashdesk/class/Facturation.class.php
+++ b/htdocs/cashdesk/class/Facturation.class.php
@@ -294,12 +294,10 @@ class Facturation
         if (!$aId)
         {
             return $this->id;
-        }
-        elseif ($aId == 'RESET')
+        } elseif ($aId == 'RESET')
         {
             $this->id = null;
-        }
-        else {
+        } else {
             $this->id = $aId;
         }
     }
@@ -316,12 +314,10 @@ class Facturation
         if (is_null($aRef))
         {
             return $this->ref;
-        }
-        elseif ($aRef == 'RESET')
+        } elseif ($aRef == 'RESET')
         {
             $this->ref = null;
-        }
-        else {
+        } else {
             $this->ref = $aRef;
         }
     }
@@ -337,12 +333,10 @@ class Facturation
         if (is_null($aQte))
         {
             return $this->qte;
-        }
-        elseif ($aQte == 'RESET')
+        } elseif ($aQte == 'RESET')
         {
             $this->qte = null;
-        }
-        else {
+        } else {
             $this->qte = $aQte;
         }
     }
@@ -359,12 +353,10 @@ class Facturation
         if (is_null($aStock))
         {
             return $this->stock;
-        }
-        elseif ($aStock == 'RESET')
+        } elseif ($aStock == 'RESET')
         {
             $this->stock = null;
-        }
-        else {
+        } else {
             $this->stock = $aStock;
         }
     }
@@ -381,12 +373,10 @@ class Facturation
         if (is_null($aRemisePercent))
         {
             return $this->remise_percent;
-        }
-        elseif ($aRemisePercent == 'RESET')
+        } elseif ($aRemisePercent == 'RESET')
         {
             $this->remise_percent = null;
-        }
-        else {
+        } else {
             $this->remise_percent = $aRemisePercent;
         }
     }
@@ -577,12 +567,10 @@ class Facturation
         if (is_null($aTotalTtc))
         {
             return $this->prix_total_ttc;
-        }
-        elseif ($aTotalTtc == 'RESET')
+        } elseif ($aTotalTtc == 'RESET')
         {
             $this->prix_total_ttc = null;
-        }
-        else {
+        } else {
             $this->prix_total_ttc = $aTotalTtc;
         }
     }
diff --git a/htdocs/cashdesk/facturation.php b/htdocs/cashdesk/facturation.php
index fd49ad952b4..48032c3e840 100644
--- a/htdocs/cashdesk/facturation.php
+++ b/htdocs/cashdesk/facturation.php
@@ -80,8 +80,7 @@ if (GETPOST('filtre', 'alpha')) {
 			$i++;
 		}
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 	$tab_designations = $ret;
@@ -114,8 +113,7 @@ if (GETPOST('filtre', 'alpha')) {
 			$i++;
 		}
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 	$tab_designations = $ret;
@@ -128,16 +126,13 @@ if ($nbr_enreg > 1)
 	if ($nbr_enreg > $conf_taille_listes)
 	{
 		$top_liste_produits = '----- '.$conf_taille_listes.' '.$langs->transnoentitiesnoconv("CashDeskProducts").' '.$langs->trans("CashDeskOn").' '.$nbr_enreg.' -----';
-	}
-	else {
+	} else {
 		$top_liste_produits = '----- '.$nbr_enreg.' '.$langs->transnoentitiesnoconv("CashDeskProducts").' '.$langs->trans("CashDeskOn").' '.$nbr_enreg.' -----';
 	}
-}
-elseif ($nbr_enreg == 1)
+} elseif ($nbr_enreg == 1)
 {
 	$top_liste_produits = '----- 1 '.$langs->transnoentitiesnoconv("ProductFound").' -----';
-}
-else {
+} else {
 	$top_liste_produits = '----- '.$langs->transnoentitiesnoconv("NoProductFound").' -----';
 }
 
diff --git a/htdocs/cashdesk/facturation_dhtml.php b/htdocs/cashdesk/facturation_dhtml.php
index 0235c3dd788..99e1ed2f942 100644
--- a/htdocs/cashdesk/facturation_dhtml.php
+++ b/htdocs/cashdesk/facturation_dhtml.php
@@ -55,8 +55,7 @@ if (dol_strlen($search) >= 0)	// If search criteria is on char length at least
 		$sql .= " AND (p.ref LIKE '".$db->escape($search)."%' OR p.label LIKE '".$db->escape($search)."%'";
 		if (!empty($conf->barcode->enabled)) $sql .= " OR p.barcode LIKE '".$db->escape($search)."%'";
 		$sql .= ")";
-	}
-	else {
+	} else {
 		$sql .= " AND (p.ref LIKE '%".$db->escape($search)."%' OR p.label LIKE '%".$db->escape($search)."%'";
 		if (!empty($conf->barcode->enabled)) $sql .= " OR p.barcode LIKE '%".$db->escape($search)."%'";
 		$sql .= ")";
@@ -97,8 +96,7 @@ if (dol_strlen($search) >= 0)	// If search criteria is on char length at least
 			$resultat .= '</ul>';
 
 			print $resultat;
-		}
-		else {
+		} else {
 			$langs->load("cashdesk");
 
 			print '<ul class="dhtml_bloc">';
diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
index c92f1e31366..c62e31b1e3f 100644
--- a/htdocs/cashdesk/facturation_verif.php
+++ b/htdocs/cashdesk/facturation_verif.php
@@ -50,8 +50,7 @@ switch ($action)
 			if ($_POST['hdnSource'] == 'LISTE')
 			{
 				$sql .= " AND p.rowid = ".((int) GETPOST('selProduit', 'int'));
-			}
-			elseif ($_POST['hdnSource'] == 'REF')
+			} elseif ($_POST['hdnSource'] == 'REF')
 			{
 				$sql .= " AND p.ref = '".$db->escape(GETPOST('txtRef', 'alpha'))."'";
 			}
@@ -101,8 +100,7 @@ switch ($action)
 					        if (isset($prod->multiprices_tva_tx[$societe->price_level])) $tva_tx = $prod->multiprices_tva_tx[$societe->price_level];
 					        if (isset($prod->multiprices_recuperableonly[$societe->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$societe->price_level];
 					    }
-					}
-					elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+					} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 					{
 					    require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
@@ -123,8 +121,7 @@ switch ($action)
 					            $tva_npr = $prodcustprice->lines[0]->recuperableonly;
 					            if (empty($tva_tx)) $tva_npr = 0;
 					        }
-					    }
-					    else {
+					    } else {
 					        setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 					    }
 					}
@@ -161,31 +158,26 @@ switch ($action)
 					if ($_POST['hdnSource'] == 'LISTE')
 					{
 						$filtre = $ret['ref'];
-					}
-					elseif ($_POST['hdnSource'] == 'REF')
+					} elseif ($_POST['hdnSource'] == 'REF')
 					{
 						$filtre = $_POST['txtRef'];
 					}
 
 					$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation&filtre='.$filtre;
-				}
-				else {
+				} else {
 					$obj_facturation->raz();
 
 					if ($_POST['hdnSource'] == 'REF')
 					{
 						$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation&filtre='.$_POST['txtRef'];
-					}
-					else {
+					} else {
 						$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation';
 					}
 				}
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
-		}
-		else {
+		} else {
 			$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation';
 		}
 
diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php
index 4038b130d63..9d8bfc9b735 100644
--- a/htdocs/cashdesk/index.php
+++ b/htdocs/cashdesk/index.php
@@ -75,8 +75,7 @@ if (is_array($hookmanager->resArray) && !empty($hookmanager->resArray)) {
 if (!empty($mysoc->logo_small))
 {
 	print '<img class="logopos" alt="Logo company" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small).'">';
-}
-else {
+} else {
 	print '<div class="logopos">'.$mysoc->name.'</div>';
 }
 ?>
@@ -112,8 +111,7 @@ if (!empty($morelogincontent)) {
 				echo $option;
 			}
 		}
-	}
-	else {
+	} else {
 		echo '<!-- Option by hook -->';
 		echo $morelogincontent;
 	}
@@ -202,8 +200,7 @@ if ($_GET['err'] < 0)
 	echo ('<script type="text/javascript">');
 	echo ('	document.getElementById(\'frmLogin\').pwdPassword.focus();');
 	echo ('</script>');
-}
-else {
+} else {
 	echo ('<script type="text/javascript">');
 	echo ('	document.getElementById(\'frmLogin\').txtUsername.focus();');
 	echo ('</script>');
diff --git a/htdocs/cashdesk/index_verif.php b/htdocs/cashdesk/index_verif.php
index 0545c149dfa..204af8f51f7 100644
--- a/htdocs/cashdesk/index_verif.php
+++ b/htdocs/cashdesk/index_verif.php
@@ -116,12 +116,10 @@ if ($retour >= 0)
 
 		header('Location: '.DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation&id=NOUV');
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
-}
-else {
+} else {
 	// Load translation files required by the page
     $langs->loadLangs(array("other", "errors"));
 	$retour = $langs->trans("ErrorBadLoginPassword");
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
index f1e19b4df20..0d81f6e947e 100644
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -169,24 +169,21 @@ for ($i = 0; $i < $nbtoshow; $i++)
 			{
 				$langs->load("errors");
 				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("Cash").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("CashDesk"))).'" />';
-			}
-			else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cash").'" onclick="javascript: verifClic(\'ESP\');" />';
+			} else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cash").'" onclick="javascript: verifClic(\'ESP\');" />';
 			print '</div>';
 			print '<div class="inline-block" style="margin: 6px;">';
 			if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CB']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] < 0)
 			{
 				$langs->load("errors");
 				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("CashDesk"))).'" />';
-			}
-			else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" onclick="javascript: verifClic(\'CB\');" />';
+			} else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" onclick="javascript: verifClic(\'CB\');" />';
 			print '</div>';
 			print '<div class="inline-block" style="margin: 6px;">';
 			if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] < 0)
 			{
 				$langs->load("errors");
 				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CheckBank").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete"), $langs->transnoentitiesnoconv("CashDesk")).'" />';
-			}
-			else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CheckBank").'" onclick="javascript: verifClic(\'CHQ\');" />';
+			} else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CheckBank").'" onclick="javascript: verifClic(\'CHQ\');" />';
 			print '</div>';
 			print '<div class="clearboth">';
 			print '<div class="inline-block" style="margin: 6px;">';
diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php
index d60d370172d..6fe42b35aa4 100644
--- a/htdocs/cashdesk/tpl/validation1.tpl.php
+++ b/htdocs/cashdesk/tpl/validation1.tpl.php
@@ -40,8 +40,7 @@ $langs->loadLangs(array("main", "bills", "banks"));
 // Affichage de la tva par taux
 if ($obj_facturation->montantTva()) {
 	echo ('<tr><td class="resume_label">'.$langs->trans("VAT").'</td><td>'.price(price2num($obj_facturation->montantTva(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency).'</td></tr>');
-}
-else {
+} else {
 	echo ('<tr><td class="resume_label">'.$langs->trans("VAT").'</td><td>'.$langs->trans("NoVAT").'</td></tr>');
 }
 ?>
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index a7a938fd828..b2711479596 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -96,8 +96,7 @@ switch ($action)
 			$encaisse = $obj_facturation->montantEncaisse();
 
 			$obj_facturation->montantRendu($encaisse - $total);
-		}
-		else {
+		} else {
 		    //$txtDatePaiement=$_POST['txtDatePaiement'];
 		    $datePaiement = dol_mktime(0, 0, 0, $_POST['txtDatePaiementmonth'], $_POST['txtDatePaiementday'], $_POST['txtDatePaiementyear']);
 		    $txtDatePaiement = dol_print_date($datePaiement, 'dayrfc');
@@ -251,15 +250,13 @@ switch ($action)
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				setEventMessages($invoice->error, $invoice->errors, 'errors');
 			    $error++;
 			}
 
 			$id = $invoice->id;
-		}
-		else {
+		} else {
 		    $resultcreate = $invoice->create($user, 0, 0);
 			if ($resultcreate > 0)
 			{
@@ -327,13 +324,11 @@ switch ($action)
                   			//print 'set paid';exit;
                     	}
                     }
-				}
-				else {
+				} else {
 				    setEventMessages($invoice->error, $invoice->errors, 'errors');
 				    $error++;
 				}
-			}
-			else {
+			} else {
 				setEventMessages($invoice->error, $invoice->errors, 'errors');
 			    $error++;
 			}
@@ -344,8 +339,7 @@ switch ($action)
 		{
 			$db->commit();
 			$redirection = 'affIndex.php?menutpl=validation_ok&facid='.$id; // Ajout de l'id de la facture, pour l'inclure dans un lien pointant directement vers celle-ci dans Dolibarr
-		}
-		else {
+		} else {
 			$db->rollback();
 			$redirection = 'affIndex.php?facid='.$id.'&error=1&mesg=ErrorFailedToCreateInvoice'; // Ajout de l'id de la facture, pour l'inclure dans un lien pointant directement vers celle-ci dans Dolibarr
 		}
diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
index 017de5cd1e6..eb8af1ee44a 100644
--- a/htdocs/categories/admin/categorie.php
+++ b/htdocs/categories/admin/categorie.php
@@ -47,8 +47,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         setEventMessages($db->lasterror(), null, 'errors');
     }
 }
@@ -60,8 +59,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
          setEventMessages($db->lasterror(), null, 'errors');
     }
 }
@@ -105,13 +103,11 @@ print '<td align="center" width="100">';
 if ($conf->use_javascript_ajax)
 {
 	print ajax_constantonoff('CATEGORIE_RECURSIV_ADD');
-}
-else {
+} else {
 	if (empty($conf->global->CATEGORIE_RECURSIV_ADD))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_CATEGORIE_RECURSIV_ADD">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else {
+	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_CATEGORIE_RECURSIV_ADD">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index a91a3df7827..8eb6c3d8eda 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -88,38 +88,31 @@ if ($action == 'add' && $user->rights->categorie->creer)
 		{
 			header("Location: ".$urlfrom);
 			exit;
-		}
-		elseif ($idProdOrigin)
+		} elseif ($idProdOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProdOrigin.'&type='.$type);
 			exit;
-		}
-		elseif ($idCompanyOrigin)
+		} elseif ($idCompanyOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCompanyOrigin.'&type='.$type);
 			exit;
-		}
-		elseif ($idSupplierOrigin)
+		} elseif ($idSupplierOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idSupplierOrigin.'&type='.$type);
 			exit;
-		}
-		elseif ($idMemberOrigin)
+		} elseif ($idMemberOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$type);
 			exit;
-		}
-		elseif ($idContactOrigin)
+		} elseif ($idContactOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$type);
 			exit;
-		}
-		elseif ($idProjectOrigin)
+		} elseif ($idProjectOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$type);
 			exit;
-		}
-		else {
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
 			exit;
 		}
@@ -154,8 +147,7 @@ if ($action == 'add' && $user->rights->categorie->creer)
 		{
 			$action = 'confirmed';
 			$_POST["addcat"] = '';
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -171,38 +163,31 @@ if (($action == 'add' || $action == 'confirmed') && $user->rights->categorie->cr
 		{
 			header("Location: ".$urlfrom);
 			exit;
-		}
-		elseif ($backtopage)
+		} elseif ($backtopage)
 		{
 			header("Location: ".$backtopage);
 			exit;
-		}
-		elseif ($idProdOrigin)
+		} elseif ($idProdOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProdOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
-		}
-		elseif ($idCompanyOrigin)
+		} elseif ($idCompanyOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCompanyOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
-		}
-		elseif ($idSupplierOrigin)
+		} elseif ($idSupplierOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idSupplierOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
-		}
-		elseif ($idMemberOrigin)
+		} elseif ($idMemberOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
-		}
-		elseif ($idContactOrigin)
+		} elseif ($idContactOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
-		}
-		elseif ($idProjectOrigin)
+		} elseif ($idProjectOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index 205e38f3e5e..1cbaf4cbe14 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -179,8 +179,7 @@ class Categories extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve category list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -243,8 +242,7 @@ class Categories extends DolibarrApi
         if ($this->category->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else {
+        } else {
             throw new RestException(500, $this->category->error);
         }
     }
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index d8f5ef4eeeb..b6255221fa3 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -316,12 +316,10 @@ class Categorie extends CommonObject
 		if ($id > 0)
 		{
 			$sql .= " WHERE rowid = ".$id;
-		}
-		elseif (!empty($ref_ext))
+		} elseif (!empty($ref_ext))
 		{
 			$sql .= " WHERE ref_ext LIKE '".$this->db->escape($ref_ext)."'";
-		}
-		else {
+		} else {
 			$sql .= " WHERE label = '".$this->db->escape($label)."' AND entity IN (".getEntity('category').")";
 			if (!is_null($type)) $sql .= " AND type = ".$this->db->escape($type);
 		}
@@ -360,12 +358,10 @@ class Categorie extends CommonObject
 				if (!empty($conf->global->MAIN_MULTILANGS)) $this->getMultiLangs();
 
 				return 1;
-			}
-			else {
+			} else {
 				return 0;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -479,18 +475,15 @@ class Categorie extends CommonObject
                 {
     				$this->db->commit();
     				return $id;
-                }
-                else {
+                } else {
                 	$this->db->rollback();
                     return -3;
                 }
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -567,8 +560,7 @@ class Categorie extends CommonObject
 			$this->db->commit();
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			dol_print_error($this->db);
 			return -1;
@@ -653,8 +645,7 @@ class Categorie extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -713,8 +704,7 @@ class Categorie extends CommonObject
 							}
 						}
 					}
-				}
-				else {
+				} else {
 					$error++;
 					$this->error = $this->db->lasterror();
 				}
@@ -738,20 +728,17 @@ class Categorie extends CommonObject
 			{
 			    $this->db->commit();
 			    return 1;
-			}
-			else {
+			} else {
 			    $this->db->rollback();
 			    return -2;
 			}
-		}
-		else {
+		} else {
 		    $this->db->rollback();
 			if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				$this->error = $this->db->lasterrno();
 				return -3;
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror();
 			}
 			return -1;
@@ -802,13 +789,11 @@ class Categorie extends CommonObject
 			{
 			    $this->db->commit();
 			    return 1;
-			}
-			else {
+			} else {
 			    $this->db->rollback();
                 return -2;
 			}
-		}
-		else {
+		} else {
 		    $this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -859,16 +844,14 @@ class Categorie extends CommonObject
 			    if ($onlyids)
 			    {
 			    	$objs[] = $rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])];
-			    }
-			    else {
+			    } else {
 				    $obj = new $this->MAP_OBJ_CLASS[$type]($this->db);
 				    $obj->fetch($rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])]);
 				    $objs[] = $obj;
 			    }
 			}
 			return $objs;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error().' sql='.$sql;
 			return -1;
 		}
@@ -993,8 +976,7 @@ class Categorie extends CommonObject
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1029,8 +1011,7 @@ class Categorie extends CommonObject
 				$cats[] = $cat;
 			}
 			return $cats;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1062,8 +1043,7 @@ class Categorie extends CommonObject
 				$this->motherof[$obj->id_son] = $obj->id_parent;
 			}
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1099,18 +1079,15 @@ class Categorie extends CommonObject
         if (is_string($markafterid))
         {
             $markafterid = explode(',', $markafterid);
-        }
-        elseif (is_numeric($markafterid))
+        } elseif (is_numeric($markafterid))
         {
             if ($markafterid > 0)
             {
                 $markafterid = array($markafterid);
-            }
-            else {
+            } else {
                 $markafterid = array();
             }
-        }
-        elseif (!is_array($markafterid))
+        } elseif (!is_array($markafterid))
         {
             $markafterid = array();
         }
@@ -1146,8 +1123,7 @@ class Categorie extends CommonObject
 				$this->cats[$obj->rowid]['ref_ext'] = $obj->ref_ext;
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1291,8 +1267,7 @@ class Categorie extends CommonObject
 				$cats[$rec['rowid']] = $cat;
 			}
 			return $cats;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1354,8 +1329,7 @@ class Categorie extends CommonObject
 			}
 			dol_syslog(get_class($this)."::already_exists no category with same name=".$this->label." and same parent ".$this->fk_parent." than category id=".$this->id, LOG_DEBUG);
 			return 0;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1407,8 +1381,7 @@ class Categorie extends CommonObject
 			        $link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$cat->id.'&type='.$cat->type.'" class="'.$forced_color.'">';
 			        $linkend = '</a>';
 			        $w[] = $link.($addpicto ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
-				}
-				else {
+				} else {
 					$w[] = "<a href='".DOL_URL_ROOT."/".$url."?catid=".$cat->id."'>".($addpicto ? img_object('', 'category') : '').$cat->label."</a>";
 				}
 			}
@@ -1449,8 +1422,7 @@ class Categorie extends CommonObject
 				}
 			}
 			return $parents;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1529,13 +1501,11 @@ class Categorie extends CommonObject
     				    $cats[] = $cat;
     				}
 		        }
-		    }
-		    else {
+		    } else {
 		        dol_print_error($this->db);
 		        return -1;
 		    }
-		}
-        else {
+		} else {
     		$sql = "SELECT ct.fk_categorie, c.label, c.rowid";
     		$sql .= " FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type])." as ct, ".MAIN_DB_PREFIX."categorie as c";
     		$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".(int) $id." AND c.type = ".$this->MAP_ID[$type];
@@ -1556,8 +1526,7 @@ class Categorie extends CommonObject
     					$cats[] = $cat;
     				}
     			}
-    		}
-    		else {
+    		} else {
     			dol_print_error($this->db);
     			return -1;
     		}
@@ -1623,8 +1592,7 @@ class Categorie extends CommonObject
 			}
 
 			return $cats;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error().' sql='.$sql;
 			return -1;
 		}
@@ -1849,8 +1817,7 @@ class Categorie extends CommonObject
 	                $sql2 .= " SET label='".$this->db->escape($this->label)."',";
 	                $sql2 .= " description='".$this->db->escape($this->description)."'";
 	                $sql2 .= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";
-	            }
-	            else {
+	            } else {
 	                $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";
 	                $sql2 .= " VALUES(".$this->id.",'".$key."','".$this->db->escape($this->label);
 	                $sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
@@ -1861,8 +1828,7 @@ class Categorie extends CommonObject
 	                $this->error = $this->db->lasterror();
 	                return -1;
 	            }
-	        }
-	        elseif (isset($this->multilangs["$key"]))
+	        } elseif (isset($this->multilangs["$key"]))
 	        {
 	            if ($this->db->num_rows($result)) // si aucune ligne dans la base
 	            {
@@ -1870,8 +1836,7 @@ class Categorie extends CommonObject
 	                $sql2 .= " SET label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
 	                $sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
 	                $sql2 .= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";
-	            }
-	            else {
+	            } else {
 	                $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";
 	                $sql2 .= " VALUES(".$this->id.",'".$key."','".$this->db->escape($this->multilangs["$key"]["label"]);
 	                $sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
@@ -1929,8 +1894,7 @@ class Categorie extends CommonObject
 	            $this->multilangs["$obj->lang"]["description"] = $obj->description;
 	        }
 	        return 1;
-	    }
-	    else {
+	    } else {
 	        $this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
 	        return -1;
 	    }
@@ -2022,8 +1986,7 @@ class Categorie extends CommonObject
 			if (intval($searchCategory) == -2)
 			{
 				$searchCategorySqlList[] = " cp.fk_categorie IS NULL";
-			}
-			elseif (intval($searchCategory) > 0)
+			} elseif (intval($searchCategory) > 0)
 			{
 				$searchCategorySqlList[] = " ".$rowIdName
 										." IN (SELECT fk_".$type." FROM ".MAIN_DB_PREFIX."categorie_".$type
@@ -2034,8 +1997,7 @@ class Categorie extends CommonObject
 		if (!empty($searchCategorySqlList))
 		{
 			return " AND (".implode(' AND ', $searchCategorySqlList).")";
-		}
-		else {
+		} else {
 			return "";
 		}
 	}
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index dfd8f01f381..53a343046b7 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -108,12 +108,10 @@ if ($action == 'update' && $user->rights->categorie->creer)
 		{
 			header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index d88e1a0ff8c..026ff2f24ac 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -134,8 +134,7 @@ if ($catname || $id > 0)
 		print "\t</tr>\n";
 	}
 	print "</table>";
-}
-else print '&nbsp;';
+} else print '&nbsp;';
 
 
 //print '</td></tr></table>';
@@ -206,8 +205,7 @@ if ($nbofentries > 0)
 	print '<tr class="pair"><td colspan="3">';
 	tree_recur($data, $data[0], 0);
 	print '</td></tr>';
-}
-else {
+} else {
 	print '<tr class="pair">';
 	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
 	print '<td valign="middle">';
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index 7443bc5b532..ba09852d61b 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -179,8 +179,7 @@ if ($object->id)
 		{
 			print '<a class="butAction hideonsmartphone" href="'.$_SERVER['PHP_SELF'].'?action=ajout_photo&amp;id='.$object->id.'&amp;type='.$type.'">';
 			print $langs->trans("AddPhoto").'</a>';
-		}
-		else {
+		} else {
 			print '<a class="butActionRefused classfortooltip hideonsmartphone" href="#">';
 			print $langs->trans("AddPhoto").'</a>';
 		}
@@ -230,8 +229,7 @@ if ($object->id)
     			if ($obj['photo_vignette'])
     			{
     				$filename = $obj['photo_vignette'];
-    			}
-    			else {
+    			} else {
     				$filename = $obj['photo'];
     			}
 
@@ -278,8 +276,7 @@ if ($object->id)
 			print '<div class="opacitymedium">'.$langs->trans("NoPhotoYet")."</div>";
 		}
 	}
-}
-else {
+} else {
     print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index c3f87e404b7..ea36ce40edd 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -292,8 +292,7 @@ if ($action == 'edit')
 	print '</div>';
 
 	print '</form>';
-}
-elseif ($action != 'add')
+} elseif ($action != 'add')
 {
     if ($cnt_trans) print '<div class="underbanner clearboth"></div>';
 
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 921a1f12061..6c2a71fe21e 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -103,47 +103,40 @@ if ($id > 0 && $removeelem > 0)
 		$tmpobject = new Product($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'product';
-	}
-	elseif ($type == Categorie::TYPE_SUPPLIER && $user->rights->societe->creer)
+	} elseif ($type == Categorie::TYPE_SUPPLIER && $user->rights->societe->creer)
 	{
 		$tmpobject = new Societe($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'supplier';
-	}
-	elseif ($type == Categorie::TYPE_CUSTOMER && $user->rights->societe->creer)
+	} elseif ($type == Categorie::TYPE_CUSTOMER && $user->rights->societe->creer)
 	{
 		$tmpobject = new Societe($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'customer';
-	}
-	elseif ($type == Categorie::TYPE_MEMBER && $user->rights->adherent->creer)
+	} elseif ($type == Categorie::TYPE_MEMBER && $user->rights->adherent->creer)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 		$tmpobject = new Adherent($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'member';
-	}
-	elseif ($type == Categorie::TYPE_CONTACT && $user->rights->societe->creer) {
+	} elseif ($type == Categorie::TYPE_CONTACT && $user->rights->societe->creer) {
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$tmpobject = new Contact($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'contact';
-    }
-    elseif ($type == Categorie::TYPE_ACCOUNT && $user->rights->banque->configurer)
+    } elseif ($type == Categorie::TYPE_ACCOUNT && $user->rights->banque->configurer)
     {
         require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
         $tmpobject = new Account($db);
         $result = $tmpobject->fetch($removeelem);
         $elementtype = 'account';
-    }
-    elseif ($type == Categorie::TYPE_PROJECT && $user->rights->projet->creer)
+    } elseif ($type == Categorie::TYPE_PROJECT && $user->rights->projet->creer)
     {
         require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
         $tmpobject = new Project($db);
         $result = $tmpobject->fetch($removeelem);
         $elementtype = 'project';
-    }
-	elseif ($type == Categorie::TYPE_USER && $user->rights->user->user->creer)
+    } elseif ($type == Categorie::TYPE_USER && $user->rights->user->user->creer)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 		$tmpobject = new User($db);
@@ -161,8 +154,7 @@ if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confi
 	{
 		header("Location: ".DOL_URL_ROOT.'/categories/index.php?type='.$type);
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -179,13 +171,11 @@ if ($type == Categorie::TYPE_PRODUCT && $elemid && $action == 'addintocategory'
 	if ($result >= 0)
 	{
 		setEventMessages($langs->trans("WasAddedSuccessfully", $newobject->ref), null, 'mesgs');
-	}
-	else {
+	} else {
 		if ($cat->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			setEventMessages($langs->trans("ObjectAlreadyLinkedToCategory"), null, 'warnings');
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -327,14 +317,12 @@ $cats = $object->get_filles();
 if ($cats < 0)
 {
 	dol_print_error($db, $cats->error, $cats->errors);
-}
-elseif (count($cats) < 1)
+} elseif (count($cats) < 1)
 {
 	print '<tr class="oddeven">';
 	print '<td colspan="3" class="opacitymedium">'.$langs->trans("NoSubCat").'</td>';
 	print '</tr>';
-}
-else {
+} else {
 	$categstatic = new Categorie($db);
 
 	$fulltree = $categstatic->get_full_arbo($type, $object->id, 1);
@@ -403,8 +391,7 @@ else {
 
 		print '</td>';
 		print '</tr>';
-	}
-	else {
+	} else {
 		print '<tr class="pair">';
 		print '<td colspan="3">';
 		print '<table class="nobordernopadding">';
@@ -445,8 +432,7 @@ if ($type == Categorie::TYPE_PRODUCT)
 	if ($prods < 0)
 	{
 		dol_print_error($db, $prods->error, $prods->errors);
-	}
-	else {
+	} else {
 		// Form to add record into a category
 		$showclassifyform = 1;
 		if ($showclassifyform)
@@ -508,8 +494,7 @@ if ($type == Categorie::TYPE_PRODUCT)
 				print '</td>';
 				print "</tr>\n";
 			}
-		}
-		else {
+		} else {
 			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -526,8 +511,7 @@ if ($type == Categorie::TYPE_SUPPLIER)
 	if ($socs < 0)
 	{
 		dol_print_error($db, $socs->error, $socs->errors);
-	}
-	else {
+	} else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -567,8 +551,7 @@ if ($type == Categorie::TYPE_SUPPLIER)
 
 				print "</tr>\n";
 			}
-		}
-		else {
+		} else {
 			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -585,8 +568,7 @@ if ($type == Categorie::TYPE_CUSTOMER)
 	if ($socs < 0)
 	{
 		dol_print_error($db, $socs->error, $socs->errors);
-	}
-	else {
+	} else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -625,8 +607,7 @@ if ($type == Categorie::TYPE_CUSTOMER)
 				print '</td>';
 				print "</tr>\n";
 			}
-		}
-		else {
+		} else {
 			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -646,8 +627,7 @@ if ($type == Categorie::TYPE_MEMBER)
 	if ($prods < 0)
 	{
 		dol_print_error($db, $prods->error, $prods->errors);
-	}
-	else {
+	} else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -688,8 +668,7 @@ if ($type == Categorie::TYPE_MEMBER)
 				}
 				print "</tr>\n";
 			}
-		}
-		else {
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -707,8 +686,7 @@ if ($type == Categorie::TYPE_CONTACT)
 	if ($contacts < 0)
 	{
 		dol_print_error($db, $contacts->error, $contacts->errors);
-	}
-	else {
+	} else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -750,8 +728,7 @@ if ($type == Categorie::TYPE_CONTACT)
 				print '</td>';
 				print "</tr>\n";
 			}
-		}
-		else {
+		} else {
 			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -771,8 +748,7 @@ if ($type == Categorie::TYPE_ACCOUNT)
     if ($accounts < 0)
     {
         dol_print_error($db, $accounts->error, $accounts->errors);
-    }
-    else {
+    } else {
     	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
     	print '<input type="hidden" name="token" value="'.newToken().'">';
     	print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -812,8 +788,7 @@ if ($type == Categorie::TYPE_ACCOUNT)
                 }
                 print "</tr>\n";
             }
-        }
-        else {
+        } else {
             print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
         }
         print "</table>\n";
@@ -833,8 +808,7 @@ if ($type == Categorie::TYPE_PROJECT)
 	if ($objects < 0)
 	{
 		dol_print_error($db, $object->error, $object->errors);
-	}
-	else {
+	} else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -875,8 +849,7 @@ if ($type == Categorie::TYPE_PROJECT)
 				}
 				print "</tr>\n";
 			}
-		}
-		else {
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -894,8 +867,7 @@ if ($type == Categorie::TYPE_USER)
 	if ($users < 0)
 	{
 		dol_print_error($db, $object->error, $object->errors);
-	}
-	else {
+	} else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -933,8 +905,7 @@ if ($type == Categorie::TYPE_USER)
 				}
 				print "</tr>\n";
 			}
-		}
-		else {
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -955,8 +926,7 @@ if ($type == Categorie::TYPE_WAREHOUSE)
 	if ($objects < 0)
 	{
 		dol_print_error($db, $object->error, $object->errors);
-	}
-	else {
+	} else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -997,8 +967,7 @@ if ($type == Categorie::TYPE_WAREHOUSE)
 				}
 				print "</tr>\n";
 			}
-		}
-		else {
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
diff --git a/htdocs/collab/index.php b/htdocs/collab/index.php
index f6344f4ebf0..0c457fb6f47 100644
--- a/htdocs/collab/index.php
+++ b/htdocs/collab/index.php
@@ -94,8 +94,7 @@ if ($action == 'add')
 		$db->commit();
 		setEventMessages($langs->trans("PageAdded", $objectpage->pageurl), null, 'mesgs');
 		$action = '';
-	}
-	else {
+	} else {
 		$db->rollback();
 	}
 
@@ -128,12 +127,10 @@ if ($action == 'delete')
 
 			header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website);
 			exit;
-		}
-		else {
+		} else {
 			$db->rollback();
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 8a4018a5458..55cca00d7d7 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -172,8 +172,7 @@ if (empty($reshook) && $action == 'confirm_clone' && $confirm == 'yes')
 	if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 	{
 		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-	}
-	else {
+	} else {
 		if ($id > 0) {
 			//$object->fetch($id);
             if (!empty($object->socpeopleassigned)) {
@@ -241,8 +240,7 @@ if (empty($reshook) && $action == 'add')
 		$error++; $donotclearsession = 1;
 		$action = 'create';
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-	}
-	else {
+	} else {
 		$object->type_code = GETPOST('actioncode', 'aZ09');
 	}
 
@@ -260,13 +258,11 @@ if (empty($reshook) && $action == 'add')
 			if (GETPOST('actioncode', 'aZ09') == 'AC_RDV' && $contact->getFullName($langs))
 			{
 				$object->label = $langs->transnoentitiesnoconv("TaskRDVWith", $contact->getFullName($langs));
-			}
-			else {
+			} else {
 				if ($langs->trans("Action".$object->type_code) != "Action".$object->type_code)
 				{
 					$object->label = $langs->transnoentitiesnoconv("Action".$object->type_code)."\n";
-				}
-				else {
+				} else {
 					$cactioncomm->fetch($object->type_code);
 					$object->label = $cactioncomm->label;
 				}
@@ -386,17 +382,14 @@ if (empty($reshook) && $action == 'add')
 				{
 					dol_syslog("Back to ".$backtopage.($moreparam ? (preg_match('/\?/', $backtopage) ? '&'.$moreparam : '?'.$moreparam) : ''));
 					header("Location: ".$backtopage.($moreparam ? (preg_match('/\?/', $backtopage) ? '&'.$moreparam : '?'.$moreparam) : ''));
-				}
-				elseif ($idaction)
+				} elseif ($idaction)
 				{
 					header("Location: ".DOL_URL_ROOT.'/comm/action/card.php?id='.$idaction.($moreparam ? '&'.$moreparam : ''));
-				}
-				else {
+				} else {
 					header("Location: ".DOL_URL_ROOT.'/comm/action/index.php'.($moreparam ? '?'.$moreparam : ''));
 				}
 				exit;
-			}
-			else {
+			} else {
 				// If error
 				$db->rollback();
 				$langs->load("errors");
@@ -404,8 +397,7 @@ if (empty($reshook) && $action == 'add')
 				setEventMessages($error, null, 'errors');
 				$action = 'create'; $donotclearsession = 1;
 			}
-		}
-		else {
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'create'; $donotclearsession = 1;
@@ -482,8 +474,7 @@ if (empty($reshook) && $action == 'update')
 			{
 				if ($val['id'] > 0 && $val['id'] != $assignedtouser) $listofuserid[$val['id']] = $val;
 			}
-		}
-		else {
+		} else {
 			$assignedtouser = (!empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : 0);
 			if ($assignedtouser) $listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>($user->id == $assignedtouser ? $transparency : '')); // Owner first
 		}
@@ -510,8 +501,7 @@ if (empty($reshook) && $action == 'update')
 			$error++; $donotclearsession = 1;
 			$action = 'edit';
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-		}
-		else {
+		} else {
 			$result = $cactioncomm->fetch(GETPOST('actioncode', 'aZ09'));
 		}
 		if (empty($object->userownerid))
@@ -599,8 +589,7 @@ if (empty($reshook) && $action == 'update')
 				unset($_SESSION['assignedtouser']);
 
 				$db->commit();
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
 			}
@@ -637,8 +626,7 @@ if (empty($reshook) && $action == 'confirm_delete' && GETPOST("confirm") == 'yes
 		{
 			header("Location: index.php");
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -746,8 +734,7 @@ if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate')
     {
         header("Location: ".$backtopage);
         exit;
-    }
-    else {
+    } else {
         $action = '';
     }
 }
@@ -969,8 +956,7 @@ if ($action == 'create')
 		if ($assignedtouser) $listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>$object->transparency); // Owner first
 		$listofuserid[$user->id]['transparency'] = GETPOSTISSET('transparency') ?GETPOST('transparency', 'alpha') : 1; // 1 by default at first init
 		$_SESSION['assignedtouser'] = json_encode($listofuserid);
-	}
-	else {
+	} else {
 		if (!empty($_SESSION['assignedtouser']))
 		{
 			$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -1022,8 +1008,7 @@ if ($action == 'create')
 			$societe->fetch(GETPOST('socid', 'int'));
 			print $societe->getNomUrl(1);
 			print '<input type="hidden" id="socid" name="socid" value="'.GETPOST('socid', 'int').'">';
-		}
-		else {
+		} else {
 			$events = array();
 			$events[] = array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php?showempty=1', 1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
 			//For external user force the company to user company
@@ -1252,8 +1237,7 @@ if ($id > 0)
 		    if ($object->type_code != 'AC_OTH_AUTO')
 		    {
 		    	$formactions->select_type_actions(GETPOST("actioncode", 'aZ09') ?GETPOST("actioncode", 'aZ09') : $object->type_code, "actioncode", "systemauto");
-		    }
-		    else {
+		    } else {
                 print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">'.$langs->trans("Action".$object->type_code);
 		    }
 			print '</td></tr>';
@@ -1383,8 +1367,7 @@ if ($id > 0)
 	    		}
 	    	}
 	    	$_SESSION['assignedtouser'] = json_encode($listofuserid);
-	    }
-	    else {
+	    } else {
 	    	if (!empty($_SESSION['assignedtouser']))
 	    	{
 	    		$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -1507,8 +1490,7 @@ if ($id > 0)
 			    print '<input type="hidden" name="elementtype" value="'.$object->elementtype.'">';
 
 			    print '</td>';
-			}
-			else {
+			} else {
 			    print '<td>';
 			    print dolGetElementUrl($object->fk_element, $object->elementtype, 1);
 			    print '<input type="hidden" name="fk_element" value="'.$object->fk_element.'">';
@@ -1547,8 +1529,7 @@ if ($id > 0)
 		print '</div>';
 
 		print '</form>';
-	}
-	else {
+	} else {
 		dol_fiche_head($head, 'card', $langs->trans("Action"), -1, 'action');
 
 
@@ -1691,8 +1672,7 @@ if ($id > 0)
 				}
 			}
 			$_SESSION['assignedtouser'] = json_encode($listofuserid);
-		}
-		else {
+		} else {
 			if (!empty($_SESSION['assignedtouser']))
 			{
 				$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -1778,8 +1758,7 @@ if ($id > 0)
 						print '<div class="paddingright"></div>';
 					}
 				}
-			}
-			else {
+			} else {
 				print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
 			}
 			print '</td></tr>';
@@ -1836,8 +1815,7 @@ if ($id > 0)
 			   (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create))
 			{
 				print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=edit&id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
-			}
-			else {
+			} else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Modify").'</a></div>';
 			}
 
@@ -1845,8 +1823,7 @@ if ($id > 0)
 			   (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create))
 			{
 				print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=clone&object='.$object->element.'&id='.$object->id.'">'.$langs->trans("ToClone").'</a></div>';
-			}
-			else {
+			} else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("ToClone").'</a></div>';
 			}
 
@@ -1854,8 +1831,7 @@ if ($id > 0)
 			   (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->delete))
 			{
 				print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?action=delete&id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';
-			}
-			else {
+			} else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Delete").'</a></div>';
 			}
 		}
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 2c21f311e5d..7c35b9979c7 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -417,13 +417,11 @@ class ActionComm extends CommonObject
             {
                 $this->type_id = $cactioncomm->id;
                 $this->type_code = $cactioncomm->code;
-            }
-            elseif ($result == 0)
+            } elseif ($result == 0)
             {
                 $this->error = 'Failed to get record with id '.$this->type_id.' code '.$this->type_code.' from dictionary "type of events"';
                 return -1;
-            }
-            else {
+            } else {
                 $this->error = $cactioncomm->error;
                 return -1;
             }
@@ -577,13 +575,11 @@ class ActionComm extends CommonObject
             {
             	$this->db->commit();
             	return $this->id;
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else {
+        } else {
             $this->db->rollback();
             $this->error = $this->db->lasterror();
             return -1;
@@ -647,8 +643,7 @@ class ActionComm extends CommonObject
         {
             $this->db->commit();
             return $this->id;
-        }
-        else {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -762,8 +757,7 @@ class ActionComm extends CommonObject
                 $this->fetchResources();
             }
             $this->db->free($resql);
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -808,8 +802,7 @@ class ActionComm extends CommonObject
             }
 
         	return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -862,8 +855,7 @@ class ActionComm extends CommonObject
             }
 
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -945,13 +937,11 @@ class ActionComm extends CommonObject
             {
                 $this->db->commit();
                 return 1;
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else {
+        } else {
             $this->db->rollback();
             $this->error = $this->db->lasterror();
             return -1;
@@ -1097,14 +1087,12 @@ class ActionComm extends CommonObject
             {
                 $this->db->commit();
                 return 1;
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 dol_syslog(get_class($this)."::update ".join(',', $this->errors), LOG_ERR);
                 return -2;
             }
-        }
-        else {
+        } else {
             $this->db->rollback();
             $this->error = $this->db->lasterror();
             return -1;
@@ -1163,8 +1151,7 @@ class ActionComm extends CommonObject
             }
             $db->free($resql);
             return $resarray;
-        }
-        else {
+        } else {
             return $db->lasterror();
         }
     }
@@ -1223,8 +1210,7 @@ class ActionComm extends CommonObject
     		$this->db->free($resql);
     		if (empty($load_state_board)) return $response;
     		else return 1;
-    	}
-    	else {
+    	} else {
     		dol_print_error($this->db);
     		$this->error = $this->db->error();
     		return -1;
@@ -1274,8 +1260,7 @@ class ActionComm extends CommonObject
                 if (!empty($obj->fk_user_mod)) $this->date_modification = $this->db->jdate($obj->datem);
             }
             $this->db->free($result);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -1404,8 +1389,7 @@ class ActionComm extends CommonObject
 		    $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 		    $linkclose = ($hookmanager->resPrint ? $hookmanager->resPrint : $linkclose);
 		    */
-		}
-		else $linkclose .= ' class="'.$classname.'"';
+		} else $linkclose .= ' class="'.$classname.'"';
 
 		$url = '';
 		if ($option == 'birthday')
@@ -1435,8 +1419,7 @@ class ActionComm extends CommonObject
             $libelle = $label;
             if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle = $labeltype;
             $libelleshort = '';
-        }
-        else {
+        } else {
             $libelle = (empty($this->libelle) ? $label : $this->libelle.(($label && $label != $this->libelle) ? ' '.$label : ''));
             if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) $libelle = $labeltype;
             if ($maxlength < 0) $libelleshort = $this->ref;
@@ -1677,8 +1660,7 @@ class ActionComm extends CommonObject
                     {
                         $dateend = $this->db->jdate($obj->datep2)
                                  - (empty($conf->global->AGENDA_EXPORT_FIX_TZ) ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
-                    }
-                    else {
+                    } else {
                         // use start date as fall-back to avoid import erros on empty end date
                         $dateend = $datestart;
                     }
@@ -1734,8 +1716,7 @@ class ActionComm extends CommonObject
 				{
 					$eventarray = $hookmanager->resArray;
 				}
-            }
-            else {
+            } else {
                 $this->error = $this->db->lasterror();
                 return -1;
             }
@@ -1768,15 +1749,13 @@ class ActionComm extends CommonObject
 
                             $timestampStart = dol_stringtotime($obj->date_start." 00:00:00", 0);
                             $timestampEnd   = dol_stringtotime($obj->date_end." 12:00:00", 0);
-                        }
-                        elseif ($obj->halfday == 1)
+                        } elseif ($obj->halfday == 1)
                         {
                             $event['fulldayevent'] = false;
 
                             $timestampStart = dol_stringtotime($obj->date_start." 12:00:00", 0);
                             $timestampEnd   = dol_stringtotime($obj->date_end." 23:59:59", 0);
-                        }
-                        else {
+                        } else {
                             $event['fulldayevent'] = true;
 
                             $timestampStart = dol_stringtotime($obj->date_start." 00:00:00", 0);
@@ -1810,8 +1789,7 @@ class ActionComm extends CommonObject
                         {
                             // 2 = leave wait for approval
                             $event['summary'] = $title." - ".$obj->lastname." (wait for approval)";
-                        }
-                        else {
+                        } else {
                             // 3 = leave approved
                             $event['summary'] = $title." - ".$obj->lastname;
                         }
@@ -1836,8 +1814,7 @@ class ActionComm extends CommonObject
                 $title = 'Dolibarr actions '.$mysoc->name.' - '.$more;
                 $desc = $more;
                 $desc .= ' ('.$mysoc->name.' - built by Dolibarr)';
-            }
-            else {
+            } else {
                 $title = 'Dolibarr actions '.$mysoc->name;
                 $desc = $langs->transnoentities('ListOfActions');
                 $desc .= ' ('.$mysoc->name.' - built by Dolibarr)';
@@ -1861,8 +1838,7 @@ class ActionComm extends CommonObject
                     dol_delete_file($outputfiletmp, 0, 1);
                     $result = -1;
                 }
-            }
-            else {
+            } else {
                 dol_syslog(get_class($this)."::build_exportfile build_xxxfile function fails to for format=".$format." outputfiletmp=".$outputfile, LOG_ERR);
                 dol_delete_file($outputfiletmp, 0, 1);
                 $langs->load("errors");
diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
index f987d551766..d3f4fb3f238 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -200,28 +200,23 @@ class ActionCommReminder extends CommonObject
 		{
 			if ($status == 1) return $langs->trans('Done');
 			elseif ($status == 0) return $langs->trans('ToDo');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($langs->trans('Done'), 'statut4').' '.$langs->trans('Done');
 			elseif ($status == 0) return img_picto($langs->trans('ToDo'), 'statut5').' '.$langs->trans('ToDo');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($langs->trans('Done'), 'statut4');
 			elseif ($status == 0) return img_picto($langs->trans('ToDo'), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($langs->trans('Done'), 'statut4').' '.$langs->trans('Done');
 			elseif ($status == 0) return img_picto($langs->trans('ToDo'), 'statut5').' '.$langs->trans('ToDo');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'), 'statut4');
 			elseif ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'), 'statut5');
-		}
-		elseif ($mode == 6)
+		} elseif ($mode == 6)
 		{
 			if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'), 'statut4');
 			elseif ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'), 'statut5');
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index a8cb6b5de8f..20b88dd73d7 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -175,8 +175,7 @@ class AgendaEvents extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve Agenda Event list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index d3e4f93b5f7..147a6ff7ef0 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -104,13 +104,11 @@ class CActionComm
 
                 $this->db->free($resql);
                 return 1;
-            }
-            else {
+            } else {
                 $this->db->free($resql);
                 return 0;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -206,8 +204,7 @@ class CActionComm
             if ($idorcode == 'id') $this->liste_array = $repid;
             if ($idorcode == 'code') $this->liste_array = $repcode;
             return $this->liste_array;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index 2b74c4793d9..b806dde94f9 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -179,15 +179,13 @@ class ICal
 								$tmpkey = '';
 								$tmpvalue = '';
 							}
-						}
-                    	elseif (preg_match('/^ENCODING=QUOTED-PRINTABLE:/i', $value))
+						} elseif (preg_match('/^ENCODING=QUOTED-PRINTABLE:/i', $value))
                     	{
                     		if (preg_match('/=$/', $value))
                     		{
                     			$tmpkey = $key;
                     			$tmpvalue = $tmpvalue.preg_replace('/=$/', "", $value); // We must wait to have next line to have complete message
-                    		}
-                    		else {
+                    		} else {
                     			$value = quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i', '', $tmpvalue.$value));
                     		}
                     	}                    	//$value=quotedPrintDecode($tmpvalue.$value);
@@ -235,8 +233,7 @@ class ICal
         	if (stristr($key, "DTSTART;VALUE=DATE") || stristr($key, "DTEND;VALUE=DATE"))
         	{
         		list($key, $value) = array($key, $value);
-        	}
-        	else {
+        	} else {
         		list($key, $value) = $this->ical_dt_date($key, $value);
         	}
         }
@@ -375,8 +372,7 @@ class ICal
         {
             usort($temp, array(&$this, "ical_dtstart_compare"));
             return $temp;
-        }
-        else {
+        } else {
             return false;
         }
     }
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 3bd141ca964..fa4387b0861 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -215,8 +215,7 @@ if ($object->id > 0)
 			}
 		}
 		$_SESSION['assignedtouser'] = json_encode($listofuserid);
-	}
-	else {
+	} else {
 		if (!empty($_SESSION['assignedtouser']))
 		{
 			$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -262,8 +261,7 @@ if ($object->id > 0)
 	$permission = $user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 7b45b3f6ceb..b83a374d1a3 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -95,8 +95,7 @@ if (GETPOST('search_actioncode', 'array'))
 {
     $actioncode = GETPOST('search_actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else {
+} else {
 	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
@@ -459,13 +458,11 @@ if (!empty($conf->use_javascript_ajax))	// If javascript on
     if (empty($reshook))
     {
 		$s .= $hookmanager->resPrint;
-    }
-    elseif ($reshook > 1)
+    } elseif ($reshook > 1)
 	{
     	$s = $hookmanager->resPrint;
     }
-}
-else // If javascript off
+} else // If javascript off
 {
 	$newparam = $param; // newparam is for birthday links
     $newparam = preg_replace('/showbirthday=[0-1]/i', 'showbirthday='.(empty($showbirthday) ? 1 : 0), $newparam);
@@ -515,16 +512,14 @@ if (!empty($actioncode))
             if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
             if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
         }
-    }
-    else {
+    } else {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
         else {
             if (is_array($actioncode))
             {
 	        	$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
-            }
-            else {
+            } else {
 	        	$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
             }
         }
@@ -548,8 +543,7 @@ if ($action == 'show_day')
     $sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
     $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
     $sql .= ')';
-}
-else {
+} else {
     // To limit array
     $sql .= " AND (";
     $sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, 1, $year) - (60 * 60 * 24 * 7))."'"; // Start 7 days before
@@ -645,8 +639,7 @@ if ($resql)
         $event->date_start_in_calendar >= $lastdaytoshow)
         {
             // This record is out of visible range
-        }
-        else {
+        } else {
             if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar = $firstdaytoshow;
             if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
 
@@ -667,16 +660,14 @@ if ($resql)
 
                 $daykey += 60 * 60 * 24;
                 if ($daykey > $event->date_end_in_calendar) $loop = false;
-            }
-            while ($loop);
+            } while ($loop);
 
             //print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
             //print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array<br>';
         }
         $i++;
     }
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -692,8 +683,7 @@ if ($showbirthday)
     {
         $sql .= ' AND MONTH(birthday) = '.$month;
         $sql .= ' AND DAY(birthday) = '.$day;
-    }
-    else {
+    } else {
         $sql .= ' AND MONTH(birthday) = '.$month;
     }
     $sql .= ' ORDER BY birthday';
@@ -735,12 +725,10 @@ if ($showbirthday)
                 $eventarray[$daykey][] = $event;
                 $daykey += 60 * 60 * 24;
                 if ($daykey > $event->date_end_in_calendar) $loop = false;
-            }
-            while ($loop);
+            } while ($loop);
             $i++;
         }
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -757,12 +745,10 @@ if ($conf->global->AGENDA_SHOW_HOLIDAYS)
     {
         // Request only leaves for the current selected day
         $sql .= " AND '".$year."-".$month."-".$day."' BETWEEN x.date_debut AND x.date_fin";
-    }
-    elseif ($action == 'show_week')
+    } elseif ($action == 'show_week')
     {
         // TODO: Add filter to reduce database request
-    }
-    elseif ($action == 'show_month')
+    } elseif ($action == 'show_month')
     {
         // TODO: Add filter to reduce database request
     }
@@ -795,8 +781,7 @@ if ($conf->global->AGENDA_SHOW_HOLIDAYS)
             {
                 // Show no symbol for leave with state "leave approved"
                 $event->percentage = -1;
-            }
-            elseif ($obj->status == 2)
+            } elseif ($obj->status == 2)
             {
                 // Show TO-DO symbol for leave with state "leave wait for approval"
                 $event->percentage = 0;
@@ -805,12 +790,10 @@ if ($conf->global->AGENDA_SHOW_HOLIDAYS)
             if ($obj->halfday == 1)
             {
                 $event->label = $obj->lastname.' ('.$langs->trans("Morning").')';
-            }
-            elseif ($obj->halfday == -1)
+            } elseif ($obj->halfday == -1)
             {
                 $event->label = $obj->lastname.' ('.$langs->trans("Afternoon").')';
-            }
-            else {
+            } else {
                 $event->label = $obj->lastname;
             }
 
@@ -823,9 +806,7 @@ if ($conf->global->AGENDA_SHOW_HOLIDAYS)
                 $eventarray[$daykey][] = $event;
 
                 $daykey += 60 * 60 * 24;
-            }
-
-            while ($daykey <= $event->date_end_in_calendar);
+            } while ($daykey <= $event->date_end_in_calendar);
 
             $i++;
         }
@@ -867,8 +848,7 @@ if (count($listofextcals))
                     {
                         $datecurstart = dol_stringtotime($icalevent['DTSTART;VALUE=DATE'], 1);
                         $datecurend = dol_stringtotime($icalevent['DTEND;VALUE=DATE'], 1) - 1; // We remove one second to get last second of day
-                    }
-                    elseif (is_array($icalevent['DTSTART']) && !empty($icalevent['DTSTART']['unixtime']))
+                    } elseif (is_array($icalevent['DTSTART']) && !empty($icalevent['DTSTART']['unixtime']))
                     {
                         $datecurstart = $icalevent['DTSTART']['unixtime'];
                         $datecurend = $icalevent['DTEND']['unixtime'];
@@ -888,8 +868,7 @@ if (count($listofextcals))
                         }
                         // datecurstart and datecurend are now GMT date
                         //var_dump($datecurstart); var_dump($datecurend); exit;
-                    }
-                    else {
+                    } else {
                         // Not a recongized record
                         dol_syslog("Found a not recognized repeatable record with unknown date start", LOG_ERR);
                         continue;
@@ -913,8 +892,7 @@ if (count($listofextcals))
                             {
                                 $newevent['DTSTART;VALUE=DATE'] = dol_print_date($datecurstart, '%Y%m%d');
                                 $newevent['DTEND;VALUE=DATE'] = dol_print_date($datecurend + 1, '%Y%m%d');
-                            }
-                            else {
+                            } else {
                                 $newevent['DTSTART'] = $datecurstart;
                                 $newevent['DTEND'] = $datecurend;
                             }
@@ -932,13 +910,11 @@ if (count($listofextcals))
                         {
                             $datecurstart = dol_time_plus_duree($datecurstart, $interval, 'w');
                             $datecurend = dol_time_plus_duree($datecurend, $interval, 'w');
-                        }
-                        elseif ($icalevent['RRULE']['FREQ'] == 'MONTHLY')
+                        } elseif ($icalevent['RRULE']['FREQ'] == 'MONTHLY')
                         {
                             $datecurstart = dol_time_plus_duree($datecurstart, $interval, 'm');
                             $datecurend = dol_time_plus_duree($datecurend, $interval, 'm');
-                        }
-                        elseif ($icalevent['RRULE']['FREQ'] == 'YEARLY')
+                        } elseif ($icalevent['RRULE']['FREQ'] == 'YEARLY')
                         {
                             $datecurstart = dol_time_plus_duree($datecurstart, $interval, 'y');
                             $datecurend = dol_time_plus_duree($datecurend, $interval, 'y');
@@ -975,8 +951,7 @@ if (count($listofextcals))
                     //print dol_print_date($dateend,'dayhour','gmt');
                     $event->fulldayevent = 1;
                     $addevent = true;
-                }
-                elseif (!is_array($icalevent['DTSTART'])) // not fullday event (DTSTART is not array. It is a value like '19700101T000000Z' for 00:00 in greenwitch)
+                } elseif (!is_array($icalevent['DTSTART'])) // not fullday event (DTSTART is not array. It is a value like '19700101T000000Z' for 00:00 in greenwitch)
                 {
                     $datestart = $icalevent['DTSTART'];
                     $dateend = $icalevent['DTEND'];
@@ -987,8 +962,7 @@ if (count($listofextcals))
                     $addevent = true;
                     //var_dump($offsettz);
                     //var_dump(dol_print_date($datestart, 'dayhour', 'gmt'));
-                }
-                elseif (isset($icalevent['DTSTART']['unixtime']))	// File contains a local timezone + a TZ (for example when using bluemind)
+                } elseif (isset($icalevent['DTSTART']['unixtime']))	// File contains a local timezone + a TZ (for example when using bluemind)
                 {
                     $datestart = $icalevent['DTSTART']['unixtime'];
                     $dateend = $icalevent['DTEND']['unixtime'];
@@ -1050,8 +1024,7 @@ if (count($listofextcals))
                         //print 'x'.$datestart.'-'.$dateend;exit;
                         //print 'x'.$datestart.'-'.$dateend;exit;
                         // This record is out of visible range
-                    }
-                    else {
+                    } else {
                         if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar = $firstdaytoshow;
                         if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
 
@@ -1071,8 +1044,7 @@ if (count($listofextcals))
                             $eventarray[$daykey][] = $event;
                             $daykey += 60 * 60 * 24; $daykeygmt += 60 * 60 * 24; // Add one day
                             if (($event->fulldayevent ? $daykeygmt : $daykey) > $event->date_end_in_calendar) $loop = false;
-                        }
-                        while ($loop);
+                        } while ($loop);
                     }
                 }
             }
@@ -1141,8 +1113,7 @@ if (empty($action) || $action == 'show_month')      // View by month
         {
             $labelshort = array(0=>'SundayMin', 1=>'MondayMin', 2=>'TuesdayMin', 3=>'WednesdayMin', 4=>'ThursdayMin', 5=>'FridayMin', 6=>'SaturdayMin');
             print $langs->trans($labelshort[$numdayinweek]);
-        }
-        else print $langs->trans("Day".$numdayinweek);
+        } else print $langs->trans("Day".$numdayinweek);
         print '  </td>'."\n";
         $i++;
     }
@@ -1200,8 +1171,7 @@ if (empty($action) || $action == 'show_month')      // View by month
 	print '<input type="hidden" name="actionmove" value="mupdate">';
 	print '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';
 	print '<input type="hidden" name="newdate" id="newdate">';
-}
-elseif ($action == 'show_week') // View by week
+} elseif ($action == 'show_week') // View by week
 {
     $newparam = $param; // newparam is for birthday links
     $newparam = preg_replace('/showbirthday=/i', 'showbirthday_=', $newparam); // To avoid replacement when replace day= is done
@@ -1255,8 +1225,7 @@ elseif ($action == 'show_week') // View by week
     echo '<input type="hidden" name="actionmove" value="mupdate">';
     echo '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';
     echo '<input type="hidden" name="newdate" id="newdate">';
-}
-else // View by day
+} else // View by day
 {
     $newparam = $param; // newparam is for birthday links
     $newparam = preg_replace('/action=show_month&?/i', '', $newparam);
@@ -1330,8 +1299,7 @@ else // View by day
 		show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 1);
 
 		print '</div>';
-    }
-    else {
+    } else {
     	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 
     	show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 0);
@@ -1452,8 +1420,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 
 	                    // We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
 	                    if (!empty($cacheusers[$event->userownerid]->color)) $color = $cacheusers[$event->userownerid]->color;
-                    }
-                    elseif ($event->type_code == 'ICALEVENT')      // Event come from external ical file
+                    } elseif ($event->type_code == 'ICALEVENT')      // Event come from external ical file
                     {
                     	$numical++;
                     	if (!empty($event->icalname)) {
@@ -1465,12 +1432,10 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 
                     	$color = ($event->icalcolor ? $event->icalcolor : -1);
                     	$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');
-                    }
-                    elseif ($event->type_code == 'BIRTHDAY')
+                    } elseif ($event->type_code == 'BIRTHDAY')
                     {
                     	$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unmovable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
-                    }
-                    else {
+                    } else {
                     	$numother++;
                     	$color = ($event->icalcolor ? $event->icalcolor : -1);
                     	$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');
@@ -1494,8 +1459,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     	if (isset($colorindexused[$idusertouse]))
                     	{
                     		$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
-                    	}
-                    	else {
+                    	} else {
                    			$colorindex = $nextindextouse;
                    			$colorindexused[$idusertouse] = $colorindex;
                     		if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
@@ -1510,8 +1474,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     if ($event->type_code == 'AC_OTH_AUTO')
                     {
                         $cssclass .= " unmovable";
-                    }
-                    elseif ($event->type_code == 'ICALEVENT')
+                    } elseif ($event->type_code == 'ICALEVENT')
                     {
                         $cssclass .= " unmovable";
                     } elseif ($event->date_end_in_calendar && date('Ymd', $event->date_start_in_calendar) != date('Ymd', $event->date_end_in_calendar)) {
@@ -1522,8 +1485,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                         {
                             $cssclass .= " unmovable";
                         }
-                    }
-                    else {
+                    } else {
                         if ($user->rights->agenda->allactions->create ||
                             (($event->authorid == $user->id || $event->userownerid == $user->id) && $user->rights->agenda->myactions->create))
                         {
@@ -1557,8 +1519,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     if (empty($event->transparency) && empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY))
                     {
                     	print 'border: 2px solid #'.$colortouse.';';
-                    }
-                    else {
+                    } else {
                     	print 'background: #'.$colortouse.';';
                     	print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($colortouse, -3).'), to(#'.dol_color_minus($colortouse, -1).'));';
                     }
@@ -1577,12 +1538,10 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     if ($event->type_code == 'BIRTHDAY') // It's a birthday
                     {
                         print $event->getNomUrl(1, $maxnbofchar, 'cal_event', 'birthday', 'contact');
-                    }
-					elseif ($event->type_code == 'HOLIDAY')
+                    } elseif ($event->type_code == 'HOLIDAY')
                     {
                         print $event->getNomUrl(1, $maxnbofchar, 'cal_event', 'holiday', 'user');
-                    }
-                    elseif ($event->type_code != 'BIRTHDAY' && $event->type_code != 'HOLIDAY')
+                    } elseif ($event->type_code != 'BIRTHDAY' && $event->type_code != 'HOLIDAY')
                     {
                         // Picto
                         if (empty($event->fulldayevent))
@@ -1625,8 +1584,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                                 if ($tmpyearend == $annee && $tmpmonthend == $mois && $tmpdayend == $jour)
                                 $daterange .= dol_print_date($event->date_end_in_calendar, '%H:%M'); // Il faudrait utiliser ici tzuser, mais si on ne peut pas car qd on rentre un date dans fiche action, en input la conversion local->gmt se base sur le TZ server et non user
                             }
-                        }
-                        else {
+                        } else {
                             if ($showinfo)
                             {
                                 print $langs->trans("EventOnFullDay")."<br>\n";
@@ -1681,8 +1639,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                                 $thirdparty = new Societe($db);
                                 $thirdparty->fetch($thirdparty_id);
                                 $cachethirdparties[$thirdparty_id] = $thirdparty;
-                            }
-                            else $thirdparty = $cachethirdparties[$thirdparty_id];
+                            } else $thirdparty = $cachethirdparties[$thirdparty_id];
                             if (!empty($thirdparty->id)) $linerelatedto .= $thirdparty->getNomUrl(1, '', 0);
                         }
                         if (!empty($contact_id) && $contact_id > 0)
@@ -1692,8 +1649,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                                 $contact = new Contact($db);
                                 $contact->fetch($contact_id);
                                 $cachecontacts[$contact_id] = $contact;
-                            }
-                            else $contact = $cachecontacts[$contact_id];
+                            } else $contact = $cachecontacts[$contact_id];
                             if ($linerelatedto) $linerelatedto .= '&nbsp;';
                             if (!empty($contact->id)) $linerelatedto .= $contact->getNomUrl(1, '', 0);
                         }
@@ -1730,8 +1686,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     print '</td></tr></table>';
                     print '</div><!-- end event '.$i.' -->'."\n";
                     $i++;
-                }
-                else {
+                } else {
                 	print '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action='.$action.'&maxprint=0&month='.$monthshown.'&year='.$year;
                     print ($status ? '&status='.$status : '').($filter ? '&filter='.$filter : '');
                     print ($filtert ? '&search_filtert='.$filtert : '');
@@ -1792,8 +1747,7 @@ function dol_color_minus($color, $minus, $minusunit = 16)
     	$newcolor[0] = dechex(max(min(hexdec($newcolor[0]) - $minus, 15), 0));
     	$newcolor[2] = dechex(max(min(hexdec($newcolor[2]) - $minus, 15), 0));
     	$newcolor[4] = dechex(max(min(hexdec($newcolor[4]) - $minus, 15), 0));
-	}
-	else {
+	} else {
 	    // Not yet implemented
 	}
 	return $newcolor;
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 2c9061b7ec8..5e71e150ece 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -54,8 +54,7 @@ if (GETPOST('search_actioncode', 'array'))
 {
     $actioncode = GETPOST('search_actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else {
+} else {
     $actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
@@ -282,16 +281,14 @@ if (!empty($actioncode))
             if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'";
             if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'";
         }
-    }
-    else {
+    } else {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
         else {
             if (is_array($actioncode))
             {
                 $sql .= " AND c.code IN ('".implode("','", $actioncode)."')";
-            }
-            else {
+            } else {
                 $sql .= " AND c.code IN ('".implode("','", explode(',', $actioncode))."')";
             }
         }
@@ -413,8 +410,7 @@ if ($resql)
     if (empty($reshook))
     {
 		$s .= $hookmanager->resPrint;
-    }
-    elseif ($reshook > 1)
+    } elseif ($reshook > 1)
 	{
     	$s = $hookmanager->resPrint;
     }
@@ -564,8 +560,7 @@ if ($resql)
 			{
 				$userstatic->fetch($obj->fk_user_action);
 				print $userstatic->getNomUrl(-1);
-			}
-			else print '&nbsp;';
+			} else print '&nbsp;';
 			print '</td>';
 		}
 
@@ -580,8 +575,7 @@ if ($resql)
 			{
 				if ($actioncomm->type_picto) {
 					$imgpicto = img_picto('', $actioncomm->type_picto);
-				}
-				else {
+				} else {
 					if ($actioncomm->type_code == 'AC_RDV')         $imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
 					elseif ($actioncomm->type_code == 'AC_TEL')     $imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
 					elseif ($actioncomm->type_code == 'AC_FAX')     $imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
@@ -649,8 +643,7 @@ if ($resql)
 				$societestatic->email = $obj->socemail;
 
 				print $societestatic->getNomUrl(1, '', 28);
-			}
-			else print '&nbsp;';
+			} else print '&nbsp;';
 			print '</td>';
 		}
 
@@ -672,8 +665,7 @@ if ($resql)
                             $contactListCache[$socpeopleassigned['id']] = $contact->getNomUrl(1, '', 0);
                             $contactList[] = $contact->getNomUrl(1, '', 0);
                         }
-                    }
-                    else {
+                    } else {
                         // use cache
                         $contactList[] = $contactListCache[$socpeopleassigned['id']];
                     }
@@ -681,8 +673,7 @@ if ($resql)
                 if (!empty($contactList)) {
                     print implode(', ', $contactList);
                 }
-            }
-            elseif ($obj->fk_contact > 0) //keep for retrocompatibility with faraway event
+            } elseif ($obj->fk_contact > 0) //keep for retrocompatibility with faraway event
 			{
 				$contactstatic->id = $obj->fk_contact;
 				$contactstatic->email = $obj->email;
@@ -693,8 +684,7 @@ if ($resql)
 				$contactstatic->phone_perso = $obj->phone_perso;
 				$contactstatic->country_id = $obj->country_id;
 				print $contactstatic->getNomUrl(1, '', 0);
-			}
-			else {
+			} else {
 				print "&nbsp;";
 			}
 			print '</td>';
@@ -744,8 +734,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index bc859ba6d2d..a769d709c4d 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -93,8 +93,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else {
+} else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
@@ -328,8 +327,7 @@ if ($conf->use_javascript_ajax)
 	    if (empty($reshook))
 	    {
 			$s .= $hookmanager->resPrint;
-	    }
-	    elseif ($reshook > 1)
+	    } elseif ($reshook > 1)
 		{
 	    	$s = $hookmanager->resPrint;
 	    }
@@ -375,8 +373,7 @@ if (!empty($actioncode))
             if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
             if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
         }
-    }
-    else {
+    } else {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
         else {
@@ -402,8 +399,7 @@ if ($action == 'show_day')
     $sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
     $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
     $sql .= ')';
-}
-else {
+} else {
     // To limit array
     $sql .= " AND (";
     $sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, 1, 1, $year) - (60 * 60 * 24 * 7))."'"; // Start 7 days before
@@ -485,8 +481,7 @@ if ($resql)
         	$event->date_start_in_calendar = $datep;
         	if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
         	else $event->date_end_in_calendar = $datep;
-        }
-        else {
+        } else {
         	$event->date_start_in_calendar = $datep;
         	if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
         	else $event->date_end_in_calendar = $datep;
@@ -503,8 +498,7 @@ if ($resql)
         {
             // This record is out of visible range
         	unset($event);
-        }
-        else {
+        } else {
 			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
 			$event->fetch_userassigned(); // This load $event->userassigned
 
@@ -528,16 +522,14 @@ if ($resql)
 
                 $daykey += 60 * 60 * 24;
                 if ($daykey > $event->date_end_in_calendar) $loop = false;
-            }
-            while ($loop);
+            } while ($loop);
 
             //print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
             //print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array<br>';
         }
         $i++;
     }
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -799,8 +791,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 				{
 					$nummytasks++; $cssclass = 'family_mytasks';
 					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color = $event->type_color;
-				}
-				elseif ($event->type_code == 'ICALEVENT')
+				} elseif ($event->type_code == 'ICALEVENT')
 				{
 					$numical++;
 					if (!empty($event->icalname))
@@ -813,12 +804,10 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 
 					$color = $event->icalcolor;
 					$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other unsortable');
-				}
-				elseif ($event->type_code == 'BIRTHDAY')
+				} elseif ($event->type_code == 'BIRTHDAY')
 				{
 					$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unsortable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
-				}
-				else {
+				} else {
 					$numother++; $cssclass = 'family_other';
 					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color = $event->type_color;
 				}
@@ -830,8 +819,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 					if (isset($colorindexused[$idusertouse]))
 					{
 						$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
-					}
-					else {
+					} else {
 						$colorindex = $nextindextouse;
 						$colorindexused[$idusertouse] = $colorindex;
 						if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
@@ -949,8 +937,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 								$cases2[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contactid]->getFullName($langs);
 							}
 						}
-					}
-					else {
+					} else {
 						$busy = $event->transparency;
 						$cases1[$h][$event->id]['busy'] = $busy;
 						$cases2[$h][$event->id]['busy'] = $busy;
@@ -1013,8 +1000,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			if ($output[0]['string']) $title1 .= ($title1 ? ' - ' : '').$output[0]['string'];
 			if ($output[0]['color']) $color1 = $output[0]['color'];
-		}
-		elseif (count($cases1[$h]) > 1)
+		} elseif (count($cases1[$h]) > 1)
 		{
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			$color1 = '222222';
@@ -1026,8 +1012,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			if ($output[0]['string']) $title2 .= ($title2 ? ' - ' : '').$output[0]['string'];
 			if ($output[0]['color']) $color2 = $output[0]['color'];
-		}
-		elseif (count($cases2[$h]) > 1)
+		} elseif (count($cases2[$h]) > 1)
 		{
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			$color2 = '222222';
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index da5020cef39..dfb756dd227 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -94,8 +94,7 @@ if (GETPOST('search_actioncode', 'array'))
 {
     $actioncode = GETPOST('search_actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else {
+} else {
     $actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
@@ -375,8 +374,7 @@ if ($conf->use_javascript_ajax)
 	    if (empty($reshook))
 	    {
 			$s .= $hookmanager->resPrint;
-	    }
-	    elseif ($reshook > 1)
+	    } elseif ($reshook > 1)
 		{
 	    	$s = $hookmanager->resPrint;
 	    }
@@ -434,16 +432,14 @@ if (!empty($actioncode))
             if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
             if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
         }
-    }
-    else {
+    } else {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
         else {
             if (is_array($actioncode))
             {
   	        	$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
-            }
-            else {
+            } else {
   	        	$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
             }
         }
@@ -467,8 +463,7 @@ if ($action == 'show_day')
     $sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
     $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
     $sql .= ')';
-}
-else {
+} else {
     // To limit array
     $sql .= " AND (";
     $sql .= " (a.datep BETWEEN '".$db->idate($firstdaytoshow - (60 * 60 * 24 * 2))."'"; // Start 2 day before $firstdaytoshow
@@ -551,8 +546,7 @@ if ($resql)
             $event->date_start_in_calendar = $datep;
             if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
             else $event->date_end_in_calendar = $datep;
-        }
-        else {
+        } else {
             $event->date_start_in_calendar = $datep;
             if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
             else $event->date_end_in_calendar = $datep;
@@ -569,8 +563,7 @@ if ($resql)
         {
             // This record is out of visible range
             unset($event);
-        }
-        else {
+        } else {
 			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
         	$event->fetch_userassigned(); // This load $event->userassigned
 
@@ -594,8 +587,7 @@ if ($resql)
 
                 $daykey += 60 * 60 * 24;
                 if ($daykey > $event->date_end_in_calendar) $loop = false;
-            }
-            while ($loop);
+            } while ($loop);
 
             //print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
             //print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array<br>';
@@ -603,8 +595,7 @@ if ($resql)
         $i++;
     }
     $db->free($resql);
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -732,8 +723,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 					$i++;
 		        }
 		    }
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 	}
 	//var_dump($usernamesid);
 	foreach ($usernamesid as $id)
@@ -981,8 +971,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 					if (!empty($cacheusers[$event->userownerid]->color)) $color = $cacheusers[$event->userownerid]->color;
 
 					if (!empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) $color = $event->type_color;
-				}
-				elseif ($event->type_code == 'ICALEVENT')
+				} elseif ($event->type_code == 'ICALEVENT')
 				{
 					$numical++;
 					if (!empty($event->icalname))
@@ -995,12 +984,10 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 
 					$color = $event->icalcolor;
 					$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other unsortable');
-				}
-				elseif ($event->type_code == 'BIRTHDAY')
+				} elseif ($event->type_code == 'BIRTHDAY')
 				{
 					$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unsortable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
-				}
-				else {
+				} else {
 					$numother++;
 					$color = ($event->icalcolor ? $event->icalcolor : -1);
 					$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');
@@ -1026,8 +1013,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 					if (isset($colorindexused[$idusertouse]))
 					{
 						$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
-					}
-					else {
+					} else {
 						$colorindex = $nextindextouse;
 						$colorindexused[$idusertouse] = $colorindex;
 						if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
@@ -1145,8 +1131,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 								$cases2[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contactid]->getFullName($langs);
 							}
 						}
-					}
-					else {
+					} else {
 						$busy = $event->transparency;
 						$cases1[$h][$event->id]['busy'] = $busy;
 						$cases2[$h][$event->id]['busy'] = $busy;
@@ -1210,8 +1195,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			if ($output[0]['string']) $title1 .= ($title1 ? ' - ' : '').$output[0]['string'];
 			if ($output[0]['color']) $color1 = $output[0]['color'];
-		}
-		elseif (is_array($cases1[$h]) && count($cases1[$h]) > 1)
+		} elseif (is_array($cases1[$h]) && count($cases1[$h]) > 1)
 		{
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			$color1 = '222222';
@@ -1223,8 +1207,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			if ($output[0]['string']) $title2 .= ($title2 ? ' - ' : '').$output[0]['string'];
 			if ($output[0]['color']) $color2 = $output[0]['color'];
-		}
-		elseif (is_array($cases2[$h]) && count($cases2[$h]) > 1)
+		} elseif (is_array($cases2[$h]) && count($cases2[$h]) > 1)
 		{
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			$color2 = '222222';
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index c3192f2286e..35c0f7a890e 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -186,8 +186,7 @@ if ($resql)
 				print '</td>';
 				print '<td class="center">'.dol_print_date(dol_filemtime($file), 'dayhour').'</td>';
 				print '<td class="center">'.dol_print_size(dol_filesize($file)).'</td>';
-			}
-			else {
+			} else {
 				print '<td>&nbsp;</td>';
 				print '<td>&nbsp;</td>';
 				print '<td>&nbsp;</td>';
@@ -202,8 +201,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 17eae67eb2e..b3b11a95a36 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -330,8 +330,7 @@ if ($object->id > 0)
 	if ($action == 'editconditions')
 	{
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_id, 'cond_reglement_id', 1);
-	}
-	else {
+	} else {
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_id, 'none');
 	}
 	print "</td>";
@@ -348,8 +347,7 @@ if ($object->id > 0)
 	if ($action == 'editmode')
 	{
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
-	}
-	else {
+	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_id, 'none');
 	}
 	print "</td>";
@@ -368,8 +366,7 @@ if ($object->id > 0)
 		if ($action == 'editbankaccount')
 		{
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_account, 'fk_account', 1);
-		}
-		else {
+		} else {
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_account, 'none');
 		}
 		print "</td>";
@@ -475,8 +472,7 @@ if ($object->id > 0)
         if ($action == 'editshipping')
         {
             $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
-        }
-        else {
+        } else {
             $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'none');
         }
         print "</td>";
@@ -513,8 +509,7 @@ if ($object->id > 0)
         {
             $adh->ref = $adh->getFullName($langs);
             print $adh->getNomUrl(1);
-        }
-        else {
+        } else {
             print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
         }
         print '</td>';
@@ -541,8 +536,7 @@ if ($object->id > 0)
 	    if ($action == 'editlevel')
 	    {
 	        $formcompany->form_prospect_level($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_prospectlevel, 'prospect_level_id', 1);
-	    }
-	    else {
+	    } else {
 	        print $object->getLibProspLevel();
 	    }
         print "</td>";
@@ -725,8 +719,7 @@ if ($object->id > 0)
 				print "</table>";
 				print '</div>';
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -810,8 +803,7 @@ if ($object->id > 0)
 				print "</table>";
 				print '</div>';
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -952,8 +944,7 @@ if ($object->id > 0)
 				print "</table>";
 				print '</div>';
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -1012,8 +1003,7 @@ if ($object->id > 0)
 				print "</table>";
 				print '</div>';
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -1082,13 +1072,11 @@ if ($object->id > 0)
 				if ($objp->frequency && $objp->date_last_gen > 0)
 				{
 					print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_last_gen), 'day').'</td>';
-				}
-				else {
+				} else {
 					if ($objp->dc > 0)
 					{
 						print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->dc), 'day').'</td>';
-					}
-					else {
+					} else {
 						print '<td class="right"><b>!!!</b></td>';
 					}
 				}
@@ -1117,8 +1105,7 @@ if ($object->id > 0)
 				print "</table>";
 				print '</div>';
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -1181,8 +1168,7 @@ if ($object->id > 0)
 				if ($objp->df > 0)
 				{
 					print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->df), 'day').'</td>';
-				}
-				else {
+				} else {
 					print '<td class="right"><b>!!!</b></td>';
 				}
 				print '<td class="right" style="min-width: 60px">';
@@ -1207,8 +1193,7 @@ if ($object->id > 0)
 				print "</table>";
 				print '</div>';
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -1273,8 +1258,7 @@ if ($object->id > 0)
     			if (empty($user->rights->facture->creer))
     			{
     			    print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
-    			}
-    			else {
+    			} else {
     				$langs->load("bills");
     				$langs->load("orders");
 
@@ -1284,8 +1268,7 @@ if ($object->id > 0)
     				    {
     					    if (!empty($orders2invoice) && $orders2invoice > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/orderstoinvoice.php?socid='.$object->id.'">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
     					    else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
-    				    }
-    				    else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
+    				    } else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
     				}
 
     				if ($object->client != 0 && $object->client != 2) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
@@ -1300,8 +1283,7 @@ if ($object->id > 0)
     		if ($user->rights->agenda->myactions->create)
     		{
     			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a></div>';
-    		}
-    		else {
+    		} else {
     			print '<div class="inline-block divButAction"><a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a></div>';
     		}
     	}
@@ -1325,8 +1307,7 @@ if ($object->id > 0)
         // List of done actions
 		show_actions_done($conf, $langs, $db, $object);
 	}
-}
-else {
+} else {
 	$langs->load("errors");
 	print $langs->trans('ErrorRecordNotFound');
 }
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index da7248dbecb..d3075916367 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -170,8 +170,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 99eddda9cad..b542a110832 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -209,20 +209,17 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire)
 			if ($num > $nbofloop)
 			{
 				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
+			} elseif ($total > 0)
 			{
 				print '<tr class="liste_total"><td colspan="2" class="right">'.$langs->trans("Total").'</td><td class="right">'.price($total)."</td></tr>";
 			}
-		}
-		else {
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoProposal").'</td></tr>';
 		}
 		print "</table></div><br>";
 
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -295,20 +292,17 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 			if ($num > $nbofloop)
 			{
 				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
+			} elseif ($total > 0)
             {
                 print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td><td colspan="2" class="right">'.price($total)."</td></tr>";
             }
-        }
-        else {
+        } else {
             print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoProposal").'</td></tr>';
         }
         print "</table></div><br>";
 
         $db->free($resql);
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -375,8 +369,7 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 				print '</td>';
 				if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
 					print '<td class="nowrap right">'.price($obj->total_ht).'</td></tr>';
-				}
-				else {
+				} else {
 					print '<td class="nowrap right">'.price($obj->total_ttc).'</td></tr>';
 				}
 				$i++;
@@ -385,21 +378,18 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 			if ($num > $nbofloop)
 			{
 				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
+			} elseif ($total > 0)
             {
                 print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td><td colspan="2" class="right">'.price($total)."</td></tr>";
 			}
-		}
-		else {
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoOrder").'</td></tr>';
 		}
 		print "</table>";
 		print "</div><br>";
 
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -466,8 +456,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
                 print '</td>';
 				if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
 					print '<td class="nowrap right">'.price($obj->total_ht).'</td></tr>';
-				}
-				else {
+				} else {
 					print '<td class="nowrap right">'.price($obj->total_ttc).'</td></tr>';
 				}
                 $i++;
@@ -476,13 +465,11 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
  			if ($num > $nbofloop)
 			{
 				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
+			} elseif ($total > 0)
             {
                 print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td><td colspan="2" class="right">'.price($total)."</td></tr>";
             }
-        }
-        else {
+        } else {
             print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoSupplierOrder").'</td></tr>';
         }
         print "</table>";
@@ -563,8 +550,7 @@ if (!empty($conf->societe->enabled) && $user->rights->societe->lire)
 			}
 
 			$db->free($resql);
-		}
-		else {
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print "</table>";
@@ -621,8 +607,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print '</table>';
@@ -708,8 +693,7 @@ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TOD
 			print "</table>";
 			print "</div><br>";
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -795,8 +779,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire)
 				print dol_print_date($db->jdate($obj->dp), 'day').'</td>'."\n";
 				if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
 					print '<td class="right">'.price($obj->total_ht).'</td>';
-				}
-				else {
+				} else {
 					print '<td class="right">'.price($obj->total_ttc).'</td>';
 				}
 				print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>'."\n";
@@ -807,16 +790,14 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire)
 			if ($num > $nbofloop)
 			{
 				print '<tr class="liste_total"><td colspan="5" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
+			} elseif ($total > 0)
 			{
 				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("Total")."</td><td class=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
 			}
 			print "</table>";
 			print "</div><br>";
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -902,8 +883,7 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 				print dol_print_date($db->jdate($obj->dp), 'day').'</td>'."\n";
 				if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
 					print '<td class="right">'.price($obj->total_ht).'</td>';
-				}
-				else {
+				} else {
 					print '<td class="right">'.price($obj->total_ttc).'</td>';
 				}
 				print '<td align="center" width="14">'.$orderstatic->LibStatut($obj->fk_statut, $obj->billed, 3).'</td>'."\n";
@@ -914,16 +894,14 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 			if ($num > $nbofloop)
 			{
 				print '<tr class="liste_total"><td colspan="5" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
+			} elseif ($total > 0)
 			{
 				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("Total")."</td><td class=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
 			}
 			print "</table>";
 			print "</div><br>";
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index d16c3e9e7da..da24f7bcb4f 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -87,8 +87,7 @@ if (empty($template_id)) {
 if ($result < 0)
 {
 	setEventMessages($advTarget->error, $advTarget->errors, 'errors');
-}
-else {
+} else {
 	if (!empty($advTarget->id)) {
 		$array_query = json_decode($advTarget->filtervalue, true);
 	}
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 1e7f5fa6385..fff6140a2aa 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -93,15 +93,13 @@ if (empty($reshook))
 		if (!GETPOST("clone_content", 'alpha') && !GETPOST("clone_receivers", 'alpha'))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else {
+		} else {
 			$result = $object->createFromClone($user, $object->id, GETPOST("clone_content", 'alpha'), GETPOST("clone_receivers", 'alpha'));
 			if ($result > 0)
 			{
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 				exit;
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -118,13 +116,11 @@ if (empty($reshook))
 			setEventMessages('<textarea cols="70" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', null, 'warnings');
 			setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings');
 			$action = '';
-		}
-		elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
+		} elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
 		{
 			setEventMessages($langs->trans("NotEnoughPermissions"), null, 'warnings');
 			$action = '';
-		}
-		else {
+		} else {
 			$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
 			if ($object->statut == 0)
@@ -232,8 +228,7 @@ if (empty($reshook))
 								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-							}
-							else {
+							} else {
 								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'order'.$obj->source_id, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
@@ -312,8 +307,7 @@ if (empty($reshook))
 							if (!$resql2)
 							{
 								dol_print_error($db);
-							}
-							else {
+							} else {
 								//if cheack read is use then update prospect contact status
 								if (strpos($message, '__CHECK_READ__') !== false)
 								{
@@ -345,8 +339,7 @@ if (empty($reshook))
                         	}
 
                         	//test if CHECK READ change statut prospect contact
-						}
-						else {
+						} else {
 							// Mail failed
 							$nbko++;
 
@@ -363,8 +356,7 @@ if (empty($reshook))
 
 						$i++;
 					}
-				}
-				else {
+				} else {
 					setEventMessages($langs->transnoentitiesnoconv("NoMoreRecipientToSendTo"), null, 'mesgs');
 				}
 
@@ -374,14 +366,12 @@ if (empty($reshook))
 					$statut = 2; // Status 'sent partially' (because at least one error)
 					if ($nbok > 0) 	setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
 					else setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
-				}
-				else {
+				} else {
 					if ($nbok >= $num)
 					{
 						$statut = 3; // Send to everybody
 						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
-					}
-					else {
+					} else {
 						$statut = 2; // Status 'sent partially' (because not send to everybody)
 						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
 					}
@@ -394,8 +384,7 @@ if (empty($reshook))
 				{
 					dol_print_error($db);
 				}
-			}
-			else {
+			} else {
 				dol_syslog($db->error());
 				dol_print_error($db);
 			}
@@ -462,8 +451,7 @@ if (empty($reshook))
 			{
 				setEventMessages($langs->trans("MailSuccessfulySent", $mailfile->getValidAddress($object->email_from, 2), $mailfile->getValidAddress($object->sendto, 2)), null, 'mesgs');
 				$action = '';
-			}
-			else {
+			} else {
 				setEventMessages($langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result, null, 'errors');
 				$action = 'test';
 			}
@@ -600,8 +588,7 @@ if (empty($reshook))
 
 			setEventMessages($mesg, $mesgs, 'errors');
 			$action = "edit";
-		}
-		else {
+		} else {
 			$action = "edit";
 		}
 	}
@@ -615,8 +602,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -632,12 +618,10 @@ if (empty($reshook))
     			//setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
     			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
     			exit;
-            }
-            else {
+            } else {
                 setEventMessages($object->error, $object->errors, 'errors');
             }
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -660,13 +644,11 @@ if (empty($reshook))
 				$db->commit();
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -766,8 +748,7 @@ if ($action == 'create')
 	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("CreateMailing").'"></div>';
 
 	print '</form>';
-}
-else {
+} else {
 	if ($object->id > 0)
 	{
 		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
@@ -823,8 +804,7 @@ else {
 					setEventMessages($langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']), null, 'warnings');
 					if (!empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) setEventMessages($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), null, 'warnings');
 					$_GET["action"] = '';
-				}
-				elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
+				} elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
 				{
 				    if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
 				    if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
@@ -837,8 +817,7 @@ else {
 					    setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings'); // You can send online with constant...
 					}
 					$_GET["action"] = '';
-				}
-				else {
+				} else {
 				    if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
 				    if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
 
@@ -920,8 +899,7 @@ else {
     				if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
     				{
     					$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
-    				}
-    				else {
+    				} else {
     					$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
     				}
 			    }
@@ -929,8 +907,7 @@ else {
 				if ($text)
     			{
     			    print $form->textwithpicto($nbemail, $text, 1, 'warning');
-    			}
-    			else {
+    			} else {
     				print $nbemail;
     			}
 			}
@@ -977,8 +954,7 @@ else {
 					if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_MAILING))
 					{
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditWithEditor").'</a>';
-					}
-					else {
+					} else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditWithTextEditor").'</a>';
 					}
 
@@ -990,8 +966,7 @@ else {
 				if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
 				{
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("TestMailing").'</a>';
-				}
-				else {
+				} else {
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=test&amp;id='.$object->id.'">'.$langs->trans("TestMailing").'</a>';
 				}
 
@@ -1000,12 +975,10 @@ else {
 					if ($object->nbemail <= 0)
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoTargetYet")).'">'.$langs->trans("ValidMailing").'</a>';
-					}
-					elseif (empty($user->rights->mailing->valider))
+					} elseif (empty($user->rights->mailing->valider))
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ValidMailing").'</a>';
-					}
-					else {
+					} else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=valid&amp;id='.$object->id.'">'.$langs->trans("ValidMailing").'</a>';
 					}
 				}
@@ -1015,12 +988,10 @@ else {
 					if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("SendingFromWebInterfaceIsNotAllowed")).'">'.$langs->trans("SendMailing").'</a>';
-					}
-					elseif (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
+					} elseif (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("SendMailing").'</a>';
-					}
-					else {
+					} else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=sendall&amp;id='.$object->id.'">'.$langs->trans("SendMailing").'</a>';
 					}
 				}
@@ -1035,8 +1006,7 @@ else {
 					if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ResetMailing").'</a>';
-					}
-					else {
+					} else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=reset&amp;id='.$object->id.'">'.$langs->trans("ResetMailing").'</a>';
 					}
 				}
@@ -1046,8 +1016,7 @@ else {
 					if ($object->statut > 0 && (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->delete))
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("DeleteMailing").'</a>';
-					}
-					else {
+					} else {
 						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.(!empty($urlfrom) ? '&urlfrom='.$urlfrom : '').'">'.$langs->trans("DeleteMailing").'</a>';
 					}
 				}
@@ -1126,8 +1095,7 @@ else {
 					print img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
 					print '<br>';
 				}
-			}
-			else {
+			} else {
 				print '<span class="opacitymedium">'.$langs->trans("NoAttachedFiles").'</span><br>';
 			}
 			print '</td></tr>';
@@ -1148,13 +1116,11 @@ else {
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', false, true, empty($conf->global->FCKEDITOR_ENABLE_MAILING) ? 0 : 1, 20, '90%', $readonly);
 				$doleditor->Create();
-			}
-			else print dol_htmlentitiesbr($object->body);
+			} else print dol_htmlentitiesbr($object->body);
 			print '</div>';
 
 			dol_fiche_end();
-		}
-		else {
+		} else {
 			/*
 			 * Mailing en mode edition (CKeditor or HTML source)
 			 */
@@ -1200,8 +1166,7 @@ else {
 					if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
 					{
 						$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
-					}
-					else {
+					} else {
 						$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
 					}
 				}
@@ -1209,8 +1174,7 @@ else {
 				if ($text)
 				{
 					print $form->textwithpicto($nbemail, $text, 1, 'warning');
-				}
-				else {
+				} else {
 					print $nbemail;
 				}
 			}
@@ -1284,8 +1248,7 @@ else {
 					$out .= ' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Search"), 'delete.png', '', '', 1).'" value="'.($key + 1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
 					$out .= '<br></div>';
 				}
-			}
-			else {
+			} else {
 				$out .= $langs->trans("NoAttachedFiles").'<br>';
 			}
 			// Add link to add file
@@ -1334,8 +1297,7 @@ else {
 			print '</form>';
 			print '<br>';
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db, $object->error);
 	}
 }
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index e89a645cf20..27e0c2e5b0c 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -160,8 +160,7 @@ if (GETPOST('exportcsv', 'int'))
 		}
 
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 	exit;
@@ -180,13 +179,11 @@ if ($action == 'delete')
 			$obj->update_nb($id);
 
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-		}
-		else {
+		} else {
 			header("Location: list.php");
 			exit;
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -290,8 +287,7 @@ if ($object->fetch($id) >= 0)
 			if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
 			{
 				$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
-			}
-			else {
+			} else {
 				$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
 			}
 		}
@@ -299,8 +295,7 @@ if ($object->fetch($id) >= 0)
 		if ($text)
 		{
 			print $form->textwithpicto($nbemail, $text, 1, 'warning');
-		}
-		else {
+		} else {
 			print $nbemail;
 		}
 	}
@@ -400,8 +395,7 @@ if ($object->fetch($id) >= 0)
 					{
 						print '<form '.$bctag[$var].' name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
 						print '<input type="hidden" name="token" value="'.newToken().'">';
-					}
-					else {
+					} else {
 					    print '<div '.$bctag[$var].'>';
 					}
 
@@ -414,8 +408,7 @@ if ($object->fetch($id) >= 0)
 
 					try {
 						$nbofrecipient = $obj->getNbOfRecipients('');
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						dol_syslog($e->getMessage(), LOG_ERR);
 					}
@@ -424,8 +417,7 @@ if ($object->fetch($id) >= 0)
 					if ($nbofrecipient >= 0)
 					{
 						print $nbofrecipient;
-					}
-					else {
+					} else {
 						print $langs->trans("Error").' '.img_error($obj->error);
 					}
 					print '</div>';
@@ -435,8 +427,7 @@ if ($object->fetch($id) >= 0)
 					{
     					try {
     						$filter = $obj->formFilter();
-    					}
-    					catch (Exception $e)
+    					} catch (Exception $e)
     					{
     						dol_syslog($e->getMessage(), LOG_ERR);
     					}
@@ -449,8 +440,7 @@ if ($object->fetch($id) >= 0)
 					if ($allowaddtarget)
 					{
 						print '<input type="submit" class="button" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
-					}
-					else {
+					} else {
 					    print '<input type="submit" class="button disabled" disabled="disabled" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
 						//print $langs->trans("MailNoChangePossible");
 						print "&nbsp;";
@@ -624,29 +614,24 @@ if ($object->fetch($id) >= 0)
                 if (empty($obj->source_id) || empty($obj->source_type))
                 {
                     print empty($obj->source_url) ? '' : $obj->source_url; // For backward compatibility
-                }
-                else {
+                } else {
                     if ($obj->source_type == 'member')
                     {
 						$objectstaticmember->fetch($obj->source_id);
                         print $objectstaticmember->getNomUrl(1);
-                    }
-                    elseif ($obj->source_type == 'user')
+                    } elseif ($obj->source_type == 'user')
                     {
 						$objectstaticuser->fetch($obj->source_id);
                         print $objectstaticuser->getNomUrl(1);
-                    }
-                    elseif ($obj->source_type == 'thirdparty')
+                    } elseif ($obj->source_type == 'thirdparty')
                     {
 						$objectstaticcompany->fetch($obj->source_id);
                         print $objectstaticcompany->getNomUrl(1);
-                    }
-                    elseif ($obj->source_type == 'contact')
+                    } elseif ($obj->source_type == 'contact')
                     {
                     	$objectstaticcontact->fetch($obj->source_id);
                     	print $objectstaticcontact->getNomUrl(1);
-                    }
-                    else {
+                    } else {
                         print $obj->source_url;
                     }
                 }
@@ -666,8 +651,7 @@ if ($object->fetch($id) >= 0)
 					print '<td class="nowrap right">';
 					print $object::libStatutDest($obj->statut, 2, '');
 					print '</td>';
-				}
-				else {
+				} else {
 					// Date sent
 					print '<td class="center">'.$obj->date_envoi.'</td>';
 
@@ -693,8 +677,7 @@ if ($object->fetch($id) >= 0)
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			if ($object->statut < 2)
 			{
 			    print '<tr><td colspan="9" class="opacitymedium">';
@@ -708,8 +691,7 @@ if ($object->fetch($id) >= 0)
 		print '</form>';
 
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index dd6f59e80b9..983ad374980 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -165,8 +165,7 @@ class AdvanceTargetingMailing extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return $this->id;
 		}
@@ -220,8 +219,7 @@ class AdvanceTargetingMailing extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
@@ -282,8 +280,7 @@ class AdvanceTargetingMailing extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
@@ -348,8 +345,7 @@ class AdvanceTargetingMailing extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
@@ -407,8 +403,7 @@ class AdvanceTargetingMailing extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -448,8 +443,7 @@ class AdvanceTargetingMailing extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -683,8 +677,7 @@ class AdvanceTargetingMailing extends CommonObject
 				if (!empty($arrayquery['contact_no_email']))
 				{
 					$tmpwhere .= "(t.email IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE t.entity IN (".getEntity('mailing').") AND email = '".$this->db->escape($arrayquery['contact_no_email'])."'))";
-				}
-				else {
+				} else {
 					$tmpwhere .= "(t.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE t.entity IN (".getEntity('mailing').") AND email = '".$this->db->escape($arrayquery['contact_no_email'])."'))";
 				}
 				$sqlwhere[] = $tmpwhere;
diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
index fd674945beb..e6f928d539f 100644
--- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
@@ -314,8 +314,7 @@ class FormAdvTargetEmailing extends Form
 					$i++;
 				}
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -399,8 +398,7 @@ class FormAdvTargetEmailing extends Form
 					$i++;
 				}
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index a6c44c96a8d..1bb4864876c 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -144,16 +144,14 @@ class Mailing extends CommonObject
 			if ($this->update($user) > 0)
 			{
 				$this->db->commit();
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -1;
 			}
 
 			return $this->id;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -184,8 +182,7 @@ class Mailing extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -250,13 +247,11 @@ class Mailing extends CommonObject
 				$this->extraparams = (array) json_decode($obj->extraparams, true);
 
 				return 1;
-			}
-			else {
+			} else {
 				dol_syslog(get_class($this)."::fetch Erreur -1");
 				return -1;
 			}
-		}
-		else {
+		} else {
 			dol_syslog(get_class($this)."::fetch Erreur -2");
 			return -2;
 		}
@@ -363,8 +358,7 @@ class Mailing extends CommonObject
 							);
 						}
 					}
-				}
-				else {
+				} else {
 					$this->error = $this->db->lasterror();
 					return -1;
 				}
@@ -380,8 +374,7 @@ class Mailing extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -405,8 +398,7 @@ class Mailing extends CommonObject
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -429,8 +421,7 @@ class Mailing extends CommonObject
 		if ($resql)
 		{
 			return $this->delete_targets();
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -453,8 +444,7 @@ class Mailing extends CommonObject
 		if ($resql)
 		{
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return 0;
 		}
@@ -480,8 +470,7 @@ class Mailing extends CommonObject
 		if ($resql)
 		{
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -511,8 +500,7 @@ class Mailing extends CommonObject
 	    {
 	        $obj = $this->db->fetch_object($resql);
 	        if ($obj) return $obj->nb;
-	    }
-	    else {
+	    } else {
 	        $this->error = $this->db->lasterror();
 	        return -1;
 	    }
@@ -572,8 +560,7 @@ class Mailing extends CommonObject
 			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 			 */
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index edcb12d1bb2..cf439e4314b 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -129,8 +129,7 @@ if (is_resource($handle))
                             }
 
                             $db->free($result);
-                        }
-                        else {
+                        } else {
                             dol_print_error($db);
                         }
                         print '</tr>';
@@ -190,14 +189,12 @@ if ($result) {
             print '</tr>';
 	        $i++;
 	    }
-    }
-    else {
+    } else {
         print '<tr><td class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
     print "</table></div><br>";
     $db->free($result);
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index dcba1333b11..d22dd130507 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -130,8 +130,7 @@ if ($filteremail)
 	if ($search_all) $sql .= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
 	if (!$sortorder) $sortorder = "ASC";
 	if (!$sortfield) $sortfield = "m.rowid";
-}
-else {
+} else {
 	$sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi";
 	$sql .= " FROM ".MAIN_DB_PREFIX."mailing as m";
 	$sql .= " WHERE m.entity = ".$conf->entity;
@@ -273,8 +272,7 @@ if ($resql)
 		if ($filteremail)
 		{
 			print $email::libStatutDest($obj->sendstatut, 2);
-		}
-		else {
+		} else {
 			print $email->LibStatut($obj->statut, 5);
 		}
 		print '</td>';
@@ -295,8 +293,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php
index 964663a976b..cd5d5c9ace9 100644
--- a/htdocs/comm/multiprix.php
+++ b/htdocs/comm/multiprix.php
@@ -152,8 +152,7 @@ if ($_socid > 0)
 		}
 		$db->free($resql);
 		print "</table>";
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 6b9ed10f18a..a2d27943c89 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -161,8 +161,7 @@ if (empty($reshook))
 		if (!GETPOST('socid', 3))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else {
+		} else {
 			if ($object->id > 0) {
 				if (!empty($conf->global->PROPAL_CLONE_DATE_DELIVERY)) {
 					//Get difference between old and new delivery date and change lines according to difference
@@ -268,9 +267,7 @@ if (empty($reshook))
 			if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');
 			else setEventMessages($langs->trans($object->error), null, 'errors');
 		}
-	}
-
-	elseif ($action == 'setdate' && $usercancreate)
+	} elseif ($action == 'setdate' && $usercancreate)
 	{
 		$datep = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
 
@@ -284,14 +281,12 @@ if (empty($reshook))
 			if ($result < 0)
 				dol_print_error($db, $object->error);
 		}
-	}
-	elseif ($action == 'setecheance' && $usercancreate)
+	} elseif ($action == 'setecheance' && $usercancreate)
 	{
 		$result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']));
 		if ($result < 0)
 			dol_print_error($db, $object->error);
-	}
-	elseif ($action == 'setdate_livraison' && $usercancreate)
+	} elseif ($action == 'setdate_livraison' && $usercancreate)
 	{
 		$result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['date_livraisonmonth'], $_POST['date_livraisonday'], $_POST['date_livraisonyear']));
 		if ($result < 0)
@@ -600,13 +595,11 @@ if (empty($reshook))
 
 						header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
 						exit();
-					}
-					else {
+					} else {
 						$db->rollback();
 						$action = 'create';
 					}
-				}
-				else {
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$db->rollback();
 					$action = 'create';
@@ -630,8 +623,7 @@ if (empty($reshook))
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 		}
 	}
@@ -657,8 +649,7 @@ if (empty($reshook))
 				if (!$error)
 				{
 					$db->commit();
-				}
-				else {
+				} else {
 					$db->rollback();
 				}
 			}
@@ -682,8 +673,7 @@ if (empty($reshook))
 			if (!$error)
 			{
 				$db->commit();
-			}
-			else {
+			} else {
 				$db->rollback();
 			}
 		}
@@ -705,8 +695,7 @@ if (empty($reshook))
 	        {
 	            dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
 	            $lineClassName = 'OrderLine';
-	        }
-	        elseif ($fromElement == 'propal')
+	        } elseif ($fromElement == 'propal')
 	        {
 	            dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
 	            $lineClassName = 'PropaleLigne';
@@ -758,8 +747,7 @@ if (empty($reshook))
 	                } else {
 	                    $error++;
 	                }
-	            }
-	            else {
+	            } else {
 	                $error++;
 	            }
 	        }
@@ -798,9 +786,7 @@ if (empty($reshook))
 			$ret = $object->fetch($id); // Reload to get new records
 			$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
-	}
-
-	elseif ($action == "setabsolutediscount" && $usercancreate) {
+	} elseif ($action == "setabsolutediscount" && $usercancreate) {
 		if ($_POST["remise_id"]) {
 			if ($object->id > 0) {
 				$result = $object->insert_discount($_POST["remise_id"]);
@@ -823,8 +809,7 @@ if (empty($reshook))
 		{
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		}
-		else {
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
@@ -956,8 +941,7 @@ if (empty($reshook))
 							if ($priceforthequantityarray['price_base_type'] == 'HT')
 							{
 								$pu_ht = $priceforthequantityarray['unitprice'];
-							}
-							else {
+							} else {
 								$pu_ttc = $priceforthequantityarray['unitprice'];
 							}
 							// Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST.
@@ -981,8 +965,7 @@ if (empty($reshook))
 							if ($priceforthequantityarray['price_base_type'] == 'HT')
 							{
 								$pu_ht = $priceforthequantityarray['unitprice'];
-							}
-							else {
+							} else {
 								$pu_ttc = $priceforthequantityarray['unitprice'];
 							}
 							// Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST.
@@ -1309,9 +1292,7 @@ if (empty($reshook))
 	} elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha')) {
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
-	}
-
-	elseif ($action == 'classin' && $usercancreate) {
+	} elseif ($action == 'classin' && $usercancreate) {
         // Set project
         $object->setProject(GETPOST('projectid', 'int'));
 	}
@@ -1329,13 +1310,9 @@ if (empty($reshook))
 	// Terms of payment
 	elseif ($action == 'setconditions' && $usercancreate) {
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
-	}
-
-	elseif ($action == 'setremisepercent' && $usercancreate) {
+	} elseif ($action == 'setremisepercent' && $usercancreate) {
 		$result = $object->set_remise_percent($user, $_POST['remise_percent']);
-	}
-
-	elseif ($action == 'setremiseabsolue' && $usercancreate) {
+	} elseif ($action == 'setremiseabsolue' && $usercancreate) {
 		$result = $object->set_remise_absolue($user, $_POST['remise_absolue']);
 	}
 
@@ -1362,9 +1339,7 @@ if (empty($reshook))
 	// shipping method
 	elseif ($action == 'setshippingmethod' && $usercancreate) {
 		$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
-	}
-
-	elseif ($action == 'update_extras') {
+	} elseif ($action == 'update_extras') {
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
@@ -1523,8 +1498,7 @@ if ($action == 'create')
 				if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx))	$currency_tx = $objectsrc->multicurrency_tx;
 			}
 		}
-	}
-	else {
+	} else {
 		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
 	}
 
@@ -2298,8 +2272,7 @@ if ($action == 'create')
 		if ($action != 'editincoterm')
 		{
 			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-		}
-		else {
+		} else {
 			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 		}
 		print '</td></tr>';
@@ -2466,8 +2439,7 @@ if ($action == 'create')
 					if ($usercanvalidate)
 					{
 						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate">'.$langs->trans('Validate').'</a>';
-					}
-					else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Validate').'</a>';
+					} else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Validate').'</a>';
 				}
 				// Create event
 				/*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
@@ -2542,8 +2514,7 @@ if ($action == 'create')
 						if ($usercanclose)
 						{
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled&amp;socid='.$object->socid.'">'.$langs->trans("ClassifyBilled").'</a>';
-						}
-						else {
+						} else {
 							print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("ClassifyBilled").'</a>';
 						}
 					}
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 563e71d79d3..8efc4aa5c19 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -220,8 +220,7 @@ class Proposals extends DolibarrApi
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(503, 'Error when retrieve propal list : '.$db->lasterror());
 		}
 		if (!count($obj_ret)) {
@@ -456,8 +455,7 @@ class Proposals extends DolibarrApi
 		$updateRes = $this->propal->deleteline($lineid);
 		if ($updateRes > 0) {
 			return $this->get($id);
-		}
-		else {
+		} else {
 			throw new RestException(405, $this->propal->error);
 		}
 	}
@@ -587,8 +585,7 @@ class Proposals extends DolibarrApi
 		if ($this->propal->update(DolibarrApiAccess::$user) > 0)
 		{
 			return $this->get($id);
-		}
-		else {
+		} else {
 			throw new RestException(500, $this->propal->error);
 		}
 	}
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 0827ddd64c7..5a8ddc31982 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -390,8 +390,7 @@ class Propal extends CommonObject
 			if ($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
 			{
 				$price = $prod->multiprices[$this->thirdparty->price_level];
-			}
-			else {
+			} else {
 				$price = $prod->price;
 			}
 
@@ -472,19 +471,16 @@ class Propal extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else {
+			} else {
 				$this->error = $line->error;
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -2;
 		}
@@ -557,8 +553,7 @@ class Propal extends CommonObject
 			if ($price_base_type == 'HT')
 			{
 				$pu = $pu_ht;
-			}
-			else {
+			} else {
 				$pu = $pu_ttc;
 			}
 
@@ -710,20 +705,17 @@ class Propal extends CommonObject
                 {
                     $this->db->commit();
                     return $this->line->id;
-                }
-                else {
+                } else {
                     $this->error = $this->db->error();
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else {
+            } else {
                 $this->error = $this->line->error;
                 $this->db->rollback();
                 return -2;
             }
-        }
-		else {
+        } else {
 			dol_syslog(get_class($this)."::addline status of proposal must be Draft to allow use of ->addline()", LOG_ERR);
 			return -3;
 		}
@@ -909,15 +901,13 @@ class Propal extends CommonObject
 
 				$this->db->commit();
 				return $result;
-			}
-			else {
+			} else {
 				$this->error = $this->line->error;
 
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			dol_syslog(get_class($this)."::updateline Erreur -2 Propal en mode incompatible pour cette action");
 			return -2;
 		}
@@ -949,13 +939,11 @@ class Propal extends CommonObject
 
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -2;
 		}
@@ -1129,8 +1117,7 @@ class Propal extends CommonObject
                 					$error++;
                 				}
                 			}
-                		}
-                		else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+                		} else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
                 		{
                 			$origin_id = $tmp_origin_id;
                 			$ret = $this->add_object_linked($origin, $origin_id);
@@ -1157,8 +1144,7 @@ class Propal extends CommonObject
                         if (!is_object($this->lines[$i]))	// If this->lines is not array of objects, coming from REST API
                         {   // Convert into object this->lines[$i].
                             $line = (object) $this->lines[$i];
-                        }
-                        else {
+                        } else {
                             $line = $this->lines[$i];
                         }
 						// Reset fk_parent_line for line that are not child lines or special product
@@ -1254,14 +1240,12 @@ class Propal extends CommonObject
 							if ($result < 0) { $error++; }
 							// End call triggers
 						}
-					}
-					else {
+					} else {
 						$this->error = $this->db->lasterror();
 						$error++;
 					}
 				}
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
@@ -1271,13 +1255,11 @@ class Propal extends CommonObject
 				$this->db->commit();
 				dol_syslog(get_class($this)."::create done id=".$this->id);
 				return $this->id;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1357,8 +1339,7 @@ class Propal extends CommonObject
 			$object->ref_client = '';
 
 			// TODO Change product price if multi-prices
-		}
-		else {
+		} else {
 		    $objsoc->fetch($object->socid);
 		}
 
@@ -1426,8 +1407,7 @@ class Propal extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1481,8 +1461,7 @@ class Propal extends CommonObject
 		if ($ref) {
 			$sql .= " WHERE p.entity IN (".getEntity('propal').")"; // Dont't use entity if you use rowid
 			$sql .= " AND p.ref='".$this->db->escape($ref)."'";
-		}
-		else $sql .= " WHERE p.rowid=".$rowid;
+		} else $sql .= " WHERE p.rowid=".$rowid;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1592,8 +1571,7 @@ class Propal extends CommonObject
 
 			$this->error = "Record Not Found";
 			return 0;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1687,8 +1665,7 @@ class Propal extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1816,8 +1793,7 @@ class Propal extends CommonObject
 			$this->db->free($result);
 
 			return $num;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -3;
 		}
@@ -1865,8 +1841,7 @@ class Propal extends CommonObject
 		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$num = $this->getNextNumRef($soc);
-		}
-		else {
+		} else {
 			$num = $this->ref;
 		}
 		$this->newref = dol_sanitizeFileName($num);
@@ -1939,8 +1914,7 @@ class Propal extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -2002,8 +1976,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2063,8 +2036,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2124,8 +2096,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2186,8 +2157,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2196,8 +2166,7 @@ class Propal extends CommonObject
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else {
+		} else {
 			$error_str = 'Propal status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -2257,8 +2226,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2267,8 +2235,7 @@ class Propal extends CommonObject
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else {
+		} else {
 			$error_str = 'Propal status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -2324,8 +2291,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2334,8 +2300,7 @@ class Propal extends CommonObject
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -2392,8 +2357,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2459,8 +2423,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2526,8 +2489,7 @@ class Propal extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -2620,8 +2582,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				$this->statut = $this->oldcopy->statut;
 				$this->date_cloture = $this->oldcopy->date_cloture;
 				$this->note_private = $this->oldcopy->note_private;
@@ -2629,8 +2590,7 @@ class Propal extends CommonObject
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -2679,8 +2639,7 @@ class Propal extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2745,8 +2704,7 @@ class Propal extends CommonObject
 
 		    $this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2812,12 +2770,10 @@ class Propal extends CommonObject
 					if ($shortlist == 1)
 					{
 						$ga[$obj->propalid] = $obj->ref;
-					}
-					elseif ($shortlist == 2)
+					} elseif ($shortlist == 2)
 					{
 						$ga[$obj->propalid] = $obj->ref.' ('.$obj->name.')';
-					}
-					else {
+					} else {
 						$ga[$i]['id'] = $obj->propalid;
 						$ga[$i]['ref'] 	= $obj->ref;
 						$ga[$i]['name'] = $obj->name;
@@ -2827,8 +2783,7 @@ class Propal extends CommonObject
 				}
 			}
 			return $ga;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -2921,12 +2876,10 @@ class Propal extends CommonObject
 					}
 				}
 				return $ga;
-			}
-			else {
+			} else {
 				return -1;
 			}
-		}
-		else return $ga;
+		} else return $ga;
 	}
 
 	/**
@@ -3023,26 +2976,22 @@ class Propal extends CommonObject
 						dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG);
 						$this->db->commit();
 						return 1;
-					}
-					else {
+					} else {
 						$this->error = $this->db->lasterror();
 						$this->db->rollback();
 						return 0;
 					}
-				}
-				else {
+				} else {
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -3096,8 +3045,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -3106,8 +3054,7 @@ class Propal extends CommonObject
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else {
+		} else {
 			$error_str = 'Propal status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -3166,8 +3113,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -3176,8 +3122,7 @@ class Propal extends CommonObject
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else {
+		} else {
 			$error_str = 'Propal status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -3234,8 +3179,7 @@ class Propal extends CommonObject
 				}
 			}
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3370,8 +3314,7 @@ class Propal extends CommonObject
 			}
 
 			return $response;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -3449,8 +3392,7 @@ class Propal extends CommonObject
 				$line->total_ttc = 60;
 				$line->total_tva = 10;
 				$line->remise_percent = 50;
-			}
-			else {
+			} else {
 				$line->total_ht = 100;
 				$line->total_ttc = 120;
 				$line->total_tva = 20;
@@ -3509,8 +3451,7 @@ class Propal extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -3560,14 +3501,12 @@ class Propal extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else {
+			} else {
 				$this->error = $obj->error;
 				//dol_print_error($db,"Propale::getNextNumRef ".$obj->error);
 				return "";
 			}
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Proposal"));
 			return "";
@@ -3615,14 +3554,11 @@ class Propal extends CommonObject
 
 			if ($option == '') {
 				$url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$this->id.$get_params;
-			}
-			elseif ($option == 'compta') {  // deprecated
+			} elseif ($option == 'compta') {  // deprecated
 				$url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$this->id.$get_params;
-			}
-			elseif ($option == 'expedition') {
+			} elseif ($option == 'expedition') {
 				$url = DOL_URL_ROOT.'/expedition/propal.php?id='.$this->id.$get_params;
-			}
-			elseif ($option == 'document') {
+			} elseif ($option == 'document') {
 				$url = DOL_URL_ROOT.'/comm/propal/document.php?id='.$this->id.$get_params;
 			}
 
@@ -3970,12 +3906,10 @@ class PropaleLigne extends CommonObjectLine
 				$this->db->free($result);
 
 				return 1;
-			}
-			else {
+			} else {
 				return 0;
 			}
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -4024,8 +3958,7 @@ class PropaleLigne extends CommonObjectLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else {
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -4112,8 +4045,7 @@ class PropaleLigne extends CommonObjectLine
 
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -4165,8 +4097,7 @@ class PropaleLigne extends CommonObjectLine
 			$this->db->commit();
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -4213,8 +4144,7 @@ class PropaleLigne extends CommonObjectLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else {
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -4291,8 +4221,7 @@ class PropaleLigne extends CommonObjectLine
 
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -4325,8 +4254,7 @@ class PropaleLigne extends CommonObjectLine
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index ac6f500cce2..da23b4fc2bc 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -55,8 +55,7 @@ if ($id > 0 || !empty($ref))
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors');
 		$error++;
-	}
-	elseif ($ret < 0)
+	} elseif ($ret < 0)
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
 		$error++;
@@ -65,8 +64,7 @@ if ($id > 0 || !empty($ref))
 if (!$error)
 {
 	$object->fetch_thirdparty();
-}
-else {
+} else {
 	header('Location: '.DOL_URL_ROOT.'/comm/propal/list.php');
 	exit;
 }
@@ -88,14 +86,12 @@ if ($action == 'addcontact' && $user->rights->propale->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -119,8 +115,7 @@ elseif ($action == 'deletecontact' && $user->rights->propale->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index f9d89ca981d..70c67566091 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -179,8 +179,7 @@ if ($object->id > 0)
 	$permtoedit = $user->rights->propal->creer;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index d456a507f19..9e138c52cbe 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -163,8 +163,7 @@ if ($resql)
     //print '<tr class="liste_total"><td>'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')</td><td class="right">'.$totalinprocess.'</td></tr>';
     print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
     print "</table></div><br>";
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -219,8 +218,7 @@ if (!empty($conf->propal->enabled))
 			if ($num > $nbofloop)
 			{
 				print '<tr class="liste_total"><td colspan="2" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
+			} elseif ($total > 0)
 			{
 				print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td><td class="right">'.price($total)."</td></tr>";
 			}
@@ -309,8 +307,7 @@ if ($resql)
 	}
 	print "</table>";
 	print "</div><br>";
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 /*
@@ -393,16 +390,14 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 			if ($num > $nbofloop)
 			{
 				print '<tr class="liste_total"><td colspan="5" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
+			} elseif ($total > 0)
 			{
 				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
 			}
 			print "</table>";
 			print "</div><br>";
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 9c31bd72bf7..6710ac56b58 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -414,8 +414,7 @@ if ($resql)
 		$soc->fetch($socid);
 		$title = $langs->trans('ListOfProposals').' - '.$soc->name;
 		if (empty($search_societe)) $search_societe = $soc->name;
-	}
-	else {
+	} else {
 		$title = $langs->trans('ListOfProposals');
 	}
 
@@ -1027,8 +1026,7 @@ if ($resql)
 			{
 				print '<td class="center">'.dol_print_date($db->jdate($obj->dfv), 'day');
 				print '</td>';
-			}
-			else {
+			} else {
 				print '<td>&nbsp;</td>';
 			}
 			if (!$i) $totalarray['nbfield']++;
@@ -1040,8 +1038,7 @@ if ($resql)
 			{
 				print '<td class="center">'.dol_print_date($db->jdate($obj->ddelivery), 'day');
 				print '</td>';
-			}
-			else {
+			} else {
 				print '<td>&nbsp;</td>';
 			}
 			if (!$i) $totalarray['nbfield']++;
@@ -1166,8 +1163,7 @@ if ($resql)
 				if ($nbofsalesrepresentative > 3)   // We print only number
 				{
 					print $nbofsalesrepresentative;
-				}
-				elseif ($nbofsalesrepresentative > 0)
+				} elseif ($nbofsalesrepresentative > 0)
 				{
 					$userstatic = new User($db);
 					$j = 0;
@@ -1189,8 +1185,7 @@ if ($resql)
 					}
 				}
 				//else print $langs->trans("NoSalesRepresentativeAffected");
-			}
-			else {
+			} else {
 				print '&nbsp';
 			}
 			print '</td>';
@@ -1275,8 +1270,7 @@ if ($resql)
 	$delallowed = $user->rights->propal->creer;
 
 	print $formfile->showdocuments('massfilesarea_proposals', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index c4f92d36b6a..00a79f3c1be 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -112,8 +112,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenamenb = $dir.'/proposalsnbinyear-'.$user->id.'-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else {
+} else {
     $filenamenb = $dir.'/proposalsnbinyear-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsnbinyear-'.$year.'.png';
 }
@@ -151,8 +150,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenameamount = $dir.'/proposalsamountinyear-'.$user->id.'-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsamountinyear-'.$user->id.'-'.$year.'.png';
-}
-else {
+} else {
     $filenameamount = $dir.'/proposalsamountinyear-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsamountinyear-'.$year.'.png';
 }
@@ -190,8 +188,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-}
-else {
+} else {
     $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
@@ -344,8 +341,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td align="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     print $px2->show();
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index 386e27f0ec3..b49f334dadd 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -223,8 +223,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 			}
 			print "</table><br>";
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php
index 2edc331d71e..e393f5fce56 100644
--- a/htdocs/comm/prospect/recap-prospect.php
+++ b/htdocs/comm/prospect/recap-prospect.php
@@ -83,8 +83,7 @@ if ($socid > 0)
 
 
 	print $langs->trans("FeatureNotYetAvailable");
-}
-else {
+} else {
   	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php
index 170eb5b247a..284c248f1f0 100644
--- a/htdocs/comm/recap-client.php
+++ b/htdocs/comm/recap-client.php
@@ -83,8 +83,7 @@ if ($socid > 0)
 
 
 	print $langs->trans("FeatureNotYetAvailable");
-}
-else {
+} else {
   	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index a735cd07028..a7517c9cb60 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -70,13 +70,11 @@ if (GETPOST('action', 'aZ09') == 'setremise')
 	    {
     		header("Location: ".$backtopage);
     		exit;
-	    }
-	    else {
+	    } else {
     		header("Location: remise.php?id=".$_GET["id"]);
     		exit;
 	    }
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -250,14 +248,12 @@ if ($socid > 0)
 	    			print '</tr>';
 	    			$i++;
 	    		}
-			}
-			else {
+			} else {
 			    print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 			$db->free($resql);
 			print "</table>";
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -307,14 +303,12 @@ if ($socid > 0)
 					print '</tr>';
 					$i++;
 				}
-			}
-			else {
+			} else {
 				print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 			$db->free($resql);
 			print "</table>";
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 62b38f9e390..ffd4c1738c0 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -105,8 +105,7 @@ if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes')
 		{
 			$newdiscount1->description = $discount->description;
 			$newdiscount2->description = $discount->description;
-		}
-		else {
+		} else {
 			$newdiscount1->description = $discount->description.' (1)';
 			$newdiscount2->description = $discount->description.' (2)';
 		}
@@ -149,8 +148,7 @@ if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes')
 			$db->commit();
 			header("Location: ".$_SERVER["PHP_SELF"].'?id='.$id.($backtopage ? '&backtopage='.urlencode($backtopage) : '')); // To avoid pb whith back
 			exit;
-		}
-		else {
+		} else {
 			$db->rollback();
 		}
 	}
@@ -187,19 +185,16 @@ if ($action == 'setremise' && $user->rights->societe->creer)
 			    {
 			        header("Location: ".$backtopage.'&discountid='.$discountid);
 			        exit;
-			    }
-				else {
+			    } else {
 				    header("Location: remx.php?id=".$id);
 				    exit;
 				}
-			}
-			else {
+			} else {
 				$error++;
 				setEventMessages($soc->error, $soc->errors, 'errors');
 			}
 		}
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("ErrorFieldFormat", $langs->transnoentitiesnoconv("AmountHT")), null, 'errors');
 	}
 }
@@ -219,8 +214,7 @@ if (GETPOST('action', 'aZ09') == 'confirm_remove' && GETPOST("confirm") == 'yes'
 		$db->commit();
 		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$id); // To avoid pb whith back
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($discount->error, $discount->errors, 'errors');
 		$db->rollback();
 	}
@@ -294,8 +288,7 @@ if ($socid > 0)
 			$obj = $db->fetch_object($resql);
 			$remise_all += $obj->amount;
 			if ($obj->fk_user == $user->id) $remise_user += $obj->amount;
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -325,8 +318,7 @@ if ($socid > 0)
 			$obj = $db->fetch_object($resql);
 			$remise_all += $obj->amount;
 			if ($obj->fk_user == $user->id) $remise_user += $obj->amount;
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -481,8 +473,7 @@ if ($socid > 0)
 	    				$facturestatic->type = $obj->type;
 	    				print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturestatic->getNomURl(1);
 	    				print '</td>';
-	    			}
-	    			elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
+	    			} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
 	    			{
 	    				print '<td class="minwidth100">';
 	    				$facturestatic->id = $obj->fk_facture_source;
@@ -490,8 +481,7 @@ if ($socid > 0)
 	    				$facturestatic->type = $obj->type;
 	    				print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturestatic->getNomURl(1);
 	    				print '</td>';
-	    			}
-	    			elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
+	    			} elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
 	    			{
 	    				print '<td class="minwidth100">';
 	    				$facturestatic->id = $obj->fk_facture_source;
@@ -499,8 +489,7 @@ if ($socid > 0)
 	    				$facturestatic->type = $obj->type;
 	    				print preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $obj->description).' '.$facturestatic->getNomURl(1);
 	    				print '</td>';
-	    			}
-	    			else {
+	    			} else {
 	    				print '<td class="minwidth100">';
 	    				print $obj->description;
 	    				print '</td>';
@@ -526,8 +515,7 @@ if ($socid > 0)
 	    				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=split&remid='.$obj->rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_split($langs->trans("SplitDiscount")).'</a>';
 	    				print '<a class="reposition marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=remove&remid='.$obj->rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_delete($langs->trans("RemoveDiscount")).'</a>';
 	    				print '</td>';
-	    			}
-	    			else print '<td>&nbsp;</td>';
+	    			} else print '<td>&nbsp;</td>';
 	    			print '</tr>';
 
 	    			if ($_GET["action"] == 'split' && GETPOST('remid') == $obj->rowid)
@@ -537,8 +525,7 @@ if ($socid > 0)
 	    			}
 	    			$i++;
 	    		}
-			}
-			else {
+			} else {
 				$colspan = 8;
 				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
 			    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -559,8 +546,7 @@ if ($socid > 0)
 				$langs->load("dict");
 				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&remid='.$showconfirminfo['rowid'].($backtopage ? '&backtopage='.urlencode($backtopage) : ''), $langs->trans('SplitDiscount'), $langs->trans('ConfirmSplitDiscount', price($showconfirminfo['amount_ttc']), $langs->transnoentities("Currency".$conf->currency)), 'confirm_split', $formquestion, '', 0);
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -635,8 +621,7 @@ if ($socid > 0)
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					}
-					elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
+					} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
 					{
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
@@ -644,8 +629,7 @@ if ($socid > 0)
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					}
-					elseif (preg_match('/\(EXCESS PAID\)/', $obj->description))
+					} elseif (preg_match('/\(EXCESS PAID\)/', $obj->description))
 					{
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
@@ -653,8 +637,7 @@ if ($socid > 0)
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(EXCESS PAID\)/', $langs->trans("ExcessPaid"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					}
-					else {
+					} else {
 						print '<td class="minwidth100">';
 						print $obj->description;
 						print '</td>';
@@ -680,8 +663,7 @@ if ($socid > 0)
 						print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=split&remid='.$obj->rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_split($langs->trans("SplitDiscount")).'</a>';
 						print '<a class="reposition marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=remove&remid='.$obj->rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_delete($langs->trans("RemoveDiscount")).'</a>';
 						print '</td>';
-					}
-					else print '<td>&nbsp;</td>';
+					} else print '<td>&nbsp;</td>';
 					print '</tr>';
 
 					if ($_GET["action"] == 'split' && GETPOST('remid') == $obj->rowid)
@@ -691,8 +673,7 @@ if ($socid > 0)
 					}
 					$i++;
 				}
-			}
-			else {
+			} else {
 				$colspan = 8;
 				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
 				print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -713,8 +694,7 @@ if ($socid > 0)
 				$langs->load("dict");
 				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&remid='.$showconfirminfo['rowid'].($backtopage ? '&backtopage='.urlencode($backtopage) : ''), $langs->trans('SplitDiscount'), $langs->trans('ConfirmSplitDiscount', price($showconfirminfo['amount_ttc']), $langs->transnoentities("Currency".$conf->currency)), 'confirm_split', $formquestion, 0, 0);
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -843,8 +823,7 @@ if ($socid > 0)
 	    				$facturestatic->type = $obj->type;
 	    				print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturestatic->getNomURl(1);
 	    				print '</td>';
-	    			}
-	    			elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
+	    			} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
 	    			{
 	    				print '<td class="minwidth100">';
 	    				$facturestatic->id = $obj->fk_facture_source;
@@ -852,8 +831,7 @@ if ($socid > 0)
 	    				$facturestatic->type = $obj->type;
 	    				print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturestatic->getNomURl(1);
 	    				print '</td>';
-	    			}
-	    			elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
+	    			} elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
 	    			{
 	    				print '<td class="minwidth100">';
 	    				$facturestatic->id = $obj->fk_facture_source;
@@ -861,8 +839,7 @@ if ($socid > 0)
 	    				$facturestatic->type = $obj->type;
 	    				print preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("Invoice"), $obj->description).' '.$facturestatic->getNomURl(1);
 	    				print '</td>';
-	    			}
-	    			else {
+	    			} else {
 	    				print '<td class="minwidth100">';
 	    				print $obj->description;
 	    				print '</td>';
@@ -891,8 +868,7 @@ if ($socid > 0)
 	    			print '</tr>';
 	    			$i++;
 	    		}
-			}
-			else {
+			} else {
 				$colspan = 8;
 				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
 			    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -900,8 +876,7 @@ if ($socid > 0)
 
 			print "</table>";
 			print '</div>';
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -1018,8 +993,7 @@ if ($socid > 0)
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					}
-					elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
+					} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
 					{
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
@@ -1027,8 +1001,7 @@ if ($socid > 0)
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					}
-					elseif (preg_match('/\(EXCESS PAID\)/', $obj->description))
+					} elseif (preg_match('/\(EXCESS PAID\)/', $obj->description))
 					{
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
@@ -1036,8 +1009,7 @@ if ($socid > 0)
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(EXCESS PAID\)/', $langs->trans("Invoice"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					}
-					else {
+					} else {
 						print '<td class="minwidth100">';
 						print $obj->description;
 						print '</td>';
@@ -1065,8 +1037,7 @@ if ($socid > 0)
 					print '</tr>';
 					$i++;
 				}
-			}
-			else {
+			} else {
 				$colspan = 8;
 				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
 				print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -1074,8 +1045,7 @@ if ($socid > 0)
 
 			print "</table>";
 			print '</div>';
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 2dfb0b67c6e..a8544c94b70 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -154,8 +154,7 @@ if (empty($reshook))
 		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else {
+		} else {
 			if ($object->id > 0)
 			{
 				// Because createFromClone modifies the object, we must clone it so that we can restore it later
@@ -166,8 +165,7 @@ if (empty($reshook))
 				{
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit;
-				}
-				else {
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$object = $orig;
 					$action = '';
@@ -185,8 +183,7 @@ if (empty($reshook))
 			if ($result > 0)
 			{
 				setEventMessages($langs->trans('OrderReopened', $object->ref), null);
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -200,8 +197,7 @@ if (empty($reshook))
 		{
 			header('Location: list.php?restore_lastsearch_values=1');
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -230,8 +226,7 @@ if (empty($reshook))
 
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -497,17 +492,14 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	elseif ($action == 'classifybilled' && $usercancreate)
+	} elseif ($action == 'classifybilled' && $usercancreate)
 	{
 		$ret = $object->classifyBilled($user);
 
 		if ($ret < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	elseif ($action == 'classifyunbilled' && $usercancreate)
+	} elseif ($action == 'classifyunbilled' && $usercancreate)
 	{
 		$ret = $object->classifyUnBilled();
 		if ($ret < 0) {
@@ -522,17 +514,13 @@ if (empty($reshook))
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'setremise' && $usercancreate) {
+	} elseif ($action == 'setremise' && $usercancreate) {
 		$result = $object->set_remise($user, GETPOST('remise'));
 		if ($result < 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'setabsolutediscount' && $usercancreate) {
+	} elseif ($action == 'setabsolutediscount' && $usercancreate) {
 		if (GETPOST('remise_id')) {
 			if ($object->id > 0) {
 				$object->insert_discount(GETPOST('remise_id'));
@@ -540,9 +528,7 @@ if (empty($reshook))
 				dol_print_error($db, $object->error);
 			}
 		}
-	}
-
-	elseif ($action == 'setdate' && $usercancreate) {
+	} elseif ($action == 'setdate' && $usercancreate) {
 		// print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
 		$date = dol_mktime(0, 0, 0, GETPOST('order_month'), GETPOST('order_day'), GETPOST('order_year'));
 
@@ -550,9 +536,7 @@ if (empty($reshook))
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'setdate_livraison' && $usercancreate) {
+	} elseif ($action == 'setdate_livraison' && $usercancreate) {
 		// print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
 		$datelivraison = dol_mktime(0, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
 
@@ -560,9 +544,7 @@ if (empty($reshook))
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'setmode' && $usercancreate) {
+	} elseif ($action == 'setmode' && $usercancreate) {
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
 		if ($result < 0)
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -576,21 +558,15 @@ if (empty($reshook))
 	// Multicurrency rate
 	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')));
-	}
-
-	elseif ($action == 'setavailability' && $usercancreate) {
+	} elseif ($action == 'setavailability' && $usercancreate) {
 		$result = $object->availability(GETPOST('availability_id'));
 		if ($result < 0)
 			setEventMessages($object->error, $object->errors, 'errors');
-	}
-
-	elseif ($action == 'setdemandreason' && $usercancreate) {
+	} elseif ($action == 'setdemandreason' && $usercancreate) {
 		$result = $object->demand_reason(GETPOST('demand_reason_id'));
 		if ($result < 0)
 			setEventMessages($object->error, $object->errors, 'errors');
-	}
-
-	elseif ($action == 'setconditions' && $usercancreate) {
+	} elseif ($action == 'setconditions' && $usercancreate) {
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
@@ -643,13 +619,9 @@ if (empty($reshook))
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'setremisepercent' && $usercancreate) {
+	} elseif ($action == 'setremisepercent' && $usercancreate) {
 		$result = $object->set_remise($user, GETPOST('remise_percent'));
-	}
-
-	elseif ($action == 'setremiseabsolue' && $usercancreate) {
+	} elseif ($action == 'setremiseabsolue' && $usercancreate) {
 		$result = $object->set_remise_absolue($user, GETPOST('remise_absolue'));
 	}
 
@@ -669,8 +641,7 @@ if (empty($reshook))
 		{
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		}
-		else {
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
@@ -718,8 +689,7 @@ if (empty($reshook))
 
 				if ($res = $prodcomb->fetchByProductCombination2ValuePairs($idprod, $combinations)) {
 					$idprod = $res->fk_product_child;
-				}
-				else {
+				} else {
 					setEventMessages($langs->trans('ErrorProductCombinationNotFound'), null, 'errors');
 					$error++;
 				}
@@ -787,8 +757,7 @@ if (empty($reshook))
 							$tva_npr = $prodcustprice->lines[0]->recuperableonly;
 							if (empty($tva_tx)) $tva_npr = 0;
 						}
-					}
-					else {
+					} else {
 						setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 					}
 				}
@@ -808,8 +777,7 @@ if (empty($reshook))
 							if ($priceforthequantityarray['price_base_type'] == 'HT')
 							{
 								$pu_ht = $priceforthequantityarray['unitprice'];
-							}
-							else {
+							} else {
 								$pu_ttc = $priceforthequantityarray['unitprice'];
 							}
 							// Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST.
@@ -832,8 +800,7 @@ if (empty($reshook))
 							if ($priceforthequantityarray['price_base_type'] == 'HT')
 							{
 								$pu_ht = $priceforthequantityarray['unitprice'];
-							}
-							else {
+							} else {
 								$pu_ttc = $priceforthequantityarray['unitprice'];
 							}
 							// Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST.
@@ -1146,9 +1113,7 @@ if (empty($reshook))
 	} elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
-	}
-
-	elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)
+	} elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)
 	{
 		$idwarehouse = GETPOST('idwarehouse');
 
@@ -1156,8 +1121,7 @@ if (empty($reshook))
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 		{
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-		}
-		else {
+		} else {
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -1192,8 +1156,7 @@ if (empty($reshook))
 
 					$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -1207,8 +1170,7 @@ if (empty($reshook))
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 		{
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-		}
-		else {
+		} else {
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -1245,16 +1207,12 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	elseif ($action == 'confirm_shipped' && $confirm == 'yes' && $usercanclose) {
+	} elseif ($action == 'confirm_shipped' && $confirm == 'yes' && $usercanclose) {
 		$result = $object->cloture($user);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $usercanvalidate)
+	} elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $usercanvalidate)
 	{
 		$idwarehouse = GETPOST('idwarehouse');
 
@@ -1262,8 +1220,7 @@ if (empty($reshook))
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 		{
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-		}
-		else {
+		} else {
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -1334,8 +1291,7 @@ if (empty($reshook))
 	        {
 	            dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
 	            $lineClassName = 'OrderLine';
-	        }
-	        elseif ($fromElement == 'propal')
+	        } elseif ($fromElement == 'propal')
 	        {
 	            dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
 	            $lineClassName = 'PropaleLigne';
@@ -1387,8 +1343,7 @@ if (empty($reshook))
 	                } else {
 	                    $error++;
 	                }
-	            }
-	            else {
+	            } else {
 	                $error++;
 	            }
 	        }
@@ -1518,12 +1473,10 @@ if ($action == 'create' && $usercancreate)
 			// For compatibility
 			if ($element == 'order' || $element == 'commande') {
 				$element = $subelement = 'commande';
-			}
-			elseif ($element == 'propal') {
+			} elseif ($element == 'propal') {
 				$element = 'comm/propal';
 				$subelement = 'propal';
-			}
-			elseif ($element == 'contract') {
+			} elseif ($element == 'contract') {
 				$element = $subelement = 'contrat';
 			}
 
@@ -1569,8 +1522,7 @@ if ($action == 'create' && $usercancreate)
 			// Object source contacts list
 			$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);
 		}
-	}
-	else {
+	} else {
 		$cond_reglement_id  = $soc->cond_reglement_id;
 		$mode_reglement_id  = $soc->mode_reglement_id;
 		$fk_account         = $soc->fk_account;
@@ -1941,8 +1893,7 @@ if ($action == 'create' && $usercancreate)
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 			{
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-			}
-			else {
+			} else {
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
@@ -1972,8 +1923,7 @@ if ($action == 'create' && $usercancreate)
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 			{
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-			}
-			else {
+			} else {
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
@@ -2013,8 +1963,7 @@ if ($action == 'create' && $usercancreate)
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 			{
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-			}
-			else {
+			} else {
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
@@ -2368,8 +2317,7 @@ if ($action == 'create' && $usercancreate)
 			if ($action != 'editincoterm')
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-			}
-			else {
+			} else {
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 			}
 			print '</td></tr>';
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 2ba223b3866..cc7db3db852 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -223,8 +223,7 @@ class Orders extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve commande list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -569,8 +568,7 @@ class Orders extends DolibarrApi
         if ($this->commande->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else {
+        } else {
         	throw new RestException(500, $this->commande->error);
         }
     }
@@ -698,7 +696,7 @@ class Orders extends DolibarrApi
         $result = $this->commande->set_reopen(DolibarrApiAccess::$user);
         if ($result < 0) {
             throw new RestException(405, $this->commande->error);
-        }elseif ($result == 0) {
+        } elseif ($result == 0) {
             throw new RestException(304);
         }
 
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 3f86ce9de5b..b4abfee0c03 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -406,14 +406,12 @@ class Commande extends CommonOrder
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else {
+			} else {
 				$this->error = $obj->error;
 				//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-		}
-		else {
+		} else {
 			print $langs->trans("Error")." ".$langs->trans("Error_COMMANDE_ADDON_NotDefined");
 			return "";
 		}
@@ -466,8 +464,7 @@ class Commande extends CommonOrder
 		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$num = $this->getNextNumRef($soc);
-		}
-		else {
+		} else {
 			$num = $this->ref;
 		}
 		$this->newref = dol_sanitizeFileName($num);
@@ -578,8 +575,7 @@ class Commande extends CommonOrder
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -664,8 +660,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -706,8 +701,7 @@ class Commande extends CommonOrder
 			$result = $this->call_trigger('ORDER_REOPEN', $user);
 			if ($result < 0) $error++;
 			// End call triggers
-		}
-		else {
+		} else {
 			$error++;
 			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
@@ -720,8 +714,7 @@ class Commande extends CommonOrder
 
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::set_reopen ".$errmsg, LOG_ERR);
@@ -776,13 +769,11 @@ class Commande extends CommonOrder
 
 					$this->db->commit();
 					return 1;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror();
 
 				$this->db->rollback();
@@ -852,8 +843,7 @@ class Commande extends CommonOrder
 				$this->statut = self::STATUS_CANCELED;
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(get_class($this)."::cancel ".$errmsg, LOG_ERR);
@@ -862,8 +852,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -1089,8 +1078,7 @@ class Commande extends CommonOrder
 										$error++;
 									}
 								}
-							}
-							else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+							} else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
 							{
 								$origin_id = $tmp_origin_id;
 								$ret = $this->add_object_linked($origin, $origin_id);
@@ -1136,8 +1124,7 @@ class Commande extends CommonOrder
 								//print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
 								$this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
 							}
-						}
-						else dol_print_error($resqlcontact);
+						} else dol_print_error($resqlcontact);
 					}
 
 					if (!$error)
@@ -1158,20 +1145,17 @@ class Commande extends CommonOrder
 					{
 						$this->db->commit();
 						return $this->id;
-					}
-					else {
+					} else {
 						$this->db->rollback();
 						return -1 * $error;
 					}
-				}
-				else {
+				} else {
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -1;
 				}
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->db->rollback();
 			return -1;
@@ -1274,8 +1258,7 @@ class Commande extends CommonOrder
 		{
 			$this->db->commit();
 			return $this->id;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1406,10 +1389,8 @@ class Commande extends CommonOrder
 					$this->valid($user);
 				}
 				return $ret;
-			}
-			else return -1;
-		}
-		else return -1;
+			} else return -1;
+		} else return -1;
 	}
 
 
@@ -1489,8 +1470,7 @@ class Commande extends CommonOrder
 			if ($price_base_type == 'HT')
 			{
 				$pu = $pu_ht;
-			}
-			else {
+			} else {
 				$pu = $pu_ttc;
 			}
 			$label = trim($label);
@@ -1649,20 +1629,17 @@ class Commande extends CommonOrder
 				{
 					$this->db->commit();
 					return $this->line->id;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else {
+			} else {
 				$this->error = $this->line->error;
 				dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			dol_syslog(get_class($this)."::addline status of order must be Draft to allow use of ->addline()", LOG_ERR);
 			return -3;
 		}
@@ -1901,13 +1878,11 @@ class Commande extends CommonOrder
 					return -3;
 				}
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = 'Order with id '.$id.' not found sql='.$sql;
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1971,19 +1946,16 @@ class Commande extends CommonOrder
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else {
+			} else {
 				$this->error = $line->error;
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -2;
 		}
@@ -2108,8 +2080,7 @@ class Commande extends CommonOrder
 			$this->db->free($result);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -3;
 		}
@@ -2172,8 +2143,7 @@ class Commande extends CommonOrder
 
 			$this->db->free($resql);
 			return $nb;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -2218,8 +2188,7 @@ class Commande extends CommonOrder
 			}
 			$this->db->free($resql);
 			return $num;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -2248,8 +2217,7 @@ class Commande extends CommonOrder
 		{
 			$row = $this->db->fetch_row($resql);
 			return $row[0];
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2335,31 +2303,26 @@ class Commande extends CommonOrder
 						{
 							$this->db->commit();
 							return 1;
-						}
-						else {
+						} else {
 							$this->db->rollback();
 							$this->error = $this->db->lasterror();
 							return -1;
 						}
-					}
-					else {
+					} else {
 						$this->db->rollback();
 						$this->error = $line->error;
 						return -1;
 					}
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					return 0;
 				}
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -1;
 		}
@@ -2418,8 +2381,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2485,8 +2447,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2547,8 +2508,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2557,8 +2517,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else {
+		} else {
 			return -2;
 		}
 	}
@@ -2611,8 +2570,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2621,8 +2579,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else {
+		} else {
 			return -2;
 		}
 	}
@@ -2679,12 +2636,10 @@ class Commande extends CommonOrder
 					if ($shortlist == 1)
 					{
 						$ga[$obj->cid] = $obj->ref;
-					}
-					elseif ($shortlist == 2)
+					} elseif ($shortlist == 2)
 					{
 						$ga[$obj->cid] = $obj->ref.' ('.$obj->name.')';
-					}
-					else {
+					} else {
 						$ga[$i]['id'] = $obj->cid;
 						$ga[$i]['ref'] 	= $obj->ref;
 						$ga[$i]['name'] = $obj->name;
@@ -2693,8 +2648,7 @@ class Commande extends CommonOrder
 				}
 			}
 			return $ga;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -2748,8 +2702,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2758,8 +2711,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else {
+		} else {
 			$error_str = 'Command status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -2818,8 +2770,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2828,8 +2779,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else {
+		} else {
 			$error_str = 'order status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -2885,8 +2835,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2895,8 +2844,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -2938,8 +2886,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(get_class($this)."::classifyBilled ".$errmsg, LOG_ERR);
@@ -2948,8 +2895,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -2991,8 +2937,7 @@ class Commande extends CommonOrder
 
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(get_class($this)."::classifyUnBilled ".$errmsg, LOG_ERR);
@@ -3001,8 +2946,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -3110,8 +3054,7 @@ class Commande extends CommonOrder
 			if ($price_base_type == 'TTC')
 			{
 				$subprice = $pu_ttc;
-			}
-			else {
+			} else {
 				$subprice = $pu_ht;
 			}
 			$remise = 0;
@@ -3214,15 +3157,13 @@ class Commande extends CommonOrder
 
 				$this->db->commit();
 				return $result;
-			}
-			else {
+			} else {
 				$this->error = $this->line->error;
 
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->error = get_class($this)."::updateline Order status makes operation forbidden";
 			$this->errors = array('OrderStatusMakeOperationForbidden');
 			return -2;
@@ -3316,8 +3257,7 @@ class Commande extends CommonOrder
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -3449,8 +3389,7 @@ class Commande extends CommonOrder
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
@@ -3515,8 +3454,7 @@ class Commande extends CommonOrder
 			}
 
 			return $response;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -3570,38 +3508,31 @@ class Commande extends CommonOrder
 		    $labelStatus = $langs->trans('StatusOrderCanceled');
 		    $labelStatusShort = $langs->trans('StatusOrderCanceledShort');
 		    $statusType = 'status9';
-		}
-		elseif ($status == self::STATUS_DRAFT) {
+		} elseif ($status == self::STATUS_DRAFT) {
 		    $labelStatus = $langs->trans('StatusOrderDraft');
 		    $labelStatusShort = $langs->trans('StatusOrderDraftShort');
 		    $statusType = 'status0';
-		}
-		elseif ($status == self::STATUS_VALIDATED) {
+		} elseif ($status == self::STATUS_VALIDATED) {
 		    $labelStatus = $langs->trans('StatusOrderValidated').$billedtext;
 		    $labelStatusShort = $langs->trans('StatusOrderValidatedShort').$billedtext;
 		    $statusType = 'status1';
-		}
-		elseif ($status == self::STATUS_SHIPMENTONPROCESS) {
+		} elseif ($status == self::STATUS_SHIPMENTONPROCESS) {
 		    $labelStatus = $langs->trans('StatusOrderSentShort').$billedtext;
 		    $labelStatusShort = $langs->trans('StatusOrderSentShort').$billedtext;
 		    $statusType = 'status4';
-		}
-		elseif ($status == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+		} elseif ($status == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
 		    $labelStatus = $langs->trans('StatusOrderToBill');
 		    $labelStatusShort = $langs->trans('StatusOrderToBillShort');
 		    $statusType = 'status4';
-		}
-		elseif ($status == self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+		} elseif ($status == self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
 		    $labelStatus = $langs->trans('StatusOrderProcessed').$billedtext;
 		    $labelStatusShort = $langs->trans('StatusOrderProcessed').$billedtext;
 		    $statusType = 'status6';
-		}
-		elseif ($status == self::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+		} elseif ($status == self::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
 		    $labelStatus = $langs->trans('StatusOrderDelivered');
 		    $labelStatusShort = $langs->trans('StatusOrderDelivered');
 		    $statusType = 'status6';
-		}
-		else {
+		} else {
 		    $labelStatus = $langs->trans('Unknown');
 		    $labelStatusShort = '';
 		    $statusType = '';
@@ -3763,8 +3694,7 @@ class Commande extends CommonOrder
 			}
 
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3838,8 +3768,7 @@ class Commande extends CommonOrder
 				$line->total_ttc = 60;
 				$line->total_tva = 10;
 				$line->remise_percent = 50;
-			}
-			else {
+			} else {
 				$line->total_ht = 100;
 				$line->total_ttc = 120;
 				$line->total_tva = 20;
@@ -3897,8 +3826,7 @@ class Commande extends CommonOrder
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -4149,8 +4077,7 @@ class OrderLine extends CommonOrderLine
 			$this->db->free($result);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -4236,8 +4163,7 @@ class OrderLine extends CommonOrderLine
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -4282,8 +4208,7 @@ class OrderLine extends CommonOrderLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else {
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -4378,8 +4303,7 @@ class OrderLine extends CommonOrderLine
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -4426,8 +4350,7 @@ class OrderLine extends CommonOrderLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else {
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -4510,8 +4433,7 @@ class OrderLine extends CommonOrderLine
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -4550,8 +4472,7 @@ class OrderLine extends CommonOrderLine
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index cbb93b940de..5af5fb23060 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -78,8 +78,7 @@ class CommandeStats extends Stats
 			$this->field = 'total_ht';
 			$this->field_line = 'total_ht';
 			$this->where .= " c.fk_statut > 0"; // Not draft and not cancelled
-		}
-		elseif ($mode == 'supplier')
+		} elseif ($mode == 'supplier')
 		{
 			$object = new CommandeFournisseur($this->db);
 			$this->from = MAIN_DB_PREFIX.$object->table_element." as c";
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index 4fd050799dc..2d11feeeee2 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -63,14 +63,12 @@ if ($action == 'addcontact' && $user->rights->commande->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -82,8 +80,7 @@ elseif ($action == 'swapstatut' && $user->rights->commande->creer)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -98,8 +95,7 @@ elseif ($action == 'deletecontact' && $user->rights->commande->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -203,8 +199,7 @@ if ($id > 0 || !empty($ref))
 		    $res = @include dol_buildpath($reldir.'/contacts.tpl.php');
 		    if ($res) break;
 		}
-	}
-	else {
+	} else {
 		// Contact not found
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 020b1654ac9..f78d6ce2e84 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -184,8 +184,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 516dcd56fc0..27d38378bcb 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -182,12 +182,10 @@ if ($id > 0 || !empty($ref))
 		$permtoedit = $user->rights->commande->creer;
 		$param = '&id='.$object->id.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity);
 		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
-}
-else {
+} else {
 	header('Location: index.php');
 	exit;
 }
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 53f6b20b4f6..96476caeeed 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -173,8 +173,7 @@ if ($resql)
     //if ($totalinprocess != $total)
     print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
     print "</table></div><br>";
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -231,8 +230,7 @@ if (!empty($conf->commande->enabled))
                 print '</td></tr>';
 				$i++;
 			}
-		}
-		else {
+		} else {
 			print '<tr class="oddeven"><td colspan="3">'.$langs->trans("NoOrder").'</td></tr>';
 		}
 		print "</table></div><br>";
@@ -321,8 +319,7 @@ if ($resql)
 		}
 	}
 	print "</table></div><br>";
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 $max = 10;
 
@@ -408,8 +405,7 @@ if (!empty($conf->commande->enabled))
 		}
 
 		print "</table></div><br>";
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 }
 
 /*
@@ -493,8 +489,7 @@ if (!empty($conf->commande->enabled))
 			}
 		}
 		print "</table></div><br>";
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 }
 
 
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 088512d6fa2..63c82775ff1 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -395,8 +395,7 @@ if ($resql)
 		$soc->fetch($socid);
 		$title = $langs->trans('ListOfOrders').' - '.$soc->name;
 		if (empty($search_company)) $search_company = $soc->name;
-	}
-	else {
+	} else {
 		$title = $langs->trans('ListOfOrders');
 	}
 	if (strval($search_status) == '0')
@@ -540,8 +539,7 @@ if ($resql)
 		{
 			print $form->selectyesno('validate_invoices', 0, 1, 1);
 			print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
-		}
-		else {
+		} else {
 			print $form->selectyesno('validate_invoices', 0, 1);
 		}
 		if (!empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER)) print ' &nbsp; &nbsp; <span class="opacitymedium">'.$langs->trans("IfValidateInvoiceIsNoOrderStayUnbilled").'</span>';
@@ -960,8 +958,7 @@ if ($resql)
 								{
 									$notshippable++;
 								}
-							}
-							else {  // Detailed code, looks bugged
+							} else {  // Detailed code, looks bugged
 								// stock order and stock order_supplier
 								$stock_order = 0;
 								$stock_order_supplier = 0;
@@ -1308,8 +1305,7 @@ if ($resql)
 	$delallowed = $user->rights->commande->creer;
 
 	print $formfile->showdocuments('massfilesarea_orders', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index cae54d69bbd..c3d82821249 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -83,8 +83,7 @@ if ($action == 'create')
 	{
 		$error++;
 		setEventMessages($langs->trans('Error_OrderNotChecked'), null, 'errors');
-	}
-	else {
+	} else {
 		$origin = GETPOST('origin');
 		$originid = GETPOST('originid');
 	}
@@ -208,8 +207,7 @@ if (($action == 'create' || $action == 'add') && !$error)
 							if ($db->query($sql))
 							{
 								$db->commit();
-							}
-							else {
+							} else {
 								$db->rollback();
 							}
 						}
@@ -254,14 +252,12 @@ if (($action == 'create' || $action == 'add') && !$error)
 										{
 											$result = $object->insert_discount($discountid);
 											//$result=$discount->link_to_invoice($lineid,$id);
-										}
-										else {
+										} else {
 											setEventMessages($discount->error, $discount->errors, 'errors');
 											$error++;
 											break;
 										}
-									}
-									else {
+									} else {
 										// Positive line
 										$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 										// Date start
@@ -316,8 +312,7 @@ if (($action == 'create' || $action == 'add') && !$error)
 										if ($result > 0)
 										{
 											$lineid = $result;
-										}
-										else {
+										} else {
 											$lineid = 0;
 											$error++;
 											break;
@@ -329,15 +324,13 @@ if (($action == 'create' || $action == 'add') && !$error)
 										}
 									}
 								}
-							}
-							else {
+							} else {
 								setEventMessages($objectsrc->error, $objectsrc->errors, 'errors');
 								$error++;
 							}
 							$ii++;
 						}
-					}
-					else {
+					} else {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
 					}
@@ -351,8 +344,7 @@ if (($action == 'create' || $action == 'add') && !$error)
 			$db->commit();
 			header('Location: '.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$id);
 			exit;
-		}
-		else {
+		} else {
 			$db->rollback();
 			$action = 'create';
 			$_GET["origin"] = $_POST["origin"];
@@ -721,8 +713,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
 		print '</form>';
 
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 35f9f60020c..0910e4ee7ad 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -114,8 +114,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filenamenb = $dir.'/ordersnbinyear-'.$user->id.'-'.$year.'.png';
     if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else {
+} else {
     $filenamenb = $dir.'/ordersnbinyear-'.$year.'.png';
     if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$year.'.png';
     if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersnbinyear-'.$year.'.png';
@@ -156,8 +155,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filenameamount = $dir.'/ordersamountinyear-'.$user->id.'-'.$year.'.png';
     if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersamountinyear-'.$user->id.'-'.$year.'.png';
-}
-else {
+} else {
     $filenameamount = $dir.'/ordersamountinyear-'.$year.'.png';
     if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$year.'.png';
     if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersamountinyear-'.$year.'.png';
@@ -196,8 +194,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-}
-else {
+} else {
     $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
@@ -378,8 +375,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td align="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     print $px2->show();
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index b14e3adafad..0c20e46e316 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -334,8 +334,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		                    $nofile['sens'] = $objd->sens;
 
 		                    $filesarray[$nofile['item'].'_'.$nofile['id']] = $nofile;
-		                }
-		                else {
+		                } else {
 		                    foreach ($files as $key => $file)
 		                    {
 		                    	$file['id'] = $objd->id;
@@ -382,14 +381,12 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 
 		            $i++;
 		        }
-		    }
-		    else {
+		    } else {
 		        dol_print_error($db);
 		    }
 
 		    $db->free($resd);
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("ErrorSelectAtLeastOne"), null, 'errors');
 			$error++;
 		}
@@ -489,8 +486,7 @@ if ($result && $action == "dl" && !$error)
         dol_delete_file($zipname);
 
         exit();
-    }
-    else {
+    } else {
     	setEventMessages($langs->trans("FailedToOpenFile", $zipname), null, 'errors');
     }
 }
@@ -622,8 +618,7 @@ if (!empty($date_start) && !empty($date_stop))
         if (empty($TData))
         {
             print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoItem").'</td></tr>';
-        }
-        else {
+        } else {
             // Sort array by date ASC to calculate balance
 
             $totalET_debit = 0;
diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php
index 05f89e1bc6f..767c8f8709b 100644
--- a/htdocs/compta/bank/account_statement_document.php
+++ b/htdocs/compta/bank/account_statement_document.php
@@ -138,12 +138,10 @@ if ($id > 0 || !empty($ref)) {
 		$moreparam = '&num='.urlencode($num); ;
 		$relativepathwithnofile = $id."/statement/".dol_sanitizeFileName($num)."/";
 		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
-}
-else {
+} else {
 	Header('Location: index.php');
 	exit;
 }
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index 51d838878b8..72a7e33d3f2 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -50,8 +50,7 @@ if (!$year_start)
 {
 	$year_start = $year_current - 2;
 	$year_end = $year_current;
-}
-else {
+} else {
 	$year_end = $year_start + 2;
 }
 
@@ -106,8 +105,7 @@ if ($resql)
 		$encaiss[$row[1]] = $row[0];
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -133,8 +131,7 @@ if ($resql)
 		$decaiss[$row[1]] = -$row[0];
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -154,8 +151,7 @@ if (!empty($id))
     if (!preg_match('/,/', $id))
     {
         dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
-    }
-    else {
+    } else {
         $bankaccount = new Account($db);
         $listid = explode(',', $id);
         foreach ($listid as $key => $aId)
@@ -166,8 +162,7 @@ if (!empty($id))
             if ($key < (count($listid) - 1)) print ', ';
         }
     }
-}
-else {
+} else {
 	print $langs->trans("AllAccounts");
 }
 
@@ -252,8 +247,7 @@ if ($resql)
 {
 	$obj = $db->fetch_object($resql);
 	if ($obj) $balance = $obj->total;
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -275,8 +269,7 @@ if ($result < 0)
 	$langs->load("errors");
 	$error++;
 	setEventMessages($langs->trans("ErrorFailedToCreateDir"), null, 'errors');
-}
-else {
+} else {
 	// Calcul de $min et $max
 	$sql = "SELECT MIN(b.datev) as min, MAX(b.datev) as max";
 	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
@@ -292,8 +285,7 @@ else {
 		$obj = $db->fetch_object($resql);
 		$min = $db->jdate($obj->min);
 		$max = $db->jdate($obj->max);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 	$log = "graph.php: min=".$min." max=".$max;
@@ -331,8 +323,7 @@ else {
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -417,8 +408,7 @@ else {
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index d5fb533016e..c5ded35cb51 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -68,8 +68,7 @@ if ($fielvalue)
 {
 	if ($user->socid) $socid = $user->socid;
 	$result = restrictedArea($user, 'banque', $fieldvalue, 'bank_account&bank_account', '', '', $fieldtype);
-}
-else {
+} else {
 	if ($user->socid) $socid = $user->socid;
 	$result = restrictedArea($user, 'banque');
 }
@@ -240,14 +239,12 @@ if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', '
                     }
                 }
             }
-        }
-        else {
+        } else {
             $error++;
             $langs->load("errors");
             setEventMessages($langs->trans("NoRecordSelected"), null, 'errors');
         }
-    }
-    else {
+    } else {
         $error++;
         $langs->load("errors");
         setEventMessages($langs->trans("ErrorPleaseTypeBankTransactionReportName"), null, 'errors');
@@ -283,8 +280,7 @@ if (GETPOST('save') && !$cancel && $user->rights->banque->modifier)
     if (price2num($_POST["addcredit"]) > 0)
     {
         $amount = price2num($_POST["addcredit"]);
-    }
-    else {
+    } else {
         $amount = - price2num($_POST["adddebit"]);
     }
 
@@ -333,12 +329,10 @@ if (GETPOST('save') && !$cancel && $user->rights->banque->modifier)
             setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
             header("Location: ".$_SERVER['PHP_SELF'].($id ? "?id=".$id : ''));
             exit;
-        }
-        else {
+        } else {
             setEventMessages($object->error, $object->errors, 'errors');
         }
-    }
-    else {
+    } else {
         $action = 'addline';
     }
 }
@@ -462,8 +456,7 @@ if ($id > 0 || !empty($ref))
             }
         }
     }
-}
-else {
+} else {
 	llxHeader('', $langs->trans("BankTransactions"), '', '', 0, 0, array(), array(), $param);
 }
 
@@ -667,8 +660,7 @@ if ($resql)
 	        if ($numr >= $nbmax) $liste = "... &nbsp; ".$liste;
 	        print $liste;
 	        if ($numr <= 0) print '<b>'.$langs->trans("None").'</b>';
-	    }
-	    else {
+	    } else {
 	        dol_print_error($db);
 	    }
 
@@ -784,13 +776,11 @@ if ($resql)
 			if (empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))	// If direct entries is done using miscellaneous payments
 			{
 			    $newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&accountid='.$search_account.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.urlencode($search_account)), '', $user->rights->banque->modifier);
-			}
-			else // If direct entries is not done using miscellaneous payments
+			} else // If direct entries is not done using miscellaneous payments
 			{
                 $newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', $user->rights->banque->modifier);
 			}
-		}
-		else {
+		} else {
             $newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', -1);
 		}
 	}
@@ -1036,8 +1026,7 @@ if ($resql)
                 		$balance = $objforbalance->previoustotal;
                 	}
                 }
-            }
-            else dol_print_error($db);
+            } else dol_print_error($db);
 
             $balancecalculated = true;
 
@@ -1118,8 +1107,7 @@ if ($resql)
         {
         	$balance = price2num($balancebefore, 'MT'); // balance = balancebefore of previous line (sort is desc)
         	$balancebefore = price2num($balancebefore - ($sign * $objp->amount), 'MT');
-        }
-		else {
+        } else {
 			$balancebefore = price2num($balance, 'MT'); // balancebefore = balance of previous line (sort is asc)
 			$balance = price2num($balance + ($sign * $objp->amount), 'MT');
 		}
@@ -1130,8 +1118,7 @@ if ($resql)
             $bankaccounttmp->fetch($objp->bankid);
             $cachebankaccount[$objp->bankid] = $bankaccounttmp;
             $bankaccount = $bankaccounttmp;
-        }
-        else {
+        } else {
             $bankaccount = $cachebankaccount[$objp->bankid];
         }
 
@@ -1195,63 +1182,53 @@ if ($resql)
     	    		$banktransferstatic->id = $links[$key]['url_id'];
     	    		$banktransferstatic->ref = $links[$key]['label'];
     	    		print ' '.$banktransferstatic->getNomUrl(0);
-    	    	}
-    	    	elseif ($links[$key]['type'] == 'payment')
+    	    	} elseif ($links[$key]['type'] == 'payment')
     	        {
     	            $paymentstatic->id = $links[$key]['url_id'];
     	            $paymentstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
     	            print ' '.$paymentstatic->getNomUrl(2);
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_supplier')
+    	        } elseif ($links[$key]['type'] == 'payment_supplier')
     	        {
     	            $paymentsupplierstatic->id = $links[$key]['url_id'];
     	            $paymentsupplierstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
     	            print ' '.$paymentsupplierstatic->getNomUrl(2);
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_sc')
+    	        } elseif ($links[$key]['type'] == 'payment_sc')
     	        {
     	            print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
     	            print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
     	            //print $langs->trans("SocialContributionPayment");
     	            print '</a>';
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_vat')
+    	        } elseif ($links[$key]['type'] == 'payment_vat')
     	        {
     	            $paymentvatstatic->id = $links[$key]['url_id'];
     	            $paymentvatstatic->ref = $links[$key]['url_id'];
     	            print ' '.$paymentvatstatic->getNomUrl(2);
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_salary')
+    	        } elseif ($links[$key]['type'] == 'payment_salary')
     	        {
     	            $paymentsalstatic->id = $links[$key]['url_id'];
     	            $paymentsalstatic->ref = $links[$key]['url_id'];
     	            print ' '.$paymentsalstatic->getNomUrl(2);
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_loan')
+    	        } elseif ($links[$key]['type'] == 'payment_loan')
     	        {
     	            print '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$links[$key]['url_id'].'">';
     	            print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
     	            print '</a>';
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_donation')
+    	        } elseif ($links[$key]['type'] == 'payment_donation')
     	        {
     	            print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$links[$key]['url_id'].'">';
     	            print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
     	            print '</a>';
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_expensereport')
+    	        } elseif ($links[$key]['type'] == 'payment_expensereport')
     	        {
     	            $paymentexpensereportstatic->id = $links[$key]['url_id'];
     	            $paymentexpensereportstatic->ref = $links[$key]['url_id'];
     	            print ' '.$paymentexpensereportstatic->getNomUrl(2);
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_various')
+    	        } elseif ($links[$key]['type'] == 'payment_various')
     	        {
     	            $paymentvariousstatic->id = $links[$key]['url_id'];
     	            $paymentvariousstatic->ref = $links[$key]['url_id'];
     	            print ' '.$paymentvariousstatic->getNomUrl(2);
-    	        }
-    	        elseif ($links[$key]['type'] == 'banktransfert')
+    	        } elseif ($links[$key]['type'] == 'banktransfert')
     	        {
     	            // Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
     	            if ($objp->amount > 0)
@@ -1266,8 +1243,7 @@ if ($resql)
     	                $bankstatic->label = $objp->bankref;
     	                print $bankstatic->getNomUrl(1, '');
     	                print ')';
-    	            }
-    	            else {
+    	            } else {
     	                $bankstatic->id = $objp->bankid;
     	                $bankstatic->label = $objp->bankref;
     	                print ' ('.$langs->trans("TransferFrom").' ';
@@ -1280,20 +1256,15 @@ if ($resql)
     	                print ')';
     	            }
     	            //var_dump($links);
-    	        }
-    	        elseif ($links[$key]['type'] == 'company')
+    	        } elseif ($links[$key]['type'] == 'company')
     	        {
-    	        }
-    	        elseif ($links[$key]['type'] == 'user')
+    	        } elseif ($links[$key]['type'] == 'user')
     	        {
-    	        }
-    	        elseif ($links[$key]['type'] == 'member')
+    	        } elseif ($links[$key]['type'] == 'member')
     	        {
-    	        }
-    	        elseif ($links[$key]['type'] == 'sc')
+    	        } elseif ($links[$key]['type'] == 'sc')
     	        {
-    	        }
-    	        else {
+    	        } else {
     	            // Show link with label $links[$key]['label']
     	            if (!empty($objp->label) && !empty($links[$key]['label'])) print ' - ';
     	            print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
@@ -1302,8 +1273,7 @@ if ($resql)
     	                // Label generique car entre parentheses. On l'affiche en le traduisant
     	                if ($reg[1] == 'paiement') $reg[1] = 'Payment';
     	                print ' '.$langs->trans($reg[1]);
-    	            }
-    	            else {
+    	            } else {
     	                print ' '.$links[$key]['label'];
     	            }
     	            print '</a>';
@@ -1380,8 +1350,7 @@ if ($resql)
 				$companystatic->code_compta = $objp->code_compta;
 				$companystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
 				print $companystatic->getNomUrl(1);
-			}
-			else {
+			} else {
 				print '&nbsp;';
 			}
 			print '</td>';
@@ -1433,12 +1402,10 @@ if ($resql)
     			if ($balancebefore >= 0)
     			{
     				print '<td class="nowrap right">&nbsp;'.price($balancebefore).'</td>';
-    			}
-    			else {
+    			} else {
     				print '<td class="error nowrap right">&nbsp;'.price($balancebefore).'</td>';
     			}
-    		}
-    		else {
+    		} else {
     			print '<td class="right">-</td>';
     		}
     		if (!$i) $totalarray['nbfield']++;
@@ -1451,12 +1418,10 @@ if ($resql)
     			if ($balance >= 0)
     			{
     				print '<td class="nowrap right">&nbsp;'.price($balance).'</td>';
-    			}
-    			else {
+    			} else {
     				print '<td class="error nowrap right">&nbsp;'.price($balance).'</td>';
     			}
-    		}
-    		else {
+    		} else {
     			print '<td class="right">-</td>';
     		}
     		if (!$i) $totalarray['nbfield']++;
@@ -1502,15 +1467,13 @@ if ($resql)
     	    print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
     	    print img_edit();
     	    print '</a>';
-    	}
-    	else {
+    	} else {
     	    if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
     	    {
     	        print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
     	        print img_edit();
     	        print '</a>';
-    	    }
-    	    else {
+    	    } else {
     	        print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
     	        print img_view();
     	        print '</a>';
@@ -1560,16 +1523,14 @@ if ($resql)
 	        {
 	            if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
 	            else print '<td class="left tdoverflowmax50" title="'.$langs->trans("Totalforthispage").'">'.$langs->trans("Totalforthispage").'</td>';
-	        }
-	        elseif ($totalarray['totaldebfield'] == $i) print '<td class="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
+	        } elseif ($totalarray['totaldebfield'] == $i) print '<td class="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
 	        elseif ($totalarray['totalcredfield'] == $i) print '<td class="right">'.price($totalarray['totalcred']).'</td>';
 	        elseif ($i == $posconciliatecol)
 	        {
 	        	print '<td class="center">';
 	        	if ($user->rights->banque->consolidate && $action == 'reconcile') print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
 	        	print '</td>';
-	        }
-	        else print '<td></td>';
+	        } else print '<td></td>';
 	    }
 	    print '</tr>';
 	}
@@ -1587,8 +1548,7 @@ if ($resql)
 
     print '</form>';
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php
index 3a15ddf72e1..8559096477d 100644
--- a/htdocs/compta/bank/budget.php
+++ b/htdocs/compta/bank/budget.php
@@ -89,8 +89,7 @@ if ($result)
 	print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").'</td>';
 	print '<td class="liste_total right">'.price($total).'</td>';
 	print '<td colspan="2" class="liste_total right">'.price($totalnb ?price2num($total / $totalnb, 'MT') : 0).'</td></tr>';
-}
-else {
+} else {
 	dol_print_error($db);
 }
 print "</table>";
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 3af40ffb2a0..3771d010f4f 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -99,8 +99,7 @@ if ($action == 'add')
 	if (empty($account_number) || $account_number == '-1')
 	{
 		$object->account_number = '';
-	}
-	else {
+	} else {
 		$object->account_number = $account_number;
 	}
 	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal', 'int');
@@ -154,8 +153,7 @@ if ($action == 'add')
 			$_GET["id"] = $id; // Force chargement page en mode visu
 
 			$action = '';
-		}
-		else {
+		} else {
 			$error++;
 			setEventMessages($object->error, $object->errors, 'errors');
 
@@ -166,8 +164,7 @@ if ($action == 'add')
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else {
+	} else {
 		$db->rollback();
 	}
 }
@@ -203,8 +200,7 @@ if ($action == 'update')
 	if (empty($account_number) || $account_number == '-1')
 	{
 		$object->account_number = '';
-	}
-	else {
+	} else {
 		$object->account_number = $account_number;
 	}
 	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal', 'int');
@@ -256,8 +252,7 @@ if ($action == 'update')
 			$object->setCategories($categories);
 
 			$_GET["id"] = $_POST["id"]; // Force chargement page en mode visu
-		}
-		else {
+		} else {
 			$error++;
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'edit'; // Force chargement page edition
@@ -267,8 +262,7 @@ if ($action == 'update')
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else {
+	} else {
 		$db->rollback();
 	}
 }
@@ -285,8 +279,7 @@ if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		header("Location: ".DOL_URL_ROOT."/compta/bank/list.php");
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = '';
 	}
@@ -377,8 +370,7 @@ if ($action == 'create')
 	if (isset($_POST["account_country_id"]))
 	{
 		$selectedcode = $_POST["account_country_id"] ? $_POST["account_country_id"] : $object->country_code;
-	}
-	elseif (empty($selectedcode)) $selectedcode = $mysoc->country_code;
+	} elseif (empty($selectedcode)) $selectedcode = $mysoc->country_code;
 	$object->country_code = getCountry($selectedcode, 2); // Force country code on account to have following field on bank fields matching country rules
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("BankAccountCountry").'</td>';
@@ -392,8 +384,7 @@ if ($action == 'create')
 	if ($selectedcode)
 	{
 		$formcompany->select_departement(isset($_POST["account_state_id"]) ? $_POST["account_state_id"] : '', $selectedcode, 'account_state_id');
-	}
-	else {
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -537,8 +528,7 @@ if ($action == 'create')
 		print '<td>';
 		print $formaccounting->select_account($object->account_number, 'account_number', 1, '', 1, 1);
 		print '</td></tr>';
-	}
-	else {
+	} else {
 		print '<tr><td class="'.$fieldrequired.'titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
 		print '<td><input type="text" name="account_number" value="'.(GETPOST("account_number") ?GETPOST('account_number', 'alpha') : $object->account_number).'"></td></tr>';
 	}
@@ -877,8 +867,7 @@ else {
 		if ($selectedcode)
 		{
 			print $formcompany->select_state(isset($_POST["account_state_id"]) ? $_POST["account_state_id"] : $object->state_id, $selectedcode, 'account_state_id');
-		}
-		else {
+		} else {
 			print $countrynotdefined;
 		}
 		print '</td></tr>';
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index b7bbb4d157e..0f71134d08a 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -132,8 +132,7 @@ if ($result)
 			print '<input name="label" type="text" size=45 value="'.$objp->label.'">';
 			print '<input type="submit" name="update" class="button" value="'.$langs->trans("Edit").'">';
 			print "</td>";
-		}
-		else {
+		} else {
 			print "<td >".$objp->label."</td>";
 			print '<td class="center">';
 			print '<a class="editfielda reposition marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?categid='.$objp->rowid.'&amp;action=edit">'.img_edit().'</a>';
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index cae83563b42..adb170ee81d 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -343,9 +343,9 @@ class Account extends CommonObject
 				$string .= $this->code_guichet.' ';
 			} elseif ($val == 'BankAccountNumberKey') {
 				$string .= $this->cle_rib.' ';
-			}elseif ($val == 'BIC') {
+			} elseif ($val == 'BIC') {
 				$string .= $this->bic.' ';
-			}elseif ($val == 'IBAN') {
+			} elseif ($val == 'IBAN') {
 				$string .= $this->iban.' ';
 			}
 		}
@@ -403,8 +403,7 @@ class Account extends CommonObject
 		{
 			$rowid = $this->db->last_insert_id(MAIN_DB_PREFIX."bank_url");
 			return $rowid;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -436,8 +435,7 @@ class Account extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank_url";
 		if ($fk_bank > 0) {
 			$sql .= " WHERE fk_bank = ".$fk_bank;
-		}
-		else { $sql .= " WHERE url_id = ".$url_id." AND type = '".$type."'";
+		} else { $sql .= " WHERE url_id = ".$url_id." AND type = '".$type."'";
 		}
 		$sql .= " ORDER BY type, label";
 
@@ -463,8 +461,7 @@ class Account extends CommonObject
 				$lines[$i]['fk_bank'] = $obj->fk_bank;
 				$i++;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return $lines;
 	}
@@ -508,8 +505,7 @@ class Account extends CommonObject
 			{
 				$obj = $this->db->fetch_object($resql);
 				$oper = $obj->code;
-			}
-			else {
+			} else {
 				dol_print_error($this->db, 'Failed to get payment type code');
 				return -1;
 			}
@@ -718,18 +714,15 @@ class Account extends CommonObject
 					if ($result < 0) $error++;
 					// End call triggers
 				}
-			}
-			else {
+			} else {
 				$error++;
 			}
-		}
-		else {
+		} else {
 			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				$this->error = $langs->trans("ErrorBankLabelAlreadyExists");
 				$error++;
-			}
-			else {
+			} else {
 				$this->error = $this->db->error()." sql=".$sql;
 				$error++;
 			}
@@ -739,8 +732,7 @@ class Account extends CommonObject
 		{
 			$this->db->commit();
 			return $this->id;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1 * $error;
 		}
@@ -831,8 +823,7 @@ class Account extends CommonObject
 				if ($result < 0) $error++;
 				// End call triggers
 			}
-		}
-		else {
+		} else {
 			$error++;
 			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
@@ -842,8 +833,7 @@ class Account extends CommonObject
 		{
 			$this->db->commit();
 			return $this->id;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1 * $error;
 		}
@@ -900,8 +890,7 @@ class Account extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
 			return -1;
@@ -998,12 +987,10 @@ class Account extends CommonObject
 				$this->fetch_optionals();
 
 				return 1;
-			}
-			else {
+			} else {
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror;
 			$this->errors[] = $this->error;
 			return -1;
@@ -1103,8 +1090,7 @@ class Account extends CommonObject
 						dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
 					}
 				}
-			}
-			else {
+			} else {
 				$error++;
 				$this->error = "Error ".$this->db->lasterror();
 			}
@@ -1114,8 +1100,7 @@ class Account extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1180,8 +1165,7 @@ class Account extends CommonObject
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			if ($obj->nb <= 1) $can_be_deleted = true; // Juste le solde
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 		return $can_be_deleted;
@@ -1279,8 +1263,7 @@ class Account extends CommonObject
 			}
 
 			return $response;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -1317,8 +1300,7 @@ class Account extends CommonObject
 				$this->nb["banklines"] = $obj->nb;
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -1352,8 +1334,7 @@ class Account extends CommonObject
 		{
 			$obj = $db->fetch_object($resql);
 			$nb = $obj->nb;
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 
 		return $nb;
 	}
@@ -1400,8 +1381,7 @@ class Account extends CommonObject
 		if ($mode == 'transactions')
 		{
 			$url = DOL_URL_ROOT.'/compta/bank/bankentries_list.php?id='.$this->id;
-		}
-		elseif ($mode == 'receipts')
+		} elseif ($mode == 'receipts')
 		{
 			$url = DOL_URL_ROOT.'/compta/bank/releve.php?account='.$this->id;
 		}
@@ -1461,8 +1441,7 @@ class Account extends CommonObject
 		if ($this->error_number == 0)
 		{
 			return 1;
-		}
-		else {
+		} else {
 			return 0;
 		}
 	}
@@ -1881,8 +1860,7 @@ class AccountLine extends CommonObject
 			}
 			$this->db->free($result);
 			return $ret;
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -1969,8 +1947,7 @@ class AccountLine extends CommonObject
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -1;
@@ -1998,8 +1975,7 @@ class AccountLine extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -$nbko;
 		}
@@ -2036,8 +2012,7 @@ class AccountLine extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -$nbko;
 		}
@@ -2067,8 +2042,7 @@ class AccountLine extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->error();
 			return -1;
@@ -2132,8 +2106,7 @@ class AccountLine extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -2169,13 +2142,11 @@ class AccountLine extends CommonObject
 				{
 					return 1;
 				}
-			}
-			else {
+			} else {
 				dol_print_error($this->db);
 				return 0;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		return 0;
 	}
 
@@ -2235,13 +2206,11 @@ class AccountLine extends CommonObject
 				{
 					return 1;
 				}
-			}
-			else {
+			} else {
 				dol_print_error($this->db);
 				return 0;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		return 0;
 	}
 
@@ -2311,8 +2280,7 @@ class AccountLine extends CommonObject
 				//$this->date_rappro       = $obj->daterappro;    // Not yet managed
 			}
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -2453,8 +2421,7 @@ class AccountLine extends CommonObject
 			{
 				$alreadydispatched = $obj->nb;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 6943d2bc5e1..3293f746033 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -225,8 +225,7 @@ class BankAccounts extends DolibarrApi
         if ($accountto->currency_code == $accountfrom->currency_code)
         {
             $amount_to = $amount;
-        }
-        else {
+        } else {
             if (!$amount_to || empty($amount_to))
             {
                 throw new RestException(422, 'You must provide amount_to value since bankaccount_from and bankaccount_to does not share the same currency.');
@@ -302,8 +301,7 @@ class BankAccounts extends DolibarrApi
                     'message' => 'Internal wire transfer created successfully.'
                 )
             );
-        }
-        else {
+        } else {
             $this->db->rollback();
             throw new RestException(500, $accountfrom->error.' '.$accountto->error);
         }
@@ -336,8 +334,7 @@ class BankAccounts extends DolibarrApi
         if ($account->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else {
+        } else {
             throw new RestException(500, $account->error);
         }
     }
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index ec88fea3f84..65c7e7ce2ea 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -169,8 +169,7 @@ class PaymentVarious extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -243,8 +242,7 @@ class PaymentVarious extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -428,8 +426,7 @@ class PaymentVarious extends CommonObject
 					if ($bank_line_id > 0)
 					{
 						$this->update_fk_bank($bank_line_id);
-					}
-					else {
+					} else {
 						$this->error = $acc->error;
 						$error++;
 					}
@@ -458,20 +455,17 @@ class PaymentVarious extends CommonObject
 				$result = $this->call_trigger('PAYMENT_VARIOUS_CREATE', $user);
 				if ($result < 0) $error++;
 				// End call triggers
-			}
-			else $error++;
+			} else $error++;
 
 			if (!$error)
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -494,8 +488,7 @@ class PaymentVarious extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -529,30 +522,25 @@ class PaymentVarious extends CommonObject
 		if ($mode == 0)
 		{
 			return $langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			return $langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 2) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
 			elseif ($status == 2 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 2 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
@@ -610,8 +598,7 @@ class PaymentVarious extends CommonObject
 			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 			 */
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -670,8 +657,7 @@ class PaymentVarious extends CommonObject
 				$this->date_modif = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -698,8 +684,7 @@ class PaymentVarious extends CommonObject
 			{
 				$alreadydispatched = $obj->nb;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index d003463e5af..09cd81d4198 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -137,12 +137,10 @@ if ($id > 0 || !empty($ref)) {
         $permtoedit = $user->rights->banque->modifier;
         $param = '&id='.$object->id;
         include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
-}
-else {
+} else {
     Header('Location: index.php');
     exit;
 }
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 796529a24d9..296211bf35c 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -84,8 +84,7 @@ if ($result < 0)
 	$langs->load("errors");
 	$error++;
 	setEventMessages($langs->trans("ErrorFailedToCreateDir"), null, 'errors');
-}
-else {
+} else {
 	// Calcul $min and $max
 	$sql = "SELECT MIN(b.datev) as min, MAX(b.datev) as max";
 	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
@@ -101,8 +100,7 @@ else {
 		$obj = $db->fetch_object($resql);
 		$min = $db->jdate($obj->min);
 		$max = $db->jdate($obj->max);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 	if (empty($min)) $min = dol_now() - 3600 * 24;
@@ -149,8 +147,7 @@ else {
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -171,8 +168,7 @@ else {
 			$row = $db->fetch_row($resql);
 			$solde = $row[0];
 			$db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -195,8 +191,7 @@ else {
 			if ($day > time())
 			{
 				$datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph
-			}
-			else {
+			} else {
 				$datas[$i] = $solde + $subtotal;
 			}
 			$datamin[$i] = $object->min_desired;
@@ -289,8 +284,7 @@ else {
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -311,8 +305,7 @@ else {
 			$row = $db->fetch_row($resql);
 			$solde = $row[0];
 			$db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -336,8 +329,7 @@ else {
 			if ($day > $now)
 			{
 				$datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph
-			}
-			else {
+			} else {
 				$datas[$i] = $solde + $subtotal;
 			}
 			$datamin[$i] = $object->min_desired;
@@ -423,8 +415,7 @@ else {
 				$amounts[$row[0]] = $row[1];
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -450,8 +441,7 @@ else {
 			if ($day > ($max + 86400))
 			{
 				$datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph
-			}
-			else {
+			} else {
 				$datas[$i] = 0 + $solde + $subtotal;
 			}
 			$datamin[$i] = $object->min_desired;
@@ -547,8 +537,7 @@ else {
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -580,8 +569,7 @@ else {
 				$debits[$row[0]] = abs($row[1]);
 			}
 			$db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -662,8 +650,7 @@ else {
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 		$sql = "SELECT date_format(b.datev,'%m')";
@@ -686,8 +673,7 @@ else {
 				$debits[$row[0]] = abs($row[1]);
 			}
 			$db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -756,14 +742,12 @@ if ($account)
 		{
 			$morehtml = '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.'&option=all'.$moreparam.'">'.$langs->trans("ShowAllAccounts").'</a>';
     		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', '', $moreparam, 0, '', '', 1);
-		}
-		else {
+		} else {
 			$morehtml = '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.$moreparam.'">'.$langs->trans("BackToAccount").'</a>';
 			print $langs->trans("AllAccounts");
 			//print $morehtml;
 		}
-	}
-	else {
+	} else {
 	    $bankaccount = new Account($db);
 		$listid = explode(',', $account);
 		foreach ($listid as $key => $id)
@@ -774,8 +758,7 @@ if ($account)
 			if ($key < (count($listid) - 1)) print ', ';
 		}
 	}
-}
-else {
+} else {
 	print $langs->trans("AllAccounts");
 }
 
@@ -791,8 +774,7 @@ if ($mode == 'showalltime')
 	print '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.'">';
 	print $langs->trans("GoBack");
 	print '</a>';
-}
-else {
+} else {
 	print '<a href="'.$_SERVER["PHP_SELF"].'?mode=showalltime&account='.$account.'">';
 	print $langs->trans("ShowAllTimeBalance");
 	print '</a>';
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index a1c37d59050..d2b3e6099dd 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -76,15 +76,15 @@ if ($user->rights->banque->consolidate && $action == 'donext')
 {
     $al = new AccountLine($db);
     $al->dateo_next($_GET["rowid"]);
-}elseif ($user->rights->banque->consolidate && $action == 'doprev')
+} elseif ($user->rights->banque->consolidate && $action == 'doprev')
 {
     $al = new AccountLine($db);
     $al->dateo_previous($_GET["rowid"]);
-}elseif ($user->rights->banque->consolidate && $action == 'dvnext')
+} elseif ($user->rights->banque->consolidate && $action == 'dvnext')
 {
     $al = new AccountLine($db);
     $al->datev_next($_GET["rowid"]);
-}elseif ($user->rights->banque->consolidate && $action == 'dvprev')
+} elseif ($user->rights->banque->consolidate && $action == 'dvprev')
 {
     $al = new AccountLine($db);
     $al->datev_previous($_GET["rowid"]);
@@ -99,8 +99,7 @@ if ($action == 'confirm_delete_categ' && $confirm == "yes" && $user->rights->ban
     	{
         	dol_print_error($db);
     	}
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("MissingIds"), null, 'errors');
 	}
 }
@@ -119,8 +118,7 @@ if ($user->rights->banque->modifier && $action == "update")
 	if (GETPOST('accountid', 'int') > 0 && !$acline->rappro && !$acline->getVentilExportCompta())	// We ask to change bank account
 	{
 		$actarget->fetch(GETPOST('accountid', 'int'));
-	}
-	else {
+	} else {
 		$actarget->fetch($id);
 	}
 
@@ -189,8 +187,7 @@ if ($user->rights->banque->modifier && $action == "update")
 		{
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 			dol_print_error($db);
 		}
@@ -226,8 +223,7 @@ if ($user->rights->banque->consolidate && ($action == 'num_releve' || $action ==
         {
 	        setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
             $db->commit();
-        }
-        else {
+        } else {
             $db->rollback();
             dol_print_error($db);
         }
@@ -320,8 +316,7 @@ if ($result)
         if (!$objp->rappro && !$bankline->getVentilExportCompta())
         {
         	$form->select_comptes($acct->id, 'accountid', 0, '', 0);
-        }
-        else {
+        } else {
         	print $acct->getNomUrl(1, 'transactions', 'reflabel');
         }
         print '</td>';
@@ -345,8 +340,7 @@ if ($result)
                     print $langs->trans("Payment");
                     print '</a>';*/
                     print $paymenttmp->getNomUrl(1);
-                }
-                elseif ($links[$key]['type'] == 'payment_supplier') {
+                } elseif ($links[$key]['type'] == 'payment_supplier') {
                     require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
                     $paymenttmp = new PaiementFourn($db);
                     $paymenttmp->fetch($links[$key]['url_id']);
@@ -356,79 +350,66 @@ if ($result)
                     print $langs->trans("Payment");
                     print '</a>';*/
                     print $paymenttmp->getNomUrl(1);
-                }
-                elseif ($links[$key]['type'] == 'company') {
+                } elseif ($links[$key]['type'] == 'company') {
                     $societe = new Societe($db);
                     $societe->fetch($links[$key]['url_id']);
                     print $societe->getNomUrl(1);
-                }
-                elseif ($links[$key]['type'] == 'sc') {
+                } elseif ($links[$key]['type'] == 'sc') {
                     print '<a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('SocialContribution'), 'bill').' ';
                     print $langs->trans("SocialContribution").($links[$key]['label'] ? ' - '.$links[$key]['label'] : '');
                     print '</a>';
-                }
-                elseif ($links[$key]['type'] == 'payment_sc') {
+                } elseif ($links[$key]['type'] == 'payment_sc') {
                     print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('Payment'), 'payment').' ';
                     print $langs->trans("SocialContributionPayment");
                     print '</a>';
-                }
-                elseif ($links[$key]['type'] == 'payment_vat') {
+                } elseif ($links[$key]['type'] == 'payment_vat') {
                     print '<a href="'.DOL_URL_ROOT.'/compta/tva/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('VAT'), 'payment').' ';
                     print $langs->trans("VATPayment");
                     print '</a>';
-                }
-                elseif ($links[$key]['type'] == 'payment_salary') {
+                } elseif ($links[$key]['type'] == 'payment_salary') {
                     print '<a href="'.DOL_URL_ROOT.'/salaries/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('PaymentSalary'), 'payment').' ';
                     print $langs->trans("SalaryPayment");
                     print '</a>';
-                }
-                elseif ($links[$key]['type'] == 'payment_loan') {
+                } elseif ($links[$key]['type'] == 'payment_loan') {
                     print '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('LoanPayment'), 'payment').' ';
                     print $langs->trans("PaymentLoan");
                     print '</a>';
-                }
-                elseif ($links[$key]['type'] == 'loan') {
+                } elseif ($links[$key]['type'] == 'loan') {
                     print '<a href="'.DOL_URL_ROOT.'/loan/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('Loan'), 'bill').' ';
                     print $langs->trans("Loan");
                     print '</a>';
-                }
-                elseif ($links[$key]['type'] == 'member') {
+                } elseif ($links[$key]['type'] == 'member') {
                     print '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('Member'), 'user').' ';
                     print $links[$key]['label'];
                     print '</a>';
-                }
-				elseif ($links[$key]['type'] == 'payment_donation') {
+                } elseif ($links[$key]['type'] == 'payment_donation') {
                     print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('Donation'), 'payment').' ';
                     print $langs->trans("DonationPayment");
                     print '</a>';
-                }
-                elseif ($links[$key]['type'] == 'banktransfert') {
+                } elseif ($links[$key]['type'] == 'banktransfert') {
                     print '<a href="'.DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('Transaction'), 'payment').' ';
                     print $langs->trans("TransactionOnTheOtherAccount");
                     print '</a>';
-                }
-                elseif ($links[$key]['type'] == 'user') {
+                } elseif ($links[$key]['type'] == 'user') {
                     print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('User'), 'user').' ';
                     print $langs->trans("User");
                     print '</a>';
-                }
-				elseif ($links[$key]['type'] == 'payment_various') {
+                } elseif ($links[$key]['type'] == 'payment_various') {
                     print '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('VariousPayment'), 'payment').' ';
                     print $langs->trans("VariousPayment");
                     print '</a>';
-                }
-                else {
+                } else {
                     print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
                     print img_object('', 'generic').' ';
                     print $links[$key]['label'];
@@ -458,8 +439,7 @@ if ($result)
                 print ' &nbsp; &nbsp; '.$langs->trans("CheckReceipt").': '.$receipt->getNomUrl(2);
             }
             print '</td>';
-        }
-        else {
+        } else {
             print '<td>'.$objp->fk_type.' '.$objp->num_chq.'</td>';
         }
         print "</tr>";
@@ -473,8 +453,7 @@ if ($result)
             print '<td>';
             print '<input type="text" class="flat minwidth200" name="emetteur" value="'.(empty($objp->emetteur) ? '' : stripslashes($objp->emetteur)).'">';
             print '</td>';
-        }
-        else {
+        } else {
             print '<td>'.$objp->emetteur.'</td>';
         }
         print "</tr>";
@@ -488,8 +467,7 @@ if ($result)
         	print '<td>';
         	print '<input type="text" class="flat minwidth200" name="banque" value="'.(empty($objp->banque) ? '' : $objp->banque).'">';
         	print '</td>';
-        }
-        else {
+        } else {
         	print '<td>'.$objp->banque.'</td>';
         }
         print "</tr>";
@@ -509,8 +487,7 @@ if ($result)
                 print img_edit_add()."</a>";
             }
             print '</td>';
-        }
-        else {
+        } else {
             print '<td>';
             print dol_print_date($db->jdate($objp->do), "day");
             print '</td>';
@@ -532,8 +509,7 @@ if ($result)
                 print img_edit_add()."</a>";
             }
             print '</td>';
-        }
-        else {
+        } else {
             print '<td>';
             print dol_print_date($db->jdate($objp->dv), "day");
             print '</td>';
@@ -550,21 +526,18 @@ if ($result)
             {
                 // Label generique car entre parentheses. On l'affiche en le traduisant
                 print $langs->trans($reg[1]);
-            }
-            else {
+            } else {
                 print $objp->label;
             }
             print '">';
             print '</td>';
-        }
-        else {
+        } else {
             print '<td>';
             if (preg_match('/^\((.*)\)$/i', $objp->label, $reg))
             {
                 // Label generique car entre parentheses. On l'affiche en le traduisant
                 print $langs->trans($reg[1]);
-            }
-            else {
+            } else {
                 print $objp->label;
             }
             print '</td>';
@@ -578,8 +551,7 @@ if ($result)
             print '<td>';
             print '<input name="amount" class="flat maxwidth100" '.($objp->rappro ? ' disabled' : '').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$acct->currency_code);
             print '</td>';
-        }
-        else {
+        } else {
             print '<td>';
             print price($objp->amount);
             print '</td>';
@@ -635,14 +607,12 @@ if ($result)
                 {
                     print $langs->trans("AccountStatement").' <input name="num_rel_bis" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro ? ' disabled' : '').'>';
                     print '<input name="num_rel" type="hidden" value="'.$objp->num_releve.'">';
-                }
-                else {
+                } else {
                     print $langs->trans("AccountStatement").' <input name="num_rel" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro ? ' disabled' : '').'>';
                 }
                 if ($objp->num_releve) print ' &nbsp; (<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?num='.$objp->num_releve.'&account='.$acct->id.'">'.$langs->trans("AccountStatement").' '.$objp->num_releve.')</a>';
                 print '</td>';
-            }
-            else {
+            } else {
                 print '<td>'.$objp->num_releve.'&nbsp;</td>';
             }
             print '</tr>';
@@ -653,8 +623,7 @@ if ($result)
                 print '<td>';
                 print '<input type="checkbox" name="reconciled" class="flat" '.(isset($_POST["reconciled"]) ? ($_POST["reconciled"] ? ' checked="checked"' : '') : ($objp->rappro ? ' checked="checked"' : '')).'">';
                 print '</td>';
-            }
-            else {
+            } else {
                 print '<td>'.yn($objp->rappro).'</td>';
             }
             print '</tr>';
@@ -677,8 +646,7 @@ if ($result)
     }
 
     $db->free($result);
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index bc45c708f33..882244518f7 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -212,8 +212,7 @@ if ($resql)
         $i++;
     }
     $db->free($resql);
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 
@@ -487,8 +486,7 @@ foreach ($accounts as $key=>$type)
     		$accountingaccount = new AccountingAccount($db);
     		$accountingaccount->fetch('', $objecttmp->account_number, 1);
     		print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
-    	}
-    	else {
+    	} else {
     		print $objecttmp->account_number;
     	}
     	print '</td>';
@@ -504,8 +502,7 @@ foreach ($accounts as $key=>$type)
     		$accountingjournal = new AccountingJournal($db);
     		$accountingjournal->fetch($objecttmp->fk_accountancy_journal);
     		print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
-    	}
-    	else {
+    	} else {
     		print '';
     	}
     	print '</td>';
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 65476665963..4244856c9ab 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -125,8 +125,7 @@ if ($_GET["rel"] == 'prev')
 			$found = true;
 		}
 	}
-}
-elseif ($_GET["rel"] == 'next')
+} elseif ($_GET["rel"] == 'next')
 {
 	// Recherche valeur pour num = numero releve precedent
 	$sql = "SELECT DISTINCT(b.num_releve) as num";
@@ -147,8 +146,7 @@ elseif ($_GET["rel"] == 'next')
 			$found = true;
 		}
 	}
-}
-else {
+} else {
 	// On veut le releve num
 	$found = true;
 }
@@ -295,15 +293,13 @@ if (empty($numref))
 			if (!isset($objp->numr))
 			{
 				//
-			}
-			else {
+			} else {
 				print '<tr class="oddeven">';
 				print '<td>';
 				if ($action != 'editbankreceipt' || $objp->numr != $brref)
 				{
 					print '<a href="releve.php?num='.$objp->numr.'&account='.$object->id.'">'.$objp->numr.'</a>';
-				}
-				else {
+				} else {
 					print '<input type="hidden" name="oldbankreceipt" value="'.$objp->numr.'">';
 					print '<input type="text" name="newbankreceipt" value="'.$objp->numr.'">';
 					print '<input type="submit" class="button" name="actionnewbankreceipt" value="'.$langs->trans("Rename").'">';
@@ -353,12 +349,10 @@ if (empty($numref))
 		print '</form>';
 
 		print "\n</div>\n";
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
-}
-else {
+} else {
 	/**
 	 *   Show list of record into a bank statement
 	 */
@@ -484,58 +478,50 @@ else {
 					$paymentstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentstatic->getNomUrl(1);
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'payment_supplier')
+				} elseif ($links[$key]['type'] == 'payment_supplier')
 				{
 					$paymentsupplierstatic->id = $links[$key]['url_id'];
 					$paymentsupplierstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentsupplierstatic->getNomUrl(1);
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'payment_sc')
+				} elseif ($links[$key]['type'] == 'payment_sc')
 				{
 					print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
 					print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
 					print $langs->trans("SocialContributionPayment");
 					print '</a>';
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'payment_vat')
+				} elseif ($links[$key]['type'] == 'payment_vat')
 				{
 					$paymentvatstatic->id = $links[$key]['url_id'];
 					$paymentvatstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentvatstatic->getNomUrl(1);
-				}
-				elseif ($links[$key]['type'] == 'payment_salary')
+				} elseif ($links[$key]['type'] == 'payment_salary')
 				{
 					print '<a href="'.DOL_URL_ROOT.'/salaries/card.php?id='.$links[$key]['url_id'].'">';
 					print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
 					print $langs->trans("Payment");
 					print '</a>';
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'payment_donation')
+				} elseif ($links[$key]['type'] == 'payment_donation')
 				{
 					$paymentdonationstatic->id = $links[$key]['url_id'];
 					$paymentdonationstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentdonationstatic->getNomUrl(1);
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'payment_loan')
+				} elseif ($links[$key]['type'] == 'payment_loan')
 				{
 					$paymentloanstatic->id = $links[$key]['url_id'];
 					$paymentloanstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentloanstatic->getNomUrl(1);
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'payment_various')
+				} elseif ($links[$key]['type'] == 'payment_various')
 				{
 					$paymentvariousstatic->id = $links[$key]['url_id'];
 					$paymentvariousstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentvariousstatic->getNomUrl(1);
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'banktransfert') {
+				} elseif ($links[$key]['type'] == 'banktransfert') {
 					// Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
 					if ($objp->amount > 0)
 					{
@@ -549,8 +535,7 @@ else {
 						$bankstatic->label = $objp->bankref;
 						print $bankstatic->getNomUrl(1, '');
 						print ')';
-					}
-					else {
+					} else {
 						$bankstatic->id = $objp->bankid;
 						$bankstatic->label = $objp->bankref;
 						print ' ('.$langs->trans("from").' ';
@@ -562,35 +547,30 @@ else {
 						print $bankstatic->getNomUrl(1, 'transactions');
 						print ')';
 					}
-				}
-				elseif ($links[$key]['type'] == 'company') {
+				} elseif ($links[$key]['type'] == 'company') {
                     $societestatic->id = $links[$key]['url_id'];
                     $societestatic->name = $links[$key]['label'];
                     print $societestatic->getNomUrl(1, 'company', 24);
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'member') {
+				} elseif ($links[$key]['type'] == 'member') {
 					print '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$links[$key]['url_id'].'">';
 					print img_object($langs->trans('ShowMember'), 'user').' ';
 					print $links[$key]['label'];
 					print '</a>';
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'user') {
+				} elseif ($links[$key]['type'] == 'user') {
 					print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$links[$key]['url_id'].'">';
 					print img_object($langs->trans('ShowUser'), 'user').' ';
 					print $links[$key]['label'];
 					print '</a>';
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'sc') {
+				} elseif ($links[$key]['type'] == 'sc') {
 					print '<a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$links[$key]['url_id'].'">';
 					print img_object($langs->trans('ShowBill'), 'bill').' ';
 					print $langs->trans("SocialContribution");
 					print '</a>';
 					$newline = 0;
-				}
-				else {
+				} else {
 					print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
 					print $links[$key]['label'];
 					print '</a>';
@@ -620,8 +600,7 @@ else {
 						print "<br>-&nbsp;<i>".$objc->label."</i>";
 						$ii++;
 					}
-				}
-				else {
+				} else {
 					dol_print_error($db);
 				}
 			}
@@ -632,8 +611,7 @@ else {
 			{
 				$totald = $totald + abs($objp->amount);
 				print '<td class="nowrap right">'.price($objp->amount * -1)."</td><td>&nbsp;</td>\n";
-			}
-			else {
+			} else {
 				$totalc = $totalc + abs($objp->amount);
 				print '<td>&nbsp;</td><td class="nowrap right">'.price($objp->amount)."</td>\n";
 			}
@@ -645,8 +623,7 @@ else {
 				print '<td class="center"><a href="'.DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$objp->rowid.'&account='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?account='.$object->id.'&num='.$numref).'">';
 				print img_edit();
 				print "</a></td>";
-			}
-			else {
+			} else {
 				print "<td class=\"center\">&nbsp;</td>";
 			}
 			print "</tr>";
diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index 99a66321648..7228c38fe50 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -87,8 +87,7 @@ if ($action == 'add')
 		if ($accountto->currency_code == $accountfrom->currency_code)
 		{
 			$amountto = $amount;
-		}
-		else {
+		} else {
 			if (!$amountto)
 			{
 				$error++;
@@ -129,13 +128,11 @@ if ($action == 'add')
 				$mesgs = $langs->trans("TransferFromToDone", '<a href="bankentries_list.php?id='.$accountfrom->id.'&sortfield=b.datev,b.dateo,b.rowid&sortorder=desc">'.$accountfrom->label."</a>", '<a href="bankentries_list.php?id='.$accountto->id.'">'.$accountto->label."</a>", $amount, $langs->transnoentities("Currency".$conf->currency));
 				setEventMessages($mesgs, null, 'mesgs');
 				$db->commit();
-			}
-			else {
+			} else {
 				setEventMessages($accountfrom->error.' '.$accountto->error, null, 'errors');
 				$db->rollback();
 			}
-		}
-		else {
+		} else {
 		    $error++;
 			setEventMessages($langs->trans("ErrorFromToAccountsMustDiffers"), null, 'errors');
 		}
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index 929a1611775..cf494b77a90 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -72,8 +72,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 	if ($vline)
 	{
 		$viewline = $vline;
-	}
-	else {
+	} else {
 		$viewline = 20;
 	}
 
@@ -289,8 +288,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 					if ($obj->family == 'invoice') {
 						$mc->getInfo($obj->entity);
 						print "<td>".$mc->label."</td>";
-					}
-					else {
+					} else {
 						print "<td></td>";
 					}
 				}
@@ -303,8 +301,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 
 			$i++;
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
@@ -324,8 +321,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 
 	print "</table>";
     print "</div>";
-}
-else {
+} else {
 	print $langs->trans("ErrorBankAccountNotFound");
 }
 
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index ffabd082bfa..071a5abf0a9 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -163,8 +163,7 @@ if (empty($reshook))
 				$urltogo = ($backtopage ? $backtopage : DOL_URL_ROOT.'/compta/bank/various_payment/list.php');
 				header("Location: ".$urltogo);
 				exit;
-			}
-			else {
+			} else {
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 				$action = "create";
@@ -197,19 +196,16 @@ if (empty($reshook))
 					$db->commit();
 					header("Location: ".DOL_URL_ROOT.'/compta/bank/various_payment/list.php');
 					exit;
-				}
-				else {
+				} else {
 					$object->error = $accountline->error;
 					$db->rollback();
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
-			}
-			else {
+			} else {
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else {
+		} else {
 			setEventMessages('Error try do delete a line linked to a conciliated bank transaction', null, 'errors');
 		}
 	}
@@ -371,8 +367,7 @@ if ($action == 'create')
         print '<td>';
 		print $formaccounting->select_account($accountancy_code, 'accountancy_code', 1, null, 1, 1);
         print '</td></tr>';
-	}
-	else // For external software
+	} else // For external software
 	{
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("AccountAccounting").'</td>';
 		print '<td><input class="minwidth100 maxwidthonsmartphone" name="accountancy_code" value="'.$accountancy_code.'">';
@@ -387,13 +382,11 @@ if ($action == 'create')
         if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
         {
             print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1, '');
-        }
-        else {
+        } else {
             print '<input type="text" class="maxwidth200 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
         }
         print '</td></tr>';
-    }
-    else // For external software
+    } else // For external software
     {
         print '<tr><td>'.$langs->trans("SubledgerAccount").'</td>';
         print '<td><input class="minwidth100 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
@@ -559,12 +552,10 @@ if ($id)
 			} else {
 				print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a></div>';
 			}
-		}
-		else {
+		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("NotAllowed"))).'">'.$langs->trans("Delete").'</a></div>';
 		}
-	}
-	else {
+	} else {
 		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("LinkedToAConciliatedTransaction").'">'.$langs->trans("Delete").'</a></div>';
 	}
 
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index 624ead86073..7a89fd77986 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -149,8 +149,7 @@ if ($object->id)
 	$permission = $user->rights->banque->modifier;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 5fa44ba8555..d02f75819e4 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -75,8 +75,7 @@ if (!GETPOST('typeid'))
 		$part = explode(':', $val);
 		if ($part[0] == 'v.fk_typepayment') $typeid = $part[1];
 	}
-}
-else {
+} else {
 	$typeid = GETPOST('typeid');
 }
 
@@ -312,8 +311,7 @@ if ($result)
 
 				$accountstatic->label = $obj->blabel;
 				print $accountstatic->getNomUrl(1);
-			}
-			else print '&nbsp;';
+			} else print '&nbsp;';
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
@@ -372,8 +370,7 @@ if ($result)
 	print '</form>';
 
 	$db->free($result);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index fce50a977e4..b14b77d5264 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -107,8 +107,7 @@ if (GETPOST('cancel', 'alpha'))
 {
 	if ($action == 'valid') {
 		$action = 'view';
-	}
-	else {
+	} else {
 		$action = 'create';
 	}
 }
@@ -144,8 +143,7 @@ if ($action == "start")
 		$action = 'create';
 		$error++;
 	}
-}
-elseif ($action == "add")
+} elseif ($action == "add")
 {
 	if (GETPOST('opening', 'alpha') == '')
 	{
@@ -177,8 +175,7 @@ elseif ($action == "add")
 		{
 			$db->commit();
 			$action = "view";
-		}
-		else {
+		} else {
 			$db->rollback;
 			$action = "view";
 		}
@@ -216,8 +213,7 @@ if ($action == "valid")	// validate = close
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("CashFenceDone"), null);
 		$db->commit();
 	}
@@ -251,8 +247,7 @@ if ($action == 'confirm_delete' && !empty($permissiontodelete))
         setEventMessages("RecordDeleted", null, 'mesgs');
         header("Location: ".$backurlforlist);
         exit;
-    }
-    else {
+    } else {
         if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
         else setEventMessages($object->error, null, 'errors');
     }
@@ -279,8 +274,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 		$syear = $object->year_close;
 		$smonth = $object->month_close;
 		$sday = $object->day_close;
-	}
-	elseif (GETPOST('posnumber', 'alpha') != '' && GETPOST('posnumber', 'alpha') != '' && GETPOST('posnumber', 'alpha') != '-1')
+	} elseif (GETPOST('posnumber', 'alpha') != '' && GETPOST('posnumber', 'alpha') != '' && GETPOST('posnumber', 'alpha') != '-1')
 	{
 		$posmodule = GETPOST('posmodule', 'alpha');
 		$terminalid = GETPOST('posnumber', 'alpha');
@@ -324,10 +318,8 @@ if ($action == "create" || $action == "start" || $action == 'close')
     			{
     				$obj = $db->fetch_object($resql);
     				if ($obj) $initialbalanceforterminal[$terminalid][$key] = $obj->total;
-    			}
-    			else dol_print_error($db);
-			}
-			else {
+    			} else dol_print_error($db);
+			} else {
 				setEventMessages($langs->trans("SetupOfTerminalNotComplete", $terminaltouse), null, 'errors');
 			    $error++;
 			}
@@ -366,8 +358,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 					$theoricalamountforterminal[$terminalid][$key] = price2num($theoricalamountforterminal[$terminalid][$key] + $obj->total);
 					$theoricalnbofinvoiceforterminal[$terminalid][$key] = $obj->nb;
 				}
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 		}
 	}
 
@@ -383,13 +374,11 @@ if ($action == "create" || $action == "start" || $action == 'close')
 	    if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1')
 	    {
 		    print '<input type="hidden" name="action" value="add">';
-	    }
-	    elseif ($action == 'close')
+	    } elseif ($action == 'close')
 	    {
 	    	print '<input type="hidden" name="action" value="valid">';
 			print '<input type="hidden" name="id" value="'.$id.'">';
-	    }
-		else {
+	    } else {
 	    	print '<input type="hidden" name="action" value="start">';
 	    }
 
@@ -463,8 +452,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 		if ($action == 'start' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '-1')
 		{
 			print '';
-		}
-		else {
+		} else {
 			print '<input type="submit" name="add" class="button" value="'.$langs->trans("Start").'">';
 		}
 		print '</td>';
@@ -562,8 +550,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 			{
 				$object->fetch($id);
 				print $object->opening;
-			}
-			else print (GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
+			} else print (GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
 			print '">';
 			print '</td>';
 			// Amount per payment type
@@ -601,8 +588,7 @@ if (empty($action) || $action == "view" || $action == "close")
 
     if ($result <= 0) {
     	print $langs->trans("ErrorRecordNotFound");
-    }
-    else {
+    } else {
     	$head = array();
     	$head[0][0] = DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_card.php?id='.$object->id;
     	$head[0][1] = $langs->trans("CashControl");
@@ -699,13 +685,11 @@ if (empty($action) || $action == "view" || $action == "close")
 	    	if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1')
 	    	{
 	    		print '<input type="hidden" name="action" value="add">';
-	    	}
-	    	elseif ($action == 'close')
+	    	} elseif ($action == 'close')
 	    	{
 	    		print '<input type="hidden" name="action" value="valid">';
 	    		print '<input type="hidden" name="id" value="'.$id.'">';
-	    	}
-	    	else {
+	    	} else {
 	    		print '<input type="hidden" name="action" value="start">';
 	    	}
 
@@ -852,8 +836,7 @@ if (empty($action) || $action == "view" || $action == "close")
 	    		{
 	    			$object->fetch($id);
 	    			print $object->opening;
-	    		}
-	    		else print (GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
+	    		} else print (GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
 	    		print '">';
 	    		print '</td>';
 	    		// Amount per payment type
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index 5269c07bab2..0279ad5143c 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -259,8 +259,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else {
+} else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 81a19389244..0f60be3c3a8 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -404,8 +404,7 @@ class CashControl extends CommonObject
 		     $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 		     if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 		     */
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index 5b9079f9d72..f2d8e38fb15 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -172,8 +172,7 @@ if ($resql)
             $bankaccounttmp->fetch($objp->bankid);
             $cachebankaccount[$objp->bankid] = $bankaccounttmp;
             $bankaccount = $bankaccounttmp;
-        }
-        else {
+        } else {
             $bankaccount = $cachebankaccount[$objp->bankid];
         }
 
@@ -207,8 +206,7 @@ if ($resql)
 		print $bankaccount->getNomUrl(1);
 		if ($cashcontrol->posmodule == "takepos") {
 			$var1 = 'CASHDESK_ID_BANKACCOUNT_CASH'.$cashcontrol->posnumber;
-		}
-		else {
+		} else {
 			$var1 = 'CASHDESK_ID_BANKACCOUNT_CASH';
 		}
 		if ($objp->code == 'CHQ') {
@@ -310,8 +308,7 @@ if ($resql)
     print '</form>';
 
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 991d039d1fb..def4fda9b10 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -103,8 +103,7 @@ if ($mode != 'sconly')
 {
     $center = ($year ? '<a href="index.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="index.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'object_payment', 0, '', '', $limit, 1);
-}
-else {
+} else {
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'object_payment', 0, '', '', $limit, 0);
 }
 
@@ -216,8 +215,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 		            $accountstatic->accountancy_journal = $obj->accountancy_journal;
 		            $accountstatic->label = $obj->blabel;
 		            print $accountstatic->getNomUrl(1);
-		        }
-		        else print '&nbsp;';
+		        } else print '&nbsp;';
 		        print '</td>';
 		    }
 			// Paid
@@ -239,8 +237,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
         if (!empty($conf->banque->enabled)) print '<td></td>';
 	    print '<td class="liste_total right">'.price($totalpaye)."</td>";
 		print "</tr>";
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 	print '</table>';
@@ -332,8 +329,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 			            $accountstatic->accountancy_journal = $obj->accountancy_journal;
 			            $accountstatic->label = $obj->blabel;
 			            print $accountstatic->getNomUrl(1);
-			        }
-			        else print '&nbsp;';
+			        } else print '&nbsp;';
 			        print '</td>';
 			    }
 
@@ -354,8 +350,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 
 		    print "</table>";
 		    $db->free($result);
-		}
-		else {
+		} else {
 		    dol_print_error($db);
 		}
 	}
@@ -366,18 +361,15 @@ if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
 {
 	$j = 1;
 	$numlt = 3;
-}
-elseif ($mysoc->localtax1_assuj == "1")
+} elseif ($mysoc->localtax1_assuj == "1")
 {
 	$j = 1;
 	$numlt = 2;
-}
-elseif ($mysoc->localtax2_assuj == "1")
+} elseif ($mysoc->localtax2_assuj == "1")
 {
 	$j = 2;
 	$numlt = 3;
-}
-else {
+} else {
 	$j = 0;
 	$numlt = 0;
 }
@@ -447,8 +439,7 @@ while ($j < $numlt)
 
 			print "</table>";
 			$db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -541,8 +532,7 @@ if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
 			            $accountstatic->accountancy_journal = $obj->accountancy_journal;
 			            $accountstatic->label = $obj->blabel;
 			            print $accountstatic->getNomUrl(1);
-			        }
-			        else print '&nbsp;';
+			        } else print '&nbsp;';
 			        print '</td>';
 			    }
 
@@ -560,8 +550,7 @@ if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
             $db->free($result);
 
             print "<br>";
-        }
-        else {
+        } else {
             dol_print_error($db);
         }
     }
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 74cc0d594e5..5632e8ebc1a 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -196,8 +196,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index b688bd17907..d2fd1c54cce 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -70,14 +70,11 @@ if ($action == 'validate' && $user->rights->deplacement->creer)
         {
             header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
             exit;
-        }
-        else {
+        } else {
 	        setEventMessages($object->error, $object->errors, 'errors');
         }
     }
-}
-
-elseif ($action == 'classifyrefunded' && $user->rights->deplacement->creer)
+} elseif ($action == 'classifyrefunded' && $user->rights->deplacement->creer)
 {
     $object->fetch($id);
     if ($object->statut == Deplacement::STATUS_VALIDATED)
@@ -87,27 +84,21 @@ elseif ($action == 'classifyrefunded' && $user->rights->deplacement->creer)
         {
             header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
             exit;
-        }
-        else {
+        } else {
 	        setEventMessages($object->error, $object->errors, 'errors');
         }
     }
-}
-
-elseif ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer)
+} elseif ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer)
 {
     $result = $object->delete($id);
     if ($result >= 0)
     {
         header("Location: index.php");
         exit;
-    }
-    else {
+    } else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
-}
-
-elseif ($action == 'add' && $user->rights->deplacement->creer)
+} elseif ($action == 'add' && $user->rights->deplacement->creer)
 {
     if (!GETPOST('cancel', 'alpha'))
     {
@@ -146,17 +137,14 @@ elseif ($action == 'add' && $user->rights->deplacement->creer)
             {
                 header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
                 exit;
-            }
-            else {
+            } else {
 	            setEventMessages($object->error, $object->errors, 'errors');
                 $action = 'create';
             }
-        }
-        else {
+        } else {
             $action = 'create';
         }
-    }
-    else {
+    } else {
         header("Location: index.php");
         exit;
     }
@@ -183,12 +171,10 @@ elseif ($action == 'update' && $user->rights->deplacement->creer)
         {
             header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
             exit;
-        }
-        else {
+        } else {
 	        setEventMessages($object->error, $object->errors, 'errors');
         }
-    }
-    else {
+    } else {
         header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
         exit;
     }
@@ -209,8 +195,7 @@ elseif ($action == 'setdated' && $user->rights->deplacement->creer)
     $object->fetch($id);
     $result = $object->setValueFrom('dated', $dated, '', '', 'date', '', $user, 'DEPLACEMENT_MODIFY');
     if ($result < 0) dol_print_error($db, $object->error);
-}
-elseif ($action == 'setkm' && $user->rights->deplacement->creer)
+} elseif ($action == 'setkm' && $user->rights->deplacement->creer)
 {
     $object->fetch($id);
     $result = $object->setValueFrom('km', GETPOST('km', 'int'), '', null, 'text', '', $user, 'DEPLACEMENT_MODIFY');
@@ -305,8 +290,7 @@ if ($action == 'create')
 	print '</div>';
 
     print '</form>';
-}
-elseif ($id)
+} elseif ($id)
 {
     $result = $object->fetch($id);
     if ($result > 0)
@@ -404,8 +388,7 @@ elseif ($id)
             print '</form>';
 
             print '</div>';
-        }
-        else {
+        } else {
             /*
              * Confirm delete trip
              */
@@ -483,8 +466,7 @@ elseif ($id)
                 if ($action == 'classify')
                 {
                     $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1);
-                }
-                else {
+                } else {
                     $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0);
                 }
                 print '</td>';
@@ -518,8 +500,7 @@ elseif ($id)
 	            if ($user->rights->deplacement->creer)
 	            {
 	                print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
-	            }
-	            else {
+	            } else {
 	                print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Modify').'</a>';
 	            }
             }
@@ -529,8 +510,7 @@ elseif ($id)
                 if ($user->rights->deplacement->creer)
                 {
                     print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=validate&id='.$id.'">'.$langs->trans('Validate').'</a>';
-                }
-                else {
+                } else {
                     print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Validate').'</a>';
                 }
             }
@@ -540,8 +520,7 @@ elseif ($id)
                 if ($user->rights->deplacement->creer)
                 {
                     print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=classifyrefunded&id='.$id.'">'.$langs->trans('ClassifyRefunded').'</a>';
-                }
-                else {
+                } else {
                     print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('ClassifyRefunded').'</a>';
                 }
             }
@@ -549,15 +528,13 @@ elseif ($id)
             if ($user->rights->deplacement->supprimer)
             {
                 print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$id.'">'.$langs->trans('Delete').'</a>';
-            }
-            else {
+            } else {
                 print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Delete').'</a>';
             }
 
             print '</div>';
         }
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index 8051d074db5..69baf710b95 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -199,14 +199,12 @@ class Deplacement extends CommonObject
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else {
+			} else {
 				$this->error = $this->db->error();
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -265,8 +263,7 @@ class Deplacement extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -309,8 +306,7 @@ class Deplacement extends CommonObject
 			$this->extraparams	= (array) json_decode($obj->extraparams, true);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -334,8 +330,7 @@ class Deplacement extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -370,30 +365,25 @@ class Deplacement extends CommonObject
 		if ($mode == 0)
 		{
 			return $langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			return $langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 2) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
 			elseif ($status == 2 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 2 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
@@ -455,8 +445,7 @@ class Deplacement extends CommonObject
                 $ret[$obj->code] = (($langs->trans($obj->code) != $obj->code) ? $langs->trans($obj->code) : $obj->label);
                 $i++;
             }
-        }
-        else {
+        } else {
         	dol_print_error($this->db);
         }
 
@@ -501,8 +490,7 @@ class Deplacement extends CommonObject
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index 4ad2044c0f1..889eb390ca2 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -123,8 +123,7 @@ if ($object->id)
     $permission = $user->rights->deplacement->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 9ed6e430c4c..0cea847f9ce 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -192,13 +192,11 @@ if ($result)
 
             $i++;
         }
-    }
-    else {
+    } else {
         print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
     print '</table><br>';
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 print '</div></div></div>';
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index 1ebaeb5c6fa..78c1f32556d 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -196,8 +196,7 @@ if ($resql)
     print "</table>";
     print "</form>\n";
     $db->free($resql);
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index 91c6546a83c..7707cb40786 100644
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -167,8 +167,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-}
-else {
+} else {
     $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
@@ -293,8 +292,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td align="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
 	print "<br>\n";
 	print $px2->show();
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 8256aeacc5a..a0d09a11980 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -238,8 +238,7 @@ if (empty($reshook))
 					setEventMessages($oldinvoice->error, $oldinvoice->errors, 'errors');
 					$action = "create";
 				}
-			}
-			else {
+			} else {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 				$action = "create";
@@ -251,8 +250,7 @@ if (empty($reshook))
 
 				header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$object->id);
 	   			exit;
-			}
-			else {
+			} else {
 				$db->rollback();
 
 				$error++;
@@ -298,8 +296,7 @@ if (empty($reshook))
 			$object->titre = GETPOST('ref', 'alpha'); // deprecated
 			$object->title = GETPOST('ref', 'alpha');
 			$object->ref = $object->title;
-		}
-		else dol_print_error($db, $object->error, $object->errors);
+		} else dol_print_error($db, $object->error, $object->errors);
 	}
 	// Set bank account
 	elseif ($action == 'setbankaccount' && $user->rights->facture->creer)
@@ -354,8 +351,7 @@ if (empty($reshook))
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -377,8 +373,7 @@ if (empty($reshook))
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -414,18 +409,15 @@ if (empty($reshook))
 			{
 				$db->commit();
 				$object->fetch($object->id); // Reload lines
-			}
-			else {
+			} else {
 				$db->rollback();
 				setEventMessages($db->lasterror(), null, 'errors');
 			}
-		}
-		else {
+		} else {
 			$db->rollback();
 			setEventMessages($line->error, $line->errors, 'errors');
 		}
-	}
-	elseif ($action == 'update_extras')
+	} elseif ($action == 'update_extras')
 	{
 		$object->oldcopy = dol_clone($object);
 
@@ -460,8 +452,7 @@ if (empty($reshook))
 		{
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0);
-		}
-		else {
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
@@ -571,8 +562,7 @@ if (empty($reshook))
 					if ($price_base_type != 'HT')
 					{
 						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
-					}
-					else {
+					} else {
 						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 					}
 				}
@@ -595,8 +585,7 @@ if (empty($reshook))
 					}
 
 					$desc = (!empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
-				}
-				else {
+				} else {
 					$desc = $prod->description;
 				}
 
@@ -631,8 +620,7 @@ if (empty($reshook))
 
 				$type = $prod->type;
 				$fk_unit = $prod->fk_unit;
-			}
-			else {
+			} else {
 				$pu_ht = price2num($price_ht, 'MU');
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 				$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
@@ -662,8 +650,7 @@ if (empty($reshook))
 			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min)))) {
 				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
 				setEventMessages($mesg, null, 'errors');
-			}
-			else {
+			} else {
 				// Insert line
 				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $info_bits, '', $pu_ttc, $type, - 1, $special_code, $label, $fk_unit, 0, $date_start_fill, $date_end_fill, $fournprice, $buyingprice);
 
@@ -727,17 +714,14 @@ if (empty($reshook))
 
 					unset($_POST['situations']);
 					unset($_POST['progress']);
-				}
-				else {
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 
 				$action = '';
 			}
 		}
-	}
-
-	elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha'))
+	} elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha'))
 	{
 		if (!$object->fetch($id) > 0)	dol_print_error($db);
 		$object->fetch_thirdparty();
@@ -935,8 +919,7 @@ if (empty($reshook))
 
 				unset($_POST['situations']);
 				unset($_POST['progress']);
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -1131,8 +1114,7 @@ if ($action == 'create')
 			$select = array('0'=>$langs->trans('DoNotGenerateDoc'), '1'=>$langs->trans('AutoGenerateDoc'));
 			print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf'));
 			print "</td></tr>";
-		}
-		else {
+		} else {
 			print '<input type="hidden" name="generate_pdf" value="1">';
 		}
 
@@ -1184,12 +1166,10 @@ if ($action == 'create')
 		print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		print '</div>';
 		print "</form>\n";
-	}
-	else {
+	} else {
 		dol_print_error('', "Error, no invoice ".$object->id);
 	}
-}
-else {
+} else {
 	/*
 	 * View mode
 	 */
@@ -1312,8 +1292,7 @@ else {
 			if ($action == 'editconditions')
 			{
 				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
-			}
-			else {
+			} else {
 				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->cond_reglement_id, 'none');
 			}
 		} else {
@@ -1333,8 +1312,7 @@ else {
 		if ($action == 'editmode')
 		{
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
-		}
-		else {
+		} else {
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'none');
 		}
 		print '</td></tr>';
@@ -1441,8 +1419,7 @@ else {
 		if ($action == 'editbankaccount')
 		{
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
-		}
-		else {
+		} else {
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
 		}
 		print "</td>";
@@ -1467,8 +1444,7 @@ else {
             }
             $select = 'select;'.implode(',', $list);
             print $form->editfieldval($langs->trans("Model"), 'modelpdf', $object->modelpdf, $object, $user->rights->facture->creer, $select);
-        }
-        else {
+        } else {
             print $object->modelpdf;
         }
         print "</td>";
@@ -1516,13 +1492,11 @@ else {
 			print '</td>';
 			print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
-		}
-		else {
+		} else {
 			if ($object->frequency > 0)
 			{
 				print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
-			}
-			else {
+			} else {
 				print $langs->trans("NotARecurringInvoiceTemplate");
 			}
 		}
@@ -1533,8 +1507,7 @@ else {
 		if ($action == 'date_when' || $object->frequency > 0)
 		{
 			print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'day');
-		}
-		else {
+		} else {
 			print $langs->trans("NextDateToExecution");
 		}
 		print '</td><td>';
@@ -1546,8 +1519,7 @@ else {
 		if (!$object->isMaxNbGenReached())
 		{
 			if (!$object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) print img_warning($langs->trans("Late"));
-		}
-		else {
+		} else {
 			print img_info($langs->trans("MaxNumberOfGenerationReached"));
 		}
 		print '</td>';
@@ -1558,16 +1530,14 @@ else {
 		if ($action == 'nb_gen_max' || $object->frequency > 0)
 		{
 			print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
-		}
-		else {
+		} else {
 			print $langs->trans("MaxPeriodNumber");
 		}
 		print '</td><td>';
 		if ($action == 'nb_gen_max' || $object->frequency > 0)
 		{
 			  print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max ? $object->nb_gen_max : '', $object, $user->rights->facture->creer);
-		}
-		else {
+		} else {
 			print '';
 		}
 		print '</td>';
@@ -1602,8 +1572,7 @@ else {
 			}
 			print '</td>';
 			print '</tr>';
-		}
-		else {
+		} else {
 			print '<input type="hidden" name="generate_pdf" value="1">';
 		}
 
@@ -1704,18 +1673,15 @@ else {
 				if (!empty($object->frequency) && $object->nb_gen_max > 0 && ($object->nb_gen_done >= $object->nb_gen_max))
 				{
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("MaxGenerationReached")).'">'.$langs->trans("CreateBill").'</a></div>';
-				}
-				else {
+				} else {
 					if (empty($object->frequency) || $object->date_when <= $today)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->thirdparty->id.'&fac_rec='.$object->id.'">'.$langs->trans("CreateBill").'</a></div>';
-					}
-					else {
+					} else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("DateIsNotEnough")).'">'.$langs->trans("CreateBill").'</a></div>';
 					}
 				}
-			}
-			else {
+			} else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateBill").'</a></div>';
 			}
 		}
@@ -1725,8 +1691,7 @@ else {
 			if (empty($object->suspended))
 			{
 				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.DOL_URL_ROOT.'/compta/facture/card-rec.php?action=disable&id='.$object->id.'">'.$langs->trans("Disable").'</a></div>';
-			}
-			else {
+			} else {
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card-rec.php?action=enable&id='.$object->id.'">'.$langs->trans("Enable").'</a></div>';
 			}
 		}
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 68b1a6e91df..677701b9970 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -335,32 +335,24 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	elseif ($action == 'set_thirdparty' && $usercancreate)
+	} elseif ($action == 'set_thirdparty' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->setValueFrom('fk_soc', $socid, '', null, 'int', '', $user, 'BILL_MODIFY');
 
 		header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id);
 		exit();
-	}
-
-	elseif ($action == 'classin' && $usercancreate)
+	} elseif ($action == 'classin' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->setProject($_POST['projectid']);
-	}
-
-	elseif ($action == 'setmode' && $usercancreate)
+	} elseif ($action == 'setmode' && $usercancreate)
 	{
 		$object->fetch($id);
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
 		if ($result < 0)
 			dol_print_error($db, $object->error);
-	}
-
-	elseif ($action == 'setretainedwarrantyconditions' && $user->rights->facture->creer)
+	} elseif ($action == 'setretainedwarrantyconditions' && $user->rights->facture->creer)
 	{
 	    $object->fetch($id);
 	    $object->retained_warranty_fk_cond_reglement = 0; // To clean property
@@ -373,17 +365,13 @@ if (empty($reshook))
 	    if ($object->retained_warranty_date_limit < $object->date) $object->retained_warranty_date_limit = $object->date;
 	    $result = $object->update($user);
 	    if ($result < 0) dol_print_error($db, $object->error);
-	}
-
-	elseif ($action == 'setretainedwarranty' && $user->rights->facture->creer)
+	} elseif ($action == 'setretainedwarranty' && $user->rights->facture->creer)
 	{
 	    $object->fetch($id);
 	    $result = $object->setRetainedWarranty(GETPOST('retained_warranty', 'float'));
 	    if ($result < 0)
 	        dol_print_error($db, $object->error);
-	}
-
-	elseif ($action == 'setretainedwarrantydatelimit' && $user->rights->facture->creer)
+	} elseif ($action == 'setretainedwarrantydatelimit' && $user->rights->facture->creer)
 	{
 	    $object->fetch($id);
 	    $result = $object->setRetainedWarrantyDateLimit(GETPOST('retained_warranty_date_limit', 'float'));
@@ -400,9 +388,7 @@ if (empty($reshook))
 	// Multicurrency rate
 	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
-	}
-
-	elseif ($action == 'setinvoicedate' && $usercancreate)
+	} elseif ($action == 'setinvoicedate' && $usercancreate)
 	{
 		$object->fetch($id);
 		$old_date_lim_reglement = $object->date_lim_reglement;
@@ -421,9 +407,7 @@ if (empty($reshook))
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
-	}
-
-	elseif ($action == 'setdate_pointoftax' && $usercancreate)
+	} elseif ($action == 'setdate_pointoftax' && $usercancreate)
 	{
 		$object->fetch($id);
 		$date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
@@ -432,9 +416,7 @@ if (empty($reshook))
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
-	}
-
-	elseif ($action == 'setconditions' && $usercancreate)
+	} elseif ($action == 'setconditions' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->cond_reglement_code = 0; // To clean property
@@ -450,9 +432,7 @@ if (empty($reshook))
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
-	}
-
-	elseif ($action == 'setpaymentterm' && $usercancreate)
+	} elseif ($action == 'setpaymentterm' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->date_lim_reglement = dol_mktime(12, 0, 0, $_POST['paymenttermmonth'], $_POST['paymenttermday'], $_POST['paymenttermyear']);
@@ -464,9 +444,7 @@ if (empty($reshook))
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
-	}
-
-	elseif ($action == 'setrevenuestamp' && $usercancreate)
+	} elseif ($action == 'setrevenuestamp' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->revenuestamp = GETPOST('revenuestamp');
@@ -506,15 +484,11 @@ if (empty($reshook))
 	elseif ($action == 'setbankaccount' && $usercancreate)
 	{
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
-	}
-
-	elseif ($action == 'setremisepercent' && $usercancreate)
+	} elseif ($action == 'setremisepercent' && $usercancreate)
 	{
 		$object->fetch($id);
 		$result = $object->set_remise($user, $_POST['remise_percent']);
-	}
-
-	elseif ($action == "setabsolutediscount" && $usercancreate)
+	} elseif ($action == "setabsolutediscount" && $usercancreate)
 	{
 		// POST[remise_id] or POST[remise_id_for_payment]
 
@@ -570,15 +544,11 @@ if (empty($reshook))
 			$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'setref' && $usercancreate)
+	} elseif ($action == 'setref' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->setValueFrom('ref', GETPOST('ref'), '', null, '', '', $user, 'BILL_MODIFY');
-	}
-
-	elseif ($action == 'setref_client' && $usercancreate)
+	} elseif ($action == 'setref_client' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->set_ref_client(GETPOST('ref_client'));
@@ -618,8 +588,7 @@ if (empty($reshook))
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
 				if ($key == 'EMAIL')
 				{
@@ -694,8 +663,7 @@ if (empty($reshook))
 					$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 					if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 				}
-			}
-			else {
+			} else {
 				if (count($object->errors)) setEventMessages(null, $object->errors, 'errors');
 				else setEventMessages($object->error, $object->errors, 'errors');
 			}
@@ -969,16 +937,14 @@ if (empty($reshook))
 					if ($result >= 0)
 					{
 						$db->commit();
-					}
-					else {
+					} else {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$db->rollback();
 					}
 				} else {
 					$db->commit();
 				}
-			}
-			else {
+			} else {
 				setEventMessages($discount->error, $discount->errors, 'errors');
 				$db->rollback();
 			}
@@ -1171,8 +1137,7 @@ if (empty($reshook))
 							            {
 							                $searchPreviousInvoice = false; // find, exit;
 							                break;
-							            }
-							            else {
+							            } else {
 							                $lineIndex--; // go to previous invoice in cycle
 							            }
 							        }
@@ -1360,8 +1325,7 @@ if (empty($reshook))
 				if (in_array($object->type, $retainedWarrantyInvoiceAvailableType)) {
 					$object->retained_warranty = GETPOST('retained_warranty', 'int');
 					$object->retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
-				}
-				else {
+				} else {
 					$object->retained_warranty = 0;
 					$object->retained_warranty_fk_cond_reglement = 0;
 				}
@@ -1464,13 +1428,11 @@ if (empty($reshook))
 									$amount_ttc_diff += $am;
 									$amountdeposit[$tva] += $am / (1 + $tva / 100); // Convert into HT for the addline
 								}
-							}
-							else {
+							} else {
 								if ($typeamount == 'amount')
 								{
 									$amountdeposit[0] = $valuedeposit;
-								}
-								elseif ($typeamount == 'variable')
+								} elseif ($typeamount == 'variable')
 								{
 									if ($result > 0)
 									{
@@ -1718,8 +1680,7 @@ if (empty($reshook))
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
 					}
-				}
-				else {   // If some invoice's lines coming from page
+				} else {   // If some invoice's lines coming from page
 					$id = $object->create($user);
 
 					for ($i = 1; $i <= $NBLINES; $i++) {
@@ -1845,8 +1806,7 @@ if (empty($reshook))
 				if ($id <= 0)
 				{
 					$mesg = $object->error;
-				}
-				else {
+				} else {
 					$nextSituationInvoice = new Facture($db);
 					$nextSituationInvoice->fetch($id);
 
@@ -1886,8 +1846,7 @@ if (empty($reshook))
 
 			header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id);
 			exit();
-		}
-		else {
+		} else {
 			$db->rollback();
 			$action = 'create';
 			$_GET["origin"] = $_POST["origin"];
@@ -1912,8 +1871,7 @@ if (empty($reshook))
 		{
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0);
-		}
-		else {
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
@@ -1960,8 +1918,7 @@ if (empty($reshook))
 					setEventMessages($langs->trans("ErrorFieldCantBeNegativeOnInvoice", $langs->transnoentitiesnoconv("UnitPriceHT"), $langs->transnoentitiesnoconv("CustomerAbsoluteDiscountShort")), null, 'errors');
 				}
 				$error++;
-			}
-			else {
+			} else {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
 				$error++;
 			}
@@ -1987,8 +1944,7 @@ if (empty($reshook))
 
 				if ($res = $prodcomb->fetchByProductCombination2ValuePairs($idprod, $combinations)) {
 					$idprod = $res->fk_product_child;
-				}
-				else {
+				} else {
 					setEventMessages($langs->trans('ErrorProductCombinationNotFound'), null, 'errors');
 					$error++;
 				}
@@ -2052,8 +2008,7 @@ if (empty($reshook))
 					if ($price_base_type != 'HT')
 					{
 						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
-					}
-					else {
+					} else {
 						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 					}
 				}
@@ -2220,9 +2175,7 @@ if (empty($reshook))
 				$action = '';
 			}
 		}
-	}
-
-	elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha'))
+	} elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha'))
 	{
 		if (!$object->fetch($id) > 0)	dol_print_error($db);
 		$object->fetch_thirdparty();
@@ -2279,16 +2232,14 @@ if (empty($reshook))
 		        setEventMessages($mesg, null, 'warnings');
 		        $error++;
 		        $result = -1;
-		    }
-		    elseif (GETPOST('progress') < $line->situation_percent) // TODO : use a modified $line->get_prev_progress($object->id) result
+		    } elseif (GETPOST('progress') < $line->situation_percent) // TODO : use a modified $line->get_prev_progress($object->id) result
 		    {
 		        $mesg = $langs->trans("CantBeLessThanMinPercent");
 		        setEventMessages($mesg, null, 'warnings');
 		        $error++;
 		        $result = -1;
 		    }
-		}
-		elseif (GETPOST('progress') < $percent)
+		} elseif (GETPOST('progress') < $percent)
 		{
 			$mesg = '<div class="warning">'.$langs->trans("CantBeLessThanMinPercent").'</div>';
 			setEventMessages($mesg, null, 'warnings');
@@ -2343,8 +2294,7 @@ if (empty($reshook))
 					setEventMessages($langs->trans("ErrorFieldCantBeNegativeOnInvoice", $langs->transnoentitiesnoconv("UnitPriceHT"), $langs->transnoentitiesnoconv("CustomerAbsoluteDiscountShort")), null, 'errors');
 				}
 				$error++;
-			}
-			else {
+			} else {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
 				$error++;
 			}
@@ -2429,9 +2379,7 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	elseif ($action == 'updatealllines' && $usercancreate && $_POST['all_percent'] == $langs->trans('Modifier'))	// Update all lines of situation invoice
+	} elseif ($action == 'updatealllines' && $usercancreate && $_POST['all_percent'] == $langs->trans('Modifier'))	// Update all lines of situation invoice
 	{
 		if (!$object->fetch($id) > 0) dol_print_error($db);
 		if (GETPOST('all_progress') != "")
@@ -2447,9 +2395,7 @@ if (empty($reshook))
 				} else $object->update_percent($line, $_POST['all_progress']);
 			}
 		}
-	}
-
-	elseif ($action == 'updateline' && $usercancreate && $_POST['cancel'] == $langs->trans('Cancel')) {
+	} elseif ($action == 'updateline' && $usercancreate && $_POST['cancel'] == $langs->trans('Cancel')) {
 		header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id); // To show again edited page
 		exit();
 	}
@@ -2524,8 +2470,7 @@ if (empty($reshook))
                                     {
                                         $searchPreviousInvoice = false; // find, exit;
                                         break;
-                                    }
-                                    else {
+                                    } else {
                                         $lineIndex--; // go to previous invoice in cycle
                                     }
                                 }
@@ -2552,16 +2497,13 @@ if (empty($reshook))
                     {
                         setEventMessages($langs->trans('Updated'), '', 'mesgs');
                         header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-                    }
-                    else {
+                    } else {
                         setEventMessages($langs->trans('ErrorOutingSituationInvoiceCreditNote'), array(), 'errors');
                     }
-	            }
-	            else {
+	            } else {
 	                setEventMessages($langs->trans('ErrorOutingSituationInvoiceOnUpdate'), array(), 'errors');
 	            }
-	        }
-	        else {
+	        } else {
 	            setEventMessages($langs->trans('ErrorFindNextSituationInvoice'), array(), 'errors');
 	        }
 	    }
@@ -2583,8 +2525,7 @@ if (empty($reshook))
 	        {
 	            dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
 	            $lineClassName = 'OrderLine';
-	        }
-	        elseif ($fromElement == 'propal')
+	        } elseif ($fromElement == 'propal')
 	        {
 	            dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
 	            $lineClassName = 'PropaleLigne';
@@ -2626,8 +2567,7 @@ if (empty($reshook))
                     $array_options = $originLine->array_options;
                     if ($object->type == Facture::TYPE_SITUATION) {
                         $situation_percent = 0;
-                    }
-                    else {
+                    } else {
                         $situation_percent = 100;
                     }
                     $fk_prev_id = '';
@@ -2641,8 +2581,7 @@ if (empty($reshook))
                     } else {
                         $error++;
                     }
-                }
-                else {
+                } else {
                     $error++;
                 }
 	        }
@@ -2855,8 +2794,7 @@ if ($action == 'create')
 				//Replicate extrafields
 				$expesrc->fetch_optionals();
 				$object->array_options = $expesrc->array_options;
-			}
-			else {
+			} else {
 				$cond_reglement_id 	= (!empty($objectsrc->cond_reglement_id) ? $objectsrc->cond_reglement_id : (!empty($soc->cond_reglement_id) ? $soc->cond_reglement_id : 0));
 				$mode_reglement_id 	= (!empty($objectsrc->mode_reglement_id) ? $objectsrc->mode_reglement_id : (!empty($soc->mode_reglement_id) ? $soc->mode_reglement_id : 0));
 				$fk_account         = (!empty($objectsrc->fk_account) ? $objectsrc->fk_account : (!empty($soc->fk_account) ? $soc->fk_account : 0));
@@ -2874,8 +2812,7 @@ if ($action == 'create')
 				$object->array_options = $objectsrc->array_options;
 			}
 		}
-	}
-	else {
+	} else {
 		$cond_reglement_id 	= $soc->cond_reglement_id;
 		$mode_reglement_id 	= $soc->mode_reglement_id;
 		$fk_account        	= $soc->fk_account;
@@ -2957,8 +2894,7 @@ if ($action == 'create')
 		print ')';
 		print '</td>';
 		print '</tr>'."\n";
-	}
-	else {
+	} else {
 		print '<tr><td class="fieldrequired">'.$langs->trans('Customer').'</td>';
 		print '<td colspan="2">';
 		print $form->select_company($soc->id, 'socid', '((s.client = 1 OR s.client = 3) AND s.status=1)', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
@@ -3181,8 +3117,7 @@ if ($action == 'create')
 			print $desc;
 			print '</div></div>';
 		}
-	}
-	else {
+	} else {
 	    if (!empty($conf->global->INVOICE_USE_SITUATION))
 	    {
     	    print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
@@ -3287,8 +3222,7 @@ if ($action == 'create')
 
     			print '</div></div>';
     		}
-		}
-		else {
+		} else {
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			if (empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) $tmp = '<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
 			else $tmp = '<input type="radio" name="type" id="radio_creditnote" value="2" > ';
@@ -3655,8 +3589,7 @@ if ($action == 'create')
 	}
 
 	print '<br>';
-}
-elseif ($id > 0 || !empty($ref))
+} elseif ($id > 0 || !empty($ref))
 {
 	/*
 	 * Show object in view mode
@@ -3765,8 +3698,7 @@ elseif ($id > 0 || !empty($ref))
 					array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1, 0, 0, $langs->trans("NoStockAction"), 0, $forcecombo))
 				);
 				$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $langs->trans('DeleteBill'), $text, 'confirm_delete', $formquestion, "yes", 1);
-			}
-			else {
+			} else {
 				$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $langs->trans('DeleteBill'), $text, 'confirm_delete', '', 'no', 1);
 			}
 		} else {
@@ -4247,8 +4179,7 @@ elseif ($id > 0 || !empty($ref))
 	if ($action == 'editmode')
 	{
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
-	}
-	else {
+	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'none', 'CRDT');
 	}
 	print '</td></tr>';
@@ -4311,8 +4242,7 @@ elseif ($id > 0 || !empty($ref))
 	if ($action == 'editbankaccount')
 	{
 		$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
-	}
-	else {
+	} else {
 		$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
 	}
 	print "</td>";
@@ -4333,8 +4263,7 @@ elseif ($id > 0 || !empty($ref))
 		if ($action != 'editincoterm')
 		{
 			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-		}
-		else {
+		} else {
 			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 		}
 		print '</td></tr>';
@@ -4368,8 +4297,7 @@ elseif ($id > 0 || !empty($ref))
 		        print '<input name="retained_warranty" type="number" step="0.01" min="0" max="100" value="'.$object->retained_warranty.'" >';
 		        print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 		        print '</form>';
-		    }
-		    else {
+		    } else {
 		        print price($object->retained_warranty).'%';
 		    }
 		    print '</td></tr>';
@@ -4402,8 +4330,7 @@ elseif ($id > 0 || !empty($ref))
 		        $form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
 		        print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 		        print '</form>';
-		    }
-		    else {
+		    } else {
 		        $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->retained_warranty_fk_cond_reglement, 'none');
 		        if (!$displayWarranty) {
 		            print img_picto($langs->trans('RetainedWarrantyNeed100Percent'), 'warning.png', 'class="pictowarning valignmiddle" ');
@@ -4436,8 +4363,7 @@ elseif ($id > 0 || !empty($ref))
                 print '<input name="retained_warranty_date_limit" type="date" step="1" min="'.dol_print_date($object->date, '%Y-%m-%d').'" value="'.dol_print_date($defaultDate, '%Y-%m-%d').'" >';
                 print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
                 print '</form>';
-            }
-            else {
+            } else {
                 print dol_print_date($object->retained_warranty_date_limit, 'day');
             }
             print '</td></tr>';
@@ -4894,8 +4820,7 @@ elseif ($id > 0 || !empty($ref))
 		    if ($object->type == Facture::TYPE_SITUATION)
 		    {
 		        $retainedWarranty = $total_global_ttc * $object->retained_warranty / 100;
-		    }
-		    else {
+		    } else {
 		        // Because one day retained warranty could be used on standard invoices
 		        $retainedWarranty = $object->total_ttc * $object->retained_warranty / 100;
 		    }
@@ -4910,8 +4835,7 @@ elseif ($id > 0 || !empty($ref))
 		    print !empty($object->retained_warranty_date_limit) ? ' '.$langs->trans("ToPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')) : '';
 		    print ' :</td><td align="right">'.price($retainedWarranty).'</td><td>&nbsp;</td></tr>';
 		}
-	}
-	else // Credit note
+	} else // Credit note
 	{
 		$cssforamountpaymentcomplete = 'amountpaymentneutral';
 
@@ -5084,8 +5008,7 @@ elseif ($id > 0 || !empty($ref))
 							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('Modify').'</span>';
 						}
 					}
-				}
-				else {
+				} else {
 					print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Modify').'</span>';
 				}
 			}
@@ -5142,12 +5065,10 @@ elseif ($id > 0 || !empty($ref))
 						} else {
 							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('MakeWithdrawRequest').'</span>';
 						}
-					}
-					else {
+					} else {
 						//print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
 					}
-				}
-				else {
+				} else {
 					//print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("AmountMustBePositive")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
 				}
 			}
@@ -5181,8 +5102,7 @@ elseif ($id > 0 || !empty($ref))
 					if ($resteapayer == 0)
 					{
 						print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPaymentBack').'</span>';
-					}
-					else {
+					} else {
 						print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/paiement.php?facid='.$object->id.'&amp;action=create&amp;accountid='.$object->fk_account.'">'.$langs->trans('DoPaymentBack').'</a>';
 					}
 				}
@@ -5221,15 +5141,13 @@ elseif ($id > 0 || !empty($ref))
 				{
 					// If one payment or one credit note was linked to this invoice
 					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaidPartially').'</a>';
-				}
-				else {
+				} else {
 					if (empty($conf->global->INVOICE_CAN_NEVER_BE_CANCELED))
 					{
 						if ($objectidnext)
 						{
 							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('ClassifyCanceled').'</span>';
-						}
-						else {
+						} else {
 							print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=canceled">'.$langs->trans('ClassifyCanceled').'</a>';
 						}
 					}
@@ -5291,8 +5209,7 @@ elseif ($id > 0 || !empty($ref))
 			    if (($object->total_ttc - $totalcreditnotes) == 0)
 			    {
 			        print '<a id="butSituationOut" class="butAction" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=situationout">'.$langs->trans("RemoveSituationFromCycle").'</a>';
-			    }
-			    else {
+			    } else {
 			        print '<a id="butSituationOutRefused" class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotEnouthCreditNote").'" >'.$langs->trans("RemoveSituationFromCycle").'</a>';
 			    }
 			}
@@ -5315,25 +5232,19 @@ elseif ($id > 0 || !empty($ref))
 				//var_dump($isErasable);
 				if ($isErasable == -4) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecausePayments").'">'.$langs->trans('Delete').'</a>';
-				}
-				elseif ($isErasable == -3) {
+				} elseif ($isErasable == -3) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastSituationInvoice").'">'.$langs->trans('Delete').'</a>';
-				}
-				elseif ($isErasable == -2) {
+				} elseif ($isErasable == -2) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastInvoice").'">'.$langs->trans('Delete').'</a>';
-				}
-				elseif ($isErasable == -1) {
+				} elseif ($isErasable == -1) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Delete').'</a>';
-				}
-				elseif ($isErasable <= 0)	// Any other cases
+				} elseif ($isErasable <= 0)	// Any other cases
 				{
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotErasable").'">'.$langs->trans('Delete').'</a>';
-				}
-				elseif ($objectidnext)
+				} elseif ($objectidnext)
 				{
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('Delete').'</a>';
-				}
-				else {
+				} else {
 					print '<a class="butActionDelete'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
 				}
 			} else {
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index d56d1b5cfef..c1ed5b809da 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -244,8 +244,7 @@ class Invoices extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve invoice list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -548,8 +547,7 @@ class Invoices extends DolibarrApi
     	$updateRes = $this->invoice->deleteline($lineid);
     	if ($updateRes > 0) {
     		return $this->get($id);
-    	}
-    	else {
+    	} else {
     		throw new RestException(405, $this->invoice->error);
     	}
     }
@@ -1040,14 +1038,11 @@ class Invoices extends DolibarrApi
             $discount = new DiscountAbsolute($this->db);
             if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
                 $discount->description = '(CREDIT_NOTE)';
-            }
-            elseif ($this->invoice->type == Facture::TYPE_DEPOSIT) {
+            } elseif ($this->invoice->type == Facture::TYPE_DEPOSIT) {
                 $discount->description = '(DEPOSIT)';
-            }
-            elseif ($this->invoice->type == Facture::TYPE_STANDARD || $this->invoice->type == Facture::TYPE_REPLACEMENT || $this->invoice->type == Facture::TYPE_SITUATION) {
+            } elseif ($this->invoice->type == Facture::TYPE_STANDARD || $this->invoice->type == Facture::TYPE_REPLACEMENT || $this->invoice->type == Facture::TYPE_SITUATION) {
                 $discount->description = '(EXCESS RECEIVED)';
-            }
-            else {
+            } else {
                 throw new RestException(500, 'Cant convert to reduc an Invoice of this type');
             }
 
@@ -1123,16 +1118,14 @@ class Invoices extends DolibarrApi
                     if ($result >= 0)
                     {
                         $this->db->commit();
-                    }
-                    else {
+                    } else {
                         $this->db->rollback();
                         throw new RestException(500, 'Could not set paid');
                     }
                 } else {
                     $this->db->commit();
                 }
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 throw new RestException(500, 'Discount creation error');
             }
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 904f59ea432..581e63be08a 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -336,8 +336,7 @@ class FactureRec extends CommonInvoice
 					if ($result_insert < 0)
 					{
 						$error++;
-					}
-					else {
+					} else {
 					    $objectline = new FactureLigneRec($this->db);
 					    if ($objectline->fetch($result_insert))
 					    {
@@ -377,8 +376,7 @@ class FactureRec extends CommonInvoice
 					                $error++;
 					            }
 					        }
-					    }
-					    else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+					    } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
 					    {
 					        $origin_id = $tmp_origin_id;
 	    					$ret = $this->add_object_linked($origin, $origin_id);
@@ -394,19 +392,16 @@ class FactureRec extends CommonInvoice
 				if ($error)
 				{
 					$this->db->rollback();
-				}
-				else {
+				} else {
 					$this->db->commit();
 					return $this->id;
 				}
-			}
-			else {
+			} else {
 			    $this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -457,8 +452,7 @@ class FactureRec extends CommonInvoice
 	        }
 	        $this->db->commit();
 	        return 1;
-	    }
-	    else {
+	    } else {
 	        $this->error = $this->db->lasterror();
 	        $this->db->rollback();
 	        return -2;
@@ -580,14 +574,12 @@ class FactureRec extends CommonInvoice
 					return -3;
 				}
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = 'Bill with id '.$rowid.' or ref '.$ref.' not found sql='.$sql;
 				dol_syslog('Facture::Fetch Error '.$this->error, LOG_ERR);
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -716,8 +708,7 @@ class FactureRec extends CommonInvoice
 
 			$this->db->free($result);
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -3;
 		}
@@ -759,13 +750,11 @@ class FactureRec extends CommonInvoice
 				// Delete extrafields
                 $res = $this->deleteExtraFields();
                 if ($res < 0) $error = -4;
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror();
 				$error = -1;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$error = -2;
 		}
@@ -774,8 +763,7 @@ class FactureRec extends CommonInvoice
 		{
 		    $this->db->commit();
 		    return 1;
-		}
-		else {
+		} else {
 	        $this->db->rollback();
 	        return $error;
 		}
@@ -850,8 +838,7 @@ class FactureRec extends CommonInvoice
 			if ($price_base_type == 'HT')
 			{
 				$pu = $pu_ht;
-			}
-			else {
+			} else {
 				$pu = $pu_ttc;
 			}
 
@@ -958,8 +945,7 @@ class FactureRec extends CommonInvoice
 				$this->id = $facid;
 				$this->update_price();
 				return $lineId;
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror();
 				return -1;
 			}
@@ -1033,8 +1019,7 @@ class FactureRec extends CommonInvoice
 	        if ($price_base_type == 'HT')
 	        {
 	            $pu = $pu_ht;
-	        }
-	        else {
+	        } else {
 	            $pu = $pu_ttc;
 	        }
 
@@ -1118,8 +1103,7 @@ class FactureRec extends CommonInvoice
 	            $this->id = $facid;
 	            $this->update_price();
 	            return 1;
-	        }
-	        else {
+	        } else {
 	            $this->error = $this->db->lasterror();
 	            return -1;
 	        }
@@ -1273,8 +1257,7 @@ class FactureRec extends CommonInvoice
 							$error++;
 						}
 					}
-				}
-				else {
+				} else {
 					$error++;
 					$this->error = "Failed to load invoice template with id=".$line->rowid.", entity=".$conf->entity."\n";
 					$this->errors[] = "Failed to load invoice template with id=".$line->rowid.", entity=".$conf->entity;
@@ -1287,8 +1270,7 @@ class FactureRec extends CommonInvoice
 					dol_syslog("createRecurringInvoices Process invoice template ".$facturerec->ref." is finished with a success generation");
 					$nb_create++;
 					$this->output .= $langs->trans("InvoiceGeneratedFromTemplate", $facture->ref, $facturerec->ref)."\n";
-				}
-				else {
+				} else {
 					$db->rollback("createRecurringInvoices Process invoice template id=".$facturerec->id.", ref=".$facturerec->ref);
 				}
 
@@ -1306,8 +1288,7 @@ class FactureRec extends CommonInvoice
 			}
 
 			$conf->entity = $saventity; // Restore entity context
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 
 		$this->output = trim($this->output);
 
@@ -1413,66 +1394,54 @@ class FactureRec extends CommonInvoice
 			{
 				if ($status == self::STATUS_SUSPENDED) {
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$labelStatus = $langs->trans('Active');
 				}
-			}
-			else {
+			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$labelStatus = $langs->trans("Draft");
 				}
 			}
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			$prefix = 'Short';
 			if ($recur)
 			{
 				if ($status == self::STATUS_SUSPENDED) {
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$labelStatus = $langs->trans('Active');
 				}
-			}
-			else {
+			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$labelStatus = $langs->trans("Draft");
 				}
 			}
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($recur)
 			{
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status4';
 					$labelStatus = $langs->trans('Active');
 				}
-			}
-			else {
+			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status0';
 					$labelStatus = $langs->trans('Draft');
 				}
 			}
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($recur)
 			{
@@ -1480,24 +1449,20 @@ class FactureRec extends CommonInvoice
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status4';
 					$labelStatus = $langs->trans('Active');
 				}
-			}
-			else {
+			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status0';
 					$labelStatus = $langs->trans('Draft');
 				}
 			}
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			$prefix = '';
 			if ($recur)
@@ -1505,24 +1470,20 @@ class FactureRec extends CommonInvoice
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status4';
 					$labelStatus = $langs->trans('Active');
 				}
-			}
-			else {
+			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status0';
 					$labelStatus = $langs->trans('Draft');
 				}
 			}
-		}
-		elseif ($mode == 5 || $mode == 6)
+		} elseif ($mode == 5 || $mode == 6)
 		{
 			$prefix = '';
 			if ($mode == 5) $prefix = 'Short';
@@ -1531,18 +1492,15 @@ class FactureRec extends CommonInvoice
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status4';
 					$labelStatus = $langs->trans('Active');
 				}
-			}
-			else {
+			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status0';
 					$labelStatus = $langs->trans('Draft');
 				}
@@ -1631,16 +1589,14 @@ class FactureRec extends CommonInvoice
 					$line->total_ht = -100;
 					$line->total_ttc = -119.6;
 					$line->total_tva = -19.6;
-				}
-				elseif ($xnbp == 2)    // UP is negative (free line)
+				} elseif ($xnbp == 2)    // UP is negative (free line)
 				{
 					$line->subprice = -100;
 					$line->total_ht = -100;
 					$line->total_ttc = -119.6;
 					$line->total_tva = -19.6;
 					$line->remise_percent = 0;
-				}
-				elseif ($xnbp == 3)    // Discount is 50% (product line)
+				} elseif ($xnbp == 3)    // Discount is 50% (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product = $prodids[$prodid];
@@ -1648,8 +1604,7 @@ class FactureRec extends CommonInvoice
 					$line->total_ttc = 59.8;
 					$line->total_tva = 9.8;
 					$line->remise_percent = 50;
-				}
-				else // (product line)
+				} else // (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product = $prodids[$prodid];
@@ -1738,8 +1693,7 @@ class FactureRec extends CommonInvoice
             $this->frequency = $frequency;
             if (!empty($unit)) $this->unit_frequency = $unit;
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1770,8 +1724,7 @@ class FactureRec extends CommonInvoice
             $this->date_when = $date;
             if ($increment_nb_gen_done > 0) $this->nb_gen_done++;
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1802,8 +1755,7 @@ class FactureRec extends CommonInvoice
         {
             $this->nb_gen_max = $nb;
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1832,8 +1784,7 @@ class FactureRec extends CommonInvoice
         {
             $this->auto_validate = $validate;
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1862,8 +1813,7 @@ class FactureRec extends CommonInvoice
         {
             $this->generate_pdf = $validate;
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1892,8 +1842,7 @@ class FactureRec extends CommonInvoice
         {
             $this->modelpdf = $model;
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -2038,8 +1987,7 @@ class FactureLigneRec extends CommonInvoiceLine
 
     		$this->db->free($result);
     		return 1;
-    	}
-    	else {
+    	} else {
     		$this->error = $this->db->lasterror();
     		return -3;
     	}
@@ -2119,8 +2067,7 @@ class FactureLigneRec extends CommonInvoiceLine
     		}
             $this->db->commit();
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -2;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 55adb5eb138..28f0883bb90 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -678,8 +678,7 @@ class Facture extends CommonInvoice
 				                $error++;
 				            }
 				        }
-				    }
-				    else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+				    } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
 				    {
 				        $origin_id = $tmp_origin_id;
     					$ret = $this->add_object_linked($origin, $origin_id);
@@ -726,8 +725,7 @@ class Facture extends CommonInvoice
 				        //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
 				        $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
 				    }
-				}
-				else dol_print_error($resqlcontact);
+				} else dol_print_error($resqlcontact);
 			}
 
 			/*
@@ -787,8 +785,7 @@ class Facture extends CommonInvoice
 						break;
 					}
 				}
-			}
-			elseif (!$error && empty($this->fac_rec)) 		// If this->lines is an array of invoice line arrays
+			} elseif (!$error && empty($this->fac_rec)) 		// If this->lines is an array of invoice line arrays
 			{
 				$fk_parent_line = 0;
 
@@ -987,25 +984,21 @@ class Facture extends CommonInvoice
 					{
 						$this->db->commit();
 						return $this->id;
-					}
-					else {
+					} else {
 						$this->db->rollback();
 						return -4;
 					}
-				}
-				else {
+				} else {
 					$this->error = $langs->trans('FailedToUpdatePrice');
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else {
+			} else {
 				dol_syslog(get_class($this)."::create error ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -1090,8 +1083,7 @@ class Facture extends CommonInvoice
 		{
 			$this->error = $facture->error;
 			$this->errors = $facture->errors;
-		}
-		elseif ($this->type == self::TYPE_SITUATION && !empty($conf->global->INVOICE_USE_SITUATION))
+		} elseif ($this->type == self::TYPE_SITUATION && !empty($conf->global->INVOICE_USE_SITUATION))
 		{
 			$this->fetchObjectLinked('', '', $this->id, 'facture');
 
@@ -1236,8 +1228,7 @@ class Facture extends CommonInvoice
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1362,10 +1353,8 @@ class Facture extends CommonInvoice
 			if (!$error)
 			{
 				return 1;
-			}
-			else return -1;
-		}
-		else return -1;
+			} else return -1;
+		} else return -1;
 	}
 
 	/**
@@ -1640,14 +1629,12 @@ class Facture extends CommonInvoice
 					return -3;
 				}
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = 'Invoice with id='.$rowid.' or ref='.$ref.' or ref_ext='.$ref_ext.' not found';
 				dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1768,8 +1755,7 @@ class Facture extends CommonInvoice
 			}
 			$this->db->free($result);
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -3;
 		}
@@ -1807,8 +1793,7 @@ class Facture extends CommonInvoice
 				       )
 					{
 					    $this->tab_previous_situation_invoice[] = $invoice;
-					}
-					else {
+					} else {
 					    $this->tab_next_situation_invoice[] = $invoice;
 					}
 				}
@@ -1924,8 +1909,7 @@ class Facture extends CommonInvoice
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -2011,20 +1995,17 @@ class Facture extends CommonInvoice
 
 					$this->db->commit();
 					return 1;
-				}
-				else {
+				} else {
 					$this->error = $facligne->error;
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else {
+			} else {
 				$this->error = $facligne->error;
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -3;
 		}
@@ -2080,8 +2061,7 @@ class Facture extends CommonInvoice
 
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2245,20 +2225,17 @@ class Facture extends CommonInvoice
 
 					$this->db->commit();
 					return 1;
-				}
-				else {
+				} else {
 					$this->error = $this->db->lasterror()." sql=".$sql;
 					$this->db->rollback();
 					return -6;
 				}
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror()." sql=".$sql;
 				$this->db->rollback();
 				return -4;
 			}
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -2;
 		}
@@ -2303,8 +2280,7 @@ class Facture extends CommonInvoice
 	            $result = $this->call_trigger('BILL_PAYED', $user);
 	            if ($result < 0) $error++;
 	            // End call triggers
-			}
-			else {
+			} else {
 				$error++;
 				$this->error = $this->db->lasterror();
 			}
@@ -2313,13 +2289,11 @@ class Facture extends CommonInvoice
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			return 0;
 		}
 	}
@@ -2355,8 +2329,7 @@ class Facture extends CommonInvoice
             $result = $this->call_trigger('BILL_UNPAYED', $user);
             if ($result < 0) $error++;
             // End call triggers
-		}
-		else {
+		} else {
 			$error++;
 			$this->error = $this->db->error();
 			dol_print_error($this->db);
@@ -2366,8 +2339,7 @@ class Facture extends CommonInvoice
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -2422,14 +2394,12 @@ class Facture extends CommonInvoice
 
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = $this->db->error()." sql=".$sql;
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -2;
@@ -2538,8 +2508,7 @@ class Facture extends CommonInvoice
 		if ($force_number)
 		{
 			$num = $force_number;
-		}
-		elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
+		} elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
 		{
 			if (!empty($conf->global->FAC_FORCE_DATE_VALIDATION))	// If option enabled, we force invoice date
 			{
@@ -2547,8 +2516,7 @@ class Facture extends CommonInvoice
 				$this->date_lim_reglement = $this->calculate_date_lim_reglement();
 			}
 			$num = $this->getNextNumRef($this->thirdparty);
-		}
-		else {
+		} else {
 			$num = $this->ref;
 		}
 		$this->newref = dol_sanitizeFileName($num);
@@ -2777,8 +2745,7 @@ class Facture extends CommonInvoice
 				    $this->setFinal($user);
                 }
 			}
-		}
-		else {
+		} else {
 			$error++;
 		}
 
@@ -2786,8 +2753,7 @@ class Facture extends CommonInvoice
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -2914,13 +2880,11 @@ class Facture extends CommonInvoice
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -3039,8 +3003,7 @@ class Facture extends CommonInvoice
 			if ($price_base_type == 'HT')
 			{
 				$pu = $pu_ht;
-			}
-			else {
+			} else {
 				$pu = $pu_ttc;
 			}
 
@@ -3181,20 +3144,17 @@ class Facture extends CommonInvoice
 				{
 					$this->db->commit();
 					return $this->line->id;
-				}
-				else {
+				} else {
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else {
+			} else {
 				$this->error = $this->line->error;
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			dol_syslog(get_class($this)."::addline status of order must be Draft to allow use of ->addline()", LOG_ERR);
 			return -3;
 		}
@@ -3409,14 +3369,12 @@ class Facture extends CommonInvoice
 				$this->update_price(1);
 				$this->db->commit();
 				return $result;
-			}
-			else {
+			} else {
 			    $this->error = $this->line->error;
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->error = "Invoice statut makes operation forbidden";
 			return -2;
 		}
@@ -3536,14 +3494,12 @@ class Facture extends CommonInvoice
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			$this->error = $line->error;
 			return -1;
@@ -3601,8 +3557,7 @@ class Facture extends CommonInvoice
 
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -3669,8 +3624,7 @@ class Facture extends CommonInvoice
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -3828,8 +3782,7 @@ class Facture extends CommonInvoice
 				$this->date_closing      = $this->db->jdate($obj->dateclosing);
 			}
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3887,12 +3840,10 @@ class Facture extends CommonInvoice
 					if ($shortlist == 1)
 					{
 						$ga[$obj->fid] = $obj->ref;
-					}
-					elseif ($shortlist == 2)
+					} elseif ($shortlist == 2)
 					{
 						$ga[$obj->fid] = $obj->ref.' ('.$obj->name.')';
-					}
-					else {
+					} else {
 						$ga[$i]['id'] = $obj->fid;
 						$ga[$i]['ref'] 	= $obj->ref;
 						$ga[$i]['name'] = $obj->name;
@@ -3901,8 +3852,7 @@ class Facture extends CommonInvoice
 				}
 			}
 			return $ga;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3950,8 +3900,7 @@ class Facture extends CommonInvoice
 			}
 			//print_r($return);
 			return $return;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -3997,8 +3946,7 @@ class Facture extends CommonInvoice
 		    $sqlSit .= " GROUP BY fs.situation_cycle_ref";
 		    $sqlSit .= " ORDER BY fs.situation_counter";
             $sql .= " AND ( f.type != ".self::TYPE_SITUATION." OR f.rowid IN (".$sqlSit.") )"; // Type non 5 si facture non avoir
-		}
-		else {
+		} else {
 		    $sql .= " AND f.type != ".self::TYPE_SITUATION; // Type non 5 si facture non avoir
 		}
 
@@ -4023,8 +3971,7 @@ class Facture extends CommonInvoice
 			}
 
 			return $return;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -4100,8 +4047,7 @@ class Facture extends CommonInvoice
 						    dol_syslog(get_class($this).'::demandeprelevement Erreur');
 						    $error++;
 						}
-					}
-					else {
+					} else {
 						$this->error = 'WithdrawRequestErrorNilAmount';
 	                    dol_syslog(get_class($this).'::demandeprelevement WithdrawRequestErrorNilAmount');
 	                    $error++;
@@ -4119,20 +4065,17 @@ class Facture extends CommonInvoice
 
                     if ($error) return -1;
                     return 1;
-                }
-                else {
+                } else {
                     $this->error = "A request already exists";
                     dol_syslog(get_class($this).'::demandeprelevement Impossible de creer une demande, demande deja en cours');
                     return 0;
                 }
-            }
-            else {
+            } else {
                 $this->error = $this->db->error();
                 dol_syslog(get_class($this).'::demandeprelevement Erreur -2');
                 return -2;
             }
-        }
-        else {
+        } else {
             $this->error = "Status of invoice does not allow this";
             dol_syslog(get_class($this)."::demandeprelevement ".$this->error." $this->statut, $this->paye, $this->mode_reglement_id");
             return -3;
@@ -4156,8 +4099,7 @@ class Facture extends CommonInvoice
 		if ($this->db->query($sql))
 		{
 			return 0;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this).'::demande_prelevement_delete Error '.$this->error);
 			return -1;
@@ -4222,8 +4164,7 @@ class Facture extends CommonInvoice
 			}
 
 			return $response;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -4343,8 +4284,7 @@ class Facture extends CommonInvoice
 					$line->multicurrency_total_ht = -200;
 					$line->multicurrency_total_ttc = -239.2;
 					$line->multicurrency_total_tva = -39.2;
-				}
-				elseif ($xnbp == 2)    // UP is negative (free line)
+				} elseif ($xnbp == 2)    // UP is negative (free line)
 				{
 					$line->subprice = -100;
 					$line->total_ht = -100;
@@ -4354,8 +4294,7 @@ class Facture extends CommonInvoice
 					$line->multicurrency_total_ht = -200;
 					$line->multicurrency_total_ttc = -239.2;
 					$line->multicurrency_total_tva = -39.2;
-				}
-				elseif ($xnbp == 3)    // Discount is 50% (product line)
+				} elseif ($xnbp == 3)    // Discount is 50% (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product = $prodids[$prodid];
@@ -4366,8 +4305,7 @@ class Facture extends CommonInvoice
 					$line->multicurrency_total_ttc = 119.6;
 					$line->multicurrency_total_tva = 19.6;
 					$line->remise_percent = 50;
-				}
-				else // (product line)
+				} else // (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product = $prodids[$prodid];
@@ -4453,8 +4391,7 @@ class Facture extends CommonInvoice
 			}
             $this->db->free($resql);
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -4615,8 +4552,7 @@ class Facture extends CommonInvoice
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -4701,12 +4637,10 @@ class Facture extends CommonInvoice
 		        if (($totalpaye < $this->total_ttc - $RetainedWarrantyAmount) && $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay))
 		        {
 		            $hasDelay = 1;
-		        }
-		        elseif ($totalpaye < $this->total_ttc && $this->retained_warranty_date_limit < ($now - $conf->facture->client->warning_delay))
+		        } elseif ($totalpaye < $this->total_ttc && $this->retained_warranty_date_limit < ($now - $conf->facture->client->warning_delay))
 		        {
 		            $hasDelay = 1;
-		        }
-		        else {
+		        } else {
 		            $hasDelay = 0;
 		        }
 		    }
@@ -4792,12 +4726,10 @@ class Facture extends CommonInvoice
 	            $total2BillWT += $this->total_ttc;
 
 	            $retainedWarrantyAmount = $total2BillWT * $this->retained_warranty / 100;
-	        }
-	        else {
+	        } else {
 	            return -1;
 	        }
-	    }
-	    else {
+	    } else {
 	        // Because one day retained warranty could be used on standard invoices
 	        $retainedWarrantyAmount = $this->total_ttc * $this->retained_warranty / 100;
 	    }
@@ -4833,14 +4765,12 @@ class Facture extends CommonInvoice
 	        {
 	            $this->retained_warranty = floatval($value);
 	            return 1;
-	        }
-	        else {
+	        } else {
 	            dol_syslog(get_class($this).'::setRetainedWarranty Erreur '.$sql.' - '.$this->db->error());
 	            $this->error = $this->db->error();
 	            return -1;
 	        }
-	    }
-	    else {
+	    } else {
 	        dol_syslog(get_class($this).'::setRetainedWarranty, status of the object is incompatible');
 	        $this->error = 'Status of the object is incompatible '.$this->statut;
 	        return -2;
@@ -4874,14 +4804,12 @@ class Facture extends CommonInvoice
 	        {
 	            $this->retained_warranty_date_limit = $timestamp;
 	            return 1;
-	        }
-	        else {
+	        } else {
 	            dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit Erreur '.$sql.' - '.$this->db->error());
 	            $this->error = $this->db->error();
 	            return -1;
 	        }
-	    }
-	    else {
+	    } else {
 	        dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit, status of the object is incompatible');
 	        $this->error = 'Status of the object is incompatible '.$this->statut;
 	        return -2;
@@ -5062,8 +4990,7 @@ class FactureLigne extends CommonInvoiceLine
 			$this->db->free($result);
 
 			return 1;
-		}
-		else {
+		} else {
 		    $this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -5116,8 +5043,7 @@ class FactureLigne extends CommonInvoiceLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else {
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -5233,8 +5159,7 @@ class FactureLigne extends CommonInvoiceLine
     							$this->db->rollback();
     							return -3;
 						    }
-						}
-						else {
+						} else {
 							$result = $discount->link_to_invoice($this->rowid, 0);
 							if ($result < 0)
 							{
@@ -5244,15 +5169,13 @@ class FactureLigne extends CommonInvoiceLine
 								return -3;
 							}
 						}
-					}
-					else {
+					} else {
 						$this->error = $langs->trans("ErrorADiscountThatHasBeenRemovedIsIncluded");
 						dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 						$this->db->rollback();
 						return -3;
 					}
-				}
-				else {
+				} else {
 					$this->error = $discount->error;
 					dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 					$this->db->rollback();
@@ -5274,8 +5197,7 @@ class FactureLigne extends CommonInvoiceLine
 
 			$this->db->commit();
 			return $this->id;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -2;
@@ -5328,8 +5250,7 @@ class FactureLigne extends CommonInvoiceLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else {
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -5407,8 +5328,7 @@ class FactureLigne extends CommonInvoiceLine
 			}
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -5450,8 +5370,7 @@ class FactureLigne extends CommonInvoiceLine
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -5491,8 +5410,7 @@ class FactureLigne extends CommonInvoiceLine
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php
index 1fddf20b023..9888bd23d13 100644
--- a/htdocs/compta/facture/class/paymentterm.class.php
+++ b/htdocs/compta/facture/class/paymentterm.class.php
@@ -145,8 +145,7 @@ class PaymentTerm // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -201,8 +200,7 @@ class PaymentTerm // extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -237,8 +235,7 @@ class PaymentTerm // extends CommonObject
 			}
 			$this->db->free($resql);
 			return $ret;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -302,8 +299,7 @@ class PaymentTerm // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -341,8 +337,7 @@ class PaymentTerm // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -391,8 +386,7 @@ class PaymentTerm // extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 77ff0f813c3..44954d863e5 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -69,14 +69,12 @@ if ($action == 'addcontact' && $user->rights->facture->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -88,8 +86,7 @@ elseif ($action == 'swapstatut' && $user->rights->facture->creer)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -104,8 +101,7 @@ elseif ($action == 'deletecontact' && $user->rights->facture->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -204,8 +200,7 @@ if ($id > 0 || !empty($ref))
 		    $res = @include dol_buildpath($reldir.'/contacts.tpl.php');
 		    if ($res) break;
 		}
-	}
-	else {
+	} else {
 		// Record not found
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 7e95b92cc3d..ed9b032ae90 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -181,12 +181,10 @@ if ($id > 0 || !empty($ref))
 		$permtoedit = $user->rights->facture->creer;
 		$param = '&id='.$object->id;
 		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
-}
-else {
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 8275dbcf450..dfda4a5b16d 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -609,8 +609,7 @@ if ($resql)
 				if (!$invoicerectmp->isMaxNbGenReached())
 				{
 					if (!$objp->suspended && $objp->frequency > 0 && $db->jdate($objp->date_when) && $db->jdate($objp->date_when) < $now) print img_warning($langs->trans("Late"));
-				}
-				else {
+				} else {
 					print img_info($langs->trans("MaxNumberOfGenerationReached"));
 				}
 				print '</div>';
@@ -653,17 +652,14 @@ if ($resql)
 				if ($invoicerectmp->isMaxNbGenReached())
 				{
 					print $langs->trans("MaxNumberOfGenerationReached");
-				}
-				elseif (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today)
+				} elseif (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today)
 				{
 					print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
 					print $langs->trans("CreateBill").'</a>';
-				}
-				else {
+				} else {
 					print $form->textwithpicto('', $langs->trans("DateIsNotEnough"));
 				}
-			}
-			else {
+			} else {
 				print "&nbsp;";
 			}
 			if (!$i) $totalarray['nbfield']++;
@@ -673,8 +669,7 @@ if ($resql)
 
 			$i++;
 		}
-	}
-	else {
+	} else {
 		$colspan = 1;
 		foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
 		print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
@@ -689,8 +684,7 @@ if ($resql)
 	print "</form>";
 
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 7b3025db810..c21d19ad538 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -304,8 +304,7 @@ if ($massaction == 'makepayment'){
 
 	header('Location: '.$loc);
 	exit;
-}
-elseif ($massaction == 'withdrawrequest')
+} elseif ($massaction == 'withdrawrequest')
 {
 	$langs->load("withdrawals");
 
@@ -313,8 +312,7 @@ elseif ($massaction == 'withdrawrequest')
 	{
 		$error++;
 		setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
-	}
-	else {
+	} else {
 		//Checking error
 		$error = 0;
 
@@ -362,12 +360,10 @@ elseif ($massaction == 'withdrawrequest')
 				if ($numprlv > 0) {
 					$error++;
 					setEventMessages($objecttmp->ref.' '.$langs->trans("RequestAlreadyDone"), $objecttmp->errors, 'warnings');
-				}
-				elseif (!empty($objecttmp->mode_reglement_code) && $objecttmp->mode_reglement_code != 'PRE') {
+				} elseif (!empty($objecttmp->mode_reglement_code) && $objecttmp->mode_reglement_code != 'PRE') {
 					$error++;
 					setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
-				}
-				else {
+				} else {
 					$listofbills[] = $objecttmp; // $listofbills will only contains invoices with good payment method and no request already done
 				}
 			}
@@ -385,8 +381,7 @@ elseif ($massaction == 'withdrawrequest')
 				{
 					$db->commit();
 					$nbwithdrawrequestok++;
-				}
-				else {
+				} else {
 					$db->rollback();
 					setEventMessages($aBill->error, $aBill->errors, 'errors');
 				}
@@ -513,8 +508,7 @@ if ($search_status != '-1' && $search_status != '')
 		if ($search_status == '1') $sql .= " AND f.fk_statut = 1"; // unpayed
 		if ($search_status == '2') $sql .= " AND f.fk_statut = 2"; // payed     Not that some corrupted data may contains f.fk_statut = 1 AND f.paye = 1 (it means payed too but should not happend. If yes, reopen and reclassify billed)
 		if ($search_status == '3') $sql .= " AND f.fk_statut = 3"; // abandonned
-	}
-	else {
+	} else {
 		$sql .= " AND f.fk_statut IN (".$db->escape($search_status).")"; // When search_status is '1,2' for example
 	}
 }
@@ -560,8 +554,7 @@ if (!$sall)
 	if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key : '');
 	}
-}
-else {
+} else {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
 
@@ -670,8 +663,7 @@ if ($resql)
 	if ($user->rights->facture->supprimer) {
 		if (!empty($conf->global->INVOICE_CAN_REMOVE_DRAFT_ONLY)) {
         	$arrayofmassactions['predeletedraft'] = $langs->trans("Deletedraft");
-		}
-        elseif (!empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) {	// mass deletion never possible on invoices on such situation
+		} elseif (!empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) {	// mass deletion never possible on invoices on such situation
             $arrayofmassactions['predelete'] = $langs->trans("Delete");
         }
     }
@@ -1215,8 +1207,7 @@ if ($resql)
                 if ($contextpage == 'poslist')
                 {
                     print $obj->ref;
-                }
-                else {
+                } else {
                     print $facturestatic->getNomUrl(1, '', 200, 0, '', 0, 1);
                 }
 
@@ -1311,8 +1302,7 @@ if ($resql)
 		        if ($contextpage == 'poslist')
 				{
 				    print $thirdpartystatic->name;
-				}
-				else {
+				} else {
 				    print $thirdpartystatic->getNomUrl(1, 'customer');
 				}
 				print '</td>';
@@ -1613,8 +1603,7 @@ if ($resql)
 	$title = '';
 
 	print $formfile->showdocuments('massfilesarea_invoices', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 109231a240d..7cbe336e126 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -86,8 +86,7 @@ if (empty($reshook))
                 $db->commit();
 
                 setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-            }
-            else {
+            } else {
                 $db->rollback();
                 setEventMessages($object->error, $object->errors, 'errors');
             }
@@ -291,12 +290,10 @@ if ($object->id > 0)
 		if ($action == 'editinvoicedate')
 		{
 			$form->form_date($_SERVER['PHP_SELF'].'?id='.$object->id, $object->date, 'invoicedate');
-		}
-		else {
+		} else {
 			print dol_print_date($object->date, 'daytext');
 		}
-	}
-	else {
+	} else {
 		print dol_print_date($object->date, 'daytext');
 	}
 	print '</td>';
@@ -315,12 +312,10 @@ if ($object->id > 0)
 		if ($action == 'editconditions')
 		{
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
-		}
-		else {
+		} else {
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
 		}
-	}
-	else {
+	} else {
 		print '&nbsp;';
 	}
 	print '</td></tr>';
@@ -338,15 +333,13 @@ if ($object->id > 0)
 		if ($action == 'editpaymentterm')
 		{
 			$form->form_date($_SERVER['PHP_SELF'].'?id='.$object->id, $object->date_lim_reglement, 'paymentterm');
-		}
-		else {
+		} else {
 			print dol_print_date($object->date_lim_reglement, 'daytext');
 			if ($object->hasDelay()) {
 				print img_warning($langs->trans('Late'));
 			}
 		}
-	}
-	else {
+	} else {
 		print '&nbsp;';
 	}
 	print '</td></tr>';
@@ -362,8 +355,7 @@ if ($object->id > 0)
 	if ($action == 'editmode')
 	{
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id');
-	}
-	else {
+	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
 	}
 	print '</td></tr>';
@@ -380,8 +372,7 @@ if ($object->id > 0)
 	if ($action == 'editbankaccount')
 	{
 	    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
-	}
-	else {
+	} else {
 	    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
 	}
 	print "</td>";
@@ -493,8 +484,7 @@ if ($object->id > 0)
 	{
 		$num = $db->num_rows($result_sql);
 		$numopen = $num;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
@@ -510,8 +500,7 @@ if ($object->id > 0)
 	{
 		$obj = $db->fetch_object($result_sql);
 		if ($obj) $pending = $obj->amount;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
@@ -538,22 +527,18 @@ if ($object->id > 0)
     			print '<input type="text" id="withdraw_request_amount" name="withdraw_request_amount" value="'.$remaintopaylesspendingdebit.'" size="10" />';
     			print '<input type="submit" class="butAction" value="'.$langs->trans("MakeWithdrawRequest").'" />';
     			print '</form>';
-    		}
-    		else {
+    		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
     		}
-	    }
-	    else {
+	    } else {
             print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("AmountMustBePositive")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
         }
-	}
-	else {
+	} else {
 		if ($num == 0)
 		{
 			if ($object->statut > Facture::STATUS_DRAFT) print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("AlreadyPaid")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
 			else print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("Draft")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
-		}
-		else print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("RequestAlreadyDone")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
+		} else print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("RequestAlreadyDone")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
 	}
 
 	print "</div><br>\n";
@@ -620,8 +605,7 @@ if ($object->id > 0)
 		}
 
 		$db->free($result_sql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
@@ -681,8 +665,7 @@ if ($object->id > 0)
 			print '<tr class="oddeven"><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 
 		$db->free($result);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index d0c7eacffc6..82ba8a33467 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -180,8 +180,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-}
-else {
+} else {
     $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
@@ -368,8 +367,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td align="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
 	print $px1->show();
 	print "<br>\n";
 	print $px2->show();
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index 571a00d6b47..ef35c03eb54 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -78,8 +78,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 			// If not abandonned
     		$total = $total + $sign * $objectlink->total_ht;
     		echo price($objectlink->total_ht);
-    	}
-    	else {
+    	} else {
     		echo '<strike>'.price($objectlink->total_ht).'</strike>';
     	}
 	}
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 2efe20a2fc5..d5daadcb557 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -214,14 +214,12 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 			print '<tr class="liste_total"><td class="left">'.$langs->trans("Total").'</td>';
 			print '<td colspan="2" class="right">'.price($tot_ttc).'</td>';
 			print '</tr>';
-		}
-		else {
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print "</table></div><br>";
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -300,14 +298,12 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 			print '<tr class="liste_total"><td class="left">'.$langs->trans("Total").'</td>';
 			print '<td colspan="2" class="right">'.price($tot_ttc).'</td>';
 			print '</tr>';
-		}
-		else {
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print "</table></div><br>";
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -424,16 +420,14 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			$colspan = 5;
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table></div><br>';
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -523,15 +517,13 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$totalam += $obj->am;
 				$i++;
 			}
-		}
-		else {
+		} else {
 			$colspan = 5;
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table></div><br>';
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -600,13 +592,11 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire)
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			print '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print '</table></div><br>';
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 }
 
 /**
@@ -677,14 +667,12 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 				print '<td class="right"></td>';
 				print '<td class="right">&nbsp;</td>';
 				print '</tr>';
-			}
-			else {
+			} else {
 				print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 			print "</table></div><br>";
 			$db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -804,8 +792,7 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 			print '</table></div><br>';
 		}
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -927,16 +914,14 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 			print '<td class="nowrap right">'.price($totalam).'</td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
-		}
-		else {
+		} else {
 			$colspan = 6;
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table></div><br>';
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -1035,15 +1020,13 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 			print '<td class="nowrap right">'.price($totalam).'</td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
-		}
-		else {
+		} else {
 			$colspan = 6;
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table></div><br>';
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
index 91d855d4454..78ef32072d6 100644
--- a/htdocs/compta/journal/purchasesjournal.php
+++ b/htdocs/compta/journal/purchasesjournal.php
@@ -168,8 +168,7 @@ if ($result)
 
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -238,8 +237,7 @@ foreach ($tabfac as $key => $val)
 				{
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
 	    			print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
-				}
-				else {
+				} else {
 					print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
 				}
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index a7eb09de31a..bd44f6c47cc 100644
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -114,8 +114,7 @@ $sql .= " WHERE f.entity IN (".getEntity('invoice').")";
 $sql .= " AND f.fk_statut > 0";
 if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_SITUATION.")";
-}
-else {
+} else {
 	$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_STANDARD.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_DEPOSIT.",".Facture::TYPE_SITUATION.")";
 }
 
@@ -195,8 +194,7 @@ if ($result)
    		$tabcompany[$obj->rowid] = array('id'=>$obj->socid, 'name'=>$obj->name, 'client'=>$obj->client);
    		$i++;
    	}
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -268,8 +266,7 @@ foreach ($tabfac as $key => $val)
 				{
 					print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
-				}
-				else {
+				} else {
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
 	    			print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
 				}
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index e5a20b5486b..cd7bbfd11c2 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -80,8 +80,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
         $db->commit();
         header("Location: list.php?localTaxType=".$lttype);
         exit;
-    }
-    else {
+    } else {
         $db->rollback();
         setEventMessages($object->error, $object->errors, 'errors');
         $_GET["action"] = "create";
@@ -112,19 +111,16 @@ if ($action == 'delete')
 				$db->commit();
 				header("Location: ".DOL_URL_ROOT.'/compta/localtax/list.php?localTaxType='.$object->ltt);
 				exit;
-			}
-			else {
+			} else {
 				$object->error = $accountline->error;
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-	    }
-	    else {
+	    } else {
 	        $db->rollback();
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
-	}
-	else {
+	} else {
         $mesg = 'Error try do delete a line linked to a conciliated bank transaction';
         setEventMessages($mesg, null, 'errors');
 	}
@@ -285,8 +281,7 @@ if ($id)
 	if ($object->rappro == 0)
 	{
 		print '<a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a>';
-	}
-	else {
+	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("LinkedToAConcialitedTransaction").'">'.$langs->trans("Delete").'</a>';
 	}
 	print "</div>";
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 59adc220c8f..1dfeb0b8930 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -137,13 +137,11 @@ class Localtax extends CommonObject
             {
             	$this->db->commit();
             	return $this->id;
-            }
-            else {
+            } else {
 				$this->db->rollback();
 				return -1;
             }
-        }
-        else {
+        } else {
             $this->error = "Error ".$this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -204,8 +202,7 @@ class Localtax extends CommonObject
     	{
     		$this->db->commit();
     		return 1;
-    	}
-    	else {
+    	} else {
     		$this->db->rollback();
     		return -1;
     	}
@@ -267,8 +264,7 @@ class Localtax extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -373,13 +369,11 @@ class Localtax extends CommonObject
             	$ret = $obj->amount;
                 $this->db->free($result);
                 return $ret;
-            }
-            else {
+            } else {
             	$this->db->free($result);
 				return 0;
             }
-        }
-        else {
+        } else {
             print $this->db->lasterror();
             return -1;
         }
@@ -412,13 +406,11 @@ class Localtax extends CommonObject
             	$ret = $obj->total_localtax;
                 $this->db->free($result);
                 return $ret;
-            }
-            else {
+            } else {
             	$this->db->free($result);
             	return 0;
             }
-        }
-        else {
+        } else {
             print $this->db->lasterror();
             return -1;
         }
@@ -453,13 +445,11 @@ class Localtax extends CommonObject
                 $ret = $obj->amount;
             	$this->db->free($result);
                 return $ret;
-            }
-            else {
+            } else {
             	$this->db->free($result);
 				return 0;
             }
-        }
-        else {
+        } else {
             print $this->db->lasterror();
             return -1;
         }
@@ -537,8 +527,7 @@ class Localtax extends CommonObject
                     if ($bank_line_id > 0)
 					{
                         $this->update_fk_bank($bank_line_id);
-                    }
-					else {
+                    } else {
 						$this->error = $acc->error;
 						$ok = 0;
 					}
@@ -556,19 +545,16 @@ class Localtax extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					return -3;
 				}
-            }
-            else {
+            } else {
                 $this->error = $this->db->lasterror();
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -590,8 +576,7 @@ class Localtax extends CommonObject
 		$result = $this->db->query($sql);
 		if ($result) {
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php
index 12112766c24..10111dd7faa 100644
--- a/htdocs/compta/localtax/clients.php
+++ b/htdocs/compta/localtax/clients.php
@@ -53,15 +53,13 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
     $q = GETPOST("q");
     if (empty($q))
 	{
-		if (GETPOST("month")) { $date_start = dol_get_first_day($year_start, GETPOST("month"), false); $date_end = dol_get_last_day($year_start, GETPOST("month"), false); }
-		else {
+		if (GETPOST("month")) { $date_start = dol_get_first_day($year_start, GETPOST("month"), false); $date_end = dol_get_last_day($year_start, GETPOST("month"), false); } else {
 			$date_start = dol_get_first_day($year_start, empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START, false);
 			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) $date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
 			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) $date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
 			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) $date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
 		}
-	}
-	else {
+	} else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -199,8 +197,7 @@ if ($calc == 0 || $calc == 2)
 					if ($coll->assuj == '1')
 					{
 						$intra = $langs->trans('Unknown');
-					}
-					else {
+					} else {
 						$intra = '';
 					}
 				}
@@ -226,8 +223,7 @@ if ($calc == 0 || $calc == 2)
 	    print '<td class="nowrap right">'.price($totalamount).'</td>';
 		print '<td class="nowrap right">'.price($total).'</td>';
 		print '</tr>';
-	}
-	else {
+	} else {
 		$langs->load("errors");
 		if ($coll_list == -1)
 			print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
@@ -269,8 +265,7 @@ if ($calc == 0 || $calc == 1) {
 					if ($coll->assuj == '1')
 					{
 						$intra = $langs->trans('Unknown');
-					}
-					else {
+					} else {
 						$intra = '';
 					}
 				}
@@ -298,8 +293,7 @@ if ($calc == 0 || $calc == 1) {
 		print '</tr>';
 
 		print '</table>';
-	}
-	else {
+	} else {
 		$langs->load("errors");
 		if ($coll_list == -1)
 			print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index b8a906ac818..8e810495ff4 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -52,13 +52,11 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	$q = GETPOST("q", "int");
 	if (empty($q))
 	{
-		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); }
-		else {
+		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); } else {
 			$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
 			$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
 		}
-	}
-	else {
+	} else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -150,8 +148,7 @@ function pt($db, $sql, $date)
             	$amountpaid = 0;
             	$previousmode = '';
             	$previousmonth = '';
-            }
-            else {
+            } else {
             	$previousmode = $obj->mode;
             	$previousmonth = $obj->dm;
             }
@@ -179,8 +176,7 @@ function pt($db, $sql, $date)
 
         print "</table>";
         $db->free($result);
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -385,8 +381,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 				'localtax2'			=>$x_paye[$my_paye_rate]['localtax2_list'][$id],
 				//'link'				=>$expensereport->getNomUrl(1)
 				);
-			}
-			else {
+			} else {
 				//$invoice_supplier->id=$x_paye[$my_paye_rate]['facid'][$id];
 				//$invoice_supplier->ref=$x_paye[$my_paye_rate]['facnum'][$id];
 				//$invoice_supplier->type=$x_paye[$my_paye_rate]['type'][$id];
diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index 58ec8cb090e..a8b37c3ef93 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -95,8 +95,7 @@ if ($result)
 
     print "</table>";
     $db->free($result);
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
index 45d34f10cce..058f6871c7d 100644
--- a/htdocs/compta/localtax/quadri_detail.php
+++ b/htdocs/compta/localtax/quadri_detail.php
@@ -63,15 +63,13 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	$q = GETPOST("q", "int");
 	if (empty($q))
 	{
-		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); }
-		else {
+		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); } else {
 			$date_start = dol_get_first_day($year_start, empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START, false);
 			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) $date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
 			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) $date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
 			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) $date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
 		}
-	}
-	else {
+	} else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -221,8 +219,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 	elseif ($x_coll == -2)
 		print '<tr><td colspan="'.$columns.'">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
 	else print '<tr><td colspan="'.$columns.'">'.$langs->trans("Error").'</td></tr>';
-}
-else {
+} else {
 	$x_both = array();
 
 	//now, from these two arrays, get another array with one rate per line
@@ -368,8 +365,7 @@ else {
 						$product_static->type = $fields['ptype'];
 						print $product_static->getNomUrl(1);
 						if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
-					}
-					else {
+					} else {
 						if ($type) $text = img_object($langs->trans('Service'), 'service');
 						else $text = img_object($langs->trans('Product'), 'product');
 			            if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg))
@@ -411,8 +407,7 @@ else {
 						if ($type == 0)
 						{
 							print $langs->trans("NotUsedForGoods");
-						}
-						else {
+						} else {
 							print price($fields['payment_amount']);
 							if (isset($fields['payment_amount'])) print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
 						}
@@ -527,8 +522,7 @@ else {
 						$product_static->type = $fields['ptype'];
 						print $product_static->getNomUrl(1);
 						if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
-					}
-					else {
+					} else {
 						if ($type) $text = img_object($langs->trans('Service'), 'service');
 						else $text = img_object($langs->trans('Product'), 'product');
 						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
@@ -566,8 +560,7 @@ else {
 						if ($type == 0)
 						{
 							print $langs->trans("NA");
-						}
-						else {
+						} else {
 							print price(price2num($fields['payment_amount'], 'MT'));
 							if (isset($fields['payment_amount'])) {
 								print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 5c0f258a091..4eea16f706b 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -131,8 +131,7 @@ if (empty($reshook))
 	            }
 
 	            $formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => $_POST[$key]);
-	        }
-			elseif (substr($key, 0, 21) == 'multicurrency_amount_')
+	        } elseif (substr($key, 0, 21) == 'multicurrency_amount_')
 			{
 				$cursorfacid = substr($key, 21);
 	            $multicurrency_amounts[$cursorfacid] = price2num(trim(GETPOST($key)));
@@ -312,8 +311,7 @@ if (empty($reshook))
 	        else $loc = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id;
 	        header('Location: '.$loc);
 	        exit;
-	    }
-	    else {
+	    } else {
 	        $db->rollback();
 	    }
 	}
@@ -502,8 +500,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
             print '<td>';
             $form->select_comptes($accountid, 'accountid', 0, '', 2);
             print '</td>';
-        }
-        else {
+        } else {
             print '<td>&nbsp;</td>';
         }
         print "</tr>\n";
@@ -558,8 +555,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
         if ($facture->type != Facture::TYPE_CREDIT_NOTE)
         {
             $sql .= ' AND type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
-        }
-        else {
+        } else {
             $sql .= ' AND type = 2'; // If paying back a credit note, we show all credit notes
         }
         // Sort invoices by date and serial number: the older one comes first
@@ -662,8 +658,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                         }
 
                         print '</td>';
-                    }
-                    else {
+                    } else {
                         print '<td align="center"></td>';
                     }
 
@@ -706,8 +701,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
     				    			print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
    				    			print '<input type="text" class="maxwidth75 multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
    				    			print '<input type="hidden" class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
-    				    	}
-    				    	else {
+    				    	} else {
     				    		print '<input type="text" class="maxwidth75" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>';
     				    		print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
     				    	}
@@ -741,8 +735,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
                         print '<input type="text" class="maxwidth75 amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
                         print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
-                    }
-                    else {
+                    } else {
                         print '<input type="text" class="maxwidth75" name="'.$namef.'_disabled" value="'.dol_escape_htmltag(GETPOST($namef)).'" disabled>';
                         print '<input type="hidden" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
                     }
@@ -797,8 +790,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                 //print "</td></tr>\n";
             }
             $db->free($resql);
-        }
-        else {
+        } else {
             dol_print_error($db);
         }
 
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index f67a2e2c12a..4acfd34a53a 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -65,8 +65,7 @@ if ($action == 'setnote' && $user->rights->facture->paiement)
     {
         $db->commit();
         $action = '';
-    }
-    else {
+    } else {
 	    setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
     }
@@ -86,13 +85,11 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture->
         {
         	header("Location: ".$backtopage);
         	exit;
-        }
-        else {
+        } else {
         	header("Location: list.php");
         	exit;
         }
-	}
-	else {
+	} else {
 	    $langs->load("errors");
 		setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
@@ -128,8 +125,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->facture->
 
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
 		exit;
-	}
-	else {
+	} else {
 	    $langs->load("errors");
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
@@ -143,8 +139,7 @@ if ($action == 'setnum_paiement' && !empty($_POST['num_paiement']))
 	if ($res === 0)
 	{
 		setEventMessages($langs->trans('PaymentNumberUpdateSucceeded'), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans('PaymentNumberUpdateFailed'), null, 'errors');
 	}
 }
@@ -157,8 +152,7 @@ if ($action == 'setdatep' && !empty($_POST['datepday']))
 	if ($res === 0)
 	{
 		setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans('PaymentDateUpdateFailed'), null, 'errors');
 	}
 }
@@ -407,8 +401,7 @@ if ($resql)
 	print '</div>';
 
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -438,8 +431,7 @@ if ($user->socid == 0 && $action == '')
 		if (!$disable_delete)
 		{
 			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-		}
-		else {
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$title_button.'">'.$langs->trans('Delete').'</a>';
 		}
 	}
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 44a160b35e0..5c490ce3128 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -79,8 +79,7 @@ if ($action == 'setdate' && $user->rights->banque->cheque)
         {
 			setEventMessages($object->error, $object->errors, 'errors');
         }
-    }
-    else {
+    } else {
         setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -97,8 +96,7 @@ if ($action == 'setrefext' && $user->rights->banque->cheque)
         {
             setEventMessages($object->error, $object->errors, 'errors');
         }
-    }
-    else {
+    } else {
         setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -115,8 +113,7 @@ if ($action == 'setref' && $user->rights->banque->cheque)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -146,12 +143,10 @@ if ($action == 'create' && $_POST["accountid"] > 0 && $user->rights->banque->che
 
        		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
         	exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("ErrorSelectAtLeastOne"), null, 'mesgs');
 	    $action = 'new';
 	}
@@ -165,8 +160,7 @@ if ($action == 'remove' && $id > 0 && $_GET["lineid"] > 0 && $user->rights->banq
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -179,8 +173,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->c
 	{
 		header("Location: index.php");
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($paiement->error, $paiement->errors, 'errors');
 	}
 }
@@ -205,8 +198,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->banque->c
 
         header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -224,8 +216,7 @@ if ($action == 'confirm_reject_check' && $confirm == 'yes' && $user->rights->ban
 		//header("Location: ".DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id);
 		//exit;
 		$action = '';
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = '';
 	}
@@ -252,8 +243,7 @@ if ($action == 'builddoc' && $user->rights->banque->cheque)
 	{
 		dol_print_error($db, $object->error);
 		exit;
-	}
-	else {
+	} else {
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc'));
 		exit;
 	}
@@ -304,8 +294,7 @@ if ($action == 'new')
 	$h++;
 
 	print load_fiche_titre($langs->trans("Cheques"), '', 'bank_account');
-}
-else {
+} else {
 	$result = $object->fetch($id, $ref);
 	if ($result < 0)
 	{
@@ -498,8 +487,7 @@ if ($action == 'new')
 				if ($paymentstatic->id)
 				{
 					print $paymentstatic->getNomUrl(1);
-				}
-				else {
+				} else {
 					print '&nbsp;';
 				}
 				print '</td>';
@@ -509,8 +497,7 @@ if ($action == 'new')
 				if ($accountlinestatic->rowid)
 				{
 					print $accountlinestatic->getNomUrl(1);
-				}
-				else {
+				} else {
 					print '&nbsp;';
 				}
 				print '</td>';
@@ -530,15 +517,13 @@ if ($action == 'new')
 		if ($user->rights->banque->cheque)
 		{
 			print '<input type="submit" class="button" value="'.$langs->trans('NewCheckDepositOn', $account_label).'">';
-		}
-		else {
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('NewCheckDepositOn', $account_label).'</a>';
 		}
 		print '</div><br>';
 		print '</form>';
 	}
-}
-else {
+} else {
 	$paymentstatic = new Paiement($db);
 	$accountlinestatic = new AccountLine($db);
 	$accountstatic = new Account($db);
@@ -572,8 +557,7 @@ else {
         print $form->selectDate($object->date_bordereau, 'datecreate_', '', '', '', "setdate");
         print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
         print '</form>';
-    }
-    else {
+    } else {
         print $object->date_bordereau ? dol_print_date($object->date_bordereau, 'day') : '&nbsp;';
     }
 
@@ -683,8 +667,7 @@ else {
     			if ($paymentstatic->id)
     			{
     				print $paymentstatic->getNomUrl(1);
-    			}
-    			else {
+    			} else {
     				print '&nbsp;';
     			}
     			print '</td>';
@@ -694,8 +677,7 @@ else {
     			if ($accountlinestatic->rowid)
     			{
     				print $accountlinestatic->getNomUrl(1);
-    			}
-    			else {
+    			} else {
     				print '&nbsp;';
     			}
     			print '</td>';
@@ -718,8 +700,7 @@ else {
 
     			$i++;
     		}
-        }
-        else {
+        } else {
             print '<td colspan="8" class="opacitymedium">';
             print $langs->trans("None");
             print '</td>';
@@ -736,8 +717,7 @@ else {
 		}
 
 		print "</div>";
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 9d252a7456e..48c58dc7219 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -120,16 +120,14 @@ class RemiseCheque extends CommonObject
 				if ($this->statut == 0)
 				{
 					$this->ref = "(PROV".$this->id.")";
-				}
-				else {
+				} else {
 					$this->ref = $obj->ref;
 				}
 			}
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 		    $this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -225,8 +223,7 @@ class RemiseCheque extends CommonObject
 						array_push($lines, $row[0]);
 					}
 					$this->db->free($resql);
-				}
-				else {
+				} else {
 					$this->errno = -1026;
 					dol_syslog("RemiseCheque::Create Error ".$this->errno, LOG_ERR);
 				}
@@ -266,8 +263,7 @@ class RemiseCheque extends CommonObject
 					dol_syslog("RemiseCheque::Create Error update amount ".$this->errno, LOG_ERR);
 				}
 			}
-		}
-		else {
+		} else {
 			$this->errno = -1;
 			$this->error = $this->db->lasterror();
 			$this->errno = $this->db->lasterrno();
@@ -284,8 +280,7 @@ class RemiseCheque extends CommonObject
             $this->db->commit();
             dol_syslog("RemiseCheque::Create end", LOG_DEBUG);
             return $this->id;
-        }
-        else {
+        } else {
             $this->db->rollback();
             dol_syslog("RemiseCheque::Create end", LOG_DEBUG);
             return $this->errno;
@@ -336,8 +331,7 @@ class RemiseCheque extends CommonObject
 		if ($this->errno === 0)
 		{
 			$this->db->commit();
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			dol_syslog("RemiseCheque::Delete ROLLBACK ($this->errno)");
 		}
@@ -379,13 +373,11 @@ class RemiseCheque extends CommonObject
 				{
 				    $this->ref = $numref;
 					$this->statut = 1;
-				}
-				else {
+				} else {
 					$this->errno = -1029;
 					dol_syslog("Remisecheque::Validate Error ".$this->errno, LOG_ERR);
 				}
-			}
-			else {
+			} else {
 				$this->errno = -1033;
 				dol_syslog("Remisecheque::Validate Error ".$this->errno, LOG_ERR);
 			}
@@ -396,8 +388,7 @@ class RemiseCheque extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			dol_syslog("RemiseCheque::Validate ".$this->errno, LOG_ERR);
             return $this->errno;
@@ -479,8 +470,7 @@ class RemiseCheque extends CommonObject
 			}
 
 			return $numref;
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Bank"));
 			return "";
@@ -534,8 +524,7 @@ class RemiseCheque extends CommonObject
 			}
 
 			return $response;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -573,8 +562,7 @@ class RemiseCheque extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -652,15 +640,13 @@ class RemiseCheque extends CommonObject
 			{
 				//$outputlangs->charset_output=$sav_charset_output;
 				return 1;
-			}
-			else {
+			} else {
 				//$outputlangs->charset_output=$sav_charset_output;
 				dol_syslog("Error");
 				dol_print_error($this->db, $docmodel->error);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->trans("ErrorFileDoesNotExists", $dir.$file);
 			return -1;
 		}
@@ -706,8 +692,7 @@ class RemiseCheque extends CommonObject
 				$this->errno = -1030;
 				dol_syslog("RemiseCheque::updateAmount ERREUR UPDATE ($this->errno)");
 			}
-		}
-		else {
+		} else {
 			$this->errno = -1031;
 			dol_syslog("RemiseCheque::updateAmount ERREUR SELECT ($this->errno)");
 		}
@@ -715,8 +700,7 @@ class RemiseCheque extends CommonObject
 		if ($this->errno === 0)
 		{
 			$this->db->commit();
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			dol_syslog("RemiseCheque::updateAmount ROLLBACK ($this->errno)");
 		}
@@ -745,8 +729,7 @@ class RemiseCheque extends CommonObject
 			if ($resql)
 			{
 				$this->updateAmount();
-			}
-			else {
+			} else {
 				$this->errno = -1032;
 				dol_syslog("RemiseCheque::removeCheck ERREUR UPDATE ($this->errno)");
 			}
@@ -821,27 +804,23 @@ class RemiseCheque extends CommonObject
 					{
     					$this->db->commit();
     					return $rejectedPayment->id;
-					}
-					else {
+					} else {
                         $this->db->rollback();
 					    return -1;
 					}
-				}
-				else {
+				} else {
 				    $this->error = $rejectedPayment->error;
 				    $this->errors = $rejectedPayment->errors;
 				    $this->db->rollback();
 					return -1;
 				}
-			}
-			else {
+			} else {
 				$this->error = $rejectedPayment->error;
 				$this->errors = $rejectedPayment->errors;
 			    $this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -914,13 +893,11 @@ class RemiseCheque extends CommonObject
             {
                 $this->date_bordereau = $date;
                 return 1;
-            }
-            else {
+            } else {
                 $this->error = $this->db->error();
                 return -1;
             }
-        }
-        else {
+        } else {
             return -2;
         }
     }
@@ -947,13 +924,11 @@ class RemiseCheque extends CommonObject
 			if ($resql)
 			{
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			return -2;
 		}
 	}
@@ -1021,8 +996,7 @@ class RemiseCheque extends CommonObject
         	}
         	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
         	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index 7971a34db0d..1ee79aeafd9 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -76,8 +76,7 @@ if ($resql) {
     print '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/card.php?leftmenu=customers_bills_checks&action=new">'.$num.'</a>';
     print '</td></tr>';
     print "</table>\n";
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -139,8 +138,7 @@ if ($resql)
 	print "</table>";
 
 	$db->free($resql);
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index cda8c2a679d..e76936c71fd 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -221,8 +221,7 @@ if ($resql)
             print "</tr>\n";
     		$i++;
     	}
-    }
-    else {
+    } else {
    		print '<tr class="oddeven">';
    		print '<td colspan="7" class="opacitymedium">'.$langs->trans("None")."</td>";
    		print '</tr>';
@@ -230,8 +229,7 @@ if ($resql)
 	print "</table>";
 	print "</div>";
 	print "</form>\n";
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 99250bd9373..f57e4408a6f 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -200,13 +200,11 @@ class Paiement extends CommonObject
 
 				$this->db->free($resql);
 				return 1;
-			}
-			else {
+			} else {
 				$this->db->free($resql);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -240,8 +238,7 @@ class Paiement extends CommonObject
 		{
 			$amounts = &$this->amounts;
 			$amounts_to_update = &$this->multicurrency_amounts;
-		}
-		else {
+		} else {
 			$amounts = &$this->multicurrency_amounts;
 			$amounts_to_update = &$this->amounts;
 		}
@@ -279,8 +276,7 @@ class Paiement extends CommonObject
 		{
 			$total = $totalamount;
 			$mtotal = $totalamount_converted; // Maybe use price2num with MT for the converted value
-		}
-		else {
+		} else {
 			$total = $totalamount_converted; // Maybe use price2num with MT for the converted value
 			$mtotal = $totalamount;
 		}
@@ -424,13 +420,11 @@ class Paiement extends CommonObject
                             	$error++;
                             }
                         }
-					}
-					else {
+					} else {
 						$this->error = $this->db->lasterror();
 						$error++;
 					}
-				}
-				else {
+				} else {
 					dol_syslog(get_class($this).'::Create Amount line '.$key.' not a number. We discard it.');
 				}
 			}
@@ -442,8 +436,7 @@ class Paiement extends CommonObject
 				if ($result < 0) { $error++; }
 				// Fin appel triggers
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$error++;
 		}
@@ -455,8 +448,7 @@ class Paiement extends CommonObject
 		    $this->multicurrency_amount = $mtotal;
 			$this->db->commit();
 			return $this->id;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -492,8 +484,7 @@ class Paiement extends CommonObject
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -2;
 		}
@@ -557,8 +548,7 @@ class Paiement extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error;
 			$this->db->rollback();
 			return -5;
@@ -719,8 +709,7 @@ class Paiement extends CommonObject
 				    if ($result < 0) { $error++; }
 				    // Fin appel triggers
 				}
-            }
-            else {
+            } else {
                 $this->error = $acc->error;
                 $error++;
             }
@@ -728,8 +717,7 @@ class Paiement extends CommonObject
             if (!$error)
             {
             	$this->db->commit();
-            }
-            else {
+            } else {
             	$this->db->rollback();
             }
         }
@@ -737,8 +725,7 @@ class Paiement extends CommonObject
         if (!$error)
         {
             return $bank_line_id;
-        }
-        else {
+        } else {
             return -1;
         }
     }
@@ -762,8 +749,7 @@ class Paiement extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else {
+		} else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this).'::update_fk_bank '.$this->error);
 			return -1;
@@ -824,8 +810,7 @@ class Paiement extends CommonObject
 
                 $this->db->commit();
                 return 0;
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 return -2;
             }
@@ -854,8 +839,7 @@ class Paiement extends CommonObject
             {
             	$this->num_payment = $this->db->escape($num);
                 return 0;
-            }
-            else {
+            } else {
                 $this->error = 'Error -1 '.$this->db->error();
                 return -2;
             }
@@ -878,8 +862,7 @@ class Paiement extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this).'::valide '.$this->error);
 			return -1;
@@ -901,8 +884,7 @@ class Paiement extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this).'::reject '.$this->error);
 			return -1;
@@ -946,8 +928,7 @@ class Paiement extends CommonObject
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
     }
@@ -979,8 +960,7 @@ class Paiement extends CommonObject
 			}
 
 			return $billsarray;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this).'::getBillsArray Error '.$this->error.' -', LOG_DEBUG);
 			return -1;
@@ -1012,8 +992,7 @@ class Paiement extends CommonObject
     		}
 
     		return $amounts;
-    	}
-    	else {
+    	} else {
     		$this->error = $this->db->error();
     		dol_syslog(get_class($this).'::getAmountsArray Error '.$this->error.' -', LOG_DEBUG);
     		return -1;
@@ -1096,8 +1075,7 @@ class Paiement extends CommonObject
 			}
 
 			return $numref;
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Invoice"));
 			return "";
@@ -1198,8 +1176,7 @@ class Paiement extends CommonObject
         	}
         	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
         	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $url = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$this->id;
 
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index dbdf4f4675e..eb2523960f3 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -129,8 +129,7 @@ if (GETPOST("orphelins", "alpha"))
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
-}
-else {
+} else {
     $sql = "SELECT DISTINCT p.rowid, p.ref, p.datep as dp, p.amount,"; // DISTINCT is to avoid duplicate when there is a link to sales representatives
     $sql .= " p.statut, p.num_paiement as num_payment,";
     $sql .= " c.code as paiement_code,";
@@ -377,8 +376,7 @@ if ($resql)
     print "</table>\n";
     print "</div>";
     print "</form>\n";
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 66f239fdf96..9d3bae3140d 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -70,8 +70,7 @@ if ($action == 'builddoc')
     if ($rap->write_file($dir, $_POST["remonth"], $_POST["reyear"], $outputlangs) > 0)
     {
         $outputlangs->charset_output = $sav_charset_output;
-    }
-    else {
+    } else {
         $outputlangs->charset_output = $sav_charset_output;
         dol_print_error($db, $obj->error);
     }
diff --git a/htdocs/compta/paiement/tovalidate.php b/htdocs/compta/paiement/tovalidate.php
index b978fc8e218..349c483a5db 100644
--- a/htdocs/compta/paiement/tovalidate.php
+++ b/htdocs/compta/paiement/tovalidate.php
@@ -126,8 +126,7 @@ if ($resql)
         if ($objp->statut == 0)
         {
             print '<a href="card.php?id='.$objp->rowid.'&amp;action=valide">'.$langs->trans("PaymentStatusToValidShort").'</a>';
-        }
-        else {
+        } else {
             print "-";
         }
 
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index d1b448c5932..9c5ceea22bf 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -141,8 +141,7 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
                 $loc = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$chid;
                 header('Location: '.$loc);
                 exit;
-            }
-            else {
+            } else {
                 $db->rollback();
             }
         }
@@ -282,8 +281,7 @@ if ($action == 'create')
 		if ($objp->date_ech > 0)
 		{
 			print '<td class="left">'.dol_print_date($objp->date_ech, 'day').'</td>'."\n";
-		}
-		else {
+		} else {
 			print "<td align=\"center\"><b>!!!</b></td>\n";
 		}
 
@@ -303,8 +301,7 @@ if ($action == 'create')
 			$remaintopay = $objp->amount - $sumpaid;
 			print '<input type=hidden class="sum_remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
 			print '<input type="text" size="8" name="'.$namef.'" id="'.$namef.'">';
-		}
-		else {
+		} else {
 			print '-';
 		}
 		print "</td>";
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index 69b425356d1..fbe5d926d33 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -66,8 +66,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->tax->char
         $db->commit();
         header("Location: ".DOL_URL_ROOT."/compta/sociales/payments.php?mode=sconly");
         exit;
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
 	}
@@ -282,8 +281,7 @@ if ($resql)
 
 	print "</table>\n";
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -314,8 +312,7 @@ if ($action == '')
 		if (!$disable_delete)
 		{
 			print '<a class="butActionDelete" href="card.php?id='.$_GET['id'].'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-		}
-		else {
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
 		}
 	}
diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php
index d2611e8a354..63769e2bd9e 100644
--- a/htdocs/compta/paymentbybanktransfer/index.php
+++ b/htdocs/compta/paymentbybanktransfer/index.php
@@ -158,13 +158,11 @@ if ($resql)
             print '</tr>';
             $i++;
         }
-    }
-    else {
+    } else {
         print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoSupplierInvoiceToWithdraw", $langs->transnoentitiesnoconv("BankTransfer")).'</td></tr>';
     }
     print "</table></div><br>";
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -218,8 +216,7 @@ if ($result)
     }
     print "</table></div><br>";
     $db->free($result);
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 106f848f732..347b3ebb37f 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -190,8 +190,7 @@ if ($result)
     print '</form>';
 
     $db->free($result);
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index d5051e06bfa..7d56cec823e 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -408,8 +408,7 @@ if ($id > 0 || $ref)
 			if ($obj->statut == 3)
 			{
 		  		print '<b>'.$langs->trans("StatusRefused").'</b>';
-			}
-			else {
+			} else {
 		  		print "&nbsp;";
 			}
 
@@ -441,8 +440,7 @@ if ($id > 0 || $ref)
 		print '</form>';
 
 		$db->free($result);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 91a165ee454..6192d97d92f 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -151,18 +151,15 @@ class BonPrelevement extends CommonObject
 				if ($this->db->query($sql))
 				{
 					$result = 0;
-				}
-				else {
+				} else {
 					$result = -1;
 					dol_syslog(get_class($this)."::AddFacture Erreur $result");
 				}
-			}
-			else {
+			} else {
 				$result = -2;
 				dol_syslog(get_class($this)."::AddFacture Erreur $result");
 			}
-		}
-		else {
+		} else {
 			$result = -3;
 			dol_syslog(get_class($this)."::AddFacture Erreur $result");
 		}
@@ -205,12 +202,10 @@ class BonPrelevement extends CommonObject
 			if ($resql)
 			{
 				$num = $this->db->num_rows($resql);
-			}
-			else {
+			} else {
 				$result = -1;
 			}
-		}
-		else {
+		} else {
 			/*
 			 * No aggregate
 			 */
@@ -238,8 +233,7 @@ class BonPrelevement extends CommonObject
 			{
 				$line_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_lignes");
 				$result = 0;
-			}
-			else {
+			} else {
 				dol_syslog(get_class($this)."::addline Error -2");
 				$result = -2;
 			}
@@ -314,13 +308,11 @@ class BonPrelevement extends CommonObject
 				$this->fetched = 1;
 
 				return 1;
-			}
-			else {
+			} else {
 				dol_syslog(get_class($this)."::Fetch Erreur aucune ligne retournee");
 				return -1;
 			}
-		}
-		else {
+		} else {
 			return -2;
 		}
 	}
@@ -388,15 +380,13 @@ class BonPrelevement extends CommonObject
 			{
 				$this->db->commit();
 				return 0;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::set_credite ROLLBACK ");
 
 				return -1;
 			}
-		}
-		else {
+		} else {
 			dol_syslog(get_class($this)."::set_credite Ouverture transaction SQL impossible ");
 			return -2;
 		}
@@ -480,8 +470,7 @@ class BonPrelevement extends CommonObject
 							{
 								dol_syslog(get_class($this)."::set_infocredit AddPayment Error");
 								$error++;
-							}
-							else {
+							} else {
 								$result = $paiement->addPaymentToBank($user, 'payment', '(WithdrawalPayment)', $bankaccount, '', '');
 								if ($result < 0)
 								{
@@ -505,8 +494,7 @@ class BonPrelevement extends CommonObject
 							dol_syslog(get_class($this)."::set_infocredit Update lines Error");
 							$error++;
 						}
-					}
-					else {
+					} else {
 						dol_syslog(get_class($this)."::set_infocredit Update Bons Error");
 						$error++;
 					}
@@ -521,24 +509,20 @@ class BonPrelevement extends CommonObject
 
 						$this->db->commit();
 						return 0;
-					}
-					else {
+					} else {
 						$this->db->rollback();
 						dol_syslog("bon-prelevment::set_infocredit ROLLBACK ");
 						return -1;
 					}
-				}
-				else {
+				} else {
 					dol_syslog(get_class($this)."::set_infocredit 1025 Open SQL transaction impossible ");
 					return -1025;
 				}
-			}
-			else {
+			} else {
 				dol_syslog("bon-prelevment::set_infocredit 1027 Date de credit < Date de trans ");
 				return -1027;
 			}
-		}
-		else {
+		} else {
 			return -1026;
 		}
 	}
@@ -580,8 +564,7 @@ class BonPrelevement extends CommonObject
 				$message .= $langs->trans("InfoTransData", price($this->amount), $this->methodes_trans[$this->method_trans], dol_print_date($date, 'day'));
 
 				// TODO Call trigger to create a notification using notification module
-			}
-			else {
+			} else {
 				$error++;
 			}
 
@@ -592,15 +575,13 @@ class BonPrelevement extends CommonObject
 				$this->db->commit();
 
 				return 0;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::set_infotrans ROLLBACK", LOG_ERR);
 
 				return -1;
 			}
-		}
-		else {
+		} else {
 			dol_syslog(get_class($this)."::set_infotrans Ouverture transaction SQL impossible", LOG_CRIT);
 			return -2;
 		}
@@ -655,8 +636,7 @@ class BonPrelevement extends CommonObject
 				}
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_syslog(get_class($this)."::getListInvoices Erreur");
 		}
 
@@ -693,8 +673,7 @@ class BonPrelevement extends CommonObject
 			$this->db->free($resql);
 
 			return $obj->nb;
-		}
-		else {
+		} else {
 			$error = 1;
 			dol_syslog(get_class($this)."::SommeAPrelever Erreur -1");
 			dol_syslog($this->db->error());
@@ -737,8 +716,7 @@ class BonPrelevement extends CommonObject
 			$this->db->free($resql);
 
 			return $obj->nb;
-		}
-		else {
+		} else {
 			$this->error = get_class($this)."::NbFactureAPrelever Erreur -1 sql=".$this->db->error();
 			return -1;
 		}
@@ -825,8 +803,7 @@ class BonPrelevement extends CommonObject
 				}
 				$this->db->free($resql);
 				dol_syslog(__METHOD__."::Read invoices, ".$i." invoices to withdraw", LOG_DEBUG);
-			}
-			else {
+			} else {
 				$error++;
 				dol_syslog(__METHOD__."::Read invoices error ".$this->db->error(), LOG_ERR);
 			}
@@ -870,23 +847,19 @@ class BonPrelevement extends CommonObject
 								$factures_prev_id[$i] = $fac[0];
 								$i++;
 								//dol_syslog(__METHOD__."::RIB is ok", LOG_DEBUG);
-							}
-							else {
+							} else {
 								dol_syslog(__METHOD__."::Check RIB Error on default bank number IBAN/BIC for thirdparty reported by verif() ".$fact->socid." ".$soc->name, LOG_WARNING);
 								$this->invoice_in_error[$fac[0]] = "Error on default bank number IBAN/BIC for invoice ".$fact->getNomUrl(0)." for thirdparty ".$soc->getNomUrl(0);
 								$this->thirdparty_in_error[$soc->id] = "Error on default bank number IBAN/BIC for invoice ".$fact->getNomUrl(0)." for thirdparty ".$soc->getNomUrl(0);
 							}
-						}
-						else {
+						} else {
 							dol_syslog(__METHOD__."::Check RIB Failed to read company", LOG_WARNING);
 						}
-					}
-					else {
+					} else {
 						dol_syslog(__METHOD__."::Check RIB Failed to read invoice", LOG_WARNING);
 					}
 				}
-			}
-			else {
+			} else {
 				dol_syslog(__METHOD__."::Check RIB No invoice to process", LOG_WARNING);
 			}
 		}
@@ -912,8 +885,7 @@ class BonPrelevement extends CommonObject
 			if ($mode == 'real')
 			{
 				$ok = 1;
-			}
-			else {
+			} else {
 				print $langs->trans("ModeWarning"); //"Option for real mode was not set, we stop after this simulation\n";
 			}
 		}
@@ -970,13 +942,11 @@ class BonPrelevement extends CommonObject
 						$prev_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_bons");
 						$this->id = $prev_id;
 						$this->ref = $ref;
-					}
-					else {
+					} else {
 						$error++;
 						dol_syslog(__METHOD__."::Create withdraw receipt ".$this->db->lasterror(), LOG_ERR);
 					}
-				}
-				else {
+				} else {
 					$error++;
 					dol_syslog(__METHOD__."::Get last withdraw receipt ".$this->db->lasterror(), LOG_ERR);
 				}
@@ -1097,14 +1067,12 @@ class BonPrelevement extends CommonObject
 			if (!$error)
 			{
 				$this->db->commit();
-			}
-			else {
+			} else {
 				$this->db->rollback();
 			}
 
 			return count($factures_prev);
-		}
-		else {
+		} else {
 			return 0;
 		}
 	}
@@ -1164,8 +1132,7 @@ class BonPrelevement extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1224,8 +1191,7 @@ class BonPrelevement extends CommonObject
 			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 			 */
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -1266,8 +1232,7 @@ class BonPrelevement extends CommonObject
 		if ($this->db->query($sql))
 		{
 			return 0;
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -1291,8 +1256,7 @@ class BonPrelevement extends CommonObject
 		if ($this->db->query($sql))
 		{
 			return 0;
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -1322,8 +1286,7 @@ class BonPrelevement extends CommonObject
 			if ($this->db->query($sql))
 			{
 				$result = 0;
-			}
-			else {
+			} else {
 				$result = -1;
 				dol_syslog(get_class($this)."::AddNotification Error $result");
 			}
@@ -1426,8 +1389,7 @@ class BonPrelevement extends CommonObject
 					$i++;
 				}
 				$nbtotalDrctDbtTxInf = $i;
-			}
-			else {
+			} else {
 				fputs($this->file, 'ERROR DEBITOR '.$sql.$CrLf); // DEBITOR = Customers
 				$result = -2;
 			}
@@ -1436,8 +1398,7 @@ class BonPrelevement extends CommonObject
 			if ($result != -2)
 			{
 				$fileEmetteurSection .= $this->EnregEmetteurSEPA($conf, $date_actu, $nbtotalDrctDbtTxInf, $this->total, $CrLf, $format);
-			}
-			else {
+			} else {
 				fputs($this->file, 'ERROR CREDITOR'.$CrLf); // CREDITOR = My company
 			}
 
@@ -1503,8 +1464,7 @@ class BonPrelevement extends CommonObject
 					$this->total = $this->total + $obj->amount;
 					$i++;
 				}
-			}
-			else {
+			} else {
 				$result = -2;
 			}
 
@@ -1874,8 +1834,7 @@ class BonPrelevement extends CommonObject
 			$XML_SEPA_INFO .= '					</PrvtId>'.$CrLf;
 			$XML_SEPA_INFO .= '				</Id>'.$CrLf;
 			$XML_SEPA_INFO .= '			</CdtrSchmeId>'.$CrLf;
-		}
-		else {
+		} else {
 			fputs($this->file, 'INCORRECT EMETTEUR '.$XML_SEPA_INFO.$CrLf);
 			$result = -2;
 		}
diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php
index accd64e2694..1e731b24524 100644
--- a/htdocs/compta/prelevement/class/ligneprelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php
@@ -96,15 +96,13 @@ class LignePrelevement
 				$this->statut          = $obj->statut;
 				$this->bon_ref         = $obj->ref;
 				$this->bon_rowid       = $obj->bon_rowid;
-			}
-			else {
+			} else {
 				$result++;
 				dol_syslog("LignePrelevement::Fetch rowid=$rowid numrows=0");
 			}
 
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			$result++;
 			dol_syslog("LignePrelevement::Fetch rowid=$rowid");
 			dol_syslog($this->db->error());
@@ -140,20 +138,17 @@ class LignePrelevement
 		if ($mode == 0)
 		{
 			return $langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut1').' '.$langs->trans($this->statuts[$status]); // Waiting
 			elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]); // Credited
 			elseif ($status == 3) return img_picto($langs->trans($this->statuts[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]); // Refused
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut1');
 			elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut6');
 			elseif ($status == 3) return img_picto($langs->trans($this->statuts[$status]), 'statut8');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 0) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut1');
 			elseif ($status == 2) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut6');
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index 1edd942fc42..8599987fb23 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -160,8 +160,7 @@ class RejetPrelevement
 			{
 				$error++;
 				dol_syslog("RejetPrelevement::Create Error creation payment invoice ".$facs[$i][0]);
-			}
-			else {
+			} else {
 				$result = $pai->addPaymentToBank($user, 'payment', '(InvoiceRefused)', $bankaccount, '', '');
 				if ($result < 0)
 				{
@@ -190,8 +189,7 @@ class RejetPrelevement
 		{
 			dol_syslog("RejetPrelevement::Create Commit");
 			$this->db->commit();
-		}
-		else {
+		} else {
 			dol_syslog("RejetPrelevement::Create Rollback");
 			$this->db->rollback();
 		}
@@ -225,8 +223,7 @@ class RejetPrelevement
 				$row = $this->db->fetch_row($resql);
 				$userid = $row[0];
 			}
-		}
-		else {
+		} else {
 			dol_syslog("RejetPrelevement::_send_email Erreur lecture user");
 		}
 
@@ -262,12 +259,10 @@ class RejetPrelevement
 			if ($result)
 			{
 				dol_syslog("RejetPrelevement::_send_email email envoye");
-			}
-			else {
+			} else {
 				dol_syslog("RejetPrelevement::_send_email Erreur envoi email");
 			}
-		}
-		else {
+		} else {
 			dol_syslog("RejetPrelevement::_send_email Userid invalide");
 		}
 	}
@@ -315,8 +310,7 @@ class RejetPrelevement
 				}
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_syslog("getListInvoices", LOG_ERR);
 		}
 
@@ -351,13 +345,11 @@ class RejetPrelevement
 				$this->db->free($resql);
 
 				return 0;
-			}
-			else {
+			} else {
 				dol_syslog("RejetPrelevement::Fetch Erreur rowid=$rowid numrows=0");
 				return -1;
 			}
-		}
-		else {
+		} else {
 			dol_syslog("RejetPrelevement::Fetch Erreur rowid=$rowid");
 			return -2;
 		}
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 505ad070645..015380a669d 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -83,8 +83,7 @@ if (empty($reshook))
 		if ($result < 0)
 		{
 			setEventMessages($bprev->error, $bprev->errors, 'errors');
-		}
-		elseif ($result == 0)
+		} elseif ($result == 0)
 		{
 			$mesg = $langs->trans("NoInvoiceCouldBeWithdrawed", $format);
 			setEventMessages($mesg, null, 'errors');
@@ -93,8 +92,7 @@ if (empty($reshook))
 			{
 				$mesg .= '<span class="warning">'.$val."</span><br>\n";
 			}
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("DirectDebitOrderCreated", $bprev->getNomUrl(1)), null);
 		}
 	}
@@ -173,19 +171,16 @@ if ($nb) {
         } else {
             print '<a class="butAction"  type="submit" href="create.php?action=create&format=ALL">'.$langs->trans("CreateAll")."</a>\n";
 		}
-	}
-	else {
+	} else {
 		if ($mysoc->isInEEC())
 		{
 			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateForSepaFRST")."</a>\n";
 			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateForSepaRCUR")."</a>\n";
-		}
-		else {
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateAll")."</a>\n";
 		}
 	}
-}
-else {
+} else {
     print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoInvoiceToWithdraw", $langs->transnoentitiesnoconv("StandingOrders"))).'">'.$langs->trans("CreateAll")."</a>\n";
 }
 
@@ -303,15 +298,13 @@ if ($resql)
 			print '</tr>';
 			$i++;
 		}
-	}
-	else {
+	} else {
 		print '<tr class="oddeven"><td colspan="6"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 	}
 	print "</table>";
 	print "</form>";
 	print "<br>\n";
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 64ac904db6c..30618de8c24 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -88,8 +88,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 if (!$status)
 {
 	$title = $langs->trans("RequestStandingOrderToTreat");
-}
-else {
+} else {
 	$title = $langs->trans("RequestStandingOrderTreated");
 }
 
@@ -141,8 +140,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else {
+} else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index bb3cced3eb4..c0fa4f55e68 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -134,8 +134,7 @@ if ($prev_id > 0 || $ref)
 		print '</div>';
 
 		dol_fiche_end();
-    }
-  	else {
+    } else {
       	dol_print_error($db);
     }
 }
@@ -245,12 +244,10 @@ if ($result)
       	if ($obj->statut == 0)
 		{
 	  		print '-';
-		}
-      	elseif ($obj->statut == 2)
+		} elseif ($obj->statut == 2)
 		{
 	  		print $langs->trans("StatusCredited");
-		}
-      	elseif ($obj->statut == 3)
+		} elseif ($obj->statut == 3)
 		{
 	  		print '<b>'.$langs->trans("StatusRefused").'</b>';
 		}
@@ -288,8 +285,7 @@ if ($result)
   	print '</div>';
 
   	$db->free($result);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 4bfc07b0292..65116878bb9 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -135,8 +135,7 @@ if ($prev_id > 0 || $ref)
 		print '</div>';
 
 		dol_fiche_end();
-    }
-  	else {
+    } else {
       	dol_print_error($db);
     }
 }
@@ -219,8 +218,7 @@ if ($resql)
 
     		$i++;
     	}
-	}
-	else {
+	} else {
 	    print '<tr><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 	}
 
@@ -236,8 +234,7 @@ if ($resql)
     print '</div>';
 
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 5dd01bad41d..0ada15853d9 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -132,8 +132,7 @@ if ($prev_id > 0 || $ref)
 		print '</div>';
 
 		dol_fiche_end();
-	}
-	else {
+	} else {
 		$langs->load("errors");
 		print $langs->trans("Error");
 	}
@@ -184,8 +183,7 @@ if ($prev_id > 0 || $ref)
 
 		print "</table>";
 		$db->free($resql);
-	}
-	else {
+	} else {
 		print $db->error().' '.$sql;
 	}
 }
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index faa56184891..d182176f0fa 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -158,13 +158,11 @@ if ($resql)
             print '</tr>';
             $i++;
         }
-    }
-    else {
+    } else {
         print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoInvoiceToWithdraw", $langs->transnoentitiesnoconv("StandingOrders")).'</td></tr>';
     }
     print "</table></div><br>";
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -218,8 +216,7 @@ if ($result)
     }
     print "</table></div><br>";
     $db->free($result);
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index 89d6ad93636..fd77d6d90f6 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -73,9 +73,7 @@ if ($action == 'confirm_rejet')
 		{
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
-		}
-
-		elseif ($daterej > dol_now())
+		} elseif ($daterej > dol_now())
 		{
 			$error++;
 			$langs->load("error");
@@ -102,12 +100,10 @@ if ($action == 'confirm_rejet')
 				header("Location: line.php?id=".$id);
 				exit;
 			}
-		}
-		else {
+		} else {
 			$action = "rejet";
 		}
-	}
-	else {
+	} else {
 		header("Location: line.php?id=".$id);
 		exit;
 	}
@@ -159,22 +155,19 @@ if ($id)
 				{
 					/* Historique pour certaines install */
 					print $langs->trans("Unknown");
-				}
-				else {
+				} else {
 					print dol_print_date($rej->date_rejet, 'day');
 				}
 				print '</td></tr>';
 				print '<tr><td width="20%">'.$langs->trans("RefusedInvoicing").'</td><td>'.$rej->invoicing.'</td></tr>';
-			}
-			else {
+			} else {
 				print '<tr><td width="20%">'.$resf.'</td></tr>';
 			}
 		}
 
 		print '</table>';
 		dol_fiche_end();
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
@@ -240,12 +233,10 @@ if ($id)
 			if ($user->rights->prelevement->bons->credit)
 			{
 	  			print "<a class=\"butAction\" href=\"line.php?action=rejet&amp;id=$lipre->id\">".$langs->trans("StandingOrderReject")."</a>";
-			}
-			else {
+			} else {
 				print "<a class=\"butActionRefused classfortooltip\" href=\"#\" title=\"".$langs->trans("NotAllowed")."\">".$langs->trans("StandingOrderReject")."</a>";
 			}
-		}
-		else {
+		} else {
 			print "<a class=\"butActionRefused classfortooltip\" href=\"#\" title=\"".$langs->trans("NotPossibleForThisStatusOfWithdrawReceiptORLine")."\">".$langs->trans("StandingOrderReject")."</a>";
 		}
 	}
@@ -322,8 +313,7 @@ if ($id)
 		print "</table>";
 
 		$db->free($result);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index b93042df8e6..3130aa475f6 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -235,8 +235,7 @@ if ($result)
     print '</form>';
 
     $db->free($result);
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index a7e7a6f3a53..61417a2cd5f 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -117,8 +117,7 @@ if ($result)
 
 	print "</table>";
 	$db->free($result);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index 609c75e065d..b12a6a2bb35 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -125,8 +125,7 @@ if ($resql)
 	print '</td><td class="right">&nbsp;</td>';
 	print "</tr></table>";
 	$db->free();
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -218,8 +217,7 @@ if ($resql)
 	print '</td><td class="right">&nbsp;</td>';
 	print "</tr></table>";
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 83388f21e49..8b75ec38fce 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -211,13 +211,11 @@ if ($id > 0)
 					}
 
 					$db->free($resqlp);
-				}
-				else {
+				} else {
 					dol_print_error($db);
 				}
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -286,8 +284,7 @@ if ($id > 0)
 
 		print "</table>";
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 8d7c0343b30..671921506d5 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -99,8 +99,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
             $month_end = $month_start - 1;
             if ($month_end < 1) $month_end = 12;
             else $year_end++;
-        }
-        else $month_end = $month_start;
+        } else $month_end = $month_start;
         $date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
     }
     if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
@@ -154,8 +153,7 @@ if ($modecompta == "CREANCES-DETTES")
 	else $description .= $langs->trans("DepositsAreIncluded");
     $builddate = dol_now();
     //$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPredefinedAccountGroups");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -166,8 +164,7 @@ elseif ($modecompta == "RECETTES-DEPENSES")
     $description = $langs->trans("RulesResultInOut");
     $builddate = dol_now();
     //$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPredefinedAccountGroups");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
@@ -212,8 +209,7 @@ print_liste_field_titre('');
 if ($modecompta == 'BOOKKEEPING')
 {
 	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], 'amount', '', $param, 'class="right"', $sortfield, $sortorder);
-}
-else {
+} else {
 	if ($modecompta == 'CREANCES-DETTES')
 	{
 		print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], 'amount_ht', '', $param, 'class="right"', $sortfield, $sortorder);
@@ -311,14 +307,11 @@ if ($modecompta == 'BOOKKEEPING')
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			print '<tr><td colspan="4" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 		}
-	}
-	else dol_print_error($db);
-}
-else {
+	} else dol_print_error($db);
+} else {
 	/*
 	 * Factures clients
 	 */
@@ -336,8 +329,7 @@ else {
 		else $sql .= " AND f.type IN (0,1,2,3,5)";
 	    if (!empty($date_start) && !empty($date_end))
 	    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-	}
-	elseif ($modecompta == 'RECETTES-DEPENSES')
+	} elseif ($modecompta == 'RECETTES-DEPENSES')
 	{
 		/*
 	     * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
@@ -462,8 +454,7 @@ else {
 		else $sql .= " AND f.type IN (0,1,2,3)";
 	    if (!empty($date_start) && !empty($date_end))
 	    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-	}
-	elseif ($modecompta == 'RECETTES-DEPENSES')
+	} elseif ($modecompta == 'RECETTES-DEPENSES')
 	{
 	    $sql = "SELECT s.nom as name, s.rowid as socid, sum(pf.amount) as amount_ttc";
 	    $sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
@@ -512,8 +503,7 @@ else {
 	            print "</tr>\n";
 	            $i++;
 	        }
-	    }
-	    else {
+	    } else {
 	        print '<tr class="oddeven"><td>&nbsp;</td>';
 	        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 	        print '</tr>';
@@ -546,8 +536,7 @@ else {
 	    $sql .= " AND c.deductible = 0";
 	    if (!empty($date_start) && !empty($date_end))
 	    	$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
-	}
-	elseif ($modecompta == 'RECETTES-DEPENSES')
+	} elseif ($modecompta == 'RECETTES-DEPENSES')
 	{
 	    $sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount";
 	    $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
@@ -591,8 +580,7 @@ else {
 	            print '</tr>';
 	            $i++;
 	        }
-	    }
-	    else {
+	    } else {
 	        print '<tr class="oddeven"><td>&nbsp;</td>';
 	        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 	        print '</tr>';
@@ -623,8 +611,7 @@ else {
 	    if (!empty($date_start) && !empty($date_end))
 	    	$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
 	    $sql .= " AND cs.entity = ".$conf->entity;
-	}
-	elseif ($modecompta == 'RECETTES-DEPENSES')
+	} elseif ($modecompta == 'RECETTES-DEPENSES')
 	{
 	    $sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount";
 	    $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
@@ -668,8 +655,7 @@ else {
 	            print '</tr>';
 	            $i++;
 	        }
-	    }
-	    else {
+	    } else {
 	        print '<tr class="oddeven"><td>&nbsp;</td>';
 	        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 	        print '</tr>';
@@ -761,14 +747,12 @@ else {
 		            print '</tr>';
 		            $i++;
 		        }
-		    }
-		    else {
+		    } else {
 		        print '<tr class="oddeven"><td>&nbsp;</td>';
 		        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 		        print '</tr>';
 		    }
-		}
-		else {
+		} else {
 		    dol_print_error($db);
 		}
 		print '<tr class="liste_total">';
@@ -845,14 +829,12 @@ else {
 					print '<td class="right">'.price(-$obj->amount_ttc).'</td>';
 					print '</tr>';
 				}
-			}
-			else {
+			} else {
 				print '<tr class="oddeven"><td>&nbsp;</td>';
 				print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 				print '</tr>';
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 		print '<tr class="liste_total">';
@@ -877,8 +859,7 @@ else {
 		    	$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
 		    	$sql .= " WHERE p.entity IN (".getEntity('donation').")";
 		    	$sql .= " AND fk_statut in (1,2)";
-			}
-			else {
+			} else {
 			    $sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
 			    $sql .= " FROM ".MAIN_DB_PREFIX."don as p";
 			    $sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
@@ -924,14 +905,12 @@ else {
 					print '</tr>';
 					$i++;
 				}
-			}
-			else {
+			} else {
 				print '<tr class="oddeven"><td>&nbsp;</td>';
 				print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 				print '</tr>';
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 		print '<tr class="liste_total">';
@@ -998,8 +977,7 @@ else {
                 print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
             print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
             print '</tr>';
-        }
-        else dol_print_error($db);
+        } else dol_print_error($db);
     }
 
     /*
@@ -1047,8 +1025,7 @@ else {
                 print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
             print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
             print '</tr>';
-        }
-        else dol_print_error($db);
+        } else dol_print_error($db);
     }
 
 	/*
@@ -1157,8 +1134,7 @@ else {
 		    print '<td class="right">&nbsp;</td>'."\n";
 		    print '<td class="right">'.price($amount)."</td>\n";
 		    print "</tr>\n";
-		}
-		else {
+		} else {
 		    // VAT really already paid
 		    $amount = 0;
 		    $sql = "SELECT date_format(t.datev,'%Y-%m') as dm, sum(t.amount) as amount";
@@ -1237,8 +1213,7 @@ else {
 		            }
 		        }
 		        $db->free($result);
-		    }
-		    else {
+		    } else {
 		        dol_print_error($db);
 		    }
 		    print '<tr class="oddeven"><td>&nbsp;</td>';
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 04bed25d6b2..7221e932ca6 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -78,8 +78,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			$month_end = $month_start - 1;
 			if ($month_end < 1) $month_end = 12;
 			else $year_end++;
-		}
-		else $month_end = $month_start;
+		} else $month_end = $month_start;
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	}
 	if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
@@ -134,8 +133,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	else $description .= "<br>".$langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES") {
+} elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByYear");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">', '</a>').')';
@@ -146,8 +144,7 @@ elseif ($modecompta == "RECETTES-DEPENSES") {
 	$description .= '<br>'.$langs->trans("RulesResultInOut");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByYear");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
@@ -191,8 +188,7 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 		else $sql .= " AND f.type IN (0,1,2,3,5)";
 	    if (!empty($date_start) && !empty($date_end))
 	    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-	}
-	elseif ($modecompta == "RECETTES-DEPENSES")
+	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		/*
 		 * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
@@ -228,12 +224,10 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 			$i++;
 		}
 		$db->free($result);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Nothing from this table
 }
@@ -274,17 +268,14 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
-	}
-	elseif ($modecompta == "RECETTES-DEPENSES")
+	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		// Nothing from this table
 	}
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Nothing from this table
 }
@@ -307,8 +298,7 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 		else $sql .= " AND f.type IN (0,1,2,3)";
     	if (!empty($date_start) && !empty($date_end))
     		$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-	}
-	elseif ($modecompta == "RECETTES-DEPENSES")
+	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		$sql = "SELECT sum(pf.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
 		$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
@@ -343,12 +333,10 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 			$i++;
 		}
 		$db->free($result);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Nothing from this table
 }
@@ -429,8 +417,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		} else {
 			dol_print_error($db);
 		}
-	}
-	elseif ($modecompta == "RECETTES-DEPENSES")
+	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		// TVA really already paid
 		$sql = "SELECT sum(t.amount) as amount, date_format(t.datev,'%Y-%m') as dm";
@@ -493,8 +480,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 			dol_print_error($db);
 		}
 	}
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Nothing from this table
 }
@@ -516,8 +502,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		$sql .= " AND c.deductible = 0";
     	if (!empty($date_start) && !empty($date_end))
     		$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
-	}
-	elseif ($modecompta == "RECETTES-DEPENSES")
+	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		$sql = "SELECT c.libelle as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
@@ -554,8 +539,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 	} else {
 		dol_print_error($db);
 	}
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Nothing from this table
 }
@@ -578,8 +562,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		$sql .= " AND c.deductible = 1";
     	if (!empty($date_start) && !empty($date_end))
     		$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
-	}
-	elseif ($modecompta == "RECETTES-DEPENSES")
+	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		$sql = "SELECT c.libelle as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
@@ -616,8 +599,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 	} else {
 		dol_print_error($db);
 	}
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Nothing from this table
 }
@@ -664,8 +646,7 @@ if (!empty($conf->salaries->enabled) && ($modecompta == 'CREANCES-DETTES' || $mo
 	} else {
 		dol_print_error($db);
 	}
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Nothing from this table
 }
@@ -723,12 +704,10 @@ if (!empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES' |
 				$decaiss_ttc[$obj->dm] += $obj->amount_ttc;
 			}
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
-}
-elseif ($modecompta == 'BOOKKEEPING') {
+} elseif ($modecompta == 'BOOKKEEPING') {
 	// Nothing from this table
 }
 
@@ -784,12 +763,10 @@ if (!empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
     			$i++;
     		}
     	}
-    }
-    else {
+    } else {
     	dol_print_error($db);
     }
-}
-elseif ($modecompta == 'BOOKKEEPING') {
+} elseif ($modecompta == 'BOOKKEEPING') {
 	// Nothing from this table
 }
 
@@ -823,8 +800,7 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->ba
     			$i++;
     		}
     	}
-    }
-    else {
+    } else {
     	dol_print_error($db);
     }
 
@@ -852,8 +828,7 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->ba
     			$i++;
     		}
     	}
-    }
-    else {
+    } else {
     	dol_print_error($db);
     }
 }
@@ -889,8 +864,7 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan
     			$i++;
     		}
     	}
-    }
-    else {
+    } else {
     	dol_print_error($db);
     }
 }
@@ -955,8 +929,7 @@ if (!empty($conf->accounting->enabled) && ($modecompta == 'BOOKKEEPING'))
 				$i++;
 			}
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -1035,8 +1008,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				if (!isset($totsorties[$annee])) $totsorties[$annee] = 0;
 				$totsorties[$annee] += $decaiss[$case];
 			}
-		}
-		else {
+		} else {
 			if (isset($decaiss_ttc[$case]) && $decaiss_ttc[$case] != 0)
 			{
 				print '<a href="clientfourn.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price(price2num($decaiss_ttc[$case], 'MT')).'</a>';
@@ -1055,8 +1027,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				if (!isset($totentrees[$annee])) $totentrees[$annee] = 0;
 				$totentrees[$annee] += $encaiss[$case];
 			}
-		}
-		else {
+		} else {
 			if (isset($encaiss_ttc[$case]))
 			{
 				print '<a href="clientfourn.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price(price2num($encaiss_ttc[$case], 'MT')).'</a>';
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 172929aabff..48cb8b1154e 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -90,8 +90,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			$month_end = $month_start - 1;
 			if ($month_end < 1) $month_end = 12;
 			else $year_end++;
-		}
-		else $month_end = $month_start;
+		} else $month_end = $month_start;
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	}
 	if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
@@ -181,8 +180,7 @@ if ($modecompta == "CREANCES-DETTES")
 	else $description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES") {
+} elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("AnnualByAccountInputOutputMode");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.(GETPOST("month") > 0 ? '&month='.GETPOST("month") : '').'&modecompta=CREANCES-DETTES">', '</a>').')';
@@ -192,8 +190,7 @@ elseif ($modecompta == "RECETTES-DEPENSES") {
 	$description = $langs->trans("RulesResultInOut");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPersonalizedAccountGroups");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
@@ -248,13 +245,11 @@ if ($modecompta == 'CREANCES-DETTES')
 {
 	//if (! empty($date_start) && ! empty($date_end))
 	//	$sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	//if (! empty($date_start) && ! empty($date_end))
 	//	$sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Get array of all report groups that are active
 	$cats = $AccCat->getCats(); // WARNING: Computed groups must be after group they include
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 0cb706d3177..f9d5a90d543 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -128,8 +128,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')
 	{
 		header("Location: list.php");
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -144,28 +143,23 @@ if ($action == 'add' && $user->rights->tax->charges->creer)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$action = 'create';
-	}
-	elseif (!$dateperiod)
+	} elseif (!$dateperiod)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Period")), null, 'errors');
 		$action = 'create';
-	}
-	elseif (!$actioncode > 0)
+	} elseif (!$actioncode > 0)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Type")), null, 'errors');
 		$action = 'create';
-	}
-	elseif (empty($amount))
+	} elseif (empty($amount))
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
-	}
-	elseif (!is_numeric($amount))
+	} elseif (!is_numeric($amount))
 	{
 		setEventMessages($langs->trans("ErrorFieldMustBeANumeric", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
-	}
-	else {
+	} else {
 		$object->type = $actioncode;
 		$object->label = GETPOST('label', 'alpha');
 		$object->date_ech = $dateech;
@@ -193,23 +187,19 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->cre
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$action = 'edit';
-	}
-	elseif (!$dateperiod)
+	} elseif (!$dateperiod)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Period")), null, 'errors');
 		$action = 'edit';
-	}
-	elseif (empty($amount))
+	} elseif (empty($amount))
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'edit';
-	}
-	elseif (!is_numeric($amount))
+	} elseif (!is_numeric($amount))
 	{
 		setEventMessages($langs->trans("ErrorFieldMustBeANumeric", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
-	}
-	else {
+	} else {
 		$result = $object->fetch($id);
 
 		$object->date_ech = $dateech;
@@ -242,16 +232,14 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
 
 		if (GETPOST('clone_label', 'alphanohtml')) {
 			$object->label = GETPOST('clone_label', 'alphanohtml');
-		}
-		else {
+		} else {
 			$object->label = $langs->trans("CopyOf").' '.$object->label;
 		}
 
 		if (GETPOST('clone_for_next_month', 'int')) {
 			$object->periode = dol_time_plus_duree($object->periode, 1, 'm');
 			$object->date_ech = dol_time_plus_duree($object->date_ech, 1, 'm');
-		}
-		else {
+		} else {
 			$newdateperiod = dol_mktime(0, 0, 0, GETPOST('clone_periodmonth', 'int'), GETPOST('clone_periodday', 'int'), GETPOST('clone_periodyear', 'int'));
 			$newdateech = dol_mktime(0, 0, 0, GETPOST('clone_date_echmonth', 'int'), GETPOST('clone_date_echday', 'int'), GETPOST('clone_date_echyear', 'int'));
 			if ($newdateperiod) $object->periode = $newdateperiod;
@@ -268,16 +256,14 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
 
 				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 				exit;
-			}
-			else {
+			} else {
 				$id = $originalId;
 				$db->rollback();
 
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-	else {
+	} else {
 		$db->rollback();
 		dol_print_error($db, $object->error);
 	}
@@ -426,8 +412,7 @@ if ($id > 0)
 			if (!empty($conf->global->TAX_ADD_CLON_FOR_NEXT_MONTH_CHECKBOX))
 			{
 				$formquestion[] = array('type' => 'checkbox', 'name' => 'clone_for_next_month', 'label' => $langs->trans("CloneTaxForNextMonth"), 'value' => 1);
-			}
-			else {
+			} else {
 				$formquestion[] = array('type' => 'date', 'name' => 'clone_date_ech', 'label' => $langs->trans("Date"), 'value' => -1);
 				$formquestion[] = array('type' => 'date', 'name' => 'clone_period', 'label' => $langs->trans("PeriodEndDate"), 'value' => -1);
 			}
@@ -529,8 +514,7 @@ if ($id > 0)
 		if ($action == 'edit')
 		{
 			print $form->selectDate($object->periode, 'period', 0, 0, 0, 'charge', 1);
-		}
-		else {
+		} else {
 			print dol_print_date($object->periode, "day");
 		}
 		print "</td></tr>";
@@ -541,8 +525,7 @@ if ($id > 0)
 			print '<tr><td>'.$langs->trans("AmountTTC")."</td><td>";
 			print '<input type="text" name="amount" size="12" class="flat" value="'.$object->amount.'">';
 			print "</td></tr>";
-		}
-		else {
+		} else {
 			print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 		}
 
@@ -667,8 +650,7 @@ if ($id > 0)
 					$totalpaye += $objp->amount;
 					$i++;
 				}
-			}
-			else {
+			} else {
 				print '<tr class="oddeven"><td><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 				print '<td></td><td></td><td></td><td></td>';
 				print '</tr>';
@@ -687,8 +669,7 @@ if ($id > 0)
 			print '</div>';
 
 			$db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -758,8 +739,7 @@ if ($id > 0)
 
 			print "</div>";
 		}
-	}
-	else {
+	} else {
 		/* Social contribution not found */
 		dol_print_error('', $object->error);
 	}
diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php
index b91d9ca31ee..cc66b56aabd 100644
--- a/htdocs/compta/sociales/class/cchargesociales.class.php
+++ b/htdocs/compta/sociales/class/cchargesociales.class.php
@@ -459,28 +459,23 @@ class Cchargesociales
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 0c709c031d5..81ae1e28f20 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -171,12 +171,10 @@ class ChargeSociales extends CommonObject
                 $this->db->free($resql);
 
                 return 1;
-            }
-            else {
+            } else {
                 return 0;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -250,13 +248,11 @@ class ChargeSociales extends CommonObject
 			if (empty($error)) {
 				$this->db->commit();
 				return $this->id;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				return -1 * $error;
 			}
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
@@ -325,8 +321,7 @@ class ChargeSociales extends CommonObject
         {
             $this->db->commit();
             return 1;
-        }
-        else {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -382,8 +377,7 @@ class ChargeSociales extends CommonObject
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -416,12 +410,10 @@ class ChargeSociales extends CommonObject
                 $obj = $this->db->fetch_object($result);
                 $this->db->free($result);
                 return $obj->amount;
-            }
-            else {
+            } else {
                 return 0;
             }
-        }
-        else {
+        } else {
             print $this->db->error();
             return -1;
         }
@@ -605,8 +597,7 @@ class ChargeSociales extends CommonObject
 
             $this->db->free($resql);
             return $amount;
-        }
-        else {
+        } else {
             return -1;
         }
     }
@@ -659,8 +650,7 @@ class ChargeSociales extends CommonObject
             }
 
             $this->db->free($result);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 9164ab39f1e..4cb81422284 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -194,13 +194,11 @@ class PaymentSocialContribution extends CommonObject
 							if ($remaintopay == 0)
 							{
 								$result = $contrib->set_paid($user);
-							}
-							else dol_syslog("Remain to pay for conrib ".$contribid." not null. We do nothing.");
+							} else dol_syslog("Remain to pay for conrib ".$contribid." not null. We do nothing.");
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				$error++;
 			}
 		}
@@ -214,8 +212,7 @@ class PaymentSocialContribution extends CommonObject
             $this->total = $totalamount; // deprecated
 		    $this->db->commit();
 			return $this->id;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -284,8 +281,7 @@ class PaymentSocialContribution extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -355,8 +351,7 @@ class PaymentSocialContribution extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -410,8 +405,7 @@ class PaymentSocialContribution extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -460,8 +454,7 @@ class PaymentSocialContribution extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -571,8 +564,7 @@ class PaymentSocialContribution extends CommonObject
                         if ($result <= 0) dol_print_error($this->db);
                     }
                 }
-            }
-            else {
+            } else {
                 $this->error = $acc->error;
                 $error++;
             }
@@ -581,8 +573,7 @@ class PaymentSocialContribution extends CommonObject
         if (!$error)
         {
             return 1;
-        }
-        else {
+        } else {
             return -1;
         }
     }
@@ -605,8 +596,7 @@ class PaymentSocialContribution extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return 0;
 		}
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index e63c5f354d0..e7d76b94a76 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -163,8 +163,7 @@ if ($object->id)
     $permtoedit = $user->rights->fournisseur->facture->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
     print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index be5f7e6f973..43823490ed9 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -80,8 +80,7 @@ if (!GETPOSTISSET('search_typeid'))
 		$part = explode(':', $val);
 		if ($part[0] == 'cs.fk_type') $search_typeid = $part[1];
 	}
-}
-else {
+} else {
 	$search_typeid = GETPOST('search_typeid', 'int');
 }
 
@@ -207,8 +206,7 @@ if ($resql)
 		$countrynotdefined = $langs->trans("ErrorSetACountryFirst");
 		print $countrynotdefined;
 		print '</div>';
-	}
-	else {
+	} else {
 	    print '<div class="div-table-responsive">';
 	    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
@@ -311,8 +309,7 @@ if ($resql)
 			if ($obj->periode)
 			{
 				print '<a href="list.php?year='.strftime("%Y", $db->jdate($obj->periode)).'">'.dol_print_date($db->jdate($obj->periode), 'day').'</a>';
-			}
-			else {
+			} else {
 				print '&nbsp;';
 			}
 			print "</td>\n";
@@ -342,8 +339,7 @@ if ($resql)
 		print '</div>';
 	}
 	print '</form>';
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index 05808877df9..fc1f66d5e2c 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -92,8 +92,7 @@ if ($mode != 'sconly')
 {
     $center = ($year ? '<a href="list.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="list.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'title_accountancy', 0, '', '', $limit, 1);
-}
-else {
+} else {
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'title_accountancy', 0, '', '', $limit);
 }
 
@@ -207,8 +206,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 	    print '<td align="center" class="liste_total">&nbsp;</td>';
 	    print '<td class="liste_total right">'.price($totalpaye)."</td>";
 		print "</tr>";
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 	print '</table>';
@@ -285,8 +283,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 
 		    print "</table>";
 		    $db->free($result);
-		}
-		else {
+		} else {
 		    dol_print_error($db);
 		}
 	}
@@ -297,18 +294,15 @@ if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
 {
 	$j = 1;
 	$numlt = 3;
-}
-elseif ($mysoc->localtax1_assuj == "1")
+} elseif ($mysoc->localtax1_assuj == "1")
 {
 	$j = 1;
 	$numlt = 2;
-}
-elseif ($mysoc->localtax2_assuj == "1")
+} elseif ($mysoc->localtax2_assuj == "1")
 {
 	$j = 2;
 	$numlt = 3;
-}
-else {
+} else {
 	$j = 0;
 	$numlt = 0;
 }
@@ -384,8 +378,7 @@ while ($j < $numlt)
 
 			print "</table>";
 			$db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -467,8 +460,7 @@ if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
             $db->free($result);
 
             print "<br>";
-        }
-        else {
+        } else {
             dol_print_error($db);
         }
     }
diff --git a/htdocs/compta/stats/byratecountry.php b/htdocs/compta/stats/byratecountry.php
index 3859b19df91..dc5ebd1731d 100644
--- a/htdocs/compta/stats/byratecountry.php
+++ b/htdocs/compta/stats/byratecountry.php
@@ -77,8 +77,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			else $year_end++;
 		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
-	}
-	else {
+	} else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -208,8 +207,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	}
 
 	$builddate = dol_now();
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByVatRate");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -219,11 +217,9 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description .= $langs->trans("DepositsAreIncluded");
 
 	$builddate = dol_now();
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
-}
-elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
 {
 }
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 513b0ffa350..ab2c1dcadb1 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -103,8 +103,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			else $year_end++;
 		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
-	}
-	else {
+	} else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -180,8 +179,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	}
 
 	$builddate = dol_now();
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByProductsAndServices");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -191,11 +189,9 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description .= $langs->trans("DepositsAreIncluded");
 
 	$builddate = dol_now();
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
-}
-elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
 {
 }
 
@@ -231,8 +227,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	if ($selected_cat === -2)	// Without any category
 	{
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
-	}
-	elseif ($selected_cat) 	// Into a specific category
+	} elseif ($selected_cat) 	// Into a specific category
 	{
 		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_product as cp";
 	}
@@ -254,8 +249,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	if ($selected_cat === -2)	// Without any category
 	{
 		$sql .= " AND cp.fk_product is null";
-	}
-	elseif ($selected_cat) {	// Into a specific category
+	} elseif ($selected_cat) {	// Into a specific category
 		$sql .= " AND (c.rowid = ".$selected_cat;
 		if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
 		$sql .= ")";
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 6d720b4f96d..8b6caa89a8f 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -96,8 +96,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 	if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
 	if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
-}
-else {
+} else {
 	// TODO We define q
 }
 // $date_start and $date_end are defined. We force $year_start and $nbofyear
@@ -156,8 +155,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	else $description .= $langs->trans("DepositsAreIncluded");
     $builddate = dol_now();
     //$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByUserAuthorOfInvoice");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -166,12 +164,10 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description .= $langs->trans("DepositsAreIncluded");
     $builddate = dol_now();
     //$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// TODO
-}
-elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
 {
 	// TODO
 }
@@ -395,8 +391,7 @@ if (count($amount)) {
             } else {
                 //print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid=-1">';
             }
-        }
-        elseif ($modecompta == 'CREANCES-DETTES') {
+        } elseif ($modecompta == 'CREANCES-DETTES') {
             if ($key > 0) {
                 print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?userid='.$key.'">';
             } else {
@@ -415,8 +410,7 @@ if (count($amount)) {
             } else {
                 //print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid=-1">';
             }
-        }
-        elseif ($modecompta == 'CREANCES-DETTES') {
+        } elseif ($modecompta == 'CREANCES-DETTES') {
             if ($key > 0) {
                 print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?userid='.$key.'">';
             } else {
@@ -430,8 +424,7 @@ if (count($amount)) {
         	} else {
         		//print '</a>';
         	}
-        }
-        elseif ($modecompta == 'CREANCES-DETTES') {
+        } elseif ($modecompta == 'CREANCES-DETTES') {
         	if ($key > 0) {
         		print '</a>';
         	}
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index 85a27c7574a..ab71b147b50 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -113,8 +113,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 	if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
 	if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
-}
-else {
+} else {
 	// TODO We define q
 }
 
@@ -182,8 +181,7 @@ if ($modecompta == "CREANCES-DETTES")
 	else $description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByThirdParties");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -192,11 +190,9 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
-}
-elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
 {
 }
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
@@ -222,8 +218,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
-	}
-	elseif ($selected_cat) 	// Into a specific category
+	} elseif ($selected_cat) 	// Into a specific category
 	{
 	    $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
@@ -240,8 +235,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " AND cs.fk_soc is null";
-	}
-	elseif ($selected_cat) {	// Into a specific category
+	} elseif ($selected_cat) {	// Into a specific category
 	    $sql .= " AND (c.rowid = ".$db->escape($selected_cat);
 	    if ($subcat) $sql .= " OR c.fk_parent = ".$db->escape($selected_cat);
 	    $sql .= ")";
@@ -260,8 +254,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
-	}
-	elseif ($selected_cat) 	// Into a specific category
+	} elseif ($selected_cat) 	// Into a specific category
 	{
 	    $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
@@ -274,8 +267,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " AND cs.fk_soc is null";
-	}
-	elseif ($selected_cat) {	// Into a specific category
+	} elseif ($selected_cat) {	// Into a specific category
 	    $sql .= " AND (c.rowid = ".$selected_cat;
 	    if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
 	    $sql .= ")";
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index cfc521c7c13..796ce2cc6a6 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -73,8 +73,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			}
 			$month_end = $month_start - 1;
 			if ($month_end < 1) $month_end = 12;
-		}
-		else $month_end = $month_start;
+		} else $month_end = $month_start;
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	}
 	if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
@@ -127,8 +126,7 @@ if ($modecompta == "CREANCES-DETTES")
 	else $description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("TurnoverCollected");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -140,8 +138,7 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$name = $langs->trans("Turnover");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
@@ -173,8 +170,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	else $sql .= " AND f.type IN (0,1,2,3,5)";
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
 	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	/*
 	 * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
@@ -188,8 +184,7 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$sql .= " AND pf.fk_facture = f.rowid";
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
 	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$sql = "SELECT date_format(b.doc_date,'%Y-%m') as dm, sum(b.credit) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b, ".MAIN_DB_PREFIX."accounting_journal as aj";
@@ -223,8 +218,7 @@ if ($result)
 		$i++;
 	}
 	$db->free($result);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -259,8 +253,7 @@ if ($modecompta == 'RECETTES-DEPENSES')
 			}
 			$i++;
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -338,10 +331,8 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				{
 					$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
 					print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price($cum_ht[$case], 1).'</a>';
-				}
-				else {
-					if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; }
-					else { print '&nbsp;'; }
+				} else {
+					if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print '&nbsp;'; }
 				}
 				print "</td>";
 			}
@@ -354,10 +345,8 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				if ($modecompta != 'BOOKKEEPING') print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">';
 				print price($cum[$case], 1);
 				if ($modecompta != 'BOOKKEEPING') print '</a>';
-			}
-			else {
-				if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; }
-				else { print '&nbsp;'; }
+			} else {
+				if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print '&nbsp;'; }
 			}
 			print "</td>";
 
@@ -387,11 +376,9 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				{
 					print '<td class="borderrightlight right">-</td>';
 				}
-			}
-			else {
+			} else {
 				print '<td class="borderrightlight right">';
-				if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; }
-				else { print '&nbsp;'; }
+				if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; } else { print '&nbsp;'; }
 				print '</td>';
 			}
 
@@ -479,8 +466,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 		if ($total_ht[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
 		{
 			print '<td class="nowrap right">'.($total_ht[$annee] ?price($total_ht[$annee]) : "0")."</td>";
-		}
-		else {
+		} else {
 			print '<td>&nbsp;</td>';
 		}
 	}
@@ -489,8 +475,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 	if ($total[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
 	{
 		print '<td class="nowrap right">'.($total[$annee] ?price($total[$annee]) : "0")."</td>";
-	}
-	else {
+	} else {
 		print '<td>&nbsp;</td>';
 	}
 
@@ -513,11 +498,9 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 		{
 			print '<td class="borderrightlight right">+0%</td>';
 		}
-	}
-	else {
+	} else {
 		print '<td class="borderrightlight right">';
-		if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; }
-		else { print '&nbsp;'; }
+		if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; } else { print '&nbsp;'; }
 		print '</td>';
 	}
 
diff --git a/htdocs/compta/stats/supplier_turnover.php b/htdocs/compta/stats/supplier_turnover.php
index e9e0ec5926c..c257d5d1f73 100644
--- a/htdocs/compta/stats/supplier_turnover.php
+++ b/htdocs/compta/stats/supplier_turnover.php
@@ -69,8 +69,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			}
 			$month_end = $month_start - 1;
 			if ($month_end < 1) $month_end = 12;
-		}
-		else $month_end = $month_start;
+		} else $month_end = $month_start;
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	}
 	if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
@@ -121,8 +120,7 @@ if ($modecompta == "CREANCES-DETTES")
 	$description = $langs->trans("RulesPurchaseTurnoverDue");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("PurchaseTurnoverCollected");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -133,8 +131,7 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description = $langs->trans("RulesPurchaseTurnoverIn");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$name = $langs->trans("PurchaseTurnover");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
@@ -165,8 +162,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	$sql .= " AND f.type IN (0,2)";
 	$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$sql = "SELECT date_format(p.datep,'%Y-%m') as dm, sum(pf.amount) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
@@ -176,8 +172,7 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$sql .= " AND pf.fk_facturefourn = f.rowid";
 	$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$sql = "SELECT date_format(b.doc_date,'%Y-%m') as dm, sum(b.debit) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b, ".MAIN_DB_PREFIX."accounting_journal as aj";
@@ -211,8 +206,7 @@ if ($result)
 		$i++;
 	}
 	$db->free($result);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -289,10 +283,8 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				{
 					$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
 					print '<a href="supplier_turnover_by_thirdparty.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price($cum_ht[$case], 1).'</a>';
-				}
-				else {
-					if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; }
-					else { print '&nbsp;'; }
+				} else {
+					if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print '&nbsp;'; }
 				}
 				print "</td>";
 			}
@@ -305,10 +297,8 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				if ($modecompta != 'BOOKKEEPING') print '<a href="supplier_turnover_by_thirdparty.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">';
 				print price($cum[$case], 1);
 				if ($modecompta != 'BOOKKEEPING') print '</a>';
-			}
-			else {
-				if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; }
-				else { print '&nbsp;'; }
+			} else {
+				if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print '&nbsp;'; }
 			}
 			print "</td>";
 
@@ -338,11 +328,9 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				{
 					print '<td class="borderrightlight right">-</td>';
 				}
-			}
-			else {
+			} else {
 				print '<td class="borderrightlight right">';
-				if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; }
-				else { print '&nbsp;'; }
+				if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; } else { print '&nbsp;'; }
 				print '</td>';
 			}
 
@@ -365,8 +353,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 		if ($total_ht[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
 		{
 			print '<td class="nowrap right">'.($total_ht[$annee] ?price($total_ht[$annee]) : "0")."</td>";
-		}
-		else {
+		} else {
 			print '<td>&nbsp;</td>';
 		}
 	}
@@ -375,8 +362,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 	if ($total[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
 	{
 		print '<td class="nowrap right">'.($total[$annee] ?price($total[$annee]) : "0")."</td>";
-	}
-	else {
+	} else {
 		print '<td>&nbsp;</td>';
 	}
 
@@ -399,11 +385,9 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 		{
 			print '<td class="borderrightlight right">+0%</td>';
 		}
-	}
-	else {
+	} else {
 		print '<td class="borderrightlight right">';
-		if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; }
-		else { print '&nbsp;'; }
+		if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; } else { print '&nbsp;'; }
 		print '</td>';
 	}
 
diff --git a/htdocs/compta/stats/supplier_turnover_by_prodserv.php b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
index 9b25488c280..5911daaba45 100644
--- a/htdocs/compta/stats/supplier_turnover_by_prodserv.php
+++ b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
@@ -100,8 +100,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			else $year_end++;
 		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
-	}
-	else {
+	} else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -171,8 +170,7 @@ if ($modecompta == "CREANCES-DETTES") {
 
 	$description = $langs->trans("RulesPurchaseTurnoverDue");
 	$builddate = dol_now();
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("PurchaseTurnoverCollected").', '.$langs->trans("ByProductsAndServices");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -180,11 +178,9 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description = $langs->trans("RulesPurchaseTurnoverIn");
 
 	$builddate = dol_now();
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
-}
-elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
 {
 }
 
@@ -220,8 +216,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	if ($selected_cat === -2)	// Without any category
 	{
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
-	}
-	elseif ($selected_cat) 	// Into a specific category
+	} elseif ($selected_cat) 	// Into a specific category
 	{
 		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_product as cp";
 	}
@@ -239,8 +234,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	if ($selected_cat === -2)	// Without any category
 	{
 		$sql .= " AND cp.fk_product is null";
-	}
-	elseif ($selected_cat) {	// Into a specific category
+	} elseif ($selected_cat) {	// Into a specific category
 		$sql .= " AND (c.rowid = ".$selected_cat;
 		if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
 		$sql .= ")";
diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index 76f9c246e87..60d65049800 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -107,8 +107,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 	if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
 	if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
-}
-else {
+} else {
 	// TODO We define q
 }
 
@@ -174,8 +173,7 @@ if ($modecompta == "CREANCES-DETTES")
 	$description = $langs->trans("RulesPurchaseTurnoverDue");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("PurchaseTurnoverCollected").', '.$langs->trans("ByThirdParties");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -183,11 +181,9 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description = $langs->trans("RulesPurchaseTurnoverIn");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
-}
-elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
 {
 }
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
@@ -214,8 +210,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
-	}
-	elseif ($selected_cat) 	// Into a specific category
+	} elseif ($selected_cat) 	// Into a specific category
 	{
 	    $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
@@ -228,8 +223,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " AND cs.fk_soc is null";
-	}
-	elseif ($selected_cat) {	// Into a specific category
+	} elseif ($selected_cat) {	// Into a specific category
 	    $sql .= " AND (c.rowid = ".$db->escape($selected_cat);
 	    if ($subcat) $sql .= " OR c.fk_parent = ".$db->escape($selected_cat);
 	    $sql .= ")";
@@ -244,8 +238,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
-	}
-	elseif ($selected_cat) 	// Into a specific category
+	} elseif ($selected_cat) 	// Into a specific category
 	{
 	    $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
@@ -258,8 +251,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " AND cs.fk_soc is null";
-	}
-	elseif ($selected_cat) {	// Into a specific category
+	} elseif ($selected_cat) {	// Into a specific category
 	    $sql .= " AND (c.rowid = ".$selected_cat;
 	    if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
 	    $sql .= ")";
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 3df7419019a..6fa22885dee 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -131,8 +131,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 			$db->commit();
 			header("Location: list.php");
 			exit;
-		}
-		else {
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = "create";
@@ -165,19 +164,16 @@ if ($action == 'delete')
 				$db->commit();
 				header("Location: ".DOL_URL_ROOT.'/compta/tva/list.php');
 				exit;
-			}
-			else {
+			} else {
 				$object->error = $accountline->error;
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-	    }
-	    else {
+	    } else {
 	        $db->rollback();
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
-	}
-	else {
+	} else {
 		$mesg = 'Error try do delete a line linked to a conciliated bank transaction';
 		setEventMessages($mesg, null, 'errors');
 	}
@@ -384,12 +380,10 @@ if ($id)
 		if (!empty($user->rights->tax->charges->supprimer))
 		{
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a></div>';
-		}
-		else {
+		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("NotAllowed"))).'">'.$langs->trans("Delete").'</a></div>';
 		}
-	}
-	else {
+	} else {
 		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("LinkedToAConciliatedTransaction").'">'.$langs->trans("Delete").'</a></div>';
 	}
 	print "</div>";
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index baeaff7a5d6..3274a3eaebd 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -150,13 +150,11 @@ class Tva extends CommonObject
             {
             	$this->db->commit();
             	return $this->id;
-            }
-            else {
+            } else {
 				$this->db->rollback();
 				return -1;
             }
-        }
-        else {
+        } else {
 			$this->error = "Error ".$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -222,8 +220,7 @@ class Tva extends CommonObject
     	{
     		$this->db->commit();
     		return 1;
-    	}
-    	else {
+    	} else {
     		$this->db->rollback();
     		return -1;
     	}
@@ -290,8 +287,7 @@ class Tva extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -400,13 +396,11 @@ class Tva extends CommonObject
 				$ret = $obj->amount;
                 $this->db->free($result);
                 return $ret;
-            }
-            else {
+            } else {
                 $this->db->free($result);
 				return 0;
             }
-        }
-        else {
+        } else {
             print $this->db->lasterror();
             return -1;
         }
@@ -439,13 +433,11 @@ class Tva extends CommonObject
                 $ret = $obj->total_tva;
             	$this->db->free($result);
                 return $ret;
-            }
-            else {
+            } else {
             	$this->db->free($result);
 				return 0;
             }
-        }
-        else {
+        } else {
             print $this->db->lasterror();
             return -1;
         }
@@ -480,13 +472,11 @@ class Tva extends CommonObject
                 $ret = $obj->amount;
             	$this->db->free($result);
                 return $ret;
-            }
-            else {
+            } else {
             	$this->db->free($result);
 				return 0;
             }
-        }
-        else {
+        } else {
             print $this->db->lasterror();
             return -1;
         }
@@ -602,8 +592,7 @@ class Tva extends CommonObject
                     if ($bank_line_id > 0)
 					{
                         $this->update_fk_bank($bank_line_id);
-                    }
-					else {
+                    } else {
 						$this->error = $acc->error;
 						$ok = 0;
 					}
@@ -621,18 +610,15 @@ class Tva extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					return -3;
 				}
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
@@ -655,8 +641,7 @@ class Tva extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -695,8 +680,7 @@ class Tva extends CommonObject
         	}
         	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
         	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $linkstart = '<a href="'.$url.'"';
         $linkstart .= $linkclose.'>';
@@ -737,8 +721,7 @@ class Tva extends CommonObject
 
             $this->db->free($resql);
             return $amount;
-        }
-        else {
+        } else {
             return -1;
         }
     }
@@ -783,8 +766,7 @@ class Tva extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index 158c974114d..52466e33d84 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -66,13 +66,11 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	$q = GETPOST("q", "int");
     if (empty($q))
     {
-        if (GETPOST("month", 'int')) { $date_start = dol_get_first_day($year_start, GETPOST("month", 'int'), false); $date_end = dol_get_last_day($year_start, GETPOST("month", 'int'), false); }
-        else {
+        if (GETPOST("month", 'int')) { $date_start = dol_get_first_day($year_start, GETPOST("month", 'int'), false); $date_end = dol_get_last_day($year_start, GETPOST("month", 'int'), false); } else {
             if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
             	$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
             	$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
-            }
-            elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
+            } elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
             	if ($current_date['mon'] < $conf->global->SOCIETE_FISCAL_MONTH_START) {
             		if (($conf->global->SOCIETE_FISCAL_MONTH_START - $current_date['mon']) > 6) {	// If period started from less than 6 years, we show past year
             			$year_start--;
@@ -84,14 +82,12 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
             	}
             	$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
             	$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
-            }
-            elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
+            } elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
             	$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -1, 'm');
             	$date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
             }
         }
-    }
-    else {
+    } else {
         if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
         if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
         if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -319,8 +315,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
                     'vat'				=>$x_paye[$my_paye_thirdpartyid]['vat_list'][$id],
                     'link'				=>$expensereport->getNomUrl(1)
                 );
-            }
-            else {
+            } else {
                 $invoice_supplier->id = $x_paye[$my_paye_thirdpartyid]['facid'][$id];
                 $invoice_supplier->ref = $x_paye[$my_paye_thirdpartyid]['facnum'][$id];
                 $invoice_supplier->type = $x_paye[$my_paye_thirdpartyid]['type'][$id];
@@ -690,8 +685,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
                             || ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
                         {
                             print $langs->trans("NA");
-                        }
-                        else {
+                        } else {
                             if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
                                 $ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
                             }
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index 45efc9681d8..cb26304cde5 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -148,8 +148,7 @@ if ($object->id)
     $permtoedit = $user->rights->fournisseur->facture->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
     print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index c85f2bbdb8f..43db8353c4c 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -57,13 +57,11 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	$q = GETPOST("q", "int");
 	if (empty($q))
 	{
-		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); }
-		else {
+		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); } else {
 			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
 				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
 				$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
-			}
-			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
+			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
 				if ($current_date['mon'] < $conf->global->SOCIETE_FISCAL_MONTH_START) {
 					if (($conf->global->SOCIETE_FISCAL_MONTH_START - $current_date['mon']) > 6) {	// If period started from less than 6 years, we show past year
 						$year_start--;
@@ -75,14 +73,12 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 				}
 				$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
 				$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
-			}
-			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
+			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
 				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -1, 'm');
 				$date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
 			}
 		}
-	}
-	else {
+	} else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -174,8 +170,7 @@ function pt($db, $sql, $date)
             	$amountpaid = 0;
             	$previousmode = '';
             	$previousmonth = '';
-            }
-            else {
+            } else {
             	$previousmode = $obj->mode;
             	$previousmonth = $obj->dm;
             }
@@ -204,8 +199,7 @@ function pt($db, $sql, $date)
         print "</table>";
 
         $db->free($result);
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -368,8 +362,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 				'vat'				=>$x_paye[$my_paye_rate]['vat_list'][$id],
 				//'link'				=>$expensereport->getNomUrl(1)
 				);
-			}
-			else {
+			} else {
 				//$invoice_supplier->id=$x_paye[$my_paye_rate]['facid'][$id];
 				//$invoice_supplier->ref=$x_paye[$my_paye_rate]['facnum'][$id];
 				//$invoice_supplier->type=$x_paye[$my_paye_rate]['type'][$id];
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 98eede887c8..5b09da5305c 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -72,8 +72,7 @@ if (empty($_REQUEST['typeid']))
 		$part = explode(':', $val);
 		if ($part[0] == 't.fk_typepayment') $typeid = $part[1];
 	}
-}
-else {
+} else {
 	$typeid = $_REQUEST['typeid'];
 }
 
@@ -227,8 +226,7 @@ if ($result)
 		if ($obj->payment_code <> '')
 		{
 			$type = '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
-		}
-		else {
+		} else {
 			$type = '<td>&nbsp;</td>';
 		}
 
@@ -264,8 +262,7 @@ if ($result)
 
 				$bankstatic->label = $obj->blabel;
 				print $bankstatic->getNomUrl(1);
-			}
-			else print '&nbsp;';
+			} else print '&nbsp;';
 			print '</td>';
 		}
 		// Amount
@@ -289,8 +286,7 @@ if ($result)
 	print '</form>';
 
     $db->free($result);
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index 6e16165ab6c..abd5fb6841c 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -66,13 +66,11 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	$q = GETPOST("q", "int");
 	if (empty($q))
 	{
-		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); }
-		else {
+		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); } else {
 			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
 				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
 				$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
-			}
-			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
+			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
 				if ($current_date['mon'] < $conf->global->SOCIETE_FISCAL_MONTH_START) {
 					if (($conf->global->SOCIETE_FISCAL_MONTH_START - $current_date['mon']) > 6) {	// If period started from less than 6 years, we show past year
 						$year_start--;
@@ -84,14 +82,12 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 				}
 				$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
 				$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
-			}
-			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
+			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
 				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -1, 'm');
 				$date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
 			}
 		}
-	}
-	else {
+	} else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -313,8 +309,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 				'vat'				=>$x_paye[$my_paye_rate]['vat_list'][$id],
 				'link'				=>$expensereport->getNomUrl(1)
 				);
-			}
-			else {
+			} else {
 				$invoice_supplier->id = $x_paye[$my_paye_rate]['facid'][$id];
 				$invoice_supplier->ref = $x_paye[$my_paye_rate]['facnum'][$id];
 				$invoice_supplier->type = $x_paye[$my_paye_rate]['type'][$id];
@@ -436,8 +431,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 					if (dol_string_nohtmltag($fields['descr'])) {
 						print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 					}
-				}
-				else {
+				} else {
 					if ($type) {
 						$text = img_object($langs->trans('Service'), 'service');
 					} else {
@@ -616,8 +610,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 					if (dol_string_nohtmltag($fields['descr'])) {
 						print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 					}
-				}
-				else {
+				} else {
 					if ($type) {
 						$text = img_object($langs->trans('Service'), 'service');
 					} else {
@@ -668,8 +661,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 						|| ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
 					{
 						print $langs->trans("NA");
-					}
-					else {
+					} else {
 						if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
 							$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
 						}
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 874a964a965..0ea0018632b 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -76,8 +76,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else {
+} else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -158,8 +157,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
  	}
    	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
     $objcanvas->display_canvas($action); // Show template
-}
-else {
+} else {
     // -----------------------------------------
     // When used in standard mode
     // -----------------------------------------
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index e005d3dca7b..415d9e47790 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -119,8 +119,7 @@ abstract class ActionsContactCardCommon
         	{
         		$this->tpl['company'] = $objsoc->getNomUrl(1);
         		$this->tpl['company_id'] = $objsoc->id;
-        	}
-        	else {
+        	} else {
         		$this->tpl['company'] = $form->select_company($this->object->socid, 'socid', '', 1);
         	}
 
@@ -207,8 +206,7 @@ abstract class ActionsContactCardCommon
 				$dolibarr_user = new User($this->db);
 				$result = $dolibarr_user->fetch($this->object->user_id);
 				$this->tpl['dolibarr_user'] = $dolibarr_user->getLoginUrl(1);
-			}
-			else $this->tpl['dolibarr_user'] = $langs->trans("NoDolibarrAccess");
+			} else $this->tpl['dolibarr_user'] = $langs->trans("NoDolibarrAccess");
         }
 
         if ($action == 'view' || $action == 'delete')
@@ -221,8 +219,7 @@ abstract class ActionsContactCardCommon
 
         		$objsoc->fetch($this->object->socid);
         		$this->tpl['company'] = $objsoc->getNomUrl(1);
-        	}
-        	else {
+        	} else {
         		$this->tpl['company'] = $langs->trans("ContactNotLinkedToCompany");
         	}
 
@@ -307,8 +304,7 @@ abstract class ActionsContactCardCommon
             if ($resql)
             {
                 $obj = $this->db->fetch_object($resql);
-            }
-            else {
+            } else {
                 dol_print_error($this->db);
             }
             $this->object->country_id = $langs->trans("Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->label;
diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
index 6ac81ac8bd4..099c973b0a4 100644
--- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php
+++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
@@ -104,8 +104,7 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
             $this->tpl['actionstodo'] = show_actions_todo($conf, $langs, $db, $objsoc, $this->object, 1);
 
             $this->tpl['actionsdone'] = show_actions_done($conf, $langs, $db, $objsoc, $this->object, 1);
-		}
-		else {
+		} else {
 			// Confirm delete contact
         	if ($action == 'delete' && $user->rights->societe->contact->supprimer)
         	{
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 885878138ba..6b73172decc 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -128,18 +128,15 @@ if (empty($reshook))
                 if ($result2)
                 {
                     $db->commit();
-                }
-                else {
+                } else {
                     $error = $nuser->error; $errors = $nuser->errors;
                     $db->rollback();
                 }
-            }
-            else {
+            } else {
                 $error = $nuser->error; $errors = $nuser->errors;
                 $db->rollback();
             }
-        }
-        else {
+        } else {
             $error = $object->error; $errors = $object->errors;
         }
     }
@@ -152,8 +149,7 @@ if (empty($reshook))
 		if ($object->setstatus(0) < 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else {
+		} else {
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
 			exit;
 		}
@@ -166,8 +162,7 @@ if (empty($reshook))
 		if ($object->setstatus(1) < 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else {
+		} else {
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
 			exit;
 		}
@@ -272,8 +267,7 @@ if (empty($reshook))
             else $url = 'card.php?id='.$id;
             header("Location: ".$url);
             exit;
-        }
-        else {
+        } else {
             $db->rollback();
         }
     }
@@ -293,13 +287,11 @@ if (empty($reshook))
         	{
         		header("Location: ".$backtopage);
         		exit;
-        	}
-        	else {
+        	} else {
         		header("Location: ".DOL_URL_ROOT.'/contact/list.php');
         		exit;
         	}
-        }
-        else {
+        } else {
             setEventMessages($object->error, $object->errors, 'errors');
         }
     }
@@ -342,20 +334,17 @@ if (empty($reshook))
                         if (!$result > 0)
                         {
                             $errors[] = "ErrorFailedToSaveFile";
-                        }
-                        else {
+                        } else {
                             $object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
 
     					    // Create thumbs
     					    $object->addThumbs($newfile);
                         }
                     }
-                }
-                else {
+                } else {
                     $errors[] = "ErrorBadImageFormat";
                 }
-            }
-            else {
+            } else {
                 switch ($_FILES['photo']['error'])
                 {
                     case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
@@ -440,8 +429,7 @@ if (empty($reshook))
 	    							$resql = $db->query($sql);
 	    						}
 	    					}
-	    				}
-	    				else {
+	    				} else {
 	    					$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = '".$db->escape($object->email)."' AND entity = ".$db->escape(getEntity('mailing', 0));
 	    					$resql = $db->query($sql);
 	    				}
@@ -452,8 +440,7 @@ if (empty($reshook))
     				$object->old_lastname = '';
     				$object->old_firstname = '';
     				$action = 'view';
-    			}
-    			else {
+    			} else {
     				setEventMessages($object->error, $object->errors, 'errors');
     				$action = 'edit';
     			}
@@ -512,8 +499,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
  	}
    	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
     $objcanvas->display_canvas($action); // Show template
-}
-else {
+} else {
     // -----------------------------------------
     // When used in standard mode
     // -----------------------------------------
@@ -632,8 +618,7 @@ else {
                     print '</td>';
                     print '<input type="hidden" name="socid" id="socid" value="'.$objsoc->id.'">';
                     print '</td></tr>';
-                }
-                else {
+                } else {
                     print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td><td colspan="3" class="maxwidthonsmartphone">';
                     print $form->select_company($socid, 'socid', '', 'SelectThirdParty');
                     print '</td></tr>';
@@ -688,16 +673,14 @@ else {
                 if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
                 {
                     print '<tr><td><label for="state_id">'.$langs->trans('Region-State').'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
-                }
-                else {
+                } else {
                     print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
                 }
 
                 if ($object->country_id)
                 {
                     print $formcompany->select_state(GETPOST("state_id", 'alpha') ? GETPOST("state_id", 'alpha') : $object->state_id, $object->country_code, 'state_id');
-                }
-                else {
+                } else {
                     print $countrynotdefined;
                 }
                 print '</td></tr>';
@@ -854,8 +837,7 @@ else {
             if ($object->birthday)
             {
                 print $form->selectDate($object->birthday, 'birthday', 0, 0, 0, "perso", 1, 0);
-            }
-            else {
+            } else {
                 print $form->selectDate('', 'birthday', 0, 0, 1, "perso", 1, 0);
             }
             print '</td>';
@@ -864,8 +846,7 @@ else {
             if ($object->birthday_alert)
             {
                 print '<input type="checkbox" name="birthday_alert" id="birthday_alert" checked>';
-            }
-            else {
+            } else {
                 print '<input type="checkbox" name="birthday_alert" id="birthday_alert">';
             }
             print '</td>';
@@ -881,16 +862,14 @@ else {
             {
                 print ' &nbsp; &nbsp; ';
                 print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-            }
-            else {
+            } else {
                 print ' &nbsp; &nbsp; ';
                 print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
             }
             print '</div>';
 
             print "</form>";
-        }
-        elseif ($action == 'edit' && !empty($id))
+        } elseif ($action == 'edit' && !empty($id))
         {
             /*
              * Fiche en mode edition
@@ -1011,8 +990,7 @@ else {
                 if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
                 {
                     print '<tr><td><label for="state_id">'.$langs->trans('Region-State').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
-                }
-                else {
+                } else {
                     print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
                 }
 
@@ -1049,8 +1027,7 @@ else {
                 $langs->load("mails");
                 print '<td class="nowrap">'.$langs->trans("NbOfEMailingsSend").'</td>';
                 print '<td>'.$object->getNbOfEMailings().'</td>';
-            }
-            else {
+            } else {
 				print '<td colspan="2"></td>';
             }
             print '</tr>';
@@ -1074,8 +1051,7 @@ else {
 
             	print '<td><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
 	            print '<td>'.$form->selectyesno('no_email', (GETPOSTISSET("no_email") ?GETPOST("no_email", 'alpha') : $noemail), 1).'</td>';
-            }
-            else {
+            } else {
 				print '<td colspan="2"></td>';
 			}
             print '</tr>';
@@ -1220,8 +1196,7 @@ else {
                 $dolibarr_user = new User($db);
                 $result = $dolibarr_user->fetch($object->user_id);
                 print $dolibarr_user->getLoginUrl(1);
-            }
-            else print $langs->trans("NoDolibarrAccess");
+            } else print $langs->trans("NoDolibarrAccess");
             print '</td></tr>';
 
             // Photo
@@ -1396,8 +1371,7 @@ else {
         if (!empty($conf->commande->enabled) || !empty($conf->expedition->enabled))
         {
             print '<tr><td>';
-            if (!empty($conf->expedition->enabled)) { print $langs->trans("ContactForOrdersOrShipments"); }
-            else print $langs->trans("ContactForOrders");
+            if (!empty($conf->expedition->enabled)) { print $langs->trans("ContactForOrdersOrShipments"); } else print $langs->trans("ContactForOrders");
             print '</td><td colspan="3">';
             $none = $langs->trans("NoContactForAnyOrder");
             if (!empty($conf->expedition->enabled)) { $none = $langs->trans("NoContactForAnyOrderOrShipments"); }
@@ -1425,8 +1399,7 @@ else {
             $dolibarr_user = new User($db);
             $result = $dolibarr_user->fetch($object->user_id);
             print $dolibarr_user->getLoginUrl(1);
-        }
-        else print $langs->trans("NoDolibarrAccess");
+        } else print $langs->trans("NoDolibarrAccess");
         print '</td></tr>';
 
         print '<tr><td>';
@@ -1456,8 +1429,7 @@ else {
 				{
 					$langs->load("mails");
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-				}
-				else {
+				} else {
 					$langs->load("mails");
 					print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
 				}
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index fc640e7e032..cfe41eafca2 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -287,8 +287,7 @@ class Contact extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -387,14 +386,12 @@ class Contact extends CommonObject
             {
                 $this->db->commit();
                 return $this->id;
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
                 return -2;
             }
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 
 			$this->db->rollback();
@@ -593,14 +590,12 @@ class Contact extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				dol_syslog(get_class($this)."::update Error ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -$error;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror().' sql='.$sql;
             $this->db->rollback();
 			return -1;
@@ -756,12 +751,10 @@ class Contact extends CommonObject
                     $error++;
                     $this->error = $this->db->lasterror();
 				}
-			}
-			else {
+			} else {
 				$result = true;
 			}
-		}
-		else {
+		} else {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_alert ";
 			$sql .= "WHERE type=1 AND fk_contact=".$this->db->escape($id)." AND fk_user=".$user->id;
 			$result = $this->db->query($sql);
@@ -784,8 +777,7 @@ class Contact extends CommonObject
 		{
 		    $this->db->commit();
 		    return 1;
-		}
-		else {
+		} else {
 		    dol_syslog(get_class($this)."::update Error ".$this->error, LOG_ERR);
 		    $this->db->rollback();
 		    return -$error;
@@ -858,8 +850,7 @@ class Contact extends CommonObject
 				dol_syslog($this->error, LOG_ERR);
 
 				return 2;
-			}
-			elseif ($num)   // $num = 1
+			} elseif ($num)   // $num = 1
 			{
 				$obj = $this->db->fetch_object($resql);
 
@@ -933,8 +924,7 @@ class Contact extends CommonObject
 						$this->user_id = $uobj->rowid;
 					}
 					$this->db->free($resql);
-				}
-				else {
+				} else {
 					$this->error = $this->db->error();
 					return -1;
 				}
@@ -960,8 +950,7 @@ class Contact extends CommonObject
 							$this->birthday_alert = 1;
 						}
 						$this->db->free($resql);
-					}
-					else {
+					} else {
 						$this->error = $this->db->error();
 						return -1;
 					}
@@ -976,13 +965,11 @@ class Contact extends CommonObject
 				}
 
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = $langs->trans("RecordNotFound");
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1003,8 +990,7 @@ class Contact extends CommonObject
 		if (in_array($this->civility_id, array('MR')) || in_array($this->civility_code, array('MR')))
 		{
 			$this->gender = 'man';
-		}
-		elseif (in_array($this->civility_id, array('MME', 'MLE')) || in_array($this->civility_code, array('MME', 'MLE')))
+		} elseif (in_array($this->civility_id, array('MME', 'MLE')) || in_array($this->civility_code, array('MME', 'MLE')))
 		{
 			$this->gender = 'woman';
 		}
@@ -1048,8 +1034,7 @@ class Contact extends CommonObject
 			}
 			$this->db->free($resql);
 			return 0;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1104,8 +1089,7 @@ class Contact extends CommonObject
 
 					$i++;
 				}
-			}
-			else {
+			} else {
 				$error++;
 				$this->error = $this->db->error().' sql='.$sql;
 			}
@@ -1171,8 +1155,7 @@ class Contact extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			dol_syslog("Error ".$this->error, LOG_ERR);
 			return -1;
@@ -1219,8 +1202,7 @@ class Contact extends CommonObject
 			}
 
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			print $this->db->error();
 		}
 	}
@@ -1245,8 +1227,7 @@ class Contact extends CommonObject
 
 			$this->db->free($resql);
 			return $nb;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1507,8 +1488,7 @@ class Contact extends CommonObject
 		{
 			$this->db->rollback();
 			return -$error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1661,8 +1641,7 @@ class Contact extends CommonObject
 			}
 
 			return $tab;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			dol_print_error($this->db);
 			return -1;
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index ff3570e7e82..7655e00ea3f 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -178,8 +178,7 @@ if ($type_element == 'fichinter')
 	$where = ' WHERE f.entity IN ('.getEntity('ficheinter').')';
 	$dateprint = 'f.datec';
 	$doc_number = 'f.ref';
-}
-elseif ($type_element == 'invoice')
+} elseif ($type_element == 'invoice')
 { 	// Customer : show products from invoices
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	$documentstatic = new Facture($db);
@@ -193,8 +192,7 @@ elseif ($type_element == 'invoice')
 	$dateprint = 'f.datef';
 	$doc_number = 'f.ref';
 	$thirdTypeSelect = 'customer';
-}
-elseif ($type_element == 'propal')
+} elseif ($type_element == 'propal')
 {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 	$documentstatic = new Propal($db);
@@ -208,8 +206,7 @@ elseif ($type_element == 'propal')
 	$datePrint = 'c.datep';
 	$doc_number = 'c.ref';
 	$thirdTypeSelect = 'customer';
-}
-elseif ($type_element == 'order')
+} elseif ($type_element == 'order')
 {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 	$documentstatic = new Commande($db);
@@ -223,8 +220,7 @@ elseif ($type_element == 'order')
 	$dateprint = 'c.date_commande';
 	$doc_number = 'c.ref';
 	$thirdTypeSelect = 'customer';
-}
-elseif ($type_element == 'supplier_invoice')
+} elseif ($type_element == 'supplier_invoice')
 { 	// Supplier : Show products from invoices.
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 	$documentstatic = new FactureFournisseur($db);
@@ -266,8 +262,7 @@ elseif ($type_element == 'supplier_order')
 	$dateprint = 'c.date_valid';
 	$doc_number = 'c.ref';
 	$thirdTypeSelect = 'supplier';
-}
-elseif ($type_element == 'contract')
+} elseif ($type_element == 'contract')
 { 	// Order
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 	$documentstatic = new Contrat($db);
@@ -423,8 +418,7 @@ if ($sql_select)
 		if ($type_element == 'contract')
 		{
 			print $documentstaticline->getLibStatut(2);
-		}
-		else {
+		} else {
 			print $documentstatic->getLibStatut(2);
 		}
 		print '</td>';
@@ -466,8 +460,7 @@ if ($sql_select)
 				}
 
 				$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
-			}
-			else {
+			} else {
 				$label = $objp->product_label;
 			}
 
@@ -499,27 +492,23 @@ if ($sql_select)
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
-				}
-				elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
+				} elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
 				{
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
-				}
-				elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
+				} elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
 				{
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 					// Add date of deposit
 					if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
-				}
-				else {
+				} else {
 					echo ($txt ? ' - ' : '').dol_htmlentitiesbr($objp->description);
 				}
 			}
-		}
-		else {
+		} else {
 			if ($objp->fk_product > 0) {
 				echo $form->textwithtooltip($text, $description, 3, '', '', $i, 0, '');
 
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index 7934bbd5996..f601086ad05 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -67,8 +67,7 @@ if ($action == 'dolibarr2ldap')
 	{
 		setEventMessages($langs->trans("ContactSynchronized"), null, 'mesgs');
 		$db->commit();
-	}
-	else {
+	} else {
 		setEventMessages($ldap->error, $ldap->errors, 'errors');
 		$db->rollback();
 	}
@@ -105,8 +104,7 @@ if ($object->socid > 0)
 	$thirdparty->fetch($object->socid);
 
 	print '<tr><td class="titlefield">'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$thirdparty->getNomUrl(1).'</td></tr>';
-}
-else {
+} else {
 	print '<tr><td class="titlefield">'.$langs->trans("ThirdParty").'</td><td colspan="3">';
 	print $langs->trans("ContactNotLinkedToCompany");
 	print '</td></tr>';
@@ -181,19 +179,16 @@ if ($result > 0)
 		if (!is_array($records))
 		{
 			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
-		}
-		else {
+		} else {
 			$result = show_ldap_content($records, 0, $records['count'], true);
 		}
-	}
-	else {
+	} else {
 		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
 	}
 
 	$ldap->unbind();
 	$ldap->close();
-}
-else {
+} else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
 
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index a6add5c7d75..fe80e709b28 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -123,14 +123,12 @@ if ($type == "c")
 	if (empty($contextpage) || $contextpage == 'contactlist') $contextpage = 'contactcustomerlist';
 	$titre .= '  ('.$langs->trans("ThirdPartyCustomers").')';
 	$urlfiche = "card.php";
-}
-elseif ($type == "f")
+} elseif ($type == "f")
 {
 	if (empty($contextpage) || $contextpage == 'contactlist') $contextpage = 'contactsupplierlist';
 	$titre .= ' ('.$langs->trans("ThirdPartySuppliers").')';
 	$urlfiche = "card.php";
-}
-elseif ($type == "o")
+} elseif ($type == "o")
 {
 	if (empty($contextpage) || $contextpage == 'contactlist') $contextpage = 'contactotherlist';
 	$titre .= ' ('.$langs->trans("OthersNotLinkedToThirdParty").')';
@@ -326,8 +324,7 @@ if (!empty($userid))    // propre au commercial
 if ($search_priv != '0' && $search_priv != '1')
 {
 	$sql .= " AND (p.priv='0' OR (p.priv='1' AND p.fk_user_creat=".$user->id."))";
-}
-else {
+} else {
 	if ($search_priv == '0') $sql .= " AND p.priv='0'";
 	if ($search_priv == '1') $sql .= " AND (p.priv='1' AND p.fk_user_creat=".$user->id.")";
 }
@@ -375,16 +372,13 @@ if ($search_import_key)             $sql .= natural_search("p.import_key", $sear
 if ($type == "o")        // filtre sur type
 {
 	$sql .= " AND p.fk_soc IS NULL";
-}
-elseif ($type == "f")        // filtre sur type
+} elseif ($type == "f")        // filtre sur type
 {
 	$sql .= " AND s.fournisseur = 1";
-}
-elseif ($type == "c")        // filtre sur type
+} elseif ($type == "c")        // filtre sur type
 {
 	$sql .= " AND s.client IN (1, 3)";
-}
-elseif ($type == "p")        // filtre sur type
+} elseif ($type == "p")        // filtre sur type
 {
 	$sql .= " AND s.client IN (2, 3)";
 }
@@ -402,8 +396,7 @@ $sql .= $hookmanager->resPrint;
 if ($view == "recent")
 {
 	$sql .= $db->order("p.datec", "DESC");
-}
-else {
+} else {
 	$sql .= $db->order($sortfield, $sortorder);
 }
 
@@ -920,8 +913,7 @@ while ($i < min($num, $limit))
 		    $objsoc = new Societe($db);
 		    $objsoc->fetch($obj->socid);
 		    print $objsoc->getNomUrl(1);
-		}
-		else print '&nbsp;';
+		} else print '&nbsp;';
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 5665030b6d5..a5a1714b6e5 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -85,18 +85,15 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->societe->contact-
 					if (!dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1, 0, $_FILES['photo']['error']) > 0)
 					{
 						setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
-					}
-					else {
+					} else {
 					    // Create thumbs
 					    $object->addThumbs($newfile);
 					}
 				}
-			}
-			else {
+			} else {
 				setEventMessages("ErrorBadImageFormat", null, 'errors');
 			}
-		}
-		else {
+		} else {
 			switch ($_FILES['photo']['error'])
 			{
 				case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
@@ -108,8 +105,7 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->societe->contact-
 					break;
 			}
 		}
-	}
-	else {
+	} else {
 		$error = $object->error;
 	}
 }
@@ -179,8 +175,7 @@ if ($action == 'edit')
             $objsoc->fetch($object->socid);
 
             print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td>';
-        }
-        else {
+        } else {
             print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
             print $langs->trans("ContactNotLinkedToCompany");
             print '</td></tr>';
@@ -202,8 +197,7 @@ if ($action == 'edit')
     if (!empty($object->birthday_alert))
     {
         print '<input type="checkbox" name="birthday_alert" checked></td>';
-    }
-    else {
+    } else {
         print '<input type="checkbox" name="birthday_alert"></td>';
     }
     print '</tr>';
@@ -219,8 +213,7 @@ if ($action == 'edit')
     print '</div>';
 
     print "</form>";
-}
-else {
+} else {
     // View mode
 
     dol_fiche_head($head, 'perso', $title, -1, 'contact');
@@ -294,8 +287,7 @@ else {
         if ($object->birthday_alert) print $langs->trans("BirthdayAlertOn");
         else print $langs->trans("BirthdayAlertOff");
         print '</td>';
-    }
-    else {
+    } else {
         print '<td>'.$langs->trans("DateToBirth").'</td><td colspan="3"></td>';
     }
     print "</tr>";
diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index 36a9c950069..d016cb23d75 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -39,8 +39,7 @@ if (GETPOST('actioncode', 'array'))
 {
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
-}
-else {
+} else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 7a2f8cf311f..c4f923a7372 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -112,13 +112,10 @@ if (empty($reshook))
 		{
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'confirm_closeline' && $confirm == 'yes' && $user->rights->contrat->activer)
+	} elseif ($action == 'confirm_closeline' && $confirm == 'yes' && $user->rights->contrat->activer)
 	{
 		if (!GETPOST('dateend'))
 		{
@@ -132,8 +129,7 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -301,13 +297,11 @@ if (empty($reshook))
 										}
 
 										$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $lines[$i]->product_label;
-									}
-									else {
+									} else {
 										$label = $lines[$i]->product_label;
 									}
 									$desc = ($lines[$i]->desc && $lines[$i]->desc != $lines[$i]->libelle) ?dol_htmlentitiesbr($lines[$i]->desc) : '';
-								}
-								else {
+								} else {
 									$desc = dol_htmlentitiesbr($lines[$i]->desc);
 								}
 
@@ -352,8 +346,7 @@ if (empty($reshook))
 								}
 							}
 						}
-					}
-					else {
+					} else {
 						setEventMessages($srcobject->error, $srcobject->errors, 'errors');
 						$error++;
 					}
@@ -364,28 +357,23 @@ if (empty($reshook))
 					// modified by hook
 					if ($reshook < 0)
 						$error++;
-				}
-				else {
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 				}
-			}
-			else {
+			} else {
 				$result = $object->create($user);
 				if ($result > 0)
 				{
 					header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
-				}
-				else {
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 				$action = 'create';
 			}
 		}
-	}
-
-	elseif ($action == 'classin' && $user->rights->contrat->creer)
+	} elseif ($action == 'classin' && $user->rights->contrat->creer)
 	{
 		$object->setProject(GETPOST('projectid'));
 	}
@@ -402,8 +390,7 @@ if (empty($reshook))
 		{
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0);
-		}
-		else {
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
@@ -474,8 +461,7 @@ if (empty($reshook))
 					$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
 					$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
 					$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
-				}
-				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+				} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
 					require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
@@ -507,8 +493,7 @@ if (empty($reshook))
 					if ($price_base_type != 'HT')
 					{
 						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
-					}
-					else {
+					} else {
 						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 					}
 				}
@@ -518,8 +503,7 @@ if (empty($reshook))
 				else $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 
 				$fk_unit = $prod->fk_unit;
-			}
-			else {
+			} else {
 				$pu_ht = GETPOST('price_ht');
 				$price_base_type = 'HT';
 				$tva_tx = GETPOST('tva_tx') ?str_replace('*', '', GETPOST('tva_tx')) : 0; // tva_tx field may be disabled, so we use vat rate 0
@@ -545,8 +529,7 @@ if (empty($reshook))
 			{
 				$object->error = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
 				$result = -1;
-			}
-			else {
+			} else {
 				// Insert line
 				$result = $object->addline(
 					$desc,
@@ -619,14 +602,11 @@ if (empty($reshook))
 				unset($_POST['date_endday']);
 				unset($_POST['date_endmonth']);
 				unset($_POST['date_endyear']);
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	elseif ($action == 'updateline' && $user->rights->contrat->creer && !GETPOST('cancel', 'alpha')) {
+	} elseif ($action == 'updateline' && $user->rights->contrat->creer && !GETPOST('cancel', 'alpha')) {
 		$error = 0;
 
 		if (!empty($date_start_update) && !empty($date_end_update) && $date_start_update > $date_end_update)
@@ -732,13 +712,10 @@ if (empty($reshook))
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 		}
-	}
-
-	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->contrat->creer)
+	} elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 		$result = $object->deleteline(GETPOST('lineid'), $user);
 
@@ -746,13 +723,10 @@ if (empty($reshook))
 		{
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->contrat->creer)
+	} elseif ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 		$result = $object->validate($user);
 
@@ -774,13 +748,10 @@ if (empty($reshook))
 
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'reopen' && $user->rights->contrat->creer)
+	} elseif ($action == 'reopen' && $user->rights->contrat->creer)
 	{
 		$result = $object->reopen($user);
 		if ($result < 0)
@@ -807,22 +778,17 @@ if (empty($reshook))
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)
 	{
 		$result = $object->delete($user);
 		if ($result >= 0)
 		{
 			header("Location: list.php?restore_lastsearch_values=1");
 			return;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contrat->creer)
+	} elseif ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 		if (GETPOST('newcid') > 0)
 		{
@@ -834,16 +800,13 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 				return;
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("RefNewContract")), null, 'errors');
 		}
-	}
-	elseif ($action == 'update_extras')
+	} elseif ($action == 'update_extras')
 	{
 		$object->oldcopy = dol_clone($object);
 
@@ -863,8 +826,7 @@ if (empty($reshook))
 		if ($error) {
 			$action = 'edit_extras';
 		}
-	}
-	elseif ($action == 'setref_supplier')
+	} elseif ($action == 'setref_supplier')
 	{
 		$cancelbutton = GETPOST('cancel', 'alpha');
 		if (!$cancelbutton) {
@@ -878,13 +840,11 @@ if (empty($reshook))
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
-		}
-		else {
+		} else {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 			exit;
 		}
-	}
-	elseif ($action == 'setref_customer')
+	} elseif ($action == 'setref_customer')
 	{
 		$cancelbutton = GETPOST('cancel', 'alpha');
 
@@ -900,13 +860,11 @@ if (empty($reshook))
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
-		}
-		else {
+		} else {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 			exit;
 		}
-	}
-	elseif ($action == 'setref')
+	} elseif ($action == 'setref')
 	{
 		$cancelbutton = GETPOST('cancel', 'alpha');
 
@@ -940,13 +898,11 @@ if (empty($reshook))
 	            header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 	            exit;
 	        }
-	    }
-	    else {
+	    } else {
 	        header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 	        exit;
 	    }
-	}
-	elseif ($action == 'setdate_contrat')
+	} elseif ($action == 'setdate_contrat')
 	{
 		$cancelbutton = GETPOST('cancel', 'alpha');
 
@@ -964,8 +920,7 @@ if (empty($reshook))
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
-		}
-		else {
+		} else {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 			exit;
 		}
@@ -996,14 +951,12 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else {
+			} else {
 				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-				}
-				else {
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
@@ -1024,8 +977,7 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -1037,8 +989,7 @@ if (empty($reshook))
 		if (!GETPOST('socid', 3))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else {
+		} else {
 			if ($object->id > 0) {
 				$result = $object->createFromClone($user, $socid);
 				if ($result > 0) {
@@ -1098,8 +1049,7 @@ if ($action == 'create')
 		if ($element == 'project')
 		{
 			$projectid = GETPOST('originid');
-		}
-		else {
+		} else {
 			// For compatibility
 			if ($element == 'order' || $element == 'commande') { $element = $subelement = 'commande'; }
 			if ($element == 'propal') { $element = 'comm/propal'; $subelement = 'propal'; }
@@ -1126,8 +1076,7 @@ if ($action == 'create')
 			// Object source contacts list
 			$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);
 		}
-	}
-	else {
+	} else {
 		$projectid = GETPOST('projectid', 'int');
 		$note_private = GETPOST("note_private");
 		$note_public = GETPOST("note_public");
@@ -1173,8 +1122,7 @@ if ($action == 'create')
 		print $soc->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$soc->id.'">';
 		print '</td>';
-	}
-	else {
+	} else {
 		print '<td>';
 		print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300');
 		print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="valignmiddle text-plus-circle">'.$langs->trans("AddThirdParty").'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
@@ -1268,8 +1216,7 @@ if ($action == 'create')
 	}
 
 	print "</form>\n";
-}
-else /* *************************************************************************** */
+} else /* *************************************************************************** */
 /*                                                                             */
 /* Mode vue et edition                                                         */
 /*                                                                             */
@@ -1575,8 +1522,7 @@ else /* ************************************************************************
 						echo $form->textwithtooltip($text, $description, 3, '', '', $cursorline, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
 
 						print '</td>';
-					}
-					else {
+					} else {
 						print '<td>'.img_object($langs->trans("ShowProductOrService"), ($objp->product_type ? 'service' : 'product')).' '.dol_htmlentitiesbr($objp->description)."</td>\n";
 					}
 					// VAT
@@ -1597,8 +1543,7 @@ else /* ************************************************************************
 					if ($objp->remise_percent > 0)
 					{
 						print '<td class="right">'.$objp->remise_percent."%</td>\n";
-					}
-					else {
+					} else {
 						print '<td>&nbsp;</td>';
 					}
 
@@ -1655,8 +1600,7 @@ else /* ************************************************************************
 								$textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
 								print " ".img_warning($textlate);
 							}
-						}
-						else print $langs->trans("Unknown");
+						} else print $langs->trans("Unknown");
 						print ' &nbsp;-&nbsp; ';
 						print $langs->trans("DateEndPlanned").': ';
 						if ($objp->date_fin)
@@ -1667,8 +1611,7 @@ else /* ************************************************************************
 								$textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
 								print " ".img_warning($textlate);
 							}
-						}
-						else print $langs->trans("Unknown");
+						} else print $langs->trans("Unknown");
 
 						print '</td>';
 						print '</tr>';
@@ -1696,8 +1639,7 @@ else /* ************************************************************************
 						print $productstatic->getNomUrl(1, '', 32);
 						print $objp->label ? ' - '.dol_trunc($objp->label, 32) : '';
 						print '<br>';
-					}
-					else {
+					} else {
 						print $objp->label ? $objp->label.'<br>' : '';
 					}
 
@@ -1773,8 +1715,7 @@ else /* ************************************************************************
 				}
 
 				$db->free($result);
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 
@@ -1844,8 +1785,7 @@ else /* ************************************************************************
 				if (empty($dateactend))
 				{
 					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEndReal")), null, 'errors');
-				}
-				else {
+				} else {
 					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne', 'int')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService", dol_print_date($dateactend, "%A %d %B %Y")), "confirm_closeline", '', 0, 1);
 				}
 				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
@@ -2121,8 +2061,7 @@ else /* ************************************************************************
 					if ($user->rights->contrat->activer)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" id="btnactivateall" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=activate">'.$langs->trans("ActivateAllContracts").'</a></div>';
-					}
-					else {
+					} else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" id="btnactivateall" href="#">'.$langs->trans("ActivateAllContracts").'</a></div>';
 					}
 				}
@@ -2131,8 +2070,7 @@ else /* ************************************************************************
 					if ($user->rights->contrat->desactiver)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" id="btncloseall" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=close">'.$langs->trans("CloseAllContracts").'</a></div>';
-					}
-					else {
+					} else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" id="btncloseall" href="#">'.$langs->trans("CloseAllContracts").'</a></div>';
 					}
 
@@ -2151,8 +2089,7 @@ else /* ************************************************************************
 				if (($user->rights->contrat->creer && $object->statut == 0) || $user->rights->contrat->supprimer)
 				{
 					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a></div>';
-				}
-				else {
+				} else {
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("Delete").'</a></div>';
 				}
 			}
diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php
index 9caa33fca2d..ffe66208afe 100644
--- a/htdocs/contrat/class/api_contracts.class.php
+++ b/htdocs/contrat/class/api_contracts.class.php
@@ -169,8 +169,7 @@ class Contracts extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve contrat list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -464,8 +463,7 @@ class Contracts extends DolibarrApi
         $updateRes = $this->contract->deleteline($lineid, DolibarrApiAccess::$user);
         if ($updateRes > 0) {
             return $this->get($id);
-        }
-        else {
+        } else {
               throw new RestException(405, $this->contract->error);
         }
     }
@@ -500,8 +498,7 @@ class Contracts extends DolibarrApi
         if ($this->contract->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else {
+        } else {
             throw new RestException(500, $this->contract->error);
         }
     }
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 304628d97cc..a702847e23b 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -298,14 +298,12 @@ class Contrat extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else {
+			} else {
 				$this->error = $obj->error;
 				dol_print_error($db, get_class($this)."::getNextValue ".$obj->error);
 				return "";
 			}
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Contract"));
 			return "";
@@ -408,8 +406,7 @@ class Contrat extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -464,8 +461,7 @@ class Contrat extends CommonObject
         {
             $this->db->commit();
             return 1;
-        }
-        else {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -504,12 +500,10 @@ class Contrat extends CommonObject
 		if ($force_number)
 		{
 			$num = $force_number;
-		}
-		elseif (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+		} elseif (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$num = $this->getNextNumRef($this->thirdparty);
-		}
-		else {
+		} else {
 			$num = $this->ref;
 		}
         $this->newref = dol_sanitizeFileName($num);
@@ -586,8 +580,7 @@ class Contrat extends CommonObject
 				$this->brouillon = 0;
 				$this->date_validation = $now;
 			}
-		}
-		else {
+		} else {
 			$error++;
 		}
 
@@ -595,8 +588,7 @@ class Contrat extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -659,8 +651,7 @@ class Contrat extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -712,8 +703,7 @@ class Contrat extends CommonObject
 				$this->error = 'Fetch found several records.';
 				dol_syslog($this->error, LOG_ERR);
 				$result = -2;
-			}
-			elseif ($num)   // $num = 1
+			} elseif ($num)   // $num = 1
 			{
 				$obj = $this->db->fetch_object($resql);
 				if ($obj)
@@ -762,14 +752,12 @@ class Contrat extends CommonObject
 
 					return $this->id;
 				}
-			}
-			else {
+			} else {
 				dol_syslog(get_class($this)."::fetch Contract not found");
 				$this->error = "Contract not found";
 				return 0;
 			}
-		}
-		else {
+		} else {
 			dol_syslog(get_class($this)."::fetch Error searching contract");
 			$this->error = $this->db->error();
 			return -1;
@@ -929,8 +917,7 @@ class Contrat extends CommonObject
 				$pos++;
 			}
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_syslog(get_class($this)."::Fetch Error when reading lines of contracts linked to products");
 			return -3;
 		}
@@ -1070,8 +1057,7 @@ class Contrat extends CommonObject
     			                    $error++;
     			                }
     			            }
-    			        }
-    			        else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+    			        } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
     			        {
     			            $origin_id = $tmp_origin_id;
     			            $ret = $this->add_object_linked($origin, $origin_id);
@@ -1118,8 +1104,7 @@ class Contrat extends CommonObject
     			            //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
     			            $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
     			        }
-    			    }
-    			    else dol_print_error($resqlcontact);
+    			    } else dol_print_error($resqlcontact);
     			}
 			}
 
@@ -1134,21 +1119,18 @@ class Contrat extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else {
+				} else {
 					dol_syslog(get_class($this)."::create - 30 - ".$this->error, LOG_ERR);
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else {
+			} else {
 				$this->error = "Failed to add contract";
 				dol_syslog(get_class($this)."::create - 20 - ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->trans("UnknownError: ".$this->db->error()." -", LOG_DEBUG);
 
 			$this->db->rollback();
@@ -1317,8 +1299,7 @@ class Contrat extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1411,8 +1392,7 @@ class Contrat extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1489,8 +1469,7 @@ class Contrat extends CommonObject
 			if ($price_base_type == 'HT')
 			{
 				$pu = $pu_ht;
-			}
-			else {
+			} else {
 				$pu = $pu_ttc;
 			}
 
@@ -1541,8 +1520,7 @@ class Contrat extends CommonObject
 				if (($result = $this->defineBuyPrice($pu_ht, $remise_percent, $fk_product)) < 0)
 				{
 					return $result;
-				}
-				else {
+				} else {
 					$pa_ht = $result;
 				}
 			}
@@ -1613,19 +1591,16 @@ class Contrat extends CommonObject
 				{
 					$this->db->rollback();
 					return -1;
-				}
-				else {
+				} else {
 					$this->db->commit();
 					return $contractlineid;
 				}
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->error()." sql=".$sql;
 				return -1;
 			}
-		}
-		else {
+		} else {
 			dol_syslog(get_class($this)."::addline ErrorTryToAddLineOnValidatedContract", LOG_ERR);
 			return -2;
 		}
@@ -1677,8 +1652,7 @@ class Contrat extends CommonObject
 		{
 			$remise = round(($pu * $remise_percent / 100), 2);
 			$price = $pu - $remise;
-		}
-		else {
+		} else {
 			$remise_percent = 0;
 		}
 
@@ -1728,8 +1702,7 @@ class Contrat extends CommonObject
 			if (($result = $this->defineBuyPrice($pu, $remise_percent)) < 0)
 			{
 				return $result;
-			}
-			else {
+			} else {
 				$pa_ht = $result;
 			}
 		}
@@ -1752,14 +1725,10 @@ class Contrat extends CommonObject
 		$sql .= ", total_ttc='".price2num($total_ttc)."'";
 		$sql .= ", fk_product_fournisseur_price=".($fk_fournprice > 0 ? $fk_fournprice : "null");
 		$sql .= ", buy_price_ht='".price2num($pa_ht)."'";
-		if ($date_start > 0) { $sql .= ",date_ouverture_prevue='".$this->db->idate($date_start)."'"; }
-		else { $sql .= ",date_ouverture_prevue=null"; }
-		if ($date_end > 0) { $sql .= ",date_fin_validite='".$this->db->idate($date_end)."'"; }
-		else { $sql .= ",date_fin_validite=null"; }
-		if ($date_debut_reel > 0) { $sql .= ",date_ouverture='".$this->db->idate($date_debut_reel)."'"; }
-		else { $sql .= ",date_ouverture=null"; }
-		if ($date_fin_reel > 0) { $sql .= ",date_cloture='".$this->db->idate($date_fin_reel)."'"; }
-		else { $sql .= ",date_cloture=null"; }
+		if ($date_start > 0) { $sql .= ",date_ouverture_prevue='".$this->db->idate($date_start)."'"; } else { $sql .= ",date_ouverture_prevue=null"; }
+		if ($date_end > 0) { $sql .= ",date_fin_validite='".$this->db->idate($date_end)."'"; } else { $sql .= ",date_fin_validite=null"; }
+		if ($date_debut_reel > 0) { $sql .= ",date_ouverture='".$this->db->idate($date_debut_reel)."'"; } else { $sql .= ",date_ouverture=null"; }
+		if ($date_fin_reel > 0) { $sql .= ",date_cloture='".$this->db->idate($date_fin_reel)."'"; } else { $sql .= ",date_cloture=null"; }
 		$sql .= ", fk_unit=".($fk_unit ? "'".$this->db->escape($fk_unit)."'" : "null");
 		$sql .= " WHERE rowid = ".$rowid;
 
@@ -1802,14 +1771,12 @@ class Contrat extends CommonObject
 					$this->db->commit();
 					return 1;
 				}
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::updateline Erreur -2");
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this)."::updateline Erreur -1");
@@ -1870,8 +1837,7 @@ class Contrat extends CommonObject
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -2;
 		}
@@ -1967,8 +1933,7 @@ class Contrat extends CommonObject
 			$text .= ($mode != 7 || $this->nbofservicesclosed > 0) ? ($this->nbofservicesclosed.ContratLigne::LibStatut(5, 3, -1, 'class="marginleft2"')) : '';
 			$text .= ($mode == 7 ? '</span>' : '');
 			return $text;
-		}
-		else {
+		} else {
 			return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 		}
 	}
@@ -2086,8 +2051,7 @@ class Contrat extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -2122,8 +2086,7 @@ class Contrat extends CommonObject
 				$i++;
 			}
 			return $tab;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2159,8 +2122,7 @@ class Contrat extends CommonObject
 				$i++;
 			}
 			return $tab;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2192,8 +2154,7 @@ class Contrat extends CommonObject
 			$sql .= " WHERE c.statut = 1";
 			$sql .= " AND c.rowid = cd.fk_contrat";
 			$sql .= " AND cd.statut = 0";
-		}
-		elseif ($mode == 'expired')
+		} elseif ($mode == 'expired')
 		{
 			$sql = "SELECT cd.rowid, cd.date_fin_validite as datefin";
 			$sql .= $this->from;
@@ -2201,8 +2162,7 @@ class Contrat extends CommonObject
 			$sql .= " AND c.rowid = cd.fk_contrat";
 			$sql .= " AND cd.statut = 4";
 			$sql .= " AND cd.date_fin_validite < '".$this->db->idate(dol_now())."'";
-		}
-		elseif ($mode == 'active')
+		} elseif ($mode == 'active')
 		{
 		    $sql = "SELECT cd.rowid, cd.date_fin_validite as datefin";
 		    $sql .= $this->from;
@@ -2228,8 +2188,7 @@ class Contrat extends CommonObject
 				$label = $langs->trans("BoardNotActivatedServices");
 				$labelShort = $langs->trans("BoardNotActivatedServicesShort");
 				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=0&sortfield=cd.date_fin_validite&sortorder=asc';
-			}
-			elseif ($mode == 'expired') {
+			} elseif ($mode == 'expired') {
 			    $warning_delay = $conf->contrat->services->expires->warning_delay;
 			    $url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=4&filter=expired&sortfield=cd.date_fin_validite&sortorder=asc';
 			    $label = $langs->trans("BoardExpiredServices");
@@ -2260,8 +2219,7 @@ class Contrat extends CommonObject
 			}
 
 			return $response;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -2302,8 +2260,7 @@ class Contrat extends CommonObject
 			}
             $this->db->free($resql);
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -2759,11 +2716,7 @@ class ContratLigne extends CommonObjectLine
 		global $langs;
 		$langs->load("contracts");
 
-		if ($status == self::STATUS_INITIAL) { $labelStatus = $langs->trans("ServiceStatusInitial"); $labelStatusShort = $langs->trans("ServiceStatusInitial"); }
-		elseif ($status == self::STATUS_OPEN && $expired == -1) { $labelStatus = $langs->trans("ServiceStatusRunning"); $labelStatusShort = $langs->trans("ServiceStatusRunning"); }
-		elseif ($status == self::STATUS_OPEN && $expired == 0) { $labelStatus = $langs->trans("ServiceStatusNotLate"); $labelStatusShort = $langs->trans("ServiceStatusNotLateShort"); }
-		elseif ($status == self::STATUS_OPEN && $expired == 1) { $labelStatus = $langs->trans("ServiceStatusLate"); $labelStatusShort = $langs->trans("ServiceStatusLateShort"); }
-		elseif ($status == self::STATUS_CLOSED) { $labelStatus = $langs->trans("ServiceStatusClosed"); $labelStatusShort = $langs->trans("ServiceStatusClosed"); }
+		if ($status == self::STATUS_INITIAL) { $labelStatus = $langs->trans("ServiceStatusInitial"); $labelStatusShort = $langs->trans("ServiceStatusInitial"); } elseif ($status == self::STATUS_OPEN && $expired == -1) { $labelStatus = $langs->trans("ServiceStatusRunning"); $labelStatusShort = $langs->trans("ServiceStatusRunning"); } elseif ($status == self::STATUS_OPEN && $expired == 0) { $labelStatus = $langs->trans("ServiceStatusNotLate"); $labelStatusShort = $langs->trans("ServiceStatusNotLateShort"); } elseif ($status == self::STATUS_OPEN && $expired == 1) { $labelStatus = $langs->trans("ServiceStatusLate"); $labelStatusShort = $langs->trans("ServiceStatusLateShort"); } elseif ($status == self::STATUS_CLOSED) { $labelStatus = $langs->trans("ServiceStatusClosed"); $labelStatusShort = $langs->trans("ServiceStatusClosed"); }
 
 		$statusType = 'status'.$status;
 		if ($status == self::STATUS_OPEN && $expired == 1) $statusType = 'status1';
@@ -2927,8 +2880,7 @@ class ContratLigne extends CommonObjectLine
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -3013,8 +2965,7 @@ class ContratLigne extends CommonObjectLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else {
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -3161,8 +3112,7 @@ class ContratLigne extends CommonObjectLine
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -3243,8 +3193,7 @@ class ContratLigne extends CommonObjectLine
 
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->error()." sql=".$sql;
 			return -1;
@@ -3297,8 +3246,7 @@ class ContratLigne extends CommonObjectLine
 
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 250d89e3e88..02d9c71776d 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -70,8 +70,7 @@ if ($action == 'addcontact' && $user->rights->contrat->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			$msg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
@@ -89,8 +88,7 @@ if ($action == 'swapstatut' && $user->rights->contrat->creer)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else {
+	} else {
 		dol_print_error($db, $object->error);
 	}
 }
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index e43db63826f..d60d54258bb 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -193,8 +193,7 @@ if ($object->id)
     $permtoedit = $user->rights->contrat->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 4530d01a6af..40a9a4100da 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -140,8 +140,7 @@ if ($resql)
 		$i++;
 	}
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 // Search by status (only expired)
@@ -178,8 +177,7 @@ if ($resql)
         $i++;
     }
     $db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -296,14 +294,12 @@ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 				//$tot_ttc+=$obj->total_ttc;
 				$i++;
 			}
-		}
-		else {
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoContracts").'</td></tr>';
 		}
 		print "</table></div><br>";
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -379,8 +375,7 @@ if ($result)
 	$db->free($result);
 
 	print "</table></div>";
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -434,8 +429,7 @@ if ($resql)
             $productstatic->ref = $obj->pref;
 			$productstatic->entity = $obj->pentity;
             print $productstatic->getNomUrl(1, '', 20);
-		}
-		else {
+		} else {
 		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
             if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
             else print '</a> '.dol_trunc($obj->note, 20);
@@ -456,8 +450,7 @@ if ($resql)
 	$db->free();
 
 	print "</table></div>";
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -512,8 +505,7 @@ if ($resql)
             $productstatic->ref = $obj->pref;
 			$productstatic->entity = $obj->pentity;
             print $productstatic->getNomUrl(1, '', 20);
-		}
-		else {
+		} else {
 		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
             if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
             else print '</a> '.dol_trunc($obj->note, 20);
@@ -533,8 +525,7 @@ if ($resql)
 	$db->free();
 
 	print "</table></div>";
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -590,8 +581,7 @@ if ($resql)
             $productstatic->ref = $obj->pref;
 			$productstatic->entity = $obj->pentity;
             print $productstatic->getNomUrl(1, '', 20);
-		}
-		else {
+		} else {
 		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
             if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
             else print '</a> '.dol_trunc($obj->note, 20);
@@ -611,8 +601,7 @@ if ($resql)
 	$db->free();
 
 	print "</table></div>";
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 5053b703966..3627661c727 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -708,8 +708,7 @@ while ($i < min($num, $limit))
 			if ($nbofsalesrepresentative > 3) {
 				// We print only number
 				print $nbofsalesrepresentative;
-			}
-			elseif ($nbofsalesrepresentative > 0)
+			} elseif ($nbofsalesrepresentative > 0)
 			{
 				$userstatic = new User($db);
 				$j = 0;
@@ -731,8 +730,7 @@ while ($i < min($num, $limit))
 				}
 			}
 			//else print $langs->trans("NoSalesRepresentativeAffected");
-		}
-		else {
+		} else {
 			print '&nbsp';
 		}
 		print '</td>';
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 62a853270e1..fd46b8eba98 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -102,8 +102,7 @@ if ($search_status != '')
 		if ($tmp[1] == 'filter=notexpired') $filter = 'notexpired';
 		if ($tmp[1] == 'filter=expired') $filter = 'expired';
 	}
-}
-else {
+} else {
 	$search_status = $mode;
 	if ($filter == 'expired') $search_status .= '&filter=expired';
 	if ($filter == 'notexpired') $search_status .= '&filter=notexpired';
@@ -595,8 +594,7 @@ while ($i < min($num, $limit))
 			print $productstatic->getNomUrl(1, '', 24);
 			print $obj->label ? ' - '.dol_trunc($obj->label, 16) : '';
 			if (!empty($obj->description) && !empty($conf->global->PRODUCT_DESC_IN_LIST)) print '<br>'.dol_nl2br($obj->description);
-		}
-		else {
+		} else {
 			if ($obj->type == 0) print img_object($obj->description, 'product').' '.dol_trunc($obj->description, 24);
 			if ($obj->type == 1) print img_object($obj->description, 'service').' '.dol_trunc($obj->description, 24);
 		}
@@ -679,8 +677,7 @@ while ($i < min($num, $limit))
 			$warning_delay = $conf->contrat->services->expires->warning_delay / 3600 / 24;
 			$textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
 			print img_warning($textlate);
-		}
-		else print '&nbsp;&nbsp;&nbsp;&nbsp;';
+		} else print '&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '</td>';
         if (!$i) $totalarray['nbfield']++;
 	}
@@ -721,8 +718,7 @@ while ($i < min($num, $limit))
 	    {
 			// If contract is draft, we say line is also draft
 		    print $contractstatic->LibStatut(0, 5);
-	    }
-	    else {
+	    } else {
 		    print $staticcontratligne->LibStatut($obj->statut, 5, ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now) ? 1 : 0);
 	    }
 	    print '</td>';
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 2d6695ff6cb..f9f10f636ca 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -40,8 +40,7 @@ if ($cancel)
 	{
 		header("Location: ".$backtopageforcancel);
 		exit;
-	}
-	elseif (!empty($backtopage))
+	} elseif (!empty($backtopage))
 	{
 		header("Location: ".$backtopage);
 		exit;
@@ -57,8 +56,7 @@ if ($action == 'add' && !empty($permissiontoadd))
 	{
 		if ($object->fields[$key]['type'] == 'duration') {
 			if (GETPOST($key.'hour') == '' && GETPOST($key.'min') == '') continue; // The field was not submited to be edited
-		}
-		else {
+		} else {
 			if (!GETPOSTISSET($key)) continue; // The field was not submited to be edited
 		}
 		// Ignore special fields
@@ -106,15 +104,13 @@ if ($action == 'add' && !empty($permissiontoadd))
 			$urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $urltogo); // New method to autoselect project after a New on another form object creation
 			header("Location: ".$urltogo);
 			exit;
-		}
-		else {
+		} else {
 			// Creation KO
 			if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 			else setEventMessages($object->error, null, 'errors');
 			$action = 'create';
 		}
-	}
-	else {
+	} else {
 		$action = 'create';
 	}
 }
@@ -127,15 +123,12 @@ if ($action == 'update' && !empty($permissiontoadd))
 		// Check if field was submited to be edited
 		if ($object->fields[$key]['type'] == 'duration') {
 			if (!GETPOSTISSET($key.'hour') || !GETPOSTISSET($key.'min')) continue; // The field was not submited to be edited
-		}
-		elseif ($object->fields[$key]['type'] == 'boolean') {
+		} elseif ($object->fields[$key]['type'] == 'boolean') {
 			if (!GETPOSTISSET($key)) {
 				$object->$key = 0; // use 0 instead null if the field is defined as not null
 				continue;
 			}
-		}
-
-		else {
+		} else {
 			if (!GETPOSTISSET($key)) continue; // The field was not submited to be edited
 		}
 		// Ignore special fields
@@ -178,14 +171,12 @@ if ($action == 'update' && !empty($permissiontoadd))
 		if ($result > 0)
 		{
 			$action = 'view';
-		}
-		else {
+		} else {
 			// Creation KO
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'edit';
 		}
-	}
-	else {
+	} else {
 		$action = 'edit';
 	}
 }
@@ -204,8 +195,7 @@ if ($action == "update_extras" && !empty($permissiontoadd))
 	{
 		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 		$action = 'view';
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit_extras';
 	}
@@ -227,8 +217,7 @@ if ($action == 'confirm_delete' && !empty($permissiontodelete))
 		setEventMessages("RecordDeleted", null, 'mesgs');
 		header("Location: ".$backurlforlist);
 		exit;
-	}
-	else {
+	} else {
 		if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 		else setEventMessages($object->error, null, 'errors');
 	}
@@ -263,8 +252,7 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && !empty($permissionto
 		setEventMessages($langs->trans('RecordDeleted'), null, 'mesgs');
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -291,8 +279,7 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $permissiontoadd)
 
 			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -319,8 +306,7 @@ if ($action == 'confirm_close' && $confirm == 'yes' && $permissiontoadd)
 
 			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -332,8 +318,7 @@ if ($action == 'confirm_setdraft' && $confirm == 'yes' && $permissiontoadd)
 	if ($result >= 0)
 	{
 		// Nothing else done
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -360,8 +345,7 @@ if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd)
 
 			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -372,8 +356,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && !empty($permissiontoadd))
 	if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 	{
 		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-	}
-	else {
+	} else {
 	    $objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone or if createFromClone modifies the object. We use native clone to keep this->db valid.
 		//$objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
         // ...
@@ -385,8 +368,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && !empty($permissiontoadd))
 			else $newid = $result;
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid); // Open record of new object
 			exit;
-		}
-		else {
+		} else {
 		    setEventMessages($objectutil->error, $objectutil->errors, 'errors');
 			$action = '';
 		}
diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php
index f4b5f1fbb4c..eb51796eccd 100644
--- a/htdocs/core/actions_builddoc.inc.php
+++ b/htdocs/core/actions_builddoc.inc.php
@@ -37,8 +37,7 @@ if ($action == 'builddoc' && $permissiontoadd)
     if (is_numeric(GETPOST('model', 'alpha')))
     {
         $error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Model"));
-    }
-    else {
+    } else {
    		// Reload to get all modified line records and be ready for hooks
         $ret = $object->fetch($id);
         $ret = $object->fetch_thirdparty();
@@ -88,8 +87,7 @@ if ($action == 'builddoc' && $permissiontoadd)
         {
             setEventMessages($object->error, $object->errors, 'errors');
             $action = '';
-        }
-        else {
+        } else {
         	if (empty($donotredirect))	// This is set when include is done by bulk action "Bill Orders"
         	{
 	            setEventMessages($langs->trans("FileGenerated"), null);
@@ -132,8 +130,7 @@ if ($action == 'remove_file' && $permissiontoadd)
 
 	    header('Location: '.$urltoredirect);
 	    exit;
-	}
-	else {
+	} else {
 		setEventMessages('BugFoundVarUploaddirnotDefined', null, 'errors');
 	}
 }
diff --git a/htdocs/core/actions_comments.inc.php b/htdocs/core/actions_comments.inc.php
index 3d18c2d7c24..c352f07f9f7 100644
--- a/htdocs/core/actions_comments.inc.php
+++ b/htdocs/core/actions_comments.inc.php
@@ -49,8 +49,7 @@ if ($action == 'addcomment')
 			setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
 			header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1' : ''));
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($comment->error, $comment->errors, 'errors');
 			$action = '';
 		}
@@ -66,8 +65,7 @@ if ($action === 'updatecomment')
             setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
             header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1#comment' : ''));
             exit;
-        }
-        else {
+        } else {
             setEventMessages($comment->error, $comment->errors, 'errors');
             $action = '';
         }
@@ -82,8 +80,7 @@ if ($action == 'deletecomment')
 			setEventMessages($langs->trans("CommentDeleted"), null, 'mesgs');
 			header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1' : ''));
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($comment->error, $comment->errors, 'errors');
 			$action = '';
 		}
diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index 5a044d7a464..46a6a31c202 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -122,8 +122,7 @@ if ($action == 'add')
 	    					$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
 	    					$action = 'create';
 	    				}
-	    			}
-	    			else {
+	    			} else {
 	    				$error++;
 	    				$langs->load("errors");
 	    				$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
@@ -148,8 +147,7 @@ if ($action == 'add')
     				{
     					$params['options'] = array($parameters=>null);
     				}
-    			}
-    			else {
+    			} else {
     				//Esle it's separated key/value and coma list
     				foreach ($parameters_array as $param_ligne)
     				{
@@ -189,22 +187,19 @@ if ($action == 'add')
     				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
     				header("Location: ".$_SERVER["PHP_SELF"]);
     				exit;
-    			}
-    			else {
+    			} else {
                     $error++;
     			    $mesg = $extrafields->error;
                     setEventMessages($mesg, null, 'errors');
     			}
-    		}
-    		else {
+    		} else {
                 $error++;
     		    $langs->load("errors");
     			$mesg = $langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters", $langs->transnoentities("AttributeCode"));
     			setEventMessages($mesg, null, 'errors');
     			$action = 'create';
     		}
-	    }
-	    else {
+	    } else {
 	    	setEventMessages($mesg, null, 'errors');
 	    }
 	}
@@ -288,8 +283,7 @@ if ($action == 'update')
 	        				$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
 	        				$action = 'edit';
 	        			}
-	        		}
-	        		else {
+	        		} else {
 	        			$error++;
 	        			$langs->load("errors");
 	        			$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
@@ -313,8 +307,7 @@ if ($action == 'update')
     				{
     					$params['options'] = array($parameters=>null);
     				}
-    			}
-    			else {
+    			} else {
     				//Esle it's separated key/value and coma list
     				foreach ($parameters_array as $param_ligne)
     				{
@@ -354,21 +347,18 @@ if ($action == 'update')
     				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
     				header("Location: ".$_SERVER["PHP_SELF"]);
     				exit;
-    			}
-    			else {
+    			} else {
                     $error++;
     			    $mesg = $extrafields->error;
     			    setEventMessages($mesg, null, 'errors');
     			}
-    		}
-    		else {
+    		} else {
     		    $error++;
     			$langs->load("errors");
     			$mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode"));
     			setEventMessages($mesg, null, 'errors');
     		}
-	    }
-	    else {
+	    } else {
 	    	setEventMessages($mesg, null, 'errors');
 	    }
 	}
@@ -384,10 +374,8 @@ if ($action == 'delete')
         {
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
-        }
-        else $mesg = $extrafields->error;
-	}
-	else {
+        } else $mesg = $extrafields->error;
+	} else {
 	    $error++;
 		$langs->load("errors");
 		$mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode"));
diff --git a/htdocs/core/actions_fetchobject.inc.php b/htdocs/core/actions_fetchobject.inc.php
index 6da2b0e674e..a77fc6e5ff6 100644
--- a/htdocs/core/actions_fetchobject.inc.php
+++ b/htdocs/core/actions_fetchobject.inc.php
@@ -37,16 +37,14 @@ if (($id > 0 || (!empty($ref) && !in_array($action, array('create', 'createtask'
 	    {
 	        $object->fetch_thirdparty();
 	        $id = $object->id;
-	    }
-	    else {
+	    } else {
 	    	if (empty($object->error) && !count($object->errors))
 	    	{
 	    		if ($ret < 0)	// if $ret == 0, it means not found.
 	    		{
 	    			setEventMessages('Fetch on object (type '.get_class($object).') return an error without filling $object->error nor $object->errors', null, 'errors');
 	    		}
-	    	}
-	        else setEventMessages($object->error, $object->errors, 'errors');
+	    	} else setEventMessages($object->error, $object->errors, 'errors');
 	        $action = '';
 	    }
 	}
diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index aeb86f9c609..ea55052f880 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -41,8 +41,7 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC))
 				$error++;
 				if ($_FILES['userfile']['error'][$key] == 1 || $_FILES['userfile']['error'][$key] == 2) {
 					setEventMessages($langs->trans('ErrorFileSizeTooLarge'), null, 'errors');
-				}
-				else {
+				} else {
 					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
 				}
 			}
@@ -58,15 +57,13 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC))
 			if (!empty($upload_dirold) && !empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
 			{
 				$result = dol_add_file_process($upload_dirold, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs);
-			}
-			elseif (!empty($upload_dir))
+			} elseif (!empty($upload_dir))
 			{
 				$result = dol_add_file_process($upload_dir, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs);
 			}
 		}
 	}
-}
-elseif (GETPOST('linkit', 'none') && !empty($conf->global->MAIN_UPLOAD_DOC))
+} elseif (GETPOST('linkit', 'none') && !empty($conf->global->MAIN_UPLOAD_DOC))
 {
     $link = GETPOST('link', 'alpha');
     if ($link)
@@ -86,8 +83,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
     if (GETPOST('section', 'alpha')) {
         // For a delete from the ECM module, upload_dir is ECM root dir and urlfile contains relative path from upload_dir
         $file = $upload_dir.(preg_match('/\/$/', $upload_dir) ? '' : '/').$urlfile;
-    }
-    else // For a delete from the file manager into another module, or from documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
+    } else // For a delete from the file manager into another module, or from documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
 	{
        	$urlfile = basename($urlfile);
        	$file = $upload_dir.(preg_match('/\/$/', $upload_dir) ? '' : '/').$urlfile;
@@ -124,8 +120,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
         } else {
             setEventMessages($langs->trans("ErrorFailToDeleteFile", $urlfile), null, 'errors');
         }
-    }
-    elseif ($linkid)	// delete of external link
+    } elseif ($linkid)	// delete of external link
     {
         require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
         $link = new Link($db);
@@ -148,15 +143,13 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
         if ($backtopage) {
         	header('Location: '.$backtopage);
             exit;
-        }
-        else {
+        } else {
         	$tmpurl = $_SERVER["PHP_SELF"].'?id='.$object->id.(GETPOST('section_dir', 'alpha') ? '&section_dir='.urlencode(GETPOST('section_dir', 'alpha')) : '').(!empty($withproject) ? '&withproject=1' : '');
         	header('Location: '.$tmpurl);
             exit;
         }
     }
-}
-elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('link', 'alpha'))
+} elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('link', 'alpha'))
 {
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
     $langs->load('link');
@@ -175,12 +168,10 @@ elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('
         {
             setEventMessages($langs->trans("ErrorFailedToUpdateLink", $link->label), null, 'mesgs');
         }
-    }
-    else {
+    } else {
         //error fetching
     }
-}
-elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha'))
+} elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha'))
 {
 	// For documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
 	if (!empty($upload_dir))
@@ -233,13 +224,11 @@ elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha'))
 			            	}
 
 			                setEventMessages($langs->trans("FileRenamed"), null);
-			            }
-			            else {
+			            } else {
 			                $langs->load("errors"); // key must be loaded because we can't rely on loading during output, we need var substitution to be done now.
 			                setEventMessages($langs->trans("ErrorFailToRenameFile", $filenamefrom, $filenameto), null, 'errors');
 			            }
-	            	}
-	            	else {
+	            	} else {
 	            		$langs->load("errors"); // key must be loaded because we can't rely on loading during output, we need var substitution to be done now.
 	            		setEventMessages($langs->trans("ErrorDestinationAlreadyExists", $filenameto), null, 'errors');
 	            	}
@@ -265,8 +254,7 @@ elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha'))
 		    		require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 		    		$ecmfile->share = getRandomPassword(true);
 		    	}
-		    }
-		    else {
+		    } else {
 		    	$ecmfile->share = '';
 		    }
 		    $result = $ecmfile->update($user);
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 41660a47815..23c76ae81fb 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -180,8 +180,7 @@ if (!$error && $massaction == 'confirm_presend')
 					if ($val == 'thirdparty') // Id of third party or user
 					{
 						$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
-					}
-					elseif ($val && method_exists($thirdparty, 'contact_get_property'))		// Id of contact
+					} elseif ($val && method_exists($thirdparty, 'contact_get_property'))		// Id of contact
 					{
 						$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 						$sendtoid[] = $val;
@@ -210,8 +209,7 @@ if (!$error && $massaction == 'confirm_presend')
 					if ($val == 'thirdparty') // Id of third party
 					{
 						$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
-					}
-					elseif ($val)	// Id du contact
+					} elseif ($val)	// Id du contact
 					{
 						$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 						//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
@@ -256,20 +254,17 @@ if (!$error && $massaction == 'confirm_presend')
 					if ($objectobj->element == 'societe')
 					{
 						$sendto = $objectobj->email;
-					}
-					elseif ($objectobj->element == 'expensereport')
+					} elseif ($objectobj->element == 'expensereport')
 					{
 						$fuser = new User($db);
 						$fuser->fetch($objectobj->fk_user_author);
 						$sendto = $fuser->email;
-					}
-					elseif ($objectobj->element == 'holiday')
+					} elseif ($objectobj->element == 'holiday')
 					{
 					    $fuser = new User($db);
 					    $fuser->fetch($objectobj->fk_user);
 					    $sendto = $fuser->email;
-					}
-					elseif ($objectobj->element == 'facture' && !empty($listofobjectcontacts[$objectid]))
+					} elseif ($objectobj->element == 'facture' && !empty($listofobjectcontacts[$objectid]))
 					{
 						$emails_to_sends = array();
 						$objectobj->fetch_thirdparty();
@@ -283,8 +278,7 @@ if (!$error && $massaction == 'confirm_presend')
 						if (count($emails_to_sends) > 0) {
 							$sendto = implode(',', $emails_to_sends);
 						}
-					}
-					else {
+					} else {
 						$objectobj->fetch_thirdparty();
 						$sendto = $objectobj->thirdparty->email;
 					}
@@ -335,8 +329,7 @@ if (!$error && $massaction == 'confirm_presend')
 							'names'=>array($filename),
 							'mimes'=>array($mime)
 						);
-					}
-					else {
+					} else {
 							$nbignored++;
 							$langs->load("errors");
 							$resaction .= '<div class="error">'.$langs->trans('ErrorCantReadFile', $file).'</div><br>';
@@ -362,19 +355,15 @@ if (!$error && $massaction == 'confirm_presend')
 				$fromtype = GETPOST('fromtype');
 				if ($fromtype === 'user') {
 					$from = $user->getFullName($langs).' <'.$user->email.'>';
-				}
-				elseif ($fromtype === 'company') {
+				} elseif ($fromtype === 'company') {
 					$from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
-				}
-				elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
+				} elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
 					$tmp = explode(',', $user->email_aliases);
 					$from = trim($tmp[($reg[1] - 1)]);
-				}
-				elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
+				} elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
 					$tmp = explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
 					$from = trim($tmp[($reg[1] - 1)]);
-				}
-				elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
+				} elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
 					$sql = 'SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE rowid = '.(int) $reg[1];
 					$resql = $db->query($sql);
 					$obj = $db->fetch_object($resql);
@@ -382,8 +371,7 @@ if (!$error && $massaction == 'confirm_presend')
 					{
 						$from = $obj->label.' <'.$obj->email.'>';
 					}
-				}
-				else {
+				} else {
 					$from = $_POST['fromname'].' <'.$_POST['frommail'].'>';
 				}
 
@@ -410,8 +398,7 @@ if (!$error && $massaction == 'confirm_presend')
 					{
 					    $looparray[$key]->thirdparty = $thirdparty; // Force thirdparty on object
 					}
-				}
-				else {
+				} else {
 					$objectforloop = new $objectclass($db);
 					$objectforloop->thirdparty = $thirdparty; // Force thirdparty on object (even if object was not loaded)
 					$looparray[0] = $objectforloop;
@@ -461,8 +448,7 @@ if (!$error && $massaction == 'confirm_presend')
 								);
 							}
 						}
-					}
-					elseif (!empty($attachedfilesThirdpartyObj[$thirdparty->id][$objectid])) {
+					} elseif (!empty($attachedfilesThirdpartyObj[$thirdparty->id][$objectid])) {
 						// Create form object
 						// if "one email per recipient" isn't check we must separate $attachedfiles by object
 						$attachedfiles = $attachedfilesThirdpartyObj[$thirdparty->id][$objectid];
@@ -478,8 +464,7 @@ if (!$error && $massaction == 'confirm_presend')
 					    $trackid = 'thi'.$thirdparty->id;
 					    if ($objecttmp->element == 'expensereport') $trackid = 'use'.$thirdparty->id;
 					    if ($objecttmp->element == 'holiday') $trackid = 'use'.$thirdparty->id;
-					}
-					else {
+					} else {
 					    $trackid = strtolower(get_class($objecttmp));
 					    if (get_class($objecttmp) == 'Contrat')  $trackid = 'con';
 					    if (get_class($objecttmp) == 'Propal')   $trackid = 'pro';
@@ -503,8 +488,7 @@ if (!$error && $massaction == 'confirm_presend')
 					if ($mailfile->error)
 					{
 						$resaction .= '<div class="error">'.$mailfile->error.'</div>';
-					}
-					else {
+					} else {
 						$result = $mailfile->sendfile();
 						if ($result)
 						{
@@ -569,15 +553,13 @@ if (!$error && $massaction == 'confirm_presend')
 
 								$nbsent++; // Nb of object sent
 							}
-						}
-						else {
+						} else {
 							$langs->load("other");
 							if ($mailfile->error)
 							{
 								$resaction .= $langs->trans('ErrorFailedToSendMail', $from, $sendto);
 								$resaction .= '<br><div class="error">'.$mailfile->error.'</div>';
-							}
-							else {
+							} else {
 								$resaction .= '<div class="warning">No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS</div>';
 							}
 						}
@@ -598,8 +580,7 @@ if (!$error && $massaction == 'confirm_presend')
 			//setEventMessages($langs->trans("EMailSentToNRecipients", $nbsent.'/'.count($toselect)), null, 'mesgs');
 			setEventMessages($langs->trans("EMailSentForNElements", $nbsent.'/'.count($toselect)), null, 'mesgs');
 			setEventMessages($resaction, null, 'mesgs');
-		}
-		else {
+		} else {
 			//setEventMessages($langs->trans("EMailSentToNRecipients", 0), null, 'warnings');  // May be object has no generated PDF file
 			setEventMessages($resaction, null, 'warnings');
 		}
@@ -714,14 +695,12 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 						{
 							$result = $objecttmp->insert_discount($discountid);
 							//$result=$discount->link_to_invoice($lineid,$id);
-						}
-						else {
+						} else {
 							setEventMessages($discount->error, $discount->errors, 'errors');
 							$error++;
 							break;
 						}
-					}
-					else {
+					} else {
 						// Positive line
 						$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 						// Date start
@@ -779,8 +758,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 						if ($result > 0)
 						{
 							$lineid = $result;
-						}
-						else {
+						} else {
 							$lineid = 0;
 							$error++;
 							break;
@@ -870,8 +848,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 
 		header("Location: ".$_SERVER['PHP_SELF'].'?'.$param);
 		exit;
-	}
-	else {
+	} else {
 		$db->rollback();
 		$action = 'create';
 		$_GET["origin"] = $_POST["origin"];
@@ -901,16 +878,14 @@ if (!$error && $massaction == 'cancelorders')
 			setEventMessages($langs->trans("ErrorObjectMustHaveStatusValidToBeCanceled", $cmd->ref), null, 'errors');
 			$error++;
 			break;
-		}
-		else $result = $cmd->cancel();
+		} else $result = $cmd->cancel();
 
 		if ($result < 0)
 		{
 			setEventMessages($cmd->error, $cmd->errors, 'errors');
 			$error++;
 			break;
-		}
-		else $nbok++;
+		} else $nbok++;
 	}
 	if (!$error)
 	{
@@ -918,8 +893,7 @@ if (!$error && $massaction == 'cancelorders')
 			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 		else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 		$db->commit();
-	}
-	else {
+	} else {
 		$db->rollback();
 	}
 }
@@ -1020,12 +994,10 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 
 			$langs->load("exports");
 			setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
 		}
-	}
-	else {
+	} else {
 		// Create empty PDF
 		$formatarray = pdf_getFormat();
 		$page_largeur = $formatarray['width'];
@@ -1082,8 +1054,7 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 
 			$langs->load("exports");
 			setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
-		}
-		else {
+		} else {
             setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
 		}
 	}
@@ -1139,16 +1110,13 @@ if (!$error && $massaction == 'validate' && $permissiontoadd)
 					setEventMessages($langs->trans("ErrorObjectMustHaveStatusDraftToBeValidated", $objecttmp->ref), null, 'errors');
 					$error++;
 					break;
-				}
-				elseif ($result < 0)
+				} elseif ($result < 0)
 				{
 					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 					$error++;
 					break;
-				}
-				else $nbok++;
-			}
-			else {
+				} else $nbok++;
+			} else {
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 				$error++;
 				break;
@@ -1160,8 +1128,7 @@ if (!$error && $massaction == 'validate' && $permissiontoadd)
 			if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 			else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 		}
 		//var_dump($listofobjectthirdparties);exit;
@@ -1183,8 +1150,7 @@ if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permissio
                 $error++;
                 break;
             } else $nbok++;
-        }
-        else {
+        } else {
             setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
             $error++;
             break;
@@ -1196,8 +1162,7 @@ if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permissio
             setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
         else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
         $db->commit();
-    }
-    else {
+    } else {
         $db->rollback();
     }
 }
@@ -1244,10 +1209,8 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 			    setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 			    $error++;
 			    break;
-			}
-			else $nbok++;
-		}
-		else {
+			} else $nbok++;
+		} else {
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 			$error++;
 			break;
@@ -1259,8 +1222,7 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 		if ($nbok > 1) setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
 		else setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
 		$db->commit();
-	}
-	else {
+	} else {
 		$db->rollback();
 	}
 	//var_dump($listofobjectthirdparties);exit;
@@ -1304,10 +1266,8 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread)
                 setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
                 $error++;
                 break;
-            }
-            else $nbok++;
-        }
-        else {
+            } else $nbok++;
+        } else {
             setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
             $error++;
             break;
@@ -1319,8 +1279,7 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread)
         if ($nbok > 1) setEventMessages($langs->trans("RecordsGenerated", $nbok), null, 'mesgs');
         else setEventMessages($langs->trans("RecordGenerated", $nbok), null, 'mesgs');
         $db->commit();
-    }
-    else {
+    } else {
         $db->rollback();
     }
 }
diff --git a/htdocs/core/actions_printing.inc.php b/htdocs/core/actions_printing.inc.php
index e2da8a4170c..e88fc937e38 100644
--- a/htdocs/core/actions_printing.inc.php
+++ b/htdocs/core/actions_printing.inc.php
@@ -75,8 +75,7 @@ if ($action == 'print_file' && $user->rights->printing->read) {
 						setEventMessages($printer->error, $printer->errors);
 						setEventMessages($langs->transnoentitiesnoconv("FileWasSentToPrinter", basename(GETPOST('file', 'alpha'))).' '.$langs->transnoentitiesnoconv("ViaModule").' '.$printer->name, null);
 					}
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$ret = 1;
 					setEventMessages($e->getMessage(), null, 'errors');
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index df461e47a95..bc38d9839af 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -120,38 +120,32 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			if ($object->element == 'user' && $result == 0) $result = 1; // Even if not found, we consider ok
 			$thirdparty = $object->thirdparty;
 			$sendtosocid = $thirdparty->id;
-		}
-		elseif ($object->element == 'member' || $object->element == 'user')
+		} elseif ($object->element == 'member' || $object->element == 'user')
 		{
 			$thirdparty = $object;
 			if ($object->socid > 0) $sendtosocid = $object->socid;
-		}
-		elseif ($object->element == 'expensereport')
+		} elseif ($object->element == 'expensereport')
 		{
 			$tmpuser = new User($db);
 			$tmpuser->fetch($object->fk_user_author);
 			$thirdparty = $tmpuser;
 			if ($object->socid > 0) $sendtosocid = $object->socid;
-		}
-		elseif ($object->element == 'societe')
+		} elseif ($object->element == 'societe')
 		{
 			$thirdparty = $object;
 			if ($thirdparty->id > 0) $sendtosocid = $thirdparty->id;
-		}
-		elseif ($object->element == 'contact')
+		} elseif ($object->element == 'contact')
 		{
 			$contact = $object;
 			if ($contact->id > 0) $sendtosocid = $contact->fetch_thirdparty()->id;
-		}
-		else dol_print_error('', "Use actions_sendmails.in.php for an element/object '".$object->element."' that is not supported");
+		} else dol_print_error('', "Use actions_sendmails.in.php for an element/object '".$object->element."' that is not supported");
 
 		if (is_object($hookmanager))
 		{
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('initSendToSocid', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		}
-	}
-	else $thirdparty = $mysoc;
+	} else $thirdparty = $mysoc;
 
 	if ($result > 0)
 	{
@@ -189,8 +183,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				elseif ($val == 'contact') // Key selected means current contact
 				{
 					$tmparray[] = dol_string_nospecial($contact->getFullName($langs), ' ', array(",")).' <'.$contact->email.'>';
-				}
-				elseif ($val)	// $val is the Id of a contact
+				} elseif ($val)	// $val is the Id of a contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 					$sendtoid[] = $val;
@@ -239,8 +232,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				elseif ($val == 'contact')	// Key selected means current contact
 				{
 					$tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
-				}
-				elseif ($val)				// $val is the Id of a contact
+				} elseif ($val)				// $val is the Id of a contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 					//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
@@ -277,22 +269,17 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			$fromtype = GETPOST('fromtype', 'alpha');
 			if ($fromtype === 'robot') {
 				$from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")).' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>';
-			}
-			elseif ($fromtype === 'user') {
+			} elseif ($fromtype === 'user') {
 				$from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")).' <'.$user->email.'>';
-			}
-			elseif ($fromtype === 'company') {
+			} elseif ($fromtype === 'company') {
 				$from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")).' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
-			}
-			elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
+			} elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
 				$tmp = explode(',', $user->email_aliases);
 				$from = trim($tmp[($reg[1] - 1)]);
-			}
-			elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
+			} elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
 				$tmp = explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
 				$from = trim($tmp[($reg[1] - 1)]);
-			}
-			elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
+			} elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
 				$sql = 'SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile';
 				$sql .= ' WHERE rowid = '.(int) $reg[1];
 				$resql = $db->query($sql);
@@ -301,8 +288,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				{
 					$from = dol_string_nospecial($obj->label, ' ', array(",")).' <'.$obj->email.'>';
 				}
-			}
-			else {
+			} else {
 				$from = dol_string_nospecial($_POST['fromname'], ' ', array(",")).' <'.$_POST['frommail'].'>';
 			}
 
@@ -419,8 +405,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			{
 				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
 				$action = 'presend';
-			}
-			else {
+			} else {
 				$result = $mailfile->sendfile();
 				if ($result)
 				{
@@ -478,16 +463,14 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 	  				if (isset($paramname2) || isset($paramval2)) $moreparam .= '&'.($paramname2 ? $paramname2 : 'mid').'='.$paramval2;
 		  			header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname ? $paramname : 'id').'='.(is_object($object) ? $object->id : '').$moreparam);
 			  		exit;
-				}
-				else {
+				} else {
 					$langs->load("other");
 					$mesg = '<div class="error">';
 					if ($mailfile->error)
 					{
 						$mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto));
 						$mesg .= '<br>'.$mailfile->error;
-					}
-					else {
+					} else {
 						$mesg .= 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 					}
 					$mesg .= '</div>';
@@ -496,15 +479,13 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 					$action = 'presend';
 				}
 			}
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("MailTo")), null, 'warnings');
 			dol_syslog('Try to send email with no recipient defined', LOG_WARNING);
 			$action = 'presend';
 		}
-	}
-	else {
+	} else {
 		$langs->load("other");
 		setEventMessages($langs->trans('ErrorFailedToReadObject', $object->element), null, 'errors');
 		dol_syslog('Failed to read data of object id='.$object->id.' element='.$object->element);
diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
index ea407375e12..05be4a31d18 100644
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -50,8 +50,7 @@ if ($action == 'update' && is_array($arrayofparameters))
 	{
 		$db->commit();
 		if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		$db->rollback();
 		if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
 	}
@@ -110,8 +109,7 @@ if ($action == 'setModuleOptions')
     {
         $db->commit();
         if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         $db->rollback();
         if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
     }
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index d5cf3ae1b48..9fb743f1208 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -68,8 +68,7 @@ if (!isset($mode) || $mode != 'noajax')    // For ajax call
         //dol_print_error($db,$ecmdir->error);
         //exit;
     }
-}
-else // For no ajax call
+} else // For no ajax call
 {
 	$rootdirfordoc = $conf->ecm->dir_output;
 
@@ -85,8 +84,7 @@ else // For no ajax call
         }
 
         $relativepath = $ecmdir->getRelativePath(); // Example   'mydir/'
-    }
-	elseif (GETPOST('section_dir'))
+    } elseif (GETPOST('section_dir'))
 	{
 		$relativepath = GETPOST('section_dir');
 	}
@@ -258,8 +256,7 @@ if ($type == 'directory')
 	    		if (!preg_match('/pageid=/', $param)) $param .= '&pageid='.urlencode(GETPOST('pageid', 'int'));
 	    		//if (!preg_match('/backtopage=/',$param)) $param.='&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid);
 	    	}
-    	}
-    	else {
+    	} else {
         	$relativepath = $ecmdir->getRelativePath();
         	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
     	}
@@ -268,8 +265,7 @@ if ($type == 'directory')
 		if (($section === '0' || empty($section)) && ($module != 'medias'))
         {
             $filearray = array();
-        }
-        else {
+        } else {
         	$filearray = dol_dir_list($upload_dir, "files", 0, '', array('^\.', '(\.meta|_preview.*\.png)$', '^temp$', '^CVS$'), $sortfield, $sorting, 1);
         }
 
@@ -279,13 +275,11 @@ if ($type == 'directory')
         	if (isset($search_doc_ref) && $search_doc_ref != '') $param .= '&search_doc_ref='.$search_doc_ref;
 
             $textifempty = $langs->trans('NoFileFound');
-        }
-        elseif ($section === '0')
+        } elseif ($section === '0')
         {
         	if ($module == 'ecm') $textifempty = '<br><div class="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
         	else $textifempty = $langs->trans('NoFileFound');
-        }
-        else $textifempty = ($showonrightsize == 'featurenotyetavailable' ? $langs->trans("FeatureNotYetAvailable") : $langs->trans("ECMSelectASection"));
+        } else $textifempty = ($showonrightsize == 'featurenotyetavailable' ? $langs->trans("FeatureNotYetAvailable") : $langs->trans("ECMSelectASection"));
 
         if ($module == 'medias')
         {
@@ -293,8 +287,7 @@ if ($type == 'directory')
             $modulepart = 'medias';
             $perm = ($user->rights->website->write || $user->rights->emailing->creer);
             $title = 'none';
-        }
-        elseif ($module == 'ecm') // DMS/ECM -> manual structure
+        } elseif ($module == 'ecm') // DMS/ECM -> manual structure
         {
             if ($user->rights->ecm->read)
             {
@@ -317,8 +310,7 @@ if ($type == 'directory')
             $perm = $user->rights->ecm->upload;
             $modulepart = 'ecm';
             $title = ''; // Use default
-        }
-        else {
+        } else {
             $useinecm = 5;
             $modulepart = 'ecm';
             $perm = $user->rights->ecm->upload;
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index f5ac3e2e422..620643da8f2 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -49,8 +49,7 @@ if (!isset($mode) || $mode != 'noajax')    // For ajax call
 	$preopened = GETPOST('preopened');
 
 	if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/', '', $selecteddir); // We removed last '/' except if it is '/'
-}
-else // For no ajax call
+} else // For no ajax call
 {
 	//if (GETPOST('preopened')) { $_GET['dir'] = $_POST['dir'] = GETPOST('preopened'); }
 
@@ -73,8 +72,7 @@ if ($modulepart == 'ecm')
 {
 	$fullpathselecteddir = $conf->ecm->dir_output.'/'.($selecteddir != '/' ? $selecteddir : '');
 	$fullpathpreopened = $conf->ecm->dir_output.'/'.($preopened != '/' ? $preopened : '');
-}
-elseif ($modulepart == 'medias')
+} elseif ($modulepart == 'medias')
 {
 	$fullpathselecteddir = $dolibarr_main_data_root.'/medias/'.($selecteddir != '/' ? $selecteddir : '');
 	$fullpathpreopened = $dolibarr_main_data_root.'/medias/'.($preopened != '/' ? $preopened : '');
@@ -95,8 +93,7 @@ if (preg_match('/\.\./', $fullpathselecteddir) || preg_match('/[<>|]/', $fullpat
 if ($modulepart == 'ecm')
 {
 	if (!$user->rights->ecm->read) accessforbidden();
-}
-elseif ($modulepart == 'medias')
+} elseif ($modulepart == 'medias')
 {
 	// Always allowed
 }
@@ -471,8 +468,7 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
 							if ($modulepart == 'ecm')
 							{
 								$newfullpathselecteddir = $conf->ecm->dir_output.'/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
-							}
-							elseif ($modulepart == 'medias')
+							} elseif ($modulepart == 'medias')
 							{
 								$newfullpathselecteddir = $dolibarr_main_data_root.'/medias/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
 							}
@@ -486,7 +482,6 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
 
 				echo "</ul>\n";
 			}
-		}
-		else print "PermissionDenied";
+		} else print "PermissionDenied";
 	}
 }
diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index 674dab95842..98d7d00a8dc 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -60,8 +60,7 @@ if ($time >= $_SESSION['auto_check_events_not_before'])
             dol_syslog("We ask to check browser notification on a too large period. We fix this with current date.");
             $starttime = $time;
         }
-    }
-    else {
+    } else {
         $starttime = $time;
     }
 
@@ -108,8 +107,7 @@ if ($time >= $_SESSION['auto_check_events_not_before'])
 
             $eventfound[] = $event;
         }
-    }
-    else {
+    } else {
         dol_syslog("Error sql = ".$db->lasterror(), LOG_ERR);
     }
 }
diff --git a/htdocs/core/ajax/constantonoff.php b/htdocs/core/ajax/constantonoff.php
index c7e5bbd8991..1ed8ca34076 100644
--- a/htdocs/core/ajax/constantonoff.php
+++ b/htdocs/core/ajax/constantonoff.php
@@ -57,8 +57,7 @@ if (!empty($action) && !empty($name))
 		if ($action == 'set')
 		{
 			dolibarr_set_const($db, $name, $value, 'chaine', 0, '', $entity);
-		}
-		elseif ($action == 'del')
+		} elseif ($action == 'del')
 		{
 			dolibarr_del_const($db, $name, $entity);
 		}
diff --git a/htdocs/core/ajax/extraparams.php b/htdocs/core/ajax/extraparams.php
index a3db4505f70..803155ce784 100644
--- a/htdocs/core/ajax/extraparams.php
+++ b/htdocs/core/ajax/extraparams.php
@@ -51,20 +51,11 @@ if (!empty($id) && !empty($element) && !empty($htmlelement) && !empty($type))
 	$classpath = $subelement = $element;
 
 	// For compatibility
-	if ($element == 'order' || $element == 'commande') { $classpath = $subelement = 'commande'; }
-	elseif ($element == 'propal') { $classpath = 'comm/propal'; $subelement = 'propal'; }
-	elseif ($element == 'facture') { $classpath = 'compta/facture'; $subelement = 'facture'; }
-	elseif ($element == 'contract') { $classpath = $subelement = 'contrat'; }
-	elseif ($element == 'shipping') { $classpath = $subelement = 'expedition'; }
-	elseif ($element == 'deplacement') { $classpath = 'compta/deplacement'; $subelement = 'deplacement'; }
-	elseif ($element == 'order_supplier') { $classpath = 'fourn'; $subelement = 'fournisseur.commande'; }
-	elseif ($element == 'invoice_supplier') { $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
+	if ($element == 'order' || $element == 'commande') { $classpath = $subelement = 'commande'; } elseif ($element == 'propal') { $classpath = 'comm/propal'; $subelement = 'propal'; } elseif ($element == 'facture') { $classpath = 'compta/facture'; $subelement = 'facture'; } elseif ($element == 'contract') { $classpath = $subelement = 'contrat'; } elseif ($element == 'shipping') { $classpath = $subelement = 'expedition'; } elseif ($element == 'deplacement') { $classpath = 'compta/deplacement'; $subelement = 'deplacement'; } elseif ($element == 'order_supplier') { $classpath = 'fourn'; $subelement = 'fournisseur.commande'; } elseif ($element == 'invoice_supplier') { $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
 
 	dol_include_once('/'.$classpath.'/class/'.$subelement.'.class.php');
 
-	if ($element == 'order_supplier') { $classname = 'CommandeFournisseur'; }
-	elseif ($element == 'invoice_supplier') { $classname = 'FactureFournisseur'; }
-	else $classname = ucfirst($subelement);
+	if ($element == 'order_supplier') { $classname = 'CommandeFournisseur'; } elseif ($element == 'invoice_supplier') { $classname = 'FactureFournisseur'; } else $classname = ucfirst($subelement);
 
 	$object = new $classname($db);
 	$object->fetch($id);
diff --git a/htdocs/core/ajax/loadinplace.php b/htdocs/core/ajax/loadinplace.php
index 742e22a5a9f..b1a72868312 100644
--- a/htdocs/core/ajax/loadinplace.php
+++ b/htdocs/core/ajax/loadinplace.php
@@ -62,8 +62,7 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 	elseif ($element == 'order_supplier') {
 		$element = 'fournisseur';
 		$subelement = 'commande';
-	}
-	elseif ($element == 'invoice_supplier') {
+	} elseif ($element == 'invoice_supplier') {
 		$element = 'fournisseur';
 		$subelement = 'facture';
 	}
@@ -83,8 +82,7 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 			{
 				$ret = $form->$methodname();
 				if ($ret > 0) echo json_encode($form->$cachename);
-			}
-			elseif (!empty($ext_element))
+			} elseif (!empty($ext_element))
 			{
 				$module = $subelement = $ext_element;
 				if (preg_match('/^([^_]+)_([^_]+)/i', $ext_element, $regs))
@@ -99,14 +97,12 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 				$ret = $object->$methodname($fk_element);
 				if ($ret > 0) echo json_encode($object->$cachename);
 			}
-		}
-		else {
+		} else {
 			$object = new GenericObject($db);
 			$value = $object->$loadmethod($table_element, $fk_element, $field);
 			echo $value;
 		}
-	}
-	else {
+	} else {
 		echo $langs->transnoentities('NotEnoughPermissions');
 	}
 }
diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index 6466df89a07..6c9f97bfbb0 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -58,11 +58,9 @@ print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"])
 
 if (in_array($field, array('status'))) {
 	$result = restrictedArea($user, $element, $id);
-}
-elseif ($element == 'product' && in_array($field, array('tosell', 'tobuy', 'tobatch'))) {	// Special case for products
+} elseif ($element == 'product' && in_array($field, array('tosell', 'tobuy', 'tobatch'))) {	// Special case for products
 	$result = restrictedArea($user, 'produit|service', $id, 'product&product', '', '', 'rowid');
-}
-else {
+} else {
 	accessforbidden("Bad value for combination of parameters element/field.", 0, 0, 1);
 	exit;
 }
diff --git a/htdocs/core/ajax/pingresult.php b/htdocs/core/ajax/pingresult.php
index a914470e50d..e08b2c5efcf 100644
--- a/htdocs/core/ajax/pingresult.php
+++ b/htdocs/core/ajax/pingresult.php
@@ -66,7 +66,6 @@ elseif ($action == 'firstpingko')
 	// Note: pings are by installation, done on entity 1.
 	dolibarr_set_const($db, 'MAIN_LAST_PING_KO_DATE', dol_print_date($now, 'dayhourlog'), 'gmt'); // erase last value
 	print 'First ping KO saved for entity '.$conf->entity;
-}
-else {
+} else {
 	print 'Error action='.$action.' not supported';
 }
diff --git a/htdocs/core/ajax/price.php b/htdocs/core/ajax/price.php
index 4e4e302d439..0dec4d21c68 100644
--- a/htdocs/core/ajax/price.php
+++ b/htdocs/core/ajax/price.php
@@ -51,8 +51,7 @@ if (!empty($output) && isset($amount) && isset($tva_tx))
 			$price = price2num($amount * (1 + ($tva_tx / 100)), 'MU');
 			$return['price_ht'] = $amount;
 			$return['price_ttc'] = (isset($price) && $price != '' ? price($price) : '');
-		}
-		elseif ($output == 'price_ht') {
+		} elseif ($output == 'price_ht') {
 			$price = price2num($amount / (1 + ($tva_tx / 100)), 'MU');
 			$return['price_ht'] = (isset($price) && $price != '' ? price($price) : '');
 			$return['price_ttc'] = ($tva_tx == 0 ? $price : $amount);
diff --git a/htdocs/core/ajax/saveinplace.php b/htdocs/core/ajax/saveinplace.php
index 4c5e472d878..5c7d363a2f9 100644
--- a/htdocs/core/ajax/saveinplace.php
+++ b/htdocs/core/ajax/saveinplace.php
@@ -85,12 +85,10 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 	elseif ($element == 'order_supplier') {
 		$newelement = 'fournisseur';
 		$subelement = 'commande';
-	}
-	elseif ($element == 'invoice_supplier') {
+	} elseif ($element == 'invoice_supplier') {
 		$newelement = 'fournisseur';
 		$subelement = 'facture';
-	}
-	else $newelement = $element;
+	} else $newelement = $element;
 
 	$_POST['action'] = 'update'; // Hack so restrictarea will test permissions on write too
 	$feature = $newelement;
@@ -130,14 +128,12 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 				$error++;
 				$return['error'] = $langs->trans('ErrorBadValue');
 			}
-		}
-		elseif ($type == 'datepicker')
+		} elseif ($type == 'datepicker')
 		{
 			$timestamp = GETPOST('timestamp', 'int', 2);
 			$format = 'date';
 			$newvalue = ($timestamp / 1000);
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			$loadmethodname = 'load_cache_'.$loadmethod;
 			$loadcachename = 'cache_'.$loadmethod;
@@ -157,13 +153,11 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 						$loadview = $form->$loadviewname;
 						$view = $loadview[$newvalue];
 					}
-				}
-				else {
+				} else {
 					$error++;
 					$return['error'] = $form->error;
 				}
-			}
-			else {
+			} else {
 				$module = $subelement = $ext_element;
 				if (preg_match('/^([^_]+)_([^_]+)/i', $ext_element, $regs))
 				{
@@ -185,8 +179,7 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 						$loadview = $object->$loadviewname;
 						$view = $loadview[$newvalue];
 					}
-				}
-				else {
+				} else {
 					$error++;
 					$return['error'] = $object->error;
 				}
@@ -212,15 +205,13 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 
 				$return['value'] = $value;
 				$return['view'] = (!empty($view) ? $view : $value);
-			}
-			else {
+			} else {
 				$return['error'] = $object->error;
 			}
 		}
 
 		echo json_encode($return);
-	}
-	else {
+	} else {
 		echo $langs->trans('NotEnoughPermissions');
 	}
 }
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 31a95d1e02c..21d6ae9aad1 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -161,8 +161,7 @@ $reshook = $hookmanager->executeHooks('addSearchEntry', $parameters);
 if (empty($reshook))
 {
 	$arrayresult = array_merge($arrayresult, $hookmanager->resArray);
-}
-else $arrayresult = $hookmanager->resArray;
+} else $arrayresult = $hookmanager->resArray;
 
 // This allow to keep a search entry to the top
 if (!empty($conf->global->DEFAULT_SEARCH_INTO_MODULE)) {
diff --git a/htdocs/core/ajax/vatrates.php b/htdocs/core/ajax/vatrates.php
index 92dd41fd64e..b0ab6ed2a7e 100644
--- a/htdocs/core/ajax/vatrates.php
+++ b/htdocs/core/ajax/vatrates.php
@@ -52,8 +52,7 @@ if (!empty($id) && !empty($action) && !empty($htmlname))
 	{
 		$seller = $mysoc;
 		$buyer = $soc;
-	}
-	else {
+	} else {
 		$buyer = $mysoc;
 		$seller = $soc;
 	}
diff --git a/htdocs/core/ajax/ziptown.php b/htdocs/core/ajax/ziptown.php
index 6c04318bd7f..568fd5b2f4c 100644
--- a/htdocs/core/ajax/ziptown.php
+++ b/htdocs/core/ajax/ziptown.php
@@ -75,8 +75,7 @@ if (!empty($_GET['zipcode']) || !empty($_GET['town']))
 		if ($town)    $sql .= " AND z.town LIKE '%".$db->escape($town)."%'";
 		$sql .= " ORDER BY z.zip, z.town";
 		$sql .= $db->plimit(100); // Avoid pb with bad criteria
-	}
-	else // Use table of third parties
+	} else // Use table of third parties
 	{
 		$sql = "SELECT DISTINCT s.zip, s.town, s.fk_departement as fk_county, s.fk_pays as fk_country";
 		$sql .= ", c.code as country_code, c.label as country";
@@ -128,8 +127,7 @@ if (!empty($_GET['zipcode']) || !empty($_GET['town']))
 	}
 
 	echo json_encode($return_arr);
-}
-else {
+} else {
 }
 
 $db->close();
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index 9c4fafd0bbd..a951402fd7b 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -244,8 +244,7 @@ class box_actions extends ModeleBoxes
 					$out .= '}, '.($conf->global->SHOW_DIALOG_HOMEPAGE * 1000).');';
 				}
 				$out .= '</script>';
-			}
-			else {
+			} else {
 				$out .= '<script>';
 				$out .= '$("#dialogboxaction").dialog({ autoOpen: false });';
 				$out .= '</script>';
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 29b249ce2c4..a59edbbf337 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -141,8 +141,7 @@ class box_activity extends ModeleBoxes
         		} else {
         			dol_print_error($this->db);
         		}
-        	}
-        	else {
+        	} else {
         		$data = dol_readcachefile($cachedir, $filename);
         	}
 
diff --git a/htdocs/core/boxes/box_birthdays.php b/htdocs/core/boxes/box_birthdays.php
index 17dd29057b3..e6d032d41f8 100644
--- a/htdocs/core/boxes/box_birthdays.php
+++ b/htdocs/core/boxes/box_birthdays.php
@@ -132,16 +132,14 @@ class box_birthdays extends ModeleBoxes
 				if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'class="center opacitymedium"', 'text'=>$langs->trans("None"));
 
 				$this->db->free($result);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql)
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_birthdays_members.php b/htdocs/core/boxes/box_birthdays_members.php
index 010bf8e7f21..e49d21ba387 100644
--- a/htdocs/core/boxes/box_birthdays_members.php
+++ b/htdocs/core/boxes/box_birthdays_members.php
@@ -133,16 +133,14 @@ class box_birthdays_members extends ModeleBoxes
 				if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'class="center opacitymedium"', 'text'=>$langs->trans("None"));
 
 				$this->db->free($result);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql)
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index 5b3b81f7865..c81e226decb 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -79,8 +79,7 @@ class box_bookmarks extends ModeleBoxes
         if ($user->rights->bookmark->creer) {
 			$this->info_box_head['subpicto'] = 'bookmark';
 			$this->info_box_head['subtext'] = $langs->trans("BookmarksManagement");
-		}
-		else {
+		} else {
 			$this->info_box_head['subpicto'] = 'bookmark';
 			$this->info_box_head['subtext'] = $langs->trans("ListOfBookmark");
 		}
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 70718db55b5..00cad787e0b 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -154,16 +154,14 @@ class box_clients extends ModeleBoxes
 				);
 
 				$this->db->free($result);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql)
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index f4220377d77..48268b28914 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -103,8 +103,7 @@ class box_external_rss extends ModeleBoxes
             // Show warning
             $title .= " ".img_error($langs->trans("FailedToRefreshDataInfoNotUpToDate", ($rssparser->getLastFetchDate() ?dol_print_date($rssparser->getLastFetchDate(), "dayhourtext") : $langs->trans("Unknown"))));
             $this->info_box_head = array('text' => $title, 'limit' => 0);
-        }
-        else {
+        } else {
             $this->info_box_head = array(
                 'text' => $title,
                 'sublink' => $link,
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 581baddd7b5..f5fe3e76dde 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -186,16 +186,14 @@ class box_factures_imp extends ModeleBoxes
 				);
 
 				$this->db->free($result);
-			}
-			else {
+			} else {
                 $this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql),
                 );
 			}
-		}
-		else {
+		} else {
             $this->info_box_contents[0][0] = array(
                 'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index 365a9ff8b48..2c104bea729 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -151,16 +151,14 @@ class box_ficheinter extends ModeleBoxes
 				);
 
 				$this->db->free($resql);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql),
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
 			    'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index 46dfdff6d23..66497c2e94f 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -148,16 +148,14 @@ class box_goodcustomers extends ModeleBoxes
 				);
 
 				$this->db->free($result);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql),
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
 				'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 6f3005262a8..9d5aeda7b36 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -111,8 +111,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 				$endyear = GETPOST($param_year, 'int');
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
-			}
-			else {
+			} else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 				$endyear = $tmparray['year'];
 				$shownb = $tmparray['shownb'];
@@ -152,8 +151,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else {
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -198,8 +196,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else {
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -267,12 +264,10 @@ class box_graph_invoices_permonth extends ModeleBoxes
 					$stringtoshow .= '</div>';
 				}
 				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover center"', 'textnoformat'=>$stringtoshow);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover left"', 'maxlength'=>500, 'text' => $mesg);
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index 44c8831ddfe..b9fde24b759 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -108,8 +108,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				$endyear = GETPOST($param_year, 'int');
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
-			}
-			else {
+			} else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 				$endyear = $tmparray['year'];
 				$shownb = $tmparray['shownb'];
@@ -150,8 +149,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else {
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -195,8 +193,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else {
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -264,8 +261,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 					$stringtoshow .= '</div>';
 				}
 				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover center"', 'textnoformat'=>$stringtoshow);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'tr'=>'class="oddeven nohover"',
                     'td' => 'class="nohover left"',
@@ -273,8 +269,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
                     'text' => $mesg,
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index ecc80696534..2ff1a579798 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -111,8 +111,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 				$endyear = GETPOST($param_year, 'int');
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
-			}
-			else {
+			} else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 				$endyear = $tmparray['year'];
 				$shownb = $tmparray['shownb'];
@@ -151,8 +150,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else {
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -194,8 +192,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else {
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -267,8 +264,7 @@ class box_graph_orders_permonth extends ModeleBoxes
                     'td' => 'class="nohover center"',
                     'textnoformat'=>$stringtoshow,
                 );
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'tr'=>'class="oddeven nohover"',
                     'td' => 'class="nohover left"',
@@ -276,8 +272,7 @@ class box_graph_orders_permonth extends ModeleBoxes
                     'text' => $mesg,
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index 845f93b9edf..fb40ee1f68f 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -110,8 +110,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 				$endyear = GETPOST($param_year, 'int');
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
-			}
-			else {
+			} else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 				$endyear = $tmparray['year'];
 				$shownb = $tmparray['shownb'];
@@ -150,8 +149,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else {
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -193,8 +191,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else {
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -266,8 +263,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
                     'td' => 'class="nohover center"',
                     'textnoformat'=>$stringtoshow,
                 );
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'tr'=>'class="oddeven nohover"',
                     'td' => 'class="nohover left"',
@@ -275,8 +271,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
                     'text' => $mesg,
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 9e9c81ab8b9..fbf1874a132 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -94,8 +94,7 @@ class box_graph_product_distribution extends ModeleBoxes
 			$showinvoicenb = GETPOST($param_showinvoicenb, 'alpha');
 			$showpropalnb = GETPOST($param_showpropalnb, 'alpha');
 			$showordernb = GETPOST($param_showordernb, 'alpha');
-		}
-		else {
+		} else {
 			$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 			$year = $tmparray['year'];
 			$showinvoicenb = $tmparray['showinvoicenb'];
@@ -392,8 +391,7 @@ class box_graph_product_distribution extends ModeleBoxes
                 'td' => 'class="nohover center"',
                 'textnoformat'=>$stringtoshow,
             );
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
 				'maxlength'=>500,
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index 4d5e8be37b8..4231638948a 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -111,8 +111,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 				$endyear = GETPOST($param_year, 'int');
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
-			}
-			else {
+			} else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 				$endyear = $tmparray['year'];
 				$shownb = $tmparray['shownb'];
@@ -149,8 +148,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else {
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -194,8 +192,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
                             $legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else {
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -267,8 +264,7 @@ class box_graph_propales_permonth extends ModeleBoxes
                     'td' => 'class="nohover center"',
                     'textnoformat'=>$stringtoshow,
                 );
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'tr'=>'class="oddeven nohover"',
                     'td' => 'class="nohover left"',
@@ -276,8 +272,7 @@ class box_graph_propales_permonth extends ModeleBoxes
                     'text' => $mesg,
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 58e6aa70157..8dffe4adf20 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -149,8 +149,7 @@ class box_produits extends ModeleBoxes
                     if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression)) {
                         $price_base_type = $langs->trans($objp->price_base_type);
                         $price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
-	                }
-	                else //Parse the dynamic price
+	                } else //Parse the dynamic price
 	               	{
 						$productstatic->fetch($objp->rowid, '', '', 1);
 	                    $priceparser = new PriceParser($this->db);
@@ -159,8 +158,7 @@ class box_produits extends ModeleBoxes
 							if ($objp->price_base_type == 'HT')
 							{
 								$price_base_type = $langs->trans("HT");
-							}
-							else {
+							} else {
 								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
 								$price_base_type = $langs->trans("TTC");
 							}
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 48cd8c0d893..60ab41d22cb 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -158,8 +158,7 @@ class box_produits_alerte_stock extends ModeleBoxes
                     {
                         $price_base_type = $langs->trans($objp->price_base_type);
                         $price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
-	                }
-	                else //Parse the dynamic price
+	                } else //Parse the dynamic price
 	               	{
 						$productstatic->fetch($objp->rowid, '', '', 1);
 	                    $priceparser = new PriceParser($this->db);
@@ -168,8 +167,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 							if ($objp->price_base_type == 'HT')
 							{
 								$price_base_type = $langs->trans("HT");
-							}
-							else {
+							} else {
 								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
 								$price_base_type = $langs->trans("TTC");
 							}
@@ -214,16 +212,14 @@ class box_produits_alerte_stock extends ModeleBoxes
                     );
 
 				$this->db->free($result);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql),
                 );
 			}
-		}
-		else {
+		} else {
             $this->info_box_contents[0][0] = array(
                 'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index 0b5044cf5f6..f81e8e72a51 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -186,8 +186,7 @@ class box_services_contracts extends ModeleBoxes
 						}
 
 						$s = $form->textwithtooltip($text, $description, 3, '', '', $cursorline, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
-					}
-					else {
+					} else {
 						$s = img_object($langs->trans("ShowProductOrService"), ($objp->product_type ? 'service' : 'product')).' '.dol_htmlentitiesbr($objp->description);
 					}
 
@@ -228,16 +227,14 @@ class box_services_contracts extends ModeleBoxes
 				);
 
 				$this->db->free($result);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength' => 500,
                     'text' => ($this->db->error().' sql='.$sql),
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index ba7eed039e3..d7b3433f6d2 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -170,16 +170,14 @@ class box_services_expired extends ModeleBoxes
     			}
 
 				$this->db->free($resql);
-    		}
-    		else {
+    		} else {
     			$this->info_box_contents[0][] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql),
                 );
     		}
-    	}
-    	else {
+    	} else {
     		$this->info_box_contents[0][0] = array(
     		    'td' => 'class="nohover opacitymedium left"',
     		    'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 14facd65886..5ba940f2af2 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -167,8 +167,7 @@ class box_supplier_orders extends ModeleBoxes
                     'text' => ($this->db->error().' sql='.$sql),
                 );
             }
-        }
-        else {
+        } else {
             $this->info_box_contents[0][] = array(
                 'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
index c1a31616f56..952e0b78d92 100644
--- a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
+++ b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
@@ -174,8 +174,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
                     'text' => ($this->db->error().' sql='.$sql),
                 );
             }
-        }
-        else {
+        } else {
             $this->info_box_contents[0][] = array(
                 'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index f9a974ae1c5..55557cd355a 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -93,15 +93,13 @@ class box_task extends ModeleBoxes
         $filterValue = 'all';
         if (in_array(GETPOST($cookie_name), array('all', 'im_project_contact', 'im_task_contact'))) {
             $filterValue = GETPOST($cookie_name);
-        }
-        elseif (!empty($_COOKIE[$cookie_name])) {
+        } elseif (!empty($_COOKIE[$cookie_name])) {
             $filterValue = $_COOKIE[$cookie_name];
         }
 
         if ($filterValue == 'im_task_contact') {
             $textHead .= ' : '.$langs->trans("WhichIamLinkedTo");
-        }
-        elseif ($filterValue == 'im_project_contact') {
+        } elseif ($filterValue == 'im_project_contact') {
             $textHead .= ' : '.$langs->trans("WhichIamLinkedToProject");
         }
 
@@ -158,8 +156,7 @@ class box_task extends ModeleBoxes
             if ($filterValue === 'im_task_contact') {
                 $sql .= " JOIN ".MAIN_DB_PREFIX."element_contact as ec ON (ec.element_id = pt.rowid AND ec.fk_socpeople = '".$user->id."' )";
                 $sql .= " JOIN ".MAIN_DB_PREFIX."c_type_contact  as tc ON (ec.fk_c_type_contact = tc.rowid AND tc.element = 'project_task' AND tc.source = 'internal' )";
-            }
-            elseif ($filterValue === 'im_project_contact') {
+            } elseif ($filterValue === 'im_project_contact') {
                 $sql .= " JOIN ".MAIN_DB_PREFIX."element_contact as ec ON (ec.element_id = p.rowid AND ec.fk_socpeople = '".$user->id."' )";
                 $sql .= " JOIN ".MAIN_DB_PREFIX."c_type_contact  as tc ON (ec.fk_c_type_contact = tc.rowid AND tc.element = 'project' AND tc.source = 'internal' )";
             }
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 1ed28d34a7f..e5fa9d8fb0d 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -161,12 +161,10 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 				$this->box_order = $obj->box_order;
 				$this->fk_user = $obj->fk_user;
 				return 1;
-			}
-			else {
+			} else {
 				return -1;
 			}
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -436,12 +434,10 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 						{
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateWidget", $modName, "").'</div>';
-						}
-						else {
+						} else {
 							try {
 								include_once $newdir.'/'.$file;
-							}
-							catch (Exception $e)
+							} catch (Exception $e)
 							{
 								print $e->getMessage();
 							}
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index cd0bc4f5e47..1b5faeff52e 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -215,8 +215,7 @@ class CMailFile
 		{
 			$this->msgishtml = 0;
 			if (dol_textishtml($msg)) $this->msgishtml = 1;
-		}
-		else {
+		} else {
 			$this->msgishtml = $msgishtml;
 		}
 
@@ -318,8 +317,7 @@ class CMailFile
 			$this->message = 'This is a message with multiple parts in MIME format.'.$this->eol;
 			$this->message .= $text_body.$files_encoded;
 			$this->message .= "--".$this->mixed_boundary."--".$this->eol;
-		}
-		elseif ($this->sendmode == 'smtps')
+		} elseif ($this->sendmode == 'smtps')
 		{
 			// Use SMTPS library
 			// ------------------------------------------
@@ -385,8 +383,7 @@ class CMailFile
 			$this->msgid = time().'.SMTPs-dolibarr-'.$trackid.'@'.$host;
 
 			$this->smtps = $smtps;
-		}
-		elseif ($this->sendmode == 'swiftmailer')
+		} elseif ($this->sendmode == 'swiftmailer')
 		{
 			// Use Swift Mailer library
             $host = dol_getprefix('email');
@@ -498,8 +495,7 @@ class CMailFile
 			if (!empty($addr_bcc)) $this->message->setBcc($this->getArrayAddress($addr_bcc));
 			//if (! empty($errors_to)) $this->message->setErrorsTo($this->getArrayAddress($errors_to);
 			if (isset($deliveryreceipt) && $deliveryreceipt == 1) $this->message->setReadReceiptTo($this->getArrayAddress($from));
-		}
-		else {
+		} else {
 			// Send mail method not correctly defined
 			// --------------------------------------
 			$this->error = 'Bad value for sendmode';
@@ -705,8 +701,7 @@ class CMailFile
 						$this->error .= ".<br>";
 						$this->error .= $langs->trans("ErrorPhpMailDelivery");
 						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					}
-					else {
+					} else {
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 					}
 				}
@@ -719,8 +714,7 @@ class CMailFile
 				// Restore parameters
 				if (!empty($conf->global->$keyforsmtpserver))	ini_restore('SMTP');
 				if (!empty($conf->global->$keyforsmtpport)) 	ini_restore('smtp_port');
-			}
-			elseif ($this->sendmode == 'smtps')
+			} elseif ($this->sendmode == 'smtps')
 			{
 				if (!is_object($this->smtps))
 				{
@@ -791,15 +785,13 @@ class CMailFile
 					{
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 						$res = true;
-					}
-					else {
+					} else {
 						if (empty($this->error)) $this->error = $result;
 						dol_syslog("CMailFile::sendfile: mail end error with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>".$this->error, LOG_ERR);
 						$res = false;
 					}
 				}
-			}
-			elseif ($this->sendmode == 'swiftmailer')
+			} elseif ($this->sendmode == 'swiftmailer')
 			{
                 // Use Swift Mailer library
                 // ------------------------------------------
@@ -856,12 +848,10 @@ class CMailFile
 				if (!empty($this->error) || !$result) {
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res = false;
-				}
-				else {
+				} else {
 					dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 				}
-			}
-			else {
+			} else {
 				// Send mail method not correctly defined
 				// --------------------------------------
 
@@ -877,8 +867,7 @@ class CMailFile
 
 				return $reshook;
 			}
-		}
-		else {
+		} else {
 			$this->error = 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 			dol_syslog("CMailFile::sendfile: ".$this->error, LOG_WARNING);
 		}
@@ -917,8 +906,7 @@ class CMailFile
 			$contents = file_get_contents($newsourcefile); // Need PHP 4.3
 			$encoded = chunk_split(base64_encode($contents), 76, $this->eol); // 76 max is defined into http://tools.ietf.org/html/rfc2047
 			return $encoded;
-		}
-		else {
+		} else {
 			$this->error = "Error: Can't read file '".$sourcefile."' into _encode_file";
 			dol_syslog("CMailFile::encode_file: ".$this->error, LOG_ERR);
 			return -1;
@@ -949,12 +937,10 @@ class CMailFile
 				fputs($fp, $this->headers);
 				fputs($fp, $this->eol); // This eol is added by the mail function, so we add it in log
 				fputs($fp, $this->message);
-			}
-			elseif ($this->sendmode == 'smtps')
+			} elseif ($this->sendmode == 'smtps')
 			{
 				fputs($fp, $this->smtps->log); // this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
-			}
-			elseif ($this->sendmode == 'swiftmailer')
+			} elseif ($this->sendmode == 'swiftmailer')
 			{
 				fputs($fp, $this->logger->dump()); // this->logger is filled only if MAIN_MAIL_DEBUG was set to on
 			}
@@ -983,8 +969,7 @@ class CMailFile
 			$out .= ">";
 			$out .= $msg;
 			$out .= "</body></html>";
-		}
-		else {
+		} else {
 			$out = $msg;
 		}
 
@@ -1065,8 +1050,7 @@ class CMailFile
 			$out .= 'Message-ID: <'.$this->msgid.">".$this->eol2; // Uppercase seems replaced by phpmail
 			$out .= 'References: <'.$this->msgid.">".$this->eol2;
 			$out .= 'X-Dolibarr-TRACKID: '.$trackid.'@'.$host.$this->eol2;
-		}
-		else {
+		} else {
 			$this->msgid = time().'.phpmail@'.$host;
 			$out .= 'Message-ID: <'.$this->msgid.">".$this->eol2;
 		}
@@ -1195,8 +1179,7 @@ class CMailFile
 			{
 				$out .= "--".$this->alternative_boundary."--".$this->eol;
 			}
-		}
-		else {
+		} else {
 			$out .= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
 			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
 			$out .= $this->eol.$strContent.$this->eol;
@@ -1254,8 +1237,7 @@ class CMailFile
 					$out .= $encoded;
 					$out .= $this->eol;
 					//$out.= $this->eol;
-				}
-				else {
+				} else {
 					return $encoded;
 				}
 			}
@@ -1353,8 +1335,7 @@ class CMailFile
 
 				// Check response from Server
 				if ($_retVal = $this->server_parse($socket, "220")) $_retVal = $socket;
-			}
-			else {
+			} else {
 				$this->error = utf8_check('Error '.$errno.' - '.$errstr) ? 'Error '.$errno.' - '.$errstr : utf8_encode('Error '.$errno.' - '.$errstr);
 			}
 		}
@@ -1474,14 +1455,12 @@ class CMailFile
 					}
 					$i++;
 				}
-			}
-			else {
+			} else {
 				return -1;
 			}
 
 			return 1;
-		}
-		else {
+		} else {
 			return 0;
 		}
 	}
@@ -1517,8 +1496,7 @@ class CMailFile
 			{
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
-			}
-			else {
+			} else {
 				$name  = '';
 				$email = trim($val);
 			}
@@ -1587,8 +1565,7 @@ class CMailFile
 			{
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
-			}
-			else {
+			} else {
 				$name  = null;
 				$email = trim($val);
 			}
diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
index 429abb8c20d..4e496408f1d 100644
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
@@ -140,14 +140,12 @@ class CSMSFile
 				{
 					$this->error = $sms->error;
 					dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
-				}
-				else {
+				} else {
 					dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
 					//var_dump($res);        // 1973128
 					if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
 				}
-			}
-		    elseif (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
+			} elseif (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
 		    {
 		        $tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
 		        $classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
@@ -174,26 +172,22 @@ class CSMSFile
     				if ($res <= 0)
     				{
     					dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
-    				}
-    				else {
+    				} else {
     					dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
     					//var_dump($res);        // 1973128
     					if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
     				}
-		        }
-		        catch (Exception $e)
+		        } catch (Exception $e)
 		        {
 		            dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
 		        }
-		    }
-			else {
+		    } else {
 				// Send sms method not correctly defined
 				// --------------------------------------
 
 				return 'Bad value for MAIN_SMS_SENDMODE constant';
 			}
-		}
-		else {
+		} else {
 			$this->error = 'No sms sent. Feature is disabled by option MAIN_DISABLE_ALL_SMS';
 			dol_syslog("CSMSFile::sendfile: ".$this->error, LOG_WARNING);
 		}
diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index ecec6a415f5..cf671eb57ca 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -138,8 +138,7 @@ class Ccountry // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -183,12 +182,10 @@ class Ccountry // extends CommonObject
 
                 $this->db->free($resql);
                 return 1;
-            }
-            else {
+            } else {
                 return 0;
             }
-        }
-        else {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -241,8 +238,7 @@ class Ccountry // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -280,8 +276,7 @@ class Ccountry // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
diff --git a/htdocs/core/class/comment.class.php b/htdocs/core/class/comment.class.php
index e7c53ce7ad6..91fba374181 100644
--- a/htdocs/core/class/comment.class.php
+++ b/htdocs/core/class/comment.class.php
@@ -156,8 +156,7 @@ class Comment extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return $this->id;
 		}
@@ -215,8 +214,7 @@ class Comment extends CommonObject
 
 			if ($num_rows) return 1;
 			else return 0;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -278,8 +276,7 @@ class Comment extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 112c4044b17..a9b75cd5ad6 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -794,12 +794,10 @@ abstract class CommonDocGenerator
 					$object->array_options['options_'.$key.'_currency'] = price($object->array_options['options_'.$key], 0, $outputlangs, 0, 0, -1, $conf->currency);
 					//Add value to store price with currency
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency']));
-				}
-				elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'select')
+				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'select')
 				{
 					$object->array_options['options_'.$key] = $extrafields->attributes[$object->table_element]['param'][$key]['options'][$object->array_options['options_'.$key]];
-				}
-				elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'checkbox') {
+				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'checkbox') {
 					$valArray = explode(',', $object->array_options['options_'.$key]);
 					$output = array();
 					foreach ($extrafields->attributes[$object->table_element]['param'][$key]['options'] as $keyopt=>$valopt) {
@@ -808,8 +806,7 @@ abstract class CommonDocGenerator
 						}
 					}
 					$object->array_options['options_'.$key] = implode(', ', $output);
-				}
-				elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'date')
+				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'date')
 				{
 					if (strlen($object->array_options['options_'.$key]) > 0)
 					{
@@ -817,16 +814,14 @@ abstract class CommonDocGenerator
 						$object->array_options['options_'.$key] = dol_print_date($date, 'day'); // using company output language
 						$object->array_options['options_'.$key.'_locale'] = dol_print_date($date, 'day', 'tzserver', $outputlangs); // using output language format
 						$object->array_options['options_'.$key.'_rfc'] = dol_print_date($date, 'dayrfc'); // international format
-					}
-					else {
+					} else {
 						$object->array_options['options_'.$key] = '';
 						$object->array_options['options_'.$key.'_locale'] = '';
 						$object->array_options['options_'.$key.'_rfc'] = '';
 					}
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
-				}
-				elseif ($extrafields->attributes[$object->table_element]['label'][$key] == 'datetime')
+				} elseif ($extrafields->attributes[$object->table_element]['label'][$key] == 'datetime')
 				{
 					$datetime = $object->array_options['options_'.$key];
 					$object->array_options['options_'.$key] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhour') : ''); // using company output language
@@ -834,8 +829,7 @@ abstract class CommonDocGenerator
 					$object->array_options['options_'.$key.'_rfc'] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhourrfc') : ''); // international format
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
-				}
-				elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'link')
+				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'link')
 				{
 					$id = $object->array_options['options_'.$key];
 					if ($id != "")
@@ -945,8 +939,7 @@ abstract class CommonDocGenerator
 
             if (empty($colDef['width'])) {
                 $countFlexCol++;
-            }
-            else {
+            } else {
                 $totalDefinedColWidth += $colDef['width'];
             }
         }
@@ -956,16 +949,14 @@ abstract class CommonDocGenerator
             // setting empty conf with default
             if (!empty($colDef['title'])) {
                 $colDef['title'] = array_replace($this->defaultTitlesFieldsStyle, $colDef['title']);
-            }
-            else {
+            } else {
                 $colDef['title'] = $this->defaultTitlesFieldsStyle;
             }
 
             // setting empty conf with default
             if (!empty($colDef['content'])) {
                 $colDef['content'] = array_replace($this->defaultContentsFieldsStyle, $colDef['content']);
-            }
-            else {
+            } else {
                 $colDef['content'] = $this->defaultContentsFieldsStyle;
             }
 
@@ -1321,8 +1312,7 @@ abstract class CommonDocGenerator
                     $html .= $field->content;
                     $i++;
                 }
-            }
-            elseif ($params['display'] == 'table') {
+            } elseif ($params['display'] == 'table') {
                 // Display in table format
                 $html .= '<table class="extrafield-table" cellspacing="'.$params['table']['cellspacing'].'" cellpadding="'.$params['table']['cellpadding'].'" border="'.$params['table']['border'].'">';
 
@@ -1387,8 +1377,7 @@ abstract class CommonDocGenerator
     {
         if (!empty($this->cols[$colKey]['status'])) {
             return true;
-        }
-        else return  false;
+        } else return  false;
     }
 
     /**
@@ -1438,8 +1427,7 @@ abstract class CommonDocGenerator
                     if (is_object($outputlangsbis)) {
                         // set cell padding with column title definition
                         $pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], 0.5);
-                    }
-                    else {
+                    } else {
                         // set cell padding with column title definition
                         $pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], $colDef['title']['padding'][2]);
                     }
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 120a670b64a..81a553100f2 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -140,8 +140,7 @@ abstract class CommonInvoice extends CommonObject
 			$this->db->free($resql);
 			if ($multicurrency) return $obj->multicurrency_amount;
 			else return $obj->amount;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -169,8 +168,7 @@ abstract class CommonInvoice extends CommonObject
 	    if ($result >= 0)
 	    {
 	        return $result;
-	    }
-	    else {
+	    } else {
 	        $this->error = $discountstatic->error;
 	        return -1;
 	    }
@@ -191,8 +189,7 @@ abstract class CommonInvoice extends CommonObject
 	    if ($result >= 0)
 	    {
 	        return $result;
-	    }
-	    else {
+	    } else {
 	        $this->error = $discountstatic->error;
 	        return -1;
 	    }
@@ -213,8 +210,7 @@ abstract class CommonInvoice extends CommonObject
 	    if ($result >= 0)
 	    {
 	        return $result;
-	    }
-	    else {
+	    } else {
 	        $this->error = $discountstatic->error;
 	        return -1;
 	    }
@@ -244,8 +240,7 @@ abstract class CommonInvoice extends CommonObject
 				$idarray[] = $row[0];
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 		return $idarray;
@@ -279,13 +274,11 @@ abstract class CommonInvoice extends CommonObject
 			{
 				// If there is any
 				return $obj->rowid;
-			}
-			else {
+			} else {
 				// If no invoice replaces it
 				return 0;
 			}
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -345,8 +338,7 @@ abstract class CommonInvoice extends CommonObject
 				$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
 				$sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$this->id;
 				$sql .= ' AND (f.type = 2 OR f.type = 0 OR f.type = 3)'; // Find discount coming from credit note or excess received or deposits (payments from deposits are always null except if FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is set)
-			}
-			elseif ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
+			} elseif ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
 			{
 				$sql = 'SELECT rc.amount_ttc as amount, rc.multicurrency_amount_ttc as multicurrency_amount, rc.datec as date, f.ref as ref, rc.description as type';
 				$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
@@ -365,14 +357,12 @@ abstract class CommonInvoice extends CommonObject
 						$obj = $this->db->fetch_object($resql);
 						if ($multicurrency) {
 							$retarray[] = array('amount'=>$obj->multicurrency_amount, 'type'=>$obj->type, 'date'=>$obj->date, 'num'=>'0', 'ref'=>$obj->ref);
-						}
-						else {
+						} else {
 							$retarray[] = array('amount'=>$obj->amount, 'type'=>$obj->type, 'date'=>$obj->date, 'num'=>'', 'ref'=>$obj->ref);
 						}
 						$i++;
 					}
-				}
-				else {
+				} else {
 					$this->error = $this->db->lasterror();
 					dol_print_error($this->db);
 					return array();
@@ -381,8 +371,7 @@ abstract class CommonInvoice extends CommonObject
 			}
 
 			return $retarray;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
 			return array();
@@ -473,8 +462,7 @@ abstract class CommonInvoice extends CommonObject
 			{
 				$alreadydispatched = $obj->nb;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -539,40 +527,33 @@ abstract class CommonInvoice extends CommonObject
 		    if ($status == 0) {
 		        $labelStatus = $langs->trans('BillStatusDraft');
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusDraft');
-		    }
-		    elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {
+		    } elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {
 		        $labelStatus = $langs->trans('BillStatusClosedUnpaid');
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
 		        $statusType = 'status5';
-		    }
-		    elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {
+		    } elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {
 		        $labelStatus = $langs->trans('BillStatusClosedPaidPartially');
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
 		        $statusType = 'status9';
-		    }
-		    elseif ($alreadypaid <= 0) {
+		    } elseif ($alreadypaid <= 0) {
 		        $labelStatus = $langs->trans('BillStatusNotPaid');
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusNotPaid');
 		        $statusType = 'status1';
-		    }
-		    else {
+		    } else {
 		        $labelStatus = $langs->trans('BillStatusStarted');
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusStarted');
 		        $statusType = 'status3';
 		    }
-		}
-		else {
+		} else {
 		    $statusType = 'status6';
 
 		    if ($type == self::TYPE_CREDIT_NOTE) {
 		        $labelStatus = $langs->trans('BillStatusPaidBackOrConverted'); // credit note
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted'); // credit note
-		    }
-		    elseif ($type == self::TYPE_DEPOSIT) {
+		    } elseif ($type == self::TYPE_DEPOSIT) {
 		        $labelStatus = $langs->trans('BillStatusConverted'); // deposit invoice
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusConverted'); // deposit invoice
-		    }
-		    else {
+		    } else {
 		        $labelStatus = $langs->trans('BillStatusPaid');
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusPaid');
 		    }
@@ -618,8 +599,7 @@ abstract class CommonInvoice extends CommonObject
 				$cdr_type = $obj->type_cdr;
 				$cdr_decalage = $obj->decalage;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -645,8 +625,7 @@ abstract class CommonInvoice extends CommonObject
 			{
 				$mois = 1;
 				$annee += 1;
-			}
-			else {
+			} else {
 				$mois += 1;
 			}
 			// We move at the beginning of the next month, and we take a day off
@@ -669,8 +648,7 @@ abstract class CommonInvoice extends CommonObject
 
 			if ($diff < 0) $datelim = $date_lim_current;
 			else $datelim = $date_lim_next;
-		}
-		else return 'Bad value for type_cdr in database for record cond_reglement = '.$cond_reglement;
+		} else return 'Bad value for type_cdr in database for record cond_reglement = '.$cond_reglement;
 
 		return $datelim;
 	}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 8364cedac2d..e1014509c0a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -705,8 +705,7 @@ abstract class CommonObject
 		{
             if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {
                 $out .= ($outdone ? ' - ' : '').$this->region.' - '.$this->state;
-            }
-            else {
+            } else {
                 $out .= ($outdone ? ' - ' : '').$this->state;
             }
 			$outdone++;
@@ -833,10 +832,8 @@ abstract class CommonObject
 					$this->errors = $ecmfile->errors;
 				}
 				*/
-			}
-			else return '';
-		}
-		elseif (empty($ecmfile->share))
+			} else return '';
+		} elseif (empty($ecmfile->share))
 		{
 			// Add entry into index
 			if ($initsharekey)
@@ -844,8 +841,7 @@ abstract class CommonObject
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 				$ecmfile->share = getRandomPassword(true);
 				$ecmfile->update($user);
-			}
-			else return '';
+			} else return '';
 		}
 		// Define $urlwithroot
 		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -867,8 +863,7 @@ abstract class CommonObject
 		if ($relativelink)
 		{
 			$linktoreturn = 'document.php'.($paramlink ? '?'.$paramlink : '');
-		}
-		else {
+		} else {
 			$linktoreturn = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
 		}
 
@@ -915,8 +910,7 @@ abstract class CommonObject
 		if (is_numeric($type_contact))
 		{
 			$id_type_contact = $type_contact;
-		}
-		else {
+		} else {
 			// We look for id type_contact
 			$sql = "SELECT tc.rowid";
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
@@ -979,16 +973,14 @@ abstract class CommonObject
 
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$this->error = $this->db->errno();
 					$this->db->rollback();
 					echo 'err rollback';
 					return -2;
-				}
-				else {
+				} else {
 					$this->error = $this->db->error();
 					$this->db->rollback();
 					return -1;
@@ -1043,8 +1035,7 @@ abstract class CommonObject
 		if ($resql)
 		{
 			return 0;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1080,8 +1071,7 @@ abstract class CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1117,8 +1107,7 @@ abstract class CommonObject
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1178,8 +1167,7 @@ abstract class CommonObject
 								   'nom'=>$obj->lastname, // For backward compatibility
 								   'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact,
 								   'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact);
-				}
-				else {
+				} else {
 					$tab[$i] = $obj->id;
 				}
 
@@ -1187,8 +1175,7 @@ abstract class CommonObject
 			}
 
 			return $tab;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
 			return -1;
@@ -1222,8 +1209,7 @@ abstract class CommonObject
 			$result = $this->update_contact($rowid, $newstatut);
 			$this->db->free($resql);
 			return $result;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			dol_print_error($this->db);
 			return -1;
@@ -1275,8 +1261,7 @@ abstract class CommonObject
 				$i++;
 			}
 			return $tab;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			//dol_print_error($this->db);
 			return null;
@@ -1357,8 +1342,7 @@ abstract class CommonObject
 				}
 			}
 			return $tab;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return null;
 		}
@@ -1418,8 +1402,7 @@ abstract class CommonObject
 				$result[$i] = $obj->fk_socpeople;
 				$i++;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return null;
 		}
@@ -1550,8 +1533,7 @@ abstract class CommonObject
 					$this->barcode_type_label = $obj->label;
 					$this->barcode_type_coder = $obj->coder;
 					return 1;
-				}
-				else {
+				} else {
 					dol_print_error($this->db);
 					return -1;
 				}
@@ -1758,8 +1740,7 @@ abstract class CommonObject
 				if (empty($this->fields) && method_exists($this, 'fetch'))
 				{
 					$result = $this->fetch($id);
-				}
-				else {
+				} else {
 					$result = $this->fetchCommon($id);
 				}
 				if ($result >= 0) $result = $this->call_trigger($trigkey, (!empty($fuser) && is_object($fuser)) ? $fuser : $user); // This may set this->errors
@@ -1771,13 +1752,11 @@ abstract class CommonObject
 				if (property_exists($this, $field)) $this->$field = $value;
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1822,8 +1801,7 @@ abstract class CommonObject
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ", ".MAIN_DB_PREFIX.$tmparray[1]." as ".($tmparray[1] == 'societe' ? 's' : 'parenttable'); // If we need to link to this table to limit select to entity
-		}
-		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
+		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
 		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
 		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
 		$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
@@ -1837,8 +1815,7 @@ abstract class CommonObject
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ' AND te.'.$tmparray[0].' = '.($tmparray[1] == 'societe' ? 's' : 'parenttable').'.rowid'; // If we need to link to this table to limit select to entity
-		}
-		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
+		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
 			if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
@@ -1963,14 +1940,12 @@ abstract class CommonObject
 			if ($projectid) $sql .= ' SET fk_project = '.$projectid;
 			else $sql .= ' SET fk_project = NULL';
 			$sql .= ' WHERE rowid = '.$this->id;
-		}
-		elseif ($this->table_element == 'actioncomm')	// Special case for actioncomm
+		} elseif ($this->table_element == 'actioncomm')	// Special case for actioncomm
 		{
 			if ($projectid) $sql .= ' SET fk_project = '.$projectid;
 			else $sql .= ' SET fk_project = NULL';
 			$sql .= ' WHERE id = '.$this->id;
-		}
-		else // Special case for old architecture objects
+		} else // Special case for old architecture objects
 		{
 			if ($projectid) $sql .= ' SET fk_projet = '.$projectid;
 			else $sql .= ' SET fk_projet = NULL';
@@ -1982,8 +1957,7 @@ abstract class CommonObject
 		{
 			$this->fk_project = $projectid;
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -2015,14 +1989,12 @@ abstract class CommonObject
 				// for supplier
 				if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;
 				return 1;
-			}
-			else {
+			} else {
 				dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible');
 			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
@@ -2054,14 +2026,12 @@ abstract class CommonObject
 				if ($rate) $this->setMulticurrencyRate($rate, 2);
 
 				return 1;
-			}
-			else {
+			} else {
 				dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			dol_syslog(get_class($this).'::setMulticurrencyCode, status of the object is incompatible');
 			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
@@ -2160,14 +2130,12 @@ abstract class CommonObject
 				}
 
 				return 1;
-			}
-			else {
+			} else {
 				dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			dol_syslog(get_class($this).'::setMulticurrencyRate, status of the object is incompatible');
 			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
@@ -2201,14 +2169,12 @@ abstract class CommonObject
 				if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;
 				$this->cond_reglement = $id; // for compatibility
 				return 1;
-			}
-			else {
+			} else {
 				dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			dol_syslog(get_class($this).'::setPaymentTerms, status of the object is incompatible');
 			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
@@ -2237,14 +2203,12 @@ abstract class CommonObject
 	        {
 	            $this->retained_warranty_fk_cond_reglement = $id;
 	            return 1;
-	        }
-	        else {
+	        } else {
 	            dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms Erreur '.$sql.' - '.$this->db->error());
 	            $this->error = $this->db->error();
 	            return -1;
 	        }
-	    }
-	    else {
+	    } else {
 	        dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms, status of the object is incompatible');
 	        $this->error = 'Status of the object is incompatible '.$this->statut;
 	        return -2;
@@ -2270,8 +2234,7 @@ abstract class CommonObject
 		{
 			$this->fk_delivery_address = $id;
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);
 			return -1;
@@ -2395,8 +2358,7 @@ abstract class CommonObject
 		{
 			$this->modelpdf = $modelpdf;
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return 0;
 		}
@@ -2438,8 +2400,7 @@ abstract class CommonObject
 			dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());
 			$this->error = $this->db->lasterror();
 			$error++;
-		}
-		else {
+		} else {
 			if (!$notrigger)
 			{
 				// Call trigger
@@ -2453,8 +2414,7 @@ abstract class CommonObject
 		{
 			$this->db->rollback();
 			return -1;
-		}
-		else {
+		} else {
 			$this->fk_account = ($fk_account == 'NULL') ?null:$fk_account;
 			$this->db->commit();
 			return 1;
@@ -2501,8 +2461,7 @@ abstract class CommonObject
 		{
 			$row = $this->db->fetch_row($resql);
 			$nl = $row[0];
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		if ($nl > 0)
 		{
 			// The goal of this part is to reorder all lines, with all children lines sharing the same
@@ -2544,8 +2503,7 @@ abstract class CommonObject
 						$this->updateRangOfLine($row, ($key + 1));
 					}
 				}
-			}
-			else {
+			} else {
 				dol_print_error($this->db);
 			}
 		}
@@ -2691,8 +2649,7 @@ abstract class CommonObject
 				{
 					dol_print_error($this->db);
 				}
-			}
-			else {
+			} else {
 				dol_print_error($this->db);
 			}
 		}
@@ -2724,8 +2681,7 @@ abstract class CommonObject
 				{
 					dol_print_error($this->db);
 				}
-			}
-			else {
+			} else {
 				dol_print_error($this->db);
 			}
 		}
@@ -2798,8 +2754,7 @@ abstract class CommonObject
 				if (!empty($row[0]))
 				{
 					return $row[0];
-				}
-				else {
+				} else {
 					return $this->getRangOfLine($fk_parent_line);
 				}
 			}
@@ -2844,8 +2799,7 @@ abstract class CommonObject
 		{
 			$this->ref_ext = $ref_ext;
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2895,8 +2849,7 @@ abstract class CommonObject
 				$this->note_private = $note;
 			}
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -3156,12 +3109,10 @@ abstract class CommonObject
 			if (!$error)
 			{
 				return 1;
-			}
-			else {
+			} else {
 				return -1;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db, 'Bad request in update_price');
 			return -1;
 		}
@@ -3206,8 +3157,7 @@ abstract class CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return 0;
@@ -3280,14 +3230,12 @@ abstract class CommonObject
 			{
 				$sql .= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";
 				if ($withtargettype) $sql .= " AND targettype = '".$targettype."'";
-			}
-			elseif ($justtarget)
+			} elseif ($justtarget)
 			{
 				$sql .= "fk_target = ".$targetid." AND targettype = '".$targettype."'";
 				if ($withsourcetype) $sql .= " AND sourcetype = '".$sourcetype."'";
 			}
-		}
-		else {
+		} else {
 			$sql .= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";
 			$sql .= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";
 		}
@@ -3307,13 +3255,11 @@ abstract class CommonObject
 					if ($justsource)
 					{
 						$this->linkedObjectsIds[$obj->targettype][$obj->rowid] = $obj->fk_target;
-					}
-					elseif ($justtarget)
+					} elseif ($justtarget)
 					{
 						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid] = $obj->fk_source;
 					}
-				}
-				else {
+				} else {
 					if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype)
 					{
 						$this->linkedObjectsIds[$obj->targettype][$obj->rowid] = $obj->fk_target;
@@ -3344,32 +3290,23 @@ abstract class CommonObject
 					// To work with non standard classpath or module name
 					if ($objecttype == 'facture') {
 						$classpath = 'compta/facture/class';
-					}
-					elseif ($objecttype == 'facturerec') {
+					} elseif ($objecttype == 'facturerec') {
 						$classpath = 'compta/facture/class'; $module = 'facture';
-					}
-					elseif ($objecttype == 'propal') {
+					} elseif ($objecttype == 'propal') {
 						$classpath = 'comm/propal/class';
-					}
-					elseif ($objecttype == 'supplier_proposal') {
+					} elseif ($objecttype == 'supplier_proposal') {
 						$classpath = 'supplier_proposal/class';
-					}
-					elseif ($objecttype == 'shipping') {
+					} elseif ($objecttype == 'shipping') {
 						$classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon';
-					}
-					elseif ($objecttype == 'delivery') {
+					} elseif ($objecttype == 'delivery') {
 						$classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon';
-					}
-					elseif ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier') {
+					} elseif ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier') {
 						$classpath = 'fourn/class'; $module = 'fournisseur';
-					}
-					elseif ($objecttype == 'fichinter') {
+					} elseif ($objecttype == 'fichinter') {
 						$classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter';
-					}
-					elseif ($objecttype == 'subscription') {
+					} elseif ($objecttype == 'subscription') {
 						$classpath = 'adherents/class'; $module = 'adherent';
-					}
-					elseif ($objecttype == 'contact') {
+					} elseif ($objecttype == 'contact') {
 						 $module = 'societe';
 					}
 
@@ -3378,23 +3315,17 @@ abstract class CommonObject
 
 					if ($objecttype == 'order') {
 						$classfile = 'commande'; $classname = 'Commande';
-					}
-					elseif ($objecttype == 'invoice_supplier') {
+					} elseif ($objecttype == 'invoice_supplier') {
 						$classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur';
-					}
-					elseif ($objecttype == 'order_supplier') {
+					} elseif ($objecttype == 'order_supplier') {
 						$classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur';
-					}
-					elseif ($objecttype == 'supplier_proposal') {
+					} elseif ($objecttype == 'supplier_proposal') {
 						$classfile = 'supplier_proposal'; $classname = 'SupplierProposal';
-					}
-					elseif ($objecttype == 'facturerec') {
+					} elseif ($objecttype == 'facturerec') {
 						$classfile = 'facture-rec'; $classname = 'FactureRec';
-					}
-					elseif ($objecttype == 'subscription') {
+					} elseif ($objecttype == 'subscription') {
 						$classfile = 'subscription'; $classname = 'Subscription';
-					}
-					elseif ($objecttype == 'project' || $objecttype == 'projet') {
+					} elseif ($objecttype == 'project' || $objecttype == 'projet') {
 						$classpath = 'projet/class'; $classfile = 'project'; $classname = 'Project';
 					}
 
@@ -3418,15 +3349,13 @@ abstract class CommonObject
 								}
 							}
 						}
-					}
-					else {
+					} else {
 						unset($this->linkedObjectsIds[$objecttype]);
 					}
 				}
 			}
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3457,8 +3386,7 @@ abstract class CommonObject
 			$sql .= ", sourcetype = '".$this->db->escape($sourcetype)."'";
 			$sql .= " WHERE fk_target = ".$this->id;
 			$sql .= " AND targettype = '".$this->db->escape($this->element)."'";
-		}
-		elseif ($updatetarget)
+		} elseif ($updatetarget)
 		{
 			$sql .= "fk_target = ".$targetid;
 			$sql .= ", targettype = '".$this->db->escape($targettype)."'";
@@ -3470,8 +3398,7 @@ abstract class CommonObject
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -3506,19 +3433,16 @@ abstract class CommonObject
 		if ($rowid > 0)
 		{
 			$sql .= " rowid = ".$rowid;
-		}
-		else {
+		} else {
 			if ($deletesource)
 			{
 				$sql .= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
 				$sql .= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";
-			}
-			elseif ($deletetarget)
+			} elseif ($deletetarget)
 			{
 				$sql .= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
 				$sql .= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";
-			}
-			else {
+			} else {
 				$sql .= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";
 				$sql .= " OR";
 				$sql .= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";
@@ -3529,8 +3453,7 @@ abstract class CommonObject
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->error;
 			return -1;
@@ -3607,14 +3530,12 @@ abstract class CommonObject
 				}
 
 				return 1;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::setStatut ".$this->error, LOG_ERR);
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -3653,10 +3574,8 @@ abstract class CommonObject
 			{
 				$this->canvas = $obj->canvas;
 				return 1;
-			}
-			else return 0;
-		}
-		else {
+			} else return 0;
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3729,15 +3648,13 @@ abstract class CommonObject
 					if (is_numeric($elementname))	// old usage
 					{
 						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
-					}
-					else // new usage: $elementname=Translation key
+					} else // new usage: $elementname=Translation key
 					{
 						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));
 					}
 					break; // We found at least one, we stop here
 				}
-			}
-			else {
+			} else {
 				$this->errors[] = $this->db->lasterror();
 				return -1;
 			}
@@ -3746,8 +3663,7 @@ abstract class CommonObject
 		{
 			$this->errors[] = "ErrorRecordHasChildren";
 			return $haschild;
-		}
-		else return 0;
+		} else return 0;
 	}
 
 	/**
@@ -3839,8 +3755,7 @@ abstract class CommonObject
 			{
 				if (empty($totalToShip)) $totalToShip = 0; // Avoid warning because $totalToShip is ''
 				$totalToShip += $line->qty_shipped; // defined for shipment only
-			}
-			elseif ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
+			} elseif ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
 			{
 				if (empty($totalToShip)) $totalToShip = 0;
 				$totalToShip += $line->qty; // defined for reception only
@@ -3850,8 +3765,7 @@ abstract class CommonObject
 			if ($this->element == 'shipping') {
 				// for shipments
 				$qty = $line->qty_shipped ? $line->qty_shipped : 0;
-			}
-			else {
+			} else {
 				$qty = $line->qty ? $line->qty : 0;
 			}
 
@@ -3878,8 +3792,7 @@ abstract class CommonObject
 			{
 				$trueWeightUnit = pow(10, $weightUnit);
 				$totalWeight += $weight * $qty * $trueWeightUnit;
-			}
-			else {
+			} else {
 				if ($weight_units == 99) {
 					// conversion 1 Pound = 0.45359237 KG
 					$trueWeightUnit = 0.45359237;
@@ -3888,8 +3801,7 @@ abstract class CommonObject
 					// conversion 1 Ounce = 0.0283495 KG
 					$trueWeightUnit = 0.0283495;
 					$totalWeight += $weight * $qty * $trueWeightUnit;
-				}
-				else {
+				} else {
 					$totalWeight += $weight * $qty; // This may be wrong if we mix different units
 				}
 			}
@@ -3899,8 +3811,7 @@ abstract class CommonObject
 				$trueVolumeUnit = pow(10, $volumeUnit);
 				//print $line->volume;
 				$totalVolume += $volume * $qty * $trueVolumeUnit;
-			}
-			else {
+			} else {
 				$totalVolume += $volume * $qty; // This may be wrong if we mix different units
 			}
 		}
@@ -3931,8 +3842,7 @@ abstract class CommonObject
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -3983,12 +3893,10 @@ abstract class CommonObject
 			{
 				$res = $this->db->fetch_object($resql);
 				return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;
-			}
-			else {
+			} else {
 				return '';
 			}
-		}
-		else {
+		} else {
 			$this->errors[] = $this->db->lasterror();
 			return false;
 		}
@@ -4024,13 +3932,11 @@ abstract class CommonObject
 					$this->label_incoterms = $obj->libelle;
 				}
 				return 1;
-			}
-			else {
+			} else {
 				$this->errors[] = $this->db->lasterror();
 				return -1;
 			}
-		}
-		else return -1;
+		} else return -1;
 	}
 
 
@@ -4071,8 +3977,7 @@ abstract class CommonObject
 			if (!empty($module))
 			{
 				$tpl = dol_buildpath($reldir.'/objectline_create.tpl.php');
-			}
-			else {
+			} else {
 				$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_create.tpl.php';
 			}
 
@@ -4137,8 +4042,7 @@ abstract class CommonObject
 				if (!empty($module))
 				{
 					$tpl = dol_buildpath($reldir.'/objectline_title.tpl.php');
-				}
-				else {
+				} else {
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_title.tpl.php';
 				}
 				if (empty($conf->file->strict_mode)) {
@@ -4165,8 +4069,7 @@ abstract class CommonObject
 				{
 					$parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element);
 					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				}
-				else {
+				} else {
 					$parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element, 'fk_parent_line'=>$line->fk_parent_line);
 					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				}
@@ -4247,8 +4150,7 @@ abstract class CommonObject
 					}
 
 					$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;
-				}
-				else {
+				} else {
 					$label = $line->product_label;
 				}
 
@@ -4267,8 +4169,7 @@ abstract class CommonObject
 				if (!empty($module))
 				{
 					$tpl = dol_buildpath($reldir.'/objectline_view.tpl.php');
-				}
-				else {
+				} else {
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_view.tpl.php';
 				}
 
@@ -4297,8 +4198,7 @@ abstract class CommonObject
 				if (!empty($module))
 				{
 					$tpl = dol_buildpath($reldir.'/objectline_edit.tpl.php');
-				}
-				else {
+				} else {
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_edit.tpl.php';
 				}
 
@@ -4358,8 +4258,7 @@ abstract class CommonObject
 						$action = '';
 						$hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 					}
-				}
-				else {
+				} else {
 					$this->printOriginLine($line, '', $restrictlist, '/core/tpl', $selectedLines);
 				}
 
@@ -4389,16 +4288,14 @@ abstract class CommonObject
 		if (!empty($line->date_start))
 		{
 			$date_start = $line->date_start;
-		}
-		else {
+		} else {
 			$date_start = $line->date_debut_prevue;
 			if ($line->date_debut_reel) $date_start = $line->date_debut_reel;
 		}
 		if (!empty($line->date_end))
 		{
 			$date_end = $line->date_end;
-		}
-		else {
+		} else {
 			$date_end = $line->date_fin_prevue;
 			if ($line->date_fin_reel) $date_end = $line->date_fin_reel;
 		}
@@ -4413,8 +4310,7 @@ abstract class CommonObject
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fk_soc = $this->socid;
 			$this->tpl['label'] .= $discount->getNomUrl(0, 'discount');
-		}
-		elseif (!empty($line->fk_product))
+		} elseif (!empty($line->fk_product))
 		{
 			$productstatic = new Product($this->db);
 			$productstatic->id = $line->fk_product;
@@ -4432,8 +4328,7 @@ abstract class CommonObject
 			{
 				$this->tpl['label'] .= get_date_range($date_start, $date_end);
 			}
-		}
-		else {
+		} else {
 			$this->tpl['label'] .= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''), 'service') : img_object($langs->trans(''), 'product')));
 			if (!empty($line->desc)) {
 				$this->tpl['label'] .= $line->desc;
@@ -4455,30 +4350,25 @@ abstract class CommonObject
 				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object
+			} elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object
 			{
 				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(EXCESS RECEIVED)')
+			} elseif ($line->desc == '(EXCESS RECEIVED)')
 			{
 				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(EXCESS PAID)')
+			} elseif ($line->desc == '(EXCESS PAID)')
 			{
 				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
-			}
-			else {
+			} else {
 				$this->tpl['description'] = dol_trunc($line->desc, 60);
 			}
-		}
-		else {
+		} else {
 			$this->tpl['description'] = '&nbsp;';
 		}
 
@@ -4505,8 +4395,7 @@ abstract class CommonObject
 			if (!empty($module))
 			{
 				$tpl = dol_buildpath($reldir.'/originproductline.tpl.php');
-			}
-			else {
+			} else {
 				$tpl = DOL_DOCUMENT_ROOT.$reldir.'/originproductline.tpl.php';
 			}
 
@@ -4557,8 +4446,7 @@ abstract class CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return  0;
@@ -4592,8 +4480,7 @@ abstract class CommonObject
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-		}
-		else {
+		} else {
 			if (!$notrigger)
 			{
 				$result = $this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);
@@ -4756,8 +4643,7 @@ abstract class CommonObject
 			    {
 				    $arrayofrecords = array(); // The write_file of templates of adherent class need this var
 				    $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
-			    }
-			    else {
+			    } else {
 				     $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);
 			    }
 			    // After call of write_file $obj->result['fullpath'] is set with generated file. It will be used to update the ECM database index.
@@ -4825,8 +4711,7 @@ abstract class CommonObject
 							    if ($result < 0) {
 								    setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 							    }
-						    }
-						    else {
+						    } else {
 							    $ecmfile->entity = $conf->entity;
 							    $ecmfile->filepath = $rel_dir;
 							    $ecmfile->filename = $filename;
@@ -4865,8 +4750,7 @@ abstract class CommonObject
 							    }
 						    }
 					    }
-				    }
-				    else {
+				    } else {
 					    dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING);
 				    }
 
@@ -4874,20 +4758,17 @@ abstract class CommonObject
 				    dol_meta_create($this);
 
 				    return 1;
-			    }
-			    else {
+			    } else {
 				    $outputlangs->charset_output = $sav_charset_output;
 				    dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);
 				    return -1;
 			    }
-		    }
-		    else {
+		    } else {
 			    $this->error = $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 			    dol_print_error('', $this->error);
 			    return -1;
 		    }
-		}
-		else return $reshook;
+		} else return $reshook;
 	}
 
 	/**
@@ -4992,8 +4873,7 @@ abstract class CommonObject
 			if (!empty($this->errors))
 			{
 				$this->errors = array_unique(array_merge($this->errors, $interface->errors)); // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.
-			}
-			else {
+			} else {
 				$this->errors = $interface->errors;
 			}
 		}
@@ -5054,8 +4934,7 @@ abstract class CommonObject
 					if (preg_match('/date/', $type))
 					{
 						$this->array_languages[$key][$codelang] = $this->db->jdate($value);
-					}
-					else {
+					} else {
 						$this->array_languages[$key][$codelang] = $value;
 					}
 
@@ -5067,8 +4946,7 @@ abstract class CommonObject
 
 			if ($numrows) return $numrows;
 			else return 0;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -5117,14 +4995,12 @@ abstract class CommonObject
 				// Clean parameters
 				// TODO GMT date in memory must be GMT so we should add gm=true in parameters
 				$value_key = dol_mktime(0, 0, 0, $_POST[$postfieldkey."month"], $_POST[$postfieldkey."day"], $_POST[$postfieldkey."year"]);
-			}
-			elseif (in_array($key_type, array('datetime')))
+			} elseif (in_array($key_type, array('datetime')))
 			{
 				// Clean parameters
 				// TODO GMT date in memory must be GMT so we should add gm=true in parameters
 				$value_key = dol_mktime($_POST[$postfieldkey."hour"], $_POST[$postfieldkey."min"], 0, $_POST[$postfieldkey."month"], $_POST[$postfieldkey."day"], $_POST[$postfieldkey."year"]);
-			}
-			elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
+			} elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
 			{
 				$value_arr = GETPOST($postfieldkey, 'array'); // check if an array
 				if (!empty($value_arr)) {
@@ -5132,13 +5008,11 @@ abstract class CommonObject
 				} else {
 					$value_key = '';
 				}
-			}
-			elseif (in_array($key_type, array('price', 'double')))
+			} elseif (in_array($key_type, array('price', 'double')))
 			{
 				$value_arr = GETPOST($postfieldkey, 'alpha');
 				$value_key = price2num($value_arr);
-			}
-			else {
+			} else {
 				$value_key = GETPOST($postfieldkey);
 				if (in_array($key_type, array('link')) && $value_key == '-1') $value_key = '';
 			}
@@ -5218,8 +5092,7 @@ abstract class CommonObject
 				$extrafields->fetch_name_optionals_label($this->table_element);
 			}
 			$optionsArray = (!empty($extrafields->attributes[$this->table_element]['label']) ? $extrafields->attributes[$this->table_element]['label'] : null);
-		}
-		else {
+		} else {
 			global $extrafields;
 			dol_syslog("Warning: fetch_optionals was called with param optionsArray defined when you should pass null now", LOG_WARNING);
 		}
@@ -5260,8 +5133,7 @@ abstract class CommonObject
 							{
 								//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);
 								$this->array_options["options_".$key] = $this->db->jdate($value);
-							}
-							else {
+							} else {
 								$this->array_options["options_".$key] = $value;
 							}
 
@@ -5285,8 +5157,7 @@ abstract class CommonObject
 
 				if ($numrows) return $numrows;
 				else return 0;
-			}
-			else {
+			} else {
 				dol_print_error($this->db);
 				return -1;
 			}
@@ -5319,8 +5190,7 @@ abstract class CommonObject
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -5395,8 +5265,7 @@ abstract class CommonObject
 						$value = dol_eval($attrfieldcomputed, 1, 0);
 					    dol_syslog($langs->trans("Extrafieldcomputed")." sur ".$attributeLabel."(".$value.")", LOG_DEBUG);
 					    $new_array_options[$key] = $value;
-					}
-					else {
+					} else {
 						$new_array_options[$key] = null;
 					}
 				}
@@ -5408,8 +5277,7 @@ abstract class CommonObject
 			   			{
 			   				$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 			   				return -1;
-			  			}
-			   			elseif ($value == '')
+			  			} elseif ($value == '')
 			   			{
 			   				$new_array_options[$key] = null;
 			   			}
@@ -5421,8 +5289,7 @@ abstract class CommonObject
 							dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
 							$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 							return -1;
-						}
-						elseif ($value == '')
+						} elseif ($value == '')
 						{
 							$new_array_options[$key] = null;
 						}
@@ -5453,19 +5320,16 @@ abstract class CommonObject
 				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
 				   					{
 				   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept
-				   					}
-									else {
+				   					} else {
 										// var_dump($algo);
 										$newvalue = dol_hash($this->array_options[$key], $algo);
 										$new_array_options[$key] = $newvalue;
 									}
-			   					}
-			   					else {
+			   					} else {
 			   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept
 			   					}
 			   				}
-			   			}
-			   			else // Common usage
+			   			} else // Common usage
 			   			{
 			   				$new_array_options[$key] = $this->array_options[$key];
 			   			}
@@ -5492,8 +5356,7 @@ abstract class CommonObject
 							if ($value == '-1')	// -1 is key for no defined in combo list of objects
 							{
 								$new_array_options[$key] = '';
-							}
-							elseif ($value)
+							} elseif ($value)
 							{
 								$object = new $InfoFieldList[0]($this->db);
 								if (is_numeric($value)) $res = $object->fetch($value);
@@ -5506,8 +5369,7 @@ abstract class CommonObject
 									return -1;
 								}
 							}
-						}
-						else {
+						} else {
 							dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 						}
 						break;
@@ -5554,8 +5416,7 @@ abstract class CommonObject
 					if ($new_array_options[$key] != '' || $new_array_options[$key] == '0')
 					{
 						$sql .= ",'".$this->db->escape($new_array_options[$key])."'";
-					}
-					else {
+					} else {
 						$sql .= ",null";
 					}
 				}
@@ -5596,13 +5457,11 @@ abstract class CommonObject
 			{
 				$this->db->rollback();
 				return -1;
-			}
-			else {
+			} else {
 				$this->db->commit();
 				return 1;
 			}
-		}
-		else return 0;
+		} else return 0;
 	}
 
 	/**
@@ -5645,8 +5504,7 @@ abstract class CommonObject
 						{
 							$this->errors[] = $langs->trans("ExtraLanguageHasWrongValue", $attributeLabel);
 							return -1;
-						}
-						elseif ($value == '')
+						} elseif ($value == '')
 						{
 							$new_array_languages[$key] = null;
 						}
@@ -5658,8 +5516,7 @@ abstract class CommonObject
 							dol_syslog($langs->trans("ExtraLanguageHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
 							$this->errors[] = $langs->trans("ExtraLanguageHasWrongValue", $attributeLabel);
 							return -1;
-						}
-						elseif ($value == '')
+						} elseif ($value == '')
 						{
 							$new_array_languages[$key] = null;
 						}
@@ -5718,13 +5575,11 @@ abstract class CommonObject
 			{
 				$this->db->rollback();
 				return -1;
-			}
-			else {
+			} else {
 				$this->db->commit();
 				return 1;
 			}
-		}
-		else return 0;
+		} else return 0;
 	}
 
 	/**
@@ -5772,8 +5627,7 @@ abstract class CommonObject
 					{
 						$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 						return -1;
-					}
-					elseif ($value === '')
+					} elseif ($value === '')
 					{
 						$this->array_options["options_".$key] = null;
 					}
@@ -5785,8 +5639,7 @@ abstract class CommonObject
 						dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
 						$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 						return -1;
-					}
-					elseif ($value === '')
+					} elseif ($value === '')
 					{
 						$this->array_options["options_".$key] = null;
 					}
@@ -5847,13 +5700,11 @@ abstract class CommonObject
 				dol_syslog(__METHOD__.$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
-			}
-			else {
+			} else {
 				$this->db->commit();
 				return 1;
 			}
-		}
-		else return 0;
+		} else return 0;
 	}
 
 	/**
@@ -5965,37 +5816,30 @@ abstract class CommonObject
 		if (empty($morecss) && !empty($val['css']))
 		{
 		    $morecss = $val['css'];
-		}
-		elseif (empty($morecss))
+		} elseif (empty($morecss))
 		{
 			if ($type == 'date')
 			{
 				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime' || $type == 'link')
+			} elseif ($type == 'datetime' || $type == 'link')
 			{
 				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type, array('int', 'integer', 'price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
+			} elseif (in_array($type, array('int', 'integer', 'price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
 			{
 				$morecss = 'maxwidth75';
 			} elseif ($type == 'url') {
 				$morecss = 'minwidth400';
-			}
-			elseif ($type == 'boolean')
+			} elseif ($type == 'boolean')
 			{
 				$morecss = '';
-			}
-			else {
+			} else {
 				if (round($size) < 12)
 				{
 					$morecss = 'minwidth100';
-				}
-				elseif (round($size) <= 48)
+				} elseif (round($size) <= 48)
 				{
 					$morecss = 'minwidth200';
-				}
-				else {
+				} else {
 					$morecss = 'minwidth400';
 				}
 			}
@@ -6013,54 +5857,44 @@ abstract class CommonObject
 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
-		}
-		elseif (in_array($type, array('duration')))
+		} elseif (in_array($type, array('duration')))
 		{
 			$out = $form->select_duration($keyprefix.$key.$keysuffix, $value, 0, 'text', 0, 1);
-		}
-		elseif (in_array($type, array('int', 'integer')))
+		} elseif (in_array($type, array('int', 'integer')))
 		{
 			$tmp = explode(',', $size);
 			$newsize = $tmp[0];
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
-		}
-		elseif (in_array($type, array('real')))
+		} elseif (in_array($type, array('real')))
 		{
 		    $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
-		}
-		elseif (preg_match('/varchar/', $type))
+		} elseif (preg_match('/varchar/', $type))
 		{
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
-		}
-		elseif (in_array($type, array('mail', 'phone', 'url')))
+		} elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
-		}
-		elseif ($type == 'text')
+		} elseif ($type == 'text')
 		{
 			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
-			}
-			else {
+			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
-		}
-		elseif ($type == 'html')
+		} elseif ($type == 'html')
 		{
 			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
-			}
-			else {
+			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked = '';
 			if (!empty($value)) {
@@ -6069,22 +5903,19 @@ abstract class CommonObject
 				$checked = ' value="1" ';
 			}
 			$out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value = price($value);
 			}
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.$langs->getCurrencySymbol($conf->currency);
-		}
-		elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
+		} elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value = price($value);
 			}
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			$out = '';
 			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -6105,8 +5936,7 @@ abstract class CommonObject
 				$out .= '>'.$val.'</option>';
 			}
 			$out .= '</select>';
-		}
-		elseif ($type == 'sellist')
+		} elseif ($type == 'sellist')
 		{
 			$out = '';
 			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -6173,12 +6003,10 @@ abstract class CommonObject
 					{
 						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
 						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
-					}
-					else {
+					} else {
 						$sqlwhere .= ' WHERE '.$InfoFieldList[4];
 					}
-				}
-				else {
+				} else {
 					$sqlwhere .= ' WHERE 1=1';
 				}
 				// Some tables may have field, some other not. For the moment we disable it.
@@ -6213,8 +6041,7 @@ abstract class CommonObject
 							{
 								$labeltoshow .= $obj->$field_toshow.' ';
 							}
-						}
-						else {
+						} else {
 							$labeltoshow = $obj->{$InfoFieldList[1]};
 						}
 						$labeltoshow = dol_trunc($labeltoshow, 45);
@@ -6231,15 +6058,13 @@ abstract class CommonObject
 								}
 							}
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else {
+						} else {
 							if (!$notrans)
 							{
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 								if ($translabel != $obj->{$InfoFieldList[1]}) {
 									$labeltoshow = dol_trunc($translabel, 18);
-								}
-								else {
+								} else {
 									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
 								}
 							}
@@ -6263,19 +6088,16 @@ abstract class CommonObject
 						$i++;
 					}
 					$this->db->free($resql);
-				}
-				else {
+				} else {
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
 			$out .= '</select>';
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr = explode(',', $value);
 			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$out = '';
 			foreach ($param['options'] as $keyopt => $val)
@@ -6286,13 +6108,11 @@ abstract class CommonObject
 				$out .= ($value == $keyopt ? 'checked' : '');
 				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			if (is_array($value)) {
 				$value_arr = $value;
-			}
-			else {
+			} else {
 				$value_arr = explode(',', $value);
 			}
 
@@ -6430,8 +6250,7 @@ abstract class CommonObject
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter]]'
 			$param_list_array = explode(':', $param_list[0]);
@@ -6454,13 +6273,11 @@ abstract class CommonObject
 		   			$out .= '<a class="butActionNew" title="'.$langs->trans("New").'" href="'.$url_path.'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF'].($paramforthenewlink ? '?'.$paramforthenewlink : '')).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
 				}
 			}
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
 			$out = '<input type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';
-		}
-		elseif ($type == 'array')
+		} elseif ($type == 'array')
 		{
 			$newval = $val;
 			$newval['type'] = 'varchar(256)';
@@ -6539,8 +6356,7 @@ abstract class CommonObject
 		{
 			$type = 'varchar'; // convert varchar(xx) int varchar
 			$size = $reg[1];
-		}
-		elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar
+		} elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar
 		if (is_array($val['arrayofkeyval'])) $type = 'select';
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type = 'link';
 
@@ -6556,8 +6372,7 @@ abstract class CommonObject
 		{
 			$type = 'link';
 			$param['options'] = array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);
-		}
-        elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+		} elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
             $param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');
             $type = 'sellist';
         }
@@ -6582,33 +6397,26 @@ abstract class CommonObject
 			if ($type == 'date')
 			{
 				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime' || $type == 'timestamp')
+			} elseif ($type == 'datetime' || $type == 'timestamp')
 			{
 				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type, array('int', 'double', 'price')))
+			} elseif (in_array($type, array('int', 'double', 'price')))
 			{
 				$morecss = 'maxwidth75';
-			}
-			elseif ($type == 'url')
+			} elseif ($type == 'url')
 			{
 				$morecss = 'minwidth400';
-			}
-			elseif ($type == 'boolean')
+			} elseif ($type == 'boolean')
 			{
 				$morecss = '';
-			}
-			else {
+			} else {
 				if (round($size) < 12)
 				{
 					$morecss = 'minwidth100';
-				}
-				elseif (round($size) <= 48)
+				} elseif (round($size) <= 48)
 				{
 					$morecss = 'minwidth200';
-				}
-				else {
+				} else {
 					$morecss = 'minwidth400';
 				}
 			}
@@ -6624,59 +6432,49 @@ abstract class CommonObject
 			} else {
 				$value = '';
 			}
-		}
-		elseif ($type == 'datetime' || $type == 'timestamp')
+		} elseif ($type == 'datetime' || $type == 'timestamp')
 		{
 			if (!empty($value)) {
 				$value = dol_print_date($value, 'dayhour');
 			} else {
 				$value = '';
 			}
-		}
-		elseif ($type == 'duration')
+		} elseif ($type == 'duration')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 			if (!is_null($value) && $value !== '') {
 				$value = convertSecondToTime($value, 'allhourmin');
 			}
-		}
-		elseif ($type == 'double' || $type == 'real')
+		} elseif ($type == 'double' || $type == 'real')
 		{
 			if (!is_null($value) && $value !== '') {
 				$value = price($value);
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked = '';
 			if (!empty($value)) {
 				$checked = ' checked ';
 			}
 			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
-		}
-		elseif ($type == 'mail')
+		} elseif ($type == 'mail')
 		{
 			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
-		}
-		elseif ($type == 'url')
+		} elseif ($type == 'url')
 		{
 			$value = dol_print_url($value, '_blank', 32, 1);
-		}
-		elseif ($type == 'phone')
+		} elseif ($type == 'phone')
 		{
 			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			if (!is_null($value) && $value !== '') {
 				$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
 			}
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			$value = $param['options'][$value];
-		}
-		elseif ($type == 'sellist')
+		} elseif ($type == 'sellist')
 		{
 			$param_list = array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
@@ -6737,8 +6535,7 @@ abstract class CommonObject
 							$value .= $obj->$field_toshow.' ';
 						}
 					}
-				}
-				else {
+				} else {
 					$translabel = '';
 					if (!empty($obj->{$InfoFieldList[1]})) {
 						$translabel = $langs->trans($obj->{$InfoFieldList[1]});
@@ -6749,14 +6546,11 @@ abstract class CommonObject
 						$value = $obj->{$InfoFieldList[1]};
 					}
 				}
-			}
-			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
-		}
-		elseif ($type == 'radio')
+			} else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
+		} elseif ($type == 'radio')
 		{
 			$value = $param['options'][$value];
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr = explode(',', $value);
 			$value = '';
@@ -6768,8 +6562,7 @@ abstract class CommonObject
 				}
 				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 			}
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			$value_arr = explode(',', $value);
 
@@ -6836,8 +6629,7 @@ abstract class CommonObject
 			} else {
 				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$out = '';
 
@@ -6859,23 +6651,18 @@ abstract class CommonObject
 						$object->fetch($value);
 						$value = $object->getNomUrl($getnomurlparam);
 					}
-				}
-				else {
+				} else {
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 					return 'Error bad setup of extrafield';
 				}
-			}
-			else $value = '';
-		}
-		elseif ($type == 'text' || $type == 'html')
+			} else $value = '';
+		} elseif ($type == 'text' || $type == 'html')
 		{
 			$value = dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			$value = preg_replace('/./i', '*', $value);
-		}
-		elseif ($type == 'array')
+		} elseif ($type == 'array')
 		{
 			$value = implode('<br>', $value);
 		}
@@ -6953,13 +6740,11 @@ abstract class CommonObject
 				if (is_array($params) && count($params) > 0) {
 					if (array_key_exists('cols', $params)) {
 						$colspan = $params['cols'];
-					}
-					elseif (array_key_exists('colspan', $params)) {	// For backward compatibility. Use cols instead now.
+					} elseif (array_key_exists('colspan', $params)) {	// For backward compatibility. Use cols instead now.
 						$reg = array();
 						if (preg_match('/colspan="(\d+)"/', $params['colspan'], $reg)) {
 							$colspan = $reg[1];
-						}
-						else {
+						} else {
 							$colspan = $params['colspan'];
 						}
 					}
@@ -7005,8 +6790,7 @@ abstract class CommonObject
                     }
 
 					$out .= $extrafields->showSeparator($key, $this, ($colspan + 1));
-				}
-				else {
+				} else {
 					$class = (!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
 					$csstyle = '';
 					if (is_array($params) && count($params) > 0) {
@@ -7203,8 +6987,7 @@ abstract class CommonObject
 		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) // In most cases, test here is false
 		{
 			$buyPrice = $unitPrice * (1 - $discountPercent / 100);
-		}
-		else {
+		} else {
 			// Get cost price for margin calculation
 			if (!empty($fk_product))
 			{
@@ -7221,13 +7004,11 @@ abstract class CommonObject
 					if ($product->cost_price > 0)
 					{
 						$buyPrice = $product->cost_price;
-					}
-					elseif ($product->pmp > 0)
+					} elseif ($product->pmp > 0)
 					{
 						$buyPrice = $product->pmp;
 					}
-				}
-				elseif (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')
+				} elseif (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')
 				{
 					require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 					$product = new Product($this->db);
@@ -7250,8 +7031,7 @@ abstract class CommonObject
 					if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0)
 					{
 						$buyPrice = $productFournisseur->fourn_unitprice;
-					}
-					elseif ($result < 0)
+					} elseif ($result < 0)
 					{
 						$this->errors[] = $productFournisseur->error;
 						return -2;
@@ -7364,8 +7144,7 @@ abstract class CommonObject
 
 							if ($nbphoto % $nbbyrow == 1) $return .= '<tr class="center valignmiddle" style="border: 1px">';
 							$return .= '<td style="width: '.ceil(100 / $nbbyrow).'%" class="photo">';
-						}
-						elseif ($nbbyrow < 0) $return .= '<div class="inline-block">';
+						} elseif ($nbbyrow < 0) $return .= '<div class="inline-block">';
 
 						$return .= "\n";
 
@@ -7391,24 +7170,20 @@ abstract class CommonObject
 								{
 									$return .= '<!-- Show original file (thumb not yet available with shared links) -->';
 									$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
-								}
-								else {
+								} else {
 									$return .= '<!-- Show original file -->';
 									$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
 								}
-							}
-							else {
+							} else {
 								$return .= '<!-- Show nophoto file (because file is not shared) -->';
 								$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
 							}
-						}
-						else {
+						} else {
 							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
 							{
 								$return .= '<!-- Show thumb -->';
 								$return .= '<img class="photo photowithmargin"  height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
-							}
-							else {
+							} else {
 								$return .= '<!-- Show original file -->';
 								$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
 							}
@@ -7443,8 +7218,7 @@ abstract class CommonObject
 						{
 							$return .= '</td>';
 							if (($nbphoto % $nbbyrow) == 0) $return .= '</tr>';
-						}
-						elseif ($nbbyrow < 0) $return .= '</div>';
+						} elseif ($nbbyrow < 0) $return .= '</div>';
 					}
 
 					if (empty($size)) {     // Format origine
@@ -7533,8 +7307,7 @@ abstract class CommonObject
 		{
 			if (isset($info['type']) && ($info['type'] == 'duration')) return true;
 			else return false;
-		}
-		else return false;
+		} else return false;
 	}
 
 	/**
@@ -7549,8 +7322,7 @@ abstract class CommonObject
 		{
 			if (isset($info['type']) && ($info['type'] == 'int' || preg_match('/^integer/i', $info['type']))) return true;
 			else return false;
-		}
-		else return false;
+		} else return false;
 	}
 
 	/**
@@ -7654,12 +7426,10 @@ abstract class CommonObject
 				if (empty($this->{$field}))
 				{
 					$queryarray[$field] = null;
-				}
-				else {
+				} else {
 					$queryarray[$field] = $this->db->idate($this->{$field});
 				}
-			}
-			elseif ($this->isArray($info))
+			} elseif ($this->isArray($info))
 			{
 				if (!empty($this->{$field})) {
 					if (!is_array($this->{$field})) {
@@ -7669,14 +7439,12 @@ abstract class CommonObject
 				} else {
 					$queryarray[$field] = null;
 				}
-			}
-			elseif ($this->isDuration($info))
+			} elseif ($this->isDuration($info))
 			{
 				// $this->{$field} may be null, '', 0, '0', 123, '123'
 				if ($this->{$field} != '' || !empty($info['notnull'])) $queryarray[$field] = (int) $this->{$field};		// If '0', it may be set to null later if $info['notnull'] == -1
 				else $queryarray[$field] = null;
-			}
-			elseif ($this->isInt($info) || $this->isFloat($info))
+			} elseif ($this->isInt($info) || $this->isFloat($info))
 			{
 				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field] = $conf->entity;
 				else {
@@ -7684,11 +7452,9 @@ abstract class CommonObject
 					if ($this->{$field} != '' || !empty($info['notnull'])) {
 						if ($this->isInt($info)) $queryarray[$field] = (int) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
 						if ($this->isFloat($info)) $queryarray[$field] = (double) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
-					}
-					else $queryarray[$field] = null;
+					} else $queryarray[$field] = null;
 				}
-			}
-			else {
+			} else {
 				$queryarray[$field] = $this->{$field};
 			}
 
@@ -7713,8 +7479,7 @@ abstract class CommonObject
 			{
 				if (empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
 				else $this->{$field} = strtotime($obj->{$field});
-			}
-			elseif ($this->isArray($info))
+			} elseif ($this->isArray($info))
 			{
 				if (!empty($obj->{$field})) {
 					$this->{$field} = @unserialize($obj->{$field});
@@ -7723,8 +7488,7 @@ abstract class CommonObject
 				} else {
 					$this->{$field} = array();
 				}
-			}
-			elseif ($this->isInt($info))
+			} elseif ($this->isInt($info))
 			{
 				if ($field == 'rowid') $this->id = (int) $obj->{$field};
 				else {
@@ -7732,8 +7496,7 @@ abstract class CommonObject
 					{
 						if (empty($obj->{$field})) $this->{$field} = null;
 						else $this->{$field} = (double) $obj->{$field};
-					}
-					else {
+					} else {
 						if (!is_null($obj->{$field}) || (isset($info['notnull']) && $info['notnull'] == 1)) {
 							$this->{$field} = (int) $obj->{$field};
 						} else {
@@ -7741,23 +7504,20 @@ abstract class CommonObject
 						}
 					}
 				}
-			}
-			elseif ($this->isFloat($info))
+			} elseif ($this->isFloat($info))
 			{
 				if ($this->isForcedToNullIfZero($info))
 				{
 					if (empty($obj->{$field})) $this->{$field} = null;
 					else $this->{$field} = (double) $obj->{$field};
-				}
-				else {
+				} else {
 					if (!is_null($obj->{$field}) || (isset($info['notnull']) && $info['notnull'] == 1)) {
 						$this->{$field} = (double) $obj->{$field};
 					} else {
 						$this->{$field} = null;
 					}
 				}
-			}
-			else {
+			} else {
 				$this->{$field} = $obj->{$field};
 			}
 		}
@@ -7970,12 +7730,10 @@ abstract class CommonObject
 			{
 				$this->setVarsFromFetchObj($obj);
 				return $this->id;
-			}
-			else {
+			} else {
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->error;
 			return -1;
@@ -8023,8 +7781,7 @@ abstract class CommonObject
 			}
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->error;
 			return -1;
@@ -8151,8 +7908,7 @@ abstract class CommonObject
 					return -1;
 				}
 			}
-		}
-		elseif (!empty($this->fk_element) && !empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.
+		} elseif (!empty($this->fk_element) && !empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.
 		{
 			$objectisused = $this->isObjectUsed($this->id);
 			if (!empty($objectisused))
@@ -8318,8 +8074,7 @@ abstract class CommonObject
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index 9edbe27aae0..f92004120ff 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -82,8 +82,7 @@ abstract class CommonObjectLine extends CommonObject
 			$label = $res[$label_type];
 			$this->db->free($resql);
 			return $label;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error().' sql='.$sql;
 			dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
 			return -1;
diff --git a/htdocs/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php
index 50330f26b17..6c832c4788d 100644
--- a/htdocs/core/class/commonstickergenerator.class.php
+++ b/htdocs/core/class/commonstickergenerator.class.php
@@ -175,8 +175,7 @@ abstract class CommonStickerGenerator
 		$hauteur = abs($y1 - $y2);
 		if ($length > $hauteur) {
 			$Pointilles = ($length / $nbPointilles) / 2; // taille des pointilles
-		}
-		else {
+		} else {
 			$Pointilles = ($hauteur / $nbPointilles) / 2;
 		}
 		for ($i = $x1; $i <= $x2; $i += $Pointilles + $Pointilles) {
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index e535a4f0ca4..4bcbf3e2e99 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -251,8 +251,7 @@ class Conf
 		{
 			try {
 				date_default_timezone_set($this->global->MAIN_SERVER_TZ);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				dol_syslog("Error: Bad value for parameter MAIN_SERVER_TZ=".$this->global->MAIN_SERVER_TZ, LOG_ERR);
 			}
@@ -334,8 +333,7 @@ class Conf
 
 							// For backward compatibility
 							$this->$module->$dirname = $rootfordata."/".$name;
-						}
-						else {
+						} else {
 							// For multicompany sharings
 							$this->$module->$multidirname = array($this->entity => $rootfortemp."/".$name."/temp");
 
diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 0b017022e41..caaeb706c32 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -74,8 +74,7 @@ class CoreObject extends CommonObject
             $this->is_clone = false;
 
             return true;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -92,8 +91,7 @@ class CoreObject extends CommonObject
         if (isset($this->fields[$field]) && method_exists($this, 'is_'.$type))
         {
             return $this->{'is_'.$type}($this->fields[$field]);
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -197,8 +195,7 @@ class CoreObject extends CommonObject
 
                         $this->{$className}[] = $o;
                     }
-                }
-                else {
+                } else {
                     $this->errors[] = $this->db->lasterror();
                 }
             }
@@ -253,8 +250,7 @@ class CoreObject extends CommonObject
             $result = $this->call_trigger(strtoupper($this->element).'_UPDATE', $user);
             if ($result < 0) $error++;
             else $this->saveChild($user);
-        }
-        else {
+        } else {
             $error++;
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->error;
@@ -264,8 +260,7 @@ class CoreObject extends CommonObject
         {
             $this->db->commit();
             return $this->id;
-        }
-        else {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -292,8 +287,7 @@ class CoreObject extends CommonObject
             $result = $this->call_trigger(strtoupper($this->element).'_CREATE', $user);
             if ($result < 0) $error++;
             else $this->saveChild($user);
-        }
-        else {
+        } else {
             $error++;
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->error;
@@ -303,8 +297,7 @@ class CoreObject extends CommonObject
         {
             $this->db->commit();
             return $this->id;
-        }
-        else {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -349,8 +342,7 @@ class CoreObject extends CommonObject
         {
             $this->db->commit();
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->error;
             $this->db->rollback();
@@ -386,8 +378,7 @@ class CoreObject extends CommonObject
         if (empty($date))
         {
             $this->{$field} = 0;
-        }
-        else {
+        } else {
             require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
             $this->{$field} = dol_stringtotime($date);
         }
@@ -409,15 +400,12 @@ class CoreObject extends CommonObject
             if ($this->checkFieldType($key, 'date'))
             {
                 $this->setDate($key, $value);
-            }
-            elseif ($this->checkFieldType($key, 'float'))
+            } elseif ($this->checkFieldType($key, 'float'))
             {
                 $this->{$key} = (double) price2num($value);
-            }
-            elseif ($this->checkFieldType($key, 'int')) {
+            } elseif ($this->checkFieldType($key, 'int')) {
                 $this->{$key} = (int) price2num($value);
-            }
-            else {
+            } else {
             	$this->{$key} = dol_string_nohtmltag($value);
             }
         }
diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php
index 9f49e77f35a..34ef707b674 100644
--- a/htdocs/core/class/cstate.class.php
+++ b/htdocs/core/class/cstate.class.php
@@ -132,8 +132,7 @@ class Cstate // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -175,8 +174,7 @@ class Cstate // extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -262,8 +260,7 @@ class Cstate // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php
index 8e567a552b2..07d3563088e 100644
--- a/htdocs/core/class/ctypent.class.php
+++ b/htdocs/core/class/ctypent.class.php
@@ -136,8 +136,7 @@ class Ctypent // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -184,8 +183,7 @@ class Ctypent // extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -238,8 +236,7 @@ class Ctypent // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -277,8 +274,7 @@ class Ctypent // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-        }
-        else {
+        } else {
             $this->db->commit();
             return 1;
         }
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index 80ea8e2f0cc..ac7b07ea5a9 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -135,8 +135,7 @@ class CUnits // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -194,8 +193,7 @@ class CUnits // extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -234,14 +232,11 @@ class CUnits // extends CommonObject
     		foreach ($filter as $key => $value) {
     			if ($key == 't.rowid' || $key == 't.active' || $key == 't.scale') {
     				$sqlwhere[] = $key.'='.(int) $value;
-    			}
-    			elseif (strpos($key, 'date') !== false) {
+    			} elseif (strpos($key, 'date') !== false) {
     				$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-    			}
-    			elseif ($key == 't.unit_type' || $key == 't.code' || $key == 't.short_label') {
+    			} elseif ($key == 't.unit_type' || $key == 't.code' || $key == 't.short_label') {
     				$sqlwhere[] = $key.' = \''.$this->db->escape($value).'\'';
-    			}
-    			else {
+    			} else {
     				$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
     			}
     		}
@@ -337,8 +332,7 @@ class CUnits // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -376,8 +370,7 @@ class CUnits // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -395,8 +388,7 @@ class CUnits // extends CommonObject
 
 		if ($mode == 'short_label'){
 			return dol_getIdFromCode($this->db, $code, 'c_units', 'short_label', 'rowid');
-		}
-		elseif ($mode == 'code'){
+		} elseif ($mode == 'code'){
 			return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid');
 		}
 
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 8cf13771d35..4cddc65d636 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -187,13 +187,11 @@ class DiscountAbsolute
 
                 $this->db->free($resql);
                 return 1;
-            }
-            else {
+            } else {
                 $this->db->free($resql);
                 return 0;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -262,8 +260,7 @@ class DiscountAbsolute
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
             return $this->id;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror().' - sql='.$sql;
             return -1;
         }
@@ -300,8 +297,7 @@ class DiscountAbsolute
                     $this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
                     return -2;
                 }
-            }
-            else {
+            } else {
                 dol_print_error($this->db);
                 return -1;
             }
@@ -327,8 +323,7 @@ class DiscountAbsolute
         			$this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
         			return -2;
         		}
-        	}
-        	else {
+        	} else {
         		dol_print_error($this->db);
         		return -1;
         	}
@@ -363,14 +358,12 @@ class DiscountAbsolute
                 {
                     $this->db->commit();
                     return 1;
-                }
-                else {
+                } else {
                     $this->error = $this->db->lasterror();
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            elseif ($this->fk_invoice_supplier_source) {
+            } elseif ($this->fk_invoice_supplier_source) {
             	$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
             	$sql .= " set paye=0, fk_statut=1";
             	$sql .= " WHERE (type = 2 or type = 3) AND rowid=".$this->fk_invoice_supplier_source;
@@ -381,19 +374,16 @@ class DiscountAbsolute
             	{
             		$this->db->commit();
             		return 1;
-            	}
-            	else {
+            	} else {
             		$this->error = $this->db->lasterror();
             		$this->db->rollback();
             		return -1;
             	}
-            }
-            else {
+            } else {
                 $this->db->commit();
                 return 1;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -449,8 +439,7 @@ class DiscountAbsolute
         		$this->fk_facture = $rowidinvoice;
         	}
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -3;
         }
@@ -480,8 +469,7 @@ class DiscountAbsolute
         if ($resql)
         {
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -3;
         }
@@ -557,15 +545,13 @@ class DiscountAbsolute
             $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
             $sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
             $sql .= ' AND f.type = 3';
-        }
-        elseif ($invoice->element == 'invoice_supplier')
+        } elseif ($invoice->element == 'invoice_supplier')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
             $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
             $sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
             $sql .= ' AND f.type = 3';
-        }
-        else {
+        } else {
             $this->error = get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
             return -1;
@@ -577,8 +563,7 @@ class DiscountAbsolute
             $obj = $this->db->fetch_object($resql);
             if ($multicurrency == 1) return $obj->multicurrency_amount;
 			else return $obj->amount;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -601,15 +586,13 @@ class DiscountAbsolute
             $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
             $sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
             $sql .= ' AND f.type IN ('.$invoice::TYPE_STANDARD.', '.$invoice::TYPE_CREDIT_NOTE.', '.$invoice::TYPE_SITUATION.')'; // Find discount coming from credit note or excess received
-        }
-        elseif ($invoice->element == 'invoice_supplier')
+        } elseif ($invoice->element == 'invoice_supplier')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
             $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
             $sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
             $sql .= ' AND f.type IN ('.$invoice::TYPE_STANDARD.', '.$invoice::TYPE_CREDIT_NOTE.')'; // Find discount coming from credit note or excess paid
-        }
-        else {
+        } else {
             $this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
             return -1;
@@ -621,8 +604,7 @@ class DiscountAbsolute
             $obj = $this->db->fetch_object($resql);
             if ($multicurrency == 1) return $obj->multicurrency_amount;
 			else return $obj->amount;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -643,14 +625,12 @@ class DiscountAbsolute
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
             $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
             $sql .= ' WHERE rc.fk_facture IS NULL AND rc.fk_facture_source = '.$invoice->id;
-        }
-        elseif ($invoice->element == 'invoice_supplier')
+        } elseif ($invoice->element == 'invoice_supplier')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
             $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
             $sql .= ' WHERE rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_source = '.$invoice->id;
-        }
-        else {
+        } else {
             $this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
             return -1;
@@ -662,8 +642,7 @@ class DiscountAbsolute
             $obj = $this->db->fetch_object($resql);
             if ($multicurrency) return $obj->multicurrency_amount;
 			else return $obj->amount;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
index 743f2968289..2b148a96e8a 100644
--- a/htdocs/core/class/dolgeoip.class.php
+++ b/htdocs/core/class/dolgeoip.class.php
@@ -55,16 +55,14 @@ class DolGeoIP
 		    {
 		    	require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
 		    }
-		}
-		elseif ($type == 'city')
+		} elseif ($type == 'city')
 		{
 		    // geoip may have been already included with PEAR
 			if ($geoipversion == '2' || ($geoipversion != 'php' && !function_exists('geoip_country_code_by_name')))
 		    {
 		    	require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
 		    }
-		}
-		else { print 'ErrorBadParameterInConstructor'; return 0; }
+		} else { print 'ErrorBadParameterInConstructor'; return 0; }
 
 		// Here, function exists (embedded into PHP or exists because we made include)
 		if (empty($type) || empty($datfile))
@@ -85,19 +83,16 @@ class DolGeoIP
 		{
 			try {
 				$this->gi = new GeoIp2\Database\Reader($datfile); // '/usr/local/share/GeoIP/GeoIP2-City.mmdb'
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->error = $e->getMessage();
 				dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
 				return 0;
 			}
-		}
-		elseif (function_exists('geoip_open'))
+		} elseif (function_exists('geoip_open'))
 		{
 			$this->gi = geoip_open($datfile, GEOIP_STANDARD);
-		}
-		else {
+		} else {
 		    $this->gi = 'NOGI'; // We are using embedded php geoip functions
 		    //print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name');
 		    //print geoip_database_info();
@@ -125,8 +120,7 @@ class DolGeoIP
 		{
 		    // geoip_country_code_by_addr does not exists
     		return strtolower(geoip_country_code_by_name($ip));
-		}
-		else {
+		} else {
 			if (preg_match('/^[0-9]+.[0-9]+\.[0-9]+\.[0-9]+/', $ip))
 			{
 				if ($geoipversion == '2')
@@ -134,30 +128,25 @@ class DolGeoIP
 					try {
 						$record = $this->gi->country($ip);
 						return strtolower($record->country->isoCode);
-					}
-					catch (Exception $e) {
+					} catch (Exception $e) {
 						//return $e->getMessage();
 						return '';
 					}
-				}
-				else {
+				} else {
 			    	if (!function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
 			    	return strtolower(geoip_country_code_by_addr($this->gi, $ip));
 				}
-			}
-			else {
+			} else {
 				if ($geoipversion == '2')
 				{
 					try {
 						$record = $this->gi->country($ip);
 						return strtolower($record->country->isoCode);
-					}
-					catch (Exception $e) {
+					} catch (Exception $e) {
 						//return $e->getMessage();
 						return '';
 					}
-				}
-				else {
+				} else {
 					if (!function_exists('geoip_country_code_by_addr_v6')) return strtolower(geoip_country_code_by_name_v6($this->gi, $ip));
 					return strtolower(geoip_country_code_by_addr_v6($this->gi, $ip));
 				}
@@ -188,13 +177,11 @@ class DolGeoIP
 			try {
 				$record = $this->gi->country($name);
 				return $record->country->isoCode;
-			}
-			catch (Exception $e) {
+			} catch (Exception $e) {
 				//return $e->getMessage();
 				return '';
 			}
-		}
-		else {
+		} else {
 			return geoip_country_code_by_name($this->gi, $name);
 		}
 	}
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index b840f767a97..4ca072897bb 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -472,12 +472,10 @@ class DolGraph
 			{
 				//print 'ee'.join(',',$theme_bgcoloronglet);
 				$this->bgcolor = $theme_bgcoloronglet;
-			}
-			else {
+			} else {
 				$this->bgcolor = $theme_bgcolor;
 			}
-		}
-		else {
+		} else {
 			$this->bgcolor = $bg_color;
 		}
 	}
@@ -500,12 +498,10 @@ class DolGraph
 			{
 				//print 'ee'.join(',',$theme_bgcoloronglet);
 				$this->bgcolorgrid = $theme_bgcoloronglet;
-			}
-			else {
+			} else {
 				$this->bgcolorgrid = $theme_bgcolor;
 			}
-		}
-		else {
+		} else {
 			$this->bgcolorgrid = $bg_colorgrid;
 		}
 	}
@@ -721,8 +717,7 @@ class DolGraph
 				foreach ($values as $x => $y) {
 					if (isset($y)) $serie[$i] .= 'd'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";
 				}
-			}
-			else {
+			} else {
 				foreach ($values as $x => $y) {
 					if (isset($y)) $serie[$i] .= 'd'.$i.'.push(['.$x.', '.$y.']);'."\n";
 				}
@@ -753,8 +748,7 @@ class DolGraph
 		if ($nblot < 0)
 		{
 			$this->stringtoshow .= '<!-- No series of data -->'."\n";
-		}
-		else {
+		} else {
 			while ($i < $nblot)
 			{
 				$this->stringtoshow .= '<!-- Serie '.$i.' -->'."\n";
@@ -893,8 +887,7 @@ class DolGraph
                         elseif ($i == $firstlot + 1) $align = 'center';
                         else $align = 'left';
                         $this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "'.$align.'", barWidth: 0.45 }, ';
-                    }
-				    else $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
+                    } else $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
                 }
 				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow .= 'lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';
 				$this->stringtoshow .= 'color: "#'.$color.'", label: "'.(isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '').'", data: d'.$i.' }';
@@ -1051,8 +1044,7 @@ class DolGraph
 		if ($nblot < 0)
 		{
 			$this->stringtoshow .= '<!-- No series of data -->';
-		}
-		else {
+		} else {
 			while ($i < $nblot)
 			{
 				//$this->stringtoshow .= '<!-- Series '.$i.' -->'."\n";
@@ -1095,8 +1087,7 @@ class DolGraph
 					if (strpos($tmp, '-') !== false) {
 						$foundnegativecolor++;
 						$color = '#FFFFFF'; // If $val is '-123'
-					}
-					else $color = "#".$tmp; // If $val is '123' or '#123'
+					} else $color = "#".$tmp; // If $val is '123' or '#123'
 				}
 				$this->stringtoshow .= "'".$color."'";
 				$i++;
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index e390565748a..25a0d2a25c5 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -350,28 +350,23 @@ class EmailSenderProfile extends CommonObject
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 6)
+		} elseif ($mode == 6)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
@@ -424,8 +419,7 @@ class EmailSenderProfile extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index cd6e3b42e0a..bffd23f05d2 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -173,8 +173,7 @@ class Events // extends CommonObject
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
 			return $this->id;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -259,8 +258,7 @@ class Events // extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 4157870972d..c82e877fa80 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -253,10 +253,8 @@ class ExtraFields
 				$this->error = '';
 				$this->errno = 0;
 				return 1;
-			}
-			else return -2;
-		}
-		else {
+			} else return -2;
+		} else {
 			return -1;
 		}
 	}
@@ -337,14 +335,12 @@ class ExtraFields
 					$resql = $this->db->query($sql, 1, 'dml');
 				}
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->errno = $this->db->lasterrno();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			return 0;
 		}
 	}
@@ -398,12 +394,10 @@ class ExtraFields
 			if (is_array($param) && count($param) > 0)
 			{
 				$params = serialize($param);
-			}
-			elseif (strlen($param) > 0)
+			} elseif (strlen($param) > 0)
 			{
 				$params = trim($param);
-			}
-			else {
+			} else {
 				$params = '';
 			}
 
@@ -461,8 +455,7 @@ class ExtraFields
 			if ($this->db->query($sql))
 			{
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->errno = $this->db->lasterrno();
 				return -1;
@@ -522,8 +515,7 @@ class ExtraFields
 			}
 
 			return $result;
-		}
-		else {
+		} else {
 			return 0;
 		}
 	}
@@ -556,13 +548,11 @@ class ExtraFields
 			if ($resql)
 			{
 				return 1;
-			}
-			else {
+			} else {
 				dol_print_error($this->db);
 				return -1;
 			}
-		}
-		else {
+		} else {
 			return 0;
 		}
 	}
@@ -651,25 +641,21 @@ class ExtraFields
 					if ($unique)
 					{
 						$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
-					}
-					else {
+					} else {
 						$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
 					}
 					dol_syslog(get_class($this).'::update', LOG_DEBUG);
 					$resql = $this->db->query($sql, 1, 'dml');
 					return 1;
-				}
-				else {
+				} else {
 					$this->error = $this->db->lasterror();
 					return -1;
 				}
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			return 0;
 		}
 	}
@@ -727,12 +713,10 @@ class ExtraFields
 			if (is_array($param) && count($param) > 0)
 			{
 				$params = serialize($param);
-			}
-			elseif (strlen($param) > 0)
+			} elseif (strlen($param) > 0)
 			{
 				$params = trim($param);
-			}
-			else {
+			} else {
 				$params = '';
 			}
 
@@ -743,8 +727,7 @@ class ExtraFields
 				$sql_del .= " WHERE name = '".$attrname."'";
 				$sql_del .= " AND entity IN (0, ".($entity === '' ? $conf->entity : $entity).")";
 				$sql_del .= " AND elementtype = '".$elementtype."'";
-			}
-			else {
+			} else {
 				// We want on all entities ($entities = '0'), we delete on all only (we keep setup specific to each entity)
 				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
 				$sql_del .= " WHERE name = '".$attrname."'";
@@ -809,14 +792,12 @@ class ExtraFields
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				dol_print_error($this->db);
 				return -1;
 			}
-		}
-		else {
+		} else {
 			return 0;
 		}
 	}
@@ -916,8 +897,7 @@ class ExtraFields
 				}
 			}
 			if ($elementtype) $this->attributes[$elementtype]['loaded'] = 1; // If nothing found, we also save tag 'loaded'
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch_name_optionals_label ".$this->error, LOG_ERR);
 		}
@@ -974,8 +954,7 @@ class ExtraFields
 			$totalizable = $this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
 			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
 			$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-		else // Old usage
+		} else // Old usage
 		{
 			$label = $this->attribute_label[$key];
 			$type = $this->attribute_type[$key];
@@ -1003,37 +982,29 @@ class ExtraFields
 			if ($type == 'date')
 			{
 				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime' || $type == 'link')
+			} elseif ($type == 'datetime' || $type == 'link')
 			{
 				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type, array('int', 'integer', 'double', 'price')))
+			} elseif (in_array($type, array('int', 'integer', 'double', 'price')))
 			{
 				$morecss = 'maxwidth75';
-			}
-			elseif ($type == 'password')
+			} elseif ($type == 'password')
 			{
 				$morecss = 'maxwidth100';
-			}
-			elseif ($type == 'url')
+			} elseif ($type == 'url')
 			{
 				$morecss = 'minwidth400';
-			}
-			elseif ($type == 'boolean')
+			} elseif ($type == 'boolean')
 			{
 				$morecss = '';
-			}
-			else {
+			} else {
 				if (round($size) < 12)
 				{
 					$morecss = 'minwidth100';
-				}
-				elseif (round($size) <= 48)
+				} elseif (round($size) <= 48)
 				{
 					$morecss = 'minwidth200';
-				}
-				else {
+				} else {
 					$morecss = 'minwidth400';
 				}
 			}
@@ -1051,46 +1022,38 @@ class ExtraFields
 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
-		}
-		elseif (in_array($type, array('int', 'integer')))
+		} elseif (in_array($type, array('int', 'integer')))
 		{
 			$tmp = explode(',', $size);
 			$newsize = $tmp[0];
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
-		}
-		elseif (preg_match('/varchar/', $type))
+		} elseif (preg_match('/varchar/', $type))
 		{
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
-		}
-		elseif (in_array($type, array('mail', 'phone', 'url')))
+		} elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
-		}
-		elseif ($type == 'text')
+		} elseif ($type == 'text')
 		{
 			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
-			}
-			else {
+			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
-		}
-		elseif ($type == 'html')
+		} elseif ($type == 'html')
 		{
 			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
-			}
-			else {
+			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			if (empty($mode))
 			{
@@ -1101,26 +1064,22 @@ class ExtraFields
 					$checked = ' value="1" ';
 				}
 				$out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';
-			}
-			else {
+			} else {
 				$out .= $form->selectyesno($keyprefix.$key.$keysuffix, $value, 1, false, 1);
 			}
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value = price($value);
 			}
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.$langs->getCurrencySymbol($conf->currency);
-		}
-		elseif ($type == 'double')
+		} elseif ($type == 'double')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value = price($value);
 			}
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			$out = '';
 			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -1144,8 +1103,7 @@ class ExtraFields
 				$out .= '</option>';
 			}
 			$out .= '</select>';
-		}
-		elseif ($type == 'sellist')
+		} elseif ($type == 'sellist')
 		{
 			$out = '';
 			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -1304,13 +1262,11 @@ class ExtraFields
                 }
 			}
 			$out .= '</select>';
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr = explode(',', $value);
 			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$out = '';
 			foreach ($param['options'] as $keyopt => $val)
@@ -1321,13 +1277,11 @@ class ExtraFields
 				$out .= ($value == $keyopt ? 'checked' : '');
 				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			if (is_array($value)) {
 				$value_arr = $value;
-			}
-			else {
+			} else {
 				$value_arr = explode(',', $value);
 			}
 
@@ -1525,14 +1479,12 @@ class ExtraFields
                     $out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
                 }
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
 			$showempty = (($required && $default != '') ? 0 : 1);
 			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss);
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
 			$out = '<input style="display:none" type="text" name="fakeusernameremembered">'; // Hidden field to reduce impact of evil Google Chrome autopopulate bug.
@@ -1580,8 +1532,7 @@ class ExtraFields
 			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
 			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
 			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-		else // Old usage
+		} else // Old usage
 		{
 			//dol_syslog("Warning: parameter 'extrafieldsobjectkey' is missing", LOG_WARNING);
 			$label = $this->attribute_label[$key];
@@ -1608,17 +1559,14 @@ class ExtraFields
 		{
 			$showsize = 10;
 			$value = dol_print_date($value, 'day');
-		}
-		elseif ($type == 'datetime')
+		} elseif ($type == 'datetime')
 		{
 			$showsize = 19;
 			$value = dol_print_date($value, 'dayhour');
-		}
-		elseif ($type == 'int')
+		} elseif ($type == 'int')
 		{
 			$showsize = 10;
-		}
-		elseif ($type == 'double')
+		} elseif ($type == 'double')
 		{
 			if (!empty($value)) {
 				//$value=price($value);
@@ -1626,38 +1574,31 @@ class ExtraFields
 				$number_decimals = $sizeparts[1];
 				$value = price($value, 0, $langs, 0, 0, $number_decimals, '');
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked = '';
 			if (!empty($value)) {
 				$checked = ' checked ';
 			}
 			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
-		}
-		elseif ($type == 'mail')
+		} elseif ($type == 'mail')
 		{
 			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
-		}
-		elseif ($type == 'url')
+		} elseif ($type == 'url')
 		{
 			$value = dol_print_url($value, '_blank', 32, 1);
-		}
-		elseif ($type == 'phone')
+		} elseif ($type == 'phone')
 		{
 			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 'phone');
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			//$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
 			if ($value || $value == '0') $value = price($value, 0, $langs, 0, 0, -1);
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			if ($langfile && $param['options'][$value]) $value = $langs->trans($param['options'][$value]);
 			else $value = $param['options'][$value];
-		}
-		elseif ($type == 'sellist')
+		} elseif ($type == 'sellist')
 		{
 			$param_list = array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
@@ -1718,8 +1659,7 @@ class ExtraFields
 							$value .= $obj->$field_toshow.' ';
 						}
 					}
-				}
-				else {
+				} else {
 					$translabel = '';
 					if (!empty($obj->{$InfoFieldList[1]})) {
 						$translabel = $langs->trans($obj->{$InfoFieldList[1]});
@@ -1730,14 +1670,11 @@ class ExtraFields
 						$value = $obj->{$InfoFieldList[1]};
 					}
 				}
-			}
-			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
-		}
-		elseif ($type == 'radio')
+			} else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
+		} elseif ($type == 'radio')
 		{
 			$value = $param['options'][$value];
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr = explode(',', $value);
 			$value = '';
@@ -1749,8 +1686,7 @@ class ExtraFields
 				}
 			}
 			$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			$value_arr = explode(',', $value);
 
@@ -1817,8 +1753,7 @@ class ExtraFields
 			} else {
 				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$out = '';
 
@@ -1839,26 +1774,21 @@ class ExtraFields
 						$object->fetch($value);
 						$value = $object->getNomUrl(3);
 					}
-				}
-				else {
+				} else {
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 					return 'Error bad setup of extrafield';
 				}
 			}
-		}
-		elseif ($type == 'text')
+		} elseif ($type == 'text')
 		{
 			$value = dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'html')
+		} elseif ($type == 'html')
 		{
 			$value = dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			$value = dol_trunc(preg_replace('/./i', '*', $value), 8, 'right', 'UTF-8', 1);
-		}
-		else {
+		} else {
 			$showsize = round($size);
 			if ($showsize > 48) $showsize = 48;
 		}
@@ -1888,36 +1818,28 @@ class ExtraFields
         if ($type == 'date')
 		{
 			$align = "center";
-		}
-		elseif ($type == 'datetime')
+		} elseif ($type == 'datetime')
 		{
 			$align = "center";
-		}
-		elseif ($type == 'int')
+		} elseif ($type == 'int')
 		{
 			$align = "right";
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			$align = "right";
-		}
-		elseif ($type == 'double')
+		} elseif ($type == 'double')
 		{
 			$align = "right";
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$align = "center";
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$align = "center";
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$align = "center";
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			$align = "right";
 		}
@@ -2040,14 +1962,12 @@ class ExtraFields
 					// Clean parameters
 					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
 					$value_key = dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
-				}
-				elseif (in_array($key_type, array('datetime')))
+				} elseif (in_array($key_type, array('datetime')))
 				{
 					// Clean parameters
 					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
 					$value_key = dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
-				}
-				elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
+				} elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
 				{
 					$value_arr = GETPOST("options_".$key, 'array'); // check if an array
 					if (!empty($value_arr)) {
@@ -2055,13 +1975,11 @@ class ExtraFields
 					} else {
 						$value_key = '';
 					}
-				}
-				elseif (in_array($key_type, array('price', 'double')))
+				} elseif (in_array($key_type, array('price', 'double')))
 				{
 					$value_arr = GETPOST("options_".$key, 'alpha');
 					$value_key = price2num($value_arr);
-				}
-				else {
+				} else {
 					$value_key = GETPOST("options_".$key);
 					if (in_array($key_type, array('link')) && $value_key == '-1') $value_key = '';
 				}
@@ -2073,12 +1991,10 @@ class ExtraFields
 				$langs->load('errors');
 				setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ', $error_field_required), null, 'errors');
 				return -1;
-			}
-			else {
+			} else {
 				return 1;
 			}
-		}
-		else {
+		} else {
 			return 0;
 		}
 	}
@@ -2098,8 +2014,7 @@ class ExtraFields
 		if (is_string($extrafieldsobjectkey) && is_array($this->attributes[$extrafieldsobjectkey]['label']))
 		{
 			$extralabels = $this->attributes[$extrafieldsobjectkey]['label'];
-		}
-		else {
+		} else {
 			$extralabels = $extrafieldsobjectkey;
 		}
 
@@ -2121,22 +2036,19 @@ class ExtraFields
 					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix."year")) continue; // Value was not provided, we should not set it.
 					// Clean parameters
 					$value_key = dol_mktime(GETPOST($keysuffix."options_".$key.$keyprefix."hour", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."min", 'int'), 0, GETPOST($keysuffix."options_".$key.$keyprefix."month", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."day", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."year", 'int'));
-				}
-				elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
+				} elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
 				{
 					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
 					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
 					// Make sure we get an array even if there's only one checkbox
 					$value_arr = (array) $value_arr;
 					$value_key = implode(',', $value_arr);
-				}
-				elseif (in_array($key_type, array('price', 'double', 'int')))
+				} elseif (in_array($key_type, array('price', 'double', 'int')))
 				{
 					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
 					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
 					$value_key = price2num($value_arr);
-				}
-				else {
+				} else {
 					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
 					$value_key = GETPOST($keysuffix."options_".$key.$keyprefix);
 				}
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index f549c7520f7..c941a3a0745 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -64,46 +64,36 @@ class FileUpload
 		if ($element == 'propal') {
 			$pathname = 'comm/propal';
 			$dir_output = $conf->$element->dir_output;
-		}
-		elseif ($element == 'facture') {
+		} elseif ($element == 'facture') {
 			$pathname = 'compta/facture';
 			$dir_output = $conf->$element->dir_output;
-		}
-		elseif ($element == 'project') {
+		} elseif ($element == 'project') {
 			$element = $pathname = 'projet';
 			$dir_output = $conf->$element->dir_output;
-		}
-		elseif ($element == 'project_task') {
+		} elseif ($element == 'project_task') {
 			$pathname = 'projet'; $filename = 'task';
 			$dir_output = $conf->projet->dir_output;
 			$parentForeignKey = 'fk_project';
 			$parentClass = 'Project';
 			$parentElement = 'projet';
 			$parentObject = 'project';
-		}
-		elseif ($element == 'fichinter') {
+		} elseif ($element == 'fichinter') {
 			$element = 'ficheinter';
 			$dir_output = $conf->$element->dir_output;
-		}
-		elseif ($element == 'order_supplier') {
+		} elseif ($element == 'order_supplier') {
 			$pathname = 'fourn'; $filename = 'fournisseur.commande';
 			$dir_output = $conf->fournisseur->commande->dir_output;
-		}
-		elseif ($element == 'invoice_supplier') {
+		} elseif ($element == 'invoice_supplier') {
 			$pathname = 'fourn'; $filename = 'fournisseur.facture';
 			$dir_output = $conf->fournisseur->facture->dir_output;
-		}
-		elseif ($element == 'product') {
+		} elseif ($element == 'product') {
 			$dir_output = $conf->product->multidir_output[$conf->entity];
-		}
-		elseif ($element == 'productbatch') {
+		} elseif ($element == 'productbatch') {
 			$dir_output = $conf->productbatch->multidir_output[$conf->entity];
-		}
-		elseif ($element == 'action') {
+		} elseif ($element == 'action') {
 			$pathname = 'comm/action'; $filename = 'actioncomm';
 			$dir_output = $conf->agenda->dir_output;
-		}
-		elseif ($element == 'chargesociales') {
+		} elseif ($element == 'chargesociales') {
 			$pathname = 'compta/sociales'; $filename = 'chargesociales';
 			$dir_output = $conf->tax->dir_output;
 		} else {
@@ -298,8 +288,7 @@ class FileUpload
 
 			if (preg_match('/error/i', $res)) return false;
 			return true;
-		}
-		else {
+		} else {
 			return false;
 		}
 	}
@@ -450,8 +439,7 @@ class FileUpload
 				} else {
 					dol_move_uploaded_file($uploaded_file, $file_path, 1, 0, 0, 0, 'userfile');
 				}
-			}
-			else {
+			} else {
 				// Non-multipart uploads (PUT method support)
 				file_put_contents($file_path, fopen('php://input', 'r'), $append_file ? FILE_APPEND : 0);
 			}
@@ -467,8 +455,7 @@ class FileUpload
 						$file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
 					}
 				}
-			}
-			elseif ($this->options['discard_aborted_uploads'])
+			} elseif ($this->options['discard_aborted_uploads'])
 			{
 				unlink($file_path);
 				$file->error = 'abort';
@@ -491,8 +478,7 @@ class FileUpload
 		if ($file_name)
 		{
 			$info = $this->getFileObject($file_name);
-		}
-		else {
+		} else {
 			$info = $this->getFileObjects();
 		}
 		header('Content-type: application/json');
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index a09d0bc3e30..0686b68115a 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -157,14 +157,12 @@ class Fiscalyear extends CommonObject
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -204,8 +202,7 @@ class Fiscalyear extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog($this->error, LOG_ERR);
 			$this->db->rollback();
@@ -239,8 +236,7 @@ class Fiscalyear extends CommonObject
 			$this->statut	    = $obj->statut;
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -264,8 +260,7 @@ class Fiscalyear extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -299,27 +294,22 @@ class Fiscalyear extends CommonObject
 		if ($mode == 0)
 		{
 			return $langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			return $langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut8').' '.$langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut8');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
@@ -364,8 +354,7 @@ class Fiscalyear extends CommonObject
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -396,8 +385,7 @@ class Fiscalyear extends CommonObject
 		{
 			$obj = $this->db->fetch_object($resql);
 			$nb = $obj->nb;
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return $nb;
 	}
@@ -428,8 +416,7 @@ class Fiscalyear extends CommonObject
 		{
 			$obj = $this->db->fetch_object($resql);
 			$nb = $obj->nb;
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return $nb;
 	}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 353102b6189..bfccd8e9b03 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -124,8 +124,7 @@ class Form
 				}
 				if ($fieldrequired) $ret .= '</span>';
 				$ret .= '</div>'."\n";
-			}
-			else {
+			} else {
 				if ($fieldrequired) $ret .= '<span class="fieldrequired">';
 				if ($help) {
 					$ret .= $this->textwithpicto($langs->trans($text), $help);
@@ -134,8 +133,7 @@ class Form
 				}
 				if ($fieldrequired) $ret .= '</span>';
 			}
-		}
-		else {
+		} else {
 			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
 			if ($fieldrequired) $ret .= '<span class="fieldrequired">';
 			if ($help) {
@@ -188,8 +186,7 @@ class Form
 		if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;|datehourpicker/', $typeofdata)) // TODO add jquery timepicker and support select
 		{
 			$ret .= $this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $custommsg);
-		}
-		else {
+		} else {
 			if (GETPOST('action', 'aZ09') == 'edit'.$htmlname)
 			{
 				$ret .= "\n";
@@ -203,14 +200,12 @@ class Form
 				{
 					$tmp = explode(':', $typeofdata);
 					$ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($editvalue ? $editvalue : $value).'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').'>';
-				}
-				elseif (preg_match('/^(numeric|amount)/', $typeofdata))
+				} elseif (preg_match('/^(numeric|amount)/', $typeofdata))
 				{
 					$tmp = explode(':', $typeofdata);
 					$valuetoshow = price2num($editvalue ? $editvalue : $value);
 					$ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($valuetoshow != '' ?price($valuetoshow) : '').'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').'>';
-				}
-				elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))	// if wysiwyg is enabled $typeofdata = 'ckeditor'
+				} elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))	// if wysiwyg is enabled $typeofdata = 'ckeditor'
 				{
 					$tmp = explode(':', $typeofdata);
 					$cols = $tmp[2];
@@ -228,16 +223,13 @@ class Form
 					$valuetoshow = str_replace('&', '&amp;', $valuetoshow);
 					$ret .= dol_string_neverthesehtmltags($valuetoshow, array('textarea'));
 					$ret .= '</textarea>';
-				}
-				elseif ($typeofdata == 'day' || $typeofdata == 'datepicker')
+				} elseif ($typeofdata == 'day' || $typeofdata == 'datepicker')
 				{
 					$ret .= $this->selectDate($value, $htmlname, 0, 0, 1, 'form'.$htmlname, 1, 0);
-				}
-				elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker')
+				} elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker')
 				{
 					$ret .= $this->selectDate($value, $htmlname, 1, 1, 1, 'form'.$htmlname, 1, 0);
-				}
-				elseif (preg_match('/^select;/', $typeofdata))
+				} elseif (preg_match('/^select;/', $typeofdata))
 				{
 					$arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));
 					$arraylist = array();
@@ -248,8 +240,7 @@ class Form
 						$arraylist[$tmpkey] = $tmp[1];
 					}
 					$ret .= $this->selectarray($htmlname, $arraylist, $value);
-				}
-				elseif (preg_match('/^ckeditor/', $typeofdata))
+				} elseif (preg_match('/^ckeditor/', $typeofdata))
 				{
 					$tmp = explode(':', $typeofdata); // Example: ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols:uselocalbrowser
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -267,8 +258,7 @@ class Form
 
 				if (empty($notabletag)) $ret .= '</tr></table>'."\n";
 				$ret .= '</form>'."\n";
-			}
-			else {
+			} else {
 				if (preg_match('/^(email)/', $typeofdata))              $ret .= dol_print_email($value, 0, 0, 0, 0, 1);
 				elseif (preg_match('/^(amount|numeric)/', $typeofdata)) $ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');
 				elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))  $ret .= dol_htmlentitiesbr($value);
@@ -285,8 +275,7 @@ class Form
 						$arraylist[$tmp[0]] = $tmp[1];
 					}
 					$ret .= $arraylist[$value];
-				}
-				elseif (preg_match('/^ckeditor/', $typeofdata))
+				} elseif (preg_match('/^ckeditor/', $typeofdata))
 				{
 					$tmpcontent = dol_htmlentitiesbr($value);
 					if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
@@ -298,8 +287,7 @@ class Form
 					// We dont use dol_escape_htmltag to get the html formating active, but this need we must also
 					// clean data from some dangerous html
 					$ret .= dol_string_onlythesehtmltags(dol_htmlentitiesbr($tmpcontent));
-				}
-				else {
+				} else {
 					$ret .= dol_escape_htmltag($value);
 				}
 
@@ -437,8 +425,7 @@ class Form
 				if (!empty($tmp[1])) $inputOption = $tmp[1];
 				if (!empty($tmp[2])) $savemethod = $tmp[2];
 				$out .= '<input id="width_'.$htmlname.'" value="'.$inputOption.'" type="hidden"/>'."\n";
-			}
-			elseif ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType)))
+			} elseif ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType)))
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0];
@@ -446,22 +433,19 @@ class Form
 				if (!empty($tmp[2])) $savemethod = $tmp[2];
 
 				$out .= '<input id="timestamp" type="hidden"/>'."\n"; // Use for timestamp format
-			}
-			elseif (preg_match('/^(select|autocomplete)/', $inputType))
+			} elseif (preg_match('/^(select|autocomplete)/', $inputType))
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0]; $loadmethod = $tmp[1];
 				if (!empty($tmp[2])) $savemethod = $tmp[2];
 				if (!empty($tmp[3])) $button_only = true;
-			}
-			elseif (preg_match('/^textarea/', $inputType))
+			} elseif (preg_match('/^textarea/', $inputType))
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0];
 				$rows = (empty($tmp[1]) ? '8' : $tmp[1]);
 				$cols = (empty($tmp[2]) ? '80' : $tmp[2]);
-			}
-			elseif (preg_match('/^ckeditor/', $inputType))
+			} elseif (preg_match('/^ckeditor/', $inputType))
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0]; $toolbar = $tmp[1];
@@ -472,8 +456,7 @@ class Form
 				if (!empty($conf->fckeditor->enabled))
 				{
 					$out .= '<input id="ckeditor_toolbar" value="'.$toolbar.'" type="hidden"/>'."\n";
-				}
-				else {
+				} else {
 					$inputType = 'textarea';
 				}
 			}
@@ -492,8 +475,7 @@ class Form
 						$out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg['success'].'" type="hidden"/>'."\n";
 						if (!empty($custommsg['error']))
 							$out .= '<input id="errormsg_'.$htmlname.'" value="'.$custommsg['error'].'" type="hidden"/>'."\n";
-				}
-				else $out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";
+				} else $out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";
 			}
 			if ($inputType == 'textarea') {
 				$out .= '<input id="textarea_'.$htmlname.'_rows" value="'.$rows.'" type="hidden"/>'."\n";
@@ -501,8 +483,7 @@ class Form
 			}
 			$out .= '<span id="viewval_'.$htmlname.'" class="viewval_'.$inputType.($button_only ? ' inactive' : ' active').'">'.$value.'</span>'."\n";
 			$out .= '<span id="editval_'.$htmlname.'" class="editval_'.$inputType.($button_only ? ' inactive' : ' active').' hideobject">'.(!empty($editvalue) ? $editvalue : $value).'</span>'."\n";
-		}
-		else {
+		} else {
 			$out = $value;
 		}
 
@@ -550,8 +531,7 @@ class Form
 		if ($tooltiptrigger == '')
 		{
 			$htmltext = str_replace('"', '&quot;', $htmltext);
-		}
-		else {
+		} else {
 			$classfortooltip = 'classfortooltiponclick';
 			$textfordialog .= '<div style="display: none;" id="idfortooltiponclick_'.$tooltiptrigger.'" class="classfortooltiponclicktext">'.$htmltext.'</div>';
 		}
@@ -560,15 +540,13 @@ class Form
 			$paramfortooltipimg = ' class="'.$classfortooltip.($notabs != 3 ? ' inline-block' : '').($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'"';
 			if ($tooltiptrigger == '') $paramfortooltipimg .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on img tag to store tooltip
 			else $paramfortooltipimg .= ' dolid="'.$tooltiptrigger.'"';
-		}
-		else $paramfortooltipimg = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
+		} else $paramfortooltipimg = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
 		if ($tooltipon == 1 || $tooltipon == 3)
 		{
 			$paramfortooltiptd = ' class="'.($tooltipon == 3 ? 'cursorpointer ' : '').$classfortooltip.' inline-block'.($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'" ';
 			if ($tooltiptrigger == '') $paramfortooltiptd .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on td tag to store tooltip
 			else $paramfortooltiptd .= ' dolid="'.$tooltiptrigger.'"';
-		}
-		else $paramfortooltiptd = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
+		} else $paramfortooltiptd = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
 		if (empty($notabs)) $s .= '<table class="nobordernopadding"><tr style="height: auto;">';
 		elseif ($notabs == 2) $s .= '<div class="inline-block'.($forcenowrap ? ' nowrap' : '').'">';
 		// Define value if value is before
@@ -849,8 +827,7 @@ class Form
 					{
 						$foundselected = true;
 						$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'" selected>';
-					}
-					else {
+					} else {
 						$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'">';
 					}
 					if ($row['label']) $out .= dol_trunc($row['label'], $maxlength, 'middle');
@@ -860,8 +837,7 @@ class Form
 				}
 			}
 			$out .= '</select>';
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -938,8 +914,7 @@ class Form
 					if ($selected && ($selected == $row['rowid'] || $selected == $row['code']))
 					{
 						$out .= '<option value="'.$row['rowid'].'" selected>';
-					}
-					else {
+					} else {
 						$out .= '<option value="'.$row['rowid'].'">';
 					}
 
@@ -956,8 +931,7 @@ class Form
 			{
 				$out .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'"></form>';
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1062,8 +1036,7 @@ class Form
 			asort($this->cache_types_fees);
 
 			return $num;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1182,8 +1155,7 @@ class Form
 			if ($hidelabel == 3) {
 				$out .= img_picto($langs->trans("Search"), 'search');
 			}
-		}
-		else {
+		} else {
 			// Immediate load of all database
 			$out .= $this->select_thirdparty_list($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events, '', 0, $limit, $morecss, $moreparam, $multiple);
 		}
@@ -1313,8 +1285,7 @@ class Form
 							$label .= $obj->code_fournisseur.' - ';
 						}
 						$label .= ' '.$obj->name;
-					}
-					else {
+					} else {
 						$label = $obj->name;
 					}
 
@@ -1343,12 +1314,10 @@ class Form
 						if (in_array($obj->rowid, $selected))
 						{
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
-						}
-						else {
+						} else {
 							$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';
 						}
-					}
-					else {
+					} else {
 						array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));
 					}
 
@@ -1357,8 +1326,7 @@ class Form
 				}
 			}
 			$out .= '</select>'."\n";
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1438,8 +1406,7 @@ class Form
 			}
 			print '</select>';
 			return $qualifiedlines;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1569,8 +1536,7 @@ class Form
 								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
 								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
 								$out .= '</option>';
-							}
-							else {
+							} else {
 								$out .= '<option value="'.$obj->rowid.'"';
 								if ($disabled) $out .= ' disabled';
 								$out .= '>';
@@ -1579,8 +1545,7 @@ class Form
 								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
 								$out .= '</option>';
 							}
-						}
-						else {
+						} else {
 							if (in_array($obj->rowid, $selected))
 							{
 								$out .= $contactstatic->getFullName($langs);
@@ -1591,8 +1556,7 @@ class Form
 					}
 					$i++;
 				}
-			}
-			else {
+			} else {
 				$out .= '<option value="-1"'.(($showempty == 2 || $multiple) ? '' : ' selected').' disabled>';
 				$out .= ($socid != -1) ? ($langs->trans($socid ? "NoContactDefinedForThirdParty" : "NoContactDefined")) : $langs->trans('SelectAThirdPartyFirst');
 				$out .= '</option>';
@@ -1616,8 +1580,7 @@ class Form
 
 			$this->num = $num;
 			return $out;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1691,8 +1654,7 @@ class Form
 		{
 			// Build list includeUsers to have only hierarchy
 			$includeUsers = implode(",", $user->getAllChildIds(0));
-		}
-		elseif ($include == 'hierarchyme')
+		} elseif ($include == 'hierarchyme')
 		{
 			// Build list includeUsers to have only hierarchy and current user
 			$includeUsers = implode(",", $user->getAllChildIds(1));
@@ -1713,15 +1675,13 @@ class Form
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=u.entity";
 			if ($force_entity) $sql .= " WHERE u.entity IN (0,".$force_entity.")";
 			else $sql .= " WHERE u.entity IS NOT NULL";
-		}
-		else {
+		} else {
 			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 			{
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug";
 				$sql .= " ON ug.fk_user = u.rowid";
 				$sql .= " WHERE ug.entity = ".$conf->entity;
-			}
-			else {
+			} else {
 				$sql .= " WHERE u.entity IN (0,".$conf->entity.")";
 			}
 		}
@@ -1738,8 +1698,7 @@ class Form
 		if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION))	// MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname
 		{
 			$sql .= " ORDER BY u.firstname ASC";
-		}
-		else {
+		} else {
 			$sql .= " ORDER BY u.lastname ASC";
 		}
 
@@ -1778,8 +1737,7 @@ class Form
 						$out .= '<option value="'.$obj->rowid.'"';
 						if ($disableline) $out .= ' disabled';
 						$out .= ' selected>';
-					}
-					else {
+					} else {
 						$out .= '<option value="'.$obj->rowid.'"';
 						if ($disableline) $out .= ' disabled';
 						$out .= '>';
@@ -1819,8 +1777,7 @@ class Form
 						{
 							$out .= ($moreinfo ? ' - ' : ' (').$langs->trans("AllEntities");
 							$moreinfo++;
-						}
-						else {
+						} else {
 							$out .= ($moreinfo ? ' - ' : ' (').($obj->label ? $obj->label : $langs->trans("EntityNameNotDefined"));
 							$moreinfo++;
 						}
@@ -1835,14 +1792,12 @@ class Form
 
 					$i++;
 				}
-			}
-			else {
+			} else {
 				$out .= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'" disabled>';
 				$out .= '<option value="">'.$langs->trans("None").'</option>';
 			}
 			$out .= '</select>';
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1887,8 +1842,7 @@ class Form
 		if ($action == 'view')
 		{
 			$out .= '';
-		}
-		else {
+		} else {
 			$out .= '<input type="hidden" class="removedassignedhidden" name="removedassigned" value="">';
 			$out .= '<script type="text/javascript" language="javascript">jQuery(document).ready(function () {    jQuery(".removedassigned").click(function() {        jQuery(".removedassignedhidden").val(jQuery(this).val());    });})</script>';
 			$out .= $this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);
@@ -1978,8 +1932,7 @@ class Form
 		if (strval($filtertype) === '' && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
 			if (!empty($conf->product->enabled) && empty($conf->service->enabled)) {
 				$filtertype = '0';
-			}
-			elseif (empty($conf->product->enabled) && !empty($conf->service->enabled)) {
+			} elseif (empty($conf->product->enabled) && !empty($conf->service->enabled)) {
 				$filtertype = '1';
 			}
 		}
@@ -2001,8 +1954,7 @@ class Form
 			{
 				if (empty($conf->product->enabled)) { // when product module is disabled, show services only
 					$filtertype = 1;
-				}
-				elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
+				} elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
 					$filtertype = 0;
 				}
 			}
@@ -2098,8 +2050,7 @@ class Form
 			if ($hidelabel == 3) {
 				print img_picto($langs->trans("Search"), 'search');
 			}
-		}
-		else {
+		} else {
 			print $this->select_produits_list($selected, $htmlname, $filtertype, $limit, $price_level, '', $status, $finished, 0, $socid, $showempty, $forcecombo, $morecss, $hidepriceinlabel, $warehouseStatus);
 		}
 	}
@@ -2163,8 +2114,7 @@ class Form
 		if (count($warehouseStatusArray))
 		{
 		    $selectFieldsGrouped = ", sum(".$db->ifsql("e.statut IS NULL", "0", "ps.reel").") as stock"; // e.statut is null if there is no record in stock
-		}
-		else {
+		} else {
 		    $selectFieldsGrouped = ", ".$db->ifsql("p.stock IS NULL", 0, "p.stock")." AS stock";
 		}
 
@@ -2254,13 +2204,11 @@ class Form
 		if ($finished == 0)
 		{
 			$sql .= " AND p.finished = ".$finished;
-		}
-		elseif ($finished == 1)
+		} elseif ($finished == 1)
 		{
 			$sql .= " AND p.finished = ".$finished;
 			if ($status >= 0)  $sql .= " AND p.tosell = ".$status;
-		}
-		elseif ($status >= 0)
+		} elseif ($status >= 0)
 		{
 			$sql .= " AND p.tosell = ".$status;
 		}
@@ -2268,8 +2216,7 @@ class Form
 		if (strval($filtertype) != '') $sql .= " AND p.fk_product_type = ".$filtertype;
 		elseif (empty($conf->product->enabled)) { // when product module is disabled, show services only
 			$sql .= " AND p.fk_product_type = 1";
-		}
-		elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
+		} elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
 			$sql .= " AND p.fk_product_type = 0";
 		}
 		// Add criteria on ref/label
@@ -2310,8 +2257,7 @@ class Form
 			$sql .= " ORDER BY categorie_product_id ";
 			//ASC OR DESC order
 			($conf->global->PRODUCT_SORT_BY_CATEGORY == 1) ? $sql .= "ASC" : $sql .= "DESC";
-		}
-		else {
+		} else {
 			$sql .= $db->order("p.ref");
 		}
 
@@ -2345,8 +2291,7 @@ class Form
 			{
 				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
 				else $textifempty .= $langs->trans("All");
-			}
-			else {
+			} else {
 			    if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
 			}
 			if ($showempty) $out .= '<option value="0" selected>'.$textifempty.'</option>';
@@ -2397,8 +2342,7 @@ class Form
 							array_push($outarray, $optJson);
 						}
 					}
-				}
-				else {
+				} else {
 					if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_price_expression)) {
 						$price_product = new Product($this->db);
 						$price_product->fetch($objp->rowid, '', '', 1);
@@ -2430,8 +2374,7 @@ class Form
 
 			if (empty($outputmode)) return $out;
 			return $outarray;
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -2581,8 +2524,7 @@ class Form
 					{
 						$opt .= ' - '.price($objp2->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
 						$outval .= ' - '.price($objp2->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
-					}
-					else {
+					} else {
 						$opt .= ' - '.price($objp2->price_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
 						$outval .= ' - '.price($objp2->price_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
 					}
@@ -2591,8 +2533,7 @@ class Form
 					$outpricebasetype = $objp2->price_base_type;
 					$outtva_tx = $objp2->tva_tx;
 				}
-			}
-			else {
+			} else {
 				dol_print_error($this->db);
 			}
 		}
@@ -2609,8 +2550,7 @@ class Form
 				$outval .= ' - '.price($objp->unitprice, 0, $langs, 0, 0, -1, $conf->currency)."/";
 				$opt .= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding
 				$outval .= $langs->transnoentities("Unit");
-			}
-			else {
+			} else {
 				$opt .= ' - '.price($objp->price, 1, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
 				$outval .= ' - '.price($objp->price, 0, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
 				$opt .= $langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding
@@ -2644,8 +2584,7 @@ class Form
 				{
 					$opt .= ' - '.price($objp->custprice, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
 					$outval .= ' - '.price($objp->custprice, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
-				}
-				else {
+				} else {
 					$opt .= ' - '.price($objp->custprice_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
 					$outval .= ' - '.price($objp->custprice_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
 				}
@@ -2664,8 +2603,7 @@ class Form
 			{
 				$opt .= ' - '.price($objp->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
 				$outval .= ' - '.price($objp->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
-			}
-			else {
+			} else {
 				$opt .= ' - '.price($objp->price_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
 				$outval .= ' - '.price($objp->price_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
 			}
@@ -2682,7 +2620,7 @@ class Form
 
     			if ($objp->stock > 0) {
     				$outval .= ' - <span class="product_line_stock_ok">';
-    			}elseif ($objp->stock <= 0) {
+    			} elseif ($objp->stock <= 0) {
     				$outval .= ' - <span class="product_line_stock_too_low">';
     			}
     			$outval .= $langs->transnoentities("Stock").':'.$objp->stock;
@@ -2701,7 +2639,7 @@ class Form
     			    $outval .= ' - '.$langs->transnoentities("VirtualStock").':';
     			    if ($virtualstock > 0) {
     			        $outval .= ' - <span class="product_line_stock_ok">';
-    			    }elseif ($virtualstock <= 0) {
+    			    } elseif ($virtualstock <= 0) {
     			        $outval .= ' - <span class="product_line_stock_too_low">';
     			    }
     			    $outval .= $virtualstock;
@@ -2753,8 +2691,7 @@ class Form
 			$urloption = ($socid > 0 ? 'socid='.$socid.'&' : '').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished.'&alsoproductwithnosupplierprice='.$alsoproductwithnosupplierprice;
 			print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
 			print ($hidelabel ? '' : $langs->trans("RefOrLabel").' : ').'<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'">';
-		}
-		else {
+		} else {
 			print $this->select_produits_fournisseurs_list($socid, $selected, $htmlname, $filtertype, $filtre, '', -1, 0, 0, $alsoproductwithnosupplierprice, $morecss);
 		}
 	}
@@ -2963,8 +2900,7 @@ class Form
 						$outvallabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency)."/";
 						$optlabel .= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding
 						$outvallabel .= $langs->transnoentities("Unit");
-					}
-					else {
+					} else {
 						$optlabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
 						$outvallabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
 						$optlabel .= ' '.$langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding
@@ -2999,14 +2935,12 @@ class Form
 						$optlabel .= " - ".$reputations[$objp->supplier_reputation];
 						$outvallabel .= " - ".$reputations[$objp->supplier_reputation];
 					}
-				}
-				else {
+				} else {
 					if (empty($alsoproductwithnosupplierprice))     // No supplier price defined for couple product/supplier
 					{
 						$optlabel .= " - <span class='opacitymedium'>".$langs->trans("NoPriceDefinedForThisSupplier").'</span>';
 						$outvallabel .= ' - '.$langs->transnoentities("NoPriceDefinedForThisSupplier");
-					}
-					else // No supplier price defined for product, even on other suppliers
+					} else // No supplier price defined for product, even on other suppliers
 					{
 						$optlabel .= " - <span class='opacitymedium'>".$langs->trans("NoPriceDefinedForThisSupplier").'</span>';
 						$outvallabel .= ' - '.$langs->transnoentities("NoPriceDefinedForThisSupplier");
@@ -3054,8 +2988,7 @@ class Form
 
 			if (empty($outputmode)) return $out;
 			return $outarray;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3100,8 +3033,7 @@ class Form
 			if (!$num)
 			{
 				$form .= '<option value="0">-- '.$langs->trans("NoSupplierPriceDefinedForThisProduct").' --</option>';
-			}
-			else {
+			} else {
 				require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
 				$form .= '<option value="0">&nbsp;</option>';
 
@@ -3144,8 +3076,7 @@ class Form
 					if ($objp->quantity == 1)
 					{
 						$opt .= $langs->trans("Unit");
-					}
-					else {
+					} else {
 						$opt .= $langs->trans("Units");
 					}
 					if ($objp->quantity > 1)
@@ -3164,8 +3095,7 @@ class Form
 			$form .= '</select>';
 			$this->db->free($result);
 			return $form;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3206,8 +3136,7 @@ class Form
 					if ($selected && $selected == $obj->rowid)
 					{
 						print '<option value="'.$obj->rowid.'" selected>'.$obj->label.'</option>';
-					}
-					else {
+					} else {
 						print '<option value="'.$obj->rowid.'">'.$obj->label.'</option>';
 					}
 					$i++;
@@ -3215,8 +3144,7 @@ class Form
 			}
 			print '</select>';
 			return $num;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3263,8 +3191,7 @@ class Form
 			//$this->cache_conditions_paiements=dol_sort_array($this->cache_conditions_paiements, 'label', 'asc', 0, 0, 1);		// We use the field sortorder of table
 
 			return $num;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3311,8 +3238,7 @@ class Form
 			$this->cache_availability = dol_sort_array($this->cache_availability, 'label', 'asc', 0, 0, 1);
 
 			return $num;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3342,8 +3268,7 @@ class Form
 			if ($selected == $id)
 			{
 				print '<option value="'.$id.'" selected>';
-			}
-			else {
+			} else {
 				print '<option value="'.$id.'">';
 			}
 			print $arrayavailability['label'];
@@ -3394,8 +3319,7 @@ class Form
 
 			unset($tmparray);
 			return $num;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3426,8 +3350,7 @@ class Form
 			if ($selected && ($selected == $arraydemandreason['id'] || $selected == $arraydemandreason['code']))
 			{
 				print '<option value="'.$arraydemandreason['id'].'" selected>';
-			}
-			else {
+			} else {
 				print '<option value="'.$arraydemandreason['id'].'">';
 			}
 			$label = $arraydemandreason['label']; // Translation of label was already done into the ->loadCacheInputReason
@@ -3483,8 +3406,7 @@ class Form
 			$this->cache_types_paiements = dol_sort_array($this->cache_types_paiements, 'label', 'asc', 0, 0, 1);
 
 			return $num;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3524,8 +3446,7 @@ class Form
 			if ($selected == $id)
 			{
 				print '<option value="'.$id.'" selected>';
-			}
-			else {
+			} else {
 				print '<option value="'.$id.'">';
 			}
 			print $arrayconditions['label'];
@@ -3628,8 +3549,7 @@ class Form
 			if ($selected == $id)
 			{
 				$return .= '<option value="'.$id.'" selected>'.$value;
-			}
-			else {
+			} else {
 				$return .= '<option value="'.$id.'">'.$value;
 			}
 			$return .= '</option>';
@@ -3770,8 +3690,7 @@ class Form
 					}
 				}
 			}
-		}
-		else {
+		} else {
 				dol_syslog("Error sql=".$sql.", error=".$this->error, LOG_ERR);
 		}
 		if ($opt == '<option value ="" selected></option>')
@@ -3816,8 +3735,7 @@ class Form
 				if ($selected == $res->rowid)
 				{
 				    $return .= '<option value="'.$res->rowid.'" selected>'.$unitLabel.'</option>';
-				}
-				else {
+				} else {
 				    $return .= '<option value="'.$res->rowid.'">'.$unitLabel.'</option>';
 				}
 			}
@@ -3875,8 +3793,7 @@ class Form
 					if ($selected == $obj->rowid)
 					{
 						print '<option value="'.$obj->rowid.'" selected>';
-					}
-					else {
+					} else {
 						print '<option value="'.$obj->rowid.'">';
 					}
 					print trim($obj->label);
@@ -3886,13 +3803,11 @@ class Form
 					$i++;
 				}
 				print "</select>";
-			}
-			else {
+			} else {
 				if ($status == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
 				else print '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -3945,8 +3860,7 @@ class Form
 					if ($selected == $obj->rowid)
 					{
 						print '<option value="'.$obj->rowid.'" selected>';
-					}
-					else {
+					} else {
 						print '<option value="'.$obj->rowid.'">';
 					}
 					print trim($obj->name);
@@ -3955,13 +3869,11 @@ class Form
 					$i++;
 				}
 				print "</select>";
-			}
-			else {
+			} else {
 				if ($status == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveEstablishmentDefined").'</span>';
 				else print '<span class="opacitymedium">'.$langs->trans("NoEstablishmentFound").'</span>';
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -4052,10 +3964,8 @@ class Form
 					$i++;
 				}
 				$this->db->free($result);
-			}
-			else dol_print_error($this->db);
-		}
-		else {
+			} else dol_print_error($this->db);
+		} else {
 			$cat = new Categorie($this->db);
             $cate_arbo = $cat->get_full_arbo($type, $markafterid, $include);
 		}
@@ -4072,8 +3982,7 @@ class Form
 					if ($cate_arbo[$key]['id'] == $selected || ($selected == 'auto' && count($cate_arbo) == 1))
 					{
 						$add = 'selected ';
-					}
-					else {
+					} else {
 						$add = '';
 					}
 					$output .= '<option '.$add.'value="'.$cate_arbo[$key]['id'].'">'.dol_trunc($cate_arbo[$key]['fulllabel'], $maxlength, 'middle').'</option>';
@@ -4187,19 +4096,16 @@ class Form
 					if ($input['type'] == 'text')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div><div class="tagtd"><input type="text" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></div></div>'."\n";
-					}
-					elseif ($input['type'] == 'password')
+					} elseif ($input['type'] == 'password')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div><div class="tagtd"><input type="password" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></div></div>'."\n";
-					}
-					elseif ($input['type'] == 'select')
+					} elseif ($input['type'] == 'select')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">';
 						if (!empty($input['label'])) $more .= $input['label'].'</div><div class="tagtd tdtop left">';
 						$more .= $this->selectarray($input['name'], $input['values'], $input['default'], 1, 0, 0, $moreattr, 0, 0, 0, '', $morecss);
 						$more .= '</div></div>'."\n";
-					}
-					elseif ($input['type'] == 'checkbox')
+					} elseif ($input['type'] == 'checkbox')
 					{
 						$more .= '<div class="tagtr">';
 						$more .= '<div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].' </div><div class="tagtd">';
@@ -4209,8 +4115,7 @@ class Form
 						if (isset($input['disabled'])) $more .= ' disabled';
 						$more .= ' /></div>';
 						$more .= '</div>'."\n";
-					}
-					elseif ($input['type'] == 'radio')
+					} elseif ($input['type'] == 'radio')
 					{
 						$i = 0;
 						foreach ($input['values'] as $selkey => $selval)
@@ -4225,8 +4130,7 @@ class Form
 							$more .= '</div></div>'."\n";
 							$i++;
 						}
-					}
-					elseif ($input['type'] == 'date')
+					} elseif ($input['type'] == 'date')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div>';
 						$more .= '<div class="tagtd">';
@@ -4237,16 +4141,13 @@ class Form
 						$formquestion[] = array('name'=>$input['name'].'year');
 						$formquestion[] = array('name'=>$input['name'].'hour');
 						$formquestion[] = array('name'=>$input['name'].'min');
-					}
-					elseif ($input['type'] == 'other')
+					} elseif ($input['type'] == 'other')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">';
 						if (!empty($input['label'])) $more .= $input['label'].'</div><div class="tagtd">';
 						$more .= $input['value'];
 						$more .= '</div></div>'."\n";
-					}
-
-					elseif ($input['type'] == 'onecolumn')
+					} elseif ($input['type'] == 'onecolumn')
 					{
 						$moreonecolumn .= '<div class="margintoponly">';
 						$moreonecolumn .= $input['value'];
@@ -4371,8 +4272,7 @@ class Form
             });
             </script>';
 			$formconfirm .= "<!-- end ajax formconfirm -->\n";
-		}
-		else {
+		} else {
 			$formconfirm .= "\n<!-- begin formconfirm page=".$page." -->\n";
 
 			if (empty($disableformtag)) $formconfirm .= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";
@@ -4455,16 +4355,14 @@ class Form
 			$out .= $formproject->select_projects($socid, $selected, $htmlname, $maxlength, 0, 1, $discard_closed, $forcefocus, 0, 0, '', 1);
 			$out .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 			$out .= '</form>';
-		}
-		else {
+		} else {
 			if ($selected)
 			{
 				$projet = new Project($this->db);
 				$projet->fetch($selected);
 				//print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
 				$out .= $projet->getNomUrl(0, '', 1);
-			}
-			else {
+			} else {
 				$out .= "&nbsp;";
 			}
 		}
@@ -4499,8 +4397,7 @@ class Form
 			$this->select_conditions_paiements($selected, $htmlname, -1, $addempty);
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else {
+		} else {
 			if ($selected)
 			{
 				$this->load_cache_conditions_paiements();
@@ -4533,8 +4430,7 @@ class Form
 			$this->selectAvailabilityDelay($selected, $htmlname, -1, $addempty);
 			print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else {
+		} else {
 			if ($selected)
 			{
 				$this->load_cache_availability();
@@ -4566,8 +4462,7 @@ class Form
 			$this->selectInputReason($selected, $htmlname, -1, $addempty);
 			print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else {
+		} else {
 			if ($selected)
 			{
 				$this->loadCacheInputReason();
@@ -4616,8 +4511,7 @@ class Form
 			$ret .= '</td>';
 			$ret .= '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			$ret .= '</tr></table></form>';
-		}
-		else {
+		} else {
 			if ($displayhour) $ret .= dol_print_date($selected, 'dayhour');
 			else $ret .= dol_print_date($selected, 'day');
 		}
@@ -4651,8 +4545,7 @@ class Form
 			print $this->select_dolusers($selected, $htmlname, 1, $exclude, 0, $include);
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else {
+		} else {
 			if ($selected)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -4690,8 +4583,7 @@ class Form
 			$this->select_types_paiements($selected, $htmlname, $filtertype, 0, $addempty, 0, 0, $active);
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else {
+		} else {
 			if ($selected)
 			{
 				$this->load_cache_types_paiements();
@@ -4723,8 +4615,7 @@ class Form
 			print $this->selectMultiCurrency($selected, $htmlname, 0);
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else {
+		} else {
 			dol_include_once('/core/lib/company.lib.php');
 			print !empty($selected) ? currency_name($selected, 1) : '&nbsp;';
 		}
@@ -4757,14 +4648,12 @@ class Form
 			print '</select> ';
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else {
+		} else {
 			if (!empty($rate))
 			{
 				print price($rate, 1, $langs, 1, 0);
 				if ($currency && $rate != 1) print ' &nbsp; ('.price($rate, 1, $langs, 1, 0).' '.$currency.' = 1 '.$conf->currency.')';
-			}
-			else {
+			} else {
 				print 1;
 			}
 		}
@@ -4802,8 +4691,7 @@ class Form
 				{
 					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL") $translationKey = 'HasAbsoluteDiscountFromSupplier'; // If we want deposit to be substracted to payments only and not to total of final invoice
 					else $translationKey = 'HasCreditNoteFromSupplier';
-				}
-				else {
+				} else {
 					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") $translationKey = 'HasAbsoluteDiscountFromSupplier';
 					else $translationKey = 'HasCreditNoteFromSupplier';
 				}
@@ -4812,8 +4700,7 @@ class Form
 				{
 					if (!$filter || $filter == "fk_facture_source IS NULL") $translationKey = 'CompanyHasAbsoluteDiscount'; // If we want deposit to be substracted to payments only and not to total of final invoice
 					else $translationKey = 'CompanyHasCreditNote';
-				}
-				else {
+				} else {
 					if (!$filter || $filter == "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") $translationKey = 'CompanyHasAbsoluteDiscount';
 					else $translationKey = 'CompanyHasCreditNote';
 				}
@@ -4851,13 +4738,11 @@ class Form
 				print '</div>';
 			}
 			print '</form>';
-		}
-		else {
+		} else {
 			if ($selected)
 			{
 				print $selected;
-			}
-			else {
+			} else {
 				print "0";
 			}
 		}
@@ -4895,8 +4780,7 @@ class Form
 			print '</td>';
 			print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
-		}
-		else {
+		} else {
 			if ($selected)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -4938,16 +4822,14 @@ class Form
 			$out .= $this->select_company($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events);
 			$out .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			$out .= '</form>';
-		}
-		else {
+		} else {
 			if ($selected)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 				$soc = new Societe($this->db);
 				$soc->fetch($selected);
 				$out .= $soc->getNomUrl($langs);
-			}
-			else {
+			} else {
 				$out .= "&nbsp;";
 			}
 		}
@@ -4995,16 +4877,14 @@ class Form
 			if ($selected && $selected == $code_iso)
 			{
 				$out .= '<option value="'.$code_iso.'" selected>';
-			}
-			else {
+			} else {
 				$out .= '<option value="'.$code_iso.'">';
 			}
 			$out .= $currency['label'];
 			if ($mode == 1)
 			{
 			    $out .= ' ('.$code_iso.')';
-			}
-			else {
+			} else {
                 $out .= ' ('.$langs->getCurrencySymbol($code_iso).')';
 			}
 			$out .= '</option>';
@@ -5128,13 +5008,11 @@ class Form
 				}
 
 				return $num;
-			}
-			else {
+			} else {
 				$this->error = '<font class="error">'.$langs->trans("ErrorNoVATRateDefinedForSellerCountry", $country_code).'</font>';
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->error = '<font class="error">'.$this->db->error().'</font>';
 			return -2;
 		}
@@ -5189,8 +5067,7 @@ class Form
 			if ($societe_vendeuse->id == $mysoc->id)
 			{
 				$return .= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</font>';
-			}
-			else {
+			} else {
 				$return .= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</font>';
 			}
 			return $return;
@@ -5205,8 +5082,7 @@ class Form
 		if (is_object($societe_vendeuse))
 		{
 			$code_country = "'".$societe_vendeuse->country_code."'";
-		}
-		else {
+		} else {
 			$code_country = "'".$mysoc->country_code."'"; // Pour compatibilite ascendente
 		}
 		if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC))    // If option to have vat for end customer for services is on
@@ -5221,12 +5097,10 @@ class Form
 					{
 						$code_country .= ",'".$societe_acheteuse->country_code."'";
 					}
-				}
-				elseif (!$idprod)  // We don't know type of product
+				} elseif (!$idprod)  // We don't know type of product
 				{
 					$code_country .= ",'".$societe_acheteuse->country_code."'";
-				}
-				else {
+				} else {
 					$prodstatic = new Product($this->db);
 					$prodstatic->fetch($idprod);
 					if ($prodstatic->type == Product::TYPE_SERVICE)   // We know product is a service
@@ -5300,8 +5174,7 @@ class Form
 							$return .= ' selected';
 							$selectedfound = true;
 						}
-					}
-					elseif ($rate['txtva'] == $defaulttx && $rate['nprtva'] == $defaultnpr)
+					} elseif ($rate['txtva'] == $defaulttx && $rate['nprtva'] == $defaultnpr)
 			   		{
 			   			$return .= ' selected';
 			   			$selectedfound = true;
@@ -5312,8 +5185,7 @@ class Form
 				if ($mysoc->country_code == 'IN' || !empty($conf->global->MAIN_VAT_LABEL_IS_POSITIVE_RATES))
 				{
 					$return .= $rate['labelpositiverates'];
-				}
-				else {
+				} else {
 					$return .= vatrate($rate['label']);
 				}
 				//$return.=($rate['code']?' '.$rate['code']:'');
@@ -5323,8 +5195,7 @@ class Form
 			}
 
 			if (!$options_only) $return .= '</select>';
-		}
-		else {
+		} else {
 			$return .= $this->error;
 		}
 
@@ -5425,8 +5296,7 @@ class Form
 			$sday	= (!empty($reg[3]) ? $reg[3] : '');
 			$shour	= (!empty($reg[4]) ? $reg[4] : '');
 			$smin	= (!empty($reg[5]) ? $reg[5] : '');
-		}
-		elseif (strval($set_time) != '' && $set_time != -1)
+		} elseif (strval($set_time) != '' && $set_time != -1)
 		{
 			// set_time est un timestamps (0 possible)
 			$syear = dol_print_date($set_time, "%Y");
@@ -5437,14 +5307,12 @@ class Form
 				$shour = dol_print_date($set_time, "%H");
 				$smin = dol_print_date($set_time, "%M");
 				$ssec = dol_print_date($set_time, "%S");
-			}
-			else {
+			} else {
 				$shour = '';
 				$smin = '';
 				$ssec = '';
 			}
-		}
-		else {
+		} else {
 			// Date est '' ou vaut -1
 			$syear = '';
 			$smonth = '';
@@ -5491,14 +5359,12 @@ class Form
 						$base = DOL_URL_ROOT.'/core/';
 						$retstring .= ' onClick="showDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');"';
 						$retstring .= '>'.img_object($langs->trans("SelectDate"), 'calendarday', 'class="datecallink"').'</button>';
-					}
-					else $retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
+					} else $retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
 
 					$retstring .= '<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";
 					$retstring .= '<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";
 					$retstring .= '<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";
-				}
-				elseif ($usecalendar == 'jquery')
+				} elseif ($usecalendar == 'jquery')
 				{
 					if (!$disabled)
 					{
@@ -5551,8 +5417,7 @@ class Form
                 		$retstring.='    });';
                 		$retstring.='});';
                 		$retstring.="</script>";*/
-					}
-					else {
+					} else {
 						$retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
 					}
 
@@ -5560,8 +5425,7 @@ class Form
 					$retstring .= '<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";
 					$retstring .= '<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";
 					$retstring .= '<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";
-				}
-				else {
+				} else {
 					$retstring .= "Bad value of MAIN_POPUP_CALENDAR";
 				}
 			}
@@ -5602,8 +5466,7 @@ class Form
 				if ($emptydate || $set_time == -1)
 				{
 					$retstring .= '<input'.($disabled ? ' disabled' : '').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat maxwidth50imp valignmiddle" type="number" min="0" max="3000" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">';
-				}
-				else {
+				} else {
 					$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'year" name="'.$prefix.'year">';
 
 					for ($year = $syear - 10; $year < $syear + 10; $year++)
@@ -5678,8 +5541,7 @@ class Form
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(), '%d', 'tzuser').'\');';
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(), '%m', 'tzuser').'\');';
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(), '%Y', 'tzuser').'\');';
-            }
-            elseif ($addnowlink == 2)
+            } elseif ($addnowlink == 2)
             {
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(d.toLocaleDateString(\''.str_replace('_', '-', $langs->defaultlang).'\'));';
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(d.getDate().pad());';
@@ -5705,8 +5567,7 @@ class Form
                 if ($addnowlink == 1)
                 {
                     $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date(dol_now(), '%H', 'tzuser').'\');';
-                }
-                elseif ($addnowlink == 2)
+                } elseif ($addnowlink == 2)
                 {
                     $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(d.getHours().pad());';
                 }
@@ -5721,8 +5582,7 @@ class Form
                 if ($addnowlink == 1)
                 {
                     $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date(dol_now(), '%M', 'tzuser').'\');';
-                }
-                elseif ($addnowlink == 2)
+                } elseif ($addnowlink == 2)
                 {
                     $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(d.getMinutes().pad());';
                 }
@@ -5827,12 +5687,10 @@ class Form
 				$retstring .= ">".$hour."</option>";
 			}
 			$retstring .= "</select>";
-		}
-		elseif ($typehour == 'text' || $typehour == 'textselect')
+		} elseif ($typehour == 'text' || $typehour == 'textselect')
 		{
 			$retstring .= '<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" size="1" name="'.$prefix.'hour"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputhour" value="'.(($hourSelected != '') ? ((int) $hourSelected) : '').'">';
-		}
-		else return 'BadValueForParameterTypeHour';
+		} else return 'BadValueForParameterTypeHour';
 
 		if ($typehour != 'text') $retstring .= ' '.$langs->trans('HourShort');
 		else $retstring .= '<span class="hideonsmartphone">:</span>';
@@ -5851,8 +5709,7 @@ class Form
 				$retstring .= '>'.$min.'</option>';
 			}
 			$retstring .= "</select>";
-		}
-		elseif ($typehour == 'text')
+		} elseif ($typehour == 'text')
 		{
 			$retstring .= '<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" size="1" name="'.$prefix.'min"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputminute" value="'.(($minSelected != '') ? ((int) $minSelected) : '').'">';
 		}
@@ -5947,8 +5804,7 @@ class Form
 			$out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';
 			if ($placeholder) $placeholder = ' placeholder="'.$placeholder.'"';
 			$out .= '<input type="text" class="'.$morecss.'"'.($disabled ? ' disabled="disabled"' : '').' name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
-		}
-		else {
+		} else {
 			// Immediate load of table record. Note: filter is inside $objecttmp->filter
 			$out .= $this->selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty, $searchkey, $placeholder, $morecss, $moreparams, $forcecombo, 0, $disabled);
 		}
@@ -5976,8 +5832,7 @@ class Form
 		if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
 		{
 			$tmpescaped = "'".$db->escape($regbis[1])."'";
-		}
-		else {
+		} else {
 			$tmpescaped = $db->escape($tmpescaped);
 		}
 		return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
@@ -6019,8 +5874,7 @@ class Form
 				if ($val['showoncombobox']) $tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '').'t.'.$key;
 			}
 			if ($tmpfieldstoshow) $fieldstoshow = $tmpfieldstoshow;
-		}
-        else {
+		} else {
 			// For backward compatibility
 			$objecttmp->fields['ref'] = array('type'=>'varchar(30)', 'label'=>'Ref', 'showoncombobox'=>1);
         }
@@ -6029,8 +5883,7 @@ class Form
 		{
 			if (isset($objecttmp->fields['ref'])) {
 				$fieldstoshow = 't.ref';
-			}
-			else {
+			} else {
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorNoFieldWithAttributeShowoncombobox");
 				return $langs->trans('ErrorNoFieldWithAttributeShowoncombobox');
@@ -6118,12 +5971,10 @@ class Form
 						if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid)
 						{
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
-						}
-						else {
+						} else {
 							$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';
 						}
-					}
-					else {
+					} else {
 						array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));
 					}
 
@@ -6133,8 +5984,7 @@ class Form
 			}
 
 			$out .= '</select>'."\n";
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -6240,8 +6090,7 @@ class Form
 				{
 					if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value));
 					else $selectOptionValue = $key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value);
-				}
-				else {
+				} else {
 					if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($maxlen ?dol_trunc($value, $maxlen) : $value);
 					else $selectOptionValue = $maxlen ?dol_trunc($value, $maxlen) : $value;
 					if ($value == '' || $value == '-') $selectOptionValue = '&nbsp;';
@@ -6369,8 +6218,7 @@ class Form
 		if ($acceptdelayedhtml)
 		{
 			$delayedhtmlcontent .= $outdelayed;
-		}
-		else {
+		} else {
 			$out .= $outdelayed;
 		}
 		return $out;
@@ -6486,8 +6334,7 @@ class Form
 		if ($acceptdelayedhtml)
 		{
 			$delayedhtmlcontent .= $outdelayed;
-		}
-		else {
+		} else {
 			$out .= $outdelayed;
 		}
 		return $out;
@@ -6534,8 +6381,7 @@ class Form
 				if ($elemtype == 'category')
 				{
 					$out .= 'return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png"> \'+record.text+\'</span>\';';
-				}
-				else {
+				} else {
 					$out .= 'return record.text;';
 				}
 				$out .= '};'."\n";
@@ -6543,8 +6389,7 @@ class Form
 				if ($elemtype == 'category')
 				{
 					$out .= 'return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png"> \'+record.text+\'</span>\';';
-				}
-				else {
+				} else {
 					$out .= 'return record.text;';
 				}
 				$out .= '};'."\n";
@@ -6559,8 +6404,7 @@ class Form
 							 	templateSelection: formatSelection		/* For 4.0 */
 							});
 						});'."\n";
-			}
-			elseif ($addjscombo == 2)
+			} elseif ($addjscombo == 2)
 			{
 				// Add other js lib
 				// TODO external lib multiselect/jquery.multi-select.js must have been loaded to use this multiselect plugin
@@ -6817,41 +6661,31 @@ class Form
 				if ($objecttype == 'facture') {
 					$tplpath = 'compta/'.$element;
 					if (empty($conf->facture->enabled)) continue; // Do not show if module disabled
-				}
-				elseif ($objecttype == 'facturerec') {
+				} elseif ($objecttype == 'facturerec') {
 					$tplpath = 'compta/facture';
 					$tplname = 'linkedobjectblockForRec';
 					if (empty($conf->facture->enabled)) continue; // Do not show if module disabled
-				}
-				elseif ($objecttype == 'propal') {
+				} elseif ($objecttype == 'propal') {
 					$tplpath = 'comm/'.$element;
 					if (empty($conf->propal->enabled)) continue; // Do not show if module disabled
-				}
-				elseif ($objecttype == 'supplier_proposal') {
+				} elseif ($objecttype == 'supplier_proposal') {
 					if (empty($conf->supplier_proposal->enabled)) continue; // Do not show if module disabled
-				}
-				elseif ($objecttype == 'shipping' || $objecttype == 'shipment') {
+				} elseif ($objecttype == 'shipping' || $objecttype == 'shipment') {
 					$tplpath = 'expedition';
 					if (empty($conf->expedition->enabled)) continue; // Do not show if module disabled
-				}
-        		elseif ($objecttype == 'reception') {
+				} elseif ($objecttype == 'reception') {
         			$tplpath = 'reception';
         			if (empty($conf->reception->enabled)) continue; // Do not show if module disabled
-        		}
-				elseif ($objecttype == 'delivery') {
+        		} elseif ($objecttype == 'delivery') {
 					$tplpath = 'livraison';
 					if (empty($conf->expedition->enabled)) continue; // Do not show if module disabled
-				}
-				elseif ($objecttype == 'invoice_supplier') {
+				} elseif ($objecttype == 'invoice_supplier') {
 					$tplpath = 'fourn/facture';
-				}
-				elseif ($objecttype == 'order_supplier') {
+				} elseif ($objecttype == 'order_supplier') {
 					$tplpath = 'fourn/commande';
-				}
-				elseif ($objecttype == 'expensereport') {
+				} elseif ($objecttype == 'expensereport') {
 					$tplpath = 'expensereport';
-				}
-				elseif ($objecttype == 'subscription') {
+				} elseif ($objecttype == 'subscription') {
 					$tplpath = 'adherents';
 				}
 
@@ -6959,8 +6793,7 @@ class Form
 			{
 				$possiblelinks = array_merge($possiblelinks, $hookmanager->resArray);
 			}
-		}
-		elseif ($reshook > 0)
+		} elseif ($reshook > 0)
 		{
 			if (is_array($hookmanager->resArray) && count($hookmanager->resArray))
 			{
@@ -7047,8 +6880,7 @@ class Form
     		</div>
     		</dd>
     		</dl>';
-		}
-		else {
+		} else {
 			$linktoelem = '';
 		}
 
@@ -7098,8 +6930,7 @@ class Form
 		{
 			$resultyesno .= '<option value="'.$yes.'" selected>'.$langs->trans("Yes").'</option>'."\n";
 			$resultyesno .= '<option value="'.$no.'">'.$langs->trans("No").'</option>'."\n";
-		}
-		else {
+		} else {
 	   		$selected = (($useempty && $value != '0' && $value != 'no') ? '' : ' selected');
 			$resultyesno .= '<option value="'.$yes.'">'.$langs->trans("Yes").'</option>'."\n";
 			$resultyesno .= '<option value="'.$no.'"'.$selected.'>'.$langs->trans("No").'</option>'."\n";
@@ -7142,8 +6973,7 @@ class Form
 				if ($selected == $obj->rowid)
 				{
 					print '<option value="'.$obj->rowid.'" selected>';
-				}
-				else {
+				} else {
 					print '<option value="'.$obj->rowid.'">';
 				}
 				print $obj->label;
@@ -7151,8 +6981,7 @@ class Form
 				$i++;
 			}
 			print "</select>";
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -7213,12 +7042,10 @@ class Form
 			if ($conf->browser->name == 'chrome')
 			{
 				$stringforfirstkey .= ' ALT +';
-			}
-			elseif ($conf->browser->name == 'firefox')
+			} elseif ($conf->browser->name == 'firefox')
 			{
 				$stringforfirstkey .= ' ALT + SHIFT +';
-			}
-			else {
+			} else {
 				$stringforfirstkey .= ' CTL +';
 			}
 
@@ -7305,8 +7132,7 @@ class Form
 					$ret .= $this->textwithpicto('', $htmltext, -1, 'language', 'opacitymedium paddingleft');
 				}
 			}
-		}
-		elseif ($object->element == 'member')
+		} elseif ($object->element == 'member')
 		{
 			$ret .= $object->ref.'<br>';
 			$fullname = $object->getFullName($langs);
@@ -7315,24 +7141,19 @@ class Form
 			} else {
 				$ret .= dol_htmlentities($fullname).((!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : '');
 			}
-		}
-		elseif (in_array($object->element, array('contact', 'user', 'usergroup')))
+		} elseif (in_array($object->element, array('contact', 'user', 'usergroup')))
 		{
 			$ret .= dol_htmlentities($object->getFullName($langs));
-		}
-		elseif (in_array($object->element, array('action', 'agenda')))
+		} elseif (in_array($object->element, array('action', 'agenda')))
 		{
 			$ret .= $object->ref.'<br>'.$object->label;
-		}
-		elseif (in_array($object->element, array('adherent_type')))
+		} elseif (in_array($object->element, array('adherent_type')))
 		{
 			$ret .= $object->label;
-		}
-		elseif ($object->element == 'ecm_directories')
+		} elseif ($object->element == 'ecm_directories')
 		{
 			$ret .= '';
-		}
-		elseif ($fieldref != 'none')
+		} elseif ($fieldref != 'none')
 		{
 			$ret .= dol_htmlentities($object->$fieldref);
 		}
@@ -7419,8 +7240,7 @@ class Form
 				$originalfile = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;
 			}
 			$email = $object->email;
-		}
-		elseif ($modulepart == 'contact')
+		} elseif ($modulepart == 'contact')
 		{
 			$dir = $conf->societe->multidir_output[$entity].'/contact';
 			if (!empty($object->photo))
@@ -7432,8 +7252,7 @@ class Form
 			}
 			$email = $object->email;
 			$capture = 'user';
-		}
-		elseif ($modulepart == 'userphoto')
+		} elseif ($modulepart == 'userphoto')
 		{
 			$dir = $conf->user->dir_output;
 			if (!empty($object->photo))
@@ -7446,8 +7265,7 @@ class Form
 			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile = $object->id.".jpg"; // For backward compatibility
 			$email = $object->email;
 			$capture = 'user';
-		}
-		elseif ($modulepart == 'memberphoto')
+		} elseif ($modulepart == 'memberphoto')
 		{
 			$dir = $conf->adherent->dir_output;
 			if (!empty($object->photo))
@@ -7460,8 +7278,7 @@ class Form
 			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile = $object->id.".jpg"; // For backward compatibility
 			$email = $object->email;
 			$capture = 'user';
-		}
-		else {
+		} else {
 			// Generic case to show photos
 			$dir = $conf->$modulepart->dir_output;
 			if (!empty($object->photo))
@@ -7489,8 +7306,7 @@ class Form
 				}
 				$ret .= '<img alt="Photo" class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').' photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
 				if ($addlinktofullsize) $ret .= '</a>';
-			}
-			elseif ($altfile && file_exists($dir."/".$altfile))
+			} elseif ($altfile && file_exists($dir."/".$altfile))
 			{
 				if ($addlinktofullsize)
 				{
@@ -7500,15 +7316,13 @@ class Form
 				}
 				$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Photo alt" id="photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" class="'.$cssclass.'" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($altfile).'&cache='.$cache.'">';
 				if ($addlinktofullsize) $ret .= '</a>';
-			}
-			else {
+			} else {
 				$nophoto = '/public/theme/common/nophoto.png';
 				if (in_array($modulepart, array('userphoto', 'contact', 'memberphoto')))	// For module that are "physical" users
 				{
 					if ($modulepart == 'memberphoto' && strpos($object->morphy, 'mor') !== false) {
 						$nophoto = '/public/theme/common/company.png';
-					}
-					else {
+					} else {
 						$nophoto = '/public/theme/common/user_anonymous.png';
 						if ($object->gender == 'man') $nophoto = '/public/theme/common/user_man.png';
 						if ($object->gender == 'woman') $nophoto = '/public/theme/common/user_woman.png';
@@ -7525,8 +7339,7 @@ class Form
 					//$defaultimg=urlencode(dol_buildpath($nophoto,3));
 					$defaultimg = 'mm';
 					$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Gravatar avatar" title="'.$email.' Gravatar avatar" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="https://www.gravatar.com/avatar/'.md5(strtolower(trim($email))).'?s='.$width.'&d='.$defaultimg.'">'; // gravatar need md5 hash
-				}
-				else {
+				} else {
 					$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.$nophoto.'">';
 				}
 			}
@@ -7539,8 +7352,7 @@ class Form
 				$ret .= '<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput" accept="image/*"'.($capture ? ' capture="'.$capture.'"' : '').'></td></tr>';
 				$ret .= '</table>';
 			}
-		}
-		else dol_print_error('', 'Call of showphoto with wrong parameters modulepart='.$modulepart);
+		} else dol_print_error('', 'Call of showphoto with wrong parameters modulepart='.$modulepart);
 
 		return $ret;
 	}
@@ -7588,8 +7400,7 @@ class Form
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=ug.entity";
 			if ($force_entity) $sql .= " WHERE ug.entity IN (0,".$force_entity.")";
 			else $sql .= " WHERE ug.entity IS NOT NULL";
-		}
-		else {
+		} else {
 			$sql .= " WHERE ug.entity IN (0,".$conf->entity.")";
 		}
 		if (is_array($exclude) && $excludeGroups) $sql .= " AND ug.rowid NOT IN ('".$excludeGroups."')";
@@ -7635,14 +7446,12 @@ class Form
 					$out .= '</option>';
 					$i++;
 				}
-			}
-			else {
+			} else {
 				if ($show_empty) $out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'></option>'."\n";
 				$out .= '<option value="" disabled>'.$langs->trans("NoUserGroupDefined").'</option>';
 			}
 			$out .= '</select>';
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -7809,8 +7618,7 @@ class Form
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -7844,8 +7652,7 @@ class Form
 				$out .= '<option '.($selected == $obj->rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.price($obj->range_ik, 0, $langs, 1, 0).'</option>';
 			}
 			$out .= '</select>';
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -7886,8 +7693,7 @@ class Form
 				$out .= '<option '.($selected == $obj->{$field} ? 'selected="selected"' : '').' value="'.$obj->{$field}.'">'.($key != $obj->code ? $key : $obj->label).'</option>';
 			}
 			$out .= '</select>';
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -7983,8 +7789,7 @@ class Form
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire))
 					{
 						// Do nothing
-					}
-					else {
+					} else {
 						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
 						{
 							$i++;
@@ -8003,13 +7808,11 @@ class Form
 							{
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("Draft");
-							}
-							elseif ($obj->fk_statut == Project::STATUS_CLOSED)
+							} elseif ($obj->fk_statut == Project::STATUS_CLOSED)
 							{
 								if ($discard_closed == 2) $disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("Closed");
-							}
-							elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 							{
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
@@ -8021,13 +7824,11 @@ class Form
 							$out .= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out .= '>'.$labeltoshow.'</option>';
-						}
-						else {
+						} else {
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
 								$resultat = '';
-							}
-							else {
+							} else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
@@ -8050,8 +7851,7 @@ class Form
 
 			$this->db->free($resql);
 			return $num;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -8098,8 +7898,7 @@ class Form
 		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endyear">';
 		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endmonth">';
 		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endday">';
-		        }
-		        else {
+		        } else {
 					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'">';
 		        }
 		    }
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index b254b74b6b9..2eca7ba78d4 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -82,8 +82,7 @@ class FormAccounting extends Form
 		{
 		    $options = $this->options_cache[$usecache];
 		    $selected = $selectid;
-		}
-		else {
+		} else {
 			$sql = "SELECT rowid, code, label, nature, entity, active";
 			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
 			$sql .= " WHERE active = 1";
@@ -169,8 +168,7 @@ class FormAccounting extends Form
 			$sql .= " AND c.category_type = 0";
             if (empty($allcountries)) $sql .= " AND c.fk_country = ".$mysoc->country_id;
             $sql .= " ORDER BY c.label ASC";
-        }
-        else {
+        } else {
             $sql = "SELECT c.rowid, c.label as type, c.range_account";
             $sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c, ".MAIN_DB_PREFIX."c_country as co";
             $sql .= " WHERE c.active = 1";
@@ -202,12 +200,10 @@ class FormAccounting extends Form
                 }
                 $out .= '</select>';
                 //if ($user->admin && $help) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-            }
-            else {
+            } else {
                 $out .= $langs->trans("ErrorNoAccountingCategoryForThisCountry", $mysoc->country_code);
             }
-        }
-        else {
+        } else {
             dol_print_error($db, $db->lasterror());
         }
 
@@ -283,8 +279,7 @@ class FormAccounting extends Form
 		{
 		    $options = $options + $this->options_cache[$usecache]; // We use + instead of array_merge because we don't want to reindex key from 0
 		    $selected = $selectid;
-		}
-		else {
+		} else {
     		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT) ? 50 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT;
 
     		$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.labelshort, aa.rowid, aa.fk_pcg_version";
@@ -310,8 +305,7 @@ class FormAccounting extends Form
 				if (empty($obj->labelshort))
 				{
 					$labeltoshow = $obj->label;
-				}
-				else {
+				} else {
 					$labeltoshow = $obj->labelshort;
 				}
 
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 75383f2825e..9baec43790c 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -147,8 +147,7 @@ class FormActions
 	            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit && ($selected >= 0) ? '' : ' disabled').'>';
     	        print '<span class="hideonsmartphone hideifna">%</span>';
             }
-        }
-        else {
+        } else {
             print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit ? '' : ' disabled').'>%';
         }
     }
@@ -246,8 +245,7 @@ class FormActions
 	        			if (is_object($cacheusers[$actioncomm->userownerid]))
 	        			{
 	        				$tmpuser = $cacheusers[$actioncomm->userownerid];
-	        			}
-	        			else {
+	        			} else {
 	        				$tmpuser = new User($this->db);
 	        				$tmpuser->fetch($actioncomm->userownerid);
 	        				$cacheusers[$actioncomm->userownerid] = $tmpuser;
@@ -267,8 +265,7 @@ class FormActions
 					{
 						if ($actioncomm->type_picto) {
 							$imgpicto = img_picto('', $actioncomm->type_picto);
-						}
-						else {
+						} else {
 							if ($actioncomm->type_code == 'AC_RDV')         $imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
 							elseif ($actioncomm->type_code == 'AC_TEL')     $imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
 							elseif ($actioncomm->type_code == 'AC_FAX')     $imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
@@ -296,8 +293,7 @@ class FormActions
 		        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
 		        		{
 		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($actioncomm->datef, 'hour', 'tzuserrel');
-		        		}
-		        		else print '-'.dol_print_date($actioncomm->datef, 'dayhour', 'tzuserrel');
+		        		} else print '-'.dol_print_date($actioncomm->datef, 'dayhour', 'tzuserrel');
 	        		}
 	        		print '</td>';
 	        		print '<td class="right">';
@@ -307,8 +303,7 @@ class FormActions
 
 	        		$cursorevent++;
 	        	}
-        	}
-        	else {
+        	} else {
         		print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         	}
 
@@ -369,8 +364,7 @@ class FormActions
 		{
 	        if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
 			$out .= $form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
-		}
-		else {
+		} else {
 			$out .= $form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200'.($morecss ? ' '.$morecss : ''), 1);
 		}
 
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index 27f622bed5b..b53d73bc757 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -114,8 +114,7 @@ class FormAdmin
 			if ($selected == $keytouse)
 			{
 				$out .= '<option value="'.$keytouse.'" selected>'.$valuetoshow.'</option>';
-			}
-			else {
+			} else {
 				$out .= '<option value="'.$keytouse.'">'.$valuetoshow.'</option>';
 			}
 		}
@@ -183,8 +182,7 @@ class FormAdmin
     	                        if ($file == $selected)
     	                        {
     	        					$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'" selected>'.$filelib.'</option>';
-    	                        }
-    	                        else {
+    	                        } else {
     	                            $menuarray[$prefix.'_'.$file] = '<option value="'.$file.'">'.$filelib.'</option>';
     	                        }
     	                    }
@@ -383,8 +381,7 @@ class FormAdmin
 
                 $i++;
             }
-        }
-        else {
+        } else {
 			dol_print_error($this->db);
 			return '';
 		}
@@ -402,8 +399,7 @@ class FormAdmin
             if ($selected == $key)
 			{
 				$out .= '<option value="'.$key.'" selected>'.$value.'</option>';
-			}
-			else {
+			} else {
 				$out .= '<option value="'.$key.'">'.$value.'</option>';
 			}
 		}
diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php
index 8c27666dfc4..104daf6de0e 100644
--- a/htdocs/core/class/html.formbarcode.class.php
+++ b/htdocs/core/class/html.formbarcode.class.php
@@ -176,8 +176,7 @@ class FormBarCode
             }
             $out .= "</select>";
             $out .= ajax_combobox("select_".$htmlname);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
         return $out;
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index a5e31916827..f4e551c6452 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -166,8 +166,7 @@ class FormCompany extends Form
 			}
 
 			print Form::selectarray($htmlname, $options, $selected);
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		if (!empty($htmlname) && $user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 		print '</form>';
@@ -241,8 +240,7 @@ class FormCompany extends Form
 					if ($obj->code == '0')		// Le code peut etre une chaine
 					{
 						$out .= '<option value="0">&nbsp;</option>';
-					}
-					else {
+					} else {
 						if (!$country || $country != $obj->country)
 						{
 							// Affiche la rupture si on est en mode liste multipays
@@ -256,8 +254,7 @@ class FormCompany extends Form
 						if (!empty($selected) && $selected == $obj->rowid)
 						{
 							$out .= '<option value="'.$obj->rowid.'" selected>';
-						}
-						else {
+						} else {
 							$out .= '<option value="'.$obj->rowid.'">';
 						}
 
@@ -266,16 +263,13 @@ class FormCompany extends Form
 						($conf->global->MAIN_SHOW_STATE_CODE == 1 || $conf->global->MAIN_SHOW_STATE_CODE == 2 || $conf->global->MAIN_SHOW_STATE_CODE === 'all')) {
 							if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {
 								$out .= $obj->region_name.' - '.$obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
-							}
-							else {
+							} else {
 								$out .= $obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							}
-						}
-						else {
+						} else {
 							if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {
 								$out .= $obj->region_name.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
-							}
-							else {
+							} else {
 								$out .= ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							}
 						}
@@ -287,8 +281,7 @@ class FormCompany extends Form
 			}
 			if (!empty($htmlname)) $out .= '</select>';
 			if (!empty($htmlname) && $user->admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -340,8 +333,7 @@ class FormCompany extends Form
 					$obj = $this->db->fetch_object($resql);
 					if ($obj->code == 0) {
 						print '<option value="0">&nbsp;</option>';
-					}
-					else {
+					} else {
 						if ($country == '' || $country != $obj->country)
 						{
 							// Show break
@@ -354,8 +346,7 @@ class FormCompany extends Form
 						if ($selected > 0 && $selected == $obj->code)
 						{
 							print '<option value="'.$obj->code.'" selected>'.$obj->label.'</option>';
-						}
-						else {
+						} else {
 							print '<option value="'.$obj->code.'">'.$obj->label.'</option>';
 						}
 					}
@@ -363,8 +354,7 @@ class FormCompany extends Form
 				}
 			}
 			print '</select>';
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -405,8 +395,7 @@ class FormCompany extends Form
 					if ($selected == $obj->code)
 					{
 						$out .= '<option value="'.$obj->code.'" selected>';
-					}
-					else {
+					} else {
 						$out .= '<option value="'.$obj->code.'">';
 					}
 					// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
@@ -417,8 +406,7 @@ class FormCompany extends Form
 			}
 			$out .= '</select>';
 			if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -519,8 +507,7 @@ class FormCompany extends Form
 					if ($selected > 0 && $selected == $val['code'])
 					{
 						$out .= '<option value="'.$val['code'].'" selected>';
-					}
-					else {
+					} else {
 						$out .= '<option value="'.$val['code'].'">';
 					}
 					// If translation exists, we use it, otherwise we use default label in database
@@ -536,8 +523,7 @@ class FormCompany extends Form
 	        $out .= ajax_combobox($htmlname);
 
 			$out .= '</div>';
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -644,8 +630,7 @@ class FormCompany extends Form
 			print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="'.$name.'" />';
 			print ajax_autocompleter(($socid ? $socid : -1), $htmlname, DOL_URL_ROOT.'/societe/ajaxcompanies.php', '', $minLength, 0);
 			return $socid;
-		}
-		else {
+		} else {
 			// Search to list thirdparties
 			$sql = "SELECT s.rowid, s.nom as name FROM";
 			$sql .= " ".MAIN_DB_PREFIX."societe as s";
@@ -683,8 +668,7 @@ class FormCompany extends Form
 							if ($disabled) print ' disabled';
 							print ' selected>'.dol_trunc($obj->name, 24).'</option>';
 							$firstCompany = $obj->rowid;
-						}
-						else {
+						} else {
 							print '<option value="'.$obj->rowid.'"';
 							if ($disabled) print ' disabled';
 							print '>'.dol_trunc($obj->name, 24).'</option>';
@@ -695,8 +679,7 @@ class FormCompany extends Form
 				print "</select>\n";
 				print ajax_combobox($htmlname);
 				return $firstCompany;
-			}
-			else {
+			} else {
 				dol_print_error($this->db);
 				return 0;
 			}
@@ -838,8 +821,7 @@ class FormCompany extends Form
         			elseif ($idprof == 3) $formlength = 5; // 4 chiffres et 1 lettre depuis janvier
         			elseif ($idprof == 4) $formlength = 32; // No maximum as we need to include a town name in this id
         		}
-        	}
-        	elseif ($country_code == 'ES')
+        	} elseif ($country_code == 'ES')
         	{
         		if ($idprof == 1) $formlength = 9; //CIF/NIF/NIE 9 digits
         		if ($idprof == 2) $formlength = 12; //NASS 12 digits without /
@@ -902,8 +884,7 @@ class FormCompany extends Form
     				if ($selected == $valors[$i])
     				{
     					print '<option value="'.$valors[$i].'" selected>';
-    				}
-    				else {
+    				} else {
     					print '<option value="'.$valors[$i].'">';
     				}
     				print $valors[$i];
diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index 75586e65b04..6dce90d372b 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -103,16 +103,14 @@ class FormContract
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)
 					{
 						// Do nothing
-					}
-					else {
+					} else {
 						$labeltoshow = dol_trunc($obj->ref, 18);
 						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 						//else $labeltoshow.=' ('.$langs->trans("Private").')';
 						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
 						{
 							print '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else {
+						} else {
 							$disabled = 0;
 							if ($obj->statut == 0)
 							{
@@ -128,8 +126,7 @@ class FormContract
 							if ($hideunselectables && $disabled)
 							{
 								$resultat = '';
-							}
-							else {
+							} else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
@@ -154,8 +151,7 @@ class FormContract
 			}
 
 			return $num;
-		}
-		else {
+		} else {
 			dol_print_error($db);
 			return -1;
 		}
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index b2e8b9763b9..c06611d74a8 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -101,8 +101,7 @@ class FormFile
 			// TODO: This does not support option savingdocmask
 			// TODO: This break feature to upload links too
 			return $this->_formAjaxFileUpload($object);
-		}
-		else {
+		} else {
 			//If there is no permission and the option to hide unauthorized actions is enabled, then nothing is printed
 			if (!$perm && !empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
 				return 1;
@@ -195,8 +194,7 @@ class FormFile
 					$out .= ' ';
 					$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow), 1);
 				}
-			}
-			else {
+			} else {
 				$out .= ' ('.$langs->trans("UploadDisabled").')';
 			}
 			$out .= "</td></tr>";
@@ -426,220 +424,192 @@ class FormFile
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php';
 					$modellist = ModeleThirdPartyDoc::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'propal')
+			} elseif ($modulepart == 'propal')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
 					$modellist = ModelePDFPropales::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'supplier_proposal')
+			} elseif ($modulepart == 'supplier_proposal')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php';
 					$modellist = ModelePDFSupplierProposal::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'commande')
+			} elseif ($modulepart == 'commande')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
 					$modellist = ModelePDFCommandes::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'expedition')
+			} elseif ($modulepart == 'expedition')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
 					$modellist = ModelePDFExpedition::liste_modeles($this->db);
 				}
-			}
-            elseif ($modulepart == 'reception')
+			} elseif ($modulepart == 'reception')
             {
                 if (is_array($genallowed)) $modellist = $genallowed;
                 else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
 					$modellist = ModelePdfReception::liste_modeles($this->db);
 				}
-            }
-			elseif ($modulepart == 'livraison')
+            } elseif ($modulepart == 'livraison')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
 					$modellist = ModelePDFDeliveryOrder::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'ficheinter')
+			} elseif ($modulepart == 'ficheinter')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
 					$modellist = ModelePDFFicheinter::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'facture')
+			} elseif ($modulepart == 'facture')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 					$modellist = ModelePDFFactures::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'contract')
+			} elseif ($modulepart == 'contract')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
 					$modellist = ModelePDFContract::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'project')
+			} elseif ($modulepart == 'project')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
 					$modellist = ModelePDFProjects::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'project_task')
+			} elseif ($modulepart == 'project_task')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
 					$modellist = ModelePDFTask::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'product')
+			} elseif ($modulepart == 'product')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
 					$modellist = ModelePDFProduct::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'product_batch')
+			} elseif ($modulepart == 'product_batch')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/product_batch/modules_product_batch.class.php';
 					$modellist = ModelePDFProductBatch::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'stock')
+			} elseif ($modulepart == 'stock')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_stock.php';
 					$modellist = ModelePDFStock::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'movement')
+			} elseif ($modulepart == 'movement')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_movement.php';
 					$modellist = ModelePDFMovement::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'export')
+			} elseif ($modulepart == 'export')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
 					$modellist = ModeleExports::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
+			} elseif ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
 					$modellist = ModelePDFSuppliersOrders::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
+			} elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
 					$modellist = ModelePDFSuppliersInvoices::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'supplier_payment')
+			} elseif ($modulepart == 'supplier_payment')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
 					$modellist = ModelePDFSuppliersPayments::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'remisecheque')
+			} elseif ($modulepart == 'remisecheque')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
 					$modellist = ModeleChequeReceipts::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'donation')
+			} elseif ($modulepart == 'donation')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
 					$modellist = ModeleDon::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'member')
+			} elseif ($modulepart == 'member')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_cards.php';
 					$modellist = ModelePDFCards::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'agenda' || $modulepart == 'actions')
+			} elseif ($modulepart == 'agenda' || $modulepart == 'actions')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/action/modules_action.php';
 					$modellist = ModeleAction::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'expensereport')
+			} elseif ($modulepart == 'expensereport')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
 					$modellist = ModeleExpenseReport::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'unpaid')
+			} elseif ($modulepart == 'unpaid')
 			{
 				$modellist = '';
-			}
-			elseif ($modulepart == 'user')
+			} elseif ($modulepart == 'user')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/user/modules_user.class.php';
 					$modellist = ModelePDFUser::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'usergroup')
+			} elseif ($modulepart == 'usergroup')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/usergroup/modules_usergroup.class.php';
 					$modellist = ModelePDFUserGroup::liste_modeles($this->db);
 				}
-			}
-			else {
+			} else {
 			    $submodulepart = $modulepart;
 
 			    // modulepart = 'nameofmodule' or 'nameofmodule:nameofsubmodule'
@@ -665,8 +635,7 @@ class FormFile
 				if (class_exists($class))
 				{
 					$modellist = call_user_func($class.'::liste_modeles', $this->db);
-				}
-				else {
+				} else {
 					dol_print_error($this->db, "Bad value for modulepart '".$modulepart."' in showdocuments");
 					return -1;
 				}
@@ -710,8 +679,7 @@ class FormFile
 				{
 					$out .= ajax_combobox('model');
 				}
-			}
-			else {
+			} else {
 				$out .= '<div class="float">'.$langs->trans("Files").'</div>';
 			}
 
@@ -724,8 +692,7 @@ class FormFile
 				$morecss = 'maxwidth150';
 				if ($conf->browser->layout == 'phone') $morecss = 'maxwidth100';
 				$out .= $formadmin->select_language($defaultlang, 'lang_id', 0, null, 0, 0, 0, $morecss);
-			}
-			else {
+			} else {
 				$out .= '&nbsp;';
 			}
 
@@ -861,8 +828,7 @@ class FormFile
 						{
 							$out .= $hookmanager->resPrint; // Complete line
 							$out .= '</tr>';
-						}
-						else {
+						} else {
 							$out = $hookmanager->resPrint; // Replace all $out
 						}
 			  		}
@@ -948,8 +914,7 @@ class FormFile
 		if (!empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP))
 		{
 			$filterforfilesearch = preg_quote(basename($modulesubdir), '/');
-		}
-		else {
+		} else {
 			$filterforfilesearch = preg_quote(basename($modulesubdir), '/').'[^\-]+';
 		}
 		$file_list = dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$'); // We also discard .meta and .png preview
@@ -1016,8 +981,7 @@ class FormFile
     			</dl>';
 
 			if (!$found) $out = '';
-		}
-		else {
+		} else {
 			// TODO Add link to regenerate doc ?
 			//$out.= '<div id="gen_pdf_'.$modulesubdir.'" class="linkobject hideobject">'.img_picto('', 'refresh').'</div>'."\n";
 		}
@@ -1115,8 +1079,7 @@ class FormFile
 		if (isset($reshook) && $reshook != '') // null or '' for bypass
 		{
 			return $reshook;
-		}
-		else {
+		} else {
 			if (!is_object($form))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; // The compoent may be included into ajax page that does not include the Form class
@@ -1236,8 +1199,7 @@ class FormFile
 						print '<input type="hidden" name="renamefilefrom" value="'.dol_escape_htmltag($file['name']).'">';
 						print '<input type="text" name="renamefileto" class="quatrevingtpercent" value="'.dol_escape_htmltag($file['name']).'">';
 						$editline = 1;
-					}
-					else {
+					} else {
 						print dol_trunc($file['name'], 200);
 						print '</a>';
 					}
@@ -1270,8 +1232,7 @@ class FormFile
 						    if ($useinecm == 5 || $useinecm == 6)
 						    {
 						        $smallfile = getImageFileNameForSize($file['name'], ''); // There is no thumb for ECM module and Media filemanager, so we use true image
-						    }
-						    else {
+						    } else {
 						        $smallfile = getImageFileNameForSize($file['name'], '_small'); // For new thumbs using same ext (in lower case however) than original
 						    }
 						    if (!dol_is_file($file['path'].'/'.$smallfile)) $smallfile = getImageFileNameForSize($file['name'], '_small', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
@@ -1286,8 +1247,7 @@ class FormFile
 							}
 							print '<img class="photo maxwidth200" height="'.(($useinecm == 4 || $useinecm == 5 || $useinecm == 6) ? '12' : $maxheightmini).'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$smallfile).'" title="">';
 							print '</a>';
-						}
-						else print '&nbsp;';
+						} else print '&nbsp;';
 						print '</td>';
 					}
 
@@ -1299,8 +1259,7 @@ class FormFile
 						{
 							print $langs->trans("FileSharedViaALink").' ';
 							print '<input class="inline-block" type="checkbox" name="shareenabled"'.($file['share'] ? ' checked="checked"' : '').' /> ';
-						}
-						else {
+						} else {
 							if ($file['share'])
 							{
 								// Define $urlwithroot
@@ -1318,8 +1277,7 @@ class FormFile
 
 								print img_picto($langs->trans("FileSharedViaALink"), 'globe').' ';
 								print '<input type="text" class="quatrevingtpercent minwidth200imp" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
-							}
-							else {
+							} else {
 								//print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
 							}
 						}
@@ -1377,14 +1335,12 @@ class FormFile
 									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id.'">'.img_down('default', 0, 'imgdownforline').'</a>';
 								}
 								print '</td>';
-							}
-							else {
+							} else {
 							   	print '<td'.(($conf->browser->layout != 'phone' && empty($disablemove)) ? ' class="linecolmove tdlineupdown center"' : ' class="linecolmove center"').'>';
 							   	print '</td>';
 							}
 					    }
-					}
-					else {
+					} else {
 						print '<td class="right">';
 						print '<input type="hidden" name="ecmfileid" value="'.$filearray[$key]['rowid'].'">';
 						print '<input type="submit" class="button" name="renamefilesave" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -1500,78 +1456,63 @@ class FormFile
 		{
 			include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 			$object_instance = new Societe($this->db);
-		}
-		elseif ($modulepart == 'invoice')
+		} elseif ($modulepart == 'invoice')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 			$object_instance = new Facture($this->db);
-		}
-		elseif ($modulepart == 'invoice_supplier')
+		} elseif ($modulepart == 'invoice_supplier')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 			$object_instance = new FactureFournisseur($this->db);
-		}
-		elseif ($modulepart == 'propal')
+		} elseif ($modulepart == 'propal')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$object_instance = new Propal($this->db);
-		}
-		elseif ($modulepart == 'supplier_proposal')
+		} elseif ($modulepart == 'supplier_proposal')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 			$object_instance = new SupplierProposal($this->db);
-		}
-		elseif ($modulepart == 'order')
+		} elseif ($modulepart == 'order')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 			$object_instance = new Commande($this->db);
-		}
-		elseif ($modulepart == 'order_supplier')
+		} elseif ($modulepart == 'order_supplier')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 			$object_instance = new CommandeFournisseur($this->db);
-		}
-		elseif ($modulepart == 'contract')
+		} elseif ($modulepart == 'contract')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 			$object_instance = new Contrat($this->db);
-		}
-		elseif ($modulepart == 'product')
+		} elseif ($modulepart == 'product')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 			$object_instance = new Product($this->db);
-		}
-		elseif ($modulepart == 'tax')
+		} elseif ($modulepart == 'tax')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 			$object_instance = new ChargeSociales($this->db);
-		}
-		elseif ($modulepart == 'project')
+		} elseif ($modulepart == 'project')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 			$object_instance = new Project($this->db);
-		}
-		elseif ($modulepart == 'fichinter')
+		} elseif ($modulepart == 'fichinter')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 			$object_instance = new Fichinter($this->db);
-		}
-		elseif ($modulepart == 'user')
+		} elseif ($modulepart == 'user')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 			$object_instance = new User($this->db);
-		}
-		elseif ($modulepart == 'expensereport')
+		} elseif ($modulepart == 'expensereport')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 			$object_instance = new ExpenseReport($this->db);
-		}
-		elseif ($modulepart == 'holiday')
+		} elseif ($modulepart == 'holiday')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 			$object_instance = new Holiday($this->db);
-		}
-		elseif ($modulepart == 'banque')
+		} elseif ($modulepart == 'banque')
 		{
 		    include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 		    $object_instance = new Account($this->db);
@@ -1591,14 +1532,11 @@ class FormFile
 				$id = 0; $ref = ''; $label = '';
 
 				// To show ref or specific information according to view to show (defined by $module)
-				if ($modulepart == 'company' || $modulepart == 'tax') { preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); }
-				elseif ($modulepart == 'invoice_supplier') { preg_match('/([^\/]+)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); if (is_numeric($ref)) { $id = $ref; $ref = ''; } }	// $ref may be also id with old supplier invoices
-				elseif ($modulepart == 'user' || $modulepart == 'holiday') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); }
-                elseif (in_array($modulepart, array('invoice', 'propal', 'supplier_proposal', 'order', 'order_supplier', 'contract', 'product', 'project', 'fichinter', 'expensereport', 'banque')))
+				if ($modulepart == 'company' || $modulepart == 'tax') { preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); } elseif ($modulepart == 'invoice_supplier') { preg_match('/([^\/]+)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); if (is_numeric($ref)) { $id = $ref; $ref = ''; } }	// $ref may be also id with old supplier invoices
+				elseif ($modulepart == 'user' || $modulepart == 'holiday') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); } elseif (in_array($modulepart, array('invoice', 'propal', 'supplier_proposal', 'order', 'order_supplier', 'contract', 'product', 'project', 'fichinter', 'expensereport', 'banque')))
 				{
 					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : '');
-				}
-				else {
+				} else {
 				    //print 'Error: Value for modulepart = '.$modulepart.' is not yet implemented in function list_of_autoecmfiles'."\n";
 				}
 
@@ -1607,8 +1545,7 @@ class FormFile
 				if (!empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
 				{
 					$found = 1;
-				}
-				else {
+				} else {
 					//print 'Fetch '.$id." - ".$ref.'<br>';
 
 					if ($id) {
@@ -1829,8 +1766,7 @@ class FormFile
 				print '<input type="submit" name="save" class="button" value="'.dol_escape_htmltag($langs->trans('Save')).'">';
 				print '<input type="submit" name="cancel" class="button" value="'.dol_escape_htmltag($langs->trans('Cancel')).'">';
 				print '</td>';
-			}
-			else {
+			} else {
 				print '<td>';
 				print img_picto('', 'globe').' ';
 				print '<a data-ajax="false" href="'.$link->url.'" target="_blank">';
@@ -1891,8 +1827,7 @@ class FormFile
 				{
 					//$out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
 					$out .= '<span class="fa fa-search-plus" style="color: gray"></span>';
-				}
-				else $out .= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
+				} else $out .= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
 				$out .= '</a>';
 			}
 		}
diff --git a/htdocs/core/class/html.formintervention.class.php b/htdocs/core/class/html.formintervention.class.php
index 8f12c5a72d4..37073e8d3a5 100644
--- a/htdocs/core/class/html.formintervention.class.php
+++ b/htdocs/core/class/html.formintervention.class.php
@@ -96,14 +96,12 @@ class FormIntervention
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)
 					{
 						// Do nothing
-					}
-					else {
+					} else {
 						$labeltoshow = dol_trunc($obj->ref, 18);
 						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
 						{
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else {
+						} else {
 							$disabled = 0;
 							if (!$obj->fk_statut > 0)
 							{
@@ -119,8 +117,7 @@ class FormIntervention
 							if ($hideunselectables && $disabled)
 							{
 								$resultat = '';
-							}
-							else {
+							} else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								$resultat .= '>'.$labeltoshow;
@@ -135,8 +132,7 @@ class FormIntervention
 			$out .= '</select>';
 			$db->free($resql);
 			return $out;
-		}
-		else {
+		} else {
 			dol_print_error($db);
 			return '';
 		}
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index bc5731c58c4..598e71d2e34 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -343,8 +343,7 @@ class FormMail extends Form
 		if (!empty($reshook))
 		{
 			return $hookmanager->resPrint;
-		}
-		else {
+		} else {
 			$out = '';
 
 			$disablebademails = 1;
@@ -433,8 +432,7 @@ class FormMail extends Form
 					if (preg_match('/\((.*)\)/', $line->label, $reg))
 					{
 						$modelmail_array[$line->id] = $langs->trans($reg[1]); // langs->trans when label is __(xxx)__
-					}
-					else {
+					} else {
 						$modelmail_array[$line->id] = $line->label;
 					}
 					if ($line->lang) $modelmail_array[$line->id] .= ' ('.$line->lang.')';
@@ -517,8 +515,7 @@ class FormMail extends Form
 						if ($this->frommail)
 						{
 							$out .= ' &lt;'.$this->frommail.'&gt;';
-						}
-						else {
+						} else {
 							if ($this->fromtype)
 							{
 								$langs->load('errors');
@@ -533,8 +530,7 @@ class FormMail extends Form
 						{
 							$langs->load('errors');
 							$liste['user'] = $user->getFullName($langs).' &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt;';
-						}
-						else {
+						} else {
 							$liste['user'] = $user->getFullName($langs).' &lt;'.$user->email.'&gt;';
 						}
 
@@ -575,8 +571,7 @@ class FormMail extends Form
 								}
 								$i++;
 							}
-						}
-						else dol_print_error($this->db);
+						} else dol_print_error($this->db);
 
 						foreach ($listaliases as $typealias => $listalias)
 						{
@@ -611,8 +606,7 @@ class FormMail extends Form
 					}
 
 					$out .= "</td></tr>\n";
-				}
-				else {
+				} else {
 					$out .= '<tr><td class="fieldrequired width200">'.$langs->trans("MailFrom")."</td><td>";
 					$out .= $langs->trans("Name").':<input type="text" id="fromname" name="fromname" class="maxwidth200onsmartphone" value="'.$this->fromname.'" />';
 					$out .= '&nbsp; &nbsp; ';
@@ -639,14 +633,12 @@ class FormMail extends Form
 							$soc = new Societe($this->db);
 							$soc->fetch($this->toid);
 							$out .= $soc->getNomUrl(1);
-						}
-						elseif ($this->totype == 'contact')
+						} elseif ($this->totype == 'contact')
 						{
 							$contact = new Contact($this->db);
 							$contact->fetch($this->toid);
 							$out .= $contact->getNomUrl(1);
-						}
-						else {
+						} else {
 							$out .= $this->toname;
 						}
 						$out .= ' &lt;'.$this->tomail.'&gt;';
@@ -654,13 +646,11 @@ class FormMail extends Form
 						{
 							$out .= '<br>'.$langs->trans("and").' <input class="minwidth200" id="sendto" name="sendto" value="'.(!is_array($this->withto) && !is_numeric($this->withto) ? (isset($_REQUEST["sendto"]) ? $_REQUEST["sendto"] : $this->withto) : "").'" />';
 						}
-					}
-					else {
+					} else {
 						// Note withto may be a text like 'AllRecipientSelected'
 						$out .= (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";
 					}
-				}
-				else {
+				} else {
 					// The free input of email
 					if (!empty($this->withtofree))
 					{
@@ -733,8 +723,7 @@ class FormMail extends Form
 				if ($this->withtoccreadonly)
 				{
 					$out .= (!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : "";
-				}
-				else {
+				} else {
 				    $out .= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.(GETPOST("sendtocc", "alpha") ? GETPOST("sendtocc", "alpha") : ((!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : '')).'" />';
 					if (!empty($this->withtocc) && is_array($this->withtocc))
 					{
@@ -864,8 +853,7 @@ class FormMail extends Form
 							}
 							$out .= '<br></div>';
 						}
-					}
-					elseif (empty($this->withmaindocfile))		// Do not show message if we asked to show the checkbox
+					} elseif (empty($this->withmaindocfile))		// Do not show message if we asked to show the checkbox
 					{
 						$out .= $langs->trans("NoAttachedFiles").'<br>';
 					}
@@ -876,8 +864,7 @@ class FormMail extends Form
 						$out .= ' ';
 						$out .= '<input class="button" type="submit" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
 					}
-				}
-				else {
+				} else {
 					$out .= $this->withfile;
 				}
 
@@ -902,8 +889,7 @@ class FormMail extends Form
 				if (empty($this->substit['__REF__']))
 				{
 					$paymenturl = '';
-				}
-				else {
+				} else {
 					// Set the online payment url link into __ONLINE_PAYMENT_URL__ key
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 					$langs->loadLangs(array('paypal', 'other'));
@@ -922,8 +908,7 @@ class FormMail extends Form
 					$langs->load('other');
 					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = str_replace('\n', "\n", $langs->transnoentities("PredefinedMailContentLink", $paymenturl));
 					$this->substit['__ONLINE_PAYMENT_URL__'] = $paymenturl;
-				}
-				else {
+				} else {
 					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = '';
 					$this->substit['__ONLINE_PAYMENT_URL__'] = '';
 				}
@@ -965,8 +950,7 @@ class FormMail extends Form
 				{
 					$out .= nl2br($defaultmessage);
 					$out .= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />';
-				}
-				else {
+				} else {
 					if (!isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes';
 
 					// Editor wysiwyg
@@ -1209,26 +1193,16 @@ class FormMail extends Form
 				$ret->content = $obj->content;
 				$ret->content_lines = $obj->content_lines;
 				$ret->joinfiles = $obj->joinfiles;
-			}
-			elseif ($id == -2) {
+			} elseif ($id == -2) {
 				// Not found with the provided label
 				return -1;
-			}
-			else {	// If there is no template at all
+			} else {	// If there is no template at all
 				$defaultmessage = '';
-				if ($type_template == 'body') { $defaultmessage = $this->withbody; }		// Special case to use this->withbody as content
-				elseif ($type_template == 'facture_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoice"); }
-				elseif ($type_template == 'facture_relance') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
-				elseif ($type_template == 'propal_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendProposal"); }
-				elseif ($type_template == 'supplier_proposal_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal"); }
-				elseif ($type_template == 'order_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendOrder"); }
-				elseif ($type_template == 'order_supplier_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
-				elseif ($type_template == 'invoice_supplier_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
-				elseif ($type_template == 'shipping_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendShipping"); }
-				elseif ($type_template == 'fichinter_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendFichInter"); }
-				elseif ($type_template == 'thirdparty') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentThirdparty"); }
-				elseif ($type_template == 'user') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentUser"); }
-				elseif (!empty($type_template)) { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContent".ucfirst($type_template)); }
+				if ($type_template == 'body') {
+					// Special case to use this->withbody as content
+					$defaultmessage = $this->withbody;
+				}
+				elseif ($type_template == 'facture_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoice"); } elseif ($type_template == 'facture_relance') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder"); } elseif ($type_template == 'propal_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendProposal"); } elseif ($type_template == 'supplier_proposal_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal"); } elseif ($type_template == 'order_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendOrder"); } elseif ($type_template == 'order_supplier_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder"); } elseif ($type_template == 'invoice_supplier_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice"); } elseif ($type_template == 'shipping_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendShipping"); } elseif ($type_template == 'fichinter_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendFichInter"); } elseif ($type_template == 'thirdparty') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentThirdparty"); } elseif ($type_template == 'user') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentUser"); } elseif (!empty($type_template)) { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContent".ucfirst($type_template)); }
 
 				$ret->label = 'default';
 				$ret->lang = $outputlangs->defaultlang;
@@ -1240,8 +1214,7 @@ class FormMail extends Form
 
 			$db->free($resql);
 			return $ret;
-		}
-		else {
+		} else {
 			dol_print_error($db);
 			return -1;
 		}
@@ -1275,8 +1248,7 @@ class FormMail extends Form
 			$num = $this->db->num_rows($resql);
 			$this->db->free($resql);
 			return $num;
-		}
-		else {
+		} else {
 			$this->error = get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
 			return -1;
 		}
@@ -1328,8 +1300,7 @@ class FormMail extends Form
 			}
 			$this->db->free($resql);
 			return $num;
-		}
-		else {
+		} else {
 			$this->error = get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
 			return -1;
 		}
@@ -1459,8 +1430,7 @@ class FormMail extends Form
 					if ($conf->commande->enabled) $tmparray['__SECUREKEYPAYMENT_ORDER__'] = 'SecureKeyPAYMENTUniquePerOrder';
 					if ($conf->contrat->enabled)  $tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'SecureKeyPAYMENTUniquePerContractLine';
 				}
-			}
-			else {
+			} else {
 				/* No need to show into tooltip help, option is not enabled
 				$vars['__SECUREKEYPAYMENT__']='';
 				$vars['__SECUREKEYPAYMENT_MEMBER__']='';
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index db2bd566e52..5e18bb20782 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -118,8 +118,7 @@ class FormMargin
 					//}
 					//else
 						$marginInfos['margin_on_products'] += $pv - $pa;
-				}
-				elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '2') { // remise globale considérée comme service
+				} elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '2') { // remise globale considérée comme service
 					$marginInfos['pa_services'] += $pa;
 					$marginInfos['pv_services'] += $pv;
 					$marginInfos['pa_total'] += $pa;
@@ -129,13 +128,11 @@ class FormMargin
 					//	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
 					//else
 						$marginInfos['margin_on_services'] += $pv - $pa;
-				}
-				elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '3') { // remise globale prise en compte uniqt sur total
+				} elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '3') { // remise globale prise en compte uniqt sur total
 					$marginInfos['pa_total'] += $pa;
 					$marginInfos['pv_total'] += $pv;
 				}
-			}
-			else {
+			} else {
 				$type = $line->product_type ? $line->product_type : $line->fk_product_type;
 				if ($type == 0) {  // product
 					$marginInfos['pa_products'] += $pa;
@@ -151,8 +148,7 @@ class FormMargin
 					//{
 					    $marginInfos['margin_on_products'] += $pv - $pa;
 					//}
-				}
-				elseif ($type == 1) {  // service
+				} elseif ($type == 1) {  // service
 					$marginInfos['pa_services'] += $pa;
 					$marginInfos['pv_services'] += $pv;
 					$marginInfos['pa_total'] += $pa;
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 358b85fad59..f69ef6703e0 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -96,8 +96,7 @@ class FormOther
                 $label = $obj->label;
                 if ($obj->fk_user == 0) {
                 	$label .= ' <span class="opacitymedium">('.$langs->trans("Everybody").')</span>';
-                }
-                elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
+                } elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
                 	$tmpuser = new User($this->db);
                 	$tmpuser->fetch($obj->fk_user);
                 	$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';
@@ -106,8 +105,7 @@ class FormOther
                 if ($selected == $obj->rowid)
                 {
                     print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';
-                }
-                else {
+                } else {
                     print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';
                 }
                 print $label;
@@ -116,8 +114,7 @@ class FormOther
             }
             print "</select>";
             print ajax_combobox($htmlname);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -162,8 +159,7 @@ class FormOther
                 $label = $obj->label;
                 if ($obj->fk_user == 0) {
                 	$label .= ' <span class="opacitymedium">('.$langs->trans("Everybody").')</span>';
-                }
-                elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
+                } elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
                 	$tmpuser = new User($this->db);
                 	$tmpuser->fetch($obj->fk_user);
                 	$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';
@@ -172,8 +168,7 @@ class FormOther
                 if ($selected == $obj->rowid)
                 {
                     print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';
-                }
-                else {
+                } else {
                     print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';
                 }
                 print $label;
@@ -182,8 +177,7 @@ class FormOther
             }
             print "</select>";
             print ajax_combobox($htmlname);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -224,8 +218,7 @@ class FormOther
                     if ($selected && $selected == $obj->rowid)
                     {
                         print '<option value="'.$obj->rowid.'" selected>';
-                    }
-                    else {
+                    } else {
                         print '<option value="'.$obj->rowid.'">';
                         //print '<option onmouseover="showtip(\''.$obj->label.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
                     }
@@ -237,8 +230,7 @@ class FormOther
             }
             print '</select>';
             return 0;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return 1;
         }
@@ -282,8 +274,7 @@ class FormOther
     				if (($selected && $selected == $obj->taux) || $num == 1)
     				{
     					$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';
-    				}
-    				else {
+    				} else {
     					$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';
     					//print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
     				}
@@ -294,8 +285,7 @@ class FormOther
     		}
     		$out .= '</select>';
     		return $out;
-    	}
-    	else {
+    	} else {
     		dol_print_error($this->db);
     		return '';
     	}
@@ -326,8 +316,7 @@ class FormOther
             if ($selected != '' && (int) $selected == $i)
             {
                 $return .= '<option value="'.$i.'" selected>';
-            }
-            else {
+            } else {
                 $return .= '<option value="'.$i.'">';
             }
             $return .= $i.' % ';
@@ -452,8 +441,7 @@ class FormOther
         		$sql_usr .= " WHERE EXISTS (SELECT ug.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug WHERE u.rowid = ug.fk_user AND ug.entity IN (".getEntity('usergroup')."))";
         		$sql_usr .= " OR u.entity = 0"; // Show always superadmin
         	}
-        }
-        else {
+        } else {
         	$sql_usr .= " WHERE u.entity IN (".getEntity('user').")";
         }
 
@@ -477,8 +465,7 @@ class FormOther
             	} else {
             		$sql_usr .= " WHERE EXISTS (SELECT ug2.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug2 WHERE u2.rowid = ug2.fk_user AND ug2.entity IN (".getEntity('usergroup')."))";
             	}
-            }
-            else {
+            } else {
             	$sql_usr .= " WHERE u2.entity IN (".getEntity('user').")";
             }
 
@@ -525,8 +512,7 @@ class FormOther
                 $out .= '</option>';
             }
             $this->db->free($resql_usr);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
 
@@ -575,8 +561,7 @@ class FormOther
             print '</select>';
 
             print ajax_combobox($htmlname);
-        }
-        else {
+        } else {
             print '<div class="warning">'.$langs->trans("NoProject").'</div>';
         }
     }
@@ -617,8 +602,7 @@ class FormOther
                         if (empty($lines[$i]->public))
                         {
                             print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
-                        }
-                        else {
+                        } else {
                             print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
                         }
                         //print '-'.$parent.'-'.$lines[$i]->fk_project.'-'.$lastprojectid;
@@ -651,8 +635,7 @@ class FormOther
                     if (empty($lines[$i]->public))
                     {
                         print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
-                    }
-                    else {
+                    } else {
                         print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
                     }
                     if ($lines[$i]->id) print ' > ';
@@ -780,8 +763,7 @@ class FormOther
 	             </script>';
             }
             $out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss ? ' '.$morecss : '').'" type="text" value="'.dol_escape_htmltag($set_color).'" />';
-        }
-        else // In most cases, this is not used. We used instead function with no specific list of colors
+        } else // In most cases, this is not used. We used instead function with no specific list of colors
         {
         	if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax))
             {
@@ -886,8 +868,7 @@ class FormOther
             if ($selected == $key)
             {
                 $select_week .= '<option value="'.$key.'" selected>';
-            }
-            else {
+            } else {
                 $select_week .= '<option value="'.$key.'">';
             }
             $select_week .= $val;
@@ -928,8 +909,7 @@ class FormOther
             if ($selected == $key)
             {
                 $select_month .= '<option value="'.$key.'" selected>';
-            }
-            else {
+            } else {
                 $select_month .= '<option value="'.$key.'">';
             }
             $select_month .= $val;
@@ -998,8 +978,7 @@ class FormOther
                 if ($selected > 0 && $y == $selected) $selected_html = ' selected';
                 $out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
             }
-        }
-        else {
+        } else {
             for ($y = $min_year; $y <= $max_year; $y++)
             {
                 $selected_html = '';
@@ -1272,8 +1251,7 @@ class FormOther
                     if ($selected == $obj->rowid || $selected == $obj->$keyfield)
                     {
                         print '<option value="'.$obj->$keyfield.'" selected>';
-                    }
-                    else {
+                    } else {
                         print '<option value="'.$obj->$keyfield.'">';
                     }
                     print $obj->$labelfield;
@@ -1284,8 +1262,7 @@ class FormOther
             } else {
                 print $langs->trans("DictionaryEmpty");
             }
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -1319,8 +1296,7 @@ class FormOther
 		{
 			$resultautomanual .= '<option value="'.$automatic.'" selected>'.$langs->trans("Automatic").'</option>'."\n";
 			$resultautomanual .= '<option value="'.$manual.'">'.$langs->trans("Manual").'</option>'."\n";
-		}
-		else {
+		} else {
 	   		$selected = (($useempty && $value != '0' && $value != 'manual') ? '' : ' selected');
 			$resultautomanual .= '<option value="'.$automatic.'">'.$langs->trans("Automatic").'</option>'."\n";
 			$resultautomanual .= '<option value="'.$manual.'"'.$selected.'>'.$langs->trans("Manual").'</option>'."\n";
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 2b6357e1c6e..6fad72862c7 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -97,8 +97,7 @@ class FormProjets
 			));
 
 			$out .= '<input type="text" class="minwidth200'.($morecss ? ' '.$morecss : '').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
-		}
-		else {
+		} else {
 			$out .= $this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, abs($discard_closed), $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid, $morecss);
 		}
 		if ($discard_closed > 0)
@@ -114,8 +113,7 @@ class FormProjets
 		{
 			print $out;
 			return '';
-		}
-		else return $out;
+		} else return $out;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -207,8 +205,7 @@ class FormProjets
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)
 					{
 						// Do nothing
-					}
-					else {
+					} else {
 						if ($discard_closed == 1 && $obj->fk_statut == 2 && $obj->rowid != $selected) // We discard closed except if selected
 						{
 							$i++;
@@ -230,13 +227,11 @@ class FormProjets
 						{
 							$disabled = 1;
 							$labeltoshow .= ' - '.$langs->trans("Draft");
-						}
-						elseif ($obj->fk_statut == 2)
+						} elseif ($obj->fk_statut == 2)
 						{
 							if ($discard_closed == 2) $disabled = 1;
 							$labeltoshow .= ' - '.$langs->trans("Closed");
-						}
-						elseif (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
+						} elseif (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 						{
 							$disabled = 1;
 							$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
@@ -247,13 +242,11 @@ class FormProjets
 							$out .= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out .= '>'.$labeltoshow.'</option>';
-						}
-						else {
+						} else {
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
 								$resultat = '';
-							}
-							else {
+							} else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
@@ -285,13 +278,11 @@ class FormProjets
 				{
 					print $out;
 					return '';
-				}
-				else return $out;
+				} else return $out;
 			} else {
 				return $outarray;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -374,8 +365,7 @@ class FormProjets
 					//if (! empty($conf->use_javascript_ajax)) $out .= '<span class="opacitymedium">aaa';
 					$out .= $show_empty;
 					//if (! empty($conf->use_javascript_ajax)) $out .= '</span>';
-				}
-				else $out .= '&nbsp;';
+				} else $out .= '&nbsp;';
 				$out .= '</option>';
 			}
 			$num = $this->db->num_rows($resql);
@@ -389,8 +379,7 @@ class FormProjets
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire))
 					{
 						// Do nothing
-					}
-					else {
+					} else {
 						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
 						{
 							$i++;
@@ -413,13 +402,11 @@ class FormProjets
 							{
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("Draft");
-							}
-							elseif ($obj->fk_statut == Project::STATUS_CLOSED)
+							} elseif ($obj->fk_statut == Project::STATUS_CLOSED)
 							{
 								if ($discard_closed == 2) $disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("Closed");
-							}
-							elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 							{
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
@@ -435,13 +422,11 @@ class FormProjets
 							$out .= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out .= '>'.$labeltoshow.'</option>';
-						}
-						else {
+						} else {
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
 								$resultat = '';
-							}
-							else {
+							} else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
@@ -464,8 +449,7 @@ class FormProjets
 
 			$this->db->free($resql);
 			return $num;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -589,8 +573,7 @@ class FormProjets
 			$this->db->free($resql);
 
 			return $sellist;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->db->lasterror();
@@ -650,8 +633,7 @@ class FormProjets
 					if ($useshortlabel)
 					{
 						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
-					}
-					else {
+					} else {
 						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
 						if ($showpercent) $finallabel .= ' ('.$obj->percent.'%)';
 					}
@@ -671,8 +653,7 @@ class FormProjets
 			$this->db->free($resql);
 
 			return $sellist;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->db->lasterror();
 			dol_syslog(get_class($this)."::selectOpportunityStatus ".$this->error, LOG_ERR);
diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index 607d7f2f6e2..e1653444960 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -97,8 +97,7 @@ class FormPropal
                         $i++;
                     }
                 }
-            }
-            else {
+            } else {
                 dol_print_error($this->db);
             }
         }
@@ -119,16 +118,14 @@ class FormPropal
             if ($selected != '' && $selected == $obj['id'])
             {
                 print '<option value="'.$obj['id'].'" selected>';
-            }
-            else {
+            } else {
                 print '<option value="'.$obj['id'].'">';
             }
             $key = $obj['code'];
             if ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : ''))
             {
                 print $langs->trans($prefix.$key.($short ? 'Short' : ''));
-            }
-            else {
+            } else {
                 $conv_to_new_code = array('PR_DRAFT'=>'Draft', 'PR_OPEN'=>'Validated', 'PR_CLOSED'=>'Closed', 'PR_SIGNED'=>'Signed', 'PR_NOTSIGNED'=>'NotSigned', 'PR_FAC'=>'Billed');
                 if (!empty($conv_to_new_code[$obj['code']])) $key = $conv_to_new_code[$obj['code']];
 
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index abad56441a9..55d214fbbd6 100644
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
@@ -179,8 +179,7 @@ function limitChars(textarea, limit, infodiv)
                 if ($this->fromsms)
                 {
                     print $this->fromsms;
-                }
-                else {
+                } else {
                     if ($this->fromtype)
                     {
                         $langs->load("errors");
@@ -189,8 +188,7 @@ function limitChars(textarea, limit, infodiv)
                 }
                 print "</td></tr>\n";
                 print "</td></tr>\n";
-            }
-            else {
+            } else {
                 print '<tr><td class="'.$morecss.'">'.$langs->trans("SmsFrom")."</td><td>";
                 //print '<input type="text" name="fromname" size="30" value="'.$this->fromsms.'">';
                 if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')        // For backward compatibility        @deprecated
@@ -201,17 +199,14 @@ function limitChars(textarea, limit, infodiv)
                         if (empty($conf->global->OVHSMS_ACCOUNT))
                         {
                             $resultsender = 'ErrorOVHSMS_ACCOUNT not defined';
-                        }
-                        else {
+                        } else {
                             $resultsender = $sms->SmsSenderList();
                         }
-                    }
-                    catch (Exception $e)
+                    } catch (Exception $e)
                     {
                         dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
                     }
-                }
-                elseif (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
+                } elseif (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
                 {
                     $tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
                     $classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
@@ -222,19 +217,16 @@ function limitChars(textarea, limit, infodiv)
                         {
                         	$sms = new $classname($this->db);
                         	$resultsender = $sms->SmsSenderList();
-                        }
-                        else {
+                        } else {
                         	$sms = new stdClass();
                         	$sms->error = 'The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
                         }
-                    }
-                    catch (Exception $e)
+                    } catch (Exception $e)
                     {
                         dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
                         exit;
                     }
-                }
-                else {
+                } else {
                     dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);
 	                $resultsender = array();
                     $resultsender[0]->number = $this->fromsms;
@@ -248,8 +240,7 @@ function limitChars(textarea, limit, infodiv)
                         print '<option value="'.$obj->number.'">'.$obj->number.'</option>';
                     }
                     print '</select>';
-                }
-                else {
+                } else {
                     print '<span class="error">'.$langs->trans("SmsNoPossibleSenderFound");
                     if (is_object($sms) && !empty($sms->error)) print ' '.$sms->error;
                     print '</span>';
@@ -270,8 +261,7 @@ function limitChars(textarea, limit, infodiv)
             if ($this->withtoreadonly)
             {
                 print (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";
-            }
-            else {
+            } else {
                 print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(!is_array($this->withto) && $this->withto != '1' ? (isset($_REQUEST["sendto"]) ?GETPOST("sendto") : $this->withto) : "+")."\">";
                 if (!empty($this->withtosocid) && $this->withtosocid > 0)
                 {
@@ -308,8 +298,7 @@ function limitChars(textarea, limit, infodiv)
             {
                 print nl2br($defaultmessage);
                 print '<input type="hidden" name="message" value="'.dol_escape_htmltag($defaultmessage).'">';
-            }
-            else {
+            } else {
                 print '<textarea class="quatrevingtpercent" name="message" id="message" rows="'.ROWS_4.'" onkeyup="limitChars(this, 160, \'charlimitinfospan\')">'.$defaultmessage.'</textarea>';
                 print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160 - dol_strlen($defaultmessage)).'</span></div></td>';
             }
diff --git a/htdocs/core/class/html.formsocialcontrib.class.php b/htdocs/core/class/html.formsocialcontrib.class.php
index ddc79a3c9cf..c6d28a7b70f 100644
--- a/htdocs/core/class/html.formsocialcontrib.class.php
+++ b/htdocs/core/class/html.formsocialcontrib.class.php
@@ -79,8 +79,7 @@ class FormSocialContrib
             $sql .= " WHERE c.active = 1";
             $sql .= " AND c.fk_pays = ".$mysoc->country_id;
             $sql .= " ORDER BY c.libelle ASC";
-        }
-        else {
+        } else {
             $sql = "SELECT c.id, c.libelle as type";
             $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
             $sql .= " WHERE c.active = 1 AND c.fk_pays = co.rowid";
@@ -110,12 +109,10 @@ class FormSocialContrib
                 print '</select>';
                 if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
                 if (!empty($conf->use_javascript_ajax)) print ajax_combobox($htmlname);
-            }
-            else {
+            } else {
                 print $langs->trans("ErrorNoSocialContributionForSellerCountry", $mysoc->country_code);
             }
-        }
-        else {
+        } else {
             dol_print_error($db, $db->lasterror());
         }
     }
diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index e666260325c..c656f5e39ee 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -79,8 +79,7 @@ class FormWebsite
                 if ($selected == $obj->rowid)
                 {
                     $out .= '<option value="'.$obj->rowid.'" selected>';
-                }
-                else {
+                } else {
                     $out .= '<option value="'.$obj->rowid.'">';
                 }
                 $out .= $obj->ref;
@@ -88,8 +87,7 @@ class FormWebsite
                 $i++;
             }
             $out .= "</select>";
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
 
@@ -137,8 +135,7 @@ class FormWebsite
     				if ($selected == $obj->rowid || $selected == $obj->code)
     				{
     					print '<option value="'.$obj->code.'" selected>';
-    				}
-    				else {
+    				} else {
     					print '<option value="'.$obj->code.'">';
     				}
     				print $obj->label;
@@ -147,12 +144,10 @@ class FormWebsite
     			}
     			print "</select>";
     			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-    		}
-    		else {
+    		} else {
     			print $langs->trans("NoTypeOfPagePleaseEditDictionary");
     		}
-    	}
-    	else {
+    	} else {
     		dol_print_error($this->db);
     	}
     }
@@ -202,8 +197,7 @@ class FormWebsite
     		if ($selected == $key)
     		{
     			$out .= '<option value="'.$key.'" selected>';
-    		}
-    		else {
+    		} else {
     			$out .= '<option value="'.$key.'">';
     		}
     		$out .= $langs->trans($val);
@@ -238,8 +232,7 @@ class FormWebsite
 	    if ($atleastonepage && $action != 'editsource')
 	    {
 	    	$out .= '<select name="'.$htmlname.'" id="'.$htmlname.'" class="maxwidth300'.($morecss ? ' '.$morecss : '').'">';
-	    }
-	    else {
+	    } else {
 	    	$out .= '<select name="pageidbis" id="pageid" class="maxwidth300'.($morecss ? ' '.$morecss : '').'" disabled="disabled">';
 	    }
 
@@ -287,8 +280,7 @@ class FormWebsite
 	    if ($atleastonepage && $action != 'editsource')
 	    {
 	    	$out .= ajax_combobox($htmlname);
-	    }
-	    else {
+	    } else {
 	    	$out .= '<input type="hidden" name="'.$htmlname.'" value="'.$pageid.'">';
 	    	$out .= ajax_combobox($htmlname);
 	    }
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index ca51c8b8c97..fb4aaf4e7ff 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -43,8 +43,7 @@ class InfoBox
         		0 => 'Home',
         		27 => 'Accountancy Home'
         	);
-		}
-		else {
+		} else {
 			return array(
 				0 => 'Home',
 				1 => 'userhome',
@@ -107,8 +106,7 @@ class InfoBox
             if (is_object($user)) $sql .= " AND b.fk_user IN (0,".$user->id.")";
             else $sql .= " AND b.fk_user = 0";
             $sql .= " ORDER BY b.box_order";
-        }
-        else // available
+        } else // available
         {
             $sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";
             $sql .= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
@@ -132,8 +130,7 @@ class InfoBox
                         $boxname = preg_replace('/\.php$/i', '', $regs[1]);
                         $module = $regs[2];
                         $relsourcefile = "/".$module."/core/boxes/".$boxname.".php";
-                    }
-                    else {
+                    } else {
                         $boxname = preg_replace('/\.php$/i', '', $obj->file);
                         $relsourcefile = "/core/boxes/".$boxname.".php";
                     }
@@ -197,15 +194,13 @@ class InfoBox
                         //print 'xx module='.$module.' enabled='.$enabled;
                         if ($enabled && ($includehidden || empty($box->hidden))) $boxes[] = $box;
                         else unset($box);
-                    }
-                    else {
+                    } else {
                         dol_syslog("Failed to load box '".$boxname."' into file '".$relsourcefile."'", LOG_WARNING);
                     }
                 }
                 $j++;
             }
-        }
-        else {
+        } else {
             dol_syslog($db->lasterror(), LOG_ERR);
             return array('error'=>$db->lasterror());
         }
@@ -303,13 +298,11 @@ class InfoBox
                 $error = $db->error();
                 $db->rollback();
                 return -2;
-            }
-            else {
+            } else {
                 $db->commit();
                 return 1;
             }
-        }
-        else {
+        } else {
             $error = $db->lasterror();
             $db->rollback();
             dol_syslog(get_class()."::saveboxorder ".$error);
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 09f05a143a8..b9b5189e81a 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -151,8 +151,7 @@ class Interfaces
                             //print 'Todo for '.$modName." : ".$newdir.'/'.$file."\n";
                             include_once $newdir.'/'.$file;
                             //print 'Done for '.$modName."\n";
-                        }
-                        catch (Exception $e)
+                        } catch (Exception $e)
                         {
                             dol_syslog('ko for '.$modName." ".$e->getMessage()."\n", LOG_ERR);
                         }
@@ -187,13 +186,11 @@ class Interfaces
                 {
                     //dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);
                     $result = $objMod->runTrigger($action, $object, $user, $langs, $conf);
-                }
-                elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method
+                } elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method
                 {
                     dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);
                     $result = $objMod->run_trigger($action, $object, $user, $langs, $conf);
-                }
-                else {
+                } else {
                     dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);
                 }
 
@@ -218,8 +215,7 @@ class Interfaces
                     elseif (!empty($objMod->error))  $this->errors[] = $objMod->error;
                     //dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($this->errors), LOG_ERR);
                 }
-            }
-            else {
+            } else {
                 dol_syslog(get_class($this)."::run_triggers action=".$action." Failed to instantiate trigger for file '".$files[$key]."'", LOG_ERR);
             }
         }
@@ -228,8 +224,7 @@ class Interfaces
         {
             dol_syslog(get_class($this)."::run_triggers action=".$action." Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko." - Nb of error string returned in this->errors = ".count($this->errors), LOG_ERR);
             return -$nbko;
-        }
-        else {
+        } else {
             //dol_syslog(get_class($this)."::run_triggers Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko, LOG_DEBUG);
             return $nbok;
         }
@@ -288,8 +283,7 @@ class Interfaces
                         {
                             $langs->load("errors");
                             print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger", $modName, "/htdocs/core/triggers/").'</div>';
-                        }
-                        else {
+                        } else {
                             include_once $newdir.'/'.$file;
                         }
 
@@ -365,18 +359,15 @@ class Interfaces
 		            {
 		                $text .= $langs->trans("TriggerDisabledByName").'<br>';
 		                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
-		            }
-		            else {
+		            } else {
 		                if ($disabledbymodule == 0) $text .= $langs->trans("TriggerAlwaysActive").'<br>';
 		                if ($disabledbymodule == 1) $text .= $langs->trans("TriggerActiveAsModuleActive", $module).'<br>';
 		                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
 		            }
-	            }
-	            else {
+	            } else {
 	            	print 'Error: Trigger '.$modName.' does not extends DolibarrTriggers<br>';
 	            }
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
             	print $e->getMessage();
             }
 
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 4a46f6a500a..8fa5633bf5e 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -190,8 +190,7 @@ class Ldap
 
 				if ($this->serverPing($host, $this->serverPort) === true) {
 					$this->connection = ldap_connect($host, $this->serverPort);
-				}
-				else continue;
+				} else continue;
 
 				if (is_resource($this->connection))
 				{
@@ -221,12 +220,10 @@ class Ldap
 							$this->bind = $this->result;
 							$connected = 2;
 							break;
-						}
-						else {
+						} else {
 							$this->error = ldap_errno($this->connection).' '.ldap_error($this->connection);
 						}
-					}
-					else {
+					} else {
 						// Try in auth mode
 						if ($this->searchUser && $this->searchPassword)
 						{
@@ -237,8 +234,7 @@ class Ldap
 								$this->bind = $this->result;
 								$connected = 2;
 								break;
-							}
-							else {
+							} else {
 								$this->error = ldap_errno($this->connection).' '.ldap_error($this->connection);
 							}
 						}
@@ -252,8 +248,7 @@ class Ldap
 								$this->bind = $this->result;
 								$connected = 1;
 								break;
-							}
-							else {
+							} else {
 								$this->error = ldap_errno($this->connection).' '.ldap_error($this->connection);
 							}
 						}
@@ -268,8 +263,7 @@ class Ldap
 		{
 			$return = $connected;
 			dol_syslog(get_class($this)."::connect_bind return=".$return, LOG_DEBUG);
-		}
-		else {
+		} else {
 			$this->error = 'Failed to connect to LDAP'.($this->error ? ': '.$this->error : '');
 			$return = -1;
 			dol_syslog(get_class($this)."::connect_bind return=".$return.' - '.$this->error, LOG_WARNING);
@@ -290,8 +284,7 @@ class Ldap
 		if ($this->connection && !@ldap_close($this->connection))
 		{
 			return false;
-		}
-		else {
+		} else {
 			return true;
 		}
 	}
@@ -310,8 +303,7 @@ class Ldap
 			$this->ldapErrorText = ldap_error($this->connection);
 			$this->error = $this->ldapErrorCode." ".$this->ldapErrorText;
 			return false;
-		}
-		else {
+		} else {
 			return true;
 		}
 	}
@@ -334,8 +326,7 @@ class Ldap
 			$this->ldapErrorText = ldap_error($this->connection);
 			$this->error = $this->ldapErrorCode." ".$this->ldapErrorText;
 			return false;
-		}
-		else {
+		} else {
 			return true;
 		}
 	}
@@ -436,8 +427,7 @@ class Ldap
 		{
 			dol_syslog(get_class($this)."::add successfull", LOG_DEBUG);
 			return 1;
-		}
-		else {
+		} else {
 			$this->ldapErrorCode = @ldap_errno($this->connection);
 			$this->ldapErrorText = @ldap_error($this->connection);
 			$this->error = $this->ldapErrorCode." ".$this->ldapErrorText;
@@ -489,8 +479,7 @@ class Ldap
 		{
 			dol_syslog(get_class($this)."::modify successfull", LOG_DEBUG);
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::modify failed: ".$this->error, LOG_ERR);
 			return -1;
@@ -538,8 +527,7 @@ class Ldap
 		{
 			dol_syslog(get_class($this)."::rename successfull", LOG_DEBUG);
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::rename failed: ".$this->error, LOG_ERR);
 			return -1;
@@ -582,14 +570,12 @@ class Ldap
 			{
 				// This function currently only works with LDAPv3
 				$result = $this->rename($olddn, $newrdn, $newparent, $user, true);
-			}
-			else {
+			} else {
 				// If change we make is rename the key of LDAP record, we create new one and if ok, we delete old one.
 				$result = $this->add($dn, $info, $user);
 				if ($result > 0 && $olddn && $olddn != $dn) $result = $this->delete($olddn); // If add fails, we do not try to delete old one
 			}
-		}
-		else {
+		} else {
 			//$result = $this->delete($olddn);
 			$result = $this->add($dn, $info, $user); // If record has been deleted from LDAP, we recreate it. We ignore error if it already exists.
 			$result = $this->modify($dn, $info, $user); // We use add/modify instead of delete/add when olddn is received
@@ -600,8 +586,7 @@ class Ldap
 			dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 			//print_r($info);
 			return -1;
-		}
-		else {
+		} else {
 			dol_syslog(get_class($this)."::update done successfully");
 			return 1;
 		}
@@ -659,8 +644,7 @@ class Ldap
 		if (preg_match('/^ldap/', $this->server[0]))
 		{
 			$target = "-H ".join(',', $this->server);
-		}
-		else {
+		} else {
 			$target = "-h ".join(',', $this->server)." -p ".$this->serverPort;
 		}
 		$content .= "# ldapadd $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
@@ -673,8 +657,7 @@ class Ldap
 			if (!is_array($value))
 			{
 				$content .= "$key: $value\n";
-			}
-			else {
+			} else {
 				foreach ($value as $valuekey => $valuevalue)
 				{
 					$content .= "$key: $valuevalue\n";
@@ -710,8 +693,7 @@ class Ldap
 			if (!empty($conf->global->MAIN_UMASK))
 			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 			return 1;
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -788,8 +770,7 @@ class Ldap
 		{
 			dol_syslog(get_class($this)."::add_attribute successfull", LOG_DEBUG);
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::add_attribute failed: ".$this->error, LOG_ERR);
 			return -1;
@@ -839,8 +820,7 @@ class Ldap
 		{
 			dol_syslog(get_class($this)."::updateAttribute successfull", LOG_DEBUG);
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::updateAttribute failed: ".$this->error, LOG_ERR);
 			return -1;
@@ -890,8 +870,7 @@ class Ldap
 		{
 			dol_syslog(get_class($this)."::deleteAttribute successfull", LOG_DEBUG);
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::deleteAttribute failed: ".$this->error, LOG_ERR);
 			return -1;
@@ -1014,17 +993,14 @@ class Ldap
 			if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter)
 			{
 				$filter = '('.$this->filter.')';
-			}
-			elseif (((string) $activefilter == 'member') && $this->filter)
+			} elseif (((string) $activefilter == 'member') && $this->filter)
 			{
 				$filter = '('.$this->filtermember.')';
-			}
-			else // If this->filter is empty, make fiter on * (all)
+			} else // If this->filter is empty, make fiter on * (all)
 			{
 				$filter = '('.$useridentifier.'=*)';
 			}
-		}
-		else {
+		} else {
 			$filter = '('.$useridentifier.'='.$search.')';
 		}
 
@@ -1035,8 +1011,7 @@ class Ldap
 			dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter." attributeArray=(".join(',', $attributeArray).")");
 			//var_dump($attributeArray);
 			$this->result = @ldap_search($this->connection, $userDn, $filter, $attributeArray);
-		}
-		else {
+		} else {
 			// Return list with fields selected by default
 			dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter);
 			$this->result = @ldap_search($this->connection, $userDn, $filter);
@@ -1073,8 +1048,7 @@ class Ldap
 					{
 						$objectsid = $this->getObjectSid($recordid);
 						$fulllist[$recordid][$attributeArray[$j]] = $objectsid;
-					}
-					else {
+					} else {
 						if (in_array($attributeArray[$j], $attributeAsArray) && is_array($info[$i][$keyattributelower])) {
 							$valueTab = array();
 							foreach ($info[$i][$keyattributelower] as $key => $value) {
@@ -1147,8 +1121,7 @@ class Ldap
 				// Si pas de resultat on cherche dans le domaine
 				$searchDN = $this->domain;
 				$i++;
-			}
-			else {
+			} else {
 				$i++;
 				$i++;
 			}
@@ -1159,8 +1132,7 @@ class Ldap
 			$ldapBinary = ldap_get_values_len($this->connection, $entry, "objectsid");
 			$SIDText = $this->binSIDtoText($ldapBinary[0]);
 			return $SIDText;
-		}
-		else {
+		} else {
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return '?';
 		}
@@ -1218,8 +1190,7 @@ class Ldap
 		{
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return -1;
-		}
-		else {
+		} else {
 			ldap_free_result($this->result);
 			return $result;
 		}
@@ -1257,8 +1228,7 @@ class Ldap
 				if ($result['count'] > 0) dol_syslog('Ldap::fetch search found '.$result['count'].' records');
 				else dol_syslog('Ldap::fetch search returns but found no records');
 				//var_dump($result);exit;
-			}
-			else {
+			} else {
 				$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 				dol_syslog(get_class($this)."::fetch search fails");
 				return -1;
@@ -1269,8 +1239,7 @@ class Ldap
 				// Si pas de resultat on cherche dans le domaine
 				$searchDN = $this->domain;
 				$i++;
-			}
-			else {
+			} else {
 				break;
 			}
 		}
@@ -1279,8 +1248,7 @@ class Ldap
 		{
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return -1;
-		}
-		else {
+		} else {
 			$this->name       = $this->convToOutputCharset($result[0][$this->attr_name][0], $this->ldapcharset);
 			$this->firstname  = $this->convToOutputCharset($result[0][$this->attr_firstname][0], $this->ldapcharset);
 			$this->login      = $this->convToOutputCharset($result[0][$this->attr_login][0], $this->ldapcharset);
@@ -1294,8 +1262,7 @@ class Ldap
 			if (isset($result[0]["pwdlastset"][0]))	// If expiration on password exists
 			{
 				$this->pwdlastset = ($result[0]["pwdlastset"][0] != 0) ? $this->convert_time($this->convToOutputCharset($result[0]["pwdlastset"][0], $this->ldapcharset)) : 0;
-			}
-			else {
+			} else {
 				$this->pwdlastset = -1;
 			}
 			if (!$this->name && !$this->login) $this->pwdlastset = -1;
diff --git a/htdocs/core/class/lessc.class.php b/htdocs/core/class/lessc.class.php
index 185cd3782e5..f5a9381b763 100644
--- a/htdocs/core/class/lessc.class.php
+++ b/htdocs/core/class/lessc.class.php
@@ -1378,8 +1378,7 @@ class Lessc
 			$darkColor  = (isset($args[2][1])) ? $this->assertColor($args[2][1]) : $darkColor;
 			$lightColor = (isset($args[2][2])) ? $this->assertColor($args[2][2]) : $lightColor;
 			$threshold  = (isset($args[2][3])) ? $this->assertNumber($args[2][3]) : $threshold;
-		}
-		else {
+		} else {
 			$inputColor = $this->assertColor($args);
 		}
 
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index 61b3a8a134a..2599fa69c09 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -123,20 +123,17 @@ class Link extends CommonObject
                 dol_syslog(get_class($this)."::Create success id=".$this->id);
                 $this->db->commit();
                 return $this->id;
-            }
-            else {
+            } else {
                 dol_syslog(get_class($this)."::Create echec update ".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -3;
             }
-        }
-        else {
+        } else {
             if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
             {
                 $this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name);
                 $result = -1;
-            }
-            else {
+            } else {
                 $this->error = $this->db->lasterror();
                 $result = -2;
             }
@@ -208,15 +205,13 @@ class Link extends CommonObject
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else {
+        } else {
             if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
             {
                 // Doublon
                 $this->error = $langs->trans("ErrorDuplicateField");
                 $result = -1;
-            }
-            else {
+            } else {
                 $this->error = $langs->trans("Error sql = ".$sql);
                 $result = -2;
             }
@@ -337,8 +332,7 @@ class Link extends CommonObject
                 $this->objecttype = $obj->objecttype;
                 $this->objectid = $obj->objectid;
                 return 1;
-            }
-            else {
+            } else {
                 return 0;
             }
         } else {
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 6a37c5235d4..40edb80b3f3 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -213,8 +213,7 @@ class Menubase
                 //print $sql; exit;
                 $resqlrowidset = $this->db->query($sql);
                 if (!$resqlrowidset) dol_print_error($this->db);
-            }
-            else dol_print_error($this->db);
+            } else dol_print_error($this->db);
         }
 
         // Check that entry does not exists yet on key menu_handler-fk_menu-position-url-entity, to avoid errors with postgresql
@@ -280,19 +279,16 @@ class Menubase
 		            dol_syslog(get_class($this)."::create record added has rowid=".$this->id, LOG_DEBUG);
 
 		            return $this->id;
-		        }
-		        else {
+		        } else {
 		            $this->error = "Error ".$this->db->lasterror();
 		            return -1;
 		        }
-        	}
-        	else {
+        	} else {
         		dol_syslog(get_class($this)."::create menu entry already exists", LOG_WARNING);
         		$this->error = 'Error Menu entry already exists';
         		return 0;
         	}
-        }
-        else {
+        } else {
         	return -1;
         }
     }
@@ -428,8 +424,7 @@ class Menubase
             $this->db->free($resql);
 
             return 1;
-        }
-        else {
+        } else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -570,8 +565,7 @@ class Menubase
         		{
         			$this->newmenu->add($val['url'], $val['titre'], 0, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
         			//var_dump($this->newmenu->liste);
-        		}
-        		else {
+        		} else {
         			// Search first menu with this couple (mainmenu,leftmenu)=(fk_mainmenu,fk_leftmenu)
         			$searchlastsub = 0; $lastid = 0; $nextid = 0; $found = 0;
         			foreach ($this->newmenu->liste as $keyparent => $valparent)
@@ -688,16 +682,14 @@ class Menubase
                         {
                             $tab_titre = explode("/", $menu['titre']);
                             $title = $langs->trans($tab_titre[0])."/".$langs->trans($tab_titre[1]);
-                        }
-                        elseif (preg_match('/\|\|/', $menu['titre']))
+                        } elseif (preg_match('/\|\|/', $menu['titre']))
                         {
                             // To manage different translation (Title||AltTitle@ConditionForAltTitle)
                         	$tab_title = explode("||", $menu['titre']);
                         	$alt_title = explode("@", $tab_title[1]);
                         	$title_enabled = verifCond($alt_title[1]);
                         	$title = ($title_enabled ? $langs->trans($alt_title[0]) : $langs->trans($tab_title[0]));
-                        }
-                        else {
+                        } else {
                             $title = $langs->trans($menu['titre']);
                         }
                     }
@@ -738,8 +730,7 @@ class Menubase
             // into the leftMenuCharger later to avoid useless operations.
 
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 126e526abf5..130dc09f4f8 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -194,8 +194,7 @@ class Notify
 						}
 						$i++;
 					}
-				}
-				else {
+				} else {
 					$error++;
 					$this->error = $this->db->lasterror();
 				}
@@ -238,8 +237,7 @@ class Notify
 						}
 						$i++;
 					}
-				}
-				else {
+				} else {
 					$error++;
 					$this->error = $this->db->lasterror();
 				}
@@ -256,8 +254,7 @@ class Notify
 					if ($notifcode)
 					{
 						if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
-					}
-					else {
+					} else {
 						if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
 					}
 
@@ -276,8 +273,7 @@ class Notify
 								$tmpuser->fetch($user->fk_user);
 								if ($tmpuser->email) $newval2 = trim($tmpuser->email);
 								else $newval2 = '';
-							}
-							else $newval2 = '';
+							} else $newval2 = '';
 						}
 						if ($newval2)
 						{
@@ -519,8 +515,7 @@ class Notify
 						{
 							// We can't add PDF as it is not generated yet.
 							$filepdf = '';
-						}
-						else {
+						} else {
 							$filepdf = $pdf_path;
 						}
 
@@ -563,8 +558,7 @@ class Notify
 							if ($obj->type_target == 'touserid') {
 	 							$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_user, type, objet_type, type_target, objet_id, email)";
 								$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
-							}
-							else {
+							} else {
 								$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, type_target, objet_id, email)";
 								$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
 							}
@@ -572,23 +566,19 @@ class Notify
 							{
 								dol_print_error($this->db);
 							}
-						}
-						else {
+						} else {
 							$error++;
 							$this->errors[] = $mailfile->error;
 						}
-					}
-					else {
+					} else {
 						dol_syslog("No notification sent for ".$sendto." because email is empty");
 					}
 					$i++;
 				}
-			}
-			else {
+			} else {
 				dol_syslog("No notification to thirdparty sent, nothing into notification setup for the thirdparty socid = ".$object->socid);
 			}
-		}
-		else {
+		} else {
 	   		$error++;
 			$this->errors[] = $this->db->lasterror();
 			dol_syslog("Failed to get list of notification to send ".$this->db->lasterror(), LOG_ERR);
@@ -735,8 +725,7 @@ class Notify
 				{
 					// We can't add PDF as it is not generated yet.
 					$filepdf = '';
-				}
-				else {
+				} else {
 					$filepdf = $pdf_path;
 				}
 
@@ -799,8 +788,7 @@ class Notify
 						{
 							dol_print_error($this->db);
 						}
-					}
-					else {
+					} else {
 						$error++;
 						$this->errors[] = $mailfile->error;
 					}
diff --git a/htdocs/core/class/openid.class.php b/htdocs/core/class/openid.class.php
index 93167289266..19a94bca9f6 100644
--- a/htdocs/core/class/openid.class.php
+++ b/htdocs/core/class/openid.class.php
@@ -218,8 +218,7 @@ class SimpleOpenID
         if (count($this->error) > 0)
         {
             return true;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -457,8 +456,7 @@ class SimpleOpenID
             echo '<script language="JavaScript" type="text/javascript">window.location=\'';
             echo $redirect_to;
             echo '\';</script>';
-        }
-        else {	// Default Header Redirect
+        } else {	// Default Header Redirect
             header('Location: '.$redirect_to);
         }
     }
@@ -500,8 +498,7 @@ class SimpleOpenID
         if ($data['is_valid'] == "true")
         {
             return true;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -551,8 +548,7 @@ class SimpleOpenID
         {
             $this->ErrorStore('OPENID_NOSERVERSFOUND');
             return false;
-        }
-        else {
+        } else {
             dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS found endpoint = '.$server);
             $this->SetOpenIDServer($server);
             return $server;
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index b9d733a7f3e..56c6bdd216b 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -218,8 +218,7 @@ class RssParser
 				$foundintocache = 1;
 
 				$this->_lastfetchdate = $filedate;
-			}
-			else {
+			} else {
 				dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
 			}
 		}
@@ -228,8 +227,7 @@ class RssParser
 		if ($foundintocache)    // Cache file found and is not too old
 		{
 			$str = file_get_contents($newpathofdestfile);
-		}
-		else {
+		} else {
 			try {
 				ini_set("user_agent", "Dolibarr ERP-CRM RSS reader");
 				ini_set("max_execution_time", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
@@ -242,8 +240,7 @@ class RssParser
 				$context = stream_context_create($opts);
 
 				$str = file_get_contents($this->_urlRSS, false, $context);
-			}
-			catch (Exception $e) {
+			} catch (Exception $e) {
 				print 'Error retrieving URL '.$this->_urlRSS.' - '.$e->getMessage();
 			}
 		}
@@ -256,8 +253,7 @@ class RssParser
 				//print 'xx'.LIBXML_NOCDATA;
 				libxml_use_internal_errors(false);
 				$rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
-			}
-			else {
+			} else {
 				$xmlparser = xml_parser_create('');
 				if (!is_resource($xmlparser)) {
 					$this->error = "ErrorFailedToCreateParser"; return -1;
@@ -290,8 +286,7 @@ class RssParser
 					@chmod($newpathofdestfile, octdec($newmask));
 
 					$this->_lastfetchdate = $nowgmt;
-				}
-				else {
+				} else {
 					print 'Error, failed to open file '.$newpathofdestfile.' for write';
 				}
 			}
@@ -320,8 +315,7 @@ class RssParser
 					if (!empty($rss->channel->link))		  $this->_link = (string) $rss->channel->link;
 					if (!empty($rss->channel->title))         $this->_title = (string) $rss->channel->title;
 					if (!empty($rss->channel->description))	  $this->_description = (string) $rss->channel->description;
-				}
-				else {
+				} else {
 					//var_dump($rss->channel);
 					if (!empty($rss->channel['language']))      $this->_language = (string) $rss->channel['language'];
 					if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
@@ -336,8 +330,7 @@ class RssParser
 				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items = $rss->channel->item; // With simplexml
 				else $items = $rss->items; // With xmlparse
 				//var_dump($items);exit;
-			}
-			elseif ($rss->_format == 'atom')
+			} elseif ($rss->_format == 'atom')
 			{
 				//var_dump($rss);
 				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
@@ -347,8 +340,7 @@ class RssParser
 					if (!empty($rss->link->href))    $this->_link = (string) $rss->link->href;
 					if (!empty($rss->title))         $this->_title = (string) $rss->title;
 					if (!empty($rss->description))	 $this->_description = (string) $rss->description;
-				}
-				else {
+				} else {
 					//if (!empty($rss->channel['rss_language']))	$this->_language = (string) $rss->channel['rss_language'];
 					if (!empty($rss->channel['generator']))			$this->_generator = (string) $rss->channel['generator'];
 					//if (!empty($rss->channel['rss_copyright']))	$this->_copyright = (string) $rss->channel['rss_copyright'];
@@ -385,8 +377,7 @@ class RssParser
 							$itemPubDate = (string) $item->pubDate;
 							$itemId = '';
 							$itemAuthor = '';
-						}
-						else {
+						} else {
 							$itemLink = (string) $item['link'];
 							$itemTitle = (string) $item['title'];
 							$itemDescription = (string) $item['description'];
@@ -404,8 +395,7 @@ class RssParser
 								$itemCategory[] = (string) $cat;
 							}
 						}
-					}
-					elseif ($rss->_format == 'atom')
+					} elseif ($rss->_format == 'atom')
 					{
 						if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
 						{
@@ -415,8 +405,7 @@ class RssParser
 							$itemPubDate = (string) $item['created'];
 							$itemId = (string) $item['id'];
 							$itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
-						}
-						else {
+						} else {
 							$itemLink = (isset($item['link']) ? (string) $item['link'] : '');
 							$itemTitle = (string) $item['title'];
 							$itemDescription = $this->getAtomItemDescription($item);
@@ -424,8 +413,7 @@ class RssParser
 							$itemId = (string) $item['id'];
 							$itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
 						}
-					}
-					else print 'ErrorBadFeedFormat';
+					} else print 'ErrorBadFeedFormat';
 
 					// Add record to result array
 					$this->_rssarray[$i] = array(
@@ -445,8 +433,7 @@ class RssParser
 			}
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = 'ErrorFailedToLoadRSSFile';
 			return -1;
 		}
@@ -486,12 +473,10 @@ class RssParser
 			if ($el == 'rdf') {
 				$this->_format = 'rss';
 				$this->feed_version = '1.0';
-			}
-			elseif ($el == 'rss') {
+			} elseif ($el == 'rss') {
 				$this->_format = 'rss';
 				$this->feed_version = $attrs['version'];
-			}
-			elseif ($el == 'feed') {
+			} elseif ($el == 'feed') {
 				$this->_format = 'atom';
 				$this->feed_version = $attrs['version'];
 				$this->inchannel = true;
@@ -502,8 +487,7 @@ class RssParser
 		if ($el == 'channel')
 		{
 			$this->inchannel = true;
-		}
-		elseif ($el == 'item' or $el == 'entry')
+		} elseif ($el == 'item' or $el == 'entry')
 		{
 			$this->initem = true;
 			if (isset($attrs['rdf:about'])) {
@@ -519,9 +503,7 @@ class RssParser
 		$el == 'textinput' )
 		{
 			$this->intextinput = true;
-		}
-
-		elseif (
+		} elseif (
 		$this->_format == 'rss' and
 		$this->current_namespace == '' and
 		$el == 'image' )
@@ -560,12 +542,10 @@ class RssParser
 			if (isset($attrs['rel']) && $attrs['rel'] == 'alternate')
 			{
 				$link_el = 'link';
-			}
-			elseif (!isset($attrs['rel']))
+			} elseif (!isset($attrs['rel']))
 			{
 				$link_el = 'link';
-			}
-			else {
+			} else {
 				$link_el = 'link_'.$attrs['rel'];
 			}
 
@@ -592,8 +572,7 @@ class RssParser
 		if ($this->_format == 'atom' and $this->incontent)
 		{
 			$this->append_content($text);
-		}
-		else {
+		} else {
 			$current_el = join('_', array_reverse($this->stack));
 			$this->append($current_el, $text);
 		}
@@ -617,37 +596,30 @@ class RssParser
 			$this->items[] = $this->current_item;
 			$this->current_item = array();
 			$this->initem = false;
-		}
-		elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput')
+		} elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput')
 		{
 			$this->intextinput = false;
-		}
-		elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image')
+		} elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image')
 		{
 			$this->inimage = false;
-		}
-		elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
+		} elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
 		{
 			$this->incontent = false;
-		}
-		elseif ($el == 'channel' or $el == 'feed')
+		} elseif ($el == 'channel' or $el == 'feed')
 		{
 			$this->inchannel = false;
-		}
-		elseif ($this->_format == 'atom' and $this->incontent) {
+		} elseif ($this->_format == 'atom' and $this->incontent) {
 			// balance tags properly
 			// note:  i don't think this is actually neccessary
 			if ($this->stack[0] == $el)
 			{
 				$this->append_content("</$el>");
-			}
-			else {
+			} else {
 				$this->append_content("<$el />");
 			}
 
 			array_shift($this->stack);
-		}
-		else {
+		} else {
 			array_shift($this->stack);
 		}
 
@@ -682,8 +654,7 @@ class RssParser
 		// phpcs:enable
 		if ($this->initem) {
 			$this->concat($this->current_item[$this->incontent], $text);
-		}
-		elseif ($this->inchannel) {
+		} elseif ($this->inchannel) {
 			$this->concat($this->channel[$this->incontent], $text);
 		}
 	}
@@ -704,28 +675,21 @@ class RssParser
 		{
 			if ($this->initem) {
 				$this->concat($this->current_item[$this->current_namespace][$el], $text);
-			}
-			elseif ($this->inchannel) {
+			} elseif ($this->inchannel) {
 				$this->concat($this->channel[$this->current_namespace][$el], $text);
-			}
-			elseif ($this->intextinput) {
+			} elseif ($this->intextinput) {
 				$this->concat($this->textinput[$this->current_namespace][$el], $text);
-			}
-			elseif ($this->inimage) {
+			} elseif ($this->inimage) {
 				$this->concat($this->image[$this->current_namespace][$el], $text);
 			}
-		}
-		else {
+		} else {
 			if ($this->initem) {
 				$this->concat($this->current_item[$el], $text);
-			}
-			elseif ($this->intextinput) {
+			} elseif ($this->intextinput) {
 				$this->concat($this->textinput[$el], $text);
-			}
-			elseif ($this->inimage) {
+			} elseif ($this->inimage) {
 				$this->concat($this->image[$el], $text);
-			}
-			elseif ($this->inchannel) {
+			} elseif ($this->inchannel) {
 				$this->concat($this->channel[$el], $text);
 			}
 		}
@@ -745,8 +709,7 @@ class RssParser
 		if (isset($item['summary']))
 		{
 			$result = $item['summary'];
-		}
-		elseif (isset($item['atom_content']))
+		} elseif (isset($item['atom_content']))
 		{
 			$result = $item['atom_content'];
 		}
@@ -834,13 +797,11 @@ function xml2php($xml)
 			$array[$key][] = $tmp;
 			$array[$key][] = $child;
 			$tab = true;
-		}
-		elseif ($tab === true)
+		} elseif ($tab === true)
 		{
 			//Add an element in an existing array
 			$array[$key][] = $child;
-		}
-		else {
+		} else {
 			//Add a simple element
 			$array[$key] = $child;
 		}
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index e4a68d2ad5e..0a0a39cc7cb 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -372,8 +372,7 @@ class SMTPs
         {
             $this->_setErr(99, $host.' is either offline or is an invalid host name.');
             $_retVal = false;
-        }
-        else {
+        } else {
             //See if we can connect to the SMTP server
             if ($this->socket = @fsockopen(
                 preg_replace('@tls://@i', '', $this->getHost()), // Host to 'hit', IP or domain
@@ -518,8 +517,7 @@ class SMTPs
             if (!$_retVal) {
                 $this->_setErr(130, 'Invalid Authentication Credentials.');
 			}
-        }
-        else {
+        } else {
             $this->_setErr(126, '"'.$host.'" does not support authenticated connections.');
         }
 
@@ -1084,8 +1082,7 @@ class SMTPs
             $_aryEmail['real'] = trim($_tmpAry[0], ' ">');
 
             $_aryEmail['addr'] = $_tmpAry[1];
-        }
-        else $_aryEmail['addr'] = $_tmpAry[0];
+        } else $_aryEmail['addr'] = $_tmpAry[0];
 
         // Pull User Name and Host.tld apart
         list($_aryEmail['user'], $_aryEmail['host']) = explode('@', $_aryEmail['addr']);
@@ -1156,8 +1153,7 @@ class SMTPs
                             {
                                 $_realName = '"'.$_realName.'"';
                                 $_RCPT_list[] = $_realName.' <'.$_addr.'@'.$_host.'>';
-                            }
-                            else {
+                            } else {
                                 $_RCPT_list[] = $_addr.'@'.$_host;
                             }
                         }
@@ -1165,13 +1161,11 @@ class SMTPs
                 }
 
                 return implode(', ', $_RCPT_list);
-            }
-            else {
+            } else {
                 $this->_setErr(101, 'No eMail Address for message to be sent to.');
                 return false;
             }
-        }
-        else {
+        } else {
             $this->_setErr(102, 'eMail type not defined.');
             return false;
         }
@@ -1304,8 +1298,7 @@ class SMTPs
             $_header .= 'Message-ID: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
             $_header .= 'References: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
             $_header .= 'X-Dolibarr-TRACKID: '.$trackid.'@'.$host."\r\n";
-        }
-        else {
+        } else {
             $_header .= 'Message-ID: <'.time().'.SMTPs@'.$host.">\r\n";
         }
         if (!empty($_SERVER['REMOTE_ADDR'])) $_header .= "X-RemoteAddr: ".$_SERVER['REMOTE_ADDR']."\r\n";
@@ -1494,8 +1487,7 @@ class SMTPs
                     $content .= "--".$this->_getBoundary('related')."--\r\n";
                     $content .= "\r\n--".$this->_getBoundary('alternative')."--\r\n";
                     $content .= "\r\n";
-                }
-                else {
+                } else {
                     if (key_exists('image', $this->_msgContent))
                     {
                         $content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index b884f54e04a..a18bad625e6 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -73,8 +73,7 @@ abstract class Stats
 				$foundintocache = 1;
 
 				$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
-			}
-			else {
+			} else {
 				dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
 			}
 		}
@@ -83,8 +82,7 @@ abstract class Stats
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
-		}
-		else {
+		} else {
 			$year = $startyear;
 			$sm = $startmonth - 1;
 			if ($sm != 0) $year = $year - 1;
@@ -168,8 +166,7 @@ abstract class Stats
         		$foundintocache = 1;
 
         		$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
-        	}
-        	else {
+        	} else {
         		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
         	}
         }
@@ -179,8 +176,7 @@ abstract class Stats
         {
         	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
         	$data = json_decode(file_get_contents($newpathofdestfile), true);
-        }
-        else {
+        } else {
 			$year = $startyear;
 			$sm = $startmonth - 1;
 			if ($sm != 0) $year = $year - 1;
@@ -216,8 +212,7 @@ abstract class Stats
 				fclose($fp);
 				if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 				@chmod($newpathofdestfile, octdec($newmask));
-			}
-			else dol_syslog("Failed to write cache file", LOG_ERR);
+			} else dol_syslog("Failed to write cache file", LOG_ERR);
 			$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
 		}
 
@@ -295,8 +290,7 @@ abstract class Stats
         		$foundintocache = 1;
 
         		$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
-        	}
-        	else {
+        	} else {
         		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
         	}
         }
@@ -306,8 +300,7 @@ abstract class Stats
         {
         	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
         	$data = json_decode(file_get_contents($newpathofdestfile), true);
-        }
-        else {
+        } else {
 			$data = $this->getAllByProduct($year, $limit);
 			//					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
 		}
@@ -360,8 +353,7 @@ abstract class Stats
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 		return $result;
@@ -404,8 +396,7 @@ abstract class Stats
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 		return $result;
@@ -443,8 +434,7 @@ abstract class Stats
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -502,8 +492,7 @@ abstract class Stats
 		  		$i++;
 		  	}
 		  	$this->db->free($resql);
-		}
-        else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		for ($i = 1; $i < 13; $i++)
 		{
@@ -558,8 +547,7 @@ abstract class Stats
 		  		$i++;
 		  	}
 		  	$this->db->free($resql);
-		}
-        else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		for ($i = 1; $i < 13; $i++)
 		{
@@ -613,8 +601,7 @@ abstract class Stats
             }
 		  	if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"), $other);
 		  	$this->db->free($resql);
-		}
-        else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return $result;
     }
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 582883f3ae9..c37a7cfc6ab 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -95,8 +95,7 @@ class Translate
 			$langpref = str_replace("-", "_", $langpref);
 			$langlist = preg_split("/[;,]/", $langpref);
 			$codetouse = preg_replace('/[^_a-zA-Z]/', '', $langlist[0]);
-		}
-		else $codetouse = $srclang;
+		} else $codetouse = $srclang;
 
 		// We redefine $srclang
 		$langpart = explode("_", $codetouse);
@@ -111,10 +110,8 @@ class Translate
 				$srclang = strtolower($langpart[0])."_".strtoupper($langpart[1]);
 				$longforlong = array('no_nb'=>'nb_NO');
 				if (isset($longforlong[strtolower($srclang)])) $srclang = $longforlong[strtolower($srclang)];
-			}
-			else $srclang = strtolower($langpart[0])."_".strtoupper($langpart[0]);
-		}
-		else {						// If it's for a codetouse that is a short code xx
+			} else $srclang = strtolower($langpart[0])."_".strtoupper($langpart[0]);
+		} else {						// If it's for a codetouse that is a short code xx
     	    // Array to convert short lang code into long code.
 	        $longforshort = array('ar'=>'ar_SA', 'el'=>'el_GR', 'ca'=>'ca_ES', 'en'=>'en_US', 'nb'=>'nb_NO', 'no'=>'nb_NO');
 			if (isset($longforshort[strtolower($langpart[0])])) $srclang = $longforshort[strtolower($langpart[0])];
@@ -302,12 +299,10 @@ class Translate
 												$tabtranslatedomain[$key] = $value;
 											}
 										}
-									}
-									elseif ($key[0] == '#')
+									} elseif ($key[0] == '#')
 									{
 									    continue;
-									}
-									else {
+									} else {
 										// Convert some strings: Parse and render carriage returns. Also, change '\\s' into '\s' because transifex sync pull the string '\s' into string '\\s'
 										$this->tab_translate[$key] = str_replace(array('\\n', '\\\\s'), array("\n", '\s'), $value);
 										if ($usecachekey) {
@@ -515,8 +510,7 @@ class Translate
     					}
     				}
     			}
-		    }
-		    else {
+		    } else {
 		        dol_print_error($db);
 		    }
 		}
@@ -551,24 +545,19 @@ class Translate
 	    if (preg_match('/^Civility([0-9A-Z]+)$/i', $key, $reg))
         {
             $newstr = $this->getLabelFromKey($db, $reg[1], 'c_civility', 'code', 'label');
-        }
-		elseif (preg_match('/^Currency([A-Z][A-Z][A-Z])$/i', $key, $reg))
+        } elseif (preg_match('/^Currency([A-Z][A-Z][A-Z])$/i', $key, $reg))
 		{
 			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_currencies', 'code_iso', 'label');
-		}
-		elseif (preg_match('/^SendingMethod([0-9A-Z]+)$/i', $key, $reg))
+		} elseif (preg_match('/^SendingMethod([0-9A-Z]+)$/i', $key, $reg))
 		{
 			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_shipment_mode', 'code', 'libelle');
-		}
-        elseif (preg_match('/^PaymentTypeShort([0-9A-Z]+)$/i', $key, $reg))
+		} elseif (preg_match('/^PaymentTypeShort([0-9A-Z]+)$/i', $key, $reg))
         {
             $newstr = $this->getLabelFromKey($db, $reg[1], 'c_paiement', 'code', 'libelle', '', 1);
-        }
-        elseif (preg_match('/^OppStatus([0-9A-Z]+)$/i', $key, $reg))
+        } elseif (preg_match('/^OppStatus([0-9A-Z]+)$/i', $key, $reg))
         {
             $newstr = $this->getLabelFromKey($db, $reg[1], 'c_lead_status', 'code', 'label');
-        }
-        elseif (preg_match('/^OrderSource([0-9A-Z]+)$/i', $key, $reg))
+        } elseif (preg_match('/^OrderSource([0-9A-Z]+)$/i', $key, $reg))
         {
         	// TODO OrderSourceX must be replaced with content of table llx_c_input_reason or llx_c_input_method
             //$newstr=$this->getLabelFromKey($db,$reg[1],'c_ordersource','code','label');
@@ -635,8 +624,7 @@ class Translate
             $str = str_replace(array('__lt__', '__gt__', '__quot__'), array('<', '>', '"',), $str);
 
 			return $str;
-		}
-		else // Translation is not available
+		} else // Translation is not available
 		{
 		    //if ($key[0] == '$') { return dol_eval($key,1); }
 			return $this->getTradFromKey($key);
@@ -706,8 +694,7 @@ class Translate
             }
 
             return $str;
-		}
-		else {
+		} else {
 		    if ($key[0] == '$') { return dol_eval($key, 1); }
 			return $this->getTradFromKey($key);
 		}
@@ -823,8 +810,7 @@ class Translate
 				if ($usecode == 1 || !empty($conf->global->MAIN_SHOW_LANGUAGE_CODE))
 				{
 				    $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir), $maxlength);
-				}
-				else {
+				} else {
 					$langs_available[$dir] = $this->trans('Language_'.$dir);
 				}
 				if ($mainlangonly) {
@@ -953,8 +939,7 @@ class Translate
 
 			$db->free($resql);
 			return $this->cache_labels[$tablename][$key];
-		}
-		else {
+		} else {
 			$this->error = $db->lasterror();
 			return -1;
 		}
@@ -1052,8 +1037,7 @@ class Translate
 			array_multisort($label, SORT_ASC, $this->cache_currencies);
 			//var_dump($this->cache_currencies);	$this->cache_currencies is now sorted onto label
 			return $num;
-		}
-		else {
+		} else {
 			dol_print_error($db);
 			return -1;
 		}
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 182cd9aa326..c1f85d72a75 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -133,8 +133,7 @@ class Utils
 					$result = dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted);
 					$count += $result;
 					$countdeleted += $tmpcountdeleted;
-				}
-				elseif ($filesarray[$key]['type'] == 'file')
+				} elseif ($filesarray[$key]['type'] == 'file')
 				{
 					// If (file that is not logfile) or (if mode is logfile)
 					if ($filesarray[$key]['fullname'] != $filelog || $choice == 'logfile')
@@ -144,8 +143,7 @@ class Utils
 						{
 							$count++;
 							$countdeleted++;
-						}
-						else {
+						} else {
 							$counterror++;
 						}
 					}
@@ -165,8 +163,7 @@ class Utils
 		{
 			$this->output = $langs->trans("PurgeNDirectoriesDeleted", $countdeleted);
 			if ($count > $countdeleted) $this->output .= '<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted));
-		}
-		else $this->output = $langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)' : '');
+		} else $this->output = $langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)' : '');
 
 		// Recreate temp dir that are not automatically recreated by core code for performance purpose, we need them
 		if (!empty($conf->api->enabled))
@@ -266,8 +263,7 @@ class Utils
 			{
 				if (GETPOST("drop", "alpha") || $usedefault)	$param .= " --add-drop-table=TRUE";
 				else $param .= " --add-drop-table=FALSE";
-			}
-			else {
+			} else {
 				$param .= " -t";
 			}
 			if (GETPOST("disable-add-locks", "alpha")) $param .= " --add-locks=FALSE";
@@ -280,8 +276,7 @@ class Utils
 				if (GETPOST("delayed", "alpha"))	 	 $param .= " --delayed-insert";
 				if (GETPOST("sql_ignore", "alpha"))	 $param .= " --insert-ignore";
 				if (GETPOST("hexforbinary", "alpha") || $usedefault) $param .= " --hex-blob";
-			}
-			else {
+			} else {
 				$param .= " -d"; // No row information (no data)
 			}
 			$param .= " --default-character-set=utf8"; // We always save output into utf8 charset
@@ -322,8 +317,7 @@ class Utils
 						dol_syslog("Datadump retval after exec=".$retval, LOG_ERR);
 						$errormsg = 'Error '.$retval;
 						$ok = 0;
-					}
-					else {
+					} else {
 						$i = 0;
 						if (!empty($output_arr))
 						{
@@ -362,8 +356,7 @@ class Utils
 
 				if (!empty($conf->global->MAIN_UMASK))
 					@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-			}
-			else {
+			} else {
 				$langs->load("errors");
 				dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
 				$errormsg = $langs->trans("ErrorFailedToWriteInDir");
@@ -385,8 +378,7 @@ class Utils
 				if ($compression == 'bz')   bzclose($handle);
 				if ($ok && preg_match('/^-- (MySql|MariaDB)/i', $errormsg)) {	// No error
 					$errormsg = '';
-				}
-				else {
+				} else {
 					// Renommer fichier sortie en fichier erreur
 					//print "$outputfile -> $outputerror";
 					@dol_delete_file($outputerror, 1, 0, 0, null, false, 0);
@@ -424,8 +416,7 @@ class Utils
 				$this->backupTables($outputfiletemp);
 				dol_compress_file($outputfiletemp, $outputfile, $compression);
 				unlink($outputfiletemp);
-			}
-			else {
+			} else {
 				$this->backupTables($outputfile);
 			}
 
@@ -605,14 +596,12 @@ class Utils
 		{
 			try {
 				$moduleobj = new $class($this->db);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$error++;
 				dol_print_error($e->getMessage());
 			}
-		}
-		else {
+		} else {
 			$error++;
 			$langs->load("errors");
 			dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
@@ -681,8 +670,7 @@ class Utils
 						if ($filecursor)
 						{
 							fwrite($fhandle, ($i ? "\n<<<\n\n" : "").$filecursor."\n");
-						}
-						else {
+						} else {
 							$this->error = 'Failed to concat content of file '.$spec['fullname'];
 							return -1;
 						}
@@ -750,22 +738,19 @@ class Utils
 				$result = ($resarray['result'] == 0) ? 1 : 0;
 
 				chdir($currentdir);
-			}
-			else {
+			} else {
 				$result = 0;
 			}
 
 			if ($result > 0)
 			{
 				return 1;
-			}
-			else {
+			} else {
 				$error++;
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorFailToGenerateFile", $outputfiledoc);
 			}
-		}
-		else {
+		} else {
 			$error++;
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorCheckVersionIsDefined");
@@ -922,8 +907,7 @@ class Utils
 			{
 				$tables[] = $row[0];
 			}
-		}
-		else {
+		} else {
 			$tables = is_array($tables) ? $tables : explode(',', $tables);
 		}
 
@@ -983,8 +967,7 @@ class Utils
 			if (empty($row2[1]))
 			{
 				fwrite($handle, "\n-- WARNING: Show create table ".$table." return empy string when it should not.\n");
-			}
-			else {
+			} else {
 				fwrite($handle, $row2[1].";\n");
 				//fwrite($handle,"/*!40101 SET character_set_client = @saved_cs_client */;\n\n");
 
diff --git a/htdocs/core/commonfieldsinexport.inc.php b/htdocs/core/commonfieldsinexport.inc.php
index 7ec7021f020..a16d6297dd4 100644
--- a/htdocs/core/commonfieldsinexport.inc.php
+++ b/htdocs/core/commonfieldsinexport.inc.php
@@ -58,8 +58,7 @@ if (class_exists($keyforclass))
 			$this->export_help_array[$r][$fieldname] = $helpfield;
 		}
 	}
-}
-else {
+} else {
 	dol_print_error($this->db, 'Failed to find class '.$keyforclass.', even after the include of '.$keyforclassfile);
 }
 // End add common fields
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 921b3d14bb6..613b0c59556 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -129,8 +129,7 @@ if ($objecttype) {
     	}
         $ObjectClassName = $arrayoftype[$objecttype]['ObjectClassName'];
         $object = new $ObjectClassName($db);
-    }
-    catch (Exception $e) {
+    } catch (Exception $e) {
         print 'Failed to load class for type '.$objecttype;
     }
 }
@@ -252,12 +251,10 @@ if (is_array($search_groupby) && count($search_groupby)) {
 			if (is_null($obj->val)) {
 				$keytouse = '__NULL__';
 				$valuetranslated = $langs->transnoentitiesnoconv("NotDefined");
-			}
-			elseif ($obj->val === '') {
+			} elseif ($obj->val === '') {
 				$keytouse = '';
 				$valuetranslated = $langs->transnoentitiesnoconv("Empty");
-			}
-			else {
+			} else {
 				$keytouse = (string) $obj->val;
 				$valuetranslated = $obj->val;
 			}
@@ -267,8 +264,7 @@ if (is_array($search_groupby) && count($search_groupby)) {
 				$valuetranslated = $object->fields[$gvalwithoutprefix]['arrayofkeyval'][$obj->val];
 				if (is_null($valuetranslated)) $valuetranslated = $langs->transnoentitiesnoconv("UndefinedKey");
 				$valuetranslated = $langs->trans($valuetranslated);
-			}
-			elseif (preg_match('/integer:([^:]+):([^:]+)$/', $object->fields[$gvalwithoutprefix]['type'], $regs)) {
+			} elseif (preg_match('/integer:([^:]+):([^:]+)$/', $object->fields[$gvalwithoutprefix]['type'], $regs)) {
 				$classname = $regs[1];
 				$classpath = $regs[2];
 				dol_include_once($classpath);
@@ -456,8 +452,7 @@ if (!empty($search_measures) && !empty($search_xaxis))
         } elseif (preg_match('/\-day$/', $val)) {
             $tmpval = preg_replace('/\-day$/', '', $val);
             $sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d') as x_".$key.', ';
-        }
-        else $sql .= $val.' as x_'.$key.', ';
+        } else $sql .= $val.' as x_'.$key.', ';
     }
     foreach ($search_groupby as $key => $val) {
     	if (preg_match('/\-year$/', $val)) {
@@ -469,24 +464,20 @@ if (!empty($search_measures) && !empty($search_xaxis))
     	} elseif (preg_match('/\-day$/', $val)) {
     		$tmpval = preg_replace('/\-day$/', '', $val);
     		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d') as g_".$key.', ';
-    	}
-    	else $sql .= $val.' as g_'.$key.', ';
+    	} else $sql .= $val.' as g_'.$key.', ';
     }
     foreach ($search_measures as $key => $val) {
         if ($val == 't.count') $sql .= 'COUNT(t.'.$fieldid.') as y_'.$key.', ';
         elseif (preg_match('/\-sum$/', $val)) {
             $tmpval = preg_replace('/\-sum$/', '', $val);
             $sql .= 'SUM('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
-        }
-        elseif (preg_match('/\-average$/', $val)) {
+        } elseif (preg_match('/\-average$/', $val)) {
             $tmpval = preg_replace('/\-average$/', '', $val);
             $sql .= 'AVG('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
-        }
-        elseif (preg_match('/\-min$/', $val)) {
+        } elseif (preg_match('/\-min$/', $val)) {
         	$tmpval  = preg_replace('/\-min$/', '', $val);
         	$sql .= 'MIN('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
-        }
-        elseif (preg_match('/\-max$/', $val)) {
+        } elseif (preg_match('/\-max$/', $val)) {
         	$tmpval = preg_replace('/\-max$/', '', $val);
         	$sql .= 'MAX('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
         }
@@ -524,8 +515,7 @@ if (!empty($search_measures) && !empty($search_xaxis))
         } elseif (preg_match('/\-day$/', $val)) {
             $tmpval = preg_replace('/\-day$/', '', $val);
             $sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-        }
-        else $sql .= $val.', ';
+        } else $sql .= $val.', ';
     }
     foreach ($search_groupby as $key => $val) {
     	if (preg_match('/\-year$/', $val)) {
@@ -537,8 +527,7 @@ if (!empty($search_measures) && !empty($search_xaxis))
     	} elseif (preg_match('/\-day$/', $val)) {
     		$tmpval = preg_replace('/\-day$/', '', $val);
     		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-    	}
-    	else $sql .= $val.', ';
+    	} else $sql .= $val.', ';
     }
     $sql = preg_replace('/,\s*$/', '', $sql);
     $sql .= ' ORDER BY ';
@@ -552,8 +541,7 @@ if (!empty($search_measures) && !empty($search_xaxis))
         } elseif (preg_match('/\-day$/', $val)) {
             $tmpval = preg_replace('/\-day$/', '', $val);
             $sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-        }
-        else $sql .= $val.', ';
+        } else $sql .= $val.', ';
     }
     foreach ($search_groupby as $key => $val) {
     	if (preg_match('/\-year$/', $val)) {
@@ -565,8 +553,7 @@ if (!empty($search_measures) && !empty($search_xaxis))
     	} elseif (preg_match('/\-day$/', $val)) {
     		$tmpval = preg_replace('/\-day$/', '', $val);
     		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-    	}
-    	else $sql .= $val.', ';
+    	} else $sql .= $val.', ';
     }
     $sql = preg_replace('/,\s*$/', '', $sql);
 }
diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index 51f71ea2b50..d3a6d3a01c9 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -59,8 +59,7 @@ print '<head>'."\n";
 if (GETPOST('mode') && GETPOST('mode') == 'test')
 {
 	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php"></script>'."\n";
-}
-else {
+} else {
 	print '<title>'.$langs->trans("Calendar").'</title>';
 }
 
@@ -108,8 +107,7 @@ if ($qualified)
 {
 	//print $_GET["cm"].",".$_GET["sd"].",".$_GET["m"].",".$_GET["y"];exit;
 	displayBox(GETPOST("sd", 'alpha'), GETPOST("m", 'int'), GETPOST("y", 'int'));
-}
-else {
+} else {
 	dol_print_error('', 'ErrorBadParameters');
 }
 
@@ -152,8 +150,7 @@ function displayBox($selectedDate, $month, $year)
 	{
 		$selDate = xyzToUnixTimestamp($selectedDate);
 		$xyz = dol_print_date($selDate, "%Y%m%d");
-	}
-	else {
+	} else {
 		$selDate = 0;
 		$xyz = 0;
 	}
@@ -217,8 +214,7 @@ function displayBox($selectedDate, $month, $year)
 				echo "<td>&nbsp;</td>";
 				$cols++;
 			}
-		}
-		else {
+		} else {
 			if ($mydate["wday"] == $startday)
 			{
 				echo "<tr class=\"dpWeek\">";
@@ -251,8 +247,7 @@ function displayBox($selectedDate, $month, $year)
 		if ($thedate == '')
 		{
 			$stoploop = 1;
-		}
-		else {
+		} else {
 			$mydate = dol_getdate($thedate);
 			if ($firstdate["month"] != $mydate["month"]) $stoploop = 1;
 		}
@@ -272,8 +267,7 @@ function displayBox($selectedDate, $month, $year)
 			print $langs->trans("Month".$selectMonth)." ";
 			print sprintf("%02s", $tempDate["mday"]);
 			print ", ".$selectYear;
-		}
-		else {
+		} else {
 			print "Click a Date";
 		}
 		?></td>
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index f37d3a4b69d..2ed52b2f01c 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -120,8 +120,7 @@ abstract class DoliDB implements Database
 				dol_syslog('', 0, 1);
 			}
 			return $ret;
-		}
-		else {
+		} else {
 			$this->transaction_opened++;
 			dol_syslog('', 0, 1);
 			return 1;
@@ -145,12 +144,10 @@ abstract class DoliDB implements Database
 				$this->transaction_opened = 0;
 				dol_syslog("COMMIT Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
 				return 1;
-			}
-			else {
+			} else {
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->transaction_opened--;
 			return 1;
 		}
@@ -171,8 +168,7 @@ abstract class DoliDB implements Database
 			$this->transaction_opened = 0;
 			dol_syslog("ROLLBACK Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
 			return $ret;
-		}
-		else {
+		} else {
 			$this->transaction_opened--;
 			return 1;
 		}
@@ -248,8 +244,7 @@ abstract class DoliDB implements Database
 				$i++;
 			}
 			return $return;
-		}
-		else {
+		} else {
 			return '';
 		}
 	}
diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php
index e5bd6c22e36..4201e5cf86f 100644
--- a/htdocs/core/db/mssql.class.php
+++ b/htdocs/core/db/mssql.class.php
@@ -90,8 +90,7 @@ class DoliDBMssql extends DoliDB
 			// (La base Dolibarr a ete forcee en this->forcecharset a l'install)
 			$this->connected = true;
 			$this->ok = true;
-		}
-		else {
+		} else {
 			// host, login ou password incorrect
 			$this->connected = false;
 			$this->ok = false;
@@ -107,16 +106,14 @@ class DoliDBMssql extends DoliDB
 				$this->database_selected = true;
 				$this->database_name = $name;
 				$this->ok = true;
-			}
-			else {
+			} else {
 				$this->database_selected = false;
 				$this->database_name = '';
 				$this->ok = false;
 				$this->error = $this->error();
 				dol_syslog(get_class($this)."::DoliDBMssql : Erreur Select_db ".$this->error, LOG_ERR);
 			}
-		}
-		else {
+		} else {
 			// Pas de selection de base demandee, ok ou ko
 			$this->database_selected = false;
 		}
@@ -195,8 +192,7 @@ class DoliDBMssql extends DoliDB
 		{
             $version = $this->fetch_array($resql);
             return $version['computed'];
-		}
-		else return '';
+		} else return '';
 	}
 
 	/**
@@ -246,8 +242,7 @@ class DoliDBMssql extends DoliDB
 				dol_syslog("BEGIN Transaction", LOG_DEBUG);
 			}
 			return $ret;
-		}
-		else {
+		} else {
 			return true;
 		}
 	}
@@ -271,12 +266,10 @@ class DoliDBMssql extends DoliDB
 			{
 				dol_syslog("COMMIT Transaction", LOG_DEBUG);
 				return true;
-			}
-			else {
+			} else {
 				return false;
 			}
-		}
-		elseif ($this->transaction_opened > 1)
+		} elseif ($this->transaction_opened > 1)
 		{
 			return true;
 		}
@@ -300,8 +293,7 @@ class DoliDBMssql extends DoliDB
 			$ret = mssql_query("ROLLBACK TRANSACTION", $this->db);
 			dol_syslog("ROLLBACK Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
 			return $ret;
-		}
-		elseif ($this->transaction_opened > 1)
+		} elseif ($this->transaction_opened > 1)
 		{
 			return true;
 		}
@@ -362,8 +354,7 @@ class DoliDBMssql extends DoliDB
                     if (!empty($query_comp))
                         $query .= " WHERE ".implode(" AND ", $query_comp);
                 }
-    		}
-    		else {
+    		} else {
                 if (preg_match('/ALTER TABLE\h+(\w+?)\h+ADD\h+PRIMARY\h+KEY\h+(\w+?)\h*\((.+)\)/is', $query, $matches))
                 {
                     $original_query = $query;
@@ -425,8 +416,7 @@ class DoliDBMssql extends DoliDB
 		{
 			// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
 			$ret = mssql_query($query, $this->db);
-		}
-		else {
+		} else {
 			$ret = mssql_query($query, $this->db);
 		}
 
@@ -590,8 +580,7 @@ class DoliDBMssql extends DoliDB
 		{
 			// Si il y a eu echec de connexion, $this->db n'est pas valide.
 			return 'DB_ERROR_FAILED_TO_CONNECT';
-		}
-		else {
+		} else {
 			// Constants to convert a MSSql error code to a generic Dolibarr error code
 			$errorcode_map = array(
 			1004 => 'DB_ERROR_CANNOT_CREATE',
@@ -641,8 +630,7 @@ class DoliDBMssql extends DoliDB
 		if (!$this->connected) {
 			// Si il y a eu echec de connexion, $this->db n'est pas valide pour mssql_get_last_message.
 			return 'Not connected. Check setup parameters in conf/conf.php file and your mssql client and server versions';
-		}
-		else {
+		} else {
 			return mssql_get_last_message();
 		}
 	}
@@ -662,8 +650,7 @@ class DoliDBMssql extends DoliDB
 		if ($res && $data = $this->fetch_array($res))
 		{
 			return $data["id"];
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -725,8 +712,7 @@ class DoliDBMssql extends DoliDB
 		{
             $row = $this->fetch_row($resql);
             return $row[0];
-		}
-		else return '?';
+		} else return '?';
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -841,8 +827,7 @@ class DoliDBMssql extends DoliDB
 				if (preg_match("/null/i", $field_desc['default']))
 				$sqlfields[$i]  .= " default ".$field_desc['default'];
 				else $sqlfields[$i]  .= " default '".$field_desc['default']."'";
-			}
-			elseif (preg_match("/^[^\s]/i", $field_desc['null']))
+			} elseif (preg_match("/^[^\s]/i", $field_desc['null']))
 			    $sqlfields[$i] .= " ".$field_desc['null'];
 
 			elseif (preg_match("/^[^\s]/i", $field_desc['extra']))
@@ -997,8 +982,7 @@ class DoliDBMssql extends DoliDB
 		{
 			$this->error = $this->lasterror();
 			return -1;
-		}
-		else return 1;
+		} else return 1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1022,8 +1006,7 @@ class DoliDBMssql extends DoliDB
             if ($this->lasterrno != '15025')
             {
 	            return -1;
-            }
-            else {
+            } else {
             	// If user already exists, we continue to set permissions
             	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
             }
@@ -1034,8 +1017,7 @@ class DoliDBMssql extends DoliDB
         {
             dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
             return -1;
-        }
-        else {
+        } else {
             if ($num)
             {
                 $this->select_db($dolibarr_main_db_name);
@@ -1189,8 +1171,7 @@ class DoliDBMssql extends DoliDB
 	    if (is_array($fields))
 	    {
 	        $where = " IN ('".implode("','", $fields)."')";
-	    }
-	    else {
+	    } else {
 	        $where = "='".$this->escape($fields)."'";
 	    }
 	    $result = array();
@@ -1201,8 +1182,7 @@ class DoliDBMssql extends DoliDB
 	        {
 	            $result[] = $obj;
 	        }
-	    }
-	    else return false;
+	    } else return false;
 
 	    return $result;
 	}
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 5f797b14c07..b98c6444148 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -121,16 +121,14 @@ class DoliDBMysqli extends DoliDB
 
 					if (!preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
 				}
-            }
-            else {
+            } else {
                 $this->database_selected = false;
                 $this->database_name = '';
                 $this->ok = false;
                 $this->error = $this->error();
                 dol_syslog(get_class($this)."::DoliDBMysqli : Select_db error ".$this->error, LOG_ERR);
             }
-        }
-        else {
+        } else {
             // Pas de selection de base demandee, ok ou ko
             $this->database_selected = false;
 
@@ -267,8 +265,7 @@ class DoliDBMysqli extends DoliDB
         {
             // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
             $ret = $this->db->query($query);
-        }
-        else {
+        } else {
             $ret = $this->db->query($query);
         }
 
@@ -338,8 +335,7 @@ class DoliDBMysqli extends DoliDB
         {
             if (!is_object($resultset)) { $resultset = $this->_results; }
             return $resultset->fetch_row();
-        }
-        else {
+        } else {
             // si le curseur est un booleen on retourne la valeur 0
             return 0;
         }
@@ -466,8 +462,7 @@ class DoliDBMysqli extends DoliDB
         if (!$this->connected) {
             // Si il y a eu echec de connexion, $this->db n'est pas valide pour mysqli_error.
             return 'Not connected. Check setup parameters in conf/conf.php file and your mysql client and server versions';
-        }
-        else {
+        } else {
             return $this->db->error;
         }
     }
@@ -512,8 +507,7 @@ class DoliDBMysqli extends DoliDB
             if ($cryptType == 2)
             {
                 $return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            }
-            elseif ($cryptType == 1)
+            } elseif ($cryptType == 1)
             {
                 $return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
             }
@@ -545,8 +539,7 @@ class DoliDBMysqli extends DoliDB
             if ($cryptType == 2)
             {
                 $return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            }
-            elseif ($cryptType == 1)
+            } elseif ($cryptType == 1)
             {
                 $return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
             }
@@ -570,8 +563,7 @@ class DoliDBMysqli extends DoliDB
         {
             $row = $this->fetch_row($resql);
             return $row[0];
-        }
-        else return '?';
+        } else return '?';
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -699,8 +691,7 @@ class DoliDBMysqli extends DoliDB
 			{
 				if ((preg_match("/null/i", $field_desc['default'])) || (preg_match("/CURRENT_TIMESTAMP/i", $field_desc['default']))) {
 					$sqlfields[$i]  .= " default ".$field_desc['default'];
-				}
-				else {
+				} else {
 					$sqlfields[$i]  .= " default '".$field_desc['default']."'";
 				}
 			}
@@ -856,8 +847,7 @@ class DoliDBMysqli extends DoliDB
         	{
         		$sqlbis = "UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
         		$this->query($sqlbis);
-        	}
-        	elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
+        	} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
         	{
         		$sqlbis = "UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
         		$this->query($sqlbis);
@@ -920,8 +910,7 @@ class DoliDBMysqli extends DoliDB
             if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
             {
             	return -1;
-            }
-            else {
+            } else {
             	// If user already exists, we continue to set permissions
             	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
             }
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index f2378bcb998..8eeaa7f335b 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -104,8 +104,7 @@ class DoliDBPgsql extends DoliDB
 		{
 			$this->connected = true;
 			$this->ok = true;
-		}
-		else {
+		} else {
 			// host, login ou password incorrect
 			$this->connected = false;
 			$this->ok = false;
@@ -121,16 +120,14 @@ class DoliDBPgsql extends DoliDB
 				$this->database_selected = true;
 				$this->database_name = $name;
 				$this->ok = true;
-			}
-			else {
+			} else {
 				$this->database_selected = false;
 				$this->database_name = '';
 				$this->ok = false;
 				$this->error = $this->error();
 				dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Select_db ".$this->error, LOG_ERR);
 			}
-		}
-		else {
+		} else {
 			// Pas de selection de base demandee, ok ou ko
 			$this->database_selected = false;
 		}
@@ -515,8 +512,7 @@ class DoliDBPgsql extends DoliDB
 				{
 					$query = preg_replace('/([^\'])([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9])/', '\\1\'\\2\'', $query);
 					dol_syslog("Warning: Bad formed request converted into ".$query, LOG_WARNING);
-				}
-				else $loop = false;
+				} else $loop = false;
 			}
 		}
 
@@ -719,8 +715,7 @@ class DoliDBPgsql extends DoliDB
 		if (!$this->connected) {
 			// Si il y a eu echec de connexion, $this->db n'est pas valide.
 			return 'DB_ERROR_FAILED_TO_CONNECT';
-		}
-		else {
+		} else {
 			// Constants to convert error code to a generic Dolibarr error code
 			$errorcode_map = array(
 			1004 => 'DB_ERROR_CANNOT_CREATE',
@@ -996,8 +991,7 @@ class DoliDBPgsql extends DoliDB
 				if (preg_match("/null/i", $field_desc['default']))
 				    $sqlfields[$i] .= " default ".$field_desc['default'];
 				else $sqlfields[$i] .= " default '".$field_desc['default']."'";
-			}
-			elseif (preg_match("/^[^\s]/i", $field_desc['null']))
+			} elseif (preg_match("/^[^\s]/i", $field_desc['null']))
 			    $sqlfields[$i]  .= " ".$field_desc['null'];
 
 			elseif (preg_match("/^[^\s]/i", $field_desc['extra']))
@@ -1172,8 +1166,7 @@ class DoliDBPgsql extends DoliDB
         	{
         		$sqlbis = "UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
         		$this->query($sqlbis);
-        	}
-        	elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
+        	} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
         	{
         		$sqlbis = "UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
         		$this->query($sqlbis);
@@ -1225,8 +1218,7 @@ class DoliDBPgsql extends DoliDB
 		{
             $liste = $this->fetch_array($resql);
 		    return $liste['server_encoding'];
-		}
-		else return '';
+		} else return '';
 	}
 
 	/**
@@ -1266,8 +1258,7 @@ class DoliDBPgsql extends DoliDB
 		{
 		    $liste = $this->fetch_array($resql);
 			return $liste['lc_collate'];
-		}
-		else return '';
+		} else return '';
 	}
 
 	/**
@@ -1306,8 +1297,7 @@ class DoliDBPgsql extends DoliDB
 		if (file_exists('/usr/bin/pg_dump'))
 		{
 		    $fullpathofdump = '/usr/bin/pg_dump';
-		}
-		else {
+		} else {
             // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
 		    $resql = $this->query('SHOW data_directory');
     		if ($resql)
@@ -1336,8 +1326,7 @@ class DoliDBPgsql extends DoliDB
         if (file_exists('/usr/bin/'.$tool))
         {
             $fullpathofdump = '/usr/bin/'.$tool;
-        }
-        else {
+        } else {
             // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
             $resql = $this->query('SHOW data_directory');
             if ($resql)
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index e5c9ef6b751..a1a4e10ec7e 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -111,8 +111,7 @@ class DoliDBSqlite3 extends DoliDB
             $this->addCustomFunction('WEEKDAY');
             $this->addCustomFunction('date_format');
             //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        }
-        else {
+        } else {
             // host, login ou password incorrect
             $this->connected = false;
             $this->ok = false;
@@ -338,8 +337,7 @@ class DoliDBSqlite3 extends DoliDB
             //$this->db = new PDO("sqlite:".$dir.'/database_'.$name.'.sdb');
 			$this->db = new SQLite3($database_name);
             //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $this->error = self::LABEL.' '.$e->getMessage().' current dir='.$database_name;
             return '';
@@ -466,8 +464,7 @@ class DoliDBSqlite3 extends DoliDB
             if ($ret) {
                 $ret->queryString = $query;
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $this->error = $this->db->lastErrorMsg();
         }
@@ -552,8 +549,7 @@ class DoliDBSqlite3 extends DoliDB
         {
             if (!is_object($resultset)) { $resultset = $this->_results; }
             return $resultset->fetchArray(SQLITE3_NUM);
-        }
-        else {
+        } else {
             // si le curseur est un booleen on retourne la valeur 0
             return false;
         }
@@ -639,8 +635,7 @@ class DoliDBSqlite3 extends DoliDB
         if (!$this->connected) {
             // Si il y a eu echec de connexion, $this->db n'est pas valide.
             return 'DB_ERROR_FAILED_TO_CONNECT';
-        }
-        else {
+        } else {
             // Constants to convert error code to a generic Dolibarr error code
             /*$errorcode_map = array(
             1004 => 'DB_ERROR_CANNOT_CREATE',
@@ -704,8 +699,7 @@ class DoliDBSqlite3 extends DoliDB
         if (!$this->connected) {
             // Si il y a eu echec de connexion, $this->db n'est pas valide pour sqlite_error.
             return 'Not connected. Check setup parameters in conf/conf.php file and your sqlite version';
-        }
-        else {
+        } else {
             return $this->error;
         }
     }
@@ -749,8 +743,7 @@ class DoliDBSqlite3 extends DoliDB
             if ($cryptType == 2)
             {
                 $return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            }
-            elseif ($cryptType == 1)
+            } elseif ($cryptType == 1)
             {
                 $return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
             }
@@ -782,8 +775,7 @@ class DoliDBSqlite3 extends DoliDB
             if ($cryptType == 2)
             {
                 $return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            }
-            elseif ($cryptType == 1)
+            } elseif ($cryptType == 1)
             {
                 $return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
             }
@@ -930,8 +922,7 @@ class DoliDBSqlite3 extends DoliDB
                 if (preg_match("/null/i", $field_desc['default']))
                     $sqlfields[$i] .= " default ".$field_desc['default'];
                 else $sqlfields[$i] .= " default '".$field_desc['default']."'";
-            }
-            elseif (preg_match("/^[^\s]/i", $field_desc['null']))
+            } elseif (preg_match("/^[^\s]/i", $field_desc['null']))
                 $sqlfields[$i] .= " ".$field_desc['null'];
 
             elseif (preg_match("/^[^\s]/i", $field_desc['extra']))
@@ -1275,8 +1266,7 @@ class DoliDBSqlite3 extends DoliDB
                 $obj = $this->fetch_row($resql);
                 //dol_syslog(get_class($this)."::select_db getServerParametersValues $var=". print_r($obj, true), LOG_DEBUG);
                 $result[$var] = $obj[0];
-            }
-            else {
+            } else {
                 // TODO Récupérer le message
                 $result[$var] = 'FAIL';
             }
@@ -1349,12 +1339,11 @@ class DoliDBSqlite3 extends DoliDB
         if ($y == 0 && $month == 0) return 0;
         $num = (365 * $y + 31 * ($month - 1) + $day);
         if ($month <= 2) {
-            $y--; }
-        else {
+            $y--; } else {
             $num -= floor(($month * 4 + 23) / 10);
-        }
-        $temp = floor(($y / 100 + 1) * 3 / 4);
-        return $num + floor($y / 4) - $temp;
+			}
+			$temp = floor(($y / 100 + 1) * 3 / 4);
+			return $num + floor($y / 4) - $temp;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/core/filemanagerdol/connectors/php/basexml.php b/htdocs/core/filemanagerdol/connectors/php/basexml.php
index 22eae8093d4..80973006886 100644
--- a/htdocs/core/filemanagerdol/connectors/php/basexml.php
+++ b/htdocs/core/filemanagerdol/connectors/php/basexml.php
@@ -97,8 +97,7 @@ function SendError($number, $text)
 	{
 		SendErrorNode($number, $text);
 		CreateXmlFooter();
-	}
-	else {
+	} else {
 		SetXmlHeaders();
 
 		dol_syslog('Error: '.$number.' '.$text, LOG_ERR);
diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php
index 01a4caf9420..5590879f8e6 100644
--- a/htdocs/core/filemanagerdol/connectors/php/commands.php
+++ b/htdocs/core/filemanagerdol/connectors/php/commands.php
@@ -169,11 +169,9 @@ function CreateFolder($resourceType, $currentFolder)
 						$sErrorNumber = '110';
 						break;
 				}
-			}
-			else $sErrorNumber = '103';
+			} else $sErrorNumber = '103';
 		}
-	}
-	else $sErrorNumber = '102';
+	} else $sErrorNumber = '102';
 
 	// Create the "Error" node.
 	echo '<Error number="'.$sErrorNumber.'" />';
@@ -250,8 +248,7 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 					$iCounter++;
 					$sFileName = RemoveExtension($sOriginalFileName).'('.$iCounter.').'.$sExtension;
 					$sErrorNumber = '201';
-				}
-				else {
+				} else {
 					move_uploaded_file($oFile['tmp_name'], $sFilePath);
 
 					if (is_file($sFilePath))
@@ -284,17 +281,14 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 				{
 					@unlink($sFilePath);
 					$sErrorNumber = '202';
-				}
-				elseif (isset($detectHtml) && $detectHtml === -1 && DetectHtml($sFilePath) === true)
+				} elseif (isset($detectHtml) && $detectHtml === -1 && DetectHtml($sFilePath) === true)
 				{
 					@unlink($sFilePath);
 					$sErrorNumber = '202';
 				}
 			}
-		}
-		else $sErrorNumber = '202';
-	}
-	else $sErrorNumber = '202';
+		} else $sErrorNumber = '202';
+	} else $sErrorNumber = '202';
 
 
 	$sFileUrl = CombinePaths(GetResourceTypePath($resourceType, $sCommand), $currentFolder);
@@ -307,8 +301,7 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
     {
         // this line already exists so wrap the if block around it
         SendUploadResults($sErrorNumber, $sFileUrl, $sFileName);
-    }
-    else {
+    } else {
 	    //issue the CKEditor Callback
         SendCKEditorResults(
 			$CKEcallback,
diff --git a/htdocs/core/filemanagerdol/connectors/php/io.php b/htdocs/core/filemanagerdol/connectors/php/io.php
index 2da8b4d5baa..2438882604e 100644
--- a/htdocs/core/filemanagerdol/connectors/php/io.php
+++ b/htdocs/core/filemanagerdol/connectors/php/io.php
@@ -66,8 +66,7 @@ function GetResourceTypeDirectory($resourceType, $sCommand)
 
 		// Map the "UserFiles" path to a local directory.
 		return Server_MapPath($Config['QuickUploadPath'][$resourceType]);
-	}
-	else {
+	} else {
 		if (strlen($Config['FileTypesAbsolutePath'][$resourceType]) > 0)
 			return $Config['FileTypesAbsolutePath'][$resourceType];
 
@@ -176,8 +175,7 @@ function CreateServerFolder($folderPath, $lastFolder = null)
 		if (isset($Config['ChmodOnFolderCreate']) && !$Config['ChmodOnFolderCreate'])
 		{
 			mkdir($folderPath);
-		}
-		else {
+		} else {
 			$permissions = '0777';
 			if (isset($Config['ChmodOnFolderCreate']) && $Config['ChmodOnFolderCreate'])
 			{
@@ -199,8 +197,7 @@ function CreateServerFolder($folderPath, $lastFolder = null)
 		ini_restore('error_reporting');
 
 		return $sErrorMsg;
-	}
-	else return '';
+	} else return '';
 }
 
 /**
diff --git a/htdocs/core/filemanagerdol/connectors/php/util.php b/htdocs/core/filemanagerdol/connectors/php/util.php
index 5af89333a48..b8caad99ee3 100644
--- a/htdocs/core/filemanagerdol/connectors/php/util.php
+++ b/htdocs/core/filemanagerdol/connectors/php/util.php
@@ -81,16 +81,14 @@ function ConvertToXmlAttribute($value)
 	if (defined('PHP_OS'))
 	{
 		$os = PHP_OS;
-	}
-	else {
+	} else {
 		$os = php_uname();
 	}
 
 	if (strtoupper(substr($os, 0, 3)) === 'WIN' || FindBadUtf8($value))
 	{
 		return (utf8_encode(htmlspecialchars($value)));
-	}
-	else {
+	} else {
 		return (htmlspecialchars($value));
 	}
 }
diff --git a/htdocs/core/get_info.php b/htdocs/core/get_info.php
index 969de383da0..48b957b9e8a 100644
--- a/htdocs/core/get_info.php
+++ b/htdocs/core/get_info.php
@@ -70,10 +70,8 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE))
 	if (preg_match('/\d\.\d/', $appli))
 	{
 		if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-	}
-	else $appli .= " ".DOL_VERSION;
-}
-else $appli .= " ".DOL_VERSION;
+	} else $appli .= " ".DOL_VERSION;
+} else $appli .= " ".DOL_VERSION;
 
 if (!empty($conf->global->MAIN_FEATURES_LEVEL)) $appli .= "<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
 
@@ -89,8 +87,7 @@ if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 		//$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
 		$logouttext .= '<span class="fa fa-sign-out atoplogin"></span>';
 		$logouttext .= '</a>';
-	}
-	else {
+	} else {
 		$logouthtmltext .= $langs->trans("NoLogoutProcessWithAuthMode", $_SESSION["dol_authmode"]);
 		$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
 	}
@@ -118,8 +115,7 @@ if (is_numeric($result))
 {
 	if (empty($result)) $toprightmenu .= $hookmanager->resPrint; // add
 	else $toprightmenu = $hookmanager->resPrint; // replace
-}
-else $toprightmenu .= $result; // For backward compatibility
+} else $toprightmenu .= $result; // For backward compatibility
 
 // Link to module builder
 if (!empty($conf->modulebuilder->enabled))
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index 6a034377ce7..78a96484751 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -177,8 +177,7 @@ $(document).ready(function(){
 if (empty($user->socid))	// If internal user or not defined
 {
 	$conf->standard_menu = (empty($conf->global->MAIN_MENU_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENU_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENU_STANDARD) : $conf->global->MAIN_MENU_STANDARD_FORCED);
-}
-else // If external user
+} else // If external user
 {
 	$conf->standard_menu = (empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENUFRONT_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENUFRONT_STANDARD) : $conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
 }
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index d86f823f4c9..47f01d649cf 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -185,8 +185,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 			                {
 			                	$qualified = 0;
 			                }
-            			}
-            			else // This is a test on a constant. For example when we have -- VMYSQLUTF8UNICODE, we test constant $conf->global->UTF8UNICODE
+            			} else // This is a test on a constant. For example when we have -- VMYSQLUTF8UNICODE, we test constant $conf->global->UTF8UNICODE
             			{
             				$dbcollation = strtoupper(preg_replace('/_/', '', $conf->db->dolibarr_main_db_collation));
             				//var_dump($reg[2]);
@@ -225,8 +224,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 
         if ($buffer) $arraysql[$i] = $buffer;
         fclose($fp);
-    }
-    else {
+    } else {
         dol_syslog("Admin.lib::run_sql failed to open file ".$sqlfile, LOG_ERR);
     }
 
@@ -250,8 +248,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
                     $obj = $db->fetch_object($resql);
                     $listofmaxrowid[$table] = $obj->max;
                     if (empty($listofmaxrowid[$table])) $listofmaxrowid[$table] = 0;
-                }
-                else {
+                } else {
                     if (!$silent) print '<tr><td class="tdtop" colspan="2">';
                     if (!$silent) print '<div class="error">'.$langs->trans("Failed to get max rowid for ".$table)."</div></td>";
                     if (!$silent) print '</tr>';
@@ -367,8 +364,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
                     dol_syslog('Admin.lib::run_sql Insert nb '.$cursorinsert.', done in table '.$table.', rowid is '.$listofinsertedrowid[$cursorinsert], LOG_DEBUG);
                 }
                 // 	          print '<td class="right">OK</td>';
-            }
-            else {
+            } else {
                 $errno = $db->errno();
                 if (!$silent) print '<!-- Result = '.$errno.' -->'."\n";
 
@@ -410,8 +406,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
         if (!$silent) print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
         if (!$silent) print '<td class="right">'.$langs->trans("OK").'</td></tr>'."\n";
         $ok = 1;
-    }
-    else {
+    } else {
         if (!$silent) print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
         if (!$silent) print '<td class="right"><font class="error">'.$langs->trans("KO").'</font></td></tr>'."\n";
         $ok = 0;
@@ -453,8 +448,7 @@ function dolibarr_del_const($db, $name, $entity = 1)
     {
         $conf->global->$name = '';
         return 1;
-    }
-    else {
+    } else {
         dol_print_error($db);
         return -1;
     }
@@ -549,8 +543,7 @@ function dolibarr_set_const($db, $name, $value, $type = 'chaine', $visible = 0,
         $db->commit();
         $conf->global->$name = $value;
         return 1;
-    }
-    else {
+    } else {
         $error = $db->lasterror();
         $db->rollback();
         return -1;
@@ -652,8 +645,7 @@ function security_prepare_head()
     {
     	$obj = $db->fetch_object($resql);
     	if ($obj) $nbPerms = $obj->nb;
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
 
     $head[$h][0] = DOL_URL_ROOT."/admin/perms.php";
     $head[$h][1] = $langs->trans("DefaultRights");
@@ -964,8 +956,7 @@ function activateModule($value, $withdeps = 1)
     if ($result <= 0)
     {
         $ret['errors'][] = $objMod->error;
-    }
-    else {
+    } else {
         if ($withdeps)
         {
             if (isset($objMod->depends) && is_array($objMod->depends) && !empty($objMod->depends))
@@ -1001,8 +992,7 @@ function activateModule($value, $withdeps = 1)
     				{
     				    $ret['nbmodules'] += $resarray['nbmodules'];
     				    $ret['nbperms'] += $resarray['nbperms'];
-    				}
-    				else {
+    				} else {
     				    $ret['errors'][] = $langs->trans('activateModuleDependNotSatisfied', $objMod->name, $modulestring);
     				}
                 }
@@ -1073,8 +1063,7 @@ function unActivateModule($value, $requiredby = 1)
         $objMod = new $modName($db);
         $result = $objMod->remove();
         if ($result <= 0) $ret = $objMod->error;
-    }
-    else // We come here when we try to unactivate a module when module does not exists anymore in sources
+    } else // We come here when we try to unactivate a module when module does not exists anymore in sources
     {
         //print $dir.$modFile;exit;
     	// TODO Replace this after DolibarrModules is moved as abstract class with a try catch to show module we try to disable has not been found or could not be loaded
@@ -1154,8 +1143,7 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
                         if ($objMod->numero > 0)
                         {
                             $j = $objMod->numero;
-                        }
-                        else {
+                        } else {
                             $j = 1000 + $i;
                         }
 
@@ -1200,22 +1188,19 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
                                 {
                                     print 'Error in descriptor of module '.$const_name.'. Array ->dictionaries has not same number of record for key "tabname", "tablib", "tabsql" and "tabsqlsort"';
                                     //print "$const_name: $nbtabname=$nbtablib=$nbtabsql=$nbtabsqlsort=$nbtabfield=$nbtabfieldvalue=$nbtabfieldinsert=$nbtabrowid=$nbtabcond=$nbtabfieldcheck=$nbtabhelp\n";
-                                }
-                                else {
+                                } else {
                                 	$taborder[] = 0; // Add an empty line
                                 }
                             }
 
                             $j++;
                             $i++;
-                        }
-                        else dol_syslog("Module ".get_class($objMod)." not qualified");
+                        } else dol_syslog("Module ".get_class($objMod)." not qualified");
                     }
                 }
             }
             closedir($handle);
-        }
-        else {
+        } else {
             dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
         }
     }
@@ -1273,14 +1258,12 @@ function activateModulesRequiredByCountry($country_code)
 
 								setEventMessages($objMod->automatic_activation[$country_code], null, 'warnings');
 							}
-						}
-						else dol_syslog("Module ".get_class($objMod)." not qualified");
+						} else dol_syslog("Module ".get_class($objMod)." not qualified");
 					}
 				}
 			}
 			closedir($handle);
-		}
-		else {
+		} else {
 			dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
 		}
 	}
@@ -1335,8 +1318,7 @@ function complete_elementList_with_modules(&$elementList)
                         if ($objMod->numero > 0)
                         {
                             $j = $objMod->numero;
-                        }
-                        else {
+                        } else {
                             $j = 1000 + $i;
                         }
 
@@ -1373,14 +1355,12 @@ function complete_elementList_with_modules(&$elementList)
 
                             $j++;
                             $i++;
-                        }
-                        else dol_syslog("Module ".get_class($objMod)." not qualified");
+                        } else dol_syslog("Module ".get_class($objMod)." not qualified");
                     }
                 }
             }
             closedir($handle);
-        }
-        else {
+        } else {
             dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
         }
     }
@@ -1433,15 +1413,13 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
     	// $const is a const key like 'MYMODULE_ABC'
     	if (is_numeric($key)) {		// Very old behaviour
     		$type = 'string';
-    	}
-    	else {
+    	} else {
     		if (is_array($const))
     		{
     			$type = $const['type'];
 				$label = $const['label'];
     			$const = $key;
-    		}
-    		else {
+    		} else {
     			$type = $const;
     			$const = $key;
     		}
@@ -1532,8 +1510,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
                 print '<input type="hidden" name="consttype" value="yesno">';
                 print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
                 print '</td>';
-            }
-            else {
+            } else {
                 print '<td>';
                 print '<input type="hidden" name="consttype'.(empty($strictw3c) ? '' : '[]').'" value="'.($obj->type ? $obj->type : 'string').'">';
                 print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
@@ -1542,18 +1519,15 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
                     print '<textarea class="flat" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" cols="50" rows="5" wrap="soft">'."\n";
                     print $obj->value;
                     print "</textarea>\n";
-                }
-                elseif ($obj->type == 'html')
+                } elseif ($obj->type == 'html')
                 {
                 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
                 	$doleditor = new DolEditor('constvalue_'.$const.(empty($strictw3c) ? '' : '[]'), $obj->value, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
                 	$doleditor->Create();
-                }
-                elseif ($obj->type == 'yesno')
+                } elseif ($obj->type == 'yesno')
                 {
                 	print $form->selectyesno('constvalue'.(empty($strictw3c) ? '' : '[]'), $obj->value, 1);
-                }
-                elseif (preg_match('/emailtemplate/', $obj->type))
+                } elseif (preg_match('/emailtemplate/', $obj->type))
                 {
                 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
                 	$formmail = new FormMail($db);
@@ -1577,8 +1551,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
                 	//var_dump($arraydefaultmessage);
                 	//var_dump($arrayofmessagename);
                 	print $form->selectarray('constvalue_'.$obj->name, $arrayofmessagename, $obj->value.':'.$tmp[1], 'None', 0, 0, '', 0, 0, 0, '', '', 1);
-                }
-                else // type = 'string' ou 'chaine'
+                } else // type = 'string' ou 'chaine'
                 {
                     print '<input type="text" class="flat" size="48" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" value="'.dol_escape_htmltag($obj->value).'">';
                 }
@@ -1667,8 +1640,7 @@ function addDocumentModel($name, $type, $label = '', $description = '')
 	{
 		$db->commit();
 		return 1;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 		return -1;
@@ -1699,8 +1671,7 @@ function delDocumentModel($name, $type)
 	{
 		$db->commit();
 		return 1;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 		return -1;
@@ -1729,8 +1700,7 @@ function phpinfo_array()
 		if (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val))
 		{
 			$info_arr[trim($cat)][trim($val[1])] = $val[2];
-		}
-		elseif (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val))
+		} elseif (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val))
 		{
 			$info_arr[trim($cat)][trim($val[1])] = array("local" => $val[2], "master" => $val[3]);
 		}
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 6070264d487..77a8ba8ea5b 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -304,8 +304,7 @@ function show_array_actions_to_do($max = 5)
 	    print "</table></div><br>";
 
 	    $db->free($resql);
-	}
-	else {
+	} else {
 	    dol_print_error($db);
 	}
 }
@@ -392,8 +391,7 @@ function show_array_last_actions_done($max = 5)
 		print "</table></div><br>";
 
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index e917f99defb..8e782c3a7fd 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -494,8 +494,7 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 	{
 		if (empty($conf->global->$code)) print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		else print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
-	}
-	else {
+	} else {
 		$out = "\n<!-- Ajax code to switch constant ".$code." -->".'
 		<script>
 			$(document).ready(function() {
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index b781051a442..da712d960cd 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -127,14 +127,12 @@ function barcode_encode($code, $encoding)
         /* use built-in EAN-Encoder */
         dol_syslog("barcode.lib.php::barcode_encode Use barcode_encode_ean");
         $bars = barcode_encode_ean($code, $encoding);
-    }
-    elseif (file_exists($genbarcode_loc))	// For example C39
+    } elseif (file_exists($genbarcode_loc))	// For example C39
     {
         /* use genbarcode */
         dol_syslog("barcode.lib.php::barcode_encode Use genbarcode ".$genbarcode_loc." code=".$code." encoding=".$encoding);
         $bars = barcode_encode_genbarcode($code, $encoding);
-    }
-    else {
+    } else {
         print "barcode_encode needs an external programm for encodings other then EAN/ISBN (code=".$code.", encoding=".$encoding.")<BR>\n";
         print "<UL>\n";
         print "<LI>download gnu-barcode from <A href=\"https://www.gnu.org/software/barcode/\">www.gnu.org/software/barcode/</A>\n";
@@ -262,8 +260,7 @@ function barcode_encode_genbarcode($code, $encoding)
         $text = fgets($fp, 1024);
         $encoding = fgets($fp, 1024);
         pclose($fp);
-    }
-    else {
+    } else {
         dol_syslog("barcode.lib.php::barcode_encode_genbarcode failed to run popen ".$fullcommandclear, LOG_ERR);
         return false;
     }
@@ -394,17 +391,14 @@ function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0,
     {
         header("Content-Type: image/jpeg; name=\"barcode.jpg\"");
         imagejpeg($im);
-    }
-    elseif ($mode == 'gif')
+    } elseif ($mode == 'gif')
     {
         header("Content-Type: image/gif; name=\"barcode.gif\"");
         imagegif($im);
-    }
-    elseif (!empty($filebarcode))    // To wxrite into  afile onto disk
+    } elseif (!empty($filebarcode))    // To wxrite into  afile onto disk
     {
         imagepng($im, $filebarcode);
-    }
-    else {
+    } else {
         header("Content-Type: image/png; name=\"barcode.png\"");
         imagepng($im);
     }
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 50b6d6683be..9449edec696 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -73,8 +73,7 @@ function societe_prepare_head(Societe $object)
 		    $head[$h][2] = 'contact';
 		    $h++;
 		}
-    }
-    else {
+    } else {
 		$head[$h][0] = DOL_URL_ROOT.'/societe/societecontact.php?socid='.$object->id;
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][1] = $langs->trans("ContactsAddresses");
@@ -133,8 +132,7 @@ function societe_prepare_head(Societe $object)
     			$nbNote = $obj->nb;
     			$i++;
     		}
-    	}
-    	else {
+    	} else {
     		dol_print_error($db);
     	}
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
@@ -226,8 +224,7 @@ function societe_prepare_head(Societe $object)
                 $nbBankAccount = $obj->nb;
                 $i++;
             }
-        }
-        else {
+        } else {
             dol_print_error($db);
         }
 
@@ -260,8 +257,7 @@ function societe_prepare_head(Societe $object)
     			$nbNote = $obj->nb;
     			$i++;
     		}
-    	}
-    	else {
+    	} else {
     		dol_print_error($db);
     	}
     	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
@@ -295,8 +291,7 @@ function societe_prepare_head(Societe $object)
         			$nbNote = $obj->nb;
         			$i++;
         		}
-        	}
-        	else {
+        	} else {
         		dol_print_error($db);
         	}
 
@@ -473,14 +468,12 @@ function getCountry($searchkey, $withcode = '', $dbtouse = 0, $outputlangs = '',
             elseif ($withcode == 3) $result = $obj->rowid;
             elseif ($withcode === 'all') $result = array('id'=>$obj->rowid, 'code'=>$obj->code, 'label'=>$label);
             else $result = $label;
-        }
-        else {
+        } else {
             $result = 'NotDefined';
         }
         $dbtouse->free($resql);
         return $result;
-    }
-    else dol_print_error($dbtouse, '');
+    } else dol_print_error($dbtouse, '');
     return 'Error';
 }
 
@@ -529,41 +522,32 @@ function getState($id, $withcode = '', $dbtouse = 0, $withregion = 0, $outputlan
             if ($withcode == 1) {
                 if ($withregion == 1) {
                     return $label = $obj->region_name.' - '.$obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
-                }
-                else {
+                } else {
                     return $label = $obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
                 }
-            }
-            elseif ($withcode == 2) {
+            } elseif ($withcode == 2) {
                 if ($withregion == 1) {
                     return $label = $obj->region_name.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
-                }
-                else {
+                } else {
                     return $label = ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
                 }
-            }
-            elseif ($withcode === 'all') {
+            } elseif ($withcode === 'all') {
                 if ($withregion == 1) {
                     return array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$label, 'region_code'=>$obj->region_code, 'region'=>$obj->region_name);
-                }
-                else {
+                } else {
                     return array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$label);
                 }
-            }
-            else {
+            } else {
                 if ($withregion == 1) {
                     return $label = $obj->region_name.' - '.$label;
-                }
-                else {
+                } else {
                     return $label;
                 }
             }
-        }
-        else {
+        } else {
             return $langs->transnoentitiesnoconv("NotDefined");
         }
-    }
-    else dol_print_error($dbtouse, '');
+    } else dol_print_error($dbtouse, '');
 }
 
 /**
@@ -603,8 +587,7 @@ function currency_name($code_iso, $withcode = '', $outputlangs = null)
             $label = ($obj->label != '-' ? $obj->label : '');
             if ($withcode) return ($label == $code_iso) ? "$code_iso" : "$code_iso - $label";
             else return $label;
-        }
-        else {
+        } else {
             return $code_iso;
         }
     }
@@ -637,8 +620,7 @@ function getFormeJuridiqueLabel($code)
             $obj = $db->fetch_object($resql);
             $label = ($obj->libelle != '-' ? $obj->libelle : '');
             return $label;
-        }
-        else {
+        } else {
             return $langs->trans("NotDefined");
         }
     }
@@ -826,13 +808,11 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
                     }
                     $i++;
                 }
-            }
-            else {
+            } else {
             	print '<tr class="oddeven"><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
             }
             $db->free($result);
-        }
-        else {
+        } else {
             dol_print_error($db);
         }
         print "</table>";
@@ -1231,8 +1211,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
             print "</tr>\n";
             $i++;
         }
-    }
-    else {
+    } else {
 		$colspan = 1;
 		foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
 		print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -1318,8 +1297,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
         // Recherche histo sur actioncomm
         if (is_object($objcon) && $objcon->id > 0) {
             $sql = "SELECT DISTINCT a.id, a.label as label,";
-        }
-        else {
+        } else {
             $sql = "SELECT a.id, a.label as label,";
         }
         $sql .= " a.datep as dp,";
@@ -1330,9 +1308,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
         $sql .= " c.code as acode, c.libelle as alabel, c.picto as apicto,";
         $sql .= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname";
         if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')))      $sql .= ", sp.lastname, sp.firstname";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ }
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Project') { /* Nothing */ }
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", m.lastname, m.firstname";
+        elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ } elseif (is_object($filterobj) && get_class($filterobj) == 'Project') { /* Nothing */ } elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", m.lastname, m.firstname";
         elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')  $sql .= ", o.ref";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Product')  $sql .= ", o.ref";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')   $sql .= ", o.ref";
@@ -1357,9 +1333,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
             $sql .= " ON er.resource_type = 'dolresource'";
             $sql .= " AND er.element_id = a.id";
             $sql .= " AND er.resource_id = ".$filterobj->id;
-        }
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Project') { /* Nothing */ }
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m";
+        } elseif (is_object($filterobj) && get_class($filterobj) == 'Project') { /* Nothing */ } elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m";
         elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", ".MAIN_DB_PREFIX."product as o";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", ".MAIN_DB_PREFIX."ticket as o";
@@ -1370,39 +1344,32 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
         $sql .= " WHERE a.entity IN (".getEntity('agenda').")";
         if ($force_filter_contact === false) {
             if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) $sql .= " AND a.fk_soc = ".$filterobj->id;
-            elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) $sql .= " AND a.fk_project = ".$filterobj->id;
+            elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ } elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) $sql .= " AND a.fk_project = ".$filterobj->id;
             elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent')
             {
                 $sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'";
                 if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')
+            } elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')
             {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'";
                 if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'Product')
+            } elseif (is_object($filterobj) && get_class($filterobj) == 'Product')
             {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'";
                 if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')
+            } elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')
             {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'";
                 if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')
+            } elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')
             {
             	$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'";
             	if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')
+            } elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')
             {
             	$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'";
             	if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element)
+            } elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element)
             {
             	$sql .= " AND a.fk_element = o.rowid AND a.elementtype = '".$db->escape($filterobj->element)."'";
             	if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
@@ -1420,8 +1387,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
                     if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'";
                     elseif ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'";
                 }
-            }
-            else {
+            } else {
                 if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
                 elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
                 else $sql .= " AND c.code = '".$db->escape($actioncode)."'";
@@ -1538,8 +1504,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 	            $numaction++;
 	            $i++;
 	        }
-	    }
-	    else {
+	    } else {
 	        dol_print_error($db);
 	    }
     }
@@ -1564,8 +1529,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
             (is_null($filterobj) || get_class($filterobj) == 'Societe'))
         {
             $out .= '<input type="hidden" name="id" value="'.$objcon->id.'" />';
-        }
-        else {
+        } else {
             $out .= '<input type="hidden" name="id" value="'.$filterobj->id.'" />';
         }
         if ($filterobj && get_class($filterobj) == 'Societe') $out .= '<input type="hidden" name="socid" value="'.$filterobj->id.'" />';
@@ -1729,8 +1693,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
             if (isset($histo[$key]['elementtype']) && !empty($histo[$key]['fk_element']))
             {
             	$out .= dolGetElementUrl($histo[$key]['fk_element'], $histo[$key]['elementtype'], 1);
-            }
-            else $out .= '&nbsp;';
+            } else $out .= '&nbsp;';
             $out .= '</td>';
 
             // Contact(s) for action
@@ -1759,8 +1722,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 					}
 				}
 				$out .= '</td>';
-			}
-            else {
+			} else {
             	$out .= '<td>&nbsp;</td>';
             }
 
diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php
index 685403b7651..1779e77213e 100644
--- a/htdocs/core/lib/cron.lib.php
+++ b/htdocs/core/lib/cron.lib.php
@@ -123,8 +123,7 @@ function dol_print_cron_urls()
     		print $langs->trans("CronExplainHowToRunUnix");
     		print '<br>';
     		print '<textarea class="quatrevingtpercent">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
-    	}
-    	else {
+    	} else {
     		print $langs->trans("CronExplainHowToRunWin");
     	}
 	}
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 343aa02e10d..22f99312520 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -94,8 +94,7 @@ function getServerTimeZoneInt($refgmtdate = 'now')
         $localdt = new DateTime($newrefgmtdate, $localtz);
         $tmp = -1 * $localtz->getOffset($localdt);
         //print $refgmtdate.'='.$tmp;
-    }
-    else {
+    } else {
     	$tmp = 0;
     	dol_print_error('', 'PHP version must be 5.3+');
     }
@@ -230,47 +229,37 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
 			{
 				$sTime .= dol_print_date($iSecond, 'hourduration', true);
 			}
-		}
-		elseif ($format == 'allhourminsec')
+		} elseif ($format == 'allhourminsec')
 		{
 		    return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));
-		}
-		elseif ($format == 'allhourmin')
+		} elseif ($format == 'allhourmin')
 		{
 		    return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60)));
-		}
-		elseif ($format == 'allhour')
+		} elseif ($format == 'allhour')
 		{
 			return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600)));
 		}
-	}
-	elseif ($format == 'hour')	// only hour part
+	} elseif ($format == 'hour')	// only hour part
 	{
 		$sTime = dol_print_date($iSecond, '%H', true);
-	}
-	elseif ($format == 'fullhour')
+	} elseif ($format == 'fullhour')
 	{
 		if (!empty($iSecond)) {
 			$iSecond = $iSecond / 3600;
-		}
-		else {
+		} else {
 			$iSecond = 0;
 		}
 		$sTime = $iSecond;
-	}
-	elseif ($format == 'min')	// only min part
+	} elseif ($format == 'min')	// only min part
 	{
 		$sTime = dol_print_date($iSecond, '%M', true);
-	}
-    elseif ($format == 'sec')	// only sec part
+	} elseif ($format == 'sec')	// only sec part
     {
         $sTime = dol_print_date($iSecond, '%S', true);
-    }
-    elseif ($format == 'month')	// only month part
+    } elseif ($format == 'month')	// only month part
     {
         $sTime = dol_print_date($iSecond, '%m', true);
-    }
-    elseif ($format == 'year')	// only year part
+    } elseif ($format == 'year')	// only year part
     {
         $sTime = dol_print_date($iSecond, '%Y', true);
     }
@@ -344,8 +333,7 @@ function dol_stringtotime($string, $gm = 1)
         if ($syear < 50) $syear += 1900;
         if ($syear >= 50 && $syear < 100) $syear += 2000;
         $string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
-    }
-    elseif (
+    } elseif (
     	   preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i', $string, $reg)	// Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)
     	|| preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i', $string, $reg)	// Convert date with format YYYY-MM-DD HH:MM:SS
    		|| preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/i', $string, $reg)		// Convert date with format YYYYMMDDTHHMMSSZ
@@ -409,8 +397,7 @@ function dol_get_prev_month($month, $year)
 	{
 		$prev_month = 12;
 		$prev_year  = $year - 1;
-	}
-	else {
+	} else {
 		$prev_month = $month - 1;
 		$prev_year  = $year;
 	}
@@ -429,8 +416,7 @@ function dol_get_next_month($month, $year)
 	{
 		$next_month = 1;
 		$next_year  = $year + 1;
-	}
-	else {
+	} else {
 		$next_month = $month + 1;
 		$next_year  = $year;
 	}
@@ -504,8 +490,7 @@ function dol_get_last_day($year, $month = 12, $gm = false)
 	{
 		$month = 1;
 		$year += 1;
-	}
-	else {
+	} else {
 		$month += 1;
 	}
 
@@ -558,8 +543,7 @@ function dol_get_first_day_week($day, $month, $year, $gm = false)
     		$prev_month = 12;
     		$prev_year  = $year - 1;
     	}
-    }
-    else {
+    } else {
     	$prev_month = $month;
 		$prev_year = $year;
     }
@@ -641,8 +625,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 				if ($tmp[2])
 				{
 					if ($tmp[0] == $annee && $tmp[1] == $mois && $tmp[2] == $jour) $ferie = true;
-				}
-				else {
+				} else {
 					if ($tmp[0] == $mois && $tmp[1] == $jour) $ferie = true;
 				}
 			}
@@ -667,8 +650,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 				if (!empty($obj->dayrule) && $obj->dayrule != 'date')		// For example 'easter', '...'
 				{
 					$specialdayrule[$obj->dayrule] = $obj->dayrule;
-				}
-				else {
+				} else {
 					$match = 1;
 					if (!empty($obj->year) && $obj->year != $annee) $match = 0;
 					if ($obj->month != $mois) $match = 0;
@@ -679,8 +661,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_syslog($db->lasterror(), LOG_ERR);
 			return 'Error sql '.$db->lasterror();
 		}
@@ -848,8 +829,7 @@ function num_between_day($timestampStart, $timestampEnd, $lastday = 0)
 		if ($lastday == 1)
 		{
 			$bit = 0;
-		}
-		else {
+		} else {
 			$bit = 1;
 		}
 		$nbjours = (int) floor(($timestampEnd - $timestampStart) / (60 * 60 * 24)) + 1 - $bit;
@@ -891,8 +871,7 @@ function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0,
 		$nbOpenDay = ($numdays - $numholidays);
 		if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = ($nbOpenDay * 24);
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
-	}
-	elseif ($timestampStart == $timestampEnd)
+	} elseif ($timestampStart == $timestampEnd)
 	{
 		$numholidays = 0;
 		if ($lastday) {
@@ -904,8 +883,7 @@ function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0,
 
 		if ($inhour == 1) $nbOpenDay = ($nbOpenDay * 24);
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
-	}
-	else {
+	} else {
 		return $langs->trans("Error");
 	}
 }
diff --git a/htdocs/core/lib/doc.lib.php b/htdocs/core/lib/doc.lib.php
index 6761c3668c3..4e9768b2a44 100644
--- a/htdocs/core/lib/doc.lib.php
+++ b/htdocs/core/lib/doc.lib.php
@@ -75,8 +75,7 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
 			$discount->fetch($line->fk_remise_except);
 			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromCreditNote", $sourceref);
-		}
-		elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except)
+		} elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except)
 		{
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
@@ -84,25 +83,21 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromDeposit", $sourceref);
 			// Add date of deposit
 			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
-		}
-		elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except)
+		} elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except)
 		{
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived", $discount->ref_facture_source);
-		}
-		elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except)
+		} elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except)
 		{
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid", $discount->ref_invoice_supplier_source);
-		}
-		else {
+		} else {
 			if ($idprod)
 			{
 				if (empty($hidedesc)) $libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
-			}
-			else {
+			} else {
 				$libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
 			}
 		}
@@ -121,8 +116,7 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
 				if ($prodser->isService())
 				{
 					$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
-				}
-				else {
+				} else {
 					$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." ";
 				}
 			}
diff --git a/htdocs/core/lib/doleditor.lib.php b/htdocs/core/lib/doleditor.lib.php
index 28042a48bf2..ddccb11247e 100644
--- a/htdocs/core/lib/doleditor.lib.php
+++ b/htdocs/core/lib/doleditor.lib.php
@@ -111,8 +111,7 @@ function show_skin($fuser, $edit = 0)
     					if ($subdir == $selected_theme)
     					{
     						print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" checked name="fckeditor_skin" value="'.$subdir.'"> <b>'.$subdir.'</b>';
-    					}
-    					else {
+    					} else {
     						print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" name="fckeditor_skin" value="'.$subdir.'"> '.$subdir;
     					}
 						print '</div>';
diff --git a/htdocs/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php
index b724af345bb..b9da91093bb 100644
--- a/htdocs/core/lib/ecm.lib.php
+++ b/htdocs/core/lib/ecm.lib.php
@@ -84,8 +84,7 @@ function ecm_prepare_head($object, $module = 'ecm', $section = '')
 		$head[$h][1] = $langs->trans("Directory");
 		$head[$h][2] = 'card';
 		$h++;
-	}
-	else {
+	} else {
 		$head[$h][0] = DOL_URL_ROOT.'/ecm/dir_card.php?section='.$section.'&module='.$module;
 		$head[$h][1] = $langs->trans("Directory");
 		$head[$h][2] = 'card';
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 9771eef442b..9e0a83e8c5f 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -118,8 +118,7 @@ function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excl
 				if (is_array($excludefilter))
 				{
 					$excludefilterarray = array_merge($excludefilterarray, $excludefilter);
-				}
-				elseif ($excludefilter) $excludefilterarray[] = $excludefilter;
+				} elseif ($excludefilter) $excludefilterarray[] = $excludefilter;
 				// Check if file is qualified
 				foreach ($excludefilterarray as $filt)
 				{
@@ -167,8 +166,7 @@ function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excl
 								$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename != '' ? $relativename.'/' : '').$file, $donotfollowsymlinks));
 							}
 						}
-					}
-					elseif (!$isdir && (($types == "files") || ($types == "all")))
+					} elseif (!$isdir && (($types == "files") || ($types == "all")))
 					{
 						// Add file into file_list array
 						if ($loaddate || $sortcriteria == 'date') $filedate = dol_filemtime($path."/".$file);
@@ -279,8 +277,7 @@ function dol_dir_list_in_database($path, $filter = "", $excludefilter = null, $s
 		}
 
 		return $file_list;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 		return array();
 	}
@@ -371,12 +368,10 @@ function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
 				if ($result < 0)
 				{
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-				}
-				else {
+				} else {
 					$filearray[$key]['rowid'] = $result;
 				}
-			}
-			else {
+			} else {
 				$filearray[$key]['rowid'] = 0; // Should not happened
 			}
 		}
@@ -400,8 +395,7 @@ function dol_compare_file($a, $b)
 
 	$sortorder = strtoupper($sortorder);
 
-	if ($sortorder == 'ASC') { $retup = -1; $retdown = 1; }
-	else { $retup = 1; $retdown = -1; }
+	if ($sortorder == 'ASC') { $retup = -1; $retdown = 1; } else { $retup = 1; $retdown = -1; }
 
 	if ($sortfield == 'name')
 	{
@@ -509,8 +503,7 @@ function dol_dir_is_emtpy($folder)
 
 		if ($folder_content == "...") return true;
 		else return false;
-	}
-	else return true; // Dir does not exists
+	} else return true; // Dir does not exists
 }
 
 /**
@@ -536,8 +529,7 @@ function dol_count_nb_of_line($file)
 			if (!$line === false) $nb++;
 		}
 		fclose($fp);
-	}
-	else {
+	} else {
 		$nb = -1;
 	}
 
@@ -620,8 +612,7 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile = '', $newmask
 	if (empty($arrayreplacementisregex))
 	{
 		$content = make_substitutions($content, $arrayreplacement, null);
-	}
-	else {
+	} else {
 		foreach ($arrayreplacement as $key => $value)
 		{
 			$content = preg_replace($key, $value, $content);
@@ -767,8 +758,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 						//var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
 						$tmpresult = dolCopyDir($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists, $arrayreplacement, $excludesubdir);
 					}
-				}
-				else {
+				} else {
 					$newfile = $file;
 					// Replace destination filename with a new one
 					if (is_array($arrayreplacement))
@@ -784,16 +774,14 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 				if ($result > 0 && $tmpresult >= 0)
 				{
 					// Do nothing, so we don't set result to 0 if tmpresult is 0 and result was success in a previous pass
-				}
-				else {
+				} else {
 					$result = $tmpresult;
 				}
 				if ($result < 0) break;
 			}
 		}
 		closedir($dir_handle);
-	}
-	else {
+	} else {
 		// Source directory does not exists
 		$result = -2;
 	}
@@ -859,8 +847,7 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 				// We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
 				dol_delete_file($destfile);
 				$result = @rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
-			}
-			else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
+			} else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
 		}
 
 		// Move ok
@@ -897,8 +884,7 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 					$ecmfile->filepath = $rel_dir;
 					$ecmfile->filename = $filename;
 					$resultecm = $ecmfile->update($user);
-				}
-				elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
+				} elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
 				{
 					$filename = basename($rel_filetorenameafter);
 					$rel_dir = dirname($rel_filetorenameafter);
@@ -917,8 +903,7 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 					{
 						setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 					}
-				}
-				elseif ($resultecm < 0)
+				} elseif ($resultecm < 0)
 				{
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 				}
@@ -1082,8 +1067,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 		$errmsg = join(',', $hookmanager->errors);
 		if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks'; // Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
 		return $errmsg;
-	}
-	elseif (empty($reshook))
+	} elseif (empty($reshook))
 	{
 		// The file functions must be in OS filesystem encoding.
 		$src_file_osencoded = dol_osencode($src_file);
@@ -1113,8 +1097,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 			if (!empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
 			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);
 			return 1; // Success
-		}
-		else {
+		} else {
 			dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR);
 			return -3; // Unknown error
 		}
@@ -1172,8 +1155,7 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 	{
 		if ($reshook < 0) return false;
 		return true;
-	}
-	else {
+	} else {
 		$error = 0;
 
 		//print "x".$file." ".$disableglob;exit;
@@ -1216,17 +1198,14 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 								}
 							}
 						}
-					}
-					else {
+					} else {
 						dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
 						// TODO Failure to remove can be because file was already removed or because of permission
 						// If error because it does not exists, we should return true, and we should return false if this is a permission problem
 					}
 				}
-			}
-			else dol_syslog("No files to delete found", LOG_DEBUG);
-		}
-		else {
+			} else dol_syslog("No files to delete found", LOG_DEBUG);
+		} else {
 			$ok = false;
 			if ($nophperrors) $ok = @unlink($file_osencoded);
 			else $ok = unlink($file_osencoded);
@@ -1288,8 +1267,7 @@ function dol_delete_dir_recursive($dir, $count = 0, $nophperrors = 0, $onlysub =
 					if (is_dir(dol_osencode("$dir/$item")) && !is_link(dol_osencode("$dir/$item")))
 					{
 						$count = dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
-					}
-					else {
+					} else {
 						$result = dol_delete_file("$dir/$item", 1, $nophperrors);
 						$count++;
 						if ($result) $countdeleted++;
@@ -1369,8 +1347,7 @@ function dol_delete_preview($object)
 			$object->error = $langs->trans("ErrorFailedToDeleteFile", $filepreviewold);
 			return 0;
 		}
-	}
-	else {
+	} else {
 		$multiple = $filepreviewold.".";
 		for ($i = 0; $i < 20; $i++)
 		{
@@ -1458,8 +1435,7 @@ function dol_meta_create($object)
 			@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 			return 1;
-	}
-	else {
+	} else {
 		dol_syslog('FailedToDetectDirInDolMetaCreateFor'.$object->element, LOG_WARNING);
 	}
 
@@ -1602,26 +1578,22 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 						{
 							if ($allowoverwrite) {
 								// Do not show error message. We can have an error due to DB_ERROR_RECORD_ALREADY_EXISTS
-							}
-							else {
+							} else {
 								setEventMessages('FailedToAddFileIntoDatabaseIndex', '', 'warnings');
 							}
 						}
 					}
 
 					$nbok++;
-				}
-				else {
+				} else {
 					$langs->load("errors");
 					if ($resupload < 0)	// Unknown error
 					{
 						setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
-					}
-					elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload))	// Files infected by a virus
+					} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload))	// Files infected by a virus
 					{
 						setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
-					}
-					else // Known error
+					} else // Known error
 					{
 						setEventMessages($langs->trans($resupload), null, 'errors');
 					}
@@ -1648,8 +1620,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 		} else {
 			setEventMessages($langs->trans("ErrorFileNotLinked"), null, 'errors');
 		}
-	}
-	else {
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("File")), null, 'errors');
 	}
@@ -1852,27 +1823,22 @@ function dol_convert_file($fileinput, $ext = 'png', $fileoutput = '', $page = ''
 				{
 					try {
 						$ret = $image->writeImages($fileoutput, true);
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
-				}
-				else {
+				} else {
 					dol_syslog("Warning: Failed to write cache preview file '.$fileoutput.'. Check permission on file/dir", LOG_ERR);
 				}
 				if ($ret) return $count;
 				else return -3;
-			}
-			else {
+			} else {
 				return -2;
 			}
-		}
-		else {
+		} else {
 			return -1;
 		}
-	}
-	else {
+	} else {
 		return 0;
 	}
 }
@@ -1898,9 +1864,7 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 		dol_syslog("dol_compress_file mode=".$mode." inputfile=".$inputfile." outputfile=".$outputfile);
 
 		$data = implode("", file(dol_osencode($inputfile)));
-		if ($mode == 'gz') { $foundhandler = 1; $compressdata = gzencode($data, 9); }
-		elseif ($mode == 'bz') { $foundhandler = 1; $compressdata = bzcompress($data, 9); }
-		elseif ($mode == 'zip')
+		if ($mode == 'gz') { $foundhandler = 1; $compressdata = gzencode($data, 9); } elseif ($mode == 'bz') { $foundhandler = 1; $compressdata = bzcompress($data, 9); } elseif ($mode == 'zip')
 		{
 			if (class_exists('ZipArchive') && !empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_COMPRESS))
 			{
@@ -1972,8 +1936,7 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 					$errorstring = "dol_compress_file error archive->errorCode = ".$archive->errorCode()." errormsg=".$errormsg;
 					dol_syslog("dol_compress_file failure - ".$errormsg, LOG_ERR);
 					return -3;
-				}
-				else {
+				} else {
 					dol_syslog("dol_compress_file success - ".count($result)." files");
 					return 1;
 				}
@@ -1986,8 +1949,7 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 			fwrite($fp, $compressdata);
 			fclose($fp);
 			return 1;
-		}
-		else {
+		} else {
 			$errorstring = "Try to zip with format ".$mode." with no handler for this format";
 			dol_syslog($errorstring, LOG_ERR);
 
@@ -1995,8 +1957,7 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 			$errormsg = $errorstring;
 			return -2;
 		}
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		global $langs, $errormsg;
 		$langs->load("errors");
@@ -2056,8 +2017,7 @@ function dol_uncompress($inputfile, $outputdir)
 			$zip->extractTo($outputdir.'/');
 			$zip->close();
 			return array();
-		}
-		else {
+		} else {
 			return array('error'=>'ErrUnzipFails');
 		}
 	}
@@ -2091,9 +2051,7 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 	}
 
 	try {
-		if ($mode == 'gz') { $foundhandler = 0; }
-		elseif ($mode == 'bz') { $foundhandler = 0; }
-		elseif ($mode == 'zip')
+		if ($mode == 'gz') { $foundhandler = 0; } elseif ($mode == 'bz') { $foundhandler = 0; } elseif ($mode == 'zip')
 		{
 			/*if (defined('ODTPHP_PATHTOPCLZIP'))
 			 {
@@ -2157,12 +2115,10 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 		{
 			dol_syslog("Try to zip with format ".$mode." with no handler for this format", LOG_ERR);
 			return -2;
-		}
-		else {
+		} else {
 			return 0;
 		}
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		global $langs, $errormsg;
 		$langs->load("errors");
@@ -2348,8 +2304,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	{
 		if ($fuser->rights->commande->{$lire}) $accessallowed = 1;
 		$original_file = $conf->commande->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
+	} elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed = 1;
 		$original_file = $conf->fournisseur->commande->dir_temp.'/'.$original_file;
@@ -2359,8 +2314,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	{
 		if ($fuser->rights->facture->{$lire}) $accessallowed = 1;
 		$original_file = $conf->facture->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
+	} elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
 		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed = 1;
 		$original_file = $conf->fournisseur->facture->dir_temp.'/'.$original_file;
@@ -2513,72 +2467,63 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->propal->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_orders')
+	} elseif ($modulepart == 'massfilesarea_orders')
 	{
 		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->commande->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_sendings')
+	} elseif ($modulepart == 'massfilesarea_sendings')
 	{
 		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expedition->dir_output.'/sending/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_invoices')
+	} elseif ($modulepart == 'massfilesarea_invoices')
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->facture->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_expensereport')
+	} elseif ($modulepart == 'massfilesarea_expensereport')
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_interventions')
+	} elseif ($modulepart == 'massfilesarea_interventions')
 	{
 		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output))
+	} elseif ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output))
 	{
 		if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_supplier_order')
+	} elseif ($modulepart == 'massfilesarea_supplier_order')
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_supplier_invoice')
+	} elseif ($modulepart == 'massfilesarea_supplier_invoice')
 	{
 		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
+	} elseif ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
 	{
 		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
@@ -2639,8 +2584,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
-	}
-	elseif ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
+	} elseif ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
 	{
 		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
@@ -2911,8 +2855,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			}
 			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
 			$original_file = $conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
-		}
-		elseif (preg_match('/^([a-z]+)_temp$/i', $modulepart, $reg))
+		} elseif (preg_match('/^([a-z]+)_temp$/i', $modulepart, $reg))
 		{
 			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
 			{
@@ -2921,8 +2864,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			}
 			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
 			$original_file = $conf->{$reg[1]}->dir_temp.'/'.$original_file;
-		}
-		elseif (preg_match('/^([a-z]+)_user$/i', $modulepart, $reg))
+		} elseif (preg_match('/^([a-z]+)_user$/i', $modulepart, $reg))
 		{
 			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
 			{
@@ -2931,8 +2873,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			}
 			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
 			$original_file = $conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
-		}
-		elseif (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg))
+		} elseif (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg))
 		{
 			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
 			{
@@ -2944,8 +2885,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 				$accessallowed = 1;
 			}
 			$original_file = $conf->{$reg[1]}->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-		}
-		else {
+		} else {
 			if (empty($conf->$modulepart->dir_output))	// modulepart not supported
 			{
 				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.'). The module for this modulepart value may not be activated.');
@@ -3074,15 +3014,13 @@ function getFilesUpdated(&$file_list, SimpleXMLElement $dir, $path = '', $pathre
 		if (!file_exists($pathref.'/'.$filename))
 		{
 			$file_list['missing'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'expectedsize'=>$expectedsize);
-		}
-		else {
+		} else {
 			$md5_local = md5_file($pathref.'/'.$filename);
 
 			if ($conffile == '/etc/dolibarr/conf.php' && $filename == '/filefunc.inc.php')	// For install with deb or rpm, we ignore test on filefunc.inc.php that was modified by package
 			{
 				$checksumconcat[] = $expectedmd5;
-			}
-			else {
+			} else {
 				if ($md5_local != $expectedmd5) $file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'expectedsize'=>$expectedsize, 'md5'=>(string) $md5_local);
 				$checksumconcat[] = $md5_local;
 			}
diff --git a/htdocs/core/lib/format_cards.lib.php b/htdocs/core/lib/format_cards.lib.php
index 1c274464673..1693329329e 100644
--- a/htdocs/core/lib/format_cards.lib.php
+++ b/htdocs/core/lib/format_cards.lib.php
@@ -55,8 +55,7 @@ if ($resql)
         $_Avery_Labels[$row['code']]['custom_x'] = $row['custom_x'];
         $_Avery_Labels[$row['code']]['custom_y'] = $row['custom_y'];
     }
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f0b85a45b73..518215b9b3f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -84,8 +84,7 @@ function getEntity($element, $shared = 1, $currentobject = null)
 	if (is_object($mc))
 	{
 		return $mc->getEntity($element, $shared, $currentobject);
-	}
-	else {
+	} else {
 		$out = '';
 		$addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values');
 		if (in_array($element, $addzero)) $out .= '0,';
@@ -107,8 +106,7 @@ function setEntity($currentobject)
 	if (is_object($mc) && method_exists($mc, 'setEntity'))
 	{
 		return $mc->setEntity($currentobject);
-	}
-	else {
+	} else {
 		return ((is_object($currentobject) && $currentobject->id > 0 && $currentobject->entity > 0) ? $currentobject->entity : $conf->entity);
 	}
 }
@@ -166,20 +164,12 @@ function getBrowserInfo($user_agent)
 	}
 
 	// OS
-	if (preg_match('/linux/i', $user_agent)) { $os = 'linux'; }
-	elseif (preg_match('/macintosh/i', $user_agent)) { $os = 'macintosh'; }
-	elseif (preg_match('/windows/i', $user_agent)) { $os = 'windows'; }
+	if (preg_match('/linux/i', $user_agent)) { $os = 'linux'; } elseif (preg_match('/macintosh/i', $user_agent)) { $os = 'macintosh'; } elseif (preg_match('/windows/i', $user_agent)) { $os = 'windows'; }
 
 	// Name
-	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'firefox'; $version = $reg[2]; }
-	elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'edge'; $version = $reg[2]; }
-	elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg)) { $name = 'chrome'; $version = $reg[2]; }    // we can have 'chrome (Mozilla...) chrome x.y' in one string
-	elseif (preg_match('/chrome/i', $user_agent, $reg)) { $name = 'chrome'; }
-	elseif (preg_match('/iceweasel/i', $user_agent)) { $name = 'iceweasel'; }
-	elseif (preg_match('/epiphany/i', $user_agent)) { $name = 'epiphany'; }
-	elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'safari'; $version = $reg[2]; }	// Safari is often present in string for mobile but its not.
-	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'opera'; $version = $reg[2]; }
-	elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); }    // MS products at end
+	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'firefox'; $version = $reg[2]; } elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'edge'; $version = $reg[2]; } elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg)) { $name = 'chrome'; $version = $reg[2]; }    // we can have 'chrome (Mozilla...) chrome x.y' in one string
+	elseif (preg_match('/chrome/i', $user_agent, $reg)) { $name = 'chrome'; } elseif (preg_match('/iceweasel/i', $user_agent)) { $name = 'iceweasel'; } elseif (preg_match('/epiphany/i', $user_agent)) { $name = 'epiphany'; } elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'safari'; $version = $reg[2]; }	// Safari is often present in string for mobile but its not.
+	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'opera'; $version = $reg[2]; } elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); }    // MS products at end
 	elseif (preg_match('/(Windows NT\s([0-9]+\.[0-9])).*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); }    // MS products at end
 	elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) { $name = 'lynxlinks'; $version = $reg[4]; }
 
@@ -255,17 +245,14 @@ function GETPOSTISSET($paramname)
 		if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring]))
 		{
 			$isset = 1;
-		}
-		elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring]))
+		} elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring]))
+		{
+			$isset = 1;
+		} elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring]))
 		{
 			$isset = 1;
 		}
-		elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring]))
-		{
-			$isset = 1;
-		}
-	}
-	else {
+	} else {
 		$isset = (isset($_POST[$paramname]) || isset($_GET[$paramname]));
 	}
 
@@ -348,12 +335,10 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 			if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring]))
 			{
 				$out = $_SESSION['lastsearch_contextpage_'.$relativepathstring];
-			}
-			elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring]))
+			} elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring]))
 			{
 				$out = $_SESSION['lastsearch_page_'.$relativepathstring];
-			}
-			elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring]))
+			} elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring]))
 			{
 				$out = $_SESSION['lastsearch_limit_'.$relativepathstring];
 			}
@@ -393,8 +378,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 									}
 									if (!$foundintru) $qualified = 1;
 									//var_dump($defkey.'-'.$qualified);
-								}
-								else $qualified = 1;
+								} else $qualified = 1;
 
 								if ($qualified)
 								{
@@ -434,8 +418,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 										}
 										if (!$foundintru) $qualified = 1;
 										//var_dump($defkey.'-'.$qualified);
-									}
-									else $qualified = 1;
+									} else $qualified = 1;
 
 									if ($qualified)
 									{
@@ -456,8 +439,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 									}
 								}
 							}
-						}
-						elseif (isset($user->default_values[$relativepathstring]['filters']))
+						} elseif (isset($user->default_values[$relativepathstring]['filters']))
 						{
 							foreach ($user->default_values[$relativepathstring]['filters'] as $defkey => $defval)	// $defkey is a querystring like 'a=b&c=d', $defval is key of user
 							{
@@ -473,8 +455,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 									}
 									if (!$foundintru) $qualified = 1;
 									//var_dump($defkey.'-'.$qualified);
-								}
-								else $qualified = 1;
+								} else $qualified = 1;
 
 								if ($qualified)
 								{
@@ -486,8 +467,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 											$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
 											$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
 										}
-									}
-									else {
+									} else {
 										$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
 										$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
 									}
@@ -512,32 +492,19 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 		{
 			$loopnb++; $newout = '';
 
-			if ($reg[1] == 'DAY') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['mday']; }
-			elseif ($reg[1] == 'MONTH') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['mon']; }
-			elseif ($reg[1] == 'YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['year']; }
-			elseif ($reg[1] == 'PREVIOUS_DAY') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
-			elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_prev_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
-			elseif ($reg[1] == 'PREVIOUS_YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); }
-			elseif ($reg[1] == 'NEXT_DAY') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
-			elseif ($reg[1] == 'NEXT_MONTH') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_next_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
-			elseif ($reg[1] == 'NEXT_YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); }
-			elseif ($reg[1] == 'MYCOMPANY_COUNTRY_ID' || $reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID')
+			if ($reg[1] == 'DAY') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['mday']; } elseif ($reg[1] == 'MONTH') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['mon']; } elseif ($reg[1] == 'YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['year']; } elseif ($reg[1] == 'PREVIOUS_DAY') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; } elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_prev_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; } elseif ($reg[1] == 'PREVIOUS_YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); } elseif ($reg[1] == 'NEXT_DAY') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; } elseif ($reg[1] == 'NEXT_MONTH') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_next_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; } elseif ($reg[1] == 'NEXT_YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); } elseif ($reg[1] == 'MYCOMPANY_COUNTRY_ID' || $reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID')
 			{
 				$newout = $mysoc->country_id;
-			}
-			elseif ($reg[1] == 'USER_ID' || $reg[1] == 'USERID')
+			} elseif ($reg[1] == 'USER_ID' || $reg[1] == 'USERID')
 			{
 				$newout = $user->id;
-			}
-			elseif ($reg[1] == 'USER_SUPERVISOR_ID' || $reg[1] == 'SUPERVISOR_ID' || $reg[1] == 'SUPERVISORID')
+			} elseif ($reg[1] == 'USER_SUPERVISOR_ID' || $reg[1] == 'SUPERVISOR_ID' || $reg[1] == 'SUPERVISORID')
 			{
 				$newout = $user->fk_user;
-			}
-			elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID')
+			} elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID')
 			{
 				$newout = $conf->entity;
-			}
-			else $newout = ''; // Key not found, we replace with empty string
+			} else $newout = ''; // Key not found, we replace with empty string
 			//var_dump('__'.$reg[1].'__ -> '.$newout);
 			$out = preg_replace('/__'.preg_quote($reg[1], '/').'__/', $newout, $out);
 		}
@@ -743,8 +710,7 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0)
 		{
 			if ($returnemptyifnotfound == 1 || !file_exists($res)) return '';
 		}
-	}
-	else // For an url path
+	} else // For an url path
 	{
 		// We try to get local path of file on filesystem from url
 		// Note that trying to know if a file on disk exist by forging path on disk from url
@@ -821,8 +787,7 @@ function dol_clone($object, $native = 0)
 	if (empty($native))
 	{
 		$myclone = unserialize(serialize($object));
-	}
-	else {
+	} else {
 		$myclone = clone $object; // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)
 	}
 
@@ -913,8 +878,7 @@ function dol_string_unaccent($str)
 		);
 		$string = strtr($string, $replacements);
 		return rawurldecode($string);
-	}
-	else {
+	} else {
 		// See http://www.ascii-code.com/
         $string = strtr(
 			$str,
@@ -972,10 +936,8 @@ function dol_escape_js($stringtoescape, $mode = 0, $noescapebackslashn = 0)
 	$substitjs = array("&#039;"=>"\\'", "\r"=>'\\r');
 	//$substitjs['</']='<\/';	// We removed this. Should be useless.
 	if (empty($noescapebackslashn)) { $substitjs["\n"] = '\\n'; $substitjs['\\'] = '\\\\'; }
-	if (empty($mode)) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\'"; }
-	elseif ($mode == 1) $substitjs["'"] = "\\'";
-	elseif ($mode == 2) { $substitjs['"'] = '\\"'; }
-	elseif ($mode == 3) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\\""; }
+	if (empty($mode)) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\'"; } elseif ($mode == 1) $substitjs["'"] = "\\'";
+	elseif ($mode == 2) { $substitjs['"'] = '\\"'; } elseif ($mode == 3) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\\""; }
 	return strtr($stringtoescape, $substitjs);
 }
 
@@ -1249,8 +1211,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 	{
 		if ((is_numeric($active) && $i == $active) || (!empty($links[$i][2]) && !is_numeric($active) && $active == $links[$i][2])) {
 			$isactive = true;
-		}
-		else {
+		} else {
 			$isactive = false;
 		}
 
@@ -1262,12 +1223,10 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 				if (!empty($links[$i][0]))
 				{
 					$out .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
-				}
-				else {
+				} else {
 					$out .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";
 				}
-			}
-			elseif (!empty($links[$i][1]))
+			} elseif (!empty($links[$i][1]))
 			{
 				//print "x $i $active ".$links[$i][2]." z";
 				if ($isactive)
@@ -1275,16 +1234,14 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 					$out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabactive tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';
 					$out .= $links[$i][1];
 					$out .= '</a>'."\n";
-				}
-				else {
+				} else {
 					$out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabunactive tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';
 					$out .= $links[$i][1];
 					$out .= '</a>'."\n";
 				}
 			}
 			$out .= '</div>';
-		}
-		else {
+		} else {
 			// The popup with the other tabs
 			if (!$popuptab)
 			{
@@ -1297,8 +1254,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 				if (!empty($links[$i][0]))
 					$outmore .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
 				else $outmore .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";
-			}
-			elseif (!empty($links[$i][1]))
+			} elseif (!empty($links[$i][1]))
 			{
 				$outmore .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="wordwrap inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';
 				$outmore .= preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]); // Replace x/y with x / y to allow wrap on long composed texts.
@@ -1434,14 +1390,12 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 			if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {
 				$nophoto = '';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';
-			}
-			else {    // Show no photo link
+			} else {    // Show no photo link
 				$nophoto = '/public/theme/common/nophoto.png';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo"'.($width ? ' style="width: '.$width.'px"' : '').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
 			}
 		}
-	}
-	elseif ($object->element == 'ticket')
+	} elseif ($object->element == 'ticket')
 	{
 		$width = 80; $cssclass = 'photoref';
 		$showimage = $object->is_photo_available($conf->ticket->multidir_output[$entity].'/'.$object->ref);
@@ -1453,8 +1407,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 			if ($object->nbphoto > 0)
 			{
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$showphoto.'</div>';
-			}
-			else {
+			} else {
 				$showimage = 0;
 			}
 		}
@@ -1463,14 +1416,12 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 			if (!empty($conf->global->TICKET_NODISPLAYIFNOPHOTO)) {
 				$nophoto = '';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';
-			}
-			else {    // Show no photo link
+			} else {    // Show no photo link
 				$nophoto = '/public/theme/common/nophoto.png';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' style="width: '.$width.'px"' : '').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
 			}
 		}
-	}
-	else {
+	} else {
 		if ($showimage)
 		{
 			if ($modulepart != 'unknown')
@@ -1485,8 +1436,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 					{
 						$subdir = get_exdir($object->id, 2, 0, 1, $object, $modulepart);
 						$subdir .= ((!empty($subdir) && !preg_match('/\/$/', $subdir)) ? '/' : '').$objectref; // the objectref dir is not included into get_exdir when used with level=2, so we add it at end
-					}
-					else {
+					} else {
 						$subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);
 					}
 					if (empty($subdir)) $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path
@@ -1529,8 +1479,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 							$phototoshow .= '</div></div>';
 						}
 					}
-				}
-				elseif (!$phototoshow)
+				} elseif (!$phototoshow)
 				{
 					$phototoshow .= $form->showphoto($modulepart, $object, 0, 0, 0, 'photoref', 'small', 1, 0, $maxvisiblephotos);
 				}
@@ -1551,8 +1500,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 					$width = 80;
 					$cssclass = 'photorefcenter';
 					$nophoto = img_picto('No photo', 'title_agenda');
-				}
-				else {
+				} else {
 					$width = 14; $cssclass = 'photorefcenter';
 					$picto = $object->picto;
 					if ($object->element == 'project' && !$object->public) $picto = 'project'; // instead of projectpub
@@ -1575,12 +1523,10 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		if (!empty($conf->use_javascript_ajax) && $user->rights->societe->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE))
 		{
 		   	$morehtmlstatus .= ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
-		}
-		else {
+		} else {
 			$morehtmlstatus .= $object->getLibStatut(6);
 		}
-	}
-	elseif ($object->element == 'product')
+	} elseif ($object->element == 'product')
 	{
 		//$morehtmlstatus.=$langs->trans("Status").' ('.$langs->trans("Sell").') ';
 		if (!empty($conf->use_javascript_ajax) && $user->rights->produit->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
@@ -1595,32 +1541,27 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		} else {
 			$morehtmlstatus .= '<span class="statusrefbuy">'.$object->getLibStatut(6, 1).'</span>';
 		}
-	}
-	elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan')))
+	} elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan')))
 	{
 		$tmptxt = $object->getLibStatut(6, $object->totalpaye);
 		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) $tmptxt = $object->getLibStatut(5, $object->totalpaye);
 		$morehtmlstatus .= $tmptxt;
-	}
-	elseif ($object->element == 'contrat' || $object->element == 'contract')
+	} elseif ($object->element == 'contrat' || $object->element == 'contract')
 	{
 		if ($object->statut == 0) $morehtmlstatus .= $object->getLibStatut(5);
 		else $morehtmlstatus .= $object->getLibStatut(4);
-	}
-	elseif ($object->element == 'facturerec')
+	} elseif ($object->element == 'facturerec')
 	{
 		if ($object->frequency == 0) $morehtmlstatus .= $object->getLibStatut(2);
 		else $morehtmlstatus .= $object->getLibStatut(5);
-	}
-	elseif ($object->element == 'project_task')
+	} elseif ($object->element == 'project_task')
 	{
 		$object->fk_statut = 1;
 		if ($object->progress > 0) $object->fk_statut = 2;
 		if ($object->progress >= 100) $object->fk_statut = 3;
 		$tmptxt = $object->getLibStatut(5);
 		$morehtmlstatus .= $tmptxt; // No status on task
-	}
-	else { // Generic case
+	} else { // Generic case
 		$tmptxt = $object->getLibStatut(6);
 		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) $tmptxt = $object->getLibStatut(5);
 		$morehtmlstatus .= $tmptxt;
@@ -1739,8 +1680,7 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 			$ret .= ($ret ? ", " : '').$object->state;
 		}
 		if ($object->zip) $ret .= ($ret ? ", " : '').$object->zip;
-	}
-	elseif (in_array($object->country_code, array('GB', 'UK'))) // UK: title firstname name \n address lines \n town state \n zip \n country
+	} elseif (in_array($object->country_code, array('GB', 'UK'))) // UK: title firstname name \n address lines \n town state \n zip \n country
 	{
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($ret ? $sep : '').$town;
@@ -1749,8 +1689,7 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 			$ret .= ($ret ? ", " : '').$object->state;
 		}
 		if ($object->zip) $ret .= ($ret ? $sep : '').$object->zip;
-	}
-	elseif (in_array($object->country_code, array('ES', 'TR'))) // ES: title firstname name \n address lines \n zip town \n state \n country
+	} elseif (in_array($object->country_code, array('ES', 'TR'))) // ES: title firstname name \n address lines \n zip town \n state \n country
 	{
 		$ret .= ($ret ? $sep : '').$object->zip;
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
@@ -1759,15 +1698,13 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 		{
 			$ret .= "\n".$object->state;
 		}
-	}
-	elseif (in_array($object->country_code, array('IT'))) // IT: tile firstname name\n address lines \n zip (Code Departement) \n country
+	} elseif (in_array($object->country_code, array('IT'))) // IT: tile firstname name\n address lines \n zip (Code Departement) \n country
 	{
 		$ret .= ($ret ? $sep : '').$object->zip;
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($town ? (($object->zip ? ' ' : '').$town) : '');
 		$ret .= ($object->state_code ? (' '.($object->state_code)) : '');
-	}
-	else // Other: title firstname name \n address lines \n zip town \n country
+	} else // Other: title firstname name \n address lines \n zip town \n country
 	{
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= $object->zip ? (($ret ? $sep : '').$object->zip) : '';
@@ -1801,8 +1738,7 @@ function dol_strftime($fmt, $ts = false, $is_gmt = false)
 {
 	if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
 		return ($is_gmt) ? @gmstrftime($fmt, $ts) : @strftime($fmt, $ts);
-	}
-	else return 'Error date into a not supported range';
+	} else return 'Error date into a not supported range';
 }
 
 /**
@@ -1844,8 +1780,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang
 				$offsettzstring = @date_default_timezone_get(); // Example 'Europe/Berlin' or 'Indian/Reunion'
 				$offsettz = 0;
 				$offsetdst = 0;
-			}
-			elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel')
+			} elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel')
 			{
 				$to_gmt = true;
 				$offsettzstring = (empty($_SESSION['dol_tz_string']) ? 'UTC' : $_SESSION['dol_tz_string']); // Example 'Europe/Berlin' or 'Indian/Reunion'
@@ -1910,8 +1845,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang
 	{
 	    dol_print_error("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"]);
 	    return '';
-	}
-	elseif (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg))    // Still available to solve problems in extrafields of type date
+	} elseif (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg))    // Still available to solve problems in extrafields of type date
 	{
 	    // This part of code should not be used.
 	    dol_syslog("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"], LOG_WARNING);
@@ -1926,16 +1860,14 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang
 
 	    $time = dol_mktime($shour, $smin, $ssec, $smonth, $sday, $syear, true);
 	    $ret = adodb_strftime($format, $time + $offsettz + $offsetdst, $to_gmt);
-	}
-	else {
+	} else {
 		// Date is a timestamps
 		if ($time < 100000000000)	// Protection against bad date values
 		{
 			$timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
 			$ret = adodb_strftime($format, $timetouse, $to_gmt);
-		}
-		else $ret = 'Bad value '.$time.' for date';
+		} else $ret = 'Bad value '.$time.' for date';
 	}
 
 	if (preg_match('/__b__/i', $format))
@@ -1949,8 +1881,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang
 		{
 			$monthtext = $outputlangs->transnoentities('Month'.$month);
 			$monthtextshort = $outputlangs->transnoentities('MonthShort'.$month);
-		}
-		else {
+		} else {
 			$monthtext = $outputlangs->transnoentitiesnoconv('Month'.$month);
 			$monthtextshort = $outputlangs->transnoentitiesnoconv('MonthShort'.$month);
 		}
@@ -2018,8 +1949,7 @@ function dol_getdate($timestamp, $fast = false)
 	if ($usealternatemethod)
 	{
 		$arrayinfo = adodb_getdate($timestamp, $fast);
-	}
-	else {
+	} else {
 		$arrayinfo = getdate($timestamp);
 	}
 
@@ -2070,27 +2000,23 @@ function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = false, $
 	{
 		$default_timezone = @date_default_timezone_get(); // Example 'Europe/Berlin'
 		$localtz = new DateTimeZone($default_timezone);
-	}
-	elseif ($gm === 'user')
+	} elseif ($gm === 'user')
 	{
 		// We use dol_tz_string first because it is more reliable.
 		$default_timezone = (empty($_SESSION["dol_tz_string"]) ? @date_default_timezone_get() : $_SESSION["dol_tz_string"]); // Example 'Europe/Berlin'
 		try {
 			$localtz = new DateTimeZone($default_timezone);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			dol_syslog("Warning dol_tz_string contains an invalid value ".$_SESSION["dol_tz_string"], LOG_WARNING);
 			$default_timezone = @date_default_timezone_get();
 		}
-	}
-	elseif (strrpos($gm, "tz,") !== false)
+	} elseif (strrpos($gm, "tz,") !== false)
 	{
 		$timezone = str_replace("tz,", "", $gm); // Example 'tz,Europe/Berlin'
 		try {
 			$localtz = new DateTimeZone($timezone);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			dol_syslog("Warning passed timezone contains an invalid value ".$timezone, LOG_WARNING);
 		}
@@ -2169,15 +2095,13 @@ function dol_print_size($size, $shortvalue = 0, $shortunit = 0)
 		$ret = $size;
 		$textunitshort = $langs->trans("b");
 		$textunitlong = $langs->trans("Bytes");
-	}
-	else {
+	} else {
 		$ret = round($size / $level, 0);
 		$textunitshort = $langs->trans("Kb");
 		$textunitlong = $langs->trans("KiloBytes");
 	}
 	// Use long or short text unit
-	if (empty($shortunit)) { $ret .= ' '.$textunitlong; }
-	else { $ret .= ' '.$textunitshort; }
+	if (empty($shortunit)) { $ret .= ' '.$textunitlong; } else { $ret .= ' '.$textunitshort; }
 
 	return $ret;
 }
@@ -2249,8 +2173,7 @@ function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64,
 			if (!empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
 			if ($link) $newemail = '<div>'.$newemail.' '.$link.'</div>';
 		}
-	}
-	else {
+	} else {
 		if ($showinvalid && !isValidEmail($email))
 		{
 			$langs->load("errors");
@@ -2342,8 +2265,7 @@ function dol_print_socialnetworks($value, $cid, $socid, $type)
 			$htmllink .= ($link ? ' '.$link : '');
 		}
 		$htmllink .= '</div>';
-	}
-	else {
+	} else {
 		$langs->load("errors");
 		$htmllink .= img_warning($langs->trans("ErrorBadSocialNetworkValue", $value));
 	}
@@ -2383,284 +2305,236 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 		// France
 		if (dol_strlen($phone) == 10) {
 			$newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 2).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2);
-		}
-		elseif (dol_strlen($phone) == 7)
+		} elseif (dol_strlen($phone) == 7)
 		{
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2);
-		}
-		elseif (dol_strlen($phone) == 9)
+		} elseif (dol_strlen($phone) == 9)
 		{
 			$newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2);
-		}
-		elseif (dol_strlen($phone) == 11)
+		} elseif (dol_strlen($phone) == 11)
 		{
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
-		}
-		elseif (dol_strlen($phone) == 12)
+		} elseif (dol_strlen($phone) == 12)
 		{
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-
-	elseif (strtoupper($countrycode) == "CA")
+	} elseif (strtoupper($countrycode) == "CA")
 	{
 		if (dol_strlen($phone) == 10) {
 			$newphone = ($separ != '' ? '(' : '').substr($newphone, 0, 3).($separ != '' ? ')' : '').$separ.substr($newphone, 3, 3).($separ != '' ? '-' : '').substr($newphone, 6, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "PT")
+	} elseif (strtoupper($countrycode) == "PT")
 	{//Portugal
 		if (dol_strlen($phone) == 13)
 		{//ex: +351_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "SR")
+	} elseif (strtoupper($countrycode) == "SR")
 	{//Suriname
 		if (dol_strlen($phone) == 10)
 		{//ex: +597_ABC_DEF
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3);
-		}
-		elseif (dol_strlen($phone) == 11)
+		} elseif (dol_strlen($phone) == 11)
 		{//ex: +597_ABC_DEFG
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "DE")
+	} elseif (strtoupper($countrycode) == "DE")
 	{//Allemagne
 		if (dol_strlen($phone) == 14)
 		{//ex:  +49_ABCD_EFGH_IJK
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 4).$separ.substr($newphone, 11, 3);
-		}
-		elseif (dol_strlen($phone) == 13)
+		} elseif (dol_strlen($phone) == 13)
 		{//ex: +49_ABC_DEFG_HIJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 4).$separ.substr($newphone, 10, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "ES")
+	} elseif (strtoupper($countrycode) == "ES")
 	{//Espagne
 		if (dol_strlen($phone) == 12)
 		{//ex:  +34_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "BF")
+	} elseif (strtoupper($countrycode) == "BF")
 	{// Burkina Faso
 		if (dol_strlen($phone) == 12)
 		{//ex :  +22 A BC_DE_FG_HI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "RO")
+	} elseif (strtoupper($countrycode) == "RO")
 	{// Roumanie
 		if (dol_strlen($phone) == 12)
 		{//ex :  +40 AB_CDE_FG_HI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "TR")
+	} elseif (strtoupper($countrycode) == "TR")
 	{//Turquie
 		if (dol_strlen($phone) == 13)
 		{//ex :  +90 ABC_DEF_GHIJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "US")
+	} elseif (strtoupper($countrycode) == "US")
 	{//Etat-Unis
 		if (dol_strlen($phone) == 12)
 		{//ex: +1 ABC_DEF_GHIJ
 			$newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "MX")
+	} elseif (strtoupper($countrycode) == "MX")
 	{//Mexique
 		if (dol_strlen($phone) == 12)
 		{//ex: +52 ABCD_EFG_HI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 2);
-		}
-		elseif (dol_strlen($phone) == 11)
+		} elseif (dol_strlen($phone) == 11)
 		{//ex: +52 AB_CD_EF_GH
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
-		}
-		elseif (dol_strlen($phone) == 13)
+		} elseif (dol_strlen($phone) == 13)
 		{//ex: +52 ABC_DEF_GHIJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "ML")
+	} elseif (strtoupper($countrycode) == "ML")
 	{//Mali
 		if (dol_strlen($phone) == 12)
 		{//ex: +223 AB_CD_EF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "TH")
+	} elseif (strtoupper($countrycode) == "TH")
 	{//Thaïlande
 		if (dol_strlen($phone) == 11)
 		{//ex: +66_ABC_DE_FGH
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3);
-		}
-		elseif (dol_strlen($phone) == 12)
+		} elseif (dol_strlen($phone) == 12)
 		{//ex: +66_A_BCD_EF_GHI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "MU")
+	} elseif (strtoupper($countrycode) == "MU")
 	{
         //Maurice
 		if (dol_strlen($phone) == 11)
 		{//ex: +230_ABC_DE_FG
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
-		}
-		elseif (dol_strlen($phone) == 12)
+		} elseif (dol_strlen($phone) == 12)
 		{//ex: +230_ABCD_EF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "ZA")
+	} elseif (strtoupper($countrycode) == "ZA")
 	{//Afrique du sud
 		if (dol_strlen($phone) == 12)
 		{//ex: +27_AB_CDE_FG_HI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "SY")
+	} elseif (strtoupper($countrycode) == "SY")
 	{//Syrie
 		if (dol_strlen($phone) == 12)
 		{//ex: +963_AB_CD_EF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
-		}
-		elseif (dol_strlen($phone) == 13)
+		} elseif (dol_strlen($phone) == 13)
 		{//ex: +963_AB_CD_EF_GHI
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "AE")
+	} elseif (strtoupper($countrycode) == "AE")
 	{//Emirats Arabes Unis
 		if (dol_strlen($phone) == 12)
 		{//ex: +971_ABC_DEF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 2);
-		}
-		elseif (dol_strlen($phone) == 13)
+		} elseif (dol_strlen($phone) == 13)
 		{//ex: +971_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);
-		}
-		elseif (dol_strlen($phone) == 14)
+		} elseif (dol_strlen($phone) == 14)
 		{//ex: +971_ABC_DEF_GHIK
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "DZ")
+	} elseif (strtoupper($countrycode) == "DZ")
 	{//Algérie
 		if (dol_strlen($phone) == 13)
 		{//ex: +213_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "BE")
+	} elseif (strtoupper($countrycode) == "BE")
 	{//Belgique
 		if (dol_strlen($phone) == 11)
 		{//ex: +32_ABC_DE_FGH
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3);
-		}
-		elseif (dol_strlen($phone) == 12)
+		} elseif (dol_strlen($phone) == 12)
 		{//ex: +32_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "PF")
+	} elseif (strtoupper($countrycode) == "PF")
 	{//Polynésie française
 		if (dol_strlen($phone) == 12)
 		{//ex: +689_AB_CD_EF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "CO")
+	} elseif (strtoupper($countrycode) == "CO")
 	{//Colombie
 		if (dol_strlen($phone) == 13)
 		{//ex: +57_ABC_DEF_GH_IJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "JO")
+	} elseif (strtoupper($countrycode) == "JO")
 	{//Jordanie
 		if (dol_strlen($phone) == 12)
 		{//ex: +962_A_BCD_EF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 1).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "JM")
+	} elseif (strtoupper($countrycode) == "JM")
 	{//Jamaïque
 		if (dol_strlen($newphone) == 12)
 		{//ex: +1867_ABC_DEFG
 			$newphone = substr($newphone, 0, 5).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "MG")
+	} elseif (strtoupper($countrycode) == "MG")
 	{//Madagascar
 		if (dol_strlen($phone) == 13)
 		{//ex: +261_AB_CD_EF_GHI
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "GB")
+	} elseif (strtoupper($countrycode) == "GB")
 	{//Royaume uni
 		if (dol_strlen($phone) == 13)
 		{//ex: +44_ABCD_EFG_HIJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "CH")
+	} elseif (strtoupper($countrycode) == "CH")
 	{//Suisse
 		if (dol_strlen($phone) == 12)
 		{//ex: +41_AB_CDE_FG_HI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
-		}
-		elseif (dol_strlen($phone) == 15)
+		} elseif (dol_strlen($phone) == 15)
 		{// +41_AB_CDE_FGH_IJKL
 			$newphone = $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 3).$separ.substr($newphone, 11, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "TN")
+	} elseif (strtoupper($countrycode) == "TN")
 	{//Tunisie
 		if (dol_strlen($phone) == 12)
 		{//ex: +216_AB_CDE_FGH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "GF")
+	} elseif (strtoupper($countrycode) == "GF")
 	{//Guyane francaise
 		if (dol_strlen($phone) == 13)
 		{//ex: +594_ABC_DE_FG_HI  (ABC=594 de nouveau)
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "GP")
+	} elseif (strtoupper($countrycode) == "GP")
 	{//Guadeloupe
 		if (dol_strlen($phone) == 13)
 		{//ex: +590_ABC_DE_FG_HI  (ABC=590 de nouveau)
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "MQ")
+	} elseif (strtoupper($countrycode) == "MQ")
 	{//Martinique
 		if (dol_strlen($phone) == 13)
 		{//ex: +596_ABC_DE_FG_HI  (ABC=596 de nouveau)
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "IT")
+	} elseif (strtoupper($countrycode) == "IT")
 	{//Italie
 		if (dol_strlen($phone) == 12)
 		{//ex: +39_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);
-		}
-		elseif (dol_strlen($phone) == 13)
+		} elseif (dol_strlen($phone) == 13)
 		{//ex: +39_ABC_DEF_GH_IJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "AU")
+	} elseif (strtoupper($countrycode) == "AU")
 	{
         //Australie
 		if (dol_strlen($phone) == 12)
@@ -2676,8 +2550,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 			$newphoneform = $newphone;
 			$newphone = '<a href="tel:'.$phone.'"';
 			$newphone .= '>'.$newphoneform.'</a>';
-		}
-		elseif (!empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL')		// If click to dial, we use click to dial url
+		} elseif (!empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL')		// If click to dial, we use click to dial url
 		{
 			if (empty($user->clicktodial_loaded)) $user->fetch_clicktodial();
 
@@ -2730,9 +2603,9 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 		if ($withpicto) {
 			if ($withpicto == 'fax') {
 				$picto = 'phoning_fax';
-			}elseif ($withpicto == 'phone') {
+			} elseif ($withpicto == 'phone') {
 				$picto = 'phoning';
-			}elseif ($withpicto == 'mobile') {
+			} elseif ($withpicto == 'mobile') {
 				$picto = 'phoning_mobile';
 			} else {
 				$picto = '';
@@ -2771,10 +2644,8 @@ function dol_print_ip($ip, $mode = 0)
 			if (file_exists(DOL_DOCUMENT_ROOT.'/theme/common/flags/'.$countrycode.'.png'))
 			{
 				$ret .= ' '.img_picto($countrycode.' '.$langs->trans("AccordingToGeoIPDatabase"), DOL_URL_ROOT.'/theme/common/flags/'.$countrycode.'.png', '', 1);
-			}
-			else $ret .= ' ('.$countrycode.')';
-		}
-		else {
+			} else $ret .= ' ('.$countrycode.')';
+		} else {
 			// Nothing
 		}
 	}
@@ -2996,17 +2867,14 @@ function dol_substr($string, $start, $length, $stringencoding = '', $trunconbyte
 		if (function_exists('mb_substr'))
 		{
 			$ret = mb_substr($string, $start, $length, $stringencoding);
-		}
-		else {
+		} else {
 			$ret = substr($string, $start, $length);
 		}
-	}
-	else {
+	} else {
 		if (function_exists('mb_strcut'))
 		{
 			$ret = mb_strcut($string, $start, $length, $stringencoding);
-		}
-		else {
+		} else {
 			$ret = substr($string, $start, $length);
 		}
 	}
@@ -3045,8 +2913,7 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
 		return dol_substr($newstring, 0, $size, $stringencoding).($nodot ? '' : '...');
 		else //return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;
 		return $string;
-	}
-	elseif ($trunc == 'middle')
+	} elseif ($trunc == 'middle')
 	{
 		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
 		if (dol_strlen($newstring, $stringencoding) > 2 && dol_strlen($newstring, $stringencoding) > ($size + 1))
@@ -3054,24 +2921,20 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
 			$size1 = round($size / 2);
 			$size2 = round($size / 2);
 			return dol_substr($newstring, 0, $size1, $stringencoding).'...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);
-		}
-		else return $string;
-	}
-	elseif ($trunc == 'left')
+		} else return $string;
+	} elseif ($trunc == 'left')
 	{
 		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
 		if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
 		return '...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);
 		else return $string;
-	}
-	elseif ($trunc == 'wrap')
+	} elseif ($trunc == 'wrap')
 	{
 		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
 		if (dol_strlen($newstring, $stringencoding) > ($size + 1))
 		return dol_substr($newstring, 0, $size, $stringencoding)."\n".dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);
 		else return $string;
-	}
-	else return 'BadParam3CallingDolTrunc';
+	} else return 'BadParam3CallingDolTrunc';
 }
 
 /**
@@ -3190,34 +3053,27 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			if ($pictowithouttext == 'off') {
 			    $fakey = 'fa-square';
 				$fasize = '1.3em';
-			}
-			elseif ($pictowithouttext == 'on') {
+			} elseif ($pictowithouttext == 'on') {
 			    $fakey = 'fa-check-square';
 				$fasize = '1.3em';
-			}
-			elseif ($pictowithouttext == 'listlight') {
+			} elseif ($pictowithouttext == 'listlight') {
 				$fakey = 'fa-download';
 				$marginleftonlyshort = 1;
-			}
-			elseif ($pictowithouttext == 'printer') {
+			} elseif ($pictowithouttext == 'printer') {
 				$fakey = 'fa-print';
 				$fasize = '1.2em';
-			}
-			elseif ($pictowithouttext == 'note') {
+			} elseif ($pictowithouttext == 'note') {
 			    $fakey = 'fa-sticky-note';
 				$marginleftonlyshort = 1;
-			}
-			elseif (in_array($pictowithouttext, array('1uparrow', '1downarrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected'))) {
+			} elseif (in_array($pictowithouttext, array('1uparrow', '1downarrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected'))) {
 			    $convertarray = array('1uparrow'=>'caret-up', '1downarrow'=>'caret-down', '1leftarrow'=>'caret-left', '1rightarrow'=>'caret-right', '1uparrow_selected'=>'caret-up', '1downarrow_selected'=>'caret-down', '1leftarrow_selected'=>'caret-left', '1rightarrow_selected'=>'caret-right');
 			    $fakey = 'fa-'.$convertarray[$pictowithouttext];
 			    if (preg_match('/selected/', $pictowithouttext)) $facolor = '#888';
 				$marginleftonlyshort = 1;
-			}
-			elseif (!empty($arrayconvpictotofa[$pictowithouttext]))
+			} elseif (!empty($arrayconvpictotofa[$pictowithouttext]))
 			{
 				$fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
-			}
-			else {
+			} else {
 				$fakey = 'fa-'.$pictowithouttext;
 			}
 
@@ -3298,11 +3154,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 		if (!empty($conf->global->MAIN_OVERWRITE_THEME_PATH)) {
 			$path = $conf->global->MAIN_OVERWRITE_THEME_PATH.'/theme/'.$theme; // If the theme does not have the same name as the module
-		}
-		elseif (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) {
+		} elseif (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) {
 			$path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES; // To allow an external module to overwrite image resources whatever is activated theme
-		}
-		elseif (!empty($conf->modules_parts['theme']) && array_key_exists($theme, $conf->modules_parts['theme'])) {
+		} elseif (!empty($conf->modules_parts['theme']) && array_key_exists($theme, $conf->modules_parts['theme'])) {
 			$path = $theme.'/theme/'.$theme; // If the theme have the same name as the module
 		}
 
@@ -3380,8 +3234,7 @@ function img_weather($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $mo
 		$leveltopicto = array(0=>'weather-clear.png', 1=>'weather-few-clouds.png', 2=>'weather-clouds.png', 3=>'weather-many-clouds.png', 4=>'weather-storm.png');
 		//return '<i class="fa fa-weather-level'.$picto.'"></i>';
 		$picto = $leveltopicto[$picto];
-	}
-	elseif (!preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
+	} elseif (!preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
 
 	$path = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/weather/'.$picto;
 
@@ -3432,12 +3285,7 @@ function img_action($titlealt, $numaction)
 
 	if (empty($titlealt) || $titlealt == 'default')
 	{
-		if ($numaction == '-1' || $numaction == 'ST_NO') { $numaction = -1; $titlealt = $langs->transnoentitiesnoconv('ChangeDoNotContact'); }
-		elseif ($numaction == '0' || $numaction == 'ST_NEVER') { $numaction = 0; $titlealt = $langs->transnoentitiesnoconv('ChangeNeverContacted'); }
-		elseif ($numaction == '1' || $numaction == 'ST_TODO') { $numaction = 1; $titlealt = $langs->transnoentitiesnoconv('ChangeToContact'); }
-		elseif ($numaction == '2' || $numaction == 'ST_PEND') { $numaction = 2; $titlealt = $langs->transnoentitiesnoconv('ChangeContactInProcess'); }
-		elseif ($numaction == '3' || $numaction == 'ST_DONE') { $numaction = 3; $titlealt = $langs->transnoentitiesnoconv('ChangeContactDone'); }
-		else { $titlealt = $langs->transnoentitiesnoconv('ChangeStatus '.$numaction); $numaction = 0; }
+		if ($numaction == '-1' || $numaction == 'ST_NO') { $numaction = -1; $titlealt = $langs->transnoentitiesnoconv('ChangeDoNotContact'); } elseif ($numaction == '0' || $numaction == 'ST_NEVER') { $numaction = 0; $titlealt = $langs->transnoentitiesnoconv('ChangeNeverContacted'); } elseif ($numaction == '1' || $numaction == 'ST_TODO') { $numaction = 1; $titlealt = $langs->transnoentitiesnoconv('ChangeToContact'); } elseif ($numaction == '2' || $numaction == 'ST_PEND') { $numaction = 2; $titlealt = $langs->transnoentitiesnoconv('ChangeContactInProcess'); } elseif ($numaction == '3' || $numaction == 'ST_DONE') { $numaction = 3; $titlealt = $langs->transnoentitiesnoconv('ChangeContactDone'); } else { $titlealt = $langs->transnoentitiesnoconv('ChangeStatus '.$numaction); $numaction = 0; }
 	}
 	if (!is_numeric($numaction)) $numaction = 0;
 
@@ -3773,13 +3621,7 @@ function img_credit_card($brand, $morecss = null)
 {
 	if (is_null($morecss)) $morecss = 'fa-2x';
 
-	if ($brand == 'visa' || $brand == 'Visa') {$brand = 'cc-visa'; }
-	elseif ($brand == 'mastercard' || $brand == 'MasterCard') {$brand = 'cc-mastercard'; }
-	elseif ($brand == 'amex' || $brand == 'American Express') {$brand = 'cc-amex'; }
-	elseif ($brand == 'discover' || $brand == 'Discover') {$brand = 'cc-discover'; }
-	elseif ($brand == 'jcb' || $brand == 'JCB') {$brand = 'cc-jcb'; }
-	elseif ($brand == 'diners' || $brand == 'Diners club') {$brand = 'cc-diners-club'; }
-	elseif (!in_array($brand, array('cc-visa', 'cc-mastercard', 'cc-amex', 'cc-discover', 'cc-jcb', 'cc-diners-club'))) {$brand = 'credit-card'; }
+	if ($brand == 'visa' || $brand == 'Visa') {$brand = 'cc-visa'; } elseif ($brand == 'mastercard' || $brand == 'MasterCard') {$brand = 'cc-mastercard'; } elseif ($brand == 'amex' || $brand == 'American Express') {$brand = 'cc-amex'; } elseif ($brand == 'discover' || $brand == 'Discover') {$brand = 'cc-discover'; } elseif ($brand == 'jcb' || $brand == 'JCB') {$brand = 'cc-jcb'; } elseif ($brand == 'diners' || $brand == 'Diners club') {$brand = 'cc-diners-club'; } elseif (!in_array($brand, array('cc-visa', 'cc-mastercard', 'cc-amex', 'cc-discover', 'cc-jcb', 'cc-diners-club'))) {$brand = 'credit-card'; }
 
 	return '<span class="fa fa-'.$brand.' fa-fw'.($morecss ? ' '.$morecss : '').'"></span>';
 }
@@ -3867,8 +3709,7 @@ function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss
 	if ($infoonimgalt)
 	{
 		$result = img_picto($text, 'info', 'class="hideonsmartphone'.($morecss ? ' '.$morecss : '').'"');
-	}
-	else {
+	} else {
 		if (empty($conf->use_javascript_ajax)) $textfordropdown = '';
 
 		$class = (empty($admin) ? 'undefined' : ($admin == '1' ? 'info' : $admin));
@@ -3948,8 +3789,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 		$out .= "<br>\n";
 		$syslog .= "url=".dol_escape_htmltag($_SERVER["REQUEST_URI"]);
 		$syslog .= ", query_string=".dol_escape_htmltag($_SERVER["QUERY_STRING"]);
-	}
-	else // Mode CLI
+	} else // Mode CLI
 	{
 		$out .= '> '.$langs->transnoentities("ErrorInternalErrorDetected").":\n".$argv[0]."\n";
 		$syslog .= "pid=".dol_getmypid();
@@ -3969,8 +3809,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 			$out .= "<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno() ?dol_escape_htmltag($db->lasterrno()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out .= "<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror() ?dol_escape_htmltag($db->lasterror()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out .= "<br>\n";
-		}
-		else // Mode CLI
+		} else // Mode CLI
 		{
 			// No dol_escape_htmltag for output, we are in CLI mode
 			$out .= '> '.$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";
@@ -3998,8 +3837,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 			if ($_SERVER['DOCUMENT_ROOT'])  // Mode web
 			{
 				$out .= "<b>".$langs->trans("Message").":</b> ".dol_escape_htmltag($msg)."<br>\n";
-			}
-			else // Mode CLI
+			} else // Mode CLI
 			{
 				$out .= '> '.$langs->transnoentities("Message").":\n".$msg."\n";
 			}
@@ -4127,8 +3965,7 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 		$out .= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '.$moreattrib;
 		$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && preg_match('/^[a-zA-Z_0-9\s\.\-:]*$/', $name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
 		$out .= '>';
-	}
-	else {
+	} else {
 		$out .= '<'.$tag.' class="'.$prefix.'liste_titre" '.$moreattrib;
 		$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && preg_match('/^[a-zA-Z_0-9\s\.\-:]*$/', $name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
 		$out .= '>';
@@ -4147,19 +3984,16 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 			if (preg_match('/^DESC/i', $sortorder))
 			{
 				$sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field)));
-			}
-			else // We reverse the var $sortordertouseinlink
+			} else // We reverse the var $sortordertouseinlink
 			{
 				$sortordertouseinlink .= str_repeat('asc,', count(explode(',', $field)));
 			}
-		}
-		else // We are on field that is the first current sorting criteria
+		} else // We are on field that is the first current sorting criteria
 		{
 			if (preg_match('/^ASC/i', $sortorder))	// We reverse the var $sortordertouseinlink
 			{
 				$sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field)));
-			}
-			else {
+			} else {
 				$sortordertouseinlink .= str_repeat('asc,', count(explode(',', $field)));
 			}
 		}
@@ -4188,8 +4022,7 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 		{
 			//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
 			//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';
-		}
-		else {
+		} else {
 			if (preg_match('/^DESC/', $sortorder)) {
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",1).'</a>';
@@ -4318,8 +4151,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 	if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0)))
 	{
 		$nextpage = 1;
-	}
-	else {
+	} else {
 		$nextpage = 0;
 	}
 	//print 'totalnboflines='.$totalnboflines.'-savlimit='.$savlimit.'-limit='.$limit.'-num='.$num.'-nextpage='.$nextpage;
@@ -4381,14 +4213,12 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 					if ($cpt == $page)
 					{
 						$pagelist .= '<li class="pagination"><span class="active">'.($page + 1).'</span></li>';
-					}
-					else {
+					} else {
 						$pagelist .= '<li class="pagination"><a href="'.$file.'?page='.$cpt.$options.'">'.($cpt + 1).'</a></li>';
 					}
 				}
 				$cpt++;
-			}
-			while ($cpt < $nbpages && $cpt <= ($page + $maxnbofpage));
+			} while ($cpt < $nbpages && $cpt <= ($page + $maxnbofpage));
 
 			if (empty($pagenavastextinput)) {
 				if ($cpt < $nbpages)
@@ -4403,8 +4233,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 					$pagelist .= '<li class="pagination"><a href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';
 				//}
 			}
-		}
-		else {
+		} else {
 			$pagelist .= '<li class="pagination"><span class="active">'.($page + 1)."</li>";
 		}
 	}
@@ -4635,8 +4464,7 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
 		if (in_array($currency_code, $listofcurrenciesbefore) || in_array($outlangs->defaultlang, $listoflanguagesbefore))
 		{
 		    $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);
-		}
-		else {
+		} else {
 			$tmpcur = $outlangs->getCurrencySymbol($currency_code);
 			$cursymbolafter .= ($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur);
 		}
@@ -4759,18 +4587,15 @@ function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round
 	{
 		$dimension = $dimension * 1000000;
 		$unit = $unit - 6;
-	}
-	elseif (($forceunitoutput == 'no' && $dimension < 1 / 10 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == -3))
+	} elseif (($forceunitoutput == 'no' && $dimension < 1 / 10 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == -3))
 	{
 		$dimension = $dimension * 1000;
 		$unit = $unit - 3;
-	}
-	elseif (($forceunitoutput == 'no' && $dimension > 100000000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 6))
+	} elseif (($forceunitoutput == 'no' && $dimension > 100000000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 6))
 	{
 		$dimension = $dimension / 1000000;
 		$unit = $unit + 6;
-	}
-	elseif (($forceunitoutput == 'no' && $dimension > 100000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 3))
+	} elseif (($forceunitoutput == 'no' && $dimension > 100000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 3))
 	{
 		$dimension = $dimension / 1000;
 		$unit = $unit + 3;
@@ -4836,8 +4661,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 			if ($thirdparty_seller->id == $mysoc->id)
 			{
 				if (!$thirdparty_buyer->localtax1_assuj) return 0;
-			}
-			else {
+			} else {
 				if (!$thirdparty_seller->localtax1_assuj) return 0;
 			}
 		}
@@ -4849,13 +4673,11 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 			if ($thirdparty_seller->id == $mysoc->id)
 			{
 				if (!$thirdparty_buyer->localtax2_assuj) return 0;
-			}
-			else {
+			} else {
 				if (!$thirdparty_seller->localtax2_assuj) return 0;
 			}
 		}
-	}
-	else {
+	} else {
 		if ($local == 1 && !$thirdparty_seller->localtax1_assuj) return 0;
 		if ($local == 2 && !$thirdparty_seller->localtax2_assuj) return 0;
 	}
@@ -4877,8 +4699,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 				{
 					return $thirdparty_seller->localtax1_value;
 				}
-			}
-			else // i am the seller
+			} else // i am the seller
 			{
 				if (!isOnlyOneLocalTax($local))  // TODO If seller is me, why not always returning this, even if there is only one locatax vat.
 				{
@@ -4895,14 +4716,12 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 				{
 					return $thirdparty_seller->localtax2_value;
 				}
-			}
-			else // i am the seller
+			} else // i am the seller
 			{
 				if (in_array($mysoc->country_code, array('ES')))
 				{
 					return $thirdparty_buyer->localtax2_value;
-				}
-				else {
+				} else {
 					return $conf->global->MAIN_INFO_VALUE_LOCALTAX2;
 				}
 			}
@@ -4947,8 +4766,7 @@ function isOnlyOneLocalTax($local)
 	if (count($valors) > 1)
 	{
 		return false;
-	}
-	else {
+	} else {
 		return true;
 	}
 }
@@ -5025,8 +4843,7 @@ function getTaxesFromId($vatrate, $buyer = null, $seller = null, $firstparamisid
 		$obj = $db->fetch_object($resql);
 		if ($obj) return array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'rate'=>$obj->rate, 'npr'=>$obj->npr, 'accountancy_code_sell'=>$obj->accountancy_code_sell, 'accountancy_code_buy'=>$obj->accountancy_code_buy);
 		else return array();
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	return array();
 }
@@ -5084,12 +4901,10 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 		if ($local == 1)
 		{
 			return array($obj->localtax1_type, get_localtax($vateratestring, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
-		}
-		elseif ($local == 2)
+		} elseif ($local == 2)
 		{
 			return array($obj->localtax2_type, get_localtax($vateratestring, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
-		}
-		else {
+		} else {
 			return array($obj->localtax1_type, get_localtax($vateratestring, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vateratestring, 2, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
 		}
 	}
@@ -5129,14 +4944,12 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr
 				$product->get_buyprice($idprodfournprice, 0, 0, 0);
 				$ret = $product->vatrate_supplier;
 				if ($product->default_vat_code) $ret .= ' ('.$product->default_vat_code.')';
-			}
-			else {
+			} else {
 				$ret = $product->tva_tx; // Default vat of product we defined
 				if ($product->default_vat_code) $ret .= ' ('.$product->default_vat_code.')';
 			}
 			$found = 1;
-		}
-		else {
+		} else {
 			// TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet.
 			// May be usefull/required if hidden option SERVICE_ARE_ECOMMERCE_200238EC is on
 		}
@@ -5163,10 +4976,8 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr
 					if ($obj->default_vat_code) $ret .= ' ('.$obj->default_vat_code.')';
 				}
 				$db->free($sql);
-			}
-			else dol_print_error($db);
-		}
-		else $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS; // Forced value if autodetect fails
+			} else dol_print_error($db);
+		} else $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS; // Forced value if autodetect fails
 	}
 
 	dol_syslog("get_product_vat_for_country: ret=".$ret);
@@ -5206,8 +5017,7 @@ function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)
 			elseif ($local==2) $ret=$product->localtax2_tx;
 			$found=1;
 			*/
-		}
-		else {
+		} else {
 			// TODO Read default product vat according to countrycode and product
 		}
 	}
@@ -5230,8 +5040,7 @@ function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)
 				if ($local == 1) $ret = $obj->localtax1;
 				elseif ($local == 2) $ret = $obj->localtax2;
 			}
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 	}
 
 	dol_syslog("get_product_localtax_for_country: ret=".$ret);
@@ -5311,8 +5120,7 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 		{
 			//print 'VATRULE 3';
 			return 0;
-		}
-		else {
+		} else {
 			//print 'VATRULE 4';
 			return get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
 		}
@@ -5352,8 +5160,7 @@ function get_default_npr(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 		$prodprice = new ProductFournisseur($db);
 		$prodprice->fetch_product_fournisseur_price($idprodfournprice);
 		return $prodprice->fourn_tva_npr;
-	}
-	elseif ($idprod > 0)
+	} elseif ($idprod > 0)
 	{
 		if (!class_exists('Product')) {
 			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -5391,14 +5198,12 @@ function get_default_localtax($thirdparty_seller, $thirdparty_buyer, $local, $id
 		if ($mysoc->country_code == 'ES')
 		{
 			if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) return 0;
-		}
-		else {
+		} else {
 			// Si vendeur non assujeti a Localtax1, localtax1 par default=0
 			if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) return 0;
 			if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') return 0;
 		}
-	}
-	elseif ($local == 2) //I Localtax 2
+	} elseif ($local == 2) //I Localtax 2
 	{
 		// Si vendeur non assujeti a Localtax2, localtax2 par default=0
 		if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj) return 0;
@@ -5433,8 +5238,7 @@ function yn($yesno, $case = 1, $color = 0)
 		if ($case == 3) $result = '<input type="checkbox" value="1" checked disabled> '.$result;
 
 		$classname = 'ok';
-	}
-	elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false')
+	} elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false')
 	{
 		$result = $langs->trans("no");
 		if ($case == 1 || $case == 3) $result = $langs->trans("No");
@@ -5480,8 +5284,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)
 		if ($level == 1) $path = substr($num, 0, 1);
 		if ($level == 2) $path = substr($num, 1, 1).'/'.substr($num, 0, 1);
 		if ($level == 3) $path = substr($num, 2, 1).'/'.substr($num, 1, 1).'/'.substr($num, 0, 1);
-	}
-	else {
+	} else {
 		// TODO
 		// We will enhance here a common way of forging path for document storage
 		// Here, object->id, object->ref and modulepart are required.
@@ -5553,14 +5356,12 @@ function dol_mkdir($dir, $dataroot = '', $newmask = null)
 					// Si le is_dir a renvoye une fausse info, alors on passe ici.
 					dol_syslog("functions.lib::dol_mkdir: Fails to create directory '".$ccdir."' or directory already exists.", LOG_WARNING);
 					$nberr++;
-				}
-				else {
+				} else {
 					dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' created", LOG_DEBUG);
 					$nberr = 0; // On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignore
 					$nbcreated++;
 				}
-			}
-			else {
+			} else {
 				$nberr = 0; // On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignores
 			}
 		}
@@ -5700,21 +5501,18 @@ function dolGetFirstLineOfText($text, $nboflines = 1, $charset = 'UTF-8')
 		{
 			$firstline = preg_replace('/<br[^>]*>.*$/s', '', $text); // The s pattern modifier means the . can match newline characters
 			$firstline = preg_replace('/<div[^>]*>.*$/s', '', $firstline); // The s pattern modifier means the . can match newline characters
-		}
-		else {
+		} else {
 			$firstline = preg_replace('/[\n\r].*/', '', $text);
 		}
 		return $firstline.((strlen($firstline) != strlen($text)) ? '...' : '');
-	}
-	else {
+	} else {
 		$ishtml = 0;
 		if (dol_textishtml($text))
 		{
 			$text = preg_replace('/\n/', '', $text);
 			$ishtml = 1;
 			$repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
-		}
-		else {
+		} else {
 			$repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " ");
 		}
 
@@ -5786,8 +5584,7 @@ function dol_htmlentitiesbr($stringtoencode, $nl2brmode = 0, $pagecodefrom = 'UT
 		$newstring = strtr($newstring, array('&'=>'__and__', '<'=>'__lt__', '>'=>'__gt__', '"'=>'__dquot__'));
 		$newstring = dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom); // Make entity encoding
 		$newstring = strtr($newstring, array('__and__'=>'&', '__lt__'=>'<', '__gt__'=>'>', '__dquot__'=>'"'));
-	}
-	else {
+	} else {
 		if ($removelasteolbr) $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); // Remove last \n (may remove several)
 		$newstring = dol_nl2br(dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom), $nl2brmode);
 	}
@@ -5876,9 +5673,7 @@ function dol_string_is_good_iso($s, $clean = 0)
 	{
 		$ordchar = ord($s[$scursor]);
 		//print $scursor.'-'.$ordchar.'<br>';
-		if ($ordchar < 32 && $ordchar != 13 && $ordchar != 10) { $ok = 0; break; }
-		elseif ($ordchar > 126 && $ordchar < 160) { $ok = 0; break; }
-		elseif ($clean) {
+		if ($ordchar < 32 && $ordchar != 13 && $ordchar != 10) { $ok = 0; break; } elseif ($ordchar > 126 && $ordchar < 160) { $ok = 0; break; } elseif ($clean) {
 			$out .= $s[$scursor];
 		}
 	}
@@ -5963,8 +5758,7 @@ function dol_textishtml($msg, $option = 0)
 		elseif (preg_match('/<\/textarea/i', $msg))	  return true;
 		elseif (preg_match('/<br/i', $msg))				return true;
 		return false;
-	}
-	else {
+	} else {
 		if (preg_match('/<html/i', $msg))				return true;
 		elseif (preg_match('/<body/i', $msg))			return true;
 		elseif (preg_match('/<\/textarea/i', $msg))	  return true;
@@ -6157,8 +5951,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			    $substitutionarray['__SHIPPINGTRACKNUM__'] = 'Shipping tacking number';
 				$substitutionarray['__SHIPPINGTRACKNUMURL__'] = 'Shipping tracking url';
 			}
-		}
-		else {
+		} else {
 			$substitutionarray['__ID__'] = $object->id;
 			$substitutionarray['__REF__'] = $object->ref;
 			$substitutionarray['__REF_CLIENT__'] = (isset($object->ref_client) ? $object->ref_client : (isset($object->ref_customer) ? $object->ref_customer : null));
@@ -6230,8 +6023,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__THIRDPARTY_TVAINTRA__'] = (is_object($object) ? $object->tva_intra : '');
 				$substitutionarray['__THIRDPARTY_NOTE_PUBLIC__'] = (is_object($object) ?dol_htmlentitiesbr($object->note_public) : '');
 				$substitutionarray['__THIRDPARTY_NOTE_PRIVATE__'] = (is_object($object) ?dol_htmlentitiesbr($object->note_private) : '');
-			}
-			elseif (is_object($object->thirdparty) && $object->thirdparty->id > 0)
+			} elseif (is_object($object->thirdparty) && $object->thirdparty->id > 0)
 			{
 				$substitutionarray['__THIRDPARTY_ID__'] = (is_object($object->thirdparty) ? $object->thirdparty->id : '');
 				$substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object->thirdparty) ? $object->thirdparty->name : '');
@@ -6327,8 +6119,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			if (empty($substitutionarray['__REF__']))
 			{
 				$paymenturl = '';
-			}
-			else {
+			} else {
 				// Set the online payment url link into __ONLINE_PAYMENT_URL__ key
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 				$outputlangs->loadLangs(array('paypal', 'other'));
@@ -6348,18 +6139,15 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal')
 				{
 					$substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = $object->getLastMainDocLink($object->element);
-				}
-				else $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
+				} else $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
 				if (!empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'commande')
 				{
 					$substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = $object->getLastMainDocLink($object->element);
-				}
-				else $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
+				} else $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
 				if (!empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'facture')
 				{
 					$substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $object->getLastMainDocLink($object->element);
-				}
-				else $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
+				} else $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
 
 				if (is_object($object) && $object->element == 'propal') $substitutionarray['__URL_PROPOSAL__'] = DOL_MAIN_URL_ROOT."/comm/propal/card.php?id=".$object->id;
 				if (is_object($object) && $object->element == 'commande') $substitutionarray['__URL_ORDER__'] = DOL_MAIN_URL_ROOT."/commande/card.php?id=".$object->id;
@@ -6634,16 +6422,14 @@ function dolGetFirstLastname($firstname, $lastname, $nameorder = -1)
 		$ret .= $firstname;
 		if ($firstname && $lastname) $ret .= ' ';
 		$ret .= $lastname;
-	}
-	elseif ($nameorder == 2 || $nameorder == 3)
+	} elseif ($nameorder == 2 || $nameorder == 3)
 	{
 	    $ret .= $firstname;
 	    if (empty($ret) && $nameorder == 3)
 	    {
 	    	$ret .= $lastname;
 	    }
-	}
-	else {
+	} else {
 		$ret .= $lastname;
 		if ($firstname && $lastname) $ret .= ' ';
 		$ret .= $firstname;
@@ -6668,8 +6454,7 @@ function setEventMessage($mesgs, $style = 'mesgs')
 	if (!is_array($mesgs))		// If mesgs is a string
 	{
 		if ($mesgs) $_SESSION['dol_events'][$style][] = $mesgs;
-	}
-	else // If mesgs is an array
+	} else // If mesgs is an array
 	{
 		foreach ($mesgs as $mesg)
 		{
@@ -6694,8 +6479,7 @@ function setEventMessages($mesg, $mesgs, $style = 'mesgs', $messagekey = '')
 	if (empty($mesg) && empty($mesgs))
 	{
 		dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);
-	}
-	else {
+	} else {
 		if ($messagekey)
 		{
 			// Complete message with a js link to set a cookie "DOLHIDEMESSAGE".$messagekey;
@@ -6813,8 +6597,7 @@ function get_htmloutput_mesg($mesgstring = '', $mesgarray = '', $style = 'ok', $
 						}
 					});
 				</script>';
-		}
-		else {
+		} else {
 			$return = $out;
 		}
 	}
@@ -6864,8 +6647,7 @@ function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $style = 'o
 			if ($val && preg_match('/class="error"/i', $val)) { $iserror++; break; }
 			if ($val && preg_match('/class="warning"/i', $val)) { $iswarning++; break; }
 		}
-	}
-	elseif ($mesgstring && preg_match('/class="error"/i', $mesgstring)) $iserror++;
+	} elseif ($mesgstring && preg_match('/class="error"/i', $mesgstring)) $iserror++;
 	elseif ($mesgstring && preg_match('/class="warning"/i', $mesgstring)) $iswarning++;
 	if ($style == 'error') $iserror++;
 	if ($style == 'warning') $iswarning++;
@@ -6888,16 +6670,14 @@ function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $style = 'o
 					$tmpmesgstring = preg_replace('/<div class="(error|warning)">/', '', $tmpmesgstring);
 					$tmpmesgstring = preg_replace('/<\/div>/', '', $tmpmesgstring);
 					$newmesgarray[] = $tmpmesgstring;
-				}
-				else {
+				} else {
 					dol_syslog("Error call of dol_htmloutput_mesg with an array with a value that is not a string", LOG_WARNING);
 				}
 			}
 			$mesgarray = $newmesgarray;
 		}
 		print get_htmloutput_mesg($mesgstring, $mesgarray, ($iserror ? 'error' : 'warning'), $keepembedded);
-	}
-	else print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
+	} else print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
 }
 
 /**
@@ -6945,8 +6725,7 @@ function dol_sort_array(&$array, $index, $order = 'asc', $natsort = 0, $case_sen
 				if (is_object($array[$key]))
 				{
 					$temp[$key] = $array[$key]->$index;
-				}
-				else {
+				} else {
 					$temp[$key] = $array[$key][$index];
 				}
 			}
@@ -7081,8 +6860,7 @@ function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid =
 		else $cache_codes[$tablename][$key][$fieldid] = '';
 		$db->free($resql);
 		return $cache_codes[$tablename][$key][$fieldid];
-	}
-	else {
+	} else {
 		return -1;
 	}
 }
@@ -7135,8 +6913,7 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1)
 	{
 		if ($hideerrors) return @eval('return '.$s.';');
 		else return eval('return '.$s.';');
-	}
-	else {
+	} else {
 		if ($hideerrors) @eval($s);
 		else eval($s);
 	}
@@ -7398,8 +7175,7 @@ function getLanguageCodeFromCountryCode($countrycode)
     			return strtolower($locale_language).'_'.strtoupper($locale_region);
     		}
     	}
-	}
-	else {
+	} else {
         dol_syslog("Warning Exention php-intl is not available", LOG_WARNING);
 	}
 
@@ -7459,16 +7235,14 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type,
 							$substitutionarray = array();
 							complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey'=>$values[2]));
 							$label = make_substitutions($reg[1], $substitutionarray);
-						}
-						else $label = $langs->trans($values[2]);
+						} else $label = $langs->trans($values[2]);
 
 						$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);
 						$head[$h][1] = $label;
 						$head[$h][2] = str_replace('+', '', $values[1]);
 						$h++;
 					}
-				}
-				elseif (count($values) == 5)       // deprecated
+				} elseif (count($values) == 5)       // deprecated
 				{
 					dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING);
 
@@ -7479,16 +7253,14 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type,
 						$substitutionarray = array();
 						complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey'=>$values[2]));
 						$label = make_substitutions($reg[1], $substitutionarray);
-					}
-					else $label = $langs->trans($values[2]);
+					} else $label = $langs->trans($values[2]);
 
 					$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[4]), 1);
 					$head[$h][1] = $label;
 					$head[$h][2] = str_replace('+', '', $values[1]);
 					$h++;
 				}
-			}
-			elseif ($mode == 'remove' && preg_match('/^\-/', $values[1]))
+			} elseif ($mode == 'remove' && preg_match('/^\-/', $values[1]))
 			{
 				if ($values[0] != $type) continue;
 				$tabname = str_replace('-', '', $values[1]);
@@ -7593,8 +7365,7 @@ function printCommonFooter($zone = 'private')
 							}
 							if (!$foundintru) $qualified = 1;
 							//var_dump($defkey.'-'.$qualified);
-						}
-						else $qualified = 1;
+						} else $qualified = 1;
 
 						if ($qualified)
 						{
@@ -7625,8 +7396,7 @@ function printCommonFooter($zone = 'private')
 							}
 							if (!$foundintru) $qualified = 1;
 							//var_dump($defkey.'-'.$qualified);
-						}
-						else $qualified = 1;
+						} else $qualified = 1;
 
 						if ($qualified)
 						{
@@ -7703,8 +7473,7 @@ function printCommonFooter($zone = 'private')
 	        $debugbar['time']->stopMeasure('pageaftermaster');
 	        print '<!-- Output debugbar data -->'."\n";
 		    print $debugbar->getRenderer()->render();
-		}
-		elseif (count($conf->logbuffer))    // If there is some logs in buffer to show
+		} elseif (count($conf->logbuffer))    // If there is some logs in buffer to show
 		{
 			print "\n";
 			print "<!-- Start of log output\n";
@@ -7841,20 +7610,17 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 					if (is_numeric($numnewcrit))
 					{
 						$newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$numnewcrit;
-					}
-					else {
+					} else {
 						$newres .= ($i2 > 0 ? ' OR ' : '').'1 = 2'; // force false
 					}
 					$i2++; // a criteria was added to string
 				}
-			}
-			elseif ($mode == 2 || $mode == -2)
+			} elseif ($mode == 2 || $mode == -2)
 			{
 				$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -2 ? 'NOT ' : '')."IN (".$db->escape(trim($crit)).")";
 				if ($mode == -2) $newres .= ' OR '.$field.' IS NULL';
 				$i2++; // a criteria was added to string
-			}
-			elseif ($mode == 3 || $mode == -3)
+			} elseif ($mode == 3 || $mode == -3)
 			{
 				$tmparray = explode(',', trim($crit));
 				if (count($tmparray))
@@ -7872,8 +7638,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 					$i2++; // a criteria was added to string
 				}
 				if ($mode == -3) $newres .= ' OR '.$field.' IS NULL';
-			}
-			elseif ($mode == 4)
+			} elseif ($mode == 4)
 			{
 			    $tmparray = explode(',', trim($crit));
 			    if (count($tmparray))
@@ -7892,8 +7657,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 			            }
 			        }
 			    }
-			}
-			else // $mode=0
+			} else // $mode=0
 			{
 				$tmpcrits = explode('|', $crit);
 				$i3 = 0;
@@ -7906,8 +7670,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 					if (preg_match('/\.(id|rowid)$/', $field))	// Special case for rowid that is sometimes a ref so used as a search field
 					{
 						$newres .= $field." = ".(is_numeric(trim($tmpcrit)) ?trim($tmpcrit) : '0');
-					}
-					else {
+					} else {
 						$newres .= $field." LIKE '";
 
 						$tmpcrit = trim($tmpcrit);
@@ -8197,8 +7960,7 @@ function getDictvalue($tablename, $field, $id, $checkentity = false, $rowidfield
 			{
 				$dictvalues[$tablename][$obj->{$rowidfield}] = $obj;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -8230,8 +7992,7 @@ function colorIsLight($stringcolor)
 			$r = $tmp[0];
 			$g = $tmp[1];
 			$b = $tmp[2];
-		}
-		else {
+		} else {
 			$hexr = $stringcolor[0].$stringcolor[1];
 			$hexg = $stringcolor[2].$stringcolor[3];
 			$hexb = $stringcolor[4].$stringcolor[5];
@@ -8327,11 +8088,9 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '
         foreach ($params['attr']as $key => $value) {
 			if ($key == 'class') {
 				$attr['class'] .= ' '.$value;
-			}
-			elseif ($key == 'classOverride') {
+			} elseif ($key == 'classOverride') {
 				$attr['class'] = $value;
-			}
-			else {
+			} else {
 				$attr[$key] = $value;
 			}
         }
@@ -8382,8 +8141,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
 
     if ($displayMode == 0) {
         $return = !empty($html) ? $html : $statusLabel;
-    }
-    elseif ($displayMode == 1) {
+    } elseif ($displayMode == 1) {
         $return = !empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel);
     }
     // Use status with images (for backward compatibility)
@@ -8422,17 +8180,13 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
 
         if ($displayMode === 2) {
             $return = $htmlImg.' '.$htmlLabelShort;
-        }
-        elseif ($displayMode === 3) {
+        } elseif ($displayMode === 3) {
             $return = $htmlImg;
-        }
-        elseif ($displayMode === 4) {
+        } elseif ($displayMode === 4) {
             $return = $htmlImg.' '.$htmlLabel;
-        }
-        elseif ($displayMode === 5) {
+        } elseif ($displayMode === 5) {
             $return = $htmlLabelShort.' '.$htmlImg;
-        }
-        else { // $displayMode >= 6
+        } else { // $displayMode >= 6
             $return = $htmlLabel.' '.$htmlImg;
         }
     }
@@ -8445,11 +8199,9 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
 
         if ($displayMode == 3) {
             $return = dolGetBadge($statusLabel, '', $statusType, 'dot', $url, $dolGetBadgeParams);
-        }
-        elseif ($displayMode === 5) {
+        } elseif ($displayMode === 5) {
             $return = dolGetBadge($statusLabelShort, $html, $statusType, '', $url, $dolGetBadgeParams);
-        }
-        else {
+        } else {
             $return = dolGetBadge($statusLabel, $html, $statusType, '', $url, $dolGetBadgeParams);
         }
     }
@@ -8502,11 +8254,9 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
         foreach ($params['attr'] as $key => $value) {
             if ($key == 'class') {
                 $attr['class'] .= ' '.$value;
-            }
-            elseif ($key == 'classOverride') {
+            } elseif ($key == 'classOverride') {
                 $attr['class'] = $value;
-            }
-            else {
+            } else {
                 $attr[$key] = $value;
             }
         }
@@ -8575,8 +8325,7 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
 
         if ($status == -1) { // disable
             $attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("FeatureDisabled"));
-        }
-        elseif ($status == 0) { // Not enough permissions
+        } elseif ($status == 0) { // Not enough permissions
             $attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions"));
         }
     }
@@ -8594,11 +8343,9 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
         foreach ($params['attr'] as $key => $value) {
             if ($key == 'class') {
                 $attr['class'] .= ' '.$value;
-            }
-            elseif ($key == 'classOverride') {
+            } elseif ($key == 'classOverride') {
                 $attr['class'] = $value;
-            }
-            else {
+            } else {
                 $attr[$key] = $value;
             }
         }
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index dcdd31a1cc2..c212662b7e6 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -55,8 +55,7 @@ function jsUnEscape($source)
                 $entity = "&#".$unicode.';';
                 $decodedStr .= utf8_encode($entity);
                 $pos += 4;
-            }
-            else {
+            } else {
                 // we have an escaped ascii character
                 $hexVal = substr($source, $pos, 2);
                 $decodedStr .= chr(hexdec($hexVal));
@@ -159,8 +158,7 @@ function dol_print_file($langs, $filename, $searchalt = 0)
             elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
             else print $content;
             return true;
-        }
-        else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
+        } else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
 
         if ($searchalt) {
             // Test si fichier dans repertoire de la langue alternative
@@ -176,8 +174,7 @@ function dol_print_file($langs, $filename, $searchalt = 0)
                 elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
                 else print $content;
                 return true;
-            }
-            else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
+            } else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
         }
     }
 
@@ -232,8 +229,7 @@ function dol_print_object_info($object, $usetable = 0)
         {
         	if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
-        }
-        else {
+        } else {
             $userstatic = new User($db);
             $userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);
             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
@@ -267,8 +263,7 @@ function dol_print_object_info($object, $usetable = 0)
         {
         	if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
-        }
-        else {
+        } else {
             $userstatic = new User($db);
             $userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);
             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
@@ -302,8 +297,7 @@ function dol_print_object_info($object, $usetable = 0)
         {
             if ($object->user_validation->id) print $object->user_validation->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
-        }
-        else {
+        } else {
             $userstatic = new User($db);
             $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
@@ -337,8 +331,7 @@ function dol_print_object_info($object, $usetable = 0)
         {
             if ($object->user_approve->id) print $object->user_approve->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
-        }
-        else {
+        } else {
             $userstatic = new User($db);
             $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
@@ -400,8 +393,7 @@ function dol_print_object_info($object, $usetable = 0)
         {
 			if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
-        }
-        else {
+        } else {
             $userstatic = new User($db);
             $userstatic->fetch($object->user_cloture);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
@@ -435,8 +427,7 @@ function dol_print_object_info($object, $usetable = 0)
         {
 			if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
-        }
-        else {
+        } else {
             $userstatic = new User($db);
             $userstatic->fetch($object->user_rappro);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
@@ -612,8 +603,7 @@ function clean_url($url, $http = 1)
         $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain, '/').'/i', $newproto.strtolower($domain), $url);
 
         return $CleanUrl;
-    }
-    else return $url;
+    } else return $url;
 }
 
 
@@ -753,8 +743,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
         $masktri = $reg[1].(!empty($reg[2]) ? $reg[2] : '').(!empty($reg[3]) ? $reg[3] : '');
         $maskcounter = $reg[1];
         $hasglobalcounter = true;
-    }
-    else {
+    } else {
         // setting some defaults so the rest of the code won't fail if there is a third party counter
         $masktri = '00000';
         $maskcounter = '00000';
@@ -776,8 +765,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
         $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
         $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like
         if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
-    }
-    else $maskrefclient = '';
+    } else $maskrefclient = '';
 
     // fail if there is neither a global nor a third party counter
     if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))
@@ -791,8 +779,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
         $masktype = $regType[1];
         $masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdpaty typent_code (where n is length in mask)
         $masktype_value = str_pad($masktype_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
-    }
-    else {
+    } else {
     	$masktype = '';
     	$masktype_value = '';
     }
@@ -806,8 +793,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
     	$maskuser = $regType[1];
     	$maskuser_value = substr($lastname, 0, dol_strlen($regType[1])); // get n first characters of user firstname (where n is length in mask)
     	$maskuser_value = str_pad($maskuser_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
-    }
-    else {
+    } else {
     	$maskuser = '';
     	$maskuser_value = '';
     }
@@ -882,18 +868,12 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
         // Define posy, posm and reg
         if ($maskraz > 1)	// if reset is not first month, we need month and year into mask
         {
-            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; }
-            elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; }
-            else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; } elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; } else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
 
             if (dol_strlen($reg[$posy]) < 2) return 'ErrorCantUseRazWithYearOnOneDigit';
-        }
-        else // if reset is for a specific month in year, we need year
+        } else // if reset is for a specific month in year, we need year
         {
-            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; }
-        	elseif (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; }
-            elseif (preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 0; }
-            else return 'ErrorCantUseRazIfNoYearInMask';
+            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; } elseif (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; } elseif (preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 0; } else return 'ErrorCantUseRazIfNoYearInMask';
         }
         // Define length
         $yearlen = $posy ?dol_strlen($reg[$posy]) : 0;
@@ -946,13 +926,11 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
             $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'";
             $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";
             $sqlwhere .= ')';
-        }
-		elseif ($resetEveryMonth)
+        } elseif ($resetEveryMonth)
 		{
 			$sqlwhere .= "(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
             $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
-		}
-        else // reset is done on january
+		} else // reset is done on january
         {
             $sqlwhere .= '(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";
         }
@@ -964,8 +942,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
     if (function_exists('mb_strrpos'))
     	{
     	$posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 'UTF-8');
-	}
-	else {
+	} else {
     	$posnumstart = strrpos($maskwithnocode, $maskcounter);
 	}	// Pos of counter in final string (from 0 to ...)
     if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';
@@ -1010,8 +987,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
     {
         $obj = $db->fetch_object($resql);
         $counter = $obj->val;
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
 
     // Check if we must force counter to maskoffset
     if (empty($counter)) $counter = $maskoffset;
@@ -1019,8 +995,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
     {
     	$counter = 0;
     	dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);
-    }
-    elseif ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter = $maskoffset;
+    } elseif ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter = $maskoffset;
 
     if ($mode == 'last')	// We found value for counter = last counter value. Now need to get corresponding ref of invoice.
     {
@@ -1058,12 +1033,10 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
         {
             $obj = $db->fetch_object($resql);
             if ($obj) $ref = $obj->ref;
-        }
-        else dol_print_error($db);
+        } else dol_print_error($db);
 
         $numFinal = $ref;
-    }
-    elseif ($mode == 'next')
+    } elseif ($mode == 'next')
     {
         $counter++;
 
@@ -1115,8 +1088,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
             {
                 $maskrefclient_obj = $db->fetch_object($maskrefclient_resql);
                 $maskrefclient_counter = $maskrefclient_obj->val;
-            }
-            else dol_print_error($db);
+            } else dol_print_error($db);
 
             if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i', $maskrefclient_counter)) $maskrefclient_counter = $maskrefclient_maskoffset;
 			$maskrefclient_counter++;
@@ -1131,8 +1103,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	        $numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date) + $yearoffset, $numFinal);
         	$numFinal = preg_replace('/\{yy\}/i', date("y", $date) + $yearoffset, $numFinal);
         	$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1) + $yearoffset, $numFinal);
-		}
-		else // we want yyyy to be current year
+		} else // we want yyyy to be current year
 		{
         	$numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date), $numFinal);
         	$numFinal = preg_replace('/\{yy\}/i', date("y", $date), $numFinal);
@@ -1213,8 +1184,7 @@ function check_value($mask, $value)
         $masktri = $reg[1].(isset($reg[2]) ? $reg[2] : '').(isset($reg[3]) ? $reg[3] : '');
         $maskcounter = $reg[1];
         $hasglobalcounter = true;
-    }
-    else {
+    } else {
         // setting some defaults so the rest of the code won't fail if there is a third party counter
         $masktri = '00000';
         $maskcounter = '00000';
@@ -1235,8 +1205,7 @@ function check_value($mask, $value)
         $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
         $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like
         if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
-    }
-    else $maskrefclient = '';
+    } else $maskrefclient = '';
 
     // fail if there is neither a global nor a third party counter
     if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))
@@ -1380,16 +1349,13 @@ function numero_semaine($time)
     if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 0) // Dimanche
     {
         $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + 4 * 24 * 60 * 60;
-    }
-    elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) < 4) // du Lundi au Mercredi
+    } elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) < 4) // du Lundi au Mercredi
     {
         $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (4 - date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)))) * 24 * 60 * 60;
-    }
-    elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) > 4) // du Vendredi au Samedi
+    } elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) > 4) // du Vendredi au Samedi
     {
         $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (7 - (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) - 4)) * 24 * 60 * 60;
-    }
-    else // Jeudi
+    } else // Jeudi
     {
         $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine));
     }
@@ -1410,8 +1376,7 @@ function numero_semaine($time)
         if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 4 || (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 3 && date("z", mktime(12, 0, 0, 12, 31, date("Y", $jeudiSemaine))) == 365))
         {
             $numeroSemaine = 53;
-        }
-        else {
+        } else {
             $numeroSemaine = 1;
         }
     }
@@ -1515,8 +1480,7 @@ function dol_set_user_param($db, $conf, &$user, $tab)
             }
             $user->conf->$key = $value;
             //print "key=".$key." user->conf->key=".$user->conf->$key;
-        }
-        else {
+        } else {
             unset($user->conf->$key);
         }
     }
@@ -1538,8 +1502,7 @@ function dol_print_reduction($reduction, $langs)
     if ($reduction == 100)
     {
         $string = $langs->transnoentities("Offered");
-    }
-    else {
+    } else {
     	$string = vatrate($reduction, true);
     }
 
@@ -1659,12 +1622,10 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
                         $max = ($maxfilenamelength ? $maxfilenamelength : 28);
                         $liste[$obj->id.':'.$record['fullname']] = dol_trunc($record['name'], $max, 'middle');
                     }
-                }
-                else {
+                } else {
                     $liste[0] = $obj->label.': '.$langs->trans("None");
                 }
-            }
-            else {
+            } else {
             	if ($type == 'member' && $obj->doc_template_name == 'standard')   // Special case, if member template, we add variant per format
                 {
                     global $_Avery_Labels;
@@ -1673,16 +1634,14 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
                     {
                     	$liste[$obj->id.':'.$key] = ($obj->label ? $obj->label : $obj->doc_template_name).' '.$val['name'];
                     }
-                }
-                else // Common usage
+                } else // Common usage
                 {
                 	$liste[$obj->id] = $obj->label ? $obj->label : $obj->doc_template_name;
                 }
             }
             $i++;
         }
-    }
-    else {
+    } else {
         dol_print_error($db);
         return -1;
     }
@@ -1759,8 +1718,7 @@ function getSoapParams()
                       'proxy_password' => $proxypass,
                       'trace'		   => 1
         );
-    }
-    else {
+    } else {
         $params = array('connection_timeout'=>$timeout,
                       'response_timeout'=>$response_timeout,
                       'proxy_use'      => 0,
@@ -1813,64 +1771,51 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 		$classpath = 'compta/facture/class';
 		$module = 'facture';
 		$myobject = 'facture';
-	}
-	elseif ($objecttype == 'commande' || $objecttype == 'order') {
+	} elseif ($objecttype == 'commande' || $objecttype == 'order') {
 		$classpath = 'commande/class';
 		$module = 'commande';
 		$myobject = 'commande';
-	}
-	elseif ($objecttype == 'propal') {
+	} elseif ($objecttype == 'propal') {
 		$classpath = 'comm/propal/class';
-	}
-	elseif ($objecttype == 'supplier_proposal') {
+	} elseif ($objecttype == 'supplier_proposal') {
 		$classpath = 'supplier_proposal/class';
-	}
-	elseif ($objecttype == 'shipping') {
+	} elseif ($objecttype == 'shipping') {
 		$classpath = 'expedition/class';
 		$myobject = 'expedition';
 		$module = 'expedition_bon';
-	}
-	elseif ($objecttype == 'delivery') {
+	} elseif ($objecttype == 'delivery') {
 		$classpath = 'livraison/class';
 		$myobject = 'livraison';
 		$module = 'livraison_bon';
-	}
-	elseif ($objecttype == 'contract') {
+	} elseif ($objecttype == 'contract') {
 		$classpath = 'contrat/class';
 		$module = 'contrat';
 		$myobject = 'contrat';
-	}
-	elseif ($objecttype == 'member') {
+	} elseif ($objecttype == 'member') {
 		$classpath = 'adherents/class';
 		$module = 'adherent';
 		$myobject = 'adherent';
-	}
-	elseif ($objecttype == 'cabinetmed_cons') {
+	} elseif ($objecttype == 'cabinetmed_cons') {
 		$classpath = 'cabinetmed/class';
 		$module = 'cabinetmed';
 		$myobject = 'cabinetmedcons';
-	}
-	elseif ($objecttype == 'fichinter') {
+	} elseif ($objecttype == 'fichinter') {
 		$classpath = 'fichinter/class';
 		$module = 'ficheinter';
 		$myobject = 'fichinter';
-	}
-	elseif ($objecttype == 'task') {
+	} elseif ($objecttype == 'task') {
 		$classpath = 'projet/class';
 		$module = 'projet';
 		$myobject = 'task';
-	}
-	elseif ($objecttype == 'stock') {
+	} elseif ($objecttype == 'stock') {
 		$classpath = 'product/stock/class';
 		$module = 'stock';
 		$myobject = 'stock';
-	}
-	elseif ($objecttype == 'inventory') {
+	} elseif ($objecttype == 'inventory') {
 		$classpath = 'product/inventory/class';
 		$module = 'stock';
 		$myobject = 'inventory';
-	}
-	elseif ($objecttype == 'mo') {
+	} elseif ($objecttype == 'mo') {
 		$classpath = 'mrp/class';
 		$module = 'mrp';
 		$myobject = 'mo';
@@ -1885,14 +1830,12 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 		$classname = 'FactureFournisseur';
 		$classpath = 'fourn/class';
 		$module = 'fournisseur';
-	}
-	elseif ($objecttype == 'order_supplier') {
+	} elseif ($objecttype == 'order_supplier') {
 		$classfile = 'fournisseur.commande';
 		$classname = 'CommandeFournisseur';
 		$classpath = 'fourn/class';
 		$module = 'fournisseur';
-	}
-	elseif ($objecttype == 'stock') {
+	} elseif ($objecttype == 'stock') {
 		$classpath = 'product/stock/class';
 		$classfile = 'entrepot';
 		$classname = 'Entrepot';
@@ -1913,8 +1856,7 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 					$ret = $langs->trans('Deleted');
 				}
 				unset($object);
-			}
-			else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
+			} else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
 		}
 	}
 	return $ret;
@@ -1949,8 +1891,7 @@ function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
 			if ($obj->parent_id > 0) $listofparentid[$obj->rowid] = $obj->parent_id;
 			$i++;
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
@@ -2128,8 +2069,7 @@ function colorAgressiveness($hex, $ratio = -50, $brightness = 0)
 		{
 			if ($color > 127) $color += ((255 - $color) * ($ratio / 100));
 			if ($color < 128) $color -= ($color * ($ratio / 100));
-		}
-		else // We decrease agressiveness
+		} else // We decrease agressiveness
 		{
 			if ($color > 128) $color -= (($color - 128) * (abs($ratio) / 100));
 			if ($color < 127) $color += ((128 - $color) * (abs($ratio) / 100));
@@ -2137,8 +2077,7 @@ function colorAgressiveness($hex, $ratio = -50, $brightness = 0)
 		if ($brightness > 0)
 		{
 			$color = ($color * (100 + abs($brightness)) / 100);
-		}
-		else {
+		} else {
 			$color = ($color * (100 - abs($brightness)) / 100);
 		}
 
@@ -2221,15 +2160,13 @@ function colorHexToRgb($hex, $alpha = false, $returnArray = false)
     if ($alpha !== false) {
         $rgb['a'] = floatval($alpha);
         $string = 'rgba('.implode(',', $rgb).')';
-    }
-    else {
+    } else {
         $string = 'rgb('.implode(',', $rgb).')';
     }
 
     if ($returnArray) {
         return $rgb;
-    }
-    else {
+    } else {
         return $string;
     }
 }
@@ -2279,71 +2216,49 @@ function getModuleDirForApiClass($module)
 
     if ($module == 'contracts') {
     	$moduledirforclass = 'contrat';
-    }
-    elseif (in_array($module, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {
+    } elseif (in_array($module, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {
         $moduledirforclass = 'api';
-    }
-    elseif ($module == 'contact' || $module == 'contacts' || $module == 'customer' || $module == 'thirdparty' || $module == 'thirdparties') {
+    } elseif ($module == 'contact' || $module == 'contacts' || $module == 'customer' || $module == 'thirdparty' || $module == 'thirdparties') {
         $moduledirforclass = 'societe';
-    }
-    elseif ($module == 'propale' || $module == 'proposals') {
+    } elseif ($module == 'propale' || $module == 'proposals') {
         $moduledirforclass = 'comm/propal';
-    }
-    elseif ($module == 'agenda' || $module == 'agendaevents') {
+    } elseif ($module == 'agenda' || $module == 'agendaevents') {
         $moduledirforclass = 'comm/action';
-    }
-    elseif ($module == 'adherent' || $module == 'members' || $module == 'memberstypes' || $module == 'subscriptions') {
+    } elseif ($module == 'adherent' || $module == 'members' || $module == 'memberstypes' || $module == 'subscriptions') {
         $moduledirforclass = 'adherents';
-    }
-    elseif ($module == 'don' || $module == 'donations') {
+    } elseif ($module == 'don' || $module == 'donations') {
         $moduledirforclass = 'don';
-    }
-    elseif ($module == 'banque' || $module == 'bankaccounts') {
+    } elseif ($module == 'banque' || $module == 'bankaccounts') {
         $moduledirforclass = 'compta/bank';
-    }
-    elseif ($module == 'category' || $module == 'categorie') {
+    } elseif ($module == 'category' || $module == 'categorie') {
         $moduledirforclass = 'categories';
-    }
-    elseif ($module == 'order' || $module == 'orders') {
+    } elseif ($module == 'order' || $module == 'orders') {
         $moduledirforclass = 'commande';
-    }
-    elseif ($module == 'shipments') {
+    } elseif ($module == 'shipments') {
         $moduledirforclass = 'expedition';
-    }
-    elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {
+    } elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {
         $moduledirforclass = 'compta/facture';
-    }
-    elseif ($module == 'products') {
+    } elseif ($module == 'products') {
         $moduledirforclass = 'product';
-    }
-    elseif ($module == 'project' || $module == 'projects' || $module == 'tasks') {
+    } elseif ($module == 'project' || $module == 'projects' || $module == 'tasks') {
         $moduledirforclass = 'projet';
-    }
-    elseif ($module == 'task') {
+    } elseif ($module == 'task') {
         $moduledirforclass = 'projet';
-    }
-    elseif ($module == 'stock' || $module == 'stockmovements' || $module == 'warehouses') {
+    } elseif ($module == 'stock' || $module == 'stockmovements' || $module == 'warehouses') {
         $moduledirforclass = 'product/stock';
-    }
-    elseif ($module == 'supplierproposals' || $module == 'supplierproposal' || $module == 'supplier_proposal') {
+    } elseif ($module == 'supplierproposals' || $module == 'supplierproposal' || $module == 'supplier_proposal') {
     	$moduledirforclass = 'supplier_proposal';
-    }
-    elseif ($module == 'fournisseur' || $module == 'supplierinvoices' || $module == 'supplierorders') {
+    } elseif ($module == 'fournisseur' || $module == 'supplierinvoices' || $module == 'supplierorders') {
         $moduledirforclass = 'fourn';
-    }
-    elseif ($module == 'expensereports') {
+    } elseif ($module == 'expensereports') {
         $moduledirforclass = 'expensereport';
-    }
-    elseif ($module == 'users') {
+    } elseif ($module == 'users') {
         $moduledirforclass = 'user';
-    }
-    elseif ($module == 'ficheinter' || $module == 'interventions') {
+    } elseif ($module == 'ficheinter' || $module == 'interventions') {
     	$moduledirforclass = 'fichinter';
-    }
-    elseif ($module == 'tickets') {
+    } elseif ($module == 'tickets') {
     	$moduledirforclass = 'ticket';
-    }
-    elseif ($module == 'boms') {
+    } elseif ($module == 'boms') {
         $moduledirforclass = 'bom';
     }
 
@@ -2410,8 +2325,7 @@ function autoOrManual($automaticmanual, $case = 1, $color = 0)
         if ($case == 3) $result = '<input type="checkbox" value="1" checked disabled> '.$result;
 
         $classname = 'ok';
-    }
-    elseif ($automaticmanual == 0 || strtolower($automaticmanual) == 'manual' || strtolower($automaticmanual) == 'false')
+    } elseif ($automaticmanual == 0 || strtolower($automaticmanual) == 'manual' || strtolower($automaticmanual) == 'false')
     {
         $result = $langs->trans("manual");
         if ($case == 1 || $case == 3) $result = $langs->trans("Manual");
diff --git a/htdocs/core/lib/functionsnumtoword.lib.php b/htdocs/core/lib/functionsnumtoword.lib.php
index f3dfa25c05c..04c60bbc8e4 100644
--- a/htdocs/core/lib/functionsnumtoword.lib.php
+++ b/htdocs/core/lib/functionsnumtoword.lib.php
@@ -180,17 +180,13 @@ function dolNumberToWord($numero, $langs, $numorcurrency = 'number')
 	{
 		if ($numero >= 1 && $numero < 2) {
 			return ("UN PESO ".$parte_decimal." / 100 M.N.");
-		}
-		elseif ($numero >= 0 && $numero < 1) {
+		} elseif ($numero >= 0 && $numero < 1) {
 			return ("CERO PESOS ".$parte_decimal." / 100 M.N.");
-		}
-		elseif ($numero >= 1000000 && $numero < 1000001) {
+		} elseif ($numero >= 1000000 && $numero < 1000001) {
 			return ("UN MILL&OacuteN DE PESOS ".$parte_decimal." / 100 M.N.");
-		}
-		elseif ($numero >= 1000000000000 && $numero < 1000000000001) {
+		} elseif ($numero >= 1000000000000 && $numero < 1000000000001) {
 			return ("UN BILL&OacuteN DE PESOS ".$parte_decimal." / 100 M.N.");
-		}
-		else {
+		} else {
 			$entexto = "";
 			$number = $numero;
 			if ($number >= 1000000000) {
@@ -269,13 +265,11 @@ function hundreds2text($hundreds, $tens, $units)
 			$entexto .= $unidades[$units - 1];
 		}
 		return $entexto;
-	}
-	elseif ($tens == 2) {
+	} elseif ($tens == 2) {
 		if ($hundreds != 0) $entexto .= " ";
 		$entexto .= " ".$veintis[$units];
 		return $entexto;
-	}
-	elseif ($tens == 1) {
+	} elseif ($tens == 1) {
 		if ($hundreds != 0) $entexto .= " ";
 		$entexto .= $diecis[$units];
 		return $entexto;
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 0175ed83e61..e6e20692317 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -77,13 +77,11 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
     {
     	curl_setopt($ch, CURLOPT_POST, 1); // POST
     	curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // Setting param x=a&y=z as POST fields
-    }
-    elseif ($postorget == 'POSTALREADYFORMATED')
+    } elseif ($postorget == 'POSTALREADYFORMATED')
     {
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST'); // HTTP request is 'POST' but param string is taken as it is
         curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string
-    }
-    elseif ($postorget == 'PUT')
+    } elseif ($postorget == 'PUT')
     {
         $array_param = null;
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
@@ -93,22 +91,18 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
     	    $array_param = $param;
     	}
     	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param)); // Setting param x=a&y=z as PUT fields
-    }
-    elseif ($postorget == 'PUTALREADYFORMATED')
+    } elseif ($postorget == 'PUTALREADYFORMATED')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
     	curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string
-    }
-    elseif ($postorget == 'HEAD')
+    } elseif ($postorget == 'HEAD')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD'
     	curl_setopt($ch, CURLOPT_NOBODY, true);
-    }
-    elseif ($postorget == 'DELETE')
+    } elseif ($postorget == 'DELETE')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE'); // POST
-    }
-    else {
+    } else {
     	curl_setopt($ch, CURLOPT_POST, 0); // GET
     }
 
@@ -141,8 +135,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
         $rep['curl_error_msg'] = curl_error($ch);
 
 		dol_syslog("getURLContent response array is ".join(',', $rep));
-    }
-    else {
+    } else {
     	$info = curl_getinfo($ch);
 
     	// Ad keys to $rep
@@ -179,8 +172,7 @@ function getDomainFromURL($url, $mode = 0)
 	if ($mode == 2)
 	{
 		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)\.([^\.]+)$/', '\1.\2.\3', $tmpdomain); // Remove part 'www.' before 'abc.mydomain.com'
-	}
-	else {
+	} else {
 		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)$/', '\1.\2', $tmpdomain); // Remove part 'www.abc.' before 'mydomain.com'
 	}
 	if (empty($mode))
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index c13c9c0f56c..cb6fdc7ad2e 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -124,25 +124,20 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	{
 		// Si le fichier n'a pas ete indique
 		return 'Bad parameter file';
-	}
-	elseif (!file_exists($file))
+	} elseif (!file_exists($file))
 	{
 		// Si le fichier passe en parametre n'existe pas
 		return $langs->trans("ErrorFileNotFound", $file);
-	}
-	elseif (image_format_supported($file) < 0)
+	} elseif (image_format_supported($file) < 0)
 	{
 		return 'This filename '.$file.' does not seem to be an image filename.';
-	}
-	elseif (!is_numeric($newWidth) && !is_numeric($newHeight))
+	} elseif (!is_numeric($newWidth) && !is_numeric($newHeight))
 	{
 		return 'Wrong value for parameter newWidth or newHeight';
-	}
-	elseif ($mode == 0 && $newWidth <= 0 && $newHeight <= 0)
+	} elseif ($mode == 0 && $newWidth <= 0 && $newHeight <= 0)
 	{
 		return 'At least newHeight or newWidth must be defined for resizing';
-	}
-	elseif ($mode == 1 && ($newWidth <= 0 || $newHeight <= 0))
+	} elseif ($mode == 1 && ($newWidth <= 0 || $newHeight <= 0))
 	{
 		return 'Both newHeight or newWidth must be defined for croping';
 	}
@@ -220,8 +215,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	{
 		// Compatibilite image GIF
 		$imgThumb = imagecreate($newWidth, $newHeight);
-	}
-	else {
+	} else {
 		$imgThumb = imagecreatetruecolor($newWidth, $newHeight);
 	}
 
@@ -349,16 +343,14 @@ function correctExifImageOrientation($fileSource, $fileDest, $quality = 95)
 						$img = imagerotate($img, $deg, imageColorAllocateAlpha($img, 0, 0, 0, 127));
 						imagealphablending($img, false);
 						imagesavealpha($img, true);
-					}
-					else {
+					} else {
 						$img = imagerotate($img, $deg, 0);
 					}
 				}
 				// then rewrite the rotated image back to the disk as $fileDest
 				if ($fileDest === false) {
 					return $img;
-				}
-				else {
+				} else {
 					// In fact there exif is only for JPG but just in case
 					// Create image on disk
 					$image = false;
@@ -423,24 +415,20 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 	{
 		// Si le fichier n'a pas ete indique
 		return 'ErrorBadParameters';
-	}
-	elseif (!file_exists($file))
+	} elseif (!file_exists($file))
 	{
 		// Si le fichier passe en parametre n'existe pas
         dol_syslog($langs->trans("ErrorFileNotFound", $file), LOG_ERR);
 	    return $langs->trans("ErrorFileNotFound", $file);
-	}
-	elseif (image_format_supported($file) < 0)
+	} elseif (image_format_supported($file) < 0)
 	{
         dol_syslog('This file '.$file.' does not seem to be an image format file name.', LOG_WARNING);
 	    return 'ErrorBadImageFormat';
-	}
-	elseif (!is_numeric($maxWidth) || empty($maxWidth) || $maxWidth < -1) {
+	} elseif (!is_numeric($maxWidth) || empty($maxWidth) || $maxWidth < -1) {
 		// Si la largeur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0)
         dol_syslog('Wrong value for parameter maxWidth', LOG_ERR);
 	    return 'Error: Wrong value for parameter maxWidth';
-	}
-	elseif (!is_numeric($maxHeight) || empty($maxHeight) || $maxHeight < -1) {
+	} elseif (!is_numeric($maxHeight) || empty($maxHeight) || $maxHeight < -1) {
 		// Si la hauteur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0)
         dol_syslog('Wrong value for parameter maxHeight', LOG_ERR);
 	    return 'Error: Wrong value for parameter maxHeight';
@@ -568,8 +556,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 			$rotated = imagerotate($img, $exifAngle, imageColorAllocateAlpha($img, 0, 0, 0, 127));
 			imagealphablending($rotated, false);
 			imagesavealpha($rotated, true);
-		}
-    	else {
+		} else {
 			$rotated = imagerotate($img, $exifAngle, 0);
 		}
 
@@ -594,8 +581,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 		// Si largeur determinante
 		$thumbWidth  = $maxWidth;
 		$thumbHeight = $thumbWidth / $imgWhFact;
-	}
-	else {
+	} else {
 		// Si hauteur determinante
 		$thumbHeight = $maxHeight;
 		$thumbWidth  = $thumbHeight * $imgWhFact;
@@ -611,8 +597,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 	{
 		// Compatibilite image GIF
 		$imgThumb = imagecreate($thumbWidth, $thumbHeight);
-	}
-	else {
+	} else {
 		$imgThumb = imagecreatetruecolor($thumbWidth, $thumbHeight);
 	}
 
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 703d50c97f8..4094da1375f 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -67,8 +67,7 @@ function facture_prepare_head($object)
         {
             $obj = $db->fetch_object($resql);
             if ($obj) $nbStandingOrders = $obj->nb;
-        }
-        else dol_print_error($db);
+        } else dol_print_error($db);
 		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('StandingOrders');
 		if ($nbStandingOrders > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbStandingOrders.'</span>';
diff --git a/htdocs/core/lib/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php
index 64ecdcf9e69..1357bfb2417 100644
--- a/htdocs/core/lib/invoice2.lib.php
+++ b/htdocs/core/lib/invoice2.lib.php
@@ -176,8 +176,7 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 					{
 						if ($usestdout) print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n";
 						$result = $fac->generateDocument($regenerate ? $regenerate : $fac->modelpdf, $outputlangs);
-					}
-					else {
+					} else {
 						if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n";
 					}
 
@@ -261,14 +260,12 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 			}
 
 			$result = 1;
-		}
-		else {
+		} else {
 			if ($usestdout) print "No invoices found for criteria.\n";
 			else dol_syslog("No invoices found for criteria");
 			$result = 0;
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 		dol_syslog("scripts/invoices/rebuild_merge.php: Error");
 		$error++;
diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index 9bf2db7278c..bdd5f622838 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -53,8 +53,7 @@ function dol_json_encode($elements)
 	if (is_object($elements))	// Count number of properties for an object
 	{
 		foreach ($elements as $key => $value) $num++;
-	}
-	else {
+	} else {
 	    $num = count($elements);
 	}
 	//var_dump($num);
@@ -73,8 +72,7 @@ function dol_json_encode($elements)
 			if ($i !== $last) $output .= ',';
 		}
 		$output .= ']';
-	}
-	else {
+	} else {
 		// associative (object)
 		$output = '{';
 		$last = $num - 1;
@@ -195,8 +193,7 @@ function _val($val)
 	    }
 
 	    return '"'.$ascii.'"';
-	}
-	elseif (is_int($val)) return sprintf('%d', $val);
+	} elseif (is_int($val)) return sprintf('%d', $val);
 	elseif (is_float($val)) return sprintf('%F', $val);
 	elseif (is_bool($val)) return ($val ? 'true' : 'false');
 	else return 'null';
@@ -242,8 +239,7 @@ function dol_json_decode($json, $assoc = false)
 			elseif (($json[$i] == '}') || ($json[$i] == ']')) $out .= ')';
 			elseif ($json[$i] == ':') $out .= ' => ';
 			else $out .= $json[$i];
-		}
-		else $out .= $json[$i];
+		} else $out .= $json[$i];
 		if ($json[$i] == '"' && $json[($i - 1)] != "\\") $comment = !$comment;
 	}
 
diff --git a/htdocs/core/lib/ldap.lib.php b/htdocs/core/lib/ldap.lib.php
index b5ea5faf3c5..f95b6d03407 100644
--- a/htdocs/core/lib/ldap.lib.php
+++ b/htdocs/core/lib/ldap.lib.php
@@ -112,17 +112,14 @@ function show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass)
 	if (!function_exists("ldap_connect"))
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPFunctionsNotAvailableOnPHP').'">'.$butlabel.'</a>';
-	}
-	elseif (empty($conf->global->LDAP_SERVER_HOST))
+	} elseif (empty($conf->global->LDAP_SERVER_HOST))
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPSetupNotComplete').'">'.$butlabel.'</a>';
-	}
-	elseif (empty($key) || empty($dn) || empty($objectclass))
+	} elseif (empty($key) || empty($dn) || empty($objectclass))
 	{
 		$langs->load("errors");
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('ErrorLDAPSetupNotComplete').'">'.$butlabel.'</a>';
-	}
-	else {
+	} else {
 		print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action='.$testlabel.'">'.$butlabel.'</a>';
 	}
 	print '<br><br>';
@@ -169,8 +166,7 @@ function show_ldap_content($result, $level, $count, $var, $hide = 0, $subcount =
 				if (strtolower($key) == 'userpassword') $hide = 1;
 			}
 			show_ldap_content($val, $level + 1, $count, $var, $hide, $val["count"]);
-		}
-		elseif ($subcount)
+		} elseif ($subcount)
 		{
 			$subcount--;
 			$newstring = dol_htmlentitiesbr($val);
diff --git a/htdocs/core/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php
index 6ed00c10b34..bcecb5ed095 100644
--- a/htdocs/core/lib/memory.lib.php
+++ b/htdocs/core/lib/memory.lib.php
@@ -63,12 +63,10 @@ function dol_setcache($memoryid, $data)
 		if ($rescode == 0)
 		{
 			return count($data);
-		}
-		else {
+		} else {
 			return -$rescode;
 		}
-	}
-	elseif (!empty($conf->memcached->enabled) && class_exists('Memcache'))
+	} elseif (!empty($conf->memcached->enabled) && class_exists('Memcache'))
 	{
 		global $dolmemcache;
 		if (empty($dolmemcache) || !is_object($dolmemcache))
@@ -85,8 +83,7 @@ function dol_setcache($memoryid, $data)
 		if ($result)
 		{
 			return count($data);
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -131,12 +128,10 @@ function dol_getcache($memoryid)
 		if ($rescode == 0)
 		{
 			return $data;
-		}
-		else {
+		} else {
 			return -$rescode;
 		}
-	}
-	elseif (!empty($conf->memcached->enabled) && class_exists('Memcache'))
+	} elseif (!empty($conf->memcached->enabled) && class_exists('Memcache'))
 	{
 		global $m;
 		if (empty($m) || !is_object($m))
@@ -155,8 +150,7 @@ function dol_getcache($memoryid)
 		if ($data)
 		{
 			return $data;
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -231,8 +225,7 @@ function dol_setshmop($memoryid, $data)
 		}
 		shmop_close($handle);
 		return ($shm_bytes_written1 + $shm_bytes_written2);
-	}
-	else {
+	} else {
 		print 'Error in shmop_open for memoryid='.$memoryid.' shmkey='.$shmkey.' 6+size=6+'.$size;
 		return -1;
 	}
@@ -258,8 +251,7 @@ function dol_getshmop($memoryid)
 		if ($size) $data = unserialize(shmop_read($handle, 6, $size));
 		else return -1;
 		shmop_close($handle);
-	}
-	else {
+	} else {
 		return -2;
 	}
 	return $data;
diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index 373e80e2a67..9e2a909f2f4 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -191,8 +191,7 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 		@chmod($pathoffiletoedittarget, octdec($newmask));
 
 		return $object;
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		print $e->getMessage();
 		return -5;
@@ -240,8 +239,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 			if (class_exists($objectname)) $object = new $objectname($db);
 			else return -1;
 		}
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		print $e->getMessage();
 	}
@@ -289,8 +287,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 	if ($result)
 	{
 		@chmod($pathoffiletoedittarget, octdec($newmask));
-	}
-	else {
+	} else {
 		$error++;
 	}
 
@@ -333,8 +330,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 	if ($result)
 	{
 		@chmod($pathoffiletoedittarget, octdec($newmask));
-	}
-	else {
+	} else {
 		$error++;
 	}
 
diff --git a/htdocs/core/lib/parsemd.lib.php b/htdocs/core/lib/parsemd.lib.php
index 6a83fad87be..1120b3f8d15 100644
--- a/htdocs/core/lib/parsemd.lib.php
+++ b/htdocs/core/lib/parsemd.lib.php
@@ -45,8 +45,7 @@ function dolMd2Html($content, $parser = 'parsedown', $replaceimagepath = null)
         include_once DOL_DOCUMENT_ROOT.'/includes/parsedown/Parsedown.php';
         $Parsedown = new Parsedown();
         $content = $Parsedown->text($content);
-    }
-    else {
+    } else {
         $content = nl2br($content);
     }
 
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index eedc8034d01..969eb05328c 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -180,8 +180,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 			else $out .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 		}
 		//if ($mode) $out.='&noidempotency=1';
-	}
-	elseif ($type == 'order')
+	} elseif ($type == 'order')
 	{
 	    $out = $urltouse.'/public/payment/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'order_ref';
@@ -197,8 +196,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 				$out .= ($mode ? '</font>' : '');
 			}
 		}
-	}
-	elseif ($type == 'invoice')
+	} elseif ($type == 'invoice')
 	{
 	    $out = $urltouse.'/public/payment/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'invoice_ref';
@@ -214,8 +212,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 				$out .= ($mode ? '</font>' : '');
 			}
 		}
-	}
-	elseif ($type == 'contractline')
+	} elseif ($type == 'contractline')
 	{
 	    $out = $urltouse.'/public/payment/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'contractline_ref';
@@ -231,8 +228,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 				$out .= ($mode ? '</font>' : '');
 			}
 		}
-	}
-	elseif ($type == 'member' || $type == 'membersubscription')
+	} elseif ($type == 'member' || $type == 'membersubscription')
 	{
 	    $out = $urltouse.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'member_ref';
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index bfa49911b02..793ea47de25 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -54,8 +54,7 @@ function pdf_getFormat(Translate $outputlangs = null, $mode = 'setup')
 	{
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 		$pdfformat = dol_getDefaultFormat($outputlangs);
-	}
-	else {
+	} else {
 		$pdfformat = $conf->global->MAIN_PDF_FORMAT;
 	}
 
@@ -304,8 +303,7 @@ function pdfGetHeightForHtmlContent(&$pdf, $htmlcontent)
     $height = 0;
     if ($end_page == $start_page) {
         $height = $end_y - $start_y;
-    }
-    else {
+    } else {
         for ($page = $start_page; $page <= $end_page; ++$page) {
         	$pdf->setPage($page);
         	$tmpm = $pdf->getMargins();
@@ -480,8 +478,7 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
     			// Country
     			if (!empty($targetcontact->country_code) && $targetcontact->country_code != $sourcecompany->country_code) {
     				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code));
-    			}
-    			elseif (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
+    			} elseif (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
     				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
     			}
 
@@ -511,8 +508,7 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
                         if ($targetcontact->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
     			    }
     			}
-    		}
-    		else {
+    		} else {
     			$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcompany));
     			// Country
     			if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
@@ -778,7 +774,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 					// Key
 					$tmplength = 15;
 					$content = $account->cle_rib;
-				}elseif ($val == 'IBAN' || $val == 'BIC') {
+				} elseif ($val == 'IBAN' || $val == 'BIC') {
 					// Key
 					$tmplength = 0;
 					$content = '';
@@ -800,8 +796,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
     		$curx = $savcurx;
     		$cury += 8;
 		}
-	}
-	else {
+	} else {
 		$pdf->SetFont('', 'B', $default_font_size - $diffsizecontent);
 		$pdf->SetXY($curx, $cury);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': '.$outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
@@ -836,9 +831,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 		$tmpy = $pdf->getStringHeight(100, $val);
 		$cury += $tmpy;
 		$cur += 1;
-	}
-
-	elseif (!$usedetailedbban) $cury += 1;
+	} elseif (!$usedetailedbban) $cury += 1;
 
 	// Use correct name of bank id according to country
 	$ibankey = FormBank::getIBANLabel($account);
@@ -1054,8 +1047,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
     			$width = 200; $align = 'C';
     		}
 		    $freetextheight = $pdf->getStringHeight($width, $line);
-		}
-		else {
+		} else {
             $freetextheight = pdfGetHeightForHtmlContent($pdf, dol_htmlentitiesbr($line, 1, 'UTF-8', 0)); // New method (works for HTML content)
             //print '<br>'.$freetextheight;exit;
 		}
@@ -1070,8 +1062,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))   // by default
 		{
             $pdf->MultiCell(0, 3, $line, 0, $align, 0);
-		}
-		else {
+		} else {
             $pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk'] - $marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
 		}
 		$posy -= $freetextheight;
@@ -1238,8 +1229,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 	{
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 		$prodser = new ProductFournisseur($db);
-	}
-	else {
+	} else {
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		$prodser = new Product($db);
 	}
@@ -1275,8 +1265,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			$textwasmodified = ($note == $prodser->note);
 			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified))  $note = $prodser->multilangs[$outputlangs->defaultlang]["note"];
 		}
-	}
-	elseif ($object->element == 'facture' || $object->element == 'facturefourn') {
+	} elseif ($object->element == 'facture' || $object->element == 'facturefourn') {
 		if ($object->type == $object::TYPE_DEPOSIT) {
 			$desc = str_replace('(DEPOSIT)', $outputlangs->trans('Deposit'), $desc);
 		}
@@ -1299,8 +1288,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromCreditNote", $sourceref);
-		}
-		elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except)
+		} elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except)
 		{
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
@@ -1308,20 +1296,17 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromDeposit", $sourceref);
 			// Add date of deposit
 			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
-		}
-		elseif ($desc == '(EXCESS RECEIVED)' && $object->lines[$i]->fk_remise_except)
+		} elseif ($desc == '(EXCESS RECEIVED)' && $object->lines[$i]->fk_remise_except)
 		{
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived", $discount->ref_facture_source);
-		}
-		elseif ($desc == '(EXCESS PAID)' && $object->lines[$i]->fk_remise_except)
+		} elseif ($desc == '(EXCESS PAID)' && $object->lines[$i]->fk_remise_except)
 		{
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid", $discount->ref_invoice_supplier_source);
-		}
-		else {
+		} else {
 			if ($idprod)
 			{
 				if (empty($hidedesc))
@@ -1329,13 +1314,11 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 					if (!empty($conf->global->MAIN_DOCUMENTS_DESCRIPTION_FIRST))
 					{
 						$libelleproduitservice = $desc."\n".$libelleproduitservice;
-					}
-					else {
+					} else {
 						$libelleproduitservice .= $desc;
 					}
 				}
-			}
-			else {
+			} else {
 				$libelleproduitservice .= $desc;
 			}
 		}
@@ -1349,8 +1332,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		if ($prodser->isService())
 		{
 			$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
-		}
-		else {
+		} else {
 			$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." ";
 		}
 	}
@@ -1368,8 +1350,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 				$ref_prodserv = $prodser->ref; // Show local ref
 				if ($ref_supplier) $ref_prodserv .= ($prodser->ref ? ' (' : '').$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.($prodser->ref ? ')' : '');
 			}
-		}
-		else {
+		} else {
 			$ref_prodserv = $prodser->ref; // Show local ref only
 		}
 
@@ -1931,8 +1912,7 @@ function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookm
 			 		$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 				}
 			 	$result = ($object->lines[$i]->situation_percent - $prev_progress).'%';
-			}
-			else $result = $object->lines[$i]->situation_percent.'%';
+			} else $result = $object->lines[$i]->situation_percent.'%';
 	  	}
 	}
 	return $result;
@@ -1987,8 +1967,7 @@ function pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails = 0)
 					$progress = ($object->lines[$i]->situation_percent - $prev_progress) / 100;
         		}
 				$result .= price($sign * ($total_ht / ($object->lines[$i]->situation_percent / 100)) * $progress, 0, $outputlangs);
-        	}
-        	else {
+        	} else {
                 $result .= price($sign * $total_ht, 0, $outputlangs);
         	}
         }
@@ -2030,8 +2009,7 @@ function pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails = 0)
 		if ($object->lines[$i]->special_code == 3)
     	{
     		$result .= $outputlangs->transnoentities("Option");
-    	}
-		elseif (empty($hidedetails) || $hidedetails > 1) $result .= price($sign * ($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht) * ($object->lines[$i]->tva_tx) / 100, 0, $outputlangs);
+    	} elseif (empty($hidedetails) || $hidedetails > 1) $result .= price($sign * ($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht) * ($object->lines[$i]->tva_tx) / 100, 0, $outputlangs);
 	}
 	return $result;
 }
@@ -2060,8 +2038,7 @@ function pdf_getTotalQty($object, $type, $outputlangs)
 			if ($type == 'all')
 			{
 				$total += $object->lines[$i]->qty;
-			}
-			elseif ($type == 9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
+			} elseif ($type == 9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
 			{
 				$special_code = $object->lines[$i]->special_code;
 				if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
@@ -2069,12 +2046,10 @@ function pdf_getTotalQty($object, $type, $outputlangs)
 				$action = '';
 				$reshook = $hookmanager->executeHooks('pdf_getTotalQty', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 				return $hookmanager->resPrint;
-			}
-			elseif ($type == 0 && $object->lines[$i]->product_type == 0)
+			} elseif ($type == 0 && $object->lines[$i]->product_type == 0)
 			{
 				$total += $object->lines[$i]->qty;
-			}
-			elseif ($type == 1 && $object->lines[$i]->product_type == 1)
+			} elseif ($type == 1 && $object->lines[$i]->product_type == 1)
 			{
 				$total += $object->lines[$i]->qty;
 			}
@@ -2105,8 +2080,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
 	    if ($objecttype == 'facture')
 	    {
 	        // For invoice, we don't want to have a reference line on document. Image we are using recuring invoice, we will have a line longer than document width.
-	    }
-	    elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal')
+	    } elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal')
 		{
 			$outputlangs->load('propal');
 
@@ -2117,8 +2091,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DatePropal");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date, 'day', '', $outputlangs);
 			}
-		}
-		elseif ($objecttype == 'commande' || $objecttype == 'supplier_order')
+		} elseif ($objecttype == 'commande' || $objecttype == 'supplier_order')
 		{
 			$outputlangs->load('orders');
 			foreach ($objects as $elementobject)
@@ -2128,8 +2101,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date, 'day', '', $outputlangs);
 			}
-		}
-		elseif ($objecttype == 'contrat')
+		} elseif ($objecttype == 'contrat')
 		{
 			$outputlangs->load('contracts');
 			foreach ($objects as $elementobject)
@@ -2139,8 +2111,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateContract");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_contrat, 'day', '', $outputlangs);
 			}
-		}
-		elseif ($objecttype == 'fichinter')
+		} elseif ($objecttype == 'fichinter')
 		{
 			$outputlangs->load('interventions');
 			foreach ($objects as $elementobject)
@@ -2150,8 +2121,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("InterDate");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->datec, 'day', '', $outputlangs);
 			}
-		}
-		elseif ($objecttype == 'shipping')
+		} elseif ($objecttype == 'shipping')
 		{
 			$outputlangs->loadLangs(array("orders", "sendings"));
 
@@ -2172,8 +2142,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
 			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateShipment");
 			        //if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / ';
 			        //$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
-			    }
-			    else {
+			    } else {
 			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending");
 			        if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '');
 			        $linkedobjects[$objecttype]['ref_value'] .= ' / '.$outputlangs->transnoentities($elementobject->ref);
@@ -2219,8 +2188,7 @@ function pdf_getSizeForImage($realpath)
 		{
 			$width = $maxwidth;
 			$height = (int) round($maxwidth * $tmp['height'] / $tmp['width']);
-		}
-		else // No pb with maxheight
+		} else // No pb with maxheight
 		{
 			$height = $maxheight;
 		}
@@ -2245,8 +2213,7 @@ function pdfGetLineTotalDiscountAmount($object, $i, $outputlangs, $hidedetails =
 	if ($object->lines[$i]->special_code == 3)
 	{
 		return $outputlangs->transnoentities("Option");
-	}
-	else {
+	} else {
 		if (is_object($hookmanager))
 		{
 			$special_code = $object->lines[$i]->special_code;
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index 8f77d24bdab..f453f543305 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -131,8 +131,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		$localtax1_rate = $localtaxes_array[1];
 		$localtax2_type = $localtaxes_array[2];
 		$localtax2_rate = $localtaxes_array[3];
-	}
-	else // deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate using the full vat rate (including text code)
+	} else // deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate using the full vat rate (including text code)
 	{
 	    dol_syslog("Price.lib::calcul_price_total search vat information using old deprecated method", LOG_WARNING);
 
@@ -152,8 +151,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 				$localtax2_type = $obj->localtax2_type;
 				//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);exit;
 			}
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 	}
 
 	// pu calculation from pu_devise if pu empty
@@ -190,8 +188,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
     	$tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)), 'MU');
     	$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)), 'MU');
     	$pu_wt = price2num($pu * (1 + ($txtva / 100)), 'MU');
-    }
-    else {
+    } else {
     	$tot_sans_remise_wt = $tot_sans_remise;
     	$tot_avec_remise_wt = $tot_avec_remise;
     	$pu_wt = $pu;
@@ -265,8 +262,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		$result[5] = price2num($pu * (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)) + $localtaxes[2], 'MU'); // Selon TVA NPR ou non
 		$result5bis = price2num($pu * (1 + ($txtva / 100)) + $localtaxes[2], 'MU'); // Si TVA consideree normale (non NPR)
 		$result[4] = price2num($result5bis - ($result[3] + $localtaxes[2]), 'MU');
-	}
-	else {
+	} else {
 		// We work to define prices using the price with tax
 		$result[8] = price2num($tot_sans_remise + $localtaxes[0], 'MT');
 		$result[6] = price2num($tot_sans_remise / (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)), 'MT'); // Selon TVA NPR ou non
@@ -350,8 +346,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 			$result[2] = price2num($result[0] + $result[1], 'MT');
 			$result[9] = round($result[9] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[10] = round($result[10] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
-		}
-		else {
+		} else {
 			$result[1] = round($result[1] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[2] = round($result[2] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[0] = price2num($result[2] - $result[1], 'MT');
@@ -400,8 +395,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		$result[24] = $newresult[8];
 		$result[25] = $newresult[9];
 		$result[26] = $newresult[10];
-	}
-	else {
+	} else {
 		$result[16] = $result[0];
 		$result[17] = $result[1];
 		$result[18] = $result[2];
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index e1ed6efc805..b2ad7d8f43b 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -544,16 +544,14 @@ function measuringUnitString($unit, $measuring_style = '', $scale = '', $use_sho
 				't.rowid' => $unit,
 				't.active' => 1
 			);
-		}
-		elseif ($scale !== '')
+		} elseif ($scale !== '')
 		{
 			$arrayforfilter = array(
 				't.scale' => $scale,
 				't.unit_type' => $measuring_style,
 				't.active' => 1
 			);
-		}
-		else {
+		} else {
 			$arrayforfilter = array(
 				't.rowid' => $unit,
 				't.unit_type' => $measuring_style,
@@ -574,8 +572,7 @@ function measuringUnitString($unit, $measuring_style = '', $scale = '', $use_sho
 			$measuring_unit_cache[$unit.'_'.$measuring_style.'_'.$scale.'_'.$use_short_label] = $labeltoreturn;
 			return $labeltoreturn;
 		}
-	}
-	else {
+	} else {
 		return $measuring_unit_cache[$unit.'_'.$measuring_style.'_'.$scale.'_'.$use_short_label];
 	}
 }
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index c84762f8575..0fa9a3ed0bb 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -77,8 +77,7 @@ function project_prepare_head($object)
 		{
 			$obj = $db->fetch_object($resql);
 			if ($obj) $nbTimeSpent = 1;
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 
 		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&projectid='.$object->id;
 		$head[$h][1] = $langs->trans("TimeSpent");
@@ -191,8 +190,7 @@ function task_prepare_head($object)
 	{
 		$obj = $db->fetch_object($resql);
 		if ($obj) $nbTimeSpent = 1;
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 	$head[$h][1] = $langs->trans("TimeSpent");
@@ -418,13 +416,11 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 					if ($foundtaskforuserdeeper > 0)
 					{
 						$showlineingray = 1; // We will show line but in gray
-					}
-					else {
+					} else {
 						$showline = 0; // No reason to show line
 					}
 				}
-			}
-			else {
+			} else {
 				// Caller did not ask to filter on tasks of a specific user (this probably means he want also tasks of all users, into public project
 				// or into all other projects if user has permission to).
 				if (empty($user->rights->projet->all->lire))
@@ -679,8 +675,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				if ($lines[$i]->planned_workload) $total_projectlinesa_spent_if_planned += $lines[$i]->duration;
                 if ($lines[$i]->planned_workload) $total_projectlinesa_declared_if_planned += $lines[$i]->planned_workload * $lines[$i]->progress / 100;
 			}
-		}
-		else {
+		} else {
 			//$level--;
 		}
 	}
@@ -1261,8 +1256,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
 					print convertSecondToTime($lines[$i]->duration, 'allhourmin');
 					print '</a>';
-				}
-				else print '--:--';
+				} else print '--:--';
 				print "</td>\n";
 
 				// Time spent by user
@@ -1376,8 +1370,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				//var_dump($totalforeachday);
 			}
 			$level--;
-		}
-		else {
+		} else {
 			//$level--;
 		}
 	}
@@ -1636,8 +1629,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
 					print convertSecondToTime($lines[$i]->duration, 'allhourmin');
 					print '</a>';
-				}
-				else print '--:--';
+				} else print '--:--';
 				print "</td>\n";
 
 				// Time spent by user
@@ -1740,8 +1732,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				//var_dump($totalforeachday);
 			}
 			$level--;
-		}
-		else {
+		} else {
 			//$level--;
 		}
 	}
@@ -1904,8 +1895,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
 					print convertSecondToTime($lines[$i]->duration, 'allhourmin');
 					print '</a>';
-				}
-				else print '--:--';
+				} else print '--:--';
 				print "</td>\n";
 
 				// Time spent by user
@@ -2000,8 +1990,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 				//var_dump($totalforeachday);
 			}
 			$level--;
-		}
-		else {
+		} else {
 			//$level--;
 		}
 	}
@@ -2103,8 +2092,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 		$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
 		$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 		$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
-	}
-	else {
+	} else {
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
 	}
 	$sql .= " WHERE p.entity IN (".getEntity('project').")";
@@ -2152,8 +2140,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 			$arrayidofprojects[$objp->projectid] = $objp->projectid;
 			$i++;
 		}
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 	if (empty($arrayidofprojects)) $arrayidofprojects[0] = -1;
 
 	// Get list of project with calculation on tasks
@@ -2331,8 +2318,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 		print '</tr>';
 
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
@@ -2396,13 +2382,11 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
             $progressBarClass = 'progress-bar-danger';
             $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress - $progressCalculated).' '.$langs->trans("point"));
             $diff = '<span class="text-danger classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-down"></i> '.($task->progress - $progressCalculated).'%</span>';
-        }
-        elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
+        } elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
             $progressBarClass = 'progress-bar-warning';
             $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress - $progressCalculated).' '.$langs->trans("point"));
             $diff = '<span class="text-warning classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-left"></i> '.($task->progress - $progressCalculated).'%</span>';
-        }
-        else {
+        } else {
             $progressBarClass = 'progress-bar-success';
             $title = $langs->trans('TheReportedProgressIsMoreThanTheCalculatedProgressionByX', ($task->progress - $progressCalculated).' '.$langs->trans("point"));
             $diff = '<span class="text-success classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-up"></i> '.($task->progress - $progressCalculated).'%</span>';
@@ -2417,8 +2401,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 
         if ($label !== true) {
             $out .= $label; // replace label by param
-        }
-        else {
+        } else {
             $out .= $task->getNomUrl(1).' '.dol_htmlentities($task->label);
         }
         $out .= '    </span>';
@@ -2430,8 +2413,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
         $out .= '    <span class="progress-number">';
         if ($progressNumber !== true) {
             $out .= $progressNumber; // replace label by param
-        }
-        else {
+        } else {
             if ($task->hasDelay()) $out .= img_warning($langs->trans("Late")).' ';
 
 			$url = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$task->id;
@@ -2466,8 +2448,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 			$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.doubleval($progressCalculated / $task->progress * 100).'%" title="'.doubleval($progressCalculated).'%"></div>';
 		}
     	$out .= '        </div>';
-    }
-    else {
+    } else {
     	// bad
     	$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.doubleval($progressCalculated).'%" title="'.doubleval($progressCalculated).'%">';
     	$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.($task->progress ? doubleval($task->progress / $progressCalculated * 100).'%' : '1px').'" title="'.doubleval($task->progress).'%"></div>';
@@ -2508,12 +2489,10 @@ function getTaskProgressBadge($task, $label = '', $tooltip = '')
             if (doubleval($progressCalculated) > doubleval($task->progress * $warningRatio)) {
                 $badgeClass .= 'badge-danger';
                 if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("Expected").' '.$progressCalculated.'%';
-            }
-            elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
+            } elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
                 $badgeClass .= 'badge-warning';
                 if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("Expected").' '.$progressCalculated.'%';
-            }
-            else {
+            } else {
                 $badgeClass .= 'badge-success';
                 if (empty($tooltip)) $tooltip = $task->progress.'% >= '.$langs->trans("Expected").' '.$progressCalculated.'%';
             }
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 76ce3cb5b01..fff5280e678 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -45,8 +45,7 @@ function dol_encode($chain, $key = '1')
 			$output_tab[$i] = chr(ord(substr($chain, $i, 1)) + 17);
 		}
 		$chain = implode("", $output_tab);
-	}
-	elseif ($key)
+	} elseif ($key)
 	{
 		$result = '';
 		$strlength = dol_strlen($chain);
@@ -84,8 +83,7 @@ function dol_decode($chain, $key = '1')
 		}
 
 		$chain = implode("", $output_tab);
-	}
-	elseif ($key)
+	} elseif ($key)
 	{
 		$result = '';
 		$strlength = dol_strlen($chain);
@@ -237,44 +235,35 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 		if ($feature == 'societe')
 		{
 			if (!$user->rights->societe->lire && !$user->rights->fournisseur->lire) { $readok = 0; $nbko++; }
-		}
-		elseif ($feature == 'contact')
+		} elseif ($feature == 'contact')
 		{
 			if (!$user->rights->societe->contact->lire) { $readok = 0; $nbko++; }
-		}
-		elseif ($feature == 'produit|service')
+		} elseif ($feature == 'produit|service')
 		{
 			if (!$user->rights->produit->lire && !$user->rights->service->lire) { $readok = 0; $nbko++; }
-		}
-		elseif ($feature == 'prelevement')
+		} elseif ($feature == 'prelevement')
 		{
 			if (!$user->rights->prelevement->bons->lire) { $readok = 0; $nbko++; }
-		}
-		elseif ($feature == 'cheque')
+		} elseif ($feature == 'cheque')
 		{
 			if (!$user->rights->banque->cheque) { $readok = 0; $nbko++; }
-		}
-		elseif ($feature == 'projet')
+		} elseif ($feature == 'projet')
 		{
 			if (!$user->rights->projet->lire && !$user->rights->projet->all->lire) { $readok = 0; $nbko++; }
-		}
-		elseif (!empty($feature2))														// This is for permissions on 2 levels
+		} elseif (!empty($feature2))														// This is for permissions on 2 levels
 		{
 			$tmpreadok = 1;
 			foreach ($feature2 as $subfeature)
 			{
 				if ($subfeature == 'user' && $user->id == $objectid) continue; // A user can always read its own card
-				if (!empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok = 0; }
-				elseif (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok = 0; }
-				else { $tmpreadok = 1; break; } // Break is to bypass second test if the first is ok
+				if (!empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok = 0; } elseif (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok = 0; } else { $tmpreadok = 1; break; } // Break is to bypass second test if the first is ok
 			}
 			if (!$tmpreadok)	// We found a test on feature that is ko
 			{
 				$readok = 0; // All tests are ko (we manage here the and, the or will be managed later using $nbko).
 				$nbko++;
 			}
-		}
-		elseif (!empty($feature) && ($feature != 'user' && $feature != 'usergroup'))		// This is permissions on 1 level
+		} elseif (!empty($feature) && ($feature != 'user' && $feature != 'usergroup'))		// This is permissions on 1 level
 		{
 			if (empty($user->rights->$feature->lire)
 				&& empty($user->rights->$feature->read)
@@ -297,28 +286,22 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 			if ($feature == 'contact')
 			{
 				if (!$user->rights->societe->contact->creer) { $createok = 0; $nbko++; }
-			}
-			elseif ($feature == 'produit|service')
+			} elseif ($feature == 'produit|service')
 			{
 				if (!$user->rights->produit->creer && !$user->rights->service->creer) { $createok = 0; $nbko++; }
-			}
-			elseif ($feature == 'prelevement')
+			} elseif ($feature == 'prelevement')
 			{
 				if (!$user->rights->prelevement->bons->creer) { $createok = 0; $nbko++; }
-			}
-			elseif ($feature == 'commande_fournisseur')
+			} elseif ($feature == 'commande_fournisseur')
 			{
 				if (!$user->rights->fournisseur->commande->creer) { $createok = 0; $nbko++; }
-			}
-			elseif ($feature == 'banque')
+			} elseif ($feature == 'banque')
 			{
 				if (!$user->rights->banque->modifier) { $createok = 0; $nbko++; }
-			}
-			elseif ($feature == 'cheque')
+			} elseif ($feature == 'cheque')
 			{
 				if (!$user->rights->banque->cheque) { $createok = 0; $nbko++; }
-			}
-			elseif (!empty($feature2))														// This is for permissions on one level
+			} elseif (!empty($feature2))														// This is for permissions on one level
 			{
 				foreach ($feature2 as $subfeature)
 				{
@@ -336,8 +319,7 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 						break;
 					}
 				}
-			}
-			elseif (!empty($feature))														// This is for permissions on 2 levels ('creer' or 'write')
+			} elseif (!empty($feature))														// This is for permissions on 2 levels ('creer' or 'write')
 			{
 				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->creer.' write='.$user->rights->$feature->write;
 				if (empty($user->rights->$feature->creer)
@@ -375,47 +357,38 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 			if ($feature == 'contact')
 			{
 				if (!$user->rights->societe->contact->supprimer) $deleteok = 0;
-			}
-			elseif ($feature == 'produit|service')
+			} elseif ($feature == 'produit|service')
 			{
 				if (!$user->rights->produit->supprimer && !$user->rights->service->supprimer) $deleteok = 0;
-			}
-			elseif ($feature == 'commande_fournisseur')
+			} elseif ($feature == 'commande_fournisseur')
 			{
 				if (!$user->rights->fournisseur->commande->supprimer) $deleteok = 0;
-			}
-			elseif ($feature == 'banque')
+			} elseif ($feature == 'banque')
 			{
 				if (!$user->rights->banque->modifier) $deleteok = 0;
-			}
-			elseif ($feature == 'cheque')
+			} elseif ($feature == 'cheque')
 			{
 				if (!$user->rights->banque->cheque) $deleteok = 0;
-			}
-			elseif ($feature == 'ecm')
+			} elseif ($feature == 'ecm')
 			{
 				if (!$user->rights->ecm->upload) $deleteok = 0;
-			}
-			elseif ($feature == 'ftp')
+			} elseif ($feature == 'ftp')
 			{
 				if (!$user->rights->ftp->write) $deleteok = 0;
-			}elseif ($feature == 'salaries')
+			} elseif ($feature == 'salaries')
 			{
 				if (!$user->rights->salaries->delete) $deleteok = 0;
-			}
-			elseif ($feature == 'salaries')
+			} elseif ($feature == 'salaries')
 			{
 				if (!$user->rights->salaries->delete) $deleteok = 0;
-			}
-			elseif (!empty($feature2))							// This is for permissions on 2 levels
+			} elseif (!empty($feature2))							// This is for permissions on 2 levels
 			{
 				foreach ($feature2 as $subfeature)
 				{
 					if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok = 0;
 					else { $deleteok = 1; break; } // For bypass the second test if the first is ok
 				}
-			}
-			elseif (!empty($feature))							// This is used for permissions on 1 level
+			} elseif (!empty($feature))							// This is used for permissions on 1 level
 			{
 				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;
 				if (empty($user->rights->$feature->supprimer)
@@ -503,26 +476,22 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 					{
 						$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 						$sql .= " AND dbt.entity IS NOT NULL";
-					}
-					else {
+					} else {
 						$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
 						$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 						$sql .= " AND ((ug.fk_user = dbt.rowid";
 						$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
 						$sql .= " OR dbt.entity = 0)"; // Show always superadmin
 					}
-				}
-				else {
+				} else {
 					$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 					$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 				}
-			}
-			else {
+			} else {
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		elseif (in_array($feature, $checksoc))	// We check feature = checksoc
+		} elseif (in_array($feature, $checksoc))	// We check feature = checksoc
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
@@ -548,8 +517,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " WHERE s.rowid IN (".$objectid.")";
 				$sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		elseif (in_array($feature, $checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
+		} elseif (in_array($feature, $checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
@@ -577,8 +545,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		elseif (in_array($feature, $checkproject))
+		} elseif (in_array($feature, $checkproject))
 		{
 			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
 			{
@@ -587,15 +554,13 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
 				$tmparray = explode(',', $tmps);
 				if (!in_array($objectid, $tmparray)) return false;
-			}
-			else {
+			} else {
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		elseif (in_array($feature, $checktask))
+		} elseif (in_array($feature, $checktask))
 		{
 			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
 			{
@@ -607,15 +572,13 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
 				$tmparray = explode(',', $tmps);
 				if (!in_array($task->fk_project, $tmparray)) return false;
-			}
-			else {
+			} else {
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		elseif (!in_array($feature, $nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
+		} elseif (!in_array($feature, $nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
@@ -657,8 +620,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 			{
 				$obj = $db->fetch_object($resql);
 				if (!$obj || $obj->nb < count(explode(',', $objectid))) return false;
-			}
-			else {
+			} else {
 				return false;
 			}
 		}
@@ -717,8 +679,7 @@ function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $sho
 			{
 				print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';
 				print $langs->trans("ErrorForbidden2", $langs->transnoentitiesnoconv("Home"), $langs->transnoentitiesnoconv("Users"));
-			}
-			else {
+			} else {
 				print $langs->trans("ErrorForbidden3");
 			}
 		}
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index fba8ba346c6..ab3f3c3f4c8 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -101,8 +101,7 @@ function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $auth
     					$dol_screenwidth = GETPOST('screenwidth');
     					$dol_screenheight = GETPOST('screenheight');
     				}
-    			}
-    			else {
+    			} else {
     				dol_syslog("Authentication KO - failed to load file '".$authfile."'", LOG_ERR);
     				sleep(1);
     				// Load translation files required by the page
@@ -178,8 +177,7 @@ if (!function_exists('dol_loginfunction'))
 				$tmp = dol_buildpath($reldir.'login.tpl.php');
 				if (file_exists($tmp)) { $template_dir = preg_replace('/login\.tpl\.php$/', '', $tmp); break; }
 			}
-		}
-		else {
+		} else {
 			$template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
 		}
 
@@ -224,13 +222,11 @@ if (!function_exists('dol_loginfunction'))
 		if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 		{
 			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
-		}
-		elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+		} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 		{
 			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
 			$width = 128;
-		}
-		elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
+		} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
 		{
 			$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
 		}
@@ -361,8 +357,7 @@ function encodedecode_dbpassconf($level = 0)
 					$passwd = $val;
 					$lineofpass = 1;
 				}
-			}
-			elseif (preg_match('/^[^#]*dolibarr_main_db_pass[\s]*=[\s]*(.*)/i', $buffer, $reg))
+			} elseif (preg_match('/^[^#]*dolibarr_main_db_pass[\s]*=[\s]*(.*)/i', $buffer, $reg))
 			{
 				$val = trim($reg[1]); // This also remove CR/LF
 				$val = preg_replace('/^["\']/', '', $val);
@@ -373,8 +368,7 @@ function encodedecode_dbpassconf($level = 0)
 					$passwd_crypted = $val;
 					$val = dol_decode($val);
 					$passwd = $val;
-				}
-				else {
+				} else {
 					$passwd = $val;
 					$val = dol_encode($val);
 					$passwd_crypted = $val;
@@ -397,8 +391,7 @@ function encodedecode_dbpassconf($level = 0)
 
 				//print 'passwd = '.$passwd.' - passwd_crypted = '.$passwd_crypted;
 				//exit;
-			}
-			else {
+			} else {
 				$config .= $buffer;
 			}
 		}
@@ -418,13 +411,11 @@ function encodedecode_dbpassconf($level = 0)
 			//@chmod($file, octdec('0600'));
 
 			return 1;
-		}
-		else {
+		} else {
 			dol_syslog("encodedecode_dbpassconf Failed to open conf.php file for writing", LOG_WARNING);
 			return -1;
 		}
-	}
-	else {
+	} else {
 		dol_syslog("encodedecode_dbpassconf Failed to read conf.php", LOG_ERR);
 		return -2;
 	}
@@ -469,8 +460,7 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 			}
 
 			$generated_password = str_shuffle($randomCode);
-		}
-		else // Old platform, non cryptographic random
+		} else // Old platform, non cryptographic random
 		{
 			$max = strlen($lowercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
@@ -487,8 +477,7 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 
 			$generated_password = str_shuffle($randomCode);
 		}
-	}
-	elseif (!empty($conf->global->USER_PASSWORD_GENERATED))
+	} elseif (!empty($conf->global->USER_PASSWORD_GENERATED))
 	{
 		$nomclass = "modGeneratePass".ucfirst($conf->global->USER_PASSWORD_GENERATED);
 		$nomfichier = $nomclass.".class.php";
@@ -507,8 +496,7 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		if (function_exists('random_int'))	// Cryptographic random
 		{
 			$generated_password = str_replace($replaceambiguouschars, $numbers{random_int(0, $max)}, $generated_password);
-		}
-		else {
+		} else {
 			$generated_password = str_replace($replaceambiguouschars, $numbers{mt_rand(0, $max)}, $generated_password);
 		}
 	}
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 541aab2358e..b81757f261f 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -304,8 +304,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 						}
 
 						$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
-					}
-					else {
+					} else {
 						$label = (!empty($objp->label) ? $objp->label : $objp->product_label);
 					}
 
@@ -331,8 +330,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 					}
 
 					print '</td>';
-				}
-				else {
+				} else {
 					print "<td>";
 					if ($objp->fk_product_type == 1) $text = img_object($langs->trans('Service'), 'service');
 					else $text = img_object($langs->trans('Product'), 'product');
@@ -437,8 +435,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 						print '<td class="right">';
 						print dol_print_date($receiving->date_delivery, 'day');
 						print '</td>';
-					}
-					else {
+					} else {
 						//print '<td>&nbsp;</td>';
 						print '<td>&nbsp;</td>';
 						print '<td>&nbsp;</td>';
@@ -451,8 +448,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 			print '</table>';
 		}
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
diff --git a/htdocs/core/lib/signature.lib.php b/htdocs/core/lib/signature.lib.php
index 8dd24c87df6..37cb9b31e8d 100644
--- a/htdocs/core/lib/signature.lib.php
+++ b/htdocs/core/lib/signature.lib.php
@@ -79,8 +79,7 @@ function getOnlineSignatureUrl($mode, $type, $ref = '')
 			{
 				$out = $langs->trans("FeatureOnlineSignDisabled");
 				return $out;
-			}
-			else {
+			} else {
 				$out .= '&hashp='.$hashp;
 			}
 		}
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index 46682addf2c..798fa568cb2 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -110,8 +110,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	$paymenttable = 'paiement';
     	$paymentfacturetable = 'paiement_facture';
     	$invoicefieldref = 'ref';
-    }
-    elseif ($direction == 'buy')
+    } elseif ($direction == 'buy')
     {
     	$invoicetable = 'facture_fourn';
     	$invoicedettable = 'facture_fourn_det';
@@ -162,8 +161,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	{
     		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
     		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	}
-    	elseif ($y)
+    	} elseif ($y)
     	{
     		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
     		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
@@ -174,8 +172,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
     	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
     	$sql .= " ORDER BY d.rowid, d.".$fk_facture;
-    }
-    else {
+    } else {
     	// Count on payments date
     	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
     	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
@@ -202,8 +199,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	{
     		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
     		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	}
-    	elseif ($y)
+    	} elseif ($y)
     	{
     		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
     		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
@@ -272,8 +268,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 
     			$company_id = $assoc['company_id'];
     		}
-    	}
-    	else {
+    	} else {
     		dol_print_error($db);
     		return -3;
     	}
@@ -308,8 +303,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	{
     		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
     		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	}
-    	elseif ($y)
+    	} elseif ($y)
     	{
     		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
     		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
@@ -320,8 +314,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
     	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
     	$sql .= " ORDER BY d.rowid, d.".$fk_facture;
-    }
-    else {
+    } else {
     	// Count on payments date
     	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
     	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
@@ -348,8 +341,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	{
     		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
     		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	}
-    	elseif ($y)
+    	} elseif ($y)
     	{
     		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
     		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
@@ -421,8 +413,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 
     			$company_id = $assoc['company_id'];
     		}
-    	}
-    	else {
+    	} else {
     		dol_print_error($db);
     		return -3;
     	}
@@ -451,8 +442,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	{
     		$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
     		$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	}
-    	elseif ($y)
+    	} elseif ($y)
     	{
     		$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
     		$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
@@ -524,8 +514,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 
     				$company_id = $assoc['company_id'];
     			}
-    		}
-    		else {
+    		} else {
     			dol_print_error($db);
     			return -3;
     		}
@@ -574,8 +563,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         $paymenttable = 'paiement';
         $paymentfacturetable = 'paiement_facture';
         $invoicefieldref = 'ref';
-    }
-    else {
+    } else {
         $invoicetable = 'facture_fourn';
         $invoicedettable = 'facture_fourn_det';
         $fk_facture = 'fk_facture_fourn';
@@ -625,8 +613,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         {
             $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
             $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-        }
-        elseif ($y)
+        } elseif ($y)
         {
             $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
             $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
@@ -637,8 +624,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         $sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
         if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
         $sql .= " ORDER BY d.rowid, d.".$fk_facture;
-    }
-    else {
+    } else {
     	// Count on payments date
     	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
     	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
@@ -665,8 +651,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
     	{
     		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
     		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	}
-    	elseif ($y)
+    	} elseif ($y)
     	{
     		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
     		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
@@ -735,8 +720,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 
                 $rate = $assoc['rate'];
             }
-        }
-        else {
+        } else {
             dol_print_error($db);
             return -3;
         }
@@ -771,8 +755,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         {
             $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
             $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-        }
-        elseif ($y)
+        } elseif ($y)
         {
             $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
             $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
@@ -783,8 +766,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
         if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
         $sql .= " ORDER BY d.rowid, d.".$fk_facture;
-    }
-    else {
+    } else {
         // Count on payments date
         $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
         $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
@@ -811,8 +793,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         {
             $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
             $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-        }
-        elseif ($y)
+        } elseif ($y)
         {
             $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
             $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
@@ -884,8 +865,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 
                 $rate = $assoc['rate'];
             }
-        }
-        else {
+        } else {
             dol_print_error($db);
             return -3;
         }
@@ -914,8 +894,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		{
 			$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
 			$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-		}
-		elseif ($y)
+		} elseif ($y)
 		{
 			$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
 			$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
@@ -987,8 +966,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 
 					$rate = $assoc['rate'];
 				}
-			}
-			else {
+			} else {
 				dol_print_error($db);
 				return -3;
 			}
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 4ed30dbcb2f..dbd26cc1f75 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -112,15 +112,13 @@ function ticket_prepare_head($object)
 	$ticketViewType = "messaging";
 	if (empty($_SESSION['ticket-view-type'])) {
 		$_SESSION['ticket-view-type'] = $ticketViewType;
-	}
-	else {
+	} else {
 		$ticketViewType = $_SESSION['ticket-view-type'];
 	}
 
 	if ($ticketViewType == "messaging") {
 		$head[$h][0] = DOL_URL_ROOT.'/ticket/messaging.php?track_id='.$object->track_id;
-	}
-	else {
+	} else {
 		// $ticketViewType == "list"
 		$head[$h][0] = DOL_URL_ROOT.'/ticket/agenda.php?track_id='.$object->track_id;
 	}
@@ -162,15 +160,13 @@ function showDirectPublicLink($object)
 	if (empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
 	{
 		$out .= '<span class="opacitymedium">'.$langs->trans("PublicInterfaceNotEnabled").'</span>';
-	}
-	else {
+	} else {
 		$out .= img_picto('', 'object_globe.png').' '.$langs->trans("TicketPublicAccess").':<br>';
 		if ($url)
 		{
 			$out .= '<input type="text" id="directpubliclink" class="quatrevingtpercent" value="'.$url.'">';
 			$out .= ajax_autoselect("directpubliclink", 0);
-		}
-		else {
+		} else {
 			$out .= '<span class="opacitymedium">'.$langs->trans("TicketNotCreatedFromPublicInterface").'</span>';
 		}
 	}
@@ -312,8 +308,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
         // Recherche histo sur actioncomm
         if (is_object($objcon) && $objcon->id > 0) {
             $sql = "SELECT DISTINCT a.id, a.label as label,";
-        }
-        else {
+        } else {
             $sql = "SELECT a.id, a.label as label,";
         }
         $sql .= " a.datep as dp,";
@@ -348,8 +343,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
             $sql .= " ON er.resource_type = 'dolresource'";
             $sql .= " AND er.element_id = a.id";
             $sql .= " AND er.resource_id = ".$filterobj->id;
-        }
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m";
+        } elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m";
         elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", ".MAIN_DB_PREFIX."product as o";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", ".MAIN_DB_PREFIX."ticket as o";
@@ -364,28 +358,23 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
             {
                 $sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'";
                 if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')
+            } elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')
             {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'";
                 if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'Product')
+            } elseif (is_object($filterobj) && get_class($filterobj) == 'Product')
             {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'";
                 if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')
+            } elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')
             {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'";
                 if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')
+            } elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')
             {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'";
                 if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')
+            } elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')
             {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'";
                 if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
@@ -403,8 +392,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
                     if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'";
                     elseif ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'";
                 }
-            }
-            else {
+            } else {
                 if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
                 elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
                 else $sql .= " AND c.code = '".$db->escape($actioncode)."'";
@@ -521,8 +509,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
             $numaction++;
             $i++;
         }
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 
@@ -548,8 +535,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 			(is_null($filterobj) || get_class($filterobj) == 'Societe'))
 		{
 			$out .= '<input type="hidden" name="id" value="'.$objcon->id.'" />';
-		}
-		else {
+		} else {
 			$out .= '<input type="hidden" name="id" value="'.$filterobj->id.'" />';
 		}
 		if ($filterobj && get_class($filterobj) == 'Societe') $out .= '<input type="hidden" name="socid" value="'.$filterobj->id.'" />';
@@ -648,16 +634,13 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
             if ($histo[$key]['percent'] == -1) {
                 $colorClass = 'timeline-icon-not-applicble';
                 $pictoTitle = $langs->trans('StatusNotApplicable');
-            }
-            elseif ($histo[$key]['percent'] == 0) {
+            } elseif ($histo[$key]['percent'] == 0) {
                 $colorClass = 'timeline-icon-todo';
                 $pictoTitle = $langs->trans('StatusActionToDo').' (0%)';
-            }
-            elseif ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100) {
+            } elseif ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100) {
                 $colorClass = 'timeline-icon-in-progress';
                 $pictoTitle = $langs->trans('StatusActionInProcess').' ('.$histo[$key]['percent'].'%)';
-            }
-            elseif ($histo[$key]['percent'] >= 100) {
+            } elseif ($histo[$key]['percent'] >= 100) {
                 $colorClass = 'timeline-icon-done';
                 $pictoTitle = $langs->trans('StatusActionDone').' (100%)';
             }
@@ -665,17 +648,13 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 
             if ($actionstatic->code == 'AC_TICKET_CREATE') {
                 $iconClass = 'fa fa-ticket';
-            }
-            elseif ($actionstatic->code == 'AC_TICKET_MODIFY') {
+            } elseif ($actionstatic->code == 'AC_TICKET_MODIFY') {
                 $iconClass = 'fa fa-pencil';
-            }
-            elseif ($actionstatic->code == 'TICKET_MSG') {
+            } elseif ($actionstatic->code == 'TICKET_MSG') {
                 $iconClass = 'fa fa-comments';
-            }
-            elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') {
+            } elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') {
                 $iconClass = 'fa fa-mask';
-            }
-            elseif (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
+            } elseif (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
             {
                 if ($actionstatic->type_picto) $img_picto = img_picto('', $actionstatic->type_picto);
                 else {
@@ -757,8 +736,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 
 			if ($actionstatic->code == 'TICKET_MSG') {
 				$out .= $langs->trans('TicketNewMessage');
-			}
-			elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') {
+			} elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') {
 				$out .= $langs->trans('TicketNewMessage').' <em>('.$langs->trans('Private').')</em>';
 			} else {
                 if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'action') {
@@ -816,8 +794,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
                 }
 
                 $footer .= $langs->trans('ActionOnContact').' : '.$contactList;
-            }
-            elseif (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0)
+            } elseif (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0)
             {
                 $contact = new Contact($db);
                 $result = $contact->fetch($histo[$key]['contact_id']);
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index 8f7f6152c97..076e5ba644e 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -79,8 +79,7 @@ function tree_showpad(&$fulltree, $key, $silent = 0)
     		{
     			if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branch.gif');
     			else print img_picto_common('', 'treemenu/line.gif');
-    		}
-    		else {
+    		} else {
     			if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branchbottom.gif');
     			else print img_picto_common('', 'treemenu/linebottom.gif');
     		}
@@ -173,8 +172,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 			    print '</td><td class="right">';
 			    print $tab[$x]['buttons'];
 			    print '</td></tr></table>';
-			}
-			else {
+			} else {
 			    print $tab[$x]['entry'];
 			}
 			//print ' -> A '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
@@ -182,8 +180,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 			// And now we search all its sons of lower level
 			tree_recur($tab, $tab[$x], $rang + 1, 'iddivjstree', 0, $showfk);
 			print '</li>';
-		}
-		elseif (!empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
+		} elseif (!empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
 		{
 		    //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
 		    if (empty($ulprinted) && !empty($pere['rowid']))
@@ -208,8 +205,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 			    print '</td><td class="right">';
 			    print $tab[$x]['buttons'];
 			    print '</td></tr></table>';
-			}
-			else {
+			} else {
 			    print $tab[$x]['entry'];
 			}
 			//print ' -> B '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 2fbc6eee325..e6c7243c449 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -125,8 +125,7 @@ function user_prepare_head($object)
 				$nbNote = $obj->nb;
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -346,8 +345,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td class="nowrap left" width="20%"><input id="check_MAIN_THEME" name="check_MAIN_THEME"'.($edit ? '' : ' disabled').' type="checkbox" '.($selected_theme ? " checked" : "").'> '.$langs->trans("UsePersonalValue").'</td>';
 		print '<td>&nbsp;</td>';
 		print '</tr>';
-	}
-	else {
+	} else {
 		$dirthemestring = '';
 		foreach ($dirthemes as $dirtheme)
 		{
@@ -402,8 +400,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 						if ($subdir == $selected_theme)
 						{
 							print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" checked name="main_theme" value="'.$subdir.'"> <b>'.$subdir.'</b>';
-						}
-						else {
+						} else {
 							print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;
 						}
 						print '</div>';
@@ -439,16 +436,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	if ($foruserprofile)
 	{
 		// Nothing
-	}
-	else {
+	} else {
 		// Show logo
 		print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("EnableShowLogo").'</td><td>';
 		if ($edit)
 		{
 			print ajax_constantonoff('MAIN_SHOW_LOGO', array(), null, 0, 0, 1);
 			//print $form->selectyesno('MAIN_SHOW_LOGO', $conf->global->MAIN_SHOW_LOGO, 1);
-		}
-		else {
+		} else {
 			print  yn($conf->global->MAIN_SHOW_LOGO);
 		}
 		print '</td>';
@@ -482,8 +477,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
          }
          if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
          print '</td>';*/
-	}
-	else {
+	} else {
 		$default = $langs->trans('No');
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
@@ -492,8 +486,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		{
 			print ajax_constantonoff('THEME_TOPMENU_DISABLE_IMAGE', array(), null, 0, 0, 1);
 			//print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
-		}
-		else {
+		} else {
 			print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
@@ -525,8 +518,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	   	}
     	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    print '</td>';*/
-	}
-	else {
+	} else {
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
@@ -534,8 +526,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), ''), 'THEME_ELDY_BACKBODY', 'formcolor', 1).' ';
-		}
-	   	else {
+		} else {
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
@@ -569,8 +560,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	   	}
     	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    print '</td>';*/
-	}
-	else {
+	} else {
 		$default = (empty($colorbackhmenu1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbackhmenu1)));
 
 		print '<tr class="oddeven">';
@@ -579,8 +569,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), ''), 'THEME_ELDY_TOPMENU_BACK1', 'formcolor', 1).' ';
-		}
-	   	else {
+		} else {
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
@@ -614,8 +603,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		 }
 		 if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 		 print '</td>';*/
-	}
-	else {
+	} else {
 		$default = (empty($colorbackvmenu1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbackvmenu1)));
 
 		print '<tr class="oddeven">';
@@ -624,8 +612,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), ''), 'THEME_ELDY_VERMENU_BACK1', 'formcolor', 1).' ';
-		}
-		else {
+		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
@@ -639,8 +626,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// TextTitleColor for title of Pages
 	if ($foruserprofile)
 	{
-	}
-	else {
+	} else {
 		$default = (empty($colortexttitlenotab) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitlenotab)));
 
 		print '<tr class="oddeven">';
@@ -649,8 +635,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB, array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', 'formcolor', 1).' ';
-		}
-		else {
+		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #'.$default.'">'.$default.'</span></strong> ';
@@ -663,8 +648,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// BackgroundTableTitleColor
 	if ($foruserprofile)
 	{
-	}
-	else {
+	} else {
 		$default = (empty($colorbacktitle1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacktitle1)));
 
 		print '<tr class="oddeven">';
@@ -673,8 +657,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1, array()), ''), 'THEME_ELDY_BACKTITLE1', 'formcolor', 1).' ';
-		}
-	   	else {
+		} else {
 	   		print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
 	   	}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> '; // $colorbacktitle1 in CSS
@@ -687,8 +670,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// TextTitleColor
 	if ($foruserprofile)
 	{
-	}
-	else {
+	} else {
 		$default = (empty($colortexttitle) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitle)));
 
 		print '<tr class="oddeven">';
@@ -697,8 +679,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE, array()), ''), 'THEME_ELDY_TEXTTITLE', 'formcolor', 1).' ';
-		}
-		else {
+		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLE, $langs->trans("Default"));
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #'.$default.'">'.$default.'</span></strong> ';
@@ -711,8 +692,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// TextTitleLinkColor
 	if ($foruserprofile)
 	{
-	}
-	else {
+	} else {
 		$default=(empty($colortexttitlelink) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitlelink)));
 
 		print '<tr class="oddeven">';
@@ -721,8 +701,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLELINK, array()), ''), 'THEME_ELDY_TEXTTITLELINK', 'formcolor', 1).' ';
-		}
-		else {
+		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLELINK, $langs->trans("Default"));
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #'.$default.'">'.$default.'</span></strong> ';
@@ -736,8 +715,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// BackgroundTableLineOddColor
 	if ($foruserprofile)
 	{
-	}
-	else {
+	} else {
 		$default = (empty($colorbacklineimpair1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklineimpair1)));
 
 		print '<tr class="oddeven">';
@@ -746,8 +724,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), ''), 'THEME_ELDY_LINEIMPAIR1', 'formcolor', 1).' ';
-		}
-		else {
+		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
@@ -761,8 +738,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// BackgroundTableLineEvenColor
 	if ($foruserprofile)
 	{
-	}
-	else {
+	} else {
 		$default = (empty($colorbacklinepair1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepair1)));
 
 		print '<tr class="oddeven">';
@@ -771,8 +747,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), ''), 'THEME_ELDY_LINEPAIR1', 'formcolor', 1).' ';
-		}
-		else {
+		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
@@ -806,8 +781,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	     }
 	    	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    	print '</td>';*/
-	}
-	else {
+	} else {
 		$default = (empty($colortextlink) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortextlink)));
 
 		print '<tr class="oddeven">';
@@ -816,8 +790,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), ''), 'THEME_ELDY_TEXTLINK', 'formcolor', 1).' ';
-		}
-		else {
+		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else {
@@ -845,8 +818,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	     print '</td>';
 	     print '</tr>';
 	     */
-	}
-	else {
+	} else {
 		$default = (empty($colorbacklinepairhover) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepairhover)));
 
 		print '<tr class="oddeven">';
@@ -859,16 +831,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
 			print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', 'formcolor', 1).' ';
-		}
-		else {
+		} else {
 			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
 			if ($color)
 			{
 				if ($color != colorArrayToHex(colorStringToArray($colorbacklinepairhover))) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 				else print $langs->trans("Default");
-			}
-			else print $langs->trans("Default");
+			} else print $langs->trans("Default");
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -888,8 +858,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	     print '</td>';
 	     print '</tr>';
 	     */
-	}
-	else {
+	} else {
 		$default = (empty($colorbacklinepairchecked) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepairchecked)));
 
 		print '<tr class="oddeven">';
@@ -902,16 +871,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');
 			print $formother->selectColor($color, 'THEME_ELDY_USE_CHECKED', 'formcolor', 1).' ';
-		}
-		else {
+		} else {
 			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');
 			if ($color)
 			{
 				if ($color != 'e6edf0') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 				else print $langs->trans("Default");
-			}
-			else print $langs->trans("Default");
+			} else print $langs->trans("Default");
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -931,13 +898,11 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
    	    if ($edit)
    	    {
    	        print $form->selectyesno('MAIN_OPTIMIZEFORTEXTBROWSER', $fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER, 1);
-   	    }
-   	    else {
+   	    } else {
    	        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
    	        {
    	            print yn($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER);
-   	        }
-   	        else {
+   	        } else {
    	            print yn(1);
    	            if (empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) print ' ('.$langs->trans("ForcedByGlobalSetup").')';
    	        }
@@ -946,8 +911,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	    print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORTEXTBROWSERDesc"));
 	    print '</td>';
 	    print '</tr>';
-	}
-	else {
+	} else {
 	    /*var_dump($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
 	    $default=$langs->trans('No');
 	    print '<tr class="oddeven">';
@@ -990,12 +954,10 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $form->selectArray('MAIN_OPTIMIZEFORCOLORBLIND', $colorBlindOptions, $fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND, 0);
-		}
-		else {
+		} else {
 			if (!empty($fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND) && isset($colorBlindOptions[$fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND])) {
 				print $colorBlindOptions[$fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND];
-			}
-			else {
+			} else {
 				print yn(0);
 			}
 		}
@@ -1003,8 +965,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORCOLORBLINDDesc"));
 		print '</td>';
 		print '</tr>';
-	}
-	else {
+	} else {
 	}
 	print '</table>';
 }
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 9dd7708c36d..8585629b6cb 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -93,8 +93,7 @@ function dolKeepOnlyPhpCode($str)
 			if (!empty($partlings))
 			{
 				$newstr .= $partlings[0].'?>';
-			}
-			else {
+			} else {
 				$newstr .= $part.'?>';
 			}
 		}
@@ -241,8 +240,7 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 			$content = preg_replace('/^.*<body(\s[^>]*)*>/ims', '', $content);
 			$content = preg_replace('/<\/body(\s[^>]*)*>.*$/ims', '', $content);
 		}
-	}
-	elseif (defined('USEDOLIBARRSERVER'))	// REPLACEMENT OF LINKS When page called from Dolibarr server
+	} elseif (defined('USEDOLIBARRSERVER'))	// REPLACEMENT OF LINKS When page called from Dolibarr server
 	{
 		$content = str_replace('<link rel="stylesheet" href="/styles.css', '<link rel="stylesheet" href="styles.css', $content);
 
@@ -298,8 +296,7 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 		if (empty($includehtmlcontentopened)) {
 			$content = str_replace('!~!~!~', '', $content);
 		}
-	}
-	else // REPLACEMENT OF LINKS When page called from virtual host
+	} else // REPLACEMENT OF LINKS When page called from virtual host
 	{
 		$symlinktomediaexists = 1;
 		if ($website->virtualhost) {
@@ -334,8 +331,7 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 			// If some links to documents or viewimage remains, we replace with wrapper
 			$content = preg_replace('/(<img[^>]*src=")\/?viewimage\.php/', '\1/wrapper.php', $content, -1, $nbrep);
 			$content = preg_replace('/(<a[^>]*href=")\/?documents\.php/', '\1/wrapper.php', $content, -1, $nbrep);
-		}
-		else {
+		} else {
 			// <img src="image.png... => <img src="medias/image.png...
 			$content = preg_replace('/(<img[^>]*src=")\/?image\//', '\1/medias/image/', $content, -1, $nbrep);
 			$content = preg_replace('/(url\(["\']?)\/?image\//', '\1/medias/image/', $content, -1, $nbrep);
@@ -423,8 +419,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 		if ($result > 0)
 		{
 			$containerref = $tmpwebsitepage->pageurl;
-		}
-		else {
+		} else {
 			print "Error, page contains a redirect to the alternative alias '".$containeraliasalt."' that does not exists in web site (".$website->id." / ".$website->ref.")";
 			exit;
 		}
@@ -460,17 +455,14 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 				{
 					print "Error, page with uri '.$currenturi.' try a redirect to the same alias page '".$containerref."' in web site '".$website->ref."'";
 					exit;
-				}
-				else {
+				} else {
 					$newurl = preg_replace('/&pageref=([^&]+)/', '&pageref='.$containerref, $currenturi);
 				}
-			}
-			else {
+			} else {
 				$newurl = $currenturi.'&pageref='.urlencode($containerref);
 			}
 		}
-	}
-	else // When page called from virtual host server
+	} else // When page called from virtual host server
 	{
 		$newurl = '/'.$containerref.'.php';
 	}
@@ -482,8 +474,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 		}
 		header("Location: ".$newurl);
 		exit;
-	}
-	else {
+	} else {
 		print "Error, page contains a redirect to the alias page '".$containerref."' that does not exists in web site (".$website->id." / ".$website->ref.")";
 		exit;
 	}
@@ -573,8 +564,7 @@ function getStructuredData($type, $data = array())
 			}
 		}'."\n";
 		$ret .= '</script>'."\n";
-	}
-	elseif ($type == 'organization')
+	} elseif ($type == 'organization')
 	{
 		$companyname = $mysoc->name;
 		$url = $mysoc->url;
@@ -600,8 +590,7 @@ function getStructuredData($type, $data = array())
 					$ret.= '"https://www.'.$key.'.com/company/'.dol_escape_json($value).'"';
 				} elseif ($key == 'youtube') {
 					$ret.= '"https://www.'.$key.'.com/user/'.dol_escape_json($value).'"';
-				}
-				else {
+				} else {
 					$ret.= '"https://www.'.$key.'.com/'.dol_escape_json($value).'"';
 				}
 				$i++;
@@ -611,8 +600,7 @@ function getStructuredData($type, $data = array())
 		}
 		$ret .= "\n".'}'."\n";
 		$ret .= '</script>'."\n";
-	}
-	elseif ($type == 'blogpost')
+	} elseif ($type == 'blogpost')
 	{
 		if (!empty($websitepage->author_alias))
 		{
@@ -675,8 +663,7 @@ function getStructuredData($type, $data = array())
 			$ret .= "\n".'}'."\n";
 			$ret .= '</script>'."\n";
 		}
-	}
-	elseif ($type == 'product')
+	} elseif ($type == 'product')
 	{
 		$ret = '<!-- Add structured data for blog post -->'."\n";
 		$ret .= '<script type="application/ld+json">'."\n";
@@ -796,15 +783,13 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 		$error++;
 		$arrayresult['code'] = 'KO';
 		$arrayresult['message'] = $weblangs->trans("EmptySearchString");
-	}
-	elseif (dol_strlen($searchstring) < 2)
+	} elseif (dol_strlen($searchstring) < 2)
 	{
 		$weblangs->load("errors");
 		$error++;
 		$arrayresult['code'] = 'KO';
 		$arrayresult['message'] = $weblangs->trans("ErrorSearchCriteriaTooSmall");
-	}
-	else {
+	} else {
 		$tmparrayoftype = explode(',', $type);
 		foreach ($tmparrayoftype as $tmptype) {
 			if (!in_array($tmptype, array('', 'page', 'blogpost'))) {
@@ -865,8 +850,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			$error++;
 			$arrayresult['code'] = $db->lasterrno();
 			$arrayresult['message'] = $db->lasterror();
@@ -925,8 +909,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 				$arrayresult['code'] = 'KO';
 				$arrayresult['message'] = $weblangs->trans("NoRecordFound");
 			}
-		}
-		else {
+		} else {
 			$error++;
 			$arrayresult['code'] = 'KO';
 			$arrayresult['message'] = 'No supported algorithm found';
@@ -975,8 +958,7 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 		{
 			$urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
 			$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
-		}
-		else {
+		} else {
 			$urltograbbis = $urltograb.'/'.$regs[2][$key]; // We use dir of grabbed file
 		}
 
@@ -1012,14 +994,12 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
 					$action = 'create';
-				}
-				elseif ($tmpgeturl['http_code'] != '200')
+				} elseif ($tmpgeturl['http_code'] != '200')
 				{
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
 					$action = 'create';
-				}
-				else {
+				} else {
 					$alreadygrabbed[$urltograbbis] = 1; // Track that file was alreay grabbed.
 
 					dol_mkdir(dirname($filetosave));
@@ -1050,8 +1030,7 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 		{
 			$urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
 			$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
-		}
-		else {
+		} else {
 			$urltograbbis = $urltograb.'/'.$regs[2][$key]; // We use dir of grabbed file
 		}
 
@@ -1089,14 +1068,12 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
 					$action = 'create';
-				}
-				elseif ($tmpgeturl['http_code'] != '200')
+				} elseif ($tmpgeturl['http_code'] != '200')
 				{
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
 					$action = 'create';
-				}
-				else {
+				} else {
 					$alreadygrabbed[$urltograbbis] = 1; // Track that file was alreay grabbed.
 
 					dol_mkdir(dirname($filetosave));
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 33093fb953c..980326d41be 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -192,8 +192,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
 					}
 				}
 			}
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 	}
 	// Add canonical reference
 	if ($object->virtualhost) {
@@ -518,8 +517,7 @@ function showWebsiteTemplates(Website $website)
 				}
 			}
 		}
-	}
-	else {
+	} else {
 		print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
 	}
 
diff --git a/htdocs/core/lib/ws.lib.php b/htdocs/core/lib/ws.lib.php
index 912f0f16cea..ad16755f617 100644
--- a/htdocs/core/lib/ws.lib.php
+++ b/htdocs/core/lib/ws.lib.php
@@ -58,8 +58,7 @@ function check_authentication($authentication, &$error, &$errorcode, &$errorlabe
         {
             $error++;
             $errorcode = 'ERROR_FETCH_USER'; $errorlabel = 'A technical error occurred during fetch of user';
-        }
-        elseif ($result == 0)
+        } elseif ($result == 0)
         {
             $error++;
             $errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';
diff --git a/htdocs/core/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php
index 33db8490a75..fd563b3deef 100644
--- a/htdocs/core/lib/xcal.lib.php
+++ b/htdocs/core/lib/xcal.lib.php
@@ -229,8 +229,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 					{
 						$enddate = dol_time_plus_duree($startdate, 1, "d");
 					}
-				}
-				else {
+				} else {
 					if (empty($enddate))
 					{
 						$enddate = $startdate + $duration;
@@ -314,8 +313,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 		{
 			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 		}
-	}
-	else {
+	} else {
 		dol_syslog("xcal.lib.php::build_calfile Failed to open file ".$outputfile." for writing");
 		return -2;
 	}
@@ -523,8 +521,7 @@ function calEncode($line)
 		}
 
 		$out .= $newpara;
-	}
-	else {
+	} else {
 		$strlength = dol_strlen($line);
 
 		for ($j = 0; $j < $strlength; $j++)
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index 333e4741cd1..3cdcda3d0b2 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -106,8 +106,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 				if ($passok)
 				{
 					$login = $obj->login;
-				}
-				else {
+				} else {
 				    sleep(2); // Anti brut force protection
 				    dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO bad password for '".$usertotest."', cryptType=".$cryptType, LOG_NOTICE);
 
@@ -132,8 +131,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO user not found for '".$usertotest."'", LOG_NOTICE);
 				sleep(1);
 
@@ -142,8 +140,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 
 				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 			}
-		}
-		else {
+		} else {
 			dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO db error for '".$usertotest."' error=".$db->lasterror(), LOG_ERR);
 			sleep(1);
 			$_SESSION["dol_loginmesg"] = $db->lasterror();
diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index 9f7f5f1d81c..0885519f0fa 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -126,8 +126,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 					$_SESSION["dol_loginmesg"] = $langs->trans("YouMustChangePassNextLogon", $usertotest, $ldap->domainFQDN);
 					return '';
 				}
-			}
-			else {
+			} else {
 				 if ($ldapdebug) print "DEBUG: ".$ldap->error."<br>\n";
 			}
 			$ldap->close();
@@ -217,8 +216,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 
 				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 			}
-		}
-		else {
+		} else {
 			/* Login failed. Return false, together with the error code and text from
              ** the LDAP server. The common error codes and reasons are listed below :
              ** (for iPlanet, other servers may differ)
diff --git a/htdocs/core/login/functions_openid.php b/htdocs/core/login/functions_openid.php
index c354d2d8d0e..1f23424fb6b 100644
--- a/htdocs/core/login/functions_openid.php
+++ b/htdocs/core/login/functions_openid.php
@@ -56,8 +56,7 @@ function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
         {
             $openid->SetApprovedURL($protocol.$_SERVER["HTTP_HOST"].$_SERVER["SCRIPT_NAME"]); // Send Response from OpenID server to this script
             $openid->Redirect(); // This will redirect user to OpenID Server
-        }
-        else {
+        } else {
             $error = $openid->GetError();
             return false;
         }
@@ -88,20 +87,17 @@ function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
                     $login = $obj->login;
                 }
             }
-        }
-        elseif ($openid->IsError() === true)
+        } elseif ($openid->IsError() === true)
         {
             // ON THE WAY, WE GOT SOME ERROR
             $error = $openid->GetError();
             return false;
-        }
-        else {
+        } else {
             // Signature Verification Failed
             //echo "INVALID AUTHORIZATION";
             return false;
         }
-    }
-    elseif ($_GET['openid_mode'] == 'cancel')
+    } elseif ($_GET['openid_mode'] == 'cancel')
     {
         // User Canceled your Request
         //echo "USER CANCELED REQUEST";
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index c58c8049c27..c69f24465ea 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -116,8 +116,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 			if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname = 'class="tmenusel"';
 			elseif (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname = 'class="tmenusel"';
 			else $classname = 'class="tmenu"';
-		}
-		elseif ($showmode == 2) $classname = 'class="tmenu"';
+		} elseif ($showmode == 2) $classname = 'class="tmenu"';
 
 		$menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target'] ? $newTabMenu[$i]['target'] : $atarget), ($newTabMenu[$i]['mainmenu'] ? $newTabMenu[$i]['mainmenu'] : $newTabMenu[$i]['rowid']), ($newTabMenu[$i]['leftmenu'] ? $newTabMenu[$i]['leftmenu'] : ''), $newTabMenu[$i]['position'], $id, $idsel, $classname);
 	}
@@ -356,8 +355,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 				}
 				$i++;
 			}
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 		$db->free($resql);
 	}
 
@@ -409,13 +407,11 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					}
 					$i++;
 				}
-			}
-			else {
+			} else {
 				// Should not happend. Entries are added
 				$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
 			}
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 		$db->free($resql);
 	}
 
@@ -471,8 +467,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 				if ($altok % 2 == 0)
 				{
 					print '<div class="blockvmenu blockvmenuimpair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
-				}
-				else {
+				} else {
 					print '<div class="blockvmenu blockvmenupair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
 				}
 			}
@@ -530,13 +525,11 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					else print '</span>';
 					print '</div>'."\n";
 					$lastlevel0 = 'enabled';
-				}
-				elseif ($showmenu)                 // Not enabled but visible (so greyed)
+				} elseif ($showmenu)                 // Not enabled but visible (so greyed)
 				{
 					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
 					$lastlevel0 = 'greyed';
-				}
-				else {
+				} else {
 				    $lastlevel0 = 'hidden';
 				}
 				if ($showmenu)
@@ -562,8 +555,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					// If title is not pure text and contains a table, no carriage return added
 					if (!strstr($menu_array[$i]['titre'], '<table')) print '<br>';
 					print '</div>'."\n";
-				}
-				elseif ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
+				} elseif ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
 				{
 					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
 				}
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index c654e823b5c..a9d05fe4b5c 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -78,8 +78,7 @@ class MenuManager
     		$mainmenu = $_GET["mainmenu"];
     		$_SESSION["mainmenu"] = $mainmenu;
     		$_SESSION["leftmenuopened"] = "";
-    	}
-    	else {
+    	} else {
     		// On va le chercher en session si non defini par le lien
     		$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
     	}
@@ -95,8 +94,7 @@ class MenuManager
     		{
     			//$leftmenu="";
     			$_SESSION["leftmenuopened"] = "";
-    		}
-    		else {
+    		} else {
     			$_SESSION["leftmenuopened"] = $leftmenu;
     		}
     	} else {
@@ -143,8 +141,7 @@ class MenuManager
         {
         	if ($mode == 'top')  print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
         	if ($mode == 'left') print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
-        }
-        else {
+        } else {
         	$conf->global->MAIN_SHOW_LOGO = 0;
         	if ($mode == 'top')  print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
         	if ($mode == 'left') print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
@@ -207,8 +204,7 @@ class MenuManager
         				{
         				    if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) print $langs->trans("Access");
         				    else print $langs->trans("Dashboard");
-        				}
-						else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+        				} else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
 						print '</a>';
 						print '</li>'."\n";
         			}
@@ -218,12 +214,10 @@ class MenuManager
 					    if ($val['enabled'])
 					    {
 					        $lastlevel[0] = 'enabled';
-					    }
-					    elseif ($showmenu)                 // Not enabled but visible (so greyed)
+					    } elseif ($showmenu)                 // Not enabled but visible (so greyed)
 					    {
 					        $lastlevel[0] = 'greyed';
-					    }
-					    else {
+					    } else {
 					        $lastlevel[0] = 'hidden';
 					    }
 					}
@@ -254,8 +248,7 @@ class MenuManager
        						if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
        						{
        							$relurl2 = dol_buildpath($val2['url'], 1);
-       						}
-       						else {
+       						} else {
        							$relurl2 = $val2['url'];
        						}
 	        				$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
@@ -280,19 +273,16 @@ class MenuManager
 		        					//print ' data-ajax="false"';
 		        					print '>';
 		        					$lastlevel2[$val2['level']] = 'enabled';
-	        					}
-	        					else // Not allowed but visible (greyed)
+	        					} else // Not allowed but visible (greyed)
 	        					{
 				        			print '<a href="#" class="vsmenudisabled">';
 				        			$lastlevel2[$val2['level']] = 'greyed';
 	        					}
-	        				}
-	        				else {
+	        				} else {
 	        				    if ($val2['enabled'])	// Allowed
 	        				    {
 	        				        $lastlevel2[$val2['level']] = 'enabled';
-	        				    }
-	        				    else {
+	        				    } else {
 	        				        $lastlevel2[$val2['level']] = 'greyed';
 	        				    }
 	        				}
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 39f94d6eb2f..1fd56199284 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -439,8 +439,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 				{
 					$mtitle .= $langs->trans($item);
 				}
-			}
-			else {
+			} else {
 				$mtitle = $langs->trans($smenu->title);
 			}
 			// Add item
@@ -482,8 +481,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname = 'class="tmenusel"';
 			elseif (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname = 'class="tmenusel"';
 			else $classname = 'class="tmenu"';
-		}
-		elseif ($showmode == 2) $classname = 'class="tmenu"';
+		} elseif ($showmode == 2) $classname = 'class="tmenu"';
 
 		$menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target'] ? $newTabMenu[$i]['target'] : $atarget), ($newTabMenu[$i]['mainmenu'] ? $newTabMenu[$i]['mainmenu'] : $newTabMenu[$i]['rowid']), ($newTabMenu[$i]['leftmenu'] ? $newTabMenu[$i]['leftmenu'] : ''), $newTabMenu[$i]['position'], $id, $idsel, $classname);
 	}
@@ -1306,13 +1304,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 								}
 								$i++;
 							}
-						}
-						else {
+						} else {
 							// Should not happend. Entries are added
 							$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
 						}
-					}
-					else dol_print_error($db);
+					} else dol_print_error($db);
 					$db->free($resql);
 				}
 
@@ -1621,8 +1617,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 						$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');
 						$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
 						$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
-					}
-					else {
+					} else {
 						$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock');
 						$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write);
 						$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read);
@@ -1721,14 +1716,12 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0)
 				{
 					$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : '').'&search_status=99', $langs->trans("List"), 1, $showmode, '', 'project', 'list');
-				}
-				elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 1)
+				} elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 1)
 				{
 					$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $showmode, '', 'project', 'list');
 					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99&contextpage=lead', $langs->trans("ListOpenLeads"), 2, $showmode);
 					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_opp_status=notopenedopp&search_status=99&contextpage=project', $langs->trans("ListOpenProjects"), 2, $showmode);
-				}
-				elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 2) {	// 2 = leads only
+				} elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 2) {	// 2 = leads only
 					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99', $langs->trans("List"), 2, $showmode);
 				}
 
@@ -1982,8 +1975,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				if ($altok % 2 == 0)
 				{
 					print '<div class="blockvmenu blockvmenuimpair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
-				}
-				else {
+				} else {
 					print '<div class="blockvmenu blockvmenupair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
 				}
 			}
@@ -2041,13 +2033,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					else print '</span>';
 					print '</div>'."\n";
 					$lastlevel0 = 'enabled';
-				}
-				elseif ($showmenu)                 // Not enabled but visible (so greyed)
+				} elseif ($showmenu)                 // Not enabled but visible (so greyed)
 				{
 					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
 					$lastlevel0 = 'greyed';
-				}
-				else {
+				} else {
 				    $lastlevel0 = 'hidden';
 				}
 				if ($showmenu)
@@ -2073,8 +2063,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					// If title is not pure text and contains a table, no carriage return added
 					if (!strstr($menu_array[$i]['titre'], '<table')) print '<br>';
 					print '</div>'."\n";
-				}
-				elseif ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
+				} elseif ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
 				{
 					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
 				}
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 2d62f9f7275..5a33d0b323b 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -77,8 +77,7 @@ class MenuManager
         	$mainmenu = $_GET["mainmenu"];
         	$_SESSION["mainmenu"] = $mainmenu;
         	$_SESSION["leftmenuopened"] = "";
-        }
-        else {
+        } else {
         	// On va le chercher en session si non defini par le lien
         	$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
         }
@@ -94,8 +93,7 @@ class MenuManager
         	{
         		//$leftmenu="";
         		$_SESSION["leftmenuopened"] = "";
-        	}
-        	else {
+        	} else {
         		$_SESSION["leftmenuopened"] = $leftmenu;
         	}
         } else {
@@ -144,8 +142,7 @@ class MenuManager
         {
         	if ($mode == 'top')  print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
         	if ($mode == 'left') print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
-        }
-        else {
+        } else {
         	$conf->global->MAIN_SHOW_LOGO = 0;
         	if ($mode == 'top')  print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
         	if ($mode == 'left') print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
@@ -212,8 +209,7 @@ class MenuManager
         				{
         					if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) print $langs->trans("Access");
         				    else print $langs->trans("Dashboard");
-        				}
-        				else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+        				} else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
         				print '</a>';
         				print '</li>'."\n";
         			}
@@ -223,12 +219,10 @@ class MenuManager
         			    if ($val['enabled'])
         			    {
         			        $lastlevel[0] = 'enabled';
-        			    }
-        			    elseif ($showmenu)                 // Not enabled but visible (so greyed)
+        			    } elseif ($showmenu)                 // Not enabled but visible (so greyed)
         			    {
         			        $lastlevel[0] = 'greyed';
-        			    }
-        			    else {
+        			    } else {
         			        $lastlevel[0] = 'hidden';
         			    }
         			}
@@ -259,8 +253,7 @@ class MenuManager
        						if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
        						{
        							$relurl2 = dol_buildpath($val2['url'], 1);
-       						}
-       						else {
+       						} else {
        							$relurl2 = $val2['url'];
        						}
 	        				$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
@@ -285,19 +278,16 @@ class MenuManager
 		        					//print ' data-ajax="false"';
 		        					print '>';
 		        					$lastlevel2[$val2['level']] = 'enabled';
-	        					}
-	        					else // Not allowed but visible (greyed)
+	        					} else // Not allowed but visible (greyed)
 	        					{
 				        			print '<a href="#" class="vsmenudisabled">';
 				        			$lastlevel2[$val2['level']] = 'greyed';
 	        					}
-	        				}
-	        				else {
+	        				} else {
 	        				    if ($val2['enabled'])	// Allowed
 	        				    {
 	        				        $lastlevel2[$val2['level']] = 'enabled';
-	        				    }
-	        				    else {
+	        				    } else {
 	        				        $lastlevel2[$val2['level']] = 'greyed';
 	        				    }
 	        				}
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 2b2a000fa3b..64145334883 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -215,8 +215,7 @@ class MenuManager
 		                {
 		                    if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
 		                    else print $langs->trans("Dashboard");
-		                }
-		                else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+		                } else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
 		                print '</a>';
 		                print '</li>'."\n";
 		            }
@@ -226,12 +225,10 @@ class MenuManager
 		                if ($val['enabled'])
 		                {
 		                    $lastlevel[0] = 'enabled';
-		                }
-		                elseif ($showmenu)                 // Not enabled but visible (so greyed)
+		                } elseif ($showmenu)                 // Not enabled but visible (so greyed)
 		                {
 		                    $lastlevel[0] = 'greyed';
-		                }
-		                else {
+		                } else {
 		                    $lastlevel[0] = 'hidden';
 		                }
 		            }
@@ -280,19 +277,16 @@ class MenuManager
 		                            //print ' data-ajax="false"';
 		                            print '>';
 		                            $lastlevel2[$val2['level']] = 'enabled';
-		                        }
-		                        else // Not allowed but visible (greyed)
+		                        } else // Not allowed but visible (greyed)
 		                        {
 		                            print '<a href="#" class="vsmenudisabled">';
 		                            $lastlevel2[$val2['level']] = 'greyed';
 		                        }
-		                    }
-		                    else {
+		                    } else {
 		                        if ($val2['enabled'])	// Allowed
 		                        {
 		                            $lastlevel2[$val2['level']] = 'enabled';
-		                        }
-		                        else {
+		                        } else {
 		                            $lastlevel2[$val2['level']] = 'greyed';
 		                        }
 		                    }
@@ -372,8 +366,7 @@ class MenuManager
 						if (($alt % 2 == 0))
 						{
 							print '<div class="blockvmenub lockvmenuimpair blockvmenuunique'.($lastopened ? ' blockvmenulast' : '').($alt == 1 ? ' blockvmenufirst' : '').'">'."\n";
-						}
-						else {
+						} else {
 							print '<div class="blockvmenu blockvmenupair blockvmenuunique'.($lastopened ? ' blockvmenulast' : '').($alt == 1 ? ' blockvmenufirst' : '').'">'."\n";
 						}
 					}
@@ -393,8 +386,7 @@ class MenuManager
 						if ($this->menu->liste[$i]['enabled'])
 						{
 							print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'], 1).'"'.($this->menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>'.$this->menu->liste[$i]['titre'].'</a></div>'."\n";
-						}
-						else {
+						} else {
 							print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$this->menu->liste[$i]['titre'].'</font></div>'."\n";
 						}
 						print '<div class="menu_top"></div>'."\n";
@@ -414,8 +406,7 @@ class MenuManager
 							else print '<span class="vsmenu">';
 							if ($this->menu->liste[$i]['url']) print $this->menu->liste[$i]['titre'].'</a>';
 							else print '</span>';
-						}
-						else {
+						} else {
 							print $tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$this->menu->liste[$i]['titre'].'</font>';
 						}
 
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 0911dc85719..6038754b023 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -437,8 +437,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                     if (!$ignoreerror) {
                          $this->error = $this->db->lasterror();
                          $err++;
-                    }
-                    else {
+                    } else {
                          dol_syslog(get_class($this)."::_init Warning ".$this->db->lasterror(), LOG_WARNING);
                     }
                 }
@@ -449,8 +448,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         if (!$err) {
             $this->db->commit();
             return 1;
-        }
-        else {
+        } else {
             $this->db->rollback();
             return 0;
         }
@@ -535,8 +533,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         if (!$err) {
             $this->db->commit();
             return 1;
-        }
-        else {
+        } else {
             $this->db->rollback();
             return 0;
         }
@@ -557,8 +554,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         if ($langs->transnoentitiesnoconv("Module".$this->numero."Name") != ("Module".$this->numero."Name")) {
             // If module name translation exists
             return $langs->transnoentitiesnoconv("Module".$this->numero."Name");
-        }
-        else {
+        } else {
             // If module name translation using it's unique id does not exist, we try to use its name to find translation
             if (is_array($this->langfiles)) {
                 foreach ($this->langfiles as $val)
@@ -592,8 +588,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         if ($langs->transnoentitiesnoconv("Module".$this->numero."Desc") != ("Module".$this->numero."Desc")) {
             // If module description translation exists
             return $langs->transnoentitiesnoconv("Module".$this->numero."Desc");
-        }
-        else {
+        } else {
             // If module description translation does not exist using its unique id, we can use its name to find translation
             if (is_array($this->langfiles)) {
                 foreach ($this->langfiles as $val)
@@ -645,12 +640,10 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                         'images/' => dol_buildpath(strtolower($this->name).'/images/', 1),
                     )
                 );
-            }
-            else {
+            } else {
                 $content = nl2br($content);
             }
-        }
-        else {
+        } else {
             // Mostly for internal modules
             if (!empty($this->descriptionlong)) {
                 if (is_array($this->langfiles)) {
@@ -738,8 +731,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
             if ((float) DOL_VERSION >= 6.0) {
                 @include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
                 $content = dolMd2Html($content, 'parsedown', array('doc/'=>dol_buildpath(strtolower($this->name).'/doc/', 1)));
-            }
-            else {
+            } else {
                 $content = nl2br($content);
             }
         }
@@ -850,8 +842,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         if ($langs->trans($langstring) == $langstring) {
             // Translation not found
             return $langs->trans($this->export_label[$r]);
-        }
-        else {
+        } else {
             // Translation found
             return $langs->trans($langstring);
         }
@@ -874,8 +865,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         if ($langs->trans($langstring) == $langstring) {
             // Translation not found
             return $langs->transnoentitiesnoconv($this->import_label[$r]);
-        }
-        else {
+        } else {
             // Translation found
             return $langs->transnoentitiesnoconv($langstring);
         }
@@ -902,8 +892,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         if (!$resql)
         {
             $err++;
-        }
-        else {
+        } else {
             $obj = $this->db->fetch_object($resql);
             if ($obj) {
                 return $this->db->jdate($obj->tms);
@@ -934,8 +923,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         if (!$resql)
         {
             $err++;
-        }
-        else {
+        } else {
             $obj = $this->db->fetch_object($resql);
             $tmp = array();
             if ($obj->note) {
@@ -1220,15 +1208,13 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
                         if (!$err) {
                             $this->db->commit();
-                        }
-                        else {
+                        } else {
                                   $this->error = $this->db->lasterror();
                                   $this->db->rollback();
                         }
                     }
                     // else box already registered into database
-                }
-                else {
+                } else {
                     $this->error = $this->db->lasterror();
                     $err++;
                 }
@@ -1413,15 +1399,13 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
                         if (!$err) {
                             $this->db->commit();
-                        }
-                        else {
+                        } else {
                             $this->error = $this->db->lasterror();
                             $this->db->rollback();
                         }
                     }
                     // else box already registered into database
-                }
-                else {
+                } else {
                     $this->error = $this->db->lasterror();
                     $err++;
                 }
@@ -1612,12 +1596,10 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                     if (!$this->db->query($sql)) {
                         $err++;
                     }
-                }
-                else {
+                } else {
                     dol_syslog(get_class($this)."::insert_const constant '".$name."' already exists", LOG_WARNING);
                 }
-            }
-            else {
+            } else {
                 $err++;
             }
         }
@@ -1719,15 +1701,13 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                                     $sql .= " (id, entity, libelle, module, type, bydefault, perms, subperms)";
                                     $sql .= " VALUES ";
                                     $sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."','".$r_subperms."')";
-                                }
-                                else {
+                                } else {
                                     $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def";
                                     $sql .= " (id, entity, libelle, module, type, bydefault, perms)";
                                     $sql .= " VALUES ";
                                     $sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."')";
                                 }
-                            }
-                            else {
+                            } else {
                                  $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def ";
                                  $sql .= " (id, entity, libelle, module, type, bydefault)";
                                  $sql .= " VALUES ";
@@ -1741,8 +1721,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                                     $this->error = $this->db->lasterror();
                                     $err++;
                                     break;
-                                }
-                                else { dol_syslog(get_class($this)."::insert_permissions record already exists", LOG_INFO);
+                                } else { dol_syslog(get_class($this)."::insert_permissions record already exists", LOG_INFO);
                                 }
                             }
 
@@ -1772,14 +1751,12 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                                   $result = $tmpuser->fetch($obj2->rowid);
                                 if ($result > 0) {
                                     $tmpuser->addrights($r_id, '', '', 0, 1);
-                                }
-                                else {
+                                } else {
                                     dol_syslog(get_class($this)."::insert_permissions Failed to add the permission to user because fetch return an error", LOG_ERR);
                                 }
                                  $i++;
                             }
-                        }
-                        else {
+                        } else {
                             dol_print_error($this->db);
                         }
                     }
@@ -1793,8 +1770,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                 }
             }
             $this->db->free($resql);
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             $err++;
         }
@@ -1861,8 +1837,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
             if (!$this->menu[$key]['fk_menu']) {
                 $menu->fk_menu = 0;
-            }
-            else {
+            } else {
                 $foundparent = 0;
                 $fk_parent = $this->menu[$key]['fk_menu'];
                 if (preg_match('/^r=/', $fk_parent))    // old deprecated method
@@ -1872,14 +1847,12 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                         $menu->fk_menu = $this->menu[$fk_parent]['rowid'];
                         $foundparent = 1;
                     }
-                }
-                elseif (preg_match('/^fk_mainmenu=([a-zA-Z0-9_]+),fk_leftmenu=([a-zA-Z0-9_]+)$/', $fk_parent, $reg)) {
+                } elseif (preg_match('/^fk_mainmenu=([a-zA-Z0-9_]+),fk_leftmenu=([a-zA-Z0-9_]+)$/', $fk_parent, $reg)) {
                     $menu->fk_menu = -1;
                     $menu->fk_mainmenu = $reg[1];
                     $menu->fk_leftmenu = $reg[2];
                     $foundparent = 1;
-                }
-                elseif (preg_match('/^fk_mainmenu=([a-zA-Z0-9_]+)$/', $fk_parent, $reg)) {
+                } elseif (preg_match('/^fk_mainmenu=([a-zA-Z0-9_]+)$/', $fk_parent, $reg)) {
                     $menu->fk_menu = -1;
                     $menu->fk_mainmenu = $reg[1];
                     $menu->fk_leftmenu = '';
@@ -1909,8 +1882,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                 $result = $menu->create($user); // Save menu entry into table llx_menu
                 if ($result > 0) {
                     $this->menu[$key]['rowid'] = $result;
-                }
-                else {
+                } else {
                     $this->error = $menu->error;
                     dol_syslog(get_class($this).'::insert_menus result='.$result." ".$this->error, LOG_ERR);
                     $err++;
@@ -1921,8 +1893,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
         if (!$err) {
             $this->db->commit();
-        }
-        else {
+        } else {
             dol_syslog(get_class($this)."::insert_menus ".$this->error, LOG_ERR);
             $this->db->rollback();
         }
@@ -2054,8 +2025,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                 dol_syslog(get_class($this)."::insert_dirs", LOG_DEBUG);
                 $this->db->query($sql);
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             $err++;
         }
@@ -2120,13 +2090,11 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                         $newvalue = json_encode($value['data']);
                         if (isset($value['entity'])) { $entity = $value['entity'];
                         }
-                    }
-                    elseif (isset($value['data']) && !is_array($value['data'])) {
+                    } elseif (isset($value['data']) && !is_array($value['data'])) {
                         $newvalue = $value['data'];
                         if (isset($value['entity'])) { $entity = $value['entity'];
                         }
-                    }
-                    else // when hook is declared with syntax 'hook'=>array('hookcontext1','hookcontext2',...)
+                    } else // when hook is declared with syntax 'hook'=>array('hookcontext1','hookcontext2',...)
                     {
                         $newvalue = json_encode($value);
                     }
@@ -2156,8 +2124,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                     if ($this->db->lasterrno() != 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                          $error++;
                          $this->error = $this->db->lasterror();
-                    }
-                    else {
+                    } else {
                          dol_syslog(get_class($this)."::insert_module_parts for ".$this->const_name."_".strtoupper($key)." Record already exists.", LOG_WARNING);
                     }
                 }
@@ -2262,8 +2229,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		{
 			if (preg_match('/^\//i', $this->picto)) print img_picto($alttext, $this->picto, 'class="inline-block valignmiddle"', 1);
 			else print img_object($alttext, $this->picto, 'class="inline-block valignmiddle"');
-		}
-		else {
+		} else {
 			print img_object($alttext, 'generic', 'class="inline-block valignmiddle"');
 		}
 
diff --git a/htdocs/core/modules/action/modules_action.php b/htdocs/core/modules/action/modules_action.php
index ea3b961b63f..27260748662 100644
--- a/htdocs/core/modules/action/modules_action.php
+++ b/htdocs/core/modules/action/modules_action.php
@@ -85,8 +85,7 @@ function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $h
 		if (!empty($conf->global->ACTION_EVENT_ADDON_PDF))
 		{
 			$modele = $conf->global->ACTION_EVENT_ADDON_PDF;
-		}
-		else {
+		} else {
 			$modele = 'soleil';
 		}
 	}
@@ -140,14 +139,12 @@ function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $h
 			dol_delete_preview($object);
 
 			return 1;
-		}
-		else {
+		} else {
 			$outputlangs->charset_output = $sav_charset_output;
 			dol_print_error($db, "action_pdf_create Error: ".$obj->error);
 			return 0;
 		}
-	}
-	else {
+	} else {
 		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 		return 0;
 	}
diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
index dc19b2c0907..3aa46add2ac 100644
--- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
@@ -118,8 +118,7 @@ class pdf_ban extends ModeleBankAccountDoc
 		    {
 		        $dir = $conf->bank->dir_output;
 		        $file = $dir."/SPECIMEN.pdf";
-		    }
-		    else {
+		    } else {
 		        $objectref = dol_sanitizeFileName($object->ref);
 		        $dir = $conf->bank->dir_output."/".$objectref;
 		        $file = $dir."/".$objectref.".pdf";
@@ -202,8 +201,7 @@ class pdf_ban extends ModeleBankAccountDoc
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else {
+				} else {
 					$height_note = 0;
 				}
 
@@ -221,8 +219,7 @@ class pdf_ban extends ModeleBankAccountDoc
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else {
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -259,8 +256,7 @@ class pdf_ban extends ModeleBankAccountDoc
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
@@ -327,15 +323,13 @@ class pdf_ban extends ModeleBankAccountDoc
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else {
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		} else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index 8bcb06b72da..e50acfb6c2a 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -123,8 +123,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 		        if (!empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
 		        else $dir = $conf->bank->dir_output;
 		        $file = $dir."/SPECIMEN.pdf";
-		    }
-		    else {
+		    } else {
 		        $objectref = dol_sanitizeFileName($object->ref);
 		        if (!empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
 		        else $dir = $conf->bank->dir_output."/".$objectref;
@@ -208,8 +207,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else {
+				} else {
 					$height_note = 0;
 				}
 
@@ -365,8 +363,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else {
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -412,8 +409,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
@@ -562,15 +558,13 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else {
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		} else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
@@ -585,8 +579,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 		if (!empty($object->date_rum))
 		{
             $daterum = dol_print_date($object->date_rum, 'day', false, $outputlangs, true);
-		}
-		else $daterum = dol_print_date($object->datec, 'day', false, $outputlangs, true); // For old record, the date_rum was not saved.
+		} else $daterum = dol_print_date($object->datec, 'day', false, $outputlangs, true); // For old record, the date_rum was not saved.
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".$daterum, '', 'R');
 		/*$posy+=6;
 		$pdf->SetXY($posx,$posy);
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index b01df64c088..9569f800f7f 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -204,29 +204,24 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		if (empty($code) && $this->code_null && empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)))
 		{
 			$result = -2;
-		}
-		else {
+		} else {
 			if ($this->verif_syntax($code, $type) >= 0)
 			{
 				$is_dispo = $this->verif_dispo($db, $code, $product);
 				if ($is_dispo <> 0)
 				{
 					$result = -3;
-				}
-				else {
+				} else {
 					$result = 0;
 				}
-			}
-			else {
+			} else {
 				if (dol_strlen($code) == 0)
 				{
 					$result = -2;
-				}
-				else {
+				} else {
 					$result = -1;
 				}
 			}
@@ -259,12 +254,10 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 			if ($db->num_rows($resql) == 0)
 			{
 				return 0;
-			}
-			else {
+			} else {
 				return -1;
 			}
-		}
-		else {
+		} else {
 			return -2;
 		}
 	}
diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
index 4260cd4d8c4..b722dd20c76 100644
--- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
+++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
@@ -266,8 +266,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else {
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -299,8 +298,7 @@ class doc_generic_bom_odt extends ModelePDFBom
                			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
             			$contactobject = $object->contact;
                     }
-				}
-				else {
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -333,8 +331,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -350,8 +347,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
                     dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -382,13 +378,11 @@ class doc_generic_bom_odt extends ModelePDFBom
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -398,8 +392,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -420,12 +413,10 @@ class doc_generic_bom_odt extends ModelePDFBom
 							{
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -434,8 +425,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -448,8 +438,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -469,8 +458,7 @@ class doc_generic_bom_odt extends ModelePDFBom
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -491,8 +479,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/bom/mod_bom_standard.php b/htdocs/core/modules/bom/mod_bom_standard.php
index 2246412997b..31f621ec15c 100644
--- a/htdocs/core/modules/bom/mod_bom_standard.php
+++ b/htdocs/core/modules/bom/mod_bom_standard.php
@@ -129,8 +129,7 @@ class mod_bom_standard extends ModeleNumRefboms
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else {
+		} else {
 			dol_syslog("mod_bom_standard::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
index ea431b5a2ce..f1a95bb5c14 100644
--- a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
@@ -126,8 +126,7 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else {
+		} else {
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/cheque/modules_chequereceipts.php b/htdocs/core/modules/cheque/modules_chequereceipts.php
index bbe9bc119a4..66b2f9f7d82 100644
--- a/htdocs/core/modules/cheque/modules_chequereceipts.php
+++ b/htdocs/core/modules/cheque/modules_chequereceipts.php
@@ -178,8 +178,7 @@ function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs)
 		if (!empty($conf->global->CHEQUERECEIPT_ADDON_PDF))
 		{
 			$modele = $conf->global->CHEQUERECEIPT_ADDON_PDF;
-		}
-		else {
+		} else {
 			//print $langs->trans("Error")." ".$langs->trans("Error_FACTURE_ADDON_PDF_NotDefined");
 			//return 0;
 			$modele = 'blochet';
@@ -202,14 +201,12 @@ function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs)
 		{
 			$outputlangs->charset_output = $sav_charset_output;
 			return 1;
-		}
-		else {
+		} else {
 			$outputlangs->charset_output = $sav_charset_output;
 			dol_print_error($db, "chequereceipt_pdf_create Error: ".$obj->error);
 			return -1;
 		}
-	}
-	else {
+	} else {
 		dol_print_error('', $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $dir.$file));
 		return -1;
 	}
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index f992996403a..4fd09edf994 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -278,8 +278,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else {
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -311,8 +310,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
                			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
             			$contactobject = $object->contact;
                     }
-				}
-				else {
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -349,8 +347,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -366,8 +363,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
                     dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -398,13 +394,11 @@ class doc_generic_order_odt extends ModelePDFCommandes
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -414,8 +408,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -436,12 +429,10 @@ class doc_generic_order_odt extends ModelePDFCommandes
 							{
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -450,8 +441,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -464,8 +454,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -485,8 +474,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					    $odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -507,8 +495,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index f5568452221..e60508487c2 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -172,8 +172,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$this->posxup = 118;
 			$this->posxqty = 135;
 			$this->posxunit = 151;
-		}
-		else {
+		} else {
 			$this->posxtva = 110;
 			$this->posxup = 126;
 			$this->posxqty = 145;
@@ -238,8 +237,7 @@ class pdf_einstein extends ModelePDFCommandes
 			{
 				$dir = $conf->commande->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->commande->multidir_output[$object->entity]."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -438,16 +436,14 @@ class pdf_einstein extends ModelePDFCommandes
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else {
+						} else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
 							else $showpricebeforepagebreak = 0;
 						}
-					}
-					else // No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -562,8 +558,7 @@ class pdf_einstein extends ModelePDFCommandes
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -577,8 +572,7 @@ class pdf_einstein extends ModelePDFCommandes
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -635,13 +629,11 @@ class pdf_einstein extends ModelePDFCommandes
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "COMMANDE_OUTPUTDIR");
 			return 0;
 		}
@@ -752,8 +744,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
             $posy = $pdf->GetY() + 1;
-		}
-        elseif ($object->availability_code || $object->availability)    // Show availability conditions
+		} elseif ($object->availability_code || $object->availability)    // Show availability conditions
 		{
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -905,8 +896,7 @@ class pdf_einstein extends ModelePDFCommandes
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else {
+			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1263,23 +1253,20 @@ class pdf_einstein extends ModelePDFCommandes
 				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
 				{
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
-				}
-				else {
+				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
 				if (is_readable($logo))
 				{
 				    $height = pdf_getHeightForLogo($logo);
 				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-				}
-				else {
+				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
-			}
-			else {
+			} else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index dc13ad237b7..b9db80a5cfc 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -232,8 +232,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		        {
 		            $pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 		            $pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
-		        }
-		        else {
+		        } else {
 		            $pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
 		            $pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 		        }
@@ -252,12 +251,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 		                        if ($obj['photo_vignette'])
 		                        {
 		                            $filename = $obj['photo_vignette'];
-		                        }
-		                        else {
+		                        } else {
 		                            $filename = $obj['photo'];
 		                        }
-		                    }
-		                    else {
+		                    } else {
 		                        $filename = $obj['photo'];
 		                    }
 
@@ -285,8 +282,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			{
 				$dir = $conf->commande->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->commande->multidir_output[$object->entity]."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -483,8 +479,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				            if ($i > $pageposbeforenote) {
 				                $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
 				                $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-				            }
-				            else {
+				            } else {
 				                $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
 				                $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 				            }
@@ -502,8 +497,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 				        $height_note = $posyafter - $tab_top_newpage;
 				        $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-				    }
-				    else // No pagebreak
+				    } else // No pagebreak
 				    {
 				        $pdf->commitTransaction();
 				        $posyafter = $pdf->GetY();
@@ -527,8 +521,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 				    $tab_height = $tab_height - $height_note;
 				    $tab_top = $posyafter + 6;
-				}
-				else {
+				} else {
 					$height_note = 0;
 				}
 
@@ -615,16 +608,14 @@ class pdf_eratosthene extends ModelePDFCommandes
     								//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
     								$pdf->setPage($pageposafter + 1);
     							}
-    						}
-    						else {
+    						} else {
     							// We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
 								else $showpricebeforepagebreak = 0;
     						}
-    					}
-    					else // No pagebreak
+    					} else // No pagebreak
     					{
     						$pdf->commitTransaction();
     					}
@@ -776,8 +767,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 						if ($pagenb == $pageposbeforeprintlines)
 						{
 						    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -791,8 +781,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					    if ($pagenb == $pageposafter)
 						{
 						    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
-					    }
-						else {
+					    } else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -849,13 +838,11 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "COMMANDE_OUTPUTDIR");
 			return 0;
 		}
@@ -960,8 +947,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
             $posy = $pdf->GetY() + 1;
-        }
-        elseif ($object->availability_code || $object->availability)    // Show availability conditions
+        } elseif ($object->availability_code || $object->availability)    // Show availability conditions
 		{
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -1116,8 +1102,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else {
+			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1427,23 +1412,20 @@ class pdf_eratosthene extends ModelePDFCommandes
 				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
 				{
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
-				}
-				else {
+				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
 				if (is_readable($logo))
 				{
 				    $height = pdf_getHeightForLogo($logo);
 				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-				}
-				else {
+				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
-			}
-			else {
+			} else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
@@ -1832,12 +1814,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 	    if ($reshook < 0)
 	    {
 	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    }
-	    elseif (empty($reshook))
+	    } elseif (empty($reshook))
 	    {
 	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    }
-	    else {
+	    } else {
 	        $this->cols = $hookmanager->resArray;
 	    }
     }
diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php
index a5558f2d0b2..f37d06b83fd 100644
--- a/htdocs/core/modules/commande/mod_commande_marbre.php
+++ b/htdocs/core/modules/commande/mod_commande_marbre.php
@@ -129,8 +129,7 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else {
+		} else {
 			dol_syslog("mod_commande_marbre::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index b5bc55633ee..30c12b46c44 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -265,8 +265,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else {
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -298,8 +297,7 @@ class doc_generic_contract_odt extends ModelePDFContract
                         // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
                         $contactobject = $object->contact;
                     }
-				}
-				else {
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -348,8 +346,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -365,8 +362,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -378,13 +374,11 @@ class doc_generic_contract_odt extends ModelePDFContract
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -395,8 +389,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -417,12 +410,10 @@ class doc_generic_contract_odt extends ModelePDFContract
 							{
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -431,8 +422,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -445,8 +435,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -464,8 +453,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 						$this->error = $e->getMessage();
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					    $odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -484,8 +472,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index 68c8cd1b96c..d612f4c0401 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -193,8 +193,7 @@ class pdf_strato extends ModelePDFContract
 			{
 				$dir = $conf->contrat->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->contrat->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -386,8 +385,7 @@ class pdf_strato extends ModelePDFContract
 									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 									$pdf->setPage($pageposafter + 1);
 								}
-							}
-							else {
+							} else {
 								// We found a page break
 
 								// Allows data in the first page if description is long enough to break in multiples pages
@@ -395,8 +393,7 @@ class pdf_strato extends ModelePDFContract
 									$showpricebeforepagebreak = 1;
 								else $showpricebeforepagebreak = 0;
 							}
-						}
-						else // No pagebreak
+						} else // No pagebreak
 						{
 							$pdf->commitTransaction();
 						}
@@ -422,8 +419,7 @@ class pdf_strato extends ModelePDFContract
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext, 0, $outputlangs, 0, 1);
-							}
-							else {
+							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter - $heightforfreetext, 0, $outputlangs, 1, 1);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -437,8 +433,7 @@ class pdf_strato extends ModelePDFContract
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext, 0, $outputlangs, 0, 1);
-							}
-							else {
+							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter - $heightforfreetext, 0, $outputlangs, 1, 1);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -456,8 +451,7 @@ class pdf_strato extends ModelePDFContract
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$this->tabSignature($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, $outputlangs);
 					$bottomlasttab = $this->page_hauteur - $heightforfooter - $heightforfooter + 1;
-				}
-				else {
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$this->tabSignature($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, $outputlangs);
 					$bottomlasttab = $this->page_hauteur - $heightforfooter - $heightforfooter + 1;
@@ -492,13 +486,11 @@ class pdf_strato extends ModelePDFContract
 				$this->result = array('fullpath'=>$file);
 
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "CONTRACT_OUTPUTDIR");
 			return 0;
 		}
@@ -627,15 +619,13 @@ class pdf_strato extends ModelePDFContract
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else {
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else {
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
diff --git a/htdocs/core/modules/contract/mod_contract_olive.php b/htdocs/core/modules/contract/mod_contract_olive.php
index d5f0c0926f5..ebb8cbf610e 100644
--- a/htdocs/core/modules/contract/mod_contract_olive.php
+++ b/htdocs/core/modules/contract/mod_contract_olive.php
@@ -114,8 +114,7 @@ class mod_contract_olive extends ModelNumRefContracts
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_CONTARCT_CODE_ALWAYS_REQUIRED))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_CONTARCT_CODE_ALWAYS_REQUIRED)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_CONTARCT_CODE_ALWAYS_REQUIRED)))
 		{
 			$result = -2;
 		}
diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php
index 2becdf52219..9cc63c5216c 100644
--- a/htdocs/core/modules/contract/mod_contract_serpis.php
+++ b/htdocs/core/modules/contract/mod_contract_serpis.php
@@ -138,8 +138,7 @@ class mod_contract_serpis extends ModelNumRefContracts
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else {
+		} else {
 			dol_syslog("mod_contract_serpis::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index d3ee39e8a5f..657c24e615d 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -103,8 +103,7 @@ class html_cerfafr extends ModeleDon
 			{
 				$dir = $conf->don->dir_output;
 				$file = $dir."/SPECIMEN.html";
-			}
-			else {
+			} else {
 				$donref = dol_sanitizeFileName($don->ref);
 				$dir = $conf->don->dir_output."/".$donref;
 				$file = $dir."/".$donref.".html";
@@ -129,19 +128,15 @@ class html_cerfafr extends ModeleDon
 				{
 					$formclass->load_cache_types_paiements();
 					$paymentmode = $formclass->cache_types_paiements[$don->modepaiementid]['label'];
-				}
-				else $paymentmode = '';
+				} else $paymentmode = '';
 
 				if ($don->modepaymentcode == 'CHQ') {
 					$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox" disabled="true" checked="checked"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
-				}
-				elseif ($don->modepaymentcode == 'LIQ') {
+				} elseif ($don->modepaymentcode == 'LIQ') {
 					$ModePaiement = '<td width="25%"><input type="checkbox" checked="checked"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
-				}
-				elseif ($don->modepaymentcode == 'VIR' || $don->modepaymentcode == 'PRE' || $don->modepaymentcode == 'CB') {
+				} elseif ($don->modepaymentcode == 'VIR' || $don->modepaymentcode == 'PRE' || $don->modepaymentcode == 'CB') {
 					$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox" checked="checked"> Virement, prélèvement, carte bancaire</td>';
-				}
-				else {
+				} else {
 					$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
 				}
 
@@ -214,8 +209,7 @@ class html_cerfafr extends ModeleDon
 					if ($conf->global->DONATION_ART200 >= 1)
 					{
 						$art200 = '<input type="checkbox" disabled="true" checked="checked" >200 du CGI';
-					}
-					else {
+					} else {
 						$art200 = '<input type="checkbox" disabled="true">200 du CGI';
 					}
 				}
@@ -226,8 +220,7 @@ class html_cerfafr extends ModeleDon
 					if ($conf->global->DONATION_ART238 >= 1)
 					{
 						$art238 = '<input type="checkbox" disabled="true" checked="checked" >238 bis du CGI';
-					}
-					else {
+					} else {
 						$art238 = '<input type="checkbox" disabled="true">238 bis du CGI';
 					}
 				}
@@ -238,8 +231,7 @@ class html_cerfafr extends ModeleDon
 					if ($conf->global->DONATION_ART978 >= 1)
 					{
 						$art978 = '<input type="checkbox" disabled="true" checked="checked" >978 du CGI';
-					}
-					else {
+					} else {
 						$art978 = '<input type="checkbox" disabled="true">978 du CGI';
 					}
 				}
@@ -256,13 +248,11 @@ class html_cerfafr extends ModeleDon
 				$this->result = array('fullpath'=>$file);
 
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "DON_OUTPUTDIR");
 			return 0;
 		}
@@ -308,12 +298,10 @@ class html_cerfafr extends ModeleDon
 			if ($dix[$i] == 0) {
 				$secon[$i] = '';
 				$prim[$i] = $chif[$unite[$i]];
-			}
-			elseif ($dix[$i] == 1) {
+			} elseif ($dix[$i] == 1) {
 				$secon[$i] = '';
 				$prim[$i] = $chif[($unite[$i] + 10)];
-			}
-			elseif ($dix[$i] == 2) {
+			} elseif ($dix[$i] == 2) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'vingt et';
                     $prim[$i] = $chif[$unite[$i]];
@@ -321,8 +309,7 @@ class html_cerfafr extends ModeleDon
                     $secon[$i] = 'vingt';
                     $prim[$i] = $chif[$unite[$i]];
 				}
-			}
-			elseif ($dix[$i] == 3) {
+			} elseif ($dix[$i] == 3) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'trente et';
                     $prim[$i] = $chif[$unite[$i]];
@@ -330,63 +317,51 @@ class html_cerfafr extends ModeleDon
                     $secon[$i] = 'trente';
                     $prim[$i] = $chif[$unite[$i]];
 				}
-			}
-			elseif ($dix[$i] == 4) {
+			} elseif ($dix[$i] == 4) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'quarante et';
                     $prim[$i] = $chif[$unite[$i]];
-				}
-				else {
+				} else {
                     $secon[$i] = 'quarante';
                     $prim[$i] = $chif[$unite[$i]];
 				}
-			}
-			elseif ($dix[$i] == 5) {
+			} elseif ($dix[$i] == 5) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'cinquante et';
                     $prim[$i] = $chif[$unite[$i]];
-				}
-				else {
+				} else {
                     $secon[$i] = 'cinquante';
                     $prim[$i] = $chif[$unite[$i]];
 				}
-			}
-			elseif ($dix[$i] == 6) {
+			} elseif ($dix[$i] == 6) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'soixante et';
                     $prim[$i] = $chif[$unite[$i]];
-				}
-				else {
+				} else {
                     $secon[$i] = 'soixante';
                     $prim[$i] = $chif[$unite[$i]];
 				}
-			}
-			elseif ($dix[$i] == 7) {
+			} elseif ($dix[$i] == 7) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'soixante et';
                     $prim[$i] = $chif[$unite[$i] + 10];
-				}
-				else {
+				} else {
                     $secon[$i] = 'soixante';
                     $prim[$i] = $chif[$unite[$i] + 10];
 				}
-			}
-			elseif ($dix[$i] == 8) {
+			} elseif ($dix[$i] == 8) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'quatre-vingts et';
                     $prim[$i] = $chif[$unite[$i]];
-				}
-				else {
+				} else {
                     $secon[$i] = 'quatre-vingt';
                     $prim[$i] = $chif[$unite[$i]];
 				}
-			}
-			elseif ($dix[$i] == 9) {
+			} elseif ($dix[$i] == 9) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'quatre-vingts et';
                     $prim[$i] = $chif[$unite[$i] + 10];
-				}
-				else {
+				} else {
                     $secon[$i] = 'quatre-vingts';
                     $prim[$i] = $chif[$unite[$i] + 10];
 				}
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index a9be573f80d..b5b42de689b 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -278,8 +278,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else {
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -348,8 +347,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -365,8 +363,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -382,13 +379,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -404,13 +399,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -428,13 +421,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -449,13 +440,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							{
 								if (file_exists($value)) $odfHandler->setImage($key, $value);
 								else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-							}
-							else // Text
+							} else // Text
 							{
 								$odfHandler->setVars($key, $value, true, 'UTF-8');
 							}
-						}
-						catch (OdfException $e)
+						} catch (OdfException $e)
 						{
                             dol_syslog($e->getMessage(), LOG_INFO);
 						}
@@ -475,13 +464,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -491,8 +478,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -511,12 +497,10 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							{
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -525,8 +509,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -539,8 +522,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -559,8 +541,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					    $odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -580,8 +561,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 2aa28f3b7db..fb131c5b6bc 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -195,8 +195,7 @@ class pdf_espadon extends ModelePdfExpedition
 				{
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product') . $object->lines[$i]->fk_product ."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
-				}
-				else {
+				} else {
 					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product') . dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
@@ -210,12 +209,10 @@ class pdf_espadon extends ModelePdfExpedition
                         if ($obj['photo_vignette'])
                         {
                             $filename = $obj['photo_vignette'];
-                        }
-                        else {
+                        } else {
                             $filename = $obj['photo'];
                         }
-                    }
-                    else {
+                    } else {
                         $filename = $obj['photo'];
                     }
 
@@ -237,8 +234,7 @@ class pdf_espadon extends ModelePdfExpedition
 			{
 				$dir = $conf->expedition->dir_output."/sending";
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$expref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output."/sending/".$expref;
 				$file = $dir."/".$expref.".pdf";
@@ -408,8 +404,7 @@ class pdf_espadon extends ModelePdfExpedition
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else {
+				} else {
 					$height_note = 0;
 				}
 
@@ -497,16 +492,14 @@ class pdf_espadon extends ModelePdfExpedition
 					                //if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					                $pdf->setPage($pageposafter + 1);
 					            }
-					        }
-					        else {
+					        } else {
 					            // We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
 								else $showpricebeforepagebreak = 0;
 					        }
-					    }
-					    else // No pagebreak
+					    } else // No pagebreak
 					    {
 					        $pdf->commitTransaction();
 					    }
@@ -599,8 +592,7 @@ class pdf_espadon extends ModelePdfExpedition
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -614,8 +606,7 @@ class pdf_espadon extends ModelePdfExpedition
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -632,8 +623,7 @@ class pdf_espadon extends ModelePdfExpedition
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else {
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -666,13 +656,11 @@ class pdf_espadon extends ModelePdfExpedition
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "EXP_OUTPUTDIR");
 			return 0;
 		}
@@ -875,15 +863,13 @@ class pdf_espadon extends ModelePdfExpedition
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else {
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else {
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -892,8 +878,7 @@ class pdf_espadon extends ModelePdfExpedition
 		if (!empty($conf->barcode->enabled))
 		{
 			$posx = 105;
-		}
-		else {
+		} else {
 			$posx = $this->marge_gauche + 3;
 		}
 		//$pdf->Rect($this->marge_gauche, $this->marge_haute, $this->page_largeur-$this->marge_gauche-$this->marge_droite, 30);
@@ -1254,12 +1239,10 @@ class pdf_espadon extends ModelePdfExpedition
 	    if ($reshook < 0)
 	    {
 	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    }
-	    elseif (empty($reshook))
+	    } elseif (empty($reshook))
 	    {
 	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    }
-	    else {
+	    } else {
 	        $this->cols = $hookmanager->resArray;
 	    }
 	}
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index bd698d72519..11f675100e7 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -192,8 +192,7 @@ class pdf_merou extends ModelePdfExpedition
 			{
 				$dir = $conf->expedition->dir_output."/sending";
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$expref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output."/sending/".$expref;
 				$file = $dir."/".$expref.".pdf";
@@ -286,8 +285,7 @@ class pdf_merou extends ModelePdfExpedition
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else {
+				} else {
 					$height_note = 0;
 				}
 
@@ -363,8 +361,7 @@ class pdf_merou extends ModelePdfExpedition
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -377,8 +374,7 @@ class pdf_merou extends ModelePdfExpedition
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -393,8 +389,7 @@ class pdf_merou extends ModelePdfExpedition
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else {
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -429,13 +424,11 @@ class pdf_merou extends ModelePdfExpedition
 				$this->result = array('fullpath'=>$file);
 
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = $outputlangs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $outputlangs->transnoentities("ErrorConstantNotDefined", "EXP_OUTPUTDIR");
 			return 0;
 		}
@@ -556,15 +549,13 @@ class pdf_merou extends ModelePdfExpedition
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, 10, 5, 0, $height); // width=0 (auto)
-			}
-			else {
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else {
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(70, 3, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -663,8 +654,7 @@ class pdf_merou extends ModelePdfExpedition
 					$pdf->writeHTMLCell(50, 8, '', '', $label, '', 'L');
 				}
 			}
-		}
-		else {
+		} else {
 			$pdf->MultiCell(50, 8, $outputlangs->transnoentities("Deliverer")." ".$outputlangs->convToOutputCharset($this->livreur->getFullName($outputlangs)), '', 'L');
 		}
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 99dfd20301f..70d9d55f6ed 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -218,8 +218,7 @@ class pdf_rouget extends ModelePdfExpedition
 				{
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
-				}
-				else {
+				} else {
 					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
@@ -232,12 +231,10 @@ class pdf_rouget extends ModelePdfExpedition
                         if ($obj['photo_vignette'])
                         {
                             $filename = $obj['photo_vignette'];
-                        }
-                        else {
+                        } else {
                             $filename = $obj['photo'];
                         }
-                    }
-                    else {
+                    } else {
                         $filename = $obj['photo'];
                     }
 
@@ -258,8 +255,7 @@ class pdf_rouget extends ModelePdfExpedition
 			{
 				$dir = $conf->expedition->dir_output."/sending";
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$expref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output."/sending/".$expref;
 				$file = $dir."/".$expref.".pdf";
@@ -417,8 +413,7 @@ class pdf_rouget extends ModelePdfExpedition
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else {
+				} else {
 					$height_note = 0;
 				}
 
@@ -496,8 +491,7 @@ class pdf_rouget extends ModelePdfExpedition
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else {
+						} else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
@@ -505,8 +499,7 @@ class pdf_rouget extends ModelePdfExpedition
 								$showpricebeforepagebreak = 1;
 							else $showpricebeforepagebreak = 0;
 						}
-					}
-					else // No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -590,8 +583,7 @@ class pdf_rouget extends ModelePdfExpedition
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -605,8 +597,7 @@ class pdf_rouget extends ModelePdfExpedition
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -623,8 +614,7 @@ class pdf_rouget extends ModelePdfExpedition
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else {
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -657,13 +647,11 @@ class pdf_rouget extends ModelePdfExpedition
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "EXP_OUTPUTDIR");
 			return 0;
 		}
@@ -910,15 +898,13 @@ class pdf_rouget extends ModelePdfExpedition
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else {
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else {
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -927,8 +913,7 @@ class pdf_rouget extends ModelePdfExpedition
 		if (!empty($conf->barcode->enabled))
 		{
 			$posx = 105;
-		}
-		else {
+		} else {
 			$posx = $this->marge_gauche + 3;
 		}
 		//$pdf->Rect($this->marge_gauche, $this->marge_haute, $this->page_largeur-$this->marge_gauche-$this->marge_droite, 30);
diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php
index f2d49ba6409..c0203d688f8 100644
--- a/htdocs/core/modules/expedition/mod_expedition_safor.php
+++ b/htdocs/core/modules/expedition/mod_expedition_safor.php
@@ -133,8 +133,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else {
+		} else {
 			dol_syslog("mod_expedition_safor::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 91539b979c2..ce226c5e031 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -226,8 +226,7 @@ class pdf_standard extends ModeleExpenseReport
 			if ($object->specimen) {
 				$dir = $conf->expensereport->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expensereport->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -338,8 +337,7 @@ class pdf_standard extends ModeleExpenseReport
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else {
+				} else {
 					$height_note = 0;
 				}
 
@@ -407,16 +405,14 @@ class pdf_standard extends ModeleExpenseReport
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else {
+						} else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
 							else $showpricebeforepagebreak = 0;
 						}
-					}
-					else // No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -454,8 +450,7 @@ class pdf_standard extends ModeleExpenseReport
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -469,8 +464,7 @@ class pdf_standard extends ModeleExpenseReport
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -486,8 +480,7 @@ class pdf_standard extends ModeleExpenseReport
 				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else {
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -553,13 +546,11 @@ class pdf_standard extends ModeleExpenseReport
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "EXPENSEREPORT_OUTPUTDIR");
 			return 0;
 		}
@@ -700,8 +691,7 @@ class pdf_standard extends ModeleExpenseReport
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else {
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -832,8 +822,7 @@ class pdf_standard extends ModeleExpenseReport
 					$pdf->SetXY($posx + 2, $posy);
 					$pdf->MultiCell(96, 4, $outputlangs->transnoentities("DATE_REFUS")." : ".dol_print_date($object->date_refuse, "day", false, $outputlangs), 0, 'L');
 				}
-			}
-			elseif ($object->fk_statut == 4)
+			} elseif ($object->fk_statut == 4)
 			{
 				if ($object->fk_user_cancel > 0) {
 					$userfee = new User($this->db);
@@ -847,8 +836,7 @@ class pdf_standard extends ModeleExpenseReport
 					$pdf->SetXY($posx + 2, $posy);
 					$pdf->MultiCell(96, 4, $outputlangs->transnoentities("DATE_CANCEL")." : ".dol_print_date($object->date_cancel, "day", false, $outputlangs), 0, 'L');
 				}
-			}
-			else {
+			} else {
 				if ($object->fk_user_approve > 0) {
 					$userfee = new User($this->db);
 					$userfee->fetch($object->fk_user_approve); $posy += 6;
@@ -1094,8 +1082,7 @@ class pdf_standard extends ModeleExpenseReport
 				$pdf->SetXY($tab3_posx + 35, $tab3_top + $y);
 				$pdf->MultiCell(30, 4, $outputlangs->transnoentitiesnoconv("RemainderToPay"), 0, 'L', 0);
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_jade.php b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
index bae163227e4..f33bf47e38e 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_jade.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
@@ -186,8 +186,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else {
+		} else {
 			dol_syslog("mod_expensereport_jade::getNextValue", LOG_DEBUG);
 			return 0;
 		}
diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php
index 0e57634f488..973e7ae536a 100644
--- a/htdocs/core/modules/export/export_csv.modules.php
+++ b/htdocs/core/modules/export/export_csv.modules.php
@@ -217,8 +217,7 @@ class ExportCsv extends ModeleExports
 		if (!empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
 		{
 			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
-		}
-		else {
+		} else {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -252,8 +251,7 @@ class ExportCsv extends ModeleExports
 		if (!empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
 		{
 			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
-		}
-		else {
+		} else {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
diff --git a/htdocs/core/modules/export/export_excel2007new.modules.php b/htdocs/core/modules/export/export_excel2007new.modules.php
index a96d51634b0..6d7cbb5d05f 100644
--- a/htdocs/core/modules/export/export_excel2007new.modules.php
+++ b/htdocs/core/modules/export/export_excel2007new.modules.php
@@ -273,8 +273,7 @@ class ExportExcel2007new extends ModeleExports
     		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		{
     			$this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
-    		}
-    		else {
+    		} else {
                 $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $outputlangs->transnoentities($alias));
     		    if (!empty($array_types[$code]) && in_array($array_types[$code], array('Date', 'Numeric', 'TextAuto')))		// Set autowidth for some types
                 {
@@ -331,8 +330,7 @@ class ExportExcel2007new extends ModeleExports
 			if (preg_match('/^\((.*)\)$/i', $newvalue, $reg))
 			{
 				$newvalue = $outputlangs->transnoentities($reg[1]);
-			}
-			else {
+			} else {
 				$newvalue = $outputlangs->convToOutputCharset($newvalue);
 			}
 
@@ -342,15 +340,13 @@ class ExportExcel2007new extends ModeleExports
         	    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel($newvalue));
         	    $coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
         	    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
-			}
-			elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i', $newvalue))
+			} elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i', $newvalue))
 			{
         	    $newvalue = dol_stringtotime($newvalue);
         	    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel($newvalue));
         	    $coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
         	    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd h:mm:ss');
-			}
-			else {
+			} else {
     	    	if ($typefield == 'Text' || $typefield == 'TextAuto')
     	    	{
     	    		//$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->setValueExplicit($newvalue, PHPExcel_Cell_DataType::TYPE_STRING);
@@ -358,8 +354,7 @@ class ExportExcel2007new extends ModeleExports
     	    		$coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
     	    		$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
     	    		$this->workbook->getActiveSheet()->getStyle($coord)->getAlignment()->setHorizontal(PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_LEFT);
-    	    	}
-    	    	else {
+    	    	} else {
     	    		$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $newvalue);
     	    	}
 			}
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index a25f07384a3..41c14324536 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -278,8 +278,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else {
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -355,8 +354,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -372,8 +370,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -407,13 +404,11 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -423,8 +418,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -445,12 +439,10 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 							{
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -459,8 +451,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -473,8 +464,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -493,8 +483,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -514,8 +503,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index ea5376981a4..60958526357 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -183,8 +183,7 @@ class pdf_crabe extends ModelePDFFactures
 			$this->posxup = 118;
 			$this->posxqty = 135;
 			$this->posxunit = 151;
-		}
-		else {
+		} else {
 			$this->posxtva = 110;
 			$this->posxup = 126;
 			$this->posxqty = 145;
@@ -286,8 +285,7 @@ class pdf_crabe extends ModelePDFFactures
 			{
 				$dir = $conf->facture->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->facture->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -552,8 +550,7 @@ class pdf_crabe extends ModelePDFFactures
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else {
+						} else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
@@ -561,8 +558,7 @@ class pdf_crabe extends ModelePDFFactures
 								$showpricebeforepagebreak = 1;
 							else $showpricebeforepagebreak = 0;
 						}
-					}
-					else // No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -695,8 +691,7 @@ class pdf_crabe extends ModelePDFFactures
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -710,8 +705,7 @@ class pdf_crabe extends ModelePDFFactures
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -728,8 +722,7 @@ class pdf_crabe extends ModelePDFFactures
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else {
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -771,13 +764,11 @@ class pdf_crabe extends ModelePDFFactures
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
 			return 0;
 		}
@@ -871,8 +862,7 @@ class pdf_crabe extends ModelePDFFactures
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -924,8 +914,7 @@ class pdf_crabe extends ModelePDFFactures
 			}
 
 			return $tab3_top + $y + 3;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1203,8 +1192,7 @@ class pdf_crabe extends ModelePDFFactures
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else {
+			} else {
 			    // FIXME amount of vat not supported with multicurrency
 
 				//Local tax 1 before VAT
@@ -1641,23 +1629,20 @@ class pdf_crabe extends ModelePDFFactures
 				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
 				{
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
-				}
-				else {
+				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
 				if (is_readable($logo))
 				{
 				    $height = pdf_getHeightForLogo($logo);
 					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-				}
-				else {
+				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
-			}
-			else {
+			} else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index acdb6063d5f..b9cb334d48e 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -250,8 +250,7 @@ class pdf_sponge extends ModelePDFFactures
 	            {
 	                $pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 	                $pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
-	            }
-	            else {
+	            } else {
 	                $pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
 	                $pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 	            }
@@ -270,12 +269,10 @@ class pdf_sponge extends ModelePDFFactures
 	                            if ($obj['photo_vignette'])
 	                            {
 	                                $filename = $obj['photo_vignette'];
-	                            }
-	                            else {
+	                            } else {
 	                                $filename = $obj['photo'];
 	                            }
-	                        }
-	                        else {
+	                        } else {
 	                            $filename = $obj['photo'];
 	                        }
 
@@ -305,8 +302,7 @@ class pdf_sponge extends ModelePDFFactures
 	        {
 	            $dir = $conf->facture->dir_output;
 	            $file = $dir."/SPECIMEN.pdf";
-	        }
-	        else {
+	        } else {
 	            $objectref = dol_sanitizeFileName($object->ref);
 	            $dir = $conf->facture->dir_output."/".$objectref;
 	            $file = $dir."/".$objectref.".pdf";
@@ -537,8 +533,7 @@ class pdf_sponge extends ModelePDFFactures
 	                        if ($i > $pageposbeforenote) {
 	                            $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
 	                            $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-	                        }
-	                        else {
+	                        } else {
 	                            $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
 	                            $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 	                        }
@@ -556,8 +551,7 @@ class pdf_sponge extends ModelePDFFactures
 	                    if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 	                    $height_note = $posyafter - $tab_top_newpage;
 	                    $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-	                }
-	                else // No pagebreak
+	                } else // No pagebreak
 	                {
 	                    $pdf->commitTransaction();
 	                    $posyafter = $pdf->GetY();
@@ -581,8 +575,7 @@ class pdf_sponge extends ModelePDFFactures
 
 	                $tab_height = $tab_height - $height_note;
 	                $tab_top = $posyafter + 6;
-	            }
-	            else {
+	            } else {
 	                $height_note = 0;
 	            }
 
@@ -667,16 +660,14 @@ class pdf_sponge extends ModelePDFFactures
     	                            if (!empty($tplidx)) $pdf->useTemplate($tplidx);
     	                            $pdf->setPage($pageposafter + 1);
     	                        }
-    	                    }
-    	                    else {
+    	                    } else {
     	                        // We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
 								else $showpricebeforepagebreak = 0;
     	                    }
-    	                }
-    	                else // No pagebreak
+    	                } else // No pagebreak
     	                {
     	                    $pdf->commitTransaction();
     	                }
@@ -840,8 +831,7 @@ class pdf_sponge extends ModelePDFFactures
                         $pdf->setPage($pagenb);
                         if ($pagenb == $pageposbeforeprintlines) {
                             $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
-                        }
-                        else {
+                        } else {
                         	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
                         }
                         $this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -854,8 +844,7 @@ class pdf_sponge extends ModelePDFFactures
                     if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
                         if ($pagenb == $pageposafter) {
                         	$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
-                        }
-                        else {
+                        } else {
                         	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
                         }
                         $this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -872,8 +861,7 @@ class pdf_sponge extends ModelePDFFactures
 	            {
 	            	$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code, $outputlangsbis);
 	                $bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-	            }
-	            else {
+	            } else {
 	            	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code, $outputlangsbis);
 	                $bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 	            }
@@ -915,13 +903,11 @@ class pdf_sponge extends ModelePDFFactures
 	                $this->result = array('fullpath'=>$file);
 
 	                return 1; // No error
-	        }
-	        else {
+	        } else {
 	            $this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 	            return 0;
 	        }
-	    }
-	    else {
+	    } else {
 	        $this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
 	        return 0;
 	    }
@@ -1018,8 +1004,7 @@ class pdf_sponge extends ModelePDFFactures
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1060,8 +1045,7 @@ class pdf_sponge extends ModelePDFFactures
 			}
 
 			return $tab3_top + $y + 3;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1298,8 +1282,7 @@ class pdf_sponge extends ModelePDFFactures
 
 		if (!empty($i)) {
 		    $avancementGlobal = $percent / $i;
-		}
-		else {
+		} else {
 		    $avancementGlobal = 0;
 		}
 
@@ -1318,8 +1301,7 @@ class pdf_sponge extends ModelePDFFactures
 		if (!empty($avancementGlobal)) {
 		    $total_a_payer = $total_a_payer * 100 / $avancementGlobal;
 		    $total_a_payer_ttc = $total_a_payer_ttc * 100 / $avancementGlobal;
-		}
-		else {
+		} else {
 		    $total_a_payer = 0;
 		    $total_a_payer_ttc = 0;
 		}
@@ -1458,8 +1440,7 @@ class pdf_sponge extends ModelePDFFactures
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else {
+			} else {
 			    // FIXME amount of vat not supported with multicurrency
 
 				//Local tax 1 before VAT
@@ -1542,8 +1523,7 @@ class pdf_sponge extends ModelePDFFactures
 					    if (!empty($sum_pdf_tva))
 					    {
 							$coef_fix_tva = $object->total_tva / $sum_pdf_tva;
-					    }
-					    else {
+					    } else {
 					        $coef_fix_tva = 1;
 					    }
 
@@ -1884,23 +1864,20 @@ class pdf_sponge extends ModelePDFFactures
 				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
 				{
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
-				}
-				else {
+				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
 				if (is_readable($logo))
 				{
 				    $height = pdf_getHeightForLogo($logo);
 					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-				}
-				else {
+				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
-			}
-			else {
+			} else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
@@ -1920,8 +1897,7 @@ class pdf_sponge extends ModelePDFFactures
 			if ($object->type == 0) {
 				if ($this->situationinvoice) $title .= $outputlangsbis->transnoentities("InvoiceSituation");
 				$title .= $outputlangsbis->transnoentities("PdfInvoiceTitle");
-			}
-			elseif ($object->type == 1) $title .= $outputlangsbis->transnoentities("InvoiceReplacement");
+			} elseif ($object->type == 1) $title .= $outputlangsbis->transnoentities("InvoiceReplacement");
 			elseif ($object->type == 2) $title .= $outputlangsbis->transnoentities("InvoiceAvoir");
 			elseif ($object->type == 3) $title .= $outputlangsbis->transnoentities("InvoiceDeposit");
 			elseif ($object->type == 4) $title .= $outputlangsbis->transnoentities("InvoiceProForma");
@@ -2373,12 +2349,10 @@ class pdf_sponge extends ModelePDFFactures
 	    if ($reshook < 0)
 	    {
 	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    }
-	    elseif (empty($reshook))
+	    } elseif (empty($reshook))
 	    {
 	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    }
-	    else {
+	    } else {
 	        $this->cols = $hookmanager->resArray;
 	    }
 	}
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index ae349f6f5cb..be9e9b782e9 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -173,8 +173,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else {
+		} else {
 			return -1;
 		}
 
@@ -196,12 +195,10 @@ class mod_facture_mars extends ModeleNumRefFactures
             {
                 $obj = $db->fetch_object($resql);
                 if ($obj) $ref = $obj->ref;
-            }
-            else dol_print_error($db);
+            } else dol_print_error($db);
 
             return $ref;
-		}
-		elseif ($mode == 'next')
+		} elseif ($mode == 'next')
 		{
 			$date = $invoice->date; // This is invoice date (not creation date)
     		$yymm = strftime("%y%m", $date);
@@ -211,8 +208,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 
     		dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
     		return $prefix.$yymm."-".$num;
-		}
-		else dol_print_error('', 'Bad parameter for getNextValue');
+		} else dol_print_error('', 'Bad parameter for getNextValue');
 	}
 
     /**
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index 80cd03f3e43..50b708baefc 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -150,8 +150,7 @@ class mod_facture_mercure extends ModeleNumRefFactures
         	{
         		$mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
         	}
-        }
-        elseif (is_object($invoice) && $invoice->type == 2) $mask = $conf->global->FACTURE_MERCURE_MASK_CREDIT;
+        } elseif (is_object($invoice) && $invoice->type == 2) $mask = $conf->global->FACTURE_MERCURE_MASK_CREDIT;
         elseif (is_object($invoice) && $invoice->type == 3) $mask = $conf->global->FACTURE_MERCURE_MASK_DEPOSIT;
         else $mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
         if (!$mask)
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index c16e751d7db..00f911ff76b 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -202,8 +202,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else {
+		} else {
 			return -1;
 		}
 
@@ -224,12 +223,10 @@ class mod_facture_terre extends ModeleNumRefFactures
             {
                 $obj = $db->fetch_object($resql);
                 if ($obj) $ref = $obj->ref;
-            }
-            else dol_print_error($db);
+            } else dol_print_error($db);
 
             return $ref;
-		}
-		elseif ($mode == 'next')
+		} elseif ($mode == 'next')
 		{
 			$date = $invoice->date; // This is invoice date (not creation date)
     		$yymm = strftime("%y%m", $date);
@@ -239,8 +236,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 
     		dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
     		return $prefix.$yymm."-".$num;
-		}
-		else dol_print_error('', 'Bad parameter for getNextValue');
+		} else dol_print_error('', 'Bad parameter for getNextValue');
 	}
 
     /**
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index a88e3c32bf3..d119cea1a45 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -185,8 +185,7 @@ class pdf_soleil extends ModelePDFFicheinter
 			{
 				$dir = $conf->ficheinter->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->ficheinter->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -287,8 +286,7 @@ class pdf_soleil extends ModelePDFFicheinter
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else {
+				} else {
 					$height_note = 0;
 				}
 
@@ -375,8 +373,7 @@ class pdf_soleil extends ModelePDFFicheinter
 									$pdf->setPage($pageposafter + 1);
 								}
 							}
-						}
-						else // No pagebreak
+						} else // No pagebreak
 						{
 							$pdf->commitTransaction();
 						}
@@ -401,8 +398,7 @@ class pdf_soleil extends ModelePDFFicheinter
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-							}
-							else {
+							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -416,8 +412,7 @@ class pdf_soleil extends ModelePDFFicheinter
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-							}
-							else {
+							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -435,8 +430,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else {
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -464,13 +458,11 @@ class pdf_soleil extends ModelePDFFicheinter
 				$this->result = array('fullpath'=>$file);
 
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "FICHEINTER_OUTPUTDIR");
 			return 0;
 		}
@@ -583,15 +575,13 @@ class pdf_soleil extends ModelePDFFicheinter
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else {
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else {
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php
index 5a56b849e5f..65aabb47030 100644
--- a/htdocs/core/modules/fichinter/mod_pacific.php
+++ b/htdocs/core/modules/fichinter/mod_pacific.php
@@ -106,8 +106,7 @@ class mod_pacific extends ModeleNumRefFicheinter
 		if (!$fayymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $fayymm))
 		{
 			return true;
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php
index b3b5906f683..b9991a7d14e 100644
--- a/htdocs/core/modules/fichinter/modules_fichinter.php
+++ b/htdocs/core/modules/fichinter/modules_fichinter.php
@@ -178,8 +178,7 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails = 0,
 		if (!empty($conf->global->FICHEINTER_ADDON_PDF))
 		{
 			$modele = $conf->global->FICHEINTER_ADDON_PDF;
-		}
-		else {
+		} else {
 			$modele = 'soleil';
 		}
 	}
@@ -233,14 +232,12 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails = 0,
 			dol_delete_preview($object);
 
 			return 1;
-		}
-		else {
+		} else {
 			$outputlangs->charset_output = $sav_charset_output;
 			dol_print_error($db, "fichinter_pdf_create Error: ".$obj->error);
 			return 0;
 		}
-	}
-	else {
+	} else {
 		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 		return 0;
 	}
diff --git a/htdocs/core/modules/holiday/mod_holiday_madonna.php b/htdocs/core/modules/holiday/mod_holiday_madonna.php
index 90c419bd260..b24fe4f45ea 100644
--- a/htdocs/core/modules/holiday/mod_holiday_madonna.php
+++ b/htdocs/core/modules/holiday/mod_holiday_madonna.php
@@ -139,8 +139,7 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else {
+		} else {
 			dol_syslog("mod_holiday_madonna::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 2e8d1d80097..51ad55cc937 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -198,8 +198,7 @@ class ImportCsv extends ModeleImports
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFailToOpenFile", $file);
 			$ret = -1;
-		}
-		else {
+		} else {
 			$this->file = $file;
 		}
 
@@ -263,20 +262,17 @@ class ImportCsv extends ModeleImports
 					{
 						$newarrayres[$key]['val'] = $val;
 						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
-					}
-					else {
+					} else {
 						$newarrayres[$key]['val'] = utf8_encode($val);
 						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					}
-				}
-				else // Autodetect format (UTF8 or ISO)
+				} else // Autodetect format (UTF8 or ISO)
 				{
 					if (utf8_check($val))
 					{
 						$newarrayres[$key]['val'] = $val;
 						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
-					}
-					else {
+					} else {
 						$newarrayres[$key]['val'] = utf8_encode($val);
 						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					}
@@ -343,8 +339,7 @@ class ImportCsv extends ModeleImports
 			$this->warnings[$warning]['lib'] = $langs->trans('EmptyLine');
 			$this->warnings[$warning]['type'] = 'EMPTY';
 			$warning++;
-		}
-		else {
+		} else {
 			$last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
 			$updatedone = false;
 			$insertdone = false;
@@ -368,10 +363,8 @@ class ImportCsv extends ModeleImports
 						$obj = $this->db->fetch_object($resql);
 						if ($obj) $tablewithentity_cache[$tablename] = 1; // table contains entity field
 						else $tablewithentity_cache[$tablename] = 0; // table does not contains entity field
-					}
-					else dol_print_error($this->db);
-				}
-				else {
+					} else dol_print_error($this->db);
+				} else {
 					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
 				}
 
@@ -431,8 +424,7 @@ class ImportCsv extends ModeleImports
                                         if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
                                         {
                                         	$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
-                                        }
-                                        else {
+                                        } else {
                                             $resultload = dol_include_once($file);
                                             if (empty($resultload))
                                             {
@@ -470,8 +462,7 @@ class ImportCsv extends ModeleImports
                                             if ($classinstance->id != '')	// id may be 0, it is a found value
                                             {
                                                 $newval = $classinstance->id;
-                                            }
-                                            else {
+                                            } else {
                                                 if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
                                                 elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
                                                 else $this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
@@ -481,8 +472,7 @@ class ImportCsv extends ModeleImports
                                             }
                                         }
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel')
                                 {
                                     $isidorref = 'id';
                                     if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
@@ -519,12 +509,10 @@ class ImportCsv extends ModeleImports
                                             }
                                         }
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull')
                                 {
                                     if (empty($newval)) $newval = '0';
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits')
                                 {
                                 	$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
                                 	$class = $objimport->array_import_convertvalue[0][$val]['class'];
@@ -533,8 +521,7 @@ class ImportCsv extends ModeleImports
                                 	if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] != '')
                                 	{
                                 		$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval];
-                                	}
-                                	else {
+                                	} else {
                                 		$resultload = dol_include_once($file);
                                 		if (empty($resultload))
                                 		{
@@ -550,8 +537,7 @@ class ImportCsv extends ModeleImports
                                 		if ($classinstance->id > 0)	// we found record
                                 		{
                                 			$newval = $scaleorid ? $scaleorid : 0;
-                                		}
-                                		else {
+                                		} else {
                                 			if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
                                 			else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
                                 			$this->errors[$error]['type'] = 'FOREIGNKEY';
@@ -559,8 +545,7 @@ class ImportCsv extends ModeleImports
                                 			$error++;
                                 		}
                                 	}
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -569,8 +554,7 @@ class ImportCsv extends ModeleImports
                                         //print 'code_client='.$newval;
                                     }
                                     if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -579,8 +563,7 @@ class ImportCsv extends ModeleImports
                                         //print 'code_fournisseur='.$newval;
                                     }
                                     if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -589,8 +572,7 @@ class ImportCsv extends ModeleImports
                                         //print 'code_compta='.$newval;
                                     }
                                     if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -600,8 +582,7 @@ class ImportCsv extends ModeleImports
                                         //print 'code_compta_fournisseur='.$newval;
                                     }
                                     if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto')
                                 {
                                     $defaultref = '';
                                     // TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
@@ -614,8 +595,7 @@ class ImportCsv extends ModeleImports
                                     }
                                     if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
                                     $newval = $defaultref;
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute')
                                 {
                                     $file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
                                     $class = $objimport->array_import_convertvalue[0][$val]['class'];
@@ -635,8 +615,7 @@ class ImportCsv extends ModeleImports
                                         $errorforthistable++;
                                         $error++;
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
                                 {
                                     $newval = price2num($newval);
                                 }
@@ -677,8 +656,7 @@ class ImportCsv extends ModeleImports
 												if ($obj) $this->cachefieldtable[$cachekey][] = $obj->aliasfield;
 												$i++;
 											}
-										}
-										else {
+										} else {
 											dol_print_error($this->db);
 										}
 									}
@@ -734,8 +712,7 @@ class ImportCsv extends ModeleImports
     				    {
     				        $listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
     				        $listvalues[] = $user->id;
-    				    }
-    				    elseif (preg_match('/^lastrowid-/', $val))
+    				    } elseif (preg_match('/^lastrowid-/', $val))
     				    {
     				        $tmp = explode('-', $val);
     				        $lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
@@ -743,14 +720,12 @@ class ImportCsv extends ModeleImports
     				        $listfields[] = $keyfield;
                             $listvalues[] = $lastinsertid;
     				        //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
-    				    }
-    				    elseif (preg_match('/^const-/', $val))
+    				    } elseif (preg_match('/^const-/', $val))
     				    {
     				    	$tmp = explode('-', $val, 2);
     				    	$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
     				    	$listvalues[] = "'".$tmp[1]."'";
-    				    }
-    				    else {
+    				    } else {
     				    	$this->errors[$error]['lib'] = 'Bad value of profile setup '.$val.' for array_import_fieldshidden';
     				    	$this->errors[$error]['type'] = 'Import profile setup';
     				    	$error++;
@@ -799,8 +774,7 @@ class ImportCsv extends ModeleImports
 									} else {
 										// No record found with filters, insert will be tried below
 									}
-								}
-								else {
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -827,8 +801,7 @@ class ImportCsv extends ModeleImports
 										// force $lastinsertid to 0 so we INSERT below.
 										$lastinsertid = 0;
 									}
-								}
-								else {
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -857,8 +830,7 @@ class ImportCsv extends ModeleImports
 								if ($resql) {
 									// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
 									$updatedone = true;
-								}
-								else {
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -891,8 +863,7 @@ class ImportCsv extends ModeleImports
 								{
 								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
 								    $insertdone = true;
-								}
-								else {
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index dc5bac9568c..090d57645ea 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -374,8 +374,7 @@ class ImportXlsx extends ModeleImports
 			$this->warnings[$warning]['lib'] = $langs->trans('EmptyLine');
 			$this->warnings[$warning]['type'] = 'EMPTY';
 			$warning++;
-		}
-		else {
+		} else {
 			$last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
 			$updatedone = false;
 			$insertdone = false;
@@ -399,10 +398,8 @@ class ImportXlsx extends ModeleImports
 						$obj = $this->db->fetch_object($resql);
 						if ($obj) $tablewithentity_cache[$tablename] = 1; // table contains entity field
 						else $tablewithentity_cache[$tablename] = 0; // table does not contains entity field
-					}
-					else dol_print_error($this->db);
-				}
-				else {
+					} else dol_print_error($this->db);
+				} else {
 					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
 				}
 
@@ -461,8 +458,7 @@ class ImportXlsx extends ModeleImports
                                         if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
                                         {
                                         	$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
-                                        }
-                                        else {
+                                        } else {
                                             $resultload = dol_include_once($file);
                                             if (empty($resultload))
                                             {
@@ -500,8 +496,7 @@ class ImportXlsx extends ModeleImports
                                             if ($classinstance->id != '')	// id may be 0, it is a found value
                                             {
                                                 $newval = $classinstance->id;
-                                            }
-                                            else {
+                                            } else {
                                                 if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
                                                 elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
                                                 else $this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
@@ -511,8 +506,7 @@ class ImportXlsx extends ModeleImports
                                             }
                                         }
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel')
                                 {
                                     $isidorref = 'id';
                                     if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
@@ -549,12 +543,10 @@ class ImportXlsx extends ModeleImports
                                             }
                                         }
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull')
                                 {
                                     if (empty($newval)) $newval = '0';
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits')
                                 {
                                 	$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
                                 	$class = $objimport->array_import_convertvalue[0][$val]['class'];
@@ -563,8 +555,7 @@ class ImportXlsx extends ModeleImports
                                 	if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] != '')
                                 	{
                                 		$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval];
-                                	}
-                                	else {
+                                	} else {
                                 		$resultload = dol_include_once($file);
                                 		if (empty($resultload))
                                 		{
@@ -580,8 +571,7 @@ class ImportXlsx extends ModeleImports
                                         if ($classinstance->id > 0)	// we found record
                                         {
                                         	$newval = $scaleorid ? $scaleorid : 0;
-                                        }
-                                        else {
+                                        } else {
                                         	if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
                                         	else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
                                 			$this->errors[$error]['type'] = 'FOREIGNKEY';
@@ -589,8 +579,7 @@ class ImportXlsx extends ModeleImports
                                 			$error++;
                                 		}
                                 	}
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -599,8 +588,7 @@ class ImportXlsx extends ModeleImports
                                         //print 'code_client='.$newval;
                                     }
                                     if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -609,8 +597,7 @@ class ImportXlsx extends ModeleImports
                                         //print 'code_fournisseur='.$newval;
                                     }
                                     if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -619,8 +606,7 @@ class ImportXlsx extends ModeleImports
                                         //print 'code_compta='.$newval;
                                     }
                                     if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -630,8 +616,7 @@ class ImportXlsx extends ModeleImports
                                         //print 'code_compta_fournisseur='.$newval;
                                     }
                                     if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto')
                                 {
                                     $defaultref = '';
                                     // TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
@@ -644,8 +629,7 @@ class ImportXlsx extends ModeleImports
                                     }
                                     if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
                                     $newval = $defaultref;
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute')
                                 {
                                     $file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
                                     $class = $objimport->array_import_convertvalue[0][$val]['class'];
@@ -665,8 +649,7 @@ class ImportXlsx extends ModeleImports
                                         $errorforthistable++;
                                         $error++;
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
                                 {
                                     $newval = price2num($newval);
                                 }
@@ -707,8 +690,7 @@ class ImportXlsx extends ModeleImports
 												if ($obj) $this->cachefieldtable[$cachekey][] = $obj->aliasfield;
 												$i++;
 											}
-										}
-										else {
+										} else {
 											dol_print_error($this->db);
 										}
 									}
@@ -760,8 +742,7 @@ class ImportXlsx extends ModeleImports
     				    {
     				        $listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
     				        $listvalues[] = $user->id;
-    				    }
-    				    elseif (preg_match('/^lastrowid-/', $val))
+    				    } elseif (preg_match('/^lastrowid-/', $val))
     				    {
     				        $tmp = explode('-', $val);
     				        $lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
@@ -769,14 +750,12 @@ class ImportXlsx extends ModeleImports
     				        $listfields[] = $keyfield;
                             $listvalues[] = $lastinsertid;
     				        //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
-    				    }
-    				    elseif (preg_match('/^const-/', $val))
+    				    } elseif (preg_match('/^const-/', $val))
     				    {
     				    	$tmp = explode('-', $val, 2);
     				    	$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
     				    	$listvalues[] = "'".$tmp[1]."'";
-    				    }
-    				    else {
+    				    } else {
     				    	$this->errors[$error]['lib'] = 'Bad value of profile setup '.$val.' for array_import_fieldshidden';
     				    	$this->errors[$error]['type'] = 'Import profile setup';
     				    	$error++;
@@ -824,8 +803,7 @@ class ImportXlsx extends ModeleImports
 									} else {
 										// No record found with filters, insert will be tried below
 									}
-								}
-								else {
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -852,8 +830,7 @@ class ImportXlsx extends ModeleImports
 										// force $lastinsertid to 0 so we INSERT below.
 										$lastinsertid = 0;
 									}
-								}
-								else {
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -882,8 +859,7 @@ class ImportXlsx extends ModeleImports
 								if ($resql) {
 									// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
 									$updatedone = true;
-								}
-								else {
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -916,8 +892,7 @@ class ImportXlsx extends ModeleImports
 								{
 								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
 								    $insertdone = true;
-								}
-								else {
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
index 2a1b79bf4f3..63f8088d528 100644
--- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
@@ -204,8 +204,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			{
 				$dir = $conf->expedition->dir_output."/receipt";
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output."/receipt/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -356,8 +355,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else {
+				} else {
 					$height_note = 0;
 				}
 
@@ -401,16 +399,14 @@ class pdf_typhon extends ModelePDFDeliveryOrder
                     			if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
                     			$pdf->setPage($pageposafter + 1);
                     		}
-                    	}
-                    	else {
+                    	} else {
                     		// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
 							else $showpricebeforepagebreak = 0;
                     	}
-                    }
-                    else // No pagebreak
+                    } else // No pagebreak
                     {
                     	$pdf->commitTransaction();
                     }
@@ -485,8 +481,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -500,8 +495,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -518,8 +512,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else {
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -619,8 +612,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
@@ -766,15 +758,13 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else {
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else $pdf->MultiCell(100, 4, $this->emetteur->name, 0, 'L');
+		} else $pdf->MultiCell(100, 4, $this->emetteur->name, 0, 'L');
 
 		$pdf->SetFont('', 'B', $default_font_size + 2);
 		$pdf->SetXY($posx, $posy);
@@ -789,8 +779,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		if ($object->date_valid)
 		{
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date_delivery, "%d %b %Y", false, $outputlangs, true), '', 'R');
-		}
-		else {
+		} else {
 			$pdf->SetTextColor(255, 0, 0);
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DeliveryNotValidated"), '', 'R');
 			$pdf->SetTextColor(0, 0, 60);
diff --git a/htdocs/core/modules/livraison/mod_livraison_jade.php b/htdocs/core/modules/livraison/mod_livraison_jade.php
index 599a33578f5..6b8d45fa368 100644
--- a/htdocs/core/modules/livraison/mod_livraison_jade.php
+++ b/htdocs/core/modules/livraison/mod_livraison_jade.php
@@ -142,8 +142,7 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else {
+		} else {
 			return -1;
 		}
 
diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
index 858e44693b4..2d6ad7307b2 100644
--- a/htdocs/core/modules/mailings/advthirdparties.modules.php
+++ b/htdocs/core/modules/mailings/advthirdparties.modules.php
@@ -113,8 +113,7 @@ class mailing_advthirdparties extends MailingTargets
 
     					$i++;
     				}
-    			}
-    			else {
+    			} else {
     				dol_syslog($this->db->error());
     				$this->error = $this->db->error();
     				return -1;
@@ -167,8 +166,7 @@ class mailing_advthirdparties extends MailingTargets
 
     					$i++;
     				}
-    			}
-    			else {
+    			} else {
     				dol_syslog($this->db->error());
     				$this->error = $this->db->error();
     				return -1;
@@ -270,8 +268,7 @@ class mailing_advthirdparties extends MailingTargets
 				$s .= '</option>';
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 1a4570df63f..2ba999fa8b7 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -153,8 +153,7 @@ class mailing_contacts1 extends MailingTargets
 				$s .= '<option value="'.dol_escape_htmltag($obj->poste).'">'.dol_escape_htmltag($obj->poste).' ('.$obj->nb.')</option>';
 				$i++;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		$s .= '</select>';
 
 		$s .= ' ';
@@ -190,12 +189,10 @@ class mailing_contacts1 extends MailingTargets
 					$s .= '<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
 					$i++;
 				}
-			}
-			else {
+			} else {
 				$s .= '<option value="-1" disabled="disabled">'.$langs->trans("NoContactWithCategoryFound").'</option>';
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		$s .= '</select>';
 
 		$s .= '<br>';
@@ -224,8 +221,7 @@ class mailing_contacts1 extends MailingTargets
 				$s .= '<option value="prospectslevel'.$obj->code.'">'.$langs->trans("ThirdPartyProspects").' ('.$langs->trans("ProspectLevelShort").'='.$level.')</option>';
 				$i++;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		$s .= '<option value="customers">'.$langs->trans("ThirdPartyCustomers").'</option>';
 		//$s.='<option value="customersidprof">'.$langs->trans("ThirdPartyCustomersWithIdProf12",$langs->trans("ProfId1"),$langs->trans("ProfId2")).'</option>';
 		$s .= '<option value="suppliers">'.$langs->trans("ThirdPartySuppliers").'</option>';
@@ -264,12 +260,10 @@ class mailing_contacts1 extends MailingTargets
 					$s .= '<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
 					$i++;
 				}
-			}
-			else {
+			} else {
 				$s .= '<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		$s .= '</select>';
 
 		$s .= ' ';
@@ -305,12 +299,10 @@ class mailing_contacts1 extends MailingTargets
 					$s .= '<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
 					$i++;
 				}
-			}
-			else {
+			} else {
 				$s .= '<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		$s .= '</select>';
 
 		return $s;
@@ -366,8 +358,7 @@ class mailing_contacts1 extends MailingTargets
 				$prospectlevel[$obj->code] = $obj->label;
 				$i++;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		// Request must return: id, email, fk_contact, lastname, firstname, other
 		$sql = "SELECT sp.rowid as id, sp.email as email, sp.rowid as fk_contact, sp.lastname, sp.firstname, sp.civility as civility_id, sp.poste as jobposition,";
@@ -444,8 +435,7 @@ class mailing_contacts1 extends MailingTargets
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_syslog($this->db->error());
 			$this->error = $this->db->error();
 			return -1;
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index e94fe57aa3b..f9c876b0230 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -154,8 +154,7 @@ class mailing_fraise extends MailingTargets
                 $s .= '</option>';
                 $i++;
             }
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
 
@@ -192,8 +191,7 @@ class mailing_fraise extends MailingTargets
         		$s .= '</option>';
         		$i++;
         	}
-        }
-        else {
+        } else {
         	dol_print_error($this->db);
         }
 
@@ -311,8 +309,7 @@ class mailing_fraise extends MailingTargets
 
                 $i++;
             }
-        }
-        else {
+        } else {
             dol_syslog($this->db->error());
             $this->error = $this->db->error();
             return -1;
diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index 9c042de1112..32222d619a0 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -98,8 +98,7 @@ class MailingTargets // This can't be abstract as it is used for some method
         {
             $obj = $this->db->fetch_object($result);
             return $obj->nb;
-        }
-        else {
+        } else {
         	$this->error = $this->db->lasterror();
             return -1;
         }
@@ -143,8 +142,7 @@ class MailingTargets // This can't be abstract as it is used for some method
                 $this->error = $this->db->error();
                 return -1;
             }
-        }
-        else {
+        } else {
             return -1;
         }
         return $nb;
@@ -191,8 +189,7 @@ class MailingTargets // This can't be abstract as it is used for some method
         		if ($result)
         		{
         			$j++;
-        		}
-        		else {
+        		} else {
         			if ($this->db->errno() != 'DB_ERROR_RECORD_ALREADY_EXISTS')
         			{
         				// Si erreur autre que doublon
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
index 1f80623bece..38c7fc78065 100644
--- a/htdocs/core/modules/mailings/pomme.modules.php
+++ b/htdocs/core/modules/mailings/pomme.modules.php
@@ -213,8 +213,7 @@ class mailing_pomme extends MailingTargets
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_syslog($this->db->error());
 			$this->error = $this->db->error();
 			return -1;
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 4773203e5ad..b286de97196 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -79,8 +79,7 @@ class mailing_thirdparties extends MailingTargets
 		    $sql .= " WHERE s.email <> ''";
 		    $sql .= " AND s.entity IN (".getEntity('societe').")";
 		    $sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-		}
-		else {
+		} else {
             $addFilter = "";
             if (isset($_POST["filter_client"]) && $_POST["filter_client"] <> '-1')
             {
@@ -89,20 +88,16 @@ class mailing_thirdparties extends MailingTargets
                 if ($_POST["filter_client"] == 0)
                 {
                     $addDescription .= $langs->trans('NorProspectNorCustomer');
-                }
-                elseif ($_POST["filter_client"] == 1)
+                } elseif ($_POST["filter_client"] == 1)
                 {
                     $addDescription .= $langs->trans('Customer');
-                }
-                elseif ($_POST["filter_client"] == 2)
+                } elseif ($_POST["filter_client"] == 2)
                 {
                     $addDescription .= $langs->trans('Prospect');
-                }
-                elseif ($_POST["filter_client"] == 3)
+                } elseif ($_POST["filter_client"] == 3)
                 {
                     $addDescription .= $langs->trans('ProspectCustomer');
-                }
-                else {
+                } else {
                     $addDescription .= "Unknown status ".$_POST["filter_client"];
                 }
             }
@@ -117,8 +112,7 @@ class mailing_thirdparties extends MailingTargets
                 {
                     $addFilter .= " AND s.status=1";
                     $addDescription .= $langs->trans("Enabled");
-                }
-                else {
+                } else {
                     $addFilter .= " AND s.status=0";
                     $addDescription .= $langs->trans("Disabled");
                 }
@@ -183,8 +177,7 @@ class mailing_thirdparties extends MailingTargets
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_syslog($this->db->error());
 			$this->error = $this->db->error();
 			return -1;
@@ -281,8 +274,7 @@ class mailing_thirdparties extends MailingTargets
 				$s .= '</option>';
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index 1c76a924883..852f05f837a 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -73,8 +73,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
                 $i++;
                 $this->arrayofproducts[$i] = $obj->ref;
             }
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -152,8 +151,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
 
                 $i++;
             }
-        }
-        else {
+        } else {
             dol_syslog($this->db->lasterror());
             $this->error = $this->db->lasterror();
             return -1;
diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php
index 040baddd7c2..3ab0735429e 100644
--- a/htdocs/core/modules/mailings/xinputfile.modules.php
+++ b/htdocs/core/modules/mailings/xinputfile.modules.php
@@ -179,8 +179,7 @@ class mailing_xinputfile extends MailingTargets
 									$old = $email;
 									$j++;
 								}
-					        }
-					        else {
+					        } else {
 					        	$i++;
 					        	$langs->load("errors");
                                 $msg = $langs->trans("ErrorFoundBadEmailInFile", $i, $cpt, $email);
@@ -195,25 +194,21 @@ class mailing_xinputfile extends MailingTargets
 				    {
 				    	return -$i;
 				    }
-				}
-				else {
+				} else {
 					$this->error = $langs->trans("ErrorFaildToOpenFile");
 					return -1;
 				}
 
 				dol_syslog(get_class($this)."::add_to_target mailing ".$cpt." targets found");
-			}
-			else {
+			} else {
 				$langs->load("errors");
 				if ($resupload < 0)	// Unknown error
 				{
 					$this->error = '<div class="error">'.$langs->trans("ErrorFileNotUploaded").'</div>';
-				}
-				elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload))	// Files infected by a virus
+				} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload))	// Files infected by a virus
 				{
 					$this->error = '<div class="error">'.$langs->trans("ErrorFileIsInfectedWithAVirus").'</div>';
-				}
-				else // Known error
+				} else // Known error
 				{
 					$this->error = '<div class="error">'.$langs->trans($resupload).'</div>';
 				}
diff --git a/htdocs/core/modules/mailings/xinputuser.modules.php b/htdocs/core/modules/mailings/xinputuser.modules.php
index 56bbaa58137..72614d39e9d 100644
--- a/htdocs/core/modules/mailings/xinputuser.modules.php
+++ b/htdocs/core/modules/mailings/xinputuser.modules.php
@@ -148,14 +148,12 @@ class mailing_xinputuser extends MailingTargets
 				);
 
 				return parent::addTargetsToDatabase($mailing_id, $cibles);
-			}
-			else {
+			} else {
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorBadEMail", $email);
 				return -1;
 			}
-		}
-		else {
+		} else {
             $langs->load("errors");
             $this->error = $langs->trans("ErrorBadEmail", $email);
 			return -1;
diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php
index e586de52b38..dd4b15d6135 100644
--- a/htdocs/core/modules/member/doc/pdf_standard.class.php
+++ b/htdocs/core/modules/member/doc/pdf_standard.class.php
@@ -88,8 +88,7 @@ class pdf_standard extends CommonStickerGenerator
 			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 			{
 				$logo = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
-			}
-			elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+			} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 			{
 				$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 			}
@@ -155,8 +154,7 @@ class pdf_standard extends CommonStickerGenerator
 		if ($tmp['height'])
 		{
 			$imgratio = $tmp['width'] / $tmp['height'];
-			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); }
-			else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
+			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); } else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
 		}
 		//var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
 
@@ -170,8 +168,7 @@ class pdf_standard extends CommonStickerGenerator
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
-		}
-		elseif ($textleft != '' && $textright != '')	//
+		} elseif ($textleft != '' && $textright != '')	//
 		{
 			if ($textleft == '__LOGO__' || $textleft == '__PHOTO__')
 			{
@@ -179,23 +176,20 @@ class pdf_standard extends CommonStickerGenerator
 				elseif ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 				$pdf->SetXY($_PosX + $xleft + $widthtouse + 1, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $xleft - $xleft - $widthtouse - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
-			}
-			elseif ($textright == '__LOGO__' || $textright == '__PHOTO__')
+			} elseif ($textright == '__LOGO__' || $textright == '__PHOTO__')
 			{
 				if ($textright == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 				elseif ($textright == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $widthtouse - $xleft - $xleft - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
-			}
-			else // text on halft left and text on half right
+			} else // text on halft left and text on half right
 			{
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 				$pdf->SetXY($_PosX + round($this->_Width / 2), $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2) - 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
-		}
-		else // Only a right part
+		} else // Only a right part
 		{
 			// Output right area
 			if ($textright == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
@@ -303,8 +297,7 @@ class pdf_standard extends CommonStickerGenerator
 	        }
 
     		$arrayofrecords = $arrayofmembers;
-		}
-		else {
+		} else {
 		    $arrayofrecords = $object;
 		}
 
@@ -333,8 +326,7 @@ class pdf_standard extends CommonStickerGenerator
 		{
 			$title = $outputlangs->transnoentities('MembersCards');
 			$keywords = $outputlangs->transnoentities('MembersCards')." ".$outputlangs->transnoentities("Foundation")." ".$outputlangs->convToOutputCharset($mysoc->name);
-		}
-		else {
+		} else {
 			dol_print_error('', 'Bad value for $mode');
 			return -1;
 		}
@@ -345,8 +337,7 @@ class pdf_standard extends CommonStickerGenerator
 		    $outputdir = $conf->adherent->dir_output;
 		    $dir = $outputdir."/".get_exdir(0, 0, 0, 0, $object, 'member');
 		    $file = $dir.'/'.$filename;
-		}
-		else {
+		} else {
 		    $outputdir = $conf->adherent->dir_temp;
 		    $dir = $outputdir;
 		    $file = $dir.'/'.$filename;
diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php
index 5f2f7f8b8ae..65e9caef561 100644
--- a/htdocs/core/modules/member/modules_cards.php
+++ b/htdocs/core/modules/member/modules_cards.php
@@ -99,12 +99,10 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o
 		if (!empty($conf->global->ADHERENT_CARDS_ADDON_PDF))
 		{
 			$code = $conf->global->ADHERENT_CARDS_ADDON_PDF;
-		}
-		else {
+		} else {
 			$code = $modele;
 		}
-	}
-	else $code = $modele;
+	} else $code = $modele;
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
 	$tmp = explode(':', $template, 2);
@@ -112,8 +110,7 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o
 	{
 		$template = $tmp[0];
 		$srctemplatepath = $tmp[1];
-	}
-	else $srctemplatepath = $code;
+	} else $srctemplatepath = $code;
 
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
@@ -152,15 +149,12 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o
 		{
 			$outputlangs->charset_output = $sav_charset_output;
 			return 1;
-		}
-		else {
+		} else {
 			$outputlangs->charset_output = $sav_charset_output;
 			dol_print_error($db, "members_card_pdf_create Error: ".$obj->error);
 			return -1;
 		}
-	}
-
-	else {
+	} else {
 		dol_print_error('', $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file));
 		return -1;
 	}
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 04283daf8b4..49ea6402e20 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -97,8 +97,7 @@ class modAgenda extends DolibarrModules
 		        //if (preg_match('/^_MODIFY/',$obj->code)) continue;    // We don't track such events by default.
 		        $this->const[] = array('MAIN_AGENDA_ACTIONAUTO_'.$obj->code, "chaine", "1", '', 0, 'current');
 		    }
-		}
-		else {
+		} else {
 		    dol_print_error($this->db->lasterror());
 		}
 
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index 4527b620074..447e3e625ac 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -233,8 +233,7 @@ class modBlockedLog extends DolibarrModules
         if ($b->alreadyUsed(1))
         {
             $res = $b->create($user, '0000000000'); // If already used for something else than SET or UNSET, we log with error
-        }
-        else {
+        } else {
             $res = $b->create($user);
         }
         if ($res <= 0) {
diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index ec0b497e7cd..03bd868bf02 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -273,8 +273,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else {
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -306,8 +305,7 @@ class doc_generic_mo_odt extends ModelePDFMo
                			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
             			$contactobject = $object->contact;
                     }
-				}
-				else {
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -340,8 +338,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -357,8 +354,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
                     dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -389,13 +385,11 @@ class doc_generic_mo_odt extends ModelePDFMo
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -405,8 +399,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -427,12 +420,10 @@ class doc_generic_mo_odt extends ModelePDFMo
 							{
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -441,8 +432,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -455,8 +445,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -476,8 +465,7 @@ class doc_generic_mo_odt extends ModelePDFMo
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -498,8 +486,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/mrp/mod_mo_standard.php b/htdocs/core/modules/mrp/mod_mo_standard.php
index 8b0edd9c129..80e26cef6d6 100644
--- a/htdocs/core/modules/mrp/mod_mo_standard.php
+++ b/htdocs/core/modules/mrp/mod_mo_standard.php
@@ -129,8 +129,7 @@ class mod_mo_standard extends ModeleNumRefMos
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else {
+		} else {
 			dol_syslog("mod_mo_standard::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/oauth/github_oauthcallback.php b/htdocs/core/modules/oauth/github_oauthcallback.php
index 766d615f884..7df6b007f26 100644
--- a/htdocs/core/modules/oauth/github_oauthcallback.php
+++ b/htdocs/core/modules/oauth/github_oauthcallback.php
@@ -142,8 +142,7 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
     } catch (Exception $e) {
         print $e->getMessage();
     }
-}
-else // If entry on page with no parameter, we arrive here
+} else // If entry on page with no parameter, we arrive here
 {
     $_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
@@ -152,8 +151,7 @@ else // If entry on page with no parameter, we arrive here
     if (GETPOST('state'))
     {
         $url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-    }
-    else {
+    } else {
         $url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
     }
 
diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index 0af4113fb0a..c15d1da5751 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -140,8 +140,7 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
     } catch (Exception $e) {
         print $e->getMessage();
     }
-}
-else // If entry on page with no parameter, we arrive here
+} else // If entry on page with no parameter, we arrive here
 {
     $_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
@@ -150,8 +149,7 @@ else // If entry on page with no parameter, we arrive here
     if (GETPOST('state'))
     {
     	$url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-    }
-    else {
+    } else {
         $url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
     }
 
diff --git a/htdocs/core/modules/oauth/stripelive_oauthcallback.php b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
index 8be1be11cc8..c1d38080657 100644
--- a/htdocs/core/modules/oauth/stripelive_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
@@ -146,8 +146,7 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
     } catch (Exception $e) {
         print $e->getMessage();
     }
-}
-else // If entry on page with no parameter, we arrive here
+} else // If entry on page with no parameter, we arrive here
 {
     $_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
@@ -156,8 +155,7 @@ else // If entry on page with no parameter, we arrive here
     if (GETPOST('state'))
     {
         $url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-    }
-    else {
+    } else {
         //$url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
     	//https://connect.stripe.com/oauth/authorize?response_type=code&client_id=ca_AX27ut70tJ1j6eyFCV3ObEXhNOo2jY6V&scope=read_write
     	$url = 'https://connect.stripe.com/oauth/authorize?response_type=code&client_id='.$conf->global->OAUTH_STRIPE_LIVE_ID.'&scope=read_write';
diff --git a/htdocs/core/modules/oauth/stripetest_oauthcallback.php b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
index 4374f65746e..df468492921 100644
--- a/htdocs/core/modules/oauth/stripetest_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
@@ -146,8 +146,7 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
 	} catch (Exception $e) {
 		print $e->getMessage();
 	}
-}
-else // If entry on page with no parameter, we arrive here
+} else // If entry on page with no parameter, we arrive here
 {
 	$_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
@@ -156,8 +155,7 @@ else // If entry on page with no parameter, we arrive here
 	if (GETPOST('state'))
 	{
 		$url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-	}
-	else {
+	} else {
 		//$url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
 		//https://connect.stripe.com/oauth/authorize?response_type=code&client_id=ca_AX27ut70tJ1j6eyFCV3ObEXhNOo2jY6V&scope=read_write
 		$url = 'https://connect.stripe.com/oauth/authorize?response_type=code&client_id='.$conf->global->OAUTH_STRIPE_TEST_ID.'&scope=read_write';
diff --git a/htdocs/core/modules/payment/mod_payment_cicada.php b/htdocs/core/modules/payment/mod_payment_cicada.php
index b9909d64fea..7debf44e18e 100644
--- a/htdocs/core/modules/payment/mod_payment_cicada.php
+++ b/htdocs/core/modules/payment/mod_payment_cicada.php
@@ -136,8 +136,7 @@ class mod_payment_cicada extends ModeleNumRefPayments
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else {
+		} else {
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 90f3825d007..f68de863ab8 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -152,12 +152,10 @@ class printing_printgcp extends PrintingDriver
                     if ($endoflife == $token::EOL_NEVER_EXPIRES)
                     {
                         $expiredat = $langs->trans("Never");
-                    }
-                    elseif ($endoflife == $token::EOL_UNKNOWN)
+                    } elseif ($endoflife == $token::EOL_UNKNOWN)
                     {
                         $expiredat = $langs->trans("Unknown");
-                    }
-                    else {
+                    } else {
                         $expiredat = dol_print_date($endoflife, "dayhour");
                     }
 
@@ -218,8 +216,7 @@ class printing_printgcp extends PrintingDriver
             if ($conf->global->PRINTING_GCP_DEFAULT == $printer_det['id'])
             {
                 $html .= img_picto($langs->trans("Default"), 'on');
-            }
-            else $html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+            } else $html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
             $html .= '</td>';
             $html .= '</tr>'."\n";
         }
@@ -323,13 +320,11 @@ class printing_printgcp extends PrintingDriver
             if ($obj)
             {
                 $printer_id = $obj->printer_id;
-            }
-            else {
+            } else {
                 if (!empty($conf->global->PRINTING_GCP_DEFAULT))
                 {
                     $printer_id = $conf->global->PRINTING_GCP_DEFAULT;
-                }
-                else {
+                } else {
                     $this->errors[] = 'NoDefaultPrinterDefined';
                     $error++;
                     return $error;
@@ -502,8 +497,7 @@ class printing_printgcp extends PrintingDriver
                 $html .= '<td>&nbsp;</td>';
                 $html .= '</tr>';
             }
-        }
-        else {
+        } else {
                 $html .= '<tr class="oddeven">';
                 $html .= '<td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td>';
                 $html .= '</tr>';
diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php
index a305b648cfe..b4b24b062df 100644
--- a/htdocs/core/modules/printing/printipp.modules.php
+++ b/htdocs/core/modules/printing/printipp.modules.php
@@ -115,14 +115,12 @@ class printing_printipp extends PrintingDriver
             {
             	dol_syslog("Found a default printer for user ".$user->id." = ".$obj->printer_id);
                 $ipp->setPrinterURI($obj->printer_id);
-            }
-            else {
+            } else {
                 if (!empty($conf->global->PRINTIPP_URI_DEFAULT))
                 {
                     dol_syslog("Will use default printer conf->global->PRINTIPP_URI_DEFAULT = ".$conf->global->PRINTIPP_URI_DEFAULT);
                     $ipp->setPrinterURI($conf->global->PRINTIPP_URI_DEFAULT);
-                }
-                else {
+                } else {
                     $this->errors[] = 'NoDefaultPrinterDefined';
                     $error++;
                     return $error;
diff --git a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
index 9155baa8aac..79e47a8328a 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
@@ -86,8 +86,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 			{
 				$logo = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
-			}
-			elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+			} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 			{
 				$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 			}
@@ -142,8 +141,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 		if ($tmp['height'])
 		{
 			$imgratio = $tmp['width'] / $tmp['height'];
-			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); }
-			else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
+			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); } else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
 		}
 		//var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
 
@@ -157,8 +155,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
-		}
-		elseif ($textleft != '' && $textright != '')	//
+		} elseif ($textleft != '' && $textright != '')	//
 		{
 			if ($textleft == '%LOGO%' || $textleft == '%PHOTO%')
 			{
@@ -166,23 +163,20 @@ class pdf_standardlabel extends CommonStickerGenerator
 				elseif ($textleft == '%PHOTO%' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 				$pdf->SetXY($_PosX + $xleft + $widthtouse + 1, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $xleft - $xleft - $widthtouse - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
-			}
-			elseif ($textright == '%LOGO%' || $textright == '%PHOTO%')
+			} elseif ($textright == '%LOGO%' || $textright == '%PHOTO%')
 			{
 				if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 				elseif ($textright == '%PHOTO%' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $widthtouse - $xleft - $xleft - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
-			}
-			else // text on halft left and text on half right
+			} else // text on halft left and text on half right
 			{
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 				$pdf->SetXY($_PosX + round($this->_Width / 2), $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2) - 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
-		}
-		else // Only a right part
+		} else // Only a right part
 		{
 			// Output right area
 			if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
diff --git a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
index 3a877049a26..1acdfbae773 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
@@ -126,8 +126,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 			{
 				$logo = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
-			}
-			elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+			} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 			{
 				$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 			}
@@ -166,13 +165,11 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 			elseif ($code && !empty($encoding))
 			{
 				$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			}
-			else {
+			} else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
-		}
-		elseif ($textleft != '' && $textright != '')	// left and right part
+		} elseif ($textleft != '' && $textright != '')	// left and right part
 		{
 			$logoHeight = $heighttouse / 2;
 			$logoWidth = $widthtouse / 2;
@@ -185,8 +182,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 				}
 				$pdf->SetXY($_PosX + ($widthtouse / 2), $_PosY + $ytop);
 				$pdf->MultiCell($widthtouse / 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
-			}
-			elseif (($textright == '%LOGO%' || $textright == '%PHOTO%' || $textright == '%BARCODE%') && !strstr($textleft, '%')) // right part logo/barcode left part text
+			} elseif (($textright == '%LOGO%' || $textright == '%PHOTO%' || $textright == '%BARCODE%') && !strstr($textleft, '%')) // right part logo/barcode left part text
 			{
 				if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + ($widthtouse / 2), $_PosY + $ytop, $logoWidth, 0);
 				elseif ($code && !empty($encoding))
@@ -195,8 +191,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 				}
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($widthtouse / 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
-			}
-			elseif ($textleft == '%LOGO%')	 // left part logo right part text/barcode
+			} elseif ($textleft == '%LOGO%')	 // left part logo right part text/barcode
 			{
 				if ($logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, 0, $logoHeight);
 				if ($code && !empty($encoding))
@@ -206,8 +201,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 					$pdf->SetXY($_PosX + $xleft + $logoWidth + 1, $_PosY + $ytop);
 					$pdf->MultiCell($widthtouse - $logoWidth - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 				}
-			}
-			elseif ($textright == '%LOGO%')  // right part logo left part text/barcode
+			} elseif ($textright == '%LOGO%')  // right part logo left part text/barcode
 			{
 				if ($logo) $pdf->Image($logo, $_PosX + $xleft + $widthtouse - $logoWidth + 1, $_PosY + $ytop, 0, $logoHeight);
 				if ($code && !empty($encoding))
@@ -217,24 +211,21 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 					$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 					$pdf->MultiCell($widthtouse - $logoWidth - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 				}
-			}
-			else // text on halft left and text on half right
+			} else // text on halft left and text on half right
 			{
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 				$pdf->SetXY($_PosX + round($this->_Width / 2), $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2) - 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
-		}
-		else // Only a right part
+		} else // Only a right part
 		{
 			// Output right area
 			if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, 0, $logoHeight);
 			elseif ($code && !empty($encoding))
 			{
 				$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			}
-			else {
+			} else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
diff --git a/htdocs/core/modules/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php
index ddf6d73a2a3..215c3a854ad 100644
--- a/htdocs/core/modules/printsheet/modules_labels.php
+++ b/htdocs/core/modules/printsheet/modules_labels.php
@@ -100,12 +100,10 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 		if (!empty($conf->global->ADHERENT_ETIQUETTE_TYPE))
 		{
 			$code = $conf->global->ADHERENT_ETIQUETTE_TYPE;
-		}
-		else {
+		} else {
 			$code = $modele;
 		}
-	}
-	else $code = $modele;
+	} else $code = $modele;
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
 	$tmp = explode(':', $template, 2);
@@ -113,8 +111,7 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 	{
 		$template = $tmp[0];
 		$srctemplatepath = $tmp[1];
-	}
-	else $srctemplatepath = $code;
+	} else $srctemplatepath = $code;
 
 	dol_syslog("modele=".$modele." outputdir=".$outputdir." template=".$template." code=".$code." srctemplatepath=".$srctemplatepath." filename=".$filename, LOG_DEBUG);
 
@@ -154,14 +151,12 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 		{
 			$outputlangs->charset_output = $sav_charset_output;
 			return 1;
-		}
-		else {
+		} else {
 			$outputlangs->charset_output = $sav_charset_output;
 			dol_print_error($db, "doc_label_pdf_create Error: ".$obj->error);
 			return -1;
 		}
-	}
-	else {
+	} else {
 		dol_print_error('', $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file));
 		return -1;
 	}
diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
index 3965bd1be5d..38e4a18bda6 100644
--- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -292,8 +292,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else {
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -326,8 +325,7 @@ class doc_generic_product_odt extends ModelePDFProduct
                         // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
                         $contactobject = $object->contact;
                     }
-				}
-				else {
+				} else {
 					$socobject = $object->thirdparty;
 				}
 				// Make substitution
@@ -363,8 +361,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 							'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -381,8 +378,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -413,13 +409,11 @@ class doc_generic_product_odt extends ModelePDFProduct
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -439,12 +433,10 @@ class doc_generic_product_odt extends ModelePDFProduct
 							{
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -453,8 +445,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 						}
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -467,8 +458,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -487,8 +477,7 @@ class doc_generic_product_odt extends ModelePDFProduct
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -508,8 +497,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index 20c3ba9c087..11fd721dfad 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -181,8 +181,7 @@ class pdf_standard extends ModelePDFProduct
 			{
 				$dir = $conf->product->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->product->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -333,8 +332,7 @@ class pdf_standard extends ModelePDFProduct
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else {
+				} else {
 					$height_note = 0;
 				}
 
@@ -571,13 +569,11 @@ class pdf_standard extends ModelePDFProduct
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PRODUCT_OUTPUTDIR");
 			return 0;
 		}
@@ -736,15 +732,13 @@ class pdf_standard extends ModelePDFProduct
 	        {
 	            $height = pdf_getHeightForLogo($logo);
 	            $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-	        }
-	        else {
+	        } else {
 	            $pdf->SetTextColor(200, 0, 0);
 	            $pdf->SetFont('', 'B', $default_font_size - 2);
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 	        }
-	    }
-	    else {
+	    } else {
 	        $text = $this->emetteur->name;
 	        $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 	    }
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index dc6d7bfd6ef..0b5fcd5212c 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -207,13 +207,11 @@ class mod_codeproduct_elephant extends ModeleProductCode
 		{
 			$field = 'ref';
 			//$where = ' AND client in (1,2)';
-		}
-		elseif ($type == 1)
+		} elseif ($type == 1)
 		{
 			$field = 'ref';
 			//$where = ' AND fournisseur = 1';
-		}
-		else return -1;
+		} else return -1;
 
 		$now = dol_now();
 
@@ -275,12 +273,10 @@ class mod_codeproduct_elephant extends ModeleProductCode
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
 			$result = -2;
-		}
-		else {
+		} else {
 			// Get Mask value
 			$mask = '';
 			if ($type == 0) $mask = empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT) ? '' : $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
@@ -326,12 +322,10 @@ class mod_codeproduct_elephant extends ModeleProductCode
 			if ($db->num_rows($resql) == 0)
 			{
 				return 0;
-			}
-			else {
+			} else {
 				return -1;
 			}
-		}
-		else {
+		} else {
 			return -2;
 		}
 	}
diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php
index 706ea0c683a..cfdcbcdb404 100644
--- a/htdocs/core/modules/product/mod_codeproduct_leopard.php
+++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php
@@ -134,8 +134,7 @@ class mod_codeproduct_leopard extends ModeleProductCode
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
 			$result = -2;
 		}
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index 1ecd734dec2..308f98d7828 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -169,8 +169,7 @@ abstract class ModeleProductCode
 				$liste[$row[0]] = $row[1];
 				$i++;
 			}
-		}
-		else {
+		} else {
 			return -1;
 		}
 		return $liste;
@@ -207,16 +206,14 @@ abstract class ModeleProductCode
 			$s .= yn(!$this->code_null, 1, 2);
 			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
 			$s .= '<br>';
-		}
-		elseif ($type == 1)
+		} elseif ($type == 1)
 		{
 			$s .= $langs->trans("RequiredIfService").': ';
 			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
 			$s .= yn(!$this->code_null, 1, 2);
 			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
 			$s .= '<br>';
-		}
-		elseif ($type == -1)
+		} elseif ($type == -1)
 		{
 			$s .= $langs->trans("Required").': ';
 			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 585edee00ee..d4994823ffc 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -542,8 +542,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else {
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -633,13 +632,11 @@ class doc_generic_project_odt extends ModelePDFProjects
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -666,12 +663,10 @@ class doc_generic_project_odt extends ModelePDFProjects
 						{
 							try {
 								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch (OdfException $e)
+							} catch (OdfException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch (SegmentException $e)
+							} catch (SegmentException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
@@ -716,12 +711,10 @@ class doc_generic_project_odt extends ModelePDFProjects
 								{
 									try {
 										$listlinestaskres->setVars($key, $val, true, 'UTF-8');
-									}
-									catch (OdfException $e)
+									} catch (OdfException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
-									}
-									catch (SegmentException $e)
+									} catch (SegmentException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
@@ -765,12 +758,10 @@ class doc_generic_project_odt extends ModelePDFProjects
 								{
 									try {
 										$listlinestasktime->setVars($key, $val, true, 'UTF-8');
-									}
-									catch (OdfException $e)
+									} catch (OdfException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
-									}
-									catch (SegmentException $e)
+									} catch (SegmentException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
@@ -804,12 +795,10 @@ class doc_generic_project_odt extends ModelePDFProjects
 								{
 									try {
 										$listlinestasktime->setVars($key, $val, true, 'UTF-8');
-									}
-									catch (OdfException $e)
+									} catch (OdfException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
-									}
-									catch (SegmentException $e)
+									} catch (SegmentException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
@@ -836,12 +825,10 @@ class doc_generic_project_odt extends ModelePDFProjects
 							{
 								try {
 									$listtasksfiles->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -851,8 +838,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$ExceptionTrace = $e->getTrace();
 					// no segment defined on ODT is not an error
@@ -880,12 +866,10 @@ class doc_generic_project_odt extends ModelePDFProjects
 						{
 							try {
 								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch (OdfException $e)
+							} catch (OdfException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch (SegmentException $e)
+							} catch (SegmentException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
@@ -893,8 +877,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -937,12 +920,10 @@ class doc_generic_project_odt extends ModelePDFProjects
 							{
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -950,8 +931,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 							$listlines->merge();
 						}
 						$odfHandler->mergeSegment($listlines);
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
@@ -1136,12 +1116,10 @@ class doc_generic_project_odt extends ModelePDFProjects
 									{
 										try {
 											$listlines->setVars($key, $val, true, 'UTF-8');
-										}
-										catch (OdfException $e)
+										} catch (OdfException $e)
 										{
 											dol_syslog($e->getMessage(), LOG_INFO);
-										}
-										catch (SegmentException $e)
+										} catch (SegmentException $e)
 										{
 											dol_syslog($e->getMessage(), LOG_INFO);
 										}
@@ -1202,8 +1180,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index 53b81ef5419..8cd73383a1a 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -300,8 +300,7 @@ class pdf_baleine extends ModelePDFProjects
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else {
+				} else {
 					$height_note = 0;
 				}
 
@@ -357,8 +356,7 @@ class pdf_baleine extends ModelePDFProjects
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else {
+						} else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
@@ -393,8 +391,7 @@ class pdf_baleine extends ModelePDFProjects
 							}
 						}
 						//var_dump($i.' '.$posybefore.' '.$posyafter.' '.($this->page_hauteur -  ($heightforfooter + $heightforfreetext + $heightforinfotot)).' '.$showpricebeforepagebreak);
-					}
-					else // No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -448,8 +445,7 @@ class pdf_baleine extends ModelePDFProjects
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -463,8 +459,7 @@ class pdf_baleine extends ModelePDFProjects
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -507,13 +502,11 @@ class pdf_baleine extends ModelePDFProjects
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "PROJECT_OUTPUTDIR");
 			return 0;
 		}
@@ -604,15 +597,13 @@ class pdf_baleine extends ModelePDFProjects
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else {
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		} else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 0888a029d5b..334fc16ca18 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -273,8 +273,7 @@ class pdf_beluga extends ModelePDFProjects
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else {
+				} else {
 					$height_note = 0;
 				}
 
@@ -507,8 +506,7 @@ class pdf_beluga extends ModelePDFProjects
 								            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								            $pdf->setPage($pageposafter + 1);
 							            }
-						            }
-						            else {
+						            } else {
 							            // We found a page break
 
 										// Allows data in the first page if description is long enough to break in multiples pages
@@ -543,8 +541,7 @@ class pdf_beluga extends ModelePDFProjects
 							            }
 						            }
 						            //var_dump($i.' '.$posybefore.' '.$posyafter.' '.($this->page_hauteur -  ($heightforfooter + $heightforfreetext + $heightforinfotot)).' '.$showpricebeforepagebreak);
-					            }
-					            else // No pagebreak
+					            } else // No pagebreak
 					            {
 						            $pdf->commitTransaction();
 					            }
@@ -586,8 +583,7 @@ class pdf_beluga extends ModelePDFProjects
 						            $fuser = new User($this->db);
 						            $fuser->fetch($element->fk_user_author);
 						            $pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, $fuser->getFullName($outputlangs), 1, 'L');
-					            }
-					            else {
+					            } else {
 						            $pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, (is_object($element->thirdparty) ? $element->thirdparty->name : ''), 1, 'L');
 					            }
 
@@ -603,8 +599,7 @@ class pdf_beluga extends ModelePDFProjects
                                 	{
                                 		$textforamount = dol_trunc($element->label, 26);
                                 		$pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, $textforamount, 1, 'L');
-                                	}
-                                	else {
+                                	} else {
 	                                    $pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, "", 1, 'R');
                                 	}
                                 }
@@ -682,13 +677,11 @@ class pdf_beluga extends ModelePDFProjects
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "PROJECT_OUTPUTDIR");
 			return 0;
 		}
@@ -779,15 +772,13 @@ class pdf_beluga extends ModelePDFProjects
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else {
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		} else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
index 0b0190cffd2..a6bf7fdace7 100644
--- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
@@ -231,8 +231,7 @@ class pdf_timespent extends ModelePDFProjects
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else {
+				} else {
 					$height_note = 0;
 				}
 
@@ -288,8 +287,7 @@ class pdf_timespent extends ModelePDFProjects
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else {
+						} else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
@@ -324,8 +322,7 @@ class pdf_timespent extends ModelePDFProjects
 							}
 						}
 						//var_dump($i.' '.$posybefore.' '.$posyafter.' '.($this->page_hauteur -  ($heightforfooter + $heightforfreetext + $heightforinfotot)).' '.$showpricebeforepagebreak);
-					}
-					else // No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -379,8 +376,7 @@ class pdf_timespent extends ModelePDFProjects
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -394,8 +390,7 @@ class pdf_timespent extends ModelePDFProjects
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -438,13 +433,11 @@ class pdf_timespent extends ModelePDFProjects
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "PROJECT_OUTPUTDIR");
 			return 0;
 		}
@@ -535,15 +528,13 @@ class pdf_timespent extends ModelePDFProjects
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else {
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		} else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php
index 9929dd357cb..6c89120571b 100644
--- a/htdocs/core/modules/project/mod_project_simple.php
+++ b/htdocs/core/modules/project/mod_project_simple.php
@@ -106,8 +106,7 @@ class mod_project_simple extends ModeleNumRefProjects
 		if (!$coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
 		{
 			return true;
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -139,8 +138,7 @@ class mod_project_simple extends ModeleNumRefProjects
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else {
+		} else {
 			dol_syslog("mod_project_simple::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index eee9945bb8a..26ab158ded9 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -531,8 +531,7 @@ class doc_generic_task_odt extends ModelePDFTask
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					return -1;
@@ -563,8 +562,7 @@ class doc_generic_task_odt extends ModelePDFTask
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -630,8 +628,7 @@ class doc_generic_task_odt extends ModelePDFTask
 									$listlinestaskres->setVars($key, $val, true, 'UTF-8');
 								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e) {
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
@@ -674,12 +671,10 @@ class doc_generic_task_odt extends ModelePDFTask
 							{
 								try {
 									$listlinestasktime->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -708,12 +703,10 @@ class doc_generic_task_odt extends ModelePDFTask
 						{
 							try {
 								$listtasksfiles->setVars($key, $val, true, 'UTF-8');
-							}
-							catch (OdfException $e)
+							} catch (OdfException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch (SegmentException $e)
+							} catch (SegmentException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
@@ -723,8 +716,7 @@ class doc_generic_task_odt extends ModelePDFTask
 					//$listlines->merge();
 
 					$odfHandler->mergeSegment($listtasksfiles);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -750,12 +742,10 @@ class doc_generic_task_odt extends ModelePDFTask
 						{
 							try {
 								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch (OdfException $e)
+							} catch (OdfException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch (SegmentException $e)
+							} catch (SegmentException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
@@ -763,8 +753,7 @@ class doc_generic_task_odt extends ModelePDFTask
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -808,12 +797,10 @@ class doc_generic_task_odt extends ModelePDFTask
 							{
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -821,8 +808,7 @@ class doc_generic_task_odt extends ModelePDFTask
 							$listlines->merge();
 						}
 						$odfHandler->mergeSegment($listlines);
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
@@ -845,8 +831,7 @@ class doc_generic_task_odt extends ModelePDFTask
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -866,8 +851,7 @@ class doc_generic_task_odt extends ModelePDFTask
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/project/task/mod_task_simple.php b/htdocs/core/modules/project/task/mod_task_simple.php
index 8a409765526..b4f02603660 100644
--- a/htdocs/core/modules/project/task/mod_task_simple.php
+++ b/htdocs/core/modules/project/task/mod_task_simple.php
@@ -107,8 +107,7 @@ class mod_task_simple extends ModeleNumRefTask
 		if (!$coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
 		{
 			return true;
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -139,8 +138,7 @@ class mod_task_simple extends ModeleNumRefTask
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else {
+		} else {
 			dol_syslog("mod_task_simple::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index e0bcefbd880..b646156079b 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -307,8 +307,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else {
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -340,8 +339,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
                         // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
                         $contactobject = $object->contact;
                     }
-				}
-				else {
+				} else {
 					$socobject = $object->thirdparty;
 				}
 				// Make substitution
@@ -377,8 +375,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -395,8 +392,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -427,13 +423,11 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -443,8 +437,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -465,12 +458,10 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 							{
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -479,8 +470,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -493,8 +483,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -513,8 +502,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					    $odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -534,8 +522,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 409df828876..87163789bcc 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -172,8 +172,7 @@ class pdf_azur extends ModelePDFPropales
 			$this->posxup = 118;
 			$this->posxqty = 135;
 			$this->posxunit = 151;
-		}
-		else {
+		} else {
 			$this->posxtva = 110;
 			$this->posxup = 126;
 			$this->posxqty = 145;
@@ -243,8 +242,7 @@ class pdf_azur extends ModelePDFPropales
 				{
 					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
-				}
-				else {
+				} else {
 					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
 					$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 				}
@@ -267,12 +265,10 @@ class pdf_azur extends ModelePDFPropales
 								if ($obj['photo_vignette'])
 								{
 									$filename = $obj['photo_vignette'];
-								}
-								else {
+								} else {
 									$filename = $obj['photo'];
 								}
-							}
-							else {
+							} else {
 								$filename = $obj['photo'];
 							}
 
@@ -299,8 +295,7 @@ class pdf_azur extends ModelePDFPropales
 			{
 				$dir = $conf->propal->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->propal->multidir_output[$object->entity]."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -541,8 +536,7 @@ class pdf_azur extends ModelePDFPropales
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else {
+						} else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
@@ -550,8 +544,7 @@ class pdf_azur extends ModelePDFPropales
 								$showpricebeforepagebreak = 1;
 							else $showpricebeforepagebreak = 0;
 						}
-					}
-					else // No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -668,8 +661,7 @@ class pdf_azur extends ModelePDFPropales
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -683,8 +675,7 @@ class pdf_azur extends ModelePDFPropales
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -701,8 +692,7 @@ class pdf_azur extends ModelePDFPropales
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
-				}
-				else {
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
 				}
@@ -770,8 +760,7 @@ class pdf_azur extends ModelePDFPropales
 											} elseif (!empty($conf->service->enabled)) {
 												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file].'/'.get_exdir($product->id, 2, 0, 0, $product, 'product').$product->id."/photos";
 											}
-										}
-										else {
+										} else {
 											if (!empty($conf->product->enabled)) {
 												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file].'/'.get_exdir(0, 0, 0, 0, $product, 'product').dol_sanitizeFileName($product->ref);
 											} elseif (!empty($conf->service->enabled)) {
@@ -823,13 +812,11 @@ class pdf_azur extends ModelePDFPropales
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PROP_OUTPUTDIR");
 			return 0;
 		}
@@ -896,8 +883,7 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
             $posy = $pdf->GetY() + 1;
-		}
-        elseif ($object->availability_code || $object->availability)    // Show availability conditions
+		} elseif ($object->availability_code || $object->availability)    // Show availability conditions
 		{
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -1086,8 +1072,7 @@ class pdf_azur extends ModelePDFPropales
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else {
+			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1470,23 +1455,20 @@ class pdf_azur extends ModelePDFPropales
 				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
 				{
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
-				}
-				else {
+				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
 				if (is_readable($logo))
 				{
 				    $height = pdf_getHeightForLogo($logo);
 				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-				}
-				else {
+				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
-			}
-			else {
+			} else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 1490dfe4adc..b1ef6e022ef 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -231,8 +231,7 @@ class pdf_cyan extends ModelePDFPropales
 				{
 					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
-				}
-				else {
+				} else {
 					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
 					$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 				}
@@ -255,12 +254,10 @@ class pdf_cyan extends ModelePDFPropales
 								if ($obj['photo_vignette'])
 								{
 									$filename = $obj['photo_vignette'];
-								}
-								else {
+								} else {
 									$filename = $obj['photo'];
 								}
-							}
-							else {
+							} else {
 								$filename = $obj['photo'];
 							}
 
@@ -288,8 +285,7 @@ class pdf_cyan extends ModelePDFPropales
 			{
 				$dir = $conf->propal->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->propal->multidir_output[$object->entity]."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -503,8 +499,7 @@ class pdf_cyan extends ModelePDFPropales
 					        if ($i > $pageposbeforenote) {
 					            $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
 					            $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-					        }
-					        else {
+					        } else {
 					            $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
 					            $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 					        }
@@ -522,8 +517,7 @@ class pdf_cyan extends ModelePDFPropales
 					    if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					    $height_note = $posyafter - $tab_top_newpage;
 					    $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-					}
-					else // No pagebreak
+					} else // No pagebreak
 					{
 					    $pdf->commitTransaction();
 					    $posyafter = $pdf->GetY();
@@ -546,8 +540,7 @@ class pdf_cyan extends ModelePDFPropales
 					}
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $posyafter + 6;
-				}
-				else {
+				} else {
 					$height_note = 0;
 				}
 
@@ -637,16 +630,14 @@ class pdf_cyan extends ModelePDFPropales
     								//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
     								$pdf->setPage($pageposafter + 1);
     							}
-    						}
-    						else {
+    						} else {
     							// We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
 								else $showpricebeforepagebreak = 0;
     						}
-    					}
-    					else // No pagebreak
+    					} else // No pagebreak
     					{
     						$pdf->commitTransaction();
     					}
@@ -799,8 +790,7 @@ class pdf_cyan extends ModelePDFPropales
 						if ($pagenb == $pageposbeforeprintlines)
 						{
 						    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -814,8 +804,7 @@ class pdf_cyan extends ModelePDFPropales
 					    if ($pagenb == $pageposafter)
 						{
 						    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -832,8 +821,7 @@ class pdf_cyan extends ModelePDFPropales
 				{
 				    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
-				}
-				else {
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
 				}
@@ -901,8 +889,7 @@ class pdf_cyan extends ModelePDFPropales
 											} elseif (!empty($conf->service->enabled)) {
 												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file].'/'.get_exdir($product->id, 2, 0, 0, $product, 'product').$product->id."/photos";
 											}
-										}
-										else {
+										} else {
 											if (!empty($conf->product->enabled)) {
 												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file].'/'.get_exdir(0, 0, 0, 0, $product, 'product').dol_sanitizeFileName($product->ref);
 											} elseif (!empty($conf->service->enabled)) {
@@ -954,13 +941,11 @@ class pdf_cyan extends ModelePDFPropales
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PROP_OUTPUTDIR");
 			return 0;
 		}
@@ -1021,8 +1006,7 @@ class pdf_cyan extends ModelePDFPropales
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
             $posy = $pdf->GetY() + 1;
-		}
-        elseif ($object->availability_code || $object->availability)    // Show availability conditions
+		} elseif ($object->availability_code || $object->availability)    // Show availability conditions
 		{
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -1217,8 +1201,7 @@ class pdf_cyan extends ModelePDFPropales
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else {
+			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1544,23 +1527,20 @@ class pdf_cyan extends ModelePDFPropales
 				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
 				{
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
-				}
-				else {
+				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
 				if (is_readable($logo))
 				{
 				    $height = pdf_getHeightForLogo($logo);
 				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-				}
-				else {
+				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
-			}
-			else {
+			} else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
@@ -1984,12 +1964,10 @@ class pdf_cyan extends ModelePDFPropales
 	    if ($reshook < 0)
 	    {
 	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    }
-	    elseif (empty($reshook))
+	    } elseif (empty($reshook))
 	    {
 	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    }
-	    else {
+	    } else {
 	        $this->cols = $hookmanager->resArray;
 	    }
 	}
diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php
index d342f9d6a4a..44a803ec58b 100644
--- a/htdocs/core/modules/propale/mod_propale_marbre.php
+++ b/htdocs/core/modules/propale/mod_propale_marbre.php
@@ -108,8 +108,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
 		if (!$pryymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $pryymm))
 		{
 			return true;
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -140,8 +139,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else {
+		} else {
 			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 4f8c8221e79..1a4400ae84d 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -271,8 +271,7 @@ class pdf_paiement
 				$lines[$i][9] = $objp->paiement_amount;
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
index 1a7076095ec..ae345b21b7c 100644
--- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
+++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
@@ -270,8 +270,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else {
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -298,8 +297,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 					// On peut utiliser le nom de la societe du contact
 					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
 					else $socobject = $object->thirdparty;
-				}
-				else {
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -336,8 +334,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					return -1;
@@ -367,8 +364,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -387,8 +383,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -405,8 +400,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -427,8 +421,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -459,8 +452,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -490,8 +482,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 						$this->error = $e->getMessage();
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					    $odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -508,8 +499,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 				$odfHandler = null; // Destroy object
 
 				return 1; // Success
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 1901a9fc044..b5fe6c53c36 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -148,12 +148,10 @@ class pdf_squille extends ModelePdfReception
                         if ($obj['photo_vignette'])
                         {
                             $filename = $obj['photo_vignette'];
-                        }
-                        else {
+                        } else {
                             $filename = $obj['photo'];
                         }
-                    }
-                    else {
+                    } else {
                         $filename = $obj['photo'];
                     }
 
@@ -174,8 +172,7 @@ class pdf_squille extends ModelePdfReception
 			{
 				$dir = $conf->reception->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$rcpref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->reception->dir_output."/".$rcpref;
 				$file = $dir."/".$rcpref.".pdf";
@@ -332,8 +329,7 @@ class pdf_squille extends ModelePdfReception
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else {
+				} else {
 					$height_note = 0;
 				}
 
@@ -413,8 +409,7 @@ class pdf_squille extends ModelePdfReception
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else {
+						} else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
@@ -422,8 +417,7 @@ class pdf_squille extends ModelePdfReception
 								$showpricebeforepagebreak = 1;
 							else $showpricebeforepagebreak = 0;
 						}
-					}
-					else // No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -504,8 +498,7 @@ class pdf_squille extends ModelePdfReception
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -518,8 +511,7 @@ class pdf_squille extends ModelePdfReception
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -535,8 +527,7 @@ class pdf_squille extends ModelePdfReception
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else {
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -567,13 +558,11 @@ class pdf_squille extends ModelePdfReception
 				@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "EXP_OUTPUTDIR");
 			return 0;
 		}
@@ -809,15 +798,13 @@ class pdf_squille extends ModelePdfReception
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else {
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else {
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -826,8 +813,7 @@ class pdf_squille extends ModelePdfReception
 		if (!empty($conf->barcode->enabled))
 		{
 			$posx = 105;
-		}
-		else {
+		} else {
 			$posx = $this->marge_gauche + 3;
 		}
 		//$pdf->Rect($this->marge_gauche, $this->marge_haute, $this->page_largeur-$this->marge_gauche-$this->marge_droite, 30);
diff --git a/htdocs/core/modules/reception/mod_reception_beryl.php b/htdocs/core/modules/reception/mod_reception_beryl.php
index ee3122749a3..8a9f2af0917 100644
--- a/htdocs/core/modules/reception/mod_reception_beryl.php
+++ b/htdocs/core/modules/reception/mod_reception_beryl.php
@@ -113,8 +113,7 @@ class mod_reception_beryl extends ModelNumRefReception
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else {
+		} else {
 			dol_syslog("mod_reception_beryl::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index cff1ae3f897..2af48507e94 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -248,8 +248,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else {
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -275,8 +274,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 	    					'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -322,12 +320,10 @@ class doc_generic_odt extends ModeleThirdPartyDoc
                 			{
                 				try {
                 					$listlines->setVars($key, $val, true, 'UTF-8');
-                				}
-                				catch (OdfException $e)
+                				} catch (OdfException $e)
                 				{
 									dol_syslog($e->getMessage(), LOG_INFO);
-                				}
-                				catch (SegmentException $e)
+                				} catch (SegmentException $e)
                 				{
 									dol_syslog($e->getMessage(), LOG_INFO);
                 				}
@@ -335,8 +331,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
                 			$listlines->merge();
                 		}
                 		$odfHandler->mergeSegment($listlines);
-                	}
-                	catch (OdfException $e)
+                	} catch (OdfException $e)
                 	{
                 		$this->error = $e->getMessage();
                 		dol_syslog($this->error, LOG_WARNING);
@@ -365,13 +360,11 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// setVars failed, probably because key not found
                         dol_syslog($e->getMessage(), LOG_INFO);
@@ -384,8 +377,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -404,8 +396,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 				    try {
                         $odfHandler->creator = $user->getFullName($outputlangs);
                         $odfHandler->title = $object->builddoc_filename;
@@ -434,8 +425,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index ce85de4670d..665d1266468 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -218,13 +218,11 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 		{
 			$field = 'code_client';
 			//$where = ' AND client in (1,2)';
-		}
-		elseif ($type == 1)
+		} elseif ($type == 1)
 		{
 			$field = 'code_fournisseur';
 			//$where = ' AND fournisseur = 1';
-		}
-		else return -1;
+		} else return -1;
 
 		$now = dol_now();
 
@@ -281,12 +279,10 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
 			$result = -2;
-		}
-		else {
+		} else {
 			// Get Mask value
 			$mask = '';
 			if ($type == 0) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
@@ -334,12 +330,10 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 			if ($db->num_rows($resql) == 0)
 			{
 				return 0;
-			}
-			else {
+			} else {
 				return -1;
 			}
-		}
-		else {
+		} else {
 			return -2;
 		}
 	}
diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php
index 1bfeab38865..c3ce858ec0d 100644
--- a/htdocs/core/modules/societe/mod_codeclient_leopard.php
+++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php
@@ -126,8 +126,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
 			$result = -2;
 		}
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index 5582e6459af..6d12d7c3e19 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -144,8 +144,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else {
+		} else {
 			return -1;
 		}
 
@@ -183,29 +182,24 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
 			$result = -2;
-		}
-		else {
+		} else {
 			if ($this->verif_syntax($code) >= 0)
 			{
 				$is_dispo = $this->verif_dispo($db, $code, $soc, $type);
 				if ($is_dispo <> 0)
 				{
 					$result = -3;
-				}
-				else {
+				} else {
 					$result = 0;
 				}
-			}
-			else {
+			} else {
 				if (dol_strlen($code) == 0)
 				{
 					$result = -2;
-				}
-				else {
+				} else {
 					$result = -1;
 				}
 			}
@@ -244,12 +238,10 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 			if ($db->num_rows($resql) == 0)
 			{
 				return 0;
-			}
-			else {
+			} else {
 				return -1;
 			}
-		}
-		else {
+		} else {
 			return -2;
 		}
 	}
@@ -270,8 +262,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		if (dol_strlen($code) < 11)
 		{
 			$res = -1;
-		}
-		else {
+		} else {
 			$res = 0;
 		}
 		return $res;
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
index 27b1572555e..fc993a0d671 100644
--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -141,13 +141,11 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		{
 			$codetouse = (!empty($societe->code_client) ? $societe->code_client : 'CUSTCODE');
 			$prefix = $this->prefixcustomeraccountancycode;
-		}
-		elseif ($type == 'supplier')
+		} elseif ($type == 'supplier')
 		{
 			$codetouse = (!empty($societe->code_fournisseur) ? $societe->code_fournisseur : 'SUPPCODE');
 			$prefix = $this->prefixsupplieraccountancycode;
-		}
-		else {
+		} else {
 			$this->error = 'Bad value for parameter type';
 			return -1;
 		}
@@ -170,8 +168,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		if (!$is_dispo)
 		{
 			$this->code = $codetouse;
-		}
-		else {
+		} else {
 			// Pour retour
 			$this->code = $codetouse;
 		}
@@ -208,13 +205,11 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 			{
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' available");
 				return 1; // Dispo
-			}
-			else {
+			} else {
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' not available");
 				return 0; // Non dispo
 			}
-		}
-		else {
+		} else {
 			$this->error = $db->error()." sql=".$sql;
 			return -1; // Erreur
 		}
diff --git a/htdocs/core/modules/societe/mod_codecompta_digitaria.php b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
index 3a689b8df93..20edc26f219 100644
--- a/htdocs/core/modules/societe/mod_codecompta_digitaria.php
+++ b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
@@ -163,14 +163,12 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
                 $codetouse = $societe->name;
                 $prefix = $this->prefixsupplieraccountancycode;
                 $width = $this->supplieraccountancycodecharacternumber;
-			}
-			elseif ($type == 'customer')
+			} elseif ($type == 'customer')
             {
                 $codetouse = $societe->name;
                 $prefix = $this->prefixcustomeraccountancycode;
                 $width = $this->customeraccountancycodecharacternumber;
-            }
-            else {
+            } else {
                 $this->error = 'Bad value for parameter type';
                 return -1;
             }
@@ -219,8 +217,7 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
         if ($disponibility == 0)
         {
             return 0; // return ok
-        }
-        else {
+        } else {
             return -1; // return ko
         }
 	}
@@ -238,12 +235,10 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
         if ($type == 'supplier')
         {
             $typethirdparty = 'code_compta_fournisseur';
-        }
-        elseif ($type == 'customer')
+        } elseif ($type == 'customer')
         {
             $typethirdparty = 'code_compta';
-        }
-        else {
+        } else {
             $this->error = 'Bad value for parameter type';
             return -1;
         }
@@ -258,13 +253,11 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
             {
                 dol_syslog("mod_codecompta_digitaria::checkIfAccountancyCodeIsAlreadyUsed '".$code."' available");
                 return 0; // Available
-            }
-            else {
+            } else {
                 dol_syslog("mod_codecompta_digitaria::checkIfAccountancyCodeIsAlreadyUsed '".$code."' not available");
                 return -1; // Not available
             }
-        }
-        else {
+        } else {
             $this->error = $db->error()." sql=".$sql;
             return -2; // Error
         }
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index ea10843a94a..df280e11679 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -172,8 +172,7 @@ abstract class ModeleThirdPartyCode
 				$liste[$row[0]] = $row[1];
 				$i++;
 			}
-		}
-		else {
+		} else {
 			return -1;
 		}
 		return $liste;
diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
index c68d1c37642..5fbee68d41b 100644
--- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
+++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
@@ -293,8 +293,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else {
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -327,8 +326,7 @@ class doc_generic_stock_odt extends ModelePDFStock
                         // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
                         $contactobject = $object->contact;
                     }
-				}
-				else {
+				} else {
 					$socobject = $object->thirdparty;
 				}
 				// Make substitution
@@ -364,8 +362,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 						    'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -382,8 +379,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -414,13 +410,11 @@ class doc_generic_stock_odt extends ModelePDFStock
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -440,12 +434,10 @@ class doc_generic_stock_odt extends ModelePDFStock
 							{
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -454,8 +446,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 						}
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -468,8 +459,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -488,8 +478,7 @@ class doc_generic_stock_odt extends ModelePDFStock
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					    $odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -509,8 +498,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index 708f06a4491..d4c8adb74f2 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -210,8 +210,7 @@ class pdf_standard extends ModelePDFStock
 			{
 				$dir = $conf->stock->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->stock->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -378,8 +377,7 @@ class pdf_standard extends ModelePDFStock
 									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 									$pdf->setPage($pageposafter + 1);
 								}
-							}
-							else {
+							} else {
 								// We found a page break
 
 								// Allows data in the first page if description is long enough to break in multiples pages
@@ -387,8 +385,7 @@ class pdf_standard extends ModelePDFStock
 									$showpricebeforepagebreak = 1;
 								else $showpricebeforepagebreak = 0;
 							}
-						}
-						else // No pagebreak
+						} else // No pagebreak
 						{
 							$pdf->commitTransaction();
 						}
@@ -472,8 +469,7 @@ class pdf_standard extends ModelePDFStock
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-							}
-							else {
+							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -487,8 +483,7 @@ class pdf_standard extends ModelePDFStock
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-							}
-							else {
+							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -538,8 +533,7 @@ class pdf_standard extends ModelePDFStock
 						$pdf->SetXY($this->postotalht, $curY);
 						$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, price(price2num($totalvaluesell, 'MT'), 0, $outputlangs), 0, 'R', 0);
 					}
-				}
-				else {
+				} else {
 					dol_print_error($db);
 				}
 
@@ -563,8 +557,7 @@ class pdf_standard extends ModelePDFStock
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else {
+				} else {
 					$height_note = 0;
 				}
 
@@ -697,8 +690,7 @@ class pdf_standard extends ModelePDFStock
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else {
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -736,13 +728,11 @@ class pdf_standard extends ModelePDFStock
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PRODUCT_OUTPUTDIR");
 			return 0;
 		}
@@ -902,15 +892,13 @@ class pdf_standard extends ModelePDFStock
 	        {
 	            $height = pdf_getHeightForLogo($logo);
 	            $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-	        }
-	        else {
+	        } else {
 	            $pdf->SetTextColor(200, 0, 0);
 	            $pdf->SetFont('', 'B', $default_font_size - 2);
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 	        }
-	    }
-	    else {
+	    } else {
 	        $text = $this->emetteur->name;
 	        $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 	    }
@@ -952,8 +940,7 @@ class pdf_standard extends ModelePDFStock
 		if (!empty($object->fk_parent) && $e->fetch($object->fk_parent) > 0)
 		{
 			$pdf->MultiCell(150, 3, $e->label, '', 'R');
-		}
-		else {
+		} else {
 			$pdf->MultiCell(150, 3, $outputlangs->transnoentities("None"), '', 'R');
 		}
 
@@ -990,16 +977,14 @@ class pdf_standard extends ModelePDFStock
 		{
 			$obj = $db->fetch_object($resqlbis);
 			$lastmovementdate = $db->jdate($obj->datem);
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
 		if ($lastmovementdate)
 		{
 			$toWrite = dol_print_date($lastmovementdate, 'dayhour').' ';
-		}
-		else {
+		} else {
 			$toWrite = $outputlangs->transnoentities("None");
 		}
 
diff --git a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
index dcf461fd9c0..59769df9987 100644
--- a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
@@ -287,8 +287,7 @@ class pdf_stdmovement extends ModelePDFMovement
 			if ($year > 0)
 			$sql .= " AND m.datem BETWEEN '".$db->idate(dol_get_first_day($year, $month, false))."' AND '".$db->idate(dol_get_last_day($year, $month, false))."'";
 			else $sql .= " AND date_format(m.datem, '%m') = '$month'";
-		}
-		elseif ($year > 0)
+		} elseif ($year > 0)
 		{
 			$sql .= " AND m.datem BETWEEN '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
 		}
@@ -373,8 +372,7 @@ class pdf_stdmovement extends ModelePDFMovement
 			{
 				$dir = $conf->stock->dir_output."/movement";
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				if (!empty($search_inventorycode)) $objectref .= "_".$id."_".$search_inventorycode;
 				if ($search_type_mouvement) $objectref .= "_".$search_type_mouvement;
@@ -536,8 +534,7 @@ class pdf_stdmovement extends ModelePDFMovement
 									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 									$pdf->setPage($pageposafter + 1);
 								}
-							}
-							else {
+							} else {
 								// We found a page break
 
 								// Allows data in the first page if description is long enough to break in multiples pages
@@ -545,8 +542,7 @@ class pdf_stdmovement extends ModelePDFMovement
 									$showpricebeforepagebreak = 1;
 								else $showpricebeforepagebreak = 0;
 							}
-						}
-						else // No pagebreak
+						} else // No pagebreak
 						{
 							$pdf->commitTransaction();
 						}
@@ -661,8 +657,7 @@ class pdf_stdmovement extends ModelePDFMovement
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-							}
-							else {
+							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -676,8 +671,7 @@ class pdf_stdmovement extends ModelePDFMovement
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-							}
-							else {
+							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -712,8 +706,7 @@ class pdf_stdmovement extends ModelePDFMovement
 					// Total Qty
 					$pdf->SetXY($this->postotalht, $curY);
 					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $totalunit, 0, 'R', 0);
-				}
-				else {
+				} else {
 					dol_print_error($db);
 				}
 
@@ -737,8 +730,7 @@ class pdf_stdmovement extends ModelePDFMovement
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else {
+				} else {
 					$height_note = 0;
 				}
 
@@ -753,8 +745,7 @@ class pdf_stdmovement extends ModelePDFMovement
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else {
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -792,13 +783,11 @@ class pdf_stdmovement extends ModelePDFMovement
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PRODUCT_OUTPUTDIR");
 			return 0;
 		}
@@ -981,15 +970,13 @@ class pdf_stdmovement extends ModelePDFMovement
 	        {
 	            $height = pdf_getHeightForLogo($logo);
 	            $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-	        }
-	        else {
+	        } else {
 	            $pdf->SetTextColor(200, 0, 0);
 	            $pdf->SetFont('', 'B', $default_font_size - 2);
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 	        }
-	    }
-	    else {
+	    } else {
 	        $text = $this->emetteur->name;
 	        $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 	    }
@@ -1031,8 +1018,7 @@ class pdf_stdmovement extends ModelePDFMovement
 		if (!empty($object->fk_parent) && $e->fetch($object->fk_parent) > 0)
 		{
 			$pdf->MultiCell(150, 3, $e->label, '', 'R');
-		}
-		else {
+		} else {
 			$pdf->MultiCell(150, 3, $outputlangs->transnoentities("None"), '', 'R');
 		}
 
@@ -1069,16 +1055,14 @@ class pdf_stdmovement extends ModelePDFMovement
 		{
 			$obj = $db->fetch_object($resqlbis);
 			$lastmovementdate = $db->jdate($obj->datem);
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
 		if ($lastmovementdate)
 		{
 			$toWrite = dol_print_date($lastmovementdate, 'dayhour').' ';
-		}
-		else {
+		} else {
 			$toWrite = $outputlangs->transnoentities("None");
 		}
 
diff --git a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
index 551d960008a..49d5dd4ca2d 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -233,8 +233,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			{
 				$dir = $conf->fournisseur->facture->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
                 $dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$objectref;
@@ -423,16 +422,14 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else {
+						} else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
 							else $showpricebeforepagebreak = 0;
 						}
-					}
-					else // No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -532,8 +529,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -547,8 +543,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -565,8 +560,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else {
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -608,13 +602,11 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "SUPPLIER_OUTPUTDIR");
 			return 0;
 		}
@@ -724,8 +716,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2, 0, $outputlangs), 0, 'R', 1);
 			}
-		}
-		else {
+		} else {
 			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 			//{
 			//Local tax 1
@@ -1039,8 +1030,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1137,8 +1127,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
-		}
-		else {
+		} else {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(255, 0, 0);
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
index 70c20a77fb3..65649e5d2e1 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
@@ -192,8 +192,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
         	$obj = $db->fetch_object($resql);
         	if ($obj) $max = intval($obj->max);
         	else $max = 0;
-        }
-        else {
+        } else {
         	return -1;
         }
 
@@ -214,12 +213,10 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
         	{
         		$obj = $db->fetch_object($resql);
         		if ($obj) $ref = $obj->ref;
-        	}
-        	else dol_print_error($db);
+        	} else dol_print_error($db);
 
         	return $ref;
-        }
-        elseif ($mode == 'next')
+        } elseif ($mode == 'next')
         {
         	$date = $object->date; // This is invoice date (not creation date)
         	$yymm = strftime("%y%m", $date);
@@ -229,8 +226,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 
         	dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
         	return $prefix.$yymm."-".$num;
-        }
-        else dol_print_error('', 'Bad parameter for getNextValue');
+        } else dol_print_error('', 'Bad parameter for getNextValue');
     }
 
 
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
index 8d35c5d1758..3805a941476 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
@@ -168,8 +168,7 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 			{
 				$mask = $conf->global->SUPPLIER_INVOICE_TULIP_MASK;
 			}
-		}
-		elseif (is_object($object) && $object->type == 2) $mask = $conf->global->SUPPLIER_CREDIT_TULIP_MASK;
+		} elseif (is_object($object) && $object->type == 2) $mask = $conf->global->SUPPLIER_CREDIT_TULIP_MASK;
 		elseif (is_object($object) && $object->type == 3) $mask = $conf->global->SUPPLIER_DEPOSIT_TULIP_MASK;
 		else $mask = $conf->global->SUPPLIER_INVOICE_TULIP_MASK;
 		if (!$mask)
diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index 7be80850526..71c39650f50 100644
--- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
@@ -237,8 +237,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 			{
 				$dir = $conf->fournisseur->commande->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->fournisseur->commande->dir_output.'/'.$objectref;
@@ -271,8 +270,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else {
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -304,8 +302,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
                			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
             			$contactobject = $object->contact;
                     }
-				}
-				else {
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -342,8 +339,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -359,8 +355,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
                     dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -391,13 +386,11 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -407,8 +400,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -429,12 +421,10 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 							{
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -443,8 +433,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -457,8 +446,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -478,8 +466,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					    $odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -500,8 +487,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index b08adfcb97c..7679a555483 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -221,8 +221,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				{
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
-				}
-				else {
+				} else {
 					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
@@ -256,8 +255,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			{
 				$dir = $conf->fournisseur->commande->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->fournisseur->commande->dir_output.'/'.$objectref;
@@ -444,8 +442,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				            if ($i > $pageposbeforenote) {
 				                $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
 				                $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-				            }
-				            else {
+				            } else {
 				                $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
 				                $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 				            }
@@ -463,8 +460,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 				        $height_note = $posyafter - $tab_top_newpage;
 				        $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-				    }
-				    else // No pagebreak
+				    } else // No pagebreak
 				    {
 				        $pdf->commitTransaction();
 				        $posyafter = $pdf->GetY();
@@ -488,8 +484,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 				    $tab_height = $tab_height - $height_note;
 				    $tab_top = $posyafter + 6;
-				}
-				else {
+				} else {
 				    $height_note = 0;
 				}
 
@@ -569,16 +564,14 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					                //if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					                $pdf->setPage($pageposafter + 1);
 					            }
-					        }
-					        else {
+					        } else {
 					            // We found a page break
 					        	// Allows data in the first page if description is long enough to break in multiples pages
 					        	if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 					        		$showpricebeforepagebreak = 1;
 					        	else $showpricebeforepagebreak = 0;
 					        }
-					    }
-					    else // No pagebreak
+					    } else // No pagebreak
 					    {
 					        $pdf->commitTransaction();
 					    }
@@ -727,8 +720,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					    if ($pagenb == $pageposbeforeprintlines)
 					    {
 					        $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
-					    }
-						else {
+					    } else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -742,8 +734,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					    if ($pagenb == $pageposafter)
 					    {
 					        $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
-					    }
-						else {
+					    } else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -760,8 +751,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				{
 				    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-			    }
-				else {
+			    } else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -803,13 +793,11 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "SUPPLIER_OUTPUTDIR");
 			return 0;
 		}
@@ -997,8 +985,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
 			}
-		}
-		else {
+		} else {
 			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 			//{
     			//Local tax 1
@@ -1230,15 +1217,13 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else {
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else {
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -1281,8 +1266,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date_commande, "day", false, $outputlangs, true), '', 'R');
-		}
-		else {
+		} else {
 			$posy += 5;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(255, 0, 0);
@@ -1625,12 +1609,10 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	    if ($reshook < 0)
 	    {
 	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    }
-	    elseif (empty($reshook))
+	    } elseif (empty($reshook))
 	    {
 	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    }
-	    else {
+	    } else {
 	        $this->cols = $hookmanager->resArray;
 	    }
 	}
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
index c2a6af6c05e..06dd3c0aed3 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -237,8 +237,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				{
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
-				}
-				else {
+				} else {
 					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
@@ -272,8 +271,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			{
 				$dir = $conf->fournisseur->commande->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->fournisseur->commande->dir_output.'/'.$objectref;
@@ -463,8 +461,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					if ($posYAfterImage > 0)
 					{
 						$descWidth = $this->posxpicture - $curX;
-					}
-					else {
+					} else {
 						$descWidth = $this->posxtva - $curX;
 					}
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $descWidth, 3, $curX, $curY, $hideref, $hidedesc, 1);
@@ -487,16 +484,14 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else {
+						} else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
 							else $showpricebeforepagebreak = 0;
 						}
-					}
-					else // No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -610,8 +605,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -625,8 +619,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -643,8 +636,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else {
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -686,13 +678,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "SUPPLIER_OUTPUTDIR");
 			return 0;
 		}
@@ -880,8 +870,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
 			}
-		}
-		else {
+		} else {
 			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 			//{
     			//Local tax 1
@@ -1146,15 +1135,13 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else {
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else {
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -1197,8 +1184,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date_commande, "day", false, $outputlangs, true), '', 'R');
-		}
-		else {
+		} else {
 			$posy += 5;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(255, 0, 0);
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
index c8129f1e491..d26329fc388 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
@@ -116,8 +116,7 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 		if (!$coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
 		{
 			return true;
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
index 060394beca6..d5ae49114f6 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -230,8 +230,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 			{
 				$dir = $conf->fournisseur->payment->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
                 $dir = $conf->fournisseur->payment->dir_output.'/'.$objectref;
@@ -358,16 +357,14 @@ class pdf_standard extends ModelePDFSuppliersPayments
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else {
+						} else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
 							else $showpricebeforepagebreak = 0;
 						}
-					}
-					else // No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -429,8 +426,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -444,8 +440,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -462,8 +457,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else {
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -499,13 +493,11 @@ class pdf_standard extends ModelePDFSuppliersPayments
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "SUPPLIER_OUTPUTDIR");
 			return 0;
 		}
@@ -654,15 +646,13 @@ class pdf_standard extends ModelePDFSuppliersPayments
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else {
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else {
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
index 4ee8ed90490..604ab634bdd 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
@@ -136,8 +136,7 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else {
+		} else {
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index 8b0d7f108a1..380f7a1dcb4 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -305,8 +305,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else {
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -335,14 +334,12 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))
 					{
 						$socobject = $object->contact;
-					}
-					else {
+					} else {
 						$socobject = $object->thirdparty;
 						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
-				}
-				else {
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -379,8 +376,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 							'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -396,8 +392,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -427,13 +422,11 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -443,8 +436,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -465,12 +457,10 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 							{
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -479,8 +469,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -493,8 +482,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -513,8 +501,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -534,8 +521,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index fd5fb653a5a..25777895543 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -233,8 +233,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				{
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
-				}
-				else {
+				} else {
 					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
@@ -264,8 +263,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			{
 				$dir = $conf->supplier_proposal->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->supplier_proposal->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -448,8 +446,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					if ($posYAfterImage > 0)
 					{
 						$descWidth = $this->posxpicture - $curX;
-					}
-					else {
+					} else {
 						$descWidth = $this->posxtva - $curX;
 					}
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $descWidth, 3, $curX, $curY, $hideref, $hidedesc, 1);
@@ -475,16 +472,14 @@ class pdf_aurore extends ModelePDFSupplierProposal
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else {
+						} else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
 							else $showpricebeforepagebreak = 0;
 						}
-					}
-					else // No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -606,8 +601,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -621,8 +615,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -639,8 +632,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else {
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -684,13 +676,11 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "SUPPLIER_PROPOSAL_OUTPUTDIR");
 			return 0;
 		}
@@ -747,8 +737,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
             $posy = $pdf->GetY() + 1;
-		}
-		else {
+		} else {
 			$outputlangs->load("sendings");
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -931,8 +920,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else {
+			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1302,15 +1290,13 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else {
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else {
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -1438,8 +1424,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
 				else $socname = $object->thirdparty->name;
 				$carac_client_name = $outputlangs->convToOutputCharset($socname);
-			}
-			else {
+			} else {
 				$carac_client_name = $outputlangs->convToOutputCharset($object->thirdparty->name);
 			}
 
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
index 02b1c5a6684..4126c8402e9 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
@@ -108,8 +108,7 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 		if (!$pryymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $pryymm))
 		{
 			return true;
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -140,8 +139,7 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else {
+		} else {
 			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index 76869791d93..4f70dc6544c 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -90,8 +90,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 		if (file_exists($filename) && is_writable($filename))
 		{
 			dol_syslog('admin/syslog: file '.$filename);
-		}
-		else $errors[] = $langs->trans("ErrorFailedToOpenFile", $filename);
+		} else $errors[] = $langs->trans("ErrorFailedToOpenFile", $filename);
 
 		return $errors;
 	}
@@ -151,8 +150,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 				//throw new Exception('Failed to open log file '.basename($logfile));
 				print 'Failed to open log file '.($dolibarr_main_prod ?basename($logfile) : $logfile);
 			}
-		}
-		else {
+		} else {
 			$logLevels = array(
 				LOG_EMERG => 'EMERG',
 				LOG_ALERT => 'ALERT',
diff --git a/htdocs/core/modules/syslog/mod_syslog_syslog.php b/htdocs/core/modules/syslog/mod_syslog_syslog.php
index d2f1200cc08..91a3cdb9b44 100644
--- a/htdocs/core/modules/syslog/mod_syslog_syslog.php
+++ b/htdocs/core/modules/syslog/mod_syslog_syslog.php
@@ -92,8 +92,7 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 			if (!empty($_SERVER["WINDIR"])) $facility = constant('LOG_USER');
 
 			dol_syslog("admin/syslog: facility ".$facility);
-		}
-		else {
+		} else {
 		    $errors[] = $langs->trans("ErrorUnknownSyslogConstant", $facility);
 		}
 
@@ -115,8 +114,7 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 		if (!empty($conf->global->SYSLOG_FACILITY))  // Example LOG_USER
 		{
 			$facility = constant($conf->global->SYSLOG_FACILITY);
-		}
-		else $facility = constant('LOG_USER');
+		} else $facility = constant('LOG_USER');
 
 		// (int) is required to avoid error parameter 3 expected to be long
 		openlog('dolibarr', LOG_PID | LOG_PERROR, (int) $facility);
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
index 48b1e856aab..91f9a9052b2 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
@@ -160,12 +160,10 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
             if ($resql) {
                 $obj = $db->fetch_object($resql);
                 if ($obj) $ref = $obj->ref;
-            }
-            else dol_print_error($db);
+            } else dol_print_error($db);
 
             return $ref;
-        }
-        elseif ($mode == 'next')
+        } elseif ($mode == 'next')
         {
             $date = $invoice->date; // This is invoice date (not creation date)
             $yymm = strftime("%y%m", $date);
@@ -175,8 +173,7 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 
             dol_syslog(get_class($this)."::getNextValue return ".$this->prefix.$pos_source.'-'.$yymm.'-'.$num);
             return $this->prefix.$pos_source.'-'.$yymm.'-'.$num;
-        }
-        else dol_print_error('', 'Bad parameter for getNextValue');
+        } else dol_print_error('', 'Bad parameter for getNextValue');
     }
 
     /**
diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
index 5c2468e29c6..b9f9ffe69e8 100644
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -287,8 +287,7 @@ class doc_generic_user_odt extends ModelePDFUser
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else {
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -319,8 +318,7 @@ class doc_generic_user_odt extends ModelePDFUser
                         // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
                         $contactobject = $object->contact;
                     }
-				}
-				else {
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -336,8 +334,7 @@ class doc_generic_user_odt extends ModelePDFUser
 							'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_WARNING);
@@ -366,13 +363,11 @@ class doc_generic_user_odt extends ModelePDFUser
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
@@ -384,8 +379,7 @@ class doc_generic_user_odt extends ModelePDFUser
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
@@ -404,8 +398,7 @@ class doc_generic_user_odt extends ModelePDFUser
 						dol_syslog($e->getMessage(), LOG_WARNING);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -425,8 +418,7 @@ class doc_generic_user_odt extends ModelePDFUser
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
index 9e227a43588..9cf9a00c796 100644
--- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
+++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
@@ -290,8 +290,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else {
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -322,8 +321,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
                         // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
                         $contactobject = $object->contact;
                     }
-				}
-				else {
+				} else {
 					$socobject = $object->thirdparty;
 				}
 				// Make substitution
@@ -374,8 +372,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_WARNING);
 				}
@@ -404,13 +401,11 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
@@ -420,8 +415,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -444,12 +438,10 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 									if (!is_array($val)) {
 										$listlines->setVars($key, $val, true, 'UTF-8');
 									}
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_WARNING);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_WARNING);
 								}
@@ -458,8 +450,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -472,8 +463,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
@@ -492,8 +482,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 						dol_syslog($e->getMessage(), LOG_WARNING);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -513,8 +502,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 959d944352b..eeb39fd5020 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -50,44 +50,37 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 	$result = restrictedArea($user, 'produit|service', $id, 'product&product');
 	if ($modulepart == 'produit|service' && (!$user->rights->produit->lire && !$user->rights->service->lire)) accessforbidden();
 	$accessallowed = 1;
-}
-elseif ($modulepart == 'project')
+} elseif ($modulepart == 'project')
 {
     $result = restrictedArea($user, 'projet', $id);
 	if (!$user->rights->projet->lire) accessforbidden();
 	$accessallowed = 1;
-}
-elseif ($modulepart == 'bom')
+} elseif ($modulepart == 'bom')
 {
 	$result = restrictedArea($user, $modulepart, $id, 'bom_bom');
 	if (!$user->rights->bom->read) accessforbidden();
 	$accessallowed = 1;
-}
-elseif ($modulepart == 'member')
+} elseif ($modulepart == 'member')
 {
 	$result = restrictedArea($user, 'adherent', $id, '', '', 'fk_soc', 'rowid');
 	if (!$user->rights->adherent->lire) accessforbidden();
 	$accessallowed = 1;
-}
-elseif ($modulepart == 'user')
+} elseif ($modulepart == 'user')
 {
 	$result = restrictedArea($user, $modulepart, $id, $modulepart);
 	if (!$user->rights->user->user->lire) accessforbidden();
 	$accessallowed = 1;
-}
-elseif ($modulepart == 'tax')
+} elseif ($modulepart == 'tax')
 {
 	$result = restrictedArea($user, $modulepart, $id, 'chargesociales', 'charges');
 	if (!$user->rights->tax->charges->lire) accessforbidden();
 	$accessallowed = 1;
-}
-elseif ($modulepart == 'bank')
+} elseif ($modulepart == 'bank')
 {
 	$result = restrictedArea($user, 'banque', $id, 'bank_account');
 	if (!$user->rights->banque->lire) accessforbidden();
 	$accessallowed = 1;
-}
-else // ticket, holiday, expensereport, societe...
+} else // ticket, holiday, expensereport, societe...
 {
 	$result = restrictedArea($user, $modulepart, $id, $modulepart);
 	if (empty($user->rights->$modulepart->read) && empty($user->rights->$modulepart->lire)) accessforbidden();
@@ -114,8 +107,7 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 		if ($object->type == Product::TYPE_PRODUCT) $dir = $conf->product->multidir_output[$object->entity];
 		if ($object->type == Product::TYPE_SERVICE) $dir = $conf->service->multidir_output[$object->entity];
 	}
-}
-elseif ($modulepart == 'project')
+} elseif ($modulepart == 'project')
 {
     require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
     $object = new Project($db);
@@ -125,8 +117,7 @@ elseif ($modulepart == 'project')
         if ($result <= 0) dol_print_error($db, 'Failed to load object');
         $dir = $conf->project->multidir_output[$object->entity]; // By default
     }
-}
-elseif ($modulepart == 'propal')
+} elseif ($modulepart == 'propal')
 {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 	$object = new Propal($db);
@@ -136,8 +127,7 @@ elseif ($modulepart == 'propal')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->propal->multidir_output[$object->entity]; // By default
 	}
-}
-elseif ($modulepart == 'holiday')
+} elseif ($modulepart == 'holiday')
 {
 	require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 	$object = new Holiday($db);
@@ -147,8 +137,7 @@ elseif ($modulepart == 'holiday')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->$modulepart->dir_output; // By default
 	}
-}
-elseif ($modulepart == 'member')
+} elseif ($modulepart == 'member')
 {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 	$object = new Adherent($db);
@@ -158,8 +147,7 @@ elseif ($modulepart == 'member')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->adherent->dir_output; // By default
 	}
-}
-elseif ($modulepart == 'societe')
+} elseif ($modulepart == 'societe')
 {
     require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
     $object = new Societe($db);
@@ -169,8 +157,7 @@ elseif ($modulepart == 'societe')
         if ($result <= 0) dol_print_error($db, 'Failed to load object');
         $dir = $conf->$modulepart->dir_output;
     }
-}
-elseif ($modulepart == 'user')
+} elseif ($modulepart == 'user')
 {
     require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
     $object = new User($db);
@@ -180,8 +167,7 @@ elseif ($modulepart == 'user')
         if ($result <= 0) dol_print_error($db, 'Failed to load object');
         $dir = $conf->$modulepart->dir_output; // By default
     }
-}
-elseif ($modulepart == 'expensereport')
+} elseif ($modulepart == 'expensereport')
 {
     require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
     $object = new ExpenseReport($db);
@@ -191,8 +177,7 @@ elseif ($modulepart == 'expensereport')
         if ($result <= 0) dol_print_error($db, 'Failed to load object');
         $dir = $conf->expensereport->dir_output; // By default
     }
-}
-elseif ($modulepart == 'tax')
+} elseif ($modulepart == 'tax')
 {
 	require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 	$object = new ChargeSociales($db);
@@ -202,8 +187,7 @@ elseif ($modulepart == 'tax')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->$modulepart->dir_output; // By default
 	}
-}
-elseif ($modulepart == 'ticket')
+} elseif ($modulepart == 'ticket')
 {
 	require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
 	$object = new Ticket($db);
@@ -213,8 +197,7 @@ elseif ($modulepart == 'ticket')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->$modulepart->dir_output; // By default
 	}
-}
-elseif ($modulepart == 'bom')
+} elseif ($modulepart == 'bom')
 {
 	require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
 	$object = new BOM($db);
@@ -224,8 +207,7 @@ elseif ($modulepart == 'bom')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->$modulepart->dir_output; // By default
 	}
-}
-elseif ($modulepart == 'mrp')
+} elseif ($modulepart == 'mrp')
 {
 	require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 	$object = new MO($db);
@@ -235,8 +217,7 @@ elseif ($modulepart == 'mrp')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->$modulepart->dir_output; // By default
 	}
-}
-elseif ($modulepart == 'bank')
+} elseif ($modulepart == 'bank')
 {
 	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 	$object = new Account($db);
@@ -246,8 +227,7 @@ elseif ($modulepart == 'bank')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->bank->dir_output; // By default
 	}
-}
-else {
+} else {
 	print 'Action crop for modulepart = '.$modulepart.' is not supported yet by photos_resize.php.';
 }
 
@@ -268,8 +248,7 @@ if (empty($backtourl))
     elseif (in_array($modulepart, array('bank')) && preg_match('/\/statement\/([^\/]+)\//', $file, $regs)) {
     	$num = $regs[1];
     	$backtourl = DOL_URL_ROOT."/compta/bank/account_statement_document.php?id=".$id.'&num='.urlencode($num).'&file='.urldecode($file);
-    }
-    elseif (in_array($modulepart, array('bank')))          $backtourl = DOL_URL_ROOT."/compta/bank/document.php?id=".$id.'&file='.urldecode($file);
+    } elseif (in_array($modulepart, array('bank')))          $backtourl = DOL_URL_ROOT."/compta/bank/document.php?id=".$id.'&file='.urldecode($file);
     elseif (in_array($modulepart, array('mrp')))           $backtourl = DOL_URL_ROOT."/mrp/mo_document.php?id=".$id.'&file='.urldecode($file);
     else $backtourl = DOL_URL_ROOT."/".$modulepart."/".$modulepart."_document.php?id=".$id.'&file='.urldecode($file);
 }
@@ -285,8 +264,7 @@ if ($cancel)
 	{
 		header("Location: ".$backtourl);
 		exit;
-	}
-	else {
+	} else {
 	    dol_print_error('', 'Cancel on photo_resize with a not supported value of modulepart='.$modulepart);
 	    exit;
 	}
@@ -318,8 +296,7 @@ if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex")
 
 		    $ecmfile->label = md5_file(dol_osencode($fullpath));
 		    $result = $ecmfile->update($user);
-		}
-		elseif ($result == 0)   // If not found
+		} elseif ($result == 0)   // If not found
 		{
 		    $filename = basename($rel_filename);
 		    $rel_dir = dirname($rel_filename);
@@ -345,13 +322,11 @@ if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex")
 		{
 			header("Location: ".$backtourl);
 			exit;
-		}
-		else {
+		} else {
     	    dol_print_error('', 'confirm_resize on photo_resize without backtourl defined for modulepart='.$modulepart);
     	    exit;
 		}
-	}
-	else {
+	} else {
 		setEventMessages($result, null, 'errors');
 		$_GET['file'] = $_POST["file"];
 		$action = '';
@@ -386,8 +361,7 @@ if ($action == 'confirm_crop')
 
 		    $ecmfile->label = md5_file(dol_osencode($fullpath));
 		    $result = $ecmfile->update($user);
-		}
-		elseif ($result == 0)   // If not found
+		} elseif ($result == 0)   // If not found
 		{
 		    $filename = basename($rel_filename);
 		    $rel_dir = dirname($rel_filename);
@@ -413,13 +387,11 @@ if ($action == 'confirm_crop')
 		{
 			header("Location: ".$backtourl);
 			exit;
-		}
-		else {
+		} else {
     	    dol_print_error('', 'confirm_crop on photo_resize without backtourl defined for modulepart='.$modulepart);
     	    exit;
 		}
-	}
-	else {
+	} else {
 		setEventMessages($result, null, 'errors');
 		$_GET['file'] = $_POST["file"];
 		$action = '';
diff --git a/htdocs/core/search.php b/htdocs/core/search.php
index 01c7c078214..b0a61f5bd71 100644
--- a/htdocs/core/search.php
+++ b/htdocs/core/search.php
@@ -147,7 +147,6 @@ if (!empty($_SERVER['HTTP_REFERER']))
 {
 	header("Location: ".$_SERVER['HTTP_REFERER']);
 	exit;
-}
-else {
+} else {
 	print 'The wrapper search.php was called without any search criteria';
 }
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index 5d61ccecdb3..e502648b805 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -74,8 +74,7 @@ if ($conf->use_javascript_ajax && 1 == 2)   // select2 is ko with jmobile
 	if (!is_object($form)) $form = new Form($db);
 	$selected = -1;
 	$searchform .= '<br><br>'.$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'minwidth300', 1, $langs->trans("Search"), 0);
-}
-else {
+} else {
 	$usedbyinclude = 1; // Used into next include
 	$showtitlebefore = GETPOST('showtitlebefore', 'int');
 	include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';
@@ -106,8 +105,7 @@ $reshook = $hookmanager->executeHooks('printSearchForm', $parameters); // Note t
 if (empty($reshook))
 {
 	$searchform .= $hookmanager->resPrint;
-}
-else $searchform = $hookmanager->resPrint;
+} else $searchform = $hookmanager->resPrint;
 
 
 print "\n";
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 960e0e57401..eaf2c58eb4b 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -177,8 +177,7 @@ if ((($type == 'select') || ($type == 'checkbox') || ($type == 'radio')) && is_a
 			$param_chain .= $key.','.$value."\n";
 		}
 	}
-}
-elseif (($type == 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password') || ($type == 'separate'))
+} elseif (($type == 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password') || ($type == 'separate'))
 {
 	$paramlist = array_keys($param['options']);
 	$param_chain = $paramlist[0];
@@ -217,8 +216,7 @@ if (in_array($type, array_keys($typewecanchangeinto)))
         else print '<option value="'.$key.'" disabled="disabled"'.$selected.'>'.$val.'</option>';
     }
     print '</select>';
-}
-else {
+} else {
 	print $type2label[$type];
     print '<input type="hidden" name="type" id="type" value="'.$type.'">';
 }
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index 4a6c7d67494..8b92f4e183c 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -100,8 +100,7 @@ if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafiel
 			if (empty($extrafields->attributes[$elementtype]['entityid'][$key]))
 			{
 				print $langs->trans("All");
-			}
-			else {
+			} else {
 				global $multicompanylabel_cache;
 				if (!is_array($multicompanylabel_cache)) $multicompanylabel_cache = array();
 				if (empty($multicompanylabel_cache[$extrafields->attributes[$elementtype]['entityid'][$key]])) {
@@ -117,8 +116,7 @@ if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafiel
 		print '&nbsp; <a class="paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=delete&attrname='.$key.'">'.img_delete().'</a></td>'."\n";
 		print "</tr>";
 	}
-}
-else {
+} else {
 	$colspan = 13;
 	if (!empty($conf->multicompany->enabled))  $colspan++;
 
diff --git a/htdocs/core/tpl/bloc_comment.tpl.php b/htdocs/core/tpl/bloc_comment.tpl.php
index d20894d6a03..02a32110779 100644
--- a/htdocs/core/tpl/bloc_comment.tpl.php
+++ b/htdocs/core/tpl/bloc_comment.tpl.php
@@ -111,8 +111,7 @@ if (!empty($object->comments))
         {
             $doleditor = new DolEditor('comment_description', $comment->description, '', 80, 'dolibarr_notes', 'In', 0, true, true, ROWS_3, '100%');
             print $doleditor->Create(1);
-        }
-        else {
+        } else {
             print $comment->description;
         }
 		print '</div>'; // End comment-description
@@ -123,8 +122,7 @@ if (!empty($object->comments))
             print '<input name="cancel" type="submit" class="button" value="'.$langs->trans("Cancel").'">';
 
             print '</form>';
-        }
-        else {
+        } else {
             if ($fk_user == $user->id || $user->admin == 1)
             {
                 print '<a class="comment-edit comment-cell" href="'.$varpage.'?action=editcomment&id='.$id.'&withproject=1&idcomment='.$comment->id.'#comment" title="'.$langs->trans('Edit').'">';
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 6087ca6e906..0e19e5dbb45 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -51,8 +51,7 @@ if ($action == 'presend')
 		if ($object->element == 'invoice_supplier')
 		{
 			$fileparams = dol_most_recent_file($diroutput.'/'.get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+');
-		}
-		else {
+		} else {
 			$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
 		}
 
@@ -102,8 +101,7 @@ if ($action == 'presend')
 			if ($object->element == 'invoice_supplier')
 			{
 				$fileparams = dol_most_recent_file($diroutput.'/'.get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+');
-			}
-			else {
+			} else {
 				$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
 			}
 
@@ -144,22 +142,18 @@ if ($action == 'presend')
 		$fuser = new User($db);
 		$fuser->fetch($object->fk_user_author);
 		$liste['thirdparty'] = $fuser->getFullName($outputlangs)." <".$fuser->email.">";
-	}
-	elseif ($object->element == 'societe')
+	} elseif ($object->element == 'societe')
 	{
 		foreach ($object->thirdparty_and_contact_email_array(1) as $key => $value) {
 			$liste[$key] = $value;
 		}
-	}
-	elseif ($object->element == 'contact')
+	} elseif ($object->element == 'contact')
 	{
 		$liste['contact'] = $object->getFullName($outputlangs)." <".$object->email.">";
-	}
-	elseif ($object->element == 'user' || $object->element == 'member')
+	} elseif ($object->element == 'user' || $object->element == 'member')
 	{
 		$liste['thirdparty'] = $object->getFullName($outputlangs)." <".$object->email.">";
-	}
-	else {
+	} else {
 		if (is_object($object->thirdparty))
 		{
 			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) {
diff --git a/htdocs/core/tpl/commonfields_view.tpl.php b/htdocs/core/tpl/commonfields_view.tpl.php
index 13d0267817f..a521876a2e7 100644
--- a/htdocs/core/tpl/commonfields_view.tpl.php
+++ b/htdocs/core/tpl/commonfields_view.tpl.php
@@ -83,8 +83,7 @@ foreach ($object->fields as $key => $val)
 	{
 		if (!empty($keyforbreak) && $key == $keyforbreak) {
 			$alreadyoutput = 0; // key used for break on second column
-		}
-		else {
+		} else {
 			continue;
 		}
 	}
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 0c1931d480f..5d467c20f4e 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -40,20 +40,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 $module = $object->element;
 
 // Special cases
-if ($module == 'propal') { $permission = $user->rights->propale->creer; }
-elseif ($module == 'fichinter') { $permission = $user->rights->ficheinter->creer; }
-elseif ($module == 'order_supplier') { $permission = $user->rights->fournisseur->commande->creer; }
-elseif ($module == 'invoice_supplier') { $permission = $user->rights->fournisseur->facture->creer; }
-elseif ($module == 'project') { $permission = $user->rights->projet->creer; }
-elseif ($module == 'action') { $permission = $user->rights->agenda->myactions->create; }
-elseif ($module == 'shipping') { $permission = $user->rights->expedition->creer; }
-elseif ($module == 'reception') { $permission = $user->rights->reception->creer; }
-elseif ($module == 'project_task') { $permission = $user->rights->projet->creer; }
-elseif (!isset($permission) && isset($user->rights->$module->creer))
+if ($module == 'propal') { $permission = $user->rights->propale->creer; } elseif ($module == 'fichinter') { $permission = $user->rights->ficheinter->creer; } elseif ($module == 'order_supplier') { $permission = $user->rights->fournisseur->commande->creer; } elseif ($module == 'invoice_supplier') { $permission = $user->rights->fournisseur->facture->creer; } elseif ($module == 'project') { $permission = $user->rights->projet->creer; } elseif ($module == 'action') { $permission = $user->rights->agenda->myactions->create; } elseif ($module == 'shipping') { $permission = $user->rights->expedition->creer; } elseif ($module == 'reception') { $permission = $user->rights->reception->creer; } elseif ($module == 'project_task') { $permission = $user->rights->projet->creer; } elseif (!isset($permission) && isset($user->rights->$module->creer))
 {
 	$permission = $user->rights->$module->creer;
-}
-elseif (!isset($permission) && isset($user->rights->$module->write))
+} elseif (!isset($permission) && isset($user->rights->$module->write))
 {
 	$permission = $user->rights->$module->write;
 }
@@ -177,8 +167,7 @@ foreach (array('internal', 'external') as $source)
 	if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc))
 	{
 		$contactlist = $objectsrc->liste_contact(-1, $source);
-	}
-	else {
+	} else {
 		$contactlist = $object->liste_contact(-1, $source);
 	}
 
@@ -197,8 +186,7 @@ foreach (array('internal', 'external') as $source)
 		if ($contact['source'] == 'internal')
 		{
 			$entry->nature = $langs->trans("User");
-		}
-		elseif ($contact['source'] == 'external')
+		} elseif ($contact['source'] == 'external')
 		{
 			$entry->nature = $langs->trans("ThirdPartyContact");
 		}
@@ -208,8 +196,7 @@ foreach (array('internal', 'external') as $source)
 			$companystatic->fetch($contact['socid']);
 			$entry->thirdparty_html = $companystatic->getNomUrl(1);
 			$entry->thirdparty_name = strtolower($companystatic->getFullName($langs));
-		}
-		elseif ($contact['socid'] < 0)
+		} elseif ($contact['socid'] < 0)
 		{
 			$entry->thirdparty_html = $conf->global->MAIN_INFO_SOCIETE_NOM;
 			$entry->thirdparty_name = strtolower($conf->global->MAIN_INFO_SOCIETE_NOM);
@@ -220,8 +207,7 @@ foreach (array('internal', 'external') as $source)
 			$userstatic->fetch($contact['id']);
 			$entry->contact_html = $userstatic->getNomUrl(-1, '', 0, 0, 0, 0, '', 'valignmiddle');
 			$entry->contact_name = strtolower($userstatic->getFullName($langs));
-		}
-		elseif ($contact['source'] == 'external')
+		} elseif ($contact['source'] == 'external')
 		{
 			$contactstatic->fetch($contact['id']);
 			$entry->contact_html = $contactstatic->getNomUrl(1, '', 0, '', 0, 0);
@@ -231,8 +217,7 @@ foreach (array('internal', 'external') as $source)
 		if ($contact['source'] == 'internal')
 		{
 			$entry->status = $userstatic->LibStatut($contact['statuscontact'], 3);
-		}
-		elseif ($contact['source'] == 'external')
+		} elseif ($contact['source'] == 'external')
 		{
 			$entry->status = $contactstatic->LibStatut($contact['statuscontact'], 3);
 		}
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index efb89043b6b..f80ae568071 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -35,8 +35,7 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
 						$datenotinstring = $db->jdate($datenotinstring);
 					}
 					$value = $datenotinstring;
-				}
-				else {
+				} else {
 					$value = $obj->$tmpkey;
 				}
 				// If field is a computed field, we make computation to get value
diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
index b3512136a10..8d09f6840b3 100644
--- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
@@ -33,13 +33,11 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
                     if (in_array($typeofextrafield, array('varchar'))) $searchclass = 'searchstring';
                     if (in_array($typeofextrafield, array('int', 'double'))) $searchclass = 'searchnum';
                     print '<input class="flat'.($searchclass ? ' '.$searchclass : '').'" size="4" type="text" name="'.$search_options_pattern.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options[$search_options_pattern.$tmpkey]).'">';
-                }
-                elseif (in_array($typeofextrafield, array('datetime', 'timestamp')))
+                } elseif (in_array($typeofextrafield, array('datetime', 'timestamp')))
                 {
                 	// TODO
                 	// Use showInputField in a particular manner to have input with a comparison operator, not input for a specific value date-hour-minutes
-                }
-                else {
+                } else {
                     // for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
                     $morecss = '';
                     if (in_array($typeofextrafield, array('link', 'sellist'))) $morecss = 'maxwidth200';
diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index 03d487ee0c0..42dc67d2b87 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -24,16 +24,14 @@ if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($
 		if ($crit != '' && in_array($typ, array('date', 'datetime', 'timestamp')))
 		{
 			$sql .= " AND ".$extrafieldsobjectprefix.$tmpkey." = '".$db->idate($crit)."'";
-		}
-		elseif (in_array($typ, array('boolean')))
+		} elseif (in_array($typ, array('boolean')))
 		{
 			if ($crit !== '-1' && $crit !== '') {
 				$sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." = '".$db->escape($crit)."'";
 				if ($crit == '0') $sql .= " OR ".$extrafieldsobjectprefix.$tmpkey." IS NULL";
 				$sql .= ")";
 			}
-		}
-		elseif ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0') && (!in_array($typ, array('link')) || $crit != '-1'))
+		} elseif ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0') && (!in_array($typ, array('link')) || $crit != '-1'))
 		{
 			$mode_search = 0;
 			if (in_array($typ, array('int', 'double', 'real', 'price'))) $mode_search = 1; // Search on a numeric
diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
index 169dd34fee1..bb231424396 100644
--- a/htdocs/core/tpl/extrafields_list_search_title.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
@@ -26,8 +26,7 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
 				if (!empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) $sortonfield = '';
 				if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') {
 					print '<th class="liste_titre thseparator"></th>';
-				}
-				else {
+				} else {
 					$tooltip = empty($extrafields->attributes[$extrafieldsobjectkey]['help'][$key]) ? '' : $extrafields->attributes[$extrafieldsobjectkey]['help'][$key];
 
 					print getTitleFieldOfList($extrafields->attributes[$extrafieldsobjectkey]['label'][$key], 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align ? 'align="'.$align.'" data-titlekey="'.$key.'"' : 'data-titlekey="'.$key.'"'), $sortfield, $sortorder, '', $disablesortlink, $tooltip)."\n";
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index a7379a69d94..6652f8f8fab 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -86,8 +86,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 		if ($action == 'edit_extras')
 		{
 			$value = (isset($_POST["options_".$key]) ? $_POST["options_".$key] : $object->array_options["options_".$key]);
-		}
-		else {
+		} else {
 			$value = $object->array_options["options_".$key];
 			//var_dump($key.' - '.$value);
 		}
@@ -112,8 +111,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 			print $extrafields->showSeparator($key, $object);
 
 			$lastseparatorkeyfound = $key;
-		}
-		else {
+		} else {
 			print '<tr class="trextrafields_collapse'.$extrafields_collapse_num;
 			/*if ($extrafields_collapse_num && $extrafields_collapse_num_old && $extrafields_collapse_num != $extrafields_collapse_num_old) {
 				print ' trextrafields_collapse_new';
@@ -189,8 +187,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 				print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Modify')).'">';
 
 				print '</form>';
-			}
-			else {
+			} else {
 				//var_dump($key.'-'.$value.'-'.$object->table_element);
 				print $extrafields->showOutputField($key, $value, '', $object->table_element);
 			}
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index 46790c28209..7ebc718cb25 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -77,8 +77,7 @@ if ($permtoadd)
 	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey ? '&website='.$websitekey : '').($pageid ? '&pageid='.$pageid : '').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
     print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
     print '</a>';
-}
-else {
+} else {
     print '<a href="#" class="inline-block valignmiddle toolbarbutton" title="'.$langs->trans("NotAllowed").'">';
     print '<img class="toolbarbutton disabled" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
     print '</a>';
@@ -115,8 +114,7 @@ if ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
     $formfile = new FormFile($db);
     $formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section ? $section : -1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir);
-}
-else print '&nbsp;';
+} else print '&nbsp;';
 
 print '</div>';
 // End "Add new file" area
@@ -176,8 +174,7 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
 	    if ($action == 'deletefile') print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
 
 	    print '</td></tr>';
-    }
-    else // Show filtree when ajax is disabled (rare)
+    } else // Show filtree when ajax is disabled (rare)
     {
         print '<tr><td style="padding-left: 20px">';
 
diff --git a/htdocs/core/tpl/list_print_total.tpl.php b/htdocs/core/tpl/list_print_total.tpl.php
index f4f6974ac08..2cd485a9510 100644
--- a/htdocs/core/tpl/list_print_total.tpl.php
+++ b/htdocs/core/tpl/list_print_total.tpl.php
@@ -20,8 +20,7 @@ if (isset($totalarray['pos']))
 			{
 				if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
 				else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
-			}
-			else print '<td></td>';
+			} else print '<td></td>';
 		}
 	}
 	print '</tr>';
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index e0245175768..a4a8908f374 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -165,8 +165,7 @@ if (!empty($morelogincontent)) {
 				echo $option;
 			}
 		}
-	}
-	else {
+	} else {
 		echo '<!-- Option by hook -->';
 		echo $morelogincontent;
 	}
@@ -329,8 +328,7 @@ if (!empty($morelogincontent) && is_array($morelogincontent)) {
 			echo $option."\n";
 		}
 	}
-}
-elseif (!empty($moreloginextracontent)) {
+} elseif (!empty($moreloginextracontent)) {
 	echo '<!-- Javascript by hook -->';
 	echo $moreloginextracontent;
 }
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index c507144b151..900d0366d87 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -98,8 +98,7 @@ if ($massaction == 'presend')
 			$fuser = new User($db);
 			$fuser->fetch($thirdpartyid);
 			$liste['thirdparty'] = $fuser->getFullName($langs)." &lt;".$fuser->email."&gt;";
-		}
-		else {
+		} else {
 			$soc = new Societe($db);
 			$soc->fetch($thirdpartyid);
 			foreach ($soc->thirdparty_and_contact_email_array(1) as $key => $value) {
@@ -157,8 +156,7 @@ if ($massaction == 'presend')
 		print img_warning().' '.$langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
 		print ' - <a href="javascript: window.history.go(-1)">'.$langs->trans("GoBack").'</a>';
 		$arrayofmassactions = array();
-	}
-	else {
+	} else {
 		print $formmail->get_form();
 	}
 
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index 28eb78fa61b..8d1f7256ab2 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -57,17 +57,7 @@ if (!empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES))
 }
 
 // Special cases
-if ($module == 'propal') { $permission = $user->rights->propale->creer; }
-elseif ($module == 'supplier_proposal') { $permission = $user->rights->supplier_proposal->creer; }
-elseif ($module == 'fichinter') { $permission = $user->rights->ficheinter->creer; }
-elseif ($module == 'project') { $permission = $user->rights->projet->creer; }
-elseif ($module == 'project_task') { $permission = $user->rights->projet->creer; }
-elseif ($module == 'invoice_supplier') { $permission = $user->rights->fournisseur->facture->creer; }
-elseif ($module == 'order_supplier') { $permission = $user->rights->fournisseur->commande->creer; }
-elseif ($module == 'societe') { $permission = $user->rights->societe->creer; }
-elseif ($module == 'contact') { $permission = $user->rights->societe->creer; }
-elseif ($module == 'shipping') { $permission = $user->rights->expedition->creer; }
-elseif ($module == 'product') { $permission = $user->rights->produit->creer; }
+if ($module == 'propal') { $permission = $user->rights->propale->creer; } elseif ($module == 'supplier_proposal') { $permission = $user->rights->supplier_proposal->creer; } elseif ($module == 'fichinter') { $permission = $user->rights->ficheinter->creer; } elseif ($module == 'project') { $permission = $user->rights->projet->creer; } elseif ($module == 'project_task') { $permission = $user->rights->projet->creer; } elseif ($module == 'invoice_supplier') { $permission = $user->rights->fournisseur->facture->creer; } elseif ($module == 'order_supplier') { $permission = $user->rights->fournisseur->commande->creer; } elseif ($module == 'societe') { $permission = $user->rights->societe->creer; } elseif ($module == 'contact') { $permission = $user->rights->societe->creer; } elseif ($module == 'shipping') { $permission = $user->rights->expedition->creer; } elseif ($module == 'product') { $permission = $user->rights->produit->creer; }
 //else dol_print_error('','Bad value '.$module.' for param module');
 
 if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) $typeofdata = 'ckeditor:dolibarr_notes:100%:200::1:12:95%:0'; // Rem: This var is for all notes, not only thirdparties note.
diff --git a/htdocs/core/tpl/object_discounts.tpl.php b/htdocs/core/tpl/object_discounts.tpl.php
index 10db8476bef..e3e921c20c5 100644
--- a/htdocs/core/tpl/object_discounts.tpl.php
+++ b/htdocs/core/tpl/object_discounts.tpl.php
@@ -42,8 +42,7 @@ if ($fixedDiscount > 0)
 {
 	$translationKey = (!empty($discount_type)) ? 'HasRelativeDiscountFromSupplier' : 'CompanyHasRelativeDiscount';
 	print $langs->trans($translationKey, $fixedDiscount).'.';
-}
-else {
+} else {
 	$translationKey = (!empty($discount_type)) ? 'HasNoRelativeDiscountFromSupplier' : 'CompanyHasNoRelativeDiscount';
 	print $langs->trans($translationKey).'.';
 }
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index baa57c7d1c9..06fe9a6ec72 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -60,26 +60,19 @@ if (!empty($extrafields))
 {
 	if ($this->table_element_line == 'commandedet') {
 		$objectline = new OrderLine($this->db);
-	}
-	elseif ($this->table_element_line == 'propaldet') {
+	} elseif ($this->table_element_line == 'propaldet') {
 		$objectline = new PropaleLigne($this->db);
-	}
-	elseif ($this->table_element_line == 'supplier_proposaldet') {
+	} elseif ($this->table_element_line == 'supplier_proposaldet') {
 		$objectline = new SupplierProposalLine($this->db);
-	}
-	elseif ($this->table_element_line == 'facturedet') {
+	} elseif ($this->table_element_line == 'facturedet') {
 		$objectline = new FactureLigne($this->db);
-	}
-	elseif ($this->table_element_line == 'contratdet') {
+	} elseif ($this->table_element_line == 'contratdet') {
 		$objectline = new ContratLigne($this->db);
-	}
-	elseif ($this->table_element_line == 'commande_fournisseurdet') {
+	} elseif ($this->table_element_line == 'commande_fournisseurdet') {
 		$objectline = new CommandeFournisseurLigne($this->db);
-	}
-	elseif ($this->table_element_line == 'facture_fourn_det') {
+	} elseif ($this->table_element_line == 'facture_fourn_det') {
 		$objectline = new SupplierInvoiceLine($this->db);
-	}
-	elseif ($this->table_element_line == 'facturedet_rec') {
+	} elseif ($this->table_element_line == 'facturedet_rec') {
 		$objectline = new FactureLigneRec($this->db);
 	}
 }
@@ -131,8 +124,7 @@ if ($nolinesbefore) {
 		{
 			if (empty($user->rights->margins->creer)) {
 				$colspan++;
-			}
-			else {
+			} else {
 				print '<td class="margininfos linecolmargin1 right">';
 				if ($conf->global->MARGIN_TYPE == "1")
 					echo $langs->trans('BuyingPrice');
@@ -185,8 +177,7 @@ if ($nolinesbefore) {
 				echo $langs->trans("FreeLineOfType");
 				echo '</label>';
 				echo ' ';
-			}
-			else {
+			} else {
 				echo '<input type="hidden" id="prod_entry_mode_free" name="prod_entry_mode" value="free">';
 				// Show type selector
 				if ($forceall >= 0)
@@ -211,8 +202,7 @@ if ($nolinesbefore) {
 				if (!empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToSell');
 				elseif ((empty($conf->product->enabled) && !empty($conf->service->enabled)) || ($object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))) echo $langs->trans('PredefinedServicesToSell');
 				else echo $langs->trans('PredefinedProductsAndServicesToSell');
-			}
-			else {
+			} else {
 				if (!empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToPurchase');
 				elseif (empty($conf->product->enabled) && !empty($conf->service->enabled)) echo $langs->trans('PredefinedServicesToPurchase');
 				else echo $langs->trans('PredefinedProductsAndServicesToPurchase');
@@ -228,8 +218,7 @@ if ($nolinesbefore) {
 				{
 					// hide products in closed warehouse, but show products for internal transfer
 					$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
-				}
-				else {
+				} else {
 					$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOST('combinations', 'array'));
 				}
 				if (!empty($conf->global->MAIN_AUTO_OPEN_SELECT2_ON_FOCUS_FOR_CUSTOMER_PRODUCTS))
@@ -250,8 +239,7 @@ if ($nolinesbefore) {
 				</script>
 					<?php
 				}
-			}
-			else {
+			} else {
 				// $senderissupplier=2 is the same as 1 but disables test on minimum qty and disable autofill qty with minimum
 				if ($senderissupplier != 2)
 				{
@@ -261,8 +249,7 @@ if ($nolinesbefore) {
 					'warning' => $langs->trans("NoPriceDefinedForThisSupplier") // translation of an error saved into var 'warning' (for example shown we select a disabled option into combo)
 					);
 					$alsoproductwithnosupplierprice = 0;
-				}
-				else {
+				} else {
 					$ajaxoptions = array(
 					'update' => array('remise_percent' => 'discount')			// html id tags that will be edited with each ajax json response key
 					);
@@ -442,8 +429,7 @@ if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dat
 		print $form->selectDate($date_start, "date_start", $usehm, $usehm, 1, "addproduct");
 		print ' &nbsp; '.$langs->trans("DateEndPlanned").' ';
 		print $form->selectDate($date_end, "date_end", $usehm, $usehm, 1, "addproduct");
-	}
-	else {
+	} else {
 		print $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
 		print $form->selectDate($date_start, 'date_start', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, 1, "addproduct", 1, 0);
 		print ' '.$langs->trans('to').' ';
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 8957021d359..ba63288b58f 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -233,8 +233,7 @@ $coldisplay++;
 					echo '<td class="right nowrap margininfos">'.$margin_rate.'<span class="hideonsmartphone">%</span></td>';
 				else echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
 				$coldisplay++;
-			}
-			elseif (!empty($conf->global->DISPLAY_MARK_RATES))
+			} elseif (!empty($conf->global->DISPLAY_MARK_RATES))
 			{
 				$mark_rate = (isset($_POST["np_markRate"]) ?GETPOST("np_markRate", 'alpha', 2) : price($line->marque_tx));
 				// if credit note, dont allow to modify margin
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 34f78ae7fcc..1e90b04fba7 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -89,8 +89,7 @@ if (($line->info_bits & 2) == 2) {
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
-		}
-		elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)
+		} elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)
 		{
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
@@ -98,32 +97,27 @@ if (($line->info_bits & 2) == 2) {
 			// Add date of deposit
 			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE))
 			    print ' ('.dol_print_date($discount->datec).')';
-		}
-		elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
+		} elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
 		{
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
-		}
-		elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
+		} elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
 		{
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
-		}
-		else {
+		} else {
 			print ($txt ? ' - ' : '').dol_htmlentitiesbr($line->description);
 		}
 	}
-}
-else {
+} else {
 	$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE ? 'dayhour' : 'day';
 
     if ($line->fk_product > 0)
 	{
 		print $form->textwithtooltip($text, $description, 3, '', '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
-	}
-	else {
+	} else {
 		$type = (!empty($line->product_type) ? $line->product_type : $line->fk_product_type);
 		if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
 		else $text = img_object($langs->trans('Product'), 'product');
@@ -136,8 +130,7 @@ else {
 			if (preg_match('/^\(DEPOSIT\)/', $line->description)) {
 				$newdesc = preg_replace('/^\(DEPOSIT\)/', $langs->trans("Deposit"), $line->description);
 				print $text.' '.dol_htmlentitiesbr($newdesc);
-			}
-			else {
+			} else {
 				print $text.' '.dol_htmlentitiesbr($line->description);
 			}
 		}
@@ -150,8 +143,7 @@ else {
 		if ($line->date_start_fill && $line->date_end_fill) print ' - ';
 		if ($line->date_end_fill) print $langs->trans('AutoFillDateToShort').': '.yn($line->date_end_fill);
 		if ($line->date_start_fill || $line->date_end_fill) print '</div>';
-	}
-	else {
+	} else {
 		if ($line->date_start || $line->date_end) print '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
 		//print get_date_range($line->date_start, $line->date_end, $format);
 	}
@@ -174,8 +166,7 @@ if ($user->rights->fournisseur->lire && $line->fk_fournprice > 0)
 	if ($user->rights->produit->creer || $user->rights->service->creer) // change required right here
 	{
 		print $productfourn->getNomUrl();
-	}
-	else {
+	} else {
 		print $productfourn->ref_supplier;
 	}
 }
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 63ff6a8a0a7..ad62ad43686 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -120,8 +120,7 @@ if (!empty($morelogincontent)) {
 				echo $option;
 			}
 		}
-	}
-	else {
+	} else {
 		echo '<!-- Option by hook -->';
 		echo $morelogincontent;
 	}
@@ -214,8 +213,7 @@ if (!empty($morelogincontent)) {
 			echo $option."\n";
 		}
 	}
-}
-elseif (!empty($moreloginextracontent)) {
+} elseif (!empty($moreloginextracontent)) {
 	echo '<!-- Javascript by hook -->';
 	echo $moreloginextracontent;
 }
diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index 3e92af33a4d..50eb0167f36 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -49,8 +49,7 @@ if ((array) $linked_resources && count($linked_resources) > 0)
 			print '<div class="tagtd center">'.$form->selectyesno('mandatory', $linked_resource['mandatory'] ? 1 : 0, 1).'</div>';
 			print '<div class="tagtd right"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div>';
 			print '</div>';
-		}
-		else {
+		} else {
 			$class = '';
 			if ($linked_resource['rowid'] == GETPOST('lineid'))
 				$class = 'highlight';
@@ -86,8 +85,7 @@ if ((array) $linked_resources && count($linked_resources) > 0)
 			print '</div>';
 		}
 	}
-}
-else {
+} else {
 	print '<div class="tagtr oddeven">';
 	print '<div class="tagtd opacitymedium">'.$langs->trans('NoResourceLinked').'</div>';
 	print '<div class="tagtd opacitymedium"></div>';
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index 591939c6156..4f368f95473 100644
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -106,8 +106,7 @@ class InterfaceLogevents extends DolibarrTriggers
             // Initialisation donnees (date,duree,texte,desc)
             $text = $langs->transnoentities("NewUserCreated", $object->login);
             $desc = $langs->transnoentities("NewUserCreated", $object->login);
-		}
-        elseif ($action == 'USER_MODIFY')
+		} elseif ($action == 'USER_MODIFY')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -115,8 +114,7 @@ class InterfaceLogevents extends DolibarrTriggers
             // Initialisation donnees (date,duree,texte,desc)
             $text = $langs->transnoentities("EventUserModified", $object->login);
             $desc = $langs->transnoentities("EventUserModified", $object->login);
-        }
-        elseif ($action == 'USER_NEW_PASSWORD')
+        } elseif ($action == 'USER_NEW_PASSWORD')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -124,8 +122,7 @@ class InterfaceLogevents extends DolibarrTriggers
             // Initialisation donnees (date,duree,texte,desc)
             $text = $langs->transnoentities("NewUserPassword", $object->login);
             $desc = $langs->transnoentities("NewUserPassword", $object->login);
-        }
-        elseif ($action == 'USER_ENABLEDISABLE')
+        } elseif ($action == 'USER_ENABLEDISABLE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -140,8 +137,7 @@ class InterfaceLogevents extends DolibarrTriggers
 				$text = $langs->transnoentities("UserDisabled", $object->login);
 				$desc = $langs->transnoentities("UserDisabled", $object->login);
 			}
-        }
-        elseif ($action == 'USER_DELETE')
+        } elseif ($action == 'USER_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -158,16 +154,14 @@ class InterfaceLogevents extends DolibarrTriggers
             // Initialisation donnees (date,duree,texte,desc)
             $text = $langs->transnoentities("NewGroupCreated", $object->name);
             $desc = $langs->transnoentities("NewGroupCreated", $object->name);
-		}
-        elseif ($action == 'USERGROUP_MODIFY')
+		} elseif ($action == 'USERGROUP_MODIFY')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
             // Initialisation donnees (date,duree,texte,desc)
             $text = $langs->transnoentities("GroupModified", $object->name);
             $desc = $langs->transnoentities("GroupModified", $object->name);
-		}
-        elseif ($action == 'USERGROUP_DELETE')
+		} elseif ($action == 'USERGROUP_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -202,8 +196,7 @@ class InterfaceLogevents extends DolibarrTriggers
         if ($result > 0)
         {
             return 1;
-        }
-        else {
+        } else {
             $error = "Failed to insert security event: ".$event->error;
             $this->errors[] = $error;
             $this->error = $error;
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 46a5df282d2..2807a3b5a56 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -96,8 +96,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			$object->sendtoid = 0;
 			$object->socid = $object->id;
-        }
-        elseif ($action == 'COMPANY_SENTBYMAIL')
+        } elseif ($action == 'COMPANY_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -106,8 +105,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		}
-        elseif ($action == 'CONTRACT_VALIDATE')
+		} elseif ($action == 'CONTRACT_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "contracts"));
@@ -116,8 +114,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("ContractValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
             $object->sendtoid = 0;
-		}
-		elseif ($action == 'CONTRACT_SENTBYMAIL')
+		} elseif ($action == 'CONTRACT_SENTBYMAIL')
 		{
 			// Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "contracts"));
@@ -130,8 +127,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPAL_VALIDATE')
+		} elseif ($action == 'PROPAL_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "propal"));
@@ -140,8 +136,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
-		}
-        elseif ($action == 'PROPAL_SENTBYMAIL')
+		} elseif ($action == 'PROPAL_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "propal"));
@@ -154,8 +149,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPAL_CLOSE_SIGNED')
+		} elseif ($action == 'PROPAL_CLOSE_SIGNED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "propal"));
@@ -164,8 +158,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'PROPAL_CLASSIFY_BILLED')
+		} elseif ($action == 'PROPAL_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "propal"));
@@ -174,8 +167,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("PropalClassifiedBilledInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'PROPAL_CLOSE_REFUSED')
+		} elseif ($action == 'PROPAL_CLOSE_REFUSED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "propal"));
@@ -184,8 +176,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_VALIDATE')
+		} elseif ($action == 'ORDER_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "orders"));
@@ -194,8 +185,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_CLOSE')
+		} elseif ($action == 'ORDER_CLOSE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -204,8 +194,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("OrderDeliveredInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_CLASSIFY_BILLED')
+		} elseif ($action == 'ORDER_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -214,8 +203,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("OrderBilledInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_CANCEL')
+		} elseif ($action == 'ORDER_CANCEL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -224,8 +212,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SENTBYMAIL')
+		} elseif ($action == 'ORDER_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -238,8 +225,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		}
-		elseif ($action == 'BILL_VALIDATE')
+		} elseif ($action == 'BILL_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills"));
@@ -248,8 +234,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'BILL_UNVALIDATE')
+		} elseif ($action == 'BILL_UNVALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills"));
@@ -258,8 +243,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-        elseif ($action == 'BILL_SENTBYMAIL')
+		} elseif ($action == 'BILL_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills"));
@@ -272,8 +256,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		}
-		elseif ($action == 'BILL_PAYED')
+		} elseif ($action == 'BILL_PAYED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills"));
@@ -283,8 +266,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
 
             $object->sendtoid = 0;
-		}
-		elseif ($action == 'BILL_CANCEL')
+		} elseif ($action == 'BILL_CANCEL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills"));
@@ -293,8 +275,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
 
             $object->sendtoid = 0;
-		}
-		elseif ($action == 'FICHINTER_CREATE')
+		} elseif ($action == 'FICHINTER_CREATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "interventions"));
@@ -305,8 +286,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->sendtoid = 0;
 			$object->fk_element = 0;
 			$object->elementtype = '';
-		}
-		elseif ($action == 'FICHINTER_VALIDATE')
+		} elseif ($action == 'FICHINTER_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "interventions"));
@@ -317,8 +297,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->sendtoid = 0;
 			$object->fk_element = 0;
 			$object->elementtype = '';
-		}
-		elseif ($action == 'FICHINTER_MODIFY')
+		} elseif ($action == 'FICHINTER_MODIFY')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "interventions"));
@@ -329,8 +308,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->sendtoid = 0;
 			$object->fk_element = 0;
 			$object->elementtype = '';
-		}
-		elseif ($action == 'FICHINTER_SENTBYMAIL')
+		} elseif ($action == 'FICHINTER_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "interventions"));
@@ -343,8 +321,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-        }
-        elseif ($action == 'FICHINTER_CLASSIFY_BILLED')
+        } elseif ($action == 'FICHINTER_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "interventions"));
@@ -353,8 +330,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
            	$object->actionmsg = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
 
             $object->sendtoid = 0;
-        }
-	    elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED')
+        } elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "interventions"));
@@ -363,8 +339,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
            	$object->actionmsg = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
 
             $object->sendtoid = 0;
-        }
-        elseif ($action == 'FICHINTER_DELETE')
+        } elseif ($action == 'FICHINTER_DELETE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "interventions"));
@@ -375,8 +350,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->sendtoid = 0;
 			$object->fk_element = 0;
 			$object->elementtype = '';
-		}
-        elseif ($action == 'SHIPPING_VALIDATE')
+		} elseif ($action == 'SHIPPING_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "sendings"));
@@ -389,8 +363,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
         	// Parameters $object->sendtoid defined by caller
         	//$object->sendtoid=0;
-        }
-		elseif ($action == 'SHIPPING_SENTBYMAIL')
+        } elseif ($action == 'SHIPPING_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "sendings"));
@@ -417,8 +390,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
         	// Parameters $object->sendtoid defined by caller
         	//$object->sendtoid=0;
-        }
-		elseif ($action == 'RECEPTION_SENTBYMAIL')
+        } elseif ($action == 'RECEPTION_SENTBYMAIL')
         {
             $langs->load("agenda");
             $langs->load("other");
@@ -432,8 +404,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPOSAL_SUPPLIER_VALIDATE')
+		} elseif ($action == 'PROPOSAL_SUPPLIER_VALIDATE')
 		{
 			// Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "propal"));
@@ -442,8 +413,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'PROPOSAL_SUPPLIER_SENTBYMAIL')
+		} elseif ($action == 'PROPOSAL_SUPPLIER_SENTBYMAIL')
 		{
 			// Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "propal"));
@@ -456,8 +426,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_SIGNED')
+		} elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_SIGNED')
 		{
 			// Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "propal"));
@@ -466,8 +435,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_REFUSED')
+		} elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_REFUSED')
 		{
 			// Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "propal"));
@@ -476,8 +444,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_CREATE')
+		} elseif ($action == 'ORDER_SUPPLIER_CREATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -486,8 +453,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
             $object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_VALIDATE')
+		} elseif ($action == 'ORDER_SUPPLIER_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -496,8 +462,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
             $object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_APPROVE')
+		} elseif ($action == 'ORDER_SUPPLIER_APPROVE')
 		{
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -506,8 +471,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("OrderApprovedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_REFUSE')
+		} elseif ($action == 'ORDER_SUPPLIER_REFUSE')
 		{
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -516,8 +480,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_SUBMIT')
+		} elseif ($action == 'ORDER_SUPPLIER_SUBMIT')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -526,8 +489,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
             $object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_RECEIVE')
+		} elseif ($action == 'ORDER_SUPPLIER_RECEIVE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -536,8 +498,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
             $object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
+		} elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills", "orders"));
@@ -550,8 +511,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-        }
-		elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED')
+        } elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills", "orders"));
@@ -563,8 +523,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             }
 
             $object->sendtoid = 0;
-        }
-		elseif ($action == 'BILL_SUPPLIER_VALIDATE')
+        } elseif ($action == 'BILL_SUPPLIER_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills"));
@@ -573,8 +532,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
             $object->sendtoid = 0;
-		}
-		elseif ($action == 'BILL_SUPPLIER_UNVALIDATE')
+		} elseif ($action == 'BILL_SUPPLIER_UNVALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills"));
@@ -583,8 +541,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
 
             $object->sendtoid = 0;
-		}
-        elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL')
+		} elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills", "orders"));
@@ -597,8 +554,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-        }
-		elseif ($action == 'BILL_SUPPLIER_PAYED')
+        } elseif ($action == 'BILL_SUPPLIER_PAYED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills"));
@@ -607,8 +563,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'BILL_SUPPLIER_CANCELED')
+		} elseif ($action == 'BILL_SUPPLIER_CANCELED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills"));
@@ -631,8 +586,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
 			$object->sendtoid = 0;
-        }
-		elseif ($action == 'MEMBER_MODIFY')
+        } elseif ($action == 'MEMBER_MODIFY')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "members"));
@@ -643,8 +597,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
             $object->sendtoid = 0;
-		}
-        elseif ($action == 'MEMBER_SUBSCRIPTION_CREATE')
+		} elseif ($action == 'MEMBER_SUBSCRIPTION_CREATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "members"));
@@ -666,8 +619,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			$object->sendtoid = 0;
 			if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
-        }
-        elseif ($action == 'MEMBER_SUBSCRIPTION_MODIFY')
+        } elseif ($action == 'MEMBER_SUBSCRIPTION_MODIFY')
         {
         	// Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "members"));
@@ -689,8 +641,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
         	$object->sendtoid = 0;
         	if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
-        }
-        elseif ($action == 'MEMBER_SUBSCRIPTION_DELETE')
+        } elseif ($action == 'MEMBER_SUBSCRIPTION_DELETE')
         {
         	// Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "members"));
@@ -704,8 +655,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
         	$object->sendtoid = 0;
         	if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
-        }
-        elseif ($action == 'MEMBER_RESILIATE')
+        } elseif ($action == 'MEMBER_RESILIATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "members"));
@@ -716,8 +666,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
 			$object->sendtoid = 0;
-        }
-        elseif ($action == 'MEMBER_DELETE')
+        } elseif ($action == 'MEMBER_DELETE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "members"));
@@ -741,8 +690,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         	$object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
 
         	$object->sendtoid = 0;
-        }
-        elseif ($action == 'PROJECT_VALIDATE')
+        } elseif ($action == 'PROJECT_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "projects"));
@@ -752,8 +700,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
 
             $object->sendtoid = 0;
-        }
-        elseif ($action == 'PROJECT_MODIFY')
+        } elseif ($action == 'PROJECT_MODIFY')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "projects"));
@@ -776,8 +723,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'TASK_MODIFY')
+		} elseif ($action == 'TASK_MODIFY')
 		{
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "projects"));
@@ -787,8 +733,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'TASK_DELETE')
+		} elseif ($action == 'TASK_DELETE')
 		{
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "projects"));
@@ -798,8 +743,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'TICKET_ASSIGNED')
+		} elseif ($action == 'TICKET_ASSIGNED')
 		{
 		    // Load translation files required by the page
 		    $langs->loadLangs(array("agenda", "other", "projects"));
@@ -811,8 +755,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		        $tmpuser = new User($this->db);
 		        $tmpuser->fetch($object->oldcopy->fk_user_assign);
 		        $object->actionmsg .= "\n".$langs->transnoentities("OldUser").': '.$tmpuser->getFullName($langs);
-		    }
-		    else {
+		    } else {
 		        $object->actionmsg .= "\n".$langs->transnoentities("OldUser").': '.$langs->trans("None");
 		    }
 		    if ($object->fk_user_assign > 0)
@@ -820,8 +763,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		        $tmpuser = new User($this->db);
 		        $tmpuser->fetch($object->fk_user_assign);
 		        $object->actionmsg .= "\n".$langs->transnoentities("NewUser").': '.$tmpuser->getFullName($langs);
-		    }
-		    else {
+		    } else {
 		        $object->actionmsg .= "\n".$langs->transnoentities("NewUser").': '.$langs->trans("None");
 		    }
 		    $object->sendtoid = 0;
@@ -864,8 +806,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         if (is_array($object->sendtoid))
         {
             if (count($object->sendtoid) == 1) $contactforaction->fetch(reset($object->sendtoid));
-        }
-        else {
+        } else {
             if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
         }
         // Set societeforaction.
@@ -948,8 +889,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		{
 			$_SESSION['LAST_ACTION_CREATED'] = $ret;
 			return 1;
-		}
-		else {
+		} else {
             $this->error = "Failed to insert event : ".$actioncomm->error." ".join(',', $actioncomm->errors);
             $this->errors = $actioncomm->errors;
 
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 7740191c94b..19eab2e5974 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -93,8 +93,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 			elseif ($action == 'CASHCONTROL_VALIDATE')
 			{
 				$amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
-			}
-			else $amounts = (double) $object->total_ttc;
+			} else $amounts = (double) $object->total_ttc;
 		}
 		/*if ($action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
 		 || $action === 'BILL_SUPPLIER_PAYED' || $action === 'BILL_SUPPLIER_UNPAYED')
@@ -112,8 +111,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 					$amounts += price2num($amount);
 				}
 			}
-		}
-		elseif (strpos($action, 'PAYMENT') !== false && !in_array($action, array('PAYMENT_ADD_TO_BANK')))
+		} elseif (strpos($action, 'PAYMENT') !== false && !in_array($action, array('PAYMENT_ADD_TO_BANK')))
 		{
 			$qualified++;
 			$amounts = (double) $object->amount;
@@ -142,8 +140,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 			$this->error = $b->error;
 			$this->errors = $b->errors;
 			return -1;
-		}
-		else {
+		} else {
 			return 1;
 		}
     }
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 8b8c392615a..9c3987cbeb1 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -91,8 +91,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USER_MODIFY')
+		} elseif ($action == 'USER_MODIFY')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -130,8 +129,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USER_NEW_PASSWORD')
+		} elseif ($action == 'USER_NEW_PASSWORD')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -167,12 +165,10 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USER_ENABLEDISABLE')
+		} elseif ($action == 'USER_ENABLEDISABLE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-		}
-		elseif ($action == 'USER_DELETE')
+		} elseif ($action == 'USER_DELETE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -190,8 +186,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USER_SETINGROUP')
+		} elseif ($action == 'USER_SETINGROUP')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -228,8 +223,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USER_REMOVEFROMGROUP')
+		} elseif ($action == 'USER_REMOVEFROMGROUP')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -292,8 +286,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USERGROUP_MODIFY')
+		} elseif ($action == 'USERGROUP_MODIFY')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -329,8 +322,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USERGROUP_DELETE')
+		} elseif ($action == 'USERGROUP_DELETE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -369,8 +361,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'CONTACT_MODIFY')
+		} elseif ($action == 'CONTACT_MODIFY')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_CONTACT_ACTIVE))
@@ -406,8 +397,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'CONTACT_DELETE')
+		} elseif ($action == 'CONTACT_DELETE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_CONTACT_ACTIVE))
@@ -475,8 +465,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'MEMBER_VALIDATE')
+		} elseif ($action == 'MEMBER_VALIDATE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -499,8 +488,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_SUBSCRIPTION')
+		} elseif ($action == 'MEMBER_SUBSCRIPTION')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -527,8 +515,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_MODIFY')
+		} elseif ($action == 'MEMBER_MODIFY')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -626,8 +613,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$this->errors[] = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_NEW_PASSWORD')
+		} elseif ($action == 'MEMBER_NEW_PASSWORD')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -653,8 +639,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					}
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_RESILIATE')
+		} elseif ($action == 'MEMBER_RESILIATE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -680,8 +665,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					}
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_DELETE')
+		} elseif ($action == 'MEMBER_DELETE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -764,8 +748,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$this->errors[] = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_TYPE_MODIFY')
+		} elseif ($action == 'MEMBER_TYPE_MODIFY')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
@@ -807,8 +790,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$this->errors[] = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_TYPE_DELETE')
+		} elseif ($action == 'MEMBER_TYPE_DELETE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
diff --git a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
index ce9e156883d..59005b2f34d 100644
--- a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
@@ -71,14 +71,12 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
     			$this->error = $object->context['linkto']->error;
     			$this->errors = $object->context['linkto']->errors;
     			$return = -1;
-    		}
-			else {
+    		} else {
 				$return = 1;
 			}
 
         	return $return;
-        }
-        elseif ($action == 'CATEGORY_UNLINK')
+        } elseif ($action == 'CATEGORY_UNLINK')
         {
         	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -88,8 +86,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
         		$this->error = $object->context['unlinkoff']->error;
         		$this->errors = $object->context['unlinkoff']->errors;
         		$return = -1;
-        	}
-        	else {
+        	} else {
         		$return = 1;
         	}
 
@@ -107,14 +104,12 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
                 $this->errors = $object->errors;
                 if (!empty($object->error)) $this->errors[] = $object->error;
                 $return = -1;
-            }
-            else {
+            } else {
                 $return = 1;
             }
 
             return $return;
-        }
-        elseif ($action == 'MEMBER_MODIFY')
+        } elseif ($action == 'MEMBER_MODIFY')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -129,8 +124,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
                         $this->errors = $object->oldcopy->errors;
                         if (!empty($object->oldcopy->error)) $this->errors[] = $object->oldcopy->error;
                         $return = -1;
-                    }
-                    else {
+                    } else {
                         $return = 1;
                     }
                 }
@@ -140,15 +134,13 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
                     $this->errors = $object->errors;
                     if (!empty($object->error)) $this->errors[] = $object->error;
                     $return = -1;
-                }
-                else {
+                } else {
                     $return = 1;
                 }
             }
 
 			return $return;
-        }
-        elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE')
+        } elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -159,8 +151,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 				$this->errors = $object->errors;
 				if (!empty($object->error)) $this->errors[] = $object->error;
 				$return = -1;
-			}
-			else {
+			} else {
 				$return = 1;
 			}
 
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index 760a2101087..a7157ea866a 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -140,8 +140,7 @@ class InterfaceNotification extends DolibarrTriggers
 
 				$i++;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return $ret;
 	}
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index b3625c09e47..3b915dee032 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -170,8 +170,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 						}
 
 						$ok = 1;
-					}
-					else {
+					} else {
 						$this->error = $userstat->error;
 						$this->errors = $userstat->errors;
 					}
diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index 303f4a523ad..5c0f17dd90d 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -177,8 +177,7 @@ class InterfaceStripe extends DolibarrTriggers
 										//$taxids = $customer->allTaxIds($customer->id);
 										$customer->createTaxId($customer->id, array('type'=>'eu_vat', 'value'=>$vatcleaned));
 									}
-								}
-								else {
+								} else {
 									$taxids = $customer->allTaxIds($customer->id);
 									if (is_array($taxids->data))
 									{
@@ -192,8 +191,7 @@ class InterfaceStripe extends DolibarrTriggers
 
 							// Update Customer on Stripe
 							$customer->save();
-						}
-						catch (Exception $e)
+						} catch (Exception $e)
 						{
 						    //var_dump(\Stripe\Stripe::getApiVersion());
 							$this->errors[] = $e->getMessage();
@@ -213,8 +211,7 @@ class InterfaceStripe extends DolibarrTriggers
 			{
 				try {
 					$customer->delete();
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					dol_syslog("Failed to delete Stripe customer ".$e->getMessage(), LOG_WARNING);
 				}
@@ -253,8 +250,7 @@ class InterfaceStripe extends DolibarrTriggers
 							$card->metadata = array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']));
 							try {
 								$card->save();
-							}
-							catch (Exception $e)
+							} catch (Exception $e)
 							{
 								$ok = -1;
 								$this->error = $e->getMessages();
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 4ac9d00ca53..00379c36329 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -117,8 +117,7 @@ if ($_SERVER['PHP_SELF'] != DOL_URL_ROOT.'/website/index.php')	// If we browsing
 					if (defined('USEDOLIBARRSERVER')) {
 						header("Location: ".DOL_URL_ROOT.'/public/website/index.php?website='.$websitekey.'&pageid='.$newpageid.'&l='.GETPOST('l', 'aZ09'));
 						exit;
-					}
-					else {
+					} else {
 						$newpageref = $obj->pageurl;
 						header("Location: ".$newpageref.'.php?l='.GETPOST('l', 'aZ09'));
 						exit;
diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php
index fe5b015214a..55a205bffd8 100644
--- a/htdocs/cron/admin/cron.php
+++ b/htdocs/cron/admin/cron.php
@@ -50,8 +50,7 @@ if (!empty($actionsave))
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -95,8 +94,7 @@ if (empty($conf->global->CRON_DISABLE_KEY_CHANGE))
     print '<input type="text" class="flat minwidth200"'.$disabled.' id="CRON_KEY" name="CRON_KEY" value="'.(GETPOST('CRON_KEY') ?GETPOST('CRON_KEY') : (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '')).'">';
     if (!empty($conf->use_javascript_ajax))
     	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
-}
-else {
+} else {
     print (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '');
     print '<input type="hidden" id="CRON_KEY" name="CRON_KEY" value="'.(GETPOST('CRON_KEY') ?GETPOST('CRON_KEY') : (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '')).'">';
 }
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 0d2455ae620..461c78efbdb 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -65,14 +65,12 @@ if (!empty($cancel))
     if (!empty($id) && empty($backtourl))
 	{
 		$action = '';
-	}
-	else {
+	} else {
 	    if ($backtourl)
 	    {
 	        header("Location: ".$backtourl);
 	        exit;
-	    }
-	    else {
+	    } else {
 	        header("Location: ".DOL_URL_ROOT.'/cron/list.php');
 		    exit;
 	    }
@@ -88,8 +86,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->del
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit';
-	}
-	else {
+	} else {
 		Header("Location: ".DOL_URL_ROOT.'/cron/list.php');
 		exit;
 	}
@@ -102,8 +99,7 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
     {
         setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
         $action = '';
-    }
-    else {
+    } else {
         $now = dol_now(); // Date we start
 
     	$result = $object->run_jobs($user->login);
@@ -112,16 +108,14 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
     	{
     		setEventMessages($object->error, $object->errors, 'errors');
     		$action = '';
-    	}
-    	else {
+    	} else {
     		$res = $object->reprogram_jobs($user->login, $now);
     		if ($res > 0)
     		{
     			if ($object->lastresult > 0) setEventMessages($langs->trans("JobFinished"), null, 'warnings');
     			else setEventMessages($langs->trans("JobFinished"), null, 'mesgs');
     			$action = '';
-    		}
-    		else {
+    		} else {
     			setEventMessages($object->error, $object->errors, 'errors');
     			$action = '';
     		}
@@ -157,8 +151,7 @@ if ($action == 'add')
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'create';
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans('CronSaveSucess'), null, 'mesgs');
 		$action = '';
 	}
@@ -193,8 +186,7 @@ if ($action == 'update')
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit';
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans('CronSaveSucess'), null, 'mesgs');
 		$action = '';
 	}
@@ -211,8 +203,7 @@ if ($action == 'activate')
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit';
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans('CronSaveSucess'), null, 'mesgs');
 		$action = '';
 	}
@@ -230,8 +221,7 @@ if ($action == 'inactive')
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit';
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans('CronSaveSucess'), null, 'mesgs');
 		$action = '';
 	}
@@ -251,8 +241,7 @@ llxHeader('', $langs->trans("CronTask"));
 if ($action == 'edit' || empty($action) || $action == 'delete' || $action == 'execute')
 {
 	$head = cron_prepare_head($object);
-}
-elseif ($action == 'create')
+} elseif ($action == 'create')
 {
 	print load_fiche_titre($langs->trans("CronTask"), '', 'title_setup');
 }
@@ -409,8 +398,7 @@ if (($action == "create") || ($action == "edit"))
 	    if ($object->frequency == $i)
 	    {
 	        print "<option value='".$i."' selected>".$i."</option>";
-	    }
-	    else {
+	    } else {
 	        print "<option value='".$i."'>".$i."</option>";
 	    }
 	}
@@ -419,8 +407,7 @@ if (($action == "create") || ($action == "edit"))
 	if ($object->unitfrequency == "60")
 	{
 	    $input .= ' checked />';
-	}
-	else {
+	} else {
 	    $input .= ' />';
 	}
 	$input .= "<label for=\"frequency_minute\">".$langs->trans('Minutes')."</label>";
@@ -429,8 +416,7 @@ if (($action == "create") || ($action == "edit"))
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"3600\" id=\"frequency_heures\" ";
 	if ($object->unitfrequency == "3600") {
 	    $input .= ' checked />';
-	}
-	else {
+	} else {
 	    $input .= ' />';
 	}
 	$input .= "<label for=\"frequency_heures\">".$langs->trans('Hours')."</label>";
@@ -439,8 +425,7 @@ if (($action == "create") || ($action == "edit"))
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"86400\" id=\"frequency_jours\" ";
 	if ($object->unitfrequency == "86400") {
 	    $input .= ' checked />';
-	}
-	else {
+	} else {
 	    $input .= ' />';
 	}
 	$input .= "<label for=\"frequency_jours\">".$langs->trans('Days')."</label>";
@@ -449,8 +434,7 @@ if (($action == "create") || ($action == "edit"))
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"604800\" id=\"frequency_semaine\" ";
 	if ($object->unitfrequency == "604800") {
 	    $input .= ' checked />';
-	}
-	else {
+	} else {
 	    $input .= ' />';
 	}
 	$input .= "<label for=\"frequency_semaine\">".$langs->trans('Weeks')."</label>";
@@ -465,8 +449,7 @@ if (($action == "create") || ($action == "edit"))
 	if (!empty($object->datestart))
 	{
         print $form->selectDate($object->datestart, 'datestart', 1, 1, '', "cronform");
-	}
-	else {
+	} else {
         print $form->selectDate('', 'datestart', 1, 1, '', "cronform");
 	}
 	print "</td>";
@@ -478,8 +461,7 @@ if (($action == "create") || ($action == "edit"))
 	print $langs->trans('CronDtEnd')."</td><td>";
 	if (!empty($object->dateend)) {
         print $form->selectDate($object->dateend, 'dateend', 1, 1, '', "cronform");
-	}
-	else {
+	} else {
         print $form->selectDate(-1, 'dateend', 1, 1, 1, "cronform");
 	}
 	print "</td>";
@@ -518,8 +500,7 @@ if (($action == "create") || ($action == "edit"))
 	if (!empty($object->datenextrun))
 	{
         print $form->selectDate($object->datenextrun, 'datenextrun', 1, 1, '', "cronform");
-	}
-	else {
+	} else {
         print $form->selectDate(-1, 'datenextrun', 1, 1, '', "cronform");
 	}
 	print "</td>";
@@ -538,8 +519,7 @@ if (($action == "create") || ($action == "edit"))
 	print "</div>";
 
 	print "</form>\n";
-}
-else {
+} else {
 	/*
 	 * view card
 	 */
@@ -611,8 +591,7 @@ else {
 		if (!$object->entity)
 		{
 			print $langs->trans("AllEntities");
-		}
-		else {
+		} else {
 			$mc->getInfo($object->entity);
 			print $mc->label;
 		}
@@ -670,8 +649,7 @@ else {
 	print ' ('.$langs->trans('CronFrom').')';
 	print "</td><td>";
 	if (!$object->status) print $langs->trans("Disabled");
-	elseif (!empty($object->datenextrun)) { print img_picto('', 'object_calendarday').' '.dol_print_date($object->datenextrun, 'dayhoursec'); }
-	else { print $langs->trans('CronNone'); }
+	elseif (!empty($object->datenextrun)) { print img_picto('', 'object_calendarday').' '.dol_print_date($object->datenextrun, 'dayhoursec'); } else { print $langs->trans('CronNone'); }
 	if ($object->status == Cronjob::STATUS_ENABLED)
 	{
 		if ($object->maxrun && $object->nbrun >= $object->maxrun) print img_warning($langs->trans("MaxRunReached"));
@@ -726,12 +704,10 @@ else {
 	if ((empty($user->rights->cron->execute)))
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronExecute").'</a>';
-	}
-	elseif (empty($object->status))
+	} elseif (empty($object->status))
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("JobDisabled")).'">'.$langs->trans("CronExecute").'</a>';
-	}
-	else {
+	} else {
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=execute&id='.$object->id.(empty($conf->global->CRON_KEY) ? '' : '&securitykey='.$conf->global->CRON_KEY).'">'.$langs->trans("CronExecute").'</a>';
 	}
 
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index f3c02c72cbb..47347cce82d 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -279,8 +279,7 @@ class Cronjob extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -376,8 +375,7 @@ class Cronjob extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -515,8 +513,7 @@ class Cronjob extends CommonObject
     		$this->db->free($resql);
 
     		return 1;
-    	}
-    	else {
+    	} else {
     		$this->error = "Error ".$this->db->lasterror();
     		return -1;
     	}
@@ -651,8 +648,7 @@ class Cronjob extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -692,8 +688,7 @@ class Cronjob extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -747,8 +742,7 @@ class Cronjob extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -842,8 +836,7 @@ class Cronjob extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -888,8 +881,7 @@ class Cronjob extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -944,8 +936,7 @@ class Cronjob extends CommonObject
 			dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
 			$conf->entity = $savcurrententity;
 			return -1;
-		}
-		else {
+		} else {
 			if (empty($user->id))
 			{
 				$this->error = " User user login:".$userlogin." do not exists";
@@ -1048,8 +1039,7 @@ class Cronjob extends CommonObject
 				if (!is_array($params_arr))
 				{
 					$result = call_user_func(array($object, $this->methodename), $this->params);
-				}
-				else {
+				} else {
 					$result = call_user_func_array(array($object, $this->methodename), $params_arr);
 				}
 
@@ -1069,8 +1059,7 @@ class Cronjob extends CommonObject
 					$this->lastresult = is_numeric($result) ? $result : -1;
 		            $retval = $this->lastresult;
 		            $error++;
-				}
-				else {
+				} else {
 					dol_syslog(get_class($this)."::run_jobs END");
 				    $this->lastoutput = $object->output;
 					$this->lastresult = var_export($result, true);
@@ -1106,8 +1095,7 @@ class Cronjob extends CommonObject
 			if (!is_array($params_arr))
 			{
 				$result = call_user_func($this->methodename, $this->params);
-			}
-			else {
+			} else {
 				$result = call_user_func_array($this->methodename, $params_arr);
 			}
 
@@ -1120,8 +1108,7 @@ class Cronjob extends CommonObject
 			    $this->lastresult = is_numeric($result) ? $result : -1;
 			    $retval = $this->lastresult;
 			    $error++;
-			}
-			else {
+			} else {
                 $this->lastoutput = var_export($result, true);
                 $this->lastresult = var_export($result, true); // Return code
                 $retval = $this->lastresult;
@@ -1189,8 +1176,7 @@ class Cronjob extends CommonObject
 			$this->error = "User Error : ".$user->error;
 			dol_syslog(get_class($this)."::reprogram_jobs ".$this->error, LOG_ERR);
 			return -1;
-		}
-		else {
+		} else {
 			if (empty($user->id))
 			{
 				$this->error = " User user login:".$userlogin." do not exists";
@@ -1216,8 +1202,7 @@ class Cronjob extends CommonObject
 
 		        // TODO For exact frequency (every month, every year, ...), use instead a dol_time_plus_duree($time, $duration_value, $duration_unit)
 		    }
-		}
-		else {
+		} else {
 			//$this->datenextrun=$this->datenextrun + ($this->frequency * $this->unitfrequency);
 		    dol_syslog(get_class($this)."::reprogram_jobs datenextrun is already in future, we do not change it");
 		}
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index a91dd4b9d66..45c938da7bf 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -132,8 +132,7 @@ if (empty($reshook))
 	    {
 	        setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
 	        $action = '';
-	    }
-	    else {
+	    } else {
 	        $object = new Cronjob($db);
 	    	$job = $object->fetch($id);
 
@@ -154,8 +153,7 @@ if (empty($reshook))
 	    		    else setEventMessages($langs->trans("JobFinished"), null, 'errors');
 	    		}
 	    		$action = '';
-	    	}
-	    	else {
+	    	} else {
 	    		setEventMessages($object->error, $object->errors, 'errors');
 	    		$action = '';
 	    	}
@@ -194,8 +192,7 @@ if (empty($reshook))
 				elseif ($massaction == 'enable') $result = $tmpcron->setStatut(Cronjob::STATUS_ENABLED);
 				//else dol_print_error($db, 'Bad value for massaction');
 				if ($result < 0) setEventMessages($tmpcron->error, $tmpcron->errors, 'errors');
-			}
-			else {
+			} else {
 				$error++;
 			}
 		}
@@ -441,8 +438,7 @@ if ($num > 0)
 			$object->ref = $langs->trans($obj->label);
 			print $object->getNomUrl(0, '', 1);
 			$object->ref = $obj->rowid;
-		}
-		else {
+		} else {
 			//print $langs->trans('CronNone');
 		}
 		print '</td>';
@@ -462,8 +458,7 @@ if ($num > 0)
 			$texttoshow .= $langs->trans('CronMethod').': '.$obj->methodename;
 			$texttoshow .= '<br>'.$langs->trans('CronArgs').': '.$obj->params;
 			$texttoshow .= '<br>'.$langs->trans('Comment').': '.$langs->trans($obj->note);
-		}
-		elseif ($obj->jobtype == 'command')
+		} elseif ($obj->jobtype == 'command')
 		{
 			$text = $langs->trans('CronCommand');
 			$texttoshow = $langs->trans('CronCommand').': '.dol_trunc($obj->command);
@@ -582,8 +577,7 @@ if ($num > 0)
 
 		$i++;
 	}
-}
-else {
+} else {
 	print '<tr><td colspan="9" class="opacitymedium">'.$langs->trans('CronNoJobs').'</td></tr>';
 }
 
diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php
index ba93638455e..40446392596 100644
--- a/htdocs/datapolicy/class/datapolicycron.class.php
+++ b/htdocs/datapolicy/class/datapolicycron.class.php
@@ -505,8 +505,7 @@ class DataPolicyCron
 	                                	$error++;
 	                                }
 	                            }
-                            }
-                            else {
+                            } else {
                             	$errormsg = $object->error;
                             	$error++;
                             }
@@ -537,8 +536,7 @@ class DataPolicyCron
         if (!$error)
         {
         	$this->output = $nbupdated.' record updated, '.$nbdeleted.' record deleted';
-        }
-        else {
+        } else {
         	$this->error = $errormsg;
         }
 
diff --git a/htdocs/dav/dav.class.php b/htdocs/dav/dav.class.php
index 673c42e27a0..195f8e800a7 100644
--- a/htdocs/dav/dav.class.php
+++ b/htdocs/dav/dav.class.php
@@ -88,8 +88,7 @@ class CdavLib
 					LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = sc.fk_soc)
 					LEFT JOIN '.MAIN_DB_PREFIX.'socpeople AS sp ON (sp.fk_soc = sc.fk_soc AND sp.rowid = a.fk_contact)
 					LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_cdav AS ac ON (a.id = ac.fk_object)';
-		}
-		else {
+		} else {
 			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = a.fk_soc)
 					LEFT JOIN '.MAIN_DB_PREFIX.'socpeople AS sp ON (sp.rowid = a.fk_contact)
 					LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_cdav AS ac ON (a.id = ac.fk_object)';
@@ -104,8 +103,7 @@ class CdavLib
 			if ($ouri === false)
 			{
 				$sql .= ' AND a.id = '.intval($oid);
-			}
-			else {
+			} else {
 				$sql .= ' AND (a.id = '.intval($oid).' OR ac.uuidext = \''.$this->db->escape($ouri).'\')';
 			}
 		}
@@ -185,19 +183,16 @@ class CdavLib
 				if (trim($obj->datep2) != '')
 					$caldata .= "DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep2) + 1)."\n";
 				else $caldata .= "DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep) + (25 * 3600))."\n";
-			}
-			elseif (trim($obj->datep2) != '')
+			} elseif (trim($obj->datep2) != '')
 				$caldata .= "DUE;VALUE=DATE:".date('Ymd', strtotime($obj->datep2) + 1)."\n";
-		}
-		else {
+		} else {
 			$caldata .= "DTSTART;TZID=".$timezone.":".strtr($obj->datep, array(" "=>"T", ":"=>"", "-"=>""))."\n";
 			if ($type == 'VEVENT')
 			{
 				if (trim($obj->datep2) != '')
 					$caldata .= "DTEND;TZID=".$timezone.":".strtr($obj->datep2, array(" "=>"T", ":"=>"", "-"=>""))."\n";
 				else $caldata .= "DTEND;TZID=".$timezone.":".strtr($obj->datep, array(" "=>"T", ":"=>"", "-"=>""))."\n";
-			}
-			elseif (trim($obj->datep2) != '')
+			} elseif (trim($obj->datep2) != '')
 				$caldata .= "DUE;TZID=".$timezone.":".strtr($obj->datep2, array(" "=>"T", ":"=>"", "-"=>""))."\n";
 		}
 		$caldata .= "CLASS:PUBLIC\n";
@@ -275,8 +270,7 @@ class CdavLib
 						'size' => strlen($calendardata),
 						'component' => strpos($calendardata, 'BEGIN:VEVENT') > 0 ? 'vevent' : 'vtodo',
 					);
-				}
-				else {
+				} else {
 					$calevents[] = array(
 						// 'calendardata' => $calendardata,  not necessary because etag+size are present
 						'uri' => $obj->id.'-ev-'.constant('CDAV_URI_KEY'),
diff --git a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
index 03d91fff140..1ff336a16b8 100644
--- a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
@@ -77,8 +77,7 @@ class DolLogsCollector extends MessagesCollector
 		if ($uselogfile)
 		{
     		$this->getStorageLogs($this->path);
-		}
-		else {
+		} else {
     	    $log_levels = $this->getLevels();
 
     	    foreach ($conf->logbuffer as $line) {
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index 514d79dcd77..5c0d8fc8576 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -70,13 +70,11 @@ if ($action == 'specimen')
         {
             header("Location: ".DOL_URL_ROOT."/document.php?modulepart=donation&file=SPECIMEN.html");
             return;
-        }
-        else {
+        } else {
             setEventMessages($obj->error, $obj->errors, 'errors');
             dol_syslog($obj->error, LOG_ERR);
         }
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
         dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -104,9 +102,7 @@ elseif ($action == 'setdoc')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -127,8 +123,7 @@ if ($action == 'set_DONATION_ACCOUNTINGACCOUNT')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -144,8 +139,7 @@ if ($action == 'set_DONATION_MESSAGE')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -160,8 +154,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -173,8 +166,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -216,8 +208,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -268,14 +259,12 @@ if (is_resource($handle))
 						print "<td class=\"center\">\n";
 						print img_picto($langs->trans("Enabled"), 'switch_on');
 						print '</td>';
-					}
-					else {
+					} else {
 						print "<td class=\"center\">\n";
 						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 						print '</td>';
 					}
-				}
-				else {
+				} else {
 					print "<td class=\"center\">\n";
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 					print "</td>";
@@ -287,8 +276,7 @@ if (is_resource($handle))
 					print "<td class=\"center\">";
 					print img_picto($langs->trans("Default"), 'on');
 					print '</td>';
-				}
-				else {
+				} else {
 					print "<td class=\"center\">";
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 					print '</td>';
@@ -360,8 +348,7 @@ print '<td class="center">';
 if (!empty($conf->accounting->enabled))
 {
 	print $formaccounting->select_account($conf->global->DONATION_ACCOUNTINGACCOUNT, 'DONATION_ACCOUNTINGACCOUNT', 1, '', 1, 1);
-}
-else {
+} else {
 	print '<input type="text" size="10" id="DONATION_ACCOUNTINGACCOUNT" name="DONATION_ACCOUNTINGACCOUNT" value="'.$conf->global->DONATION_ACCOUNTINGACCOUNT.'">';
 }
 print '</td><td class="center">';
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 7af11d46ebf..90498568d6e 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -180,8 +180,7 @@ if ($action == 'add')
 		{
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$res);
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -194,8 +193,7 @@ if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights-
     {
         header("Location: index.php");
         exit;
-    }
-    else {
+    } else {
         dol_syslog($object->error, LOG_DEBUG);
         setEventMessages($object->error, $object->errors, 'errors');
     }
@@ -209,8 +207,7 @@ if ($action == 'valid_promesse')
 
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 		exit;
-	}
-    else {
+	} else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -221,8 +218,7 @@ if ($action == 'set_cancel')
     {
         header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
         exit;
-    }
-    else {
+    } else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -233,12 +229,10 @@ if ($action == 'set_paid')
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 		exit;
-	}
-    else {
+	} else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
-}
-elseif ($action == 'classin' && $user->rights->don->creer)
+} elseif ($action == 'classin' && $user->rights->don->creer)
 {
 	$object->fetch($id);
 	$object->setProject($projectid);
@@ -352,8 +346,7 @@ if ($action == 'create')
 			}
 			print ')';
 			print '</td>';
-		}
-		else {
+		} else {
 			print '<td colspan="2">';
 			print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 			// Option to reload page to retrieve customer informations. Note, this clear other input
@@ -516,8 +509,7 @@ if (!empty($id) && $action == 'edit')
 	if ($object->statut == 0)
 	{
 		print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.price($object->amount).'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
-	}
-	else {
+	} else {
 		print '<tr><td>'.$langs->trans("Amount").'</td><td>';
 		print price($object->amount, 0, $langs, 0, 0, -1, $conf->currency);
 		print '</td></tr>';
@@ -772,8 +764,7 @@ if (!empty($id) && $action != 'edit')
 		}
 		print "</table>";
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
@@ -809,8 +800,7 @@ if (!empty($id) && $action != 'edit')
 		if ($remaintopay == 0)
 		{
 			print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPayment').'</span></div>';
-		}
-		else {
+		} else {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/don/payment/payment.php?rowid='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a></div>';
 		}
 	}
@@ -827,12 +817,10 @@ if (!empty($id) && $action != 'edit')
 		if ($object->statut == -1 || $object->statut == 0)
 		{
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete">'.$langs->trans("Delete")."</a></div>";
-		}
-		else {
+		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
 		}
-	}
-	else {
+	} else {
 		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
 	}
 
diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index 69bd1e58042..5d35b24707f 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -157,8 +157,7 @@ class Donations extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve donation list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -230,8 +229,7 @@ class Donations extends DolibarrApi
         if ($this->don->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else {
+        } else {
         	throw new RestException(500, $this->don->error);
         }
     }
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index f80feff1869..6b6cbb3d36e 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -314,8 +314,7 @@ class Don extends CommonObject
             {
             	$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Amount'));
                 $err++;
-            }
-            else {
+            } else {
                 if ($this->amount < $minimum && $minimum > 0)
                 {
                 	$error_string[] = $langs->trans('MinimumAmount', $langs->transnoentitiesnoconv('$minimum'));
@@ -328,8 +327,7 @@ class Don extends CommonObject
         {
             $this->errors = $error_string;
             return 0;
-        }
-        else {
+        } else {
             return 1;
         }
     }
@@ -420,8 +418,7 @@ class Don extends CommonObject
                 if ($result < 0) { $error++; }
                 // End call triggers
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             $this->errno = $this->db->lasterrno();
             $error++;
@@ -449,8 +446,7 @@ class Don extends CommonObject
         {
             $this->db->commit();
             return $ret;
-        }
-        else {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -529,13 +525,11 @@ class Don extends CommonObject
             {
                 $this->db->commit();
                 $result = 1;
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 $result = -1;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->error;
             $this->db->rollback();
@@ -606,8 +600,7 @@ class Don extends CommonObject
     	{
             $this->db->commit();
             return 1;
-        }
-        else {
+        } else {
         	foreach ($this->errors as $errmsg)
         	{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
@@ -645,8 +638,7 @@ class Don extends CommonObject
         if (!empty($id))
         {
         	$sql .= " AND d.rowid=".$id;
-        }
-        elseif (!empty($ref))
+        } elseif (!empty($ref))
         {
         	$sql .= " AND d.ref='".$this->db->escape($ref)."'";
         }
@@ -701,8 +693,7 @@ class Don extends CommonObject
                 $this->fetch_optionals();
             }
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -753,8 +744,7 @@ class Don extends CommonObject
             		// End call triggers
             	}
             }
-        }
-        else {
+        } else {
             $error++;
             $this->error = $this->db->lasterror();
         }
@@ -763,8 +753,7 @@ class Don extends CommonObject
         {
         	$this->db->commit();
         	return 1;
-        }
-        else {
+        } else {
         	$this->db->rollback();
         	return -1;
         }
@@ -794,12 +783,10 @@ class Don extends CommonObject
             if ($this->db->affected_rows($resql))
             {
                 return 1;
-            }
-            else {
+            } else {
                 return 0;
             }
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -823,12 +810,10 @@ class Don extends CommonObject
             if ($this->db->affected_rows($resql))
             {
                 return 1;
-            }
-            else {
+            } else {
                 return 0;
             }
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -890,8 +875,7 @@ class Don extends CommonObject
             }
             $this->db->free($resql);
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -975,8 +959,7 @@ class Don extends CommonObject
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -1072,15 +1055,13 @@ class Don extends CommonObject
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 				dol_delete_preview($object);
 				return 1;
-			}
-			else {
+			} else {
 				$outputlangs->charset_output = $sav_charset_output;
 				dol_syslog("Erreur dans don_create");
 				dol_print_error($this->db, $obj->error);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 			return 0;
 		}
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index 416884c3a24..e9a38c50bef 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -167,8 +167,7 @@ class PaymentDonation extends CommonObject
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_donation");
 				$this->ref = $this->id;
-			}
-			else {
+			} else {
 				$error++;
 			}
 		}
@@ -187,8 +186,7 @@ class PaymentDonation extends CommonObject
             $this->total = $totalamount; // deprecated
 		    $this->db->commit();
 			return $this->id;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -256,8 +254,7 @@ class PaymentDonation extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -338,8 +335,7 @@ class PaymentDonation extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -407,8 +403,7 @@ class PaymentDonation extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -461,8 +456,7 @@ class PaymentDonation extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -586,8 +580,7 @@ class PaymentDonation extends CommonObject
                         dol_print_error($this->db);
                     }
                 }
-            }
-            else {
+            } else {
                 $this->error = $acc->error;
                 $error++;
             }
@@ -596,8 +589,7 @@ class PaymentDonation extends CommonObject
         if (!$error)
         {
             return 1;
-        }
-        else {
+        } else {
             return -1;
         }
     }
@@ -620,8 +612,7 @@ class PaymentDonation extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return 0;
 		}
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 98884af9c6f..0d56ff5bd63 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -186,8 +186,7 @@ if ($object->id)
     $permtoedit = $user->rights->don->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index d8df1f910fc..030d61d03de 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -246,8 +246,7 @@ if ($resql)
         }
     }
     print "</table><br>";
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 print '</div></div></div>';
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 8c5ad9a36e0..cc12daabb6c 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -269,8 +269,7 @@ if ($resql)
 				$projectstatic->public = $objp->public;
 				$projectstatic->title = $objp->title;
 				print $projectstatic->getNomUrl(1);
-			}
-			else print '&nbsp;';
+			} else print '&nbsp;';
 			print "</td>\n";
 		}
 		print '<td class="right">'.price($objp->amount).'</td>';
@@ -283,8 +282,7 @@ if ($resql)
     print '</div>';
     print "</form>\n";
     $db->free($resql);
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 57d5fe160a0..6d1285b5f17 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -63,8 +63,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->don->supp
         $db->commit();
         header("Location: ".DOL_URL_ROOT."/don/index.php");
         exit;
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
 	}
@@ -100,8 +99,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->don->cree
 
 		header('Location: card.php?id='.$object->id);
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -251,8 +249,7 @@ if ($resql)
 
 	print "</table>\n";
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -286,8 +283,7 @@ if (empty($action))
 		if (!$disable_delete)
 		{
 			print '<a class="butActionDelete" href="card.php?id='.$_GET['id'].'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-		}
-		else {
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
 		}
 	}
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index 162193dc51d..50c469a5f1a 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -137,8 +137,7 @@ if ($action == 'add_payment')
                 $loc = DOL_URL_ROOT.'/don/card.php?rowid='.$chid;
                 header('Location: '.$loc);
                 exit;
-            }
-            else {
+            } else {
                 $db->rollback();
             }
         }
@@ -259,8 +258,7 @@ if ($action == 'create')
 		{
 			$namef = "amount_".$objp->id;
 			print '<input type="text" size="8" name="'.$namef.'">';
-		}
-		else {
+		} else {
 			print '-';
 		}
 		print "</td>";
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index 247656dc2ad..bda437fa6b5 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -75,8 +75,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else {
+} else {
     $filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
 }
 
@@ -284,8 +283,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     /*print $px2->show();
diff --git a/htdocs/ecm/ajax/ecmdatabase.php b/htdocs/ecm/ajax/ecmdatabase.php
index 91564ec8f80..5ba61c53a8d 100644
--- a/htdocs/ecm/ajax/ecmdatabase.php
+++ b/htdocs/ecm/ajax/ecmdatabase.php
@@ -114,13 +114,11 @@ if (isset($action) && !empty($action))
 						//print "Yes with id ".$parentdirisindatabase."<br>\n";
 						$fk_parent = $parentdirisindatabase;
 						//break;  // We found parent, we can stop the while loop
-					}
-					else {
+					} else {
 						dol_syslog("No");
 						//print "No<br>\n";
 					}
-				}
-				else {
+				} else {
 					dol_syslog("Parent is root");
 					$fk_parent = 0; // Parent is root
 				}
@@ -146,12 +144,10 @@ if (isset($action) && !empty($action))
 						$sqltree[] = $newdirsql; // We complete fulltree for following loops
 						//var_dump($sqltree);
 						$adirwascreated = 1;
-					}
-					else {
+					} else {
 						dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR);
 					}
-				}
-				else {
+				} else {
 					$txt = "Parent of ".$dirdesc['fullname']." not found";
 					dol_syslog($txt);
 					//print $txt."<br>\n";
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index fc450e9864e..9c09ee0f534 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -164,8 +164,7 @@ class EcmDirectory // extends CommonObject
 			$this->error = "ErrorDirAlreadyExists";
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
 			return -1;
-		}
-		else {
+		} else {
 			$this->db->begin();
 
 			// Insert request
@@ -206,13 +205,11 @@ class EcmDirectory // extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else {
+			} else {
 				$this->error = "Error ".$this->db->lasterror();
 				$this->db->rollback();
 				return -1;
@@ -270,8 +267,7 @@ class EcmDirectory // extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -298,8 +294,7 @@ class EcmDirectory // extends CommonObject
 		{
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
-		}
-		else {
+		} else {
 		    if (preg_match('/[0-9]+/', $value)) $this->cachenbofdoc = (int) $value;
 		    elseif ($value == '+') $this->cachenbofdoc++;
 		    elseif ($value == '-') $this->cachenbofdoc--;
@@ -353,8 +348,7 @@ class EcmDirectory // extends CommonObject
 			$this->db->free($resql);
 
 			return $obj ? 1 : 0;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -392,8 +386,7 @@ class EcmDirectory // extends CommonObject
 			$this->db->rollback();
 			$this->error = "Error ".$this->db->lasterror();
 			return -2;
-		}
-		else {
+		} else {
             // Call trigger
             $result = $this->call_trigger('MYECMDIR_DELETE', $user);
             if ($result < 0)
@@ -410,8 +403,7 @@ class EcmDirectory // extends CommonObject
 			if ($deletedirrecursive)
 			{
 				$result = @dol_delete_dir_recursive($file, 0, 0);
-			}
-			else {
+			} else {
 				$result = @dol_delete_dir($file, 0);
 			}
 		}
@@ -419,8 +411,7 @@ class EcmDirectory // extends CommonObject
 		if ($result || !@is_dir(dol_osencode($file)))
 		{
 			$this->db->commit();
-		}
-		else {
+		} else {
 			$this->error = 'ErrorFailToDeleteDir';
 			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 			$this->db->rollback();
@@ -520,8 +511,7 @@ class EcmDirectory // extends CommonObject
 				$idtosearch = $this->cats[$cursorindex]['id_mere'];
 				$i++;
 			}
-		}
-		while ($cursorindex >= 0 && !empty($idtosearch) && $i < 100); // i avoid infinite loop
+		} while ($cursorindex >= 0 && !empty($idtosearch) && $i < 100); // i avoid infinite loop
 
 		return $ret;
 	}
@@ -555,8 +545,7 @@ class EcmDirectory // extends CommonObject
 				$this->motherof[$obj->id_son] = $obj->id_parent;
 			}
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -662,16 +651,14 @@ class EcmDirectory // extends CommonObject
 						$newelempos = count($this->cats[$obj->rowid]['id_children']);
 						//print "this->cats[$i]['id_children'] est deja un tableau de $newelem elements<br>";
 						$this->cats[$obj->rowid]['id_children'][$newelempos] = $obj->rowid_fille;
-					}
-					else {
+					} else {
 						//print "this->cats[".$obj->rowid."]['id_children'] n'est pas encore un tableau<br>";
 						$this->cats[$obj->rowid]['id_children'] = array($obj->rowid_fille);
 					}
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -710,8 +697,7 @@ class EcmDirectory // extends CommonObject
             $this->cats[$id_categ]['fullrelativename'] .= '/'.$this->cats[$id_categ]['label'];
 			$this->cats[$id_categ]['fulllabel'] = $this->cats[$this->cats[$id_categ]['id_mere']]['fulllabel'];
 			$this->cats[$id_categ]['fulllabel'] .= ' >> '.$this->cats[$id_categ]['label'];
-		}
-		else {
+		} else {
 			$this->cats[$id_categ]['fullpath'] = '_'.$id_categ;
             $this->cats[$id_categ]['fullrelativename'] = $this->cats[$id_categ]['label'];
 			$this->cats[$id_categ]['fulllabel'] = $this->cats[$id_categ]['label'];
@@ -754,8 +740,7 @@ class EcmDirectory // extends CommonObject
 		if (empty($all))  // By default
 		{
 			$sql .= " WHERE rowid = ".$this->id;
-		}
-		else {
+		} else {
 			$sql .= " WHERE entity = ".$conf->entity;
 		}
 
@@ -765,8 +750,7 @@ class EcmDirectory // extends CommonObject
 		{
 			$this->cachenbofdoc = count($filelist);
 			return $this->cachenbofdoc;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -797,8 +781,7 @@ class EcmDirectory // extends CommonObject
             if (!empty($this->errors))
             {
                 $this->errors = array_merge($this->errors, $interface->errors);
-            }
-            else {
+            } else {
                 $this->errors = $interface->errors;
             }
         }
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index e24af560143..8006b864d87 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -182,8 +182,7 @@ class EcmFiles extends CommonObject
 		if (!empty($this->ref))
 		{
 			$ref = $this->ref;
-		}
-		else {
+		} else {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 			$ref = dol_hash($this->filepath.'/'.$this->filename, 3);
 		}
@@ -199,14 +198,12 @@ class EcmFiles extends CommonObject
 			{
 				$obj = $this->db->fetch_object($resql);
 				$maxposition = (int) $obj->maxposition;
-			}
-			else {
+			} else {
 				$this->errors[] = 'Error '.$this->db->lasterror();
 				return --$error;
 			}
 			$maxposition = $maxposition + 1;
-		}
-		else {
+		} else {
 			$maxposition = $this->position;
 		}
 
@@ -351,26 +348,21 @@ class EcmFiles extends CommonObject
 		if ($relativepath) {
 			$sql .= " AND t.filepath = '".$this->db->escape(dirname($relativepath))."' AND t.filename = '".$this->db->escape(basename($relativepath))."'";
 			$sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index
-		}
-		elseif (!empty($ref)) {		// hash of file path
+		} elseif (!empty($ref)) {		// hash of file path
 			$sql .= " AND t.ref = '".$this->db->escape($ref)."'";
 			$sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index
-		}
-		elseif (!empty($hashoffile)) {	// hash of content
+		} elseif (!empty($hashoffile)) {	// hash of content
 			$sql .= " AND t.label = '".$this->db->escape($hashoffile)."'";
 			$sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index
-		}
-		elseif (!empty($hashforshare)) {
+		} elseif (!empty($hashforshare)) {
 			$sql .= " AND t.share = '".$this->db->escape($hashforshare)."'";
 			//$sql .= " AND t.entity = ".$conf->entity;							// hashforshare already unique
-		}
-		elseif ($src_object_type && $src_object_id)
+		} elseif ($src_object_type && $src_object_id)
 		{
 			// Warning: May return several record, and only first one is returned !
 			$sql .= " AND t.src_object_type ='".$this->db->escape($src_object_type)."' AND t.src_object_id = ".$this->db->escape($src_object_id);
 			$sql .= " AND t.entity = ".$conf->entity;
-		}
-		else {
+		} else {
 			$sql .= ' AND t.rowid = '.$this->db->escape($id); // rowid already unique
 		}
 
@@ -787,8 +779,7 @@ class EcmFiles extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php
index e1e7bf40873..5c84cade8e4 100644
--- a/htdocs/ecm/class/htmlecm.form.class.php
+++ b/htdocs/ecm/class/htmlecm.form.class.php
@@ -69,8 +69,7 @@ class FormEcm
 		{
 			$cat = new EcmDirectory($this->db);
 			$cate_arbo = $cat->get_full_arbo();
-		}
-		elseif ($module == 'medias')
+		} elseif ($module == 'medias')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			$path = $conf->medias->multidir_output[$conf->entity];
@@ -89,8 +88,7 @@ class FormEcm
 					if ($selected && $valueforoption == $selected)
 					{
 						$add = 'selected ';
-					}
-					else {
+					} else {
 						$add = '';
 					}
 					$output .= '<option '.$add.'value="'.dol_escape_htmltag($valueforoption).'">'.(empty($cate_arbo[$key]['fulllabel']) ? $cate_arbo[$key]['relativename'] : $cate_arbo[$key]['fulllabel']).'</option>';
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index 9eb95c1f198..501999947c0 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -56,8 +56,7 @@ if (empty($urlsection)) $urlsection = 'misc';
 if ($module == 'ecm')
 {
 	$upload_dir = $conf->ecm->dir_output.'/'.$urlsection;
-}
-else // For example $module == 'medias'
+} else // For example $module == 'medias'
 {
 	$upload_dir = $conf->medias->multidir_output[$conf->entity];
 }
@@ -115,8 +114,7 @@ if ($action == 'add' && $permtoadd)
 		{
 			header("Location: ".$backtopage);
 			exit;
-		}
-		else {
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/ecm/index.php?action=file_manager'.($module ? '&module='.$module : ''));
 			exit;
 		}
@@ -154,8 +152,7 @@ if ($action == 'add' && $permtoadd)
 				setEventMessages($ecmdir->error, $ecmdir->errors, 'errors');
 				$action = 'create';
 			}
-		}
-		else // For example $module == 'medias'
+		} else // For example $module == 'medias'
 		{
 			$dirfornewdir = '';
 			if ($module == 'medias')
@@ -176,8 +173,7 @@ if ($action == 'add' && $permtoadd)
 				{
 					setEventMessages($langs->trans('ErrorFailToCreateDir', $label), null, 'errors');
 					$error++;
-				}
-				else {
+				} else {
 					setEventMessages($langs->trans("ECMSectionWasCreated", $label), null, 'mesgs');
 				}
 			}
@@ -190,8 +186,7 @@ if ($action == 'add' && $permtoadd)
 		{
 			header("Location: ".$backtopage);
 			exit;
-		}
-		else {
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/ecm/index.php?action=file_manager');
 			exit;
 		}
@@ -298,8 +293,7 @@ if (empty($action) || $action == 'delete_section')
 	if ($user->rights->ecm->setup)
 	{
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=delete_section">'.$langs->trans('Delete').'</a>';
-	}
-	else {
+	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
 	}
 	print '</div>';
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index 78b7d16bb5d..27d08e9119f 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -74,8 +74,7 @@ if ($module == 'ecm')
 
 	$relativepath = $ecmdir->getRelativePath();
 	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
-}
-else // For example $module == 'medias'
+} else // For example $module == 'medias'
 {
 	$relativepath = $section;
 	$upload_dir = $conf->medias->multidir_output[$conf->entity].'/'.$relativepath;
@@ -110,8 +109,7 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 		if (is_numeric($resupload) && $resupload > 0)
 		{
 			$result = $ecmdir->changeNbOfFiles('+');
-		}
-		else {
+		} else {
    			$langs->load("errors");
 			if ($resupload < 0)	// Unknown error
 			{
@@ -119,14 +117,12 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 			} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload)) {
 				// Files infected by a virus
 				setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
-			}
-			else // Known error
+			} else // Known error
 			{
 				setEventMessages($langs->trans($resupload), null, 'errors');
 			}
 		}
-	}
-	else {
+	} else {
 		// Failed transfer (exceeding the limit file?)
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFailToCreateDir", $upload_dir), null, 'errors');
@@ -165,13 +161,11 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes')
 			$langs->load('errors');
 			setEventMessages($langs->trans($ecmdir->error, $ecmdir->label), null, 'errors');
 		}
-	}
-	else {
+	} else {
 		if ($deletedirrecursive)
 		{
 			$resbool = dol_delete_dir_recursive($upload_dir, 0, 1);
-		}
-		else {
+		} else {
 			$resbool = dol_delete_dir($upload_dir, 1);
 		}
 		if ($resbool) $result = 1;
@@ -198,8 +192,7 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha'))
 		$oldlabel = $ecmdir->label;
 		$olddir = $ecmdir->getRelativePath(0);
 		$olddir = $conf->ecm->dir_output.'/'.$olddir;
-	}
-	else {
+	} else {
 		$olddir = GETPOST('section', 'alpha');
 		$olddir = $conf->medias->multidir_output[$conf->entity].'/'.$relativepath;
 	}
@@ -236,17 +229,14 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha'))
 				// Set new value after renaming
 				$relativepath = $ecmdir->getRelativePath();
 				$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
-			}
-			else {
+			} else {
 				$db->rollback();
 			}
-		}
-		else {
+		} else {
 			$db->rollback();
 			setEventMessages($ecmdir->error, $ecmdir->errors, 'errors');
 		}
-	}
-	else {
+	} else {
 		$newdir = $conf->medias->multidir_output[$conf->entity].'/'.GETPOST('oldrelparentdir', 'alpha').'/'.GETPOST('label', 'alpha');
 
 		$result = @rename($olddir, $newdir);
@@ -325,14 +315,12 @@ if ($module == 'ecm')
 		if ($i == 0 && $action == 'edit')
 		{
 			$s = '<input type="text" name="label" class="minwidth300" maxlength="32" value="'.$tmpecmdir->label.'">';
-		}
-		else $s = $tmpecmdir->getNomUrl(1).$s;
+		} else $s = $tmpecmdir->getNomUrl(1).$s;
 		if ($tmpecmdir->fk_parent)
 		{
 			$s = ' -> '.$s;
 			$result = $tmpecmdir->fetch($tmpecmdir->fk_parent);
-		}
-		else {
+		} else {
 			$tmpecmdir = 0;
 		}
 		$i++;
@@ -355,8 +343,7 @@ if ($module == 'medias')
 				$s .= '<input type="text" name="label" class="minwidth300" maxlength="32" value="'.$subdir.'">';
 				$s .= '<input type="hidden" name="oldrelparentdir" value="'.dirname($section).'">';
 				$s .= '<input type="hidden" name="oldreldir" value="'.basename($section).'">';
-			}
-			else $s .= $subdir;
+			} else $s .= $subdir;
 		}
 		if ($i < (count($subdirs) - 1))
 		{
@@ -387,8 +374,7 @@ if ($module == 'ecm')
 		print '<textarea class="flat quatrevingtpercent" name="description">';
 		print $ecmdir->description;
 		print '</textarea>';
-	}
-	else print dol_nl2br($ecmdir->description);
+	} else print dol_nl2br($ecmdir->description);
 	print '</td></tr>';
 
 	print '<tr><td class="titlefield">'.$langs->trans("ECMCreationUser").'</td><td>';
@@ -401,8 +387,7 @@ print '<tr><td class="titlefield">'.$langs->trans("ECMCreationDate").'</td><td>'
 if ($module == 'ecm')
 {
 	print dol_print_date($ecmdir->date_c, 'dayhour');
-}
-else {
+} else {
 	//var_dump($upload_dir);
 	print dol_print_date(dol_filemtime($upload_dir), 'dayhour');
 }
@@ -411,8 +396,7 @@ print '<tr><td>'.$langs->trans("ECMDirectoryForFiles").'</td><td>';
 if ($module == 'ecm')
 {
 	print '/ecm/'.$relativepath;
-}
-else {
+} else {
 	print '/'.$module.'/'.$relativepath;
 }
 print '</td></tr>';
@@ -465,8 +449,7 @@ if ($action != 'edit' && $action != 'delete')
 	if ($permtoadd)
 	{
 		print '<a class="butAction" href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create'.($module ? '&module='.$module : '').'&catParent='.$section.'">'.$langs->trans('ECMAddSection').'</a>';
-	}
-	else {
+	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('ECMAddSection').'</a>';
 	}
 
@@ -475,8 +458,7 @@ if ($action != 'edit' && $action != 'delete')
 	if ($permtoadd)
 	{
 		print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete_dir'.($module ? '&module='.$module : '').'&section='.$section.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.$langs->trans('Delete').'</a>';
-	}
-	else {
+	} else {
 		print '<a class="butActionDeleteRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
 	}
 	/*}
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index bddbd0f6294..9a4c86aba02 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -113,8 +113,7 @@ if ($cancel)
     {
         header("Location: ".$backtopage);
         exit;
-    }
-    else {
+    } else {
     	header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'&section='.urlencode($section).($module ? '&module='.urlencode($module) : ''));
         exit;
     }
@@ -169,8 +168,7 @@ if ($action == 'update')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 			$object->share = getRandomPassword(true);
-		}
-		else {
+		} else {
 			$object->share = '';
 		}
 
@@ -182,8 +180,7 @@ if ($action == 'update')
 			{
 				setEventMessages($object->error, $object->errors, 'warnings');
 			}
-		}
-		else {
+		} else {
 			// Call create to insert record
 			$object->entity = $conf->entity;
 			$object->filepath = preg_replace('/[\\/]+$/', '', $newdirrelativetodocument);
@@ -208,8 +205,7 @@ if ($action == 'update')
         $urlfile = $newlabel;
         header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'&section='.urlencode($section));
         exit;
-    }
-    else {
+    } else {
         $db->rollback();
     }
 }
@@ -253,8 +249,7 @@ while ($tmpecmdir && $result > 0)
 	{
 		$s = ' -> '.$s;
 		$result = $tmpecmdir->fetch($tmpecmdir->fk_parent);
-	}
-	else {
+	} else {
 		$tmpecmdir = 0;
 	}
 	$i++;
@@ -293,8 +288,7 @@ $object->fetch(0, '', $filepathtodocument);
 if (!empty($object->label))
 {
 	print $object->label;
-}
-else {
+} else {
 	print img_warning().' '.$langs->trans("FileNotYetIndexedInDatabase");
 }
 print '</td></tr>';
@@ -342,17 +336,14 @@ if (!empty($object->share))
 		if ($action != 'edit') print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
 		else print $fulllink;
 		if ($action != 'edit') print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>'; // No target here
-	}
-	else {
+	} else {
 		print '<input type="checkbox" name="shareenabled"'.($object->share ? ' checked="checked"' : '').' /> ';
 	}
-}
-else {
+} else {
 	if ($action != 'edit')
 	{
 		print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
-	}
-	else {
+	} else {
 		print '<input type="checkbox" name="shareenabled"'.($object->share ? ' checked="checked"' : '').' /> ';
 	}
 }
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 09350d2b245..adb1df99ab5 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -101,8 +101,7 @@ if (GETPOST("sendit", 'none') && !empty($conf->global->MAIN_UPLOAD_DOC))
 			$error++;
 			if ($_FILES['userfile']['error'][$key] == 1 || $_FILES['userfile']['error'][$key] == 2) {
 				setEventMessages($langs->trans('ErrorFileSizeTooLarge'), null, 'errors');
-			}
-			else {
+			} else {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
 			}
 		}
@@ -135,8 +134,7 @@ if ($action == 'confirm_deletefile')
 		{
 			setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile', 'alpha')), null, 'mesgs');
 			$result = $ecmdir->changeNbOfFiles('-');
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile', 'alpha')), null, 'errors');
 		}
 
@@ -157,8 +155,7 @@ if ($action == 'add' && $user->rights->ecm->setup)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages('Error '.$langs->trans($ecmdir->error), null, 'errors');
 		$action = "create";
 	}
@@ -244,13 +241,11 @@ if ($action == 'refreshmanual')
                     //print "Yes with id ".$parentdirisindatabase."<br>\n";
                     $fk_parent = $parentdirisindatabase;
                     //break;  // We found parent, we can stop the while loop
-                }
-                else {
+                } else {
                     dol_syslog("No");
                     //print "No<br>\n";
                 }
-            }
-            else {
+            } else {
                 dol_syslog("Parent is root");
                 $fk_parent = 0; // Parent is root
             }
@@ -276,12 +271,10 @@ if ($action == 'refreshmanual')
                     $sqltree[] = $newdirsql; // We complete fulltree for following loops
                     //var_dump($sqltree);
                     $adirwascreated = 1;
-                }
-                else {
+                } else {
                     dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR);
                 }
-            }
-            else {
+            } else {
                 $txt = "Parent of ".$dirdesc['fullname']." not found";
                 dol_syslog($txt);
                 //print $txt."<br>\n";
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 9b8c82ca05e..c9a8e1dc551 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -102,8 +102,7 @@ if ($action == 'add' && $user->rights->ecm->setup)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages('Error '.$langs->trans($ecmdir->error), null, 'errors');
 		$action = "create";
 	}
@@ -126,8 +125,7 @@ if ($action == 'confirm_deletefile')
 	    		exit;
 	    	}
 	    	$relativepath = $ecmdir->getRelativePath();
-    	}
-    	else $relativepath = '';
+    	} else $relativepath = '';
     	$upload_dir = $conf->ecm->dir_output.($relativepath ? '/'.$relativepath : '');
     	$file = $upload_dir."/".GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_POST are already decoded by PHP).
 
@@ -220,13 +218,11 @@ if ($action == 'refreshmanual')
                     //print "Yes with id ".$parentdirisindatabase."<br>\n";
                     $fk_parent = $parentdirisindatabase;
                     //break;  // We found parent, we can stop the while loop
-                }
-                else {
+                } else {
                     dol_syslog("No");
                     //print "No<br>\n";
                 }
-            }
-            else {
+            } else {
                 dol_syslog("Parent is root");
                 $fk_parent = 0; // Parent is root
             }
@@ -252,12 +248,10 @@ if ($action == 'refreshmanual')
                     $sqltree[] = $newdirsql; // We complete fulltree for following loops
                     //var_dump($sqltree);
                     $adirwascreated = 1;
-                }
-                else {
+                } else {
                     dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR);
                 }
-            }
-            else {
+            } else {
                 $txt = "Parent of ".$dirdesc['fullname']." not found";
                 dol_syslog($txt);
                 //print $txt."<br>\n";
@@ -414,8 +408,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 			    print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
 			    print $val['label'];
    			    print '</a>';
-			}
-			else {
+			} else {
 			    print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
 			    print $val['label'];
 			    print '</a>';
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 1cbd01d39e8..55bd07d7789 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -478,8 +478,7 @@ class EmailCollector extends CommonObject
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $linkstart = '<a href="'.$url.'"';
         $linkstart .= $linkclose.'>';
@@ -585,8 +584,7 @@ class EmailCollector extends CommonObject
             }
 
             $this->db->free($result);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -628,8 +626,7 @@ class EmailCollector extends CommonObject
                 $i++;
             }
             $this->db->free($resql);
-        }
-        else dol_print_error($this->db);
+        } else dol_print_error($this->db);
 
         return 1;
     }
@@ -660,8 +657,7 @@ class EmailCollector extends CommonObject
                 $i++;
             }
             $this->db->free($resql);
-        }
-        else dol_print_error($this->db);
+        } else dol_print_error($this->db);
     }
 
 
@@ -712,8 +708,7 @@ class EmailCollector extends CommonObject
 	    		$this->error = "error: is not possible to encode this string '".$str."'";
 	     		return false;
 	    	}
-    	}
-    	else {
+    	} else {
     		return $str;
     	}
     }
@@ -771,8 +766,7 @@ class EmailCollector extends CommonObject
             {
                 $tmpclass = $tmparray[0];
                 $tmpproperty = $tmparray[1];
-            }
-            else {
+            } else {
                 $tmpproperty = $tmparray[0];
             }
             if ($tmpclass && ($tmpclass != $object->element)) continue; // Property is for another type of object
@@ -790,8 +784,7 @@ class EmailCollector extends CommonObject
                     $sourcefield = $regforregex[1];
                     $regexstring = $regforregex[2];
                     //$transofrmationstring=$regforregex[3];
-                }
-                elseif (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*)$/', $valueforproperty, $regforregex))
+                } elseif (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*)$/', $valueforproperty, $regforregex))
                 {
                     $sourcefield = $regforregex[1];
                     $regexstring = $regforregex[2];
@@ -815,20 +808,17 @@ class EmailCollector extends CommonObject
                             //var_dump($regforval[count($regforval)-1]);exit;
                             // Overwrite param $tmpproperty
                             $object->$tmpproperty = isset($regforval[count($regforval) - 1]) ?trim($regforval[count($regforval) - 1]) : null;
-                        }
-                        else {
+                        } else {
                             // Regex not found
                             $object->$tmpproperty = null;
                         }
-                    }
-                    else {
+                    } else {
                         // Nothing can be done for this param
                         $errorforthisaction++;
                         $this->error = 'The extract rule to use has on an unknown source (must be HEADER, SUBJECT or BODY)';
                         $this->errors[] = $this->error;
                     }
-                }
-                elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $regforregex))
+                } elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $regforregex))
                 {
                     $valuecurrent = '';
                     if (preg_match('/^options_/', $tmpproperty)) $valuecurrent = $object->array_options[preg_replace('/^options_/', '', $tmpproperty)];
@@ -858,8 +848,7 @@ class EmailCollector extends CommonObject
                         if (preg_match('/^options_/', $tmpproperty)) $object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $valuetouse;
                         else $object->$tmpproperty = $valuetouse;
                     }
-                }
-                else {
+                } else {
                     $errorforthisaction++;
                     $this->error = 'Bad syntax for description of action parameters: '.$actionparam;
                     $this->errors[] = $this->error;
@@ -1138,8 +1127,7 @@ class EmailCollector extends CommonObject
                 // Can use also iconv_mime_decode($str, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8')
                 if (function_exists('iconv_mime_decode')) {
                 	$overview[0]->subject = iconv_mime_decode($overview[0]->subject, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');
-                }
-                elseif (function_exists('imap_mime_header_decode')) {
+                } elseif (function_exists('imap_mime_header_decode')) {
                 	$elements = imap_mime_header_decode($overview[0]->subject);
                 	$newstring = '';
                 	if (!empty($elements)) {
@@ -1149,8 +1137,7 @@ class EmailCollector extends CommonObject
 	                	}
 	                	$overview[0]->subject = $newstring;
                 	}
-                }
-                elseif (function_exists('mb_decode_mimeheader')) {
+                } elseif (function_exists('mb_decode_mimeheader')) {
                 	$overview[0]->subject = mb_decode_mimeheader($overview[0]->subject);
                 }
                 // Removed emojis
@@ -1233,8 +1220,7 @@ class EmailCollector extends CommonObject
                 {
                     $from = $reg[2];
                     $fromtext = $reg[1];
-                }
-                else {
+                } else {
                     $from = $fromstring;
                     $fromtext = '';
                 }
@@ -1399,8 +1385,7 @@ class EmailCollector extends CommonObject
                             $errorforactions++;
                             $this->error = "Action loadthirdparty or loadandcreatethirdparty has empty parameter. Must be 'SET:xxx' or 'EXTRACT:(body|subject):regex' to define how to extract data";
                             $this->errors[] = $this->error;
-                        }
-                        else {
+                        } else {
                             $actionparam = $operation['actionparam'];
                             $nametouseforthirdparty = '';
 
@@ -1434,27 +1419,23 @@ class EmailCollector extends CommonObject
                                             //var_dump($regforval[count($regforval)-1]);exit;
                                             // Overwrite param $tmpproperty
                                             $nametouseforthirdparty = isset($regforval[count($regforval) - 1]) ?trim($regforval[count($regforval) - 1]) : null;
-                                        }
-                                        else {
+                                        } else {
                                             // Regex not found
                                             $nametouseforthirdparty = null;
                                         }
                                         //var_dump($object->$tmpproperty);exit;
-                                    }
-                                    else {
+                                    } else {
                                         // Nothing can be done for this param
                                         $errorforactions++;
                                         $this->error = 'The extract rule to use to load thirdparty has on an unknown source (must be HEADER, SUBJECT or BODY)';
                                         $this->errors[] = $this->error;
                                     }
-                                }
-                                elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $reg))
+                                } elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $reg))
                                 {
                                     //if (preg_match('/^options_/', $tmpproperty)) $object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $reg[1];
                                     //else $object->$tmpproperty = $reg[1];
                                     $nametouseforthirdparty = $reg[2];
-                                }
-                                else {
+                                } else {
                                     $errorforactions++;
                                     $this->error = 'Bad syntax for description of action parameters: '.$actionparam;
                                     $this->errors[] = $this->error;
@@ -1471,8 +1452,7 @@ class EmailCollector extends CommonObject
                                     $this->error = 'Error when getting thirdparty with name '.$nametouseforthirdparty.' (may be 2 record exists with same name ?)';
                                     $this->errors[] = $this->error;
                                     break;
-                                }
-                                elseif ($result == 0)
+                                } elseif ($result == 0)
                                 {
                                     if ($operation['type'] == 'loadthirdparty')
                                     {
@@ -1481,8 +1461,7 @@ class EmailCollector extends CommonObject
                                         $errorforactions++;
                                         $this->error = 'ErrorFailedToLoadThirdParty';
                                         $this->errors[] = 'ErrorFailedToLoadThirdParty';
-                                    }
-                                    elseif ($operation['type'] == 'loadandcreatethirdparty')
+                                    } elseif ($operation['type'] == 'loadandcreatethirdparty')
                                     {
                                         dol_syslog("Third party with name ".$nametouseforthirdparty." was not found. We try to create it.");
 
@@ -1497,8 +1476,7 @@ class EmailCollector extends CommonObject
                                         if ($errorforthisaction)
                                         {
                                             $errorforactions++;
-                                        }
-                                        else {
+                                        } else {
                                             $result = $thirdpartystatic->create($user);
                                             if ($result <= 0)
                                             {
@@ -1583,8 +1561,7 @@ class EmailCollector extends CommonObject
 	                        if ($errorforthisaction)
 	                        {
 	                            $errorforactions++;
-	                        }
-	                        else {
+	                        } else {
 	                            $result = $actioncomm->create($user);
 	                            if ($result <= 0)
 	                            {
@@ -1669,8 +1646,7 @@ class EmailCollector extends CommonObject
                                         $errorforactions++;
                                         setEventMessages('You loaded a thirdparty (id='.$savesocid.') and you force another thirdparty id (id='.$projecttocreate->socid.') by setting socid in operation with a different value', null, 'errors');
                                     }
-                                }
-                                else {
+                                } else {
                                     if ($projecttocreate->socid > 0)
                                     {
                                         $thirdpartystatic->fetch($projecttocreate->socid);
@@ -1685,14 +1661,12 @@ class EmailCollector extends CommonObject
                         if ($errorforthisaction)
                         {
                             $errorforactions++;
-                        }
-                        else {
+                        } else {
                             if (empty($projecttocreate->ref) || (is_numeric($projecttocreate->ref) && $projecttocreate->ref <= 0))
                             {
                                 $errorforactions++;
                                 $this->error = 'Failed to create project: Can\'t get a valid value for the field ref with numbering template = '.$modele.', thirdparty id = '.$thirdpartystatic->id;
-                            }
-                            else {
+                            } else {
                                 // Create project
                                 $result = $projecttocreate->create($user);
                                 if ($result <= 0)
@@ -1782,8 +1756,7 @@ class EmailCollector extends CommonObject
                                         $errorforactions++;
                                         setEventMessages('You loaded a thirdparty (id='.$savesocid.') and you force another thirdparty id (id='.$tickettocreate->socid.') by setting socid in operation with a different value', null, 'errors');
                                     }
-                                }
-                                else {
+                                } else {
                                     if ($tickettocreate->socid > 0)
                                     {
                                         $thirdpartystatic->fetch($tickettocreate->socid);
@@ -1831,14 +1804,12 @@ class EmailCollector extends CommonObject
                         if ($errorforthisaction)
                         {
                             $errorforactions++;
-                        }
-                        else {
+                        } else {
                             if (is_numeric($tickettocreate->ref) && $tickettocreate->ref <= 0)
                             {
                                 $errorforactions++;
                                 $this->error = 'Failed to create ticket: Can\'t get a valid value for the field ref with numbering template = '.$modele.', thirdparty id = '.$thirdpartystatic->id;
-                            }
-                            else {
+                            } else {
                                 // Create project
                                 $result = $tickettocreate->create($user);
                                 if ($result <= 0)
@@ -1870,12 +1841,10 @@ class EmailCollector extends CommonObject
                             $this->errors[] = $this->error;
                             dol_syslog(imap_last_error());
                         }
-                    }
-                    else {
+                    } else {
                         dol_syslog("EmailCollector::doCollectOneCollector message ".$imapemail." to ".$connectstringtarget." was set to read", LOG_DEBUG);
                     }
-                }
-                else {
+                } else {
                     $errorforemail++;
                 }
 
@@ -1899,8 +1868,7 @@ class EmailCollector extends CommonObject
                         dol_syslog("EmailCollect::doCollectOneCollector We reach maximum of ".$nbemailok." collected with success, so we stop this collector now.");
                         break;
                     }
-                }
-                else {
+                } else {
                     $error++;
 
                     $this->db->rollback();
@@ -1910,8 +1878,7 @@ class EmailCollector extends CommonObject
             $output = $langs->trans('XEmailsDoneYActionsDone', $nbemailprocessed, $nbemailok, $nbactiondone);
 
             dol_syslog("End of loop on emails", LOG_INFO, -1);
-        }
-        else {
+        } else {
             $output = $langs->trans('NoNewEmailToProcess');
         }
 
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index b4fdf52ca5b..ed6942f34d6 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -369,8 +369,7 @@ class EmailCollectorAction extends CommonObject
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $linkstart = '<a href="'.$url.'"';
         $linkstart .= $linkclose.'>';
@@ -425,32 +424,26 @@ class EmailCollectorAction extends CommonObject
         if ($mode == 0)
         {
             return $this->labelStatus[$status];
-        }
-        elseif ($mode == 1)
+        } elseif ($mode == 1)
         {
             return $this->labelStatus[$status];
-        }
-        elseif ($mode == 2)
+        } elseif ($mode == 2)
         {
             if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
             elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-        }
-        elseif ($mode == 3)
+        } elseif ($mode == 3)
         {
             if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
             elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-        }
-        elseif ($mode == 4)
+        } elseif ($mode == 4)
         {
             if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
             elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-        }
-        elseif ($mode == 5)
+        } elseif ($mode == 5)
         {
             if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
             elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-        }
-        elseif ($mode == 6)
+        } elseif ($mode == 6)
         {
             if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
             elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
@@ -503,8 +496,7 @@ class EmailCollectorAction extends CommonObject
             }
 
             $this->db->free($result);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index 106d57c23c5..8e4f5814db4 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -344,8 +344,7 @@ class EmailCollectorFilter extends CommonObject
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -400,32 +399,26 @@ class EmailCollectorFilter extends CommonObject
 		if ($mode == 0)
 		{
 			return $this->labelStatus[$status];
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			return $this->labelStatus[$status];
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
 			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
 			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
 			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
 			elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-		}
-		elseif ($mode == 6)
+		} elseif ($mode == 6)
 		{
 			if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
 			elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
@@ -478,8 +471,7 @@ class EmailCollectorFilter extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index cdc4da7fe51..3d0a58dac7a 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -265,8 +265,7 @@ if (empty($reshook))
     				$batch_line[$i]['ix_l'] = GETPOST($idl, 'int');
 
     				$totalqty += $subtotalqty;
-			    }
-			    else {
+			    } else {
 			        // No detail were provided for lots
 			        if (!empty($_POST[$qty]))
 			        {
@@ -276,8 +275,7 @@ if (empty($reshook))
     			        setEventMessages($langs->trans("StockIsRequiredToChooseWhichLotToUse"), null, 'errors');
 			        }
 			    }
-			}
-			elseif (GETPOSTISSET($stockLocation))
+			} elseif (GETPOSTISSET($stockLocation))
 			{
 			    //shipment line from multiple stock locations
 			    $qty .= '_'.$j;
@@ -294,8 +292,7 @@ if (empty($reshook))
 			        $stockLocation = "ent1".$i."_".$j;
 			        $qty = "qtyl".$i.'_'.$j;
 			    }
-			}
-			else {
+			} else {
 			    //var_dump(GETPOST($qty,'int')); var_dump($_POST); var_dump($batch);exit;
 				//shipment line for product with no batch management and no multiple stock location
 				if (GETPOST($qty, 'int') > 0) $totalqty += GETPOST($qty, 'int');
@@ -339,8 +336,7 @@ if (empty($reshook))
     					        }
     					    }
     					}
-					}
-					else {
+					} else {
 						if (GETPOST($qty, 'int') > 0 || (GETPOST($qty, 'int') == 0 && $conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS))
 						{
 							$ent = "entl".$i;
@@ -357,8 +353,7 @@ if (empty($reshook))
 							}
 						}
 					}
-				}
-				else {
+				} else {
 					// batch mode
 					if ($batch_line[$i]['qty'] > 0)
 					{
@@ -384,8 +379,7 @@ if (empty($reshook))
 	                $error++;
 	            }
 	        }
-	    }
-	    else {
+	    } else {
 	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("QtyToShip").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 	        $error++;
 	    }
@@ -395,8 +389,7 @@ if (empty($reshook))
 	        $db->commit();
 	        header("Location: card.php?id=".$object->id);
 	        exit;
-	    }
-	    else {
+	    } else {
 	        $db->rollback();
 	        $_GET["commande_id"] = GETPOST('commande_id', 'int');
 	        $action = 'create';
@@ -413,13 +406,10 @@ if (empty($reshook))
 	    {
 	        header("Location: ".DOL_URL_ROOT.'/livraison/card.php?action=create_delivery&id='.$result);
 	        exit;
-	    }
-	    else {
+	    } else {
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
-	}
-
-	elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
+	} elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
         ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->creer))
        	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->shipping_advance->validate)))
 	)
@@ -432,8 +422,7 @@ if (empty($reshook))
 	    {
 			$langs->load("errors");
 			setEventMessages($langs->trans($object->error), $object->errors, 'errors');
-	    }
-	    else {
+	    } else {
 	    	// Define output language
 	    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 	    	{
@@ -452,22 +441,17 @@ if (empty($reshook))
 	    		if ($result < 0) dol_print_error($db, $result);
 	    	}
 	    }
-	}
-
-	elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $user->rights->expedition->supprimer)
+	} elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $user->rights->expedition->supprimer)
 	{
 		$also_update_stock = (GETPOST('alsoUpdateStock', 'alpha') ? 1 : 0);
 	    $result = $object->cancel(0, $also_update_stock);
 	    if ($result > 0)
 	    {
 	        $result = $object->setStatut(-1);
-	    }
-	    else {
+	    } else {
 			setEventMessages($object->error, $object->errors, 'errors');
 	    }
-	}
-
-	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->supprimer)
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->supprimer)
 	{
 	    $also_update_stock = (GETPOST('alsoUpdateStock', 'alpha') ? 1 : 0);
 	    $result = $object->delete(0, $also_update_stock);
@@ -475,8 +459,7 @@ if (empty($reshook))
 	    {
 	        header("Location: ".DOL_URL_ROOT.'/expedition/index.php');
 	        exit;
-	    }
-	    else {
+	    } else {
 			setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
@@ -542,9 +525,7 @@ if (empty($reshook))
 	    }
 
 	    $action = "";
-	}
-
-	elseif ($action == 'classifybilled')
+	} elseif ($action == 'classifybilled')
 	{
 	    $object->fetch($id);
 	    $result = $object->set_billed();
@@ -553,9 +534,7 @@ if (empty($reshook))
 	    	exit();
 	    }
 		setEventMessages($object->error, $object->errors, 'errors');
-	}
-
-	elseif ($action == 'classifyclosed')
+	} elseif ($action == 'classifyclosed')
 	{
 	    $object->fetch($id);
 	    $result = $object->setClosed();
@@ -590,8 +569,7 @@ if (empty($reshook))
 							$error++;
 						}
 					}
-				}
-				else {
+				} else {
 					// delete single warehouse line
 					$line->id = $line_id;
 					if (!$error && $line->delete($user) < 0)
@@ -606,8 +584,7 @@ if (empty($reshook))
 		if (!$error) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
-		}
-		else {
+		} else {
 			setEventMessages($line->error, $line->errors, 'errors');
 		}
 	}
@@ -671,8 +648,7 @@ if (empty($reshook))
 									setEventMessages($line->error, $line->errors, 'errors');
 									$error++;
 								}
-							}
-							else {
+							} else {
 								setEventMessages($lotStock->error, $lotStock->errors, 'errors');
 								$error++;
 							}
@@ -699,8 +675,7 @@ if (empty($reshook))
 								{
 									$lineIdToAddLot = $line_id;
 								}
-							}
-							elseif (count($lines[$i]->details_entrepot) > 1)
+							} elseif (count($lines[$i]->details_entrepot) > 1)
 							{
 								// multi warehouse shipment lines
 								foreach ($lines[$i]->details_entrepot as $detail_entrepot)
@@ -724,13 +699,11 @@ if (empty($reshook))
 										setEventMessages($line->error, $line->errors, 'errors');
 										$error++;
 									}
-								}
-								else {
+								} else {
 									setEventMessages($line->error, $line->errors, 'errors');
 									$error++;
 								}
-							}
-							else {
+							} else {
 								// create new line with new lot
 								$line->origin_line_id = $lines[$i]->origin_line_id;
 								$line->entrepot_id = $lotStock->warehouseid;
@@ -745,14 +718,12 @@ if (empty($reshook))
 									$error++;
 								}
 							}
-						}
-						else {
+						} else {
 							setEventMessages($lotStock->error, $lotStock->errors, 'errors');
 							$error++;
 						}
 					}
-				}
-				else {
+				} else {
 					if ($lines[$i]->fk_product > 0)
 					{
 						// line without lot
@@ -770,8 +741,7 @@ if (empty($reshook))
 							}
 							unset($_POST[$stockLocation]);
 							unset($_POST[$qty]);
-						}
-						elseif (count($lines[$i]->details_entrepot) > 1)
+						} elseif (count($lines[$i]->details_entrepot) > 1)
 						{
 							// multi warehouse shipment lines
 							foreach ($lines[$i]->details_entrepot as $detail_entrepot)
@@ -795,8 +765,7 @@ if (empty($reshook))
 								}
 							}
 						}
-					}
-					else {
+					} else {
                         // Product no predefined
 						$qty = "qtyl".$line_id;
 						$line->id = $line_id;
@@ -831,8 +800,7 @@ if (empty($reshook))
 				$ret = $object->fetch($object->id); // Reload to get new records
 				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
-		}
-		else {
+		} else {
 			header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // To redisplay the form being edited
 			exit();
 		}
@@ -1113,8 +1081,7 @@ if ($action == 'create')
 					if (empty($conf->productbatch->enabled))
 					{
                     	print '<td class="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
-					}
-					else {
+					} else {
 						print '<td class="left">'.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").')</td>';
 					}
                 }
@@ -1174,8 +1141,7 @@ if ($action == 'create')
 	                    }
 
 	                    print '</td>';
-	                }
-	                else {
+	                } else {
 					    print "<td>";
 	                    if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
 	                    else $text = img_object($langs->trans('Product'), 'product');
@@ -1210,8 +1176,7 @@ if ($action == 'create')
 					if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES))
 					{
 						$quantityToBeDelivered = 0;
-					}
-					else {
+					} else {
 						$quantityToBeDelivered = $quantityAsked - $quantityDelivered;
 					}
 	                $warehouse_id = GETPOST('entrepot_id', 'int');
@@ -1233,8 +1198,7 @@ if ($action == 'create')
 	                            if (GETPOST('qtyl'.$indiceAsked, 'int')) $deliverableQty = GETPOST('qtyl'.$indiceAsked, 'int');
 	                            print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 								print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
-							}
-							else print $langs->trans("NA");
+							} else print $langs->trans("NA");
 							print '</td>';
 
 							// Stock
@@ -1266,8 +1230,7 @@ if ($action == 'create')
 											}
 										}
 									}
-								}
-								else {
+								} else {
 									print $langs->trans("Service");
 								}
 								print '</td>';
@@ -1297,8 +1260,7 @@ if ($action == 'create')
 									}
 								}
 							}
-						}
-						else {
+						} else {
 						    // Product need lot
 							print '<td></td><td></td></tr>'; // end line and start a new one for lot/serial
 							print '<!-- Case product need lot -->';
@@ -1352,8 +1314,7 @@ if ($action == 'create')
 									$subj++;
 									print '</td></tr>';
 								}
-							}
-							else {
+							} else {
 							    print '<!-- Case there is no details of lot at all -->';
 							    print '<tr class="oddeven"><td colspan="3"></td><td class="center">';
 							    print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0" disabled="disabled"> ';
@@ -1364,8 +1325,7 @@ if ($action == 'create')
 							    print '</td></tr>';
 							}
 						}
-					}
-					else {
+					} else {
 						// ship from multiple locations
 						if (empty($conf->productbatch->enabled) || !$product->hasbatch())
 						{
@@ -1399,8 +1359,7 @@ if ($action == 'create')
 									{
 										print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
 										print '<input name="ent1'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$warehouse_id.'">';
-									}
-									else print $langs->trans("NA");
+									} else print $langs->trans("NA");
 									print '</td>';
 
 									// Stock
@@ -1413,8 +1372,7 @@ if ($action == 'create')
 
 											print '<!-- Show details of stock -->';
 											print '('.$stock.')';
-										}
-										else {
+										} else {
 											print $langs->trans("Service");
 										}
 										print '</td>';
@@ -1452,8 +1410,7 @@ if ($action == 'create')
 									}
 								}
 							}
-						}
-						else {
+						} else {
 						    print '<!-- Case warehouse not already known and product need lot -->';
 						    print '<td></td><td></td></tr>'; // end line and start a new one for lot/serial
 
@@ -1524,8 +1481,7 @@ if ($action == 'create')
 	                                $disabled = 'disabled="disabled"';
 							    }
 	    						print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0"'.($disabled ? ' '.$disabled : '').'> ';
-							}
-							else {
+							} else {
 							    print $langs->trans("NA");
 							}
 							print '</td>';
@@ -1539,13 +1495,11 @@ if ($action == 'create')
 	    							$warehouseObject = new Entrepot($db);
 	    							$warehouseObject->fetch($warehouse_selected_id);
 	    							print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->label);
-	    						}
-	    						else {
+	    						} else {
 	    						    if ($line->fk_product) print img_warning().' '.$langs->trans("StockTooLow");
 	    						    else print '';
 	    						}
-							}
-							else {
+							} else {
 							    print $langs->trans("Service");
 							}
 							print '</td>';
@@ -1585,13 +1539,11 @@ if ($action == 'create')
             print '</form>';
 
             print '<br>';
-        }
-        else {
+        } else {
             dol_print_error($db);
         }
     }
-}
-elseif ($id || $ref)
+} elseif ($id || $ref)
 /* *************************************************************************** */
 /*                                                                             */
 /* Edit and view mode                                                          */
@@ -1654,8 +1606,7 @@ elseif ($id || $ref)
 			if ($objectref == 'PROV')
 			{
 				$numref = $object->getNextNumRef($soc);
-			}
-			else {
+			} else {
 				$numref = $object->ref;
 			}
 
@@ -1800,8 +1751,7 @@ elseif ($id || $ref)
 			print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
-		}
-		else {
+		} else {
 			print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
 		}
 		print '</td>';
@@ -1823,8 +1773,7 @@ elseif ($id || $ref)
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
-		}
-		else {
+		} else {
 			print $object->trueWeight;
 			print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
 		}
@@ -1857,8 +1806,7 @@ elseif ($id || $ref)
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
-		}
-		else {
+		} else {
 			print $object->trueHeight;
 			print ($object->trueHeight && $object->height_units != '') ? ' '.measuringUnitString(0, "size", $object->height_units) : '';
 		}
@@ -1889,8 +1837,7 @@ elseif ($id || $ref)
 			if ($volumeUnit < 50)
 			{
 			    print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
-			}
-			else print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
+			} else print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
 		}
 		if ($totalVolume > 0)
 		{
@@ -1934,8 +1881,7 @@ elseif ($id || $ref)
 			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
-		}
-		else {
+		} else {
 			if ($object->shipping_method_id > 0)
 			{
 				// Get code using getLabelFromKey
@@ -1966,8 +1912,7 @@ elseif ($id || $ref)
 			if ($action != 'editincoterm')
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-			}
-			else {
+			} else {
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 			}
 	        print '</td></tr>';
@@ -2026,8 +1971,7 @@ elseif ($id || $ref)
 			if ($object->statut <= 1)
 			{
 				print $langs->trans("QtyToShip").' - ';
-			}
-			else {
+			} else {
 				print $langs->trans("QtyShipped").' - ';
 			}
 			if (!empty($conf->stock->enabled))
@@ -2039,13 +1983,11 @@ elseif ($id || $ref)
 				print $langs->trans("Batch");
 			}
 			print '</td>';
-		}
-		else {
+		} else {
 			if ($object->statut <= 1)
 			{
 				print '<td class="center linecolqtytoship">'.$langs->trans("QtyToShip").'</td>';
-			}
-			else {
+			} else {
 				print '<td class="center linecolqtyshipped">'.$langs->trans("QtyShipped").'</td>';
 			}
 			if (!empty($conf->stock->enabled))
@@ -2154,8 +2096,7 @@ elseif ($id || $ref)
 						$prod = new Product($db);
 						$prod->fetch($lines[$i]->fk_product);
 						$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
-					}
-					else $label = (!empty($lines[$i]->label) ? $lines[$i]->label : $lines[$i]->product_label);
+					} else $label = (!empty($lines[$i]->label) ? $lines[$i]->label : $lines[$i]->product_label);
 
 					print '<td class="linecoldescription">';
 
@@ -2188,8 +2129,7 @@ elseif ($id || $ref)
 						print (!empty($lines[$i]->description) && $lines[$i]->description != $lines[$i]->product) ? '<br>'.dol_htmlentitiesbr($lines[$i]->description) : '';
 					}
 					print "</td>\n";
-				}
-				else {
+				} else {
 					print '<td class="linecoldescription" >';
 					if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'), 'service');
 					else $text = img_object($langs->trans('Product'), 'product');
@@ -2268,8 +2208,7 @@ elseif ($id || $ref)
 						// Batch number managment
 						print '<td>'.$formproduct->selectLotStock('', 'batchl'.$line_id.'_0', '', 1, 0, $lines[$i]->fk_product).'</td>';
 						print '</tr>';
-					}
-					elseif (!empty($conf->stock->enabled))
+					} elseif (!empty($conf->stock->enabled))
 					{
 						if ($lines[$i]->fk_product > 0)
 						{
@@ -2284,8 +2223,7 @@ elseif ($id || $ref)
 								// Batch number managment
 								print '<td> - '.$langs->trans("NA").'</td>';
 								print '</tr>';
-							}
-							elseif (count($lines[$i]->details_entrepot) > 1)
+							} elseif (count($lines[$i]->details_entrepot) > 1)
 							{
 								print '<!-- case edit 3 -->';
 								foreach ($lines[$i]->details_entrepot as $detail_entrepot)
@@ -2299,13 +2237,11 @@ elseif ($id || $ref)
 									print '<td> - '.$langs->trans("NA").'</td>';
 									print '</tr>';
 								}
-							}
-							else {
+							} else {
 								print '<!-- case edit 4 -->';
 								print '<tr><td colspan="3">'.$langs->trans("NotEnoughStock").'</td></tr>';
 							}
-						}
-						else {
+						} else {
 							print '<!-- case edit 5 -->';
 							print '<tr>';
 							// Qty to ship or shipped
@@ -2319,8 +2255,7 @@ elseif ($id || $ref)
 					}
 
 					print '</table></td>';
-				}
-				else {
+				} else {
 					// Qty to ship or shipped
 					print '<td class="linecolqtytoship center">'.$lines[$i]->qty_shipped.'</td>';
 
@@ -2333,8 +2268,7 @@ elseif ($id || $ref)
 							$entrepot = new Entrepot($db);
 							$entrepot->fetch($lines[$i]->entrepot_id);
 							print $entrepot->getNomUrl(1);
-						}
-						elseif (count($lines[$i]->details_entrepot) > 1)
+						} elseif (count($lines[$i]->details_entrepot) > 1)
 						{
 							$detail = '';
 							foreach ($lines[$i]->details_entrepot as $detail_entrepot)
@@ -2370,8 +2304,7 @@ elseif ($id || $ref)
 									$detail .= '<br>';
 								}
 								print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $detail);
-							}
-							else {
+							} else {
 								print $langs->trans("NA");
 							}
 							print '</td>';
@@ -2402,8 +2335,7 @@ elseif ($id || $ref)
 					print '<input type="submit" class="button" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'"><br>';
 					print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>';
 					print '</td>';
-				}
-				elseif ($object->statut == Expedition::STATUS_DRAFT)
+				} elseif ($object->statut == Expedition::STATUS_DRAFT)
 				{
 					// edit-delete buttons
 					print '<td class="linecoledit center">';
@@ -2436,8 +2368,7 @@ elseif ($id || $ref)
 					if ($action == 'editline' && $line->id == $line_id)
 					{
 						print $lines[$i]->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), $indiceAsked);
-					}
-					else {
+					} else {
 						print $lines[$i]->showOptionals($extrafields, 'view', array('colspan'=>$colspan), $indiceAsked);
 					}
 				}
@@ -2477,8 +2408,7 @@ elseif ($id || $ref)
 	  		     || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->shipping_advance->validate)))
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
-				}
-				else {
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
 				}
 			}
@@ -2490,8 +2420,7 @@ elseif ($id || $ref)
 				if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ClassifyUnbilled").'</a>';
-				}
-				else {
+				} else {
 			    	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
 				}
 			}
@@ -2503,8 +2432,7 @@ elseif ($id || $ref)
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expedition->shipping_advance->send)
 					{
 						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-					}
-					else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
+					} else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
 				}
 			}
 
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 42cb273fbcd..7bc4db0a511 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -166,8 +166,7 @@ class Shipments extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve commande list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -398,8 +397,7 @@ class Shipments extends DolibarrApi
         $updateRes = $this->shipment->deleteline(DolibarrApiAccess::$user, $lineid);
         if ($updateRes > 0) {
             return $this->get($id);
-        }
-        else {
+        } else {
             throw new RestException(405, $this->shipment->error);
         }
     }
@@ -434,8 +432,7 @@ class Shipments extends DolibarrApi
         if ($this->shipment->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else {
+        } else {
             throw new RestException(500, $this->shipment->error);
         }
     }
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 3250ba8aa5e..f728c727920 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -251,13 +251,11 @@ class Expedition extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else {
+			} else {
 				dol_print_error($this->db, get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-		}
-		else {
+		} else {
 			print $langs->trans("Error")." ".$langs->trans("Error_EXPEDITION_ADDON_NUMBER_NotDefined");
 			return "";
 		}
@@ -363,8 +361,7 @@ class Expedition extends CommonObject
 						{
 							$error++;
 						}
-					}
-					else {	// with batch management
+					} else {	// with batch management
 						if (!$this->create_line_batch($this->lines[$i], $this->lines[$i]->array_options) > 0)
 						{
 							$error++;
@@ -402,8 +399,7 @@ class Expedition extends CommonObject
 					{
 						$this->db->commit();
 						return $this->id;
-					}
-					else {
+					} else {
 						foreach ($this->errors as $errmsg)
 						{
 							dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
@@ -412,22 +408,19 @@ class Expedition extends CommonObject
 						$this->db->rollback();
 						return -1 * $error;
 					}
-				}
-				else {
+				} else {
 					$error++;
 					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else {
+			} else {
 				$error++;
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$error++;
 			$this->error = $this->db->error()." - sql=$sql";
 			$this->db->rollback();
@@ -496,8 +489,7 @@ class Expedition extends CommonObject
 			if (($line_id = $this->create_line($stockLocation, $line_ext->origin_line_id, $qty, $line_ext->rang, $array_options)) < 0)
 			{
 				$error++;
-			}
-			else {
+			} else {
 				// create shipment batch lines for stockLocation
 				foreach ($tab as $detbatch)
 				{
@@ -638,14 +630,12 @@ class Expedition extends CommonObject
 				}
 
 				return 1;
-			}
-			else {
+			} else {
 				dol_syslog(get_class($this).'::Fetch no expedition found', LOG_ERR);
 				$this->error = 'Delivery with id '.$id.' not found';
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -696,8 +686,7 @@ class Expedition extends CommonObject
 		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$numref = $this->getNextNumRef($soc);
-		}
-		else {
+		} else {
 			$numref = "EXP".$this->id;
 		}
 		$this->newref = dol_sanitizeFileName($numref);
@@ -748,8 +737,7 @@ class Expedition extends CommonObject
 					if (empty($obj->edbrowid))
 					{
 						$qty = $obj->qty;
-					}
-					else {
+					} else {
 						$qty = $obj->edbqty;
 					}
 					if ($qty <= 0) continue;
@@ -771,8 +759,7 @@ class Expedition extends CommonObject
 							$this->errors = array_merge($this->errors, $mouvS->errors);
 							break;
 						}
-					}
-					else {
+					} else {
 						// line with batch detail
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
@@ -786,8 +773,7 @@ class Expedition extends CommonObject
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -2;
@@ -861,8 +847,7 @@ class Expedition extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1 * $error;
 		}
@@ -892,15 +877,12 @@ class Expedition extends CommonObject
 				if ($result > 0)
 				{
 					return $result;
-				}
-				else {
+				} else {
 					$this->error = $delivery->error;
 					return $result;
 				}
-			}
-			else return 0;
-		}
-		else return 0;
+			} else return 0;
+		} else return 0;
 	}
 
 	/**
@@ -951,8 +933,7 @@ class Expedition extends CommonObject
 				if ($entrepot_id > 0) {
 					$product->load_stock('warehouseopen');
 					$product_stock = $product->stock_warehouse[$entrepot_id]->real;
-				}
-				else $product_stock = $product->stock_reel;
+				} else $product_stock = $product->stock_reel;
 
 				$product_type = $product->type;
 				if ($product_type == 0 && $product_stock < $qty)
@@ -1147,8 +1128,7 @@ class Expedition extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1242,8 +1222,7 @@ class Expedition extends CommonObject
 							$error++; $this->errors = $this->errors + $mouvS->errors;
 							break;
 						}
-					}
-					else {
+					} else {
 						// We increment stock of batches
 						// We use warehouse selected for each line
 						foreach ($lotArray as $lot)
@@ -1258,8 +1237,7 @@ class Expedition extends CommonObject
 						if ($error) break; // break for loop incase of error
 					}
 				}
-			}
-			else {
+			} else {
 				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
@@ -1337,31 +1315,26 @@ class Expedition extends CommonObject
 							}
 
 							return 1;
-						}
-						else {
+						} else {
 							$this->db->rollback();
 							return -1;
 						}
-					}
-					else {
+					} else {
 						$this->error = $this->db->lasterror()." - sql=$sql";
 						$this->db->rollback();
 						return -3;
 					}
-				}
-				else {
+				} else {
 					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -2;
 				}//*/
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1455,8 +1428,7 @@ class Expedition extends CommonObject
 							$error++; $this->errors = $this->errors + $mouvS->errors;
 							break;
 						}
-					}
-					else {
+					} else {
 						// We increment stock of batches
 						// We use warehouse selected for each line
 						foreach ($lotArray as $lot)
@@ -1471,8 +1443,7 @@ class Expedition extends CommonObject
 						if ($error) break; // break for loop incase of error
 					}
 				}
-			}
-			else {
+			} else {
 				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
@@ -1556,31 +1527,26 @@ class Expedition extends CommonObject
 							}
 
 							return 1;
-						}
-						else {
+						} else {
 							$this->db->rollback();
 							return -1;
 						}
-					}
-					else {
+					} else {
 						$this->error = $this->db->lasterror()." - sql=$sql";
 						$this->db->rollback();
 						return -3;
 					}
-				}
-				else {
+				} else {
 					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -2;
 				}
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1737,8 +1703,7 @@ class Expedition extends CommonObject
 						if ($originline != $obj->fk_origin_line)
 						{
 							$line->detail_batch = $newdetailbatch;
-						}
-						else {
+						} else {
 							$line->detail_batch = array_merge($line->detail_batch, $newdetailbatch);
 						}
 					}
@@ -1748,8 +1713,7 @@ class Expedition extends CommonObject
 				{
 					$this->lines[$lineindex] = $line;
 					$lineindex++;
-				}
-				else {
+				} else {
 					$line->total_ht += $tabprice[0];
 					$line->total_localtax1 	+= $tabprice[9];
 					$line->total_localtax2 	+= $tabprice[10];
@@ -1762,8 +1726,7 @@ class Expedition extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -3;
 		}
@@ -1795,13 +1758,11 @@ class Expedition extends CommonObject
 
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -2;
 		}
@@ -2001,13 +1962,11 @@ class Expedition extends CommonObject
 			{
 				$this->date_delivery = $date_livraison;
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			return -2;
 		}
 	}
@@ -2092,8 +2051,7 @@ class Expedition extends CommonObject
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
 			$sql .= " VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
 			$resql = $this->db->query($sql);
-		}
-		else {
+		} else {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
 			$sql .= " code='".$this->db->escape($this->update['code'])."'";
 			$sql .= ",libelle='".$this->db->escape($this->update['libelle'])."'";
@@ -2167,8 +2125,7 @@ class Expedition extends CommonObject
 		{
 			$url = str_replace('{TRACKID}', $value, $tracking);
 			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value ? $value : 'url').'</a>', $url, $url);
-		}
-		else {
+		} else {
 			$this->tracking_url = $value;
 		}
 	}
@@ -2258,8 +2215,7 @@ class Expedition extends CommonObject
 						if (empty($obj->edbrowid))
 						{
 							$qty = $obj->qty;
-						}
-						else {
+						} else {
 							$qty = $obj->edbqty;
 						}
 						if ($qty <= 0) continue;
@@ -2279,8 +2235,7 @@ class Expedition extends CommonObject
 								$this->errors = $mouvS->errors;
 								$error++; break;
 							}
-						}
-						else {
+						} else {
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -2292,8 +2247,7 @@ class Expedition extends CommonObject
 							}
 						}
 					}
-				}
-				else {
+				} else {
 					$this->error = $this->db->lasterror();
 					$error++;
 				}
@@ -2307,8 +2261,7 @@ class Expedition extends CommonObject
 					$error++;
 				}
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$error++;
 		}
@@ -2317,8 +2270,7 @@ class Expedition extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->statut = self::STATUS_VALIDATED;
 			$this->db->rollback();
 			return -1;
@@ -2361,8 +2313,7 @@ class Expedition extends CommonObject
 		if (empty($error)) {
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->statut = self::STATUS_VALIDATED;
 			$this->billed = 0;
 			$this->db->rollback();
@@ -2429,8 +2380,7 @@ class Expedition extends CommonObject
 						if (empty($obj->edbrowid))
 						{
 							$qty = $obj->qty;
-						}
-						else {
+						} else {
 							$qty = $obj->edbqty;
 						}
 						if ($qty <= 0) continue;
@@ -2451,8 +2401,7 @@ class Expedition extends CommonObject
 								$this->errors = $mouvS->errors;
 								$error++; break;
 							}
-						}
-						else {
+						} else {
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -2464,8 +2413,7 @@ class Expedition extends CommonObject
 							}
 						}
 					}
-				}
-				else {
+				} else {
 					$this->error = $this->db->lasterror();
 					$error++;
 				}
@@ -2487,8 +2435,7 @@ class Expedition extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->statut = self::STATUS_CLOSED;
 			$this->billed = $oldbilled;
 			$this->db->rollback();
@@ -2740,8 +2687,7 @@ class ExpeditionLigne extends CommonObjectLine
 			$this->db->free($result);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->errors[] = $this->db->lasterror();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -2833,8 +2779,7 @@ class ExpeditionLigne extends CommonObjectLine
 
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$error++;
 		}
 	}
@@ -2893,8 +2838,7 @@ class ExpeditionLigne extends CommonObjectLine
 				}
 				// End call triggers
 			}
-		}
-		else {
+		} else {
 			$this->errors[] = $this->db->lasterror()." - sql=$sql";
 			$error++;
 		}
@@ -2902,8 +2846,7 @@ class ExpeditionLigne extends CommonObjectLine
 		if (!$error) {
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
@@ -2945,8 +2888,7 @@ class ExpeditionLigne extends CommonObjectLine
 				dol_syslog(get_class($this).'::update only possible for one batch', LOG_ERR);
 				$this->errors[] = 'ErrorBadParameters';
 				$error++;
-			}
-			else {
+			} else {
 				$batch = $this->detail_batch[0]->batch;
 				$batch_id = $this->detail_batch[0]->fk_origin_stock;
 				$expedition_batch_id = $this->detail_batch[0]->id;
@@ -2958,8 +2900,7 @@ class ExpeditionLigne extends CommonObjectLine
 				}
 				$qty = price2num($this->detail_batch[0]->qty);
 			}
-		}
-		elseif (!empty($this->detail_batch))
+		} elseif (!empty($this->detail_batch))
 		{
 			$batch = $this->detail_batch->batch;
 			$batch_id = $this->detail_batch->fk_origin_stock;
@@ -3000,8 +2941,7 @@ class ExpeditionLigne extends CommonObjectLine
 			{
 				$this->errors[] = $this->db->lasterror()." - ExpeditionLineBatch::fetchAll";
 				$error++;
-			}
-			else {
+			} else {
 				// caculate new total line qty
 				foreach ($lotArray as $lot)
 				{
@@ -3098,8 +3038,7 @@ class ExpeditionLigne extends CommonObjectLine
 		if (!$error) {
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php
index 131d2abc261..703d44e6896 100644
--- a/htdocs/expedition/class/expeditionbatch.class.php
+++ b/htdocs/expedition/class/expeditionbatch.class.php
@@ -90,8 +90,7 @@ class ExpeditionLineBatch extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -134,8 +133,7 @@ class ExpeditionLineBatch extends CommonObject
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.self::$_table_element);
 			$this->fk_expeditiondet = $id_line_expdet;
 			return $this->id;
-		}
-		else {
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
@@ -164,8 +162,7 @@ class ExpeditionLineBatch extends CommonObject
 		if ($db->query($sql))
 		{
 			return 1;
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -227,8 +224,7 @@ class ExpeditionLineBatch extends CommonObject
 			}
 			$db->free($resql);
 			return $ret;
-		}
-		else {
+		} else {
 			dol_print_error($db);
 			return -1;
 		}
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 1ea47ea199b..c20e2bb4088 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -87,8 +87,7 @@ if ($action == 'addcontact' && $user->rights->expedition->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
@@ -116,8 +115,7 @@ elseif ($action == 'deletecontact' && $user->rights->expedition->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index 6047be5fe0e..69f59cb3385 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -176,12 +176,10 @@ if ($id > 0 || !empty($ref)) {
 		$permtoedit = $user->rights->expedition->creer;
 		$param = '&id='.$object->id;
 		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
-}
-else {
+} else {
 	header('Location: index.php');
 	exit;
 }
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 15dc8168a54..849e2054cd6 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -192,8 +192,7 @@ if ($resql)
 		print "</table></div><br>";
 	}
 	$db->free($resql);
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 /*
  * Open orders
@@ -258,8 +257,7 @@ if ($resql)
 
 		print "</table></div><br>";
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 print '</div></div></div>';
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index b6de8adc74d..0b4a8182ca7 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -686,8 +686,7 @@ if ($resql)
 				$tmparray = $object->getTotalWeightVolume();
 				print showDimensionInBestUnit($tmparray['weight'], 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');
 				print $form->textwithpicto('', $langs->trans('EstimatedWeight'), 1);
-			}
-			else {
+			} else {
 				print $object->trueWeight;
 				print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
 			}
@@ -802,8 +801,7 @@ if ($resql)
 	$title      = '';
 
 	print $formfile->showdocuments('massfilesarea_sendings', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 1c874d402b5..6f2389a7bb6 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -376,8 +376,7 @@ if ($id > 0 || !empty($ref))
 			print $form->selectDate($object->date_livraison > 0 ? $object->date_livraison : -1, 'liv_', '', '', '', "setdatedelivery");
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
-		}
-		else {
+		} else {
 			print dol_print_date($object->date_livraison, 'daytext');
 			if ($object->hasDelay() && !empty($object->date_livraison)) {
 			    print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
@@ -529,8 +528,7 @@ if ($id > 0 || !empty($ref))
 		    if ($action != 'editincoterm')
 		    {
 		        print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-		    }
-		    else {
+		    } else {
 		        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 		    }
 		    print '</td></tr>';
@@ -641,8 +639,7 @@ if ($id > 0 || !empty($ref))
 			if (!empty($conf->stock->enabled))
 			{
 				print '<td class="center">'.$langs->trans("RealStock").'</td>';
-			}
-			else {
+			} else {
 				print '<td>&nbsp;</td>';
 			}
 			print "</tr>\n";
@@ -693,8 +690,7 @@ if ($id > 0 || !empty($ref))
 							}
 
 							$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
-						}
-						else $label = (!empty($objp->label) ? $objp->label : $objp->product_label);
+						} else $label = (!empty($objp->label) ? $objp->label : $objp->product_label);
 
 						print '<td>';
 						print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
@@ -734,8 +730,7 @@ if ($id > 0 || !empty($ref))
 						}
 
 						print '</td>';
-					}
-					else {
+					} else {
 						print "<td>";
 						if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
 						else $text = img_object($langs->trans('Product'), 'product');
@@ -770,8 +765,7 @@ if ($id > 0 || !empty($ref))
 						$toBeShipped[$objp->fk_product] = $objp->qty - $qtyAlreadyShipped;
 						$toBeShippedTotal += $toBeShipped[$objp->fk_product];
 						print $toBeShipped[$objp->fk_product];
-					}
-					else {
+					} else {
 						print '0 ('.$langs->trans("Service").')';
 					}
 					print '</td>';
@@ -792,8 +786,7 @@ if ($id > 0 || !empty($ref))
 							print ' '.img_warning($langs->trans("StockTooLow"));
 						}
 						print '</td>';
-					}
-					else {
+					} else {
 						print '<td>&nbsp;</td>';
 					}
 					print "</tr>\n";
@@ -836,8 +829,7 @@ if ($id > 0 || !empty($ref))
 			}
 
 			print "</table>";
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -862,8 +854,7 @@ if ($id > 0 || !empty($ref))
 					{
 						print ' '.img_warning($langs->trans("WarningNoQtyLeftToSend"));
 					}
-				}
-				else {
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateShipment").'</a>';
 				}
 			}
@@ -925,8 +916,7 @@ if ($id > 0 || !empty($ref))
 				print '</div>';
 
 				$somethingshown = 1;
-			}
-			else {
+			} else {
 				print '<div class="tabsAction">';
 				print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateShipment").'</a>';
 				print '</div>';
@@ -934,8 +924,7 @@ if ($id > 0 || !empty($ref))
 		}
 
 		show_list_sending_receive('commande', $object->id);
-	}
-	else {
+	} else {
 		/* Order not found */
 		setEventMessages($langs->trans("NonExistentOrder"), null, 'errors');
 	}
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index ce305ea41bb..fcccb545a33 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -74,8 +74,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else {
+} else {
     $filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
 }
 
@@ -289,8 +288,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     /*print $px2->show();
diff --git a/htdocs/expensereport/ajax/ajaxprojet.php b/htdocs/expensereport/ajax/ajaxprojet.php
index 57b86ac9c7f..49a7bd4201e 100644
--- a/htdocs/expensereport/ajax/ajaxprojet.php
+++ b/htdocs/expensereport/ajax/ajaxprojet.php
@@ -76,11 +76,9 @@ if (GETPOST('fk_projet') != '')
 	    }
 
 	    echo json_encode($return_arr);
-	}
-	else {
+	} else {
 	    echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
 	}
-}
-else {
+} else {
     echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
 }
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index c4a2d176e59..f5348bb4261 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -177,8 +177,7 @@ if (empty($reshook))
         if (1 == 0 && !GETPOST('clone_content', 'alpha') && !GETPOST('clone_receivers', 'alpha'))
         {
             setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-        }
-        else {
+        } else {
             if ($object->id > 0)
             {
                 // Because createFromClone modifies the object, we must clone it so that we can restore it later if it fails
@@ -189,8 +188,7 @@ if (empty($reshook))
                 {
                     header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
                     exit;
-                }
-                else {
+                } else {
                     setEventMessages($object->error, $object->errors, 'errors');
                     $object = $orig;
                     $action = '';
@@ -208,8 +206,7 @@ if (empty($reshook))
     	{
     		header("Location: index.php");
     		exit;
-    	}
-    	else {
+    	} else {
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
@@ -261,8 +258,7 @@ if (empty($reshook))
     			$db->commit();
     			Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
     			exit;
-    		}
-    		else {
+    		} else {
     			setEventMessages($object->error, $object->errors, 'errors');
     			$db->rollback();
     			$action = 'create';
@@ -293,8 +289,7 @@ if (empty($reshook))
     	{
     		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_POST['id']);
     		exit;
-    	}
-    	else {
+    	} else {
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
@@ -351,8 +346,7 @@ if (empty($reshook))
 
     			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		}
-    	}
-    	else {
+    	} else {
     		setEventMessages($object->error, $object->errors, 'errors');
     		$error++;
     	}
@@ -409,8 +403,7 @@ if (empty($reshook))
     				{
     					$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
     					setEventMessages($mesg, null, 'mesgs');
-    				}
-    				else {
+    				} else {
     					$langs->load("other");
     					if ($mailfile->error)
     					{
@@ -418,18 +411,15 @@ if (empty($reshook))
     						$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
     						$mesg .= '<br>'.$mailfile->error;
     						setEventMessages($mesg, null, 'errors');
-    					}
-    					else {
+    					} else {
     						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
     					}
     				}
-    			}
-    			else {
+    			} else {
     				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
     				$action = '';
     			}
-    		}
-    		else {
+    		} else {
     			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
     			$action = '';
     		}
@@ -440,8 +430,7 @@ if (empty($reshook))
 			$db->commit();
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 			exit;
-		}
-		else {
+		} else {
 			$db->rollback();
 		}
     }
@@ -531,8 +520,7 @@ if (empty($reshook))
     					setEventMessages($mesg, null, 'mesgs');
     					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
     					exit;
-    				}
-    				else {
+    				} else {
     					$langs->load("other");
     					if ($mailfile->error)
     					{
@@ -540,23 +528,19 @@ if (empty($reshook))
     						$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
     						$mesg .= '<br>'.$mailfile->error;
     						setEventMessages($mesg, null, 'errors');
-    					}
-    					else {
+    					} else {
     						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
     					}
     				}
-    			}
-    			else {
+    			} else {
     				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
     				$action = '';
     			}
-    		}
-    		else {
+    		} else {
     			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
     			$action = '';
     		}
-    	}
-    	else {
+    	} else {
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
@@ -649,8 +633,7 @@ if (empty($reshook))
        					setEventMessages($mesg, null, 'mesgs');
        					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
        					exit;
-       				}
-       				else {
+       				} else {
        					$langs->load("other");
        					if ($mailfile->error)
        					{
@@ -658,23 +641,19 @@ if (empty($reshook))
        						$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
        						$mesg .= '<br>'.$mailfile->error;
        						setEventMessages($mesg, null, 'errors');
-       					}
-       					else {
+       					} else {
        						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
        					}
        				}
-       			}
-       			else {
+       			} else {
        				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
        				$action = '';
        			}
-   			}
-    		else {
+   			} else {
     			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
     			$action = '';
     		}
-    	}
-   		else {
+    	} else {
    			setEventMessages($langs->trans("FailedtoSetToApprove"), null, 'warnings');
    			$action = '';
    		}
@@ -765,8 +744,7 @@ if (empty($reshook))
         				setEventMessages($mesg, null, 'mesgs');
         				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
         				exit;
-        			}
-        			else {
+        			} else {
         				$langs->load("other");
         				if ($mailfile->error)
         				{
@@ -774,23 +752,19 @@ if (empty($reshook))
         					$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
         					$mesg .= '<br>'.$mailfile->error;
         					setEventMessages($mesg, null, 'errors');
-        				}
-        				else {
+        				} else {
         					setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
         				}
         			}
-        		}
-        		else {
+        		} else {
         			setEventMessages($mailfile->error, $mailfile->errors, 'errors');
         			$action = '';
         		}
-        	}
-        	else {
+        	} else {
         		setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
         		$action = '';
         	}
-    	}
-    	else {
+    	} else {
     	    setEventMessages($langs->trans("FailedtoSetToDeny"), null, 'warnings');
     	    $action = '';
     	}
@@ -802,8 +776,7 @@ if (empty($reshook))
     	if (!GETPOST('detail_cancel', 'alpha'))
     	{
     		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Comment")), null, 'errors');
-    	}
-    	else {
+    	} else {
 	    	$object = new ExpenseReport($db);
 	    	$object->fetch($id);
 
@@ -889,8 +862,7 @@ if (empty($reshook))
 	        					setEventMessages($mesg, null, 'mesgs');
 	        					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 	        					exit;
-	        				}
-	        				else {
+	        				} else {
 	        					$langs->load("other");
 	        					if ($mailfile->error)
 	        					{
@@ -898,28 +870,23 @@ if (empty($reshook))
 	        						$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
 	        						$mesg .= '<br>'.$mailfile->error;
 	        						setEventMessages($mesg, null, 'errors');
-	        					}
-	        					else {
+	        					} else {
 	        						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
 	        					}
 	        				}
-	        			}
-	        			else {
+	        			} else {
 	        				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
 	        				$action = '';
 	        			}
-	    			}
-	    			else {
+	    			} else {
 	    			    setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
 	    			    $action = '';
 	    			}
-	    		}
-	    		else {
+	    		} else {
 	    			setEventMessages($langs->trans("FailedToSetToCancel"), null, 'warnings');
 	    			$action = '';
 	    		}
-	    	}
-	    	else {
+	    	} else {
 	    		setEventMessages($object->error, $object->errors, 'errors');
 	    	}
     	}
@@ -957,12 +924,10 @@ if (empty($reshook))
     		{
     			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
     			exit;
-    		}
-    		else {
+    		} else {
     			setEventMessages($object->error, $object->errors, 'errors');
     		}
-    	}
-    	else {
+    	} else {
     		setEventMessages("NOT_AUTHOR", '', 'errors');
     	}
     }
@@ -1096,8 +1061,7 @@ if (empty($reshook))
         				setEventMessages($mesg, null, 'mesgs');
         				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
         				exit;
-        			}
-        			else {
+        			} else {
     					$langs->load("other");
         				if ($mailfile->error)
         				{
@@ -1105,23 +1069,19 @@ if (empty($reshook))
         					$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
         					$mesg .= '<br>'.$mailfile->error;
         					setEventMessages($mesg, null, 'errors');
-        				}
-        				else {
+        				} else {
         					setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
         				}
         			}
-        		}
-        		else {
+        		} else {
         			setEventMessages($mailfile->error, $mailfile->errors, 'errors');
         			$action = '';
         		}
-    		}
-    		else {
+    		} else {
     		    setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
     		    $action = '';
     		}
-    	}
-    	else {
+    	} else {
     		setEventMessages($langs->trans("FailedToSetPaid"), null, 'warnings');
     		$action = '';
     	}
@@ -1272,8 +1232,7 @@ if (empty($reshook))
     		$object->update_totaux_del($object_ligne->total_ht, $object_ligne->total_tva);
     		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_GET['id']);
     		exit;
-    	}
-    	else {
+    	} else {
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
@@ -1366,8 +1325,7 @@ if (empty($reshook))
 
     			//header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
     			//exit;
-    		}
-    		else {
+    		} else {
     			setEventMessages($object->error, $object->errors, 'errors');
     		}
     	}
@@ -1515,8 +1473,7 @@ if ($action == 'create')
 	print '</div>';
 
 	print '</form>';
-}
-else {
+} else {
 	if ($id > 0 || $ref)
 	{
 		$result = $object->fetch($id, $ref);
@@ -1557,8 +1514,7 @@ else {
 				if ($object->fk_statut == 99)
 				{
 					print '<input type="hidden" name="action" value="updateFromRefuse">';
-				}
-				else {
+				} else {
 					print '<input type="hidden" name="action" value="update">';
 				}
 
@@ -1615,8 +1571,7 @@ else {
 					print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
 					print '</td>';
 					print '</tr>';
-				}
-				else {
+				} else {
 					print '<tr>';
 					print '<td>'.$langs->trans("VALIDOR").'</td>';
 					print '<td>';
@@ -1651,8 +1606,7 @@ else {
 				print '</div>';
 
 				print '</form>';
-			}
-			else {
+			} else {
 				dol_fiche_head($head, 'card', $langs->trans("ExpenseReport"), -1, 'trip');
 
 				// Clone confirmation
@@ -1824,8 +1778,7 @@ else {
 						}
 					}
 					print '</td></tr>';
-				}
-				elseif ($object->fk_statut == ExpenseReport::STATUS_CANCELED)
+				} elseif ($object->fk_statut == ExpenseReport::STATUS_CANCELED)
 				{
 					print '<tr>';
 					print '<td>'.$langs->trans("CANCEL_USER").'</span></td>';
@@ -1846,8 +1799,7 @@ else {
 					print '<td>'.$langs->trans("DATE_CANCEL").'</td>';
 					print '<td>'.dol_print_date($object->date_cancel, 'dayhour').'</td></tr>';
 					print '</tr>';
-				}
-				else {
+				} else {
 					print '<tr>';
 					print '<td>'.$langs->trans("ApprovedBy").'</td>';
 					print '<td>';
@@ -2032,8 +1984,7 @@ else {
 				    {
 				    	$cssforamountpaymentcomplete = 'amountpaymentneutral';
 				    	$resteapayeraffiche = 0;
-				    }
-			    	elseif ($object->paid == 0)
+				    } elseif ($object->paid == 0)
 			    	{
 			    		$cssforamountpaymentcomplete = 'amountpaymentneutral';
 			    	}
@@ -2044,8 +1995,7 @@ else {
 			        print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td><td></td></tr>';
 
 				    $db->free($resql);
-				}
-				else {
+				} else {
 				    dol_print_error($db);
 				}
 				print "</table>";
@@ -2151,8 +2101,7 @@ else {
 							if (!empty($line->value_unit_ht))
 							{
 							    print price($line->value_unit_ht);
-							}
-							else {
+							} else {
 							    $tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $line->vatrate));
 							    $pricenettoshow = price2num($line->value_unit / (1 + $tmpvat / 100), 'MU');
 							    print $pricenettoshow;
@@ -2195,8 +2144,7 @@ else {
                                         }
                                         print '<img class="photo" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.'/'.$minifile).'" title="">';
                                         print '</a>';
-                                    }
-                                    else {
+                                    } else {
                                         $modulepart = 'expensereport';
                                         $thumbshown = 0;
                                         if (preg_match('/\.pdf$/i', $ecmfilesstatic->filename))
@@ -2696,8 +2644,7 @@ if ($action != 'create' && $action != 'edit')
 		if ($remaintopay == 0)
 		{
 			print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPayment').'</span></div>';
-		}
-		else {
+		} else {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/expensereport/payment/payment.php?id='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a></div>';
 		}
 	}
@@ -2741,8 +2688,7 @@ if ($action != 'create' && $action != 'edit')
 	{
 	    // Delete
 		print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
-	}
-	elseif ($user->rights->expensereport->supprimer && $object->fk_statut != ExpenseReport::STATUS_CLOSED)
+	} elseif ($user->rights->expensereport->supprimer && $object->fk_statut != ExpenseReport::STATUS_CLOSED)
 	{
     	// Delete
 	    print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 050a7902a43..c246da650af 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -145,8 +145,7 @@ class ExpenseReports extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve Expense Report list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -411,8 +410,7 @@ class ExpenseReports extends DolibarrApi
         if ($this->expensereport->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else {
+        } else {
             throw new RestException(500, $this->expensereport->error);
         }
     }
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 124a1fe4e7d..c1d918fa3ec 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -308,8 +308,7 @@ class ExpenseReport extends CommonObject
     	            		$newndfline->rule_warning_message = $line->rule_warning_message;
     	            		$newndfline->fk_c_exp_tax_cat = $line->fk_c_exp_tax_cat;
     	            		$newndfline->fk_ecm_files = $line->fk_ecm_files;
-    	            	}
-    	            	else {
+    	            	} else {
     	            		$newndfline = $line;
     	            	}
     	                //$newndfline=new ExpenseReportLine($this->db);
@@ -351,24 +350,20 @@ class ExpenseReport extends CommonObject
 					{
 						$this->db->commit();
 						return $this->id;
-					}
-					else {
+					} else {
 						$this->db->rollback();
 						return -4;
 					}
-                }
-                else {
+                } else {
                     $this->db->rollback();
                     return -3;
                 }
-            }
-            else {
+            } else {
                 dol_syslog(get_class($this)."::create error ".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror()." sql=".$sql;
             $this->db->rollback();
             return -1;
@@ -436,8 +431,7 @@ class ExpenseReport extends CommonObject
         {
             $this->db->commit();
             return $this->id;
-        }
-        else {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -499,14 +493,12 @@ class ExpenseReport extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -2;
 			}
-        }
-        else {
+        } else {
 			$this->db->rollback();
             $this->error = $this->db->error();
             return -1;
@@ -598,12 +590,10 @@ class ExpenseReport extends CommonObject
                 $result = $this->fetch_lines();
 
                 return $result;
-            }
-            else {
+            } else {
                 return 0;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -649,19 +639,16 @@ class ExpenseReport extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					$this->error = $this->db->error();
 					return -2;
 				}
-            }
-            else {
+            } else {
 				$this->db->commit();
                 return 0;
             }
-        }
-        else {
+        } else {
 			$this->db->rollback();
             dol_print_error($this->db);
             return -1;
@@ -768,8 +755,7 @@ class ExpenseReport extends CommonObject
                 }
             }
             $this->db->free($resql);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -933,8 +919,7 @@ class ExpenseReport extends CommonObject
                 print '<td class="right" width="100">'.$langs->trans("TotalTTC").' : '.price($total_TTC).'</td>';
                 print '<td>&nbsp;</td>';
                 print '</tr>';
-            }
-            else {
+            } else {
                 $this->error = $db->lasterror();
                 return -1;
             }
@@ -983,8 +968,7 @@ class ExpenseReport extends CommonObject
                 dol_syslog(get_class($this)."::recalculer: Error ".$this->error, LOG_ERR);
                 return -3;
             endif;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this)."::recalculer: Error ".$this->error, LOG_ERR);
             return -3;
@@ -1016,8 +1000,7 @@ class ExpenseReport extends CommonObject
         if (!empty($conf->global->EXPENSEREPORT_LINES_SORTED_BY_ROWID))
         {
         	$sql .= ' ORDER BY de.rang ASC, de.rowid ASC';
-        }
-        else {
+        } else {
         	$sql .= ' ORDER BY de.rang ASC, de.date ASC';
         }
 
@@ -1066,8 +1049,7 @@ class ExpenseReport extends CommonObject
             }
             $this->db->free($resql);
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this)."::fetch_lines: Error ".$this->error, LOG_ERR);
             return -3;
@@ -1096,15 +1078,13 @@ class ExpenseReport extends CommonObject
             {
                 $this->db->commit();
                 return 1;
-            }
-            else {
+            } else {
                 $this->error = $this->db->error()." sql=".$sql;
                 dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -6;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->error()." sql=".$sql;
             dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
             $this->db->rollback();
@@ -1139,8 +1119,7 @@ class ExpenseReport extends CommonObject
         if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
         {
             $num = $this->getNextNumRef();
-        }
-        else {
+        } else {
             $num = $this->ref;
         }
         if (empty($num) || $num < 0) return -1;
@@ -1223,14 +1202,12 @@ class ExpenseReport extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -2;
 			}
-        }
-        else {
+        } else {
 			$this->db->rollback();
             $this->error = $this->db->lasterror();
             return -1;
@@ -1271,13 +1248,11 @@ class ExpenseReport extends CommonObject
             if ($this->db->query($sql))
             {
                 return 1;
-            }
-            else {
+            } else {
                 $this->error = $this->db->lasterror();
                 return -1;
             }
-        }
-        else {
+        } else {
             dol_syslog(get_class($this)."::set_save_from_refuse expensereport already with save status", LOG_WARNING);
         }
     }
@@ -1321,20 +1296,17 @@ class ExpenseReport extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					$this->error = $this->db->error();
 					return -2;
 				}
-            }
-            else {
+            } else {
 				$this->db->rollback();
                 $this->error = $this->db->lasterror();
                 return -1;
             }
-        }
-        else {
+        } else {
             dol_syslog(get_class($this)."::setApproved expensereport already with approve status", LOG_WARNING);
         }
 
@@ -1385,20 +1357,17 @@ class ExpenseReport extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					$this->error = $this->db->error();
 					return -2;
 				}
-            }
-            else {
+            } else {
 				$this->db->rollback();
                 $this->error = $this->db->lasterror();
                 return -1;
             }
-        }
-        else {
+        } else {
             dol_syslog(get_class($this)."::setDeny expensereport already with refuse status", LOG_WARNING);
         }
     }
@@ -1443,20 +1412,17 @@ class ExpenseReport extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					$this->error = $this->db->error();
 					return -2;
 				}
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -1;
 			}
-        }
-        else {
+        } else {
             dol_syslog(get_class($this)."::set_unpaid expensereport already with unpaid status", LOG_WARNING);
         }
     }
@@ -1504,20 +1470,17 @@ class ExpenseReport extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					$this->error = $this->db->error();
 					return -2;
 				}
-            }
-            else {
+            } else {
 				$this->db->rollback();
                 $this->error = $this->db->error();
                 return -1;
             }
-        }
-        else {
+        } else {
             dol_syslog(get_class($this)."::set_cancel expensereport already with cancel status", LOG_WARNING);
         }
     }
@@ -1560,15 +1523,13 @@ class ExpenseReport extends CommonObject
             if ($numref != "")
             {
             	return $numref;
-            }
-            else {
+            } else {
 				$this->error = $obj->error;
 				$this->errors = $obj->errors;
             	//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
             	return -1;
             }
-        }
-        else {
+        } else {
             $this->error = "Error_EXPENSEREPORT_ADDON_NotDefined";
             return -2;
         }
@@ -1784,20 +1745,17 @@ class ExpenseReport extends CommonObject
                 {
                     $this->db->commit();
                     return $this->line->id;
-                }
-                else {
+                } else {
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else {
+            } else {
                 $this->error = $this->line->error;
                 dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -2;
             }
-		}
-		else {
+		} else {
             dol_syslog(get_class($this)."::addline status of expense report must be Draft to allow use of ->addline()", LOG_ERR);
 			$this->error = 'ErrorExpenseNotDraft';
             return -3;
@@ -1846,8 +1804,7 @@ class ExpenseReport extends CommonObject
 
 					$new_current_total_ttc -= $amount_to_test - $rule->amount; // ex, entered 16€, limit 12€, subtracts 4€;
 					$rule_warning_message_tab[] = $langs->trans('ExpenseReportConstraintViolationError', $rule->id, price($amount_to_test, 0, $langs, 1, -1, -1, $conf->currency), price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency), $langs->trans('by'.$rule->code_expense_rules_type, price($new_current_total_ttc, 0, $langs, 1, -1, -1, $conf->currency)));
-				}
-				else {
+				} else {
 					$this->error = 'ExpenseReportConstraintViolationWarning';
 					$this->errors[] = $this->error;
 
@@ -1870,8 +1827,7 @@ class ExpenseReport extends CommonObject
 			$this->line->total_tva = $tmp[1];
 
 			return false;
-		}
-		else return true;
+		} else return true;
 	}
 
 	/**
@@ -1942,8 +1898,7 @@ class ExpenseReport extends CommonObject
 		{
 			$num = $this->db->num_rows($resql);
 			if ($num > 0) return true;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -2062,8 +2017,7 @@ class ExpenseReport extends CommonObject
             {
                 $this->db->commit();
                 return 1;
-            }
-            else {
+            } else {
                 $this->error = $this->line->error;
                 $this->errors = $this->line->errors;
                 $this->db->rollback();
@@ -2143,12 +2097,10 @@ class ExpenseReport extends CommonObject
 
                 if ($existe) return 1;
                 else return 0;
-            }
-            else {
+            } else {
                 return 0;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this)."::periode_existe  Error ".$this->error, LOG_ERR);
             return -1;
@@ -2189,8 +2141,7 @@ class ExpenseReport extends CommonObject
                 $i++;
             }
             return $users_validator;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this)."::fetch_users_approver_expensereport  Error ".$this->error, LOG_ERR);
             return -1;
@@ -2254,8 +2205,7 @@ class ExpenseReport extends CommonObject
                 $ret[$obj->code] = (($langs->trans($obj->code) != $obj->code) ? $langs->trans($obj->code) : $obj->label);
                 $i++;
             }
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
         return $ret;
@@ -2286,8 +2236,7 @@ class ExpenseReport extends CommonObject
             }
             $this->db->free($resql);
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -2333,8 +2282,7 @@ class ExpenseReport extends CommonObject
 	            $response->label = $langs->trans("ExpenseReportsToApprove");
 	            $response->labelShort = $langs->trans("ToApprove");
 	            $response->url = DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&amp;statut=2';
-	        }
-	        else {
+	        } else {
 	            $response->warning_delay = $conf->expensereport->payment->warning_delay / 60 / 60 / 24;
 	            $response->label = $langs->trans("ExpenseReportsToPay");
 	            $response->labelShort = $langs->trans("StatusToPay");
@@ -2351,8 +2299,7 @@ class ExpenseReport extends CommonObject
 	                if ($this->db->jdate($obj->date_valid) < ($now - $conf->expensereport->approve->warning_delay)) {
 	                    $response->nbtodolate++;
 	                }
-	            }
-	            else {
+	            } else {
                     if ($this->db->jdate($obj->date_valid) < ($now - $conf->expensereport->payment->warning_delay)) {
     	                $response->nbtodolate++;
                     }
@@ -2360,8 +2307,7 @@ class ExpenseReport extends CommonObject
             }
 
             return $response;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -2386,8 +2332,7 @@ class ExpenseReport extends CommonObject
         if ($option == 'toapprove')
         {
             return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->approve->warning_delay);
-        }
-        else return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->payment->warning_delay);
+        } else return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->payment->warning_delay);
     }
 
     /**
@@ -2410,8 +2355,7 @@ class ExpenseReport extends CommonObject
     		{
     			$alreadydispatched = $obj->nb;
     		}
-    	}
-    	else {
+    	} else {
     		$this->error = $this->db->lasterror();
     		return -1;
     	}
@@ -2444,8 +2388,7 @@ class ExpenseReport extends CommonObject
 			$obj = $this->db->fetch_object($resql);
 			$this->db->free($resql);
 			return $obj->amount;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -2639,8 +2582,7 @@ class ExpenseReportLine
 					$this->errors = $tmpparent->errors;
 				}
 			}
-        }
-		else {
+        } else {
 			$error++;
 		}
 
@@ -2648,8 +2590,7 @@ class ExpenseReportLine
         {
             $this->db->commit();
             return $this->id;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             dol_syslog("ExpenseReportLine::insert Error ".$this->error, LOG_ERR);
             $this->db->rollback();
@@ -2690,8 +2631,7 @@ class ExpenseReportLine
 				$obj = $this->db->fetch_object($resql);
 				$amount = (double) $obj->total_amount;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -2754,14 +2694,12 @@ class ExpenseReportLine
                     $this->error = $tmpparent->error;
                     $this->errors = $tmpparent->errors;
                 }
-            }
-            else {
+            } else {
                 $error++;
                 $this->error = $tmpparent->error;
                 $this->errors = $tmpparent->errors;
             }
-        }
-        else {
+        } else {
             $error++;
             dol_print_error($this->db);
         }
@@ -2770,8 +2708,7 @@ class ExpenseReportLine
         {
             $this->db->commit();
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             dol_syslog("ExpenseReportLine::update Error ".$this->error, LOG_ERR);
             $this->db->rollback();
@@ -2806,8 +2743,7 @@ function select_expensereport_statut($selected = '', $htmlname = 'fk_statut', $u
         if ($selected != '' && $selected == $key)
         {
             print '<option value="'.$key.'" selected>';
-        }
-        else {
+        } else {
             print '<option value="'.$key.'">';
         }
         print $langs->trans($val);
diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index 74bfdaf8bb8..59de531a662 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -122,8 +122,7 @@ class ExpenseReportIk extends CoreObject
 			{
 				$categories[$obj->rowid] = $obj;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -181,8 +180,7 @@ class ExpenseReportIk extends CoreObject
 					$ranges[] = $object;
 				}
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -220,8 +218,7 @@ class ExpenseReportIk extends CoreObject
 				if (!isset($ranges[$obj->fk_c_exp_tax_cat])) $ranges[$obj->fk_c_exp_tax_cat] = array('label' => $obj->label, 'active' => $obj->cat_active, 'ranges' => array());
 				$ranges[$obj->fk_c_exp_tax_cat]['ranges'][] = $obj;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -252,8 +249,7 @@ class ExpenseReportIk extends CoreObject
 		{
 			$obj = $db->fetch_object($resql);
 			return $obj->nbRange;
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
diff --git a/htdocs/expensereport/class/expensereport_rule.class.php b/htdocs/expensereport/class/expensereport_rule.class.php
index 33fc152d2b7..7ed3a5ecb09 100644
--- a/htdocs/expensereport/class/expensereport_rule.class.php
+++ b/htdocs/expensereport/class/expensereport_rule.class.php
@@ -185,8 +185,7 @@ class ExpenseReportRule extends CoreObject
 				if ($rule->fetch($obj->rowid) > 0) $rules[$rule->id] = $rule;
 				else dol_print_error($db);
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -208,8 +207,7 @@ class ExpenseReportRule extends CoreObject
 			if ($group->fetch($this->fk_usergroup) > 0)
 			{
 				return $group->nom;
-			}
-			else {
+			} else {
 				$this->error = $group->error;
 				$this->errors[] = $this->error;
 			}
@@ -233,8 +231,7 @@ class ExpenseReportRule extends CoreObject
 			if ($u->fetch($this->fk_user) > 0)
 			{
 				return dolGetFirstLastname($u->firstname, $u->lastname);
-			}
-			else {
+			} else {
 				$this->error = $u->error;
 				$this->errors[] = $this->error;
 			}
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 174e6ab05e7..cad3d62420e 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -159,8 +159,7 @@ class PaymentExpenseReport extends CommonObject
 			if ($resql)
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_expensereport");
-			}
-			else {
+			} else {
 				$error++;
 			}
 		}
@@ -170,8 +169,7 @@ class PaymentExpenseReport extends CommonObject
 		    $this->amount = $totalamount;
 		    $this->db->commit();
 			return $this->id;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -238,8 +236,7 @@ class PaymentExpenseReport extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -308,8 +305,7 @@ class PaymentExpenseReport extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -364,8 +360,7 @@ class PaymentExpenseReport extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -414,8 +409,7 @@ class PaymentExpenseReport extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -568,8 +562,7 @@ class PaymentExpenseReport extends CommonObject
                         }
                     }
                 }
-            }
-            else {
+            } else {
                 $this->error = $acc->error;
                 $error++;
             }
@@ -578,8 +571,7 @@ class PaymentExpenseReport extends CommonObject
         if (!$error)
         {
             return 1;
-        }
-        else {
+        } else {
             return -1;
         }
     }
@@ -602,8 +594,7 @@ class PaymentExpenseReport extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return 0;
 		}
@@ -675,8 +666,7 @@ class PaymentExpenseReport extends CommonObject
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
     }
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index ef344d8cadc..82ac70b7ccb 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -133,8 +133,7 @@ if ($object->id)
     $permtoedit = $user->rights->expensereport->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 7442aa7dc78..3c30154f7f1 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -233,13 +233,11 @@ if ($result)
 
             $i++;
         }
-    }
-    else {
+    } else {
         print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
     print '</table></div><br>';
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 print '</div></div></div>';
 
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 60b3575f0b6..6b165c1042e 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -226,8 +226,7 @@ if (empty($reshook))
     					if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
     						$langs->load("errors");
     						setEventMessages($langs->trans("ErrorLoginAlreadyExists", $objectuser->login), null, 'errors');
-    					}
-    					else {
+    					} else {
     						setEventMessages($objectuser->error, $objectuser->errors, 'errors');
     					}
     				}
@@ -236,8 +235,7 @@ if (empty($reshook))
     			if (!$error && !count($objectuser->errors)) {
     				setEventMessages($langs->trans("UserModified"), null, 'mesgs');
     				$db->commit();
-    			}
-    			else {
+    			} else {
     				$db->rollback();
     			}
     		}
@@ -406,8 +404,7 @@ if ($resql)
 				$maxRangeNum = ExpenseReportIk::getMaxRangeNumber($fuser->default_c_exp_tax_cat);
 				print $form->selectarray('default_range', range(0, $maxRangeNum), $fuser->default_range);
 				print '</td></tr>';
-			}
-			else {
+			} else {
 				print '<tr><td class="titlefield">'.$langs->trans("DefaultCategoryCar").'</td>';
 				print '<td class="fk_c_exp_tax_cat">';
 				print dol_getIdFromCode($db, $fuser->default_c_exp_tax_cat, 'c_exp_tax_cat', 'rowid', 'label');
@@ -456,14 +453,12 @@ if ($resql)
 			}
 
 			print '</div>';
-		}
-		else {
+		} else {
 			print '<div class="center">';
 			print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 			print '</div><br>';
 		}
-	}
-	else {
+	} else {
 		$title = $langs->trans("ListTripsAndExpenses");
 
 		$newcardbutton = '';
@@ -801,8 +796,7 @@ if ($resql)
 
 			$i++;
 		}
-	}
-	else {
+	} else {
 		$colspan = 1;
 		foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
 		print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
@@ -837,8 +831,7 @@ if ($resql)
 
 		print $formfile->showdocuments('massfilesarea_expensereport', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index 61e0d7326ca..3e8da949bff 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -64,8 +64,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expensere
         $db->commit();
         header("Location: ".DOL_URL_ROOT."/expensereport/index.php");
         exit;
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
 	}
@@ -101,8 +100,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->expensere
 
 		header('Location: card.php?id='.$object->id);
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -278,8 +276,7 @@ if ($resql)
 	print '</div>';
 
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -297,8 +294,7 @@ if ($action == '')
 		if (!$disable_delete)
 		{
 			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-		}
-		else {
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($title_button).'">'.$langs->trans('Delete').'</a>';
 		}
 	}
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index 62b52ee3ed8..00d690f20d5 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -158,8 +158,7 @@ if ($action == 'add_payment')
                 $loc = DOL_URL_ROOT.'/expensereport/card.php?id='.$id;
                 header('Location: '.$loc);
                 exit;
-            }
-            else {
+            } else {
                 $db->rollback();
             }
         }
@@ -320,8 +319,7 @@ if ($action == 'create' || empty($action))
 			$remaintopay = $objp->total_ttc - $sumpaid; // autofill remainder amount
 			print '<input type=hidden class="sum_remain" name="'.$nameRemain.'" value="'.$remaintopay.'">'; // autofill remainder amount
 			print '<input type="text" size="8" name="'.$namef.'" id="'.$namef.'">';
-		}
-		else {
+		} else {
 			print '-';
 		}
 		print "</td>";
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index 4218ebcbbd3..eff10cd9323 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -151,8 +151,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-}
-else {
+} else {
     $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
@@ -288,8 +287,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
 	print "<br>\n";
 	print $px2->show();
diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index 205afc61df3..f4f460719a0 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -42,8 +42,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
                 print '<img class="photoexpensereport photorefcenter" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
                 print '</div>';
                 print '</a>';
-            }
-            else {
+            } else {
                 $error = 0;
                 $thumbshown = '';
 
@@ -105,8 +104,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
 	                {
 	                    $checked = ' checked';
 	                    break;
-	                }
-	                elseif ($file['relativename'] && in_array($file['relativename'], GETPOST('attachfile', 'array'))) {
+	                } elseif ($file['relativename'] && in_array($file['relativename'], GETPOST('attachfile', 'array'))) {
 	                    $checked = ' checked';
 	                    break;
 	                }
@@ -131,8 +129,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
         print '</script>';
 
         print '</td></tr>';
-    }
-    else {
+    } else {
         print '<tr class="oddeven nohover trattachnewfilenow"'.(!GETPOSTISSET('sendit') && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
         print '<td colspan="'.$colspan.'">';
         print '<span class="opacitymedium">'.$langs->trans("NoFilesUploadedYet").'</span>';
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index a6873f2894a..e04b8f20dfb 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -141,8 +141,7 @@ class Export
 	    									if (!empty($perm[2]))
 	    									{
 	    										$bool = $user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
-	    									}
-	    									else {
+	    									} else {
 	    										$bool = $user->rights->{$perm[0]}->{$perm[1]};
 	    									}
 	    									if ($perm[0] == 'user' && $user->admin) $bool = true;
@@ -303,8 +302,7 @@ class Export
 					$ValueArray = explode("+", $ValueField);
 					$szFilterQuery = "(".$this->conditionDate($NameField, trim($ValueArray[0]), ">=");
 					$szFilterQuery .= " AND ".$this->conditionDate($NameField, trim($ValueArray[1]), "<=").")";
-				}
-				else {
+				} else {
 					if (is_numeric(substr($ValueField, 0, 1)))
 						$szFilterQuery = $this->conditionDate($NameField, trim($ValueField), "=");
 					else $szFilterQuery = $this->conditionDate($NameField, trim(substr($ValueField, 1)), substr($ValueField, 0, 1));
@@ -320,8 +318,7 @@ class Export
 					$ValueArray = explode("+", $ValueField);
 					$szFilterQuery = "(".$NameField.">=".$ValueArray[0];
 					$szFilterQuery .= " AND ".$NameField."<=".$ValueArray[1].")";
-				}
-				else {
+				} else {
 					if (is_numeric(substr($ValueField, 0, 1)))
 						$szFilterQuery = " ".$NameField."=".$ValueField;
 					else $szFilterQuery = " ".$NameField.substr($ValueField, 0, 1).substr($ValueField, 1);
@@ -465,8 +462,7 @@ class Export
 							if (!empty($ValueField) && $ValueField == $obj->rowid)
 							{
 								$szFilterField .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-							}
-							else {
+							} else {
 								$szFilterField .= '<option value="'.$obj->rowid.'" >'.$labeltoshow.'</option>';
 							}
 							$i++;
@@ -475,8 +471,7 @@ class Export
 					$szFilterField .= "</select>";
 
 					$this->db->free($resql);
-				}
-				else dol_print_error($this->db);
+				} else dol_print_error($this->db);
 				break;
 		}
 
@@ -653,8 +648,7 @@ class Export
 								    $remaintopay = $tmpobjforcomputecall->getRemainToPay();
 								}
 								$obj->$alias = $remaintopay;
-							}
-							else {
+							} else {
 							    // TODO FIXME Export of compute field does not work. $obj containt $obj->alias_field and formulat will contains $obj->field
 							    $computestring = $this->array_export_special[$indice][$key];
 							    $tmp = dol_eval($computestring, 1, 0);
@@ -676,14 +670,12 @@ class Export
 				$objmodel->close_file();
 
         		return 1;
-			}
-			else {
+			} else {
 				$this->error = $objmodel->error;
 				dol_syslog("Export::build_file Error: ".$this->error, LOG_ERR);
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error()." - sql=".$sql;
 			return -1;
 		}
@@ -725,8 +717,7 @@ class Export
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errno = $this->db->lasterrno();
 			$this->db->rollback();
@@ -761,13 +752,11 @@ class Export
 				$this->hexafiltervalue = $obj->filter;
 
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = "ModelNotFound";
 				return -2;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -3;
 		}
@@ -805,8 +794,7 @@ class Export
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index b6b0e7b7fa5..98353d42bf1 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -173,8 +173,7 @@ if ($action == 'selectfield')     // Selection of field at step 2
 		    //print_r($array_selected);
 		    $_SESSION["export_selected_fields"] = $array_selected;
 		}
-    }
-    else {
+    } else {
         $warnings = array();
 
         $array_selected[$field] = count($array_selected) + 1; // We tag the key $field as "selected"
@@ -189,8 +188,7 @@ if ($action == 'selectfield')     // Selection of field at step 2
             $tmp = $fieldsdependenciesarray[$fieldsentitiesarray[$field]]; // $fieldsdependenciesarray=array('element'=>'fd.rowid') or array('element'=>array('fd.rowid','ab.rowid'))
             if (is_array($tmp)) $listofdependencies = $tmp;
             else $listofdependencies = array($tmp);
-        }
-        elseif (!empty($field) && !empty($fieldsdependenciesarray[$field]))
+        } elseif (!empty($field) && !empty($fieldsdependenciesarray[$field]))
         {
             // We found a dependency on a dedicated field
             $tmp = $fieldsdependenciesarray[$field]; // $fieldsdependenciesarray=array('fd.fieldx'=>'fd.rowid') or array('fd.fieldx'=>array('fd.rowid','ab.rowid'))
@@ -221,8 +219,7 @@ if ($action == 'unselectfield')
     {
 		$array_selected = array();
 		$_SESSION["export_selected_fields"] = $array_selected;
-    }
-    else {
+    } else {
 	    unset($array_selected[$_GET["field"]]);
 	    // Renumber fields of array_selected (from 1 to nb_elements)
 	    asort($array_selected);
@@ -285,8 +282,7 @@ if ($action == 'builddoc')
 	{
 		setEventMessages($objexport->error, $objexport->errors, 'errors');
 		$sqlusedforexport = $objexport->sqlusedforexport;
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("FileSuccessfullyBuilt"), null, 'mesgs');
 	    $sqlusedforexport = $objexport->sqlusedforexport;
     }
@@ -347,15 +343,13 @@ if ($action == 'add_export_model')
 		if ($result >= 0)
 		{
 			setEventMessages($langs->trans("ExportModelSaved", $objexport->model_name), null, 'mesgs');
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			if ($objexport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				setEventMessages($langs->trans("ErrorExportDuplicateProfil"), null, 'errors');
 			else setEventMessages($objexport->error, $objexport->errors, 'errors');
 		}
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ExportModelName")), null, 'errors');
 	}
 }
@@ -466,14 +460,12 @@ if ($step == 1 || !$datatoexport)
             if ($objexport->array_export_perms[$key])
             {
             	print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&module_position='.$objexport->array_export_module[$key]->module_position.'&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"), 'filenew').'</a>';
-            }
-            else {
+            } else {
             	print $langs->trans("NotEnoughPermissions");
             }
            	print '</td></tr>';
         }
-    }
-    else {
+    } else {
         print '<tr><td class="oddeven" colspan="3">'.$langs->trans("NoExportableData").'</td></tr>';
     }
     print '</table>';
@@ -538,8 +530,7 @@ if ($step == 2 && $datatoexport)
     print '<span class="opacitymedium">'.$langs->trans("SelectExportFields").'</span> ';
     if (empty($conf->global->EXPORTS_SHARE_MODELS)) {
     	$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1, $user->id);
-    }
-    else {
+    } else {
     	$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1);
     }
     print ' ';
@@ -606,8 +597,7 @@ if ($step == 2 && $datatoexport)
         if (!empty($objexport->array_export_special[0][$code]))
         {
             $htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
-        }
-        else {
+        } else {
             $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
         }
    		if (!empty($objexport->array_export_examplevalues[0][$code]))
@@ -633,8 +623,7 @@ if ($step == 2 && $datatoexport)
             print $form->textwithpicto($text, $htmltext);
 			//print ' ('.$code.')';
             print '</td>';
-        }
-        else {
+        } else {
         	// Fields not selected
             print '<td>';
 			//print $text.'-'.$htmltext."<br>";
@@ -662,12 +651,10 @@ if ($step == 2 && $datatoexport)
 		if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
 		{
 			print '<a class="butAction" href="export.php?step=3&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
-		}
-		else {
+		} else {
 			print '<a class="butAction" href="export.php?step=4&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
 		}
-	}
-	else {
+	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("SelectAtLeastOneField")).'">'.$langs->trans("NextStep").'</a>';
 	}
 
@@ -798,8 +785,7 @@ if ($step == 3 && $datatoexport)
         if (!empty($objexport->array_export_special[0][$code]))
 		{
 		    $htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
-		}
-		else {
+		} else {
 		    $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
 		}
 		if (!empty($objexport->array_export_examplevalues[0][$code]))
@@ -828,8 +814,7 @@ if ($step == 3 && $datatoexport)
 			{
 				$tmp = $objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter);
 				print $form->textwithpicto($tmp, $szInfoFiltre);
-			}
-			else {
+			} else {
 				print $objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter);
 			}
 		}
@@ -991,8 +976,7 @@ if ($step == 4 && $datatoexport)
         if (!empty($objexport->array_export_special[0][$code]))
         {
             $htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
-        }
-        else {
+        } else {
             $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
         }
         if (!empty($objexport->array_export_examplevalues[0][$code]))
@@ -1096,8 +1080,7 @@ if ($step == 4 && $datatoexport)
 				print '</tr>';
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1291,6 +1274,5 @@ function getablenamefromfield($code, $sqlmaxforexport)
 	if (preg_match($regexstring, $newsql, $reg))
 	{
 		return $reg[1]; // The tablename
-	}
-	else return '';
+	} else return '';
 }
diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php
index 70f235f4a27..e2af9e5267d 100644
--- a/htdocs/externalsite/admin/externalsite.php
+++ b/htdocs/externalsite/admin/externalsite.php
@@ -59,8 +59,7 @@ if ($action == 'update')
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		$db->rollback();
 		setEventMessages($db->lasterror(), null, 'errors');
 	}
diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php
index 5393f68b640..4827d832af4 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -63,18 +63,15 @@ if (!empty($keyforcontent))
 	{
 		$langs->load("errors");
 		print $langs->trans("ErrorBadSyntaxForParamKeyForContent", 'EXTERNAL_SITE_CONTENT_', 'EXTERNAL_SITE_URL_');
-	}
-	elseif (empty($conf->global->$keyforcontent))
+	} elseif (empty($conf->global->$keyforcontent))
 	{
 		$langs->load("errors");
 		print $langs->trans("ErrorVariableKeyForContentMustBeSet", 'EXTERNAL_SITE_CONTENT_'.$keyforcontent, 'EXTERNAL_SITE_URL_'.$keyforcontent);
-	}
-	else {
+	} else {
 		if (preg_match('/EXTERNAL_SITE_CONTENT_/', $keyforcontent))
 		{
 			print $conf->global->$keyforcontent;
-		}
-		elseif (preg_match('/EXTERNAL_SITE_URL_/', $keyforcontent))
+		} elseif (preg_match('/EXTERNAL_SITE_URL_/', $keyforcontent))
 		{
 			/*print "
 			<html>
@@ -113,8 +110,7 @@ if (!empty($keyforcontent))
 
 	print '<div>';
 	llxFooter();
-}
-else {
+} else {
 	if (preg_match('/^\//', $conf->global->EXTERNALSITE_URL) || preg_match('/^http/i', $conf->global->EXTERNALSITE_URL))
 	{
 		print "
@@ -148,8 +144,7 @@ else {
 
 	</html>
 	";
-	}
-	else {
+	} else {
 		llxHeader();
 		print '<div class="framecontent" style="height: '.($_SESSION['dol_screenheight'] - 90).'px">';
 		print $conf->global->EXTERNALSITE_URL;
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 96febdcf34f..55ad529df3b 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -424,8 +424,7 @@ if ($action == 'create') {
 		print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		print '</div>';
 		print "</form>\n";
-	}
-	else {
+	} else {
 		dol_print_error('', "Error, no fichinter ".$object->id);
 	}
 } elseif ($action == 'selsocforcreatefrommodel') {
@@ -623,8 +622,7 @@ if ($action == 'create') {
 			print '</td><td>';
 			if ($action == 'nb_gen_max' || $object->frequency > 0) {
 				print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max ? $object->nb_gen_max : '', $object, $user->rights->facture->creer);
-			}
-			else print '';
+			} else print '';
 
 			print '</td>';
 			print '</tr>';
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index cb2022e511c..ed01164b3df 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -129,8 +129,7 @@ if (empty($reshook))
 		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else {
+		} else {
 			if ($object->id > 0)
 			{
 				// Because createFromClone modifies the object, we must clone it so that we can restore it later
@@ -141,8 +140,7 @@ if (empty($reshook))
 				{
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit;
-				}
-				else {
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$object = $orig;
 					$action = '';
@@ -174,13 +172,10 @@ if (empty($reshook))
 
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
-		}
-		else {
+		} else {
 			$mesg = '<div class="error">'.$object->error.'</div>';
 		}
-	}
-
-	elseif ($action == 'confirm_modify' && $confirm == 'yes' && $user->rights->ficheinter->creer)
+	} elseif ($action == 'confirm_modify' && $confirm == 'yes' && $user->rights->ficheinter->creer)
 	{
 		$result = $object->setDraft($user);
 		if ($result >= 0)
@@ -202,13 +197,10 @@ if (empty($reshook))
 
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
-		}
-		else {
+		} else {
 			$mesg = '<div class="error">'.$object->error.'</div>';
 		}
-	}
-
-	elseif ($action == 'add' && $user->rights->ficheinter->creer)
+	} elseif ($action == 'add' && $user->rights->ficheinter->creer)
 	{
 	    $object->socid = $socid;
 	    $object->duration = GETPOST('duration', 'int');
@@ -379,18 +371,15 @@ if (empty($reshook))
 								}
 							}
 						}
-		            }
-		            else {
+		            } else {
 		                $mesg = $srcobject->error;
 		                $error++;
 		            }
-		        }
-		        else {
+		        } else {
 		            $mesg = $object->error;
 		            $error++;
 		        }
-		    }
-		    else {
+		    } else {
 		    	// Fill array 'array_options' with data from add form
 		    	$ret = $extrafields->setOptionalsFromPost(null, $object);
 		    	if ($ret < 0) {
@@ -409,22 +398,18 @@ if (empty($reshook))
 		    		if ($result > 0)
 		    		{
 		    			$id = $result; // Force raffraichissement sur fiche venant d'etre cree
-		    		}
-		    		else {
+		    		} else {
 		    			$langs->load("errors");
 		    			setEventMessages($object->error, $object->errors, 'errors');
 		    			$action = 'create';
 		    		}
 		    	}
 	        }
-	    }
-	    else {
+	    } else {
 	    	$mesg = '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")).'</div>';
 	        $action = 'create';
 	    }
-	}
-
-	elseif ($action == 'update' && $user->rights->ficheinter->creer)
+	} elseif ($action == 'update' && $user->rights->ficheinter->creer)
 	{
 		$object->socid = $socid;
 		$object->fk_project		= GETPOST('projectid', 'int');
@@ -451,9 +436,7 @@ if (empty($reshook))
 	{
 		$result = $object->set_contrat($user, GETPOST('contratid', 'int'));
 		if ($result < 0) dol_print_error($db, $object->error);
-	}
-
-	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->ficheinter->supprimer)
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->ficheinter->supprimer)
 	{
 		$result = $object->delete($user);
 		if ($result < 0) {
@@ -462,9 +445,7 @@ if (empty($reshook))
 
 		header('Location: '.DOL_URL_ROOT.'/fichinter/list.php?leftmenu=ficheinter&restore_lastsearch_values=1');
 		exit;
-	}
-
-	elseif ($action == 'setdescription' && $user->rights->ficheinter->creer)
+	} elseif ($action == 'setdescription' && $user->rights->ficheinter->creer)
 	{
 		$result = $object->set_description($user, GETPOST('description'));
 		if ($result < 0) dol_print_error($db, $object->error);
@@ -528,8 +509,7 @@ if (empty($reshook))
 				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->modelpdf, $outputlangs);
 				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 				exit;
-			}
-			else {
+			} else {
 				$mesg = $object->error;
 				$db->rollback();
 			}
@@ -544,8 +524,7 @@ if (empty($reshook))
 		{
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -558,8 +537,7 @@ if (empty($reshook))
 		{
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
-		}
-		else {
+		} else {
 			$mesg = '<div class="error">'.$object->error.'</div>';
 		}
 	}
@@ -572,8 +550,7 @@ if (empty($reshook))
 	    {
 	        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	        exit;
-	    }
-	    else {
+	    } else {
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
@@ -685,9 +662,7 @@ if (empty($reshook))
 
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.$lineid);
 		exit;
-	}
-
-	elseif ($action == 'down' && $user->rights->ficheinter->creer)
+	} elseif ($action == 'down' && $user->rights->ficheinter->creer)
 	{
 		$object->line_down($lineid);
 
@@ -756,14 +731,12 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else {
+			} else {
 				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("errors");
 					$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
-				}
-				else {
+				} else {
 					$mesg = '<div class="error">'.$object->error.'</div>';
 				}
 			}
@@ -784,8 +757,7 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -830,8 +802,7 @@ if ($action == 'create')
         if ($element == 'project')
         {
             $projectid = GETPOST('originid', 'int');
-        }
-        else {
+        } else {
             // For compatibility
 			if ($element == 'order' || $element == 'commande') {
 				$element = $subelement = 'commande';
@@ -865,8 +836,7 @@ if ($action == 'create')
 			// Object source contacts list
 			$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);
 		}
-	}
-	else {
+	} else {
 		$projectid = GETPOST('projectid', 'int');
 	}
 
@@ -1045,8 +1015,7 @@ if ($action == 'create')
 
 			print '</table>';
 		}
-	}
-	else {
+	} else {
 		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 
@@ -1077,8 +1046,7 @@ if ($action == 'create')
 
 		print '</form>';
 	}
-}
-elseif ($id > 0 || !empty($ref))
+} elseif ($id > 0 || !empty($ref))
 {
 	/*
 	 * Affichage en mode visu
@@ -1117,8 +1085,7 @@ elseif ($id > 0 || !empty($ref))
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else {
+		} else {
 			$numref = $object->ref;
 		}
 		$text = $langs->trans('ConfirmValidateIntervention', $numref);
@@ -1272,16 +1239,14 @@ elseif ($id > 0 || !empty($ref))
 		{
 			$formcontract = new Formcontract($db);
 			$formcontract->formSelectContract($_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, $object->fk_contrat, 'contratid', 0, 1);
-		}
-		else {
+		} else {
 			if ($object->fk_contrat)
             {
                 $contratstatic = new Contrat($db);
                 $contratstatic->fetch($object->fk_contrat);
                 //print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
                 print $contratstatic->getNomUrl(0, '', 1);
-            }
-            else {
+            } else {
                 print "&nbsp;";
             }
 		}
@@ -1343,8 +1308,7 @@ elseif ($id > 0 || !empty($ref))
 		{
 			print '<input type="hidden" name="action" value="updateline">';
 			print '<input type="hidden" name="line_id" value="'.GETPOST('line_id', 'int').'">';
-		}
-		else {
+		} else {
 			print '<input type="hidden" name="action" value="addline">';
 		}
 
@@ -1425,8 +1389,7 @@ elseif ($id > 0 || !empty($ref))
 							}
 						}
 						print '</td>';
-					}
-					else {
+					} else {
 						print '<td colspan="2">&nbsp;</td>';
 					}
 
@@ -1562,8 +1525,7 @@ elseif ($id > 0 || !empty($ref))
 			}
 
 			if ($num) print '</table>';
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -1613,8 +1575,7 @@ elseif ($id > 0 || !empty($ref))
 						if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send)
 						{
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-						}
-						else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
+						} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
 					}
 				}
 
@@ -1651,8 +1612,7 @@ elseif ($id > 0 || !empty($ref))
 						if ($object->statut != Fichinter::STATUS_BILLED)
 						{
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("InterventionClassifyBilled").'</a></div>';
-						}
-						else {
+						} else {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifyunbilled">'.$langs->trans("InterventionClassifyUnBilled").'</a></div>';
 						}
 					}
diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
index 4f81930355e..b36ca265b6f 100644
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -172,8 +172,7 @@ class Interventions extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve intervention list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 0574c38cdfb..754fc8dd507 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -206,8 +206,7 @@ class Fichinter extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -333,15 +332,13 @@ class Fichinter extends CommonObject
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				$this->error = join(',', $this->errors);
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -401,8 +398,7 @@ class Fichinter extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -427,8 +423,7 @@ class Fichinter extends CommonObject
 		if ($ref) {
 			$sql .= " WHERE f.entity IN (".getEntity('intervention').")";
 			$sql .= " AND f.ref='".$this->db->escape($ref)."'";
-		}
-		else $sql .= " WHERE f.rowid=".$rowid;
+		} else $sql .= " WHERE f.rowid=".$rowid;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -476,8 +471,7 @@ class Fichinter extends CommonObject
 				$this->db->free($resql);
 				return 1;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -530,8 +524,7 @@ class Fichinter extends CommonObject
 			    $this->db->rollback();
 			    return -1;
 			}
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -562,8 +555,7 @@ class Fichinter extends CommonObject
 			if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 			{
 				$num = $this->getNextNumRef($this->thirdparty);
-			}
-			else {
+			} else {
 				$num = $this->ref;
 			}
 			$this->newref = dol_sanitizeFileName($num);
@@ -648,8 +640,7 @@ class Fichinter extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::setValid ".$this->error, LOG_ERR);
 				return -1;
@@ -869,13 +860,11 @@ class Fichinter extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else {
+			} else {
 				dol_print_error($db, "Fichinter::getNextNumRef ".$obj->error);
 				return "";
 			}
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("Error_FICHEINTER_ADDON_NotDefined");
 			return "";
@@ -933,8 +922,7 @@ class Fichinter extends CommonObject
 				}
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -1053,8 +1041,7 @@ class Fichinter extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1084,8 +1071,7 @@ class Fichinter extends CommonObject
 			{
 				$this->date_delivery = $date_delivery;
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = $this->db->error();
 				dol_syslog("Fichinter::set_date_delivery Erreur SQL");
 				return -1;
@@ -1117,8 +1103,7 @@ class Fichinter extends CommonObject
 			{
 				$this->description = $description;
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = $this->db->error();
 				dol_syslog("Fichinter::set_description Erreur SQL");
 				return -1;
@@ -1150,8 +1135,7 @@ class Fichinter extends CommonObject
 			{
 				$this->fk_contrat = $contractid;
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = $this->db->error();
 				return -1;
 			}
@@ -1241,8 +1225,7 @@ class Fichinter extends CommonObject
 		{
 			$this->db->commit();
 			return $this->id;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1286,8 +1269,7 @@ class Fichinter extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = $this->db->error();
 				$this->db->rollback();
 				return -1;
@@ -1378,8 +1360,7 @@ class Fichinter extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1482,8 +1463,7 @@ class FichinterLigne extends CommonObjectLine
 
 			$this->db->free($result);
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error().' sql='.$sql;
 			return -1;
 		}
@@ -1517,8 +1497,7 @@ class FichinterLigne extends CommonObjectLine
 			{
 				$obj = $this->db->fetch_object($resql);
 				$rangToUse = $obj->max + 1;
-			}
-			else {
+			} else {
 				dol_print_error($this->db);
 				$this->db->rollback();
 				return -1;
@@ -1570,13 +1549,11 @@ class FichinterLigne extends CommonObjectLine
 			if (!$error) {
 				$this->db->commit();
 				return $result;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -1636,14 +1613,12 @@ class FichinterLigne extends CommonObjectLine
 			{
 				$this->db->commit();
 				return $result;
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1687,14 +1662,12 @@ class FichinterLigne extends CommonObjectLine
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = $this->db->error();
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -1744,19 +1717,16 @@ class FichinterLigne extends CommonObjectLine
 
 					$this->db->commit();
 					return $result;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else {
+			} else {
 				$this->error = $this->db->error()." sql=".$sql;
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			return -2;
 		}
 	}
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index bf0ec43cce2..e991efb2009 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -66,8 +66,7 @@ if ($action == 'addcontact' && $user->rights->ficheinter->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			$mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
@@ -94,8 +93,7 @@ elseif ($action == 'deletecontact' && $user->rights->ficheinter->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 099d542b462..9825c0a58d1 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -170,8 +170,7 @@ if ($object->id)
     $permtoedit = $user->rights->ficheinter->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 42649efb2f2..ccadf89f1e4 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -179,8 +179,7 @@ if ($resql)
     //print '<tr class="liste_total"><td>'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')</td><td class="right">'.$totalinprocess.'</td></tr>';
     print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
     print "</table></div><br>";
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -297,8 +296,7 @@ if ($resql)
 		}
 	}
 	print "</table></div><br>";
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 /*
@@ -368,8 +366,7 @@ if (!empty($conf->ficheinter->enabled))
 		}
 
 		print "</table></div><br>";
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 }
 
 print '</div></div></div>';
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 481c7c075a1..4d18a54cb54 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -652,8 +652,7 @@ if ($resql)
 	$delallowed = $user->rights->ficheinter->creer;
 
 	print $formfile->showdocuments('massfilesarea_interventions', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index a761cdff622..cb076e01ef1 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -81,8 +81,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenamenb = $dir.'/interventionsnbinyear-'.$user->id.'-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else {
+} else {
     $filenamenb = $dir.'/interventionsnbinyear-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsnbinyear-'.$year.'.png';
 }
@@ -120,8 +119,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenameamount = $dir.'/interventionsamountinyear-'.$user->id.'-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsamountinyear-'.$user->id.'-'.$year.'.png';
-}
-else {
+} else {
     $filenameamount = $dir.'/interventionsamountinyear-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsamountinyear-'.$year.'.png';
 }
@@ -158,8 +156,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filename_avg = $dir.'/interventionsaverage-'.$user->id.'-'.$year.'.png';
     $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsaverage-'.$user->id.'-'.$year.'.png';
-}
-else {
+} else {
     $filename_avg = $dir.'/interventionsaverage-'.$year.'.png';
     $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsaverage-'.$year.'.png';
 }
@@ -310,8 +307,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     /*print "<br>\n";
     print $px2->show();
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 535fcae5e75..c10b9dbf162 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -235,8 +235,7 @@ if ($object->id > 0)
 	if ($action == 'editconditions')
 	{
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_supplier_id, 'cond_reglement_supplier_id', -1, 1);
-	}
-	else {
+	} else {
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_supplier_id, 'none');
 	}
 	print "</td>";
@@ -253,8 +252,7 @@ if ($object->id > 0)
 	if ($action == 'editmode')
 	{
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_supplier_id, 'mode_reglement_supplier_id', 'DBIT', 1, 1);
-	}
-	else {
+	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_supplier_id, 'none');
 	}
 	print "</td>";
@@ -332,8 +330,7 @@ if ($object->id > 0)
         {
             $adh->ref = $adh->getFullName($langs);
             print $adh->getNomUrl(1);
-        }
-        else {
+        } else {
             print $langs->trans("ThirdpartyNotLinkedToMember");
         }
         print '</td>';
@@ -563,8 +560,7 @@ if ($object->id > 0)
 	            if ($obj->dc)
 	            {
 	                print dol_print_date($db->jdate($obj->dc), 'day');
-	            }
-	            else {
+	            } else {
 	                print "-";
 	            }
 	            print '</td>';
@@ -575,8 +571,7 @@ if ($object->id > 0)
 	        $db->free($resql);
 
 	        if ($num > 0) print "</table>";
-	    }
-	    else {
+	    } else {
 	        dol_print_error($db);
 	    }
 	}
@@ -601,8 +596,7 @@ if ($object->id > 0)
 		if (empty($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS))
 		{
 			$sql2 .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY.")"; //  Must match filter in htdocs/fourn/orderstoinvoice.php
-		}
-		else {
+		} else {
 			// CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.", ".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY
 			$sql2 .= " AND c.fk_statut IN (".$db->escape($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS).")";
 		}
@@ -671,8 +665,7 @@ if ($object->id > 0)
 				if ($obj->dc)
 				{
 					print dol_print_date($db->jdate($obj->dc), 'day');
-				}
-				else {
+				} else {
 					print "-";
 				}
 				print '</td>';
@@ -683,8 +676,7 @@ if ($object->id > 0)
 			$db->free($resql);
 
 			if ($num > 0) print "</table>";
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -753,8 +745,7 @@ if ($object->id > 0)
 			}
 			$db->free($resql);
 			if ($num > 0) print '</table>';
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -808,12 +799,10 @@ if ($object->id > 0)
 				{
 					// Company is open
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/orderstoinvoice.php?socid='.$object->id.'">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
-				}
-				else {
+				} else {
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
 				}
-			}
-			else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice").' ('.$langs->trans("WithReceptionFinished").')').'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+			} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice").' ('.$langs->trans("WithReceptionFinished").')').'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
 		}
 
 		if ($user->rights->fournisseur->facture->creer)
@@ -832,8 +821,7 @@ if ($object->id > 0)
         	if ($user->rights->agenda->myactions->create)
         	{
             	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a>';
-        	}
-        	else {
+        	} else {
             	print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
         	}
     	}
@@ -859,8 +847,7 @@ if ($object->id > 0)
     	// List of done actions
     	show_actions_done($conf, $langs, $db, $object);
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index c69b9aa701d..5ec2b6f49a6 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -177,8 +177,7 @@ class SupplierInvoices extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve supplier invoice list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -669,8 +668,7 @@ class SupplierInvoices extends DolibarrApi
     	$updateRes = $this->invoice->deleteline($lineid);
     	if ($updateRes > 0) {
     		return $this->get($id);
-    	}
-    	else {
+    	} else {
     		throw new RestException(405, $this->invoice->error);
     	}
     }
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index 9e22d952920..bee6346386b 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -175,8 +175,7 @@ class SupplierOrders extends DolibarrApi
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(503, 'Error when retrieve supplier order list : '.$db->lasterror());
 		}
 		if (!count($obj_ret)) {
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index 70f4fcfe233..e9ba334313c 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -95,8 +95,7 @@ class Fournisseur extends Societe
 		{
 			$obj = $this->db->fetch_object($resql);
 			return $obj->nb;
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -135,8 +134,7 @@ class Fournisseur extends Societe
 			}
             $this->db->free($resql);
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -164,8 +162,7 @@ class Fournisseur extends Societe
 		{
 			dol_syslog("Fournisseur::CreateCategory : Success");
 			return 0;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog("Fournisseur::CreateCategory : Failed (".$this->error.")");
 			return -1;
@@ -201,8 +198,7 @@ class Fournisseur extends Societe
 			{
 				$arr[$obj->rowid] = $obj->name;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->lasterror();
 		}
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 59f4e583e14..22cb26b749c 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -422,12 +422,10 @@ class CommandeFournisseur extends CommonOrder
             if ($result < 0)
             {
             	return -1;
-            }
-            else {
+            } else {
             	return 1;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->error()." sql=".$sql;
             return -1;
         }
@@ -545,8 +543,7 @@ class CommandeFournisseur extends CommonOrder
     		$this->db->free($result);
 
     		return $num;
-    	}
-    	else {
+    	} else {
     		$this->error = $this->db->error()." sql=".$sql;
     		return -1;
     	}
@@ -582,8 +579,7 @@ class CommandeFournisseur extends CommonOrder
             if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
             {
                 $num = $this->getNextNumRef($soc);
-            }
-            else {
+            } else {
                 $num = $this->ref;
             }
             $this->newref = dol_sanitizeFileName($num);
@@ -662,13 +658,11 @@ class CommandeFournisseur extends CommonOrder
             {
                 $this->db->commit();
                 return 1;
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else {
+        } else {
             $this->error = 'NotAuthorized';
             dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
             return -1;
@@ -875,13 +869,11 @@ class CommandeFournisseur extends CommonOrder
             if ($numref != "")
             {
                 return $numref;
-            }
-            else {
+            } else {
                 $this->error = $obj->error;
                 return -1;
             }
-        }
-        else {
+        } else {
             $this->error = "Error_COMMANDE_SUPPLIER_ADDON_NotDefined";
             return -2;
         }
@@ -915,13 +907,11 @@ class CommandeFournisseur extends CommonOrder
 
         	    $this->db->commit();
         	    return 1;
-        	}
-        	else {
+        	} else {
         	    $this->db->rollback();
                 return -1;
         	}
-        }
-        else {
+        } else {
         	dol_print_error($this->db);
 
         	$this->db->rollback();
@@ -960,8 +950,7 @@ class CommandeFournisseur extends CommonOrder
             if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
             {
                 $num = $this->getNextNumRef($soc);
-            }
-            else {
+            } else {
                 $num = $this->ref;
             }
             $this->newref = dol_sanitizeFileName($num);
@@ -984,8 +973,7 @@ class CommandeFournisseur extends CommonOrder
     	        	    $comment = ' (first level)';
     	        	}
     	        }
-			}
-			else // request a second level approval
+			} else // request a second level approval
 			{
             	$sql .= " date_approve2='".$this->db->idate($now)."',";
             	$sql .= " fk_user_approve2 = ".$user->id;
@@ -1052,8 +1040,7 @@ class CommandeFournisseur extends CommonOrder
 					{
 			            $this->date_approve = $now;
 		    	        $this->user_approve_id = $user->id;
-					}
-					else // request a second level approval
+					} else // request a second level approval
 					{
 			            $this->date_approve2 = $now;
 		    	        $this->user_approve_id2 = $user->id;
@@ -1061,19 +1048,16 @@ class CommandeFournisseur extends CommonOrder
 
                     $this->db->commit();
                     return 1;
-                }
-                else {
+                } else {
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 $this->error = $this->db->lasterror();
                 return -1;
             }
-        }
-        else {
+        } else {
             dol_syslog(get_class($this)."::approve Not Authorized", LOG_ERR);
         }
         return -1;
@@ -1112,19 +1096,16 @@ class CommandeFournisseur extends CommonOrder
                     {
                         $error++;
                         $this->db->rollback();
-                    }
-                    else $this->db->commit();
+                    } else $this->db->commit();
 					// End call triggers
                 }
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 $this->error = $this->db->lasterror();
                 dol_syslog(get_class($this)."::refuse Error -1");
                 $result = -1;
             }
-        }
-        else {
+        } else {
             dol_syslog(get_class($this)."::refuse Not Authorized");
         }
         return $result;
@@ -1170,20 +1151,17 @@ class CommandeFournisseur extends CommonOrder
                 {
                     $this->db->commit();
                     return 1;
-                }
-                else {
+                } else {
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 $this->error = $this->db->lasterror();
                 dol_syslog(get_class($this)."::cancel ".$this->error);
                 return -1;
             }
-        }
-        else {
+        } else {
             dol_syslog(get_class($this)."::cancel Not Authorized");
             return -1;
         }
@@ -1227,8 +1205,7 @@ class CommandeFournisseur extends CommonOrder
                 $result = $this->call_trigger('ORDER_SUPPLIER_SUBMIT', $user);
                 if ($result < 0) $error++;
                 // End call triggers
-            }
-            else {
+            } else {
                 $error++;
                 $this->error = $this->db->lasterror();
                 $this->errors[] = $this->db->lasterror();
@@ -1237,12 +1214,10 @@ class CommandeFournisseur extends CommonOrder
             if (!$error)
             {
                 $this->db->commit();
-            }
-            else {
+            } else {
                 $this->db->rollback();
             }
-        }
-        else {
+        } else {
             $error++;
             $this->error = $langs->trans('NotAuthorized');
             $this->errors[] = $langs->trans('NotAuthorized');
@@ -1405,8 +1380,7 @@ class CommandeFournisseur extends CommonOrder
 							                $error++;
 							            }
 							        }
-							    }
-							    else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+							    } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
 							    {
 							        $origin_id = $tmp_origin_id;
 									$ret = $this->add_object_linked($origin, $origin_id);
@@ -1440,15 +1414,13 @@ class CommandeFournisseur extends CommonOrder
 
 	                $this->db->commit();
 	                return $this->id;
-	            }
-	            else {
+	            } else {
 	                $this->error = $this->db->lasterror();
 	                $this->db->rollback();
 	                return -2;
 	            }
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -1532,8 +1504,7 @@ class CommandeFournisseur extends CommonOrder
         {
             $this->db->commit();
             return $this->id;
-        }
-        else {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -1600,8 +1571,7 @@ class CommandeFournisseur extends CommonOrder
 			if ($price_base_type == 'HT')
 			{
 				$pu = $pu_ht;
-			}
-			else {
+			} else {
 				$pu = $pu_ttc;
 			}
 			$desc = trim($desc);
@@ -1671,8 +1641,7 @@ class CommandeFournisseur extends CommonOrder
                             dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
                             return -1;
                         }
-                    }
-                    else {
+                    } else {
                         $this->error = $prod->error;
                         $this->db->rollback();
                         return -1;
@@ -1687,8 +1656,7 @@ class CommandeFournisseur extends CommonOrder
 					if ($qty < $prod->packaging)
 					{
 						$qty = $prod->packaging;
-					}
-					else {
+					} else {
 						if (($qty % $prod->packaging) > 0)
 						{
 							$coeff = intval($qty / $prod->packaging) + 1;
@@ -1697,8 +1665,7 @@ class CommandeFournisseur extends CommonOrder
 						}
 					}
 				}
-            }
-            else {
+            } else {
                 $product_type = $type;
             }
 
@@ -1811,13 +1778,11 @@ class CommandeFournisseur extends CommonOrder
                 {
                     $this->db->commit();
                     return $this->line->id;
-                }
-                else {
+                } else {
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else {
+            } else {
                 $this->error = $this->line->error;
                 $this->errors = $this->line->errors;
                 dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
@@ -1894,8 +1859,7 @@ class CommandeFournisseur extends CommonOrder
                     }
 					// End call triggers
                 }
-            }
-            else {
+            } else {
                 $this->error = $this->db->lasterror();
                 $error++;
             }
@@ -1923,13 +1887,11 @@ class CommandeFournisseur extends CommonOrder
             {
                 $this->db->commit();
                 return 1;
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else {
+        } else {
             $this->error = 'BadStatusForObject';
             return -2;
         }
@@ -1957,14 +1919,12 @@ class CommandeFournisseur extends CommonOrder
             {
                 $this->update_price();
                 return 1;
-            }
-            else {
+            } else {
                 $this->error = $line->error;
                 $this->errors = $line->errors;
                 return -1;
             }
-        }
-        else {
+        } else {
             return -2;
         }
     }
@@ -2028,8 +1988,7 @@ class CommandeFournisseur extends CommonOrder
                 $this->errors[] = $this->db->lasterror();
                 $error++;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->db->lasterror();
             $error++;
@@ -2091,8 +2050,7 @@ class CommandeFournisseur extends CommonOrder
 			dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG);
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -$error;
@@ -2127,8 +2085,7 @@ class CommandeFournisseur extends CommonOrder
                 $i++;
             }
             return 0;
-        }
-        else {
+        } else {
             return -1;
         }
     }
@@ -2178,8 +2135,7 @@ class CommandeFournisseur extends CommonOrder
 
 				$i++;
 			}
-		}
-		else dol_print_error($this->db, 'Failed to execute request to get dispatched lines');
+		} else dol_print_error($this->db, 'Failed to execute request to get dispatched lines');
 
 		return $ret;
     }
@@ -2275,22 +2231,19 @@ class CommandeFournisseur extends CommonOrder
                     if (!$error)
                     {
                         $this->db->commit();
-                    }
-                    else {
+                    } else {
                         $this->statut = $old_statut;
                         $this->db->rollback();
                         $this->error = $this->db->lasterror();
                         $result = -1;
                     }
-                }
-                else {
+                } else {
                     $this->db->rollback();
                     $this->error = $this->db->lasterror();
                     $result = -1;
                 }
             }
-        }
-        else {
+        } else {
             $this->error = $langs->trans('NotAuthorized');
             $this->errors[] = $langs->trans('NotAuthorized');
             dol_syslog(get_class($this)."::Livraison Not Authorized");
@@ -2347,8 +2300,7 @@ class CommandeFournisseur extends CommonOrder
         	{
         		$this->db->commit();
         		return 1;
-        	}
-        	else {
+        	} else {
         		foreach ($this->errors as $errmsg)
         		{
         			dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2357,8 +2309,7 @@ class CommandeFournisseur extends CommonOrder
         		$this->db->rollback();
         		return -1 * $error;
         	}
-        }
-        else {
+        } else {
             return -2;
         }
     }
@@ -2412,8 +2363,7 @@ class CommandeFournisseur extends CommonOrder
             {
             	$this->db->commit();
             	return 1;
-            }
-            else {
+            } else {
             	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2422,8 +2372,7 @@ class CommandeFournisseur extends CommonOrder
             	$this->db->rollback();
             	return -1 * $error;
             }
-        }
-        else {
+        } else {
             return -2;
         }
     }
@@ -2510,8 +2459,7 @@ class CommandeFournisseur extends CommonOrder
             $result = $this->call_trigger("ORDER_SUPPLIER_STATUS_".$triggerName[$status], $user);
             if ($result < 0) { $error++; }
             // End call triggers
-        }
-        else {
+        } else {
             $error++;
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this)."::setStatus ".$this->error);
@@ -2522,8 +2470,7 @@ class CommandeFournisseur extends CommonOrder
             $this->statut = $status;
             $this->db->commit();
             return 1;
-        }
-        else {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -2646,8 +2593,7 @@ class CommandeFournisseur extends CommonOrder
 				if ($qty < $this->line->packaging)
 				{
 					$qty = $this->line->packaging;
-				}
-				else {
+				} else {
 					if (($qty % $this->line->packaging) > 0)
 					{
 						$coeff = intval($qty / $this->line->packaging) + 1;
@@ -2712,14 +2658,12 @@ class CommandeFournisseur extends CommonOrder
                 $this->update_price('', 'auto');
 				$this->db->commit();
 				return $result;
-            }
-            else {
+            } else {
                 $this->error = $this->db->lasterror();
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else {
+        } else {
             $this->error = "Order status makes operation forbidden";
             dol_syslog(get_class($this)."::updateline ".$this->error, LOG_ERR);
             return -2;
@@ -2797,8 +2741,7 @@ class CommandeFournisseur extends CommonOrder
                 $line->total_ttc = 59.8;
                 $line->total_tva = 9.8;
                 $line->remise_percent = 50;
-            }
-            else {
+            } else {
                 $line->total_ht = 100;
                 $line->total_ttc = 119.6;
                 $line->total_tva = 19.6;
@@ -2849,8 +2792,7 @@ class CommandeFournisseur extends CommonOrder
                 $this->date_validation   = $this->db->idate($obj->date_validation);
             }
             $this->db->free($result);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -2889,8 +2831,7 @@ class CommandeFournisseur extends CommonOrder
             }
             $this->db->free($resql);
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -2923,8 +2864,7 @@ class CommandeFournisseur extends CommonOrder
         $sql .= $clause." c.entity = ".$conf->entity;
         if ($mode === 'awaiting') {
             $sql .= " AND c.fk_statut = ".self::STATUS_ORDERSENT;
-        }
-        else {
+        } else {
             $sql .= " AND c.fk_statut IN (".self::STATUS_VALIDATED.", ".self::STATUS_ACCEPTED.")";
         }
         if ($user->socid) $sql .= " AND c.fk_soc = ".$user->socid;
@@ -2961,8 +2901,7 @@ class CommandeFournisseur extends CommonOrder
             }
 
             return $response;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -2998,8 +2937,7 @@ class CommandeFournisseur extends CommonOrder
                     }
                     return $string;
                 }
-            }
-            else dol_print_error($db);
+            } else dol_print_error($db);
         }
 
         return '';
@@ -3162,8 +3100,7 @@ class CommandeFournisseur extends CommonOrder
     		{
     			$this->error = $supplierorderdispatch->error; $this->errors = $supplierorderdispatch->errors;
     			return $ret;
-    		}
-    		else {
+    		} else {
     			if (is_array($supplierorderdispatch->lines) && count($supplierorderdispatch->lines) > 0)
     			{
     				$date_liv = dol_now();
@@ -3196,8 +3133,7 @@ class CommandeFournisseur extends CommonOrder
         						return -1;
         					}
     					    return 5;
-    					}
-    					else {
+    					} else {
     					    //Diff => received partially
     					    //$ret=$this->setStatus($user,4);
     						$ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
@@ -3235,8 +3171,7 @@ class CommandeFournisseur extends CommonOrder
         						    return -1;
         					    }
     					        return 5;
-    					    }
-    					    else {
+    					    } else {
     					        //Diff => received partially
     					        $ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
 							    if ($ret < 0) {
@@ -3244,8 +3179,7 @@ class CommandeFournisseur extends CommonOrder
 							    }
 							    return 4;
 						    }
-					    }
-					    else {
+					    } else {
                             //all the products are not received
 						    $ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
 						    if ($ret < 0) {
@@ -3253,8 +3187,7 @@ class CommandeFournisseur extends CommonOrder
 						    }
 						    return 4;
 					    }
-				    }
-    				else {
+				    } else {
     					//Diff => received partially
     					$ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
     					if ($ret < 0) {
@@ -3309,8 +3242,7 @@ class CommandeFournisseur extends CommonOrder
             $this->db->free();
 
             return $num;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -3471,14 +3403,12 @@ class CommandeFournisseurLigne extends CommonOrderLine
 
 	            $this->db->free($result);
     	        return 1;
-            }
-    	    else {
+            } else {
     	        $this->error = 'Supplier order line  with id='.$rowid.' not found';
     	        dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR);
     	        return 0;
     	    }
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -3539,8 +3469,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
         $sql .= " VALUES (".$this->fk_commande.", '".$this->db->escape($this->label)."','".$this->db->escape($this->desc)."',";
         $sql .= " ".($this->date_start ? "'".$this->db->idate($this->date_start)."'" : "null").",";
         $sql .= " ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null").",";
-        if ($this->fk_product) { $sql .= $this->fk_product.","; }
-        else { $sql .= "null,"; }
+        if ($this->fk_product) { $sql .= $this->fk_product.","; } else { $sql .= "null,"; }
         $sql .= "'".$this->db->escape($this->product_type)."',";
         $sql .= "'".$this->db->escape($this->special_code)."',";
         $sql .= "'".$this->db->escape($this->rang)."',";
@@ -3602,8 +3531,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else {
+        } else {
             $this->errors[] = $this->db->error();
             $this->db->rollback();
             return -2;
@@ -3688,13 +3616,11 @@ class CommandeFournisseurLigne extends CommonOrderLine
             {
                 $this->db->commit();
                 return 1;
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -3750,8 +3676,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index 335ac1fcbac..518c6885411 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -227,8 +227,7 @@ class CommandeFournisseurDispatch extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -296,8 +295,7 @@ class CommandeFournisseurDispatch extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else {
+        } else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -390,8 +388,7 @@ class CommandeFournisseurDispatch extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -456,8 +453,7 @@ class CommandeFournisseurDispatch extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -510,8 +506,7 @@ class CommandeFournisseurDispatch extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -547,28 +542,23 @@ class CommandeFournisseurDispatch extends CommonObject
         if ($mode == 0)
         {
             return $langs->trans($this->statuts[$status]);
-        }
-        elseif ($mode == 1)
+        } elseif ($mode == 1)
         {
             return $langs->trans($this->statutshort[$status]);
-        }
-        elseif ($mode == 2)
+        } elseif ($mode == 2)
         {
             return $langs->trans($this->statuts[$status]);
-        }
-        elseif ($mode == 3)
+        } elseif ($mode == 3)
         {
             if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut0');
             elseif ($status == 1) return img_picto($langs->trans($this->statuts[$status]), 'statut4');
             elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut8');
-        }
-        elseif ($mode == 4)
+        } elseif ($mode == 4)
         {
             if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
             elseif ($status == 1) return img_picto($langs->trans($this->statuts[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
             elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]);
-        }
-        elseif ($mode == 5)
+        } elseif ($mode == 5)
         {
             if ($status == 0) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut0');
             elseif ($status == 1) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut4');
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 5415b9bea9a..9949c4d3253 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -455,8 +455,7 @@ class FactureFournisseur extends CommonInvoice
 				                $error++;
 				            }
 				        }
-				    }
-				    else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+				    } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
 				    {
 				        $origin_id = $tmp_origin_id;
     					$ret = $this->add_object_linked($origin, $origin_id);
@@ -502,15 +501,13 @@ class FactureFournisseur extends CommonInvoice
                             $this->lines[$i]->fk_unit,
                             $this->lines[$i]->pu_ht_devise
                         );
-                    }
-                    else {
+                    } else {
                         $this->error = $this->db->lasterror();
                         $this->db->rollback();
                         return -5;
                     }
                 }
-			}
-			else // If this->lines is an array of invoice line arrays
+			} else // If this->lines is an array of invoice line arrays
 			{
 			    dol_syslog("There is ".count($this->lines)." lines that are array lines");
 			    foreach ($this->lines as $i => $val)
@@ -542,8 +539,7 @@ class FactureFournisseur extends CommonInvoice
 			                (!empty($line->info_bits) ? $line->info_bits : ''),
 			                $line->product_type
 			                );
-			        }
-			        else {
+			        } else {
 			            $this->error = $this->db->lasterror();
 			            $this->db->rollback();
 			            return -5;
@@ -577,26 +573,22 @@ class FactureFournisseur extends CommonInvoice
                 {
                     $this->db->commit();
                     return $this->id;
-                }
-                else {
+                } else {
                     $this->db->rollback();
                     return -4;
                 }
-            }
-            else {
+            } else {
                 $this->error = $langs->trans('FailedToUpdatePrice');
                 $this->db->rollback();
                 return -3;
             }
-        }
-        else {
+        } else {
             if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
             {
                 $this->error = $langs->trans('ErrorRefAlreadyExists');
                 $this->db->rollback();
                 return -1;
-            }
-            else {
+            } else {
                 $this->error = $this->db->lasterror();
                 $this->db->rollback();
                 return -2;
@@ -751,8 +743,7 @@ class FactureFournisseur extends CommonInvoice
                     $this->error = $this->db->lasterror();
                     return -3;
                 }
-            }
-            else {
+            } else {
                 $this->error = 'Bill with id '.$id.' not found';
                 dol_syslog(get_class($this).'::fetch '.$this->error);
                 return 0;
@@ -760,8 +751,7 @@ class FactureFournisseur extends CommonInvoice
 
             $this->db->free($resql);
             return 1;
-        }
-        else {
+        } else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -861,8 +851,7 @@ class FactureFournisseur extends CommonInvoice
             }
             $this->db->free($resql_rows);
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -3;
         }
@@ -998,8 +987,7 @@ class FactureFournisseur extends CommonInvoice
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -1086,20 +1074,17 @@ class FactureFournisseur extends CommonInvoice
 
     				$this->db->commit();
     				return 1;
-    			}
-    			else {
+    			} else {
     				$this->error = $facligne->error;
     				$this->db->rollback();
     				return -1;
     			}
-    		}
-    		else {
+    		} else {
     			$this->error = $facligne->error;
     			$this->db->rollback();
     			return -2;
     		}
-    	}
-    	else {
+    	} else {
     		$this->db->rollback();
     		return -3;
     	}
@@ -1182,8 +1167,7 @@ class FactureFournisseur extends CommonInvoice
                 if (!$resql2) {
                 	$error++;
                 }
-            }
-            else {
+            } else {
             	$error++;
             }
         }
@@ -1249,8 +1233,7 @@ class FactureFournisseur extends CommonInvoice
         	dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG);
         	$this->db->commit();
         	return 1;
-        }
-        else {
+        } else {
         	$this->error = $this->db->lasterror();
         	$this->db->rollback();
         	return -$error;
@@ -1287,8 +1270,7 @@ class FactureFournisseur extends CommonInvoice
             $result = $this->call_trigger('BILL_SUPPLIER_PAYED', $user);
             if ($result < 0) $error++;
             // End call triggers
-        }
-        else {
+        } else {
             $error++;
             $this->error = $this->db->error();
             dol_print_error($this->db);
@@ -1298,8 +1280,7 @@ class FactureFournisseur extends CommonInvoice
         {
             $this->db->commit();
             return 1;
-        }
-        else {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -1335,8 +1316,7 @@ class FactureFournisseur extends CommonInvoice
             $result = $this->call_trigger('BILL_SUPPLIER_UNPAYED', $user);
             if ($result < 0) $error++;
             // End call triggers
-        }
-        else {
+        } else {
             $error++;
             $this->error = $this->db->lasterror();
             dol_syslog("FactureFournisseur::set_unpaid ".$this->error);
@@ -1346,8 +1326,7 @@ class FactureFournisseur extends CommonInvoice
         {
             $this->db->commit();
             return 1;
-        }
-        else {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -1402,12 +1381,10 @@ class FactureFournisseur extends CommonInvoice
         if ($force_number)
         {
             $num = $force_number;
-        }
-        elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
+        } elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
         {
             $num = $this->getNextNumRef($this->thirdparty);
-        }
-        else {
+        } else {
             $num = $this->ref;
         }
         $this->newref = dol_sanitizeFileName($num);
@@ -1506,13 +1483,11 @@ class FactureFournisseur extends CommonInvoice
             {
                 $this->db->commit();
                 return 1;
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
@@ -1586,13 +1561,11 @@ class FactureFournisseur extends CommonInvoice
             {
                 $this->db->commit();
                 return 1;
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
@@ -1716,15 +1689,13 @@ class FactureFournisseur extends CommonInvoice
 	        				dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
 	        				return -1;
 	        			}
-	        		}
-	        		else {
+	        		} else {
 	        			$this->error = $prod->error;
 	        			$this->db->rollback();
 	        			return -1;
 	        		}
 	        	}
-	        }
-	        else {
+	        } else {
 	        	$product_type = $type;
 	        }
 
@@ -1836,21 +1807,18 @@ class FactureFournisseur extends CommonInvoice
 				{
 					$this->db->commit();
 					return $this->line->id;
-				}
-				else {
+				} else {
 					$this->error = $this->db->error();
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else {
+			} else {
 				$this->error = $this->line->error;
 				$this->errors = $this->line->errors;
 				$this->db->rollback();
 				return -2;
 			}
-        }
-        else {
+        } else {
         	return 0;
         }
     }
@@ -1948,8 +1916,7 @@ class FactureFournisseur extends CommonInvoice
             $product = new Product($this->db);
             $result = $product->fetch($idproduct);
             $product_type = $product->type;
-        }
-        else {
+        } else {
             $product_type = $type;
         }
 
@@ -2063,8 +2030,7 @@ class FactureFournisseur extends CommonInvoice
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -4;
@@ -2116,8 +2082,7 @@ class FactureFournisseur extends CommonInvoice
                 //$this->date_validation   = $obj->datev; // This field is not available. Should be store into log table and using this function should be replaced with showing content of log (like for supplier orders)
             }
             $this->db->free($result);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -2165,8 +2130,7 @@ class FactureFournisseur extends CommonInvoice
 			}
 			//print_r($return);
 			return $return;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2217,8 +2181,7 @@ class FactureFournisseur extends CommonInvoice
 			}
 
 			return $return;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2275,8 +2238,7 @@ class FactureFournisseur extends CommonInvoice
             }
             $this->db->free($resql);
             return $response;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -2430,8 +2392,7 @@ class FactureFournisseur extends CommonInvoice
         if ($numref != "")
         {
         	return $numref;
-        }
-        else {
+        } else {
             $this->error = $obj->error;
             //dol_print_error($db,get_class($this)."::getNextNumRef ".$obj->error);
             return false;
@@ -2514,8 +2475,7 @@ class FactureFournisseur extends CommonInvoice
 				    $line->total_ttc = 59.8;
 				    $line->total_tva = 9.8;
 	    			$line->remise_percent = 50;
-				}
-				else {
+				} else {
 				    $line->total_ht = 100;
 				    $line->total_ttc = 119.6;
 				    $line->total_tva = 19.6;
@@ -2580,8 +2540,7 @@ class FactureFournisseur extends CommonInvoice
 			}
             $this->db->free($resql);
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -2656,8 +2615,7 @@ class FactureFournisseur extends CommonInvoice
         {
             $this->db->commit();
             return $object->id;
-        }
-        else {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -2686,8 +2644,7 @@ class FactureFournisseur extends CommonInvoice
 			if (!empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF))
 			{
 				$modele = $conf->global->INVOICE_SUPPLIER_ADDON_PDF;
-			}
-			else {
+			} else {
 				$modele = ''; // No default value. For supplier invoice, we allow to disable all PDF generation
 			}
 		}
@@ -2695,8 +2652,7 @@ class FactureFournisseur extends CommonInvoice
 		if (empty($modele))
 		{
 		    return 0;
-		}
-		else {
+		} else {
             $modelpath = "core/modules/supplier_invoice/doc/";
 
             return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
@@ -3136,8 +3092,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -3393,8 +3348,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 
             $this->db->commit();
             return $this->id;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
@@ -3428,8 +3382,7 @@ class SupplierInvoiceLine extends CommonObjectLine
         {
             $this->db->commit();
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 497e9d7af77..a2ed4b6c0aa 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -149,8 +149,7 @@ class ProductFournisseur extends Product
         {
             $this->db->commit();
             return 1;
-        }
-        else {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -286,8 +285,7 @@ class ProductFournisseur extends Product
 			$localtax1 = $localtaxes_array['1'];
 			$localtaxtype2 = $localtaxes_array['2'];
 			$localtax2 = $localtaxes_array['3'];
-		}
-		else // old method. deprecated because ot can't retreive type
+		} else // old method. deprecated because ot can't retreive type
 		{
 			$localtaxtype1 = '0';
 			$localtax1 = get_localtax($newvat, 1);
@@ -383,19 +381,16 @@ class ProductFournisseur extends Product
 				{
 					$this->db->commit();
 					return $this->product_fourn_price_id;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else {
+			} else {
 				$this->error = $this->db->error()." sql=".$sql;
 				$this->db->rollback();
 				return -2;
 			}
-        }
-        else {
+        } else {
             dol_syslog(get_class($this).'::update_buyprice without knowing id of line, so we delete from company, quantity and supplier_ref and insert again', LOG_DEBUG);
 
             // Delete price for this quantity
@@ -443,8 +438,7 @@ class ProductFournisseur extends Product
                 $resql = $this->db->query($sql);
                 if ($resql) {
                     $this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_fournisseur_price");
-                }
-                else {
+                } else {
                     $error++;
                 }
 
@@ -562,20 +556,17 @@ class ProductFournisseur extends Product
 	                    if ($this->fourn_qty != 0)
 	                    {
 	                        $this->fourn_unitprice = price2num($this->fourn_price / $this->fourn_qty, 'MU');
-	                    }
-	                    else {
+	                    } else {
 	                        $this->fourn_unitprice = "";
 	                    }
                     }
                 }
 
             	return 1;
-            }
-            else {
+            } else {
                 return 0;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -678,8 +669,7 @@ class ProductFournisseur extends Product
                     if ($prodfourn->fourn_qty != 0)
                     {
                         $prodfourn->fourn_unitprice = price2num($prodfourn->fourn_price / $prodfourn->fourn_qty, 'MU');
-                    }
-                    else {
+                    } else {
                         $prodfourn->fourn_unitprice = "";
                     }
                 }
@@ -689,8 +679,7 @@ class ProductFournisseur extends Product
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -766,8 +755,7 @@ class ProductFournisseur extends Product
             {
                 $this->db->free($resql);
                 return 0;
-            }
-            else {
+            } else {
                 $min = -1;
                 foreach ($record_array as $record)
                 {
@@ -788,8 +776,7 @@ class ProductFournisseur extends Product
                             if ($record["quantity"] != 0)
                             {
                                 $fourn_unitprice = price2num($fourn_price / $record["quantity"], 'MU');
-                            }
-                            else {
+                            } else {
                                 $fourn_unitprice = $fourn_price;
                             }
                         }
@@ -824,8 +811,7 @@ class ProductFournisseur extends Product
 
             $this->db->free($resql);
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -856,8 +842,7 @@ class ProductFournisseur extends Product
         {
             $this->db->commit();
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->error()." sql=".$sql;
             $this->db->rollback();
             return -1;
@@ -984,8 +969,7 @@ class ProductFournisseur extends Product
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -1073,8 +1057,7 @@ class ProductFournisseur extends Product
             }
             $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $linkstart = '<a href="'.$url.'"';
         $linkstart .= $linkclose.'>';
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index bf9affbc455..a2df6ba9b74 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -131,13 +131,11 @@ class PaiementFourn extends Paiement
 				$this->type_label = $obj->paiement_type;
 				$this->statut         = $obj->statut;
 				$error = 1;
-			}
-			else {
+			} else {
 				$error = -2; // TODO Use 0 instead
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$error = -1;
 		}
@@ -169,8 +167,7 @@ class PaiementFourn extends Paiement
 		{
 			$amounts = &$this->amounts;
 			$amounts_to_update = &$this->multicurrency_amounts;
-		}
-		else {
+		} else {
 			$amounts = &$this->multicurrency_amounts;
 			$amounts_to_update = &$this->amounts;
 		}
@@ -199,8 +196,7 @@ class PaiementFourn extends Paiement
 			{
 				$total = $totalamount;
 				$mtotal = $totalamount_converted; // Maybe use price2num with MT for the converted value
-			}
-			else {
+			} else {
 				$total = $totalamount_converted; // Maybe use price2num with MT for the converted value
 				$mtotal = $totalamount;
 			}
@@ -243,8 +239,7 @@ class PaiementFourn extends Paiement
 								if ($remaintopay == 0)
 								{
 									$result = $invoice->set_paid($user, '', '');
-								}
-								else dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing.");
+								} else dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing.");
 							}
 
 							// Regenerate documents of invoices
@@ -264,13 +259,11 @@ class PaiementFourn extends Paiement
 									$error++;
 								}
 							}
-						}
-						else {
+						} else {
 							$this->error = $this->db->lasterror();
 							$error++;
 						}
-					}
-					else {
+					} else {
 						dol_syslog(get_class($this).'::Create Amount line '.$key.' not a number. We discard it.');
 					}
 				}
@@ -282,13 +275,11 @@ class PaiementFourn extends Paiement
 					if ($result < 0) $error++;
 					// End call triggers
 				}
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
-		}
-		else {
+		} else {
 			$this->error = "ErrorTotalIsNull";
 			dol_syslog('PaiementFourn::Create Error '.$this->error, LOG_ERR);
 			$error++;
@@ -302,8 +293,7 @@ class PaiementFourn extends Paiement
 			$this->db->commit();
 			dol_syslog('PaiementFourn::Create Ok Total = '.$this->total);
 			return $this->id;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -337,8 +327,7 @@ class PaiementFourn extends Paiement
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -2;
 		}
@@ -404,8 +393,7 @@ class PaiementFourn extends Paiement
 
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error;
 			$this->db->rollback();
 			return -5;
@@ -449,8 +437,7 @@ class PaiementFourn extends Paiement
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -484,8 +471,7 @@ class PaiementFourn extends Paiement
 			}
 
 			return $billsarray;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this).'::getBillsArray Error '.$this->error);
 			return -1;
@@ -692,8 +678,7 @@ class PaiementFourn extends Paiement
 			}
 
 			return $numref;
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Supplier"));
 			return "";
@@ -723,8 +708,7 @@ class PaiementFourn extends Paiement
 			if (!empty($conf->global->SUPPLIER_PAYMENT_ADDON_PDF))
 			{
 				$modele = $conf->global->SUPPLIER_PAYMENT_ADDON_PDF;
-			}
-			else {
+			} else {
 				$modele = ''; // No default value. For supplier invoice, we allow to disable all PDF generation
 			}
 		}
@@ -732,8 +716,7 @@ class PaiementFourn extends Paiement
 		if (empty($modele))
 		{
 			return 0;
-		}
-		else {
+		} else {
 			$modelpath = "core/modules/supplier_payment/doc/";
 
 			return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index bf91a0fdd50..00273d48c7e 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -99,8 +99,7 @@ if ($id > 0 || !empty($ref))
 	if ($ret < 0) dol_print_error($db, $object->error);
 	$ret = $object->fetch_thirdparty();
 	if ($ret < 0) dol_print_error($db, $object->error);
-}
-elseif (!empty($socid) && $socid > 0)
+} elseif (!empty($socid) && $socid > 0)
 {
 	$fourn = new Fournisseur($db);
 	$ret = $fourn->fetch($socid);
@@ -238,8 +237,7 @@ if (empty($reshook))
                             $l->total_ttc = 0;
                             $l->ref_supplier = '';
                             $l->update();
-                        }
-                        else {
+                        } else {
                             // No need for loop to keep best supplier price
                             $obj = $db->fetch_object($resql);
                             $l->subprice = $obj->unitprice;
@@ -250,8 +248,7 @@ if (empty($reshook))
                             $l->ref_supplier = $obj->ref_fourn;
                             $l->update();
                         }
-                    }
-                    else {
+                    } else {
                         dol_print_error($db);
                     }
                     $db->free($resql);
@@ -284,8 +281,7 @@ if (empty($reshook))
 				//$newstatus=3;  // Submited
 				// TODO If there is at least one reception, we can set to Received->Received partially
 				$newstatus = 4; // Received partially
-			}
-			elseif ($object->statut == 6) $newstatus = 2; // Canceled->Approved
+			} elseif ($object->statut == 6) $newstatus = 2; // Canceled->Approved
 			elseif ($object->statut == 7) $newstatus = 3; // Canceled->Process running
 			elseif ($object->statut == 9) $newstatus = 1; // Refused->Validated
 			else $newstatus = 2;
@@ -316,8 +312,7 @@ if (empty($reshook))
 
 				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 				exit;
-			}
-			else {
+			} else {
 				$db->rollback();
 
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -355,8 +350,7 @@ if (empty($reshook))
 			$idprod = 0;
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		}
-		else {
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = '';
@@ -439,13 +433,11 @@ if (empty($reshook))
 					{
 						$productsupplier->ref_supplier = '';
 					}
-				}
-				else {
+				} else {
 					$fksoctosearch = $object->thirdparty->id;
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 				}
-			}
-			elseif (GETPOST('idprodfournprice', 'alpha') > 0)
+			} elseif (GETPOST('idprodfournprice', 'alpha') > 0)
 			{
 				$qtytosearch = $qty; // Just to see if a price exists for the quantity. Not used to found vat.
 				//$qtytosearch=-1;	       // We force qty to -1 to be sure to find if a supplier price exist
@@ -531,8 +523,7 @@ if (empty($reshook))
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'errors');
 			}
-		}
-		elseif (empty($error)) // $price_ht is already set
+		} elseif (empty($error)) // $price_ht is already set
 		{
 			$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
 			$tva_tx = str_replace('*', '', $tva_tx);
@@ -552,8 +543,7 @@ if (empty($reshook))
 			if ($price_ht !== '')
 			{
 				$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
-			}
-			else {
+			} else {
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 				$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
 			}
@@ -619,8 +609,7 @@ if (empty($reshook))
 			unset($_POST['date_endday']);
 			unset($_POST['date_endmonth']);
 			unset($_POST['date_endyear']);
-		}
-		else {
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -669,8 +658,7 @@ if (empty($reshook))
 		{
 			$price_base_type = 'HT';
 			$ht = price2num(GETPOST('price_ht'));
-		}
-		else {
+		} else {
 			$vatratecleaned = $vat_rate;
 			if (preg_match('/^(.*)\s*\((.*)\)$/', $vat_rate, $reg))      // If vat is "xx (yy)"
 			{
@@ -762,8 +750,7 @@ if (empty($reshook))
 				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				if ($result < 0) dol_print_error($db, $result);
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db, $object->error);
 			exit;
 		}
@@ -793,8 +780,7 @@ if (empty($reshook))
 
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			/* Fix bug 1485 : Reset action to avoid asking again confirmation on failure */
 			$action = '';
@@ -828,8 +814,7 @@ if (empty($reshook))
 				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				if ($result < 0) dol_print_error($db, $result);
 			}
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 
@@ -848,8 +833,7 @@ if (empty($reshook))
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 		{
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-		}
-		else {
+		} else {
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -882,8 +866,7 @@ if (empty($reshook))
 				}
 				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 				exit;
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -896,8 +879,7 @@ if (empty($reshook))
 		{
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -932,8 +914,7 @@ if (empty($reshook))
 			$action = '';
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -946,8 +927,7 @@ if (empty($reshook))
 		{
 			header("Location: ".DOL_URL_ROOT.'/fourn/commande/list.php?restore_lastsearch_values=1');
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -958,8 +938,7 @@ if (empty($reshook))
 		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else {
+		} else {
 			if ($object->id > 0)
 			{
 				$orig = clone $object;
@@ -969,8 +948,7 @@ if (empty($reshook))
 				{
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit;
-				}
-				else {
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$object = $orig;
 					$action = '';
@@ -992,16 +970,13 @@ if (empty($reshook))
 				$langs->load("deliveries");
 				setEventMessages($langs->trans("DeliveryStateSaved"), null);
 				$action = '';
-			}
-			elseif ($result == -3)
+			} elseif ($result == -3)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Delivery")), null, 'errors');
 		}
 	}
@@ -1013,8 +988,7 @@ if (empty($reshook))
 		{
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -1109,13 +1083,11 @@ if (empty($reshook))
 					{
 						$classname = 'Propal';
 						$element = 'comm/propal'; $subelement = 'propal';
-					}
-					elseif ($origin == 'order' || $origin == 'commande')
+					} elseif ($origin == 'order' || $origin == 'commande')
 					{
 						$classname = 'Commande';
 						$element = $subelement = 'commande';
-					}
-					else {
+					} else {
 						$classname = 'SupplierProposal';
 						$element = 'supplier_proposal';
 						$subelement = 'supplier_proposal';
@@ -1187,8 +1159,7 @@ if (empty($reshook))
 										$ref_supplier = $productsupplier->ref_supplier;
 										$product_fourn_price_id = $productsupplier->product_fourn_price_id;
 									}
-								}
-								else {
+								} else {
 									$ref_supplier = $lines[$i]->ref_fourn;
 									$product_fourn_price_id = 0;
 								}
@@ -1255,8 +1226,7 @@ if (empty($reshook))
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
 					}
-				}
-				else {
+				} else {
 			   		$id = $object->create($user);
 					if ($id < 0)
 					{
@@ -1272,8 +1242,7 @@ if (empty($reshook))
 				$db->rollback();
 				$action = 'create';
 				$_GET['socid'] = $_POST['socid'];
-			}
-			else {
+			} else {
 				$db->commit();
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 				exit;
@@ -1360,12 +1329,10 @@ if (empty($reshook))
 			if (empty($result_order["result"]["result_code"])) //No result, check error str
 			{
 				setEventMessages($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", null, 'errors');
-			}
-			elseif ($result_order["result"]["result_code"] != "OK") //Something went wrong
+			} elseif ($result_order["result"]["result_code"] != "OK") //Something went wrong
 			{
 				setEventMessages($langs->trans("SOAPError")." '".$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", null, 'errors');
-			}
-			else {
+			} else {
 				setEventMessages($langs->trans("RemoteOrderRef")." ".$result_order["ref"], null, 'mesgs');
 			}
 		}
@@ -1385,14 +1352,12 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else {
+			} else {
 				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-				}
-				else {
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
@@ -1413,8 +1378,7 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -1466,13 +1430,11 @@ if ($action == 'create')
 		{
 			$classname = 'Propal';
 			$element = 'comm/propal'; $subelement = 'propal';
-		}
-		elseif ($origin == 'order' || $origin == 'commande')
+		} elseif ($origin == 'order' || $origin == 'commande')
 		{
 			$classname = 'Commande';
 			$element = $subelement = 'commande';
-		}
-		else {
+		} else {
 			$classname = 'SupplierProposal';
 			$element = 'supplier_proposal';
 			$subelement = 'supplier_proposal';
@@ -1517,8 +1479,7 @@ if ($action == 'create')
 
 		// Object source contacts list
 		$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);
-	}
-	else {
+	} else {
 		$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
 
@@ -1556,8 +1517,7 @@ if ($action == 'create')
 	{
 		print $societe->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$socid.'">';
-	}
-	else {
+	} else {
 		print $form->select_company((empty($socid) ? '' : $socid), 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve customer informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE))
@@ -1741,8 +1701,7 @@ if ($action == 'create')
 		print '</table>';
 	}
     print "</form>\n";
-}
-elseif (!empty($object->id))
+} elseif (!empty($object->id))
 {
 	$result = $object->fetch($id, $ref);
 
@@ -1790,15 +1749,13 @@ elseif (!empty($object->id))
 		if (preg_match('/^[\(]?PROV/i', $object->ref) || empty($object->ref)) // empty should not happened, but when it occurs, the test save life
 		{
 			$newref = $object->getNextNumRef($object->thirdparty);
-		}
-		else $newref = $object->ref;
+		} else $newref = $object->ref;
 
 		if ($newref < 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
-		}
-		else {
+		} else {
 			$text = $langs->trans('ConfirmValidateOrder', $newref);
 			if (!empty($conf->notification->enabled))
 			{
@@ -1819,8 +1776,7 @@ elseif (!empty($object->id))
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 		{
 			$qualified_for_stock_change = $object->hasProductsOrServices(2);
-		}
-		else {
+		} else {
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -1927,20 +1883,17 @@ elseif (!empty($object->id))
                 $morehtmlref .= $formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
                 $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
                 $morehtmlref .= '</form>';
-            }
-            else {
+            } else {
                 $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
             }
-        }
-        else {
+        } else {
             if (!empty($object->fk_project)) {
                 $proj = new Project($db);
                 $proj->fetch($object->fk_project);
                 $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
                 $morehtmlref .= $proj->ref;
                 $morehtmlref .= '</a>';
-            }
-            else {
+            } else {
                 $morehtmlref .= '';
             }
         }
@@ -2013,8 +1966,7 @@ elseif (!empty($object->id))
 	if ($action == 'editconditions')
 	{
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
-	}
-	else {
+	} else {
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
 	}
 	print "</td>";
@@ -2032,8 +1984,7 @@ elseif (!empty($object->id))
 	if ($action == 'editmode')
 	{
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT', 1, 1);
-	}
-	else {
+	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
 	}
 	print '</td></tr>';
@@ -2126,8 +2077,7 @@ elseif (!empty($object->id))
 		print $form->selectDate($object->date_livraison ? $object->date_livraison : -1, 'liv_', $usehourmin, $usehourmin, '', "setdate_livraison");
 		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 		print '</form>';
-	}
-	else {
+	} else {
 		$usehourmin = 'day';
 		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin = 'dayhour';
 		print $object->date_livraison ? dol_print_date($object->date_livraison, $usehourmin) : '&nbsp;';
@@ -2158,8 +2108,7 @@ elseif (!empty($object->id))
 		if ($action != 'editincoterm')
 		{
 			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-		}
-		else {
+		} else {
 			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 		}
 		print '</td></tr>';
@@ -2358,12 +2307,10 @@ elseif (!empty($object->id))
 					if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $conf->global->MAIN_FEATURES_LEVEL > 0 && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED && !empty($object->user_approve_id))
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("FirstApprovalAlreadyDone")).'">'.$langs->trans("ApproveOrder").'</a>';
-					}
-					else {
+					} else {
 						print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=approve">'.$langs->trans("ApproveOrder").'</a>';
 					}
-				}
-				else {
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("ApproveOrder").'</a>';
 				}
 			}
@@ -2378,12 +2325,10 @@ elseif (!empty($object->id))
 						if (!empty($object->user_approve_id2))
 						{
 							print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("SecondApprovalAlreadyDone")).'">'.$langs->trans("Approve2Order").'</a>';
-						}
-						else {
+						} else {
 							print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=approve2">'.$langs->trans("Approve2Order").'</a>';
 						}
-					}
-					else {
+					} else {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("Approve2Order").'</a>';
 					}
 				}
@@ -2395,8 +2340,7 @@ elseif (!empty($object->id))
 				if ($user->rights->fournisseur->commande->approuver || $user->rights->fournisseur->commande->approve2)
 				{
 					print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=refuse">'.$langs->trans("RefuseOrder").'</a>';
-				}
-				else {
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("RefuseOrder").'</a>';
 				}
 			}
@@ -2463,8 +2407,7 @@ elseif (!empty($object->id))
 				if ($user->rights->fournisseur->commande->commander)
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=makeorder#makeorder">'.$langs->trans("MakeOrder").'</a></div>';
-				}
-				else {
+				} else {
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("MakeOrder").'</a></div>';
 				}
 			}
@@ -2496,16 +2439,14 @@ elseif (!empty($object->id))
 				if (empty($conf->facture->enabled))
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
-				}
-				else {
+				} else {
 					if (!empty($object->linkedObjectsIds['invoice_supplier']))
 					{
 						if ($user->rights->fournisseur->facture->creer)
 						{
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
 						}
-					}
-					else {
+					} else {
 						print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NeedAtLeastOneInvoice")).'">'.$langs->trans("ClassifyBilled").'</a>';
 					}
 				}
@@ -2690,8 +2631,7 @@ elseif (!empty($object->id))
 				{
 					print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
 					print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-				}
-				else {
+				} else {
 					$textinput_size = "50";
 					// Webservice url
 					print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td colspan="3">'.dol_print_url($ws_url).'</td></tr>';
@@ -2711,8 +2651,7 @@ elseif (!empty($object->id))
 				//End table/form
 				print '</form>';
 				print '</table>';
-			}
-			elseif ($mode == "check")
+			} elseif ($mode == "check")
 			{
 				$ws_entity = '';
 				$ws_thirdparty = '';
@@ -2738,8 +2677,7 @@ elseif (!empty($object->id))
 					{
 						setEventMessages($langs->trans("RemoteUserMissingAssociatedSoc"), null, 'errors');
 						$error_occurred = true;
-					}
-					else {
+					} else {
 						//Create SOAP client and connect it to product/service
 						$soapclient_product = new nusoap_client($ws_url."/webservices/server_productorservice.php");
 						$soapclient_product->soap_defencoding = 'UTF-8';
@@ -2768,14 +2706,12 @@ elseif (!empty($object->id))
 							if (empty($status_code)) //No result, check error str
 							{
 								setEventMessages($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", null, 'errors');
-							}
-							elseif ($status_code != "OK") //Something went wrong
+							} elseif ($status_code != "OK") //Something went wrong
 							{
 								if ($status_code == "NOT_FOUND")
 								{
 									setEventMessages($line_id.$langs->trans("SupplierMissingRef")." '".$ref_supplier."'", null, 'warnings');
-								}
-								else {
+								} else {
 									setEventMessages($line_id.$langs->trans("ResponseNonOK")." '".$status_code."' - '".$result_product["result"]["result_label"]."'", null, 'errors');
 									$error_occurred = true;
 									break;
@@ -2810,18 +2746,15 @@ elseif (!empty($object->id))
 							}
 						}
 					}
-				}
-				elseif ($user_status_code == "PERMISSION_DENIED")
+				} elseif ($user_status_code == "PERMISSION_DENIED")
 				{
 					setEventMessages($langs->trans("RemoteUserNotPermission"), null, 'errors');
 					$error_occurred = true;
-				}
-				elseif ($user_status_code == "BAD_CREDENTIALS")
+				} elseif ($user_status_code == "BAD_CREDENTIALS")
 				{
 					setEventMessages($langs->trans("RemoteUserBadCredentials"), null, 'errors');
 					$error_occurred = true;
-				}
-				else {
+				} else {
 					setEventMessages($langs->trans("ResponseNonOK")." '".$user_status_code."'", null, 'errors');
 					$error_occurred = true;
 				}
@@ -2838,8 +2771,7 @@ elseif (!empty($object->id))
 				if ($error_occurred)
 				{
 					print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
-				}
-				else {
+				} else {
 					print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("Confirm").'">';
 					print ' &nbsp; &nbsp; ';
 				}
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 682d933f6dd..b3d2e3aa664 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -65,14 +65,12 @@ if ($action == 'addcontact' && $user->rights->fournisseur->commande->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -84,8 +82,7 @@ elseif ($action == 'swapstatut' && $user->rights->fournisseur->commande->creer)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -100,8 +97,7 @@ elseif ($action == 'deletecontact' && $user->rights->fournisseur->commande->cree
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -190,8 +186,7 @@ if ($id > 0 || !empty($ref))
 
 		// Contacts lines
 		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
-	}
-	else {
+	} else {
 		// Contact not found
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 19b308c996b..f867fc51c3a 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -128,8 +128,7 @@ if ($action == 'checkdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else {
+	} else {
 		$db->rollback();
 	}
 }
@@ -170,8 +169,7 @@ if ($action == 'uncheckdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCE
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else {
+	} else {
 		$db->rollback();
 	}
 }
@@ -212,8 +210,7 @@ if ($action == 'denydispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_P
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else {
+	} else {
 		$db->rollback();
 	}
 }
@@ -575,8 +572,7 @@ if ($id > 0 || !empty($ref)) {
 					print '<td class="dispatch_batch_number_title">'.$langs->trans("batch_number").'</td>';
 					print '<td class="dispatch_dluo_title">'.$langs->trans("EatByDate").'</td>';
 					print '<td class="dispatch_dlc_title">'.$langs->trans("SellByDate").'</td>';
-				}
-				else {
+				} else {
 					print '<td></td>';
 					print '<td></td>';
 					print '<td></td>';
@@ -601,8 +597,7 @@ if ($id > 0 || !empty($ref)) {
 				if (count($listwarehouses) > 1)
 				{
 					print '<br>'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 1, 0, 0, '', 0, 0, $disabled);
-				}
-				elseif (count($listwarehouses) == 1)
+				} elseif (count($listwarehouses) == 1)
 				{
 					print '<br>'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 0, 0, 0, '', 0, 0, $disabled);
 				}
@@ -730,8 +725,7 @@ if ($id > 0 || !empty($ref)) {
 							if (!empty($conf->global->SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT)) // Not tested !
 							{
 							    print $langs->trans("BuyingPrice").': <input class="maxwidth75" name="pu'.$suffix.'" type="text" value="'.price2num($up_ht_disc, 'MU').'">';
-							}
-							else {
+							} else {
 							    print '<input class="maxwidth75" name="pu'.$suffix.'" type="hidden" value="'.price2num($up_ht_disc, 'MU').'">';
 							}
 
@@ -785,8 +779,7 @@ if ($id > 0 || !empty($ref)) {
 							if (!empty($conf->global->SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT)) // Not tested !
 							{
 							    print $langs->trans("BuyingPrice").': <input class="maxwidth75" name="pu'.$suffix.'" type="text" value="'.price2num($up_ht_disc, 'MU').'">';
-							}
-							else {
+							} else {
 							    print '<input class="maxwidth75" name="pu'.$suffix.'" type="hidden" value="'.price2num($up_ht_disc, 'MU').'">';
 							}
 
@@ -802,8 +795,7 @@ if ($id > 0 || !empty($ref)) {
 						if (!empty($conf->productbatch->enabled) && $objp->tobatch == 1) {
 						    $type = 'batch';
 						    print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"');
-						}
-						else {
+						} else {
 						    $type = 'dispatch';
 						    print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"');
 						}
@@ -964,8 +956,7 @@ if ($id > 0 || !empty($ref)) {
 			// Status
 			if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS) && empty($reception->rowid)) {
 				print '<td class="center" colspan="2">'.$langs->trans("Status").'</td>';
-			}
-			elseif (!empty($conf->reception->enabled)) {
+			} elseif (!empty($conf->reception->enabled)) {
 				print '<td class="center"></td>';
 			}
 
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 569a5b72576..56516b440f7 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -177,8 +177,7 @@ if ($object->id > 0)
 	$permtoedit = $user->rights->fournisseur->commande->creer;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	header('Location: index.php');
 	exit;
 }
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 8f79b1b077e..6891e3bdf92 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -160,8 +160,7 @@ if ($resql)
 	print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
 
 	print "</table></div><br>";
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -225,8 +224,7 @@ if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_T
 	$sql .= " WHERE ((ug.fk_user = u.rowid";
 	$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
 	$sql .= " OR u.entity = 0)"; // Show always superadmin
-}
-else {
+} else {
 	$sql .= " WHERE (u.entity IN (".getEntity('user')."))";
 }
 $sql .= " AND u.fk_soc IS NULL"; // An external user can not approved
@@ -267,8 +265,7 @@ if ($resql)
 	}
 	print "</table></div><br>";
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -341,8 +338,7 @@ if ($resql)
 		}
 	}
 	print "</table></div><br>";
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 /*
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index 859d05bb775..195e87e5b5d 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -55,8 +55,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else {
+} else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -195,8 +194,7 @@ if (!empty($conf->agenda->enabled))
     if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
     {
         print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("AddAction").'</a>';
-    }
-    else {
+    } else {
         print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
     }
 }
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index c4895064ce0..8ffc6be6c05 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -335,14 +335,12 @@ if (empty($reshook))
 							{
 								$result = $object->insert_discount($discountid);
 								//$result=$discount->link_to_invoice($lineid,$id);
-							}
-							else {
+							} else {
 								setEventMessages($discount->error, $discount->errors, 'errors');
 								$error++;
 								break;
 							}
-						}
-						else {
+						} else {
 							// Positive line
 							$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 							// Date start
@@ -389,8 +387,7 @@ if (empty($reshook))
 							if ($result > 0)
 							{
 								$lineid = $result;
-							}
-							else {
+							} else {
 								$lineid = 0;
 								$error++;
 								break;
@@ -444,8 +441,7 @@ if (empty($reshook))
 		{
 			$db->commit();
 			setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs');
-		}
-		else {
+		} else {
 			$db->rollback();
 			$action = 'create';
 			$_GET["origin"] = $_POST["origin"];
@@ -592,8 +588,7 @@ if ($resql)
 		$soc = new Societe($db);
 		$soc->fetch($socid);
 		$title = $langs->trans('ListOfSupplierOrders').' - '.$soc->name;
-	}
-	else {
+	} else {
 		$title = $langs->trans('ListOfSupplierOrders');
 	}
 
@@ -1256,8 +1251,7 @@ if ($resql)
 	$delallowed = $user->rights->fournisseur->commande->creer;
 
 	print $formfile->showdocuments('massfilesarea_supplier_order', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index e1d5b03db14..53efd68faa6 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -145,8 +145,7 @@ if ($id > 0 || !empty($ref))
         print '</div>';
 
         dol_fiche_end();
-    }
-    else {
+    } else {
         /* Order not found */
         $langs->load("errors");
         print $langs->trans("ErrorRecordNotFound");
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index efacacc8277..d7f8ef489ab 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -83,8 +83,7 @@ if ($action == 'create')
 	if (!GETPOST('createbill'))
 	{
 		$action = '';
-	}
-	else {
+	} else {
 		if (!is_array($selected))
 		{
 			//$error++;
@@ -447,8 +446,7 @@ if (($action != 'create' && $action != 'add') && !$error) {
 	if (empty($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS))
 	{
 		$sql .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY.")"; // Must match filter in htdocs/fourn/card.php
-	}
-	else {
+	} else {
 		// CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.", ".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY
 		$sql .= " AND c.fk_statut IN (".$db->escape($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS).")";
 	}
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index f550595237c..edcccbc6a88 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -124,8 +124,7 @@ if ($result)
     }
     print "</table>";
     $db->free($result);
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 87591071105..349cf9571ab 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -154,15 +154,12 @@ if (empty($reshook))
         {
         	header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
         	exit;
-        }
-        else {
+        } else {
         	$langs->load("errors");
         	setEventMessages($objectutil->error, $objectutil->errors, 'errors');
         	$action = '';
         }
-	}
-
-	elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
+	} elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
 		((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->facture->creer))
 		|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_invoice_advance->validate)))
 	)
@@ -176,8 +173,7 @@ if (empty($reshook))
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 		{
 			$qualified_for_stock_change = $object->hasProductsOrServices(2);
-		}
-		else {
+		} else {
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -219,9 +215,7 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	elseif ($action == 'confirm_delete' && $confirm == 'yes')
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes')
 	{
 		$object->fetch($id);
 		$object->fetch_thirdparty();
@@ -236,8 +230,7 @@ if (empty($reshook))
 			{
 				header('Location: list.php?restore_lastsearch_values=1');
 				exit;
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -267,8 +260,7 @@ if (empty($reshook))
 
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			/* Fix bug 1485 : Reset action to avoid asking again confirmation on failure */
 			$action = '';
@@ -281,9 +273,7 @@ if (empty($reshook))
 		$discount = new DiscountAbsolute($db);
 		$result = $discount->fetch(GETPOST("discountid"));
 		$discount->unlink_invoice();
-	}
-
-	elseif ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
+	} elseif ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
 	{
 		$object->fetch($id);
 		$result = $object->set_paid($user);
@@ -300,8 +290,7 @@ if (empty($reshook))
 
 		if ($object->update($user) < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else {
+		} else {
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = '';
@@ -362,8 +351,7 @@ if (empty($reshook))
 		$object->label = GETPOST('label');
 		$result = $object->update($user);
 		if ($result < 0) dol_print_error($db);
-	}
-	elseif ($action == 'setdatef' && $user->rights->fournisseur->facture->creer)
+	} elseif ($action == 'setdatef' && $user->rights->fournisseur->facture->creer)
 	{
 		$newdate = dol_mktime(0, 0, 0, $_POST['datefmonth'], $_POST['datefday'], $_POST['datefyear']);
 		if ($newdate > (dol_now() + (empty($conf->global->INVOICE_MAX_OFFSET_IN_FUTURE) ? 0 : $conf->global->INVOICE_MAX_OFFSET_IN_FUTURE)))
@@ -387,8 +375,7 @@ if (empty($reshook))
 
 		$result = $object->update($user);
 		if ($result < 0) dol_print_error($db, $object->error);
-	}
-	elseif ($action == 'setdate_lim_reglement' && $user->rights->fournisseur->facture->creer)
+	} elseif ($action == 'setdate_lim_reglement' && $user->rights->fournisseur->facture->creer)
 	{
 		$object->fetch($id);
 		$object->date_echeance = dol_mktime(12, 0, 0, $_POST['date_lim_reglementmonth'], $_POST['date_lim_reglementday'], $_POST['date_lim_reglementyear']);
@@ -399,8 +386,7 @@ if (empty($reshook))
 		}
 		$result = $object->update($user);
 		if ($result < 0) dol_print_error($db, $object->error);
-	}
-	elseif ($action == "setabsolutediscount" && $usercancreate)
+	} elseif ($action == "setabsolutediscount" && $usercancreate)
 	{
 		// POST[remise_id] or POST[remise_id_for_payment]
 
@@ -589,16 +575,14 @@ if (empty($reshook))
 					if ($result >= 0)
 					{
 						$db->commit();
-					}
-					else {
+					} else {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$db->rollback();
 					}
 				} else {
 					$db->commit();
 				}
-			}
-			else {
+			} else {
 				setEventMessages($discount->error, $discount->errors, 'errors');
 				$db->rollback();
 			}
@@ -965,8 +949,7 @@ if (empty($reshook))
 								{
 									$pu = 0;
 									$pu_currency = $lines[$i]->multicurrency_subprice;
-								}
-								else {
+								} else {
 									$pu = $lines[$i]->subprice;
 									$pu_currency = 0;
 								}
@@ -1006,16 +989,13 @@ if (empty($reshook))
 
 							// Now reload line
 							$object->fetch_lines();
-						}
-						else {
+						} else {
 							$error++;
 						}
-					}
-					else {
+					} else {
 						$error++;
 					}
-				}
-				elseif (!$error)
+				} elseif (!$error)
 				{
 					$id = $object->create($user);
 					if ($id < 0)
@@ -1034,8 +1014,7 @@ if (empty($reshook))
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'create';
 			$_GET['socid'] = $_POST['socid'];
-		}
-		else {
+		} else {
 			$db->commit();
 
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
@@ -1067,8 +1046,7 @@ if (empty($reshook))
 		{
 			$up = price2num(GETPOST('price_ht'));
 			$price_base_type = 'HT';
-		}
-		else {
+		} else {
 			$up = price2num(GETPOST('price_ttc'));
 			$price_base_type = 'TTC';
 		}
@@ -1090,8 +1068,7 @@ if (empty($reshook))
 			if (trim($_POST['product_desc']) != trim($label)) $label = $_POST['product_desc'];
 
 			$type = $prod->type;
-		}
-		else {
+		} else {
 			$label = $_POST['product_desc'];
 			$type = $_POST["type"] ? $_POST["type"] : 0;
 		}
@@ -1141,14 +1118,11 @@ if (empty($reshook))
 			unset($_POST['date_endyear']);
 
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer)
+	} elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer)
 	{
 		$db->begin();
 
@@ -1175,8 +1149,7 @@ if (empty($reshook))
 			$idprod = 0;
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		}
-		else {
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = '';
@@ -1259,13 +1232,11 @@ if (empty($reshook))
 					{
 						$productsupplier->ref_supplier = '';
 					}
-				}
-				else {
+				} else {
 					$fksoctosearch = $object->thirdparty->id;
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 				}
-			}
-			elseif (GETPOST('idprodfournprice', 'alpha') > 0)
+			} elseif (GETPOST('idprodfournprice', 'alpha') > 0)
 			{
 				$qtytosearch = $qty; // Just to see if a price exists for the quantity. Not used to found vat.
 				//$qtytosearch=-1;	       // We force qty to -1 to be sure to find if a supplier price exist
@@ -1349,8 +1320,7 @@ if (empty($reshook))
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'errors');
 			}
-		}
-		elseif (empty($error)) // $price_ht is already set
+		} elseif (empty($error)) // $price_ht is already set
 		{
 			$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
 			$tva_tx = str_replace('*', '', $tva_tx);
@@ -1370,8 +1340,7 @@ if (empty($reshook))
 			if ($price_ht !== '')
 			{
 				$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
-			}
-			else {
+			} else {
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 				$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
 			}
@@ -1436,16 +1405,13 @@ if (empty($reshook))
 			unset($_POST['date_endday']);
 			unset($_POST['date_endmonth']);
 			unset($_POST['date_endyear']);
-		}
-		else {
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 
 		$action = '';
-	}
-
-	elseif ($action == 'classin' && $user->rights->fournisseur->facture->creer)
+	} elseif ($action == 'classin' && $user->rights->fournisseur->facture->creer)
 	{
 		$object->fetch($id);
 		$result = $object->setProject($projectid);
@@ -1476,8 +1442,7 @@ if (empty($reshook))
 	            if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 	            {
 	                $qualified_for_stock_change = $object->hasProductsOrServices(2);
-	            }
-	            else {
+	            } else {
 	                $qualified_for_stock_change = $object->hasProductsOrServices(1);
 	            }
 
@@ -1530,8 +1495,7 @@ if (empty($reshook))
 			{
 				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
 				exit;
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -1607,14 +1571,12 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else {
+			} else {
 				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-				}
-				else {
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
@@ -1626,8 +1588,7 @@ if (empty($reshook))
 			if ($object->fetch($id))
 			{
 				$result = $object->swapContactStatus(GETPOST('ligne'));
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -1642,8 +1603,7 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -1743,8 +1703,7 @@ if ($action == 'create')
 		// Replicate extrafields
 		$objectsrc->fetch_optionals();
 		$object->array_options = $objectsrc->array_options;
-	}
-	else {
+	} else {
 		$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
 		$fk_account         = $societe->fk_account;
@@ -1780,8 +1739,7 @@ if ($action == 'create')
 		$absolute_discount = $societe->getAvailableDiscounts('', '', 0, 1);
 		print $societe->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$societe->id.'">';
-	}
-	else {
+	} else {
 		print $form->select_company($societe->id, 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve supplier informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE))
@@ -1991,8 +1949,7 @@ if ($action == 'create')
 
 				print '</div></div>';
 			}
-		}
-		else {
+		} else {
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			$tmp = '<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
 			$text = $tmp.$langs->trans("InvoiceAvoir").' ';
@@ -2195,8 +2152,7 @@ if ($action == 'create')
 
 		print '</table>';
 	}
-}
-else {
+} else {
 	if ($id > 0 || !empty($ref))
 	{
 		/* *************************************************************************** */
@@ -2289,8 +2245,7 @@ else {
 			{
 				$savdate = $object->date;
 				$numref = $object->getNextNumRef($societe);
-			}
-			else {
+			} else {
 				$numref = $object->ref;
 			}
 
@@ -2308,8 +2263,7 @@ else {
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 			{
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
-			}
-			else {
+			} else {
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
@@ -2344,8 +2298,7 @@ else {
             if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
             {
                 $qualified_for_stock_change = $object->hasProductsOrServices(2);
-            }
-            else {
+            } else {
                 $qualified_for_stock_change = $object->hasProductsOrServices(1);
             }
             if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
@@ -2552,8 +2505,7 @@ else {
 		if ($action == 'editconditions')
 		{
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
-		}
-		else {
+		} else {
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
 		}
 		print "</td>";
@@ -2573,8 +2525,7 @@ else {
 		if ($action == 'editmode')
 		{
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT', 1, 1);
-		}
-		else {
+		} else {
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
 		}
 		print '</td></tr>';
@@ -2660,8 +2611,7 @@ else {
 			if ($action != 'editincoterm')
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-			}
-			else {
+			} else {
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 			}
 			print '</td></tr>';
@@ -2833,8 +2783,7 @@ else {
 					$totalpaye += $objp->amount;
 					$i++;
 				}
-			}
-			else {
+			} else {
 				print '<tr class="oddeven"><td colspan="'.$nbcols.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td><td></td><td></td></tr>';
 			}
 
@@ -2852,8 +2801,7 @@ else {
 			*/
 
 			$db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -2956,8 +2904,7 @@ else {
 			print ' :</td>';
 			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td>';
 			print '<td class="nowrap">&nbsp;</td></tr>';
-		}
-		else // Credit note
+		} else // Credit note
 		{
 			$cssforamountpaymentcomplete = 'amountpaymentneutral';
 
@@ -3080,8 +3027,7 @@ else {
 					if ($ventilExportCompta == 0)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans('Modify').'</a></div>';
-					}
-					else {
+					} else {
 						print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Modify').'</span></div>';
 					}
 				}
@@ -3097,8 +3043,7 @@ else {
 					if (!$facidnext && $object->close_code != 'replaced' && $user->rights->fournisseur->facture->creer)	// Not replaced by another invoice
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans('ReOpen').'</a></div>';
-					}
-					else {
+					} else {
 						if ($user->rights->fournisseur->facture->creer) {
 							print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('ReOpen').'</span></div>';
 						} elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
@@ -3114,8 +3059,7 @@ else {
 						if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->fournisseur->supplier_invoice_advance->send)
 						{
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-						}
-						else print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip">'.$langs->trans('SendMail').'</a></div>';
+						} else print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip">'.$langs->trans('SendMail').'</a></div>';
 					}
 				}
 
@@ -3142,8 +3086,7 @@ else {
 						if ($resteapayer == 0)
 						{
 							print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPaymentBack').'</span></div>';
-						}
-						else {
+						} else {
 							print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?facid='.$object->id.'&amp;action=create&amp;accountid='.$object->fk_account.'">'.$langs->trans('DoPaymentBack').'</a></div>';
 						}
 					}
@@ -3176,8 +3119,7 @@ else {
 	                    {
 	                        print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid"';
 	                        print '>'.$langs->trans('Validate').'</a></div>';
-	                    }
-	                    else {
+	                    } else {
 	                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'"';
 	                        print '>'.$langs->trans('Validate').'</a></div>';
 	                    }
@@ -3212,21 +3154,16 @@ else {
 	            	//var_dump($isErasable);
 	            	if ($isErasable == -4) {
 	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecausePayments").'">'.$langs->trans('Delete').'</a></div>';
-	            	}
-	            	elseif ($isErasable == -3) {	// Should never happen with supplier invoice
+	            	} elseif ($isErasable == -3) {	// Should never happen with supplier invoice
 	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastSituationInvoice").'">'.$langs->trans('Delete').'</a></div>';
-	            	}
-	            	elseif ($isErasable == -2) {	// Should never happen with supplier invoice
+	            	} elseif ($isErasable == -2) {	// Should never happen with supplier invoice
 	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastInvoice").'">'.$langs->trans('Delete').'</a></div>';
-	            	}
-	            	elseif ($isErasable == -1) {
+	            	} elseif ($isErasable == -1) {
 	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Delete').'</a></div>';
-	            	}
-	            	elseif ($isErasable <= 0)	// Any other cases
+	            	} elseif ($isErasable <= 0)	// Any other cases
 	            	{
 	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotErasable").'">'.$langs->trans('Delete').'</a></div>';
-	            	}
-                    else {
+	            	} else {
     	                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>';
                     }
 	            }
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 007fadc1e36..5cd1043de8f 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -65,14 +65,12 @@ if ($action == 'addcontact' && $user->rights->fournisseur->facture->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -84,8 +82,7 @@ elseif ($action == 'swapstatut' && $user->rights->fournisseur->facture->creer)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -100,8 +97,7 @@ elseif ($action == 'deletecontact' && $user->rights->fournisseur->facture->creer
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -264,8 +260,7 @@ if ($id > 0 || !empty($ref))
 
 		// Contacts lines
 		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
-	}
-	else {
+	} else {
 		print "ErrorRecordNotFound";
 	}
 }
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 3c08c2e4e68..3b06f1276d6 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -253,8 +253,7 @@ if ($object->id > 0)
 	$permtoedit = $user->rights->fournisseur->facture->creer;
 	$param = '&facid='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
     print $langs->trans('ErrorUnknown');
 }
 
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index 8b0cbac2586..b37de34301d 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -290,8 +290,7 @@ if ($user->rights->fournisseur->facture->lire)
 		print '</form>';
 
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index c573cb5d938..1be897fa411 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -414,8 +414,7 @@ if (!$search_all)
 			$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ",ef.".$key : '');
 		}
 	}
-}
-else {
+} else {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
 
@@ -1300,8 +1299,7 @@ if ($resql)
     $title = '';
 
     print $formfile->showdocuments('massfilesarea_supplier_invoice', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 7ececacbf33..db5bc9acfb5 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -168,8 +168,7 @@ if (empty($reshook))
 	            }
 
 	            $formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => $_POST[$key]);
-	        }
-			elseif (substr($key, 0, 21) == 'multicurrency_amount_')
+	        } elseif (substr($key, 0, 21) == 'multicurrency_amount_')
 			{
 				$cursorfacid = substr($key, 21);
 	            $multicurrency_amounts[$cursorfacid] = price2num(trim(GETPOST($key)));
@@ -345,8 +344,7 @@ if (empty($reshook))
 	            else $loc = DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$paiement_id;
 	            header('Location: '.$loc);
 	            exit;
-	        }
-	        else {
+	        } else {
 	            $db->rollback();
 	        }
 	    }
@@ -496,8 +494,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                 print '<tr><td class="fieldrequired">'.$langs->trans('Account').'</td><td>';
                 $form->select_comptes(empty($accountid) ? $obj->fk_account : $accountid, 'accountid', 0, '', 2);
                 print '</td></tr>';
-            }
-            else {
+            } else {
                 print '<tr><td>&nbsp;</td></tr>';
             }
             print '<tr><td>'.$langs->trans('Numero').'</td><td><input name="num_paiement" type="text" value="'.(empty($_POST['num_paiement']) ? '' : $_POST['num_paiement']).'"></td></tr>';
@@ -529,8 +526,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	            if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE)
 	            {
 	                $sql .= ' AND f.type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
-	            }
-	            else {
+	            } else {
 	                $sql .= ' AND f.type = 2'; // If paying back a credit note, we show all credit notes
 	            }
                 // Group by because we have a total
@@ -624,8 +620,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                        {
 	                            print '<td class="center nowraponall">';
 	                            print dol_print_date($db->jdate($objp->df), 'day').'</td>';
-	                        }
-	                        else {
+	                        } else {
 	                            print '<td class="center"><b>!!!</b></td>';
 	                        }
 
@@ -641,8 +636,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                            }
 
 	                            print '</td>';
-	                        }
-	                        else {
+	                        } else {
 	                            print '<td class="center"><b>--</b></td>';
 	                        }
 
@@ -695,8 +689,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                        		print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
 	                        		print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
 	                        		print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
-	                        }
-	                        else {
+	                        } else {
 	                        	print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.dol_escape_htmltag(GETPOST($namef)).'" disabled>';
 	                        	print '<input type="hidden" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
 	                        }
@@ -719,8 +712,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 											print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
 											print '<input type=hidden class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
 											print '<input type="text" size="8" class="multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
-									}
-									else {
+									} else {
 										print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>';
 										print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
 									}
@@ -760,8 +752,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                    print "</div>";
 	                }
 	                $db->free($resql);
-	            }
-	            else {
+	            } else {
 	                dol_print_error($db);
 	            }
 			}
@@ -794,8 +785,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
             print '</form>';
         }
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
 }
 
 /*
@@ -1042,8 +1032,7 @@ if (empty($action) || $action == 'list')
         print "</table>";
         print "</div>";
         print "</form>\n";
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
index 78acbbd32f2..7873dd81b2d 100644
--- a/htdocs/fourn/facture/rapport.php
+++ b/htdocs/fourn/facture/rapport.php
@@ -72,8 +72,7 @@ if ($action == 'builddoc')
     if ($rap->write_file($dir, $_POST["remonth"], $_POST["reyear"], $outputlangs) > 0)
     {
         $outputlangs->charset_output = $sav_charset_output;
-    }
-    else {
+    } else {
         $outputlangs->charset_output = $sav_charset_output;
         dol_print_error($db, $obj->error);
     }
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index dd1f792853d..0826a4ab200 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -59,8 +59,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 				// If not abandonned
     			$total = $total + $sign * $objectlink->total_ht;
     			echo price($objectlink->total_ht);
-    		}
-    		else {
+    		} else {
     			echo '<strike>'.price($objectlink->total_ht).'</strike>';
     		}
     	} ?></td>
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index 4cd4063f72b..5d82021bf3c 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -89,8 +89,7 @@ if ($resql)
 	print "</table>";
 	print "<br>\n";
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -209,8 +208,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 			print "<br>\n";
 		}
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -262,8 +260,7 @@ if ($resql)
 	print "</table>\n";
 
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index a4c53d573c9..a93d093022c 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -59,8 +59,7 @@ if ($action == 'setnote' && $user->rights->fournisseur->facture->creer)
 	{
 		$db->commit();
 		$action = '';
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -77,8 +76,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisse
 		$db->commit();
 		header('Location: '.DOL_URL_ROOT.'/fourn/facture/paiement.php');
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -97,8 +95,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' &&
 		$db->commit();
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -111,8 +108,7 @@ if ($action == 'setnum_paiement' && !empty($_POST['num_paiement']))
 	if ($res === 0)
 	{
 		setEventMessages($langs->trans('PaymentNumberUpdateSucceeded'), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans('PaymentNumberUpdateFailed'), null, 'errors');
 	}
 }
@@ -125,8 +121,7 @@ if ($action == 'setdatep' && !empty($_POST['datepday']))
 	if ($res === 0)
 	{
 		setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans('PaymentDateUpdateFailed'), null, 'errors');
 	}
 }
@@ -321,8 +316,7 @@ if ($result > 0)
 
 		print "</table>\n";
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
@@ -352,8 +346,7 @@ if ($result > 0)
 			if ($allow_delete)
 			{
 				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-			}
-			else {
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$title_button.'">'.$langs->trans('Delete').'</a>';
 			}
 		}
@@ -390,8 +383,7 @@ if ($result > 0)
 	*/
 
 	print '</div></div></div>';
-}
-else {
+} else {
 	$langs->load("errors");
 	print $langs->trans("ErrorRecordNotFound");
 }
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 7621a5ea5f3..91cd3636bbe 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -331,8 +331,7 @@ if ($resql)
 	print "</table>";
 
 	print '</form>';
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index 87088ba91c0..540ed1cbc18 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -173,20 +173,17 @@ if ($socid > 0)
                     }
 
                     $db->free($resqlp);
-                }
-                else {
+                } else {
                     dol_print_error($db);
                 }
             }
-        }
-        else {
+        } else {
             dol_print_error($db);
         }
 
         print "</table>";
     }
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index ba4dbc3925b..49af7141d84 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -50,8 +50,7 @@ if ($result)
 	$obj = $db->fetch_object($result);
 	preg_match('/([0-9]+)$/i', $obj->name, $reg);
 	if ($reg[1]) $lastftpentry = $reg[1];
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -95,8 +94,7 @@ if ($action == 'add' || GETPOST('modify', 'alpha'))
 			$db->commit();
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
-		}
-		else {
+		} else {
 			$db->rollback();
 			dol_print_error($db);
 		}
@@ -121,8 +119,7 @@ if (GETPOST('delete', 'alpha'))
             $db->commit();
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
-        }
-        else {
+        } else {
             $db->rollback();
             dol_print_error($db);
         }
@@ -145,8 +142,7 @@ print '<br>';
 if (!function_exists('ftp_connect'))
 {
 	print $langs->trans("FTPFeatureNotSupportedByYourPHP");
-}
-else {
+} else {
 	// Formulaire ajout
 	print '<form name="ftpconfig" action="ftpclient.php" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -296,8 +292,7 @@ else {
 
 			$i++;
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index cf5ad19e553..5310a0b3bf8 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -102,8 +102,7 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 		if (is_numeric($resupload) && $resupload > 0)
 		{
 			$result = $ecmdir->changeNbOfFiles('+');
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			if ($resupload < 0)	// Unknown error
 			{
@@ -111,14 +110,12 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 			} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload)) {
                 // Files infected by a virus
 				setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
-			}
-			else // Known error
+			} else // Known error
 			{
 				setEventMessages($langs->trans($resupload), null, 'errors');
 			}
 		}
-	}
-	else {
+	} else {
 		// Echec transfert (fichier depassant la limite ?)
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFailToCreateDir", $upload_dir), null, 'errors');
@@ -137,8 +134,7 @@ if ($action == 'add' && $user->rights->ftp->setup)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("ErrorFailToCreateDir"), null, 'errors');
 		$action = "create";
 	}
@@ -172,8 +168,7 @@ if ($action == 'confirm_deletefile' && $_REQUEST['confirm'] == 'yes')
 		if ($result)
 		{
 			setEventMessages($langs->trans("FileWasRemoved", $file), null, 'mesgs');
-		}
-		else {
+		} else {
 			dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
 			setEventMessages($langs->trans("FTPFailedToRemoveFile", $file), null, 'errors');
 		}
@@ -181,8 +176,7 @@ if ($action == 'confirm_deletefile' && $_REQUEST['confirm'] == 'yes')
 		//ftp_close($conn_id);	Close later
 
 		$action = '';
-	}
-	else {
+	} else {
 		dol_print_error('', $mesg);
 	}
 }
@@ -220,8 +214,7 @@ if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("De
 				if ($result)
 				{
 					setEventMessages($langs->trans("FileWasRemoved", $file), null, 'mesgs');
-				}
-				else {
+				} else {
 					dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
 					setEventMessages($langs->trans("FTPFailedToRemoveFile", $file), null, 'errors');
 				}
@@ -231,8 +224,7 @@ if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("De
 				$action = '';
 			}
 		}
-	}
-	else {
+	} else {
 		dol_print_error('', $mesg);
 	}
 }
@@ -261,16 +253,14 @@ if ($action == 'confirm_deletesection' && $confirm == 'yes')
 		if ($result)
 		{
 			setEventMessages($langs->trans("DirWasRemoved", $file), null, 'mesgs');
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("FTPFailedToRemoveDir", $file), null, 'errors');
 		}
 
 		//ftp_close($conn_id);	Close later
 
 		$action = '';
-	}
-	else {
+	} else {
 		dol_print_error('', $mesg);
 	}
 }
@@ -326,12 +316,10 @@ if ($action == 'download')
 			ftp_close($conn_id);
 
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($langs->transnoentitiesnoconv('FailedToGetFile', $remotefile), null, 'errors');
 		}
-	}
-	else {
+	} else {
 		dol_print_error('', $mesg);
 	}
 
@@ -388,8 +376,7 @@ print $langs->trans("FTPAreaDesc")."<br>";
 if (!function_exists('ftp_connect'))
 {
 	print $langs->trans("FTPFeatureNotSupportedByYourPHP");
-}
-else {
+} else {
     if (!empty($ftp_server))
 	{
 		// Confirm remove file
@@ -486,8 +473,7 @@ else {
                 {
                     $buff[$i] = "---------- - root root 1234 Aug 01 2000 ".$key;
                 }
-    		}
-    		else {
+    		} else {
                 $buff = ftp_rawlist($conn_id, $newsectioniso);
                 $contents = ftp_nlist($conn_id, $newsectioniso); // Sometimes rawlist fails but never nlist
         		//var_dump($contents);
@@ -522,8 +508,7 @@ else {
 				{
 					if (preg_match('/^d/', $vals[0])) $is_directory = 1;
 					if (preg_match('/^l/', $vals[0])) $is_link = 1;
-				}
-				else {
+				} else {
 					// Remote file
 					$filename = $file;
 					//print "section=".$section.' file='.$file.'X';
@@ -573,14 +558,12 @@ else {
 				{
 					if ($file != '..') print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_section&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_delete().'</a>';
 					else print '&nbsp;';
-				}
-				elseif ($is_link)
+				} elseif ($is_link)
 				{
 					$newfile = $file;
 					$newfile = preg_replace('/ ->.*/', '', $newfile);
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($newfile).'">'.img_delete().'</a>';
-				}
-				else {
+				} else {
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=download&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_picto('', 'file').'</a>';
 					print ' &nbsp; ';
 					print '<input type="checkbox" class="flat checkboxfordelete" id="check_'.$i.'" name="const['.$i.'][check]" value="1">';
@@ -621,8 +604,7 @@ else {
 		print '</div>';
 
 		print "</form>";
-	}
-	else {
+	} else {
 		$foundsetup = false;
 		$MAXFTP = 20;
 		$i = 1;
@@ -640,8 +622,7 @@ else {
 	    if (!$foundsetup)
 	    {
             print $langs->trans("SetupOfFTPClientModuleNotComplete");
-	    }
-	    else {
+	    } else {
 	        print $langs->trans("ChooseAFTPEntryIntoMenu");
 	    }
 	}
@@ -654,12 +635,10 @@ if ($conn_id)
 {
     if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
     {
-    }
-    elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL))
+    } elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL))
     {
         ftp_close($conn_id);
-    }
-    else {
+    } else {
         ftp_close($conn_id);
     }
 }
@@ -701,13 +680,11 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
 		{
 		    dol_syslog('Try to connect with ssh2_ftp');
 		    $tmp_conn_id = ssh2_connect($ftp_server, $ftp_port);
-		}
-		elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL))
+		} elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL))
 		{
 		    dol_syslog('Try to connect with ftp_ssl_connect');
 		    $conn_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout);
-		}
-		else {
+		} else {
 		    dol_syslog('Try to connect with ftp_connect');
 		    $conn_id = ftp_connect($ftp_server, $ftp_port, $connecttimeout);
 		}
@@ -732,14 +709,12 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
     	   				    $ok = 0;
         				    $error++;
 		                }
-    				}
-    				else {
+    				} else {
     					$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
 	   				    $ok = 0;
     				    $error++;
     				}
-				}
-				else {
+				} else {
 				    if (ftp_login($conn_id, $ftp_user, $ftp_password))
     				{
     					// Turn on passive mode transfers (must be after a successful login
@@ -748,16 +723,14 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
     					// Change the dir
     					$newsectioniso = utf8_decode($section);
     					ftp_chdir($conn_id, $newsectioniso);
-    				}
-    				else {
+    				} else {
     					$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
 	   				    $ok = 0;
     				    $error++;
     				}
 				}
 			}
-		}
-		else {
+		} else {
 		    dol_syslog('FailedToConnectToFTPServer '.$ftp_server.' '.$ftp_port, LOG_ERR);
 			$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServer", $ftp_server, $ftp_port);
 			$ok = 0;
@@ -782,8 +755,7 @@ function ftp_isdir($connect_id, $dir)
 	{
 		ftp_cdup($connect_id);
 		return 1;
-	}
-	else {
+	} else {
 		return 0;
 	}
 }
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 8a72ac7284e..6e639370aa9 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -228,8 +228,7 @@ if (empty($reshook))
 
 		    	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 		        exit;
-		    }
-		    else {
+		    } else {
 		    	$db->rollback();
 		    }
 	    }
@@ -251,8 +250,7 @@ if (empty($reshook))
 	        {
 	            setEventMessages($object->error, $object->errors, 'warnings');
 	            $action = 'editvalidator';
-	        }
-	        else {
+	        } else {
 	            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	            exit;
 	        }
@@ -337,18 +335,15 @@ if (empty($reshook))
 				{
 					setEventMessages($object->error, $object->errors, 'warnings');
 					$action = 'edit';
-				}
-				else {
+				} else {
 					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 					exit;
 				}
-	        }
-	        else {
+	        } else {
 	        	setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
 	        	$action = '';
 	        }
-	    }
-	    else {
+	    } else {
 	    	setEventMessages($langs->trans("ErrorBadStatus"), null, 'errors');
 	    	$action = '';
 	    }
@@ -370,8 +365,7 @@ if (empty($reshook))
 			if ($candelete)
 			{
 				$result = $object->delete($user);
-			}
-			else {
+			} else {
 				$error++;
 				setEventMessages($langs->trans('ErrorCantDeleteCP'), null, 'errors');
 				$action = '';
@@ -383,8 +377,7 @@ if (empty($reshook))
 			$db->commit();
 			header('Location: list.php?restore_lastsearch_values=1');
 			exit;
-		}
-		else {
+		} else {
 			$db->rollback();
 		}
 	}
@@ -477,13 +470,11 @@ if (empty($reshook))
 	            {
 	                setEventMessages($mail->error, $mail->errors, 'warnings');
 	                $action = '';
-	            }
-	            else {
+	            } else {
 	            	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	            	exit;
 	            }
-	        }
-	        else {
+	        } else {
 	        	setEventMessages($object->error, $object->errors, 'errors');
 	        	$action = '';
 	        }
@@ -571,8 +562,7 @@ if (empty($reshook))
 	            if (!$emailTo)
 	            {
 	                dol_syslog("User that request leave has no email, so we redirect directly to finished page without sending email");
-	            }
-	            else {
+	            } else {
 	                // From
 	                $expediteur = new User($db);
 	                $expediteur->fetch($object->fk_validator);
@@ -615,8 +605,7 @@ if (empty($reshook))
 
 	           	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	           	exit;
-	        }
-	        else {
+	        } else {
 	            $db->rollback();
 	        	$action = '';
 	        }
@@ -657,8 +646,7 @@ if (empty($reshook))
 	                if (!$emailTo)
 	                {
 	                    dol_syslog("User that request leave has no email, so we redirect directly to finished page without sending email");
-	                }
-	                else {
+	                } else {
 	                    // From
 	                    $expediteur = new User($db);
 	                    $expediteur->fetch($object->fk_validator);
@@ -694,8 +682,7 @@ if (empty($reshook))
 	                    	$action = '';
 	                    }
 	                }
-	            }
-	            else {
+	            } else {
 	            	$action = '';
 	            }
 
@@ -705,8 +692,7 @@ if (empty($reshook))
 
 	                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	                exit;
-	            }
-	            else {
+	            } else {
 	                $db->rollback();
 	                $action = '';
 	            }
@@ -741,8 +727,7 @@ if (empty($reshook))
 
 	        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	        exit;
-	    }
-	    else {
+	    } else {
 	        $db->rollback();
 	    }
 	}
@@ -790,8 +775,7 @@ if (empty($reshook))
 	        if (!$error)
 	        {
 	        	$db->commit();
-	        }
-	        else {
+	        } else {
 	        	$db->rollback();
 	        }
 
@@ -841,8 +825,7 @@ if (empty($reshook))
 	            {
 	            	setEventMessages($mail->error, $mail->errors, 'warnings');
 	            	$action = '';
-	            }
-	            else {
+	            } else {
 	            	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	            	exit;
 	            }
@@ -886,8 +869,7 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $
     if (($fuserid == $user->id && empty($user->rights->holiday->write)) || ($fuserid != $user->id && empty($user->rights->holiday->write_all)))
     {
         $errors[] = $langs->trans('CantCreateCP');
-    }
-    else {
+    } else {
         // Formulaire de demande de congés payés
         print load_fiche_titre($langs->trans('MenuAddCP'), '', 'title_hrm.png');
 
@@ -981,8 +963,7 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $
 			print $out;
 
 	        dol_fiche_end();
-        }
-        elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
+        } elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
         {
         	print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'<br>';
         }
@@ -1003,8 +984,7 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $
         {
         	print $form->select_dolusers(($fuserid ? $fuserid : $user->id), 'fuserid', 0, '', 0, 'hierarchyme', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth300');
         	//print '<input type="hidden" name="fuserid" value="'.($fuserid?$fuserid:$user->id).'">';
-        }
-        else print $form->select_dolusers(GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id, 'fuserid', 0, '', 0, '', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth300');
+        } else print $form->select_dolusers(GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id, 'fuserid', 0, '', 0, '', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth300');
         print '</td>';
         print '</tr>';
 
@@ -1107,16 +1087,14 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $
 
         print '</from>'."\n";
     }
-}
-else {
+} else {
     if ($error)
     {
         print '<div class="tabBar">';
         print $error;
         print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
         print '</div>';
-    }
-    else {
+    } else {
         // Affichage de la fiche d'une demande de congés payés
         if (($id > 0) || $ref)
         {
@@ -1225,8 +1203,7 @@ else {
 			        print '<span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
                     print '</td>';
                     print '</tr>';
-                }
-                else {
+                } else {
                     print '<tr>';
                     print '<td class="nowrap">'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
                     print '<td>';
@@ -1246,8 +1223,7 @@ else {
                     print '<span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
                     print '</td>';
                     print '</tr>';
-                }
-                else {
+                } else {
                     print '<tr>';
                     print '<td class="nowrap">'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
                     print '<td>';
@@ -1288,8 +1264,7 @@ else {
                     print '<td>'.$langs->trans('DescCP').'</td>';
                     print '<td>'.nl2br($object->description).'</td>';
                     print '</tr>';
-                }
-                else {
+                } else {
                     print '<tr>';
                     print '<td>'.$langs->trans('DescCP').'</td>';
                     print '<td class="tdtop">';
@@ -1472,8 +1447,7 @@ else {
                         {
                             print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=valid" class="butAction">'.$langs->trans("Approve").'</a>';
                             print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=refuse" class="butAction">'.$langs->trans("ActionRefuseCP").'</a>';
-                        }
-                        else {
+                        } else {
                             print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("Approve").'</a>';
                             print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("ActionRefuseCP").'</a>';
                         }
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 838e65968ef..314cc0b8bd0 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -204,14 +204,12 @@ class Holiday extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else {
+			} else {
 				$this->error = $obj->error;
 				//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-		}
-		else {
+		} else {
 			print $langs->trans("Error")." ".$langs->trans("Error_HOLIDAY_ADDON_NotDefined");
 			return "";
 		}
@@ -236,8 +234,7 @@ class Holiday extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -341,8 +338,7 @@ class Holiday extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return $this->id;
 		}
@@ -423,15 +419,13 @@ class Holiday extends CommonObject
 				$this->fetch_optionals();
 
 				$result = 1;
-			}
-			else {
+			} else {
 				$result = 0;
 			}
 			$this->db->free($resql);
 
 			return $result;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -555,8 +549,7 @@ class Holiday extends CommonObject
 			// Returns 1 with the filled array
 			$this->holiday = $tab_result;
 			return 1;
-		}
-		else {
+		} else {
 			// SQL Error
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
@@ -679,8 +672,7 @@ class Holiday extends CommonObject
 			// Returns 1 and adds the array to the variable
 			$this->holiday = $tab_result;
 			return 1;
-		}
-		else {
+		} else {
 			// SQL Error
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
@@ -704,8 +696,7 @@ class Holiday extends CommonObject
 		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref) || $this->ref == $this->id))
 		{
 			$num = $this->getNextNumRef(null);
-		}
-		else {
+		} else {
 			$num = $this->ref;
 		}
 		$this->newref = dol_sanitizeFileName($num);
@@ -749,8 +740,7 @@ class Holiday extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -862,8 +852,7 @@ class Holiday extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -974,8 +963,7 @@ class Holiday extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1026,8 +1014,7 @@ class Holiday extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1070,8 +1057,7 @@ class Holiday extends CommonObject
 				{
 					return false;
 				}
-			}
-			elseif ($halfday == -1)
+			} elseif ($halfday == -1)
 			{
 				// new start afternoon, new end afternoon
 				if ($dateStart >= $infos_CP['date_debut'] && $dateStart <= $infos_CP['date_fin'])
@@ -1083,8 +1069,7 @@ class Holiday extends CommonObject
 					if ($dateStart < $dateEnd) return false;
 					if ($dateEnd < $infos_CP['date_fin'] || in_array($infos_CP['halfday'], array(0, -1))) return false;
 				}
-			}
-			elseif ($halfday == 1)
+			} elseif ($halfday == 1)
 			{
 				// new start morning, new end morning
 				if ($dateStart >= $infos_CP['date_debut'] && $dateStart <= $infos_CP['date_fin'])
@@ -1096,8 +1081,7 @@ class Holiday extends CommonObject
 				{
 					if ($dateEnd > $infos_CP['date_debut'] || in_array($infos_CP['halfday'], array(0, 1))) return false;
 				}
-			}
-			elseif ($halfday == 2)
+			} elseif ($halfday == 2)
 			{
 				// new start afternoon, new end morning
 				if ($dateStart >= $infos_CP['date_debut'] && $dateStart <= $infos_CP['date_fin'])
@@ -1108,8 +1092,7 @@ class Holiday extends CommonObject
 				{
 					if ($dateEnd > $infos_CP['date_debut'] || in_array($infos_CP['halfday'], array(0, 1))) return false;
 				}
-			}
-			else {
+			} else {
 				dol_print_error('', 'Bad value of parameter halfday when calling function verifDateHolidayCP');
 			}
 		}
@@ -1176,8 +1159,7 @@ class Holiday extends CommonObject
 					break;
 				}
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return array('morning'=>$isavailablemorning, 'afternoon'=>$isavailableafternoon);
 	}
@@ -1294,8 +1276,7 @@ class Holiday extends CommonObject
 		for ($i = 1; $i < $nb; $i++) {
 			if ($i == $selected) {
 				$statut .= '<option value="'.$i.'" selected>'.$langs->trans($name[$i - 1]).'</option>'."\n";
-			}
-			else {
+			} else {
 				$statut .= '<option value="'.$i.'">'.$langs->trans($name[$i - 1]).'</option>'."\n";
 			}
 		}
@@ -1357,17 +1338,14 @@ class Holiday extends CommonObject
 					if ($result)
 					{
 						return $createifnotfound;
-					}
-					else {
+					} else {
 						$this->error = $this->db->lasterror();
 						return -2;
 					}
-				}
-				else {
+				} else {
 					return '';
 				}
-			}
-			else {
+			} else {
 				return $obj->value;
 			}
 		} else {
@@ -1447,16 +1425,14 @@ class Holiday extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
 			}
 
 			return 0;
-		}
-		else {
+		} else {
 			// Mise à jour pour un utilisateur
 			$nbHoliday = price2num($nbHoliday, 5);
 
@@ -1479,8 +1455,7 @@ class Holiday extends CommonObject
 						$error++;
 						$this->errors[] = $this->db->lasterror();
 					}
-				}
-				else {
+				} else {
 					// Insert for user
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users(nb_holiday, fk_user, fk_type) VALUES (";
 					$sql .= $nbHoliday;
@@ -1492,8 +1467,7 @@ class Holiday extends CommonObject
 						$this->errors[] = $this->db->lasterror();
 					}
 				}
-			}
-			else {
+			} else {
 				$this->errors[] = $this->db->lasterror();
 				$error++;
 			}
@@ -1501,8 +1475,7 @@ class Holiday extends CommonObject
 			if (!$error)
 			{
 				return 1;
-			}
-			else {
+			} else {
 				return -1;
 			}
 		}
@@ -1558,8 +1531,7 @@ class Holiday extends CommonObject
 				$resql = $this->db->query($sql);
 				if (!$resql) dol_print_error($this->db);
 			}
-		}
-		else {
+		} else {
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users";
 			$sql .= " (fk_user, nb_holiday)";
 			$sql .= " VALUES ('".$userid."','0')";
@@ -1607,8 +1579,7 @@ class Holiday extends CommonObject
 			//return number_format($obj->nb_holiday,2);
 			if ($obj) return $obj->nb_holiday;
 			else return null;
-		}
-		else {
+		} else {
 			return null;
 		}
 	}
@@ -1645,8 +1616,7 @@ class Holiday extends CommonObject
 					$sql .= " WHERE ((ug.fk_user = u.rowid";
 					$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
 					$sql .= " OR u.entity = 0)"; // Show always superadmin
-				}
-				else {
+				} else {
 					$sql .= " WHERE u.entity IN (".getEntity('user').")";
 				}
 				$sql .= " AND u.statut > 0";
@@ -1675,14 +1645,12 @@ class Holiday extends CommonObject
 					}
 					// Retoune le tableau des utilisateurs
 					return $stringlist;
-				}
-				else {
+				} else {
 					// Erreur SQL
 					$this->error = "Error ".$this->db->lasterror();
 					return -1;
 				}
-			}
-			else {
+			} else {
 				// We want only list of vacation balance for user ids
 				$sql = "SELECT DISTINCT cpu.fk_user";
 				$sql .= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
@@ -1712,15 +1680,13 @@ class Holiday extends CommonObject
 					}
 					// Retoune le tableau des utilisateurs
 					return $stringlist;
-				}
-				else {
+				} else {
 					// Erreur SQL
 					$this->error = "Error ".$this->db->lasterror();
 					return -1;
 				}
 			}
-		}
-		else {
+		} else {
 			// Si faux donc return array
 			// List for Dolibarr users
 			if ($type)
@@ -1739,8 +1705,7 @@ class Holiday extends CommonObject
 					$sql .= " WHERE ((ug.fk_user = u.rowid";
 					$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
 					$sql .= " OR u.entity = 0)"; // Show always superadmin
-				}
-				else {
+				} else {
 					$sql .= " WHERE u.entity IN (".getEntity('user').")";
 				}
 
@@ -1781,8 +1746,7 @@ class Holiday extends CommonObject
 					$this->errors[] = "Error ".$this->db->lasterror();
 					return -1;
 				}
-			}
-			else {
+			} else {
 				// List of vacation balance users
 				$sql = "SELECT cpu.fk_type, cpu.nb_holiday, u.rowid, u.lastname, u.firstname, u.gender, u.photo, u.employee, u.statut, u.fk_user";
 				$sql .= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
@@ -1820,8 +1784,7 @@ class Holiday extends CommonObject
 					}
 					// Retoune le tableau des utilisateurs
 					return $tab_result;
-				}
-				else {
+				} else {
 					// Erreur SQL
 					$this->error = "Error ".$this->db->lasterror();
 					return -1;
@@ -1864,8 +1827,7 @@ class Holiday extends CommonObject
 				$i++;
 			}
 			return $users_validator;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch_users_approver_holiday  Error ".$this->error, LOG_ERR);
 			return -1;
@@ -1986,8 +1948,7 @@ class Holiday extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return $this->optRowid;
 		}
@@ -2058,8 +2019,7 @@ class Holiday extends CommonObject
 			// Retourne 1 et ajoute le tableau à la variable
 			$this->logs = $tab_result;
 			return 1;
-		}
-		else {
+		} else {
 			// Erreur SQL
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
@@ -2097,8 +2057,7 @@ class Holiday extends CommonObject
 
 				return $types;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return array();
 	}
@@ -2153,8 +2112,7 @@ class Holiday extends CommonObject
             }
             $this->db->free($resql);
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -2208,8 +2166,7 @@ class Holiday extends CommonObject
             }
 
             return $response;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index f0f2a588c18..51145fb1f42 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -232,8 +232,7 @@ if (count($typeleaves) == 0)
     print $langs->trans("NoLeaveWithCounterDefined")."<br>\n";
     print $langs->trans("GoIntoDictionaryHolidayTypes");
     //print '</div>';
-}
-else {
+} else {
     $canedit = 0;
     if (!empty($user->rights->holiday->define_holiday)) $canedit = 1;
 
@@ -259,8 +258,7 @@ else {
         {
             print '<td class="liste_titre" style="text-align:center"></td>';
         }
-    }
-    else {
+    } else {
         print '<td class="liste_titre"></td>';
     }
     print '<td class="liste_titre"></td>';
@@ -283,8 +281,7 @@ else {
         	$labeltype = ($langs->trans($val['code']) != $val['code']) ? $langs->trans($val['code']) : $langs->trans($val['label']);
         	print_liste_field_titre($labeltype, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'center ');
         }
-    }
-    else {
+    } else {
         print_liste_field_titre('NoLeaveWithCounterDefined', $_SERVER["PHP_SELF"], '', '', '', '');
     }
     print_liste_field_titre((empty($user->rights->holiday->define_holiday) ? '' : 'Note'), $_SERVER["PHP_SELF"]);
@@ -339,8 +336,7 @@ else {
         	    //print ' '.$langs->trans('days');
             	print '</td>'."\n";
         	}
-        }
-        else {
+        } else {
             print '<td></td>';
         }
 
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index af55e42137e..256e69028f2 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -146,8 +146,7 @@ if ($object->id)
         print '<span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
         print '</td>';
         print '</tr>';
-    }
-    else {
+    } else {
         print '<tr>';
         print '<td>'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
         print '<td>';
@@ -167,8 +166,7 @@ if ($object->id)
         print '<span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
         print '</td>';
         print '</tr>';
-    }
-    else {
+    } else {
         print '<tr>';
         print '<td>'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
         print '<td>';
@@ -198,8 +196,7 @@ if ($object->id)
         print '<td>'.$langs->trans('DescCP').'</td>';
         print '<td>'.nl2br($object->description).'</td>';
         print '</tr>';
-    }
-    else {
+    } else {
         print '<tr>';
         print '<td>'.$langs->trans('DescCP').'</td>';
         print '<td><textarea name="description" class="flat" rows="'.ROWS_3.'" cols="70">'.$object->description.'</textarea></td>';
@@ -286,8 +283,7 @@ if ($object->id)
     $permtoedit = $user->rights->holiday->write;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 3f17a16c05d..5a4f782deac 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -429,8 +429,7 @@ if ($resql)
 		}
 
 		print '</div>';
-	}
-	else {
+	} else {
 		$title = $langs->trans("ListeCP");
 
 		$newcardbutton = '';
@@ -522,8 +521,7 @@ if ($resql)
 		    foreach ($valideurobjects as $val) $valideurarray[$val->id] = $val->id;
 		    print $form->select_dolusers($search_valideur, "search_valideur", 1, "", 0, $valideurarray, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
 		    print '</td>';
-		}
-		else {
+		} else {
 		    print '<td class="liste_titre">&nbsp;</td>';
 		}
 	}
@@ -641,8 +639,7 @@ if ($resql)
 		$langs->load("errors");
 		print '<tr class="oddeven opacitymediuem"><td colspan="10">'.$langs->trans("NotEnoughPermissions").'</td></tr>';
 		$result = 0;
-	}
-	elseif ($num > 0 && !empty($mysoc->country_id))
+	} elseif ($num > 0 && !empty($mysoc->country_id))
 	{
 	    // Lines
 	    $userstatic = new User($db);
@@ -791,8 +788,7 @@ if ($resql)
 	print '</div>';
 
 	print '</form>';
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index 4bdc3012d74..0c4ffe76335 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -120,8 +120,7 @@ print '</tr>';
 if ($num == 0)
 {
     print '<tr><td colspan="10" class="opacitymedium">'.$langs->trans('None').'</td></tr>';
-}
-else {
+} else {
     while ($obj = $db->fetch_object($resql))
     {
         $user = new User($db);
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index ce394cbd691..0d987844924 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -166,8 +166,7 @@ if ($lastUpdate)
     $yearLastUpdate = $lastUpdate[0].$lastUpdate[1].$lastUpdate[2].$lastUpdate[3];
     print '<strong>'.dol_print_date($db->jdate($object->getConfCP('lastUpdate')), 'dayhour', 'tzuser').'</strong>';
     print '<br>'.$langs->trans("MonthOfLastMonthlyUpdate").': <strong>'.$yearLastUpdate.'-'.$monthLastUpdate.'</strong>'."\n";
-}
-else print $langs->trans('None');
+} else print $langs->trans('None');
 print "</div><br>\n";
 
 $moreforfilter = '';
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index cd24a6bce0c..a260941ab0d 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -129,14 +129,12 @@ if ($result)
 
             $i++;
         }
-    }
-    else {
+    } else {
         print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
 
 	print '</table>';
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index caba1b87925..37ae050cd9b 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -260,8 +260,7 @@ class Establishment extends CommonObject
             $this->country      = $obj->country;
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -285,8 +284,7 @@ class Establishment extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -320,27 +318,22 @@ class Establishment extends CommonObject
 		if ($mode == 0)
 		{
 			return $langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			return $langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut5');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
@@ -386,8 +379,7 @@ class Establishment extends CommonObject
 				}
 			}
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -414,8 +406,7 @@ class Establishment extends CommonObject
 				$obj = $this->db->fetch_object($result);
 			}
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 8199e3bbccc..aa1ac36a9f1 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -63,13 +63,10 @@ if ($action == 'confirm_delete' && $confirm == "yes")
     {
         header("Location: ../admin/admin_establishment.php");
         exit;
-    }
-    else {
+    } else {
         setEventMessages($object->error, $object->errors, 'errors');
     }
-}
-
-elseif ($action == 'add')
+} elseif ($action == 'add')
 {
     if (!$cancel)
     {
@@ -99,16 +96,13 @@ elseif ($action == 'add')
             {
                 header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
                 exit;
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-        }
-        else {
+        } else {
             $action = 'create';
         }
-    }
-    else {
+    } else {
         header("Location: ../admin/admin_establishment.php");
         exit;
     }
@@ -143,8 +137,7 @@ elseif ($action == 'update')
             {
                 header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_POST['id']);
                 exit;
-            }
-			else {
+            } else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -335,8 +328,7 @@ if (($id || $ref) && $action == 'edit')
 
             print '</form>';
         }
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
 }
 
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 1f61b920eb8..7cc72c1792e 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -160,8 +160,7 @@ if (!empty($conf->holiday->enabled))
 	    print '</td>';
 	    print '</tr>';
 	    print '</table></div><br>';
-	}
-	elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
+	} elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
 	{
 		print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'<br>';
 	}
@@ -241,15 +240,13 @@ if (!empty($conf->holiday->enabled) && $user->rights->holiday->read)
 
                 $i++;
             }
-        }
-        else {
+        } else {
             print '<tr class="oddeven"><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         print '</table>';
         print '</div>';
         print '<br>';
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
 }
 
 
@@ -313,14 +310,12 @@ if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print '</table>';
 		print '</div>';
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 }
 
 
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index 98b923f0be5..12dfc5d19e9 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -260,8 +260,7 @@ class Import
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errno = $this->db->lasterrno();
 			$this->db->rollback();
@@ -294,13 +293,11 @@ class Import
 				$this->datatoimport         = $obj->type;
 				$this->fk_user              = $obj->fk_user;
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = "Model not found";
 				return -2;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -3;
 		}
@@ -350,8 +347,7 @@ class Import
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index e78ea433057..eb0d7470dbb 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -141,8 +141,7 @@ if ($action == 'builddoc')
 	if ($result < 0)
 	{
 		setEventMessages($objimport->error, $objimport->errors, 'errors');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("FileSuccessfullyBuilt"), null, 'mesgs');
 	}
 }
@@ -177,19 +176,16 @@ if ($action == 'add_import_model')
 		if ($result >= 0)
 		{
 			setEventMessages($langs->trans("ImportModelSaved", $objimport->model_name), null, 'mesgs');
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			if ($objimport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				setEventMessages($langs->trans("ErrorImportDuplicateProfil"), null, 'errors');
-			}
-			else {
+			} else {
 				setEventMessages($objimport->error, null, 'errors');
 			}
 		}
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ImportModelName")), null, 'errors');
 	}
 }
@@ -205,8 +201,7 @@ if ($step == 3 && $datatoimport)
 		if (dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $fullpath, 1) > 0)
 		{
 			dol_syslog("File ".$fullpath." was added for import");
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 		}
@@ -367,14 +362,12 @@ if ($step == 1 || !$datatoimport)
 			if ($objimport->array_import_perms[$key])
 			{
 				print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=2&datatoimport='.$objimport->array_import_code[$key].$param.'">'.img_picto($langs->trans("NewImport"), 'filenew').'</a>';
-			}
-			else {
+			} else {
 				print $langs->trans("NotEnoughPermissions");
 			}
 			print '</td></tr>';
 		}
-	}
-	else {
+	} else {
 		print '<tr><td class="oddeven" colspan="3">'.$langs->trans("NoImportableData").'</td></tr>';
 	}
 	print '</table>';
@@ -606,8 +599,7 @@ if ($step == 3 && $datatoimport)
         $langs->load('other');
         $out .= ' ';
         $out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow), 1);
-	}
-	else {
+	} else {
 	    $out .= ' ('.$langs->trans("UploadDisabled").')';
 	}
 	print $out;
@@ -974,8 +966,7 @@ if ($step == 4 && $datatoimport)
 			{
 				$filecolumntoshow = $filecolumn;
 				$htmltext .= $langs->trans("DataComeFromFileFieldNb", $filecolumntoshow).'<br>';
-			}
-			else {
+			} else {
 				if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromref')    $htmltext .= $langs->trans("DataComeFromIdFoundFromRef", $filecolumn, $langs->transnoentitiesnoconv($entitylang)).'<br>';
 				if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromcodeid') $htmltext .= $langs->trans("DataComeFromIdFoundFromCodeId", $filecolumn, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$code]['dict'])).'<br>';
 			}
@@ -987,8 +978,7 @@ if ($step == 4 && $datatoimport)
 		if (empty($objimport->array_import_convertvalue[0][$code]))	// If source file does not need convertion
 		{
 		    if ($example) $htmltext .= $langs->trans("SourceExample").': <b>'.$example.'</b><br>';
-		}
-		else {
+		} else {
 		    if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromref')        $htmltext .= $langs->trans("SourceExample").': <b>'.$langs->transnoentitiesnoconv("ExampleAnyRefFoundIntoElement", $entitylang).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.$example.')' : '').'</b><br>';
 		    elseif ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromcodeid') $htmltext .= $langs->trans("SourceExample").': <b>'.$langs->trans("ExampleAnyCodeOrIdFoundIntoDictionary", $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$code]['dict'])).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.$example.')' : '').'</b><br>';
 		    elseif ($example) $htmltext .= $langs->trans("SourceExample").': <b>'.$example.'</b><br>';
@@ -1004,8 +994,7 @@ if ($step == 4 && $datatoimport)
 		if (empty($objimport->array_import_convertvalue[0][$code]))	// If source file does not need convertion
 		{
 			$htmltext .= $langs->trans("DataIsInsertedInto").'<br>';
-		}
-		else {
+		} else {
 			if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromref')    $htmltext .= $langs->trans("DataIDSourceIsInsertedInto").'<br>';
 			if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromcodeid') $htmltext .= $langs->trans("DataCodeIDSourceIsInsertedInto").'<br>';
 		}
@@ -1115,8 +1104,7 @@ if ($step == 4 && $datatoimport)
 		if ($mandatoryfieldshavesource)
 		{
 			print '<a class="butAction" href="import.php?step=5'.$param.'&filetoimport='.urlencode($filetoimport).'">'.$langs->trans("NextStep").'</a>';
-		}
-		else {
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("SomeMandatoryFieldHaveNoSource")).'">'.$langs->trans("NextStep").'</a>';
 		}
 	}
@@ -1177,8 +1165,7 @@ if ($step == 4 && $datatoimport)
 				print '</tr>';
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -1314,8 +1301,7 @@ if ($step == 5 && $datatoimport)
 	{
 	    print '<input type="number" class="maxwidth50" name="excludefirstlinebis" disabled="disabled" value="'.$excludefirstline.'">';
 	    print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
-	}
-	else {
+	} else {
 	    print '<input type="number" class="maxwidth50" name="excludefirstline" value="'.$excludefirstline.'">';
 	    print $form->textwithpicto("", $langs->trans("SetThisValueTo2ToExcludeFirstLine"));
 	}
@@ -1324,8 +1310,7 @@ if ($step == 5 && $datatoimport)
 	{
 	    print '<input type="text" class="maxwidth50" name="endatlinenbbis" disabled="disabled" value="'.$endatlinenb.'">';
 	    print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
-	}
-	else {
+	} else {
 	    print '<input type="text" class="maxwidth50" name="endatlinenb" value="'.$endatlinenb.'">';
 	    print $form->textwithpicto("", $langs->trans("KeepEmptyToGoToEndOfFile"));
 	}
@@ -1340,8 +1325,7 @@ if ($step == 5 && $datatoimport)
 		if (count($updatekeys))
 		{
 			print $form->multiselectarray('updatekeysbis', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '80%', 'disabled');
-		}
-		else {
+		} else {
 			print '<span class="opacitymedium">'.$langs->trans("NoUpdateAttempt").'</span> &nbsp; -';
 		}
 		foreach ($updatekeys as $val) {
@@ -1353,8 +1337,7 @@ if ($step == 5 && $datatoimport)
         {   //TODO dropdown UL is created inside nested SPANS
 			print $form->multiselectarray('updatekeys', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '80%');
 			print $form->textwithpicto("", $langs->trans("SelectPrimaryColumnsForUpdateAttempt"));
-		}
-		else {
+		} else {
 			print '<span class="opacitymedium">'.$langs->trans("UpdateNotYetSupportedForThisImport").'</span>';
 		}
 	}
@@ -1409,8 +1392,7 @@ if ($step == 5 && $datatoimport)
 			}*/
 			print $newval;
 		}
-	}
-	else print $langs->trans("Error");
+	} else print $langs->trans("Error");
 	print '</td></tr>';
 
 	// Fields imported
@@ -1452,13 +1434,11 @@ if ($step == 5 && $datatoimport)
         if ($user->rights->import->run)
         {
             print '<input type="submit" class="butAction" value="'.$langs->trans("RunSimulateImportFile").'">';
-        }
-        else {
+        } else {
             print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunSimulateImportFile").'</a>';
         }
         print '</div>';
-    }
-    else {
+    } else {
         // Launch import
         $arrayoferrors = array();
         $arrayofwarnings = array();
@@ -1508,8 +1488,7 @@ if ($step == 5 && $datatoimport)
             }
             // Close file
             $obj->import_close_file();
-        }
-        else {
+        } else {
             print $langs->trans("ErrorFailedToOpenFile", $pathfile);
         }
 
@@ -1539,8 +1518,7 @@ if ($step == 5 && $datatoimport)
         	print '<div class="center">'.img_picto($langs->trans("OK"), 'tick').' <b>'.$langs->trans("NoError").'</b></div><br><br>';
 			print $langs->trans("NbInsert", $obj->nbinsert).'<br>';
 			print $langs->trans("NbUpdate", $obj->nbupdate).'<br><br>';
-		}
-        else print $langs->trans("NbOfLinesOK", $nbok).'<br><br>';
+		} else print $langs->trans("NbOfLinesOK", $nbok).'<br><br>';
 
         // Show Errors
         //var_dump($arrayoferrors);
@@ -1607,14 +1585,12 @@ if ($step == 5 && $datatoimport)
             if (empty($nboferrors))
             {
                 print '<a class="butAction" href="'.DOL_URL_ROOT.'/imports/import.php?leftmenu=import&step=6&importid='.$importid.$param.'">'.$langs->trans("RunImportFile").'</a>';
-            }
-            else {
+            } else {
                 //print '<input type="submit" class="butAction" value="'.dol_escape_htmltag($langs->trans("RunSimulateImportFile")).'">';
 
                 print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("CorrectErrorBeforeRunningImport")).'">'.$langs->trans("RunImportFile").'</a>';
             }
-        }
-        else {
+        } else {
             print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunSimulateImportFile").'</a>';
 
             print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunImportFile").'</a>';
@@ -1800,8 +1776,7 @@ if ($step == 6 && $datatoimport)
 			}*/
 			print $newval;
 		}
-	}
-	else print $langs->trans("Error");
+	} else print $langs->trans("Error");
 	print '</td></tr>';
 
 	// Fields imported
@@ -1873,8 +1848,7 @@ if ($step == 6 && $datatoimport)
 		}
 		// Close file
 		$obj->import_close_file();
-	}
-	else {
+	} else {
 		print $langs->trans("ErrorFailedToOpenFile", $pathfile);
 	}
 
@@ -1964,8 +1938,7 @@ function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
 		print $langs->trans("NoFields");
 		print '</td>';
 		print '</tr>';
-	}
-	elseif ($key == 'none')	// Empty line
+	} elseif ($key == 'none')	// Empty line
 	{
 		print '<tr'.($nostyle ? '' : ' '.$bc[$var]).' style="height:'.$height.'">';
 		print '<td class="nocellnopadding" width="16" style="font-weight: normal">';
@@ -1975,8 +1948,7 @@ function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
 		print '&nbsp;';
 		print '</td>';
 		print '</tr>';
-	}
-	else // Print field of source file
+	} else // Print field of source file
 	{
 		print '<tr'.($nostyle ? '' : ' '.$bc[$var]).' style="height:'.$height.'">';
 		print '<td class="nocellnopadding" width="16" style="font-weight: normal">';
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 792f72d8831..84ef9986be0 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -82,13 +82,11 @@ if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0)        // M
 {
 	print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionerror));
 	$checksok = 0; // 0=error, 1=warning
-}
-elseif (versioncompare(versionphparray(), $arrayphpminversionwarning) < 0)    // Minimum supported (warning if lower)
+} elseif (versioncompare(versionphparray(), $arrayphpminversionwarning) < 0)    // Minimum supported (warning if lower)
 {
     print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionwarning));
     $checksok = 0; // 0=error, 1=warning
-}
-else {
+} else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPVersion")." ".versiontostring(versionphparray());
 }
 if (empty($force_install_nophpinfo)) print ' (<a href="phpinfo.php" target="_blank">'.$langs->trans("MoreInformation").'</a>)';
@@ -102,8 +100,7 @@ if (!isset($_GET["testget"]) && !isset($_POST["testpost"]))
 	print ' (<a href="'.$_SERVER["PHP_SELF"].'?testget=ok">'.$langs->trans("Recheck").'</a>)';
 	print "<br>\n";
 	$checksok = 0;
-}
-else {
+} else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportPOSTGETOk")."<br>\n";
 }
 
@@ -113,8 +110,7 @@ if (!function_exists("session_id"))
 {
 	print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportSessions")."<br>\n";
 	$checksok = 0;
-}
-else {
+} else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportSessions")."<br>\n";
 }
 
@@ -125,8 +121,7 @@ if (!function_exists("imagecreate"))
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportGD")."<br>\n";
 	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
-}
-else {
+} else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportGD")."<br>\n";
 }
 
@@ -137,8 +132,7 @@ if (!function_exists("curl_init"))
     $langs->load("errors");
     print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportCurl")."<br>\n";
     // $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
-}
-else {
+} else {
     print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportCurl")."<br>\n";
 }
 
@@ -146,8 +140,7 @@ else {
 if (!function_exists("easter_date"))
 {
     print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportCalendar")."<br>\n";
-}
-else {
+} else {
     print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportCalendar")."<br>\n";
 }
 
@@ -158,8 +151,7 @@ if (!function_exists("utf8_encode"))
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportUTF8")."<br>\n";
 	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
-}
-else {
+} else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportUTF8")."<br>\n";
 }
 
@@ -172,8 +164,7 @@ if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@loc
 	    $langs->load("errors");
 	    print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportIntl")."<br>\n";
 	    // $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
-	}
-	else {
+	} else {
 	    print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportIntl")."<br>\n";
 	}
 }
@@ -183,8 +174,7 @@ if (!class_exists('ZipArchive'))
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupport", "ZIP")."<br>\n";
 	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
-}
-else {
+} else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupport", "ZIP")."<br>\n";
 }
 
@@ -205,8 +195,7 @@ if ($memmaxorig != '')
 	if ($memmax >= $memrequired || $memmax == -1)
 	{
 		print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPMemoryOK", $memmaxorig, $memrequiredorig)."<br>\n";
-	}
-	else {
+	} else {
 		print '<img src="../theme/eldy/img/warning.png" alt="Warning"> '.$langs->trans("PHPMemoryTooLow", $memmaxorig, $memrequiredorig)."<br>\n";
 	}
 }
@@ -225,12 +214,10 @@ if (is_readable($conffile) && filesize($conffile) > 8)
 	{
 		// Already installed for all parts (config and database). We can propose upgrade.
 		$allowupgrade = true;
-	}
-	else {
+	} else {
 		$allowupgrade = false;
 	}
-}
-else {
+} else {
 	// If not, we create it
 	dolibarr_install_syslog("check: we try to create conf file '".$conffile."'");
 	$confexists = 0;
@@ -240,8 +227,7 @@ else {
 	{
 		// Success
 		dolibarr_install_syslog("check: successfully copied file ".$conffile.".example into ".$conffile);
-	}
-	else {
+	} else {
 		// If failed, we try to create an empty file
 		dolibarr_install_syslog("check: failed to copy file ".$conffile.".example into ".$conffile.". We try to create it.", LOG_WARNING);
 
@@ -251,8 +237,7 @@ else {
 			@fwrite($fp, '<?php');
 			@fputs($fp, "\n");
 			fclose($fp);
-		}
-		else dolibarr_install_syslog("check: failed to create a new file ".$conffile." into current dir ".getcwd().". Please check permissions.", LOG_ERR);
+		} else dolibarr_install_syslog("check: failed to create a new file ".$conffile." into current dir ".getcwd().". Please check permissions.", LOG_ERR);
 	}
 
 	// First install: no upgrade necessary/required
@@ -271,8 +256,7 @@ if (!file_exists($conffile))
 
 	print $langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok');
 	$err++;
-}
-else {
+} else {
 	if (dol_is_dir($conffile))
 	{
 		print '<img src="../theme/eldy/img/error.png" alt="Warning"> '.$langs->trans("ConfFileMustBeAFileNotADir", $conffiletoshow);
@@ -285,8 +269,7 @@ else {
 		if ($confexists)
 		{
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileExists", $conffiletoshow);
-		}
-		else {
+		} else {
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileCouldBeCreated", $conffiletoshow);
 		}
 		print "<br>";
@@ -300,8 +283,7 @@ else {
 		if ($confexists)
 		{
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileExists", $conffiletoshow);
-		}
-		else {
+		} else {
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileCouldBeCreated", $conffiletoshow);
 		}
 		print "<br>";
@@ -327,8 +309,7 @@ else {
 				{
                     print '<span class="error">A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to '.$dolibarr_main_document_root.' that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.</span><br>'."\n";
 				    dol_syslog("A '".$conffiletoshow."' file exists with a dolibarr_main_document_root to ".$dolibarr_main_document_root." that seems wrong. Try to fix or remove the '".$conffiletoshow."' file.", LOG_WARNING);
-				}
-				else {
+				} else {
                     require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
 
                     // If password is encoded, we decode it
@@ -339,8 +320,7 @@ else {
                         {
                             $dolibarr_main_db_encrypted_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass); // We need to set this as it is used to know the password was initially crypted
                             $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
-                        }
-                        else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+                        } else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
                     }
 
     				// $conf already created in inc.php
@@ -386,8 +366,7 @@ else {
 			//print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired"));
 			print '<br>';
 			print '<br>';
-		}
-		else print "<br>\n";
+		} else print "<br>\n";
 
 		//print $langs->trans("InstallEasy")." ";
 		print '<h3><span class="soustitre">'.$langs->trans("ChooseYourSetupMode").'</span></h3>';
@@ -421,8 +400,7 @@ else {
 		if ($allowinstall)
 		{
             $choice .= '<a class="button" href="fileconf.php?selectlang='.$setuplang.'">'.$langs->trans("Start").'</a>';
-		}
-		else {
+		} else {
 			$choice .= ($foundrecommandedchoice ? '<span class="warning">' : '').$langs->trans("InstallNotAllowed").($foundrecommandedchoice ? '</span>' : '');
 		}
         $choice .= '</td>'."\n";
@@ -498,8 +476,7 @@ else {
                         $foundrecommandedchoice = 1; // To show only once
                         $recommended_choice = true;
                     }
-                }
-                else {
+                } else {
                     // We cannot recommend a choice.
                     // A version of install may be known, but we need last upgrade.
                 }
@@ -540,12 +517,10 @@ else {
 				if ($disabled)
                 {
                     $choice .= '<span class="opacitymedium">'.$langs->trans("NotYetAvailable").'</span>';
-                }
-				else {
+                } else {
                     $choice .= '<a class="button runupgrade" href="upgrade.php?action=upgrade'.($count < count($migrationscript) ? '_'.$versionto : '').'&amp;selectlang='.$setuplang.'&amp;versionfrom='.$versionfrom.'&amp;versionto='.$versionto.'">'.$langs->trans("Start").'</a>';
                 }
-			}
-			else {
+			} else {
                 $choice .= $langs->trans("NotAvailable");
 			}
             $choice .= '</td>';
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index aab1615ed64..ff983618c41 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -123,12 +123,10 @@ if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) >
                     $includeconferror = 'ErrorBadValueForDolibarrMainDBType';
                 }
             }
-        }
-        else {
+        } else {
             $includeconferror = 'ErrorBadValueForDolibarrMainDocumentRoot';
         }
-    }
-    else {
+    } else {
         $includeconferror = 'ErrorBadFormatForConfFile';
     }
 }
@@ -207,8 +205,7 @@ if (@file_exists($lockfile))
         print '<a href="'.$dolibarr_main_url_root.'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"]) ? '&username='.urlencode($_POST["login"]) : '').'">';
         print $langs->trans("ClickHereToGoToApp");
         print '</a>';
-    }
-    else {
+    } else {
         print 'If you always reach this page, you must remove install.lock file manually.<br>';
     }
     exit;
@@ -361,8 +358,7 @@ function pHeader($subtitle, $next, $action = 'set', $param = '', $forcejqueryurl
     {
         $jQueryCustomPath = $forcejqueryurl;
         $jQueryUiCustomPath = $forcejqueryurl;
-    }
-    else {
+    } else {
         $jQueryCustomPath = (defined('JS_JQUERY') && constant('JS_JQUERY')) ? JS_JQUERY : false;
         $jQueryUiCustomPath = (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) ? JS_JQUERY_UI : false;
     }
@@ -543,11 +539,9 @@ function detect_dolibarr_main_url_root()
 		$proto = ((!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') || (!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443)) ? 'https' : 'http';
 		if (!empty($_SERVER["HTTP_HOST"])) {
 			$serverport = $_SERVER["HTTP_HOST"];
-		}
-		elseif (!empty($_SERVER["SERVER_NAME"])) {
+		} elseif (!empty($_SERVER["SERVER_NAME"])) {
 			$serverport = $_SERVER["SERVER_NAME"];
-		}
-		else {
+		} else {
 			$serverport = 'localhost';
 		}
 		$dolibarr_main_url_root = $proto."://".$serverport.$_SERVER["SCRIPT_NAME"];
diff --git a/htdocs/install/lib/repair.lib.php b/htdocs/install/lib/repair.lib.php
index 9e58ac4230f..19b91bb0a26 100644
--- a/htdocs/install/lib/repair.lib.php
+++ b/htdocs/install/lib/repair.lib.php
@@ -40,8 +40,7 @@ function checkElementExist($id, $table)
 		$num = $db->num_rows($resql);
 		if ($num > 0) return true;
 		else return false;
-	}
-	else return true; // for security
+	} else return true; // for security
 }
 
 /**
@@ -137,8 +136,7 @@ function clean_data_ecm_directories()
 				if (!$resqlupdate) dol_print_error($db, 'Failed to update');
 			}
 		}
-	}
-	else dol_print_error($db, 'Failed to run request');
+	} else dol_print_error($db, 'Failed to run request');
 
 	return;
 }
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index f6f5eb83003..d427e529a8d 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -99,8 +99,7 @@ if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_d
         $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
         $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
         $dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially crypted
-    }
-    else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+    } else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
 }
 
 // $conf is already instancied inside inc.php
@@ -123,8 +122,7 @@ if ($db->connected)
     print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td class=\"right\">".$langs->trans("OK")."</td></tr>";
     dolibarr_install_syslog("repair: ".$langs->transnoentities("ServerConnection").": ".$dolibarr_main_db_host.$langs->transnoentities("OK"));
     $ok = 1;
-}
-else {
+} else {
     print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td class=\"right\">".$langs->transnoentities("Error")."</td></tr>";
     dolibarr_install_syslog("repair: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
     $ok = 0;
@@ -138,8 +136,7 @@ if ($ok)
         print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td class=\"right\">".$langs->trans("OK")."</td></tr>";
         dolibarr_install_syslog("repair: database connection successful: ".$dolibarr_main_db_name);
         $ok = 1;
-    }
-    else {
+    } else {
         print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td class=\"right\">".$langs->trans("Error")."</td></tr>";
         dolibarr_install_syslog("repair: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
         $ok = 0;
@@ -254,8 +251,7 @@ if ($ok && GETPOST('standard', 'alpha'))
 	            {
 	                $fieldname = $obj->Field;
 	                $fieldtype = $obj->Type;
-	            }
-	            else {
+	            } else {
 	                $fieldname = isset($obj->Key) ? $obj->Key : $obj->attname;
 	                $fieldtype = isset($obj->Type) ? $obj->Type : 'varchar';
 	            }
@@ -282,7 +278,7 @@ if ($ok && GETPOST('standard', 'alpha'))
         			} elseif ($type == 'phone') {
         				$typedb = 'varchar';
         				$lengthdb = '20';
-        			}elseif ($type == 'mail') {
+        			} elseif ($type == 'mail') {
         				$typedb = 'varchar';
         				$lengthdb = '128';
         			} elseif (($type == 'select') || ($type == 'sellist') || ($type == 'radio') || ($type == 'checkbox') || ($type == 'chkbxlst')) {
@@ -314,20 +310,17 @@ if ($ok && GETPOST('standard', 'alpha'))
 		                if ($result < 0)
 		                {
 	    	                print "KO ".$db->lasterror."<br>\n";
-	        	        }
-	            	    else {
+	        	        } else {
 	                    	print "OK<br>\n";
 		                }
-	                }
-	                else {
+	                } else {
 	                	print ' - Mode test, no column added.';
 	                }
 	            }
 	        }
 
 	        print "</td><td>&nbsp;</td></tr>\n";
-	    }
-	    else {
+	    } else {
 	    	dol_print_error($db);
 	    }
 	}
@@ -392,12 +385,10 @@ if ($ok && GETPOST('standard', 'alpha'))
 								$db->query($sqldelete);
 
 								print '<tr><td>Widget '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module '.$name.' not enabled in entity '.$obj->entity.', we delete record</td></tr>';
-							}
-							else {
+							} else {
 								print '<tr><td>Widget '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module '.$name.' not enabled in entity '.$obj->entity.', we should delete record (not done, mode test)</td></tr>';
 							}
-						}
-						else {
+						} else {
 							//print '<tr><td>Constant '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module found in entity '.$obj->entity.', we keep record</td></tr>';
 						}
 					}
@@ -463,12 +454,10 @@ if ($ok && GETPOST('standard', 'alpha'))
 								$db->query($sqldeleteb);
 
 								print '<tr><td>Constant '.$obj->file.' set in boxes_def for entity '.$obj->entity.' but MAIN_MODULE_'.strtoupper($module).' not defined in entity '.$obj->entity.', we delete record</td></tr>';
-							}
-							else {
+							} else {
 								print '<tr><td>Constant '.$obj->file.' set in boxes_def for entity '.$obj->entity.' but MAIN_MODULE_'.strtoupper($module).' not defined in entity '.$obj->entity.', we should delete record (not done, mode test)</td></tr>';
 							}
-						}
-						else {
+						} else {
 							//print '<tr><td>Constant '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module found in entity '.$obj->entity.', we keep record</td></tr>';
 						}
 					}
@@ -556,8 +545,7 @@ if ($ok && GETPOST('restore_thirdparties_logos'))
 
 			$i++;
 		}
-	}
-	else {
+	} else {
 		$ok = 0;
 		dol_print_error($db);
 	}
@@ -659,8 +647,7 @@ if ($ok && GETPOST('restore_user_pictures', 'alpha'))
 
 			$i++;
 		}
-	}
-	else {
+	} else {
 		$ok = 0;
 		dol_print_error($db);
 	}
@@ -717,8 +704,7 @@ if ($ok && GETPOST('rebuild_product_thumbs', 'alpha'))
 
             $i++;
         }
-    }
-    else {
+    } else {
         $ok = 0;
         dol_print_error($db);
     }
@@ -802,14 +788,11 @@ if ($ok && GETPOST('clean_menus', 'alpha'))
 							{
 								$error++;
 								dol_print_error($db);
-							}
-							else print ' - <span class="warning">Cleaned</span>';
-						}
-						else {
+							} else print ' - <span class="warning">Cleaned</span>';
+						} else {
 							print ' - <span class="warning">Canceled (test mode)</span>';
 						}
-					}
-					else {
+					} else {
 						print ' - Module condition '.$modulecond.' is ok, we do nothing.';
 					}
 				}
@@ -823,12 +806,10 @@ if ($ok && GETPOST('clean_menus', 'alpha'))
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			print '<tr><td>No menu entries of disabled menus found</td></tr>';
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -866,33 +847,27 @@ if ($ok && GETPOST('clean_orphelin_dir', 'alpha'))
         {
             include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
             $object_instance = new Facture($db);
-        }
-        elseif ($modulepart == 'invoice_supplier')
+        } elseif ($modulepart == 'invoice_supplier')
         {
             include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
             $object_instance = new FactureFournisseur($db);
-        }
-        elseif ($modulepart == 'propal')
+        } elseif ($modulepart == 'propal')
         {
             include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
             $object_instance = new Propal($db);
-        }
-        elseif ($modulepart == 'order')
+        } elseif ($modulepart == 'order')
         {
             include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
             $object_instance = new Commande($db);
-        }
-        elseif ($modulepart == 'order_supplier')
+        } elseif ($modulepart == 'order_supplier')
         {
             include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
             $object_instance = new CommandeFournisseur($db);
-        }
-        elseif ($modulepart == 'contract')
+        } elseif ($modulepart == 'contract')
         {
             include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
             $object_instance = new Contrat($db);
-        }
-        elseif ($modulepart == 'tax')
+        } elseif ($modulepart == 'tax')
         {
             include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
             $object_instance = new ChargeSociales($db);
@@ -951,8 +926,7 @@ if ($ok && GETPOST('clean_orphelin_dir', 'alpha'))
                             dol_delete_dir(dirname($file['fullname']), 1);
                         }
                         print "</td></tr>";
-                    }
-                    elseif ($result < 0) print 'Error in '.get_class($object_instance).'.fetch of id'.$id.' ref='.$ref.', result='.$result.'<br>';
+                    } elseif ($result < 0) print 'Error in '.get_class($object_instance).'.fetch of id'.$id.' ref='.$ref.', result='.$result.'<br>';
                 }
             }
         }
@@ -1030,8 +1004,7 @@ if ($ok && GETPOST('clean_product_stock_batch', 'alpha'))
                                     $error++;
                                     dol_print_error($db);
                                 }
-                            }
-                            else {
+                            } else {
                                 $error++;
                                 dol_print_error($db);
                             }
@@ -1046,12 +1019,10 @@ if ($ok && GETPOST('clean_product_stock_batch', 'alpha'))
 
                 $i++;
             }
-        }
-        else {
+        } else {
             print '<tr><td colspan="2">Nothing to do</td></tr>';
         }
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -1134,12 +1105,10 @@ if ($ok && GETPOST('set_empty_time_spent_amount', 'alpha'))
 
                 $i++;
             }
-        }
-        else {
+        } else {
             print '<tr><td>No time spent with empty line on users with a hourly rate defined</td></tr>';
         }
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -1207,8 +1176,7 @@ if ($ok && GETPOST('force_disable_of_modules_not_found', 'alpha'))
 		                    	//var_dump($key.' - '.$value.' - '.$reloffile);
 		                    	try {
 		                        	$result = dol_buildpath($reloffile, 0, 2);
-		                    	}
-		                    	catch (Exception $e)
+		                    	} catch (Exception $e)
 		                    	{
 									// No catch yet
 									$result = 'found'; // If error, we force lke if we found to avoid any deletion
@@ -1233,14 +1201,11 @@ if ($ok && GETPOST('force_disable_of_modules_not_found', 'alpha'))
 	                                {
 	                                    $error++;
 	                                    dol_print_error($db);
-	                                }
-	                                else print ' - <span class="warning">Cleaned</span>';
-	                            }
-	                            else {
+	                                } else print ' - <span class="warning">Cleaned</span>';
+	                            } else {
 	                                print ' - <span class="warning">Canceled (test mode)</span>';
 	                            }
-	                        }
-	                        else {
+	                        } else {
 	                            print ' - File of '.$key.' ('.$reloffile.') found, we do nothing.';
 	                        }
 	                    }
@@ -1255,12 +1220,10 @@ if ($ok && GETPOST('force_disable_of_modules_not_found', 'alpha'))
 
 	                $i++;
 	            }
-	        }
-	        else {
+	        } else {
 	            print '<tr><td>No active module with missing files found by searching on MAIN_MODULE_(.*)_'.strtoupper($key).'</td></tr>';
 	        }
-	    }
-	    else {
+	    } else {
 	        dol_print_error($db);
 	    }
     }
@@ -1305,12 +1268,10 @@ if ($ok && GETPOST('clean_perm_table', 'alpha'))
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			print '<tr><td>No lines of a disabled external module (with id > 100000) found into table rights_def</td></tr>';
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -1349,8 +1310,7 @@ if ($ok && GETPOST('force_utf8_on_tables', 'alpha'))
             {
             	$resql = $db->query($sql);
             	print ' - Done ('.($resql ? 'OK' : 'KO').')';
-            }
-            else print ' - Disabled';
+            } else print ' - Disabled';
             print '</td></tr>';
         }
 
@@ -1361,8 +1321,7 @@ if ($ok && GETPOST('force_utf8_on_tables', 'alpha'))
         	print '<!-- '.$sql.' -->';
         	$resql = $db->query($sql);
         }
-    }
-    else {
+    } else {
         print '<tr><td colspan="2">Not available with database type '.$db->type.'</td></tr>';
     }
 }
@@ -1464,8 +1423,7 @@ if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
                 if ($repair_link_dispatch_lines_supplier_order_lines == 'confirmed')
                 {
 	                $resql_attach = $db->query($sql_attach);
-                }
-                else {
+                } else {
                 	$resql_attach = true; // Force success in test mode
                 }
 
@@ -1519,8 +1477,7 @@ if ($oneoptionset)
 	print '<div class="center" style="padding-top: 10px"><a href="../index.php?mainmenu=home&leftmenu=home'.(isset($_POST["login"]) ? '&username='.urlencode($_POST["login"]) : '').'">';
 	print $langs->trans("GoToDolibarr");
 	print '</a></div>';
-}
-else {
+} else {
 	print '<div class="center warning" style="padding-top: 10px">';
 	print $langs->trans("SetAtLeastOneOptionAsUrlParameter");
 	print '</div>';
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index 6bf2e1d3dff..62a10a0b7b3 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -226,12 +226,10 @@ if (!$error) {
                 if ($db_type == 'mysql' || $db_type == 'mysqli')
                 {
                     $databasefortest = 'mysql';
-                }
-                elseif ($db_type == 'pgsql')
+                } elseif ($db_type == 'pgsql')
                 {
                     $databasefortest = 'postgres';
-                }
-                else {
+                } else {
                     $databasefortest = 'master';
                 }
             }
@@ -273,8 +271,7 @@ if (!$error) {
                 $error++;
             }
         }
-    }
-    else {
+    } else {
         print "<br>\nFailed to include_once(\"".$main_dir."/core/db/".$db_type.".class.php\")<br>\n";
         print '<div class="error">'.$langs->trans("ErrorWrongValueForParameter", $langs->transnoentities("WebPagesDirectory")).'</div>';
         //print '<a href="#" onClick="javascript: history.back();">';
@@ -282,9 +279,7 @@ if (!$error) {
         //print '</a>';
         $error++;
     }
-}
-
-else {
+} else {
     if (isset($db)) print $db->lasterror();
     if (isset($db) && !$db->connected) print '<br>'.$langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
     print $langs->trans("ErrorGoBackAndCorrectParameters");
@@ -314,8 +309,7 @@ if (!$error && $db->connected)
 
         $defaultCharacterSet = $db->forcecharset;
     	$defaultDBSortingCollation = $db->forcecollate;
-    }
-    else // If already created, we take current value
+    } else // If already created, we take current value
     {
         $defaultCharacterSet = $db->getDefaultCharacterSetDatabase();
         $defaultDBSortingCollation = $db->getDefaultCollationDatabase();
@@ -397,8 +391,7 @@ if (!$error && $db->connected && $action == "set")
             print "</td></tr>";
             print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
             $error++;
-        }
-        else {
+        } else {
             // Create .htaccess file in document directory
             $pathhtaccess = $main_data_dir.'/.htaccess';
             if (!file_exists($pathhtaccess))
@@ -433,8 +426,7 @@ if (!$error && $db->connected && $action == "set")
                 if (is_dir($dir[$i]))
                 {
                     dolibarr_install_syslog("step1: directory '".$dir[$i]."' exists");
-                }
-                else {
+                } else {
                     if (dol_mkdir($dir[$i]) < 0)
                     {
                         print "<tr><td>";
@@ -443,8 +435,7 @@ if (!$error && $db->connected && $action == "set")
                         print $langs->trans("Error");
                         print "</td></tr>";
                         $error++;
-                    }
-                    else {
+                    } else {
                         dolibarr_install_syslog("step1: directory '".$dir[$i]."' created");
                     }
                 }
@@ -465,8 +456,7 @@ if (!$error && $db->connected && $action == "set")
                 print '<span class="error">'.$langs->trans("Error").'</span>';
                 print "</td></tr>";
                 print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
-            }
-            else {
+            } else {
             	//ODT templates
             	$srcroot = $main_dir.'/install/doctemplates';
             	$destroot = $main_data_dir.'/doctemplates';
@@ -539,12 +529,10 @@ if (!$error && $db->connected && $action == "set")
             if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
             {
                 $databasefortest = 'mysql';
-            }
-            elseif ($conf->db->type == 'pgsql')
+            } elseif ($conf->db->type == 'pgsql')
             {
                 $databasefortest = 'postgres';
-            }
-            elseif ($conf->db->type == 'mssql')
+            } elseif ($conf->db->type == 'mssql')
             {
                 $databasefortest = 'master';
             }
@@ -584,8 +572,7 @@ if (!$error && $db->connected && $action == "set")
                         print $dolibarr_main_db_user;
                         print '</td>';
                         print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-                    }
-                    else {
+                    } else {
                         if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
                         || $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
                         || $db->errno() == 'DB_ERROR_USER_ALREADY_EXISTS')
@@ -596,8 +583,7 @@ if (!$error && $db->connected && $action == "set")
                             print $dolibarr_main_db_user;
                             print '</td>';
                             print '<td>'.$langs->trans("LoginAlreadyExists").'</td></tr>';
-                        }
-                        else {
+                        } else {
                             dolibarr_install_syslog("step1: failed to create user", LOG_ERR);
                             print '<tr><td>';
                             print $langs->trans("UserCreation").' : ';
@@ -608,8 +594,7 @@ if (!$error && $db->connected && $action == "set")
                     }
 
                     $db->close();
-                }
-                else {
+                } else {
                     print '<tr><td>';
                     print $langs->trans("UserCreation").' : ';
                     print $dolibarr_main_db_user;
@@ -657,8 +642,7 @@ if (!$error && $db->connected && $action == "set")
                     // If values differs, we save conf file again
                     //if ($check1 != $dolibarr_main_db_character_set) dolibarr_install_syslog('step1: value for character_set is not the one asked for database creation', LOG_WARNING);
                     //if ($check2 != $dolibarr_main_db_collation)     dolibarr_install_syslog('step1: value for collation is not the one asked for database creation', LOG_WARNING);
-                }
-                else {
+                } else {
                     // warning message
                     print '<tr><td colspan="2"><br>';
                     print $langs->trans("ErrorFailedToCreateDatabase", $dolibarr_main_db_name).'<br>';
@@ -671,8 +655,7 @@ if (!$error && $db->connected && $action == "set")
                     $error++;
                 }
                 $newdb->close();
-            }
-            else {
+            } else {
                 print '<tr><td>';
                 print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
                 print $dolibarr_main_db_name;
@@ -723,8 +706,7 @@ if (!$error && $db->connected && $action == "set")
                     print "</td></tr>";
 
                     $error = 0;
-                }
-                else {
+                } else {
                     dolibarr_install_syslog("step1: connection to database ".$conf->db->name." by user ".$conf->db->user." failed", LOG_ERR);
                     print "<tr><td>";
                     print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
@@ -742,8 +724,7 @@ if (!$error && $db->connected && $action == "set")
 
                     $error++;
                 }
-            }
-            else {
+            } else {
                 dolibarr_install_syslog("step1: connection to server by user ".$conf->db->user." failed", LOG_ERR);
                 print "<tr><td>";
                 print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
@@ -1017,8 +998,7 @@ function write_conf_file($conffile)
 			print "</td><td>";
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok">';
 			print "</td></tr>";
-		}
-		else {
+		} else {
 			$error++;
 		}
 	}
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index f33319ba57c..1a56019f321 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -99,8 +99,7 @@ if ($action == "set")
         print "<tr><td>";
         print $langs->trans("ServerConnection")." : ".$conf->db->host.'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
         $ok = 1;
-    }
-    else {
+    } else {
         print "<tr><td>Failed to connect to server : ".$conf->db->host.'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
     }
 
@@ -109,8 +108,7 @@ if ($action == "set")
         if ($db->database_selected)
         {
             dolibarr_install_syslog("step2: successful connection to database: ".$conf->db->name);
-        }
-        else {
+        } else {
             dolibarr_install_syslog("step2: failed connection to database :".$conf->db->name, LOG_ERR);
             print "<tr><td>Failed to select database ".$conf->db->name.'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
             $ok = 0;
@@ -199,8 +197,7 @@ if ($action == "set")
                 if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')	// For Mysql 5.5+, we must replace type=innodb with ENGINE=innodb
                 {
                     $buffer = preg_replace('/type=innodb/i', 'ENGINE=innodb', $buffer);
-                }
-                else {
+                } else {
                     // Keyword ENGINE is MySQL-specific, so scrub it for
                     // other database types (mssql, pgsql)
                     $buffer = preg_replace('/type=innodb/i', '', $buffer);
@@ -222,14 +219,12 @@ if ($action == "set")
                 {
                     // print "<td>OK requete ==== $buffer</td></tr>";
                     $db->free($resql);
-                }
-                else {
+                } else {
                     if ($db->errno() == 'DB_ERROR_TABLE_ALREADY_EXISTS' ||
                     $db->errno() == 'DB_ERROR_TABLE_OR_KEY_ALREADY_EXISTS')
                     {
                         //print "<td>Deja existante</td></tr>";
-                    }
-                    else {
+                    } else {
                         print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey", $name);
                         print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer.' <br>Executed query : '.$db->lastquery;
                         print "\n</td>";
@@ -237,8 +232,7 @@ if ($action == "set")
                         $error++;
                     }
                 }
-            }
-            else {
+            } else {
                 print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey", $name);
                 print "</td>";
                 print '<td><span class="error">'.$langs->trans("Error").' Failed to open file '.$dir.$file.'</span></td></tr>';
@@ -255,8 +249,7 @@ if ($action == "set")
                 print $langs->trans("TablesAndPrimaryKeysCreation").'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
                 $ok = 1;
             }
-        }
-        else {
+        } else {
             print '<tr><td>'.$langs->trans("ErrorFailedToFindSomeFiles", $dir).'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
             dolibarr_install_syslog("step2: failed to find files to create database in directory ".$dir, LOG_ERR);
         }
@@ -361,8 +354,7 @@ if ($action == "set")
                         {
                             //print "<td>OK requete ==== $buffer</td></tr>";
                             $db->free($resql);
-                        }
-                        else {
+                        } else {
                             if ($db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS' ||
                             $db->errno() == 'DB_ERROR_CANNOT_CREATE' ||
                             $db->errno() == 'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS' ||
@@ -371,8 +363,7 @@ if ($action == "set")
                             {
                                 //print "<td>Deja existante</td></tr>";
                                 $key_exists = 1;
-                            }
-                            else {
+                            } else {
                                 print "<tr><td>".$langs->trans("CreateOtherKeysForTable", $name);
                                 print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$db->lastqueryerror();
                                 print "\n</td>";
@@ -382,8 +373,7 @@ if ($action == "set")
                         }
                     }
                 }
-            }
-            else {
+            } else {
                 print "<tr><td>".$langs->trans("CreateOtherKeysForTable", $name);
                 print "</td>";
                 print '<td><span class="error">'.$langs->trans("Error")." Failed to open file ".$dir.$file."</span></td></tr>";
@@ -454,14 +444,12 @@ if ($action == "set")
                     {
                         $ok = 1;
                         $db->free($resql);
-                    }
-                    else {
+                    } else {
                         if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
                         || $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS')
                         {
                             //print "Insert line : ".$buffer."<br>\n";
-                        }
-                        else {
+                        } else {
                             $ok = 0;
 
                             print "<tr><td>".$langs->trans("FunctionsCreation");
@@ -478,8 +466,7 @@ if ($action == "set")
             if ($ok)
             {
                 print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-            }
-            else {
+            } else {
                 print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
                 $ok = 1;
             }
@@ -575,13 +562,11 @@ if ($action == "set")
                     if ($resql)
                     {
                         //$db->free($resql);     // Not required as request we launch here does not return memory needs.
-                    }
-                    else {
+                    } else {
                         if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
                         {
                             //print "<tr><td>Insertion ligne : $buffer</td><td>";
-                        }
-                        else {
+                        } else {
                             $ok = 0;
                             $okallfile = 0;
                             print '<span class="error">'.$langs->trans("ErrorSQL")." : ".$db->lasterrno()." - ".$db->lastqueryerror()." - ".$db->lasterror()."</span><br>";
@@ -598,15 +583,13 @@ if ($action == "set")
         if ($ok)
         {
             print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-        }
-        else {
+        } else {
             print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
             $ok = 1; // Data loading are not blocking errors
         }
     }
     print '</table>';
-}
-else {
+} else {
     print 'Parameter action=set not defined';
 }
 
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index a30a6040fb9..ed64de7cbb1 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -130,8 +130,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 			$dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
 			$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
 			$dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially crypted
-		}
-		else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+		} else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
 	}
 
 	$conf->db->type = $dolibarr_main_db_type;
@@ -213,15 +212,13 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 			{
 				print $langs->trans("AdminLoginCreatedSuccessfuly", $login)."<br>";
 				$success = 1;
-			}
-			else {
+			} else {
 				if ($newuser->error == 'ErrorLoginAlreadyExists')
 				{
 					dolibarr_install_syslog('step5: AdminLoginAlreadyExists', LOG_WARNING);
 					print '<br><div class="warning">'.$langs->trans("AdminLoginAlreadyExists", $login)."</div><br>";
 					$success = 1;
-				}
-				else {
+				} else {
 					dolibarr_install_syslog('step5: FailedToCreateAdminLogin '.$newuser->error, LOG_ERR);
 					print '<br><div class="error">'.$langs->trans("FailedToCreateAdminLogin").' '.$newuser->error.'</div><br><br>';
 				}
@@ -237,8 +234,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 				{
 					$conf->global->MAIN_VERSION_FIRST_INSTALL = $targetversion;
 					$db->commit();
-				}
-				else {
+				} else {
 					//if (! $resql) dol_print_error($db,'Error in setup program');      // We ignore errors. Key may already exists
 					$db->commit();
 				}
@@ -288,8 +284,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 
 				$db->commit();
 			}
-		}
-		else {
+		} else {
 			print $langs->trans("ErrorFailedToConnect")."<br>";
 		}
 	}
@@ -320,16 +315,13 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 				$resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_VERSION_LAST_UPGRADE', 1).",".$db->encrypt($targetversion, 1).",'chaine',0,'Dolibarr version for last upgrade',0)");
 				if (!$resql) dol_print_error($db, 'Error in setup program');
 				$conf->global->MAIN_VERSION_LAST_UPGRADE = $targetversion;
-			}
-			else {
+			} else {
 				dolibarr_install_syslog('step5: we run an upgrade to version '.$targetversion.' but database was already upgraded to '.$conf->global->MAIN_VERSION_LAST_UPGRADE.'. We keep MAIN_VERSION_LAST_UPGRADE as it is.');
 			}
-		}
-		else {
+		} else {
 			print $langs->trans("ErrorFailedToConnect")."<br>";
 		}
-	}
-	else {
+	} else {
 		dol_print_error('', 'step5.php: unknown choice of action');
 	}
 
@@ -380,8 +372,7 @@ if ($action == "set" && $success)
 		print '<div class="center"><a href="../admin/index.php?mainmenu=home&leftmenu=setup'.(isset($login) ? '&username='.urlencode($login) : '').'">';
 		print '<span class="fas fa-external-link-alt"></span> '.$langs->trans("GoToSetupArea");
 		print '</a></div>';
-	}
-	else {
+	} else {
 		// If here MAIN_VERSION_LAST_UPGRADE is not empty
 		print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</span></b><br>';
 		print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b><br>';
@@ -427,8 +418,7 @@ elseif (empty($action) || preg_match('/upgrade/i', $action))
 		print '<div class="center"><a href="../index.php?mainmenu=home'.(isset($login) ? '&username='.urlencode($login) : '').'">';
 		print '<span class="fas fa-link-alt"></span> '.$langs->trans("GoToDolibarr").'...';
 		print '</a></div><br>';
-	}
-	else {
+	} else {
 		// If here MAIN_VERSION_LAST_UPGRADE is not empty
 		print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</span></b><br>';
 		print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b>';
@@ -439,8 +429,7 @@ elseif (empty($action) || preg_match('/upgrade/i', $action))
 		print '<span class="fas fa-link-alt"></span> '.$langs->trans("GoToUpgradePage");
 		print '</a></div>';
 	}
-}
-else {
+} else {
 	dol_print_error('', 'step5.php: unknown choice of action');
 }
 
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 91242b7429a..af05fb374d2 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -120,8 +120,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
             $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
             $dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially crypted
-        }
-        else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+        } else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
     }
 
     // $conf is already instancied inside inc.php
@@ -150,8 +149,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
         print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
         dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerConnection").": $dolibarr_main_db_host ".$langs->transnoentities("OK"));
         $ok = 1;
-    }
-    else {
+    } else {
         print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td align=\"right\">".$langs->transnoentities("Error")."</td></tr>\n";
         dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
         $ok = 0;
@@ -165,8 +163,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
             dolibarr_install_syslog("upgrade: Database connection successful: ".$dolibarr_main_db_name);
             $ok = 1;
-        }
-        else {
+        } else {
             print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>\n";
             dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
             $ok = 0;
@@ -290,8 +287,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             				$i++;
             			}
             			$db->free($resql);
-            		}
-            		else {
+            		} else {
             			if ($db->lasterrno() != 'DB_ERROR_NOSUCHTABLE')
             			{
             				print '<tr><td colspan="2"><span class="error">'.$sql.' : '.$db->lasterror()."</font></td></tr>\n";
@@ -331,8 +327,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             	if (preg_match('/\.sql$/i', $file)) $filesindir[] = $file;
             }
             sort($filesindir);
-        }
-        else {
+        } else {
             print '<div class="error">'.$langs->trans("ErrorCanNotReadDir", $dir).'</div>';
         }
 
@@ -342,8 +337,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             if (preg_match('/'.$from.'/i', $file))
             {
                 $filelist[] = $file;
-            }
-            elseif (preg_match('/'.$to.'/i', $file))	// First test may be false if we migrate from x.y.* to x.y.*
+            } elseif (preg_match('/'.$to.'/i', $file))	// First test may be false if we migrate from x.y.* to x.y.*
             {
                 $filelist[] = $file;
             }
@@ -352,8 +346,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
         if (count($filelist) == 0)
         {
         	print '<div class="error">'.$langs->trans("ErrorNoMigrationFilesFoundForParameters").'</div>';
-        }
-		else {
+        } else {
 			$listoffileprocessed = array(); // Protection to avoid to process twice the same file
 
 	        // Loop on each migrate files
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index b8e9ad30076..13e50732566 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -126,8 +126,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
             $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
             $dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially crypted
-        }
-        else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+        } else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
     }
 
     // $conf is already instancied inside inc.php
@@ -157,8 +156,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
         if ($db->database_selected)
         {
             dolibarr_install_syslog('upgrade2: database connection successful :'.$dolibarr_main_db_name);
-        }
-        else {
+        } else {
             $error++;
         }
     }
@@ -533,15 +531,13 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
                 print $hookmanager->error;
                 print "<!-- (".$reshook.") -->";
                 print '</td></tr>';
-            }
-            else {
+            } else {
                 print '<tr><td colspan="4">';
                 print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: OK';
                 print "<!-- (".$reshook.") -->";
                 print '</td></tr>';
             }
-        }
-        else {
+        } else {
             //if (! empty($conf->modules))
             if (!empty($conf->modules_parts['hooks']))     // If there is at least one module with one hook, we show message to say nothing was done
             {
@@ -580,8 +576,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
     migrate_rename_directories($db, $langs, $conf, '/banque/bordereau', '/bank/checkdeposits');
 
     print '<div><br>'.$langs->trans("MigrationFinished").'</div>';
-}
-else {
+} else {
     print '<div class="error">'.$langs->trans('ErrorWrongParameters').'</div>';
     $error++;
 }
@@ -640,8 +635,7 @@ function migrate_paiements($db, $langs, $conf)
                 $row[$i][2] = $obj->amount;
                 $i++;
             }
-        }
-        else {
+        } else {
             dol_print_error($db);
         }
 
@@ -671,17 +665,14 @@ function migrate_paiements($db, $langs, $conf)
             {
                 $db->commit();
                 print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            }
-            else {
+            } else {
                 $db->rollback();
                 print $langs->trans('MigrationUpdateFailed').'<br>';
             }
-        }
-        else {
+        } else {
             print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
         }
-    }
-    else {
+    } else {
         print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
     }
 
@@ -743,8 +734,7 @@ function migrate_paiements_orphelins_1($db, $langs, $conf)
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             dol_print_error($db);
         }
 
@@ -783,8 +773,7 @@ function migrate_paiements_orphelins_1($db, $langs, $conf)
 
                         print $langs->trans('MigrationProcessPaymentUpdate', 'facid='.$facid.'-paymentid='.$row[$i]['paymentid'].'-amount='.$row[$i]['pamount'])."<br>\n";
                     }
-                }
-                else {
+                } else {
                     print 'ERROR';
                 }
             }
@@ -792,18 +781,15 @@ function migrate_paiements_orphelins_1($db, $langs, $conf)
             if ($res > 0)
             {
                 print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            }
-            else {
+            } else {
                 print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
             }
 
             $db->commit();
-        }
-        else {
+        } else {
             print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
         }
-    }
-    else {
+    } else {
         print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
     }
 
@@ -864,8 +850,7 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             dol_print_error($db);
         }
 
@@ -905,8 +890,7 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
 
                         print $langs->trans('MigrationProcessPaymentUpdate', 'facid='.$facid.'-paymentid='.$row[$i]['paymentid'].'-amount='.$row[$i]['pamount'])."<br>\n";
                     }
-                }
-                else {
+                } else {
                     print 'ERROR';
                     $nberr++;
                 }
@@ -915,14 +899,12 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
             if ($res > 0)
             {
                 print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            }
-            else {
+            } else {
                 print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
             }
 
             $db->commit();
-        }
-        else {
+        } else {
             print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
         }
 
@@ -935,13 +917,11 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
         if (!$nberr)
         {
             $db->commit();
-        }
-        else {
+        } else {
             print 'ERROR';
             $db->rollback();
         }
-    }
-    else {
+    } else {
         print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
     }
 
@@ -1011,8 +991,7 @@ function migrate_contracts_det($db, $langs, $conf)
                 if ($db->query($sql))
                 {
                     print $langs->trans('MigrationContractsLineCreation', $obj->cref)."<br>\n";
-                }
-                else {
+                } else {
                     dol_print_error($db);
                     $nberr++;
                 }
@@ -1025,17 +1004,14 @@ function migrate_contracts_det($db, $langs, $conf)
                 //      $db->rollback();
                 $db->commit();
                 print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            }
-            else {
+            } else {
                 $db->rollback();
                 print $langs->trans('MigrationUpdateFailed').'<br>';
             }
-        }
-        else {
+        } else {
             print $langs->trans('MigrationContractsNothingToUpdate')."<br>\n";
         }
-    }
-    else {
+    } else {
         print $langs->trans('MigrationContractsFieldDontExist')."<br>\n";
         //    dol_print_error($db);
     }
@@ -1108,17 +1084,14 @@ function migrate_links_transfert($db, $langs, $conf)
                 //      $db->rollback();
                 $db->commit();
                 print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            }
-            else {
+            } else {
                 $db->rollback();
                 print $langs->trans('MigrationUpdateFailed').'<br>';
             }
-        }
-        else {
+        } else {
             print $langs->trans('MigrationBankTransfertsNothingToUpdate')."<br>\n";
         }
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 
@@ -1218,8 +1191,7 @@ function migrate_contracts_date2($db, $langs, $conf)
             print $langs->trans('MigrationContractsInvalidDatesNumber', $nbcontratsmodifie)."<br>\n";
             else print  $langs->trans('MigrationContractsInvalidDatesNothingToUpdate')."<br>\n";
         }
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 
@@ -1304,8 +1276,7 @@ function migrate_contracts_open($db, $langs, $conf)
             print $langs->trans('MigrationReopenedContractsNumber', $nbcontratsmodifie)."<br>\n";
             else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
         }
-    }
-    else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
+    } else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
 
     print '</td></tr>';
 }
@@ -1383,21 +1354,18 @@ function migrate_paiementfourn_facturefourn($db, $langs, $conf)
                         {
                             $nb++;
                             print '<td><span style="color:green">'.$langs->trans("OK").'</span></td>';
-                        }
-                        else {
+                        } else {
                             print '<td><span style="color:red">Error on insert</span></td>';
                             $error++;
                         }
                         print '</tr>';
                     }
-                }
-                else {
+                } else {
                     $error++;
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             $error++;
         }
 
@@ -1411,13 +1379,11 @@ function migrate_paiementfourn_facturefourn($db, $langs, $conf)
 
             $sql = "ALTER TABLE ".MAIN_DB_PREFIX."paiementfourn DROP COLUMN fk_facture_fourn";
             $db->query($sql);
-        }
-        else {
+        } else {
             print '<tr><td>'.$langs->trans("Error").'</td></tr>';
             $db->rollback();
         }
-    }
-    else {
+    } else {
         print '<tr><td>'.$langs->trans("AlreadyDone").'</td></tr>';
     }
 }
@@ -1502,13 +1468,11 @@ function migrate_price_facture($db, $langs, $conf)
                         if ($facture->update_price() > 0)
                         {
                             //print $facture->id;
-                        }
-                        else {
+                        } else {
                             print "Error id=".$facture->id;
                             $err++;
                         }
-                    }
-                    else {
+                    } else {
                         print "Error #3";
                         $err++;
                     }
@@ -1517,15 +1481,13 @@ function migrate_price_facture($db, $langs, $conf)
 
                 $i++;
             }
-        }
-        else {
+        } else {
             print $langs->trans("AlreadyDone");
         }
         $db->free($resql);
 
         $db->commit();
-    }
-    else {
+    } else {
         print "Error #1 ".$db->error();
         $err++;
 
@@ -1623,16 +1585,14 @@ function migrate_price_propal($db, $langs, $conf)
                  */
                 $i++;
             }
-        }
-        else {
+        } else {
             print $langs->trans("AlreadyDone");
         }
 
         $db->free($resql);
 
         $db->commit();
-    }
-    else {
+    } else {
         print "Error #1 ".$db->error();
 
         $db->rollback();
@@ -1710,16 +1670,14 @@ function migrate_price_contrat($db, $langs, $conf)
 
                 $i++;
             }
-        }
-        else {
+        } else {
             print $langs->trans("AlreadyDone");
         }
 
         $db->free($resql);
 
         $db->commit();
-    }
-    else {
+    } else {
         print "Error #1 ".$db->error();
 
         $db->rollback();
@@ -1815,8 +1773,7 @@ function migrate_price_commande($db, $langs, $conf)
                  */
                 $i++;
             }
-        }
-        else {
+        } else {
             print $langs->trans("AlreadyDone");
         }
 
@@ -1833,8 +1790,7 @@ function migrate_price_commande($db, $langs, $conf)
          */
 
         $db->commit();
-    }
-    else {
+    } else {
         print "Error #1 ".$db->error();
 
         $db->rollback();
@@ -1930,8 +1886,7 @@ function migrate_price_commande_fournisseur($db, $langs, $conf)
                  */
                 $i++;
             }
-        }
-        else {
+        } else {
             print $langs->trans("AlreadyDone");
         }
 
@@ -1948,8 +1903,7 @@ function migrate_price_commande_fournisseur($db, $langs, $conf)
          */
 
         $db->commit();
-    }
-    else {
+    } else {
         print "Error #1 ".$db->error();
 
         $db->rollback();
@@ -2076,17 +2030,14 @@ function migrate_commande_expedition($db, $langs, $conf)
                 $sql = "ALTER TABLE ".MAIN_DB_PREFIX."expedition DROP COLUMN fk_commande";
                 print $langs->trans('FieldRenamed')."<br>\n";
                 $db->query($sql);
-            }
-            else {
+            } else {
                 $db->rollback();
             }
-        }
-        else {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
     print '</td></tr>';
@@ -2149,8 +2100,7 @@ function migrate_commande_livraison($db, $langs, $conf)
                             $error++;
                             dol_print_error($db);
                         }
-                    }
-                    else {
+                    } else {
                         $error++;
                         dol_print_error($db);
                     }
@@ -2165,17 +2115,14 @@ function migrate_commande_livraison($db, $langs, $conf)
                 $sql = "ALTER TABLE ".MAIN_DB_PREFIX."livraison DROP COLUMN fk_commande";
                 print $langs->trans('FieldRenamed')."<br>\n";
                 $db->query($sql);
-            }
-            else {
+            } else {
                 $db->rollback();
             }
-        }
-        else {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
     print '</td></tr>';
@@ -2253,13 +2200,11 @@ function migrate_detail_livraison($db, $langs, $conf)
                                 $error++;
                                 dol_print_error($db);
                             }
-                        }
-                        else {
+                        } else {
                             $error++;
                             dol_print_error($db);
                         }
-                    }
-                    else {
+                    } else {
                         $error++;
                         dol_print_error($db);
                     }
@@ -2274,17 +2219,14 @@ function migrate_detail_livraison($db, $langs, $conf)
                 $sql = "ALTER TABLE ".MAIN_DB_PREFIX."livraisondet CHANGE fk_commande_ligne fk_origin_line integer";
                 print $langs->trans('FieldRenamed')."<br>\n";
                 $db->query($sql);
-            }
-            else {
+            } else {
                 $db->rollback();
             }
-        }
-        else {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else {
+    } else {
         $result = $db->DDLDescTable(MAIN_DB_PREFIX."livraisondet", "fk_origin_line");
         $obj = $db->fetch_object($result);
         if (!$obj)
@@ -2340,8 +2282,7 @@ function migrate_stocks($db, $langs, $conf)
                 $resql2 = $db->query($sql);
                 if ($resql2)
                 {
-                }
-                else {
+                } else {
                     $error++;
                     dol_print_error($db);
                 }
@@ -2353,12 +2294,10 @@ function migrate_stocks($db, $langs, $conf)
         if ($error == 0)
         {
             $db->commit();
-        }
-        else {
+        } else {
             $db->rollback();
         }
-    }
-    else {
+    } else {
         dol_print_error($db);
         $db->rollback();
     }
@@ -2413,8 +2352,7 @@ function migrate_menus($db, $langs, $conf)
                     $resql2 = $db->query($sql);
                     if ($resql2)
                     {
-                    }
-                    else {
+                    } else {
                         $error++;
                         dol_print_error($db);
                     }
@@ -2426,17 +2364,14 @@ function migrate_menus($db, $langs, $conf)
             if ($error == 0)
             {
                 $db->commit();
-            }
-            else {
+            } else {
                 $db->rollback();
             }
-        }
-        else {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
 
@@ -2498,25 +2433,21 @@ function migrate_commande_deliveryaddress($db, $langs, $conf)
                     print ". ";
                     $i++;
                 }
-            }
-            else {
+            } else {
                 print $langs->trans('AlreadyDone')."<br>\n";
             }
 
             if ($error == 0)
             {
                 $db->commit();
-            }
-            else {
+            } else {
                 $db->rollback();
             }
-        }
-        else {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
 
@@ -2591,18 +2522,15 @@ function migrate_restore_missing_links($db, $langs, $conf)
                 //print ". ";
                 $i++;
             }
-        }
-        else print $langs->trans('AlreadyDone')."<br>\n";
+        } else print $langs->trans('AlreadyDone')."<br>\n";
 
         if ($error == 0)
         {
             $db->commit();
-        }
-        else {
+        } else {
             $db->rollback();
         }
-    }
-    else {
+    } else {
         dol_print_error($db);
         $db->rollback();
     }
@@ -2654,20 +2582,17 @@ function migrate_restore_missing_links($db, $langs, $conf)
                 //print ". ";
                 $i++;
             }
-        }
-        else {
+        } else {
             print $langs->trans('AlreadyDone')."<br>\n";
         }
 
         if ($error == 0)
         {
             $db->commit();
-        }
-        else {
+        } else {
             $db->rollback();
         }
-    }
-    else {
+    } else {
         dol_print_error($db);
         $db->rollback();
     }
@@ -2748,21 +2673,17 @@ function migrate_project_user_resp($db, $langs, $conf)
                 if ($db->query($sqlDrop))
                 {
                     $db->commit();
-                }
-                else {
+                } else {
                     $db->rollback();
                 }
-            }
-            else {
+            } else {
                 $db->rollback();
             }
-        }
-        else {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
     print '</td></tr>';
@@ -2836,21 +2757,17 @@ function migrate_project_task_actors($db, $langs, $conf)
                 if ($db->query($sqlDrop))
                 {
                     $db->commit();
-                }
-                else {
+                } else {
                     $db->rollback();
                 }
-            }
-            else {
+            } else {
                 $db->rollback();
             }
-        }
-        else {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
     print '</td></tr>';
@@ -2920,8 +2837,7 @@ function migrate_relationship_tables($db, $langs, $conf, $table, $fk_source, $so
                     print ". ";
                     $i++;
                 }
-            }
-            else {
+            } else {
                 print $langs->trans('AlreadyDone')."<br>\n";
             }
 
@@ -2931,21 +2847,17 @@ function migrate_relationship_tables($db, $langs, $conf, $table, $fk_source, $so
                 if ($db->query($sqlDrop))
                 {
                     $db->commit();
-                }
-                else {
+                } else {
                     $db->rollback();
                 }
-            }
-            else {
+            } else {
                 $db->rollback();
             }
-        }
-        else {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
 
@@ -3013,8 +2925,7 @@ function migrate_project_task_time($db, $langs, $conf)
                     $oldtime++;
                     if (!empty($totaltime[$obj->fk_task])) $totaltime[$obj->fk_task] += $newtime;
                     else $totaltime[$obj->fk_task] = $newtime;
-                }
-                else {
+                } else {
                     if (!empty($totaltime[$obj->fk_task])) $totaltime[$obj->fk_task] += $obj->task_duration;
                     else $totaltime[$obj->fk_task] = $obj->task_duration;
                 }
@@ -3039,28 +2950,23 @@ function migrate_project_task_time($db, $langs, $conf)
                             dol_print_error($db);
                         }
                     }
-                }
-                else {
+                } else {
                     print $langs->trans('AlreadyDone')."<br>\n";
                 }
-            }
-            else {
+            } else {
                 dol_print_error($db);
             }
-        }
-        else {
+        } else {
             print $langs->trans('AlreadyDone')."<br>\n";
         }
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 
     if ($error == 0)
     {
         $db->commit();
-    }
-    else {
+    } else {
         $db->rollback();
     }
 
@@ -3132,31 +3038,26 @@ function migrate_customerorder_shipping($db, $langs, $conf)
                         print ". ";
                         $i++;
                     }
-                }
-                else {
+                } else {
                     print $langs->trans('AlreadyDone')."<br>\n";
                 }
 
                 if ($error == 0)
                 {
                     $db->commit();
-                }
-                else {
+                } else {
                     dol_print_error($db);
                     $db->rollback();
                 }
-            }
-            else {
+            } else {
                 dol_print_error($db);
                 $db->rollback();
             }
-        }
-        else {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
 
@@ -3229,15 +3130,13 @@ function migrate_shipping_delivery($db, $langs, $conf)
                             dol_print_error($db);
                         }
                         print ". ";
-                    }
-                    else {
+                    } else {
                         $error++;
                         dol_print_error($db);
                     }
                     $i++;
                 }
-            }
-            else {
+            } else {
                 print $langs->trans('AlreadyDone')."<br>\n";
             }
 
@@ -3251,18 +3150,15 @@ function migrate_shipping_delivery($db, $langs, $conf)
                 // DDL commands must not be inside a transaction
                 $sqlDrop = "ALTER TABLE ".MAIN_DB_PREFIX."livraison DROP COLUMN fk_expedition";
                 $db->query($sqlDrop);
-            }
-            else {
+            } else {
                 dol_print_error($db);
                 $db->rollback();
             }
-        }
-        else {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
 
@@ -3329,21 +3225,18 @@ function migrate_shipping_delivery2($db, $langs, $conf)
                 print ". ";
                 $i++;
             }
-        }
-        else {
+        } else {
             print $langs->trans('AlreadyDone')."<br>\n";
         }
 
         if ($error == 0)
         {
             $db->commit();
-        }
-        else {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else {
+    } else {
         dol_print_error($db);
         $db->rollback();
     }
@@ -3401,13 +3294,11 @@ function migrate_actioncomm_element($db, $langs, $conf)
 				//$sqlDrop = "ALTER TABLE ".MAIN_DB_PREFIX."actioncomm DROP COLUMN ".$field;
 				//$db->query($sqlDrop);
 				//print ". ";
-			}
-			else {
+			} else {
 				dol_print_error($db);
 				$db->rollback();
 			}
-		}
-		else {
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 	}
@@ -3491,13 +3382,11 @@ function migrate_mode_reglement($db, $langs, $conf)
 					if (!$error)
 					{
 						$db->commit();
-					}
-					else {
+					} else {
 						dol_print_error($db);
 						$db->rollback();
 					}
-				}
-				else {
+				} else {
 					dol_print_error($db);
 					$db->rollback();
 				}
@@ -3580,15 +3469,13 @@ function migrate_clean_association($db, $langs, $conf)
                         print '<tr><td>'.$langs->trans("MigrationCategorieAssociation").'</td>';
                         print '<td class="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Success").' ('.$num.'=>'.count($couples).')</td></tr>';
                         $db->commit();
-                    }
-                    else {
+                    } else {
                         print '<tr><td>'.$langs->trans("MigrationCategorieAssociation").'</td>';
                         print '<td class="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Failed").'</td></tr>';
                         $db->rollback();
                     }
                 }
-            }
-            else {
+            } else {
                 print '<tr><td>'.$langs->trans("Error").'</td>';
                 print '<td class="right"><div class="error">'.$db->lasterror().'</div></td></tr>';
             }
@@ -3648,8 +3535,7 @@ function migrate_categorie_association($db, $langs, $conf)
 					print ". ";
 					$i++;
 				}
-			}
-			else {
+			} else {
 				print $langs->trans('AlreadyDone')."<br>\n";
 			}
 
@@ -3669,17 +3555,14 @@ function migrate_categorie_association($db, $langs, $conf)
 				*/
 
 				$db->commit();
-			}
-			else {
+			} else {
 				$db->rollback();
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 			$db->rollback();
 		}
-	}
-	else {
+	} else {
 		print $langs->trans('AlreadyDone')."<br>\n";
 	}
 
@@ -3738,20 +3621,17 @@ function migrate_event_assignement($db, $langs, $conf)
 				print ". ";
 				$i++;
 			}
-		}
-		else {
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -3812,20 +3692,17 @@ function migrate_event_assignement_contact($db, $langs, $conf)
 				print ". ";
 				$i++;
 			}
-		}
-		else {
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -3896,8 +3773,7 @@ function migrate_reset_blocked_log($db, $langs, $conf)
 						{
 							$error++;
 							dol_print_error($db);
-						}
-						else {
+						} else {
 							// Add set line
 							$object = new stdClass();
 							$object->id = 1;
@@ -3914,31 +3790,26 @@ function migrate_reset_blocked_log($db, $langs, $conf)
 								$error++;
 							}
 						}
-					}
-					else {
+					} else {
 						print ' - '.$langs->trans('AlreadyInV7').'<br>';
 					}
-				}
-				else {
+				} else {
 					dol_print_error($db);
 				}
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			print $langs->trans('NothingToDo')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4000,20 +3871,17 @@ function migrate_remise_entity($db, $langs, $conf)
 				print ". ";
 				$i++;
 			}
-		}
-		else {
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4065,15 +3933,13 @@ function migrate_remise_except_entity($db, $langs, $conf)
 					$sqlSelect2 = "SELECT f.entity";
 					$sqlSelect2 .= " FROM ".MAIN_DB_PREFIX."facture as f";
 					$sqlSelect2 .= " WHERE f.rowid = ".$fk_facture;
-				}
-				elseif (!empty($obj->fk_facture_line))
+				} elseif (!empty($obj->fk_facture_line))
 				{
 					$sqlSelect2 = "SELECT f.entity";
 					$sqlSelect2 .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."facturedet as fd";
 					$sqlSelect2 .= " WHERE fd.rowid = ".$obj->fk_facture_line;
 					$sqlSelect2 .= " AND fd.fk_facture = f.rowid";
-				}
-				else {
+				} else {
 					$sqlSelect2 = "SELECT s.entity";
 					$sqlSelect2 .= " FROM ".MAIN_DB_PREFIX."societe as s";
 					$sqlSelect2 .= " WHERE s.rowid = ".$obj->fk_soc;
@@ -4097,8 +3963,7 @@ function migrate_remise_except_entity($db, $langs, $conf)
 							dol_print_error($db);
 						}
 					}
-				}
-				else {
+				} else {
 					$error++;
 					dol_print_error($db);
 				}
@@ -4106,20 +3971,17 @@ function migrate_remise_except_entity($db, $langs, $conf)
 				print ". ";
 				$i++;
 			}
-		}
-		else {
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4179,20 +4041,17 @@ function migrate_user_rights_entity($db, $langs, $conf)
 				print ". ";
 				$i++;
 			}
-		}
-		else {
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4252,20 +4111,17 @@ function migrate_usergroup_rights_entity($db, $langs, $conf)
 				print ". ";
 				$i++;
 			}
-		}
-		else {
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4448,8 +4304,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_API')
+		} elseif ($moduletoreload == 'MAIN_MODULE_API')
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Rest API module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modApi.class.php';
@@ -4458,8 +4313,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_BARCODE')
+		} elseif ($moduletoreload == 'MAIN_MODULE_BARCODE')
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Barcode module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modBarcode.class.php';
@@ -4468,8 +4322,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_CRON')
+		} elseif ($moduletoreload == 'MAIN_MODULE_CRON')
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Cron module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modCron.class.php';
@@ -4478,8 +4331,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_SOCIETE')
+		} elseif ($moduletoreload == 'MAIN_MODULE_SOCIETE')
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Societe module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modSociete.class.php';
@@ -4488,8 +4340,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_PRODUIT')    // Permission has changed into 2.7
+		} elseif ($moduletoreload == 'MAIN_MODULE_PRODUIT')    // Permission has changed into 2.7
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Produit module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modProduct.class.php';
@@ -4498,8 +4349,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_SERVICE')    // Permission has changed into 2.7
+		} elseif ($moduletoreload == 'MAIN_MODULE_SERVICE')    // Permission has changed into 2.7
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Service module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php';
@@ -4508,8 +4358,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_COMMANDE')   // Permission has changed into 2.9
+		} elseif ($moduletoreload == 'MAIN_MODULE_COMMANDE')   // Permission has changed into 2.9
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Commande module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php';
@@ -4518,8 +4367,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_FACTURE')    // Permission has changed into 2.9
+		} elseif ($moduletoreload == 'MAIN_MODULE_FACTURE')    // Permission has changed into 2.9
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Facture module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php';
@@ -4528,8 +4376,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_FOURNISSEUR')    // Permission has changed into 2.9
+		} elseif ($moduletoreload == 'MAIN_MODULE_FOURNISSEUR')    // Permission has changed into 2.9
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Fournisseur module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
@@ -4538,8 +4385,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_HOLIDAY')    // Permission and tabs has changed into 3.8
+		} elseif ($moduletoreload == 'MAIN_MODULE_HOLIDAY')    // Permission and tabs has changed into 3.8
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Leave Request module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modHoliday.class.php';
@@ -4548,8 +4394,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_DEPLACEMENT')    // Permission has changed into 3.0
+		} elseif ($moduletoreload == 'MAIN_MODULE_DEPLACEMENT')    // Permission has changed into 3.0
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Deplacement module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modDeplacement.class.php';
@@ -4558,8 +4403,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_EXPENSEREPORT')
+		} elseif ($moduletoreload == 'MAIN_MODULE_EXPENSEREPORT')
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Expense Report module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modExpenseReport.class.php';
@@ -4568,8 +4412,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_DON')    // Permission has changed into 3.0
+		} elseif ($moduletoreload == 'MAIN_MODULE_DON')    // Permission has changed into 3.0
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Don module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modDon.class.php';
@@ -4578,8 +4421,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_ECM')    // Permission has changed into 3.0 and 3.1
+		} elseif ($moduletoreload == 'MAIN_MODULE_ECM')    // Permission has changed into 3.0 and 3.1
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate ECM module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php';
@@ -4588,8 +4430,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes'); // We need to remove because a permission id has been removed
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_PAYBOX')    // Permission has changed into 3.0
+		} elseif ($moduletoreload == 'MAIN_MODULE_PAYBOX')    // Permission has changed into 3.0
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Paybox module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modPaybox.class.php';
@@ -4598,8 +4439,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes'); // We need to remove because id of module has changed
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_SUPPLIERPROPOSAL')		// Module after 3.5
+		} elseif ($moduletoreload == 'MAIN_MODULE_SUPPLIERPROPOSAL')		// Module after 3.5
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Supplier Proposal module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modSupplierProposal.class.php';
@@ -4608,8 +4448,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes'); // We need to remove because id of module has changed
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_OPENSURVEY')    // Permission has changed into 3.0
+		} elseif ($moduletoreload == 'MAIN_MODULE_OPENSURVEY')    // Permission has changed into 3.0
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Opensurvey module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modOpenSurvey.class.php';
@@ -4618,8 +4457,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes'); // We need to remove because menu entries has changed
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_TAKEPOS')    // Permission has changed into 10.0
+		} elseif ($moduletoreload == 'MAIN_MODULE_TAKEPOS')    // Permission has changed into 10.0
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Takepos module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modTakePos.class.php';
@@ -4628,8 +4466,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes'); // We need to remove because menu entries has changed
 				$mod->init($reloadmode);
 			}
-		}
-		else {
+		} else {
 			$reg = array();
 			$tmp = preg_match('/MAIN_MODULE_([a-zA-Z0-9]+)/', $moduletoreload, $reg);
 			if (!empty($reg[1]))
@@ -4637,8 +4474,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				if (strtoupper($moduletoreload) == $moduletoreload)	// If key is un uppercase
 				{
 					$moduletoreloadshort = ucfirst(strtolower($reg[1]));
-				}
-				else // If key is a mix of up and low case
+				} else // If key is a mix of up and low case
 				{
 					$moduletoreloadshort = $reg[1];
 				}
@@ -4649,8 +4485,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 					$mod = new $classname($db);
 					//$mod->remove('noboxes');
 					$mod->init($reloadmode);
-				}
-				else {
+				} else {
 					dolibarr_install_syslog('Failed to include '.DOL_DOCUMENT_ROOT.'/core/modules/mod'.$moduletoreloadshort.'.class.php');
 
 					$res = @dol_include_once(strtolower($moduletoreloadshort).'/core/modules/mod'.$moduletoreloadshort.'.class.php');
@@ -4659,13 +4494,11 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 						$mod = new $classname($db);
 						//$mod->remove('noboxes');
 						$mod->init($reloadmode);
-					}
-					else {
+					} else {
 						dolibarr_install_syslog('Failed to include '.strtolower($moduletoreloadshort).'/core/modules/mod'.$moduletoreloadshort.'.class.php');
 					}
 				}
-			}
-			else {
+			} else {
 				dolibarr_install_syslog("Error, can't find module with name ".$moduletoreload, LOG_WARNING);
 				print "Error, can't find module with name ".$moduletoreload;
 			}
@@ -4799,8 +4632,7 @@ function migrate_user_photospath()
 					    			}
 									// dol_delete_dir($origin.'/'.$file);
 			        			}
-			    			}
-			    			else // it is a file
+			    			} else // it is a file
 			    			{
 			    				if (!dol_is_file($destin.'/'.$file))
 			    				{
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 80f30552473..544593dc16c 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -118,17 +118,14 @@ if ($action == 'add')
 		$db->commit();
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 
 		$_GET["commande_id"] = $_POST["commande_id"];
 		$action = 'create';
 	}
-}
-
-elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
+} elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
     ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->livraison->creer))
     || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->livraison_advance->validate)))
 )
@@ -165,8 +162,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expeditio
 		if (!empty($backtopage)) header("Location: ".$backtopage);
 		else header("Location: ".DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1');
 		exit;
-	}
-	else {
+	} else {
 		$db->rollback();
 	}
 }
@@ -259,8 +255,7 @@ $formfile = new FormFile($db);
 
 if ($action == 'create')    // Create. Seems to no be used
 {
-}
-else // View
+} else // View
 {
 	if ($object->id > 0)
 	{
@@ -450,8 +445,7 @@ else // View
 				print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 1);
 				print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 				print '</form>';
-			}
-			else {
+			} else {
 				print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
 			}
 			print '</td>';
@@ -472,8 +466,7 @@ else // View
 				if ($action != 'editincoterm')
 				{
 					print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-				}
-				else {
+				} else {
 					print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 				}
 		        print '</td></tr>';
@@ -570,8 +563,7 @@ else // View
 							}
 
 							$label = (!empty($product->multilangs[$outputlangs->defaultlang]["label"])) ? $product->multilangs[$outputlangs->defaultlang]["label"] : $object->lines[$i]->product_label;
-						}
-						else {
+						} else {
 							$label = (!empty($object->lines[$i]->label) ? $object->lines[$i]->label : $object->lines[$i]->product_label);
 						}
 
@@ -591,8 +583,7 @@ else // View
 						{
 							print (!empty($object->lines[$i]->description) && $object->lines[$i]->description != $object->lines[$i]->product_label) ? '<br>'.dol_htmlentitiesbr($object->lines[$i]->description) : '';
 						}
-					}
-					else {
+					} else {
 						print "<td>";
 						if ($object->lines[$i]->fk_product_type == 1) $text = img_object($langs->trans('Service'), 'service');
 						else $text = img_object($langs->trans('Product'), 'product');
@@ -668,8 +659,7 @@ else // View
 					if ($conf->expedition_bon->enabled)
 					{
 						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;expid='.$object->origin_id.'&amp;action=delete&amp;backtopage='.urlencode(DOL_URL_ROOT.'/expedition/card.php?id='.$object->origin_id).'">'.$langs->trans("Delete").'</a>';
-					}
-					else {
+					} else {
 						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
 					}
 				}
@@ -712,13 +702,11 @@ else // View
 			// Rien a droite
 
 			print '</td></tr></table>';
-		}
-		else {
+		} else {
 			/* Expedition non trouvee */
 			print "Expedition inexistante ou acces refuse";
 		}
-	}
-	else {
+	} else {
 		/* Expedition non trouvee */
 		print "Expedition inexistante ou acces refuse";
 	}
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 4d00c414cb1..6199bc4ec88 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -215,22 +215,19 @@ class Livraison extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else {
+				} else {
 					$error++;
 					$this->error = $this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else {
+			} else {
 				$error++;
 				$this->error = $this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$error++;
 			$this->error = $this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 			$this->db->rollback();
@@ -341,14 +338,12 @@ class Livraison extends CommonObject
 				}
 
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = 'Delivery with id '.$id.' not found sql='.$sql;
 				dol_syslog(get_class($this).'::fetch Error '.$this->error, LOG_ERR);
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -394,8 +389,7 @@ class Livraison extends CommonObject
 					if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
 		            {
 		                $numref = $objMod->livraison_get_num($soc, $this);
-		            }
-		            else {
+		            } else {
 		                $numref = $this->ref;
 		            }
             		$this->newref = dol_sanitizeFileName($numref);
@@ -494,15 +488,13 @@ class Livraison extends CommonObject
 			        {
 			            $this->db->commit();
 			            return 1;
-			        }
-			        else {
+			        } else {
 			            $this->db->rollback();
 			            return -1;
 			        }
 				}
 			}
-		}
-		else {
+		} else {
 			$this->error = "Non autorise";
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 			return -1;
@@ -625,8 +617,7 @@ class Livraison extends CommonObject
 				$this->update_price();
 
 				return 1;
-			}
-			else {
+			} else {
 				return 0;
 			}
 		}
@@ -695,20 +686,17 @@ class Livraison extends CommonObject
                     // End call triggers
 
 					return 1;
-				}
-				else {
+				} else {
 					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror()." - sql=$sql";
 			$this->db->rollback();
 			return -1;
@@ -978,15 +966,13 @@ class Livraison extends CommonObject
 					if ($row[0] == $objSourceLine->rowid)
 					{
 						$array[$i]['qty'] = $objSourceLine->qty - $row[1];
-					}
-					else {
+					} else {
 						$array[$i]['qty'] = $objSourceLine->qty;
 					}
 
 					$array[$i]['ref'] = $objSourceLine->ref;
 					$array[$i]['label'] = $objSourceLine->label ? $objSourceLine->label : $objSourceLine->description;
-				}
-				elseif ($objSourceLine->qty - $row[1] < 0)
+				} elseif ($objSourceLine->qty - $row[1] < 0)
 				{
 					$array[$i]['qty'] = $objSourceLine->qty - $row[1]." Erreur livraison !";
 					$array[$i]['ref'] = $objSourceLine->ref;
@@ -996,8 +982,7 @@ class Livraison extends CommonObject
 					$i++;
 			}
 			return $array;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error()." - sql=$sqlSourceLine";
 			return -1;
 		}
@@ -1026,13 +1011,11 @@ class Livraison extends CommonObject
 			{
 				$this->date_delivery = $date_livraison;
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			return -2;
 		}
 	}
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 266b7d2bc09..8f82e94b8f9 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -68,8 +68,7 @@ if (empty($reshook))
 		if ($result > 0)
 		{
 			setEventMessages($langs->trans('LoanPaid'), null, 'mesgs');
-		}
-		else {
+		} else {
 			setEventMessages($loan->error, null, 'errors');
 		}
 	}
@@ -84,8 +83,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans('LoanDeleted'), null, 'mesgs');
 			header("Location: index.php");
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($loan->error, null, 'errors');
 		}
 	}
@@ -151,8 +149,7 @@ if (empty($reshook))
 					$action = 'create';
 				}
 			}
-		}
-		else {
+		} else {
 			header("Location: index.php");
 			exit();
 		}
@@ -173,8 +170,7 @@ if (empty($reshook))
 			{
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("LoanCapital")), null, 'errors');
 				$action = 'edit';
-			}
-			else {
+			} else {
 				$object->datestart = $datestart;
 				$object->dateend	        = $dateend;
 				$object->capital	        = $capital;
@@ -197,13 +193,11 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 				exit;
-			}
-			else {
+			} else {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else {
+		} else {
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 			exit;
 		}
@@ -268,8 +262,7 @@ if ($action == 'create')
 		print '<tr><td class="fieldrequired">'.$langs->trans("Account").'</td><td>';
 		$form->select_comptes(GETPOST("accountid"), "accountid", 0, "courant=1", 1); // Show list of bank account with courant
 		print '</td></tr>';
-	}
-	else {
+	} else {
 		print '<tr><td>'.$langs->trans("Account").'</td><td>';
 		print $langs->trans("NoBankAccountDefined");
 		print '</td></tr>';
@@ -352,8 +345,7 @@ if ($action == 'create')
 		print '<td>';
 		print $formaccounting->select_account(GETPOST('accountancy_account_interest') ?GETPOST('accountancy_account_interest') : $conf->global->LOAN_ACCOUNTING_ACCOUNT_INTEREST, 'accountancy_account_interest', 1, '', 1, 1);
 		print '</td></tr>';
-	}
-	else // For external software
+	} else // For external software
 	{
 		// Accountancy_account_capital
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("LoanAccountancyCapitalCode").'</td>';
@@ -476,8 +468,7 @@ if ($id > 0)
 			print '<tr><td class="fieldrequired titlefield">'.$langs->trans("LoanCapital").'</td><td>';
 			print '<input name="capital" size="10" value="'.$object->capital.'"></td></tr>';
 			print '</td></tr>';
-		}
-		else {
+		} else {
 			print '<tr><td class="titlefield">'.$langs->trans("LoanCapital").'</td><td>'.price($object->capital, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 		}
 
@@ -487,8 +478,7 @@ if ($id > 0)
 		    print '<tr><td class="titlefield">'.$langs->trans("Insurance").'</td><td>';
 		    print '<input name="insurance_amount" size="10" value="'.$object->insurance_amount.'"></td></tr>';
 		    print '</td></tr>';
-		}
-		else {
+		} else {
 		    print '<tr><td class="titlefield">'.$langs->trans("Insurance").'</td><td>'.price($object->insurance_amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 		}
 
@@ -498,8 +488,7 @@ if ($id > 0)
 		if ($action == 'edit')
 		{
 			print $form->selectDate($object->datestart, 'start', 0, 0, 0, 'update', 1, 0);
-		}
-		else {
+		} else {
 			print dol_print_date($object->datestart, "day");
 		}
 		print "</td></tr>";
@@ -510,8 +499,7 @@ if ($id > 0)
 		if ($action == 'edit')
 		{
 			print $form->selectDate($object->dateend, 'end', 0, 0, 0, 'update', 1, 0);
-		}
-		else {
+		} else {
 			print dol_print_date($object->dateend, "day");
 		}
 		print "</td></tr>";
@@ -522,8 +510,7 @@ if ($id > 0)
 		if ($action == 'edit')
 		{
 			print '<input name="nbterm" size="4" value="'.$object->nbterm.'">';
-		}
-		else {
+		} else {
 			print $object->nbterm;
 		}
 		print '</td></tr>';
@@ -534,8 +521,7 @@ if ($id > 0)
 		if ($action == 'edit')
 		{
 			print '<input name="rate" size="4" value="'.$object->rate.'">%';
-		}
-		else {
+		} else {
 			print price($object->rate).'%';
 		}
 		print '</td></tr>';
@@ -551,13 +537,11 @@ if ($id > 0)
 			if (!empty($conf->accounting->enabled))
 			{
 				print $formaccounting->select_account($object->account_capital, 'accountancy_account_capital', 1, '', 1, 1);
-			}
-			else {
+			} else {
 				print '<input name="accountancy_account_capital" size="16" value="'.$object->account_capital.'">';
 			}
 			print '</td>';
-		}
-		else {
+		} else {
 			print '<td class="nowrap">';
 			print $langs->trans("LoanAccountancyCapitalCode");
 			print '</td><td>';
@@ -587,13 +571,11 @@ if ($id > 0)
 			if (!empty($conf->accounting->enabled))
 			{
 				print $formaccounting->select_account($object->account_insurance, 'accountancy_account_insurance', 1, '', 1, 1);
-			}
-			else {
+			} else {
 				print '<input name="accountancy_account_insurance" size="16" value="'.$object->account_insurance.'">';
 			}
 			print '</td>';
-		}
-		else {
+		} else {
 			print '<td class="nowrap">';
 			print $langs->trans("LoanAccountancyInsuranceCode");
 			print '</td><td>';
@@ -623,13 +605,11 @@ if ($id > 0)
 			if (!empty($conf->accounting->enabled))
 			{
 				print $formaccounting->select_account($object->account_interest, 'accountancy_account_interest', 1, '', 1, 1);
-			}
-			else {
+			} else {
 				print '<input name="accountancy_account_interest" size="16" value="'.$object->account_interest.'">';
 			}
 			print '</td>';
-		}
-		else {
+		} else {
 			print '<td class="nowrap">';
 			print $langs->trans("LoanAccountancyInterestCode");
 			print '</td><td>';
@@ -723,8 +703,7 @@ if ($id > 0)
 			print '</div>';
 
 			$db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -784,8 +763,7 @@ if ($id > 0)
 				print "</div>";
 			}
 		}
-	}
-	else {
+	} else {
 		// Loan not found
 		dol_print_error('', $object->error);
 	}
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index d38593c9710..a072199dc01 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -160,13 +160,11 @@ class Loan extends CommonObject
 
 				$this->db->free($resql);
 				return 1;
-			}
-			else {
+			} else {
 				$this->db->free($resql);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -256,8 +254,7 @@ class Loan extends CommonObject
 			//dol_syslog("Loans::create this->id=".$this->id);
 			$this->db->commit();
 			return $this->id;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -326,8 +323,7 @@ class Loan extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -371,8 +367,7 @@ class Loan extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -496,8 +491,7 @@ class Loan extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -566,8 +560,7 @@ class Loan extends CommonObject
 
 			$this->db->free($resql);
 			return $amount;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -612,13 +605,11 @@ class Loan extends CommonObject
 
 				$this->db->free($result);
 				return 1;
-			}
-			else {
+			} else {
 				$this->db->free($result);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/loan/class/loanschedule.class.php b/htdocs/loan/class/loanschedule.class.php
index 8089dc3e176..7405a63e3b9 100644
--- a/htdocs/loan/class/loanschedule.class.php
+++ b/htdocs/loan/class/loanschedule.class.php
@@ -170,8 +170,7 @@ class LoanSchedule extends CommonObject
 			if ($resql)
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_loan");
-			}
-			else {
+			} else {
                 $this->error = $this->db->lasterror();
 				$error++;
 			}
@@ -182,8 +181,7 @@ class LoanSchedule extends CommonObject
 		    $this->amount_capital = $totalamount;
 		    $this->db->commit();
 			return $this->id;
-		}
-		else {
+		} else {
 			$this->errors[] = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -255,8 +253,7 @@ class LoanSchedule extends CommonObject
             $this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -318,8 +315,7 @@ class LoanSchedule extends CommonObject
 		{
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -359,8 +355,7 @@ class LoanSchedule extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -445,8 +440,7 @@ class LoanSchedule extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index 5c50a1fea89..40479677fd0 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -165,8 +165,7 @@ class PaymentLoan extends CommonObject
 			if ($resql)
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_loan");
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
@@ -177,8 +176,7 @@ class PaymentLoan extends CommonObject
 			$this->amount_capital = $totalamount;
 			$this->db->commit();
 			return $this->id;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -252,8 +250,7 @@ class PaymentLoan extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -323,8 +320,7 @@ class PaymentLoan extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -375,8 +371,7 @@ class PaymentLoan extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -454,8 +449,7 @@ class PaymentLoan extends CommonObject
 					$result = $acc->add_url_line($bank_line_id, $fk_loan, DOL_URL_ROOT.'/loan/card.php?id=', ($this->label ? $this->label : ''), 'loan');
 					if ($result <= 0) dol_print_error($this->db);
 				}
-			}
-			else {
+			} else {
 				$this->error = $acc->error;
 				$error++;
 			}
@@ -464,8 +458,7 @@ class PaymentLoan extends CommonObject
 		if (!$error)
 		{
 			return 1;
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -489,8 +482,7 @@ class PaymentLoan extends CommonObject
 		{
 		    $this->fk_bank = $id_bank;
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return 0;
 		}
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 93eca8cb7b4..442f8768390 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -158,8 +158,7 @@ if ($object->id)
     $permtoedit = $user->rights->loan->write;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
     print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index 5a4b9364555..fc0e766ed9b 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -120,8 +120,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else {
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -260,8 +259,7 @@ if ($resql)
 	print '</form>'."\n";
 
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index 6d912cc7149..31619be511b 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -63,8 +63,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->loan->del
 		$db->commit();
 		header("Location: ".DOL_URL_ROOT."/loan/list.php");
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($payment->error, $payment->errors, 'errors');
 		$db->rollback();
 	}
@@ -100,8 +99,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->loan->wri
 
 		header('Location: card.php?id='.$payment->id);
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($payment->error, $payment->errors, 'errors');
 		$db->rollback();
 	}
@@ -252,8 +250,7 @@ if ($resql)
 
 	print "</table>\n";
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -283,8 +280,7 @@ if (empty($action) && !empty($user->rights->loan->delete))
 	if (!$disable_delete)
 	{
 		print '<a class="butActionDelete" href="card.php?id='.$id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-	}
-	else {
+	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
 	}
 }
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 3ccc6a77b3f..de5a43220ef 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -155,8 +155,7 @@ if ($action == 'add_payment')
 				{
 					setEventMessages($payment->error, $payment->errors, 'errors');
 					$error++;
-				}
-				elseif (isset($line))
+				} elseif (isset($line))
 				{
 					$line->fk_bank = $payment->fk_bank;
 					$line->update($user);
@@ -169,8 +168,7 @@ if ($action == 'add_payment')
 				$loc = DOL_URL_ROOT.'/loan/card.php?id='.$chid;
 				header('Location: '.$loc);
 				exit;
-			}
-			else {
+			} else {
 				$db->rollback();
 			}
 		}
@@ -289,8 +287,7 @@ if ($action == 'create')
 	if ($loan->datestart > 0)
 	{
 		print '<td class="left" valign="center">'.dol_print_date($loan->datestart, 'day').'</td>';
-	}
-	else {
+	} else {
 		print '<td class="center" valign="center"><b>!!!</b></td>';
 	}
 
@@ -304,24 +301,21 @@ if ($action == 'create')
 	if ($sumpaid < $loan->capital)
 	{
 	    print $langs->trans("LoanCapital").': <input type="text" size="8" name="amount_capital" value="'.$amount_capital.'">';
-	}
-	else {
+	} else {
 		print '-';
 	}
 	print '<br>';
 	if ($sumpaid < $loan->capital)
 	{
 		print $langs->trans("Insurance").': <input type="text" size="8" name="amount_insurance" value="'.$amount_insurance.'">';
-	}
-	else {
+	} else {
 		print '-';
 	}
 	print '<br>';
 	if ($sumpaid < $loan->capital)
 	{
 		print $langs->trans("Interest").': <input type="text" size="8" name="amount_interest" value="'.$amount_interest.'">';
-	}
-	else {
+	} else {
 		print '-';
 	}
 	print "</td>";
diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php
index fb3cd86ebe3..adcdf4ca049 100644
--- a/htdocs/loan/schedule.php
+++ b/htdocs/loan/schedule.php
@@ -237,8 +237,7 @@ if ($object->nbterm > 0 && count($echeance->lines) == 0)
 		$i++;
 		$capital = $cap_rest;
 	}
-}
-elseif (count($echeance->lines) > 0)
+} elseif (count($echeance->lines) > 0)
 {
 	$i = 1;
 	$capital = $object->capital;
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index dec81411a33..46e8d017eca 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -208,14 +208,10 @@ class MailmanSpip
                     if ($result)
                     {
                         return 1;
-                    }
-                    else $this->error = $mydb->lasterror();
-                }
-                else $this->error = 'Failed to connect to SPIP';
-            }
-            else $this->error = 'BadSPIPConfiguration';
-        }
-        else $this->error = 'SPIPNotEnabled';
+                    } else $this->error = $mydb->lasterror();
+                } else $this->error = 'Failed to connect to SPIP';
+            } else $this->error = 'BadSPIPConfiguration';
+        } else $this->error = 'SPIPNotEnabled';
 
         return 0;
     }
@@ -249,14 +245,10 @@ class MailmanSpip
                     if ($result)
                     {
                         return 1;
-                    }
-                    else $this->error = $mydb->lasterror();
-                }
-                else $this->error = 'Failed to connect to SPIP';
-            }
-            else $this->error = 'BadSPIPConfiguration';
-        }
-        else $this->error = 'SPIPNotEnabled';
+                    } else $this->error = $mydb->lasterror();
+                } else $this->error = 'Failed to connect to SPIP';
+            } else $this->error = 'BadSPIPConfiguration';
+        } else $this->error = 'SPIPNotEnabled';
 
         return 0;
     }
@@ -290,23 +282,18 @@ class MailmanSpip
                             // nous avons au moins une reponse
                             $mydb->close($result);
                             return 1;
-                        }
-                        else {
+                        } else {
                             // nous n'avons pas de reponse => n'existe pas
                             $mydb->close($result);
                             return 0;
                         }
-                    }
-                    else {
+                    } else {
                         $this->error = $mydb->lasterror();
                         $mydb->close();
                     }
-                }
-                else $this->error = 'Failed to connect to SPIP';
-            }
-            else $this->error = 'BadSPIPConfiguration';
-        }
-        else $this->error = 'SPIPNotEnabled';
+                } else $this->error = 'Failed to connect to SPIP';
+            } else $this->error = 'BadSPIPConfiguration';
+        } else $this->error = 'SPIPNotEnabled';
 
         return -1;
     }
@@ -371,12 +358,10 @@ class MailmanSpip
 					{
 						$this->mladded_ko[$list] = $object->email;
 					    return -2;
-					}
-					else $this->mladded_ok[$list] = $object->email;
+					} else $this->mladded_ok[$list] = $object->email;
 	            }
 	            return count($lists);
-	        }
-	        else {
+	        } else {
 	            $this->error = "ADHERENT_MAILMAN_URL not defined";
 	            return -1;
 	        }
@@ -444,12 +429,10 @@ class MailmanSpip
 					{
 						$this->mlremoved_ko[$list] = $object->email;
 					    return -2;
-					}
-					else $this->mlremoved_ok[$list] = $object->email;
+					} else $this->mlremoved_ok[$list] = $object->email;
 	            }
 	            return count($lists);
-	        }
-	        else {
+	        } else {
 	            $this->error = "ADHERENT_MAILMAN_UNSUB_URL not defined";
 	            return -1;
 	        }
diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index e174e383993..9efea04e415 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -47,8 +47,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -60,8 +59,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -71,8 +69,7 @@ if ($action == 'remises')
 	if (dolibarr_set_const($db, 'MARGIN_METHODE_FOR_DISCOUNT', $_POST['MARGIN_METHODE_FOR_DISCOUNT'], 'chaine', 0, '', $conf->entity) > 0)
 	{
 		  setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -82,8 +79,7 @@ if ($action == 'typemarges')
 	if (dolibarr_set_const($db, 'MARGIN_TYPE', $_POST['MARGIN_TYPE'], 'chaine', 0, '', $conf->entity) > 0)
 	{
 		  setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -93,8 +89,7 @@ if ($action == 'contact')
 	if (dolibarr_set_const($db, 'AGENT_CONTACT_TYPE', $_POST['AGENT_CONTACT_TYPE'], 'chaine', 0, '', $conf->entity) > 0)
 	{
 		  setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -161,13 +156,11 @@ print '<td colspan="2">';
 if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('DISPLAY_MARGIN_RATES');
-}
-else {
+} else {
 	if (empty($conf->global->DISPLAY_MARGIN_RATES))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARGIN_RATES">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else {
+	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARGIN_RATES">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
@@ -182,13 +175,11 @@ print '<td colspan="2">';
 if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('DISPLAY_MARK_RATES');
-}
-else {
+} else {
 	if (empty($conf->global->DISPLAY_MARK_RATES))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else {
+	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
@@ -203,13 +194,11 @@ print '<td colspan="2">';
 if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('ForceBuyingPriceIfNull');
-}
-else {
+} else {
 	if (empty($conf->global->ForceBuyingPriceIfNull))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else {
+	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 8dfaecc7d41..6ff9cdc7274 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -303,8 +303,7 @@ if ($result)
     }
 	print "</table>";
 	print '</div>';
-}
-else {
+} else {
 	dol_print_error($db);
 }
 $db->free($result);
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 20d2b2a1b52..e1fd6876e0f 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -108,8 +108,7 @@ if ($socid > 0) {
 		if (!$sortorder) $sortorder = "DESC";
 		if (!$sortfield) $sortfield = "f.datef";
 	}
-}
-else {
+} else {
 	print '<tr><td class="titlefield">'.$langs->trans('ThirdPartyName').'</td>';
 	print '<td class="maxwidthonsmartphone" colspan="4">';
 	print $form->select_company(null, 'socid', '(client=1 OR client=3)', 1, 0, 0);
@@ -125,8 +124,7 @@ if (!$sortfield)
 	{
 		$sortfield = "f.datef";
 		$sortorder = "DESC";
-	}
-	else {
+	} else {
 	    $sortfield = "s.nom";
 	    $sortorder = "ASC";
 	}
@@ -267,8 +265,7 @@ if ($result)
 	if (!empty($client)) {
   		print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&amp;socid=".$socid, '', $sortfield, $sortorder);
   		print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;socid=".$socid, 'align="center"', $sortfield, $sortorder);
-	}
-	else print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "s.nom", "", "&amp;socid=".$socid, '', $sortfield, $sortorder);
+	} else print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "s.nom", "", "&amp;socid=".$socid, '', $sortfield, $sortorder);
 	print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;socid=".$socid, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "buying_price", "", "&amp;socid=".$socid, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;socid=".$socid, 'align="right"', $sortfield, $sortorder);
@@ -295,8 +292,7 @@ if ($result)
 			{
 				$marginRate = ($pa != 0) ?-1 * (100 * $marge / $pa) : '';
 				$markRate = ($pv != 0) ?-1 * (100 * $marge / $pv) : '';
-			}
-			else {
+			} else {
 				$marginRate = ($pa != 0) ? (100 * $marge / $pa) : '';
 				$markRate = ($pv != 0) ? (100 * $marge / $pv) : '';
 			}
@@ -310,8 +306,7 @@ if ($result)
 				print "</td>\n";
 				print "<td class=\"center\">";
 				print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
-		  	}
-		  	else {
+		  	} else {
 				$companystatic->id = $objp->socid;
 				$companystatic->name = $objp->name;
 				$companystatic->client = $objp->client;
@@ -363,8 +358,7 @@ if ($result)
 
 	print "</table>";
 	print '</div>';
-}
-else {
+} else {
 	dol_print_error($db);
 }
 $db->free($result);
diff --git a/htdocs/margin/lib/margins.lib.php b/htdocs/margin/lib/margins.lib.php
index 41618b174fa..fdfea1610bf 100644
--- a/htdocs/margin/lib/margins.lib.php
+++ b/htdocs/margin/lib/margins.lib.php
@@ -127,12 +127,10 @@ function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localta
 		if ($product->fetch_product_fournisseur_price($fk_pa))
 		{
 			$paht_ret = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
-		}
-		else {
+		} else {
 			$paht_ret = $paht;
 		}
-	}
-	else {
+	} else {
 		$paht_ret = $paht;
 	}
 
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 3e2fd804ff6..cb67cb0d58f 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -61,8 +61,7 @@ if (!$sortfield)
 	{
 		$sortfield = "f.datef";
 		$sortorder = "DESC";
-	}
-	else {
+	} else {
 	    $sortfield = "p.ref";
 	    $sortorder = "ASC";
 	}
@@ -112,8 +111,7 @@ if ($id > 0) {
 
     if (!$sortorder) $sortorder = "DESC";
     if (!$sortfield) $sortfield = "f.datef";
-}
-else {
+} else {
 	print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
 	print '<td class="maxwidthonsmartphone" colspan="4">';
 	$form->select_produits('', 'id', '', 20, 0, 1, 2, '', 1, array(), 0, 'All');
@@ -238,8 +236,7 @@ if ($result)
 	if ($id > 0) {
   		print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&amp;id=".$id, '', $sortfield, $sortorder);
   		print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;id=".$id, 'align="center"', $sortfield, $sortorder);
-  	}
-  	else {
+  	} else {
   		print_liste_field_titre("ProductService", $_SERVER["PHP_SELF"], "p.ref", "", "&amp;id=".$id, '', $sortfield, $sortorder);
   	}
 	print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;id=".$id, 'align="right"', $sortfield, $sortorder);
@@ -267,8 +264,7 @@ if ($result)
 			{
 				$marginRate = ($pa != 0) ?-1 * (100 * $marge / $pa) : '';
 				$markRate = ($pv != 0) ?-1 * (100 * $marge / $pv) : '';
-			}
-			else {
+			} else {
 				$marginRate = ($pa != 0) ? (100 * $marge / $pa) : '';
 				$markRate = ($pv != 0) ? (100 * $marge / $pv) : '';
 			}
@@ -282,8 +278,7 @@ if ($result)
 				print "</td>\n";
 				print "<td class=\"center\">";
 				print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
-			}
-			else {
+			} else {
 				print '<td>';
 				if ($objp->rowid > 0)
 				{
@@ -294,8 +289,7 @@ if ($result)
     				$product_static->entity = $objp->pentity;
     				$text = $product_static->getNomUrl(1);
     				print $text .= ' - '.$objp->label;
-				}
-				else {
+				} else {
 				    print img_object('', 'product').' '.$langs->trans("NotPredefinedProducts");
 				}
 				print "</td>\n";
@@ -339,8 +333,7 @@ if ($result)
 
 	print "</table>";
 	print '</div>';
-}
-else {
+} else {
 	dol_print_error($db);
 }
 $db->free($result);
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 489946e43fe..70cbf6a9e42 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -229,8 +229,7 @@ if ($id > 0 || !empty($ref))
                 {
                     $marginRate = ($cumul_achat != 0) ?-1 * (100 * $totalMargin / $cumul_achat) : '';
                     $markRate = ($cumul_vente != 0) ?-1 * (100 * $totalMargin / $cumul_vente) : '';
-                }
-                else {
+                } else {
                     $marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
                     $markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
                 }
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index c04537fa99e..c9711bd99ef 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -235,8 +235,7 @@ if ($socid > 0)
     	{
     		$marginRate = ($cumul_achat != 0) ?-1 * (100 * $totalMargin / $cumul_achat) : '';
     		$markRate = ($cumul_vente != 0) ?-1 * (100 * $totalMargin / $cumul_vente) : '';
-    	}
-    	else {
+    	} else {
     		$marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
     		$markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
     	}
@@ -253,8 +252,7 @@ if ($socid > 0)
     		print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
     	print '<td class="right">&nbsp;</td>';
     	print "</tr>\n";
-    }
-    else {
+    } else {
     	dol_print_error($db);
     }
     print "</table>";
@@ -262,8 +260,7 @@ if ($socid > 0)
 
     print '<br>';
     $db->free($result);
-}
-else {
+} else {
 	dol_print_error('', 'Parameter socid not defined');
 }
 
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 1ef1f9c1f50..e50539fd05b 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -160,20 +160,17 @@ if (!defined('NOREQUIREUSER')) {
  */
 
 // By default conf->entity is 1, but we change this if we ask another value.
-if (session_id() && !empty($_SESSION["dol_entity"]))			// Entity inside an opened session
-{
+if (session_id() && !empty($_SESSION["dol_entity"])) {
+	// Entity inside an opened session
 	$conf->entity = $_SESSION["dol_entity"];
-}
-elseif (!empty($_ENV["dol_entity"]))							// Entity inside a CLI script
-{
+} elseif (!empty($_ENV["dol_entity"])) {
+	// Entity inside a CLI script
 	$conf->entity = $_ENV["dol_entity"];
-}
-elseif (GETPOSTISSET("loginfunction") && GETPOST("entity", 'int'))	// Just after a login page
-{
+} elseif (GETPOSTISSET("loginfunction") && GETPOST("entity", 'int')) {
+	// Just after a login page
 	$conf->entity = GETPOST("entity", 'int');
-}
-elseif (defined('DOLENTITY') && is_numeric(DOLENTITY))			// For public page with MultiCompany module
-{
+} elseif (defined('DOLENTITY') && is_numeric(DOLENTITY)) {
+	// For public page with MultiCompany module
 	$conf->entity = DOLENTITY;
 }
 
diff --git a/htdocs/mrp/ajax/ajax_bom.php b/htdocs/mrp/ajax/ajax_bom.php
index d5c1355d361..57f1089c2e2 100644
--- a/htdocs/mrp/ajax/ajax_bom.php
+++ b/htdocs/mrp/ajax/ajax_bom.php
@@ -49,7 +49,6 @@ if ($result > 0)
 	unset($object->fields);
 	unset($object->db);
 	echo json_encode($object);
-}
-else {
+} else {
    	echo 'Failed to load category with id='.$idbom;
 }
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 5cf3d5798f8..404a3329133 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -421,14 +421,11 @@ class Mo extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				}
-				elseif (strpos($key, 'date') !== false) {
+				} elseif (strpos($key, 'date') !== false) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				}
-				elseif ($key == 'customsql') {
+				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				}
-				else {
+				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
@@ -582,8 +579,7 @@ class Mo extends CommonObject
 			setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			setEventMessages($this->error, $this->errors, 'errors');
 			$this->db->rollback();
 			return -1;
@@ -655,8 +651,7 @@ class Mo extends CommonObject
 								$error++;
 								$this->error = "BadValueForquantityToConsume";
 								break;
-							}
-							else {
+							} else {
 								$moline->fk_product = $line->fk_product;
 								$moline->role = 'toconsume';
 								$moline->position = $line->position;
@@ -762,14 +757,12 @@ class Mo extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else {
+			} else {
 				$this->error = $obj->error;
 				//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-		}
-		else {
+		} else {
 			print $langs->trans("Error")." ".$langs->trans("Error_MRP_MO_ADDON_NotDefined");
 			return "";
 		}
@@ -814,8 +807,7 @@ class Mo extends CommonObject
 		{
 			$this->fetch_product();
 			$num = $this->getNextNumRef($this->product);
-		}
-		else {
+		} else {
 			$num = $this->ref;
 		}
 		$this->newref = $num;
@@ -896,8 +888,7 @@ class Mo extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1024,8 +1015,7 @@ class Mo extends CommonObject
             }
             $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -1141,8 +1131,7 @@ class Mo extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -1175,8 +1164,7 @@ class Mo extends CommonObject
 	        $this->error = $this->error;
 	        $this->errors = $this->errors;
 	        return $result;
-	    }
-	    else {
+	    } else {
 	        $this->lines = $result;
 	        return $this->lines;
 	    }
@@ -1322,8 +1310,7 @@ class Mo extends CommonObject
 			$productstatic->fetch($line->fk_product);
 			$this->tpl['label'] .= $productstatic->getNomUrl(1);
 			//$this->tpl['label'].= ' - '.$productstatic->label;
-		}
-		else {
+		} else {
 			// If origin MRP line is not a product, but another MRP
 			// TODO
 		}
@@ -1506,14 +1493,11 @@ class MoLine extends CommonObjectLine
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				}
-				elseif (strpos($key, 'date') !== false) {
+				} elseif (strpos($key, 'date') !== false) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				}
-				elseif ($key == 'customsql') {
+				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				}
-				else {
+				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
diff --git a/htdocs/mrp/index.php b/htdocs/mrp/index.php
index e05a93494f3..d4359dcae90 100644
--- a/htdocs/mrp/index.php
+++ b/htdocs/mrp/index.php
@@ -136,8 +136,7 @@ if ($conf->use_javascript_ajax)
     	print "</div>";
 
     	print "<br>";
-    }
-    else {
+    } else {
     	dol_print_error($db);
     }
 }
@@ -194,8 +193,7 @@ if ($resql)
 	}
 	print "</table></div>";
 	print "<br>";
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -246,8 +244,7 @@ if ($resql)
     }
     print "</table></div>";
     print "<br>";
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php
index 5b18f18d1ca..6630688b64a 100644
--- a/htdocs/mrp/mo_agenda.php
+++ b/htdocs/mrp/mo_agenda.php
@@ -48,8 +48,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else {
+} else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -215,8 +214,7 @@ if ($object->id > 0)
     	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
     	{
         	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
-    	}
-    	else {
+    	} else {
         	print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
     	}
     }
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index eda7d0c30ca..a4ab216156c 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -192,8 +192,7 @@ if (empty($reshook))
 
     			$object->generateDocument($model, $outputlangs, 0, 0, 0);
     		}
-    	}
-    	else {
+    	} else {
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
@@ -623,8 +622,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    		if ($permissiontoadd)
 	    		{
 	    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-	    		}
-	    		else {
+	    		} else {
 	    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
 	    		}
     		}
@@ -637,8 +635,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    			if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0))
 	    		    {
 	    		        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
-	    		    }
-	    		    else {
+	    		    } else {
 	    		    	$langs->load("errors");
 	    		        print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
 	    		    }
@@ -672,8 +669,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd))
     		{
     			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete">'.$langs->trans('Delete').'</a>'."\n";
-    		}
-    		else {
+    		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
     		}
     	}
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index 9ed658ab1c1..86aefd8a5d5 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -183,8 +183,7 @@ if ($object->id)
 	$relativepathwithnofile = 'mo/'.dol_sanitizeFileName($object->ref).'/';
 
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 9866dabf8e0..64441a4fec9 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -279,8 +279,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else {
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -415,8 +414,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		}
-		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 6c800446595..b168371c0ea 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -352,8 +352,7 @@ if (empty($reshook))
 	    				}
 	    			}
 	    		}
-    		}
-    		else {
+    		} else {
     			$consumptioncomplete = false;
     			$productioncomplete = false;
     		}
@@ -406,8 +405,7 @@ if (empty($reshook))
 
     			$object->generateDocument($model, $outputlangs, 0, 0, 0);
     		}
-    	}
-    	else {
+    	} else {
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
@@ -591,8 +589,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0))
 					{
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
-					}
-					else {
+					} else {
 						$langs->load("errors");
 						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
 					}
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index 50bd5d6cdcf..27bf6dc1c8f 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -409,8 +409,7 @@ class MultiCurrency extends CommonObject
 		{
 			$this->rate = $currencyRate;
 			return 1;
-		}
-		else {
+		} else {
 			$this->rate = null;
 			$this->errors = $currencyRate->errors;
 			return -1;
@@ -562,8 +561,7 @@ class MultiCurrency extends CommonObject
         {
             if ($way == 'dolibarr') return $amount * $multicurrency_tx;
             else return $amount / $multicurrency_tx;
-        }
-        else return $amount;
+        } else return $amount;
     }
 
 	/**
@@ -657,8 +655,7 @@ class MultiCurrency extends CommonObject
 					if ($obj->fetch(null, $code) > 0)
 					{
 						$obj->updateRate($rate);
-					}
-					elseif ($addifnotfound)
+					} elseif ($addifnotfound)
 					{
 						self::addRateFromDolibarr($code, $rate);
 					}
@@ -666,8 +663,7 @@ class MultiCurrency extends CommonObject
 			}
 
 			return 1;
-        }
-		else {
+        } else {
 		    dol_syslog("Failed to call endpoint ".$response->error->info, LOG_WARNING);
 			setEventMessages($langs->trans('multicurrency_syncronize_error', $response->error->info), null, 'errors');
 
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 1a794ac76d9..7322c70780c 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -241,8 +241,7 @@ print $langs->trans("Title").'</td><td colspan="2">';
 if ($action == 'edit')
 {
 	print '<input type="text" name="nouveautitre" style="width: 95%" value="'.dol_escape_htmltag(dol_htmlentities($object->titre)).'">';
-}
-else print dol_htmlentities($object->titre);
+} else print dol_htmlentities($object->titre);
 print '</td></tr>';
 
 // Description
@@ -251,8 +250,7 @@ if ($action == 'edit')
 {
 	$doleditor = new DolEditor('nouveauxcommentaires', $object->description, '', 120, 'dolibarr_notes', 'In', 1, 1, 1, ROWS_7, '90%');
 	$doleditor->Create(0, '');
-}
-else {
+} else {
 	print (dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true));
 }
 print '</td></tr>';
@@ -264,8 +262,7 @@ if (!$object->fk_user_creat) {
 	if ($action == 'edit')
 	{
 		print '<input type="text" name="nouvelleadresse" class="minwith200" value="'.$object->mail_admin.'">';
-	}
-	else print dol_print_email($object->mail_admin, 0, 0, 1);
+	} else print dol_print_email($object->mail_admin, 0, 0, 1);
 	print '</td></tr>';
 }
 
@@ -274,8 +271,7 @@ print '<tr><td>'.$langs->trans('ToReceiveEMailForEachVote').'</td><td colspan="2
 if ($action == 'edit')
 {
 	print '<input type="checkbox" name="mailsonde" '.($object->mailsonde ? 'checked="checked"' : '').'">';
-}
-else {
+} else {
 	print yn($object->mailsonde);
 
 	//If option is active and linked user does not have an email, we show a warning
@@ -292,8 +288,7 @@ print '<tr><td>'.$langs->trans('CanComment').'</td><td colspan="2">';
 if ($action == 'edit')
 {
 	print '<input type="checkbox" name="cancomment" '.($object->allow_comments ? 'checked="checked"' : '').'">';
-}
-else print yn($object->allow_comments);
+} else print yn($object->allow_comments);
 print '</td></tr>';
 
 // Users can see others vote
@@ -301,8 +296,7 @@ print '<tr><td>'.$langs->trans('CanSeeOthersVote').'</td><td colspan="2">';
 if ($action == 'edit')
 {
 	print '<input type="checkbox" name="canseeothersvote" '.($object->allow_spy ? 'checked="checked"' : '').'">';
-}
-else print yn($object->allow_spy);
+} else print yn($object->allow_spy);
 print '</td></tr>';
 
 // Expire date
@@ -407,8 +401,7 @@ if ($comments) {
 
 		print dol_htmlentities($comment->usercomment).': '.dol_nl2br(dol_htmlentities($comment->comment))." <br>";
 	}
-}
-else {
+} else {
 	print $langs->trans("NoCommentYet").'<br>';
 }
 
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index f7541f2ebe0..19a29f5fa71 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -199,8 +199,7 @@ class Opensurveysondage extends CommonObject
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else {
+        } else {
             $this->db->commit();
             return $this->id;
         }
@@ -261,8 +260,7 @@ class Opensurveysondage extends CommonObject
 
                 $this->date_m = $this->db->jdate($obj->tls);
                 $ret = 1;
-            }
-            else {
+            } else {
                 $sondage = ($id ? 'id='.$id : 'sondageid='.$numsurvey);
                 $this->error = 'Fetch no poll found for '.$sondage;
                 dol_syslog($this->error, LOG_ERR);
@@ -270,8 +268,7 @@ class Opensurveysondage extends CommonObject
             }
 
             $this->db->free($resql);
-        }
-        else {
+        } else {
               $this->error = "Error ".$this->db->lasterror();
             $ret = -1;
         }
@@ -339,8 +336,7 @@ class Opensurveysondage extends CommonObject
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -404,8 +400,7 @@ class Opensurveysondage extends CommonObject
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -453,8 +448,7 @@ class Opensurveysondage extends CommonObject
             }
             $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $linkstart = '<a href="'.$url.'"';
         $linkstart .= $linkclose.'>';
@@ -495,8 +489,7 @@ class Opensurveysondage extends CommonObject
                 $ret[] = $tmp;
                 $i++;
             }
-        }
-        else dol_print_error($this->db);
+        } else dol_print_error($this->db);
 
         $this->lines = $ret;
 
diff --git a/htdocs/opensurvey/exportcsv.php b/htdocs/opensurvey/exportcsv.php
index 2125ac76774..6f9a699273b 100644
--- a/htdocs/opensurvey/exportcsv.php
+++ b/htdocs/opensurvey/exportcsv.php
@@ -108,13 +108,11 @@ if ($resql)
 			{
 				$input .= 'OK;';
 				$somme[$k]++;
-			}
-			elseif ($car == "2")
+			} elseif ($car == "2")
 			{
 				$input .= 'KO;';
 				$somme[$k]++;
-			}
-			else {
+			} else {
 				$input .= ';';
 			}
 		}
@@ -122,8 +120,7 @@ if ($resql)
 		$input .= "\r\n";
 		$i++;
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 $filesize = strlen($input);
diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php
index 2fa067ba9a3..635fc3ceb5c 100644
--- a/htdocs/opensurvey/fonctions.php
+++ b/htdocs/opensurvey/fonctions.php
@@ -103,8 +103,7 @@ function llxHeaderSurvey($title, $head = "", $disablejs = 0, $disablehead = 0, $
 		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
 		$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
 		$width = 150;
-	}
-	elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+	} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 	{
 		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
 		$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
diff --git a/htdocs/opensurvey/index.php b/htdocs/opensurvey/index.php
index 20609602ad2..50198e5202f 100644
--- a/htdocs/opensurvey/index.php
+++ b/htdocs/opensurvey/index.php
@@ -52,8 +52,7 @@ if ($resql)
 {
 	$obj = $db->fetch_object($resql);
 	$nbsondages = $obj->nb;
-}
-else dol_print_error($db, '');
+} else dol_print_error($db, '');
 
 
 $title = $langs->trans("OpenSurveyArea");
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 918c8e20ef9..4fcbb93a18c 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -190,8 +190,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else {
+} else {
     $sql .= $db->plimit($limit + 1, $offset);
 
     $resql = $db->query($sql);
@@ -356,8 +355,7 @@ while ($i < min($num, $limit))
 	{
 		$obj2 = $db->fetch_object($resql2);
 		$nbuser = $obj2->nb;
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	$opensurvey_static->id = $obj->rowid;
 	$opensurvey_static->ref = $obj->rowid;
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index c86c6919f00..59f605daf31 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -70,12 +70,10 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 			if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1')
 			{
 				$nouveauchoix .= "1";
-			}
-			elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
+			} elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
 			{
 				$nouveauchoix .= "2";
-			}
-			else { // sinon c'est 0
+			} else { // sinon c'est 0
 				$nouveauchoix .= "0";
 			}
 		}
@@ -93,8 +91,7 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 		{
 			setEventMessages($langs->trans("VoteNameAlreadyExists"), null, 'errors');
 			$error++;
-		}
-		else {
+		} else {
 			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'opensurvey_user_studs (nom, id_sondage, reponses)';
 			$sql .= " VALUES ('".$db->escape($nom)."', '".$db->escape($numsondage)."','".$db->escape($nouveauchoix)."')";
 			$resql = $db->query($sql);
@@ -134,12 +131,10 @@ if ($testmodifier)
 		if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1')
 		{
 			$nouveauchoix .= "1";
-		}
-		elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
+		} elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
 		{
 			$nouveauchoix .= "2";
-		}
-		else { // sinon c'est 0
+		} else { // sinon c'est 0
 			$nouveauchoix .= "0";
 		}
 	}
@@ -260,8 +255,7 @@ if (isset($_POST["ajoutercolonne"]) && $object->format == "D")
 		}
 
 		$adresseadmin = $object->mail_admin;
-	}
-	else {
+	} else {
 		$erreur_ajout_date = "yes";
 	}
 }
@@ -449,8 +443,7 @@ print $langs->trans("Title").'</td><td colspan="2">';
 if ($action == 'edit')
 {
 	print '<input type="text" name="nouveautitre" size="40" value="'.dol_escape_htmltag(dol_htmlentities($object->titre)).'">';
-}
-else print dol_htmlentities($object->titre);
+} else print dol_htmlentities($object->titre);
 print '</td></tr>';
 
 // Expire date
@@ -533,8 +526,7 @@ if (GETPOST('ajoutsujet'))
 		print ' &nbsp; &nbsp; ';
 		print '<input type="submit" class="button" name="retoursondage" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 		print '<br><br>'."\n";
-	}
-	else {
+	} else {
 		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 		$formother = new FormOther($db);
@@ -749,8 +741,7 @@ if ($object->format == "D")
 
 		print '</tr>'."\n";
 	}
-}
-else {
+} else {
 	// Show titles
 	print '<tr>'."\n";
 	print '<td></td>'."\n";
@@ -836,8 +827,7 @@ while ($compteur < $num)
 				if (((string) $car) == "0") $sumagainst[$i]++;
 			}
 		}
-	}
-	else {
+	} else {
 		//sinon on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs
 		if ($compteur == $ligneamodifier)
 		{
@@ -863,8 +853,7 @@ while ($compteur < $num)
 				}
 				print '</td>'."\n";
 			}
-		}
-		else {
+		} else {
 			for ($i = 0; $i < $nbcolonnes; $i++)
 			{
 				$car = substr($ensemblereponses, $i, 1);
@@ -1058,8 +1047,7 @@ for ($i = 0; $i < $nbcolonnes; $i++)
 			} else {
 				$meilleursujet .= dol_print_date($toutsujet[$i], 'daytext').($toutsujet[$i] ? ' ('.dol_print_date($toutsujet[$i], '%A').')' : '');
 			}
-		}
-		else {
+		} else {
 			$tmps = explode('@', $toutsujet[$i]);
 			$meilleursujet .= dol_htmlentities($tmps[0]);
 		}
diff --git a/htdocs/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php
index 4254199ec96..17d60d4a406 100644
--- a/htdocs/opensurvey/wizard/choix_date.php
+++ b/htdocs/opensurvey/wizard/choix_date.php
@@ -209,8 +209,7 @@ llxHeader('', $langs->trans("OpenSurvey"), "", '', 0, 0, $arrayofjs, $arrayofcss
 if (!isset($_SESSION["nbrecaseshoraires"]))
 {
 	$_SESSION["nbrecaseshoraires"] = 5;
-}
-elseif (GETPOST('ajoutcases') && $_SESSION["nbrecaseshoraires"] == 5)
+} elseif (GETPOST('ajoutcases') && $_SESSION["nbrecaseshoraires"] == 5)
 {
 	$_SESSION["nbrecaseshoraires"] = 10;
 }
@@ -319,8 +318,7 @@ $premierjourmois = date("N", mktime(0, 0, 0, $_SESSION["mois"], 1, $_SESSION["an
 if (is_integer($_SESSION["mois"]) && $_SESSION["mois"] > 0 && $_SESSION["mois"] < 13)
 {
 	$motmois = dol_print_date(mktime(0, 0, 0, $_SESSION["mois"], 10), '%B');
-}
-else {
+} else {
 	$motmois = dol_print_date(dol_now(), '%B');
 }
 
diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
index 9752a4c43c4..5d7363b4c9f 100644
--- a/htdocs/opensurvey/wizard/create_survey.php
+++ b/htdocs/opensurvey/wizard/create_survey.php
@@ -88,8 +88,7 @@ if (GETPOST("creation_sondage_date") || GETPOST("creation_sondage_autre"))
 		{
 			$testdate = true;
 			$_SESSION['champdatefin'] = dol_print_date($champdatefin, 'dayrfc');
-		}
-		else {
+		} else {
 			$testdate = true;
 			$_SESSION['champdatefin'] = dol_print_date($champdatefin, 'dayrfc');
 			//$testdate = false;
@@ -191,8 +190,7 @@ if (GETPOST('choix_sondage'))
 	else print '<input type="hidden" name="creation_sondage_autre" value="autre">';
 	print '<input type="hidden" name="choix_sondage" value="'.GETPOST('choix_sondage').'">';
 	print '<br><input type="submit" class="button" name="submit" value="'.$langs->trans("CreatePoll").' ('.(GETPOST('choix_sondage') == 'date' ? $langs->trans("TypeDate") : $langs->trans("TypeClassic")).')">';
-}
-else {
+} else {
 	// Show image to selecte between date survey or other survey
 	print '<br><table>'."\n";
 	print '<tr><td>'.$langs->trans("CreateSurveyDate").'</td><td></td> '."\n";
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index 5e21326062c..cb1ad560158 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -79,8 +79,7 @@ if ($action == 'setvalue' && $user->admin)
   	{
   		$db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-  	}
-  	else {
+  	} else {
   		$db->rollback();
 		dol_print_error($db);
     }
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 94dff45e543..71f4b25829b 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -79,8 +79,7 @@ if ($action == 'setvalue' && $user->admin)
   	{
   		$db->commit();
   		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-  	}
-  	else {
+  	} else {
   		$db->rollback();
 		dol_print_error($db);
     }
@@ -94,8 +93,7 @@ if ($action == "setlive")
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -149,8 +147,7 @@ if (empty($conf->global->PAYPAL_API_SANDBOX))
 {
     print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=0">';
     print img_picto($langs->trans("Activated"), 'switch_on');
-}
-else {
+} else {
     print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=1">';
     print img_picto($langs->trans("Disabled"), 'switch_off');
 }
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 6da045aaf4f..18ebce49479 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -259,8 +259,7 @@ function print_paypal_redirect($paymentAmount, $currencyCodeType, $paymentType,
         $payPalURL = $API_Url.$token;
         header("Location: ".$payPalURL);
         exit;
-    }
-    else {
+    } else {
         //Display a user friendly Error on the page using any of the following error information returned by PayPal
         $ErrorCode = urldecode($resArray["L_ERRORCODE0"]);
         $ErrorShortMsg = urldecode($resArray["L_SHORTMESSAGE0"]);
@@ -270,8 +269,7 @@ function print_paypal_redirect($paymentAmount, $currencyCodeType, $paymentType,
         if ($ErrorCode == 10729)
         {
         	$mesg .= "PayPal can't accept payments for this thirdparty. An address is defined but is not complete (missing State).<br>Ask system administrator to fix address or to setup Paypal module to accept payments even on not complete addresses (remove option PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS).<br>\n";
-        }
-        else {
+        } else {
         	$mesg = $langs->trans('SetExpressCheckoutAPICallFailed')."<br>\n";
         	$mesg .= $langs->trans('DetailedErrorMessage').": ".$ErrorLongMsg."<br>\n";
         	$mesg .= $langs->trans('ShortErrorMessage').": ".$ErrorShortMsg."<br>\n";
@@ -345,8 +343,7 @@ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType,
     if (empty($conf->global->PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS))
     {
     	$nvpstr = $nvpstr."&NOSHIPPING=1"; // An empty or not complete shipping address will be accepted
-    }
-    else {
+    } else {
     	$nvpstr = $nvpstr."&NOSHIPPING=0"; // A valid shipping address is required (full required fields mandatory)
     }
     $nvpstr = $nvpstr."&SOLUTIONTYPE=".urlencode($solutionType);
@@ -589,8 +586,7 @@ function hash_call($methodName, $nvpStr)
 	{
 	    $API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
 	    $API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
-	}
-	else {
+	} else {
 	    $API_Endpoint = "https://api-3t.paypal.com/nvp";
 	    $API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
 	}
@@ -668,8 +664,7 @@ function hash_call($methodName, $nvpStr)
         $_SESSION['curl_error_msg'] = curl_error($ch);
 
         //Execute the Error handling module to display errors.
-    }
-    else {
+    } else {
         //closing the curl
         curl_close($ch);
     }
diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php
index 1c495bdb5ae..5fbe0f6e9cd 100644
--- a/htdocs/paypal/lib/paypalfunctions.lib.php
+++ b/htdocs/paypal/lib/paypalfunctions.lib.php
@@ -52,8 +52,7 @@ if (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'alpha'
 {
 	$API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
 	$API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
-}
-else {
+} else {
 	$API_Endpoint = "https://api-3t.paypal.com/nvp";
 	$API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
 }
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index 5282684f81f..02fd4545c84 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -73,8 +73,7 @@ if ($action == 'setconst' && $user->admin)
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null);
-    }
-    else {
+    } else {
         $db->rollback();
         dol_print_error($db);
     }
@@ -92,8 +91,7 @@ if ($action == 'setvalue' && $user->admin)
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null);
-    }
-    else {
+    } else {
         $db->rollback();
         dol_print_error($db);
     }
@@ -159,8 +157,7 @@ if ($mode == 'setup' && $user->admin)
                     if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS')
                     {
                         print $langs->trans("IsTokenGenerated");
-                    }
-                    else {
+                    } else {
                         print $langs->trans($key['varname']);
                     }
                     print '</td>';
@@ -196,8 +193,7 @@ if ($mode == 'setup' && $user->admin)
                 $storage = new DoliStorage($db, $conf);
                 try {
                     $tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME_GOOGLE);
-                }
-                catch (Exception $e)
+                } catch (Exception $e)
                 {
                     // Return an error if token not found
                 }
@@ -263,13 +259,11 @@ if ($mode == 'config' && $user->admin)
         if (!empty($conf->use_javascript_ajax))
         {
             print ajax_constantonoff($printer->active);
-        }
-        else {
+        } else {
             if (empty($conf->global->{$printer->conf}))
             {
                 print '<a href="'.$_SERVER['PHP_SELF'].'?action=setvalue&amp;varname='.$printer->active.'&amp;value=1">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-            }
-            else {
+            } else {
                 print '<a href="'.$_SERVER['PHP_SELF'].'?action=setvalue&amp;varname='.$printer->active.'&amp;value=0">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
             }
         }
@@ -303,8 +297,7 @@ if ($mode == 'test' && $user->admin)
             } else {
                 setEventMessages($printer->error, $printer->errors, 'errors');
             }
-        }
-        else {
+        } else {
             print $langs->trans('PleaseConfigureDriverfromList');
         }
     } else {
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index a1077a4f845..752ddecbea8 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -182,8 +182,7 @@ if ($action != 'create_updater' && $action != 'edit_updater')
 	        print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_variable&selection='.$entry->id.'">'.img_delete().'</a></td>';
 	        print '</tr>';
 	    }
-    }
-    else {
+    } else {
     	print '<tr colspan="7"><td class="opacitymedium">';
     	print $langs->trans("None");
     	print '</td></tr>';
@@ -274,8 +273,7 @@ if ($action != 'create_variable' && $action != 'edit_variable')
 	        print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_updater&selection='.$entry->id.'">'.img_delete().'</a></td>';
 	        print '</tr>';
 	    }
-    }
-    else {
+    } else {
     	print '<tr><td colspan="7" class="opacitymedium">';
     	print $langs->trans("None");
     	print '</td></tr>';
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 8ac181e64c9..23b1cb43f56 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -81,8 +81,7 @@ if ($action == 'setcodeproduct')
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -110,16 +109,14 @@ if ($action == 'other')
 				$res = dolibarr_set_const($db, 'PRODUIT_CUSTOMER_PRICES_BY_QTY', 0, 'chaine', 0, '', $conf->entity);
 				$res = dolibarr_set_const($db, 'PRODUIT_CUSTOMER_PRICES', 0, 'chaine', 0, '', $conf->entity);
 				dolibarr_set_const($db, 'PRODUCT_PRICE_UNIQ', 1, 'chaine', 0, '', $conf->entity);
-			}
-			else {
+			} else {
 				$multirule = explode('&', $princingrules);
 				foreach ($multirule as $rulesselected)
 				{
 					$res = dolibarr_set_const($db, $rulesselected, 1, 'chaine', 0, '', $conf->entity);
 				}
 			}
-		}
-		else // We clear this mode
+		} else // We clear this mode
 		{
 			if (strpos($rule, '&') === false) {
 				$res = dolibarr_set_const($db, $rule, 0, 'chaine', 0, '', $conf->entity);
@@ -199,13 +196,11 @@ if ($action == 'specimen') // For products
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=product&file=SPECIMEN.pdf");
 			return;
-		}
-		else {
+		} else {
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -266,8 +261,7 @@ if ($action)
     if (!$error)
     {
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
 	    setEventMessages($langs->trans("SetupNotError"), null, 'errors');
     }
 }
@@ -284,8 +278,7 @@ if (empty($conf->product->enabled))
 {
 	$title = $langs->trans('ServiceSetup');
 	$tab = $langs->trans('Services');
-}
-elseif (empty($conf->service->enabled))
+} elseif (empty($conf->service->enabled))
 {
 	$title = $langs->trans('ProductSetup');
 	$tab = $langs->trans('Products');
@@ -333,8 +326,7 @@ foreach ($dirproduct as $dirroot)
 
     			try {
         			dol_include_once($dirroot.$file.'.php');
-    			}
-    			catch (Exception $e)
+    			} catch (Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
@@ -356,8 +348,7 @@ foreach ($dirproduct as $dirroot)
     				print '<td class="center">'."\n";
     				print img_picto($langs->trans("Activated"), 'switch_on');
     				print "</td>\n";
-    			}
-    			else {
+    			} else {
     				$disabled = false;
     				if (!empty($conf->multicompany->enabled) && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true);
     				print '<td class="center">';
@@ -397,8 +388,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -468,8 +458,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -480,8 +469,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->PRODUCT_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -507,8 +495,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
-	                            }
-	                            else {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -561,8 +548,7 @@ print '<tr class="oddeven">';
 if (empty($conf->multicompany->enabled))
 {
 	print '<td>'.$langs->trans("PricingRule").'</td>';
-}
-else {
+} else {
 	print '<td>'.$form->textwithpicto($langs->trans("PricingRule"), $langs->trans("SamePriceAlsoForSharedCompanies"), 1).'</td>';
 }
 print '<td width="60" class="right">';
@@ -605,8 +591,7 @@ if (empty($conf->use_javascript_ajax))
 	print '<td class="nowrap right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print '</td>';
-}
-else {
+} else {
 	print '<td width="60" class="right">';
 	$arrval = array(
 		'0'=>$langs->trans("No"),
@@ -730,8 +715,7 @@ if (!empty($conf->global->PRODUCT_CANVAS_ABILITY))
     						print img_picto($langs->trans("Active"), 'tick');
     						print '</td><td class="right">';
     						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;spe='.$file.'&amp;value=0">'.$langs->trans("Disable").'</a>';
-    					}
-    					else {
+    					} else {
     						print '&nbsp;</td><td class="right">';
     						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;spe='.$file.'&amp;value=1">'.$langs->trans("Activate").'</a>';
     					}
@@ -742,8 +726,7 @@ if (!empty($conf->global->PRODUCT_CANVAS_ABILITY))
     		}
 		    closedir($handle);
         }
-	}
-	else {
+	} else {
 		setEventMessages($dir.' '.$langs->trans("IsNotADir"), null, 'errors');
 	}
 }
diff --git a/htdocs/product/admin/product_extrafields.php b/htdocs/product/admin/product_extrafields.php
index 7814c3bcda8..1e67a1d469a 100644
--- a/htdocs/product/admin/product_extrafields.php
+++ b/htdocs/product/admin/product_extrafields.php
@@ -65,8 +65,7 @@ if (empty($conf->product->enabled))
 {
 	$title = $langs->trans('ServiceSetup');
 	$textobject = $langs->trans('Services');
-}
-elseif (empty($conf->service->enabled))
+} elseif (empty($conf->service->enabled))
 {
 	$title = $langs->trans('ProductSetup');
 	$textobject = $langs->trans('Products');
diff --git a/htdocs/product/admin/product_supplier_extrafields.php b/htdocs/product/admin/product_supplier_extrafields.php
index d35e6012e1f..b400843ab5c 100644
--- a/htdocs/product/admin/product_supplier_extrafields.php
+++ b/htdocs/product/admin/product_supplier_extrafields.php
@@ -66,8 +66,7 @@ if (empty($conf->product->enabled))
 {
 	$title = $langs->trans('ServiceSetup');
 	$textobject = $langs->trans('Services');
-}
-elseif (empty($conf->service->enabled))
+} elseif (empty($conf->service->enabled))
 {
 	$title = $langs->trans('ProductSetup');
 	$textobject = $langs->trans('Products');
diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php
index 898d23ae8fb..ce7bcf733a5 100644
--- a/htdocs/product/admin/product_tools.php
+++ b/htdocs/product/admin/product_tools.php
@@ -120,8 +120,7 @@ if ($action == 'convert')
 							{
 								$newprice = price2num($objectstatic->multiprices_ttc[$level], 'MU'); // Second param must be MU (we want a unit price so 'MU'. If unit price was on 4 decimal, we must keep 4 decimals)
 								$newminprice = $objectstatic->multiprices_min_ttc[$level];
-							}
-							else {
+							} else {
 								$newprice = price2num($objectstatic->multiprices[$level], 'MU'); // Second param must be MU (we want a unit price so 'MU'. If unit price was on 4 decimal, we must keep 4 decimals)
 								$newminprice = $objectstatic->multiprices_min[$level];
 							}
@@ -150,8 +149,7 @@ if ($action == 'convert')
 						{
 							$newprice = price2num($objectstatic->price_ttc, 'MU'); // Second param must be MU (we want a unit price so 'MU'. If unit price was on 4 decimal, we must keep 4 decimals)
 							$newminprice = $objectstatic->price_min_ttc;
-						}
-						else {
+						} else {
 							$newprice = price2num($objectstatic->price, 'MU'); // Second param must be MU (we want a unit price so 'MU'. If unit price was on 4 decimal, we must keep 4 decimals)
 							$newminprice = $objectstatic->price_min;
 						}
@@ -174,8 +172,7 @@ if ($action == 'convert')
 
 					$i++;
 				}
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 		}
 
 		$fourn = new Fournisseur($db);
@@ -243,14 +240,12 @@ if ($action == 'convert')
 
 				$i++;
 			}
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 		}
 
@@ -259,8 +254,7 @@ if ($action == 'convert')
 		{
 			if ($nbrecordsmodified > 0) setEventMessages($langs->trans("RecordsModified", $nbrecordsmodified), null, 'mesgs');
 			else setEventMessages($langs->trans("NoRecordFound"), null, 'warnings');
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
@@ -285,8 +279,7 @@ if (empty($mysoc->country_code))
 	$langs->load("errors");
 	$warnpicto = img_error($langs->trans("WarningMandatorySetupNotComplete"));
 	print '<br><a href="'.DOL_URL_ROOT.'/admin/company.php?mainmenu=home">'.$warnpicto.' '.$langs->trans("WarningMandatorySetupNotComplete").'</a>';
-}
-else {
+} else {
 	print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'" />';
 	print '<input type="hidden" name="action" value="convert" />';
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index 3d0dc302283..acd698d9f37 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -40,8 +40,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else {
+} else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 219e68171d2..f206d868347 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -162,8 +162,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 	}
 
 	echo json_encode($outjson);
-}
-else {
+} else {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 	$langs->loadLangs(array("main", "products"));
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index da99efc337d..c14bfaf5e74 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -287,8 +287,7 @@ class ActionsCardProduct
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db, $sql);
 		}
 	}
@@ -406,14 +405,12 @@ class ActionsCardProduct
 							$this->type 	= $obj->fk_product_type;
 							$this->entity = $obj->entity;
 							$datas[$alias] = $this->getNomUrl(1, '', 24);
-						}
-						elseif ($alias == 'stock')
+						} elseif ($alias == 'stock')
 						{
 							$this->load_stock();
 							if ($this->stock_reel < $obj->seuil_stock_alerte) $datas[$alias] = $this->stock_reel.' '.img_warning($langs->trans("StockTooLow"));
 							else $datas[$alias] = $this->stock_reel;
-						}
-						elseif ($alias == 'label')	$datas[$alias] = dol_trunc($obj->$alias, 40);
+						} elseif ($alias == 'label')	$datas[$alias] = dol_trunc($obj->$alias, 40);
 						elseif (preg_match('/price/i', $alias))	$datas[$alias] = price($obj->$alias);
 						elseif ($alias == 'datem') $datas[$alias] = dol_print_date($this->db->jdate($obj->$alias), 'day');
 						elseif ($alias == 'status') $datas[$alias] = $this->LibStatut($obj->$alias, 5);
@@ -426,8 +423,7 @@ class ActionsCardProduct
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index aaf9b584068..0518cfed475 100644
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -205,8 +205,7 @@ class ActionsCardService
 			if ($this->object->duration_value > 1)
 			{
 				$dur = array("h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
-			}
-			elseif ($this->object->duration_value > 0)
+			} elseif ($this->object->duration_value > 0)
 			{
 				$dur = array("h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
 			}
@@ -267,8 +266,7 @@ class ActionsCardService
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db, $sql);
 		}
 	}
@@ -359,8 +357,7 @@ class ActionsCardService
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			print $sql;
 		}
 	}
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index bd18737bd6b..657add84bd1 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -174,8 +174,7 @@ if (empty($reshook))
 	    	$result = $object->setValueFrom('barcode', GETPOST('barcode'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');
 	    	header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 	    	exit;
-		}
-		else {
+		} else {
 			$langs->load("errors");
         	if ($result == -1) $errors[] = 'ErrorBadBarCodeSyntax';
         	elseif ($result == -2) $errors[] = 'ErrorBarCodeRequired';
@@ -336,8 +335,7 @@ if (empty($reshook))
                     {
                         $object->multiprices["$i"] = price2num($_POST["price_".$i], 'MU');
                         $object->multiprices_base_type["$i"] = $_POST["multiprices_base_type_".$i];
-                    }
-                    else {
+                    } else {
                         $object->multiprices["$i"] = "";
                     }
                 }
@@ -364,13 +362,11 @@ if (empty($reshook))
 					if (preg_match('/\?/', $backtopage)) $backtopage .= '&socid='.$object->id; // Old method
 					header("Location: ".$backtopage);
 					exit;
-				}
-				else {
+				} else {
                 	header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
                 	exit;
 				}
-            }
-            else {
+            } else {
             	if (count($object->errors)) setEventMessages($object->error, $object->errors, 'errors');
 				else setEventMessages($langs->trans($object->error), null, 'errors');
                 $action = "create";
@@ -384,8 +380,7 @@ if (empty($reshook))
     	if (GETPOST('cancel', 'alpha'))
         {
             $action = '';
-        }
-        else {
+        } else {
             if ($object->id > 0)
             {
 				$object->oldcopy = clone $object;
@@ -481,14 +476,12 @@ if (empty($reshook))
 						$object->setCategories($categories);
 
                         $action = 'view';
-                    }
-                    else {
+                    } else {
 						if (count($object->errors)) setEventMessages($object->error, $object->errors, 'errors');
                     	else setEventMessages($langs->trans($object->error), null, 'errors');
                         $action = 'edit';
                     }
-                }
-                else {
+                } else {
 					if (count($object->errors)) setEventMessages($object->error, $object->errors, 'errors');
                 	else setEventMessages($langs->trans("ErrorProductBadRefOrLabel"), null, 'errors');
                     $action = 'edit';
@@ -504,8 +497,7 @@ if (empty($reshook))
         if (!GETPOST('clone_content') && !GETPOST('clone_prices'))
         {
         	setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-        }
-        else {
+        } else {
             $db->begin();
 
             $originalId = $id;
@@ -567,8 +559,7 @@ if (empty($reshook))
 
                         header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
                         exit;
-                    }
-                    else {
+                    } else {
                         $id = $originalId;
 
                         if ($object->error == 'ErrorProductAlreadyExists')
@@ -582,15 +573,13 @@ if (empty($reshook))
                             $mesg .= ' <a href="'.$_SERVER["PHP_SELF"].'?ref='.$object->ref.'">'.$langs->trans("ShowCardHere").'</a>.';
                             setEventMessages($mesg, null, 'errors');
                             $object->fetch($id);
-                        }
-                        else {
+                        } else {
                             $db->rollback();
                             if (count($object->errors))
                             {
                             	setEventMessages($object->error, $object->errors, 'errors');
                             	dol_print_error($db, $object->errors);
-                            }
-                            else {
+                            } else {
                             	setEventMessages($langs->trans($object->error), null, 'errors');
                             	dol_print_error($db, $object->error);
                             }
@@ -599,8 +588,7 @@ if (empty($reshook))
 
                     unset($object->context['createfromclone']);
                 }
-            }
-            else {
+            } else {
                 $db->rollback();
                 dol_print_error($db, $object->error);
             }
@@ -617,8 +605,7 @@ if (empty($reshook))
         {
             header('Location: '.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'&delprod='.urlencode($object->ref));
             exit;
-        }
-        else {
+        } else {
         	setEventMessages($langs->trans($object->error), null, 'errors');
             $reload = 0;
             $action = '';
@@ -640,8 +627,7 @@ if (empty($reshook))
 	            exit;
 	        }
 	        $thirpdartyid = $propal->socid;
-        }
-        elseif (GETPOST('commandeid') > 0)
+        } elseif (GETPOST('commandeid') > 0)
         {
             $commande = new Commande($db);
 	        $result = $commande->fetch(GETPOST('commandeid'));
@@ -651,8 +637,7 @@ if (empty($reshook))
 	            exit;
 	        }
 	        $thirpdartyid = $commande->socid;
-        }
-        elseif (GETPOST('factureid') > 0)
+        } elseif (GETPOST('factureid') > 0)
         {
     	    $facture = new Facture($db);
 	        $result = $facture->fetch(GETPOST('factureid'));
@@ -727,8 +712,7 @@ if (empty($reshook))
                 {
                     dol_syslog($langs->trans('FailedToGetCostPrice'));
                     setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
-                }
-                else {
+                } else {
                     $buyprice = $result;
                 }
 
@@ -769,8 +753,7 @@ if (empty($reshook))
                 {
                     dol_syslog($langs->trans('FailedToGetCostPrice'));
                     setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
-                }
-                else {
+                } else {
                     $buyprice = $result;
                 }
 
@@ -811,8 +794,7 @@ if (empty($reshook))
                 {
                     dol_syslog($langs->trans('FailedToGetCostPrice'));
                     setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
-                }
-                else {
+                } else {
                     $buyprice = $result;
                 }
 
@@ -852,8 +834,7 @@ if (empty($reshook))
                     exit;
                 }
             }
-        }
-        else {
+        } else {
             $action = "";
             setEventMessages($langs->trans("WarningSelectOneDocument"), null, 'warnings');
         }
@@ -918,8 +899,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 	}
 	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
 	$objcanvas->display_canvas($action); // Show template
-}
-else {
+} else {
     // -----------------------------------------
     // When used in standard mode
     // -----------------------------------------
@@ -955,8 +935,7 @@ else {
 		if ($type == 1) {
 			$picto = 'service';
 			$title = $langs->trans("NewService");
-		}
-		else {
+		} else {
 			$picto = 'product';
 			$title = $langs->trans("NewProduct");
 		}
@@ -1010,8 +989,7 @@ else {
  	        if (isset($_POST['fk_barcode_type']))
 	        {
 	         	$fk_barcode_type = GETPOST('fk_barcode_type');
-	        }
-	        else {
+	        } else {
 	        	if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
 	        }
 	        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
@@ -1059,8 +1037,7 @@ else {
             print '<td>'.$form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1).'</td><td>';
             print '<input name="desiredstock" class="maxwidth50" value="'.GETPOST('desiredstock').'">';
             print '</td></tr>';
-        }
-        else {
+        } else {
             print '<input name="seuil_stock_alerte" type="hidden" value="0">';
             print '<input name="desiredstock" type="hidden" value="0">';
         }
@@ -1193,8 +1170,7 @@ else {
             print '</table>';
 
             print '<br>';
-        }
-        else {
+        } else {
             print '<table class="border centpercent">';
 
             // Price
@@ -1298,8 +1274,7 @@ else {
 			}
 			print $formaccounting->select_account($accountancy_code_buy_export, 'accountancy_code_buy_export', 1, null, 1, 1, '');
 			print '</td></tr>';
-		}
-		else // For external software
+		} else // For external software
 		{
 			// Accountancy_code_sell
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
@@ -1348,14 +1323,10 @@ else {
 		print '</div>';
 
 		print '</form>';
-	}
-
-    /*
-     * Product card
-     */
-
-    elseif ($object->id > 0)
-    {
+    } elseif ($object->id > 0) {
+        /*
+         * Product card
+         */
         // Fiche en mode edition
 		if ($action == 'edit' && $usercancreate)
 		{
@@ -1393,8 +1364,7 @@ else {
             {
                 print '<option value="1" selected>'.$langs->trans("OnSell").'</option>';
                 print '<option value="0">'.$langs->trans("NotOnSell").'</option>';
-            }
-            else {
+            } else {
                 print '<option value="1">'.$langs->trans("OnSell").'</option>';
                 print '<option value="0" selected>'.$langs->trans("NotOnSell").'</option>';
             }
@@ -1408,8 +1378,7 @@ else {
             {
                 print '<option value="1" selected>'.$langs->trans("ProductStatusOnBuy").'</option>';
                 print '<option value="0">'.$langs->trans("ProductStatusNotOnBuy").'</option>';
-            }
-            else {
+            } else {
                 print '<option value="1">'.$langs->trans("ProductStatusOnBuy").'</option>';
                 print '<option value="0" selected>'.$langs->trans("ProductStatusNotOnBuy").'</option>';
             }
@@ -1438,8 +1407,7 @@ else {
 		        if (isset($_POST['fk_barcode_type']))
 		        {
 		         	$fk_barcode_type = GETPOST('fk_barcode_type');
-		        }
-		        else {
+		        } else {
 	        		$fk_barcode_type = $object->barcode_type;
 		        	if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
 		        }
@@ -1500,8 +1468,7 @@ else {
                 print '<input name="duration_value" size="5" value="'.$object->duration_value.'"> ';
                 print $formproduct->selectMeasuringUnits("duration_unit", "time", $object->duration_unit, 0, 1);
                 print '</td></tr>';
-            }
-            else {
+            } else {
                 // Nature
                 print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';
                 $statutarray = array('-1'=>'&nbsp;', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
@@ -1656,9 +1623,8 @@ else {
 				print '<td>';
 				print $formaccounting->select_account($object->accountancy_code_buy_export, 'accountancy_code_buy_export', 1, '', 1, 1);
 				print '</td></tr>';
-			}
-			else // For external software
-			{
+			} else {
+                // For external software
 				// Accountancy_code_sell
 				print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
 				print '<td><input name="accountancy_code_sell" class="maxwidth200" value="'.$object->accountancy_code_sell.'">';
@@ -1763,8 +1729,7 @@ else {
                 if ($action == 'editbarcodetype')
                 {
                     print $formbarcode->formBarcodeType($_SERVER['PHP_SELF'].'?id='.$object->id, $object->barcode_type, 'fk_barcode_type');
-                }
-                else {
+                } else {
                     $object->fetch_barcode();
                     print $object->barcode_type_label ? $object->barcode_type_label : ($object->barcode ? '<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>' : '');
                 }
@@ -1790,8 +1755,7 @@ else {
 					print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="'.$tmpcode.'">';
 					print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 					print '</form>';
-                }
-                else {
+                } else {
 					print $object->barcode;
                 }
                 print '</td></tr>'."\n";
@@ -1974,16 +1938,14 @@ else {
                 if ($object->duration_value > 1)
                 {
                     $dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
-                }
-                elseif ($object->duration_value > 0)
+                } elseif ($object->duration_value > 0)
                 {
                     $dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
                 }
                 print (!empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')."&nbsp;";
 
                 print '</td></tr>';
-            }
-            else {
+            } else {
                 // Nature
                 print '<tr><td class="titlefield">'.$langs->trans("Nature").'</td><td colspan="2">';
                 print $object->getLibFinished();
@@ -1994,8 +1956,7 @@ else {
                 if ($object->weight != '')
                 {
                 	print $object->weight." ".measuringUnitString(0, "weight", $object->weight_units);
-                }
-                else {
+                } else {
                     print '&nbsp;';
                 }
                 print "</td></tr>\n";
@@ -2010,8 +1971,7 @@ else {
                         if ($object->width) print " x ".$object->width;
                         if ($object->height) print " x ".$object->height;
                         print ' '.measuringUnitString(0, "size", $object->length_units);
-                    }
-                    else {
+                    } else {
                         print '&nbsp;';
                     }
                     print "</td></tr>\n";
@@ -2023,8 +1983,7 @@ else {
                     if ($object->surface != '')
                     {
                     	print $object->surface." ".measuringUnitString(0, "surface", $object->surface_units);
-                    }
-                    else {
+                    } else {
                         print '&nbsp;';
                     }
                     print "</td></tr>\n";
@@ -2036,8 +1995,7 @@ else {
                     if ($object->volume != '')
                     {
                     	print $object->volume." ".measuringUnitString(0, "volume", $object->volume_units);
-                    }
-                    else {
+                    } else {
                         print '&nbsp;';
                     }
                     print "</td></tr>\n";
@@ -2050,8 +2008,7 @@ else {
                 	if ($object->net_measure != '')
                 	{
                 		print $object->net_measure." ".measuringUnitString($object->net_measure_units);
-                	}
-                	else {
+                	} else {
                 		print '&nbsp;';
                 	}
                 }
@@ -2105,8 +2062,7 @@ else {
 
             dol_fiche_end();
         }
-    }
-    elseif ($action != 'create')
+    } elseif ($action != 'create')
     {
         exit;
     }
@@ -2179,8 +2135,7 @@ if ($action != 'create' && $action != 'edit')
                 if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
                 {
                     print '<span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span>'."\n";
-                }
-                else {
+                } else {
                     print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a>';
                 }
             }
@@ -2194,16 +2149,13 @@ if ($action != 'create' && $action != 'edit')
                 if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
                 {
                     print '<span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span>'."\n";
-                }
-                else {
+                } else {
                     print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("Delete").'</a>';
                 }
-            }
-            else {
+            } else {
                 print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ProductIsUsed").'">'.$langs->trans("Delete").'</a>';
             }
-        }
-        else {
+        } else {
             print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Delete").'</a>';
         }
     }
@@ -2236,8 +2188,7 @@ if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action ==
         	$html .= $langs->trans("AddToDraftProposals").'</td><td>';
         	$html .= $form->selectarray("propalid", $otherprop, 0, 1);
         	$html .= '</td></tr>';
-        }
-        else {
+        } else {
         	$html .= '<tr><td style="width: 200px;">';
         	$html .= $langs->trans("AddToDraftProposals").'</td><td>';
         	$html .= $langs->trans("NoDraftProposals");
@@ -2259,8 +2210,7 @@ if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action ==
         	$html .= $langs->trans("AddToDraftOrders").'</td><td>';
         	$html .= $form->selectarray("commandeid", $othercom, 0, 1);
         	$html .= '</td></tr>';
-        }
-        else {
+        } else {
         	$html .= '<tr><td style="width: 200px;">';
         	$html .= $langs->trans("AddToDraftOrders").'</td><td>';
         	$html .= $langs->trans("NoDraftOrders");
@@ -2282,8 +2232,7 @@ if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action ==
     		$html .= $langs->trans("AddToDraftInvoices").'</td><td>';
     		$html .= $form->selectarray("factureid", $otherinvoice, 0, 1);
     		$html .= '</td></tr>';
-    	}
-    	else {
+    	} else {
     		$html .= '<tr><td style="width: 200px;">';
     		$html .= $langs->trans("AddToDraftInvoices").'</td><td>';
     		$html .= $langs->trans("NoDraftInvoices");
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 66cef158439..e7fce1b480f 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -221,8 +221,7 @@ class Products extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve product list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -316,8 +315,7 @@ class Products extends DolibarrApi
                     }
                     if ($this->product->price_min_ttc != $oldproduct->price_min_ttc) { $pricemodified = true;
                     }
-                }
-                else {
+                } else {
                     if ($this->product->price != $oldproduct->price) { $pricemodified = true;
                     }
                     if ($this->product->price_min != $oldproduct->price_min) { $pricemodified = true;
@@ -811,8 +809,7 @@ class Products extends DolibarrApi
 
     			$i++;
     		}
-    	}
-    	else {
+    	} else {
     		throw new RestException(503, 'Error when retrieve product list : '.$db->lasterror());
     	}
     	if (!count($obj_ret)) {
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index b38501cb788..30445615413 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -101,12 +101,10 @@ class FormProduct
 			if (!empty($batch))
 			{
 				$sql .= ", pb.qty as stock";
-			}
-			else {
+			} else {
 				$sql .= ", ps.reel as stock";
 			}
-		}
-		elseif ($sumStock)
+		} elseif ($sumStock)
 		{
 			$sql .= ", sum(ps.reel) as stock";
 		}
@@ -124,8 +122,7 @@ class FormProduct
 		if (count($warehouseStatus))
 		{
 			$sql .= " AND e.statut IN (".$this->db->escape(implode(',', $warehouseStatus)).")";
-		}
-		else {
+		} else {
 			$sql .= " AND e.statut = 1";
 		}
 
@@ -176,8 +173,7 @@ class FormProduct
 			}
 
 			return $num;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -267,8 +263,7 @@ class FormProduct
 			{
 				if ($arraytypes['stock'] <= 0) {
 					$label .= ' <span class= \'text-warning\'>('.$langs->trans("Stock").':'.$arraytypes['stock'].')</span>';
-				}
-				else {
+				} else {
 					$label .= ' <span class=\'opacitymedium\'>('.$langs->trans("Stock").':'.$arraytypes['stock'].')</span>';
 				}
 			}
@@ -432,8 +427,7 @@ class FormProduct
 		if (!is_array($objectLines) || !count($objectLines))
 		{
 			if (!empty($fk_product)) $productIdArray[] = $fk_product;
-		}
-		else {
+		} else {
 			foreach ($objectLines as $line) {
 				if ($line->fk_product) $productIdArray[] = $line->fk_product;
 			}
@@ -453,8 +447,7 @@ class FormProduct
 		if (!empty($fk_product))
 		{
 			$productIdArray = array($fk_product); // only show lot stock for product
-		}
-		else {
+		} else {
 			foreach ($this->cache_lot as $key => $value)
 			{
 				$productIdArray[] = $key;
@@ -471,8 +464,7 @@ class FormProduct
 					$label .= $arraytypes['batch'];
 					if ($arraytypes['qty'] <= 0) {
 						$label .= ' <span class=\'text-warning\'>('.$langs->trans("Stock").' '.$arraytypes['qty'].')</span>';
-					}
-					else {
+					} else {
 						$label .= ' <span class=\'opacitymedium\'>('.$langs->trans("Stock").' '.$arraytypes['qty'].')</span>';
 					}
 
@@ -520,8 +512,7 @@ class FormProduct
 		if ($cacheLoaded)
 		{
 			return count($this->cache_lot);
-		}
-		else {
+		} else {
 			// clear cache
 			$this->cache_lot = array();
 			$productIdList = implode(',', $productIdArray);
@@ -553,8 +544,7 @@ class FormProduct
 				}
 
 				return $num;
-			}
-			else {
+			} else {
 				dol_print_error($this->db);
 				return -1;
 			}
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index f072d04916e..6e559c3e7fb 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -456,8 +456,7 @@ class Product extends CommonObject
 
         if ($err > 0) {
             return 0;
-        }
-        else {
+        } else {
             return 1;
         }
     }
@@ -681,30 +680,25 @@ class Product extends CommonObject
                                 if ($this->update($id, $user, true, 'add') <= 0) {
                                     $error++;
                                 }
-                            }
-                            else {
+                            } else {
                                 $error++;
                                 $this->error = $this->db->lasterror();
                             }
-                        }
-                        else {
+                        } else {
                             $error++;
                             $this->error = 'ErrorFailedToGetInsertedId';
                         }
-                    }
-                    else {
+                    } else {
                         $error++;
                         $this->error = $this->db->lasterror();
                     }
-                }
-                else {
+                } else {
                     // Product already exists with this ref
                     $langs->load("products");
                     $error++;
                     $this->error = "ErrorProductAlreadyExists";
                 }
-            }
-            else {
+            } else {
                 $error++;
                 $this->error = $this->db->lasterror();
             }
@@ -720,13 +714,11 @@ class Product extends CommonObject
             if (!$error) {
                 $this->db->commit();
                 return $this->id;
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 return -$error;
             }
-        }
-        else {
+        } else {
             $this->db->rollback();
             dol_syslog(get_class($this)."::Create fails verify ".join(',', $this->errors), LOG_WARNING);
             return -3;
@@ -756,11 +748,9 @@ class Product extends CommonObject
         if ($rescode) {
             if ($rescode == -1) {
                 $this->errors[] = 'ErrorBadBarCodeSyntax';
-            }
-            elseif ($rescode == -2) {
+            } elseif ($rescode == -2) {
                 $this->errors[] = 'ErrorBarCodeRequired';
-            }
-            elseif ($rescode == -3) {
+            } elseif ($rescode == -3) {
                 // Note: Common usage is to have barcode unique. For variants, we should have a different barcode.
                 $this->errors[] = 'ErrorBarCodeAlreadyUsed';
             }
@@ -802,8 +792,7 @@ class Product extends CommonObject
             dol_syslog(get_class($this)."::check_barcode value=".$valuetotest." type=".$typefortest." module=".$module);
             $result = $mod->verif($this->db, $valuetotest, $this, 0, $typefortest);
             return $result;
-        }
-        else {
+        } else {
             return 0;
         }
     }
@@ -1094,13 +1083,11 @@ class Product extends CommonObject
 
                     $this->db->commit();
                     return 1;
-                }
-                else {
+                } else {
                     $this->db->rollback();
                     return -$error;
                 }
-            }
-            else {
+            } else {
                 if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                     $langs->load("errors");
                     if (empty($conf->barcode->enabled) || empty($this->barcode)) {
@@ -1111,16 +1098,14 @@ class Product extends CommonObject
                     $this->errors[] = $this->error;
                     $this->db->rollback();
                     return -1;
-                }
-                else {
+                } else {
                     $this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
                     $this->errors[] = $this->error;
                     $this->db->rollback();
                     return -2;
                 }
             }
-        }
-        else {
+        } else {
             $this->db->rollback();
             dol_syslog(get_class($this)."::Update fails verify ".join(',', $this->errors), LOG_WARNING);
             return -3;
@@ -1267,8 +1252,7 @@ class Product extends CommonObject
             if (!$error) {
                 $this->db->commit();
                 return 1;
-            }
-            else {
+            } else {
                 foreach ($this->errors as $errmsg)
                 {
                     dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
@@ -1277,8 +1261,7 @@ class Product extends CommonObject
                 $this->db->rollback();
                 return -$error;
             }
-        }
-        else {
+        } else {
             $this->error = "ErrorRecordIsUsedCantDelete";
             return 0;
         }
@@ -1316,8 +1299,7 @@ class Product extends CommonObject
                     if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", note='".$this->db->escape($this->other)."'";
                     }
                     $sql2 .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";
-                }
-                else {
+                } else {
                     $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description";
                     if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", note";
                     }
@@ -1334,8 +1316,7 @@ class Product extends CommonObject
                     $this->error = $this->db->lasterror();
                     return -1;
                 }
-            }
-            elseif (isset($this->multilangs[$key])) {
+            } elseif (isset($this->multilangs[$key])) {
                 $sql = "SELECT rowid";
                 $sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
                 $sql .= " WHERE fk_product=".$this->id;
@@ -1353,8 +1334,7 @@ class Product extends CommonObject
                         $sql2 .= ", note='".$this->db->escape($this->multilangs["$key"]["other"])."'";
                     }
                     $sql2 .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";
-                }
-                else {
+                } else {
                     $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description";
                     if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", note";
                     }
@@ -1374,8 +1354,7 @@ class Product extends CommonObject
                         return -1;
                     }
                 }
-            }
-            else {
+            } else {
                 // language is not current language and we didn't provide a multilang description for this language
             }
         }
@@ -1416,8 +1395,7 @@ class Product extends CommonObject
             }
             // End call triggers
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this).'::delMultiLangs error='.$this->error, LOG_ERR);
             return -1;
@@ -1478,8 +1456,7 @@ class Product extends CommonObject
 
             $this->db->commit();
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -1517,8 +1494,7 @@ class Product extends CommonObject
                 $this->multilangs["$obj->lang"]["other"]        = $obj->other;
             }
             return 1;
-        }
-        else {
+        } else {
             $this->error = "Error: ".$this->db->lasterror()." - ".$sql;
             return -1;
         }
@@ -1559,8 +1535,7 @@ class Product extends CommonObject
             $this->error = $this->db->lasterror();
             dol_print_error($this->db);
             return -1;
-        }
-        else {
+        } else {
             return 1;
         }
     }
@@ -1586,8 +1561,7 @@ class Product extends CommonObject
         $resql = $this->db->query($sql);
         if ($resql) {
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -1663,8 +1637,7 @@ class Product extends CommonObject
 					if ($priceforthequantityarray['price_base_type'] == 'HT')
 					{
 						$pu_ht = $priceforthequantityarray['unitprice'];
-					}
-					else {
+					} else {
 						$pu_ttc = $priceforthequantityarray['unitprice'];
 					}
 					break;
@@ -1683,8 +1656,7 @@ class Product extends CommonObject
 					if ($priceforthequantityarray['price_base_type'] == 'HT')
 					{
 						$pu_ht = $priceforthequantityarray['unitprice'];
-					}
-					else {
+					} else {
 						$pu_ttc = $priceforthequantityarray['unitprice'];
 					}
 					break;
@@ -1766,8 +1738,7 @@ class Product extends CommonObject
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $this->packaging = $obj->packaging;
                 $result = $obj->fk_product;
                 return $result;
-            }
-            else // If not found
+            } else // If not found
             {
                 // We do a second search by doing a select again but searching with less reliable criteria: couple qty/id product, and if set fourn_ref or fk_soc.
                 $sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity, pfp.fk_soc,";
@@ -1826,18 +1797,15 @@ class Product extends CommonObject
 						if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $this->packaging = $obj->packaging;
 						$result = $obj->fk_product;
                         return $result;
-                    }
-                    else {
+                    } else {
                         return -1; // Ce produit n'existe pas avec cet id tarif fournisseur ou existe mais qte insuffisante, ni pour le couple produit/ref fournisseur dans la quantité.
                     }
-                }
-                else {
+                } else {
                     $this->error = $this->db->lasterror();
                     return -3;
                 }
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             return -2;
         }
@@ -1908,13 +1876,11 @@ class Product extends CommonObject
                     $price_min_ttc = price2num($newminprice, 'MU');
                     $price_min = price2num($newminprice) / (1 + ($newvat / 100));
                     $price_min = price2num($price_min, 'MU');
-                }
-                else {
+                } else {
                     $price_min = 0;
                     $price_min_ttc = 0;
                 }
-            }
-            else {
+            } else {
                 $price = price2num($newprice, 'MU');
                 $price_ttc = ($newnpr != 1) ? price2num($newprice) * (1 + ($newvat / 100)) : $price;
                 $price_ttc = price2num($price_ttc, 'MU');
@@ -1924,8 +1890,7 @@ class Product extends CommonObject
                     $price_min_ttc = price2num($newminprice) * (1 + ($newvat / 100));
                     $price_min_ttc = price2num($price_min_ttc, 'MU');
                     //print 'X'.$newminprice.'-'.$price_min;
-                }
-                else {
+                } else {
                     $price_min = 0;
                     $price_min_ttc = 0;
                 }
@@ -1937,8 +1902,7 @@ class Product extends CommonObject
                 $localtax1 = $localtaxes_array['1'];
                 $localtaxtype2 = $localtaxes_array['2'];
                 $localtax2 = $localtaxes_array['3'];
-            }
-            else // old method. deprecated because ot can't retreive type
+            } else // old method. deprecated because ot can't retreive type
             {
                 $localtaxtype1 = '0';
                 $localtax1 = get_localtax($newvat, 1);
@@ -2013,8 +1977,7 @@ class Product extends CommonObject
                 // End call triggers
 
                 $this->db->commit();
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 dol_print_error($this->db);
             }
@@ -2248,18 +2211,15 @@ class Product extends CommonObject
                             return -1;
                             }
                             }*/
-                        }
-                        else {
+                        } else {
                             dol_print_error($this->db);
                             return -1;
                         }
                     }
-                }
-                elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && empty($ignore_price_load))            // prices per customers
+                } elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && empty($ignore_price_load))            // prices per customers
                 {
                     // Nothing loaded by default. List may be very long.
-                }
-                elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) && empty($ignore_price_load))    // prices per quantity
+                } elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) && empty($ignore_price_load))    // prices per quantity
                 {
                     $sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
                     $sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid";
@@ -2296,19 +2256,16 @@ class Product extends CommonObject
                                     $ii++;
                                 }
                                 $this->prices_by_qty_list[0] = $resultat;
-                            }
-                            else {
+                            } else {
                                     dol_print_error($this->db);
                                     return -1;
                             }
                         }
-                    }
-                    else {
+                    } else {
                         dol_print_error($this->db);
                         return -1;
                     }
-                }
-                elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES) && empty($ignore_price_load))    // prices per customer and quantity
+                } elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES) && empty($ignore_price_load))    // prices per customer and quantity
                 {
                     for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
                     {
@@ -2358,14 +2315,12 @@ class Product extends CommonObject
                                         $ii++;
                                     }
                                     $this->prices_by_qty_list[$i] = $resultat;
-                                }
-                                else {
+                                } else {
                                     dol_print_error($this->db);
                                     return -1;
                                 }
                             }
-                        }
-                        else {
+                        } else {
                             dol_print_error($this->db);
                             return -1;
                         }
@@ -2389,12 +2344,10 @@ class Product extends CommonObject
                 $this->stock_warehouse = array();
 
                 return 1;
-            }
-            else {
+            } else {
                 return 0;
             }
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -2467,8 +2420,7 @@ class Product extends CommonObject
             if ($reshook > 0) $this->stats_propale = $hookmanager->resArray['stats_propale'];
 
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -2517,8 +2469,7 @@ class Product extends CommonObject
             if ($reshook > 0) $this->stats_proposal_supplier = $hookmanager->resArray['stats_proposal_supplier'];
 
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -2619,8 +2570,7 @@ class Product extends CommonObject
             $reshook = $hookmanager->executeHooks('loadStatsCustomerOrder', $parameters, $this, $action);
             if ($reshook > 0) $this->stats_commande = $hookmanager->resArray['stats_commande'];
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -2675,8 +2625,7 @@ class Product extends CommonObject
             if ($reshook > 0) $this->stats_commande_fournisseur = $hookmanager->resArray['stats_commande_fournisseur'];
 
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->error().' sql='.$sql;
             return -1;
         }
@@ -2758,8 +2707,7 @@ class Product extends CommonObject
             if ($reshook > 0) $this->stats_expedition = $hookmanager->resArray['stats_expedition'];
 
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -2810,8 +2758,7 @@ class Product extends CommonObject
             if ($reshook > 0) $this->stats_reception = $hookmanager->resArray['stats_reception'];
 
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -2900,8 +2847,7 @@ class Product extends CommonObject
             if ($reshook > 0) $this->stats_mrptoproduce = $hookmanager->resArray['stats_mrptoproduce'];
 
     		return 1;
-    	}
-    	else {
+    	} else {
     		$this->error = $this->db->error();
     		return -1;
     	}
@@ -2973,8 +2919,7 @@ class Product extends CommonObject
             if ($reshook > 0) $this->stats_contrat = $hookmanager->resArray['stats_contrat'];
 
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->error().' sql='.$sql;
             return -1;
         }
@@ -3046,8 +2991,7 @@ class Product extends CommonObject
             if ($reshook > 0) $this->stats_facture = $hookmanager->resArray['stats_facture'];
 
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -3098,8 +3042,7 @@ class Product extends CommonObject
             if ($reshook > 0) $this->stats_facture_fournisseur = $hookmanager->resArray['stats_facture_fournisseur'];
 
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -3132,8 +3075,7 @@ class Product extends CommonObject
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->error().' sql='.$sql;
             return -1;
         }
@@ -3141,8 +3083,7 @@ class Product extends CommonObject
         if (empty($year)) {
             $year = strftime('%Y', time());
             $month = strftime('%m', time());
-        }
-        else {
+        } else {
             $month = 12; // We imagine we are at end of year, so we get last 12 month before, so all correct year.
         }
         $result = array();
@@ -3622,23 +3563,20 @@ class Product extends CommonObject
         if (!$this->db->query($sql)) {
             dol_print_error($this->db);
             return -1;
-        }
-        else {
+        } else {
             $result = $this->db->query($sql);
             if ($result) {
                 $num = $this->db->num_rows($result);
                 if ($num > 0) {
                     $this->error = "isFatherOfThis";
                     return -1;
-                }
-                else {
+                } else {
                     $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_association(fk_product_pere,fk_product_fils,qty,incdec)';
                     $sql .= ' VALUES ('.$id_pere.', '.$id_fils.', '.$qty.', '.$incdec.')';
                     if (!$this->db->query($sql)) {
                          dol_print_error($this->db);
                          return -1;
-                    }
-                    else {
+                    } else {
                          return 1;
                     }
                 }
@@ -3681,8 +3619,7 @@ class Product extends CommonObject
         if (!$this->db->query($sql)) {
             dol_print_error($this->db);
             return -1;
-        }
-        else {
+        } else {
             return 1;
         }
     }
@@ -3744,12 +3681,10 @@ class Product extends CommonObject
                 $this->is_sousproduit_incdec = $obj->incdec;
 
                 return true;
-            }
-            else {
+            } else {
                 return false;
             }
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -3838,8 +3773,7 @@ class Product extends CommonObject
                 if ($this->db->query($sql)) {
                     $this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_fournisseur_price");
                     return 1;
-                }
-                else {
+                } else {
                     $this->error = $this->db->lasterror();
                     return -1;
                 }
@@ -3849,8 +3783,7 @@ class Product extends CommonObject
                 $this->product_fourn_price_id = $obj->rowid;
                 return 0;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             return -2;
         }
@@ -4045,8 +3978,7 @@ class Product extends CommonObject
         if (!$resql) {
             $this->db->rollback();
             return -1;
-        }
-        else {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -4156,8 +4088,7 @@ class Product extends CommonObject
             $obj = $this->db->fetch_object($resql);
             if ($obj) { $nb = $obj->nb;
             }
-        }
-        else {
+        } else {
             return -1;
         }
 
@@ -4241,8 +4172,7 @@ class Product extends CommonObject
                 $prods[$record['id']]['entity'] = $record['entity'];
             }
             return $prods;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -4305,8 +4235,7 @@ class Product extends CommonObject
             }
 
             return $prods;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -4433,8 +4362,7 @@ class Product extends CommonObject
 
             $linkclose .= ' title="'.dol_escape_htmltag($label, 1, 1).'"';
             $linkclose .= ' class="nowraponall classfortooltip"';
-        }
-        else {
+        } else {
         	$linkclose = ' class="nowraponall"';
         }
 
@@ -4508,8 +4436,7 @@ class Product extends CommonObject
         if (!dol_strlen($modele)) {
             if (!empty($conf->global->PRODUCT_ADDON_PDF)) {
                 $modele = $conf->global->PRODUCT_ADDON_PDF;
-            }
-            else {
+            } else {
                 $modele = 'strato';
             }
         }
@@ -4591,27 +4518,22 @@ class Product extends CommonObject
             if ($type == 0) {
                 $labelStatus = $langs->trans('ProductStatusNotOnSellShort');
                 $labelStatusShort = $langs->trans('ProductStatusNotOnSell');
-            }
-            elseif ($type == 1) {
+            } elseif ($type == 1) {
                 $labelStatus = $langs->trans('ProductStatusNotOnBuyShort');
                 $labelStatusShort = $langs->trans('ProductStatusNotOnBuy');
-            }
-            elseif ($type == 2) {
+            } elseif ($type == 2) {
                 $labelStatus = $langs->trans('ProductStatusNotOnBatch');
                 $labelStatusShort = $langs->trans('ProductStatusNotOnBatchShort');
             }
-        }
-        elseif ($status == 1) {
+        } elseif ($status == 1) {
             // $type   0=Status "to sell", 1=Status "to buy", 2=Status "to Batch"
             if ($type == 0) {
                 $labelStatus = $langs->trans('ProductStatusOnSellShort');
                 $labelStatusShort = $langs->trans('ProductStatusOnSell');
-            }
-            elseif ($type == 1) {
+            } elseif ($type == 1) {
                 $labelStatus = $langs->trans('ProductStatusOnBuyShort');
                 $labelStatusShort = $langs->trans('ProductStatusOnBuy');
-            }
-            elseif ($type == 2) {
+            } elseif ($type == 2) {
                 $labelStatus = $langs->trans('ProductStatusOnBatch');
                 $labelStatusShort = $langs->trans('ProductStatusOnBatchShort');
             }
@@ -4677,8 +4599,7 @@ class Product extends CommonObject
             if ($result >= 0) {
                 $this->db->commit();
                 return 1;
-            }
-            else {
+            } else {
                 $this->error = $movementstock->error;
                 $this->errors = $movementstock->errors;
 
@@ -4724,8 +4645,7 @@ class Product extends CommonObject
             if ($result >= 0) {
                 $this->db->commit();
                 return 1;
-            }
-            else {
+            } else {
                 $this->error = $movementstock->error;
                 $this->errors = $movementstock->errors;
 
@@ -4803,8 +4723,7 @@ class Product extends CommonObject
             }
 
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -4888,24 +4807,19 @@ class Product extends CommonObject
 		// Stock decrease mode
 		if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
 			$this->stock_theorique -= ($stock_commande_client - $stock_sending_client);
-		}
-		elseif (!empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)) {
+		} elseif (!empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)) {
 			$this->stock_theorique += 0;
-		}
-		elseif (!empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
+		} elseif (!empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
 			$this->stock_theorique -= $stock_commande_client;
 		}
 		// Stock Increase mode
         if (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
             $this->stock_theorique += ($stock_commande_fournisseur - $stock_reception_fournisseur);
-        }
-		elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
+        } elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
 			$this->stock_theorique += ($stock_commande_fournisseur - $stock_reception_fournisseur);
-		}
-		elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)) {
+		} elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)) {
 			$this->stock_theorique -= $stock_reception_fournisseur;
-		}
-		elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
+		} elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
 			$this->stock_theorique += ($stock_commande_fournisseur - $stock_reception_fournisseur);
 		}
 
@@ -4949,8 +4863,7 @@ class Product extends CommonObject
                 $i++;
             }
             return $result;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             $this->db->rollback();
             return array();
@@ -5187,8 +5100,7 @@ class Product extends CommonObject
             }
             $this->db->free($resql);
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -5323,8 +5235,7 @@ class Product extends CommonObject
             $label = ($label_type == 'short' ? $res[$label_type] : 'unit'.$res['code']);
             $this->db->free($resql);
             return $label;
-        }
-        else {
+        } else {
             $this->error = $this->db->error().' sql='.$sql;
             dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
             return -1;
@@ -5556,8 +5467,7 @@ class Product extends CommonObject
             }
 
             $this->db->free($result);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index 3c56221863c..db59efcdfb7 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -119,8 +119,7 @@ class Productbatch extends CommonObject
 		{
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -177,8 +176,7 @@ class Productbatch extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -230,8 +228,7 @@ class Productbatch extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -271,8 +268,7 @@ class Productbatch extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -326,8 +322,7 @@ class Productbatch extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -419,8 +414,7 @@ class Productbatch extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -488,8 +482,7 @@ class Productbatch extends CommonObject
             $db->free($resql);
 
             return $ret;
-        }
-        else {
+        } else {
             $error = "Error ".$db->lasterror();
             return -1;
         }
diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php
index 26c627ee0e4..331708ff096 100644
--- a/htdocs/product/class/propalmergepdfproduct.class.php
+++ b/htdocs/product/class/propalmergepdfproduct.class.php
@@ -139,8 +139,7 @@ class Propalmergepdfproduct extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -197,8 +196,7 @@ class Propalmergepdfproduct extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
@@ -270,8 +268,7 @@ class Propalmergepdfproduct extends CommonObject
     		$this->db->free($resql);
 
     		return 1;
-    	}
-    	else {
+    	} else {
     		$this->error = "Error ".$this->db->lasterror();
     		dol_syslog(get_class($this)."::fetch_by_product ".$this->error, LOG_ERR);
     		return -1;
@@ -330,8 +327,7 @@ class Propalmergepdfproduct extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -372,8 +368,7 @@ class Propalmergepdfproduct extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -421,8 +416,7 @@ class Propalmergepdfproduct extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -463,8 +457,7 @@ class Propalmergepdfproduct extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -518,8 +511,7 @@ class Propalmergepdfproduct extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 194a342d391..975dcfda831 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -80,24 +80,20 @@ if ($action == 'add_prod' && ($user->rights->produit->creer || $user->rights->se
 			{
 				//var_dump($i.' '.GETPOST("prod_id_".$i, 'int'), $qty, GETPOST("prod_incdec_".$i, 'int'));
 				$action = 'edit';
-			}
-			else {
+			} else {
 				$error++;
 				$action = 're-edit';
 				if ($object->error == "isFatherOfThis") {
 					setEventMessages($langs->trans("ErrorAssociationIsFatherOfThis"), null, 'errors');
-				}
-				else {
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
-		}
-		else {
+		} else {
 			if ($object->del_sousproduit($id, GETPOST("prod_id_".$i, 'int')) > 0)
 			{
 				$action = 'edit';
-			}
-			else {
+			} else {
 				$error++;
 				$action = 're-edit';
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -110,8 +106,7 @@ if ($action == 'add_prod' && ($user->rights->produit->creer || $user->rights->se
 		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit;
 	}
-}
-elseif ($action === 'save_composed_product')
+} elseif ($action === 'save_composed_product')
 {
 	$TProduct = GETPOST('TProduct', 'array');
 	if (!empty($TProduct))
@@ -230,8 +225,7 @@ if ($id > 0 || !empty($ref))
     			if ($object->price_base_type == 'TTC')
     			{
     				print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
-    			}
-    			else {
+    			} else {
     				print price($object->price).' '.$langs->trans($object->price_base_type ? $object->price_base_type : 'HT');
     			}
     			print '</td></tr>';
@@ -241,8 +235,7 @@ if ($id > 0 || !empty($ref))
     			if ($object->price_base_type == 'TTC')
     			{
     				print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
-    			}
-    			else {
+    			} else {
     				print price($object->price_min).' '.$langs->trans($object->price_base_type ? $object->price_base_type : 'HT');
     			}
     			print '</td></tr>';
@@ -292,8 +285,7 @@ if ($id > 0 || !empty($ref))
 				print '<td>'.$value['qty'].'</td>';
 				print '</tr>';
 			}
-		}
-		else {
+		} else {
 			print '<tr class="oddeven">';
 			print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 			print '</tr>';
@@ -370,8 +362,7 @@ if ($id > 0 || !empty($ref))
 					if (!empty($conf->global->PRODUIT_MULTIPRICES))
 					{
 						$pricesell = 'Variable';
-					}
-					else {
+					} else {
 						$totallinesell = price2num($value['nb'] * ($pricesell), 'MT');
 						$totalsell += $totallinesell;
 					}
@@ -389,15 +380,13 @@ if ($id > 0 || !empty($ref))
 					{
 						print '<td class="center"><input type="text" value="'.$nb_of_subproduct.'" name="TProduct['.$productstatic->id.'][qty]" size="4" /></td>';
 						print '<td class="center"><input type="checkbox" name="TProduct['.$productstatic->id.'][incdec]" value="1" '.($value['incdec'] == 1 ? 'checked' : '').' /></td>';
-					}
-					else {
+					} else {
 						print '<td>'.$nb_of_subproduct.'</td>';
 						print '<td>'.($value['incdec'] == 1 ? 'x' : '').'</td>';
 					}
 
 					print '</tr>'."\n";
-				}
-				else {
+				} else {
 					$hide = '';
 					if (empty($conf->global->PRODUCT_SHOW_SUB_SUB_PRODUCTS)) $hide = ' hideobject'; // By default, we do not show this. It makes screen very difficult to understand
 
@@ -459,8 +448,7 @@ if ($id > 0 || !empty($ref))
 			}
 			print '</td>';
 			print '</tr>'."\n";
-		}
-		else {
+		} else {
 			$colspan = 8;
 			if (!empty($conf->stock->enabled)) $colspan++;
 
@@ -589,8 +577,7 @@ if ($id > 0 || !empty($ref))
 							//$addchecked = ' checked';
 							$qty = $object->is_sousproduit_qty;
 							$incdec = $object->is_sousproduit_incdec;
-						}
-						else {
+						} else {
 							//$addchecked = '';
 							$qty = 0;
 							$incdec = 0;
@@ -623,8 +610,7 @@ if ($id > 0 || !empty($ref))
 					print '<td></td>';
 					print '</tr>';
 				}
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 			print '</table>';
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index db233fbe84c..4f505bff187 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -313,8 +313,7 @@ if ($object->id)
     						$filename = $filetoadd['name'].' - '.$langs->trans('Language_'.$default_lang);
     						$checked = ' checked ';
     					}
-    				}
-    				else {
+    				} else {
     					if (array_key_exists($filetoadd['name'], $filetomerge->lines))
     					{
     						$checked = ' checked ';
@@ -336,8 +335,7 @@ if ($object->id)
     		print  '</form>';
     	}
     }
-}
-else {
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/product/dynamic_price/class/price_expression.class.php b/htdocs/product/dynamic_price/class/price_expression.class.php
index 4f40e2b6c6f..cf498d6f998 100644
--- a/htdocs/product/dynamic_price/class/price_expression.class.php
+++ b/htdocs/product/dynamic_price/class/price_expression.class.php
@@ -123,8 +123,7 @@ class PriceExpression
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else {
+        } else {
             $this->db->commit();
             return $this->id;
         }
@@ -161,12 +160,10 @@ class PriceExpression
                 $this->title = $obj->title;
                 $this->expression = $obj->expression;
                 return 1;
-            }
-            else {
+            } else {
                 return 0;
             }
-        }
-        else {
+        } else {
               $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -202,8 +199,7 @@ class PriceExpression
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -232,12 +228,10 @@ class PriceExpression
             if ($obj)
             {
                 return (int) $obj->rowid;
-            }
-            else {
+            } else {
                 return 0;
             }
-        }
-        else {
+        } else {
               $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -295,8 +289,7 @@ class PriceExpression
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -352,8 +345,7 @@ class PriceExpression
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else {
+        } else {
             $this->db->commit();
             return 1;
         }
diff --git a/htdocs/product/dynamic_price/class/price_global_variable.class.php b/htdocs/product/dynamic_price/class/price_global_variable.class.php
index 7f241518e4c..f2ab8006b02 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable.class.php
@@ -128,8 +128,7 @@ class PriceGlobalVariable
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else {
+        } else {
             $this->db->commit();
             return $this->id;
         }
@@ -161,12 +160,10 @@ class PriceGlobalVariable
                 $this->value		= $obj->value;
                 $this->checkParameters();
                 return 1;
-            }
-            else {
+            } else {
                 return 0;
             }
-        }
-        else {
+        } else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -222,8 +219,7 @@ class PriceGlobalVariable
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -278,8 +274,7 @@ class PriceGlobalVariable
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -344,8 +339,7 @@ class PriceGlobalVariable
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
diff --git a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
index 12e497c0f2c..6706dded094 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
@@ -144,8 +144,7 @@ class PriceGlobalVariableUpdater
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else {
+        } else {
             $this->db->commit();
             return $this->id;
         }
@@ -181,12 +180,10 @@ class PriceGlobalVariableUpdater
                 $this->last_status		= $obj->last_status;
                 $this->checkParameters();
                 return 1;
-            }
-            else {
+            } else {
                 return 0;
             }
-        }
-        else {
+        } else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -246,8 +243,7 @@ class PriceGlobalVariableUpdater
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -301,8 +297,7 @@ class PriceGlobalVariableUpdater
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -394,8 +389,7 @@ class PriceGlobalVariableUpdater
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -435,8 +429,7 @@ class PriceGlobalVariableUpdater
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -591,8 +584,7 @@ class PriceGlobalVariableUpdater
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -636,8 +628,7 @@ class PriceGlobalVariableUpdater
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else {
+        } else {
             $this->db->commit();
             return 1;
         }
diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php
index 6659dc56054..7a7dd5aac56 100644
--- a/htdocs/product/dynamic_price/class/price_parser.class.php
+++ b/htdocs/product/dynamic_price/class/price_parser.class.php
@@ -103,20 +103,16 @@ class PriceParser
         if (in_array($code, array(9, 14, 19, 20))) //Errors which have 0 arg
         {
             return $langs->trans("ErrorPriceExpression".$code);
-        }
-        elseif (in_array($code, array(1, 2, 3, 4, 5, 8, 10, 11, 17, 21, 22))) //Errors which have 1 arg
+        } elseif (in_array($code, array(1, 2, 3, 4, 5, 8, 10, 11, 17, 21, 22))) //Errors which have 1 arg
         {
             return $langs->trans("ErrorPriceExpression".$code, $info);
-        }
-        elseif (in_array($code, array(6, 23))) //Errors which have 2 args
+        } elseif (in_array($code, array(6, 23))) //Errors which have 2 args
         {
             return $langs->trans("ErrorPriceExpression".$code, $info[0], $info[1]);
-        }
-        elseif (in_array($code, array(7, 12, 13, 15, 16, 18))) //Internal errors
+        } elseif (in_array($code, array(7, 12, 13, 15, 16, 18))) //Internal errors
         {
             return $langs->trans("ErrorPriceExpressionInternal", $code);
-        }
-        else //Unknown errors
+        } else //Unknown errors
         {
             return $langs->trans("ErrorPriceExpressionUnknown", $code);
         }
@@ -276,7 +272,7 @@ class PriceParser
 		if ($res < 0) {
 			$this->error_parser = array(25, null);
 			return -1;
-		}  elseif ($res == 0) {
+		} elseif ($res == 0) {
 			$supplier_min_price = 0;
 		} else {
 			 $supplier_min_price = $productFournisseur->fourn_unitprice;
diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php
index 778f749f983..c8855b0665e 100644
--- a/htdocs/product/dynamic_price/editor.php
+++ b/htdocs/product/dynamic_price/editor.php
@@ -54,8 +54,7 @@ $price_globals = new PriceGlobalVariable($db);
 if (empty($eid)) //This also disables fetch when eid == 0
 {
 	$eid = 0;
-}
-elseif ($action != 'delete')
+} elseif ($action != 'delete')
 {
 	$price_expression->fetch($eid);
 }
@@ -77,8 +76,7 @@ if ($action == 'add')
 			$price_result = $priceparser->testExpression($id, $expression);
 			if ($price_result < 0) { //Expression is not valid
 				setEventMessages($priceparser->translatedError(), null, 'errors');
-			}
-			else {
+			} else {
 				$price_expression->title = $title;
 				$price_expression->expression = $expression;
 				$result = $price_expression->create($user);
@@ -86,17 +84,14 @@ if ($action == 'add')
 				{
 					$eid = $price_expression->id;
 					setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-				}
-				else {
+				} else {
 					setEventMessages("add: ".$price_expression->error, $price_expression->errors, 'errors');
 				}
 			}
-		}
-		elseif ($result < 0)
+		} elseif ($result < 0)
 		{
 			setEventMessages("add find: ".$price_expression->error, $price_expression->errors, 'errors');
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("ErrorRecordAlreadyExists"), null, 'errors');
 		}
 	}
@@ -114,8 +109,7 @@ if ($action == 'update')
 			$price_result = $priceparser->testExpression($id, $expression);
 			if ($price_result < 0) { //Expression is not valid
 				setEventMessages($priceparser->translatedError(), null, 'errors');
-			}
-			else {
+			} else {
 				$price_expression->id = $eid;
 				$price_expression->title = $title;
 				$price_expression->expression = $expression;
@@ -123,17 +117,14 @@ if ($action == 'update')
 				if ($result < 0)
 				{
 					setEventMessages("update: ".$price_expression->error, $price_expression->errors, 'errors');
-				}
-				else {
+				} else {
 					setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 				}
 			}
-		}
-		elseif ($result < 0)
+		} elseif ($result < 0)
 		{
 			setEventMessages("update find: ".$price_expression->error, $price_expression->errors, 'errors');
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("ErrorRecordAlreadyExists"), null, 'errors');
 		}
 	}
@@ -214,8 +205,7 @@ print '<span id="back" class="butAction">'.$langs->trans("Back").'</span>';
 if ($eid == 0)
 {
 	print '<div class="inline-block divButAction"><span id="action-delete" class="butActionRefused classfortooltip">'.$langs->trans('Delete').'</span></div>'."\n";
-}
-else {
+} else {
 	print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;tab='.$tab.'&amp;eid='.$eid.'&amp;action=delete">'.$langs->trans("Delete").'</a></div>';
 }
 print '</div>';
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 3c4ebfc6acb..efcf0b33553 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -127,8 +127,7 @@ if (empty($reshook))
 			{
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 		        $action = '';
-			}
-			else {
+			} else {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
@@ -209,8 +208,7 @@ if (empty($reshook))
 				$error++;
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Price")), null, 'errors');
-			}
-			else {
+			} else {
 				$_POST["price"] = 0;
 			}
 		}
@@ -253,8 +251,7 @@ if (empty($reshook))
 					$productLink = $object->getNomUrl(1, 'supplier');
 
 					setEventMessages($langs->trans("ReferenceSupplierIsAlreadyAssociatedWithAProduct", $productLink), null, 'errors');
-				}
-				elseif ($ret < 0)
+				} elseif ($ret < 0)
 				{
 					$error++;
 					setEventMessages($object->error, $object->errors, 'errors');
@@ -284,8 +281,8 @@ if (empty($reshook))
                             $sql .= '"'.$value.'", ';
                         }
                         $sql = substr($sql, 0, strlen($sql) - 2).')';
-                    } // else update the existing one
-                    else {
+                    } else {
+                        // update the existing one
                         $sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields SET ";
                         foreach ($extrafield_values as $key => $value) {
                             $sql .= str_replace('options_', '', $key).' = "'.$value.'", ';
@@ -313,8 +310,7 @@ if (empty($reshook))
 				{
 					$error++;
 					setEventMessages($object->error, $object->errors, 'errors');
-				}
-				else {
+				} else {
 					if (!empty($conf->dynamicprices->enabled) && $price_expression !== '')
 					{
 						//Check the expression validity by parsing it
@@ -343,12 +339,10 @@ if (empty($reshook))
 			{
 				$db->commit();
 				$action = '';
-			}
-			else {
+			} else {
 				$db->rollback();
 			}
-		}
-		else {
+		} else {
 			$action = 'add_price';
 		}
 	}
@@ -447,8 +441,7 @@ if ($id > 0 || $ref)
 				{
 					$object->fetch_product_fournisseur_price($rowid, 1); //Ignore the math expression when getting the price
 					print load_fiche_titre($langs->trans("ChangeSupplierPrice"));
-				}
-				else {
+				} else {
 					print load_fiche_titre($langs->trans("AddSupplierPrice"));
 				}
 
@@ -471,8 +464,7 @@ if ($id > 0 || $ref)
 					print '<input type="hidden" name="ref_fourn_price_id" value="'.$rowid.'">';
 					print '<input type="hidden" name="rowid" value="'.$rowid.'">';
 					print '<input type="hidden" name="socid" value="'.$socid.'">';
-				}
-				else {
+				} else {
 					$events = array();
 					$events[] = array('method' => 'getVatRates', 'url' => dol_buildpath('/core/ajax/vatrates.php', 1), 'htmlname' => 'tva_tx', 'params' => array());
 					print $form->select_company(GETPOST("id_fourn", 'alpha'), 'id_fourn', 'fournisseur=1', 'SelectThirdParty', 0, 0, $events);
@@ -495,8 +487,7 @@ if ($id > 0 || $ref)
 				{
                     print '<input type="hidden" name="ref_fourn_old" value="'.$object->ref_supplier.'">';
                     print '<input class="flat" name="ref_fourn" size="12" value="'.$object->ref_supplier.'">';
-				}
-				else {
+				} else {
 					print '<input class="flat" name="ref_fourn" size="12" value="'.(GETPOST("ref_fourn") ?GETPOST("ref_fourn") : '').'">';
 				}
 				print '</td>';
@@ -520,8 +511,7 @@ if ($id > 0 || $ref)
 				{
 					print '<input type="hidden" name="qty" value="'.$object->fourn_qty.'">';
 					print $object->fourn_qty;
-				}
-				else {
+				} else {
 					print '<input class="flat" name="qty" size="5" value="'.$quantity.'">';
 				}
                 // Units
@@ -554,8 +544,7 @@ if ($id > 0 || $ref)
 				    $tmpproductsupplier->fetch_product_fournisseur_price($rowid, 1);
 					$default_vat = $tmpproductsupplier->fourn_tva_tx;
 					$default_npr = $tmpproductsupplier->fourn_tva_npr;
-				}
-				else {
+				} else {
                     if (empty($default_vat))
                     {
                         $default_vat = $object->tva_tx;
@@ -934,8 +923,7 @@ SCRIPT;
 						if ($usercancreate) // change required right here
 						{
 							print '<td class="left">'.$productfourn->getNomUrl().'</td>';
-						}
-						else {
+						} else {
 							print '<td class="left">'.$productfourn->fourn_ref.'</td>';
 						}
 
@@ -1087,8 +1075,7 @@ SCRIPT;
 
 						print '</tr>';
 					}
-				}
-				else {
+				} else {
 				    dol_print_error($db);
 				}
 
@@ -1097,8 +1084,7 @@ SCRIPT;
 			}
 		}
 	}
-}
-else {
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index ebe55716bae..f2a9ea98b79 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -225,8 +225,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 				if ($i < $nbmax)
 				{
 					$dataseries[] = array($obj->label, round($obj->nb));
-				}
-				else {
+				} else {
 					$rest += $obj->nb;
 				}
 				$total += $obj->nb;
@@ -246,8 +245,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 			$dolgraph->setHeight('200');
 			$dolgraph->draw('idstatscategproduct');
 			print $dolgraph->show($total ? 0 : 1);
-		}
-		else {
+		} else {
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($result);
@@ -383,8 +381,7 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us
 			print '</div>';
 			print '<br>';
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/product/inventory/ajax/ajax.inventory.php b/htdocs/product/inventory/ajax/ajax.inventory.php
index c258b63de2b..85dd488df6f 100644
--- a/htdocs/product/inventory/ajax/ajax.inventory.php
+++ b/htdocs/product/inventory/ajax/ajax.inventory.php
@@ -20,8 +20,7 @@ switch ($put)
 			$res = $det->update($user);
 
 			echo $det->qty_view;
-		}
-		else {
+		} else {
 			echo -2;
 		}
 
@@ -39,8 +38,7 @@ switch ($put)
 			$det->update($user);
 
 			echo $det->new_pmp;
-		}
-		else {
+		} else {
 			echo -2;
 		}
 
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index a5084c296a1..9f3afa55738 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -41,8 +41,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
 	$result = restrictedArea($user, 'stock', $id);
-}
-else {
+} else {
 	$result = restrictedArea($user, 'stock', $id, '', 'inventory_advance');
 }
 
@@ -79,8 +78,7 @@ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
 	$permissiontoadd = $user->rights->stock->creer;
 	$permissiontodelete = $user->rights->stock->supprimer;
-}
-else {
+} else {
 	$permissiontoadd = $user->rights->stock->inventory_advance->write;
 	$permissiontodelete = $user->rights->stock->inventory_advance->write;
 }
@@ -334,24 +332,21 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
         	if ($permissiontoadd)
     		{
     			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-    		}
-    		else {
+    		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
     		}
 
     		if ($permissiontoadd)
     		{
     			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Validate").'</a>'."\n";
-    		}
-    		else {
+    		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Validate').'</a>'."\n";
     		}
 
     		if ($permissiontodelete)
     		{
     			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
-    		}
-    		else {
+    		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
     		}
     	}
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 381c40d0aa4..983a7a4acb9 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -371,8 +371,7 @@ class Inventory extends CommonObject
             }
             $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -465,8 +464,7 @@ class Inventory extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 373164eeae4..5261b0432b8 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -41,8 +41,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
 	$result = restrictedArea($user, 'stock', $id);
-}
-else {
+} else {
 	$result = restrictedArea($user, 'stock', $id, '', 'inventory_advance');
 }
 
@@ -79,8 +78,7 @@ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
 	$permissiontoadd = $user->rights->stock->creer;
 	$permissiontodelete = $user->rights->stock->supprimer;
-}
-else {
+} else {
 	$permissiontoadd = $user->rights->stock->inventory_advance->write;
 	$permissiontodelete = $user->rights->stock->inventory_advance->write;
 }
@@ -266,8 +264,7 @@ if ($object->id > 0)
 		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 		print '<br>';
-	}
-	else {
+	} else {
     	print '<div class="tabsAction">'."\n";
     	$parameters = array();
     	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -280,8 +277,7 @@ if ($object->id > 0)
     			if ($permissiontoadd)
     			{
     				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Edit").'</a>'."\n";
-    			}
-    			else {
+    			} else {
     				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Edit').'</a>'."\n";
     			}
     		}
@@ -291,8 +287,7 @@ if ($object->id > 0)
 	        	if ($permissiontoadd)
 	    		{
 	    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate">'.$langs->trans("Validate").'</a>'."\n";
-	    		}
-	    		else {
+	    		} else {
 	    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Validate').'</a>'."\n";
 	    		}
     		}
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index c799ab7da87..4d451fcbeec 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -76,8 +76,7 @@ if ($user->socid > 0)	// Protection if external user
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
 	$result = restrictedArea($user, 'stock', $objectid);
-}
-else {
+} else {
 	$result = restrictedArea($user, 'stock', $objectid, '', 'inventory_advance');
 }
 
@@ -254,8 +253,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else {
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -376,8 +374,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		}
-		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 347281f0c75..e3889258df7 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -291,12 +291,10 @@ if ($search_type != '' && $search_type != '-1')
 	if ($search_type == 1)
 	{
 		$texte = $langs->trans("Services");
-	}
-	else {
+	} else {
 		$texte = $langs->trans("Products");
 	}
-}
-else {
+} else {
 	$texte = $langs->trans("ProductsAndServices");
 }
 
@@ -450,8 +448,7 @@ if ($resql)
 		if ($search_type == 0)
 		{
 			$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
-		}
-		elseif ($search_type == 1)
+		} elseif ($search_type == 1)
 		{
 			$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 		}
@@ -1058,15 +1055,13 @@ if ($resql)
 				if ((float) $duration_value > 1)
 				{
 				    $dur = array("i"=>$langs->trans("Minutes"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
-				}
-				elseif ((float) $duration_value > 0)
+				} elseif ((float) $duration_value > 0)
 				{
 				    $dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
 				}
 				print $duration_value;
 				print ((!empty($duration_unit) && isset($dur[$duration_unit]) && $duration_value != '') ? ' '.$langs->trans($dur[$duration_unit]) : '');
-			}
-			elseif (!preg_match('/^[a-z]$/i', $obj->duration))		// If duration is a simple char (like 's' of 'm'), we do not show value
+			} elseif (!preg_match('/^[a-z]$/i', $obj->duration))		// If duration is a simple char (like 's' of 'm'), we do not show value
 			{
 				print $obj->duration;
 			}
@@ -1213,8 +1208,7 @@ if ($resql)
 						{
 							$htmltext = $product_fourn->display_price_product_fournisseur(1, 1, 0, 1);
 							print $form->textwithpicto(price($product_fourn->fourn_unitprice * (1 - $product_fourn->fourn_remise_percent / 100) - $product_fourn->fourn_remise).' '.$langs->trans("HT"), $htmltext);
-						}
-						else print price($product_fourn->fourn_unitprice).' '.$langs->trans("HT");
+						} else print price($product_fourn->fourn_unitprice).' '.$langs->trans("HT");
 					}
 				}
 			}
@@ -1408,8 +1402,7 @@ if ($resql)
 	print "</table>";
 	print "</div>";
 	print '</form>';
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/product/popucom.php b/htdocs/product/popucom.php
index c21afa711e7..a0ee53a5758 100644
--- a/htdocs/product/popucom.php
+++ b/htdocs/product/popucom.php
@@ -62,12 +62,10 @@ $helpurl = '';
 if ($type == '0')
 {
     $helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
-}
-elseif ($type == '1')
+} elseif ($type == '1')
 {
     $helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-}
-else {
+} else {
     $helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 }
 $title = $langs->trans("Statistics");
@@ -151,8 +149,7 @@ if ($resql)
         $i++;
     }
     $db->free($resql);
-}
-else {
+} else {
     dol_print_error($db);
 }
 //var_dump($infoprod);
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 92de8b33546..b48afc6d162 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -62,12 +62,10 @@ $helpurl = '';
 if ($type == '0')
 {
 	$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
-}
-elseif ($type == '1')
+} elseif ($type == '1')
 {
 	$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-}
-else {
+} else {
 	$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 }
 $title = $langs->trans("Statistics");
@@ -151,8 +149,7 @@ if ($resql)
 		$i++;
 	}
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 //var_dump($infoprod);
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 1db2219bf63..2c1bc26d092 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -169,8 +169,7 @@ if (empty($reshook))
 	    if (!$error)
 	    {
 	        $db->commit();
-	    }
-	    else {
+	    } else {
 	        $db->rollback();
 	    }
 
@@ -274,8 +273,7 @@ if (empty($reshook))
 					break;
 				}
 			}
-		}
-		elseif (!$error)
+		} elseif (!$error)
 		{
 			$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
 
@@ -765,8 +763,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
 			//print vatrate($object->multiprices_tva_tx[$soc->price_level], true);
 			print '</td></tr>';
-		}
-		else {
+		} else {
         	// TVA
         	print '<tr><td>'.$langs->trans("DefaultTaxRate").'</td><td>';
 
@@ -784,16 +781,14 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
         	else print vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true);*/
         	print '</td></tr>';
 		}
-	}
-	else {
+	} else {
 		if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
 		{
 			// We show only vat for level 1
 			print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td>';
 			print '<td colspan="2">'.vatrate($object->multiprices_tva_tx[1], true).'</td>';
 			print '</tr>';
-		}
-		else {
+		} else {
             // TVA
 	        print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td><td>';
 
@@ -841,8 +836,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			    print '<input size="10" class="maxwidthonsmartphone" type="text" name="labelsellingprice" value="'.$conf->global->$keyforlabel.'">';
 			    print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 			    print '</form>';
-			}
-			else {
+			} else {
 			    print $langs->trans("SellingPrice").' '.$i;
 			    if (!empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
 			}
@@ -866,8 +860,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			if ($object->multiprices_base_type[$i] == 'TTC')
 			{
 				print price($object->multiprices_min_ttc[$i]).' '.$langs->trans($object->multiprices_base_type[$i]);
-			}
-			else {
+			} else {
 				print price($object->multiprices_min[$i]).' '.$langs->trans($object->multiprices_base_type[$i]);
 			}
 			print '</td></tr>';
@@ -947,8 +940,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			}
 		}
 	}
-}
-else {
+} else {
 	// TVA
 	print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td><td>';
 
@@ -990,8 +982,7 @@ else {
 		print '<tr><td>'.$langs->trans("PriceByQuantity");
 		if ($object->prices_by_qty[0] == 0) {
 			print '&nbsp; <a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=activate_price_by_qty&level=1">('.$langs->trans("Activate").')';
-		}
-		else {
+		} else {
 			print '&nbsp; <a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=disable_price_by_qty&level=1">('.$langs->trans("DisablePriceByQty").')';
 		}
 		print '</td><td>';
@@ -1280,8 +1271,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 		print '</div>';
 
 		print '<br></form>';
-	}
-	else {
+	} else {
 	    print '<!-- Edit price per level -->'."\n";
 	    ?>
 		<script>
@@ -1541,8 +1531,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
     				print '<td class="right"></td>';
     				print '<td class="right"></td>';
     				print '<td class="right">'.$title."</td>";
-    			}
-    			else {
+    			} else {
     				print '<td class="right">';
     				if (empty($objp->price_by_qty)) {
     					print price($objp->price);
@@ -1587,8 +1576,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
     			    {
     			        if (empty($notfirstlineforlevel[$objp->price_level])) $notfirstlineforlevel[$objp->price_level] = 1;
     			        else $candelete = 1;
-    			    }
-    			    elseif ($i > 0) $candelete = 1;
+    			    } elseif ($i > 0) $candelete = 1;
 
     				print '<td class="right">';
     				if ($candelete)
@@ -1723,8 +1711,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '</div>';
 
 		print '</form>';
-	}
-	elseif ($action == 'edit_customer_price')
+	} elseif ($action == 'edit_customer_price')
 	{
 		// Edit mode
 		$maxpricesupplier = $object->min_recommended_price();
@@ -1817,8 +1804,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '</div>';
 
 		print '<br></form>';
-	}
-	elseif ($action == 'showlog_customer_price')
+	} elseif ($action == 'showlog_customer_price')
 	{
 		// List of all log of prices by customers
 		print '<!-- list of all log of prices per customer -->'."\n";
@@ -1865,8 +1851,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 			{
 				//print '<td class="right">' . $langs->trans("INCVATONLY") . '</td>';
 				print '<td class="right">'.$langs->trans("INCT").'</td>';
-			}
-			else {
+			} else {
 				print '<td class="right">'.$langs->trans("TTC").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
@@ -1887,8 +1872,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				if ($line->price_base_type == 'HT')
 				{
 				    $pu = $line->price;
-				}
-				else {
+				} else {
 				    $pu = $line->price_ttc;
 				}
 
@@ -1926,8 +1910,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
 					//print '<td class="right">' . price($line->price_ttc) . "</td>";
 					print '<td class="right">'.price($resultarray[2]).'</td>';
-				}
-				else {
+				} else {
 					print '<td class="right">'.price($line->price_ttc)."</td>";
 				}
 
@@ -1947,8 +1930,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		} else {
 			print $langs->trans('None');
 		}
-	}
-	elseif ($action != 'showlog_default_price' && $action != 'edit_price')
+	} elseif ($action != 'showlog_default_price' && $action != 'edit_price')
 	{
 		// List of all prices by customers
         print '<!-- list of all prices per customer -->'."\n";
@@ -1999,8 +1981,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		{
 			//print '<td class="right">' . $langs->trans("INCVATONLY") . '</td>';
 			print '<td class="right">'.$langs->trans("INCT").'</td>';
-		}
-		else {
+		} else {
 			print '<td class="right">'.$langs->trans("TTC").'</td>';
 		}
 
@@ -2014,8 +1995,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		if ($object->price_base_type == 'HT')
 		{
 		    $pu = $object->price;
-		}
-		else {
+		} else {
 		    $pu = $object->price_ttc;
 		}
 
@@ -2054,8 +2034,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		{
 			//print '<td class="right">' . price($object->price_ttc) . "</td>";
 			print '<td class="right">'.price($resultarray[2]).'</td>';
-		}
-		else {
+		} else {
 			print '<td class="right">'.price($object->price_ttc)."</td>";
 		}
 
@@ -2093,8 +2072,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				if ($line->price_base_type == 'HT')
 				{
 				    $pu = $line->price;
-				}
-				else {
+				} else {
 				    $pu = $line->price_ttc;
 				}
 
@@ -2131,8 +2109,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
 					//print '<td class="right">' . price($line->price_ttc) . "</td>";
 					print '<td class="right">'.price($resultarray[2]).'</td>';
-				}
-				else {
+				} else {
 					print '<td class="right">'.price($line->price_ttc)."</td>";
 				}
 
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index a3c5da0c8e6..a13c22ff4e7 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -136,8 +136,7 @@ if (dol_strlen($type))
     if ($type == 1)
     {
         $sql .= " AND p.fk_product_type = '1'";
-    }
-    else {
+    } else {
         $sql .= " AND p.fk_product_type <> '1'";
     }
 }
@@ -187,8 +186,7 @@ if ($resql)
 
 	if (isset($type))
 	{
-		if ($type == 1) { $texte = $langs->trans("Services"); }
-		else { $texte = $langs->trans("Products"); }
+		if ($type == 1) { $texte = $langs->trans("Services"); } else { $texte = $langs->trans("Products"); }
 	} else {
 		$texte = $langs->trans("ProductsAndServices");
 	}
@@ -402,8 +400,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 76184f4025d..de49a11fbc7 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -139,8 +139,7 @@ if (dol_strlen($type))
     if ($type == 1)
     {
         $sql .= " AND p.fk_product_type = '1'";
-    }
-    else {
+    } else {
         $sql .= " AND p.fk_product_type <> '1'";
     }
 }
@@ -196,8 +195,7 @@ if ($resql)
 
 	if (isset($type))
 	{
-		if ($type == 1) { $texte = $langs->trans("Services"); }
-		else { $texte = $langs->trans("Products"); }
+		if ($type == 1) { $texte = $langs->trans("Services"); } else { $texte = $langs->trans("Products"); }
 	} else {
 		$texte = $langs->trans("ProductsAndServices");
 	}
@@ -421,8 +419,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 6e18bea494e..d77c03f4d0d 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -90,14 +90,12 @@ if (!$id && empty($ref))
         $helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
         //$title=$langs->trans("StatisticsOfProducts");
         $title = $langs->trans("Statistics");
-    }
-    elseif ($type == '1')
+    } elseif ($type == '1')
     {
         $helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
         //$title=$langs->trans("StatisticsOfServices");
         $title = $langs->trans("Statistics");
-    }
-    else {
+    } else {
         $helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
         //$title=$langs->trans("StatisticsOfProductsOrServices");
         $title = $langs->trans("Statistics");
@@ -107,8 +105,7 @@ if (!$id && empty($ref))
     if ($type == 1) $picto = 'service';
 
     print load_fiche_titre($title, $mesg, $picto);
-}
-else {
+} else {
     $result = $object->fetch($id, $ref);
 
 	$title = $langs->trans('ProductServiceCard');
@@ -322,8 +319,7 @@ if ($result || empty($id))
 				if (dol_is_file($dir.'/'.$graphfiles[$key]['file']))
 				{
 					// TODO Load cachefile $graphfiles[$key]['file']
-				}
-				else {
+				} else {
 				    $morefilters = '';
 				    if ($search_categ > 0)
 				    {
@@ -367,8 +363,7 @@ if ($result || empty($id))
 
 					$graphfiles[$key]['total'] = $px->total();
 					$graphfiles[$key]['output'] = $px->show();
-				}
-				else {
+				} else {
 					dol_print_error($db, 'Error for calculating graph on key='.$key.' - '.$object->error);
 				}
 			}
@@ -397,8 +392,7 @@ if ($result || empty($id))
 			if ($i % 2 == 0)
 			{
 				print "\n".'<div class="fichecenter"><div class="fichehalfleft">'."\n";
-			}
-			else {
+			} else {
 				print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
 			}
 
@@ -407,8 +401,7 @@ if ($result || empty($id))
 			{
 			    if (file_exists($dir."/".$graphfiles[$key]['file']) && filemtime($dir."/".$graphfiles[$key]['file'])) $dategenerated = $langs->trans("GeneratedOn", dol_print_date(filemtime($dir."/".$graphfiles[$key]['file']), "dayhour"));
 			    else $dategenerated = $langs->trans("GeneratedOn", dol_print_date(dol_now(), "dayhour"));
-			}
-			else {
+			} else {
 			    $dategenerated = ($mesg ? '<font class="error">'.$mesg.'</font>' : $langs->trans("ChartNotGenerated"));
 			}
 			$linktoregenerate = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id') ?GETPOST('id') : $object->id).((string) $type != '' ? '&type='.$type : '').'&action=recalcul&mode='.$mode.'&search_year='.$search_year.'&search_categ='.$search_categ.'">'.img_picto($langs->trans("ReCalculate").' ('.$dategenerated.')', 'refresh').'</a>';
@@ -430,8 +423,7 @@ if ($result || empty($id))
 			if ($i % 2 == 0)
 			{
 				print "\n".'</div>'."\n";
-			}
-			else {
+			} else {
 				print "\n".'</div></div></div>';
 				print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
 			}
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 41da6fc1f33..194de1c6ddf 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -220,14 +220,12 @@ if ($id > 0 || !empty($ref))
 			print '</table>';
 			print '</div>';
 			print '</form>';
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 		$db->free($result);
 	}
-}
-else {
+} else {
 	dol_print_error();
 }
 
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 342cd3058a2..731a3762728 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -143,8 +143,7 @@ if ($id > 0 || !empty($ref))
 		if ($showmessage && $nboflines > 1)
 		{
 			print '<span class="opacitymedium">'.$langs->trans("ClinkOnALinkOfColumn", $langs->transnoentitiesnoconv("Referers")).'</span>';
-		}
-        elseif ($user->rights->facture->lire)
+		} elseif ($user->rights->facture->lire)
         {
             $sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client,";
             $sql .= " f.ref, f.datef, f.paye, f.type, f.fk_statut as statut, f.rowid as facid,";
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index e2be34d6e85..d8dfa9053e8 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -213,14 +213,12 @@ if ($id > 0 || !empty($ref))
 			print '</table>';
 			print '</div>';
 			print '</form>';
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 		$db->free($result);
 	}
-}
-else {
+} else {
 	dol_print_error();
 }
 
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 117ff5801d9..f78eaea055e 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -136,8 +136,7 @@ if (empty($reshook))
 	                setEventMessages($object->error, $object->errors, 'errors');
 	            }
 	        }
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("ErrorWarehouseRefRequired"), null, 'errors');
 			$action = "create"; // Force retour sur page creation
 		}
@@ -153,8 +152,7 @@ if (empty($reshook))
 		    setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 			header("Location: ".DOL_URL_ROOT.'/product/stock/list.php?restore_lastsearch_values=1');
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
@@ -194,13 +192,11 @@ if (empty($reshook))
 				$object->setCategories($categories);
 	            $action = '';
 	        }
-		}
-		else {
+		} else {
 			$action = 'edit';
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	elseif ($action == 'update_extras') {
+	} elseif ($action == 'update_extras') {
 	    $object->oldcopy = dol_clone($object);
 
 	    // Fill array 'array_options' with data from update form
@@ -312,8 +308,7 @@ if ($action == 'create')
 		if ($key == 1)
 		{
 			print '<option value="'.$key.'" selected>'.$langs->trans($value).'</option>';
-		}
-		else {
+		} else {
 			print '<option value="'.$key.'">'.$langs->trans($value).'</option>';
 		}
 	}
@@ -341,8 +336,7 @@ if ($action == 'create')
 	print '</div>';
 
 	print '</form>';
-}
-else {
+} else {
     $id = GETPOST("id", 'int');
 	if ($id > 0 || $ref)
 	{
@@ -663,8 +657,7 @@ else {
                 print '<td class="liste_total">&nbsp;</td>';
 				print '<td class="liste_total">&nbsp;</td>';
 				print '</tr>';
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 			print "</table>\n";
@@ -742,8 +735,7 @@ else {
 				if ($key == $object->statut)
 				{
 					print '<option value="'.$key.'" selected>'.$langs->trans($value).'</option>';
-				}
-				else {
+				} else {
 					print '<option value="'.$key.'">'.$langs->trans($value).'</option>';
 				}
 			}
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index 0c61ae605c0..a8e15f8f28e 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -144,8 +144,7 @@ class StockMovements extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve stock movement list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index 0d244785479..e84b017ed93 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -151,8 +151,7 @@ class Warehouses extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve warehouse list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 5df50b1ae23..cae51ea4b3f 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -165,8 +165,7 @@ class Entrepot extends CommonObject
 		{
 			$this->statuts[self::STATUS_OPEN_ALL] = 'OpenAll';
 			$this->statuts[self::STATUS_OPEN_INTERNAL] = 'OpenInternal';
-		}
-		else {
+		} else {
 			$this->statuts[self::STATUS_OPEN_ALL] = 'Opened';
 		}
 	}
@@ -234,20 +233,17 @@ class Entrepot extends CommonObject
 				{
 					$this->db->commit();
 					return $id;
-				}
-				else {
+				} else {
 					dol_syslog(get_class($this)."::create return -3");
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else {
+			} else {
 				$this->error = "Failed to get insert id";
 				dol_syslog(get_class($this)."::create return -2");
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this)."::create Error ".$this->db->error());
 			$this->db->rollback();
@@ -422,8 +418,7 @@ class Entrepot extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -456,8 +451,7 @@ class Entrepot extends CommonObject
 		if ($id)
 		{
 			$sql .= " WHERE rowid = '".$id."'";
-		}
-		else {
+		} else {
 			$sql .= " WHERE entity = ".$conf->entity;
 			if ($ref) $sql .= " AND ref = '".$this->db->escape($ref)."'";
 		}
@@ -494,13 +488,11 @@ class Entrepot extends CommonObject
 				$this->country_code = $tmp['code'];
 
 				return 1;
-			}
-			else {
+			} else {
                 $this->error = "Record Not Found";
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -546,8 +538,7 @@ class Entrepot extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else {
+		} else {
 	        dol_print_error($this->db);
 		}
 	}
@@ -610,8 +601,7 @@ class Entrepot extends CommonObject
 			$obj = $this->db->fetch_object($result);
 			$ret['nb'] = $obj->nb;
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -644,8 +634,7 @@ class Entrepot extends CommonObject
 			$ret['nb'] = $obj->nb;
 			$ret['value'] = $obj->value;
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -800,10 +789,8 @@ class Entrepot extends CommonObject
                 	$warehousetmp->fetch($parentid);
                 	$TArbo[] = $warehousetmp->label;
                  	$parentid = $objarbo->fk_parent;
-                }
-                else break;
-            }
-            else dol_print_error($this->db);
+                } else break;
+            } else dol_print_error($this->db);
 
             $i++;
         }
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 5ef50f798d0..ef6b583dd0f 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -1118,20 +1118,16 @@ class MouvementStock extends CommonObject
 		if ($mode == 0 || $mode == 1)
 		{
 			return $langs->trans('StatusNotApplicable');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			return img_picto($langs->trans('StatusNotApplicable'), 'statut9').' '.$langs->trans('StatusNotApplicable');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			return img_picto($langs->trans('StatusNotApplicable'), 'statut9');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			return img_picto($langs->trans('StatusNotApplicable'), 'statut9').' '.$langs->trans('StatusNotApplicable');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			return $langs->trans('StatusNotApplicable').' '.img_picto($langs->trans('StatusNotApplicable'), 'statut9');
 		}
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index f0a5c0a48ea..b495f64485a 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -571,8 +571,7 @@ class Productlot extends CommonObject
         	}
         	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
         	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $linkstart = '<a href="'.$url.'"';
         $linkstart .= $linkclose.'>';
diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php
index 2b7069c82b5..469cec4a9a2 100644
--- a/htdocs/product/stock/class/productstockentrepot.class.php
+++ b/htdocs/product/stock/class/productstockentrepot.class.php
@@ -532,28 +532,23 @@ class ProductStockEntrepot extends CommonObject
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
diff --git a/htdocs/product/stock/fiche-valo.php b/htdocs/product/stock/fiche-valo.php
index 5fd74431fe6..494f6042ff1 100644
--- a/htdocs/product/stock/fiche-valo.php
+++ b/htdocs/product/stock/fiche-valo.php
@@ -130,8 +130,7 @@ if ($_GET["id"])
 			$url = DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file=entrepot-'.$entrepot->id.'-'.($year - 1).'.png';
 			print '<br><img src="'.$url.'" alt="Valorisation du stock annee '.($year - 1).'">';
 		}
-	}
-	else {
+	} else {
 		$langs->load("errors");
 		print $langs->trans("FeatureNotYetAvailable");
 	}
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index 75b15ad777c..fc43d5e8ce3 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -121,8 +121,7 @@ if ($result)
 
     print "</table>";
     print '</div>';
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/product/stock/lib/replenishment.lib.php b/htdocs/product/stock/lib/replenishment.lib.php
index c63878aebbe..b6ce237a2b5 100644
--- a/htdocs/product/stock/lib/replenishment.lib.php
+++ b/htdocs/product/stock/lib/replenishment.lib.php
@@ -141,8 +141,7 @@ function ordered($product_id)
 		} else {
 			return null; //img_picto('', 'stcomm-1');
 		}
-	}
-	else {
+	} else {
 		$error = $db->lasterror();
 		dol_print_error($db);
 
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 0fc6e5cdb6f..948398ce157 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -292,8 +292,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else {
+} else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -419,8 +418,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		elseif (strpos($val['type'], 'integer:') === 0 || strpos($val['type'], 'sellist:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		}
-		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
@@ -550,11 +548,9 @@ if ($num)
 				if ($key == 'statut') print $warehouse->getLibStatut(5);
 				if ($key == 'phone') {
 					print dol_print_phone($obj->phone, '', 0, $obj->rowid, 'AC_TEL');
-				}
-				elseif ($key == 'fax') {
+				} elseif ($key == 'fax') {
 					print dol_print_phone($obj->fax, '', 0, $obj->rowid, 'AC_FAX');
-				}
-				else {
+				} else {
 					print $warehouse->showOutputField($val, $key, $warehouse->$key, '');
 				}
 				print '</td>';
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index bb9493c05d4..0c7d0ff4434 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -125,8 +125,7 @@ if ($action == 'addline')
 		// Warning, don't forget lines already added into the $_SESSION['massstockmove']
 		if ($producttmp->hasbatch())
 		{
-		}
-		else {
+		} else {
 		}
 	}
 
@@ -224,8 +223,7 @@ if ($action == 'createmovements')
 						$error++;
 						setEventMessages($product->errors, $product->errorss, 'errors');
 					}
-				}
-				else {
+				} else {
 					$arraybatchinfo = $product->loadBatchInfo($batch);
 					if (count($arraybatchinfo) > 0)
 					{
@@ -233,8 +231,7 @@ if ($action == 'createmovements')
 						$dlc = $firstrecord['eatby'];
 						$dluo = $firstrecord['sellby'];
 						//var_dump($batch); var_dump($arraybatchinfo); var_dump($firstrecord); var_dump($dlc); var_dump($dluo); exit;
-					}
-					else {
+					} else {
 						$dlc = '';
 						$dluo = '';
 					}
@@ -277,8 +274,7 @@ if ($action == 'createmovements')
 						setEventMessages($product->errors, $product->errorss, 'errors');
 					}
 				}
-			}
-			else {
+			} else {
 				// dol_print_error('',"Bad value saved into sessions");
 				$error++;
 			}
@@ -293,8 +289,7 @@ if ($action == 'createmovements')
 		setEventMessages($langs->trans("StockMovementRecorded"), null, 'mesgs');
 		header("Location: ".DOL_URL_ROOT.'/product/stock/index.php'); // Redirect to avoid pb when using back
 		exit;
-	}
-	else {
+	} else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -358,8 +353,7 @@ $filtertype = 0;
 if (!empty($conf->global->STOCK_SUPPORTS_SERVICES)) $filtertype = '';
 if ($conf->global->PRODUIT_LIMIT_SIZE <= 0) {
 	$limit = '';
-}
-else {
+} else {
 	$limit = $conf->global->PRODUIT_LIMIT_SIZE;
 }
 
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index 9bf5ede3bce..ca9a09449ca 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -207,8 +207,7 @@ if ($action == "correct_stock")
 	        	$origin_element,
 	        	$origin_id
 	        ); // We do not change value of stock for a correction
-        }
-        else {
+        } else {
 	        $result = $product->correct_stock(
 	            $user,
 	            $id,
@@ -226,8 +225,7 @@ if ($action == "correct_stock")
         {
             header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
             exit;
-        }
-        else {
+        } else {
             $error++;
             setEventMessages($product->error, $product->errors, 'errors');
             $action = 'correction';
@@ -310,13 +308,11 @@ if ($action == "transfert_stock" && !$cancel)
                         $batch = $pdluo->batch;
                         $eatby = $pdluo->eatby;
                         $sellby = $pdluo->sellby;
-                    }
-                    else {
+                    } else {
                         setEventMessages($pdluo->error, $pdluo->errors, 'errors');
                         $error++;
                     }
-                }
-                else {
+                } else {
                     $srcwarehouseid = $id;
                     $batch = GETPOST('batch_number', 'alpha');
                     $eatby = $d_eatby;
@@ -352,8 +348,7 @@ if ($action == "transfert_stock" && !$cancel)
                         GETPOST('inventorycode', 'alpha')
                     );
                 }
-            }
-            else {
+            } else {
                 // Remove stock
                 $result1 = $product->correct_stock(
                     $user,
@@ -384,13 +379,11 @@ if ($action == "transfert_stock" && !$cancel)
                 {
                     header("Location: ".$backtopage);
                     exit;
-                }
-                else {
+                } else {
                     header("Location: movement_list.php?id=".$object->id);
                     exit;
                 }
-            }
-            else {
+            } else {
                 setEventMessages($product->error, $product->errors, 'errors');
                 $db->rollback();
                 $action = 'transfert';
@@ -498,8 +491,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (empty($search_inventorycode))
 {
 	$sql .= $db->plimit($limit + 1, $offset);
-}
-else {
+} else {
 	$limit = 0;
 }
 
@@ -611,8 +603,7 @@ if ($resql)
         {
             $obj = $db->fetch_object($resqlbis);
             $lastmovementdate = $db->jdate($obj->datem);
-        }
-        else {
+        } else {
             dol_print_error($db);
         }
 
@@ -620,8 +611,7 @@ if ($resql)
         if ($lastmovementdate)
         {
             print dol_print_date($lastmovementdate, 'dayhour');
-        }
-        else {
+        } else {
             print $langs->trans("None");
         }
         print "</td></tr>";
@@ -1138,8 +1128,7 @@ if ($resql)
     	print "<br>\n";
         //print '</td></tr>';
     }
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index d17fce1e580..320c46292cd 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -230,8 +230,7 @@ if ($action == "correct_stock")
 	        	$origin_element,
 	        	$origin_id
 	        ); // We do not change value of stock for a correction
-        }
-        else {
+        } else {
 			$result = $product->correct_stock(
 	            $user,
 	            $id,
@@ -249,8 +248,7 @@ if ($action == "correct_stock")
         {
             header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
             exit;
-        }
-        else {
+        } else {
             $error++;
             setEventMessages($product->error, $product->errors, 'errors');
             $action = 'correction';
@@ -333,13 +331,11 @@ if ($action == "transfert_stock" && !$cancel)
                         $batch = $pdluo->batch;
                         $eatby = $pdluo->eatby;
                         $sellby = $pdluo->sellby;
-                    }
-                    else {
+                    } else {
                         setEventMessages($pdluo->error, $pdluo->errors, 'errors');
                         $error++;
                     }
-                }
-                else {
+                } else {
                     $srcwarehouseid = $id;
                     $batch = GETPOST('batch_number', 'alphanohtml');
                     $eatby = $d_eatby;
@@ -371,8 +367,7 @@ if ($action == "transfert_stock" && !$cancel)
                     	GETPOST('inventorycode', 'alphanohtml')
                         );
                 }
-            }
-            else {
+            } else {
                 // Remove stock
                 $result1 = $product->correct_stock(
                     $user,
@@ -403,13 +398,11 @@ if ($action == "transfert_stock" && !$cancel)
                 {
                     header("Location: ".$backtopage);
                     exit;
-                }
-                else {
+                } else {
                     header("Location: movement_list.php?id=".$object->id);
                     exit;
                 }
-            }
-            else {
+            } else {
                 setEventMessages($product->error, $product->errors, 'errors');
                 $db->rollback();
                 $action = 'transfert';
@@ -496,8 +489,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (empty($search_inventorycode))
 {
 	$sql .= $db->plimit($limit + 1, $offset);
-}
-else {
+} else {
 	$limit = 0;
 }
 
@@ -609,8 +601,7 @@ if ($resql)
         {
             $objbis = $db->fetch_object($resqlbis);
             $lastmovementdate = $db->jdate($objbis->datem);
-        }
-        else {
+        } else {
             dol_print_error($db);
         }
 
@@ -618,8 +609,7 @@ if ($resql)
         if ($lastmovementdate)
         {
             print dol_print_date($lastmovementdate, 'dayhour');
-        }
-        else {
+        } else {
             print $langs->trans("None");
         }
         print "</td></tr>";
@@ -1182,8 +1172,7 @@ if ($resql)
     	print "<br>\n";
     	//print '</td></tr>';
     }
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 0894ac2ce8b..946381d15bc 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -255,8 +255,7 @@ if ($action == "correct_stock" && !$cancel)
 					$origin_element,
 					$origin_id
 				); // We do not change value of stock for a correction
-			}
-			else {
+			} else {
 				$result = $object->correct_stock(
 		    		$user,
 		    		GETPOST("id_entrepot"),
@@ -276,13 +275,11 @@ if ($action == "correct_stock" && !$cancel)
 				{
 					header("Location: ".$backtopage);
 					exit;
-				}
-				else {
+				} else {
 	            	header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 					exit;
 				}
-			}
-			else {
+			} else {
 			    setEventMessages($object->error, $object->errors, 'errors');
 			    $action = 'correction';
 			}
@@ -353,13 +350,11 @@ if ($action == "transfert_stock" && !$cancel)
 						$batch = $pdluo->batch;
 						$eatby = $pdluo->eatby;
 						$sellby = $pdluo->sellby;
-					}
-					else {
+					} else {
 						setEventMessages($pdluo->error, $pdluo->errors, 'errors');
 						$error++;
 					}
-				}
-				else {
+				} else {
 					$srcwarehouseid = GETPOST('id_entrepot', 'int');
 					$batch = $batchnumber;
 					$eatby = $d_eatby;
@@ -396,8 +391,7 @@ if ($action == "transfert_stock" && !$cancel)
 					);
 					if ($result2 < 0) $error++;
 				}
-			}
-			else {
+			} else {
 				if (!$error)
 				{
     			    // Remove stock
@@ -437,13 +431,11 @@ if ($action == "transfert_stock" && !$cancel)
 				{
 					header("Location: ".$backtopage);
 					exit;
-				}
-				else {
+				} else {
 					header("Location: product.php?id=".$object->id);
 					exit;
 				}
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
 				$action = 'transfert';
@@ -464,8 +456,7 @@ if ($action == 'updateline' && GETPOST('save') == $langs->trans('Save'))
         {
             if ((!GETPOST("sellby")) && (!GETPOST("eatby")) && (!$batchnumber)) {
                 setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("atleast1batchfield")), null, 'errors');
-            }
-            else {
+            } else {
                 $d_eatby = dol_mktime(0, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
                 $d_sellby = dol_mktime(0, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
                 $pdluo->batch = $batchnumber;
@@ -477,12 +468,10 @@ if ($action == 'updateline' && GETPOST('save') == $langs->trans('Save'))
                     setEventMessages($pdluo->error, $pdluo->errors, 'errors');
                 }
             }
-        }
-        else {
+        } else {
             setEventMessages($langs->trans('BatchInformationNotfound'), null, 'errors');
         }
-    }
-    else {
+    } else {
         setEventMessages($pdluo->error, null, 'errors');
     }
     header("Location: product.php?id=".$id);
@@ -742,8 +731,7 @@ if ($id > 0 || $ref)
 		include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stocktransfer.tpl.php';
 		print '<br><br>';
 	}
-}
-else {
+} else {
 	dol_print_error();
 }
 
@@ -767,12 +755,10 @@ if (empty($reshook))
 		{
 			if (!$variants || !empty($conf->global->VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT)) {
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=correction">'.$langs->trans("CorrectStock").'</a>';
-			}
-			else {
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ActionAvailableOnVariantProductOnly").'">'.$langs->trans("CorrectStock").'</a>';
 			}
-		}
-		else {
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CorrectStock").'</a>';
 		}
 
@@ -781,12 +767,10 @@ if (empty($reshook))
 		{
 			if (!$variants || !empty($conf->global->VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT)) {
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=transfert">'.$langs->trans("TransferStock").'</a>';
-			}
-			else {
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ActionAvailableOnVariantProductOnly").'">'.$langs->trans("TransferStock").'</a>';
 			}
-		}
-		else {
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CorrectStock").'</a>';
 		}
 
@@ -1076,8 +1060,7 @@ if (!$variants) {
 			print '<td class="right">'.$stock_total.'</td>';
 			print '<td></td>';
 			print '</tr>';
-		}
-		else {
+		} else {
 			print '<tr><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 		}
 		?>
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 6318c059458..0fd37e3f55b 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -183,8 +183,7 @@ if (empty($reshook))
 			else setEventMessages($object->error, null, 'errors');
 				$action = 'create';
 			}
-		}
-		else {
+		} else {
 			$action = 'create';
 		}
 	}
@@ -216,15 +215,13 @@ if (empty($reshook))
 			if ($result > 0)
 			{
 				$action = 'view';
-			}
-			else {
+			} else {
 				// Creation KO
 				if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 				else setEventMessages($object->error, null, 'errors');
 				$action = 'edit';
 			}
-		}
-		else {
+		} else {
 			$action = 'edit';
 		}
 	}
@@ -239,8 +236,7 @@ if (empty($reshook))
 			setEventMessages("RecordDeleted", null, 'mesgs');
 			header("Location: ".dol_buildpath('/stock/list.php', 1));
 			exit;
-		}
-		else {
+		} else {
 			if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 			else setEventMessages($object->error, null, 'errors');
 		}
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index d3927d113b4..6a28f595f86 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -154,8 +154,7 @@ if ($object->id)
     $permission = ($user->rights->produit->creer);
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 5a600b619ba..0fb3c4a0388 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -541,8 +541,7 @@ if ($resql)
 
 	print $formfile->showdocuments('massfilesarea_orders','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
 	*/
-}
-else {
+} else {
 	$error++;
 	dol_print_error($db);
 }
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index f87891666df..7ce22067c46 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -177,12 +177,10 @@ if ($action == 'order' && isset($_POST['valid']))
 						$line->fk_unit = $productsupplier->fk_unit;
 	                    $suppliers[$productsupplier->fourn_socid]['lines'][] = $line;
                 	}
-                }
-				elseif ($idprod == -1)
+                } elseif ($idprod == -1)
 				{
 					$errorQty++;
-				}
-                else {
+				} else {
                     $error = $db->lasterror();
                     dol_print_error($db);
                 }
@@ -271,8 +269,7 @@ if ($action == 'order' && isset($_POST['valid']))
             setEventMessages($langs->trans('OrderCreated'), null, 'mesgs');
             header('Location: replenishorders.php');
             exit;
-        }
-        else {
+        } else {
         	$db->rollback();
         }
     }
@@ -669,8 +666,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 		{
 			// If option to increase/decrease is not on an object validation, virtual stock may differs from physical stock.
 			$stock = $prod->stock_theorique;
-		}
-		else {
+		} else {
 			$stock = $prod->stock_reel;
 		}
 
@@ -710,8 +706,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 			{
 				$picto = img_picto('', './img/yes', '', 1);
 				$disabled = 'disabled';
-			}
-			else {
+			} else {
 				$picto = img_picto('', './img/no', '', 1);
 			}
 		} else {
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 9913e612435..b316d269c3a 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -314,8 +314,7 @@ if ($resql)
     $db->free($resql);
 
     dol_fiche_end();
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index 56580c7df53..097f1d2c84b 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -46,8 +46,7 @@ if ($pdluoid > 0)
 	if ($result > 0)
 	{
 		$pdluoid = $pdluo->id;
-	}
-	else {
+	} else {
 		dol_print_error($db, $pdluo->error, $pdluo->errors);
 	}
 }
@@ -103,8 +102,7 @@ if (!empty($conf->productbatch->enabled) &&
 		// If form was opened for a specific pdluoid, field is disabled
 		print '<input type="text" name="batch_number_bis" size="40" disabled="disabled" value="'.(GETPOST('batch_number') ?GETPOST('batch_number') : $pdluo->batch).'">';
 		print '<input type="hidden" name="batch_number" value="'.(GETPOST('batch_number') ?GETPOST('batch_number') : $pdluo->batch).'">';
-	}
-	else {
+	} else {
 		print '<input type="text" name="batch_number" size="40" value="'.(GETPOST('batch_number') ?GETPOST('batch_number') : $pdluo->batch).'">';
 	}
 	print '</td>';
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 74c7fb21d5f..182d78e9cd1 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -149,8 +149,7 @@ if ($result)
         $url = DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
         print '<br><img src="'.$url.'">';
     }
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index c803ea7adf1..4e5c7b13458 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -78,8 +78,7 @@ $cancel != $langs->trans("Cancel") &&
 		$object->label			= $_POST["libelle"];
 		$object->description = dol_htmlcleanlastbr($_POST["desc"]);
 		$object->other			= dol_htmlcleanlastbr($_POST["other"]);
-	}
-	else {
+	} else {
 		$object->multilangs[$_POST["forcelangprod"]]["label"]		= $_POST["libelle"];
 		$object->multilangs[$_POST["forcelangprod"]]["description"] = dol_htmlcleanlastbr($_POST["desc"]);
 		$object->multilangs[$_POST["forcelangprod"]]["other"]		= dol_htmlcleanlastbr($_POST["other"]);
@@ -89,8 +88,7 @@ $cancel != $langs->trans("Cancel") &&
 	if ($object->setMultiLangs($user) > 0)
 	{
 		$action = '';
-	}
-	else {
+	} else {
 		$action = 'add';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -112,8 +110,7 @@ $cancel != $langs->trans("Cancel") &&
 			$object->label			= $_POST["libelle-".$key];
 			$object->description = dol_htmlcleanlastbr($_POST["desc-".$key]);
 			$object->other			= dol_htmlcleanlastbr($_POST["other-".$key]);
-		}
-		else {
+		} else {
 			$object->multilangs[$key]["label"]			= $_POST["libelle-".$key];
 			$object->multilangs[$key]["description"] = dol_htmlcleanlastbr($_POST["desc-".$key]);
 			$object->multilangs[$key]["other"]			= dol_htmlcleanlastbr($_POST["other-".$key]);
@@ -123,8 +120,7 @@ $cancel != $langs->trans("Cancel") &&
 	if ($object->setMultiLangs($user) > 0)
 	{
 		$action = '';
-	}
-	else {
+	} else {
 		$action = 'edit';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -143,8 +139,7 @@ $cancel != $langs->trans("Cancel") &&
 	if ($object->delMultiLangs($langtodelete, $user) > 0)
 	{
 		$action = '';
-	}
-	else {
+	} else {
 		$action = 'edit';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -271,8 +266,7 @@ if ($action == 'edit')
 	print '</div>';
 
 	print '</form>';
-}
-elseif ($action != 'add')
+} elseif ($action != 'add')
 {
 	if (!empty($object->multilangs))
 	{
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index c8bc07400b5..da8a6dc9c0c 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -169,8 +169,7 @@ if ($resql)
 	}
 
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 print '<tr class="liste_total">';
@@ -225,8 +224,7 @@ if ($resql)
 	}
 
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 print '<tr class="liste_total">';
@@ -336,8 +334,7 @@ if (!empty($conf->global->PROJECT_TASK_TIME_MONTH))
     		print "</tr>\n";
     	}
     	$db->free($resql);
-    }
-    else {
+    } else {
     	dol_print_error($db);
     }
     print '<tr class="liste_total">';
@@ -387,8 +384,7 @@ if (!empty($conf->global->PROJECT_TASK_TIME_YEAR))
 			print "</tr>\n";
 		}
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 	print '<tr class="liste_total">';
@@ -413,8 +409,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
         {
             $listofprojectcontacttype[$obj->rowid] = $obj->code;
         }
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
     if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
     // Get id of types of contacts for tasks (This list never contains a lot of elements)
     $listoftaskcontacttype = array();
@@ -428,8 +423,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
         {
             $listoftaskcontacttype[$obj->rowid] = $obj->code;
         }
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
     if (count($listoftaskcontacttype) == 0) $listoftaskcontacttype[0] = '0'; // To avoid sql syntax error if not found
 
 
@@ -531,8 +525,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 				$tasktmp->ref = $obj->ref;
 				$tasktmp->label = $obj->label;
 				print $tasktmp->getNomUrl(1, 'withproject', 'task', 1, '<br>');
-			}
-			else print $langs->trans("NoTasks");
+			} else print $langs->trans("NoTasks");
 			print '</td>';
 			print '<td class="center">'.dol_print_date($db->jdate($obj->dateo), 'day').'</td>';
 			print '<td class="center">'.dol_print_date($db->jdate($obj->datee), 'day');
@@ -575,8 +568,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 
 
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 61738d29ebf..41def74cf1d 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -93,14 +93,12 @@ if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id)
 {
 	$usertoprocess = $user;
 	$search_usertoprocessid = $usertoprocess->id;
-}
-elseif ($search_usertoprocessid > 0)
+} elseif ($search_usertoprocessid > 0)
 {
 	$usertoprocess = new User($db);
 	$usertoprocess->fetch($search_usertoprocessid);
 	$search_usertoprocessid = $usertoprocess->id;
-}
-else {
+} else {
 	$usertoprocess = new User($db);
 }
 
@@ -192,8 +190,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 	{
 		$result = $object->fetch($taskid, $ref);
 		if ($result < 0) $error++;
-	}
-	else {
+	} else {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), '', 'errors');
 		$error++;
 	}
@@ -229,8 +226,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 						$result = $project->add_contact($idfortaskuser, $typeforprojectcontact, 'internal');
 					}
 				}
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -243,8 +239,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorTaskAlreadyAssigned"), null, 'warnings');
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -301,8 +296,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 			{
 				$object->timespent_datehour = dol_mktime(GETPOST($key."hour"), GETPOST($key."min"), 0, $monthofday, $dayofday, $yearofday);
 				$object->timespent_withhour = 1;
-			}
-			else {
+			} else {
 				$object->timespent_datehour = dol_mktime(12, 0, 0, $monthofday, $dayofday, $yearofday);
 			}
 			$object->timespent_date = $object->timespent_datehour;
@@ -310,8 +304,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 			if ($object->timespent_date > 0)
 			{
 				$result = $object->addTimeSpent($user);
-			}
-			else {
+			} else {
 				setEventMessages("ErrorBadDate", null, 'errors');
 				$error++;
 				break;
@@ -333,8 +326,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 			header('Location: '.$_SERVER["PHP_SELF"].'?'.($projectid ? 'id='.$projectid : '').($search_usertoprocessid ? '&search_usertoprocessid='.$search_usertoprocessid : '').($mode ? '&mode='.$mode : '').'&year='.$yearofday.'&month='.$monthofday.'&day='.$dayofday);
 			exit;
 		}
-	}
-	else {
+	} else {
    		setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
 	}
 }
@@ -469,8 +461,7 @@ else {
 if ($mine || ($usertoprocess->id == $user->id))
 {
 	print $langs->trans("OnlyYourTaskAreVisible").'<br>';
-}
-else {
+} else {
 	print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>';
 }
 print '</div>';
@@ -779,8 +770,7 @@ if (count($tasksarray) > 0)
                 <td class="liste_total"></td>
                 </tr>';
 	}
-}
-else {
+} else {
 	print '<tr><td colspan="14"><span class="opacitymedium">'.$langs->trans("NoAssignedTasks").'</span></td></tr>';
 }
 print "</table>";
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index b6466e4ad72..576f580db6a 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -96,14 +96,12 @@ if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id)
 {
 	$usertoprocess = $user;
 	$search_usertoprocessid = $usertoprocess->id;
-}
-elseif ($search_usertoprocessid > 0)
+} elseif ($search_usertoprocessid > 0)
 {
 	$usertoprocess = new User($db);
 	$usertoprocess->fetch($search_usertoprocessid);
 	$search_usertoprocessid = $usertoprocess->id;
-}
-else {
+} else {
 	$usertoprocess = new User($db);
 }
 
@@ -148,8 +146,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 	{
 		$result = $object->fetch($taskid, $ref);
 		if ($result < 0) $error++;
-	}
-	else {
+	} else {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), '', 'errors');
 		$error++;
 	}
@@ -186,8 +183,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 						$result = $project->add_contact($idfortaskuser, $typeforprojectcontact, 'internal');
 					}
 				}
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -200,8 +196,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorTaskAlreadyAssigned"), null, 'warnings');
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -221,8 +216,7 @@ if ($action == 'addtime' && $user->rights->projet->lire)
 	if (empty($timetoadd))
 	{
 		setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
-	}
-	else {
+	} else {
 		foreach ($timetoadd as $taskid => $value)     // Loop on each task
 		{
 			$updateoftaskdone = 0;
@@ -394,8 +388,7 @@ else {
 if ($mine || ($usertoprocess->id == $user->id))
 {
 	print $langs->trans("OnlyYourTaskAreVisible").'<br>';
-}
-else {
+} else {
 	print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>';
 }
 print '</div>';
@@ -602,8 +595,7 @@ if (count($tasksarray) > 0)
 		print '<td class="liste_total center"><div class="totalDayAll">&nbsp;</div></td>
     	</tr>';
 	}
-}
-else {
+} else {
 	print '<tr><td colspan="15"><span class="opacitymedium">'.$langs->trans("NoAssignedTasks").'</span></td></tr>';
 }
 print "</table>";
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index f2342d15787..f3a68dd979f 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -104,14 +104,12 @@ if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id)
 {
 	$usertoprocess = $user;
 	$search_usertoprocessid = $usertoprocess->id;
-}
-elseif ($search_usertoprocessid > 0)
+} elseif ($search_usertoprocessid > 0)
 {
 	$usertoprocess = new User($db);
 	$usertoprocess->fetch($search_usertoprocessid);
 	$search_usertoprocessid = $usertoprocess->id;
-}
-else {
+} else {
 	$usertoprocess = new User($db);
 }
 
@@ -204,8 +202,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 	{
 		$result = $object->fetch($taskid, $ref);
 		if ($result < 0) $error++;
-	}
-	else {
+	} else {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), '', 'errors');
 		$error++;
 	}
@@ -242,8 +239,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 						$result = $project->add_contact($idfortaskuser, $typeforprojectcontact, 'internal');
 					}
 				}
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -256,8 +252,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorTaskAlreadyAssigned"), null, 'warnings');
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -277,8 +272,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 	if (empty($timetoadd))
 	{
 		setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
-	}
-	else {
+	} else {
 		foreach ($timetoadd as $taskid => $value)     // Loop on each task
 		{
 			$updateoftaskdone = 0;
@@ -487,8 +481,7 @@ else {
 if ($mine || ($usertoprocess->id == $user->id))
 {
 	print $langs->trans("OnlyYourTaskAreVisible").'<br>';
-}
-else {
+} else {
 	print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>';
 }
 print '</div>';
@@ -830,8 +823,7 @@ if (count($tasksarray) > 0)
                 print '<td class="liste_total center"><div class="totalDayAll">&nbsp;</div></td>
     	</tr>';
 	}
-}
-else {
+} else {
 	print '<tr><td colspan="15"><span class="opacitymedium">'.$langs->trans("NoAssignedTasks").'</span></td></tr>';
 }
 print "</table>";
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 77e96a9a616..bbc7441f8c8 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -63,8 +63,7 @@ if ($action == 'updateMask')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -81,13 +80,10 @@ if ($action == 'updateMaskTask')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -118,19 +114,15 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=project&file=SPECIMEN.pdf");
 			return;
-		}
-		else {
+		} else {
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
-}
-
-elseif ($action == 'specimentask')
+} elseif ($action == 'specimentask')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -161,13 +153,11 @@ elseif ($action == 'specimentask')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=project_task&file=SPECIMEN.pdf");
 			return;
-		}
-		else {
+		} else {
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -182,9 +172,7 @@ elseif ($action == 'set')
 elseif ($action == 'settask')
 {
 	$ret = addDocumentModel($value, 'project_task', $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -212,9 +200,7 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setdoctask')
+} elseif ($action == 'setdoctask')
 {
 	if (dolibarr_set_const($db, "PROJECT_TASK_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
 	{
@@ -229,24 +215,19 @@ elseif ($action == 'setdoctask')
 	{
 		$ret = addDocumentModel($value, 'project_task', $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "PROJECT_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'setmodtask')
+} elseif ($action == 'setmodtask')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "PROJECT_TASK_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-elseif ($action == 'updateoptions')
+} elseif ($action == 'updateoptions')
 {
 	if (GETPOST('PROJECT_USE_SEARCH_TO_SELECT'))
 	{
@@ -378,8 +359,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->PROJECT_ADDON == 'mod_'.$classname)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else {
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 						}
 						print '</td>';
@@ -397,8 +377,7 @@ foreach ($dirmodels as $reldir)
 							if ($nextval)
 							{
 								$htmltooltip .= $nextval.'<br>';
-							}
-							else {
+							} else {
 								$htmltooltip .= $langs->trans($module->error).'<br>';
 							}
 						}
@@ -477,8 +456,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 							if ($conf->global->PROJECT_TASK_ADDON == 'mod_'.$classname)
 							{
 								print img_picto($langs->trans("Activated"), 'switch_on');
-							}
-							else {
+							} else {
 								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodtask&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							}
 							print '</td>';
@@ -496,8 +474,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 								if ($nextval)
 								{
 									$htmltooltip .= $nextval.'<br>';
-								}
-								else {
+								} else {
 									$htmltooltip .= $langs->trans($module->error).'<br>';
 								}
 							}
@@ -545,8 +522,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -613,8 +589,7 @@ foreach ($dirmodels as $reldir)
 									print img_picto($langs->trans("Enabled"), 'switch_on');
 									print '</a>';
 									print "</td>";
-								}
-								else {
+								} else {
 									print "<td class=\"center\">\n";
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 									print "</td>";
@@ -625,8 +600,7 @@ foreach ($dirmodels as $reldir)
 								if ($conf->global->PROJECT_ADDON_PDF == "$name")
 								{
 									print img_picto($langs->trans("Default"), 'on');
-								}
-								else {
+								} else {
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 								}
 								print '</td>';
@@ -650,8 +624,7 @@ foreach ($dirmodels as $reldir)
 								if ($module->type == 'pdf')
 								{
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-								}
-								else {
+								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
 								print '</td>';
@@ -698,8 +671,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 			array_push($def, $array[0]);
 			$i++;
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
@@ -766,8 +738,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 										print img_picto($langs->trans("Enabled"), 'switch_on');
 										print '</a>';
 										print "</td>";
-									}
-									else {
+									} else {
 										print "<td class=\"center\">\n";
 										print '<a href="'.$_SERVER["PHP_SELF"].'?action=settask&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 										print "</td>";
@@ -778,8 +749,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 									if ($conf->global->PROJECT_TASK_ADDON_PDF == "$name")
 									{
 										print img_picto($langs->trans("Default"), 'on');
-									}
-									else {
+									} else {
 										print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoctask&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 									}
 									print '</td>';
@@ -803,8 +773,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 									if ($module->type == 'pdf')
 									{
 										print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimentask&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-									}
-									else {
+									} else {
 										print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 									}
 									print '</td>';
@@ -844,8 +813,7 @@ if (!$conf->use_javascript_ajax)
 	print '<td class="nowrap right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
-}
-else {
+} else {
 	print '<td width="60" class="right">';
 	$arrval = array('0'=>$langs->trans("No"),
 		'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 54012b583f1..596cd152faa 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -102,8 +102,7 @@ if (empty($reshook))
 			{
 				header("Location: index.php");
 				exit;
-			}
-			else {
+			} else {
 				dol_syslog($object->error, LOG_DEBUG);
 				setEventMessages($langs->trans("CantRemoveProject", $langs->transnoentitiesnoconv("ProjectOverview")), null, 'errors');
 			}
@@ -182,8 +181,7 @@ if (empty($reshook))
 					setEventMessages($langs->trans($object->error), null, 'errors');
 					$error++;
 				}
-			}
-			else {
+			} else {
 				$langs->load("errors");
 				setEventMessages($langs->trans($object->error), null, 'errors');
 				$error++;
@@ -210,19 +208,16 @@ if (empty($reshook))
 					$backtopage = $backtopage.'&projectid='.$object->id; // Old method
 					header("Location: ".$backtopage);
 					exit;
-				}
-				else {
+				} else {
 					header("Location:card.php?id=".$object->id);
 					exit;
 				}
-			}
-			else {
+			} else {
 				$db->rollback();
 
 				$action = 'create';
 			}
-		}
-		else {
+		} else {
 			$action = 'create';
 		}
 	}
@@ -329,8 +324,7 @@ if (empty($reshook))
 		{
 			$db->rollback();
 			$action = 'edit';
-		}
-		else {
+		} else {
 			$db->commit();
 
 			if (GETPOST('socid', 'int') > 0) $object->fetch_thirdparty(GETPOST('socid', 'int'));
@@ -413,8 +407,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 			header("Location: list.php?restore_lastsearch_values=1");
 			exit;
-		}
-		else {
+		} else {
 			dol_syslog($object->error, LOG_DEBUG);
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -434,8 +427,7 @@ if (empty($reshook))
 		if ($result <= 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else {
+		} else {
 			// Load new object
 			$newobject = new Project($db);
 			$newobject->fetch($result);
@@ -600,8 +592,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 		{
 			$texthelp = $langs->trans("IfNeedToUseOtherObjectKeepEmpty");
 			print $form->textwithtooltip($text.' '.img_help(), $texthelp, 1);
-		}
-		else print $text;
+		} else print $text;
 		if (!GETPOSTISSET('backtopage')) print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
 		print '</td></tr>';
 	}
@@ -694,8 +685,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 	{
 		print ' &nbsp; &nbsp; ';
 		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-	}
-	else {
+	} else {
 		print ' &nbsp; &nbsp; ';
 		print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	}
@@ -733,8 +723,7 @@ if ($action == 'create' && $user->rights->projet->creer)
         	});
         });
         </script>';
-}
-elseif ($object->id > 0)
+} elseif ($object->id > 0)
 {
 	/*
      * Show or edit
@@ -885,8 +874,7 @@ elseif ($object->id > 0)
 			{
 				$texthelp = $langs->trans("IfNeedToUseOtherObjectKeepEmpty");
 				print $form->textwithtooltip($text.' '.img_help(), $texthelp, 1, 0, '', '', 2);
-			}
-			else print $text;
+			} else print $text;
 			print '</td></tr>';
 		}
 
@@ -974,8 +962,7 @@ elseif ($object->id > 0)
 		}
 
 		print '</table>';
-	}
-	else {
+	} else {
 		dol_fiche_head($head, 'project', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
 
 		// Project card
@@ -1228,8 +1215,7 @@ elseif ($object->id > 0)
 				if ($userWrite > 0)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
-				}
-				else {
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Modify').'</a>';
 				}
 			}
@@ -1240,8 +1226,7 @@ elseif ($object->id > 0)
 				if ($userWrite > 0)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
-				}
-				else {
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Validate').'</a>';
 				}
 			}
@@ -1252,8 +1237,7 @@ elseif ($object->id > 0)
 				if ($userWrite > 0)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=close">'.$langs->trans("Close").'</a>';
-				}
-				else {
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Close').'</a>';
 				}
 			}
@@ -1264,8 +1248,7 @@ elseif ($object->id > 0)
 				if ($userWrite > 0)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
-				}
-				else {
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('ReOpen').'</a>';
 				}
 			}
@@ -1331,8 +1314,7 @@ elseif ($object->id > 0)
 				if ($userWrite > 0)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&action=clone">'.$langs->trans('ToClone').'</a>';
-				}
-				else {
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('ToClone').'</a>';
 				}
 			}
@@ -1343,8 +1325,7 @@ elseif ($object->id > 0)
 				if ($userDelete > 0 || ($object->statut == 0 && $user->rights->projet->creer))
 				{
 					print '<a class="butActionDelete" href="card.php?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
-				}
-				else {
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Delete').'</a>';
 				}
 			}
@@ -1401,8 +1382,7 @@ elseif ($object->id > 0)
 	// Hook to add more things on page
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('mainCardTabAddMore', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-}
-else {
+} else {
 	print $langs->trans("RecordNotFound");
 }
 
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index 77feddb91bd..5ef21879c7f 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -171,8 +171,7 @@ class Projects extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve project list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -452,8 +451,7 @@ class Projects extends DolibarrApi
         if ($this->project->update(DolibarrApiAccess::$user) >= 0)
         {
             return $this->get($id);
-        }
-        else {
+        } else {
             throw new RestException(500, $this->project->error);
         }
     }
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index 1a16d9ce199..084292d0727 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -173,8 +173,7 @@ class Tasks extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve task list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -450,8 +449,7 @@ class Tasks extends DolibarrApi
         if ($this->task->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else {
+        } else {
             throw new RestException(500, $this->task->error);
         }
     }
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 8337a625415..7389af9083c 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -306,8 +306,7 @@ class Project extends CommonObject
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errno = $this->db->lasterrno();
 			$error++;
@@ -332,8 +331,7 @@ class Project extends CommonObject
 		{
 			$this->db->commit();
 			return $ret;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -439,27 +437,23 @@ class Project extends CommonObject
 				{
 					$this->db->commit();
 					$result = 1;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					$result = -1;
 				}
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->errors[] = $this->error;
 				$this->db->rollback();
 				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$result = -4;
-				}
-				else {
+				} else {
 					$result = -2;
 				}
 				dol_syslog(get_class($this)."::update error ".$result." ".$this->error, LOG_ERR);
 			}
-		}
-		else {
+		} else {
 			dol_syslog(get_class($this)."::update ref null");
 			$result = -1;
 		}
@@ -487,8 +481,7 @@ class Project extends CommonObject
 		if (!empty($id))
 		{
 			$sql .= " WHERE rowid=".$id;
-		}
-		elseif (!empty($ref))
+		} elseif (!empty($ref))
 		{
 			$sql .= " WHERE ref='".$this->db->escape($ref)."'";
 			$sql .= " AND entity IN (".getEntity('project').")";
@@ -547,8 +540,7 @@ class Project extends CommonObject
 			$this->db->free($resql);
 
 			return 0;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -578,35 +570,28 @@ class Project extends CommonObject
 		if ($type == 'agenda')
 		{
 			$sql = "SELECT id as rowid FROM ".MAIN_DB_PREFIX."actioncomm WHERE fk_project IN (".$ids.") AND entity IN (".getEntity('agenda').")";
-		}
-		elseif ($type == 'expensereport')
+		} elseif ($type == 'expensereport')
 		{
 			$sql = "SELECT ed.rowid FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."expensereport_det as ed WHERE e.rowid = ed.fk_expensereport AND e.entity IN (".getEntity('expensereport').") AND ed.fk_projet IN (".$ids.")";
-		}
-		elseif ($type == 'project_task')
+		} elseif ($type == 'project_task')
 		{
 			$sql = "SELECT DISTINCT pt.rowid FROM ".MAIN_DB_PREFIX."projet_task as pt WHERE pt.fk_projet IN (".$ids.")";
-		}
-		elseif ($type == 'project_task_time')	// Case we want to duplicate line foreach user
+		} elseif ($type == 'project_task_time')	// Case we want to duplicate line foreach user
 		{
 			$sql = "SELECT DISTINCT pt.rowid, ptt.fk_user FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt WHERE pt.rowid = ptt.fk_task AND pt.fk_projet IN (".$ids.")";
-		}
-		elseif ($type == 'stock_mouvement')
+		} elseif ($type == 'stock_mouvement')
 		{
 			$sql = 'SELECT ms.rowid, ms.fk_user_author as fk_user FROM '.MAIN_DB_PREFIX."stock_mouvement as ms, ".MAIN_DB_PREFIX."entrepot as e WHERE e.rowid = ms.fk_entrepot AND e.entity IN (".getEntity('stock').") AND ms.origintype = 'project' AND ms.fk_origin IN (".$ids.") AND ms.type_mouvement = 1";
-		}
-		elseif ($type == 'loan')
+		} elseif ($type == 'loan')
 		{
 			$sql = 'SELECT l.rowid, l.fk_user_author as fk_user FROM '.MAIN_DB_PREFIX."loan as l WHERE l.entity IN (".getEntity('loan').") AND l.fk_projet IN (".$ids.")";
-		}
-		else {
+		} else {
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$tablename." WHERE ".$projectkey." IN (".$ids.") AND entity IN (".getEntity($type).")";
 		}
 
 		if ($dates > 0 && $type == 'loan'){
 			$sql .= " AND (dateend > '".$this->db->idate($dates)."' OR dateend IS NULL)";
-		}
-		elseif ($dates > 0 && ($type != 'project_task'))	// For table project_taks, we want the filter on date apply on project_time_spent table
+		} elseif ($dates > 0 && ($type != 'project_task'))	// For table project_taks, we want the filter on date apply on project_time_spent table
 		{
 			if (empty($datefieldname) && !empty($this->table_element_date)) $datefieldname = $this->table_element_date;
 			if (empty($datefieldname)) return 'Error this object has no date field defined';
@@ -615,8 +600,7 @@ class Project extends CommonObject
 
 		if ($datee > 0 && $type == 'loan'){
 			$sql .= " AND (datestart < '".$this->db->idate($datee)."' OR datestart IS NULL)";
-		}
-		elseif ($datee > 0 && ($type != 'project_task'))	// For table project_taks, we want the filter on date apply on project_time_spent table
+		} elseif ($datee > 0 && ($type != 'project_task'))	// For table project_taks, we want the filter on date apply on project_time_spent table
 		{
 			if (empty($datefieldname) && !empty($this->table_element_date)) $datefieldname = $this->table_element_date;
 			if (empty($datefieldname)) return 'Error this object has no date field defined';
@@ -646,8 +630,7 @@ class Project extends CommonObject
 
 			/* Return array even if empty*/
 			return $elements;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -797,8 +780,7 @@ class Project extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
@@ -890,15 +872,13 @@ class Project extends CommonObject
 					$this->statut = 1;
 					$this->db->commit();
 					return 1;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					$this->error = join(',', $this->errors);
 					dol_syslog(get_class($this)."::setValid ".$this->error, LOG_ERR);
 					return -1;
 				}
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -1;
@@ -948,15 +928,13 @@ class Project extends CommonObject
 					$this->statut = 2;
 					$this->db->commit();
 					return 1;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					$this->error = join(',', $this->errors);
 					dol_syslog(get_class($this)."::setClose ".$this->error, LOG_ERR);
 					return -1;
 				}
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -1;
@@ -1054,16 +1032,13 @@ class Project extends CommonObject
 		{
 			if (preg_match('/\.php$/', $option)) {
 				$url = dol_buildpath($option, 1).'?id='.$this->id;
-			}
-			elseif ($option == 'task')
+			} elseif ($option == 'task')
 			{
 				$url = DOL_URL_ROOT.'/projet/tasks.php?id='.$this->id;
-			}
-			elseif ($option == 'preview')
+			} elseif ($option == 'preview')
 			{
 				$url = DOL_URL_ROOT.'/projet/element.php?id='.$this->id;
-			}
-			else {
+			} else {
 				$url = DOL_URL_ROOT.'/projet/card.php?id='.$this->id;
 			}
 			// Add param to save lastsearch_values or not
@@ -1179,12 +1154,10 @@ class Project extends CommonObject
 		if (($mode == 'read' && !empty($user->rights->projet->all->lire)) || ($mode == 'write' && !empty($user->rights->projet->all->creer)) || ($mode == 'delete' && !empty($user->rights->projet->all->supprimer)))
 		{
 			$userAccess = 1;
-		}
-		elseif ($this->public && (($mode == 'read' && !empty($user->rights->projet->lire)) || ($mode == 'write' && !empty($user->rights->projet->creer)) || ($mode == 'delete' && !empty($user->rights->projet->supprimer))))
+		} elseif ($this->public && (($mode == 'read' && !empty($user->rights->projet->lire)) || ($mode == 'write' && !empty($user->rights->projet->creer)) || ($mode == 'delete' && !empty($user->rights->projet->supprimer))))
 		{
 			$userAccess = 1;
-		}
-		else {
+		} else {
 			foreach (array('internal', 'external') as $source)
 			{
 				$userRole = $this->liste_contact(4, $source);
@@ -1234,12 +1207,10 @@ class Project extends CommonObject
 		if ($mode == 0)
 		{
 			$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "element_contact as ec ON ec.element_id = p.rowid";
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			$sql.= ", " . MAIN_DB_PREFIX . "element_contact as ec";
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			// No filter. Use this if user has permission to see all project
 		}
@@ -1260,8 +1231,7 @@ class Project extends CommonObject
 			{
 				$listofprojectcontacttype[$obj->rowid]=$obj->code;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0]='0';    // To avoid syntax error if not found
 
 		if ($mode == 0)
@@ -1270,16 +1240,14 @@ class Project extends CommonObject
 			$sql.= " OR ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
 			$sql.= " AND ec.fk_socpeople = ".$user->id.")";
 			$sql.= " )";
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			$sql.= " AND ec.element_id = p.rowid";
 			$sql.= " AND (";
 			$sql.= "  ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
 			$sql.= " AND ec.fk_socpeople = ".$user->id.")";
 			$sql.= " )";
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			// No filter. Use this if user has permission to see all project
 		}
@@ -1308,8 +1276,7 @@ class Project extends CommonObject
 				$result = implode(',', $temp);
 				return $result;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1416,8 +1383,7 @@ class Project extends CommonObject
 			{
 				$clone_project->note_private = '';
 				$clone_project->note_public = '';
-			}
-			else {
+			} else {
 				$this->db->begin();
 				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_public, ENT_QUOTES), '_public');
 				if ($res < 0)
@@ -1425,8 +1391,7 @@ class Project extends CommonObject
 					$this->error .= $clone_project->error;
 					$error++;
 					$this->db->rollback();
-				}
-				else {
+				} else {
 					$this->db->commit();
 				}
 
@@ -1437,8 +1402,7 @@ class Project extends CommonObject
 					$this->error .= $clone_project->error;
 					$error++;
 					$this->db->rollback();
-				}
-				else {
+				} else {
 					$this->db->commit();
 				}
 			}
@@ -1461,8 +1425,7 @@ class Project extends CommonObject
 							$langs->load("errors");
 							$this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
 							$error++;
-						}
-						else {
+						} else {
 							if ($clone_project->error != '')
 							{
 								$this->error .= $clone_project->error;
@@ -1493,8 +1456,7 @@ class Project extends CommonObject
 							$error++;
 						}
 					}
-				}
-				else {
+				} else {
 					$this->error .= $langs->trans('ErrorInternalErrorDetected').':dol_mkdir';
 					$error++;
 				}
@@ -1523,8 +1485,7 @@ class Project extends CommonObject
 					{
 						$this->error .= $result_clone->error;
 						$error++;
-					}
-					else {
+					} else {
 						$new_task_id = $result_clone;
 						$taskstatic->fetch($tasktoclone->id);
 
@@ -1562,8 +1523,7 @@ class Project extends CommonObject
 		{
 			$this->db->commit();
 			return $clone_project_id;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::createFromClone nbError: ".$error." error : ".$this->error, LOG_ERR);
 			return -1;
@@ -1656,8 +1616,7 @@ class Project extends CommonObject
 		{
 			$sql .= " SET fk_project=".$this->id;
 			$sql .= " WHERE id=".$elementSelectId;
-		}
-		else {
+		} else {
 			$sql .= " SET fk_projet=".$this->id;
 			$sql .= " WHERE rowid=".$elementSelectId;
 		}
@@ -1782,8 +1741,7 @@ class Project extends CommonObject
 				{
 					$this->weekWorkLoad[$day] = $obj->task_duration;
 					$this->weekWorkLoadPerTask[$day][$obj->fk_task] = $obj->task_duration;
-				}
-				else {
+				} else {
 					$this->weekWorkLoad[$day] += $obj->task_duration;
 					$this->weekWorkLoadPerTask[$day][$obj->fk_task] += $obj->task_duration;
 				}
@@ -1792,8 +1750,7 @@ class Project extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
@@ -1847,8 +1804,7 @@ class Project extends CommonObject
 				{
 					$this->monthWorkLoad[$week_number] = $obj->task_duration;
 					$this->monthWorkLoadPerTask[$week_number][$obj->fk_task] = $obj->task_duration;
-				}
-				else {
+				} else {
 					$this->monthWorkLoad[$week_number] += $obj->task_duration;
 					$this->monthWorkLoadPerTask[$week_number][$obj->fk_task] += $obj->task_duration;
 				}
@@ -1857,8 +1813,7 @@ class Project extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
@@ -1927,8 +1882,7 @@ class Project extends CommonObject
 			}
 
 			return $response;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1985,8 +1939,7 @@ class Project extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -2052,8 +2005,7 @@ class Project extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index 1452b0e919f..cb6150b6dc7 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -92,8 +92,7 @@ class ProjectStats extends Stats
 					$label.' ('.price(price2num($row[0], 'MT'), 1, $langs, 1, -1, -1, $conf->currency).')',
 					$row[0]
 					);
-				}
-				else $other += $row[1];
+				} else $other += $row[1];
 					$i++;
 			}
 			if ($num > $limit)
@@ -280,8 +279,7 @@ class ProjectStats extends Stats
 				$foundintocache = 1;
 
 				$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
-			}
-			else {
+			} else {
 				dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
 			}
 		}
@@ -291,8 +289,7 @@ class ProjectStats extends Stats
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
-		}
-		else {
+		} else {
 			$year = $startyear;
 			while ($year <= $endyear)
 			{
@@ -326,8 +323,7 @@ class ProjectStats extends Stats
 				fclose($fp);
 				if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 				@chmod($newpathofdestfile, octdec($newmask));
-			}
-			else dol_syslog("Failed to write cache file", LOG_ERR);
+			} else dol_syslog("Failed to write cache file", LOG_ERR);
 			$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
 		}
 
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index cc74e565385..10f5a36d67f 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -225,8 +225,7 @@ class Task extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return $this->id;
 		}
@@ -327,8 +326,7 @@ class Task extends CommonObject
 			} else {
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -437,8 +435,7 @@ class Task extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -540,8 +537,7 @@ class Task extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			//Delete associated link file
 			if ($conf->projet->dir_output)
 			{
@@ -585,8 +581,7 @@ class Task extends CommonObject
 
 		dol_syslog(get_class($this)."::hasChildren", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-		else {
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); } else {
 			$obj = $this->db->fetch_object($resql);
 			if ($obj) $ret = $obj->nb;
 			$this->db->free($resql);
@@ -595,8 +590,7 @@ class Task extends CommonObject
 		if (!$error)
 		{
 			return $ret;
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -617,8 +611,7 @@ class Task extends CommonObject
 
 		dol_syslog(get_class($this)."::hasTimeSpent", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-		else {
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); } else {
 			$obj = $this->db->fetch_object($resql);
 			if ($obj) $ret = $obj->nb;
 			$this->db->free($resql);
@@ -627,8 +620,7 @@ class Task extends CommonObject
 		if (!$error)
 		{
 			return $ret;
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -791,8 +783,7 @@ class Task extends CommonObject
             $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_extrafields as efpt ON (t.rowid = efpt.fk_object)";
             $sql .= " WHERE p.entity IN (".getEntity('project').")";
 			$sql .= " AND t.fk_projet = p.rowid";
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($filteronprojuser > 0)
 			{
@@ -808,8 +799,7 @@ class Task extends CommonObject
 				}
 				$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec2";
 				$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
-			}
-			else {
+			} else {
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
 				if ($includebilltime)
 				{
@@ -818,8 +808,7 @@ class Task extends CommonObject
 			}
             $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_extrafields as efpt ON (t.rowid = efpt.fk_object)";
             $sql .= " WHERE p.entity IN (".getEntity('project').")";
-		}
-		else return 'BadValueForParameterMode';
+		} else return 'BadValueForParameterMode';
 
 		if ($filteronprojuser > 0)
 		{
@@ -965,8 +954,7 @@ class Task extends CommonObject
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1044,8 +1032,7 @@ class Task extends CommonObject
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1136,8 +1123,7 @@ class Task extends CommonObject
 				if ($result < 0) { $ret = -1; }
 				// End call triggers
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$ret = -1;
 		}
@@ -1172,8 +1158,7 @@ class Task extends CommonObject
 		if ($ret > 0)
 		{
 			$this->db->commit();
-		}
-		else {
+		} else {
 			$this->db->rollback();
 		}
 		return $ret;
@@ -1233,8 +1218,7 @@ class Task extends CommonObject
 			$this->timespent_nblines = ($obj->nblines ? $obj->nblines : 0);
 
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 		return $result;
@@ -1289,8 +1273,7 @@ class Task extends CommonObject
 
 			$this->db->free($resql);
 			return $result;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return $result;
 		}
@@ -1341,8 +1324,7 @@ class Task extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -1427,8 +1409,7 @@ class Task extends CommonObject
 			}
 
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
@@ -1488,13 +1469,10 @@ class Task extends CommonObject
 				{
 					$this->db->rollback();
 					$ret = -1;
-				}
-				else $ret = 1;
+				} else $ret = 1;
 				// End call triggers
-			}
-			else $ret = 1;
-		}
-		else {
+			} else $ret = 1;
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			$ret = -1;
@@ -1564,8 +1542,7 @@ class Task extends CommonObject
 			if ($this->db->query($sql))
 			{
 				$result = 0;
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror();
 				$result = -2;
 			}
@@ -1581,8 +1558,7 @@ class Task extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1694,8 +1670,7 @@ class Task extends CommonObject
 	   		{
 				$clone_task->note_private = '';
 				$clone_task->note_public = '';
-			}
-			else {
+			} else {
 				$this->db->begin();
 				$res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_public, ENT_QUOTES), '_public');
 				if ($res < 0)
@@ -1703,8 +1678,7 @@ class Task extends CommonObject
 					$this->error .= $clone_task->error;
 					$error++;
 					$this->db->rollback();
-				}
-				else {
+				} else {
 					$this->db->commit();
 				}
 
@@ -1715,8 +1689,7 @@ class Task extends CommonObject
 					$this->error .= $clone_task->error;
 					$error++;
 					$this->db->rollback();
-				}
-				else {
+				} else {
 					$this->db->commit();
 				}
 			}
@@ -1735,8 +1708,7 @@ class Task extends CommonObject
 				{
 					$projectstatic->fetch($project_id);
 					$clone_project_ref = $projectstatic->ref;
-				}
-				else {
+				} else {
 					$clone_project_ref = $ori_project_ref;
 				}
 
@@ -1783,8 +1755,7 @@ class Task extends CommonObject
 							$langs->load("errors");
 							$this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
 							$error++;
-						}
-						else {
+						} else {
 							if ($clone_task->error != '')
 							{
 								$this->error .= $clone_task->error;
@@ -1808,8 +1779,7 @@ class Task extends CommonObject
 		{
 			$this->db->commit();
 			return $clone_task_id;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::createFromClone nbError: ".$error." error : ".$this->error, LOG_ERR);
 			return -1;
@@ -1856,12 +1826,10 @@ class Task extends CommonObject
 		if ($mode == 0)
 		{
 			return $langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			return $langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut1').' '.$langs->trans($this->statuts_short[$status]);
@@ -1869,8 +1837,7 @@ class Task extends CommonObject
 			elseif ($status == 3) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 4) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 5) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5').' '.$langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
 			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut1');
@@ -1878,8 +1845,7 @@ class Task extends CommonObject
 			elseif ($status == 3) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
 			elseif ($status == 4) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
 			elseif ($status == 5) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut1').' '.$langs->trans($this->statuts[$status]);
@@ -1887,8 +1853,7 @@ class Task extends CommonObject
 			elseif ($status == 3) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 4) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 5) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5').' '.$langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			/*if ($status==0) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut0');
 			elseif ($status==1) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut1');
@@ -1899,8 +1864,7 @@ class Task extends CommonObject
 			*/
 			//else return $this->progress.' %';
 			return '&nbsp;';
-		}
-		elseif ($mode == 6)
+		} elseif ($mode == 6)
 		{
 			/*if ($status==0) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut0');
 			elseif ($status==1) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut1');
@@ -2012,8 +1976,7 @@ class Task extends CommonObject
 			}
 
 			return $response;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2060,8 +2023,7 @@ class Task extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
diff --git a/htdocs/projet/class/taskstats.class.php b/htdocs/projet/class/taskstats.class.php
index 1ab6189674a..722736fe9b8 100644
--- a/htdocs/projet/class/taskstats.class.php
+++ b/htdocs/projet/class/taskstats.class.php
@@ -82,8 +82,7 @@ class TaskStats extends Stats
 						$row[1],
 						$row[0]
 					);
-				}
-				else $other += $row[1];
+				} else $other += $row[1];
 				$i++;
 			}
 			if ($num > $limit)
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index fde1563eac2..b8f1a24013d 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -73,14 +73,12 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -92,8 +90,7 @@ if ($action == 'swapstatut' && $user->rights->projet->creer)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne', 'int'));
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -108,8 +105,7 @@ if (($action == 'deleteline' || $action == 'deletecontact') && $user->rights->pr
 	{
 		header("Location: contact.php?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 5b0409d7246..9015ef0d4d4 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -157,8 +157,7 @@ if ($object->id > 0)
 	$permission = ($userWrite > 0);
 	$permtoedit = ($userWrite > 0);
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	dol_print_error('', 'NoRecordFound');
 }
 
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 3907259e230..84612ef76ce 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -568,8 +568,7 @@ if ($action == "addelement")
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
-}
-elseif ($action == "unlink")
+} elseif ($action == "unlink")
 {
 	$tablename = GETPOST("tablename", "aZ09");
     $projectField = GETPOSTISSET('projectfield') ? GETPOST('projectfield', 'aZ09') : 'fk_projet';
@@ -685,18 +684,15 @@ foreach ($listofreferent as $key => $value)
 					{
 						$tmp = $element->getSumOfAmount($elementuser, $dates, $datee);
 						$total_ht_by_line = price2num($tmp['amount'], 'MT');
-					}
-					else {
+					} else {
 						$tmp = $element->getSumOfAmount('', $dates, $datee);
 						$total_ht_by_line = price2num($tmp['amount'], 'MT');
 					}
-				}
-                elseif ($key == 'loan') {
+				} elseif ($key == 'loan') {
                     if ((empty($dates) && empty($datee)) || (intval($dates) <= $element->datestart && intval($datee) >= $element->dateend)) {
                         // Get total loan
                         $total_ht_by_line = -$element->capital;
-                    }
-				    else {
+                    } else {
                         // Get loan schedule according to date filter
                         $total_ht_by_line = 0;
                         $loanScheduleStatic = new LoanSchedule($element->db);
@@ -715,8 +711,7 @@ foreach ($listofreferent as $key => $value)
                             }
                         }
                     }
-                }
-				else $total_ht_by_line = $element->total_ht;
+                } else $total_ht_by_line = $element->total_ht;
 
 				// Define $total_ttc_by_line
 				if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') $total_ttc_by_line = $element->amount;
@@ -726,11 +721,9 @@ foreach ($listofreferent as $key => $value)
 				{
 					$defaultvat = get_default_tva($mysoc, $mysoc);
 					$total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)), 'MT');
-				}
-                elseif ($key == 'loan') {
+				} elseif ($key == 'loan') {
                         $total_ttc_by_line = $total_ht_by_line; // For loan there is actually no taxe managed in Dolibarr
-                }
-				else $total_ttc_by_line = $element->total_ttc;
+                } else $total_ttc_by_line = $element->total_ttc;
 
 				// Change sign of $total_ht_by_line and $total_ttc_by_line for some cases
 				if ($tablename == 'payment_various')
@@ -844,8 +837,7 @@ foreach ($listofreferent as $key => $value)
 			if ($selectList < 0)
 			{
 				setEventMessages($formproject->error, $formproject->errors, 'errors');
-			}
-			elseif ($selectList)
+			} elseif ($selectList)
 			{
 				// Define form with the combo list of elements to link
 			    $addform .= '<div class="inline-block valignmiddle">';
@@ -951,8 +943,7 @@ foreach ($listofreferent as $key => $value)
 				if ($tablename != 'expensereport_det')
 				{
 					if (method_exists($element, 'fetch_thirdparty')) $element->fetch_thirdparty();
-				}
-				else {
+				} else {
 					$expensereport = new ExpenseReport($db);
 					$expensereport->fetch($element->fk_expensereport);
 				}
@@ -997,19 +988,16 @@ foreach ($listofreferent as $key => $value)
 				if ($tablename == 'expensereport_det')
 				{
 					print $expensereport->getNomUrl(1);
-				}
-				else {
+				} else {
 					// Show ref with link
 					if ($element instanceof Task)
 					{
 						print $element->getNomUrl(1, 'withproject', 'time');
 						print ' - '.dol_trunc($element->label, 48);
-					}
-					elseif ($key == 'loan') {
+					} elseif ($key == 'loan') {
                         print $element->getNomUrl(1);
                         print ' - '.dol_trunc($element->label, 48);
-                    }
-					else print $element->getNomUrl(1);
+                    } else print $element->getNomUrl(1);
 
 					$element_doc = $element->element;
 					$filename = dol_sanitizeFileName($element->ref);
@@ -1018,8 +1006,7 @@ foreach ($listofreferent as $key => $value)
 					if ($element_doc === 'order_supplier') {
 						$element_doc = 'commande_fournisseur';
 						$filedir = $conf->fournisseur->commande->multidir_output[$element->entity].'/'.dol_sanitizeFileName($element->ref);
-					}
-					elseif ($element_doc === 'invoice_supplier') {
+					} elseif ($element_doc === 'invoice_supplier') {
 						$element_doc = 'facture_fournisseur';
 						$filename = get_exdir($element->id, 2, 0, 0, $element, 'product').dol_sanitizeFileName($element->ref);
 						$filedir = $conf->fournisseur->facture->multidir_output[$element->entity].'/'.get_exdir($element->id, 2, 0, 0, $element, 'invoice_supplier').dol_sanitizeFileName($element->ref);
@@ -1047,8 +1034,7 @@ foreach ($listofreferent as $key => $value)
 				    if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order')
     				{
     				    $date = ($element->date_commande ? $element->date_commande : $element->date_valid);
-    				}
-    				elseif ($tablename == 'supplier_proposal') $date = $element->date_validation; // There is no other date for this
+    				} elseif ($tablename == 'supplier_proposal') $date = $element->date_validation; // There is no other date for this
     				elseif ($tablename == 'fichinter') $date = $element->datev; // There is no other date for this
     				elseif ($tablename == 'projet_task') $date = ''; // We show no date. Showing date of beginning of task make user think it is date of time consumed
 					else {
@@ -1059,8 +1045,7 @@ foreach ($listofreferent as $key => $value)
     						$date = $element->$datefieldname;
     					}
     				}
-				}
-                elseif ($key == 'loan') {
+				} elseif ($key == 'loan') {
                     $date = $element->datestart;
                 }
 
@@ -1069,16 +1054,14 @@ foreach ($listofreferent as $key => $value)
 				{
 				    print dol_print_date($element->datep, 'dayhour');
 				    if ($element->datef && $element->datef > $element->datep) print " - ".dol_print_date($element->datef, 'dayhour');
-				}
-				elseif (in_array($tablename, array('projet_task')))
+				} elseif (in_array($tablename, array('projet_task')))
 				{
 				    $tmpprojtime = $element->getSumOfAmount($elementuser, $dates, $datee); // $element is a task. $elementuser may be empty
                     print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$idofelement.'&withproject=1">';
 				    print convertSecondToTime($tmpprojtime['nbseconds'], 'allhourmin');
                 	print '</a>';
 				    $total_time_by_line = $tmpprojtime['nbseconds'];
-				}
-				else print dol_print_date($date, 'day');
+				} else print dol_print_date($date, 'day');
 				print '</td>';
 
 				// Third party or user
@@ -1089,14 +1072,12 @@ foreach ($listofreferent as $key => $value)
                 	$tmpuser = new User($db);
                 	$tmpuser->fetch($expensereport->fk_user_author);
                 	print $tmpuser->getNomUrl(1, '', 48);
-                }
-				elseif ($tablename == 'payment_salary')
+                } elseif ($tablename == 'payment_salary')
 				{
 					$tmpuser = new User($db);
 					$tmpuser->fetch($element->fk_user);
 					print $tmpuser->getNomUrl(1, '', 48);
-				}
-				elseif ($tablename == 'don' || $tablename == 'stock_mouvement')
+				} elseif ($tablename == 'don' || $tablename == 'stock_mouvement')
                 {
                 	if ($element->fk_user_author > 0)
                 	{
@@ -1104,8 +1085,7 @@ foreach ($listofreferent as $key => $value)
 	                	$tmpuser2->fetch($element->fk_user_author);
 	                	print $tmpuser2->getNomUrl(1, '', 48);
                 	}
-                }
-                elseif ($tablename == 'projet_task' && $key == 'project_task_time')	// if $key == 'project_task', we don't want details per user
+                } elseif ($tablename == 'projet_task' && $key == 'project_task_time')	// if $key == 'project_task', we don't want details per user
                 {
                     print $elementuser->getNomUrl(1);
                 }
@@ -1140,12 +1120,10 @@ foreach ($listofreferent as $key => $value)
     							$langs->load("errors");
     							$warning = $langs->trans("WarningSomeLinesWithNullHourlyRate", $conf->currency);
     						}
-					    }
-					    else {
+					    } else {
 					        $othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
 					    }
-					}
-                    elseif ($key == 'loan') $total_ht_by_line = $element->capital;
+					} elseif ($key == 'loan') $total_ht_by_line = $element->capital;
 					else {
 						$total_ht_by_line = $element->total_ht;
 					}
@@ -1169,8 +1147,7 @@ foreach ($listofreferent as $key => $value)
 					}
 					if ($warning) print ' '.img_warning($warning);
 					print '</td>';
-				}
-				else print '<td></td>';
+				} else print '<td></td>';
 
                 // Amount inc tax
 				if (empty($value['disableamount']))
@@ -1186,12 +1163,10 @@ foreach ($listofreferent as $key => $value)
 					        // TODO Permission to read daily rate
     						$defaultvat = get_default_tva($mysoc, $mysoc);
     						$total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)), 'MT');
-					    }
-					    else {
+					    } else {
 					        $othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
 					    }
-					}
-                    elseif ($key == 'loan') $total_ttc_by_line = $element->capital - $element->getSumPayment();
+					} elseif ($key == 'loan') $total_ttc_by_line = $element->capital - $element->getSumPayment();
 					else {
 						$total_ttc_by_line = $element->total_ttc;
 					}
@@ -1215,32 +1190,27 @@ foreach ($listofreferent as $key => $value)
 					}
 					if ($warning) print ' '.img_warning($warning);
 					print '</td>';
-				}
-				else print '<td></td>';
+				} else print '<td></td>';
 
 				// Status
 				print '<td class="right">';
 				if ($tablename == 'expensereport_det')
 				{
 					print $expensereport->getLibStatut(5);
-				}
-				elseif ($element instanceof CommonInvoice)
+				} elseif ($element instanceof CommonInvoice)
 				{
 					//This applies for Facture and FactureFournisseur
 					print $element->getLibStatut(5, $element->getSommePaiement());
-				}
-				elseif ($element instanceof Task)
+				} elseif ($element instanceof Task)
 				{
 					if ($element->progress != '')
 					{
 						print $element->progress.' %';
 					}
-				}
-				elseif ($tablename == 'stock_mouvement')
+				} elseif ($tablename == 'stock_mouvement')
 				{
 					print $element->getLibStatut(3);
-				}
-				else {
+				} else {
 					print $element->getLibStatut(5);
 				}
 				print '</td>';
@@ -1314,8 +1284,7 @@ foreach ($listofreferent as $key => $value)
 			print '</td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
-		}
-		else {
+		} else {
 			if (!is_array($elementarray))	// error
 			{
 				print $elementarray;
diff --git a/htdocs/projet/ganttchart.inc.php b/htdocs/projet/ganttchart.inc.php
index 5f88db6344d..457345d2fe3 100644
--- a/htdocs/projet/ganttchart.inc.php
+++ b/htdocs/projet/ganttchart.inc.php
@@ -195,8 +195,7 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level = 0, $proje
 	if ($project_id && $level < 0)
 	{
 		$parent = '-'.$project_id;
-	}
-	else {
+	} else {
 		$parent = $task["task_parent_alternate_id"];
 		//$parent = $task["task_parent"];
 	}
@@ -207,8 +206,7 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level = 0, $proje
 	{
 		//$link=DOL_URL_ROOT.'/projet/tasks.php?withproject=1&id='.abs($task["task_id"]);
 		$link = '';
-	}
-	else {
+	} else {
 		$link = DOL_URL_ROOT.'/projet/tasks/contact.php?withproject=1&id='.$task["task_id"];
 	}
 
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 2cecf9c85ba..d578f372777 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -281,8 +281,7 @@ if (count($tasksarray) > 0)
             $tasks[$taskcursor]['task_is_group'] = 1;
         	$tasks[$taskcursor]['task_css'] = 'ggroupblack';
             //$tasks[$taskcursor]['task_css'] = 'gtaskblue';
-        }
-        elseif ($task->hasChildren() > 0) {
+        } elseif ($task->hasChildren() > 0) {
             $tasks[$taskcursor]['task_is_group'] = 1;
         	//$tasks[$taskcursor]['task_is_group'] = 0;
             $tasks[$taskcursor]['task_css'] = 'ggroupblack';
@@ -379,13 +378,11 @@ if (count($tasksarray) > 0)
 		print '</div>'."\n";
 
 		print '</div>';
-	}
-	else {
+	} else {
 		$langs->load("admin");
 		print $langs->trans("AvailableOnlyIfJavascriptAndAjaxNotDisabled");
 	}
-}
-else {
+} else {
 	print '<div class="opacitymedium">'.$langs->trans("NoTasks").'</div>';
 }
 
diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php
index 90f172f2fe2..a18b2dc54a5 100644
--- a/htdocs/projet/graph_opportunities.inc.php
+++ b/htdocs/projet/graph_opportunities.inc.php
@@ -98,8 +98,7 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 	    print "</div>";
 
 	    print "<br>";
-	}
-	else {
+	} else {
 	    dol_print_error($db);
 	}
 }
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 261b7529907..f4edfdea548 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -140,8 +140,7 @@ if ($resql)
 		}
 		$i++;
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 //var_dump($listofoppcode);
 
 
@@ -272,8 +271,7 @@ if ($resql)
 		}
 	}
 	print "</table></div><br>";
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 $companystatic = new Societe($db); // We need a clean new object for next loop because current one has some properties set.
@@ -326,8 +324,7 @@ if ($resql)
 			$companystatic->status = $obj->status;
 
 			print $companystatic->getNomUrl(1);
-		}
-		else {
+		} else {
 			print $langs->trans("OthersNotLinkedToThirdParty");
 		}
 		print '</td>';
@@ -351,8 +348,7 @@ if ($resql)
 	}
 
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 print "</table>";
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index 772188ec261..6c73d2cfc8b 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -52,8 +52,7 @@ if (GETPOST('actioncode', 'array'))
 {
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
-}
-else {
+} else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 98d9d49fd8e..70ad0f61e96 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -233,8 +233,7 @@ if (empty($reshook))
                 } else {
                     setEventMessages($langs->trans("DontHaveTheValidateStatus", $objecttmp->ref), null, 'warnings');
                 }
-            }
-            else {
+            } else {
                 setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
                 $error++;
                 break;
@@ -246,8 +245,7 @@ if (empty($reshook))
             if ($nbok > 1) setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
             else setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
             $db->commit();
-        }
-        else {
+        } else {
             $db->rollback();
         }
     }
@@ -282,8 +280,7 @@ if ($resql)
 	{
 		$listofprojectcontacttype[$obj->rowid] = $obj->code;
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
 
 $distinct = 'DISTINCT'; // We add distinct until we are added a protection to be sure a contact of a project and task is only once.
@@ -749,8 +746,7 @@ while ($i < min($num, $limit))
 			if ($obj->socid)
 			{
 				print $socstatic->getNomUrl(1);
-			}
-			else {
+			} else {
 				print '&nbsp;';
 			}
 			print '</td>';
@@ -769,8 +765,7 @@ while ($i < min($num, $limit))
 				if ($nbofsalesrepresentative > 3)   // We print only number
 				{
 					print $nbofsalesrepresentative;
-				}
-				elseif ($nbofsalesrepresentative > 0)
+				} elseif ($nbofsalesrepresentative > 0)
 				{
 					$userstatic = new User($db);
 					$j = 0;
@@ -790,8 +785,7 @@ while ($i < min($num, $limit))
 					}
 				}
 				//else print $langs->trans("NoSalesRepresentativeAffected");
-			}
-			else {
+			} else {
 				print '&nbsp';
 			}
 			print '</td>';
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index 38d12081b4f..6d56b2088e9 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -350,8 +350,7 @@ print '</div>';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 $stringtoshow .= '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
 	$stringtoshow .= $px1->show();
 	$stringtoshow .= "<br>\n";
 	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index c70a9b042d5..f395a4ee27a 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -236,8 +236,7 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 			$action = 'create';
 			$error++;
-		}
-		elseif (empty($_POST['task_parent']))
+		} elseif (empty($_POST['task_parent']))
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ChildOfProjectTask")), null, 'errors');
 			$action = 'create';
@@ -273,15 +272,13 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 			if ($taskid > 0)
 			{
 				$result = $task->add_contact($_POST["userid"], 'TASKEXECUTIVE', 'internal');
-			}
-			else {
+			} else {
 				if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("projects");
 					setEventMessages($langs->trans('NewTaskRefSuggested'), '', 'warnings');
 					$duplicate_code_error = true;
-				}
-				else {
+				} else {
 					setEventMessages($task->error, $task->errors, 'errors');
 				}
 				$action = 'create';
@@ -295,22 +292,19 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 			{
 				header("Location: ".$backtopage);
 				exit;
-			}
-			elseif (empty($projectid))
+			} elseif (empty($projectid))
 			{
 				header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php'.(empty($mode) ? '' : '?mode='.$mode));
 				exit;
 			}
 			$id = $projectid;
 		}
-	}
-	else {
+	} else {
 		if (!empty($backtopage))
 		{
 			header("Location: ".$backtopage);
 			exit;
-		}
-		elseif (empty($id))
+		} elseif (empty($id))
 		{
 			// We go back on task list
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php'.(empty($mode) ? '' : '?mode='.$mode));
@@ -504,8 +498,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 		$langs->load("errors");
 		print $langs->trans("WarningProjectClosed");
 		print '</div>';
-	}
-	else {
+	} else {
 		print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="createtask">';
@@ -532,8 +525,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 		if (empty($duplicate_code_error))
 		{
 			print (GETPOSTISSET("ref") ?GETPOST("ref", 'alpha') : $defaultref);
-		}
-		else {
+		} else {
 			print $defaultref;
 		}
 		print '<input type="hidden" name="taskref" value="'.($_POST["ref"] ? $_POST["ref"] : $defaultref).'">';
@@ -553,8 +545,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 		if (is_array($contactsofproject) && count($contactsofproject))
 		{
 			print $form->select_dolusers($user->id, 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, '', 'maxwidth300');
-		}
-		else {
+		} else {
 			print $langs->trans("NoUserAssignedToTheProject");
 		}
 		print '</td></tr>';
@@ -607,8 +598,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 		print '</form>';
 	}
-}
-elseif ($id > 0 || !empty($ref))
+} elseif ($id > 0 || !empty($ref))
 {
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
@@ -805,8 +795,7 @@ elseif ($id > 0 || !empty($ref))
 		// Show all lines in taskarray (recursive function to go down on tree)
 		$j = 0; $level = 0;
 		$nboftaskshown = projectLinesa($j, 0, $tasksarray, $level, true, 0, $tasksrole, $object->id, 1, $object->id, $filterprogresscalc, ($object->usage_bill_time ? 1 : 0), $arrayfields);
-	}
-	else {
+	} else {
 		$colspan = 10;
 		if ($object->usage_bill_time) $colspan += 2;
 		print '<tr class="oddeven nobottom"><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoTasks").'</span></td></tr>';
@@ -829,8 +818,7 @@ elseif ($id > 0 || !empty($ref))
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 				cleanCorruptedTree($db, 'projet_task', 'fk_task_parent');
 			}
-		}
-		else {
+		} else {
 			if ($nboftaskshown < count($tasksarray) && !GETPOST('search_user_id', 'int'))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php
index 905a6adedbf..e8a4ae93168 100644
--- a/htdocs/projet/tasks/comment.php
+++ b/htdocs/projet/tasks/comment.php
@@ -74,8 +74,7 @@ if (!empty($project_ref) && !empty($withproject))
 		if (count($objectsarray) > 0)
 		{
 			$id = $objectsarray[0]->id;
-		}
-		else {
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode) ? '' : '&mode='.$mode));
 		}
 	}
@@ -279,8 +278,7 @@ if ($id > 0 || !empty($ref))
 		{
 		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 		    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-		}
-		else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+		} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 		$morehtmlref = '';
 
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 303ee19425a..2c3737c6788 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -68,16 +68,14 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
     		if ($result <= 0)
     		{
     			dol_print_error($db, $projectstatic->error, $projectstatic->errors);
-    		}
-    		else {
+    		} else {
     			$contactsofproject = $projectstatic->getListContactId('internal');
     			foreach ($contactsofproject as $key => $val)
     			{
     				$result = $object->add_contact($val, GETPOST("type"), GETPOST("source"));
     			}
     		}
-    	}
-    	else {
+    	} else {
   			$result = $object->add_contact($idfortaskuser, GETPOST("type"), GETPOST("source"));
     	}
     }
@@ -86,14 +84,12 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id.($withproject ? '&withproject=1' : ''));
 		exit;
-	}
-	else {
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -105,8 +101,7 @@ if ($action == 'swapstatut' && $user->rights->projet->creer)
 	if ($object->fetch($id, $ref))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -121,8 +116,7 @@ if ($action == 'deleteline' && $user->rights->projet->creer)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id.($withproject ? '&withproject=1' : ''));
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -136,8 +130,7 @@ if (!empty($project_ref) && !empty($withproject))
 		if (count($tasksarray) > 0)
 		{
 			$id = $tasksarray[0]->id;
-		}
-		else {
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject ? '&withproject=1' : '').(empty($mode) ? '' : '&mode='.$mode));
 			exit;
 		}
@@ -318,8 +311,7 @@ if ($id > 0 || !empty($ref))
 		{
 		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 		    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-		}
-		else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+		} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 		$morehtmlref = '';
 
@@ -538,8 +530,7 @@ if ($id > 0 || !empty($ref))
 			}
 		}
 		print "</table>";
-	}
-	else {
+	} else {
 		print "ErrorRecordNotFound";
 	}
 }
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 80183db3d60..1493542c5ed 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -79,8 +79,7 @@ if (!empty($project_ref) && !empty($withproject))
 		{
 			$id = $tasksarray[0]->id;
 			$object->fetch($id);
-		}
-		else {
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject ? '&withproject=1' : '').(empty($mode) ? '' : '&mode='.$mode));
 			exit;
 		}
@@ -102,8 +101,7 @@ if ($id > 0 || !empty($ref))
 		$object->project = clone $projectstatic;
 
 		$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -269,8 +267,7 @@ if ($object->id > 0)
 	{
 	    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 	    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-	}
-	else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+	} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 	$morehtmlref = '';
 
@@ -316,8 +313,7 @@ if ($object->id > 0)
 	$permtoedit = $user->rights->projet->creer;
 	$relativepathwithnofile = dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref).'/';
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	header('Location: index.php');
 	exit;
 }
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index c25546bccbf..8930220f6ec 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -245,8 +245,7 @@ if ($resql)
 	{
 		$listofprojectcontacttype[$obj->rowid] = $obj->code;
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
 // Get id of types of contacts for tasks (This list never contains a lot of elements)
 $listoftaskcontacttype = array();
@@ -260,8 +259,7 @@ if ($resql)
 	{
 		$listoftaskcontacttype[$obj->rowid] = $obj->code;
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 if (count($listoftaskcontacttype) == 0) $listoftaskcontacttype[0] = '0'; // To avoid sql syntax error if not found
 
 $distinct = 'DISTINCT'; // We add distinct until we are added a protection to be sure a contact of a project and task is assigned only once.
@@ -752,8 +750,7 @@ while ($i < min($num, $limit))
 				$socstatic->id = $obj->socid;
 				$socstatic->name = $obj->name;
 				print $socstatic->getNomUrl(1);
-			}
-			else {
+			} else {
 				print '&nbsp;';
 			}
 			print '</td>';
@@ -854,8 +851,7 @@ while ($i < min($num, $limit))
 		        print convertSecondToTime($obj->tobill, 'allhourmin');
 		        $totalarray['val']['t.tobill'] += $obj->tobill;
 		        $totalarray['totaltobill'] += $obj->tobill;
-		    }
-		    else {
+		    } else {
 		        print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
 		    }
 		    print '</td>';
@@ -872,8 +868,7 @@ while ($i < min($num, $limit))
 		        print convertSecondToTime($obj->billed, 'allhourmin');
 		        $totalarray['val']['t.billed'] += $obj->billed;
 		        $totalarray['totalbilled'] += $obj->billed;
-		    }
-		    else {
+		    } else {
 		        print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
 		    }
 		    print '</td>';
@@ -938,8 +933,7 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota
 		{
 			if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
 			else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
-		}
-		elseif ($totalarray['totalplannedworkloadfield'] == $i) print '<td class="center">'.convertSecondToTime($totalarray['totalplannedworkload'], $plannedworkloadoutputformat).'</td>';
+		} elseif ($totalarray['totalplannedworkloadfield'] == $i) print '<td class="center">'.convertSecondToTime($totalarray['totalplannedworkload'], $plannedworkloadoutputformat).'</td>';
 		elseif ($totalarray['totaldurationeffectivefield'] == $i) print '<td class="center">'.convertSecondToTime($totalarray['totaldurationeffective'], $timespentoutputformat).'</td>';
 		elseif ($totalarray['totalprogress_calculatedfield'] == $i) print '<td class="center">'.($totalarray['totalplannedworkload'] > 0 ? round(100 * $totalarray['totaldurationeffective'] / $totalarray['totalplannedworkload'], 2).' %' : '').'</td>';
 		elseif ($totalarray['totalprogress_declaredfield'] == $i) print '<td class="center">'.($totalarray['totalplannedworkload'] > 0 ? round(100 * $totalarray['totaldurationdeclared'] / $totalarray['totalplannedworkload'], 2).' %' : '').'</td>';
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 737346570f4..7af9bbbacef 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -57,8 +57,7 @@ if ($id > 0 || !empty($ref))
 		if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
 
 		$object->project = clone $projectstatic;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -74,8 +73,7 @@ if (!empty($project_ref) && !empty($withproject))
 		{
 			$id = $tasksarray[0]->id;
 			$object->fetch($id);
-		}
-		else {
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode) ? '' : '&mode='.$mode));
 		}
 	}
@@ -241,8 +239,7 @@ if ($object->id > 0)
 	{
 	    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 	    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-	}
-	else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+	} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 	$morehtmlref = '';
 
diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
index bbb275ef5df..a0bf33b34ba 100644
--- a/htdocs/projet/tasks/stats/index.php
+++ b/htdocs/projet/tasks/stats/index.php
@@ -199,8 +199,7 @@ print '</div>';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 $stringtoshow .= '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
 	$stringtoshow .= $px1->show();
 	$stringtoshow .= "<br>\n";
 }
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 93f3ca3b01e..7a109eb1f50 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -113,8 +113,7 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->projet->creer)
 			    setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-	else {
+	} else {
 		$action = 'edit';
 	}
 }
@@ -130,8 +129,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->s
 		{
 			header('Location: '.DOL_URL_ROOT.'/projet/tasks.php?restore_lastsearch_values=1&id='.$projectstatic->id.($withproject ? '&withproject=1' : ''));
 			exit;
-		}
-		else {
+		} else {
 		    setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
@@ -147,8 +145,7 @@ if (!empty($project_ref) && !empty($withproject))
 		if (count($tasksarray) > 0)
 		{
 			$id = $tasksarray[0]->id;
-		}
-		else {
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode) ? '' : '&mode='.$mode));
 		}
 	}
@@ -459,8 +456,7 @@ if ($id > 0 || !empty($ref))
 			print '</div>';
 
 			print '</form>';
-		}
-		else {
+		} else {
 			/*
 			 * Fiche tache en mode visu
 			 */
@@ -478,8 +474,7 @@ if ($id > 0 || !empty($ref))
 			{
 			    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 			    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-			}
-			else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+			} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 			$morehtmlref = '';
 
@@ -563,8 +558,7 @@ if ($id > 0 || !empty($ref))
 				$tmparray = $object->getSummaryOfTimeSpent();
 				if ($tmparray['total_duration'] > 0 && !empty($object->planned_workload)) print round($tmparray['total_duration'] / $object->planned_workload * 100, 2).' %';
 				else print '0 %';
-			}
-			else print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
+			} else print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
 			print '</td></tr>';
 
 			// Other attributes
@@ -601,8 +595,7 @@ if ($id > 0 || !empty($ref))
 				if ($user->rights->projet->creer)
 				{
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit&amp;withproject='.$withproject.'">'.$langs->trans('Modify').'</a>';
-				}
-				else {
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Modify').'</a>';
 				}
 
@@ -612,12 +605,10 @@ if ($id > 0 || !empty($ref))
 				    if (!$object->hasChildren() && !$object->hasTimeSpent())
 				    {
 						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;withproject='.$withproject.'">'.$langs->trans('Delete').'</a>';
-				    }
-				    else {
+				    } else {
 				        print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("TaskHasChild").'">'.$langs->trans('Delete').'</a>';
 				    }
-				}
-				else {
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
 				}
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 95c50b9b62d..6c482264bbf 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -154,15 +154,13 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 		if ($id || $ref)
 		{
 			$object->fetch($id, $ref);
-		}
-		else {
+		} else {
 			if (!GETPOST('taskid', 'int') || GETPOST('taskid', 'int') < 0)
 			{
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), null, 'errors');
 				$action = 'createtime';
 				$error++;
-			}
-			else {
+			} else {
 				$object->fetch(GETPOST('taskid', 'int'));
 			}
 		}
@@ -176,8 +174,7 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 				setEventMessages($langs->trans("ProjectMustBeValidatedFirst"), null, 'errors');
 				$action = 'createtime';
 				$error++;
-			}
-			else {
+			} else {
 				$object->timespent_note = $_POST["timespent_note"];
 				if (GETPOST('progress', 'int') > 0) $object->progress = GETPOST('progress', 'int'); // If progress is -1 (not defined), we do not change value
 				$object->timespent_duration = $_POST["timespent_durationhour"] * 60 * 60; // We store duration in seconds
@@ -186,8 +183,7 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 				{
 					$object->timespent_date = dol_mktime(GETPOST("timehour"), GETPOST("timemin"), 0, GETPOST("timemonth"), GETPOST("timeday"), GETPOST("timeyear"));
 					$object->timespent_withhour = 1;
-				}
-				else {
+				} else {
 					$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timemonth"), GETPOST("timeday"), GETPOST("timeyear"));
 				}
 				$object->timespent_fk_user = $_POST["userid"];
@@ -195,15 +191,13 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 				if ($result >= 0)
 				{
 					setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-				}
-				else {
+				} else {
 					setEventMessages($langs->trans($object->error), null, 'errors');
 					$error++;
 				}
 			}
 		}
-	}
-	else {
+	} else {
 		if (empty($id)) $action = 'createtime';
 		else $action = 'createtime';
 	}
@@ -238,8 +232,7 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$_POST["cancel
 			{
 				$object->timespent_date = dol_mktime(GETPOST("timelinehour"), GETPOST("timelinemin"), 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 				$object->timespent_withhour = 1;
-			}
-			else {
+			} else {
 				$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 			}
 			$object->timespent_fk_user = $_POST["userid_line"];
@@ -247,13 +240,11 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$_POST["cancel
 			if ($result >= 0)
 			{
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-			}
-			else {
+			} else {
 				setEventMessages($langs->trans($object->error), null, 'errors');
 				$error++;
 			}
-		}
-		else {
+		} else {
 			$object->fetch($id, $ref);
 			// TODO Check that ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids))
 
@@ -266,8 +257,7 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$_POST["cancel
 			{
 				$object->timespent_date = dol_mktime(GETPOST("timelinehour"), GETPOST("timelinemin"), 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 				$object->timespent_withhour = 1;
-			}
-			else {
+			} else {
 				$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 			}
 			$object->timespent_fk_user = $_POST["userid_line"];
@@ -276,14 +266,12 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$_POST["cancel
 			if ($result >= 0)
 			{
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-			}
-			else {
+			} else {
 				setEventMessages($langs->trans($object->error), null, 'errors');
 				$error++;
 			}
 		}
-	}
-	else {
+	} else {
 		$action = '';
 	}
 }
@@ -300,8 +288,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->l
 		setEventMessages($langs->trans($object->error), null, 'errors');
 		$error++;
 		$action = '';
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 	}
 }
@@ -315,8 +302,7 @@ if (!empty($project_ref) && !empty($withproject))
 		if (count($tasksarray) > 0)
 		{
 			$id = $tasksarray[0]->id;
-		}
-		else {
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject ? '&withproject=1' : '').(empty($mode) ? '' : '&mode='.$mode));
 			exit;
 		}
@@ -332,14 +318,12 @@ if (GETPOST('projectid', 'int') > 0)
 	$result = $projectstatic->fetch($projectidforalltimes);
 	if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
 	$res = $projectstatic->fetch_optionals();
-}
-elseif (GETPOST('project_ref', 'alpha'))
+} elseif (GETPOST('project_ref', 'alpha'))
 {
 	$projectstatic->fetch(0, GETPOST('project_ref', 'alpha'));
 	$projectidforalltimes = $projectstatic->id;
 	$withproject = 1;
-}
-elseif ($id > 0)
+} elseif ($id > 0)
 {
 	$object->fetch($id);
 	$result = $projectstatic->fetch($object->fk_project);
@@ -353,8 +337,7 @@ if ($action == 'confirm_generateinvoice')
 	if (!($projectstatic->thirdparty->id > 0))
 	{
 		setEventMessages($langs->trans("ThirdPartyRequiredToGenerateInvoice"), null, 'errors');
-	}
-	else {
+	} else {
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -392,8 +375,7 @@ if ($action == 'confirm_generateinvoice')
 			$txtva = $dataforprice['tva_tx'];
 			$localtax1 = $dataforprice['localtax1'];
 			$localtax2 = $dataforprice['localtax2'];
-		}
-		else {
+		} else {
 			$pu_ht = 0;
 			$txtva = get_default_tva($mysoc, $projectstatic->thirdparty);
 			$localtax1 = get_default_localtax($mysoc, $projectstatic->thirdparty, 1);
@@ -406,8 +388,7 @@ if ($action == 'confirm_generateinvoice')
 
         if ($invoiceToUse) {
             $tmpinvoice->fetch($invoiceToUse);
-        }
-        else {
+        } else {
 		    $result = $tmpinvoice->create($user);
 		    if ($result <= 0)
 		    {
@@ -458,8 +439,7 @@ if ($action == 'confirm_generateinvoice')
 						break;
 					}
 				}
-			}
-			elseif ($generateinvoicemode == 'onelineperperiod') {
+			} elseif ($generateinvoicemode == 'onelineperperiod') {
 					$arrayoftasks = array();
 				foreach ($toselect as $key => $value)
 					{
@@ -502,8 +482,7 @@ if ($action == 'confirm_generateinvoice')
 						break;
 					}
 				}
-			}
-			elseif ($generateinvoicemode == 'onelinepertask') {
+			} elseif ($generateinvoicemode == 'onelinepertask') {
 					$arrayoftasks = array();
 				foreach ($toselect as $key => $value)
 					{
@@ -553,8 +532,7 @@ if ($action == 'confirm_generateinvoice')
 			//var_dump($tmpinvoice);
 
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 		}
 	}
@@ -584,8 +562,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		$result = $projectstatic->fetch($projectidforalltimes);
 		if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
 		$res = $projectstatic->fetch_optionals();
-	}
-	elseif ($object->fetch($id, $ref) >= 0)
+	} elseif ($object->fetch($id, $ref) >= 0)
 	{
 		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
 		$result = $projectstatic->fetch($object->fk_project);
@@ -742,14 +719,12 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				{
 					$backtourl = $_SERVER['PHP_SELF'].'?projectid='.$projectstatic->id.($withproject ? '&withproject=1' : '');
 					$linktocreatetimeUrl = $_SERVER['PHP_SELF'].'?'.($withproject ? 'withproject=1' : '').'&projectid='.$projectstatic->id.'&action=createtime'.$param.'&backtopage='.urlencode($backtourl);
-				}
-				else // We are on tab 'Time Spent' of task
+				} else // We are on tab 'Time Spent' of task
 				{
 					$backtourl = $_SERVER['PHP_SELF'].'?id='.$object->id.($withproject ? '&withproject=1' : '');
 					$linktocreatetimeUrl = $_SERVER['PHP_SELF'].'?'.($withproject ? 'withproject=1' : '').($object->id > 0 ? '&id='.$object->id : '&projectid='.$projectstatic->id).'&action=createtime'.$param.'&backtopage='.urlencode($backtourl);
 				}
-			}
-			else {
+			} else {
 				$linktocreatetimeBtnStatus = -2;
 				$linktocreatetimeHelpText = $langs->trans("NotOwnerOfProject");
 			}
@@ -788,8 +763,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		{
 			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 			$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-		}
-		else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+		} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 		$morehtmlref = '';
 
@@ -855,8 +829,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			$tmparray = $object->getSummaryOfTimeSpent();
 			if ($tmparray['total_duration'] > 0) print round($tmparray['total_duration'] / $object->planned_workload * 100, 2).' %';
 			else print '0 %';
-		}
-		else print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
+		} else print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
 		print '</td>';
 
 		print '</tr>';
@@ -1051,8 +1024,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 		{
 			$num = $nbtotalofrecords;
-		}
-		else {
+		} else {
 			$sql .= $db->plimit($limit + 1, $offset);
 
 			$resql = $db->query($sql);
@@ -1074,8 +1046,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				$title = $langs->trans("ListTaskTimeUserProject");
 
 				print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $linktocreatetime, '', $limit);
-			}
-			else {
+			} else {
 				print '<!-- List of time spent for project -->'."\n";
 
 				$title = $langs->trans("ListTaskTimeForTask");
@@ -1091,8 +1062,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -1150,8 +1120,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 
 				if ($projectstatic->public) $contactsofproject = array();
 				print $form->select_dolusers((GETPOST('userid', 'int') ? GETPOST('userid', 'int') : $userid), 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, $langs->trans("ResourceNotAssignedToProject"), 'maxwidth200');
-			}
-			else {
+			} else {
 				if ($nboftasks) {
 					print img_error($langs->trans('FirstAddRessourceToAllocateTime')).' '.$langs->trans('FirstAddRessourceToAllocateTime');
 				}
@@ -1310,10 +1279,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					if (empty($task_time->task_date_withhour))
 					{
 						print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 3, 3, 2, "timespent_date", 1, 0);
-					}
-					else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
-				}
-				else {
+					} else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
+				} else {
 					print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
 				}
 				print '</td>';
@@ -1329,8 +1296,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
 					{
 						$formproject->selectTasks(-1, GETPOST('taskid', 'int') ?GETPOST('taskid', 'int') : $task_time->fk_task, 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, '');
-					}
-					else {
+					} else {
 						$tasktmp->id = $task_time->fk_task;
 						$tasktmp->ref = $task_time->ref;
 						$tasktmp->label = $task_time->label;
@@ -1370,8 +1336,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					} else {
 						print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
 					}
-				}
-				else {
+				} else {
 					$userstatic->id = $task_time->fk_user;
 					$userstatic->lastname = $task_time->lastname;
 					$userstatic->firstname = $task_time->firstname;
@@ -1390,14 +1355,12 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
 				{
 					print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
-				}
-				else {
+				} else {
 					print dol_nl2br($task_time->note);
 				}
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
-			}
-			elseif ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
+			} elseif ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
 			{
 				print '<input type="hidden" name="timespent_note_line" value="'.$task_time->note.'">';
 			}
@@ -1410,8 +1373,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				{
 					print '<input type="hidden" name="old_duration" value="'.$task_time->task_duration.'">';
 					print $form->select_duration('new_duration', $task_time->task_duration, 0, 'text');
-				}
-				else {
+				} else {
 					print convertSecondToTime($task_time->task_duration, 'allhourmin');
 				}
 				print '</td>';
@@ -1451,12 +1413,10 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 							{
 								print $tmpinvoice->getNomUrl(1);
 							}
-						}
-						else {
+						} else {
 							print $langs->trans("No");
 						}
-					}
-					else {
+					} else {
 						print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
 					}
 				}
@@ -1484,8 +1444,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				print '<input type="submit" class="button buttongen margintoponlyshort marginbottomonlyshort" name="save" value="'.$langs->trans("Save").'">';
 				print '<br>';
 				print '<input type="submit" class="button buttongen margintoponlyshort marginbottomonlyshort" name="cancel" value="'.$langs->trans('Cancel').'">';
-			}
-			elseif ($user->rights->projet->lire || $user->rights->projet->all->creer)	 // Read project and enter time consumed on assigned tasks
+			} elseif ($user->rights->projet->lire || $user->rights->projet->all->creer)	 // Read project and enter time consumed on assigned tasks
 			{
 				if ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids) || $user->rights->projet->all->creer)
 				{
@@ -1537,10 +1496,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 						if (empty($task_time->task_date_withhour))
 						{
 							print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 3, 3, 2, "timespent_date", 1, 0);
-						}
-						else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
-					}
-					else {
+						} else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
+					} else {
 						print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
 					}
 					print '</td>';
@@ -1588,8 +1545,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 						} else {
 							print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
 						}
-					}
-					else {
+					} else {
 						$userstatic->id = $task_time->fk_user;
 						$userstatic->lastname = $task_time->lastname;
 						$userstatic->firstname = $task_time->firstname;
@@ -1607,13 +1563,11 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
 					{
 						print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
-					}
-					else {
+					} else {
 						print dol_nl2br($task_time->note);
 					}
 					print '</td>';
-				}
-				elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
+				} elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
 				{
 					print '<input type="hidden" name="timespent_note_line" value="'.$task_time->note.'">';
 				}
@@ -1626,8 +1580,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					{
 						print '<input type="hidden" name="old_duration" value="'.$task_time->task_duration.'">';
 						print $form->select_duration('new_duration', $task_time->task_duration, 0, 'text');
-					}
-					else {
+					} else {
 						print convertSecondToTime($task_time->task_duration, 'allhourmin');
 					}
 					print '</td>';
@@ -1681,10 +1634,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 						if (empty($task_time->task_date_withhour))
 						{
 							print $form->selectDate(($date2 ? $date2 : $date1), 'timeline_2', 3, 3, 2, "timespent_date", 1, 0);
-						}
-						else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline_2', 1, 1, 2, "timespent_date", 1, 0);
-					}
-					else {
+						} else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline_2', 1, 1, 2, "timespent_date", 1, 0);
+					} else {
 						print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
 					}
 					print '</td>';
@@ -1732,8 +1683,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 						} else {
 							print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
 						}
-					}
-					else {
+					} else {
 						$userstatic->id = $task_time->fk_user;
 						$userstatic->lastname = $task_time->lastname;
 						$userstatic->firstname = $task_time->firstname;
@@ -1751,13 +1701,11 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
 					{
 						print '<textarea name="timespent_note_line_2" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
-					}
-					else {
+					} else {
 						print dol_nl2br($task_time->note);
 					}
 					print '</td>';
-				}
-				elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
+				} elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
 				{
 					print '<input type="hidden" name="timespent_note_line_2" value="'.$task_time->note.'">';
 				}
@@ -1770,8 +1718,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					{
 						print '<input type="hidden" name="old_duration_2" value="0">';
 						print $form->select_duration('new_duration_2', 0, 0, 'text');
-					}
-					else {
+					} else {
 						print convertSecondToTime($task_time->task_duration, 'allhourmin');
 					}
 					print '</td>';
@@ -1828,8 +1775,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				{
 					if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
 					else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
-				}
-				elseif ($totalarray['totaldurationfield'] == $i) print '<td class="right">'.convertSecondToTime($totalarray['totalduration'], 'allhourmin').'</td>';
+				} elseif ($totalarray['totaldurationfield'] == $i) print '<td class="right">'.convertSecondToTime($totalarray['totalduration'], 'allhourmin').'</td>';
 				elseif ($totalarray['totalvaluefield'] == $i) print '<td class="right">'.price($totalarray['totalvalue']).'</td>';
 				//elseif ($totalarray['totalvaluebilledfield'] == $i) print '<td class="center">'.price($totalarray['totalvaluebilled']).'</td>';
 				else print '<td></td>';
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index ff8611ee0a4..9530757b283 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -109,8 +109,7 @@ if ($reshook < 0) {
 		print '<div class="error">'.$hookmanager->error.'</div>';
 	}
 	llxFooterVierge();
-}
-elseif (empty($reshook)) {
+} elseif (empty($reshook)) {
 	// Check exportkey
 	if (empty($_GET["exportkey"]) || $conf->global->MAIN_AGENDA_XCAL_EXPORTKEY != $_GET["exportkey"]) {
 		$user->getrights();
@@ -188,8 +187,7 @@ if ($format == 'ical' || $format == 'vcal')
 
 		//header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
-	}
-	else {
+	} else {
 		print 'Error '.$agenda->error;
 
 		exit;
@@ -225,8 +223,7 @@ if ($format == 'rss')
 
 		// header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
-	}
-	else {
+	} else {
 		print 'Error '.$agenda->error;
 
 		exit;
diff --git a/htdocs/public/cron/cron_run_jobs.php b/htdocs/public/cron/cron_run_jobs.php
index 13419207e07..9eb0579680a 100644
--- a/htdocs/public/cron/cron_run_jobs.php
+++ b/htdocs/public/cron/cron_run_jobs.php
@@ -90,8 +90,7 @@ if ($result < 0)
 	echo "User Error:".$user->error;
 	dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
 	exit;
-}
-else {
+} else {
 	if (empty($user->id))
 	{
 		echo " User login:".$userlogin." do not exists";
@@ -166,8 +165,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 		            echo "\nUser Error: ".$user->error."\n";
 		            dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
 		            exit(-1);
-		        }
-		        else {
+		        } else {
 		            if ($result == 0)
 		            {
 		                echo "\nUser login: ".$userlogin." does not exists for entity ".$conf->entity."\n";
@@ -204,8 +202,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 			    echo "You can also enable module Log if not yet enabled, run again and take a look into dolibarr.log file\n";
 			    dol_syslog("cron_run_jobs.php::run_jobs Error".$cronjob->error, LOG_ERR);
 				$nbofjobslaunchedko++;
-			}
-			else {
+			} else {
 				$nbofjobslaunchedok++;
 			}
 
@@ -222,8 +219,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 			}
 
 			echo " - reprogrammed\n";
-		}
-		else {
+		} else {
 		    echo " - not qualified\n";
 
 		    dol_syslog("cron_run_jobs.php job not qualified line->datenextrun:".dol_print_date($line->datenextrun, 'dayhourrfc')." line->datestart:".dol_print_date($line->datestart, 'dayhourrfc')." line->dateend:".dol_print_date($line->dateend, 'dayhourrfc')." now:".dol_print_date($now, 'dayhourrfc'));
@@ -233,8 +229,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 	$conf = $savconf;
 
 	echo "Result: ".($nbofjobs)." jobs - ".($nbofjobslaunchedok + $nbofjobslaunchedko)." launched = ".$nbofjobslaunchedok." OK + ".$nbofjobslaunchedko." KO";
-}
-else {
+} else {
 	echo "Result: No active jobs found.";
 }
 
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 7e4f1b1b0d7..768b7d42392 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -151,8 +151,7 @@ foreach ($modulesdir as $dir)
                         if ($objMod->numero > 0)
                         {
                             $j = $objMod->numero;
-                        }
-                        else {
+                        } else {
                             $j = 1000 + $i;
                         }
 
@@ -173,8 +172,7 @@ foreach ($modulesdir as $dir)
                             $j++;
                             $i++;
                         }
-		            }
-                    catch (Exception $e)
+		            } catch (Exception $e)
                     {
                         dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
                     }
@@ -378,8 +376,7 @@ foreach ($demoprofiles as $profilearray)
                 {
                     print "\n".'<!-- Module '.$modulekeyname.' hidden and always checked -->';
                     print '<input type="hidden" name="'.$modulekeyname.'" value="1">';
-                }
-                else {
+                } else {
                     $modulo = ($j % $nbcolsmod);
         		    //if ($modulo == 0) print '<tr>';
                     print '<!-- id='.$val->numero.' -->';
@@ -431,8 +428,7 @@ if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AD_CLIEN
 		print 'src="http://pagead2.googlesyndication.com/pagead/show_ads.js">'."\n";
 		print '</script>'."\n";
 		print '</div>'."\n";
-	}
-	else {
+	} else {
 		print '<!-- google js advert tag disabled with jmobile -->'."\n";
 	}
 }
diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php
index 045f726fe1d..49114b89f46 100644
--- a/htdocs/public/donations/donateurs_code.php
+++ b/htdocs/public/donations/donateurs_code.php
@@ -87,8 +87,7 @@ if ($resql)
 			if ($objp->public)
 			{
 				print "<td>".dolGetFirstLastname($objp->firstname, $objp->lastname)." ".$objp->societe."</td>\n";
-			}
-			else {
+			} else {
 				print "<td>Anonyme Anonyme</td>\n";
 			}
 			print "<td>".dol_print_date($db->jdate($objp->datedon))."</td>\n";
@@ -97,12 +96,10 @@ if ($resql)
 			$i++;
 		}
 		print "</table>";
-	}
-	else {
+	} else {
 		print "Aucun don publique";
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 71e28c94da8..7eb45f008e6 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -107,13 +107,11 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
     {
         $urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
         $width = 150;
-    }
-    elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+    } elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
     {
         $urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
         $width = 150;
-    }
-    elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
+    } elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
     {
         $urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
         $width = 150;
@@ -343,10 +341,8 @@ if ($action == 'add')
             		if (preg_match('/\d\.\d/', $appli))
             		{
             			if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-            		}
-            		else $appli .= " ".DOL_VERSION;
-            	}
-            	else $appli .= " ".DOL_VERSION;
+            		} else $appli .= " ".DOL_VERSION;
+            	} else $appli .= " ".DOL_VERSION;
 
             	$to = $adh->makeSubstitution($conf->global->MAIN_INFO_SOCIETE_MAIL);
             	$from = $conf->global->ADHERENT_MAIL_FROM;
@@ -375,8 +371,7 @@ if ($action == 'add')
             {
                 $urlback = $conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
                 // TODO Make replacement of __AMOUNT__, etc...
-            }
-            else $urlback = $_SERVER["PHP_SELF"]."?action=added";
+            } else $urlback = $_SERVER["PHP_SELF"]."?action=added";
 
             if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE) && $conf->global->MEMBER_NEWFORM_PAYONLINE != '-1')
             {
@@ -390,13 +385,11 @@ if ($action == 'add')
                         if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
                         {
                     	    $urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-                        }
-                        else {
+                        } else {
                             $urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
                         }
                     }
-                }
-            	elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox')
+                } elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox')
                 {
                     $urlback = DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
                     if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
@@ -406,13 +399,11 @@ if ($action == 'add')
                     	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
                     	{
                     		$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-                    	}
-                    	else {
+                    	} else {
                     		$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
                     	}
                     }
-                }
-                elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal')
+                } elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal')
                 {
                     $urlback = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
                     if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
@@ -422,13 +413,11 @@ if ($action == 'add')
                     	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
                         {
                         	$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-                        }
-                        else {
+                        } else {
                         	$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
                         }
                     }
-                }
-				elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'stripe')
+                } elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'stripe')
                 {
                     $urlback = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
                     if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
@@ -438,13 +427,11 @@ if ($action == 'add')
                     	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
                         {
                         	$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-                        }
-                        else {
+                        } else {
                         	$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
                         }
                     }
-                }
-                else {
+                } else {
                     dol_print_error('', "Autosubscribe form is setup to ask an online payment for a not managed online payment");
                     exit;
                 }
@@ -452,8 +439,7 @@ if ($action == 'add')
 
             if (!empty($entity)) $urlback .= '&entity='.$entity;
             dol_syslog("member ".$adh->ref." was created, we redirect to ".$urlback);
-        }
-        else {
+        } else {
         	$error++;
             $errmsg .= join('<br>', $adh->errors);
         }
@@ -465,8 +451,7 @@ if ($action == 'add')
 
     	Header("Location: ".$urlback);
     	exit;
-    }
-    else {
+    } else {
     	$db->rollback();
     }
 }
@@ -567,8 +552,7 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE))
     print '<tr><td class="titlefield">'.$langs->trans("Type").' <FONT COLOR="red">*</FONT></td><td>';
     print $form->selectarray("type", $adht->liste_array(), GETPOST('type') ?GETPOST('type') : $defaulttype, $isempty);
     print '</td></tr>'."\n";
-}
-else {
+} else {
     $adht->fetch($conf->global->MEMBER_NEWFORM_FORCETYPE);
     print '<input type="hidden" id="type" name="type" value="'.$conf->global->MEMBER_NEWFORM_FORCETYPE.'">';
 }
@@ -580,8 +564,7 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY))
     print '<tr class="morphy"><td class="titlefield">'.$langs->trans('MemberNature').' <FONT COLOR="red">*</FONT></td><td>'."\n";
     print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
     print '</td></tr>'."\n";
-}
-else {
+} else {
     print $morphys[$conf->global->MEMBER_NEWFORM_FORCEMORPHY];
     print '<input type="hidden" id="morphy" name="morphy" value="'.$conf->global->MEMBER_NEWFORM_FORCEMORPHY.'">';
 }
@@ -723,8 +706,7 @@ if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)
     if (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT))
     {
         print '<input type="text" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
-    }
-    else {
+    } else {
         print '<input type="text" name="amount" id="amounthidden" class="flat amount" disabled size="6" value="'.$amount.'">';
         print '<input type="hidden" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
     }
diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php
index a955c9605f2..c1677b2902b 100644
--- a/htdocs/public/members/public_card.php
+++ b/htdocs/public/members/public_card.php
@@ -84,8 +84,7 @@ if ($id > 0)
 	if (empty($object->public))
 	{
 		 print $langs->trans("ErrorThisMemberIsNotPublic");
-	}
-	else {
+	} else {
 		print '<table class="public_border" cellspacing="0" width="100%" cellpadding="3">';
 
 		print '<tr><td width="15%">'.$langs->trans("Type").'</td><td class="valeur">'.$object->type."</td></tr>\n";
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index 1a885ed3596..cb5b9308ed4 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -152,16 +152,14 @@ if ($result)
 			print '<td>';
 			print $form->showphoto('memberphoto', $objp, 64);
 			print '</td>'."\n";
-		}
-		else {
+		} else {
 			print "<td>&nbsp;</td>\n";
 		}
 		print "</tr>";
 		$i++;
 	}
 	print "</table>";
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/public/notice.php b/htdocs/public/notice.php
index b3b362fa6b2..a86b8c68e42 100644
--- a/htdocs/public/notice.php
+++ b/htdocs/public/notice.php
@@ -38,8 +38,7 @@ if (!GETPOST('transkey', 'alphanohtml') && !GETPOST('transphrase', 'alphanohtml'
 {
 	print 'Sorry, it seems your internet connexion is off.<br>';
 	print 'You need to be connected to network to use this software.<br>';
-}
-else {
+} else {
 	$langs->load("error");
 	$langs->load("other");
 
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index 20b029f960d..2031c11a3ad 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -174,8 +174,7 @@ if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumb
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
 	$width = 150;
-}
-elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
@@ -235,8 +234,7 @@ if ($source == 'proposal')
 	{
 		$mesg = $proposal->error;
 		$error++;
-	}
-	else {
+	} else {
 		$result = $proposal->fetch_thirdparty($proposal->socid);
 	}
 
@@ -275,12 +273,10 @@ if ($action != 'dosign')
 {
     if ($found && !$error)	// We are in a management option and no error
     {
-    }
-    else {
+    } else {
     	dol_print_error_email('ERRORNEWONLINESIGN');
     }
-}
-else {
+} else {
     // Print
 }
 
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index f26d31c483d..4f437c07740 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -108,12 +108,10 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 			if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1')
 			{
 				$nouveauchoix .= "1";
-			}
-			elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
+			} elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
 			{
 				$nouveauchoix .= "2";
-			}
-			else { // sinon c'est 0
+			} else { // sinon c'est 0
 				$nouveauchoix .= "0";
 			}
 		}
@@ -132,8 +130,7 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 		{
 			setEventMessages($langs->trans("VoteNameAlreadyExists"), null, 'errors');
 			$error++;
-		}
-		else {
+		} else {
 			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'opensurvey_user_studs (nom, id_sondage, reponses)';
 			$sql .= " VALUES ('".$db->escape($nom)."', '".$db->escape($numsondage)."','".$db->escape($nouveauchoix)."')";
 			$resql = $db->query($sql);
@@ -168,11 +165,9 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 						$result = $cmailfile->sendfile();
 					}
 				}
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 		}
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Name")), null, 'errors');
 	}
 }
@@ -208,12 +203,10 @@ if ($testmodifier)
 		if (isset($_POST["choix".$i]) && $_POST["choix".$i] == '1')
 		{
 			$nouveauchoix .= "1";
-		}
-		elseif (isset($_POST["choix".$i]) && $_POST["choix".$i] == '2')
+		} elseif (isset($_POST["choix".$i]) && $_POST["choix".$i] == '2')
 		{
 			$nouveauchoix .= "2";
-		}
-		else { // sinon c'est 0
+		} else { // sinon c'est 0
 			$nouveauchoix .= "0";
 		}
 	}
@@ -389,8 +382,7 @@ if ($object->format == "D")
 
 		print '</tr>'."\n";
 	}
-}
-else {
+} else {
 	//display of survey topics
 	print '<tr>'."\n";
 	print '<td></td>'."\n";
@@ -477,8 +469,7 @@ while ($compteur < $num)
 				if (((string) $car) == "0") $sumagainst[$i]++;
 			}
 		}
-	}
-	else {
+	} else {
 		//sinon on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs
 		if ($compteur == $ligneamodifier)
 		{
@@ -504,8 +495,7 @@ while ($compteur < $num)
 				}
 				print '</td>'."\n";
 			}
-		}
-		else {
+		} else {
 			for ($i = 0; $i < $nbcolonnes; $i++)
 			{
 				$car = substr($ensemblereponses, $i, 1);
@@ -689,8 +679,7 @@ if ($object->allow_spy) {
 				} else {
 					$meilleursujet .= dol_print_date($toutsujet[$i], 'daytext').' ('.dol_print_date($toutsujet[$i], '%A').')';
 				}
-			}
-			else {
+			} else {
 				$tmps = explode('@', $toutsujet[$i]);
 				$meilleursujet .= dol_htmlentities($tmps[0]);
 			}
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index b82dcc3360b..746fcffcfa4 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -210,8 +210,7 @@ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 	{
 		if ($source && $REF) $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$source.$REF, 2); // Use the source in the hash to avoid duplicates if the references are identical
 		else $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-	}
-	else {
+	} else {
 		$token = $conf->global->PAYMENT_SECURITY_TOKEN;
 	}
 	if ($SECUREKEY != $token)
@@ -466,8 +465,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
 	    				dol_syslog('Failed to create card record', LOG_WARNING, 0, '_stripe');
 	    				setEventMessages('Failed to create card record', null, 'errors');
 	    				$action = '';
-	    			}
-	    			else {
+	    			} else {
 	    				if (!empty($FULLTAG))       $metadata["FULLTAG"] = $FULLTAG;
 	    				if (!empty($dol_id))        $metadata["dol_id"] = $dol_id;
 	    				if (!empty($dol_type))      $metadata["dol_type"] = $dol_type;
@@ -493,8 +491,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
 	    				}
 	    			}
     			}
-    		}
-    		else {
+    		} else {
     			$vatcleaned = $vatnumber ? $vatnumber : null;
 
     			/*$taxinfo = array('type'=>'vat');
@@ -648,8 +645,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
             } else {
                 $paymentintent = \Stripe\PaymentIntent::retrieve($paymentintent_id, array("stripe_account" => $stripeacc));
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $error++;
             $errormessage = "CantRetreivePaymentIntent ".$e->getMessage();
@@ -665,8 +661,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
             dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
             setEventMessages($paymentintent->status, null, 'errors');
             $action = '';
-        }
-        else {
+        } else {
         	// TODO We can alse record the payment mode into llx_societe_rib with stripe $paymentintent->payment_method
         	// Note that with other old Stripe architecture (using Charge API), the payment mode was not recorded, so it is not mandatory to do it here.
         	//dol_syslog("Create payment_method for ".$paymentintent->payment_method, LOG_DEBUG, 0, '_stripe');
@@ -695,8 +690,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
 	{
 		header("Location: ".$urlko);
 		exit;
-	}
-	else {
+	} else {
 		header("Location: ".$urlok);
 		exit;
 	}
@@ -769,8 +763,7 @@ if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumb
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
 	$width = 150;
-}
-elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
@@ -870,8 +863,7 @@ if (!$source)
 	{
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
-	}
-	else {
+	} else {
 		print '<b>'.price($amount).'</b>';
 		print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
@@ -907,8 +899,7 @@ if ($source == 'order')
 	{
 		$mesg = $order->error;
 		$error++;
-	}
-	else {
+	} else {
 		$result = $order->fetch_thirdparty($order->socid);
 	}
 	$object = $order;
@@ -964,8 +955,7 @@ if ($source == 'order')
 	{
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
-	}
-	else {
+	} else {
 		print '<b>'.price($amount).'</b>';
 		print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
@@ -1001,8 +991,7 @@ if ($source == 'order')
 		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-	}
-	else {
+	} else {
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	if (is_object($order->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$order->thirdparty->id.'">'."\n";
@@ -1028,8 +1017,7 @@ if ($source == 'invoice')
 	{
 		$mesg = $invoice->error;
 		$error++;
-	}
-	else {
+	} else {
 		$result = $invoice->fetch_thirdparty($invoice->socid);
 	}
 	$object = $invoice;
@@ -1087,14 +1075,12 @@ if ($source == 'invoice')
 		{
 			print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
 			print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
-		}
-		else {
+		} else {
 			print '<b>'.price($amount).'</b>';
 			print '<input type="hidden" name="amount" value="'.$amount.'">';
 			print '<input type="hidden" name="newamount" value="'.$amount.'">';
 		}
-	}
-	else {
+	} else {
 		print '<b>'.price($object->total_ttc, 1, $langs).'</b>';
 	}
 	// Currency
@@ -1128,8 +1114,7 @@ if ($source == 'invoice')
 		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-	}
-	else {
+	} else {
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	if (is_object($invoice->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$invoice->thirdparty->id.'">'."\n";
@@ -1156,21 +1141,18 @@ if ($source == 'contractline')
 	{
 		$mesg = $contractline->error;
 		$error++;
-	}
-	else {
+	} else {
 		if ($contractline->fk_contrat > 0)
 		{
 			$result = $contract->fetch($contractline->fk_contrat);
 			if ($result > 0)
 			{
 				$result = $contract->fetch_thirdparty($contract->socid);
-			}
-			else {
+			} else {
 				$mesg = $contract->error;
 				$error++;
 			}
-		}
-		else {
+		} else {
 			$mesg = 'ErrorRecordNotFound';
 			$error++;
 		}
@@ -1192,8 +1174,7 @@ if ($source == 'contractline')
 				$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
 				$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
 				$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
-			}
-			else {
+			} else {
 				$pu_ht = $product->price;
 				$pu_ttc = $product->price_ttc;
 				$price_base_type = $product->price_base_type;
@@ -1278,8 +1259,7 @@ if ($source == 'contractline')
 			if ($contractline->product->duration_value > 1)
 			{
 				$dur = array("h"=>$langs->trans("Hours"), "d"=>$langs->trans("DurationDays"), "w"=>$langs->trans("DurationWeeks"), "m"=>$langs->trans("DurationMonths"), "y"=>$langs->trans("DurationYears"));
-			}
-			else {
+			} else {
 				$dur = array("h"=>$langs->trans("Hour"), "d"=>$langs->trans("DurationDay"), "w"=>$langs->trans("DurationWeek"), "m"=>$langs->trans("DurationMonth"), "y"=>$langs->trans("DurationYear"));
 			}
 			$duration = $contractline->product->duration_value.' '.$dur[$contractline->product->duration_unit];
@@ -1298,8 +1278,7 @@ if ($source == 'contractline')
 	{
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
-	}
-	else {
+	} else {
 		print '<b>'.price($amount).'</b>';
 		print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
@@ -1335,8 +1314,7 @@ if ($source == 'contractline')
 		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-	}
-	else {
+	} else {
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	if (is_object($contract->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$contract->thirdparty->id.'">'."\n";
@@ -1362,8 +1340,7 @@ if ($source == 'membersubscription')
 	{
 		$mesg = $member->error;
 		$error++;
-	}
-	else {
+	} else {
 		$member->fetch_thirdparty();
 		$subscription = new Subscription($db);
 	}
@@ -1450,8 +1427,7 @@ if ($source == 'membersubscription')
 				if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 					$valtoshow = $conf->global->MEMBER_NEWFORM_AMOUNT;
 				}
-			}
-			else {
+			} else {
 				if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 					$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
 				}
@@ -1464,8 +1440,7 @@ if ($source == 'membersubscription')
 		if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.$valtoshow.'">';
-	}
-	else {
+	} else {
 		$valtoshow = $amount;
 		if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
 		print '<b>'.price($valtoshow).'</b>';
@@ -1504,8 +1479,7 @@ if ($source == 'membersubscription')
 		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-	}
-	else {
+	} else {
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	if (is_object($member->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$member->thirdparty->id.'">'."\n";
@@ -1529,8 +1503,7 @@ if ($source == 'donation')
 	{
 		$mesg = $don->error;
 		$error++;
-	}
-	else {
+	} else {
 		$don->fetch_thirdparty();
 	}
 	$object = $don;
@@ -1593,8 +1566,7 @@ if ($source == 'donation')
 				if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 					$valtoshow = $conf->global->MEMBER_NEWFORM_AMOUNT;
 				}
-			}
-			else {
+			} else {
 				if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 					$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
 				}
@@ -1607,8 +1579,7 @@ if ($source == 'donation')
 		if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.$valtoshow.'">';
-	}
-	else {
+	} else {
 		$valtoshow = $amount;
 		if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
 		print '<b>'.price($valtoshow).'</b>';
@@ -1647,8 +1618,7 @@ if ($source == 'donation')
 		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-	}
-	else {
+	} else {
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	if (is_object($don->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$don->thirdparty->id.'">'."\n";
@@ -1675,16 +1645,13 @@ if ($action != 'dopayment')
 		if ($source == 'order' && $object->billed)
 		{
 			print '<br><br><span class="amountpaymentcomplete">'.$langs->trans("OrderBilled").'</span>';
-		}
-		elseif ($source == 'invoice' && $object->paye)
+		} elseif ($source == 'invoice' && $object->paye)
 		{
 			print '<br><br><span class="amountpaymentcomplete">'.$langs->trans("InvoicePaid").'</span>';
-		}
-		elseif ($source == 'donation' && $object->paid)
+		} elseif ($source == 'donation' && $object->paid)
 		{
 			print '<br><br><span class="amountpaymentcomplete">'.$langs->trans("DonationPaid").'</span>';
-		}
-		else {
+		} else {
 		    // Membership can be paid and we still allow to make renewal
 		    if ($source == 'membersubscription' && $object->datefin > dol_now())
 		    {
@@ -1773,12 +1740,10 @@ if ($action != 'dopayment')
 				';
 			}
 		}
-	}
-	else {
+	} else {
 		dol_print_error_email('ERRORNEWPAYMENT');
 	}
-}
-else {
+} else {
 	// Print
 }
 
@@ -1915,8 +1880,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 		    if (empty($paymentintent))
 		    {
                 print '<center>'.$langs->trans("Error").'</center>';
-		    }
-		    else {
+		    } else {
 		        print '<input type="hidden" name="paymentintent_id" value="'.$paymentintent->id.'">';
 		        //$_SESSION["paymentintent_id"] = $paymentintent->id;
 		    }
@@ -1930,8 +1894,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 		{
 			$langs->load("errors");
 			print info_admin($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Stripe")), 0, 0, 'error');
-		}
-		else {
+		} else {
 			print '<!-- JS Code for Stripe components -->';
     		print '<script src="https://js.stripe.com/v3/"></script>'."\n";
     		print '<!-- urllogofull = '.$urllogofull.' -->'."\n";
@@ -1993,8 +1956,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
     				$_SESSION['ipaddress'] = ($remoteip ? $remoteip : 'unknown'); // Payer ip
     				$_SESSION['payerID'] = is_object($stripecu) ? $stripecu->id : '';
     				$_SESSION['TRANSACTIONID'] = $sessionstripe->id;
-    			}
-    			catch (Exception $e)
+    			} catch (Exception $e)
     			{
     				print $e->getMessage();
     			}
@@ -2042,8 +2004,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 
 
     			<?php
-    		}
-    		elseif (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
+    		} elseif (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
     		{
             	?>
     		// Code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION set
@@ -2146,8 +2107,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
             });
 
     			<?php
-    		}
-    		else // Old method (not SCA ready)
+    		} else // Old method (not SCA ready)
     		{
     			?>
     		// Old code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION off and STRIPE_USE_NEW_CHECKOUT off
@@ -2214,8 +2174,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
     			        }
     				});
     				<?php
-    			}
-    			else // Ask credit card with 3DS test
+    			} else // Ask credit card with 3DS test
     			{
     				?>
     				/* Use 3DS source */
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index a261c6101a0..c42677d8b21 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -77,8 +77,7 @@ if (empty($paymentmethod))
 {
     dol_print_error(null, 'The back url does not contains a parameter fulltag that should help us to find the payment method used');
     exit;
-}
-else {
+} else {
     dol_syslog("paymentmethod=".$paymentmethod);
 }
 
@@ -158,10 +157,8 @@ if (!empty($_SESSION['ipaddress']))      // To avoid to make action twice
     	    if (preg_match('/\d\.\d/', $appli))
     	    {
     	        if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-    	    }
-    	    else $appli .= " ".DOL_VERSION;
-    	}
-    	else $appli .= " ".DOL_VERSION;
+    	    } else $appli .= " ".DOL_VERSION;
+    	} else $appli .= " ".DOL_VERSION;
 
     	$urlback = $_SERVER["REQUEST_URI"];
     	$topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("NewOnlinePaymentFailed");
@@ -185,8 +182,7 @@ if (!empty($_SESSION['ipaddress']))      // To avoid to make action twice
     	if ($result)
     	{
     		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
-    	}
-    	else {
+    	} else {
     		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
     	}
     }
@@ -225,8 +221,7 @@ if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumb
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
 	$width = 150;
-}
-elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index a1d562b8690..4bb899b930e 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -163,8 +163,7 @@ if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumb
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
 	$width = 150;
-}
-elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
@@ -221,8 +220,7 @@ if (!empty($conf->paypal->enabled))
 		        {
 		        	// Nothing to do
 		        	dol_syslog("Call to GetExpressCheckoutDetails return ".$ack, LOG_DEBUG, 0, '_payment');
-		        }
-		        else {
+		        } else {
 		        	dol_syslog("Call to GetExpressCheckoutDetails return error: ".json_encode($resArray), LOG_WARNING, '_payment');
 		        }
 
@@ -249,8 +247,7 @@ if (!empty($conf->paypal->enabled))
 		            $NOTE = urldecode($resArray2["NOTE"]);
 
 		            $ispaymentok = true;
-		        }
-		        else {
+		        } else {
 		        	dol_syslog("Call to DoExpressCheckoutPayment return error: ".json_encode($resArray2), LOG_WARNING, 0, '_payment');
 
 		            //Display a user friendly Error on the page using any of the following error information returned by PayPal
@@ -259,12 +256,10 @@ if (!empty($conf->paypal->enabled))
 		            $ErrorLongMsg = urldecode($resArray2["L_LONGMESSAGE0"]);
 		            $ErrorSeverityCode = urldecode($resArray2["L_SEVERITYCODE0"]);
 		        }
-		    }
-		    else {
+		    } else {
 		        dol_print_error('', 'Session expired');
 		    }
-		}
-		else {
+		} else {
 		    dol_print_error('', '$PAYPALTOKEN not defined');
 		}
 	}
@@ -415,8 +410,7 @@ if ($ispaymentok)
 						$errmsg = $object->error;
 						$postactionmessages[] = $errmsg;
 						$ispostactionok = -1;
-					}
-					else {
+					} else {
 						$postactionmessages[] = 'Subscription created';
 						$ispostactionok = 1;
 					}
@@ -437,8 +431,7 @@ if ($ispaymentok)
 						$postactionmessages[] = $object->error;
 						$postactionmessages = array_merge($postactionmessages, $object->errors);
 						$ispostactionok = -1;
-					}
-					else {
+					} else {
 						if ($option == 'bankviainvoice')
 						{
 							$postactionmessages[] = 'Invoice, payment and bank record created';
@@ -502,8 +495,7 @@ if ($ispaymentok)
 									$postactionmessages[] = $errmsg;
 									$ispostactionok = -1;
 								}
-							}
-							catch (Exception $e) {
+							} catch (Exception $e) {
 								$error++;
 								$errmsg = 'Failed to save customer stripe id in database ; '.$e->getMessage();
 								$postactionmessages[] = $errmsg;
@@ -516,8 +508,7 @@ if ($ispaymentok)
 				if (!$error)
 				{
 					$db->commit();
-				}
-				else {
+				} else {
 					$db->rollback();
 				}
 
@@ -582,8 +573,7 @@ if ($ispaymentok)
 							$errmsg = $object->error;
 							$postactionmessages[] = $errmsg;
 							$ispostactionok = -1;
-						}
-						else {
+						} else {
 							if ($file) $postactionmessages[] = 'Email sent to member (with invoice document attached)';
 							else $postactionmessages[] = 'Email sent to member (without any attached document)';
 
@@ -591,18 +581,15 @@ if ($ispaymentok)
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				$postactionmessages[] = 'Failed to get a valid value for "amount paid" or "payment type" to record the payment of subscription for member '.$tmptag['MEM'].'. May be payment was already recorded.';
 				$ispostactionok = -1;
 			}
-		}
-		else {
+		} else {
 			$postactionmessages[] = 'Member '.$tmptag['MEM'].' for subscription payed was not found';
 			$ispostactionok = -1;
 		}
-	}
-	elseif (array_key_exists('INV', $tmptag) && $tmptag['INV'] > 0)
+	} elseif (array_key_exists('INV', $tmptag) && $tmptag['INV'] > 0)
 	{
 		// Record payment
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -637,8 +624,7 @@ if ($ispaymentok)
 				if ($currencyCodeType == $conf->currency)
 				{
 					$paiement->amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching with invoice id
-				}
-				else {
+				} else {
 					$paiement->multicurrency_amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching
 
 					$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
@@ -660,8 +646,7 @@ if ($ispaymentok)
 						$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
 						$ispostactionok = -1;
 						$error++;
-					}
-					else {
+					} else {
 						$postactionmessages[] = 'Payment created';
 						$ispostactionok = 1;
 					}
@@ -684,13 +669,11 @@ if ($ispaymentok)
 							$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
 							$ispostactionok = -1;
 							$error++;
-						}
-						else {
+						} else {
 							$postactionmessages[] = 'Bank transaction of payment created';
 							$ispostactionok = 1;
 						}
-					}
-					else {
+					} else {
 						$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
 						$ispostactionok = -1;
 						$error++;
@@ -700,22 +683,18 @@ if ($ispaymentok)
 				if (!$error)
 				{
 					$db->commit();
-				}
-				else {
+				} else {
 					$db->rollback();
 				}
-			}
-			else {
+			} else {
 				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of invoice '.$tmptag['INV'].'. May be payment was already recorded.';
 				$ispostactionok = -1;
 			}
-		}
-		else {
+		} else {
 			$postactionmessages[] = 'Invoice payed '.$tmptag['INV'].' was not found';
 			$ispostactionok = -1;
 		}
-	}
-	else {
+	} else {
 		// Nothing done
 	}
 }
@@ -770,10 +749,8 @@ if ($ispaymentok)
 		    if (preg_match('/\d\.\d/', $appli))
 		    {
 		        if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-		    }
-		    else $appli .= " ".DOL_VERSION;
-		}
-		else $appli .= " ".DOL_VERSION;
+		    } else $appli .= " ".DOL_VERSION;
+		} else $appli .= " ".DOL_VERSION;
 
 		$urlback = $_SERVER["REQUEST_URI"];
 		$topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("NewOnlinePaymentReceived");
@@ -784,16 +761,14 @@ if ($ispaymentok)
 			$content .= '<strong>'.$companylangs->trans("PaymentSubscription")."</strong><br><br>\n";
 			$content .= $companylangs->trans("MemberId").': <strong>'.$tmptag['MEM']."</strong><br>\n";
 			$content .= $companylangs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
-		}
-		elseif (array_key_exists('INV', $tmptag))
+		} elseif (array_key_exists('INV', $tmptag))
 		{
 			$url = $urlwithroot."/compta/facture/card.php?id=".$tmptag['INV'];
 			$content .= '<strong>'.$companylangs->trans("Payment")."</strong><br><br>\n";
 			$content .= $companylangs->trans("InvoiceId").': <strong>'.$tmptag['INV']."</strong><br>\n";
 			//$content.=$companylangs->trans("ThirdPartyId").': '.$tmptag['CUS']."<br>\n";
 			$content .= $companylangs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
-		}
-		else {
+		} else {
 			$content .= $companylangs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
 		}
 		$content .= $companylangs->transnoentities("PostActionAfterPayment").' : ';
@@ -801,12 +776,10 @@ if ($ispaymentok)
 		{
 			//$topic.=' ('.$companylangs->transnoentitiesnoconv("Status").' '.$companylangs->transnoentitiesnoconv("OK").')';
 			$content .= '<font color="green">'.$companylangs->transnoentitiesnoconv("OK").'</font>';
-		}
-		elseif ($ispostactionok == 0)
+		} elseif ($ispostactionok == 0)
 		{
 			$content .= $companylangs->transnoentitiesnoconv("None");
-		}
-		else {
+		} else {
 			$topic .= ($ispostactionok ? '' : ' ('.$companylangs->trans("WarningPostActionErrorAfterPayment").')');
 			$content .= '<font color="red">'.$companylangs->transnoentitiesnoconv("Error").'</font>';
 		}
@@ -844,14 +817,12 @@ if ($ispaymentok)
 		{
 			dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
 			//dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0);
-		}
-		else {
+		} else {
 			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 			//dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0);
 		}
 	}
-}
-else {
+} else {
     // Get on url call
 	$onlinetoken = empty($PAYPALTOKEN) ? $_SESSION['onlinetoken'] : $PAYPALTOKEN;
     $payerID            = empty($PAYPALPAYERID) ? $_SESSION['payerID'] : $PAYPALPAYERID;
@@ -902,10 +873,8 @@ else {
             if (preg_match('/\d\.\d/', $appli))
             {
                 if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-            }
-            else $appli .= " ".DOL_VERSION;
-        }
-        else $appli .= " ".DOL_VERSION;
+            } else $appli .= " ".DOL_VERSION;
+        } else $appli .= " ".DOL_VERSION;
 
         $urlback = $_SERVER["REQUEST_URI"];
         $topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("ValidationOfPaymentFailed");
@@ -929,8 +898,7 @@ else {
         if ($result)
         {
             dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
-        }
-        else {
+        } else {
             dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
         }
     }
diff --git a/htdocs/public/stripe/confirm_payment.php b/htdocs/public/stripe/confirm_payment.php
index 9c6346842c8..683a537fe69 100644
--- a/htdocs/public/stripe/confirm_payment.php
+++ b/htdocs/public/stripe/confirm_payment.php
@@ -48,21 +48,18 @@ if (isset($_GET['connect']))
 		$endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_CONNECT_KEY;
 		$service = 'StripeTest';
 		$servicestatus = 0;
-	}
-	else {
+	} else {
 		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_CONNECT_KEY;
 		$service = 'StripeLive';
         $servicestatus = 1;
 	}
-}
-else {
+} else {
 	if (isset($_GET['test']))
 	{
 		$endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_KEY;
 		$service = 'StripeTest';
 		$servicestatus = 0;
-	}
-	else {
+	} else {
 		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_KEY;
 		$service = 'StripeLive';
 		$servicestatus = 1;
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index e3cc21b327b..d3a9521bf25 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -48,21 +48,18 @@ if (isset($_GET['connect']))
 		$endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_CONNECT_KEY;
 		$service = 'StripeTest';
 		$servicestatus = 0;
-	}
-	else {
+	} else {
 		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_CONNECT_KEY;
 		$service = 'StripeLive';
         $servicestatus = 1;
 	}
-}
-else {
+} else {
 	if (isset($_GET['test']))
 	{
 		$endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_KEY;
 		$service = 'StripeTest';
 		$servicestatus = 0;
-	}
-	else {
+	} else {
 		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_KEY;
 		$service = 'StripeLive';
 		$servicestatus = 1;
@@ -89,8 +86,7 @@ $error = 0;
 
 try {
 	$event = \Stripe\Webhook::constructEvent($payload, $sig_header, $endpoint_secret);
-}
-catch (\UnexpectedValueException $e) {
+} catch (\UnexpectedValueException $e) {
 	// Invalid payload
 	http_response_code(400); // PHP 5.4 or greater
 	exit();
@@ -123,12 +119,10 @@ if (!empty($conf->multicompany->enabled) && !empty($conf->stripeconnect->enabled
 		{
 			$obj = $db->fetch_object($result);
 			$key = $obj->entity;
-		}
-		else {
+		} else {
 			$key = 1;
 		}
-	}
-	else {
+	} else {
 		$key = 1;
 	}
 	$ret = $mc->switchEntity($key);
@@ -186,14 +180,12 @@ if ($event->type == 'payout.created') {
 
         http_response_code(200); // PHP 5.4 or greater
         return 1;
-	}
-	else {
+	} else {
 		$error++;
 		http_response_code(500); // PHP 5.4 or greater
 		return -1;
 	}
-}
-elseif ($event->type == 'payout.paid') {
+} elseif ($event->type == 'payout.paid') {
 	global $conf;
 	$error = 0;
 	$result = dolibarr_set_const($db, $service."_NEXTPAYOUT", null, 'chaine', 0, '', $conf->entity);
@@ -266,41 +258,32 @@ elseif ($event->type == 'payout.paid') {
 
 		http_response_code(200); // PHP 5.4 or greater
 		return 1;
-	}
-	else {
+	} else {
 		$error++;
 		http_response_code(500); // PHP 5.4 or greater
 		return -1;
 	}
-}
-elseif ($event->type == 'customer.source.created') {
+} elseif ($event->type == 'customer.source.created') {
 	//TODO: save customer's source
-}
-elseif ($event->type == 'customer.source.updated') {
+} elseif ($event->type == 'customer.source.updated') {
 	//TODO: update customer's source
-}
-elseif ($event->type == 'customer.source.delete') {
+} elseif ($event->type == 'customer.source.delete') {
 	//TODO: delete customer's source
-}
-elseif ($event->type == 'customer.deleted') {
+} elseif ($event->type == 'customer.deleted') {
     $db->begin();
     $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account WHERE key_account = '".$db->escape($event->data->object->id)."' and site='stripe'";
     $db->query($sql);
     $db->commit();
-}
-elseif ($event->type == 'payment_intent.succeeded') {		// Called when making payment with PaymentIntent method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).
+} elseif ($event->type == 'payment_intent.succeeded') {		// Called when making payment with PaymentIntent method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).
 	// TODO: create fees
 	// TODO: Redirect to paymentok.php
-}
-elseif ($event->type == 'payment_intent.payment_failed') {
+} elseif ($event->type == 'payment_intent.payment_failed') {
     // TODO: Redirect to paymentko.php
-}
-elseif ($event->type == 'checkout.session.completed')		// Called when making payment with new Checkout method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).
+} elseif ($event->type == 'checkout.session.completed')		// Called when making payment with new Checkout method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).
 {
 	// TODO: create fees
 	// TODO: Redirect to paymentok.php
-}
-elseif ($event->type == 'payment_method.attached') {
+} elseif ($event->type == 'payment_method.attached') {
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/companypaymentmode.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
 	$societeaccount = new SocieteAccount($db);
@@ -339,13 +322,11 @@ elseif ($event->type == 'payment_method.attached') {
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else {
+		} else {
 			$db->rollback();
 		}
 	}
-}
-elseif ($event->type == 'payment_method.updated') {
+} elseif ($event->type == 'payment_method.updated') {
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/companypaymentmode.class.php';
 	$companypaymentmode = new CompanyPaymentMode($db);
 	$companypaymentmode->fetch(0, '', 0, '', " AND stripe_card_ref = '".$db->escape($event->data->object->id)."'");
@@ -375,25 +356,20 @@ elseif ($event->type == 'payment_method.updated') {
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else {
+	} else {
 		$db->rollback();
 	}
-}
-elseif ($event->type == 'payment_method.detached') {
+} elseif ($event->type == 'payment_method.detached') {
 	$db->begin();
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_rib WHERE ref = '".$db->escape($event->data->object->id)."' and status = ".$servicestatus;
 	$db->query($sql);
 	$db->commit();
-}
-elseif ($event->type == 'charge.succeeded') {
+} elseif ($event->type == 'charge.succeeded') {
     // TODO: create fees
     // TODO: Redirect to paymentok.php
-}
-elseif ($event->type == 'charge.failed') {
+} elseif ($event->type == 'charge.failed') {
     // TODO: Redirect to paymentko.php
-}
-elseif (($event->type == 'source.chargeable') && ($event->data->object->type == 'three_d_secure') && ($event->data->object->three_d_secure->authenticated == true)) {
+} elseif (($event->type == 'source.chargeable') && ($event->data->object->type == 'three_d_secure') && ($event->data->object->three_d_secure->authenticated == true)) {
 	// This event is deprecated.
 }
 
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index cbe88b006d4..ffa4b24fc59 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -45,8 +45,7 @@ if (empty($usedolheader))
 
 
 	<?php
-}
-else {
+} else {
 	$arraycss = array();
 	$arrayjs = array();
 	/*
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 29ec7983930..131be53c756 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -370,8 +370,7 @@ if ($action != "infos_success") {
 		print $langs->trans("ErrorFieldRequired", $langs->transnoentities("TicketEmailNotificationFrom")).'<br>';
 		print $langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentities("Ticket"));
 		print '<div>';
-	}
-	else {
+	} else {
 		print '<div class="info marginleftonly marginrightonly">'.$langs->trans('TicketPublicInfoCreateTicket').'</div>';
 		$formticket->showForm();
 	}
diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index 51e120cdbd5..2b9ab94c5b1 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -187,8 +187,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		if ($action == "add_message")
 		{
 			$action = 'presend';
-		}
-		else {
+		} else {
 			$action = '';
 		}
 	}
@@ -371,8 +370,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		// Message list
 		print load_fiche_titre($langs->trans('TicketMessagesList'), '', 'object_conversation');
 		$object->viewTicketMessages(false, true, $object->dao);
-	}
-	else {
+	} else {
 		print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->dao->track_id.'">'.$langs->trans('Back').'</a></div>';
 	}
 } else {
diff --git a/htdocs/public/website/index.php b/htdocs/public/website/index.php
index 2f18de010a0..d09b8e10012 100644
--- a/htdocs/public/website/index.php
+++ b/htdocs/public/website/index.php
@@ -95,8 +95,7 @@ if (empty($pageid))
 		if ($result > 0)
 		{
 			$pageid = $objectpage->id;
-		}
-		elseif ($result == 0)
+		} elseif ($result == 0)
 		{
 			// Page not found from ref=pageurl, we try using alternative alias
 			$result = $objectpage->fetch(0, $object->id, null, $pageref);
@@ -105,8 +104,7 @@ if (empty($pageid))
 				$pageid = $objectpage->id;
 			}
 		}
-	}
-	else {
+	} else {
 		if ($object->fk_default_home > 0)
 		{
 			$result = $objectpage->fetch($object->fk_default_home);
@@ -163,8 +161,7 @@ if ($pageid == 'css')   // No more used ?
 	//else
 	header('Cache-Control: no-cache');
 	$original_file = $dolibarr_main_data_root.'/website/'.$websitekey.'/styles.css.php';
-}
-else {
+} else {
 	$original_file = $dolibarr_main_data_root.'/website/'.$websitekey.'/page'.$pageid.'.tpl.php';
 }
 
diff --git a/htdocs/public/website/styles.css.php b/htdocs/public/website/styles.css.php
index 24125178f5d..8854c13ea52 100644
--- a/htdocs/public/website/styles.css.php
+++ b/htdocs/public/website/styles.css.php
@@ -77,8 +77,7 @@ if (empty($pageid))
     {
         $object->fetch($websiteid);
         $website = $object->ref;
-    }
-    else {
+    } else {
         $object->fetch(0, $website);
     }
 
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 2ada4b1c447..7bc99977943 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -79,7 +79,7 @@ else {
 	$result = restrictedArea($user, 'reception');
 	if ($origin == 'supplierorder') {
 		if (empty($user->rights->fournisseur->commande->lire) && empty($user->rights->fournisseur->commande->read)) accessforbidden();
-	}elseif (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) accessforbidden();
+	} elseif (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) accessforbidden();
 }
 
 $action		= GETPOST('action', 'alpha');
@@ -352,8 +352,7 @@ if (empty($reshook))
 	                $error++;
 	            }
 	        }
-	    }
-	    else {
+	    } else {
 	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("QtyToReceive").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 	        $error++;
 	    }
@@ -363,15 +362,12 @@ if (empty($reshook))
 	        $db->commit();
 	        header("Location: card.php?id=".$object->id);
 	        exit;
-	    }
-	    else {
+	    } else {
 	        $db->rollback();
 	        $_GET["commande_id"] = GETPOST('commande_id', 'int');
 	        $action = 'create';
 	    }
-	}
-
-	elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
+	} elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
         ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
        	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate)))
 	)
@@ -384,8 +380,7 @@ if (empty($reshook))
 	    {
 			$langs->load("errors");
 	        setEventMessages($langs->trans($object->error), null, 'errors');
-	    }
-	    else {
+	    } else {
 	    	// Define output language
 	    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 	    	{
@@ -404,17 +399,14 @@ if (empty($reshook))
 	    		if ($result < 0) dol_print_error($db, $result);
 	    	}
 	    }
-	}
-
-	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->reception->supprimer)
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->reception->supprimer)
 	{
 	    $result = $object->delete($user);
 	    if ($result > 0)
 	    {
 	        header("Location: ".DOL_URL_ROOT.'/reception/index.php');
 	        exit;
-	    }
-	    else {
+	    } else {
 			setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
@@ -512,9 +504,7 @@ if (empty($reshook))
 		$ret = dol_delete_file($file, 0, 0, 0, $object);
 		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
 		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
-	}
-
-	elseif ($action == 'classifybilled')
+	} elseif ($action == 'classifybilled')
 	{
 	    $object->fetch($id);
 	    $result = $object->set_billed();
@@ -522,9 +512,7 @@ if (empty($reshook))
 	    	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	    	exit();
 	    }
-	}
-
-	elseif ($action == 'classifyclosed')
+	} elseif ($action == 'classifyclosed')
 	{
 	    $object->fetch($id);
 	    $result = $object->setClosed();
@@ -561,8 +549,7 @@ if (empty($reshook))
 		if (!$error) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
-		}
-		else {
+		} else {
 			setEventMessages($line->error, $line->errors, 'errors');
 		}
 	}
@@ -624,8 +611,7 @@ if (empty($reshook))
 						setEventMessages($line->error, $line->errors, 'errors');
 						$error++;
 					}
-				}
-				else // Product no predefined
+				} else // Product no predefined
 				{
 					$qty = "qtyl".$line_id;
 					$line->id = $line_id;
@@ -660,8 +646,7 @@ if (empty($reshook))
 				$ret = $object->fetch($object->id); // Reload to get new records
 				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
-		}
-		else {
+		} else {
 			header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 			exit();
 		}
@@ -1041,8 +1026,7 @@ if ($action == 'create')
                     }
 
                     print '</td>';
-                }
-                else {
+                } else {
 				    print "<td>";
                     if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
                     else $text = img_object($langs->trans('Product'), 'product');
@@ -1080,8 +1064,7 @@ if ($action == 'create')
 				if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES))
 				{
 					$quantityToBeDelivered = 0;
-				}
-				else {
+				} else {
 					$quantityToBeDelivered = $dispatchLines[$indiceAsked]['qty'];
 				}
                 $warehouse_id = $dispatchLines[$indiceAsked]['ent'];
@@ -1102,8 +1085,7 @@ if ($action == 'create')
                         if (GETPOST('qtyl'.$indiceAsked, 'int')) $defaultqty = GETPOST('qtyl'.$indiceAsked, 'int');
                         print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 						print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
-					}
-					else print $langs->trans("NA");
+					} else print $langs->trans("NA");
 					print '</td>';
 
 					// Stock
@@ -1121,8 +1103,7 @@ if ($action == 'create')
 								print '<!-- Show warehouse selection -->';
 								print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 0, 0, $line->fk_product, '', 1);
 							}
-						}
-						else {
+						} else {
 							print $langs->trans("Service");
 						}
 						print '</td>';
@@ -1139,8 +1120,7 @@ if ($action == 'create')
 							print '<td>';
 							print $form->selectDate($dispatchLines[$indiceAsked]['DLUO'], 'dluo'.$indiceAsked, '', '', 1, "");
 							print '</td>';
-						}
-						else {
+						} else {
 							print '<td colspan="3"></td>';
 						}
 					}
@@ -1184,13 +1164,11 @@ if ($action == 'create')
             print '</form>';
 
             print '<br>';
-        }
-        else {
+        } else {
             dol_print_error($db);
         }
     }
-}
-elseif ($id || $ref)
+} elseif ($id || $ref)
 /* *************************************************************************** */
 /*                                                                             */
 /* Edit and view mode                                                          */
@@ -1235,8 +1213,7 @@ elseif ($id || $ref)
 			if ($objectref == 'PROV')
 			{
 				$numref = $object->getNextNumRef($soc);
-			}
-			else {
+			} else {
 				$numref = $object->ref;
 			}
 
@@ -1400,8 +1377,7 @@ elseif ($id || $ref)
 			print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
-		}
-		else {
+		} else {
 			print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
 		}
 		print '</td>';
@@ -1423,8 +1399,7 @@ elseif ($id || $ref)
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
-		}
-		else {
+		} else {
 			print $object->trueWeight;
 			print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
 		}
@@ -1457,8 +1432,7 @@ elseif ($id || $ref)
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
-		}
-		else {
+		} else {
 			print $object->trueHeight;
 			print ($object->trueHeight && $object->height_units != '') ? ' '.measuringUnitString(0, "size", $object->height_units) : '';
 		}
@@ -1489,8 +1463,7 @@ elseif ($id || $ref)
 			if ($volumeUnit < 50)
 			{
 			    print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
-			}
-			else print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
+			} else print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
 		}
 		if ($totalVolume > 0)
 		{
@@ -1535,8 +1508,7 @@ elseif ($id || $ref)
 			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
-		}
-		else {
+		} else {
 			if ($object->shipping_method_id > 0)
 			{
 				// Get code using getLabelFromKey
@@ -1568,8 +1540,7 @@ elseif ($id || $ref)
 			if ($action != 'editincoterm')
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-			}
-			else {
+			} else {
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 			}
 	        print '</td></tr>';
@@ -1622,8 +1593,7 @@ elseif ($id || $ref)
 			if ($object->statut <= 1)
 			{
 				print $langs->trans("QtyToReceive").' - ';
-			}
-			else {
+			} else {
 				print $langs->trans("QtyReceived").' - ';
 			}
 			if (!empty($conf->stock->enabled))
@@ -1635,13 +1605,11 @@ elseif ($id || $ref)
 				print $langs->trans("Batch");
 			}
 			print '</td>';
-		}
-		else {
+		} else {
 			if ($object->statut <= 1)
 			{
 				print '<td class="center">'.$langs->trans("QtyToReceive").'</td>';
-			}
-			else {
+			} else {
 				print '<td class="center">'.$langs->trans("QtyReceived").'</td>';
 			}
 			if (!empty($conf->stock->enabled))
@@ -1748,8 +1716,7 @@ elseif ($id || $ref)
 					$prod = new Product($db);
 					$prod->fetch($lines[$i]->fk_product);
 					$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product->label;
-				}
-				else $label = (!empty($lines[$i]->product->label) ? $lines[$i]->product->label : $lines[$i]->product->product_label);
+				} else $label = (!empty($lines[$i]->product->label) ? $lines[$i]->product->label : $lines[$i]->product->product_label);
 
 				print '<td>';
 
@@ -1763,8 +1730,7 @@ elseif ($id || $ref)
 					print (!empty($lines[$i]->product->description) && $lines[$i]->description != $lines[$i]->product->description) ? '<br>'.dol_htmlentitiesbr($lines[$i]->description) : '';
 				}
 				print "</td>\n";
-			}
-			else {
+			} else {
 				print "<td>";
 				if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'), 'service');
 				else $text = img_object($langs->trans('Product'), 'product');
@@ -1783,8 +1749,7 @@ elseif ($id || $ref)
 			if ($action == 'editline' && $lines[$i]->id == $line_id)
 			{
 				print '<td ><textarea name="comment'.$line_id.'" id="comment'.$line_id.'" /> '.$lines[$i]->comment.'</textarea></td>';
-			}
-			else {
+			} else {
 				print '<td style="white-space: pre-wrap;max-width: 200px;" >'.$lines[$i]->comment.'</td>';
 			}
 
@@ -1849,8 +1814,7 @@ elseif ($id || $ref)
 							print '</td>';
 						}
 						print '</tr>';
-					}
-					else {
+					} else {
 						print '<!-- case edit 2 -->';
 						print '<tr>';
 						// Qty to receive or received
@@ -1863,8 +1827,7 @@ elseif ($id || $ref)
 					}
 				}
 				print '</table></td>';
-			}
-			else {
+			} else {
 				// Qty to receive or received
 				print '<td class="center">'.$lines[$i]->qty.'</td>';
 
@@ -1900,8 +1863,7 @@ elseif ($id || $ref)
 								$detail .= '<br>';
 
 							print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $detail);
-						}
-						else {
+						} else {
 							print $langs->trans("NA");
 						}
 						print '</td>';
@@ -1929,8 +1891,7 @@ elseif ($id || $ref)
 				print '<td class="center" colspan="2" valign="middle">';
 				print '<input type="submit" class="button" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'"><br>';
 				print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>';
-			}
-			elseif ($object->statut == Reception::STATUS_DRAFT)
+			} elseif ($object->statut == Reception::STATUS_DRAFT)
 			{
 				// edit-delete buttons
 				print '<td class="linecoledit center">';
@@ -1961,8 +1922,7 @@ elseif ($id || $ref)
 				if ($action == 'editline' && $lines[$i]->id == $line_id)
 				{
 					print $line->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), $indiceAsked);
-				}
-				else {
+				} else {
 					print $line->showOptionals($extrafields, 'view', array('colspan'=>$colspan), $indiceAsked);
 				}
 			}
@@ -1999,8 +1959,7 @@ elseif ($id || $ref)
 	  		     || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate)))
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
-				}
-				else {
+				} else {
 					print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
 				}
 			}
@@ -2016,8 +1975,7 @@ elseif ($id || $ref)
 				if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ClassifyUnbilled").'</a>';
-				}
-				else {
+				} else {
 			    	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
 				}
 			}
@@ -2029,8 +1987,7 @@ elseif ($id || $ref)
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->reception->reception_advance->send)
 					{
 						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a>';
-					}
-					else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
+					} else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
 				}
 			}
 
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 111846347be..f4cbb08ee9e 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -178,13 +178,11 @@ class Reception extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else {
+			} else {
 				dol_print_error($this->db, get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-        }
-	    else {
+        } else {
 		    print $langs->trans("Error")." ".$langs->trans("Error_RECEPTION_ADDON_NUMBER_NotDefined");
 		    return "";
 	    }
@@ -322,8 +320,7 @@ class Reception extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else {
+				} else {
 					foreach ($this->errors as $errmsg)
 					{
 						dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
@@ -332,15 +329,13 @@ class Reception extends CommonObject
 					$this->db->rollback();
 					return -1 * $error;
 				}
-			}
-			else {
+			} else {
 				$error++;
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$error++;
 			$this->error = $this->db->error()." - sql=$sql";
 			$this->db->rollback();
@@ -467,14 +462,12 @@ class Reception extends CommonObject
 				}
 
 				return 1;
-			}
-			else {
+			} else {
 				dol_syslog(get_class($this).'::Fetch no reception found', LOG_ERR);
 				$this->error = 'Delivery with id '.$id.' not found';
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -523,8 +516,7 @@ class Reception extends CommonObject
 		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$numref = $this->getNextNumRef($soc);
-		}
-		else {
+		} else {
 			$numref = $this->ref;
 		}
 
@@ -594,8 +586,7 @@ class Reception extends CommonObject
 							$this->errors = array_merge($this->errors, $mouvS->errors);
 							break;
 						}
-					}
-					else {
+					} else {
 						// line with batch detail
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
@@ -609,8 +600,7 @@ class Reception extends CommonObject
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -2;
@@ -684,8 +674,7 @@ class Reception extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::valid ".$errmsg, LOG_ERR);
@@ -856,8 +845,7 @@ class Reception extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -910,8 +898,7 @@ class Reception extends CommonObject
 
 					$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ReceptionDeletedInDolibarr", $this->ref), '', $obj->eatby, $obj->sellby, $obj->batch); // Price is set to 0, because we don't want to see WAP changed
 				}
-			}
-			else {
+			} else {
 				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
@@ -987,31 +974,26 @@ class Reception extends CommonObject
 							}
 
 							return 1;
-						}
-						else {
+						} else {
 							$this->db->rollback();
 							return -1;
 						}
-					}
-					else {
+					} else {
 						$this->error = $this->db->lasterror()." - sql=$sql";
 						$this->db->rollback();
 						return -3;
 					}
-				}
-				else {
+				} else {
 					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -2;
 				}
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1069,8 +1051,7 @@ class Reception extends CommonObject
 			}
 
 			return 1;
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -1256,13 +1237,11 @@ class Reception extends CommonObject
 			{
 				$this->date_delivery = $date_livraison;
 				return 1;
-			}
-			else {
+			} else {
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			return -2;
 		}
 	}
@@ -1345,8 +1324,7 @@ class Reception extends CommonObject
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
             $sql .= " VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
             $resql = $this->db->query($sql);
-        }
-        else {
+        } else {
             $sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
             $sql .= " code='".$this->db->escape($this->update['code'])."'";
             $sql .= ",libelle='".$this->db->escape($this->update['libelle'])."'";
@@ -1421,8 +1399,7 @@ class Reception extends CommonObject
 		{
 			$url = str_replace('{TRACKID}', $value, $tracking);
 			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value ? $value : 'url').'</a>', $url, $url);
-		}
-		else {
+		} else {
 			$this->tracking_url = $value;
 		}
 	}
@@ -1523,8 +1500,7 @@ class Reception extends CommonObject
 							    $this->errors = $mouvS->errors;
 								$error++; break;
 							}
-						}
-						else {
+						} else {
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -1537,8 +1513,7 @@ class Reception extends CommonObject
 							}
 						}
 					}
-				}
-				else {
+				} else {
 					$this->error = $this->db->lasterror();
 					$error++;
 				}
@@ -1552,8 +1527,7 @@ class Reception extends CommonObject
     			    $error++;
     			}
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
             $error++;
 		}
@@ -1562,8 +1536,7 @@ class Reception extends CommonObject
 		{
 		    $this->db->commit();
 		    return 1;
-		}
-		else {
+		} else {
 		    $this->db->rollback();
 		    return -1;
 		}
@@ -1607,8 +1580,7 @@ class Reception extends CommonObject
 		if (empty($error)) {
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1683,8 +1655,7 @@ class Reception extends CommonObject
 							    $this->errors = $mouvS->errors;
 								$error++; break;
 							}
-						}
-						else {
+						} else {
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -1696,8 +1667,7 @@ class Reception extends CommonObject
 							}
 						}
 					}
-				}
-				else {
+				} else {
 					$this->error = $this->db->lasterror();
 					$error++;
 				}
@@ -1726,8 +1696,7 @@ class Reception extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1816,8 +1785,7 @@ class Reception extends CommonObject
 								$error++;
 								break;
 							}
-						}
-						else {
+						} else {
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -1829,8 +1797,7 @@ class Reception extends CommonObject
 							}
 						}
 					}
-				}
-				else {
+				} else {
 					$this->error = $this->db->lasterror();
 					$error++;
 				}
@@ -1880,8 +1847,7 @@ class Reception extends CommonObject
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index b5e526bb1b3..4e8605ac74a 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -90,8 +90,7 @@ if ($action == 'addcontact' && $user->rights->reception->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
@@ -119,8 +118,7 @@ elseif ($action == 'deletecontact' && $user->rights->reception->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/reception/index.php b/htdocs/reception/index.php
index b9786229468..e3951458e40 100644
--- a/htdocs/reception/index.php
+++ b/htdocs/reception/index.php
@@ -120,8 +120,7 @@ if ($resql)
 			print '</td></tr>';
 			$i++;
 		}
-	}
-	else {
+	} else {
 		print '<tr><td><span class="opacitymedium">'.$langs->trans("None").'</span></td><td></td><td></td></tr>';
 	}
 
@@ -182,16 +181,14 @@ if ($resql)
 				$orderstatic->id = $obj->commande_fournisseur_id;
 				$orderstatic->ref = $obj->commande_fournisseur_ref;
 				print $orderstatic->getNomUrl(1);
-			}
-			else print '&nbsp;';
+			} else print '&nbsp;';
 			print '</td></tr>';
 			$i++;
 		}
 		print "</table></div><br>";
 	}
 	$db->free($resql);
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index c753cf3e873..93aba12eb00 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -192,8 +192,7 @@ if (empty($reshook))
 							$object->add_object_linked('reception', $value); // add supplier order linked object
 					}
 				}
-			}
-    		else {
+			} else {
     			$object->socid = $rcp->socid;
     			$object->type = FactureFournisseur::TYPE_STANDARD;
     			$object->cond_reglement_id	= $rcp->thirdparty->cond_reglement_supplier_id;
@@ -278,14 +277,12 @@ if (empty($reshook))
 	    					{
 	    						$result = $object->insert_discount($discountid);
 	    						//$result=$discount->link_to_invoice($lineid,$id);
-	    					}
-	    					else {
+	    					} else {
 	    						setEventMessages($discount->error, $discount->errors, 'errors');
 	    						$error++;
 	    						break;
 	    					}
-	    				}
-	    				else {
+	    				} else {
 	    					// Positive line
 	    					$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 	    					// Date start
@@ -332,8 +329,7 @@ if (empty($reshook))
 	    					if ($result > 0)
 	    					{
 	    						$lineid = $result;
-	    					}
-	    					else {
+	    					} else {
 	    						$lineid = 0;
 	    						$error++;
 	    						break;
@@ -387,8 +383,7 @@ if (empty($reshook))
     	{
     		$db->commit();
     		setEventMessage($langs->trans('BillCreated', $nb_bills_created));
-    	}
-    	else {
+    	} else {
     		$db->rollback();
     		$action = 'create';
     		$_GET["origin"] = $_POST["origin"];
@@ -580,8 +575,7 @@ if ($resql)
 		{
 		    print $form->selectyesno('validate_invoices', 0, 1, 1);
 		    print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
-		}
-		else {
+		} else {
             print $form->selectyesno('validate_invoices', 0, 1);
 		}
 		print '</td>';
@@ -931,8 +925,7 @@ if ($resql)
 	print "</div>";
 	print '</form>';
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/reception/stats/index.php b/htdocs/reception/stats/index.php
index 4a0bcb4fd04..5079671dafd 100644
--- a/htdocs/reception/stats/index.php
+++ b/htdocs/reception/stats/index.php
@@ -77,8 +77,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenamenb = $dir.'/receptionsnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else {
+} else {
     $filenamenb = $dir.'/receptionsnbinyear-'.$year.'.png';
 }
 
@@ -289,8 +288,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr valign="top"><td class="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     /*print $px2->show();
diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php
index fa99e4610d5..72d055da41d 100644
--- a/htdocs/resource/agenda.php
+++ b/htdocs/resource/agenda.php
@@ -48,8 +48,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else {
+} else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index 9f2a044525d..8d965c69c2c 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -99,8 +99,7 @@ if (empty($reshook))
 			{
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
 				$action = 'create';
-			}
-			else {
+			} else {
 				$object->ref                    = $ref;
 				$object->description            = $description;
 				$object->fk_code_type_resource  = $fk_code_type_resource;
@@ -117,15 +116,13 @@ if (empty($reshook))
 					setEventMessages($langs->trans('ResourceCreatedWithSuccess'), null, 'mesgs');
 					Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
-				}
-				else {
+				} else {
 					// Creation KO
 					setEventMessages($object->error, $object->errors, 'errors');
 					$action = 'create';
 				}
 			}
-		}
-		else {
+		} else {
 			Header("Location: list.php");
 			exit;
 		}
@@ -162,13 +159,11 @@ if (empty($reshook))
 				{
 					Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
-				}
-				else {
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 				}
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
@@ -192,12 +187,10 @@ if (empty($reshook))
 				setEventMessages($langs->trans('RessourceSuccessfullyDeleted'), null, 'mesgs');
 				Header('Location: '.DOL_URL_ROOT.'/resource/list.php');
 				exit;
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -220,8 +213,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 	{
 		print load_fiche_titre($title, '', 'object_resource');
 		dol_fiche_head('');
-	}
-	else {
+	} else {
 		$head = resource_prepare_head($object);
 		dol_fiche_head($head, 'resource', $title, -1, 'resource');
 	}
@@ -283,8 +275,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 		print '</div>';
 
 		print '</form>';
-	}
-	else {
+	} else {
 		$formconfirm = '';
 
 		// Confirm deleting resource line
@@ -384,8 +375,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 		}
 	}
 	print '</div>';
-}
-else {
+} else {
 	dol_print_error();
 }
 
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 41c0db7ec15..294f36e5589 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -164,8 +164,7 @@ class Dolresource extends CommonObject
     		}
     		$this->db->rollback();
     		return -1 * $error;
-    	}
-    	else {
+    	} else {
     		$this->db->commit();
     		return $this->id;
     	}
@@ -222,8 +221,7 @@ class Dolresource extends CommonObject
     		$this->db->free($resql);
 
     		return $this->id;
-    	}
-    	else {
+    	} else {
     		$this->error = "Error ".$this->db->lasterror();
     		dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
     		return -1;
@@ -327,8 +325,7 @@ class Dolresource extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -385,8 +382,7 @@ class Dolresource extends CommonObject
     		$this->db->free($resql);
 
     		return $this->id;
-    	}
-    	else {
+    	} else {
     		$this->error = "Error ".$this->db->lasterror();
     		return -1;
     	}
@@ -423,8 +419,7 @@ class Dolresource extends CommonObject
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$error++;
 		}
@@ -470,8 +465,7 @@ class Dolresource extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -516,11 +510,9 @@ class Dolresource extends CommonObject
     		foreach ($filter as $key => $value) {
     			if (strpos($key, 'date')) {
     				$sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
-    			}
-    			elseif (strpos($key, 'ef.') !== false) {
+    			} elseif (strpos($key, 'ef.') !== false) {
     				$sql .= $value;
-    			}
-    			else {
+    			} else {
     				$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
     			}
     		}
@@ -561,8 +553,7 @@ class Dolresource extends CommonObject
     			$this->db->free($resql);
     		}
     		return $num;
-    	}
-    	else {
+    	} else {
     		$this->error = $this->db->lasterror();
     		return -1;
     	}
@@ -601,8 +592,7 @@ class Dolresource extends CommonObject
    			foreach ($filter as $key => $value) {
    				if (strpos($key, 'date')) {
    					$sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
-   				}
-   				else {
+   				} else {
    					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
    				}
    			}
@@ -638,8 +628,7 @@ class Dolresource extends CommonObject
    				$this->db->free($resql);
    			}
    			return $num;
-   		}
-   		else {
+   		} else {
    			$this->error = $this->db->lasterror();
    			return -1;
    		}
@@ -682,8 +671,7 @@ class Dolresource extends CommonObject
     		foreach ($filter as $key => $value) {
     			if (strpos($key, 'date')) {
     				$sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
-    			}
-    			else {
+    			} else {
     				$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
     			}
     		}
@@ -716,8 +704,7 @@ class Dolresource extends CommonObject
     			$this->db->free($resql);
     		}
     		return $num;
-    	}
-    	else {
+    	} else {
     		$this->error = $this->db->lasterror();
     		return -1;
     	}
@@ -807,8 +794,7 @@ class Dolresource extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -914,8 +900,7 @@ class Dolresource extends CommonObject
     			$i++;
     		}
     		return $num;
-    	}
-    	else {
+    	} else {
     		dol_print_error($this->db);
     		return -1;
     	}
@@ -967,8 +952,7 @@ class Dolresource extends CommonObject
         	}
         	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
         	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $linkstart = '<a href="'.$url.$get_params.'"';
         $linkstart .= $linkclose.'>';
diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php
index 3eeebeaee45..451ca9922b1 100644
--- a/htdocs/resource/class/html.formresource.class.php
+++ b/htdocs/resource/class/html.formresource.class.php
@@ -126,8 +126,7 @@ class FormResource
     				if ($selected > 0 && $selected == $resourcestat->lines[$i]->id)
     				{
     					$out .= '<option value="'.$resourcestat->lines[$i]->id.'" selected>'.$label.'</option>';
-    				}
-    				else {
+    				} else {
     					$out .= '<option value="'.$resourcestat->lines[$i]->id.'">'.$label.'</option>';
     				}
 
@@ -145,8 +144,7 @@ class FormResource
 
         		$out .= '</form>';
     		}
-    	}
-    	else {
+    	} else {
     		dol_print_error($this->db);
     	}
 
diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php
index dc916aa5f77..ee20d918648 100644
--- a/htdocs/resource/contact.php
+++ b/htdocs/resource/contact.php
@@ -62,8 +62,7 @@ if ($action == 'addcontact' && $user->rights->resource->write)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			$mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
@@ -90,8 +89,7 @@ elseif ($action == 'deletecontact' && $user->rights->resource->write)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index 0e6b20923b5..077430cf4bb 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -136,8 +136,7 @@ if ($object->id > 0)
     $permission = $user->rights->resource->write;
 
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index 8e353b59788..dd3a02e18e3 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -97,8 +97,7 @@ if (empty($reshook))
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Resource")), null, 'errors');
 			$action = '';
-		}
-		else {
+		} else {
 			$objstat = fetchObjectByElement($element_id, $element, $element_ref);
 			$objstat->element = $element; // For externals module, we need to keep @xx
 
@@ -168,8 +167,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans('ResourceLinkedWithSuccess'), null, 'mesgs');
 			header("Location: ".$_SERVER['PHP_SELF'].'?element='.$element.'&element_id='.$objstat->id);
 			exit;
-		}
-		elseif ($objstat)
+		} elseif ($objstat)
 		{
 			setEventMessages($objstat->error, $objstat->errors, 'errors');
 		}
@@ -264,8 +262,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans('RessourceLineSuccessfullyDeleted'), null, 'mesgs');
 			header("Location: ".$_SERVER['PHP_SELF']."?element=".$element."&element_id=".$element_id);
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -295,8 +292,7 @@ if ($ret == -1) {
 }
 if (!$ret) {
     print '<div class="warning">'.$langs->trans('NoResourceInDatabase').'</div>';
-}
-else {
+} else {
 	// Confirmation suppression resource line
 	if ($action == 'delete_resource')
 	{
@@ -408,8 +404,7 @@ else {
 					}
 				}
 				$_SESSION['assignedtouser'] = json_encode($listofuserid);
-			}
-			else {
+			} else {
 				if (!empty($_SESSION['assignedtouser']))
 				{
 					$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -596,8 +591,7 @@ else {
 				if (file_exists(dol_buildpath($reldir.'/resource_'.$element_prop['element'].'_add.tpl.php')))
 				{
 					$tpl = dol_buildpath($reldir.'/resource_'.$element_prop['element'].'_add.tpl.php');
-				}
-				else {
+				} else {
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/resource_add.tpl.php';
 				}
 				if (empty($conf->file->strict_mode)) {
@@ -615,8 +609,7 @@ else {
 					if (file_exists(dol_buildpath($reldir.'/resource_'.$element_prop['element'].'_view.tpl.php')))
 					{
 						$tpl = dol_buildpath($reldir.'/resource_'.$element_prop['element'].'_view.tpl.php');
-					}
-					else {
+					} else {
 						$tpl = DOL_DOCUMENT_ROOT.$reldir.'/resource_view.tpl.php';
 					}
 					if (empty($conf->file->strict_mode)) {
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 4f94c6c3e17..4dca64b47a6 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -281,8 +281,7 @@ if ($ret)
 
         print '</tr>';
     }
-}
-else {
+} else {
     $colspan = 1;
     foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
     print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
diff --git a/htdocs/salaries/admin/salaries.php b/htdocs/salaries/admin/salaries.php
index b1f1f627a99..a824a7d8eee 100644
--- a/htdocs/salaries/admin/salaries.php
+++ b/htdocs/salaries/admin/salaries.php
@@ -62,8 +62,7 @@ if ($action == 'update')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -113,8 +112,7 @@ foreach ($list as $key)
 	if (!empty($conf->accounting->enabled))
 	{
 		print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
-	}
-	else {
+	} else {
 		print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
 	}
 	print '</td></tr>';
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index d7b71edbf0b..94add08291c 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -158,8 +158,7 @@ if ($action == 'add' && empty($cancel))
 				header("Location: list.php");
 				exit;
 			}
-		}
-		else {
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = "create";
@@ -192,19 +191,16 @@ if ($action == 'delete')
 				$db->commit();
 				header("Location: ".DOL_URL_ROOT.'/salaries/list.php');
 				exit;
-			}
-			else {
+			} else {
 				$object->error = $accountline->error;
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else {
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	else {
+	} else {
 		setEventMessages('Error try do delete a line linked to a conciliated bank transaction', null, 'errors');
 	}
 }
@@ -489,12 +485,10 @@ if ($id)
 		if (!empty($user->rights->salaries->delete))
 		{
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a></div>';
-		}
-		else {
+		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("NotAllowed"))).'">'.$langs->trans("Delete").'</a></div>';
 		}
-	}
-	else {
+	} else {
 		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("LinkedToAConciliatedTransaction").'">'.$langs->trans("Delete").'</a></div>';
 	}
 	print "</div>";
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 9fddd59ce51..34b58a5c0e4 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -182,8 +182,7 @@ class PaymentSalary extends CommonObject
         {
             $this->db->commit();
             return 1;
-        }
-        else {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -262,8 +261,7 @@ class PaymentSalary extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else {
+        } else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -478,8 +476,7 @@ class PaymentSalary extends CommonObject
                     if ($bank_line_id > 0)
                     {
                         $this->update_fk_bank($bank_line_id);
-                    }
-                    else {
+                    } else {
                         $this->error = $acc->error;
                         $error++;
                     }
@@ -521,20 +518,17 @@ class PaymentSalary extends CommonObject
                 $result = $this->call_trigger('PAYMENT_SALARY_CREATE', $user);
                 if ($result < 0) $error++;
                 // End call triggers
-            }
-            else $error++;
+            } else $error++;
 
             if (!$error)
             {
                 $this->db->commit();
                 return $this->id;
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
@@ -557,8 +551,7 @@ class PaymentSalary extends CommonObject
         if ($result)
         {
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -616,8 +609,7 @@ class PaymentSalary extends CommonObject
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $linkstart = '<a href="'.$url.'"';
         $linkstart .= $linkclose.'>';
@@ -669,8 +661,7 @@ class PaymentSalary extends CommonObject
                 $this->date_creation     = $this->db->jdate($obj->datec);
             }
             $this->db->free($result);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index 0e6a1bccba0..69680df6a2a 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -128,8 +128,7 @@ if ($object->id)
 	$permission = $user->rights->salaries->write;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index b06ad2348e4..6c4ee37a979 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -67,8 +67,7 @@ if (!GETPOST('typeid', 'int'))
 		$part = explode(':', $val);
 		if ($part[0] == 's.fk_typepayment') $typeid = $part[1];
 	}
-}
-else {
+} else {
 	$typeid = GETPOST('typeid', 'int');
 }
 
@@ -287,8 +286,7 @@ if ($result)
 				}
 	            $accountstatic->label = $obj->blabel;
 	        	print $accountstatic->getNomUrl(1);
-	        }
-	        else print '&nbsp;';
+	        } else print '&nbsp;';
 	        print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 	    }
@@ -316,8 +314,7 @@ if ($result)
 	print '</form>';
 
     $db->free($result);
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/salaries/stats/index.php b/htdocs/salaries/stats/index.php
index b0023de8b64..06beda8ce41 100644
--- a/htdocs/salaries/stats/index.php
+++ b/htdocs/salaries/stats/index.php
@@ -256,8 +256,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td align="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
 	print $px1->show();
 	print "<br>\n";
 	print $px2->show();
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 307b903787e..21ee679292a 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -53,8 +53,7 @@ if ($action == 'setcodeclient')
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -65,8 +64,7 @@ if ($action == 'setcodecompta')
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -81,8 +79,7 @@ if ($action == 'updateoptions')
 		if (!$error)
 	    {
 		    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	    }
-	    else {
+	    } else {
 		    setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
@@ -95,8 +92,7 @@ if ($action == 'updateoptions')
 		if (!$error)
 		{
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
@@ -109,8 +105,7 @@ if ($action == 'updateoptions')
 		if (!$error)
 		{
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
@@ -172,8 +167,7 @@ if ($action == 'setdoc')
 	if ($result1 && $result2)
 	{
 		$db->commit();
-	}
-	else {
+	} else {
 	    $db->rollback();
 	}
 }
@@ -186,8 +180,7 @@ if ($action == "setaddrefinlist") {
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -200,8 +193,7 @@ if ($action == "setaddadressinlist") {
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -214,8 +206,7 @@ if ($action == "setaskforshippingmet") {
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -228,8 +219,7 @@ if ($action == "setdisableprospectcustomer") {
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -244,8 +234,7 @@ if ($action == 'setprofid')
 	{
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -260,8 +249,7 @@ if ($action == 'setprofidmandatory')
 	{
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -276,8 +264,7 @@ if ($action == 'setprofidinvoicemandatory')
 	{
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -291,8 +278,7 @@ if ($action == 'sethideinactivethirdparty')
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -303,8 +289,7 @@ if ($action == 'setonsearchandlistgooncustomerorsuppliercard') {
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -363,8 +348,7 @@ foreach ($dirsociete as $dirroot)
 
     			try {
         			dol_include_once($dirroot.$file.'.php');
-    			}
-    			catch (Exception $e)
+    			} catch (Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
@@ -396,8 +380,7 @@ foreach ($arrayofmodules as $file => $modCodeTiers)
 		print '<td class="center">'."\n";
 		print img_picto($langs->trans("Activated"), 'switch_on');
 		print "</td>\n";
-	}
-	else {
+	} else {
 		$disabled = (!empty($conf->multicompany->enabled) && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? true : false);
 		print '<td class="center">';
 		if (!$disabled) print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&value='.$file.'">';
@@ -450,8 +433,7 @@ foreach ($dirsociete as $dirroot)
 
     		    try {
         			dol_include_once($dirroot.$file.'.php');
-    			}
-    			catch (Exception $e)
+    			} catch (Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
@@ -481,8 +463,7 @@ foreach ($arrayofmodules as $file => $modCodeCompta)
     	print '<td class="center">';
     	print img_picto($langs->trans("Activated"), 'switch_on');
     	print '</td>';
-    }
-    else {
+    } else {
     	print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodecompta&value='.$file.'">';
     	print img_picto($langs->trans("Disabled"), 'switch_off');
     	print '</a></td>';
@@ -520,8 +501,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -551,8 +531,7 @@ foreach ($dirsociete as $dirroot)
 
 			    try {
         			dol_include_once($dirroot.'doc/'.$file);
-    			}
-    			catch (Exception $e)
+    			} catch (Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
@@ -589,15 +568,13 @@ foreach ($dirsociete as $dirroot)
 						//	print img_picto($langs->trans("Enabled"),'on');
 						//}
 						print "</td>";
-					}
-					else {
+					} else {
 						if (versioncompare($module->phpmin, versionphparray()) > 0)
 						{
 							print "<td class=\"center\">\n";
 							print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion", join('.', $module->phpmin))), 'switch_off');
 							print "</td>";
-						}
-						else {
+						} else {
 							print "<td class=\"center\">\n";
 							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							print "</td>";
@@ -623,8 +600,7 @@ foreach ($dirsociete as $dirroot)
 					if ($module->type == 'pdf')
 					{
 						$linkspec = '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-					}
-					else {
+					} else {
 						$linkspec = img_object($langs->trans("PreviewNotAvailable"), 'generic');
 					}
 					print $linkspec;
@@ -693,8 +669,7 @@ foreach ($profid as $key => $val)
 			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=0">';
 			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a></td>';
-		}
-		else {
+		} else {
 			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=1">';
 			print img_picto($langs->trans("Disabled"), 'switch_off');
 			print '</a></td>';
@@ -705,8 +680,7 @@ foreach ($profid as $key => $val)
 			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=0">';
 			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a></td>';
-		}
-		else {
+		} else {
 			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=1">';
 			print img_picto($langs->trans("Disabled"), 'switch_off');
 			print '</a></td>';
@@ -717,8 +691,7 @@ foreach ($profid as $key => $val)
 			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=0">';
 			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a></td>';
-		}
-		else {
+		} else {
 			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=1">';
 			print img_picto($langs->trans("Disabled"), 'switch_off');
 			print '</a></td>';
@@ -759,8 +732,7 @@ if (!$conf->use_javascript_ajax)
 	print '<td class="nowrap right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
-}
-else {
+} else {
 	print '<td width="60" class="right">';
 	$arrval = array('0'=>$langs->trans("No"),
 	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
@@ -782,8 +754,7 @@ if (!$conf->use_javascript_ajax)
 	print '<td class="nowrap right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
-}
-else {
+} else {
 	print '<td width="60" class="right">';
 	$arrval = array('0'=>$langs->trans("No"),
 	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
@@ -807,8 +778,7 @@ if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST))
 {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
-}
-else {
+} else {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=1">';
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
@@ -823,8 +793,7 @@ if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST))
 {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
-}
-else {
+} else {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=1">';
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
@@ -841,8 +810,7 @@ if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD))
 {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
-}
-else {
+} else {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=1">';
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
@@ -858,8 +826,7 @@ if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS))
 {
     print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&value=0">';
     print img_picto($langs->trans("Activated"), 'switch_on');
-}
-else {
+} else {
     print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&value=1">';
     print img_picto($langs->trans("Disabled"), 'switch_off');
 }
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 4142231261d..61d473f5c43 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -38,8 +38,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else {
+} else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
index 1622b81384d..dc2d60df5e6 100644
--- a/htdocs/societe/ajax/company.php
+++ b/htdocs/societe/ajax/company.php
@@ -67,8 +67,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 	}
 
 	echo json_encode($outjson);
-}
-else {
+} else {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 	$langs->load("companies");
diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php
index 0558d7d31c8..b98a5f75d5b 100644
--- a/htdocs/societe/ajaxcompanies.php
+++ b/htdocs/societe/ajaxcompanies.php
@@ -71,8 +71,7 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
             $sql .= "nom LIKE '".$db->escape($socid)."%'";
             $sql .= " OR code_client LIKE '".$db->escape($socid)."%'";
             $sql .= " OR code_fournisseur LIKE '".$db->escape($socid)."%'";
-        }
-        else {
+        } else {
     		$sql .= "nom LIKE '%".$db->escape($socid)."%'";
     		$sql .= " OR code_client LIKE '%".$db->escape($socid)."%'";
     		$sql .= " OR code_fournisseur LIKE '%".$db->escape($socid)."%'";
@@ -99,11 +98,9 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
 	    }
 
 	    echo json_encode($return_arr);
-	}
-	else {
+	} else {
 	    echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
 	}
-}
-else {
+} else {
     echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
 }
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index 0cd103a2855..fa650a4e1fd 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -244,22 +244,19 @@ abstract class ActionsCardCommon
                     $this->tpl['localtax'] .= '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
                     $this->tpl['localtax'] .= $form->selectyesno('localtax2assuj_value', $this->object->localtax1_assuj, 1);
                     $this->tpl['localtax'] .= '</td></tr>';
-                }
-                elseif ($mysoc->localtax1_assuj == "1")
+                } elseif ($mysoc->localtax1_assuj == "1")
                 {
                     $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
                     $this->tpl['localtax'] .= $form->selectyesno('localtax1assuj_value', $this->object->localtax1_assuj, 1);
                     $this->tpl['localtax'] .= '</td><tr>';
-                }
-                elseif ($mysoc->localtax2_assuj == "1")
+                } elseif ($mysoc->localtax2_assuj == "1")
                 {
                     $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
                     $this->tpl['localtax'] .= $form->selectyesno('localtax2assuj_value', $this->object->localtax1_assuj, 1);
                     $this->tpl['localtax'] .= '</td><tr>';
                 }
             }
-        }
-        else {
+        } else {
             $head = societe_prepare_head($this->object);
 
             $this->tpl['showhead'] = dol_get_fiche_head($head, 'card', '', 0, 'company');
@@ -306,8 +303,7 @@ abstract class ActionsCardCommon
             if ($nbofsalesrepresentative > 3)   // We print only number
             {
             	$this->tpl['sales_representatives'] .= $nbofsalesrepresentative;
-            }
-            elseif ($nbofsalesrepresentative > 0)
+            } elseif ($nbofsalesrepresentative > 0)
             {
             	$userstatic = new User($this->db);
             	$i = 0;
@@ -320,8 +316,7 @@ abstract class ActionsCardCommon
             		$i++;
             		if ($i < $nbofsalesrepresentative) $this->tpl['sales_representatives'] .= ', ';
             	}
-            }
-            else $this->tpl['sales_representatives'] .= $langs->trans("NoSalesRepresentativeAffected");
+            } else $this->tpl['sales_representatives'] .= $langs->trans("NoSalesRepresentativeAffected");
 
             // Linked member
             if (!empty($conf->adherent->enabled))
@@ -333,8 +328,7 @@ abstract class ActionsCardCommon
                 {
                     $adh->ref = $adh->getFullName($langs);
                     $this->tpl['linked_member'] = $adh->getNomUrl(1);
-                }
-                else {
+                } else {
                     $this->tpl['linked_member'] = $langs->trans("ThirdpartyNotLinkedToMember");
                 }
             }
@@ -351,13 +345,11 @@ abstract class ActionsCardCommon
                     $this->tpl['localtax'] .= '<td>'.yn($this->object->localtax1_assuj).'</td>';
                     $this->tpl['localtax'] .= '<td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
                     $this->tpl['localtax'] .= '<td>'.yn($this->object->localtax2_assuj).'</td></tr>';
-                }
-                elseif ($mysoc->localtax1_assuj == "1")
+                } elseif ($mysoc->localtax1_assuj == "1")
                 {
                     $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
                     $this->tpl['localtax'] .= '<td colspan="3">'.yn($this->object->localtax1_assuj).'</td></tr>';
-                }
-                elseif ($mysoc->localtax2_assuj == "1")
+                } elseif ($mysoc->localtax2_assuj == "1")
                 {
                     $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
                     $this->tpl['localtax'] .= '<td colspan="3">'.yn($this->object->localtax2_assuj).'</td></tr>';
diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php
index 348163195d9..73453aff62e 100644
--- a/htdocs/societe/canvas/company/actions_card_company.class.php
+++ b/htdocs/societe/canvas/company/actions_card_company.class.php
@@ -134,16 +134,13 @@ class ActionsCardCompany extends ActionsCardCommon
 				{
 					$s .= '<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
 					$this->tpl['tva_intra'] = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
-				}
-				else {
+				} else {
 					$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL", $this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
 				}
-			}
-			else {
+			} else {
 				$this->tpl['tva_intra'] = $s;
 			}
-		}
-		else {
+		} else {
 			// Confirm delete third party
 			if ($action == 'delete')
 			{
@@ -170,16 +167,13 @@ class ActionsCardCompany extends ActionsCardCommon
 					{
 						$s .= '<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
 						$this->tpl['tva_intra'] = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
-					}
-					else {
+					} else {
 						$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL", $this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
 					}
-				}
-				else {
+				} else {
 					$this->tpl['tva_intra'] = $s;
 				}
-			}
-			else {
+			} else {
 				$this->tpl['tva_intra'] = '&nbsp;';
 			}
 
@@ -190,8 +184,7 @@ class ActionsCardCompany extends ActionsCardCommon
 				$socm->fetch($this->object->parent);
 				$this->tpl['parent_company'] = $socm->getNomUrl(1).' '.($socm->code_client ? "(".$socm->code_client.")" : "");
 				$this->tpl['parent_company'] .= ($socm->town ? ' - '.$socm->town : '');
-			}
-			else {
+			} else {
 				$this->tpl['parent_company'] = $langs->trans("NoParentCompany");
 			}
 		}
diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php
index 6a93ac3e939..3abb9e9b6f7 100644
--- a/htdocs/societe/canvas/individual/actions_card_individual.class.php
+++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php
@@ -110,8 +110,7 @@ class ActionsCardIndividual extends ActionsCardCommon
 		if ($action == 'create' || $action == 'edit')
 		{
 			$this->tpl['select_civility'] = $formcompany->select_civility(GETPOST('civility_id'));
-		}
-		else {
+		} else {
 			// Confirm delete third party
 			if ($action == 'delete' || $conf->use_javascript_ajax)
 			{
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 77299e3ee89..f468f4f63ce 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -136,8 +136,7 @@ if (empty($reshook))
 		{
 			$langs->load('errors');
 			setEventMessages($langs->trans('ErrorThirdPartyIdIsMandatory', $langs->transnoentitiesnoconv('MergeOriginThirdparty')), null, 'errors');
-		}
-		else {
+		} else {
 			if (!$error && $soc_origin->fetch($soc_origin_id) < 1)
 			{
 				setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors');
@@ -300,8 +299,7 @@ if (empty($reshook))
 				{
 					setEventMessages($langs->trans('ThirdpartiesMergeSuccess'), null, 'mesgs');
 					$db->commit();
-				}
-				else {
+				} else {
 				    $langs->load("errors");
 					setEventMessages($langs->trans('ErrorsThirdpartyMerge'), null, 'errors');
 					$db->rollback();
@@ -389,8 +387,7 @@ if (empty($reshook))
 	        {
 	        	$ret = $object->fetch($socid);
 				$object->oldcopy = clone $object;
-	        }
-			else $object->canvas = $canvas;
+	        } else $object->canvas = $canvas;
 
 	        if (GETPOST("private", 'int') == 1)	// Ask to create a contact
 	        {
@@ -401,8 +398,7 @@ if (empty($reshook))
 	            // Add non official properties
 	            $object->name_bis = GETPOST('name', 'alpha');
 	            $object->firstname = GETPOST('firstname', 'alpha');
-	        }
-	        else {
+	        } else {
 	            $object->name = GETPOST('name', 'alpha');
 	        }
 	        $object->entity					= (GETPOSTISSET('entity') ?GETPOST('entity', 'int') : $conf->entity);
@@ -605,15 +601,13 @@ if (empty($reshook))
                                 if (!$result > 0)
                                 {
                                     $errors[] = "ErrorFailedToSaveFile";
-                                }
-                                else {
+                                } else {
                                     // Create thumbs
                                     $object->addThumbs($newfile);
                                 }
                             }
                         }
-                    }
-                    else {
+                    } else {
 						switch ($_FILES['photo']['error'])
 						{
 						    case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
@@ -626,8 +620,7 @@ if (empty($reshook))
 						}
 	                }
                     // Gestion du logo de la société
-                }
-                else {
+                } else {
 				    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
 					{
 						$duplicate_code_error = true;
@@ -649,8 +642,7 @@ if (empty($reshook))
                 		if (preg_match('/\?/', $backtopage)) $backtopage .= '&socid='.$object->id; // Old method
                		    header("Location: ".$backtopage);
                     	exit;
-                	}
-                	else {
+                	} else {
                 		$url = $_SERVER["PHP_SELF"]."?socid=".$object->id; // Old method
                     	if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url = DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
                     	elseif ($object->fournisseur == 1) $url = DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
@@ -658,8 +650,7 @@ if (empty($reshook))
                 		header("Location: ".$url);
                     	exit;
                 	}
-                }
-                else {
+                } else {
                     $db->rollback();
                     $action = 'create';
                 }
@@ -675,8 +666,7 @@ if (empty($reshook))
                 	{
                		    header("Location: ".$backtopage);
                     	exit;
-                	}
-                	else {
+                	} else {
                		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
                     	exit;
                 	}
@@ -750,8 +740,7 @@ if (empty($reshook))
                             if (!$result > 0)
                             {
                                 $errors[] = "ErrorFailedToSaveFile";
-                            }
-                            else {
+                            } else {
                             	// Create thumbs
                             	$object->addThumbs($newfile);
 
@@ -766,12 +755,10 @@ if (empty($reshook))
                                 }
                             }
                         }
-                    }
-                    else {
+                    } else {
                         $errors[] = "ErrorBadImageFormat";
                     }
-                }
-                else {
+                } else {
 					switch ($_FILES['photo']['error'])
 					{
 					    case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
@@ -805,19 +792,16 @@ if (empty($reshook))
                 	{
                		    header("Location: ".$backtopage);
                     	exit;
-                	}
-                	else {
+                	} else {
                		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
                     	exit;
                 	}
-                }
-                else {
+                } else {
                     $object->id = $socid;
                     $action = "edit";
                 }
             }
-        }
-        else {
+        } else {
         	$action = ($action == 'add' ? 'create' : 'edit');
         }
     }
@@ -833,8 +817,7 @@ if (empty($reshook))
         {
             header("Location: ".DOL_URL_ROOT."/societe/list.php?restore_lastsearch_values=1&delsoc=".urlencode($object->name));
             exit;
-        }
-        else {
+        } else {
             $langs->load("errors");
            	setEventMessages($object->error, $object->errors, 'errors');
            	$error++;
@@ -903,8 +886,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
     // -----------------------------------------
    	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
     $objcanvas->display_canvas($action); // Show template
-}
-else {
+} else {
     // -----------------------------------------
     // When used in standard mode
     // -----------------------------------------
@@ -972,8 +954,7 @@ else {
 	        $object->code_client		= GETPOST('customer_code', 'alpha');
 	        $object->fournisseur		= GETPOST('fournisseur') ?GETPOST('fournisseur') : $object->fournisseur;
             $object->code_fournisseur = GETPOST('supplier_code', 'alpha');
-        }
-		else {
+        } else {
 			setEventMessages($langs->trans('NewCustomerSupplierCodeProposed'), '', 'warnings');
 		}
 
@@ -1044,8 +1025,7 @@ else {
                     if (!$result > 0)
                     {
                         $errors[] = "ErrorFailedToSaveFile";
-                    }
-                    else {
+                    } else {
                         // Create thumbs
                         $object->addThumbs($newfile);
                     }
@@ -1186,8 +1166,7 @@ else {
         if ($object->particulier || $private)
         {
 	        print '<span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName', 'name').'</span>';
-        }
-        else {
+        } else {
 			print '<span id="TypeName" class="fieldrequired">'.$form->editfieldkey('ThirdPartyName', 'name', '', $object, 0).'</span>';
         }
 	    print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX) ? ' colspan="3"' : '').'>';
@@ -1322,8 +1301,7 @@ else {
             if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
             {
                 print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
-            }
-            else {
+            } else {
                 print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
             }
 
@@ -1411,8 +1389,7 @@ else {
                 print "\n";
                 $s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
                 $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
-            }
-            else {
+            } else {
                 $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
             }
         }
@@ -1431,14 +1408,12 @@ else {
             print '<td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
             print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1);
             print '</td></tr>';
-        }
-        elseif ($mysoc->localtax1_assuj == "1")
+        } elseif ($mysoc->localtax1_assuj == "1")
         {
             print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td colspan="3">';
             print $form->selectyesno('localtax1assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1 : 0), 1);
             print '</td></tr>';
-        }
-        elseif ($mysoc->localtax2_assuj == "1")
+        } elseif ($mysoc->localtax2_assuj == "1")
         {
             print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td colspan="3">';
             print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1);
@@ -1463,8 +1438,7 @@ else {
         if ($object->country_id)
         {
             print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
-        }
-        else {
+        } else {
             print $countrynotdefined;
         }
         print '</td></tr>';
@@ -1556,16 +1530,14 @@ else {
         {
             print ' &nbsp; &nbsp; ';
             print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
-        }
-        else {
+        } else {
             print ' &nbsp; &nbsp; ';
             print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
         }
         print '</div>'."\n";
 
         print '</form>'."\n";
-    }
-    elseif ($action == 'edit')
+    } elseif ($action == 'edit')
     {
         //print load_fiche_titre($langs->trans("EditCompany"));
 
@@ -1813,8 +1785,7 @@ else {
                 {
                     print '<input type="hidden" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'">';
                     print $object->prefix_comm;
-                }
-                else {
+                } else {
                     print '<input type="text" size="5" maxlength="5" name="prefix_comm" id="prefix" value="'.dol_escape_htmltag($object->prefix_comm).'">';
                 }
                 print '</td>';
@@ -1835,12 +1806,10 @@ else {
                 if (empty($tmpcode) && !empty($object->oldcopy->code_client)) $tmpcode = $object->oldcopy->code_client; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
                 if (empty($tmpcode) && !empty($modCodeClient->code_auto)) $tmpcode = $modCodeClient->getNextValue($object, 0);
                 print '<input type="text" name="customer_code" id="customer_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-            }
-            elseif ($object->codeclient_modifiable())
+            } elseif ($object->codeclient_modifiable())
             {
             	print '<input type="text" name="customer_code" id="customer_code" size="16" value="'.dol_escape_htmltag($object->code_client).'" maxlength="15">';
-            }
-            else {
+            } else {
                 print $object->code_client;
                 print '<input type="hidden" name="customer_code" value="'.dol_escape_htmltag($object->code_client).'">';
             }
@@ -1875,12 +1844,10 @@ else {
                     if (empty($tmpcode) && !empty($object->oldcopy->code_fournisseur)) $tmpcode = $object->oldcopy->code_fournisseur; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
                     if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) $tmpcode = $modCodeFournisseur->getNextValue($object, 1);
                     print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-                }
-                elseif ($object->codefournisseur_modifiable())
+                } elseif ($object->codefournisseur_modifiable())
                 {
                     print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.$object->code_fournisseur.'" maxlength="15">';
-                }
-                else {
+                } else {
                     print $object->code_fournisseur;
                     print '<input type="hidden" name="supplier_code" value="'.$object->code_fournisseur.'">';
                 }
@@ -1935,8 +1902,7 @@ else {
                 if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
                 {
                     print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3">';
-                }
-                else {
+                } else {
                     print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3">';
                 }
 
@@ -2022,8 +1988,7 @@ else {
                     print '</span>';
                 }
                 print '</td></tr>';
-            }
-            elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
+            } elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
             {
                 print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td colspan="3">';
                 print $form->selectyesno('localtax1assuj_value', $object->localtax1_assuj, 1);
@@ -2034,8 +1999,7 @@ else {
                     print '</span>';
                 }
                 print '</td></tr>';
-            }
-            elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
+            } elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
             {
                 print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td colspan="3">';
                 print $form->selectyesno('localtax2assuj_value', $object->localtax2_assuj, 1);
@@ -2071,8 +2035,7 @@ else {
                     print "\n";
                     $s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
                     $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
-                }
-                else {
+                } else {
                     $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
                 }
             }
@@ -2214,8 +2177,7 @@ else {
 
             print '</form>';
         }
-    }
-    else {
+    } else {
     	/*
          * View
          */
@@ -2376,8 +2338,7 @@ else {
 			            print '<td class="left">';
 			            $formcompany->select_localtax(1, $object->localtax1_value, "lt1");
 			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        }
-			        else {
+			        } else {
 			            print '<td>'.$object->localtax1_value.'</td>';
 			        }
 			        print '</tr></form>';
@@ -2397,8 +2358,7 @@ else {
 			        }
 			        print '</tr></form>';
 			    }
-			}
-			elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
+			} elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
 			{
 			    print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
 			    print yn($object->localtax1_assuj);
@@ -2418,8 +2378,7 @@ else {
 			        }
 			        print '</tr></form>';
 			    }
-			}
-			elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
+			} elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
 			{
 			    print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
 			    print yn($object->localtax2_assuj);
@@ -2469,14 +2428,12 @@ else {
                     print "\n";
                     $s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT( $(\'#tva_intra\').val() );">'.$langs->trans("VATIntraCheck").'</a>';
                     $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
-                }
-                else {
+                } else {
                     $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
                 }
             }
             print $s;
-        }
-        else {
+        } else {
             print '&nbsp;';
         }
         print '</td>';
@@ -2553,8 +2510,7 @@ else {
         	if ($action != 'editincoterm')
         	{
         		print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-        	}
-        	else {
+        	} else {
         		print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?socid='.$object->id);
         	}
         	print '</td></tr>';
@@ -2587,8 +2543,7 @@ else {
         	if ($action == 'editparentcompany')
         	{
         		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'editparentcompany', 's.rowid <> '.$object->id, 1);
-        	}
-        	else {
+        	} else {
         		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'none', 's.rowid <> '.$object->id, 1);
         	}
         	print '</td>';
@@ -2610,8 +2565,7 @@ else {
             {
                 $adh->ref = $adh->getFullName($langs);
                 print $adh->getNomUrl(1);
-            }
-            else {
+            } else {
                 print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
             }
             print '</td>';
@@ -2660,8 +2614,7 @@ else {
 			        {
 			        	$langs->load("mails");
 			        	print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-			        }
-			        else {
+			        } else {
 			        	$langs->load("mails");
 			       		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a>';
 			        }
@@ -2692,8 +2645,7 @@ else {
 		            if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with jmobile
 		            {
 		                print '<span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span>'."\n";
-		            }
-		            else {
+		            } else {
 		                print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
 		            }
 		        }
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index 99e18f036aa..725cab96065 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -49,8 +49,7 @@ if (!$vatNumber)
 {
 	print '<br>';
 	print '<font class="error">'.$langs->transnoentities("ErrorFieldRequired", $langs->trans("VATIntraShort")).'</font><br>';
-}
-else {
+} else {
 	$vatNumber = preg_replace('/\^\w/', '', $vatNumber);
 	$vatNumber = str_replace(array(' ', '.'), '', $vatNumber);
 	$countryCode = substr($vatNumber, 0, 2);
@@ -101,18 +100,15 @@ else {
 	{
 		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
 		$messagetoshow = $soapclient->response;
-	}
-	elseif (preg_match('/TIMEOUT/i', $result['faultstring']))
+	} elseif (preg_match('/TIMEOUT/i', $result['faultstring']))
 	{
 		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
 		$messagetoshow = $soapclient->response;
-	}
-	elseif (preg_match('/SERVER_BUSY/i', $result['faultstring']))
+	} elseif (preg_match('/SERVER_BUSY/i', $result['faultstring']))
 	{
 		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
 		$messagetoshow = $soapclient->response;
-	}
-	elseif ($result['faultstring'])
+	} elseif ($result['faultstring'])
 	{
 		print '<font class="error">'.$langs->trans("Error").'</font><br>';
 		$messagetoshow = $result['faultstring'];
@@ -125,8 +121,7 @@ else {
 		print $langs->trans("VATIntraSyntaxIsValid").': <font class="error">'.$langs->trans("No").'</font> (Might be a non europeen VAT)<br>';
 		print $langs->trans("ValueIsValid").': <font class="error">'.$langs->trans("No").'</font> (Might be a non europeen VAT)<br>';
 		//$messagetoshow=$soapclient->response;
-	}
-	else {
+	} else {
 		// Syntaxe ok
 		if ($result['requestDate']) print $langs->trans("Date").': '.$result['requestDate'].'<br>';
 		print $langs->trans("VATIntraSyntaxIsValid").': <font class="ok">'.$langs->trans("Yes").'</font><br>';
@@ -134,16 +129,14 @@ else {
 		if (preg_match('/MS_UNAVAILABLE/i', $result['faultstring']))
 		{
 			print '<font class="error">'.$langs->trans("ErrorVATCheckMS_UNAVAILABLE", $countryCode).'</font><br>';
-		}
-		else {
+		} else {
 			if (!empty($result['valid']) && ($result['valid'] == 1 || $result['valid'] == 'true'))
 			{
 				print '<font class="ok">'.$langs->trans("Yes").'</font>';
 				print '<br>';
 				print $langs->trans("Name").': '.$result['name'].'<br>';
 				print $langs->trans("Address").': '.$result['address'].'<br>';
-			}
-			else {
+			} else {
 				print '<font class="error">'.$langs->trans("No").'</font>';
 				print '<br>'."\n";
 			}
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index bfaed41f21b..37d9239265f 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -208,8 +208,7 @@ class Contacts extends DolibarrApi
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(503, 'Error when retrieve contacts : '.$sql);
 		}
 		if (!count($obj_ret))
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 3ec6243a2c7..ca3e4385837 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -143,9 +143,7 @@ class Thirdparties extends DolibarrApi
 
     	// Select thirdparties of given category
     	if ($category > 0) {
-			if (!empty($mode) && $mode != 4) { $sql .= " AND c.fk_categorie = ".$db->escape($category)." AND c.fk_soc = t.rowid"; }
-			elseif (!empty($mode) && $mode == 4) { $sql .= " AND cc.fk_categorie = ".$db->escape($category)." AND cc.fk_soc = t.rowid"; }
-			else { $sql .= " AND ((c.fk_categorie = ".$db->escape($category)." AND c.fk_soc = t.rowid) OR (cc.fk_categorie = ".$db->escape($category)." AND cc.fk_soc = t.rowid))"; }
+			if (!empty($mode) && $mode != 4) { $sql .= " AND c.fk_categorie = ".$db->escape($category)." AND c.fk_soc = t.rowid"; } elseif (!empty($mode) && $mode == 4) { $sql .= " AND cc.fk_categorie = ".$db->escape($category)." AND cc.fk_soc = t.rowid"; } else { $sql .= " AND ((c.fk_categorie = ".$db->escape($category)." AND c.fk_soc = t.rowid) OR (cc.fk_categorie = ".$db->escape($category)." AND cc.fk_soc = t.rowid))"; }
     	}
 
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc";
@@ -195,8 +193,7 @@ class Thirdparties extends DolibarrApi
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(503, 'Error when retrieve thirdparties : '.$db->lasterror());
 		}
 		if (!count($obj_ret)) {
@@ -466,8 +463,7 @@ class Thirdparties extends DolibarrApi
 			$db->rollback();
 
 			throw new RestException(500, 'Error failed to merged thirdparty '.$this->companytoremove->id.' into '.$id.'. Enable and read log file for more information.');
-		}
-		else {
+		} else {
 			$db->commit();
 		}
 
@@ -1104,8 +1100,7 @@ class Thirdparties extends DolibarrApi
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(404, 'Account not found');
 		}
 
@@ -1311,8 +1306,7 @@ class Thirdparties extends DolibarrApi
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(404, 'Bank account not found');
 		}
 
@@ -1328,8 +1322,7 @@ class Thirdparties extends DolibarrApi
 		if ($result > 0)
 		{
 			return array("success" => $result);
-		}
-		else {
+		} else {
 			throw new RestException(500);
 		}
     }
diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php
index 803d0ddebe3..3b289547f8d 100644
--- a/htdocs/societe/class/client.class.php
+++ b/htdocs/societe/class/client.class.php
@@ -83,8 +83,7 @@ class Client extends Societe
             }
             $this->db->free($resql);
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->lasterror();
             return -1;
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 00737c04504..283c32573e0 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -111,17 +111,14 @@ class CompanyBankAccount extends Account
 					if (!$error)
 					{
 						return 1;
-					}
-					else {
+					} else {
 						return 0;
 					}
-				}
-				else {
+				} else {
 					return 1;
 				}
 			}
-		}
-		else {
+		} else {
 			print $this->db->error();
 			return 0;
 		}
@@ -179,16 +176,13 @@ class CompanyBankAccount extends Account
 				if (!$error)
 				{
 					return 1;
-				}
-				else {
+				} else {
 					return -1;
 				}
-			}
-			else {
+			} else {
 				return 1;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -251,8 +245,7 @@ class CompanyBankAccount extends Account
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -299,8 +292,7 @@ class CompanyBankAccount extends Account
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1 * $error;
 		}
@@ -345,8 +337,7 @@ class CompanyBankAccount extends Account
 			if ($this->db->num_rows($result1) == 0)
 			{
 				return 0;
-			}
-			else {
+			} else {
 				$obj = $this->db->fetch_object($result1);
 
 				$this->db->begin();
@@ -366,14 +357,12 @@ class CompanyBankAccount extends Account
 					dol_print_error($this->db);
 					$this->db->rollback();
 					return -1;
-				}
-				else {
+				} else {
 					$this->db->commit();
 					return 1;
 				}
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index ca75b904b11..93f0d13b498 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -404,8 +404,7 @@ class CompanyPaymentMode extends CommonObject
             }
             $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -439,8 +438,7 @@ class CompanyPaymentMode extends CommonObject
 			if ($this->db->num_rows($result1) == 0)
 			{
 				return 0;
-			}
-			else {
+			} else {
 				$obj = $this->db->fetch_object($result1);
 
 				$type = '';
@@ -465,14 +463,12 @@ class CompanyPaymentMode extends CommonObject
 					dol_print_error($this->db);
 					$this->db->rollback();
 					return -1;
-				}
-				else {
+				} else {
 					$this->db->commit();
 					return 1;
 				}
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -562,8 +558,7 @@ class CompanyPaymentMode extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index e2b24577bf9..03290f1581d 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -818,36 +818,31 @@ class Societe extends CommonObject
 					$result = $this->call_trigger('COMPANY_CREATE', $user);
 					if ($result < 0) $error++;
 					// End call triggers
-				}
-				else $error++;
+				} else $error++;
 
 				if (!$error)
 				{
 					dol_syslog(get_class($this)."::Create success id=".$this->id);
 					$this->db->commit();
 					return $this->id;
-				}
-				else {
+				} else {
 					dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',', $this->errors), LOG_ERR);
 					$this->db->rollback();
 					return -4;
 				}
-			}
-			else {
+			} else {
 				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name); // duplicate on a field (code or profid or ...)
 					$result = -1;
-				}
-				else {
+				} else {
 					$this->error = $this->db->lasterror();
 					$result = -2;
 				}
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::Create fails verify ".join(',', $this->errors), LOG_WARNING);
 			return -3;
@@ -925,16 +920,13 @@ class Societe extends CommonObject
 				if ($rescode == -1)
 				{
 					$this->errors[] = 'ErrorBadCustomerCodeSyntax';
-				}
-				elseif ($rescode == -2)
+				} elseif ($rescode == -2)
 				{
 					$this->errors[] = 'ErrorCustomerCodeRequired';
-				}
-				elseif ($rescode == -3)
+				} elseif ($rescode == -3)
 				{
 					$this->errors[] = 'ErrorCustomerCodeAlreadyUsed';
-				}
-				elseif ($rescode == -4)
+				} elseif ($rescode == -4)
 				{
 					$this->errors[] = 'ErrorPrefixRequired';
 				}
@@ -950,16 +942,13 @@ class Societe extends CommonObject
 				if ($rescode == -1)
 				{
 					$this->errors[] = 'ErrorBadSupplierCodeSyntax';
-				}
-				elseif ($rescode == -2)
+				} elseif ($rescode == -2)
 				{
 					$this->errors[] = 'ErrorSupplierCodeRequired';
-				}
-				elseif ($rescode == -3)
+				} elseif ($rescode == -3)
 				{
 					$this->errors[] = 'ErrorSupplierCodeAlreadyUsed';
-				}
-				elseif ($rescode == -5)
+				} elseif ($rescode == -5)
 				{
 					$this->errors[] = 'ErrorPrefixRequired';
 				}
@@ -1002,8 +991,7 @@ class Societe extends CommonObject
 						$this->errors[] = $langs->transcountry('ProfId'.$i, $this->country_code)." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
 					}
 				}
-			}
-			else {
+			} else {
 				//var_dump($conf->global->SOCIETE_EMAIL_UNIQUE);
 				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
 				if ($key == 'EMAIL')
@@ -1248,20 +1236,16 @@ class Societe extends CommonObject
 				if ($this->localtax1_value != '')
 				{
 					$sql .= ",localtax1_value =".$this->localtax1_value;
-				}
-				else $sql .= ",localtax1_value =0.000";
-			}
-			else $sql .= ",localtax1_value =0.000";
+				} else $sql .= ",localtax1_value =0.000";
+			} else $sql .= ",localtax1_value =0.000";
 
 			if ($this->localtax2_assuj == 1)
 			{
 				if ($this->localtax2_value != '')
 				{
 					$sql .= ",localtax2_value =".$this->localtax2_value;
-				}
-				else $sql .= ",localtax2_value =0.000";
-			}
-			else $sql .= ",localtax2_value =0.000";
+				} else $sql .= ",localtax2_value =0.000";
+			} else $sql .= ",localtax2_value =0.000";
 
 			$sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
 
@@ -1331,8 +1315,7 @@ class Societe extends CommonObject
 						unset($this->state_code);
 						unset($this->state);
 					}
-				}
-				else {
+				} else {
 					unset($this->country_code); // We clean this, in the doubt, because it may have been changed after an update of country_id
 					unset($this->country);
 					unset($this->state_code);
@@ -1375,8 +1358,7 @@ class Societe extends CommonObject
 								dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 								$error++;
 							}
-						}
-						elseif ($result < 0)
+						} elseif ($result < 0)
 						{
 							$this->error = $lmember->error;
 							$error++;
@@ -1418,28 +1400,24 @@ class Societe extends CommonObject
 					dol_syslog(get_class($this)."::Update success");
 					$this->db->commit();
 					return 1;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else {
+			} else {
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					// Doublon
 					$this->error = $langs->trans("ErrorDuplicateField");
 					$result = -1;
-				}
-				else {
+				} else {
 					$this->error = $this->db->lasterror();
 					$result = -2;
 				}
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::Update fails verify ".join(',', $this->errors), LOG_WARNING);
 			return -3;
@@ -1531,8 +1509,7 @@ class Societe extends CommonObject
 				$this->error = 'Fetch found several records. Rename one of thirdparties to avoid duplicate.';
 				dol_syslog($this->error, LOG_ERR);
 				$result = -2;
-			}
-			elseif ($num)   // $num = 1
+			} elseif ($num)   // $num = 1
 			{
 				$obj = $this->db->fetch_object($resql);
 
@@ -1664,14 +1641,12 @@ class Societe extends CommonObject
 
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
-			}
-			else {
+			} else {
 				$result = 0;
 			}
 
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$result = -3;
 		}
@@ -1809,14 +1784,12 @@ class Societe extends CommonObject
 				}
 
 				return 1;
-			}
-			else {
+			} else {
 				dol_syslog($this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
+		} else dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
 		return 0;
 	}
 
@@ -1842,8 +1815,7 @@ class Societe extends CommonObject
 			{
 				$this->client = $newclient;
 				return 1;
-			}
-			else return -1;
+			} else return -1;
 		}
 		return 0;
 	}
@@ -2037,13 +2009,11 @@ class Societe extends CommonObject
 			if ($result > 0)
 			{
 				return $result;
-			}
-			else {
+			} else {
 				$this->error = $discount->error;
 				return -3;
 			}
-		}
-		else return 0;
+		} else return 0;
 	}
 
 	/**
@@ -2064,8 +2034,7 @@ class Societe extends CommonObject
 		if ($result >= 0)
 		{
 			return $result;
-		}
-		else {
+		} else {
 			$this->error = $discountstatic->error;
 			return -1;
 		}
@@ -2092,8 +2061,7 @@ class Societe extends CommonObject
 			$sql .= " WHERE ((ug.fk_user = sc.fk_user";
 			$sql .= " AND ug.entity = ".$conf->entity.")";
 			$sql .= " OR u.admin = 1)";
-		}
-		else $sql .= " WHERE entity in (0, ".$conf->entity.")";
+		} else $sql .= " WHERE entity in (0, ".$conf->entity.")";
 
 		$sql .= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
 
@@ -2119,15 +2087,13 @@ class Societe extends CommonObject
 					$reparray[$i]['entity'] = $obj->entity;
 					$reparray[$i]['login'] = $obj->login;
 					$reparray[$i]['photo'] = $obj->photo;
-				}
-				else {
+				} else {
 					$reparray[] = $obj->rowid;
 				}
 				$i++;
 			}
 			return $reparray;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -2231,8 +2197,7 @@ class Societe extends CommonObject
 			{
                 $this->db->commit();
                 return 1;
-			}
-			else {
+			} else {
 			    $this->db->rollback();
 			    return -1;
 			}
@@ -2316,8 +2281,7 @@ class Societe extends CommonObject
 			if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
 			{
 				$name = $code.' '.$name;
-			}
-			else {
+			} else {
 				$name = $code;
 			}
 		}
@@ -2332,8 +2296,7 @@ class Societe extends CommonObject
 			$label .= '<div class="photointooltip">';
 			$label .= Form::showphoto('societe', $this, 0, 40, 0, '', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
 			$label .= '</div><div style="clear: both;"></div>';
-		}
-		elseif (!empty($this->logo_squarred) && class_exists('Form'))
+		} elseif (!empty($this->logo_squarred) && class_exists('Form'))
 		{
 			/*$label.= '<div class="photointooltip">';
 			$label.= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0);	// Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
@@ -2346,38 +2309,31 @@ class Societe extends CommonObject
 		{
 		    $label .= '<u>'.$langs->trans("ShowCustomer").'</u>';
 		    $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		}
-		elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+		} elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 		{
 			$label .= '<u>'.$langs->trans("ShowProspect").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		}
-		elseif ($option == 'supplier')
+		} elseif ($option == 'supplier')
 		{
 			$label .= '<u>'.$langs->trans("ShowSupplier").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
-		}
-		elseif ($option == 'agenda')
+		} elseif ($option == 'agenda')
 		{
 			$label .= '<u>'.$langs->trans("ShowAgenda").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
-		}
-		elseif ($option == 'project')
+		} elseif ($option == 'project')
 		{
 			$label .= '<u>'.$langs->trans("ShowProject").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
-		}
-		elseif ($option == 'margin')
+		} elseif ($option == 'margin')
 		{
 			$label .= '<u>'.$langs->trans("ShowMargin").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
-		}
-		elseif ($option == 'contact')
+		} elseif ($option == 'contact')
 		{
 			$label .= '<u>'.$langs->trans("ShowContacts").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
-		}
-		elseif ($option == 'ban')
+		} elseif ($option == 'ban')
 		{
 			$label .= '<u>'.$langs->trans("ShowBan").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$this->id;
@@ -2609,16 +2565,14 @@ class Societe extends CommonObject
 						if (!empty($obj->poste))
 						{
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).($obj->poste ? " - ".$obj->poste : "").(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
-						}
-						else {
+						} else {
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
 						}
 					}
 					$i++;
 				}
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 		return $contact_property;
@@ -2651,8 +2605,7 @@ class Societe extends CommonObject
 					$i++;
 				}
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 		return $contacts;
@@ -2687,8 +2640,7 @@ class Societe extends CommonObject
 					$i++;
 				}
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 		return $contacts;
@@ -2726,8 +2678,7 @@ class Societe extends CommonObject
 				elseif ($mode == 'mobile') $contact_property = $obj->phone_mobile;
 			}
 			return $contact_property;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -2751,8 +2702,7 @@ class Societe extends CommonObject
 		if ($mode == 'label')
 		{
 			return $bac->getRibLabel(true);
-		}
-		elseif ($mode == 'rum')
+		} elseif ($mode == 'rum')
 		{
 			if (empty($bac->rum))
 			{
@@ -2762,8 +2712,7 @@ class Societe extends CommonObject
 				$bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
 			}
 			return $bac->rum;
-		}
-		elseif ($mode == 'format')
+		} elseif ($mode == 'format')
 		{
 			return $bac->frstrecur;
 		}
@@ -2893,8 +2842,7 @@ class Societe extends CommonObject
 			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
 			if ($mod->code_modifiable) return 1; // A mettre en dernier
 			return 0;
-		}
-		else {
+		} else {
 			return 0;
 		}
 	}
@@ -2928,8 +2876,7 @@ class Societe extends CommonObject
 			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
 			if ($mod->code_modifiable) return 1; // A mettre en dernier
 			return 0;
-		}
-		else {
+		} else {
 			return 0;
 		}
 	}
@@ -2965,8 +2912,7 @@ class Societe extends CommonObject
 		   	dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
 		   	$result = $mod->verif($this->db, $this->code_client, $this, 0);
 			return $result;
-		}
-		else {
+		} else {
 			return 0;
 		}
 	}
@@ -3001,8 +2947,7 @@ class Societe extends CommonObject
 			dol_syslog(get_class($this)."::check_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
 			$result = $mod->verif($this->db, $this->code_fournisseur, $this, 1);
 			return $result;
-		}
-		else {
+		} else {
 			return 0;
 		}
 	}
@@ -3043,13 +2988,11 @@ class Societe extends CommonObject
 				elseif ($type == 'supplier') $this->code_compta_fournisseur = $mod->code;
 
 				return $result;
-			}
-			else {
+			} else {
 				$this->error = 'ErrorAccountancyCodeNotDefined';
 				return -1;
 			}
-		}
-		else {
+		} else {
 			if ($type == 'customer') $this->code_compta = '';
 			elseif ($type == 'supplier') $this->code_compta_fournisseur = '';
 
@@ -3078,12 +3021,10 @@ class Societe extends CommonObject
 			{
 				$this->parent = $id;
 				return 1;
-			}
-			else {
+			} else {
 				return -1;
 			}
-		}
-		else return -1;
+		} else return -1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -3173,8 +3114,7 @@ class Societe extends CommonObject
 		{
 			$obj = $this->db->fetch_object($resql);
 			$count = $obj->idprof;
-		}
-		else {
+		} else {
 			$count = 0;
 			print $this->db->error();
 		}
@@ -3324,8 +3264,7 @@ class Societe extends CommonObject
 			//Check NIF
 			if (preg_match('/(^[0-9]{9}$)/', $string)) {
 				return 1;
-			}
-			else {
+			} else {
 				return -1;
 			}
 		}
@@ -3379,8 +3318,7 @@ class Societe extends CommonObject
 			if ($url) {
 				return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
 			}
-		}
-		else {
+		} else {
 			return $hookmanager->resPrint;
 		}
 
@@ -3402,8 +3340,7 @@ class Societe extends CommonObject
 		{
 			$obj = $this->db->fetch_object($resql);
 			$count = $obj->numproj;
-		}
-		else {
+		} else {
 			$count = 0;
 			print $this->db->error();
 		}
@@ -3452,8 +3389,7 @@ class Societe extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3471,11 +3407,9 @@ class Societe extends CommonObject
 		$isacompany = empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES) ? 0 : 1; // 0 by default
 		if (!empty($this->tva_intra)) {
 			$isacompany = 1;
-		}
-		elseif (!empty($this->idprof1) || !empty($this->idprof2) || !empty($this->idprof3) || !empty($this->idprof4) || !empty($this->idprof5) || !empty($this->idprof6)) {
+		} elseif (!empty($this->idprof1) || !empty($this->idprof2) || !empty($this->idprof3) || !empty($this->idprof4) || !empty($this->idprof5) || !empty($this->idprof6)) {
 			$isacompany = 1;
-		}
-		elseif (!empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
+		} elseif (!empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
 		{
 			// TODO Add a field is_a_company into dictionary
 			if (preg_match('/^TE_PRIVATE/', $this->typent_code)) $isacompany = 0;
@@ -3518,8 +3452,7 @@ class Societe extends CommonObject
 				$this->SupplierCategories[$obj->rowid] = $obj->label;
 			}
 			return 0;
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -3540,8 +3473,7 @@ class Societe extends CommonObject
 			$sql .= " VALUES (".$categorie_id.", ".$this->id.")";
 
 			if ($resql = $this->db->query($sql)) return 0;
-		}
-		else {
+		} else {
 			return 0;
 		}
 		return -1;
@@ -3603,15 +3535,13 @@ class Societe extends CommonObject
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else {
+			} else {
 				$this->error = $this->db->error();
 
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			// $this->error deja positionne
 			dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',', $this->errors), LOG_ERR);
 
@@ -3652,8 +3582,7 @@ class Societe extends CommonObject
 			{
 				$country_code = $tmp[1];
 				$country_label = $tmp[2];
-			}
-			else // For backward compatibility
+			} else // For backward compatibility
 			{
 				dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_WARNING);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -3677,8 +3606,7 @@ class Societe extends CommonObject
 			{
 				$state_code = $tmp[1];
 				$state_label = $tmp[2];
-			}
-			else // For backward compatibility
+			} else // For backward compatibility
 			{
 				dol_syslog("Your state setup use an old syntax. Reedit it using setup area.", LOG_ERR);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -3816,8 +3744,7 @@ class Societe extends CommonObject
 		if ($resql)
 		{
    			return ($this->db->num_rows($resql) > 0);
-		}
-		else return false;
+		} else return false;
 	}
 
 	/**
@@ -3837,8 +3764,7 @@ class Societe extends CommonObject
 		if ($resql)
 		{
 			return ($this->db->num_rows($resql) > 0);
-		}
-		else return false;
+		} else return false;
 	}
 
 	/**
@@ -3860,8 +3786,7 @@ class Societe extends CommonObject
 		{
 			$obj = $this->db->fetch_object($resql);
    			return (($obj->nb > 0) ?true:false);
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return false;
 		}
@@ -4026,8 +3951,7 @@ class Societe extends CommonObject
 				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
-		}
-		else return array();
+		} else return array();
 	}
 
 	/**
@@ -4065,8 +3989,7 @@ class Societe extends CommonObject
 				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
-		}
-		else return array();
+		} else return array();
 	}
 
 	/**
@@ -4107,8 +4030,7 @@ class Societe extends CommonObject
 			{
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 				$tmpobject = new FactureFournisseur($this->db);
-			}
-			else {
+			} else {
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$tmpobject = new Facture($this->db);
 			}
@@ -4143,8 +4065,7 @@ class Societe extends CommonObject
                 }
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
-		}
-		else {
+		} else {
 			return array();
 		}
 	}
@@ -4203,16 +4124,14 @@ class Societe extends CommonObject
 			$result = $companybankaccount->fetch($moreparams['use_companybankid']);
 			if (!$result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
 			$result = $companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-		}
-		else {
+		} else {
 			// Positionne le modele sur le nom du modele a utiliser
 			if (!dol_strlen($modele))
 			{
 				if (!empty($conf->global->COMPANY_ADDON_PDF))
 				{
 					$modele = $conf->global->COMPANY_ADDON_PDF;
-				}
-				else {
+				} else {
 					print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
 					return 0;
 				}
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 1f99e9bae8a..ba32086cc4d 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -433,8 +433,7 @@ class SocieteAccount extends CommonObject
             }
             $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -477,33 +476,27 @@ class SocieteAccount extends CommonObject
 			$prefix = '';
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 6)
+		} elseif ($mode == 6)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
@@ -556,8 +549,7 @@ class SocieteAccount extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 2660625bd1c..312835e1a80 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -427,8 +427,7 @@ if ($sql_select)
 		if ($type_element == 'contract')
 		{
 			print $documentstaticline->getLibStatut(2);
-		}
-		else {
+		} else {
 			print $documentstatic->getLibStatut(2);
 		}
 		print '</td>';
@@ -470,8 +469,7 @@ if ($sql_select)
 				}
 
 				$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
-			}
-			else {
+			} else {
 				$label = $objp->product_label;
 			}
 
@@ -505,27 +503,23 @@ if ($sql_select)
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
-				}
-				elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
+				} elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
 				{
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
-				}
-				elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
+				} elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
 				{
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 					// Add date of deposit
 					if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
-				}
-				else {
+				} else {
 					echo ($txt ? ' - ' : '').dol_htmlentitiesbr($objp->description);
 				}
 			}
-		}
-		else {
+		} else {
 			if ($objp->fk_product > 0) {
 				echo $form->textwithtooltip($text, $description, 3, '', '', $i, 0, '');
 
@@ -603,8 +597,7 @@ if ($sql_select)
 		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
 	}
 	$db->free($resql);
-}
-elseif (empty($type_element) || $type_element == -1)
+} elseif (empty($type_element) || $type_element == -1)
 {
     print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
@@ -621,8 +614,7 @@ elseif (empty($type_element) || $type_element == -1)
 	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
 
 	print "</table>";
-}
-else {
+} else {
     print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
     print '<table class="liste centpercent">'."\n";
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 9f3751fd5b2..ba0241a90f7 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -166,8 +166,7 @@ if ($object->id)
 	$permtoedit = $user->rights->societe->creer;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	accessforbidden('', 0, 0);
 }
 
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index c62ec602ecd..85c27a29b7e 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -95,8 +95,7 @@ if ($result)
         if (!empty($conf->societe->enabled) && $objp->client == 0 && $objp->fournisseur == 0) { $found = 1; $third['other']++; }
         if ($found) $total++;
     }
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder nohover centpercent">'."\n";
@@ -119,8 +118,7 @@ if (!empty($conf->use_javascript_ajax) && ((round($third['prospect']) ? 1 : 0) +
 	$dolgraph->draw('idgraphthirdparties');
 	print $dolgraph->show();
     print '</td></tr>'."\n";
-}
-else {
+} else {
     if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS))
     {
         $statstring = "<tr>";
@@ -184,8 +182,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 				if ($i < $nbmax)
 				{
 					$dataseries[] = array($obj->label, round($obj->nb));
-				}
-				else {
+				} else {
 					$rest += $obj->nb;
 				}
 				$total += $obj->nb;
@@ -204,8 +201,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 			$dolgraph->setHeight('200');
 			$dolgraph->draw('idgraphcateg');
 			print $dolgraph->show();
-		}
-		else {
+		} else {
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($result);
@@ -331,8 +327,7 @@ if ($result)
         print '</div>';
         print "<!-- End last thirdparties modified -->\n";
     }
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index cb94da91e2f..4ead540eb8b 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -386,8 +386,7 @@ if ($resql)
 		if ($level == $obj->code) $level = $langs->trans($obj->label);
 		$tab_level[$obj->code] = $level;
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 $sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.barcode, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, s.logo,";
 $sql .= " s.entity,";
@@ -1049,8 +1048,7 @@ while ($i < min($num, $limit))
 		if ($contextpage == 'poslist')
 		{
 		    print $obj->name;
-		}
-		else {
+		} else {
 		    print $companystatic->getNomUrl(1, '', 100, 0, 1);
 		}
 		print "</td>\n";
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index 48a31085eb4..866a0e0964f 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -122,8 +122,7 @@ if ($object->id > 0)
     include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
     dol_fiche_end();
-}
-else {
+} else {
 	$langs->load("errors");
 	print $langs->trans("ErrorRecordNotFound");
 }
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 0650261cefc..2a0d2603e5b 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -104,16 +104,14 @@ if (empty($reshook))
                     $error++;
                     dol_print_error($db);
                 }
-            }
-            else {
+            } else {
                 dol_print_error($db);
             }
 
             if (!$error)
             {
                 $db->commit();
-            }
-            else {
+            } else {
                 $db->rollback();
             }
         }
@@ -261,8 +259,7 @@ if ($result > 0)
         print '</td>';
         print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
         print '</tr>';
-    }
-    else {
+    } else {
         print '<tr class="oddeven"><td colspan="4" class="opacitymedium">';
         print $langs->trans("YouMustCreateContactFirst");
         print '</td></tr>';
@@ -290,8 +287,7 @@ if ($result > 0)
     if ($resql)
     {
         $num = $db->num_rows($resql);
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 
@@ -329,8 +325,7 @@ if ($result > 0)
                 if (isValidEmail($obj->email))
                 {
                     print ' &lt;'.$obj->email.'&gt;';
-                }
-                else {
+                } else {
                     $langs->load("errors");
                     print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
                 }
@@ -438,8 +433,7 @@ if ($result > 0)
     if ($resql)
     {
         $num = $db->num_rows($resql);
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 
@@ -487,8 +481,7 @@ if ($result > 0)
 	            $contactstatic->firstname = $obj->firstname;
 	            print $contactstatic->getNomUrl(1);
 	            print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
-            }
-            else {
+            } else {
 				print $obj->email;
             }
             print '</td>';
@@ -522,8 +515,7 @@ if ($result > 0)
     print '</table>';
 
     print '</form>';
-}
-else dol_print_error('', 'RecordNotFound');
+} else dol_print_error('', 'RecordNotFound');
 
 // End of page
 llxFooter();
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 2d5e0612959..fa01e2db095 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -175,8 +175,7 @@ if (empty($reshook))
 			if (!$result)
 			{
 				setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
-			}
-			else {
+			} else {
 				// If this account is the default bank account, we disable others
 				if ($companybankaccount->default_rib)
 				{
@@ -229,8 +228,7 @@ if (empty($reshook))
 			if (!$result)
 			{
 				setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
-			}
-			else {
+			} else {
 				// If this account is the default bank account, we disable others
 				if ($companypaymentmode->default_rib)
 				{
@@ -336,8 +334,7 @@ if (empty($reshook))
 				$url = $_SERVER["PHP_SELF"].'?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			else {
+			} else {
 				$db->rollback();
 			}
 		}
@@ -404,8 +401,7 @@ if (empty($reshook))
 				$url = $_SERVER["PHP_SELF"].'?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			else {
+			} else {
 				$db->rollback();
 			}
 		}
@@ -420,8 +416,7 @@ if (empty($reshook))
 			$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 			header('Location: '.$url);
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($db->lasterror, null, 'errors');
 		}
 	}
@@ -446,12 +441,10 @@ if (empty($reshook))
 				$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			else {
+			} else {
 				setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
 			}
-		}
-		else {
+		} else {
 			setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
 		}
 	}
@@ -466,12 +459,10 @@ if (empty($reshook))
 				$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			else {
+			} else {
 				setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
 			}
-		}
-		else {
+		} else {
 			setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
 		}
 	}
@@ -506,16 +497,14 @@ if (empty($reshook))
 			{
 				$error++;
 				setEventMessages('ThisThirdpartyIsNotACustomer', null, 'errors');
-			}
-			else {
+			} else {
 				// Creation of Stripe customer + update of societe_account
 				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus, 1);
 				if (!$cu)
 				{
 					$error++;
 					setEventMessages($stripe->error, $stripe->errors, 'errors');
-				}
-				else {
+				} else {
 					$stripecu = $cu->id;
 				}
 			}
@@ -529,8 +518,7 @@ if (empty($reshook))
 			{
 				$error++;
 				setEventMessages('ThisPaymentModeIsNotACard', null, 'errors');
-			}
-			else {
+			} else {
 				// Get the Stripe customer
 				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
 				if (!$cu)
@@ -600,8 +588,7 @@ if (empty($reshook))
 			{
 				$stripecu = $newcu;
 				$db->commit();
-			}
-			else {
+			} else {
 				$db->rollback();
 			}
 		}
@@ -656,8 +643,7 @@ if (empty($reshook))
 			{
 				$stripesupplieracc = $newsup;
 				$db->commit();
-			}
-			else {
+			} else {
 				$db->rollback();
 			}
 		}
@@ -670,22 +656,19 @@ if (empty($reshook))
 				$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$error++;
 				setEventMessages($e->getMessage(), null, 'errors');
 			}
-		}
-		elseif ($action == 'setassourcedefault')	// Set as default when payment mode defined remotely only
+		} elseif ($action == 'setassourcedefault')	// Set as default when payment mode defined remotely only
 		{
 			try {
 				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
 				if (preg_match('/pm_/', $source))
 				{
 					$cu->invoice_settings->default_payment_method = (string) $source; // New
-				}
-				else {
+				} else {
 					$cu->default_source = (string) $source; // Old
 				}
 				$result = $cu->save();
@@ -693,14 +676,12 @@ if (empty($reshook))
 				$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$error++;
 				setEventMessages($e->getMessage(), null, 'errors');
 			}
-		}
-		elseif ($action == 'deletecard' && $source)
+		} elseif ($action == 'deletecard' && $source)
 		{
 			try {
 				if (preg_match('/pm_/', $source))
@@ -710,8 +691,7 @@ if (empty($reshook))
 			        {
 					    $payment_method->detach();
 				    }
-				}
-				else {
+				} else {
 				    $cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
 				    $card = $cu->sources->retrieve("$source");
 				    if ($card) {
@@ -727,8 +707,7 @@ if (empty($reshook))
 				$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$error++;
 				setEventMessages($e->getMessage(), null, 'errors');
@@ -766,8 +745,7 @@ if (!$id)
 {
 	$companybankaccount->fetch(0, $object->id);
 	$companypaymentmode->fetch(0, null, $object->id, 'card');
-}
-else {
+} else {
 	$companybankaccount->fetch($id);
 	$companypaymentmode->fetch($id);
 }
@@ -958,8 +936,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 					if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
 					{
 						$listofsources = $customerstripe->sources->data;
-					}
-					else {
+					} else {
 						$service = 'StripeTest';
 						$servicestatus = 0;
 						if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha'))
@@ -980,16 +957,14 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							}
 
 							$listofsources = $paymentmethodobjs->data;
-						}
-						catch (Exception $e)
+						} catch (Exception $e)
 						{
 							$error++;
 							setEventMessages($e->getMessage(), null, 'errors');
 						}
 					}
 				}
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				dol_syslog("Error when searching/loading Stripe customer for thirdparty id =".$object->id);
 			}
@@ -1086,8 +1061,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 								$img = picto_from_langcode($companypaymentmodetemp->country_code);
 								print $img ? $img.' ' : '';
 								print getCountry($companypaymentmodetemp->country_code, 1);
-							}
-							else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+							} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
 							print '</td>';
 							// Default
 							print '<td class="center">';
@@ -1134,8 +1108,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						$i++;
 					}
 				}
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 		}
 
 		// Show remote sources (not already shown as local source)
@@ -1175,20 +1148,16 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				if ($src->object == 'card')
 				{
 					print img_credit_card($src->brand);
-				}
-				elseif ($src->object == 'source' && $src->type == 'card')
+				} elseif ($src->object == 'source' && $src->type == 'card')
 				{
 					print img_credit_card($src->card->brand);
-				}
-				elseif ($src->object == 'source' && $src->type == 'sepa_debit')
+				} elseif ($src->object == 'source' && $src->type == 'sepa_debit')
 				{
 					print '<span class="fa fa-university fa-2x fa-fw"></span>';
-				}
-				elseif ($src->object == 'payment_method' && $src->type == 'card')
+				} elseif ($src->object == 'payment_method' && $src->type == 'card')
 				{
 					print img_credit_card($src->card->brand);
-				}
-				elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit')
+				} elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit')
 				{
 					print '<span class="fa fa-university fa-2x fa-fw"></span>';
 				}
@@ -1204,10 +1173,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						$img = picto_from_langcode($src->country);
 						print $img ? $img.' ' : '';
 						print getCountry($src->country, 1);
-					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				}
-				elseif ($src->object == 'source' && $src->type == 'card')
+					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				} elseif ($src->object == 'source' && $src->type == 'card')
 				{
 					print '<span class="opacitymedium">'.$src->owner->name.'</span><br>....'.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
 					print '</td><td>';
@@ -1217,10 +1184,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						$img = picto_from_langcode($src->card->country);
 						print $img ? $img.' ' : '';
 						print getCountry($src->card->country, 1);
-					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				}
-				elseif ($src->object == 'source' && $src->type == 'sepa_debit')
+					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				} elseif ($src->object == 'source' && $src->type == 'sepa_debit')
 				{
 					print 'SEPA debit';
 					print '</td><td>';
@@ -1229,10 +1194,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							$img = picto_from_langcode($src->sepa_debit->country);
 							print $img ? $img.' ' : '';
 							print getCountry($src->sepa_debit->country, 1);
-					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				}
-				elseif ($src->object == 'payment_method' && $src->type == 'card')
+					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				} elseif ($src->object == 'payment_method' && $src->type == 'card')
 				{
 					print '<span class="opacitymedium">'.$src->billing_details->name.'</span><br>....'.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
 					print '</td><td>';
@@ -1242,10 +1205,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						$img = picto_from_langcode($src->card->country);
 						print $img ? $img.' ' : '';
 						print getCountry($src->card->country, 1);
-					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				}
-				elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit')
+					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				} elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit')
 				{
 					print 'SEPA debit';
 					print '</td><td>';
@@ -1254,10 +1215,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						$img = picto_from_langcode($src->sepa_debit->country);
 						print $img ? $img.' ' : '';
 						print getCountry($src->sepa_debit->country, 1);
-					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				}
-				else {
+					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				} else {
 					print '</td><td>';
 				}
 				print '</td>';
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 2f0595cf15d..278a85fa7f5 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -466,16 +466,14 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 				print '</td>';
 			}
 			print "</table>";
-		}
-		else {
+		} else {
 			print $langs->trans('None');
 		}
 
 		print "\n".'<div class="tabsAction">'."\n";
 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'">'.$langs->trans("Ok").'</a></div>';
 		print "\n</div><br>\n";
-	}
-	else {
+	} else {
         // View mode
 
 		/* ************************************************************************** */
@@ -588,8 +586,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
                 print "</tr>\n";
             }
-        }
-        else {
+        } else {
             $colspan = 9;
             if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan += 1;
             print '<tr class="oddeven"><td colspan="'.$colspan.'">'.$langs->trans('None').'</td></tr>';
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index e25b5c5e606..1369f29a185 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -78,14 +78,12 @@ if ($action == 'addcontact' && $user->rights->societe->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
-		}
-		else {
+		} else {
 			$mesg = '<div class="error">'.$object->error.'</div>';
 		}
 	}
@@ -97,8 +95,7 @@ elseif ($action == 'swapstatut' && $user->rights->societe->creer)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -113,8 +110,7 @@ elseif ($action == 'deletecontact' && $user->rights->societe->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -324,15 +320,13 @@ if ($id > 0 || !empty($ref))
 								print " ".img_warning($langs->trans("SubscriptionLate"));
 							}
 							print '</td>';
-						}
-						else {
+						} else {
 							print '<td class="left nowrap">';
 							if ($objp->subscription == 'yes')
 							{
 								print $langs->trans("SubscriptionNotReceived");
 								if ($objp->statut > 0) print " ".img_warning();
-							}
-							else {
+							} else {
 								print '&nbsp;';
 							}
 							print '</td>';
@@ -345,8 +339,7 @@ if ($id > 0 || !empty($ref))
 				}
 			}
 		}
-	}
-	else {
+	} else {
 		// Contrat non trouve
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/societe/tpl/linesalesrepresentative.tpl.php b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
index 11b2d033b69..8ee338fba44 100644
--- a/htdocs/societe/tpl/linesalesrepresentative.tpl.php
+++ b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
@@ -48,6 +48,5 @@ if ($nbofsalesrepresentative > 0)
 		print $userstatic->getNomUrl(-1);
 		print ' ';
 	}
-}
-else print '<span class="opacitymedium">'.$langs->trans("NoSalesRepresentativeAffected").'</span>';
+} else print '<span class="opacitymedium">'.$langs->trans("NoSalesRepresentativeAffected").'</span>';
 print '</td></tr>';
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index f20ac732fd4..728c076d1c8 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -136,8 +136,7 @@ if ($action == "setlive")
 	$res = dolibarr_set_const($db, "STRIPE_LIVE", $liveenable, 'yesno', 0, '', $conf->entity);
 	if ($res > 0) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -236,14 +235,12 @@ if (empty($conf->stripeconnect->enabled))
             {
             	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
             	print img_picto($langs->trans("Activated"), 'switch_on');
-            }
-            else {
+            } else {
             	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=1">';
             	print img_picto($langs->trans("Disabled"), 'switch_off');
             }
             //print $endpoint;
-        }
-        else {
+        } else {
             print img_picto($langs->trans("inactive"), 'statut5');
         }
 	}
@@ -307,20 +304,17 @@ if (empty($conf->stripeconnect->enabled))
             {
                 print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
                 print img_picto($langs->trans("Activated"), 'switch_on');
-            }
-            else {
+            } else {
                 print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=1">';
                 print img_picto($langs->trans("Disabled"), 'switch_off');
             }
             //print $endpoint;
-        }
-        else {
+        } else {
             print img_picto($langs->trans("inactive"), 'statut5');
         }
 	}
     print '</td></tr>';
-}
-else {
+} else {
 	print '<tr class="oddeven"><td>'.$langs->trans("StripeConnect").'</td>';
 	print '<td>'.$langs->trans("StripeConnect_Mode").'</td><td></td></tr>';
 }
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 74fa1aafc43..5672176168a 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -65,8 +65,7 @@ if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETP
 	$service = 'StripeTest';
 	$servicestatus = '0';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
-}
-else {
+} else {
 	$service = 'StripeLive';
 	$servicestatus = '1';
 }
@@ -84,8 +83,7 @@ if (!$rowid)
 	if ($stripeacc)
 	{
 		$list = \Stripe\Charge::all($option, array("stripe_account" => $stripeacc));
-	}
-	else {
+	} else {
 		$list = \Stripe\Charge::all($option);
 	}
 
@@ -177,19 +175,16 @@ if (!$rowid)
 		if (!empty($tmparray['CUS']) && $tmparray['CUS'] > 0)
 		{
 			$societestatic->fetch($tmparray['CUS']);
-		}
-		elseif (!empty($charge->metadata->dol_thirdparty_id) && $charge->metadata->dol_thirdparty_id > 0)
+		} elseif (!empty($charge->metadata->dol_thirdparty_id) && $charge->metadata->dol_thirdparty_id > 0)
 		{
 			$societestatic->fetch($charge->metadata->dol_thirdparty_id);
-		}
-		else {
+		} else {
 			$societestatic->id = 0;
 		}
 		if (!empty($tmparray['MEM']) && $tmparray['MEM'] > 0)
 		{
 			$memberstatic->fetch($tmparray['MEM']);
-		}
-		else {
+		} else {
 			$memberstatic->id = 0;
 		}
 
@@ -227,8 +222,7 @@ if (!$rowid)
 		if ($societestatic->id > 0)
 		{
 			print $societestatic->getNomUrl(1);
-		}
-		elseif ($memberstatic->id > 0)
+		} elseif ($memberstatic->id > 0)
 		{
 			print $memberstatic->getNomUrl(1);
 		}
diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php
index 4b68ad72b09..2fafe09a693 100644
--- a/htdocs/stripe/class/actions_stripe.class.php
+++ b/htdocs/stripe/class/actions_stripe.class.php
@@ -75,8 +75,7 @@ class ActionsStripeconnect
 		{
 			$service = 'StripeTest';
 			dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
-		}
-		else {
+		} else {
 			$service = 'StripeLive';
 		}
 
@@ -103,13 +102,11 @@ class ActionsStripeconnect
 			if ($stripe->getStripeAccount($service) && $object->client != 0) {
 				$customer = $stripe->customerStripe($object, $stripe->getStripeAccount($service));
 				$this->resprints .= $customer->id;
-			}
-			else {
+			} else {
 				$this->resprints .= $langs->trans("NoStripe");
 			}
 			$this->resprints .= '</td></tr>';
-		}
-		elseif (is_object($object) && $object->element == 'member') {
+		} elseif (is_object($object) && $object->element == 'member') {
 			$this->resprints .= '<tr><td>';
 			$this->resprints .= '<table width="100%" class="nobordernopadding"><tr><td>';
 			$this->resprints .= $langs->trans('StripeCustomer');
@@ -207,24 +204,19 @@ class ActionsStripeconnect
 					{
 						$langs->load("withdrawals");
 						print '<a class="butActionDelete" href="'.dol_buildpath('/stripeconnect/payment.php?facid='.$object->id.'&action=create', 1).'" title="'.dol_escape_htmltag($langs->trans("StripeConnectPay")).'">'.$langs->trans("StripeConnectPay").'</a>';
-					}
-					else {
+					} else {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
 					}
-				}
-				elseif ($resteapayer == 0)
+				} elseif ($resteapayer == 0)
 				{
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
 				}
-			}
-			else {
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
 			}
-		}
-		elseif (is_object($object) && $object->element == 'invoice_supplier') {
+		} elseif (is_object($object) && $object->element == 'invoice_supplier') {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("StripeConnectPay")).'">'.$langs->trans("StripeConnectPay").'</a>';
-		}
-		elseif (is_object($object) && $object->element == 'member') {
+		} elseif (is_object($object) && $object->element == 'member') {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("StripeAutoSubscription")).'">'.$langs->trans("StripeAutoSubscription").'</a>';
 		}
 		return 0;
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 4a56a2a1542..f3bb30d7efb 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -95,8 +95,7 @@ class Stripe extends CommonObject
 		$sql .= " AND service = '".$mode."'";
 		if ($fk_soc > 0) {
 			$sql .= " AND fk_soc = ".$fk_soc;
-		}
-		else {
+		} else {
 			$sql .= " AND fk_soc IS NULL";
 		}
 		$sql .= " AND fk_user IS NULL AND fk_adherent IS NULL";
@@ -113,8 +112,7 @@ class Stripe extends CommonObject
     		} else {
     			$tokenstring = '';
     		}
-    	}
-    	else {
+    	} else {
     		dol_print_error($this->db);
     	}
 
@@ -189,14 +187,12 @@ class Stripe extends CommonObject
 					} else {
 						$customer = \Stripe\Customer::retrieve("$tiers", array("stripe_account" => $key));
 					}
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					// For exemple, we may have error: 'No such customer: cus_XXXXX; a similar object exists in live mode, but a test mode key was used to make this request.'
 					$this->error = $e->getMessage();
 				}
-			}
-			elseif ($createifnotlinkedtostripe)
+			} elseif ($createifnotlinkedtostripe)
 			{
 			    $ipaddress = getUserRemoteIP();
 
@@ -254,14 +250,12 @@ class Stripe extends CommonObject
 					{
 						$this->error = $this->db->lasterror();
 					}
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 				}
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -289,8 +283,7 @@ class Stripe extends CommonObject
 			} else {
 				$stripepaymentmethod = \Stripe\PaymentMethod::retrieve(''.$paymentmethod->id.'', array("stripe_account" => $key));
 			}
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->error = $e->getMessage();
 		}
@@ -480,8 +473,7 @@ class Stripe extends CommonObject
     						$obj = $this->db->fetch_object($resql);
     						if ($obj) $paymentintentalreadyexists++;
     					}
-    				}
-    				else dol_print_error($this->db);
+    				} else dol_print_error($this->db);
 
     				// If not, we create it.
     				if (!$paymentintentalreadyexists)
@@ -497,19 +489,16 @@ class Stripe extends CommonObject
 	                        dol_syslog(get_class($this)."::PaymentIntent failed to insert paymentintent with id=".$paymentintent->id." into database.");
 	    				}
     				}
-    			}
-    			else {
+    			} else {
     			    $_SESSION["stripe_payment_intent"] = $paymentintent;
     			}
-    		}
-    		catch (Stripe\Error\Card $e)
+    		} catch (Stripe\Error\Card $e)
     		{
     			$error++;
     			$this->error = $e->getMessage();
     			$this->code = $e->getStripeCode();
     			$this->declinecode = $e->getDeclineCode();
-    		}
-    		catch (Exception $e)
+    		} catch (Exception $e)
     		{
     		    /*var_dump($dataforintent);
     		    var_dump($description);
@@ -529,8 +518,7 @@ class Stripe extends CommonObject
 		if (!$error)
 		{
 			return $paymentintent;
-		}
-		else {
+		} else {
 			return null;
 		}
 	}
@@ -654,8 +642,7 @@ class Stripe extends CommonObject
 				{
 					$_SESSION["stripe_setup_intent"] = $setupintent;
 				}*/
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				/*var_dump($dataforintent);
 				 var_dump($description);
@@ -671,8 +658,7 @@ class Stripe extends CommonObject
 		{
 			dol_syslog("getSetupIntent ".(is_object($setupintent) ? $setupintent->id : ''), LOG_INFO, -1);
 			return $setupintent;
-		}
-		else {
+		} else {
 			dol_syslog("getSetupIntent return error=".$error, LOG_INFO, -1);
 			return null;
 		}
@@ -716,8 +702,7 @@ class Stripe extends CommonObject
 							if (!preg_match('/^pm_/', $cardref))
 							{
 								$card = $cu->sources->retrieve($cardref);
-							}
-							else {
+							} else {
 								$card = \Stripe\PaymentMethod::retrieve($cardref);
 							}
 						} else {
@@ -725,20 +710,17 @@ class Stripe extends CommonObject
 							{
 								//$card = $cu->sources->retrieve($cardref, array("stripe_account" => $stripeacc));		// this API fails when array stripe_account is provided
 								$card = $cu->sources->retrieve($cardref);
-							}
-							else {
+							} else {
 								//$card = \Stripe\PaymentMethod::retrieve($cardref, array("stripe_account" => $stripeacc));		// Don't know if this works
 								$card = \Stripe\PaymentMethod::retrieve($cardref);
 							}
 						}
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
 					}
-				}
-				elseif ($createifnotlinkedtostripe)
+				} elseif ($createifnotlinkedtostripe)
 				{
 					$exp_date_month = $obj->exp_date_month;
 					$exp_date_year = $obj->exp_date_year;
@@ -763,8 +745,7 @@ class Stripe extends CommonObject
 								{
 									$this->error = 'Creation of card on Stripe has failed';
 								}
-							}
-							else {
+							} else {
 								$connect = '';
 								if (!empty($stripeacc)) $connect = $stripeacc.'/';
 								$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$cu->id;
@@ -786,8 +767,7 @@ class Stripe extends CommonObject
 								{
 									$this->error = 'Creation of card on Stripe has failed';
 								}
-							}
-							else {
+							} else {
 								$connect = '';
 								if (!empty($stripeacc)) $connect = $stripeacc.'/';
 								$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$cu->id;
@@ -816,16 +796,14 @@ class Stripe extends CommonObject
 								$this->error = $this->db->lasterror();
 							}
 						}
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -935,8 +913,7 @@ class Stripe extends CommonObject
 					if ($paymentintent->status == 'succeeded')
 					{
 						$charge->status = 'ok';
-					}
-					else {
+					} else {
 						$charge->status = 'failed';
 						$charge->failure_code = $stripe->code;
 						$charge->failure_message = $stripe->error;
@@ -945,8 +922,7 @@ class Stripe extends CommonObject
 						$stripefailuremessage = $stripe->error;
 						$stripefailuredeclinecode = $stripe->declinecode;
 					}
-				}
-				elseif (preg_match('/acct_/i', $source))
+				} elseif (preg_match('/acct_/i', $source))
 				{
                     $charge = \Stripe\Charge::create(array(
 						"amount" => "$stripeamount",
@@ -1029,15 +1005,13 @@ class Stripe extends CommonObject
 					{
 						$charge->status = 'ok';
 						$charge->id = $paymentintent->id;
-					}
-					else {
+					} else {
 						$charge->status = 'failed';
 						$charge->failure_code = $stripe->code;
 						$charge->failure_message = $stripe->error;
 						$charge->failure_declinecode = $stripe->declinecode;
 					}
-				}
-				else {
+				} else {
 					$charge = \Stripe\Charge::create($paymentarray, array("idempotency_key" => "$description", "stripe_account" => "$account"));
 				}
 			}
@@ -1049,8 +1023,7 @@ class Stripe extends CommonObject
 			if (preg_match('/pm_/i', $source))
 			{
 				$return->message = 'Payment retreived by card status = '.$charge->status;
-			}
-			else {
+			} else {
 				if ($charge->source->type == 'card') {
 					$return->message = $charge->source->card->brand." ....".$charge->source->card->last4;
 				} elseif ($charge->source->type == 'three_d_secure') {
diff --git a/htdocs/stripe/config.php b/htdocs/stripe/config.php
index 1efe9a7f386..e6dc75c04ec 100644
--- a/htdocs/stripe/config.php
+++ b/htdocs/stripe/config.php
@@ -47,8 +47,7 @@ $stripearrayofkeys = array();
 if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))
 {
 	$stripearrayofkeys = $stripearrayofkeysbyenv[0]; // Test
-}
-else {
+} else {
 	$stripearrayofkeys = $stripearrayofkeysbyenv[1]; // Live
 }
 
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index 741921ac63c..6823c32c0b7 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -64,8 +64,7 @@ if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETP
 	$service = 'StripeTest';
 	$servicestatus = '0';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
-}
-else {
+} else {
 	$service = 'StripeLive';
 	$servicestatus = '1';
 }
@@ -113,8 +112,7 @@ if (!$rowid) {
 	if ($stripeacc)
 	{
 		$payout = \Stripe\Payout::all(array("limit" => $limit), array("stripe_account" => $stripeacc));
-	}
-	else {
+	} else {
 		$payout = \Stripe\Payout::all(array("limit" => $limit));
 	}
 
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index eb0ce7df09e..6f74d1a48c0 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -65,8 +65,7 @@ if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETP
 	$service = 'StripeTest';
 	$servicestatus = '0';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
-}
-else {
+} else {
 	$service = 'StripeLive';
 	$servicestatus = '1';
 }
@@ -112,8 +111,7 @@ if (!$rowid) {
 	if ($stripeacc)
 	{
 		$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripeacc));
-	}
-	else {
+	} else {
 		$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit));
 	}
 
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index d911e310d90..dc696dcea90 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -133,15 +133,13 @@ if (empty($reshook))
 		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else {
+		} else {
 			if ($object->id > 0) {
 				$result = $object->createFromClone($user, $socid);
 				if ($result > 0) {
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit();
-				}
-				else {
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$action = '';
 				}
@@ -219,9 +217,7 @@ if (empty($reshook))
 			if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');
 			else setEventMessages($langs->trans($object->error), null, 'errors');
 		}
-	}
-
-	elseif ($action == 'setdate_livraison' && $user->rights->supplier_proposal->creer)
+	} elseif ($action == 'setdate_livraison' && $user->rights->supplier_proposal->creer)
 	{
 		$result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']));
 		if ($result < 0)
@@ -439,13 +435,11 @@ if (empty($reshook))
 
 						header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
 						exit();
-					}
-					else {
+					} else {
 						$db->rollback();
 						$action = 'create';
 					}
-				}
-				else {
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$db->rollback();
 					$action = 'create';
@@ -515,9 +509,7 @@ if (empty($reshook))
 			$ret = $object->fetch($id); // Reload to get new records
 			$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
-	}
-
-	elseif ($action == "setabsolutediscount" && $user->rights->supplier_proposal->creer) {
+	} elseif ($action == "setabsolutediscount" && $user->rights->supplier_proposal->creer) {
 		if ($_POST["remise_id"]) {
 			if ($object->id > 0) {
 				$result = $object->insert_discount($_POST["remise_id"]);
@@ -546,8 +538,7 @@ if (empty($reshook))
 			$idprod = 0;
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		}
-		else {
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$price_ht = '';
 			$tva_tx = '';
@@ -615,13 +606,11 @@ if (empty($reshook))
 						{
 							$productsupplier->ref_supplier = '';
 						}
-					}
-					else {
+					} else {
 						$fksoctosearch = $object->thirdparty->id;
 						$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 					}
-				}
-				elseif (GETPOST('idprodfournprice', 'alpha') > 0)
+				} elseif (GETPOST('idprodfournprice', 'alpha') > 0)
 				{
 					//$qtytosearch=$qty; 	   // Just to see if a price exists for the quantity. Not used to found vat.
 					$qtytosearch = -1; // We force qty to -1 to be sure to find if the supplier price that exists
@@ -708,8 +697,7 @@ if (empty($reshook))
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'errors');
 				}
-			}
-			elseif ((GETPOST('price_ht') !== '' || GETPOST('price_ttc') !== '' || GETPOST('multicurrency_price_ht') != '') && empty($error))    // Free product.  // $price_ht is already set
+			} elseif ((GETPOST('price_ht') !== '' || GETPOST('price_ttc') !== '' || GETPOST('multicurrency_price_ht') != '') && empty($error))    // Free product.  // $price_ht is already set
 			{
 				$pu_ht = price2num($price_ht, 'MU');
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
@@ -730,8 +718,7 @@ if (empty($reshook))
 				if ($price_ht !== '')
 				{
 					$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
-				}
-				else {
+				} else {
 					$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 					$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
 				}
@@ -826,8 +813,7 @@ if (empty($reshook))
 				unset($_POST['date_endday']);
 				unset($_POST['date_endmonth']);
 				unset($_POST['date_endyear']);
-			}
-			else {
+			} else {
 				$db->rollback();
 
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -1002,9 +988,7 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	elseif ($action == 'updateline' && $user->rights->supplier_proposal->creer && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
+	} elseif ($action == 'updateline' && $user->rights->supplier_proposal->creer && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
 	}
@@ -1022,13 +1006,9 @@ if (empty($reshook))
 	// Terms of payments
 	elseif ($action == 'setconditions' && $user->rights->supplier_proposal->creer) {
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
-	}
-
-	elseif ($action == 'setremisepercent' && $user->rights->supplier_proposal->creer) {
+	} elseif ($action == 'setremisepercent' && $user->rights->supplier_proposal->creer) {
 		$result = $object->set_remise_percent($user, $_POST['remise_percent']);
-	}
-
-	elseif ($action == 'setremiseabsolue' && $user->rights->supplier_proposal->creer) {
+	} elseif ($action == 'setremiseabsolue' && $user->rights->supplier_proposal->creer) {
 		$result = $object->set_remise_absolue($user, $_POST['remise_absolue']);
 	}
 
@@ -1045,9 +1025,7 @@ if (empty($reshook))
 	// Multicurrency rate
 	elseif ($action == 'setmulticurrencyrate' && $user->rights->supplier_proposal->creer) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')));
-	}
-
-	elseif ($action == 'update_extras') {
+	} elseif ($action == 'update_extras') {
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
@@ -1129,8 +1107,7 @@ if ($action == 'create')
 			if (!empty($objectsrc->multicurrency_code)) $currency_code = $objectsrc->multicurrency_code;
 			if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx))	$currency_tx = $objectsrc->multicurrency_tx;
 		}
-	}
-	else {
+	} else {
 		$cond_reglement_id 	= $soc->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $soc->mode_reglement_supplier_id;
 		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
diff --git a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
index 3fbe3afa021..3eea10bdf13 100644
--- a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
+++ b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
@@ -160,8 +160,7 @@ class Supplierproposals extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieving supplier proposal list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 42c30c333d6..907a741c288 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -273,8 +273,7 @@ class SupplierProposal extends CommonObject
             if ($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
             {
                 $price = $prod->multiprices[$this->thirdparty->price_level];
-            }
-            else {
+            } else {
                 $price = $prod->price;
             }
 
@@ -345,19 +344,16 @@ class SupplierProposal extends CommonObject
                 {
                     $this->db->commit();
                     return 1;
-                }
-                else {
+                } else {
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else {
+            } else {
                 $this->error = $supplier_proposalligne->error;
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else {
+        } else {
             $this->db->rollback();
             return -2;
         }
@@ -426,8 +422,7 @@ class SupplierProposal extends CommonObject
         if ($price_base_type == 'HT')
         {
             $pu = $pu_ht;
-        }
-        else {
+        } else {
             $pu = $pu_ttc;
         }
 
@@ -487,15 +482,13 @@ class SupplierProposal extends CommonObject
                             dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
                             return -1;
                         }
-                    }
-                    else {
+                    } else {
                         $this->error = $prod->error;
                         $this->db->rollback();
                         return -1;
                     }
                 }
-            }
-            else {
+            } else {
                 $product_type = $type;
             }
 
@@ -615,20 +608,17 @@ class SupplierProposal extends CommonObject
                 {
                     $this->db->commit();
                     return $this->line->id;
-                }
-                else {
+                } else {
                     $this->error = $this->db->error();
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else {
+            } else {
                 $this->error = $this->line->error;
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else {
+        } else {
         	$this->error = 'BadStatusOfObjectToAddLine';
         	return -5;
         }
@@ -798,14 +788,12 @@ class SupplierProposal extends CommonObject
 
                 $this->db->commit();
                 return $result;
-            }
-            else {
+            } else {
                 $this->error = $this->db->error();
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else {
+        } else {
             dol_syslog(get_class($this)."::updateline Erreur -2 SupplierProposal en mode incompatible pour cette action");
             return -2;
         }
@@ -832,12 +820,10 @@ class SupplierProposal extends CommonObject
                 $this->update_price(1);
 
                 return 1;
-            }
-            else {
+            } else {
                 return -1;
             }
-        }
-        else {
+        } else {
             return -2;
         }
     }
@@ -1065,14 +1051,12 @@ class SupplierProposal extends CommonObject
                             if ($result < 0) { $error++; }
                             // End call triggers
                         }
-                    }
-                    else {
+                    } else {
                         $this->error = $this->db->lasterror();
                         $error++;
                     }
                 }
-            }
-            else {
+            } else {
                 $this->error = $this->db->lasterror();
                 $error++;
             }
@@ -1082,13 +1066,11 @@ class SupplierProposal extends CommonObject
                 $this->db->commit();
                 dol_syslog(get_class($this)."::create done id=".$this->id);
                 return $this->id;
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -1149,8 +1131,7 @@ class SupplierProposal extends CommonObject
             }
 
             // TODO Change product price if multi-prices
-        }
-        else {
+        } else {
             $objsoc->fetch($this->socid);
         }
 
@@ -1198,8 +1179,7 @@ class SupplierProposal extends CommonObject
         {
             $this->db->commit();
             return $this->id;
-        }
-        else {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -1390,8 +1370,7 @@ class SupplierProposal extends CommonObject
                         $i++;
                     }
                     $this->db->free($result);
-                }
-                else {
+                } else {
                     $this->error = $this->db->error();
                     return -1;
                 }
@@ -1405,8 +1384,7 @@ class SupplierProposal extends CommonObject
 
             $this->error = "Record Not Found";
             return 0;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -1441,8 +1419,7 @@ class SupplierProposal extends CommonObject
             if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
             {
                 $num = $this->getNextNumRef($soc);
-            }
-            else {
+            } else {
                 $num = $this->ref;
             }
             $this->newref = dol_sanitizeFileName($num);
@@ -1515,13 +1492,11 @@ class SupplierProposal extends CommonObject
 
                 $this->db->commit();
                 return 1;
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else {
+        } else {
             dol_syslog("You don't have permission to validate supplier proposal", LOG_WARNING);
             return -2;
         }
@@ -1548,8 +1523,7 @@ class SupplierProposal extends CommonObject
             {
                 $this->date_livraison = $date_livraison;
                 return 1;
-            }
-            else {
+            } else {
                 $this->error = $this->db->error();
                 dol_syslog(get_class($this)."::set_date_livraison Erreur SQL");
                 return -1;
@@ -1582,8 +1556,7 @@ class SupplierProposal extends CommonObject
                 $this->remise_percent = $remise;
                 $this->update_price(1);
                 return 1;
-            }
-            else {
+            } else {
                 $this->error = $this->db->error();
                 return -1;
             }
@@ -1617,8 +1590,7 @@ class SupplierProposal extends CommonObject
                 $this->remise_absolue = $remise;
                 $this->update_price(1);
                 return 1;
-            }
-            else {
+            } else {
                 $this->error = $this->db->error();
                 return -1;
             }
@@ -1680,8 +1652,7 @@ class SupplierProposal extends CommonObject
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -1753,13 +1724,11 @@ class SupplierProposal extends CommonObject
             {
                 $this->db->commit();
                 return 1;
-            }
-            else {
+            } else {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->db->lasterror();
             $this->db->rollback();
@@ -1861,8 +1830,7 @@ class SupplierProposal extends CommonObject
                     $values[] = $product->multicurrency_subprice;
                     $values[] = $product->multicurrency_total_ht;
                     $values[] = $multicurrency->rate->rate;
-                }
-                else {
+                } else {
                     for ($i = 0; $i < 5; $i++) $values[] = 'NULL';
                 }
             }
@@ -1926,8 +1894,7 @@ class SupplierProposal extends CommonObject
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else {
+        } else {
             return -1;
         }
     }
@@ -1987,12 +1954,10 @@ class SupplierProposal extends CommonObject
                     if ($shortlist == 1)
                     {
                         $ga[$obj->supplier_proposalid] = $obj->ref;
-                    }
-                    elseif ($shortlist == 2)
+                    } elseif ($shortlist == 2)
                     {
                         $ga[$obj->supplier_proposalid] = $obj->ref.' ('.$obj->name.')';
-                    }
-                    else {
+                    } else {
                         $ga[$i]['id'] = $obj->supplier_proposalid;
                         $ga[$i]['ref'] 	= $obj->ref;
                         $ga[$i]['name'] = $obj->name;
@@ -2002,8 +1967,7 @@ class SupplierProposal extends CommonObject
                 }
             }
             return $ga;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -2099,26 +2063,22 @@ class SupplierProposal extends CommonObject
                         dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG);
                         $this->db->commit();
                         return 1;
-                    }
-                    else {
+                    } else {
                         $this->error = $this->db->lasterror();
                         $this->db->rollback();
                         return 0;
                     }
-                }
-                else {
+                } else {
                     $this->error = $this->db->lasterror();
                     $this->db->rollback();
                     return -3;
                 }
-            }
-            else {
+            } else {
                 $this->error = $this->db->lasterror();
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -2171,8 +2131,7 @@ class SupplierProposal extends CommonObject
                 }
             }
             $this->db->free($result);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -2301,8 +2260,7 @@ class SupplierProposal extends CommonObject
                 // if ($mode == 'signed' && ! count($this->FactureListeArray($obj->rowid))) $this->nbtodolate++;
             }
             return $response;
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -2369,8 +2327,7 @@ class SupplierProposal extends CommonObject
                 $line->total_ttc = 59.8;
                 $line->total_tva = 9.8;
                 $line->remise_percent = 50;
-            }
-            else {
+            } else {
                 $line->total_ht = 100;
                 $line->total_ttc = 119.6;
                 $line->total_tva = 19.6;
@@ -2428,8 +2385,7 @@ class SupplierProposal extends CommonObject
             }
             $this->db->free($resql);
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->lasterror();
             return -1;
@@ -2478,13 +2434,11 @@ class SupplierProposal extends CommonObject
             if ($numref != "")
             {
                 return $numref;
-            }
-            else {
+            } else {
                 $this->error = $obj->error;
                 return "";
             }
-        }
-        else {
+        } else {
             $langs->load("errors");
             print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("SupplierProposal"));
             return "";
@@ -2654,8 +2608,7 @@ class SupplierProposal extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -2949,8 +2902,7 @@ class SupplierProposalLine extends CommonObjectLine
             $this->fk_unit = $objp->fk_unit;
 
             $this->db->free($result);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -2995,8 +2947,7 @@ class SupplierProposalLine extends CommonObjectLine
             if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
             {
                 return $result;
-            }
-            else {
+            } else {
                 $this->pa_ht = $result;
             }
         }
@@ -3082,8 +3033,7 @@ class SupplierProposalLine extends CommonObjectLine
 
             $this->db->commit();
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->error()." sql=".$sql;
             $this->db->rollback();
             return -1;
@@ -3129,8 +3079,7 @@ class SupplierProposalLine extends CommonObjectLine
             $this->db->commit();
 
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->error()." sql=".$sql;
             $this->db->rollback();
             return -1;
@@ -3175,8 +3124,7 @@ class SupplierProposalLine extends CommonObjectLine
             if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
             {
                 return $result;
-            }
-            else {
+            } else {
                 $this->pa_ht = $result;
             }
         }
@@ -3250,8 +3198,7 @@ class SupplierProposalLine extends CommonObjectLine
 
             $this->db->commit();
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
@@ -3284,8 +3231,7 @@ class SupplierProposalLine extends CommonObjectLine
         {
             $this->db->commit();
             return 1;
-        }
-        else {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index 8f606ad4f67..4bd027299fa 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -65,14 +65,12 @@ if ($action == 'addcontact' && $permissiontoedit)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -84,8 +82,7 @@ elseif ($action == 'swapstatut' && $permissiontoedit)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -100,8 +97,7 @@ elseif ($action == 'deletecontact' && $permissiontoedit)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -191,8 +187,7 @@ if ($id > 0 || !empty($ref))
 
 		// Contacts lines
 		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
-	}
-	else {
+	} else {
 		// Contact not found
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 3096e6fbbdb..5b58c7de461 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -166,8 +166,7 @@ if ($object->id > 0)
 	$permtoedit = $user->rights->supplier_proposal->creer;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index 7a575007be2..6ba425f323a 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -162,8 +162,7 @@ if ($resql)
 
     print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
     print "</table></div><br>";
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -293,8 +292,7 @@ if ($resql)
 		}
 	}
 	print "</table></div><br>";
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 /*
@@ -375,15 +373,13 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 			if ($num > $nbofloop)
 			{
 				print '<tr class="liste_total"><td colspan="5">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
+			} elseif ($total > 0)
 			{
 				print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total").'</td><td class="right">'.price($total)."</td><td>&nbsp;</td></tr>";
 			}
 			print "</table></div><br>";
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index eba1db92a94..d0ea3a2b625 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -358,8 +358,7 @@ if ($resql)
 		$soc = new Societe($db);
 		$soc->fetch($socid);
 		$title = $langs->trans('ListOfSupplierProposals').' - '.$soc->name;
-	}
-	else {
+	} else {
 		$title = $langs->trans('ListOfSupplierProposals');
 	}
 
@@ -949,8 +948,7 @@ if ($resql)
 	$delallowed = $user->rights->supplier_proposal->creer;
 
 	print $formfile->showdocuments('massfilesarea_supplier_proposal', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index 3f09ac541d3..43077495238 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -110,12 +110,10 @@ if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) >
 					$includeconferror = 'ErrorBadValueForDolibarrMainDBType';
 				}
 			}
-		}
-		else {
+		} else {
 			$includeconferror = 'ErrorBadValueForDolibarrMainDocumentRoot';
 		}
-	}
-	else {
+	} else {
 		$includeconferror = 'ErrorBadFormatForConfFile';
 	}
 }
diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index a33f337cc96..81eaf319295 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -52,8 +52,7 @@ if (GETPOST('action', 'alpha') == 'set')
     {
         $db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         $db->rollback();
 	    setEventMessages($langs->trans("Error"), null, 'errors');
     }
diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php
index f0410f812d9..a9a4b945d0d 100644
--- a/htdocs/takepos/admin/orderprinters.php
+++ b/htdocs/takepos/admin/orderprinters.php
@@ -72,15 +72,7 @@ if ($action == "SavePrinter2") {
 $categstatic = new Categorie($db);
 $form = new Form($db);
 
-if ($type == Categorie::TYPE_PRODUCT) { $title = $langs->trans("ProductsCategoriesArea"); $typetext = 'product'; }
-elseif ($type == Categorie::TYPE_SUPPLIER) { $title = $langs->trans("SuppliersCategoriesArea"); $typetext = 'supplier'; }
-elseif ($type == Categorie::TYPE_CUSTOMER) { $title = $langs->trans("CustomersCategoriesArea"); $typetext = 'customer'; }
-elseif ($type == Categorie::TYPE_MEMBER) { $title = $langs->trans("MembersCategoriesArea"); $typetext = 'member'; }
-elseif ($type == Categorie::TYPE_CONTACT) { $title = $langs->trans("ContactsCategoriesArea"); $typetext = 'contact'; }
-elseif ($type == Categorie::TYPE_ACCOUNT) { $title = $langs->trans("AccountsCategoriesArea"); $typetext = 'bank_account'; }
-elseif ($type == Categorie::TYPE_PROJECT) { $title = $langs->trans("ProjectsCategoriesArea"); $typetext = 'project'; }
-elseif ($type == Categorie::TYPE_USER) { $title = $langs->trans("UsersCategoriesArea"); $typetext = 'user'; }
-else { $title = $langs->trans("CategoriesArea"); $typetext = 'unknown'; }
+if ($type == Categorie::TYPE_PRODUCT) { $title = $langs->trans("ProductsCategoriesArea"); $typetext = 'product'; } elseif ($type == Categorie::TYPE_SUPPLIER) { $title = $langs->trans("SuppliersCategoriesArea"); $typetext = 'supplier'; } elseif ($type == Categorie::TYPE_CUSTOMER) { $title = $langs->trans("CustomersCategoriesArea"); $typetext = 'customer'; } elseif ($type == Categorie::TYPE_MEMBER) { $title = $langs->trans("MembersCategoriesArea"); $typetext = 'member'; } elseif ($type == Categorie::TYPE_CONTACT) { $title = $langs->trans("ContactsCategoriesArea"); $typetext = 'contact'; } elseif ($type == Categorie::TYPE_ACCOUNT) { $title = $langs->trans("AccountsCategoriesArea"); $typetext = 'bank_account'; } elseif ($type == Categorie::TYPE_PROJECT) { $title = $langs->trans("ProjectsCategoriesArea"); $typetext = 'project'; } elseif ($type == Categorie::TYPE_USER) { $title = $langs->trans("UsersCategoriesArea"); $typetext = 'user'; } else { $title = $langs->trans("CategoriesArea"); $typetext = 'unknown'; }
 
 $arrayofjs = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
 $arrayofcss = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
@@ -146,8 +138,7 @@ if ($nbofentries > 0)
 		if ($row["fk_menu"] == 0) print '<input type="checkbox" name="printer1[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
 	}
 	print '</td></tr>';
-}
-else {
+} else {
 	print '<tr class="pair">';
 	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
 	print '<td valign="middle">';
@@ -175,8 +166,7 @@ if ($nbofentries > 0)
 		if ($row["fk_menu"] == 0) print '<input type="checkbox" name="printer2[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
 	}
 	print '</td></tr>';
-}
-else {
+} else {
 	print '<tr class="pair">';
 	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
 	print '<td valign="middle">';
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 7ed4f2786b2..44fdf5c89f7 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -57,13 +57,11 @@ if (GETPOST('action', 'alpha') == 'set')
     {
         $db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         $db->rollback();
 	    setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-elseif (GETPOST('action', 'alpha') == 'setmethod')
+} elseif (GETPOST('action', 'alpha') == 'setmethod')
 {
     dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity);
 }
@@ -103,8 +101,7 @@ print '</td><td class="center">';
 if ($conf->global->TAKEPOS_PRINT_METHOD == "browser")
 {
     print img_picto($langs->trans("Activated"), 'switch_on');
-}
-else {
+} else {
     print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&value=browser">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 }
 print "</td></tr>\n";
@@ -119,8 +116,7 @@ if ($conf->receiptprinter->enabled) {
 	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter")
 	{
 		print img_picto($langs->trans("Activated"), 'switch_on');
-	}
-	else {
+	} else {
 		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&value=receiptprinter">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	}
 	print "</td></tr>\n";
@@ -135,8 +131,7 @@ print '</td><td class="center">';
 if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector")
 {
     print img_picto($langs->trans("Activated"), 'switch_on');
-}
-else {
+} else {
     print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&value=takeposconnector">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 }
 print "</td></tr>\n";
@@ -171,8 +166,7 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "browser" || $conf->global->TAKEPOS_P
 	if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 	{
 		print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-	}
-	else {
+	} else {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
 		print $doleditor->Create();
@@ -186,8 +180,7 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "browser" || $conf->global->TAKEPOS_P
 	if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 	{
 		print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-	}
-	else {
+	} else {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
 		print $doleditor->Create();
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index f4e86677a1b..b03ae939fad 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -96,8 +96,7 @@ if ($action == 'set')
  	if (!$error)
     {
         $db->commit();
-    }
-    else {
+    } else {
         $db->rollback();
     }
 } elseif ($action == 'updateMask') {
@@ -194,8 +193,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->TAKEPOS_REF_ADDON == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else {
+						} else {
 							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setrefmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index e2996ad763d..db85e96fa01 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -102,8 +102,7 @@ if (GETPOST('action', 'alpha') == 'set')
     {
         $db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
+    } else {
         $db->rollback();
 	    setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -186,8 +185,7 @@ if (!empty($conf->stock->enabled))
 	print '<td>';
 	if (empty($conf->productbatch->enabled) || !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK)) {
 	    print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK'.$terminal, $conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}, 1);
-	}
-	else {
+	} else {
 	    if (!$conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}) {
 	        $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK".$terminal, 1, 'chaine', 0, '', $conf->entity);
 	    }
@@ -205,8 +203,7 @@ if (!empty($conf->stock->enabled))
 	{
 		print $formproduct->selectWarehouses($conf->global->{'CASHDESK_ID_WAREHOUSE'.$terminal}, 'CASHDESK_ID_WAREHOUSE'.$terminal, '', 1, $disabled);
 		print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"]).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
-	}
-	else {
+	} else {
 		print '<span class="opacitymedium">'.$langs->trans("StockDecreaseForPointOfSaleDisabled").'</span>';
 	}
 	print '</td></tr>';
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index 75c40e6607e..7c4471b0ec8 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -64,12 +64,10 @@ if ($action == 'getProducts') {
 	    	}
 	    }
     	echo json_encode($prods);
-    }
-    else {
+    } else {
     	echo 'Failed to load category with id='.$category;
     }
-}
-elseif ($action == 'search' && $term != '') {
+} elseif ($action == 'search' && $term != '') {
 	// Define $filteroncategids, the filter on category ID if there is a Root category defined.
 	$filteroncategids = '';
 	if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) {	// A root category is defined, we must filter on products inside this category tree
@@ -108,8 +106,7 @@ elseif ($action == 'search' && $term != '') {
 	    	);
 	    }
 	    echo json_encode($rows);
-	}
-	else {
+	} else {
 		echo 'Failed to search product : '.$db->lasterror();
 	}
 } elseif ($action == "opendrawer" && $term != '') {
diff --git a/htdocs/takepos/genimg/index.php b/htdocs/takepos/genimg/index.php
index 8a752a5d3a5..f549c0ec7bd 100644
--- a/htdocs/takepos/genimg/index.php
+++ b/htdocs/takepos/genimg/index.php
@@ -55,8 +55,7 @@ if ($query == "cat")
 		if ($obj['photo_vignette'])
 		{
 			$filename = $obj['photo_vignette'];
-		}
-		else {
+		} else {
 			$filename = $obj['photo'];
 		}
 		$file = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$filename);
@@ -64,8 +63,7 @@ if ($query == "cat")
 		exit;
 	}
 	header('Location: ../../public/theme/common/nophoto.png');
-}
-elseif ($query == "pro")
+} elseif ($query == "pro")
 {
 	require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
 
@@ -77,8 +75,7 @@ elseif ($query == "pro")
 	$file = array_pop($match);
 	if ($file == "") header('Location: ../../public/theme/common/nophoto.png');
 	else header('Location: '.$file.'&cache=1&publictakepos=1&modulepart=product');
-}
-else {
+} else {
     // TODO We don't need this. Size of image must be defined on HTML page, image must NOT be resize when downloaded.
 
 	// The file
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 94cc526434e..4091e5fff90 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -134,8 +134,7 @@ foreach ($categories as $key => $categorycursor)
     if ($categorycursor['level'] == $levelofmaincategories)
     {
         $maincategories[$key] = $categorycursor;
-    }
-    else {
+    } else {
         $subcategories[$key] = $categorycursor;
     }
 }
@@ -856,8 +855,7 @@ $r = 0;
 if (empty($conf->global->TAKEPOS_BAR_RESTAURANT))
 {
     $menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("New").'</div>', 'action'=>'New();');
-}
-else {
+} else {
     // BAR RESTAURANT specific menu
     $menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("Place").'</div>', 'action'=>'Floors();');
 }
@@ -951,8 +949,7 @@ if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
         	{
         		echo '<button style="'.$menu['style'].'" type="button" id="actionnext" class="actionbutton" onclick="MoreActions('.count($menus).');">'.$langs->trans("Next").'</button>';
         		echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
-        	}
-            elseif ($i > 12) echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
+        	} elseif ($i > 12) echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
             else echo '<button style="'.$menu['style'].'" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
         }
 
@@ -981,12 +978,10 @@ if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 				if ($count == ($MAXCATEG - 2)) {
 				    //echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="catimg'.$count.'" />';
 				    echo '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em;"></span>';
-				}
-				elseif ($count == ($MAXCATEG - 1)) {
+				} elseif ($count == ($MAXCATEG - 1)) {
 				    //echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="catimg'.$count.'" />';
 				    echo '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';
-				}
-				else {
+				} else {
 				    echo '<img class="imgwrapper" height="100%" id="catimg'.$count.'" />';
 				}
 				?>
@@ -1015,12 +1010,10 @@ if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
     				if ($count == ($MAXPRODUCT - 2)) {
     				    //echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="proimg'.$count.'" />';
     					print '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em;"></span>';
-    				}
-    				elseif ($count == ($MAXPRODUCT - 1)) {
+    				} elseif ($count == ($MAXPRODUCT - 1)) {
     				    //echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="proimg'.$count.'" />';
     					print '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';
-    				}
-    				else {
+    				} else {
     					print '<div class="" id="proprice'.$count.'"></div>';
     					print '<img class="imgwrapper" height="100%" title="" id="proimg'.$count.'">';
     				}
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 274e47a1185..904f2ac7e4c 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -116,8 +116,7 @@ $invoice = new Facture($db);
 if ($invoiceid > 0)
 {
     $ret = $invoice->fetch($invoiceid);
-}
-else {
+} else {
     $ret = $invoice->fetch('', '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')');
 }
 if ($ret > 0)
@@ -186,13 +185,11 @@ if ($action == 'valid' && $user->rights->facture->creer)
 			dol_syslog("Sale already validated");
 			dol_htmloutput_errors($langs->trans("InvoiceIsAlreadyValidated", "TakePos"), null, 1);
 		}
-	}
-	elseif (count($invoice->lines) == 0)
+	} elseif (count($invoice->lines) == 0)
 	{
 		dol_syslog("Sale without lines");
 		dol_htmloutput_errors($langs->trans("NoLinesToBill", "TakePos"), null, 1);
-	}
-	elseif (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1")
+	} elseif (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1")
 	{
 		$savconst = $conf->global->STOCK_CALCULATE_ON_BILL;
 		$conf->global->STOCK_CALCULATE_ON_BILL = 1;
@@ -207,8 +204,7 @@ if ($action == 'valid' && $user->rights->facture->creer)
 		$res = $invoice->validate($user, '', $conf->global->$constantforkey, 0, $batch_rule);
 
 		$conf->global->STOCK_CALCULATE_ON_BILL = $savconst;
-	}
-	else {
+	} else {
 	    $res = $invoice->validate($user);
 	}
 
@@ -270,8 +266,7 @@ if (($action == "addline" || $action == "freezone") && $placeid == 0)
 	{
 		$langs->load('errors');
 		dol_htmloutput_errors($langs->trans("ErrorModuleSetupNotComplete", "TakePos"), null, 1);
-	}
-	else {
+	} else {
 		$placeid = $invoice->create($user);
 		if ($placeid < 0)
 		{
@@ -375,8 +370,7 @@ if ($action == "deleteline") {
     if ($idline > 0 and $placeid > 0) { // If invoice exists and line selected. To avoid errors if deleted from another device or no line selected.
         $invoice->deleteline($idline);
         $invoice->fetch($placeid);
-    }
-    elseif ($placeid > 0) {             // If invoice exists but no line selected, proceed to delete last line.
+    } elseif ($placeid > 0) {             // If invoice exists but no line selected, proceed to delete last line.
         $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facturedet where fk_facture='".$placeid."' order by rowid DESC";
         $resql = $db->query($sql);
         $row = $db->fetch_array($resql);
@@ -415,8 +409,7 @@ if ($action == "delete") {
             if ($resql1 && $resql2 && $resql3)
             {
             	$db->commit();
-            }
-            else {
+            } else {
             	$db->rollback();
             }
 
@@ -456,8 +449,7 @@ if ($action == "updateprice")
 			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($line->remise_percent) / 100) < price2num($price_min))))
 			{
 				echo $langs->trans("CantBeLessThanMinPrice");
-			}
-			else $result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+			} else $result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
         }
     }
     $invoice->fetch($placeid);
@@ -481,8 +473,7 @@ if ($action == "updatereduction")
 			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($line->multicurrency_subprice) * (1 - price2num($number) / 100) < price2num($price_min))))
 			{
 				echo $langs->trans("CantBeLessThanMinPrice");
-			}
-			else $result = $invoice->updateline($line->id, $line->desc, $line->multicurrency_subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+			} else $result = $invoice->updateline($line->id, $line->desc, $line->multicurrency_subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
 		}
     }
 	$invoice->fetch($placeid);
@@ -574,8 +565,7 @@ if ($action == "valid" || $action == "history")
     if ($remaintopay > 0)
     {
         $sectionwithinvoicelink .= $langs->trans('RemainToPay').': <span class="amountremaintopay" style="font-size: unset">'.price($remaintopay, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
-    }
-    else {
+    } else {
         if ($invoice->paye) $sectionwithinvoicelink .= '<span class="amountpaymentcomplete" style="font-size: unset">'.$langs->trans("Paid").'</span>';
         else $sectionwithinvoicelink .= $langs->trans('BillShortStatusValidated');
     }
@@ -806,13 +796,11 @@ $( document ).ready(function() {
 				if ($adh->hasDelay()) {
 					$s .= " ".img_warning($langs->trans("Late"));
 				}
-			}
-			else {
+			} else {
 				$s .= '<br>'.$langs->trans("SubscriptionNotReceived");
 				if ($adh->statut > 0) $s .= " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
 			}
-		}
-		else {
+		} else {
 			$s .= '<br>'.$langs->trans("ThirdpartyNotLinkedToMember");
 		}
 		$s .= '</span>';
@@ -958,8 +946,7 @@ if ($placeid > 0)
 					if ($firstline != $line->desc)
 					{
 						$htmlsupplements[$line->fk_parent_line] .= $form->textwithpicto(dolGetFirstLineOfText($line->desc), $line->desc);
-					}
-					else {
+					} else {
 						$htmlsupplements[$line->fk_parent_line] .= $line->desc;
 					}
 				}
@@ -1008,8 +995,7 @@ if ($placeid > 0)
 	                if ($firstline != $line->desc)
 	                {
 	                    $htmlforlines .= $form->textwithpicto(dolGetFirstLineOfText($line->desc), $line->desc);
-	                }
-	                else {
+	                } else {
 	                    $htmlforlines .= $line->desc;
 	                }
 	            }
@@ -1036,12 +1022,10 @@ if ($placeid > 0)
 
             print $htmlforlines;
         }
-    }
-    else {
+    } else {
         print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td></tr>';
     }
-}
-else {      // No invoice generated yet
+} else {      // No invoice generated yet
     print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td></tr>';
 }
 
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index f370387d72e..95bb9118b48 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -51,8 +51,7 @@ $invoice = new Facture($db);
 if ($invoiceid > 0)
 {
     $invoice->fetch($invoiceid);
-}
-else {
+} else {
     $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
     $resql = $db->query($sql);
     $obj = $db->fetch_object($resql);
@@ -63,8 +62,7 @@ else {
     if (!$invoiceid)
     {
         $invoiceid = 0; // Invoice does not exist yet
-    }
-    else {
+    } else {
         $invoice->fetch($invoiceid);
     }
 }
diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 1cad9a9ede4..427f2e92ab1 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -41,8 +41,7 @@ if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 	// Decode place if it is an order from customer phone
 	$key = GETPOST('key');
 	$place = dol_decode($key);
-}
-else $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
+} else $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
 $action = GETPOST('action', 'alpha');
 $setterminal = GETPOST('setterminal', 'int');
 $idproduct = GETPOST('idproduct', 'int');
@@ -82,8 +81,7 @@ if ($action == "productinfo") {
 	print "<br><b>".price($prod->price_ttc, 1, $langs, 1, -1, -1, $conf->currency)."</b>";
 	print '<br>';
 	print '<button type="button" class="publicphonebutton2" onclick="AddProductConfirm(place, '.$idproduct.');">'.$langs->trans('Add').'</button>';
-}
-elseif ($action == "editline") {
+} elseif ($action == "editline") {
 	$placeid = GETPOST('placeid', 'int');
 	$selectedline = GETPOST('selectedline', 'int');
 	$invoice = new Facture($db);
@@ -104,8 +102,7 @@ elseif ($action == "editline") {
 			print '<button type="button" class="publicphonebutton2" onclick="SetNote(place, '.$selectedline.');">'.$langs->trans('Note').'</button>';
         }
     }
-}
-else {
+} else {
 	?>
 <script language="javascript">
 	<?php
@@ -135,8 +132,7 @@ else {
     	if ($categorycursor['level'] == $levelofmaincategories)
     	{
         	$maincategories[$key] = $categorycursor;
-    	}
-    	else {
+    	} else {
         	$subcategories[$key] = $categorycursor;
     	}
 	}
@@ -170,8 +166,7 @@ function LoadPlace(placeid){
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&place="+place, function() {
 		});';
-	}
-	else {
+	} else {
 		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&place="+place, function() {
 		});';
 	}
@@ -186,8 +181,7 @@ function AddProduct(placeid, productid){
 		print 'place=placeid;
 		$("#phonediv1").load("auto_order.php?action=productinfo&place="+place+"&idproduct="+productid, function() {
 		});';
-	}
-	else {
+	} else {
 		print 'AddProductConfirm(placeid, productid);';
 	}
 	?>
@@ -199,8 +193,7 @@ function AddProductConfirm(placeid, productid){
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
 		});';
-	}
-	else {
+	} else {
 		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
 		});';
 	}
@@ -231,8 +224,7 @@ function LoadCats(){
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv1").load("auto_order.php?mobilepage=cats&place="+place, function() {
 		});';
-	}
-	else {
+	} else {
 		echo '$("#phonediv1").load("invoice.php?mobilepage=cats&place="+place, function() {
 		});';
 	}
@@ -245,8 +237,7 @@ function LoadProducts(idcat){
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv1").load("auto_order.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
 		});';
-	}
-	else {
+	} else {
 		echo '$("#phonediv1").load("invoice.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
 		});';
 	}
@@ -264,8 +255,7 @@ function TakeposPrintingOrder(){
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv2").load("auto_order.php?action=order&place="+place, function() {
 		});';
-	}
-	else {
+	} else {
 		echo '$("#phonediv2").load("invoice.php?action=order&place="+place, function() {
 		});';
 	}
@@ -298,8 +288,7 @@ function CheckPlease(){
 			print '<button type="button" class="phonebutton" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 3)).'</button>';
 			print '<button type="button" class="phonebutton" onclick="TakeposPrintingOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 3)).'</button>';
 			print '<button type="button" class="phonebutton" onclick="Exit();">'.strtoupper(substr($langs->trans('Logout'), 0, 3)).'</button>';
-		}
-		else {
+		} else {
 			print '<button type="button" class="publicphonebutton" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 5)).'</button>';
 			print '<button type="button" class="publicphonebutton" onclick="TakeposPrintingOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 5)).'</button>';
 			print '<button type="button" class="publicphonebutton" onclick="CheckPlease();">'.strtoupper(substr($langs->trans('Payment'), 0, 5)).'</button>';
diff --git a/htdocs/takepos/reduction.php b/htdocs/takepos/reduction.php
index 4d11663ea85..e882957ad14 100644
--- a/htdocs/takepos/reduction.php
+++ b/htdocs/takepos/reduction.php
@@ -51,8 +51,7 @@ $invoice = new Facture($db);
 if ($invoiceid > 0)
 {
     $invoice->fetch($invoiceid);
-}
-else {
+} else {
     $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
     $resql = $db->query($sql);
     $obj = $db->fetch_object($resql);
@@ -63,8 +62,7 @@ else {
     if (!$invoiceid)
     {
         $invoiceid = 0; // Invoice does not exist yet
-    }
-    else {
+    } else {
         $invoice->fetch($invoiceid);
     }
 }
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index dc25fa4b44a..2d30ed9c766 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -2119,8 +2119,7 @@ a.tmenuimage:hover{
                 print 'div.mainmenu.'.$val.'::before {
                     content: "\f249";
                 }'."\n";
-            }
-            else {
+            } else {
                 print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
                 $url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1);
                 print "div.mainmenu.".$val." {\n";
@@ -2128,8 +2127,7 @@ a.tmenuimage:hover{
                 print "}\n";
             }
             $generic++;
-        }
-        else {
+        } else {
             print "div.mainmenu.".$val." {\n";
             print "	background-image: url(".$url.");\n";
             print "}\n";
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 927d29e1919..f486c10ef50 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -154,24 +154,20 @@ else $colortextbackhmenu = '000000';
 $colorbackvmenu1 = join(',', colorStringToArray($colorbackvmenu1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbackvmenu1);
 $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) { $colortextbackvmenu = 'FFFFFF'; }
-else { $colortextbackvmenu = '000000'; }
+if ($tmpval <= 460) { $colortextbackvmenu = 'FFFFFF'; } else { $colortextbackvmenu = '000000'; }
 
 $colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbacktitle1);
 if ($colortexttitle == '')
 {
     $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
-    if ($tmpval <= 460) { $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888'; }
-    else { $colortexttitle = '000000'; $colorshadowtitle = 'FFFFFF'; }
-}
-else $colorshadowtitle = '888888';
+    if ($tmpval <= 460) { $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888'; } else { $colortexttitle = '000000'; $colorshadowtitle = 'FFFFFF'; }
+} else $colorshadowtitle = '888888';
 
 $colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbacktabcard1);
 $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) { $colortextbacktab = 'FFFFFF'; }
-else { $colortextbacktab = '000000'; }
+if ($tmpval <= 460) { $colortextbacktab = 'FFFFFF'; } else { $colortextbacktab = '000000'; }
 
 
 // Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 6a4f1ebf7e1..d9b2011991d 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -40,8 +40,7 @@ if (!defined('ISLOADEDBYSTEELSHEET'))	// File is run after an include of a php p
 		if ($conf->global->MAIN_OPTIMIZEFORCOLORBLIND == 'flashy')
 		{
 			$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250, 190, 30), array(221, 75, 57), array(0, 166, 90), array(140, 140, 220), array(190, 120, 120), array(190, 190, 100), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
-		}
-		else {
+		} else {
 			// for now we use the same configuration for all types of color blind
 			$theme_datacolor = array(array(248, 220, 1), array(9, 85, 187), array(42, 208, 255), array(0, 0, 0), array(169, 169, 169), array(253, 102, 136), array(120, 154, 190), array(146, 146, 55), array(0, 52, 251), array(196, 226, 161), array(222, 160, 41), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
 		}
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index a7b759cfea0..163b10208ff 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -157,24 +157,20 @@ else $colortextbackhmenu = '000000';
 $colorbackvmenu1 = join(',', colorStringToArray($colorbackvmenu1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbackvmenu1);
 $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) { $colortextbackvmenu = 'FFFFFF'; }
-else { $colortextbackvmenu = '000000'; }
+if ($tmpval <= 460) { $colortextbackvmenu = 'FFFFFF'; } else { $colortextbackvmenu = '000000'; }
 
 $colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbacktitle1);
 if ($colortexttitle == '')
 {
 	$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
-	if ($tmpval <= 460) { $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888'; }
-	else { $colortexttitle = '101010'; $colorshadowtitle = 'FFFFFF'; }
-}
-else $colorshadowtitle = '888888';
+	if ($tmpval <= 460) { $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888'; } else { $colortexttitle = '101010'; $colorshadowtitle = 'FFFFFF'; }
+} else $colorshadowtitle = '888888';
 
 $colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbacktabcard1);
 $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) { $colortextbacktab = 'FFFFFF'; }
-else { $colortextbacktab = '111111'; }
+if ($tmpval <= 460) { $colortextbacktab = 'FFFFFF'; } else { $colortextbacktab = '111111'; }
 
 // Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
 $colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1));
@@ -2147,8 +2143,7 @@ div.mainmenu.website {
 		        print 'div.mainmenu.'.$val.'::before {
 	                    content: "\f249";
 	                }';
-		    }
-		    else {
+		    } else {
 		    	print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one. */\n";
 		    	print "/* Overwrite this definition in your own css with a different content to use your own font awesome icon. */\n";
 		        $url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1);
@@ -2157,8 +2152,7 @@ div.mainmenu.website {
 		        print "}\n";
 	    	}
 	    	$generic++;
-		}
-		else {
+		} else {
 			print "div.mainmenu.".$val." {\n";
 			print "	background-image: url(".$url.");\n";
 			print "}\n";
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index 7d492bcae6a..fdf62ffb1bf 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -36,8 +36,7 @@ if (!defined('ISLOADEDBYSTEELSHEET'))	// File is run after an include of a php p
 		if ($conf->global->MAIN_OPTIMIZEFORCOLORBLIND == 'flashy')
 		{
 			$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250, 190, 30), array(221, 75, 57), array(0, 166, 90), array(140, 140, 220), array(190, 120, 120), array(190, 190, 100), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
-		}
-		else {
+		} else {
 			// for now we use the same configuration for all types of color blind
 			$theme_datacolor = array(array(248, 220, 1), array(9, 85, 187), array(42, 208, 255), array(0, 0, 0), array(169, 169, 169), array(253, 102, 136), array(120, 154, 190), array(146, 146, 55), array(0, 52, 251), array(196, 226, 161), array(222, 160, 41), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
 		}
diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index 2fd3b2643e0..3d1b89e6c65 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -56,8 +56,7 @@ if (GETPOST('actioncode', 'array'))
 {
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
-}
-else {
+} else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 2e61ce15045..132280d6d40 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -986,8 +986,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 		print '<td>';
 		if (GETPOST('set', 'alpha') == 'properties' && $user->rights->ticket->write) {
 			print '<input class="button" type="submit" name="btn_update_ticket_prop" value="'.$langs->trans("Modify").'" />';
-		}
-		else {
+		} else {
 			//    Button to edit Properties
 			if ($object->fk_statut < 5 && $user->rights->ticket->write) {
 				print '<a class="editfielda" href="card.php?track_id='.$object->track_id.'&action=view&set=properties">'.img_edit($langs->trans('Modify')).'</a>';
@@ -1206,8 +1205,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 				}
 			}
 			print '</div>'."\n";
-		}
-		else {
+		} else {
 			print '<br>';
 		}
 
diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php
index f701fabc2c0..043eed1d142 100644
--- a/htdocs/ticket/class/actions_ticket.class.php
+++ b/htdocs/ticket/class/actions_ticket.class.php
@@ -396,8 +396,7 @@ class ActionsTicket
 				if ($status == 1)
 				{
 					$urlforbutton = $_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'&action=mark_ticket_read'; // To set as read, we use a dedicated action
-				}
-				else {
+				} else {
 					$urlforbutton = $_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'&action=set_status&new_status='.$status;
 				}
 
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index 94b94b33339..f06ec59aa5d 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -114,8 +114,7 @@ class Tickets extends DolibarrApi
     {
         try {
             return $this->getCommon(0, '', $ref);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
                throw $e;
         }
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 0f6994d6a03..2a01ce2d5e8 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -541,8 +541,7 @@ class Ticket extends CommonObject
 
 				$this->db->free($resql);
 				return 1;
-			}
-			else {
+			} else {
 				return 0;
 			}
 		} else {
@@ -1181,29 +1180,21 @@ class Ticket extends CommonObject
 
 		if ($status == self::STATUS_NOT_READ) {
 			$statusType = 'status0';
-		}
-		elseif ($status == self::STATUS_READ) {
+		} elseif ($status == self::STATUS_READ) {
 			$statusType = 'status1';
-		}
-		elseif ($status == self::STATUS_ASSIGNED) {
+		} elseif ($status == self::STATUS_ASSIGNED) {
 			$statusType = 'status3';
-		}
-		elseif ($status == self::STATUS_IN_PROGRESS) {
+		} elseif ($status == self::STATUS_IN_PROGRESS) {
 			$statusType = 'status4';
-		}
-		elseif ($status == self::STATUS_WAITING) {
+		} elseif ($status == self::STATUS_WAITING) {
 			$statusType = 'status3';
-		}
-		elseif ($status == self::STATUS_NEED_MORE_INFO) {
+		} elseif ($status == self::STATUS_NEED_MORE_INFO) {
 			$statusType = 'status9';
-		}
-		elseif ($status == self::STATUS_CANCELED) {
+		} elseif ($status == self::STATUS_CANCELED) {
 			$statusType = 'status9';
-		}
-		elseif ($status == self::STATUS_CLOSED) {
+		} elseif ($status == self::STATUS_CLOSED) {
 			$statusType = 'status6';
-		}
-		else {
+		} else {
 			$labelStatus = $langs->trans('Unknown');
 			$labelStatusShort = $langs->trans('Unknown');
 			$statusType = 'status0';
@@ -1261,8 +1252,7 @@ class Ticket extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -1352,8 +1342,7 @@ class Ticket extends CommonObject
 		if ($id_assign_user > 0)
 		{
 			$sql .= " SET fk_user_assign=".$id_assign_user.", fk_statut = ".Ticket::STATUS_ASSIGNED;
-		}
-		else {
+		} else {
 			$sql .= " SET fk_user_assign=null, fk_statut = ".Ticket::STATUS_READ;
 		}
 		$sql .= " WHERE rowid = ".$this->id;
@@ -2764,8 +2753,7 @@ class Ticket extends CommonObject
 				}
 			}
 			return $response;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -2806,8 +2794,7 @@ class Ticket extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->lasterror();
 			return -1;
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index 86f671d876b..e37db95c23d 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -195,8 +195,7 @@ if ($object->id)
   	$param = '&id='.$object->id;
 
   	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
     accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 4d1cb7a5d60..b920d10aed5 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -285,8 +285,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else {
+} else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -557,12 +556,10 @@ foreach ($object->fields as $key => $val)
 		    if ($search[$key]) $selectedarray = array_values($search[$key]);
 			print Form::multiselectarray('search_fk_statut', $arrayofstatus, $selectedarray, 0, 0, 'minwidth150', 1, 0, '', '', '');
 			print '</td>';
-		}
-		elseif ($key == "fk_soc")
+		} elseif ($key == "fk_soc")
 		{
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'"><input type="text" class="flat maxwidth75" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
-		}
-		else {
+		} else {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
 		}
 	}
@@ -663,8 +660,7 @@ while ($i < min($num, $limit))
 					$user_create->fetch($object->fk_user_create);
 					print $user_create->getNomUrl(-1);
 				}
-			}
-			elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) print $object->showOutputField($val, $key, $db->jdate($obj->$key), '');
+			} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) print $object->showOutputField($val, $key, $db->jdate($obj->$key), '');
 			else print $object->showOutputField($val, $key, $obj->$key, '');
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index c35b60ab42e..b7d4c3d7b21 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -56,8 +56,7 @@ if (GETPOST('actioncode', 'array'))
 {
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
-}
-else {
+} else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php
index e6760ba9c4d..da921577596 100644
--- a/htdocs/ticket/stats/index.php
+++ b/htdocs/ticket/stats/index.php
@@ -84,8 +84,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenamenb = $dir.'/ticketsnbinyear-'.$user->id.'-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else {
+} else {
     $filenamenb = $dir.'/ticketsnbinyear-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsnbinyear-'.$year.'.png';
 }
@@ -124,8 +123,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenameamount = $dir.'/ticketsamountinyear-'.$user->id.'-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$user->id.'-'.$year.'.png';
-}
-else {
+} else {
     $filenameamount = $dir.'/ticketsamountinyear-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$year.'.png';
 }
@@ -162,8 +160,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filename_avg = $dir.'/ticketsaverage-'.$user->id.'-'.$year.'.png';
     $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsaverage-'.$user->id.'-'.$year.'.png';
-}
-else {
+} else {
     $filename_avg = $dir.'/ticketsaverage-'.$year.'.png';
     $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsaverage-'.$year.'.png';
 }
@@ -306,8 +303,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     //print $px2->show();
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index a02e2c17ec6..5363ec728c2 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -71,8 +71,7 @@ $account = new UserBankAccount($db);
 if (!$bankid)
 {
 	$account->fetch(0, '', $id);
-}
-else {
+} else {
 	$account->fetch($bankid);
 }
 if (empty($account->userid)) $account->userid = $object->id;
@@ -105,8 +104,7 @@ if ($action == 'add' && !$cancel)
 	{
 		setEventMessages($account->error, $account->errors, 'errors');
 		$action = 'edit'; // Force chargement page edition
-	}
-	else {
+	} else {
         setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
         $action = '';
 	}
@@ -135,8 +133,7 @@ if ($action == 'update' && !$cancel)
 	{
 		setEventMessages($account->error, $account->errors, 'errors');
 		$action = 'edit'; // Force chargement page edition
-	}
-	else {
+	} else {
         setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
         $action = '';
     }
@@ -280,8 +277,7 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 
 			if ($num <= 0) print '<td colspan="4" class="opacitymedium">'.$langs->trans("None").'</a>';
 			print "</table>";
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -335,8 +331,7 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 
 			if ($num <= 0) print '<td colspan="4" class="opacitymedium">'.$langs->trans("None").'</a>';
 			print "</table>";
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -389,8 +384,7 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 
 			if ($num <= 0) print '<td colspan="4" class="opacitymedium">'.$langs->trans("None").'</a>';
 			print "</table>";
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 	}
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 3e7b36e5189..b3a3739b2c1 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -294,8 +294,7 @@ if (empty($reshook)) {
 
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
 				exit;
-			}
-			else {
+			} else {
 				$langs->load("errors");
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -324,8 +323,7 @@ if (empty($reshook)) {
 			if ($result > 0) {
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
 				exit;
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -422,16 +420,13 @@ if (empty($reshook)) {
 					if (!empty($_POST["superadmin"]))
 					{
 						$object->entity = 0;
-					}
-					elseif (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+					} elseif (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 					{
 						$object->entity = 1; // all users in master entity
-					}
-					else {
+					} else {
 						$object->entity = (!GETPOST('entity', 'int') ? 0 : GETPOST('entity', 'int'));
 					}
-				}
-				else {
+				} else {
 					$object->entity = (!GETPOST('entity', 'int') ? 0 : GETPOST('entity', 'int'));
 				}
 
@@ -450,8 +445,7 @@ if (empty($reshook)) {
 				    if ($isimage > 0)
 				    {
     					$object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
-				    }
-				    else {
+				    } else {
 				        $error++;
 				        $langs->load("errors");
 				        setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
@@ -466,8 +460,7 @@ if (empty($reshook)) {
 						if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 							$langs->load("errors");
 							setEventMessages($langs->trans("ErrorLoginAlreadyExists", $object->login), null, 'errors');
-						}
-						else {
+						} else {
 							setEventMessages($object->error, $object->errors, 'errors');
 						}
 					}
@@ -553,13 +546,11 @@ if (empty($reshook)) {
 						$langs->load("errors");
 						setEventMessages($langs->transnoentitiesnoconv("WarningYourLoginWasModifiedPleaseLogin"), null, 'warnings');
 					}
-				}
-				else {
+				} else {
 					$db->rollback();
 				}
 			}
-		}
-		else {
+		} else {
 			if ($caneditpassword)    // Case we can edit only password
 			{
 				dol_syslog("Not allowed to change fields, only password");
@@ -595,12 +586,10 @@ if (empty($reshook)) {
 				if ($object->send_password($user, $newpassword) > 0)
 				{
 					setEventMessages($langs->trans("PasswordChangedAndSentTo", $object->email), null, 'mesgs');
-				}
-				else {
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
-			}
-			else {
+			} else {
 				setEventMessages($langs->trans("PasswordChangedTo", $newpassword), null, 'warnings');
 			}
 		}
@@ -656,8 +645,7 @@ if (empty($reshook)) {
 					$ldap_sid = $attribute[$conf->global->LDAP_FIELD_SID];
 				}
 			}
-		}
-		else {
+		} else {
 			setEventMessages($ldap->error, $ldap->errors, 'errors');
 		}
 	}
@@ -754,12 +742,10 @@ if ($action == 'create' || $action == 'adduserldap')
 					}
 					$liste[$key] = $label;
 				}
-			}
-			else {
+			} else {
 				setEventMessages($ldap->error, $ldap->errors, 'errors');
 			}
-		}
-		else {
+		} else {
 			setEventMessages($ldap->error, $ldap->errors, 'errors');
 		}
 
@@ -809,8 +795,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" id="lastname" name="lastname" value="'.dol_escape_htmltag($ldap_lastname).'">';
 		print $ldap_lastname;
-	}
-	else {
+	} else {
 		print '<input class="minwidth100" type="text" id="lastname" name="lastname" value="'.dol_escape_htmltag(GETPOST('lastname', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -822,8 +807,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" name="firstname" value="'.dol_escape_htmltag($ldap_firstname).'">';
 		print $ldap_firstname;
-	}
-	else {
+	} else {
 		print '<input class="minwidth100" type="text" name="firstname" value="'.dol_escape_htmltag(GETPOST('firstname', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -835,13 +819,11 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" name="login" value="'.dol_escape_htmltag($ldap_login).'">';
 		print $ldap_login;
-	}
-	elseif (!empty($ldap_loginsmb))
+	} elseif (!empty($ldap_loginsmb))
 	{
 		print '<input type="hidden" name="login" value="'.dol_escape_htmltag($ldap_loginsmb).'">';
 		print $ldap_loginsmb;
-	}
-	else {
+	} else {
 		print '<input class="maxwidth200" maxsize="24" type="text" name="login" value="'.dol_escape_htmltag(GETPOST('login', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -871,8 +853,7 @@ if ($action == 'create' || $action == 'adduserldap')
 		{
 			$valuetoshow .= ($valuetoshow ? ', ' : '').'<input type="hidden" name="password" value="'.$ldap_pass.'">'; // Dolibarr password is preffiled with LDAP known password
 			$valuetoshow .= preg_replace('/./i', '*', $ldap_pass);
-		}
-		else {
+		} else {
 			// We do not use a field password but a field text to show new password to use.
 			$valuetoshow .= ($valuetoshow ? ', ' : '').'<input size="30" maxsize="32" type="text" name="password" value="'.$password.'" autocomplete="new-password">';
 		}
@@ -897,8 +878,7 @@ if ($action == 'create' || $action == 'adduserldap')
 		if (!empty($conf->use_javascript_ajax))
 			print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
 		print '</td></tr>';
-	}
-	else {
+	} else {
 		// PARTIAL WORKAROUND
 		$generated_fake_api_key = getRandomPassword(false);
 		print '<input type="hidden" name="api_key" value="'.$generated_fake_api_key.'">';
@@ -1042,8 +1022,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" name="office_phone" value="'.dol_escape_htmltag($ldap_phone).'">';
 		print $ldap_phone;
-	}
-	else {
+	} else {
 		print '<input size="20" type="text" name="office_phone" value="'.dol_escape_htmltag(GETPOST('office_phone', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -1055,8 +1034,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" name="user_mobile" value="'.dol_escape_htmltag($ldap_mobile).'">';
 		print $ldap_mobile;
-	}
-	else {
+	} else {
 		print '<input size="20" type="text" name="user_mobile" value="'.dol_escape_htmltag(GETPOST('user_mobile', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -1068,8 +1046,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" name="office_fax" value="'.dol_escape_htmltag($ldap_fax).'">';
 		print $ldap_fax;
-	}
-	else {
+	} else {
 		print '<input size="20" type="text" name="office_fax" value="'.dol_escape_htmltag(GETPOST('office_fax', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -1081,8 +1058,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" name="email" value="'.dol_escape_htmltag($ldap_mail).'">';
 		print $ldap_mail;
-	}
-	else {
+	} else {
 		print '<input size="40" type="text" name="email" value="'.dol_escape_htmltag(GETPOST('email', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -1215,8 +1191,7 @@ if ($action == 'create' || $action == 'adduserldap')
 				 print "<tr>".'<td>'.$langs->trans("Entity").'</td>';
 				 print "<td>".$mc->select_entities($conf->entity);
 				 print "</td></tr>\n";
-			}
-			else {
+			} else {
 				 print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
 			}
 		}
@@ -1335,8 +1310,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	print '</div>';
 
 	print "</form>";
-}
-else {
+} else {
 	/* ************************************************************************** */
 	/*                                                                            */
 	/* View and edition                                                            */
@@ -1387,8 +1361,7 @@ else {
 							$statutUACF = $statut;
 						}
 					}
-				}
-				else {
+				} else {
 					$userDisabled = 1;
 					$statutUACF = "ACCOUNTDISABLE";
 				}
@@ -1405,8 +1378,7 @@ else {
 		{
 			$title = $langs->trans("Employee");
 			$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/employee/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-		}
-		else {
+		} else {
 			$title = $langs->trans("User");
 			$linkback = '';
 
@@ -1477,8 +1449,7 @@ else {
 			if (!empty($object->ldap_sid) && $object->statut == 0)
 			{
 				print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
-			}
-			else {
+			} else {
 				print '<td>'.$object->login.'</td>';
 			}
 			print '</tr>'."\n";
@@ -1495,20 +1466,16 @@ else {
 					if ($passDoNotExpire)
 					{
 						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("LdapUacf_".$statutUACF);
-					}
-					elseif ($userChangePassNextLogon)
+					} elseif ($userChangePassNextLogon)
 					{
 						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<span class="warning">'.$langs->trans("UserMustChangePassNextLogon", $ldap->domainFQDN).'</span>';
-					}
-					elseif ($userDisabled)
+					} elseif ($userDisabled)
 					{
 						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<span class="warning">'.$langs->trans("LdapUacf_".$statutUACF, $ldap->domainFQDN).'</span>';
-					}
-					else {
+					} else {
 						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("PasswordOfUserInLDAP");
 					}
-				}
-				else {
+				} else {
 					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("PasswordOfUserInLDAP");
 				}
 			}
@@ -1548,12 +1515,10 @@ else {
 			if (!empty($conf->multicompany->enabled) && $object->admin && !$object->entity)
 			{
 				print $form->textwithpicto(yn($object->admin), $langs->trans("SuperAdministratorDesc"), 1, "superadmin");
-			}
-			elseif ($object->admin)
+			} elseif ($object->admin)
 			{
 				print $form->textwithpicto(yn($object->admin), $langs->trans("AdministratorDesc"), 1, "admin");
-			}
-			else {
+			} else {
 				print yn($object->admin);
 			}
 			print '</td></tr>'."\n";
@@ -1595,8 +1560,7 @@ else {
 			print '<td>';
 			if (empty($object->fk_user)) {
 				print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
-			}
-			else {
+			} else {
 				$huser = new User($db);
 				$huser->fetch($object->fk_user);
 				print $huser->getNomUrl(1);
@@ -1795,8 +1759,7 @@ else {
 					$societe = new Societe($db);
 					$societe->fetch($object->socid);
 					print $societe->getNomUrl(1, '');
-				}
-				else {
+				} else {
 					print $langs->trans("ThisUserIsNot");
 				}
 				if (!empty($object->contactid))
@@ -1823,8 +1786,7 @@ else {
 					$adh->fetch($object->fk_member);
 					$adh->ref = $adh->getFullname($langs); // Force to show login instead of id
 					print $adh->getNomUrl(1);
-				}
-				else {
+				} else {
 					print $langs->trans("UserNotLinkedToMember");
 				}
 				print '</td>';
@@ -1861,8 +1823,7 @@ else {
 					{
 						$langs->load("mails");
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-					}
-					else {
+					} else {
 						$langs->load("mails");
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
 					}
@@ -1873,12 +1834,10 @@ else {
 					if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
 					{
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("DisabledInMonoUserMode")).'">'.$langs->trans("Modify").'</a></div>';
-					}
-					else {
+					} else {
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>';
 					}
-				}
-				elseif ($caneditpassword && !$object->ldap_sid &&
+				} elseif ($caneditpassword && !$object->ldap_sid &&
 				(empty($conf->multicompany->enabled) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("EditPassword").'</a></div>';
@@ -1890,8 +1849,7 @@ else {
 					if ($object->statut == 0)
 					{
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("ReinitPassword").'</a></div>';
-					}
-					elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
+					} elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
 					((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=password">'.$langs->trans("ReinitPassword").'</a></div>';
@@ -1900,8 +1858,7 @@ else {
 					if ($object->statut == 0)
 					{
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("SendNewPassword").'</a></div>';
-					}
-					elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
+					} elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
 					((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
 					{
 						if ($object->email) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a></div>';
@@ -1920,8 +1877,7 @@ else {
 				((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
 				{
 					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&amp;id='.$object->id.'">'.$langs->trans("DisableUser").'</a></div>';
-				}
-				else {
+				} else {
 				    if ($user->id == $id)
 				    {
 				        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("CantDisableYourself").'">'.$langs->trans("DisableUser").'</a></div>';
@@ -1934,8 +1890,7 @@ else {
 					if ($user->admin || !$object->admin) // If user edited is admin, delete is possible on for an admin
 					{
 						print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("DeleteUser").'</a></div>';
-					}
-					else {
+					} else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("MustBeAdminToDeleteOtherAdmin")).'">'.$langs->trans("DeleteUser").'</a></div>';
 					}
 				}
@@ -2018,8 +1973,7 @@ else {
 								if ($caneditgroup)
 								{
 									print $group->getNomUrl(1);
-								}
-								else {
+								} else {
 									print img_object($langs->trans("ShowGroup"), "group").' '.$group->name;
 								}
 								print '</td>';
@@ -2029,14 +1983,12 @@ else {
 									print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'">';
 									print img_picto($langs->trans("RemoveFromGroup"), 'unlink');
 									print '</a>';
-								}
-								else {
+								} else {
 									print "&nbsp;";
 								}
 								print "</td></tr>\n";
 							}
-						}
-						else {
+						} else {
 							print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 						}
 
@@ -2083,8 +2035,7 @@ else {
 			if ($caneditfield && !$object->ldap_sid)
 			{
 				print '<input class="minwidth100" type="text" class="flat" name="lastname" value="'.$object->lastname.'">';
-			}
-			else {
+			} else {
 				print '<input type="hidden" name="lastname" value="'.$object->lastname.'">';
 				print $object->lastname;
 			}
@@ -2097,8 +2048,7 @@ else {
 			if ($caneditfield && !$object->ldap_sid)
 			{
 				print '<input class="minwidth100" type="text" class="flat" name="firstname" value="'.$object->firstname.'">';
-			}
-			else {
+			} else {
 				print '<input type="hidden" name="firstname" value="'.$object->firstname.'">';
 				print $object->firstname;
 			}
@@ -2110,8 +2060,7 @@ else {
 			if ($user->admin && !$object->ldap_sid)
 			{
 				print '<input maxlength="50" type="text" class="flat" name="login" value="'.$object->login.'">';
-			}
-			else {
+			} else {
 				print '<input type="hidden" name="login" value="'.$object->login.'">';
 				print $object->login;
 			}
@@ -2135,8 +2084,7 @@ else {
 				if ($caneditpassword)
 				{
 					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<input maxlength="32" type="password" class="flat" name="password" value="'.$object->pass.'" autocomplete="new-password">';
-				}
-				else {
+				} else {
 					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').preg_replace('/./i', '*', $object->pass);
 				}
 			}
@@ -2170,8 +2118,7 @@ else {
 				print '<input type="hidden" name="admin" value="'.$object->admin.'">'.yn($object->admin);
 				print ' ('.$langs->trans("ExternalUser").')';
 				print '</td></tr>';
-			}
-			else {
+			} else {
 				print '<td>';
 				$nbAdmin = $user->getNbOfUsers('active', '', 1);
 				$nbSuperAdmin = $user->getNbOfUsers('active', 'superadmin', 1);
@@ -2231,8 +2178,7 @@ else {
 						$checked = (($object->admin && !$object->entity) ? ' checked' : '');
 						print '<input type="checkbox" name="superadmin" value="1"'.$checked.' /> '.$langs->trans("SuperAdministrator");
 					}
-				}
-				else {
+				} else {
 					$yn = yn($object->admin);
 					print '<input type="hidden" name="admin" value="'.$object->admin.'">';
 					print '<input type="hidden" name="superadmin" value="'.(empty($object->entity) ? 1 : 0).'">';
@@ -2252,8 +2198,7 @@ else {
 			   	if ($object->socid) $type = $langs->trans("External");
 			   	print $form->textwithpicto($type, $langs->trans("InternalExternalDesc"));
 			   	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
-		   	}
-		   	else {
+		   	} else {
 				// Select mode
 				$type = 0;
 				if ($object->contactid) $type = $object->contactid;
@@ -2304,8 +2249,7 @@ else {
 		   	if ($caneditfield)
 		   	{
 		   		print $form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
-		   	}
-		   	else {
+		   	} else {
 		   		print '<input type="hidden" name="fk_user" value="'.$object->fk_user.'">';
 		   		$huser = new User($db);
 		   		$huser->fetch($object->fk_user);
@@ -2323,8 +2267,7 @@ else {
 			if ($caneditfield)
 			{
 				print $form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
-			}
-			else {
+			} else {
 				print '<input type="hidden" name="fk_user_expense_validator" value="'.$object->fk_user_expense_validator.'">';
 				$evuser = new User($db);
 				$evuser->fetch($object->fk_user_expense_validator);
@@ -2342,8 +2285,7 @@ else {
 			if ($caneditfield)
 			{
 				print $form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
-			}
-			else {
+			} else {
 				print '<input type="hidden" name="fk_user_holiday_validator" value="'.$object->fk_user_holiday_validator.'">';
 				$hvuser = new User($db);
 				$hvuser->fetch($object->fk_user_holiday_validator);
@@ -2411,8 +2353,7 @@ else {
 			if ($caneditfield && empty($object->ldap_sid))
 			{
 				print '<input size="20" type="text" name="office_phone" class="flat" value="'.$object->office_phone.'">';
-			}
-			else {
+			} else {
 				print '<input type="hidden" name="office_phone" value="'.$object->office_phone.'">';
 				print $object->office_phone;
 			}
@@ -2424,8 +2365,7 @@ else {
 			if ($caneditfield && empty($object->ldap_sid))
 			{
 				print '<input size="20" type="text" name="user_mobile" class="flat" value="'.$object->user_mobile.'">';
-			}
-			else {
+			} else {
 				print '<input type="hidden" name="user_mobile" value="'.$object->user_mobile.'">';
 				print $object->user_mobile;
 			}
@@ -2437,8 +2377,7 @@ else {
 			if ($caneditfield && empty($object->ldap_sid))
 			{
 				print '<input size="20" type="text" name="office_fax" class="flat" value="'.$object->office_fax.'">';
-			}
-			else {
+			} else {
 				print '<input type="hidden" name="office_fax" value="'.$object->office_fax.'">';
 				print $object->office_fax;
 			}
@@ -2450,8 +2389,7 @@ else {
 			if ($caneditfield && empty($object->ldap_sid))
 			{
 				print '<input class="minwidth100" type="text" name="email" class="flat" value="'.$object->email.'">';
-			}
-			else {
+			} else {
 				print '<input type="hidden" name="email" value="'.$object->email.'">';
 				print $object->email;
 			}
@@ -2484,8 +2422,7 @@ else {
 				if ($caneditfield)
 				{
 					print '<input class="minwidth100" type="url" name="openid" class="flat" value="'.$object->openid.'">';
-				}
-				else {
+				} else {
 					print '<input type="hidden" name="openid" value="'.$object->openid.'">';
 					print $object->openid;
 				}
@@ -2503,8 +2440,7 @@ else {
 				if ($caneditfield)
 				{
 					print '<input size="30" type="text" class="flat" name="accountancy_code" value="'.$object->accountancy_code.'">';
-				}
-				else {
+				} else {
 					print '<input type="hidden" name="accountancy_code" value="'.$object->accountancy_code.'">';
 					print $object->accountancy_code;
 				}
@@ -2576,8 +2512,7 @@ else {
 						$contact->fetch($object->contactid);
 						print ' / <a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$object->contactid.'">'.img_object($langs->trans("ShowContact"), 'contact').' '.dol_trunc($contact->getFullName($langs), 32).'</a>';
 					}
-				}
-				else {
+				} else {
 					print $langs->trans("ThisUserIsNot");
 				}
 				print ' ('.$langs->trans("UseTypeFieldToChange").')';
@@ -2597,8 +2532,7 @@ else {
 					$adh->fetch($object->fk_member);
 					$adh->ref = $adh->login; // Force to show login instead of id
 					print $adh->getNomUrl(1);
-				}
-				else {
+				} else {
 					print $langs->trans("UserNotLinkedToMember");
 				}
 				print '</td>';
@@ -2617,8 +2551,7 @@ else {
 	            		print "<tr>".'<td>'.$langs->trans("Entity").'</td>';
 	            		print "<td>".$mc->select_entities($object->entity, 'entity', '', 0, 1, false, false, 1); // last parameter 1 means, show also a choice 0=>'all entities'
 	            		print "</td></tr>\n";
-	            	}
-	            	else {
+	            	} else {
 	            		print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
 	            	}
 	            }
@@ -2646,8 +2579,7 @@ else {
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor('signature', $object->signature, '', 138, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) ? 0 : 1, ROWS_4, '90%');
 				print $doleditor->Create(1);
-			}
-			else {
+			} else {
 				print dol_htmlentitiesbr($object->signature);
 			}
 			print '</td></tr>';
@@ -2673,8 +2605,7 @@ else {
             if ($caneditfield)
             {
             	print '<input size="30" type="text" name="job" value="'.$object->job.'">';
-            }
-            else {
+            } else {
             	print '<input type="hidden" name="job" value="'.$object->job.'">';
             	print $object->job;
             }
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 54681974e04..d477e37c160 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -132,8 +132,7 @@ class Users extends DolibarrApi
 	            }
 	            $i++;
 	        }
-	    }
-	    else {
+	    } else {
 	        throw new RestException(503, 'Error when retrieve User list : '.$db->lasterror());
 	    }
 	    if (!count($obj_ret)) {
@@ -288,8 +287,7 @@ class Users extends DolibarrApi
 		if ($this->useraccount->update(DolibarrApiAccess::$user) >= 0)
 		{
 			return $this->get($id);
-		}
-		else {
+		} else {
 			throw new RestException(500, $this->useraccount->error);
 		}
     }
@@ -362,8 +360,7 @@ class Users extends DolibarrApi
 		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && !empty(DolibarrApiAccess::$user->admin) && empty(DolibarrApiAccess::$user->entity))
 		{
 			$entity = (!empty($entity) ? $entity : $conf->entity);
-		}
-		else {
+		} else {
 			// When using API, action is done on entity of logged user because a user of entity X with permission to create user should not be able to
 			// hack the security by giving himself permissions on another entity.
 			$entity = (DolibarrApiAccess::$user->entity > 0 ? DolibarrApiAccess::$user->entity : $conf->entity);
@@ -448,8 +445,7 @@ class Users extends DolibarrApi
 	            }
 	            $i++;
 	        }
-	    }
-	    else {
+	    } else {
 	        throw new RestException(503, 'Error when retrieve Group list : '.$db->lasterror());
 	    }
 	    if (!count($obj_ret)) {
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index a4daebe3b9a..8b62c501294 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -294,12 +294,10 @@ class User extends CommonObject
 			if ((empty($conf->multicompany->enabled) || empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) && (!empty($user->entity)))
 			{
 				$sql .= " WHERE u.entity IN (0,".$conf->entity.")";
-			}
-			else {
+			} else {
 				$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
 			}
-		}
-		else // The fetch was forced on an entity
+		} else // The fetch was forced on an entity
 		{
 			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 				$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
@@ -309,16 +307,13 @@ class User extends CommonObject
 		if ($sid)    // permet une recherche du user par son SID ActiveDirectory ou Samba
 		{
 			$sql .= " AND (u.ldap_sid = '".$this->db->escape($sid)."' OR u.login = '".$this->db->escape($login)."') LIMIT 1";
-		}
-		elseif ($login)
+		} elseif ($login)
 		{
 			$sql .= " AND u.login = '".$this->db->escape($login)."'";
-		}
-		elseif ($email)
+		} elseif ($email)
 		{
 			$sql .= " AND u.email = '".$this->db->escape($email)."'";
-		}
-		else {
+		} else {
 			$sql .= " AND u.rowid = ".$id;
 		}
 		$sql .= " ORDER BY u.entity ASC"; // Avoid random result when there is 2 login in 2 different entities
@@ -416,16 +411,14 @@ class User extends CommonObject
 				$this->fetch_optionals();
 
 				$this->db->free($result);
-			}
-			else {
+			} else {
 				$this->error = "USERNOTFOUND";
 				dol_syslog(get_class($this)."::fetch user not found", LOG_DEBUG);
 
 				$this->db->free($result);
 				return 0;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -451,8 +444,7 @@ class User extends CommonObject
 					$i++;
 				}
 				$this->db->free($resql);
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror();
 				return -2;
 			}
@@ -518,8 +510,7 @@ class User extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -563,8 +554,7 @@ class User extends CommonObject
 				$module = $obj->module;
 				$perms = $obj->perms;
 				$subperms = $obj->subperms;
-			}
-			else {
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -574,8 +564,7 @@ class User extends CommonObject
 			// Ajout des droits induits
 			if (!empty($subperms))   $whereforadd .= " OR (module='$module' AND perms='$perms' AND (subperms='lire' OR subperms='read'))";
 			elseif (!empty($perms)) $whereforadd .= " OR (module='$module' AND (perms='lire' OR perms='read') AND subperms IS NULL)";
-		}
-		else {
+		} else {
 			// On a pas demande un droit en particulier mais une liste de droits
 			// sur la base d'un nom de module de de perms
 			// Where pour la liste des droits a ajouter
@@ -584,8 +573,7 @@ class User extends CommonObject
 				if ($allmodule == 'allmodules')
 				{
 					$whereforadd = 'allmodules';
-				}
-				else {
+				} else {
 					$whereforadd = "module='".$this->db->escape($allmodule)."'";
 					if (!empty($allperms))  $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
 				}
@@ -620,8 +608,7 @@ class User extends CommonObject
 
 					$i++;
 				}
-			}
-			else {
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -641,8 +628,7 @@ class User extends CommonObject
 		if ($error) {
 			$this->db->rollback();
 			return -$error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -684,8 +670,7 @@ class User extends CommonObject
 				$module = $obj->module;
 				$perms = $obj->perms;
 				$subperms = $obj->subperms;
-			}
-			else {
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -703,8 +688,7 @@ class User extends CommonObject
 				if ($allmodule == 'allmodules')
 				{
 					$wherefordel = 'allmodules';
-				}
-				else {
+				} else {
 					$wherefordel = "module='".$this->db->escape($allmodule)."'";
 					if (!empty($allperms))  $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
 				}
@@ -739,8 +723,7 @@ class User extends CommonObject
 
 					$i++;
 				}
-			}
-			else {
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -760,8 +743,7 @@ class User extends CommonObject
 		if ($error) {
 			$this->db->rollback();
 			return -$error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -821,8 +803,7 @@ class User extends CommonObject
 		if (!empty($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY))
 		{
 			$sql .= " AND r.entity IN (0,".(!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? "1," : "").$conf->entity.")";
-		}
-		else {
+		} else {
 			$sql .= " AND ur.entity = ".$conf->entity;
 		}
 		$sql .= " AND ur.fk_user= ".$this->id;
@@ -853,8 +834,7 @@ class User extends CommonObject
 							if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = new stdClass();
 							if (empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
 							$this->rights->$module->$perms->$subperms = 1;
-						}
-						else {
+						} else {
 							if (empty($this->rights->$module->$perms)) $this->nb_rights++;
 							$this->rights->$module->$perms = 1;
 						}
@@ -878,8 +858,7 @@ class User extends CommonObject
 			} else {
 				$sql .= " AND r.entity = ".$conf->entity;
 			}
-		}
-		else {
+		} else {
 			$sql .= " AND gr.entity = ".$conf->entity;
 			$sql .= " AND gu.entity = ".$conf->entity;
 			$sql .= " AND r.entity = ".$conf->entity;
@@ -911,8 +890,7 @@ class User extends CommonObject
 						if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = new stdClass();
 						if (empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
 						$this->rights->$module->$perms->$subperms = 1;
-					}
-					else {
+					} else {
 						if (empty($this->rights->$module->$perms)) $this->nb_rights++;
 						// if we have already define a subperm like this $this->rights->$module->level1->level2 with llx_user_rights, we don't want override level1 because the level2 can be not define on user group
 						if (!is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = 1;
@@ -932,8 +910,7 @@ class User extends CommonObject
 			// Si module etait non defini, alors on a tout charge, on peut donc considerer
 			// que les droits sont en cache (car tous charges) pour cet instance de user
 			$this->all_permissions_are_loaded = 1;
-		}
-		else {
+		} else {
 			// If module defined, we flag it as loaded into cache
 			$this->_tab_loaded[$moduletag] = 1;
 		}
@@ -976,8 +953,7 @@ class User extends CommonObject
 		{
 			$this->db->rollback();
 			return -$error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1115,8 +1091,7 @@ class User extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1181,8 +1156,7 @@ class User extends CommonObject
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
 				$this->db->rollback();
 				return -6;
-			}
-			else {
+			} else {
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."user (datec,login,ldap_sid,entity)";
 				$sql .= " VALUES('".$this->db->idate($this->datec)."','".$this->db->escape($this->login)."','".$this->db->escape($this->ldap_sid)."',".$this->db->escape($this->entity).")";
 				$result = $this->db->query($sql);
@@ -1233,22 +1207,19 @@ class User extends CommonObject
 					{
 						$this->db->commit();
 						return $this->id;
-					}
-					else {
+					} else {
 						//$this->error=$interface->error;
 						dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 						$this->db->rollback();
 						return -3;
 					}
-				}
-				else {
+				} else {
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -2;
 				}
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1316,15 +1287,13 @@ class User extends CommonObject
 
 				$this->db->commit();
 				return $this->id;
-			}
-			else {
+			} else {
 				$this->error = $this->db->error();
 
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			// $this->error deja positionne
 			dol_syslog(get_class($this)."::create_from_contact - 0");
 
@@ -1399,8 +1368,7 @@ class User extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else {
+				} else {
 					$this->error = $this->db->lasterror();
 
 					$this->db->rollback();
@@ -1413,8 +1381,7 @@ class User extends CommonObject
 		{
 			$this->db->commit();
 			return $this->id;
-		}
-		else {
+		} else {
 			// $this->error deja positionne
 			$this->db->rollback();
 			return -2;
@@ -1668,8 +1635,7 @@ class User extends CommonObject
 							dol_syslog(get_class($this)."::update error after calling adh->update to sync it with user: ".$this->error, LOG_ERR);
 							$error++;
 						}
-					}
-					elseif ($result < 0)
+					} elseif ($result < 0)
 					{
 						$this->error = $adh->error;
 						$this->errors = $adh->errors;
@@ -1725,8 +1691,7 @@ class User extends CommonObject
 							dol_syslog(get_class($this)."::update error after calling adh->update to sync it with user: ".$this->error, LOG_ERR);
 							$error++;
 						}
-					}
-					else {
+					} else {
 						$this->error = $tmpobj->error;
 						$this->errors = $tmpobj->errors;
 						$error++;
@@ -1758,14 +1723,12 @@ class User extends CommonObject
 			{
 				$this->db->commit();
 				return $nbrowsaffected;
-			}
-			else {
+			} else {
 				dol_syslog(get_class($this)."::update error=".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -2;
@@ -1797,8 +1760,7 @@ class User extends CommonObject
 			$this->datepreviouslogin = $this->datelastlogin;
 			$this->datelastlogin = $now;
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror().' sql='.$sql;
 			return -1;
 		}
@@ -1846,8 +1808,7 @@ class User extends CommonObject
 			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED))
 			{
 				$sql .= ", pass = null";
-			}
-			else {
+			} else {
 				$sql .= ", pass = '".$this->db->escape($password)."'";
 			}
 			$sql .= " WHERE rowid = ".$this->id;
@@ -1880,8 +1841,7 @@ class User extends CommonObject
 								dol_syslog(get_class($this)."::setPassword ".$this->error, LOG_ERR);
 								$error++;
 							}
-						}
-						else {
+						} else {
 							$this->error = $adh->error;
 							$error++;
 						}
@@ -1899,19 +1859,16 @@ class User extends CommonObject
 
 					$this->db->commit();
 					return $this->pass;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					return 0;
 				}
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				dol_print_error($this->db);
 				return -1;
 			}
-		}
-		else {
+		} else {
 			// We store clear password in password temporary field.
 			// After receiving confirmation link, we will crypt it and store it in pass_crypted
 			$sql = "UPDATE ".MAIN_DB_PREFIX."user";
@@ -1923,8 +1880,7 @@ class User extends CommonObject
 			if ($result)
 			{
 				return $password;
-			}
-			else {
+			} else {
 				dol_print_error($this->db);
 				return -3;
 			}
@@ -1964,8 +1920,7 @@ class User extends CommonObject
 
 		if ($this->conf->MAIN_LANG_DEFAULT) {
             $outputlangs->setDefaultLang($this->conf->MAIN_LANG_DEFAULT);
-        }
-		else {	// If user has not defined its own language, we used current language
+        } else {	// If user has not defined its own language, we used current language
 			$outputlangs = $langs;
 		}
 
@@ -1995,8 +1950,7 @@ class User extends CommonObject
 			$mesg .= $user->getFullName($outputlangs); // Username that send the email (not the user for who we want to reset password)
 
 			dol_syslog(get_class($this)."::send_password changelater is off, url=".$url);
-		}
-		else {
+		} else {
 			$url = $urlwithroot.'/user/passwordforgotten.php?action=validatenewpassword&username='.urlencode($this->login)."&passwordhash=".dol_hash($password);
 
 			$mesg .= $outputlangs->transnoentitiesnoconv("RequestToResetPasswordReceived")."\n";
@@ -2033,8 +1987,7 @@ class User extends CommonObject
 		if ($mailfile->sendfile())
 		{
 			return 1;
-		}
-		else {
+		} else {
 			$langs->trans("errors");
 			$this->error = $langs->trans("ErrorFailedToSendPassword").' '.$mailfile->error;
 			return -1;
@@ -2082,8 +2035,7 @@ class User extends CommonObject
 
 			$this->db->free($resql);
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2120,8 +2072,7 @@ class User extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -2175,14 +2126,12 @@ class User extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				dol_syslog(get_class($this)."::SetInGroup ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -2230,14 +2179,12 @@ class User extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else {
+			} else {
 				dol_syslog(get_class($this)."::RemoveFromGroup ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -2728,8 +2675,7 @@ class User extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -2755,8 +2701,7 @@ class User extends CommonObject
 
 			$this->db->free($resql);
 			return $nb;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2780,8 +2725,7 @@ class User extends CommonObject
 		{
 			$sql .= " WHERE entity = 0";
 			if ($admin >= 0) $sql .= " AND admin = ".$admin;
-		}
-		else {
+		} else {
 			$sql .= " WHERE entity IN (".getEntity('user', 0).")";
 			if ($limitTo == 'active') $sql .= " AND statut = 1";
 			if ($admin >= 0) $sql .= " AND admin = ".$admin;
@@ -2795,8 +2739,7 @@ class User extends CommonObject
 
 			$this->db->free($resql);
 			return $nb;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -2867,8 +2810,7 @@ class User extends CommonObject
 				$users[] = $user;
 			}
 			return $users;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -2901,8 +2843,7 @@ class User extends CommonObject
 				$this->parentof[$obj->id_son] = $obj->id_parent;
 			}
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -2971,8 +2912,7 @@ class User extends CommonObject
 				$this->users[$obj->rowid]['photo'] = $obj->photo;
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3030,8 +2970,7 @@ class User extends CommonObject
 		if (isset($this->cache_childids[$this->id]))
 		{
 			$childids = $this->cache_childids[$this->id];
-		}
-		else {
+		} else {
 			// Init this->users
 			$this->get_full_tree();
 
@@ -3142,8 +3081,7 @@ class User extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -3173,8 +3111,7 @@ class User extends CommonObject
 			if (!empty($conf->global->USER_ADDON_PDF))
 			{
 				$modele = $conf->global->USER_ADDON_PDF;
-			}
-			else {
+			} else {
 				$modele = 'bluesky';
 			}
 		}
@@ -3216,8 +3153,7 @@ class User extends CommonObject
 				elseif ($mode == 'mobile') $user_property = $obj->user_mobile;
 			}
 			return $user_property;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3253,12 +3189,10 @@ class User extends CommonObject
 					$sql .= " AND ug.entity IN (".getEntity('user')."))";
 					$sql .= " OR t.entity = 0)"; // Show always superadmin
 				}
-			}
-			else {
+			} else {
 				$sql .= " WHERE t.entity IN (".getEntity('user').")";
 			}
-		}
-		else {
+		} else {
 			$sql .= " WHERE 1";
 		}
 
@@ -3268,14 +3202,11 @@ class User extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				}
-				elseif (strpos($key, 'date') !== false) {
+				} elseif (strpos($key, 'date') !== false) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				}
-				elseif ($key == 'customsql') {
+				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				}
-				else {
+				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
@@ -3306,8 +3237,7 @@ class User extends CommonObject
 				$this->db->free($resql);
 			}
 			return $num;
-		}
-		else {
+		} else {
             $this->errors[] = $this->db->lasterror();
             return -1;
         }
diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index 02a046a60ad..325753fc773 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -104,8 +104,7 @@ class UserBankAccount extends Account
 
                 return $this->update($user);
             }
-        }
-        else {
+        } else {
             print $this->db->error();
             return 0;
         }
@@ -148,8 +147,7 @@ class UserBankAccount extends Account
         if ($result)
         {
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return 0;
         }
@@ -200,8 +198,7 @@ class UserBankAccount extends Account
             $this->db->free($resql);
 
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index f56358963c9..f9a5243407f 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -154,8 +154,7 @@ class UserGroup extends CommonObject
 		if (!empty($groupname))
 		{
 			$result = $this->fetchCommon(0, '', ' AND nom = \''.$this->db->escape($groupname).'\'');
-		}
-		else {
+		} else {
 			$result = $this->fetchCommon($id);
 		}
 
@@ -169,8 +168,7 @@ class UserGroup extends CommonObject
 			}
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -198,8 +196,7 @@ class UserGroup extends CommonObject
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)
 		{
 			$sql .= " AND g.entity IS NOT NULL";
-		}
-		else {
+		} else {
 			$sql .= " AND g.entity IN (0,".$conf->entity.")";
 		}
 		$sql .= " ORDER BY g.nom";
@@ -223,8 +220,7 @@ class UserGroup extends CommonObject
 			$this->db->free($result);
 
 			return $ret;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -253,8 +249,7 @@ class UserGroup extends CommonObject
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)
 		{
 			$sql .= " AND u.entity IS NOT NULL";
-		}
-		else {
+		} else {
 			$sql .= " AND u.entity IN (0,".$conf->entity.")";
 		}
 		if (!empty($excludefilter)) $sql .= ' AND ('.$excludefilter.')';
@@ -272,8 +267,7 @@ class UserGroup extends CommonObject
 						$newuser = new User($this->db);
 						$newuser->fetch($obj->rowid);
 						$ret[$obj->rowid] = $newuser;
-					}
-					else $ret[$obj->rowid] = $obj->rowid;
+					} else $ret[$obj->rowid] = $obj->rowid;
 				}
 				if ($mode != 1 && !empty($obj->usergroup_entity))
 				{
@@ -284,8 +278,7 @@ class UserGroup extends CommonObject
 			$this->db->free($resql);
 
 			return $ret;
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -327,8 +320,7 @@ class UserGroup extends CommonObject
 				$module = $obj->module;
 				$perms = $obj->perms;
 				$subperms = $obj->subperms;
-			}
-			else {
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -342,16 +334,14 @@ class UserGroup extends CommonObject
 			// Pour compatibilite, si lowid = 0, on est en mode ajout de tout
 			// TODO A virer quand sera gere par l'appelant
 			//if (substr($rid,-1,1) == 0) $whereforadd="module='$module'";
-		}
-		else {
+		} else {
 			// Where pour la liste des droits a ajouter
 			if (!empty($allmodule))
 			{
 				if ($allmodule == 'allmodules')
 				{
 					$whereforadd = 'allmodules';
-				}
-				else {
+				} else {
 					$whereforadd = "module='".$this->db->escape($allmodule)."'";
 					if (!empty($allperms))  $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
 				}
@@ -386,8 +376,7 @@ class UserGroup extends CommonObject
 
 					$i++;
 				}
-			}
-			else {
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -407,8 +396,7 @@ class UserGroup extends CommonObject
 		if ($error) {
 			$this->db->rollback();
 			return -$error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -450,8 +438,7 @@ class UserGroup extends CommonObject
 				$module = $obj->module;
 				$perms = $obj->perms;
 				$subperms = $obj->subperms;
-			}
-			else {
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -472,8 +459,7 @@ class UserGroup extends CommonObject
 				if ($allmodule == 'allmodules')
 				{
 					$wherefordel = 'allmodules';
-				}
-				else {
+				} else {
 					$wherefordel = "module='".$this->db->escape($allmodule)."'";
 					if (!empty($allperms))  $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
 				}
@@ -508,8 +494,7 @@ class UserGroup extends CommonObject
 
 					$i++;
 				}
-			}
-			else {
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -529,8 +514,7 @@ class UserGroup extends CommonObject
 		if ($error) {
 			$this->db->rollback();
 			return -$error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -594,8 +578,7 @@ class UserGroup extends CommonObject
 						if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = new stdClass();
 						if (empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
 						$this->rights->$module->$perms->$subperms = 1;
-					}
-					else {
+					} else {
 						if (empty($this->rights->$module->$perms)) $this->nb_rights++;
 						$this->rights->$module->$perms = 1;
 					}
@@ -611,8 +594,7 @@ class UserGroup extends CommonObject
 			// Si module etait non defini, alors on a tout charge, on peut donc considerer
 			// que les droits sont en cache (car tous charges) pour cet instance de group
 			$this->all_permissions_are_loaded = 1;
-		}
-		else {
+		} else {
 			// If module defined, we flag it as loaded into cache
 		    $this->_tab_loaded[$moduletag] = 1;
 		}
@@ -889,8 +871,7 @@ class UserGroup extends CommonObject
 			if (!empty($conf->global->USERGROUP_ADDON_PDF))
 			{
 				$modele = $conf->global->USERGROUP_ADDON_PDF;
-			}
-			else {
+			} else {
 				$modele = 'grass';
 			}
 		}
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index 302e0729bb8..20c51a28ba4 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -121,8 +121,7 @@ if ($id > 0)
             {
                 $langs->load("errors");
                 print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</font>';
-            }
-            else {
+            } else {
                 print ' &nbsp; &nbsp; '.$form->textwithpicto($langs->trans("KeepEmptyToUseDefault").': '.$conf->global->CLICKTODIAL_URL, $langs->trans("ClickToDialUrlDesc"));
             }
             print '</td>';
@@ -145,8 +144,7 @@ if ($id > 0)
         print "</tr>\n";
 
         print '</table>';
-    }
-    else // View mode
+    } else // View mode
     {
         print '<table class="border centpercent tableforfield">';
 
@@ -160,8 +158,7 @@ if ($id > 0)
         	{
         	    $langs->load("errors");
         	    print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</font>';
-        	}
-        	else {
+        	} else {
         		print $form->textwithpicto((empty($object->clicktodial_url) ? $langs->trans("DefaultLink").': ' : '').$url, $langs->trans("ClickToDialUrlDesc"));
         	}
         	print '</td>';
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 912675dd636..83b525d03de 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -171,8 +171,7 @@ if ($object->id)
 	$permtoedit = $user->rights->user->user->creer;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else {
+} else {
 	accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 524fc25b51a..e4e8913c3af 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -114,8 +114,7 @@ if (empty($reshook)) {
 			$object->delete($user);
 			header("Location: ".DOL_URL_ROOT."/user/group/list.php?restore_lastsearch_values=1");
 			exit;
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorForbidden'), null, 'errors');
 		}
@@ -151,8 +150,7 @@ if (empty($reshook)) {
 
 					header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
-				}
-				else {
+				} else {
 					$db->rollback();
 
 					$langs->load("errors");
@@ -160,8 +158,7 @@ if (empty($reshook)) {
 					$action = "create"; // Go back to create page
 				}
 			}
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorForbidden'), null, 'errors');
 		}
@@ -186,13 +183,11 @@ if (empty($reshook)) {
 				{
 					header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
-				}
-				else {
+				} else {
 					setEventMessages($edituser->error, $edituser->errors, 'errors');
 				}
 			}
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorForbidden'), null, 'errors');
 		}
@@ -226,13 +221,11 @@ if (empty($reshook)) {
 			{
 				setEventMessages($langs->trans("GroupModified"), null, 'mesgs');
 				$db->commit();
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
 			}
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorForbidden'), null, 'mesgs');
 		}
@@ -279,8 +272,7 @@ if ($action == 'create')
 			print "<tr>".'<td class="tdtop">'.$langs->trans("Entity").'</td>';
 			print "<td>".$mc->select_entities($conf->entity);
 			print "</td></tr>\n";
-		}
-		else {
+		} else {
 			print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
 		}
 	}
@@ -478,14 +470,12 @@ else {
 							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removeuser&amp;user='.$useringroup->id.'">';
 							print img_picto($langs->trans("RemoveFromGroup"), 'unlink');
 							print '</a>';
-						}
-						else {
+						} else {
 							print "-";
 						}
 						print "</td></tr>\n";
 					}
-				}
-				else {
+				} else {
 					print '<tr><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 				}
 				print "</table>";
@@ -545,8 +535,7 @@ else {
 					print "<tr>".'<td class="tdtop">'.$langs->trans("Entity").'</td>';
 					print "<td>".$mc->select_entities($object->entity);
 					print "</td></tr>\n";
-				}
-				else {
+				} else {
 					print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
 				}
 			}
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index b72fc7718f9..8e69101b44d 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -83,8 +83,7 @@ if ($action == 'dolibarr2ldap')
 	if ($result >= 0)
 	{
 		setEventMessages($langs->trans("GroupSynchronized"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($ldap->error, $ldap->errors, 'errors');
 	}
 }
@@ -194,18 +193,15 @@ if ($result > 0)
 		if (!is_array($records))
 		{
 			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
-		}
-		else {
+		} else {
 			$result = show_ldap_content($records, 0, $records['count'], true);
 		}
-	}
-	else {
+	} else {
 		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
 	}
 	$ldap->unbind();
 	$ldap->close();
-}
-else {
+} else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
 
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 48c56a20218..ace4e863c01 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -116,8 +116,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_rights as ugr ON ugr.fk_usergrou
 if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && !$user->entity)))
 {
 	$sql .= " WHERE g.entity IS NOT NULL";
-}
-else {
+} else {
 	$sql .= " WHERE g.entity IN (0,".$conf->entity.")";
 }
 if (!empty($search_group)) natural_search(array("g.nom", "g.note"), $search_group);
@@ -220,8 +219,7 @@ if ($resql)
     print "</form>\n";
 
     $db->free($resql);
-}
-else {
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 8c8a59fa536..71f8f5b0ebd 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -188,8 +188,7 @@ if ($object->id > 0)
     			$i++;
     	}
     	$db->free($result);
-    }
-    else {
+    } else {
     	dol_print_error($db);
     }
 
@@ -323,8 +322,7 @@ if ($object->id > 0)
             		print '<td class="center nowrap">';
             		print img_picto($langs->trans("Active"), 'tick');
             		print '</td>';
-            	}
-            	else {
+            	} else {
             		// Do not own permission
             		if ($caneditperms)
             		{
@@ -332,8 +330,7 @@ if ($object->id > 0)
             		}
             		print '<td>&nbsp</td>';
             	}
-            }
-            else {
+            } else {
             	// Do not own permission
             	if ($caneditperms)
             	{
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 520821ad84f..5278835be3c 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -79,8 +79,7 @@ $user_arbo = $userstatic->get_full_tree(0, ($search_statut != '' && $search_stat
 if (!is_array($user_arbo) && $user_arbo < 0)
 {
     setEventMessages($userstatic->error, $userstatic->errors, 'warnings');
-}
-else {
+} else {
     // Define fulltree array
     $fulltree = $user_arbo;
     //var_dump($fulltree);
@@ -111,8 +110,7 @@ else {
     		if (empty($entity))
     		{
     			$entitystring = $langs->trans("AllEntities");
-    		}
-    		else {
+    		} else {
     			$mc->getInfo($entity);
     			$entitystring = $mc->label;
     		}
@@ -122,8 +120,7 @@ else {
     	if (!empty($conf->multicompany->enabled) && $userstatic->admin && !$userstatic->entity)
     	{
     		$li .= img_picto($langs->trans("SuperAdministrator"), 'redstar');
-    	}
-    	elseif ($userstatic->admin)
+    	} elseif ($userstatic->admin)
     	{
     		$li .= img_picto($langs->trans("Administrator"), 'star');
     	}
@@ -194,8 +191,7 @@ else {
     	print '</td>';
     	print '<td></td>';
     	print '</tr>';
-    }
-    else {
+    } else {
     	print '<tr '.$bc[true].'>';
     	print '<td colspan="3">';
     	print '<table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index cec26f72dcc..2fa6ec1e7ae 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -158,8 +158,7 @@ if ($resql)
 		if (!empty($conf->multicompany->enabled) && $obj->admin && !$obj->entity)
 		{
 			print img_picto($langs->trans("SuperAdministrator"), 'redstar');
-		}
-		elseif ($obj->admin)
+		} elseif ($obj->admin)
 		{
 			print img_picto($langs->trans("Administrator"), 'star');
 		}
@@ -169,8 +168,7 @@ if ($resql)
 		if ($obj->fk_soc)
 		{
             print $companystatic->getNomUrl(1);
-		}
-		else {
+		} else {
 			print $langs->trans("InternalUser");
 		}
 		if ($obj->ldap_sid)
@@ -186,8 +184,7 @@ if ($resql)
 			if (empty($entity))
 			{
 				$entitystring = $langs->trans("AllEntities");
-			}
-			else {
+			} else {
 				$mc->getInfo($entity);
 				$entitystring = $mc->label;
 			}
@@ -207,8 +204,7 @@ if ($resql)
 	print "</div><br>";
 
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -225,8 +221,7 @@ if ($canreadperms)
 	if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && !$user->entity)))
 	{
 		$sql .= " WHERE g.entity IS NOT NULL";
-	}
-	else {
+	} else {
 		$sql .= " WHERE g.entity IN (0,".$conf->entity.")";
 	}
 	$sql .= $db->order("g.datec", "DESC");
@@ -279,8 +274,7 @@ if ($canreadperms)
 		print "</div><br>";
 
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index 674ef0f64b6..eaa3de2c55d 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -75,8 +75,7 @@ if (empty($reshook))
 
 		if ($result >= 0) {
 			setEventMessages($langs->trans("UserSynchronized"), null, 'mesgs');
-		}
-		else {
+		} else {
 			setEventMessages($ldap->error, $ldap->errors, 'errors');
 		}
 	}
@@ -113,8 +112,7 @@ print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
 if ($object->ldap_sid)
 {
 	print '<td class="warning">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
-}
-else {
+} else {
 	print '<td>'.$object->login.'</td>';
 }
 print '</tr>';
@@ -197,19 +195,16 @@ if ($result > 0)
 		if (!is_array($records))
 		{
 			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
-		}
-		else {
+		} else {
 			$result = show_ldap_content($records, 0, $records['count'], true);
 		}
-	}
-	else {
+	} else {
 		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
 	}
 
 	$ldap->unbind();
 	$ldap->close();
-}
-else {
+} else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
 
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index ca2f39b4e9f..84447ea9781 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -521,8 +521,7 @@ while ($i < min($num, $limit))
 		if (!empty($conf->multicompany->enabled) && $obj->admin && !$obj->entity)
 		{
 		  	print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
-		}
-		elseif ($obj->admin)
+		} elseif ($obj->admin)
 		{
 			print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
 		}
@@ -575,12 +574,10 @@ while ($i < min($num, $limit))
 			$companystatic->name = $obj->name;
 			$companystatic->canvas = $obj->canvas;
 			print $companystatic->getNomUrl(1);
-		}
-		elseif ($obj->ldap_sid)
+		} elseif ($obj->ldap_sid)
 		{
 			print $langs->trans("DomainUser");
-		}
-		else {
+		} else {
 			print $langs->trans("InternalUser");
 		}
 		print '</td>';
@@ -595,8 +592,7 @@ while ($i < min($num, $limit))
 			if (!$obj->entity)
 			{
 				print $langs->trans("AllEntities");
-			}
-			else {
+			} else {
 				$mc->getInfo($obj->entity);
 				print $mc->label;
 			}
@@ -625,8 +621,7 @@ while ($i < min($num, $limit))
 			if (!empty($conf->multicompany->enabled) && $obj->admin2 && !$obj->entity2)
 			{
 			  	print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
-			}
-			elseif ($obj->admin2)
+			} elseif ($obj->admin2)
 			{
 				print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
 			}
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 988b879653f..beece592a3b 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -120,8 +120,7 @@ if ($id)
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$doleditor = new DolEditor('note_private', $object->note_private, '', 280, 'dolibarr_notes', 'In', true, false, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_8, '90%');
 		$doleditor->Create();
-	}
-	else {
+	} else {
 		print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_private));
 	}
 	print "</td></tr>";
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 33dded8a304..bc07dc0270d 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -87,16 +87,14 @@ if ($action == 'add')
                 $error++;
                 dol_print_error($db);
             }
-        }
-        else {
+        } else {
             dol_print_error($db);
         }
 
         if (!$error)
         {
             $db->commit();
-        }
-        else {
+        } else {
             $db->rollback();
         }
     }
@@ -149,8 +147,7 @@ if ($result > 0)
     if (!empty($object->ldap_sid) && $object->statut == 0)
     {
         print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
-    }
-    else {
+    } else {
         print '<td>'.$object->login.'</td>';
     }
     print '</tr>'."\n";
@@ -224,8 +221,7 @@ if ($result > 0)
         if (isValidEmail($object->email))
         {
             print ' &lt;'.$object->email.'&gt;';
-        }
-        else {
+        } else {
             $langs->load("errors");
             print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $object->email);
         }
@@ -239,8 +235,7 @@ if ($result > 0)
         print '</td>';
         print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
         print '</tr>';
-    }
-    else {
+    } else {
         print '<tr class="oddeven"><td colspan="4">';
         print $langs->trans("YouMustAssignUserMailFirst");
         print '</td></tr>';
@@ -266,8 +261,7 @@ if ($result > 0)
     if ($resql)
     {
         $num = $db->num_rows($resql);
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 
@@ -305,8 +299,7 @@ if ($result > 0)
                 if (isValidEmail($obj->email))
                 {
                     print ' &lt;'.$obj->email.'&gt;';
-                }
-                else {
+                } else {
                     $langs->load("errors");
                     print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
                 }
@@ -413,8 +406,7 @@ if ($result > 0)
     if ($resql)
     {
         $num = $db->num_rows($resql);
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 
@@ -462,8 +454,7 @@ if ($result > 0)
 	            $userstatic->firstname = $obj->firstname;
 	            print $userstatic->getNomUrl(1);
 	            print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
-            }
-            else {
+            } else {
 				print $obj->email;
             }
             print '</td>';
@@ -490,16 +481,14 @@ if ($result > 0)
             $i++;
         }
         $db->free($resql);
-    }
-    else {
+    } else {
     	print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
     }
 
     print '</table>';
 
     print '</form>';
-}
-else dol_print_error('', 'RecordNotFound');
+} else dol_print_error('', 'RecordNotFound');
 
 // End of page
 llxFooter();
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 068ea0047b1..1f0880b0fb3 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -324,8 +324,7 @@ if ($action == 'edit')
     print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
     print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
     print '</div>';
-}
-else {
+} else {
     dol_fiche_head($head, 'guisetup', $title, -1, 'user');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
@@ -347,8 +346,7 @@ else {
     if (!empty($tmparray[$object->conf->MAIN_LANDING_PAGE]))
     {
         print $langs->trans($tmparray[$object->conf->MAIN_LANDING_PAGE]);
-    }
-    else print $object->conf->MAIN_LANDING_PAGE;
+    } else print $object->conf->MAIN_LANDING_PAGE;
     //print $form->selectarray('MAIN_LANDING_PAGE', $tmparray, (! empty($object->conf->MAIN_LANDING_PAGE)?$object->conf->MAIN_LANDING_PAGE:''), 0, 0, 0, '', 1);
     print '</td></tr>';
 
@@ -395,13 +393,11 @@ else {
     if (empty($user->admin) && !empty($dolibarr_main_demo))
     {
         print "<a class=\"butActionRefused classfortooltip\" title=\"".$langs->trans("FeatureDisabledInDemo")."\" href=\"#\">".$langs->trans("Modify")."</a>";
-    }
-    else {
+    } else {
         if ($caneditfield || !empty($user->admin))       // Si utilisateur edite = utilisateur courant (pas besoin de droits particulier car il s'agit d'une page de modif d'output et non de données) ou si admin
         {
             print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a>';
-        }
-        else {
+        } else {
             print "<a class=\"butActionRefused classfortooltip\" title=\"".$langs->trans("NotEnoughPermissions")."\" href=\"#\">".$langs->trans("Modify")."</a>";
         }
     }
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 43202a01028..8baae98e6ef 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -72,8 +72,7 @@ if ($action == 'validatenewpassword' && $username && $passwordhash)
     if ($result < 0)
     {
         $message = '<div class="error">'.$langs->trans("ErrorLoginDoesNotExists", $username).'</div>';
-    }
-    else {
+    } else {
         if (dol_verifyHash($edituser->pass_temp, $passwordhash))
         {
         	// Clear session
@@ -84,8 +83,7 @@ if ($action == 'validatenewpassword' && $username && $passwordhash)
             dol_syslog("passwordforgotten.php new password for user->id=".$edituser->id." validated in database");
             header("Location: ".DOL_URL_ROOT.'/');
             exit;
-        }
-        else {
+        } else {
         	$langs->load("errors");
             $message = '<div class="error">'.$langs->trans("ErrorFailedToValidatePasswordReset").'</div>';
         }
@@ -101,8 +99,7 @@ if ($action == 'buildnewpassword' && $username)
     if (!$ok)
     {
         $message = '<div class="error">'.$langs->trans("ErrorBadValueForCode").'</div>';
-    }
-    else {
+    } else {
         $edituser = new User($db);
         $result = $edituser->fetch('', $username, '', 1);
         if ($result == 0 && preg_match('/@/', $username))
@@ -114,27 +111,23 @@ if ($action == 'buildnewpassword' && $username)
         {
             $message = '<div class="error">'.$langs->trans("ErrorLoginDoesNotExists", $username).'</div>';
             $username = '';
-        }
-        else {
+        } else {
             if (!$edituser->email)
             {
                 $message = '<div class="error">'.$langs->trans("ErrorLoginHasNoEmail").'</div>';
-            }
-            else {
+            } else {
                 $newpassword = $edituser->setPassword($user, '', 1);
                 if ($newpassword < 0)
                 {
                     // Failed
                     $message = '<div class="error">'.$langs->trans("ErrorFailedToChangePassword").'</div>';
-                }
-                else {
+                } else {
                     // Success
                     if ($edituser->send_password($user, $newpassword, 1) > 0)
                     {
                     	$message = '<div class="ok'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">'.$langs->trans("PasswordChangeRequestSent", $edituser->login, dolObfuscateEmail($edituser->email)).'</div>';
                         $username = '';
-                    }
-                    else {
+                    } else {
                         $message .= '<div class="error">'.$edituser->error.'</div>';
                     }
                 }
@@ -158,8 +151,7 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = $conf->global->MAIN_
 if (file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/passwordforgotten.tpl.php"))
 {
     $template_dir = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/";
-}
-else {
+} else {
     $template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
 }
 
@@ -178,17 +170,14 @@ $urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';
 if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 {
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
-}
-elseif (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+} elseif (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 {
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
 	$width = 128;
-}
-elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.svg'))
+} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.svg'))
 {
 	$urllogo = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.svg';
-}
-elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
+} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
 {
 	$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
 }
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 408900eb406..606380acd7c 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -208,8 +208,7 @@ if ($result)
 		$i++;
 	}
 	$db->free($result);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -238,8 +237,7 @@ if ($result)
 		$i++;
 	}
 	$db->free($result);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -384,8 +382,7 @@ if ($result)
         	print '<td class="center nowrap">';
         	print img_picto($langs->trans("Active"), 'tick');
         	print '</td>';
-        }
-        elseif (in_array($obj->id, $permsuser))					// Permission granted by user
+        } elseif (in_array($obj->id, $permsuser))					// Permission granted by user
         {
         	if ($caneditperms)
         	{
@@ -394,8 +391,7 @@ if ($result)
         	print '<td class="center nowrap">';
         	print img_picto($langs->trans("Active"), 'tick');
         	print '</td>';
-        }
-        elseif (is_array($permsgroupbyentity[$entity]))
+        } elseif (is_array($permsgroupbyentity[$entity]))
         {
         	if (in_array($obj->id, $permsgroupbyentity[$entity]))	// Permission granted by group
 	        {
@@ -408,8 +404,7 @@ if ($result)
 	        	print '<td class="center nowrap">';
 	        	print img_picto($langs->trans("Active"), 'tick');
 	        	print '</td>';
-	        }
-	        else {
+	        } else {
 	        	// Do not own permission
 	        	if ($caneditperms)
 	        	{
@@ -417,8 +412,7 @@ if ($result)
 	        	}
 	        	print '<td>&nbsp</td>';
 	        }
-        }
-        else {
+        } else {
         	// Do not own permission
         	if ($caneditperms)
         	{
@@ -435,8 +429,7 @@ if ($result)
 
 		$i++;
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 print '</table>';
 print '</div>';
 
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 9970026a524..fa769933355 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -192,13 +192,10 @@ $accessallowed              = $check_access['accessallowed'];
 $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 $fullpath_original_file     = $check_access['original_file']; // $fullpath_original_file is now a full path name
 
-if (!empty($hashp))
-{
+if (!empty($hashp)) {
 	$accessallowed = 1; // When using hashp, link is public so we force $accessallowed
 	$sqlprotectagainstexternals = '';
-}
-elseif (isset($_GET["publictakepos"]))
-{
+} elseif (isset($_GET["publictakepos"])) {
 	if (! empty($conf->global->TAKEPOS_AUTO_ORDER)) {
 		$accessallowed = 1; // Only if TakePOS Public Auto Order is enabled and received publictakepos variable
 	}
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index 9ec5421648b..9058577aa21 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -191,8 +191,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
     		        echo "\nUser Error: ".$user->error."\n";
     		        dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
     		        exit(-1);
-    		    }
-    		    else {
+    		    } else {
     		        if ($result == 0)
     		        {
     		            echo "\nUser login: ".$userlogin." does not exists for entity ".$conf->entity."\n";
@@ -257,8 +256,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
 	}
 
 	$conf = $savconf;
-}
-else {
+} else {
 	echo "cron_run_jobs.php no qualified job found\n";
 }
 

From d9f42f85d14a182d0a50bef75222b90616bcaa4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 15:08:14 +0200
Subject: [PATCH 342/490] add new rule

---
 dev/initdata/generate-invoice.php    |  6 ++--
 dev/initdata/generate-order.php      | 12 +++-----
 dev/initdata/generate-proposal.php   |  6 ++--
 dev/initdata/generate-thirdparty.php |  3 +-
 dev/initdata/import-products.php     | 12 +++-----
 dev/initdata/import-thirdparties.php | 15 ++++------
 dev/initdata/import-users.php        |  6 ++--
 dev/initdata/purge-data.php          |  3 +-
 dev/setup/codesniffer/ruleset.xml    |  2 +-
 htdocs/main.inc.php                  | 42 ++++++++++------------------
 10 files changed, 36 insertions(+), 71 deletions(-)

diff --git a/dev/initdata/generate-invoice.php b/dev/initdata/generate-invoice.php
index d4522ef047e..c35fe2440ef 100755
--- a/dev/initdata/generate-invoice.php
+++ b/dev/initdata/generate-invoice.php
@@ -179,12 +179,10 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 		if ($result)
 		{
 			print " OK with ref ".$object->ref."\n";;
-		}
-		else {
+		} else {
 			dol_print_error($db, $object->error);
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db, $object->error);
 	}
 }
diff --git a/dev/initdata/generate-order.php b/dev/initdata/generate-order.php
index f63d50a1967..c421e39ffe3 100755
--- a/dev/initdata/generate-order.php
+++ b/dev/initdata/generate-order.php
@@ -124,8 +124,7 @@ if ($resql) {
         $row = $db->fetch_row($resql);
         $societesid[$i] = $row[0];
     }
-}
-else { print "err"; }
+} else { print "err"; }
 
 $commandesid = array();
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande";
@@ -138,8 +137,7 @@ if ($resql) {
         $row = $db->fetch_row($resql);
         $commandesid[$i] = $row[0];
     }
-}
-else { print "err"; }
+} else { print "err"; }
 
 $prodids = array();
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product WHERE tosell=1";
@@ -206,14 +204,12 @@ for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
         {
             $db->commit();
             print " OK with ref ".$object->ref."\n";
-        }
-        else {
+        } else {
             print " KO\n";
             $db->rollback();
             dol_print_error($db, $object->error);
         }
-    }
-    else {
+    } else {
         print " KO\n";
         $db->rollback();
         dol_print_error($db, $object->error);
diff --git a/dev/initdata/generate-proposal.php b/dev/initdata/generate-proposal.php
index 60ba418b43b..42c0c4098f2 100755
--- a/dev/initdata/generate-proposal.php
+++ b/dev/initdata/generate-proposal.php
@@ -210,14 +210,12 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 		{
 		    $db->commit();
 		    print " OK with ref ".$object->ref."\n";
-		}
-		else {
+		} else {
 		    print " KO\n";
 		    $db->rollback();
 		    dol_print_error($db, $object->error);
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db, $object->error);
 	}
 }
diff --git a/dev/initdata/generate-thirdparty.php b/dev/initdata/generate-thirdparty.php
index f7bde473038..a13e2351e9c 100755
--- a/dev/initdata/generate-thirdparty.php
+++ b/dev/initdata/generate-thirdparty.php
@@ -136,8 +136,7 @@ for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++)
         }
 
         print "Company ".$s." created nom=".$soc->name."\n";
-    }
-    else {
+    } else {
     	print "Error: ".$soc->error."\n";
     }
 }
diff --git a/dev/initdata/import-products.php b/dev/initdata/import-products.php
index 78f3a0789f8..fb07143f972 100755
--- a/dev/initdata/import-products.php
+++ b/dev/initdata/import-products.php
@@ -163,8 +163,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     {
         print " - Error in create result code = ".$ret." - ".$produit->errorsToString();
         $errorrecord++;
-    }
-	else {
+    } else {
 	    print " - Creation OK with ref ".$produit->ref." - id = ".$ret;
 	}
 
@@ -179,8 +178,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         {
             print " - Error in updatePrice result code = ".$ret1." ".$ret2." - ".$produit->errorsToString();
             $errorrecord++;
-        }
-    	else {
+        } else {
     	    print " - updatePrice OK";
     	}
 	}
@@ -198,8 +196,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         {
             print " - Error in setMultiLangs result code = ".$ret." - ".$produit->errorsToString();
             $errorrecord++;
-        }
-    	else {
+        } else {
     	    print " - setMultiLangs OK";
     	}
 	}
@@ -224,8 +221,7 @@ if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
 {
     print "Rollback any changes.\n";
     $db->rollback();
-}
-else {
+} else {
     print "Commit all changes.\n";
     $db->commit();
 }
diff --git a/dev/initdata/import-thirdparties.php b/dev/initdata/import-thirdparties.php
index 87fef83de0f..a0ddaac7674 100755
--- a/dev/initdata/import-thirdparties.php
+++ b/dev/initdata/import-thirdparties.php
@@ -181,8 +181,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         {
             print " - Error in create result code = ".$ret." - ".$object->errorsToString();
             $errorrecord++;
-        }
-    	else {
+        } else {
     	    print " - Creation OK with name ".$object->name." - id = ".$ret;
     	}
     }
@@ -211,8 +210,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     	{
     	    print " - Error in create link with sale representative result code = ".$result." - ".$object->errorsToString();
     	    $errorrecord++;
-    	}
-    	else {
+    	} else {
     	    print " - create link sale representative OK";
     	}
 	}
@@ -241,8 +239,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         {
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
             $errorrecord++;
-        }
-    	else {
+        } else {
     	    print " - create contact OK";
     	}
 	}
@@ -274,8 +271,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         {
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
             $errorrecord++;
-        }
-    	else {
+        } else {
     	    print " - create contact OK";
     	}
 	}
@@ -301,8 +297,7 @@ if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
 {
     print "Rollback any changes.\n";
     $db->rollback();
-}
-else {
+} else {
     print "Commit all changes.\n";
     $db->commit();
 }
diff --git a/dev/initdata/import-users.php b/dev/initdata/import-users.php
index 25fa6a69e2d..8e4878577a1 100755
--- a/dev/initdata/import-users.php
+++ b/dev/initdata/import-users.php
@@ -142,8 +142,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     {
         print " - Error in create result code = ".$ret." - ".$object->errorsToString();
         $errorrecord++;
-    }
-	else {
+    } else {
 	    print " - Creation OK with login ".$object->login." - id = ".$ret;
 	}
 
@@ -167,8 +166,7 @@ if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
 {
     print "Rollback any changes.\n";
     $db->rollback();
-}
-else {
+} else {
     print "Commit all changes.\n";
     $db->commit();
 }
diff --git a/dev/initdata/purge-data.php b/dev/initdata/purge-data.php
index f9d8420b1e1..183140af202 100755
--- a/dev/initdata/purge-data.php
+++ b/dev/initdata/purge-data.php
@@ -325,8 +325,7 @@ if ($error || $mode != 'confirm')
 {
     print "\nRollback any changes.\n";
     $db->rollback();
-}
-else {
+} else {
     print "Commit all changes.\n";
     $db->commit();
 }
diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index 03104270dcf..4494e21f95a 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -214,7 +214,7 @@
     <rule ref="Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose" />
 
     <!-- <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseParenthesis" /> -->
-    <!-- <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace" /> -->
+    <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace" />
     <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword" />
 
     <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration.SpaceAfterOpen" />
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 569f4aa6c57..19f20276378 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -266,8 +266,7 @@ if (!empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERV
 			{
 				$newurl = preg_replace('/^http:/i', 'https:', $_SERVER["SCRIPT_URI"]);
 			}
-		}
-		else {
+		} else {
 			// Check HTTPS environment variable (Apache/mod_ssl only)
 			$newurl = preg_replace('/^http:/i', 'https:', DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
 		}
@@ -860,14 +859,12 @@ if (!GETPOST('nojs', 'int'))   // If javascript was not disabled on URL
 	{
 		$conf->use_javascript_ajax = !$user->conf->MAIN_DISABLE_JAVASCRIPT;
 	}
-}
-else $conf->use_javascript_ajax = 0;
+} else $conf->use_javascript_ajax = 0;
 // Set MAIN_OPTIMIZEFORTEXTBROWSER
 if (GETPOST('textbrowser', 'int') || (!empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || !empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))   // If we must enable text browser
 {
 	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = 1;
-}
-elseif (!empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))
+} elseif (!empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))
 {
 	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = $user->conf->MAIN_OPTIMIZEFORTEXTBROWSER;
 }
@@ -1134,8 +1131,7 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 			// default-src http: https: 'unsafe-eval' 'unsafe-inline'; object-src 'none'
 			header("Content-Security-Policy: ".$contentsecuritypolicy);
 		}
-	}
-	elseif (constant('FORCECSP'))
+	} elseif (constant('FORCECSP'))
 	{
 		header("Content-Security-Policy: ".constant('FORCECSP'));
 	}
@@ -1553,10 +1549,8 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			if (preg_match('/\d\.\d/', $appli))
 			{
 				if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-			}
-			else $appli .= " ".DOL_VERSION;
-		}
-		else $appli .= " ".DOL_VERSION;
+			} else $appli .= " ".DOL_VERSION;
+		} else $appli .= " ".DOL_VERSION;
 
 		if (!empty($conf->global->MAIN_FEATURES_LEVEL)) $appli .= "<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
 
@@ -1727,8 +1721,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
     {
         $userImage          = Form::showphoto('userphoto', $user, 0, 0, 0, 'photouserphoto userphoto', 'small', 0, 1);
         $userDropDownImage  = Form::showphoto('userphoto', $user, 0, 0, 0, 'dropdown-user-image', 'small', 0, 1);
-    }
-    else {
+    } else {
         $nophoto = '/public/theme/common/user_anonymous.png';
         if ($user->gender == 'man') $nophoto = '/public/theme/common/user_man.png';
         if ($user->gender == 'woman') $nophoto = '/public/theme/common/user_woman.png';
@@ -1781,8 +1774,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
     {
         if ($result == 0) {
             $dropdownBody .= $hookmanager->resPrint; // add
-        }
-        else {
+        } else {
             $dropdownBody = $hookmanager->resPrint; // replace
         }
     }
@@ -1808,10 +1800,8 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
     	if (preg_match('/\d\.\d/', $appli))
     	{
     		if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-    	}
-    	else $appli .= " ".DOL_VERSION;
-    }
-    else $appli .= " ".DOL_VERSION;
+    	} else $appli .= " ".DOL_VERSION;
+    } else $appli .= " ".DOL_VERSION;
 
     if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 	    $btnUser = '<!-- div for user link -->
@@ -2202,10 +2192,8 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 				if (preg_match('/\d\.\d/', $appli))
 				{
 					if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-				}
-				else $appli .= " ".DOL_VERSION;
-			}
-			else $appli .= " ".DOL_VERSION;
+				} else $appli .= " ".DOL_VERSION;
+			} else $appli .= " ".DOL_VERSION;
 			print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
 			if ($doliurl) print '<a class="help" target="_blank" rel="noopener" href="'.$doliurl.'">';
 			else print '<span class="help">';
@@ -2259,8 +2247,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 			if (empty($reshook))
 			{
 				$bugbaseurl .= $hookmanager->resPrint;
-			}
-			else $bugbaseurl = $hookmanager->resPrint;
+			} else $bugbaseurl = $hookmanager->resPrint;
 
 			$bugbaseurl .= urlencode("\n");
 			$bugbaseurl .= urlencode("## Report\n");
@@ -2580,8 +2567,7 @@ if (!function_exists("llxFooter"))
 				// No ping done if we are into an alpha version
 				if (strpos('alpha', DOL_VERSION) > 0 && !$forceping) {
 					print "\n<!-- NO JS CODE TO ENABLE the anonymous Ping. It is an alpha version -->\n";
-				}
-				elseif (empty($_COOKIE['DOLINSTALLNOPING_'.$hash_unique_id]) || $forceping)	// Cookie is set when we uncheck the checkbox in the installation wizard.
+				} elseif (empty($_COOKIE['DOLINSTALLNOPING_'.$hash_unique_id]) || $forceping)	// Cookie is set when we uncheck the checkbox in the installation wizard.
 				{
 					// MAIN_LAST_PING_KO_DATE
 					// Disable ping if MAIN_LAST_PING_KO_DATE is set and is recent

From 459154edc061440a62687dd2578d77fb32a44fe2 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 21 May 2020 13:11:06 +0000
Subject: [PATCH 343/490] Fixing style errors.

---
 htdocs/core/class/html.formmail.class.php     |  3 +--
 htdocs/webservices/server_actioncomm.php      |  6 ++----
 .../webservices/server_productorservice.php   |  3 +--
 htdocs/webservices/server_user.php            |  9 +++-----
 htdocs/website/index.php                      | 21 +++++++------------
 5 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 598e71d2e34..b1dcdc15b31 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1201,8 +1201,7 @@ class FormMail extends Form
 				if ($type_template == 'body') {
 					// Special case to use this->withbody as content
 					$defaultmessage = $this->withbody;
-				}
-				elseif ($type_template == 'facture_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoice"); } elseif ($type_template == 'facture_relance') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder"); } elseif ($type_template == 'propal_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendProposal"); } elseif ($type_template == 'supplier_proposal_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal"); } elseif ($type_template == 'order_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendOrder"); } elseif ($type_template == 'order_supplier_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder"); } elseif ($type_template == 'invoice_supplier_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice"); } elseif ($type_template == 'shipping_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendShipping"); } elseif ($type_template == 'fichinter_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendFichInter"); } elseif ($type_template == 'thirdparty') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentThirdparty"); } elseif ($type_template == 'user') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentUser"); } elseif (!empty($type_template)) { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContent".ucfirst($type_template)); }
+				} elseif ($type_template == 'facture_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoice"); } elseif ($type_template == 'facture_relance') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder"); } elseif ($type_template == 'propal_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendProposal"); } elseif ($type_template == 'supplier_proposal_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal"); } elseif ($type_template == 'order_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendOrder"); } elseif ($type_template == 'order_supplier_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder"); } elseif ($type_template == 'invoice_supplier_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice"); } elseif ($type_template == 'shipping_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendShipping"); } elseif ($type_template == 'fichinter_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendFichInter"); } elseif ($type_template == 'thirdparty') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentThirdparty"); } elseif ($type_template == 'user') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentUser"); } elseif (!empty($type_template)) { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContent".ucfirst($type_template)); }
 
 				$ret->label = 'default';
 				$ret->lang = $outputlangs->defaultlang;
diff --git a/htdocs/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php
index 10ef9cfbd7e..092624c1501 100644
--- a/htdocs/webservices/server_actioncomm.php
+++ b/htdocs/webservices/server_actioncomm.php
@@ -386,13 +386,11 @@ function getListActionCommType($authentication)
 				 $objectresp = array(
 			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
 			        'actioncommtypes'=>$resultarray);
-			}
-			else {
+			} else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
-		}
-		else {
+		} else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index 68563bfab38..fa5eab60fa8 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -987,8 +987,7 @@ function getListOfProductsOrServices($authentication, $filterproduct)
 			'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
         	'products'=>$arrayproducts
         );
-    }
-    else {
+    } else {
         $objectresp = array(
 			'result'=>array('result_code' => 'OK', 'result_label' => ''),
         	'products'=>$arrayproducts
diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php
index c37e920f61d..bc43c4ab6d4 100644
--- a/htdocs/webservices/server_user.php
+++ b/htdocs/webservices/server_user.php
@@ -642,20 +642,17 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 							$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>'SUCCESS'), 'id'=>$socid_return);
 							$error = 0;
 						}
-					}
-					else {
+					} else {
 						$error++;
 						$errors = ($thirdparty->error ? array($thirdparty->error) : $thirdparty->errors);
 					}
 				}
-			}
-			else {
+			} else {
 				// retour creation KO
 				$error++;
 				$errorcode = 'NOT_CREATE'; $errorlabel = 'Object not create';
 			}
-		}
-		else {
+		} else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 3d29b8ac2ea..1caeb326854 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -1863,35 +1863,29 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 							header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
 							exit;
 						}
-					}
-					else {
+					} else {
 						if ($action == 'updatesource') $action = 'editsource';
 						if ($action == 'updatecontent') $action = 'editcontent';
 					}
-				}
-				else {
+				} else {
 					setEventMessages('Failed to write file '.$filetpl, null, 'errors');
 					header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
 	   				exit;
 				}
-			}
-			else {
+			} else {
 				$db->rollback();
 			}
-		}
-		else {
+		} else {
 			header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
 			exit;
 		}
-	}
-	else {
+	} else {
 		if (!$error)
 		{
 			if (empty($websitekey) || $websitekey == '-1')
 			{
 				setEventMessages($langs->trans("NoWebSiteCreateOneFirst"), null, 'warnings');
-			}
-			else {
+			} else {
 				setEventMessages($langs->trans("NoPageYet"), null, 'warnings');
 				setEventMessages($langs->trans("YouCanCreatePageOrImportTemplate"), null, 'warnings');
 			}
@@ -1929,8 +1923,7 @@ if ($action == 'regeneratesite')
 	{
 		setEventMessages($langs->trans("PagesRegenerated"), null, 'mesgs');
 		$action = 'preview';
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'preview';
 	}

From 674b0e38c82855b5357c582988d75e37a005baf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 15:13:31 +0200
Subject: [PATCH 344/490] add new rule

---
 dev/setup/codesniffer/ruleset.xml        |  2 +-
 htdocs/document.php                      | 12 ++++--------
 htdocs/viewimage.php                     |  3 +--
 test/phpunit/CodingSqlTest.php           |  9 +++------
 test/phpunit/FactureRecTest.php          |  3 +--
 test/phpunit/FactureTest.php             |  3 +--
 test/phpunit/WebservicesInvoicesTest.php |  9 +++------
 7 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index 4494e21f95a..03104270dcf 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -214,7 +214,7 @@
     <rule ref="Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose" />
 
     <!-- <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseParenthesis" /> -->
-    <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace" />
+    <!-- <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace" /> -->
     <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword" />
 
     <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration.SpaceAfterOpen" />
diff --git a/htdocs/document.php b/htdocs/document.php
index 0d08296e63e..3afa7d252cf 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -133,17 +133,14 @@ if (!empty($hashp))
 				// We remove first level of directory
 				$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 				//var_dump($original_file); exit;
-			}
-			else {
+			} else {
 				accessforbidden('Bad link. File is from another module part.', 0, 0, 1);
 			}
-		}
-		else {
+		} else {
 			$modulepart = $moduleparttocheck;
 			$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 		}
-	}
-	else {
+	} else {
 		$langs->load("errors");
 		accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"), 0, 0, 1);
 	}
@@ -181,8 +178,7 @@ if (!empty($hashp))
 {
 	$accessallowed = 1; // When using hashp, link is public so we force $accessallowed
 	$sqlprotectagainstexternals = '';
-}
-else {
+} else {
 	// Basic protection (against external users only)
 	if ($user->socid > 0)
 	{
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index fa769933355..c2856848dc5 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -127,8 +127,7 @@ if (GETPOST("cache", 'alpha'))
     {
         header('Cache-Control: max-age=3600, public, must-revalidate');
         header('Pragma: cache'); // This is to avoid having Pragma: no-cache
-    }
-    else header('Cache-Control: no-cache');
+    } else header('Cache-Control: no-cache');
     //print $dolibarr_nocache; exit;
 }
 
diff --git a/test/phpunit/CodingSqlTest.php b/test/phpunit/CodingSqlTest.php
index c9a5d12f3fc..56b0d001a81 100644
--- a/test/phpunit/CodingSqlTest.php
+++ b/test/phpunit/CodingSqlTest.php
@@ -201,17 +201,14 @@ class CodingSqlTest extends PHPUnit\Framework\TestCase
                 if ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/migration')
                 {
                     // Test for migration files only
-                }
-                elseif ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/data')
+                } elseif ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/data')
                 {
                     // Test for data files only
-                }
-                else {
+                } else {
                     if (preg_match('/\.key\.sql$/', $file))
                     {
                         // Test for key files only
-                    }
-                    else {
+                    } else {
                         // Test for non key files only
                         $result=(strpos($filecontent, 'KEY ') && strpos($filecontent, 'PRIMARY KEY') == 0);
                         print __METHOD__." Result for checking we don't have ' KEY ' instead of a sql file to create index = ".$result."\n";
diff --git a/test/phpunit/FactureRecTest.php b/test/phpunit/FactureRecTest.php
index fa44fda619f..3778989945a 100644
--- a/test/phpunit/FactureRecTest.php
+++ b/test/phpunit/FactureRecTest.php
@@ -186,8 +186,7 @@ class FactureRecTest extends PHPUnit\Framework\TestCase
         if (get_class($oA) !== get_class($oB))
         {
             $retAr[]="Supplied objects are not of same class.";
-        }
-        else {
+        } else {
             $oVarsA=get_object_vars($oA);
             $oVarsB=get_object_vars($oB);
             $aKeys=array_keys($oVarsA);
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index 83a7c0cfbe9..dc34b061806 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -365,8 +365,7 @@ class FactureTest extends PHPUnit\Framework\TestCase
         if (get_class($oA) !== get_class($oB))
         {
             $retAr[]="Supplied objects are not of same class.";
-        }
-        else {
+        } else {
             $oVarsA=get_object_vars($oA);
             $oVarsB=get_object_vars($oB);
             $aKeys=array_keys($oVarsA);
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index dc6cc93c8a5..428db9e8ef5 100644
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -255,8 +255,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
-    	}
-    	catch (SoapFault $exception)
+    	} catch (SoapFault $exception)
     	{
     		echo $exception;
     		$result=0;
@@ -313,8 +312,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
-    	}
-    	catch (SoapFault $exception)
+    	} catch (SoapFault $exception)
     	{
     		echo $exception;
     		$result=0;
@@ -413,8 +411,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
-    	}
-    	catch (SoapFault $exception)
+    	} catch (SoapFault $exception)
     	{
     		echo $exception;
     		$result=0;

From 3a786ca766f73ac79801cb6cedcf56ecae7b45d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 15:25:42 +0200
Subject: [PATCH 345/490] add new rule

---
 htdocs/core/class/html.formmail.class.php | 26 ++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index b1dcdc15b31..4a6d7ee01ea 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1201,7 +1201,31 @@ class FormMail extends Form
 				if ($type_template == 'body') {
 					// Special case to use this->withbody as content
 					$defaultmessage = $this->withbody;
-				} elseif ($type_template == 'facture_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoice"); } elseif ($type_template == 'facture_relance') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder"); } elseif ($type_template == 'propal_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendProposal"); } elseif ($type_template == 'supplier_proposal_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal"); } elseif ($type_template == 'order_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendOrder"); } elseif ($type_template == 'order_supplier_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder"); } elseif ($type_template == 'invoice_supplier_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice"); } elseif ($type_template == 'shipping_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendShipping"); } elseif ($type_template == 'fichinter_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendFichInter"); } elseif ($type_template == 'thirdparty') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentThirdparty"); } elseif ($type_template == 'user') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentUser"); } elseif (!empty($type_template)) { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContent".ucfirst($type_template)); }
+				} elseif ($type_template == 'facture_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoice");
+				} elseif ($type_template == 'facture_relance') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder");
+				} elseif ($type_template == 'propal_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendProposal");
+				} elseif ($type_template == 'supplier_proposal_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal");
+				} elseif ($type_template == 'order_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendOrder");
+				} elseif ($type_template == 'order_supplier_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder");
+				} elseif ($type_template == 'invoice_supplier_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice");
+				} elseif ($type_template == 'shipping_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendShipping");
+				} elseif ($type_template == 'fichinter_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendFichInter");
+				} elseif ($type_template == 'thirdparty') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentThirdparty");
+				} elseif ($type_template == 'user') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentUser");
+				} elseif (!empty($type_template)) {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContent".ucfirst($type_template));
+				}
 
 				$ret->label = 'default';
 				$ret->lang = $outputlangs->defaultlang;

From 5940d3705aded09e304058292dc60cb40f3b5bea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 16:00:12 +0200
Subject: [PATCH 346/490] add new rule

---
 htdocs/contrat/class/contrat.class.php | 17 ++++-
 htdocs/core/ajax/extraparams.php       | 31 ++++++++-
 htdocs/core/lib/functions.lib.php      | 94 +++++++++++++++++++++-----
 htdocs/core/tpl/notes.tpl.php          | 24 ++++++-
 htdocs/takepos/admin/orderprinters.php | 34 +++++++++-
 5 files changed, 178 insertions(+), 22 deletions(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index a702847e23b..c2200a411c2 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2716,7 +2716,22 @@ class ContratLigne extends CommonObjectLine
 		global $langs;
 		$langs->load("contracts");
 
-		if ($status == self::STATUS_INITIAL) { $labelStatus = $langs->trans("ServiceStatusInitial"); $labelStatusShort = $langs->trans("ServiceStatusInitial"); } elseif ($status == self::STATUS_OPEN && $expired == -1) { $labelStatus = $langs->trans("ServiceStatusRunning"); $labelStatusShort = $langs->trans("ServiceStatusRunning"); } elseif ($status == self::STATUS_OPEN && $expired == 0) { $labelStatus = $langs->trans("ServiceStatusNotLate"); $labelStatusShort = $langs->trans("ServiceStatusNotLateShort"); } elseif ($status == self::STATUS_OPEN && $expired == 1) { $labelStatus = $langs->trans("ServiceStatusLate"); $labelStatusShort = $langs->trans("ServiceStatusLateShort"); } elseif ($status == self::STATUS_CLOSED) { $labelStatus = $langs->trans("ServiceStatusClosed"); $labelStatusShort = $langs->trans("ServiceStatusClosed"); }
+        if ($status == self::STATUS_INITIAL) {
+            $labelStatus = $langs->trans("ServiceStatusInitial");
+            $labelStatusShort = $langs->trans("ServiceStatusInitial");
+        } elseif ($status == self::STATUS_OPEN && $expired == -1) {
+            $labelStatus = $langs->trans("ServiceStatusRunning");
+            $labelStatusShort = $langs->trans("ServiceStatusRunning");
+        } elseif ($status == self::STATUS_OPEN && $expired == 0) {
+            $labelStatus = $langs->trans("ServiceStatusNotLate");
+            $labelStatusShort = $langs->trans("ServiceStatusNotLateShort");
+        } elseif ($status == self::STATUS_OPEN && $expired == 1) {
+            $labelStatus = $langs->trans("ServiceStatusLate");
+            $labelStatusShort = $langs->trans("ServiceStatusLateShort");
+        } elseif ($status == self::STATUS_CLOSED) {
+            $labelStatus = $langs->trans("ServiceStatusClosed");
+            $labelStatusShort = $langs->trans("ServiceStatusClosed");
+        }
 
 		$statusType = 'status'.$status;
 		if ($status == self::STATUS_OPEN && $expired == 1) $statusType = 'status1';
diff --git a/htdocs/core/ajax/extraparams.php b/htdocs/core/ajax/extraparams.php
index 803155ce784..16f39af9bde 100644
--- a/htdocs/core/ajax/extraparams.php
+++ b/htdocs/core/ajax/extraparams.php
@@ -51,11 +51,38 @@ if (!empty($id) && !empty($element) && !empty($htmlelement) && !empty($type))
 	$classpath = $subelement = $element;
 
 	// For compatibility
-	if ($element == 'order' || $element == 'commande') { $classpath = $subelement = 'commande'; } elseif ($element == 'propal') { $classpath = 'comm/propal'; $subelement = 'propal'; } elseif ($element == 'facture') { $classpath = 'compta/facture'; $subelement = 'facture'; } elseif ($element == 'contract') { $classpath = $subelement = 'contrat'; } elseif ($element == 'shipping') { $classpath = $subelement = 'expedition'; } elseif ($element == 'deplacement') { $classpath = 'compta/deplacement'; $subelement = 'deplacement'; } elseif ($element == 'order_supplier') { $classpath = 'fourn'; $subelement = 'fournisseur.commande'; } elseif ($element == 'invoice_supplier') { $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
+	if ($element == 'order' || $element == 'commande') {
+		$classpath = $subelement = 'commande';
+	} elseif ($element == 'propal') {
+		$classpath = 'comm/propal';
+		$subelement = 'propal';
+	} elseif ($element == 'facture') {
+		$classpath = 'compta/facture';
+		$subelement = 'facture';
+	} elseif ($element == 'contract') {
+		$classpath = $subelement = 'contrat';
+	} elseif ($element == 'shipping') {
+		$classpath = $subelement = 'expedition';
+	} elseif ($element == 'deplacement') {
+		$classpath = 'compta/deplacement';
+		$subelement = 'deplacement';
+	} elseif ($element == 'order_supplier') {
+		$classpath = 'fourn';
+		$subelement = 'fournisseur.commande';
+	} elseif ($element == 'invoice_supplier') {
+		$classpath = 'fourn';
+		$subelement = 'fournisseur.facture';
+	}
 
 	dol_include_once('/'.$classpath.'/class/'.$subelement.'.class.php');
 
-	if ($element == 'order_supplier') { $classname = 'CommandeFournisseur'; } elseif ($element == 'invoice_supplier') { $classname = 'FactureFournisseur'; } else $classname = ucfirst($subelement);
+	if ($element == 'order_supplier') {
+		$classname = 'CommandeFournisseur';
+	} elseif ($element == 'invoice_supplier') {
+		$classname = 'FactureFournisseur';
+	} else {
+		$classname = ucfirst($subelement);
+	}
 
 	$object = new $classname($db);
 	$object->fetch($id);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 518215b9b3f..8ab6cb43be9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -492,19 +492,48 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 		{
 			$loopnb++; $newout = '';
 
-			if ($reg[1] == 'DAY') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['mday']; } elseif ($reg[1] == 'MONTH') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['mon']; } elseif ($reg[1] == 'YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['year']; } elseif ($reg[1] == 'PREVIOUS_DAY') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; } elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_prev_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; } elseif ($reg[1] == 'PREVIOUS_YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); } elseif ($reg[1] == 'NEXT_DAY') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; } elseif ($reg[1] == 'NEXT_MONTH') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_next_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; } elseif ($reg[1] == 'NEXT_YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); } elseif ($reg[1] == 'MYCOMPANY_COUNTRY_ID' || $reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID')
-			{
+			if ($reg[1] == 'DAY') {
+				$tmp = dol_getdate(dol_now(), true);
+				$newout = $tmp['mday'];
+			} elseif ($reg[1] == 'MONTH') {
+				$tmp = dol_getdate(dol_now(), true);
+				$newout = $tmp['mon'];
+			} elseif ($reg[1] == 'YEAR') {
+				$tmp = dol_getdate(dol_now(), true);
+				$newout = $tmp['year'];
+			} elseif ($reg[1] == 'PREVIOUS_DAY') {
+				$tmp = dol_getdate(dol_now(), true);
+				$tmp2 = dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']);
+				$newout = $tmp2['day'];
+			} elseif ($reg[1] == 'PREVIOUS_MONTH') {
+				$tmp = dol_getdate(dol_now(), true);
+				$tmp2 = dol_get_prev_month($tmp['mon'], $tmp['year']);
+				$newout = $tmp2['month'];
+			} elseif ($reg[1] == 'PREVIOUS_YEAR') {
+				$tmp = dol_getdate(dol_now(), true);
+				$newout = ($tmp['year'] - 1);
+			} elseif ($reg[1] == 'NEXT_DAY') {
+				$tmp = dol_getdate(dol_now(), true);
+				$tmp2 = dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']);
+				$newout = $tmp2['day'];
+			} elseif ($reg[1] == 'NEXT_MONTH') {
+				$tmp = dol_getdate(dol_now(), true);
+				$tmp2 = dol_get_next_month($tmp['mon'], $tmp['year']);
+				$newout = $tmp2['month'];
+			} elseif ($reg[1] == 'NEXT_YEAR') {
+				$tmp = dol_getdate(dol_now(), true);
+				$newout = ($tmp['year'] + 1);
+			} elseif ($reg[1] == 'MYCOMPANY_COUNTRY_ID' || $reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID') {
 				$newout = $mysoc->country_id;
-			} elseif ($reg[1] == 'USER_ID' || $reg[1] == 'USERID')
-			{
+			} elseif ($reg[1] == 'USER_ID' || $reg[1] == 'USERID') {
 				$newout = $user->id;
-			} elseif ($reg[1] == 'USER_SUPERVISOR_ID' || $reg[1] == 'SUPERVISOR_ID' || $reg[1] == 'SUPERVISORID')
-			{
+			} elseif ($reg[1] == 'USER_SUPERVISOR_ID' || $reg[1] == 'SUPERVISOR_ID' || $reg[1] == 'SUPERVISORID') {
 				$newout = $user->fk_user;
-			} elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID')
-			{
+			} elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID') {
 				$newout = $conf->entity;
-			} else $newout = ''; // Key not found, we replace with empty string
+			} else {
+				$newout = ''; // Key not found, we replace with empty string
+			}
 			//var_dump('__'.$reg[1].'__ -> '.$newout);
 			$out = preg_replace('/__'.preg_quote($reg[1], '/').'__/', $newout, $out);
 		}
@@ -522,8 +551,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 			if (preg_match('/[^0-9,-]+/i', $out)) $out = '';
 			break;
 		case 'alpha':
-			if (!is_array($out))
-			{
+			if (!is_array($out)) {
 				// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
 				// '../' is dangerous because it allows dir transversals
 				$out = str_replace(array('"', '../'), '', trim($out));
@@ -3285,7 +3313,25 @@ function img_action($titlealt, $numaction)
 
 	if (empty($titlealt) || $titlealt == 'default')
 	{
-		if ($numaction == '-1' || $numaction == 'ST_NO') { $numaction = -1; $titlealt = $langs->transnoentitiesnoconv('ChangeDoNotContact'); } elseif ($numaction == '0' || $numaction == 'ST_NEVER') { $numaction = 0; $titlealt = $langs->transnoentitiesnoconv('ChangeNeverContacted'); } elseif ($numaction == '1' || $numaction == 'ST_TODO') { $numaction = 1; $titlealt = $langs->transnoentitiesnoconv('ChangeToContact'); } elseif ($numaction == '2' || $numaction == 'ST_PEND') { $numaction = 2; $titlealt = $langs->transnoentitiesnoconv('ChangeContactInProcess'); } elseif ($numaction == '3' || $numaction == 'ST_DONE') { $numaction = 3; $titlealt = $langs->transnoentitiesnoconv('ChangeContactDone'); } else { $titlealt = $langs->transnoentitiesnoconv('ChangeStatus '.$numaction); $numaction = 0; }
+		if ($numaction == '-1' || $numaction == 'ST_NO') {
+			$numaction = -1;
+			$titlealt = $langs->transnoentitiesnoconv('ChangeDoNotContact');
+		} elseif ($numaction == '0' || $numaction == 'ST_NEVER') {
+			$numaction = 0;
+			$titlealt = $langs->transnoentitiesnoconv('ChangeNeverContacted');
+		} elseif ($numaction == '1' || $numaction == 'ST_TODO') {
+			$numaction = 1;
+			$titlealt = $langs->transnoentitiesnoconv('ChangeToContact');
+		} elseif ($numaction == '2' || $numaction == 'ST_PEND') {
+			$numaction = 2;
+			$titlealt = $langs->transnoentitiesnoconv('ChangeContactInProcess');
+		} elseif ($numaction == '3' || $numaction == 'ST_DONE') {
+			$numaction = 3;
+			$titlealt = $langs->transnoentitiesnoconv('ChangeContactDone');
+		} else {
+			$titlealt = $langs->transnoentitiesnoconv('ChangeStatus '.$numaction);
+			$numaction = 0;
+		}
 	}
 	if (!is_numeric($numaction)) $numaction = 0;
 
@@ -3570,7 +3616,9 @@ function img_left($titlealt = 'default', $selected = 0, $moreatt = '')
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Left');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Left');
+	}
 
 	return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $moreatt);
 }
@@ -3613,15 +3661,29 @@ function img_allow($allow, $titlealt = 'default')
 /**
  *	Return image of a credit card according to its brand name
  *
- *	@param	string	$brand		Brand name of credit card
- *  @param	string	$morecss	More CSS
+ *	@param  string	$brand		Brand name of credit card
+ *  @param  string	$morecss	More CSS
  *	@return string     			Return img tag
  */
 function img_credit_card($brand, $morecss = null)
 {
 	if (is_null($morecss)) $morecss = 'fa-2x';
 
-	if ($brand == 'visa' || $brand == 'Visa') {$brand = 'cc-visa'; } elseif ($brand == 'mastercard' || $brand == 'MasterCard') {$brand = 'cc-mastercard'; } elseif ($brand == 'amex' || $brand == 'American Express') {$brand = 'cc-amex'; } elseif ($brand == 'discover' || $brand == 'Discover') {$brand = 'cc-discover'; } elseif ($brand == 'jcb' || $brand == 'JCB') {$brand = 'cc-jcb'; } elseif ($brand == 'diners' || $brand == 'Diners club') {$brand = 'cc-diners-club'; } elseif (!in_array($brand, array('cc-visa', 'cc-mastercard', 'cc-amex', 'cc-discover', 'cc-jcb', 'cc-diners-club'))) {$brand = 'credit-card'; }
+	if ($brand == 'visa' || $brand == 'Visa') {
+		$brand = 'cc-visa';
+	} elseif ($brand == 'mastercard' || $brand == 'MasterCard') {
+		$brand = 'cc-mastercard';
+	} elseif ($brand == 'amex' || $brand == 'American Express') {
+		$brand = 'cc-amex';
+	} elseif ($brand == 'discover' || $brand == 'Discover') {
+		$brand = 'cc-discover';
+	} elseif ($brand == 'jcb' || $brand == 'JCB') {
+		$brand = 'cc-jcb';
+	} elseif ($brand == 'diners' || $brand == 'Diners club') {
+		$brand = 'cc-diners-club';
+	} elseif (!in_array($brand, array('cc-visa', 'cc-mastercard', 'cc-amex', 'cc-discover', 'cc-jcb', 'cc-diners-club'))) {
+		$brand = 'credit-card';
+	}
 
 	return '<span class="fa fa-'.$brand.' fa-fw'.($morecss ? ' '.$morecss : '').'"></span>';
 }
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index 8d1f7256ab2..f387725bece 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -57,7 +57,29 @@ if (!empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES))
 }
 
 // Special cases
-if ($module == 'propal') { $permission = $user->rights->propale->creer; } elseif ($module == 'supplier_proposal') { $permission = $user->rights->supplier_proposal->creer; } elseif ($module == 'fichinter') { $permission = $user->rights->ficheinter->creer; } elseif ($module == 'project') { $permission = $user->rights->projet->creer; } elseif ($module == 'project_task') { $permission = $user->rights->projet->creer; } elseif ($module == 'invoice_supplier') { $permission = $user->rights->fournisseur->facture->creer; } elseif ($module == 'order_supplier') { $permission = $user->rights->fournisseur->commande->creer; } elseif ($module == 'societe') { $permission = $user->rights->societe->creer; } elseif ($module == 'contact') { $permission = $user->rights->societe->creer; } elseif ($module == 'shipping') { $permission = $user->rights->expedition->creer; } elseif ($module == 'product') { $permission = $user->rights->produit->creer; }
+if ($module == 'propal') {
+	$permission = $user->rights->propale->creer;
+} elseif ($module == 'supplier_proposal') {
+	$permission = $user->rights->supplier_proposal->creer;
+} elseif ($module == 'fichinter') {
+	$permission = $user->rights->ficheinter->creer;
+} elseif ($module == 'project') {
+	$permission = $user->rights->projet->creer;
+} elseif ($module == 'project_task') {
+	$permission = $user->rights->projet->creer;
+} elseif ($module == 'invoice_supplier') {
+	$permission = $user->rights->fournisseur->facture->creer;
+} elseif ($module == 'order_supplier') {
+	$permission = $user->rights->fournisseur->commande->creer;
+} elseif ($module == 'societe') {
+	$permission = $user->rights->societe->creer;
+} elseif ($module == 'contact') {
+	$permission = $user->rights->societe->creer;
+} elseif ($module == 'shipping') {
+	$permission = $user->rights->expedition->creer;
+} elseif ($module == 'product') {
+	$permission = $user->rights->produit->creer;
+}
 //else dol_print_error('','Bad value '.$module.' for param module');
 
 if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) $typeofdata = 'ckeditor:dolibarr_notes:100%:200::1:12:95%:0'; // Rem: This var is for all notes, not only thirdparties note.
diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php
index a9a4b945d0d..79a16d77861 100644
--- a/htdocs/takepos/admin/orderprinters.php
+++ b/htdocs/takepos/admin/orderprinters.php
@@ -72,9 +72,39 @@ if ($action == "SavePrinter2") {
 $categstatic = new Categorie($db);
 $form = new Form($db);
 
-if ($type == Categorie::TYPE_PRODUCT) { $title = $langs->trans("ProductsCategoriesArea"); $typetext = 'product'; } elseif ($type == Categorie::TYPE_SUPPLIER) { $title = $langs->trans("SuppliersCategoriesArea"); $typetext = 'supplier'; } elseif ($type == Categorie::TYPE_CUSTOMER) { $title = $langs->trans("CustomersCategoriesArea"); $typetext = 'customer'; } elseif ($type == Categorie::TYPE_MEMBER) { $title = $langs->trans("MembersCategoriesArea"); $typetext = 'member'; } elseif ($type == Categorie::TYPE_CONTACT) { $title = $langs->trans("ContactsCategoriesArea"); $typetext = 'contact'; } elseif ($type == Categorie::TYPE_ACCOUNT) { $title = $langs->trans("AccountsCategoriesArea"); $typetext = 'bank_account'; } elseif ($type == Categorie::TYPE_PROJECT) { $title = $langs->trans("ProjectsCategoriesArea"); $typetext = 'project'; } elseif ($type == Categorie::TYPE_USER) { $title = $langs->trans("UsersCategoriesArea"); $typetext = 'user'; } else { $title = $langs->trans("CategoriesArea"); $typetext = 'unknown'; }
+if ($type == Categorie::TYPE_PRODUCT) {
+	$title = $langs->trans("ProductsCategoriesArea");
+	$typetext = 'product';
+} elseif ($type == Categorie::TYPE_SUPPLIER) {
+	$title = $langs->trans("SuppliersCategoriesArea");
+	$typetext = 'supplier';
+} elseif ($type == Categorie::TYPE_CUSTOMER) {
+	$title = $langs->trans("CustomersCategoriesArea");
+	$typetext = 'customer';
+} elseif ($type == Categorie::TYPE_MEMBER) {
+	$title = $langs->trans("MembersCategoriesArea");
+	$typetext = 'member';
+} elseif ($type == Categorie::TYPE_CONTACT) {
+	$title = $langs->trans("ContactsCategoriesArea");
+	$typetext = 'contact';
+} elseif ($type == Categorie::TYPE_ACCOUNT) {
+	$title = $langs->trans("AccountsCategoriesArea");
+	$typetext = 'bank_account';
+} elseif ($type == Categorie::TYPE_PROJECT) {
+	$title = $langs->trans("ProjectsCategoriesArea");
+	$typetext = 'project';
+} elseif ($type == Categorie::TYPE_USER) {
+	$title = $langs->trans("UsersCategoriesArea");
+	$typetext = 'user';
+} else {
+	$title = $langs->trans("CategoriesArea");
+	$typetext = 'unknown';
+}
 
-$arrayofjs = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
+$arrayofjs = array(
+	'/includes/jquery/plugins/jquerytreeview/jquery.treeview.js',
+	'/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js',
+);
 $arrayofcss = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
 
 llxHeader('', $title, '', '', 0, 0, $arrayofjs, $arrayofcss);

From 37202a54e92c0b0068f988ac3936590685c65104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 16:04:52 +0200
Subject: [PATCH 347/490] add new rule

---
 htdocs/core/ajax/saveinplace.php | 53 +++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/htdocs/core/ajax/saveinplace.php b/htdocs/core/ajax/saveinplace.php
index 5c7d363a2f9..8273683b8de 100644
--- a/htdocs/core/ajax/saveinplace.php
+++ b/htdocs/core/ajax/saveinplace.php
@@ -59,49 +59,60 @@ top_httphead();
 if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_element))
 {
 	$ext_element = GETPOST('ext_element', 'alpha', 2);
-	$field				= substr($field, 8); // remove prefix val_
+	$field = substr($field, 8); // remove prefix val_
 	$type = GETPOST('type', 'alpha', 2);
-	$value				= ($type == 'ckeditor' ? GETPOST('value', '', 2) : GETPOST('value', 'alpha', 2));
-	$loadmethod			= GETPOST('loadmethod', 'alpha', 2);
-	$savemethod			= GETPOST('savemethod', 'alpha', 2);
+	$value = ($type == 'ckeditor' ? GETPOST('value', '', 2) : GETPOST('value', 'alpha', 2));
+	$loadmethod = GETPOST('loadmethod', 'alpha', 2);
+	$savemethod = GETPOST('savemethod', 'alpha', 2);
 	$savemethodname = (!empty($savemethod) ? $savemethod : 'setValueFrom');
-	$newelement			= $element;
+	$newelement = $element;
 
 	$view = '';
 	$format = 'text';
 	$return = array();
 	$error = 0;
 
-	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i', $element, $regs))
-	{
+	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i', $element, $regs)) {
 		$element = $regs[1];
 		$subelement = $regs[2];
 	}
 
-	if ($element == 'propal') $newelement = 'propale';
-	elseif ($element == 'fichinter') $newelement = 'ficheinter';
-	elseif ($element == 'product') $newelement = 'produit';
-	elseif ($element == 'member') $newelement = 'adherent';
-	elseif ($element == 'order_supplier') {
+	if ($element == 'propal') {
+		$newelement = 'propale';
+	} elseif ($element == 'fichinter') {
+		$newelement = 'ficheinter';
+	} elseif ($element == 'product') {
+		$newelement = 'produit';
+	} elseif ($element == 'member') {
+		$newelement = 'adherent';
+	} elseif ($element == 'order_supplier') {
 		$newelement = 'fournisseur';
 		$subelement = 'commande';
 	} elseif ($element == 'invoice_supplier') {
 		$newelement = 'fournisseur';
 		$subelement = 'facture';
-	} else $newelement = $element;
+	} else {
+		$newelement = $element;
+	}
 
 	$_POST['action'] = 'update'; // Hack so restrictarea will test permissions on write too
 	$feature = $newelement;
 	$feature2 = $subelement;
 	$object_id = $fk_element;
-	if ($feature == 'expedition' || $feature == 'shipping')
-	{
+	if ($feature == 'expedition' || $feature == 'shipping') {
 		$feature = 'commande';
 		$object_id = 0;
 	}
-	if ($feature == 'shipping') $feature = 'commande';
-	if ($feature == 'payment') { $feature = 'facture'; }
-	if ($feature == 'payment_supplier') { $feature = 'fournisseur'; $feature2 = 'facture'; }
+	if ($feature == 'shipping') {
+		$feature = 'commande';
+	}
+	if ($feature == 'payment') {
+		$feature = 'facture';
+	}
+	if ($feature == 'payment_supplier') {
+		$feature = 'fournisseur';
+		$feature2 = 'facture';
+	}
 	//var_dump(GETPOST('action','aZ09'));
 	//var_dump($newelement.'-'.$subelement."-".$feature."-".$object_id);
 	$check_access = restrictedArea($user, $feature, $object_id, '', $feature2);
@@ -128,13 +139,11 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 				$error++;
 				$return['error'] = $langs->trans('ErrorBadValue');
 			}
-		} elseif ($type == 'datepicker')
-		{
+		} elseif ($type == 'datepicker') {
 			$timestamp = GETPOST('timestamp', 'int', 2);
 			$format = 'date';
 			$newvalue = ($timestamp / 1000);
-		} elseif ($type == 'select')
-		{
+		} elseif ($type == 'select') {
 			$loadmethodname = 'load_cache_'.$loadmethod;
 			$loadcachename = 'cache_'.$loadmethod;
 			$loadviewname = 'view_'.$loadmethod;

From 726d7817c46474dcfc19375e1fde834bd26cada9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 16:13:46 +0200
Subject: [PATCH 348/490] add new rule

---
 htdocs/core/tpl/contacts.tpl.php | 40 +++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 5d467c20f4e..7665c4e2211 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -40,11 +40,27 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 $module = $object->element;
 
 // Special cases
-if ($module == 'propal') { $permission = $user->rights->propale->creer; } elseif ($module == 'fichinter') { $permission = $user->rights->ficheinter->creer; } elseif ($module == 'order_supplier') { $permission = $user->rights->fournisseur->commande->creer; } elseif ($module == 'invoice_supplier') { $permission = $user->rights->fournisseur->facture->creer; } elseif ($module == 'project') { $permission = $user->rights->projet->creer; } elseif ($module == 'action') { $permission = $user->rights->agenda->myactions->create; } elseif ($module == 'shipping') { $permission = $user->rights->expedition->creer; } elseif ($module == 'reception') { $permission = $user->rights->reception->creer; } elseif ($module == 'project_task') { $permission = $user->rights->projet->creer; } elseif (!isset($permission) && isset($user->rights->$module->creer))
-{
+if ($module == 'propal') {
+	$permission = $user->rights->propale->creer;
+} elseif ($module == 'fichinter') {
+	$permission = $user->rights->ficheinter->creer;
+} elseif ($module == 'order_supplier') {
+	$permission = $user->rights->fournisseur->commande->creer;
+} elseif ($module == 'invoice_supplier') {
+	$permission = $user->rights->fournisseur->facture->creer;
+} elseif ($module == 'project') {
+	$permission = $user->rights->projet->creer;
+} elseif ($module == 'action') {
+	$permission = $user->rights->agenda->myactions->create;
+} elseif ($module == 'shipping') {
+	$permission = $user->rights->expedition->creer;
+} elseif ($module == 'reception') {
+	$permission = $user->rights->reception->creer;
+} elseif ($module == 'project_task') {
+	$permission = $user->rights->projet->creer;
+} elseif (!isset($permission) && isset($user->rights->$module->creer)) {
 	$permission = $user->rights->$module->creer;
-} elseif (!isset($permission) && isset($user->rights->$module->write))
-{
+} elseif (!isset($permission) && isset($user->rights->$module->write)) {
 	$permission = $user->rights->$module->write;
 }
 
@@ -186,8 +202,7 @@ foreach (array('internal', 'external') as $source)
 		if ($contact['source'] == 'internal')
 		{
 			$entry->nature = $langs->trans("User");
-		} elseif ($contact['source'] == 'external')
-		{
+		} elseif ($contact['source'] == 'external') {
 			$entry->nature = $langs->trans("ThirdPartyContact");
 		}
 
@@ -196,8 +211,7 @@ foreach (array('internal', 'external') as $source)
 			$companystatic->fetch($contact['socid']);
 			$entry->thirdparty_html = $companystatic->getNomUrl(1);
 			$entry->thirdparty_name = strtolower($companystatic->getFullName($langs));
-		} elseif ($contact['socid'] < 0)
-		{
+		} elseif ($contact['socid'] < 0) {
 			$entry->thirdparty_html = $conf->global->MAIN_INFO_SOCIETE_NOM;
 			$entry->thirdparty_name = strtolower($conf->global->MAIN_INFO_SOCIETE_NOM);
 		}
@@ -207,8 +221,7 @@ foreach (array('internal', 'external') as $source)
 			$userstatic->fetch($contact['id']);
 			$entry->contact_html = $userstatic->getNomUrl(-1, '', 0, 0, 0, 0, '', 'valignmiddle');
 			$entry->contact_name = strtolower($userstatic->getFullName($langs));
-		} elseif ($contact['source'] == 'external')
-		{
+		} elseif ($contact['source'] == 'external') {
 			$contactstatic->fetch($contact['id']);
 			$entry->contact_html = $contactstatic->getNomUrl(1, '', 0, '', 0, 0);
 			$entry->contact_name = strtolower($contactstatic->getFullName($langs));
@@ -217,8 +230,7 @@ foreach (array('internal', 'external') as $source)
 		if ($contact['source'] == 'internal')
 		{
 			$entry->status = $userstatic->LibStatut($contact['statuscontact'], 3);
-		} elseif ($contact['source'] == 'external')
-		{
+		} elseif ($contact['source'] == 'external') {
 			$entry->status = $contactstatic->LibStatut($contact['statuscontact'], 3);
 		}
 
@@ -305,9 +317,6 @@ print '</div>';
 
 print "</form>";
 
-
-
-
 print "<!-- TEMPLATE CONTACTS HOOK BEGIN HERE -->\n";
 if (is_object($hookmanager)) {
 	$hookmanager->initHooks(array('contacttpl'));
@@ -315,4 +324,3 @@ if (is_object($hookmanager)) {
 	$reshook = $hookmanager->executeHooks('formContactTpl', $parameters, $object, $action);
 }
 print "<!-- END PHP TEMPLATE CONTACTS -->\n";
-

From e6a5d4c8d92d0a72588ee0a8549845616f145ab5 Mon Sep 17 00:00:00 2001
From: Birame SENE <bsene@pm.me>
Date: Thu, 21 May 2020 17:01:27 +0200
Subject: [PATCH 349/490] Add PNG/JPEG packages to build GD extension

---
 build/docker/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index 4b1df7e0876..9264eed5ef2 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -3,7 +3,7 @@ FROM php:7.2-apache
 ENV HOST_USER_ID 33
 ENV PHP_INI_DATE_TIMEZONE 'UTC'
 
-RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libldap2-dev libzip-dev zlib1g-dev libicu-dev g++\
+RUN apt-get update && apt-get install -y libpng16-16 libpng-dev libjpeg62-turbo libjpeg62-turbo-dev libldap2-dev zlib1g-dev libicu-dev g++\
 	&& rm -rf /var/lib/apt/lists/* \
 	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
 	&& docker-php-ext-install gd \
@@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libldap2-dev lib
         && docker-php-ext-install calendar \
         && docker-php-ext-configure intl \
         && docker-php-ext-install intl \
-        && apt-get autoremove --purge -y libjpeg-dev libldap2-dev zlib1g-dev libicu-dev g++
+        && apt-get autoremove --purge -y libpng-dev libjpeg62-turbo-dev libldap2-dev zlib1g-dev libicu-dev g++
 
 RUN mkdir /var/documents
 RUN chown www-data /var/documents

From 9e295d44f069786c6d9b6adab788debd33fccf50 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 21 May 2020 17:14:42 +0200
Subject: [PATCH 350/490] Code comment

---
 htdocs/core/modules/modFacture.class.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 5043e2c2d28..a4e6134060d 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -212,8 +212,10 @@ class modFacture extends DolibarrModules
 		$this->export_fields_array[$r] = array(
 		    's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.code_client'=>'CustomerCode', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 'cd.nom'=>'State',
 		    's.phone'=>'Phone',
-			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.code_compta'=>'CustomerAccountancyCode',
-			's.code_compta_fournisseur'=>'SupplierAccountancyCode', 's.tva_intra'=>'VATIntra',
+			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4',
+			's.code_compta'=>'CustomerAccountancyCode',
+			's.code_compta_fournisseur'=>'SupplierAccountancyCode',
+			's.tva_intra'=>'VATIntra',
 			'f.rowid'=>"InvoiceId", 'f.ref'=>"InvoiceRef", 'f.ref_client'=>'RefCustomer',
 			'f.type'=>"Type", 'f.datec'=>"InvoiceDateCreation", 'f.datef'=>"DateInvoice", 'f.date_lim_reglement'=>"DateDue", 'f.total'=>"TotalHT",
 			'f.total_ttc'=>"TotalTTC", 'f.tva'=>"TotalVAT", 'f.localtax1'=>'LT1', 'f.localtax2'=>'LT2', 'f.paye'=>"InvoicePaidCompletely", 'f.fk_statut'=>'InvoiceStatus', 'f.close_code'=>'EarlyClosingReason', 'f.close_note'=>'EarlyClosingComment',

From 76823d3e399d367fc1f03a860300bc6a053517ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 21 May 2020 13:06:36 +0200
Subject: [PATCH 351/490] Clean CSS, clean code

---
 htdocs/core/class/extrafields.class.php    |    2 +-
 htdocs/core/class/extralanguages.class.php | 1194 +-------------------
 htdocs/core/class/html.form.class.php      |    2 +
 htdocs/index.php                           |    6 +-
 htdocs/theme/eldy/info-box.inc.php         |    7 +-
 5 files changed, 19 insertions(+), 1192 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 18dd686367b..6e0651568a1 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -43,7 +43,7 @@ class ExtraFields
     public $db;
 
 	/**
-     * @var string type of element (for what object is the extrafield)
+     * @var array Array with type of element (for what object is the extrafield)
 	 * @deprecated
      */
     public $attribute_elementtype;
diff --git a/htdocs/core/class/extralanguages.class.php b/htdocs/core/class/extralanguages.class.php
index 71a6fa8c1aa..48f2e94936a 100644
--- a/htdocs/core/class/extralanguages.class.php
+++ b/htdocs/core/class/extralanguages.class.php
@@ -18,7 +18,7 @@
 /**
  * 	\file 		htdocs/core/class/extralanguages.class.php
  *	\ingroup    core
- *	\brief      File of class to manage extra fields
+ *	\brief      File of class to manage extra languages for some fields
  */
 
 
@@ -69,7 +69,8 @@ class ExtraLanguages
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * 	Load array this->attributes with list of fields per object that need an alternate translation.
+	 * 	Load array this->attributes with list of fields per object that need an alternate translation. The object and field must be managed with
+	 *  the widgetForTranslation() method.
 	 *  You can set variable MAIN_USE_ALTERNATE_TRANSLATION_FOR=elementA:fieldname,fieldname2;elementB:...
 	 *  Example: MAIN_USE_ALTERNATE_TRANSLATION_FOR=societe:name,town;contact:firstname,lastname
 	 *
@@ -119,16 +120,16 @@ class ExtraLanguages
 	 *
 	 * @param  string  $key            			Key of attribute
 	 * @param  string  $value          			Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
+	 * @param  string  $extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
 	 * @param  string  $moreparam      			To add more parametes on html input tag
 	 * @param  string  $keysuffix      			Prefix string to add after name and id of field (can be used to avoid duplicate names)
 	 * @param  string  $keyprefix      			Suffix string to add before name and id of field (can be used to avoid duplicate names)
 	 * @param  string  $morecss        			More css (to defined size of field. Old behaviour: may also be a numeric)
 	 * @param  int     $objectid       			Current object id
-	 * @param  string  $extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
 	 * @param  string  $mode                    1=Used for search filters
 	 * @return string
 	 */
-	public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '', $objectid = 0, $extrafieldsobjectkey = '', $mode = 0)
+	public function showInputField($key, $value, $extrafieldsobjectkey, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '', $objectid = 0, $mode = 0)
 	{
 		global $conf, $langs, $form;
 
@@ -145,601 +146,7 @@ class ExtraLanguages
 			$keyprefix = $keyprefix.'options_';
 		}
 
-		if (!empty($extrafieldsobjectkey))
-		{
-			$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
-			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
-			$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];
-			$default = $this->attributes[$extrafieldsobjectkey]['default'][$key];
-			$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];
-			$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
-			$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];
-			$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];
-			$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
-			$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
-			$totalizable = $this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
-			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
-			$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-		else	// Old usage
-		{
-			$label = $this->attribute_label[$key];
-			$type = $this->attribute_type[$key];
-			$size = $this->attribute_size[$key];
-			$elementtype = $this->attribute_elementtype[$key]; // Seems not used
-			$default = $this->attribute_default[$key];
-			$computed = $this->attribute_computed[$key];
-			$unique = $this->attribute_unique[$key];
-			$required = $this->attribute_required[$key];
-			$param = $this->attribute_param[$key];
-			$langfile = $this->attribute_langfile[$key];
-			$list = $this->attribute_list[$key];
-			$totalizable = $this->attribute_totalizable[$key];
-			$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
 
-		if ($computed)
-		{
-			if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
-			else return '';
-		}
-
-		if (empty($morecss))
-		{
-			if ($type == 'date')
-			{
-				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime' || $type == 'link')
-			{
-				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type, array('int', 'integer', 'double', 'price')))
-			{
-				$morecss = 'maxwidth75';
-			}
-			elseif ($type == 'password')
-			{
-				$morecss = 'maxwidth100';
-			}
-			elseif ($type == 'url')
-			{
-				$morecss = 'minwidth400';
-			}
-			elseif ($type == 'boolean')
-			{
-				$morecss = '';
-			}
-			else
-			{
-				if (round($size) < 12)
-				{
-					$morecss = 'minwidth100';
-				}
-				elseif (round($size) <= 48)
-				{
-					$morecss = 'minwidth200';
-				}
-				else
-				{
-					$morecss = 'minwidth400';
-				}
-			}
-		}
-
-		if (in_array($type, array('date', 'datetime')))
-		{
-			$tmp = explode(',', $size);
-			$newsize = $tmp[0];
-
-			$showtime = in_array($type, array('datetime')) ? 1 : 0;
-
-			// Do not show current date when field not required (see selectDate() method)
-			if (!$required && $value == '') $value = '-1';
-
-			// TODO Must also support $moreparam
-			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
-		}
-		elseif (in_array($type, array('int', 'integer')))
-		{
-			$tmp = explode(',', $size);
-			$newsize = $tmp[0];
-			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
-		}
-		elseif (preg_match('/varchar/', $type))
-		{
-			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
-		}
-		elseif (in_array($type, array('mail', 'phone', 'url')))
-		{
-			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
-		}
-		elseif ($type == 'text')
-		{
-			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
-			{
-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
-				$out = $doleditor->Create(1);
-			}
-			else
-			{
-				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
-			}
-		}
-		elseif ($type == 'html')
-		{
-			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
-			{
-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
-				$out = $doleditor->Create(1);
-			}
-			else
-			{
-				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
-			}
-		}
-		elseif ($type == 'boolean')
-		{
-			if (empty($mode))
-			{
-				$checked = '';
-				if (!empty($value)) {
-					$checked = ' checked value="1" ';
-				} else {
-					$checked = ' value="1" ';
-				}
-				$out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';
-			}
-			else
-			{
-				$out .= $form->selectyesno($keyprefix.$key.$keysuffix, $value, 1, false, 1);
-			}
-		}
-		elseif ($type == 'price')
-		{
-			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value = price($value);
-			}
-			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.$langs->getCurrencySymbol($conf->currency);
-		}
-		elseif ($type == 'double')
-		{
-			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value = price($value);
-			}
-			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
-		}
-		elseif ($type == 'select')
-		{
-			$out = '';
-			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
-			{
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
-			}
-
-			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
-			$out .= '<option value="0">&nbsp;</option>';
-			foreach ($param['options'] as $key => $val)
-			{
-				if ((string) $key == '') continue;
-				list($val, $parent) = explode('|', $val);
-				$out .= '<option value="'.$key.'"';
-				$out .= (((string) $value == (string) $key) ? ' selected' : '');
-				$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
-				$out .= '>';
-				if ($langfile && $val) $out .= $langs->trans($val);
-				else $out .= $val;
-				$out .= '</option>';
-			}
-			$out .= '</select>';
-		}
-		elseif ($type == 'sellist')
-		{
-			$out = '';
-			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
-			{
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
-			}
-
-			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
-			if (is_array($param['options']))
-			{
-				$param_list = array_keys($param['options']);
-				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName = '';
-				$parentField = '';
-				// 0 : tableName
-				// 1 : label field name
-				// 2 : key fields name (if differ of rowid)
-				// 3 : key field parent (for dependent lists)
-				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-                // 5 : id category type
-                // 6 : ids categories list separated by comma for category root
-				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
-
-
-				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4]))
-				{
-					if (strpos($InfoFieldList[4], 'extra.') !== false)
-					{
-						$keyList = 'main.'.$InfoFieldList[2].' as rowid';
-					} else {
-						$keyList = $InfoFieldList[2].' as rowid';
-					}
-				}
-				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3]))
-				{
-					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
-					$keyList .= ', '.$parentField;
-				}
-
-                $filter_categorie = false;
-                if (count($InfoFieldList) > 5) {
-                    if ($InfoFieldList[0] == 'categorie') {
-                        $filter_categorie = true;
-                    }
-                }
-
-                if ($filter_categorie === false) {
-                    $fields_label = explode('|', $InfoFieldList[1]);
-                    if (is_array($fields_label)) {
-                        $keyList .= ', ';
-                        $keyList .= implode(', ', $fields_label);
-                    }
-
-                    $sqlwhere = '';
-                    $sql = 'SELECT '.$keyList;
-                    $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
-                    if (!empty($InfoFieldList[4])) {
-                        // can use curent entity filter
-                        if (strpos($InfoFieldList[4], '$ENTITY$') !== false) {
-                            $InfoFieldList[4] = str_replace('$ENTITY$', $conf->entity, $InfoFieldList[4]);
-                        }
-                        // can use SELECT request
-                        if (strpos($InfoFieldList[4], '$SEL$') !== false) {
-                            $InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
-                        }
-
-                        // current object id can be use into filter
-                        if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
-                            $InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
-                        } else {
-                            $InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
-                        }
-                        //We have to join on extrafield table
-                        if (strpos($InfoFieldList[4], 'extra') !== false) {
-                            $sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
-                            $sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
-                        } else {
-                            $sqlwhere .= ' WHERE '.$InfoFieldList[4];
-                        }
-                    } else {
-                        $sqlwhere .= ' WHERE 1=1';
-                    }
-                    // Some tables may have field, some other not. For the moment we disable it.
-                    if (in_array($InfoFieldList[0], array('tablewithentity'))) {
-                        $sqlwhere .= ' AND entity = '.$conf->entity;
-                    }
-                    $sql .= $sqlwhere;
-                    //print $sql;
-
-                    $sql .= ' ORDER BY '.implode(', ', $fields_label);
-
-                    dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
-                    $resql = $this->db->query($sql);
-                    if ($resql) {
-                        $out .= '<option value="0">&nbsp;</option>';
-                        $num = $this->db->num_rows($resql);
-                        $i = 0;
-                        while ($i < $num) {
-                            $labeltoshow = '';
-                            $obj = $this->db->fetch_object($resql);
-
-                            // Several field into label (eq table:code|libelle:rowid)
-                            $notrans = false;
-                            $fields_label = explode('|', $InfoFieldList[1]);
-                            if (is_array($fields_label) && count($fields_label) > 1) {
-                                $notrans = true;
-                                foreach ($fields_label as $field_toshow) {
-                                    $labeltoshow .= $obj->$field_toshow.' ';
-                                }
-                            } else {
-                                $labeltoshow = $obj->{$InfoFieldList[1]};
-                            }
-                            $labeltoshow = dol_trunc($labeltoshow, 45);
-
-                            if ($value == $obj->rowid) {
-                            	if (!$notrans) {
-	                                foreach ($fields_label as $field_toshow) {
-	                                    $translabel = $langs->trans($obj->$field_toshow);
-	                                    $labeltoshow = dol_trunc($translabel, 18).' ';
-	                                }
-                            	}
-                                $out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-                            } else {
-                                if (!$notrans) {
-                                    $translabel = $langs->trans($obj->{$InfoFieldList[1]});
-                                    $labeltoshow = dol_trunc($translabel, 18);
-                                }
-                                if (empty($labeltoshow)) $labeltoshow = '(not defined)';
-
-                                if (!empty($InfoFieldList[3]) && $parentField) {
-                                    $parent = $parentName.':'.$obj->{$parentField};
-                                }
-
-                                $out .= '<option value="'.$obj->rowid.'"';
-                                $out .= ($value == $obj->rowid ? ' selected' : '');
-                                $out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
-                                $out .= '>'.$labeltoshow.'</option>';
-                            }
-
-                            $i++;
-                        }
-                        $this->db->free($resql);
-                    } else {
-                        print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
-                    }
-                } else {
-					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-                    $data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
-                    $out .= '<option value="0">&nbsp;</option>';
-                    foreach ($data as $data_key => $data_value) {
-                        $out .= '<option value="'.$data_key.'"';
-                        $out .= ($value == $data_key ? ' selected' : '');
-                        $out .= '>'.$data_value.'</option>';
-                    }
-                }
-			}
-			$out .= '</select>';
-		}
-		elseif ($type == 'checkbox')
-		{
-			$value_arr = explode(',', $value);
-			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
-		}
-		elseif ($type == 'radio')
-		{
-			$out = '';
-			foreach ($param['options'] as $keyopt => $val)
-			{
-				$out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');
-				$out .= ' value="'.$keyopt.'"';
-				$out .= ' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
-				$out .= ($value == $keyopt ? 'checked' : '');
-				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
-			}
-		}
-		elseif ($type == 'chkbxlst')
-		{
-			if (is_array($value)) {
-				$value_arr = $value;
-			}
-			else {
-				$value_arr = explode(',', $value);
-			}
-
-			if (is_array($param['options'])) {
-				$param_list = array_keys($param['options']);
-				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName = '';
-				$parentField = '';
-				// 0 : tableName
-				// 1 : label field name
-				// 2 : key fields name (if differ of rowid)
-				// 3 : key field parent (for dependent lists)
-				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-                // 5 : id category type
-                // 6 : ids categories list separated by comma for category root
-				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
-
-				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
-					list ($parentName, $parentField) = explode('|', $InfoFieldList[3]);
-					$keyList .= ', '.$parentField;
-				}
-				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
-					if (strpos($InfoFieldList[4], 'extra.') !== false) {
-						$keyList = 'main.'.$InfoFieldList[2].' as rowid';
-					} else {
-						$keyList = $InfoFieldList[2].' as rowid';
-					}
-				}
-
-                $filter_categorie = false;
-                if (count($InfoFieldList) > 5) {
-                    if ($InfoFieldList[0] == 'categorie') {
-                        $filter_categorie = true;
-                    }
-                }
-
-                if ($filter_categorie === false) {
-                    $fields_label = explode('|', $InfoFieldList[1]);
-                    if (is_array($fields_label)) {
-                        $keyList .= ', ';
-                        $keyList .= implode(', ', $fields_label);
-                    }
-
-                    $sqlwhere = '';
-                    $sql = 'SELECT '.$keyList;
-                    $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
-                    if (!empty($InfoFieldList[4])) {
-                        // can use SELECT request
-                        if (strpos($InfoFieldList[4], '$SEL$') !== false) {
-                            $InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
-                        }
-
-                        // current object id can be use into filter
-                        if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
-                            $InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
-                        } elseif (preg_match("#^.*list.php$#", $_SERVER["PHP_SELF"])) {
-                            // Pattern for word=$ID$
-                            $word = '\b[a-zA-Z0-9-\.-_]+\b=\$ID\$';
-
-                            // Removing space arount =, ( and )
-                            $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
-
-                            $nbPreg = 1;
-                            // While we have parenthesis
-                            while ($nbPreg != 0) {
-                                // Init des compteurs
-                                $nbPregRepl = $nbPregSel = 0;
-                                // On retire toutes les parenthèses sans = avant
-                                $InfoFieldList[4] = preg_replace('#([^=])(\([^)^(]*('.$word.')[^)^(]*\))#', '$1 $3 ', $InfoFieldList[4], -1, $nbPregRepl);
-                                // On retire les espaces autour des = et parenthèses
-                                $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
-                                // On retire toutes les parenthèses avec = avant
-                                $InfoFieldList[4] = preg_replace('#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*('.$word.')[^)^(]*\)#', '$1 ', $InfoFieldList[4], -1, $nbPregSel);
-                                // On retire les espaces autour des = et parenthèses
-                                $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
-
-                                // Calcul du compteur général pour la boucle
-                                $nbPreg = $nbPregRepl + $nbPregSel;
-                            }
-
-                            // Si l'on a un AND ou un OR, avant ou après
-                            preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
-                            while (!empty($matchCondition[0])) {
-                                // If the two sides differ but are not empty
-                                if (!empty($matchCondition[1]) && !empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3]) {
-                                    // Nobody sain would do that without parentheses
-                                    $InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
-                                } else {
-                                    if (!empty($matchCondition[1])) {
-                                        $boolCond = (($matchCondition[1] == "AND") ? ' AND TRUE ' : ' OR FALSE ');
-                                        $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond.$matchCondition[3], $InfoFieldList[4]);
-                                    } elseif (!empty($matchCondition[3])) {
-                                        $boolCond = (($matchCondition[3] == "AND") ? ' TRUE AND ' : ' FALSE OR');
-                                        $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond, $InfoFieldList[4]);
-                                    } else {
-                                        $InfoFieldList[4] = " TRUE ";
-                                    }
-                                }
-
-                                // Si l'on a un AND ou un OR, avant ou après
-                                preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
-                            }
-                        } else {
-                            $InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
-                        }
-
-                        // We have to join on extrafield table
-                        if (strpos($InfoFieldList[4], 'extra.') !== false) {
-                            $sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
-                            $sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
-                        } else {
-                            $sqlwhere .= ' WHERE '.$InfoFieldList[4];
-                        }
-                    } else {
-                        $sqlwhere .= ' WHERE 1=1';
-                    }
-                    // Some tables may have field, some other not. For the moment we disable it.
-                    if (in_array($InfoFieldList[0], array('tablewithentity'))) {
-                        $sqlwhere .= ' AND entity = '.$conf->entity;
-                    }
-                    // $sql.=preg_replace('/^ AND /','',$sqlwhere);
-                    // print $sql;
-
-                    $sql .= $sqlwhere;
-                    dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);
-                    $resql = $this->db->query($sql);
-                    if ($resql) {
-                        $num = $this->db->num_rows($resql);
-                        $i = 0;
-
-                        $data = array();
-
-                        while ($i < $num) {
-                            $labeltoshow = '';
-                            $obj = $this->db->fetch_object($resql);
-
-                            $notrans = false;
-                            // Several field into label (eq table:code|libelle:rowid)
-                            $fields_label = explode('|', $InfoFieldList[1]);
-                            if (is_array($fields_label)) {
-                                $notrans = true;
-                                foreach ($fields_label as $field_toshow) {
-                                    $labeltoshow .= $obj->$field_toshow.' ';
-                                }
-                            } else {
-                                $labeltoshow = $obj->{$InfoFieldList[1]};
-                            }
-                            $labeltoshow = dol_trunc($labeltoshow, 45);
-
-                            if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-                                foreach ($fields_label as $field_toshow) {
-                                    $translabel = $langs->trans($obj->$field_toshow);
-                                    if ($translabel != $obj->$field_toshow) {
-                                        $labeltoshow = dol_trunc($translabel, 18).' ';
-                                    } else {
-                                        $labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
-                                    }
-                                }
-
-                                $data[$obj->rowid] = $labeltoshow;
-                            } else {
-                                if (!$notrans) {
-                                    $translabel = $langs->trans($obj->{$InfoFieldList[1]});
-                                    if ($translabel != $obj->{$InfoFieldList[1]}) {
-                                        $labeltoshow = dol_trunc($translabel, 18);
-                                    } else {
-                                        $labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
-                                    }
-                                }
-                                if (empty($labeltoshow))
-                                    $labeltoshow = '(not defined)';
-
-                                if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-                                    $data[$obj->rowid] = $labeltoshow;
-                                }
-
-                                if (!empty($InfoFieldList[3]) && $parentField) {
-                                    $parent = $parentName.':'.$obj->{$parentField};
-                                }
-
-                                $data[$obj->rowid] = $labeltoshow;
-                            }
-
-                            $i++;
-                        }
-                        $this->db->free($resql);
-
-                        $out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
-                    } else {
-                        print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
-                    }
-                } else {
-					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-                    $data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
-                    $out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
-                }
-			}
-		}
-		elseif ($type == 'link')
-		{
-			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
-			$showempty = (($required && $default != '') ? 0 : 1);
-			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss);
-		}
-		elseif ($type == 'password')
-		{
-			// If prefix is 'search_', field is used as a filter, we use a common text field.
-			$out = '<input style="display:none" type="text" name="fakeusernameremembered">'; // Hidden field to reduce impact of evil Google Chrome autopopulate bug.
-			$out .= '<input autocomplete="new-password" type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';
-		}
-		if (!empty($hidden)) {
-			$out = '<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
-		}
-		/* Add comments
-		 if ($type == 'date') $out.=' (YYYY-MM-DD)';
-		 elseif ($type == 'datetime') $out.=' (YYYY-MM-DD HH:MM:SS)';
-		 */
-		/*if (! empty($help) && $keyprefix != 'search_options_') {
-			$out .= $form->textwithpicto('', $help, 1, 'help', '', 0, 3);
-		}*/
 		return $out;
 	}
 
@@ -749,601 +156,16 @@ class ExtraLanguages
 	 *
 	 * @param   string	$key            		Key of attribute
 	 * @param   string	$value          		Value to show
-	 * @param	string	$moreparam				To add more parameters on html input tag (only checkbox use html input for output rendering)
 	 * @param	string	$extrafieldsobjectkey	If defined (for example $object->table_element), function uses the new method to get extrafields data
+	 * @param	string	$moreparam				To add more parameters on html input tag (only checkbox use html input for output rendering)
 	 * @return	string							Formated value
 	 */
-	public function showOutputField($key, $value, $moreparam = '', $extrafieldsobjectkey = '')
+	public function showOutputField($key, $value, $extrafieldsobjectkey, $moreparam = '')
 	{
 		global $conf, $langs;
 
-		if (!empty($extrafieldsobjectkey))
-		{
-			$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
-			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
-			$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];
-			$default = $this->attributes[$extrafieldsobjectkey]['default'][$key];
-			$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];
-			$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
-			$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];
-			$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];
-			$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
-			$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
-			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
-			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-		else	// Old usage
-		{
-			//dol_syslog("Warning: parameter 'extrafieldsobjectkey' is missing", LOG_WARNING);
-			$label = $this->attribute_label[$key];
-			$type = $this->attribute_type[$key];
-			$size = $this->attribute_size[$key];
-			$default = $this->attribute_default[$key];
-			$computed = $this->attribute_computed[$key];
-			$unique = $this->attribute_unique[$key];
-			$required = $this->attribute_required[$key];
-			$param = $this->attribute_param[$key];
-			$perms = dol_eval($this->attribute_perms[$key], 1);
-			$langfile = $this->attribute_langfile[$key];
-			$list = dol_eval($this->attribute_list[$key], 1);
-			$help = ''; // Not supported with old syntax
-			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-
-		if ($hidden) return ''; // This is a protection. If field is hidden, we should just not call this method.
-
-		//if ($computed) $value =		// $value is already calculated into $value before calling this method
-
-		$showsize = 0;
-		if ($type == 'date')
-		{
-			$showsize = 10;
-			$value = dol_print_date($value, 'day');
-		}
-		elseif ($type == 'datetime')
-		{
-			$showsize = 19;
-			$value = dol_print_date($value, 'dayhour');
-		}
-		elseif ($type == 'int')
-		{
-			$showsize = 10;
-		}
-		elseif ($type == 'double')
-		{
-			if (!empty($value)) {
-				//$value=price($value);
-				$sizeparts = explode(",", $size);
-				$number_decimals = $sizeparts[1];
-				$value = price($value, 0, $langs, 0, 0, $number_decimals, '');
-			}
-		}
-		elseif ($type == 'boolean')
-		{
-			$checked = '';
-			if (!empty($value)) {
-				$checked = ' checked ';
-			}
-			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
-		}
-		elseif ($type == 'mail')
-		{
-			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
-		}
-		elseif ($type == 'url')
-		{
-			$value = dol_print_url($value, '_blank', 32, 1);
-		}
-		elseif ($type == 'phone')
-		{
-			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 'phone');
-		}
-		elseif ($type == 'price')
-		{
-			$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
-		}
-		elseif ($type == 'select')
-		{
-			if ($langfile && $param['options'][$value]) $value = $langs->trans($param['options'][$value]);
-			else $value = $param['options'][$value];
-		}
-		elseif ($type == 'sellist')
-		{
-			$param_list = array_keys($param['options']);
-			$InfoFieldList = explode(":", $param_list[0]);
-
-			$selectkey = "rowid";
-			$keyList = 'rowid';
-
-			if (count($InfoFieldList) >= 3)
-			{
-				$selectkey = $InfoFieldList[2];
-				$keyList = $InfoFieldList[2].' as rowid';
-			}
-
-			$fields_label = explode('|', $InfoFieldList[1]);
-			if (is_array($fields_label)) {
-				$keyList .= ', ';
-				$keyList .= implode(', ', $fields_label);
-			}
-
-			$sql = 'SELECT '.$keyList;
-			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
-			if (strpos($InfoFieldList[4], 'extra') !== false)
-			{
-				$sql .= ' as main';
-			}
-			if ($selectkey == 'rowid' && empty($value)) {
-				$sql .= " WHERE ".$selectkey."=0";
-			} elseif ($selectkey == 'rowid') {
-				$sql .= " WHERE ".$selectkey."=".$this->db->escape($value);
-			} else {
-				$sql .= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
-			}
-
-			//$sql.= ' AND entity = '.$conf->entity;
-
-			dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				$value = ''; // value was used, so now we reste it to use it to build final output
-
-				$obj = $this->db->fetch_object($resql);
-
-				// Several field into label (eq table:code|libelle:rowid)
-				$fields_label = explode('|', $InfoFieldList[1]);
-
-				if (is_array($fields_label) && count($fields_label) > 1)
-				{
-					foreach ($fields_label as $field_toshow)
-					{
-						$translabel = '';
-						if (!empty($obj->$field_toshow)) {
-							$translabel = $langs->trans($obj->$field_toshow);
-						}
-						if ($translabel != $field_toshow) {
-							$value .= dol_trunc($translabel, 18).' ';
-						} else {
-							$value .= $obj->$field_toshow.' ';
-						}
-					}
-				}
-				else
-				{
-					$translabel = '';
-					if (!empty($obj->{$InfoFieldList[1]})) {
-						$translabel = $langs->trans($obj->{$InfoFieldList[1]});
-					}
-					if ($translabel != $obj->{$InfoFieldList[1]}) {
-						$value = dol_trunc($translabel, 18);
-					} else {
-						$value = $obj->{$InfoFieldList[1]};
-					}
-				}
-			}
-			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
-		}
-		elseif ($type == 'radio')
-		{
-			$value = $param['options'][$value];
-		}
-		elseif ($type == 'checkbox')
-		{
-			$value_arr = explode(',', $value);
-			$value = '';
-			$toprint = array();
-			if (is_array($value_arr))
-			{
-				foreach ($value_arr as $keyval=>$valueval) {
-					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
-				}
-			}
-			$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
-		}
-		elseif ($type == 'chkbxlst')
-		{
-			$value_arr = explode(',', $value);
-
-			$param_list = array_keys($param['options']);
-			$InfoFieldList = explode(":", $param_list[0]);
-
-			$selectkey = "rowid";
-			$keyList = 'rowid';
-
-			if (count($InfoFieldList) >= 3) {
-				$selectkey = $InfoFieldList[2];
-				$keyList = $InfoFieldList[2].' as rowid';
-			}
-
-			$fields_label = explode('|', $InfoFieldList[1]);
-			if (is_array($fields_label)) {
-				$keyList .= ', ';
-				$keyList .= implode(', ', $fields_label);
-			}
-
-			$sql = 'SELECT '.$keyList;
-			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
-			if (strpos($InfoFieldList[4], 'extra') !== false) {
-				$sql .= ' as main';
-			}
-			// $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
-			// $sql.= ' AND entity = '.$conf->entity;
-
-			dol_syslog(get_class($this).':showOutputField:$type=chkbxlst', LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if ($resql) {
-				$value = ''; // value was used, so now we reste it to use it to build final output
-				$toprint = array();
-				while ($obj = $this->db->fetch_object($resql)) {
-					// Several field into label (eq table:code|libelle:rowid)
-					$fields_label = explode('|', $InfoFieldList[1]);
-					if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-						if (is_array($fields_label) && count($fields_label) > 1) {
-							foreach ($fields_label as $field_toshow) {
-								$translabel = '';
-								if (!empty($obj->$field_toshow)) {
-									$translabel = $langs->trans($obj->$field_toshow);
-								}
-								if ($translabel != $field_toshow) {
-									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
-								} else {
-									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
-								}
-							}
-						} else {
-							$translabel = '';
-							if (!empty($obj->{$InfoFieldList[1]})) {
-								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
-							}
-							if ($translabel != $obj->{$InfoFieldList[1]}) {
-								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
-							} else {
-								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
-							}
-						}
-					}
-				}
-				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
-			} else {
-				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
-			}
-		}
-		elseif ($type == 'link')
-		{
-			$out = '';
-
-			// Only if something to display (perf)
-			if ($value)		// If we have -1 here, pb is into insert, not into ouptut (fix insert instead of changing code here to compensate)
-			{
-				$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
-
-				$InfoFieldList = explode(":", $param_list[0]);
-				$classname = $InfoFieldList[0];
-				$classpath = $InfoFieldList[1];
-				if (!empty($classpath))
-				{
-					dol_include_once($InfoFieldList[1]);
-					if ($classname && class_exists($classname))
-					{
-						$object = new $classname($this->db);
-						$object->fetch($value);
-						$value = $object->getNomUrl(3);
-					}
-				}
-				else
-				{
-					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
-					return 'Error bad setup of extrafield';
-				}
-			}
-		}
-		elseif ($type == 'text')
-		{
-			$value = dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'html')
-		{
-			$value = dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'password')
-		{
-			$value = dol_trunc(preg_replace('/./i', '*', $value), 8, 'right', 'UTF-8', 1);
-		}
-		else
-		{
-			$showsize = round($size);
-			if ($showsize > 48) $showsize = 48;
-		}
-
-		//print $type.'-'.$size;
-		$out = $value;
+		$out = $this->attributes[$extrafieldsobjectkey][$key];
 
 		return $out;
 	}
-
-	/**
-	 * Return tag to describe alignement to use for this extrafield
-	 *
-	 * @param   string	$key            		Key of attribute
-	 * @param	string	$extrafieldsobjectkey	If defined, use the new method to get extrafields data
-	 * @return	string							Formated value
-	 */
-	public function getAlignFlag($key, $extrafieldsobjectkey = '')
-	{
-		global $conf, $langs;
-
-		if (!empty($extrafieldsobjectkey)) $type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
-		else $type = $this->attribute_type[$key];
-
-		$align = '';
-
-        if ($type == 'date')
-		{
-			$align = "center";
-		}
-		elseif ($type == 'datetime')
-		{
-			$align = "center";
-		}
-		elseif ($type == 'int')
-		{
-			$align = "right";
-		}
-		elseif ($type == 'price')
-		{
-			$align = "right";
-		}
-		elseif ($type == 'double')
-		{
-			$align = "right";
-		}
-		elseif ($type == 'boolean')
-		{
-			$align = "center";
-		}
-		elseif ($type == 'radio')
-		{
-			$align = "center";
-		}
-		elseif ($type == 'checkbox')
-		{
-			$align = "center";
-		}
-		elseif ($type == 'price')
-		{
-			$align = "right";
-		}
-
-		return $align;
-	}
-
-	/**
-	 * Return HTML string to print separator extrafield
-	 *
-	 * @param   string	$key            Key of attribute
-	 * @param	string	$object			Object
-	 * @param	int		$colspan		Value of colspan to use (it must includes the first column with title)
-	 * @return 	string					HTML code with line for separator
-	 */
-	public function showSeparator($key, $object, $colspan = 2)
-	{
-		global $langs;
-
-		$out = '<tr id="trextrafieldseparator'.$key.'" class="trextrafieldseparator trextrafieldseparator'.$key.'"><td colspan="'.$colspan.'"><strong>';
-		$out .= $langs->trans($this->attributes[$object->table_element]['label'][$key]);
-		$out .= '</strong></td></tr>';
-
-        $extrafield_param = $this->attributes[$object->table_element]['param'][$key];
-        if (!empty($extrafield_param) && is_array($extrafield_param)) {
-            $extrafield_param_list = array_keys($extrafield_param['options']);
-
-            if (count($extrafield_param_list) > 0) {
-                $extrafield_collapse_display_value = intval($extrafield_param_list[0]);
-                if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {
-                	// Set the collapse_display status to cookie in priority or if ignorecollapsesetup is 1, if cookie and ignorecollapsesetup not defined, use the setup.
-                	$collapse_display = ((isset($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key]) || GETPOST('ignorecollapsesetup', 'int')) ? ($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key] ? true : false) : ($extrafield_collapse_display_value == 2 ? false : true));
-                    $extrafields_collapse_num = $this->attributes[$object->table_element]['pos'][$key];
-
-                    $out .= '<!-- Add js script to manage the collpase/uncollapse of extrafields separators '.$key.' -->';
-                    $out .= '<script type="text/javascript">';
-                    $out .= 'jQuery(document).ready(function(){';
-                    if ($collapse_display === false) {
-                        $out .= '   jQuery("#trextrafieldseparator'.$key.' td").prepend("<span class=\"cursorpointer fa fa-plus-square\"></span>&nbsp;");'."\n";
-                        $out .= '   jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").hide();'."\n";
-                    } else {
-                    	$out .= '   jQuery("#trextrafieldseparator'.$key.' td").prepend("<span class=\"cursorpointer fa fa-minus-square\"></span>&nbsp;");'."\n";
-                    	$out .= '   document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
-                    }
-                    $out .= '   jQuery("#trextrafieldseparator'.$key.'").click(function(){'."\n";
-                    $out .= '       jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").toggle(300, function(){'."\n";
-                    $out .= '           if (jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").is(":hidden")) {'."\n";
-                    $out .= '               jQuery("#trextrafieldseparator'.$key.' td span").addClass("fa-plus-square").removeClass("fa-minus-square");'."\n";
-                    $out .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=0; path='.$_SERVER["PHP_SELF"].'"'."\n";
-                    $out .= '           } else {'."\n";
-                    $out .= '               jQuery("#trextrafieldseparator'.$key.' td span").addClass("fa-minus-square").removeClass("fa-plus-square");'."\n";
-                    $out .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
-                    $out .= '           }'."\n";
-                    $out .= '       });';
-                    $out .= '   });';
-                    $out .= '});';
-                    $out .= '</script>';
-                }
-            }
-        }
-
-		return $out;
-	}
-
-	/**
-	 * Fill array_options property of object by extrafields value (using for data sent by forms)
-	 *
-	 * @param   array	$extralabels    Deprecated (old $array of extrafields, now set this to null)
-	 * @param   object	$object         Object
-	 * @param	string	$onlykey		Only the following key is filled. When we make update of only one extrafield ($action = 'update_extras'), calling page must set this to avoid to have other extrafields being reset.
-	 * @return	int						1 if array_options set, 0 if no value, -1 if error (field required missing for example)
-	 */
-	public function setOptionalsFromPost($extralabels, &$object, $onlykey = '')
-	{
-		global $_POST, $langs;
-
-		$nofillrequired = 0; // For error when required field left blank
-		$error_field_required = array();
-
-		if (is_array($this->attributes[$object->table_element]['label'])) $extralabels = $this->attributes[$object->table_element]['label'];
-
-		if (is_array($extralabels))
-		{
-			// Get extra fields
-			foreach ($extralabels as $key => $value)
-			{
-				if (!empty($onlykey) && $key != $onlykey) continue;
-
-				$key_type = $this->attributes[$object->table_element]['type'][$key];
-				if ($key_type == 'separate') continue;
-
-				$enabled = 1;
-				if (isset($this->attributes[$object->table_element]['list'][$key]))
-				{
-					$enabled = dol_eval($this->attributes[$object->table_element]['list'][$key], 1);
-				}
-				$perms = 1;
-				if (isset($this->attributes[$object->table_element]['perms'][$key]))
-				{
-					$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
-				}
-				if (empty($enabled)) continue;
-				if (empty($perms)) continue;
-
-				if ($this->attributes[$object->table_element]['required'][$key])	// Value is required
-				{
-					// Check if empty without using GETPOST, value can be alpha, int, array, etc...
-				    if ((!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] != 'select' && $_POST["options_".$key] != '0')
-				        || (!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] == 'select')
-						|| (is_array($_POST["options_".$key]) && empty($_POST["options_".$key])))
-					{
-						//print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];
-						$nofillrequired++;
-						$error_field_required[] = $langs->transnoentitiesnoconv($value);
-					}
-				}
-
-				if (in_array($key_type, array('date')))
-				{
-					// Clean parameters
-					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
-					$value_key = dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
-				}
-				elseif (in_array($key_type, array('datetime')))
-				{
-					// Clean parameters
-					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
-					$value_key = dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
-				}
-				elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
-				{
-					$value_arr = GETPOST("options_".$key, 'array'); // check if an array
-					if (!empty($value_arr)) {
-						$value_key = implode($value_arr, ',');
-					} else {
-						$value_key = '';
-					}
-				}
-				elseif (in_array($key_type, array('price', 'double')))
-				{
-					$value_arr = GETPOST("options_".$key, 'alpha');
-					$value_key = price2num($value_arr);
-				}
-				else
-				{
-					$value_key = GETPOST("options_".$key);
-					if (in_array($key_type, array('link')) && $value_key == '-1') $value_key = '';
-				}
-
-				$object->array_options["options_".$key] = $value_key;
-			}
-
-			if ($nofillrequired) {
-				$langs->load('errors');
-				setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ', $error_field_required), null, 'errors');
-				return -1;
-			}
-			else {
-				return 1;
-			}
-		}
-		else {
-			return 0;
-		}
-	}
-
-	/**
-	 * return array_options array of data of extrafields value of object sent by a search form
-	 *
-	 * @param  array|string		$extrafieldsobjectkey  	array of extrafields (old usage) or value of object->table_element (new usage)
-	 * @param  string			$keyprefix      		Prefix string to add into name and id of field (can be used to avoid duplicate names)
-	 * @param  string			$keysuffix      		Suffix string to add into name and id of field (can be used to avoid duplicate names)
-	 * @return array|int								array_options set or 0 if no value
-	 */
-	public function getOptionalsFromPost($extrafieldsobjectkey, $keyprefix = '', $keysuffix = '')
-	{
-		global $_POST;
-
-		if (is_string($extrafieldsobjectkey) && is_array($this->attributes[$extrafieldsobjectkey]['label']))
-		{
-			$extralabels = $this->attributes[$extrafieldsobjectkey]['label'];
-		}
-		else
-		{
-			$extralabels = $extrafieldsobjectkey;
-		}
-
-		if (is_array($extralabels))
-		{
-			$array_options = array();
-
-			// Get extra fields
-			foreach ($extralabels as $key => $value)
-			{
-				$key_type = '';
-				if (is_string($extrafieldsobjectkey))
-				{
-					$key_type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
-				}
-
-				if (in_array($key_type, array('date', 'datetime')))
-				{
-					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix."year")) continue; // Value was not provided, we should not set it.
-					// Clean parameters
-					$value_key = dol_mktime(GETPOST($keysuffix."options_".$key.$keyprefix."hour", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."min", 'int'), 0, GETPOST($keysuffix."options_".$key.$keyprefix."month", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."day", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."year", 'int'));
-				}
-				elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
-				{
-					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
-					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
-					// Make sure we get an array even if there's only one checkbox
-					$value_arr = (array) $value_arr;
-					$value_key = implode(',', $value_arr);
-				}
-				elseif (in_array($key_type, array('price', 'double', 'int')))
-				{
-					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
-					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
-					$value_key = price2num($value_arr);
-				}
-				else
-				{
-					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
-					$value_key = GETPOST($keysuffix."options_".$key.$keyprefix);
-				}
-
-				$array_options[$keysuffix."options_".$key] = $value_key; // No keyprefix here. keyprefix is used only for read.
-			}
-
-			return $array_options;
-		}
-
-		return 0;
-	}
 }
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b07e5220384..f2b11938ca2 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -368,6 +368,8 @@ class Form
 
 				$s = picto_from_langcode($langcode, 'class="pictoforlang paddingright"');
 				$resultforextrlang .= $s;
+
+				// TODO Use the showInputField() method of ExtraLanguages object
 				if ($typeofdata == 'textarea') {
 					$resultforextrlang .= '<textarea name="field-'.$object->element."-".$fieldname."-".$langcode.'" id="'.$fieldname."-".$langcode.'" class="'.$morecss.'" rows="'.ROWS_2.'" wrap="soft">';
 					$resultforextrlang .= $valuetoshow;
diff --git a/htdocs/index.php b/htdocs/index.php
index 2301a841ddc..48e87ee6829 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -689,7 +689,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
                     }
                 }
 
-                $openedDashBoard .= '<div class="box-flex-item">'."\n";
+                $openedDashBoard .= '<div class="box-flex-item"><div class="box-flex-item-with-margin">'."\n";
                 $openedDashBoard .= '	<div class="info-box '.$openedDashBoardSize.'">'."\n";
                 $openedDashBoard .= '		<span class="info-box-icon bg-infobox-'.$groupKeyLowerCase.'">'."\n";
                 $openedDashBoard .= '		<i class="fa fa-dol-'.$groupKeyLowerCase.'"></i>'."\n";
@@ -736,6 +736,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 
                 $openedDashBoard .= '		</div><!-- /.info-box-content -->'."\n";
                 $openedDashBoard .= '	</div><!-- /.info-box -->'."\n";
+                $openedDashBoard .= '</div><!-- /.box-flex-item-with-margin -->'."\n";
                 $openedDashBoard .= '</div><!-- /.box-flex-item -->'."\n";
                 $openedDashBoard .= "\n";
             }
@@ -754,7 +755,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
             }
             $text .= '. '.$langs->transnoentitiesnoconv("LateDesc");
 
-            $weatherDashBoard = '<div class="box-flex-item '.$appendClass.'">'."\n";
+            $weatherDashBoard = '<div class="box-flex-item '.$appendClass.'"><div class="box-flex-item-with-margin">'."\n";
             $weatherDashBoard .= '	<div class="info-box '.$openedDashBoardSize.' info-box-weather info-box-weather-level'.$weather->level.'">'."\n";
             $weatherDashBoard .= '		<span class="info-box-icon">';
             $weatherDashBoard .= img_weather('', $weather->level, '', 0, 'valignmiddle width50');
@@ -778,6 +779,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 
             $weatherDashBoard .= '		</div><!-- /.info-box-content -->'."\n";
             $weatherDashBoard .= '	</div><!-- /.info-box -->'."\n";
+            $weatherDashBoard .= '</div><!-- /.box-flex-item-with-margin -->'."\n";
             $weatherDashBoard .= '</div><!-- /.box-flex-item -->'."\n";
             $weatherDashBoard .= "\n";
 
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 98130f1d03a..ade71d73f39 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -314,8 +314,8 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES
 	display: flex; /* or inline-flex */
 	flex-direction: row;
 	flex-wrap: wrap;
-	width: 100%;
-	margin: 0 0 0 -8px;
+	width: calc(100% + 14px);
+	margin: 0 -8px 0 -8px;
 	/*justify-content: space-between;*/
 }
 
@@ -348,7 +348,8 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES
 @media only screen and (max-width: 767px)
 {
 	.box-flex-container {
-	    margin: 0 0 0 0 !important;
+	    margin: 0 0 0 0px !important;
+	    width: 100% !important;
 	}
 
 	.info-box-module {

From f89195e39fe015adc14bdcd9aa61414fd75babf4 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Thu, 21 May 2020 23:23:59 +0200
Subject: [PATCH 352/490] Fix SQL IF for PGSQL

---
 htdocs/margin/tabs/productMargins.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 57eef531342..4551557e95a 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -136,9 +136,9 @@ if ($id > 0 || ! empty($ref))
             $sql.= " f.datef, f.paye, f.fk_statut as statut, f.type,";
             if (!$user->rights->societe->client->voir && !$socid) $sql.= " sc.fk_soc, sc.fk_user,";
             $sql.= " sum(d.total_ht) as selling_price,";							// may be negative or positive
-            $sql.= " IF(f.type = 2, -1, 1) * sum(d.qty) as qty,";						// not always positive in case of Credit note
-            $sql.= " IF(f.type = 2, -1, 1) * sum(d.qty * d.buy_price_ht) as buying_price,";			// not always positive in case of Credit note
-            $sql.= " IF(f.type = 2, -1, 1) * sum(abs(d.total_ht) - (d.buy_price_ht * d.qty)) as marge" ;	// not always positive in case of Credit note
+            $sql.= " ".$db->ifsql('f.type = 2', -1, 1)." * sum(d.qty) as qty,";						// not always positive in case of Credit note
+            $sql.= " ".$db->ifsql('f.type = 2', -1, 1)." * sum(d.qty * d.buy_price_ht) as buying_price,";			// not always positive in case of Credit note
+            $sql.= " ".$db->ifsql('f.type = 2', -1, 1)." * sum(abs(d.total_ht) - (d.buy_price_ht * d.qty)) as marge" ;	// not always positive in case of Credit note
             $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
             $sql.= ", ".MAIN_DB_PREFIX."facture as f";
             $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";

From 6434f255c32d444c744bb5fba96f547d85e73f0c Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 22 May 2020 00:32:55 +0200
Subject: [PATCH 353/490] Fix load_state_board doesn't take parameters

---
 htdocs/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/index.php b/htdocs/index.php
index 5eee02efa1e..944701fe0d1 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -324,7 +324,7 @@ if (empty($user->societe_id))
 	            	include_once $includes[$key];	// Loading a class cost around 1Mb
 
 	                $board=new $classe($db);
-	                $board->load_state_board($user);
+	                $board->load_state_board();
 	                $boardloaded[$classe]=$board;
 	            }
 	            else

From fb0f31c142cad7df1da3fc85190aab10c274e14d Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 22 May 2020 00:33:30 +0200
Subject: [PATCH 354/490] Fix board filters for expense report and holiday

---
 .../class/expensereport.class.php             | 20 +++++++++++++------
 htdocs/holiday/class/holiday.class.php        | 18 +++++++++++++----
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 2dddac4dbab..bb543642733 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -970,7 +970,7 @@ class ExpenseReport extends CommonObject
     {
         // phpcs:enable
 		global $conf;
-		
+
         $this->lines=array();
 
         $sql = ' SELECT de.rowid, de.comments, de.qty, de.value_unit, de.date, de.rang,';
@@ -2274,7 +2274,7 @@ class ExpenseReport extends CommonObject
     public function load_state_board()
     {
         // phpcs:enable
-        global $conf;
+        global $conf, $user;
 
         $this->nb=array();
 
@@ -2282,6 +2282,12 @@ class ExpenseReport extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
         $sql.= " WHERE ex.fk_statut > 0";
         $sql.= " AND ex.entity IN (".getEntity('expensereport').")";
+		if(!$user->rights->expensereport->readall)
+		{
+			$userchildids = $user->getAllChildIds(1);
+			$sql.= " AND (ex.fk_user_author IN (".join(',', $userchildids).")";
+			$sql.= " OR ex.fk_user_validator IN (".join(',', $userchildids)."))";
+		}
 
         $resql=$this->db->query($sql);
         if ($resql) {
@@ -2316,15 +2322,17 @@ class ExpenseReport extends CommonObject
 
         $now=dol_now();
 
-        $userchildids = $user->getAllChildIds(1);
-
         $sql = "SELECT ex.rowid, ex.date_valid";
         $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
         if ($option == 'toapprove') $sql.= " WHERE ex.fk_statut = 2";
         else $sql.= " WHERE ex.fk_statut = 5";
         $sql.= " AND ex.entity IN (".getEntity('expensereport').")";
-        $sql.= " AND (ex.fk_user_author IN (".join(',', $userchildids).")";
-        $sql.= " OR ex.fk_user_validator IN (".join(',', $userchildids)."))";
+        if(!$user->rights->expensereport->readall)
+        {
+			$userchildids = $user->getAllChildIds(1);
+			$sql.= " AND (ex.fk_user_author IN (".join(',', $userchildids).")";
+			$sql.= " OR ex.fk_user_validator IN (".join(',', $userchildids)."))";
+		}
 
         $resql=$this->db->query($sql);
         if ($resql)
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 25f1d9675bb..1d818d33c1f 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -2182,12 +2182,20 @@ class Holiday extends CommonObject
     public function load_state_board()
     {
         // phpcs:enable
+		global $user;
+
         $this->nb=array();
 
         $sql = "SELECT count(h.rowid) as nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday as h";
         $sql.= " WHERE h.statut > 1";
         $sql.= " AND h.entity IN (".getEntity('holiday').")";
+		if(!$user->rights->expensereport->read_all)
+		{
+			$userchildids = $user->getAllChildIds(1);
+			$sql.= " AND (h.fk_user IN (".join(',', $userchildids).")";
+			$sql.= " OR h.fk_validator IN (".join(',', $userchildids)."))";
+		}
 
         $resql=$this->db->query($sql);
         if ($resql) {
@@ -2221,14 +2229,16 @@ class Holiday extends CommonObject
 
         $now=dol_now();
 
-        $userchildids = $user->getAllChildIds(1);
-
         $sql = "SELECT h.rowid, h.date_debut";
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday as h";
         $sql.= " WHERE h.statut = 2";
         $sql.= " AND h.entity IN (".getEntity('holiday').")";
-        $sql.= " AND (h.fk_user IN (".join(',', $userchildids).")";
-        $sql.= " OR h.fk_validator IN (".join(',', $userchildids)."))";
+		if(!$user->rights->expensereport->read_all)
+		{
+			$userchildids = $user->getAllChildIds(1);
+			$sql.= " AND (h.fk_user IN (".join(',', $userchildids).")";
+			$sql.= " OR h.fk_validator IN (".join(',', $userchildids)."))";
+		}
 
         $resql=$this->db->query($sql);
         if ($resql)

From 5d78f6dac5f16f607c3a7317c3c448499d00e066 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 22 May 2020 00:38:01 +0200
Subject: [PATCH 355/490] NEW Add link to edit property from search result of
 website pages

---
 htdocs/core/lib/functions.lib.php      |  2 +-
 htdocs/product/class/product.class.php |  2 +-
 htdocs/theme/eldy/global.inc.php       |  4 ++--
 htdocs/website/index.php               | 19 +++++++++++++++++++
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e3059ade21e..809ebef2ca9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3170,7 +3170,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
 				'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top',
-				'home', 'companies', 'products', 'commercial', 'invoicing', 'preview', 'project', 'projectpub', 'supplier_invoice', 'hrm', 'members', 'ticket', 'generic',
+				'home', 'companies', 'products', 'commercial', 'invoicing', 'pencil-ruler', 'preview', 'project', 'projectpub', 'supplier_invoice', 'hrm', 'members', 'ticket', 'generic',
         		'error', 'warning', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
         		'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda'
 			)
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 7b6892552d1..e94065ded8d 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -818,7 +818,7 @@ class Product extends CommonObject
     }
 
     /**
-     *    Update a record into database.
+     *  Update a record into database.
      *  If batch flag is set to on, we create records into llx_product_batch
      *
      * @param  int     $id          Id of product
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index fc365ae5812..b01d84ed237 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -665,10 +665,10 @@ body[class*="colorblind-"] .text-success{
     color : <?php print $textDanger; ?>
 }
 
-.editfielda span.fa-pencil-alt, .editfielda span.fa-trash, .editfieldlang {
+.editfielda span.fa-pencil-alt, .editfielda span.fa-pencil-ruler, .editfielda span.fa-trash, .editfieldlang {
     color: #ccc !important;
 }
-.editfielda span.fa-pencil-alt:hover, .editfielda span.fa-trash:hover, .editfieldlang:hover {
+.editfielda span.fa-pencil-alt:hover, .editfielda span.fa-pencil-ruler:hover, .editfielda span.fa-trash:hover, .editfieldlang:hover {
     color: var(--colortexttitle) !important;
 }
 .fawidth30 {
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index ba539ccb653..d414530f331 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -3629,6 +3629,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 			print getTitleFieldOfList("Page", 0, $_SERVER['PHP_SELF'], 'pageurl', '', $param, '', $sortfield, $sortorder, '')."\n";
 			//print getTitleFieldOfList("Description", 0, $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, '')."\n";
 			print getTitleFieldOfList("", 0, $_SERVER['PHP_SELF']);
+			print getTitleFieldOfList("", 0, $_SERVER['PHP_SELF']);
 			print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 			print '</tr>';
 
@@ -3651,6 +3652,24 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 					print '<span class="opacitymedium">'.$answerrecord->description.'</span>';
 					print '</td>';
 
+					// Edit properties
+					print '<td>';
+					$param = '?action=replacesiteconfirm';
+					$param .= '&websiteid='.$website->id;
+					$param .= '&optioncontent='.GETPOST('optioncontent');
+					$param .= '&optionmeta='.GETPOST('optionmeta');
+					$param .= '&optionsitefiles='.GETPOST('optionsitefiles');
+					$param .= '&searchstring='.$searchkey;
+					$disabled = '';
+					$urltoedithtmlsource = $_SERVER["PHP_SELF"].'?action=editmeta&websiteid='.$website->id.'&pageid='.$answerrecord->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].$param);
+					if (empty($user->rights->website->write)) {
+						$disabled = ' disabled';
+						$urltoedithtmlsource = '';
+					}
+					print '<a class="editfielda '.$disabled.'" href="'.$urltoedithtmlsource.'" title="'.$langs->trans("EditPageMeta").'">'.img_picto($langs->trans("EditPageMeta"), 'pencil-ruler').'</a>';
+					print '</td>';
+
+					// Edit HTML source
 					print '<td>';
 					$param = '?action=replacesiteconfirm';
 					$param .= '&websiteid='.$website->id;

From 6b1eef9827a72a9753bb151abd956fca3d8d0f6a Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 22 May 2020 00:50:13 +0200
Subject: [PATCH 356/490] Fix board exepense report to approve

---
 htdocs/index.php                   | 24 ++++++++++++------------
 htdocs/theme/eldy/info-box.inc.php |  2 +-
 htdocs/theme/md/info-box.inc.php   |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/htdocs/index.php b/htdocs/index.php
index 250a0c1736b..44722403ef4 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -450,35 +450,35 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
     if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->socid && empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT)) {
         include_once DOL_DOCUMENT_ROOT . '/compta/paiement/cheque/class/remisecheque.class.php';
         $board = new RemiseCheque($db);
-        $dashboardlines['RemiseCheque'] = $board->load_board($user);
+        $dashboardlines[$board->element] = $board->load_board($user);
     }
 
     // Number of foundation members
     if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire && !$user->socid) {
         include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
         $board = new Adherent($db);
-        $dashboardlines['Adherent'] = $board->load_board($user);
+        $dashboardlines[$board->element] = $board->load_board($user);
     }
 
     // Number of expense reports to approve
     if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->approve) {
         include_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
         $board = new ExpenseReport($db);
-        $dashboardlines['ExpenseReport'] = $board->load_board($user, 'toapprove');
+        $dashboardlines[$board->element . '_toapprove'] = $board->load_board($user, 'toapprove');
     }
 
     // Number of expense reports to pay
     if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->to_paid) {
         include_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
         $board = new ExpenseReport($db);
-        $dashboardlines['ExpenseReport'] = $board->load_board($user, 'topay');
+        $dashboardlines[$board->element . '_topay'] = $board->load_board($user, 'topay');
     }
 
     // Number of holidays to approve
     if (!empty($conf->holiday->enabled) && $user->rights->holiday->approve) {
         include_once DOL_DOCUMENT_ROOT . '/holiday/class/holiday.class.php';
         $board = new Holiday($db);
-        $dashboardlines['Holiday'] = $board->load_board($user);
+        $dashboardlines[$board->element] = $board->load_board($user);
     }
 
     $object = new stdClass();
@@ -556,28 +556,28 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
             array(
                 'groupName' => 'BankAccount',
                 'stats' =>
-                    array('bank_account', 'RemiseCheque'),
+                    array('bank_account', 'chequereceipt'),
             ),
-        'Adherent' =>
+        'member' =>
             array(
                 'groupName' => 'Members',
                 'globalStatsKey' => 'members',
                 'stats' =>
-                    array('Adherent'),
+                    array('member'),
             ),
-        'ExpenseReport' =>
+        'expensereport' =>
             array(
                 'groupName' => 'ExpenseReport',
                 'globalStatsKey' => 'expensereports',
                 'stats' =>
-                    array('ExpenseReport'),
+                    array('expensereport_toapprove', 'expensereport_topay'),
             ),
-        'Holiday' =>
+        'holiday' =>
             array(
                 'groupName' => 'Holidays',
                 'globalStatsKey' => 'holidays',
                 'stats' =>
-                    array('Holiday'),
+                    array('holiday'),
             ),
     );
 
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 268f1885327..9c2ebd9e8a4 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -226,7 +226,7 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES
 .fa-dol-bank_account:before {
 	content: "\f19c";
 }
-.fa-dol-adherent:before {
+.fa-dol-member:before {
 	content: "\f0c0";
 }
 .fa-dol-expensereport:before {
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index fb011e63e69..38315a76272 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -164,7 +164,7 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES
 .fa-dol-bank_account:before {
 	content: "\f19c";
 }
-.fa-dol-adherent:before {
+.fa-dol-member:before {
 	content: "\f0c0";
 }
 .fa-dol-expensereport:before {

From e81e4032f7de1af421114e37f7472cf474c8d930 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 22 May 2020 00:54:53 +0200
Subject: [PATCH 357/490] Fix make page of categories of web site working

---
 htdocs/categories/class/categorie.class.php | 11 +++++++----
 htdocs/categories/index.php                 | 15 +--------------
 htdocs/langs/en_US/categories.lang          |  1 +
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index dc451855c0a..cf0fa1cd697 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -64,9 +64,7 @@ class Categorie extends CommonObject
 
 
 	/**
-	 * @var array ID mapping from type string
-	 *
-	 * @note This array should be removed in future, once previous constants are moved to the string value. Deprecated
+	 * @var array Table of mapping between type string and ID used for field 'type' in table llx_categories
 	 */
 	protected $MAP_ID = array(
 		'product'      => 0,
@@ -79,7 +77,8 @@ class Categorie extends CommonObject
 		'user'         => 7,
 		'bank_line'    => 8,
 		'warehouse'    => 9,
-        'actioncomm'   => 10
+        'actioncomm'   => 10,
+		'website_page' => 11
 	);
 
     /**
@@ -1113,6 +1112,10 @@ class Categorie extends CommonObject
 	    global $conf, $langs;
 
 		if (!is_numeric($type)) $type = $this->MAP_ID[$type];
+		if (is_null($type)) {
+			$this->error = 'BadValueForParameterType';
+			return -1;
+		}
 
         if (is_string($markafterid))
         {
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index b36101750f2..db6f5a2eec4 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -54,6 +54,7 @@ $typetext = $type;
 if ($type == Categorie::TYPE_ACCOUNT) 			$title = $langs->trans('AccountsCategoriesArea');
 elseif ($type == Categorie::TYPE_WAREHOUSE) 	$title = $langs->trans('StocksCategoriesArea');
 elseif ($type == Categorie::TYPE_ACTIONCOMM)	$title = $langs->trans('ActionCommCategoriesArea');
+elseif ($type == Categorie::TYPE_WEBSITE_PAGE)	$title = $langs->trans('WebsitePagesCategoriesArea');
 else 											$title = $langs->trans(ucfirst($type).'sCategoriesArea');
 
 $arrayofjs = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
@@ -69,8 +70,6 @@ if (!empty($user->rights->categorie->creer)) {
 
 print load_fiche_titre($title, $newcardbutton, 'object_category');
 
-//print '<table border="0" width="100%" class="notopnoleftnoright">';
-//print '<tr><td valign="top" width="30%" class="notopnoleft">';
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
@@ -88,20 +87,9 @@ print '<td colspan="3">'.$langs->trans("Search").'</td>';
 print '</tr>';
 print '<tr class="oddeven nohover"><td>';
 print $langs->trans("Name").':</td><td><input class="flat inputsearch" type="text" name="catname" value="'.$catname.'"/></td><td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
-/*
-// faire une rech dans une sous categorie uniquement
-print '<tr '.$bc[0].'><td>';
-print $langs->trans("SubCatOf").':</td><td>';
-
-print $form->select_all_categories('','subcatof');
-print '</td>';
-print '<td><input type="submit" class="button" value="'.$langs->trans ("Search").'"></td></tr>';
-*/
-
 print '</table></form>';
 
 
-//print '</td><td valign="top" width="70%">';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
@@ -138,7 +126,6 @@ if ($catname || $id > 0)
 else print '&nbsp;';
 
 
-//print '</td></tr></table>';
 print '</div></div></div>';
 
 print '<div class="fichecenter"><br>';
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index 30bace0574c..9bb71984ecf 100644
--- a/htdocs/langs/en_US/categories.lang
+++ b/htdocs/langs/en_US/categories.lang
@@ -86,4 +86,5 @@ ByDefaultInList=By default in list
 ChooseCategory=Choose category
 StocksCategoriesArea=Warehouses Categories Area
 ActionCommCategoriesArea=Events Categories Area
+WebsitePagesCategoriesArea=Page-Container Categories Area
 UseOrOperatorForCategories=Use or operator for categories

From 43103f40a565aecd41dab246b5b2b4c6fee3c93f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 22 May 2020 00:54:53 +0200
Subject: [PATCH 358/490] Fix make page of categories of web site working

---
 htdocs/categories/class/categorie.class.php | 11 +++++++----
 htdocs/categories/index.php                 | 15 +--------------
 htdocs/langs/en_US/categories.lang          |  1 +
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index dc451855c0a..cf0fa1cd697 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -64,9 +64,7 @@ class Categorie extends CommonObject
 
 
 	/**
-	 * @var array ID mapping from type string
-	 *
-	 * @note This array should be removed in future, once previous constants are moved to the string value. Deprecated
+	 * @var array Table of mapping between type string and ID used for field 'type' in table llx_categories
 	 */
 	protected $MAP_ID = array(
 		'product'      => 0,
@@ -79,7 +77,8 @@ class Categorie extends CommonObject
 		'user'         => 7,
 		'bank_line'    => 8,
 		'warehouse'    => 9,
-        'actioncomm'   => 10
+        'actioncomm'   => 10,
+		'website_page' => 11
 	);
 
     /**
@@ -1113,6 +1112,10 @@ class Categorie extends CommonObject
 	    global $conf, $langs;
 
 		if (!is_numeric($type)) $type = $this->MAP_ID[$type];
+		if (is_null($type)) {
+			$this->error = 'BadValueForParameterType';
+			return -1;
+		}
 
         if (is_string($markafterid))
         {
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index b36101750f2..db6f5a2eec4 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -54,6 +54,7 @@ $typetext = $type;
 if ($type == Categorie::TYPE_ACCOUNT) 			$title = $langs->trans('AccountsCategoriesArea');
 elseif ($type == Categorie::TYPE_WAREHOUSE) 	$title = $langs->trans('StocksCategoriesArea');
 elseif ($type == Categorie::TYPE_ACTIONCOMM)	$title = $langs->trans('ActionCommCategoriesArea');
+elseif ($type == Categorie::TYPE_WEBSITE_PAGE)	$title = $langs->trans('WebsitePagesCategoriesArea');
 else 											$title = $langs->trans(ucfirst($type).'sCategoriesArea');
 
 $arrayofjs = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
@@ -69,8 +70,6 @@ if (!empty($user->rights->categorie->creer)) {
 
 print load_fiche_titre($title, $newcardbutton, 'object_category');
 
-//print '<table border="0" width="100%" class="notopnoleftnoright">';
-//print '<tr><td valign="top" width="30%" class="notopnoleft">';
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
@@ -88,20 +87,9 @@ print '<td colspan="3">'.$langs->trans("Search").'</td>';
 print '</tr>';
 print '<tr class="oddeven nohover"><td>';
 print $langs->trans("Name").':</td><td><input class="flat inputsearch" type="text" name="catname" value="'.$catname.'"/></td><td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
-/*
-// faire une rech dans une sous categorie uniquement
-print '<tr '.$bc[0].'><td>';
-print $langs->trans("SubCatOf").':</td><td>';
-
-print $form->select_all_categories('','subcatof');
-print '</td>';
-print '<td><input type="submit" class="button" value="'.$langs->trans ("Search").'"></td></tr>';
-*/
-
 print '</table></form>';
 
 
-//print '</td><td valign="top" width="70%">';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
@@ -138,7 +126,6 @@ if ($catname || $id > 0)
 else print '&nbsp;';
 
 
-//print '</td></tr></table>';
 print '</div></div></div>';
 
 print '<div class="fichecenter"><br>';
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index 30bace0574c..9bb71984ecf 100644
--- a/htdocs/langs/en_US/categories.lang
+++ b/htdocs/langs/en_US/categories.lang
@@ -86,4 +86,5 @@ ByDefaultInList=By default in list
 ChooseCategory=Choose category
 StocksCategoriesArea=Warehouses Categories Area
 ActionCommCategoriesArea=Events Categories Area
+WebsitePagesCategoriesArea=Page-Container Categories Area
 UseOrOperatorForCategories=Use or operator for categories

From 38c8ebd62783d91e2bfcbdf6b77927337da7a959 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 22 May 2020 01:01:27 +0200
Subject: [PATCH 359/490] Add link into toolbar to create website tags

---
 htdocs/website/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index d414530f331..1eef84a1ae7 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2270,6 +2270,7 @@ if (!GETPOST('hide_websitemenu'))
 		*/
 
 		print '<a href="'.$_SERVER["PHP_SEFL"].'?action=replacesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("ReplaceWebsiteContent")).'"><span class="fa fa-search"><span></a>';
+		print '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=website&type=website_page&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("Categories")).'"><span class="fa fa-tags"><span></a>';
 		if (! empty($conf->global->WEBSITE_ADD_REGENERATE_BUTTON)) {
 			print '<a href="'.$_SERVER["PHP_SEFL"].'?action=regeneratesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("RegenerateWebsiteContent")).'"><span class="fa fa-cogs"><span></a>';
 		}

From d9a2d2b982613e5a52beb29d949f26931abad44d Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Fri, 22 May 2020 08:00:26 +0200
Subject: [PATCH 360/490] fix not working default values for payment

---
 htdocs/fourn/facture/card.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 6e8f259bc01..ae6af7bf99b 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1780,6 +1780,18 @@ if ($action == 'create')
 		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
 	}
 
+	// when payment condition is empty (means not override by payment condition form a other object, like third-party), try to use default value
+	if(empty($cond_reglement_id))
+	{
+		$cond_reglement_id = GETPOST("cond_reglement_id");
+	}
+
+	// when payment mode is empty (means not override by payment condition form a other object, like third-party), try to use default value
+	if(empty($mode_reglement_id))
+	{
+		$mode_reglement_id = GETPOST("mode_reglement_id");
+	}
+	
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';

From 53080be2453eb2c6815d809e344c1e5191f070d3 Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Fri, 22 May 2020 08:01:29 +0200
Subject: [PATCH 361/490] fix not working default values for payment

---
 htdocs/compta/facture/card.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index ab2262844bf..3b36950447f 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2907,6 +2907,18 @@ if ($action == 'create')
 		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
 	}
 
+	// when payment condition is empty (means not override by payment condition form a other object, like third-party), try to use default value
+	if(empty($cond_reglement_id))
+	{
+		$cond_reglement_id = GETPOST("cond_reglement_id");
+	}
+
+	// when payment mode is empty (means not override by payment mode form a other object, like third-party), try to use default value
+	if(empty($mode_reglement_id))
+	{
+		$mode_reglement_id = GETPOST("mode_reglement_id");
+	}
+	
 	if (!empty($soc->id)) $absolute_discount = $soc->getAvailableDiscounts();
 	$note_public = $object->getDefaultCreateValueFor('note_public', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTURE_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_public : null));
 	$note_private = $object->getDefaultCreateValueFor('note_private', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTURE_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_private : null));

From 2873f4dacfe3a0bdf0c7e91281bb73a40b4f2ce4 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 22 May 2020 06:08:12 +0000
Subject: [PATCH 362/490] Fixing style errors.

---
 htdocs/compta/facture/card.php | 2 +-
 htdocs/fourn/facture/card.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 3b36950447f..038120151e3 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2918,7 +2918,7 @@ if ($action == 'create')
 	{
 		$mode_reglement_id = GETPOST("mode_reglement_id");
 	}
-	
+
 	if (!empty($soc->id)) $absolute_discount = $soc->getAvailableDiscounts();
 	$note_public = $object->getDefaultCreateValueFor('note_public', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTURE_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_public : null));
 	$note_private = $object->getDefaultCreateValueFor('note_private', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTURE_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_private : null));
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index ae6af7bf99b..05cb43fceb8 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1791,7 +1791,7 @@ if ($action == 'create')
 	{
 		$mode_reglement_id = GETPOST("mode_reglement_id");
 	}
-	
+
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';

From 2f8b36445437beefeea6673de8d19db585373903 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 22 May 2020 13:18:47 +0200
Subject: [PATCH 363/490] Code comment

---
 htdocs/commande/class/commande.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index b911a03e3ad..3496a9299fe 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2018,7 +2018,7 @@ class Commande extends CommonOrder
 	/**
 	 *	Load array lines
 	 *
-	 *	@param		int		$only_product	Return only physical products
+	 *	@param		int		$only_product	Return only physical products, not services
 	 *	@param		int		$loadalsotranslation	Return translation for products
 	 *	@return		int						<0 if KO, >0 if OK
 	 */

From e349b9323f04db2ee0fda7d73fe8fea41abf4106 Mon Sep 17 00:00:00 2001
From: "gael.langlais" <gael.langlais@protonmail.com>
Date: Fri, 22 May 2020 17:42:06 +0200
Subject: [PATCH 364/490] Change some curly braces #13929

---
 htdocs/contact/list.php           | 11 +++++------
 htdocs/core/antispamimage.php     |  2 +-
 htdocs/core/class/lessc.class.php |  6 +++---
 htdocs/core/lib/security2.lib.php | 16 ++++++++--------
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 9e7485d189f..7eee6d797e7 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -76,7 +76,7 @@ $search_no_email = GETPOST("search_no_email", 'int');
 if (!empty($conf->socialnetworks->enabled)) {
 	foreach ($socialnetworks as $key => $value) {
 		if ($value['active']) {
-			$search_{$key} = GETPOST("search_".$key, 'alpha');
+			$search_[$key] = GETPOST("search_".$key, 'alpha');
 		}
 	}
 }
@@ -253,7 +253,7 @@ if (empty($reshook))
 		if (!empty($conf->socialnetworks->enabled)) {
 			foreach ($socialnetworks as $key => $value) {
 				if ($value['active']) {
-					$search_{$key} = "";
+					$search_[$key] = "";
 				}
 			}
 		}
@@ -357,9 +357,8 @@ if (strlen($search_phone_mobile))   $sql .= natural_search('p.phone_mobile', $se
 if (strlen($search_fax))            $sql .= natural_search('p.fax', $search_fax);
 if (!empty($conf->socialnetworks->enabled)) {
 	foreach ($socialnetworks as $key => $value) {
-		if ($value['active'] && strlen($search_{$key})) {
-			//$sql.= natural_search("p.socialnetworks->'$.".$key."'", $search_{$key});
-			$sql .= ' AND p.socialnetworks LIKE \'%"'.$key.'":"'.$search_{$key}.'%\'';
+		if ($value['active'] && strlen($search_[$key])) {
+			$sql .= ' AND p.socialnetworks LIKE \'%"'.$key.'":"'.$search_[$key].'%\'';
 		}
 	}
 }
@@ -669,7 +668,7 @@ if (!empty($conf->socialnetworks->enabled)) {
 			if (!empty($arrayfields['p.'.$key]['checked']))
 			{
 				print '<td class="liste_titre">';
-				print '<input class="flat" type="text" name="search_'.$key.'" size="6" value="'.dol_escape_htmltag($search_{$key}).'">';
+				print '<input class="flat" type="text" name="search_'.$key.'" size="6" value="'.dol_escape_htmltag($search_[$key]).'">';
 				print '</td>';
 			}
 		}
diff --git a/htdocs/core/antispamimage.php b/htdocs/core/antispamimage.php
index 68e585c3ea0..7d6512a64a9 100644
--- a/htdocs/core/antispamimage.php
+++ b/htdocs/core/antispamimage.php
@@ -43,7 +43,7 @@ $number = strlen($letters);
 $string = '';
 for ($i = 0; $i < $length; $i++)
 {
-	$string .= $letters{mt_rand(0, $number - 1)};
+	$string .= $letters[mt_rand(0, $number - 1)];
 }
 //print $string;
 
diff --git a/htdocs/core/class/lessc.class.php b/htdocs/core/class/lessc.class.php
index 210c3d3c29d..8ab9e58aa58 100644
--- a/htdocs/core/class/lessc.class.php
+++ b/htdocs/core/class/lessc.class.php
@@ -1966,7 +1966,7 @@ class Lessc {
 		$this->pushEnv();
 		$parser = new lessc_parser($this, __METHOD__);
 		foreach ($args as $name => $strValue) {
-			if ($name{0} !== '@') {
+			if ($name[0] !== '@') {
 				$name = '@'.$name;
 			}
 			$parser->count = 0;
@@ -2638,7 +2638,7 @@ class lessc_parser {
 								$hidden = true;
 								if (!isset($block->args)) {
 									foreach ($block->tags as $tag) {
-										if (!is_string($tag) || $tag{0} != $this->lessc->mPrefix) {
+										if (!is_string($tag) || $tag[0] != $this->lessc->mPrefix) {
 											$hidden = false;
 											break;
 										}
@@ -2692,7 +2692,7 @@ class lessc_parser {
 		protected function fixTags($tags) {
 			// move @ tags out of variable namespace
 			foreach ($tags as &$tag) {
-				if ($tag{0} == $this->lessc->vPrefix)
+				if ($tag[0] == $this->lessc->vPrefix)
 					$tag[0] = $this->lessc->mPrefix;
 			}
 			return $tags;
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 04d16084365..c7f5a7b7330 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -463,15 +463,15 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		{
 			$max = strlen($lowercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $lowercase{random_int(0, $max)};
+				$randomCode .= $lowercase[random_int(0, $max)];
 			}
 			$max = strlen($uppercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $uppercase{random_int(0, $max)};
+				$randomCode .= $uppercase[random_int(0, $max)];
 			}
 			$max = strlen($numbers) - 1;
 			for ($x = 0; $x < $nbofcharlast; $x++) {
-				$randomCode .= $numbers{random_int(0, $max)};
+				$randomCode .= $numbers[random_int(0, $max)];
 			}
 
 			$generated_password = str_shuffle($randomCode);
@@ -480,15 +480,15 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		{
 			$max = strlen($lowercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $lowercase{mt_rand(0, $max)};
+				$randomCode .= $lowercase[mt_rand(0, $max)];
 			}
 			$max = strlen($uppercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $uppercase{mt_rand(0, $max)};
+				$randomCode .= $uppercase[mt_rand(0, $max)];
 			}
 			$max = strlen($numbers) - 1;
 			for ($x = 0; $x < $nbofcharlast; $x++) {
-				$randomCode .= $numbers{mt_rand(0, $max)};
+				$randomCode .= $numbers[mt_rand(0, $max)];
 			}
 
 			$generated_password = str_shuffle($randomCode);
@@ -512,11 +512,11 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		$max = strlen($numbers) - 1;
 		if (function_exists('random_int'))	// Cryptographic random
 		{
-			$generated_password = str_replace($replaceambiguouschars, $numbers{random_int(0, $max)}, $generated_password);
+			$generated_password = str_replace($replaceambiguouschars, $numbers[random_int(0, $max)], $generated_password);
 		}
 		else
 		{
-			$generated_password = str_replace($replaceambiguouschars, $numbers{mt_rand(0, $max)}, $generated_password);
+			$generated_password = str_replace($replaceambiguouschars, $numbers[mt_rand(0, $max)], $generated_password);
 		}
 	}
 

From dce93197d7535a3290d0562b453934120410cfd7 Mon Sep 17 00:00:00 2001
From: "gael.langlais" <gael.langlais@protonmail.com>
Date: Fri, 22 May 2020 17:58:24 +0200
Subject: [PATCH 365/490] FIX #13908 keep child label if modified by user

---
 .../variants/class/ProductCombination.class.php   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index f19c81960db..c3cb5f77a5f 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -326,11 +326,16 @@ class ProductCombination
 
 		$child = new Product($this->db);
 		$child->fetch($this->fk_product_child);
-		$child->price_autogen = $parent->price_autogen;
-		$child->weight = $parent->weight + $this->variation_weight;
-		$child->weight_units = $parent->weight_units;
-		$varlabel = $this->getCombinationLabel($this->fk_product_child);
-		$child->label = $parent->label.$varlabel;
+        $child->price_autogen   = $parent->price_autogen;
+        $child->weight          = $parent->weight + $this->variation_weight;
+        $child->weight_units    = $parent->weight_units;
+
+        // Don't update the child label if the user modified it.
+        if ($child->label == $parent->label) {
+            // This will trigger only at variant creation time
+            $varlabel               = $this->getCombinationLabel($this->fk_product_child);
+            $child->label           = $parent->label.$varlabel;;
+        }
 
 		if ($child->update($child->id, $user) > 0) {
 			$new_vat = $parent->tva_tx;

From c460cff01c63df7ab8af295d109917195adc6bc0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 01:17:01 +0200
Subject: [PATCH 366/490] Fix calculation and add tooltip to understand it.

---
 htdocs/bom/bom_card.php        |  2 +-
 htdocs/bom/class/bom.class.php | 11 ++++++++++-
 htdocs/langs/en_US/mrp.lang    |  1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 48e9c9d965a..c98dee97f51 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -523,7 +523,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$keyforbreak = 'duration';
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 
-	print '<tr><td>'.$langs->trans("TotalCost").'</td><td>'.price($object->total_cost).'</td></tr>';
+	print '<tr><td>'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCost")).'</td><td>'.price($object->total_cost).'</td></tr>';
 	print '<tr><td>'.$langs->trans("UnitCost").'</td><td>'.price($object->unit_cost).'</td></tr>';
 
 	// Other attributes
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 3e522b3c11f..86e0b84b655 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1013,11 +1013,20 @@ class BOM extends CommonObject
 		$this->unit_cost = 0;
 		$this->total_cost = 0;
 
+		require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+		$productFournisseur = new ProductFournisseur($this->db);
+
 		foreach ($this->lines as &$line) {
 			$tmpproduct = new Product($this->db);
 			$tmpproduct->fetch($line->fk_product);
+			$line->unit_cost = price2num((!empty($tmpproduct->cost_price)) ? $tmpproduct->cost_price : $tmpproduct->pmp);
+			if (empty($line->unit_cost)) {
+				if ($productFournisseur->find_min_price_product_fournisseur($line->fk_product) > 0)
+				{
+					$line->unit_cost = $productFournisseur->fourn_unitprice;
+				}
+			}
 
-			$line->unit_cost = (!empty($tmpproduct->cost_price)) ? $tmpproduct->cost_price : $tmpproduct->pmp; // TODO : add option to work with cost_price or pmp
 			$line->total_cost = price2num($line->qty * $line->unit_cost, 'MT');
 			$this->total_cost += $line->total_cost;
 		}
diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index d3c4d3253c6..faa8eb60cf4 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -74,3 +74,4 @@ ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
+BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) 
\ No newline at end of file

From b137775046c5832a43a7f96fd7456e615839380d Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Sat, 23 May 2020 10:12:14 +0200
Subject: [PATCH 367/490] fix merge issue

---
 htdocs/accountancy/admin/account.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 961f83b0155..0119963d63f 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -267,22 +267,13 @@ if ($resql)
 {
 	$num = $db->num_rows($resql);
 
-    $param = '';
+   $param = '';
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 	if ($search_account) $param .= '&search_account='.urlencode($search_account);
 	if ($search_label) $param .= '&search_label='.urlencode($search_label);
-<<<<<<< HEAD
-<<<<<<< HEAD
-	if ($search_labelshort) $param.= '&search_labelshort='.urlencode($search_labelshort);
-	if ($search_accountparent) $param .= '&search_accountparent='.urlencode($search_accountparent);
-=======
-	if ($search_accountparent > 0 || $search_accountparent == '0') $param .= '&search_accountparent='.urlencode($search_accountparent);
->>>>>>> upstream/11.0
-=======
 	if ($search_labelshort) $param .= '&search_labelshort='.urlencode($search_labelshort);
 	if ($search_accountparent > 0 || $search_accountparent == '0') $param .= '&search_accountparent='.urlencode($search_accountparent);
->>>>>>> upstream/develop
 	if ($search_pcgtype) $param .= '&search_pcgtype='.urlencode($search_pcgtype);
 	if ($optioncss != '') $param .= '&optioncss='.$optioncss;
 

From e7c2bd830a738958cb49d689afea9670a714d666 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Sat, 23 May 2020 10:17:48 +0200
Subject: [PATCH 368/490] fix merge issue

---
 htdocs/accountancy/admin/account.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 0119963d63f..16f0de4d91a 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -350,30 +350,14 @@ if ($resql)
 	print '<tr class="liste_titre_filter">';
 	if (!empty($arrayfields['aa.account_number']['checked']))	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_account" value="'.$search_account.'"></td>';
 	if (!empty($arrayfields['aa.label']['checked']))			print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="'.$search_label.'"></td>';
-<<<<<<< HEAD
-<<<<<<< HEAD
-	if (!empty($arrayfields['aa.labelshort']['checked']))		print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_labelshort" value="' . $search_labelshort . '"></td>';
-	if (!empty($arrayfields['aa.account_parent']['checked']))	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_accountparent" value="'.$search_accountparent.'"></td>';
-	if (!empty($arrayfields['aa.pcg_type']['checked']))			print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgtype" value="'.$search_pcgtype.'"></td>';
-=======
-=======
 	if (!empty($arrayfields['aa.labelshort']['checked']))		print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_labelshort" value="'.$search_labelshort.'"></td>';
->>>>>>> upstream/develop
 	if (!empty($arrayfields['aa.account_parent']['checked'])) {
 		print '<td class="liste_titre">';
 		print $formaccounting->select_account($search_accountparent, 'search_accountparent', 2);
 		print '</td>';
 	}
 	if (!empty($arrayfields['aa.pcg_type']['checked']))		    print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgtype" value="'.$search_pcgtype.'"></td>';
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> upstream/11.0
-=======
->>>>>>> upstream/develop
-	if (!empty($arrayfields['aa.pcg_subtype']['checked']))		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgsubtype" value="'.$search_pcgsubtype.'"></td>';
-=======
 	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (!empty($arrayfields['aa.reconcilable']['checked']))   print '<td class="liste_titre">&nbsp;</td>'; }
->>>>>>> upstream/develop
 	if (!empty($arrayfields['aa.active']['checked']))			print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);

From 74662d3ecd79981a3e5dd564ad1cfe8d497a957d Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 23 May 2020 08:18:41 +0000
Subject: [PATCH 369/490] Fixing style errors.

---
 htdocs/accountancy/admin/account.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 16f0de4d91a..2ac97ee38ac 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -267,7 +267,7 @@ if ($resql)
 {
 	$num = $db->num_rows($resql);
 
-   $param = '';
+	$param = '';
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 	if ($search_account) $param .= '&search_account='.urlencode($search_account);

From 875230ed13984fc41e12f045c3388f3d237fe475 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Sat, 23 May 2020 10:23:26 +0200
Subject: [PATCH 370/490] Fix missing batch update to varchar(128)

---
 htdocs/install/mysql/migration/11.0.0-12.0.0.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index e2112b020b0..96506120263 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -252,6 +252,7 @@ ALTER TABLE llx_blockedlog ADD COLUMN object_version varchar(32) DEFAULT '';
 
 ALTER TABLE llx_product_lot MODIFY COLUMN batch varchar(128);
 ALTER TABLE llx_product_batch MODIFY COLUMN batch varchar(128);
+ALTER TABLE llx_expeditiondet_batch MODIFY COLUMN batch varchar(128);
 ALTER TABLE llx_commande_fournisseur_dispatch MODIFY COLUMN batch varchar(128);
 ALTER TABLE llx_stock_mouvement MODIFY COLUMN batch varchar(128);
 ALTER TABLE llx_mrp_production MODIFY COLUMN batch varchar(128);

From 0bf6b26117a631ee6843e3b2911bad1929743c37 Mon Sep 17 00:00:00 2001
From: Laurent De Coninck <lau.deconinck@gmail.com>
Date: Sat, 23 May 2020 12:20:56 +0200
Subject: [PATCH 371/490] add a mail server

---
 build/docker/docker-compose.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/build/docker/docker-compose.yml b/build/docker/docker-compose.yml
index 3fe6125a874..cc839810e7f 100644
--- a/build/docker/docker-compose.yml
+++ b/build/docker/docker-compose.yml
@@ -21,5 +21,12 @@ web:
         - ../../htdocs:/var/www/html
     links:
         - mariadb
+        - mail
     ports:
         - "80:80"
+
+mail:
+    image: maildev/maildev
+    ports:
+        - "8081:80"
+        - "25:25"
\ No newline at end of file

From f2c02f5559b931b2288929f4bd1686114c791aed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 12:41:06 +0200
Subject: [PATCH 372/490] FIX Language for RSS

---
 htdocs/core/lib/xcal.lib.php       | 7 +++++--
 htdocs/website/samples/wrapper.php | 8 ++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php
index 440f1147cbf..3d8120a6d29 100644
--- a/htdocs/core/lib/xcal.lib.php
+++ b/htdocs/core/lib/xcal.lib.php
@@ -334,9 +334,10 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
  *  @param      string	$outputfile         Output file
  *  @param      string	$filter             (optional) Filter
  *  @param		string	$url				Url (If empty, forge URL for agenda RSS export)
+ *  @param		string	$langcode			Language code to show in header
  *  @return     int                         < 0 if ko, Nb of events in file if ok
  */
-function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filter = '', $url = '')
+function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filter = '', $url = '', $langcode = '')
 {
 	global $user, $conf, $langs;
 	global $dolibarr_main_url_root;
@@ -362,7 +363,9 @@ function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filt
 		fwrite($fichier, '<rss version="2.0">');
 		fwrite($fichier, "\n");
 
-		fwrite($fichier, "<channel>\n<title>".$title."</title>\n");
+		fwrite($fichier, "<channel>\n");
+		fwrite($fichier, "<title>".$title."</title>\n");
+		if ($langcode) fwrite($fichier, "<language>".$langcode."</language>\n");
 
 		/*
         fwrite($fichier, "<description><![CDATA[".$desc.".]]></description>"."\n".
diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index 25483a36f53..bb761c5f894 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -12,6 +12,7 @@ $hashp = GETPOST('hashp', 'aZ09');
 $modulepart = GETPOST('modulepart', 'aZ09');
 $entity = GETPOST('entity', 'int') ?GETPOST('entity', 'int') : $conf->entity;
 $original_file = GETPOST("file", "alpha");
+$l = GETPOST('l', 'aZ09');
 
 // Parameters for RSS
 $rss = GETPOST('rss', 'aZ09');
@@ -90,8 +91,8 @@ if ($rss) {
 	$type = '';
 	$cachedelay = 0;
 	$filename = $original_file;
-	$filters = array('type_container'=>'blogpost', 'lang'=>'en_US');
 	$dir_temp = $conf->website->dir_temp;
+
 	include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
 	$website = new Website($db);
@@ -99,6 +100,9 @@ if ($rss) {
 
 	$website->fetch('', $websitekey);
 
+	$filters = array('type_container'=>'blogpost');
+	if ($l) $filters['lang'] = $l;
+
 	$MAXNEWS = 20;
 	$arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', $MAXNEWS, 0, $filters);
 	$eventarray = array();
@@ -151,7 +155,7 @@ if ($rss) {
 		@chmod($outputfiletmp, octdec($conf->global->MAIN_UMASK));
 
 		// Write file
-		$result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp, '', $website->virtualhost.'/wrapper.php?rss=1');
+		$result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp, '', $website->virtualhost.'/wrapper.php?rss=1'.($l ? '&l='.$l : ''), $l);
 
 		if ($result >= 0)
 		{

From e947ddba10be56526118e82ebae5f19f5a4b20ea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 12:51:44 +0200
Subject: [PATCH 373/490] Fix RSS feed

---
 htdocs/website/index.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 8a6aa296efb..06c072dc86d 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2977,6 +2977,19 @@ if ($action == 'editcss')
 
 	print '</td></tr>';
 
+	// RSS
+	print '<tr><td class="tdtop">';
+	//$htmlhelp = $langs->trans("Example").' :<br>';
+	//$htmlhelp .= dol_htmlentitiesbr($manifestjsoncontentdefault);
+	$htmlhelp = '';
+	print $form->textwithpicto($langs->trans('RSSFeed'), $htmlhelp, 1, 'help', '', 0, 2, 'rsstooltip');
+	print '</td><td>';
+	//print $langs->trans("RSS").': '.$form->selectyesno('WEBSITE_ENBALE_RSS', $website->use_rss, 1).'<br>';
+	//$doleditor = new DolEditor('WEBSITE_ENBALE_RSS', $manifestjsoncontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
+	//print $doleditor->Create(1, '', true, $langs->trans("File").' manifest.json', 'text');
+	print '/wrapper.php?rss=1[&lang=XX]';
+	print '</td></tr>';
+
 	print '</table>';
 
 	dol_fiche_end();

From 50d063256e7171363892dd77411d89be7954e782 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 12:54:06 +0200
Subject: [PATCH 374/490] NEW Povide a RSS Feed for blogposts

---
 htdocs/website/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 06c072dc86d..7cd0660cdb1 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2987,7 +2987,7 @@ if ($action == 'editcss')
 	//print $langs->trans("RSS").': '.$form->selectyesno('WEBSITE_ENBALE_RSS', $website->use_rss, 1).'<br>';
 	//$doleditor = new DolEditor('WEBSITE_ENBALE_RSS', $manifestjsoncontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
 	//print $doleditor->Create(1, '', true, $langs->trans("File").' manifest.json', 'text');
-	print '/wrapper.php?rss=1[&lang=XX]';
+	print '/wrapper.php?rss=1[&l=XX]';
 	print '</td></tr>';
 
 	print '</table>';

From aff2872fc11453f8d635a681f251dfdca4e1ca7d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 12:57:58 +0200
Subject: [PATCH 375/490] Fix RSS

---
 htdocs/langs/en_US/website.lang    |  4 +++-
 htdocs/website/index.php           | 11 +++--------
 htdocs/website/samples/wrapper.php |  3 ++-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 2c555b40c20..6109f3ca879 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -127,4 +127,6 @@ OtherLanguages=Other languages
 UseManifest=Provide a manifest.json file
 PublicAuthorAlias=Public author alias
 AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
-ReplacementDoneInXPages=Replacement done in %s pages or containers
\ No newline at end of file
+ReplacementDoneInXPages=Replacement done in %s pages or containers
+RSSFeed=RSS Feed
+RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL  
\ No newline at end of file
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 7cd0660cdb1..b6d2404de6f 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2979,15 +2979,10 @@ if ($action == 'editcss')
 
 	// RSS
 	print '<tr><td class="tdtop">';
-	//$htmlhelp = $langs->trans("Example").' :<br>';
-	//$htmlhelp .= dol_htmlentitiesbr($manifestjsoncontentdefault);
-	$htmlhelp = '';
-	print $form->textwithpicto($langs->trans('RSSFeed'), $htmlhelp, 1, 'help', '', 0, 2, 'rsstooltip');
+	$htmlhelp = $langs->trans('RSSFeedDesc');
+	print $form->textwithpicto($langs->trans('RSSFeed'), $htmlhelp, 1, 'help', '', 0, 2, '');
 	print '</td><td>';
-	//print $langs->trans("RSS").': '.$form->selectyesno('WEBSITE_ENBALE_RSS', $website->use_rss, 1).'<br>';
-	//$doleditor = new DolEditor('WEBSITE_ENBALE_RSS', $manifestjsoncontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
-	//print $doleditor->Create(1, '', true, $langs->trans("File").' manifest.json', 'text');
-	print '/wrapper.php?rss=1[&l=XX]';
+	print '/wrapper.php?rss=1[&l=XX][&limit=123]';
 	print '</td></tr>';
 
 	print '</table>';
diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index bb761c5f894..abb2bea0179 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -13,6 +13,7 @@ $modulepart = GETPOST('modulepart', 'aZ09');
 $entity = GETPOST('entity', 'int') ?GETPOST('entity', 'int') : $conf->entity;
 $original_file = GETPOST("file", "alpha");
 $l = GETPOST('l', 'aZ09');
+$limit = GETPOST('limit', 'int');
 
 // Parameters for RSS
 $rss = GETPOST('rss', 'aZ09');
@@ -103,7 +104,7 @@ if ($rss) {
 	$filters = array('type_container'=>'blogpost');
 	if ($l) $filters['lang'] = $l;
 
-	$MAXNEWS = 20;
+	$MAXNEWS = ($limit ? $limit : 20);
 	$arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', $MAXNEWS, 0, $filters);
 	$eventarray = array();
 	if (is_array($arrayofblogs)) {

From 755c47f900ef9583b18f6749d4022a067090158e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 13:10:33 +0200
Subject: [PATCH 376/490] Fix save of wrapper missing

---
 htdocs/core/lib/website2.lib.php | 54 +++++++++++++++++++-------------
 htdocs/website/index.php         |  9 ++++--
 2 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 33093fb953c..776c535d586 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -229,11 +229,11 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
 
 
 /**
- * Save content of the index.php and wrapper.php page
+ * Save content of the index.php and/or wrapper.php page
  *
  * @param	string		$pathofwebsite			Path of website root
  * @param	string		$fileindex				Full path of file index.php
- * @param	string		$filetpl				File tpl to index.php page redirect to
+ * @param	string		$filetpl				File tpl the index.php page redirect to
  * @param	string		$filewrapper			Full path of file wrapper.php
  * @return	boolean								True if OK
  */
@@ -246,29 +246,39 @@ function dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper)
 
 	dol_mkdir($pathofwebsite);
 
-	dol_delete_file($fileindex);
-	$indexcontent = '<?php'."\n";
-	$indexcontent .= "// BEGIN PHP File generated to provide an index.php as Home Page or alias redirector - DO NOT MODIFY - It is just a generated wrapper.\n";
-	$indexcontent .= '$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";
-	$indexcontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded\n";
-	$indexcontent .= 'if (! empty($_GET[\'pageref\']) || ! empty($_GET[\'pagealiasalt\']) || ! empty($_GET[\'pageid\'])) {'."\n";
-	$indexcontent .= "	require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-	$indexcontent .= "	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-	$indexcontent .= '	redirectToContainer($_GET[\'pageref\'], $_GET[\'pagealiasalt\'], $_GET[\'pageid\']);'."\n";
-	$indexcontent .= "}\n";
-	$indexcontent .= "include_once './".basename($filetpl)."'\n";
-	$indexcontent .= '// END PHP ?>'."\n";
-	$result1 = file_put_contents($fileindex, $indexcontent);
-	if (!empty($conf->global->MAIN_UMASK)) {
-		@chmod($fileindex, octdec($conf->global->MAIN_UMASK));
+	if ($fileindex) {
+		dol_delete_file($fileindex);
+		$indexcontent = '<?php'."\n";
+		$indexcontent .= "// BEGIN PHP File generated to provide an index.php as Home Page or alias redirector - DO NOT MODIFY - It is just a generated wrapper.\n";
+		$indexcontent .= '$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";
+		$indexcontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded\n";
+		$indexcontent .= 'if (! empty($_GET[\'pageref\']) || ! empty($_GET[\'pagealiasalt\']) || ! empty($_GET[\'pageid\'])) {'."\n";
+		$indexcontent .= "	require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+		$indexcontent .= "	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+		$indexcontent .= '	redirectToContainer($_GET[\'pageref\'], $_GET[\'pagealiasalt\'], $_GET[\'pageid\']);'."\n";
+		$indexcontent .= "}\n";
+		$indexcontent .= "include_once './".basename($filetpl)."'\n";
+		$indexcontent .= '// END PHP ?>'."\n";
+
+		$result1 = file_put_contents($fileindex, $indexcontent);
+		if (!empty($conf->global->MAIN_UMASK)) {
+			@chmod($fileindex, octdec($conf->global->MAIN_UMASK));
+		}
+	}
+	else {
+		$result1 = true;
 	}
-	dol_delete_file($filewrapper);
 
-	$wrappercontent = file_get_contents(DOL_DOCUMENT_ROOT.'/website/samples/wrapper.php');
+	if ($filewrapper) {
+		dol_delete_file($filewrapper);
+		$wrappercontent = file_get_contents(DOL_DOCUMENT_ROOT.'/website/samples/wrapper.php');
 
-	$result2 = file_put_contents($filewrapper, $wrappercontent);
-	if (!empty($conf->global->MAIN_UMASK)) {
-		@chmod($filewrapper, octdec($conf->global->MAIN_UMASK));
+		$result2 = file_put_contents($filewrapper, $wrappercontent);
+		if (!empty($conf->global->MAIN_UMASK)) {
+			@chmod($filewrapper, octdec($conf->global->MAIN_UMASK));
+		}
+	} else {
+		$result2 = true;
 	}
 
 	return ($result1 && $result2);
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index b6d2404de6f..eefebd0e652 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -197,6 +197,7 @@ $fileindex = $pathofwebsite.'/index.php';
 $filewrapper = $pathofwebsite.'/wrapper.php';
 $filemanifestjson = $pathofwebsite.'/manifest.json.php';
 $filereadme = $pathofwebsite.'/README.md';
+$filemaster = $pathofwebsite.'/master.inc.php';
 
 // Define $urlwithroot
 $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -1189,8 +1190,6 @@ if ($action == 'updatecss')
 		if (!$error)
 		{
     		// Save master.inc.php file
-    		$filemaster = $pathofwebsite.'/master.inc.php';
-
     		dol_syslog("Save master file ".$filemaster);
 
     		dol_mkdir($pathofwebsite);
@@ -1384,6 +1383,10 @@ if ($action == 'updatecss')
        		}
 
 
+       		// Save wrapper.php
+			$result = dolSaveIndexPage($pathofwebsite, '', '', $filewrapper);
+
+
     		// Message if no error
     		if (!$error)
     		{
@@ -1727,8 +1730,8 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 			}
 			else
 			{
-				$fileindex = $pathofwebsitenew.'/index.php';
 				$filetpl = $pathofwebsitenew.'/page'.$resultpage->id.'.tpl.php';
+				$fileindex = $pathofwebsitenew.'/index.php';
 				$filewrapper = $pathofwebsitenew.'/wrapper.php';
 
 				//var_dump($pathofwebsitenew);

From 072d8c622297c87ac2f3bf1040908d8fab63d9f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 13:36:02 +0200
Subject: [PATCH 377/490] Update list.php

---
 htdocs/contact/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 7eee6d797e7..8ee51ca815e 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -76,7 +76,7 @@ $search_no_email = GETPOST("search_no_email", 'int');
 if (!empty($conf->socialnetworks->enabled)) {
 	foreach ($socialnetworks as $key => $value) {
 		if ($value['active']) {
-			$search_[$key] = GETPOST("search_".$key, 'alpha');
+			$search_{$key} = GETPOST("search_".$key, 'alpha');
 		}
 	}
 }
@@ -253,7 +253,7 @@ if (empty($reshook))
 		if (!empty($conf->socialnetworks->enabled)) {
 			foreach ($socialnetworks as $key => $value) {
 				if ($value['active']) {
-					$search_[$key] = "";
+					$search_{$key} = "";
 				}
 			}
 		}
@@ -358,7 +358,7 @@ if (strlen($search_fax))            $sql .= natural_search('p.fax', $search_fax)
 if (!empty($conf->socialnetworks->enabled)) {
 	foreach ($socialnetworks as $key => $value) {
 		if ($value['active'] && strlen($search_[$key])) {
-			$sql .= ' AND p.socialnetworks LIKE \'%"'.$key.'":"'.$search_[$key].'%\'';
+			$sql .= ' AND p.socialnetworks LIKE \'%"'.$key.'":"'.$search_{$key}.'%\'';
 		}
 	}
 }

From 9e95342e2fcb7c254f97763f6502f16e1e740323 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 13:36:39 +0200
Subject: [PATCH 378/490] Update list.php

---
 htdocs/contact/list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 8ee51ca815e..781daacd030 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -357,7 +357,7 @@ if (strlen($search_phone_mobile))   $sql .= natural_search('p.phone_mobile', $se
 if (strlen($search_fax))            $sql .= natural_search('p.fax', $search_fax);
 if (!empty($conf->socialnetworks->enabled)) {
 	foreach ($socialnetworks as $key => $value) {
-		if ($value['active'] && strlen($search_[$key])) {
+		if ($value['active'] && strlen($search_{$key})) {
 			$sql .= ' AND p.socialnetworks LIKE \'%"'.$key.'":"'.$search_{$key}.'%\'';
 		}
 	}
@@ -668,7 +668,7 @@ if (!empty($conf->socialnetworks->enabled)) {
 			if (!empty($arrayfields['p.'.$key]['checked']))
 			{
 				print '<td class="liste_titre">';
-				print '<input class="flat" type="text" name="search_'.$key.'" size="6" value="'.dol_escape_htmltag($search_[$key]).'">';
+				print '<input class="flat" type="text" name="search_'.$key.'" size="6" value="'.dol_escape_htmltag($search_{$key}).'">';
 				print '</td>';
 			}
 		}

From af5de05a31cdd5f6d204033f8b75a5d35361e0a1 Mon Sep 17 00:00:00 2001
From: "gael.langlais" <gael.langlais@protonmail.com>
Date: Fri, 22 May 2020 17:42:06 +0200
Subject: [PATCH 379/490] Change some curly braces #13929

---
 htdocs/contact/list.php           | 11 +++++------
 htdocs/core/antispamimage.php     |  2 +-
 htdocs/core/class/lessc.class.php |  6 +++---
 htdocs/core/lib/security2.lib.php | 16 ++++++++--------
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 9e7485d189f..7eee6d797e7 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -76,7 +76,7 @@ $search_no_email = GETPOST("search_no_email", 'int');
 if (!empty($conf->socialnetworks->enabled)) {
 	foreach ($socialnetworks as $key => $value) {
 		if ($value['active']) {
-			$search_{$key} = GETPOST("search_".$key, 'alpha');
+			$search_[$key] = GETPOST("search_".$key, 'alpha');
 		}
 	}
 }
@@ -253,7 +253,7 @@ if (empty($reshook))
 		if (!empty($conf->socialnetworks->enabled)) {
 			foreach ($socialnetworks as $key => $value) {
 				if ($value['active']) {
-					$search_{$key} = "";
+					$search_[$key] = "";
 				}
 			}
 		}
@@ -357,9 +357,8 @@ if (strlen($search_phone_mobile))   $sql .= natural_search('p.phone_mobile', $se
 if (strlen($search_fax))            $sql .= natural_search('p.fax', $search_fax);
 if (!empty($conf->socialnetworks->enabled)) {
 	foreach ($socialnetworks as $key => $value) {
-		if ($value['active'] && strlen($search_{$key})) {
-			//$sql.= natural_search("p.socialnetworks->'$.".$key."'", $search_{$key});
-			$sql .= ' AND p.socialnetworks LIKE \'%"'.$key.'":"'.$search_{$key}.'%\'';
+		if ($value['active'] && strlen($search_[$key])) {
+			$sql .= ' AND p.socialnetworks LIKE \'%"'.$key.'":"'.$search_[$key].'%\'';
 		}
 	}
 }
@@ -669,7 +668,7 @@ if (!empty($conf->socialnetworks->enabled)) {
 			if (!empty($arrayfields['p.'.$key]['checked']))
 			{
 				print '<td class="liste_titre">';
-				print '<input class="flat" type="text" name="search_'.$key.'" size="6" value="'.dol_escape_htmltag($search_{$key}).'">';
+				print '<input class="flat" type="text" name="search_'.$key.'" size="6" value="'.dol_escape_htmltag($search_[$key]).'">';
 				print '</td>';
 			}
 		}
diff --git a/htdocs/core/antispamimage.php b/htdocs/core/antispamimage.php
index 68e585c3ea0..7d6512a64a9 100644
--- a/htdocs/core/antispamimage.php
+++ b/htdocs/core/antispamimage.php
@@ -43,7 +43,7 @@ $number = strlen($letters);
 $string = '';
 for ($i = 0; $i < $length; $i++)
 {
-	$string .= $letters{mt_rand(0, $number - 1)};
+	$string .= $letters[mt_rand(0, $number - 1)];
 }
 //print $string;
 
diff --git a/htdocs/core/class/lessc.class.php b/htdocs/core/class/lessc.class.php
index 210c3d3c29d..8ab9e58aa58 100644
--- a/htdocs/core/class/lessc.class.php
+++ b/htdocs/core/class/lessc.class.php
@@ -1966,7 +1966,7 @@ class Lessc {
 		$this->pushEnv();
 		$parser = new lessc_parser($this, __METHOD__);
 		foreach ($args as $name => $strValue) {
-			if ($name{0} !== '@') {
+			if ($name[0] !== '@') {
 				$name = '@'.$name;
 			}
 			$parser->count = 0;
@@ -2638,7 +2638,7 @@ class lessc_parser {
 								$hidden = true;
 								if (!isset($block->args)) {
 									foreach ($block->tags as $tag) {
-										if (!is_string($tag) || $tag{0} != $this->lessc->mPrefix) {
+										if (!is_string($tag) || $tag[0] != $this->lessc->mPrefix) {
 											$hidden = false;
 											break;
 										}
@@ -2692,7 +2692,7 @@ class lessc_parser {
 		protected function fixTags($tags) {
 			// move @ tags out of variable namespace
 			foreach ($tags as &$tag) {
-				if ($tag{0} == $this->lessc->vPrefix)
+				if ($tag[0] == $this->lessc->vPrefix)
 					$tag[0] = $this->lessc->mPrefix;
 			}
 			return $tags;
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 04d16084365..c7f5a7b7330 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -463,15 +463,15 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		{
 			$max = strlen($lowercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $lowercase{random_int(0, $max)};
+				$randomCode .= $lowercase[random_int(0, $max)];
 			}
 			$max = strlen($uppercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $uppercase{random_int(0, $max)};
+				$randomCode .= $uppercase[random_int(0, $max)];
 			}
 			$max = strlen($numbers) - 1;
 			for ($x = 0; $x < $nbofcharlast; $x++) {
-				$randomCode .= $numbers{random_int(0, $max)};
+				$randomCode .= $numbers[random_int(0, $max)];
 			}
 
 			$generated_password = str_shuffle($randomCode);
@@ -480,15 +480,15 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		{
 			$max = strlen($lowercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $lowercase{mt_rand(0, $max)};
+				$randomCode .= $lowercase[mt_rand(0, $max)];
 			}
 			$max = strlen($uppercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $uppercase{mt_rand(0, $max)};
+				$randomCode .= $uppercase[mt_rand(0, $max)];
 			}
 			$max = strlen($numbers) - 1;
 			for ($x = 0; $x < $nbofcharlast; $x++) {
-				$randomCode .= $numbers{mt_rand(0, $max)};
+				$randomCode .= $numbers[mt_rand(0, $max)];
 			}
 
 			$generated_password = str_shuffle($randomCode);
@@ -512,11 +512,11 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		$max = strlen($numbers) - 1;
 		if (function_exists('random_int'))	// Cryptographic random
 		{
-			$generated_password = str_replace($replaceambiguouschars, $numbers{random_int(0, $max)}, $generated_password);
+			$generated_password = str_replace($replaceambiguouschars, $numbers[random_int(0, $max)], $generated_password);
 		}
 		else
 		{
-			$generated_password = str_replace($replaceambiguouschars, $numbers{mt_rand(0, $max)}, $generated_password);
+			$generated_password = str_replace($replaceambiguouschars, $numbers[mt_rand(0, $max)], $generated_password);
 		}
 	}
 

From 15de6194c4b61c3b73f30aab91aca5680eea0e10 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 13:36:02 +0200
Subject: [PATCH 380/490] Update list.php

---
 htdocs/contact/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 7eee6d797e7..8ee51ca815e 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -76,7 +76,7 @@ $search_no_email = GETPOST("search_no_email", 'int');
 if (!empty($conf->socialnetworks->enabled)) {
 	foreach ($socialnetworks as $key => $value) {
 		if ($value['active']) {
-			$search_[$key] = GETPOST("search_".$key, 'alpha');
+			$search_{$key} = GETPOST("search_".$key, 'alpha');
 		}
 	}
 }
@@ -253,7 +253,7 @@ if (empty($reshook))
 		if (!empty($conf->socialnetworks->enabled)) {
 			foreach ($socialnetworks as $key => $value) {
 				if ($value['active']) {
-					$search_[$key] = "";
+					$search_{$key} = "";
 				}
 			}
 		}
@@ -358,7 +358,7 @@ if (strlen($search_fax))            $sql .= natural_search('p.fax', $search_fax)
 if (!empty($conf->socialnetworks->enabled)) {
 	foreach ($socialnetworks as $key => $value) {
 		if ($value['active'] && strlen($search_[$key])) {
-			$sql .= ' AND p.socialnetworks LIKE \'%"'.$key.'":"'.$search_[$key].'%\'';
+			$sql .= ' AND p.socialnetworks LIKE \'%"'.$key.'":"'.$search_{$key}.'%\'';
 		}
 	}
 }

From 493becde8b06a830a5dba611dea008058a16cdb5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 13:36:39 +0200
Subject: [PATCH 381/490] Update list.php

---
 htdocs/contact/list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 8ee51ca815e..781daacd030 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -357,7 +357,7 @@ if (strlen($search_phone_mobile))   $sql .= natural_search('p.phone_mobile', $se
 if (strlen($search_fax))            $sql .= natural_search('p.fax', $search_fax);
 if (!empty($conf->socialnetworks->enabled)) {
 	foreach ($socialnetworks as $key => $value) {
-		if ($value['active'] && strlen($search_[$key])) {
+		if ($value['active'] && strlen($search_{$key})) {
 			$sql .= ' AND p.socialnetworks LIKE \'%"'.$key.'":"'.$search_{$key}.'%\'';
 		}
 	}
@@ -668,7 +668,7 @@ if (!empty($conf->socialnetworks->enabled)) {
 			if (!empty($arrayfields['p.'.$key]['checked']))
 			{
 				print '<td class="liste_titre">';
-				print '<input class="flat" type="text" name="search_'.$key.'" size="6" value="'.dol_escape_htmltag($search_[$key]).'">';
+				print '<input class="flat" type="text" name="search_'.$key.'" size="6" value="'.dol_escape_htmltag($search_{$key}).'">';
 				print '</td>';
 			}
 		}

From 83ecbef9bc3ec4449262b4b6b8e8ae7371e11617 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 13:46:37 +0200
Subject: [PATCH 382/490] FIX #13911 #13940

---
 htdocs/variants/class/ProductCombination.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index f19c81960db..128c1974c77 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -327,7 +327,10 @@ class ProductCombination
 		$child = new Product($this->db);
 		$child->fetch($this->fk_product_child);
 		$child->price_autogen = $parent->price_autogen;
-		$child->weight = $parent->weight + $this->variation_weight;
+		$child->weight = $parent->weight;
+		if ($this->variation_weight) {	// If we must add a delta on weight
+			$child->weight = ($child->weight ? $child->weight : 0) + $this->variation_weight;
+		}
 		$child->weight_units = $parent->weight_units;
 		$varlabel = $this->getCombinationLabel($this->fk_product_child);
 		$child->label = $parent->label.$varlabel;

From 3a15688f17646926f7362b66df725ee43d8a2de8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 13:53:47 +0200
Subject: [PATCH 383/490] FIX #13951

---
 .../class/ProductCombination.class.php        | 164 +++++++++---------
 1 file changed, 85 insertions(+), 79 deletions(-)

diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 128c1974c77..b67f56db935 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -71,12 +71,12 @@ class ProductCombination
 	 */
 	public $entity;
 
-    /**
-     * Constructor
-     *
-     * @param   DoliDB $db     Database handler
-     */
-    public function __construct(DoliDB $db)
+	/**
+	 * Constructor
+	 *
+	 * @param   DoliDB $db     Database handler
+	 */
+	public function __construct(DoliDB $db)
 	{
 		global $conf;
 
@@ -189,16 +189,16 @@ class ProductCombination
 	 */
 	public function countNbOfCombinationForFkProductParent($fk_product_parent)
 	{
-	    $nb = 0;
-	    $sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getEntity('product').")";
+		$nb = 0;
+		$sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getEntity('product').")";
 
-	    $resql = $this->db->query($sql);
-	    if ($resql) {
-	        $obj = $this->db->fetch_object($resql);
-	        if ($obj) $nb = $obj->nb;
-	    }
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$obj = $this->db->fetch_object($resql);
+			if ($obj) $nb = $obj->nb;
+		}
 
-	    return $nb;
+		return $nb;
 	}
 
 	/**
@@ -326,14 +326,20 @@ class ProductCombination
 
 		$child = new Product($this->db);
 		$child->fetch($this->fk_product_child);
+
 		$child->price_autogen = $parent->price_autogen;
 		$child->weight = $parent->weight;
 		if ($this->variation_weight) {	// If we must add a delta on weight
 			$child->weight = ($child->weight ? $child->weight : 0) + $this->variation_weight;
 		}
-		$child->weight_units = $parent->weight_units;
-		$varlabel = $this->getCombinationLabel($this->fk_product_child);
-		$child->label = $parent->label.$varlabel;
+		$child->weight_units    = $parent->weight_units;
+
+		// Don't update the child label if the user has already modified it.
+		if ($child->label == $parent->label) {
+			// This will trigger only at variant creation time
+			$varlabel               = $this->getCombinationLabel($this->fk_product_child);
+			$child->label           = $parent->label.$varlabel;;
+		}
 
 		if ($child->update($child->id, $user) > 0) {
 			$new_vat = $parent->tva_tx;
@@ -530,9 +536,9 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 				$newproduct->ref = $forced_refvar;
 			}
 		} else {
-		    $forced_refvar = false;
-		    $existingProduct = false;
-            $newproduct = clone $product;
+			$forced_refvar = false;
+			$existingProduct = false;
+			$newproduct = clone $product;
 		}
 
 		//Final weight impact
@@ -593,11 +599,11 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 			}
 
 			if ($forced_refvar === false) {
-    			if (isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) {
+				if (isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) {
 					$newproduct->ref .= $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR.$prodattrval->ref;
-    			} else {
+				} else {
 					$newproduct->ref .= '_'.$prodattrval->ref;
-    			}
+				}
 			}
 
 			//The first one should not contain a linebreak
@@ -616,62 +622,62 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 		// Now create the product
 		//print 'Create prod '.$newproduct->ref.'<br>'."\n";
 		if ($existingProduct === false) {
-    		//To avoid wrong information in price history log
-    		$newproduct->price = 0;
-    		$newproduct->price_ttc = 0;
-    		$newproduct->price_min = 0;
-    		$newproduct->price_min_ttc = 0;
+			//To avoid wrong information in price history log
+			$newproduct->price = 0;
+			$newproduct->price_ttc = 0;
+			$newproduct->price_min = 0;
+			$newproduct->price_min_ttc = 0;
 
-    		// A new variant must use a new barcode (not same product)
-    		$newproduct->barcode = -1;
-		    $result = $newproduct->create($user);
+			// A new variant must use a new barcode (not same product)
+			$newproduct->barcode = -1;
+			$result = $newproduct->create($user);
 
-    		if ($result < 0)
-    		{
-    			//In case the error is not related with an already existing product
-    			if ($newproduct->error != 'ErrorProductAlreadyExists') {
-    			    $this->error[] = $newproduct->error;
-    			    $this->errors = $newproduct->errors;
-    				$db->rollback();
-    				return -1;
-    			}
+			if ($result < 0)
+			{
+				//In case the error is not related with an already existing product
+				if ($newproduct->error != 'ErrorProductAlreadyExists') {
+					$this->error[] = $newproduct->error;
+					$this->errors = $newproduct->errors;
+					$db->rollback();
+					return -1;
+				}
 
-    			/**
-    			 * If there is an existing combination, then we update the prices and weight
-    			 * Otherwise, we try adding a random number to the ref
-    			 */
+				/**
+				 * If there is an existing combination, then we update the prices and weight
+				 * Otherwise, we try adding a random number to the ref
+				 */
 
-    			if ($newcomb->fk_product_child) {
-    				$res = $newproduct->fetch($existingCombination->fk_product_child);
-    			} else {
-    				$orig_prod_ref = $newproduct->ref;
-    				$i = 1;
+				if ($newcomb->fk_product_child) {
+					$res = $newproduct->fetch($existingCombination->fk_product_child);
+				} else {
+					$orig_prod_ref = $newproduct->ref;
+					$i = 1;
 
-    				do {
-    					$newproduct->ref = $orig_prod_ref.$i;
-    					$res = $newproduct->create($user);
+					do {
+						$newproduct->ref = $orig_prod_ref.$i;
+						$res = $newproduct->create($user);
 
-    					if ($newproduct->error != 'ErrorProductAlreadyExists') {
-    					    $this->errors[] = $newproduct->error;
-    						break;
-    					}
+						if ($newproduct->error != 'ErrorProductAlreadyExists') {
+							$this->errors[] = $newproduct->error;
+							break;
+						}
 
-    					$i++;
-    				} while ($res < 0);
-    			}
+						$i++;
+					} while ($res < 0);
+				}
 
-    			if ($res < 0) {
-    				$db->rollback();
-    				return -1;
-    			}
-    		}
+				if ($res < 0) {
+					$db->rollback();
+					return -1;
+				}
+			}
 		} else {
-		    $result = $newproduct->update($newproduct->id, $user);
-		    if ($result < 0)
-		    {
-		        $db->rollback();
-		        return -1;
-		    }
+			$result = $newproduct->update($newproduct->id, $user);
+			if ($result < 0)
+			{
+				$db->rollback();
+				return -1;
+			}
 		}
 
 		$newcomb->fk_product_child = $newproduct->id;
@@ -686,14 +692,14 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 		return $newproduct->id;
 	}
 
-    /**
-     * Copies all product combinations from the origin product to the destination product
-     *
+	/**
+	 * Copies all product combinations from the origin product to the destination product
+	 *
 	 * @param 	User 	$user	Object user
-     * @param   int     $origProductId  Origin product id
-     * @param   Product $destProduct    Destination product
-     * @return  int                     >0 OK <0 KO
-     */
+	 * @param   int     $origProductId  Origin product id
+	 * @param   Product $destProduct    Destination product
+	 * @return  int                     >0 OK <0 KO
+	 */
 	public function copyAll(User $user, $origProductId, Product $destProduct)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.class.php';
@@ -715,7 +721,7 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 				$variations[$tmp_pc2v->fk_prod_attr] = $tmp_pc2v->fk_prod_attr_val;
 			}
 
-            if ($this->createProductCombination(
+			if ($this->createProductCombination(
 				$user,
 				$destProduct,
 				$variations,
@@ -723,7 +729,7 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 				$combination->variation_price_percentage,
 				$combination->variation_price,
 				$combination->variation_weight
-			) < 0)
+				) < 0)
 			{
 				return -1;
 			}

From 3a93dcf2c4cf340e023cf47570a3ea92a5a3a3d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 20 May 2020 20:19:00 +0200
Subject: [PATCH 384/490] Update paymentloan.class.php

same picto in loan
---
 htdocs/loan/class/paymentloan.class.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index ce152317710..0aa5b2dbf62 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2014-2018  Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2015-2018  Frederic France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2015-2020  Frederic France      <frederic.france@netlogic.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 +40,11 @@ class PaymentLoan extends CommonObject
 	 */
 	public $table_element = 'payment_loan';
 
+    /**
+     * @var string String with name of icon for PaymentLoan
+     */
+    public $picto = 'money-bill-alt';
+
     /**
      * @var int Loan ID
      */

From 8b4dcbaa64b74425169208cf4d9b73318cacd688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 20 May 2020 20:13:42 +0200
Subject: [PATCH 385/490] Update datapolicycron.class.php

---
 htdocs/datapolicy/class/datapolicycron.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php
index 409df1362e9..8e3cfe10874 100644
--- a/htdocs/datapolicy/class/datapolicycron.class.php
+++ b/htdocs/datapolicy/class/datapolicycron.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2018       Nicolas ZABOURI     <info@inovea-conseil.com>
- * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France     <frederic.france@netlogic.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
@@ -482,7 +482,7 @@ class DataPolicyCron
 
                     while ($i < $num && !$error)
                     {
-                        $obj = $db->fetch_object($resql);
+                        $obj = $this->db->fetch_object($resql);
 
                         $object->fetch($obj->rowid);
                         $object->id = $obj->rowid;

From 58e32aa2ff9379c2706d825b1a110e2cb41edec6 Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Thu, 21 May 2020 09:31:06 +0200
Subject: [PATCH 386/490] Fix not wokring default values for date (re...)

---
 htdocs/compta/facture/card.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index ab2262844bf..522d4471daa 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1025,7 +1025,7 @@ if (empty($reshook))
 		// Replacement invoice
 		if ($_POST['type'] == Facture::TYPE_REPLACEMENT)
 		{
-			$dateinvoice = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+			$dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 			if (empty($dateinvoice))
 			{
 				$error++;
@@ -1086,7 +1086,7 @@ if (empty($reshook))
 				$action = 'create';
 			}
 
-			$dateinvoice = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+			$dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 			if (empty($dateinvoice))
 			{
 				$error++;
@@ -1269,7 +1269,7 @@ if (empty($reshook))
 		// Standard invoice or Deposit invoice, created from a Predefined template invoice
 		if (($_POST['type'] == Facture::TYPE_STANDARD || $_POST['type'] == Facture::TYPE_DEPOSIT) && GETPOST('fac_rec', 'int') > 0)
 		{
-			$dateinvoice = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+			$dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 			if (empty($dateinvoice))
 			{
 				$error++;
@@ -1320,7 +1320,7 @@ if (empty($reshook))
 				$action = 'create';
 			}
 
-			$dateinvoice = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+			$dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 			if (empty($dateinvoice))
 			{
 				$error++;
@@ -1745,7 +1745,7 @@ if (empty($reshook))
 		// Situation invoices
 		if (GETPOST('type') == Facture::TYPE_SITUATION && (!empty($_POST['situations'])))
 		{
-			$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+			$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 			if (empty($datefacture)) {
 				$error++;
 				$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date"));

From babcdfc99a7e3a52c332578ced8e1dbe31e46f9e Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Thu, 21 May 2020 09:34:20 +0200
Subject: [PATCH 387/490] Fix not working default value (re...)

---
 htdocs/fourn/facture/card.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 6e8f259bc01..91d1b333e56 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -644,7 +644,7 @@ if (empty($reshook))
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
 		if ($ret < 0) $error++;
 
-		$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+		$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		$datedue = dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']);
 
 		// Replacement invoice
@@ -1758,7 +1758,7 @@ if ($action == 'create')
 			if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx))	$currency_tx = $objectsrc->multicurrency_tx;
 		}
 
-		$datetmp = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+		$datetmp = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		$dateinvoice = ($datetmp == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datetmp);
 		$datetmp = dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']);
 		$datedue = ($datetmp == '' ?-1 : $datetmp);
@@ -1772,7 +1772,7 @@ if ($action == 'create')
 		$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
 		$fk_account         = $societe->fk_account;
-		$datetmp = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+		$datetmp = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		$dateinvoice = ($datetmp == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datetmp);
 		$datetmp = dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']);
 		$datedue = ($datetmp == '' ?-1 : $datetmp);

From 7397806ae770b6a03ce030711a11341fc0d3b554 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 14:26:28 +0200
Subject: [PATCH 388/490] Update actioncomm.class.php

---
 htdocs/comm/action/class/actioncomm.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index dadc180ce08..f3ec464e7c0 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -2048,7 +2048,7 @@ class ActionComm extends CommonObject
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
-		$sql .= " SET percent = '".$percent."'";
+		$sql .= " SET percent = ".(int) $percent;
 		$sql .= " WHERE id=".$id;
 
 		if ($this->db->query($sql))

From 0becc47b30d20c92833a9037607e221eb786db25 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Sat, 23 May 2020 14:38:26 +0200
Subject: [PATCH 389/490] fix : personnal font file within tcpdf

---
 .../tecnickcom/tcpdf/fonts/raleway.ctg.z         | Bin 1354 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 htdocs/includes/tecnickcom/tcpdf/fonts/raleway.ctg.z

diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/raleway.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/raleway.ctg.z
deleted file mode 100644
index 371019c5a51e79b2e1053e94632e6e4d83cf6b80..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1354
zcmd6jYgdv70DwK!POGz|v@<tNidiSaq_b{hq%QM<BxKsMyuj(QOq#YOgrH*Muxw5(
zovlTv+)3iH%IpXlT`Y?1)!<cDX&@jL25$KZ1EIEk?howw_<VZKQ}Nt2Lj4{5`m+ar
zO(alg|A9rbGWV?rn}a;F0#WoSpS_?9`$v4qDHi+GLIJkm)MXxqc5>MgCCkg2J00xj
zPPbLmP(6VoUe$T)!-Y5=8z<_+2}C%F9mj9Mi9wvO6DNiAyn4N;UoVjBC2#b6u3kK%
z7xw6-0VI!w6x~G%1W1V$$!|uA4M^cNr1Y(fS0@wcWdfN@;*{|@GVybnP%V@C$-L8K
z(F3wTqE3AR7RG})3NXJE-0K2~(ctb@aQ_9_&uZuTB4r#!tjrlHQj|HBaA(Icib83e
zQE%@B3(&H&WjUmo+?qv$Pa-dGkCYcsu9O)UFB)=1N-!G>V<^&ea!dNLdbeR;gRufX
zn2I+X#y{PIH&R9wl@yiR807FTa>UOVU%|+Y4sx4g5|Jp+fG)$0wtU`?jFer@HHnI1
zNZw|g&KE^=?%Ub9=P@K88Xhy!RL)JkN;D*SX?VfNm~tk@n-(fSq+&R-R|SLkNrrrd
zQRh#cys^EVEZkgjz3bJ6(xJ_zrU`!viClZq8Rs&X{OOt*h3BZsQ=$!h#S49nsa7qA
zgiOPM=%>4b@<aYKtrHz>S`aLI7D}+N3HCmMRYY*u31cmUagbo^Buqenr5>>N16DcU
zcms@af$<T*)&oogP!<--eivmGpd41zSTkzefU;dfO}tfF>Xdf9(kfFroXRnda{T#w
zb@yZ+NTmYZZIhZGqSQ@Mnx8KDo40VUT)gyNY`Pmis#lCU2AaCcCOmFSquUPL0*gk5
zF8EH6#^S2at4^Y6G?*9KbZgk;W0);Ow<~H?hwfI*c5CMcbQnznd@q@YnggeBuHLz|
zD#z?Us~dG7;LaC`{WNZ^W*K}<%sd~k0a!*)-!Bw=54{f*9;&*aV{mnqtksO>)s=Np
z21hzuX0}yUw@-OL8GzOfc;+$(%eR@Px0zwS1IgBm;BU*lbJjuOOv5f;NwTdt$Zhw2
zp|#v6TE#?1M6j9UiDM3_d{pfiI{2&EgJGJc=-qi0;yn5d)8ExK7Fe*!#Ar?StR_w^
zdIv`JKDyL<zny;NCS8;4jd*9k^cYEWQv#`76~uEJ&93A0%8(COZ0^xj4j^mVy}H+o
z`Bi_`m&1ITU;O6T+T0UNXjd^sc`wN-eD_Qj*eOrY`fpYgm~2T)!fRkx9rJ1zhq2kk
z<uA|0u56^DGO_+*%ziB3evmmElZN%J`@AE?c{C1>jWVPi^q)f<uJ6l2ls^n>eazs*
zTyI_9oM_*ICj#Zrx7~s-X%EBSo~}aF#C~U}x|1EdG&C*cY4+NsuvICKvYl&H*;{k;
z>}yTx!Ypl7RuN)2P#0kd?O2+dm-Hm-JhmgUG;j7r;Y@{w*^oUgVk)vR-~uY0X8VRZ
znRY0cdn7UycW*FOGP-5!@XC!1T?d0_S%Ytq%{!;B_a9%<5WgcXDKq5uN5Se5&ZZ9r
p{eMK^nUtvEe{;AuN$}Dgn!zN>$I&q^f_#2R$nE=X*i;6r;2)Ctm)ZaT


From 5f3a82423f5200274836b2a04b96f8f42bf61403 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 14:38:37 +0200
Subject: [PATCH 390/490] Fix regression in look and feel v12

---
 htdocs/theme/eldy/info-box.inc.php | 2 +-
 htdocs/theme/md/info-box.inc.php   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index e0ae5b045f6..2b734f037b3 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -235,7 +235,7 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES
 .bg-infobox-bank_account{
 	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#b0a53e', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
-.bg-infobox-adherent{
+.bg-infobox-adherent, .bg-infobox-member {
 	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#79633f', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
 .bg-infobox-expensereport{
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index 3c4323f9f97..f2a2a8b810d 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -34,7 +34,7 @@ if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) $prefix = 'backgro
 .bg-infobox-bank_account{
 	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#b0a53e', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
-.bg-infobox-adherent{
+.bg-infobox-adherent, .bg-infobox-member{
 	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#79633f', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
 .bg-infobox-expensereport{
@@ -258,7 +258,7 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES
 .bg-infobox-bank_account i.fa{
 	color: <?php print colorAgressiveness('#b0a53e', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
-.bg-infobox-adherent i.fa{
+.bg-infobox-adherent i.fa, .bg-infobox-member i.fa{
 	color: <?php print colorAgressiveness('#f39c12', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
 .bg-infobox-expensereport i.fa{

From fdea4db671a27004a27dd5e49da8939249927e9d Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Sat, 23 May 2020 14:39:18 +0200
Subject: [PATCH 391/490] fix : personnal font file within tcpdf

---
 .../tecnickcom/tcpdf/fonts/raleway.php        | 74 -------------------
 1 file changed, 74 deletions(-)
 delete mode 100644 htdocs/includes/tecnickcom/tcpdf/fonts/raleway.php

diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/raleway.php b/htdocs/includes/tecnickcom/tcpdf/fonts/raleway.php
deleted file mode 100644
index 399e03647cc..00000000000
--- a/htdocs/includes/tecnickcom/tcpdf/fonts/raleway.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='Raleway-Regular';
-$desc=array('Ascent'=>940,'Descent'=>-234,'CapHeight'=>5,'Flags'=>32,'FontBBox'=>'[-216 -223 1310 933]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
-$up=-100;
-$ut=50;
-$dw=600;
-$cw=array(
-32=>255,33=>252,34=>292,35=>680,36=>619,37=>714,38=>667,39=>197,40=>269,41=>268,
-42=>321,43=>415,44=>225,45=>422,46=>189,47=>604,48=>612,49=>428,50=>521,51=>534,
-52=>546,53=>545,54=>603,55=>535,56=>593,57=>586,58=>188,59=>205,60=>508,61=>438,
-62=>508,63=>476,64=>837,65=>676,66=>666,67=>686,68=>715,69=>609,70=>589,71=>716,
-72=>738,73=>248,74=>481,75=>643,76=>583,77=>877,78=>772,79=>751,80=>622,81=>749,
-82=>653,83=>607,84=>610,85=>755,86=>679,87=>1046,88=>632,89=>651,90=>629,91=>258,
-92=>568,93=>258,94=>539,95=>511,96=>222,97=>545,98=>617,99=>549,100=>622,101=>587,
-102=>330,103=>618,104=>583,105=>218,106=>225,107=>530,108=>272,109=>919,110=>583,111=>595,
-112=>617,113=>617,114=>351,115=>487,116=>335,117=>594,118=>533,119=>813,120=>504,121=>542,
-122=>492,123=>259,124=>231,125=>259,126=>511,8364=>801,1027=>519,8218=>225,402=>526,8222=>343,
-8230=>457,8224=>406,8225=>410,710=>330,8240=>1066,352=>607,8249=>352,338=>1153,1036=>604,381=>629,
-1039=>694,8216=>196,8217=>190,8220=>316,8221=>311,8226=>351,8211=>570,8212=>901,732=>406,8482=>727,
-353=>487,8250=>352,339=>1034,1116=>484,382=>492,376=>651,160=>255,161=>251,162=>561,163=>499,
-164=>537,165=>676,166=>234,167=>506,168=>329,169=>832,170=>434,171=>573,172=>582,173=>570,
-174=>832,175=>396,176=>266,177=>467,178=>388,179=>390,180=>222,181=>620,182=>602,183=>189,
-184=>283,185=>272,186=>449,187=>573,188=>825,189=>864,190=>837,191=>469,192=>676,193=>676,
-194=>676,195=>676,196=>676,197=>676,198=>961,199=>683,200=>609,201=>609,202=>609,203=>609,
-204=>248,205=>248,206=>248,207=>248,208=>721,209=>772,210=>751,211=>751,212=>751,213=>751,
-214=>751,215=>457,216=>751,217=>755,218=>755,219=>755,220=>755,221=>651,222=>603,223=>551,
-224=>545,225=>545,226=>545,227=>545,228=>545,229=>545,230=>932,231=>549,232=>587,233=>587,
-234=>587,235=>587,236=>218,237=>218,238=>218,239=>218,240=>602,241=>583,242=>595,243=>595,
-244=>595,245=>595,246=>595,247=>537,248=>595,249=>594,250=>594,251=>594,252=>594,253=>542,
-254=>603,255=>542,256=>676,257=>545,258=>676,259=>545,260=>675,261=>545,262=>686,263=>549,
-264=>686,265=>549,266=>686,267=>549,268=>686,269=>549,270=>715,271=>622,272=>721,273=>622,
-274=>609,275=>587,276=>609,277=>587,278=>609,279=>587,280=>609,281=>587,282=>609,283=>587,
-284=>716,285=>617,286=>716,287=>617,288=>716,289=>617,290=>716,291=>617,292=>738,293=>583,
-294=>748,295=>583,296=>248,297=>218,298=>248,299=>218,300=>248,301=>218,302=>248,303=>218,
-304=>248,305=>218,306=>729,307=>443,308=>481,309=>218,310=>643,311=>530,312=>530,313=>583,
-314=>272,315=>583,316=>272,317=>583,318=>272,319=>583,320=>314,321=>590,322=>292,323=>772,
-324=>583,325=>772,326=>583,327=>772,328=>583,329=>583,330=>766,331=>583,332=>751,333=>595,
-334=>751,335=>595,336=>751,337=>595,340=>653,341=>351,342=>653,343=>351,344=>653,345=>351,
-346=>607,347=>487,348=>607,349=>487,350=>608,351=>488,354=>609,355=>335,356=>610,357=>335,
-358=>641,359=>337,360=>755,361=>594,362=>755,363=>594,364=>755,365=>594,366=>755,367=>594,
-368=>755,369=>594,370=>756,371=>594,372=>1046,373=>813,374=>651,375=>542,377=>629,378=>492,
-379=>629,380=>492,399=>737,452=>1343,453=>1206,454=>1113,455=>1064,456=>807,457=>497,458=>1253,
-459=>997,460=>808,490=>751,491=>595,497=>1329,498=>1206,499=>1113,500=>716,501=>617,506=>676,
-507=>545,508=>961,509=>932,510=>751,511=>595,512=>676,513=>545,514=>676,515=>545,516=>609,
-517=>587,518=>609,519=>587,520=>248,521=>218,522=>248,523=>218,524=>751,525=>595,526=>751,
-527=>595,528=>653,529=>351,530=>653,531=>351,532=>755,533=>594,534=>755,535=>594,536=>607,
-537=>487,538=>610,539=>335,567=>218,601=>587,700=>544,711=>330,713=>396,728=>282,729=>162,
-730=>248,731=>240,733=>326,783=>326,785=>282,916=>647,937=>763,956=>600,960=>589,1024=>609,
-1025=>609,1026=>701,1028=>700,1029=>607,1030=>250,1031=>250,1032=>483,1033=>998,1034=>1040,1035=>708,
-1037=>731,1038=>622,1040=>676,1041=>653,1042=>668,1043=>519,1044=>706,1045=>609,1046=>945,1047=>523,
-1048=>748,1049=>748,1050=>604,1051=>650,1052=>880,1053=>741,1054=>751,1055=>729,1056=>623,1057=>686,
-1058=>609,1059=>622,1060=>741,1061=>632,1062=>724,1063=>611,1064=>932,1065=>963,1066=>736,1067=>819,
-1068=>589,1069=>700,1070=>978,1071=>632,1072=>546,1073=>581,1074=>523,1075=>415,1076=>577,1077=>587,
-1078=>752,1079=>409,1080=>586,1081=>585,1082=>484,1083=>538,1084=>676,1085=>578,1086=>595,1087=>563,
-1088=>619,1089=>549,1090=>474,1091=>542,1092=>678,1093=>504,1094=>569,1095=>480,1096=>745,1097=>773,
-1098=>574,1099=>639,1100=>461,1101=>541,1102=>743,1103=>495,1104=>587,1105=>587,1106=>585,1107=>416,
-1108=>541,1109=>487,1110=>220,1111=>220,1112=>227,1113=>798,1114=>800,1115=>585,1117=>569,1118=>542,
-1119=>541,1168=>519,1169=>425,1200=>620,1201=>548,7692=>715,7693=>622,7716=>738,7717=>583,7748=>772,
-7749=>583,7770=>653,7771=>351,7778=>607,7779=>487,7788=>610,7789=>335,7808=>1046,7809=>813,7810=>1046,
-7811=>813,7812=>1046,7813=>813,7826=>629,7827=>492,7864=>609,7865=>587,7868=>609,7869=>587,7882=>248,
-7883=>218,7884=>751,7885=>595,7908=>755,7909=>594,7922=>651,7923=>542,7928=>651,7929=>542,8194=>579,
-8195=>916,8260=>154,8304=>458,8308=>384,8309=>374,8310=>403,8311=>355,8312=>398,8313=>403,8320=>458,
-8321=>287,8322=>391,8323=>391,8324=>384,8325=>374,8326=>404,8327=>355,8328=>398,8329=>405,8353=>551,
-8355=>612,8356=>488,8358=>843,8361=>1118,8377=>473,8467=>309,8470=>1140,8480=>716,8486=>763,8494=>603,
-8531=>859,8532=>871,8539=>858,8540=>863,8541=>866,8542=>849,8706=>566,8710=>614,8719=>691,8721=>529,
-8722=>539,8725=>588,8729=>189,8730=>447,8734=>691,8747=>300,8776=>432,8800=>467,8804=>450,8805=>450,
-9674=>506,63171=>154,64256=>582,64257=>504,64258=>583,64259=>734,64260=>817,64262=>811);
-$enc='';
-$diff='';
-$file='raleway.z';
-$ctg='raleway.ctg.z';
-$originalsize=237096;
-// --- EOF ---
\ No newline at end of file

From 51db2be3f4d6085d78f629d68c9deb9ca674c018 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Sat, 23 May 2020 14:39:56 +0200
Subject: [PATCH 392/490] fix : personnal font file within tcpdf

---
 .../includes/tecnickcom/tcpdf/fonts/raleway.z   | Bin 94131 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 htdocs/includes/tecnickcom/tcpdf/fonts/raleway.z

diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/raleway.z b/htdocs/includes/tecnickcom/tcpdf/fonts/raleway.z
deleted file mode 100644
index 21039cedf8e8e477ea6c2595e1771f9aa106ea62..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94131
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


From 76e32781a3ba30e2dc365aceec5f6e88154e7d92 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Sat, 23 May 2020 14:40:45 +0200
Subject: [PATCH 393/490] fix : personnal font file within tcpdf

---
 .../tecnickcom/tcpdf/fonts/ralewaylight.ctg.z    | Bin 1354 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 htdocs/includes/tecnickcom/tcpdf/fonts/ralewaylight.ctg.z

diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/ralewaylight.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/ralewaylight.ctg.z
deleted file mode 100644
index 371019c5a51e79b2e1053e94632e6e4d83cf6b80..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1354
zcmd6jYgdv70DwK!POGz|v@<tNidiSaq_b{hq%QM<BxKsMyuj(QOq#YOgrH*Muxw5(
zovlTv+)3iH%IpXlT`Y?1)!<cDX&@jL25$KZ1EIEk?howw_<VZKQ}Nt2Lj4{5`m+ar
zO(alg|A9rbGWV?rn}a;F0#WoSpS_?9`$v4qDHi+GLIJkm)MXxqc5>MgCCkg2J00xj
zPPbLmP(6VoUe$T)!-Y5=8z<_+2}C%F9mj9Mi9wvO6DNiAyn4N;UoVjBC2#b6u3kK%
z7xw6-0VI!w6x~G%1W1V$$!|uA4M^cNr1Y(fS0@wcWdfN@;*{|@GVybnP%V@C$-L8K
z(F3wTqE3AR7RG})3NXJE-0K2~(ctb@aQ_9_&uZuTB4r#!tjrlHQj|HBaA(Icib83e
zQE%@B3(&H&WjUmo+?qv$Pa-dGkCYcsu9O)UFB)=1N-!G>V<^&ea!dNLdbeR;gRufX
zn2I+X#y{PIH&R9wl@yiR807FTa>UOVU%|+Y4sx4g5|Jp+fG)$0wtU`?jFer@HHnI1
zNZw|g&KE^=?%Ub9=P@K88Xhy!RL)JkN;D*SX?VfNm~tk@n-(fSq+&R-R|SLkNrrrd
zQRh#cys^EVEZkgjz3bJ6(xJ_zrU`!viClZq8Rs&X{OOt*h3BZsQ=$!h#S49nsa7qA
zgiOPM=%>4b@<aYKtrHz>S`aLI7D}+N3HCmMRYY*u31cmUagbo^Buqenr5>>N16DcU
zcms@af$<T*)&oogP!<--eivmGpd41zSTkzefU;dfO}tfF>Xdf9(kfFroXRnda{T#w
zb@yZ+NTmYZZIhZGqSQ@Mnx8KDo40VUT)gyNY`Pmis#lCU2AaCcCOmFSquUPL0*gk5
zF8EH6#^S2at4^Y6G?*9KbZgk;W0);Ow<~H?hwfI*c5CMcbQnznd@q@YnggeBuHLz|
zD#z?Us~dG7;LaC`{WNZ^W*K}<%sd~k0a!*)-!Bw=54{f*9;&*aV{mnqtksO>)s=Np
z21hzuX0}yUw@-OL8GzOfc;+$(%eR@Px0zwS1IgBm;BU*lbJjuOOv5f;NwTdt$Zhw2
zp|#v6TE#?1M6j9UiDM3_d{pfiI{2&EgJGJc=-qi0;yn5d)8ExK7Fe*!#Ar?StR_w^
zdIv`JKDyL<zny;NCS8;4jd*9k^cYEWQv#`76~uEJ&93A0%8(COZ0^xj4j^mVy}H+o
z`Bi_`m&1ITU;O6T+T0UNXjd^sc`wN-eD_Qj*eOrY`fpYgm~2T)!fRkx9rJ1zhq2kk
z<uA|0u56^DGO_+*%ziB3evmmElZN%J`@AE?c{C1>jWVPi^q)f<uJ6l2ls^n>eazs*
zTyI_9oM_*ICj#Zrx7~s-X%EBSo~}aF#C~U}x|1EdG&C*cY4+NsuvICKvYl&H*;{k;
z>}yTx!Ypl7RuN)2P#0kd?O2+dm-Hm-JhmgUG;j7r;Y@{w*^oUgVk)vR-~uY0X8VRZ
znRY0cdn7UycW*FOGP-5!@XC!1T?d0_S%Ytq%{!;B_a9%<5WgcXDKq5uN5Se5&ZZ9r
p{eMK^nUtvEe{;AuN$}Dgn!zN>$I&q^f_#2R$nE=X*i;6r;2)Ctm)ZaT


From 471d86ff395a263600bb97c17421288cdb6cfa58 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Sat, 23 May 2020 14:41:08 +0200
Subject: [PATCH 394/490] fix : personnal font file within tcpdf

---
 .../tecnickcom/tcpdf/fonts/ralewaylight.php   | 74 -------------------
 1 file changed, 74 deletions(-)
 delete mode 100644 htdocs/includes/tecnickcom/tcpdf/fonts/ralewaylight.php

diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/ralewaylight.php b/htdocs/includes/tecnickcom/tcpdf/fonts/ralewaylight.php
deleted file mode 100644
index d86eb76f6a5..00000000000
--- a/htdocs/includes/tecnickcom/tcpdf/fonts/ralewaylight.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='Raleway-Light';
-$desc=array('Ascent'=>940,'Descent'=>-234,'CapHeight'=>7,'Flags'=>32,'FontBBox'=>'[-220 -223 1308 936]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
-$up=-100;
-$ut=50;
-$dw=600;
-$cw=array(
-32=>257,33=>243,34=>264,35=>669,36=>617,37=>698,38=>655,39=>185,40=>256,41=>255,
-42=>314,43=>414,44=>238,45=>422,46=>177,47=>579,48=>611,49=>408,50=>508,51=>529,
-52=>536,53=>542,54=>600,55=>535,56=>589,57=>583,58=>177,59=>191,60=>506,61=>437,
-62=>506,63=>473,64=>834,65=>675,66=>662,67=>690,68=>713,69=>612,70=>594,71=>717,
-72=>735,73=>237,74=>478,75=>635,76=>581,77=>880,78=>773,79=>753,80=>621,81=>752,
-82=>649,83=>605,84=>606,85=>756,86=>679,87=>1043,88=>628,89=>647,90=>627,91=>247,
-92=>548,93=>247,94=>526,95=>519,96=>213,97=>537,98=>612,99=>545,100=>615,101=>583,
-102=>318,103=>612,104=>576,105=>207,106=>214,107=>522,108=>259,109=>915,110=>576,111=>592,
-112=>612,113=>612,114=>341,115=>481,116=>320,117=>587,118=>528,119=>806,120=>496,121=>540,
-122=>490,123=>248,124=>223,125=>248,126=>493,8364=>807,1027=>524,8218=>238,402=>519,8222=>338,
-8230=>416,8224=>393,8225=>398,710=>320,8240=>1039,352=>605,8249=>351,338=>1173,1036=>588,381=>627,
-1039=>691,8216=>185,8217=>180,8220=>291,8221=>286,8226=>347,8211=>559,8212=>892,732=>397,8482=>697,
-353=>481,8250=>351,339=>1040,1116=>469,382=>490,376=>647,160=>257,161=>242,162=>554,163=>487,
-164=>535,165=>667,166=>226,167=>497,168=>294,169=>829,170=>431,171=>552,172=>574,173=>559,
-174=>829,175=>390,176=>261,177=>468,178=>381,179=>386,180=>213,181=>613,182=>588,183=>177,
-184=>271,185=>264,186=>449,187=>552,188=>795,189=>838,190=>810,191=>466,192=>675,193=>675,
-194=>675,195=>675,196=>675,197=>675,198=>962,199=>687,200=>612,201=>612,202=>612,203=>612,
-204=>237,205=>237,206=>237,207=>237,208=>720,209=>773,210=>753,211=>753,212=>753,213=>753,
-214=>753,215=>451,216=>753,217=>756,218=>756,219=>756,220=>756,221=>647,222=>601,223=>549,
-224=>537,225=>537,226=>537,227=>537,228=>537,229=>537,230=>930,231=>545,232=>583,233=>583,
-234=>583,235=>583,236=>207,237=>207,238=>207,239=>207,240=>599,241=>576,242=>592,243=>592,
-244=>592,245=>592,246=>592,247=>540,248=>592,249=>587,250=>587,251=>587,252=>587,253=>540,
-254=>603,255=>540,256=>675,257=>537,258=>675,259=>537,260=>674,261=>537,262=>690,263=>545,
-264=>690,265=>545,266=>690,267=>545,268=>690,269=>545,270=>713,271=>615,272=>720,273=>615,
-274=>612,275=>583,276=>612,277=>583,278=>612,279=>583,280=>612,281=>583,282=>612,283=>583,
-284=>717,285=>612,286=>717,287=>612,288=>717,289=>612,290=>717,291=>612,292=>735,293=>576,
-294=>745,295=>576,296=>237,297=>207,298=>237,299=>207,300=>237,301=>207,302=>237,303=>207,
-304=>237,305=>207,306=>715,307=>421,308=>478,309=>207,310=>635,311=>522,312=>522,313=>581,
-314=>259,315=>581,316=>259,317=>581,318=>259,319=>581,320=>292,321=>588,322=>277,323=>773,
-324=>576,325=>773,326=>576,327=>773,328=>576,329=>576,330=>770,331=>576,332=>753,333=>592,
-334=>753,335=>592,336=>753,337=>592,340=>649,341=>341,342=>649,343=>341,344=>649,345=>341,
-346=>605,347=>481,348=>605,349=>481,350=>606,351=>482,354=>605,355=>320,356=>606,357=>320,
-358=>641,359=>322,360=>756,361=>587,362=>756,363=>587,364=>756,365=>587,366=>756,367=>587,
-368=>756,369=>587,370=>756,371=>587,372=>1043,373=>806,374=>647,375=>540,377=>627,378=>490,
-379=>627,380=>490,399=>738,452=>1340,453=>1203,454=>1105,455=>1060,456=>795,457=>473,458=>1252,
-459=>987,460=>790,490=>753,491=>592,497=>1325,498=>1203,499=>1105,500=>717,501=>612,506=>675,
-507=>537,508=>962,509=>930,510=>753,511=>592,512=>675,513=>537,514=>675,515=>537,516=>612,
-517=>583,518=>612,519=>583,520=>237,521=>207,522=>237,523=>207,524=>753,525=>592,526=>753,
-527=>592,528=>649,529=>341,530=>649,531=>341,532=>756,533=>587,534=>756,535=>587,536=>605,
-537=>481,538=>606,539=>320,567=>207,601=>583,700=>546,711=>320,713=>390,728=>269,729=>146,
-730=>244,731=>226,733=>316,783=>316,785=>269,916=>647,937=>766,956=>593,960=>571,1024=>612,
-1025=>612,1026=>692,1028=>699,1029=>605,1030=>238,1031=>238,1032=>479,1033=>994,1034=>1039,1035=>699,
-1037=>737,1038=>620,1040=>675,1041=>649,1042=>663,1043=>524,1044=>696,1045=>612,1046=>921,1047=>527,
-1048=>748,1049=>748,1050=>588,1051=>643,1052=>881,1053=>737,1054=>753,1055=>720,1056=>622,1057=>690,
-1058=>605,1059=>620,1060=>737,1061=>628,1062=>714,1063=>608,1064=>919,1065=>942,1066=>724,1067=>811,
-1068=>584,1069=>699,1070=>971,1071=>628,1072=>538,1073=>572,1074=>519,1075=>406,1076=>564,1077=>583,
-1078=>745,1079=>409,1080=>584,1081=>584,1082=>469,1083=>526,1084=>678,1085=>574,1086=>592,1087=>559,
-1088=>613,1089=>545,1090=>470,1091=>540,1092=>678,1093=>496,1094=>561,1095=>477,1096=>749,1097=>772,
-1098=>568,1099=>630,1100=>456,1101=>540,1102=>743,1103=>492,1104=>583,1105=>583,1106=>578,1107=>407,
-1108=>541,1109=>481,1110=>208,1111=>208,1112=>215,1113=>790,1114=>801,1115=>577,1117=>573,1118=>540,
-1119=>539,1168=>524,1169=>424,1200=>626,1201=>553,7692=>713,7693=>615,7716=>735,7717=>576,7748=>773,
-7749=>576,7770=>649,7771=>341,7778=>605,7779=>481,7788=>606,7789=>320,7808=>1043,7809=>806,7810=>1043,
-7811=>806,7812=>1043,7813=>806,7826=>627,7827=>490,7864=>612,7865=>583,7868=>612,7869=>583,7882=>237,
-7883=>207,7884=>753,7885=>592,7908=>756,7909=>587,7922=>647,7923=>540,7928=>647,7929=>540,8194=>573,
-8195=>912,8260=>141,8304=>450,8308=>377,8309=>369,8310=>398,8311=>346,8312=>392,8313=>398,8320=>450,
-8321=>274,8322=>383,8323=>387,8324=>377,8325=>369,8326=>398,8327=>345,8328=>392,8329=>399,8353=>546,
-8355=>613,8356=>478,8358=>833,8361=>1101,8377=>450,8467=>292,8470=>1124,8480=>695,8486=>766,8494=>606,
-8531=>833,8532=>846,8539=>831,8540=>837,8541=>837,8542=>827,8706=>569,8710=>611,8719=>661,8721=>513,
-8722=>541,8725=>578,8729=>177,8730=>432,8734=>695,8747=>285,8776=>429,8800=>455,8804=>450,8805=>450,
-9674=>491,63171=>141,64256=>565,64257=>484,64258=>562,64259=>706,64260=>788,64262=>795);
-$enc='';
-$diff='';
-$file='ralewaylight.z';
-$ctg='ralewaylight.ctg.z';
-$originalsize=238348;
-// --- EOF ---
\ No newline at end of file

From 19598bad8a748cfb9d91bd12708a135408d18467 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Sat, 23 May 2020 14:41:30 +0200
Subject: [PATCH 395/490] fix : personnal font file within tcpdf

---
 .../tecnickcom/tcpdf/fonts/ralewaylight.z       | Bin 94453 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 htdocs/includes/tecnickcom/tcpdf/fonts/ralewaylight.z

diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/ralewaylight.z b/htdocs/includes/tecnickcom/tcpdf/fonts/ralewaylight.z
deleted file mode 100644
index 56a46efada73c24e2a2e50f174c679e03d49e8a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94453
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
Ithn(10PL#<djJ3c


From 60f1bcfb708d1cddaadcca663b42c1c05d72b693 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Sat, 23 May 2020 14:59:06 +0200
Subject: [PATCH 396/490] fix : personnal font file within tcpdf

---
 .../includes/tecnickcom/tcpdf/fonts/roboto.ctg.z | Bin 1857 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 htdocs/includes/tecnickcom/tcpdf/fonts/roboto.ctg.z

diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/roboto.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/roboto.ctg.z
deleted file mode 100644
index ec15f8b47840d50753db4a65bb6e714a69872aa6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1857
zcmd6n{a2EQ0>^EuRkNhd8E1(vR1@{gne*PXi4(8e6>S0v=&f1eEML~V(@;>ZqHedE
zfDV@PB~kH;A&?^@M1<#pyLWqXmE|6nw<Eqy5EY-P;XqJAx83{W{(<}X?fd=dbI$ji
zFUz<x#XRJnh`KlDtc+d#jX={XX=-{;`Tt11vu|}Z=<5|pD9_aJ%H{nr{8?($G?48a
zDXWQ7{c-1~*Mr`lY_M16lK+xNEwiMNER-S(nP#C@BhwO)lpG|PjHJ?=(oQ!~E;W(g
zZ=(J!BP}t5l9xfw$e=RE(}?4gkH^Vb<J79Cw0EN@7o*73C~B!XEk#W!RFluCsg=yM
zBqpVRNj}4*malXLF3V}l3fyvU^>W`Xlq>=D)iKnq9MtW@C^;FWh(z_$QGNT3)Ezxn
zc=NtcEEo1zg<Y*e$%L?5E0k_#{^MHaO)yg|$?UOYb~R;6#xuM1{hAHPU`%zxUIDTz
zj5|J17nV>9?+cK3Gy3_E5=$C}cX!CXWZWe|ax75_ALx*)7z2+XEjD!#ej!U%$55Vt
zBsxM1{BoAOm!ZB5sdc2M@JrLOHioJQQs{^p*k@V}Ff^->UYF{Gcg4wS?RNs9?h1kc
z-XABI+WSS2s)95M?@^3n^|BWGT^iJz*>}(=BUTXm;DdU(#y&6u0Troh@QYP4fnAA%
zq+5he*t<&JXIC2_%@%34P&Kf$*CXqE=kQ$eb<AD-z;}T$#|!3pQ`bY*@rLivd&D2S
z!uvNlh=*5(24cjyjl3~(@B_Ry6pa*LNasBuV{YNqvcM>D{u7>&9I}kp%g_hKIVXAd
zpdcY$^<iMRIIo}gA1K&}2R=jxh%YjXHWPkPk=GJnUqVfneQ%80_`V1kH*gsC)r-sR
zTm!U*K=;)g;Cvdnl*-S4M!EqV@}N0glbnNfbFC%c`Z)c3yDu>6xyr~@1l#CZ86a>*
zG#?P2XXK9c(NecNhCA0a*#dcFc+YVC4PVuTvIS53Nc5=%@cG$8-WSPl@G;7h&EWdk
z!(kUQzT!tI&-@hN{?^bca)aCSKlvZo3;v6q?2oDi=jea-_e}yJI>Fy>7_`yfX+IJI
z-lxCUj*@~_I=<bv0Gyzc+Wi*6O?txlBd>xW{q%WM3uvJyp4T#S&w%6c0-G@F&9y?a
zZV*?*@iX@f#uRbSnFj{rRynce+k>&I+)A@yFg}p8*WAT=E0CLHR<hm}aYD>;7FNV9
zFl$*j8b_@>L91^uSy&j_=MLqu=zBe^aGKzh=@BbzhF@-)W<|^h5T<Wjp*Vi3=?B*v
zI6;Kzq3d-6zt}YCI$;nzQevt(XmiNJoY<H;6}C+kTU&~4DUB8UjP3jx_{3ZHg*U*d
z)7_{8uBPZ3Q-J!1y7q^_-@|kbVF0gJC+r12E7Ua?0(@8}f`L!{bl3d=Zkw*P4M<!d
z%OvNt>d8UHq*fn0*d41?0fW7O7I0ohI2jSnGPIK!?{s=0>_-tBhY*f85zc)Ad#GUJ
zh`{ldz`1+P$`#Gu7n$Uu1*>STRb-hEnYE(DP1=vwX!9V=B%v)>Xmd?8%Q(%f|EI=j
zGt7*--CpRWE9^T6TNiGm*1ZpH?Pm82Y)ahYVfXINr7zicQ*CnGBdPm9r&Yxs7`16}
zql@krvX|=E$_SgpFw)|FIosOHR`=P|hR09cFU>Bsu~o%3h2fFL?K5iy*qSw)-Z1L)
z_WB*bHT1J9z={gJ{tZyIEpU<J7lu7oJD*eC@fNA4zSB`!JrluFJl#wjns4#&vK<x0
z&+x_Th1Ju=F5-|y<KfRbDywJFu6JwZ1s-m^qhNa~+m%vd>GOO(<S5^sY14!8uB4sD
z#^W)PMob=Yg0j*0nuVaHtTu*Nh?|t{^rJ|^HOgFi5RwQ|Z0X0F2oj1lJ-CTzp=_of
z%OEsSEa{kxU;ojOZeFA3_Xy8-)Fd<)N{n*St+r*!mOSC38z{*=`RR|gQYuwX-lh&D
zhf{kA(^&QCkEy^D95Xq9Dka=3U2f17txSY7Q+I5Ii%(utISBe{q_tx!_km%^`n34f
zQPoa#_lsp?(B7Ve){@JphR=F(F0oM8@!Mn3%crW6q>-&9e?>Xt%Yy4?6DF@JEM?mf
z$B0uT_SgwOc>W}YNc>^2y8OLpX|W~`pWoJ+?+M1b7b_l@IosUQ;XkY)Had4o^+&^V
zF}u8KV7Kjf$?wMae<)(JGuxZL*z;eNPqM<oF?+qdevDvmoNaEFA}?WDe@*C;wd_Qn
S?XIvPtYWj=6EXg^nDh%?H<;-F


From c9c5dc4ebe68f51de3340b6c687df4a9cfa1dcb6 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Sat, 23 May 2020 14:59:30 +0200
Subject: [PATCH 397/490] fix : personnal font file within tcpdf

---
 .../tecnickcom/tcpdf/fonts/roboto.php         | 104 ------------------
 1 file changed, 104 deletions(-)
 delete mode 100644 htdocs/includes/tecnickcom/tcpdf/fonts/roboto.php

diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/roboto.php b/htdocs/includes/tecnickcom/tcpdf/fonts/roboto.php
deleted file mode 100644
index 674ffd02b2d..00000000000
--- a/htdocs/includes/tecnickcom/tcpdf/fonts/roboto.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='Roboto-Regular';
-$desc=array('Ascent'=>928,'Descent'=>-244,'CapHeight'=>28,'Flags'=>32,'FontBBox'=>'[-737 -271 1148 1056]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
-$up=-98;
-$ut=49;
-$dw=600;
-$cw=array(
-0=>0,2=>0,13=>248,32=>248,33=>257,34=>320,35=>616,36=>562,37=>732,38=>622,
-39=>174,40=>342,41=>348,42=>431,43=>567,44=>196,45=>276,46=>263,47=>412,48=>562,
-49=>562,50=>562,51=>562,52=>562,53=>562,54=>562,55=>562,56=>562,57=>562,58=>242,
-59=>211,60=>508,61=>549,62=>522,63=>472,64=>898,65=>652,66=>623,67=>651,68=>656,
-69=>568,70=>553,71=>681,72=>713,73=>272,74=>552,75=>627,76=>538,77=>873,78=>713,
-79=>688,80=>631,81=>688,82=>616,83=>593,84=>597,85=>648,86=>636,87=>887,88=>627,
-89=>601,90=>599,91=>265,92=>410,93=>265,94=>418,95=>451,96=>309,97=>544,98=>561,
-99=>523,100=>564,101=>530,102=>347,103=>561,104=>551,105=>243,106=>239,107=>507,108=>243,
-109=>876,110=>552,111=>570,112=>561,113=>568,114=>338,115=>516,116=>327,117=>551,118=>484,
-119=>751,120=>496,121=>473,122=>496,123=>338,124=>244,125=>338,126=>680,8364=>562,1027=>556,
-8218=>199,402=>340,8222=>344,8230=>669,8224=>551,8225=>570,710=>471,8240=>958,352=>593,8249=>300,
-338=>954,1036=>627,381=>599,1039=>713,8216=>200,8217=>200,8220=>354,8221=>357,8226=>337,8211=>656,
-8212=>781,732=>472,8482=>625,353=>516,8250=>300,339=>908,1116=>540,382=>496,376=>601,160=>248,
-161=>244,162=>547,163=>581,164=>713,165=>525,166=>240,167=>613,168=>418,169=>786,170=>447,
-171=>469,172=>554,173=>276,174=>786,175=>458,176=>374,177=>534,178=>367,179=>367,180=>313,
-181=>566,182=>489,183=>261,184=>248,185=>367,186=>455,187=>469,188=>732,189=>776,190=>778,
-191=>473,192=>652,193=>652,194=>652,195=>652,196=>652,197=>652,198=>935,199=>651,200=>568,
-201=>568,202=>568,203=>568,204=>272,205=>272,206=>272,207=>272,208=>670,209=>713,210=>688,
-211=>688,212=>688,213=>688,214=>688,215=>533,216=>688,217=>648,218=>648,219=>648,220=>648,
-221=>601,222=>591,223=>595,224=>544,225=>544,226=>544,227=>544,228=>544,229=>544,230=>844,
-231=>523,232=>530,233=>530,234=>530,235=>530,236=>247,237=>247,238=>247,239=>247,240=>586,
-241=>552,242=>570,243=>570,244=>570,245=>570,246=>570,247=>571,248=>566,249=>551,250=>551,
-251=>551,252=>551,253=>473,254=>576,255=>473,256=>652,257=>544,258=>652,259=>544,260=>652,
-261=>544,262=>651,263=>523,264=>651,265=>523,266=>651,267=>523,268=>651,269=>523,270=>656,
-271=>637,272=>670,273=>597,274=>568,275=>530,276=>568,277=>530,278=>568,279=>530,280=>568,
-281=>530,282=>568,283=>530,284=>681,285=>561,286=>681,287=>561,288=>681,289=>561,290=>681,
-291=>561,292=>713,293=>551,294=>700,295=>565,296=>272,297=>247,298=>272,299=>247,300=>272,
-301=>247,302=>272,303=>243,304=>272,305=>247,306=>824,307=>481,308=>552,309=>251,310=>627,
-311=>507,312=>556,313=>538,314=>243,315=>538,316=>243,317=>538,318=>316,319=>538,320=>350,
-321=>539,322=>270,323=>713,324=>552,325=>713,326=>552,327=>713,328=>552,329=>552,330=>693,
-331=>566,332=>688,333=>570,334=>688,335=>570,336=>688,337=>570,340=>616,341=>338,342=>616,
-343=>338,344=>616,345=>338,346=>593,347=>516,348=>593,349=>516,350=>593,351=>516,354=>597,
-355=>327,356=>597,357=>346,358=>597,359=>327,360=>648,361=>551,362=>648,363=>551,364=>648,
-365=>551,366=>648,367=>551,368=>648,369=>551,370=>648,371=>551,372=>887,373=>751,374=>601,
-375=>473,377=>599,378=>496,379=>599,380=>496,383=>248,399=>691,416=>687,417=>571,431=>695,
-432=>619,496=>251,506=>652,507=>544,508=>935,509=>844,510=>688,511=>566,536=>593,537=>516,
-538=>597,539=>327,567=>251,601=>527,700=>200,711=>444,713=>458,728=>427,729=>243,730=>334,
-731=>271,733=>373,755=>294,768=>0,769=>0,771=>0,777=>0,783=>0,803=>0,900=>256,
-901=>505,902=>652,903=>261,904=>568,905=>713,906=>272,908=>697,910=>649,911=>675,912=>324,
-913=>652,914=>623,915=>556,916=>705,917=>568,918=>599,919=>713,920=>680,921=>272,922=>627,
-923=>655,924=>873,925=>713,926=>571,927=>688,928=>713,929=>631,931=>571,932=>597,933=>601,
-934=>716,935=>627,936=>692,937=>665,938=>272,939=>601,940=>565,941=>539,942=>566,943=>324,
-944=>545,945=>565,946=>592,947=>501,948=>566,949=>539,950=>518,951=>566,952=>569,953=>324,
-954=>556,955=>554,956=>566,957=>484,958=>490,959=>570,960=>596,961=>566,962=>538,963=>566,
-964=>521,965=>545,966=>705,967=>496,968=>700,969=>824,970=>324,971=>545,972=>570,973=>545,
-974=>824,977=>579,978=>532,982=>785,1024=>568,1025=>568,1026=>750,1028=>674,1029=>593,1030=>272,
-1031=>272,1032=>552,1033=>1071,1034=>1080,1035=>813,1037=>713,1038=>628,1040=>652,1041=>630,1042=>623,
-1043=>556,1044=>752,1045=>568,1046=>908,1047=>593,1048=>713,1049=>713,1050=>643,1051=>708,1052=>873,
-1053=>713,1054=>688,1055=>713,1056=>631,1057=>651,1058=>597,1059=>628,1060=>771,1061=>627,1062=>731,
-1063=>685,1064=>941,1065=>969,1066=>759,1067=>865,1068=>627,1069=>674,1070=>894,1071=>637,1072=>544,
-1073=>553,1074=>571,1075=>419,1076=>604,1077=>530,1078=>766,1079=>508,1080=>577,1081=>577,1082=>540,
-1083=>578,1084=>742,1085=>577,1086=>570,1087=>577,1088=>561,1089=>523,1090=>480,1091=>473,1092=>725,
-1093=>496,1094=>592,1095=>543,1096=>809,1097=>827,1098=>621,1099=>776,1100=>543,1101=>538,1102=>816,
-1103=>549,1104=>530,1105=>530,1106=>551,1107=>419,1108=>538,1109=>516,1110=>243,1111=>247,1112=>239,
-1113=>848,1114=>861,1115=>567,1117=>577,1118=>473,1119=>577,1120=>879,1121=>771,1122=>627,1123=>542,
-1124=>896,1125=>746,1126=>603,1127=>534,1128=>880,1129=>755,1130=>852,1131=>735,1132=>1127,1133=>977,
-1134=>517,1135=>482,1136=>692,1137=>700,1138=>680,1139=>568,1140=>630,1141=>501,1142=>630,1143=>501,
-1144=>1161,1145=>1043,1146=>680,1147=>566,1148=>875,1149=>768,1150=>879,1151=>771,1152=>649,1153=>535,
-1154=>624,1155=>0,1156=>0,1157=>0,1158=>0,1160=>0,1161=>0,1162=>754,1163=>616,1164=>627,
-1165=>542,1166=>638,1167=>567,1168=>548,1169=>445,1170=>556,1171=>419,1172=>607,1173=>502,1174=>954,
-1175=>797,1176=>593,1177=>508,1178=>700,1179=>590,1180=>629,1181=>562,1182=>652,1183=>519,1184=>818,
-1185=>689,1186=>750,1187=>606,1188=>976,1189=>713,1190=>1024,1191=>869,1192=>741,1193=>603,1194=>651,
-1195=>523,1196=>597,1197=>480,1198=>601,1199=>501,1200=>601,1201=>501,1202=>637,1203=>521,1204=>896,
-1205=>670,1206=>717,1207=>573,1208=>679,1209=>552,1210=>679,1211=>551,1212=>773,1213=>592,1214=>773,
-1215=>592,1216=>272,1217=>908,1218=>766,1219=>629,1220=>544,1221=>749,1222=>617,1223=>712,1224=>566,
-1225=>759,1226=>615,1227=>685,1228=>543,1229=>914,1230=>780,1231=>272,1232=>652,1233=>544,1234=>652,
-1235=>544,1236=>935,1237=>844,1238=>568,1239=>530,1240=>691,1241=>527,1242=>691,1243=>527,1244=>908,
-1245=>766,1246=>593,1247=>508,1248=>582,1249=>582,1250=>713,1251=>577,1252=>713,1253=>577,1254=>688,
-1255=>570,1256=>680,1257=>568,1258=>680,1259=>568,1260=>674,1261=>538,1262=>628,1263=>473,1264=>628,
-1265=>473,1266=>628,1267=>473,1268=>685,1269=>543,1270=>556,1271=>419,1272=>865,1273=>776,1274=>589,
-1275=>458,1276=>647,1277=>531,1278=>627,1279=>496,1280=>620,1281=>564,1282=>822,1283=>861,1284=>792,
-1285=>646,1286=>536,1287=>503,1288=>969,1289=>807,1290=>998,1291=>829,1292=>620,1293=>514,1294=>709,
-1295=>641,1296=>674,1297=>539,1298=>751,1299=>618,7680=>652,7681=>544,7742=>873,7743=>876,7808=>887,
-7809=>751,7810=>887,7811=>751,7812=>887,7813=>751,7840=>652,7841=>544,7842=>652,7843=>544,7844=>652,
-7845=>544,7846=>652,7847=>544,7848=>652,7849=>544,7850=>652,7851=>544,7852=>652,7853=>544,7854=>652,
-7855=>544,7856=>652,7857=>544,7858=>652,7859=>544,7860=>652,7861=>544,7862=>652,7863=>544,7864=>568,
-7865=>530,7866=>568,7867=>530,7868=>568,7869=>530,7870=>568,7871=>530,7872=>568,7873=>530,7874=>568,
-7875=>530,7876=>568,7877=>530,7878=>568,7879=>530,7880=>272,7881=>247,7882=>272,7883=>243,7884=>688,
-7885=>570,7886=>688,7887=>570,7888=>688,7889=>570,7890=>688,7891=>570,7892=>688,7893=>570,7894=>688,
-7895=>570,7896=>688,7897=>570,7898=>687,7899=>571,7900=>687,7901=>571,7902=>687,7903=>571,7904=>687,
-7905=>571,7906=>687,7907=>571,7908=>648,7909=>551,7910=>648,7911=>551,7912=>695,7913=>619,7914=>695,
-7915=>619,7916=>695,7917=>619,7918=>695,7919=>619,7920=>695,7921=>619,7922=>601,7923=>473,7924=>601,
-7925=>473,7926=>601,7927=>473,7928=>601,7929=>473,8013=>722,8192=>510,8193=>1020,8194=>510,8195=>1020,
-8196=>340,8197=>255,8198=>170,8199=>562,8200=>273,8201=>204,8202=>102,8203=>0,8208=>275,8209=>275,
-8213=>781,8215=>456,8219=>200,8229=>471,8231=>187,8242=>174,8243=>320,8252=>515,8260=>455,8308=>367,
-8319=>422,8355=>553,8356=>581,8358=>792,8359=>820,8360=>1058,8361=>740,8362=>771,8363=>579,8369=>731,
-8377=>517,8378=>557,8380=>660,8381=>664,8453=>738,8467=>476,8470=>1028,8494=>636,8539=>769,8540=>855,
-8541=>851,8542=>802,8706=>570,8719=>694,8721=>585,8722=>571,8730=>596,8734=>1028,8747=>256,8776=>563,
-8800=>549,8804=>508,8805=>523,9674=>504,60929=>287,60930=>320,63171=>251,64257=>554,64258=>568,64259=>854,
-64260=>854,65279=>0,65532=>1025,65533=>1026);
-$enc='';
-$diff='';
-$file='roboto.z';
-$ctg='roboto.ctg.z';
-$originalsize=242972;
-// --- EOF ---
\ No newline at end of file

From 462b043efc40a4df5a7da9f9d4d6c5363626924f Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Sat, 23 May 2020 14:59:52 +0200
Subject: [PATCH 398/490] fix : personnal font file within tcpdf

---
 .../includes/tecnickcom/tcpdf/fonts/roboto.z   | Bin 124775 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 htdocs/includes/tecnickcom/tcpdf/fonts/roboto.z

diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/roboto.z b/htdocs/includes/tecnickcom/tcpdf/fonts/roboto.z
deleted file mode 100644
index 20e8ad2b49feee295ec963c42e7bdb7360ef6d81..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 124775
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
HGsFK6skR~C


From b4ceb2e97e1dd8da15339cc86263812583fa10af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 15:00:06 +0200
Subject: [PATCH 399/490] Update entrepot.class.php

---
 htdocs/product/stock/class/entrepot.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index b37420ffc7f..f514af2ba2b 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -745,7 +745,7 @@ class Entrepot extends CommonObject
 
         $result .= $linkstart;
         if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2) $result.= (($showfullpath || !empty($conf->global->STOCK_ALWAYS_SHOW_FULL_ARBO))? $this->get_full_arbo() : (empty($this->label)?$this->libelle:$this->label));
+        if ($withpicto != 2) $result .= (($showfullpath || !empty($conf->global->STOCK_ALWAYS_SHOW_FULL_ARBO)) ? $this->get_full_arbo() : (empty($this->label)?$this->libelle:$this->label));
         $result .= $linkend;
 
 		return $result;

From b1e7085857c5cb5d2b719c7e43b32aec2ba6553e Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Sat, 23 May 2020 15:00:11 +0200
Subject: [PATCH 400/490] fix : personnal font file within tcpdf

---
 .../tecnickcom/tcpdf/fonts/robotob.ctg.z         | Bin 1857 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 htdocs/includes/tecnickcom/tcpdf/fonts/robotob.ctg.z

diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/robotob.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/robotob.ctg.z
deleted file mode 100644
index ec15f8b47840d50753db4a65bb6e714a69872aa6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1857
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
S?XIvPtYWj=6EXg^nDh%?H<;-F


From 20898d783a19a04d0b53611d3e396bde94b39d43 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Sat, 23 May 2020 15:00:30 +0200
Subject: [PATCH 401/490] fix : personnal font file within tcpdf

---
 .../tecnickcom/tcpdf/fonts/robotob.php        | 104 ------------------
 1 file changed, 104 deletions(-)
 delete mode 100644 htdocs/includes/tecnickcom/tcpdf/fonts/robotob.php

diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/robotob.php b/htdocs/includes/tecnickcom/tcpdf/fonts/robotob.php
deleted file mode 100644
index fb141105f8e..00000000000
--- a/htdocs/includes/tecnickcom/tcpdf/fonts/robotob.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='Roboto-Bold';
-$desc=array('Ascent'=>928,'Descent'=>-244,'CapHeight'=>11,'Flags'=>32,'FontBBox'=>'[-727 -271 1191 1056]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>600);
-$up=-98;
-$ut=49;
-$dw=600;
-$cw=array(
-0=>0,2=>0,13=>249,32=>249,33=>272,34=>321,35=>596,36=>574,37=>738,38=>656,
-39=>162,40=>351,41=>353,42=>453,43=>546,44=>244,45=>388,46=>291,47=>374,48=>574,
-49=>574,50=>574,51=>574,52=>574,53=>574,54=>574,55=>574,56=>574,57=>574,58=>282,
-59=>262,60=>509,61=>572,62=>517,63=>498,64=>895,65=>673,66=>638,67=>654,68=>650,
-69=>563,70=>548,71=>681,72=>707,73=>292,74=>559,75=>635,76=>542,77=>876,78=>706,
-79=>690,80=>645,81=>690,82=>638,83=>615,84=>619,85=>658,86=>654,87=>875,88=>635,
-89=>618,90=>606,91=>278,92=>422,93=>278,94=>437,95=>446,96=>331,97=>536,98=>563,
-99=>521,100=>563,101=>541,102=>358,103=>571,104=>560,105=>265,106=>260,107=>534,108=>265,
-109=>866,110=>560,111=>565,112=>563,113=>565,114=>365,115=>514,116=>338,117=>560,118=>505,
-119=>735,120=>509,121=>502,122=>509,123=>330,124=>253,125=>330,126=>648,8364=>574,1027=>557,
-8218=>248,402=>361,8222=>403,8230=>740,8224=>538,8225=>579,710=>496,8240=>959,352=>615,8249=>312,
-338=>968,1036=>635,381=>606,1039=>700,8216=>234,8217=>229,8220=>406,8221=>409,8226=>359,8211=>632,
-8212=>763,732=>481,8482=>631,353=>514,8250=>302,339=>902,1116=>563,382=>509,376=>618,160=>249,
-161=>282,162=>575,163=>594,164=>692,165=>536,166=>252,167=>628,168=>467,169=>784,170=>444,
-171=>500,172=>551,173=>388,174=>784,175=>501,176=>388,177=>537,178=>373,179=>373,180=>332,
-181=>616,182=>490,183=>301,184=>268,185=>373,186=>457,187=>500,188=>718,189=>761,190=>808,
-191=>498,192=>673,193=>673,194=>673,195=>673,196=>673,197=>673,198=>940,199=>654,200=>563,
-201=>563,202=>563,203=>563,204=>292,205=>292,206=>292,207=>292,208=>665,209=>706,210=>690,
-211=>690,212=>690,213=>690,214=>690,215=>531,216=>689,217=>658,218=>658,219=>658,220=>658,
-221=>618,222=>608,223=>631,224=>536,225=>536,226=>536,227=>536,228=>536,229=>536,230=>844,
-231=>521,232=>541,233=>541,234=>541,235=>541,236=>274,237=>274,238=>274,239=>274,240=>575,
-241=>560,242=>565,243=>565,244=>565,245=>565,246=>565,247=>570,248=>564,249=>560,250=>560,
-251=>560,252=>560,253=>502,254=>567,255=>502,256=>673,257=>536,258=>673,259=>536,260=>673,
-261=>536,262=>654,263=>521,264=>654,265=>521,266=>654,267=>521,268=>654,269=>521,270=>650,
-271=>637,272=>665,273=>630,274=>563,275=>541,276=>563,277=>541,278=>563,279=>541,280=>563,
-281=>541,282=>563,283=>541,284=>681,285=>571,286=>681,287=>571,288=>681,289=>571,290=>681,
-291=>571,292=>707,293=>560,294=>720,295=>574,296=>292,297=>274,298=>292,299=>274,300=>292,
-301=>274,302=>292,303=>265,304=>292,305=>274,306=>850,307=>525,308=>559,309=>282,310=>635,
-311=>534,312=>590,313=>542,314=>265,315=>542,316=>265,317=>542,318=>338,319=>542,320=>373,
-321=>558,322=>306,323=>706,324=>560,325=>706,326=>560,327=>706,328=>560,329=>560,330=>703,
-331=>564,332=>690,333=>565,334=>690,335=>565,336=>690,337=>565,340=>638,341=>365,342=>638,
-343=>365,344=>638,345=>365,346=>615,347=>514,348=>615,349=>514,350=>615,351=>514,354=>619,
-355=>338,356=>619,357=>357,358=>619,359=>338,360=>658,361=>560,362=>658,363=>560,364=>658,
-365=>560,366=>658,367=>560,368=>658,369=>560,370=>658,371=>560,372=>875,373=>735,374=>618,
-375=>502,377=>606,378=>509,379=>606,380=>509,383=>259,399=>695,416=>701,417=>581,431=>712,
-432=>610,496=>282,506=>673,507=>536,508=>940,509=>844,510=>689,511=>564,536=>615,537=>514,
-538=>619,539=>338,567=>282,601=>529,700=>229,711=>471,713=>501,728=>444,729=>265,730=>333,
-731=>301,733=>410,755=>314,768=>0,769=>0,771=>0,777=>0,783=>0,803=>0,900=>337,
-901=>548,902=>673,903=>301,904=>563,905=>707,906=>292,908=>700,910=>667,911=>682,912=>337,
-913=>673,914=>638,915=>557,916=>731,917=>563,918=>606,919=>707,920=>688,921=>292,922=>635,
-923=>647,924=>876,925=>706,926=>567,927=>690,928=>708,929=>645,931=>567,932=>619,933=>618,
-934=>770,935=>635,936=>727,937=>672,938=>292,939=>618,940=>563,941=>556,942=>564,943=>337,
-944=>546,945=>563,946=>602,947=>510,948=>564,949=>556,950=>501,951=>564,952=>590,953=>337,
-954=>590,955=>548,956=>616,957=>505,958=>530,959=>565,960=>644,961=>564,962=>515,963=>572,
-964=>521,965=>546,966=>746,967=>509,968=>744,969=>821,970=>337,971=>546,972=>565,973=>546,
-974=>821,977=>595,978=>591,982=>827,1024=>563,1025=>563,1026=>748,1028=>660,1029=>615,1030=>292,
-1031=>292,1032=>559,1033=>1058,1034=>1059,1035=>771,1037=>700,1038=>631,1040=>673,1041=>626,1042=>638,
-1043=>557,1044=>748,1045=>563,1046=>998,1047=>617,1048=>700,1049=>700,1050=>646,1051=>706,1052=>876,
-1053=>707,1054=>690,1055=>708,1056=>645,1057=>654,1058=>619,1059=>631,1060=>816,1061=>635,1062=>759,
-1063=>695,1064=>958,1065=>1021,1066=>771,1067=>872,1068=>625,1069=>650,1070=>943,1071=>597,1072=>536,
-1073=>569,1074=>566,1075=>419,1076=>631,1077=>541,1078=>854,1079=>514,1080=>567,1081=>567,1082=>563,
-1083=>568,1084=>759,1085=>567,1086=>565,1087=>567,1088=>563,1089=>521,1090=>509,1091=>502,1092=>730,
-1093=>509,1094=>609,1095=>554,1096=>827,1097=>900,1098=>656,1099=>828,1100=>558,1101=>520,1102=>812,
-1103=>559,1104=>541,1105=>541,1106=>560,1107=>419,1108=>520,1109=>514,1110=>265,1111=>274,1112=>260,
-1113=>858,1114=>861,1115=>564,1117=>567,1118=>502,1119=>567,1120=>947,1121=>820,1122=>625,1123=>558,
-1124=>893,1125=>754,1126=>661,1127=>559,1128=>935,1129=>798,1130=>872,1131=>733,1132=>1163,1133=>1006,
-1134=>514,1135=>503,1136=>727,1137=>744,1138=>688,1139=>564,1140=>643,1141=>510,1142=>643,1143=>510,
-1144=>1192,1145=>1067,1146=>688,1147=>564,1148=>946,1149=>808,1150=>947,1151=>820,1152=>621,1153=>535,
-1154=>623,1155=>0,1156=>0,1157=>0,1158=>0,1160=>0,1161=>0,1162=>777,1163=>652,1164=>625,
-1165=>558,1166=>629,1167=>563,1168=>555,1169=>461,1170=>557,1171=>419,1172=>623,1173=>529,1174=>1069,
-1175=>909,1176=>617,1177=>514,1178=>743,1179=>650,1180=>662,1181=>602,1182=>656,1183=>544,1184=>826,
-1185=>715,1186=>781,1187=>649,1188=>985,1189=>706,1190=>1045,1191=>866,1192=>803,1193=>646,1194=>654,
-1195=>521,1196=>619,1197=>509,1198=>618,1199=>510,1200=>618,1201=>510,1202=>667,1203=>542,1204=>895,
-1205=>687,1206=>768,1207=>636,1208=>680,1209=>560,1210=>699,1211=>560,1212=>757,1213=>598,1214=>757,
-1215=>598,1216=>292,1217=>998,1218=>854,1219=>649,1220=>571,1221=>781,1222=>652,1223=>707,1224=>564,
-1225=>783,1226=>651,1227=>695,1228=>554,1229=>950,1230=>830,1231=>292,1232=>673,1233=>536,1234=>673,
-1235=>536,1236=>940,1237=>844,1238=>563,1239=>541,1240=>695,1241=>529,1242=>695,1243=>529,1244=>998,
-1245=>854,1246=>617,1247=>514,1248=>578,1249=>579,1250=>700,1251=>567,1252=>700,1253=>567,1254=>690,
-1255=>565,1256=>688,1257=>564,1258=>688,1259=>564,1260=>650,1261=>520,1262=>631,1263=>502,1264=>631,
-1265=>502,1266=>631,1267=>502,1268=>695,1269=>554,1270=>557,1271=>419,1272=>872,1273=>828,1274=>601,
-1275=>458,1276=>700,1277=>576,1278=>635,1279=>509,1280=>625,1281=>563,1282=>907,1283=>854,1284=>788,
-1285=>643,1286=>585,1287=>559,1288=>965,1289=>847,1290=>994,1291=>825,1292=>633,1293=>529,1294=>705,
-1295=>637,1296=>655,1297=>556,1298=>813,1299=>684,7680=>673,7681=>536,7742=>876,7743=>866,7808=>875,
-7809=>735,7810=>875,7811=>735,7812=>875,7813=>735,7840=>673,7841=>536,7842=>673,7843=>536,7844=>673,
-7845=>536,7846=>673,7847=>536,7848=>673,7849=>536,7850=>673,7851=>536,7852=>673,7853=>536,7854=>673,
-7855=>536,7856=>673,7857=>536,7858=>673,7859=>536,7860=>673,7861=>536,7862=>673,7863=>536,7864=>563,
-7865=>541,7866=>563,7867=>541,7868=>563,7869=>541,7870=>563,7871=>541,7872=>563,7873=>541,7874=>563,
-7875=>541,7876=>563,7877=>541,7878=>563,7879=>541,7880=>292,7881=>274,7882=>292,7883=>265,7884=>690,
-7885=>565,7886=>690,7887=>565,7888=>690,7889=>565,7890=>690,7891=>565,7892=>690,7893=>565,7894=>690,
-7895=>565,7896=>690,7897=>565,7898=>701,7899=>581,7900=>701,7901=>581,7902=>701,7903=>581,7904=>701,
-7905=>581,7906=>701,7907=>581,7908=>658,7909=>560,7910=>658,7911=>560,7912=>712,7913=>610,7914=>712,
-7915=>610,7916=>712,7917=>610,7918=>712,7919=>610,7920=>712,7921=>610,7922=>618,7923=>502,7924=>618,
-7925=>502,7926=>618,7927=>502,7928=>618,7929=>502,8013=>725,8192=>510,8193=>1020,8194=>510,8195=>1020,
-8196=>340,8197=>255,8198=>170,8199=>562,8200=>273,8201=>204,8202=>102,8203=>0,8208=>388,8209=>388,
-8213=>763,8215=>446,8219=>209,8229=>521,8231=>257,8242=>162,8243=>321,8252=>544,8260=>446,8308=>373,
-8319=>418,8355=>548,8356=>594,8358=>814,8359=>860,8360=>1085,8361=>807,8362=>868,8363=>578,8369=>749,
-8377=>527,8378=>594,8380=>682,8381=>705,8453=>734,8467=>494,8470=>1014,8494=>633,8539=>783,8540=>861,
-8541=>852,8542=>859,8706=>572,8719=>693,8721=>627,8722=>556,8730=>565,8734=>1046,8747=>289,8776=>577,
-8800=>572,8804=>509,8805=>517,9674=>509,60929=>294,60930=>321,63171=>229,64257=>608,64258=>613,64259=>928,
-64260=>928,65279=>0,65532=>1021,65533=>1026);
-$enc='';
-$diff='';
-$file='robotob.z';
-$ctg='robotob.ctg.z';
-$originalsize=247932;
-// --- EOF ---
\ No newline at end of file

From f49374c72d27e716796de1ac5215b5802aae1de1 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Sat, 23 May 2020 15:00:48 +0200
Subject: [PATCH 402/490] fix : personnal font file within tcpdf

---
 .../includes/tecnickcom/tcpdf/fonts/robotob.z  | Bin 125898 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 htdocs/includes/tecnickcom/tcpdf/fonts/robotob.z

diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/robotob.z b/htdocs/includes/tecnickcom/tcpdf/fonts/robotob.z
deleted file mode 100644
index b13e72a2b10f81d7d3754dfb3823bb058e0368ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 125898
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
aEM-2XcssT{Y504fx>XWZ<r56?>;C{IBwoD$


From d80afa753619219a54dfcf4e284a6173a9dc78cd Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Sat, 23 May 2020 15:01:08 +0200
Subject: [PATCH 403/490] fix : personnal font file within tcpdf

---
 .../tecnickcom/tcpdf/fonts/robotolight.ctg.z     | Bin 1857 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 htdocs/includes/tecnickcom/tcpdf/fonts/robotolight.ctg.z

diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/robotolight.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/robotolight.ctg.z
deleted file mode 100644
index ec15f8b47840d50753db4a65bb6e714a69872aa6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1857
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
S?XIvPtYWj=6EXg^nDh%?H<;-F


From 6c15ff2ac1da9f73f03a45535679a46f44cd664d Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Sat, 23 May 2020 15:01:25 +0200
Subject: [PATCH 404/490] fix : personnal font file within tcpdf

---
 .../tecnickcom/tcpdf/fonts/robotolight.php    | 104 ------------------
 1 file changed, 104 deletions(-)
 delete mode 100644 htdocs/includes/tecnickcom/tcpdf/fonts/robotolight.php

diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/robotolight.php b/htdocs/includes/tecnickcom/tcpdf/fonts/robotolight.php
deleted file mode 100644
index 97c31de9150..00000000000
--- a/htdocs/includes/tecnickcom/tcpdf/fonts/robotolight.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='Roboto-Light';
-$desc=array('Ascent'=>928,'Descent'=>-244,'CapHeight'=>27,'Flags'=>32,'FontBBox'=>'[-734 -271 1138 1056]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
-$up=-98;
-$ut=49;
-$dw=600;
-$cw=array(
-0=>0,2=>0,13=>243,32=>243,33=>226,34=>287,35=>582,36=>554,37=>739,38=>615,
-39=>170,40=>319,41=>326,42=>424,43=>564,44=>191,45=>286,46=>239,47=>397,48=>554,
-49=>554,50=>554,51=>554,52=>554,53=>554,54=>554,55=>554,56=>554,57=>554,58=>210,
-59=>195,60=>511,61=>553,62=>518,63=>454,64=>913,65=>625,66=>613,67=>649,68=>655,
-69=>569,70=>563,71=>684,72=>708,73=>266,74=>550,75=>631,76=>527,77=>865,78=>710,
-79=>677,80=>616,81=>677,82=>635,83=>592,84=>597,85=>657,86=>617,87=>896,88=>612,
-89=>599,90=>598,91=>240,92=>394,93=>240,94=>416,95=>432,96=>286,97=>536,98=>554,
-99=>515,100=>556,101=>517,102=>331,103=>555,104=>549,105=>224,106=>228,107=>490,108=>224,
-109=>886,110=>549,111=>560,112=>554,113=>558,114=>336,115=>506,116=>321,117=>549,118=>481,
-119=>754,120=>486,121=>475,122=>486,123=>330,124=>221,125=>330,126=>685,8364=>554,1027=>552,
-8218=>172,402=>327,8222=>290,8230=>641,8224=>550,8225=>563,710=>430,8240=>976,352=>592,8249=>297,
-338=>934,1036=>631,381=>598,1039=>705,8216=>178,8217=>178,8220=>299,8221=>301,8226=>323,8211=>651,
-8212=>771,732=>435,8482=>617,353=>506,8250=>297,339=>924,1116=>518,382=>486,376=>599,160=>243,
-161=>221,162=>544,163=>571,164=>723,165=>516,166=>217,167=>605,168=>430,169=>799,170=>442,
-171=>456,172=>545,173=>286,174=>802,175=>427,176=>378,177=>530,178=>361,179=>361,180=>281,
-181=>557,182=>475,183=>246,184=>243,185=>361,186=>450,187=>453,188=>725,189=>756,190=>776,
-191=>459,192=>625,193=>625,194=>625,195=>625,196=>625,197=>625,198=>911,199=>649,200=>569,
-201=>569,202=>569,203=>569,204=>266,205=>266,206=>266,207=>266,208=>669,209=>710,210=>677,
-211=>677,212=>677,213=>677,214=>677,215=>523,216=>677,217=>657,218=>657,219=>657,220=>657,
-221=>599,222=>593,223=>586,224=>536,225=>536,226=>536,227=>536,228=>536,229=>536,230=>846,
-231=>515,232=>517,233=>517,234=>517,235=>517,236=>223,237=>223,238=>223,239=>223,240=>582,
-241=>549,242=>560,243=>560,244=>560,245=>560,246=>560,247=>568,248=>557,249=>549,250=>549,
-251=>549,252=>549,253=>475,254=>562,255=>475,256=>625,257=>536,258=>625,259=>536,260=>625,
-261=>536,262=>649,263=>515,264=>649,265=>515,266=>649,267=>515,268=>649,269=>515,270=>655,
-271=>629,272=>669,273=>572,274=>569,275=>517,276=>569,277=>517,278=>569,279=>517,280=>569,
-281=>517,282=>569,283=>517,284=>684,285=>555,286=>684,287=>555,288=>684,289=>555,290=>684,
-291=>555,292=>708,293=>549,294=>689,295=>563,296=>266,297=>223,298=>266,299=>223,300=>266,
-301=>223,302=>266,303=>224,304=>266,305=>223,306=>816,307=>452,308=>550,309=>229,310=>631,
-311=>490,312=>542,313=>527,314=>224,315=>527,316=>224,317=>527,318=>297,319=>527,320=>332,
-321=>528,322=>258,323=>710,324=>549,325=>710,326=>549,327=>710,328=>549,329=>549,330=>700,
-331=>557,332=>677,333=>560,334=>677,335=>560,336=>677,337=>560,340=>635,341=>336,342=>635,
-343=>336,344=>635,345=>336,346=>592,347=>506,348=>592,349=>506,350=>592,351=>506,354=>597,
-355=>321,356=>597,357=>341,358=>597,359=>321,360=>657,361=>549,362=>657,363=>549,364=>657,
-365=>549,366=>657,367=>549,368=>657,369=>549,370=>657,371=>549,372=>896,373=>754,374=>599,
-375=>475,377=>598,378=>486,379=>598,380=>486,383=>227,399=>700,416=>697,417=>560,431=>681,
-432=>586,496=>229,506=>625,507=>536,508=>911,509=>846,510=>677,511=>557,536=>592,537=>506,
-538=>597,539=>321,567=>229,601=>515,700=>178,711=>408,713=>427,728=>422,729=>224,730=>310,
-731=>250,733=>377,755=>304,768=>0,769=>0,771=>0,777=>0,783=>0,803=>0,900=>253,
-901=>479,902=>625,903=>246,904=>569,905=>708,906=>266,908=>687,910=>647,911=>665,912=>300,
-913=>625,914=>613,915=>552,916=>697,917=>569,918=>598,919=>708,920=>673,921=>266,922=>631,
-923=>648,924=>865,925=>710,926=>559,927=>677,928=>708,929=>616,931=>559,932=>597,933=>599,
-934=>715,935=>612,936=>694,937=>655,938=>266,939=>599,940=>563,941=>543,942=>557,943=>300,
-944=>535,945=>563,946=>592,947=>489,948=>557,949=>543,950=>492,951=>557,952=>573,953=>300,
-954=>542,955=>550,956=>557,957=>481,958=>491,959=>560,960=>595,961=>557,962=>535,963=>556,
-964=>511,965=>535,966=>686,967=>486,968=>684,969=>824,970=>300,971=>535,972=>560,973=>535,
-974=>824,977=>574,978=>536,982=>786,1024=>569,1025=>569,1026=>744,1028=>660,1029=>592,1030=>266,
-1031=>266,1032=>550,1033=>1055,1034=>1079,1035=>804,1037=>710,1038=>627,1040=>625,1041=>627,1042=>613,
-1043=>552,1044=>724,1045=>569,1046=>880,1047=>595,1048=>710,1049=>710,1050=>639,1051=>702,1052=>865,
-1053=>708,1054=>677,1055=>708,1056=>616,1057=>649,1058=>597,1059=>627,1060=>743,1061=>612,1062=>713,
-1063=>666,1064=>926,1065=>942,1066=>774,1067=>835,1068=>612,1069=>660,1070=>910,1071=>611,1072=>536,
-1073=>550,1074=>559,1075=>421,1076=>573,1077=>517,1078=>767,1079=>506,1080=>562,1081=>562,1082=>518,
-1083=>563,1084=>731,1085=>562,1086=>560,1087=>562,1088=>554,1089=>515,1090=>475,1091=>475,1092=>725,
-1093=>486,1094=>569,1095=>532,1096=>793,1097=>802,1098=>630,1099=>751,1100=>535,1101=>535,1102=>813,
-1103=>543,1104=>517,1105=>517,1106=>549,1107=>421,1108=>535,1109=>506,1110=>224,1111=>223,1112=>228,
-1113=>854,1114=>861,1115=>557,1117=>562,1118=>475,1119=>562,1120=>888,1121=>823,1122=>612,1123=>535,
-1124=>894,1125=>744,1126=>600,1127=>527,1128=>878,1129=>753,1130=>815,1131=>707,1132=>1081,1133=>927,
-1134=>515,1135=>484,1136=>694,1137=>684,1138=>673,1139=>565,1140=>616,1141=>493,1142=>616,1143=>493,
-1144=>1152,1145=>1035,1146=>673,1147=>557,1148=>883,1149=>798,1150=>888,1151=>823,1152=>633,1153=>523,
-1154=>610,1155=>0,1156=>0,1157=>0,1158=>0,1160=>0,1161=>0,1162=>712,1163=>572,1164=>612,
-1165=>535,1166=>632,1167=>564,1168=>548,1169=>438,1170=>552,1171=>421,1172=>577,1173=>498,1174=>915,
-1175=>776,1176=>595,1177=>506,1178=>668,1179=>560,1180=>613,1181=>540,1182=>648,1183=>501,1184=>808,
-1185=>660,1186=>707,1187=>567,1188=>1007,1189=>724,1190=>1020,1191=>852,1192=>743,1193=>594,1194=>649,
-1195=>515,1196=>597,1197=>475,1198=>599,1199=>489,1200=>599,1201=>489,1202=>621,1203=>494,1204=>868,
-1205=>653,1206=>665,1207=>537,1208=>663,1209=>550,1210=>663,1211=>549,1212=>755,1213=>590,1214=>755,
-1215=>590,1216=>266,1217=>880,1218=>767,1219=>613,1220=>527,1221=>706,1222=>572,1223=>705,1224=>557,
-1225=>711,1226=>571,1227=>666,1228=>532,1229=>867,1230=>741,1231=>266,1232=>625,1233=>536,1234=>625,
-1235=>536,1236=>911,1237=>846,1238=>569,1239=>517,1240=>700,1241=>515,1242=>700,1243=>515,1244=>880,
-1245=>767,1246=>595,1247=>506,1248=>576,1249=>576,1250=>710,1251=>562,1252=>710,1253=>562,1254=>677,
-1255=>560,1256=>673,1257=>565,1258=>673,1259=>565,1260=>660,1261=>535,1262=>627,1263=>475,1264=>627,
-1265=>475,1266=>627,1267=>475,1268=>666,1269=>532,1270=>552,1271=>421,1272=>835,1273=>751,1274=>569,
-1275=>441,1276=>626,1277=>499,1278=>612,1279=>486,1280=>573,1281=>556,1282=>781,1283=>859,1284=>790,
-1285=>644,1286=>533,1287=>501,1288=>967,1289=>805,1290=>974,1291=>826,1292=>618,1293=>512,1294=>707,
-1295=>638,1296=>660,1297=>543,1298=>707,1299=>573,7680=>625,7681=>536,7742=>865,7743=>886,7808=>896,
-7809=>754,7810=>896,7811=>754,7812=>896,7813=>754,7840=>625,7841=>536,7842=>625,7843=>536,7844=>625,
-7845=>536,7846=>625,7847=>536,7848=>625,7849=>536,7850=>625,7851=>536,7852=>625,7853=>536,7854=>625,
-7855=>536,7856=>625,7857=>536,7858=>625,7859=>536,7860=>625,7861=>536,7862=>625,7863=>536,7864=>569,
-7865=>517,7866=>569,7867=>517,7868=>569,7869=>517,7870=>569,7871=>517,7872=>569,7873=>517,7874=>569,
-7875=>517,7876=>569,7877=>517,7878=>569,7879=>517,7880=>266,7881=>223,7882=>266,7883=>224,7884=>677,
-7885=>560,7886=>677,7887=>560,7888=>677,7889=>560,7890=>677,7891=>560,7892=>677,7893=>560,7894=>677,
-7895=>560,7896=>677,7897=>560,7898=>697,7899=>560,7900=>697,7901=>560,7902=>697,7903=>560,7904=>697,
-7905=>560,7906=>697,7907=>560,7908=>657,7909=>549,7910=>657,7911=>549,7912=>681,7913=>586,7914=>681,
-7915=>586,7916=>681,7917=>586,7918=>681,7919=>586,7920=>681,7921=>586,7922=>599,7923=>475,7924=>599,
-7925=>475,7926=>599,7927=>475,7928=>599,7929=>475,8013=>711,8192=>510,8193=>1020,8194=>510,8195=>1020,
-8196=>340,8197=>255,8198=>170,8199=>562,8200=>273,8201=>204,8202=>102,8203=>0,8208=>282,8209=>282,
-8213=>771,8215=>453,8219=>178,8229=>454,8231=>169,8242=>170,8243=>287,8252=>451,8260=>448,8308=>361,
-8319=>421,8355=>563,8356=>571,8358=>769,8359=>818,8360=>1046,8361=>759,8362=>763,8363=>570,8369=>686,
-8377=>488,8378=>513,8380=>657,8381=>642,8453=>735,8467=>465,8470=>1020,8494=>634,8539=>765,8540=>857,
-8541=>846,8542=>802,8706=>571,8719=>657,8721=>577,8722=>570,8730=>546,8734=>1057,8747=>253,8776=>563,
-8800=>553,8804=>511,8805=>519,9674=>505,60929=>253,60930=>287,63171=>238,64257=>537,64258=>544,64259=>828,
-64260=>828,65279=>0,65532=>1022,65533=>1026);
-$enc='';
-$diff='';
-$file='robotolight.z';
-$ctg='robotolight.ctg.z';
-$originalsize=258624;
-// --- EOF ---
\ No newline at end of file

From af17781b2bc0ff703fd6012b0786e82a974ac741 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Sat, 23 May 2020 15:01:40 +0200
Subject: [PATCH 405/490] fix : personnal font file within tcpdf

---
 .../tecnickcom/tcpdf/fonts/robotolight.z       | Bin 128612 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 htdocs/includes/tecnickcom/tcpdf/fonts/robotolight.z

diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/robotolight.z b/htdocs/includes/tecnickcom/tcpdf/fonts/robotolight.z
deleted file mode 100644
index fc8ec949499aa28df72f318be8e014d9de0fd323..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 128612
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


From abe7472ee5827e81f6ef6843ed493be0bfd984f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 15:03:57 +0200
Subject: [PATCH 406/490] Update stocks.lang

---
 htdocs/langs/en_US/stocks.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 54b7389aaf5..603d3cf2c39 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -218,4 +218,4 @@ InventoryForASpecificWarehouse=Inventory for a specific warehouse
 InventoryForASpecificProduct=Inventory for a specific product
 StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
 ForceTo=Force to
-AlwaysShowFullArbo=Always display full tree on card link
\ No newline at end of file
+AlwaysShowFullArbo=Display full tree of emplacement on card link (Warning: This may decrease dramatically performances)

From 5bbbabf653ed1481bafc7ca6260436e1924a8f5e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 15:04:59 +0200
Subject: [PATCH 407/490] Update stocks.lang

---
 htdocs/langs/en_US/stocks.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 603d3cf2c39..68f75224a08 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -218,4 +218,4 @@ InventoryForASpecificWarehouse=Inventory for a specific warehouse
 InventoryForASpecificProduct=Inventory for a specific product
 StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
 ForceTo=Force to
-AlwaysShowFullArbo=Display full tree of emplacement on card link (Warning: This may decrease dramatically performances)
+AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)

From 7c92bb218e31a531dd66c7255d1e0f15539b88e4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 15:33:04 +0200
Subject: [PATCH 408/490] Fix no hreflang if not a canonical page

---
 htdocs/core/lib/website2.lib.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 776c535d586..cdad3fcced6 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -157,9 +157,14 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
 	$tplcontent .= '<meta name="description" content="'.dol_string_nohtmltag($objectpage->description, 0, 'UTF-8').'" />'."\n";
 	$tplcontent .= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.' '.DOL_VERSION.' (https://www.dolibarr.org)" />'."\n";
 	$tplcontent .= '<meta name="dolibarr:pageid" content="'.dol_string_nohtmltag($objectpage->id).'" />'."\n";
+	// Add canonical reference
+	if ($object->virtualhost) {
+		$tplcontent .= '<link rel="canonical" href="'.(($objectpage->id == $object->fk_default_home) ? '/' : (($shortlangcode != substr($object->lang, 0, 2) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php')).'" />'."\n";
+	}
 	// Add translation reference (main language)
 	if ($object->isMultiLang()) {
 		// Add myself
+		$tplcontent .= '<?php if ($_SERVER["PHP_SELF"] == "/'.$objectpage->pageurl.'.php") { ?>'."\n";
 		$tplcontent .= '<link rel="alternate" hreflang="'.$shortlangcode.'" href="'.(($object->fk_default_home == $objectpage->id) ? '/' : (($shortlangcode != substr($object->lang, 0, 2) ? '/'.$shortlangcode : '')).'/'.$objectpage->pageurl.'.php').'" />'."\n";
 
 		// Add page "translation of"
@@ -194,10 +199,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
 			}
 		}
 		else dol_print_error($db);
-	}
-	// Add canonical reference
-	if ($object->virtualhost) {
-		$tplcontent .= '<link rel="canonical" href="'.(($objectpage->id == $object->fk_default_home) ? '/' : (($shortlangcode != substr($object->lang, 0, 2) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php')).'" />'."\n";
+		$tplcontent .= '<?php } ?>'."\n";
 	}
 	// Add manifest.json on homepage
 	$tplcontent .= '<?php if ($website->use_manifest) { print \'<link rel="manifest" href="/manifest.json.php" />\'."\n"; } ?>'."\n";

From 748a120b71848e84d97782b149dacfbb14075f31 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 15:50:15 +0200
Subject: [PATCH 409/490] Show button for categories if module is enabled

---
 htdocs/website/index.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index ed2801c2820..969c56dde8c 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2273,7 +2273,11 @@ if (!GETPOST('hide_websitemenu'))
 		*/
 
 		print '<a href="'.$_SERVER["PHP_SEFL"].'?action=replacesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("ReplaceWebsiteContent")).'"><span class="fa fa-search"><span></a>';
-		print '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=website&type=website_page&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("Categories")).'"><span class="fa fa-tags"><span></a>';
+
+		if (! empty($conf->categorie->enabled)) {
+			print '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=website&type=website_page&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("Categories")).'"><span class="fa fa-tags"><span></a>';
+		}
+
 		if (! empty($conf->global->WEBSITE_ADD_REGENERATE_BUTTON)) {
 			print '<a href="'.$_SERVER["PHP_SEFL"].'?action=regeneratesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("RegenerateWebsiteContent")).'"><span class="fa fa-cogs"><span></a>';
 		}

From efa4ffa32612eeacb76efcd11ba9a5bd4c615fc8 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Sat, 23 May 2020 16:46:42 +0200
Subject: [PATCH 410/490] Fix ref_int deprecation. Add to changelog and allow
 to use ref_ext for shipments.

---
 ChangeLog                                    | 1 +
 htdocs/expedition/class/expedition.class.php | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 20a1748af6b..ffb51bd26c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -104,6 +104,7 @@ Following changes may create regressions for some external modules, but were nec
   by a "_" automatically when a reference (with a custom numbering mask that use it) is generated.  
 * Library jflot (replace with chartjs) and geoip (replaced with geoip2) were removed.  
 * Hidden constant COMMANDE_VALID_AFTER_CLOSE_PROPAL were renamed into ORDER_VALID_AFTER_CLOSE_PROPAL.
+* Object field ref_int is deprecated and set to not used, object fetch by only ref_int is not supported anymore.
 
 
 ***** ChangeLog for 11.0.3 compared to 11.0.2 *****
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 1ccfe9944f7..b6cb00ec091 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -296,6 +296,7 @@ class Expedition extends CommonObject
 		$sql .= ", entity";
 		$sql .= ", ref_customer";
 		$sql .= ", ref_int";
+		$sql .= ", ref_ext";
 		$sql .= ", date_creation";
 		$sql .= ", fk_user_author";
 		$sql .= ", date_expedition";
@@ -320,6 +321,7 @@ class Expedition extends CommonObject
 		$sql .= ", ".$conf->entity;
 		$sql .= ", ".($this->ref_customer ? "'".$this->db->escape($this->ref_customer)."'" : "null");
 		$sql .= ", ".($this->ref_int ? "'".$this->db->escape($this->ref_int)."'" : "null");
+		$sql .= ", ".($this->ref_ext ? "'".$this->db->escape($this->ref_ext)."'" : "null");
 		$sql .= ", '".$this->db->idate($now)."'";
 		$sql .= ", ".$user->id;
 		$sql .= ", ".($this->date_expedition > 0 ? "'".$this->db->idate($this->date_expedition)."'" : "null");
@@ -1111,6 +1113,7 @@ class Expedition extends CommonObject
 
 		$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
 		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
+		$sql .= " ref_ext=".(isset($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null").",";
 		$sql .= " ref_customer=".(isset($this->ref_customer) ? "'".$this->db->escape($this->ref_customer)."'" : "null").",";
 		$sql .= " fk_soc=".(isset($this->socid) ? $this->socid : "null").",";
 		$sql .= " date_creation=".(dol_strlen($this->date_creation) != 0 ? "'".$this->db->idate($this->date_creation)."'" : 'null').",";

From 64f72daa7e46ab1a037457bbb8de0d4a67fc6ae0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 17:01:22 +0200
Subject: [PATCH 411/490] Fix hreflang if canonical page

---
 htdocs/core/lib/website2.lib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index cdad3fcced6..de5bb6d0ddd 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -164,8 +164,8 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
 	// Add translation reference (main language)
 	if ($object->isMultiLang()) {
 		// Add myself
-		$tplcontent .= '<?php if ($_SERVER["PHP_SELF"] == "/'.$objectpage->pageurl.'.php") { ?>'."\n";
-		$tplcontent .= '<link rel="alternate" hreflang="'.$shortlangcode.'" href="'.(($object->fk_default_home == $objectpage->id) ? '/' : (($shortlangcode != substr($object->lang, 0, 2) ? '/'.$shortlangcode : '')).'/'.$objectpage->pageurl.'.php').'" />'."\n";
+		$tplcontent .= '<?php if ($_SERVER["PHP_SELF"] == "'.(($object->fk_default_home == $objectpage->id) ? '/' : (($shortlangcode != substr($object->lang, 0, 2)) ? '/'.$shortlangcode : '')).'/'.$objectpage->pageurl.'.php") { ?>'."\n";
+		$tplcontent .= '<link rel="alternate" hreflang="'.$shortlangcode.'" href="'.(($object->fk_default_home == $objectpage->id) ? '/' : (($shortlangcode != substr($object->lang, 0, 2)) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php').'" />'."\n";
 
 		// Add page "translation of"
 		$translationof = $objectpage->fk_page;
@@ -176,7 +176,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
 				$tmpshortlangcode = '';
 				if ($tmppage->lang) $tmpshortlangcode = preg_replace('/[_-].*$/', '', $tmppage->lang); // en_US or en-US -> en
 				if ($tmpshortlangcode != $shortlangcode) {
-					$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="'.($object->fk_default_home == $tmppage->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2) ? '/'.$tmpshortlangcode : '')).'/'.$tmppage->pageurl.'.php').'" />'."\n";
+					$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="'.($object->fk_default_home == $tmppage->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2)) ? '/'.$tmpshortlangcode : '').'/'.$tmppage->pageurl.'.php').'" />'."\n";
 				}
 			}
 		}

From 66637ba0b67f6a563b96014d51f6a401820f5d0e Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 23 May 2020 16:39:06 +0000
Subject: [PATCH 412/490] Fixing style errors.

---
 htdocs/comm/action/class/actioncomm.class.php |  3 +--
 htdocs/comm/action/list.php                   |  4 ++--
 htdocs/fourn/commande/dispatch.php            | 24 +++++++------------
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 2abc2fa5798..bb1da4d852a 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1996,8 +1996,7 @@ class ActionComm extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
 			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index f2197c0d06d..467275d5fc0 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -210,12 +210,12 @@ if (empty($reshook) && !empty($massaction))
 			break;
 	}
 
-	if(isset($percent))
+	if (isset($percent))
 	{
 		foreach ($toselect as $toselectid)
 		{
 			$result = $object->updatePercent($toselectid, $percent);
-			if($result < 0)
+			if ($result < 0)
 			{
 				dol_print_error($db);
 				break;
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 7f99b2697af..06005febfe4 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -389,8 +389,7 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fourn
 		$errors = $object->errors;
 		$error++;
 	}
-	else
-	{
+	else {
 		// If module stock is enabled and the stock increase is done on purchase order dispatching
 		if ($entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
 		{
@@ -412,8 +411,7 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fourn
 		$db->rollback();
 		setEventMessages($error, $errors, 'errors');
 	}
-	else
-	{
+	else {
 		$db->commit();
 	}
 }
@@ -446,8 +444,7 @@ if ($action == 'updateline' && $user->rights->fournisseur->commande->receptionne
 		$error++;
 		$errors=$supplierorderdispatch->errors;
 	}
-	else
-	{
+	else {
 		// If module stock is enabled and the stock increase is done on purchase order dispatching
 		if ($entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
 		{
@@ -461,8 +458,7 @@ if ($action == 'updateline' && $user->rights->fournisseur->commande->receptionne
 					$errors=$mouv->errors;
 					$error++;
 				}
-				else
-				{
+				else {
 					$mouv->origin = &$object;
 					$result=$mouv->reception($user, $product, $supplierorderdispatch->fk_entrepot, $supplierorderdispatch->qty, $price, $comment, $eatby, $sellby, $batch);
 					if ($result < 0)
@@ -479,8 +475,7 @@ if ($action == 'updateline' && $user->rights->fournisseur->commande->receptionne
 		$db->rollback();
 		setEventMessages($error, $errors, 'errors');
 	}
-	else
-	{
+	else {
 		$db->commit();
 	}
 }
@@ -1151,8 +1146,7 @@ if ($id > 0 || !empty($ref)) {
 				{
 					print '<input style="width: 50px;" type="number" min="1" name="qty" value="' . $objp->qty . '" />';
 				}
-				else
-				{
+				else {
 					print $objp->qty;
 				}
 				print '<input type="hidden" name="price" value="'.$objp->subprice.'" />';
@@ -1171,8 +1165,7 @@ if ($id > 0 || !empty($ref)) {
 						print $langs->trans("ErrorNoWarehouseDefined");
 					}
 				}
-				else
-				{
+				else {
 					$warehouse_static->id = $objp->warehouse_id;
 					$warehouse_static->libelle = $objp->entrepot;
 					print $warehouse_static->getNomUrl(1);
@@ -1241,8 +1234,7 @@ if ($id > 0 || !empty($ref)) {
 					print '</a>';
 					print '</td>';
 				}
-				else
-				{
+				else {
 					print '<td class="center valignmiddle">';
 					print '<input type="submit" class="button" id="savelinebutton" name="save" value="'.$langs->trans("Save").'" />';
 					print '</td>';

From 6522bb70fdfd8d235e271165bb4703773557638b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 23 May 2020 19:06:01 +0200
Subject: [PATCH 413/490] fix merge

---
 htdocs/takepos/phone.php | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 1245a146e30..e1e10c5c172 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -107,11 +107,7 @@ if ($action == "productinfo") {
 			print '<button type="button" class="publicphonebutton2 phoneblue width24" onclick="SetNote(place, '.$selectedline.');">'.$langs->trans('Note').'</button>';
         }
     }
-<<<<<<< HEAD
 } else {
-=======
-}
-else {
 	// Title
 	$title = 'TakePOS - Dolibarr '.DOL_VERSION;
 	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
@@ -121,7 +117,6 @@ else {
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
 	$arrayofcss = array('/takepos/css/phone.css');
 	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
->>>>>>> upstream/develop
 	?>
 <script language="javascript">
 	<?php
@@ -185,7 +180,8 @@ function LoadPlace(placeid){
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&place="+place, function() {
 		});';
-	} else {
+	}
+	else {
 		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&place="+place, function() {
 		});';
 	}
@@ -200,7 +196,8 @@ function AddProduct(placeid, productid){
 		print 'place=placeid;
 		$("#phonediv1").load("auto_order.php?action=productinfo&place="+place+"&idproduct="+productid, function() {
 		});';
-	} else {
+	}
+	else {
 		print 'AddProductConfirm(placeid, productid);';
 	}
 	?>
@@ -217,7 +214,8 @@ function AddProductConfirm(placeid, productid){
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
 		});';
-	} else {
+	}
+	else {
 		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
 		});';
 	}
@@ -248,7 +246,8 @@ function LoadCats(){
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv1").load("auto_order.php?mobilepage=cats&place="+place, function() {
 		});';
-	} else {
+	}
+	else {
 		echo '$("#phonediv1").load("invoice.php?mobilepage=cats&place="+place, function() {
 		});';
 	}
@@ -261,7 +260,8 @@ function LoadProducts(idcat){
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv1").load("auto_order.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
 		});';
-	} else {
+	}
+	else {
 		echo '$("#phonediv1").load("invoice.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
 		});';
 	}
@@ -281,7 +281,8 @@ function TakeposPrintingOrder(){
 		});';
 		echo '$("#phonediv1").load("auto_order.php?action=publicpayment&place="+place, function() {
 		});';
-	} else {
+	}
+	else {
 		echo '$("#phonediv2").load("invoice.php?action=order&place="+place, function() {
 		});';
 	}
@@ -316,18 +317,11 @@ function CheckPlease(){
 			print '<button type="button" class="phonebutton" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 3)).'</button>';
 			print '<button type="button" class="phonebutton" onclick="TakeposPrintingOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 3)).'</button>';
 			print '<button type="button" class="phonebutton" onclick="Exit();">'.strtoupper(substr($langs->trans('Logout'), 0, 3)).'</button>';
-<<<<<<< HEAD
-		} else {
-			print '<button type="button" class="publicphonebutton" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 5)).'</button>';
-			print '<button type="button" class="publicphonebutton" onclick="TakeposPrintingOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 5)).'</button>';
-			print '<button type="button" class="publicphonebutton" onclick="CheckPlease();">'.strtoupper(substr($langs->trans('Payment'), 0, 5)).'</button>';
-=======
 		}
 		else {
 			print '<button type="button" class="publicphonebutton phoneblue" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 5)).'</button>';
 			print '<button type="button" class="publicphonebutton phoneorange" onclick="PublicPreOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 5)).'</button>';
 			print '<button type="button" class="publicphonebutton phonegreen" onclick="CheckPlease();">'.strtoupper(substr($langs->trans('Payment'), 0, 5)).'</button>';
->>>>>>> upstream/develop
 		}
 		?>
 	</div>

From 173662e98ce7ef456f246bfc67fa98c38734b0d7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 19:14:05 +0200
Subject: [PATCH 414/490] Update lines.php

---
 htdocs/accountancy/customer/lines.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 0bbb8800425..487687b8d08 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -394,7 +394,7 @@ if ($result) {
 		print '<td>';
 		if ($productstatic->id > 0) print $productstatic->getNomUrl(1);
 		if ($productstatic->id > 0 && $objp->product_label) print '<br>';
-		if ($objp->product_label) print $objp->product_label;
+		if ($objp->product_label) print '<span class="opacitymedium">'.$objp->product_label.'</span>;
 		print '</td>';
 
 		print '<td class="tdoverflowonsmartphone">';

From 6c3a2389810616caea8bb07db2540f679df1e34c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 19:14:33 +0200
Subject: [PATCH 415/490] Update lines.php

---
 htdocs/accountancy/customer/lines.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 487687b8d08..38c3323201d 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -394,7 +394,7 @@ if ($result) {
 		print '<td>';
 		if ($productstatic->id > 0) print $productstatic->getNomUrl(1);
 		if ($productstatic->id > 0 && $objp->product_label) print '<br>';
-		if ($objp->product_label) print '<span class="opacitymedium">'.$objp->product_label.'</span>;
+		if ($objp->product_label) print '<span class="opacitymedium">'.$objp->product_label.'</span>';
 		print '</td>';
 
 		print '<td class="tdoverflowonsmartphone">';

From 2ccd6c1e9a820b765b7c182ca664cd35cf0a4004 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 19:16:37 +0200
Subject: [PATCH 416/490] Update lines.php

---
 htdocs/accountancy/customer/lines.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 38c3323201d..af98dc14653 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -325,7 +325,7 @@ if ($result) {
 	//print '<input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '">';
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tvaintra" value="'.dol_escape_htmltag($search_tvaintra).'"></td>';
-	print '<td class="liste_titre center"><input type="text" class="flat maxwidth100" name="search_account" value="'.dol_escape_htmltag($search_account).'"></td>';
+	print '<td class="liste_titre center"><input type="text" class="flat maxwidth50" name="search_account" value="'.dol_escape_htmltag($search_account).'"></td>';
 	print '<td class="liste_titre center">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;

From e086cdcf2a547775f114a642e548d2b1858da220 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 19:17:09 +0200
Subject: [PATCH 417/490] Update lines.php

---
 htdocs/accountancy/expensereport/lines.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 1940d382737..7ffbb9518f8 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -277,7 +277,7 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="'.dol_escape_htmltag($search_desc).'"></td>';
 	print '<td class="liste_titre right"><input type="text" class="flat maxwidth50" name="search_amount" value="'.dol_escape_htmltag($search_amount).'"></td>';
 	print '<td class="liste_titre center"><input type="text" class="flat maxwidth50" name="search_vat" size="1" placeholder="%" value="'.dol_escape_htmltag($search_vat).'"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_account" value="'.dol_escape_htmltag($search_account).'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_account" value="'.dol_escape_htmltag($search_account).'"></td>';
     print '<td class="liste_titre right">';
     $searchpicto = $form->showFilterButtons();
     print $searchpicto;

From 558a441b41b70ca7fc6483e87c90128697bf5de7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 19:18:13 +0200
Subject: [PATCH 418/490] Update lines.php

---
 htdocs/accountancy/supplier/lines.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index b1978079871..d354cdf1e80 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -327,7 +327,7 @@ if ($result) {
 	//	print '<input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '">';
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tvaintra" value="'.dol_escape_htmltag($search_tvaintra).'"></td>';
-	print '<td class="liste_titre center"><input type="text" class="flat maxwidth100" name="search_account" value="'.dol_escape_htmltag($search_account).'"></td>';
+	print '<td class="liste_titre center"><input type="text" class="flat maxwidth50" name="search_account" value="'.dol_escape_htmltag($search_account).'"></td>';
 	print '<td class="liste_titre center">';
     $searchpicto = $form->showFilterButtons();
     print $searchpicto;

From 1ed3b385fa13a456fa8be90a08177898a1f82c9e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 19:19:28 +0200
Subject: [PATCH 419/490] Update lines.php

---
 htdocs/accountancy/supplier/lines.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index d354cdf1e80..42628e08031 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -432,7 +432,7 @@ if ($result) {
 
 		print '<td class="center">';
         print $accountingaccountstatic->getNomUrl(0, 1, 1, '', 1);
-		print ' <a href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
+		print ' <a class="editfielda" href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
 		print img_edit();
 		print '</a></td>';
 		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="'.$objp->rowid.'"/></td>';

From d6470519eb1ada1f0588996a77d4f1cf066e4d08 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 19:21:03 +0200
Subject: [PATCH 420/490] Update list.php

---
 htdocs/accountancy/expensereport/list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 7f6885e1b62..c4695ce01fe 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -251,8 +251,8 @@ if ($result) {
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
 	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
     if ($search_login)       $param .= '&search_login='.urlencode($search_login);
 	if ($search_lineid)      $param .= '&search_lineid='.urlencode($search_lineid);
 	if ($search_day)         $param .= '&search_day='.urlencode($search_day);

From 127534ef55939dc4fa5e2570b5815fcb117f6589 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 20:09:31 +0200
Subject: [PATCH 421/490] Fix common var name seems to be $objref for subdir of
 doc

---
 htdocs/comm/propal/card.php            |  4 ++--
 htdocs/commande/card.php               |  8 ++++----
 htdocs/fourn/commande/card.php         | 10 +++++-----
 htdocs/website/websiteaccount_card.php |  8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index bd5430c440a..28fdc7845d2 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2596,13 +2596,13 @@ if ($action == 'create')
 		/*
 		 * Documents generes
 		 */
-		$filename = dol_sanitizeFileName($object->ref);
+		$objref = dol_sanitizeFileName($object->ref);
 		$filedir = $conf->propal->multidir_output[$object->entity]."/".dol_sanitizeFileName($object->ref);
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 		$genallowed = $usercanread;
 		$delallowed = $usercancreate;
 
-		print $formfile->showdocuments('propal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang, '', $object);
+		print $formfile->showdocuments('propal', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang, '', $object);
 
 		// Show links to link elements
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('propal'));
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 4764b53a5c9..21f558219eb 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2688,13 +2688,13 @@ if ($action == 'create' && $usercancreate)
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 			print '<a name="builddoc"></a>'; // ancre
 			// Documents
-			$comref = dol_sanitizeFileName($object->ref);
-			$relativepath = $comref.'/'.$comref.'.pdf';
-			$filedir = $conf->commande->multidir_output[$object->entity].'/'.$comref;
+			$objref = dol_sanitizeFileName($object->ref);
+			$relativepath = $objref.'/'.$objref.'.pdf';
+			$filedir = $conf->commande->multidir_output[$object->entity].'/'.$objref;
 			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 			$genallowed = $usercanread;
 			$delallowed = $usercancreate;
-			print $formfile->showdocuments('commande', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang, '', $object);
+			print $formfile->showdocuments('commande', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang, '', $object);
 
 
 			// Show links to link elements
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 0cd823304ee..71ed66ffc09 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2625,15 +2625,15 @@ elseif (!empty($object->id))
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 
 			// Generated documents
-			$comfournref = dol_sanitizeFileName($object->ref);
-			$file = $conf->fournisseur->dir_output.'/commande/'.$comfournref.'/'.$comfournref.'.pdf';
-			$relativepath = $comfournref.'/'.$comfournref.'.pdf';
-			$filedir = $conf->fournisseur->dir_output.'/commande/'.$comfournref;
+			$objref = dol_sanitizeFileName($object->ref);
+			$file = $conf->fournisseur->dir_output.'/commande/'.$objref.'/'.$objref.'.pdf';
+			$relativepath = $objref.'/'.$objref.'.pdf';
+			$filedir = $conf->fournisseur->dir_output.'/commande/'.$objref;
 			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 			$genallowed = $user->rights->fournisseur->commande->lire;
 			$delallowed = $user->rights->fournisseur->commande->creer;
 
-			print $formfile->showdocuments('commande_fournisseur', $comfournref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 0, 0, '', '', '', $object->thirdparty->default_lang);
+			print $formfile->showdocuments('commande_fournisseur', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 0, 0, '', '', '', $object->thirdparty->default_lang);
 			$somethingshown = $formfile->numoffiles;
 
 			// Show links to link elements
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index be0c4c3cc41..54accb48fd3 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -349,13 +349,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    print '<a name="builddoc"></a>'; // ancre
 
 	    // Documents
-	    /*$comref = dol_sanitizeFileName($object->ref);
-	    $relativepath = $comref . '/' . $comref . '.pdf';
-	    $filedir = $conf->website->dir_output . '/' . $comref;
+	    /*$objref = dol_sanitizeFileName($object->ref);
+	    $relativepath = $objref . '/' . $objref . '.pdf';
+	    $filedir = $conf->website->dir_output . '/' . $objref;
 	    $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
 	    $genallowed = $user->rights->website->read;	// If you can read, you can build the PDF to read content
 	    $delallowed = $user->rights->website->create;	// If you can create/edit, you can remove a file on card
-	    print $formfile->showdocuments('website', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+	    print $formfile->showdocuments('website', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
 		*/
 
 	    // Show links to link elements

From 40777cbcd989b1b3cd2909e9f7f78fed15fb672e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 20:11:10 +0200
Subject: [PATCH 422/490] Fix phpcs

---
 htdocs/fourn/commande/dispatch.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 088cff61ee6..0f6efeb8943 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -711,7 +711,6 @@ if ($id > 0 || !empty($ref)) {
 			$i = 0;
 
 			if ($num) {
-
 				print '<tr class="liste_titre">';
 
 				print '<td>'.$langs->trans("Description").'</td>';

From 024e62a58274718d2a0a02c6cc1e1739044755cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 20:27:25 +0200
Subject: [PATCH 423/490] Fix navigation

---
 htdocs/product/stock/movement_card.php | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index 03171fbeac5..ea72983e810 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2006  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2020	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2014	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018		Ferran Marcet			<fmarcet@2byte.es>
@@ -502,21 +502,10 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
     }
 }
 
-if (empty($search_inventorycode))
-{
-	$sql .= $db->plimit($limit + 1, $offset);
-}
-else
-{
-	$limit = 0;
-}
-
 //print $sql;
 
 $resql = $db->query($sql);
 
-if (!empty($search_inventorycode)) $limit = $db->num_rows($resql);
-
 if ($resql)
 {
 	$product = new Product($db);
@@ -952,7 +941,6 @@ if ($resql)
 
 
     $arrayofuniqueproduct = array();
-
     while ($i < ($limit ? min($num, $limit) : $num)) {
         $objp = $db->fetch_object($resql);
 

From 174ddc5fd49fa219ea9bf48496b06facb59f2b91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 23 May 2020 21:07:47 +0200
Subject: [PATCH 424/490] prepare new rule

---
 htdocs/admin/propal.php                       |  51 ++--
 htdocs/comm/action/class/actioncomm.class.php |   3 +-
 htdocs/comm/action/index.php                  |   6 +-
 htdocs/comm/action/peruser.php                |   3 +-
 htdocs/comm/mailing/card.php                  |   6 +-
 htdocs/comm/propal/card.php                   | 118 +++------
 htdocs/comm/propal/class/propal.class.php     |   3 +-
 htdocs/comm/propal/contact.php                |   8 +-
 htdocs/compta/bank/bankentries_list.php       |   3 +-
 htdocs/compta/bank/card.php                   |   3 +-
 htdocs/compta/deplacement/card.php            |  12 +-
 htdocs/compta/facture/card-rec.php            |  48 ++--
 htdocs/compta/facture/card.php                |  85 ++-----
 htdocs/compta/facture/contact.php             |   8 +-
 htdocs/compta/paiement/cheque/card.php        |   4 +-
 htdocs/core/lib/files.lib.php                 | 239 +++++-------------
 htdocs/core/lib/functions.lib.php             |  30 +--
 htdocs/core/lib/functions2.lib.php            |   6 +-
 htdocs/core/lib/memory.lib.php                |   6 +-
 htdocs/core/lib/security.lib.php              |  18 +-
 htdocs/core/lib/website2.lib.php              |   3 +-
 htdocs/fourn/commande/dispatch.php            |  10 +-
 htdocs/fourn/facture/card.php                 |   6 +-
 htdocs/main.inc.php                           |  20 +-
 htdocs/product/card.php                       |   5 +-
 htdocs/product/class/product.class.php        |  31 +--
 26 files changed, 223 insertions(+), 512 deletions(-)

diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 9cde0e81e56..4855a164412 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -52,8 +52,7 @@ $type = 'propal';
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 $error = 0;
-if ($action == 'updateMask')
-{
+if ($action == 'updateMask') {
 	$maskconstpropal = GETPOST('maskconstpropal', 'alpha');
 	$maskpropal = GETPOST('maskpropal', 'alpha');
 	if ($maskconstpropal) $res = dolibarr_set_const($db, $maskconstpropal, $maskpropal, 'chaine', 0, '', $conf->entity);
@@ -66,8 +65,7 @@ if ($action == 'updateMask')
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'specimen')
-{
+} elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
 
 	$propal = new Propal($db);
@@ -87,8 +85,7 @@ if ($action == 'updateMask')
 		}
 	}
 
-	if ($filefound)
-	{
+	if ($filefound) {
 		require_once $file;
 
 		$module = new $classname($db);
@@ -105,8 +102,7 @@ if ($action == 'updateMask')
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
-} elseif ($action == 'setribchq')
-{
+} elseif ($action == 'setribchq') {
 	$rib = GETPOST('rib', 'alpha');
 	$chq = GETPOST('chq', 'alpha');
 
@@ -121,8 +117,7 @@ if ($action == 'updateMask')
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'set_PROPALE_DRAFT_WATERMARK')
-{
+} elseif ($action == 'set_PROPALE_DRAFT_WATERMARK') {
 	$draft = GETPOST('PROPALE_DRAFT_WATERMARK', 'alpha');
 
 	$res = dolibarr_set_const($db, "PROPALE_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
@@ -134,8 +129,7 @@ if ($action == 'updateMask')
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'set_PROPOSAL_FREE_TEXT')
-{
+} elseif ($action == 'set_PROPOSAL_FREE_TEXT') {
 	$freetext = GETPOST('PROPOSAL_FREE_TEXT', 'none'); // No alpha here, we want exact string
 
 	$res = dolibarr_set_const($db, "PROPOSAL_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
@@ -148,8 +142,7 @@ if ($action == 'updateMask')
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'setdefaultduration')
-{
+} elseif ($action == 'setdefaultduration') {
 	$res = dolibarr_set_const($db, "PROPALE_VALIDITY_DURATION", $value, 'chaine', 0, '', $conf->entity);
 
 	if (!$res > 0) $error++;
@@ -160,45 +153,35 @@ if ($action == 'updateMask')
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL')
-{
+} elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') {
     $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL", $value, 'chaine', 0, '', $conf->entity);
 
     if (!$res > 0) $error++;
 
-    if (!$error)
-    {
+    if (!$error) {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-// Activate a model
-elseif ($action == 'set')
-{
+} elseif ($action == 'set') {
+	// Activate a model
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-} elseif ($action == 'del')
-{
+} elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
+	if ($ret > 0) {
         if ($conf->global->PROPALE_ADDON_PDF == "$value") dolibarr_del_const($db, 'PROPALE_ADDON_PDF', $conf->entity);
 	}
-} elseif ($action == 'setdoc')
-{
-    if (dolibarr_set_const($db, "PROPALE_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
-	{
+} elseif ($action == 'setdoc') {
+    if (dolibarr_set_const($db, "PROPALE_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity)) {
 		$conf->global->PROPALE_ADDON_PDF = $value;
 	}
 
 	// On active le modele
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
+	if ($ret > 0) {
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-} elseif ($action == 'setmod')
-{
+} elseif ($action == 'setmod') {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index bb1da4d852a..2cda34a494b 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1995,8 +1995,7 @@ class ActionComm extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index b83a374d1a3..8b852689b99 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1137,8 +1137,7 @@ if (empty($action) || $action == 'show_month')      // View by month
                 echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
                 show_day_events($db, $max_day_in_prev_month + $tmpday, $prev_month, $prev_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
                 echo "  </td>\n";
-            }
-            /* Show days of the current month */
+            } /* Show days of the current month */
             elseif ($tmpday <= $max_day_in_month)
             {
                 $curtime = dol_mktime(0, 0, 0, $month, $tmpday, $year);
@@ -1152,8 +1151,7 @@ if (empty($action) || $action == 'show_month')      // View by month
                 echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
                 show_day_events($db, $tmpday, $month, $year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
                 echo "  </td>\n";
-            }
-            /* Show days after the current month (next month) */
+            } /* Show days after the current month (next month) */
             else {
                 $style = 'cal_other_month';
                 if ($iter_day == 6) $style .= ' cal_other_month_right';
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index dfb756dd227..f76503ddc2b 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -700,8 +700,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 				}
 		    }
 		}
-	}
-	/* Use this list to have for all users */
+	} /* Use this list to have for all users */
 	else {
 		$sql = "SELECT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";
 		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index fff6140a2aa..ea81c4e35b9 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -764,13 +764,11 @@ if ($action == 'create')
 		if ($action == 'valid')
 		{
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ValidMailing"), $langs->trans("ConfirmValidMailing"), "confirm_valid", '', '', 1);
-		}
-		// Confirm reset
+		} // Confirm reset
 		elseif ($action == 'reset')
 		{
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ResetMailing"), $langs->trans("ConfirmResetMailing", $object->ref), "confirm_reset", '', '', 2);
-		}
-		// Confirm delete
+		} // Confirm delete
 		elseif ($action == 'delete')
 		{
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.(!empty($urlfrom) ? '&urlfrom='.urlencode($urlfrom) : ''), $langs->trans("DeleteAMailing"), $langs->trans("ConfirmDeleteMailing"), "confirm_delete", '', '', 1);
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index a2d27943c89..ae2eeda82ef 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -202,9 +202,7 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	// Delete proposal
+	} // Delete proposal
 	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete)
 	{
 		$result = $object->delete($user);
@@ -215,9 +213,7 @@ if (empty($reshook))
 			$langs->load("errors");
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// Remove line
+	} // Remove line
 	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate)
 	{
 		$result = $object->deleteline($lineid);
@@ -239,9 +235,7 @@ if (empty($reshook))
 
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit();
-	}
-
-	// Validation
+	} // Validation
 	elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)
 	{
 		$result = $object->valid($user);
@@ -291,9 +285,7 @@ if (empty($reshook))
 		$result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['date_livraisonmonth'], $_POST['date_livraisonday'], $_POST['date_livraisonyear']));
 		if ($result < 0)
 			dol_print_error($db, $object->error);
-	}
-
-	// Positionne ref client
+	} // Positionne ref client
 	elseif ($action == 'setref_client' && $usercancreate)
 	{
 		$result = $object->set_ref_client($user, GETPOST('ref_client'));
@@ -301,15 +293,11 @@ if (empty($reshook))
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// Set incoterm
+	} // Set incoterm
 	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled) && $usercancreate)
 	{
 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
-	}
-
-	// Create proposal
+	} // Create proposal
 	elseif ($action == 'add' && $usercancreate)
 	{
 		$object->socid = $socid;
@@ -543,7 +531,7 @@ if (empty($reshook))
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
 					}
-				} 			// Standard creation
+				} // Standard creation
 				else {
 					$id = $object->create($user);
 				}
@@ -606,9 +594,7 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	// Classify billed
+	} // Classify billed
 	elseif ($action == 'classifybilled' && $usercanclose)
 	{
 		$db->begin();
@@ -626,9 +612,7 @@ if (empty($reshook))
 		} else {
 			$db->rollback();
 		}
-	}
-
-	// Close proposal
+	} // Close proposal
 	elseif ($action == 'setstatut' && $usercanclose && !GETPOST('cancel', 'alpha')) {
 		if (!(GETPOST('statut', 'int') > 0)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CloseAs")), null, 'errors');
@@ -654,9 +638,7 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	// Reopen proposal
+	} // Reopen proposal
 	elseif ($action == 'confirm_reopen' && $usercanclose && !GETPOST('cancel', 'alpha')) {
 		// prevent browser refresh from reopening proposal several times
 		if ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED)
@@ -677,9 +659,7 @@ if (empty($reshook))
 				$db->rollback();
 			}
 		}
-	}
-
-	// add lines from objectlinked
+	} // add lines from objectlinked
 	elseif ($action == 'import_lines_from_object'
 	    && $user->rights->propal->creer
 	    && $object->statut == Propal::STATUS_DRAFT
@@ -795,9 +775,7 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	// Add line
+	} // Add line
 	elseif ($action == 'addline' && $usercancreate) {
 		// Set if we used free entry or predefined product
 		$predef = '';
@@ -901,8 +879,7 @@ if (empty($reshook))
 					    if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
 					    if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
 					}
-				}
-				// If price per customer
+				} // If price per customer
 				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
 					require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
@@ -924,8 +901,7 @@ if (empty($reshook))
 							if (empty($tva_tx)) $tva_npr = 0;
 						}
 					}
-				}
-				// If price per quantity
+				} // If price per quantity
 				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
 				{
 					if ($prod->prices_by_qty[0])	// yes, this product has some prices per quantity
@@ -948,8 +924,7 @@ if (empty($reshook))
 							break;
 						}
 					}
-				}
-				// If price per quantity and customer
+				} // If price per quantity and customer
 				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
 				{
 					if ($prod->prices_by_qty[$object->thirdparty->price_level]) // yes, this product has some prices per quantity
@@ -981,8 +956,7 @@ if (empty($reshook))
 				if (!empty($price_ht)) {
 					$pu_ht = price2num($price_ht, 'MU');
 					$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
-				}
-				// On reevalue prix selon taux tva car taux tva transaction peut etre different
+				} // On reevalue prix selon taux tva car taux tva transaction peut etre different
 				// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
 				elseif ($tmpvat != $tmpprodvat) {
 					if ($price_base_type != 'HT') {
@@ -1153,9 +1127,7 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	// Update a line within proposal
+	} // Update a line within proposal
 	elseif ($action == 'updateline' && $usercancreate && GETPOST('save'))
 	{
 		// Define info_bits
@@ -1295,48 +1267,32 @@ if (empty($reshook))
 	} elseif ($action == 'classin' && $usercancreate) {
         // Set project
         $object->setProject(GETPOST('projectid', 'int'));
-	}
-
-	// Delivery time
+	} // Delivery time
 	elseif ($action == 'setavailability' && $usercancreate) {
 		$result = $object->set_availability($user, GETPOST('availability_id', 'int'));
-	}
-
-	// Origin of the commercial proposal
+	} // Origin of the commercial proposal
 	elseif ($action == 'setdemandreason' && $usercancreate) {
 		$result = $object->set_demand_reason($user, GETPOST('demand_reason_id', 'int'));
-	}
-
-	// Terms of payment
+	} // Terms of payment
 	elseif ($action == 'setconditions' && $usercancreate) {
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
 	} elseif ($action == 'setremisepercent' && $usercancreate) {
 		$result = $object->set_remise_percent($user, $_POST['remise_percent']);
 	} elseif ($action == 'setremiseabsolue' && $usercancreate) {
 		$result = $object->set_remise_absolue($user, $_POST['remise_absolue']);
-	}
-
-	// Payment choice
+	} // Payment choice
 	elseif ($action == 'setmode' && $usercancreate) {
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-	}
-
-	// Multicurrency Code
+	} // Multicurrency Code
 	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
-	}
-
-	// Multicurrency rate
+	} // Multicurrency rate
 	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')));
-	}
-
-	// bank account
+	} // bank account
 	elseif ($action == 'setbankaccount' && $usercancreate) {
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
-	}
-
-	// shipping method
+	} // shipping method
 	elseif ($action == 'setshippingmethod' && $usercancreate) {
 		$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
 	} elseif ($action == 'update_extras') {
@@ -1377,18 +1333,14 @@ if (empty($reshook))
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
-		}
-
-		// Toggle the status of a contact
+		} // Toggle the status of a contact
 		elseif ($action == 'swapstatut') {
 			if ($object->fetch($id) > 0) {
 				$result = $object->swapContactStatus(GETPOST('ligne'));
 			} else {
 				dol_print_error($db);
 			}
-		}
-
-		// Delete a contact
+		} // Delete a contact
 		elseif ($action == 'deletecontact') {
 			$object->fetch($id);
 			$result = $object->delete_contact($lineid);
@@ -1871,24 +1823,16 @@ if ($action == 'create')
 		}
 
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), $text, 'setstatut', $formquestion, '', 1, 250);
-	}
-
-	// Confirm delete
+	} // Confirm delete
 	elseif ($action == 'delete') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteProp'), $langs->trans('ConfirmDeleteProp', $object->ref), 'confirm_delete', '', 0, 1);
-	}
-
-	// Confirm reopen
+	} // Confirm reopen
 	elseif ($action == 'reopen') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReOpen'), $langs->trans('ConfirmReOpenProp', $object->ref), 'confirm_reopen', '', 0, 1);
-	}
-
-	// Confirmation delete product/service line
+	} // Confirmation delete product/service line
 	elseif ($action == 'ask_deleteline') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
-	}
-
-	// Confirm validate proposal
+	} // Confirm validate proposal
 	elseif ($action == 'validate') {
 		$error = 0;
 
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 5a8ddc31982..63e3864245b 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -2823,8 +2823,7 @@ class Propal extends CommonObject
 				if ($objecttype == 'facture')
 				{
 					$linkedInvoices[] = $object;
-				}
-				// Cas des factures liees par un autre objet (ex: commande)
+				} // Cas des factures liees par un autre objet (ex: commande)
 				else {
 					$this->fetchObjectLinked($object, $objecttype);
 					foreach ($this->linkedObjectsIds as $subobjecttype => $subobjectid)
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index da23b4fc2bc..c2f60516f1c 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -95,18 +95,14 @@ if ($action == 'addcontact' && $user->rights->propale->creer)
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-}
-
-// Toggle the status of a contact
+} // Toggle the status of a contact
 elseif ($action == 'swapstatut' && $user->rights->propale->creer)
 {
 	if ($object->id > 0)
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
 	}
-}
-
-// Deletes a contact
+} // Deletes a contact
 elseif ($action == 'deletecontact' && $user->rights->propale->creer)
 {
 	$result = $object->delete_contact($lineid);
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index c5ded35cb51..0af1f84d9f6 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -1020,8 +1020,7 @@ if ($resql)
                 	if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc')
                 	{
                 		$balancebefore = $objforbalance->previoustotal + ($sign * $objp->amount);
-                	}
-                	// If sort is asc,asc,asc then total of previous date is balance of line before the next line to show
+                	} // If sort is asc,asc,asc then total of previous date is balance of line before the next line to show
                 	else {
                 		$balance = $objforbalance->previoustotal;
                 	}
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 3771d010f4f..9459df7579f 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -553,8 +553,7 @@ if ($action == 'create')
 	print '</div>';
 
 	print '</form>';
-}
-/* ************************************************************************** */
+} /* ************************************************************************** */
 /*                                                                            */
 /* Visu et edition                                                            */
 /*                                                                            */
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index d2fd1c54cce..4d3ec6b1ee6 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -148,9 +148,7 @@ if ($action == 'validate' && $user->rights->deplacement->creer)
         header("Location: index.php");
         exit;
     }
-}
-
-// Update record
+} // Update record
 elseif ($action == 'update' && $user->rights->deplacement->creer)
 {
     if (!GETPOST('cancel', 'alpha'))
@@ -178,17 +176,13 @@ elseif ($action == 'update' && $user->rights->deplacement->creer)
         header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
         exit;
     }
-}
-
-// Set into a project
+} // Set into a project
 elseif ($action == 'classin' && $user->rights->deplacement->creer)
 {
     $object->fetch($id);
     $result = $object->setProject(GETPOST('projectid', 'int'));
     if ($result < 0) dol_print_error($db, $object->error);
-}
-
-// Set fields
+} // Set fields
 elseif ($action == 'setdated' && $user->rights->deplacement->creer)
 {
     $dated = dol_mktime(GETPOST('datedhour', 'int'), GETPOST('datedmin', 'int'), GETPOST('datedsec', 'int'), GETPOST('datedmonth', 'int'), GETPOST('datedday', 'int'), GETPOST('datedyear', 'int'));
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index a0d09a11980..cc3a0769e70 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -275,18 +275,15 @@ if (empty($reshook))
 	if ($action == 'setconditions' && $user->rights->facture->creer)
 	{
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
-	}
-	// Set mode
+	} // Set mode
 	elseif ($action == 'setmode' && $user->rights->facture->creer)
 	{
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-	}
-	// Set project
+	} // Set project
 	elseif ($action == 'classin' && $user->rights->facture->creer)
 	{
 		$object->setProject(GETPOST('projectid', 'int'));
-	}
-	// Set bank account
+	} // Set bank account
 	elseif ($action == 'setref' && $user->rights->facture->creer)
 	{
 		//var_dump(GETPOST('ref', 'alpha'));exit;
@@ -297,45 +294,36 @@ if (empty($reshook))
 			$object->title = GETPOST('ref', 'alpha');
 			$object->ref = $object->title;
 		} else dol_print_error($db, $object->error, $object->errors);
-	}
-	// Set bank account
+	} // Set bank account
 	elseif ($action == 'setbankaccount' && $user->rights->facture->creer)
 	{
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
-	}
-	// Set frequency and unit frequency
+	} // Set frequency and unit frequency
 	elseif ($action == 'setfrequency' && $user->rights->facture->creer)
 	{
 		$object->setFrequencyAndUnit(GETPOST('frequency', 'int'), GETPOST('unit_frequency', 'alpha'));
-	}
-	// Set next date of execution
+	} // Set next date of execution
 	elseif ($action == 'setdate_when' && $user->rights->facture->creer)
 	{
 		$date = dol_mktime(GETPOST('date_whenhour'), GETPOST('date_whenmin'), 0, GETPOST('date_whenmonth'), GETPOST('date_whenday'), GETPOST('date_whenyear'));
 		if (!empty($date)) $object->setNextDate($date);
-	}
-	// Set max period
+	} // Set max period
 	elseif ($action == 'setnb_gen_max' && $user->rights->facture->creer)
 	{
 		$object->setMaxPeriod(GETPOST('nb_gen_max', 'int'));
-	}
-	// Set auto validate
+	} // Set auto validate
 	elseif ($action == 'setauto_validate' && $user->rights->facture->creer)
 	{
 		$object->setAutoValidate(GETPOST('auto_validate', 'int'));
-    }
-    // Set generate pdf
+    } // Set generate pdf
 	elseif ($action == 'setgenerate_pdf' && $user->rights->facture->creer)
 	{
 		$object->setGeneratepdf(GETPOST('generate_pdf', 'int'));
-	}
-    // Set model pdf
+	} // Set model pdf
 	elseif ($action == 'setmodelpdf' && $user->rights->facture->creer)
 	{
 		$object->setModelpdf(GETPOST('modelpdf', 'alpha'));
-	}
-
-	// Set status disabled
+	} // Set status disabled
 	elseif ($action == 'disable' && $user->rights->facture->creer)
 	{
 		$db->begin();
@@ -355,9 +343,7 @@ if (empty($reshook))
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// Set status enabled
+	} // Set status enabled
 	elseif ($action == 'enable' && $user->rights->facture->creer)
 	{
 		$db->begin();
@@ -377,13 +363,10 @@ if (empty($reshook))
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	// Multicurrency Code
+	} // Multicurrency Code
 	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
-	}
-
-	// Multicurrency rate
+	} // Multicurrency rate
 	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
 	}
@@ -554,8 +537,7 @@ if (empty($reshook))
 				{
 					$pu_ht = price2num($price_ht, 'MU');
 					$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
-				}
-				// On reevalue prix selon taux tva car taux tva transaction peut etre different
+				} // On reevalue prix selon taux tva car taux tva transaction peut etre different
 				// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
 				elseif ($tmpvat != $tmpprodvat)
 				{
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index ac961e2df6a..60bd255da20 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -188,9 +188,7 @@ if (empty($reshook))
        		setEventMessages($object->error, $object->errors, 'errors');
        		$action = '';
         }
-	}
-
-	// Change status of invoice
+	} // Change status of invoice
 	elseif ($action == 'reopen' && $usercancreate) {
 		$result = $object->fetch($id);
 
@@ -203,9 +201,7 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	// Delete invoice
+	} // Delete invoice
 	elseif ($action == 'confirm_delete' && $confirm == 'yes') {
 		$result = $object->fetch($id);
 		$object->fetch_thirdparty();
@@ -233,9 +229,7 @@ if (empty($reshook))
 				$action = '';
 			}
 		}
-	}
-
-	// Delete line
+	} // Delete line
 	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate)
 	{
 		$object->fetch($id);
@@ -267,17 +261,13 @@ if (empty($reshook))
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
-	}
-
-	// Delete link of credit note to invoice
+	} // Delete link of credit note to invoice
 	elseif ($action == 'unlinkdiscount' && $usercancreate)
 	{
 		$discount = new DiscountAbsolute($db);
 		$result = $discount->fetch(GETPOST("discountid"));
 		$discount->unlink_invoice();
-	}
-
-	// Validation
+	} // Validation
 	elseif ($action == 'valid' && $usercancreate)
 	{
 		$object->fetch($id);
@@ -377,15 +367,10 @@ if (empty($reshook))
 	    $result = $object->setRetainedWarrantyDateLimit(GETPOST('retained_warranty_date_limit', 'float'));
 	    if ($result < 0)
 	        dol_print_error($db, $object->error);
-	}
-
-
-	// Multicurrency Code
+	} // Multicurrency Code
 	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
-	}
-
-	// Multicurrency rate
+	} // Multicurrency rate
 	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
 	} elseif ($action == 'setinvoicedate' && $usercancreate)
@@ -472,15 +457,11 @@ if (empty($reshook))
 				if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	// Set incoterm
+	} // Set incoterm
 	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
 	{
 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
-	}
-
-	// bank account
+	} // bank account
 	elseif ($action == 'setbankaccount' && $usercancreate)
 	{
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
@@ -552,9 +533,7 @@ if (empty($reshook))
 	{
 		$object->fetch($id);
 		$object->set_ref_client(GETPOST('ref_client'));
-	}
-
-	// Classify to validated
+	} // Classify to validated
 	elseif ($action == 'confirm_valid' && $confirm == 'yes' && $usercanvalidate)
 	{
 		$idwarehouse = GETPOST('idwarehouse', 'int');
@@ -668,9 +647,7 @@ if (empty($reshook))
 				else setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	// Go back to draft status (unvalidate)
+	} // Go back to draft status (unvalidate)
 	elseif ($action == 'confirm_modif' && $usercanunvalidate)
 	{
 		$idwarehouse = GETPOST('idwarehouse', 'int');
@@ -751,9 +728,7 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	// Classify "paid"
+	} // Classify "paid"
 	elseif ($action == 'confirm_paid' && $confirm == 'yes' && $usercanissuepayment)
 	{
 		$object->fetch($id);
@@ -782,9 +757,7 @@ if (empty($reshook))
 		} else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Reason")), null, 'errors');
 		}
-	}
-
-	// Convertir en reduc
+	} // Convertir en reduc
 	elseif ($action == 'confirm_converttoreduc' && $confirm == 'yes' && $usercancreate)
 	{
 		$object->fetch($id);
@@ -949,9 +922,7 @@ if (empty($reshook))
 				$db->rollback();
 			}
 		}
-	}
-
-	// Delete payment
+	} // Delete payment
 	elseif ($action == 'confirm_delete_paiement' && $confirm == 'yes' && $usercancreate)
 	{
 		$object->fetch($id);
@@ -967,9 +938,7 @@ if (empty($reshook))
 				setEventMessages($paiement->error, $paiement->errors, 'errors');
 			}
 		}
-	}
-
-	/*
+	} /*
 	 * Insert new invoice in database
 	 */
 	elseif ($action == 'add' && $usercancreate)
@@ -1853,9 +1822,7 @@ if (empty($reshook))
 			$_GET["originid"] = $_POST["originid"];
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// Add a new line
+	} // Add a new line
 	elseif ($action == 'addline' && $usercancreate)
 	{
 		$langs->load('errors');
@@ -2000,8 +1967,7 @@ if (empty($reshook))
 				{
 					$pu_ht = price2num($price_ht, 'MU');
 					$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
-				}
-				// On reevalue prix selon taux tva car taux tva transaction peut etre different
+				} // On reevalue prix selon taux tva car taux tva transaction peut etre different
 				// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
 				elseif ($tmpvat != $tmpprodvat)
 				{
@@ -2398,9 +2364,7 @@ if (empty($reshook))
 	} elseif ($action == 'updateline' && $usercancreate && $_POST['cancel'] == $langs->trans('Cancel')) {
 		header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id); // To show again edited page
 		exit();
-	}
-
-	// Outing situation invoice from cycle
+	} // Outing situation invoice from cycle
 	elseif ($action == 'confirm_situationout' && $confirm == 'yes' && $usercancreate)
 	{
 	    $object->fetch($id, '', '', '', true);
@@ -2507,9 +2471,7 @@ if (empty($reshook))
 	            setEventMessages($langs->trans('ErrorFindNextSituationInvoice'), array(), 'errors');
 	        }
 	    }
-	}
-
-	// add lines from objectlinked
+	} // add lines from objectlinked
 	elseif ($action == 'import_lines_from_object'
 	    && $usercancreate
 	    && $object->statut == Facture::STATUS_DRAFT
@@ -2824,14 +2786,12 @@ if ($action == 'create')
 	}
 
 	// when payment condition is empty (means not override by payment condition form a other object, like third-party), try to use default value
-	if(empty($cond_reglement_id))
-	{
+	if (empty($cond_reglement_id)) {
 		$cond_reglement_id = GETPOST("cond_reglement_id");
 	}
 
 	// when payment mode is empty (means not override by payment mode form a other object, like third-party), try to use default value
-	if(empty($mode_reglement_id))
-	{
+	if (empty($mode_reglement_id)) {
 		$mode_reglement_id = GETPOST("mode_reglement_id");
 	}
 
@@ -2839,8 +2799,7 @@ if ($action == 'create')
 	$note_public = $object->getDefaultCreateValueFor('note_public', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTURE_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_public : null));
 	$note_private = $object->getDefaultCreateValueFor('note_private', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTURE_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_private : null));
 
-	if (!empty($conf->use_javascript_ajax))
-	{
+	if (!empty($conf->use_javascript_ajax)) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 		print ajax_combobox('fac_replacement');
 		print ajax_combobox('fac_avoir');
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 44954d863e5..c88fef5015c 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -78,9 +78,7 @@ if ($action == 'addcontact' && $user->rights->facture->creer)
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-}
-
-// Toggle the status of a contact
+} // Toggle the status of a contact
 elseif ($action == 'swapstatut' && $user->rights->facture->creer)
 {
 	if ($object->fetch($id))
@@ -89,9 +87,7 @@ elseif ($action == 'swapstatut' && $user->rights->facture->creer)
 	} else {
 		dol_print_error($db);
 	}
-}
-
-// Deletes a contact
+} // Deletes a contact
 elseif ($action == 'deletecontact' && $user->rights->facture->creer)
 {
 	$object->fetch($id);
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 5c490ce3128..4b1c1637c89 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -247,9 +247,7 @@ if ($action == 'builddoc' && $user->rights->banque->cheque)
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc'));
 		exit;
 	}
-}
-
-// Remove file in doc form
+} // Remove file in doc form
 elseif ($action == 'remove_file' && $user->rights->banque->cheque)
 {
 	if ($object->fetch($id) > 0)
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 9e0a83e8c5f..03bb8a419c9 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2198,20 +2198,17 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		if (empty($entity) || empty($conf->medias->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
 		$accessallowed = 1;
 		$original_file = $conf->medias->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
+	} // Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
 	elseif ($modulepart == 'logs' && !empty($dolibarr_main_data_root))
 	{
 		$accessallowed = ($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
 		$original_file = $dolibarr_main_data_root.'/'.$original_file;
-	}
-	// Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
+	} // Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
 	elseif ($modulepart == 'doctemplateswebsite' && !empty($dolibarr_main_data_root))
 	{
 		$accessallowed = ($fuser->rights->website->write && preg_match('/\.jpg$/i', basename($original_file)));
 		$original_file = $dolibarr_main_data_root.'/doctemplates/websites/'.$original_file;
-	}
-	// Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
+	} // Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
 	elseif ($modulepart == 'packages' && !empty($dolibarr_main_data_root))
 	{
 		// Dir for custom dirs
@@ -2220,86 +2217,72 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 
 		$accessallowed = ($user->admin && preg_match('/^module_.*\.zip$/', basename($original_file)));
 		$original_file = $dirins.'/'.$original_file;
-	}
-	// Wrapping for some images
+	} // Wrapping for some images
 	elseif ($modulepart == 'mycompany' && !empty($conf->mycompany->dir_output))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->mycompany->dir_output.'/'.$original_file;
-	}
-	// Wrapping for users photos
+	} // Wrapping for users photos
 	elseif ($modulepart == 'userphoto' && !empty($conf->user->dir_output))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->user->dir_output.'/'.$original_file;
-	}
-	// Wrapping for members photos
+	} // Wrapping for members photos
 	elseif ($modulepart == 'memberphoto' && !empty($conf->adherent->dir_output))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->adherent->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu factures
+	} // Wrapping pour les apercu factures
 	elseif ($modulepart == 'apercufacture' && !empty($conf->facture->multidir_output[$entity]))
 	{
 		if ($fuser->rights->facture->{$lire}) $accessallowed = 1;
 		$original_file = $conf->facture->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les apercu propal
+	} // Wrapping pour les apercu propal
 	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->multidir_output[$entity]))
 	{
 		if ($fuser->rights->propale->{$lire}) $accessallowed = 1;
 		$original_file = $conf->propal->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les apercu commande
+	} // Wrapping pour les apercu commande
 	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->multidir_output[$entity]))
 	{
 		if ($fuser->rights->commande->{$lire}) $accessallowed = 1;
 		$original_file = $conf->commande->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les apercu intervention
+	} // Wrapping pour les apercu intervention
 	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
 	{
 		if ($fuser->rights->ficheinter->{$lire}) $accessallowed = 1;
 		$original_file = $conf->ficheinter->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu conat
+	} // Wrapping pour les apercu conat
 	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))
 	{
 		if ($fuser->rights->contrat->{$lire}) $accessallowed = 1;
 		$original_file = $conf->contrat->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu supplier proposal
+	} // Wrapping pour les apercu supplier proposal
 	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
 	{
 		if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed = 1;
 		$original_file = $conf->supplier_proposal->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu supplier order
+	} // Wrapping pour les apercu supplier order
 	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed = 1;
 		$original_file = $conf->fournisseur->commande->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu supplier invoice
+	} // Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
 	{
 		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed = 1;
 		$original_file = $conf->fournisseur->facture->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu supplier invoice
+	} // Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output))
 	{
 		if ($fuser->rights->expensereport->{$lire}) $accessallowed = 1;
 		$original_file = $conf->expensereport->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats propales
+	} // Wrapping pour les images des stats propales
 	elseif ($modulepart == 'propalstats' && !empty($conf->propal->multidir_temp[$entity]))
 	{
 		if ($fuser->rights->propale->{$lire}) $accessallowed = 1;
 		$original_file = $conf->propal->multidir_temp[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les images des stats commandes
+	} // Wrapping pour les images des stats commandes
 	elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp))
 	{
 		if ($fuser->rights->commande->{$lire}) $accessallowed = 1;
@@ -2308,8 +2291,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed = 1;
 		$original_file = $conf->fournisseur->commande->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats factures
+	} // Wrapping pour les images des stats factures
 	elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
 	{
 		if ($fuser->rights->facture->{$lire}) $accessallowed = 1;
@@ -2318,103 +2300,86 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	{
 		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed = 1;
 		$original_file = $conf->fournisseur->facture->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats expeditions
+	} // Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp))
 	{
 		if ($fuser->rights->expedition->{$lire}) $accessallowed = 1;
 		$original_file = $conf->expedition->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats expeditions
+	} // Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp))
 	{
 		if ($fuser->rights->deplacement->{$lire}) $accessallowed = 1;
 		$original_file = $conf->deplacement->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats expeditions
+	} // Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp))
 	{
 		if ($fuser->rights->adherent->{$lire}) $accessallowed = 1;
 		$original_file = $conf->adherent->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats produits
+	} // Wrapping pour les images des stats produits
 	elseif (preg_match('/^productstats_/i', $modulepart) && !empty($conf->product->dir_temp))
 	{
 		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed = 1;
 		$original_file = (!empty($conf->product->multidir_temp[$entity]) ? $conf->product->multidir_temp[$entity] : $conf->service->multidir_temp[$entity]).'/'.$original_file;
-	}
-	// Wrapping for taxes
+	} // Wrapping for taxes
 	elseif (in_array($modulepart, array('tax', 'tax-vat')) && !empty($conf->tax->dir_output))
 	{
 		if ($fuser->rights->tax->charges->{$lire}) $accessallowed = 1;
 		$modulepartsuffix = str_replace('tax-', '', $modulepart);
 		$original_file = $conf->tax->dir_output.'/'.($modulepartsuffix != 'tax' ? $modulepartsuffix.'/' : '').$original_file;
-	}
-	// Wrapping for events
+	} // Wrapping for events
 	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
 		if ($fuser->rights->agenda->myactions->{$read}) $accessallowed = 1;
 		$original_file = $conf->agenda->dir_output.'/'.$original_file;
-	}
-	// Wrapping for categories
+	} // Wrapping for categories
 	elseif ($modulepart == 'category' && !empty($conf->categorie->multidir_output[$entity]))
 	{
 		if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
 		if ($fuser->rights->categorie->{$lire}) $accessallowed = 1;
 		$original_file = $conf->categorie->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les prelevements
+	} // Wrapping pour les prelevements
 	elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output))
 	{
 		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i', $original_file)) $accessallowed = 1;
 		$original_file = $conf->prelevement->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les graph energie
+	} // Wrapping pour les graph energie
 	elseif ($modulepart == 'graph_stock' && !empty($conf->stock->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->stock->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les graph fournisseurs
+	} // Wrapping pour les graph fournisseurs
 	elseif ($modulepart == 'graph_fourn' && !empty($conf->fournisseur->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->fournisseur->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les graph des produits
+	} // Wrapping pour les graph des produits
 	elseif ($modulepart == 'graph_product' && !empty($conf->product->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->product->multidir_temp[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les code barre
+	} // Wrapping pour les code barre
 	elseif ($modulepart == 'barcode')
 	{
 		$accessallowed = 1;
 		// If viewimage is called for barcode, we try to output an image on the fly, with no build of file on disk.
 		//$original_file=$conf->barcode->dir_temp.'/'.$original_file;
 		$original_file = '';
-	}
-	// Wrapping pour les icones de background des mailings
+	} // Wrapping pour les icones de background des mailings
 	elseif ($modulepart == 'iconmailing' && !empty($conf->mailing->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->mailing->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour le scanner
+	} // Wrapping pour le scanner
 	elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
-	}
-	// Wrapping pour les images fckeditor
+	} // Wrapping pour les images fckeditor
 	elseif ($modulepart == 'fckeditor' && !empty($conf->fckeditor->dir_output))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->fckeditor->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for users
+	} // Wrapping for users
 	elseif ($modulepart == 'user' && !empty($conf->user->dir_output))
 	{
 		$canreaduser = (!empty($fuser->admin) || $fuser->rights->user->user->{$lire});
@@ -2424,9 +2389,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->user->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for third parties
+	} // Wrapping for third parties
 	elseif (($modulepart == 'company' || $modulepart == 'societe' || $modulepart == 'thirdparty') && !empty($conf->societe->multidir_output[$entity]))
 	{
 		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
@@ -2436,9 +2399,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->societe->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT rowid as fk_soc FROM ".MAIN_DB_PREFIX."societe WHERE rowid='".$db->escape($refname)."' AND entity IN (".getEntity('societe').")";
-	}
-
-	// Wrapping for contact
+	} // Wrapping for contact
 	elseif ($modulepart == 'contact' && !empty($conf->societe->multidir_output[$entity]))
 	{
 		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
@@ -2447,9 +2408,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->societe->multidir_output[$entity].'/contact/'.$original_file;
-	}
-
-	// Wrapping for invoices
+	} // Wrapping for invoices
 	elseif (($modulepart == 'facture' || $modulepart == 'invoice') && !empty($conf->facture->multidir_output[$entity]))
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2458,8 +2417,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->facture->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('invoice').")";
-	}
-	// Wrapping for mass actions
+	} // Wrapping for mass actions
 	elseif ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->multidir_output[$entity]))
 	{
 		if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2530,9 +2488,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->contrat->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-
-	// Wrapping for interventions
+	} // Wrapping for interventions
 	elseif (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))
 	{
 		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2541,9 +2497,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->ficheinter->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-
-	// Wrapping pour les deplacements et notes de frais
+	} // Wrapping pour les deplacements et notes de frais
 	elseif ($modulepart == 'deplacement' && !empty($conf->deplacement->dir_output))
 	{
 		if ($fuser->rights->deplacement->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2552,8 +2506,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->deplacement->dir_output.'/'.$original_file;
 		//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-	// Wrapping pour les propales
+	} // Wrapping pour les propales
 	elseif (($modulepart == 'propal' || $modulepart == 'propale') && !empty($conf->propal->multidir_output[$entity]))
 	{
 		if ($fuser->rights->propale->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2562,9 +2515,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->propal->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."propal WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('propal').")";
-	}
-
-	// Wrapping pour les commandes
+	} // Wrapping pour les commandes
 	elseif (($modulepart == 'commande' || $modulepart == 'order') && !empty($conf->commande->multidir_output[$entity]))
 	{
 		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2573,9 +2524,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->commande->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('order').")";
-	}
-
-	// Wrapping pour les projets
+	} // Wrapping pour les projets
 	elseif ($modulepart == 'project' && !empty($conf->projet->dir_output))
 	{
 		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2592,9 +2541,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
-	}
-
-	// Wrapping pour les commandes fournisseurs
+	} // Wrapping pour les commandes fournisseurs
 	elseif (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output))
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2603,9 +2550,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->fournisseur->commande->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-
-	// Wrapping pour les factures fournisseurs
+	} // Wrapping pour les factures fournisseurs
 	elseif (($modulepart == 'facture_fournisseur' || $modulepart == 'invoice_supplier') && !empty($conf->fournisseur->facture->dir_output))
 	{
 		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2614,8 +2559,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->fournisseur->facture->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-	// Wrapping pour les rapport de paiements
+	} // Wrapping pour les rapport de paiements
 	elseif ($modulepart == 'supplier_payment')
 	{
 		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2624,9 +2568,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->fournisseur->payment->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."paiementfournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-
-	// Wrapping pour les rapport de paiements
+	} // Wrapping pour les rapport de paiements
 	elseif ($modulepart == 'facture_paiement' && !empty($conf->facture->dir_output))
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2635,9 +2577,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		if ($fuser->societe_id > 0) $original_file = $conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
 		else $original_file = $conf->facture->dir_output.'/payments/'.$original_file;
-	}
-
-	// Wrapping for accounting exports
+	} // Wrapping for accounting exports
 	elseif ($modulepart == 'export_compta' && !empty($conf->accounting->dir_output))
 	{
 		if ($fuser->rights->accounting->bind->write || preg_match('/^specimen/i', $original_file))
@@ -2645,9 +2585,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->accounting->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les expedition
+	} // Wrapping pour les expedition
 	elseif ($modulepart == 'expedition' && !empty($conf->expedition->dir_output))
 	{
 		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2655,8 +2593,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expedition->dir_output."/sending/".$original_file;
-	}
-	// Wrapping pour les bons de livraison
+	} // Wrapping pour les bons de livraison
 	elseif ($modulepart == 'livraison' && !empty($conf->expedition->dir_output))
 	{
 		if ($fuser->rights->expedition->livraison->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2664,9 +2601,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expedition->dir_output."/receipt/".$original_file;
-	}
-
-	// Wrapping pour les actions
+	} // Wrapping pour les actions
 	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
 		if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i', $original_file))
@@ -2674,9 +2609,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->agenda->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les actions
+	} // Wrapping pour les actions
 	elseif ($modulepart == 'actionsreport' && !empty($conf->agenda->dir_temp))
 	{
 		if ($fuser->rights->agenda->allactions->{$read} || preg_match('/^specimen/i', $original_file))
@@ -2684,9 +2617,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->agenda->dir_temp."/".$original_file;
-	}
-
-	// Wrapping pour les produits et services
+	} // Wrapping pour les produits et services
 	elseif ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
 	{
 		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
@@ -2696,9 +2627,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		if (!empty($conf->product->enabled)) $original_file = $conf->product->multidir_output[$entity].'/'.$original_file;
 		elseif (!empty($conf->service->enabled)) $original_file = $conf->service->multidir_output[$entity].'/'.$original_file;
-	}
-
-	// Wrapping pour les lots produits
+	} // Wrapping pour les lots produits
 	elseif ($modulepart == 'product_batch' || $modulepart == 'produitlot')
 	{
 		if (empty($entity) || (empty($conf->productbatch->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
@@ -2707,9 +2636,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		if (!empty($conf->productbatch->enabled)) $original_file = $conf->productbatch->multidir_output[$entity].'/'.$original_file;
-	}
-
-	// Wrapping for stock movements
+	} // Wrapping for stock movements
 	elseif ($modulepart == 'movement' || $modulepart == 'mouvement')
 	{
 		if (empty($entity) || empty($conf->stock->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
@@ -2718,9 +2645,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		if (!empty($conf->stock->enabled)) $original_file = $conf->stock->multidir_output[$entity].'/movement/'.$original_file;
-	}
-
-	// Wrapping pour les contrats
+	} // Wrapping pour les contrats
 	elseif ($modulepart == 'contract' && !empty($conf->contrat->dir_output))
 	{
 		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2729,9 +2654,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->contrat->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."contrat WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('contract').")";
-	}
-
-	// Wrapping pour les dons
+	} // Wrapping pour les dons
 	elseif ($modulepart == 'donation' && !empty($conf->don->dir_output))
 	{
 		if ($fuser->rights->don->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2739,9 +2662,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->don->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les dons
+	} // Wrapping pour les dons
 	elseif ($modulepart == 'dolresource' && !empty($conf->resource->dir_output))
 	{
 		if ($fuser->rights->resource->{$read} || preg_match('/^specimen/i', $original_file))
@@ -2749,9 +2670,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->resource->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les remises de cheques
+	} // Wrapping pour les remises de cheques
 	elseif ($modulepart == 'remisecheque' && !empty($conf->bank->dir_output))
 	{
 		if ($fuser->rights->banque->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2760,9 +2679,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 
 		$original_file = $conf->bank->dir_output.'/checkdeposits/'.$original_file; // original_file should contains relative path so include the get_exdir result
-	}
-
-	// Wrapping for bank
+	} // Wrapping for bank
 	elseif (($modulepart == 'banque' || $modulepart == 'bank') && !empty($conf->bank->dir_output))
 	{
 		if ($fuser->rights->banque->{$lire})
@@ -2770,55 +2687,41 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->bank->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for export module
+	} // Wrapping for export module
 	elseif ($modulepart == 'export' && !empty($conf->export->dir_temp))
 	{
 		// Aucun test necessaire car on force le rep de download sur
 		// le rep export qui est propre a l'utilisateur
 		$accessallowed = 1;
 		$original_file = $conf->export->dir_temp.'/'.$fuser->id.'/'.$original_file;
-	}
-
-	// Wrapping for import module
+	} // Wrapping for import module
 	elseif ($modulepart == 'import' && !empty($conf->import->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->import->dir_temp.'/'.$original_file;
-	}
-
-	// Wrapping pour l'editeur wysiwyg
+	} // Wrapping pour l'editeur wysiwyg
 	elseif ($modulepart == 'editor' && !empty($conf->fckeditor->dir_output))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->fckeditor->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for backups
+	} // Wrapping for backups
 	elseif ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
 	{
 		if ($fuser->admin) $accessallowed = 1;
 		$original_file = $conf->admin->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for upload file test
+	} // Wrapping for upload file test
 	elseif ($modulepart == 'admin_temp' && !empty($conf->admin->dir_temp))
 	{
 		if ($fuser->admin) $accessallowed = 1;
 		$original_file = $conf->admin->dir_temp.'/'.$original_file;
-	}
-
-	// Wrapping pour BitTorrent
+	} // Wrapping pour BitTorrent
 	elseif ($modulepart == 'bittorrent' && !empty($conf->bittorrent->dir_output))
 	{
 		$accessallowed = 1;
 		$dir = 'files';
 		if (dol_mimetype($original_file) == 'application/x-bittorrent') $dir = 'torrents';
 		$original_file = $conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
-	}
-
-	// Wrapping pour Foundation module
+	} // Wrapping pour Foundation module
 	elseif ($modulepart == 'member' && !empty($conf->adherent->dir_output))
 	{
 		if ($fuser->rights->adherent->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2826,16 +2729,12 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->adherent->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for Scanner
+	} // Wrapping for Scanner
 	elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
-	}
-
-	// GENERIC Wrapping
+	} // GENERIC Wrapping
 	// If modulepart=module_user_temp	Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp/iduser
 	// If modulepart=module_temp		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp
 	// If modulepart=module_user		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/iduser
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4dd7588cec1..5b78dae709c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -167,10 +167,10 @@ function getBrowserInfo($user_agent)
 	if (preg_match('/linux/i', $user_agent)) { $os = 'linux'; } elseif (preg_match('/macintosh/i', $user_agent)) { $os = 'macintosh'; } elseif (preg_match('/windows/i', $user_agent)) { $os = 'windows'; }
 
 	// Name
-	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'firefox'; $version = $reg[2]; } elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'edge'; $version = $reg[2]; } elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg)) { $name = 'chrome'; $version = $reg[2]; }    // we can have 'chrome (Mozilla...) chrome x.y' in one string
-	elseif (preg_match('/chrome/i', $user_agent, $reg)) { $name = 'chrome'; } elseif (preg_match('/iceweasel/i', $user_agent)) { $name = 'iceweasel'; } elseif (preg_match('/epiphany/i', $user_agent)) { $name = 'epiphany'; } elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'safari'; $version = $reg[2]; }	// Safari is often present in string for mobile but its not.
-	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'opera'; $version = $reg[2]; } elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); }    // MS products at end
-	elseif (preg_match('/(Windows NT\s([0-9]+\.[0-9])).*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); }    // MS products at end
+	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'firefox'; $version = $reg[2]; } elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'edge'; $version = $reg[2]; } elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg)) { $name = 'chrome'; $version = $reg[2]; } // we can have 'chrome (Mozilla...) chrome x.y' in one string
+	elseif (preg_match('/chrome/i', $user_agent, $reg)) { $name = 'chrome'; } elseif (preg_match('/iceweasel/i', $user_agent)) { $name = 'iceweasel'; } elseif (preg_match('/epiphany/i', $user_agent)) { $name = 'epiphany'; } elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'safari'; $version = $reg[2]; } // Safari is often present in string for mobile but its not.
+	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'opera'; $version = $reg[2]; } elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); } // MS products at end
+	elseif (preg_match('/(Windows NT\s([0-9]+\.[0-9])).*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); } // MS products at end
 	elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) { $name = 'lynxlinks'; $version = $reg[4]; }
 
 	if ($tablet) {
@@ -342,8 +342,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 			{
 				$out = $_SESSION['lastsearch_limit_'.$relativepathstring];
 			}
-		}
-		// Else, retreive default values if we are not doing a sort
+		} // Else, retreive default values if we are not doing a sort
 		elseif (!isset($_GET['sortfield']))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
 		{
 			if (!empty($_GET['action']) && $_GET['action'] == 'create' && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
@@ -392,8 +391,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 							}
 						}
 					}
-				}
-				// Management of default search_filters and sort order
+				} // Management of default search_filters and sort order
 				//elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 				elseif (!empty($paramname) && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
 				{
@@ -1120,8 +1118,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
 			// This is when server run behind a reverse proxy
 			if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR'] != $remoteip) $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'].' -> '.$data['ip'];
 			elseif (!empty($_SERVER['HTTP_CLIENT_IP']) && $_SERVER['HTTP_CLIENT_IP'] != $remoteip) $data['ip'] = $_SERVER['HTTP_CLIENT_IP'].' -> '.$data['ip'];
-		}
-		// This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)
+		} // This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)
 		elseif (!empty($_SERVER['SERVER_ADDR'])) $data['ip'] = $_SERVER['SERVER_ADDR'];
 		// This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).
 		elseif (!empty($_SERVER['COMPUTERNAME'])) $data['ip'] = $_SERVER['COMPUTERNAME'].(empty($_SERVER['USERNAME']) ? '' : '@'.$_SERVER['USERNAME']);
@@ -2083,8 +2080,7 @@ function dol_now($mode = 'gmt')
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		$tzsecond = getServerTimeZoneInt('now'); // Contains tz+dayling saving time
 		$ret = (int) (dol_now('gmt') + ($tzsecond * 3600));
-	}
-	/*elseif ($mode == 'tzref')				// Time for now with parent company timezone is added
+	} /*elseif ($mode == 'tzref')				// Time for now with parent company timezone is added
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		$tzsecond=getParentCompanyTimeZoneInt();    // Contains tz+dayling saving time
@@ -5579,7 +5575,7 @@ function dolGetFirstLineOfText($text, $nboflines = 1, $charset = 'UTF-8')
 		}
 
 		$text = strtr($text, $repTable);
-		if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; }	// /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
+		if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
 		else $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.
 		$a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
@@ -5776,7 +5772,7 @@ function dol_nboflines_bis($text, $maxlinesize = 0, $charset = 'UTF-8')
 	if (dol_textishtml($text)) $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
 
 	$text = strtr($text, $repTable);
-	if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; }	// /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
+	if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
 	else $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.
 	$a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
@@ -8205,8 +8201,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
         $return = !empty($html) ? $html : $statusLabel;
     } elseif ($displayMode == 1) {
         $return = !empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel);
-    }
-    // Use status with images (for backward compatibility)
+    } // Use status with images (for backward compatibility)
     elseif (!empty($conf->global->MAIN_STATUS_USES_IMAGES)) {
         $return = '';
         $htmlLabel      = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : $statusLabel).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : '');
@@ -8251,8 +8246,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
         } else { // $displayMode >= 6
             $return = $htmlLabel.' '.$htmlImg;
         }
-    }
-    // Use new badge
+    } // Use new badge
     elseif (empty($conf->global->MAIN_STATUS_USES_IMAGES) && !empty($displayMode)) {
         $statusLabelShort = !empty($statusLabelShort) ? $statusLabelShort : $statusLabel;
 
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index c212662b7e6..7673776ad93 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -904,11 +904,9 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
         	{
         		// If before of next new year date
         		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset = 1;
-        	}
-        	// If after or equal of current new year date
+        	} // If after or equal of current new year date
         	elseif ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset = -1;
-        }
-        // For backward compatibility
+        } // For backward compatibility
         elseif (date("m", $date) < $maskraz && empty($resetEveryMonth)) { $yearoffset = -1; }	// If current month lower that month of return to zero, year is previous year
 
         if ($yearlen == 4) $yearcomp = sprintf("%04d", date("Y", $date) + $yearoffset);
diff --git a/htdocs/core/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php
index bcecb5ed095..9d64185c781 100644
--- a/htdocs/core/lib/memory.lib.php
+++ b/htdocs/core/lib/memory.lib.php
@@ -86,8 +86,7 @@ function dol_setcache($memoryid, $data)
 		} else {
 			return -1;
 		}
-	}
-	// Using shmop
+	} // Using shmop
 	elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
 	{
 		$result = dol_setshmop($memoryid, $data);
@@ -153,8 +152,7 @@ function dol_getcache($memoryid)
 		} else {
 			return -1;
 		}
-	}
-	// Using shmop
+	} // Using shmop
 	elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
 	{
 		$data = dol_getshmop($memoryid);
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index fff5280e678..06e311b39f5 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -497,8 +497,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 			if ($user->socid > 0)
 			{
 				if ($user->socid <> $objectid) return false;
-			}
-			// If internal user: Check permission for internal users that are restricted on their objects
+			} // If internal user: Check permission for internal users that are restricted on their objects
 			elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
 			{
 				$sql = "SELECT COUNT(sc.fk_soc) as nb";
@@ -508,8 +507,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " AND sc.fk_user = ".$user->id;
 				$sql .= " AND sc.fk_soc = s.rowid";
 				$sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";
-			}
-			// If multicompany and internal users with all permissions, check user is in correct entity
+			} // If multicompany and internal users with all permissions, check user is in correct entity
 			elseif (!empty($conf->multicompany->enabled))
 			{
 				$sql = "SELECT COUNT(s.rowid) as nb";
@@ -526,8 +524,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.fk_soc = ".$user->socid;
-			}
-			// If internal user: Check permission for internal users that are restricted on their objects
+			} // If internal user: Check permission for internal users that are restricted on their objects
 			elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
@@ -536,8 +533,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)"; // Contact not linked to a company or to a company of user
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-			// If multicompany and internal users with all permissions, check user is in correct entity
+			} // If multicompany and internal users with all permissions, check user is in correct entity
 			elseif (!empty($conf->multicompany->enabled))
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
@@ -588,8 +584,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.rowid IN (".$objectid.")";
 				$sql .= " AND dbt.".$dbt_keyfield." = ".$user->socid;
-			}
-			// If internal user: Check permission for internal users that are restricted on their objects
+			} // If internal user: Check permission for internal users that are restricted on their objects
 			elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
 			{
 				if (empty($dbt_keyfield)) dol_print_error('', 'Param dbt_keyfield is required but not defined');
@@ -602,8 +597,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " AND dbt.".$dbt_keyfield." = s.rowid";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 				$sql .= " AND sc.fk_user = ".$user->id;
-			}
-			// If multicompany and internal users with all permissions, check user is in correct entity
+			} // If multicompany and internal users with all permissions, check user is in correct entity
 			elseif (!empty($conf->multicompany->enabled))
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 733b3f3dc00..a594dd1dd84 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -267,8 +267,7 @@ function dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper)
 		if (!empty($conf->global->MAIN_UMASK)) {
 			@chmod($fileindex, octdec($conf->global->MAIN_UMASK));
 		}
-	}
-	else {
+	} else {
 		$result1 = true;
 	}
 
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 06005febfe4..d7ad3785338 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -700,12 +700,10 @@ if ($id > 0 || !empty($ref)) {
 			$i = 0;
 
 			if ($num) {
-
 				print '<tr class="liste_titre">';
 
 				print '<td>'.$langs->trans("Description").'</td>';
-				if (!empty($conf->productbatch->enabled))
-				{
+				if (!empty($conf->productbatch->enabled)) {
 					print '<td class="dispatch_batch_number_title">'.$langs->trans("batch_number").'</td>';
 					print '<td class="dispatch_dluo_title">'.$langs->trans("EatByDate").'</td>';
 					print '<td class="dispatch_dlc_title">'.$langs->trans("SellByDate").'</td>';
@@ -731,11 +729,9 @@ if ($id > 0 || !empty($ref)) {
 				print '<td align="right">'.$langs->trans("Warehouse");
 
 				// Select warehouse to force it everywhere
-				if (count($listwarehouses) > 1)
-				{
+				if (count($listwarehouses) > 1) {
 					print '<br>'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 1, 0, 0, '', 0, 0, $disabled);
-				} elseif (count($listwarehouses) == 1)
-				{
+				} elseif (count($listwarehouses) == 1) {
 					print '<br>'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 0, 0, 0, '', 0, 0, $disabled);
 				}
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 04c55b6dae4..0cde9145a51 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1716,14 +1716,12 @@ if ($action == 'create')
 	}
 
 	// when payment condition is empty (means not override by payment condition form a other object, like third-party), try to use default value
-	if(empty($cond_reglement_id))
-	{
+	if (empty($cond_reglement_id)) {
 		$cond_reglement_id = GETPOST("cond_reglement_id");
 	}
 
 	// when payment mode is empty (means not override by payment condition form a other object, like third-party), try to use default value
-	if(empty($mode_reglement_id))
-	{
+	if (empty($mode_reglement_id)) {
 		$mode_reglement_id = GETPOST("mode_reglement_id");
 	}
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index ef8830b2f35..42b0a4a3bc7 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2040,7 +2040,7 @@ function top_menu_quickadd()
 
 	if (! empty($conf->service->enabled) && $user->rights->service->creer) {
 		$langs->load("products");
-		$dropDownQuickAddHtml.= '
+		$dropDownQuickAddHtml .= '
                 <!-- Service link -->
                 <div class="quickaddblock center">
                     <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/product/card.php?action=create&amp;type=1" title="'.$langs->trans("NewService").'">
@@ -2054,20 +2054,18 @@ function top_menu_quickadd()
 	// Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
 	$parameters = array();
 	$result = $hookmanager->executeHooks('printQuickAddBlock', $parameters); // Note that $action and $object may have been modified by some hooks
-	if (is_numeric($result))
-	{
-		if ($result == 0)
+	if (is_numeric($result)) {
+		if ($result == 0) {
 			$dropDownQuickAddHtml.= $hookmanager->resPrint; // add
-		else
+		} else {
 			$dropDownQuickAddHtml = $hookmanager->resPrint; // replace
-	}
-	else
-	{
-		$dropDownQuickAddHtml.= $result; // For backward compatibility
+		}
+	} else {
+		$dropDownQuickAddHtml .= $result; // For backward compatibility
 	}
 
-	$dropDownQuickAddHtml.= '</div>';
-	$dropDownQuickAddHtml.= '</div>';
+	$dropDownQuickAddHtml .= '</div>';
+	$dropDownQuickAddHtml .= '</div>';
 
 	$html.= '<!-- div for quick add link -->
     <div id="topmenu-quickadd-dropdown" class="atoplogin dropdown inline-block">
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 657add84bd1..1a7001f5864 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1672,9 +1672,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '</div>';
 
 			print '</form>';
-		}
-        // Fiche en mode visu
-        else {
+		} else {
+            // Fiche en mode visu
             $showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
             if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 9bb3589b936..8a069418c4a 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1603,9 +1603,8 @@ class Product extends CommonObject
 				if (isset($this->multiprices_recuperableonly[$thirdparty_buyer->price_level])) $tva_npr = $this->multiprices_recuperableonly[$thirdparty_buyer->price_level];
 				if (empty($tva_tx)) $tva_npr = 0;
 			}
-		}
-		// If price per customer
-		elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+		} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+			// If price per customer
 			require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
 			$prodcustprice = new Productcustomerprice($db);
@@ -1624,14 +1623,12 @@ class Product extends CommonObject
 					if (empty($tva_tx)) $tva_npr = 0;
 				}
 			}
-		}
-		// If price per quantity
-		elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
-			if ($this->prices_by_qty[0])	// yes, this product has some prices per quantity
-			{
+		} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
+			// If price per quantity
+			if ($this->prices_by_qty[0]) {
+				// yes, this product has some prices per quantity
 				// Search price into product_price_by_qty from $this->id
-				foreach ($this->prices_by_qty_list[0] as $priceforthequantityarray)
-				{
+				foreach ($this->prices_by_qty_list[0] as $priceforthequantityarray) {
 					if ($priceforthequantityarray['rowid'] != $pqp) continue;
 					// We found the price
 					if ($priceforthequantityarray['price_base_type'] == 'HT')
@@ -1643,11 +1640,10 @@ class Product extends CommonObject
 					break;
 				}
 			}
-		}
-		// If price per quantity and customer
-		elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
-			if ($this->prices_by_qty[$thirdparty_buyer->price_level]) // yes, this product has some prices per quantity
-			{
+		} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+			// If price per quantity and customer
+			if ($this->prices_by_qty[$thirdparty_buyer->price_level]) {
+				// yes, this product has some prices per quantity
 				// Search price into product_price_by_qty from $this->id
 				foreach ($this->prices_by_qty_list[$thirdparty_buyer->price_level] as $priceforthequantityarray)
 				{
@@ -3777,9 +3773,8 @@ class Product extends CommonObject
                     $this->error = $this->db->lasterror();
                     return -1;
                 }
-            }
-            // If the supplier price already exists for this product and quantity
-            else {
+            } else {
+                 // If the supplier price already exists for this product and quantity
                 $this->product_fourn_price_id = $obj->rowid;
                 return 0;
             }

From 5c78eca68a0f4efa1aa5a09b17cbbefddcd74dd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 23 May 2020 21:14:44 +0200
Subject: [PATCH 425/490] prepare new rule

---
 htdocs/comm/action/index.php   | 32 +++++++++++++-------------------
 htdocs/comm/action/peruser.php | 10 ++++------
 htdocs/compta/bank/card.php    | 16 ++++++++--------
 3 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 8b852689b99..e0ded511928 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1124,22 +1124,18 @@ if (empty($action) || $action == 'show_month')      // View by month
 
     // In loops, tmpday contains day nb in current month (can be zero or negative for days of previous month)
     //var_dump($eventarray);
-    for ($iter_week = 0; $iter_week < 6; $iter_week++)
-    {
+    for ($iter_week = 0; $iter_week < 6; $iter_week++) {
         echo " <tr>\n";
-        for ($iter_day = 0; $iter_day < 7; $iter_day++)
-        {
-        	/* Show days before the beginning of the current month (previous month)  */
-            if ($tmpday <= 0)
-            {
+        for ($iter_day = 0; $iter_day < 7; $iter_day++) {
+            if ($tmpday <= 0) {
+                /* Show days before the beginning of the current month (previous month)  */
                 $style = 'cal_other_month cal_past';
-        		if ($iter_day == 6) $style .= ' cal_other_month_right';
+                if ($iter_day == 6) $style .= ' cal_other_month_right';
                 echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
                 show_day_events($db, $max_day_in_prev_month + $tmpday, $prev_month, $prev_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
                 echo "  </td>\n";
-            } /* Show days of the current month */
-            elseif ($tmpday <= $max_day_in_month)
-            {
+            } elseif ($tmpday <= $max_day_in_month) {
+                /* Show days of the current month */
                 $curtime = dol_mktime(0, 0, 0, $month, $tmpday, $year);
                 $style = 'cal_current_month';
                 if ($iter_day == 6) $style .= ' cal_current_month_right';
@@ -1151,8 +1147,8 @@ if (empty($action) || $action == 'show_month')      // View by month
                 echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
                 show_day_events($db, $tmpday, $month, $year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
                 echo "  </td>\n";
-            } /* Show days after the current month (next month) */
-            else {
+            } else {
+                /* Show days after the current month (next month) */
                 $style = 'cal_other_month';
                 if ($iter_day == 6) $style .= ' cal_other_month_right';
                 echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
@@ -1169,8 +1165,8 @@ if (empty($action) || $action == 'show_month')      // View by month
 	print '<input type="hidden" name="actionmove" value="mupdate">';
 	print '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';
 	print '<input type="hidden" name="newdate" id="newdate">';
-} elseif ($action == 'show_week') // View by week
-{
+} elseif ($action == 'show_week') {
+    // View by week
     $newparam = $param; // newparam is for birthday links
     $newparam = preg_replace('/showbirthday=/i', 'showbirthday_=', $newparam); // To avoid replacement when replace day= is done
     $newparam = preg_replace('/action=show_month&?/i', '', $newparam);
@@ -1186,8 +1182,7 @@ if (empty($action) || $action == 'show_month')      // View by month
     print '<table width="100%" class="noborder nocellnopadd cal_pannel cal_month">';
     print ' <tr class="liste_titre">';
     $i = 0;
-    while ($i < 7)
-    {
+    while ($i < 7) {
         echo '  <td align="center">'.$langs->trans("Day".(($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7))."</td>\n";
         $i++;
     }
@@ -1195,8 +1190,7 @@ if (empty($action) || $action == 'show_month')      // View by month
 
     echo " <tr>\n";
 
-    for ($iter_day = 0; $iter_day < 7; $iter_day++)
-    {
+    for ($iter_day = 0; $iter_day < 7; $iter_day++) {
         // Show days of the current week
 		$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');
 		$tmparray = dol_getdate($curtime, true);
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index f76503ddc2b..ef2c60e5ae6 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -694,14 +694,13 @@ while ($currentdaytoshow < $lastdaytoshow) {
 		    {
 			    $event->fetch_userassigned();
 				$listofuserid = $event->userassigned;
-				foreach ($listofuserid as $userid => $tmp)
-				{
+				foreach ($listofuserid as $userid => $tmp) {
 				   	if (!in_array($userid, $usernamesid)) $usernamesid[$userid] = $userid;
 				}
 		    }
 		}
-	} /* Use this list to have for all users */
-	else {
+	} else {
+		/* Use this list to have for all users */
 		$sql = "SELECT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";
 		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 		if ($usergroup > 0)	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user";
@@ -709,8 +708,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 		if ($usergroup > 0)	$sql .= " AND ug.fk_usergroup = ".$usergroup;
 		//print $sql;
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 		    $num = $db->num_rows($resql);
 		    $i = 0;
 		    if ($num)
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 9459df7579f..c99f303210b 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -553,14 +553,14 @@ if ($action == 'create')
 	print '</div>';
 
 	print '</form>';
-} /* ************************************************************************** */
-/*                                                                            */
-/* Visu et edition                                                            */
-/*                                                                            */
-/* ************************************************************************** */
-else {
-	if (($_GET["id"] || $_GET["ref"]) && $action != 'edit')
-	{
+} else {
+	/* ************************************************************************** */
+	/*                                                                            */
+	/* Visu et edition                                                            */
+	/*                                                                            */
+	/* ************************************************************************** */
+
+	if (($_GET["id"] || $_GET["ref"]) && $action != 'edit') {
 		$object = new Account($db);
 		if ($_GET["id"])
 		{

From 3dca55661ceefab13f17b46c32eb578edd634db0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 22:01:17 +0200
Subject: [PATCH 426/490] Fix Add unit test to avoid the big % instead of comon
 % char.

---
 dev/translation/strip_language_file.php |  4 ++--
 test/phpunit/LangTest.php               | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/dev/translation/strip_language_file.php b/dev/translation/strip_language_file.php
index ce28ca5de63..f2263b1d18b 100755
--- a/dev/translation/strip_language_file.php
+++ b/dev/translation/strip_language_file.php
@@ -250,11 +250,11 @@ foreach($filesToProcess as $fileToProcess)
 	{
 		if ( ! $oh = fopen($output, 'w') )
 		{
-			print "ERROR in writing to file $output\n";
+			print "ERROR in writing to file ".$output."\n";
 			exit;
 		}
 
-		print "Read Primary File $lPrimaryFile and write ".$output.":\n";
+		print "Read Primary File ".$lPrimaryFile." and write ".$output.":\n";
 
 		fwrite($oh, "# Dolibarr language file - Source file is en_US - ".(preg_replace('/\.lang$/', '', $fileToProcess))."\n");
 
diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index f4a14373ebe..7802bc57659 100644
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -181,6 +181,20 @@ class LangTest extends PHPUnit\Framework\TestCase
 			$this->assertRegExp('/^[dMy\/\-\.]+$/', $result, 'FormatDateShortJavaInput KO for lang code '.$code);
 
 			unset($tmplangs);
+
+			$filesarray2 = scandir(DOL_DOCUMENT_ROOT.'/langs/'.$code);
+			foreach($filesarray2 as $key => $file) {
+				if (! preg_match('/\.lang$/', $file)) {
+					continue;
+				}
+
+				print 'Check lang file '.$file."\n";
+				$filecontent=file_get_contents(DOL_DOCUMENT_ROOT.'/langs/'.$code.'/'.$file);
+
+				$result=strpos($filecontent, '％');
+				print __METHOD__." Result for checking we don't have bad percent char = ".$result."\n";
+				$this->assertTrue($result===false, 'Found a bad percent char ％ instead of % into file '.$code.'/'.$file);
+			}
 		}
 
         return;

From c843da527207bab811595ff567316410a6016287 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 22:29:36 +0200
Subject: [PATCH 427/490] Sync transifex

---
 htdocs/langs/de_AT/admin.lang         |  5 --
 htdocs/langs/de_AT/bills.lang         |  4 +-
 htdocs/langs/de_AT/errors.lang        |  1 -
 htdocs/langs/de_AT/exports.lang       |  1 -
 htdocs/langs/de_AT/install.lang       |  1 -
 htdocs/langs/de_AT/languages.lang     |  1 -
 htdocs/langs/de_CH/accountancy.lang   |  1 -
 htdocs/langs/de_CH/admin.lang         |  5 --
 htdocs/langs/de_CH/agenda.lang        |  1 -
 htdocs/langs/de_CH/bills.lang         |  3 +-
 htdocs/langs/de_CH/categories.lang    |  3 -
 htdocs/langs/de_CH/errors.lang        |  1 -
 htdocs/langs/de_CH/exports.lang       |  1 -
 htdocs/langs/de_CH/install.lang       |  1 -
 htdocs/langs/de_CH/languages.lang     |  1 -
 htdocs/langs/de_CH/orders.lang        |  4 +-
 htdocs/langs/de_CH/website.lang       |  1 -
 htdocs/langs/en_AU/admin.lang         | 13 ----
 htdocs/langs/en_AU/bills.lang         |  7 +-
 htdocs/langs/en_AU/cashdesk.lang      |  2 -
 htdocs/langs/en_CA/admin.lang         | 13 ----
 htdocs/langs/en_GB/accountancy.lang   |  1 -
 htdocs/langs/en_GB/admin.lang         | 13 ----
 htdocs/langs/en_GB/bills.lang         |  8 +--
 htdocs/langs/en_GB/cashdesk.lang      |  2 -
 htdocs/langs/en_GB/orders.lang        |  2 -
 htdocs/langs/en_GB/projects.lang      |  1 -
 htdocs/langs/en_GB/propal.lang        |  1 -
 htdocs/langs/en_GB/users.lang         |  1 -
 htdocs/langs/en_GB/website.lang       |  2 -
 htdocs/langs/en_IN/admin.lang         | 13 ----
 htdocs/langs/en_IN/bills.lang         |  7 +-
 htdocs/langs/en_IN/install.lang       |  1 -
 htdocs/langs/en_IN/projects.lang      |  1 -
 htdocs/langs/en_IN/propal.lang        |  1 -
 htdocs/langs/es_CL/admin.lang         |  2 -
 htdocs/langs/es_CL/agenda.lang        |  1 -
 htdocs/langs/es_CL/bills.lang         | 12 +---
 htdocs/langs/es_CL/install.lang       |  1 -
 htdocs/langs/es_CL/orders.lang        |  2 -
 htdocs/langs/es_CL/propal.lang        |  1 -
 htdocs/langs/es_CO/admin.lang         |  2 -
 htdocs/langs/es_CO/bills.lang         | 12 +---
 htdocs/langs/es_CO/orders.lang        |  2 -
 htdocs/langs/es_CO/propal.lang        |  1 -
 htdocs/langs/es_DO/admin.lang         |  2 -
 htdocs/langs/es_EC/admin.lang         |  2 -
 htdocs/langs/es_MX/admin.lang         |  2 -
 htdocs/langs/es_MX/bills.lang         |  4 +-
 htdocs/langs/es_MX/install.lang       |  1 -
 htdocs/langs/es_MX/orders.lang        |  2 -
 htdocs/langs/es_MX/propal.lang        |  1 -
 htdocs/langs/es_PA/admin.lang         |  2 -
 htdocs/langs/es_PE/admin.lang         |  2 -
 htdocs/langs/es_PE/bills.lang         |  4 +-
 htdocs/langs/es_PE/mrp.lang           |  1 -
 htdocs/langs/es_PE/propal.lang        |  1 -
 htdocs/langs/es_VE/admin.lang         |  2 -
 htdocs/langs/es_VE/bills.lang         |  4 +-
 htdocs/langs/es_VE/orders.lang        |  2 -
 htdocs/langs/es_VE/propal.lang        |  1 -
 htdocs/langs/fr_BE/admin.lang         | 10 ---
 htdocs/langs/fr_BE/bills.lang         |  7 +-
 htdocs/langs/fr_CA/admin.lang         | 10 ---
 htdocs/langs/fr_CA/bills.lang         |  9 +--
 htdocs/langs/fr_CA/cashdesk.lang      |  2 -
 htdocs/langs/fr_CA/categories.lang    |  2 -
 htdocs/langs/fr_CA/donations.lang     |  1 -
 htdocs/langs/fr_CA/errors.lang        |  1 -
 htdocs/langs/fr_CA/exports.lang       |  1 -
 htdocs/langs/fr_CA/install.lang       |  1 -
 htdocs/langs/fr_CA/users.lang         |  1 -
 htdocs/langs/fr_CA/website.lang       |  2 -
 htdocs/langs/ja_JP/accountancy.lang   | 20 +++++-
 htdocs/langs/ja_JP/admin.lang         | 13 ++--
 htdocs/langs/ja_JP/bills.lang         | 11 +--
 htdocs/langs/ja_JP/compta.lang        |  4 +-
 htdocs/langs/ja_JP/donations.lang     |  2 +-
 htdocs/langs/ja_JP/interventions.lang |  6 +-
 htdocs/langs/ja_JP/modulebuilder.lang |  4 +-
 htdocs/langs/ja_JP/multicurrency.lang | 22 ++++++
 htdocs/langs/ja_JP/projects.lang      |  2 +-
 htdocs/langs/ja_JP/website.lang       |  4 +-
 htdocs/langs/ja_JP/zapier.lang        | 28 ++++++++
 htdocs/langs/nl_BE/admin.lang         |  5 --
 htdocs/langs/nl_BE/agenda.lang        |  1 -
 htdocs/langs/nl_BE/bills.lang         |  5 +-
 htdocs/langs/pt_BR/agenda.lang        |  1 -
 htdocs/langs/pt_BR/bills.lang         |  9 +--
 htdocs/langs/pt_BR/categories.lang    |  6 --
 htdocs/langs/pt_BR/donations.lang     |  1 -
 htdocs/langs/pt_BR/mrp.lang           |  1 -
 htdocs/langs/pt_BR/orders.lang        |  2 +-
 htdocs/langs/pt_BR/website.lang       |  1 -
 htdocs/langs/zh_TW/accountancy.lang   | 22 +++++-
 htdocs/langs/zh_TW/admin.lang         | 11 ++-
 htdocs/langs/zh_TW/bills.lang         | 17 ++---
 htdocs/langs/zh_TW/cashdesk.lang      | 16 +++--
 htdocs/langs/zh_TW/companies.lang     |  5 +-
 htdocs/langs/zh_TW/compta.lang        | 20 +++---
 htdocs/langs/zh_TW/main.lang          | 19 ++++--
 htdocs/langs/zh_TW/modulebuilder.lang | 96 +++++++++++++--------------
 htdocs/langs/zh_TW/products.lang      | 10 +--
 htdocs/langs/zh_TW/projects.lang      |  4 +-
 htdocs/langs/zh_TW/users.lang         |  5 +-
 htdocs/langs/zh_TW/website.lang       | 20 +++---
 106 files changed, 244 insertions(+), 389 deletions(-)
 create mode 100644 htdocs/langs/ja_JP/multicurrency.lang
 create mode 100644 htdocs/langs/ja_JP/zapier.lang

diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index 11e60ccc00b..21556732826 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -20,14 +20,12 @@ ExternalUsers=externe Nutzer
 GUISetup=Anischt
 NextValue=Nächste Wert
 URL=URL oder Link
-YouCanSubmitFile=You can upload the .zip file of module package from here:
 Module50Name=Produkte und Services
 Module53Name=Dienstleistung
 Module70Name=Eingriffe
 Module70Desc=Eingriffsverwaltung
 Module80Name=Sendungen
 Module310Desc=Mitgliederverwaltun
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
 Permission31=Produkte/Services einsehen
 Permission32=Produkte/Services erstellen/bearbeiten
 Permission34=Produkte/Services löschen
@@ -71,7 +69,6 @@ Permission2411=Maßnahmen (Termine oder Aufgaben) Anderer einsehen
 Permission2412=Maßnahmen (Termine oder Aufgaben) Anderer erstellen/bearbeiten
 Permission2413=Maßnahmen (Termine oder Aufgaben) Anderer löschen
 Permission2501=Dokumente hochladen oder löschen
-ValueOfConstantKey=Value of a configuration constant
 VirtualServerName=Virtual Server Name
 PhpWebLink=Php Web-Link
 Server=Host
@@ -92,8 +89,6 @@ InterventionsSetup=Eingriffsmoduleinstellungen
 FreeLegalTextOnInterventions=Freier Rechtstext für Eingriffe
 WatermarkOnDraftInterventionCards=Wasserzeichen auf Intervention Karte Dokumente (alle, wenn leer)
 ClickToDialSetup=Click-to-Dial-Moduleinstellungen
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersInvoiceModel=Complete template of Vendor Invoice
 MailToSendShipment=Sendungen
 MailToSendIntervention=Eingriffe
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
diff --git a/htdocs/langs/de_AT/bills.lang b/htdocs/langs/de_AT/bills.lang
index d250ef21a6a..0a3f17e463f 100644
--- a/htdocs/langs/de_AT/bills.lang
+++ b/htdocs/langs/de_AT/bills.lang
@@ -6,8 +6,6 @@ InvoiceProFormaAsk=Proformarechnung
 InvoiceProFormaDesc=<b>Proformarechnung</b> entspricht dem Wert der echten Rechnung, wird aber nicht verbucht.
 ConsumedBy=Consumed von
 CardBill=Rechnungskarte
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
 BillShortStatusValidated=Bestätigt
 BillShortStatusClosedUnpaid=geschlossen
 ValidateBill=Validate Rechnung
@@ -23,7 +21,7 @@ ValidateInvoice=Validate Rechnung
 DisabledBecausePayments=Nicht möglich, da gibt es einige Zahlungen
 CantRemovePaymentWithOneInvoicePaid=Kann die Zahlung nicht entfernen, da es zumindest auf der Rechnung bezahlt klassifiziert
 PayedByThisPayment=Bezahlt durch diese Zahlung
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
 TerreNumRefModelDesc1=Zurück NUMERO mit Format %syymm-nnnn für Standardrechnungen und syymm%-nnnn für Gutschriften, wo ist JJ Jahr, MM Monat und nnnn ist eine Folge ohne Pause und keine Rückkehr auf 0
 TypeContact_facture_internal_SALESREPFOLL=Repräsentative Follow-up Debitorenrechnung
 TypeContact_facture_external_BILLING=Debitorenrechnung Kontakt
diff --git a/htdocs/langs/de_AT/errors.lang b/htdocs/langs/de_AT/errors.lang
index ffa5721c11c..c20def2a8d4 100644
--- a/htdocs/langs/de_AT/errors.lang
+++ b/htdocs/langs/de_AT/errors.lang
@@ -3,4 +3,3 @@ ErrorBadUrl=Url %s ist ungültig
 ErrorRecordNotFound=Eintrag nicht gefunden.
 ErrorCashAccountAcceptsOnlyCashMoney=Dies ist ein Bargeldkonto (Kassa) und akzeptiert deshalb nur Bargeldtransaktionen.
 ErrorCustomerCodeAlreadyUsed=Diese Kunden Nr. ist bereits vergeben.
-ErrorSelectAtLeastOne=Error, select at least one entry.
diff --git a/htdocs/langs/de_AT/exports.lang b/htdocs/langs/de_AT/exports.lang
index 493579d0a25..6fb49b45c57 100644
--- a/htdocs/langs/de_AT/exports.lang
+++ b/htdocs/langs/de_AT/exports.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - exports
-SQLUsedForExport=SQL Request used to extract data
 FieldsInTargetDatabase=Zielfelder in der Systemdatenbank (* erforderlich)
diff --git a/htdocs/langs/de_AT/install.lang b/htdocs/langs/de_AT/install.lang
index 8c95ade8d86..3f360945492 100644
--- a/htdocs/langs/de_AT/install.lang
+++ b/htdocs/langs/de_AT/install.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - install
 GoToDolibarr=Zu dolibarr
 GoToUpgradePage=Zur Aktualisierungsseite
-DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
 DBSortingCollation=Reihenfolge der Zeichensortierung (Collation)
 MigrationActioncommElement=Update-Daten über die Maßnahmen
diff --git a/htdocs/langs/de_AT/languages.lang b/htdocs/langs/de_AT/languages.lang
index 373dbb213be..1057c7f65d6 100644
--- a/htdocs/langs/de_AT/languages.lang
+++ b/htdocs/langs/de_AT/languages.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_nl_NL=Dutch
 Language_pt_PT=Portugiesisch
diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
index 21a82fa90b2..698820c59fe 100644
--- a/htdocs/langs/de_CH/accountancy.lang
+++ b/htdocs/langs/de_CH/accountancy.lang
@@ -183,7 +183,6 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Der Partner ist nicht def
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Mir fehlt der Partner und das Wartestellungskonto. Zugriffsfehler.
 PaymentsNotLinkedToProduct=Die Zahlung ist mit keinem Produkt oder Service verknüpft.
 Pcgtype=Kontengruppe
-PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 TotalMarge=Gesamtmarge Verkauf
 DescVentilCustomer=Du siehst hier die Liste der Kundenrechnungen und ob diese mit einem Buchhaltungskonto verknüpft sind, oder nicht.
 DescVentilMore=Wenn du in den Produkten und Leistungen die Buchhaltungskonten deines Kontenplanes  hinterlegt hast, kann ich die Rechnungspositionen automatisch jenen Konten zuordnen. Dafür ist die Schaltfläche "<strong>%s</strong>" da.\nDort, wo das nicht klappt, kannst du die Rechnungspositionen via "<strong>%s</strong>" von Hand zuweisen.
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index c1aba0657cb..44472f52343 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -173,7 +173,6 @@ UnpackPackageInDolibarrRoot=Entpacke das Archiv in dein aktuelles Dolibarr Verze
 UnpackPackageInModulesRoot=Zum Einbinden eines externen Moduls entpackst du deren Archiv in das Verzeichnis: <br><b>%s</b>.
 SetupIsReadyForUse=Modulinstallation abgeschlossen. Aktiviere und konfiguriere nun das Modul im Menu "<a href="%s">%s</a>".
 InfDirExample=<br>Dann deklariere in <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>\n"#" heisst, die Variablen sind auskommentiert und werden nicht berücksichtigt.\nEntferne einfach "#", um die Variablen scharf zu schalten.
-YouCanSubmitFile=You can upload the .zip file of module package from here:
 CallUpdatePage=Zur Aktualisierung der Daten und der Datenbankstruktur gehst du zur Seite %s.
 UpdateServerOffline=Update-Server offline
 WithCounter=Zähler verwalten
@@ -323,7 +322,6 @@ Module40000Desc=Verwendung alternativer Währungen in Preisen und Dokumenten
 Module50100Name=Simple POS
 Module50100Desc=Kassenmodul (Simple POS)
 Module50150Name=Take POS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
 Module50200Desc=PayPal Zahlungsmaske aktivieren. So können deine Kunden Dolibarr - Rechnungen via PayPal oder Kreditkarte bezahlen.
 Module50300Desc=Stripe Zahlungsmaske aktivieren. So können deine Kunden Dolibarr - Rechnungen via Wallets oder Kreditkarte (plus weitere Stripe Zahlungsmöglichkeiten) bezahlen.
 Module50400Name=Doppelte Buchhaltung
@@ -403,7 +401,6 @@ VATIsUsedDesc=Standardmässig folgt der Umsatzsteuersatz beim Erstellen von Inte
 VATIsNotUsedDesc=Standardmässig beträgt die vorgeschlagene Umsatzsteuer 0, was für Fälle wie Vereine, Einzelpersonen oder kleine Unternehmen verwendet werden kann.
 LocalTax1IsNotUsedDescES=Standardmässig werden die vorgeschlagenen RE 0 ist. Ende der Regel.
 LocalTax2IsNotUsedDescES=Standardmässig werden die vorgeschlagenen IRPF 0 ist. Ende der Regel.
-ValueOfConstantKey=Value of a configuration constant
 AtEndOfMonth=Am Ende des Monats
 DriverType=Treiber Typ
 MenuCompanySetup=Firma / Organisation
@@ -500,8 +497,6 @@ ApiSetup=API-Modul-Setup
 ChequeReceiptsNumberingModule=Modul Cheques - Verwaltung
 MultiCompanySetup=Multi-Company-Moduleinstellungen
 SuppliersSetup=Modul Lieferanten einrichten
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersInvoiceModel=Complete template of Vendor Invoice
 TasksNumberingModules=Aufgaben-Nummerierungs-Modul
 NbMajMin=Mindestanzahl Grossbuchstaben
 TemplatePDFExpenseReports=Dokumentvorlagen zur Spesenabrechnung Dokument erstellen
diff --git a/htdocs/langs/de_CH/agenda.lang b/htdocs/langs/de_CH/agenda.lang
index fb6f5aa0d87..f28d248930f 100644
--- a/htdocs/langs/de_CH/agenda.lang
+++ b/htdocs/langs/de_CH/agenda.lang
@@ -35,7 +35,6 @@ PRODUCT_MODIFYInDolibarr=Produkt %s bearbeitet
 HOLIDAY_CREATEInDolibarr=Ferienantrag %s erzeugt
 HOLIDAY_MODIFYInDolibarr=Ferienantrag %s geändert
 HOLIDAY_APPROVEInDolibarr=Ferienantrag %s frei gegeben
-HOLIDAY_VALIDATEDInDolibarr=Ferienantrag %s bestätigt
 HOLIDAY_DELETEInDolibarr=Ferienantrag %s gelöscht
 EXPENSE_REPORT_CREATEInDolibarr=Spesenabrechnung %s erzeugt
 EXPENSE_REPORT_VALIDATEInDolibarr=Spesenabrechnung %s geprüft
diff --git a/htdocs/langs/de_CH/bills.lang b/htdocs/langs/de_CH/bills.lang
index c653f5b376c..be42d507752 100644
--- a/htdocs/langs/de_CH/bills.lang
+++ b/htdocs/langs/de_CH/bills.lang
@@ -93,7 +93,6 @@ ConfirmSupplierPayment=Stimmt dieser Zahlungseingang für <b>%s</b>, %s?
 ConfirmValidatePayment=Bist du sicher, dass du diese Zahlung freigeben willst? Danach kannst du keine Änderungen mehr vornehmen.
 NumberOfBills=Anzahl der Rechnungen
 AmountOfBillsHT=Gesamtbetrag Rechnungen pro Monat (inkl. Steuern)
-ShowInvoiceDeposit=Akontorechnung anzeigen
 ToPayOn=Zahlbar am %s
 toPayOn=zahlbar am %s
 ExcessPaid=Bezahlter Überschuss
@@ -176,7 +175,7 @@ ChequesArea=Schecks
 ChequeDeposits=Scheckeinlagen
 NoteListOfYourUnpaidInvoices=Bitte beachten: Diese Liste enthält nur Rechnungen für Geschäftspartner, bei denen Sie als Vertreter angegeben sind.
 YouMustCreateStandardInvoiceFirstDesc=Sie müssen zuerst eine Standardrechnung Erstellen und diese dann in eine Rechnungsvorlage umwandeln
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
 TypeContact_invoice_supplier_external_BILLING=Lieferanten - Rechnungskontakt
 TypeContact_invoice_supplier_external_SHIPPING=Lieferanten - Versandkontakt
 InvoiceFirstSituationAsk=Erste Situation Rechnung
diff --git a/htdocs/langs/de_CH/categories.lang b/htdocs/langs/de_CH/categories.lang
index 96122e9576d..589f21b1d0e 100644
--- a/htdocs/langs/de_CH/categories.lang
+++ b/htdocs/langs/de_CH/categories.lang
@@ -57,9 +57,6 @@ ContactCategoriesShort=Kontaktschlagworte / -kategorien
 AccountsCategoriesShort=Kontenschlagworte / -kategorien
 ProjectsCategoriesShort=Projektschlagworte / -kateorien
 UsersCategoriesShort=Benutzerschlagworte und -kategorien
-ThisCategoryHasNoSupplier=Mit dieser Kategorie ist kein Lieferant verknüpft.
-ThisCategoryHasNoAccount=Dieser Kategorie sind keine Konten zugewiesen.
-ThisCategoryHasNoProject=Mit dieser Kategorie ist kein Projekt verknüpft.
 CategId=Schlagwort / Kategorie ID
 CatSupList=Liste der Lieferantenschlagworte / -kategorien
 CatCusList=Liste der Kunden-/ Interessentenschlagworte / -kategorien
diff --git a/htdocs/langs/de_CH/errors.lang b/htdocs/langs/de_CH/errors.lang
index 041f2ea3681..6faba9c6f97 100644
--- a/htdocs/langs/de_CH/errors.lang
+++ b/htdocs/langs/de_CH/errors.lang
@@ -24,7 +24,6 @@ ErrorFieldCanNotContainSpecialNorUpperCharacters=Das Feld <b>%s</b> darf keine S
 ErrorFieldMustHaveXChar=Das Feld <b>%s</b> muss mindestens %s Zeichen haben.
 ErrorCantSaveADoneUserWithZeroPercentage=Ereignisse können nicht mit Status "Nicht begonnen" gespeichert werden, wenn das Feld "Erledigt durch" schon ausgefüllt ist.
 ErrorPleaseTypeBankTransactionReportName=Gib hier den Bankkontoauszug im Format YYYYMM oder YYYYMMDD an, in den du diesen Eintrag eintragen willst.
-ErrorSelectAtLeastOne=Error, select at least one entry.
 ErrorProdIdAlreadyExist=%s wurde bereits einem Geschäftspartner zugewiesen
 ErrorForbidden3=Es scheint keine ordnungsgemässe Authentifizierung für das System vorzuliegen. Bitte werfen Sie einen Blick auf die Systemdokumentation um die entsprechenden Authentifizierungsoptionen zu verwalten (htaccess, mod_auth oder andere...)
 ErrorBadValueForCode=Unzulässiger Code-Wert. Versuchen Sie es mit einem anderen Wert erneut...
diff --git a/htdocs/langs/de_CH/exports.lang b/htdocs/langs/de_CH/exports.lang
index ab814c75f8c..eb8c5cdab4e 100644
--- a/htdocs/langs/de_CH/exports.lang
+++ b/htdocs/langs/de_CH/exports.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - exports
 FileSuccessfullyBuilt=Filter generiert
-SQLUsedForExport=SQL Request used to extract data
 ExampleAnyCodeOrIdFoundIntoDictionary=Ein Code (oder eine ID) wurde im Dictionnary <b>%s</b> gefunden
 ImportFromLine=Import ab Zeile Nummer
 EndAtLineNb=Bis zu Zeile Nummer
diff --git a/htdocs/langs/de_CH/install.lang b/htdocs/langs/de_CH/install.lang
index d19bdc48c19..0d004eaf02f 100644
--- a/htdocs/langs/de_CH/install.lang
+++ b/htdocs/langs/de_CH/install.lang
@@ -5,7 +5,6 @@ ErrorDatabaseAlreadyExists=Eine Datenbank mit dem Namen '%s' exisitiert bereits.
 IfDatabaseExistsGoBackAndCheckCreate=Sollte die Datebank bereits existieren, gehen Sie bitte zurück und deaktivieren Sie das Kontrollkästchen "Datenbank erstellen".
 AdminLoginCreatedSuccessfuly=Das dolibarr-Administratorkonto '<b>%s</b>' wurde erfolgreich erstellt.
 GoToDolibarr=Zu dolibarr wechseln
-DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
 ChoosedMigrateScript=Migrationsskript auswählen
 ChooseYourSetupMode=Wählen Sie Ihre Installationsart und klicken Sie anschliessend auf "Start"...
 UpgradeDesc=Verwenden Sie diesen Modus zum Ersetzen Ihrer bisherigen Dateien durch eine neuere Version. Dieser Vorgang beinhaltet eine Aktualisierung Ihrer Datenbank und -daten.
diff --git a/htdocs/langs/de_CH/languages.lang b/htdocs/langs/de_CH/languages.lang
index 05228e52b15..00991f458c2 100644
--- a/htdocs/langs/de_CH/languages.lang
+++ b/htdocs/langs/de_CH/languages.lang
@@ -6,5 +6,4 @@ Language_es_PA=Spanisch (Panama)
 Language_ka_GE=georgisch
 Language_km_KH=Kambodschanisch
 Language_mn_MN=Mongolisch
-Language_nl_NL=Dutch
 Language_sw_SW=Kisuaheli
diff --git a/htdocs/langs/de_CH/orders.lang b/htdocs/langs/de_CH/orders.lang
index d3413475a4d..18c31d48556 100644
--- a/htdocs/langs/de_CH/orders.lang
+++ b/htdocs/langs/de_CH/orders.lang
@@ -43,9 +43,7 @@ TypeContact_order_supplier_external_SHIPPING=Lieferanten - Versandkontakt
 TypeContact_order_supplier_external_CUSTOMER=Lieferanten - Nachkalkulationskontakt
 Error_OrderNotChecked=Keine zu verrechnenden Bestellungen ausgewählt
 OrderByEMail=E-Mail
-PDFEinsteinDescription=A complete order model 
-PDFEratostheneDescription=A complete order model
-PDFProformaDescription=A complete Proforma invoice template
+PDFEinsteinDescription=A complete order model
 OrderCreation=Erstellen einer Bestellung
 IfValidateInvoiceIsNoOrderStayUnbilled=Wenn Rechnungsvalidierung auf "Nein" steht, bleibt die Bestellung im Status "nicht verrechnet", bis die Rechnung frei gegeben worden ist.
 SetShippingMode=Versandart wählen
diff --git a/htdocs/langs/de_CH/website.lang b/htdocs/langs/de_CH/website.lang
index 8ae7cc54f9d..8504c7c5535 100644
--- a/htdocs/langs/de_CH/website.lang
+++ b/htdocs/langs/de_CH/website.lang
@@ -8,4 +8,3 @@ WEBSITE_CSS_URL=URL zu externer CSS Datei
 ViewSiteInNewTab=Webauftritt in neuem Tab anzeigen
 SetAsHomePage=Als Startseite definieren
 WebsiteAccounts=Webseitenkonten
-BackToListOfThirdParty=Zurück zur Liste für Partner
diff --git a/htdocs/langs/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
index 0490a990d18..df7c865148f 100644
--- a/htdocs/langs/en_AU/admin.lang
+++ b/htdocs/langs/en_AU/admin.lang
@@ -1,21 +1,8 @@
 # Dolibarr language file - Source file is en_US - admin
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
-YouCanSubmitFile=You can upload the .zip file of module package from here:
 OldVATRates=Old GST rate
 NewVATRates=New GST rate
-ExternalModule=External module
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
-DictionaryCivility=Honorific titles
 DictionaryVAT=GST Rates or Sales Tax Rates
-ValueOfConstantKey=Value of a configuration constant
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 OptionVatMode=GST due
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersInvoiceModel=Complete template of Vendor Invoice
 LinkColor=Colour of links
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_AU/bills.lang b/htdocs/langs/en_AU/bills.lang
index 0488d509e28..840cd00451e 100644
--- a/htdocs/langs/en_AU/bills.lang
+++ b/htdocs/langs/en_AU/bills.lang
@@ -1,8 +1,4 @@
 # Dolibarr language file - Source file is en_US - bills
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 PaymentTypeCHQ=Cheque
 PaymentTypeShortCHQ=Cheque
 BankCode=BSB
@@ -15,5 +11,4 @@ MenuCheques=Cheques
 NewChequeDeposit=New Cheque deposit
 Cheques=Cheques
 NbCheque=Number of cheques
-RevenueStamp=Tax stamp
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
diff --git a/htdocs/langs/en_AU/cashdesk.lang b/htdocs/langs/en_AU/cashdesk.lang
index 690785ca368..adbd9cf9e57 100644
--- a/htdocs/langs/en_AU/cashdesk.lang
+++ b/htdocs/langs/en_AU/cashdesk.lang
@@ -1,4 +1,2 @@
 # Dolibarr language file - Source file is en_US - cashdesk
 NoVAT=No GST for this sale
-TicketVatGrouped=Group VAT by rate in tickets|receipts
-AutoPrintTickets=Automatically print tickets|receipts
diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
index 02f884882dd..993708b8fd5 100644
--- a/htdocs/langs/en_CA/admin.lang
+++ b/htdocs/langs/en_CA/admin.lang
@@ -1,20 +1,7 @@
 # Dolibarr language file - Source file is en_US - admin
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
-YouCanSubmitFile=You can upload the .zip file of module package from here:
-ExternalModule=External module
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
-DictionaryCivility=Honorific titles
 LocalTax1Management=PST Management
-ValueOfConstantKey=Value of a configuration constant
 CompanyZip=Postal code
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 LDAPFieldZip=Postal code
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersInvoiceModel=Complete template of Vendor Invoice
 FormatZip=Postal code
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang
index 87d8baba586..c85327052ee 100644
--- a/htdocs/langs/en_GB/accountancy.lang
+++ b/htdocs/langs/en_GB/accountancy.lang
@@ -83,7 +83,6 @@ ErrorDebitCredit=Debit and Credit fields cannot have values at the same time
 AddCompteFromBK=Add finance accounts to the group
 ListAccounts=List of the financial accounts
 Pcgtype=Group account
-PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 DescVentilCustomer=View the list of customer invoice lines linked (or not) to a product financial account
 DescVentilDoneCustomer=View a detailed list of invoices, customers and their product financial account
 DescVentilTodoCustomer=Link invoice lines not already linked with a product finance account
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index f435d660136..ee36872cc67 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -10,8 +10,6 @@ ErrorDecimalLargerThanAreForbidden=Error: A precision higher than <b>%s</b> is n
 ErrorReservedTypeSystemSystemAuto=Entry of 'system' and 'systemauto' for this type is reserved. You can use 'user' as a value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0 (zero)
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to prevent any uploads)
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 CurrentValueSeparatorThousand=Thousands separator
 PositionByDefault=Default position
 MenusDesc=Menu managers set the content of the two menu bars (horizontal and vertical).
@@ -20,7 +18,6 @@ PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined by Syslog modul
 ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted but no other data will be removed.
 ImportPostgreSqlDesc=To import a backup file, you must use the pg_restore command from the command line:
 CommandsToDisableForeignKeysForImportWarning=This is mandatory if you want to restore your sql dumps later
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download from external websites on the Internet...
 ModulesMarketPlaces=Find external applications and modules
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is enabled
@@ -34,7 +31,6 @@ ModuleFamilyTechnic=Multi-module tools
 NotExistsDirect=The alternative root directory is not defined in an existing directory.<br>
 InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, in a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines start with a "#", they are comments. To enable them, just remove the "#" character and save the file.
-YouCanSubmitFile=You can upload the .zip file of module package from here:
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros to the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code is n characters<br><b>{cccc000}</b> the client code of n characters is followed by a counter dedicated per customer. This counter dedicated per customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type of n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes4a=<u>Example of the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
@@ -45,20 +41,11 @@ UMaskExplanation=This parameter allows you to define permissions set by default
 ListOfDirectories=List of OpenDocument template directories
 ListOfDirectoriesForModelGenODT=List of directories containing template files in OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between each directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 FollowingSubstitutionKeysCanBeUsed=<br>To learn how to create your .odt document templates, before storing them in those directories, read wiki documentation:
-ExternalModule=External module
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
 Module50200Name=PayPal
-DictionaryCivility=Honorific titles
 DictionaryAccountancyJournal=Finance journals
-ValueOfConstantKey=Value of a configuration constant
 CompanyZip=Postcode
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 LDAPFieldZip=Postcode
 GenbarcodeLocation=Barcode generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersInvoiceModel=Complete template of Vendor Invoice
 FormatZip=Postcode
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_GB/bills.lang b/htdocs/langs/en_GB/bills.lang
index b500a49afcd..aab486542a5 100644
--- a/htdocs/langs/en_GB/bills.lang
+++ b/htdocs/langs/en_GB/bills.lang
@@ -2,13 +2,8 @@
 InvoiceDeposit=Deposit invoice
 InvoiceDepositAsk=Deposit invoice
 InvoiceDepositDesc=This kind of invoice is raised when a deposit has been received.
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 PaymentHigherThanReminderToPay=Payment higher than balance outstanding
 ConfirmValidatePayment=Are you sure you want to validate this payment? No changes can be made once payment is validated.
-ShowInvoiceDeposit=Show deposit invoice
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits)
 EscompteOffered=Disc. offered (early pmt)
 Deposit=Deposit
@@ -25,7 +20,6 @@ PrettyLittleSentence=Accept the amount of payments due by cheques issued in my n
 MenuCheques=Cheques
 Cheques=Cheques
 NbCheque=Number of cheques
-RevenueStamp=Tax stamp
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for deposit invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for deposit invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/en_GB/cashdesk.lang b/htdocs/langs/en_GB/cashdesk.lang
index 87ee48c4d72..0188074370e 100644
--- a/htdocs/langs/en_GB/cashdesk.lang
+++ b/htdocs/langs/en_GB/cashdesk.lang
@@ -6,5 +6,3 @@ NewSell=New sale
 RestartSelling=Go back to sales
 NoProductFound=No product found
 NoArticle=No product
-TicketVatGrouped=Group VAT by rate in tickets|receipts
-AutoPrintTickets=Automatically print tickets|receipts
diff --git a/htdocs/langs/en_GB/orders.lang b/htdocs/langs/en_GB/orders.lang
index 4d67f6d53dc..c667519bb39 100644
--- a/htdocs/langs/en_GB/orders.lang
+++ b/htdocs/langs/en_GB/orders.lang
@@ -2,7 +2,5 @@
 StatusOrderCanceledShort=Cancelled
 StatusOrderCanceled=Cancelled
 PDFEinsteinDescription=A complete order model
-PDFEratostheneDescription=A complete order model
-PDFProformaDescription=A complete Proforma invoice template
 StatusSupplierOrderCanceledShort=Cancelled
 StatusSupplierOrderCanceled=Cancelled
diff --git a/htdocs/langs/en_GB/projects.lang b/htdocs/langs/en_GB/projects.lang
index be0ee26f4eb..f506b1a134e 100644
--- a/htdocs/langs/en_GB/projects.lang
+++ b/htdocs/langs/en_GB/projects.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - projects
 CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referrers tab.
-FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
diff --git a/htdocs/langs/en_GB/propal.lang b/htdocs/langs/en_GB/propal.lang
index a4683b58bfe..89a6773cd33 100644
--- a/htdocs/langs/en_GB/propal.lang
+++ b/htdocs/langs/en_GB/propal.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - propal
 DocModelAzurDescription=A complete proposal model
-DocModelCyanDescription=A complete proposal model
 DefaultModelPropalCreate=Default template creation
diff --git a/htdocs/langs/en_GB/users.lang b/htdocs/langs/en_GB/users.lang
index 99d06414135..33514bcb0de 100644
--- a/htdocs/langs/en_GB/users.lang
+++ b/htdocs/langs/en_GB/users.lang
@@ -5,7 +5,6 @@ RemoveFromGroup=Remove from a group
 ConfirmPasswordReset=Confirm password change
 NonAffectedUsers=Non-assigned users
 UsePersonalValue=Use a personal choice
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Permission granted through inherited rights from one of the user groups.
 UserWillBeInternalUser=Created user will be an internal user (because they are not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because they are linked to a particular third party)
diff --git a/htdocs/langs/en_GB/website.lang b/htdocs/langs/en_GB/website.lang
index 66eedde4939..ef8e16da6ad 100644
--- a/htdocs/langs/en_GB/website.lang
+++ b/htdocs/langs/en_GB/website.lang
@@ -1,4 +1,2 @@
 # Dolibarr language file - Source file is en_US - website
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge an SEO URL when the website is run from a Virtual host of a Web server (like Apache, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index ad87b77f8aa..89d0c0fbdb8 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -1,12 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
-YouCanSubmitFile=You can upload the .zip file of module package from here:
-ExternalModule=External module
 Module20Name=Quotations
 Module20Desc=Management of quotations
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
 Permission21=Read quotations
 Permission22=Create/modify quotations
 Permission24=Validate quotations
@@ -14,18 +8,11 @@ Permission25=Send quotations
 Permission26=Close quotations
 Permission27=Delete quotations
 Permission28=Export quotations
-DictionaryCivility=Honorific titles
-ValueOfConstantKey=Value of a configuration constant
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 PropalSetup=Quotation module setup
 ProposalsNumberingModules=Quotation numbering models
 ProposalsPDFModules=Quotation documents models
 FreeLegalTextOnProposal=Free text on quotations
 WatermarkOnDraftProposal=Watermark on draft quotations (none if empty)
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersInvoiceModel=Complete template of Vendor Invoice
 MailToSendProposal=Customer quotations
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_IN/bills.lang b/htdocs/langs/en_IN/bills.lang
index 2f4fcf8b1e9..28c917fc8f8 100644
--- a/htdocs/langs/en_IN/bills.lang
+++ b/htdocs/langs/en_IN/bills.lang
@@ -1,8 +1,3 @@
 # Dolibarr language file - Source file is en_US - bills
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 RelatedCommercialProposals=Related quotations
-RevenueStamp=Tax stamp
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
diff --git a/htdocs/langs/en_IN/install.lang b/htdocs/langs/en_IN/install.lang
index 03e38043ed8..7384fe6fdc4 100644
--- a/htdocs/langs/en_IN/install.lang
+++ b/htdocs/langs/en_IN/install.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - install
-DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
 MigrationProposal=Data migration for quotations
diff --git a/htdocs/langs/en_IN/projects.lang b/htdocs/langs/en_IN/projects.lang
index a8becbc9085..bece63d2190 100644
--- a/htdocs/langs/en_IN/projects.lang
+++ b/htdocs/langs/en_IN/projects.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - projects
-FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 OppStatusPROPO=Quotation
diff --git a/htdocs/langs/en_IN/propal.lang b/htdocs/langs/en_IN/propal.lang
index e9479092f9b..98d690728a5 100644
--- a/htdocs/langs/en_IN/propal.lang
+++ b/htdocs/langs/en_IN/propal.lang
@@ -20,4 +20,3 @@ ActionsOnPropal=Events on quotation
 DatePropal=Date of quotation
 ProposalLine=Quotation line
 DocModelAzurDescription=A complete proposal model
-DocModelCyanDescription=A complete proposal model
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 00418e48cfe..5d7ab1c604e 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -1264,8 +1264,6 @@ BankOrderESDesc=Orden de exhibición en español
 ChequeReceiptsNumberingModule=Verifique el módulo de numeración de recibos
 MultiCompanySetup=Configuración de módulo multi-compañía
 SuppliersSetup=Configuración del módulo de proveedor
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Facturas de proveedores de numeración de modelos.
 IfSetToYesDontForgetPermission=Si se establece en un valor no nulo, no olvide proporcionar permisos a grupos o usuarios permitidos para la segunda aprobación
 PathToGeoIPMaxmindCountryDataFile=Ruta al archivo que contiene Maxmind ip a la traducción del país. <br> Ejemplos: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoLite2-Country.mmdb
diff --git a/htdocs/langs/es_CL/agenda.lang b/htdocs/langs/es_CL/agenda.lang
index 65586d280fc..45d8af34b9d 100644
--- a/htdocs/langs/es_CL/agenda.lang
+++ b/htdocs/langs/es_CL/agenda.lang
@@ -60,7 +60,6 @@ InvoiceDeleted=Factura borrada
 HOLIDAY_CREATEInDolibarr=Solicitud de licencia %s creada
 HOLIDAY_MODIFYInDolibarr=Solicitud de licencia %s modificada
 HOLIDAY_APPROVEInDolibarr=Requerimiento de ausencia %s aprovada
-HOLIDAY_VALIDATEDInDolibarr=Solicitud de licencia %s validada
 HOLIDAY_DELETEInDolibarr=Solicitud de licencia %s eliminada
 TICKET_MODIFYInDolibarr=Boleto %s modificado
 TICKET_ASSIGNEDInDolibarr=Boleto %s asignado
diff --git a/htdocs/langs/es_CL/bills.lang b/htdocs/langs/es_CL/bills.lang
index aeb6b873638..c3e43cf8438 100644
--- a/htdocs/langs/es_CL/bills.lang
+++ b/htdocs/langs/es_CL/bills.lang
@@ -43,8 +43,6 @@ CustomersInvoices=Facturas de clientes
 SupplierInvoice=Factura del proveedor
 SupplierBill=Factura del proveedor
 SupplierBills=facturas de proveedores
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
 paymentInInvoiceCurrency=en la moneda de las facturas
 DeletePayment=Eliminar pago
 ConfirmDeletePayment=¿Seguro que quieres eliminar este pago?
@@ -162,18 +160,10 @@ NumberOfBillsByMonth=Nº de facturas al mes.
 AmountOfBills=Cantidad de facturas
 AmountOfBillsHT=Importe de las facturas (neto de impuestos)
 AmountOfBillsByMonthHT=Importe de facturas por mes (neto de impuestos)
-ShowSocialContribution=Mostrar impuesto social / fiscal
-ShowBill=Mostrar factura
-ShowInvoice=Mostrar factura
-ShowInvoiceReplace=Mostrar reemplazo de factura
-ShowInvoiceAvoir=Mostrar nota de crédito
-ShowInvoiceDeposit=Mostrar factura de pago
-ShowInvoiceSituation=Mostrar factura de situación
 UseSituationInvoicesCreditNote=Permitir situación factura nota de crédito
 setPaymentConditionsShortRetainedWarranty=Establecer condiciones de pago de garantía retenidas
 setretainedwarranty=Establecer garantía retenida
 setretainedwarrantyDateLimit=Establecer límite de fecha de garantía retenida
-ShowPayment=Mostrar pago
 AlreadyPaidBack=Ya pagado
 AlreadyPaidNoCreditNotesNoDeposits=Ya pagado (sin notas de crédito y anticipos)
 Abandoned=Abandonado
@@ -386,7 +376,7 @@ NoteListOfYourUnpaidInvoices=Nota: Esta lista contiene solo facturas para tercer
 YouMustCreateInvoiceFromThird=Esta opción solo está disponible cuando se crea una factura desde la pestaña &quot;Cliente&quot; de un tercero
 YouMustCreateInvoiceFromSupplierThird=Esta opción solo está disponible cuando se crea una factura desde la pestaña &quot;Proveedor&quot; de un tercero
 YouMustCreateStandardInvoiceFirstDesc=Primero debe crear una factura estándar y convertirla en "plantilla" para crear una nueva factura de plantilla
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
 PDFSpongeDescription=Factura PDF plantilla de esponja. Una plantilla de factura completa.
 PDFCrevetteDescription=Plantilla de factura en PDF Crevette. Una plantilla de factura completa para facturas de situación
 TerreNumRefModelDesc1=Número de devolución con formato %saaam-nnnn para facturas estándar y %saaam-nnnn para notas de crédito donde yy es año, mm es mes y nnnn es una secuencia sin interrupción y sin retorno a 0
diff --git a/htdocs/langs/es_CL/install.lang b/htdocs/langs/es_CL/install.lang
index c0d5b6d2ea1..f9a48684eac 100644
--- a/htdocs/langs/es_CL/install.lang
+++ b/htdocs/langs/es_CL/install.lang
@@ -72,7 +72,6 @@ GoToDolibarr=Ir a Dolibarr
 GoToSetupArea=Ir a Dolibarr (área de configuración)
 GoToUpgradePage=Ir a la página de actualización de nuevo
 WithNoSlashAtTheEnd=Sin la barra "/" al final
-DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
 AdminLoginAlreadyExists=La cuenta de administrador de Dolibarr &#39; <b>%s</b> &#39; ya existe. Vuelve si quieres crear otro.
 FailedToCreateAdminLogin=Error al crear la cuenta de administrador de Dolibarr.
 WarningRemoveInstallDir=Advertencia, por razones de seguridad, una vez que se complete la instalación o la actualización, debe agregar un archivo llamado <b>install.lock</b> en el directorio de documentos de Dolibarr para evitar nuevamente el uso accidental / malicioso de las herramientas de instalación.
diff --git a/htdocs/langs/es_CL/orders.lang b/htdocs/langs/es_CL/orders.lang
index 0412e89874e..e876b0ea557 100644
--- a/htdocs/langs/es_CL/orders.lang
+++ b/htdocs/langs/es_CL/orders.lang
@@ -113,9 +113,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constante COMMANDE_SUPPLIER_ADDON no de
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON no definido
 Error_OrderNotChecked=No hay pedidos para facturar seleccionados
 PDFEinsteinDescription=A complete order model
-PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=Un modelo de orden simple
-PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Pagar Pedidos
 NoOrdersToInvoice=No hay pedidos facturables
 CloseProcessedOrdersAutomatically=Clasifique "Procesado" todas las órdenes seleccionadas.
diff --git a/htdocs/langs/es_CL/propal.lang b/htdocs/langs/es_CL/propal.lang
index 58374a1467b..51a8162c256 100644
--- a/htdocs/langs/es_CL/propal.lang
+++ b/htdocs/langs/es_CL/propal.lang
@@ -60,7 +60,6 @@ TypeContact_propal_external_BILLING=Contacto cliente de facturación cotización
 TypeContact_propal_external_CUSTOMER=Contacto cliente seguimiento cotización
 TypeContact_propal_external_SHIPPING=Contacto con el cliente para la entrega
 DocModelAzurDescription=A complete proposal model
-DocModelCyanDescription=A complete proposal model
 DefaultModelPropalCreate=Creación de modelo por defecto
 DefaultModelPropalToBill=Modelo por defecto al cerrar una cotización (a facturar)
 DefaultModelPropalClosed=Modelo por defecto al cerrar una cotización (no facturado)
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index 5ae76dc82e1..66f20ac1b65 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -1016,8 +1016,6 @@ BankSetupModule=Configuración del módulo bancario
 BankOrderShow=Mostrar el orden de las cuentas bancarias para los países que utilizan "número bancario detallado"
 BankOrderESDesc=Orden de visualización en español
 MultiCompanySetup=Configuración del módulo multiempresa
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersInvoiceModel=Complete template of Vendor Invoice
 NoteOnPathLocation=Tenga en cuenta que su archivo de datos de IP a país debe estar dentro de un directorio que su PHP pueda leer (Verifique su configuración de PHP open_basedir y los permisos del sistema de archivos).
 YouCanDownloadFreeDatFileTo=Puede descargar una <b> versión demo gratuita </b> del archivo de país de Maxmind GeoIP en %s.
 YouCanDownloadAdvancedDatFileTo=También puede descargar una versión más completa de <b>, con actualizaciones, </b> del archivo de país de Maxmind GeoIP en %s.
diff --git a/htdocs/langs/es_CO/bills.lang b/htdocs/langs/es_CO/bills.lang
index b2c2ff15057..42a4cf4a751 100644
--- a/htdocs/langs/es_CO/bills.lang
+++ b/htdocs/langs/es_CO/bills.lang
@@ -38,8 +38,6 @@ InvoiceCustomer=Factura del cliente
 CustomerInvoice=Factura del cliente
 CustomersInvoices=Facturas de clientes
 SupplierBills=proveedores facturas
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
 paymentInInvoiceCurrency=en facturas moneda
 DeletePayment=Eliminar pago
 ConfirmDeletePayment=¿Estás seguro de que quieres eliminar este pago?
@@ -141,14 +139,6 @@ NumberOfBillsByMonth=Nº de facturas al mes.
 AmountOfBills=Cantidad de facturas
 AmountOfBillsHT=Importe de las facturas (neto de impuestos)
 AmountOfBillsByMonthHT=Monto de facturas por mes (neto de impuestos)
-ShowSocialContribution=Mostrar impuesto social / fiscal
-ShowBill=Mostrar factura
-ShowInvoice=Mostrar factura
-ShowInvoiceReplace=Mostrar factura de sustitución
-ShowInvoiceAvoir=Mostrar nota de credito
-ShowInvoiceDeposit=Mostrar factura de anticipo
-ShowInvoiceSituation=Mostrar factura de situación
-ShowPayment=Mostrar pago
 AlreadyPaidBack=Ya pagado
 AlreadyPaidNoCreditNotesNoDeposits=Ya pagado (sin notas de crédito y pagos iniciales)
 Abandoned=Abandonado
@@ -337,7 +327,7 @@ ToMakePaymentBack=Pagar
 ListOfYourUnpaidInvoices=Lista de facturas impagadas
 NoteListOfYourUnpaidInvoices=Nota: Esta lista solo contiene facturas para terceros a los que está vinculado como representante de ventas.
 YouMustCreateStandardInvoiceFirstDesc=Primero debe crear una factura estándar y convertirla en "plantilla" para crear una nueva factura de plantilla
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
 PDFSpongeDescription=Factura PDF plantilla de esponja. Una plantilla de factura completa.
 PDFCrevetteDescription=Plantilla PDF factura Crevette. Una plantilla de factura completa para facturas de situación.
 TerreNumRefModelDesc1=Número de devolución con formato %syymm-nnnn para facturas estándar y %syymm-nnnn para notas de crédito donde yy es año, mm es mes y nnnn es una secuencia sin interrupción y sin retorno a 0
diff --git a/htdocs/langs/es_CO/orders.lang b/htdocs/langs/es_CO/orders.lang
index 17c59bea360..ddbbf00a6dc 100644
--- a/htdocs/langs/es_CO/orders.lang
+++ b/htdocs/langs/es_CO/orders.lang
@@ -8,8 +8,6 @@ StatusOrderDraft=Borrador (necesita ser validado)
 TypeContact_commande_external_BILLING=Contacto factura cliente
 TypeContact_commande_external_SHIPPING=Contacto de envío del cliente
 PDFEinsteinDescription=A complete order model
-PDFEratostheneDescription=A complete order model
-PDFProformaDescription=A complete Proforma invoice template
 StatusSupplierOrderCanceledShort=Cancelado
 StatusSupplierOrderCanceled=Cancelado
 StatusSupplierOrderDraft=Borrador (necesita ser validado)
diff --git a/htdocs/langs/es_CO/propal.lang b/htdocs/langs/es_CO/propal.lang
index 110a2292dbc..a3cee6bb843 100644
--- a/htdocs/langs/es_CO/propal.lang
+++ b/htdocs/langs/es_CO/propal.lang
@@ -5,4 +5,3 @@ PropalsDraft=Borradores
 PropalStatusDraft=Borrador (necesita ser validado)
 TypeContact_propal_external_BILLING=Contacto factura cliente
 DocModelAzurDescription=A complete proposal model
-DocModelCyanDescription=A complete proposal model
diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
index 985dcfadd4e..3c5abab95b1 100644
--- a/htdocs/langs/es_DO/admin.lang
+++ b/htdocs/langs/es_DO/admin.lang
@@ -7,7 +7,5 @@ Permission93=Eliminar impuestos e ITBIS
 DictionaryVAT=Tasa de ITBIS (Impuesto sobre ventas en EEUU)
 UnitPriceOfProduct=Precio unitario sin ITBIS de un producto
 OptionVatMode=Opción de carga de ITBIS
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersInvoiceModel=Complete template of Vendor Invoice
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index c73942cac1e..ee7219ee2f0 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -1243,8 +1243,6 @@ BankOrderESDesc=Orden de exhibición en español
 ChequeReceiptsNumberingModule=Verifique el módulo de numeración de recibos
 MultiCompanySetup=Configuración del módulo de varias empresas
 SuppliersSetup=Configuración del módulo de proveedor
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Facturas de proveedores de numeración de modelos.
 NoteOnPathLocation=Tenga en cuenta que su IP es un archivo de datos de un país debe estar en un directorio que su PHP puede leer.
 YouCanDownloadFreeDatFileTo=Puede descargar una <b> versión de demostración gratuita </b> del archivo de país Maxmind GeoIP en %s.
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index 02dbd732725..441a6d31cb8 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -233,8 +233,6 @@ DictionaryProspectStatus=Estatus del cliente potencial
 Upgrade=Actualizar
 LDAPFieldFirstName=Nombre(s)
 AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto vinculado en la vista de agenda
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersInvoiceModel=Complete template of Vendor Invoice
 ConfFileMustContainCustom=Instalar o construir un módulo externo desde la aplicación necesita guardar los archivos del módulo en el directorio <strong> %s </strong>. Para que este directorio sea procesado por Dolibarr, debe configurar su <strong> conf/conf.php </strong> para agregar las 2 líneas de directiva: <strong> $dolibarr_main_url_root_alt='/custom'; </strong> <br> <strong> $dolibarr_main_document_root_alt='%s/custom'; </strong>
 MailToSendProposal=Propuestas de clientes
 MailToSendInvoice=Facturas de clientes
diff --git a/htdocs/langs/es_MX/bills.lang b/htdocs/langs/es_MX/bills.lang
index 63ece735923..a9e388cf198 100644
--- a/htdocs/langs/es_MX/bills.lang
+++ b/htdocs/langs/es_MX/bills.lang
@@ -26,8 +26,6 @@ NoInvoiceToCorrect=Ninguna factura para corregir
 InvoiceHasAvoir=Fue fuente de una o varias notas de crédito
 InvoiceCustomer=Factura del cliente
 CustomerInvoice=Factura del cliente
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
 ConfirmDeletePayment=Are you sure you want to delete this payment ?
 PaymentAmount=Importe de pago
 BillStatusPaid=Pagado
@@ -45,5 +43,5 @@ CreditNote=Nota de crédito
 ReasonDiscount=Razón
 PaymentTypeCB=Tarjeta de crédito
 PaymentTypeShortCB=Tarjeta de crédito
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
 situationInvoiceShortcode_S=D
diff --git a/htdocs/langs/es_MX/install.lang b/htdocs/langs/es_MX/install.lang
index 254ae6b1547..32549c46947 100644
--- a/htdocs/langs/es_MX/install.lang
+++ b/htdocs/langs/es_MX/install.lang
@@ -38,7 +38,6 @@ GoToDolibarr=Ir a Dolibarr
 GoToSetupArea=Ir a Dolibarr (área de configuración)
 GoToUpgradePage=Ir a actualizar la página de nuevo
 WithNoSlashAtTheEnd=Sin la diagonal "/" al final
-DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
 DolibarrAdminLogin=Dolibarr Admin Login
 ChoosedMigrateScript=Elija script de migración
 ProcessMigrateScript=Procesamiento de script
diff --git a/htdocs/langs/es_MX/orders.lang b/htdocs/langs/es_MX/orders.lang
index 84b219f56ad..a3bb0ddd512 100644
--- a/htdocs/langs/es_MX/orders.lang
+++ b/htdocs/langs/es_MX/orders.lang
@@ -2,7 +2,5 @@
 StatusOrderCanceledShort=Cancelado
 StatusOrderCanceled=Cancelado
 PDFEinsteinDescription=A complete order model
-PDFEratostheneDescription=A complete order model
-PDFProformaDescription=A complete Proforma invoice template
 StatusSupplierOrderCanceledShort=Cancelado
 StatusSupplierOrderCanceled=Cancelado
diff --git a/htdocs/langs/es_MX/propal.lang b/htdocs/langs/es_MX/propal.lang
index fcd6f3f4488..761ead8ad71 100644
--- a/htdocs/langs/es_MX/propal.lang
+++ b/htdocs/langs/es_MX/propal.lang
@@ -4,4 +4,3 @@ PropalsDraft=Borradores
 PropalsOpened=Abierta
 PropalStatusClosedShort=Cerrada
 DocModelAzurDescription=A complete proposal model
-DocModelCyanDescription=A complete proposal model
diff --git a/htdocs/langs/es_PA/admin.lang b/htdocs/langs/es_PA/admin.lang
index 99443ee80a7..458ab5fc1b4 100644
--- a/htdocs/langs/es_PA/admin.lang
+++ b/htdocs/langs/es_PA/admin.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
 VersionUnknown=Desconocido
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersInvoiceModel=Complete template of Vendor Invoice
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index 659e7e79f39..16738012308 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -9,8 +9,6 @@ Permission93=Eliminar impuestos e IGV
 DictionaryVAT=Tasa de IGV o tasa de impuesto a las ventas
 UnitPriceOfProduct=Precio unitario sin IGV de un producto
 OptionVatMode=IGV adeudado
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersInvoiceModel=Complete template of Vendor Invoice
 MailToSendInvoice=Facturas de Clientes
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_PE/bills.lang b/htdocs/langs/es_PE/bills.lang
index 688939af29d..124c730f7cb 100644
--- a/htdocs/langs/es_PE/bills.lang
+++ b/htdocs/langs/es_PE/bills.lang
@@ -5,11 +5,9 @@ InvoiceAvoir=Nota de crédito
 InvoiceAvoirAsk=Nota de crédito para corregir factura
 InvoiceCustomer=Factura de cliente
 CustomerInvoice=Factura de cliente
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
 BillShortStatusClosedUnpaid=Cerrado
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=El resto a pagar <b>(%s %s)</b> es un descuento acordado después de la factura. Acepto perder el IGV de este descuento
 AmountOfBillsByMonthHT=Importe de las facturas por mes (Sin IGV)
 CreditNote=Nota de crédito
 VATIsNotUsedForInvoice=* IGV no aplicable  art-293B del CGI
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
diff --git a/htdocs/langs/es_PE/mrp.lang b/htdocs/langs/es_PE/mrp.lang
index a699d3a726f..adc1bbf4eb2 100644
--- a/htdocs/langs/es_PE/mrp.lang
+++ b/htdocs/langs/es_PE/mrp.lang
@@ -48,7 +48,6 @@ QtyAlreadyProduced=Cant. producida
 ConsumeOrProduce=Consumir o Producir
 ConsumeAndProduceAll=Consumir y Producir Todo
 TheProductXIsAlreadyTheProductToProduce=El producto a agregar es el producto a producir
-ForAQuantityOf1=Para una cantidad a producir de 1 BOM
 ConfirmValidateMo=Está seguro de validar esta Orden de Fabricación?
 AddNewConsumeLines=Agregar nueva linea para consumir
 ProductsToConsume=Productos para consumir
diff --git a/htdocs/langs/es_PE/propal.lang b/htdocs/langs/es_PE/propal.lang
index 8d0e582c109..14ae98682ee 100644
--- a/htdocs/langs/es_PE/propal.lang
+++ b/htdocs/langs/es_PE/propal.lang
@@ -2,4 +2,3 @@
 ProposalShort=Cotización
 PropalsOpened=Abrir
 DocModelAzurDescription=A complete proposal model
-DocModelCyanDescription=A complete proposal model
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index 7b2b8ecef64..4feb99ac81e 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -30,7 +30,5 @@ WatermarkOnDraftSupplierProposal=Marca de agua en solicitudes de precios a prove
 LDAPMemberObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
 LDAPUserObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
 LDAPContactObjectClassListExample=Lista de objectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersInvoiceModel=Complete template of Vendor Invoice
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_VE/bills.lang b/htdocs/langs/es_VE/bills.lang
index e5e74735485..d1fe99b8fcd 100644
--- a/htdocs/langs/es_VE/bills.lang
+++ b/htdocs/langs/es_VE/bills.lang
@@ -1,7 +1,5 @@
 # Dolibarr language file - Source file is en_US - bills
 BillsCustomersUnpaid=Facturas a clientes pendientes de cobro
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
 CreateCreditNote=Crear factura de abono
 BillShortStatusConverted=Pagada
 CustomerBillsUnpaid=Facturas a clientes pendientes de cobro
@@ -10,5 +8,5 @@ PaymentConditionShortPT_ORDER=Pedido
 PaymentTypeShortTRA=A validar
 VATIsNotUsedForInvoice=-
 LawApplicationPart1=-
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
 situationInvoiceShortcode_S=D
diff --git a/htdocs/langs/es_VE/orders.lang b/htdocs/langs/es_VE/orders.lang
index 1953e730541..af9af547c83 100644
--- a/htdocs/langs/es_VE/orders.lang
+++ b/htdocs/langs/es_VE/orders.lang
@@ -1,8 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 StatusOrderDeliveredShort=Emitido
 PDFEinsteinDescription=A complete order model
-PDFEratostheneDescription=A complete order model
-PDFProformaDescription=A complete Proforma invoice template
 StatusSupplierOrderDraftShort=A validar
 StatusSupplierOrderValidatedShort=Validada
 StatusSupplierOrderDelivered=Emitido
diff --git a/htdocs/langs/es_VE/propal.lang b/htdocs/langs/es_VE/propal.lang
index afb7079b24d..1740adeccf3 100644
--- a/htdocs/langs/es_VE/propal.lang
+++ b/htdocs/langs/es_VE/propal.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - propal
 PropalsOpened=Abierta
 DocModelAzurDescription=A complete proposal model
-DocModelCyanDescription=A complete proposal model
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index fa89f84c97c..8ba2e658bdb 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -14,18 +14,8 @@ WarningModuleNotActive=Le module <b>%s</b> doit être activé
 WarningOnlyPermissionOfActivatedModules=Seules les permissions liées à des modules activés sont montrées ici. Vous pouvez activer d'autres modules sur la page Accueil->Configuration->Modules.
 FormToTestFileUploadForm=Formulaire pour tester l'upload de fichiers (selon la configuration)
 IfModuleEnabled=Note: oui ne fonctionne que si le module <b>%s</b> est activé
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-YouCanSubmitFile=You can upload the .zip file of module package from here:
 Module20Name=Propales
 Module30Name=Factures
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
-ValueOfConstantKey=Value of a configuration constant
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 Target=Objectif
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersInvoiceModel=Complete template of Vendor Invoice
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_BE/bills.lang b/htdocs/langs/fr_BE/bills.lang
index 21de194f376..48d93ed5920 100644
--- a/htdocs/langs/fr_BE/bills.lang
+++ b/htdocs/langs/fr_BE/bills.lang
@@ -14,12 +14,8 @@ UsedByInvoice=Utilisée pour payer la facture %s
 PredefinedInvoices=Factures prédéfinies
 SupplierBills=factures fournisseurs
 Payment=Paiement
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
 Payments=Paiements
 DeletePayment=Supprimer paiement
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 ReceivedPayments=Paiements reçus
 ReceivedCustomersPayments=Paiements reçus de clients
 ReceivedCustomersPaymentsToValid=Paiements à valider de clients
@@ -30,7 +26,6 @@ PaymentAmount=Montant de paiement
 AddBill=Créer facture ou note de crédit
 EnterPaymentDueToCustomer=Réaliser règlement de crédits dus au client
 ErrorInvoiceAvoirMustBeNegative=Erreur, une facture de type Note de crédit doit avoir un montant négatif
-ShowInvoiceAvoir=Afficher note de crédit
 EscompteOfferedShort=Ristourne
 Discounts=Ristournes
 AddDiscount=Créer ristourne
@@ -43,5 +38,5 @@ PaymentTypeShortLIQ=En espèces
 PaymentTypeCB=Carte de crédit
 PaymentTypeShortCB=Carte de crédit
 Cash=En espèces
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
 TerreNumRefModelDesc1=Renvoie le numéro sous la forme %syymm-nnnn pour les factures et %syymm-nnnn pour les notes de crédits où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index b933b9d4c2e..a3ecbf32f06 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -19,8 +19,6 @@ UploadNewTemplate=Télécharger un nouveau modèle (s)
 SecurityFilesDesc=Définissez ici les options liées à la sécurité concernant le téléchargement de fichiers.
 AllowToSelectProjectFromOtherCompany=Sur le document d'un tiers, peut choisir un projet lié à un autre tiers
 NextValueForDeposit=Valeur suivante (acompte)
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 MultiCurrencySetup=Configuration multi-devises
 NotConfigured=Module / Application non configuré
 AllWidgetsWereEnabled=Tous les widgets disponibles sont activés
@@ -59,7 +57,6 @@ ModuleFamilyInterface=Interfaces avec les systèmes externes
 ThisIsAlternativeProcessToFollow=Il s'agit d'une configuration alternative à traiter manuellement:
 NotExistsDirect=Le répertoire racine alternatif n'est pas défini dans un répertoire existant.
 InfDirAlt=Depuis la version 3, il est possible de définir un autre répertoire racine. Cela vous permet de stocker, dans un répertoire dédié, des plug-ins et des modèles personnalisés. <br> Créez simplement un répertoire à la racine de Dolibarr (par exemple: personnalisé).
-YouCanSubmitFile=You can upload the .zip file of module package from here:
 LastStableVersion=Dernière version stable
 LastActivationDate=Dernière date d'activation
 LastActivationAuthor=Dernier auteur d'activation
@@ -101,7 +98,6 @@ Module2610Desc=Activer le serveur REST de services API de les services
 Module2660Name=WebServices appel ( client SOAP )
 Module4000Name=Gestion des ressources humaines
 Module10000Name=Sites Internet
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
 Module55000Name=Sondage, enquête ou vote
 Permission45=Exportation de projets
 Permission76=Exporter des données
@@ -129,20 +125,16 @@ DictionaryVAT=Taux de TPS/TVH ou de Taxes de Ventes
 DictionaryAccountancyJournal=Revues comptables
 DictionaryProspectStatus=Status prospection
 SetupNotSaved=Le programme d'installation n'a pas été enregistré
-ValueOfConstantKey=Value of a configuration constant
 CurrentNext=Actuel / Suivant
 DefaultMaxSizeList=Longueur maximale des listes
 CompanyObject=Objet de la compagnie
 ShowBugTrackLink=Afficher le lien "Signaler un défaut"
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 InfoDolibarr=À propos de Dolibarr
 InfoBrowser=À propos du navigateur
 InfoWebServer=À propos du serveur Web
 InfoPHP=À propos de PHP
 InfoPerf=À propos des performances
 AreaForAdminOnly=Les paramètres d'installation peuvent être définis par <b> utilisateurs d'administrateur </ b> uniquement.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 DictionaryDesc=Insérez toutes les données de référence. Vous pouvez ajouter vos valeurs par défaut.
 MiscellaneousDesc=Tous les autres paramètres liés à la sécurité sont définis ici.
 UnitPriceOfProduct=Prix unitaire (no tax) d'un produit
@@ -199,8 +191,6 @@ ApiExporerIs=Vous pouvez explorer et tester les API à l'URL
 OnlyActiveElementsAreExposed=Seuls les éléments de modules activés sont exposés
 ApiKey=Clé API
 WarningAPIExplorerDisabled=L'explorateur API a été désactivé. L'API Explorer n'est pas nécessaire pour fournir des services API. C'est un outil permettant aux développeurs de trouver / tester des API REST. Si vous avez besoin de cet outil, installez le module API REST pour l'activer.
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersInvoiceModel=Complete template of Vendor Invoice
 AccountingPeriods=Périodes de comptabilité
 AccountingPeriodCard=Période de comptabilité
 NewFiscalYear=Nouvelle période comptable
diff --git a/htdocs/langs/fr_CA/bills.lang b/htdocs/langs/fr_CA/bills.lang
index eaa8825ba8a..68989d1d124 100644
--- a/htdocs/langs/fr_CA/bills.lang
+++ b/htdocs/langs/fr_CA/bills.lang
@@ -5,12 +5,8 @@ InvoiceDepositDesc=Ce type de facture se fait lorsque l'acompte a été reçu.
 invoiceAvoirWithLines=Créer l'avoir avec les même lignes que la factures dont il est issu
 InvoiceHasAvoir=Était une source d'une ou de plusieurs notes de crédit
 PredefinedInvoices=Facture prédéfinie
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
 paymentInInvoiceCurrency=en factures de devises
 ConfirmDeletePayment=Êtes-vous sûr de vouloir supprimer ce paiement?
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 PaymentTypeDC=Carte de débit / crédit
 PaymentTypePP=Pay Pal
 CreateCreditNote=Créer avoir
@@ -35,9 +31,6 @@ ConfirmCustomerPayment=Confirmez-vous cette entrée de paiement pour <b>%s</b> %
 ConfirmSupplierPayment=Confirmez-vous cette entrée de paiement pour <b>%s</b> %s?
 ConfirmValidatePayment=Êtes-vous sûr de vouloir valider ce paiement? Aucun changement ne peut être effectué une fois le paiement validé.
 AmountOfBillsByMonthHT=Montant de factures par mois (no tax.)
-ShowSocialContribution=Afficher charge sociale
-ShowInvoiceDeposit=Afficher la facture de paiement
-ShowInvoiceSituation=Montrer facture de situation
 AlreadyPaidNoCreditNotesNoDeposits=Déjà payé (sans notes de crédit ni acomptes)
 EscompteOffered=Escompte (règlement avant échéance)
 EscompteOfferedShort=Remise
@@ -87,7 +80,7 @@ PaymentTypeShortTRA=Brouillon
 ChequeMaker=Émetteur du chèque/transfert
 DepositId=Identifiant de dépot
 YouMustCreateStandardInvoiceFirstDesc=Vous devez d'abord créer une facture standard et la convertir en «modèle» pour créer une nouvelle facture modèle
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
 PDFCrevetteDescription=Facture modèle PDF Crevette. Un modèle de facture complet pour les factures de situation
 MarsNumRefModelDesc1=Numéro de retour avec le format %syymm-nnnn pour les factures standard, %syymm-nnnn pour les factures de remplacement, %syymm-nnnn pour les factures de versement et %syymm-nnnn pour les notes de crédit où il est année, mm est le mois et nnnn est une séquence sans interruption et non Retourner à 0
 CactusNumRefModelDesc1=Numéro de retour avec le format %syymm-nnnn pour les factures standard, %syymm-nnnn pour les notes de crédit et %syymm-nnnn pour les factures de versement de paiement où yy est l'année, mm est le mois et nnnn est une séquence sans interruption et aucun retour à 0
diff --git a/htdocs/langs/fr_CA/cashdesk.lang b/htdocs/langs/fr_CA/cashdesk.lang
index 7b351fd210f..2f3da52b1f5 100644
--- a/htdocs/langs/fr_CA/cashdesk.lang
+++ b/htdocs/langs/fr_CA/cashdesk.lang
@@ -2,5 +2,3 @@
 NoVAT=Pas de TVA (TAXE) pour cette vente
 BankToPay=Compte pour le paiement
 DolibarrReceiptPrinter=Imprimante de reçu Dolibarr
-TicketVatGrouped=Group VAT by rate in tickets|receipts
-AutoPrintTickets=Automatically print tickets|receipts
diff --git a/htdocs/langs/fr_CA/categories.lang b/htdocs/langs/fr_CA/categories.lang
index ddd510a52e0..71116b8842c 100644
--- a/htdocs/langs/fr_CA/categories.lang
+++ b/htdocs/langs/fr_CA/categories.lang
@@ -22,6 +22,4 @@ ProductsCategoriesShort=Tags/catégories de produits
 MembersCategoriesShort=Tags/catégories de membres
 AccountsCategoriesShort=Étiquettes / catégories de comptes
 ProjectsCategoriesShort=Projets Tags / catégories
-ThisCategoryHasNoAccount=Cette catégorie ne contient aucun compte.
-ThisCategoryHasNoProject=Cette catégorie ne contient aucun projet.
 CatProJectLinks=Liens entre projets et tags / catégories
diff --git a/htdocs/langs/fr_CA/donations.lang b/htdocs/langs/fr_CA/donations.lang
index 9102ba55b8a..d4178883d73 100644
--- a/htdocs/langs/fr_CA/donations.lang
+++ b/htdocs/langs/fr_CA/donations.lang
@@ -2,7 +2,6 @@
 Donor=Donneur
 DeleteADonation=Supprimer un don
 ConfirmDeleteADonation=Êtes-vous sûr de vouloir supprimer ce don?
-ShowDonation=Montrer le don
 DonationsArea=Domaine de donations
 DonationStatusPromiseNotValidated=Projet de promesse
 DonationStatusPaid=Dons reçus
diff --git a/htdocs/langs/fr_CA/errors.lang b/htdocs/langs/fr_CA/errors.lang
index 9df16a4655b..967bf583d1c 100644
--- a/htdocs/langs/fr_CA/errors.lang
+++ b/htdocs/langs/fr_CA/errors.lang
@@ -59,7 +59,6 @@ ErrorSpecialCharNotAllowedForField=Les caractères spéciaux ne sont pas autoris
 ErrorNumRefModel=Une référence existe dans la base de données (%s) et n'est pas compatible avec cette règle de numérotation. Supprimez l'enregistrement ou la renommée référence pour activer ce module.
 ErrorBadMaskBadRazMonth=Erreur, mauvaise valeur de réinitialisation
 ErrorCounterMustHaveMoreThan3Digits=Le compteur doit avoir plus de 3 chiffres
-ErrorSelectAtLeastOne=Error, select at least one entry.
 ErrorProdIdAlreadyExist=%s est affecté à un autre tiers
 ErrorFailedToLoadRSSFile=Impossible d'obtenir un flux RSS. Essayez d'ajouter constante MAIN_SIMPLEXMLLOAD_DEBUG si les messages d'erreur ne fournissent pas suffisamment d'informations.
 ErrorForbidden=Accès refusé. <br> Vous essayez d'accéder à une page, zone ou fonctionnalité d'un module désactivé ou sans être dans une session authentifiée ou non autorisée pour votre utilisateur.
diff --git a/htdocs/langs/fr_CA/exports.lang b/htdocs/langs/fr_CA/exports.lang
index 9b9a43adfb2..f194dc86615 100644
--- a/htdocs/langs/fr_CA/exports.lang
+++ b/htdocs/langs/fr_CA/exports.lang
@@ -14,7 +14,6 @@ FieldsTitle=Titre des champs
 FieldTitle=Titre du champ
 Sheet=Drap
 NoImportableData=Aucune donnée importable (aucun module avec des définitions permettant d'importer des données)
-SQLUsedForExport=SQL Request used to extract data
 LineLabel=Étiquette de ligne
 LineDescription=Description de la ligne
 LineUnitPrice=Prix ​​unitaire de la ligne
diff --git a/htdocs/langs/fr_CA/install.lang b/htdocs/langs/fr_CA/install.lang
index fce602a3195..b9fa031ae48 100644
--- a/htdocs/langs/fr_CA/install.lang
+++ b/htdocs/langs/fr_CA/install.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - install
 ErrorPHPDoesNotSupportCurl=Votre installation PHP ne prend pas en charge Curl.
 AdminLoginCreatedSuccessfuly=Connexion administrateur Dolibarr '<b>%s</b>' créé avec succès.
-DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
 FailedToCreateAdminLogin=Impossible de créer un compte administrateur Dolibarr.
 MigrationContractsIncoherentCreationDateUpdateSuccess=Correction mauvaise valeur de la date de création du contrat effectuée avec succès
 MigrationBankTransfertsUpdate=Mettre à jour les liens entre la saisie bancaire et un virement bancaire
diff --git a/htdocs/langs/fr_CA/users.lang b/htdocs/langs/fr_CA/users.lang
index a6633222cdc..81db7ef3370 100644
--- a/htdocs/langs/fr_CA/users.lang
+++ b/htdocs/langs/fr_CA/users.lang
@@ -7,7 +7,6 @@ ConfirmEnableUser=Êtes-vous sûr de vouloir activer l'utilisateur <b>%s</b>?
 ConfirmReinitPassword=Êtes-vous sûr de vouloir générer un nouveau mot de passe pour l'utilisateur <b>%s</b>?
 ConfirmSendNewPassword=Êtes-vous sûr de vouloir générer et envoyer un nouveau mot de passe pour l'utilisateur <b> %s</b>?
 LastUsersCreated=Derniers %s utilisateurs créés
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 ConfirmCreateContact=Êtes-vous sûr de vouloir créer un compte Dolibarr pour ce contact?
 ConfirmCreateLogin=Êtes-vous sûr de vouloir créer un compte Dolibarr pour ce membre?
 ConfirmCreateThirdParty=Êtes-vous sûr de vouloir créer un tiers pour ce membre?
diff --git a/htdocs/langs/fr_CA/website.lang b/htdocs/langs/fr_CA/website.lang
index 5aefcc130d6..5255b2f9da5 100644
--- a/htdocs/langs/fr_CA/website.lang
+++ b/htdocs/langs/fr_CA/website.lang
@@ -7,5 +7,3 @@ EditMenu=Menu Edition
 ViewSiteInNewTab=Afficher le site dans un nouvel onglet
 ViewPageInNewTab=Afficher la page dans un nouvel onglet
 ViewWebsiteInProduction=Afficher le site Web à l'aide d'URL d'accueil
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 157933ed993..839cbc858f8 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 0ffb092fea4..9f3da177793 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Webサーバのユーザ/グループ
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=データを格納するデータベース·キャラクタ·セット
 DBSortingCharset=データをソートするには、データベース·キャラクタ·セット
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=モジュール<b>%sを</b>有効<b>に</b>する必要<b>が</b>あります
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=デフォルトでは、提案されたIRPFは0です。ルールの終わり。
 LocalTax2IsUsedExampleES=スペインでは、フリーランサーとサービスモジュールの税制を選択した企業に提供する独立した専門家。
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=ユーザーモジュールのセットアップ
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=マルチ会社のモジュールのセットアップ
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=ZIP
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 6983da51ab6..286d0b7d1ae 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=請求書の金額
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=月別請求書の金額（税引後）
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=請求書を表示する
-ShowInvoice=請求書を表示する
-ShowInvoiceReplace=請求書を交換見せる
-ShowInvoiceAvoir=クレジットメモを表示する
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=支払を表示する
 AlreadyPaid=既に支払わ
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=ステータス
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index 863b691b5b1..b5359c7da1e 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -191,7 +191,7 @@ RulesVATDueServices=- サービスについては、報告書は、請求書の
 RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=注：材料の資産については、それがより公正に配信した日付を使用する必要があります。
 ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
-PercentOfInvoice=％％/請求書
+PercentOfInvoice=%%/請求書
 NotUsedForGoods=財では使用しません
 ProposalStats=提案に関する統計
 OrderStats=注文に関する統計
@@ -262,3 +262,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/ja_JP/donations.lang b/htdocs/langs/ja_JP/donations.lang
index c3841279a47..68a136bd285 100644
--- a/htdocs/langs/ja_JP/donations.lang
+++ b/htdocs/langs/ja_JP/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Create a donation
 NewDonation=新しい寄付
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Show donation
 PublicDonation=義援金
 DonationsArea=寄付のエリア
 DonationStatusPromiseNotValidated=ドラフトの約束
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=ドラフト
 DonationStatusPromiseValidatedShort=検証
 DonationStatusPaidShort=受信された
 DonationTitle=Donation receipt
+DonationDate=Donation date
 DonationDatePayment=支払期日
 ValidPromess=約束を検証する
 DonationReceipt=Donation receipt
diff --git a/htdocs/langs/ja_JP/interventions.lang b/htdocs/langs/ja_JP/interventions.lang
index 7e4f9e4e533..f6278c8556d 100644
--- a/htdocs/langs/ja_JP/interventions.lang
+++ b/htdocs/langs/ja_JP/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=フォローアップ顧客との接触
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/ja_JP/modulebuilder.lang b/htdocs/langs/ja_JP/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/ja_JP/modulebuilder.lang
+++ b/htdocs/langs/ja_JP/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/ja_JP/multicurrency.lang b/htdocs/langs/ja_JP/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/ja_JP/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index 06c0202207e..b374f5a404b 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index d0c17d5ab4d..b3e1aad6d54 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/ja_JP/zapier.lang b/htdocs/langs/ja_JP/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/ja_JP/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang
index 527f9da1546..4606f2d05f1 100644
--- a/htdocs/langs/nl_BE/admin.lang
+++ b/htdocs/langs/nl_BE/admin.lang
@@ -117,7 +117,6 @@ SetupIsReadyForUse=Module-implementatie is voltooid. U moet de module in uw toep
 NotExistsDirect=De alternatieve hoofdmap is niet gedefinieerd voor een bestaande map. <br>
 InfDirAlt=Sinds versie 3 is het mogelijk om een alternatieve rootmap te definiëren. Hiermee kunt u in een speciale map plug-ins en aangepaste sjablonen opslaan. <br> Maak gewoon een map aan in de root van Dolibarr (bv: aangepast). <br>
 InfDirExample=<br> <strong>Verklaar</strong> het dan in het bestand <strong>conf.php</strong> <br> $ Dolibarr_main_url_root_alt='/custom' <br> $ Dolibarr_main_document_root_alt='/pad/of/Dolibarr/htdocs/custom' <br> Als deze regels worden becommentarieerd met "#", schakelt u ze gewoon uit door het teken "#" te verwijderen.
-YouCanSubmitFile=You can upload the .zip file of module package from here:
 LastStableVersion=Nieuwste stabiele versie
 GenericMaskCodes2=<b>{cccc}</b> de clientcode van n tekens <br> <b>{cccc000}</b> de <b>klantcode</b> op n tekens wordt gevolgd door een teller voor de klant. Deze teller die aan de klant is toegewezen, wordt tegelijkertijd opnieuw ingesteld als de globale teller. <br> <b>{tttt}</b> De code van het type van een derde partij op n tekens (zie menu Home - Instellingen - Woordenboek - Typen derde partijen). Als u deze tag toevoegt, verschilt de teller voor elk type derde partij. <br>
 GenericMaskCodes4a=<u>Voorbeeld op de 99e %s van de derde partij TheCompany, met datum 31-01-2007:</u> <br>
@@ -161,16 +160,12 @@ ModuleCompanyCodePanicum=Retourneer een lege boekhoudcode.
 Module40Name=Verkoper
 Module1780Name=Labels/Categorien
 Module1780Desc=Label/categorie maken (producten, klanten, leveranciers, contacten of leden)
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
 Permission1004=Bekijk voorraadmutaties
 Permission1005=Creëren / wijzigen voorraadmutaties
-ValueOfConstantKey=Value of a configuration constant
 InfoWebServer=Over webserver
 InfoDatabase=Over de database
 AccountantFileNumber=Code voor boekhouder
 AvailableModules=Beschikbare app / modules
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersInvoiceModel=Complete template of Vendor Invoice
 SalariesSetup=Setup van module salarissen
 MailToSendProposal=Klant voorstellen
 MailToSendInvoice=Klantfacturen
diff --git a/htdocs/langs/nl_BE/agenda.lang b/htdocs/langs/nl_BE/agenda.lang
index f439accb022..fc56ebd9bba 100644
--- a/htdocs/langs/nl_BE/agenda.lang
+++ b/htdocs/langs/nl_BE/agenda.lang
@@ -25,7 +25,6 @@ ProposalDeleted=Offerte verwijderd
 HOLIDAY_CREATEInDolibarr=Verzoek om verlof %s gemaakt
 HOLIDAY_MODIFYInDolibarr=Verzoek om verlof %s gewijzigd
 HOLIDAY_APPROVEInDolibarr=Verzoek om verlof %s goedgekeurd
-HOLIDAY_VALIDATEDInDolibarr=Verzoek om verlof %s gevalideerd
 HOLIDAY_DELETEInDolibarr=Verzoek om verlof %s verwijderd
 EXPENSE_REPORT_CREATEInDolibarr=Onkostenrapport %s aangemaakt
 EXPENSE_REPORT_VALIDATEInDolibarr=Onkostenrapport %s gevalideerd
diff --git a/htdocs/langs/nl_BE/bills.lang b/htdocs/langs/nl_BE/bills.lang
index f6ea88ac2fd..7d08e4fdf03 100644
--- a/htdocs/langs/nl_BE/bills.lang
+++ b/htdocs/langs/nl_BE/bills.lang
@@ -6,8 +6,6 @@ BillsCustomersUnpaidForCompany=Onbetaalde afnemersfacturen voor %s
 DisabledBecauseNotErasable=Niet mogelijk omdat het niet kan worden gewist
 PaymentBack=Teruggave
 CustomerInvoicePaymentBack=Teruggave
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 CreateCreditNote=Aanmaak krediet nota
 DoPayment=Doe een betaling
 DoPaymentBack=Doe een terugbetaling
@@ -17,7 +15,6 @@ BillShortStatusClosedUnpaid=Afgesloten
 ErrorVATIntraNotConfigured=Intracommunautair btw-nummer nog niet gedefinieerd
 LastCustomersBills=Laatste %s klantfacturen
 AmountOfBillsByMonthHT=Factuurbedrag per maand (ex BTW)
-ShowInvoiceSituation=Toon situatie factuur
 RemainderToBill=Nog te factureren
 GlobalDiscount=Globale korting
 PaymentRef=Betalingsref.
@@ -39,7 +36,7 @@ PaymentTypeTRA=Bank cheque
 ChequeMaker=Cheque / Transfer uitvoerder
 DepositId=Id storting
 ShowUnpaidAll=Bekijk alle onbetaalde facturen
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
 TypeContact_facture_external_BILLING=Klant contact
 NotLastInCycle=Deze factuur is niet de laatste in de rij en mag niet worden aangepast.
 PDFCrevetteSituationInvoiceLineDecompte=Situatie factuur - AANTAL
diff --git a/htdocs/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang
index 9eb2efd346c..3a8de6667d0 100644
--- a/htdocs/langs/pt_BR/agenda.lang
+++ b/htdocs/langs/pt_BR/agenda.lang
@@ -70,7 +70,6 @@ PRODUCT_DELETEInDolibarr=Produto%s exluído
 HOLIDAY_CREATEInDolibarr=Solicitação de licença %s criada
 HOLIDAY_MODIFYInDolibarr=Solicitação de licença %s alterada
 HOLIDAY_APPROVEInDolibarr=Solicitação de licença %s aprovada
-HOLIDAY_VALIDATEDInDolibarr=Solicitação de licença %s validada
 HOLIDAY_DELETEInDolibarr=Solicitação de licença %s excluída
 EXPENSE_REPORT_CREATEInDolibarr=Relatório de despesas %s criado
 EXPENSE_REPORT_VALIDATEInDolibarr=relatório de despesas %s validado
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index 47a4ce850a6..093a461809a 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -163,13 +163,6 @@ NumberOfBills=Nº. de faturas
 NumberOfBillsByMonth=Nº. de faturas por mês
 AmountOfBills=Quantidade de faturas
 AmountOfBillsByMonthHT=Quantidade de faturas por mês (líquido de taxa)
-ShowSocialContribution=Mostrar contribuição social
-ShowBill=Mostrar fatura
-ShowInvoice=Mostrar fatura
-ShowInvoiceReplace=Mostrar fatura de substituição
-ShowInvoiceAvoir=Mostrar nota de crédito
-ShowInvoiceDeposit=Mostrar fatura de pagamento
-ShowInvoiceSituation=Exibir a situação da fatura
 UseSituationInvoices=Permitir fatura de situação
 UseSituationInvoicesCreditNote=Permitir nota de crédito da fatura da situação
 Retainedwarranty=Garantia retida
@@ -352,7 +345,7 @@ NoteListOfYourUnpaidInvoices=Nota: Essa lista contém faturas de terceiros que v
 YouMustCreateInvoiceFromThird=Esta opção só está disponível ao criar uma fatura na guia "Cliente" de terceiros
 YouMustCreateInvoiceFromSupplierThird=Essa opção só está disponível ao criar uma fatura na guia "Fornecedor" de terceiros
 YouMustCreateStandardInvoiceFirstDesc=Você deve criar antes uma fatura padrão e convertê-la em um "tema" para criar um novo tema de fatura
-PDFCrabeDescription=Modelo de fatura PDF Crabe. Um modelo de fatura completo 
+PDFCrabeDescription=Modelo de fatura PDF Crabe. Um modelo de fatura completo
 PDFCrevetteDescription=Tema Crevette para fatura em PDF. Um tema completo para a situação das faturas
 TerreNumRefModelDesc1=Retorna número com formato %syymm-nnnn para padrão de faturas e %syymm-nnnn para notas de crédito onde yy é ano, mm é mês e nnnn é uma sequência numérica sem quebra e sem retorno para 0
 MarsNumRefModelDesc1=Número de retorno com o formato %syymm-nnnn para faturas padrão, %syymm-nnnn para faturas de substituição, %syymm-nnnn para faturas de adiantamento e %syymm-nnnn para notas de crédito onde yy é ano, mm é mês e nnnn é uma seqüência sem interrupção e não retornar para 0
diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang
index 4d6beb8961b..732f54fd2b3 100644
--- a/htdocs/langs/pt_BR/categories.lang
+++ b/htdocs/langs/pt_BR/categories.lang
@@ -58,12 +58,6 @@ AccountsCategoriesShort=Tags/categorias Contas
 ProjectsCategoriesShort=Projetos tags/categorias
 UsersCategoriesShort=Tags / categorias de usuários
 StockCategoriesShort=Tags / categorias de armazém
-ThisCategoryHasNoProduct=Esta categoria não contém nenhum produto.
-ThisCategoryHasNoSupplier=Esta categoria não contém nenhum fornecedor
-ThisCategoryHasNoCustomer=Esta categoria não contém a nenhum cliente.
-ThisCategoryHasNoMember=Esta categoria nao contem nenhum membro.
-ThisCategoryHasNoContact=Esta categoria nao contem nenhum contato.
-ThisCategoryHasNoProject=Esta categoria nao contem nenhum projeto.
 CategId=ID Tag / categoria
 CatSupList=Lista de tags / categorias de fornecedores
 CatCusList=Lista de cliente / perspectivas de tags / categorias
diff --git a/htdocs/langs/pt_BR/donations.lang b/htdocs/langs/pt_BR/donations.lang
index b6ffd6a8653..60d99b0518d 100644
--- a/htdocs/langs/pt_BR/donations.lang
+++ b/htdocs/langs/pt_BR/donations.lang
@@ -6,7 +6,6 @@ AddDonation=Criar uma doação
 NewDonation=Nova doação
 DeleteADonation=Excluir uma doação
 ConfirmDeleteADonation=Tem certeza que quer remover esta doacao?
-ShowDonation=Mostrar doação
 PublicDonation=Doação pública
 DonationsArea=Área de doações
 DonationStatusPromiseNotValidated=Promessa não validada
diff --git a/htdocs/langs/pt_BR/mrp.lang b/htdocs/langs/pt_BR/mrp.lang
index 20a3e9f60ed..c6203bd824e 100644
--- a/htdocs/langs/pt_BR/mrp.lang
+++ b/htdocs/langs/pt_BR/mrp.lang
@@ -58,7 +58,6 @@ ConsumeOrProduce=Consumir ou Produzir
 ConsumeAndProduceAll=Consumir e produzir todos
 Manufactured=Fabricado
 TheProductXIsAlreadyTheProductToProduce=O produto a ser adicionado já é o produto a ser produzido.
-ForAQuantityOf1=Para uma quantidade a produzir de 1
 ConfirmValidateMo=Tem certeza de que deseja validar esta ordem de fabricação?
 ConfirmProductionDesc=Ao clicar em '%s', você validará o consumo e / ou produção para as quantidades definidas. Isso também atualizará o estoque e registrará movimentos de estoque.
 ProductionForRef=Produção de %s
diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang
index 3c6b39a8fa1..79cde2cf111 100644
--- a/htdocs/langs/pt_BR/orders.lang
+++ b/htdocs/langs/pt_BR/orders.lang
@@ -111,7 +111,7 @@ TypeContact_order_supplier_external_SHIPPING=Contato de remessa do fornecedor
 TypeContact_order_supplier_external_CUSTOMER=Ordem de acompanhamento de contato do fornecedor
 Error_OrderNotChecked=Nenhum pedido seleçionado para se faturar
 OrderByEMail=E-mail
-PDFEinsteinDescription=Modelo de pedido completo 
+PDFEinsteinDescription=Modelo de pedido completo
 PDFEratostheneDescription=Modelo completo de pedidos
 PDFEdisonDescription=O modelo simplificado do pedido
 PDFProformaDescription=Modelo completo de fatura Proforma
diff --git a/htdocs/langs/pt_BR/website.lang b/htdocs/langs/pt_BR/website.lang
index 65c7144a2c1..13dbbd3b7e6 100644
--- a/htdocs/langs/pt_BR/website.lang
+++ b/htdocs/langs/pt_BR/website.lang
@@ -47,7 +47,6 @@ FetchAndCreate=Procure e comece a criar
 BlogPost=Postagem do blog
 WebsiteAccounts=Conta do website
 AddWebsiteAccount=Criar conta do site
-BackToListOfThirdParty=Voltar à lista para Terceiros
 DisableSiteFirst=Desativar o site primeiro
 MyContainerTitle=Título do meu site
 AnotherContainer=É assim que se inclui o conteúdo de outra página / contêiner (você pode ter um erro aqui se ativar o código dinâmico porque o subcontêiner incorporado pode não existir)
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index 334fa9ec1b9..e328934eda3 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -26,7 +26,7 @@ BackToChartofaccounts=回到會計科目表
 Chartofaccounts=會計科目表
 CurrentDedicatedAccountingAccount=目前的專用帳戶
 AssignDedicatedAccountingAccount=新帳戶指派給
-InvoiceLabel=帳單標籤
+InvoiceLabel=發票標籤
 OverviewOfAmountOfLinesNotBound=行數金額的概述未綁定到會計帳戶
 OverviewOfAmountOfLinesBound=行數金額的概述已綁定到會計帳戶
 OtherInfo=其他資訊
@@ -121,6 +121,7 @@ InvoiceLinesDone=已關聯的各式發票
 ExpenseReportLines=費用報表關聯數
 ExpenseReportLinesDone=已關連的費用報表
 IntoAccount=會計項目的關聯
+TotalForAccount=會計科目總計
 
 
 Ventilate=關聯
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=註冊捐款的會計科目
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=用於註冊訂閱的會計科目
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=所購買產品的預設會計科目（如果在產品表中未定義則使用）
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=預設情況下，在EEC中所購買產品的會計帳戶（如果未在產品單中定義則使用）
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=預設情況下，用於在EEC以外購買產品並且輸入產品的會計帳戶（如果在產品表中未定義，則使用）
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=所銷售產品的預設會計科目（如果在產品表中未定義則使用）
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=在歐盟所販賣產品的預設會計科目（如果在產品表中未定義則使用）
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=在歐盟以外地區所販賣產品並且輸出的預設會計科目（如果在產品表中未定義則使用）
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=委外服務預設會計項目(若沒在服務頁中定義時使用)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=預設情況下，在EEC中購買服務的會計帳戶（如果未在服務單中定義，則使用）
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=預設情況下，用於在EEC以外購買服務並且輸入服務的會計帳戶（如果未在服務單中定義，則使用）
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=服務收入預設會計項目(若沒在服務頁中定義時使用)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=在歐盟國家中服務收入預設會計項目(若沒在服務頁中定義時使用)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=在歐盟以外國家中服務收入預設會計項目(若沒在服務頁中定義時使用)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=未知合作方
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=未定義合作方帳戶或未知的合作方。封鎖錯誤。
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=未定義的未知合作方帳戶和等待帳戶。封鎖錯誤
 PaymentsNotLinkedToProduct=付款未連結到任何產品/服務
+OpeningBalance=初期餘額
 ShowOpeningBalance=顯示初期餘額
 HideOpeningBalance=隱藏初期餘額
+ShowSubtotalByGroup=依組顯示小計
 
 Pcgtype=會計項目大類
 PcgtypeDesc=用作某些會計報告的預定義“過濾器”和“分組”標準的科目組。例如“ INCOME”或“ EXPENSE”用作產品的會計科目組，以建立費用/收入報告。
 
+Reconcilable=可和解
+
 TotalVente=稅前總周轉
 TotalMarge=總銷貨淨利
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=匯出為Quadratus QuadraCompta
 Modelcsv_ebp=匯出為EBP
 Modelcsv_cogilog=匯出為Cogilog
 Modelcsv_agiris=匯出到Agiris
-Modelcsv_LDCompta=匯出為LD Compta（v9及更高版本）（測試）
+Modelcsv_LDCompta=LD Compta（v9）（測試）匯出
+Modelcsv_LDCompta10=LD Compta用之匯出（v10及更高版本）
 Modelcsv_openconcerto=匯出為OpenConcerto（測試）
 Modelcsv_configurable=匯出為可設置CSV
 Modelcsv_FEC=匯出為FEC
 Modelcsv_Sage50_Swiss=匯出為Sage 50 Switzerland
+Modelcsv_winfic=匯出Winfic-eWinfic-WinSis Compta
 ChartofaccountsId=會計項目表ID
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=銷售模式
 OptionModeProductSellIntra=在EEC中的銷售模式已匯出
 OptionModeProductSellExport=在其他國家/城市中的銷售模式已匯出
 OptionModeProductBuy=採購模式
+OptionModeProductBuyIntra=在EEC中購買輸入模式
+OptionModeProductBuyExport=在EEC以外地區購買輸入模式
 OptionModeProductSellDesc=顯示銷售產品的會計項目
 OptionModeProductSellIntraDesc=顯示所有在EEC中有銷售會計科目的產品。
 OptionModeProductSellExportDesc=顯示所有在除了EEC地區(其他國家)中有銷售會計科目的產品。
 OptionModeProductBuyDesc=顯示採購所有產品的會計項目
+OptionModeProductBuyIntraDesc=顯示所有具有在EEC中購買之會計帳戶的產品。
+OptionModeProductBuyExportDesc=顯示所有具有其他國外購買之會計帳戶的產品。
 CleanFixHistory=移除會計代號將不再出現在會計項目表中。
 CleanHistory=針對選定年度重設全部關聯性
 PredefinedGroups=預定義的群組
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=帳戶已從群組中刪除
 SaleLocal=本地銷售
 SaleExport=出口銷售
 SaleEEC=在歐盟銷售
+SaleEECWithVAT=在EEC中具有營業稅的銷售不為空，因此我們認為這不是內部銷售，建議的帳戶是標準產品帳戶。
+SaleEECWithoutVATNumber=在EEC中銷售沒有營業稅但合作方的營業稅ID未定義。我們退回標準銷售的產品帳戶。您可以根據需要修改合作方或產品帳戶的營業稅ID。
 
 ## Dictionary
 Range=會計項目範圍
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index d91885d1812..5933ccb0a9e 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=網頁伺服器用戶/組別
 NoSessionFound=您的PHP設定似乎不允許列出活動程序。用於保存程序的資料夾（ <b>%s</b> ）可能受到保護（例如，通過OS權限或PHP指令open_basedir）。
 DBStoringCharset=儲存資料的資料庫字集
 DBSortingCharset=資料排序以資料庫字集
+HostCharset=主機字符集
 ClientCharset=客戶端字集
 ClientSortingCharset=客戶端整理
 WarningModuleNotActive=模組<b>%s</b>必須啓用
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=勾選框
 ExtrafieldCheckBoxFromList=表格勾選框
 ExtrafieldLink=連結到項目
 ComputedFormula=計算欄位
-ComputedFormulaDesc=您可以在此處輸入使用項目的其他屬性或任何PHP編碼的公式，以獲得動態計算值。 您可以使用任何與PHP相容的公式，包括“？” 條件運算符號和後續全域項目: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>警告</strong>: $ object的僅某些屬性可能可用。 如果您需要一個未載入的屬性，請像第二個範例一樣，將項目自己提取到公式中。<br>使用計算欄位表示著您無法從界面輸入任何值。 另外，如果存在語法錯誤，則公式可能不返回任何內容。<br><br>公式範例:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>重新載入範例<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>強制載入項目及其母項目公式的其他範例:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: '找不到母專案'
+ComputedFormulaDesc=您可以在此處輸入使用對象的其他屬性或任何PHP編碼的公式，以獲得動態計算值。您可以使用任何與PHP兼容的公式，包括“？”條件運算符和以下全局對象：<strong> $ db，$ conf，$ langs，$ mysoc，$ user，$ object </strong>。 <br> <strong>警告</strong>：僅$ object的某些屬性可用。如果需要一個未加載的屬性，則像第二個示例一樣，將對象自己提取到公式中。 <br>使用計算字段意味著您無法從界面輸入任何值。另外，如果存在語法錯誤，則公式可能不返回任何內容。 <br> <br>公式示例：<br> $ object-> id < 10 ? round($object-> id / 2，2）：（$ object-> id + 2 * $ user-> id）*（int）substr（$ mysoc-> zip，1，2 ）<br> <br>重新加載對象的示例<br>（（（$ reloadedobj = new Societe（$ db））&&（$ reloadedobj-> fetchNoCompute（$ obj-> id？$ obj-> id：（$ obj-> rowid？$ obj- > rowid：$ object-> id））> 0））嗎？ $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5：'-1'<br> <br>用於強制加載對象及其父對象的公式的其他示例：<br>（（（$ reloadedobj = new Task（$ ））&&（$ reloadedobj-> fetchNoCompute（$ object-> id）> 0）&&（$ secondloadedobj =新項目（$ db））&&（$ secondloadedobj-> fetchNoCompute（$ reloadedobj-> fk_project）> 0））嗎？ $ secondloadedobj-> ref：'未找到父項目'
 Computedpersistent=儲存已計算欄位
 ComputedpersistentDesc=計算出的額外欄位將儲存在資料庫中，但是，僅當更改此欄位的項目時，才會重新計算該值。如果計算欄位依賴於其他項目或全域數據，則該值可能是錯誤的！
 ExtrafieldParamHelpPassword=將欄位保留為空白表示該值將不加密地儲存（欄位只能在螢幕上以星號隱藏）。 <br>設定“自動”以使用預設的加密規則將密碼保存到資料庫中（然後讀取的值將僅是哈希值，無法搜索原始值）
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=建立潛在客戶，發票，訂單等時，預設情況
 LocalTax2IsNotUsedDescES=預設情況下，建議的IRPF為0。規則結束。
 LocalTax2IsUsedExampleES=在西班牙，自由職業者及提供服務的專業人士及選擇稅務系統模組的公司。
 LocalTax2IsNotUsedExampleES=在西班牙，它們是不受模組稅制約束的企業。
-RevenueStampDesc=“稅票”或“收入票”是每張發票的固定稅額（與發票金額無關）。稅額也可以是百分比稅，但是使用第二種或第三種類型的稅對百分比稅更好，因為稅票不提供任何報告。只有極少數國家/地區使用此類稅種。
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=使用印花稅
 UseRevenueStampExample=稅票的預設值在字典設置中定義（%s-%s-%s）
 CalcLocaltax=地方稅收報告
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=產生和驗證密碼的規則
 DisableForgetPasswordLinkOnLogonPage=不要在登入頁面顯示“忘記密碼”連結
 UsersSetup=用戶模組設定
 UserMailRequired=建立新用戶需要電子郵件
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=文件模板給從使用者紀錄生成的文件
 GroupsDocModules=文件模板給從群組紀錄生成的文件
 ##### HRM setup #####
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=在頂端選單中隱藏圖片
 LeftMenuBackgroundColor=左側選單的背景顏色
 BackgroundTableTitleColor=表格標題行的背景顏色
 BackgroundTableTitleTextColor=表格標題行的文字顏色
+BackgroundTableTitleTextlinkColor=表格標題連結行的文字顏色
 BackgroundTableLineOddColor=表格奇數行的背景顏色
 BackgroundTableLineEvenColor=表格偶數行的背景色
 MinimumNoticePeriod=最短通知期限（您的休假申請必須在此之前完成）
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=在訊息ID中找不到Dolibarr參考
 FormatZip=Zip
 MainMenuCode=選單輸入代碼（主選單）
 ECMAutoTree=顯示自動ECM樹狀圖
-OperationParamDesc=定義用於操作的值，或如何提取值. 範例:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:我的公司名稱為\\s([^\\s]*)<br><br>使用; char作為分隔符號以提取或設定幾個屬性。
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=營業時間
 OpeningHoursDesc=在此處輸入貴公司的正常營業時間。
 ResourceSetup=資源模組的設定
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=如果您要在生成同一的PDF中以兩種不同
 FafaIconSocialNetworksDesc=在此處輸入FontAwesome圖示的代碼。如果您不知道什麼是FontAwesome，則可以使用通用值fa-address-book。
 RssNote=注意：每個RSS feed定義都提供一個小部件，您必須啟用該小部件才能使其在儀表板中看到
 JumpToBoxes=跳至設定 -> 小部件
+MeasuringUnitTypeDesc=使用值例如 "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=比例尺是您必須移動小數部分以匹配默認參考單位的位數。對於“時間”單位類型，它是秒數。 80到99之間的值是保留值。
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index 08639a1d3d1..9c06b78ff0d 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -209,20 +209,13 @@ NumberOfBillsByMonth=每月發票數
 AmountOfBills=發票金額
 AmountOfBillsHT=發票金額（稅後）
 AmountOfBillsByMonthHT=每月發票(invoice)金額（稅後）
-ShowSocialContribution=顯示社會/財務稅
-ShowBill=顯示發票
-ShowInvoice=顯示發票
-ShowInvoiceReplace=顯示替換發票
-ShowInvoiceAvoir=顯示信用票據(折讓單-credit notes)
-ShowInvoiceDeposit=顯示預付款發票
-ShowInvoiceSituation=顯示發票狀況
 UseSituationInvoices=允許發票狀況
 UseSituationInvoicesCreditNote=允許發票狀況信用票據(折讓單-credit notes)
 Retainedwarranty=有保修
-AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
+AllowedInvoiceForRetainedWarranty=保留保固，可用於以下類型的發票
 RetainedwarrantyDefaultPercent=有保修預設百分比
-RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
-RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
+RetainedwarrantyOnlyForSituation=使“保留保固”僅適用於情況發票
+RetainedwarrantyOnlyForSituationFinal=在情況發票上，全域“保留保固”扣除僅適用於最終情況
 ToPayOn=支付%s
 toPayOn=支付%s
 RetainedWarranty=保修
@@ -233,7 +226,6 @@ setretainedwarranty=設定保修
 setretainedwarrantyDateLimit=設定保修期限制
 RetainedWarrantyDateLimit=保修期限制
 RetainedWarrantyNeed100Percent=發票情況需要以100%%的進度顯示在PDF上
-ShowPayment=顯示付款
 AlreadyPaid=已付款
 AlreadyPaidBack=已償還
 AlreadyPaidNoCreditNotesNoDeposits=已付款（無信用票據(折讓單-credit notes)和預付款）
@@ -393,6 +385,7 @@ GeneratedFromTemplate=已從發票範本%s產生
 WarningInvoiceDateInFuture=警告，發票日期大於目前日期
 WarningInvoiceDateTooFarInFuture=警告，發票日期與目前日期相距太遠
 ViewAvailableGlobalDiscounts=檢視可用折扣
+GroupPaymentsByModOnReports=在報告上依模式分組付款
 # PaymentConditions
 Statut=狀態
 PaymentConditionShortRECEP=即時
@@ -512,7 +505,7 @@ ToMakePayment=付款
 ToMakePaymentBack=退還款項
 ListOfYourUnpaidInvoices=未付款發票清單
 NoteListOfYourUnpaidInvoices=注意：此列表僅包含被您連接的銷售代表合作方發票。
-RevenueStamp=Tax stamp
+RevenueStamp=印花稅票
 YouMustCreateInvoiceFromThird=僅當從合作方的“客戶”標籤建立發票時，此選項才可使用
 YouMustCreateInvoiceFromSupplierThird=僅當從合作方的“供應商”標籤建立發票時，此選項才可用
 YouMustCreateStandardInvoiceFirstDesc=您必須先建立標準發票，然後將其轉換為“範本”才能建立新的發票範本
diff --git a/htdocs/langs/zh_TW/cashdesk.lang b/htdocs/langs/zh_TW/cashdesk.lang
index b91ab4d9243..5447d2abd79 100644
--- a/htdocs/langs/zh_TW/cashdesk.lang
+++ b/htdocs/langs/zh_TW/cashdesk.lang
@@ -49,7 +49,7 @@ Footer=頁尾
 AmountAtEndOfPeriod=結束的金額（天，月或年）
 TheoricalAmount=理論金額
 RealAmount=實際金額
-CashFence=Cash fence
+CashFence=現金圍欄
 CashFenceDone=本期現金圍欄完成
 NbOfInvoices=發票數
 Paymentnumpad=輸入付款的便籤類型
@@ -90,19 +90,21 @@ HeadBar=標題欄
 SortProductField=產品分類欄位
 Browser=瀏覽器
 BrowserMethodDescription=簡易列印收據。僅需幾個參數即可設定收據。通過瀏覽器打印。
-TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
+TakeposConnectorMethodDescription=具有附加功能的外部模組。可以從雲端列印。
 PrintMethod=列印方式
 ReceiptPrinterMethodDescription=具有很多參數的強大方法。完全可定制的模板。無法從雲端列印。
 ByTerminal=依照站台
 TakeposNumpadUsePaymentIcon=在數字鍵上使用付款圖示
-CashDeskRefNumberingModules=收銀台編號模組
+CashDeskRefNumberingModules=POS銷售編號模組
 CashDeskGenericMaskCodes6 = <br> <b> {TN} </b>標籤用於增加站台
 TakeposGroupSameProduct=群組相同產品線
 StartAParallelSale=開啟新的平行銷售
 ControlCashOpening=打開銷售點時控制收銀機
 CloseCashFence=關閉現金圍籬
 CashReport=現金報告
-MainPrinterToUse=Main printer to use
-OrderPrinterToUse=Order printer to use
-MainTemplateToUse=Main template to use
-OrderTemplateToUse=Order template to use
+MainPrinterToUse=要使用的主印表機
+OrderPrinterToUse=要使用的訂單印表機
+MainTemplateToUse=要使用的主要模板
+OrderTemplateToUse=要使用的訂單模板
+BarRestaurant=酒吧餐廳
+AutoOrder=客戶自動下單
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index 6cfc559ea43..68c65175bd0 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -325,7 +325,8 @@ CompanyDeleted=已從資料庫中刪除“%s”公司。
 ListOfContacts=通訊錄/地址清單
 ListOfContactsAddresses=通訊錄/地址清單
 ListOfThirdParties=合作方清單
-ShowContact=顯示連絡人
+ShowCompany=合作方
+ShowContact=聯絡人-地址
 ContactsAllShort=全部（不過濾）
 ContactType=連絡型式
 ContactForOrders=訂單連絡人
@@ -446,7 +447,7 @@ SaleRepresentativeFirstname=業務代表的名字
 SaleRepresentativeLastname=業務代表的姓氏
 ErrorThirdpartiesMerge=刪除合作方時發生錯誤。請檢查日誌。原變更已被回復。
 NewCustomerSupplierCodeProposed=客戶或供應商代碼已使用，已建議新代碼
-KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+KeepEmptyIfGenericAddress=如果此地址是通用地址，請將此欄位保留為空
 #Imports
 PaymentTypeCustomer=付款方式-客戶
 PaymentTermsCustomer=付款條件-客戶
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index a60f23bb772..c6b1a038bf3 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=有關實際付款(即使尚未在分類帳中實際
 SeeReportInDueDebtMode=有關基於已記錄發票(即使尚未在分類帳中進行核算)的計算，請參閱%s發票分析%s。
 SeeReportInBookkeepingMode=請參閱<b>%s簿記報告%s</b>了解關於<b>簿記分類帳表</b>的計算
 RulesAmountWithTaxIncluded=-顯示的金額包括所有稅費
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
+RulesResultDue=-包括無論是否付款的未結發票，費用，增值稅，捐贈。還包括已付款薪資。 <br>-它基於發票的開票日期以及費用或稅款的到期日。對於使用“薪資”模組定義的薪資，將使用付款的起息日。
 RulesResultInOut=-它包括發票，費用，營業稅和薪水的實際付款。 <br> -它基於發票，費用，營業稅和薪水的付款日期。捐贈的捐贈日期。
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
+RulesCADue=-它包括客戶的到期發票，無論是否已付款。 <br>-它基於這些發票的開票日期。 <br>
 RulesCAIn=-包括從客戶收到的所有有效發票付款。 <br> -此基於這些發票的付款日期<br>
 RulesCATotalSaleJournal=它包括“銷售”日記帳中的所有信用額度。
 RulesAmountOnInOutBookkeepingRecord=它包括分類帳中具有“ 費用”或“ 收入”組的會計帳戶中的記錄
@@ -255,10 +255,12 @@ TurnoverbyVatrate=依營業稅率開票的營業額
 TurnoverCollectedbyVatrate=依營業稅率收取的營業額
 PurchasebyVatrate=依銷售購買稅率
 LabelToShow=短標籤
-PurchaseTurnover=Purchase turnover
-PurchaseTurnoverCollected=Purchase turnover collected
-RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
-RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
-RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
-ReportPurchaseTurnover=Purchase turnover invoiced
-ReportPurchaseTurnoverCollected=Purchase turnover collected
+PurchaseTurnover=採購營業額
+PurchaseTurnoverCollected=採購營業額
+RulesPurchaseTurnoverDue=-它包括供應商的到期發票，無論是否已付款。 <br>-它基於這些發票的發票日期。 <br>
+RulesPurchaseTurnoverIn=-它包括對供應商的所有有效發票付款。<br>-此基於這些發票的付款日期<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=它包括採購日記帳中的所有借方行。
+ReportPurchaseTurnover=已開票營業額
+ReportPurchaseTurnoverCollected=採購營業額
+IncludeVarpaysInResults = 在報告中包括各種付款
+IncludeLoansInResults = 在報告中包括貸款
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index bf598fad411..ee82ff56d58 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -8,8 +8,8 @@ FONTFORPDF=msungstdlight
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
 SeparatorThousand=,
-FormatDateShort=％m/%d/％Y
-FormatDateShortInput=％m/%d/％Y
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
 FormatDateShortJava=MM/dd/yyyy
 FormatDateShortJavaInput=MM/dd/yyyy
 FormatDateShortJQuery=mm/dd/yy
@@ -426,6 +426,7 @@ Modules=模組/應用程式
 Option=選項
 List=清單
 FullList=全部清單
+FullConversation=全部轉換
 Statistics=統計
 OtherStatistics=其他統計
 Status=狀態
@@ -830,8 +831,8 @@ Gender=性別
 Genderman=男
 Genderwoman=女
 ViewList=檢視清單
-ViewGantt=Gantt view
-ViewKanban=Kanban view
+ViewGantt=甘特圖
+ViewKanban=看板圖
 Mandatory=必要
 Hello=哈囉
 GoodBye=再見
@@ -953,12 +954,13 @@ SearchIntoMembers=會員
 SearchIntoUsers=用戶
 SearchIntoProductsOrServices=產品或服務
 SearchIntoProjects=專案
+SearchIntoMO=製造訂單
 SearchIntoTasks=任務
 SearchIntoCustomerInvoices=客戶發票
 SearchIntoSupplierInvoices=供應商發票
 SearchIntoCustomerOrders=銷售訂單
 SearchIntoSupplierOrders=採購訂單
-SearchIntoCustomerProposals=客戶提案/建議書
+SearchIntoCustomerProposals=商業提案/建議書
 SearchIntoSupplierProposals=供應商提案/建議書
 SearchIntoInterventions=干預/介入
 SearchIntoContracts=合約
@@ -1026,5 +1028,8 @@ Measures=措施
 XAxis=X軸
 YAxis=Y軸
 StatusOfRefMustBe= %s 的狀態必須是 %s
-DeleteFileHeader=Confirm file delete
-DeleteFileText=Do you really want delete this file?
+DeleteFileHeader=確認檔案刪除
+DeleteFileText=您確定要刪除檔案嗎？
+ShowOtherLanguages=顯示其他語言
+SwitchInEditModeToAddTranslation=切換到編輯模式以添加該語言的翻譯
+NotUsedForThisCustomer=未用於此客戶
diff --git a/htdocs/langs/zh_TW/modulebuilder.lang b/htdocs/langs/zh_TW/modulebuilder.lang
index 0840164f74c..775ac7b66f6 100644
--- a/htdocs/langs/zh_TW/modulebuilder.lang
+++ b/htdocs/langs/zh_TW/modulebuilder.lang
@@ -1,69 +1,69 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=此工具只能由有經驗的用戶或開發人員使用。它提供了用於建構或編輯自己的模組的實用程式。替代<a href="%s" target="_blank">手動開發的文件在此處</a>。
-EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
-EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
-ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
-ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
-ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
+ModuleBuilderDesc=此工具只能由有經驗的使用者或開發人員使用。它提供了用於建構或編輯您自己模組。另個<a href="%s" target="_blank">手動開發的文件在此處</a>。
+EnterNameOfModuleDesc=輸入要新建的 模組/程式 名稱不留空白。使用大寫字母分隔單詞（例如：example: MyModule, EcommerceForShop, SyncWithMySystem...）
+EnterNameOfObjectDesc=輸入要新建的物件名稱不留空白。使用大寫字母分隔單詞（例如：MyObject, Student, Teacher...）。將生成 CRUD class 檔案，以及 API 檔案，頁面用來 列出/新增/編輯/刪除 對象及SQL的檔案將自動生成。
+ModuleBuilderDesc2=已生成/已編輯 模組的路徑（外部模組的首個目錄定義為%s）: <strong> %s </strong>
+ModuleBuilderDesc3=已找到 生成的/可編輯的模組：<strong> %s </strong>
+ModuleBuilderDesc4=當模組目錄的根目錄中存在檔案<strong> %s </strong>時，模組被偵測為"可編輯”
 NewModule=新模組
 NewObjectInModulebuilder=新項目
-ModuleKey=Module key
-ObjectKey=Object key
-ModuleInitialized=Module initialized
-FilesForObjectInitialized=Files for new object '%s' initialized
-FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
-ModuleBuilderDescdescription=Enter here all general information that describe your module.
-ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
-ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
-ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
-ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
-ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
-ModuleBuilderDeschooks=This tab is dedicated to hooks.
+ModuleKey=模組金鑰
+ObjectKey=項目金鑰
+ModuleInitialized=模組初始化
+FilesForObjectInitialized=初始化新項目'%s'的檔案
+FilesForObjectUpdated=項目'%s'的檔案已更新（.sql檔案和.class.php檔案）
+ModuleBuilderDescdescription=在此處輸入描述模組的所有一般資訊。
+ModuleBuilderDescspecifications=您可以在此處輸入尚未在其他標籤中建立的模組特性描述。這樣您就可以輕鬆地開發所有規則。此文字內容還將包含在生成的文件中（請參見最後一個標籤）。您可以使用 Markdown格式，但建議使用 Asciidoc 格式（.md和.asciidoc之間的比較：http://asciidoctor.org/docs/user-manual/#compared-to-markdown）。
+ModuleBuilderDescobjects=在此處定義您要使用模組管理的對象。一個CRUD DAO class，SQL檔案，用於列出對象記錄，建立/編輯/檢視 記錄的頁面以及將會生成一個API 。
+ModuleBuilderDescmenus=此標籤專用於定義您模組提供的選單輸入。
+ModuleBuilderDescpermissions=此標籤專用於定義您要隨模組提供的新權限。
+ModuleBuilderDesctriggers=這是您模組提供的觸發器檢視。當觸發了業務事件時要包含代碼的執行，只需編輯此檔案。
+ModuleBuilderDeschooks=此標籤專用於掛載。
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
 EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
 EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
-DangerZone=Danger zone
-BuildPackage=Build package
+DangerZone=危險區域
+BuildPackage=建立軟體包
 BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
-BuildDocumentation=Build documentation
+BuildDocumentation=建立文件
 ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
 ModuleIsLive=This module has been activated. Any change may break a current live feature.
-DescriptionLong=Long description
+DescriptionLong=詳細描述
 EditorName=編輯器名稱
 EditorUrl=編輯器網址
 DescriptorFile=模組的描述檔案
-ClassFile=File for PHP DAO CRUD class
-ApiClassFile=File for PHP API class
-PageForList=PHP page for list of record
-PageForCreateEditView=PHP page to create/edit/view a record
-PageForAgendaTab=PHP page for event tab
-PageForDocumentTab=PHP page for document tab
-PageForNoteTab=PHP page for note tab
+ClassFile=PHP DAO CRUD類別檔案
+ApiClassFile=PHP API類別檔案
+PageForList=記錄列表PHP頁面
+PageForCreateEditView=建立/編輯/檢視記錄PHP頁面
+PageForAgendaTab=事件分頁的PHP頁面
+PageForDocumentTab=文件分頁的PHP頁面
+PageForNoteTab=註記分頁的PHP頁面
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
-FileNotYetGenerated=File not yet generated
+FileNotYetGenerated=尚未產生檔案
 RegenerateClassAndSql=Force update of .class and .sql files
-RegenerateMissingFiles=Generate missing files
+RegenerateMissingFiles=產生遺失的檔案
 SpecificationFile=文件檔案
 LanguageFile=語言檔案
-ObjectProperties=Object Properties
+ObjectProperties=項目屬性
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
-NotNull=Not NULL
+NotNull=非空白
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
-DatabaseIndex=Database index
-FileAlreadyExists=File %s already exists
+DatabaseIndex=資料庫索引
+FileAlreadyExists=檔案%s已存在
 TriggersFile=File for triggers code
 HooksFile=File for hooks code
 ArrayOfKeyValues=Array of key-val
 ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
-WidgetFile=Widget file
-CSSFile=CSS file
-JSFile=Javascript file
-ReadmeFile=Readme file
-ChangeLog=ChangeLog file
+WidgetFile=小工具檔案
+CSSFile=CSS檔案
+JSFile=Javascript檔案
+ReadmeFile=Readme檔案
+ChangeLog=ChangeLog檔案
 TestClassFile=File for PHP Unit Test class
 SqlFile=SQL檔案
 PageForLib=通用PHP庫的檔案
@@ -76,16 +76,16 @@ UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asci
 IsAMeasure=Is a measure
 DirScanned=資料夾已掃描
 NoTrigger=No trigger
-NoWidget=No widget
-GoToApiExplorer=Go to API explorer
-ListOfMenusEntries=List of menu entries
-ListOfDictionariesEntries=List of dictionaries entries
+NoWidget=沒有小工具
+GoToApiExplorer=前往API資源管理器
+ListOfMenusEntries=選單條目清單
+ListOfDictionariesEntries=分類條目清單
 ListOfPermissionsDefined=已定義權限清單
 SeeExamples=在這裡查看範例
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
-DisplayOnPdf=Display on PDF
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdf=以PDF顯示
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
@@ -135,7 +135,7 @@ ShowOnCombobox=在組合框中顯示數值
 KeyForTooltip=Key for tooltip
 CSSClass=CSS類別
 NotEditable=無法編輯
-ForeignKey=Foreign key
+ForeignKey=外部金鑰
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
 AsciiToHtmlConverter=ASCII到HTML轉換器
 AsciiToPdfConverter=ASCII到PDF轉換器
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 72233c0d88a..a17d6b43bc4 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -17,13 +17,13 @@ Create=建立
 Reference=參考
 NewProduct=新產品
 NewService=新服務
-ProductVatMassChange=全球營業稅更新
+ProductVatMassChange=全域營業稅更新
 ProductVatMassChangeDesc=此工具將更新<b><u>所有</u></b>產品和服務上定義的營業稅率！
 MassBarcodeInit=批次條碼初始化
 MassBarcodeInitDesc=此頁面可用將未定義條碼的項目初始化條碼。在完成模組條碼的設定之前進行檢查。
 ProductAccountancyBuyCode=會計代碼（購買）
 ProductAccountancyBuyIntraCode=會計代碼（在歐盟內採購）
-ProductAccountancyBuyExportCode=Accounting code (purchase import)
+ProductAccountancyBuyExportCode=會計代碼（採購輸入）
 ProductAccountancySellCode=會計代碼（銷售）
 ProductAccountancySellIntraCode=會計代碼（內部銷售）
 ProductAccountancySellExportCode=會計代碼（出口銷售）
@@ -68,7 +68,7 @@ ProductStatusNotOnBuyShort=不可採購
 UpdateVAT=更新營業稅
 UpdateDefaultPrice=更新預設價格
 UpdateLevelPrices=更新每個級別的價格
-AppliedPricesFrom=同意自
+AppliedPricesFrom=報價日期
 SellingPrice=售價
 SellingPriceHT=售價（不含稅）
 SellingPriceTTC=售價（含稅）
@@ -87,7 +87,7 @@ ErrorProductBadRefOrLabel=錯誤的價值參考或標籤。
 ErrorProductClone=嘗試複製產品或服務時出現問題。
 ErrorPriceCantBeLowerThanMinPrice=錯誤，價格不能低於最低價格。
 Suppliers=供應商
-SupplierRef=供應商SKU(最小庫存單位)
+SupplierRef=供應商報價單號
 ShowProduct=顯示產品
 ShowService=顯示服務
 ProductsAndServicesArea=產品和服務區域
@@ -167,7 +167,7 @@ SuppliersPrices=供應商價格
 SuppliersPricesOfProductsOrServices=供應商價格（產品或服務）
 CustomCode=海關/商品/ HS編碼
 CountryOrigin=原產地
-Nature=Nature of product (material/finished)
+Nature=產品性質（材料/成品）
 ShortLabel=短標籤
 Unit=單位
 p=u.
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index dd85077e28a..789835b25ea 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -186,7 +186,7 @@ PlannedWorkload=計劃的工作量
 PlannedWorkloadShort=工作量
 ProjectReferers=相關項目
 ProjectMustBeValidatedFirst=必須先驗證專案
-FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+FirstAddRessourceToAllocateTime=分配用戶資源作為專案聯絡人以分配時間
 InputPerDay=每天輸入
 InputPerWeek=每週輸入
 InputPerMonth=每月輸入
@@ -255,7 +255,7 @@ ServiceToUseOnLines=行上使用的服務
 InvoiceGeneratedFromTimeSpent=根據專案花費的時間產生了發票%s
 ProjectBillTimeDescription=請勾選如果您輸入了有關專案任務的時間表，並計劃從此時間表中產生發票以向此專案的客戶開立帳單（不要勾選如果您打算建立不基於輸入時間表的發票）。注意：要產生發票，請前往專案的“花費時間”分頁上，並選擇要包括的行。
 ProjectFollowOpportunity=追蹤機會
-ProjectFollowTasks=追蹤任務
+ProjectFollowTasks=追蹤任務或花費的時間
 Usage=使用率
 UsageOpportunity=用法：機會
 UsageTasks=用法：任務
diff --git a/htdocs/langs/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang
index 4afcba3ee3f..6bfe776b2e0 100644
--- a/htdocs/langs/zh_TW/users.lang
+++ b/htdocs/langs/zh_TW/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=建立的用戶將是外部用戶（因為連結到一個
 IdPhoneCaller=手機來電者身份
 NewUserCreated=建立用戶%s
 NewUserPassword=%變動的密碼
+NewPasswordValidated=您的新密碼已通過驗證，必須立即用於登錄。
 EventUserModified=用戶%s修改
 UserDisabled=用戶%s禁用
 UserEnabled=用戶%s啟動
@@ -113,5 +114,5 @@ CantDisableYourself=您不能禁用自己的用戶記錄
 ForceUserExpenseValidator=強制使用費用報告表驗證
 ForceUserHolidayValidator=強制使用休假請求驗證
 ValidatorIsSupervisorByDefault=預設情況下，驗證者是用戶的主管。保持空白狀態以保持這種行為。
-UserPersonalEmail=Personal email
-UserPersonalMobile=Personal mobile phone
+UserPersonalEmail=私人信箱
+UserPersonalMobile=私人手機
diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
index 6cf4b0381d9..f62509cb79f 100644
--- a/htdocs/langs/zh_TW/website.lang
+++ b/htdocs/langs/zh_TW/website.lang
@@ -4,7 +4,7 @@ WebsiteSetupDesc=在此處建立您要使用的網站。然後進入選單網站
 DeleteWebsite=刪除網站
 ConfirmDeleteWebsite=您確定要刪除此網站嗎？其所有頁面和內容也將被刪除。上傳的文件（例如進入medias資料夾，ECM模組等）將保留。
 WEBSITE_TYPE_CONTAINER=頁面/容器的類型
-WEBSITE_PAGE_EXAMPLE=範本網頁
+WEBSITE_PAGE_EXAMPLE=當作範例的網頁
 WEBSITE_PAGENAME=頁面名稱/別名
 WEBSITE_ALIASALT=備用頁面名稱/別名
 WEBSITE_ALIASALTDesc=使用此處的其他名稱/別名清單，因此也可以使用此其他名稱/別名來訪問頁面（例如，重命名別名以使舊連結/名稱保持反向連結正常工作後的舊名稱）。語法是： <br> Alternativename1，Alternativename2，...
@@ -13,9 +13,9 @@ WEBSITE_CSS_INLINE=CSS檔案內容（所有頁面共有）
 WEBSITE_JS_INLINE=Javascript檔案內容（所有頁面共有）
 WEBSITE_HTML_HEADER=附加在HTML標頭底部（所有頁面共有）
 WEBSITE_ROBOT=Robot檔案（robots.txt）
-WEBSITE_HTACCESS=網站.htaccess檔案
-WEBSITE_MANIFEST_JSON=網站manifest.json檔案
-WEBSITE_README=README.md檔案
+WEBSITE_HTACCESS=網站 .htaccess 檔案
+WEBSITE_MANIFEST_JSON=網站 manifest.json 檔案
+WEBSITE_README=README.md 檔案
 EnterHereLicenseInformation=在此處輸入meta data或許可證資訊以填入README.md檔案。如果您以模板型式發佈網站，則檔案將包含在模板軟體包中。
 HtmlHeaderPage=HTML標頭（僅用於此頁面）
 PageNameAliasHelp=頁面的名稱或別名。 <br>當從Web伺服器的虛擬主機（如Apacke，Nginx等）執行網站時，此別名還用於偽造SEO網址。使用按鈕“ <strong>%s</strong> ”編輯此別名。
@@ -24,11 +24,11 @@ MediaFiles=媒體庫
 EditCss=編輯網站屬性
 EditMenu=編輯選單
 EditMedias=編輯媒體
-EditPageMeta=編輯頁面/容器屬性
+EditPageMeta=編輯 頁面/容器 屬性
 EditInLine=編輯嵌入
 AddWebsite=新增網站
 Webpage=網頁/容器
-AddPage=增加頁面/容器
+AddPage=新增 頁面/容器
 HomePage=首頁
 PageContainer=頁面/容器
 PreviewOfSiteNotYetAvailable=您的網站<strong>%s</strong>預覽尚不可用。您必須先“ <strong>導入完整的網站模板</strong> ”或僅“ <strong>新增頁面/容器</strong> ”。
@@ -49,7 +49,7 @@ YouCanAlsoDeployToAnotherWHP=<u>在其他Dolibarr網站託管供應商執行您
 CheckVirtualHostPerms=還要檢查虛擬主機是否具有將<strong> %s </strong>上的許可權轉換為<br> <strong> %s </strong>的權限
 ReadPerm=閱讀
 WritePerm=寫入
-TestDeployOnWeb=上線測試/部署
+TestDeployOnWeb=上線 測試/部署
 PreviewSiteServedByWebServer=<u>在新分頁中預覽%s。 </u> <br> <br> %s將由外部Web伺服器（例如Apache，Nginx，IIS）提供服務。您必須先安裝和設定此伺服器，然後再指向目錄：<br> <strong> %s </strong> <br>外部伺服器提供的網址：<br><strong>%s</strong>
 PreviewSiteServedByDolibarr=<u>在新分頁中預覽%s。 </u> <br> <br> Dolibarr伺服器將為%s提供服務，因此不需要安裝任何其他Web伺服器（例如Apache，Nginx，IIS）。 <br>的不便之處在於頁面的URL不友好，並且以Dolibarr的路徑開頭。 <br> URL由Dolibarr提供：<br> <strong> %s </strong> <br> <br>要使用自己的外部Web伺服器來服務於這個網站，在您的Web伺服器上建立一個虛擬主機其指向目錄<br> <strong> %s </strong> <br>然後輸入該虛伺服器的名稱然後點擊另一個預覽按鈕。
 VirtualHostUrlNotDefined=未定義由外部網站伺服器提供服務的虛擬主機網址
@@ -57,7 +57,7 @@ NoPageYet=暫無頁面
 YouCanCreatePageOrImportTemplate=您可以建立一個新頁面或匯入完整的網站模板
 SyntaxHelp=有關特定語法提示的幫助
 YouCanEditHtmlSourceckeditor=您可以使用編輯器中的“Source”按鈕來編輯HTML源代碼。
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> 您可以使用標籤將PHP代碼包含到此源中<strong>&lt;?php ?&gt;</strong>. 以下全域變數可用: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> 您還可以使用以下語法包含另一個頁面/容器的內容:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> 您可以使用以下語法重新定向到另一個頁面/容器（注意：重新定向之前請勿輸出任何內容）:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> 要增加到另一個頁面的連結，請使用以下語法:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> 要包含一個 <strong>連結</strong> 下載儲存到 <strong>文件</strong>資料夾, 使用<strong>document.php</strong>打包器:<br>例如, 一個檔案要儲存到documents/ecm (需要紀錄)中, 語法為:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>檔案要儲存到documents/medias (公共權限的資料夾)中, 語法為:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>對於使用共用連結共享的檔案(使用檔案的共用hash鍵進行開放訪問), 語法為:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> 要包含一個<strong>影像</strong> 檔案且儲存到<strong>documents</strong>目錄中, 使用 <strong>viewimage.php</strong> 打包器:<br>例如, 儲存影像到documents/medias (公共權限的資料夾), 語法為:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>更多HTML語法或動態碼可在<a href="%s" target="_blank">維基文件</a>中找到<br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=複製頁面/容器
 CloneSite=複製網站
 SiteAdded=網站已增加
@@ -77,7 +77,7 @@ BlogPost=部落格文章
 WebsiteAccount=網站帳號
 WebsiteAccounts=網站帳號
 AddWebsiteAccount=建立網站帳號
-BackToListOfThirdParty=返回合作方清單
+BackToListForThirdParty=返回第三方清單
 DisableSiteFirst=首先停止網站
 MyContainerTitle=我的網站標題
 AnotherContainer=這是如何包含其他頁面/容器內容的方式（如果啟用動態代碼，則可能會出現錯誤，因為嵌入式子容器可能不存在）
@@ -127,4 +127,4 @@ OtherLanguages=其他語言
 UseManifest=提供manifest.json檔案
 PublicAuthorAlias=公共作者別名
 AvailableLanguagesAreDefinedIntoWebsiteProperties=可用語言已定義到網站屬性中
-ReplacementDoneInXPages=Replacement done in %s pages or containers
+ReplacementDoneInXPages=在%s頁面或容器中已完成替換

From 02d5359749958fbd838ffb5b02c2a233553e22e6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 23:30:52 +0200
Subject: [PATCH 428/490] Fix transifex sync

---
 dev/translation/txpull.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/translation/txpull.sh b/dev/translation/txpull.sh
index fcccae98221..d3ac02fb633 100755
--- a/dev/translation/txpull.sh
+++ b/dev/translation/txpull.sh
@@ -33,8 +33,8 @@ if [ "x$1" = "xall" ]
 then
 	if [ "x$2" = "x" ]
 	then
-	    echo "tx pull"
-	    tx pull
+	    echo "tx pull -a"
+	    tx pull -a
 	else
 		for dir in `find htdocs/langs/* -type d`
 		do

From 2b963479a85d4638ba677ba545657e731cef71bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 May 2020 23:50:00 +0200
Subject: [PATCH 429/490] Sync transifex

---
 dev/translation/txpull.sh                 |    8 +
 htdocs/langs/am_ET/accountancy.lang       |  382 ++++
 htdocs/langs/am_ET/admin.lang             | 2002 +++++++++++++++++++++
 htdocs/langs/am_ET/agenda.lang            |  154 ++
 htdocs/langs/am_ET/assets.lang            |   65 +
 htdocs/langs/am_ET/banks.lang             |  175 ++
 htdocs/langs/am_ET/bills.lang             |  574 ++++++
 htdocs/langs/am_ET/blockedlog.lang        |   54 +
 htdocs/langs/am_ET/bookmarks.lang         |   21 +
 htdocs/langs/am_ET/boxes.lang             |  102 ++
 htdocs/langs/am_ET/cashdesk.lang          |  110 ++
 htdocs/langs/am_ET/categories.lang        |   89 +
 htdocs/langs/am_ET/commercial.lang        |   80 +
 htdocs/langs/am_ET/companies.lang         |  458 +++++
 htdocs/langs/am_ET/compta.lang            |  266 +++
 htdocs/langs/am_ET/contracts.lang         |  101 ++
 htdocs/langs/am_ET/cron.lang              |   84 +
 htdocs/langs/am_ET/deliveries.lang        |   31 +
 htdocs/langs/am_ET/dict.lang              |  359 ++++
 htdocs/langs/am_ET/donations.lang         |   34 +
 htdocs/langs/am_ET/ecm.lang               |   52 +
 htdocs/langs/am_ET/errors.lang            |  265 +++
 htdocs/langs/am_ET/exports.lang           |  135 ++
 htdocs/langs/am_ET/externalsite.lang      |    5 +
 htdocs/langs/am_ET/ftp.lang               |   14 +
 htdocs/langs/am_ET/help.lang              |   23 +
 htdocs/langs/am_ET/holiday.lang           |  133 ++
 htdocs/langs/am_ET/hrm.lang               |   18 +
 htdocs/langs/am_ET/install.lang           |  223 +++
 htdocs/langs/am_ET/interventions.lang     |   66 +
 htdocs/langs/am_ET/languages.lang         |   89 +
 htdocs/langs/am_ET/ldap.lang              |   27 +
 htdocs/langs/am_ET/link.lang              |   11 +
 htdocs/langs/am_ET/loan.lang              |   31 +
 htdocs/langs/am_ET/mailmanspip.lang       |   27 +
 htdocs/langs/am_ET/mails.lang             |  170 ++
 htdocs/langs/am_ET/main.lang              | 1035 +++++++++++
 htdocs/langs/am_ET/margins.lang           |   45 +
 htdocs/langs/am_ET/members.lang           |  204 +++
 htdocs/langs/am_ET/modulebuilder.lang     |  141 ++
 htdocs/langs/am_ET/mrp.lang               |   76 +
 htdocs/langs/am_ET/multicurrency.lang     |   22 +
 htdocs/langs/am_ET/oauth.lang             |   32 +
 htdocs/langs/am_ET/opensurvey.lang        |   61 +
 htdocs/langs/am_ET/orders.lang            |  189 ++
 htdocs/langs/am_ET/other.lang             |  286 +++
 htdocs/langs/am_ET/paybox.lang            |   31 +
 htdocs/langs/am_ET/paypal.lang            |   36 +
 htdocs/langs/am_ET/printing.lang          |   54 +
 htdocs/langs/am_ET/productbatch.lang      |   24 +
 htdocs/langs/am_ET/products.lang          |  385 ++++
 htdocs/langs/am_ET/projects.lang          |  267 +++
 htdocs/langs/am_ET/propal.lang            |   86 +
 htdocs/langs/am_ET/receiptprinter.lang    |   95 +
 htdocs/langs/am_ET/receptions.lang        |   45 +
 htdocs/langs/am_ET/resource.lang          |   39 +
 htdocs/langs/am_ET/salaries.lang          |   21 +
 htdocs/langs/am_ET/sendings.lang          |   74 +
 htdocs/langs/am_ET/sms.lang               |   51 +
 htdocs/langs/am_ET/stocks.lang            |  220 +++
 htdocs/langs/am_ET/stripe.lang            |   72 +
 htdocs/langs/am_ET/supplier_proposal.lang |   54 +
 htdocs/langs/am_ET/suppliers.lang         |   47 +
 htdocs/langs/am_ET/ticket.lang            |  305 ++++
 htdocs/langs/am_ET/trips.lang             |  151 ++
 htdocs/langs/am_ET/users.lang             |  118 ++
 htdocs/langs/am_ET/website.lang           |  130 ++
 htdocs/langs/am_ET/withdrawals.lang       |  119 ++
 htdocs/langs/am_ET/workflow.lang          |   20 +
 htdocs/langs/am_ET/zapier.lang            |   28 +
 htdocs/langs/ar_EG/agenda.lang            |    2 +
 htdocs/langs/ar_EG/banks.lang             |    4 +
 htdocs/langs/ar_EG/bills.lang             |   28 +
 htdocs/langs/ar_EG/boxes.lang             |    3 +
 htdocs/langs/ar_EG/cashdesk.lang          |    2 +
 htdocs/langs/ar_EG/categories.lang        |    9 +
 htdocs/langs/ar_EG/commercial.lang        |   26 +
 htdocs/langs/ar_EG/companies.lang         |   12 +
 htdocs/langs/ar_EG/contracts.lang         |    4 +
 htdocs/langs/ar_EG/deliveries.lang        |    2 +
 htdocs/langs/ar_EG/dict.lang              |    2 +
 htdocs/langs/ar_EG/donations.lang         |    9 +
 htdocs/langs/ar_EG/holiday.lang           |    2 +
 htdocs/langs/ar_EG/hrm.lang               |    2 +
 htdocs/langs/ar_EG/interventions.lang     |    2 +
 htdocs/langs/ar_EG/mails.lang             |    2 +
 htdocs/langs/ar_EG/members.lang           |    3 +
 htdocs/langs/ar_EG/multicurrency.lang     |   11 -
 htdocs/langs/ar_EG/orders.lang            |   28 +
 htdocs/langs/ar_EG/products.lang          |    2 +
 htdocs/langs/ar_EG/projects.lang          |    3 +
 htdocs/langs/ar_EG/propal.lang            |   67 +
 htdocs/langs/ar_EG/receptions.lang        |    2 +
 htdocs/langs/ar_EG/sendings.lang          |    2 +
 htdocs/langs/ar_EG/sms.lang               |    2 +
 htdocs/langs/ar_EG/stocks.lang            |    2 +
 htdocs/langs/ar_EG/supplier_proposal.lang |   47 +
 htdocs/langs/ar_EG/suppliers.lang         |   46 +
 htdocs/langs/ar_EG/ticket.lang            |    2 +
 htdocs/langs/ar_EG/website.lang           |   11 +
 htdocs/langs/ar_EG/withdrawals.lang       |    2 +
 htdocs/langs/ar_EG/workflow.lang          |   17 +
 htdocs/langs/ar_EG/zapier.lang            |    4 +
 htdocs/langs/ar_SA/accountancy.lang       |   20 +-
 htdocs/langs/ar_SA/admin.lang             |   13 +-
 htdocs/langs/ar_SA/bills.lang             |   11 +-
 htdocs/langs/ar_SA/donations.lang         |    2 +-
 htdocs/langs/ar_SA/interventions.lang     |    6 +-
 htdocs/langs/ar_SA/modulebuilder.lang     |    4 +-
 htdocs/langs/ar_SA/multicurrency.lang     |   22 +
 htdocs/langs/ar_SA/projects.lang          |    2 +-
 htdocs/langs/ar_SA/website.lang           |    4 +-
 htdocs/langs/ar_SA/zapier.lang            |   28 +
 htdocs/langs/az_AZ/accountancy.lang       |  382 ++++
 htdocs/langs/az_AZ/admin.lang             | 2002 +++++++++++++++++++++
 htdocs/langs/az_AZ/agenda.lang            |  154 ++
 htdocs/langs/az_AZ/assets.lang            |   65 +
 htdocs/langs/az_AZ/banks.lang             |  175 ++
 htdocs/langs/az_AZ/bills.lang             |  574 ++++++
 htdocs/langs/az_AZ/blockedlog.lang        |   54 +
 htdocs/langs/az_AZ/bookmarks.lang         |   21 +
 htdocs/langs/az_AZ/boxes.lang             |  102 ++
 htdocs/langs/az_AZ/cashdesk.lang          |  110 ++
 htdocs/langs/az_AZ/categories.lang        |   89 +
 htdocs/langs/az_AZ/commercial.lang        |   80 +
 htdocs/langs/az_AZ/companies.lang         |  458 +++++
 htdocs/langs/az_AZ/compta.lang            |  266 +++
 htdocs/langs/az_AZ/contracts.lang         |  101 ++
 htdocs/langs/az_AZ/cron.lang              |   84 +
 htdocs/langs/az_AZ/deliveries.lang        |   31 +
 htdocs/langs/az_AZ/dict.lang              |  359 ++++
 htdocs/langs/az_AZ/donations.lang         |   34 +
 htdocs/langs/az_AZ/ecm.lang               |   52 +
 htdocs/langs/az_AZ/errors.lang            |  265 +++
 htdocs/langs/az_AZ/exports.lang           |  135 ++
 htdocs/langs/az_AZ/externalsite.lang      |    5 +
 htdocs/langs/az_AZ/ftp.lang               |   14 +
 htdocs/langs/az_AZ/help.lang              |   23 +
 htdocs/langs/az_AZ/holiday.lang           |  133 ++
 htdocs/langs/az_AZ/hrm.lang               |   18 +
 htdocs/langs/az_AZ/install.lang           |  223 +++
 htdocs/langs/az_AZ/interventions.lang     |   66 +
 htdocs/langs/az_AZ/languages.lang         |   89 +
 htdocs/langs/az_AZ/ldap.lang              |   27 +
 htdocs/langs/az_AZ/link.lang              |   11 +
 htdocs/langs/az_AZ/loan.lang              |   31 +
 htdocs/langs/az_AZ/mailmanspip.lang       |   27 +
 htdocs/langs/az_AZ/mails.lang             |  170 ++
 htdocs/langs/az_AZ/main.lang              | 1035 +++++++++++
 htdocs/langs/az_AZ/margins.lang           |   45 +
 htdocs/langs/az_AZ/members.lang           |  204 +++
 htdocs/langs/az_AZ/modulebuilder.lang     |  141 ++
 htdocs/langs/az_AZ/mrp.lang               |   76 +
 htdocs/langs/az_AZ/multicurrency.lang     |   22 +
 htdocs/langs/az_AZ/oauth.lang             |   32 +
 htdocs/langs/az_AZ/opensurvey.lang        |   61 +
 htdocs/langs/az_AZ/orders.lang            |  189 ++
 htdocs/langs/az_AZ/other.lang             |  286 +++
 htdocs/langs/az_AZ/paybox.lang            |   31 +
 htdocs/langs/az_AZ/paypal.lang            |   36 +
 htdocs/langs/az_AZ/printing.lang          |   54 +
 htdocs/langs/az_AZ/productbatch.lang      |   24 +
 htdocs/langs/az_AZ/products.lang          |  385 ++++
 htdocs/langs/az_AZ/projects.lang          |  267 +++
 htdocs/langs/az_AZ/propal.lang            |   86 +
 htdocs/langs/az_AZ/receiptprinter.lang    |   95 +
 htdocs/langs/az_AZ/receptions.lang        |   45 +
 htdocs/langs/az_AZ/resource.lang          |   39 +
 htdocs/langs/az_AZ/salaries.lang          |   21 +
 htdocs/langs/az_AZ/sendings.lang          |   74 +
 htdocs/langs/az_AZ/sms.lang               |   51 +
 htdocs/langs/az_AZ/stocks.lang            |  220 +++
 htdocs/langs/az_AZ/stripe.lang            |   72 +
 htdocs/langs/az_AZ/supplier_proposal.lang |   54 +
 htdocs/langs/az_AZ/suppliers.lang         |   47 +
 htdocs/langs/az_AZ/ticket.lang            |  305 ++++
 htdocs/langs/az_AZ/trips.lang             |  151 ++
 htdocs/langs/az_AZ/users.lang             |  118 ++
 htdocs/langs/az_AZ/website.lang           |  130 ++
 htdocs/langs/az_AZ/withdrawals.lang       |  119 ++
 htdocs/langs/az_AZ/workflow.lang          |   20 +
 htdocs/langs/az_AZ/zapier.lang            |   28 +
 htdocs/langs/bg_BG/accountancy.lang       |   22 +-
 htdocs/langs/bg_BG/admin.lang             |   13 +-
 htdocs/langs/bg_BG/bills.lang             |   11 +-
 htdocs/langs/bg_BG/modulebuilder.lang     |    4 +-
 htdocs/langs/bg_BG/multicurrency.lang     |   22 +
 htdocs/langs/bg_BG/projects.lang          |    2 +-
 htdocs/langs/bg_BG/website.lang           |    4 +-
 htdocs/langs/bg_BG/zapier.lang            |   28 +
 htdocs/langs/bn_BD/accountancy.lang       |   20 +-
 htdocs/langs/bn_BD/admin.lang             |   13 +-
 htdocs/langs/bn_BD/bills.lang             |   11 +-
 htdocs/langs/bn_BD/donations.lang         |    2 +-
 htdocs/langs/bn_BD/interventions.lang     |    6 +-
 htdocs/langs/bn_BD/modulebuilder.lang     |    4 +-
 htdocs/langs/bn_BD/multicurrency.lang     |   22 +
 htdocs/langs/bn_BD/projects.lang          |    2 +-
 htdocs/langs/bn_BD/website.lang           |    4 +-
 htdocs/langs/bn_BD/zapier.lang            |   28 +
 htdocs/langs/bn_IN/accountancy.lang       |  382 ++++
 htdocs/langs/bn_IN/admin.lang             | 2002 +++++++++++++++++++++
 htdocs/langs/bn_IN/agenda.lang            |  154 ++
 htdocs/langs/bn_IN/assets.lang            |   65 +
 htdocs/langs/bn_IN/banks.lang             |  175 ++
 htdocs/langs/bn_IN/bills.lang             |  574 ++++++
 htdocs/langs/bn_IN/blockedlog.lang        |   54 +
 htdocs/langs/bn_IN/bookmarks.lang         |   21 +
 htdocs/langs/bn_IN/boxes.lang             |  102 ++
 htdocs/langs/bn_IN/cashdesk.lang          |  110 ++
 htdocs/langs/bn_IN/categories.lang        |   89 +
 htdocs/langs/bn_IN/commercial.lang        |   80 +
 htdocs/langs/bn_IN/companies.lang         |  458 +++++
 htdocs/langs/bn_IN/compta.lang            |  266 +++
 htdocs/langs/bn_IN/contracts.lang         |  101 ++
 htdocs/langs/bn_IN/cron.lang              |   84 +
 htdocs/langs/bn_IN/deliveries.lang        |   31 +
 htdocs/langs/bn_IN/dict.lang              |  359 ++++
 htdocs/langs/bn_IN/donations.lang         |   34 +
 htdocs/langs/bn_IN/ecm.lang               |   52 +
 htdocs/langs/bn_IN/errors.lang            |  265 +++
 htdocs/langs/bn_IN/exports.lang           |  135 ++
 htdocs/langs/bn_IN/externalsite.lang      |    5 +
 htdocs/langs/bn_IN/ftp.lang               |   14 +
 htdocs/langs/bn_IN/help.lang              |   23 +
 htdocs/langs/bn_IN/holiday.lang           |  133 ++
 htdocs/langs/bn_IN/hrm.lang               |   18 +
 htdocs/langs/bn_IN/install.lang           |  223 +++
 htdocs/langs/bn_IN/interventions.lang     |   66 +
 htdocs/langs/bn_IN/languages.lang         |   89 +
 htdocs/langs/bn_IN/ldap.lang              |   27 +
 htdocs/langs/bn_IN/link.lang              |   11 +
 htdocs/langs/bn_IN/loan.lang              |   31 +
 htdocs/langs/bn_IN/mailmanspip.lang       |   27 +
 htdocs/langs/bn_IN/mails.lang             |  170 ++
 htdocs/langs/bn_IN/main.lang              | 1035 +++++++++++
 htdocs/langs/bn_IN/margins.lang           |   45 +
 htdocs/langs/bn_IN/members.lang           |  204 +++
 htdocs/langs/bn_IN/modulebuilder.lang     |  141 ++
 htdocs/langs/bn_IN/mrp.lang               |   76 +
 htdocs/langs/bn_IN/multicurrency.lang     |   22 +
 htdocs/langs/bn_IN/oauth.lang             |   32 +
 htdocs/langs/bn_IN/opensurvey.lang        |   61 +
 htdocs/langs/bn_IN/orders.lang            |  189 ++
 htdocs/langs/bn_IN/other.lang             |  286 +++
 htdocs/langs/bn_IN/paybox.lang            |   31 +
 htdocs/langs/bn_IN/paypal.lang            |   36 +
 htdocs/langs/bn_IN/printing.lang          |   54 +
 htdocs/langs/bn_IN/productbatch.lang      |   24 +
 htdocs/langs/bn_IN/products.lang          |  385 ++++
 htdocs/langs/bn_IN/projects.lang          |  267 +++
 htdocs/langs/bn_IN/propal.lang            |   86 +
 htdocs/langs/bn_IN/receiptprinter.lang    |   95 +
 htdocs/langs/bn_IN/receptions.lang        |   45 +
 htdocs/langs/bn_IN/resource.lang          |   39 +
 htdocs/langs/bn_IN/salaries.lang          |   21 +
 htdocs/langs/bn_IN/sendings.lang          |   74 +
 htdocs/langs/bn_IN/sms.lang               |   51 +
 htdocs/langs/bn_IN/stocks.lang            |  220 +++
 htdocs/langs/bn_IN/stripe.lang            |   72 +
 htdocs/langs/bn_IN/supplier_proposal.lang |   54 +
 htdocs/langs/bn_IN/suppliers.lang         |   47 +
 htdocs/langs/bn_IN/ticket.lang            |  305 ++++
 htdocs/langs/bn_IN/trips.lang             |  151 ++
 htdocs/langs/bn_IN/users.lang             |  118 ++
 htdocs/langs/bn_IN/website.lang           |  130 ++
 htdocs/langs/bn_IN/withdrawals.lang       |  119 ++
 htdocs/langs/bn_IN/workflow.lang          |   20 +
 htdocs/langs/bn_IN/zapier.lang            |   28 +
 htdocs/langs/bs_BA/accountancy.lang       |   20 +-
 htdocs/langs/bs_BA/admin.lang             |   13 +-
 htdocs/langs/bs_BA/bills.lang             |   11 +-
 htdocs/langs/bs_BA/donations.lang         |    2 +-
 htdocs/langs/bs_BA/interventions.lang     |    6 +-
 htdocs/langs/bs_BA/modulebuilder.lang     |    4 +-
 htdocs/langs/bs_BA/projects.lang          |    2 +-
 htdocs/langs/bs_BA/website.lang           |    4 +-
 htdocs/langs/bs_BA/zapier.lang            |   28 +
 htdocs/langs/ca_ES/accountancy.lang       |   20 +-
 htdocs/langs/ca_ES/admin.lang             |   53 +-
 htdocs/langs/ca_ES/bills.lang             |   13 +-
 htdocs/langs/ca_ES/modulebuilder.lang     |    4 +-
 htdocs/langs/ca_ES/projects.lang          |   10 +-
 htdocs/langs/ca_ES/website.lang           |    4 +-
 htdocs/langs/ca_ES/zapier.lang            |   28 +
 htdocs/langs/cs_CZ/accountancy.lang       |   20 +-
 htdocs/langs/cs_CZ/admin.lang             |   13 +-
 htdocs/langs/cs_CZ/bills.lang             |   11 +-
 htdocs/langs/cs_CZ/blockedlog.lang        |    2 +-
 htdocs/langs/cs_CZ/commercial.lang        |    4 +-
 htdocs/langs/cs_CZ/deliveries.lang        |    2 +-
 htdocs/langs/cs_CZ/exports.lang           |    4 +-
 htdocs/langs/cs_CZ/interventions.lang     |    5 +-
 htdocs/langs/cs_CZ/languages.lang         |    2 +-
 htdocs/langs/cs_CZ/link.lang              |    2 +-
 htdocs/langs/cs_CZ/mails.lang             |    8 +-
 htdocs/langs/cs_CZ/margins.lang           |   21 +-
 htdocs/langs/cs_CZ/modulebuilder.lang     |    4 +-
 htdocs/langs/cs_CZ/multicurrency.lang     |    2 +
 htdocs/langs/cs_CZ/opensurvey.lang        |    2 +-
 htdocs/langs/cs_CZ/paybox.lang            |    4 +-
 htdocs/langs/cs_CZ/projects.lang          |    2 +-
 htdocs/langs/cs_CZ/propal.lang            |    6 +-
 htdocs/langs/cs_CZ/receptions.lang        |    6 +-
 htdocs/langs/cs_CZ/resource.lang          |   15 +-
 htdocs/langs/cs_CZ/salaries.lang          |    2 +-
 htdocs/langs/cs_CZ/supplier_proposal.lang |    2 +-
 htdocs/langs/cs_CZ/users.lang             |    7 +-
 htdocs/langs/cs_CZ/website.lang           |    4 +-
 htdocs/langs/cs_CZ/withdrawals.lang       |    8 +-
 htdocs/langs/cs_CZ/zapier.lang            |   28 +
 htdocs/langs/da_DK/accountancy.lang       |   20 +-
 htdocs/langs/da_DK/admin.lang             |   13 +-
 htdocs/langs/da_DK/bills.lang             |    9 +-
 htdocs/langs/da_DK/donations.lang         |   44 +-
 htdocs/langs/da_DK/interventions.lang     |    6 +-
 htdocs/langs/da_DK/modulebuilder.lang     |    4 +-
 htdocs/langs/da_DK/multicurrency.lang     |   22 +
 htdocs/langs/da_DK/projects.lang          |    2 +-
 htdocs/langs/da_DK/website.lang           |    4 +-
 htdocs/langs/da_DK/zapier.lang            |   28 +
 htdocs/langs/de_AT/accountancy.lang       |    4 +
 htdocs/langs/de_AT/externalsite.lang      |    4 +
 htdocs/langs/de_AT/modulebuilder.lang     |    2 +
 htdocs/langs/de_CH/assets.lang            |   27 +
 htdocs/langs/de_CH/blockedlog.lang        |    5 +
 htdocs/langs/de_CH/cashdesk.lang          |    3 +
 htdocs/langs/de_CH/externalsite.lang      |    2 +
 htdocs/langs/de_CH/ftp.lang               |   12 +
 htdocs/langs/de_CH/link.lang              |    5 +
 htdocs/langs/de_CH/main.lang              |    1 -
 htdocs/langs/de_CH/members.lang           |    1 -
 htdocs/langs/de_CH/modulebuilder.lang     |    2 +
 htdocs/langs/de_CH/multicurrency.lang     |   20 +
 htdocs/langs/de_CH/paypal.lang            |   20 +
 htdocs/langs/de_CH/salaries.lang          |   12 +
 htdocs/langs/de_CH/zapier.lang            |    2 +
 htdocs/langs/de_DE/accountancy.lang       |   20 +-
 htdocs/langs/de_DE/admin.lang             |   57 +-
 htdocs/langs/de_DE/bills.lang             |   25 +-
 htdocs/langs/de_DE/modulebuilder.lang     |    6 +-
 htdocs/langs/de_DE/projects.lang          |    2 +-
 htdocs/langs/de_DE/propal.lang            |    4 +-
 htdocs/langs/de_DE/website.lang           |    4 +-
 htdocs/langs/de_DE/zapier.lang            |   28 +
 htdocs/langs/el_CY/accountancy.lang       |    3 +
 htdocs/langs/el_CY/admin.lang             |    5 +
 htdocs/langs/el_CY/companies.lang         |    2 +
 htdocs/langs/el_CY/modulebuilder.lang     |    2 +
 htdocs/langs/el_CY/projects.lang          |    2 +
 htdocs/langs/el_GR/accountancy.lang       |   22 +-
 htdocs/langs/el_GR/admin.lang             |   75 +-
 htdocs/langs/el_GR/bills.lang             |   29 +-
 htdocs/langs/el_GR/modulebuilder.lang     |    6 +-
 htdocs/langs/el_GR/multicurrency.lang     |   38 +-
 htdocs/langs/el_GR/projects.lang          |   20 +-
 htdocs/langs/el_GR/website.lang           |   20 +-
 htdocs/langs/el_GR/zapier.lang            |   28 +
 htdocs/langs/en_AU/accountancy.lang       |    3 +
 htdocs/langs/en_AU/modulebuilder.lang     |    2 +
 htdocs/langs/en_AU/projects.lang          |    2 +
 htdocs/langs/en_CA/accountancy.lang       |    3 +
 htdocs/langs/en_CA/modulebuilder.lang     |    2 +
 htdocs/langs/en_CA/projects.lang          |    2 +
 htdocs/langs/en_GB/donations.lang         |    3 +
 htdocs/langs/en_GB/externalsite.lang      |    2 +
 htdocs/langs/en_GB/ftp.lang               |    2 +
 htdocs/langs/en_GB/modulebuilder.lang     |    2 +
 htdocs/langs/en_GB/multicurrency.lang     |    2 +
 htdocs/langs/en_GB/paypal.lang            |    5 +
 htdocs/langs/en_GB/salaries.lang          |    4 +
 htdocs/langs/en_GB/sms.lang               |    2 +
 htdocs/langs/en_IN/accountancy.lang       |    3 +
 htdocs/langs/en_IN/modulebuilder.lang     |    2 +
 htdocs/langs/en_SG/accountancy.lang       |    3 +
 htdocs/langs/en_SG/admin.lang             |    6 +
 htdocs/langs/en_SG/companies.lang         |    2 +
 htdocs/langs/en_SG/main.lang              |   21 +
 htdocs/langs/en_SG/modulebuilder.lang     |    2 +
 htdocs/langs/en_SG/projects.lang          |    2 +
 htdocs/langs/es_AR/accountancy.lang       |   21 +
 htdocs/langs/es_AR/admin.lang             |  626 +++++++
 htdocs/langs/es_AR/agenda.lang            |    3 +
 htdocs/langs/es_AR/banks.lang             |   87 +
 htdocs/langs/es_AR/bills.lang             |   37 +
 htdocs/langs/es_AR/blockedlog.lang        |   35 +
 htdocs/langs/es_AR/bookmarks.lang         |   18 +
 htdocs/langs/es_AR/boxes.lang             |   73 +
 htdocs/langs/es_AR/cashdesk.lang          |    5 +
 htdocs/langs/es_AR/categories.lang        |    2 +
 htdocs/langs/es_AR/commercial.lang        |   65 +
 htdocs/langs/es_AR/companies.lang         |  275 +++
 htdocs/langs/es_AR/compta.lang            |    5 +
 htdocs/langs/es_AR/contracts.lang         |   77 +
 htdocs/langs/es_AR/cron.lang              |   58 +
 htdocs/langs/es_AR/deliveries.lang        |   23 +
 htdocs/langs/es_AR/dict.lang              |   87 +
 htdocs/langs/es_AR/donations.lang         |   20 +
 htdocs/langs/es_AR/ecm.lang               |   50 +
 htdocs/langs/es_AR/externalsite.lang      |    3 +
 htdocs/langs/es_AR/ftp.lang               |   13 +
 htdocs/langs/es_AR/help.lang              |   19 +
 htdocs/langs/es_AR/holiday.lang           |   44 +
 htdocs/langs/es_AR/hrm.lang               |    6 +
 htdocs/langs/es_AR/install.lang           |    5 +
 htdocs/langs/es_AR/interventions.lang     |   47 +
 htdocs/langs/es_AR/languages.lang         |   11 +
 htdocs/langs/es_AR/ldap.lang              |   19 +
 htdocs/langs/es_AR/link.lang              |   10 +
 htdocs/langs/es_AR/loan.lang              |   20 +
 htdocs/langs/es_AR/mailmanspip.lang       |   26 +
 htdocs/langs/es_AR/mails.lang             |  134 ++
 htdocs/langs/es_AR/main.lang              |    3 -
 htdocs/langs/es_AR/margins.lang           |   36 +
 htdocs/langs/es_AR/members.lang           |  159 ++
 htdocs/langs/es_AR/modulebuilder.lang     |    2 +
 htdocs/langs/es_AR/mrp.lang               |   16 +
 htdocs/langs/es_AR/multicurrency.lang     |   17 +
 htdocs/langs/es_AR/opensurvey.lang        |   41 +
 htdocs/langs/es_AR/orders.lang            |   19 +
 htdocs/langs/es_AR/other.lang             |    3 +
 htdocs/langs/es_AR/paybox.lang            |   24 +
 htdocs/langs/es_AR/paypal.lang            |   31 +
 htdocs/langs/es_AR/printing.lang          |   46 +
 htdocs/langs/es_AR/productbatch.lang      |   21 +
 htdocs/langs/es_AR/products.lang          |    7 +
 htdocs/langs/es_AR/projects.lang          |    8 +
 htdocs/langs/es_AR/propal.lang            |    9 +
 htdocs/langs/es_AR/receptions.lang        |   29 +
 htdocs/langs/es_AR/resource.lang          |   19 +
 htdocs/langs/es_AR/salaries.lang          |   20 +
 htdocs/langs/es_AR/sendings.lang          |   56 +
 htdocs/langs/es_AR/sms.lang               |   27 +
 htdocs/langs/es_AR/stocks.lang            |    6 +
 htdocs/langs/es_AR/supplier_proposal.lang |   43 +
 htdocs/langs/es_AR/suppliers.lang         |   37 +
 htdocs/langs/es_AR/trips.lang             |  118 ++
 htdocs/langs/es_AR/users.lang             |   81 +
 htdocs/langs/es_AR/website.lang           |    3 +
 htdocs/langs/es_AR/withdrawals.lang       |  100 +
 htdocs/langs/es_AR/workflow.lang          |   15 +
 htdocs/langs/es_AR/zapier.lang            |    3 +
 htdocs/langs/es_BO/accountancy.lang       |    3 +
 htdocs/langs/es_BO/admin.lang             |    5 +
 htdocs/langs/es_BO/companies.lang         |    2 +
 htdocs/langs/es_BO/modulebuilder.lang     |    2 +
 htdocs/langs/es_BO/projects.lang          |    2 +
 htdocs/langs/es_CL/admin.lang             |    2 -
 htdocs/langs/es_CL/blockedlog.lang        |   19 +
 htdocs/langs/es_CL/cashdesk.lang          |   43 +
 htdocs/langs/es_CL/categories.lang        |   76 +
 htdocs/langs/es_CL/contracts.lang         |   74 +
 htdocs/langs/es_CL/cron.lang              |   63 +
 htdocs/langs/es_CL/deliveries.lang        |   24 +
 htdocs/langs/es_CL/dict.lang              |   78 +
 htdocs/langs/es_CL/errors.lang            |  214 +++
 htdocs/langs/es_CL/exports.lang           |  106 ++
 htdocs/langs/es_CL/externalsite.lang      |    3 +
 htdocs/langs/es_CL/ftp.lang               |   13 +
 htdocs/langs/es_CL/help.lang              |   21 +
 htdocs/langs/es_CL/holiday.lang           |  105 ++
 htdocs/langs/es_CL/hrm.lang               |    7 +
 htdocs/langs/es_CL/languages.lang         |   49 +
 htdocs/langs/es_CL/ldap.lang              |   17 +
 htdocs/langs/es_CL/link.lang              |   10 +
 htdocs/langs/es_CL/loan.lang              |   24 +
 htdocs/langs/es_CL/mailmanspip.lang       |   24 +
 htdocs/langs/es_CL/mails.lang             |  131 ++
 htdocs/langs/es_CL/main.lang              |    1 -
 htdocs/langs/es_CL/margins.lang           |   34 +
 htdocs/langs/es_CL/modulebuilder.lang     |   97 +
 htdocs/langs/es_CL/mrp.lang               |   39 +
 htdocs/langs/es_CL/multicurrency.lang     |   15 +
 htdocs/langs/es_CL/oauth.lang             |   22 +
 htdocs/langs/es_CL/opensurvey.lang        |   41 +
 htdocs/langs/es_CL/orders.lang            |    1 -
 htdocs/langs/es_CL/paybox.lang            |   25 +
 htdocs/langs/es_CL/paypal.lang            |   28 +
 htdocs/langs/es_CL/printing.lang          |   40 +
 htdocs/langs/es_CL/productbatch.lang      |   20 +
 htdocs/langs/es_CL/products.lang          |    1 -
 htdocs/langs/es_CL/receiptprinter.lang    |   36 +
 htdocs/langs/es_CL/resource.lang          |   19 +
 htdocs/langs/es_CL/salaries.lang          |   11 +
 htdocs/langs/es_CL/sendings.lang          |   48 +
 htdocs/langs/es_CL/sms.lang               |   33 +
 htdocs/langs/es_CL/stripe.lang            |   37 +
 htdocs/langs/es_CL/suppliers.lang         |   39 +
 htdocs/langs/es_CL/trips.lang             |  101 ++
 htdocs/langs/es_CL/users.lang             |   86 +
 htdocs/langs/es_CL/website.lang           |   75 +
 htdocs/langs/es_CL/withdrawals.lang       |  102 ++
 htdocs/langs/es_CO/accountancy.lang       |  203 +++
 htdocs/langs/es_CO/agenda.lang            |    1 -
 htdocs/langs/es_CO/boxes.lang             |    3 +
 htdocs/langs/es_CO/categories.lang        |    3 +
 htdocs/langs/es_CO/contracts.lang         |    5 +
 htdocs/langs/es_CO/exports.lang           |    3 +
 htdocs/langs/es_CO/install.lang           |  179 ++
 htdocs/langs/es_CO/main.lang              |    1 -
 htdocs/langs/es_CO/modulebuilder.lang     |    2 +
 htdocs/langs/es_CO/multicurrency.lang     |    2 +
 htdocs/langs/es_CO/other.lang             |  142 ++
 htdocs/langs/es_CO/productbatch.lang      |   20 +
 htdocs/langs/es_CO/products.lang          |  192 ++
 htdocs/langs/es_CO/projects.lang          |  163 ++
 htdocs/langs/es_CO/salaries.lang          |    3 +
 htdocs/langs/es_CO/sms.lang               |    3 +
 htdocs/langs/es_CO/stocks.lang            |    3 -
 htdocs/langs/es_CO/supplier_proposal.lang |    4 +
 htdocs/langs/es_CO/suppliers.lang         |    3 +
 htdocs/langs/es_CO/trips.lang             |   40 +
 htdocs/langs/es_CO/users.lang             |    2 +
 htdocs/langs/es_CO/withdrawals.lang       |    5 +
 htdocs/langs/es_CO/workflow.lang          |   15 +
 htdocs/langs/es_CO/zapier.lang            |    2 +
 htdocs/langs/es_DO/accountancy.lang       |    3 +
 htdocs/langs/es_DO/companies.lang         |    2 +
 htdocs/langs/es_DO/modulebuilder.lang     |    2 +
 htdocs/langs/es_DO/projects.lang          |    2 +
 htdocs/langs/es_EC/accountancy.lang       |  268 +++
 htdocs/langs/es_EC/admin.lang             |    4 -
 htdocs/langs/es_EC/agenda.lang            |  108 ++
 htdocs/langs/es_EC/banks.lang             |  120 ++
 htdocs/langs/es_EC/bills.lang             |  441 +++++
 htdocs/langs/es_EC/bookmarks.lang         |   11 +
 htdocs/langs/es_EC/boxes.lang             |   77 +
 htdocs/langs/es_EC/cashdesk.lang          |   71 +
 htdocs/langs/es_EC/categories.lang        |   60 +
 htdocs/langs/es_EC/commercial.lang        |   65 +
 htdocs/langs/es_EC/companies.lang         |  278 +++
 htdocs/langs/es_EC/compta.lang            |  227 +++
 htdocs/langs/es_EC/contracts.lang         |   75 +
 htdocs/langs/es_EC/cron.lang              |   64 +
 htdocs/langs/es_EC/deliveries.lang        |   22 +
 htdocs/langs/es_EC/dict.lang              |   82 +
 htdocs/langs/es_EC/donations.lang         |   18 +
 htdocs/langs/es_EC/ecm.lang               |   34 +
 htdocs/langs/es_EC/errors.lang            |  225 +++
 htdocs/langs/es_EC/exports.lang           |  109 ++
 htdocs/langs/es_EC/externalsite.lang      |    4 +
 htdocs/langs/es_EC/ftp.lang               |   12 +
 htdocs/langs/es_EC/help.lang              |   18 +
 htdocs/langs/es_EC/holiday.lang           |  108 ++
 htdocs/langs/es_EC/hrm.lang               |    7 +
 htdocs/langs/es_EC/install.lang           |  191 ++
 htdocs/langs/es_EC/interventions.lang     |   54 +
 htdocs/langs/es_EC/languages.lang         |    8 +
 htdocs/langs/es_EC/ldap.lang              |   17 +
 htdocs/langs/es_EC/link.lang              |    9 +
 htdocs/langs/es_EC/loan.lang              |   23 +
 htdocs/langs/es_EC/mailmanspip.lang       |   24 +
 htdocs/langs/es_EC/mails.lang             |  129 ++
 htdocs/langs/es_EC/main.lang              |    2 -
 htdocs/langs/es_EC/margins.lang           |   34 +
 htdocs/langs/es_EC/members.lang           |  161 ++
 htdocs/langs/es_EC/modulebuilder.lang     |   93 +
 htdocs/langs/es_EC/mrp.lang               |   50 +
 htdocs/langs/es_EC/multicurrency.lang     |   18 +
 htdocs/langs/es_EC/oauth.lang             |   23 +
 htdocs/langs/es_EC/opensurvey.lang        |   35 +
 htdocs/langs/es_EC/orders.lang            |  142 ++
 htdocs/langs/es_EC/other.lang             |  198 ++
 htdocs/langs/es_EC/paybox.lang            |   24 +
 htdocs/langs/es_EC/paypal.lang            |   27 +
 htdocs/langs/es_EC/printing.lang          |   41 +
 htdocs/langs/es_EC/productbatch.lang      |   19 +
 htdocs/langs/es_EC/products.lang          |  234 +++
 htdocs/langs/es_EC/projects.lang          |  190 ++
 htdocs/langs/es_EC/propal.lang            |   68 +
 htdocs/langs/es_EC/receiptprinter.lang    |   74 +
 htdocs/langs/es_EC/resource.lang          |   17 +
 htdocs/langs/es_EC/salaries.lang          |   17 +
 htdocs/langs/es_EC/sendings.lang          |   51 +
 htdocs/langs/es_EC/sms.lang               |   29 +
 htdocs/langs/es_EC/stocks.lang            |  167 ++
 htdocs/langs/es_EC/stripe.lang            |   37 +
 htdocs/langs/es_EC/supplier_proposal.lang |   46 +
 htdocs/langs/es_EC/suppliers.lang         |   36 +
 htdocs/langs/es_EC/trips.lang             |   95 +
 htdocs/langs/es_EC/users.lang             |   87 +
 htdocs/langs/es_EC/website.lang           |   74 +
 htdocs/langs/es_EC/withdrawals.lang       |  100 +
 htdocs/langs/es_EC/workflow.lang          |   14 +
 htdocs/langs/es_ES/accountancy.lang       |   20 +-
 htdocs/langs/es_ES/admin.lang             |   13 +-
 htdocs/langs/es_ES/bills.lang             |   13 +-
 htdocs/langs/es_ES/modulebuilder.lang     |    4 +-
 htdocs/langs/es_ES/projects.lang          |    2 +-
 htdocs/langs/es_ES/website.lang           |    4 +-
 htdocs/langs/es_GT/accountancy.lang       |    3 +
 htdocs/langs/es_GT/admin.lang             |    5 +
 htdocs/langs/es_GT/companies.lang         |    2 +
 htdocs/langs/es_GT/main.lang              |   21 +
 htdocs/langs/es_GT/modulebuilder.lang     |    2 +
 htdocs/langs/es_GT/projects.lang          |    2 +
 htdocs/langs/es_HN/accountancy.lang       |    3 +
 htdocs/langs/es_HN/admin.lang             |    5 +
 htdocs/langs/es_HN/companies.lang         |    2 +
 htdocs/langs/es_HN/modulebuilder.lang     |    2 +
 htdocs/langs/es_HN/projects.lang          |    2 +
 htdocs/langs/es_MX/agenda.lang            |    1 -
 htdocs/langs/es_MX/boxes.lang             |   13 +
 htdocs/langs/es_MX/errors.lang            |    4 +
 htdocs/langs/es_MX/externalsite.lang      |    4 +
 htdocs/langs/es_MX/ftp.lang               |   11 +
 htdocs/langs/es_MX/interventions.lang     |    2 +
 htdocs/langs/es_MX/link.lang              |   10 +
 htdocs/langs/es_MX/mails.lang             |    2 +
 htdocs/langs/es_MX/main.lang              |    1 -
 htdocs/langs/es_MX/modulebuilder.lang     |   12 +
 htdocs/langs/es_MX/multicurrency.lang     |   18 +
 htdocs/langs/es_MX/oauth.lang             |   22 +
 htdocs/langs/es_MX/products.lang          |    1 -
 htdocs/langs/es_MX/projects.lang          |    4 +
 htdocs/langs/es_MX/receiptprinter.lang    |   19 +
 htdocs/langs/es_MX/salaries.lang          |    3 +
 htdocs/langs/es_MX/suppliers.lang         |    2 +
 htdocs/langs/es_MX/website.lang           |    4 +
 htdocs/langs/es_MX/workflow.lang          |   15 +
 htdocs/langs/es_MX/zapier.lang            |    2 +
 htdocs/langs/es_PA/accountancy.lang       |    3 +
 htdocs/langs/es_PA/companies.lang         |    2 +
 htdocs/langs/es_PA/modulebuilder.lang     |    2 +
 htdocs/langs/es_PA/projects.lang          |    2 +
 htdocs/langs/es_PE/agenda.lang            |    2 +
 htdocs/langs/es_PE/assets.lang            |    2 +
 htdocs/langs/es_PE/banks.lang             |    3 +
 htdocs/langs/es_PE/bookmarks.lang         |    2 +
 htdocs/langs/es_PE/cashdesk.lang          |    3 +
 htdocs/langs/es_PE/commercial.lang        |    2 +
 htdocs/langs/es_PE/cron.lang              |    3 +
 htdocs/langs/es_PE/donations.lang         |    3 +
 htdocs/langs/es_PE/externalsite.lang      |    4 +
 htdocs/langs/es_PE/help.lang              |   20 +
 htdocs/langs/es_PE/holiday.lang           |    4 +
 htdocs/langs/es_PE/interventions.lang     |    9 +
 htdocs/langs/es_PE/mails.lang             |    2 +
 htdocs/langs/es_PE/main.lang              |    1 -
 htdocs/langs/es_PE/margins.lang           |   13 +
 htdocs/langs/es_PE/modulebuilder.lang     |    2 +
 htdocs/langs/es_PE/multicurrency.lang     |   20 +
 htdocs/langs/es_PE/products.lang          |    6 +
 htdocs/langs/es_PE/projects.lang          |    3 +
 htdocs/langs/es_PE/salaries.lang          |    2 +
 htdocs/langs/es_PE/stocks.lang            |    4 +
 htdocs/langs/es_PE/trips.lang             |    2 +
 htdocs/langs/es_PE/users.lang             |    4 +
 htdocs/langs/es_PE/website.lang           |    2 +
 htdocs/langs/es_PE/workflow.lang          |    2 +
 htdocs/langs/es_PY/accountancy.lang       |    3 +
 htdocs/langs/es_PY/admin.lang             |    5 +
 htdocs/langs/es_PY/companies.lang         |    2 +
 htdocs/langs/es_PY/modulebuilder.lang     |    2 +
 htdocs/langs/es_PY/projects.lang          |    2 +
 htdocs/langs/es_PY/zapier.lang            |    3 +
 htdocs/langs/es_US/accountancy.lang       |    3 +
 htdocs/langs/es_US/admin.lang             |    5 +
 htdocs/langs/es_US/companies.lang         |    2 +
 htdocs/langs/es_US/main.lang              |   21 +
 htdocs/langs/es_US/modulebuilder.lang     |    2 +
 htdocs/langs/es_US/projects.lang          |    2 +
 htdocs/langs/es_UY/accountancy.lang       |    3 +
 htdocs/langs/es_UY/admin.lang             |    5 +
 htdocs/langs/es_UY/companies.lang         |    2 +
 htdocs/langs/es_UY/modulebuilder.lang     |    2 +
 htdocs/langs/es_UY/projects.lang          |    2 +
 htdocs/langs/es_VE/accountancy.lang       |    3 +
 htdocs/langs/es_VE/categories.lang        |    2 +
 htdocs/langs/es_VE/dict.lang              |    2 +
 htdocs/langs/es_VE/modulebuilder.lang     |    2 +
 htdocs/langs/et_EE/accountancy.lang       |   20 +-
 htdocs/langs/et_EE/admin.lang             |   13 +-
 htdocs/langs/et_EE/bills.lang             |   11 +-
 htdocs/langs/et_EE/donations.lang         |    2 +-
 htdocs/langs/et_EE/interventions.lang     |    6 +-
 htdocs/langs/et_EE/modulebuilder.lang     |    4 +-
 htdocs/langs/et_EE/multicurrency.lang     |   22 +
 htdocs/langs/et_EE/projects.lang          |    2 +-
 htdocs/langs/et_EE/website.lang           |    4 +-
 htdocs/langs/et_EE/zapier.lang            |   28 +
 htdocs/langs/eu_ES/accountancy.lang       |   20 +-
 htdocs/langs/eu_ES/admin.lang             |   13 +-
 htdocs/langs/eu_ES/bills.lang             |   11 +-
 htdocs/langs/eu_ES/donations.lang         |    2 +-
 htdocs/langs/eu_ES/interventions.lang     |    6 +-
 htdocs/langs/eu_ES/modulebuilder.lang     |    4 +-
 htdocs/langs/eu_ES/multicurrency.lang     |   22 +
 htdocs/langs/eu_ES/projects.lang          |    2 +-
 htdocs/langs/eu_ES/website.lang           |    4 +-
 htdocs/langs/eu_ES/zapier.lang            |   28 +
 htdocs/langs/fa_IR/accountancy.lang       |   20 +-
 htdocs/langs/fa_IR/admin.lang             |   13 +-
 htdocs/langs/fa_IR/bills.lang             |   11 +-
 htdocs/langs/fa_IR/donations.lang         |    2 +-
 htdocs/langs/fa_IR/interventions.lang     |    6 +-
 htdocs/langs/fa_IR/modulebuilder.lang     |    4 +-
 htdocs/langs/fa_IR/multicurrency.lang     |   22 +
 htdocs/langs/fa_IR/projects.lang          |    2 +-
 htdocs/langs/fa_IR/website.lang           |    4 +-
 htdocs/langs/fa_IR/zapier.lang            |   28 +
 htdocs/langs/fi_FI/accountancy.lang       |   20 +-
 htdocs/langs/fi_FI/admin.lang             |   13 +-
 htdocs/langs/fi_FI/assets.lang            |    2 +-
 htdocs/langs/fi_FI/bills.lang             |   11 +-
 htdocs/langs/fi_FI/donations.lang         |    2 +-
 htdocs/langs/fi_FI/interventions.lang     |    8 +-
 htdocs/langs/fi_FI/main.lang              |    9 +-
 htdocs/langs/fi_FI/margins.lang           |    9 +-
 htdocs/langs/fi_FI/modulebuilder.lang     |    4 +-
 htdocs/langs/fi_FI/multicurrency.lang     |   22 +
 htdocs/langs/fi_FI/products.lang          |    2 +-
 htdocs/langs/fi_FI/projects.lang          |    2 +-
 htdocs/langs/fi_FI/sendings.lang          |    4 +-
 htdocs/langs/fi_FI/stocks.lang            |   12 +-
 htdocs/langs/fi_FI/website.lang           |    4 +-
 htdocs/langs/fi_FI/withdrawals.lang       |    4 +-
 htdocs/langs/fi_FI/zapier.lang            |   28 +
 htdocs/langs/fr_BE/agenda.lang            |    1 -
 htdocs/langs/fr_BE/modulebuilder.lang     |    2 +
 htdocs/langs/fr_BE/products.lang          |    2 +
 htdocs/langs/fr_BE/projects.lang          |    2 +
 htdocs/langs/fr_CH/accountancy.lang       |    3 +
 htdocs/langs/fr_CH/admin.lang             |    5 +
 htdocs/langs/fr_CH/modulebuilder.lang     |    2 +
 htdocs/langs/fr_CH/projects.lang          |    2 +
 htdocs/langs/fr_CI/accountancy.lang       |    3 +
 htdocs/langs/fr_CI/admin.lang             |    5 +
 htdocs/langs/fr_CI/main.lang              |   21 +
 htdocs/langs/fr_CI/modulebuilder.lang     |    2 +
 htdocs/langs/fr_CI/projects.lang          |    2 +
 htdocs/langs/fr_CM/accountancy.lang       |    3 +
 htdocs/langs/fr_CM/admin.lang             |    5 +
 htdocs/langs/fr_CM/main.lang              |   21 +
 htdocs/langs/fr_CM/modulebuilder.lang     |    2 +
 htdocs/langs/fr_CM/projects.lang          |    2 +
 htdocs/langs/fr_FR/accountancy.lang       |   30 +-
 htdocs/langs/fr_FR/admin.lang             |   41 +-
 htdocs/langs/fr_FR/bills.lang             |   19 +-
 htdocs/langs/fr_FR/cashdesk.lang          |   14 +-
 htdocs/langs/fr_FR/companies.lang         |    5 +-
 htdocs/langs/fr_FR/compta.lang            |   22 +-
 htdocs/langs/fr_FR/interventions.lang     |    5 +-
 htdocs/langs/fr_FR/main.lang              |   13 +-
 htdocs/langs/fr_FR/modulebuilder.lang     |    8 +-
 htdocs/langs/fr_FR/projects.lang          |   10 +-
 htdocs/langs/fr_FR/receiptprinter.lang    |   52 +-
 htdocs/langs/fr_FR/users.lang             |    5 +-
 htdocs/langs/fr_FR/website.lang           |    6 +-
 htdocs/langs/fr_GA/accountancy.lang       |    3 +
 htdocs/langs/fr_GA/admin.lang             |    5 +
 htdocs/langs/fr_GA/main.lang              |   21 +
 htdocs/langs/fr_GA/modulebuilder.lang     |    2 +
 htdocs/langs/fr_GA/projects.lang          |    2 +
 htdocs/langs/gl_ES/accountancy.lang       |  382 ++++
 htdocs/langs/gl_ES/admin.lang             | 2002 +++++++++++++++++++++
 htdocs/langs/gl_ES/agenda.lang            |  154 ++
 htdocs/langs/gl_ES/assets.lang            |   65 +
 htdocs/langs/gl_ES/banks.lang             |  175 ++
 htdocs/langs/gl_ES/bills.lang             |  574 ++++++
 htdocs/langs/gl_ES/blockedlog.lang        |   54 +
 htdocs/langs/gl_ES/bookmarks.lang         |   21 +
 htdocs/langs/gl_ES/boxes.lang             |  102 ++
 htdocs/langs/gl_ES/cashdesk.lang          |  110 ++
 htdocs/langs/gl_ES/categories.lang        |   89 +
 htdocs/langs/gl_ES/commercial.lang        |   80 +
 htdocs/langs/gl_ES/companies.lang         |  458 +++++
 htdocs/langs/gl_ES/compta.lang            |  266 +++
 htdocs/langs/gl_ES/contracts.lang         |  101 ++
 htdocs/langs/gl_ES/cron.lang              |   84 +
 htdocs/langs/gl_ES/deliveries.lang        |   31 +
 htdocs/langs/gl_ES/dict.lang              |  359 ++++
 htdocs/langs/gl_ES/donations.lang         |   34 +
 htdocs/langs/gl_ES/ecm.lang               |   52 +
 htdocs/langs/gl_ES/errors.lang            |  265 +++
 htdocs/langs/gl_ES/exports.lang           |  135 ++
 htdocs/langs/gl_ES/externalsite.lang      |    5 +
 htdocs/langs/gl_ES/ftp.lang               |   14 +
 htdocs/langs/gl_ES/help.lang              |   23 +
 htdocs/langs/gl_ES/holiday.lang           |  133 ++
 htdocs/langs/gl_ES/hrm.lang               |   18 +
 htdocs/langs/gl_ES/install.lang           |  223 +++
 htdocs/langs/gl_ES/interventions.lang     |   66 +
 htdocs/langs/gl_ES/languages.lang         |   89 +
 htdocs/langs/gl_ES/ldap.lang              |   27 +
 htdocs/langs/gl_ES/link.lang              |   11 +
 htdocs/langs/gl_ES/loan.lang              |   31 +
 htdocs/langs/gl_ES/mailmanspip.lang       |   27 +
 htdocs/langs/gl_ES/mails.lang             |  170 ++
 htdocs/langs/gl_ES/main.lang              | 1035 +++++++++++
 htdocs/langs/gl_ES/margins.lang           |   45 +
 htdocs/langs/gl_ES/members.lang           |  204 +++
 htdocs/langs/gl_ES/modulebuilder.lang     |  141 ++
 htdocs/langs/gl_ES/mrp.lang               |   76 +
 htdocs/langs/gl_ES/multicurrency.lang     |   22 +
 htdocs/langs/gl_ES/oauth.lang             |   32 +
 htdocs/langs/gl_ES/opensurvey.lang        |   61 +
 htdocs/langs/gl_ES/orders.lang            |  189 ++
 htdocs/langs/gl_ES/other.lang             |  286 +++
 htdocs/langs/gl_ES/paybox.lang            |   31 +
 htdocs/langs/gl_ES/paypal.lang            |   36 +
 htdocs/langs/gl_ES/printing.lang          |   54 +
 htdocs/langs/gl_ES/productbatch.lang      |   24 +
 htdocs/langs/gl_ES/products.lang          |  385 ++++
 htdocs/langs/gl_ES/projects.lang          |  267 +++
 htdocs/langs/gl_ES/propal.lang            |   86 +
 htdocs/langs/gl_ES/receiptprinter.lang    |   95 +
 htdocs/langs/gl_ES/receptions.lang        |   45 +
 htdocs/langs/gl_ES/resource.lang          |   39 +
 htdocs/langs/gl_ES/salaries.lang          |   21 +
 htdocs/langs/gl_ES/sendings.lang          |   74 +
 htdocs/langs/gl_ES/sms.lang               |   51 +
 htdocs/langs/gl_ES/stocks.lang            |  220 +++
 htdocs/langs/gl_ES/stripe.lang            |   72 +
 htdocs/langs/gl_ES/supplier_proposal.lang |   54 +
 htdocs/langs/gl_ES/suppliers.lang         |   47 +
 htdocs/langs/gl_ES/ticket.lang            |  305 ++++
 htdocs/langs/gl_ES/trips.lang             |  151 ++
 htdocs/langs/gl_ES/users.lang             |  118 ++
 htdocs/langs/gl_ES/website.lang           |  130 ++
 htdocs/langs/gl_ES/withdrawals.lang       |  119 ++
 htdocs/langs/gl_ES/workflow.lang          |   20 +
 htdocs/langs/gl_ES/zapier.lang            |   28 +
 htdocs/langs/he_IL/accountancy.lang       |   20 +-
 htdocs/langs/he_IL/admin.lang             |   13 +-
 htdocs/langs/he_IL/bills.lang             |   11 +-
 htdocs/langs/he_IL/donations.lang         |    2 +-
 htdocs/langs/he_IL/interventions.lang     |    6 +-
 htdocs/langs/he_IL/modulebuilder.lang     |    4 +-
 htdocs/langs/he_IL/multicurrency.lang     |   22 +
 htdocs/langs/he_IL/projects.lang          |    2 +-
 htdocs/langs/he_IL/website.lang           |    4 +-
 htdocs/langs/he_IL/zapier.lang            |   28 +
 htdocs/langs/hi_IN/accountancy.lang       |  382 ++++
 htdocs/langs/hi_IN/admin.lang             | 2002 +++++++++++++++++++++
 htdocs/langs/hi_IN/agenda.lang            |  154 ++
 htdocs/langs/hi_IN/assets.lang            |   65 +
 htdocs/langs/hi_IN/banks.lang             |  175 ++
 htdocs/langs/hi_IN/bills.lang             |  574 ++++++
 htdocs/langs/hi_IN/blockedlog.lang        |   54 +
 htdocs/langs/hi_IN/bookmarks.lang         |   21 +
 htdocs/langs/hi_IN/boxes.lang             |  102 ++
 htdocs/langs/hi_IN/cashdesk.lang          |  110 ++
 htdocs/langs/hi_IN/categories.lang        |   89 +
 htdocs/langs/hi_IN/commercial.lang        |   80 +
 htdocs/langs/hi_IN/companies.lang         |  458 +++++
 htdocs/langs/hi_IN/compta.lang            |  266 +++
 htdocs/langs/hi_IN/contracts.lang         |  101 ++
 htdocs/langs/hi_IN/cron.lang              |   84 +
 htdocs/langs/hi_IN/deliveries.lang        |   31 +
 htdocs/langs/hi_IN/dict.lang              |  359 ++++
 htdocs/langs/hi_IN/donations.lang         |   34 +
 htdocs/langs/hi_IN/ecm.lang               |   52 +
 htdocs/langs/hi_IN/errors.lang            |  265 +++
 htdocs/langs/hi_IN/exports.lang           |  135 ++
 htdocs/langs/hi_IN/externalsite.lang      |    5 +
 htdocs/langs/hi_IN/ftp.lang               |   14 +
 htdocs/langs/hi_IN/help.lang              |   23 +
 htdocs/langs/hi_IN/holiday.lang           |  133 ++
 htdocs/langs/hi_IN/hrm.lang               |   18 +
 htdocs/langs/hi_IN/install.lang           |  223 +++
 htdocs/langs/hi_IN/interventions.lang     |   66 +
 htdocs/langs/hi_IN/languages.lang         |   89 +
 htdocs/langs/hi_IN/ldap.lang              |   27 +
 htdocs/langs/hi_IN/link.lang              |   11 +
 htdocs/langs/hi_IN/loan.lang              |   31 +
 htdocs/langs/hi_IN/mailmanspip.lang       |   27 +
 htdocs/langs/hi_IN/mails.lang             |  170 ++
 htdocs/langs/hi_IN/main.lang              | 1035 +++++++++++
 htdocs/langs/hi_IN/margins.lang           |   45 +
 htdocs/langs/hi_IN/members.lang           |  204 +++
 htdocs/langs/hi_IN/modulebuilder.lang     |  141 ++
 htdocs/langs/hi_IN/mrp.lang               |   76 +
 htdocs/langs/hi_IN/multicurrency.lang     |   22 +
 htdocs/langs/hi_IN/oauth.lang             |   32 +
 htdocs/langs/hi_IN/opensurvey.lang        |   61 +
 htdocs/langs/hi_IN/orders.lang            |  189 ++
 htdocs/langs/hi_IN/other.lang             |  286 +++
 htdocs/langs/hi_IN/paybox.lang            |   31 +
 htdocs/langs/hi_IN/paypal.lang            |   36 +
 htdocs/langs/hi_IN/printing.lang          |   54 +
 htdocs/langs/hi_IN/productbatch.lang      |   24 +
 htdocs/langs/hi_IN/products.lang          |  385 ++++
 htdocs/langs/hi_IN/projects.lang          |  267 +++
 htdocs/langs/hi_IN/propal.lang            |   86 +
 htdocs/langs/hi_IN/receiptprinter.lang    |   95 +
 htdocs/langs/hi_IN/receptions.lang        |   45 +
 htdocs/langs/hi_IN/resource.lang          |   39 +
 htdocs/langs/hi_IN/salaries.lang          |   21 +
 htdocs/langs/hi_IN/sendings.lang          |   74 +
 htdocs/langs/hi_IN/sms.lang               |   51 +
 htdocs/langs/hi_IN/stocks.lang            |  220 +++
 htdocs/langs/hi_IN/stripe.lang            |   72 +
 htdocs/langs/hi_IN/supplier_proposal.lang |   54 +
 htdocs/langs/hi_IN/suppliers.lang         |   47 +
 htdocs/langs/hi_IN/ticket.lang            |  305 ++++
 htdocs/langs/hi_IN/trips.lang             |  151 ++
 htdocs/langs/hi_IN/users.lang             |  118 ++
 htdocs/langs/hi_IN/website.lang           |  130 ++
 htdocs/langs/hi_IN/withdrawals.lang       |  119 ++
 htdocs/langs/hi_IN/workflow.lang          |   20 +
 htdocs/langs/hi_IN/zapier.lang            |   28 +
 htdocs/langs/hr_HR/accountancy.lang       |   20 +-
 htdocs/langs/hr_HR/admin.lang             |   13 +-
 htdocs/langs/hr_HR/bills.lang             |   11 +-
 htdocs/langs/hr_HR/donations.lang         |    4 +-
 htdocs/langs/hr_HR/main.lang              |   19 +-
 htdocs/langs/hr_HR/modulebuilder.lang     |    4 +-
 htdocs/langs/hr_HR/multicurrency.lang     |   22 +
 htdocs/langs/hr_HR/projects.lang          |    2 +-
 htdocs/langs/hr_HR/website.lang           |    4 +-
 htdocs/langs/hr_HR/zapier.lang            |   28 +
 htdocs/langs/hu_HU/accountancy.lang       |   20 +-
 htdocs/langs/hu_HU/admin.lang             |   19 +-
 htdocs/langs/hu_HU/bills.lang             |   11 +-
 htdocs/langs/hu_HU/donations.lang         |    2 +-
 htdocs/langs/hu_HU/interventions.lang     |    6 +-
 htdocs/langs/hu_HU/modulebuilder.lang     |    4 +-
 htdocs/langs/hu_HU/projects.lang          |    2 +-
 htdocs/langs/hu_HU/website.lang           |    4 +-
 htdocs/langs/hu_HU/zapier.lang            |   28 +
 htdocs/langs/id_ID/accountancy.lang       |   20 +-
 htdocs/langs/id_ID/admin.lang             |   13 +-
 htdocs/langs/id_ID/bills.lang             |   11 +-
 htdocs/langs/id_ID/donations.lang         |    2 +-
 htdocs/langs/id_ID/interventions.lang     |    6 +-
 htdocs/langs/id_ID/modulebuilder.lang     |    4 +-
 htdocs/langs/id_ID/multicurrency.lang     |   22 +
 htdocs/langs/id_ID/projects.lang          |    2 +-
 htdocs/langs/id_ID/website.lang           |    4 +-
 htdocs/langs/id_ID/zapier.lang            |   28 +
 htdocs/langs/is_IS/accountancy.lang       |   20 +-
 htdocs/langs/is_IS/admin.lang             |   13 +-
 htdocs/langs/is_IS/bills.lang             |   11 +-
 htdocs/langs/is_IS/donations.lang         |    2 +-
 htdocs/langs/is_IS/interventions.lang     |    6 +-
 htdocs/langs/is_IS/modulebuilder.lang     |    4 +-
 htdocs/langs/is_IS/multicurrency.lang     |   22 +
 htdocs/langs/is_IS/projects.lang          |    2 +-
 htdocs/langs/is_IS/website.lang           |    4 +-
 htdocs/langs/is_IS/zapier.lang            |   28 +
 htdocs/langs/it_CH/accountancy.lang       |    3 +
 htdocs/langs/it_CH/admin.lang             |    3 +
 htdocs/langs/it_CH/companies.lang         |    2 +
 htdocs/langs/it_CH/main.lang              |   21 +
 htdocs/langs/it_CH/projects.lang          |    2 +
 htdocs/langs/it_IT/accountancy.lang       |    6 +-
 htdocs/langs/it_IT/admin.lang             |   45 +-
 htdocs/langs/it_IT/bills.lang             |   21 +-
 htdocs/langs/it_IT/commercial.lang        |    6 +-
 htdocs/langs/it_IT/errors.lang            |    6 +-
 htdocs/langs/it_IT/exports.lang           |    4 +-
 htdocs/langs/it_IT/holiday.lang           |    6 +-
 htdocs/langs/it_IT/modulebuilder.lang     |    4 +-
 htdocs/langs/it_IT/multicurrency.lang     |    2 +-
 htdocs/langs/it_IT/other.lang             |    6 +-
 htdocs/langs/it_IT/projects.lang          |    2 +-
 htdocs/langs/it_IT/website.lang           |    4 +-
 htdocs/langs/it_IT/zapier.lang            |   28 +
 htdocs/langs/ka_GE/accountancy.lang       |   20 +-
 htdocs/langs/ka_GE/admin.lang             |   13 +-
 htdocs/langs/ka_GE/bills.lang             |   11 +-
 htdocs/langs/ka_GE/donations.lang         |    2 +-
 htdocs/langs/ka_GE/interventions.lang     |    6 +-
 htdocs/langs/ka_GE/modulebuilder.lang     |    4 +-
 htdocs/langs/ka_GE/multicurrency.lang     |   22 +
 htdocs/langs/ka_GE/projects.lang          |    2 +-
 htdocs/langs/ka_GE/website.lang           |    4 +-
 htdocs/langs/ka_GE/zapier.lang            |   28 +
 htdocs/langs/km_KH/accountancy.lang       |  382 ++++
 htdocs/langs/km_KH/admin.lang             | 2002 +++++++++++++++++++++
 htdocs/langs/km_KH/agenda.lang            |  154 ++
 htdocs/langs/km_KH/banks.lang             |  175 ++
 htdocs/langs/km_KH/bills.lang             |  574 ++++++
 htdocs/langs/km_KH/bookmarks.lang         |   21 +
 htdocs/langs/km_KH/boxes.lang             |  102 ++
 htdocs/langs/km_KH/cashdesk.lang          |  110 ++
 htdocs/langs/km_KH/categories.lang        |   89 +
 htdocs/langs/km_KH/commercial.lang        |   80 +
 htdocs/langs/km_KH/companies.lang         |  458 +++++
 htdocs/langs/km_KH/compta.lang            |  266 +++
 htdocs/langs/km_KH/contracts.lang         |  101 ++
 htdocs/langs/km_KH/cron.lang              |   84 +
 htdocs/langs/km_KH/deliveries.lang        |   31 +
 htdocs/langs/km_KH/dict.lang              |  359 ++++
 htdocs/langs/km_KH/donations.lang         |   34 +
 htdocs/langs/km_KH/ecm.lang               |   52 +
 htdocs/langs/km_KH/errors.lang            |  265 +++
 htdocs/langs/km_KH/exports.lang           |  135 ++
 htdocs/langs/km_KH/externalsite.lang      |    5 +
 htdocs/langs/km_KH/ftp.lang               |   14 +
 htdocs/langs/km_KH/help.lang              |   23 +
 htdocs/langs/km_KH/holiday.lang           |  133 ++
 htdocs/langs/km_KH/hrm.lang               |   18 +
 htdocs/langs/km_KH/install.lang           |  223 +++
 htdocs/langs/km_KH/interventions.lang     |   66 +
 htdocs/langs/km_KH/languages.lang         |   89 +
 htdocs/langs/km_KH/ldap.lang              |   27 +
 htdocs/langs/km_KH/link.lang              |   11 +
 htdocs/langs/km_KH/loan.lang              |   31 +
 htdocs/langs/km_KH/mailmanspip.lang       |   27 +
 htdocs/langs/km_KH/mails.lang             |  170 ++
 htdocs/langs/km_KH/margins.lang           |   45 +
 htdocs/langs/km_KH/members.lang           |  204 +++
 htdocs/langs/km_KH/modulebuilder.lang     |  141 ++
 htdocs/langs/km_KH/multicurrency.lang     |   22 +
 htdocs/langs/km_KH/oauth.lang             |   32 +
 htdocs/langs/km_KH/opensurvey.lang        |   61 +
 htdocs/langs/km_KH/orders.lang            |  189 ++
 htdocs/langs/km_KH/other.lang             |  286 +++
 htdocs/langs/km_KH/paybox.lang            |   31 +
 htdocs/langs/km_KH/paypal.lang            |   36 +
 htdocs/langs/km_KH/printing.lang          |   54 +
 htdocs/langs/km_KH/productbatch.lang      |   24 +
 htdocs/langs/km_KH/products.lang          |  385 ++++
 htdocs/langs/km_KH/projects.lang          |  267 +++
 htdocs/langs/km_KH/propal.lang            |   86 +
 htdocs/langs/km_KH/receiptprinter.lang    |   95 +
 htdocs/langs/km_KH/resource.lang          |   39 +
 htdocs/langs/km_KH/salaries.lang          |   21 +
 htdocs/langs/km_KH/sendings.lang          |   74 +
 htdocs/langs/km_KH/sms.lang               |   51 +
 htdocs/langs/km_KH/stocks.lang            |  220 +++
 htdocs/langs/km_KH/stripe.lang            |   72 +
 htdocs/langs/km_KH/supplier_proposal.lang |   54 +
 htdocs/langs/km_KH/suppliers.lang         |   47 +
 htdocs/langs/km_KH/trips.lang             |  151 ++
 htdocs/langs/km_KH/users.lang             |  118 ++
 htdocs/langs/km_KH/website.lang           |  130 ++
 htdocs/langs/km_KH/withdrawals.lang       |  119 ++
 htdocs/langs/km_KH/workflow.lang          |   20 +
 htdocs/langs/km_KH/zapier.lang            |   28 +
 htdocs/langs/kn_IN/accountancy.lang       |   20 +-
 htdocs/langs/kn_IN/admin.lang             |   13 +-
 htdocs/langs/kn_IN/bills.lang             |   11 +-
 htdocs/langs/kn_IN/donations.lang         |    2 +-
 htdocs/langs/kn_IN/interventions.lang     |    6 +-
 htdocs/langs/kn_IN/modulebuilder.lang     |    4 +-
 htdocs/langs/kn_IN/multicurrency.lang     |   22 +
 htdocs/langs/kn_IN/projects.lang          |    2 +-
 htdocs/langs/kn_IN/website.lang           |    4 +-
 htdocs/langs/kn_IN/zapier.lang            |   28 +
 htdocs/langs/ko_KR/accountancy.lang       |   20 +-
 htdocs/langs/ko_KR/admin.lang             |   13 +-
 htdocs/langs/ko_KR/bills.lang             |   11 +-
 htdocs/langs/ko_KR/donations.lang         |    2 +-
 htdocs/langs/ko_KR/interventions.lang     |    6 +-
 htdocs/langs/ko_KR/modulebuilder.lang     |    4 +-
 htdocs/langs/ko_KR/projects.lang          |    2 +-
 htdocs/langs/ko_KR/website.lang           |    4 +-
 htdocs/langs/ko_KR/zapier.lang            |   28 +
 htdocs/langs/lo_LA/accountancy.lang       |   20 +-
 htdocs/langs/lo_LA/admin.lang             |   13 +-
 htdocs/langs/lo_LA/bills.lang             |   11 +-
 htdocs/langs/lo_LA/donations.lang         |    2 +-
 htdocs/langs/lo_LA/interventions.lang     |    6 +-
 htdocs/langs/lo_LA/modulebuilder.lang     |    4 +-
 htdocs/langs/lo_LA/multicurrency.lang     |   22 +
 htdocs/langs/lo_LA/projects.lang          |    2 +-
 htdocs/langs/lo_LA/website.lang           |    4 +-
 htdocs/langs/lo_LA/zapier.lang            |   28 +
 htdocs/langs/lt_LT/accountancy.lang       |   20 +-
 htdocs/langs/lt_LT/admin.lang             |   13 +-
 htdocs/langs/lt_LT/bills.lang             |   11 +-
 htdocs/langs/lt_LT/donations.lang         |    2 +-
 htdocs/langs/lt_LT/interventions.lang     |    6 +-
 htdocs/langs/lt_LT/modulebuilder.lang     |    4 +-
 htdocs/langs/lt_LT/multicurrency.lang     |   22 +
 htdocs/langs/lt_LT/projects.lang          |    2 +-
 htdocs/langs/lt_LT/website.lang           |    4 +-
 htdocs/langs/lt_LT/zapier.lang            |   28 +
 htdocs/langs/lv_LV/accountancy.lang       |   20 +-
 htdocs/langs/lv_LV/admin.lang             |   57 +-
 htdocs/langs/lv_LV/bills.lang             |   25 +-
 htdocs/langs/lv_LV/modulebuilder.lang     |    4 +-
 htdocs/langs/lv_LV/multicurrency.lang     |    2 +
 htdocs/langs/lv_LV/projects.lang          |    8 +-
 htdocs/langs/lv_LV/website.lang           |   14 +-
 htdocs/langs/lv_LV/zapier.lang            |   28 +
 htdocs/langs/mk_MK/accountancy.lang       |   20 +-
 htdocs/langs/mk_MK/admin.lang             |   13 +-
 htdocs/langs/mk_MK/bills.lang             |   11 +-
 htdocs/langs/mk_MK/donations.lang         |    4 +-
 htdocs/langs/mk_MK/interventions.lang     |    6 +-
 htdocs/langs/mk_MK/modulebuilder.lang     |    4 +-
 htdocs/langs/mk_MK/multicurrency.lang     |   22 +
 htdocs/langs/mk_MK/projects.lang          |    2 +-
 htdocs/langs/mk_MK/website.lang           |    4 +-
 htdocs/langs/mk_MK/zapier.lang            |   28 +
 htdocs/langs/mn_MN/accountancy.lang       |   20 +-
 htdocs/langs/mn_MN/admin.lang             |   13 +-
 htdocs/langs/mn_MN/bills.lang             |   11 +-
 htdocs/langs/mn_MN/donations.lang         |    2 +-
 htdocs/langs/mn_MN/interventions.lang     |    6 +-
 htdocs/langs/mn_MN/modulebuilder.lang     |    4 +-
 htdocs/langs/mn_MN/multicurrency.lang     |   22 +
 htdocs/langs/mn_MN/projects.lang          |    2 +-
 htdocs/langs/mn_MN/website.lang           |    4 +-
 htdocs/langs/mn_MN/zapier.lang            |   28 +
 htdocs/langs/nb_NO/accountancy.lang       |   20 +-
 htdocs/langs/nb_NO/admin.lang             |   41 +-
 htdocs/langs/nb_NO/bills.lang             |   17 +-
 htdocs/langs/nb_NO/modulebuilder.lang     |    4 +-
 htdocs/langs/nb_NO/multicurrency.lang     |    2 +
 htdocs/langs/nb_NO/projects.lang          |    8 +-
 htdocs/langs/nb_NO/website.lang           |   14 +-
 htdocs/langs/nb_NO/zapier.lang            |   28 +
 htdocs/langs/ne_NP/accountancy.lang       |  382 ++++
 htdocs/langs/ne_NP/admin.lang             | 2002 +++++++++++++++++++++
 htdocs/langs/ne_NP/agenda.lang            |  154 ++
 htdocs/langs/ne_NP/assets.lang            |   65 +
 htdocs/langs/ne_NP/banks.lang             |  175 ++
 htdocs/langs/ne_NP/bills.lang             |  574 ++++++
 htdocs/langs/ne_NP/blockedlog.lang        |   54 +
 htdocs/langs/ne_NP/bookmarks.lang         |   21 +
 htdocs/langs/ne_NP/boxes.lang             |  102 ++
 htdocs/langs/ne_NP/cashdesk.lang          |  110 ++
 htdocs/langs/ne_NP/categories.lang        |   89 +
 htdocs/langs/ne_NP/commercial.lang        |   80 +
 htdocs/langs/ne_NP/companies.lang         |  458 +++++
 htdocs/langs/ne_NP/compta.lang            |  266 +++
 htdocs/langs/ne_NP/contracts.lang         |  101 ++
 htdocs/langs/ne_NP/cron.lang              |   84 +
 htdocs/langs/ne_NP/deliveries.lang        |   31 +
 htdocs/langs/ne_NP/dict.lang              |  359 ++++
 htdocs/langs/ne_NP/donations.lang         |   34 +
 htdocs/langs/ne_NP/ecm.lang               |   52 +
 htdocs/langs/ne_NP/errors.lang            |  265 +++
 htdocs/langs/ne_NP/exports.lang           |  135 ++
 htdocs/langs/ne_NP/externalsite.lang      |    5 +
 htdocs/langs/ne_NP/ftp.lang               |   14 +
 htdocs/langs/ne_NP/help.lang              |   23 +
 htdocs/langs/ne_NP/holiday.lang           |  133 ++
 htdocs/langs/ne_NP/hrm.lang               |   18 +
 htdocs/langs/ne_NP/install.lang           |  223 +++
 htdocs/langs/ne_NP/interventions.lang     |   66 +
 htdocs/langs/ne_NP/languages.lang         |   89 +
 htdocs/langs/ne_NP/ldap.lang              |   27 +
 htdocs/langs/ne_NP/link.lang              |   11 +
 htdocs/langs/ne_NP/loan.lang              |   31 +
 htdocs/langs/ne_NP/mailmanspip.lang       |   27 +
 htdocs/langs/ne_NP/mails.lang             |  170 ++
 htdocs/langs/ne_NP/main.lang              | 1035 +++++++++++
 htdocs/langs/ne_NP/margins.lang           |   45 +
 htdocs/langs/ne_NP/members.lang           |  204 +++
 htdocs/langs/ne_NP/modulebuilder.lang     |  141 ++
 htdocs/langs/ne_NP/mrp.lang               |   76 +
 htdocs/langs/ne_NP/multicurrency.lang     |   22 +
 htdocs/langs/ne_NP/oauth.lang             |   32 +
 htdocs/langs/ne_NP/opensurvey.lang        |   61 +
 htdocs/langs/ne_NP/orders.lang            |  189 ++
 htdocs/langs/ne_NP/other.lang             |  286 +++
 htdocs/langs/ne_NP/paybox.lang            |   31 +
 htdocs/langs/ne_NP/paypal.lang            |   36 +
 htdocs/langs/ne_NP/printing.lang          |   54 +
 htdocs/langs/ne_NP/productbatch.lang      |   24 +
 htdocs/langs/ne_NP/products.lang          |  385 ++++
 htdocs/langs/ne_NP/projects.lang          |  267 +++
 htdocs/langs/ne_NP/propal.lang            |   86 +
 htdocs/langs/ne_NP/receiptprinter.lang    |   95 +
 htdocs/langs/ne_NP/receptions.lang        |   45 +
 htdocs/langs/ne_NP/resource.lang          |   39 +
 htdocs/langs/ne_NP/salaries.lang          |   21 +
 htdocs/langs/ne_NP/sendings.lang          |   74 +
 htdocs/langs/ne_NP/sms.lang               |   51 +
 htdocs/langs/ne_NP/stocks.lang            |  220 +++
 htdocs/langs/ne_NP/stripe.lang            |   72 +
 htdocs/langs/ne_NP/supplier_proposal.lang |   54 +
 htdocs/langs/ne_NP/suppliers.lang         |   47 +
 htdocs/langs/ne_NP/ticket.lang            |  305 ++++
 htdocs/langs/ne_NP/trips.lang             |  151 ++
 htdocs/langs/ne_NP/users.lang             |  118 ++
 htdocs/langs/ne_NP/website.lang           |  130 ++
 htdocs/langs/ne_NP/withdrawals.lang       |  119 ++
 htdocs/langs/ne_NP/workflow.lang          |   20 +
 htdocs/langs/ne_NP/zapier.lang            |   28 +
 htdocs/langs/nl_BE/donations.lang         |    4 +
 htdocs/langs/nl_BE/main.lang              |    1 -
 htdocs/langs/nl_BE/modulebuilder.lang     |    2 +
 htdocs/langs/nl_BE/multicurrency.lang     |    2 +
 htdocs/langs/nl_BE/products.lang          |    1 -
 htdocs/langs/nl_BE/suppliers.lang         |    3 +
 htdocs/langs/nl_NL/accountancy.lang       |   22 +-
 htdocs/langs/nl_NL/admin.lang             |   59 +-
 htdocs/langs/nl_NL/bills.lang             |   21 +-
 htdocs/langs/nl_NL/blockedlog.lang        |    2 +-
 htdocs/langs/nl_NL/boxes.lang             |    4 +-
 htdocs/langs/nl_NL/cashdesk.lang          |   48 +-
 htdocs/langs/nl_NL/categories.lang        |   10 +-
 htdocs/langs/nl_NL/companies.lang         |    5 +-
 htdocs/langs/nl_NL/modulebuilder.lang     |    4 +-
 htdocs/langs/nl_NL/multicurrency.lang     |   22 +
 htdocs/langs/nl_NL/projects.lang          |    2 +-
 htdocs/langs/nl_NL/website.lang           |    4 +-
 htdocs/langs/nl_NL/zapier.lang            |   28 +
 htdocs/langs/pl_PL/accountancy.lang       |   26 +-
 htdocs/langs/pl_PL/admin.lang             |   19 +-
 htdocs/langs/pl_PL/bills.lang             |   11 +-
 htdocs/langs/pl_PL/donations.lang         |    4 +-
 htdocs/langs/pl_PL/interventions.lang     |    6 +-
 htdocs/langs/pl_PL/modulebuilder.lang     |    4 +-
 htdocs/langs/pl_PL/projects.lang          |    2 +-
 htdocs/langs/pl_PL/receptions.lang        |    4 +-
 htdocs/langs/pl_PL/website.lang           |    4 +-
 htdocs/langs/pl_PL/zapier.lang            |   28 +
 htdocs/langs/pt_BR/donations.lang         |    1 -
 htdocs/langs/pt_BR/zapier.lang            |    4 +
 htdocs/langs/pt_PT/accountancy.lang       |   20 +-
 htdocs/langs/pt_PT/admin.lang             |   13 +-
 htdocs/langs/pt_PT/bills.lang             |   11 +-
 htdocs/langs/pt_PT/donations.lang         |    6 +-
 htdocs/langs/pt_PT/interventions.lang     |    6 +-
 htdocs/langs/pt_PT/modulebuilder.lang     |    4 +-
 htdocs/langs/pt_PT/projects.lang          |    2 +-
 htdocs/langs/pt_PT/website.lang           |    4 +-
 htdocs/langs/pt_PT/zapier.lang            |   28 +
 htdocs/langs/ro_RO/accountancy.lang       |   20 +-
 htdocs/langs/ro_RO/admin.lang             |   13 +-
 htdocs/langs/ro_RO/bills.lang             |   11 +-
 htdocs/langs/ro_RO/donations.lang         |    4 +-
 htdocs/langs/ro_RO/interventions.lang     |    6 +-
 htdocs/langs/ro_RO/modulebuilder.lang     |    4 +-
 htdocs/langs/ro_RO/multicurrency.lang     |   22 +
 htdocs/langs/ro_RO/projects.lang          |    2 +-
 htdocs/langs/ro_RO/website.lang           |    4 +-
 htdocs/langs/ro_RO/zapier.lang            |   28 +
 htdocs/langs/ru_RU/accountancy.lang       |   20 +-
 htdocs/langs/ru_RU/admin.lang             |   13 +-
 htdocs/langs/ru_RU/bills.lang             |   11 +-
 htdocs/langs/ru_RU/donations.lang         |    2 +-
 htdocs/langs/ru_RU/interventions.lang     |    6 +-
 htdocs/langs/ru_RU/modulebuilder.lang     |    4 +-
 htdocs/langs/ru_RU/projects.lang          |    2 +-
 htdocs/langs/ru_RU/website.lang           |    4 +-
 htdocs/langs/ru_RU/zapier.lang            |   28 +
 htdocs/langs/sk_SK/accountancy.lang       |   20 +-
 htdocs/langs/sk_SK/admin.lang             |   13 +-
 htdocs/langs/sk_SK/bills.lang             |   11 +-
 htdocs/langs/sk_SK/donations.lang         |    2 +-
 htdocs/langs/sk_SK/interventions.lang     |    6 +-
 htdocs/langs/sk_SK/modulebuilder.lang     |    4 +-
 htdocs/langs/sk_SK/multicurrency.lang     |   22 +
 htdocs/langs/sk_SK/projects.lang          |    2 +-
 htdocs/langs/sk_SK/website.lang           |    4 +-
 htdocs/langs/sk_SK/zapier.lang            |   28 +
 htdocs/langs/sl_SI/accountancy.lang       |   20 +-
 htdocs/langs/sl_SI/admin.lang             |   13 +-
 htdocs/langs/sl_SI/bills.lang             |   11 +-
 htdocs/langs/sl_SI/donations.lang         |    2 +-
 htdocs/langs/sl_SI/interventions.lang     |    6 +-
 htdocs/langs/sl_SI/modulebuilder.lang     |    4 +-
 htdocs/langs/sl_SI/multicurrency.lang     |   22 +
 htdocs/langs/sl_SI/projects.lang          |    2 +-
 htdocs/langs/sl_SI/website.lang           |    4 +-
 htdocs/langs/sl_SI/zapier.lang            |   28 +
 htdocs/langs/sq_AL/accountancy.lang       |   20 +-
 htdocs/langs/sq_AL/admin.lang             |   13 +-
 htdocs/langs/sq_AL/bills.lang             |   11 +-
 htdocs/langs/sq_AL/donations.lang         |    2 +-
 htdocs/langs/sq_AL/interventions.lang     |    6 +-
 htdocs/langs/sq_AL/modulebuilder.lang     |    4 +-
 htdocs/langs/sq_AL/multicurrency.lang     |   22 +
 htdocs/langs/sq_AL/projects.lang          |    2 +-
 htdocs/langs/sq_AL/website.lang           |    4 +-
 htdocs/langs/sq_AL/zapier.lang            |   28 +
 htdocs/langs/sr_RS/accountancy.lang       |   20 +-
 htdocs/langs/sr_RS/admin.lang             |   13 +-
 htdocs/langs/sr_RS/assets.lang            |   65 +
 htdocs/langs/sr_RS/bills.lang             |   11 +-
 htdocs/langs/sr_RS/blockedlog.lang        |   54 +
 htdocs/langs/sr_RS/donations.lang         |    2 +-
 htdocs/langs/sr_RS/hrm.lang               |   18 +
 htdocs/langs/sr_RS/interventions.lang     |    6 +-
 htdocs/langs/sr_RS/modulebuilder.lang     |  141 ++
 htdocs/langs/sr_RS/mrp.lang               |   76 +
 htdocs/langs/sr_RS/multicurrency.lang     |   22 +
 htdocs/langs/sr_RS/oauth.lang             |   32 +
 htdocs/langs/sr_RS/projects.lang          |    2 +-
 htdocs/langs/sr_RS/receiptprinter.lang    |   95 +
 htdocs/langs/sr_RS/receptions.lang        |   45 +
 htdocs/langs/sr_RS/stripe.lang            |   72 +
 htdocs/langs/sr_RS/supplier_proposal.lang |   54 +
 htdocs/langs/sr_RS/ticket.lang            |  305 ++++
 htdocs/langs/sr_RS/website.lang           |  130 ++
 htdocs/langs/sr_RS/zapier.lang            |   28 +
 htdocs/langs/sv_SE/accountancy.lang       |   20 +-
 htdocs/langs/sv_SE/admin.lang             |   13 +-
 htdocs/langs/sv_SE/bills.lang             |   11 +-
 htdocs/langs/sv_SE/donations.lang         |   18 +-
 htdocs/langs/sv_SE/interventions.lang     |   18 +-
 htdocs/langs/sv_SE/modulebuilder.lang     |    4 +-
 htdocs/langs/sv_SE/multicurrency.lang     |   22 +
 htdocs/langs/sv_SE/projects.lang          |    2 +-
 htdocs/langs/sv_SE/website.lang           |    4 +-
 htdocs/langs/sv_SE/zapier.lang            |   28 +
 htdocs/langs/sw_SW/accountancy.lang       |   20 +-
 htdocs/langs/sw_SW/admin.lang             |   13 +-
 htdocs/langs/sw_SW/assets.lang            |   65 +
 htdocs/langs/sw_SW/bills.lang             |   11 +-
 htdocs/langs/sw_SW/blockedlog.lang        |   54 +
 htdocs/langs/sw_SW/donations.lang         |    2 +-
 htdocs/langs/sw_SW/hrm.lang               |   18 +
 htdocs/langs/sw_SW/interventions.lang     |    6 +-
 htdocs/langs/sw_SW/modulebuilder.lang     |  141 ++
 htdocs/langs/sw_SW/mrp.lang               |   76 +
 htdocs/langs/sw_SW/multicurrency.lang     |   22 +
 htdocs/langs/sw_SW/oauth.lang             |   32 +
 htdocs/langs/sw_SW/projects.lang          |    2 +-
 htdocs/langs/sw_SW/receiptprinter.lang    |   95 +
 htdocs/langs/sw_SW/receptions.lang        |   45 +
 htdocs/langs/sw_SW/stripe.lang            |   72 +
 htdocs/langs/sw_SW/supplier_proposal.lang |   54 +
 htdocs/langs/sw_SW/ticket.lang            |  305 ++++
 htdocs/langs/sw_SW/website.lang           |  130 ++
 htdocs/langs/sw_SW/zapier.lang            |   28 +
 htdocs/langs/th_TH/accountancy.lang       |   20 +-
 htdocs/langs/th_TH/admin.lang             |   13 +-
 htdocs/langs/th_TH/bills.lang             |   11 +-
 htdocs/langs/th_TH/donations.lang         |    2 +-
 htdocs/langs/th_TH/interventions.lang     |    6 +-
 htdocs/langs/th_TH/modulebuilder.lang     |    4 +-
 htdocs/langs/th_TH/projects.lang          |    2 +-
 htdocs/langs/th_TH/website.lang           |    4 +-
 htdocs/langs/th_TH/zapier.lang            |   28 +
 htdocs/langs/tr_TR/accountancy.lang       |   24 +-
 htdocs/langs/tr_TR/admin.lang             |   13 +-
 htdocs/langs/tr_TR/bills.lang             |   11 +-
 htdocs/langs/tr_TR/interventions.lang     |    6 +-
 htdocs/langs/tr_TR/modulebuilder.lang     |    4 +-
 htdocs/langs/tr_TR/projects.lang          |    2 +-
 htdocs/langs/tr_TR/website.lang           |    4 +-
 htdocs/langs/tr_TR/zapier.lang            |   28 +
 htdocs/langs/uk_UA/accountancy.lang       |   20 +-
 htdocs/langs/uk_UA/admin.lang             |   13 +-
 htdocs/langs/uk_UA/bills.lang             |   11 +-
 htdocs/langs/uk_UA/donations.lang         |    2 +-
 htdocs/langs/uk_UA/interventions.lang     |    6 +-
 htdocs/langs/uk_UA/modulebuilder.lang     |    4 +-
 htdocs/langs/uk_UA/multicurrency.lang     |   22 +
 htdocs/langs/uk_UA/projects.lang          |    2 +-
 htdocs/langs/uk_UA/website.lang           |    4 +-
 htdocs/langs/uk_UA/zapier.lang            |   28 +
 htdocs/langs/uz_UZ/accountancy.lang       |   20 +-
 htdocs/langs/uz_UZ/admin.lang             |   13 +-
 htdocs/langs/uz_UZ/assets.lang            |   65 +
 htdocs/langs/uz_UZ/bills.lang             |   11 +-
 htdocs/langs/uz_UZ/blockedlog.lang        |   54 +
 htdocs/langs/uz_UZ/donations.lang         |    2 +-
 htdocs/langs/uz_UZ/hrm.lang               |   18 +
 htdocs/langs/uz_UZ/interventions.lang     |    6 +-
 htdocs/langs/uz_UZ/modulebuilder.lang     |  141 ++
 htdocs/langs/uz_UZ/mrp.lang               |   76 +
 htdocs/langs/uz_UZ/multicurrency.lang     |   22 +
 htdocs/langs/uz_UZ/oauth.lang             |   32 +
 htdocs/langs/uz_UZ/projects.lang          |    2 +-
 htdocs/langs/uz_UZ/receiptprinter.lang    |   95 +
 htdocs/langs/uz_UZ/receptions.lang        |   45 +
 htdocs/langs/uz_UZ/stripe.lang            |   72 +
 htdocs/langs/uz_UZ/supplier_proposal.lang |   54 +
 htdocs/langs/uz_UZ/ticket.lang            |  305 ++++
 htdocs/langs/uz_UZ/website.lang           |  130 ++
 htdocs/langs/uz_UZ/zapier.lang            |   28 +
 htdocs/langs/vi_VN/accountancy.lang       |   28 +-
 htdocs/langs/vi_VN/admin.lang             |   99 +-
 htdocs/langs/vi_VN/bills.lang             |   37 +-
 htdocs/langs/vi_VN/modulebuilder.lang     |   10 +-
 htdocs/langs/vi_VN/multicurrency.lang     |   22 +
 htdocs/langs/vi_VN/projects.lang          |   34 +-
 htdocs/langs/vi_VN/website.lang           |   14 +-
 htdocs/langs/vi_VN/zapier.lang            |   28 +
 htdocs/langs/zh_CN/accountancy.lang       |   20 +-
 htdocs/langs/zh_CN/admin.lang             |   13 +-
 htdocs/langs/zh_CN/bills.lang             |   11 +-
 htdocs/langs/zh_CN/donations.lang         |    6 +-
 htdocs/langs/zh_CN/interventions.lang     |    6 +-
 htdocs/langs/zh_CN/modulebuilder.lang     |    4 +-
 htdocs/langs/zh_CN/projects.lang          |    2 +-
 htdocs/langs/zh_CN/website.lang           |    4 +-
 htdocs/langs/zh_CN/zapier.lang            |   28 +
 htdocs/langs/zh_HK/accountancy.lang       |  382 ++++
 htdocs/langs/zh_HK/admin.lang             | 2002 +++++++++++++++++++++
 htdocs/langs/zh_HK/agenda.lang            |  154 ++
 htdocs/langs/zh_HK/assets.lang            |   65 +
 htdocs/langs/zh_HK/banks.lang             |  175 ++
 htdocs/langs/zh_HK/bills.lang             |  574 ++++++
 htdocs/langs/zh_HK/blockedlog.lang        |   54 +
 htdocs/langs/zh_HK/bookmarks.lang         |   21 +
 htdocs/langs/zh_HK/boxes.lang             |  102 ++
 htdocs/langs/zh_HK/cashdesk.lang          |  110 ++
 htdocs/langs/zh_HK/categories.lang        |   89 +
 htdocs/langs/zh_HK/commercial.lang        |   80 +
 htdocs/langs/zh_HK/companies.lang         |  458 +++++
 htdocs/langs/zh_HK/compta.lang            |  266 +++
 htdocs/langs/zh_HK/contracts.lang         |  101 ++
 htdocs/langs/zh_HK/cron.lang              |   84 +
 htdocs/langs/zh_HK/deliveries.lang        |   31 +
 htdocs/langs/zh_HK/dict.lang              |  359 ++++
 htdocs/langs/zh_HK/donations.lang         |   34 +
 htdocs/langs/zh_HK/ecm.lang               |   52 +
 htdocs/langs/zh_HK/errors.lang            |  265 +++
 htdocs/langs/zh_HK/exports.lang           |  135 ++
 htdocs/langs/zh_HK/externalsite.lang      |    5 +
 htdocs/langs/zh_HK/ftp.lang               |   14 +
 htdocs/langs/zh_HK/help.lang              |   23 +
 htdocs/langs/zh_HK/holiday.lang           |  133 ++
 htdocs/langs/zh_HK/hrm.lang               |   18 +
 htdocs/langs/zh_HK/install.lang           |  223 +++
 htdocs/langs/zh_HK/interventions.lang     |   66 +
 htdocs/langs/zh_HK/languages.lang         |   89 +
 htdocs/langs/zh_HK/ldap.lang              |   27 +
 htdocs/langs/zh_HK/link.lang              |   11 +
 htdocs/langs/zh_HK/loan.lang              |   31 +
 htdocs/langs/zh_HK/mailmanspip.lang       |   27 +
 htdocs/langs/zh_HK/mails.lang             |  170 ++
 htdocs/langs/zh_HK/main.lang              | 1035 +++++++++++
 htdocs/langs/zh_HK/margins.lang           |   45 +
 htdocs/langs/zh_HK/members.lang           |  204 +++
 htdocs/langs/zh_HK/modulebuilder.lang     |  141 ++
 htdocs/langs/zh_HK/mrp.lang               |   76 +
 htdocs/langs/zh_HK/multicurrency.lang     |   22 +
 htdocs/langs/zh_HK/oauth.lang             |   32 +
 htdocs/langs/zh_HK/opensurvey.lang        |   61 +
 htdocs/langs/zh_HK/orders.lang            |  189 ++
 htdocs/langs/zh_HK/other.lang             |  286 +++
 htdocs/langs/zh_HK/paybox.lang            |   31 +
 htdocs/langs/zh_HK/paypal.lang            |   36 +
 htdocs/langs/zh_HK/printing.lang          |   54 +
 htdocs/langs/zh_HK/productbatch.lang      |   24 +
 htdocs/langs/zh_HK/products.lang          |  385 ++++
 htdocs/langs/zh_HK/projects.lang          |  267 +++
 htdocs/langs/zh_HK/propal.lang            |   86 +
 htdocs/langs/zh_HK/receiptprinter.lang    |   95 +
 htdocs/langs/zh_HK/receptions.lang        |   45 +
 htdocs/langs/zh_HK/resource.lang          |   39 +
 htdocs/langs/zh_HK/salaries.lang          |   21 +
 htdocs/langs/zh_HK/sendings.lang          |   74 +
 htdocs/langs/zh_HK/sms.lang               |   51 +
 htdocs/langs/zh_HK/stocks.lang            |  220 +++
 htdocs/langs/zh_HK/stripe.lang            |   72 +
 htdocs/langs/zh_HK/supplier_proposal.lang |   54 +
 htdocs/langs/zh_HK/suppliers.lang         |   47 +
 htdocs/langs/zh_HK/ticket.lang            |  305 ++++
 htdocs/langs/zh_HK/trips.lang             |  151 ++
 htdocs/langs/zh_HK/users.lang             |  118 ++
 htdocs/langs/zh_HK/website.lang           |  130 ++
 htdocs/langs/zh_HK/withdrawals.lang       |  119 ++
 htdocs/langs/zh_HK/workflow.lang          |   20 +
 htdocs/langs/zh_HK/zapier.lang            |   28 +
 1448 files changed, 106182 insertions(+), 1653 deletions(-)
 create mode 100644 htdocs/langs/am_ET/accountancy.lang
 create mode 100644 htdocs/langs/am_ET/admin.lang
 create mode 100644 htdocs/langs/am_ET/agenda.lang
 create mode 100644 htdocs/langs/am_ET/assets.lang
 create mode 100644 htdocs/langs/am_ET/banks.lang
 create mode 100644 htdocs/langs/am_ET/bills.lang
 create mode 100644 htdocs/langs/am_ET/blockedlog.lang
 create mode 100644 htdocs/langs/am_ET/bookmarks.lang
 create mode 100644 htdocs/langs/am_ET/boxes.lang
 create mode 100644 htdocs/langs/am_ET/cashdesk.lang
 create mode 100644 htdocs/langs/am_ET/categories.lang
 create mode 100644 htdocs/langs/am_ET/commercial.lang
 create mode 100644 htdocs/langs/am_ET/companies.lang
 create mode 100644 htdocs/langs/am_ET/compta.lang
 create mode 100644 htdocs/langs/am_ET/contracts.lang
 create mode 100644 htdocs/langs/am_ET/cron.lang
 create mode 100644 htdocs/langs/am_ET/deliveries.lang
 create mode 100644 htdocs/langs/am_ET/dict.lang
 create mode 100644 htdocs/langs/am_ET/donations.lang
 create mode 100644 htdocs/langs/am_ET/ecm.lang
 create mode 100644 htdocs/langs/am_ET/errors.lang
 create mode 100644 htdocs/langs/am_ET/exports.lang
 create mode 100644 htdocs/langs/am_ET/externalsite.lang
 create mode 100644 htdocs/langs/am_ET/ftp.lang
 create mode 100644 htdocs/langs/am_ET/help.lang
 create mode 100644 htdocs/langs/am_ET/holiday.lang
 create mode 100644 htdocs/langs/am_ET/hrm.lang
 create mode 100644 htdocs/langs/am_ET/install.lang
 create mode 100644 htdocs/langs/am_ET/interventions.lang
 create mode 100644 htdocs/langs/am_ET/languages.lang
 create mode 100644 htdocs/langs/am_ET/ldap.lang
 create mode 100644 htdocs/langs/am_ET/link.lang
 create mode 100644 htdocs/langs/am_ET/loan.lang
 create mode 100644 htdocs/langs/am_ET/mailmanspip.lang
 create mode 100644 htdocs/langs/am_ET/mails.lang
 create mode 100644 htdocs/langs/am_ET/main.lang
 create mode 100644 htdocs/langs/am_ET/margins.lang
 create mode 100644 htdocs/langs/am_ET/members.lang
 create mode 100644 htdocs/langs/am_ET/modulebuilder.lang
 create mode 100644 htdocs/langs/am_ET/mrp.lang
 create mode 100644 htdocs/langs/am_ET/multicurrency.lang
 create mode 100644 htdocs/langs/am_ET/oauth.lang
 create mode 100644 htdocs/langs/am_ET/opensurvey.lang
 create mode 100644 htdocs/langs/am_ET/orders.lang
 create mode 100644 htdocs/langs/am_ET/other.lang
 create mode 100644 htdocs/langs/am_ET/paybox.lang
 create mode 100644 htdocs/langs/am_ET/paypal.lang
 create mode 100644 htdocs/langs/am_ET/printing.lang
 create mode 100644 htdocs/langs/am_ET/productbatch.lang
 create mode 100644 htdocs/langs/am_ET/products.lang
 create mode 100644 htdocs/langs/am_ET/projects.lang
 create mode 100644 htdocs/langs/am_ET/propal.lang
 create mode 100644 htdocs/langs/am_ET/receiptprinter.lang
 create mode 100644 htdocs/langs/am_ET/receptions.lang
 create mode 100644 htdocs/langs/am_ET/resource.lang
 create mode 100644 htdocs/langs/am_ET/salaries.lang
 create mode 100644 htdocs/langs/am_ET/sendings.lang
 create mode 100644 htdocs/langs/am_ET/sms.lang
 create mode 100644 htdocs/langs/am_ET/stocks.lang
 create mode 100644 htdocs/langs/am_ET/stripe.lang
 create mode 100644 htdocs/langs/am_ET/supplier_proposal.lang
 create mode 100644 htdocs/langs/am_ET/suppliers.lang
 create mode 100644 htdocs/langs/am_ET/ticket.lang
 create mode 100644 htdocs/langs/am_ET/trips.lang
 create mode 100644 htdocs/langs/am_ET/users.lang
 create mode 100644 htdocs/langs/am_ET/website.lang
 create mode 100644 htdocs/langs/am_ET/withdrawals.lang
 create mode 100644 htdocs/langs/am_ET/workflow.lang
 create mode 100644 htdocs/langs/am_ET/zapier.lang
 create mode 100644 htdocs/langs/ar_EG/agenda.lang
 create mode 100644 htdocs/langs/ar_EG/banks.lang
 create mode 100644 htdocs/langs/ar_EG/bills.lang
 create mode 100644 htdocs/langs/ar_EG/boxes.lang
 create mode 100644 htdocs/langs/ar_EG/cashdesk.lang
 create mode 100644 htdocs/langs/ar_EG/categories.lang
 create mode 100644 htdocs/langs/ar_EG/commercial.lang
 create mode 100644 htdocs/langs/ar_EG/companies.lang
 create mode 100644 htdocs/langs/ar_EG/contracts.lang
 create mode 100644 htdocs/langs/ar_EG/deliveries.lang
 create mode 100644 htdocs/langs/ar_EG/dict.lang
 create mode 100644 htdocs/langs/ar_EG/donations.lang
 create mode 100644 htdocs/langs/ar_EG/holiday.lang
 create mode 100644 htdocs/langs/ar_EG/hrm.lang
 create mode 100644 htdocs/langs/ar_EG/interventions.lang
 create mode 100644 htdocs/langs/ar_EG/mails.lang
 create mode 100644 htdocs/langs/ar_EG/members.lang
 create mode 100644 htdocs/langs/ar_EG/orders.lang
 create mode 100644 htdocs/langs/ar_EG/products.lang
 create mode 100644 htdocs/langs/ar_EG/projects.lang
 create mode 100644 htdocs/langs/ar_EG/propal.lang
 create mode 100644 htdocs/langs/ar_EG/receptions.lang
 create mode 100644 htdocs/langs/ar_EG/sendings.lang
 create mode 100644 htdocs/langs/ar_EG/sms.lang
 create mode 100644 htdocs/langs/ar_EG/stocks.lang
 create mode 100644 htdocs/langs/ar_EG/supplier_proposal.lang
 create mode 100644 htdocs/langs/ar_EG/suppliers.lang
 create mode 100644 htdocs/langs/ar_EG/ticket.lang
 create mode 100644 htdocs/langs/ar_EG/website.lang
 create mode 100644 htdocs/langs/ar_EG/withdrawals.lang
 create mode 100644 htdocs/langs/ar_EG/workflow.lang
 create mode 100644 htdocs/langs/ar_EG/zapier.lang
 create mode 100644 htdocs/langs/ar_SA/multicurrency.lang
 create mode 100644 htdocs/langs/ar_SA/zapier.lang
 create mode 100644 htdocs/langs/az_AZ/accountancy.lang
 create mode 100644 htdocs/langs/az_AZ/admin.lang
 create mode 100644 htdocs/langs/az_AZ/agenda.lang
 create mode 100644 htdocs/langs/az_AZ/assets.lang
 create mode 100644 htdocs/langs/az_AZ/banks.lang
 create mode 100644 htdocs/langs/az_AZ/bills.lang
 create mode 100644 htdocs/langs/az_AZ/blockedlog.lang
 create mode 100644 htdocs/langs/az_AZ/bookmarks.lang
 create mode 100644 htdocs/langs/az_AZ/boxes.lang
 create mode 100644 htdocs/langs/az_AZ/cashdesk.lang
 create mode 100644 htdocs/langs/az_AZ/categories.lang
 create mode 100644 htdocs/langs/az_AZ/commercial.lang
 create mode 100644 htdocs/langs/az_AZ/companies.lang
 create mode 100644 htdocs/langs/az_AZ/compta.lang
 create mode 100644 htdocs/langs/az_AZ/contracts.lang
 create mode 100644 htdocs/langs/az_AZ/cron.lang
 create mode 100644 htdocs/langs/az_AZ/deliveries.lang
 create mode 100644 htdocs/langs/az_AZ/dict.lang
 create mode 100644 htdocs/langs/az_AZ/donations.lang
 create mode 100644 htdocs/langs/az_AZ/ecm.lang
 create mode 100644 htdocs/langs/az_AZ/errors.lang
 create mode 100644 htdocs/langs/az_AZ/exports.lang
 create mode 100644 htdocs/langs/az_AZ/externalsite.lang
 create mode 100644 htdocs/langs/az_AZ/ftp.lang
 create mode 100644 htdocs/langs/az_AZ/help.lang
 create mode 100644 htdocs/langs/az_AZ/holiday.lang
 create mode 100644 htdocs/langs/az_AZ/hrm.lang
 create mode 100644 htdocs/langs/az_AZ/install.lang
 create mode 100644 htdocs/langs/az_AZ/interventions.lang
 create mode 100644 htdocs/langs/az_AZ/languages.lang
 create mode 100644 htdocs/langs/az_AZ/ldap.lang
 create mode 100644 htdocs/langs/az_AZ/link.lang
 create mode 100644 htdocs/langs/az_AZ/loan.lang
 create mode 100644 htdocs/langs/az_AZ/mailmanspip.lang
 create mode 100644 htdocs/langs/az_AZ/mails.lang
 create mode 100644 htdocs/langs/az_AZ/main.lang
 create mode 100644 htdocs/langs/az_AZ/margins.lang
 create mode 100644 htdocs/langs/az_AZ/members.lang
 create mode 100644 htdocs/langs/az_AZ/modulebuilder.lang
 create mode 100644 htdocs/langs/az_AZ/mrp.lang
 create mode 100644 htdocs/langs/az_AZ/multicurrency.lang
 create mode 100644 htdocs/langs/az_AZ/oauth.lang
 create mode 100644 htdocs/langs/az_AZ/opensurvey.lang
 create mode 100644 htdocs/langs/az_AZ/orders.lang
 create mode 100644 htdocs/langs/az_AZ/other.lang
 create mode 100644 htdocs/langs/az_AZ/paybox.lang
 create mode 100644 htdocs/langs/az_AZ/paypal.lang
 create mode 100644 htdocs/langs/az_AZ/printing.lang
 create mode 100644 htdocs/langs/az_AZ/productbatch.lang
 create mode 100644 htdocs/langs/az_AZ/products.lang
 create mode 100644 htdocs/langs/az_AZ/projects.lang
 create mode 100644 htdocs/langs/az_AZ/propal.lang
 create mode 100644 htdocs/langs/az_AZ/receiptprinter.lang
 create mode 100644 htdocs/langs/az_AZ/receptions.lang
 create mode 100644 htdocs/langs/az_AZ/resource.lang
 create mode 100644 htdocs/langs/az_AZ/salaries.lang
 create mode 100644 htdocs/langs/az_AZ/sendings.lang
 create mode 100644 htdocs/langs/az_AZ/sms.lang
 create mode 100644 htdocs/langs/az_AZ/stocks.lang
 create mode 100644 htdocs/langs/az_AZ/stripe.lang
 create mode 100644 htdocs/langs/az_AZ/supplier_proposal.lang
 create mode 100644 htdocs/langs/az_AZ/suppliers.lang
 create mode 100644 htdocs/langs/az_AZ/ticket.lang
 create mode 100644 htdocs/langs/az_AZ/trips.lang
 create mode 100644 htdocs/langs/az_AZ/users.lang
 create mode 100644 htdocs/langs/az_AZ/website.lang
 create mode 100644 htdocs/langs/az_AZ/withdrawals.lang
 create mode 100644 htdocs/langs/az_AZ/workflow.lang
 create mode 100644 htdocs/langs/az_AZ/zapier.lang
 create mode 100644 htdocs/langs/bg_BG/multicurrency.lang
 create mode 100644 htdocs/langs/bg_BG/zapier.lang
 create mode 100644 htdocs/langs/bn_BD/multicurrency.lang
 create mode 100644 htdocs/langs/bn_BD/zapier.lang
 create mode 100644 htdocs/langs/bn_IN/accountancy.lang
 create mode 100644 htdocs/langs/bn_IN/admin.lang
 create mode 100644 htdocs/langs/bn_IN/agenda.lang
 create mode 100644 htdocs/langs/bn_IN/assets.lang
 create mode 100644 htdocs/langs/bn_IN/banks.lang
 create mode 100644 htdocs/langs/bn_IN/bills.lang
 create mode 100644 htdocs/langs/bn_IN/blockedlog.lang
 create mode 100644 htdocs/langs/bn_IN/bookmarks.lang
 create mode 100644 htdocs/langs/bn_IN/boxes.lang
 create mode 100644 htdocs/langs/bn_IN/cashdesk.lang
 create mode 100644 htdocs/langs/bn_IN/categories.lang
 create mode 100644 htdocs/langs/bn_IN/commercial.lang
 create mode 100644 htdocs/langs/bn_IN/companies.lang
 create mode 100644 htdocs/langs/bn_IN/compta.lang
 create mode 100644 htdocs/langs/bn_IN/contracts.lang
 create mode 100644 htdocs/langs/bn_IN/cron.lang
 create mode 100644 htdocs/langs/bn_IN/deliveries.lang
 create mode 100644 htdocs/langs/bn_IN/dict.lang
 create mode 100644 htdocs/langs/bn_IN/donations.lang
 create mode 100644 htdocs/langs/bn_IN/ecm.lang
 create mode 100644 htdocs/langs/bn_IN/errors.lang
 create mode 100644 htdocs/langs/bn_IN/exports.lang
 create mode 100644 htdocs/langs/bn_IN/externalsite.lang
 create mode 100644 htdocs/langs/bn_IN/ftp.lang
 create mode 100644 htdocs/langs/bn_IN/help.lang
 create mode 100644 htdocs/langs/bn_IN/holiday.lang
 create mode 100644 htdocs/langs/bn_IN/hrm.lang
 create mode 100644 htdocs/langs/bn_IN/install.lang
 create mode 100644 htdocs/langs/bn_IN/interventions.lang
 create mode 100644 htdocs/langs/bn_IN/languages.lang
 create mode 100644 htdocs/langs/bn_IN/ldap.lang
 create mode 100644 htdocs/langs/bn_IN/link.lang
 create mode 100644 htdocs/langs/bn_IN/loan.lang
 create mode 100644 htdocs/langs/bn_IN/mailmanspip.lang
 create mode 100644 htdocs/langs/bn_IN/mails.lang
 create mode 100644 htdocs/langs/bn_IN/main.lang
 create mode 100644 htdocs/langs/bn_IN/margins.lang
 create mode 100644 htdocs/langs/bn_IN/members.lang
 create mode 100644 htdocs/langs/bn_IN/modulebuilder.lang
 create mode 100644 htdocs/langs/bn_IN/mrp.lang
 create mode 100644 htdocs/langs/bn_IN/multicurrency.lang
 create mode 100644 htdocs/langs/bn_IN/oauth.lang
 create mode 100644 htdocs/langs/bn_IN/opensurvey.lang
 create mode 100644 htdocs/langs/bn_IN/orders.lang
 create mode 100644 htdocs/langs/bn_IN/other.lang
 create mode 100644 htdocs/langs/bn_IN/paybox.lang
 create mode 100644 htdocs/langs/bn_IN/paypal.lang
 create mode 100644 htdocs/langs/bn_IN/printing.lang
 create mode 100644 htdocs/langs/bn_IN/productbatch.lang
 create mode 100644 htdocs/langs/bn_IN/products.lang
 create mode 100644 htdocs/langs/bn_IN/projects.lang
 create mode 100644 htdocs/langs/bn_IN/propal.lang
 create mode 100644 htdocs/langs/bn_IN/receiptprinter.lang
 create mode 100644 htdocs/langs/bn_IN/receptions.lang
 create mode 100644 htdocs/langs/bn_IN/resource.lang
 create mode 100644 htdocs/langs/bn_IN/salaries.lang
 create mode 100644 htdocs/langs/bn_IN/sendings.lang
 create mode 100644 htdocs/langs/bn_IN/sms.lang
 create mode 100644 htdocs/langs/bn_IN/stocks.lang
 create mode 100644 htdocs/langs/bn_IN/stripe.lang
 create mode 100644 htdocs/langs/bn_IN/supplier_proposal.lang
 create mode 100644 htdocs/langs/bn_IN/suppliers.lang
 create mode 100644 htdocs/langs/bn_IN/ticket.lang
 create mode 100644 htdocs/langs/bn_IN/trips.lang
 create mode 100644 htdocs/langs/bn_IN/users.lang
 create mode 100644 htdocs/langs/bn_IN/website.lang
 create mode 100644 htdocs/langs/bn_IN/withdrawals.lang
 create mode 100644 htdocs/langs/bn_IN/workflow.lang
 create mode 100644 htdocs/langs/bn_IN/zapier.lang
 create mode 100644 htdocs/langs/bs_BA/zapier.lang
 create mode 100644 htdocs/langs/ca_ES/zapier.lang
 create mode 100644 htdocs/langs/cs_CZ/zapier.lang
 create mode 100644 htdocs/langs/da_DK/multicurrency.lang
 create mode 100644 htdocs/langs/da_DK/zapier.lang
 create mode 100644 htdocs/langs/de_AT/accountancy.lang
 create mode 100644 htdocs/langs/de_AT/externalsite.lang
 create mode 100644 htdocs/langs/de_AT/modulebuilder.lang
 create mode 100644 htdocs/langs/de_CH/assets.lang
 create mode 100644 htdocs/langs/de_CH/blockedlog.lang
 create mode 100644 htdocs/langs/de_CH/cashdesk.lang
 create mode 100644 htdocs/langs/de_CH/externalsite.lang
 create mode 100644 htdocs/langs/de_CH/ftp.lang
 create mode 100644 htdocs/langs/de_CH/link.lang
 create mode 100644 htdocs/langs/de_CH/modulebuilder.lang
 create mode 100644 htdocs/langs/de_CH/multicurrency.lang
 create mode 100644 htdocs/langs/de_CH/paypal.lang
 create mode 100644 htdocs/langs/de_CH/salaries.lang
 create mode 100644 htdocs/langs/de_CH/zapier.lang
 create mode 100644 htdocs/langs/de_DE/zapier.lang
 create mode 100644 htdocs/langs/el_CY/accountancy.lang
 create mode 100644 htdocs/langs/el_CY/admin.lang
 create mode 100644 htdocs/langs/el_CY/companies.lang
 create mode 100644 htdocs/langs/el_CY/modulebuilder.lang
 create mode 100644 htdocs/langs/el_CY/projects.lang
 create mode 100644 htdocs/langs/el_GR/zapier.lang
 create mode 100644 htdocs/langs/en_AU/accountancy.lang
 create mode 100644 htdocs/langs/en_AU/modulebuilder.lang
 create mode 100644 htdocs/langs/en_AU/projects.lang
 create mode 100644 htdocs/langs/en_CA/accountancy.lang
 create mode 100644 htdocs/langs/en_CA/modulebuilder.lang
 create mode 100644 htdocs/langs/en_CA/projects.lang
 create mode 100644 htdocs/langs/en_GB/donations.lang
 create mode 100644 htdocs/langs/en_GB/externalsite.lang
 create mode 100644 htdocs/langs/en_GB/ftp.lang
 create mode 100644 htdocs/langs/en_GB/modulebuilder.lang
 create mode 100644 htdocs/langs/en_GB/multicurrency.lang
 create mode 100644 htdocs/langs/en_GB/paypal.lang
 create mode 100644 htdocs/langs/en_GB/salaries.lang
 create mode 100644 htdocs/langs/en_GB/sms.lang
 create mode 100644 htdocs/langs/en_IN/accountancy.lang
 create mode 100644 htdocs/langs/en_IN/modulebuilder.lang
 create mode 100644 htdocs/langs/en_SG/accountancy.lang
 create mode 100644 htdocs/langs/en_SG/admin.lang
 create mode 100644 htdocs/langs/en_SG/companies.lang
 create mode 100644 htdocs/langs/en_SG/main.lang
 create mode 100644 htdocs/langs/en_SG/modulebuilder.lang
 create mode 100644 htdocs/langs/en_SG/projects.lang
 create mode 100644 htdocs/langs/es_AR/accountancy.lang
 create mode 100644 htdocs/langs/es_AR/admin.lang
 create mode 100644 htdocs/langs/es_AR/agenda.lang
 create mode 100644 htdocs/langs/es_AR/banks.lang
 create mode 100644 htdocs/langs/es_AR/bills.lang
 create mode 100644 htdocs/langs/es_AR/blockedlog.lang
 create mode 100644 htdocs/langs/es_AR/bookmarks.lang
 create mode 100644 htdocs/langs/es_AR/boxes.lang
 create mode 100644 htdocs/langs/es_AR/cashdesk.lang
 create mode 100644 htdocs/langs/es_AR/categories.lang
 create mode 100644 htdocs/langs/es_AR/commercial.lang
 create mode 100644 htdocs/langs/es_AR/companies.lang
 create mode 100644 htdocs/langs/es_AR/compta.lang
 create mode 100644 htdocs/langs/es_AR/contracts.lang
 create mode 100644 htdocs/langs/es_AR/cron.lang
 create mode 100644 htdocs/langs/es_AR/deliveries.lang
 create mode 100644 htdocs/langs/es_AR/dict.lang
 create mode 100644 htdocs/langs/es_AR/donations.lang
 create mode 100644 htdocs/langs/es_AR/ecm.lang
 create mode 100644 htdocs/langs/es_AR/externalsite.lang
 create mode 100644 htdocs/langs/es_AR/ftp.lang
 create mode 100644 htdocs/langs/es_AR/help.lang
 create mode 100644 htdocs/langs/es_AR/holiday.lang
 create mode 100644 htdocs/langs/es_AR/hrm.lang
 create mode 100644 htdocs/langs/es_AR/install.lang
 create mode 100644 htdocs/langs/es_AR/interventions.lang
 create mode 100644 htdocs/langs/es_AR/languages.lang
 create mode 100644 htdocs/langs/es_AR/ldap.lang
 create mode 100644 htdocs/langs/es_AR/link.lang
 create mode 100644 htdocs/langs/es_AR/loan.lang
 create mode 100644 htdocs/langs/es_AR/mailmanspip.lang
 create mode 100644 htdocs/langs/es_AR/mails.lang
 create mode 100644 htdocs/langs/es_AR/margins.lang
 create mode 100644 htdocs/langs/es_AR/members.lang
 create mode 100644 htdocs/langs/es_AR/modulebuilder.lang
 create mode 100644 htdocs/langs/es_AR/mrp.lang
 create mode 100644 htdocs/langs/es_AR/multicurrency.lang
 create mode 100644 htdocs/langs/es_AR/opensurvey.lang
 create mode 100644 htdocs/langs/es_AR/orders.lang
 create mode 100644 htdocs/langs/es_AR/other.lang
 create mode 100644 htdocs/langs/es_AR/paybox.lang
 create mode 100644 htdocs/langs/es_AR/paypal.lang
 create mode 100644 htdocs/langs/es_AR/printing.lang
 create mode 100644 htdocs/langs/es_AR/productbatch.lang
 create mode 100644 htdocs/langs/es_AR/products.lang
 create mode 100644 htdocs/langs/es_AR/projects.lang
 create mode 100644 htdocs/langs/es_AR/propal.lang
 create mode 100644 htdocs/langs/es_AR/receptions.lang
 create mode 100644 htdocs/langs/es_AR/resource.lang
 create mode 100644 htdocs/langs/es_AR/salaries.lang
 create mode 100644 htdocs/langs/es_AR/sendings.lang
 create mode 100644 htdocs/langs/es_AR/sms.lang
 create mode 100644 htdocs/langs/es_AR/stocks.lang
 create mode 100644 htdocs/langs/es_AR/supplier_proposal.lang
 create mode 100644 htdocs/langs/es_AR/suppliers.lang
 create mode 100644 htdocs/langs/es_AR/trips.lang
 create mode 100644 htdocs/langs/es_AR/users.lang
 create mode 100644 htdocs/langs/es_AR/website.lang
 create mode 100644 htdocs/langs/es_AR/withdrawals.lang
 create mode 100644 htdocs/langs/es_AR/workflow.lang
 create mode 100644 htdocs/langs/es_AR/zapier.lang
 create mode 100644 htdocs/langs/es_BO/accountancy.lang
 create mode 100644 htdocs/langs/es_BO/admin.lang
 create mode 100644 htdocs/langs/es_BO/companies.lang
 create mode 100644 htdocs/langs/es_BO/modulebuilder.lang
 create mode 100644 htdocs/langs/es_BO/projects.lang
 create mode 100644 htdocs/langs/es_CL/blockedlog.lang
 create mode 100644 htdocs/langs/es_CL/cashdesk.lang
 create mode 100644 htdocs/langs/es_CL/categories.lang
 create mode 100644 htdocs/langs/es_CL/contracts.lang
 create mode 100644 htdocs/langs/es_CL/cron.lang
 create mode 100644 htdocs/langs/es_CL/deliveries.lang
 create mode 100644 htdocs/langs/es_CL/dict.lang
 create mode 100644 htdocs/langs/es_CL/errors.lang
 create mode 100644 htdocs/langs/es_CL/exports.lang
 create mode 100644 htdocs/langs/es_CL/externalsite.lang
 create mode 100644 htdocs/langs/es_CL/ftp.lang
 create mode 100644 htdocs/langs/es_CL/help.lang
 create mode 100644 htdocs/langs/es_CL/holiday.lang
 create mode 100644 htdocs/langs/es_CL/hrm.lang
 create mode 100644 htdocs/langs/es_CL/languages.lang
 create mode 100644 htdocs/langs/es_CL/ldap.lang
 create mode 100644 htdocs/langs/es_CL/link.lang
 create mode 100644 htdocs/langs/es_CL/loan.lang
 create mode 100644 htdocs/langs/es_CL/mailmanspip.lang
 create mode 100644 htdocs/langs/es_CL/mails.lang
 create mode 100644 htdocs/langs/es_CL/margins.lang
 create mode 100644 htdocs/langs/es_CL/modulebuilder.lang
 create mode 100644 htdocs/langs/es_CL/mrp.lang
 create mode 100644 htdocs/langs/es_CL/multicurrency.lang
 create mode 100644 htdocs/langs/es_CL/oauth.lang
 create mode 100644 htdocs/langs/es_CL/opensurvey.lang
 create mode 100644 htdocs/langs/es_CL/paybox.lang
 create mode 100644 htdocs/langs/es_CL/paypal.lang
 create mode 100644 htdocs/langs/es_CL/printing.lang
 create mode 100644 htdocs/langs/es_CL/productbatch.lang
 create mode 100644 htdocs/langs/es_CL/receiptprinter.lang
 create mode 100644 htdocs/langs/es_CL/resource.lang
 create mode 100644 htdocs/langs/es_CL/salaries.lang
 create mode 100644 htdocs/langs/es_CL/sendings.lang
 create mode 100644 htdocs/langs/es_CL/sms.lang
 create mode 100644 htdocs/langs/es_CL/stripe.lang
 create mode 100644 htdocs/langs/es_CL/suppliers.lang
 create mode 100644 htdocs/langs/es_CL/trips.lang
 create mode 100644 htdocs/langs/es_CL/users.lang
 create mode 100644 htdocs/langs/es_CL/website.lang
 create mode 100644 htdocs/langs/es_CL/withdrawals.lang
 create mode 100644 htdocs/langs/es_CO/accountancy.lang
 create mode 100644 htdocs/langs/es_CO/boxes.lang
 create mode 100644 htdocs/langs/es_CO/categories.lang
 create mode 100644 htdocs/langs/es_CO/contracts.lang
 create mode 100644 htdocs/langs/es_CO/exports.lang
 create mode 100644 htdocs/langs/es_CO/install.lang
 create mode 100644 htdocs/langs/es_CO/modulebuilder.lang
 create mode 100644 htdocs/langs/es_CO/multicurrency.lang
 create mode 100644 htdocs/langs/es_CO/other.lang
 create mode 100644 htdocs/langs/es_CO/productbatch.lang
 create mode 100644 htdocs/langs/es_CO/products.lang
 create mode 100644 htdocs/langs/es_CO/projects.lang
 create mode 100644 htdocs/langs/es_CO/salaries.lang
 create mode 100644 htdocs/langs/es_CO/sms.lang
 create mode 100644 htdocs/langs/es_CO/supplier_proposal.lang
 create mode 100644 htdocs/langs/es_CO/suppliers.lang
 create mode 100644 htdocs/langs/es_CO/trips.lang
 create mode 100644 htdocs/langs/es_CO/users.lang
 create mode 100644 htdocs/langs/es_CO/withdrawals.lang
 create mode 100644 htdocs/langs/es_CO/workflow.lang
 create mode 100644 htdocs/langs/es_CO/zapier.lang
 create mode 100644 htdocs/langs/es_DO/accountancy.lang
 create mode 100644 htdocs/langs/es_DO/companies.lang
 create mode 100644 htdocs/langs/es_DO/modulebuilder.lang
 create mode 100644 htdocs/langs/es_DO/projects.lang
 create mode 100644 htdocs/langs/es_EC/accountancy.lang
 create mode 100644 htdocs/langs/es_EC/agenda.lang
 create mode 100644 htdocs/langs/es_EC/banks.lang
 create mode 100644 htdocs/langs/es_EC/bills.lang
 create mode 100644 htdocs/langs/es_EC/bookmarks.lang
 create mode 100644 htdocs/langs/es_EC/boxes.lang
 create mode 100644 htdocs/langs/es_EC/cashdesk.lang
 create mode 100644 htdocs/langs/es_EC/categories.lang
 create mode 100644 htdocs/langs/es_EC/commercial.lang
 create mode 100644 htdocs/langs/es_EC/companies.lang
 create mode 100644 htdocs/langs/es_EC/compta.lang
 create mode 100644 htdocs/langs/es_EC/contracts.lang
 create mode 100644 htdocs/langs/es_EC/cron.lang
 create mode 100644 htdocs/langs/es_EC/deliveries.lang
 create mode 100644 htdocs/langs/es_EC/dict.lang
 create mode 100644 htdocs/langs/es_EC/donations.lang
 create mode 100644 htdocs/langs/es_EC/ecm.lang
 create mode 100644 htdocs/langs/es_EC/errors.lang
 create mode 100644 htdocs/langs/es_EC/exports.lang
 create mode 100644 htdocs/langs/es_EC/externalsite.lang
 create mode 100644 htdocs/langs/es_EC/ftp.lang
 create mode 100644 htdocs/langs/es_EC/help.lang
 create mode 100644 htdocs/langs/es_EC/holiday.lang
 create mode 100644 htdocs/langs/es_EC/hrm.lang
 create mode 100644 htdocs/langs/es_EC/install.lang
 create mode 100644 htdocs/langs/es_EC/interventions.lang
 create mode 100644 htdocs/langs/es_EC/languages.lang
 create mode 100644 htdocs/langs/es_EC/ldap.lang
 create mode 100644 htdocs/langs/es_EC/link.lang
 create mode 100644 htdocs/langs/es_EC/loan.lang
 create mode 100644 htdocs/langs/es_EC/mailmanspip.lang
 create mode 100644 htdocs/langs/es_EC/mails.lang
 create mode 100644 htdocs/langs/es_EC/margins.lang
 create mode 100644 htdocs/langs/es_EC/members.lang
 create mode 100644 htdocs/langs/es_EC/modulebuilder.lang
 create mode 100644 htdocs/langs/es_EC/mrp.lang
 create mode 100644 htdocs/langs/es_EC/multicurrency.lang
 create mode 100644 htdocs/langs/es_EC/oauth.lang
 create mode 100644 htdocs/langs/es_EC/opensurvey.lang
 create mode 100644 htdocs/langs/es_EC/orders.lang
 create mode 100644 htdocs/langs/es_EC/other.lang
 create mode 100644 htdocs/langs/es_EC/paybox.lang
 create mode 100644 htdocs/langs/es_EC/paypal.lang
 create mode 100644 htdocs/langs/es_EC/printing.lang
 create mode 100644 htdocs/langs/es_EC/productbatch.lang
 create mode 100644 htdocs/langs/es_EC/products.lang
 create mode 100644 htdocs/langs/es_EC/projects.lang
 create mode 100644 htdocs/langs/es_EC/propal.lang
 create mode 100644 htdocs/langs/es_EC/receiptprinter.lang
 create mode 100644 htdocs/langs/es_EC/resource.lang
 create mode 100644 htdocs/langs/es_EC/salaries.lang
 create mode 100644 htdocs/langs/es_EC/sendings.lang
 create mode 100644 htdocs/langs/es_EC/sms.lang
 create mode 100644 htdocs/langs/es_EC/stocks.lang
 create mode 100644 htdocs/langs/es_EC/stripe.lang
 create mode 100644 htdocs/langs/es_EC/supplier_proposal.lang
 create mode 100644 htdocs/langs/es_EC/suppliers.lang
 create mode 100644 htdocs/langs/es_EC/trips.lang
 create mode 100644 htdocs/langs/es_EC/users.lang
 create mode 100644 htdocs/langs/es_EC/website.lang
 create mode 100644 htdocs/langs/es_EC/withdrawals.lang
 create mode 100644 htdocs/langs/es_EC/workflow.lang
 create mode 100644 htdocs/langs/es_GT/accountancy.lang
 create mode 100644 htdocs/langs/es_GT/admin.lang
 create mode 100644 htdocs/langs/es_GT/companies.lang
 create mode 100644 htdocs/langs/es_GT/main.lang
 create mode 100644 htdocs/langs/es_GT/modulebuilder.lang
 create mode 100644 htdocs/langs/es_GT/projects.lang
 create mode 100644 htdocs/langs/es_HN/accountancy.lang
 create mode 100644 htdocs/langs/es_HN/admin.lang
 create mode 100644 htdocs/langs/es_HN/companies.lang
 create mode 100644 htdocs/langs/es_HN/modulebuilder.lang
 create mode 100644 htdocs/langs/es_HN/projects.lang
 create mode 100644 htdocs/langs/es_MX/boxes.lang
 create mode 100644 htdocs/langs/es_MX/errors.lang
 create mode 100644 htdocs/langs/es_MX/externalsite.lang
 create mode 100644 htdocs/langs/es_MX/ftp.lang
 create mode 100644 htdocs/langs/es_MX/interventions.lang
 create mode 100644 htdocs/langs/es_MX/link.lang
 create mode 100644 htdocs/langs/es_MX/mails.lang
 create mode 100644 htdocs/langs/es_MX/modulebuilder.lang
 create mode 100644 htdocs/langs/es_MX/multicurrency.lang
 create mode 100644 htdocs/langs/es_MX/oauth.lang
 create mode 100644 htdocs/langs/es_MX/projects.lang
 create mode 100644 htdocs/langs/es_MX/receiptprinter.lang
 create mode 100644 htdocs/langs/es_MX/salaries.lang
 create mode 100644 htdocs/langs/es_MX/suppliers.lang
 create mode 100644 htdocs/langs/es_MX/website.lang
 create mode 100644 htdocs/langs/es_MX/workflow.lang
 create mode 100644 htdocs/langs/es_MX/zapier.lang
 create mode 100644 htdocs/langs/es_PA/accountancy.lang
 create mode 100644 htdocs/langs/es_PA/companies.lang
 create mode 100644 htdocs/langs/es_PA/modulebuilder.lang
 create mode 100644 htdocs/langs/es_PA/projects.lang
 create mode 100644 htdocs/langs/es_PE/agenda.lang
 create mode 100644 htdocs/langs/es_PE/assets.lang
 create mode 100644 htdocs/langs/es_PE/banks.lang
 create mode 100644 htdocs/langs/es_PE/bookmarks.lang
 create mode 100644 htdocs/langs/es_PE/cashdesk.lang
 create mode 100644 htdocs/langs/es_PE/commercial.lang
 create mode 100644 htdocs/langs/es_PE/cron.lang
 create mode 100644 htdocs/langs/es_PE/donations.lang
 create mode 100644 htdocs/langs/es_PE/externalsite.lang
 create mode 100644 htdocs/langs/es_PE/help.lang
 create mode 100644 htdocs/langs/es_PE/holiday.lang
 create mode 100644 htdocs/langs/es_PE/interventions.lang
 create mode 100644 htdocs/langs/es_PE/mails.lang
 create mode 100644 htdocs/langs/es_PE/margins.lang
 create mode 100644 htdocs/langs/es_PE/modulebuilder.lang
 create mode 100644 htdocs/langs/es_PE/multicurrency.lang
 create mode 100644 htdocs/langs/es_PE/products.lang
 create mode 100644 htdocs/langs/es_PE/projects.lang
 create mode 100644 htdocs/langs/es_PE/salaries.lang
 create mode 100644 htdocs/langs/es_PE/stocks.lang
 create mode 100644 htdocs/langs/es_PE/trips.lang
 create mode 100644 htdocs/langs/es_PE/users.lang
 create mode 100644 htdocs/langs/es_PE/website.lang
 create mode 100644 htdocs/langs/es_PE/workflow.lang
 create mode 100644 htdocs/langs/es_PY/accountancy.lang
 create mode 100644 htdocs/langs/es_PY/admin.lang
 create mode 100644 htdocs/langs/es_PY/companies.lang
 create mode 100644 htdocs/langs/es_PY/modulebuilder.lang
 create mode 100644 htdocs/langs/es_PY/projects.lang
 create mode 100644 htdocs/langs/es_PY/zapier.lang
 create mode 100644 htdocs/langs/es_US/accountancy.lang
 create mode 100644 htdocs/langs/es_US/admin.lang
 create mode 100644 htdocs/langs/es_US/companies.lang
 create mode 100644 htdocs/langs/es_US/main.lang
 create mode 100644 htdocs/langs/es_US/modulebuilder.lang
 create mode 100644 htdocs/langs/es_US/projects.lang
 create mode 100644 htdocs/langs/es_UY/accountancy.lang
 create mode 100644 htdocs/langs/es_UY/admin.lang
 create mode 100644 htdocs/langs/es_UY/companies.lang
 create mode 100644 htdocs/langs/es_UY/modulebuilder.lang
 create mode 100644 htdocs/langs/es_UY/projects.lang
 create mode 100644 htdocs/langs/es_VE/accountancy.lang
 create mode 100644 htdocs/langs/es_VE/categories.lang
 create mode 100644 htdocs/langs/es_VE/dict.lang
 create mode 100644 htdocs/langs/es_VE/modulebuilder.lang
 create mode 100644 htdocs/langs/et_EE/multicurrency.lang
 create mode 100644 htdocs/langs/et_EE/zapier.lang
 create mode 100644 htdocs/langs/eu_ES/multicurrency.lang
 create mode 100644 htdocs/langs/eu_ES/zapier.lang
 create mode 100644 htdocs/langs/fa_IR/multicurrency.lang
 create mode 100644 htdocs/langs/fa_IR/zapier.lang
 create mode 100644 htdocs/langs/fi_FI/multicurrency.lang
 create mode 100644 htdocs/langs/fi_FI/zapier.lang
 create mode 100644 htdocs/langs/fr_BE/modulebuilder.lang
 create mode 100644 htdocs/langs/fr_BE/products.lang
 create mode 100644 htdocs/langs/fr_BE/projects.lang
 create mode 100644 htdocs/langs/fr_CH/accountancy.lang
 create mode 100644 htdocs/langs/fr_CH/admin.lang
 create mode 100644 htdocs/langs/fr_CH/modulebuilder.lang
 create mode 100644 htdocs/langs/fr_CH/projects.lang
 create mode 100644 htdocs/langs/fr_CI/accountancy.lang
 create mode 100644 htdocs/langs/fr_CI/admin.lang
 create mode 100644 htdocs/langs/fr_CI/main.lang
 create mode 100644 htdocs/langs/fr_CI/modulebuilder.lang
 create mode 100644 htdocs/langs/fr_CI/projects.lang
 create mode 100644 htdocs/langs/fr_CM/accountancy.lang
 create mode 100644 htdocs/langs/fr_CM/admin.lang
 create mode 100644 htdocs/langs/fr_CM/main.lang
 create mode 100644 htdocs/langs/fr_CM/modulebuilder.lang
 create mode 100644 htdocs/langs/fr_CM/projects.lang
 create mode 100644 htdocs/langs/fr_GA/accountancy.lang
 create mode 100644 htdocs/langs/fr_GA/admin.lang
 create mode 100644 htdocs/langs/fr_GA/main.lang
 create mode 100644 htdocs/langs/fr_GA/modulebuilder.lang
 create mode 100644 htdocs/langs/fr_GA/projects.lang
 create mode 100644 htdocs/langs/gl_ES/accountancy.lang
 create mode 100644 htdocs/langs/gl_ES/admin.lang
 create mode 100644 htdocs/langs/gl_ES/agenda.lang
 create mode 100644 htdocs/langs/gl_ES/assets.lang
 create mode 100644 htdocs/langs/gl_ES/banks.lang
 create mode 100644 htdocs/langs/gl_ES/bills.lang
 create mode 100644 htdocs/langs/gl_ES/blockedlog.lang
 create mode 100644 htdocs/langs/gl_ES/bookmarks.lang
 create mode 100644 htdocs/langs/gl_ES/boxes.lang
 create mode 100644 htdocs/langs/gl_ES/cashdesk.lang
 create mode 100644 htdocs/langs/gl_ES/categories.lang
 create mode 100644 htdocs/langs/gl_ES/commercial.lang
 create mode 100644 htdocs/langs/gl_ES/companies.lang
 create mode 100644 htdocs/langs/gl_ES/compta.lang
 create mode 100644 htdocs/langs/gl_ES/contracts.lang
 create mode 100644 htdocs/langs/gl_ES/cron.lang
 create mode 100644 htdocs/langs/gl_ES/deliveries.lang
 create mode 100644 htdocs/langs/gl_ES/dict.lang
 create mode 100644 htdocs/langs/gl_ES/donations.lang
 create mode 100644 htdocs/langs/gl_ES/ecm.lang
 create mode 100644 htdocs/langs/gl_ES/errors.lang
 create mode 100644 htdocs/langs/gl_ES/exports.lang
 create mode 100644 htdocs/langs/gl_ES/externalsite.lang
 create mode 100644 htdocs/langs/gl_ES/ftp.lang
 create mode 100644 htdocs/langs/gl_ES/help.lang
 create mode 100644 htdocs/langs/gl_ES/holiday.lang
 create mode 100644 htdocs/langs/gl_ES/hrm.lang
 create mode 100644 htdocs/langs/gl_ES/install.lang
 create mode 100644 htdocs/langs/gl_ES/interventions.lang
 create mode 100644 htdocs/langs/gl_ES/languages.lang
 create mode 100644 htdocs/langs/gl_ES/ldap.lang
 create mode 100644 htdocs/langs/gl_ES/link.lang
 create mode 100644 htdocs/langs/gl_ES/loan.lang
 create mode 100644 htdocs/langs/gl_ES/mailmanspip.lang
 create mode 100644 htdocs/langs/gl_ES/mails.lang
 create mode 100644 htdocs/langs/gl_ES/main.lang
 create mode 100644 htdocs/langs/gl_ES/margins.lang
 create mode 100644 htdocs/langs/gl_ES/members.lang
 create mode 100644 htdocs/langs/gl_ES/modulebuilder.lang
 create mode 100644 htdocs/langs/gl_ES/mrp.lang
 create mode 100644 htdocs/langs/gl_ES/multicurrency.lang
 create mode 100644 htdocs/langs/gl_ES/oauth.lang
 create mode 100644 htdocs/langs/gl_ES/opensurvey.lang
 create mode 100644 htdocs/langs/gl_ES/orders.lang
 create mode 100644 htdocs/langs/gl_ES/other.lang
 create mode 100644 htdocs/langs/gl_ES/paybox.lang
 create mode 100644 htdocs/langs/gl_ES/paypal.lang
 create mode 100644 htdocs/langs/gl_ES/printing.lang
 create mode 100644 htdocs/langs/gl_ES/productbatch.lang
 create mode 100644 htdocs/langs/gl_ES/products.lang
 create mode 100644 htdocs/langs/gl_ES/projects.lang
 create mode 100644 htdocs/langs/gl_ES/propal.lang
 create mode 100644 htdocs/langs/gl_ES/receiptprinter.lang
 create mode 100644 htdocs/langs/gl_ES/receptions.lang
 create mode 100644 htdocs/langs/gl_ES/resource.lang
 create mode 100644 htdocs/langs/gl_ES/salaries.lang
 create mode 100644 htdocs/langs/gl_ES/sendings.lang
 create mode 100644 htdocs/langs/gl_ES/sms.lang
 create mode 100644 htdocs/langs/gl_ES/stocks.lang
 create mode 100644 htdocs/langs/gl_ES/stripe.lang
 create mode 100644 htdocs/langs/gl_ES/supplier_proposal.lang
 create mode 100644 htdocs/langs/gl_ES/suppliers.lang
 create mode 100644 htdocs/langs/gl_ES/ticket.lang
 create mode 100644 htdocs/langs/gl_ES/trips.lang
 create mode 100644 htdocs/langs/gl_ES/users.lang
 create mode 100644 htdocs/langs/gl_ES/website.lang
 create mode 100644 htdocs/langs/gl_ES/withdrawals.lang
 create mode 100644 htdocs/langs/gl_ES/workflow.lang
 create mode 100644 htdocs/langs/gl_ES/zapier.lang
 create mode 100644 htdocs/langs/he_IL/multicurrency.lang
 create mode 100644 htdocs/langs/he_IL/zapier.lang
 create mode 100644 htdocs/langs/hi_IN/accountancy.lang
 create mode 100644 htdocs/langs/hi_IN/admin.lang
 create mode 100644 htdocs/langs/hi_IN/agenda.lang
 create mode 100644 htdocs/langs/hi_IN/assets.lang
 create mode 100644 htdocs/langs/hi_IN/banks.lang
 create mode 100644 htdocs/langs/hi_IN/bills.lang
 create mode 100644 htdocs/langs/hi_IN/blockedlog.lang
 create mode 100644 htdocs/langs/hi_IN/bookmarks.lang
 create mode 100644 htdocs/langs/hi_IN/boxes.lang
 create mode 100644 htdocs/langs/hi_IN/cashdesk.lang
 create mode 100644 htdocs/langs/hi_IN/categories.lang
 create mode 100644 htdocs/langs/hi_IN/commercial.lang
 create mode 100644 htdocs/langs/hi_IN/companies.lang
 create mode 100644 htdocs/langs/hi_IN/compta.lang
 create mode 100644 htdocs/langs/hi_IN/contracts.lang
 create mode 100644 htdocs/langs/hi_IN/cron.lang
 create mode 100644 htdocs/langs/hi_IN/deliveries.lang
 create mode 100644 htdocs/langs/hi_IN/dict.lang
 create mode 100644 htdocs/langs/hi_IN/donations.lang
 create mode 100644 htdocs/langs/hi_IN/ecm.lang
 create mode 100644 htdocs/langs/hi_IN/errors.lang
 create mode 100644 htdocs/langs/hi_IN/exports.lang
 create mode 100644 htdocs/langs/hi_IN/externalsite.lang
 create mode 100644 htdocs/langs/hi_IN/ftp.lang
 create mode 100644 htdocs/langs/hi_IN/help.lang
 create mode 100644 htdocs/langs/hi_IN/holiday.lang
 create mode 100644 htdocs/langs/hi_IN/hrm.lang
 create mode 100644 htdocs/langs/hi_IN/install.lang
 create mode 100644 htdocs/langs/hi_IN/interventions.lang
 create mode 100644 htdocs/langs/hi_IN/languages.lang
 create mode 100644 htdocs/langs/hi_IN/ldap.lang
 create mode 100644 htdocs/langs/hi_IN/link.lang
 create mode 100644 htdocs/langs/hi_IN/loan.lang
 create mode 100644 htdocs/langs/hi_IN/mailmanspip.lang
 create mode 100644 htdocs/langs/hi_IN/mails.lang
 create mode 100644 htdocs/langs/hi_IN/main.lang
 create mode 100644 htdocs/langs/hi_IN/margins.lang
 create mode 100644 htdocs/langs/hi_IN/members.lang
 create mode 100644 htdocs/langs/hi_IN/modulebuilder.lang
 create mode 100644 htdocs/langs/hi_IN/mrp.lang
 create mode 100644 htdocs/langs/hi_IN/multicurrency.lang
 create mode 100644 htdocs/langs/hi_IN/oauth.lang
 create mode 100644 htdocs/langs/hi_IN/opensurvey.lang
 create mode 100644 htdocs/langs/hi_IN/orders.lang
 create mode 100644 htdocs/langs/hi_IN/other.lang
 create mode 100644 htdocs/langs/hi_IN/paybox.lang
 create mode 100644 htdocs/langs/hi_IN/paypal.lang
 create mode 100644 htdocs/langs/hi_IN/printing.lang
 create mode 100644 htdocs/langs/hi_IN/productbatch.lang
 create mode 100644 htdocs/langs/hi_IN/products.lang
 create mode 100644 htdocs/langs/hi_IN/projects.lang
 create mode 100644 htdocs/langs/hi_IN/propal.lang
 create mode 100644 htdocs/langs/hi_IN/receiptprinter.lang
 create mode 100644 htdocs/langs/hi_IN/receptions.lang
 create mode 100644 htdocs/langs/hi_IN/resource.lang
 create mode 100644 htdocs/langs/hi_IN/salaries.lang
 create mode 100644 htdocs/langs/hi_IN/sendings.lang
 create mode 100644 htdocs/langs/hi_IN/sms.lang
 create mode 100644 htdocs/langs/hi_IN/stocks.lang
 create mode 100644 htdocs/langs/hi_IN/stripe.lang
 create mode 100644 htdocs/langs/hi_IN/supplier_proposal.lang
 create mode 100644 htdocs/langs/hi_IN/suppliers.lang
 create mode 100644 htdocs/langs/hi_IN/ticket.lang
 create mode 100644 htdocs/langs/hi_IN/trips.lang
 create mode 100644 htdocs/langs/hi_IN/users.lang
 create mode 100644 htdocs/langs/hi_IN/website.lang
 create mode 100644 htdocs/langs/hi_IN/withdrawals.lang
 create mode 100644 htdocs/langs/hi_IN/workflow.lang
 create mode 100644 htdocs/langs/hi_IN/zapier.lang
 create mode 100644 htdocs/langs/hr_HR/multicurrency.lang
 create mode 100644 htdocs/langs/hr_HR/zapier.lang
 create mode 100644 htdocs/langs/hu_HU/zapier.lang
 create mode 100644 htdocs/langs/id_ID/multicurrency.lang
 create mode 100644 htdocs/langs/id_ID/zapier.lang
 create mode 100644 htdocs/langs/is_IS/multicurrency.lang
 create mode 100644 htdocs/langs/is_IS/zapier.lang
 create mode 100644 htdocs/langs/it_CH/accountancy.lang
 create mode 100644 htdocs/langs/it_CH/admin.lang
 create mode 100644 htdocs/langs/it_CH/companies.lang
 create mode 100644 htdocs/langs/it_CH/main.lang
 create mode 100644 htdocs/langs/it_CH/projects.lang
 create mode 100644 htdocs/langs/it_IT/zapier.lang
 create mode 100644 htdocs/langs/ka_GE/multicurrency.lang
 create mode 100644 htdocs/langs/ka_GE/zapier.lang
 create mode 100644 htdocs/langs/km_KH/accountancy.lang
 create mode 100644 htdocs/langs/km_KH/admin.lang
 create mode 100644 htdocs/langs/km_KH/agenda.lang
 create mode 100644 htdocs/langs/km_KH/banks.lang
 create mode 100644 htdocs/langs/km_KH/bills.lang
 create mode 100644 htdocs/langs/km_KH/bookmarks.lang
 create mode 100644 htdocs/langs/km_KH/boxes.lang
 create mode 100644 htdocs/langs/km_KH/cashdesk.lang
 create mode 100644 htdocs/langs/km_KH/categories.lang
 create mode 100644 htdocs/langs/km_KH/commercial.lang
 create mode 100644 htdocs/langs/km_KH/companies.lang
 create mode 100644 htdocs/langs/km_KH/compta.lang
 create mode 100644 htdocs/langs/km_KH/contracts.lang
 create mode 100644 htdocs/langs/km_KH/cron.lang
 create mode 100644 htdocs/langs/km_KH/deliveries.lang
 create mode 100644 htdocs/langs/km_KH/dict.lang
 create mode 100644 htdocs/langs/km_KH/donations.lang
 create mode 100644 htdocs/langs/km_KH/ecm.lang
 create mode 100644 htdocs/langs/km_KH/errors.lang
 create mode 100644 htdocs/langs/km_KH/exports.lang
 create mode 100644 htdocs/langs/km_KH/externalsite.lang
 create mode 100644 htdocs/langs/km_KH/ftp.lang
 create mode 100644 htdocs/langs/km_KH/help.lang
 create mode 100644 htdocs/langs/km_KH/holiday.lang
 create mode 100644 htdocs/langs/km_KH/hrm.lang
 create mode 100644 htdocs/langs/km_KH/install.lang
 create mode 100644 htdocs/langs/km_KH/interventions.lang
 create mode 100644 htdocs/langs/km_KH/languages.lang
 create mode 100644 htdocs/langs/km_KH/ldap.lang
 create mode 100644 htdocs/langs/km_KH/link.lang
 create mode 100644 htdocs/langs/km_KH/loan.lang
 create mode 100644 htdocs/langs/km_KH/mailmanspip.lang
 create mode 100644 htdocs/langs/km_KH/mails.lang
 create mode 100644 htdocs/langs/km_KH/margins.lang
 create mode 100644 htdocs/langs/km_KH/members.lang
 create mode 100644 htdocs/langs/km_KH/modulebuilder.lang
 create mode 100644 htdocs/langs/km_KH/multicurrency.lang
 create mode 100644 htdocs/langs/km_KH/oauth.lang
 create mode 100644 htdocs/langs/km_KH/opensurvey.lang
 create mode 100644 htdocs/langs/km_KH/orders.lang
 create mode 100644 htdocs/langs/km_KH/other.lang
 create mode 100644 htdocs/langs/km_KH/paybox.lang
 create mode 100644 htdocs/langs/km_KH/paypal.lang
 create mode 100644 htdocs/langs/km_KH/printing.lang
 create mode 100644 htdocs/langs/km_KH/productbatch.lang
 create mode 100644 htdocs/langs/km_KH/products.lang
 create mode 100644 htdocs/langs/km_KH/projects.lang
 create mode 100644 htdocs/langs/km_KH/propal.lang
 create mode 100644 htdocs/langs/km_KH/receiptprinter.lang
 create mode 100644 htdocs/langs/km_KH/resource.lang
 create mode 100644 htdocs/langs/km_KH/salaries.lang
 create mode 100644 htdocs/langs/km_KH/sendings.lang
 create mode 100644 htdocs/langs/km_KH/sms.lang
 create mode 100644 htdocs/langs/km_KH/stocks.lang
 create mode 100644 htdocs/langs/km_KH/stripe.lang
 create mode 100644 htdocs/langs/km_KH/supplier_proposal.lang
 create mode 100644 htdocs/langs/km_KH/suppliers.lang
 create mode 100644 htdocs/langs/km_KH/trips.lang
 create mode 100644 htdocs/langs/km_KH/users.lang
 create mode 100644 htdocs/langs/km_KH/website.lang
 create mode 100644 htdocs/langs/km_KH/withdrawals.lang
 create mode 100644 htdocs/langs/km_KH/workflow.lang
 create mode 100644 htdocs/langs/km_KH/zapier.lang
 create mode 100644 htdocs/langs/kn_IN/multicurrency.lang
 create mode 100644 htdocs/langs/kn_IN/zapier.lang
 create mode 100644 htdocs/langs/ko_KR/zapier.lang
 create mode 100644 htdocs/langs/lo_LA/multicurrency.lang
 create mode 100644 htdocs/langs/lo_LA/zapier.lang
 create mode 100644 htdocs/langs/lt_LT/multicurrency.lang
 create mode 100644 htdocs/langs/lt_LT/zapier.lang
 create mode 100644 htdocs/langs/lv_LV/zapier.lang
 create mode 100644 htdocs/langs/mk_MK/multicurrency.lang
 create mode 100644 htdocs/langs/mk_MK/zapier.lang
 create mode 100644 htdocs/langs/mn_MN/multicurrency.lang
 create mode 100644 htdocs/langs/mn_MN/zapier.lang
 create mode 100644 htdocs/langs/nb_NO/zapier.lang
 create mode 100644 htdocs/langs/ne_NP/accountancy.lang
 create mode 100644 htdocs/langs/ne_NP/admin.lang
 create mode 100644 htdocs/langs/ne_NP/agenda.lang
 create mode 100644 htdocs/langs/ne_NP/assets.lang
 create mode 100644 htdocs/langs/ne_NP/banks.lang
 create mode 100644 htdocs/langs/ne_NP/bills.lang
 create mode 100644 htdocs/langs/ne_NP/blockedlog.lang
 create mode 100644 htdocs/langs/ne_NP/bookmarks.lang
 create mode 100644 htdocs/langs/ne_NP/boxes.lang
 create mode 100644 htdocs/langs/ne_NP/cashdesk.lang
 create mode 100644 htdocs/langs/ne_NP/categories.lang
 create mode 100644 htdocs/langs/ne_NP/commercial.lang
 create mode 100644 htdocs/langs/ne_NP/companies.lang
 create mode 100644 htdocs/langs/ne_NP/compta.lang
 create mode 100644 htdocs/langs/ne_NP/contracts.lang
 create mode 100644 htdocs/langs/ne_NP/cron.lang
 create mode 100644 htdocs/langs/ne_NP/deliveries.lang
 create mode 100644 htdocs/langs/ne_NP/dict.lang
 create mode 100644 htdocs/langs/ne_NP/donations.lang
 create mode 100644 htdocs/langs/ne_NP/ecm.lang
 create mode 100644 htdocs/langs/ne_NP/errors.lang
 create mode 100644 htdocs/langs/ne_NP/exports.lang
 create mode 100644 htdocs/langs/ne_NP/externalsite.lang
 create mode 100644 htdocs/langs/ne_NP/ftp.lang
 create mode 100644 htdocs/langs/ne_NP/help.lang
 create mode 100644 htdocs/langs/ne_NP/holiday.lang
 create mode 100644 htdocs/langs/ne_NP/hrm.lang
 create mode 100644 htdocs/langs/ne_NP/install.lang
 create mode 100644 htdocs/langs/ne_NP/interventions.lang
 create mode 100644 htdocs/langs/ne_NP/languages.lang
 create mode 100644 htdocs/langs/ne_NP/ldap.lang
 create mode 100644 htdocs/langs/ne_NP/link.lang
 create mode 100644 htdocs/langs/ne_NP/loan.lang
 create mode 100644 htdocs/langs/ne_NP/mailmanspip.lang
 create mode 100644 htdocs/langs/ne_NP/mails.lang
 create mode 100644 htdocs/langs/ne_NP/main.lang
 create mode 100644 htdocs/langs/ne_NP/margins.lang
 create mode 100644 htdocs/langs/ne_NP/members.lang
 create mode 100644 htdocs/langs/ne_NP/modulebuilder.lang
 create mode 100644 htdocs/langs/ne_NP/mrp.lang
 create mode 100644 htdocs/langs/ne_NP/multicurrency.lang
 create mode 100644 htdocs/langs/ne_NP/oauth.lang
 create mode 100644 htdocs/langs/ne_NP/opensurvey.lang
 create mode 100644 htdocs/langs/ne_NP/orders.lang
 create mode 100644 htdocs/langs/ne_NP/other.lang
 create mode 100644 htdocs/langs/ne_NP/paybox.lang
 create mode 100644 htdocs/langs/ne_NP/paypal.lang
 create mode 100644 htdocs/langs/ne_NP/printing.lang
 create mode 100644 htdocs/langs/ne_NP/productbatch.lang
 create mode 100644 htdocs/langs/ne_NP/products.lang
 create mode 100644 htdocs/langs/ne_NP/projects.lang
 create mode 100644 htdocs/langs/ne_NP/propal.lang
 create mode 100644 htdocs/langs/ne_NP/receiptprinter.lang
 create mode 100644 htdocs/langs/ne_NP/receptions.lang
 create mode 100644 htdocs/langs/ne_NP/resource.lang
 create mode 100644 htdocs/langs/ne_NP/salaries.lang
 create mode 100644 htdocs/langs/ne_NP/sendings.lang
 create mode 100644 htdocs/langs/ne_NP/sms.lang
 create mode 100644 htdocs/langs/ne_NP/stocks.lang
 create mode 100644 htdocs/langs/ne_NP/stripe.lang
 create mode 100644 htdocs/langs/ne_NP/supplier_proposal.lang
 create mode 100644 htdocs/langs/ne_NP/suppliers.lang
 create mode 100644 htdocs/langs/ne_NP/ticket.lang
 create mode 100644 htdocs/langs/ne_NP/trips.lang
 create mode 100644 htdocs/langs/ne_NP/users.lang
 create mode 100644 htdocs/langs/ne_NP/website.lang
 create mode 100644 htdocs/langs/ne_NP/withdrawals.lang
 create mode 100644 htdocs/langs/ne_NP/workflow.lang
 create mode 100644 htdocs/langs/ne_NP/zapier.lang
 create mode 100644 htdocs/langs/nl_BE/donations.lang
 create mode 100644 htdocs/langs/nl_BE/modulebuilder.lang
 create mode 100644 htdocs/langs/nl_BE/multicurrency.lang
 create mode 100644 htdocs/langs/nl_BE/suppliers.lang
 create mode 100644 htdocs/langs/nl_NL/multicurrency.lang
 create mode 100644 htdocs/langs/nl_NL/zapier.lang
 create mode 100644 htdocs/langs/pl_PL/zapier.lang
 create mode 100644 htdocs/langs/pt_BR/zapier.lang
 create mode 100644 htdocs/langs/pt_PT/zapier.lang
 create mode 100644 htdocs/langs/ro_RO/multicurrency.lang
 create mode 100644 htdocs/langs/ro_RO/zapier.lang
 create mode 100644 htdocs/langs/ru_RU/zapier.lang
 create mode 100644 htdocs/langs/sk_SK/multicurrency.lang
 create mode 100644 htdocs/langs/sk_SK/zapier.lang
 create mode 100644 htdocs/langs/sl_SI/multicurrency.lang
 create mode 100644 htdocs/langs/sl_SI/zapier.lang
 create mode 100644 htdocs/langs/sq_AL/multicurrency.lang
 create mode 100644 htdocs/langs/sq_AL/zapier.lang
 create mode 100644 htdocs/langs/sr_RS/assets.lang
 create mode 100644 htdocs/langs/sr_RS/blockedlog.lang
 create mode 100644 htdocs/langs/sr_RS/hrm.lang
 create mode 100644 htdocs/langs/sr_RS/modulebuilder.lang
 create mode 100644 htdocs/langs/sr_RS/mrp.lang
 create mode 100644 htdocs/langs/sr_RS/multicurrency.lang
 create mode 100644 htdocs/langs/sr_RS/oauth.lang
 create mode 100644 htdocs/langs/sr_RS/receiptprinter.lang
 create mode 100644 htdocs/langs/sr_RS/receptions.lang
 create mode 100644 htdocs/langs/sr_RS/stripe.lang
 create mode 100644 htdocs/langs/sr_RS/supplier_proposal.lang
 create mode 100644 htdocs/langs/sr_RS/ticket.lang
 create mode 100644 htdocs/langs/sr_RS/website.lang
 create mode 100644 htdocs/langs/sr_RS/zapier.lang
 create mode 100644 htdocs/langs/sv_SE/multicurrency.lang
 create mode 100644 htdocs/langs/sv_SE/zapier.lang
 create mode 100644 htdocs/langs/sw_SW/assets.lang
 create mode 100644 htdocs/langs/sw_SW/blockedlog.lang
 create mode 100644 htdocs/langs/sw_SW/hrm.lang
 create mode 100644 htdocs/langs/sw_SW/modulebuilder.lang
 create mode 100644 htdocs/langs/sw_SW/mrp.lang
 create mode 100644 htdocs/langs/sw_SW/multicurrency.lang
 create mode 100644 htdocs/langs/sw_SW/oauth.lang
 create mode 100644 htdocs/langs/sw_SW/receiptprinter.lang
 create mode 100644 htdocs/langs/sw_SW/receptions.lang
 create mode 100644 htdocs/langs/sw_SW/stripe.lang
 create mode 100644 htdocs/langs/sw_SW/supplier_proposal.lang
 create mode 100644 htdocs/langs/sw_SW/ticket.lang
 create mode 100644 htdocs/langs/sw_SW/website.lang
 create mode 100644 htdocs/langs/sw_SW/zapier.lang
 create mode 100644 htdocs/langs/th_TH/zapier.lang
 create mode 100644 htdocs/langs/tr_TR/zapier.lang
 create mode 100644 htdocs/langs/uk_UA/multicurrency.lang
 create mode 100644 htdocs/langs/uk_UA/zapier.lang
 create mode 100644 htdocs/langs/uz_UZ/assets.lang
 create mode 100644 htdocs/langs/uz_UZ/blockedlog.lang
 create mode 100644 htdocs/langs/uz_UZ/hrm.lang
 create mode 100644 htdocs/langs/uz_UZ/modulebuilder.lang
 create mode 100644 htdocs/langs/uz_UZ/mrp.lang
 create mode 100644 htdocs/langs/uz_UZ/multicurrency.lang
 create mode 100644 htdocs/langs/uz_UZ/oauth.lang
 create mode 100644 htdocs/langs/uz_UZ/receiptprinter.lang
 create mode 100644 htdocs/langs/uz_UZ/receptions.lang
 create mode 100644 htdocs/langs/uz_UZ/stripe.lang
 create mode 100644 htdocs/langs/uz_UZ/supplier_proposal.lang
 create mode 100644 htdocs/langs/uz_UZ/ticket.lang
 create mode 100644 htdocs/langs/uz_UZ/website.lang
 create mode 100644 htdocs/langs/uz_UZ/zapier.lang
 create mode 100644 htdocs/langs/vi_VN/multicurrency.lang
 create mode 100644 htdocs/langs/vi_VN/zapier.lang
 create mode 100644 htdocs/langs/zh_CN/zapier.lang
 create mode 100644 htdocs/langs/zh_HK/accountancy.lang
 create mode 100644 htdocs/langs/zh_HK/admin.lang
 create mode 100644 htdocs/langs/zh_HK/agenda.lang
 create mode 100644 htdocs/langs/zh_HK/assets.lang
 create mode 100644 htdocs/langs/zh_HK/banks.lang
 create mode 100644 htdocs/langs/zh_HK/bills.lang
 create mode 100644 htdocs/langs/zh_HK/blockedlog.lang
 create mode 100644 htdocs/langs/zh_HK/bookmarks.lang
 create mode 100644 htdocs/langs/zh_HK/boxes.lang
 create mode 100644 htdocs/langs/zh_HK/cashdesk.lang
 create mode 100644 htdocs/langs/zh_HK/categories.lang
 create mode 100644 htdocs/langs/zh_HK/commercial.lang
 create mode 100644 htdocs/langs/zh_HK/companies.lang
 create mode 100644 htdocs/langs/zh_HK/compta.lang
 create mode 100644 htdocs/langs/zh_HK/contracts.lang
 create mode 100644 htdocs/langs/zh_HK/cron.lang
 create mode 100644 htdocs/langs/zh_HK/deliveries.lang
 create mode 100644 htdocs/langs/zh_HK/dict.lang
 create mode 100644 htdocs/langs/zh_HK/donations.lang
 create mode 100644 htdocs/langs/zh_HK/ecm.lang
 create mode 100644 htdocs/langs/zh_HK/errors.lang
 create mode 100644 htdocs/langs/zh_HK/exports.lang
 create mode 100644 htdocs/langs/zh_HK/externalsite.lang
 create mode 100644 htdocs/langs/zh_HK/ftp.lang
 create mode 100644 htdocs/langs/zh_HK/help.lang
 create mode 100644 htdocs/langs/zh_HK/holiday.lang
 create mode 100644 htdocs/langs/zh_HK/hrm.lang
 create mode 100644 htdocs/langs/zh_HK/install.lang
 create mode 100644 htdocs/langs/zh_HK/interventions.lang
 create mode 100644 htdocs/langs/zh_HK/languages.lang
 create mode 100644 htdocs/langs/zh_HK/ldap.lang
 create mode 100644 htdocs/langs/zh_HK/link.lang
 create mode 100644 htdocs/langs/zh_HK/loan.lang
 create mode 100644 htdocs/langs/zh_HK/mailmanspip.lang
 create mode 100644 htdocs/langs/zh_HK/mails.lang
 create mode 100644 htdocs/langs/zh_HK/main.lang
 create mode 100644 htdocs/langs/zh_HK/margins.lang
 create mode 100644 htdocs/langs/zh_HK/members.lang
 create mode 100644 htdocs/langs/zh_HK/modulebuilder.lang
 create mode 100644 htdocs/langs/zh_HK/mrp.lang
 create mode 100644 htdocs/langs/zh_HK/multicurrency.lang
 create mode 100644 htdocs/langs/zh_HK/oauth.lang
 create mode 100644 htdocs/langs/zh_HK/opensurvey.lang
 create mode 100644 htdocs/langs/zh_HK/orders.lang
 create mode 100644 htdocs/langs/zh_HK/other.lang
 create mode 100644 htdocs/langs/zh_HK/paybox.lang
 create mode 100644 htdocs/langs/zh_HK/paypal.lang
 create mode 100644 htdocs/langs/zh_HK/printing.lang
 create mode 100644 htdocs/langs/zh_HK/productbatch.lang
 create mode 100644 htdocs/langs/zh_HK/products.lang
 create mode 100644 htdocs/langs/zh_HK/projects.lang
 create mode 100644 htdocs/langs/zh_HK/propal.lang
 create mode 100644 htdocs/langs/zh_HK/receiptprinter.lang
 create mode 100644 htdocs/langs/zh_HK/receptions.lang
 create mode 100644 htdocs/langs/zh_HK/resource.lang
 create mode 100644 htdocs/langs/zh_HK/salaries.lang
 create mode 100644 htdocs/langs/zh_HK/sendings.lang
 create mode 100644 htdocs/langs/zh_HK/sms.lang
 create mode 100644 htdocs/langs/zh_HK/stocks.lang
 create mode 100644 htdocs/langs/zh_HK/stripe.lang
 create mode 100644 htdocs/langs/zh_HK/supplier_proposal.lang
 create mode 100644 htdocs/langs/zh_HK/suppliers.lang
 create mode 100644 htdocs/langs/zh_HK/ticket.lang
 create mode 100644 htdocs/langs/zh_HK/trips.lang
 create mode 100644 htdocs/langs/zh_HK/users.lang
 create mode 100644 htdocs/langs/zh_HK/website.lang
 create mode 100644 htdocs/langs/zh_HK/withdrawals.lang
 create mode 100644 htdocs/langs/zh_HK/workflow.lang
 create mode 100644 htdocs/langs/zh_HK/zapier.lang

diff --git a/dev/translation/txpull.sh b/dev/translation/txpull.sh
index d3ac02fb633..65d5af3689b 100755
--- a/dev/translation/txpull.sh
+++ b/dev/translation/txpull.sh
@@ -35,6 +35,14 @@ then
 	then
 	    echo "tx pull -a"
 	    tx pull -a
+	    
+	    echo "Remove some language directories (not enough translated)"
+	    rm -fr htdocs/langs/ach
+	    rm -fr htdocs/langs/br_FR
+	    rm -fr htdocs/langs/en
+	    rm -fr htdocs/langs/frp
+	    rm -fr htdocs/langs/fy_NL
+	    
 	else
 		for dir in `find htdocs/langs/* -type d`
 		do
diff --git a/htdocs/langs/am_ET/accountancy.lang b/htdocs/langs/am_ET/accountancy.lang
new file mode 100644
index 00000000000..b8ce37a0956
--- /dev/null
+++ b/htdocs/langs/am_ET/accountancy.lang
@@ -0,0 +1,382 @@
+# Dolibarr language file - en_US - Accountancy (Double entries)
+Accountancy=Accountancy
+Accounting=Accounting
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
+ACCOUNTING_EXPORT_LABEL=Export label
+ACCOUNTING_EXPORT_AMOUNT=Export amount
+ACCOUNTING_EXPORT_DEVISE=Export currency
+Selectformat=Select the format for the file
+ACCOUNTING_EXPORT_FORMAT=Select the format for the file
+ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
+ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
+ThisService=This service
+ThisProduct=This product
+DefaultForService=Default for service
+DefaultForProduct=Default for product
+CantSuggest=Can't suggest
+AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journalization=Journalization
+Journaux=Journals
+JournalFinancial=Financial journals
+BackToChartofaccounts=Return chart of accounts
+Chartofaccounts=Chart of accounts
+CurrentDedicatedAccountingAccount=Current dedicated account
+AssignDedicatedAccountingAccount=New account to assign
+InvoiceLabel=Invoice label
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
+OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
+JournalizationInLedgerStatus=Status of journalization
+AlreadyInGeneralLedger=Already journalized in ledgers
+NotYetInGeneralLedger=Not yet journalized in ledgers
+GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
+DetailByAccount=Show detail by account
+AccountWithNonZeroValues=Accounts with non-zero values
+ListOfAccounts=List of accounts
+CountriesInEEC=Countries in EEC
+CountriesNotInEEC=Countries not in EEC
+CountriesInEECExceptMe=Countries in EEC except %s
+CountriesExceptMe=All countries except %s
+AccountantFiles=Export accounting documents
+
+MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
+MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
+MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+
+AccountancyArea=Accounting area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
+
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expenses (miscellaneous taxes). For this, use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
+AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
+AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+
+AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+Selectchartofaccounts=Select active chart of accounts
+ChangeAndLoad=Change and load
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+AccountAccountingShort=Account
+SubledgerAccount=Subledger account
+SubledgerAccountLabel=Subledger account label
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
+AccountAccountingSuggest=Accounting account suggested
+MenuDefaultAccounts=Default accounts
+MenuBankAccounts=Bank accounts
+MenuVatAccounts=Vat accounts
+MenuTaxAccounts=Tax accounts
+MenuExpenseReportAccounts=Expense report accounts
+MenuLoanAccounts=Loan accounts
+MenuProductsAccounts=Product accounts
+MenuClosureAccounts=Closure accounts
+MenuAccountancyClosure=Closure
+MenuAccountancyValidationMovements=Validate movements
+ProductsBinding=Products accounts
+TransferInAccounting=Transfer in accounting
+RegistrationInAccounting=Registration in accounting
+Binding=Binding to accounts
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Vendor invoice binding
+ExpenseReportsVentilation=Expense report binding
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+ValidTransaction=Validate transaction
+WriteBookKeeping=Register transactions in Ledger
+Bookkeeping=Ledger
+AccountBalance=Account balance
+ObjectsRef=Source object ref
+CAHTF=Total purchase vendor before tax
+TotalExpenseReport=Total expense report
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+ExpenseReportLines=Lines of expense reports to bind
+ExpenseReportLinesDone=Bound lines of expense reports
+IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
+
+
+Ventilate=Bind
+LineId=Id line
+Processing=Processing
+EndProcessing=Process terminated.
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+LineOfExpenseReport=Line of expense report
+NoAccountSelected=No accounting account selected
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+
+ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
+BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+
+ACCOUNTING_SELL_JOURNAL=Sell journal
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
+ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
+
+ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
+ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
+TransitionalAccount=Transitional bank transfer account
+
+ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
+DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+LabelAccount=Label account
+LabelOperation=Label operation
+Sens=Sens
+LetteringCode=Lettering code
+Lettering=Lettering
+Codejournal=Journal
+JournalLabel=Journal label
+NumPiece=Piece number
+TransactionNumShort=Num. transaction
+AccountingCategory=Personalized groups
+GroupByAccountAccounting=Group by accounting account
+AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
+ByAccounts=By accounts
+ByPredefinedAccountGroups=By predefined groups
+ByPersonalizedAccountGroups=By personalized groups
+ByYear=By year
+NotMatch=Not Set
+DeleteMvt=Delete Ledger lines
+DelMonth=Month to delete
+DelYear=Year to delete
+DelJournal=Journal to delete
+ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+FinanceJournal=Finance journal
+ExpenseReportsJournal=Expense reports journal
+DescFinanceJournal=Finance journal including all the types of payments by bank account
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+FeeAccountNotDefined=Account for fee not defined
+BankAccountNotDefined=Account for bank not defined
+CustomerInvoicePayment=Payment of invoice customer
+ThirdPartyAccount=Third-party account
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+AddCompteFromBK=Add accounting accounts to the group
+ReportThirdParty=List third-party account
+DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
+ListAccounts=List of the accounting accounts
+UnknownAccountForThirdparty=Unknown third-party account. We will use %s
+UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
+ShowOpeningBalance=Show opening balance
+HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
+
+Pcgtype=Group of account
+PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+
+Reconcilable=Reconcilable
+
+TotalVente=Total turnover before tax
+TotalMarge=Total sales margin
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
+Vide=-
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account (only record not already transfered in accountancy are visible)
+DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
+DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
+DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
+DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+
+DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
+OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+ValidateMovements=Validate movements
+DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
+SelectMonthAndValidate=Select month and validate movements
+
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
+Balancing=Balancing
+FicheVentilation=Binding card
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
+NoNewRecordSaved=No more record to journalize
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
+ShowTutorial=Show Tutorial
+NotReconciled=Not reconciled
+
+## Admin
+ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
+CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccountingJournal=Show accounting journal
+NatureOfJournal=Nature of Journal
+AccountingJournalType1=Miscellaneous operations
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
+NumberOfAccountancyEntries=Number of entries
+NumberOfAccountancyMovements=Number of movements
+
+## Export
+ExportDraftJournal=Export draft journal
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export for CEGID Expert Comptabilité
+Modelcsv_COALA=Export for Sage Coala
+Modelcsv_bob50=Export for Sage BOB 50
+Modelcsv_ciel=Export for Sage Ciel Compta or Compta Evolution
+Modelcsv_quadratus=Export for Quadratus QuadraCompta
+Modelcsv_ebp=Export for EBP
+Modelcsv_cogilog=Export for Cogilog
+Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
+Modelcsv_openconcerto=Export for OpenConcerto (Test)
+Modelcsv_configurable=Export CSV Configurable
+Modelcsv_FEC=Export FEC
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+ChartofaccountsId=Chart of accounts Id
+
+## Tools - Init accounting account on product / service
+InitAccountancy=Init accountancy
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
+DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
+Options=Options
+OptionModeProductSell=Mode sales
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
+OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
+OptionModeProductSellDesc=Show all products with accounting account for sales.
+OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
+OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
+OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
+CleanFixHistory=Remove accounting code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
+PredefinedGroups=Predefined groups
+WithoutValidAccount=Without valid dedicated account
+WithValidAccount=With valid dedicated account
+ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
+AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
+
+## Dictionary
+Range=Range of accounting account
+Calculated=Calculated
+Formula=Formula
+
+## Error
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
+ExportNotSupported=The export format setuped is not supported into this page
+BookeppingLineAlreayExists=Lines already existing into bookkeeping
+NoJournalDefined=No journal defined
+Binded=Lines bound
+ToBind=Lines to bind
+UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
+
+## Import
+ImportAccountingEntries=Accounting entries
+DateExport=Date export
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/am_ET/admin.lang b/htdocs/langs/am_ET/admin.lang
new file mode 100644
index 00000000000..7eb67d7a4ab
--- /dev/null
+++ b/htdocs/langs/am_ET/admin.lang
@@ -0,0 +1,2002 @@
+# Dolibarr language file - Source file is en_US - admin
+Foundation=Foundation
+Version=Version
+Publisher=Publisher
+VersionProgram=Version program
+VersionLastInstall=Initial install version
+VersionLastUpgrade=Latest version upgrade
+VersionExperimental=Experimental
+VersionDevelopment=Development
+VersionUnknown=Unknown
+VersionRecommanded=Recommended
+FileCheck=Fileset Integrity Checks
+FileCheckDesc=This tool allows you to check the integrity of files and the setup of your application, comparing each file with the official one. The value of some setup constants may also be checked. You can use this tool to determine if any files have been modified (e.g by a hacker).
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files have been added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when the application is installed from an official package
+XmlNotFound=Xml Integrity File of application not found
+SessionId=Session ID
+SessionSaveHandler=Handler to save sessions
+SessionSavePath=Session save location
+PurgeSessions=Purge of sessions
+ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
+NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow listing all running sessions.
+LockNewSessions=Lock new connections
+ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself? Only user <b>%s</b> will be able to connect after that.
+UnlockNewSessions=Remove connection lock
+YourSession=Your session
+Sessions=Users Sessions
+WebUserGroup=Web server user/group
+NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
+DBStoringCharset=Database charset to store data
+DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
+ClientCharset=Client charset
+ClientSortingCharset=Client collation
+WarningModuleNotActive=Module <b>%s</b> must be enabled
+WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
+DolibarrSetup=Dolibarr install or upgrade
+InternalUser=Internal user
+ExternalUser=External user
+InternalUsers=Internal users
+ExternalUsers=External users
+GUISetup=Display
+SetupArea=Setup
+UploadNewTemplate=Upload new template(s)
+FormToTestFileUploadForm=Form to test file upload (according to setup)
+IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
+RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
+RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
+SecuritySetup=Security setup
+SecurityFilesDesc=Define here options related to security about uploading files.
+ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
+ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
+ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
+DictionarySetup=Dictionary setup
+Dictionary=Dictionaries
+ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
+ErrorCodeCantContainZero=Code can't contain value 0
+DisableJavascript=Disable JavaScript and Ajax functions
+DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
+NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
+JavascriptDisabled=JavaScript disabled
+UsePreviewTabs=Use preview tabs
+ShowPreview=Show preview
+PreviewNotAvailable=Preview not available
+ThemeCurrentlyActive=Theme currently active
+CurrentTimeZone=TimeZone PHP (server)
+MySQLTimeZone=TimeZone MySql (database)
+TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+Space=Space
+Table=Table
+Fields=Fields
+Index=Index
+Mask=Mask
+NextValue=Next value
+NextValueForInvoices=Next value (invoices)
+NextValueForCreditNotes=Next value (credit notes)
+NextValueForDeposit=Next value (down payment)
+NextValueForReplacements=Next value (replacements)
+MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
+MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page
+AntiVirusCommand=Full path to antivirus command
+AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusParam= More parameters on command line
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=Accounting module setup
+UserSetup=User management setup
+MultiCurrencySetup=Multi-currency setup
+MenuLimits=Limits and accuracy
+MenuIdParent=Parent menu ID
+DetailMenuIdParent=ID of parent menu (empty for a top menu)
+DetailPosition=Sort number to define menu position
+AllMenus=All
+NotConfigured=Module/Application not configured
+Active=Active
+SetupShort=Setup
+OtherOptions=Other options
+OtherSetup=Other Setup
+CurrentValueSeparatorDecimal=Decimal separator
+CurrentValueSeparatorThousand=Thousand separator
+Destination=Destination
+IdModule=Module ID
+IdPermissions=Permissions ID
+LanguageBrowserParameter=Parameter %s
+LocalisationDolibarrParameters=Localization parameters
+ClientTZ=Client Time Zone (user)
+ClientHour=Client time (user)
+OSTZ=Server OS Time Zone
+PHPTZ=PHP server Time Zone
+DaylingSavingTime=Daylight saving time
+CurrentHour=PHP Time (server)
+CurrentSessionTimeOut=Current session timeout
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a .htaccess file with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but of the timezone of the server.
+Box=Widget
+Boxes=Widgets
+MaxNbOfLinesForBoxes=Max. number of lines for widgets
+AllWidgetsWereEnabled=All available widgets are enabled
+PositionByDefault=Default order
+Position=Position
+MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
+MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br>Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenuForUsers=Menu for users
+LangFile=.lang file
+Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
+System=System
+SystemInfo=System information
+SystemToolsArea=System tools area
+SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature.
+Purge=Purge
+PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
+PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
+PurgeRunNow=Purge now
+PurgeNothingToDelete=No directory or files to delete.
+PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
+PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
+PurgeAuditEvents=Purge all security events
+ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
+GenerateBackup=Generate backup
+Backup=Backup
+Restore=Restore
+RunCommandSummary=Backup has been launched with the following command
+BackupResult=Backup result
+BackupFileSuccessfullyCreated=Backup file successfully generated
+YouCanDownloadBackupFile=The generated file can now be downloaded
+NoBackupFileAvailable=No backup files available.
+ExportMethod=Export method
+ImportMethod=Import method
+ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
+ImportMySqlDesc=To import a MySQL backup file, you may use phpMyAdmin via your hosting or use the mysql command from the Command line.<br>For example:
+ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
+ImportMySqlCommand=%s %s < mybackupfile.sql
+ImportPostgreSqlCommand=%s %s mybackupfile.sql
+FileNameToGenerate=Filename for backup:
+Compression=Compression
+CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
+CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
+ExportCompatibility=Compatibility of generated export file
+ExportUseMySQLQuickParameter=Use the --quick parameter
+ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
+MySqlExportParameters=MySQL export parameters
+PostgreSqlExportParameters= PostgreSQL export parameters
+UseTransactionnalMode=Use transactional mode
+FullPathToMysqldumpCommand=Full path to mysqldump command
+FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
+AddDropDatabase=Add DROP DATABASE command
+AddDropTable=Add DROP TABLE command
+ExportStructure=Structure
+NameColumn=Name columns
+ExtendedInsert=Extended INSERT
+NoLockBeforeInsert=No lock commands around INSERT
+DelayedInsert=Delayed insert
+EncodeBinariesInHexa=Encode binary data in hexadecimal
+IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
+AutoDetectLang=Autodetect (browser language)
+FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
+BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
+OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
+ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external app/modules
+ModulesDevelopYourModule=Develop your own app/modules
+ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
+DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
+NewModule=New
+FreeModule=Free
+CompatibleUpTo=Compatible with version %s
+NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
+CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
+SeeInMarkerPlace=See in Market place
+SeeSetupOfModule=See setup of module %s
+Updated=Updated
+Nouveauté=Novelty
+AchatTelechargement=Buy / Download
+GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
+DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming may develop a module.
+WebSiteDesc=External websites for more add-on (non-core) modules...
+DevelopYourModuleDesc=Some solutions to develop your own module...
+URL=URL
+RelativeURL=Relative URL
+BoxesAvailable=Widgets available
+BoxesActivated=Widgets activated
+ActivateOn=Activate on
+ActiveOn=Activated on
+SourceFile=Source file
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
+Required=Required
+UsedOnlyWithTypeOption=Used by some agenda option only
+Security=Security
+Passwords=Passwords
+DoNotStoreClearPassword=Encrypt passwords stored in database (NOT as plain-text). It is strongly recommended to activate this option.
+MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
+ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
+Feature=Feature
+DolibarrLicense=License
+Developpers=Developers/contributors
+OfficialWebSite=Dolibarr official web site
+OfficialWebSiteLocal=Local web site (%s)
+OfficialWiki=Dolibarr documentation / Wiki
+OfficialDemo=Dolibarr online demo
+OfficialMarketPlace=Official market place for external modules/addons
+OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
+ReferencedPreferredPartners=Preferred Partners
+OtherResources=Other resources
+ExternalResources=External Resources
+SocialNetworks=Social Networks
+ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
+ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
+HelpCenterDesc2=Some of these resources are only available in <b>english</b>.
+CurrentMenuHandler=Current menu handler
+MeasuringUnit=Measuring unit
+LeftMargin=Left margin
+TopMargin=Top margin
+PaperSize=Paper type
+Orientation=Orientation
+SpaceX=Space X
+SpaceY=Space Y
+FontSize=Font size
+Content=Content
+NoticePeriod=Notice period
+NewByMonth=New by month
+Emails=Emails
+EMailsSetup=Emails setup
+EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EmailSenderProfiles=Emails sender profiles
+EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
+MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix-like systems)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix-like systems)
+MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
+MAIN_MAIL_AUTOCOPY_TO= Copy (Bcc) all sent emails to
+MAIN_DISABLE_ALL_MAILS=Disable all email sending (for test purposes or demos)
+MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
+MAIN_MAIL_SENDMODE=Email sending method
+MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
+MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
+MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
+MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
+MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos)
+MAIN_SMS_SENDMODE=Method to use to send SMS
+MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending
+MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
+UserEmail=User email
+CompanyEmail=Company Email
+FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+ModuleSetup=Module setup
+ModulesSetup=Modules/Application setup
+ModuleFamilyBase=System
+ModuleFamilyCrm=Customer Relationship Management (CRM)
+ModuleFamilySrm=Vendor Relationship Management (VRM)
+ModuleFamilyProducts=Product Management (PM)
+ModuleFamilyHr=Human Resource Management (HR)
+ModuleFamilyProjects=Projects/Collaborative work
+ModuleFamilyOther=Other
+ModuleFamilyTechnic=Multi-modules tools
+ModuleFamilyExperimental=Experimental modules
+ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
+ModuleFamilyECM=Electronic Content Management (ECM)
+ModuleFamilyPortal=Websites and other frontal application
+ModuleFamilyInterface=Interfaces with external systems
+MenuHandlers=Menu handlers
+MenuAdmin=Menu editor
+DoNotUseInProduction=Do not use in production
+ThisIsProcessToFollow=Upgrade procedure:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+StepNb=Step %s
+FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
+DownloadPackageFromWebSite=Download package (for example from the official web site %s).
+UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
+YouCanSubmitFile=You can upload the .zip file of module package from here:
+CurrentVersion=Dolibarr current version
+CallUpdatePage=Browse to the page that updates the database structure and data: %s.
+LastStableVersion=Latest stable version
+LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
+UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
+GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
+GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
+GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
+ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
+ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
+DoTestServerAvailability=Test server connectivity
+DoTestSend=Test sending
+DoTestSendHTML=Test sending HTML
+ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
+UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
+SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
+UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
+DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
+DisableLinkToHelp=Hide link to online help "<b>%s</b>"
+AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
+ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
+MinLength=Minimum length
+LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
+LanguageFile=Language file
+ExamplesWithCurrentSetup=Examples with current configuration
+ListOfDirectories=List of OpenDocument templates directories
+ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
+NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
+FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
+FirstnameNamePosition=Position of Name/Lastname
+DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
+KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
+TestSubmitForm=Input test form
+ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours.
+ThemeDir=Skins directory
+ConnectionTimeout=Connection timeout
+ResponseTimeout=Response timeout
+SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
+ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
+SecurityToken=Key to secure URLs
+NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
+PDF=PDF
+PDFDesc=Global options for PDF generation.
+PDFAddressForging=Rules for address boxes
+HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
+PDFLocaltax=Rules for %s
+HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideDescOnPDF=Hide products description
+HideRefOnPDF=Hide products ref.
+HideDetailsOnPDF=Hide product lines details
+PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+Library=Library
+UrlGenerationParameters=Parameters to secure URLs
+SecurityTokenIsUnique=Use a unique securekey parameter for each URL
+EnterRefToBuildUrl=Enter reference for object %s
+GetSecuredUrl=Get calculated URL
+ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+OldVATRates=Old VAT rate
+NewVATRates=New VAT rate
+PriceBaseTypeToChange=Modify on prices with base reference value defined on
+MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
+String=String
+TextLong=Long text
+HtmlText=Html text
+Int=Integer
+Float=Float
+DateAndTime=Date and hour
+Unique=Unique
+Boolean=Boolean (one checkbox)
+ExtrafieldPhone = Phone
+ExtrafieldPrice = Price
+ExtrafieldMail = Email
+ExtrafieldUrl = Url
+ExtrafieldSelect = Select list
+ExtrafieldSelectList = Select from table
+ExtrafieldSeparator=Separator (not a field)
+ExtrafieldPassword=Password
+ExtrafieldRadio=Radio buttons (one choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
+ExtrafieldLink=Link to an object
+ComputedFormula=Computed field
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+Computedpersistent=Store computed field
+ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
+ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
+ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
+LibraryToBuildPDF=Library used for PDF generation
+LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
+SMS=SMS
+LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
+RefreshPhoneLink=Refresh link
+LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
+KeepEmptyToUseDefault=Keep empty to use default value
+DefaultLink=Default link
+SetAsDefault=Set as default
+ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
+ExternalModule=External module
+InstalledInto=Installed into directory %s
+BarcodeInitForthird-parties=Mass barcode init for third-parties
+BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
+CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
+InitEmptyBarCode=Init value for next %s empty records
+EraseAllCurrentBarCode=Erase all current barcode values
+ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
+AllBarcodeReset=All barcode values have been removed
+NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
+EnableFileCache=Enable file cache
+ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
+NoDetails=No additional details in footer
+DisplayCompanyInfo=Display company address
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
+EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
+ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code
+ModuleCompanyCodePanicum=Return an empty accounting code.
+ModuleCompanyCodeDigitaria=Returns a compound accounting code according to the name of the third party. The code consists of a prefix that can be defined in the first position followed by the number of characters defined in the third party code.
+ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
+ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+ClickToShowDescription=Click to show description
+DependsOn=This module needs the module(s)
+RequiredBy=This module is required by module(s)
+TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
+PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
+EnableDefaultValues=Enable customization of default values
+EnableOverwriteTranslation=Enable usage of overwritten translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
+AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
+FilesAttachedToEmail=Attach file
+SendEmailsReminders=Send agenda reminders by emails
+davDescription=Setup a WebDAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
+DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
+DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
+DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
+DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
+# Modules
+Module0Name=Users & Groups
+Module0Desc=Users / Employees and Groups management
+Module1Name=Third Parties
+Module1Desc=Companies and contacts management (customers, prospects...)
+Module2Name=Commercial
+Module2Desc=Commercial management
+Module10Name=Accounting (simplified)
+Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
+Module20Name=Proposals
+Module20Desc=Commercial proposal management
+Module22Name=Mass Emailings
+Module22Desc=Manage bulk emailing
+Module23Name=Energy
+Module23Desc=Monitoring the consumption of energies
+Module25Name=Sales Orders
+Module25Desc=Sales order management
+Module30Name=Invoices
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
+Module40Name=Vendors
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
+Module42Name=Debug Logs
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module49Name=Editors
+Module49Desc=Editor management
+Module50Name=Products
+Module50Desc=Management of Products
+Module51Name=Mass mailings
+Module51Desc=Mass paper mailing management
+Module52Name=Stocks
+Module52Desc=Stock management
+Module53Name=Services
+Module53Desc=Management of Services
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or recurring subscriptions)
+Module55Name=Barcodes
+Module55Desc=Barcode management
+Module56Name=Telephony
+Module56Desc=Telephony integration
+Module57Name=Bank Direct Debit payments
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module58Name=ClickToDial
+Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
+Module59Name=Bookmark4u
+Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
+Module60Name=Stickers
+Module60Desc=Management of stickers
+Module70Name=Interventions
+Module70Desc=Intervention management
+Module75Name=Expense and trip notes
+Module75Desc=Expense and trip notes management
+Module80Name=Shipments
+Module80Desc=Shipments and delivery note management
+Module85Name=Banks & Cash
+Module85Desc=Management of bank or cash accounts
+Module100Name=External Site
+Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module105Name=Mailman and SPIP
+Module105Desc=Mailman or SPIP interface for member module
+Module200Name=LDAP
+Module200Desc=LDAP directory synchronization
+Module210Name=PostNuke
+Module210Desc=PostNuke integration
+Module240Name=Data exports
+Module240Desc=Tool to export Dolibarr data (with assistance)
+Module250Name=Data imports
+Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module310Name=Members
+Module310Desc=Foundation members management
+Module320Name=RSS Feed
+Module320Desc=Add a RSS feed to Dolibarr pages
+Module330Name=Bookmarks & Shortcuts
+Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access
+Module400Name=Projects or Leads
+Module400Desc=Management of projects, leads/opportunities and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module410Name=Webcalendar
+Module410Desc=Webcalendar integration
+Module500Name=Taxes & Special Expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
+Module510Name=Salaries
+Module510Desc=Record and track employee payments
+Module520Name=Loans
+Module520Desc=Management of loans
+Module600Name=Notifications on business event
+Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
+Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
+Module610Name=Product Variants
+Module610Desc=Creation of product variants (color, size etc.)
+Module700Name=Donations
+Module700Desc=Donation management
+Module770Name=Expense Reports
+Module770Desc=Manage expense reports claims (transportation, meal, ...)
+Module1120Name=Vendor Commercial Proposals
+Module1120Desc=Request vendor commercial proposal and prices
+Module1200Name=Mantis
+Module1200Desc=Mantis integration
+Module1520Name=Document Generation
+Module1520Desc=Mass email document generation
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module2000Name=WYSIWYG editor
+Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
+Module2200Name=Dynamic Prices
+Module2200Desc=Use maths expressions for auto-generation of prices
+Module2300Name=Scheduled jobs
+Module2300Desc=Scheduled jobs management (alias cron or chrono table)
+Module2400Name=Events/Agenda
+Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
+Module2500Name=DMS / ECM
+Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
+Module2600Name=API/Web services (SOAP server)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API/Web services (REST server)
+Module2610Desc=Enable the Dolibarr REST server providing API services
+Module2660Name=Call WebServices (SOAP client)
+Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
+Module2700Name=Gravatar
+Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
+Module2800Desc=FTP Client
+Module2900Name=GeoIPMaxmind
+Module2900Desc=GeoIP Maxmind conversions capabilities
+Module3200Name=Unalterable Archives
+Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module4000Name=HRM
+Module4000Desc=Human resources management (management of department, employee contracts and feelings)
+Module5000Name=Multi-company
+Module5000Desc=Allows you to manage multiple companies
+Module6000Name=Workflow
+Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module10000Name=Websites
+Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
+Module20000Name=Leave Request Management
+Module20000Desc=Define and track employee leave requests
+Module39000Name=Product Lots
+Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
+Module40000Name=Multicurrency
+Module40000Desc=Use alternative currencies in prices and documents
+Module50000Name=PayBox
+Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50100Name=POS SimplePOS
+Module50100Desc=Point of Sale module SimplePOS (simple POS).
+Module50150Name=POS TakePOS
+Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50200Name=Paypal
+Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50300Name=Stripe
+Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50400Name=Accounting (double entry)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module54000Name=PrintIPP
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
+Module59000Name=Margins
+Module59000Desc=Module to manage margins
+Module60000Name=Commissions
+Module60000Desc=Module to manage commissions
+Module62000Name=Incoterms
+Module62000Desc=Add features to manage Incoterms
+Module63000Name=Resources
+Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
+Permission11=Read customer invoices
+Permission12=Create/modify customer invoices
+Permission13=Unvalidate customer invoices
+Permission14=Validate customer invoices
+Permission15=Send customer invoices by email
+Permission16=Create payments for customer invoices
+Permission19=Delete customer invoices
+Permission21=Read commercial proposals
+Permission22=Create/modify commercial proposals
+Permission24=Validate commercial proposals
+Permission25=Send commercial proposals
+Permission26=Close commercial proposals
+Permission27=Delete commercial proposals
+Permission28=Export commercial proposals
+Permission31=Read products
+Permission32=Create/modify products
+Permission34=Delete products
+Permission36=See/manage hidden products
+Permission38=Export products
+Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
+Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
+Permission44=Delete projects (shared project and projects I'm contact for)
+Permission45=Export projects
+Permission61=Read interventions
+Permission62=Create/modify interventions
+Permission64=Delete interventions
+Permission67=Export interventions
+Permission71=Read members
+Permission72=Create/modify members
+Permission74=Delete members
+Permission75=Setup types of membership
+Permission76=Export data
+Permission78=Read subscriptions
+Permission79=Create/modify subscriptions
+Permission81=Read customers orders
+Permission82=Create/modify customers orders
+Permission84=Validate customers orders
+Permission86=Send customers orders
+Permission87=Close customers orders
+Permission88=Cancel customers orders
+Permission89=Delete customers orders
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
+Permission95=Read reports
+Permission101=Read sendings
+Permission102=Create/modify sendings
+Permission104=Validate sendings
+Permission106=Export sendings
+Permission109=Delete sendings
+Permission111=Read financial accounts
+Permission112=Create/modify/delete and compare transactions
+Permission113=Setup financial accounts (create, manage categories)
+Permission114=Reconcile transactions
+Permission115=Export transactions and account statements
+Permission116=Transfers between accounts
+Permission117=Manage checks dispatching
+Permission121=Read third parties linked to user
+Permission122=Create/modify third parties linked to user
+Permission125=Delete third parties linked to user
+Permission126=Export third parties
+Permission141=Read all projects and tasks (also private projects for which I am not a contact)
+Permission142=Create/modify all projects and tasks (also private projects for which I am not a contact)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
+Permission146=Read providers
+Permission147=Read stats
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejections of direct debit payment orders
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
+Permission171=Read trips and expenses (yours and your subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
+Permission180=Read suppliers
+Permission181=Read purchase orders
+Permission182=Create/modify purchase orders
+Permission183=Validate purchase orders
+Permission184=Approve purchase orders
+Permission185=Order or cancel purchase orders
+Permission186=Receive purchase orders
+Permission187=Close purchase orders
+Permission188=Cancel purchase orders
+Permission192=Create lines
+Permission193=Cancel lines
+Permission194=Read the bandwidth lines
+Permission202=Create ADSL connections
+Permission203=Order connections orders
+Permission204=Order connections
+Permission205=Manage connections
+Permission206=Read connections
+Permission211=Read Telephony
+Permission212=Order lines
+Permission213=Activate line
+Permission214=Setup Telephony
+Permission215=Setup providers
+Permission221=Read emailings
+Permission222=Create/modify emailings (topic, recipients...)
+Permission223=Validate emailings (allows sending)
+Permission229=Delete emailings
+Permission237=View recipients and info
+Permission238=Manually send mailings
+Permission239=Delete mailings after validation or sent
+Permission241=Read categories
+Permission242=Create/modify categories
+Permission243=Delete categories
+Permission244=See the contents of the hidden categories
+Permission251=Read other users and groups
+PermissionAdvanced251=Read other users
+Permission252=Read permissions of other users
+Permission253=Create/modify other users, groups and permissions
+PermissionAdvanced253=Create/modify internal/external users and permissions
+Permission254=Create/modify external users only
+Permission255=Modify other users password
+Permission256=Delete or disable other users
+Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission271=Read CA
+Permission272=Read invoices
+Permission273=Issue invoices
+Permission281=Read contacts
+Permission282=Create/modify contacts
+Permission283=Delete contacts
+Permission286=Export contacts
+Permission291=Read tariffs
+Permission292=Set permissions on the tariffs
+Permission293=Modify customer's tariffs
+Permission300=Read barcodes
+Permission301=Create/modify barcodes
+Permission302=Delete barcodes
+Permission311=Read services
+Permission312=Assign service/subscription to contract
+Permission331=Read bookmarks
+Permission332=Create/modify bookmarks
+Permission333=Delete bookmarks
+Permission341=Read its own permissions
+Permission342=Create/modify his own user information
+Permission343=Modify his own password
+Permission344=Modify its own permissions
+Permission351=Read groups
+Permission352=Read groups permissions
+Permission353=Create/modify groups
+Permission354=Delete or disable groups
+Permission358=Export users
+Permission401=Read discounts
+Permission402=Create/modify discounts
+Permission403=Validate discounts
+Permission404=Delete discounts
+Permission430=Use Debug Bar
+Permission511=Read payments of salaries
+Permission512=Create/modify payments of salaries
+Permission514=Delete payments of salaries
+Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
+Permission531=Read services
+Permission532=Create/modify services
+Permission534=Delete services
+Permission536=See/manage hidden services
+Permission538=Export services
+Permission650=Read Bills of Materials
+Permission651=Create/Update Bills of Materials
+Permission652=Delete Bills of Materials
+Permission701=Read donations
+Permission702=Create/modify donations
+Permission703=Delete donations
+Permission771=Read expense reports (yours and your subordinates)
+Permission772=Create/modify expense reports
+Permission773=Delete expense reports
+Permission774=Read all expense reports (even for user not subordinates)
+Permission775=Approve expense reports
+Permission776=Pay expense reports
+Permission779=Export expense reports
+Permission1001=Read stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
+Permission1004=Read stock movements
+Permission1005=Create/modify stock movements
+Permission1101=Read delivery receipts
+Permission1102=Create/modify delivery receipts
+Permission1104=Validate delivery receipts
+Permission1109=Delete delivery receipts
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
+Permission1181=Read suppliers
+Permission1182=Read purchase orders
+Permission1183=Create/modify purchase orders
+Permission1184=Validate purchase orders
+Permission1185=Approve purchase orders
+Permission1186=Order purchase orders
+Permission1187=Acknowledge receipt of purchase orders
+Permission1188=Delete purchase orders
+Permission1190=Approve (second approval) purchase orders
+Permission1201=Get result of an export
+Permission1202=Create/Modify an export
+Permission1231=Read vendor invoices
+Permission1232=Create/modify vendor invoices
+Permission1233=Validate vendor invoices
+Permission1234=Delete vendor invoices
+Permission1235=Send vendor invoices by email
+Permission1236=Export vendor invoices, attributes and payments
+Permission1237=Export purchase orders and their details
+Permission1251=Run mass imports of external data into database (data load)
+Permission1321=Export customer invoices, attributes and payments
+Permission1322=Reopen a paid bill
+Permission1421=Export sales orders and attributes
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
+Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
+Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
+Permission2411=Read actions (events or tasks) of others
+Permission2412=Create/modify actions (events or tasks) of others
+Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
+Permission2501=Read/Download documents
+Permission2502=Download documents
+Permission2503=Submit or delete documents
+Permission2515=Setup documents directories
+Permission2801=Use FTP client in read mode (browse and download only)
+Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=Delete leave requests
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20006=Admin leave requests (setup and update balance)
+Permission20007=Approve leave requests
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
+Permission50101=Use Point of Sale
+Permission50201=Read transactions
+Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define fiscal periods. Validate transactions and close fiscal periods.
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
+Permission54001=Print
+Permission55001=Read polls
+Permission55002=Create/modify polls
+Permission59001=Read commercial margins
+Permission59002=Define commercial margins
+Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
+DictionaryCompanyType=Third-party types
+DictionaryCompanyJuridicalType=Third-party legal entities
+DictionaryProspectLevel=Prospect potential
+DictionaryCanton=States/Provinces
+DictionaryRegion=Regions
+DictionaryCountry=Countries
+DictionaryCurrency=Currencies
+DictionaryCivility=Honorific titles
+DictionaryActions=Types of agenda events
+DictionarySocialContributions=Types of social or fiscal taxes
+DictionaryVAT=VAT Rates or Sales Tax Rates
+DictionaryRevenueStamp=Amount of tax stamps
+DictionaryPaymentConditions=Payment Terms
+DictionaryPaymentModes=Payment Modes
+DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Website - Type of website pages/containers
+DictionaryEcotaxe=Ecotax (WEEE)
+DictionaryPaperFormat=Paper formats
+DictionaryFormatCards=Card formats
+DictionaryFees=Expense report - Types of expense report lines
+DictionarySendingMethods=Shipping methods
+DictionaryStaff=Number of Employees
+DictionaryAvailability=Delivery delay
+DictionaryOrderMethods=Ordering methods
+DictionarySource=Origin of proposals/orders
+DictionaryAccountancyCategory=Personalized groups for reports
+DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
+DictionaryEMailTemplates=Email Templates
+DictionaryUnits=Units
+DictionaryMeasuringUnits=Measuring Units
+DictionarySocialNetworks=Social Networks
+DictionaryProspectStatus=Prospect status
+DictionaryHolidayTypes=Types of leave
+DictionaryOpportunityStatus=Lead status for project/lead
+DictionaryExpenseTaxCat=Expense report - Transportation categories
+DictionaryExpenseTaxRange=Expense report - Range by transportation category
+SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
+BackToModuleList=Back to Module list
+BackToDictionaryList=Back to Dictionaries list
+TypeOfRevenueStamp=Type of tax stamp
+VATManagement=Sales Tax Management
+VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
+##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
+LTRate=Rate
+LocalTax1IsNotUsed=Do not use second tax
+LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
+LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax1Management=Second type of tax
+LocalTax1IsUsedExample=
+LocalTax1IsNotUsedExample=
+LocalTax2IsNotUsed=Do not use third tax
+LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
+LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax2Management=Third type of tax
+LocalTax2IsUsedExample=
+LocalTax2IsNotUsedExample=
+LocalTax1ManagementES=RE Management
+LocalTax1IsUsedDescES=The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
+LocalTax1IsNotUsedDescES=By default the proposed RE is 0. End of rule.
+LocalTax1IsUsedExampleES=In Spain they are professionals subject to some specific sections of the Spanish IAE.
+LocalTax1IsNotUsedExampleES=In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
+LocalTax2ManagementES=IRPF Management
+LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
+LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
+LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
+LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
+UseRevenueStamp=Use a tax stamp
+UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+CalcLocaltax=Reports on local taxes
+CalcLocaltax1=Sales - Purchases
+CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
+CalcLocaltax2=Purchases
+CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
+CalcLocaltax3=Sales
+CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+LabelUsedByDefault=Label used by default if no translation can be found for code
+LabelOnDocuments=Label on documents
+LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of a configuration constant
+NbOfDays=No. of days
+AtEndOfMonth=At end of month
+CurrentNext=Current/Next
+Offset=Offset
+AlwaysActive=Always active
+Upgrade=Upgrade
+MenuUpgrade=Upgrade / Extend
+AddExtensionThemeModuleOrOther=Deploy/install external app/module
+WebServer=Web server
+DocumentRootServer=Web server's root directory
+DataRootServer=Data files directory
+IP=IP
+Port=Port
+VirtualServerName=Virtual server name
+OS=OS
+PhpWebLink=Web-Php link
+Server=Server
+Database=Database
+DatabaseServer=Database host
+DatabaseName=Database name
+DatabasePort=Database port
+DatabaseUser=Database user
+DatabasePassword=Database password
+Tables=Tables
+TableName=Table name
+NbOfRecord=No. of records
+Host=Server
+DriverType=Driver type
+SummarySystem=System information summary
+SummaryConst=List of all Dolibarr setup parameters
+MenuCompanySetup=Company/Organization
+DefaultMenuManager= Standard menu manager
+DefaultMenuSmartphoneManager=Smartphone menu manager
+Skin=Skin theme
+DefaultSkin=Default skin theme
+MaxSizeList=Max length for list
+DefaultMaxSizeList=Default max length for lists
+DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
+MessageOfDay=Message of the day
+MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
+PermanentLeftSearchForm=Permanent search form on left menu
+DefaultLanguage=Default language
+EnableMultilangInterface=Enable multilanguage support
+EnableShowLogo=Show the company logo in the menu
+CompanyInfo=Company/Organization
+CompanyIds=Company/Organization identities
+CompanyName=Name
+CompanyAddress=Address
+CompanyZip=Zip
+CompanyTown=Town
+CompanyCountry=Country
+CompanyCurrency=Main currency
+CompanyObject=Object of the company
+IDCountry=ID country
+Logo=Logo
+LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
+LogoSquarred=Logo (squarred)
+LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
+DoNotSuggestPaymentMode=Do not suggest
+NoActiveBankAccountDefined=No active bank account defined
+OwnerOfBankAccount=Owner of bank account %s
+BankModuleNotActive=Bank accounts module not enabled
+ShowBugTrackLink=Show link "<strong>%s</strong>"
+Alerts=Alerts
+DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
+DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
+Delays_MAIN_DELAY_ACTIONS_TODO=Planned events (agenda events) not completed
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time
+Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Order not processed
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
+Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation
+Delays_MAIN_DELAY_MEMBERS=Delayed membership fee
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
+Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
+Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
+SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
+SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
+SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
+SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescription5=Other Setup menu entries manage optional parameters.
+LogEvents=Security audit events
+Audit=Audit
+InfoDolibarr=About Dolibarr
+InfoBrowser=About Browser
+InfoOS=About OS
+InfoWebServer=About Web Server
+InfoDatabase=About Database
+InfoPHP=About PHP
+InfoPerf=About Performances
+BrowserName=Browser name
+BrowserOS=Browser OS
+ListOfSecurityEvents=List of Dolibarr security events
+SecurityEventsPurged=Security events purged
+LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
+SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
+SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
+AccountantFileNumber=Accountant code
+DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
+AvailableModules=Available app/modules
+ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
+SessionTimeOut=Time out for session
+SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
+TriggersAvailable=Available triggers
+TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
+TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
+TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
+TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
+TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
+GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
+DictionaryDesc=Insert all reference data. You can add your values to the default.
+ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
+MiscellaneousDesc=All other security related parameters are defined here.
+LimitsSetup=Limits/Precision setup
+LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
+MAIN_MAX_DECIMALS_UNIT=Max. decimals for unit prices
+MAIN_MAX_DECIMALS_TOT=Max. decimals for total prices
+MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
+UnitPriceOfProduct=Net unit price of a product
+TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
+ParameterActiveForNextInputOnly=Parameter effective for next input only
+NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page.
+NoEventFoundWithCriteria=No security event has been found for this search criteria.
+SeeLocalSendMailSetup=See your local sendmail setup
+BackupDesc=A <b>complete</b> backup of a Dolibarr installation requires two steps.
+BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
+BackupDesc3=Backup the structure and contents of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
+BackupDescX=The archived directory should be stored in a secure place.
+BackupDescY=The generated dump file should be stored in a secure place.
+BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
+RestoreDesc=To restore a Dolibarr backup, two steps are required.
+RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
+RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
+RestoreMySQL=MySQL import
+ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+PreviousDumpFiles=Existing backup files
+PreviousArchiveFiles=Existing archive files
+WeekStartOnDay=First day of the week
+RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
+YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
+YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
+DownloadMoreSkins=More skins to download
+SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+ShowProfIdInAddress=Show professional id with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+TranslationUncomplete=Partial translation
+MAIN_DISABLE_METEO=Disable meteorological view
+MeteoStdMod=Standard mode
+MeteoStdModEnabled=Standard mode enabled
+MeteoPercentageMod=Percentage mode
+MeteoPercentageModEnabled=Percentage mode enabled
+MeteoUseMod=Click to use %s
+TestLoginToAPI=Test login to API
+ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
+ExternalAccess=External/Internet Access
+MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet)
+MAIN_PROXY_HOST=Proxy server: Name/Address
+MAIN_PROXY_PORT=Proxy server: Port
+MAIN_PROXY_USER=Proxy server: Login/User
+MAIN_PROXY_PASS=Proxy server: Password
+DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+ExtraFields=Complementary attributes
+ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsThirdParties=Complementary attributes (third party)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
+ExtraFieldsMember=Complementary attributes (member)
+ExtraFieldsMemberType=Complementary attributes (member type)
+ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
+ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
+ExtraFieldsSupplierOrders=Complementary attributes (orders)
+ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
+ExtraFieldsProject=Complementary attributes (projects)
+ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldHasWrongValue=Attribute %s has a wrong value.
+AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
+PathToDocuments=Path to documents
+PathDirectory=Directory
+SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+YouMustEnableOneModule=You must at least enable 1 module
+ClassNotFoundIntoPathWarning=Class %s not found in PHP path
+YesInSummer=Yes in summer
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
+SuhosinSessionEncrypt=Session storage encrypted by Suhosin
+ConditionIsCurrently=Condition is currently %s
+YouUseBestDriver=You use driver %s which is the best driver currently available.
+YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+SearchOptim=Search optimization
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
+BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
+AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
+AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
+FieldEdition=Edition of field %s
+FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
+GetBarCode=Get barcode
+NumberingModules=Numbering models
+##### Module password generation
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
+PasswordGenerationPerso=Return a password according to your personally defined configuration.
+SetupPerso=According to your configuration
+PasswordPatternDesc=Password pattern description
+##### Users setup #####
+RuleForGeneratedPasswords=Rules to generate and validate passwords
+DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
+UsersSetup=Users module setup
+UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
+##### HRM setup #####
+HRMSetup=HRM module setup
+##### Company setup #####
+CompanySetup=Companies module setup
+CompanyCodeChecker=Options for automatic generation of customer/vendor codes
+AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
+NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
+NotificationsDescUser=* per user, one user at a time.
+NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
+NotificationsDescGlobal=* or by setting global email addresses in this setup page.
+ModelModules=Document Templates
+DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
+WatermarkOnDraft=Watermark on draft document
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
+CompanyIdProfChecker=Rules for Professional IDs
+MustBeUnique=Must be unique?
+MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
+MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
+WebDavServer=Root URL of %s server: %s
+##### Webcal setup #####
+WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
+##### Invoices #####
+BillsSetup=Invoices module setup
+BillsNumberingModule=Invoices and credit notes numbering model
+BillsPDFModules=Invoice documents models
+BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
+PaymentsPDFModules=Payment documents models
+ForceInvoiceDate=Force invoice date to validation date
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
+SuggestPaymentByChequeToAddress=Suggest payment by check to
+FreeLegalTextOnInvoices=Free text on invoices
+WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
+PaymentsNumberingModule=Payments numbering model
+SuppliersPayment=Vendor payments
+SupplierPaymentSetup=Vendor payments setup
+##### Proposals #####
+PropalSetup=Commercial proposals module setup
+ProposalsNumberingModules=Commercial proposal numbering models
+ProposalsPDFModules=Commercial proposal documents models
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+FreeLegalTextOnProposal=Free text on commercial proposals
+WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
+##### Suppliers Orders #####
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
+##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+OrdersSetup=Sales Orders management setup
+OrdersNumberingModules=Orders numbering models
+OrdersModelModule=Order documents models
+FreeLegalTextOnOrders=Free text on orders
+WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+##### Interventions #####
+InterventionsSetup=Interventions module setup
+FreeLegalTextOnInterventions=Free text on intervention documents
+FicheinterNumberingModules=Intervention numbering models
+TemplatePDFInterventions=Intervention card documents models
+WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+##### Contracts #####
+ContractsSetup=Contracts/Subscriptions module setup
+ContractsNumberingModules=Contracts numbering modules
+TemplatePDFContracts=Contracts documents models
+FreeLegalTextOnContracts=Free text on contracts
+WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+##### Members #####
+MembersSetup=Members module setup
+MemberMainOptions=Main options
+AdherentLoginRequired= Manage a Login for each member
+AdherentMailRequired=Email required to create a new member
+MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
+MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+##### LDAP setup #####
+LDAPSetup=LDAP Setup
+LDAPGlobalParameters=Global parameters
+LDAPUsersSynchro=Users
+LDAPGroupsSynchro=Groups
+LDAPContactsSynchro=Contacts
+LDAPMembersSynchro=Members
+LDAPMembersTypesSynchro=Members types
+LDAPSynchronization=LDAP synchronisation
+LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
+LDAPToDolibarr=LDAP -> Dolibarr
+DolibarrToLDAP=Dolibarr -> LDAP
+LDAPNamingAttribute=Key in LDAP
+LDAPSynchronizeUsers=Organization of users in LDAP
+LDAPSynchronizeGroups=Organization of groups in LDAP
+LDAPSynchronizeContacts=Organization of contacts in LDAP
+LDAPSynchronizeMembers=Organization of foundation's members in LDAP
+LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
+LDAPPrimaryServer=Primary server
+LDAPSecondaryServer=Secondary server
+LDAPServerPort=Server port
+LDAPServerPortExample=Default port: 389
+LDAPServerProtocolVersion=Protocol version
+LDAPServerUseTLS=Use TLS
+LDAPServerUseTLSExample=Your LDAP server use TLS
+LDAPServerDn=Server DN
+LDAPAdminDn=Administrator DN
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
+LDAPPassword=Administrator password
+LDAPUserDn=Users' DN
+LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
+LDAPGroupDn=Groups' DN
+LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
+LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
+LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
+LDAPDnSynchroActive=Users and groups synchronization
+LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
+LDAPDnContactActive=Contacts' synchronization
+LDAPDnContactActiveExample=Activated/Unactivated synchronization
+LDAPDnMemberActive=Members' synchronization
+LDAPDnMemberActiveExample=Activated/Unactivated synchronization
+LDAPDnMemberTypeActive=Members types' synchronization
+LDAPDnMemberTypeActiveExample=Activated/Unactivated synchronization
+LDAPContactDn=Dolibarr contacts' DN
+LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
+LDAPMemberDn=Dolibarr members DN
+LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
+LDAPMemberObjectClassList=List of objectClass
+LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPMemberTypeDn=Dolibarr members types DN
+LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeObjectClassList=List of objectClass
+LDAPMemberTypeObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPUserObjectClassList=List of objectClass
+LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPGroupObjectClassList=List of objectClass
+LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPContactObjectClassList=List of objectClass
+LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPTestConnect=Test LDAP connection
+LDAPTestSynchroContact=Test contacts synchronization
+LDAPTestSynchroUser=Test user synchronization
+LDAPTestSynchroGroup=Test group synchronization
+LDAPTestSynchroMember=Test member synchronization
+LDAPTestSynchroMemberType=Test member type synchronization
+LDAPTestSearch= Test a LDAP search
+LDAPSynchroOK=Synchronization test successful
+LDAPSynchroKO=Failed synchronization test
+LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
+LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
+LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
+LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPSetupForVersion3=LDAP server configured for version 3
+LDAPSetupForVersion2=LDAP server configured for version 2
+LDAPDolibarrMapping=Dolibarr Mapping
+LDAPLdapMapping=LDAP Mapping
+LDAPFieldLoginUnix=Login (unix)
+LDAPFieldLoginExample=Example: uid
+LDAPFilterConnection=Search filter
+LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPFieldLoginSamba=Login (samba, activedirectory)
+LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldFullname=Full name
+LDAPFieldFullnameExample=Example: cn
+LDAPFieldPasswordNotCrypted=Password not encrypted
+LDAPFieldPasswordCrypted=Password encrypted
+LDAPFieldPasswordExample=Example: userPassword
+LDAPFieldCommonNameExample=Example: cn
+LDAPFieldName=Name
+LDAPFieldNameExample=Example: sn
+LDAPFieldFirstName=First name
+LDAPFieldFirstNameExample=Example: givenName
+LDAPFieldMail=Email address
+LDAPFieldMailExample=Example: mail
+LDAPFieldPhone=Professional phone number
+LDAPFieldPhoneExample=Example: telephonenumber
+LDAPFieldHomePhone=Personal phone number
+LDAPFieldHomePhoneExample=Example: homephone
+LDAPFieldMobile=Cellular phone
+LDAPFieldMobileExample=Example: mobile
+LDAPFieldFax=Fax number
+LDAPFieldFaxExample=Example: facsimiletelephonenumber
+LDAPFieldAddress=Street
+LDAPFieldAddressExample=Example: street
+LDAPFieldZip=Zip
+LDAPFieldZipExample=Example: postalcode
+LDAPFieldTown=Town
+LDAPFieldTownExample=Example: l
+LDAPFieldCountry=Country
+LDAPFieldDescription=Description
+LDAPFieldDescriptionExample=Example: description
+LDAPFieldNotePublic=Public Note
+LDAPFieldNotePublicExample=Example: publicnote
+LDAPFieldGroupMembers= Group members
+LDAPFieldGroupMembersExample= Example: uniqueMember
+LDAPFieldBirthdate=Birthdate
+LDAPFieldCompany=Company
+LDAPFieldCompanyExample=Example: o
+LDAPFieldSid=SID
+LDAPFieldSidExample=Example: objectsid
+LDAPFieldEndLastSubscription=Date of subscription end
+LDAPFieldTitle=Job position
+LDAPFieldTitleExample=Example: title
+LDAPFieldGroupid=Group id
+LDAPFieldGroupidExample=Exemple : gidnumber
+LDAPFieldUserid=User id
+LDAPFieldUseridExample=Exemple : uidnumber
+LDAPFieldHomedirectory=Home directory
+LDAPFieldHomedirectoryExample=Exemple : homedirectory
+LDAPFieldHomedirectoryprefix=Home directory prefix
+LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
+LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
+LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
+LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
+LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
+LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
+LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use thoose values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all thoose schemas loaded.
+ForANonAnonymousAccess=For an authenticated access (for a write access for example)
+PerfDolibarr=Performance setup/optimizing report
+YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
+NotInstalled=Not installed, so your server is not slowed down by this.
+ApplicativeCache=Applicative cache
+MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
+MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
+MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
+OPCodeCache=OPCode cache
+NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
+HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
+FilesOfTypeCached=Files of type %s are cached by HTTP server
+FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
+FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
+FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
+CacheByServer=Cache by server
+CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
+CacheByClient=Cache by browser
+CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
+DefaultCreateForm=Default values (to use on forms)
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
+DefaultMandatory=Mandatory form fields
+##### Products #####
+ProductSetup=Products module setup
+ServiceSetup=Services module setup
+ProductServiceSetup=Products and Services modules setup
+NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
+ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in the language of the third party
+UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
+SetDefaultBarcodeTypeProducts=Default barcode type to use for products
+SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
+ProductCodeChecker= Module for product code generation and checking (product or service)
+ProductOtherConf= Product / Service configuration
+IsNotADir=is not a directory!
+##### Syslog #####
+SyslogSetup=Logs module setup
+SyslogOutput=Logs outputs
+SyslogFacility=Facility
+SyslogLevel=Level
+SyslogFilename=File name and path
+YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
+ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
+OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+##### Donations #####
+DonationsSetup=Donation module setup
+DonationsReceiptModel=Template of donation receipt
+##### Barcode #####
+BarcodeSetup=Barcode setup
+PaperFormatModule=Print format module
+BarcodeEncodeModule=Barcode encoding type
+CodeBarGenerator=Barcode generator
+ChooseABarCode=No generator defined
+FormatNotSupportedByGenerator=Format not supported by this generator
+BarcodeDescEAN8=Barcode of type EAN8
+BarcodeDescEAN13=Barcode of type EAN13
+BarcodeDescUPC=Barcode of type UPC
+BarcodeDescISBN=Barcode of type ISBN
+BarcodeDescC39=Barcode of type C39
+BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
+GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
+BarcodeInternalEngine=Internal engine
+BarCodeNumberManager=Manager to auto define barcode numbers
+##### Prelevements #####
+WithdrawalsSetup=Setup of module Direct Debit payments
+##### ExternalRSS #####
+ExternalRSSSetup=External RSS imports setup
+NewRSS=New RSS Feed
+RSSUrl=RSS URL
+RSSUrlExample=An interesting RSS feed
+##### Mailing #####
+MailingSetup=EMailing module setup
+MailingEMailFrom=Sender email (From) for emails sent by emailing module
+MailingEMailError=Return Email (Errors-to) for emails with errors
+MailingDelay=Seconds to wait after sending next message
+##### Notification #####
+NotificationSetup=Email Notification module setup
+NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
+FixedEmailTarget=Recipient
+##### Sendings #####
+SendingsSetup=Shipping module setup
+SendingsReceiptModel=Sending receipt model
+SendingsNumberingModules=Sendings numbering modules
+SendingsAbility=Support shipping sheets for customer deliveries
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
+FreeLegalTextOnShippings=Free text on shipments
+##### Deliveries #####
+DeliveryOrderNumberingModules=Products deliveries receipt numbering module
+DeliveryOrderModel=Products deliveries receipt model
+DeliveriesOrderAbility=Support products deliveries receipts
+FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+##### FCKeditor #####
+AdvancedEditor=Advanced editor
+ActivateFCKeditor=Activate advanced editor for:
+FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
+FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
+FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
+FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
+FCKeditorForTicket=WYSIWIG creation/edition for tickets
+##### Stock #####
+StockSetup=Stock module setup
+IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+##### Menu #####
+MenuDeleted=Menu deleted
+Menus=Menus
+TreeMenuPersonalized=Personalized menus
+NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
+NewMenu=New menu
+Menu=Selection of menu
+MenuHandler=Menu handler
+MenuModule=Source module
+HideUnauthorizedMenu= Hide unauthorized menus (gray)
+DetailId=Id menu
+DetailMenuHandler=Menu handler where to show new menu
+DetailMenuModule=Module name if menu entry come from a module
+DetailType=Type of menu (top or left)
+DetailTitre=Menu label or label code for translation
+DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
+DetailEnabled=Condition to show or not entry
+DetailRight=Condition to display unauthorized grey menus
+DetailLangs=Lang file name for label code translation
+DetailUser=Intern / Extern / All
+Target=Target
+DetailTarget=Target for links (_blank top opens a new window)
+DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
+ModifMenu=Menu change
+DeleteMenu=Delete menu entry
+ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
+FailedToInitializeMenu=Failed to initialize menu
+##### Tax #####
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
+OptionVatMode=VAT due
+OptionVATDefault=Standard basis
+OptionVATDebitOption=Accrual basis
+OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
+OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
+SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option:
+OnDelivery=On delivery
+OnPayment=On payment
+OnInvoice=On invoice
+SupposedToBePaymentDate=Payment date used
+SupposedToBeInvoiceDate=Invoice date used
+Buy=Buy
+Sell=Sell
+InvoiceDateUsed=Invoice date used
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
+AccountancyCode=Accounting Code
+AccountancyCodeSell=Sale account. code
+AccountancyCodeBuy=Purchase account. code
+##### Agenda #####
+AgendaSetup=Events and agenda module setup
+PasswordTogetVCalExport=Key to authorize export link
+PastDelayVCalExport=Do not export event older than
+AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
+AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
+AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
+AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
+ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+##### Point Of Sale (CashDesk) #####
+CashDesk=Point of Sale
+CashDeskSetup=Point of Sales module setup
+CashDeskThirdPartyForSell=Default generic third party to use for sales
+CashDeskBankAccountForSell=Default account to use to receive cash payments
+CashDeskBankAccountForCheque=Default account to use to receive payments by check
+CashDeskBankAccountForCB=Default account to use to receive payments by credit cards
+CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with module Serial/Lot management (currently active) so stock decrease is disabled.
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
+CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
+CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
+CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+##### Bookmark #####
+BookmarkSetup=Bookmark module setup
+BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
+NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
+##### WebServices #####
+WebServicesSetup=Webservices module setup
+WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
+WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
+EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
+ApiExporerIs=You can explore and test the APIs at URL
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+##### Bank #####
+BankSetupModule=Bank module setup
+FreeLegalTextOnChequeReceipts=Free text on check receipts
+BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
+BankOrderGlobal=General
+BankOrderGlobalDesc=General display order
+BankOrderES=Spanish
+BankOrderESDesc=Spanish display order
+ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+##### Multicompany #####
+MultiCompanySetup=Multi-company module setup
+##### Suppliers #####
+SuppliersSetup=Vendor module setup
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
+SuppliersInvoiceModel=Complete template of Vendor Invoice
+SuppliersInvoiceNumberingModel=Vendor invoices numbering models
+IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
+##### GeoIPMaxmind #####
+GeoIPMaxmindSetup=GeoIP Maxmind module setup
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
+NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
+YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
+YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
+TestGeoIPResult=Test of a conversion IP -> country
+##### Projects #####
+ProjectsNumberingModules=Projects numbering module
+ProjectsSetup=Project module setup
+ProjectsModelModule=Project reports document model
+TasksNumberingModules=Tasks numbering module
+TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
+##### ECM (GED) #####
+##### Fiscal Year #####
+AccountingPeriods=Accounting periods
+AccountingPeriodCard=Accounting period
+NewFiscalYear=New accounting period
+OpenFiscalYear=Open accounting period
+CloseFiscalYear=Close accounting period
+DeleteFiscalYear=Delete accounting period
+ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
+ShowFiscalYear=Show accounting period
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
+Format=Format
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
+IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
+ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
+ExpenseReportNumberingModules=Expense reports numbering module
+NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerUser=List of automatic notifications per user*
+ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
+ListOfFixedNotifications=List of automatic fixed notifications
+GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+Threshold=Threshold
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
+SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
+SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
+HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+TextTitleColor=Text color of Page title
+LinkColor=Color of links
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
+MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
+NbAddedAutomatically=Number of days added to counters of users (automatically) each month
+EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+Enter0or1=Enter 0 or 1
+UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
+PositionIntoComboList=Position of line into combo lists
+SellTaxRate=Sale tax rate
+RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
+UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
+OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
+TemplateForElement=This template record is dedicated to which element
+TypeOfTemplate=Type of template
+TemplateIsVisibleByOwnerOnly=Template is visible to owner only
+VisibleEverywhere=Visible everywhere
+VisibleNowhere=Visible nowhere
+FixTZ=TimeZone fix
+FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
+ExpectedChecksum=Expected Checksum
+CurrentChecksum=Current Checksum
+ExpectedSize=Expected size
+CurrentSize=Current size
+ForcedConstants=Required constant values
+MailToSendProposal=Customer proposals
+MailToSendOrder=Sales orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Shipments
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracts
+MailToThirdparty=Third parties
+MailToMember=Members
+MailToUser=Users
+MailToProject=Projects page
+ByDefaultInList=Show by default on list view
+YouUseLastStableVersion=You use the latest stable version
+TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
+TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
+SeeChangeLog=See ChangeLog file (english only)
+AllPublishers=All publishers
+UnknownPublishers=Unknown publishers
+AddRemoveTabs=Add or remove tabs
+AddDataTables=Add object tables
+AddDictionaries=Add dictionaries tables
+AddData=Add objects or dictionaries data
+AddBoxes=Add widgets
+AddSheduledJobs=Add scheduled jobs
+AddHooks=Add hooks
+AddTriggers=Add triggers
+AddMenus=Add menus
+AddPermissions=Add permissions
+AddExportProfiles=Add export profiles
+AddImportProfiles=Add import profiles
+AddOtherPagesOrServices=Add other pages or services
+AddModels=Add document or numbering templates
+AddSubstitutions=Add keys substitutions
+DetectionNotPossible=Detection not possible
+UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
+ListOfAvailableAPIs=List of available APIs
+activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
+CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
+UserHasNoPermissions=This user has no permissions defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
+BaseCurrency=Reference currency of the company (go into setup of company to change this)
+WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
+WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
+MAIN_PDF_MARGIN_LEFT=Left margin on PDF
+MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
+MAIN_PDF_MARGIN_TOP=Top margin on PDF
+MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+NothingToSetup=There is no specific setup required for this module.
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+RemoveSpecialChars=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
+GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
+GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
+HelpOnTooltip=Help text to show on tooltip
+HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
+YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
+ChartLoaded=Chart of account loaded
+SocialNetworkSetup=Setup of module Social Networks
+EnableFeatureFor=Enable features for <strong>%s</strong>
+VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+EmailCollector=Email collector
+EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
+NewEmailCollector=New Email Collector
+EMailHost=Host of email IMAP server
+MailboxSourceDirectory=Mailbox source directory
+MailboxTargetDirectory=Mailbox target directory
+EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
+CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
+DateLastCollectResult=Date latest collect tried
+DateLastcollectResultOk=Date latest collect successfull
+LastResult=Latest result
+EmailCollectorConfirmCollectTitle=Email collect confirmation
+EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
+NoNewEmailToProcess=No new email (matching filters) to process
+NothingProcessed=Nothing done
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+RecordEvent=Record email event
+CreateLeadAndThirdParty=Create lead (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CodeLastResult=Latest result code
+NbOfEmailsInInbox=Number of emails in source directory
+LoadThirdPartyFromName=Load third party searching on %s (load only)
+LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+WithDolTrackingID=Dolibarr Reference found in Message ID
+WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+FormatZip=Zip
+MainMenuCode=Menu entry code (mainmenu)
+ECMAutoTree=Show automatic ECM tree
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OpeningHours=Opening hours
+OpeningHoursDesc=Enter here the regular opening hours of your company.
+ResourceSetup=Configuration of Resource module
+UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
+EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
+ConfirmUnactivation=Confirm module reset
+OnMobileOnly=On small screen (smartphone) only
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
+Protanopia=Protanopia
+Deuteranopes=Deuteranopes
+Tritanopes=Tritanopes
+ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
+DefaultCustomerType=Default thirdparty type for "New customer" creation form
+ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
+RootCategoryForProductsToSell=Root category of products to sell
+RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
+DebugBar=Debug Bar
+DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
+DebugBarSetup=DebugBar Setup
+GeneralOptions=General Options
+LogsLinesNumber=Number of lines to show on logs tab
+UseDebugBar=Use the debug bar
+DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
+WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
+ModuleActivated=Module %s is activated and slows the interface
+EXPORTS_SHARE_MODELS=Export models are share with everybody
+ExportSetup=Setup of module Export
+ImportSetup=Setup of module Import
+InstanceUniqueID=Unique ID of the instance
+SmallerThan=Smaller than
+LargerThan=Larger than
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
+EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
+RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
+AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+IPListExample=127.0.0.1 192.168.0.2 [::1]
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
+FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
+EmailTemplate=Template for email
+EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
+FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/am_ET/agenda.lang b/htdocs/langs/am_ET/agenda.lang
new file mode 100644
index 00000000000..2031241d2c9
--- /dev/null
+++ b/htdocs/langs/am_ET/agenda.lang
@@ -0,0 +1,154 @@
+# Dolibarr language file - Source file is en_US - agenda
+IdAgenda=ID event
+Actions=Events
+Agenda=Agenda
+TMenuAgenda=Agenda
+Agendas=Agendas
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+ActionsOwnedByShort=Owner
+AffectedTo=Assigned to
+Event=Event
+Events=Events
+EventsNb=Number of events
+ListOfActions=List of events
+EventReports=Event reports
+Location=Location
+ToUserOfGroup=To any user in group
+EventOnFullDay=Event on all day(s)
+MenuToDoActions=All incomplete events
+MenuDoneActions=All terminated events
+MenuToDoMyActions=My incomplete events
+MenuDoneMyActions=My terminated events
+ListOfEvents=List of events (internal calendar)
+ActionsAskedBy=Events reported by
+ActionsToDoBy=Events assigned to
+ActionsDoneBy=Events done by
+ActionAssignedTo=Event assigned to
+ViewCal=Month view
+ViewDay=Day view
+ViewWeek=Week view
+ViewPerUser=Per user view
+ViewPerType=Per type view
+AutoActions= Automatic filling
+AgendaAutoActionDesc= Here you may define events which you want Dolibarr to create automatically  in Agenda. If nothing is checked, only manual actions will be included in logs and displayed in Agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
+AgendaSetupOtherDesc= This page provides options to allow the export of your Dolibarr events into an external calendar (Thunderbird, Google Calendar etc...)
+AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
+ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
+EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
+##### Agenda event labels #####
+NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
+ContractValidatedInDolibarr=Contract %s validated
+CONTRACT_DELETEInDolibarr=Contract %s deleted
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
+InvoiceDeleteDolibarr=Invoice %s deleted
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+MemberValidatedInDolibarr=Member %s validated
+MemberModifiedInDolibarr=Member %s modified
+MemberResiliatedInDolibarr=Member %s terminated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
+ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
+ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
+ShipmentDeletedInDolibarr=Shipment %s deleted
+OrderCreatedInDolibarr=Order %s created
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
+OrderApprovedInDolibarr=Order %s approved
+OrderRefusedInDolibarr=Order %s refused
+OrderBackToDraftInDolibarr=Order %s go back to draft status
+ProposalSentByEMail=Commercial proposal %s sent by email
+ContractSentByEMail=Contract %s sent by email
+OrderSentByEMail=Sales order %s sent by email
+InvoiceSentByEMail=Customer invoice %s sent by email
+SupplierOrderSentByEMail=Purchase order %s sent by email
+ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
+SupplierInvoiceSentByEMail=Vendor invoice %s sent by email
+ShippingSentByEMail=Shipment %s sent by email
+ShippingValidated= Shipment %s validated
+InterventionSentByEMail=Intervention %s sent by email
+ProposalDeleted=Proposal deleted
+OrderDeleted=Order deleted
+InvoiceDeleted=Invoice deleted
+DraftInvoiceDeleted=Draft invoice deleted
+PRODUCT_CREATEInDolibarr=Product %s created
+PRODUCT_MODIFYInDolibarr=Product %s modified
+PRODUCT_DELETEInDolibarr=Product %s deleted
+HOLIDAY_CREATEInDolibarr=Request for leave %s created
+HOLIDAY_MODIFYInDolibarr=Request for leave %s modified
+HOLIDAY_APPROVEInDolibarr=Request for leave %s approved
+HOLIDAY_VALIDATEInDolibarr=Request for leave %s validated
+HOLIDAY_DELETEInDolibarr=Request for leave %s deleted
+EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created
+EXPENSE_REPORT_VALIDATEInDolibarr=Expense report %s validated
+EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved
+EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted
+EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused
+PROJECT_CREATEInDolibarr=Project %s created
+PROJECT_MODIFYInDolibarr=Project %s modified
+PROJECT_DELETEInDolibarr=Project %s deleted
+TICKET_CREATEInDolibarr=Ticket %s created
+TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
+TICKET_CLOSEInDolibarr=Ticket %s closed
+TICKET_DELETEInDolibarr=Ticket %s deleted
+BOM_VALIDATEInDolibarr=BOM validated
+BOM_UNVALIDATEInDolibarr=BOM unvalidated
+BOM_CLOSEInDolibarr=BOM disabled
+BOM_REOPENInDolibarr=BOM reopen
+BOM_DELETEInDolibarr=BOM deleted
+MRP_MO_VALIDATEInDolibarr=MO validated
+MRP_MO_PRODUCEDInDolibarr=MO produced
+MRP_MO_DELETEInDolibarr=MO deleted
+##### End agenda events #####
+AgendaModelModule=Document templates for event
+DateActionStart=Start date
+DateActionEnd=End date
+AgendaUrlOptions1=You can also add following parameters to filter output:
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
+AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
+AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
+AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaHideBirthdayEvents=Hide birthdays of contacts
+Busy=Busy
+ExportDataset_event1=List of agenda events
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
+# External Sites ical
+ExportCal=Export calendar
+ExtSites=Import external calendars
+ExtSitesEnableThisTool=Show external calendars (defined in global setup) in Agenda. Does not affect external calendars defined by users.
+ExtSitesNbOfAgenda=Number of calendars
+AgendaExtNb=Calendar no. %s
+ExtSiteUrlAgenda=URL to access .ical file
+ExtSiteNoLabel=No Description
+VisibleTimeRange=Visible time range
+VisibleDaysRange=Visible days range
+AddEvent=Create event
+MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
+RepeatEvent=Repeat event
+EveryWeek=Every week
+EveryMonth=Every month
+DayOfMonth=Day of month
+DayOfWeek=Day of week
+DateStartPlusOne=Date start + 1 hour
diff --git a/htdocs/langs/am_ET/assets.lang b/htdocs/langs/am_ET/assets.lang
new file mode 100644
index 00000000000..ef04723c6c2
--- /dev/null
+++ b/htdocs/langs/am_ET/assets.lang
@@ -0,0 +1,65 @@
+# Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+Assets = Assets
+NewAsset = New asset
+AccountancyCodeAsset = Accounting code (asset)
+AccountancyCodeDepreciationAsset = Accounting code (depreciation asset account)
+AccountancyCodeDepreciationExpense = Accounting code (depreciation expense account)
+NewAssetType=New asset type
+AssetsTypeSetup=Asset type setup
+AssetTypeModified=Asset type modified
+AssetType=Asset type
+AssetsLines=Assets
+DeleteType=Delete
+DeleteAnAssetType=Delete an asset type
+ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
+ShowTypeCard=Show type '%s'
+
+# Module label 'ModuleAssetsName'
+ModuleAssetsName = Assets
+# Module description 'ModuleAssetsDesc'
+ModuleAssetsDesc = Assets description
+
+#
+# Admin page
+#
+AssetsSetup = Assets setup
+Settings = Settings
+AssetsSetupPage = Assets setup page
+ExtraFieldsAssetsType = Complementary attributes (Asset type)
+AssetsType=Asset type
+AssetsTypeId=Asset type id
+AssetsTypeLabel=Asset type label
+AssetsTypes=Assets types
+
+#
+# Menu
+#
+MenuAssets = Assets
+MenuNewAsset = New asset
+MenuTypeAssets = Type assets
+MenuListAssets = List
+MenuNewTypeAssets = New
+MenuListTypeAssets = List
+
+#
+# Module
+#
+NewAssetType=New asset type
+NewAsset=New asset
diff --git a/htdocs/langs/am_ET/banks.lang b/htdocs/langs/am_ET/banks.lang
new file mode 100644
index 00000000000..e54239e9fb2
--- /dev/null
+++ b/htdocs/langs/am_ET/banks.lang
@@ -0,0 +1,175 @@
+# Dolibarr language file - Source file is en_US - banks
+Bank=Bank
+MenuBankCash=Banks | Cash
+MenuVariousPayment=Miscellaneous payments
+MenuNewVariousPayment=New Miscellaneous payment
+BankName=Bank name
+FinancialAccount=Account
+BankAccount=Bank account
+BankAccounts=Bank accounts
+BankAccountsAndGateways=Bank accounts | Gateways
+ShowAccount=Show Account
+AccountRef=Financial account ref
+AccountLabel=Financial account label
+CashAccount=Cash account
+CashAccounts=Cash accounts
+CurrentAccounts=Current accounts
+SavingAccounts=Savings accounts
+ErrorBankLabelAlreadyExists=Financial account label already exists
+BankBalance=Balance
+BankBalanceBefore=Balance before
+BankBalanceAfter=Balance after
+BalanceMinimalAllowed=Minimum allowed balance
+BalanceMinimalDesired=Minimum desired balance
+InitialBankBalance=Initial balance
+EndBankBalance=End balance
+CurrentBalance=Current balance
+FutureBalance=Future balance
+ShowAllTimeBalance=Show balance from start
+AllTime=From start
+Reconciliation=Reconciliation
+RIB=Bank Account Number
+IBAN=IBAN number
+BIC=BIC/SWIFT code
+SwiftValid=BIC/SWIFT valid
+SwiftVNotalid=BIC/SWIFT not valid
+IbanValid=BAN valid
+IbanNotValid=BAN not valid
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
+AccountStatement=Account statement
+AccountStatementShort=Statement
+AccountStatements=Account statements
+LastAccountStatements=Last account statements
+IOMonthlyReporting=Monthly reporting
+BankAccountDomiciliation=Bank address
+BankAccountCountry=Account country
+BankAccountOwner=Account owner name
+BankAccountOwnerAddress=Account owner address
+RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
+CreateAccount=Create account
+NewBankAccount=New account
+NewFinancialAccount=New financial account
+MenuNewFinancialAccount=New financial account
+EditFinancialAccount=Edit account
+LabelBankCashAccount=Bank or cash label
+AccountType=Account type
+BankType0=Savings account
+BankType1=Current or credit card account
+BankType2=Cash account
+AccountsArea=Accounts area
+AccountCard=Account card
+DeleteAccount=Delete account
+ConfirmDeleteAccount=Are you sure you want to delete this account?
+Account=Account
+BankTransactionByCategories=Bank entries by categories
+BankTransactionForCategory=Bank entries for category <b>%s</b>
+RemoveFromRubrique=Remove link with category
+RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
+ListBankTransactions=List of bank entries
+IdTransaction=Transaction ID
+BankTransactions=Bank entries
+BankTransaction=Bank entry
+ListTransactions=List entries
+ListTransactionsByCategory=List entries/category
+TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
+Conciliable=Can be reconciled
+Conciliate=Reconcile
+Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
+ReconciliationLate=Reconciliation late
+IncludeClosedAccount=Include closed accounts
+OnlyOpenedAccount=Only open accounts
+AccountToCredit=Account to credit
+AccountToDebit=Account to debit
+DisableConciliation=Disable reconciliation feature for this account
+ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated entry
+StatusAccountOpened=Open
+StatusAccountClosed=Closed
+AccountIdShort=Number
+LineRecord=Transaction
+AddBankRecord=Add entry
+AddBankRecordLong=Add entry manually
+Conciliated=Reconciled
+ConciliatedBy=Reconciled by
+DateConciliating=Reconcile date
+BankLineConciliated=Entry reconciled with bank receipt
+Reconciled=Reconciled
+NotReconciled=Not reconciled
+CustomerInvoicePayment=Customer payment
+SupplierInvoicePayment=Vendor payment
+SubscriptionPayment=Subscription payment
+WithdrawalPayment=Debit payment order
+SocialContributionPayment=Social/fiscal tax payment
+BankTransfer=Bank transfer
+BankTransfers=Bank transfers
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferFrom=From
+TransferTo=To
+TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
+CheckTransmitter=Transmitter
+ValidateCheckReceipt=Validate this check receipt?
+ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done?
+DeleteCheckReceipt=Delete this check receipt?
+ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
+BankChecks=Bank checks
+BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
+ShowCheckReceipt=Show check deposit receipt
+NumberOfCheques=No. of check
+DeleteTransaction=Delete entry
+ConfirmDeleteTransaction=Are you sure you want to delete this entry?
+ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
+BankMovements=Movements
+PlannedTransactions=Planned entries
+Graph=Graphics
+ExportDataset_banque_1=Bank entries and account statement
+ExportDataset_banque_2=Deposit slip
+TransactionOnTheOtherAccount=Transaction on the other account
+PaymentNumberUpdateSucceeded=Payment number updated successfully
+PaymentNumberUpdateFailed=Payment number could not be updated
+PaymentDateUpdateSucceeded=Payment date updated successfully
+PaymentDateUpdateFailed=Payment date could not be updated
+Transactions=Transactions
+BankTransactionLine=Bank entry
+AllAccounts=All bank and cash accounts
+BackToAccount=Back to account
+ShowAllAccounts=Show for all accounts
+FutureTransaction=Future transaction. Unable to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+EventualyAddCategory=Eventually, specify a category in which to classify the records
+ToConciliate=To reconcile?
+ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
+DefaultRIB=Default BAN
+AllRIB=All BAN
+LabelRIB=BAN Label
+NoBANRecord=No BAN record
+DeleteARib=Delete BAN record
+ConfirmDeleteRib=Are you sure you want to delete this BAN record?
+RejectCheck=Check returned
+ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
+RejectCheckDate=Date the check was returned
+CheckRejected=Check returned
+CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
+VariousPayments=Miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
+SEPAMandate=SEPA mandate
+YourSEPAMandate=Your SEPA mandate
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
+BankColorizeMovement=Colorize movements
+BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
+BankColorizeMovementName1=Background color for debit movement
+BankColorizeMovementName2=Background color for credit movement
diff --git a/htdocs/langs/am_ET/bills.lang b/htdocs/langs/am_ET/bills.lang
new file mode 100644
index 00000000000..9f11d8ecf87
--- /dev/null
+++ b/htdocs/langs/am_ET/bills.lang
@@ -0,0 +1,574 @@
+# Dolibarr language file - Source file is en_US - bills
+Bill=Invoice
+Bills=Invoices
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Vendor invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid vendor invoices
+BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsLate=Late payments
+BillsStatistics=Customers invoices statistics
+BillsStatisticsSuppliers=Vendors invoices statistics
+DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
+DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
+DisabledBecauseNotErasable=Disabled because cannot be erased
+InvoiceStandard=Standard invoice
+InvoiceStandardAsk=Standard invoice
+InvoiceStandardDesc=This kind of invoice is the common invoice.
+InvoiceDeposit=Down payment invoice
+InvoiceDepositAsk=Down payment invoice
+InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
+InvoiceProForma=Proforma invoice
+InvoiceProFormaAsk=Proforma invoice
+InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
+InvoiceReplacement=Replacement invoice
+InvoiceReplacementAsk=Replacement invoice for invoice
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceAvoir=Credit note
+InvoiceAvoirAsk=Credit note to correct invoice
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
+invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+ReplaceInvoice=Replace invoice %s
+ReplacementInvoice=Replacement invoice
+ReplacedByInvoice=Replaced by invoice %s
+ReplacementByInvoice=Replaced by invoice
+CorrectInvoice=Correct invoice %s
+CorrectionInvoice=Correction invoice
+UsedByInvoice=Used to pay invoice %s
+ConsumedBy=Consumed by
+NotConsumed=Not consumed
+NoReplacableInvoice=No replaceable invoices
+NoInvoiceToCorrect=No invoice to correct
+InvoiceHasAvoir=Was source of one or several credit notes
+CardBill=Invoice card
+PredefinedInvoices=Predefined Invoices
+Invoice=Invoice
+PdfInvoiceTitle=Invoice
+Invoices=Invoices
+InvoiceLine=Invoice line
+InvoiceCustomer=Customer invoice
+CustomerInvoice=Customer invoice
+CustomersInvoices=Customers invoices
+SupplierInvoice=Vendor invoice
+SuppliersInvoices=Vendors invoices
+SupplierBill=Vendor invoice
+SupplierBills=suppliers invoices
+Payment=Payment
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
+Payments=Payments
+PaymentsBack=Refunds
+paymentInInvoiceCurrency=in invoices currency
+PaidBack=Paid back
+DeletePayment=Delete payment
+ConfirmDeletePayment=Are you sure you want to delete this payment?
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+SupplierPayments=Vendor payments
+ReceivedPayments=Received payments
+ReceivedCustomersPayments=Payments received from customers
+PayedSuppliersPayments=Payments paid to vendors
+ReceivedCustomersPaymentsToValid=Received customers payments to validate
+PaymentsReportsForYear=Payments reports for %s
+PaymentsReports=Payments reports
+PaymentsAlreadyDone=Payments already done
+PaymentsBackAlreadyDone=Refunds already done
+PaymentRule=Payment rule
+PaymentMode=Payment Type
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
+IdPaymentMode=Payment Type (id)
+CodePaymentMode=Payment Type (code)
+LabelPaymentMode=Payment Type (label)
+PaymentModeShort=Payment Type
+PaymentTerm=Payment Term
+PaymentConditions=Payment Terms
+PaymentConditionsShort=Payment Terms
+PaymentAmount=Payment amount
+PaymentHigherThanReminderToPay=Payment higher than reminder to pay
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
+ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
+ClassifyPaidPartially=Classify 'Paid partially'
+ClassifyCanceled=Classify 'Abandoned'
+ClassifyClosed=Classify 'Closed'
+ClassifyUnBilled=Classify 'Unbilled'
+CreateBill=Create Invoice
+CreateCreditNote=Create credit note
+AddBill=Create invoice or credit note
+AddToDraftInvoices=Add to draft invoice
+DeleteBill=Delete invoice
+SearchACustomerInvoice=Search for a customer invoice
+SearchASupplierInvoice=Search for a vendor invoice
+CancelBill=Cancel an invoice
+SendRemindByMail=Send reminder by email
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
+ConvertToReduc=Mark as credit available
+ConvertExcessReceivedToReduc=Convert excess received into available credit
+ConvertExcessPaidToReduc=Convert excess paid into available discount
+EnterPaymentReceivedFromCustomer=Enter payment received from customer
+EnterPaymentDueToCustomer=Make payment due to customer
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+PriceBase=Price base
+BillStatus=Invoice status
+StatusOfGeneratedInvoices=Status of generated invoices
+BillStatusDraft=Draft (needs to be validated)
+BillStatusPaid=Paid
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
+BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusCanceled=Abandoned
+BillStatusValidated=Validated (needs to be paid)
+BillStatusStarted=Started
+BillStatusNotPaid=Not paid
+BillStatusNotRefunded=Not refunded
+BillStatusClosedUnpaid=Closed (unpaid)
+BillStatusClosedPaidPartially=Paid (partially)
+BillShortStatusDraft=Draft
+BillShortStatusPaid=Paid
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
+BillShortStatusConverted=Paid
+BillShortStatusCanceled=Abandoned
+BillShortStatusValidated=Validated
+BillShortStatusStarted=Started
+BillShortStatusNotPaid=Not paid
+BillShortStatusNotRefunded=Not refunded
+BillShortStatusClosedUnpaid=Closed
+BillShortStatusClosedPaidPartially=Paid (partially)
+PaymentStatusToValidShort=To validate
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
+ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
+ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
+ErrorBillNotFound=Invoice %s does not exist
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorDiscountAlreadyUsed=Error, discount already used
+ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
+ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
+ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
+BillFrom=From
+BillTo=To
+ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=Template / Recurring invoice
+NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
+FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
+NotARecurringInvoiceTemplate=Not a recurring template invoice
+NewBill=New invoice
+LastBills=Latest %s invoices
+LatestTemplateInvoices=Latest %s template invoices
+LatestCustomerTemplateInvoices=Latest %s customer template invoices
+LatestSupplierTemplateInvoices=Latest %s vendor template invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s vendor invoices
+AllBills=All invoices
+AllCustomerTemplateInvoices=All template invoices
+OtherBills=Other invoices
+DraftBills=Draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Vendor draft invoices
+Unpaid=Unpaid
+ErrorNoPaymentDefined=Error No payment defined
+ConfirmDeleteBill=Are you sure you want to delete this invoice?
+ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
+ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
+ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
+ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
+ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
+ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
+ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
+ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyAbandonReasonOther=Other
+ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
+ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
+ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
+ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
+ValidateBill=Validate invoice
+UnvalidateBill=Unvalidate invoice
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
+AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
+AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
+UseSituationInvoices=Allow situation invoice
+UseSituationInvoicesCreditNote=Allow situation invoice credit note
+Retainedwarranty=Retained warranty
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
+RetainedwarrantyDefaultPercent=Retained warranty default percent
+RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
+RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
+ToPayOn=To pay on %s
+toPayOn=to pay on %s
+RetainedWarranty=Retained Warranty
+PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
+DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
+setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
+setretainedwarranty=Set retained warranty
+setretainedwarrantyDateLimit=Set retained warranty date limit
+RetainedWarrantyDateLimit=Retained warranty date limit
+RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
+AlreadyPaid=Already paid
+AlreadyPaidBack=Already paid back
+AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
+Abandoned=Abandoned
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to refund
+Rest=Pending
+AmountExpected=Amount claimed
+ExcessReceived=Excess received
+ExcessPaid=Excess paid
+EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
+NoDraftBills=No draft invoices
+NoOtherDraftBills=No other draft invoices
+NoDraftInvoices=No draft invoices
+RefBill=Invoice ref
+ToBill=To bill
+RemainderToBill=Remainder to bill
+SendBillByMail=Send invoice by email
+SendReminderBillByMail=Send reminder by email
+RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
+MenuToValid=To valid
+DateMaxPayment=Payment due on
+DateInvoice=Invoice date
+DatePointOfTax=Point of tax
+NoInvoice=No invoice
+ClassifyBill=Classify invoice
+SupplierBillsToPay=Unpaid vendor invoices
+CustomerBillsUnpaid=Unpaid customer invoices
+NonPercuRecuperable=Non-recoverable
+SetConditions=Set Payment Terms
+SetMode=Set Payment Type
+SetRevenuStamp=Set revenue stamp
+Billed=Billed
+RecurringInvoices=Recurring invoices
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
+CustomersInvoicesAndPayments=Customer invoices and payments
+ExportDataset_invoice_1=Customer invoices and invoice details
+ExportDataset_invoice_2=Customer invoices and payments
+ProformaBill=Proforma Bill:
+Reduction=Reduction
+ReductionShort=Disc.
+Reductions=Reductions
+ReductionsShort=Disc.
+Discounts=Discounts
+AddDiscount=Create discount
+AddRelativeDiscount=Create relative discount
+EditRelativeDiscount=Edit relative discount
+AddGlobalDiscount=Create absolute discount
+EditGlobalDiscounts=Edit absolute discounts
+AddCreditNote=Create credit note
+ShowDiscount=Show discount
+ShowReduc=Show the discount
+ShowSourceInvoice=Show the source invoice
+RelativeDiscount=Relative discount
+GlobalDiscount=Global discount
+CreditNote=Credit note
+CreditNotes=Credit notes
+CreditNotesOrExcessReceived=Credit notes or excess received
+Deposit=Down payment
+Deposits=Down payments
+DiscountFromCreditNote=Discount from credit note %s
+DiscountFromDeposit=Down payments from invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
+AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
+CreditNoteDepositUse=Invoice must be validated to use this kind of credits
+NewGlobalDiscount=New absolute discount
+NewRelativeDiscount=New relative discount
+DiscountType=Discount type
+NoteReason=Note/Reason
+ReasonDiscount=Reason
+DiscountOfferedBy=Granted by
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Vendors discounts
+BillAddress=Bill address
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
+IdSocialContribution=Social/fiscal tax payment id
+PaymentId=Payment id
+PaymentRef=Payment ref.
+InvoiceId=Invoice id
+InvoiceRef=Invoice ref.
+InvoiceDateCreation=Invoice creation date
+InvoiceStatus=Invoice status
+InvoiceNote=Invoice note
+InvoicePaid=Invoice paid
+InvoicePaidCompletely=Paid completely
+InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
+OrderBilled=Order billed
+DonationPaid=Donation paid
+PaymentNumber=Payment number
+RemoveDiscount=Remove discount
+WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty)
+InvoiceNotChecked=No invoice selected
+ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
+DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
+NbOfPayments=No. of payments
+SplitDiscount=Split discount in two
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
+ConfirmRemoveDiscount=Are you sure you want to remove this discount?
+RelatedBill=Related invoice
+RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related vendor invoices
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoices already exist
+MergingPDFTool=Merging PDF tool
+AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
+PaymentNote=Payment note
+ListOfPreviousSituationInvoices=List of previous situation invoices
+ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+FrequencyUnit=Frequency unit
+toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
+NextDateToExecution=Date for next invoice generation
+NextDateToExecutionShort=Date next gen.
+DateLastGeneration=Date of latest generation
+DateLastGenerationShort=Date latest gen.
+MaxPeriodNumber=Max. number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
+InvoiceAutoValidate=Validate invoices automatically
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not reached yet
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
+WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
+WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
+ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
+# PaymentConditions
+Statut=Status
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShort30D=30 days
+PaymentCondition30D=30 days
+PaymentConditionShort30DENDMONTH=30 days of month-end
+PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort60D=60 days
+PaymentCondition60D=60 days
+PaymentConditionShort60DENDMONTH=60 days of month-end
+PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShortPT_DELIVERY=Delivery
+PaymentConditionPT_DELIVERY=On delivery
+PaymentConditionShortPT_ORDER=Order
+PaymentConditionPT_ORDER=On order
+PaymentConditionShortPT_5050=50-50
+PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+PaymentConditionShort10D=10 days
+PaymentCondition10D=10 days
+PaymentConditionShort10DENDMONTH=10 days of month-end
+PaymentCondition10DENDMONTH=Within 10 days following the end of the month
+PaymentConditionShort14D=14 days
+PaymentCondition14D=14 days
+PaymentConditionShort14DENDMONTH=14 days of month-end
+PaymentCondition14DENDMONTH=Within 14 days following the end of the month
+FixAmount=Fixed amount - 1 line with label '%s'
+VarAmount=Variable amount (%% tot.)
+VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
+VarAmountAllLines=Variable amount (%% tot.) - all same lines
+# PaymentType
+PaymentTypeVIR=Bank transfer
+PaymentTypeShortVIR=Bank transfer
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
+PaymentTypeLIQ=Cash
+PaymentTypeShortLIQ=Cash
+PaymentTypeCB=Credit card
+PaymentTypeShortCB=Credit card
+PaymentTypeCHQ=Check
+PaymentTypeShortCHQ=Check
+PaymentTypeTIP=TIP (Documents against Payment)
+PaymentTypeShortTIP=TIP Payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
+PaymentTypeTRA=Bank draft
+PaymentTypeShortTRA=Draft
+PaymentTypeFAC=Factor
+PaymentTypeShortFAC=Factor
+BankDetails=Bank details
+BankCode=Bank code
+DeskCode=Branch code
+BankAccountNumber=Account number
+BankAccountNumberKey=Checksum
+Residence=Address
+IBANNumber=IBAN account number
+IBAN=IBAN
+BIC=BIC/SWIFT
+BICNumber=BIC/SWIFT code
+ExtraInfos=Extra infos
+RegulatedOn=Regulated on
+ChequeNumber=Check N°
+ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
+ChequeMaker=Check/Transfer transmitter
+ChequeBank=Bank of Check
+CheckBank=Check
+NetToBePaid=Net to be paid
+PhoneNumber=Tel
+FullPhoneNumber=Telephone
+TeleFax=Fax
+PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration.
+IntracommunityVATNumber=Intra-Community VAT ID
+PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
+PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
+SendTo=sent to
+PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
+VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
+LawApplicationPart1=By application of the law 80.335 of 12/05/80
+LawApplicationPart2=the goods remain the property of
+LawApplicationPart3=the seller until full payment of
+LawApplicationPart4=their price.
+LimitedLiabilityCompanyCapital=SARL with Capital of
+UseLine=Apply
+UseDiscount=Use discount
+UseCredit=Use credit
+UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit
+MenuChequeDeposits=Check Deposits
+MenuCheques=Checks
+MenuChequesReceipts=Check receipts
+NewChequeDeposit=New deposit
+ChequesReceipts=Check receipts
+ChequesArea=Check deposits area
+ChequeDeposits=Check deposits
+Cheques=Checks
+DepositId=Id deposit
+NbCheque=Number of checks
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices
+ShowUnpaidAll=Show all unpaid invoices
+ShowUnpaidLateOnly=Show late unpaid invoices only
+PaymentInvoiceRef=Payment invoice %s
+ValidateInvoice=Validate invoice
+ValidateInvoices=Validate invoices
+Cash=Cash
+Reported=Delayed
+DisabledBecausePayments=Not possible since there are some payments
+CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+ExpectedToPay=Expected payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
+PayedByThisPayment=Paid by this payment
+ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
+ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
+ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
+ToMakePayment=Pay
+ToMakePaymentBack=Pay back
+ListOfYourUnpaidInvoices=List of unpaid invoices
+NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
+RevenueStamp=Tax stamp
+YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
+YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
+PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
+TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+EarlyClosingReason=Early closing reason
+EarlyClosingComment=Early closing note
+##### Types de contacts #####
+TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
+TypeContact_facture_external_BILLING=Customer invoice contact
+TypeContact_facture_external_SHIPPING=Customer shipping contact
+TypeContact_facture_external_SERVICE=Customer service contact
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
+TypeContact_invoice_supplier_external_BILLING=Vendor invoice contact
+TypeContact_invoice_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+# Situation invoices
+InvoiceFirstSituationAsk=First situation invoice
+InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
+InvoiceSituation=Situation invoice
+InvoiceSituationAsk=Invoice following the situation
+InvoiceSituationDesc=Create a new situation following an already existing one
+SituationAmount=Situation invoice amount(net)
+SituationDeduction=Situation subtraction
+ModifyAllLines=Modify all lines
+CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
+NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
+DisabledBecauseNotLastInCycle=The next situation already exists.
+DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
+CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
+NoSituations=No open situations
+InvoiceSituationLast=Final and general invoice
+PDFCrevetteSituationNumber=Situation N°%s
+PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
+PDFCrevetteSituationInvoiceTitle=Situation invoice
+PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
+TotalSituationInvoice=Total situation
+invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
+updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
+CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
+BillCreated=%s bill(s) created
+StatusOfGeneratedDocuments=Status of document generation
+DoNotGenerateDoc=Do not generate document file
+AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/am_ET/blockedlog.lang b/htdocs/langs/am_ET/blockedlog.lang
new file mode 100644
index 00000000000..5afae6e9e53
--- /dev/null
+++ b/htdocs/langs/am_ET/blockedlog.lang
@@ -0,0 +1,54 @@
+BlockedLog=Unalterable Logs
+Field=Field
+BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525).
+Fingerprints=Archived events and fingerprints
+FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed).
+CompanyInitialKey=Company initial key (hash of genesis block)
+BrowseBlockedLog=Unalterable logs
+ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
+ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
+DownloadBlockChain=Download fingerprints
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
+OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
+AddedByAuthority=Stored into remote authority
+NotAddedByAuthorityYet=Not yet stored into remote authority
+ShowDetails=Show stored details
+logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
+logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
+logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
+logPAYMENT_ADD_TO_BANK=Payment added to bank
+logPAYMENT_CUSTOMER_CREATE=Customer payment created
+logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
+logDONATION_PAYMENT_CREATE=Donation payment created
+logDONATION_PAYMENT_DELETE=Donation payment logical deletion
+logBILL_PAYED=Customer invoice paid
+logBILL_UNPAYED=Customer invoice set unpaid
+logBILL_VALIDATE=Customer invoice validated
+logBILL_SENTBYMAIL=Customer invoice send by mail
+logBILL_DELETE=Customer invoice logically deleted
+logMODULE_RESET=Module BlockedLog was disabled
+logMODULE_SET=Module BlockedLog was enabled
+logDON_VALIDATE=Donation validated
+logDON_MODIFY=Donation modified
+logDON_DELETE=Donation logical deletion
+logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
+logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
+logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
+logCASHCONTROL_VALIDATE=Cash fence recording
+BlockedLogBillDownload=Customer invoice download
+BlockedLogBillPreview=Customer invoice preview
+BlockedlogInfoDialog=Log Details
+ListOfTrackedEvents=List of tracked events
+Fingerprint=Fingerprint
+DownloadLogCSV=Export archived logs (CSV)
+logDOC_PREVIEW=Preview of a validated document in order to print or download
+logDOC_DOWNLOAD=Download of a validated document in order to print or send
+DataOfArchivedEvent=Full datas of archived event
+ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
+BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
+BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
+OnlyNonValid=Non-valid
+TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
+RestrictYearToExport=Restrict month / year to export
diff --git a/htdocs/langs/am_ET/bookmarks.lang b/htdocs/langs/am_ET/bookmarks.lang
new file mode 100644
index 00000000000..87466cadcfa
--- /dev/null
+++ b/htdocs/langs/am_ET/bookmarks.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - marque pages
+AddThisPageToBookmarks=Add current page to bookmarks
+Bookmark=Bookmark
+Bookmarks=Bookmarks
+ListOfBookmarks=List of bookmarks
+EditBookmarks=List/edit bookmarks
+NewBookmark=New bookmark
+ShowBookmark=Show bookmark
+OpenANewWindow=Open a new tab
+ReplaceWindow=Replace current tab
+BookmarkTargetNewWindowShort=New tab
+BookmarkTargetReplaceWindowShort=Current tab
+BookmarkTitle=Bookmark name
+UrlOrLink=URL
+BehaviourOnClick=Behaviour when a bookmark URL is selected
+CreateBookmark=Create bookmark
+SetHereATitleForLink=Set a name for the bookmark
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if the linked page should open in the current tab or a new tab
+BookmarksManagement=Bookmarks management
+BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/am_ET/boxes.lang b/htdocs/langs/am_ET/boxes.lang
new file mode 100644
index 00000000000..bd62684421a
--- /dev/null
+++ b/htdocs/langs/am_ET/boxes.lang
@@ -0,0 +1,102 @@
+# Dolibarr language file - Source file is en_US - boxes
+BoxLoginInformation=Login Information
+BoxLastRssInfos=RSS Information
+BoxLastProducts=Latest %s Products/Services
+BoxProductsAlertStock=Stock alerts for products
+BoxLastProductsInContract=Latest %s contracted products/services
+BoxLastSupplierBills=Latest Vendor invoices
+BoxLastCustomerBills=Latest Customer invoices
+BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
+BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
+BoxLastProposals=Latest commercial proposals
+BoxLastProspects=Latest modified prospects
+BoxLastCustomers=Latest modified customers
+BoxLastSuppliers=Latest modified suppliers
+BoxLastCustomerOrders=Latest sales orders
+BoxLastActions=Latest actions
+BoxLastContracts=Latest contracts
+BoxLastContacts=Latest contacts/addresses
+BoxLastMembers=Latest members
+BoxFicheInter=Latest interventions
+BoxCurrentAccounts=Open accounts balance
+BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleLastRssInfos=Latest %s news from %s
+BoxTitleLastProducts=Products/Services: last %s modified
+BoxTitleProductsAlertStock=Products: stock alert
+BoxTitleLastSuppliers=Latest %s recorded suppliers
+BoxTitleLastModifiedSuppliers=Vendors: last %s modified
+BoxTitleLastModifiedCustomers=Customers: last %s modified
+BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
+BoxTitleLastModifiedProspects=Prospects: last %s modified
+BoxTitleLastModifiedMembers=Latest %s members
+BoxTitleLastFicheInter=Latest %s modified interventions
+BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
+BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
+BoxTitleCurrentAccounts=Open Accounts: balances
+BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
+BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
+BoxMyLastBookmarks=Bookmarks: latest %s
+BoxOldestExpiredServices=Oldest active expired services
+BoxLastExpiredServices=Latest %s oldest contacts with active expired services
+BoxTitleLastActionsToDo=Latest %s actions to do
+BoxTitleLastContracts=Latest %s modified contracts
+BoxTitleLastModifiedDonations=Latest %s modified donations
+BoxTitleLastModifiedExpenses=Latest %s modified expense reports
+BoxTitleLatestModifiedBoms=Latest %s modified BOMs
+BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
+FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
+LastRefreshDate=Latest refresh date
+NoRecordedBookmarks=No bookmarks defined.
+ClickToAdd=Click here to add.
+NoRecordedCustomers=No recorded customers
+NoRecordedContacts=No recorded contacts
+NoActionsToDo=No actions to do
+NoRecordedOrders=No recorded sales orders
+NoRecordedProposals=No recorded proposals
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid vendor invoices
+NoModifiedSupplierBills=No recorded vendor invoices
+NoRecordedProducts=No recorded products/services
+NoRecordedProspects=No recorded prospects
+NoContractedProducts=No products/services contracted
+NoRecordedContracts=No recorded contracts
+NoRecordedInterventions=No recorded interventions
+BoxLatestSupplierOrders=Latest purchase orders
+BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
+NoSupplierOrder=No recorded purchase order
+BoxCustomersInvoicesPerMonth=Customer Invoices per month
+BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
+BoxCustomersOrdersPerMonth=Sales Orders per month
+BoxSuppliersOrdersPerMonth=Vendor Orders per month
+BoxProposalsPerMonth=Proposals per month
+NoTooLowStockProducts=No products are under the low stock limit
+BoxProductDistribution=Products/Services Distribution
+ForObject=On %s
+BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
+BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
+BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
+BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
+BoxTitleLastModifiedPropals=Latest %s modified proposals
+ForCustomersInvoices=Customers invoices
+ForCustomersOrders=Customers orders
+ForProposals=Proposals
+LastXMonthRolling=The latest %s month rolling
+ChooseBoxToAdd=Add widget to your dashboard
+BoxAdded=Widget was added in your dashboard
+BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
+BoxLastManualEntries=Last manual entries in accountancy
+BoxTitleLastManualEntries=%s latest manual entries
+NoRecordedManualEntries=No manual entries record in accountancy
+BoxSuspenseAccount=Count accountancy operation with suspense account
+BoxTitleSuspenseAccount=Number of unallocated lines
+NumberOfLinesInSuspenseAccount=Number of line in suspense account
+SuspenseAccountNotDefined=Suspense account isn't defined
+BoxLastCustomerShipments=Last customer shipments
+BoxTitleLastCustomerShipments=Latest %s customer shipments
+NoRecordedShipments=No recorded customer shipment
diff --git a/htdocs/langs/am_ET/cashdesk.lang b/htdocs/langs/am_ET/cashdesk.lang
new file mode 100644
index 00000000000..0903a3d10bc
--- /dev/null
+++ b/htdocs/langs/am_ET/cashdesk.lang
@@ -0,0 +1,110 @@
+# Language file - Source file is en_US - cashdesk
+CashDeskMenu=Point of sale
+CashDesk=Point of sale
+CashDeskBankCash=Bank account (cash)
+CashDeskBankCB=Bank account (card)
+CashDeskBankCheque=Bank account (cheque)
+CashDeskWarehouse=Warehouse
+CashdeskShowServices=Selling services
+CashDeskProducts=Products
+CashDeskStock=Stock
+CashDeskOn=on
+CashDeskThirdParty=Third party
+ShoppingCart=Shopping cart
+NewSell=New sell
+AddThisArticle=Add this article
+RestartSelling=Go back on sell
+SellFinished=Sale complete
+PrintTicket=Print ticket
+SendTicket=Send ticket
+NoProductFound=No article found
+ProductFound=product found
+NoArticle=No article
+Identification=Identification
+Article=Article
+Difference=Difference
+TotalTicket=Total ticket
+NoVAT=No VAT for this sale
+Change=Excess received
+BankToPay=Account for payment
+ShowCompany=Show company
+ShowStock=Show warehouse
+DeleteArticle=Click to remove this article
+FilterRefOrLabelOrBC=Search (Ref/Label)
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
+DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of Sale
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
+Receipt=Receipt
+Header=Header
+Footer=Footer
+AmountAtEndOfPeriod=Amount at end of period (day, month or year)
+TheoricalAmount=Theorical amount
+RealAmount=Real amount
+CashFence=Cash fence
+CashFenceDone=Cash fence done for the period
+NbOfInvoices=Nb of invoices
+Paymentnumpad=Type of Pad to enter payment
+Numberspad=Numbers Pad
+BillsCoinsPad=Coins and banknotes Pad
+DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
+TakeposNeedsCategories=TakePOS needs product categories to work
+OrderNotes=Order Notes
+CashDeskBankAccountFor=Default account to use for payments in
+NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
+PrintCustomerOnReceipts=Print customer on tickets|receipts
+EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
+ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
+POSTerminal=POS Terminal
+POSModule=POS Module
+BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
+CustomReceipt=Custom Receipt
+ReceiptName=Receipt Name
+ProductSupplements=Product Supplements
+SupplementCategory=Supplement category
+ColorTheme=Color theme
+Colorful=Colorful
+HeadBar=Head Bar
+SortProductField=Field for sorting products
+Browser=Browser
+BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
+TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
+PrintMethod=Print method
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ByTerminal=By terminal
+TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for POS sales
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
+BarRestaurant=Bar Restaurant
+AutoOrder=Customer auto order
diff --git a/htdocs/langs/am_ET/categories.lang b/htdocs/langs/am_ET/categories.lang
new file mode 100644
index 00000000000..30bace0574c
--- /dev/null
+++ b/htdocs/langs/am_ET/categories.lang
@@ -0,0 +1,89 @@
+# Dolibarr language file - Source file is en_US - categories
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+RubriquesTransactions=Tags/Categories of transactions
+categories=tags/categories
+NoCategoryYet=No tag/category of this type created
+In=In
+AddIn=Add in
+modify=modify
+Classify=Classify
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Vendors tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
+UsersCategoriesArea=Users tags/categories area
+SubCats=Sub-categories
+CatList=List of tags/categories
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
+NoSubCat=No subcategory.
+SubCatOf=Subcategory
+FoundCats=Found tags/categories
+ImpossibleAddCat=Impossible to add the tag/category %s
+WasAddedSuccessfully=<b>%s</b> was added successfully.
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+ProductIsInCategories=Product/service is linked to following tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
+ClassifyInCategory=Add to tag/category
+NotCategorized=Without tag/category
+CategoryExistsAtSameLevel=This category already exists with this ref
+ContentsVisibleByAllShort=Contents visible by all
+ContentsNotVisibleByAllShort=Contents not visible by all
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Vendors tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
+SuppliersCategoriesShort=Vendors tags/categories
+CustomersCategoriesShort=Customers tags/categories
+ProspectsCategoriesShort=Prospects tags/categories
+CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
+AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
+UsersCategoriesShort=Users tags/categories
+StockCategoriesShort=Warehouse tags/categories
+ThisCategoryHasNoItems=This category does not contain any items.
+CategId=Tag/category id
+CatSupList=List of vendor tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatContactsLinks=Links between contacts/addresses and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
+DeleteFromCat=Remove from tags/category
+ExtraFieldsCategories=Complementary attributes
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
+CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
+AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show tag/category
+ByDefaultInList=By default in list
+ChooseCategory=Choose category
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/am_ET/commercial.lang b/htdocs/langs/am_ET/commercial.lang
new file mode 100644
index 00000000000..10c536e0d48
--- /dev/null
+++ b/htdocs/langs/am_ET/commercial.lang
@@ -0,0 +1,80 @@
+# Dolibarr language file - Source file is en_US - commercial
+Commercial=Commerce
+CommercialArea=Commerce area
+Customer=Customer
+Customers=Customers
+Prospect=Prospect
+Prospects=Prospects
+DeleteAction=Delete an event
+NewAction=New event
+AddAction=Create event
+AddAnAction=Create an event
+AddActionRendezVous=Create a Rendez-vous event
+ConfirmDeleteAction=Are you sure you want to delete this event?
+CardAction=Event card
+ActionOnCompany=Related company
+ActionOnContact=Related contact
+TaskRDVWith=Meeting with %s
+ShowTask=Show task
+ShowAction=Show event
+ActionsReport=Events report
+ThirdPartiesOfSaleRepresentative=Third parties with sales representative
+SaleRepresentativesOfThirdParty=Sales representatives of third party
+SalesRepresentative=Sales representative
+SalesRepresentatives=Sales representatives
+SalesRepresentativeFollowUp=Sales representative (follow-up)
+SalesRepresentativeSignature=Sales representative (signature)
+NoSalesRepresentativeAffected=No particular sales representative assigned
+ShowCustomer=Show customer
+ShowProspect=Show prospect
+ListOfProspects=List of prospects
+ListOfCustomers=List of customers
+LastDoneTasks=Latest %s completed actions
+LastActionsToDo=Oldest %s not completed actions
+DoneAndToDoActions=Completed and To do events
+DoneActions=Completed events
+ToDoActions=Incomplete events
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
+StatusNotApplicable=Not applicable
+StatusActionToDo=To do
+StatusActionDone=Complete
+StatusActionInProcess=In process
+TasksHistoryForThisContact=Events for this contact
+LastProspectDoNotContact=Do not contact
+LastProspectNeverContacted=Never contacted
+LastProspectToContact=To contact
+LastProspectContactInProcess=Contact in process
+LastProspectContactDone=Contact done
+ActionAffectedTo=Event assigned to
+ActionDoneBy=Event done by
+ActionAC_TEL=Phone call
+ActionAC_FAX=Send fax
+ActionAC_PROP=Send proposal by mail
+ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
+ActionAC_RDV=Meetings
+ActionAC_INT=Intervention on site
+ActionAC_FAC=Send customer invoice by mail
+ActionAC_REL=Send customer invoice by mail (reminder)
+ActionAC_CLO=Close
+ActionAC_EMAILING=Send mass email
+ActionAC_COM=Send sales order by mail
+ActionAC_SHIP=Send shipping by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
+ActionAC_OTH=Other
+ActionAC_OTH_AUTO=Automatically inserted events
+ActionAC_MANUAL=Manually inserted events
+ActionAC_AUTO=Automatically inserted events
+ActionAC_OTH_AUTOShort=Auto
+Stats=Sales statistics
+StatusProsp=Prospect status
+DraftPropals=Draft commercial proposals
+NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commercial proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/am_ET/companies.lang b/htdocs/langs/am_ET/companies.lang
new file mode 100644
index 00000000000..0fad58c9389
--- /dev/null
+++ b/htdocs/langs/am_ET/companies.lang
@@ -0,0 +1,458 @@
+# Dolibarr language file - Source file is en_US - companies
+ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
+ErrorSetACountryFirst=Set the country first
+SelectThirdParty=Select a third party
+ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+DeleteContact=Delete a contact/address
+ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+MenuNewThirdParty=New Third Party
+MenuNewCustomer=New Customer
+MenuNewProspect=New Prospect
+MenuNewSupplier=New Vendor
+MenuNewPrivateIndividual=New private individual
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New Third Party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
+CreateThirdPartyOnly=Create third party
+CreateThirdPartyAndContact=Create a third party + a child contact
+ProspectionArea=Prospection area
+IdThirdParty=Id third party
+IdCompany=Company Id
+IdContact=Contact Id
+Contacts=Contacts/Addresses
+ThirdPartyContacts=Third-party contacts
+ThirdPartyContact=Third-party contact/address
+Company=Company
+CompanyName=Company name
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias Name
+Companies=Companies
+CountryIsInEEC=Country is inside the European Economic Community
+PriceFormatInCurrentLanguage=Price display format in the current language and currency
+ThirdPartyName=Third-party name
+ThirdPartyEmail=Third-party email
+ThirdParty=Third-party
+ThirdParties=Third-parties
+ThirdPartyProspects=Prospects
+ThirdPartyProspectsStats=Prospects
+ThirdPartyCustomers=Customers
+ThirdPartyCustomersStats=Customers
+ThirdPartyCustomersWithIdProf12=Customers with %s or %s
+ThirdPartySuppliers=Vendors
+ThirdPartyType=Third-party type
+Individual=Private individual
+ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
+ParentCompany=Parent company
+Subsidiaries=Subsidiaries
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
+ReportByQuarter=Report by rate
+CivilityCode=Civility code
+RegisteredOffice=Registered office
+Lastname=Last name
+Firstname=First name
+PostOrFunction=Job position
+UserTitle=Title
+NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
+Address=Address
+State=State/Province
+StateCode=State/Province code
+StateShort=State
+Region=Region
+Region-State=Region - State
+Country=Country
+CountryCode=Country code
+CountryId=Country id
+Phone=Phone
+PhoneShort=Phone
+Skype=Skype
+Call=Call
+Chat=Chat
+PhonePro=Prof. phone
+PhonePerso=Pers. phone
+PhoneMobile=Mobile
+No_Email=Refuse bulk emailings
+Fax=Fax
+Zip=Zip Code
+Town=City
+Web=Web
+Poste= Position
+DefaultLang=Language default
+VATIsUsed=Sales tax used
+VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
+CopyAddressFromSoc=Copy address from third-party details
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
+PaymentBankAccount=Payment bank account
+OverAllProposals=Proposals
+OverAllOrders=Orders
+OverAllInvoices=Invoices
+OverAllSupplierProposals=Price requests
+##### Local Taxes #####
+LocalTax1IsUsed=Use second tax
+LocalTax1IsUsedES= RE is used
+LocalTax1IsNotUsedES= RE is not used
+LocalTax2IsUsed=Use third tax
+LocalTax2IsUsedES= IRPF is used
+LocalTax2IsNotUsedES= IRPF is not used
+WrongCustomerCode=Customer code invalid
+WrongSupplierCode=Vendor code invalid
+CustomerCodeModel=Customer code model
+SupplierCodeModel=Vendor code model
+Gencod=Barcode
+##### Professional ID #####
+ProfId1Short=Prof. id 1
+ProfId2Short=Prof. id 2
+ProfId3Short=Prof. id 3
+ProfId4Short=Prof. id 4
+ProfId5Short=Prof. id 5
+ProfId6Short=Prof. id 6
+ProfId1=Professional ID 1
+ProfId2=Professional ID 2
+ProfId3=Professional ID 3
+ProfId4=Professional ID 4
+ProfId5=Professional ID 5
+ProfId6=Professional ID 6
+ProfId1AR=Prof Id 1 (CUIT/CUIL)
+ProfId2AR=Prof Id 2 (Revenu brutes)
+ProfId3AR=-
+ProfId4AR=-
+ProfId5AR=-
+ProfId6AR=-
+ProfId1AT=Prof Id 1 (USt.-IdNr)
+ProfId2AT=Prof Id 2 (USt.-Nr)
+ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
+ProfId4AT=-
+ProfId5AT=-
+ProfId6AT=-
+ProfId1AU=Prof Id 1 (ABN)
+ProfId2AU=-
+ProfId3AU=-
+ProfId4AU=-
+ProfId5AU=-
+ProfId6AU=-
+ProfId1BE=Prof Id 1 (Professional number)
+ProfId2BE=-
+ProfId3BE=-
+ProfId4BE=-
+ProfId5BE=-
+ProfId6BE=-
+ProfId1BR=-
+ProfId2BR=IE (Inscricao Estadual)
+ProfId3BR=IM (Inscricao Municipal)
+ProfId4BR=CPF
+#ProfId5BR=CNAE
+#ProfId6BR=INSS
+ProfId1CH=-
+ProfId2CH=-
+ProfId3CH=Prof Id 1 (Federal number)
+ProfId4CH=Prof Id 2 (Commercial Record number)
+ProfId5CH=-
+ProfId6CH=-
+ProfId1CL=Prof Id 1 (R.U.T.)
+ProfId2CL=-
+ProfId3CL=-
+ProfId4CL=-
+ProfId5CL=-
+ProfId6CL=-
+ProfId1CO=Prof Id 1 (R.U.T.)
+ProfId2CO=-
+ProfId3CO=-
+ProfId4CO=-
+ProfId5CO=-
+ProfId6CO=-
+ProfId1DE=Prof Id 1 (USt.-IdNr)
+ProfId2DE=Prof Id 2 (USt.-Nr)
+ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId4DE=-
+ProfId5DE=-
+ProfId6DE=-
+ProfId1ES=Prof Id 1 (CIF/NIF)
+ProfId2ES=Prof Id 2 (Social security number)
+ProfId3ES=Prof Id 3 (CNAE)
+ProfId4ES=Prof Id 4 (Collegiate number)
+ProfId5ES=-
+ProfId6ES=-
+ProfId1FR=Prof Id 1 (SIREN)
+ProfId2FR=Prof Id 2 (SIRET)
+ProfId3FR=Prof Id 3 (NAF, old APE)
+ProfId4FR=Prof Id 4 (RCS/RM)
+ProfId5FR=-
+ProfId6FR=-
+ProfId1GB=Registration Number
+ProfId2GB=-
+ProfId3GB=SIC
+ProfId4GB=-
+ProfId5GB=-
+ProfId6GB=-
+ProfId1HN=Id prof. 1 (RTN)
+ProfId2HN=-
+ProfId3HN=-
+ProfId4HN=-
+ProfId5HN=-
+ProfId6HN=-
+ProfId1IN=Prof Id 1 (TIN)
+ProfId2IN=Prof Id 2 (PAN)
+ProfId3IN=Prof Id 3 (SRVC TAX)
+ProfId4IN=Prof Id 4
+ProfId5IN=Prof Id 5
+ProfId6IN=-
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
+ProfId1MA=Id prof. 1 (R.C.)
+ProfId2MA=Id prof. 2 (Patente)
+ProfId3MA=Id prof. 3 (I.F.)
+ProfId4MA=Id prof. 4 (C.N.S.S.)
+ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId6MA=-
+ProfId1MX=Prof Id 1 (R.F.C).
+ProfId2MX=Prof Id 2 (R..P. IMSS)
+ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId4MX=-
+ProfId5MX=-
+ProfId6MX=-
+ProfId1NL=KVK nummer
+ProfId2NL=-
+ProfId3NL=-
+ProfId4NL=Burgerservicenummer (BSN)
+ProfId5NL=-
+ProfId6NL=-
+ProfId1PT=Prof Id 1 (NIPC)
+ProfId2PT=Prof Id 2 (Social security number)
+ProfId3PT=Prof Id 3 (Commercial Record number)
+ProfId4PT=Prof Id 4 (Conservatory)
+ProfId5PT=-
+ProfId6PT=-
+ProfId1SN=RC
+ProfId2SN=NINEA
+ProfId3SN=-
+ProfId4SN=-
+ProfId5SN=-
+ProfId6SN=-
+ProfId1TN=Prof Id 1 (RC)
+ProfId2TN=Prof Id 2 (Fiscal matricule)
+ProfId3TN=Prof Id 3 (Douane code)
+ProfId4TN=Prof Id 4 (BAN)
+ProfId5TN=-
+ProfId6TN=-
+ProfId1US=Prof Id (FEIN)
+ProfId2US=-
+ProfId3US=-
+ProfId4US=-
+ProfId5US=-
+ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
+ProfId1RU=Prof Id 1 (OGRN)
+ProfId2RU=Prof Id 2 (INN)
+ProfId3RU=Prof Id 3 (KPP)
+ProfId4RU=Prof Id 4 (OKPO)
+ProfId5RU=-
+ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
+VATIntra=VAT ID
+VATIntraShort=VAT ID
+VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
+ProspectCustomer=Prospect / Customer
+Prospect=Prospect
+CustomerCard=Customer Card
+Customer=Customer
+CustomerRelativeDiscount=Relative customer discount
+SupplierRelativeDiscount=Relative vendor discount
+CustomerRelativeDiscountShort=Relative discount
+CustomerAbsoluteDiscountShort=Absolute discount
+CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
+CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
+CompanyHasAbsoluteDiscount=This customer has discounts available (credits notes or down payments) for <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
+CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
+CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
+DiscountNone=None
+Vendor=Vendor
+Supplier=Vendor
+AddContact=Create contact
+AddContactAddress=Create contact/address
+EditContact=Edit contact
+EditContactAddress=Edit contact/address
+Contact=Contact
+ContactId=Contact id
+ContactsAddresses=Contacts/Addresses
+FromContactName=Name:
+NoContactDefinedForThirdParty=No contact defined for this third party
+NoContactDefined=No contact defined
+DefaultContact=Default contact/address
+ContactByDefaultFor=Default contact/address for
+AddThirdParty=Create third party
+DeleteACompany=Delete a company
+PersonalInformations=Personal data
+AccountancyCode=Accounting account
+CustomerCode=Customer Code
+SupplierCode=Vendor Code
+CustomerCodeShort=Customer Code
+SupplierCodeShort=Vendor Code
+CustomerCodeDesc=Customer Code, unique for all customers
+SupplierCodeDesc=Vendor Code, unique for all vendors
+RequiredIfCustomer=Required if third party is a customer or prospect
+RequiredIfSupplier=Required if third party is a vendor
+ValidityControledByModule=Validity controlled by module
+ThisIsModuleRules=Rules for this module
+ProspectToContact=Prospect to contact
+CompanyDeleted=Company "%s" deleted from database.
+ListOfContacts=List of contacts/addresses
+ListOfContactsAddresses=List of contacts/addresses
+ListOfThirdParties=List of Third Parties
+ShowCompany=Third Party
+ShowContact=Contact-Address
+ContactsAllShort=All (No filter)
+ContactType=Contact type
+ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
+ContactForProposals=Proposal's contact
+ContactForContracts=Contract's contact
+ContactForInvoices=Invoice's contact
+NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
+NoContactForAnyProposal=This contact is not a contact for any commercial proposal
+NoContactForAnyContract=This contact is not a contact for any contract
+NoContactForAnyInvoice=This contact is not a contact for any invoice
+NewContact=New contact
+NewContactAddress=New Contact/Address
+MyContacts=My contacts
+Capital=Capital
+CapitalOf=Capital of %s
+EditCompany=Edit company
+ThisUserIsNot=This user is not a prospect, customer or vendor
+VATIntraCheck=Check
+VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
+VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
+NorProspectNorCustomer=Not prospect, nor customer
+JuridicalStatus=Legal Entity Type
+Staff=Employees
+ProspectLevelShort=Potential
+ProspectLevel=Prospect potential
+ContactPrivate=Private
+ContactPublic=Shared
+ContactVisibility=Visibility
+ContactOthers=Other
+OthersNotLinkedToThirdParty=Others, not linked to a third party
+ProspectStatus=Prospect status
+PL_NONE=None
+PL_UNKNOWN=Unknown
+PL_LOW=Low
+PL_MEDIUM=Medium
+PL_HIGH=High
+TE_UNKNOWN=-
+TE_STARTUP=Startup
+TE_GROUP=Large company
+TE_MEDIUM=Medium company
+TE_ADMIN=Governmental
+TE_SMALL=Small company
+TE_RETAIL=Retailer
+TE_WHOLE=Wholesaler
+TE_PRIVATE=Private individual
+TE_OTHER=Other
+StatusProspect-1=Do not contact
+StatusProspect0=Never contacted
+StatusProspect1=To be contacted
+StatusProspect2=Contact in process
+StatusProspect3=Contact done
+ChangeDoNotContact=Change status to 'Do not contact'
+ChangeNeverContacted=Change status to 'Never contacted'
+ChangeToContact=Change status to 'To be contacted'
+ChangeContactInProcess=Change status to 'Contact in process'
+ChangeContactDone=Change status to 'Contact done'
+ProspectsByStatus=Prospects by status
+NoParentCompany=None
+ExportCardToFormat=Export card to format
+ContactNotLinkedToCompany=Contact not linked to any third party
+DolibarrLogin=Dolibarr login
+NoDolibarrAccess=No Dolibarr access
+ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
+ExportDataset_company_2=Contacts and their properties
+ImportDataset_company_1=Third-parties and their properties
+ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ImportDataset_company_3=Third-parties Bank accounts
+ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
+PriceLevel=Price Level
+PriceLevelLabels=Price Level Labels
+DeliveryAddress=Delivery address
+AddAddress=Add address
+SupplierCategory=Vendor category
+JuridicalStatus200=Independent
+DeleteFile=Delete file
+ConfirmDeleteFile=Are you sure you want to delete this file?
+AllocateCommercial=Assigned to sales representative
+Organization=Organization
+FiscalYearInformation=Fiscal Year
+FiscalMonthStart=Starting month of the fiscal year
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
+YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
+YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
+ListSuppliersShort=List of Vendors
+ListProspectsShort=List of Prospects
+ListCustomersShort=List of Customers
+ThirdPartiesArea=Third Parties/Contacts
+LastModifiedThirdParties=Last %s modified Third Parties
+UniqueThirdParties=Total of Third Parties
+InActivity=Open
+ActivityCeased=Closed
+ThirdPartyIsClosed=Third party is closed
+ProductsIntoElements=List of products/services into %s
+CurrentOutstandingBill=Current outstanding bill
+OutstandingBill=Max. for outstanding bill
+OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
+MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
+ManagingDirectors=Manager(s) name (CEO, director, president...)
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ThirdpartiesMergeSuccess=Third parties have been merged
+SaleRepresentativeLogin=Login of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+#Imports
+PaymentTypeCustomer=Payment Type - Customer
+PaymentTermsCustomer=Payment Terms - Customer
+PaymentTypeSupplier=Payment Type - Vendor
+PaymentTermsSupplier=Payment Term - Vendor
+PaymentTypeBoth=Payment Type - Customer and Vendor
+MulticurrencyUsed=Use Multicurrency
+MulticurrencyCurrency=Currency
diff --git a/htdocs/langs/am_ET/compta.lang b/htdocs/langs/am_ET/compta.lang
new file mode 100644
index 00000000000..8a8c837ac87
--- /dev/null
+++ b/htdocs/langs/am_ET/compta.lang
@@ -0,0 +1,266 @@
+# Dolibarr language file - Source file is en_US - compta
+MenuFinancial=Billing | Payment
+TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
+OptionMode=Option for accountancy
+OptionModeTrue=Option Incomes-Expenses
+OptionModeVirtual=Option Claims-Debts
+OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
+OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
+FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
+VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
+LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+Param=Setup
+RemainingAmountPayment=Amount payment remaining:
+Account=Account
+Accountparent=Parent account
+Accountsparent=Parent accounts
+Income=Income
+Outcome=Expense
+MenuReportInOut=Income / Expense
+ReportInOut=Balance of income and expenses
+ReportTurnover=Turnover invoiced
+ReportTurnoverCollected=Turnover collected
+PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party
+PaymentsNotLinkedToUser=Payments not linked to any user
+Profit=Profit
+AccountingResult=Accounting result
+BalanceBefore=Balance (before)
+Balance=Balance
+Debit=Debit
+Credit=Credit
+Piece=Accounting Doc.
+AmountHTVATRealReceived=Net collected
+AmountHTVATRealPaid=Net paid
+VATToPay=Tax sales
+VATReceived=Tax received
+VATToCollect=Tax purchases
+VATSummary=Tax monthly
+VATBalance=Tax Balance
+VATPaid=Tax paid
+LT1Summary=Tax 2 summary
+LT2Summary=Tax 3 summary
+LT1SummaryES=RE Balance
+LT2SummaryES=IRPF Balance
+LT1SummaryIN=CGST Balance
+LT2SummaryIN=SGST Balance
+LT1Paid=Tax 2 paid
+LT2Paid=Tax 3 paid
+LT1PaidES=RE Paid
+LT2PaidES=IRPF Paid
+LT1PaidIN=CGST Paid
+LT2PaidIN=SGST Paid
+LT1Customer=Tax 2 sales
+LT1Supplier=Tax 2 purchases
+LT1CustomerES=RE sales
+LT1SupplierES=RE purchases
+LT1CustomerIN=CGST sales
+LT1SupplierIN=CGST purchases
+LT2Customer=Tax 3 sales
+LT2Supplier=Tax 3 purchases
+LT2CustomerES=IRPF sales
+LT2SupplierES=IRPF purchases
+LT2CustomerIN=SGST sales
+LT2SupplierIN=SGST purchases
+VATCollected=VAT collected
+StatusToPay=To pay
+SpecialExpensesArea=Area for all special payments
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
+SocialContributionsDeductibles=Deductible social or fiscal taxes
+SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
+MenuSpecialExpenses=Special expenses
+MenuTaxAndDividends=Taxes and dividends
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New social/fiscal tax
+NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
+AccountancyTreasuryArea=Billing and payment area
+NewPayment=New payment
+PaymentCustomerInvoice=Customer invoice payment
+PaymentSupplierInvoice=vendor invoice payment
+PaymentSocialContribution=Social/fiscal tax payment
+PaymentVat=VAT payment
+ListPayment=List of payments
+ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of vendor payments
+DateStartPeriod=Date start period
+DateEndPeriod=Date end period
+newLT1Payment=New tax 2 payment
+newLT2Payment=New tax 3 payment
+LT1Payment=Tax 2 payment
+LT1Payments=Tax 2 payments
+LT2Payment=Tax 3 payment
+LT2Payments=Tax 3 payments
+newLT1PaymentES=New RE payment
+newLT2PaymentES=New IRPF payment
+LT1PaymentES=RE Payment
+LT1PaymentsES=RE Payments
+LT2PaymentES=IRPF Payment
+LT2PaymentsES=IRPF Payments
+VATPayment=Sales tax payment
+VATPayments=Sales tax payments
+VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
+NewLocalTaxPayment=New tax %s payment
+Refund=Refund
+SocialContributionsPayments=Social/fiscal taxes payments
+ShowVatPayment=Show VAT payment
+TotalToPay=Total to pay
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+CustomerAccountancyCode=Customer accounting code
+SupplierAccountancyCode=Vendor accounting code
+CustomerAccountancyCodeShort=Cust. account. code
+SupplierAccountancyCodeShort=Sup. account. code
+AccountNumber=Account number
+NewAccountingAccount=New account
+Turnover=Turnover invoiced
+TurnoverCollected=Turnover collected
+SalesTurnoverMinimum=Minimum turnover
+ByExpenseIncome=By expenses & incomes
+ByThirdParties=By third parties
+ByUserAuthorOfInvoice=By invoice author
+CheckReceipt=Check deposit
+CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Latest %s check receipts
+NewCheckReceipt=New discount
+NewCheckDeposit=New check deposit
+NewCheckDepositOn=Create receipt for deposit on account: %s
+NoWaitingChecks=No checks awaiting deposit.
+DateChequeReceived=Check reception date
+NbOfCheques=No. of checks
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
+CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
+CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
+CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
+CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
+CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
+CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
+CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
+CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
+CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
+CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
+AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
+AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
+AnnualByCompanies=Balance of income and expenses, by predefined groups of account
+AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
+AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
+SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
+SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
+SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
+RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
+RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
+RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
+RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
+RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
+SeePageForSetup=See menu <a href="%s">%s</a> for setup
+DepositsAreNotIncluded=- Down payment invoices are not included
+DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
+VATReportByCustomers=Sale tax report by customer
+VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
+SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
+SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
+RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
+RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
+OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
+PercentOfInvoice=%%/invoice
+NotUsedForGoods=Not used on goods
+ProposalStats=Statistics on proposals
+OrderStats=Statistics on orders
+InvoiceStats=Statistics on bills
+Dispatch=Dispatching
+Dispatched=Dispatched
+ToDispatch=To dispatch
+ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer
+SellsJournal=Sales Journal
+PurchasesJournal=Purchases Journal
+DescSellsJournal=Sales Journal
+DescPurchasesJournal=Purchases Journal
+CodeNotDef=Not defined
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
+DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
+Pcg_version=Chart of accounts models
+Pcg_type=Pcg type
+Pcg_subtype=Pcg subtype
+InvoiceLinesToDispatch=Invoice lines to dispatch
+ByProductsAndServices=By product and service
+RefExt=External ref
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+LinkedOrder=Link to order
+Mode1=Method 1
+Mode2=Method 2
+CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
+CalculationRuleDescSupplier=According to vendor, choose appropriate method to apply same calculation rule and get same result expected by your vendor.
+TurnoverPerProductInCommitmentAccountingNotRelevant=The report of Turnover collected per product is not available. This report is only available for turnover invoiced.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
+CalculationMode=Calculation mode
+AccountancyJournal=Accounting code journal
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+CloneTaxForNextMonth=Clone it for next month
+SimpleReport=Simple report
+AddExtraReport=Extra reports (add foreign and national customer report)
+OtherCountriesCustomersReport=Foreign customers report
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
+SameCountryCustomersWithVAT=National customers report
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
+LinkedFichinter=Link to an intervention
+ImportDataset_tax_contrib=Social/fiscal taxes
+ImportDataset_tax_vat=Vat payments
+ErrorBankAccountNotFound=Error: Bank account not found
+FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
+DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignment
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover invoiced by sale tax rate
+TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
+LabelToShow=Short label
+PurchaseTurnover=Purchase turnover
+PurchaseTurnoverCollected=Purchase turnover collected
+RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
+RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/am_ET/contracts.lang b/htdocs/langs/am_ET/contracts.lang
new file mode 100644
index 00000000000..47572c355ab
--- /dev/null
+++ b/htdocs/langs/am_ET/contracts.lang
@@ -0,0 +1,101 @@
+# Dolibarr language file - Source file is en_US - contracts
+ContractsArea=Contracts area
+ListOfContracts=List of contracts
+AllContracts=All contracts
+ContractCard=Contract card
+ContractStatusNotRunning=Not running
+ContractStatusDraft=Draft
+ContractStatusValidated=Validated
+ContractStatusClosed=Closed
+ServiceStatusInitial=Not running
+ServiceStatusRunning=Running
+ServiceStatusNotLate=Running, not expired
+ServiceStatusNotLateShort=Not expired
+ServiceStatusLate=Running, expired
+ServiceStatusLateShort=Expired
+ServiceStatusClosed=Closed
+ShowContractOfService=Show contract of service
+Contracts=Contracts
+ContractsSubscriptions=Contracts/Subscriptions
+ContractsAndLine=Contracts and line of contracts
+Contract=Contract
+ContractLine=Contract line
+Closing=Closing
+NoContracts=No contracts
+MenuServices=Services
+MenuInactiveServices=Services not active
+MenuRunningServices=Running services
+MenuExpiredServices=Expired services
+MenuClosedServices=Closed services
+NewContract=New contract
+NewContractSubscription=New contract/subscription
+AddContract=Create contract
+DeleteAContract=Delete a contract
+ActivateAllOnContract=Activate all services
+CloseAContract=Close a contract
+ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
+ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
+ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
+ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract?
+ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
+ValidateAContract=Validate a contract
+ActivateService=Activate service
+ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b>?
+RefContract=Contract reference
+DateContract=Contract date
+DateServiceActivate=Service activation date
+ListOfServices=List of services
+ListOfInactiveServices=List of not active services
+ListOfExpiredServices=List of expired active services
+ListOfClosedServices=List of closed services
+ListOfRunningServices=List of running services
+NotActivatedServices=Inactive services (among validated contracts)
+BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
+LastContracts=Latest %s contracts
+LastModifiedServices=Latest %s modified services
+ContractStartDate=Start date
+ContractEndDate=End date
+DateStartPlanned=Planned start date
+DateStartPlannedShort=Planned start date
+DateEndPlanned=Planned end date
+DateEndPlannedShort=Planned end date
+DateStartReal=Real start date
+DateStartRealShort=Real start date
+DateEndReal=Real end date
+DateEndRealShort=Real end date
+CloseService=Close service
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
+ServiceStatus=Status of service
+DraftContracts=Drafts contracts
+CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
+ActivateAllContracts=Activate all contract lines
+CloseAllContracts=Close all contract lines
+DeleteContractLine=Delete a contract line
+ConfirmDeleteContractLine=Are you sure you want to delete this contract line?
+MoveToAnotherContract=Move service into another contract.
+ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract.
+ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
+PaymentRenewContractId=Renew contract line (number %s)
+ExpiredSince=Expiration date
+NoExpiredServices=No expired active services
+ListOfServicesToExpireWithDuration=List of Services to expire in %s days
+ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
+ListOfServicesToExpire=List of Services to expire
+NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
+StandardContractsTemplate=Standard contracts template
+ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
+LowerDateEndPlannedShort=Lower planned end date of active services
+SendContractRef=Contract information __REF__
+OtherContracts=Other contracts
+##### Types de contacts #####
+TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
+TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract
+TypeContact_contrat_external_BILLING=Billing customer contact
+TypeContact_contrat_external_CUSTOMER=Follow-up customer contact
+TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact
diff --git a/htdocs/langs/am_ET/cron.lang b/htdocs/langs/am_ET/cron.lang
new file mode 100644
index 00000000000..1de1251831a
--- /dev/null
+++ b/htdocs/langs/am_ET/cron.lang
@@ -0,0 +1,84 @@
+# Dolibarr language file - Source file is en_US - cron
+# About page
+# Right
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
+# Admin
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
+CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
+CronJobProfiles=List of predefined cron job profiles
+# Menu
+EnabledAndDisabled=Enabled and disabled
+# Page list
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
+CronCommand=Command
+CronList=Scheduled jobs
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
+CronExecute=Launch scheduled job
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
+CronTask=Job
+CronNone=None
+CronDtStart=Not before
+CronDtEnd=Not after
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Start date of latest execution
+CronDtLastResult=End date of latest execution
+CronFrequency=Frequency
+CronClass=Class
+CronMethod=Method
+CronModule=Module
+CronNoJobs=No jobs registered
+CronPriority=Priority
+CronLabel=Label
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
+CronEach=Every
+JobFinished=Job launched and finished
+#Page card
+CronAdd= Add jobs
+CronEvery=Execute job each
+CronObject=Instance/Object to create
+CronArgs=Parameters
+CronSaveSucess=Save successfully
+CronNote=Comment
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+StatusAtInstall=Status at module installation
+CronStatusActiveBtn=Enable
+CronStatusInactiveBtn=Disable
+CronTaskInactive=This job is disabled
+CronId=Id
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
+CronFrom=From
+# Info
+# Common
+CronType=Job type
+CronType_method=Call method of a PHP Class
+CronType_command=Shell command
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
+JobDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
diff --git a/htdocs/langs/am_ET/deliveries.lang b/htdocs/langs/am_ET/deliveries.lang
new file mode 100644
index 00000000000..1f48c01de75
--- /dev/null
+++ b/htdocs/langs/am_ET/deliveries.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - deliveries
+Delivery=Delivery
+DeliveryRef=Ref Delivery
+DeliveryCard=Receipt card
+DeliveryOrder=Delivery receipt
+DeliveryDate=Delivery date
+CreateDeliveryOrder=Generate delivery receipt
+DeliveryStateSaved=Delivery state saved
+SetDeliveryDate=Set shipping date
+ValidateDeliveryReceipt=Validate delivery receipt
+ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt?
+DeleteDeliveryReceipt=Delete delivery receipt
+DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b>?
+DeliveryMethod=Delivery method
+TrackingNumber=Tracking number
+DeliveryNotValidated=Delivery not validated
+StatusDeliveryCanceled=Canceled
+StatusDeliveryDraft=Draft
+StatusDeliveryValidated=Received
+# merou PDF model
+NameAndSignature=Name and Signature:
+ToAndDate=To___________________________________ on ____/_____/__________
+GoodStatusDeclaration=Have received the goods above in good condition,
+Deliverer=Deliverer:
+Sender=Sender
+Recipient=Recipient
+ErrorStockIsNotEnough=There's not enough stock
+Shippable=Shippable
+NonShippable=Not Shippable
+ShowReceiving=Show delivery receipt
+NonExistentOrder=Nonexistent order
diff --git a/htdocs/langs/am_ET/dict.lang b/htdocs/langs/am_ET/dict.lang
new file mode 100644
index 00000000000..ec315d97142
--- /dev/null
+++ b/htdocs/langs/am_ET/dict.lang
@@ -0,0 +1,359 @@
+# Dolibarr language file - Source file is en_US - dict
+CountryFR=France
+CountryBE=Belgium
+CountryIT=Italy
+CountryES=Spain
+CountryDE=Germany
+CountryCH=Switzerland
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
+CountryUK=United Kingdom
+CountryIE=Ireland
+CountryCN=China
+CountryTN=Tunisia
+CountryUS=United States
+CountryMA=Morocco
+CountryDZ=Algeria
+CountryCA=Canada
+CountryTG=Togo
+CountryGA=Gabon
+CountryNL=Netherlands
+CountryHU=Hungary
+CountryRU=Russia
+CountrySE=Sweden
+CountryCI=Ivoiry Coast
+CountrySN=Senegal
+CountryAR=Argentina
+CountryCM=Cameroon
+CountryPT=Portugal
+CountrySA=Saudi Arabia
+CountryMC=Monaco
+CountryAU=Australia
+CountrySG=Singapore
+CountryAF=Afghanistan
+CountryAX=Åland Islands
+CountryAL=Albania
+CountryAS=American Samoa
+CountryAD=Andorra
+CountryAO=Angola
+CountryAI=Anguilla
+CountryAQ=Antarctica
+CountryAG=Antigua and Barbuda
+CountryAM=Armenia
+CountryAW=Aruba
+CountryAT=Austria
+CountryAZ=Azerbaijan
+CountryBS=Bahamas
+CountryBH=Bahrain
+CountryBD=Bangladesh
+CountryBB=Barbados
+CountryBY=Belarus
+CountryBZ=Belize
+CountryBJ=Benin
+CountryBM=Bermuda
+CountryBT=Bhutan
+CountryBO=Bolivia
+CountryBA=Bosnia and Herzegovina
+CountryBW=Botswana
+CountryBV=Bouvet Island
+CountryBR=Brazil
+CountryIO=British Indian Ocean Territory
+CountryBN=Brunei Darussalam
+CountryBG=Bulgaria
+CountryBF=Burkina Faso
+CountryBI=Burundi
+CountryKH=Cambodia
+CountryCV=Cape Verde
+CountryKY=Cayman Islands
+CountryCF=Central African Republic
+CountryTD=Chad
+CountryCL=Chile
+CountryCX=Christmas Island
+CountryCC=Cocos (Keeling) Islands
+CountryCO=Colombia
+CountryKM=Comoros
+CountryCG=Congo
+CountryCD=Congo, The Democratic Republic of the
+CountryCK=Cook Islands
+CountryCR=Costa Rica
+CountryHR=Croatia
+CountryCU=Cuba
+CountryCY=Cyprus
+CountryCZ=Czech Republic
+CountryDK=Denmark
+CountryDJ=Djibouti
+CountryDM=Dominica
+CountryDO=Dominican Republic
+CountryEC=Ecuador
+CountryEG=Egypt
+CountrySV=El Salvador
+CountryGQ=Equatorial Guinea
+CountryER=Eritrea
+CountryEE=Estonia
+CountryET=Ethiopia
+CountryFK=Falkland Islands
+CountryFO=Faroe Islands
+CountryFJ=Fiji Islands
+CountryFI=Finland
+CountryGF=French Guiana
+CountryPF=French Polynesia
+CountryTF=French Southern Territories
+CountryGM=Gambia
+CountryGE=Georgia
+CountryGH=Ghana
+CountryGI=Gibraltar
+CountryGR=Greece
+CountryGL=Greenland
+CountryGD=Grenada
+CountryGP=Guadeloupe
+CountryGU=Guam
+CountryGT=Guatemala
+CountryGN=Guinea
+CountryGW=Guinea-Bissau
+CountryGY=Guyana
+CountryHT=Haïti
+CountryHM=Heard Island and McDonald
+CountryVA=Holy See (Vatican City State)
+CountryHN=Honduras
+CountryHK=Hong Kong
+CountryIS=Iceland
+CountryIN=India
+CountryID=Indonesia
+CountryIR=Iran
+CountryIQ=Iraq
+CountryIL=Israel
+CountryJM=Jamaica
+CountryJP=Japan
+CountryJO=Jordan
+CountryKZ=Kazakhstan
+CountryKE=Kenya
+CountryKI=Kiribati
+CountryKP=North Korea
+CountryKR=South Korea
+CountryKW=Kuwait
+CountryKG=Kyrgyzstan
+CountryLA=Lao
+CountryLV=Latvia
+CountryLB=Lebanon
+CountryLS=Lesotho
+CountryLR=Liberia
+CountryLY=Libyan
+CountryLI=Liechtenstein
+CountryLT=Lithuania
+CountryLU=Luxembourg
+CountryMO=Macao
+CountryMK=Macedonia, the former Yugoslav of
+CountryMG=Madagascar
+CountryMW=Malawi
+CountryMY=Malaysia
+CountryMV=Maldives
+CountryML=Mali
+CountryMT=Malta
+CountryMH=Marshall Islands
+CountryMQ=Martinique
+CountryMR=Mauritania
+CountryMU=Mauritius
+CountryYT=Mayotte
+CountryMX=Mexico
+CountryFM=Micronesia
+CountryMD=Moldova
+CountryMN=Mongolia
+CountryMS=Monserrat
+CountryMZ=Mozambique
+CountryMM=Myanmar (Burma)
+CountryNA=Namibia
+CountryNR=Nauru
+CountryNP=Nepal
+CountryAN=Netherlands Antilles
+CountryNC=New Caledonia
+CountryNZ=New Zealand
+CountryNI=Nicaragua
+CountryNE=Niger
+CountryNG=Nigeria
+CountryNU=Niue
+CountryNF=Norfolk Island
+CountryMP=Northern Mariana Islands
+CountryNO=Norway
+CountryOM=Oman
+CountryPK=Pakistan
+CountryPW=Palau
+CountryPS=Palestinian Territory, Occupied
+CountryPA=Panama
+CountryPG=Papua New Guinea
+CountryPY=Paraguay
+CountryPE=Peru
+CountryPH=Philippines
+CountryPN=Pitcairn Islands
+CountryPL=Poland
+CountryPR=Puerto Rico
+CountryQA=Qatar
+CountryRE=Reunion
+CountryRO=Romania
+CountryRW=Rwanda
+CountrySH=Saint Helena
+CountryKN=Saint Kitts and Nevis
+CountryLC=Saint Lucia
+CountryPM=Saint Pierre and Miquelon
+CountryVC=Saint Vincent and Grenadines
+CountryWS=Samoa
+CountrySM=San Marino
+CountryST=Sao Tome and Principe
+CountryRS=Serbia
+CountrySC=Seychelles
+CountrySL=Sierra Leone
+CountrySK=Slovakia
+CountrySI=Slovenia
+CountrySB=Solomon Islands
+CountrySO=Somalia
+CountryZA=South Africa
+CountryGS=South Georgia and the South Sandwich Islands
+CountryLK=Sri Lanka
+CountrySD=Sudan
+CountrySR=Suriname
+CountrySJ=Svalbard and Jan Mayen
+CountrySZ=Swaziland
+CountrySY=Syrian
+CountryTW=Taiwan
+CountryTJ=Tajikistan
+CountryTZ=Tanzania
+CountryTH=Thailand
+CountryTL=Timor-Leste
+CountryTK=Tokelau
+CountryTO=Tonga
+CountryTT=Trinidad and Tobago
+CountryTR=Turkey
+CountryTM=Turkmenistan
+CountryTC=Turks and Caicos Islands
+CountryTV=Tuvalu
+CountryUG=Uganda
+CountryUA=Ukraine
+CountryAE=United Arab Emirates
+CountryUM=United States Minor Outlying Islands
+CountryUY=Uruguay
+CountryUZ=Uzbekistan
+CountryVU=Vanuatu
+CountryVE=Venezuela
+CountryVN=Viet Nam
+CountryVG=Virgin Islands, British
+CountryVI=Virgin Islands, U.S.
+CountryWF=Wallis and Futuna
+CountryEH=Western Sahara
+CountryYE=Yemen
+CountryZM=Zambia
+CountryZW=Zimbabwe
+CountryGG=Guernsey
+CountryIM=Isle of Man
+CountryJE=Jersey
+CountryME=Montenegro
+CountryBL=Saint Barthelemy
+CountryMF=Saint Martin
+
+##### Civilities #####
+CivilityMME=Mrs.
+CivilityMR=Mr.
+CivilityMLE=Ms.
+CivilityMTRE=Master
+CivilityDR=Doctor
+##### Currencies #####
+Currencyeuros=Euros
+CurrencyAUD=AU Dollars
+CurrencySingAUD=AU Dollar
+CurrencyCAD=CAN Dollars
+CurrencySingCAD=CAN Dollar
+CurrencyCHF=Swiss Francs
+CurrencySingCHF=Swiss Franc
+CurrencyEUR=Euros
+CurrencySingEUR=Euro
+CurrencyFRF=French Francs
+CurrencySingFRF=French Franc
+CurrencyGBP=GB Pounds
+CurrencySingGBP=GB Pound
+CurrencyINR=Indian rupees
+CurrencySingINR=Indian rupee
+CurrencyMAD=Dirham
+CurrencySingMAD=Dirham
+CurrencyMGA=Ariary
+CurrencySingMGA=Ariary
+CurrencyMUR=Mauritius rupees
+CurrencySingMUR=Mauritius rupee
+CurrencyNOK=Norwegian krones
+CurrencySingNOK=Norwegian kronas
+CurrencyTND=Tunisian dinars
+CurrencySingTND=Tunisian dinar
+CurrencyUSD=US Dollars
+CurrencySingUSD=US Dollar
+CurrencyUAH=Hryvnia
+CurrencySingUAH=Hryvnia
+CurrencyXAF=CFA Francs BEAC
+CurrencySingXAF=CFA Franc BEAC
+CurrencyXOF=CFA Francs BCEAO
+CurrencySingXOF=CFA Franc BCEAO
+CurrencyXPF=CFP Francs
+CurrencySingXPF=CFP Franc
+CurrencyCentEUR=cents
+CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=thousandth
+#### Input reasons #####
+DemandReasonTypeSRC_INTE=Internet
+DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
+DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
+DemandReasonTypeSRC_CAMP_PHO=Phone campaign
+DemandReasonTypeSRC_CAMP_FAX=Fax campaign
+DemandReasonTypeSRC_COMM=Commercial contact
+DemandReasonTypeSRC_SHOP=Shop contact
+DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_PARTNER=Partner
+DemandReasonTypeSRC_EMPLOYEE=Employee
+DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
+#### Paper formats ####
+PaperFormatEU4A0=Format 4A0
+PaperFormatEU2A0=Format 2A0
+PaperFormatEUA0=Format A0
+PaperFormatEUA1=Format A1
+PaperFormatEUA2=Format A2
+PaperFormatEUA3=Format A3
+PaperFormatEUA4=Format A4
+PaperFormatEUA5=Format A5
+PaperFormatEUA6=Format A6
+PaperFormatUSLETTER=Format Letter US
+PaperFormatUSLEGAL=Format Legal US
+PaperFormatUSEXECUTIVE=Format Executive US
+PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatCAP1=Format P1 Canada
+PaperFormatCAP2=Format P2 Canada
+PaperFormatCAP3=Format P3 Canada
+PaperFormatCAP4=Format P4 Canada
+PaperFormatCAP5=Format P5 Canada
+PaperFormatCAP6=Format P6 Canada
+#### Expense report categories ####
+ExpAutoCat=Car
+ExpCycloCat=Moped
+ExpMotoCat=Motorbike
+ExpAuto3CV=3 CV
+ExpAuto4CV=4 CV
+ExpAuto5CV=5 CV
+ExpAuto6CV=6 CV
+ExpAuto7CV=7 CV
+ExpAuto8CV=8 CV
+ExpAuto9CV=9 CV
+ExpAuto10CV=10 CV
+ExpAuto11CV=11 CV
+ExpAuto12CV=12 CV
+ExpAuto3PCV=3 CV and more
+ExpAuto4PCV=4 CV and more
+ExpAuto5PCV=5 CV and more
+ExpAuto6PCV=6 CV and more
+ExpAuto7PCV=7 CV and more
+ExpAuto8PCV=8 CV and more
+ExpAuto9PCV=9 CV and more
+ExpAuto10PCV=10 CV and more
+ExpAuto11PCV=11 CV and more
+ExpAuto12PCV=12 CV and more
+ExpAuto13PCV=13 CV and more
+ExpCyclo=Capacity lower to 50cm3
+ExpMoto12CV=Motorbike 1 or 2 CV
+ExpMoto345CV=Motorbike 3, 4 or 5 CV
+ExpMoto5PCV=Motorbike 5 CV and more
diff --git a/htdocs/langs/am_ET/donations.lang b/htdocs/langs/am_ET/donations.lang
new file mode 100644
index 00000000000..de4bdf68f03
--- /dev/null
+++ b/htdocs/langs/am_ET/donations.lang
@@ -0,0 +1,34 @@
+# Dolibarr language file - Source file is en_US - donations
+Donation=Donation
+Donations=Donations
+DonationRef=Donation ref.
+Donor=Donor
+AddDonation=Create a donation
+NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation?
+PublicDonation=Public donation
+DonationsArea=Donations area
+DonationStatusPromiseNotValidated=Draft promise
+DonationStatusPromiseValidated=Validated promise
+DonationStatusPaid=Donation received
+DonationStatusPromiseNotValidatedShort=Draft
+DonationStatusPromiseValidatedShort=Validated
+DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDate=Donation date
+DonationDatePayment=Payment date
+ValidPromess=Validate promise
+DonationReceipt=Donation receipt
+DonationsModels=Documents models for donation receipts
+LastModifiedDonations=Latest %s modified donations
+DonationRecipient=Donation recipient
+IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+MinimumAmount=Minimum amount is  %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
+DonationValidated=Donation %s validated
diff --git a/htdocs/langs/am_ET/ecm.lang b/htdocs/langs/am_ET/ecm.lang
new file mode 100644
index 00000000000..369ac6dfdfa
--- /dev/null
+++ b/htdocs/langs/am_ET/ecm.lang
@@ -0,0 +1,52 @@
+# Dolibarr language file - Source file is en_US - ecm
+ECMNbOfDocs=No. of documents in directory
+ECMSection=Directory
+ECMSectionManual=Manual directory
+ECMSectionAuto=Automatic directory
+ECMSectionsManual=Manual tree
+ECMSectionsAuto=Automatic tree
+ECMSections=Directories
+ECMRoot=ECM Root
+ECMNewSection=New directory
+ECMAddSection=Add directory
+ECMCreationDate=Creation date
+ECMNbOfFilesInDir=Number of files in directory
+ECMNbOfSubDir=Number of sub-directories
+ECMNbOfFilesInSubDir=Number of files in sub-directories
+ECMCreationUser=Creator
+ECMArea=DMS/ECM area
+ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.<br>* Manual directories can be used to save documents not linked to a particular element.
+ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
+ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMSearchByKeywords=Search by keywords
+ECMSearchByEntity=Search by object
+ECMSectionOfDocuments=Directories of documents
+ECMTypeAuto=Automatic
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
+ECMDocsByThirdParties=Documents linked to third parties
+ECMDocsByProposals=Documents linked to proposals
+ECMDocsByOrders=Documents linked to customers orders
+ECMDocsByContracts=Documents linked to contracts
+ECMDocsByInvoices=Documents linked to customers invoices
+ECMDocsByProducts=Documents linked to products
+ECMDocsByProjects=Documents linked to projects
+ECMDocsByUsers=Documents linked to users
+ECMDocsByInterventions=Documents linked to interventions
+ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to vendor proposals
+ECMNoDirectoryYet=No directory created
+ShowECMSection=Show directory
+DeleteSection=Remove directory
+ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
+ECMDirectoryForFiles=Relative directory for files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+ECMFileManager=File manager
+ECMSelectASection=Select a directory in the tree...
+DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
+ReSyncListOfDir=Resync list of directories
+HashOfFileContent=Hash of file content
+NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/am_ET/errors.lang b/htdocs/langs/am_ET/errors.lang
new file mode 100644
index 00000000000..7c67aeca8b5
--- /dev/null
+++ b/htdocs/langs/am_ET/errors.lang
@@ -0,0 +1,265 @@
+# Dolibarr language file - Source file is en_US - errors
+
+# No errors
+NoErrorCommitIsDone=No error, we commit
+# Errors
+ErrorButCommitIsDone=Errors found but we validate despite this
+ErrorBadEMail=Email %s is wrong
+ErrorBadUrl=Url %s is wrong
+ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorLoginAlreadyExists=Login %s already exists.
+ErrorGroupAlreadyExists=Group %s already exists.
+ErrorRecordNotFound=Record not found.
+ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
+ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
+ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
+ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
+ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
+ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
+ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
+ErrorBadThirdPartyName=Bad value for third-party name
+ErrorProdIdIsMandatory=The %s is mandatory
+ErrorBadCustomerCodeSyntax=Bad syntax for customer code
+ErrorBadBarCodeSyntax=Bad syntax for barcode. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorCustomerCodeRequired=Customer code required
+ErrorBarCodeRequired=Barcode required
+ErrorCustomerCodeAlreadyUsed=Customer code already used
+ErrorBarCodeAlreadyUsed=Barcode already used
+ErrorPrefixRequired=Prefix required
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
+ErrorBadParameters=Bad parameters
+ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
+ErrorBadDateFormat=Value '%s' has wrong date format
+ErrorWrongDate=Date is not correct!
+ErrorFailedToWriteInDir=Failed to write in directory %s
+ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
+ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
+ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
+ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
+ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
+ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
+ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
+ErrorFileNotFound=File <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
+ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
+ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
+ErrorDirAlreadyExists=A directory with this name already exists.
+ErrorFileAlreadyExists=A file with this name already exists.
+ErrorPartialFile=File not received completely by server.
+ErrorNoTmpDir=Temporary directy %s does not exists.
+ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
+ErrorFileSizeTooLarge=File size is too large.
+ErrorFieldTooLong=Field %s is too long.
+ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum)
+ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum)
+ErrorNoValueForSelectType=Please fill value for select list
+ErrorNoValueForCheckBoxType=Please fill value for checkbox list
+ErrorNoValueForRadioType=Please fill value for radio list
+ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
+ErrorFieldCanNotContainSpecialCharacters=The field <b>%s</b> must not contains special characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
+ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
+ErrorNoAccountancyModuleLoaded=No accountancy module activated
+ErrorExportDuplicateProfil=This profile name already exists for this export set.
+ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
+ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
+ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
+ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
+ErrorRecordHasChildren=Failed to delete record since it has some child records.
+ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
+ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
+ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display.
+ErrorPasswordsMustMatch=Both typed passwords must match each other
+ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
+ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
+ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
+ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
+ErrorsOnXLines=%s errors found
+ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
+ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
+ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
+ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorBadMask=Error on mask
+ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
+ErrorBadMaskBadRazMonth=Error, bad reset value
+ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
+ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
+ErrorSelectAtLeastOne=Error, select at least one entry.
+ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
+ErrorProdIdAlreadyExist=%s is assigned to another third
+ErrorFailedToSendPassword=Failed to send password
+ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
+ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
+ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
+ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
+ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
+ErrorRecordAlreadyExists=Record already exists
+ErrorLabelAlreadyExists=This label already exists
+ErrorCantReadFile=Failed to read file '%s'
+ErrorCantReadDir=Failed to read directory '%s'
+ErrorBadLoginPassword=Bad value for login or password
+ErrorLoginDisabled=Your account has been disabled
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToChangePassword=Failed to change password
+ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
+ErrorLoginHasNoEmail=This user has no email address. Process aborted.
+ErrorBadValueForCode=Bad value for security code. Try again with new value...
+ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice.
+ErrorLinesCantBeNegativeForOneVATRate=Total of lines can't be negative for a given VAT rate.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
+ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
+ErrorNoActivatedBarcode=No barcode type activated
+ErrUnzipFails=Failed to unzip %s with ZipArchive
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
+ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
+ErrorModuleFileRequired=You must select a Dolibarr module package file
+ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
+ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
+ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
+ErrorNewValueCantMatchOldValue=New value can't be equal to old one
+ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
+ErrorFailedToAddContact=Failed to add contact
+ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
+ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
+ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
+ErrorWarehouseMustDiffers=Source and target warehouses must differs
+ErrorBadFormat=Bad format!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
+ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
+ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
+ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Operator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpression23=Unknown or non set variable '%s' in %s
+ErrorPriceExpression24=Variable '%s' exists but has no value
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
+ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
+ErrorSavingChanges=An error has occurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
+ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
+ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
+ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
+ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
+ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
+ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
+ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
+ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
+ErrorTaskAlreadyAssigned=Task already assigned to user
+ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
+ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
+ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
+ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
+ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
+ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
+ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
+ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
+ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
+ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
+ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
+ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
+ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, record is already transferred in accounting, deletion is not possible.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, language is mandatory if you set the page as a translation of another one.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
+ErrorBatchNoFoundForProductInWarehouse=No lot/serial found for product "%s" in warehouse "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this lot/serial for product "%s" in warehouse "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
+ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
+ErrorReplaceStringEmpty=Error, the string to replace into is empty
+# Warnings
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
+WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
+WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
+WarningEnableYourModulesApplications=Click here to enable your modules and applications
+WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.
+WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
+WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
+WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php</b>) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe.
+WarningsOnXLines=Warnings on <b>%s</b> source record(s)
+WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
+WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable the installation/migration tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Omitting the creation of this file is a grave security risk.
+WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
+WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
+WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
+WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
+WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
+WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
+WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
+WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectClosed=Project is closed. You must re-open it first.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
diff --git a/htdocs/langs/am_ET/exports.lang b/htdocs/langs/am_ET/exports.lang
new file mode 100644
index 00000000000..3549e3f8b23
--- /dev/null
+++ b/htdocs/langs/am_ET/exports.lang
@@ -0,0 +1,135 @@
+# Dolibarr language file - Source file is en_US - exports
+ExportsArea=Exports
+ImportArea=Import
+NewExport=New Export
+NewImport=New Import
+ExportableDatas=Exportable dataset
+ImportableDatas=Importable dataset
+SelectExportDataSet=Choose dataset you want to export...
+SelectImportDataSet=Choose dataset you want to import...
+SelectExportFields=Choose the fields you want to export, or select a predefined export profile
+SelectImportFields=Choose the source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
+NotImportedFields=Fields of source file not imported
+SaveExportModel=Save your selections as an export profile/template (for reuse).
+SaveImportModel=Save this import profile (for reuse) ...
+ExportModelName=Export profile name
+ExportModelSaved=Export profile saved as <b>%s</b>.
+ExportableFields=Exportable fields
+ExportedFields=Exported fields
+ImportModelName=Import profile name
+ImportModelSaved=Import profile saved as <b>%s</b>.
+DatasetToExport=Dataset to export
+DatasetToImport=Import file into dataset
+ChooseFieldsOrdersAndTitle=Choose fields order...
+FieldsTitle=Fields title
+FieldTitle=Field title
+NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
+AvailableFormats=Available Formats
+LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
+Step=Step
+FormatedImport=Import Assistant
+FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
+FormatedImportDesc2=First step is to choose the kind of data you want to import, then the format of the source file, then the fields you want to import.
+FormatedExport=Export Assistant
+FormatedExportDesc1=These tools allow the export of personalized data using an assistant, to help you in the process without requiring technical knowledge.
+FormatedExportDesc2=First step is to choose a predefined dataset, then which fields you want to export, and in which order.
+FormatedExportDesc3=When data to export are selected, you can choose the format of the output file.
+Sheet=Sheet
+NoImportableData=No importable data (no module with definitions to allow data imports)
+FileSuccessfullyBuilt=File generated
+SQLUsedForExport=SQL Request used to extract data
+LineId=Id of line
+LineLabel=Label of line
+LineDescription=Description of line
+LineUnitPrice=Unit price of line
+LineVATRate=VAT Rate of line
+LineQty=Quantity for line
+LineTotalHT=Amount excl. tax for line
+LineTotalTTC=Amount with tax for line
+LineTotalVAT=Amount of VAT for line
+TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
+FileWithDataToImport=File with data to import
+FileToImport=Source file to import
+FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SourceFileFormat=Source file format
+FieldsInSourceFile=Fields in source file
+FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+Field=Field
+NoFields=No fields
+MoveField=Move field column number %s
+ExampleOfImportFile=Example_of_import_file
+SaveImportProfile=Save this import profile
+ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name.
+TablesTarget=Targeted tables
+FieldsTarget=Targeted fields
+FieldTarget=Targeted field
+FieldSource=Source field
+NbOfSourceLines=Number of lines in source file
+NowClickToTestTheImport=Check that the file format (field and string delimiters) of your file matches the options shown and that you have omitted the header line, or these will be flagged as errors in the following simulation.<br>Click on the "<b>%s</b>" button to run a check of the file structure/contents and simulate the import process.<br><b>No data will be changed in your database</b>.
+RunSimulateImportFile=Run Import Simulation
+FieldNeedSource=This field requires data from the source file
+SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
+InformationOnSourceFile=Information on source file
+InformationOnTargetTables=Information on target fields
+SelectAtLeastOneField=Switch at least one source field in the column of fields to export
+SelectFormat=Choose this import file format
+RunImportFile=Import Data
+NowClickToRunTheImport=Check the results of the import simulation. Correct any errors and re-test.<br>When the simulation reports no errors you may proceed to import the data into the database.
+DataLoadedWithId=The imported data will have an additional field in each database table with this import id: <b>%s</b>, to allow it to be searchable in the case of investigating a problem related to this import.
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+TooMuchErrors=There are still <b>%s</b> other source lines with errors but output has been limited.
+TooMuchWarnings=There are still <b>%s</b> other source lines with warnings but output has been limited.
+EmptyLine=Empty line (will be discarded)
+CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
+FileWasImported=File was imported with number <b>%s</b>.
+YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
+NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
+NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
+DataComeFromNoWhere=Value to insert comes from nowhere in source file.
+DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
+DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
+DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
+DataIsInsertedInto=Data coming from source file will be inserted into the following field:
+DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
+DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field:
+SourceRequired=Data value is mandatory
+SourceExample=Example of possible data value
+ExampleAnyRefFoundIntoElement=Any ref found for element <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
+CSVFormatDesc=<b>Comma Separated Value</b> file format (.csv).<br>This is a text file format where fields are separated by a separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ].
+Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is the native Excel 95 format (BIFF5).
+Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is the native Excel 2007 format (SpreadsheetML).
+TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
+ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate record (with this field added, all lines will own their own id and will differ).
+CsvOptions=CSV format options
+Separator=Field Separator
+Enclosure=String Delimiter
+SpecialCode=Special code
+ExportStringFilter=%% allows replacing one or more characters in the text
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD: filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD: filters on all previous years/months/days
+ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+ImportFromToLine=Limit range (From - To). Eg. to omit header line(s).
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines.<br>If the header lines are NOT omitted, this will result in multiple errors in the Import Simulation.
+KeepEmptyToGoToEndOfFile=Keep this field empty to process all lines to the end of the file.
+SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for an UPDATE import
+UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
+NoUpdateAttempt=No update attempt was performed, only insert
+ImportDataset_user_1=Users (employees or not) and properties
+ComputedField=Computed field
+## filters
+SelectFilterFields=If you want to filter on some values, just input values here.
+FilteredFields=Filtered fields
+FilteredFieldsValues=Value for filter
+FormatControlRule=Format control rule
+## imports updates
+KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
+NbInsert=Number of inserted lines: %s
+NbUpdate=Number of updated lines: %s
+MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
diff --git a/htdocs/langs/am_ET/externalsite.lang b/htdocs/langs/am_ET/externalsite.lang
new file mode 100644
index 00000000000..da4853df0df
--- /dev/null
+++ b/htdocs/langs/am_ET/externalsite.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExternalSiteSetup=Setup link to external website
+ExternalSiteURL=External Site URL
+ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/am_ET/ftp.lang b/htdocs/langs/am_ET/ftp.lang
new file mode 100644
index 00000000000..d80b87c2715
--- /dev/null
+++ b/htdocs/langs/am_ET/ftp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - ftp
+FTPClientSetup=FTP Client module setup
+NewFTPClient=New FTP connection setup
+FTPArea=FTP Area
+FTPAreaDesc=This screen shows a view of an FTP server.
+SetupOfFTPClientModuleNotComplete=The setup of the FTP client module seems to be incomplete
+FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
+FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
+FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
+FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
+FTPPassiveMode=Passive mode
+ChooseAFTPEntryIntoMenu=Choose a FTP site from the menu...
+FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/am_ET/help.lang b/htdocs/langs/am_ET/help.lang
new file mode 100644
index 00000000000..048de16d3c0
--- /dev/null
+++ b/htdocs/langs/am_ET/help.lang
@@ -0,0 +1,23 @@
+# Dolibarr language file - Source file is en_US - help
+CommunitySupport=Forum/Wiki support
+EMailSupport=Emails support
+RemoteControlSupport=Online real-time / remote support
+OtherSupport=Other support
+ToSeeListOfAvailableRessources=To contact/see available resources:
+HelpCenter=Help Center
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
+TypeSupportCommunauty=Community (free)
+TypeSupportCommercial=Commercial
+TypeOfHelp=Type
+NeedHelpCenter=Need help or support?
+Efficiency=Efficiency
+TypeHelpOnly=Help only
+TypeHelpDev=Help+Development
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
+PossibleLanguages=Supported languages
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
+SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/am_ET/holiday.lang b/htdocs/langs/am_ET/holiday.lang
new file mode 100644
index 00000000000..82de49f9c5f
--- /dev/null
+++ b/htdocs/langs/am_ET/holiday.lang
@@ -0,0 +1,133 @@
+# Dolibarr language file - Source file is en_US - holiday
+HRM=HRM
+Holidays=Leave
+CPTitreMenu=Leave
+MenuReportMonth=Monthly statement
+MenuAddCP=New leave request
+NotActiveModCP=You must enable the module Leave to view this page.
+AddCP=Make a leave request
+DateDebCP=Start date
+DateFinCP=End date
+DraftCP=Draft
+ToReviewCP=Awaiting approval
+ApprovedCP=Approved
+CancelCP=Canceled
+RefuseCP=Refused
+ValidatorCP=Approbator
+ListeCP=List of leave
+LeaveId=Leave ID
+ReviewedByCP=Will be approved by
+UserID=User ID
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
+DescCP=Description
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
+ErrorEndDateCP=You must select an end date greater than the start date.
+ErrorSQLCreateCP=An SQL error occurred during the creation:
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
+ReturnCP=Return to previous page
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosWorkflowCP=Information Workflow
+RequestByCP=Requested by
+TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
+NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DayIsANonWorkingDay=%s is a non working day
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
+EditCP=Edit
+DeleteCP=Delete
+ActionRefuseCP=Refuse
+ActionCancelCP=Cancel
+StatutCP=Status
+TitleDeleteCP=Delete the leave request
+ConfirmDeleteCP=Confirm the deletion of this leave request?
+ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
+CantCreateCP=You don't have the right to make leave requests.
+InvalidValidatorCP=You must choose an approbator to your leave request.
+NoDateDebut=You must select a start date.
+NoDateFin=You must select an end date.
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
+ConfirmValidCP=Are you sure you want to approve the leave request?
+DateValidCP=Date approved
+TitleToValidCP=Send leave request
+ConfirmToValidCP=Are you sure you want to send the leave request?
+TitleRefuseCP=Refuse the leave request
+ConfirmRefuseCP=Are you sure you want to refuse the leave request?
+NoMotifRefuseCP=You must choose a reason for refusing the request.
+TitleCancelCP=Cancel the leave request
+ConfirmCancelCP=Are you sure you want to cancel the leave request?
+DetailRefusCP=Reason for refusal
+DateRefusCP=Date of refusal
+DateCancelCP=Date of cancellation
+DefineEventUserCP=Assign an exceptional leave for a user
+addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
+MotifCP=Reason
+UserCP=User
+ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
+AddEventToUserOkCP=The addition of the exceptional leave has been completed.
+MenuLogCP=View change logs
+LogCP=Log of updates of available vacation days
+ActionByCP=Performed by
+UserUpdateCP=For the user
+PrevSoldeCP=Previous Balance
+NewSoldeCP=New Balance
+alreadyCPexist=A leave request has already been done on this period.
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
+BoxTitleLastLeaveRequests=Latest %s modified leave requests
+HolidaysMonthlyUpdate=Monthly update
+ManualUpdate=Manual update
+HolidaysCancelation=Leave request cancelation
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
+## Configuration du Module ##
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
+UpdateConfCPOK=Updated successfully.
+Module27130Name= Management of leave requests
+Module27130Desc= Management of leave requests
+ErrorMailNotSend=An error occurred while sending email:
+NoticePeriod=Notice period
+#Messages
+HolidaysToValidate=Validate leave requests
+HolidaysToValidateBody=Below is a leave request to validate
+HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
+HolidaysValidated=Validated leave requests
+HolidaysValidatedBody=Your leave request for %s to %s has been validated.
+HolidaysRefused=Request denied
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
+HolidaysCanceled=Canceled leaved request
+HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
+FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
+NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
+NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
diff --git a/htdocs/langs/am_ET/hrm.lang b/htdocs/langs/am_ET/hrm.lang
new file mode 100644
index 00000000000..3697c47e30d
--- /dev/null
+++ b/htdocs/langs/am_ET/hrm.lang
@@ -0,0 +1,18 @@
+# Dolibarr language file - en_US - hrm
+# Admin
+HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
+Establishments=Establishments
+Establishment=Establishment
+NewEstablishment=New establishment
+DeleteEstablishment=Delete establishment
+ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
+OpenEtablishment=Open establishment
+CloseEtablishment=Close establishment
+# Dictionary
+DictionaryPublicHolidays=HRM - Public holidays
+DictionaryDepartment=HRM - Department list
+DictionaryFunction=HRM - Function list
+# Module
+Employees=Employees
+Employee=Employee
+NewEmployee=New employee
diff --git a/htdocs/langs/am_ET/install.lang b/htdocs/langs/am_ET/install.lang
new file mode 100644
index 00000000000..f67dff57184
--- /dev/null
+++ b/htdocs/langs/am_ET/install.lang
@@ -0,0 +1,223 @@
+# Dolibarr language file - Source file is en_US - install
+InstallEasy=Just follow the instructions step by step.
+MiscellaneousChecks=Prerequisites check
+ConfFileExists=Configuration file <b>%s</b> exists.
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
+ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
+ConfFileReload=Reloading parameters from configuration file.
+PHPSupportSessions=This PHP supports sessions.
+PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportCalendar=This PHP supports calendars extensions.
+PHPSupportUTF8=This PHP supports UTF8 functions.
+PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupport=This PHP supports %s functions.
+PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
+ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
+ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
+ErrorDirDoesNotExists=Directory %s does not exist.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
+ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
+ErrorFailedToCreateDatabase=Failed to create database '%s'.
+ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
+ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
+ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
+ErrorDatabaseAlreadyExists=Database '%s' already exists.
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
+IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
+PHPVersion=PHP Version
+License=Using license
+ConfigurationFile=Configuration file
+WebPagesDirectory=Directory where web pages are stored
+DocumentsDirectory=Directory to store uploaded and generated documents
+URLRoot=URL Root
+ForceHttps=Force secure connections (https)
+CheckToForceHttps=Check this option to force secure connections (https).<br>This requires that the web server is configured with an SSL certificate.
+DolibarrDatabase=Dolibarr Database
+DatabaseType=Database type
+DriverType=Driver type
+Server=Server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
+ServerPortDescription=Database server port. Keep empty if unknown.
+DatabaseServer=Database server
+DatabaseName=Database name
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
+AdminPassword=Password for Dolibarr database owner.
+CreateDatabase=Create database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
+DatabaseSuperUserAccess=Database server - Superuser access
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
+ServerConnection=Server connection
+DatabaseCreation=Database creation
+CreateDatabaseObjects=Database objects creation
+ReferenceDataLoading=Reference data loading
+TablesAndPrimaryKeysCreation=Tables and Primary keys creation
+CreateTableAndPrimaryKey=Create table %s
+CreateOtherKeysForTable=Create foreign keys and indexes for table %s
+OtherKeysCreation=Foreign keys and indexes creation
+FunctionsCreation=Functions creation
+AdminAccountCreation=Administrator login creation
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
+SetupEnd=End of setup
+SystemIsInstalled=This installation is complete.
+SystemIsUpgraded=Dolibarr has been upgraded successfully.
+YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below:
+AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
+GoToDolibarr=Go to Dolibarr
+GoToSetupArea=Go to Dolibarr (setup area)
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
+GoToUpgradePage=Go to upgrade page again
+WithNoSlashAtTheEnd=Without the slash "/" at the end
+DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
+LoginAlreadyExists=Already exists
+DolibarrAdminLogin=Dolibarr admin login
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
+FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
+ChoosedMigrateScript=Choose migration script
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
+ProcessMigrateScript=Script processing
+ChooseYourSetupMode=Choose your setup mode and click "Start"...
+FreshInstall=Fresh install
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
+Upgrade=Upgrade
+UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
+Start=Start
+InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
+YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
+AlreadyDone=Already migrated
+DatabaseVersion=Database version
+ServerVersion=Database server version
+YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
+DBSortingCollation=Character sorting order
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
+OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
+RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
+FieldRenamed=Field renamed
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
+InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
+InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
+IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
+OpenBaseDir=PHP openbasedir parameter
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
+MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
+MigrationShippingDelivery=Upgrade storage of shipping
+MigrationShippingDelivery2=Upgrade storage of shipping 2
+MigrationFinished=Migration finished
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
+ActivateModule=Activate module %s
+ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
+SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
+NothingToDelete=Nothing to clean/delete
+NothingToDo=Nothing to do
+#########
+# upgrade
+MigrationFixData=Fix for denormalized data
+MigrationOrder=Data migration for customer's orders
+MigrationSupplierOrder=Data migration for vendor's orders
+MigrationProposal=Data migration for commercial proposals
+MigrationInvoice=Data migration for customer's invoices
+MigrationContract=Data migration for contracts
+MigrationSuccessfullUpdate=Upgrade successful
+MigrationUpdateFailed=Failed upgrade process
+MigrationRelationshipTables=Data migration for relationship tables (%s)
+MigrationPaymentsUpdate=Payment data correction
+MigrationPaymentsNumberToUpdate=%s payment(s) to update
+MigrationProcessPaymentUpdate=Update payment(s) %s
+MigrationPaymentsNothingToUpdate=No more things to do
+MigrationPaymentsNothingUpdatable=No more payments that can be corrected
+MigrationContractsUpdate=Contract data correction
+MigrationContractsNumberToUpdate=%s contract(s) to update
+MigrationContractsLineCreation=Create contract line for contract ref %s
+MigrationContractsNothingToUpdate=No more things to do
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
+MigrationContractsEmptyDatesUpdate=Contract empty date correction
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
+MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
+MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
+MigrationContractsInvalidDatesUpdate=Bad value date contract correction
+MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s)
+MigrationContractsInvalidDatesNumber=%s contracts modified
+MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct
+MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction
+MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
+MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct
+MigrationReopeningContracts=Open contract closed by error
+MigrationReopenThisContract=Reopen contract %s
+MigrationReopenedContractsNumber=%s contracts modified
+MigrationReopeningContractsNothingToUpdate=No closed contract to open
+MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
+MigrationBankTransfertsNothingToUpdate=All links are up to date
+MigrationShipmentOrderMatching=Sendings receipt update
+MigrationDeliveryOrderMatching=Delivery receipt update
+MigrationDeliveryDetail=Delivery update
+MigrationStockDetail=Update stock value of products
+MigrationMenusDetail=Update dynamic menus tables
+MigrationDeliveryAddress=Update delivery address in shipments
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
+MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
+MigrationProjectTaskTime=Update time spent in seconds
+MigrationActioncommElement=Update data on actions
+MigrationPaymentMode=Data migration for payment type
+MigrationCategorieAssociation=Migration of categories
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
+MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
+MigrationReloadModule=Reload module %s
+MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
+ClickHereToGoToApp=Click here to go to your application
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/am_ET/interventions.lang b/htdocs/langs/am_ET/interventions.lang
new file mode 100644
index 00000000000..e5936f8246e
--- /dev/null
+++ b/htdocs/langs/am_ET/interventions.lang
@@ -0,0 +1,66 @@
+# Dolibarr language file - Source file is en_US - interventions
+Intervention=Intervention
+Interventions=Interventions
+InterventionCard=Intervention card
+NewIntervention=New intervention
+AddIntervention=Create intervention
+ChangeIntoRepeatableIntervention=Change to repeatable intervention
+ListOfInterventions=List of interventions
+ActionsOnFicheInter=Actions on intervention
+LastInterventions=Latest %s interventions
+AllInterventions=All interventions
+CreateDraftIntervention=Create draft
+InterventionContact=Intervention contact
+DeleteIntervention=Delete intervention
+ValidateIntervention=Validate intervention
+ModifyIntervention=Modify intervention
+DeleteInterventionLine=Delete intervention line
+ConfirmDeleteIntervention=Are you sure you want to delete this intervention?
+ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
+ConfirmModifyIntervention=Are you sure you want to modify this intervention?
+ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line?
+ConfirmCloneIntervention=Are you sure you want to clone this intervention?
+NameAndSignatureOfInternalContact=Name and signature of intervening:
+NameAndSignatureOfExternalContact=Name and signature of customer:
+DocumentModelStandard=Standard document model for interventions
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
+InterventionClassifyDone=Classify "Done"
+StatusInterInvoiced=Billed
+SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by email
+InterventionDeletedInDolibarr=Intervention %s deleted
+InterventionsArea=Interventions area
+DraftFichinter=Draft interventions
+LastModifiedInterventions=Latest %s modified interventions
+FichinterToProcess=Interventions to process
+TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
+PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
+PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
+UseDurationOnFichinter=Hides the duration field for intervention records
+UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records
+InterventionStatistics=Statistics of interventions
+NbOfinterventions=No. of intervention cards
+NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
+InterId=Intervention id
+InterRef=Intervention ref.
+InterDateCreation=Date creation intervention
+InterDuration=Duration intervention
+InterStatus=Status intervention
+InterNote=Note intervention
+InterLine=Line of intervention
+InterLineId=Line id intervention
+InterLineDate=Line date intervention
+InterLineDuration=Line duration intervention
+InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/am_ET/languages.lang b/htdocs/langs/am_ET/languages.lang
new file mode 100644
index 00000000000..6185183161b
--- /dev/null
+++ b/htdocs/langs/am_ET/languages.lang
@@ -0,0 +1,89 @@
+# Dolibarr language file - Source file is en_US - languages
+Language_ar_AR=Arabic
+Language_ar_EG=Arabic (Egypt)
+Language_ar_SA=Arabic
+Language_bn_BD=Bengali
+Language_bg_BG=Bulgarian
+Language_bs_BA=Bosnian
+Language_ca_ES=Catalan
+Language_cs_CZ=Czech
+Language_da_DA=Danish
+Language_da_DK=Danish
+Language_de_DE=German
+Language_de_AT=German (Austria)
+Language_de_CH=German (Switzerland)
+Language_el_GR=Greek
+Language_el_CY=Greek (Cyprus)
+Language_en_AU=English (Australia)
+Language_en_CA=English (Canada)
+Language_en_GB=English (United Kingdom)
+Language_en_IN=English (India)
+Language_en_NZ=English (New Zealand)
+Language_en_SA=English (Saudi Arabia)
+Language_en_US=English (United States)
+Language_en_ZA=English (South Africa)
+Language_es_ES=Spanish
+Language_es_AR=Spanish (Argentina)
+Language_es_BO=Spanish (Bolivia)
+Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
+Language_es_EC=Spanish (Ecuador)
+Language_es_HN=Spanish (Honduras)
+Language_es_MX=Spanish (Mexico)
+Language_es_PA=Spanish (Panama)
+Language_es_PY=Spanish (Paraguay)
+Language_es_PE=Spanish (Peru)
+Language_es_PR=Spanish (Puerto Rico)
+Language_es_UY=Spanish (Uruguay)
+Language_es_VE=Spanish (Venezuela)
+Language_et_EE=Estonian
+Language_eu_ES=Basque
+Language_fa_IR=Persian
+Language_fi_FI=Finnish
+Language_fr_BE=French (Belgium)
+Language_fr_CA=French (Canada)
+Language_fr_CH=French (Switzerland)
+Language_fr_FR=French
+Language_fr_NC=French (New Caledonia)
+Language_fy_NL=Frisian
+Language_he_IL=Hebrew
+Language_hr_HR=Croatian
+Language_hu_HU=Hungarian
+Language_id_ID=Indonesian
+Language_is_IS=Icelandic
+Language_it_IT=Italian
+Language_ja_JP=Japanese
+Language_ka_GE=Georgian
+Language_km_KH=Khmer
+Language_kn_IN=Kannada
+Language_ko_KR=Korean
+Language_lo_LA=Lao
+Language_lt_LT=Lithuanian
+Language_lv_LV=Latvian
+Language_mk_MK=Macedonian
+Language_mn_MN=Mongolian
+Language_nb_NO=Norwegian (Bokmål)
+Language_nl_BE=Dutch (Belgium)
+Language_nl_NL=Dutch
+Language_pl_PL=Polish
+Language_pt_BR=Portuguese (Brazil)
+Language_pt_PT=Portuguese
+Language_ro_RO=Romanian
+Language_ru_RU=Russian
+Language_ru_UA=Russian (Ukraine)
+Language_tr_TR=Turkish
+Language_sl_SI=Slovenian
+Language_sv_SV=Swedish
+Language_sv_SE=Swedish
+Language_sq_AL=Albanian
+Language_sk_SK=Slovakian
+Language_sr_RS=Serbian
+Language_sw_SW=Kiswahili
+Language_th_TH=Thai
+Language_uk_UA=Ukrainian
+Language_uz_UZ=Uzbek
+Language_vi_VN=Vietnamese
+Language_zh_CN=Chinese
+Language_zh_TW=Chinese (Traditional)
+Language_bh_MY=Malay
diff --git a/htdocs/langs/am_ET/ldap.lang b/htdocs/langs/am_ET/ldap.lang
new file mode 100644
index 00000000000..8b6f0864215
--- /dev/null
+++ b/htdocs/langs/am_ET/ldap.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - ldap
+YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
+UserMustChangePassNextLogon=User must change password on the domain %s
+LDAPInformationsForThisContact=Information in LDAP database for this contact
+LDAPInformationsForThisUser=Information in LDAP database for this user
+LDAPInformationsForThisGroup=Information in LDAP database for this group
+LDAPInformationsForThisMember=Information in LDAP database for this member
+LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPAttributes=LDAP attributes
+LDAPCard=LDAP card
+LDAPRecordNotFound=Record not found in LDAP database
+LDAPUsers=Users in LDAP database
+LDAPFieldStatus=Status
+LDAPFieldFirstSubscriptionDate=First subscription date
+LDAPFieldFirstSubscriptionAmount=First subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example: skypeName
+UserSynchronized=User synchronized
+GroupSynchronized=Group synchronized
+MemberSynchronized=Member synchronized
+MemberTypeSynchronized=Member type synchronized
+ContactSynchronized=Contact synchronized
+ForceSynchronize=Force synchronizing Dolibarr -> LDAP
+ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/am_ET/link.lang b/htdocs/langs/am_ET/link.lang
new file mode 100644
index 00000000000..1ffcd41a18b
--- /dev/null
+++ b/htdocs/langs/am_ET/link.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - languages
+LinkANewFile=Link a new file/document
+LinkedFiles=Linked files and documents
+NoLinkFound=No registered links
+LinkComplete=The file has been linked successfully
+ErrorFileNotLinked=The file could not be linked
+LinkRemoved=The link %s has been removed
+ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
+ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+URLToLink=URL to link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/am_ET/loan.lang b/htdocs/langs/am_ET/loan.lang
new file mode 100644
index 00000000000..534dee08867
--- /dev/null
+++ b/htdocs/langs/am_ET/loan.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+LoanPayment=Loan payment
+ShowLoanPayment=Show Loan Payment
+LoanCapital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+Term=Term
+LoanAccountancyCapitalCode=Accounting account capital
+LoanAccountancyInsuranceCode=Accounting account insurance
+LoanAccountancyInterestCode=Accounting account interest
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ListLoanAssociatedProject=List of loan associated with the project
+AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
+CreateCalcSchedule=Edit financial commitment
diff --git a/htdocs/langs/am_ET/mailmanspip.lang b/htdocs/langs/am_ET/mailmanspip.lang
new file mode 100644
index 00000000000..bab4b3576b4
--- /dev/null
+++ b/htdocs/langs/am_ET/mailmanspip.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - mailmanspip
+MailmanSpipSetup=Mailman and SPIP module Setup
+MailmanTitle=Mailman mailing list system
+TestSubscribe=To test subscription to Mailman lists
+TestUnSubscribe=To test unsubscribe from Mailman lists
+MailmanCreationSuccess=Subscription test was executed successfully
+MailmanDeletionSuccess=Unsubscription test was executed successfully
+SynchroMailManEnabled=A Mailman update will be performed
+SynchroSpipEnabled=A Spip update will be performed
+DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
+DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
+DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
+DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
+SPIPTitle=SPIP Content Management System
+DescADHERENT_SPIP_SERVEUR=SPIP Server
+DescADHERENT_SPIP_DB=SPIP database name
+DescADHERENT_SPIP_USER=SPIP database login
+DescADHERENT_SPIP_PASS=SPIP database password
+AddIntoSpip=Add into SPIP
+AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
+AddIntoSpipError=Failed to add the user in SPIP
+DeleteIntoSpip=Remove from SPIP
+DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
+DeleteIntoSpipError=Failed to suppress the user from SPIP
+SPIPConnectionFailed=Failed to connect to SPIP
+SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
+SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
diff --git a/htdocs/langs/am_ET/mails.lang b/htdocs/langs/am_ET/mails.lang
new file mode 100644
index 00000000000..7b3bfd3852a
--- /dev/null
+++ b/htdocs/langs/am_ET/mails.lang
@@ -0,0 +1,170 @@
+# Dolibarr language file - Source file is en_US - mails
+Mailing=EMailing
+EMailing=EMailing
+EMailings=EMailings
+AllEMailings=All eMailings
+MailCard=EMailing card
+MailRecipients=Recipients
+MailRecipient=Recipient
+MailTitle=Description
+MailFrom=Sender
+MailErrorsTo=Errors to
+MailReply=Reply to
+MailTo=Receiver(s)
+MailToUsers=To user(s)
+MailCC=Copy to
+MailToCCUsers=Copy to users(s)
+MailCCC=Cached copy to
+MailTopic=Email topic
+MailText=Message
+MailFile=Attached files
+MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
+ShowEMailing=Show emailing
+ListOfEMailings=List of emailings
+NewMailing=New emailing
+EditMailing=Edit emailing
+ResetMailing=Resend emailing
+DeleteMailing=Delete emailing
+DeleteAMailing=Delete an emailing
+PreviewMailing=Preview emailing
+CreateMailing=Create emailing
+TestMailing=Test email
+ValidMailing=Valid emailing
+MailingStatusDraft=Draft
+MailingStatusValidated=Validated
+MailingStatusSent=Sent
+MailingStatusSentPartialy=Sent partially
+MailingStatusSentCompletely=Sent completely
+MailingStatusError=Error
+MailingStatusNotSent=Not sent
+MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
+MailingSuccessfullyValidated=EMailing successfully validated
+MailUnsubcribe=Unsubscribe
+MailingStatusNotContact=Don't contact anymore
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
+ErrorMailRecipientIsEmpty=Email recipient is empty
+WarningNoEMailsAdded=No new Email to add to recipient's list.
+ConfirmValidMailing=Are you sure you want to validate this emailing?
+ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
+ConfirmDeleteMailing=Are you sure you want to delete this emailing?
+NbOfUniqueEMails=No. of unique emails
+NbOfEMails=No. of EMails
+TotalNbOfDistinctRecipients=Number of distinct recipients
+NoTargetYet=No recipients defined yet (Go on tab 'Recipients')
+NoRecipientEmail=No recipient email for %s
+RemoveRecipient=Remove recipient
+YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README.
+EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values
+MailingAddFile=Attach this file
+NoAttachedFiles=No attached files
+BadEMail=Bad value for Email
+ConfirmCloneEMailing=Are you sure you want to clone this emailing?
+CloneContent=Clone message
+CloneReceivers=Cloner recipients
+DateLastSend=Date of latest sending
+DateSending=Date sending
+SentTo=Sent to <b>%s</b>
+MailingStatusRead=Read
+YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubscribe from mailing list
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubscribe" feature
+EMailSentToNRecipients=Email sent to %s recipients.
+EMailSentForNElements=Email sent for %s elements.
+XTargetsAdded=<b>%s</b> recipients added into target list
+OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachments in mass sending in this version).
+AllRecipientSelected=The recipients of the %s record selected (if their email is known).
+GroupEmails=Group emails
+OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
+WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
+ResultOfMailSending=Result of mass Email sending
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
+SentXXXmessages=%s message(s) sent.
+ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
+MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
+MailingModuleDescContactsByCompanyCategory=Contacts by third-party category
+MailingModuleDescContactsByCategory=Contacts by categories
+MailingModuleDescContactsByFunction=Contacts by position
+MailingModuleDescEmailsFromFile=Emails from file
+MailingModuleDescEmailsFromUser=Emails input by user
+MailingModuleDescDolibarrUsers=Users with Emails
+MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+
+# Libelle des modules de liste de destinataires mailing
+LineInFile=Line %s in file
+RecipientSelectionModules=Defined requests for recipient's selection
+MailSelectedRecipients=Selected recipients
+MailingArea=EMailings area
+LastMailings=Latest %s emailings
+TargetsStatistics=Targets statistics
+NbOfCompaniesContacts=Unique contacts/addresses
+MailNoChangePossible=Recipients for validated emailing can't be changed
+SearchAMailing=Search mailing
+SendMailing=Send emailing
+SentBy=Sent by
+MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
+MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
+ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+TargetsReset=Clear list
+ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
+ToAddRecipientsChooseHere=Add recipients by choosing from the lists
+NbOfEMailingsReceived=Mass emailings received
+NbOfEMailingsSend=Mass emailings sent
+IdRecord=ID record
+DeliveryReceipt=Delivery Ack.
+YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
+TagCheckMail=Track mail opening
+TagUnsubscribe=Unsubscribe link
+TagSignature=Signature of sending user
+EMailRecipient=Recipient Email
+TagMailtoEmail=Recipient Email (including html "mailto:" link)
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
+# Module Notifications
+Notifications=Notifications
+NoNotificationsWillBeSent=No email notifications are planned for this event and company
+ANotificationsWillBeSent=1 notification will be sent by email
+SomeNotificationsWillBeSent=%s notifications will be sent by email
+AddNewNotification=Activate a new email notification target/event
+ListOfActiveNotifications=List all active targets/events for email notification
+ListOfNotificationsDone=List all email notifications sent
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
+UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
+UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
+MailAdvTargetRecipients=Recipients (advanced selection)
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchIntHelp=Use interval to select int or float value
+AdvTgtMinVal=Minimum value
+AdvTgtMaxVal=Maximum value
+AdvTgtSearchDtHelp=Use interval to select date value
+AdvTgtStartDt=Start dt.
+AdvTgtEndDt=End dt.
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third-party email or just contact email
+AdvTgtTypeOfIncude=Type of targeted email
+AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
+AddAll=Add all
+RemoveAll=Remove all
+ItemsCount=Item(s)
+AdvTgtNameTemplate=Filter name
+AdvTgtAddContact=Add emails according to criteria
+AdvTgtLoadFilter=Load filter
+AdvTgtDeleteFilter=Delete filter
+AdvTgtSaveFilter=Save filter
+AdvTgtCreateFilter=Create filter
+AdvTgtOrCreateNewFilter=Name of new filter
+NoContactWithCategoryFound=No contact/address with a category found
+NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+DefaultOutgoingEmailSetup=Default outgoing email setup
+Information=Information
+ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/am_ET/main.lang b/htdocs/langs/am_ET/main.lang
new file mode 100644
index 00000000000..824a5e495b8
--- /dev/null
+++ b/htdocs/langs/am_ET/main.lang
@@ -0,0 +1,1035 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+# Note for Chinese:
+# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
+# stsongstdlight or cid0cs are for simplified Chinese
+# To read Chinese pdf with Linux: sudo apt-get install poppler-data
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
+DatabaseConnection=Database connection
+NoTemplateDefined=No template available for this email type
+AvailableVariables=Available substitution variables
+NoTranslation=No translation
+Translation=Translation
+EmptySearchString=Enter a non empty search string
+NoRecordFound=No record found
+NoRecordDeleted=No record deleted
+NotEnoughDataYet=Not enough data
+NoError=No error
+Error=Error
+Errors=Errors
+ErrorFieldRequired=Field '%s' is required
+ErrorFieldFormat=Field '%s' has a bad value
+ErrorFileDoesNotExists=File %s does not exist
+ErrorFailedToOpenFile=Failed to open file %s
+ErrorCanNotCreateDir=Cannot create dir %s
+ErrorCanNotReadDir=Cannot read dir %s
+ErrorConstantNotDefined=Parameter %s not defined
+ErrorUnknown=Unknown error
+ErrorSQL=SQL Error
+ErrorLogoFileNotFound=Logo file '%s' was not found
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
+ErrorGoToModuleSetup=Go to Module setup to fix this
+ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
+ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
+ErrorInternalErrorDetected=Error detected
+ErrorWrongHostParameter=Wrong host parameter
+ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post the form again.
+ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child record.
+ErrorWrongValue=Wrong value
+ErrorWrongValueForParameterX=Wrong value for parameter %s
+ErrorNoRequestInError=No request in error
+ErrorServiceUnavailableTryLater=Service not available at the moment. Try again later.
+ErrorDuplicateField=Duplicate value in a unique field
+ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back.
+ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
+ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
+ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
+ErrorFailedToSaveFile=Error, failed to save file.
+ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
+MaxNbOfRecordPerPage=Max. number of records per page
+NotAuthorized=You are not authorized to do that.
+SetDate=Set date
+SelectDate=Select a date
+SeeAlso=See also %s
+SeeHere=See here
+ClickHere=Click here
+Here=Here
+Apply=Apply
+BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
+FileGenerated=The file was successfully generated
+FileSaved=The file was successfully saved
+FileUploaded=The file was successfully uploaded
+FileTransferComplete=File(s) uploaded successfully
+FilesDeleted=File(s) successfully deleted
+FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
+NbOfEntries=No. of entries
+GoToWikiHelpPage=Read online help (Internet access needed)
+GoToHelpPage=Read help
+RecordSaved=Record saved
+RecordDeleted=Record deleted
+RecordGenerated=Record generated
+LevelOfFeature=Level of features
+NotDefined=Not defined
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
+Administrator=Administrator
+Undefined=Undefined
+PasswordForgotten=Password forgotten?
+NoAccount=No account?
+SeeAbove=See above
+HomeArea=Home
+LastConnexion=Last login
+PreviousConnexion=Previous login
+PreviousValue=Previous value
+ConnectedOnMultiCompany=Connected on environment
+ConnectedSince=Connected since
+AuthenticationMode=Authentication mode
+RequestedUrl=Requested URL
+DatabaseTypeManager=Database type manager
+RequestLastAccessInError=Latest database access request error
+ReturnCodeLastAccessInError=Return code for latest database access request error
+InformationLastAccessInError=Information for latest database access request error
+DolibarrHasDetectedError=Dolibarr has detected a technical error
+YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices)
+MoreInformation=More information
+TechnicalInformation=Technical information
+TechnicalID=Technical ID
+LineID=Line ID
+NotePublic=Note (public)
+NotePrivate=Note (private)
+PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
+DoTest=Test
+ToFilter=Filter
+NoFilter=No filter
+WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
+yes=yes
+Yes=Yes
+no=no
+No=No
+All=All
+Home=Home
+Help=Help
+OnlineHelp=Online help
+PageWiki=Wiki page
+MediaBrowser=Media browser
+Always=Always
+Never=Never
+Under=under
+Period=Period
+PeriodEndDate=End date for period
+SelectedPeriod=Selected period
+PreviousPeriod=Previous period
+Activate=Activate
+Activated=Activated
+Closed=Closed
+Closed2=Closed
+NotClosed=Not closed
+Enabled=Enabled
+Enable=Enable
+Deprecated=Deprecated
+Disable=Disable
+Disabled=Disabled
+Add=Add
+AddLink=Add link
+RemoveLink=Remove link
+AddToDraft=Add to draft
+Update=Update
+Close=Close
+CloseBox=Remove widget from your dashboard
+Confirm=Confirm
+ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
+Delete=Delete
+Remove=Remove
+Resiliate=Terminate
+Cancel=Cancel
+Modify=Modify
+Edit=Edit
+Validate=Validate
+ValidateAndApprove=Validate and Approve
+ToValidate=To validate
+NotValidated=Not validated
+Save=Save
+SaveAs=Save As
+SaveAndStay=Save and stay
+SaveAndNew=Save and new
+TestConnection=Test connection
+ToClone=Clone
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
+ConfirmClone=Choose data you want to clone:
+NoCloneOptionsSpecified=No data to clone defined.
+Of=of
+Go=Go
+Run=Run
+CopyOf=Copy of
+Show=Show
+Hide=Hide
+ShowCardHere=Show card
+Search=Search
+SearchOf=Search
+SearchMenuShortCut=Ctrl + shift + f
+Valid=Valid
+Approve=Approve
+Disapprove=Disapprove
+ReOpen=Re-Open
+Upload=Upload
+ToLink=Link
+Select=Select
+Choose=Choose
+Resize=Resize
+ResizeOrCrop=Resize or Crop
+Recenter=Recenter
+Author=Author
+User=User
+Users=Users
+Group=Group
+Groups=Groups
+NoUserGroupDefined=No user group defined
+Password=Password
+PasswordRetype=Retype your password
+NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
+Name=Name
+NameSlashCompany=Name / Company
+Person=Person
+Parameter=Parameter
+Parameters=Parameters
+Value=Value
+PersonalValue=Personal value
+NewObject=New %s
+NewValue=New value
+CurrentValue=Current value
+Code=Code
+Type=Type
+Language=Language
+MultiLanguage=Multi-language
+Note=Note
+Title=Title
+Label=Label
+RefOrLabel=Ref. or label
+Info=Log
+Family=Family
+Description=Description
+Designation=Description
+DescriptionOfLine=Description of line
+DateOfLine=Date of line
+DurationOfLine=Duration of line
+Model=Doc template
+DefaultModel=Default doc template
+Action=Event
+About=About
+Number=Number
+NumberByMonth=Number by month
+AmountByMonth=Amount by month
+Numero=Number
+Limit=Limit
+Limits=Limits
+Logout=Logout
+NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
+Connection=Login
+Setup=Setup
+Alert=Alert
+MenuWarnings=Alerts
+Previous=Previous
+Next=Next
+Cards=Cards
+Card=Card
+Now=Now
+HourStart=Start hour
+Date=Date
+DateAndHour=Date and hour
+DateToday=Today's date
+DateReference=Reference date
+DateStart=Start date
+DateEnd=End date
+DateCreation=Creation date
+DateCreationShort=Creat. date
+DateModification=Modification date
+DateModificationShort=Modif. date
+DateLastModification=Latest modification date
+DateValidation=Validation date
+DateClosing=Closing date
+DateDue=Due date
+DateValue=Value date
+DateValueShort=Value date
+DateOperation=Operation date
+DateOperationShort=Oper. Date
+DateLimit=Limit date
+DateRequest=Request date
+DateProcess=Process date
+DateBuild=Report build date
+DatePayment=Date of payment
+DateApprove=Approving date
+DateApprove2=Approving date (second approval)
+RegistrationDate=Registration date
+UserCreation=Creation user
+UserModification=Modification user
+UserValidation=Validation user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
+UserValidationShort=Valid. user
+DurationYear=year
+DurationMonth=month
+DurationWeek=week
+DurationDay=day
+DurationYears=years
+DurationMonths=months
+DurationWeeks=weeks
+DurationDays=days
+Year=Year
+Month=Month
+Week=Week
+WeekShort=Week
+Day=Day
+Hour=Hour
+Minute=Minute
+Second=Second
+Years=Years
+Months=Months
+Days=Days
+days=days
+Hours=Hours
+Minutes=Minutes
+Seconds=Seconds
+Weeks=Weeks
+Today=Today
+Yesterday=Yesterday
+Tomorrow=Tomorrow
+Morning=Morning
+Afternoon=Afternoon
+Quadri=Quadri
+MonthOfDay=Month of the day
+HourShort=H
+MinuteShort=mn
+Rate=Rate
+CurrencyRate=Currency conversion rate
+UseLocalTax=Include tax
+Bytes=Bytes
+KiloBytes=Kilobytes
+MegaBytes=Megabytes
+GigaBytes=Gigabytes
+TeraBytes=Terabytes
+UserAuthor=User of creation
+UserModif=User of last update
+b=b.
+Kb=Kb
+Mb=Mb
+Gb=Gb
+Tb=Tb
+Cut=Cut
+Copy=Copy
+Paste=Paste
+Default=Default
+DefaultValue=Default value
+DefaultValues=Default values/filters/sorting
+Price=Price
+PriceCurrency=Price (currency)
+UnitPrice=Unit price
+UnitPriceHT=Unit price (excl.)
+UnitPriceHTCurrency=Unit price (excl.) (currency)
+UnitPriceTTC=Unit price
+PriceU=U.P.
+PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
+PriceUTTC=U.P. (inc. tax)
+Amount=Amount
+AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
+AmountInvoicedHT=Amount invoiced (incl. tax)
+AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountPayment=Payment amount
+AmountHTShort=Amount (excl.)
+AmountTTCShort=Amount (inc. tax)
+AmountHT=Amount (excl. tax)
+AmountTTC=Amount (inc. tax)
+AmountVAT=Amount tax
+MulticurrencyAlreadyPaid=Already paid, original currency
+MulticurrencyRemainderToPay=Remain to pay, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+MulticurrencyAmountHT=Amount (excl. tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
+AmountLT1=Amount tax 2
+AmountLT2=Amount tax 3
+AmountLT1ES=Amount RE
+AmountLT2ES=Amount IRPF
+AmountTotal=Total amount
+AmountAverage=Average amount
+PriceQtyMinHT=Price quantity min. (excl. tax)
+PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+Percentage=Percentage
+Total=Total
+SubTotal=Subtotal
+TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
+TotalHTShortCurrency=Total (excl. in currency)
+TotalTTCShort=Total (inc. tax)
+TotalHT=Total (excl. tax)
+TotalHTforthispage=Total (excl. tax) for this page
+Totalforthispage=Total for this page
+TotalTTC=Total (inc. tax)
+TotalTTCToYourCredit=Total (inc. tax) to your credit
+TotalVAT=Total tax
+TotalVATIN=Total IGST
+TotalLT1=Total tax 2
+TotalLT2=Total tax 3
+TotalLT1ES=Total RE
+TotalLT2ES=Total IRPF
+TotalLT1IN=Total CGST
+TotalLT2IN=Total SGST
+HT=Excl. tax
+TTC=Inc. tax
+INCVATONLY=Inc. VAT
+INCT=Inc. all taxes
+VAT=Sales tax
+VATIN=IGST
+VATs=Sales taxes
+VATINs=IGST taxes
+LT1=Sales tax 2
+LT1Type=Sales tax 2 type
+LT2=Sales tax 3
+LT2Type=Sales tax 3 type
+LT1ES=RE
+LT2ES=IRPF
+LT1IN=CGST
+LT2IN=SGST
+LT1GC=Additionnal cents
+VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
+DefaultTaxRate=Default tax rate
+Average=Average
+Sum=Sum
+Delta=Delta
+StatusToPay=To pay
+RemainToPay=Remain to pay
+Module=Module/Application
+Modules=Modules/Applications
+Option=Option
+List=List
+FullList=Full list
+FullConversation=Full conversation
+Statistics=Statistics
+OtherStatistics=Other statistics
+Status=Status
+Favorite=Favorite
+ShortInfo=Info.
+Ref=Ref.
+ExternalRef=Ref. extern
+RefSupplier=Ref. vendor
+RefPayment=Ref. payment
+CommercialProposalsShort=Commercial proposals
+Comment=Comment
+Comments=Comments
+ActionsToDo=Events to do
+ActionsToDoShort=To do
+ActionsDoneShort=Done
+ActionNotApplicable=Not applicable
+ActionRunningNotStarted=To start
+ActionRunningShort=In progress
+ActionDoneShort=Finished
+ActionUncomplete=Incomplete
+LatestLinkedEvents=Latest %s linked events
+CompanyFoundation=Company/Organization
+Accountant=Accountant
+ContactsForCompany=Contacts for this third party
+ContactsAddressesForCompany=Contacts/addresses for this third party
+AddressesForCompany=Addresses for this third party
+ActionsOnCompany=Events for this third party
+ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
+ActionsOnMember=Events about this member
+ActionsOnProduct=Events about this product
+NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
+RequestAlreadyDone=Request already recorded
+Filter=Filter
+FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
+RemoveFilter=Remove filter
+ChartGenerated=Chart generated
+ChartNotGenerated=Chart not generated
+GeneratedOn=Build on %s
+Generate=Generate
+Duration=Duration
+TotalDuration=Total duration
+Summary=Summary
+DolibarrStateBoard=Database Statistics
+DolibarrWorkBoard=Open Items
+NoOpenedElementToProcess=No open element to process
+Available=Available
+NotYetAvailable=Not yet available
+NotAvailable=Not available
+Categories=Tags/categories
+Category=Tag/category
+By=By
+From=From
+FromLocation=From
+to=to
+To=to
+and=and
+or=or
+Other=Other
+Others=Others
+OtherInformations=Other information
+Quantity=Quantity
+Qty=Qty
+ChangedBy=Changed by
+ApprovedBy=Approved by
+ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
+ReCalculate=Recalculate
+ResultKo=Failure
+Reporting=Reporting
+Reportings=Reporting
+Draft=Draft
+Drafts=Drafts
+StatusInterInvoiced=Invoiced
+Validated=Validated
+Opened=Open
+OpenAll=Open (All)
+ClosedAll=Closed (All)
+New=New
+Discount=Discount
+Unknown=Unknown
+General=General
+Size=Size
+OriginalSize=Original size
+Received=Received
+Paid=Paid
+Topic=Subject
+ByCompanies=By third parties
+ByUsers=By user
+Links=Links
+Link=Link
+Rejects=Rejects
+Preview=Preview
+NextStep=Next step
+Datas=Data
+None=None
+NoneF=None
+NoneOrSeveral=None or several
+Late=Late
+LateDesc=An item is defined as Delayed as per the system configuration in menu Home - Setup - Alerts.
+NoItemLate=No late item
+Photo=Picture
+Photos=Pictures
+AddPhoto=Add picture
+DeletePicture=Picture delete
+ConfirmDeletePicture=Confirm picture deletion?
+Login=Login
+LoginEmail=Login (email)
+LoginOrEmail=Login or Email
+CurrentLogin=Current login
+EnterLoginDetail=Enter login details
+January=January
+February=February
+March=March
+April=April
+May=May
+June=June
+July=July
+August=August
+September=September
+October=October
+November=November
+December=December
+Month01=January
+Month02=February
+Month03=March
+Month04=April
+Month05=May
+Month06=June
+Month07=July
+Month08=August
+Month09=September
+Month10=October
+Month11=November
+Month12=December
+MonthShort01=Jan
+MonthShort02=Feb
+MonthShort03=Mar
+MonthShort04=Apr
+MonthShort05=May
+MonthShort06=Jun
+MonthShort07=Jul
+MonthShort08=Aug
+MonthShort09=Sep
+MonthShort10=Oct
+MonthShort11=Nov
+MonthShort12=Dec
+MonthVeryShort01=J
+MonthVeryShort02=F
+MonthVeryShort03=M
+MonthVeryShort04=A
+MonthVeryShort05=M
+MonthVeryShort06=J
+MonthVeryShort07=J
+MonthVeryShort08=A
+MonthVeryShort09=S
+MonthVeryShort10=O
+MonthVeryShort11=N
+MonthVeryShort12=D
+AttachedFiles=Attached files and documents
+JoinMainDoc=Join main document
+DateFormatYYYYMM=YYYY-MM
+DateFormatYYYYMMDD=YYYY-MM-DD
+DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
+ReportName=Report name
+ReportPeriod=Report period
+ReportDescription=Description
+Report=Report
+Keyword=Keyword
+Origin=Origin
+Legend=Legend
+Fill=Fill
+Reset=Reset
+File=File
+Files=Files
+NotAllowed=Not allowed
+ReadPermissionNotAllowed=Read permission not allowed
+AmountInCurrency=Amount in %s currency
+Example=Example
+Examples=Examples
+NoExample=No example
+FindBug=Report a bug
+NbOfThirdParties=Number of third parties
+NbOfLines=Number of lines
+NbOfObjects=Number of objects
+NbOfObjectReferers=Number of related items
+Referers=Related items
+TotalQuantity=Total quantity
+DateFromTo=From %s to %s
+DateFrom=From %s
+DateUntil=Until %s
+Check=Check
+Uncheck=Uncheck
+Internal=Internal
+External=External
+Internals=Internal
+Externals=External
+Warning=Warning
+Warnings=Warnings
+BuildDoc=Build Doc
+Entity=Environment
+Entities=Entities
+CustomerPreview=Customer preview
+SupplierPreview=Vendor preview
+ShowCustomerPreview=Show customer preview
+ShowSupplierPreview=Show vendor preview
+RefCustomer=Ref. customer
+Currency=Currency
+InfoAdmin=Information for administrators
+Undo=Undo
+Redo=Redo
+ExpandAll=Expand all
+UndoExpandAll=Undo expand
+SeeAll=See all
+Reason=Reason
+FeatureNotYetSupported=Feature not yet supported
+CloseWindow=Close window
+Response=Response
+Priority=Priority
+SendByMail=Send by email
+MailSentBy=Email sent by
+TextUsedInTheMessageBody=Email body
+SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
+Email=Email
+NoEMail=No email
+AlreadyRead=Already read
+NotRead=Not read
+NoMobilePhone=No mobile phone
+Owner=Owner
+FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
+Refresh=Refresh
+BackToList=Back to list
+GoBack=Go back
+CanBeModifiedIfOk=Can be modified if valid
+CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
+RecordCreatedSuccessfully=Record created successfully
+RecordModifiedSuccessfully=Record modified successfully
+RecordsModified=%s record(s) modified
+RecordsDeleted=%s record(s) deleted
+RecordsGenerated=%s record(s) generated
+AutomaticCode=Automatic code
+FeatureDisabled=Feature disabled
+MoveBox=Move widget
+Offered=Offered
+NotEnoughPermissions=You don't have permission for this action
+SessionName=Session name
+Method=Method
+Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+PartialWoman=Partial
+TotalWoman=Total
+NeverReceived=Never received
+Canceled=Canceled
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
+YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record in module setup
+Color=Color
+Documents=Linked files
+Documents2=Documents
+UploadDisabled=Upload disabled
+MenuAccountancy=Accounting
+MenuECM=Documents
+MenuAWStats=AWStats
+MenuMembers=Members
+MenuAgendaGoogle=Google agenda
+ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+NoFileFound=No documents saved in this directory
+CurrentUserLanguage=Current language
+CurrentTheme=Current theme
+CurrentMenuManager=Current menu manager
+Browser=Browser
+Layout=Layout
+Screen=Screen
+DisabledModules=Disabled modules
+For=For
+ForCustomer=For customer
+Signature=Signature
+DateOfSignature=Date of signature
+HidePassword=Show command with password hidden
+UnHidePassword=Show real command with clear password
+Root=Root
+RootOfMedias=Root of public medias (/medias)
+Informations=Information
+Page=Page
+Notes=Notes
+AddNewLine=Add new line
+AddFile=Add file
+FreeZone=Not a predefined product/service
+FreeLineOfType=Free-text item, type:
+CloneMainAttributes=Clone object with its main attributes
+ReGeneratePDF=Re-generate PDF
+PDFMerge=PDF Merge
+Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
+PrintContentArea=Show page to print main content area
+MenuManager=Menu manager
+WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
+CoreErrorTitle=System error
+CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
+CreditCard=Credit card
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
+FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
+FieldsWithIsForPublic=Fields with <b>%s</b> are shown in public list of members. If you don't want this, uncheck the "public" box.
+AccordingToGeoIPDatabase=(according to GeoIP conversion)
+Line=Line
+NotSupported=Not supported
+RequiredField=Required field
+Result=Result
+ToTest=Test
+ValidateBefore=Item must be validated before using this feature
+Visibility=Visibility
+Totalizable=Totalizable
+TotalizableDesc=This field is totalizable in list
+Private=Private
+Hidden=Hidden
+Resources=Resources
+Source=Source
+Prefix=Prefix
+Before=Before
+After=After
+IPAddress=IP address
+Frequency=Frequency
+IM=Instant messaging
+NewAttribute=New attribute
+AttributeCode=Attribute code
+URLPhoto=URL of photo/logo
+SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToTemplateInvoice=Link to template invoice
+LinkToSupplierOrder=Link to purchase order
+LinkToSupplierProposal=Link to vendor proposal
+LinkToSupplierInvoice=Link to vendor invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
+CreateDraft=Create draft
+SetToDraft=Back to draft
+ClickToEdit=Click to edit
+ClickToRefresh=Click to refresh
+EditWithEditor=Edit with CKEditor
+EditWithTextEditor=Edit with Text editor
+EditHTMLSource=Edit HTML Source
+ObjectDeleted=Object %s deleted
+ByCountry=By country
+ByTown=By town
+ByDate=By date
+ByMonthYear=By month/year
+ByYear=By year
+ByMonth=By month
+ByDay=By day
+BySalesRepresentative=By sales representative
+LinkedToSpecificUsers=Linked to a particular user contact
+NoResults=No results
+AdminTools=Admin Tools
+SystemTools=System tools
+ModulesSystemTools=Modules tools
+Test=Test
+Element=Element
+NoPhotoYet=No pictures available yet
+Dashboard=Dashboard
+MyDashboard=My Dashboard
+Deductible=Deductible
+from=from
+toward=toward
+Access=Access
+SelectAction=Select action
+SelectTargetUser=Select target user/employee
+HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
+SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
+OriginFileName=Original filename
+SetDemandReason=Set source
+SetBankAccount=Define Bank Account
+AccountCurrency=Account currency
+ViewPrivateNote=View notes
+XMoreLines=%s line(s) hidden
+ShowMoreLines=Show more/less lines
+PublicUrl=Public URL
+AddBox=Add box
+SelectElementAndClick=Select an element and click %s
+PrintFile=Print File %s
+ShowTransaction=Show entry on bank account
+ShowIntervention=Show intervention
+ShowContract=Show contract
+GoIntoSetupToChangeLogo=Go to Home - Setup - Company to change logo or go to Home - Setup - Display to hide.
+Deny=Deny
+Denied=Denied
+ListOf=List of %s
+ListOfTemplates=List of templates
+Gender=Gender
+Genderman=Man
+Genderwoman=Woman
+ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
+Mandatory=Mandatory
+Hello=Hello
+GoodBye=GoodBye
+Sincerely=Sincerely
+ConfirmDeleteObject=Are you sure you want to delete this object?
+DeleteLine=Delete line
+ConfirmDeleteLine=Are you sure you want to delete this line?
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records.
+NoRecordSelected=No record selected
+MassFilesArea=Area for files built by mass actions
+ShowTempMassFilesArea=Show area of files built by mass actions
+ConfirmMassDeletion=Bulk Delete confirmation
+ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
+RelatedObjects=Related Objects
+ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
+Progress=Progress
+ProgressShort=Progr.
+FrontOffice=Front office
+BackOffice=Back office
+Submit=Submit
+View=View
+Export=Export
+Exports=Exports
+ExportFilteredList=Export filtered list
+ExportList=Export list
+ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
+Miscellaneous=Miscellaneous
+Calendar=Calendar
+GroupBy=Group by...
+ViewFlatList=View flat list
+RemoveString=Remove string '%s'
+SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+DirectDownloadLink=Direct download link (public/external)
+DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+Download=Download
+DownloadDocument=Download document
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
+ModuleBuilder=Module and Application Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status?
+ImportId=Import id
+Events=Events
+EMailTemplates=Email templates
+FileNotShared=File not shared to external public
+Project=Project
+Projects=Projects
+LeadOrProject=Lead | Project
+LeadsOrProjects=Leads | Projects
+Lead=Lead
+Leads=Leads
+ListOpenLeads=List open leads
+ListOpenProjects=List open projects
+NewLeadOrProject=New lead or project
+Rights=Permissions
+LineNb=Line no.
+IncotermLabel=Incoterms
+TabLetteringCustomer=Customer lettering
+TabLetteringSupplier=Vendor lettering
+Monday=Monday
+Tuesday=Tuesday
+Wednesday=Wednesday
+Thursday=Thursday
+Friday=Friday
+Saturday=Saturday
+Sunday=Sunday
+MondayMin=Mo
+TuesdayMin=Tu
+WednesdayMin=We
+ThursdayMin=Th
+FridayMin=Fr
+SaturdayMin=Sa
+SundayMin=Su
+Day1=Monday
+Day2=Tuesday
+Day3=Wednesday
+Day4=Thursday
+Day5=Friday
+Day6=Saturday
+Day0=Sunday
+ShortMonday=M
+ShortTuesday=T
+ShortWednesday=W
+ShortThursday=T
+ShortFriday=F
+ShortSaturday=S
+ShortSunday=S
+SelectMailModel=Select an email template
+SetRef=Set ref
+Select2ResultFoundUseArrows=Some results found. Use arrows to select.
+Select2NotFound=No result found
+Select2Enter=Enter
+Select2MoreCharacter=or more character
+Select2MoreCharacters=or more characters
+Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
+Select2LoadingMoreResults=Loading more results...
+Select2SearchInProgress=Search in progress...
+SearchIntoThirdparties=Third parties
+SearchIntoContacts=Contacts
+SearchIntoMembers=Members
+SearchIntoUsers=Users
+SearchIntoProductsOrServices=Products or services
+SearchIntoProjects=Projects
+SearchIntoMO=Manufacturing Orders
+SearchIntoTasks=Tasks
+SearchIntoCustomerInvoices=Customer invoices
+SearchIntoSupplierInvoices=Vendor invoices
+SearchIntoCustomerOrders=Sales orders
+SearchIntoSupplierOrders=Purchase orders
+SearchIntoCustomerProposals=Commercial proposals
+SearchIntoSupplierProposals=Vendor proposals
+SearchIntoInterventions=Interventions
+SearchIntoContracts=Contracts
+SearchIntoCustomerShipments=Customer shipments
+SearchIntoExpenseReports=Expense reports
+SearchIntoLeaves=Leave
+SearchIntoTickets=Tickets
+CommentLink=Comments
+NbComments=Number of comments
+CommentPage=Comments space
+CommentAdded=Comment added
+CommentDeleted=Comment deleted
+Everybody=Everybody
+PayedBy=Paid by
+PayedTo=Paid to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft mass delete confirmation
+FileSharedViaALink=File shared via a link
+SelectAThirdPartyFirst=Select a third party first...
+YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
+AnalyticCode=Analytic code
+TMenuMRP=MRP
+ShowMoreInfos=Show More Infos
+NoFilesUploadedYet=Please upload a document first
+SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
+ContactDefault_agenda=Event
+ContactDefault_commande=Order
+ContactDefault_contrat=Contract
+ContactDefault_facture=Invoice
+ContactDefault_fichinter=Intervention
+ContactDefault_invoice_supplier=Supplier Invoice
+ContactDefault_order_supplier=Purchase Order
+ContactDefault_project=Project
+ContactDefault_project_task=Task
+ContactDefault_propal=Proposal
+ContactDefault_supplier_proposal=Supplier Proposal
+ContactDefault_ticket=Ticket
+ContactAddedAutomatically=Contact added from contact thirdparty roles
+More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+StatisticsOn=Statistics on
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
+Measures=Measures
+XAxis=X-Axis
+YAxis=Y-Axis
+StatusOfRefMustBe=Status of %s must be %s
+DeleteFileHeader=Confirm file delete
+DeleteFileText=Do you really want delete this file?
+ShowOtherLanguages=Show other languages
+SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
+NotUsedForThisCustomer=Not used for this customer
diff --git a/htdocs/langs/am_ET/margins.lang b/htdocs/langs/am_ET/margins.lang
new file mode 100644
index 00000000000..76ea8ad5c4d
--- /dev/null
+++ b/htdocs/langs/am_ET/margins.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - marges
+
+Margin=Margin
+Margins=Margins
+TotalMargin=Total Margin
+MarginOnProducts=Margin / Products
+MarginOnServices=Margin / Services
+MarginRate=Margin rate
+MarkRate=Mark rate
+DisplayMarginRates=Display margin rates
+DisplayMarkRates=Display mark rates
+InputPrice=Input price
+margin=Profit margins management
+margesSetup=Profit margins management setup
+MarginDetails=Margin details
+ProductMargins=Product margins
+CustomerMargins=Customer margins
+SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
+UserMargins=User margins
+ProductService=Product or Service
+AllProducts=All products and services
+ChooseProduct/Service=Choose product or service
+ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
+ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
+UseDiscountAsProduct=As a product
+UseDiscountAsService=As a service
+UseDiscountOnTotal=On subtotal
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
+MargeType1=Margin on Best vendor price
+MargeType2=Margin on Weighted Average Price (WAP)
+MargeType3=Margin on Cost Price
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
+CostPrice=Cost price
+UnitCharges=Unit charges
+Charges=Charges
+AgentContactType=Commercial agent contact type
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
+CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/am_ET/members.lang b/htdocs/langs/am_ET/members.lang
new file mode 100644
index 00000000000..dd0a5bf49e2
--- /dev/null
+++ b/htdocs/langs/am_ET/members.lang
@@ -0,0 +1,204 @@
+# Dolibarr language file - Source file is en_US - members
+MembersArea=Members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of terminated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Terminated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
+DateSubscription=Subscription date
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=Subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Terminated member
+MemberStatusResiliatedShort=Terminated
+MembersStatusToValid=Draft members
+MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Validated
+SubscriptionNotNeeded=No subscription needed
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+MemberTypeModified=Member type modified
+DeleteAMemberType=Delete a member type
+ConfirmDeleteMemberType=Are you sure you want to delete this member type?
+MemberTypeDeleted=Member type deleted
+MemberTypeCanNotBeDeleted=Member type can not be deleted
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome email
+SubscriptionRequired=Subscription required
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Terminate a member
+ConfirmResiliateMember=Are you sure you want to terminate this member?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions)?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public self-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public website with self-subscription form
+ForceMemberType=Force the member type
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembersModified=Latest %s modified members
+LastSubscriptionsModified=Latest %s modified subscriptions
+String=String
+Text=Text
+Int=Int
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+SubscriptionNotRecorded=Subscription not recorded
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct entry on bank account
+MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Latest member date
+LatestSubscriptionDate=Latest subscription date
+MemberNature=Nature of member
+Public=Information are public
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No VAT for subscriptions
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
+MembershipPaid=Membership paid for current period (until %s)
+YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
+XMembersClosed=%s member(s) closed
diff --git a/htdocs/langs/am_ET/modulebuilder.lang b/htdocs/langs/am_ET/modulebuilder.lang
new file mode 100644
index 00000000000..135ac1ae9ec
--- /dev/null
+++ b/htdocs/langs/am_ET/modulebuilder.lang
@@ -0,0 +1,141 @@
+# Dolibarr language file - Source file is en_US - loan
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
+ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
+ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
+ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
+NewModule=New module
+NewObjectInModulebuilder=New object
+ModuleKey=Module key
+ObjectKey=Object key
+ModuleInitialized=Module initialized
+FilesForObjectInitialized=Files for new object '%s' initialized
+FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
+ModuleBuilderDescdescription=Enter here all general information that describe your module.
+ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
+ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
+ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
+ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
+ModuleBuilderDeschooks=This tab is dedicated to hooks.
+ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
+ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
+DangerZone=Danger zone
+BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
+BuildDocumentation=Build documentation
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
+DescriptionLong=Long description
+EditorName=Name of editor
+EditorUrl=URL of editor
+DescriptorFile=Descriptor file of module
+ClassFile=File for PHP DAO CRUD class
+ApiClassFile=File for PHP API class
+PageForList=PHP page for list of record
+PageForCreateEditView=PHP page to create/edit/view a record
+PageForAgendaTab=PHP page for event tab
+PageForDocumentTab=PHP page for document tab
+PageForNoteTab=PHP page for note tab
+PathToModulePackage=Path to zip of module/application package
+PathToModuleDocumentation=Path to file of module/application documentation (%s)
+SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
+FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Force update of .class and .sql files
+RegenerateMissingFiles=Generate missing files
+SpecificationFile=File of documentation
+LanguageFile=File for language
+ObjectProperties=Object Properties
+ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
+NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
+SearchAll=Used for 'search all'
+DatabaseIndex=Database index
+FileAlreadyExists=File %s already exists
+TriggersFile=File for triggers code
+HooksFile=File for hooks code
+ArrayOfKeyValues=Array of key-val
+ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
+WidgetFile=Widget file
+CSSFile=CSS file
+JSFile=Javascript file
+ReadmeFile=Readme file
+ChangeLog=ChangeLog file
+TestClassFile=File for PHP Unit Test class
+SqlFile=Sql file
+PageForLib=File for the common PHP library
+PageForObjLib=File for the PHP library dedicated to object
+SqlFileExtraFields=Sql file for complementary attributes
+SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
+AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
+UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Is a measure
+DirScanned=Directory scanned
+NoTrigger=No trigger
+NoWidget=No widget
+GoToApiExplorer=Go to API explorer
+ListOfMenusEntries=List of menu entries
+ListOfDictionariesEntries=List of dictionaries entries
+ListOfPermissionsDefined=List of defined permissions
+SeeExamples=See examples here
+EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdf=Display on PDF
+IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
+SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
+SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
+LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
+MenusDefDesc=Define here the menus provided by your module
+DictionariesDefDesc=Define here the dictionaries provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
+HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
+TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
+SeeIDsInUse=See IDs in use in your installation
+SeeReservedIDsRangeHere=See range of reserved IDs
+ToolkitForDevelopers=Toolkit for Dolibarr developers
+TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
+SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
+AddLanguageFile=Add language file
+YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
+DropTableIfEmpty=(Delete table if empty)
+TableDoesNotExists=The table %s does not exists
+TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
+UseAboutPage=Disable the about page
+UseDocFolder=Disable the documentation folder
+UseSpecificReadme=Use a specific ReadMe
+ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
+RealPathOfModule=Real path of module
+ContentCantBeEmpty=Content of file can't be empty
+WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
+CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
+JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
+CLIDesc=You can generate here some command line scripts you want to provide with your module.
+CLIFile=CLI File
+NoCLIFile=No CLI files
+UseSpecificEditorName = Use a specific editor name
+UseSpecificEditorURL = Use a specific editor URL
+UseSpecificFamily = Use a specific family
+UseSpecificAuthor = Use a specific author
+UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
+IncludeRefGeneration=The reference of object must be generated automatically
+IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
+IncludeDocGeneration=I want to generate some documents from the object
+IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
+ShowOnCombobox=Show value into combobox
+KeyForTooltip=Key for tooltip
+CSSClass=CSS Class
+NotEditable=Not editable
+ForeignKey=Foreign key
+TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/am_ET/mrp.lang b/htdocs/langs/am_ET/mrp.lang
new file mode 100644
index 00000000000..d3c4d3253c6
--- /dev/null
+++ b/htdocs/langs/am_ET/mrp.lang
@@ -0,0 +1,76 @@
+Mrp=Manufacturing Orders
+MO=Manufacturing Order
+MRPDescription=Module to manage production and Manufacturing Orders (MO).
+MRPArea=MRP Area
+MrpSetupPage=Setup of module MRP
+MenuBOM=Bills of material
+LatestBOMModified=Latest %s Bills of materials modified
+LatestMOModified=Latest %s Manufacturing Orders modified
+Bom=Bills of Material
+BillOfMaterials=Bill of Material
+BOMsSetup=Setup of module BOM
+ListOfBOMs=List of bills of material - BOM
+ListOfManufacturingOrders=List of Manufacturing Orders
+NewBOM=New bill of material
+ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+BOMsNumberingModules=BOM numbering templates
+BOMsModelModule=BOM document templates
+MOsNumberingModules=MO numbering templates
+MOsModelModule=MO document templates
+FreeLegalTextOnBOMs=Free text on document of BOM
+WatermarkOnDraftBOMs=Watermark on draft BOM
+FreeLegalTextOnMOs=Free text on document of MO
+WatermarkOnDraftMOs=Watermark on draft MO
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
+ManufacturingEfficiency=Manufacturing efficiency
+ConsumptionEfficiency=Consumption efficiency
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
+DeleteBillOfMaterials=Delete Bill Of Materials
+DeleteMo=Delete Manufacturing Order
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+MenuMRP=Manufacturing Orders
+NewMO=New Manufacturing Order
+QtyToProduce=Qty to produce
+DateStartPlannedMo=Date start planned
+DateEndPlannedMo=Date end planned
+KeepEmptyForAsap=Empty means 'As Soon As Possible'
+EstimatedDuration=Estimated duration
+EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
+ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
+ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
+StatusMOProduced=Produced
+QtyFrozen=Frozen Qty
+QuantityFrozen=Frozen Quantity
+QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
+DisableStockChange=Stock change disabled
+DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
+BomAndBomLines=Bills Of Material and lines
+BOMLine=Line of BOM
+WarehouseForProduction=Warehouse for production
+CreateMO=Create MO
+ToConsume=To consume
+ToProduce=To produce
+QtyAlreadyConsumed=Qty already consumed
+QtyAlreadyProduced=Qty already produced
+QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
+ConsumeOrProduce=Consume or Produce
+ConsumeAndProduceAll=Consume and Produce All
+Manufactured=Manufactured
+TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
+ForAQuantityOf=For a quantity to produce of %s
+ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
+ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
+ProductionForRef=Production of %s
+AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
+NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
+AddNewConsumeLines=Add new line to consume
+ProductsToConsume=Products to consume
+ProductsToProduce=Products to produce
+UnitCost=Unit cost
+TotalCost=Total cost
diff --git a/htdocs/langs/am_ET/multicurrency.lang b/htdocs/langs/am_ET/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/am_ET/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/am_ET/oauth.lang b/htdocs/langs/am_ET/oauth.lang
new file mode 100644
index 00000000000..075ff49a895
--- /dev/null
+++ b/htdocs/langs/am_ET/oauth.lang
@@ -0,0 +1,32 @@
+# Dolibarr language file - Source file is en_US - oauth
+ConfigOAuth=OAuth Configuration
+OAuthServices=OAuth Services
+ManualTokenGeneration=Manual token generation
+TokenManager=Token Manager
+IsTokenGenerated=Is token generated ?
+NoAccessToken=No access token saved into local database
+HasAccessToken=A token was generated and saved into local database
+NewTokenStored=Token received and saved
+ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
+TokenDeleted=Token deleted
+RequestAccess=Click here to request/renew access and receive a new token to save
+DeleteAccess=Click here to delete token
+UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
+ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
+OAuthSetupForLogin=Page to generate an OAuth token
+SeePreviousTab=See previous tab
+OAuthIDSecret=OAuth ID and Secret
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=OAuth Google service
+OAUTH_GOOGLE_ID=OAuth Google Id
+OAUTH_GOOGLE_SECRET=OAuth Google Secret
+OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create OAuth credentials
+OAUTH_GITHUB_NAME=OAuth GitHub service
+OAUTH_GITHUB_ID=OAuth GitHub Id
+OAUTH_GITHUB_SECRET=OAuth GitHub Secret
+OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create OAuth credentials
+OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
+OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/am_ET/opensurvey.lang b/htdocs/langs/am_ET/opensurvey.lang
new file mode 100644
index 00000000000..7d26151fa16
--- /dev/null
+++ b/htdocs/langs/am_ET/opensurvey.lang
@@ -0,0 +1,61 @@
+# Dolibarr language file - Source file is en_US - opensurvey
+Survey=Poll
+Surveys=Polls
+OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select the type of poll...
+NewSurvey=New poll
+OpenSurveyArea=Polls area
+AddACommentForPoll=You can add a comment into poll...
+AddComment=Add comment
+CreatePoll=Create poll
+PollTitle=Poll title
+ToReceiveEMailForEachVote=Receive an email for each vote
+TypeDate=Type date
+TypeClassic=Type standard
+OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
+RemoveAllDays=Remove all days
+CopyHoursOfFirstDay=Copy hours of first day
+RemoveAllHours=Remove all hours
+SelectedDays=Selected days
+TheBestChoice=The best choice currently is
+TheBestChoices=The best choices currently are
+with=with
+OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
+CommentsOfVoters=Comments of voters
+ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
+RemovePoll=Remove poll
+UrlForSurvey=URL to communicate to get a direct access to poll
+PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
+CreateSurveyDate=Create a date poll
+CreateSurveyStandard=Create a standard poll
+CheckBox=Simple checkbox
+YesNoList=List (empty/yes/no)
+PourContreList=List (empty/for/against)
+AddNewColumn=Add new column
+TitleChoice=Choice label
+ExportSpreadsheet=Export result spreadsheet
+ExpireDate=Limit date
+NbOfSurveys=Number of polls
+NbOfVoters=No. of voters
+SurveyResults=Results
+PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
+5MoreChoices=5 more choices
+Against=Against
+YouAreInivitedToVote=You are invited to vote for this poll
+VoteNameAlreadyExists=This name was already used for this poll
+AddADate=Add a date
+AddStartHour=Add start hour
+AddEndHour=Add end hour
+votes=vote(s)
+NoCommentYet=No comments have been posted for this poll yet
+CanComment=Voters can comment in the poll
+CanSeeOthersVote=Voters can see other people's vote
+SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
+BackToCurrentMonth=Back to current month
+ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
+ErrorOpenSurveyOneChoice=Enter at least one choice
+ErrorInsertingComment=There was an error while inserting your comment
+MoreChoices=Enter more choices for the voters
+SurveyExpiredInfo=The poll has been closed or voting delay has expired.
+EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
+ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/am_ET/orders.lang b/htdocs/langs/am_ET/orders.lang
new file mode 100644
index 00000000000..ad91e1eef63
--- /dev/null
+++ b/htdocs/langs/am_ET/orders.lang
@@ -0,0 +1,189 @@
+# Dolibarr language file - Source file is en_US - orders
+OrdersArea=Customers orders area
+SuppliersOrdersArea=Purchase orders area
+OrderCard=Order card
+OrderId=Order Id
+Order=Order
+PdfOrderTitle=Order
+Orders=Orders
+OrderLine=Order line
+OrderDate=Order date
+OrderDateShort=Order date
+OrderToProcess=Order to process
+NewOrder=New order
+NewOrderSupplier=New Purchase Order
+ToOrder=Make order
+MakeOrder=Make order
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Sales Order
+CustomersOrders=Sales Orders
+CustomersOrdersRunning=Current sales orders
+CustomersOrdersAndOrdersLines=Sales orders and order details
+OrdersDeliveredToBill=Sales orders delivered to bill
+OrdersToBill=Sales orders delivered
+OrdersInProcess=Sales orders in process
+OrdersToProcess=Sales orders to process
+SuppliersOrdersToProcess=Purchase orders to process
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
+StatusOrderCanceledShort=Canceled
+StatusOrderDraftShort=Draft
+StatusOrderValidatedShort=Validated
+StatusOrderSentShort=In process
+StatusOrderSent=Shipment in process
+StatusOrderOnProcessShort=Ordered
+StatusOrderProcessedShort=Processed
+StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
+StatusOrderToBillShort=Delivered
+StatusOrderApprovedShort=Approved
+StatusOrderRefusedShort=Refused
+StatusOrderToProcessShort=To process
+StatusOrderReceivedPartiallyShort=Partially received
+StatusOrderReceivedAllShort=Products received
+StatusOrderCanceled=Canceled
+StatusOrderDraft=Draft (needs to be validated)
+StatusOrderValidated=Validated
+StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderProcessed=Processed
+StatusOrderToBill=Delivered
+StatusOrderApproved=Approved
+StatusOrderRefused=Refused
+StatusOrderReceivedPartially=Partially received
+StatusOrderReceivedAll=All products received
+ShippingExist=A shipment exists
+QtyOrdered=Qty ordered
+ProductQtyInDraft=Product quantity into draft orders
+ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
+MenuOrdersToBill=Orders delivered
+MenuOrdersToBill2=Billable orders
+ShipProduct=Ship product
+CreateOrder=Create Order
+RefuseOrder=Refuse order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
+ValidateOrder=Validate order
+UnvalidateOrder=Unvalidate order
+DeleteOrder=Delete order
+CancelOrder=Cancel order
+OrderReopened= Order %s re-open
+AddOrder=Create order
+AddPurchaseOrder=Create purchase order
+AddToDraftOrders=Add to draft order
+ShowOrder=Show order
+OrdersOpened=Orders to process
+NoDraftOrders=No draft orders
+NoOrder=No order
+NoSupplierOrder=No purchase order
+LastOrders=Latest %s sales orders
+LastCustomerOrders=Latest %s sales orders
+LastSupplierOrders=Latest %s purchase orders
+LastModifiedOrders=Latest %s modified orders
+AllOrders=All orders
+NbOfOrders=Number of orders
+OrdersStatistics=Order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
+NumberOfOrdersByMonth=Number of orders by month
+AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
+ListOfOrders=List of orders
+CloseOrder=Close order
+ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
+ConfirmDeleteOrder=Are you sure you want to delete this order?
+ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b>?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status?
+ConfirmCancelOrder=Are you sure you want to cancel this order?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
+GenerateBill=Generate invoice
+ClassifyShipped=Classify delivered
+DraftOrders=Draft orders
+DraftSuppliersOrders=Draft purchase orders
+OnProcessOrders=In process orders
+RefOrder=Ref. order
+RefCustomerOrder=Ref. order for customer
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
+SendOrderByMail=Send order by mail
+ActionsOnOrder=Events on order
+NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
+OrderMode=Order method
+AuthorRequest=Request author
+UserWithApproveOrderGrant=Users granted with "approve orders" permission.
+PaymentOrderRef=Payment of order %s
+ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
+DispatchSupplierOrder=Receiving purchase order %s
+FirstApprovalAlreadyDone=First approval already done
+SecondApprovalAlreadyDone=Second approval already done
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
+OtherOrders=Other orders
+##### Types de contacts #####
+TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
+TypeContact_commande_internal_SHIPPING=Representative following-up shipping
+TypeContact_commande_external_BILLING=Customer invoice contact
+TypeContact_commande_external_SHIPPING=Customer shipping contact
+TypeContact_commande_external_CUSTOMER=Customer contact following-up order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
+TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
+Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
+Error_OrderNotChecked=No orders to invoice selected
+# Order modes (how we receive order). Not the "why" are keys stored into dict.lang
+OrderByMail=Mail
+OrderByFax=Fax
+OrderByEMail=Email
+OrderByWWW=Online
+OrderByPhone=Phone
+# Documents models
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
+PDFEratostheneDescription=A complete order model
+PDFEdisonDescription=A simple order model
+PDFProformaDescription=A complete Proforma invoice template
+CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
+IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
+SetShippingMode=Set shipping mode
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Canceled
+StatusSupplierOrderDraftShort=Draft
+StatusSupplierOrderValidatedShort=Validated
+StatusSupplierOrderSentShort=In process
+StatusSupplierOrderSent=Shipment in process
+StatusSupplierOrderOnProcessShort=Ordered
+StatusSupplierOrderProcessedShort=Processed
+StatusSupplierOrderDelivered=Delivered
+StatusSupplierOrderDeliveredShort=Delivered
+StatusSupplierOrderToBillShort=Delivered
+StatusSupplierOrderApprovedShort=Approved
+StatusSupplierOrderRefusedShort=Refused
+StatusSupplierOrderToProcessShort=To process
+StatusSupplierOrderReceivedPartiallyShort=Partially received
+StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderCanceled=Canceled
+StatusSupplierOrderDraft=Draft (needs to be validated)
+StatusSupplierOrderValidated=Validated
+StatusSupplierOrderOnProcess=Ordered - Standby reception
+StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusSupplierOrderProcessed=Processed
+StatusSupplierOrderToBill=Delivered
+StatusSupplierOrderApproved=Approved
+StatusSupplierOrderRefused=Refused
+StatusSupplierOrderReceivedPartially=Partially received
+StatusSupplierOrderReceivedAll=All products received
diff --git a/htdocs/langs/am_ET/other.lang b/htdocs/langs/am_ET/other.lang
new file mode 100644
index 00000000000..ba85f51e739
--- /dev/null
+++ b/htdocs/langs/am_ET/other.lang
@@ -0,0 +1,286 @@
+# Dolibarr language file - Source file is en_US - other
+SecurityCode=Security code
+NumberingShort=N°
+Tools=Tools
+TMenuTools=Tools
+ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
+Birthday=Birthday
+BirthdayDate=Birthday date
+DateToBirth=Birth date
+BirthdayAlertOn=birthday alert active
+BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (text) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+DocFileGeneratedInto=Doc file generated into <b>%s</b>.
+JumpToLogin=Disconnected. Go to login page...
+MessageForm=Message on online payment form
+MessageOK=Message on the return page for a validated payment
+MessageKO=Message on the return page for a canceled payment
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursively
+PoweredBy=Powered by
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+DateNextInvoiceBeforeGen=Date of next invoice (before generation)
+DateNextInvoiceAfterGen=Date of next invoice (after generation)
+GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
+OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Only the first selected field has been selected.
+AtLeastOneMeasureIsRequired=At least 1 field for measure is required
+AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
+LatestBlogPosts=Latest Blog Posts
+Notify_ORDER_VALIDATE=Sales order validated
+Notify_ORDER_SENTBYMAIL=Sales order sent by mail
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
+Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
+Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
+Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
+Notify_PROPAL_VALIDATE=Customer proposal validated
+Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
+Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
+Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
+Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
+Notify_WITHDRAW_CREDIT=Credit withdrawal
+Notify_WITHDRAW_EMIT=Perform withdrawal
+Notify_COMPANY_CREATE=Third party created
+Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_BILL_VALIDATE=Customer invoice validated
+Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_BILL_PAYED=Customer invoice paid
+Notify_BILL_CANCEL=Customer invoice canceled
+Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
+Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
+Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
+Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
+Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
+Notify_CONTRACT_VALIDATE=Contract validated
+Notify_FICHINTER_VALIDATE=Intervention validated
+Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
+Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
+Notify_SHIPPING_VALIDATE=Shipping validated
+Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail
+Notify_MEMBER_VALIDATE=Member validated
+Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_SUBSCRIPTION=Member subscribed
+Notify_MEMBER_RESILIATE=Member terminated
+Notify_MEMBER_DELETE=Member deleted
+Notify_PROJECT_CREATE=Project creation
+Notify_TASK_CREATE=Task created
+Notify_TASK_MODIFY=Task modified
+Notify_TASK_DELETE=Task deleted
+Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
+Notify_EXPENSE_REPORT_APPROVE=Expense report approved
+Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
+Notify_HOLIDAY_APPROVE=Leave request approved
+SeeModuleSetup=See setup of module %s
+NbOfAttachedFiles=Number of attached files/documents
+TotalSizeOfAttachedFiles=Total size of attached files/documents
+MaxSize=Maximum size
+AttachANewFile=Attach a new file/document
+LinkedObject=Linked object
+NbOfActiveNotifications=Number of notifications (no. of recipient emails)
+PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to remind you that the invoice  __REF__ seems to have not been paid. A copy of the invoice is attached as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find commercial proposal __REF__ attached \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price request __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
+ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
+DemoFundation=Manage members of a foundation
+DemoFundation2=Manage members and bank account of a foundation
+DemoCompanyServiceOnly=Company or freelance selling service only
+DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
+DemoCompanyAll=Company with multiple activities (all main modules)
+CreatedBy=Created by %s
+ModifiedBy=Modified by %s
+ValidatedBy=Validated by %s
+ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made latest change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made latest change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
+FileWasRemoved=File %s was removed
+DirWasRemoved=Directory %s was removed
+FeatureNotYetAvailable=Feature not yet available in the current version
+FeaturesSupported=Supported features
+Width=Width
+Height=Height
+Depth=Depth
+Top=Top
+Bottom=Bottom
+Left=Left
+Right=Right
+CalculatedWeight=Calculated weight
+CalculatedVolume=Calculated volume
+Weight=Weight
+WeightUnitton=tonne
+WeightUnitkg=kg
+WeightUnitg=g
+WeightUnitmg=mg
+WeightUnitpound=pound
+WeightUnitounce=ounce
+Length=Length
+LengthUnitm=m
+LengthUnitdm=dm
+LengthUnitcm=cm
+LengthUnitmm=mm
+Surface=Area
+SurfaceUnitm2=m²
+SurfaceUnitdm2=dm²
+SurfaceUnitcm2=cm²
+SurfaceUnitmm2=mm²
+SurfaceUnitfoot2=ft²
+SurfaceUnitinch2=in²
+Volume=Volume
+VolumeUnitm3=m³
+VolumeUnitdm3=dm³ (L)
+VolumeUnitcm3=cm³ (ml)
+VolumeUnitmm3=mm³ (µl)
+VolumeUnitfoot3=ft³
+VolumeUnitinch3=in³
+VolumeUnitounce=ounce
+VolumeUnitlitre=litre
+VolumeUnitgallon=gallon
+SizeUnitm=m
+SizeUnitdm=dm
+SizeUnitcm=cm
+SizeUnitmm=mm
+SizeUnitinch=inch
+SizeUnitfoot=foot
+SizeUnitpoint=point
+BugTracker=Bug tracker
+SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
+BackToLoginPage=Back to login page
+AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
+EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
+ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
+DolibarrDemo=Dolibarr ERP/CRM demo
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of sales orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of vendor proposals
+NumberOfSupplierOrders=Number of purchase orders
+NumberOfSupplierInvoices=Number of vendor invoices
+NumberOfContracts=Number of contracts
+NumberOfMos=Number of manufacturing orders
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on sales orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on vendor proposals
+NumberOfUnitsSupplierOrders=Number of units on purchase orders
+NumberOfUnitsSupplierInvoices=Number of units on vendor invoices
+NumberOfUnitsContracts=Number of units on contracts
+NumberOfUnitsMos=Number of units to produce in manufacturing orders
+EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
+EMailTextInterventionValidated=The intervention %s has been validated.
+EMailTextInvoiceValidated=Invoice %s has been validated.
+EMailTextInvoicePayed=Invoice %s has been paid.
+EMailTextProposalValidated=Proposal %s has been validated.
+EMailTextProposalClosedSigned=Proposal %s has been closed signed.
+EMailTextOrderValidated=Order %s has been validated.
+EMailTextOrderApproved=Order %s has been approved.
+EMailTextOrderValidatedBy=Order %s has been recorded by %s.
+EMailTextOrderApprovedBy=Order %s has been approved by %s.
+EMailTextOrderRefused=Order %s has been refused.
+EMailTextOrderRefusedBy=Order %s has been refused by %s.
+EMailTextExpeditionValidated=Shipping %s has been validated.
+EMailTextExpenseReportValidated=Expense report %s has been validated.
+EMailTextExpenseReportApproved=Expense report %s has been approved.
+EMailTextHolidayValidated=Leave request %s has been validated.
+EMailTextHolidayApproved=Leave request %s has been approved.
+ImportedWithSet=Importation data set
+DolibarrNotification=Automatic notification
+ResizeDesc=Enter new width <b>OR</b> new height. Ratio will be kept during resizing...
+NewLength=New width
+NewHeight=New height
+NewSizeAfterCropping=New size after cropping
+DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner)
+CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
+ImageEditor=Image editor
+YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s.
+YouReceiveMailBecauseOfNotification2=This event is the following:
+ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start".
+UseAdvancedPerms=Use the advanced permissions of some modules
+FileFormat=File format
+SelectAColor=Choose a color
+AddFiles=Add Files
+StartUpload=Start upload
+CancelUpload=Cancel upload
+FileIsTooBig=Files is too big
+PleaseBePatient=Please be patient...
+NewPassword=New password
+ResetPassword=Reset password
+RequestToResetPasswordReceived=A request to change your password has been received.
+NewKeyIs=This is your new keys to login
+NewKeyWillBe=Your new key to login to software will be
+ClickHereToGoTo=Click here to go to %s
+YouMustClickToChange=You must however first click on the following link to validate this password change
+ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
+Chart=Chart
+PassEncoding=Password encoding
+PermissionsAdd=Permissions added
+PermissionsDelete=Permissions removed
+YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+YourPasswordHasBeenReset=Your password has been reset successfully
+ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+MissingIds=Missing ids
+ThirdPartyCreatedByEmailCollector=Third party created by email collector from email MSGID %s
+ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s
+ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
+TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
+OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+
+##### Export #####
+ExportsArea=Exports area
+AvailableFormats=Available formats
+LibraryUsed=Library used
+LibraryVersion=Library version
+ExportableDatas=Exportable data
+NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
+##### External sites #####
+WebsiteSetup=Setup of module website
+WEBSITE_PAGEURL=URL of page
+WEBSITE_TITLE=Title
+WEBSITE_DESCRIPTION=Description
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
+WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
+
+MemoryUsage=Memory usage
+RequestDuration=Duration of request
+PopuProp=Products/Services by popularity in Proposals
+PopuCom=Products/Services by popularity in Orders
+ProductStatistics=Products/Services Statistics
+NbOfQtyInOrders=Qty in orders
diff --git a/htdocs/langs/am_ET/paybox.lang b/htdocs/langs/am_ET/paybox.lang
new file mode 100644
index 00000000000..1bbbef4017b
--- /dev/null
+++ b/htdocs/langs/am_ET/paybox.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - paybox
+PayBoxSetup=PayBox module setup
+PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+Creditor=Creditor
+PaymentCode=Payment code
+PayBoxDoPayment=Pay with Paybox
+YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
+Continue=Next
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
+YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/am_ET/paypal.lang b/htdocs/langs/am_ET/paypal.lang
new file mode 100644
index 00000000000..5eb5f389445
--- /dev/null
+++ b/htdocs/langs/am_ET/paypal.lang
@@ -0,0 +1,36 @@
+# Dolibarr language file - Source file is en_US - paypal
+PaypalSetup=PayPal module setup
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
+PAYPAL_API_SANDBOX=Mode test/sandbox
+PAYPAL_API_USER=API username
+PAYPAL_API_PASSWORD=API password
+PAYPAL_API_SIGNATURE=API signature
+PAYPAL_SSLVERSION=Curl SSL Version
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
+PaypalModeIntegral=Integral
+PaypalModeOnlyPaypal=PayPal only
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
+ThisIsTransactionId=This is id of transaction: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
+NewOnlinePaymentReceived=New online payment received
+NewOnlinePaymentFailed=New online payment tried but failed
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
+ReturnURLAfterPayment=Return URL after payment
+ValidationOfOnlinePaymentFailed=Validation of online payment failed
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
+DetailedErrorMessage=Detailed Error Message
+ShortErrorMessage=Short Error Message
+ErrorCode=Error Code
+ErrorSeverityCode=Error Severity Code
+OnlinePaymentSystem=Online payment system
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/am_ET/printing.lang b/htdocs/langs/am_ET/printing.lang
new file mode 100644
index 00000000000..16494583550
--- /dev/null
+++ b/htdocs/langs/am_ET/printing.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - printing
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
+PrintingSetup=Setup of Direct Printing System
+PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer without needing to open the document in another application.
+MenuDirectPrinting=Direct Printing jobs
+DirectPrint=Direct print
+PrintingDriverDesc=Configuration variables for printing driver.
+ListDrivers=List of drivers
+PrintTestDesc=List of Printers.
+FileWasSentToPrinter=File %s was sent to printer
+ViaModule=via the module
+NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
+PleaseSelectaDriverfromList=Please select a driver from list.
+PleaseConfigureDriverfromList=Please configure the selected driver from list.
+SetupDriver=Driver setup
+TargetedPrinter=Targeted printer
+UserConf=Setup per user
+PRINTGCP_INFO=Google OAuth API setup
+PRINTGCP_AUTHLINK=Authentication
+PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
+PrintGCPDesc=This driver allows sending documents directly to a printer using Google Cloud Print.
+GCP_Name=Name
+GCP_displayName=Display Name
+GCP_Id=Printer Id
+GCP_OwnerName=Owner Name
+GCP_State=Printer State
+GCP_connectionStatus=Online State
+GCP_Type=Printer Type
+PrintIPPDesc=This driver allows sending of documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+IPP_Uri=Printer Uri
+IPP_Name=Printer Name
+IPP_State=Printer State
+IPP_State_reason=State reason
+IPP_State_reason1=State reason1
+IPP_BW=BW
+IPP_Color=Color
+IPP_Device=Device
+IPP_Media=Printer media
+IPP_Supported=Type of media
+DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
+GoogleAuthNotConfigured=Google OAuth has not been setup. Enable module OAuth and set a Google ID/Secret.
+GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
+PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
+PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
+PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+PrintTestDescprintipp=List of Printers for Cups.
diff --git a/htdocs/langs/am_ET/productbatch.lang b/htdocs/langs/am_ET/productbatch.lang
new file mode 100644
index 00000000000..54270c4a23b
--- /dev/null
+++ b/htdocs/langs/am_ET/productbatch.lang
@@ -0,0 +1,24 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Use lot/serial number
+ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusNotOnBatch=No (lot/serial not used)
+ProductStatusOnBatchShort=Yes
+ProductStatusNotOnBatchShort=No
+Batch=Lot/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
+batch_number=Lot/Serial number
+BatchNumberShort=Lot/Serial
+EatByDate=Eat-by date
+SellByDate=Sell-by date
+DetailBatchNumber=Lot/Serial details
+printBatch=Lot/Serial: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
+StockDetailPerBatch=Stock detail per lot
diff --git a/htdocs/langs/am_ET/products.lang b/htdocs/langs/am_ET/products.lang
new file mode 100644
index 00000000000..a31243a07b6
--- /dev/null
+++ b/htdocs/langs/am_ET/products.lang
@@ -0,0 +1,385 @@
+# Dolibarr language file - Source file is en_US - products
+ProductRef=Product ref.
+ProductLabel=Product label
+ProductLabelTranslated=Translated product label
+ProductDescription=Product description
+ProductDescriptionTranslated=Translated product description
+ProductNoteTranslated=Translated product note
+ProductServiceCard=Products/Services card
+TMenuProducts=Products
+TMenuServices=Services
+Products=Products
+Services=Services
+Product=Product
+Service=Service
+ProductId=Product/service id
+Create=Create
+Reference=Reference
+NewProduct=New product
+NewService=New service
+ProductVatMassChange=Global VAT Update
+ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
+MassBarcodeInit=Mass barcode init
+MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
+ProductAccountancyBuyCode=Accounting code (purchase)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
+ProductAccountancySellCode=Accounting code (sale)
+ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
+ProductAccountancySellExportCode=Accounting code (sale export)
+ProductOrService=Product or Service
+ProductsAndServices=Products and Services
+ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
+ProductsOnSale=Products for sale
+ProductsOnPurchase=Products for purchase
+ProductsOnSaleOnly=Products for sale only
+ProductsOnPurchaseOnly=Products for purchase only
+ProductsNotOnSell=Products not for sale and not for purchase
+ProductsOnSellAndOnBuy=Products for sale and for purchase
+ServicesOnSale=Services for sale
+ServicesOnPurchase=Services for purchase
+ServicesOnSaleOnly=Services for sale only
+ServicesOnPurchaseOnly=Services for purchase only
+ServicesNotOnSell=Services not for sale and not for purchase
+ServicesOnSellAndOnBuy=Services for sale and for purchase
+LastModifiedProductsAndServices=Last %s modified products/services
+LastRecordedProducts=Latest %s recorded products
+LastRecordedServices=Latest %s recorded services
+CardProduct0=Product
+CardProduct1=Service
+Stock=Stock
+MenuStocks=Stocks
+Stocks=Stocks and location (warehouse) of products
+Movements=Movements
+Sell=Sell
+Buy=Purchase
+OnSell=For sale
+OnBuy=For purchase
+NotOnSell=Not for sale
+ProductStatusOnSell=For sale
+ProductStatusNotOnSell=Not for sale
+ProductStatusOnSellShort=For sale
+ProductStatusNotOnSellShort=Not for sale
+ProductStatusOnBuy=For purchase
+ProductStatusNotOnBuy=Not for purchase
+ProductStatusOnBuyShort=For purchase
+ProductStatusNotOnBuyShort=Not for purchase
+UpdateVAT=Update vat
+UpdateDefaultPrice=Update default price
+UpdateLevelPrices=Update prices for each level
+AppliedPricesFrom=Applied from
+SellingPrice=Selling price
+SellingPriceHT=Selling price (excl. tax)
+SellingPriceTTC=Selling price (inc. tax)
+SellingMinPriceTTC=Minimum Selling price (inc. tax)
+CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceUsage=This value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
+NewPrice=New price
+MinPrice=Min. sell price
+EditSellingPriceLabel=Edit selling price label
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
+ContractStatusClosed=Closed
+ErrorProductAlreadyExists=A product with reference %s already exists.
+ErrorProductBadRefOrLabel=Wrong value for reference or label.
+ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
+Suppliers=Vendors
+SupplierRef=Vendor SKU
+ShowProduct=Show product
+ShowService=Show service
+ProductsAndServicesArea=Product and Services area
+ProductsArea=Product area
+ServicesArea=Services area
+ListOfStockMovements=List of stock movements
+BuyingPrice=Buying price
+PriceForEachProduct=Products with specific prices
+SupplierCard=Vendor card
+PriceRemoved=Price removed
+BarCode=Barcode
+BarcodeType=Barcode type
+SetDefaultBarcodeType=Set barcode type
+BarcodeValue=Barcode value
+NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
+ServiceLimitedDuration=If product is a service with limited duration:
+MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
+MultiPricesNumPrices=Number of prices
+AssociatedProductsAbility=Activate virtual products (kits)
+AssociatedProducts=Virtual products
+AssociatedProductsNumber=Number of products composing this virtual product
+ParentProductsNumber=Number of parent packaging product
+ParentProducts=Parent products
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+KeywordFilter=Keyword filter
+CategoryFilter=Category filter
+ProductToAddSearch=Search product to add
+NoMatchFound=No match found
+ListOfProductsServices=List of products/services
+ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
+ProductParentList=List of virtual products/services with this product as a component
+ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
+DeleteProduct=Delete a product/service
+ConfirmDeleteProduct=Are you sure you want to delete this product/service?
+ProductDeleted=Product/Service "%s" deleted from database.
+ExportDataset_produit_1=Products
+ExportDataset_service_1=Services
+ImportDataset_produit_1=Products
+ImportDataset_service_1=Services
+DeleteProductLine=Delete product line
+ConfirmDeleteProductLine=Are you sure you want to delete this product line?
+ProductSpecial=Special
+QtyMin=Min. purchase quantity
+PriceQtyMin=Price quantity min.
+PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
+VATRateForSupplierProduct=VAT Rate (for this vendor/product)
+DiscountQtyMin=Discount for this qty.
+NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
+NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedProductsToSell=Predefined Product
+PredefinedServicesToSell=Predefined Service
+PredefinedProductsAndServicesToSell=Predefined products/services to sell
+PredefinedProductsToPurchase=Predefined product to purchase
+PredefinedServicesToPurchase=Predefined services to purchase
+PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
+NotPredefinedProducts=Not predefined products/services
+GenerateThumb=Generate thumb
+ServiceNb=Service #%s
+ListProductServiceByPopularity=List of products/services by popularity
+ListProductByPopularity=List of products by popularity
+ListServiceByPopularity=List of services by popularity
+Finished=Manufactured product
+RowMaterial=Raw Material
+ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
+CloneContentProduct=Clone all main information of product/service
+ClonePricesProduct=Clone prices
+CloneCategoriesProduct=Clone tags/categories linked
+CloneCompositionProduct=Clone virtual product/service
+CloneCombinationsProduct=Clone product variants
+ProductIsUsed=This product is used
+NewRefForClone=Ref. of new product/service
+SellingPrices=Selling prices
+BuyingPrices=Buying prices
+CustomerPrices=Customer prices
+SuppliersPrices=Vendor prices
+SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
+CustomCode=Customs / Commodity / HS code
+CountryOrigin=Origin country
+Nature=Nature of product (material/finished)
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+lm=lm
+m2=m²
+m3=m³
+liter=liter
+l=L
+unitP=Piece
+unitSET=Set
+unitS=Second
+unitH=Hour
+unitD=Day
+unitG=Gram
+unitM=Meter
+unitLM=Linear meter
+unitM2=Square meter
+unitM3=Cubic meter
+unitL=Liter
+unitT=ton
+unitKG=kg
+unitG=Gram
+unitMG=mg
+unitLB=pound
+unitOZ=ounce
+unitM=Meter
+unitDM=dm
+unitCM=cm
+unitMM=mm
+unitFT=ft
+unitIN=in
+unitM2=Square meter
+unitDM2=dm²
+unitCM2=cm²
+unitMM2=mm²
+unitFT2=ft²
+unitIN2=in²
+unitM3=Cubic meter
+unitDM3=dm³
+unitCM3=cm³
+unitMM3=mm³
+unitFT3=ft³
+unitIN3=in³
+unitOZ3=ounce
+unitgallon=gallon
+ProductCodeModel=Product ref template
+ServiceCodeModel=Service ref template
+CurrentProductPrice=Current price
+AlwaysUseNewPrice=Always use current price of product/service
+AlwaysUseFixedPrice=Use the fixed price
+PriceByQuantity=Different prices by quantity
+DisablePriceByQty=Disable prices by quantity
+PriceByQuantityRange=Quantity range
+MultipriceRules=Price segment rules
+UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
+PercentVariationOver=%% variation over %s
+PercentDiscountOver=%% discount over %s
+KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
+VariantRefExample=Examples: COL, SIZE
+VariantLabelExample=Examples: Color, Size
+### composition fabrication
+Build=Produce
+ProductsMultiPrice=Products and prices for each price segment
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
+ProductSellByQuarterHT=Products turnover quarterly before tax
+ServiceSellByQuarterHT=Services turnover quarterly before tax
+Quarter1=1st. Quarter
+Quarter2=2nd. Quarter
+Quarter3=3rd. Quarter
+Quarter4=4th. Quarter
+BarCodePrintsheet=Print barcode
+PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
+NumberOfStickers=Number of stickers to print on page
+PrintsheetForOneBarCode=Print several stickers for one barcode
+BuildPageToPrint=Generate page to print
+FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
+FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
+DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
+BarCodeDataForProduct=Barcode information of product %s:
+BarCodeDataForThirdparty=Barcode information of third party %s:
+ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
+PriceByCustomer=Different prices for each customer
+PriceCatalogue=A single sell price per product/service
+PricingRule=Rules for selling prices
+AddCustomerPrice=Add price by customer
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+PriceByCustomerLog=Log of previous customer prices
+MinimumPriceLimit=Minimum price can't be lower then %s
+MinimumRecommendedPrice=Minimum recommended price is: %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
+PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=Available global values:
+PriceMode=Price mode
+PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Child products
+MinSupplierPrice=Minimum buying price
+MinCustomerPrice=Minimum selling price
+DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
+AddVariable=Add Variable
+AddUpdater=Add Updater
+GlobalVariables=Global variables
+VariableToUpdate=Variable to update
+GlobalVariableUpdaters=External updaters for variables
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Latest update
+CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product/service with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
+WarningSelectOneDocument=Please select at least one document
+DefaultUnitToShow=Unit
+NbOfQtyInProposals=Qty in proposals
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+ProductsOrServicesTranslations=Products/Services translations
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+WidthUnits=Width unit
+LengthUnits=Length unit
+HeightUnits=Height unit
+SurfaceUnits=Surface unit
+SizeUnits=Size unit
+DeleteProductBuyPrice=Delete buying price
+ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
+ProductSheet=Product sheet
+ServiceSheet=Service sheet
+PossibleValues=Possible values
+GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
+ProductSupplierDescription=Vendor description for the product
+UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
+PackagingForThisProduct=Packaging
+QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+
+#Attributes
+VariantAttributes=Variant attributes
+ProductAttributes=Variant attributes for products
+ProductAttributeName=Variant attribute %s
+ProductAttribute=Variant attribute
+ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
+ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
+ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
+ProductCombinations=Variants
+PropagateVariant=Propagate variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+NewProductCombinations=New variants
+EditProductCombinations=Editing variants
+SelectCombination=Select combination
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+NewProductAttributeValue=New attribute value
+ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
+ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
+TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
+DoNotRemovePreviousCombinations=Do not remove previous variants
+UsePercentageVariations=Use percentage variations
+PercentageVariation=Percentage variation
+ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
+NbOfDifferentValues=No. of different values
+NbProducts=Number of products
+ParentProduct=Parent product
+HideChildProducts=Hide variant products
+ShowChildProducts=Show variant products
+NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
+ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
+CloneDestinationReference=Destination product reference
+ErrorCopyProductCombinations=There was an error while copying the product variants
+ErrorDestinationProductNotFound=Destination product not found
+ErrorProductCombinationNotFound=Product variant not found
+ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
+ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
+DeleteLinkedProduct=Delete the child product linked to the combination
diff --git a/htdocs/langs/am_ET/projects.lang b/htdocs/langs/am_ET/projects.lang
new file mode 100644
index 00000000000..bb42bff3c87
--- /dev/null
+++ b/htdocs/langs/am_ET/projects.lang
@@ -0,0 +1,267 @@
+# Dolibarr language file - Source file is en_US - projects
+RefProject=Ref. project
+ProjectRef=Project ref.
+ProjectId=Project Id
+ProjectLabel=Project label
+ProjectsArea=Projects Area
+ProjectStatus=Project status
+SharedProject=Everybody
+PrivateProject=Project contacts
+ProjectsImContactFor=Projects for I am explicitly a contact
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=All projects
+MyProjectsDesc=This view is limited to projects you are a contact for
+ProjectsPublicDesc=This view presents all projects you are allowed to read.
+TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
+TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
+ClosedProjectsAreHidden=Closed projects are not visible.
+TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
+TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
+NewProject=New project
+AddProject=Create project
+DeleteAProject=Delete a project
+DeleteATask=Delete a task
+ConfirmDeleteAProject=Are you sure you want to delete this project?
+ConfirmDeleteATask=Are you sure you want to delete this task?
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
+OpportunitiesStatusForProjects=Leads amount of projects by status
+ShowProject=Show project
+ShowTask=Show task
+SetProject=Set project
+NoProject=No project defined or owned
+NbOfProjects=Number of projects
+NbOfTasks=Number of tasks
+TimeSpent=Time spent
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
+TimesSpent=Time spent
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
+TaskTimeSpent=Time spent on tasks
+TaskTimeUser=User
+TaskTimeNote=Note
+TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on open projects
+WorkloadNotDefined=Workload not defined
+NewTimeSpent=Time spent
+MyTimeSpent=My time spent
+BillTime=Bill the time spent
+BillTimeShort=Bill time
+TimeToBill=Time not billed
+TimeBilled=Time billed
+Tasks=Tasks
+Task=Task
+TaskDateStart=Task start date
+TaskDateEnd=Task end date
+TaskDescription=Task description
+NewTask=New task
+AddTask=Create task
+AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
+AddHereTimeSpentForWeek=Add here time spent for this week/task
+Activity=Activity
+Activities=Tasks/activities
+MyActivities=My tasks/activities
+MyProjects=My projects
+MyProjectsArea=My projects Area
+DurationEffective=Effective duration
+ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently open tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
+ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
+Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GanttView=Gantt View
+ListProposalsAssociatedProject=List of the commercial proposals related to the project
+ListOrdersAssociatedProject=List of sales orders related to the project
+ListInvoicesAssociatedProject=List of customer invoices related to the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
+ListSupplierOrdersAssociatedProject=List of purchase orders related to the project
+ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project
+ListContractAssociatedProject=List of contracts related to the project
+ListShippingAssociatedProject=List of shippings related to the project
+ListFichinterAssociatedProject=List of interventions related to the project
+ListExpenseReportsAssociatedProject=List of expense reports related to the project
+ListDonationsAssociatedProject=List of donations related to the project
+ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
+ListSalariesAssociatedProject=List of payments of salaries related to the project
+ListActionsAssociatedProject=List of events related to the project
+ListMOAssociatedProject=List of manufacturing orders related to the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
+ActivityOnProjectToday=Activity on project today
+ActivityOnProjectYesterday=Activity on project yesterday
+ActivityOnProjectThisWeek=Activity on project this week
+ActivityOnProjectThisMonth=Activity on project this month
+ActivityOnProjectThisYear=Activity on project this year
+ChildOfProjectTask=Child of project/task
+ChildOfTask=Child of task
+TaskHasChild=Task has child
+NotOwnerOfProject=Not owner of this private project
+AffectedTo=Allocated to
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
+ValidateProject=Validate projet
+ConfirmValidateProject=Are you sure you want to validate this project?
+CloseAProject=Close project
+ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+ReOpenAProject=Open project
+ConfirmReOpenAProject=Are you sure you want to re-open this project?
+ProjectContact=Contacts of project
+TaskContact=Task contacts
+ActionsOnProject=Events on project
+YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
+DeleteATimeSpent=Delete time spent
+ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
+TaskRessourceLinks=Contacts of task
+ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
+NoTasks=No tasks for this project
+LinkedToAnotherCompany=Linked to other third party
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
+ErrorTimeSpentIsEmpty=Time spent is empty
+ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
+IfNeedToUseOtherObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
+CloneTasks=Clone tasks
+CloneContacts=Clone contacts
+CloneNotes=Clone notes
+CloneProjectFiles=Clone project joined files
+CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
+CloneMoveDate=Update project/tasks dates from now?
+ConfirmCloneProject=Are you sure to clone this project?
+ProjectReportDate=Change task dates according to new project start date
+ErrorShiftTaskDate=Impossible to shift task date according to new project start date
+ProjectsAndTasksLines=Projects and tasks
+ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
+ProjectModifiedInDolibarr=Project %s modified
+TaskCreatedInDolibarr=Task %s created
+TaskModifiedInDolibarr=Task %s modified
+TaskDeletedInDolibarr=Task %s deleted
+OpportunityStatus=Lead status
+OpportunityStatusShort=Lead status
+OpportunityProbability=Lead probability
+OpportunityProbabilityShort=Lead probab.
+OpportunityAmount=Lead amount
+OpportunityAmountShort=Lead amount
+OpportunityWeightedAmount=Opportunity weighted amount
+OpportunityWeightedAmountShort=Opp. weighted amount
+OpportunityAmountAverageShort=Average lead amount
+OpportunityAmountWeigthedShort=Weighted lead amount
+WonLostExcluded=Won/Lost excluded
+##### Types de contacts #####
+TypeContact_project_internal_PROJECTLEADER=Project leader
+TypeContact_project_external_PROJECTLEADER=Project leader
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_task_internal_TASKEXECUTIVE=Task executive
+TypeContact_project_task_external_TASKEXECUTIVE=Task executive
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
+TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
+SelectElement=Select element
+AddElement=Link to element
+# Documents models
+DocumentModelBeluga=Project document template for linked objects overview
+DocumentModelBaleine=Project document template for tasks
+DocumentModelTimeSpent=Project report template for time spent
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+ProjectReferers=Related items
+ProjectMustBeValidatedFirst=Project must be validated first
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerMonth=Input per month
+InputDetail=Input detail
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTheTask=Not assigned to the task
+NoUserAssignedToTheProject=No users assigned to this project
+TimeSpentBy=Time spent by
+TasksAssignedTo=Tasks assigned to
+AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
+AssignTask=Assign
+ProjectOverview=Overview
+ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
+ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
+ProjectNbProjectByMonth=No. of created projects by month
+ProjectNbTaskByMonth=No. of created tasks by month
+ProjectOppAmountOfProjectsByMonth=Amount of leads by month
+ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
+ProjectOpenedProjectByOppStatus=Open project/lead by lead status
+ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
+TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
+IdTaskTime=Id task time
+YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
+OpenedProjectsByThirdparties=Open projects by third parties
+OnlyOpportunitiesShort=Only leads
+OpenedOpportunitiesShort=Open leads
+NotOpenedOpportunitiesShort=Not an open lead
+NotAnOpportunityShort=Not a lead
+OpportunityTotalAmount=Total amount of leads
+OpportunityPonderatedAmount=Weighted amount of leads
+OpportunityPonderatedAmountDesc=Leads amount weighted with probability
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWON=Won
+OppStatusLOST=Lost
+Budget=Budget
+AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
+LatestProjects=Latest %s projects
+LatestModifiedProjects=Latest %s modified projects
+OtherFilteredTasks=Other filtered tasks
+NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
+ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+# Comments trans
+AllowCommentOnTask=Allow user comments on tasks
+AllowCommentOnProject=Allow user comments on projects
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=Information project %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
+NewTaskRefSuggested=Task ref already used, a new task ref is required
+TimeSpentInvoiced=Time spent billed
+TimeSpentForInvoice=Time spent
+OneLinePerUser=One line per user
+ServiceToUseOnLines=Service to use on lines
+InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
+ProjectFollowOpportunity=Follow opportunity
+ProjectFollowTasks=Follow tasks or time spent
+Usage=Usage
+UsageOpportunity=Usage: Opportunity
+UsageTasks=Usage: Tasks
+UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=New invoice
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/am_ET/propal.lang b/htdocs/langs/am_ET/propal.lang
new file mode 100644
index 00000000000..71d6857c909
--- /dev/null
+++ b/htdocs/langs/am_ET/propal.lang
@@ -0,0 +1,86 @@
+# Dolibarr language file - Source file is en_US - propal
+Proposals=Commercial proposals
+Proposal=Commercial proposal
+ProposalShort=Proposal
+ProposalsDraft=Draft commercial proposals
+ProposalsOpened=Open commercial proposals
+CommercialProposal=Commercial proposal
+PdfCommercialProposalTitle=Commercial proposal
+ProposalCard=Proposal card
+NewProp=New commercial proposal
+NewPropal=New proposal
+Prospect=Prospect
+DeleteProp=Delete commercial proposal
+ValidateProp=Validate commercial proposal
+AddProp=Create proposal
+ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
+ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
+LastPropals=Latest %s proposals
+LastModifiedProposals=Latest %s modified proposals
+AllPropals=All proposals
+SearchAProposal=Search a proposal
+NoProposal=No proposal
+ProposalsStatistics=Commercial proposal's statistics
+NumberOfProposalsByMonth=Number by month
+AmountOfProposalsByMonthHT=Amount by month (excl. tax)
+NbOfProposals=Number of commercial proposals
+ShowPropal=Show proposal
+PropalsDraft=Drafts
+PropalsOpened=Open
+PropalStatusDraft=Draft (needs to be validated)
+PropalStatusValidated=Validated (proposal is open)
+PropalStatusSigned=Signed (needs billing)
+PropalStatusNotSigned=Not signed (closed)
+PropalStatusBilled=Billed
+PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated (open)
+PropalStatusClosedShort=Closed
+PropalStatusSignedShort=Signed
+PropalStatusNotSignedShort=Not signed
+PropalStatusBilledShort=Billed
+PropalsToClose=Commercial proposals to close
+PropalsToBill=Signed commercial proposals to bill
+ListOfProposals=List of commercial proposals
+ActionsOnPropal=Events on proposal
+RefProposal=Commercial proposal ref
+SendPropalByMail=Send commercial proposal by mail
+DatePropal=Date of proposal
+DateEndPropal=Validity ending date
+ValidityDuration=Validity duration
+CloseAs=Set status to
+SetAcceptedRefused=Set accepted/refused
+ErrorPropalNotFound=Propal %s not found
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
+CopyPropalFrom=Create commercial proposal by copying existing proposal
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
+DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
+ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
+ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
+ProposalsAndProposalsLines=Commercial proposal and lines
+ProposalLine=Proposal line
+AvailabilityPeriod=Availability delay
+SetAvailability=Set availability delay
+AfterOrder=after order
+OtherProposals=Other proposals
+##### Availability #####
+AvailabilityTypeAV_NOW=Immediate
+AvailabilityTypeAV_1W=1 week
+AvailabilityTypeAV_2W=2 weeks
+AvailabilityTypeAV_3W=3 weeks
+AvailabilityTypeAV_1M=1 month
+##### Types de contacts #####
+TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
+TypeContact_propal_external_BILLING=Customer invoice contact
+TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
+TypeContact_propal_external_SHIPPING=Customer contact for delivery
+# Document models
+DocModelAzurDescription=A complete proposal model (old implementation of Cyan template)
+DocModelCyanDescription=A complete proposal model
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
+ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/am_ET/receiptprinter.lang b/htdocs/langs/am_ET/receiptprinter.lang
new file mode 100644
index 00000000000..896eaa313dd
--- /dev/null
+++ b/htdocs/langs/am_ET/receiptprinter.lang
@@ -0,0 +1,95 @@
+# Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
+PrinterAdded=Printer %s added
+PrinterUpdated=Printer %s updated
+PrinterDeleted=Printer %s deleted
+TestSentToPrinter=Test Sent To Printer %s
+ReceiptPrinter=Receipt printers
+ReceiptPrinterDesc=Setup of receipt printers
+ReceiptPrinterTemplateDesc=Setup of Templates
+ReceiptPrinterTypeDesc=Description of Receipt Printer's type
+ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
+ListPrinters=List of Printers
+SetupReceiptTemplate=Template Setup
+CONNECTOR_DUMMY=Dummy Printer
+CONNECTOR_NETWORK_PRINT=Network Printer
+CONNECTOR_FILE_PRINT=Local Printer
+CONNECTOR_WINDOWS_PRINT=Local Windows Printer
+CONNECTOR_CUPS_PRINT=Cups Printer
+CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
+CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
+CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
+CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
+PROFILE_DEFAULT=Default Profile
+PROFILE_SIMPLE=Simple Profile
+PROFILE_EPOSTEP=Epos Tep Profile
+PROFILE_P822D=P822D Profile
+PROFILE_STAR=Star Profile
+PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
+PROFILE_SIMPLE_HELP=Simple Profile No Graphics
+PROFILE_EPOSTEP_HELP=Epos Tep Profile
+PROFILE_P822D_HELP=P822D Profile No Graphics
+PROFILE_STAR_HELP=Star Profile
+DOL_LINE_FEED=Skip line
+DOL_ALIGN_LEFT=Left align text
+DOL_ALIGN_CENTER=Center text
+DOL_ALIGN_RIGHT=Right align text
+DOL_USE_FONT_A=Use font A of printer
+DOL_USE_FONT_B=Use font B of printer
+DOL_USE_FONT_C=Use font C of printer
+DOL_PRINT_BARCODE=Print barcode
+DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
+DOL_CUT_PAPER_FULL=Cut ticket completely
+DOL_CUT_PAPER_PARTIAL=Cut ticket partially
+DOL_OPEN_DRAWER=Open cash drawer
+DOL_ACTIVATE_BUZZER=Activate buzzer
+DOL_PRINT_QRCODE=Print QR Code
+DOL_PRINT_LOGO=Print logo of my company
+DOL_PRINT_LOGO_OLD=Print logo of my company (old printers)
+DOL_BOLD=Bold
+DOL_BOLD_DISABLED=Disable bold
+DOL_DOUBLE_HEIGHT=Double height size
+DOL_DOUBLE_WIDTH=Double width size
+DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
+DOL_UNDERLINE=Enable underline
+DOL_UNDERLINE_DISABLED=Disable underline
+DOL_BEEP=Beed sound
+DOL_PRINT_TEXT=Print text
+DOL_VALUE_DATE=Invoice date
+DOL_VALUE_DATE_TIME=Invoice date and time
+DOL_VALUE_YEAR=Invoice year
+DOL_VALUE_MONTH_LETTERS=Invoice month in letters
+DOL_VALUE_MONTH=Invoice month
+DOL_VALUE_DAY=Invoice day
+DOL_VALUE_DAY_LETTERS=Inovice day in letters
+DOL_LINE_FEED_REVERSE=Line feed reverse
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Invoice ref
+DOL_PRINT_OBJECT_LINES=Invoice lines
+DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
+DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
+DOL_VALUE_CUSTOMER_MAIL=Customer mail
+DOL_VALUE_CUSTOMER_PHONE=Customer phone
+DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
+DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
+DOL_VALUE_MYSOC_NAME=Your company name
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/am_ET/receptions.lang b/htdocs/langs/am_ET/receptions.lang
new file mode 100644
index 00000000000..010a7521846
--- /dev/null
+++ b/htdocs/langs/am_ET/receptions.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - receptions
+ReceptionsSetup=Product Reception setup
+RefReception=Ref. reception
+Reception=Reception
+Receptions=Receptions
+AllReceptions=All Receptions
+Reception=Reception
+Receptions=Receptions
+ShowReception=Show Receptions
+ReceptionsArea=Receptions area
+ListOfReceptions=List of receptions
+ReceptionMethod=Reception method
+LastReceptions=Latest %s receptions
+StatisticsOfReceptions=Statistics for receptions
+NbOfReceptions=Number of receptions
+NumberOfReceptionsByMonth=Number of receptions by month
+ReceptionCard=Reception card
+NewReception=New reception
+CreateReception=Create reception
+QtyInOtherReceptions=Qty in other receptions
+OtherReceptionsForSameOrder=Other receptions for this order
+ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
+ReceptionsToValidate=Receptions to validate
+StatusReceptionCanceled=Canceled
+StatusReceptionDraft=Draft
+StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionProcessed=Processed
+StatusReceptionDraftShort=Draft
+StatusReceptionValidatedShort=Validated
+StatusReceptionProcessedShort=Processed
+ReceptionSheet=Reception sheet
+ConfirmDeleteReception=Are you sure you want to delete this reception?
+ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
+ConfirmCancelReception=Are you sure you want to cancel this reception?
+StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
+SendReceptionByEMail=Send reception by email
+SendReceptionRef=Submission of reception %s
+ActionsOnReception=Events on reception
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the order card.
+ReceptionLine=Reception line
+ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
+ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
+ReceptionsNumberingModules=Numbering module for receptions
+ReceptionsReceiptModel=Document templates for receptions
diff --git a/htdocs/langs/am_ET/resource.lang b/htdocs/langs/am_ET/resource.lang
new file mode 100644
index 00000000000..e8574dc680f
--- /dev/null
+++ b/htdocs/langs/am_ET/resource.lang
@@ -0,0 +1,39 @@
+# Dolibarr language file - Source file is en_US - resource
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+ActionsOnResource=Events about this resource
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResource=Show resource
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+SelectResource=Select resource
+
+IdResource=Id resource
+AssetNumber=Serial number
+ResourceTypeCode=Resource type code
+ImportDataset_resource_1=Resources
+
+ErrorResourcesAlreadyInUse=Some resources are in use
+ErrorResourceUseInEvent=%s used in %s event
diff --git a/htdocs/langs/am_ET/salaries.lang b/htdocs/langs/am_ET/salaries.lang
new file mode 100644
index 00000000000..7c3c08a65bd
--- /dev/null
+++ b/htdocs/langs/am_ET/salaries.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+Salary=Salary
+Salaries=Salaries
+NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
+SalaryPayment=Salary payment
+SalariesPayments=Salaries payments
+ShowSalaryPayment=Show salary payment
+THM=Average hourly rate
+TJM=Average daily rate
+CurrentSalary=Current salary
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/am_ET/sendings.lang b/htdocs/langs/am_ET/sendings.lang
new file mode 100644
index 00000000000..5ce3b7f67e9
--- /dev/null
+++ b/htdocs/langs/am_ET/sendings.lang
@@ -0,0 +1,74 @@
+# Dolibarr language file - Source file is en_US - sendings
+RefSending=Ref. shipment
+Sending=Shipment
+Sendings=Shipments
+AllSendings=All Shipments
+Shipment=Shipment
+Shipments=Shipments
+ShowSending=Show Shipments
+Receivings=Delivery Receipts
+SendingsArea=Shipments area
+ListOfSendings=List of shipments
+SendingMethod=Shipping method
+LastSendings=Latest %s shipments
+StatisticsOfSendings=Statistics for shipments
+NbOfSendings=Number of shipments
+NumberOfShipmentsByMonth=Number of shipments by month
+SendingCard=Shipment card
+NewSending=New shipment
+CreateShipment=Create shipment
+QtyShipped=Qty shipped
+QtyShippedShort=Qty ship.
+QtyPreparedOrShipped=Qty prepared or shipped
+QtyToShip=Qty to ship
+QtyToReceive=Qty to receive
+QtyReceived=Qty received
+QtyInOtherShipments=Qty in other shipments
+KeepToShip=Remain to ship
+KeepToShipShort=Remain
+OtherSendingsForSameOrder=Other shipments for this order
+SendingsAndReceivingForSameOrder=Shipments and receipts for this order
+SendingsToValidate=Shipments to validate
+StatusSendingCanceled=Canceled
+StatusSendingDraft=Draft
+StatusSendingValidated=Validated (products to ship or already shipped)
+StatusSendingProcessed=Processed
+StatusSendingDraftShort=Draft
+StatusSendingValidatedShort=Validated
+StatusSendingProcessedShort=Processed
+SendingSheet=Shipment sheet
+ConfirmDeleteSending=Are you sure you want to delete this shipment?
+ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
+ConfirmCancelSending=Are you sure you want to cancel this shipment?
+DocumentModelMerou=Merou A5 model
+WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+DateDeliveryPlanned=Planned date of delivery
+RefDeliveryReceipt=Ref delivery receipt
+StatusReceipt=Status delivery receipt
+DateReceived=Date delivery received
+ClassifyReception=Classify reception
+SendShippingByEMail=Send shipment by email
+SendShippingRef=Submission of shipment %s
+ActionsOnShipping=Events on shipment
+LinkToTrackYourPackage=Link to track your package
+ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
+ShipmentLine=Shipment line
+ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
+ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
+ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
+NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+
+# Sending methods
+# ModelDocument
+DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty: %d)
diff --git a/htdocs/langs/am_ET/sms.lang b/htdocs/langs/am_ET/sms.lang
new file mode 100644
index 00000000000..055085eb16a
--- /dev/null
+++ b/htdocs/langs/am_ET/sms.lang
@@ -0,0 +1,51 @@
+# Dolibarr language file - Source file is en_US - sms
+Sms=Sms
+SmsSetup=SMS setup
+SmsDesc=This page allows you to define global options on SMS features
+SmsCard=SMS Card
+AllSms=All SMS campaigns
+SmsTargets=Targets
+SmsRecipients=Targets
+SmsRecipient=Target
+SmsTitle=Description
+SmsFrom=Sender
+SmsTo=Target
+SmsTopic=Topic of SMS
+SmsText=Message
+SmsMessage=SMS Message
+ShowSms=Show SMS
+ListOfSms=List SMS campaigns
+NewSms=New SMS campaign
+EditSms=Edit SMS
+ResetSms=New sending
+DeleteSms=Delete SMS campaign
+DeleteASms=Remove a SMS campaign
+PreviewSms=Previuw SMS
+PrepareSms=Prepare SMS
+CreateSms=Create SMS
+SmsResult=Result of SMS sending
+TestSms=Test SMS
+ValidSms=Validate SMS
+ApproveSms=Approve SMS
+SmsStatusDraft=Draft
+SmsStatusValidated=Validated
+SmsStatusApproved=Approved
+SmsStatusSent=Sent
+SmsStatusSentPartialy=Sent partially
+SmsStatusSentCompletely=Sent completely
+SmsStatusError=Error
+SmsStatusNotSent=Not sent
+SmsSuccessfulySent=SMS correctly sent (from %s to %s)
+ErrorSmsRecipientIsEmpty=Number of target is empty
+WarningNoSmsAdded=No new phone number to add to target list
+ConfirmValidSms=Do you confirm validation of this campaign?
+NbOfUniqueSms=No. of unique phone numbers
+NbOfSms=No. of phone numbers
+ThisIsATestMessage=This is a test message
+SendSms=Send SMS
+SmsInfoCharRemain=No. of remaining characters
+SmsInfoNumero= (international format i.e.: +33899701761)
+DelayBeforeSending=Delay before sending (minutes)
+SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
+SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider.
+DisableStopIfSupported=Disable STOP message (if supported)
diff --git a/htdocs/langs/am_ET/stocks.lang b/htdocs/langs/am_ET/stocks.lang
new file mode 100644
index 00000000000..9856649b834
--- /dev/null
+++ b/htdocs/langs/am_ET/stocks.lang
@@ -0,0 +1,220 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseCard=Warehouse card
+Warehouse=Warehouse
+Warehouses=Warehouses
+ParentWarehouse=Parent warehouse
+NewWarehouse=New warehouse / Stock Location
+WarehouseEdit=Modify warehouse
+MenuNewWarehouse=New warehouse
+WarehouseSource=Source warehouse
+WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
+AddOne=Add one
+DefaultWarehouse=Default warehouse
+WarehouseTarget=Target warehouse
+ValidateSending=Delete sending
+CancelSending=Cancel sending
+DeleteSending=Delete sending
+Stock=Stock
+Stocks=Stocks
+StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
+Movements=Movements
+ErrorWarehouseRefRequired=Warehouse reference name is required
+ListOfWarehouses=List of warehouses
+ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
+MovementId=Movement ID
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
+StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
+Location=Location
+LocationSummary=Short name location
+NumberOfDifferentProducts=Number of different products
+NumberOfProducts=Total number of products
+LastMovement=Latest movement
+LastMovements=Latest movements
+Units=Units
+Unit=Unit
+StockCorrection=Stock correction
+CorrectStock=Correct stock
+StockTransfer=Stock transfer
+TransferStock=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
+NumberOfUnit=Number of units
+UnitPurchaseValue=Unit purchase price
+StockTooLow=Stock too low
+StockLowerThanLimit=Stock lower than alert limit (%s)
+EnhancedValue=Value
+PMPValue=Weighted average price
+PMPValueShort=WAP
+EnhancedValueOfWarehouses=Warehouses value
+UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
+QtyDispatched=Quantity dispatched
+QtyDispatchedShort=Qty dispatched
+QtyToDispatchShort=Qty to dispatch
+OrderDispatch=Item receipts
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
+DeStockOnShipment=Decrease real stocks on shipping validation
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
+OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
+StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
+NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
+DispatchVerb=Dispatch
+StockLimitShort=Limit for alert
+StockLimit=Stock limit for alert
+StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+PhysicalStock=Physical Stock
+RealStock=Real Stock
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
+VirtualStock=Virtual stock
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+IdWarehouse=Id warehouse
+DescWareHouse=Description warehouse
+LieuWareHouse=Localisation warehouse
+WarehousesAndProducts=Warehouses and products
+WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
+AverageUnitPricePMPShort=Weighted average input price
+AverageUnitPricePMP=Weighted average input price
+SellPriceMin=Selling Unit Price
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
+EstimatedStockValueShort=Input stock value
+EstimatedStockValue=Input stock value
+DeleteAWarehouse=Delete a warehouse
+ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
+PersonalStock=Personal stock %s
+ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
+SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
+SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
+NoStockAction=No stock action
+DesiredStock=Desired Stock
+DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
+StockToBuy=To order
+Replenishment=Replenishment
+ReplenishmentOrders=Replenishment orders
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
+UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+UseVirtualStock=Use virtual stock
+UsePhysicalStock=Use physical stock
+CurentSelectionMode=Current selection mode
+CurentlyUsingVirtualStock=Virtual stock
+CurentlyUsingPhysicalStock=Physical stock
+RuleForStockReplenishment=Rule for stocks replenishment
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
+AlertOnly= Alerts only
+WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
+WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
+ForThisWarehouse=For this warehouse
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+Replenishments=Replenishments
+NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
+NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
+MassMovement=Mass movement
+SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+RecordMovement=Record transfer
+ReceivingForSameOrder=Receipts for this order
+StockMovementRecorded=Stock movements recorded
+RuleForStockAvailability=Rules on stock requirements
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
+MovementLabel=Label of movement
+TypeMovement=Type of movement
+DateMovement=Date of movement
+InventoryCode=Movement or inventory code
+IsInPackage=Contained into package
+WarehouseAllowNegativeTransfer=Stock can be negative
+qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
+ShowWarehouse=Show warehouse
+MovementCorrectStock=Stock correction for product %s
+MovementTransferStock=Stock transfer of product %s into another warehouse
+InventoryCodeShort=Inv./Mov. code
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
+ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
+OpenAll=Open for all actions
+OpenInternal=Open only for internal actions
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
+OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
+ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
+ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
+ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
+AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
+AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+InventoryDate=Inventory date
+NewInventory=New inventory
+inventorySetup = Inventory Setup
+inventoryCreatePermission=Create new inventory
+inventoryReadPermission=View inventories
+inventoryWritePermission=Update inventories
+inventoryValidatePermission=Validate inventory
+inventoryTitle=Inventory
+inventoryListTitle=Inventories
+inventoryListEmpty=No inventory in progress
+inventoryCreateDelete=Create/Delete inventory
+inventoryCreate=Create new
+inventoryEdit=Edit
+inventoryValidate=Validated
+inventoryDraft=Running
+inventorySelectWarehouse=Warehouse choice
+inventoryConfirmCreate=Create
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
+inventoryMvtStock=By inventory
+inventoryWarningProductAlreadyExists=This product is already into list
+SelectCategory=Category filter
+SelectFournisseur=Vendor filter
+inventoryOnDate=Inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
+inventoryChangePMPPermission=Allow to change PMP value for a product
+ColumnNewPMP=New unit PMP
+OnlyProdsInStock=Do not add product without stock
+TheoricalQty=Theorique qty
+TheoricalValue=Theorique qty
+LastPA=Last BP
+CurrentPA=Curent BP
+RecordedQty=Recorded Qty
+RealQty=Real Qty
+RealValue=Real Value
+RegulatedQty=Regulated Qty
+AddInventoryProduct=Add product to inventory
+AddProduct=Add
+ApplyPMP=Apply PMP
+FlushInventory=Flush inventory
+ConfirmFlushInventory=Do you confirm this action?
+InventoryFlushed=Inventory flushed
+ExitEditMode=Exit edition
+inventoryDeleteLine=Delete line
+RegulateStock=Regulate Stock
+ListInventory=List
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
+ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
+InventoryForASpecificWarehouse=Inventory for a specific warehouse
+InventoryForASpecificProduct=Inventory for a specific product
+StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
+ForceTo=Force to
diff --git a/htdocs/langs/am_ET/stripe.lang b/htdocs/langs/am_ET/stripe.lang
new file mode 100644
index 00000000000..844762040af
--- /dev/null
+++ b/htdocs/langs/am_ET/stripe.lang
@@ -0,0 +1,72 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Stripe module setup
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
+StripeOrCBDoPayment=Pay with credit card or Stripe
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+Creditor=Creditor
+PaymentCode=Payment code
+StripeDoPayment=Pay with Stripe
+YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+Continue=Next
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment page for a sales order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment page for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.<br>For the URL of payments with no existing object, you may also add the parameter <strong>&noidempotency=1</strong> so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter)
+SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+NewStripePaymentReceived=New Stripe payment received
+NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
+STRIPE_TEST_SECRET_KEY=Secret test key
+STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
+STRIPE_LIVE_SECRET_KEY=Secret live key
+STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
+StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
+StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
+StripePayoutList=List of Stripe payouts
+ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
+ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
+PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
+ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
diff --git a/htdocs/langs/am_ET/supplier_proposal.lang b/htdocs/langs/am_ET/supplier_proposal.lang
new file mode 100644
index 00000000000..ce5bdf0425a
--- /dev/null
+++ b/htdocs/langs/am_ET/supplier_proposal.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposalNew=New price request
+CommRequest=Price request
+CommRequests=Price requests
+SearchRequest=Find a request
+DraftRequests=Draft requests
+SupplierProposalsDraft=Draft vendor proposals
+LastModifiedRequests=Latest %s modified price requests
+RequestsOpened=Open price requests
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
+NewAskPrice=New price request
+ShowSupplierProposal=Show price request
+AddSupplierProposal=Create a price request
+SupplierProposalRefFourn=Vendor ref
+SupplierProposalDate=Delivery date
+SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
+ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
+DeleteAsk=Delete request
+ValidateAsk=Validate request
+SupplierProposalStatusDraft=Draft (needs to be validated)
+SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusClosed=Closed
+SupplierProposalStatusSigned=Accepted
+SupplierProposalStatusNotSigned=Refused
+SupplierProposalStatusDraftShort=Draft
+SupplierProposalStatusValidatedShort=Validated
+SupplierProposalStatusClosedShort=Closed
+SupplierProposalStatusSignedShort=Accepted
+SupplierProposalStatusNotSignedShort=Refused
+CopyAskFrom=Create a price request by copying an existing request
+CreateEmptyAsk=Create blank request
+ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
+ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
+SendAskByMail=Send price request by mail
+SendAskRef=Sending the price request %s
+SupplierProposalCard=Request card
+ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
+ActionsOnSupplierProposal=Events on price request
+DocModelAuroreDescription=A complete request model (logo...)
+CommercialAsk=Price request
+DefaultModelSupplierProposalCreate=Default model creation
+DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
+DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
+ListOfSupplierProposals=List of vendor proposal requests
+ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
+SupplierProposalsToClose=Vendor proposals to close
+SupplierProposalsToProcess=Vendor proposals to process
+LastSupplierProposals=Latest %s price requests
+AllPriceRequests=All requests
diff --git a/htdocs/langs/am_ET/suppliers.lang b/htdocs/langs/am_ET/suppliers.lang
new file mode 100644
index 00000000000..b69b11272b4
--- /dev/null
+++ b/htdocs/langs/am_ET/suppliers.lang
@@ -0,0 +1,47 @@
+# Dolibarr language file - Source file is en_US - vendors
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
+History=History
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
+OrderDate=Order date
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
+SupplierPrices=Vendor prices
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
+Availability=Availability
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order details
+ApproveThisOrder=Approve this order
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
+DenyingThisOrder=Deny this order
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
+SupplierReputation=Vendor reputation
+DoNotOrderThisProductToThisSupplier=Do not order
+NotTheGoodQualitySupplier=Low quality
+ReputationForThisProduct=Reputation
+BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
+AllProductReferencesOfSupplier=All product / service references of vendor
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/am_ET/ticket.lang b/htdocs/langs/am_ET/ticket.lang
new file mode 100644
index 00000000000..80518c3401a
--- /dev/null
+++ b/htdocs/langs/am_ET/ticket.lang
@@ -0,0 +1,305 @@
+# en_US lang file for module ticket
+# Copyright (C) 2013  Jean-François FERRY <hello@librethic.io>
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+Module56000Name=Tickets
+Module56000Desc=Ticket system for issue or request management
+
+Permission56001=See tickets
+Permission56002=Modify tickets
+Permission56003=Delete tickets
+Permission56004=Manage tickets
+Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+
+TicketDictType=Ticket - Types
+TicketDictCategory=Ticket - Groupes
+TicketDictSeverity=Ticket - Severities
+TicketDictResolution=Ticket - Resolution
+TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
+TicketTypeShortBUGHARD=Dysfonctionnement matériel
+TicketTypeShortCOM=Commercial question
+
+TicketTypeShortHELP=Request for functionnal help
+TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortPROJET=Project
+TicketTypeShortOTHER=Other
+
+TicketSeverityShortLOW=Low
+TicketSeverityShortNORMAL=Normal
+TicketSeverityShortHIGH=High
+TicketSeverityShortBLOCKING=Critical/Blocking
+
+ErrorBadEmailAddress=Field '%s' incorrect
+MenuTicketMyAssign=My tickets
+MenuTicketMyAssignNonClosed=My open tickets
+MenuListNonClosed=Open tickets
+
+TypeContact_ticket_internal_CONTRIBUTOR=Contributor
+TypeContact_ticket_internal_SUPPORTTEC=Assigned user
+TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
+TypeContact_ticket_external_CONTRIBUTOR=External contributor
+
+OriginEmail=Email source
+Notify_TICKET_SENTBYMAIL=Send ticket message by email
+
+# Status
+NotRead=Not read
+Read=Read
+Assigned=Assigned
+InProgress=In progress
+NeedMoreInformation=Waiting for information
+Answered=Answered
+Waiting=Waiting
+Closed=Closed
+Deleted=Deleted
+
+# Dict
+Type=Type
+Category=Analytic code
+Severity=Severity
+
+# Email templates
+MailToSendTicketMessage=To send email from ticket message
+
+#
+# Admin page
+#
+TicketSetup=Ticket module setup
+TicketSettings=Settings
+TicketSetupPage=
+TicketPublicAccess=A public interface requiring no identification is available at the following url
+TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
+TicketParamModule=Module variable setup
+TicketParamMail=Email setup
+TicketEmailNotificationFrom=Notification email from
+TicketEmailNotificationFromHelp=Used into ticket message answer by example
+TicketEmailNotificationTo=Notifications email to
+TicketEmailNotificationToHelp=Send email notifications to this address.
+TicketNewEmailBodyLabel=Text message sent after creating a ticket
+TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
+TicketParamPublicInterface=Public interface setup
+TicketsEmailMustExist=Require an existing email address to create a ticket
+TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket.
+PublicInterface=Public interface
+TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
+TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
+TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
+TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
+TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
+TicketPublicInterfaceTopicLabelAdmin=Interface title
+TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
+TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
+ExtraFieldsTicket=Extra attributes
+TicketCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
+TicketsDisableEmail=Do not send emails for ticket creation or message recording
+TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
+TicketsLogEnableEmail=Enable log by email
+TicketsLogEnableEmailHelp=At each change, an email will be sent **to each contact** associated with the ticket.
+TicketParams=Params
+TicketsShowModuleLogo=Display the logo of the module in the public interface
+TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
+TicketsShowCompanyLogo=Display the logo of the company in the public interface
+TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
+TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
+TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
+TicketsActivatePublicInterface=Activate public interface
+TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create tickets.
+TicketsAutoAssignTicket=Automatically assign the user who created the ticket
+TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
+TicketNumberingModules=Tickets numbering module
+TicketNotifyTiersAtCreation=Notify third party at creation
+TicketGroup=Group
+TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
+#
+# Index & list page
+#
+TicketsIndex=Tickets area
+TicketList=List of tickets
+TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
+NoTicketsFound=No ticket found
+NoUnreadTicketsFound=No unread ticket found
+TicketViewAllTickets=View all tickets
+TicketViewNonClosedOnly=View only open tickets
+TicketStatByStatus=Tickets by status
+OrderByDateAsc=Sort by ascending date
+OrderByDateDesc=Sort by descending date
+ShowAsConversation=Show as conversation list
+MessageListViewType=Show as table list
+
+#
+# Ticket card
+#
+Ticket=Ticket
+TicketCard=Ticket card
+CreateTicket=Create ticket
+EditTicket=Edit ticket
+TicketsManagement=Tickets Management
+CreatedBy=Created by
+NewTicket=New Ticket
+SubjectAnswerToTicket=Ticket answer
+TicketTypeRequest=Request type
+TicketCategory=Analytic code
+SeeTicket=See ticket
+TicketMarkedAsRead=Ticket has been marked as read
+TicketReadOn=Read on
+TicketCloseOn=Closing date
+MarkAsRead=Mark ticket as read
+TicketHistory=Ticket history
+AssignUser=Assign to user
+TicketAssigned=Ticket is now assigned
+TicketChangeType=Change type
+TicketChangeCategory=Change analytic code
+TicketChangeSeverity=Change severity
+TicketAddMessage=Add a message
+AddMessage=Add a message
+MessageSuccessfullyAdded=Ticket added
+TicketMessageSuccessfullyAdded=Message successfully added
+TicketMessagesList=Message list
+NoMsgForThisTicket=No message for this ticket
+Properties=Classification
+LatestNewTickets=Latest %s newest tickets (not read)
+TicketSeverity=Severity
+ShowTicket=See ticket
+RelatedTickets=Related tickets
+TicketAddIntervention=Create intervention
+CloseTicket=Close ticket
+CloseATicket=Close a ticket
+ConfirmCloseAticket=Confirm ticket closing
+ConfirmDeleteTicket=Please confirm ticket deleting
+TicketDeletedSuccess=Ticket deleted with success
+TicketMarkedAsClosed=Ticket marked as closed
+TicketDurationAuto=Calculated duration
+TicketDurationAutoInfos=Duration calculated automatically from intervention related
+TicketUpdated=Ticket updated
+SendMessageByEmail=Send message by email
+TicketNewMessage=New message
+ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
+TicketGoIntoContactTab=Please go into "Contacts" tab to select them
+TicketMessageMailIntro=Introduction
+TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
+TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
+TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
+TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
+TicketMessageMailSignature=Signature
+TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
+TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
+TicketMessageMailSignatureLabelAdmin=Signature of response email
+TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
+TicketMessageHelp=Only this text will be saved in the message list on ticket card.
+TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
+TimeElapsedSince=Time elapsed since
+TicketTimeToRead=Time elapsed before read
+TicketContacts=Contacts ticket
+TicketDocumentsLinked=Documents linked to ticket
+ConfirmReOpenTicket=Confirm reopen this ticket ?
+TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
+TicketAssignedToYou=Ticket assigned
+TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
+MarkMessageAsPrivate=Mark message as private
+TicketMessagePrivateHelp=This message will not display to external users
+TicketEmailOriginIssuer=Issuer at origin of the tickets
+InitialMessage=Initial Message
+LinkToAContract=Link to a contract
+TicketPleaseSelectAContract=Select a contract
+UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
+TicketMailExchanges=Mail exchanges
+TicketInitialMessageModified=Initial message modified
+TicketMessageSuccesfullyUpdated=Message successfully updated
+TicketChangeStatus=Change status
+TicketConfirmChangeStatus=Confirm the status change: %s ?
+TicketLogStatusChanged=Status changed: %s to %s
+TicketNotNotifyTiersAtCreate=Not notify company at create
+Unread=Unread
+TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
+PublicInterfaceNotEnabled=Public interface was not enabled
+ErrorTicketRefRequired=Ticket reference name is required
+
+#
+# Logs
+#
+TicketLogMesgReadBy=Ticket %s read by %s
+NoLogForThisTicket=No log for this ticket yet
+TicketLogAssignedTo=Ticket %s assigned to %s
+TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
+TicketLogClosedBy=Ticket %s closed by %s
+TicketLogReopen=Ticket %s re-open
+
+#
+# Public pages
+#
+TicketSystem=Ticket system
+ShowListTicketWithTrackId=Display ticket list from track ID
+ShowTicketWithTrackId=Display ticket from track ID
+TicketPublicDesc=You can create a support ticket or check from an existing ID.
+YourTicketSuccessfullySaved=Ticket has been successfully saved!
+MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
+PleaseRememberThisId=Please keep the tracking number that we might ask you later.
+TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
+TicketNewEmailSubjectCustomer=New support ticket
+TicketNewEmailBody=This is an automatic email to confirm you have registered a new ticket.
+TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
+TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
+TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
+TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
+TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
+TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
+TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
+TicketPublicMsgViewLogIn=Please enter ticket tracking ID
+TicketTrackId=Public Tracking ID
+OneOfTicketTrackId=One of your tracking ID
+ErrorTicketNotFound=Ticket with tracking ID %s not found!
+Subject=Subject
+ViewTicket=View ticket
+ViewMyTicketList=View my ticket list
+ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
+TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
+TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
+SeeThisTicketIntomanagementInterface=See ticket in management interface
+TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
+ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
+OldUser=Old user
+NewUser=New user
+NumberOfTicketsByMonth=Number of tickets per month
+NbOfTickets=Number of tickets
+# notifications
+TicketNotificationEmailSubject=Ticket %s updated
+TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
+TicketNotificationRecipient=Notification recipient
+TicketNotificationLogMessage=Log message
+TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
+TicketNotificationNumberEmailSent=Notification email sent: %s
+
+ActionsOnTicket=Events on ticket
+
+#
+# Boxes
+#
+BoxLastTicket=Latest created tickets
+BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicketContent=
+BoxLastTicketNoRecordedTickets=No recent unread tickets
+BoxLastModifiedTicket=Latest modified tickets
+BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastModifiedTicketContent=
+BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
diff --git a/htdocs/langs/am_ET/trips.lang b/htdocs/langs/am_ET/trips.lang
new file mode 100644
index 00000000000..654f14d6bf7
--- /dev/null
+++ b/htdocs/langs/am_ET/trips.lang
@@ -0,0 +1,151 @@
+# Dolibarr language file - Source file is en_US - trips
+ShowExpenseReport=Show expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense reports
+ListOfFees=List of fees
+TypeFees=Types of fees
+ShowTrip=Show expense report
+NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
+CompanyVisited=Company/organization visited
+FeesKilometersOrAmout=Amount or kilometers
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportApproved=An expense report was approved
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
+ExpenseReportRefused=An expense report was refused
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
+ExpenseReportCanceled=An expense report was canceled
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
+ExpenseReportPaid=An expense report was paid
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripNDF=Informations expense report
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Other
+TF_TRIP=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hotel
+TF_TAXI=Taxi
+EX_KME=Mileage costs
+EX_FUE=Fuel CV
+EX_HOT=Hotel
+EX_PAR=Parking CV
+EX_TOL=Toll CV
+EX_TAX=Various Taxes
+EX_IND=Indemnity transportation subscription
+EX_SUM=Maintenance supply
+EX_SUO=Office supplies
+EX_CAR=Car rental
+EX_DOC=Documentation
+EX_CUR=Customers receiving
+EX_OTR=Other receiving
+EX_POS=Postage
+EX_CAM=CV maintenance and repair
+EX_EMM=Employees meal
+EX_GUM=Guests meal
+EX_BRE=Breakfast
+EX_FUE_VP=Fuel PV
+EX_TOL_VP=Toll PV
+EX_PAR_VP=Parking PV
+EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
+UploadANewFileNow=Upload a new document now
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+AucuneLigne=There is no expense report declared yet
+ModePaiement=Payment mode
+VALIDATOR=User responsible for approval
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paid by
+REFUSEUR=Denied by
+CANCEL_USER=Deleted by
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+BROUILLONNER=Reopen
+ExpenseReportRef=Ref. expense report
+ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+ConfirmRefuseTrip=Are you sure you want to deny this expense report?
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report?
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
+ConfirmCancelTrip=Are you sure you want to cancel this expense report?
+BrouillonnerTrip=Move back expense report to status "Draft"
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report?
+NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
+ExpenseReportsToApprove=Expense reports to approve
+ExpenseReportsToPay=Expense reports to pay
+ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
+ExpenseReportsIk=Expense report milles index
+ExpenseReportsRules=Expense report rules
+ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
+ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report
+expenseReportOffset=Offset
+expenseReportCoef=Coefficient
+expenseReportTotalForFive=Example with <u>d</u> = 5
+expenseReportRangeFromTo=from %d to %d
+expenseReportRangeMoreThan=more than %d
+expenseReportCoefUndefined=(value not defined)
+expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
+expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
+expenseReportPrintExample=offset + (d x coef) = %s
+ExpenseReportApplyTo=Apply to
+ExpenseReportDomain=Domain to apply
+ExpenseReportLimitOn=Limit on
+ExpenseReportDateStart=Date start
+ExpenseReportDateEnd=Date end
+ExpenseReportLimitAmount=Limite amount
+ExpenseReportRestrictive=Restrictive
+AllExpenseReport=All type of expense report
+OnExpense=Expense line
+ExpenseReportRuleSave=Expense report rule saved
+ExpenseReportRuleErrorOnSave=Error: %s
+RangeNum=Range %d
+ExpenseReportConstraintViolationError=Constraint violation id [%s]: %s  is superior to %s %s
+byEX_DAY=by day (limitation to %s)
+byEX_MON=by month (limitation to %s)
+byEX_YEA=by year (limitation to %s)
+byEX_EXP=by line (limitation to %s)
+ExpenseReportConstraintViolationWarning=Constraint violation id [%s]: %s  is superior to %s %s
+nolimitbyEX_DAY=by day (no limitation)
+nolimitbyEX_MON=by month (no limitation)
+nolimitbyEX_YEA=by year (no limitation)
+nolimitbyEX_EXP=by line (no limitation)
+CarCategory=Category of car
+ExpenseRangeOffset=Offset amount: %s
+RangeIk=Mileage range
+AttachTheNewLineToTheDocument=Attach the line to an uploaded document
diff --git a/htdocs/langs/am_ET/users.lang b/htdocs/langs/am_ET/users.lang
new file mode 100644
index 00000000000..41a5ebd0981
--- /dev/null
+++ b/htdocs/langs/am_ET/users.lang
@@ -0,0 +1,118 @@
+# Dolibarr language file - Source file is en_US - users
+HRMArea=HRM area
+UserCard=User card
+GroupCard=Group card
+Permission=Permission
+Permissions=Permissions
+EditPassword=Edit password
+SendNewPassword=Regenerate and send password
+SendNewPasswordLink=Send link to reset password
+ReinitPassword=Regenerate password
+PasswordChangedTo=Password changed to: %s
+SubjectNewPassword=Your new password for %s
+GroupRights=Group permissions
+UserRights=User permissions
+UserGUISetup=User Display Setup
+DisableUser=Disable
+DisableAUser=Disable a user
+DeleteUser=Delete
+DeleteAUser=Delete a user
+EnableAUser=Enable a user
+DeleteGroup=Delete
+DeleteAGroup=Delete a group
+ConfirmDisableUser=Are you sure you want to disable user <b>%s</b>?
+ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b>?
+ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b>?
+ConfirmEnableUser=Are you sure you want to enable user <b>%s</b>?
+ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b>?
+ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
+NewUser=New user
+CreateUser=Create user
+LoginNotDefined=Login is not defined.
+NameNotDefined=Name is not defined.
+ListOfUsers=List of users
+SuperAdministrator=Super Administrator
+SuperAdministratorDesc=Global administrator
+AdministratorDesc=Administrator
+DefaultRights=Default Permissions
+DefaultRightsDesc=Define here the <u>default</u> permissions that are automatically granted to a <u>new</u> user (to modify permissions for existing users, go to the user card).
+DolibarrUsers=Dolibarr users
+LastName=Last name
+FirstName=First name
+ListOfGroups=List of groups
+NewGroup=New group
+CreateGroup=Create group
+RemoveFromGroup=Remove from group
+PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
+PasswordChangeRequest=Request to change password for <b>%s</b>
+PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+ConfirmPasswordReset=Confirm password reset
+MenuUsersAndGroups=Users & Groups
+LastGroupsCreated=Latest %s groups created
+LastUsersCreated=Latest %s users created
+ShowGroup=Show group
+ShowUser=Show user
+NonAffectedUsers=Non assigned users
+UserModified=User modified successfully
+PhotoFile=Photo file
+ListOfUsersInGroup=List of users in this group
+ListOfGroupsForUser=List of groups for this user
+LinkToCompanyContact=Link to third party / contact
+LinkedToDolibarrMember=Link to member
+LinkedToDolibarrUser=Link to Dolibarr user
+LinkedToDolibarrThirdParty=Link to Dolibarr third party
+CreateDolibarrLogin=Create a user
+CreateDolibarrThirdParty=Create a third party
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
+UsePersonalValue=Use personal value
+InternalUser=Internal user
+ExportDataset_user_1=Users and their properties
+DomainUser=Domain user %s
+Reactivate=Reactivate
+CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
+Inherited=Inherited
+UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
+UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
+IdPhoneCaller=Id phone caller
+NewUserCreated=User %s created
+NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
+EventUserModified=User %s modified
+UserDisabled=User %s disabled
+UserEnabled=User %s activated
+UserDeleted=User %s removed
+NewGroupCreated=Group %s created
+GroupModified=Group %s modified
+GroupDeleted=Group %s removed
+ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact?
+ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member?
+ConfirmCreateThirdParty=Are you sure you want to create a third party for this member?
+LoginToCreate=Login to create
+NameToCreate=Name of third party to create
+YourRole=Your roles
+YourQuotaOfUsersIsReached=Your quota of active users is reached !
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
+DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
+HierarchicalResponsible=Supervisor
+HierarchicView=Hierarchical view
+UseTypeFieldToChange=Use field Type to change
+OpenIDURL=OpenID URL
+LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Hours worked (per week)
+ExpectedWorkedHours=Expected worked hours per week
+ColorUser=Color of the user
+DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accounting code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Employment Start Date
+DateEmploymentEnd=Employment End Date
+CantDisableYourself=You can't disable your own user record
+ForceUserExpenseValidator=Force expense report validator
+ForceUserHolidayValidator=Force leave request validator
+ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/am_ET/website.lang b/htdocs/langs/am_ET/website.lang
new file mode 100644
index 00000000000..bce2a09fb03
--- /dev/null
+++ b/htdocs/langs/am_ET/website.lang
@@ -0,0 +1,130 @@
+# Dolibarr language file - Source file is en_US - website
+Shortname=Code
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
+DeleteWebsite=Delete website
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
+WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
+WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
+WEBSITE_CSS_URL=URL of external CSS file
+WEBSITE_CSS_INLINE=CSS file content (common to all pages)
+WEBSITE_JS_INLINE=Javascript file content (common to all pages)
+WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
+WEBSITE_ROBOT=Robot file (robots.txt)
+WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
+HtmlHeaderPage=HTML header (specific to this page only)
+PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
+EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
+MediaFiles=Media library
+EditCss=Edit website properties
+EditMenu=Edit menu
+EditMedias=Edit medias
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
+AddWebsite=Add website
+Webpage=Web page/container
+AddPage=Add page/container
+HomePage=Home Page
+PageContainer=Page/container
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
+PageContent=Page/Contenair
+PageDeleted=Page/Contenair '%s' of website %s deleted
+PageAdded=Page/Contenair '%s' added
+ViewSiteInNewTab=View site in new tab
+ViewPageInNewTab=View page in new tab
+SetAsHomePage=Set as Home page
+RealURL=Real URL
+ViewWebsiteInProduction=View web site using home URLs
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+TestDeployOnWeb=Test/deploy on web
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
+NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
+SyntaxHelp=Help on specific syntax tips
+YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+ClonePage=Clone page/container
+CloneSite=Clone site
+SiteAdded=Website added
+ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
+PageIsANewTranslation=The new page is a translation of the current page ?
+LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
+ParentPageId=Parent page ID
+WebsiteId=Website ID
+CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
+FetchAndCreate=Fetch and Create
+ExportSite=Export website
+ImportSite=Import website template
+IDOfPage=Id of page
+Banner=Banner
+BlogPost=Blog post
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
+AddWebsiteAccount=Create web site account
+BackToListForThirdParty=Back to list for the third-party
+DisableSiteFirst=Disable website first
+MyContainerTitle=My web site title
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is a translation of
+ThisPageHasTranslationPages=This page/container has translation
+NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
+GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Search or Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
+MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
+EditInLineOnOff=Mode 'Edit inline' is %s
+ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
+GlobalCSSorJS=Global CSS/JS/Header file of web site
+BackToHomePage=Back to home page...
+TranslationLinks=Translation links
+YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not a website page
+UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
+MainLanguage=Main language
+OtherLanguages=Other languages
+UseManifest=Provide a manifest.json file
+PublicAuthorAlias=Public author alias
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
+ReplacementDoneInXPages=Replacement done in %s pages or containers
diff --git a/htdocs/langs/am_ET/withdrawals.lang b/htdocs/langs/am_ET/withdrawals.lang
new file mode 100644
index 00000000000..b1d6e30e329
--- /dev/null
+++ b/htdocs/langs/am_ET/withdrawals.lang
@@ -0,0 +1,119 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
+NewStandingOrder=New direct debit order
+StandingOrderToProcess=To process
+WithdrawalsReceipts=Direct debit orders
+WithdrawalReceipt=Direct debit order
+LastWithdrawalReceipts=Latest %s direct debit files
+WithdrawalsLines=Direct debit order lines
+RequestStandingOrderToTreat=Request for direct debit payment order to process
+RequestStandingOrderTreated=Request for direct debit payment order processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
+AmountToWithdraw=Amount to withdraw
+WithdrawsRefused=Direct debit refused
+NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
+ResponsibleUser=User Responsible
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
+MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
+ClassCredited=Classify credited
+ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
+TransData=Transmission date
+TransMetod=Transmission method
+Send=Send
+Lines=Lines
+StandingOrderReject=Issue a rejection
+WithdrawalRefused=Withdrawal refused
+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=Invoice refused (Charge the rejection to customer)
+StatusDebitCredit=Status debit/credit
+StatusWaiting=Waiting
+StatusTrans=Sent
+StatusCredited=Credited
+StatusRefused=Refused
+StatusMotif0=Unspecified
+StatusMotif1=Insufficient funds
+StatusMotif2=Request contested
+StatusMotif3=No direct debit payment order
+StatusMotif4=Sales Order
+StatusMotif5=RIB unusable
+StatusMotif6=Account without balance
+StatusMotif7=Judicial Decision
+StatusMotif8=Other reason
+CreateForSepaFRST=Create direct debit file (SEPA FRST)
+CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
+CreateAll=Create direct debit file (all)
+CreateGuichet=Only office
+CreateBanque=Only bank
+OrderWaiting=Waiting for treatment
+NotifyTransmision=Withdrawal Transmission
+NotifyCredit=Withdrawal Credit
+NumeroNationalEmetter=National Transmitter Number
+WithBankUsingRIB=For bank accounts using RIB
+WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
+BankToReceiveWithdraw=Receiving Bank Account
+CreditDate=Credit on
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+WithdrawalFile=Withdrawal file
+SetToStatusSent=Set to status "File Sent"
+ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
+StatisticsByLineStatus=Statistics by status of lines
+RUM=UMR
+DateRUM=Mandate signature date
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
+WithdrawMode=Direct debit mode (FRST or RECUR)
+WithdrawRequestAmount=Amount of Direct debit request:
+WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
+SepaMandate=SEPA Direct Debit Mandate
+SepaMandateShort=SEPA Mandate
+PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
+SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+CreditorIdentifier=Creditor Identifier
+CreditorName=Creditor Name
+SEPAFillForm=(B) Please complete all the fields marked *
+SEPAFormYourName=Your name
+SEPAFormYourBAN=Your Bank Account Name (IBAN)
+SEPAFormYourBIC=Your Bank Identifier Code (BIC)
+SEPAFrstOrRecur=Type of payment
+ModeRECUR=Recurring payment
+ModeFRST=One-off payment
+PleaseCheckOne=Please check one only
+DirectDebitOrderCreated=Direct debit order %s created
+AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
+
+### Notifications
+InfoCreditSubject=Payment of direct debit payment order %s by the bank
+InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
+InfoTransSubject=Transmission of direct debit payment order %s to bank
+InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
+InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
+InfoRejectSubject=Direct debit payment order refused
+InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/am_ET/workflow.lang b/htdocs/langs/am_ET/workflow.lang
new file mode 100644
index 00000000000..be126eef0f4
--- /dev/null
+++ b/htdocs/langs/am_ET/workflow.lang
@@ -0,0 +1,20 @@
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=Workflow module setup
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+# Autocreate
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
+# Autoclassify customer proposal or order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+AutomaticCreation=Automatic creation
+AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/am_ET/zapier.lang b/htdocs/langs/am_ET/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/am_ET/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/ar_EG/agenda.lang b/htdocs/langs/ar_EG/agenda.lang
new file mode 100644
index 00000000000..e823329209f
--- /dev/null
+++ b/htdocs/langs/ar_EG/agenda.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - agenda
+AddEvent=عمل حدث
diff --git a/htdocs/langs/ar_EG/banks.lang b/htdocs/langs/ar_EG/banks.lang
new file mode 100644
index 00000000000..fcb987c99bf
--- /dev/null
+++ b/htdocs/langs/ar_EG/banks.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - banks
+StatusAccountOpened=افتح
+StatusAccountClosed=مقفول
+SupplierInvoicePayment=دفعة مورد
diff --git a/htdocs/langs/ar_EG/bills.lang b/htdocs/langs/ar_EG/bills.lang
new file mode 100644
index 00000000000..b1dce597b45
--- /dev/null
+++ b/htdocs/langs/ar_EG/bills.lang
@@ -0,0 +1,28 @@
+# Dolibarr language file - Source file is en_US - bills
+BillsCustomers=فواتير العميل
+BillsSuppliers=فواتير المورد
+BillsCustomersUnpaid=فواتير العميل غير المدفوعة
+BillsSuppliersUnpaid=فواتير المورد غير المدفوعة
+BillsSuppliersUnpaidForCompany=فواتير الموردين غير المدفوعة لـ %s
+BillsStatistics=احصائيات فواتير العملاء
+BillsStatisticsSuppliers=احصائيات فواتير الموردين
+InvoiceDeposit=فاتورة دفعة أولى
+InvoiceDepositAsk=فاتورة دفعة أولى
+InvoiceReplacement=فاتورة استبدال
+ReplacementInvoice=فاتورة استبدال
+SupplierInvoice=فاتورة مورد
+SuppliersInvoices=فواتير الموردين
+SupplierBill=فاتورة مورد
+CancelBill=إلغ فاتورة
+SendRemindByMail=إرسل تذكير عن طريق البريد الإلكتروني
+BillStatusDraft=مسودة(مطلوب الاعتماد)
+BillShortStatusValidated=معتمد
+BillShortStatusClosedUnpaid=مقفول
+SendReminderBillByMail=إرسل تذكير عن طريق البريد الإلكتروني
+SupplierBillsToPay=فواتير المورد غير المدفوعة
+CustomerBillsUnpaid=فواتير العميل غير المدفوعة
+Billed=مفوتر
+PaymentConditionShortPT_ORDER=طلب
+TypeContact_facture_external_BILLING=جهة اتصال فاتورة العميل
+AutoFillDateFromShort=حدد تاريخ البدء
+AutoFillDateToShort=حدد تاريخ الانتهاء
diff --git a/htdocs/langs/ar_EG/boxes.lang b/htdocs/langs/ar_EG/boxes.lang
new file mode 100644
index 00000000000..1c4466c2f30
--- /dev/null
+++ b/htdocs/langs/ar_EG/boxes.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - boxes
+BoxTitleLastModifiedPropals=أحدث العروض المعدلة %s
+ForCustomersInvoices=فواتير العملاء
diff --git a/htdocs/langs/ar_EG/cashdesk.lang b/htdocs/langs/ar_EG/cashdesk.lang
new file mode 100644
index 00000000000..b62e4a9b9a2
--- /dev/null
+++ b/htdocs/langs/ar_EG/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+History=تاريخ
diff --git a/htdocs/langs/ar_EG/categories.lang b/htdocs/langs/ar_EG/categories.lang
new file mode 100644
index 00000000000..b210aed0b78
--- /dev/null
+++ b/htdocs/langs/ar_EG/categories.lang
@@ -0,0 +1,9 @@
+# Dolibarr language file - Source file is en_US - categories
+Rubrique=الوسام/التصنيف
+Rubriques=الأوسمة/التصنيفات
+categories=الأوسمة/التصنيفات
+CreateCat=إنشاء وسام/تصنيف
+CreateThisCat=إنشاء هذا الوسام/التصنيف
+NoSubCat=لايوجد تصنيف فرعي
+SubCatOf=تصنيف فرعي
+FoundCats=تم العثور علي تصنيفات/أوسمة
diff --git a/htdocs/langs/ar_EG/commercial.lang b/htdocs/langs/ar_EG/commercial.lang
new file mode 100644
index 00000000000..2d1397eb341
--- /dev/null
+++ b/htdocs/langs/ar_EG/commercial.lang
@@ -0,0 +1,26 @@
+# Dolibarr language file - Source file is en_US - commercial
+Customers=عملاء
+Prospects=فرص
+DeleteAction=حذف الحدث
+AddAction=عمل حدث
+AddAnAction=عمل حدث
+AddActionRendezVous=تحديد مقابلة
+ConfirmDeleteAction=هل انت واثق من حذف هذا الحدث؟
+CardAction=كارتة حدث
+TaskRDVWith=مقابلة مع %s
+ShowTask=إفتح المهمة
+ShowAction=إفتح الحدث
+ActionsReport=تقرير الاحداث
+ThirdPartiesOfSaleRepresentative=الجهات الخارجية و ممثلي المبيعات
+SaleRepresentativesOfThirdParty=ممثلي المبيعات عن الجهة الخارجية
+SalesRepresentative=ممثل المبيعات
+SalesRepresentatives=ممثلي المبيعات
+SalesRepresentativeFollowUp=ممثل المبيعات (متبعة)
+SalesRepresentativeSignature=ممثلي المبيعات (الامضاء)
+NoSalesRepresentativeAffected=لا يوجد ممثل مبيعات محدد
+ShowCustomer=إفتح العميل
+ShowProspect=إفتح الفرصة
+ListOfProspects=قائمة الفرص
+LastDoneTasks=أحدث %s خطوات مكتملة
+LastActionsToDo=أقدم %s خطوات غير مكتملة
+DraftPropals=مسودة العروض التجارية
diff --git a/htdocs/langs/ar_EG/companies.lang b/htdocs/langs/ar_EG/companies.lang
new file mode 100644
index 00000000000..a1075a56697
--- /dev/null
+++ b/htdocs/langs/ar_EG/companies.lang
@@ -0,0 +1,12 @@
+# Dolibarr language file - Source file is en_US - companies
+ThirdPartyProspects=فرص
+ThirdPartyProspectsStats=فرص
+ThirdPartyCustomers=عملاء
+ThirdPartyCustomersStats=عملاء
+ThirdPartySuppliers=موردين
+OverAllOrders=الطلبات
+OverAllSupplierProposals=طلبات عروض اسعار
+Customer=عميل
+Contact=Contact
+InActivity=افتح
+ActivityCeased=مقفول
diff --git a/htdocs/langs/ar_EG/contracts.lang b/htdocs/langs/ar_EG/contracts.lang
new file mode 100644
index 00000000000..21e822adde8
--- /dev/null
+++ b/htdocs/langs/ar_EG/contracts.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - contracts
+ContractStatusValidated=معتمد
+ContractStatusClosed=مقفول
+ServiceStatusClosed=مقفول
diff --git a/htdocs/langs/ar_EG/deliveries.lang b/htdocs/langs/ar_EG/deliveries.lang
new file mode 100644
index 00000000000..6e2d92bb5e3
--- /dev/null
+++ b/htdocs/langs/ar_EG/deliveries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - deliveries
+DeliveryDate=تاريخ التوريد
diff --git a/htdocs/langs/ar_EG/dict.lang b/htdocs/langs/ar_EG/dict.lang
new file mode 100644
index 00000000000..886e393b183
--- /dev/null
+++ b/htdocs/langs/ar_EG/dict.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - dict
+DemandReasonTypeSRC_EMPLOYEE=موظف
diff --git a/htdocs/langs/ar_EG/donations.lang b/htdocs/langs/ar_EG/donations.lang
new file mode 100644
index 00000000000..cc789e78307
--- /dev/null
+++ b/htdocs/langs/ar_EG/donations.lang
@@ -0,0 +1,9 @@
+# Dolibarr language file - Source file is en_US - donations
+Donations=تبرعات
+DonationRef=مرجع التبرع
+Donor=المتبرع
+AddDonation=أنشاء تبرع
+NewDonation=تبرع جديد
+PublicDonation=تبرع عام
+DonationsArea=منطقة التبرعات
+DonationStatusPromiseValidatedShort=معتمد
diff --git a/htdocs/langs/ar_EG/holiday.lang b/htdocs/langs/ar_EG/holiday.lang
new file mode 100644
index 00000000000..8363b4a3fef
--- /dev/null
+++ b/htdocs/langs/ar_EG/holiday.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - holiday
+RefuseCP=مرفوض
diff --git a/htdocs/langs/ar_EG/hrm.lang b/htdocs/langs/ar_EG/hrm.lang
new file mode 100644
index 00000000000..70e618e7bd4
--- /dev/null
+++ b/htdocs/langs/ar_EG/hrm.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - hrm
+Employee=موظف
diff --git a/htdocs/langs/ar_EG/interventions.lang b/htdocs/langs/ar_EG/interventions.lang
new file mode 100644
index 00000000000..bab7f2b4cad
--- /dev/null
+++ b/htdocs/langs/ar_EG/interventions.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - interventions
+StatusInterInvoiced=مفوتر
diff --git a/htdocs/langs/ar_EG/mails.lang b/htdocs/langs/ar_EG/mails.lang
new file mode 100644
index 00000000000..adbdc0cfe39
--- /dev/null
+++ b/htdocs/langs/ar_EG/mails.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - mails
+MailingStatusValidated=معتمد
diff --git a/htdocs/langs/ar_EG/members.lang b/htdocs/langs/ar_EG/members.lang
new file mode 100644
index 00000000000..d03eb406cea
--- /dev/null
+++ b/htdocs/langs/ar_EG/members.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - members
+MemberStatusDraft=مسودة(مطلوب الاعتماد)
+MemberStatusActiveShort=معتمد
diff --git a/htdocs/langs/ar_EG/multicurrency.lang b/htdocs/langs/ar_EG/multicurrency.lang
index 4f05cd491b6..cbd2b9dce59 100644
--- a/htdocs/langs/ar_EG/multicurrency.lang
+++ b/htdocs/langs/ar_EG/multicurrency.lang
@@ -1,20 +1,9 @@
 # Dolibarr language file - Source file is en_US - multicurrency
-MultiCurrency=Multi currency
-ErrorAddRateFail=Error in added rate
-ErrorAddCurrencyFail=Error in added currency
-ErrorDeleteCurrencyFail=Error delete fail
 multicurrency_syncronize_error=Synchronisation error: %s
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use date of document to find currency rate, instead of using latest known rate
 multicurrency_useOriginTx=When an object is created from another, keep the original rate of source object (otherwise use the latest known rate)
-CurrencyLayerAccount=CurrencyLayer API
 CurrencyLayerAccount_help_to_synchronize=You sould create an account on their website to use this functionnality<br>Get your <b>API key</b><br />If you use a free account you can't change the <b>currency source</b> (USD by default)<br />But if your main currency isn't USD you can use the <b>alternate currency source</b> to force you main currency<br /><br />You are limited at 1000 synchronizations per month
-multicurrency_appId=API key
 multicurrency_appCurrencySource=Currency source
 multicurrency_alternateCurrencySource=Alternate currency source
-CurrenciesUsed=Currencies used
 CurrenciesUsed_help_to_add=Add the differents currencies and rates you need to use on you <b>proposals</b>, <b>orders</b>, etc.
-rate=rate
-MulticurrencyReceived=Received, original currency
 MulticurrencyRemainderToTake=Remaining amout, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-AmountToOthercurrency=Amount To (in currency of receiving account)
diff --git a/htdocs/langs/ar_EG/orders.lang b/htdocs/langs/ar_EG/orders.lang
new file mode 100644
index 00000000000..7e6d65dd9bd
--- /dev/null
+++ b/htdocs/langs/ar_EG/orders.lang
@@ -0,0 +1,28 @@
+# Dolibarr language file - Source file is en_US - orders
+OrdersArea=منطقة طلبات العملاء
+SuppliersOrdersArea=منطقة أوامر الشراء
+OrderCard=بطاقة الأمر
+OrderId=رقم التعريف الخاص بالأمر
+Order=طلب
+PdfOrderTitle=طلب
+Orders=الطلبات
+OrderDateShort=تاريخ الأمر
+OrderToProcess=طلب تحت التشغيل
+NewOrder=أمر جديد
+NewOrderSupplier=أمر شراء جديد
+ToOrder=إصدار أمر
+MakeOrder=إصدار أمر
+SupplierOrder=أمر شراء
+SuppliersOrders=أوامر الشراء
+SuppliersOrdersRunning=أوامر الشراء الحالية
+StatusOrderValidatedShort=معتمد
+StatusOrderRefusedShort=مرفوض
+StatusOrderDraft=مسودة(مطلوب الاعتماد)
+StatusOrderValidated=معتمد
+StatusOrderRefused=مرفوض
+TypeContact_commande_external_BILLING=جهة اتصال فاتورة العميل
+StatusSupplierOrderValidatedShort=معتمد
+StatusSupplierOrderRefusedShort=مرفوض
+StatusSupplierOrderDraft=مسودة(مطلوب الاعتماد)
+StatusSupplierOrderValidated=معتمد
+StatusSupplierOrderRefused=مرفوض
diff --git a/htdocs/langs/ar_EG/products.lang b/htdocs/langs/ar_EG/products.lang
new file mode 100644
index 00000000000..5a177b2f19a
--- /dev/null
+++ b/htdocs/langs/ar_EG/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+SuppliersPrices=أسعار المورد
diff --git a/htdocs/langs/ar_EG/projects.lang b/htdocs/langs/ar_EG/projects.lang
new file mode 100644
index 00000000000..9ec23f6aa90
--- /dev/null
+++ b/htdocs/langs/ar_EG/projects.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - projects
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
+OppStatusPROPO=عرض
diff --git a/htdocs/langs/ar_EG/propal.lang b/htdocs/langs/ar_EG/propal.lang
new file mode 100644
index 00000000000..4037a3b428b
--- /dev/null
+++ b/htdocs/langs/ar_EG/propal.lang
@@ -0,0 +1,67 @@
+# Dolibarr language file - Source file is en_US - propal
+Proposals=عروض تجارية
+Proposal=عرض تجاري
+ProposalShort=عرض
+ProposalsDraft=مسودة العروض التجارية
+ProposalsOpened=العروض التجارية المفتوحة
+CommercialProposal=عرض تجاري
+PdfCommercialProposalTitle=عرض تجاري
+ProposalCard=بطاقة العرض
+NewProp=عرض تجاري جديد
+NewPropal=عرض جديد
+Prospect=فرصة
+DeleteProp=حذف العرض التجاري
+ValidateProp=اعتماد العرض التجاري
+AddProp=إنشاء عرض
+ConfirmDeleteProp=هل أنت متأكد أنك تريد حذف هذا العرض التجاري؟
+ConfirmValidateProp=هل أنت متأكد أنك تريد اعتماد هذا العرض التجاري تحت الاسم <b> %s </b>؟
+LastPropals=أحدث عروض %s
+LastModifiedProposals=أحدث العروض المعدلة %s
+AllPropals=جميع العروض
+SearchAProposal=ابحث عن عرض
+NoProposal=لا يوجد عرض
+ProposalsStatistics=إحصائيات العروض التجارية
+NumberOfProposalsByMonth=الرقم بالشهر
+AmountOfProposalsByMonthHT=المبلغ حسب الشهر (بدون الضريبة)
+NbOfProposals=عدد العروض التجارية
+ShowPropal=إظهار العرض
+PropalsOpened=افتح
+PropalStatusDraft=مسودة(مطلوب الاعتماد)
+PropalStatusValidated=تم الاعتماد (العرض مفتوح)
+PropalStatusSigned=موقّع (يحتاج إلى فواتير)
+PropalStatusNotSigned=غير موقّع (مغلق)
+PropalStatusBilled=مفوتر
+PropalStatusValidatedShort=معتمد (مفتوح)
+PropalStatusClosedShort=مقفول
+PropalStatusSignedShort=موقع
+PropalStatusNotSignedShort=لم توقع
+PropalStatusBilledShort=مفوتر
+PropalsToClose=عروض التجارية للغلق
+PropalsToBill=عروض تجارية موقعة للفوترة
+ListOfProposals=قائمة العروض التجارية
+ActionsOnPropal=الأحداث على العرض
+RefProposal=مرجع العرض تجاري
+SendPropalByMail=إرسال عرض تجاري عن طريق البريد
+DatePropal=تاريخ العرض
+ValidityDuration=مدة الصلاحية
+CloseAs=اضبط الحالة على
+SetAcceptedRefused=مقبول / مرفوض
+ErrorPropalNotFound=العرض %s غير موجود
+AddToDraftProposals=أضف إلى مسودة العرض
+NoDraftProposals=لا توجد مسودات عروض
+CopyPropalFrom=إنشاء عرض تجاري عن طريق نسخ العرض الحالي
+CreateEmptyPropal=إنشاء عرض تجاري فارغ أو من قائمة المنتجات / الخدمات
+DefaultProposalDurationValidity=مدة صلاحية العرض التجاري الافتراضي (بالأيام)
+ConfirmClonePropal=هل أنت متأكد أنك تريد استنساخ العرض التجاري <b> %s </b>؟
+ConfirmReOpenProp=هل أنت متأكد أنك تريد إعادة فتح العرض التجاري <b> %s </b>؟
+AfterOrder=بعد الطلب
+OtherProposals=عروض أخرى
+AvailabilityTypeAV_1W=أسبوع 1
+AvailabilityTypeAV_1M=شهر 1
+TypeContact_propal_internal_SALESREPFOLL=الممثل المتابع للعرض
+TypeContact_propal_external_BILLING=جهة اتصال فاتورة العميل
+DocModelCyanDescription=نموذج عرض كامل
+DefaultModelPropalCreate=إنشاء النموذج الافتراضي
+DefaultModelPropalToBill=النموذج الافتراضي عند إغلاق عرض الأعمال (سيتم إصدار فاتورة به)
+ProposalCustomerSignature=قبول خطي وختم الشركة والتاريخ والتوقيع
+ProposalsStatisticsSuppliers=إحصاءات مقترحات البائعين
diff --git a/htdocs/langs/ar_EG/receptions.lang b/htdocs/langs/ar_EG/receptions.lang
new file mode 100644
index 00000000000..a12780e0f69
--- /dev/null
+++ b/htdocs/langs/ar_EG/receptions.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - receptions
+StatusReceptionValidatedShort=معتمد
diff --git a/htdocs/langs/ar_EG/sendings.lang b/htdocs/langs/ar_EG/sendings.lang
new file mode 100644
index 00000000000..7b3a489dd7d
--- /dev/null
+++ b/htdocs/langs/ar_EG/sendings.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - sendings
+StatusSendingValidatedShort=معتمد
diff --git a/htdocs/langs/ar_EG/sms.lang b/htdocs/langs/ar_EG/sms.lang
new file mode 100644
index 00000000000..c6e922fd18c
--- /dev/null
+++ b/htdocs/langs/ar_EG/sms.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - sms
+SmsStatusValidated=معتمد
diff --git a/htdocs/langs/ar_EG/stocks.lang b/htdocs/langs/ar_EG/stocks.lang
new file mode 100644
index 00000000000..2ea2a409fd1
--- /dev/null
+++ b/htdocs/langs/ar_EG/stocks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - stocks
+inventoryValidate=معتمد
diff --git a/htdocs/langs/ar_EG/supplier_proposal.lang b/htdocs/langs/ar_EG/supplier_proposal.lang
new file mode 100644
index 00000000000..98769314093
--- /dev/null
+++ b/htdocs/langs/ar_EG/supplier_proposal.lang
@@ -0,0 +1,47 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=عروض المورد التجارية
+supplier_proposalDESC=إدارة طلبات عروض الأسعار من موردين
+SupplierProposalNew=طلب عرض سعر جديد
+CommRequest=طلب عرض السعر
+CommRequests=طلبات عروض اسعار
+SearchRequest=البحث عن عرض سعر
+DraftRequests=مسودة طلب عرض سعر
+SupplierProposalsDraft=مسودة عروض موردين
+LastModifiedRequests=أحدث طلبات السعر المعدلة %s
+RequestsOpened=طلبات عروض اسعار مفتوحة
+SupplierProposalArea=منطقة عروض الموردين
+SupplierProposalShort=عرض المورد
+SupplierProposals=عروض الموردين
+SupplierProposalsShort=عروض الموردين
+NewAskPrice=طلب عرض سعر جديد
+ShowSupplierProposal=فتح عرض السعر
+AddSupplierProposal=عمل طلب عرض سعر
+SupplierProposalRefFourn=مرجع المورد
+SupplierProposalDate=تاريخ التوريد
+SupplierProposalRefFournNotice=قبل الإغلاق إلى "مقبول" ، فكر في فهم مراجع الموردين.
+ConfirmValidateAsk=هل أنت متأكد أنك تريد اعتماد طلب السعر هذا تحت الاسم <b> %s </b>؟
+ValidateAsk=اعتماد الطلب
+SupplierProposalStatusDraft=مسودة(مطلوب الاعتماد)
+SupplierProposalStatusValidated=معتمد(الطلب مفتوح)
+SupplierProposalStatusClosed=مقفول
+SupplierProposalStatusSigned=مقبول
+SupplierProposalStatusNotSigned=مرفوض
+SupplierProposalStatusValidatedShort=معتمد
+SupplierProposalStatusClosedShort=مقفول
+SupplierProposalStatusSignedShort=مقبول
+SupplierProposalStatusNotSignedShort=مرفوض
+CopyAskFrom=قم بإنشاء طلب سعر عن طريق نسخ طلب موجود
+CreateEmptyAsk=إنشاء طلب فارغ
+ConfirmCloneAsk=هل أنت متأكد أنك تريد استنساخ طلب السعر <b> %s </b>؟
+ConfirmReOpenAsk=هل أنت متأكد أنك تريد فتح طلب السعر مرة أخرى <b> %s </b>؟
+SendAskRef=إرسال طلب السعر %s
+SupplierProposalCard=بطاقة الطلب
+ConfirmDeleteAsk=هل أنت متأكد أنك تريد حذف طلب السعر هذا <b> %s </b>؟
+DefaultModelSupplierProposalCreate=إنشاء النموذج الافتراضي
+DefaultModelSupplierProposalClosed=القالب الافتراضي عند إغلاق طلب السعر (مرفوض)
+ListOfSupplierProposals=قائمة طلبات عروض البائعين
+ListSupplierProposalsAssociatedProject=قائمة عروض الموردين المرتبطة بالمشروع
+SupplierProposalsToClose=عروض موردين لإغلاق
+SupplierProposalsToProcess=عروض موردين لمعالجة
+LastSupplierProposals=أحدث طلبات أسعار %s
+AllPriceRequests=جميع الطلبات
diff --git a/htdocs/langs/ar_EG/suppliers.lang b/htdocs/langs/ar_EG/suppliers.lang
new file mode 100644
index 00000000000..7a683513e08
--- /dev/null
+++ b/htdocs/langs/ar_EG/suppliers.lang
@@ -0,0 +1,46 @@
+# Dolibarr language file - Source file is en_US - suppliers
+Suppliers=موردين
+SuppliersInvoice=فاتورة مورد
+ShowSupplierInvoice=إظهار فاتورة المورد
+NewSupplier=مورد جديد
+ListOfSuppliers=قائمة موردين
+ShowSupplier=فتح صفحة المورد
+OrderDate=تاريخ الأمر
+BuyingPriceMin=أفضل سعر شراء
+BuyingPriceMinShort=أفضل سعر شراء
+TotalBuyingPriceMinShort=إجمالي أسعار الشراء
+TotalSellingPriceMinShort=إجمالي أسعار البيع
+SomeSubProductHaveNoPrices=بعض المنتجات غير مسعره
+AddSupplierPrice=إضافة سعر الشراء
+ChangeSupplierPrice=تغيير سعر الشراء
+SupplierPrices=أسعار المورد
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=مرجع المورد هذا مرتبط بالفعل بمنتج: %s
+NoRecordedSuppliers=لم يتم تسجيل مورد
+SupplierPayment=دفعة مورد
+SuppliersArea=منطقة المورد
+RefSupplierShort=المرجع. مورد
+Availability=التوفر
+ExportDataset_fournisseur_1=فواتير المورد و تفاصيلها
+ExportDataset_fournisseur_2=فواتير و دفعات المورد
+ExportDataset_fournisseur_3=تفاصيل أوامر الشراء
+ApproveThisOrder=إعتماد الأمر
+ConfirmApproveThisOrder=هل أنت متأكد أنك تريد الموافقة على الطلب <b> %s </b>؟
+DenyingThisOrder=رفض هذا الأمر
+ConfirmDenyingThisOrder=هل أنت متأكد أنك تريد رفض هذا الطلب <b> %s </b>؟
+ConfirmCancelThisOrder=هل أنت متأكد أنك تريد إلغاء هذا الطلب <b> %s </b>؟
+AddSupplierOrder=إنشاء أمر شراء
+AddSupplierInvoice=إنشاء فاتورة المورد
+ListOfSupplierProductForSupplier=قائمة المنتجات والأسعار الخاصة بالمورد <b> %s </b>
+SentToSuppliers=مرسلة إلى المورديين
+ListOfSupplierOrders=قائمة أوامر الشراء
+MenuOrdersSupplierToBill=أوامر الشراء للفاتورة
+NbDaysToDelivery=تأخير التسليم (أيام)
+DescNbDaysToDelivery=أطول تأخير لتسليم المنتجات من هذا الطلب
+SupplierReputation=سمعة المورد
+DoNotOrderThisProductToThisSupplier=لا تتعامل
+NotTheGoodQualitySupplier=جودة منخفضة
+ReputationForThisProduct=سمعة
+BuyerName=اسم المشتري
+AllProductServicePrices=أسعار جميع المنتجات / الخدمات
+AllProductReferencesOfSupplier=جميع مراجع المنتج / الخدمة للمورد
+BuyingPriceNumShort=أسعار المورد
diff --git a/htdocs/langs/ar_EG/ticket.lang b/htdocs/langs/ar_EG/ticket.lang
new file mode 100644
index 00000000000..4185fd359c1
--- /dev/null
+++ b/htdocs/langs/ar_EG/ticket.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - ticket
+Closed=مقفول
diff --git a/htdocs/langs/ar_EG/website.lang b/htdocs/langs/ar_EG/website.lang
new file mode 100644
index 00000000000..4f2ff392475
--- /dev/null
+++ b/htdocs/langs/ar_EG/website.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - website
+WebsiteSetupDesc=أنشئ هنا مواقع الويب التي ترغب في استخدامها. ثم انتقل إلى قائمة مواقع الويب القائمة لعمل التعديلات.
+DeleteWebsite=حذف موقع الويب
+ConfirmDeleteWebsite=هل أنت متأكد أنك تريد حذف هذا الموقع؟ سيتم أيضًا إزالة جميع صفحاته ومحتواه. ستبقى الملفات التي تم تحميلها (مثل في دليل الصور ، وحدة ECM ، ...).
+WEBSITE_TYPE_CONTAINER=نوع الصفحة / الحاوية
+WEBSITE_PAGE_EXAMPLE=صفحة ويب لاستخدامها كمثال
+WEBSITE_PAGENAME=اسم الصفحة / الاسم المستعار
+WEBSITE_ALIASALT=أسماء الصفحات / الأسماء المستعارة البديلة
+WEBSITE_ALIASALTDesc=استخدم هنا قائمة بأسماء / أسماء مستعارة أخرى بحيث يمكن الوصول إلى الصفحة أيضًا باستخدام هذه الأسماء / الأسماء المستعارة الأخرى (على سبيل المثال ، الاسم القديم بعد إعادة تسمية الاسم المستعار للحفاظ على الرابط الخلفي في عمل الرابط / الاسم القديم). النحو هو: <br> Alternativename1 ، و Alternativename2 ، ...
+WEBSITE_CSS_URL=عنوان URL لملف CSS الخارجي
+WEBSITE_CSS_INLINE=محتوى ملف CSS (مشترك لجميع الصفحات)
diff --git a/htdocs/langs/ar_EG/withdrawals.lang b/htdocs/langs/ar_EG/withdrawals.lang
new file mode 100644
index 00000000000..a45b9beb6d8
--- /dev/null
+++ b/htdocs/langs/ar_EG/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+StatusRefused=مرفوض
diff --git a/htdocs/langs/ar_EG/workflow.lang b/htdocs/langs/ar_EG/workflow.lang
new file mode 100644
index 00000000000..45447603a22
--- /dev/null
+++ b/htdocs/langs/ar_EG/workflow.lang
@@ -0,0 +1,17 @@
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=إعداد وحدة سير العمل
+WorkflowDesc=توفر هذه الوحدة بعض الإجراءات التلقائية. بشكل افتراضي ، سير العمل مفتوح (يمكنك القيام بالأشياء بالترتيب الذي تريده) ولكن هنا يمكنك تنشيط بعض الإجراءات التلقائية.
+ThereIsNoWorkflowToModify=لا توجد تعديلات على سير العمل متاحة مع الوحدات المفعلة.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=إنشاء أمر مبيعات تلقائيًا بعد توقيع عرض تجاري (سيكون للطلب الجديد نفس مبلغ العرض)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=إنشاء فاتورة عملاء تلقائيًا بعد توقيع عرض تجاري (سيكون للفاتورة الجديدة نفس مبلغ الاقتراح)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=إنشاء فاتورة العميل تلقائيًا بعد التحقق من إعتماد العقد
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=إنشاء فاتورة عملاء تلقائيًا بعد إغلاق أمر المبيعات (سيكون للفاتورة الجديدة نفس مبلغ الأمر)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=إعتبار العرض الأصلي مفوتر عند فوترت أمر المبيعات (وإذا كان مبلغ الأمر هو نفس المبلغ الإجمالي للاقتراح المرتبط الموقع)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=إعتبار العرض الأصلي مفوتر عند اعتماد فاتورة العميل (وإذا كان مبلغ الفاتورة هو نفس المبلغ الإجمالي للعرض الاصلى الموقع)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=تصنيف أمر مبيعات الاصلى مفوتر عند اعتماد من فاتورة العميل (وإذا كان مبلغ الفاتورة هو نفس المبلغ الإجمالي للأمر المرتبط)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=تصنيف أمر المبيعات الأصلي على أنه فاتورة عند تسجيل دفع العميل للفاتورة (وإذا كان مبلغ الفاتورة هو نفس المبلغ الإجمالي للأمر المرتبط)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=تصنيف أمر مبيعات الاصلى على أنه مشحون عند التحقق من صحة الشحنة (وإذا كانت الكمية المشحونة بواسطة جميع الشحنات هي نفسها كما في طلب التحديث)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=تصنيف عرض المورد الاصلى على أنه فاتورة عند التحقق من صحة فاتورة البائع (وإذا كان مبلغ الفاتورة هو نفس المبلغ الإجمالي للعرض المرتبط)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=تصنيف أمر الشراء الاصلى على أنه فاتورة عند التحقق من صحة فاتورة البائع (وإذا كان مبلغ الفاتورة هو نفس المبلغ الإجمالي للطلب المرتبط)
+AutomaticCreation=الإنشاء الأوتوماتيكي
+AutomaticClassification=التصنيف الأوتوماتيكي
diff --git a/htdocs/langs/ar_EG/zapier.lang b/htdocs/langs/ar_EG/zapier.lang
new file mode 100644
index 00000000000..dd7094bdc04
--- /dev/null
+++ b/htdocs/langs/ar_EG/zapier.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - zapier
+ModuleZapierForDolibarrName =Zapier
+ModuleZapierForDolibarrDesc =وحدة Zapier
+ZapierForDolibarrSetup =إعداد Zapier
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index ab83e39a2d2..cf95ced5354 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=المبيعات الإجمالية قبل الضريبة
 TotalMarge=إجمالي هامش المبيعات
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index c316fb0b4a3..c6c0bcc954e 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=خادم الويب المستخدم / المجموعة
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=الترميز الخاص بقاعدة البيانات لتخزين المعلومات
 DBSortingCharset=الترميز الخاص بقاعدة البيانات لتخزين المعلومات
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=يجب أن يكون النموذج <b>%s</b> مفعل
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=رابط إلى كائن
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=افتراضيا IRPF المقترحة هي 0. نهاية الحكم.
 LocalTax2IsUsedExampleES=في اسبانيا ، لحسابهم الخاص والمهنيين المستقلين الذين يقدمون الخدمات والشركات الذين اختاروا النظام الضريبي من وحدات.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=تقارير عن الضرائب المحلية
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=شاهد الإعداد وحدة
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=نموذج متعدد شركة الإعداد
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=لون الخلفية القائمة اليمنى
 BackgroundTableTitleColor=لون الخلفية لخط عنوان الجدول
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=لون الخلفية لخطوط الجدول غريبة
 BackgroundTableLineEvenColor=لون الخلفية حتى خطوط الجدول
 MinimumNoticePeriod=الحد الأدنى لمدة إشعار (يجب أن يتم طلب إجازة قبل هذا التأخير)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=الرمز البريدي
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index 9625e9a54b6..8967fedb3ab 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=مبلغ الفواتير
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=كمية من الفواتير من قبل شهر (بعد خصم الضرائب)
-ShowSocialContribution=تظهر الضريبة الاجتماعية / المالية
-ShowBill=وتظهر الفاتورة
-ShowInvoice=وتظهر الفاتورة
-ShowInvoiceReplace=وتظهر استبدال الفاتورة
-ShowInvoiceAvoir=وتظهر المذكرة الائتمان
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=وتظهر الدفع
 AlreadyPaid=دفعت بالفعل
 AlreadyPaidBack=دفعت بالفعل العودة
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=الحالة
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=عودة عدد مع الشكل syymm NNNN عن الفواتير القياسية و٪ syymm-NNNN لتلاحظ الائتمان حيث هو YY العام٪، مم هو الشهر وnnnn هو تسلسل مع أي انقطاع وعدم العودة إلى 0
diff --git a/htdocs/langs/ar_SA/donations.lang b/htdocs/langs/ar_SA/donations.lang
index 492a364cd4e..1cba54ca878 100644
--- a/htdocs/langs/ar_SA/donations.lang
+++ b/htdocs/langs/ar_SA/donations.lang
@@ -7,7 +7,6 @@ AddDonation=إنشاء التبرع
 NewDonation=منحة جديدة
 DeleteADonation=حذف التبرع
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=مشاهدة التبرع
 PublicDonation=تبرع العامة
 DonationsArea=التبرعات المنطقة
 DonationStatusPromiseNotValidated=مشروع وعد
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=مسودة
 DonationStatusPromiseValidatedShort=صادق
 DonationStatusPaidShort=وردت
 DonationTitle=استلام التبرع
+DonationDate=Donation date
 DonationDatePayment=تاريخ الدفع
 ValidPromess=التحقق من صحة الوعد
 DonationReceipt=استلام التبرع
diff --git a/htdocs/langs/ar_SA/interventions.lang b/htdocs/langs/ar_SA/interventions.lang
index 308427fad67..06c3d23854e 100644
--- a/htdocs/langs/ar_SA/interventions.lang
+++ b/htdocs/langs/ar_SA/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=منطقة التدخلات
 DraftFichinter=مشروع التدخلات
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=متابعة العملاء الاتصال
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=التدخلات المتولدة من أوامر
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=تدخل معرف
 InterRef=تدخل المرجع.
 InterDateCreation=تدخل تاريخ الإنشاء
 InterDuration=تدخل مدة
 InterStatus=التدخل الوضع
 InterNote=ملاحظة التدخل
+InterLine=Line of intervention
 InterLineId=تدخل معرف الخط
 InterLineDate=تدخل تاريخ الخط
 InterLineDuration=تدخل مدة خط
 InterLineDesc=خط وصف التدخل
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/ar_SA/modulebuilder.lang b/htdocs/langs/ar_SA/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/ar_SA/modulebuilder.lang
+++ b/htdocs/langs/ar_SA/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/ar_SA/multicurrency.lang b/htdocs/langs/ar_SA/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/ar_SA/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index e92384e6dc2..6d0a3866a69 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang
index 4def736100c..09a41969c1a 100644
--- a/htdocs/langs/ar_SA/website.lang
+++ b/htdocs/langs/ar_SA/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/ar_SA/zapier.lang b/htdocs/langs/ar_SA/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/ar_SA/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/az_AZ/accountancy.lang b/htdocs/langs/az_AZ/accountancy.lang
new file mode 100644
index 00000000000..b8ce37a0956
--- /dev/null
+++ b/htdocs/langs/az_AZ/accountancy.lang
@@ -0,0 +1,382 @@
+# Dolibarr language file - en_US - Accountancy (Double entries)
+Accountancy=Accountancy
+Accounting=Accounting
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
+ACCOUNTING_EXPORT_LABEL=Export label
+ACCOUNTING_EXPORT_AMOUNT=Export amount
+ACCOUNTING_EXPORT_DEVISE=Export currency
+Selectformat=Select the format for the file
+ACCOUNTING_EXPORT_FORMAT=Select the format for the file
+ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
+ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
+ThisService=This service
+ThisProduct=This product
+DefaultForService=Default for service
+DefaultForProduct=Default for product
+CantSuggest=Can't suggest
+AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journalization=Journalization
+Journaux=Journals
+JournalFinancial=Financial journals
+BackToChartofaccounts=Return chart of accounts
+Chartofaccounts=Chart of accounts
+CurrentDedicatedAccountingAccount=Current dedicated account
+AssignDedicatedAccountingAccount=New account to assign
+InvoiceLabel=Invoice label
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
+OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
+JournalizationInLedgerStatus=Status of journalization
+AlreadyInGeneralLedger=Already journalized in ledgers
+NotYetInGeneralLedger=Not yet journalized in ledgers
+GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
+DetailByAccount=Show detail by account
+AccountWithNonZeroValues=Accounts with non-zero values
+ListOfAccounts=List of accounts
+CountriesInEEC=Countries in EEC
+CountriesNotInEEC=Countries not in EEC
+CountriesInEECExceptMe=Countries in EEC except %s
+CountriesExceptMe=All countries except %s
+AccountantFiles=Export accounting documents
+
+MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
+MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
+MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+
+AccountancyArea=Accounting area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
+
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expenses (miscellaneous taxes). For this, use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
+AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
+AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+
+AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+Selectchartofaccounts=Select active chart of accounts
+ChangeAndLoad=Change and load
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+AccountAccountingShort=Account
+SubledgerAccount=Subledger account
+SubledgerAccountLabel=Subledger account label
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
+AccountAccountingSuggest=Accounting account suggested
+MenuDefaultAccounts=Default accounts
+MenuBankAccounts=Bank accounts
+MenuVatAccounts=Vat accounts
+MenuTaxAccounts=Tax accounts
+MenuExpenseReportAccounts=Expense report accounts
+MenuLoanAccounts=Loan accounts
+MenuProductsAccounts=Product accounts
+MenuClosureAccounts=Closure accounts
+MenuAccountancyClosure=Closure
+MenuAccountancyValidationMovements=Validate movements
+ProductsBinding=Products accounts
+TransferInAccounting=Transfer in accounting
+RegistrationInAccounting=Registration in accounting
+Binding=Binding to accounts
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Vendor invoice binding
+ExpenseReportsVentilation=Expense report binding
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+ValidTransaction=Validate transaction
+WriteBookKeeping=Register transactions in Ledger
+Bookkeeping=Ledger
+AccountBalance=Account balance
+ObjectsRef=Source object ref
+CAHTF=Total purchase vendor before tax
+TotalExpenseReport=Total expense report
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+ExpenseReportLines=Lines of expense reports to bind
+ExpenseReportLinesDone=Bound lines of expense reports
+IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
+
+
+Ventilate=Bind
+LineId=Id line
+Processing=Processing
+EndProcessing=Process terminated.
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+LineOfExpenseReport=Line of expense report
+NoAccountSelected=No accounting account selected
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+
+ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
+BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+
+ACCOUNTING_SELL_JOURNAL=Sell journal
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
+ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
+
+ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
+ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
+TransitionalAccount=Transitional bank transfer account
+
+ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
+DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+LabelAccount=Label account
+LabelOperation=Label operation
+Sens=Sens
+LetteringCode=Lettering code
+Lettering=Lettering
+Codejournal=Journal
+JournalLabel=Journal label
+NumPiece=Piece number
+TransactionNumShort=Num. transaction
+AccountingCategory=Personalized groups
+GroupByAccountAccounting=Group by accounting account
+AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
+ByAccounts=By accounts
+ByPredefinedAccountGroups=By predefined groups
+ByPersonalizedAccountGroups=By personalized groups
+ByYear=By year
+NotMatch=Not Set
+DeleteMvt=Delete Ledger lines
+DelMonth=Month to delete
+DelYear=Year to delete
+DelJournal=Journal to delete
+ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+FinanceJournal=Finance journal
+ExpenseReportsJournal=Expense reports journal
+DescFinanceJournal=Finance journal including all the types of payments by bank account
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+FeeAccountNotDefined=Account for fee not defined
+BankAccountNotDefined=Account for bank not defined
+CustomerInvoicePayment=Payment of invoice customer
+ThirdPartyAccount=Third-party account
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+AddCompteFromBK=Add accounting accounts to the group
+ReportThirdParty=List third-party account
+DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
+ListAccounts=List of the accounting accounts
+UnknownAccountForThirdparty=Unknown third-party account. We will use %s
+UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
+ShowOpeningBalance=Show opening balance
+HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
+
+Pcgtype=Group of account
+PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+
+Reconcilable=Reconcilable
+
+TotalVente=Total turnover before tax
+TotalMarge=Total sales margin
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
+Vide=-
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account (only record not already transfered in accountancy are visible)
+DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
+DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
+DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
+DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+
+DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
+OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+ValidateMovements=Validate movements
+DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
+SelectMonthAndValidate=Select month and validate movements
+
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
+Balancing=Balancing
+FicheVentilation=Binding card
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
+NoNewRecordSaved=No more record to journalize
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
+ShowTutorial=Show Tutorial
+NotReconciled=Not reconciled
+
+## Admin
+ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
+CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccountingJournal=Show accounting journal
+NatureOfJournal=Nature of Journal
+AccountingJournalType1=Miscellaneous operations
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
+NumberOfAccountancyEntries=Number of entries
+NumberOfAccountancyMovements=Number of movements
+
+## Export
+ExportDraftJournal=Export draft journal
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export for CEGID Expert Comptabilité
+Modelcsv_COALA=Export for Sage Coala
+Modelcsv_bob50=Export for Sage BOB 50
+Modelcsv_ciel=Export for Sage Ciel Compta or Compta Evolution
+Modelcsv_quadratus=Export for Quadratus QuadraCompta
+Modelcsv_ebp=Export for EBP
+Modelcsv_cogilog=Export for Cogilog
+Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
+Modelcsv_openconcerto=Export for OpenConcerto (Test)
+Modelcsv_configurable=Export CSV Configurable
+Modelcsv_FEC=Export FEC
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+ChartofaccountsId=Chart of accounts Id
+
+## Tools - Init accounting account on product / service
+InitAccountancy=Init accountancy
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
+DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
+Options=Options
+OptionModeProductSell=Mode sales
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
+OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
+OptionModeProductSellDesc=Show all products with accounting account for sales.
+OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
+OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
+OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
+CleanFixHistory=Remove accounting code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
+PredefinedGroups=Predefined groups
+WithoutValidAccount=Without valid dedicated account
+WithValidAccount=With valid dedicated account
+ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
+AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
+
+## Dictionary
+Range=Range of accounting account
+Calculated=Calculated
+Formula=Formula
+
+## Error
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
+ExportNotSupported=The export format setuped is not supported into this page
+BookeppingLineAlreayExists=Lines already existing into bookkeeping
+NoJournalDefined=No journal defined
+Binded=Lines bound
+ToBind=Lines to bind
+UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
+
+## Import
+ImportAccountingEntries=Accounting entries
+DateExport=Date export
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/az_AZ/admin.lang b/htdocs/langs/az_AZ/admin.lang
new file mode 100644
index 00000000000..7eb67d7a4ab
--- /dev/null
+++ b/htdocs/langs/az_AZ/admin.lang
@@ -0,0 +1,2002 @@
+# Dolibarr language file - Source file is en_US - admin
+Foundation=Foundation
+Version=Version
+Publisher=Publisher
+VersionProgram=Version program
+VersionLastInstall=Initial install version
+VersionLastUpgrade=Latest version upgrade
+VersionExperimental=Experimental
+VersionDevelopment=Development
+VersionUnknown=Unknown
+VersionRecommanded=Recommended
+FileCheck=Fileset Integrity Checks
+FileCheckDesc=This tool allows you to check the integrity of files and the setup of your application, comparing each file with the official one. The value of some setup constants may also be checked. You can use this tool to determine if any files have been modified (e.g by a hacker).
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files have been added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when the application is installed from an official package
+XmlNotFound=Xml Integrity File of application not found
+SessionId=Session ID
+SessionSaveHandler=Handler to save sessions
+SessionSavePath=Session save location
+PurgeSessions=Purge of sessions
+ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
+NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow listing all running sessions.
+LockNewSessions=Lock new connections
+ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself? Only user <b>%s</b> will be able to connect after that.
+UnlockNewSessions=Remove connection lock
+YourSession=Your session
+Sessions=Users Sessions
+WebUserGroup=Web server user/group
+NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
+DBStoringCharset=Database charset to store data
+DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
+ClientCharset=Client charset
+ClientSortingCharset=Client collation
+WarningModuleNotActive=Module <b>%s</b> must be enabled
+WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
+DolibarrSetup=Dolibarr install or upgrade
+InternalUser=Internal user
+ExternalUser=External user
+InternalUsers=Internal users
+ExternalUsers=External users
+GUISetup=Display
+SetupArea=Setup
+UploadNewTemplate=Upload new template(s)
+FormToTestFileUploadForm=Form to test file upload (according to setup)
+IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
+RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
+RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
+SecuritySetup=Security setup
+SecurityFilesDesc=Define here options related to security about uploading files.
+ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
+ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
+ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
+DictionarySetup=Dictionary setup
+Dictionary=Dictionaries
+ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
+ErrorCodeCantContainZero=Code can't contain value 0
+DisableJavascript=Disable JavaScript and Ajax functions
+DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
+NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
+JavascriptDisabled=JavaScript disabled
+UsePreviewTabs=Use preview tabs
+ShowPreview=Show preview
+PreviewNotAvailable=Preview not available
+ThemeCurrentlyActive=Theme currently active
+CurrentTimeZone=TimeZone PHP (server)
+MySQLTimeZone=TimeZone MySql (database)
+TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+Space=Space
+Table=Table
+Fields=Fields
+Index=Index
+Mask=Mask
+NextValue=Next value
+NextValueForInvoices=Next value (invoices)
+NextValueForCreditNotes=Next value (credit notes)
+NextValueForDeposit=Next value (down payment)
+NextValueForReplacements=Next value (replacements)
+MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
+MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page
+AntiVirusCommand=Full path to antivirus command
+AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusParam= More parameters on command line
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=Accounting module setup
+UserSetup=User management setup
+MultiCurrencySetup=Multi-currency setup
+MenuLimits=Limits and accuracy
+MenuIdParent=Parent menu ID
+DetailMenuIdParent=ID of parent menu (empty for a top menu)
+DetailPosition=Sort number to define menu position
+AllMenus=All
+NotConfigured=Module/Application not configured
+Active=Active
+SetupShort=Setup
+OtherOptions=Other options
+OtherSetup=Other Setup
+CurrentValueSeparatorDecimal=Decimal separator
+CurrentValueSeparatorThousand=Thousand separator
+Destination=Destination
+IdModule=Module ID
+IdPermissions=Permissions ID
+LanguageBrowserParameter=Parameter %s
+LocalisationDolibarrParameters=Localization parameters
+ClientTZ=Client Time Zone (user)
+ClientHour=Client time (user)
+OSTZ=Server OS Time Zone
+PHPTZ=PHP server Time Zone
+DaylingSavingTime=Daylight saving time
+CurrentHour=PHP Time (server)
+CurrentSessionTimeOut=Current session timeout
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a .htaccess file with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but of the timezone of the server.
+Box=Widget
+Boxes=Widgets
+MaxNbOfLinesForBoxes=Max. number of lines for widgets
+AllWidgetsWereEnabled=All available widgets are enabled
+PositionByDefault=Default order
+Position=Position
+MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
+MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br>Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenuForUsers=Menu for users
+LangFile=.lang file
+Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
+System=System
+SystemInfo=System information
+SystemToolsArea=System tools area
+SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature.
+Purge=Purge
+PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
+PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
+PurgeRunNow=Purge now
+PurgeNothingToDelete=No directory or files to delete.
+PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
+PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
+PurgeAuditEvents=Purge all security events
+ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
+GenerateBackup=Generate backup
+Backup=Backup
+Restore=Restore
+RunCommandSummary=Backup has been launched with the following command
+BackupResult=Backup result
+BackupFileSuccessfullyCreated=Backup file successfully generated
+YouCanDownloadBackupFile=The generated file can now be downloaded
+NoBackupFileAvailable=No backup files available.
+ExportMethod=Export method
+ImportMethod=Import method
+ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
+ImportMySqlDesc=To import a MySQL backup file, you may use phpMyAdmin via your hosting or use the mysql command from the Command line.<br>For example:
+ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
+ImportMySqlCommand=%s %s < mybackupfile.sql
+ImportPostgreSqlCommand=%s %s mybackupfile.sql
+FileNameToGenerate=Filename for backup:
+Compression=Compression
+CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
+CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
+ExportCompatibility=Compatibility of generated export file
+ExportUseMySQLQuickParameter=Use the --quick parameter
+ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
+MySqlExportParameters=MySQL export parameters
+PostgreSqlExportParameters= PostgreSQL export parameters
+UseTransactionnalMode=Use transactional mode
+FullPathToMysqldumpCommand=Full path to mysqldump command
+FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
+AddDropDatabase=Add DROP DATABASE command
+AddDropTable=Add DROP TABLE command
+ExportStructure=Structure
+NameColumn=Name columns
+ExtendedInsert=Extended INSERT
+NoLockBeforeInsert=No lock commands around INSERT
+DelayedInsert=Delayed insert
+EncodeBinariesInHexa=Encode binary data in hexadecimal
+IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
+AutoDetectLang=Autodetect (browser language)
+FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
+BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
+OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
+ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external app/modules
+ModulesDevelopYourModule=Develop your own app/modules
+ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
+DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
+NewModule=New
+FreeModule=Free
+CompatibleUpTo=Compatible with version %s
+NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
+CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
+SeeInMarkerPlace=See in Market place
+SeeSetupOfModule=See setup of module %s
+Updated=Updated
+Nouveauté=Novelty
+AchatTelechargement=Buy / Download
+GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
+DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming may develop a module.
+WebSiteDesc=External websites for more add-on (non-core) modules...
+DevelopYourModuleDesc=Some solutions to develop your own module...
+URL=URL
+RelativeURL=Relative URL
+BoxesAvailable=Widgets available
+BoxesActivated=Widgets activated
+ActivateOn=Activate on
+ActiveOn=Activated on
+SourceFile=Source file
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
+Required=Required
+UsedOnlyWithTypeOption=Used by some agenda option only
+Security=Security
+Passwords=Passwords
+DoNotStoreClearPassword=Encrypt passwords stored in database (NOT as plain-text). It is strongly recommended to activate this option.
+MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
+ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
+Feature=Feature
+DolibarrLicense=License
+Developpers=Developers/contributors
+OfficialWebSite=Dolibarr official web site
+OfficialWebSiteLocal=Local web site (%s)
+OfficialWiki=Dolibarr documentation / Wiki
+OfficialDemo=Dolibarr online demo
+OfficialMarketPlace=Official market place for external modules/addons
+OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
+ReferencedPreferredPartners=Preferred Partners
+OtherResources=Other resources
+ExternalResources=External Resources
+SocialNetworks=Social Networks
+ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
+ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
+HelpCenterDesc2=Some of these resources are only available in <b>english</b>.
+CurrentMenuHandler=Current menu handler
+MeasuringUnit=Measuring unit
+LeftMargin=Left margin
+TopMargin=Top margin
+PaperSize=Paper type
+Orientation=Orientation
+SpaceX=Space X
+SpaceY=Space Y
+FontSize=Font size
+Content=Content
+NoticePeriod=Notice period
+NewByMonth=New by month
+Emails=Emails
+EMailsSetup=Emails setup
+EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EmailSenderProfiles=Emails sender profiles
+EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
+MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix-like systems)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix-like systems)
+MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
+MAIN_MAIL_AUTOCOPY_TO= Copy (Bcc) all sent emails to
+MAIN_DISABLE_ALL_MAILS=Disable all email sending (for test purposes or demos)
+MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
+MAIN_MAIL_SENDMODE=Email sending method
+MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
+MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
+MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
+MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
+MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos)
+MAIN_SMS_SENDMODE=Method to use to send SMS
+MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending
+MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
+UserEmail=User email
+CompanyEmail=Company Email
+FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+ModuleSetup=Module setup
+ModulesSetup=Modules/Application setup
+ModuleFamilyBase=System
+ModuleFamilyCrm=Customer Relationship Management (CRM)
+ModuleFamilySrm=Vendor Relationship Management (VRM)
+ModuleFamilyProducts=Product Management (PM)
+ModuleFamilyHr=Human Resource Management (HR)
+ModuleFamilyProjects=Projects/Collaborative work
+ModuleFamilyOther=Other
+ModuleFamilyTechnic=Multi-modules tools
+ModuleFamilyExperimental=Experimental modules
+ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
+ModuleFamilyECM=Electronic Content Management (ECM)
+ModuleFamilyPortal=Websites and other frontal application
+ModuleFamilyInterface=Interfaces with external systems
+MenuHandlers=Menu handlers
+MenuAdmin=Menu editor
+DoNotUseInProduction=Do not use in production
+ThisIsProcessToFollow=Upgrade procedure:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+StepNb=Step %s
+FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
+DownloadPackageFromWebSite=Download package (for example from the official web site %s).
+UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
+YouCanSubmitFile=You can upload the .zip file of module package from here:
+CurrentVersion=Dolibarr current version
+CallUpdatePage=Browse to the page that updates the database structure and data: %s.
+LastStableVersion=Latest stable version
+LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
+UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
+GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
+GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
+GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
+ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
+ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
+DoTestServerAvailability=Test server connectivity
+DoTestSend=Test sending
+DoTestSendHTML=Test sending HTML
+ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
+UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
+SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
+UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
+DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
+DisableLinkToHelp=Hide link to online help "<b>%s</b>"
+AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
+ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
+MinLength=Minimum length
+LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
+LanguageFile=Language file
+ExamplesWithCurrentSetup=Examples with current configuration
+ListOfDirectories=List of OpenDocument templates directories
+ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
+NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
+FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
+FirstnameNamePosition=Position of Name/Lastname
+DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
+KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
+TestSubmitForm=Input test form
+ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours.
+ThemeDir=Skins directory
+ConnectionTimeout=Connection timeout
+ResponseTimeout=Response timeout
+SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
+ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
+SecurityToken=Key to secure URLs
+NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
+PDF=PDF
+PDFDesc=Global options for PDF generation.
+PDFAddressForging=Rules for address boxes
+HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
+PDFLocaltax=Rules for %s
+HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideDescOnPDF=Hide products description
+HideRefOnPDF=Hide products ref.
+HideDetailsOnPDF=Hide product lines details
+PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+Library=Library
+UrlGenerationParameters=Parameters to secure URLs
+SecurityTokenIsUnique=Use a unique securekey parameter for each URL
+EnterRefToBuildUrl=Enter reference for object %s
+GetSecuredUrl=Get calculated URL
+ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+OldVATRates=Old VAT rate
+NewVATRates=New VAT rate
+PriceBaseTypeToChange=Modify on prices with base reference value defined on
+MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
+String=String
+TextLong=Long text
+HtmlText=Html text
+Int=Integer
+Float=Float
+DateAndTime=Date and hour
+Unique=Unique
+Boolean=Boolean (one checkbox)
+ExtrafieldPhone = Phone
+ExtrafieldPrice = Price
+ExtrafieldMail = Email
+ExtrafieldUrl = Url
+ExtrafieldSelect = Select list
+ExtrafieldSelectList = Select from table
+ExtrafieldSeparator=Separator (not a field)
+ExtrafieldPassword=Password
+ExtrafieldRadio=Radio buttons (one choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
+ExtrafieldLink=Link to an object
+ComputedFormula=Computed field
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+Computedpersistent=Store computed field
+ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
+ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
+ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
+LibraryToBuildPDF=Library used for PDF generation
+LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
+SMS=SMS
+LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
+RefreshPhoneLink=Refresh link
+LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
+KeepEmptyToUseDefault=Keep empty to use default value
+DefaultLink=Default link
+SetAsDefault=Set as default
+ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
+ExternalModule=External module
+InstalledInto=Installed into directory %s
+BarcodeInitForthird-parties=Mass barcode init for third-parties
+BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
+CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
+InitEmptyBarCode=Init value for next %s empty records
+EraseAllCurrentBarCode=Erase all current barcode values
+ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
+AllBarcodeReset=All barcode values have been removed
+NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
+EnableFileCache=Enable file cache
+ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
+NoDetails=No additional details in footer
+DisplayCompanyInfo=Display company address
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
+EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
+ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code
+ModuleCompanyCodePanicum=Return an empty accounting code.
+ModuleCompanyCodeDigitaria=Returns a compound accounting code according to the name of the third party. The code consists of a prefix that can be defined in the first position followed by the number of characters defined in the third party code.
+ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
+ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+ClickToShowDescription=Click to show description
+DependsOn=This module needs the module(s)
+RequiredBy=This module is required by module(s)
+TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
+PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
+EnableDefaultValues=Enable customization of default values
+EnableOverwriteTranslation=Enable usage of overwritten translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
+AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
+FilesAttachedToEmail=Attach file
+SendEmailsReminders=Send agenda reminders by emails
+davDescription=Setup a WebDAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
+DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
+DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
+DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
+DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
+# Modules
+Module0Name=Users & Groups
+Module0Desc=Users / Employees and Groups management
+Module1Name=Third Parties
+Module1Desc=Companies and contacts management (customers, prospects...)
+Module2Name=Commercial
+Module2Desc=Commercial management
+Module10Name=Accounting (simplified)
+Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
+Module20Name=Proposals
+Module20Desc=Commercial proposal management
+Module22Name=Mass Emailings
+Module22Desc=Manage bulk emailing
+Module23Name=Energy
+Module23Desc=Monitoring the consumption of energies
+Module25Name=Sales Orders
+Module25Desc=Sales order management
+Module30Name=Invoices
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
+Module40Name=Vendors
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
+Module42Name=Debug Logs
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module49Name=Editors
+Module49Desc=Editor management
+Module50Name=Products
+Module50Desc=Management of Products
+Module51Name=Mass mailings
+Module51Desc=Mass paper mailing management
+Module52Name=Stocks
+Module52Desc=Stock management
+Module53Name=Services
+Module53Desc=Management of Services
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or recurring subscriptions)
+Module55Name=Barcodes
+Module55Desc=Barcode management
+Module56Name=Telephony
+Module56Desc=Telephony integration
+Module57Name=Bank Direct Debit payments
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module58Name=ClickToDial
+Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
+Module59Name=Bookmark4u
+Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
+Module60Name=Stickers
+Module60Desc=Management of stickers
+Module70Name=Interventions
+Module70Desc=Intervention management
+Module75Name=Expense and trip notes
+Module75Desc=Expense and trip notes management
+Module80Name=Shipments
+Module80Desc=Shipments and delivery note management
+Module85Name=Banks & Cash
+Module85Desc=Management of bank or cash accounts
+Module100Name=External Site
+Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module105Name=Mailman and SPIP
+Module105Desc=Mailman or SPIP interface for member module
+Module200Name=LDAP
+Module200Desc=LDAP directory synchronization
+Module210Name=PostNuke
+Module210Desc=PostNuke integration
+Module240Name=Data exports
+Module240Desc=Tool to export Dolibarr data (with assistance)
+Module250Name=Data imports
+Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module310Name=Members
+Module310Desc=Foundation members management
+Module320Name=RSS Feed
+Module320Desc=Add a RSS feed to Dolibarr pages
+Module330Name=Bookmarks & Shortcuts
+Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access
+Module400Name=Projects or Leads
+Module400Desc=Management of projects, leads/opportunities and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module410Name=Webcalendar
+Module410Desc=Webcalendar integration
+Module500Name=Taxes & Special Expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
+Module510Name=Salaries
+Module510Desc=Record and track employee payments
+Module520Name=Loans
+Module520Desc=Management of loans
+Module600Name=Notifications on business event
+Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
+Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
+Module610Name=Product Variants
+Module610Desc=Creation of product variants (color, size etc.)
+Module700Name=Donations
+Module700Desc=Donation management
+Module770Name=Expense Reports
+Module770Desc=Manage expense reports claims (transportation, meal, ...)
+Module1120Name=Vendor Commercial Proposals
+Module1120Desc=Request vendor commercial proposal and prices
+Module1200Name=Mantis
+Module1200Desc=Mantis integration
+Module1520Name=Document Generation
+Module1520Desc=Mass email document generation
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module2000Name=WYSIWYG editor
+Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
+Module2200Name=Dynamic Prices
+Module2200Desc=Use maths expressions for auto-generation of prices
+Module2300Name=Scheduled jobs
+Module2300Desc=Scheduled jobs management (alias cron or chrono table)
+Module2400Name=Events/Agenda
+Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
+Module2500Name=DMS / ECM
+Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
+Module2600Name=API/Web services (SOAP server)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API/Web services (REST server)
+Module2610Desc=Enable the Dolibarr REST server providing API services
+Module2660Name=Call WebServices (SOAP client)
+Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
+Module2700Name=Gravatar
+Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
+Module2800Desc=FTP Client
+Module2900Name=GeoIPMaxmind
+Module2900Desc=GeoIP Maxmind conversions capabilities
+Module3200Name=Unalterable Archives
+Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module4000Name=HRM
+Module4000Desc=Human resources management (management of department, employee contracts and feelings)
+Module5000Name=Multi-company
+Module5000Desc=Allows you to manage multiple companies
+Module6000Name=Workflow
+Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module10000Name=Websites
+Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
+Module20000Name=Leave Request Management
+Module20000Desc=Define and track employee leave requests
+Module39000Name=Product Lots
+Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
+Module40000Name=Multicurrency
+Module40000Desc=Use alternative currencies in prices and documents
+Module50000Name=PayBox
+Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50100Name=POS SimplePOS
+Module50100Desc=Point of Sale module SimplePOS (simple POS).
+Module50150Name=POS TakePOS
+Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50200Name=Paypal
+Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50300Name=Stripe
+Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50400Name=Accounting (double entry)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module54000Name=PrintIPP
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
+Module59000Name=Margins
+Module59000Desc=Module to manage margins
+Module60000Name=Commissions
+Module60000Desc=Module to manage commissions
+Module62000Name=Incoterms
+Module62000Desc=Add features to manage Incoterms
+Module63000Name=Resources
+Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
+Permission11=Read customer invoices
+Permission12=Create/modify customer invoices
+Permission13=Unvalidate customer invoices
+Permission14=Validate customer invoices
+Permission15=Send customer invoices by email
+Permission16=Create payments for customer invoices
+Permission19=Delete customer invoices
+Permission21=Read commercial proposals
+Permission22=Create/modify commercial proposals
+Permission24=Validate commercial proposals
+Permission25=Send commercial proposals
+Permission26=Close commercial proposals
+Permission27=Delete commercial proposals
+Permission28=Export commercial proposals
+Permission31=Read products
+Permission32=Create/modify products
+Permission34=Delete products
+Permission36=See/manage hidden products
+Permission38=Export products
+Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
+Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
+Permission44=Delete projects (shared project and projects I'm contact for)
+Permission45=Export projects
+Permission61=Read interventions
+Permission62=Create/modify interventions
+Permission64=Delete interventions
+Permission67=Export interventions
+Permission71=Read members
+Permission72=Create/modify members
+Permission74=Delete members
+Permission75=Setup types of membership
+Permission76=Export data
+Permission78=Read subscriptions
+Permission79=Create/modify subscriptions
+Permission81=Read customers orders
+Permission82=Create/modify customers orders
+Permission84=Validate customers orders
+Permission86=Send customers orders
+Permission87=Close customers orders
+Permission88=Cancel customers orders
+Permission89=Delete customers orders
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
+Permission95=Read reports
+Permission101=Read sendings
+Permission102=Create/modify sendings
+Permission104=Validate sendings
+Permission106=Export sendings
+Permission109=Delete sendings
+Permission111=Read financial accounts
+Permission112=Create/modify/delete and compare transactions
+Permission113=Setup financial accounts (create, manage categories)
+Permission114=Reconcile transactions
+Permission115=Export transactions and account statements
+Permission116=Transfers between accounts
+Permission117=Manage checks dispatching
+Permission121=Read third parties linked to user
+Permission122=Create/modify third parties linked to user
+Permission125=Delete third parties linked to user
+Permission126=Export third parties
+Permission141=Read all projects and tasks (also private projects for which I am not a contact)
+Permission142=Create/modify all projects and tasks (also private projects for which I am not a contact)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
+Permission146=Read providers
+Permission147=Read stats
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejections of direct debit payment orders
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
+Permission171=Read trips and expenses (yours and your subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
+Permission180=Read suppliers
+Permission181=Read purchase orders
+Permission182=Create/modify purchase orders
+Permission183=Validate purchase orders
+Permission184=Approve purchase orders
+Permission185=Order or cancel purchase orders
+Permission186=Receive purchase orders
+Permission187=Close purchase orders
+Permission188=Cancel purchase orders
+Permission192=Create lines
+Permission193=Cancel lines
+Permission194=Read the bandwidth lines
+Permission202=Create ADSL connections
+Permission203=Order connections orders
+Permission204=Order connections
+Permission205=Manage connections
+Permission206=Read connections
+Permission211=Read Telephony
+Permission212=Order lines
+Permission213=Activate line
+Permission214=Setup Telephony
+Permission215=Setup providers
+Permission221=Read emailings
+Permission222=Create/modify emailings (topic, recipients...)
+Permission223=Validate emailings (allows sending)
+Permission229=Delete emailings
+Permission237=View recipients and info
+Permission238=Manually send mailings
+Permission239=Delete mailings after validation or sent
+Permission241=Read categories
+Permission242=Create/modify categories
+Permission243=Delete categories
+Permission244=See the contents of the hidden categories
+Permission251=Read other users and groups
+PermissionAdvanced251=Read other users
+Permission252=Read permissions of other users
+Permission253=Create/modify other users, groups and permissions
+PermissionAdvanced253=Create/modify internal/external users and permissions
+Permission254=Create/modify external users only
+Permission255=Modify other users password
+Permission256=Delete or disable other users
+Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission271=Read CA
+Permission272=Read invoices
+Permission273=Issue invoices
+Permission281=Read contacts
+Permission282=Create/modify contacts
+Permission283=Delete contacts
+Permission286=Export contacts
+Permission291=Read tariffs
+Permission292=Set permissions on the tariffs
+Permission293=Modify customer's tariffs
+Permission300=Read barcodes
+Permission301=Create/modify barcodes
+Permission302=Delete barcodes
+Permission311=Read services
+Permission312=Assign service/subscription to contract
+Permission331=Read bookmarks
+Permission332=Create/modify bookmarks
+Permission333=Delete bookmarks
+Permission341=Read its own permissions
+Permission342=Create/modify his own user information
+Permission343=Modify his own password
+Permission344=Modify its own permissions
+Permission351=Read groups
+Permission352=Read groups permissions
+Permission353=Create/modify groups
+Permission354=Delete or disable groups
+Permission358=Export users
+Permission401=Read discounts
+Permission402=Create/modify discounts
+Permission403=Validate discounts
+Permission404=Delete discounts
+Permission430=Use Debug Bar
+Permission511=Read payments of salaries
+Permission512=Create/modify payments of salaries
+Permission514=Delete payments of salaries
+Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
+Permission531=Read services
+Permission532=Create/modify services
+Permission534=Delete services
+Permission536=See/manage hidden services
+Permission538=Export services
+Permission650=Read Bills of Materials
+Permission651=Create/Update Bills of Materials
+Permission652=Delete Bills of Materials
+Permission701=Read donations
+Permission702=Create/modify donations
+Permission703=Delete donations
+Permission771=Read expense reports (yours and your subordinates)
+Permission772=Create/modify expense reports
+Permission773=Delete expense reports
+Permission774=Read all expense reports (even for user not subordinates)
+Permission775=Approve expense reports
+Permission776=Pay expense reports
+Permission779=Export expense reports
+Permission1001=Read stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
+Permission1004=Read stock movements
+Permission1005=Create/modify stock movements
+Permission1101=Read delivery receipts
+Permission1102=Create/modify delivery receipts
+Permission1104=Validate delivery receipts
+Permission1109=Delete delivery receipts
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
+Permission1181=Read suppliers
+Permission1182=Read purchase orders
+Permission1183=Create/modify purchase orders
+Permission1184=Validate purchase orders
+Permission1185=Approve purchase orders
+Permission1186=Order purchase orders
+Permission1187=Acknowledge receipt of purchase orders
+Permission1188=Delete purchase orders
+Permission1190=Approve (second approval) purchase orders
+Permission1201=Get result of an export
+Permission1202=Create/Modify an export
+Permission1231=Read vendor invoices
+Permission1232=Create/modify vendor invoices
+Permission1233=Validate vendor invoices
+Permission1234=Delete vendor invoices
+Permission1235=Send vendor invoices by email
+Permission1236=Export vendor invoices, attributes and payments
+Permission1237=Export purchase orders and their details
+Permission1251=Run mass imports of external data into database (data load)
+Permission1321=Export customer invoices, attributes and payments
+Permission1322=Reopen a paid bill
+Permission1421=Export sales orders and attributes
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
+Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
+Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
+Permission2411=Read actions (events or tasks) of others
+Permission2412=Create/modify actions (events or tasks) of others
+Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
+Permission2501=Read/Download documents
+Permission2502=Download documents
+Permission2503=Submit or delete documents
+Permission2515=Setup documents directories
+Permission2801=Use FTP client in read mode (browse and download only)
+Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=Delete leave requests
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20006=Admin leave requests (setup and update balance)
+Permission20007=Approve leave requests
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
+Permission50101=Use Point of Sale
+Permission50201=Read transactions
+Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define fiscal periods. Validate transactions and close fiscal periods.
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
+Permission54001=Print
+Permission55001=Read polls
+Permission55002=Create/modify polls
+Permission59001=Read commercial margins
+Permission59002=Define commercial margins
+Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
+DictionaryCompanyType=Third-party types
+DictionaryCompanyJuridicalType=Third-party legal entities
+DictionaryProspectLevel=Prospect potential
+DictionaryCanton=States/Provinces
+DictionaryRegion=Regions
+DictionaryCountry=Countries
+DictionaryCurrency=Currencies
+DictionaryCivility=Honorific titles
+DictionaryActions=Types of agenda events
+DictionarySocialContributions=Types of social or fiscal taxes
+DictionaryVAT=VAT Rates or Sales Tax Rates
+DictionaryRevenueStamp=Amount of tax stamps
+DictionaryPaymentConditions=Payment Terms
+DictionaryPaymentModes=Payment Modes
+DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Website - Type of website pages/containers
+DictionaryEcotaxe=Ecotax (WEEE)
+DictionaryPaperFormat=Paper formats
+DictionaryFormatCards=Card formats
+DictionaryFees=Expense report - Types of expense report lines
+DictionarySendingMethods=Shipping methods
+DictionaryStaff=Number of Employees
+DictionaryAvailability=Delivery delay
+DictionaryOrderMethods=Ordering methods
+DictionarySource=Origin of proposals/orders
+DictionaryAccountancyCategory=Personalized groups for reports
+DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
+DictionaryEMailTemplates=Email Templates
+DictionaryUnits=Units
+DictionaryMeasuringUnits=Measuring Units
+DictionarySocialNetworks=Social Networks
+DictionaryProspectStatus=Prospect status
+DictionaryHolidayTypes=Types of leave
+DictionaryOpportunityStatus=Lead status for project/lead
+DictionaryExpenseTaxCat=Expense report - Transportation categories
+DictionaryExpenseTaxRange=Expense report - Range by transportation category
+SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
+BackToModuleList=Back to Module list
+BackToDictionaryList=Back to Dictionaries list
+TypeOfRevenueStamp=Type of tax stamp
+VATManagement=Sales Tax Management
+VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
+##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
+LTRate=Rate
+LocalTax1IsNotUsed=Do not use second tax
+LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
+LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax1Management=Second type of tax
+LocalTax1IsUsedExample=
+LocalTax1IsNotUsedExample=
+LocalTax2IsNotUsed=Do not use third tax
+LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
+LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax2Management=Third type of tax
+LocalTax2IsUsedExample=
+LocalTax2IsNotUsedExample=
+LocalTax1ManagementES=RE Management
+LocalTax1IsUsedDescES=The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
+LocalTax1IsNotUsedDescES=By default the proposed RE is 0. End of rule.
+LocalTax1IsUsedExampleES=In Spain they are professionals subject to some specific sections of the Spanish IAE.
+LocalTax1IsNotUsedExampleES=In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
+LocalTax2ManagementES=IRPF Management
+LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
+LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
+LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
+LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
+UseRevenueStamp=Use a tax stamp
+UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+CalcLocaltax=Reports on local taxes
+CalcLocaltax1=Sales - Purchases
+CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
+CalcLocaltax2=Purchases
+CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
+CalcLocaltax3=Sales
+CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+LabelUsedByDefault=Label used by default if no translation can be found for code
+LabelOnDocuments=Label on documents
+LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of a configuration constant
+NbOfDays=No. of days
+AtEndOfMonth=At end of month
+CurrentNext=Current/Next
+Offset=Offset
+AlwaysActive=Always active
+Upgrade=Upgrade
+MenuUpgrade=Upgrade / Extend
+AddExtensionThemeModuleOrOther=Deploy/install external app/module
+WebServer=Web server
+DocumentRootServer=Web server's root directory
+DataRootServer=Data files directory
+IP=IP
+Port=Port
+VirtualServerName=Virtual server name
+OS=OS
+PhpWebLink=Web-Php link
+Server=Server
+Database=Database
+DatabaseServer=Database host
+DatabaseName=Database name
+DatabasePort=Database port
+DatabaseUser=Database user
+DatabasePassword=Database password
+Tables=Tables
+TableName=Table name
+NbOfRecord=No. of records
+Host=Server
+DriverType=Driver type
+SummarySystem=System information summary
+SummaryConst=List of all Dolibarr setup parameters
+MenuCompanySetup=Company/Organization
+DefaultMenuManager= Standard menu manager
+DefaultMenuSmartphoneManager=Smartphone menu manager
+Skin=Skin theme
+DefaultSkin=Default skin theme
+MaxSizeList=Max length for list
+DefaultMaxSizeList=Default max length for lists
+DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
+MessageOfDay=Message of the day
+MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
+PermanentLeftSearchForm=Permanent search form on left menu
+DefaultLanguage=Default language
+EnableMultilangInterface=Enable multilanguage support
+EnableShowLogo=Show the company logo in the menu
+CompanyInfo=Company/Organization
+CompanyIds=Company/Organization identities
+CompanyName=Name
+CompanyAddress=Address
+CompanyZip=Zip
+CompanyTown=Town
+CompanyCountry=Country
+CompanyCurrency=Main currency
+CompanyObject=Object of the company
+IDCountry=ID country
+Logo=Logo
+LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
+LogoSquarred=Logo (squarred)
+LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
+DoNotSuggestPaymentMode=Do not suggest
+NoActiveBankAccountDefined=No active bank account defined
+OwnerOfBankAccount=Owner of bank account %s
+BankModuleNotActive=Bank accounts module not enabled
+ShowBugTrackLink=Show link "<strong>%s</strong>"
+Alerts=Alerts
+DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
+DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
+Delays_MAIN_DELAY_ACTIONS_TODO=Planned events (agenda events) not completed
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time
+Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Order not processed
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
+Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation
+Delays_MAIN_DELAY_MEMBERS=Delayed membership fee
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
+Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
+Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
+SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
+SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
+SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
+SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescription5=Other Setup menu entries manage optional parameters.
+LogEvents=Security audit events
+Audit=Audit
+InfoDolibarr=About Dolibarr
+InfoBrowser=About Browser
+InfoOS=About OS
+InfoWebServer=About Web Server
+InfoDatabase=About Database
+InfoPHP=About PHP
+InfoPerf=About Performances
+BrowserName=Browser name
+BrowserOS=Browser OS
+ListOfSecurityEvents=List of Dolibarr security events
+SecurityEventsPurged=Security events purged
+LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
+SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
+SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
+AccountantFileNumber=Accountant code
+DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
+AvailableModules=Available app/modules
+ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
+SessionTimeOut=Time out for session
+SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
+TriggersAvailable=Available triggers
+TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
+TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
+TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
+TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
+TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
+GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
+DictionaryDesc=Insert all reference data. You can add your values to the default.
+ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
+MiscellaneousDesc=All other security related parameters are defined here.
+LimitsSetup=Limits/Precision setup
+LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
+MAIN_MAX_DECIMALS_UNIT=Max. decimals for unit prices
+MAIN_MAX_DECIMALS_TOT=Max. decimals for total prices
+MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
+UnitPriceOfProduct=Net unit price of a product
+TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
+ParameterActiveForNextInputOnly=Parameter effective for next input only
+NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page.
+NoEventFoundWithCriteria=No security event has been found for this search criteria.
+SeeLocalSendMailSetup=See your local sendmail setup
+BackupDesc=A <b>complete</b> backup of a Dolibarr installation requires two steps.
+BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
+BackupDesc3=Backup the structure and contents of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
+BackupDescX=The archived directory should be stored in a secure place.
+BackupDescY=The generated dump file should be stored in a secure place.
+BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
+RestoreDesc=To restore a Dolibarr backup, two steps are required.
+RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
+RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
+RestoreMySQL=MySQL import
+ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+PreviousDumpFiles=Existing backup files
+PreviousArchiveFiles=Existing archive files
+WeekStartOnDay=First day of the week
+RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
+YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
+YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
+DownloadMoreSkins=More skins to download
+SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+ShowProfIdInAddress=Show professional id with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+TranslationUncomplete=Partial translation
+MAIN_DISABLE_METEO=Disable meteorological view
+MeteoStdMod=Standard mode
+MeteoStdModEnabled=Standard mode enabled
+MeteoPercentageMod=Percentage mode
+MeteoPercentageModEnabled=Percentage mode enabled
+MeteoUseMod=Click to use %s
+TestLoginToAPI=Test login to API
+ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
+ExternalAccess=External/Internet Access
+MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet)
+MAIN_PROXY_HOST=Proxy server: Name/Address
+MAIN_PROXY_PORT=Proxy server: Port
+MAIN_PROXY_USER=Proxy server: Login/User
+MAIN_PROXY_PASS=Proxy server: Password
+DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+ExtraFields=Complementary attributes
+ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsThirdParties=Complementary attributes (third party)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
+ExtraFieldsMember=Complementary attributes (member)
+ExtraFieldsMemberType=Complementary attributes (member type)
+ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
+ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
+ExtraFieldsSupplierOrders=Complementary attributes (orders)
+ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
+ExtraFieldsProject=Complementary attributes (projects)
+ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldHasWrongValue=Attribute %s has a wrong value.
+AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
+PathToDocuments=Path to documents
+PathDirectory=Directory
+SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+YouMustEnableOneModule=You must at least enable 1 module
+ClassNotFoundIntoPathWarning=Class %s not found in PHP path
+YesInSummer=Yes in summer
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
+SuhosinSessionEncrypt=Session storage encrypted by Suhosin
+ConditionIsCurrently=Condition is currently %s
+YouUseBestDriver=You use driver %s which is the best driver currently available.
+YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+SearchOptim=Search optimization
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
+BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
+AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
+AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
+FieldEdition=Edition of field %s
+FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
+GetBarCode=Get barcode
+NumberingModules=Numbering models
+##### Module password generation
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
+PasswordGenerationPerso=Return a password according to your personally defined configuration.
+SetupPerso=According to your configuration
+PasswordPatternDesc=Password pattern description
+##### Users setup #####
+RuleForGeneratedPasswords=Rules to generate and validate passwords
+DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
+UsersSetup=Users module setup
+UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
+##### HRM setup #####
+HRMSetup=HRM module setup
+##### Company setup #####
+CompanySetup=Companies module setup
+CompanyCodeChecker=Options for automatic generation of customer/vendor codes
+AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
+NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
+NotificationsDescUser=* per user, one user at a time.
+NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
+NotificationsDescGlobal=* or by setting global email addresses in this setup page.
+ModelModules=Document Templates
+DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
+WatermarkOnDraft=Watermark on draft document
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
+CompanyIdProfChecker=Rules for Professional IDs
+MustBeUnique=Must be unique?
+MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
+MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
+WebDavServer=Root URL of %s server: %s
+##### Webcal setup #####
+WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
+##### Invoices #####
+BillsSetup=Invoices module setup
+BillsNumberingModule=Invoices and credit notes numbering model
+BillsPDFModules=Invoice documents models
+BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
+PaymentsPDFModules=Payment documents models
+ForceInvoiceDate=Force invoice date to validation date
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
+SuggestPaymentByChequeToAddress=Suggest payment by check to
+FreeLegalTextOnInvoices=Free text on invoices
+WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
+PaymentsNumberingModule=Payments numbering model
+SuppliersPayment=Vendor payments
+SupplierPaymentSetup=Vendor payments setup
+##### Proposals #####
+PropalSetup=Commercial proposals module setup
+ProposalsNumberingModules=Commercial proposal numbering models
+ProposalsPDFModules=Commercial proposal documents models
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+FreeLegalTextOnProposal=Free text on commercial proposals
+WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
+##### Suppliers Orders #####
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
+##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+OrdersSetup=Sales Orders management setup
+OrdersNumberingModules=Orders numbering models
+OrdersModelModule=Order documents models
+FreeLegalTextOnOrders=Free text on orders
+WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+##### Interventions #####
+InterventionsSetup=Interventions module setup
+FreeLegalTextOnInterventions=Free text on intervention documents
+FicheinterNumberingModules=Intervention numbering models
+TemplatePDFInterventions=Intervention card documents models
+WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+##### Contracts #####
+ContractsSetup=Contracts/Subscriptions module setup
+ContractsNumberingModules=Contracts numbering modules
+TemplatePDFContracts=Contracts documents models
+FreeLegalTextOnContracts=Free text on contracts
+WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+##### Members #####
+MembersSetup=Members module setup
+MemberMainOptions=Main options
+AdherentLoginRequired= Manage a Login for each member
+AdherentMailRequired=Email required to create a new member
+MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
+MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+##### LDAP setup #####
+LDAPSetup=LDAP Setup
+LDAPGlobalParameters=Global parameters
+LDAPUsersSynchro=Users
+LDAPGroupsSynchro=Groups
+LDAPContactsSynchro=Contacts
+LDAPMembersSynchro=Members
+LDAPMembersTypesSynchro=Members types
+LDAPSynchronization=LDAP synchronisation
+LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
+LDAPToDolibarr=LDAP -> Dolibarr
+DolibarrToLDAP=Dolibarr -> LDAP
+LDAPNamingAttribute=Key in LDAP
+LDAPSynchronizeUsers=Organization of users in LDAP
+LDAPSynchronizeGroups=Organization of groups in LDAP
+LDAPSynchronizeContacts=Organization of contacts in LDAP
+LDAPSynchronizeMembers=Organization of foundation's members in LDAP
+LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
+LDAPPrimaryServer=Primary server
+LDAPSecondaryServer=Secondary server
+LDAPServerPort=Server port
+LDAPServerPortExample=Default port: 389
+LDAPServerProtocolVersion=Protocol version
+LDAPServerUseTLS=Use TLS
+LDAPServerUseTLSExample=Your LDAP server use TLS
+LDAPServerDn=Server DN
+LDAPAdminDn=Administrator DN
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
+LDAPPassword=Administrator password
+LDAPUserDn=Users' DN
+LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
+LDAPGroupDn=Groups' DN
+LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
+LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
+LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
+LDAPDnSynchroActive=Users and groups synchronization
+LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
+LDAPDnContactActive=Contacts' synchronization
+LDAPDnContactActiveExample=Activated/Unactivated synchronization
+LDAPDnMemberActive=Members' synchronization
+LDAPDnMemberActiveExample=Activated/Unactivated synchronization
+LDAPDnMemberTypeActive=Members types' synchronization
+LDAPDnMemberTypeActiveExample=Activated/Unactivated synchronization
+LDAPContactDn=Dolibarr contacts' DN
+LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
+LDAPMemberDn=Dolibarr members DN
+LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
+LDAPMemberObjectClassList=List of objectClass
+LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPMemberTypeDn=Dolibarr members types DN
+LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeObjectClassList=List of objectClass
+LDAPMemberTypeObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPUserObjectClassList=List of objectClass
+LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPGroupObjectClassList=List of objectClass
+LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPContactObjectClassList=List of objectClass
+LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPTestConnect=Test LDAP connection
+LDAPTestSynchroContact=Test contacts synchronization
+LDAPTestSynchroUser=Test user synchronization
+LDAPTestSynchroGroup=Test group synchronization
+LDAPTestSynchroMember=Test member synchronization
+LDAPTestSynchroMemberType=Test member type synchronization
+LDAPTestSearch= Test a LDAP search
+LDAPSynchroOK=Synchronization test successful
+LDAPSynchroKO=Failed synchronization test
+LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
+LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
+LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
+LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPSetupForVersion3=LDAP server configured for version 3
+LDAPSetupForVersion2=LDAP server configured for version 2
+LDAPDolibarrMapping=Dolibarr Mapping
+LDAPLdapMapping=LDAP Mapping
+LDAPFieldLoginUnix=Login (unix)
+LDAPFieldLoginExample=Example: uid
+LDAPFilterConnection=Search filter
+LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPFieldLoginSamba=Login (samba, activedirectory)
+LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldFullname=Full name
+LDAPFieldFullnameExample=Example: cn
+LDAPFieldPasswordNotCrypted=Password not encrypted
+LDAPFieldPasswordCrypted=Password encrypted
+LDAPFieldPasswordExample=Example: userPassword
+LDAPFieldCommonNameExample=Example: cn
+LDAPFieldName=Name
+LDAPFieldNameExample=Example: sn
+LDAPFieldFirstName=First name
+LDAPFieldFirstNameExample=Example: givenName
+LDAPFieldMail=Email address
+LDAPFieldMailExample=Example: mail
+LDAPFieldPhone=Professional phone number
+LDAPFieldPhoneExample=Example: telephonenumber
+LDAPFieldHomePhone=Personal phone number
+LDAPFieldHomePhoneExample=Example: homephone
+LDAPFieldMobile=Cellular phone
+LDAPFieldMobileExample=Example: mobile
+LDAPFieldFax=Fax number
+LDAPFieldFaxExample=Example: facsimiletelephonenumber
+LDAPFieldAddress=Street
+LDAPFieldAddressExample=Example: street
+LDAPFieldZip=Zip
+LDAPFieldZipExample=Example: postalcode
+LDAPFieldTown=Town
+LDAPFieldTownExample=Example: l
+LDAPFieldCountry=Country
+LDAPFieldDescription=Description
+LDAPFieldDescriptionExample=Example: description
+LDAPFieldNotePublic=Public Note
+LDAPFieldNotePublicExample=Example: publicnote
+LDAPFieldGroupMembers= Group members
+LDAPFieldGroupMembersExample= Example: uniqueMember
+LDAPFieldBirthdate=Birthdate
+LDAPFieldCompany=Company
+LDAPFieldCompanyExample=Example: o
+LDAPFieldSid=SID
+LDAPFieldSidExample=Example: objectsid
+LDAPFieldEndLastSubscription=Date of subscription end
+LDAPFieldTitle=Job position
+LDAPFieldTitleExample=Example: title
+LDAPFieldGroupid=Group id
+LDAPFieldGroupidExample=Exemple : gidnumber
+LDAPFieldUserid=User id
+LDAPFieldUseridExample=Exemple : uidnumber
+LDAPFieldHomedirectory=Home directory
+LDAPFieldHomedirectoryExample=Exemple : homedirectory
+LDAPFieldHomedirectoryprefix=Home directory prefix
+LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
+LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
+LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
+LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
+LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
+LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
+LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use thoose values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all thoose schemas loaded.
+ForANonAnonymousAccess=For an authenticated access (for a write access for example)
+PerfDolibarr=Performance setup/optimizing report
+YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
+NotInstalled=Not installed, so your server is not slowed down by this.
+ApplicativeCache=Applicative cache
+MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
+MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
+MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
+OPCodeCache=OPCode cache
+NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
+HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
+FilesOfTypeCached=Files of type %s are cached by HTTP server
+FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
+FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
+FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
+CacheByServer=Cache by server
+CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
+CacheByClient=Cache by browser
+CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
+DefaultCreateForm=Default values (to use on forms)
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
+DefaultMandatory=Mandatory form fields
+##### Products #####
+ProductSetup=Products module setup
+ServiceSetup=Services module setup
+ProductServiceSetup=Products and Services modules setup
+NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
+ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in the language of the third party
+UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
+SetDefaultBarcodeTypeProducts=Default barcode type to use for products
+SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
+ProductCodeChecker= Module for product code generation and checking (product or service)
+ProductOtherConf= Product / Service configuration
+IsNotADir=is not a directory!
+##### Syslog #####
+SyslogSetup=Logs module setup
+SyslogOutput=Logs outputs
+SyslogFacility=Facility
+SyslogLevel=Level
+SyslogFilename=File name and path
+YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
+ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
+OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+##### Donations #####
+DonationsSetup=Donation module setup
+DonationsReceiptModel=Template of donation receipt
+##### Barcode #####
+BarcodeSetup=Barcode setup
+PaperFormatModule=Print format module
+BarcodeEncodeModule=Barcode encoding type
+CodeBarGenerator=Barcode generator
+ChooseABarCode=No generator defined
+FormatNotSupportedByGenerator=Format not supported by this generator
+BarcodeDescEAN8=Barcode of type EAN8
+BarcodeDescEAN13=Barcode of type EAN13
+BarcodeDescUPC=Barcode of type UPC
+BarcodeDescISBN=Barcode of type ISBN
+BarcodeDescC39=Barcode of type C39
+BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
+GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
+BarcodeInternalEngine=Internal engine
+BarCodeNumberManager=Manager to auto define barcode numbers
+##### Prelevements #####
+WithdrawalsSetup=Setup of module Direct Debit payments
+##### ExternalRSS #####
+ExternalRSSSetup=External RSS imports setup
+NewRSS=New RSS Feed
+RSSUrl=RSS URL
+RSSUrlExample=An interesting RSS feed
+##### Mailing #####
+MailingSetup=EMailing module setup
+MailingEMailFrom=Sender email (From) for emails sent by emailing module
+MailingEMailError=Return Email (Errors-to) for emails with errors
+MailingDelay=Seconds to wait after sending next message
+##### Notification #####
+NotificationSetup=Email Notification module setup
+NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
+FixedEmailTarget=Recipient
+##### Sendings #####
+SendingsSetup=Shipping module setup
+SendingsReceiptModel=Sending receipt model
+SendingsNumberingModules=Sendings numbering modules
+SendingsAbility=Support shipping sheets for customer deliveries
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
+FreeLegalTextOnShippings=Free text on shipments
+##### Deliveries #####
+DeliveryOrderNumberingModules=Products deliveries receipt numbering module
+DeliveryOrderModel=Products deliveries receipt model
+DeliveriesOrderAbility=Support products deliveries receipts
+FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+##### FCKeditor #####
+AdvancedEditor=Advanced editor
+ActivateFCKeditor=Activate advanced editor for:
+FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
+FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
+FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
+FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
+FCKeditorForTicket=WYSIWIG creation/edition for tickets
+##### Stock #####
+StockSetup=Stock module setup
+IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+##### Menu #####
+MenuDeleted=Menu deleted
+Menus=Menus
+TreeMenuPersonalized=Personalized menus
+NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
+NewMenu=New menu
+Menu=Selection of menu
+MenuHandler=Menu handler
+MenuModule=Source module
+HideUnauthorizedMenu= Hide unauthorized menus (gray)
+DetailId=Id menu
+DetailMenuHandler=Menu handler where to show new menu
+DetailMenuModule=Module name if menu entry come from a module
+DetailType=Type of menu (top or left)
+DetailTitre=Menu label or label code for translation
+DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
+DetailEnabled=Condition to show or not entry
+DetailRight=Condition to display unauthorized grey menus
+DetailLangs=Lang file name for label code translation
+DetailUser=Intern / Extern / All
+Target=Target
+DetailTarget=Target for links (_blank top opens a new window)
+DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
+ModifMenu=Menu change
+DeleteMenu=Delete menu entry
+ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
+FailedToInitializeMenu=Failed to initialize menu
+##### Tax #####
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
+OptionVatMode=VAT due
+OptionVATDefault=Standard basis
+OptionVATDebitOption=Accrual basis
+OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
+OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
+SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option:
+OnDelivery=On delivery
+OnPayment=On payment
+OnInvoice=On invoice
+SupposedToBePaymentDate=Payment date used
+SupposedToBeInvoiceDate=Invoice date used
+Buy=Buy
+Sell=Sell
+InvoiceDateUsed=Invoice date used
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
+AccountancyCode=Accounting Code
+AccountancyCodeSell=Sale account. code
+AccountancyCodeBuy=Purchase account. code
+##### Agenda #####
+AgendaSetup=Events and agenda module setup
+PasswordTogetVCalExport=Key to authorize export link
+PastDelayVCalExport=Do not export event older than
+AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
+AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
+AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
+AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
+ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+##### Point Of Sale (CashDesk) #####
+CashDesk=Point of Sale
+CashDeskSetup=Point of Sales module setup
+CashDeskThirdPartyForSell=Default generic third party to use for sales
+CashDeskBankAccountForSell=Default account to use to receive cash payments
+CashDeskBankAccountForCheque=Default account to use to receive payments by check
+CashDeskBankAccountForCB=Default account to use to receive payments by credit cards
+CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with module Serial/Lot management (currently active) so stock decrease is disabled.
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
+CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
+CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
+CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+##### Bookmark #####
+BookmarkSetup=Bookmark module setup
+BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
+NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
+##### WebServices #####
+WebServicesSetup=Webservices module setup
+WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
+WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
+EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
+ApiExporerIs=You can explore and test the APIs at URL
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+##### Bank #####
+BankSetupModule=Bank module setup
+FreeLegalTextOnChequeReceipts=Free text on check receipts
+BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
+BankOrderGlobal=General
+BankOrderGlobalDesc=General display order
+BankOrderES=Spanish
+BankOrderESDesc=Spanish display order
+ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+##### Multicompany #####
+MultiCompanySetup=Multi-company module setup
+##### Suppliers #####
+SuppliersSetup=Vendor module setup
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
+SuppliersInvoiceModel=Complete template of Vendor Invoice
+SuppliersInvoiceNumberingModel=Vendor invoices numbering models
+IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
+##### GeoIPMaxmind #####
+GeoIPMaxmindSetup=GeoIP Maxmind module setup
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
+NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
+YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
+YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
+TestGeoIPResult=Test of a conversion IP -> country
+##### Projects #####
+ProjectsNumberingModules=Projects numbering module
+ProjectsSetup=Project module setup
+ProjectsModelModule=Project reports document model
+TasksNumberingModules=Tasks numbering module
+TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
+##### ECM (GED) #####
+##### Fiscal Year #####
+AccountingPeriods=Accounting periods
+AccountingPeriodCard=Accounting period
+NewFiscalYear=New accounting period
+OpenFiscalYear=Open accounting period
+CloseFiscalYear=Close accounting period
+DeleteFiscalYear=Delete accounting period
+ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
+ShowFiscalYear=Show accounting period
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
+Format=Format
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
+IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
+ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
+ExpenseReportNumberingModules=Expense reports numbering module
+NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerUser=List of automatic notifications per user*
+ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
+ListOfFixedNotifications=List of automatic fixed notifications
+GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+Threshold=Threshold
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
+SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
+SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
+HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+TextTitleColor=Text color of Page title
+LinkColor=Color of links
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
+MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
+NbAddedAutomatically=Number of days added to counters of users (automatically) each month
+EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+Enter0or1=Enter 0 or 1
+UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
+PositionIntoComboList=Position of line into combo lists
+SellTaxRate=Sale tax rate
+RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
+UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
+OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
+TemplateForElement=This template record is dedicated to which element
+TypeOfTemplate=Type of template
+TemplateIsVisibleByOwnerOnly=Template is visible to owner only
+VisibleEverywhere=Visible everywhere
+VisibleNowhere=Visible nowhere
+FixTZ=TimeZone fix
+FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
+ExpectedChecksum=Expected Checksum
+CurrentChecksum=Current Checksum
+ExpectedSize=Expected size
+CurrentSize=Current size
+ForcedConstants=Required constant values
+MailToSendProposal=Customer proposals
+MailToSendOrder=Sales orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Shipments
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracts
+MailToThirdparty=Third parties
+MailToMember=Members
+MailToUser=Users
+MailToProject=Projects page
+ByDefaultInList=Show by default on list view
+YouUseLastStableVersion=You use the latest stable version
+TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
+TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
+SeeChangeLog=See ChangeLog file (english only)
+AllPublishers=All publishers
+UnknownPublishers=Unknown publishers
+AddRemoveTabs=Add or remove tabs
+AddDataTables=Add object tables
+AddDictionaries=Add dictionaries tables
+AddData=Add objects or dictionaries data
+AddBoxes=Add widgets
+AddSheduledJobs=Add scheduled jobs
+AddHooks=Add hooks
+AddTriggers=Add triggers
+AddMenus=Add menus
+AddPermissions=Add permissions
+AddExportProfiles=Add export profiles
+AddImportProfiles=Add import profiles
+AddOtherPagesOrServices=Add other pages or services
+AddModels=Add document or numbering templates
+AddSubstitutions=Add keys substitutions
+DetectionNotPossible=Detection not possible
+UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
+ListOfAvailableAPIs=List of available APIs
+activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
+CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
+UserHasNoPermissions=This user has no permissions defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
+BaseCurrency=Reference currency of the company (go into setup of company to change this)
+WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
+WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
+MAIN_PDF_MARGIN_LEFT=Left margin on PDF
+MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
+MAIN_PDF_MARGIN_TOP=Top margin on PDF
+MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+NothingToSetup=There is no specific setup required for this module.
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+RemoveSpecialChars=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
+GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
+GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
+HelpOnTooltip=Help text to show on tooltip
+HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
+YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
+ChartLoaded=Chart of account loaded
+SocialNetworkSetup=Setup of module Social Networks
+EnableFeatureFor=Enable features for <strong>%s</strong>
+VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+EmailCollector=Email collector
+EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
+NewEmailCollector=New Email Collector
+EMailHost=Host of email IMAP server
+MailboxSourceDirectory=Mailbox source directory
+MailboxTargetDirectory=Mailbox target directory
+EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
+CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
+DateLastCollectResult=Date latest collect tried
+DateLastcollectResultOk=Date latest collect successfull
+LastResult=Latest result
+EmailCollectorConfirmCollectTitle=Email collect confirmation
+EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
+NoNewEmailToProcess=No new email (matching filters) to process
+NothingProcessed=Nothing done
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+RecordEvent=Record email event
+CreateLeadAndThirdParty=Create lead (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CodeLastResult=Latest result code
+NbOfEmailsInInbox=Number of emails in source directory
+LoadThirdPartyFromName=Load third party searching on %s (load only)
+LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+WithDolTrackingID=Dolibarr Reference found in Message ID
+WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+FormatZip=Zip
+MainMenuCode=Menu entry code (mainmenu)
+ECMAutoTree=Show automatic ECM tree
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OpeningHours=Opening hours
+OpeningHoursDesc=Enter here the regular opening hours of your company.
+ResourceSetup=Configuration of Resource module
+UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
+EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
+ConfirmUnactivation=Confirm module reset
+OnMobileOnly=On small screen (smartphone) only
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
+Protanopia=Protanopia
+Deuteranopes=Deuteranopes
+Tritanopes=Tritanopes
+ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
+DefaultCustomerType=Default thirdparty type for "New customer" creation form
+ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
+RootCategoryForProductsToSell=Root category of products to sell
+RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
+DebugBar=Debug Bar
+DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
+DebugBarSetup=DebugBar Setup
+GeneralOptions=General Options
+LogsLinesNumber=Number of lines to show on logs tab
+UseDebugBar=Use the debug bar
+DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
+WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
+ModuleActivated=Module %s is activated and slows the interface
+EXPORTS_SHARE_MODELS=Export models are share with everybody
+ExportSetup=Setup of module Export
+ImportSetup=Setup of module Import
+InstanceUniqueID=Unique ID of the instance
+SmallerThan=Smaller than
+LargerThan=Larger than
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
+EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
+RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
+AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+IPListExample=127.0.0.1 192.168.0.2 [::1]
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
+FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
+EmailTemplate=Template for email
+EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
+FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/az_AZ/agenda.lang b/htdocs/langs/az_AZ/agenda.lang
new file mode 100644
index 00000000000..2031241d2c9
--- /dev/null
+++ b/htdocs/langs/az_AZ/agenda.lang
@@ -0,0 +1,154 @@
+# Dolibarr language file - Source file is en_US - agenda
+IdAgenda=ID event
+Actions=Events
+Agenda=Agenda
+TMenuAgenda=Agenda
+Agendas=Agendas
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+ActionsOwnedByShort=Owner
+AffectedTo=Assigned to
+Event=Event
+Events=Events
+EventsNb=Number of events
+ListOfActions=List of events
+EventReports=Event reports
+Location=Location
+ToUserOfGroup=To any user in group
+EventOnFullDay=Event on all day(s)
+MenuToDoActions=All incomplete events
+MenuDoneActions=All terminated events
+MenuToDoMyActions=My incomplete events
+MenuDoneMyActions=My terminated events
+ListOfEvents=List of events (internal calendar)
+ActionsAskedBy=Events reported by
+ActionsToDoBy=Events assigned to
+ActionsDoneBy=Events done by
+ActionAssignedTo=Event assigned to
+ViewCal=Month view
+ViewDay=Day view
+ViewWeek=Week view
+ViewPerUser=Per user view
+ViewPerType=Per type view
+AutoActions= Automatic filling
+AgendaAutoActionDesc= Here you may define events which you want Dolibarr to create automatically  in Agenda. If nothing is checked, only manual actions will be included in logs and displayed in Agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
+AgendaSetupOtherDesc= This page provides options to allow the export of your Dolibarr events into an external calendar (Thunderbird, Google Calendar etc...)
+AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
+ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
+EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
+##### Agenda event labels #####
+NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
+ContractValidatedInDolibarr=Contract %s validated
+CONTRACT_DELETEInDolibarr=Contract %s deleted
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
+InvoiceDeleteDolibarr=Invoice %s deleted
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+MemberValidatedInDolibarr=Member %s validated
+MemberModifiedInDolibarr=Member %s modified
+MemberResiliatedInDolibarr=Member %s terminated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
+ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
+ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
+ShipmentDeletedInDolibarr=Shipment %s deleted
+OrderCreatedInDolibarr=Order %s created
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
+OrderApprovedInDolibarr=Order %s approved
+OrderRefusedInDolibarr=Order %s refused
+OrderBackToDraftInDolibarr=Order %s go back to draft status
+ProposalSentByEMail=Commercial proposal %s sent by email
+ContractSentByEMail=Contract %s sent by email
+OrderSentByEMail=Sales order %s sent by email
+InvoiceSentByEMail=Customer invoice %s sent by email
+SupplierOrderSentByEMail=Purchase order %s sent by email
+ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
+SupplierInvoiceSentByEMail=Vendor invoice %s sent by email
+ShippingSentByEMail=Shipment %s sent by email
+ShippingValidated= Shipment %s validated
+InterventionSentByEMail=Intervention %s sent by email
+ProposalDeleted=Proposal deleted
+OrderDeleted=Order deleted
+InvoiceDeleted=Invoice deleted
+DraftInvoiceDeleted=Draft invoice deleted
+PRODUCT_CREATEInDolibarr=Product %s created
+PRODUCT_MODIFYInDolibarr=Product %s modified
+PRODUCT_DELETEInDolibarr=Product %s deleted
+HOLIDAY_CREATEInDolibarr=Request for leave %s created
+HOLIDAY_MODIFYInDolibarr=Request for leave %s modified
+HOLIDAY_APPROVEInDolibarr=Request for leave %s approved
+HOLIDAY_VALIDATEInDolibarr=Request for leave %s validated
+HOLIDAY_DELETEInDolibarr=Request for leave %s deleted
+EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created
+EXPENSE_REPORT_VALIDATEInDolibarr=Expense report %s validated
+EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved
+EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted
+EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused
+PROJECT_CREATEInDolibarr=Project %s created
+PROJECT_MODIFYInDolibarr=Project %s modified
+PROJECT_DELETEInDolibarr=Project %s deleted
+TICKET_CREATEInDolibarr=Ticket %s created
+TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
+TICKET_CLOSEInDolibarr=Ticket %s closed
+TICKET_DELETEInDolibarr=Ticket %s deleted
+BOM_VALIDATEInDolibarr=BOM validated
+BOM_UNVALIDATEInDolibarr=BOM unvalidated
+BOM_CLOSEInDolibarr=BOM disabled
+BOM_REOPENInDolibarr=BOM reopen
+BOM_DELETEInDolibarr=BOM deleted
+MRP_MO_VALIDATEInDolibarr=MO validated
+MRP_MO_PRODUCEDInDolibarr=MO produced
+MRP_MO_DELETEInDolibarr=MO deleted
+##### End agenda events #####
+AgendaModelModule=Document templates for event
+DateActionStart=Start date
+DateActionEnd=End date
+AgendaUrlOptions1=You can also add following parameters to filter output:
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
+AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
+AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
+AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaHideBirthdayEvents=Hide birthdays of contacts
+Busy=Busy
+ExportDataset_event1=List of agenda events
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
+# External Sites ical
+ExportCal=Export calendar
+ExtSites=Import external calendars
+ExtSitesEnableThisTool=Show external calendars (defined in global setup) in Agenda. Does not affect external calendars defined by users.
+ExtSitesNbOfAgenda=Number of calendars
+AgendaExtNb=Calendar no. %s
+ExtSiteUrlAgenda=URL to access .ical file
+ExtSiteNoLabel=No Description
+VisibleTimeRange=Visible time range
+VisibleDaysRange=Visible days range
+AddEvent=Create event
+MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
+RepeatEvent=Repeat event
+EveryWeek=Every week
+EveryMonth=Every month
+DayOfMonth=Day of month
+DayOfWeek=Day of week
+DateStartPlusOne=Date start + 1 hour
diff --git a/htdocs/langs/az_AZ/assets.lang b/htdocs/langs/az_AZ/assets.lang
new file mode 100644
index 00000000000..ef04723c6c2
--- /dev/null
+++ b/htdocs/langs/az_AZ/assets.lang
@@ -0,0 +1,65 @@
+# Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+Assets = Assets
+NewAsset = New asset
+AccountancyCodeAsset = Accounting code (asset)
+AccountancyCodeDepreciationAsset = Accounting code (depreciation asset account)
+AccountancyCodeDepreciationExpense = Accounting code (depreciation expense account)
+NewAssetType=New asset type
+AssetsTypeSetup=Asset type setup
+AssetTypeModified=Asset type modified
+AssetType=Asset type
+AssetsLines=Assets
+DeleteType=Delete
+DeleteAnAssetType=Delete an asset type
+ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
+ShowTypeCard=Show type '%s'
+
+# Module label 'ModuleAssetsName'
+ModuleAssetsName = Assets
+# Module description 'ModuleAssetsDesc'
+ModuleAssetsDesc = Assets description
+
+#
+# Admin page
+#
+AssetsSetup = Assets setup
+Settings = Settings
+AssetsSetupPage = Assets setup page
+ExtraFieldsAssetsType = Complementary attributes (Asset type)
+AssetsType=Asset type
+AssetsTypeId=Asset type id
+AssetsTypeLabel=Asset type label
+AssetsTypes=Assets types
+
+#
+# Menu
+#
+MenuAssets = Assets
+MenuNewAsset = New asset
+MenuTypeAssets = Type assets
+MenuListAssets = List
+MenuNewTypeAssets = New
+MenuListTypeAssets = List
+
+#
+# Module
+#
+NewAssetType=New asset type
+NewAsset=New asset
diff --git a/htdocs/langs/az_AZ/banks.lang b/htdocs/langs/az_AZ/banks.lang
new file mode 100644
index 00000000000..e54239e9fb2
--- /dev/null
+++ b/htdocs/langs/az_AZ/banks.lang
@@ -0,0 +1,175 @@
+# Dolibarr language file - Source file is en_US - banks
+Bank=Bank
+MenuBankCash=Banks | Cash
+MenuVariousPayment=Miscellaneous payments
+MenuNewVariousPayment=New Miscellaneous payment
+BankName=Bank name
+FinancialAccount=Account
+BankAccount=Bank account
+BankAccounts=Bank accounts
+BankAccountsAndGateways=Bank accounts | Gateways
+ShowAccount=Show Account
+AccountRef=Financial account ref
+AccountLabel=Financial account label
+CashAccount=Cash account
+CashAccounts=Cash accounts
+CurrentAccounts=Current accounts
+SavingAccounts=Savings accounts
+ErrorBankLabelAlreadyExists=Financial account label already exists
+BankBalance=Balance
+BankBalanceBefore=Balance before
+BankBalanceAfter=Balance after
+BalanceMinimalAllowed=Minimum allowed balance
+BalanceMinimalDesired=Minimum desired balance
+InitialBankBalance=Initial balance
+EndBankBalance=End balance
+CurrentBalance=Current balance
+FutureBalance=Future balance
+ShowAllTimeBalance=Show balance from start
+AllTime=From start
+Reconciliation=Reconciliation
+RIB=Bank Account Number
+IBAN=IBAN number
+BIC=BIC/SWIFT code
+SwiftValid=BIC/SWIFT valid
+SwiftVNotalid=BIC/SWIFT not valid
+IbanValid=BAN valid
+IbanNotValid=BAN not valid
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
+AccountStatement=Account statement
+AccountStatementShort=Statement
+AccountStatements=Account statements
+LastAccountStatements=Last account statements
+IOMonthlyReporting=Monthly reporting
+BankAccountDomiciliation=Bank address
+BankAccountCountry=Account country
+BankAccountOwner=Account owner name
+BankAccountOwnerAddress=Account owner address
+RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
+CreateAccount=Create account
+NewBankAccount=New account
+NewFinancialAccount=New financial account
+MenuNewFinancialAccount=New financial account
+EditFinancialAccount=Edit account
+LabelBankCashAccount=Bank or cash label
+AccountType=Account type
+BankType0=Savings account
+BankType1=Current or credit card account
+BankType2=Cash account
+AccountsArea=Accounts area
+AccountCard=Account card
+DeleteAccount=Delete account
+ConfirmDeleteAccount=Are you sure you want to delete this account?
+Account=Account
+BankTransactionByCategories=Bank entries by categories
+BankTransactionForCategory=Bank entries for category <b>%s</b>
+RemoveFromRubrique=Remove link with category
+RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
+ListBankTransactions=List of bank entries
+IdTransaction=Transaction ID
+BankTransactions=Bank entries
+BankTransaction=Bank entry
+ListTransactions=List entries
+ListTransactionsByCategory=List entries/category
+TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
+Conciliable=Can be reconciled
+Conciliate=Reconcile
+Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
+ReconciliationLate=Reconciliation late
+IncludeClosedAccount=Include closed accounts
+OnlyOpenedAccount=Only open accounts
+AccountToCredit=Account to credit
+AccountToDebit=Account to debit
+DisableConciliation=Disable reconciliation feature for this account
+ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated entry
+StatusAccountOpened=Open
+StatusAccountClosed=Closed
+AccountIdShort=Number
+LineRecord=Transaction
+AddBankRecord=Add entry
+AddBankRecordLong=Add entry manually
+Conciliated=Reconciled
+ConciliatedBy=Reconciled by
+DateConciliating=Reconcile date
+BankLineConciliated=Entry reconciled with bank receipt
+Reconciled=Reconciled
+NotReconciled=Not reconciled
+CustomerInvoicePayment=Customer payment
+SupplierInvoicePayment=Vendor payment
+SubscriptionPayment=Subscription payment
+WithdrawalPayment=Debit payment order
+SocialContributionPayment=Social/fiscal tax payment
+BankTransfer=Bank transfer
+BankTransfers=Bank transfers
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferFrom=From
+TransferTo=To
+TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
+CheckTransmitter=Transmitter
+ValidateCheckReceipt=Validate this check receipt?
+ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done?
+DeleteCheckReceipt=Delete this check receipt?
+ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
+BankChecks=Bank checks
+BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
+ShowCheckReceipt=Show check deposit receipt
+NumberOfCheques=No. of check
+DeleteTransaction=Delete entry
+ConfirmDeleteTransaction=Are you sure you want to delete this entry?
+ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
+BankMovements=Movements
+PlannedTransactions=Planned entries
+Graph=Graphics
+ExportDataset_banque_1=Bank entries and account statement
+ExportDataset_banque_2=Deposit slip
+TransactionOnTheOtherAccount=Transaction on the other account
+PaymentNumberUpdateSucceeded=Payment number updated successfully
+PaymentNumberUpdateFailed=Payment number could not be updated
+PaymentDateUpdateSucceeded=Payment date updated successfully
+PaymentDateUpdateFailed=Payment date could not be updated
+Transactions=Transactions
+BankTransactionLine=Bank entry
+AllAccounts=All bank and cash accounts
+BackToAccount=Back to account
+ShowAllAccounts=Show for all accounts
+FutureTransaction=Future transaction. Unable to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+EventualyAddCategory=Eventually, specify a category in which to classify the records
+ToConciliate=To reconcile?
+ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
+DefaultRIB=Default BAN
+AllRIB=All BAN
+LabelRIB=BAN Label
+NoBANRecord=No BAN record
+DeleteARib=Delete BAN record
+ConfirmDeleteRib=Are you sure you want to delete this BAN record?
+RejectCheck=Check returned
+ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
+RejectCheckDate=Date the check was returned
+CheckRejected=Check returned
+CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
+VariousPayments=Miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
+SEPAMandate=SEPA mandate
+YourSEPAMandate=Your SEPA mandate
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
+BankColorizeMovement=Colorize movements
+BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
+BankColorizeMovementName1=Background color for debit movement
+BankColorizeMovementName2=Background color for credit movement
diff --git a/htdocs/langs/az_AZ/bills.lang b/htdocs/langs/az_AZ/bills.lang
new file mode 100644
index 00000000000..9f11d8ecf87
--- /dev/null
+++ b/htdocs/langs/az_AZ/bills.lang
@@ -0,0 +1,574 @@
+# Dolibarr language file - Source file is en_US - bills
+Bill=Invoice
+Bills=Invoices
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Vendor invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid vendor invoices
+BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsLate=Late payments
+BillsStatistics=Customers invoices statistics
+BillsStatisticsSuppliers=Vendors invoices statistics
+DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
+DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
+DisabledBecauseNotErasable=Disabled because cannot be erased
+InvoiceStandard=Standard invoice
+InvoiceStandardAsk=Standard invoice
+InvoiceStandardDesc=This kind of invoice is the common invoice.
+InvoiceDeposit=Down payment invoice
+InvoiceDepositAsk=Down payment invoice
+InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
+InvoiceProForma=Proforma invoice
+InvoiceProFormaAsk=Proforma invoice
+InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
+InvoiceReplacement=Replacement invoice
+InvoiceReplacementAsk=Replacement invoice for invoice
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceAvoir=Credit note
+InvoiceAvoirAsk=Credit note to correct invoice
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
+invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+ReplaceInvoice=Replace invoice %s
+ReplacementInvoice=Replacement invoice
+ReplacedByInvoice=Replaced by invoice %s
+ReplacementByInvoice=Replaced by invoice
+CorrectInvoice=Correct invoice %s
+CorrectionInvoice=Correction invoice
+UsedByInvoice=Used to pay invoice %s
+ConsumedBy=Consumed by
+NotConsumed=Not consumed
+NoReplacableInvoice=No replaceable invoices
+NoInvoiceToCorrect=No invoice to correct
+InvoiceHasAvoir=Was source of one or several credit notes
+CardBill=Invoice card
+PredefinedInvoices=Predefined Invoices
+Invoice=Invoice
+PdfInvoiceTitle=Invoice
+Invoices=Invoices
+InvoiceLine=Invoice line
+InvoiceCustomer=Customer invoice
+CustomerInvoice=Customer invoice
+CustomersInvoices=Customers invoices
+SupplierInvoice=Vendor invoice
+SuppliersInvoices=Vendors invoices
+SupplierBill=Vendor invoice
+SupplierBills=suppliers invoices
+Payment=Payment
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
+Payments=Payments
+PaymentsBack=Refunds
+paymentInInvoiceCurrency=in invoices currency
+PaidBack=Paid back
+DeletePayment=Delete payment
+ConfirmDeletePayment=Are you sure you want to delete this payment?
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+SupplierPayments=Vendor payments
+ReceivedPayments=Received payments
+ReceivedCustomersPayments=Payments received from customers
+PayedSuppliersPayments=Payments paid to vendors
+ReceivedCustomersPaymentsToValid=Received customers payments to validate
+PaymentsReportsForYear=Payments reports for %s
+PaymentsReports=Payments reports
+PaymentsAlreadyDone=Payments already done
+PaymentsBackAlreadyDone=Refunds already done
+PaymentRule=Payment rule
+PaymentMode=Payment Type
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
+IdPaymentMode=Payment Type (id)
+CodePaymentMode=Payment Type (code)
+LabelPaymentMode=Payment Type (label)
+PaymentModeShort=Payment Type
+PaymentTerm=Payment Term
+PaymentConditions=Payment Terms
+PaymentConditionsShort=Payment Terms
+PaymentAmount=Payment amount
+PaymentHigherThanReminderToPay=Payment higher than reminder to pay
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
+ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
+ClassifyPaidPartially=Classify 'Paid partially'
+ClassifyCanceled=Classify 'Abandoned'
+ClassifyClosed=Classify 'Closed'
+ClassifyUnBilled=Classify 'Unbilled'
+CreateBill=Create Invoice
+CreateCreditNote=Create credit note
+AddBill=Create invoice or credit note
+AddToDraftInvoices=Add to draft invoice
+DeleteBill=Delete invoice
+SearchACustomerInvoice=Search for a customer invoice
+SearchASupplierInvoice=Search for a vendor invoice
+CancelBill=Cancel an invoice
+SendRemindByMail=Send reminder by email
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
+ConvertToReduc=Mark as credit available
+ConvertExcessReceivedToReduc=Convert excess received into available credit
+ConvertExcessPaidToReduc=Convert excess paid into available discount
+EnterPaymentReceivedFromCustomer=Enter payment received from customer
+EnterPaymentDueToCustomer=Make payment due to customer
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+PriceBase=Price base
+BillStatus=Invoice status
+StatusOfGeneratedInvoices=Status of generated invoices
+BillStatusDraft=Draft (needs to be validated)
+BillStatusPaid=Paid
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
+BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusCanceled=Abandoned
+BillStatusValidated=Validated (needs to be paid)
+BillStatusStarted=Started
+BillStatusNotPaid=Not paid
+BillStatusNotRefunded=Not refunded
+BillStatusClosedUnpaid=Closed (unpaid)
+BillStatusClosedPaidPartially=Paid (partially)
+BillShortStatusDraft=Draft
+BillShortStatusPaid=Paid
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
+BillShortStatusConverted=Paid
+BillShortStatusCanceled=Abandoned
+BillShortStatusValidated=Validated
+BillShortStatusStarted=Started
+BillShortStatusNotPaid=Not paid
+BillShortStatusNotRefunded=Not refunded
+BillShortStatusClosedUnpaid=Closed
+BillShortStatusClosedPaidPartially=Paid (partially)
+PaymentStatusToValidShort=To validate
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
+ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
+ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
+ErrorBillNotFound=Invoice %s does not exist
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorDiscountAlreadyUsed=Error, discount already used
+ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
+ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
+ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
+BillFrom=From
+BillTo=To
+ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=Template / Recurring invoice
+NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
+FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
+NotARecurringInvoiceTemplate=Not a recurring template invoice
+NewBill=New invoice
+LastBills=Latest %s invoices
+LatestTemplateInvoices=Latest %s template invoices
+LatestCustomerTemplateInvoices=Latest %s customer template invoices
+LatestSupplierTemplateInvoices=Latest %s vendor template invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s vendor invoices
+AllBills=All invoices
+AllCustomerTemplateInvoices=All template invoices
+OtherBills=Other invoices
+DraftBills=Draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Vendor draft invoices
+Unpaid=Unpaid
+ErrorNoPaymentDefined=Error No payment defined
+ConfirmDeleteBill=Are you sure you want to delete this invoice?
+ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
+ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
+ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
+ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
+ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
+ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
+ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
+ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyAbandonReasonOther=Other
+ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
+ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
+ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
+ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
+ValidateBill=Validate invoice
+UnvalidateBill=Unvalidate invoice
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
+AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
+AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
+UseSituationInvoices=Allow situation invoice
+UseSituationInvoicesCreditNote=Allow situation invoice credit note
+Retainedwarranty=Retained warranty
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
+RetainedwarrantyDefaultPercent=Retained warranty default percent
+RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
+RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
+ToPayOn=To pay on %s
+toPayOn=to pay on %s
+RetainedWarranty=Retained Warranty
+PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
+DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
+setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
+setretainedwarranty=Set retained warranty
+setretainedwarrantyDateLimit=Set retained warranty date limit
+RetainedWarrantyDateLimit=Retained warranty date limit
+RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
+AlreadyPaid=Already paid
+AlreadyPaidBack=Already paid back
+AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
+Abandoned=Abandoned
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to refund
+Rest=Pending
+AmountExpected=Amount claimed
+ExcessReceived=Excess received
+ExcessPaid=Excess paid
+EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
+NoDraftBills=No draft invoices
+NoOtherDraftBills=No other draft invoices
+NoDraftInvoices=No draft invoices
+RefBill=Invoice ref
+ToBill=To bill
+RemainderToBill=Remainder to bill
+SendBillByMail=Send invoice by email
+SendReminderBillByMail=Send reminder by email
+RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
+MenuToValid=To valid
+DateMaxPayment=Payment due on
+DateInvoice=Invoice date
+DatePointOfTax=Point of tax
+NoInvoice=No invoice
+ClassifyBill=Classify invoice
+SupplierBillsToPay=Unpaid vendor invoices
+CustomerBillsUnpaid=Unpaid customer invoices
+NonPercuRecuperable=Non-recoverable
+SetConditions=Set Payment Terms
+SetMode=Set Payment Type
+SetRevenuStamp=Set revenue stamp
+Billed=Billed
+RecurringInvoices=Recurring invoices
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
+CustomersInvoicesAndPayments=Customer invoices and payments
+ExportDataset_invoice_1=Customer invoices and invoice details
+ExportDataset_invoice_2=Customer invoices and payments
+ProformaBill=Proforma Bill:
+Reduction=Reduction
+ReductionShort=Disc.
+Reductions=Reductions
+ReductionsShort=Disc.
+Discounts=Discounts
+AddDiscount=Create discount
+AddRelativeDiscount=Create relative discount
+EditRelativeDiscount=Edit relative discount
+AddGlobalDiscount=Create absolute discount
+EditGlobalDiscounts=Edit absolute discounts
+AddCreditNote=Create credit note
+ShowDiscount=Show discount
+ShowReduc=Show the discount
+ShowSourceInvoice=Show the source invoice
+RelativeDiscount=Relative discount
+GlobalDiscount=Global discount
+CreditNote=Credit note
+CreditNotes=Credit notes
+CreditNotesOrExcessReceived=Credit notes or excess received
+Deposit=Down payment
+Deposits=Down payments
+DiscountFromCreditNote=Discount from credit note %s
+DiscountFromDeposit=Down payments from invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
+AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
+CreditNoteDepositUse=Invoice must be validated to use this kind of credits
+NewGlobalDiscount=New absolute discount
+NewRelativeDiscount=New relative discount
+DiscountType=Discount type
+NoteReason=Note/Reason
+ReasonDiscount=Reason
+DiscountOfferedBy=Granted by
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Vendors discounts
+BillAddress=Bill address
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
+IdSocialContribution=Social/fiscal tax payment id
+PaymentId=Payment id
+PaymentRef=Payment ref.
+InvoiceId=Invoice id
+InvoiceRef=Invoice ref.
+InvoiceDateCreation=Invoice creation date
+InvoiceStatus=Invoice status
+InvoiceNote=Invoice note
+InvoicePaid=Invoice paid
+InvoicePaidCompletely=Paid completely
+InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
+OrderBilled=Order billed
+DonationPaid=Donation paid
+PaymentNumber=Payment number
+RemoveDiscount=Remove discount
+WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty)
+InvoiceNotChecked=No invoice selected
+ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
+DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
+NbOfPayments=No. of payments
+SplitDiscount=Split discount in two
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
+ConfirmRemoveDiscount=Are you sure you want to remove this discount?
+RelatedBill=Related invoice
+RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related vendor invoices
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoices already exist
+MergingPDFTool=Merging PDF tool
+AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
+PaymentNote=Payment note
+ListOfPreviousSituationInvoices=List of previous situation invoices
+ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+FrequencyUnit=Frequency unit
+toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
+NextDateToExecution=Date for next invoice generation
+NextDateToExecutionShort=Date next gen.
+DateLastGeneration=Date of latest generation
+DateLastGenerationShort=Date latest gen.
+MaxPeriodNumber=Max. number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
+InvoiceAutoValidate=Validate invoices automatically
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not reached yet
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
+WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
+WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
+ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
+# PaymentConditions
+Statut=Status
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShort30D=30 days
+PaymentCondition30D=30 days
+PaymentConditionShort30DENDMONTH=30 days of month-end
+PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort60D=60 days
+PaymentCondition60D=60 days
+PaymentConditionShort60DENDMONTH=60 days of month-end
+PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShortPT_DELIVERY=Delivery
+PaymentConditionPT_DELIVERY=On delivery
+PaymentConditionShortPT_ORDER=Order
+PaymentConditionPT_ORDER=On order
+PaymentConditionShortPT_5050=50-50
+PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+PaymentConditionShort10D=10 days
+PaymentCondition10D=10 days
+PaymentConditionShort10DENDMONTH=10 days of month-end
+PaymentCondition10DENDMONTH=Within 10 days following the end of the month
+PaymentConditionShort14D=14 days
+PaymentCondition14D=14 days
+PaymentConditionShort14DENDMONTH=14 days of month-end
+PaymentCondition14DENDMONTH=Within 14 days following the end of the month
+FixAmount=Fixed amount - 1 line with label '%s'
+VarAmount=Variable amount (%% tot.)
+VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
+VarAmountAllLines=Variable amount (%% tot.) - all same lines
+# PaymentType
+PaymentTypeVIR=Bank transfer
+PaymentTypeShortVIR=Bank transfer
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
+PaymentTypeLIQ=Cash
+PaymentTypeShortLIQ=Cash
+PaymentTypeCB=Credit card
+PaymentTypeShortCB=Credit card
+PaymentTypeCHQ=Check
+PaymentTypeShortCHQ=Check
+PaymentTypeTIP=TIP (Documents against Payment)
+PaymentTypeShortTIP=TIP Payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
+PaymentTypeTRA=Bank draft
+PaymentTypeShortTRA=Draft
+PaymentTypeFAC=Factor
+PaymentTypeShortFAC=Factor
+BankDetails=Bank details
+BankCode=Bank code
+DeskCode=Branch code
+BankAccountNumber=Account number
+BankAccountNumberKey=Checksum
+Residence=Address
+IBANNumber=IBAN account number
+IBAN=IBAN
+BIC=BIC/SWIFT
+BICNumber=BIC/SWIFT code
+ExtraInfos=Extra infos
+RegulatedOn=Regulated on
+ChequeNumber=Check N°
+ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
+ChequeMaker=Check/Transfer transmitter
+ChequeBank=Bank of Check
+CheckBank=Check
+NetToBePaid=Net to be paid
+PhoneNumber=Tel
+FullPhoneNumber=Telephone
+TeleFax=Fax
+PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration.
+IntracommunityVATNumber=Intra-Community VAT ID
+PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
+PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
+SendTo=sent to
+PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
+VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
+LawApplicationPart1=By application of the law 80.335 of 12/05/80
+LawApplicationPart2=the goods remain the property of
+LawApplicationPart3=the seller until full payment of
+LawApplicationPart4=their price.
+LimitedLiabilityCompanyCapital=SARL with Capital of
+UseLine=Apply
+UseDiscount=Use discount
+UseCredit=Use credit
+UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit
+MenuChequeDeposits=Check Deposits
+MenuCheques=Checks
+MenuChequesReceipts=Check receipts
+NewChequeDeposit=New deposit
+ChequesReceipts=Check receipts
+ChequesArea=Check deposits area
+ChequeDeposits=Check deposits
+Cheques=Checks
+DepositId=Id deposit
+NbCheque=Number of checks
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices
+ShowUnpaidAll=Show all unpaid invoices
+ShowUnpaidLateOnly=Show late unpaid invoices only
+PaymentInvoiceRef=Payment invoice %s
+ValidateInvoice=Validate invoice
+ValidateInvoices=Validate invoices
+Cash=Cash
+Reported=Delayed
+DisabledBecausePayments=Not possible since there are some payments
+CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+ExpectedToPay=Expected payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
+PayedByThisPayment=Paid by this payment
+ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
+ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
+ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
+ToMakePayment=Pay
+ToMakePaymentBack=Pay back
+ListOfYourUnpaidInvoices=List of unpaid invoices
+NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
+RevenueStamp=Tax stamp
+YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
+YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
+PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
+TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+EarlyClosingReason=Early closing reason
+EarlyClosingComment=Early closing note
+##### Types de contacts #####
+TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
+TypeContact_facture_external_BILLING=Customer invoice contact
+TypeContact_facture_external_SHIPPING=Customer shipping contact
+TypeContact_facture_external_SERVICE=Customer service contact
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
+TypeContact_invoice_supplier_external_BILLING=Vendor invoice contact
+TypeContact_invoice_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+# Situation invoices
+InvoiceFirstSituationAsk=First situation invoice
+InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
+InvoiceSituation=Situation invoice
+InvoiceSituationAsk=Invoice following the situation
+InvoiceSituationDesc=Create a new situation following an already existing one
+SituationAmount=Situation invoice amount(net)
+SituationDeduction=Situation subtraction
+ModifyAllLines=Modify all lines
+CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
+NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
+DisabledBecauseNotLastInCycle=The next situation already exists.
+DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
+CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
+NoSituations=No open situations
+InvoiceSituationLast=Final and general invoice
+PDFCrevetteSituationNumber=Situation N°%s
+PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
+PDFCrevetteSituationInvoiceTitle=Situation invoice
+PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
+TotalSituationInvoice=Total situation
+invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
+updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
+CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
+BillCreated=%s bill(s) created
+StatusOfGeneratedDocuments=Status of document generation
+DoNotGenerateDoc=Do not generate document file
+AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/az_AZ/blockedlog.lang b/htdocs/langs/az_AZ/blockedlog.lang
new file mode 100644
index 00000000000..5afae6e9e53
--- /dev/null
+++ b/htdocs/langs/az_AZ/blockedlog.lang
@@ -0,0 +1,54 @@
+BlockedLog=Unalterable Logs
+Field=Field
+BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525).
+Fingerprints=Archived events and fingerprints
+FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed).
+CompanyInitialKey=Company initial key (hash of genesis block)
+BrowseBlockedLog=Unalterable logs
+ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
+ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
+DownloadBlockChain=Download fingerprints
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
+OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
+AddedByAuthority=Stored into remote authority
+NotAddedByAuthorityYet=Not yet stored into remote authority
+ShowDetails=Show stored details
+logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
+logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
+logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
+logPAYMENT_ADD_TO_BANK=Payment added to bank
+logPAYMENT_CUSTOMER_CREATE=Customer payment created
+logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
+logDONATION_PAYMENT_CREATE=Donation payment created
+logDONATION_PAYMENT_DELETE=Donation payment logical deletion
+logBILL_PAYED=Customer invoice paid
+logBILL_UNPAYED=Customer invoice set unpaid
+logBILL_VALIDATE=Customer invoice validated
+logBILL_SENTBYMAIL=Customer invoice send by mail
+logBILL_DELETE=Customer invoice logically deleted
+logMODULE_RESET=Module BlockedLog was disabled
+logMODULE_SET=Module BlockedLog was enabled
+logDON_VALIDATE=Donation validated
+logDON_MODIFY=Donation modified
+logDON_DELETE=Donation logical deletion
+logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
+logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
+logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
+logCASHCONTROL_VALIDATE=Cash fence recording
+BlockedLogBillDownload=Customer invoice download
+BlockedLogBillPreview=Customer invoice preview
+BlockedlogInfoDialog=Log Details
+ListOfTrackedEvents=List of tracked events
+Fingerprint=Fingerprint
+DownloadLogCSV=Export archived logs (CSV)
+logDOC_PREVIEW=Preview of a validated document in order to print or download
+logDOC_DOWNLOAD=Download of a validated document in order to print or send
+DataOfArchivedEvent=Full datas of archived event
+ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
+BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
+BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
+OnlyNonValid=Non-valid
+TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
+RestrictYearToExport=Restrict month / year to export
diff --git a/htdocs/langs/az_AZ/bookmarks.lang b/htdocs/langs/az_AZ/bookmarks.lang
new file mode 100644
index 00000000000..87466cadcfa
--- /dev/null
+++ b/htdocs/langs/az_AZ/bookmarks.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - marque pages
+AddThisPageToBookmarks=Add current page to bookmarks
+Bookmark=Bookmark
+Bookmarks=Bookmarks
+ListOfBookmarks=List of bookmarks
+EditBookmarks=List/edit bookmarks
+NewBookmark=New bookmark
+ShowBookmark=Show bookmark
+OpenANewWindow=Open a new tab
+ReplaceWindow=Replace current tab
+BookmarkTargetNewWindowShort=New tab
+BookmarkTargetReplaceWindowShort=Current tab
+BookmarkTitle=Bookmark name
+UrlOrLink=URL
+BehaviourOnClick=Behaviour when a bookmark URL is selected
+CreateBookmark=Create bookmark
+SetHereATitleForLink=Set a name for the bookmark
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if the linked page should open in the current tab or a new tab
+BookmarksManagement=Bookmarks management
+BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/az_AZ/boxes.lang b/htdocs/langs/az_AZ/boxes.lang
new file mode 100644
index 00000000000..bd62684421a
--- /dev/null
+++ b/htdocs/langs/az_AZ/boxes.lang
@@ -0,0 +1,102 @@
+# Dolibarr language file - Source file is en_US - boxes
+BoxLoginInformation=Login Information
+BoxLastRssInfos=RSS Information
+BoxLastProducts=Latest %s Products/Services
+BoxProductsAlertStock=Stock alerts for products
+BoxLastProductsInContract=Latest %s contracted products/services
+BoxLastSupplierBills=Latest Vendor invoices
+BoxLastCustomerBills=Latest Customer invoices
+BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
+BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
+BoxLastProposals=Latest commercial proposals
+BoxLastProspects=Latest modified prospects
+BoxLastCustomers=Latest modified customers
+BoxLastSuppliers=Latest modified suppliers
+BoxLastCustomerOrders=Latest sales orders
+BoxLastActions=Latest actions
+BoxLastContracts=Latest contracts
+BoxLastContacts=Latest contacts/addresses
+BoxLastMembers=Latest members
+BoxFicheInter=Latest interventions
+BoxCurrentAccounts=Open accounts balance
+BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleLastRssInfos=Latest %s news from %s
+BoxTitleLastProducts=Products/Services: last %s modified
+BoxTitleProductsAlertStock=Products: stock alert
+BoxTitleLastSuppliers=Latest %s recorded suppliers
+BoxTitleLastModifiedSuppliers=Vendors: last %s modified
+BoxTitleLastModifiedCustomers=Customers: last %s modified
+BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
+BoxTitleLastModifiedProspects=Prospects: last %s modified
+BoxTitleLastModifiedMembers=Latest %s members
+BoxTitleLastFicheInter=Latest %s modified interventions
+BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
+BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
+BoxTitleCurrentAccounts=Open Accounts: balances
+BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
+BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
+BoxMyLastBookmarks=Bookmarks: latest %s
+BoxOldestExpiredServices=Oldest active expired services
+BoxLastExpiredServices=Latest %s oldest contacts with active expired services
+BoxTitleLastActionsToDo=Latest %s actions to do
+BoxTitleLastContracts=Latest %s modified contracts
+BoxTitleLastModifiedDonations=Latest %s modified donations
+BoxTitleLastModifiedExpenses=Latest %s modified expense reports
+BoxTitleLatestModifiedBoms=Latest %s modified BOMs
+BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
+FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
+LastRefreshDate=Latest refresh date
+NoRecordedBookmarks=No bookmarks defined.
+ClickToAdd=Click here to add.
+NoRecordedCustomers=No recorded customers
+NoRecordedContacts=No recorded contacts
+NoActionsToDo=No actions to do
+NoRecordedOrders=No recorded sales orders
+NoRecordedProposals=No recorded proposals
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid vendor invoices
+NoModifiedSupplierBills=No recorded vendor invoices
+NoRecordedProducts=No recorded products/services
+NoRecordedProspects=No recorded prospects
+NoContractedProducts=No products/services contracted
+NoRecordedContracts=No recorded contracts
+NoRecordedInterventions=No recorded interventions
+BoxLatestSupplierOrders=Latest purchase orders
+BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
+NoSupplierOrder=No recorded purchase order
+BoxCustomersInvoicesPerMonth=Customer Invoices per month
+BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
+BoxCustomersOrdersPerMonth=Sales Orders per month
+BoxSuppliersOrdersPerMonth=Vendor Orders per month
+BoxProposalsPerMonth=Proposals per month
+NoTooLowStockProducts=No products are under the low stock limit
+BoxProductDistribution=Products/Services Distribution
+ForObject=On %s
+BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
+BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
+BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
+BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
+BoxTitleLastModifiedPropals=Latest %s modified proposals
+ForCustomersInvoices=Customers invoices
+ForCustomersOrders=Customers orders
+ForProposals=Proposals
+LastXMonthRolling=The latest %s month rolling
+ChooseBoxToAdd=Add widget to your dashboard
+BoxAdded=Widget was added in your dashboard
+BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
+BoxLastManualEntries=Last manual entries in accountancy
+BoxTitleLastManualEntries=%s latest manual entries
+NoRecordedManualEntries=No manual entries record in accountancy
+BoxSuspenseAccount=Count accountancy operation with suspense account
+BoxTitleSuspenseAccount=Number of unallocated lines
+NumberOfLinesInSuspenseAccount=Number of line in suspense account
+SuspenseAccountNotDefined=Suspense account isn't defined
+BoxLastCustomerShipments=Last customer shipments
+BoxTitleLastCustomerShipments=Latest %s customer shipments
+NoRecordedShipments=No recorded customer shipment
diff --git a/htdocs/langs/az_AZ/cashdesk.lang b/htdocs/langs/az_AZ/cashdesk.lang
new file mode 100644
index 00000000000..0903a3d10bc
--- /dev/null
+++ b/htdocs/langs/az_AZ/cashdesk.lang
@@ -0,0 +1,110 @@
+# Language file - Source file is en_US - cashdesk
+CashDeskMenu=Point of sale
+CashDesk=Point of sale
+CashDeskBankCash=Bank account (cash)
+CashDeskBankCB=Bank account (card)
+CashDeskBankCheque=Bank account (cheque)
+CashDeskWarehouse=Warehouse
+CashdeskShowServices=Selling services
+CashDeskProducts=Products
+CashDeskStock=Stock
+CashDeskOn=on
+CashDeskThirdParty=Third party
+ShoppingCart=Shopping cart
+NewSell=New sell
+AddThisArticle=Add this article
+RestartSelling=Go back on sell
+SellFinished=Sale complete
+PrintTicket=Print ticket
+SendTicket=Send ticket
+NoProductFound=No article found
+ProductFound=product found
+NoArticle=No article
+Identification=Identification
+Article=Article
+Difference=Difference
+TotalTicket=Total ticket
+NoVAT=No VAT for this sale
+Change=Excess received
+BankToPay=Account for payment
+ShowCompany=Show company
+ShowStock=Show warehouse
+DeleteArticle=Click to remove this article
+FilterRefOrLabelOrBC=Search (Ref/Label)
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
+DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of Sale
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
+Receipt=Receipt
+Header=Header
+Footer=Footer
+AmountAtEndOfPeriod=Amount at end of period (day, month or year)
+TheoricalAmount=Theorical amount
+RealAmount=Real amount
+CashFence=Cash fence
+CashFenceDone=Cash fence done for the period
+NbOfInvoices=Nb of invoices
+Paymentnumpad=Type of Pad to enter payment
+Numberspad=Numbers Pad
+BillsCoinsPad=Coins and banknotes Pad
+DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
+TakeposNeedsCategories=TakePOS needs product categories to work
+OrderNotes=Order Notes
+CashDeskBankAccountFor=Default account to use for payments in
+NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
+PrintCustomerOnReceipts=Print customer on tickets|receipts
+EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
+ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
+POSTerminal=POS Terminal
+POSModule=POS Module
+BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
+CustomReceipt=Custom Receipt
+ReceiptName=Receipt Name
+ProductSupplements=Product Supplements
+SupplementCategory=Supplement category
+ColorTheme=Color theme
+Colorful=Colorful
+HeadBar=Head Bar
+SortProductField=Field for sorting products
+Browser=Browser
+BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
+TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
+PrintMethod=Print method
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ByTerminal=By terminal
+TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for POS sales
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
+BarRestaurant=Bar Restaurant
+AutoOrder=Customer auto order
diff --git a/htdocs/langs/az_AZ/categories.lang b/htdocs/langs/az_AZ/categories.lang
new file mode 100644
index 00000000000..30bace0574c
--- /dev/null
+++ b/htdocs/langs/az_AZ/categories.lang
@@ -0,0 +1,89 @@
+# Dolibarr language file - Source file is en_US - categories
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+RubriquesTransactions=Tags/Categories of transactions
+categories=tags/categories
+NoCategoryYet=No tag/category of this type created
+In=In
+AddIn=Add in
+modify=modify
+Classify=Classify
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Vendors tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
+UsersCategoriesArea=Users tags/categories area
+SubCats=Sub-categories
+CatList=List of tags/categories
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
+NoSubCat=No subcategory.
+SubCatOf=Subcategory
+FoundCats=Found tags/categories
+ImpossibleAddCat=Impossible to add the tag/category %s
+WasAddedSuccessfully=<b>%s</b> was added successfully.
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+ProductIsInCategories=Product/service is linked to following tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
+ClassifyInCategory=Add to tag/category
+NotCategorized=Without tag/category
+CategoryExistsAtSameLevel=This category already exists with this ref
+ContentsVisibleByAllShort=Contents visible by all
+ContentsNotVisibleByAllShort=Contents not visible by all
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Vendors tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
+SuppliersCategoriesShort=Vendors tags/categories
+CustomersCategoriesShort=Customers tags/categories
+ProspectsCategoriesShort=Prospects tags/categories
+CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
+AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
+UsersCategoriesShort=Users tags/categories
+StockCategoriesShort=Warehouse tags/categories
+ThisCategoryHasNoItems=This category does not contain any items.
+CategId=Tag/category id
+CatSupList=List of vendor tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatContactsLinks=Links between contacts/addresses and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
+DeleteFromCat=Remove from tags/category
+ExtraFieldsCategories=Complementary attributes
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
+CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
+AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show tag/category
+ByDefaultInList=By default in list
+ChooseCategory=Choose category
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/az_AZ/commercial.lang b/htdocs/langs/az_AZ/commercial.lang
new file mode 100644
index 00000000000..10c536e0d48
--- /dev/null
+++ b/htdocs/langs/az_AZ/commercial.lang
@@ -0,0 +1,80 @@
+# Dolibarr language file - Source file is en_US - commercial
+Commercial=Commerce
+CommercialArea=Commerce area
+Customer=Customer
+Customers=Customers
+Prospect=Prospect
+Prospects=Prospects
+DeleteAction=Delete an event
+NewAction=New event
+AddAction=Create event
+AddAnAction=Create an event
+AddActionRendezVous=Create a Rendez-vous event
+ConfirmDeleteAction=Are you sure you want to delete this event?
+CardAction=Event card
+ActionOnCompany=Related company
+ActionOnContact=Related contact
+TaskRDVWith=Meeting with %s
+ShowTask=Show task
+ShowAction=Show event
+ActionsReport=Events report
+ThirdPartiesOfSaleRepresentative=Third parties with sales representative
+SaleRepresentativesOfThirdParty=Sales representatives of third party
+SalesRepresentative=Sales representative
+SalesRepresentatives=Sales representatives
+SalesRepresentativeFollowUp=Sales representative (follow-up)
+SalesRepresentativeSignature=Sales representative (signature)
+NoSalesRepresentativeAffected=No particular sales representative assigned
+ShowCustomer=Show customer
+ShowProspect=Show prospect
+ListOfProspects=List of prospects
+ListOfCustomers=List of customers
+LastDoneTasks=Latest %s completed actions
+LastActionsToDo=Oldest %s not completed actions
+DoneAndToDoActions=Completed and To do events
+DoneActions=Completed events
+ToDoActions=Incomplete events
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
+StatusNotApplicable=Not applicable
+StatusActionToDo=To do
+StatusActionDone=Complete
+StatusActionInProcess=In process
+TasksHistoryForThisContact=Events for this contact
+LastProspectDoNotContact=Do not contact
+LastProspectNeverContacted=Never contacted
+LastProspectToContact=To contact
+LastProspectContactInProcess=Contact in process
+LastProspectContactDone=Contact done
+ActionAffectedTo=Event assigned to
+ActionDoneBy=Event done by
+ActionAC_TEL=Phone call
+ActionAC_FAX=Send fax
+ActionAC_PROP=Send proposal by mail
+ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
+ActionAC_RDV=Meetings
+ActionAC_INT=Intervention on site
+ActionAC_FAC=Send customer invoice by mail
+ActionAC_REL=Send customer invoice by mail (reminder)
+ActionAC_CLO=Close
+ActionAC_EMAILING=Send mass email
+ActionAC_COM=Send sales order by mail
+ActionAC_SHIP=Send shipping by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
+ActionAC_OTH=Other
+ActionAC_OTH_AUTO=Automatically inserted events
+ActionAC_MANUAL=Manually inserted events
+ActionAC_AUTO=Automatically inserted events
+ActionAC_OTH_AUTOShort=Auto
+Stats=Sales statistics
+StatusProsp=Prospect status
+DraftPropals=Draft commercial proposals
+NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commercial proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/az_AZ/companies.lang b/htdocs/langs/az_AZ/companies.lang
new file mode 100644
index 00000000000..0fad58c9389
--- /dev/null
+++ b/htdocs/langs/az_AZ/companies.lang
@@ -0,0 +1,458 @@
+# Dolibarr language file - Source file is en_US - companies
+ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
+ErrorSetACountryFirst=Set the country first
+SelectThirdParty=Select a third party
+ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+DeleteContact=Delete a contact/address
+ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+MenuNewThirdParty=New Third Party
+MenuNewCustomer=New Customer
+MenuNewProspect=New Prospect
+MenuNewSupplier=New Vendor
+MenuNewPrivateIndividual=New private individual
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New Third Party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
+CreateThirdPartyOnly=Create third party
+CreateThirdPartyAndContact=Create a third party + a child contact
+ProspectionArea=Prospection area
+IdThirdParty=Id third party
+IdCompany=Company Id
+IdContact=Contact Id
+Contacts=Contacts/Addresses
+ThirdPartyContacts=Third-party contacts
+ThirdPartyContact=Third-party contact/address
+Company=Company
+CompanyName=Company name
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias Name
+Companies=Companies
+CountryIsInEEC=Country is inside the European Economic Community
+PriceFormatInCurrentLanguage=Price display format in the current language and currency
+ThirdPartyName=Third-party name
+ThirdPartyEmail=Third-party email
+ThirdParty=Third-party
+ThirdParties=Third-parties
+ThirdPartyProspects=Prospects
+ThirdPartyProspectsStats=Prospects
+ThirdPartyCustomers=Customers
+ThirdPartyCustomersStats=Customers
+ThirdPartyCustomersWithIdProf12=Customers with %s or %s
+ThirdPartySuppliers=Vendors
+ThirdPartyType=Third-party type
+Individual=Private individual
+ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
+ParentCompany=Parent company
+Subsidiaries=Subsidiaries
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
+ReportByQuarter=Report by rate
+CivilityCode=Civility code
+RegisteredOffice=Registered office
+Lastname=Last name
+Firstname=First name
+PostOrFunction=Job position
+UserTitle=Title
+NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
+Address=Address
+State=State/Province
+StateCode=State/Province code
+StateShort=State
+Region=Region
+Region-State=Region - State
+Country=Country
+CountryCode=Country code
+CountryId=Country id
+Phone=Phone
+PhoneShort=Phone
+Skype=Skype
+Call=Call
+Chat=Chat
+PhonePro=Prof. phone
+PhonePerso=Pers. phone
+PhoneMobile=Mobile
+No_Email=Refuse bulk emailings
+Fax=Fax
+Zip=Zip Code
+Town=City
+Web=Web
+Poste= Position
+DefaultLang=Language default
+VATIsUsed=Sales tax used
+VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
+CopyAddressFromSoc=Copy address from third-party details
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
+PaymentBankAccount=Payment bank account
+OverAllProposals=Proposals
+OverAllOrders=Orders
+OverAllInvoices=Invoices
+OverAllSupplierProposals=Price requests
+##### Local Taxes #####
+LocalTax1IsUsed=Use second tax
+LocalTax1IsUsedES= RE is used
+LocalTax1IsNotUsedES= RE is not used
+LocalTax2IsUsed=Use third tax
+LocalTax2IsUsedES= IRPF is used
+LocalTax2IsNotUsedES= IRPF is not used
+WrongCustomerCode=Customer code invalid
+WrongSupplierCode=Vendor code invalid
+CustomerCodeModel=Customer code model
+SupplierCodeModel=Vendor code model
+Gencod=Barcode
+##### Professional ID #####
+ProfId1Short=Prof. id 1
+ProfId2Short=Prof. id 2
+ProfId3Short=Prof. id 3
+ProfId4Short=Prof. id 4
+ProfId5Short=Prof. id 5
+ProfId6Short=Prof. id 6
+ProfId1=Professional ID 1
+ProfId2=Professional ID 2
+ProfId3=Professional ID 3
+ProfId4=Professional ID 4
+ProfId5=Professional ID 5
+ProfId6=Professional ID 6
+ProfId1AR=Prof Id 1 (CUIT/CUIL)
+ProfId2AR=Prof Id 2 (Revenu brutes)
+ProfId3AR=-
+ProfId4AR=-
+ProfId5AR=-
+ProfId6AR=-
+ProfId1AT=Prof Id 1 (USt.-IdNr)
+ProfId2AT=Prof Id 2 (USt.-Nr)
+ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
+ProfId4AT=-
+ProfId5AT=-
+ProfId6AT=-
+ProfId1AU=Prof Id 1 (ABN)
+ProfId2AU=-
+ProfId3AU=-
+ProfId4AU=-
+ProfId5AU=-
+ProfId6AU=-
+ProfId1BE=Prof Id 1 (Professional number)
+ProfId2BE=-
+ProfId3BE=-
+ProfId4BE=-
+ProfId5BE=-
+ProfId6BE=-
+ProfId1BR=-
+ProfId2BR=IE (Inscricao Estadual)
+ProfId3BR=IM (Inscricao Municipal)
+ProfId4BR=CPF
+#ProfId5BR=CNAE
+#ProfId6BR=INSS
+ProfId1CH=-
+ProfId2CH=-
+ProfId3CH=Prof Id 1 (Federal number)
+ProfId4CH=Prof Id 2 (Commercial Record number)
+ProfId5CH=-
+ProfId6CH=-
+ProfId1CL=Prof Id 1 (R.U.T.)
+ProfId2CL=-
+ProfId3CL=-
+ProfId4CL=-
+ProfId5CL=-
+ProfId6CL=-
+ProfId1CO=Prof Id 1 (R.U.T.)
+ProfId2CO=-
+ProfId3CO=-
+ProfId4CO=-
+ProfId5CO=-
+ProfId6CO=-
+ProfId1DE=Prof Id 1 (USt.-IdNr)
+ProfId2DE=Prof Id 2 (USt.-Nr)
+ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId4DE=-
+ProfId5DE=-
+ProfId6DE=-
+ProfId1ES=Prof Id 1 (CIF/NIF)
+ProfId2ES=Prof Id 2 (Social security number)
+ProfId3ES=Prof Id 3 (CNAE)
+ProfId4ES=Prof Id 4 (Collegiate number)
+ProfId5ES=-
+ProfId6ES=-
+ProfId1FR=Prof Id 1 (SIREN)
+ProfId2FR=Prof Id 2 (SIRET)
+ProfId3FR=Prof Id 3 (NAF, old APE)
+ProfId4FR=Prof Id 4 (RCS/RM)
+ProfId5FR=-
+ProfId6FR=-
+ProfId1GB=Registration Number
+ProfId2GB=-
+ProfId3GB=SIC
+ProfId4GB=-
+ProfId5GB=-
+ProfId6GB=-
+ProfId1HN=Id prof. 1 (RTN)
+ProfId2HN=-
+ProfId3HN=-
+ProfId4HN=-
+ProfId5HN=-
+ProfId6HN=-
+ProfId1IN=Prof Id 1 (TIN)
+ProfId2IN=Prof Id 2 (PAN)
+ProfId3IN=Prof Id 3 (SRVC TAX)
+ProfId4IN=Prof Id 4
+ProfId5IN=Prof Id 5
+ProfId6IN=-
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
+ProfId1MA=Id prof. 1 (R.C.)
+ProfId2MA=Id prof. 2 (Patente)
+ProfId3MA=Id prof. 3 (I.F.)
+ProfId4MA=Id prof. 4 (C.N.S.S.)
+ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId6MA=-
+ProfId1MX=Prof Id 1 (R.F.C).
+ProfId2MX=Prof Id 2 (R..P. IMSS)
+ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId4MX=-
+ProfId5MX=-
+ProfId6MX=-
+ProfId1NL=KVK nummer
+ProfId2NL=-
+ProfId3NL=-
+ProfId4NL=Burgerservicenummer (BSN)
+ProfId5NL=-
+ProfId6NL=-
+ProfId1PT=Prof Id 1 (NIPC)
+ProfId2PT=Prof Id 2 (Social security number)
+ProfId3PT=Prof Id 3 (Commercial Record number)
+ProfId4PT=Prof Id 4 (Conservatory)
+ProfId5PT=-
+ProfId6PT=-
+ProfId1SN=RC
+ProfId2SN=NINEA
+ProfId3SN=-
+ProfId4SN=-
+ProfId5SN=-
+ProfId6SN=-
+ProfId1TN=Prof Id 1 (RC)
+ProfId2TN=Prof Id 2 (Fiscal matricule)
+ProfId3TN=Prof Id 3 (Douane code)
+ProfId4TN=Prof Id 4 (BAN)
+ProfId5TN=-
+ProfId6TN=-
+ProfId1US=Prof Id (FEIN)
+ProfId2US=-
+ProfId3US=-
+ProfId4US=-
+ProfId5US=-
+ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
+ProfId1RU=Prof Id 1 (OGRN)
+ProfId2RU=Prof Id 2 (INN)
+ProfId3RU=Prof Id 3 (KPP)
+ProfId4RU=Prof Id 4 (OKPO)
+ProfId5RU=-
+ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
+VATIntra=VAT ID
+VATIntraShort=VAT ID
+VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
+ProspectCustomer=Prospect / Customer
+Prospect=Prospect
+CustomerCard=Customer Card
+Customer=Customer
+CustomerRelativeDiscount=Relative customer discount
+SupplierRelativeDiscount=Relative vendor discount
+CustomerRelativeDiscountShort=Relative discount
+CustomerAbsoluteDiscountShort=Absolute discount
+CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
+CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
+CompanyHasAbsoluteDiscount=This customer has discounts available (credits notes or down payments) for <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
+CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
+CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
+DiscountNone=None
+Vendor=Vendor
+Supplier=Vendor
+AddContact=Create contact
+AddContactAddress=Create contact/address
+EditContact=Edit contact
+EditContactAddress=Edit contact/address
+Contact=Contact
+ContactId=Contact id
+ContactsAddresses=Contacts/Addresses
+FromContactName=Name:
+NoContactDefinedForThirdParty=No contact defined for this third party
+NoContactDefined=No contact defined
+DefaultContact=Default contact/address
+ContactByDefaultFor=Default contact/address for
+AddThirdParty=Create third party
+DeleteACompany=Delete a company
+PersonalInformations=Personal data
+AccountancyCode=Accounting account
+CustomerCode=Customer Code
+SupplierCode=Vendor Code
+CustomerCodeShort=Customer Code
+SupplierCodeShort=Vendor Code
+CustomerCodeDesc=Customer Code, unique for all customers
+SupplierCodeDesc=Vendor Code, unique for all vendors
+RequiredIfCustomer=Required if third party is a customer or prospect
+RequiredIfSupplier=Required if third party is a vendor
+ValidityControledByModule=Validity controlled by module
+ThisIsModuleRules=Rules for this module
+ProspectToContact=Prospect to contact
+CompanyDeleted=Company "%s" deleted from database.
+ListOfContacts=List of contacts/addresses
+ListOfContactsAddresses=List of contacts/addresses
+ListOfThirdParties=List of Third Parties
+ShowCompany=Third Party
+ShowContact=Contact-Address
+ContactsAllShort=All (No filter)
+ContactType=Contact type
+ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
+ContactForProposals=Proposal's contact
+ContactForContracts=Contract's contact
+ContactForInvoices=Invoice's contact
+NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
+NoContactForAnyProposal=This contact is not a contact for any commercial proposal
+NoContactForAnyContract=This contact is not a contact for any contract
+NoContactForAnyInvoice=This contact is not a contact for any invoice
+NewContact=New contact
+NewContactAddress=New Contact/Address
+MyContacts=My contacts
+Capital=Capital
+CapitalOf=Capital of %s
+EditCompany=Edit company
+ThisUserIsNot=This user is not a prospect, customer or vendor
+VATIntraCheck=Check
+VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
+VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
+NorProspectNorCustomer=Not prospect, nor customer
+JuridicalStatus=Legal Entity Type
+Staff=Employees
+ProspectLevelShort=Potential
+ProspectLevel=Prospect potential
+ContactPrivate=Private
+ContactPublic=Shared
+ContactVisibility=Visibility
+ContactOthers=Other
+OthersNotLinkedToThirdParty=Others, not linked to a third party
+ProspectStatus=Prospect status
+PL_NONE=None
+PL_UNKNOWN=Unknown
+PL_LOW=Low
+PL_MEDIUM=Medium
+PL_HIGH=High
+TE_UNKNOWN=-
+TE_STARTUP=Startup
+TE_GROUP=Large company
+TE_MEDIUM=Medium company
+TE_ADMIN=Governmental
+TE_SMALL=Small company
+TE_RETAIL=Retailer
+TE_WHOLE=Wholesaler
+TE_PRIVATE=Private individual
+TE_OTHER=Other
+StatusProspect-1=Do not contact
+StatusProspect0=Never contacted
+StatusProspect1=To be contacted
+StatusProspect2=Contact in process
+StatusProspect3=Contact done
+ChangeDoNotContact=Change status to 'Do not contact'
+ChangeNeverContacted=Change status to 'Never contacted'
+ChangeToContact=Change status to 'To be contacted'
+ChangeContactInProcess=Change status to 'Contact in process'
+ChangeContactDone=Change status to 'Contact done'
+ProspectsByStatus=Prospects by status
+NoParentCompany=None
+ExportCardToFormat=Export card to format
+ContactNotLinkedToCompany=Contact not linked to any third party
+DolibarrLogin=Dolibarr login
+NoDolibarrAccess=No Dolibarr access
+ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
+ExportDataset_company_2=Contacts and their properties
+ImportDataset_company_1=Third-parties and their properties
+ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ImportDataset_company_3=Third-parties Bank accounts
+ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
+PriceLevel=Price Level
+PriceLevelLabels=Price Level Labels
+DeliveryAddress=Delivery address
+AddAddress=Add address
+SupplierCategory=Vendor category
+JuridicalStatus200=Independent
+DeleteFile=Delete file
+ConfirmDeleteFile=Are you sure you want to delete this file?
+AllocateCommercial=Assigned to sales representative
+Organization=Organization
+FiscalYearInformation=Fiscal Year
+FiscalMonthStart=Starting month of the fiscal year
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
+YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
+YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
+ListSuppliersShort=List of Vendors
+ListProspectsShort=List of Prospects
+ListCustomersShort=List of Customers
+ThirdPartiesArea=Third Parties/Contacts
+LastModifiedThirdParties=Last %s modified Third Parties
+UniqueThirdParties=Total of Third Parties
+InActivity=Open
+ActivityCeased=Closed
+ThirdPartyIsClosed=Third party is closed
+ProductsIntoElements=List of products/services into %s
+CurrentOutstandingBill=Current outstanding bill
+OutstandingBill=Max. for outstanding bill
+OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
+MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
+ManagingDirectors=Manager(s) name (CEO, director, president...)
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ThirdpartiesMergeSuccess=Third parties have been merged
+SaleRepresentativeLogin=Login of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+#Imports
+PaymentTypeCustomer=Payment Type - Customer
+PaymentTermsCustomer=Payment Terms - Customer
+PaymentTypeSupplier=Payment Type - Vendor
+PaymentTermsSupplier=Payment Term - Vendor
+PaymentTypeBoth=Payment Type - Customer and Vendor
+MulticurrencyUsed=Use Multicurrency
+MulticurrencyCurrency=Currency
diff --git a/htdocs/langs/az_AZ/compta.lang b/htdocs/langs/az_AZ/compta.lang
new file mode 100644
index 00000000000..8a8c837ac87
--- /dev/null
+++ b/htdocs/langs/az_AZ/compta.lang
@@ -0,0 +1,266 @@
+# Dolibarr language file - Source file is en_US - compta
+MenuFinancial=Billing | Payment
+TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
+OptionMode=Option for accountancy
+OptionModeTrue=Option Incomes-Expenses
+OptionModeVirtual=Option Claims-Debts
+OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
+OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
+FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
+VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
+LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+Param=Setup
+RemainingAmountPayment=Amount payment remaining:
+Account=Account
+Accountparent=Parent account
+Accountsparent=Parent accounts
+Income=Income
+Outcome=Expense
+MenuReportInOut=Income / Expense
+ReportInOut=Balance of income and expenses
+ReportTurnover=Turnover invoiced
+ReportTurnoverCollected=Turnover collected
+PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party
+PaymentsNotLinkedToUser=Payments not linked to any user
+Profit=Profit
+AccountingResult=Accounting result
+BalanceBefore=Balance (before)
+Balance=Balance
+Debit=Debit
+Credit=Credit
+Piece=Accounting Doc.
+AmountHTVATRealReceived=Net collected
+AmountHTVATRealPaid=Net paid
+VATToPay=Tax sales
+VATReceived=Tax received
+VATToCollect=Tax purchases
+VATSummary=Tax monthly
+VATBalance=Tax Balance
+VATPaid=Tax paid
+LT1Summary=Tax 2 summary
+LT2Summary=Tax 3 summary
+LT1SummaryES=RE Balance
+LT2SummaryES=IRPF Balance
+LT1SummaryIN=CGST Balance
+LT2SummaryIN=SGST Balance
+LT1Paid=Tax 2 paid
+LT2Paid=Tax 3 paid
+LT1PaidES=RE Paid
+LT2PaidES=IRPF Paid
+LT1PaidIN=CGST Paid
+LT2PaidIN=SGST Paid
+LT1Customer=Tax 2 sales
+LT1Supplier=Tax 2 purchases
+LT1CustomerES=RE sales
+LT1SupplierES=RE purchases
+LT1CustomerIN=CGST sales
+LT1SupplierIN=CGST purchases
+LT2Customer=Tax 3 sales
+LT2Supplier=Tax 3 purchases
+LT2CustomerES=IRPF sales
+LT2SupplierES=IRPF purchases
+LT2CustomerIN=SGST sales
+LT2SupplierIN=SGST purchases
+VATCollected=VAT collected
+StatusToPay=To pay
+SpecialExpensesArea=Area for all special payments
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
+SocialContributionsDeductibles=Deductible social or fiscal taxes
+SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
+MenuSpecialExpenses=Special expenses
+MenuTaxAndDividends=Taxes and dividends
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New social/fiscal tax
+NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
+AccountancyTreasuryArea=Billing and payment area
+NewPayment=New payment
+PaymentCustomerInvoice=Customer invoice payment
+PaymentSupplierInvoice=vendor invoice payment
+PaymentSocialContribution=Social/fiscal tax payment
+PaymentVat=VAT payment
+ListPayment=List of payments
+ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of vendor payments
+DateStartPeriod=Date start period
+DateEndPeriod=Date end period
+newLT1Payment=New tax 2 payment
+newLT2Payment=New tax 3 payment
+LT1Payment=Tax 2 payment
+LT1Payments=Tax 2 payments
+LT2Payment=Tax 3 payment
+LT2Payments=Tax 3 payments
+newLT1PaymentES=New RE payment
+newLT2PaymentES=New IRPF payment
+LT1PaymentES=RE Payment
+LT1PaymentsES=RE Payments
+LT2PaymentES=IRPF Payment
+LT2PaymentsES=IRPF Payments
+VATPayment=Sales tax payment
+VATPayments=Sales tax payments
+VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
+NewLocalTaxPayment=New tax %s payment
+Refund=Refund
+SocialContributionsPayments=Social/fiscal taxes payments
+ShowVatPayment=Show VAT payment
+TotalToPay=Total to pay
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+CustomerAccountancyCode=Customer accounting code
+SupplierAccountancyCode=Vendor accounting code
+CustomerAccountancyCodeShort=Cust. account. code
+SupplierAccountancyCodeShort=Sup. account. code
+AccountNumber=Account number
+NewAccountingAccount=New account
+Turnover=Turnover invoiced
+TurnoverCollected=Turnover collected
+SalesTurnoverMinimum=Minimum turnover
+ByExpenseIncome=By expenses & incomes
+ByThirdParties=By third parties
+ByUserAuthorOfInvoice=By invoice author
+CheckReceipt=Check deposit
+CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Latest %s check receipts
+NewCheckReceipt=New discount
+NewCheckDeposit=New check deposit
+NewCheckDepositOn=Create receipt for deposit on account: %s
+NoWaitingChecks=No checks awaiting deposit.
+DateChequeReceived=Check reception date
+NbOfCheques=No. of checks
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
+CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
+CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
+CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
+CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
+CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
+CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
+CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
+CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
+CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
+CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
+AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
+AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
+AnnualByCompanies=Balance of income and expenses, by predefined groups of account
+AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
+AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
+SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
+SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
+SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
+RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
+RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
+RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
+RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
+RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
+SeePageForSetup=See menu <a href="%s">%s</a> for setup
+DepositsAreNotIncluded=- Down payment invoices are not included
+DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
+VATReportByCustomers=Sale tax report by customer
+VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
+SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
+SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
+RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
+RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
+OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
+PercentOfInvoice=%%/invoice
+NotUsedForGoods=Not used on goods
+ProposalStats=Statistics on proposals
+OrderStats=Statistics on orders
+InvoiceStats=Statistics on bills
+Dispatch=Dispatching
+Dispatched=Dispatched
+ToDispatch=To dispatch
+ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer
+SellsJournal=Sales Journal
+PurchasesJournal=Purchases Journal
+DescSellsJournal=Sales Journal
+DescPurchasesJournal=Purchases Journal
+CodeNotDef=Not defined
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
+DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
+Pcg_version=Chart of accounts models
+Pcg_type=Pcg type
+Pcg_subtype=Pcg subtype
+InvoiceLinesToDispatch=Invoice lines to dispatch
+ByProductsAndServices=By product and service
+RefExt=External ref
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+LinkedOrder=Link to order
+Mode1=Method 1
+Mode2=Method 2
+CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
+CalculationRuleDescSupplier=According to vendor, choose appropriate method to apply same calculation rule and get same result expected by your vendor.
+TurnoverPerProductInCommitmentAccountingNotRelevant=The report of Turnover collected per product is not available. This report is only available for turnover invoiced.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
+CalculationMode=Calculation mode
+AccountancyJournal=Accounting code journal
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+CloneTaxForNextMonth=Clone it for next month
+SimpleReport=Simple report
+AddExtraReport=Extra reports (add foreign and national customer report)
+OtherCountriesCustomersReport=Foreign customers report
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
+SameCountryCustomersWithVAT=National customers report
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
+LinkedFichinter=Link to an intervention
+ImportDataset_tax_contrib=Social/fiscal taxes
+ImportDataset_tax_vat=Vat payments
+ErrorBankAccountNotFound=Error: Bank account not found
+FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
+DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignment
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover invoiced by sale tax rate
+TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
+LabelToShow=Short label
+PurchaseTurnover=Purchase turnover
+PurchaseTurnoverCollected=Purchase turnover collected
+RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
+RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/az_AZ/contracts.lang b/htdocs/langs/az_AZ/contracts.lang
new file mode 100644
index 00000000000..47572c355ab
--- /dev/null
+++ b/htdocs/langs/az_AZ/contracts.lang
@@ -0,0 +1,101 @@
+# Dolibarr language file - Source file is en_US - contracts
+ContractsArea=Contracts area
+ListOfContracts=List of contracts
+AllContracts=All contracts
+ContractCard=Contract card
+ContractStatusNotRunning=Not running
+ContractStatusDraft=Draft
+ContractStatusValidated=Validated
+ContractStatusClosed=Closed
+ServiceStatusInitial=Not running
+ServiceStatusRunning=Running
+ServiceStatusNotLate=Running, not expired
+ServiceStatusNotLateShort=Not expired
+ServiceStatusLate=Running, expired
+ServiceStatusLateShort=Expired
+ServiceStatusClosed=Closed
+ShowContractOfService=Show contract of service
+Contracts=Contracts
+ContractsSubscriptions=Contracts/Subscriptions
+ContractsAndLine=Contracts and line of contracts
+Contract=Contract
+ContractLine=Contract line
+Closing=Closing
+NoContracts=No contracts
+MenuServices=Services
+MenuInactiveServices=Services not active
+MenuRunningServices=Running services
+MenuExpiredServices=Expired services
+MenuClosedServices=Closed services
+NewContract=New contract
+NewContractSubscription=New contract/subscription
+AddContract=Create contract
+DeleteAContract=Delete a contract
+ActivateAllOnContract=Activate all services
+CloseAContract=Close a contract
+ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
+ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
+ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
+ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract?
+ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
+ValidateAContract=Validate a contract
+ActivateService=Activate service
+ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b>?
+RefContract=Contract reference
+DateContract=Contract date
+DateServiceActivate=Service activation date
+ListOfServices=List of services
+ListOfInactiveServices=List of not active services
+ListOfExpiredServices=List of expired active services
+ListOfClosedServices=List of closed services
+ListOfRunningServices=List of running services
+NotActivatedServices=Inactive services (among validated contracts)
+BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
+LastContracts=Latest %s contracts
+LastModifiedServices=Latest %s modified services
+ContractStartDate=Start date
+ContractEndDate=End date
+DateStartPlanned=Planned start date
+DateStartPlannedShort=Planned start date
+DateEndPlanned=Planned end date
+DateEndPlannedShort=Planned end date
+DateStartReal=Real start date
+DateStartRealShort=Real start date
+DateEndReal=Real end date
+DateEndRealShort=Real end date
+CloseService=Close service
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
+ServiceStatus=Status of service
+DraftContracts=Drafts contracts
+CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
+ActivateAllContracts=Activate all contract lines
+CloseAllContracts=Close all contract lines
+DeleteContractLine=Delete a contract line
+ConfirmDeleteContractLine=Are you sure you want to delete this contract line?
+MoveToAnotherContract=Move service into another contract.
+ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract.
+ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
+PaymentRenewContractId=Renew contract line (number %s)
+ExpiredSince=Expiration date
+NoExpiredServices=No expired active services
+ListOfServicesToExpireWithDuration=List of Services to expire in %s days
+ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
+ListOfServicesToExpire=List of Services to expire
+NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
+StandardContractsTemplate=Standard contracts template
+ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
+LowerDateEndPlannedShort=Lower planned end date of active services
+SendContractRef=Contract information __REF__
+OtherContracts=Other contracts
+##### Types de contacts #####
+TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
+TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract
+TypeContact_contrat_external_BILLING=Billing customer contact
+TypeContact_contrat_external_CUSTOMER=Follow-up customer contact
+TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact
diff --git a/htdocs/langs/az_AZ/cron.lang b/htdocs/langs/az_AZ/cron.lang
new file mode 100644
index 00000000000..1de1251831a
--- /dev/null
+++ b/htdocs/langs/az_AZ/cron.lang
@@ -0,0 +1,84 @@
+# Dolibarr language file - Source file is en_US - cron
+# About page
+# Right
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
+# Admin
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
+CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
+CronJobProfiles=List of predefined cron job profiles
+# Menu
+EnabledAndDisabled=Enabled and disabled
+# Page list
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
+CronCommand=Command
+CronList=Scheduled jobs
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
+CronExecute=Launch scheduled job
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
+CronTask=Job
+CronNone=None
+CronDtStart=Not before
+CronDtEnd=Not after
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Start date of latest execution
+CronDtLastResult=End date of latest execution
+CronFrequency=Frequency
+CronClass=Class
+CronMethod=Method
+CronModule=Module
+CronNoJobs=No jobs registered
+CronPriority=Priority
+CronLabel=Label
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
+CronEach=Every
+JobFinished=Job launched and finished
+#Page card
+CronAdd= Add jobs
+CronEvery=Execute job each
+CronObject=Instance/Object to create
+CronArgs=Parameters
+CronSaveSucess=Save successfully
+CronNote=Comment
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+StatusAtInstall=Status at module installation
+CronStatusActiveBtn=Enable
+CronStatusInactiveBtn=Disable
+CronTaskInactive=This job is disabled
+CronId=Id
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
+CronFrom=From
+# Info
+# Common
+CronType=Job type
+CronType_method=Call method of a PHP Class
+CronType_command=Shell command
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
+JobDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
diff --git a/htdocs/langs/az_AZ/deliveries.lang b/htdocs/langs/az_AZ/deliveries.lang
new file mode 100644
index 00000000000..1f48c01de75
--- /dev/null
+++ b/htdocs/langs/az_AZ/deliveries.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - deliveries
+Delivery=Delivery
+DeliveryRef=Ref Delivery
+DeliveryCard=Receipt card
+DeliveryOrder=Delivery receipt
+DeliveryDate=Delivery date
+CreateDeliveryOrder=Generate delivery receipt
+DeliveryStateSaved=Delivery state saved
+SetDeliveryDate=Set shipping date
+ValidateDeliveryReceipt=Validate delivery receipt
+ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt?
+DeleteDeliveryReceipt=Delete delivery receipt
+DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b>?
+DeliveryMethod=Delivery method
+TrackingNumber=Tracking number
+DeliveryNotValidated=Delivery not validated
+StatusDeliveryCanceled=Canceled
+StatusDeliveryDraft=Draft
+StatusDeliveryValidated=Received
+# merou PDF model
+NameAndSignature=Name and Signature:
+ToAndDate=To___________________________________ on ____/_____/__________
+GoodStatusDeclaration=Have received the goods above in good condition,
+Deliverer=Deliverer:
+Sender=Sender
+Recipient=Recipient
+ErrorStockIsNotEnough=There's not enough stock
+Shippable=Shippable
+NonShippable=Not Shippable
+ShowReceiving=Show delivery receipt
+NonExistentOrder=Nonexistent order
diff --git a/htdocs/langs/az_AZ/dict.lang b/htdocs/langs/az_AZ/dict.lang
new file mode 100644
index 00000000000..ec315d97142
--- /dev/null
+++ b/htdocs/langs/az_AZ/dict.lang
@@ -0,0 +1,359 @@
+# Dolibarr language file - Source file is en_US - dict
+CountryFR=France
+CountryBE=Belgium
+CountryIT=Italy
+CountryES=Spain
+CountryDE=Germany
+CountryCH=Switzerland
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
+CountryUK=United Kingdom
+CountryIE=Ireland
+CountryCN=China
+CountryTN=Tunisia
+CountryUS=United States
+CountryMA=Morocco
+CountryDZ=Algeria
+CountryCA=Canada
+CountryTG=Togo
+CountryGA=Gabon
+CountryNL=Netherlands
+CountryHU=Hungary
+CountryRU=Russia
+CountrySE=Sweden
+CountryCI=Ivoiry Coast
+CountrySN=Senegal
+CountryAR=Argentina
+CountryCM=Cameroon
+CountryPT=Portugal
+CountrySA=Saudi Arabia
+CountryMC=Monaco
+CountryAU=Australia
+CountrySG=Singapore
+CountryAF=Afghanistan
+CountryAX=Åland Islands
+CountryAL=Albania
+CountryAS=American Samoa
+CountryAD=Andorra
+CountryAO=Angola
+CountryAI=Anguilla
+CountryAQ=Antarctica
+CountryAG=Antigua and Barbuda
+CountryAM=Armenia
+CountryAW=Aruba
+CountryAT=Austria
+CountryAZ=Azerbaijan
+CountryBS=Bahamas
+CountryBH=Bahrain
+CountryBD=Bangladesh
+CountryBB=Barbados
+CountryBY=Belarus
+CountryBZ=Belize
+CountryBJ=Benin
+CountryBM=Bermuda
+CountryBT=Bhutan
+CountryBO=Bolivia
+CountryBA=Bosnia and Herzegovina
+CountryBW=Botswana
+CountryBV=Bouvet Island
+CountryBR=Brazil
+CountryIO=British Indian Ocean Territory
+CountryBN=Brunei Darussalam
+CountryBG=Bulgaria
+CountryBF=Burkina Faso
+CountryBI=Burundi
+CountryKH=Cambodia
+CountryCV=Cape Verde
+CountryKY=Cayman Islands
+CountryCF=Central African Republic
+CountryTD=Chad
+CountryCL=Chile
+CountryCX=Christmas Island
+CountryCC=Cocos (Keeling) Islands
+CountryCO=Colombia
+CountryKM=Comoros
+CountryCG=Congo
+CountryCD=Congo, The Democratic Republic of the
+CountryCK=Cook Islands
+CountryCR=Costa Rica
+CountryHR=Croatia
+CountryCU=Cuba
+CountryCY=Cyprus
+CountryCZ=Czech Republic
+CountryDK=Denmark
+CountryDJ=Djibouti
+CountryDM=Dominica
+CountryDO=Dominican Republic
+CountryEC=Ecuador
+CountryEG=Egypt
+CountrySV=El Salvador
+CountryGQ=Equatorial Guinea
+CountryER=Eritrea
+CountryEE=Estonia
+CountryET=Ethiopia
+CountryFK=Falkland Islands
+CountryFO=Faroe Islands
+CountryFJ=Fiji Islands
+CountryFI=Finland
+CountryGF=French Guiana
+CountryPF=French Polynesia
+CountryTF=French Southern Territories
+CountryGM=Gambia
+CountryGE=Georgia
+CountryGH=Ghana
+CountryGI=Gibraltar
+CountryGR=Greece
+CountryGL=Greenland
+CountryGD=Grenada
+CountryGP=Guadeloupe
+CountryGU=Guam
+CountryGT=Guatemala
+CountryGN=Guinea
+CountryGW=Guinea-Bissau
+CountryGY=Guyana
+CountryHT=Haïti
+CountryHM=Heard Island and McDonald
+CountryVA=Holy See (Vatican City State)
+CountryHN=Honduras
+CountryHK=Hong Kong
+CountryIS=Iceland
+CountryIN=India
+CountryID=Indonesia
+CountryIR=Iran
+CountryIQ=Iraq
+CountryIL=Israel
+CountryJM=Jamaica
+CountryJP=Japan
+CountryJO=Jordan
+CountryKZ=Kazakhstan
+CountryKE=Kenya
+CountryKI=Kiribati
+CountryKP=North Korea
+CountryKR=South Korea
+CountryKW=Kuwait
+CountryKG=Kyrgyzstan
+CountryLA=Lao
+CountryLV=Latvia
+CountryLB=Lebanon
+CountryLS=Lesotho
+CountryLR=Liberia
+CountryLY=Libyan
+CountryLI=Liechtenstein
+CountryLT=Lithuania
+CountryLU=Luxembourg
+CountryMO=Macao
+CountryMK=Macedonia, the former Yugoslav of
+CountryMG=Madagascar
+CountryMW=Malawi
+CountryMY=Malaysia
+CountryMV=Maldives
+CountryML=Mali
+CountryMT=Malta
+CountryMH=Marshall Islands
+CountryMQ=Martinique
+CountryMR=Mauritania
+CountryMU=Mauritius
+CountryYT=Mayotte
+CountryMX=Mexico
+CountryFM=Micronesia
+CountryMD=Moldova
+CountryMN=Mongolia
+CountryMS=Monserrat
+CountryMZ=Mozambique
+CountryMM=Myanmar (Burma)
+CountryNA=Namibia
+CountryNR=Nauru
+CountryNP=Nepal
+CountryAN=Netherlands Antilles
+CountryNC=New Caledonia
+CountryNZ=New Zealand
+CountryNI=Nicaragua
+CountryNE=Niger
+CountryNG=Nigeria
+CountryNU=Niue
+CountryNF=Norfolk Island
+CountryMP=Northern Mariana Islands
+CountryNO=Norway
+CountryOM=Oman
+CountryPK=Pakistan
+CountryPW=Palau
+CountryPS=Palestinian Territory, Occupied
+CountryPA=Panama
+CountryPG=Papua New Guinea
+CountryPY=Paraguay
+CountryPE=Peru
+CountryPH=Philippines
+CountryPN=Pitcairn Islands
+CountryPL=Poland
+CountryPR=Puerto Rico
+CountryQA=Qatar
+CountryRE=Reunion
+CountryRO=Romania
+CountryRW=Rwanda
+CountrySH=Saint Helena
+CountryKN=Saint Kitts and Nevis
+CountryLC=Saint Lucia
+CountryPM=Saint Pierre and Miquelon
+CountryVC=Saint Vincent and Grenadines
+CountryWS=Samoa
+CountrySM=San Marino
+CountryST=Sao Tome and Principe
+CountryRS=Serbia
+CountrySC=Seychelles
+CountrySL=Sierra Leone
+CountrySK=Slovakia
+CountrySI=Slovenia
+CountrySB=Solomon Islands
+CountrySO=Somalia
+CountryZA=South Africa
+CountryGS=South Georgia and the South Sandwich Islands
+CountryLK=Sri Lanka
+CountrySD=Sudan
+CountrySR=Suriname
+CountrySJ=Svalbard and Jan Mayen
+CountrySZ=Swaziland
+CountrySY=Syrian
+CountryTW=Taiwan
+CountryTJ=Tajikistan
+CountryTZ=Tanzania
+CountryTH=Thailand
+CountryTL=Timor-Leste
+CountryTK=Tokelau
+CountryTO=Tonga
+CountryTT=Trinidad and Tobago
+CountryTR=Turkey
+CountryTM=Turkmenistan
+CountryTC=Turks and Caicos Islands
+CountryTV=Tuvalu
+CountryUG=Uganda
+CountryUA=Ukraine
+CountryAE=United Arab Emirates
+CountryUM=United States Minor Outlying Islands
+CountryUY=Uruguay
+CountryUZ=Uzbekistan
+CountryVU=Vanuatu
+CountryVE=Venezuela
+CountryVN=Viet Nam
+CountryVG=Virgin Islands, British
+CountryVI=Virgin Islands, U.S.
+CountryWF=Wallis and Futuna
+CountryEH=Western Sahara
+CountryYE=Yemen
+CountryZM=Zambia
+CountryZW=Zimbabwe
+CountryGG=Guernsey
+CountryIM=Isle of Man
+CountryJE=Jersey
+CountryME=Montenegro
+CountryBL=Saint Barthelemy
+CountryMF=Saint Martin
+
+##### Civilities #####
+CivilityMME=Mrs.
+CivilityMR=Mr.
+CivilityMLE=Ms.
+CivilityMTRE=Master
+CivilityDR=Doctor
+##### Currencies #####
+Currencyeuros=Euros
+CurrencyAUD=AU Dollars
+CurrencySingAUD=AU Dollar
+CurrencyCAD=CAN Dollars
+CurrencySingCAD=CAN Dollar
+CurrencyCHF=Swiss Francs
+CurrencySingCHF=Swiss Franc
+CurrencyEUR=Euros
+CurrencySingEUR=Euro
+CurrencyFRF=French Francs
+CurrencySingFRF=French Franc
+CurrencyGBP=GB Pounds
+CurrencySingGBP=GB Pound
+CurrencyINR=Indian rupees
+CurrencySingINR=Indian rupee
+CurrencyMAD=Dirham
+CurrencySingMAD=Dirham
+CurrencyMGA=Ariary
+CurrencySingMGA=Ariary
+CurrencyMUR=Mauritius rupees
+CurrencySingMUR=Mauritius rupee
+CurrencyNOK=Norwegian krones
+CurrencySingNOK=Norwegian kronas
+CurrencyTND=Tunisian dinars
+CurrencySingTND=Tunisian dinar
+CurrencyUSD=US Dollars
+CurrencySingUSD=US Dollar
+CurrencyUAH=Hryvnia
+CurrencySingUAH=Hryvnia
+CurrencyXAF=CFA Francs BEAC
+CurrencySingXAF=CFA Franc BEAC
+CurrencyXOF=CFA Francs BCEAO
+CurrencySingXOF=CFA Franc BCEAO
+CurrencyXPF=CFP Francs
+CurrencySingXPF=CFP Franc
+CurrencyCentEUR=cents
+CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=thousandth
+#### Input reasons #####
+DemandReasonTypeSRC_INTE=Internet
+DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
+DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
+DemandReasonTypeSRC_CAMP_PHO=Phone campaign
+DemandReasonTypeSRC_CAMP_FAX=Fax campaign
+DemandReasonTypeSRC_COMM=Commercial contact
+DemandReasonTypeSRC_SHOP=Shop contact
+DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_PARTNER=Partner
+DemandReasonTypeSRC_EMPLOYEE=Employee
+DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
+#### Paper formats ####
+PaperFormatEU4A0=Format 4A0
+PaperFormatEU2A0=Format 2A0
+PaperFormatEUA0=Format A0
+PaperFormatEUA1=Format A1
+PaperFormatEUA2=Format A2
+PaperFormatEUA3=Format A3
+PaperFormatEUA4=Format A4
+PaperFormatEUA5=Format A5
+PaperFormatEUA6=Format A6
+PaperFormatUSLETTER=Format Letter US
+PaperFormatUSLEGAL=Format Legal US
+PaperFormatUSEXECUTIVE=Format Executive US
+PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatCAP1=Format P1 Canada
+PaperFormatCAP2=Format P2 Canada
+PaperFormatCAP3=Format P3 Canada
+PaperFormatCAP4=Format P4 Canada
+PaperFormatCAP5=Format P5 Canada
+PaperFormatCAP6=Format P6 Canada
+#### Expense report categories ####
+ExpAutoCat=Car
+ExpCycloCat=Moped
+ExpMotoCat=Motorbike
+ExpAuto3CV=3 CV
+ExpAuto4CV=4 CV
+ExpAuto5CV=5 CV
+ExpAuto6CV=6 CV
+ExpAuto7CV=7 CV
+ExpAuto8CV=8 CV
+ExpAuto9CV=9 CV
+ExpAuto10CV=10 CV
+ExpAuto11CV=11 CV
+ExpAuto12CV=12 CV
+ExpAuto3PCV=3 CV and more
+ExpAuto4PCV=4 CV and more
+ExpAuto5PCV=5 CV and more
+ExpAuto6PCV=6 CV and more
+ExpAuto7PCV=7 CV and more
+ExpAuto8PCV=8 CV and more
+ExpAuto9PCV=9 CV and more
+ExpAuto10PCV=10 CV and more
+ExpAuto11PCV=11 CV and more
+ExpAuto12PCV=12 CV and more
+ExpAuto13PCV=13 CV and more
+ExpCyclo=Capacity lower to 50cm3
+ExpMoto12CV=Motorbike 1 or 2 CV
+ExpMoto345CV=Motorbike 3, 4 or 5 CV
+ExpMoto5PCV=Motorbike 5 CV and more
diff --git a/htdocs/langs/az_AZ/donations.lang b/htdocs/langs/az_AZ/donations.lang
new file mode 100644
index 00000000000..de4bdf68f03
--- /dev/null
+++ b/htdocs/langs/az_AZ/donations.lang
@@ -0,0 +1,34 @@
+# Dolibarr language file - Source file is en_US - donations
+Donation=Donation
+Donations=Donations
+DonationRef=Donation ref.
+Donor=Donor
+AddDonation=Create a donation
+NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation?
+PublicDonation=Public donation
+DonationsArea=Donations area
+DonationStatusPromiseNotValidated=Draft promise
+DonationStatusPromiseValidated=Validated promise
+DonationStatusPaid=Donation received
+DonationStatusPromiseNotValidatedShort=Draft
+DonationStatusPromiseValidatedShort=Validated
+DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDate=Donation date
+DonationDatePayment=Payment date
+ValidPromess=Validate promise
+DonationReceipt=Donation receipt
+DonationsModels=Documents models for donation receipts
+LastModifiedDonations=Latest %s modified donations
+DonationRecipient=Donation recipient
+IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+MinimumAmount=Minimum amount is  %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
+DonationValidated=Donation %s validated
diff --git a/htdocs/langs/az_AZ/ecm.lang b/htdocs/langs/az_AZ/ecm.lang
new file mode 100644
index 00000000000..369ac6dfdfa
--- /dev/null
+++ b/htdocs/langs/az_AZ/ecm.lang
@@ -0,0 +1,52 @@
+# Dolibarr language file - Source file is en_US - ecm
+ECMNbOfDocs=No. of documents in directory
+ECMSection=Directory
+ECMSectionManual=Manual directory
+ECMSectionAuto=Automatic directory
+ECMSectionsManual=Manual tree
+ECMSectionsAuto=Automatic tree
+ECMSections=Directories
+ECMRoot=ECM Root
+ECMNewSection=New directory
+ECMAddSection=Add directory
+ECMCreationDate=Creation date
+ECMNbOfFilesInDir=Number of files in directory
+ECMNbOfSubDir=Number of sub-directories
+ECMNbOfFilesInSubDir=Number of files in sub-directories
+ECMCreationUser=Creator
+ECMArea=DMS/ECM area
+ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.<br>* Manual directories can be used to save documents not linked to a particular element.
+ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
+ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMSearchByKeywords=Search by keywords
+ECMSearchByEntity=Search by object
+ECMSectionOfDocuments=Directories of documents
+ECMTypeAuto=Automatic
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
+ECMDocsByThirdParties=Documents linked to third parties
+ECMDocsByProposals=Documents linked to proposals
+ECMDocsByOrders=Documents linked to customers orders
+ECMDocsByContracts=Documents linked to contracts
+ECMDocsByInvoices=Documents linked to customers invoices
+ECMDocsByProducts=Documents linked to products
+ECMDocsByProjects=Documents linked to projects
+ECMDocsByUsers=Documents linked to users
+ECMDocsByInterventions=Documents linked to interventions
+ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to vendor proposals
+ECMNoDirectoryYet=No directory created
+ShowECMSection=Show directory
+DeleteSection=Remove directory
+ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
+ECMDirectoryForFiles=Relative directory for files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+ECMFileManager=File manager
+ECMSelectASection=Select a directory in the tree...
+DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
+ReSyncListOfDir=Resync list of directories
+HashOfFileContent=Hash of file content
+NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/az_AZ/errors.lang b/htdocs/langs/az_AZ/errors.lang
new file mode 100644
index 00000000000..7c67aeca8b5
--- /dev/null
+++ b/htdocs/langs/az_AZ/errors.lang
@@ -0,0 +1,265 @@
+# Dolibarr language file - Source file is en_US - errors
+
+# No errors
+NoErrorCommitIsDone=No error, we commit
+# Errors
+ErrorButCommitIsDone=Errors found but we validate despite this
+ErrorBadEMail=Email %s is wrong
+ErrorBadUrl=Url %s is wrong
+ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorLoginAlreadyExists=Login %s already exists.
+ErrorGroupAlreadyExists=Group %s already exists.
+ErrorRecordNotFound=Record not found.
+ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
+ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
+ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
+ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
+ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
+ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
+ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
+ErrorBadThirdPartyName=Bad value for third-party name
+ErrorProdIdIsMandatory=The %s is mandatory
+ErrorBadCustomerCodeSyntax=Bad syntax for customer code
+ErrorBadBarCodeSyntax=Bad syntax for barcode. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorCustomerCodeRequired=Customer code required
+ErrorBarCodeRequired=Barcode required
+ErrorCustomerCodeAlreadyUsed=Customer code already used
+ErrorBarCodeAlreadyUsed=Barcode already used
+ErrorPrefixRequired=Prefix required
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
+ErrorBadParameters=Bad parameters
+ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
+ErrorBadDateFormat=Value '%s' has wrong date format
+ErrorWrongDate=Date is not correct!
+ErrorFailedToWriteInDir=Failed to write in directory %s
+ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
+ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
+ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
+ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
+ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
+ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
+ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
+ErrorFileNotFound=File <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
+ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
+ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
+ErrorDirAlreadyExists=A directory with this name already exists.
+ErrorFileAlreadyExists=A file with this name already exists.
+ErrorPartialFile=File not received completely by server.
+ErrorNoTmpDir=Temporary directy %s does not exists.
+ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
+ErrorFileSizeTooLarge=File size is too large.
+ErrorFieldTooLong=Field %s is too long.
+ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum)
+ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum)
+ErrorNoValueForSelectType=Please fill value for select list
+ErrorNoValueForCheckBoxType=Please fill value for checkbox list
+ErrorNoValueForRadioType=Please fill value for radio list
+ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
+ErrorFieldCanNotContainSpecialCharacters=The field <b>%s</b> must not contains special characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
+ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
+ErrorNoAccountancyModuleLoaded=No accountancy module activated
+ErrorExportDuplicateProfil=This profile name already exists for this export set.
+ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
+ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
+ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
+ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
+ErrorRecordHasChildren=Failed to delete record since it has some child records.
+ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
+ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
+ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display.
+ErrorPasswordsMustMatch=Both typed passwords must match each other
+ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
+ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
+ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
+ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
+ErrorsOnXLines=%s errors found
+ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
+ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
+ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
+ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorBadMask=Error on mask
+ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
+ErrorBadMaskBadRazMonth=Error, bad reset value
+ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
+ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
+ErrorSelectAtLeastOne=Error, select at least one entry.
+ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
+ErrorProdIdAlreadyExist=%s is assigned to another third
+ErrorFailedToSendPassword=Failed to send password
+ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
+ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
+ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
+ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
+ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
+ErrorRecordAlreadyExists=Record already exists
+ErrorLabelAlreadyExists=This label already exists
+ErrorCantReadFile=Failed to read file '%s'
+ErrorCantReadDir=Failed to read directory '%s'
+ErrorBadLoginPassword=Bad value for login or password
+ErrorLoginDisabled=Your account has been disabled
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToChangePassword=Failed to change password
+ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
+ErrorLoginHasNoEmail=This user has no email address. Process aborted.
+ErrorBadValueForCode=Bad value for security code. Try again with new value...
+ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice.
+ErrorLinesCantBeNegativeForOneVATRate=Total of lines can't be negative for a given VAT rate.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
+ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
+ErrorNoActivatedBarcode=No barcode type activated
+ErrUnzipFails=Failed to unzip %s with ZipArchive
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
+ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
+ErrorModuleFileRequired=You must select a Dolibarr module package file
+ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
+ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
+ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
+ErrorNewValueCantMatchOldValue=New value can't be equal to old one
+ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
+ErrorFailedToAddContact=Failed to add contact
+ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
+ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
+ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
+ErrorWarehouseMustDiffers=Source and target warehouses must differs
+ErrorBadFormat=Bad format!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
+ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
+ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
+ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Operator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpression23=Unknown or non set variable '%s' in %s
+ErrorPriceExpression24=Variable '%s' exists but has no value
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
+ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
+ErrorSavingChanges=An error has occurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
+ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
+ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
+ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
+ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
+ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
+ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
+ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
+ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
+ErrorTaskAlreadyAssigned=Task already assigned to user
+ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
+ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
+ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
+ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
+ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
+ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
+ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
+ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
+ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
+ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
+ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
+ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
+ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, record is already transferred in accounting, deletion is not possible.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, language is mandatory if you set the page as a translation of another one.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
+ErrorBatchNoFoundForProductInWarehouse=No lot/serial found for product "%s" in warehouse "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this lot/serial for product "%s" in warehouse "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
+ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
+ErrorReplaceStringEmpty=Error, the string to replace into is empty
+# Warnings
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
+WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
+WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
+WarningEnableYourModulesApplications=Click here to enable your modules and applications
+WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.
+WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
+WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
+WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php</b>) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe.
+WarningsOnXLines=Warnings on <b>%s</b> source record(s)
+WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
+WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable the installation/migration tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Omitting the creation of this file is a grave security risk.
+WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
+WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
+WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
+WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
+WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
+WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
+WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
+WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectClosed=Project is closed. You must re-open it first.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
diff --git a/htdocs/langs/az_AZ/exports.lang b/htdocs/langs/az_AZ/exports.lang
new file mode 100644
index 00000000000..3549e3f8b23
--- /dev/null
+++ b/htdocs/langs/az_AZ/exports.lang
@@ -0,0 +1,135 @@
+# Dolibarr language file - Source file is en_US - exports
+ExportsArea=Exports
+ImportArea=Import
+NewExport=New Export
+NewImport=New Import
+ExportableDatas=Exportable dataset
+ImportableDatas=Importable dataset
+SelectExportDataSet=Choose dataset you want to export...
+SelectImportDataSet=Choose dataset you want to import...
+SelectExportFields=Choose the fields you want to export, or select a predefined export profile
+SelectImportFields=Choose the source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
+NotImportedFields=Fields of source file not imported
+SaveExportModel=Save your selections as an export profile/template (for reuse).
+SaveImportModel=Save this import profile (for reuse) ...
+ExportModelName=Export profile name
+ExportModelSaved=Export profile saved as <b>%s</b>.
+ExportableFields=Exportable fields
+ExportedFields=Exported fields
+ImportModelName=Import profile name
+ImportModelSaved=Import profile saved as <b>%s</b>.
+DatasetToExport=Dataset to export
+DatasetToImport=Import file into dataset
+ChooseFieldsOrdersAndTitle=Choose fields order...
+FieldsTitle=Fields title
+FieldTitle=Field title
+NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
+AvailableFormats=Available Formats
+LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
+Step=Step
+FormatedImport=Import Assistant
+FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
+FormatedImportDesc2=First step is to choose the kind of data you want to import, then the format of the source file, then the fields you want to import.
+FormatedExport=Export Assistant
+FormatedExportDesc1=These tools allow the export of personalized data using an assistant, to help you in the process without requiring technical knowledge.
+FormatedExportDesc2=First step is to choose a predefined dataset, then which fields you want to export, and in which order.
+FormatedExportDesc3=When data to export are selected, you can choose the format of the output file.
+Sheet=Sheet
+NoImportableData=No importable data (no module with definitions to allow data imports)
+FileSuccessfullyBuilt=File generated
+SQLUsedForExport=SQL Request used to extract data
+LineId=Id of line
+LineLabel=Label of line
+LineDescription=Description of line
+LineUnitPrice=Unit price of line
+LineVATRate=VAT Rate of line
+LineQty=Quantity for line
+LineTotalHT=Amount excl. tax for line
+LineTotalTTC=Amount with tax for line
+LineTotalVAT=Amount of VAT for line
+TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
+FileWithDataToImport=File with data to import
+FileToImport=Source file to import
+FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SourceFileFormat=Source file format
+FieldsInSourceFile=Fields in source file
+FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+Field=Field
+NoFields=No fields
+MoveField=Move field column number %s
+ExampleOfImportFile=Example_of_import_file
+SaveImportProfile=Save this import profile
+ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name.
+TablesTarget=Targeted tables
+FieldsTarget=Targeted fields
+FieldTarget=Targeted field
+FieldSource=Source field
+NbOfSourceLines=Number of lines in source file
+NowClickToTestTheImport=Check that the file format (field and string delimiters) of your file matches the options shown and that you have omitted the header line, or these will be flagged as errors in the following simulation.<br>Click on the "<b>%s</b>" button to run a check of the file structure/contents and simulate the import process.<br><b>No data will be changed in your database</b>.
+RunSimulateImportFile=Run Import Simulation
+FieldNeedSource=This field requires data from the source file
+SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
+InformationOnSourceFile=Information on source file
+InformationOnTargetTables=Information on target fields
+SelectAtLeastOneField=Switch at least one source field in the column of fields to export
+SelectFormat=Choose this import file format
+RunImportFile=Import Data
+NowClickToRunTheImport=Check the results of the import simulation. Correct any errors and re-test.<br>When the simulation reports no errors you may proceed to import the data into the database.
+DataLoadedWithId=The imported data will have an additional field in each database table with this import id: <b>%s</b>, to allow it to be searchable in the case of investigating a problem related to this import.
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+TooMuchErrors=There are still <b>%s</b> other source lines with errors but output has been limited.
+TooMuchWarnings=There are still <b>%s</b> other source lines with warnings but output has been limited.
+EmptyLine=Empty line (will be discarded)
+CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
+FileWasImported=File was imported with number <b>%s</b>.
+YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
+NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
+NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
+DataComeFromNoWhere=Value to insert comes from nowhere in source file.
+DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
+DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
+DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
+DataIsInsertedInto=Data coming from source file will be inserted into the following field:
+DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
+DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field:
+SourceRequired=Data value is mandatory
+SourceExample=Example of possible data value
+ExampleAnyRefFoundIntoElement=Any ref found for element <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
+CSVFormatDesc=<b>Comma Separated Value</b> file format (.csv).<br>This is a text file format where fields are separated by a separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ].
+Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is the native Excel 95 format (BIFF5).
+Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is the native Excel 2007 format (SpreadsheetML).
+TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
+ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate record (with this field added, all lines will own their own id and will differ).
+CsvOptions=CSV format options
+Separator=Field Separator
+Enclosure=String Delimiter
+SpecialCode=Special code
+ExportStringFilter=%% allows replacing one or more characters in the text
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD: filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD: filters on all previous years/months/days
+ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+ImportFromToLine=Limit range (From - To). Eg. to omit header line(s).
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines.<br>If the header lines are NOT omitted, this will result in multiple errors in the Import Simulation.
+KeepEmptyToGoToEndOfFile=Keep this field empty to process all lines to the end of the file.
+SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for an UPDATE import
+UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
+NoUpdateAttempt=No update attempt was performed, only insert
+ImportDataset_user_1=Users (employees or not) and properties
+ComputedField=Computed field
+## filters
+SelectFilterFields=If you want to filter on some values, just input values here.
+FilteredFields=Filtered fields
+FilteredFieldsValues=Value for filter
+FormatControlRule=Format control rule
+## imports updates
+KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
+NbInsert=Number of inserted lines: %s
+NbUpdate=Number of updated lines: %s
+MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
diff --git a/htdocs/langs/az_AZ/externalsite.lang b/htdocs/langs/az_AZ/externalsite.lang
new file mode 100644
index 00000000000..da4853df0df
--- /dev/null
+++ b/htdocs/langs/az_AZ/externalsite.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExternalSiteSetup=Setup link to external website
+ExternalSiteURL=External Site URL
+ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/az_AZ/ftp.lang b/htdocs/langs/az_AZ/ftp.lang
new file mode 100644
index 00000000000..d80b87c2715
--- /dev/null
+++ b/htdocs/langs/az_AZ/ftp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - ftp
+FTPClientSetup=FTP Client module setup
+NewFTPClient=New FTP connection setup
+FTPArea=FTP Area
+FTPAreaDesc=This screen shows a view of an FTP server.
+SetupOfFTPClientModuleNotComplete=The setup of the FTP client module seems to be incomplete
+FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
+FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
+FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
+FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
+FTPPassiveMode=Passive mode
+ChooseAFTPEntryIntoMenu=Choose a FTP site from the menu...
+FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/az_AZ/help.lang b/htdocs/langs/az_AZ/help.lang
new file mode 100644
index 00000000000..048de16d3c0
--- /dev/null
+++ b/htdocs/langs/az_AZ/help.lang
@@ -0,0 +1,23 @@
+# Dolibarr language file - Source file is en_US - help
+CommunitySupport=Forum/Wiki support
+EMailSupport=Emails support
+RemoteControlSupport=Online real-time / remote support
+OtherSupport=Other support
+ToSeeListOfAvailableRessources=To contact/see available resources:
+HelpCenter=Help Center
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
+TypeSupportCommunauty=Community (free)
+TypeSupportCommercial=Commercial
+TypeOfHelp=Type
+NeedHelpCenter=Need help or support?
+Efficiency=Efficiency
+TypeHelpOnly=Help only
+TypeHelpDev=Help+Development
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
+PossibleLanguages=Supported languages
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
+SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/az_AZ/holiday.lang b/htdocs/langs/az_AZ/holiday.lang
new file mode 100644
index 00000000000..82de49f9c5f
--- /dev/null
+++ b/htdocs/langs/az_AZ/holiday.lang
@@ -0,0 +1,133 @@
+# Dolibarr language file - Source file is en_US - holiday
+HRM=HRM
+Holidays=Leave
+CPTitreMenu=Leave
+MenuReportMonth=Monthly statement
+MenuAddCP=New leave request
+NotActiveModCP=You must enable the module Leave to view this page.
+AddCP=Make a leave request
+DateDebCP=Start date
+DateFinCP=End date
+DraftCP=Draft
+ToReviewCP=Awaiting approval
+ApprovedCP=Approved
+CancelCP=Canceled
+RefuseCP=Refused
+ValidatorCP=Approbator
+ListeCP=List of leave
+LeaveId=Leave ID
+ReviewedByCP=Will be approved by
+UserID=User ID
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
+DescCP=Description
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
+ErrorEndDateCP=You must select an end date greater than the start date.
+ErrorSQLCreateCP=An SQL error occurred during the creation:
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
+ReturnCP=Return to previous page
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosWorkflowCP=Information Workflow
+RequestByCP=Requested by
+TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
+NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DayIsANonWorkingDay=%s is a non working day
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
+EditCP=Edit
+DeleteCP=Delete
+ActionRefuseCP=Refuse
+ActionCancelCP=Cancel
+StatutCP=Status
+TitleDeleteCP=Delete the leave request
+ConfirmDeleteCP=Confirm the deletion of this leave request?
+ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
+CantCreateCP=You don't have the right to make leave requests.
+InvalidValidatorCP=You must choose an approbator to your leave request.
+NoDateDebut=You must select a start date.
+NoDateFin=You must select an end date.
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
+ConfirmValidCP=Are you sure you want to approve the leave request?
+DateValidCP=Date approved
+TitleToValidCP=Send leave request
+ConfirmToValidCP=Are you sure you want to send the leave request?
+TitleRefuseCP=Refuse the leave request
+ConfirmRefuseCP=Are you sure you want to refuse the leave request?
+NoMotifRefuseCP=You must choose a reason for refusing the request.
+TitleCancelCP=Cancel the leave request
+ConfirmCancelCP=Are you sure you want to cancel the leave request?
+DetailRefusCP=Reason for refusal
+DateRefusCP=Date of refusal
+DateCancelCP=Date of cancellation
+DefineEventUserCP=Assign an exceptional leave for a user
+addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
+MotifCP=Reason
+UserCP=User
+ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
+AddEventToUserOkCP=The addition of the exceptional leave has been completed.
+MenuLogCP=View change logs
+LogCP=Log of updates of available vacation days
+ActionByCP=Performed by
+UserUpdateCP=For the user
+PrevSoldeCP=Previous Balance
+NewSoldeCP=New Balance
+alreadyCPexist=A leave request has already been done on this period.
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
+BoxTitleLastLeaveRequests=Latest %s modified leave requests
+HolidaysMonthlyUpdate=Monthly update
+ManualUpdate=Manual update
+HolidaysCancelation=Leave request cancelation
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
+## Configuration du Module ##
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
+UpdateConfCPOK=Updated successfully.
+Module27130Name= Management of leave requests
+Module27130Desc= Management of leave requests
+ErrorMailNotSend=An error occurred while sending email:
+NoticePeriod=Notice period
+#Messages
+HolidaysToValidate=Validate leave requests
+HolidaysToValidateBody=Below is a leave request to validate
+HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
+HolidaysValidated=Validated leave requests
+HolidaysValidatedBody=Your leave request for %s to %s has been validated.
+HolidaysRefused=Request denied
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
+HolidaysCanceled=Canceled leaved request
+HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
+FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
+NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
+NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
diff --git a/htdocs/langs/az_AZ/hrm.lang b/htdocs/langs/az_AZ/hrm.lang
new file mode 100644
index 00000000000..3697c47e30d
--- /dev/null
+++ b/htdocs/langs/az_AZ/hrm.lang
@@ -0,0 +1,18 @@
+# Dolibarr language file - en_US - hrm
+# Admin
+HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
+Establishments=Establishments
+Establishment=Establishment
+NewEstablishment=New establishment
+DeleteEstablishment=Delete establishment
+ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
+OpenEtablishment=Open establishment
+CloseEtablishment=Close establishment
+# Dictionary
+DictionaryPublicHolidays=HRM - Public holidays
+DictionaryDepartment=HRM - Department list
+DictionaryFunction=HRM - Function list
+# Module
+Employees=Employees
+Employee=Employee
+NewEmployee=New employee
diff --git a/htdocs/langs/az_AZ/install.lang b/htdocs/langs/az_AZ/install.lang
new file mode 100644
index 00000000000..f67dff57184
--- /dev/null
+++ b/htdocs/langs/az_AZ/install.lang
@@ -0,0 +1,223 @@
+# Dolibarr language file - Source file is en_US - install
+InstallEasy=Just follow the instructions step by step.
+MiscellaneousChecks=Prerequisites check
+ConfFileExists=Configuration file <b>%s</b> exists.
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
+ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
+ConfFileReload=Reloading parameters from configuration file.
+PHPSupportSessions=This PHP supports sessions.
+PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportCalendar=This PHP supports calendars extensions.
+PHPSupportUTF8=This PHP supports UTF8 functions.
+PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupport=This PHP supports %s functions.
+PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
+ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
+ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
+ErrorDirDoesNotExists=Directory %s does not exist.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
+ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
+ErrorFailedToCreateDatabase=Failed to create database '%s'.
+ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
+ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
+ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
+ErrorDatabaseAlreadyExists=Database '%s' already exists.
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
+IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
+PHPVersion=PHP Version
+License=Using license
+ConfigurationFile=Configuration file
+WebPagesDirectory=Directory where web pages are stored
+DocumentsDirectory=Directory to store uploaded and generated documents
+URLRoot=URL Root
+ForceHttps=Force secure connections (https)
+CheckToForceHttps=Check this option to force secure connections (https).<br>This requires that the web server is configured with an SSL certificate.
+DolibarrDatabase=Dolibarr Database
+DatabaseType=Database type
+DriverType=Driver type
+Server=Server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
+ServerPortDescription=Database server port. Keep empty if unknown.
+DatabaseServer=Database server
+DatabaseName=Database name
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
+AdminPassword=Password for Dolibarr database owner.
+CreateDatabase=Create database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
+DatabaseSuperUserAccess=Database server - Superuser access
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
+ServerConnection=Server connection
+DatabaseCreation=Database creation
+CreateDatabaseObjects=Database objects creation
+ReferenceDataLoading=Reference data loading
+TablesAndPrimaryKeysCreation=Tables and Primary keys creation
+CreateTableAndPrimaryKey=Create table %s
+CreateOtherKeysForTable=Create foreign keys and indexes for table %s
+OtherKeysCreation=Foreign keys and indexes creation
+FunctionsCreation=Functions creation
+AdminAccountCreation=Administrator login creation
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
+SetupEnd=End of setup
+SystemIsInstalled=This installation is complete.
+SystemIsUpgraded=Dolibarr has been upgraded successfully.
+YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below:
+AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
+GoToDolibarr=Go to Dolibarr
+GoToSetupArea=Go to Dolibarr (setup area)
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
+GoToUpgradePage=Go to upgrade page again
+WithNoSlashAtTheEnd=Without the slash "/" at the end
+DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
+LoginAlreadyExists=Already exists
+DolibarrAdminLogin=Dolibarr admin login
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
+FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
+ChoosedMigrateScript=Choose migration script
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
+ProcessMigrateScript=Script processing
+ChooseYourSetupMode=Choose your setup mode and click "Start"...
+FreshInstall=Fresh install
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
+Upgrade=Upgrade
+UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
+Start=Start
+InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
+YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
+AlreadyDone=Already migrated
+DatabaseVersion=Database version
+ServerVersion=Database server version
+YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
+DBSortingCollation=Character sorting order
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
+OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
+RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
+FieldRenamed=Field renamed
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
+InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
+InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
+IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
+OpenBaseDir=PHP openbasedir parameter
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
+MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
+MigrationShippingDelivery=Upgrade storage of shipping
+MigrationShippingDelivery2=Upgrade storage of shipping 2
+MigrationFinished=Migration finished
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
+ActivateModule=Activate module %s
+ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
+SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
+NothingToDelete=Nothing to clean/delete
+NothingToDo=Nothing to do
+#########
+# upgrade
+MigrationFixData=Fix for denormalized data
+MigrationOrder=Data migration for customer's orders
+MigrationSupplierOrder=Data migration for vendor's orders
+MigrationProposal=Data migration for commercial proposals
+MigrationInvoice=Data migration for customer's invoices
+MigrationContract=Data migration for contracts
+MigrationSuccessfullUpdate=Upgrade successful
+MigrationUpdateFailed=Failed upgrade process
+MigrationRelationshipTables=Data migration for relationship tables (%s)
+MigrationPaymentsUpdate=Payment data correction
+MigrationPaymentsNumberToUpdate=%s payment(s) to update
+MigrationProcessPaymentUpdate=Update payment(s) %s
+MigrationPaymentsNothingToUpdate=No more things to do
+MigrationPaymentsNothingUpdatable=No more payments that can be corrected
+MigrationContractsUpdate=Contract data correction
+MigrationContractsNumberToUpdate=%s contract(s) to update
+MigrationContractsLineCreation=Create contract line for contract ref %s
+MigrationContractsNothingToUpdate=No more things to do
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
+MigrationContractsEmptyDatesUpdate=Contract empty date correction
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
+MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
+MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
+MigrationContractsInvalidDatesUpdate=Bad value date contract correction
+MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s)
+MigrationContractsInvalidDatesNumber=%s contracts modified
+MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct
+MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction
+MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
+MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct
+MigrationReopeningContracts=Open contract closed by error
+MigrationReopenThisContract=Reopen contract %s
+MigrationReopenedContractsNumber=%s contracts modified
+MigrationReopeningContractsNothingToUpdate=No closed contract to open
+MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
+MigrationBankTransfertsNothingToUpdate=All links are up to date
+MigrationShipmentOrderMatching=Sendings receipt update
+MigrationDeliveryOrderMatching=Delivery receipt update
+MigrationDeliveryDetail=Delivery update
+MigrationStockDetail=Update stock value of products
+MigrationMenusDetail=Update dynamic menus tables
+MigrationDeliveryAddress=Update delivery address in shipments
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
+MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
+MigrationProjectTaskTime=Update time spent in seconds
+MigrationActioncommElement=Update data on actions
+MigrationPaymentMode=Data migration for payment type
+MigrationCategorieAssociation=Migration of categories
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
+MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
+MigrationReloadModule=Reload module %s
+MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
+ClickHereToGoToApp=Click here to go to your application
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/az_AZ/interventions.lang b/htdocs/langs/az_AZ/interventions.lang
new file mode 100644
index 00000000000..e5936f8246e
--- /dev/null
+++ b/htdocs/langs/az_AZ/interventions.lang
@@ -0,0 +1,66 @@
+# Dolibarr language file - Source file is en_US - interventions
+Intervention=Intervention
+Interventions=Interventions
+InterventionCard=Intervention card
+NewIntervention=New intervention
+AddIntervention=Create intervention
+ChangeIntoRepeatableIntervention=Change to repeatable intervention
+ListOfInterventions=List of interventions
+ActionsOnFicheInter=Actions on intervention
+LastInterventions=Latest %s interventions
+AllInterventions=All interventions
+CreateDraftIntervention=Create draft
+InterventionContact=Intervention contact
+DeleteIntervention=Delete intervention
+ValidateIntervention=Validate intervention
+ModifyIntervention=Modify intervention
+DeleteInterventionLine=Delete intervention line
+ConfirmDeleteIntervention=Are you sure you want to delete this intervention?
+ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
+ConfirmModifyIntervention=Are you sure you want to modify this intervention?
+ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line?
+ConfirmCloneIntervention=Are you sure you want to clone this intervention?
+NameAndSignatureOfInternalContact=Name and signature of intervening:
+NameAndSignatureOfExternalContact=Name and signature of customer:
+DocumentModelStandard=Standard document model for interventions
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
+InterventionClassifyDone=Classify "Done"
+StatusInterInvoiced=Billed
+SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by email
+InterventionDeletedInDolibarr=Intervention %s deleted
+InterventionsArea=Interventions area
+DraftFichinter=Draft interventions
+LastModifiedInterventions=Latest %s modified interventions
+FichinterToProcess=Interventions to process
+TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
+PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
+PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
+UseDurationOnFichinter=Hides the duration field for intervention records
+UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records
+InterventionStatistics=Statistics of interventions
+NbOfinterventions=No. of intervention cards
+NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
+InterId=Intervention id
+InterRef=Intervention ref.
+InterDateCreation=Date creation intervention
+InterDuration=Duration intervention
+InterStatus=Status intervention
+InterNote=Note intervention
+InterLine=Line of intervention
+InterLineId=Line id intervention
+InterLineDate=Line date intervention
+InterLineDuration=Line duration intervention
+InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/az_AZ/languages.lang b/htdocs/langs/az_AZ/languages.lang
new file mode 100644
index 00000000000..6185183161b
--- /dev/null
+++ b/htdocs/langs/az_AZ/languages.lang
@@ -0,0 +1,89 @@
+# Dolibarr language file - Source file is en_US - languages
+Language_ar_AR=Arabic
+Language_ar_EG=Arabic (Egypt)
+Language_ar_SA=Arabic
+Language_bn_BD=Bengali
+Language_bg_BG=Bulgarian
+Language_bs_BA=Bosnian
+Language_ca_ES=Catalan
+Language_cs_CZ=Czech
+Language_da_DA=Danish
+Language_da_DK=Danish
+Language_de_DE=German
+Language_de_AT=German (Austria)
+Language_de_CH=German (Switzerland)
+Language_el_GR=Greek
+Language_el_CY=Greek (Cyprus)
+Language_en_AU=English (Australia)
+Language_en_CA=English (Canada)
+Language_en_GB=English (United Kingdom)
+Language_en_IN=English (India)
+Language_en_NZ=English (New Zealand)
+Language_en_SA=English (Saudi Arabia)
+Language_en_US=English (United States)
+Language_en_ZA=English (South Africa)
+Language_es_ES=Spanish
+Language_es_AR=Spanish (Argentina)
+Language_es_BO=Spanish (Bolivia)
+Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
+Language_es_EC=Spanish (Ecuador)
+Language_es_HN=Spanish (Honduras)
+Language_es_MX=Spanish (Mexico)
+Language_es_PA=Spanish (Panama)
+Language_es_PY=Spanish (Paraguay)
+Language_es_PE=Spanish (Peru)
+Language_es_PR=Spanish (Puerto Rico)
+Language_es_UY=Spanish (Uruguay)
+Language_es_VE=Spanish (Venezuela)
+Language_et_EE=Estonian
+Language_eu_ES=Basque
+Language_fa_IR=Persian
+Language_fi_FI=Finnish
+Language_fr_BE=French (Belgium)
+Language_fr_CA=French (Canada)
+Language_fr_CH=French (Switzerland)
+Language_fr_FR=French
+Language_fr_NC=French (New Caledonia)
+Language_fy_NL=Frisian
+Language_he_IL=Hebrew
+Language_hr_HR=Croatian
+Language_hu_HU=Hungarian
+Language_id_ID=Indonesian
+Language_is_IS=Icelandic
+Language_it_IT=Italian
+Language_ja_JP=Japanese
+Language_ka_GE=Georgian
+Language_km_KH=Khmer
+Language_kn_IN=Kannada
+Language_ko_KR=Korean
+Language_lo_LA=Lao
+Language_lt_LT=Lithuanian
+Language_lv_LV=Latvian
+Language_mk_MK=Macedonian
+Language_mn_MN=Mongolian
+Language_nb_NO=Norwegian (Bokmål)
+Language_nl_BE=Dutch (Belgium)
+Language_nl_NL=Dutch
+Language_pl_PL=Polish
+Language_pt_BR=Portuguese (Brazil)
+Language_pt_PT=Portuguese
+Language_ro_RO=Romanian
+Language_ru_RU=Russian
+Language_ru_UA=Russian (Ukraine)
+Language_tr_TR=Turkish
+Language_sl_SI=Slovenian
+Language_sv_SV=Swedish
+Language_sv_SE=Swedish
+Language_sq_AL=Albanian
+Language_sk_SK=Slovakian
+Language_sr_RS=Serbian
+Language_sw_SW=Kiswahili
+Language_th_TH=Thai
+Language_uk_UA=Ukrainian
+Language_uz_UZ=Uzbek
+Language_vi_VN=Vietnamese
+Language_zh_CN=Chinese
+Language_zh_TW=Chinese (Traditional)
+Language_bh_MY=Malay
diff --git a/htdocs/langs/az_AZ/ldap.lang b/htdocs/langs/az_AZ/ldap.lang
new file mode 100644
index 00000000000..8b6f0864215
--- /dev/null
+++ b/htdocs/langs/az_AZ/ldap.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - ldap
+YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
+UserMustChangePassNextLogon=User must change password on the domain %s
+LDAPInformationsForThisContact=Information in LDAP database for this contact
+LDAPInformationsForThisUser=Information in LDAP database for this user
+LDAPInformationsForThisGroup=Information in LDAP database for this group
+LDAPInformationsForThisMember=Information in LDAP database for this member
+LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPAttributes=LDAP attributes
+LDAPCard=LDAP card
+LDAPRecordNotFound=Record not found in LDAP database
+LDAPUsers=Users in LDAP database
+LDAPFieldStatus=Status
+LDAPFieldFirstSubscriptionDate=First subscription date
+LDAPFieldFirstSubscriptionAmount=First subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example: skypeName
+UserSynchronized=User synchronized
+GroupSynchronized=Group synchronized
+MemberSynchronized=Member synchronized
+MemberTypeSynchronized=Member type synchronized
+ContactSynchronized=Contact synchronized
+ForceSynchronize=Force synchronizing Dolibarr -> LDAP
+ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/az_AZ/link.lang b/htdocs/langs/az_AZ/link.lang
new file mode 100644
index 00000000000..1ffcd41a18b
--- /dev/null
+++ b/htdocs/langs/az_AZ/link.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - languages
+LinkANewFile=Link a new file/document
+LinkedFiles=Linked files and documents
+NoLinkFound=No registered links
+LinkComplete=The file has been linked successfully
+ErrorFileNotLinked=The file could not be linked
+LinkRemoved=The link %s has been removed
+ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
+ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+URLToLink=URL to link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/az_AZ/loan.lang b/htdocs/langs/az_AZ/loan.lang
new file mode 100644
index 00000000000..534dee08867
--- /dev/null
+++ b/htdocs/langs/az_AZ/loan.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+LoanPayment=Loan payment
+ShowLoanPayment=Show Loan Payment
+LoanCapital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+Term=Term
+LoanAccountancyCapitalCode=Accounting account capital
+LoanAccountancyInsuranceCode=Accounting account insurance
+LoanAccountancyInterestCode=Accounting account interest
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ListLoanAssociatedProject=List of loan associated with the project
+AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
+CreateCalcSchedule=Edit financial commitment
diff --git a/htdocs/langs/az_AZ/mailmanspip.lang b/htdocs/langs/az_AZ/mailmanspip.lang
new file mode 100644
index 00000000000..bab4b3576b4
--- /dev/null
+++ b/htdocs/langs/az_AZ/mailmanspip.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - mailmanspip
+MailmanSpipSetup=Mailman and SPIP module Setup
+MailmanTitle=Mailman mailing list system
+TestSubscribe=To test subscription to Mailman lists
+TestUnSubscribe=To test unsubscribe from Mailman lists
+MailmanCreationSuccess=Subscription test was executed successfully
+MailmanDeletionSuccess=Unsubscription test was executed successfully
+SynchroMailManEnabled=A Mailman update will be performed
+SynchroSpipEnabled=A Spip update will be performed
+DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
+DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
+DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
+DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
+SPIPTitle=SPIP Content Management System
+DescADHERENT_SPIP_SERVEUR=SPIP Server
+DescADHERENT_SPIP_DB=SPIP database name
+DescADHERENT_SPIP_USER=SPIP database login
+DescADHERENT_SPIP_PASS=SPIP database password
+AddIntoSpip=Add into SPIP
+AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
+AddIntoSpipError=Failed to add the user in SPIP
+DeleteIntoSpip=Remove from SPIP
+DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
+DeleteIntoSpipError=Failed to suppress the user from SPIP
+SPIPConnectionFailed=Failed to connect to SPIP
+SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
+SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
diff --git a/htdocs/langs/az_AZ/mails.lang b/htdocs/langs/az_AZ/mails.lang
new file mode 100644
index 00000000000..7b3bfd3852a
--- /dev/null
+++ b/htdocs/langs/az_AZ/mails.lang
@@ -0,0 +1,170 @@
+# Dolibarr language file - Source file is en_US - mails
+Mailing=EMailing
+EMailing=EMailing
+EMailings=EMailings
+AllEMailings=All eMailings
+MailCard=EMailing card
+MailRecipients=Recipients
+MailRecipient=Recipient
+MailTitle=Description
+MailFrom=Sender
+MailErrorsTo=Errors to
+MailReply=Reply to
+MailTo=Receiver(s)
+MailToUsers=To user(s)
+MailCC=Copy to
+MailToCCUsers=Copy to users(s)
+MailCCC=Cached copy to
+MailTopic=Email topic
+MailText=Message
+MailFile=Attached files
+MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
+ShowEMailing=Show emailing
+ListOfEMailings=List of emailings
+NewMailing=New emailing
+EditMailing=Edit emailing
+ResetMailing=Resend emailing
+DeleteMailing=Delete emailing
+DeleteAMailing=Delete an emailing
+PreviewMailing=Preview emailing
+CreateMailing=Create emailing
+TestMailing=Test email
+ValidMailing=Valid emailing
+MailingStatusDraft=Draft
+MailingStatusValidated=Validated
+MailingStatusSent=Sent
+MailingStatusSentPartialy=Sent partially
+MailingStatusSentCompletely=Sent completely
+MailingStatusError=Error
+MailingStatusNotSent=Not sent
+MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
+MailingSuccessfullyValidated=EMailing successfully validated
+MailUnsubcribe=Unsubscribe
+MailingStatusNotContact=Don't contact anymore
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
+ErrorMailRecipientIsEmpty=Email recipient is empty
+WarningNoEMailsAdded=No new Email to add to recipient's list.
+ConfirmValidMailing=Are you sure you want to validate this emailing?
+ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
+ConfirmDeleteMailing=Are you sure you want to delete this emailing?
+NbOfUniqueEMails=No. of unique emails
+NbOfEMails=No. of EMails
+TotalNbOfDistinctRecipients=Number of distinct recipients
+NoTargetYet=No recipients defined yet (Go on tab 'Recipients')
+NoRecipientEmail=No recipient email for %s
+RemoveRecipient=Remove recipient
+YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README.
+EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values
+MailingAddFile=Attach this file
+NoAttachedFiles=No attached files
+BadEMail=Bad value for Email
+ConfirmCloneEMailing=Are you sure you want to clone this emailing?
+CloneContent=Clone message
+CloneReceivers=Cloner recipients
+DateLastSend=Date of latest sending
+DateSending=Date sending
+SentTo=Sent to <b>%s</b>
+MailingStatusRead=Read
+YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubscribe from mailing list
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubscribe" feature
+EMailSentToNRecipients=Email sent to %s recipients.
+EMailSentForNElements=Email sent for %s elements.
+XTargetsAdded=<b>%s</b> recipients added into target list
+OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachments in mass sending in this version).
+AllRecipientSelected=The recipients of the %s record selected (if their email is known).
+GroupEmails=Group emails
+OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
+WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
+ResultOfMailSending=Result of mass Email sending
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
+SentXXXmessages=%s message(s) sent.
+ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
+MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
+MailingModuleDescContactsByCompanyCategory=Contacts by third-party category
+MailingModuleDescContactsByCategory=Contacts by categories
+MailingModuleDescContactsByFunction=Contacts by position
+MailingModuleDescEmailsFromFile=Emails from file
+MailingModuleDescEmailsFromUser=Emails input by user
+MailingModuleDescDolibarrUsers=Users with Emails
+MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+
+# Libelle des modules de liste de destinataires mailing
+LineInFile=Line %s in file
+RecipientSelectionModules=Defined requests for recipient's selection
+MailSelectedRecipients=Selected recipients
+MailingArea=EMailings area
+LastMailings=Latest %s emailings
+TargetsStatistics=Targets statistics
+NbOfCompaniesContacts=Unique contacts/addresses
+MailNoChangePossible=Recipients for validated emailing can't be changed
+SearchAMailing=Search mailing
+SendMailing=Send emailing
+SentBy=Sent by
+MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
+MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
+ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+TargetsReset=Clear list
+ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
+ToAddRecipientsChooseHere=Add recipients by choosing from the lists
+NbOfEMailingsReceived=Mass emailings received
+NbOfEMailingsSend=Mass emailings sent
+IdRecord=ID record
+DeliveryReceipt=Delivery Ack.
+YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
+TagCheckMail=Track mail opening
+TagUnsubscribe=Unsubscribe link
+TagSignature=Signature of sending user
+EMailRecipient=Recipient Email
+TagMailtoEmail=Recipient Email (including html "mailto:" link)
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
+# Module Notifications
+Notifications=Notifications
+NoNotificationsWillBeSent=No email notifications are planned for this event and company
+ANotificationsWillBeSent=1 notification will be sent by email
+SomeNotificationsWillBeSent=%s notifications will be sent by email
+AddNewNotification=Activate a new email notification target/event
+ListOfActiveNotifications=List all active targets/events for email notification
+ListOfNotificationsDone=List all email notifications sent
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
+UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
+UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
+MailAdvTargetRecipients=Recipients (advanced selection)
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchIntHelp=Use interval to select int or float value
+AdvTgtMinVal=Minimum value
+AdvTgtMaxVal=Maximum value
+AdvTgtSearchDtHelp=Use interval to select date value
+AdvTgtStartDt=Start dt.
+AdvTgtEndDt=End dt.
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third-party email or just contact email
+AdvTgtTypeOfIncude=Type of targeted email
+AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
+AddAll=Add all
+RemoveAll=Remove all
+ItemsCount=Item(s)
+AdvTgtNameTemplate=Filter name
+AdvTgtAddContact=Add emails according to criteria
+AdvTgtLoadFilter=Load filter
+AdvTgtDeleteFilter=Delete filter
+AdvTgtSaveFilter=Save filter
+AdvTgtCreateFilter=Create filter
+AdvTgtOrCreateNewFilter=Name of new filter
+NoContactWithCategoryFound=No contact/address with a category found
+NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+DefaultOutgoingEmailSetup=Default outgoing email setup
+Information=Information
+ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/az_AZ/main.lang b/htdocs/langs/az_AZ/main.lang
new file mode 100644
index 00000000000..824a5e495b8
--- /dev/null
+++ b/htdocs/langs/az_AZ/main.lang
@@ -0,0 +1,1035 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+# Note for Chinese:
+# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
+# stsongstdlight or cid0cs are for simplified Chinese
+# To read Chinese pdf with Linux: sudo apt-get install poppler-data
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
+DatabaseConnection=Database connection
+NoTemplateDefined=No template available for this email type
+AvailableVariables=Available substitution variables
+NoTranslation=No translation
+Translation=Translation
+EmptySearchString=Enter a non empty search string
+NoRecordFound=No record found
+NoRecordDeleted=No record deleted
+NotEnoughDataYet=Not enough data
+NoError=No error
+Error=Error
+Errors=Errors
+ErrorFieldRequired=Field '%s' is required
+ErrorFieldFormat=Field '%s' has a bad value
+ErrorFileDoesNotExists=File %s does not exist
+ErrorFailedToOpenFile=Failed to open file %s
+ErrorCanNotCreateDir=Cannot create dir %s
+ErrorCanNotReadDir=Cannot read dir %s
+ErrorConstantNotDefined=Parameter %s not defined
+ErrorUnknown=Unknown error
+ErrorSQL=SQL Error
+ErrorLogoFileNotFound=Logo file '%s' was not found
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
+ErrorGoToModuleSetup=Go to Module setup to fix this
+ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
+ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
+ErrorInternalErrorDetected=Error detected
+ErrorWrongHostParameter=Wrong host parameter
+ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post the form again.
+ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child record.
+ErrorWrongValue=Wrong value
+ErrorWrongValueForParameterX=Wrong value for parameter %s
+ErrorNoRequestInError=No request in error
+ErrorServiceUnavailableTryLater=Service not available at the moment. Try again later.
+ErrorDuplicateField=Duplicate value in a unique field
+ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back.
+ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
+ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
+ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
+ErrorFailedToSaveFile=Error, failed to save file.
+ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
+MaxNbOfRecordPerPage=Max. number of records per page
+NotAuthorized=You are not authorized to do that.
+SetDate=Set date
+SelectDate=Select a date
+SeeAlso=See also %s
+SeeHere=See here
+ClickHere=Click here
+Here=Here
+Apply=Apply
+BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
+FileGenerated=The file was successfully generated
+FileSaved=The file was successfully saved
+FileUploaded=The file was successfully uploaded
+FileTransferComplete=File(s) uploaded successfully
+FilesDeleted=File(s) successfully deleted
+FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
+NbOfEntries=No. of entries
+GoToWikiHelpPage=Read online help (Internet access needed)
+GoToHelpPage=Read help
+RecordSaved=Record saved
+RecordDeleted=Record deleted
+RecordGenerated=Record generated
+LevelOfFeature=Level of features
+NotDefined=Not defined
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
+Administrator=Administrator
+Undefined=Undefined
+PasswordForgotten=Password forgotten?
+NoAccount=No account?
+SeeAbove=See above
+HomeArea=Home
+LastConnexion=Last login
+PreviousConnexion=Previous login
+PreviousValue=Previous value
+ConnectedOnMultiCompany=Connected on environment
+ConnectedSince=Connected since
+AuthenticationMode=Authentication mode
+RequestedUrl=Requested URL
+DatabaseTypeManager=Database type manager
+RequestLastAccessInError=Latest database access request error
+ReturnCodeLastAccessInError=Return code for latest database access request error
+InformationLastAccessInError=Information for latest database access request error
+DolibarrHasDetectedError=Dolibarr has detected a technical error
+YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices)
+MoreInformation=More information
+TechnicalInformation=Technical information
+TechnicalID=Technical ID
+LineID=Line ID
+NotePublic=Note (public)
+NotePrivate=Note (private)
+PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
+DoTest=Test
+ToFilter=Filter
+NoFilter=No filter
+WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
+yes=yes
+Yes=Yes
+no=no
+No=No
+All=All
+Home=Home
+Help=Help
+OnlineHelp=Online help
+PageWiki=Wiki page
+MediaBrowser=Media browser
+Always=Always
+Never=Never
+Under=under
+Period=Period
+PeriodEndDate=End date for period
+SelectedPeriod=Selected period
+PreviousPeriod=Previous period
+Activate=Activate
+Activated=Activated
+Closed=Closed
+Closed2=Closed
+NotClosed=Not closed
+Enabled=Enabled
+Enable=Enable
+Deprecated=Deprecated
+Disable=Disable
+Disabled=Disabled
+Add=Add
+AddLink=Add link
+RemoveLink=Remove link
+AddToDraft=Add to draft
+Update=Update
+Close=Close
+CloseBox=Remove widget from your dashboard
+Confirm=Confirm
+ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
+Delete=Delete
+Remove=Remove
+Resiliate=Terminate
+Cancel=Cancel
+Modify=Modify
+Edit=Edit
+Validate=Validate
+ValidateAndApprove=Validate and Approve
+ToValidate=To validate
+NotValidated=Not validated
+Save=Save
+SaveAs=Save As
+SaveAndStay=Save and stay
+SaveAndNew=Save and new
+TestConnection=Test connection
+ToClone=Clone
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
+ConfirmClone=Choose data you want to clone:
+NoCloneOptionsSpecified=No data to clone defined.
+Of=of
+Go=Go
+Run=Run
+CopyOf=Copy of
+Show=Show
+Hide=Hide
+ShowCardHere=Show card
+Search=Search
+SearchOf=Search
+SearchMenuShortCut=Ctrl + shift + f
+Valid=Valid
+Approve=Approve
+Disapprove=Disapprove
+ReOpen=Re-Open
+Upload=Upload
+ToLink=Link
+Select=Select
+Choose=Choose
+Resize=Resize
+ResizeOrCrop=Resize or Crop
+Recenter=Recenter
+Author=Author
+User=User
+Users=Users
+Group=Group
+Groups=Groups
+NoUserGroupDefined=No user group defined
+Password=Password
+PasswordRetype=Retype your password
+NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
+Name=Name
+NameSlashCompany=Name / Company
+Person=Person
+Parameter=Parameter
+Parameters=Parameters
+Value=Value
+PersonalValue=Personal value
+NewObject=New %s
+NewValue=New value
+CurrentValue=Current value
+Code=Code
+Type=Type
+Language=Language
+MultiLanguage=Multi-language
+Note=Note
+Title=Title
+Label=Label
+RefOrLabel=Ref. or label
+Info=Log
+Family=Family
+Description=Description
+Designation=Description
+DescriptionOfLine=Description of line
+DateOfLine=Date of line
+DurationOfLine=Duration of line
+Model=Doc template
+DefaultModel=Default doc template
+Action=Event
+About=About
+Number=Number
+NumberByMonth=Number by month
+AmountByMonth=Amount by month
+Numero=Number
+Limit=Limit
+Limits=Limits
+Logout=Logout
+NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
+Connection=Login
+Setup=Setup
+Alert=Alert
+MenuWarnings=Alerts
+Previous=Previous
+Next=Next
+Cards=Cards
+Card=Card
+Now=Now
+HourStart=Start hour
+Date=Date
+DateAndHour=Date and hour
+DateToday=Today's date
+DateReference=Reference date
+DateStart=Start date
+DateEnd=End date
+DateCreation=Creation date
+DateCreationShort=Creat. date
+DateModification=Modification date
+DateModificationShort=Modif. date
+DateLastModification=Latest modification date
+DateValidation=Validation date
+DateClosing=Closing date
+DateDue=Due date
+DateValue=Value date
+DateValueShort=Value date
+DateOperation=Operation date
+DateOperationShort=Oper. Date
+DateLimit=Limit date
+DateRequest=Request date
+DateProcess=Process date
+DateBuild=Report build date
+DatePayment=Date of payment
+DateApprove=Approving date
+DateApprove2=Approving date (second approval)
+RegistrationDate=Registration date
+UserCreation=Creation user
+UserModification=Modification user
+UserValidation=Validation user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
+UserValidationShort=Valid. user
+DurationYear=year
+DurationMonth=month
+DurationWeek=week
+DurationDay=day
+DurationYears=years
+DurationMonths=months
+DurationWeeks=weeks
+DurationDays=days
+Year=Year
+Month=Month
+Week=Week
+WeekShort=Week
+Day=Day
+Hour=Hour
+Minute=Minute
+Second=Second
+Years=Years
+Months=Months
+Days=Days
+days=days
+Hours=Hours
+Minutes=Minutes
+Seconds=Seconds
+Weeks=Weeks
+Today=Today
+Yesterday=Yesterday
+Tomorrow=Tomorrow
+Morning=Morning
+Afternoon=Afternoon
+Quadri=Quadri
+MonthOfDay=Month of the day
+HourShort=H
+MinuteShort=mn
+Rate=Rate
+CurrencyRate=Currency conversion rate
+UseLocalTax=Include tax
+Bytes=Bytes
+KiloBytes=Kilobytes
+MegaBytes=Megabytes
+GigaBytes=Gigabytes
+TeraBytes=Terabytes
+UserAuthor=User of creation
+UserModif=User of last update
+b=b.
+Kb=Kb
+Mb=Mb
+Gb=Gb
+Tb=Tb
+Cut=Cut
+Copy=Copy
+Paste=Paste
+Default=Default
+DefaultValue=Default value
+DefaultValues=Default values/filters/sorting
+Price=Price
+PriceCurrency=Price (currency)
+UnitPrice=Unit price
+UnitPriceHT=Unit price (excl.)
+UnitPriceHTCurrency=Unit price (excl.) (currency)
+UnitPriceTTC=Unit price
+PriceU=U.P.
+PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
+PriceUTTC=U.P. (inc. tax)
+Amount=Amount
+AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
+AmountInvoicedHT=Amount invoiced (incl. tax)
+AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountPayment=Payment amount
+AmountHTShort=Amount (excl.)
+AmountTTCShort=Amount (inc. tax)
+AmountHT=Amount (excl. tax)
+AmountTTC=Amount (inc. tax)
+AmountVAT=Amount tax
+MulticurrencyAlreadyPaid=Already paid, original currency
+MulticurrencyRemainderToPay=Remain to pay, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+MulticurrencyAmountHT=Amount (excl. tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
+AmountLT1=Amount tax 2
+AmountLT2=Amount tax 3
+AmountLT1ES=Amount RE
+AmountLT2ES=Amount IRPF
+AmountTotal=Total amount
+AmountAverage=Average amount
+PriceQtyMinHT=Price quantity min. (excl. tax)
+PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+Percentage=Percentage
+Total=Total
+SubTotal=Subtotal
+TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
+TotalHTShortCurrency=Total (excl. in currency)
+TotalTTCShort=Total (inc. tax)
+TotalHT=Total (excl. tax)
+TotalHTforthispage=Total (excl. tax) for this page
+Totalforthispage=Total for this page
+TotalTTC=Total (inc. tax)
+TotalTTCToYourCredit=Total (inc. tax) to your credit
+TotalVAT=Total tax
+TotalVATIN=Total IGST
+TotalLT1=Total tax 2
+TotalLT2=Total tax 3
+TotalLT1ES=Total RE
+TotalLT2ES=Total IRPF
+TotalLT1IN=Total CGST
+TotalLT2IN=Total SGST
+HT=Excl. tax
+TTC=Inc. tax
+INCVATONLY=Inc. VAT
+INCT=Inc. all taxes
+VAT=Sales tax
+VATIN=IGST
+VATs=Sales taxes
+VATINs=IGST taxes
+LT1=Sales tax 2
+LT1Type=Sales tax 2 type
+LT2=Sales tax 3
+LT2Type=Sales tax 3 type
+LT1ES=RE
+LT2ES=IRPF
+LT1IN=CGST
+LT2IN=SGST
+LT1GC=Additionnal cents
+VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
+DefaultTaxRate=Default tax rate
+Average=Average
+Sum=Sum
+Delta=Delta
+StatusToPay=To pay
+RemainToPay=Remain to pay
+Module=Module/Application
+Modules=Modules/Applications
+Option=Option
+List=List
+FullList=Full list
+FullConversation=Full conversation
+Statistics=Statistics
+OtherStatistics=Other statistics
+Status=Status
+Favorite=Favorite
+ShortInfo=Info.
+Ref=Ref.
+ExternalRef=Ref. extern
+RefSupplier=Ref. vendor
+RefPayment=Ref. payment
+CommercialProposalsShort=Commercial proposals
+Comment=Comment
+Comments=Comments
+ActionsToDo=Events to do
+ActionsToDoShort=To do
+ActionsDoneShort=Done
+ActionNotApplicable=Not applicable
+ActionRunningNotStarted=To start
+ActionRunningShort=In progress
+ActionDoneShort=Finished
+ActionUncomplete=Incomplete
+LatestLinkedEvents=Latest %s linked events
+CompanyFoundation=Company/Organization
+Accountant=Accountant
+ContactsForCompany=Contacts for this third party
+ContactsAddressesForCompany=Contacts/addresses for this third party
+AddressesForCompany=Addresses for this third party
+ActionsOnCompany=Events for this third party
+ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
+ActionsOnMember=Events about this member
+ActionsOnProduct=Events about this product
+NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
+RequestAlreadyDone=Request already recorded
+Filter=Filter
+FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
+RemoveFilter=Remove filter
+ChartGenerated=Chart generated
+ChartNotGenerated=Chart not generated
+GeneratedOn=Build on %s
+Generate=Generate
+Duration=Duration
+TotalDuration=Total duration
+Summary=Summary
+DolibarrStateBoard=Database Statistics
+DolibarrWorkBoard=Open Items
+NoOpenedElementToProcess=No open element to process
+Available=Available
+NotYetAvailable=Not yet available
+NotAvailable=Not available
+Categories=Tags/categories
+Category=Tag/category
+By=By
+From=From
+FromLocation=From
+to=to
+To=to
+and=and
+or=or
+Other=Other
+Others=Others
+OtherInformations=Other information
+Quantity=Quantity
+Qty=Qty
+ChangedBy=Changed by
+ApprovedBy=Approved by
+ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
+ReCalculate=Recalculate
+ResultKo=Failure
+Reporting=Reporting
+Reportings=Reporting
+Draft=Draft
+Drafts=Drafts
+StatusInterInvoiced=Invoiced
+Validated=Validated
+Opened=Open
+OpenAll=Open (All)
+ClosedAll=Closed (All)
+New=New
+Discount=Discount
+Unknown=Unknown
+General=General
+Size=Size
+OriginalSize=Original size
+Received=Received
+Paid=Paid
+Topic=Subject
+ByCompanies=By third parties
+ByUsers=By user
+Links=Links
+Link=Link
+Rejects=Rejects
+Preview=Preview
+NextStep=Next step
+Datas=Data
+None=None
+NoneF=None
+NoneOrSeveral=None or several
+Late=Late
+LateDesc=An item is defined as Delayed as per the system configuration in menu Home - Setup - Alerts.
+NoItemLate=No late item
+Photo=Picture
+Photos=Pictures
+AddPhoto=Add picture
+DeletePicture=Picture delete
+ConfirmDeletePicture=Confirm picture deletion?
+Login=Login
+LoginEmail=Login (email)
+LoginOrEmail=Login or Email
+CurrentLogin=Current login
+EnterLoginDetail=Enter login details
+January=January
+February=February
+March=March
+April=April
+May=May
+June=June
+July=July
+August=August
+September=September
+October=October
+November=November
+December=December
+Month01=January
+Month02=February
+Month03=March
+Month04=April
+Month05=May
+Month06=June
+Month07=July
+Month08=August
+Month09=September
+Month10=October
+Month11=November
+Month12=December
+MonthShort01=Jan
+MonthShort02=Feb
+MonthShort03=Mar
+MonthShort04=Apr
+MonthShort05=May
+MonthShort06=Jun
+MonthShort07=Jul
+MonthShort08=Aug
+MonthShort09=Sep
+MonthShort10=Oct
+MonthShort11=Nov
+MonthShort12=Dec
+MonthVeryShort01=J
+MonthVeryShort02=F
+MonthVeryShort03=M
+MonthVeryShort04=A
+MonthVeryShort05=M
+MonthVeryShort06=J
+MonthVeryShort07=J
+MonthVeryShort08=A
+MonthVeryShort09=S
+MonthVeryShort10=O
+MonthVeryShort11=N
+MonthVeryShort12=D
+AttachedFiles=Attached files and documents
+JoinMainDoc=Join main document
+DateFormatYYYYMM=YYYY-MM
+DateFormatYYYYMMDD=YYYY-MM-DD
+DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
+ReportName=Report name
+ReportPeriod=Report period
+ReportDescription=Description
+Report=Report
+Keyword=Keyword
+Origin=Origin
+Legend=Legend
+Fill=Fill
+Reset=Reset
+File=File
+Files=Files
+NotAllowed=Not allowed
+ReadPermissionNotAllowed=Read permission not allowed
+AmountInCurrency=Amount in %s currency
+Example=Example
+Examples=Examples
+NoExample=No example
+FindBug=Report a bug
+NbOfThirdParties=Number of third parties
+NbOfLines=Number of lines
+NbOfObjects=Number of objects
+NbOfObjectReferers=Number of related items
+Referers=Related items
+TotalQuantity=Total quantity
+DateFromTo=From %s to %s
+DateFrom=From %s
+DateUntil=Until %s
+Check=Check
+Uncheck=Uncheck
+Internal=Internal
+External=External
+Internals=Internal
+Externals=External
+Warning=Warning
+Warnings=Warnings
+BuildDoc=Build Doc
+Entity=Environment
+Entities=Entities
+CustomerPreview=Customer preview
+SupplierPreview=Vendor preview
+ShowCustomerPreview=Show customer preview
+ShowSupplierPreview=Show vendor preview
+RefCustomer=Ref. customer
+Currency=Currency
+InfoAdmin=Information for administrators
+Undo=Undo
+Redo=Redo
+ExpandAll=Expand all
+UndoExpandAll=Undo expand
+SeeAll=See all
+Reason=Reason
+FeatureNotYetSupported=Feature not yet supported
+CloseWindow=Close window
+Response=Response
+Priority=Priority
+SendByMail=Send by email
+MailSentBy=Email sent by
+TextUsedInTheMessageBody=Email body
+SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
+Email=Email
+NoEMail=No email
+AlreadyRead=Already read
+NotRead=Not read
+NoMobilePhone=No mobile phone
+Owner=Owner
+FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
+Refresh=Refresh
+BackToList=Back to list
+GoBack=Go back
+CanBeModifiedIfOk=Can be modified if valid
+CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
+RecordCreatedSuccessfully=Record created successfully
+RecordModifiedSuccessfully=Record modified successfully
+RecordsModified=%s record(s) modified
+RecordsDeleted=%s record(s) deleted
+RecordsGenerated=%s record(s) generated
+AutomaticCode=Automatic code
+FeatureDisabled=Feature disabled
+MoveBox=Move widget
+Offered=Offered
+NotEnoughPermissions=You don't have permission for this action
+SessionName=Session name
+Method=Method
+Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+PartialWoman=Partial
+TotalWoman=Total
+NeverReceived=Never received
+Canceled=Canceled
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
+YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record in module setup
+Color=Color
+Documents=Linked files
+Documents2=Documents
+UploadDisabled=Upload disabled
+MenuAccountancy=Accounting
+MenuECM=Documents
+MenuAWStats=AWStats
+MenuMembers=Members
+MenuAgendaGoogle=Google agenda
+ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+NoFileFound=No documents saved in this directory
+CurrentUserLanguage=Current language
+CurrentTheme=Current theme
+CurrentMenuManager=Current menu manager
+Browser=Browser
+Layout=Layout
+Screen=Screen
+DisabledModules=Disabled modules
+For=For
+ForCustomer=For customer
+Signature=Signature
+DateOfSignature=Date of signature
+HidePassword=Show command with password hidden
+UnHidePassword=Show real command with clear password
+Root=Root
+RootOfMedias=Root of public medias (/medias)
+Informations=Information
+Page=Page
+Notes=Notes
+AddNewLine=Add new line
+AddFile=Add file
+FreeZone=Not a predefined product/service
+FreeLineOfType=Free-text item, type:
+CloneMainAttributes=Clone object with its main attributes
+ReGeneratePDF=Re-generate PDF
+PDFMerge=PDF Merge
+Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
+PrintContentArea=Show page to print main content area
+MenuManager=Menu manager
+WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
+CoreErrorTitle=System error
+CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
+CreditCard=Credit card
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
+FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
+FieldsWithIsForPublic=Fields with <b>%s</b> are shown in public list of members. If you don't want this, uncheck the "public" box.
+AccordingToGeoIPDatabase=(according to GeoIP conversion)
+Line=Line
+NotSupported=Not supported
+RequiredField=Required field
+Result=Result
+ToTest=Test
+ValidateBefore=Item must be validated before using this feature
+Visibility=Visibility
+Totalizable=Totalizable
+TotalizableDesc=This field is totalizable in list
+Private=Private
+Hidden=Hidden
+Resources=Resources
+Source=Source
+Prefix=Prefix
+Before=Before
+After=After
+IPAddress=IP address
+Frequency=Frequency
+IM=Instant messaging
+NewAttribute=New attribute
+AttributeCode=Attribute code
+URLPhoto=URL of photo/logo
+SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToTemplateInvoice=Link to template invoice
+LinkToSupplierOrder=Link to purchase order
+LinkToSupplierProposal=Link to vendor proposal
+LinkToSupplierInvoice=Link to vendor invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
+CreateDraft=Create draft
+SetToDraft=Back to draft
+ClickToEdit=Click to edit
+ClickToRefresh=Click to refresh
+EditWithEditor=Edit with CKEditor
+EditWithTextEditor=Edit with Text editor
+EditHTMLSource=Edit HTML Source
+ObjectDeleted=Object %s deleted
+ByCountry=By country
+ByTown=By town
+ByDate=By date
+ByMonthYear=By month/year
+ByYear=By year
+ByMonth=By month
+ByDay=By day
+BySalesRepresentative=By sales representative
+LinkedToSpecificUsers=Linked to a particular user contact
+NoResults=No results
+AdminTools=Admin Tools
+SystemTools=System tools
+ModulesSystemTools=Modules tools
+Test=Test
+Element=Element
+NoPhotoYet=No pictures available yet
+Dashboard=Dashboard
+MyDashboard=My Dashboard
+Deductible=Deductible
+from=from
+toward=toward
+Access=Access
+SelectAction=Select action
+SelectTargetUser=Select target user/employee
+HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
+SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
+OriginFileName=Original filename
+SetDemandReason=Set source
+SetBankAccount=Define Bank Account
+AccountCurrency=Account currency
+ViewPrivateNote=View notes
+XMoreLines=%s line(s) hidden
+ShowMoreLines=Show more/less lines
+PublicUrl=Public URL
+AddBox=Add box
+SelectElementAndClick=Select an element and click %s
+PrintFile=Print File %s
+ShowTransaction=Show entry on bank account
+ShowIntervention=Show intervention
+ShowContract=Show contract
+GoIntoSetupToChangeLogo=Go to Home - Setup - Company to change logo or go to Home - Setup - Display to hide.
+Deny=Deny
+Denied=Denied
+ListOf=List of %s
+ListOfTemplates=List of templates
+Gender=Gender
+Genderman=Man
+Genderwoman=Woman
+ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
+Mandatory=Mandatory
+Hello=Hello
+GoodBye=GoodBye
+Sincerely=Sincerely
+ConfirmDeleteObject=Are you sure you want to delete this object?
+DeleteLine=Delete line
+ConfirmDeleteLine=Are you sure you want to delete this line?
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records.
+NoRecordSelected=No record selected
+MassFilesArea=Area for files built by mass actions
+ShowTempMassFilesArea=Show area of files built by mass actions
+ConfirmMassDeletion=Bulk Delete confirmation
+ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
+RelatedObjects=Related Objects
+ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
+Progress=Progress
+ProgressShort=Progr.
+FrontOffice=Front office
+BackOffice=Back office
+Submit=Submit
+View=View
+Export=Export
+Exports=Exports
+ExportFilteredList=Export filtered list
+ExportList=Export list
+ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
+Miscellaneous=Miscellaneous
+Calendar=Calendar
+GroupBy=Group by...
+ViewFlatList=View flat list
+RemoveString=Remove string '%s'
+SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+DirectDownloadLink=Direct download link (public/external)
+DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+Download=Download
+DownloadDocument=Download document
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
+ModuleBuilder=Module and Application Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status?
+ImportId=Import id
+Events=Events
+EMailTemplates=Email templates
+FileNotShared=File not shared to external public
+Project=Project
+Projects=Projects
+LeadOrProject=Lead | Project
+LeadsOrProjects=Leads | Projects
+Lead=Lead
+Leads=Leads
+ListOpenLeads=List open leads
+ListOpenProjects=List open projects
+NewLeadOrProject=New lead or project
+Rights=Permissions
+LineNb=Line no.
+IncotermLabel=Incoterms
+TabLetteringCustomer=Customer lettering
+TabLetteringSupplier=Vendor lettering
+Monday=Monday
+Tuesday=Tuesday
+Wednesday=Wednesday
+Thursday=Thursday
+Friday=Friday
+Saturday=Saturday
+Sunday=Sunday
+MondayMin=Mo
+TuesdayMin=Tu
+WednesdayMin=We
+ThursdayMin=Th
+FridayMin=Fr
+SaturdayMin=Sa
+SundayMin=Su
+Day1=Monday
+Day2=Tuesday
+Day3=Wednesday
+Day4=Thursday
+Day5=Friday
+Day6=Saturday
+Day0=Sunday
+ShortMonday=M
+ShortTuesday=T
+ShortWednesday=W
+ShortThursday=T
+ShortFriday=F
+ShortSaturday=S
+ShortSunday=S
+SelectMailModel=Select an email template
+SetRef=Set ref
+Select2ResultFoundUseArrows=Some results found. Use arrows to select.
+Select2NotFound=No result found
+Select2Enter=Enter
+Select2MoreCharacter=or more character
+Select2MoreCharacters=or more characters
+Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
+Select2LoadingMoreResults=Loading more results...
+Select2SearchInProgress=Search in progress...
+SearchIntoThirdparties=Third parties
+SearchIntoContacts=Contacts
+SearchIntoMembers=Members
+SearchIntoUsers=Users
+SearchIntoProductsOrServices=Products or services
+SearchIntoProjects=Projects
+SearchIntoMO=Manufacturing Orders
+SearchIntoTasks=Tasks
+SearchIntoCustomerInvoices=Customer invoices
+SearchIntoSupplierInvoices=Vendor invoices
+SearchIntoCustomerOrders=Sales orders
+SearchIntoSupplierOrders=Purchase orders
+SearchIntoCustomerProposals=Commercial proposals
+SearchIntoSupplierProposals=Vendor proposals
+SearchIntoInterventions=Interventions
+SearchIntoContracts=Contracts
+SearchIntoCustomerShipments=Customer shipments
+SearchIntoExpenseReports=Expense reports
+SearchIntoLeaves=Leave
+SearchIntoTickets=Tickets
+CommentLink=Comments
+NbComments=Number of comments
+CommentPage=Comments space
+CommentAdded=Comment added
+CommentDeleted=Comment deleted
+Everybody=Everybody
+PayedBy=Paid by
+PayedTo=Paid to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft mass delete confirmation
+FileSharedViaALink=File shared via a link
+SelectAThirdPartyFirst=Select a third party first...
+YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
+AnalyticCode=Analytic code
+TMenuMRP=MRP
+ShowMoreInfos=Show More Infos
+NoFilesUploadedYet=Please upload a document first
+SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
+ContactDefault_agenda=Event
+ContactDefault_commande=Order
+ContactDefault_contrat=Contract
+ContactDefault_facture=Invoice
+ContactDefault_fichinter=Intervention
+ContactDefault_invoice_supplier=Supplier Invoice
+ContactDefault_order_supplier=Purchase Order
+ContactDefault_project=Project
+ContactDefault_project_task=Task
+ContactDefault_propal=Proposal
+ContactDefault_supplier_proposal=Supplier Proposal
+ContactDefault_ticket=Ticket
+ContactAddedAutomatically=Contact added from contact thirdparty roles
+More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+StatisticsOn=Statistics on
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
+Measures=Measures
+XAxis=X-Axis
+YAxis=Y-Axis
+StatusOfRefMustBe=Status of %s must be %s
+DeleteFileHeader=Confirm file delete
+DeleteFileText=Do you really want delete this file?
+ShowOtherLanguages=Show other languages
+SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
+NotUsedForThisCustomer=Not used for this customer
diff --git a/htdocs/langs/az_AZ/margins.lang b/htdocs/langs/az_AZ/margins.lang
new file mode 100644
index 00000000000..76ea8ad5c4d
--- /dev/null
+++ b/htdocs/langs/az_AZ/margins.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - marges
+
+Margin=Margin
+Margins=Margins
+TotalMargin=Total Margin
+MarginOnProducts=Margin / Products
+MarginOnServices=Margin / Services
+MarginRate=Margin rate
+MarkRate=Mark rate
+DisplayMarginRates=Display margin rates
+DisplayMarkRates=Display mark rates
+InputPrice=Input price
+margin=Profit margins management
+margesSetup=Profit margins management setup
+MarginDetails=Margin details
+ProductMargins=Product margins
+CustomerMargins=Customer margins
+SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
+UserMargins=User margins
+ProductService=Product or Service
+AllProducts=All products and services
+ChooseProduct/Service=Choose product or service
+ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
+ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
+UseDiscountAsProduct=As a product
+UseDiscountAsService=As a service
+UseDiscountOnTotal=On subtotal
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
+MargeType1=Margin on Best vendor price
+MargeType2=Margin on Weighted Average Price (WAP)
+MargeType3=Margin on Cost Price
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
+CostPrice=Cost price
+UnitCharges=Unit charges
+Charges=Charges
+AgentContactType=Commercial agent contact type
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
+CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/az_AZ/members.lang b/htdocs/langs/az_AZ/members.lang
new file mode 100644
index 00000000000..dd0a5bf49e2
--- /dev/null
+++ b/htdocs/langs/az_AZ/members.lang
@@ -0,0 +1,204 @@
+# Dolibarr language file - Source file is en_US - members
+MembersArea=Members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of terminated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Terminated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
+DateSubscription=Subscription date
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=Subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Terminated member
+MemberStatusResiliatedShort=Terminated
+MembersStatusToValid=Draft members
+MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Validated
+SubscriptionNotNeeded=No subscription needed
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+MemberTypeModified=Member type modified
+DeleteAMemberType=Delete a member type
+ConfirmDeleteMemberType=Are you sure you want to delete this member type?
+MemberTypeDeleted=Member type deleted
+MemberTypeCanNotBeDeleted=Member type can not be deleted
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome email
+SubscriptionRequired=Subscription required
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Terminate a member
+ConfirmResiliateMember=Are you sure you want to terminate this member?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions)?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public self-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public website with self-subscription form
+ForceMemberType=Force the member type
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembersModified=Latest %s modified members
+LastSubscriptionsModified=Latest %s modified subscriptions
+String=String
+Text=Text
+Int=Int
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+SubscriptionNotRecorded=Subscription not recorded
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct entry on bank account
+MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Latest member date
+LatestSubscriptionDate=Latest subscription date
+MemberNature=Nature of member
+Public=Information are public
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No VAT for subscriptions
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
+MembershipPaid=Membership paid for current period (until %s)
+YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
+XMembersClosed=%s member(s) closed
diff --git a/htdocs/langs/az_AZ/modulebuilder.lang b/htdocs/langs/az_AZ/modulebuilder.lang
new file mode 100644
index 00000000000..135ac1ae9ec
--- /dev/null
+++ b/htdocs/langs/az_AZ/modulebuilder.lang
@@ -0,0 +1,141 @@
+# Dolibarr language file - Source file is en_US - loan
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
+ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
+ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
+ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
+NewModule=New module
+NewObjectInModulebuilder=New object
+ModuleKey=Module key
+ObjectKey=Object key
+ModuleInitialized=Module initialized
+FilesForObjectInitialized=Files for new object '%s' initialized
+FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
+ModuleBuilderDescdescription=Enter here all general information that describe your module.
+ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
+ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
+ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
+ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
+ModuleBuilderDeschooks=This tab is dedicated to hooks.
+ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
+ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
+DangerZone=Danger zone
+BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
+BuildDocumentation=Build documentation
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
+DescriptionLong=Long description
+EditorName=Name of editor
+EditorUrl=URL of editor
+DescriptorFile=Descriptor file of module
+ClassFile=File for PHP DAO CRUD class
+ApiClassFile=File for PHP API class
+PageForList=PHP page for list of record
+PageForCreateEditView=PHP page to create/edit/view a record
+PageForAgendaTab=PHP page for event tab
+PageForDocumentTab=PHP page for document tab
+PageForNoteTab=PHP page for note tab
+PathToModulePackage=Path to zip of module/application package
+PathToModuleDocumentation=Path to file of module/application documentation (%s)
+SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
+FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Force update of .class and .sql files
+RegenerateMissingFiles=Generate missing files
+SpecificationFile=File of documentation
+LanguageFile=File for language
+ObjectProperties=Object Properties
+ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
+NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
+SearchAll=Used for 'search all'
+DatabaseIndex=Database index
+FileAlreadyExists=File %s already exists
+TriggersFile=File for triggers code
+HooksFile=File for hooks code
+ArrayOfKeyValues=Array of key-val
+ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
+WidgetFile=Widget file
+CSSFile=CSS file
+JSFile=Javascript file
+ReadmeFile=Readme file
+ChangeLog=ChangeLog file
+TestClassFile=File for PHP Unit Test class
+SqlFile=Sql file
+PageForLib=File for the common PHP library
+PageForObjLib=File for the PHP library dedicated to object
+SqlFileExtraFields=Sql file for complementary attributes
+SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
+AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
+UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Is a measure
+DirScanned=Directory scanned
+NoTrigger=No trigger
+NoWidget=No widget
+GoToApiExplorer=Go to API explorer
+ListOfMenusEntries=List of menu entries
+ListOfDictionariesEntries=List of dictionaries entries
+ListOfPermissionsDefined=List of defined permissions
+SeeExamples=See examples here
+EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdf=Display on PDF
+IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
+SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
+SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
+LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
+MenusDefDesc=Define here the menus provided by your module
+DictionariesDefDesc=Define here the dictionaries provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
+HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
+TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
+SeeIDsInUse=See IDs in use in your installation
+SeeReservedIDsRangeHere=See range of reserved IDs
+ToolkitForDevelopers=Toolkit for Dolibarr developers
+TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
+SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
+AddLanguageFile=Add language file
+YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
+DropTableIfEmpty=(Delete table if empty)
+TableDoesNotExists=The table %s does not exists
+TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
+UseAboutPage=Disable the about page
+UseDocFolder=Disable the documentation folder
+UseSpecificReadme=Use a specific ReadMe
+ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
+RealPathOfModule=Real path of module
+ContentCantBeEmpty=Content of file can't be empty
+WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
+CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
+JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
+CLIDesc=You can generate here some command line scripts you want to provide with your module.
+CLIFile=CLI File
+NoCLIFile=No CLI files
+UseSpecificEditorName = Use a specific editor name
+UseSpecificEditorURL = Use a specific editor URL
+UseSpecificFamily = Use a specific family
+UseSpecificAuthor = Use a specific author
+UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
+IncludeRefGeneration=The reference of object must be generated automatically
+IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
+IncludeDocGeneration=I want to generate some documents from the object
+IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
+ShowOnCombobox=Show value into combobox
+KeyForTooltip=Key for tooltip
+CSSClass=CSS Class
+NotEditable=Not editable
+ForeignKey=Foreign key
+TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/az_AZ/mrp.lang b/htdocs/langs/az_AZ/mrp.lang
new file mode 100644
index 00000000000..d3c4d3253c6
--- /dev/null
+++ b/htdocs/langs/az_AZ/mrp.lang
@@ -0,0 +1,76 @@
+Mrp=Manufacturing Orders
+MO=Manufacturing Order
+MRPDescription=Module to manage production and Manufacturing Orders (MO).
+MRPArea=MRP Area
+MrpSetupPage=Setup of module MRP
+MenuBOM=Bills of material
+LatestBOMModified=Latest %s Bills of materials modified
+LatestMOModified=Latest %s Manufacturing Orders modified
+Bom=Bills of Material
+BillOfMaterials=Bill of Material
+BOMsSetup=Setup of module BOM
+ListOfBOMs=List of bills of material - BOM
+ListOfManufacturingOrders=List of Manufacturing Orders
+NewBOM=New bill of material
+ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+BOMsNumberingModules=BOM numbering templates
+BOMsModelModule=BOM document templates
+MOsNumberingModules=MO numbering templates
+MOsModelModule=MO document templates
+FreeLegalTextOnBOMs=Free text on document of BOM
+WatermarkOnDraftBOMs=Watermark on draft BOM
+FreeLegalTextOnMOs=Free text on document of MO
+WatermarkOnDraftMOs=Watermark on draft MO
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
+ManufacturingEfficiency=Manufacturing efficiency
+ConsumptionEfficiency=Consumption efficiency
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
+DeleteBillOfMaterials=Delete Bill Of Materials
+DeleteMo=Delete Manufacturing Order
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+MenuMRP=Manufacturing Orders
+NewMO=New Manufacturing Order
+QtyToProduce=Qty to produce
+DateStartPlannedMo=Date start planned
+DateEndPlannedMo=Date end planned
+KeepEmptyForAsap=Empty means 'As Soon As Possible'
+EstimatedDuration=Estimated duration
+EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
+ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
+ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
+StatusMOProduced=Produced
+QtyFrozen=Frozen Qty
+QuantityFrozen=Frozen Quantity
+QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
+DisableStockChange=Stock change disabled
+DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
+BomAndBomLines=Bills Of Material and lines
+BOMLine=Line of BOM
+WarehouseForProduction=Warehouse for production
+CreateMO=Create MO
+ToConsume=To consume
+ToProduce=To produce
+QtyAlreadyConsumed=Qty already consumed
+QtyAlreadyProduced=Qty already produced
+QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
+ConsumeOrProduce=Consume or Produce
+ConsumeAndProduceAll=Consume and Produce All
+Manufactured=Manufactured
+TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
+ForAQuantityOf=For a quantity to produce of %s
+ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
+ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
+ProductionForRef=Production of %s
+AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
+NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
+AddNewConsumeLines=Add new line to consume
+ProductsToConsume=Products to consume
+ProductsToProduce=Products to produce
+UnitCost=Unit cost
+TotalCost=Total cost
diff --git a/htdocs/langs/az_AZ/multicurrency.lang b/htdocs/langs/az_AZ/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/az_AZ/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/az_AZ/oauth.lang b/htdocs/langs/az_AZ/oauth.lang
new file mode 100644
index 00000000000..075ff49a895
--- /dev/null
+++ b/htdocs/langs/az_AZ/oauth.lang
@@ -0,0 +1,32 @@
+# Dolibarr language file - Source file is en_US - oauth
+ConfigOAuth=OAuth Configuration
+OAuthServices=OAuth Services
+ManualTokenGeneration=Manual token generation
+TokenManager=Token Manager
+IsTokenGenerated=Is token generated ?
+NoAccessToken=No access token saved into local database
+HasAccessToken=A token was generated and saved into local database
+NewTokenStored=Token received and saved
+ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
+TokenDeleted=Token deleted
+RequestAccess=Click here to request/renew access and receive a new token to save
+DeleteAccess=Click here to delete token
+UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
+ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
+OAuthSetupForLogin=Page to generate an OAuth token
+SeePreviousTab=See previous tab
+OAuthIDSecret=OAuth ID and Secret
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=OAuth Google service
+OAUTH_GOOGLE_ID=OAuth Google Id
+OAUTH_GOOGLE_SECRET=OAuth Google Secret
+OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create OAuth credentials
+OAUTH_GITHUB_NAME=OAuth GitHub service
+OAUTH_GITHUB_ID=OAuth GitHub Id
+OAUTH_GITHUB_SECRET=OAuth GitHub Secret
+OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create OAuth credentials
+OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
+OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/az_AZ/opensurvey.lang b/htdocs/langs/az_AZ/opensurvey.lang
new file mode 100644
index 00000000000..7d26151fa16
--- /dev/null
+++ b/htdocs/langs/az_AZ/opensurvey.lang
@@ -0,0 +1,61 @@
+# Dolibarr language file - Source file is en_US - opensurvey
+Survey=Poll
+Surveys=Polls
+OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select the type of poll...
+NewSurvey=New poll
+OpenSurveyArea=Polls area
+AddACommentForPoll=You can add a comment into poll...
+AddComment=Add comment
+CreatePoll=Create poll
+PollTitle=Poll title
+ToReceiveEMailForEachVote=Receive an email for each vote
+TypeDate=Type date
+TypeClassic=Type standard
+OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
+RemoveAllDays=Remove all days
+CopyHoursOfFirstDay=Copy hours of first day
+RemoveAllHours=Remove all hours
+SelectedDays=Selected days
+TheBestChoice=The best choice currently is
+TheBestChoices=The best choices currently are
+with=with
+OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
+CommentsOfVoters=Comments of voters
+ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
+RemovePoll=Remove poll
+UrlForSurvey=URL to communicate to get a direct access to poll
+PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
+CreateSurveyDate=Create a date poll
+CreateSurveyStandard=Create a standard poll
+CheckBox=Simple checkbox
+YesNoList=List (empty/yes/no)
+PourContreList=List (empty/for/against)
+AddNewColumn=Add new column
+TitleChoice=Choice label
+ExportSpreadsheet=Export result spreadsheet
+ExpireDate=Limit date
+NbOfSurveys=Number of polls
+NbOfVoters=No. of voters
+SurveyResults=Results
+PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
+5MoreChoices=5 more choices
+Against=Against
+YouAreInivitedToVote=You are invited to vote for this poll
+VoteNameAlreadyExists=This name was already used for this poll
+AddADate=Add a date
+AddStartHour=Add start hour
+AddEndHour=Add end hour
+votes=vote(s)
+NoCommentYet=No comments have been posted for this poll yet
+CanComment=Voters can comment in the poll
+CanSeeOthersVote=Voters can see other people's vote
+SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
+BackToCurrentMonth=Back to current month
+ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
+ErrorOpenSurveyOneChoice=Enter at least one choice
+ErrorInsertingComment=There was an error while inserting your comment
+MoreChoices=Enter more choices for the voters
+SurveyExpiredInfo=The poll has been closed or voting delay has expired.
+EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
+ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/az_AZ/orders.lang b/htdocs/langs/az_AZ/orders.lang
new file mode 100644
index 00000000000..ad91e1eef63
--- /dev/null
+++ b/htdocs/langs/az_AZ/orders.lang
@@ -0,0 +1,189 @@
+# Dolibarr language file - Source file is en_US - orders
+OrdersArea=Customers orders area
+SuppliersOrdersArea=Purchase orders area
+OrderCard=Order card
+OrderId=Order Id
+Order=Order
+PdfOrderTitle=Order
+Orders=Orders
+OrderLine=Order line
+OrderDate=Order date
+OrderDateShort=Order date
+OrderToProcess=Order to process
+NewOrder=New order
+NewOrderSupplier=New Purchase Order
+ToOrder=Make order
+MakeOrder=Make order
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Sales Order
+CustomersOrders=Sales Orders
+CustomersOrdersRunning=Current sales orders
+CustomersOrdersAndOrdersLines=Sales orders and order details
+OrdersDeliveredToBill=Sales orders delivered to bill
+OrdersToBill=Sales orders delivered
+OrdersInProcess=Sales orders in process
+OrdersToProcess=Sales orders to process
+SuppliersOrdersToProcess=Purchase orders to process
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
+StatusOrderCanceledShort=Canceled
+StatusOrderDraftShort=Draft
+StatusOrderValidatedShort=Validated
+StatusOrderSentShort=In process
+StatusOrderSent=Shipment in process
+StatusOrderOnProcessShort=Ordered
+StatusOrderProcessedShort=Processed
+StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
+StatusOrderToBillShort=Delivered
+StatusOrderApprovedShort=Approved
+StatusOrderRefusedShort=Refused
+StatusOrderToProcessShort=To process
+StatusOrderReceivedPartiallyShort=Partially received
+StatusOrderReceivedAllShort=Products received
+StatusOrderCanceled=Canceled
+StatusOrderDraft=Draft (needs to be validated)
+StatusOrderValidated=Validated
+StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderProcessed=Processed
+StatusOrderToBill=Delivered
+StatusOrderApproved=Approved
+StatusOrderRefused=Refused
+StatusOrderReceivedPartially=Partially received
+StatusOrderReceivedAll=All products received
+ShippingExist=A shipment exists
+QtyOrdered=Qty ordered
+ProductQtyInDraft=Product quantity into draft orders
+ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
+MenuOrdersToBill=Orders delivered
+MenuOrdersToBill2=Billable orders
+ShipProduct=Ship product
+CreateOrder=Create Order
+RefuseOrder=Refuse order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
+ValidateOrder=Validate order
+UnvalidateOrder=Unvalidate order
+DeleteOrder=Delete order
+CancelOrder=Cancel order
+OrderReopened= Order %s re-open
+AddOrder=Create order
+AddPurchaseOrder=Create purchase order
+AddToDraftOrders=Add to draft order
+ShowOrder=Show order
+OrdersOpened=Orders to process
+NoDraftOrders=No draft orders
+NoOrder=No order
+NoSupplierOrder=No purchase order
+LastOrders=Latest %s sales orders
+LastCustomerOrders=Latest %s sales orders
+LastSupplierOrders=Latest %s purchase orders
+LastModifiedOrders=Latest %s modified orders
+AllOrders=All orders
+NbOfOrders=Number of orders
+OrdersStatistics=Order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
+NumberOfOrdersByMonth=Number of orders by month
+AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
+ListOfOrders=List of orders
+CloseOrder=Close order
+ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
+ConfirmDeleteOrder=Are you sure you want to delete this order?
+ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b>?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status?
+ConfirmCancelOrder=Are you sure you want to cancel this order?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
+GenerateBill=Generate invoice
+ClassifyShipped=Classify delivered
+DraftOrders=Draft orders
+DraftSuppliersOrders=Draft purchase orders
+OnProcessOrders=In process orders
+RefOrder=Ref. order
+RefCustomerOrder=Ref. order for customer
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
+SendOrderByMail=Send order by mail
+ActionsOnOrder=Events on order
+NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
+OrderMode=Order method
+AuthorRequest=Request author
+UserWithApproveOrderGrant=Users granted with "approve orders" permission.
+PaymentOrderRef=Payment of order %s
+ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
+DispatchSupplierOrder=Receiving purchase order %s
+FirstApprovalAlreadyDone=First approval already done
+SecondApprovalAlreadyDone=Second approval already done
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
+OtherOrders=Other orders
+##### Types de contacts #####
+TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
+TypeContact_commande_internal_SHIPPING=Representative following-up shipping
+TypeContact_commande_external_BILLING=Customer invoice contact
+TypeContact_commande_external_SHIPPING=Customer shipping contact
+TypeContact_commande_external_CUSTOMER=Customer contact following-up order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
+TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
+Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
+Error_OrderNotChecked=No orders to invoice selected
+# Order modes (how we receive order). Not the "why" are keys stored into dict.lang
+OrderByMail=Mail
+OrderByFax=Fax
+OrderByEMail=Email
+OrderByWWW=Online
+OrderByPhone=Phone
+# Documents models
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
+PDFEratostheneDescription=A complete order model
+PDFEdisonDescription=A simple order model
+PDFProformaDescription=A complete Proforma invoice template
+CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
+IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
+SetShippingMode=Set shipping mode
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Canceled
+StatusSupplierOrderDraftShort=Draft
+StatusSupplierOrderValidatedShort=Validated
+StatusSupplierOrderSentShort=In process
+StatusSupplierOrderSent=Shipment in process
+StatusSupplierOrderOnProcessShort=Ordered
+StatusSupplierOrderProcessedShort=Processed
+StatusSupplierOrderDelivered=Delivered
+StatusSupplierOrderDeliveredShort=Delivered
+StatusSupplierOrderToBillShort=Delivered
+StatusSupplierOrderApprovedShort=Approved
+StatusSupplierOrderRefusedShort=Refused
+StatusSupplierOrderToProcessShort=To process
+StatusSupplierOrderReceivedPartiallyShort=Partially received
+StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderCanceled=Canceled
+StatusSupplierOrderDraft=Draft (needs to be validated)
+StatusSupplierOrderValidated=Validated
+StatusSupplierOrderOnProcess=Ordered - Standby reception
+StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusSupplierOrderProcessed=Processed
+StatusSupplierOrderToBill=Delivered
+StatusSupplierOrderApproved=Approved
+StatusSupplierOrderRefused=Refused
+StatusSupplierOrderReceivedPartially=Partially received
+StatusSupplierOrderReceivedAll=All products received
diff --git a/htdocs/langs/az_AZ/other.lang b/htdocs/langs/az_AZ/other.lang
new file mode 100644
index 00000000000..ba85f51e739
--- /dev/null
+++ b/htdocs/langs/az_AZ/other.lang
@@ -0,0 +1,286 @@
+# Dolibarr language file - Source file is en_US - other
+SecurityCode=Security code
+NumberingShort=N°
+Tools=Tools
+TMenuTools=Tools
+ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
+Birthday=Birthday
+BirthdayDate=Birthday date
+DateToBirth=Birth date
+BirthdayAlertOn=birthday alert active
+BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (text) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+DocFileGeneratedInto=Doc file generated into <b>%s</b>.
+JumpToLogin=Disconnected. Go to login page...
+MessageForm=Message on online payment form
+MessageOK=Message on the return page for a validated payment
+MessageKO=Message on the return page for a canceled payment
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursively
+PoweredBy=Powered by
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+DateNextInvoiceBeforeGen=Date of next invoice (before generation)
+DateNextInvoiceAfterGen=Date of next invoice (after generation)
+GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
+OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Only the first selected field has been selected.
+AtLeastOneMeasureIsRequired=At least 1 field for measure is required
+AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
+LatestBlogPosts=Latest Blog Posts
+Notify_ORDER_VALIDATE=Sales order validated
+Notify_ORDER_SENTBYMAIL=Sales order sent by mail
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
+Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
+Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
+Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
+Notify_PROPAL_VALIDATE=Customer proposal validated
+Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
+Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
+Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
+Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
+Notify_WITHDRAW_CREDIT=Credit withdrawal
+Notify_WITHDRAW_EMIT=Perform withdrawal
+Notify_COMPANY_CREATE=Third party created
+Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_BILL_VALIDATE=Customer invoice validated
+Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_BILL_PAYED=Customer invoice paid
+Notify_BILL_CANCEL=Customer invoice canceled
+Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
+Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
+Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
+Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
+Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
+Notify_CONTRACT_VALIDATE=Contract validated
+Notify_FICHINTER_VALIDATE=Intervention validated
+Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
+Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
+Notify_SHIPPING_VALIDATE=Shipping validated
+Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail
+Notify_MEMBER_VALIDATE=Member validated
+Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_SUBSCRIPTION=Member subscribed
+Notify_MEMBER_RESILIATE=Member terminated
+Notify_MEMBER_DELETE=Member deleted
+Notify_PROJECT_CREATE=Project creation
+Notify_TASK_CREATE=Task created
+Notify_TASK_MODIFY=Task modified
+Notify_TASK_DELETE=Task deleted
+Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
+Notify_EXPENSE_REPORT_APPROVE=Expense report approved
+Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
+Notify_HOLIDAY_APPROVE=Leave request approved
+SeeModuleSetup=See setup of module %s
+NbOfAttachedFiles=Number of attached files/documents
+TotalSizeOfAttachedFiles=Total size of attached files/documents
+MaxSize=Maximum size
+AttachANewFile=Attach a new file/document
+LinkedObject=Linked object
+NbOfActiveNotifications=Number of notifications (no. of recipient emails)
+PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to remind you that the invoice  __REF__ seems to have not been paid. A copy of the invoice is attached as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find commercial proposal __REF__ attached \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price request __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
+ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
+DemoFundation=Manage members of a foundation
+DemoFundation2=Manage members and bank account of a foundation
+DemoCompanyServiceOnly=Company or freelance selling service only
+DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
+DemoCompanyAll=Company with multiple activities (all main modules)
+CreatedBy=Created by %s
+ModifiedBy=Modified by %s
+ValidatedBy=Validated by %s
+ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made latest change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made latest change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
+FileWasRemoved=File %s was removed
+DirWasRemoved=Directory %s was removed
+FeatureNotYetAvailable=Feature not yet available in the current version
+FeaturesSupported=Supported features
+Width=Width
+Height=Height
+Depth=Depth
+Top=Top
+Bottom=Bottom
+Left=Left
+Right=Right
+CalculatedWeight=Calculated weight
+CalculatedVolume=Calculated volume
+Weight=Weight
+WeightUnitton=tonne
+WeightUnitkg=kg
+WeightUnitg=g
+WeightUnitmg=mg
+WeightUnitpound=pound
+WeightUnitounce=ounce
+Length=Length
+LengthUnitm=m
+LengthUnitdm=dm
+LengthUnitcm=cm
+LengthUnitmm=mm
+Surface=Area
+SurfaceUnitm2=m²
+SurfaceUnitdm2=dm²
+SurfaceUnitcm2=cm²
+SurfaceUnitmm2=mm²
+SurfaceUnitfoot2=ft²
+SurfaceUnitinch2=in²
+Volume=Volume
+VolumeUnitm3=m³
+VolumeUnitdm3=dm³ (L)
+VolumeUnitcm3=cm³ (ml)
+VolumeUnitmm3=mm³ (µl)
+VolumeUnitfoot3=ft³
+VolumeUnitinch3=in³
+VolumeUnitounce=ounce
+VolumeUnitlitre=litre
+VolumeUnitgallon=gallon
+SizeUnitm=m
+SizeUnitdm=dm
+SizeUnitcm=cm
+SizeUnitmm=mm
+SizeUnitinch=inch
+SizeUnitfoot=foot
+SizeUnitpoint=point
+BugTracker=Bug tracker
+SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
+BackToLoginPage=Back to login page
+AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
+EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
+ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
+DolibarrDemo=Dolibarr ERP/CRM demo
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of sales orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of vendor proposals
+NumberOfSupplierOrders=Number of purchase orders
+NumberOfSupplierInvoices=Number of vendor invoices
+NumberOfContracts=Number of contracts
+NumberOfMos=Number of manufacturing orders
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on sales orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on vendor proposals
+NumberOfUnitsSupplierOrders=Number of units on purchase orders
+NumberOfUnitsSupplierInvoices=Number of units on vendor invoices
+NumberOfUnitsContracts=Number of units on contracts
+NumberOfUnitsMos=Number of units to produce in manufacturing orders
+EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
+EMailTextInterventionValidated=The intervention %s has been validated.
+EMailTextInvoiceValidated=Invoice %s has been validated.
+EMailTextInvoicePayed=Invoice %s has been paid.
+EMailTextProposalValidated=Proposal %s has been validated.
+EMailTextProposalClosedSigned=Proposal %s has been closed signed.
+EMailTextOrderValidated=Order %s has been validated.
+EMailTextOrderApproved=Order %s has been approved.
+EMailTextOrderValidatedBy=Order %s has been recorded by %s.
+EMailTextOrderApprovedBy=Order %s has been approved by %s.
+EMailTextOrderRefused=Order %s has been refused.
+EMailTextOrderRefusedBy=Order %s has been refused by %s.
+EMailTextExpeditionValidated=Shipping %s has been validated.
+EMailTextExpenseReportValidated=Expense report %s has been validated.
+EMailTextExpenseReportApproved=Expense report %s has been approved.
+EMailTextHolidayValidated=Leave request %s has been validated.
+EMailTextHolidayApproved=Leave request %s has been approved.
+ImportedWithSet=Importation data set
+DolibarrNotification=Automatic notification
+ResizeDesc=Enter new width <b>OR</b> new height. Ratio will be kept during resizing...
+NewLength=New width
+NewHeight=New height
+NewSizeAfterCropping=New size after cropping
+DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner)
+CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
+ImageEditor=Image editor
+YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s.
+YouReceiveMailBecauseOfNotification2=This event is the following:
+ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start".
+UseAdvancedPerms=Use the advanced permissions of some modules
+FileFormat=File format
+SelectAColor=Choose a color
+AddFiles=Add Files
+StartUpload=Start upload
+CancelUpload=Cancel upload
+FileIsTooBig=Files is too big
+PleaseBePatient=Please be patient...
+NewPassword=New password
+ResetPassword=Reset password
+RequestToResetPasswordReceived=A request to change your password has been received.
+NewKeyIs=This is your new keys to login
+NewKeyWillBe=Your new key to login to software will be
+ClickHereToGoTo=Click here to go to %s
+YouMustClickToChange=You must however first click on the following link to validate this password change
+ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
+Chart=Chart
+PassEncoding=Password encoding
+PermissionsAdd=Permissions added
+PermissionsDelete=Permissions removed
+YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+YourPasswordHasBeenReset=Your password has been reset successfully
+ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+MissingIds=Missing ids
+ThirdPartyCreatedByEmailCollector=Third party created by email collector from email MSGID %s
+ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s
+ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
+TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
+OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+
+##### Export #####
+ExportsArea=Exports area
+AvailableFormats=Available formats
+LibraryUsed=Library used
+LibraryVersion=Library version
+ExportableDatas=Exportable data
+NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
+##### External sites #####
+WebsiteSetup=Setup of module website
+WEBSITE_PAGEURL=URL of page
+WEBSITE_TITLE=Title
+WEBSITE_DESCRIPTION=Description
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
+WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
+
+MemoryUsage=Memory usage
+RequestDuration=Duration of request
+PopuProp=Products/Services by popularity in Proposals
+PopuCom=Products/Services by popularity in Orders
+ProductStatistics=Products/Services Statistics
+NbOfQtyInOrders=Qty in orders
diff --git a/htdocs/langs/az_AZ/paybox.lang b/htdocs/langs/az_AZ/paybox.lang
new file mode 100644
index 00000000000..1bbbef4017b
--- /dev/null
+++ b/htdocs/langs/az_AZ/paybox.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - paybox
+PayBoxSetup=PayBox module setup
+PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+Creditor=Creditor
+PaymentCode=Payment code
+PayBoxDoPayment=Pay with Paybox
+YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
+Continue=Next
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
+YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/az_AZ/paypal.lang b/htdocs/langs/az_AZ/paypal.lang
new file mode 100644
index 00000000000..5eb5f389445
--- /dev/null
+++ b/htdocs/langs/az_AZ/paypal.lang
@@ -0,0 +1,36 @@
+# Dolibarr language file - Source file is en_US - paypal
+PaypalSetup=PayPal module setup
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
+PAYPAL_API_SANDBOX=Mode test/sandbox
+PAYPAL_API_USER=API username
+PAYPAL_API_PASSWORD=API password
+PAYPAL_API_SIGNATURE=API signature
+PAYPAL_SSLVERSION=Curl SSL Version
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
+PaypalModeIntegral=Integral
+PaypalModeOnlyPaypal=PayPal only
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
+ThisIsTransactionId=This is id of transaction: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
+NewOnlinePaymentReceived=New online payment received
+NewOnlinePaymentFailed=New online payment tried but failed
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
+ReturnURLAfterPayment=Return URL after payment
+ValidationOfOnlinePaymentFailed=Validation of online payment failed
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
+DetailedErrorMessage=Detailed Error Message
+ShortErrorMessage=Short Error Message
+ErrorCode=Error Code
+ErrorSeverityCode=Error Severity Code
+OnlinePaymentSystem=Online payment system
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/az_AZ/printing.lang b/htdocs/langs/az_AZ/printing.lang
new file mode 100644
index 00000000000..16494583550
--- /dev/null
+++ b/htdocs/langs/az_AZ/printing.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - printing
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
+PrintingSetup=Setup of Direct Printing System
+PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer without needing to open the document in another application.
+MenuDirectPrinting=Direct Printing jobs
+DirectPrint=Direct print
+PrintingDriverDesc=Configuration variables for printing driver.
+ListDrivers=List of drivers
+PrintTestDesc=List of Printers.
+FileWasSentToPrinter=File %s was sent to printer
+ViaModule=via the module
+NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
+PleaseSelectaDriverfromList=Please select a driver from list.
+PleaseConfigureDriverfromList=Please configure the selected driver from list.
+SetupDriver=Driver setup
+TargetedPrinter=Targeted printer
+UserConf=Setup per user
+PRINTGCP_INFO=Google OAuth API setup
+PRINTGCP_AUTHLINK=Authentication
+PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
+PrintGCPDesc=This driver allows sending documents directly to a printer using Google Cloud Print.
+GCP_Name=Name
+GCP_displayName=Display Name
+GCP_Id=Printer Id
+GCP_OwnerName=Owner Name
+GCP_State=Printer State
+GCP_connectionStatus=Online State
+GCP_Type=Printer Type
+PrintIPPDesc=This driver allows sending of documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+IPP_Uri=Printer Uri
+IPP_Name=Printer Name
+IPP_State=Printer State
+IPP_State_reason=State reason
+IPP_State_reason1=State reason1
+IPP_BW=BW
+IPP_Color=Color
+IPP_Device=Device
+IPP_Media=Printer media
+IPP_Supported=Type of media
+DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
+GoogleAuthNotConfigured=Google OAuth has not been setup. Enable module OAuth and set a Google ID/Secret.
+GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
+PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
+PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
+PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+PrintTestDescprintipp=List of Printers for Cups.
diff --git a/htdocs/langs/az_AZ/productbatch.lang b/htdocs/langs/az_AZ/productbatch.lang
new file mode 100644
index 00000000000..54270c4a23b
--- /dev/null
+++ b/htdocs/langs/az_AZ/productbatch.lang
@@ -0,0 +1,24 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Use lot/serial number
+ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusNotOnBatch=No (lot/serial not used)
+ProductStatusOnBatchShort=Yes
+ProductStatusNotOnBatchShort=No
+Batch=Lot/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
+batch_number=Lot/Serial number
+BatchNumberShort=Lot/Serial
+EatByDate=Eat-by date
+SellByDate=Sell-by date
+DetailBatchNumber=Lot/Serial details
+printBatch=Lot/Serial: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
+StockDetailPerBatch=Stock detail per lot
diff --git a/htdocs/langs/az_AZ/products.lang b/htdocs/langs/az_AZ/products.lang
new file mode 100644
index 00000000000..a31243a07b6
--- /dev/null
+++ b/htdocs/langs/az_AZ/products.lang
@@ -0,0 +1,385 @@
+# Dolibarr language file - Source file is en_US - products
+ProductRef=Product ref.
+ProductLabel=Product label
+ProductLabelTranslated=Translated product label
+ProductDescription=Product description
+ProductDescriptionTranslated=Translated product description
+ProductNoteTranslated=Translated product note
+ProductServiceCard=Products/Services card
+TMenuProducts=Products
+TMenuServices=Services
+Products=Products
+Services=Services
+Product=Product
+Service=Service
+ProductId=Product/service id
+Create=Create
+Reference=Reference
+NewProduct=New product
+NewService=New service
+ProductVatMassChange=Global VAT Update
+ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
+MassBarcodeInit=Mass barcode init
+MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
+ProductAccountancyBuyCode=Accounting code (purchase)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
+ProductAccountancySellCode=Accounting code (sale)
+ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
+ProductAccountancySellExportCode=Accounting code (sale export)
+ProductOrService=Product or Service
+ProductsAndServices=Products and Services
+ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
+ProductsOnSale=Products for sale
+ProductsOnPurchase=Products for purchase
+ProductsOnSaleOnly=Products for sale only
+ProductsOnPurchaseOnly=Products for purchase only
+ProductsNotOnSell=Products not for sale and not for purchase
+ProductsOnSellAndOnBuy=Products for sale and for purchase
+ServicesOnSale=Services for sale
+ServicesOnPurchase=Services for purchase
+ServicesOnSaleOnly=Services for sale only
+ServicesOnPurchaseOnly=Services for purchase only
+ServicesNotOnSell=Services not for sale and not for purchase
+ServicesOnSellAndOnBuy=Services for sale and for purchase
+LastModifiedProductsAndServices=Last %s modified products/services
+LastRecordedProducts=Latest %s recorded products
+LastRecordedServices=Latest %s recorded services
+CardProduct0=Product
+CardProduct1=Service
+Stock=Stock
+MenuStocks=Stocks
+Stocks=Stocks and location (warehouse) of products
+Movements=Movements
+Sell=Sell
+Buy=Purchase
+OnSell=For sale
+OnBuy=For purchase
+NotOnSell=Not for sale
+ProductStatusOnSell=For sale
+ProductStatusNotOnSell=Not for sale
+ProductStatusOnSellShort=For sale
+ProductStatusNotOnSellShort=Not for sale
+ProductStatusOnBuy=For purchase
+ProductStatusNotOnBuy=Not for purchase
+ProductStatusOnBuyShort=For purchase
+ProductStatusNotOnBuyShort=Not for purchase
+UpdateVAT=Update vat
+UpdateDefaultPrice=Update default price
+UpdateLevelPrices=Update prices for each level
+AppliedPricesFrom=Applied from
+SellingPrice=Selling price
+SellingPriceHT=Selling price (excl. tax)
+SellingPriceTTC=Selling price (inc. tax)
+SellingMinPriceTTC=Minimum Selling price (inc. tax)
+CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceUsage=This value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
+NewPrice=New price
+MinPrice=Min. sell price
+EditSellingPriceLabel=Edit selling price label
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
+ContractStatusClosed=Closed
+ErrorProductAlreadyExists=A product with reference %s already exists.
+ErrorProductBadRefOrLabel=Wrong value for reference or label.
+ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
+Suppliers=Vendors
+SupplierRef=Vendor SKU
+ShowProduct=Show product
+ShowService=Show service
+ProductsAndServicesArea=Product and Services area
+ProductsArea=Product area
+ServicesArea=Services area
+ListOfStockMovements=List of stock movements
+BuyingPrice=Buying price
+PriceForEachProduct=Products with specific prices
+SupplierCard=Vendor card
+PriceRemoved=Price removed
+BarCode=Barcode
+BarcodeType=Barcode type
+SetDefaultBarcodeType=Set barcode type
+BarcodeValue=Barcode value
+NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
+ServiceLimitedDuration=If product is a service with limited duration:
+MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
+MultiPricesNumPrices=Number of prices
+AssociatedProductsAbility=Activate virtual products (kits)
+AssociatedProducts=Virtual products
+AssociatedProductsNumber=Number of products composing this virtual product
+ParentProductsNumber=Number of parent packaging product
+ParentProducts=Parent products
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+KeywordFilter=Keyword filter
+CategoryFilter=Category filter
+ProductToAddSearch=Search product to add
+NoMatchFound=No match found
+ListOfProductsServices=List of products/services
+ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
+ProductParentList=List of virtual products/services with this product as a component
+ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
+DeleteProduct=Delete a product/service
+ConfirmDeleteProduct=Are you sure you want to delete this product/service?
+ProductDeleted=Product/Service "%s" deleted from database.
+ExportDataset_produit_1=Products
+ExportDataset_service_1=Services
+ImportDataset_produit_1=Products
+ImportDataset_service_1=Services
+DeleteProductLine=Delete product line
+ConfirmDeleteProductLine=Are you sure you want to delete this product line?
+ProductSpecial=Special
+QtyMin=Min. purchase quantity
+PriceQtyMin=Price quantity min.
+PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
+VATRateForSupplierProduct=VAT Rate (for this vendor/product)
+DiscountQtyMin=Discount for this qty.
+NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
+NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedProductsToSell=Predefined Product
+PredefinedServicesToSell=Predefined Service
+PredefinedProductsAndServicesToSell=Predefined products/services to sell
+PredefinedProductsToPurchase=Predefined product to purchase
+PredefinedServicesToPurchase=Predefined services to purchase
+PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
+NotPredefinedProducts=Not predefined products/services
+GenerateThumb=Generate thumb
+ServiceNb=Service #%s
+ListProductServiceByPopularity=List of products/services by popularity
+ListProductByPopularity=List of products by popularity
+ListServiceByPopularity=List of services by popularity
+Finished=Manufactured product
+RowMaterial=Raw Material
+ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
+CloneContentProduct=Clone all main information of product/service
+ClonePricesProduct=Clone prices
+CloneCategoriesProduct=Clone tags/categories linked
+CloneCompositionProduct=Clone virtual product/service
+CloneCombinationsProduct=Clone product variants
+ProductIsUsed=This product is used
+NewRefForClone=Ref. of new product/service
+SellingPrices=Selling prices
+BuyingPrices=Buying prices
+CustomerPrices=Customer prices
+SuppliersPrices=Vendor prices
+SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
+CustomCode=Customs / Commodity / HS code
+CountryOrigin=Origin country
+Nature=Nature of product (material/finished)
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+lm=lm
+m2=m²
+m3=m³
+liter=liter
+l=L
+unitP=Piece
+unitSET=Set
+unitS=Second
+unitH=Hour
+unitD=Day
+unitG=Gram
+unitM=Meter
+unitLM=Linear meter
+unitM2=Square meter
+unitM3=Cubic meter
+unitL=Liter
+unitT=ton
+unitKG=kg
+unitG=Gram
+unitMG=mg
+unitLB=pound
+unitOZ=ounce
+unitM=Meter
+unitDM=dm
+unitCM=cm
+unitMM=mm
+unitFT=ft
+unitIN=in
+unitM2=Square meter
+unitDM2=dm²
+unitCM2=cm²
+unitMM2=mm²
+unitFT2=ft²
+unitIN2=in²
+unitM3=Cubic meter
+unitDM3=dm³
+unitCM3=cm³
+unitMM3=mm³
+unitFT3=ft³
+unitIN3=in³
+unitOZ3=ounce
+unitgallon=gallon
+ProductCodeModel=Product ref template
+ServiceCodeModel=Service ref template
+CurrentProductPrice=Current price
+AlwaysUseNewPrice=Always use current price of product/service
+AlwaysUseFixedPrice=Use the fixed price
+PriceByQuantity=Different prices by quantity
+DisablePriceByQty=Disable prices by quantity
+PriceByQuantityRange=Quantity range
+MultipriceRules=Price segment rules
+UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
+PercentVariationOver=%% variation over %s
+PercentDiscountOver=%% discount over %s
+KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
+VariantRefExample=Examples: COL, SIZE
+VariantLabelExample=Examples: Color, Size
+### composition fabrication
+Build=Produce
+ProductsMultiPrice=Products and prices for each price segment
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
+ProductSellByQuarterHT=Products turnover quarterly before tax
+ServiceSellByQuarterHT=Services turnover quarterly before tax
+Quarter1=1st. Quarter
+Quarter2=2nd. Quarter
+Quarter3=3rd. Quarter
+Quarter4=4th. Quarter
+BarCodePrintsheet=Print barcode
+PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
+NumberOfStickers=Number of stickers to print on page
+PrintsheetForOneBarCode=Print several stickers for one barcode
+BuildPageToPrint=Generate page to print
+FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
+FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
+DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
+BarCodeDataForProduct=Barcode information of product %s:
+BarCodeDataForThirdparty=Barcode information of third party %s:
+ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
+PriceByCustomer=Different prices for each customer
+PriceCatalogue=A single sell price per product/service
+PricingRule=Rules for selling prices
+AddCustomerPrice=Add price by customer
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+PriceByCustomerLog=Log of previous customer prices
+MinimumPriceLimit=Minimum price can't be lower then %s
+MinimumRecommendedPrice=Minimum recommended price is: %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
+PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=Available global values:
+PriceMode=Price mode
+PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Child products
+MinSupplierPrice=Minimum buying price
+MinCustomerPrice=Minimum selling price
+DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
+AddVariable=Add Variable
+AddUpdater=Add Updater
+GlobalVariables=Global variables
+VariableToUpdate=Variable to update
+GlobalVariableUpdaters=External updaters for variables
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Latest update
+CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product/service with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
+WarningSelectOneDocument=Please select at least one document
+DefaultUnitToShow=Unit
+NbOfQtyInProposals=Qty in proposals
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+ProductsOrServicesTranslations=Products/Services translations
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+WidthUnits=Width unit
+LengthUnits=Length unit
+HeightUnits=Height unit
+SurfaceUnits=Surface unit
+SizeUnits=Size unit
+DeleteProductBuyPrice=Delete buying price
+ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
+ProductSheet=Product sheet
+ServiceSheet=Service sheet
+PossibleValues=Possible values
+GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
+ProductSupplierDescription=Vendor description for the product
+UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
+PackagingForThisProduct=Packaging
+QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+
+#Attributes
+VariantAttributes=Variant attributes
+ProductAttributes=Variant attributes for products
+ProductAttributeName=Variant attribute %s
+ProductAttribute=Variant attribute
+ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
+ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
+ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
+ProductCombinations=Variants
+PropagateVariant=Propagate variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+NewProductCombinations=New variants
+EditProductCombinations=Editing variants
+SelectCombination=Select combination
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+NewProductAttributeValue=New attribute value
+ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
+ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
+TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
+DoNotRemovePreviousCombinations=Do not remove previous variants
+UsePercentageVariations=Use percentage variations
+PercentageVariation=Percentage variation
+ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
+NbOfDifferentValues=No. of different values
+NbProducts=Number of products
+ParentProduct=Parent product
+HideChildProducts=Hide variant products
+ShowChildProducts=Show variant products
+NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
+ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
+CloneDestinationReference=Destination product reference
+ErrorCopyProductCombinations=There was an error while copying the product variants
+ErrorDestinationProductNotFound=Destination product not found
+ErrorProductCombinationNotFound=Product variant not found
+ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
+ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
+DeleteLinkedProduct=Delete the child product linked to the combination
diff --git a/htdocs/langs/az_AZ/projects.lang b/htdocs/langs/az_AZ/projects.lang
new file mode 100644
index 00000000000..bb42bff3c87
--- /dev/null
+++ b/htdocs/langs/az_AZ/projects.lang
@@ -0,0 +1,267 @@
+# Dolibarr language file - Source file is en_US - projects
+RefProject=Ref. project
+ProjectRef=Project ref.
+ProjectId=Project Id
+ProjectLabel=Project label
+ProjectsArea=Projects Area
+ProjectStatus=Project status
+SharedProject=Everybody
+PrivateProject=Project contacts
+ProjectsImContactFor=Projects for I am explicitly a contact
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=All projects
+MyProjectsDesc=This view is limited to projects you are a contact for
+ProjectsPublicDesc=This view presents all projects you are allowed to read.
+TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
+TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
+ClosedProjectsAreHidden=Closed projects are not visible.
+TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
+TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
+NewProject=New project
+AddProject=Create project
+DeleteAProject=Delete a project
+DeleteATask=Delete a task
+ConfirmDeleteAProject=Are you sure you want to delete this project?
+ConfirmDeleteATask=Are you sure you want to delete this task?
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
+OpportunitiesStatusForProjects=Leads amount of projects by status
+ShowProject=Show project
+ShowTask=Show task
+SetProject=Set project
+NoProject=No project defined or owned
+NbOfProjects=Number of projects
+NbOfTasks=Number of tasks
+TimeSpent=Time spent
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
+TimesSpent=Time spent
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
+TaskTimeSpent=Time spent on tasks
+TaskTimeUser=User
+TaskTimeNote=Note
+TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on open projects
+WorkloadNotDefined=Workload not defined
+NewTimeSpent=Time spent
+MyTimeSpent=My time spent
+BillTime=Bill the time spent
+BillTimeShort=Bill time
+TimeToBill=Time not billed
+TimeBilled=Time billed
+Tasks=Tasks
+Task=Task
+TaskDateStart=Task start date
+TaskDateEnd=Task end date
+TaskDescription=Task description
+NewTask=New task
+AddTask=Create task
+AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
+AddHereTimeSpentForWeek=Add here time spent for this week/task
+Activity=Activity
+Activities=Tasks/activities
+MyActivities=My tasks/activities
+MyProjects=My projects
+MyProjectsArea=My projects Area
+DurationEffective=Effective duration
+ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently open tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
+ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
+Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GanttView=Gantt View
+ListProposalsAssociatedProject=List of the commercial proposals related to the project
+ListOrdersAssociatedProject=List of sales orders related to the project
+ListInvoicesAssociatedProject=List of customer invoices related to the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
+ListSupplierOrdersAssociatedProject=List of purchase orders related to the project
+ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project
+ListContractAssociatedProject=List of contracts related to the project
+ListShippingAssociatedProject=List of shippings related to the project
+ListFichinterAssociatedProject=List of interventions related to the project
+ListExpenseReportsAssociatedProject=List of expense reports related to the project
+ListDonationsAssociatedProject=List of donations related to the project
+ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
+ListSalariesAssociatedProject=List of payments of salaries related to the project
+ListActionsAssociatedProject=List of events related to the project
+ListMOAssociatedProject=List of manufacturing orders related to the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
+ActivityOnProjectToday=Activity on project today
+ActivityOnProjectYesterday=Activity on project yesterday
+ActivityOnProjectThisWeek=Activity on project this week
+ActivityOnProjectThisMonth=Activity on project this month
+ActivityOnProjectThisYear=Activity on project this year
+ChildOfProjectTask=Child of project/task
+ChildOfTask=Child of task
+TaskHasChild=Task has child
+NotOwnerOfProject=Not owner of this private project
+AffectedTo=Allocated to
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
+ValidateProject=Validate projet
+ConfirmValidateProject=Are you sure you want to validate this project?
+CloseAProject=Close project
+ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+ReOpenAProject=Open project
+ConfirmReOpenAProject=Are you sure you want to re-open this project?
+ProjectContact=Contacts of project
+TaskContact=Task contacts
+ActionsOnProject=Events on project
+YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
+DeleteATimeSpent=Delete time spent
+ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
+TaskRessourceLinks=Contacts of task
+ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
+NoTasks=No tasks for this project
+LinkedToAnotherCompany=Linked to other third party
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
+ErrorTimeSpentIsEmpty=Time spent is empty
+ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
+IfNeedToUseOtherObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
+CloneTasks=Clone tasks
+CloneContacts=Clone contacts
+CloneNotes=Clone notes
+CloneProjectFiles=Clone project joined files
+CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
+CloneMoveDate=Update project/tasks dates from now?
+ConfirmCloneProject=Are you sure to clone this project?
+ProjectReportDate=Change task dates according to new project start date
+ErrorShiftTaskDate=Impossible to shift task date according to new project start date
+ProjectsAndTasksLines=Projects and tasks
+ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
+ProjectModifiedInDolibarr=Project %s modified
+TaskCreatedInDolibarr=Task %s created
+TaskModifiedInDolibarr=Task %s modified
+TaskDeletedInDolibarr=Task %s deleted
+OpportunityStatus=Lead status
+OpportunityStatusShort=Lead status
+OpportunityProbability=Lead probability
+OpportunityProbabilityShort=Lead probab.
+OpportunityAmount=Lead amount
+OpportunityAmountShort=Lead amount
+OpportunityWeightedAmount=Opportunity weighted amount
+OpportunityWeightedAmountShort=Opp. weighted amount
+OpportunityAmountAverageShort=Average lead amount
+OpportunityAmountWeigthedShort=Weighted lead amount
+WonLostExcluded=Won/Lost excluded
+##### Types de contacts #####
+TypeContact_project_internal_PROJECTLEADER=Project leader
+TypeContact_project_external_PROJECTLEADER=Project leader
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_task_internal_TASKEXECUTIVE=Task executive
+TypeContact_project_task_external_TASKEXECUTIVE=Task executive
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
+TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
+SelectElement=Select element
+AddElement=Link to element
+# Documents models
+DocumentModelBeluga=Project document template for linked objects overview
+DocumentModelBaleine=Project document template for tasks
+DocumentModelTimeSpent=Project report template for time spent
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+ProjectReferers=Related items
+ProjectMustBeValidatedFirst=Project must be validated first
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerMonth=Input per month
+InputDetail=Input detail
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTheTask=Not assigned to the task
+NoUserAssignedToTheProject=No users assigned to this project
+TimeSpentBy=Time spent by
+TasksAssignedTo=Tasks assigned to
+AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
+AssignTask=Assign
+ProjectOverview=Overview
+ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
+ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
+ProjectNbProjectByMonth=No. of created projects by month
+ProjectNbTaskByMonth=No. of created tasks by month
+ProjectOppAmountOfProjectsByMonth=Amount of leads by month
+ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
+ProjectOpenedProjectByOppStatus=Open project/lead by lead status
+ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
+TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
+IdTaskTime=Id task time
+YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
+OpenedProjectsByThirdparties=Open projects by third parties
+OnlyOpportunitiesShort=Only leads
+OpenedOpportunitiesShort=Open leads
+NotOpenedOpportunitiesShort=Not an open lead
+NotAnOpportunityShort=Not a lead
+OpportunityTotalAmount=Total amount of leads
+OpportunityPonderatedAmount=Weighted amount of leads
+OpportunityPonderatedAmountDesc=Leads amount weighted with probability
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWON=Won
+OppStatusLOST=Lost
+Budget=Budget
+AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
+LatestProjects=Latest %s projects
+LatestModifiedProjects=Latest %s modified projects
+OtherFilteredTasks=Other filtered tasks
+NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
+ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+# Comments trans
+AllowCommentOnTask=Allow user comments on tasks
+AllowCommentOnProject=Allow user comments on projects
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=Information project %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
+NewTaskRefSuggested=Task ref already used, a new task ref is required
+TimeSpentInvoiced=Time spent billed
+TimeSpentForInvoice=Time spent
+OneLinePerUser=One line per user
+ServiceToUseOnLines=Service to use on lines
+InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
+ProjectFollowOpportunity=Follow opportunity
+ProjectFollowTasks=Follow tasks or time spent
+Usage=Usage
+UsageOpportunity=Usage: Opportunity
+UsageTasks=Usage: Tasks
+UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=New invoice
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/az_AZ/propal.lang b/htdocs/langs/az_AZ/propal.lang
new file mode 100644
index 00000000000..71d6857c909
--- /dev/null
+++ b/htdocs/langs/az_AZ/propal.lang
@@ -0,0 +1,86 @@
+# Dolibarr language file - Source file is en_US - propal
+Proposals=Commercial proposals
+Proposal=Commercial proposal
+ProposalShort=Proposal
+ProposalsDraft=Draft commercial proposals
+ProposalsOpened=Open commercial proposals
+CommercialProposal=Commercial proposal
+PdfCommercialProposalTitle=Commercial proposal
+ProposalCard=Proposal card
+NewProp=New commercial proposal
+NewPropal=New proposal
+Prospect=Prospect
+DeleteProp=Delete commercial proposal
+ValidateProp=Validate commercial proposal
+AddProp=Create proposal
+ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
+ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
+LastPropals=Latest %s proposals
+LastModifiedProposals=Latest %s modified proposals
+AllPropals=All proposals
+SearchAProposal=Search a proposal
+NoProposal=No proposal
+ProposalsStatistics=Commercial proposal's statistics
+NumberOfProposalsByMonth=Number by month
+AmountOfProposalsByMonthHT=Amount by month (excl. tax)
+NbOfProposals=Number of commercial proposals
+ShowPropal=Show proposal
+PropalsDraft=Drafts
+PropalsOpened=Open
+PropalStatusDraft=Draft (needs to be validated)
+PropalStatusValidated=Validated (proposal is open)
+PropalStatusSigned=Signed (needs billing)
+PropalStatusNotSigned=Not signed (closed)
+PropalStatusBilled=Billed
+PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated (open)
+PropalStatusClosedShort=Closed
+PropalStatusSignedShort=Signed
+PropalStatusNotSignedShort=Not signed
+PropalStatusBilledShort=Billed
+PropalsToClose=Commercial proposals to close
+PropalsToBill=Signed commercial proposals to bill
+ListOfProposals=List of commercial proposals
+ActionsOnPropal=Events on proposal
+RefProposal=Commercial proposal ref
+SendPropalByMail=Send commercial proposal by mail
+DatePropal=Date of proposal
+DateEndPropal=Validity ending date
+ValidityDuration=Validity duration
+CloseAs=Set status to
+SetAcceptedRefused=Set accepted/refused
+ErrorPropalNotFound=Propal %s not found
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
+CopyPropalFrom=Create commercial proposal by copying existing proposal
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
+DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
+ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
+ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
+ProposalsAndProposalsLines=Commercial proposal and lines
+ProposalLine=Proposal line
+AvailabilityPeriod=Availability delay
+SetAvailability=Set availability delay
+AfterOrder=after order
+OtherProposals=Other proposals
+##### Availability #####
+AvailabilityTypeAV_NOW=Immediate
+AvailabilityTypeAV_1W=1 week
+AvailabilityTypeAV_2W=2 weeks
+AvailabilityTypeAV_3W=3 weeks
+AvailabilityTypeAV_1M=1 month
+##### Types de contacts #####
+TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
+TypeContact_propal_external_BILLING=Customer invoice contact
+TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
+TypeContact_propal_external_SHIPPING=Customer contact for delivery
+# Document models
+DocModelAzurDescription=A complete proposal model (old implementation of Cyan template)
+DocModelCyanDescription=A complete proposal model
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
+ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/az_AZ/receiptprinter.lang b/htdocs/langs/az_AZ/receiptprinter.lang
new file mode 100644
index 00000000000..896eaa313dd
--- /dev/null
+++ b/htdocs/langs/az_AZ/receiptprinter.lang
@@ -0,0 +1,95 @@
+# Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
+PrinterAdded=Printer %s added
+PrinterUpdated=Printer %s updated
+PrinterDeleted=Printer %s deleted
+TestSentToPrinter=Test Sent To Printer %s
+ReceiptPrinter=Receipt printers
+ReceiptPrinterDesc=Setup of receipt printers
+ReceiptPrinterTemplateDesc=Setup of Templates
+ReceiptPrinterTypeDesc=Description of Receipt Printer's type
+ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
+ListPrinters=List of Printers
+SetupReceiptTemplate=Template Setup
+CONNECTOR_DUMMY=Dummy Printer
+CONNECTOR_NETWORK_PRINT=Network Printer
+CONNECTOR_FILE_PRINT=Local Printer
+CONNECTOR_WINDOWS_PRINT=Local Windows Printer
+CONNECTOR_CUPS_PRINT=Cups Printer
+CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
+CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
+CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
+CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
+PROFILE_DEFAULT=Default Profile
+PROFILE_SIMPLE=Simple Profile
+PROFILE_EPOSTEP=Epos Tep Profile
+PROFILE_P822D=P822D Profile
+PROFILE_STAR=Star Profile
+PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
+PROFILE_SIMPLE_HELP=Simple Profile No Graphics
+PROFILE_EPOSTEP_HELP=Epos Tep Profile
+PROFILE_P822D_HELP=P822D Profile No Graphics
+PROFILE_STAR_HELP=Star Profile
+DOL_LINE_FEED=Skip line
+DOL_ALIGN_LEFT=Left align text
+DOL_ALIGN_CENTER=Center text
+DOL_ALIGN_RIGHT=Right align text
+DOL_USE_FONT_A=Use font A of printer
+DOL_USE_FONT_B=Use font B of printer
+DOL_USE_FONT_C=Use font C of printer
+DOL_PRINT_BARCODE=Print barcode
+DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
+DOL_CUT_PAPER_FULL=Cut ticket completely
+DOL_CUT_PAPER_PARTIAL=Cut ticket partially
+DOL_OPEN_DRAWER=Open cash drawer
+DOL_ACTIVATE_BUZZER=Activate buzzer
+DOL_PRINT_QRCODE=Print QR Code
+DOL_PRINT_LOGO=Print logo of my company
+DOL_PRINT_LOGO_OLD=Print logo of my company (old printers)
+DOL_BOLD=Bold
+DOL_BOLD_DISABLED=Disable bold
+DOL_DOUBLE_HEIGHT=Double height size
+DOL_DOUBLE_WIDTH=Double width size
+DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
+DOL_UNDERLINE=Enable underline
+DOL_UNDERLINE_DISABLED=Disable underline
+DOL_BEEP=Beed sound
+DOL_PRINT_TEXT=Print text
+DOL_VALUE_DATE=Invoice date
+DOL_VALUE_DATE_TIME=Invoice date and time
+DOL_VALUE_YEAR=Invoice year
+DOL_VALUE_MONTH_LETTERS=Invoice month in letters
+DOL_VALUE_MONTH=Invoice month
+DOL_VALUE_DAY=Invoice day
+DOL_VALUE_DAY_LETTERS=Inovice day in letters
+DOL_LINE_FEED_REVERSE=Line feed reverse
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Invoice ref
+DOL_PRINT_OBJECT_LINES=Invoice lines
+DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
+DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
+DOL_VALUE_CUSTOMER_MAIL=Customer mail
+DOL_VALUE_CUSTOMER_PHONE=Customer phone
+DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
+DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
+DOL_VALUE_MYSOC_NAME=Your company name
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/az_AZ/receptions.lang b/htdocs/langs/az_AZ/receptions.lang
new file mode 100644
index 00000000000..010a7521846
--- /dev/null
+++ b/htdocs/langs/az_AZ/receptions.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - receptions
+ReceptionsSetup=Product Reception setup
+RefReception=Ref. reception
+Reception=Reception
+Receptions=Receptions
+AllReceptions=All Receptions
+Reception=Reception
+Receptions=Receptions
+ShowReception=Show Receptions
+ReceptionsArea=Receptions area
+ListOfReceptions=List of receptions
+ReceptionMethod=Reception method
+LastReceptions=Latest %s receptions
+StatisticsOfReceptions=Statistics for receptions
+NbOfReceptions=Number of receptions
+NumberOfReceptionsByMonth=Number of receptions by month
+ReceptionCard=Reception card
+NewReception=New reception
+CreateReception=Create reception
+QtyInOtherReceptions=Qty in other receptions
+OtherReceptionsForSameOrder=Other receptions for this order
+ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
+ReceptionsToValidate=Receptions to validate
+StatusReceptionCanceled=Canceled
+StatusReceptionDraft=Draft
+StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionProcessed=Processed
+StatusReceptionDraftShort=Draft
+StatusReceptionValidatedShort=Validated
+StatusReceptionProcessedShort=Processed
+ReceptionSheet=Reception sheet
+ConfirmDeleteReception=Are you sure you want to delete this reception?
+ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
+ConfirmCancelReception=Are you sure you want to cancel this reception?
+StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
+SendReceptionByEMail=Send reception by email
+SendReceptionRef=Submission of reception %s
+ActionsOnReception=Events on reception
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the order card.
+ReceptionLine=Reception line
+ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
+ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
+ReceptionsNumberingModules=Numbering module for receptions
+ReceptionsReceiptModel=Document templates for receptions
diff --git a/htdocs/langs/az_AZ/resource.lang b/htdocs/langs/az_AZ/resource.lang
new file mode 100644
index 00000000000..e8574dc680f
--- /dev/null
+++ b/htdocs/langs/az_AZ/resource.lang
@@ -0,0 +1,39 @@
+# Dolibarr language file - Source file is en_US - resource
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+ActionsOnResource=Events about this resource
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResource=Show resource
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+SelectResource=Select resource
+
+IdResource=Id resource
+AssetNumber=Serial number
+ResourceTypeCode=Resource type code
+ImportDataset_resource_1=Resources
+
+ErrorResourcesAlreadyInUse=Some resources are in use
+ErrorResourceUseInEvent=%s used in %s event
diff --git a/htdocs/langs/az_AZ/salaries.lang b/htdocs/langs/az_AZ/salaries.lang
new file mode 100644
index 00000000000..7c3c08a65bd
--- /dev/null
+++ b/htdocs/langs/az_AZ/salaries.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+Salary=Salary
+Salaries=Salaries
+NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
+SalaryPayment=Salary payment
+SalariesPayments=Salaries payments
+ShowSalaryPayment=Show salary payment
+THM=Average hourly rate
+TJM=Average daily rate
+CurrentSalary=Current salary
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/az_AZ/sendings.lang b/htdocs/langs/az_AZ/sendings.lang
new file mode 100644
index 00000000000..5ce3b7f67e9
--- /dev/null
+++ b/htdocs/langs/az_AZ/sendings.lang
@@ -0,0 +1,74 @@
+# Dolibarr language file - Source file is en_US - sendings
+RefSending=Ref. shipment
+Sending=Shipment
+Sendings=Shipments
+AllSendings=All Shipments
+Shipment=Shipment
+Shipments=Shipments
+ShowSending=Show Shipments
+Receivings=Delivery Receipts
+SendingsArea=Shipments area
+ListOfSendings=List of shipments
+SendingMethod=Shipping method
+LastSendings=Latest %s shipments
+StatisticsOfSendings=Statistics for shipments
+NbOfSendings=Number of shipments
+NumberOfShipmentsByMonth=Number of shipments by month
+SendingCard=Shipment card
+NewSending=New shipment
+CreateShipment=Create shipment
+QtyShipped=Qty shipped
+QtyShippedShort=Qty ship.
+QtyPreparedOrShipped=Qty prepared or shipped
+QtyToShip=Qty to ship
+QtyToReceive=Qty to receive
+QtyReceived=Qty received
+QtyInOtherShipments=Qty in other shipments
+KeepToShip=Remain to ship
+KeepToShipShort=Remain
+OtherSendingsForSameOrder=Other shipments for this order
+SendingsAndReceivingForSameOrder=Shipments and receipts for this order
+SendingsToValidate=Shipments to validate
+StatusSendingCanceled=Canceled
+StatusSendingDraft=Draft
+StatusSendingValidated=Validated (products to ship or already shipped)
+StatusSendingProcessed=Processed
+StatusSendingDraftShort=Draft
+StatusSendingValidatedShort=Validated
+StatusSendingProcessedShort=Processed
+SendingSheet=Shipment sheet
+ConfirmDeleteSending=Are you sure you want to delete this shipment?
+ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
+ConfirmCancelSending=Are you sure you want to cancel this shipment?
+DocumentModelMerou=Merou A5 model
+WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+DateDeliveryPlanned=Planned date of delivery
+RefDeliveryReceipt=Ref delivery receipt
+StatusReceipt=Status delivery receipt
+DateReceived=Date delivery received
+ClassifyReception=Classify reception
+SendShippingByEMail=Send shipment by email
+SendShippingRef=Submission of shipment %s
+ActionsOnShipping=Events on shipment
+LinkToTrackYourPackage=Link to track your package
+ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
+ShipmentLine=Shipment line
+ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
+ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
+ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
+NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+
+# Sending methods
+# ModelDocument
+DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty: %d)
diff --git a/htdocs/langs/az_AZ/sms.lang b/htdocs/langs/az_AZ/sms.lang
new file mode 100644
index 00000000000..055085eb16a
--- /dev/null
+++ b/htdocs/langs/az_AZ/sms.lang
@@ -0,0 +1,51 @@
+# Dolibarr language file - Source file is en_US - sms
+Sms=Sms
+SmsSetup=SMS setup
+SmsDesc=This page allows you to define global options on SMS features
+SmsCard=SMS Card
+AllSms=All SMS campaigns
+SmsTargets=Targets
+SmsRecipients=Targets
+SmsRecipient=Target
+SmsTitle=Description
+SmsFrom=Sender
+SmsTo=Target
+SmsTopic=Topic of SMS
+SmsText=Message
+SmsMessage=SMS Message
+ShowSms=Show SMS
+ListOfSms=List SMS campaigns
+NewSms=New SMS campaign
+EditSms=Edit SMS
+ResetSms=New sending
+DeleteSms=Delete SMS campaign
+DeleteASms=Remove a SMS campaign
+PreviewSms=Previuw SMS
+PrepareSms=Prepare SMS
+CreateSms=Create SMS
+SmsResult=Result of SMS sending
+TestSms=Test SMS
+ValidSms=Validate SMS
+ApproveSms=Approve SMS
+SmsStatusDraft=Draft
+SmsStatusValidated=Validated
+SmsStatusApproved=Approved
+SmsStatusSent=Sent
+SmsStatusSentPartialy=Sent partially
+SmsStatusSentCompletely=Sent completely
+SmsStatusError=Error
+SmsStatusNotSent=Not sent
+SmsSuccessfulySent=SMS correctly sent (from %s to %s)
+ErrorSmsRecipientIsEmpty=Number of target is empty
+WarningNoSmsAdded=No new phone number to add to target list
+ConfirmValidSms=Do you confirm validation of this campaign?
+NbOfUniqueSms=No. of unique phone numbers
+NbOfSms=No. of phone numbers
+ThisIsATestMessage=This is a test message
+SendSms=Send SMS
+SmsInfoCharRemain=No. of remaining characters
+SmsInfoNumero= (international format i.e.: +33899701761)
+DelayBeforeSending=Delay before sending (minutes)
+SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
+SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider.
+DisableStopIfSupported=Disable STOP message (if supported)
diff --git a/htdocs/langs/az_AZ/stocks.lang b/htdocs/langs/az_AZ/stocks.lang
new file mode 100644
index 00000000000..9856649b834
--- /dev/null
+++ b/htdocs/langs/az_AZ/stocks.lang
@@ -0,0 +1,220 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseCard=Warehouse card
+Warehouse=Warehouse
+Warehouses=Warehouses
+ParentWarehouse=Parent warehouse
+NewWarehouse=New warehouse / Stock Location
+WarehouseEdit=Modify warehouse
+MenuNewWarehouse=New warehouse
+WarehouseSource=Source warehouse
+WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
+AddOne=Add one
+DefaultWarehouse=Default warehouse
+WarehouseTarget=Target warehouse
+ValidateSending=Delete sending
+CancelSending=Cancel sending
+DeleteSending=Delete sending
+Stock=Stock
+Stocks=Stocks
+StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
+Movements=Movements
+ErrorWarehouseRefRequired=Warehouse reference name is required
+ListOfWarehouses=List of warehouses
+ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
+MovementId=Movement ID
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
+StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
+Location=Location
+LocationSummary=Short name location
+NumberOfDifferentProducts=Number of different products
+NumberOfProducts=Total number of products
+LastMovement=Latest movement
+LastMovements=Latest movements
+Units=Units
+Unit=Unit
+StockCorrection=Stock correction
+CorrectStock=Correct stock
+StockTransfer=Stock transfer
+TransferStock=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
+NumberOfUnit=Number of units
+UnitPurchaseValue=Unit purchase price
+StockTooLow=Stock too low
+StockLowerThanLimit=Stock lower than alert limit (%s)
+EnhancedValue=Value
+PMPValue=Weighted average price
+PMPValueShort=WAP
+EnhancedValueOfWarehouses=Warehouses value
+UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
+QtyDispatched=Quantity dispatched
+QtyDispatchedShort=Qty dispatched
+QtyToDispatchShort=Qty to dispatch
+OrderDispatch=Item receipts
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
+DeStockOnShipment=Decrease real stocks on shipping validation
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
+OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
+StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
+NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
+DispatchVerb=Dispatch
+StockLimitShort=Limit for alert
+StockLimit=Stock limit for alert
+StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+PhysicalStock=Physical Stock
+RealStock=Real Stock
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
+VirtualStock=Virtual stock
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+IdWarehouse=Id warehouse
+DescWareHouse=Description warehouse
+LieuWareHouse=Localisation warehouse
+WarehousesAndProducts=Warehouses and products
+WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
+AverageUnitPricePMPShort=Weighted average input price
+AverageUnitPricePMP=Weighted average input price
+SellPriceMin=Selling Unit Price
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
+EstimatedStockValueShort=Input stock value
+EstimatedStockValue=Input stock value
+DeleteAWarehouse=Delete a warehouse
+ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
+PersonalStock=Personal stock %s
+ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
+SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
+SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
+NoStockAction=No stock action
+DesiredStock=Desired Stock
+DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
+StockToBuy=To order
+Replenishment=Replenishment
+ReplenishmentOrders=Replenishment orders
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
+UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+UseVirtualStock=Use virtual stock
+UsePhysicalStock=Use physical stock
+CurentSelectionMode=Current selection mode
+CurentlyUsingVirtualStock=Virtual stock
+CurentlyUsingPhysicalStock=Physical stock
+RuleForStockReplenishment=Rule for stocks replenishment
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
+AlertOnly= Alerts only
+WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
+WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
+ForThisWarehouse=For this warehouse
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+Replenishments=Replenishments
+NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
+NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
+MassMovement=Mass movement
+SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+RecordMovement=Record transfer
+ReceivingForSameOrder=Receipts for this order
+StockMovementRecorded=Stock movements recorded
+RuleForStockAvailability=Rules on stock requirements
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
+MovementLabel=Label of movement
+TypeMovement=Type of movement
+DateMovement=Date of movement
+InventoryCode=Movement or inventory code
+IsInPackage=Contained into package
+WarehouseAllowNegativeTransfer=Stock can be negative
+qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
+ShowWarehouse=Show warehouse
+MovementCorrectStock=Stock correction for product %s
+MovementTransferStock=Stock transfer of product %s into another warehouse
+InventoryCodeShort=Inv./Mov. code
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
+ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
+OpenAll=Open for all actions
+OpenInternal=Open only for internal actions
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
+OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
+ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
+ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
+ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
+AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
+AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+InventoryDate=Inventory date
+NewInventory=New inventory
+inventorySetup = Inventory Setup
+inventoryCreatePermission=Create new inventory
+inventoryReadPermission=View inventories
+inventoryWritePermission=Update inventories
+inventoryValidatePermission=Validate inventory
+inventoryTitle=Inventory
+inventoryListTitle=Inventories
+inventoryListEmpty=No inventory in progress
+inventoryCreateDelete=Create/Delete inventory
+inventoryCreate=Create new
+inventoryEdit=Edit
+inventoryValidate=Validated
+inventoryDraft=Running
+inventorySelectWarehouse=Warehouse choice
+inventoryConfirmCreate=Create
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
+inventoryMvtStock=By inventory
+inventoryWarningProductAlreadyExists=This product is already into list
+SelectCategory=Category filter
+SelectFournisseur=Vendor filter
+inventoryOnDate=Inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
+inventoryChangePMPPermission=Allow to change PMP value for a product
+ColumnNewPMP=New unit PMP
+OnlyProdsInStock=Do not add product without stock
+TheoricalQty=Theorique qty
+TheoricalValue=Theorique qty
+LastPA=Last BP
+CurrentPA=Curent BP
+RecordedQty=Recorded Qty
+RealQty=Real Qty
+RealValue=Real Value
+RegulatedQty=Regulated Qty
+AddInventoryProduct=Add product to inventory
+AddProduct=Add
+ApplyPMP=Apply PMP
+FlushInventory=Flush inventory
+ConfirmFlushInventory=Do you confirm this action?
+InventoryFlushed=Inventory flushed
+ExitEditMode=Exit edition
+inventoryDeleteLine=Delete line
+RegulateStock=Regulate Stock
+ListInventory=List
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
+ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
+InventoryForASpecificWarehouse=Inventory for a specific warehouse
+InventoryForASpecificProduct=Inventory for a specific product
+StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
+ForceTo=Force to
diff --git a/htdocs/langs/az_AZ/stripe.lang b/htdocs/langs/az_AZ/stripe.lang
new file mode 100644
index 00000000000..844762040af
--- /dev/null
+++ b/htdocs/langs/az_AZ/stripe.lang
@@ -0,0 +1,72 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Stripe module setup
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
+StripeOrCBDoPayment=Pay with credit card or Stripe
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+Creditor=Creditor
+PaymentCode=Payment code
+StripeDoPayment=Pay with Stripe
+YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+Continue=Next
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment page for a sales order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment page for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.<br>For the URL of payments with no existing object, you may also add the parameter <strong>&noidempotency=1</strong> so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter)
+SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+NewStripePaymentReceived=New Stripe payment received
+NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
+STRIPE_TEST_SECRET_KEY=Secret test key
+STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
+STRIPE_LIVE_SECRET_KEY=Secret live key
+STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
+StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
+StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
+StripePayoutList=List of Stripe payouts
+ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
+ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
+PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
+ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
diff --git a/htdocs/langs/az_AZ/supplier_proposal.lang b/htdocs/langs/az_AZ/supplier_proposal.lang
new file mode 100644
index 00000000000..ce5bdf0425a
--- /dev/null
+++ b/htdocs/langs/az_AZ/supplier_proposal.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposalNew=New price request
+CommRequest=Price request
+CommRequests=Price requests
+SearchRequest=Find a request
+DraftRequests=Draft requests
+SupplierProposalsDraft=Draft vendor proposals
+LastModifiedRequests=Latest %s modified price requests
+RequestsOpened=Open price requests
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
+NewAskPrice=New price request
+ShowSupplierProposal=Show price request
+AddSupplierProposal=Create a price request
+SupplierProposalRefFourn=Vendor ref
+SupplierProposalDate=Delivery date
+SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
+ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
+DeleteAsk=Delete request
+ValidateAsk=Validate request
+SupplierProposalStatusDraft=Draft (needs to be validated)
+SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusClosed=Closed
+SupplierProposalStatusSigned=Accepted
+SupplierProposalStatusNotSigned=Refused
+SupplierProposalStatusDraftShort=Draft
+SupplierProposalStatusValidatedShort=Validated
+SupplierProposalStatusClosedShort=Closed
+SupplierProposalStatusSignedShort=Accepted
+SupplierProposalStatusNotSignedShort=Refused
+CopyAskFrom=Create a price request by copying an existing request
+CreateEmptyAsk=Create blank request
+ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
+ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
+SendAskByMail=Send price request by mail
+SendAskRef=Sending the price request %s
+SupplierProposalCard=Request card
+ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
+ActionsOnSupplierProposal=Events on price request
+DocModelAuroreDescription=A complete request model (logo...)
+CommercialAsk=Price request
+DefaultModelSupplierProposalCreate=Default model creation
+DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
+DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
+ListOfSupplierProposals=List of vendor proposal requests
+ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
+SupplierProposalsToClose=Vendor proposals to close
+SupplierProposalsToProcess=Vendor proposals to process
+LastSupplierProposals=Latest %s price requests
+AllPriceRequests=All requests
diff --git a/htdocs/langs/az_AZ/suppliers.lang b/htdocs/langs/az_AZ/suppliers.lang
new file mode 100644
index 00000000000..b69b11272b4
--- /dev/null
+++ b/htdocs/langs/az_AZ/suppliers.lang
@@ -0,0 +1,47 @@
+# Dolibarr language file - Source file is en_US - vendors
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
+History=History
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
+OrderDate=Order date
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
+SupplierPrices=Vendor prices
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
+Availability=Availability
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order details
+ApproveThisOrder=Approve this order
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
+DenyingThisOrder=Deny this order
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
+SupplierReputation=Vendor reputation
+DoNotOrderThisProductToThisSupplier=Do not order
+NotTheGoodQualitySupplier=Low quality
+ReputationForThisProduct=Reputation
+BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
+AllProductReferencesOfSupplier=All product / service references of vendor
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/az_AZ/ticket.lang b/htdocs/langs/az_AZ/ticket.lang
new file mode 100644
index 00000000000..80518c3401a
--- /dev/null
+++ b/htdocs/langs/az_AZ/ticket.lang
@@ -0,0 +1,305 @@
+# en_US lang file for module ticket
+# Copyright (C) 2013  Jean-François FERRY <hello@librethic.io>
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+Module56000Name=Tickets
+Module56000Desc=Ticket system for issue or request management
+
+Permission56001=See tickets
+Permission56002=Modify tickets
+Permission56003=Delete tickets
+Permission56004=Manage tickets
+Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+
+TicketDictType=Ticket - Types
+TicketDictCategory=Ticket - Groupes
+TicketDictSeverity=Ticket - Severities
+TicketDictResolution=Ticket - Resolution
+TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
+TicketTypeShortBUGHARD=Dysfonctionnement matériel
+TicketTypeShortCOM=Commercial question
+
+TicketTypeShortHELP=Request for functionnal help
+TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortPROJET=Project
+TicketTypeShortOTHER=Other
+
+TicketSeverityShortLOW=Low
+TicketSeverityShortNORMAL=Normal
+TicketSeverityShortHIGH=High
+TicketSeverityShortBLOCKING=Critical/Blocking
+
+ErrorBadEmailAddress=Field '%s' incorrect
+MenuTicketMyAssign=My tickets
+MenuTicketMyAssignNonClosed=My open tickets
+MenuListNonClosed=Open tickets
+
+TypeContact_ticket_internal_CONTRIBUTOR=Contributor
+TypeContact_ticket_internal_SUPPORTTEC=Assigned user
+TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
+TypeContact_ticket_external_CONTRIBUTOR=External contributor
+
+OriginEmail=Email source
+Notify_TICKET_SENTBYMAIL=Send ticket message by email
+
+# Status
+NotRead=Not read
+Read=Read
+Assigned=Assigned
+InProgress=In progress
+NeedMoreInformation=Waiting for information
+Answered=Answered
+Waiting=Waiting
+Closed=Closed
+Deleted=Deleted
+
+# Dict
+Type=Type
+Category=Analytic code
+Severity=Severity
+
+# Email templates
+MailToSendTicketMessage=To send email from ticket message
+
+#
+# Admin page
+#
+TicketSetup=Ticket module setup
+TicketSettings=Settings
+TicketSetupPage=
+TicketPublicAccess=A public interface requiring no identification is available at the following url
+TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
+TicketParamModule=Module variable setup
+TicketParamMail=Email setup
+TicketEmailNotificationFrom=Notification email from
+TicketEmailNotificationFromHelp=Used into ticket message answer by example
+TicketEmailNotificationTo=Notifications email to
+TicketEmailNotificationToHelp=Send email notifications to this address.
+TicketNewEmailBodyLabel=Text message sent after creating a ticket
+TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
+TicketParamPublicInterface=Public interface setup
+TicketsEmailMustExist=Require an existing email address to create a ticket
+TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket.
+PublicInterface=Public interface
+TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
+TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
+TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
+TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
+TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
+TicketPublicInterfaceTopicLabelAdmin=Interface title
+TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
+TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
+ExtraFieldsTicket=Extra attributes
+TicketCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
+TicketsDisableEmail=Do not send emails for ticket creation or message recording
+TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
+TicketsLogEnableEmail=Enable log by email
+TicketsLogEnableEmailHelp=At each change, an email will be sent **to each contact** associated with the ticket.
+TicketParams=Params
+TicketsShowModuleLogo=Display the logo of the module in the public interface
+TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
+TicketsShowCompanyLogo=Display the logo of the company in the public interface
+TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
+TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
+TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
+TicketsActivatePublicInterface=Activate public interface
+TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create tickets.
+TicketsAutoAssignTicket=Automatically assign the user who created the ticket
+TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
+TicketNumberingModules=Tickets numbering module
+TicketNotifyTiersAtCreation=Notify third party at creation
+TicketGroup=Group
+TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
+#
+# Index & list page
+#
+TicketsIndex=Tickets area
+TicketList=List of tickets
+TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
+NoTicketsFound=No ticket found
+NoUnreadTicketsFound=No unread ticket found
+TicketViewAllTickets=View all tickets
+TicketViewNonClosedOnly=View only open tickets
+TicketStatByStatus=Tickets by status
+OrderByDateAsc=Sort by ascending date
+OrderByDateDesc=Sort by descending date
+ShowAsConversation=Show as conversation list
+MessageListViewType=Show as table list
+
+#
+# Ticket card
+#
+Ticket=Ticket
+TicketCard=Ticket card
+CreateTicket=Create ticket
+EditTicket=Edit ticket
+TicketsManagement=Tickets Management
+CreatedBy=Created by
+NewTicket=New Ticket
+SubjectAnswerToTicket=Ticket answer
+TicketTypeRequest=Request type
+TicketCategory=Analytic code
+SeeTicket=See ticket
+TicketMarkedAsRead=Ticket has been marked as read
+TicketReadOn=Read on
+TicketCloseOn=Closing date
+MarkAsRead=Mark ticket as read
+TicketHistory=Ticket history
+AssignUser=Assign to user
+TicketAssigned=Ticket is now assigned
+TicketChangeType=Change type
+TicketChangeCategory=Change analytic code
+TicketChangeSeverity=Change severity
+TicketAddMessage=Add a message
+AddMessage=Add a message
+MessageSuccessfullyAdded=Ticket added
+TicketMessageSuccessfullyAdded=Message successfully added
+TicketMessagesList=Message list
+NoMsgForThisTicket=No message for this ticket
+Properties=Classification
+LatestNewTickets=Latest %s newest tickets (not read)
+TicketSeverity=Severity
+ShowTicket=See ticket
+RelatedTickets=Related tickets
+TicketAddIntervention=Create intervention
+CloseTicket=Close ticket
+CloseATicket=Close a ticket
+ConfirmCloseAticket=Confirm ticket closing
+ConfirmDeleteTicket=Please confirm ticket deleting
+TicketDeletedSuccess=Ticket deleted with success
+TicketMarkedAsClosed=Ticket marked as closed
+TicketDurationAuto=Calculated duration
+TicketDurationAutoInfos=Duration calculated automatically from intervention related
+TicketUpdated=Ticket updated
+SendMessageByEmail=Send message by email
+TicketNewMessage=New message
+ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
+TicketGoIntoContactTab=Please go into "Contacts" tab to select them
+TicketMessageMailIntro=Introduction
+TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
+TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
+TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
+TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
+TicketMessageMailSignature=Signature
+TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
+TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
+TicketMessageMailSignatureLabelAdmin=Signature of response email
+TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
+TicketMessageHelp=Only this text will be saved in the message list on ticket card.
+TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
+TimeElapsedSince=Time elapsed since
+TicketTimeToRead=Time elapsed before read
+TicketContacts=Contacts ticket
+TicketDocumentsLinked=Documents linked to ticket
+ConfirmReOpenTicket=Confirm reopen this ticket ?
+TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
+TicketAssignedToYou=Ticket assigned
+TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
+MarkMessageAsPrivate=Mark message as private
+TicketMessagePrivateHelp=This message will not display to external users
+TicketEmailOriginIssuer=Issuer at origin of the tickets
+InitialMessage=Initial Message
+LinkToAContract=Link to a contract
+TicketPleaseSelectAContract=Select a contract
+UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
+TicketMailExchanges=Mail exchanges
+TicketInitialMessageModified=Initial message modified
+TicketMessageSuccesfullyUpdated=Message successfully updated
+TicketChangeStatus=Change status
+TicketConfirmChangeStatus=Confirm the status change: %s ?
+TicketLogStatusChanged=Status changed: %s to %s
+TicketNotNotifyTiersAtCreate=Not notify company at create
+Unread=Unread
+TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
+PublicInterfaceNotEnabled=Public interface was not enabled
+ErrorTicketRefRequired=Ticket reference name is required
+
+#
+# Logs
+#
+TicketLogMesgReadBy=Ticket %s read by %s
+NoLogForThisTicket=No log for this ticket yet
+TicketLogAssignedTo=Ticket %s assigned to %s
+TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
+TicketLogClosedBy=Ticket %s closed by %s
+TicketLogReopen=Ticket %s re-open
+
+#
+# Public pages
+#
+TicketSystem=Ticket system
+ShowListTicketWithTrackId=Display ticket list from track ID
+ShowTicketWithTrackId=Display ticket from track ID
+TicketPublicDesc=You can create a support ticket or check from an existing ID.
+YourTicketSuccessfullySaved=Ticket has been successfully saved!
+MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
+PleaseRememberThisId=Please keep the tracking number that we might ask you later.
+TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
+TicketNewEmailSubjectCustomer=New support ticket
+TicketNewEmailBody=This is an automatic email to confirm you have registered a new ticket.
+TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
+TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
+TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
+TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
+TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
+TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
+TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
+TicketPublicMsgViewLogIn=Please enter ticket tracking ID
+TicketTrackId=Public Tracking ID
+OneOfTicketTrackId=One of your tracking ID
+ErrorTicketNotFound=Ticket with tracking ID %s not found!
+Subject=Subject
+ViewTicket=View ticket
+ViewMyTicketList=View my ticket list
+ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
+TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
+TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
+SeeThisTicketIntomanagementInterface=See ticket in management interface
+TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
+ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
+OldUser=Old user
+NewUser=New user
+NumberOfTicketsByMonth=Number of tickets per month
+NbOfTickets=Number of tickets
+# notifications
+TicketNotificationEmailSubject=Ticket %s updated
+TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
+TicketNotificationRecipient=Notification recipient
+TicketNotificationLogMessage=Log message
+TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
+TicketNotificationNumberEmailSent=Notification email sent: %s
+
+ActionsOnTicket=Events on ticket
+
+#
+# Boxes
+#
+BoxLastTicket=Latest created tickets
+BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicketContent=
+BoxLastTicketNoRecordedTickets=No recent unread tickets
+BoxLastModifiedTicket=Latest modified tickets
+BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastModifiedTicketContent=
+BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
diff --git a/htdocs/langs/az_AZ/trips.lang b/htdocs/langs/az_AZ/trips.lang
new file mode 100644
index 00000000000..654f14d6bf7
--- /dev/null
+++ b/htdocs/langs/az_AZ/trips.lang
@@ -0,0 +1,151 @@
+# Dolibarr language file - Source file is en_US - trips
+ShowExpenseReport=Show expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense reports
+ListOfFees=List of fees
+TypeFees=Types of fees
+ShowTrip=Show expense report
+NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
+CompanyVisited=Company/organization visited
+FeesKilometersOrAmout=Amount or kilometers
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportApproved=An expense report was approved
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
+ExpenseReportRefused=An expense report was refused
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
+ExpenseReportCanceled=An expense report was canceled
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
+ExpenseReportPaid=An expense report was paid
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripNDF=Informations expense report
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Other
+TF_TRIP=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hotel
+TF_TAXI=Taxi
+EX_KME=Mileage costs
+EX_FUE=Fuel CV
+EX_HOT=Hotel
+EX_PAR=Parking CV
+EX_TOL=Toll CV
+EX_TAX=Various Taxes
+EX_IND=Indemnity transportation subscription
+EX_SUM=Maintenance supply
+EX_SUO=Office supplies
+EX_CAR=Car rental
+EX_DOC=Documentation
+EX_CUR=Customers receiving
+EX_OTR=Other receiving
+EX_POS=Postage
+EX_CAM=CV maintenance and repair
+EX_EMM=Employees meal
+EX_GUM=Guests meal
+EX_BRE=Breakfast
+EX_FUE_VP=Fuel PV
+EX_TOL_VP=Toll PV
+EX_PAR_VP=Parking PV
+EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
+UploadANewFileNow=Upload a new document now
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+AucuneLigne=There is no expense report declared yet
+ModePaiement=Payment mode
+VALIDATOR=User responsible for approval
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paid by
+REFUSEUR=Denied by
+CANCEL_USER=Deleted by
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+BROUILLONNER=Reopen
+ExpenseReportRef=Ref. expense report
+ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+ConfirmRefuseTrip=Are you sure you want to deny this expense report?
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report?
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
+ConfirmCancelTrip=Are you sure you want to cancel this expense report?
+BrouillonnerTrip=Move back expense report to status "Draft"
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report?
+NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
+ExpenseReportsToApprove=Expense reports to approve
+ExpenseReportsToPay=Expense reports to pay
+ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
+ExpenseReportsIk=Expense report milles index
+ExpenseReportsRules=Expense report rules
+ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
+ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report
+expenseReportOffset=Offset
+expenseReportCoef=Coefficient
+expenseReportTotalForFive=Example with <u>d</u> = 5
+expenseReportRangeFromTo=from %d to %d
+expenseReportRangeMoreThan=more than %d
+expenseReportCoefUndefined=(value not defined)
+expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
+expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
+expenseReportPrintExample=offset + (d x coef) = %s
+ExpenseReportApplyTo=Apply to
+ExpenseReportDomain=Domain to apply
+ExpenseReportLimitOn=Limit on
+ExpenseReportDateStart=Date start
+ExpenseReportDateEnd=Date end
+ExpenseReportLimitAmount=Limite amount
+ExpenseReportRestrictive=Restrictive
+AllExpenseReport=All type of expense report
+OnExpense=Expense line
+ExpenseReportRuleSave=Expense report rule saved
+ExpenseReportRuleErrorOnSave=Error: %s
+RangeNum=Range %d
+ExpenseReportConstraintViolationError=Constraint violation id [%s]: %s  is superior to %s %s
+byEX_DAY=by day (limitation to %s)
+byEX_MON=by month (limitation to %s)
+byEX_YEA=by year (limitation to %s)
+byEX_EXP=by line (limitation to %s)
+ExpenseReportConstraintViolationWarning=Constraint violation id [%s]: %s  is superior to %s %s
+nolimitbyEX_DAY=by day (no limitation)
+nolimitbyEX_MON=by month (no limitation)
+nolimitbyEX_YEA=by year (no limitation)
+nolimitbyEX_EXP=by line (no limitation)
+CarCategory=Category of car
+ExpenseRangeOffset=Offset amount: %s
+RangeIk=Mileage range
+AttachTheNewLineToTheDocument=Attach the line to an uploaded document
diff --git a/htdocs/langs/az_AZ/users.lang b/htdocs/langs/az_AZ/users.lang
new file mode 100644
index 00000000000..41a5ebd0981
--- /dev/null
+++ b/htdocs/langs/az_AZ/users.lang
@@ -0,0 +1,118 @@
+# Dolibarr language file - Source file is en_US - users
+HRMArea=HRM area
+UserCard=User card
+GroupCard=Group card
+Permission=Permission
+Permissions=Permissions
+EditPassword=Edit password
+SendNewPassword=Regenerate and send password
+SendNewPasswordLink=Send link to reset password
+ReinitPassword=Regenerate password
+PasswordChangedTo=Password changed to: %s
+SubjectNewPassword=Your new password for %s
+GroupRights=Group permissions
+UserRights=User permissions
+UserGUISetup=User Display Setup
+DisableUser=Disable
+DisableAUser=Disable a user
+DeleteUser=Delete
+DeleteAUser=Delete a user
+EnableAUser=Enable a user
+DeleteGroup=Delete
+DeleteAGroup=Delete a group
+ConfirmDisableUser=Are you sure you want to disable user <b>%s</b>?
+ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b>?
+ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b>?
+ConfirmEnableUser=Are you sure you want to enable user <b>%s</b>?
+ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b>?
+ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
+NewUser=New user
+CreateUser=Create user
+LoginNotDefined=Login is not defined.
+NameNotDefined=Name is not defined.
+ListOfUsers=List of users
+SuperAdministrator=Super Administrator
+SuperAdministratorDesc=Global administrator
+AdministratorDesc=Administrator
+DefaultRights=Default Permissions
+DefaultRightsDesc=Define here the <u>default</u> permissions that are automatically granted to a <u>new</u> user (to modify permissions for existing users, go to the user card).
+DolibarrUsers=Dolibarr users
+LastName=Last name
+FirstName=First name
+ListOfGroups=List of groups
+NewGroup=New group
+CreateGroup=Create group
+RemoveFromGroup=Remove from group
+PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
+PasswordChangeRequest=Request to change password for <b>%s</b>
+PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+ConfirmPasswordReset=Confirm password reset
+MenuUsersAndGroups=Users & Groups
+LastGroupsCreated=Latest %s groups created
+LastUsersCreated=Latest %s users created
+ShowGroup=Show group
+ShowUser=Show user
+NonAffectedUsers=Non assigned users
+UserModified=User modified successfully
+PhotoFile=Photo file
+ListOfUsersInGroup=List of users in this group
+ListOfGroupsForUser=List of groups for this user
+LinkToCompanyContact=Link to third party / contact
+LinkedToDolibarrMember=Link to member
+LinkedToDolibarrUser=Link to Dolibarr user
+LinkedToDolibarrThirdParty=Link to Dolibarr third party
+CreateDolibarrLogin=Create a user
+CreateDolibarrThirdParty=Create a third party
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
+UsePersonalValue=Use personal value
+InternalUser=Internal user
+ExportDataset_user_1=Users and their properties
+DomainUser=Domain user %s
+Reactivate=Reactivate
+CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
+Inherited=Inherited
+UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
+UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
+IdPhoneCaller=Id phone caller
+NewUserCreated=User %s created
+NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
+EventUserModified=User %s modified
+UserDisabled=User %s disabled
+UserEnabled=User %s activated
+UserDeleted=User %s removed
+NewGroupCreated=Group %s created
+GroupModified=Group %s modified
+GroupDeleted=Group %s removed
+ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact?
+ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member?
+ConfirmCreateThirdParty=Are you sure you want to create a third party for this member?
+LoginToCreate=Login to create
+NameToCreate=Name of third party to create
+YourRole=Your roles
+YourQuotaOfUsersIsReached=Your quota of active users is reached !
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
+DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
+HierarchicalResponsible=Supervisor
+HierarchicView=Hierarchical view
+UseTypeFieldToChange=Use field Type to change
+OpenIDURL=OpenID URL
+LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Hours worked (per week)
+ExpectedWorkedHours=Expected worked hours per week
+ColorUser=Color of the user
+DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accounting code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Employment Start Date
+DateEmploymentEnd=Employment End Date
+CantDisableYourself=You can't disable your own user record
+ForceUserExpenseValidator=Force expense report validator
+ForceUserHolidayValidator=Force leave request validator
+ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/az_AZ/website.lang b/htdocs/langs/az_AZ/website.lang
new file mode 100644
index 00000000000..bce2a09fb03
--- /dev/null
+++ b/htdocs/langs/az_AZ/website.lang
@@ -0,0 +1,130 @@
+# Dolibarr language file - Source file is en_US - website
+Shortname=Code
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
+DeleteWebsite=Delete website
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
+WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
+WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
+WEBSITE_CSS_URL=URL of external CSS file
+WEBSITE_CSS_INLINE=CSS file content (common to all pages)
+WEBSITE_JS_INLINE=Javascript file content (common to all pages)
+WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
+WEBSITE_ROBOT=Robot file (robots.txt)
+WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
+HtmlHeaderPage=HTML header (specific to this page only)
+PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
+EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
+MediaFiles=Media library
+EditCss=Edit website properties
+EditMenu=Edit menu
+EditMedias=Edit medias
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
+AddWebsite=Add website
+Webpage=Web page/container
+AddPage=Add page/container
+HomePage=Home Page
+PageContainer=Page/container
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
+PageContent=Page/Contenair
+PageDeleted=Page/Contenair '%s' of website %s deleted
+PageAdded=Page/Contenair '%s' added
+ViewSiteInNewTab=View site in new tab
+ViewPageInNewTab=View page in new tab
+SetAsHomePage=Set as Home page
+RealURL=Real URL
+ViewWebsiteInProduction=View web site using home URLs
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+TestDeployOnWeb=Test/deploy on web
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
+NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
+SyntaxHelp=Help on specific syntax tips
+YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+ClonePage=Clone page/container
+CloneSite=Clone site
+SiteAdded=Website added
+ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
+PageIsANewTranslation=The new page is a translation of the current page ?
+LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
+ParentPageId=Parent page ID
+WebsiteId=Website ID
+CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
+FetchAndCreate=Fetch and Create
+ExportSite=Export website
+ImportSite=Import website template
+IDOfPage=Id of page
+Banner=Banner
+BlogPost=Blog post
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
+AddWebsiteAccount=Create web site account
+BackToListForThirdParty=Back to list for the third-party
+DisableSiteFirst=Disable website first
+MyContainerTitle=My web site title
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is a translation of
+ThisPageHasTranslationPages=This page/container has translation
+NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
+GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Search or Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
+MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
+EditInLineOnOff=Mode 'Edit inline' is %s
+ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
+GlobalCSSorJS=Global CSS/JS/Header file of web site
+BackToHomePage=Back to home page...
+TranslationLinks=Translation links
+YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not a website page
+UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
+MainLanguage=Main language
+OtherLanguages=Other languages
+UseManifest=Provide a manifest.json file
+PublicAuthorAlias=Public author alias
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
+ReplacementDoneInXPages=Replacement done in %s pages or containers
diff --git a/htdocs/langs/az_AZ/withdrawals.lang b/htdocs/langs/az_AZ/withdrawals.lang
new file mode 100644
index 00000000000..b1d6e30e329
--- /dev/null
+++ b/htdocs/langs/az_AZ/withdrawals.lang
@@ -0,0 +1,119 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
+NewStandingOrder=New direct debit order
+StandingOrderToProcess=To process
+WithdrawalsReceipts=Direct debit orders
+WithdrawalReceipt=Direct debit order
+LastWithdrawalReceipts=Latest %s direct debit files
+WithdrawalsLines=Direct debit order lines
+RequestStandingOrderToTreat=Request for direct debit payment order to process
+RequestStandingOrderTreated=Request for direct debit payment order processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
+AmountToWithdraw=Amount to withdraw
+WithdrawsRefused=Direct debit refused
+NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
+ResponsibleUser=User Responsible
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
+MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
+ClassCredited=Classify credited
+ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
+TransData=Transmission date
+TransMetod=Transmission method
+Send=Send
+Lines=Lines
+StandingOrderReject=Issue a rejection
+WithdrawalRefused=Withdrawal refused
+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=Invoice refused (Charge the rejection to customer)
+StatusDebitCredit=Status debit/credit
+StatusWaiting=Waiting
+StatusTrans=Sent
+StatusCredited=Credited
+StatusRefused=Refused
+StatusMotif0=Unspecified
+StatusMotif1=Insufficient funds
+StatusMotif2=Request contested
+StatusMotif3=No direct debit payment order
+StatusMotif4=Sales Order
+StatusMotif5=RIB unusable
+StatusMotif6=Account without balance
+StatusMotif7=Judicial Decision
+StatusMotif8=Other reason
+CreateForSepaFRST=Create direct debit file (SEPA FRST)
+CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
+CreateAll=Create direct debit file (all)
+CreateGuichet=Only office
+CreateBanque=Only bank
+OrderWaiting=Waiting for treatment
+NotifyTransmision=Withdrawal Transmission
+NotifyCredit=Withdrawal Credit
+NumeroNationalEmetter=National Transmitter Number
+WithBankUsingRIB=For bank accounts using RIB
+WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
+BankToReceiveWithdraw=Receiving Bank Account
+CreditDate=Credit on
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+WithdrawalFile=Withdrawal file
+SetToStatusSent=Set to status "File Sent"
+ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
+StatisticsByLineStatus=Statistics by status of lines
+RUM=UMR
+DateRUM=Mandate signature date
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
+WithdrawMode=Direct debit mode (FRST or RECUR)
+WithdrawRequestAmount=Amount of Direct debit request:
+WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
+SepaMandate=SEPA Direct Debit Mandate
+SepaMandateShort=SEPA Mandate
+PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
+SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+CreditorIdentifier=Creditor Identifier
+CreditorName=Creditor Name
+SEPAFillForm=(B) Please complete all the fields marked *
+SEPAFormYourName=Your name
+SEPAFormYourBAN=Your Bank Account Name (IBAN)
+SEPAFormYourBIC=Your Bank Identifier Code (BIC)
+SEPAFrstOrRecur=Type of payment
+ModeRECUR=Recurring payment
+ModeFRST=One-off payment
+PleaseCheckOne=Please check one only
+DirectDebitOrderCreated=Direct debit order %s created
+AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
+
+### Notifications
+InfoCreditSubject=Payment of direct debit payment order %s by the bank
+InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
+InfoTransSubject=Transmission of direct debit payment order %s to bank
+InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
+InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
+InfoRejectSubject=Direct debit payment order refused
+InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/az_AZ/workflow.lang b/htdocs/langs/az_AZ/workflow.lang
new file mode 100644
index 00000000000..be126eef0f4
--- /dev/null
+++ b/htdocs/langs/az_AZ/workflow.lang
@@ -0,0 +1,20 @@
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=Workflow module setup
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+# Autocreate
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
+# Autoclassify customer proposal or order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+AutomaticCreation=Automatic creation
+AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/az_AZ/zapier.lang b/htdocs/langs/az_AZ/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/az_AZ/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index b29a30b133e..9169cab96fb 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Свързани редове на фактури
 ExpenseReportLines=Редове на разходни отчети за свързване
 ExpenseReportLinesDone=Свързани редове на разходни отчети
 IntoAccount=Свързване на ред със счетоводна сметка
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Свързване
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Счетоводна сметка за регистр
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Счетоводен акаунт за регистриране на членски внос
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Счетоводна сметка по подразбиране за закупени продукти (използва се, ако не е определена в продуктовата карта)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Счетоводна сметка по подразбиране за закупени продукти в ЕИО (използва се, ако не е дефинирана в картата на продукта)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Счетоводна сметка по подразбиране за закупени продукти и внесени отвън ЕИО (използва се, ако не е дефинирана в картата на продукта)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Счетоводна сметка по подразбиране за продадени продукти (използва се, ако не е дефинирана в продуктовата карта)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Счетоводна сметка по подразбиране за продадени продукти в ЕИО (използва се, ако не е определена в продуктовата карта)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Счетоводна сметка по подразбиране за продадени и експортирани продукти извън ЕИО (използва се, ако не е определена в продуктовата карта)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Счетоводна сметка по подразбиране за закупени услуги (използва се, ако не е дефинирана в картата на услугата)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Счетоводна сметка по подразбиране за закупени услуги в ЕИО (използва се, ако не е дефинирана в картата на услугата)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Счетоводна сметка по подразбиране за закупени услуги и внесени отвън ЕИО (използва се, ако не е дефинирана в картата на услугата)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Счетоводна сметка по подразбиране за продадени услуги (използва се, ако не е дефинирана в картата на услугата)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Счетоводна сметка по подразбиране за продадени услуги в ЕИО (използва се, ако не е определена в картата на услугата)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Счетоводна сметка по подразбиране за продадени и експортирани услуги извън ЕИО (използва се, ако не е определена в картата на услугата)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Неизвест
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Сметката на контрагента не е определена или контрагента е неизвестен. Блокираща грешка.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Неизвестна сметка на контрагент и сметка за изчакване не са определени. Блокираща грешка.
 PaymentsNotLinkedToProduct=Плащането не е свързано с нито един продукт / услуга
+OpeningBalance=Opening balance
 ShowOpeningBalance=Показване на баланс при откриване
 HideOpeningBalance=Скриване на баланс при откриване
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Група от сметки
 PcgtypeDesc=Групата от сметки се използва като предварително зададен критерий за филтриране и групиране за някои счетоводни отчети. Например 'Приход' или 'Разход' се използват като групи за счетоводни сметки на продукти за съставяне на отчет за разходи / приходи.
 
+Reconcilable=Съвместим
+
 TotalVente=Общ оборот преди ДДС
 TotalMarge=Общ марж на продажби
 
@@ -250,7 +260,7 @@ DescVentilExpenseReport=Преглед на списъка с редове на
 DescVentilExpenseReportMore=Ако настроите счетоводна сметка за видовете разходен отчет, то системата ще може да извърши всички свързвания между редовете на разходния отчет и счетоводната сметка във вашия сметкоплан, просто с едно щракване с бутона <strong>"%s"</strong>. Ако сметката не е зададена в речника с таксите или ако все още имате някои редове, които не са свързани с нито една сметка ще трябва да направите ръчно свързване от менюто "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Преглед на списъка с редове на разходни отчети и тяхната счетоводна сметка за такса
 
-DescClosure=Преглед на броя движения по месеци, които не са валидирани и отворените фискални години
+DescClosure=Преглед на броя движения за месец, които не са валидирани за активните фискални години
 OverviewOfMovementsNotValidated=Стъпка 1 / Преглед на движенията, които не са валидирани (необходимо за приключване на фискална година)
 ValidateMovements=Валидиране на движения
 DescValidateMovements=Всякакви промени или изтриване на написаното ще бъдат забранени. Всички записи за изпълнение трябва да бъдат валидирани, в противен случай приключването няма да е възможно.
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Експортиране за Quadratus QuadraCompta
 Modelcsv_ebp=Експортиране за EBP
 Modelcsv_cogilog=Експортиране за Cogilog
 Modelcsv_agiris=Експортиране за Agiris
-Modelcsv_LDCompta=Експортиране за LD Compta (v9 и по-нова версия) (Тест)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Експортиране за LD Compta (v10 и по-нова)
 Modelcsv_openconcerto=Експортиране за OpenConcerto (Тест)
 Modelcsv_configurable=Експортиране в конфигурируем CSV
 Modelcsv_FEC=Експортиране за FEC
 Modelcsv_Sage50_Swiss=Експортиране за Sage 50 Швейцария
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Идентификатор на сметкоплан
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Режим продажби
 OptionModeProductSellIntra=Режим продажби, изнасяни в ЕИО
 OptionModeProductSellExport=Режим продажби, изнасяни в други държави
 OptionModeProductBuy=Режим покупки
+OptionModeProductBuyIntra=Режим покупки, внесени от ЕИО
+OptionModeProductBuyExport=Режим покупки, внесени от други държави
 OptionModeProductSellDesc=Показване на всички продукти със счетоводна сметка за продажби.
 OptionModeProductSellIntraDesc=Показване на всички продукти със счетоводна сметка за продажби в ЕИО.
 OptionModeProductSellExportDesc=Показване на всички продукти със счетоводна сметка за други чуждестранни продажби.
 OptionModeProductBuyDesc=Показване на всички продукти със счетоводна сметка за покупки.
+OptionModeProductBuyIntraDesc=Показване на всички продукти със счетоводна сметка за покупки в ЕИО.
+OptionModeProductBuyExportDesc=Показване на всички продукти със счетоводна сметка за други чуждестранни покупки
 CleanFixHistory=Премахване на счетоводния код от редове, които не съществуват в сметкоплана
 CleanHistory=Нулиране на всички връзки за избраната година
 PredefinedGroups=Предварително определени групи
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Сметката е премахната от група
 SaleLocal=Локална продажба
 SaleExport=Експортна продажба
 SaleEEC=Вътреобщностна продажба
+SaleEECWithVAT=Продажба в ЕИО с ДДС различен от нула, за която се предполага, че НЕ е вътреобщностна продажба, поради тази причина се препоръчва стандартната сметка за продукти.
+SaleEECWithoutVATNumber=Продажба в ЕИО без ДДС, но идентификационният номер по ДДС на контрагента не е определен. Ще се използва стандартната сметка за продажба на продукти. Може да въведете идентификационен номер по ДДС на контрагента или сметка на продукта, ако е необходимо.
 
 ## Dictionary
 Range=Обхват на счетоводна сметка
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index aff61d22ae5..24e874ed1e2 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Уеб сървър потребител / група
 NoSessionFound=Изглежда, че вашата PHP конфигурация не позволява изброяване на активни сесии. Директорията, използвана за запазване на сесии (<b> %s </b>), може да е защитена (например от права на операционната система или от директивата PHP open_basedir).
 DBStoringCharset=Кодиране на знаците при съхраняване в базата данни
 DBSortingCharset=Кодиране на знаците при сортиране в базата данни
+HostCharset=Host charset
 ClientCharset=Кодиране от страна на клиента
 ClientSortingCharset=Съпоставяне от страна на клиента
 WarningModuleNotActive=Модул <b>%s</b> е необходимо да бъде включен
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Полета за отметка
 ExtrafieldCheckBoxFromList=Отметки от таблица
 ExtrafieldLink=Връзка към обект
 ComputedFormula=Изчислено поле
-ComputedFormulaDesc=Тук можете да въведете формула, използвайки други свойства на обекта или PHP код, за да получите изчислена динамична стойност. Може да използвате всички съвместими с PHP формули, включително "?" условен оператор и следния глобален обект: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>Внимание</strong>: Може да са налице само някои свойства на $object. Ако ви трябват свойства, които не са заредени, просто присвоете обекта във вашата формула като във втория пример.<br>Използването на изчислено поле означава, че не може да въведете никаква стойност от интерфейса. Също така, ако има синтактична грешка, формулата може да не върне нищо.<br><br>Пример за формула:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Пример за презареждане на обект:<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id:($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Друг пример с формула за принудително зареждане на обект и негов главен обект:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Запазване на изчисленото поле
 ComputedpersistentDesc=Изчислените допълнителни полета ще бъдат съхранени в базата данни, но стойността ще бъде преизчислена само когато обектът на това поле бъде променен. Ако изчисленото поле зависи от други обекти или глобални данни, тази стойност може да е грешна!!
 ExtrafieldParamHelpPassword=Оставяйки това поле празно означава, че тази стойност ще бъде съхранена без криптиране (полето трябва да бъде скрито само със звезда на екрана).<br>Посочете 'auto', за да използвате правилото за криптиране по подразбиране и за да запазите паролата в базата данни (тогава четимата стойност ще бъде само хеш код и няма да има начин да извлечете реалната стойност).
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=Ставката на IRPF по подразбиране 
 LocalTax2IsNotUsedDescES=По подразбиране предложената IRPF е 0. Край на правилото.
 LocalTax2IsUsedExampleES=В Испания, професионалистите на свободна практика и независимите професионалисти, които предоставят услуги и фирми, които са избрали данъчната система от модули.
 LocalTax2IsNotUsedExampleES=В Испания те са предприятия, които не подлежат на данъчна система от модули.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Справки за местни данъци
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Правила за генериране и валид
 DisableForgetPasswordLinkOnLogonPage=Да не се показва връзката "Забравена парола" на страницата за вход
 UsersSetup=Настройка на модула за потребители
 UserMailRequired=Необходим е имейл при създаване на нов потребител
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Шаблони на документи за потребителски профил
 GroupsDocModules=Шаблони на документи за групов профил
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Настройка на модула за няколко фи
 ##### Suppliers #####
 SuppliersSetup=Настройка на модул Доставчици
 SuppliersCommandModel=Пълен шаблон на поръчка за покупка
-SuppliersCommandModelMuscadet=Пълен шаблон на поръчка за покупка 
+SuppliersCommandModelMuscadet=Пълен шаблон на поръчка за покупка (стара реализация на шаблона Cornas)
 SuppliersInvoiceModel=Пълен шаблон на фактура за доставка
 SuppliersInvoiceNumberingModel=Модели за номериране на фактури за доставка
 IfSetToYesDontForgetPermission=Ако е настроена различна от нула стойност, не забравяйте да предоставите права на групите или потребителите за второ одобрение
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Скриване на изображения в горно
 LeftMenuBackgroundColor=Цвят на фона в лявото меню
 BackgroundTableTitleColor=Цвят на фона в реда със заглавието на таблица
 BackgroundTableTitleTextColor=Цвят на текста в заглавието на таблиците
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Цвят на фона в нечетните редове на таблица
 BackgroundTableLineEvenColor=Цвят на фона в четните редове на таблица
 MinimumNoticePeriod=Минимален срок за известяване (вашата молба за отпуск трябва да бъде изпратена преди този срок)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Не е намерена Dolibarr референция в 
 FormatZip=Zip
 MainMenuCode=Код на меню (главно меню)
 ECMAutoTree=Показване на автоматично ECM дърво
-OperationParamDesc=Определете стойности, които да използвате за действие или как да извличате стойности. Например: <br> objproperty1=SET:abc <br> objproperty1=SET:value with replacement of __objproperty1__ <br> objproperty3=SETIFEMPTY:abc <br> objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(*). <br> options_myextrafield=EXTRACT:SUBJECT:([^\\s]*) <br> object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*) <br><br> Използвайте символа ; като разделител за извличане или задаване на няколко свойства.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Работно време
 OpeningHoursDesc=Въведете тук редовното работно време на вашата фирма.
 ResourceSetup=Конфигурация на модул Ресурси
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=Ако искате да имате някои тек
 FafaIconSocialNetworksDesc=Въведете тук кода за FontAwesome икона. Ако не знаете какво е FontAwesome, може да използвате стандартната стойност fa-address book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index 6b3ccb21875..02cfd9be1b0 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=Брой фактури за месец
 AmountOfBills=Сума на фактури
 AmountOfBillsHT=Сума на фактури (без ДДС)
 AmountOfBillsByMonthHT=Стойност на фактури за месец (без ДДС)
-ShowSocialContribution=Показване на социален / фискален данък
-ShowBill=Показване на фактура
-ShowInvoice=Показване на фактура
-ShowInvoiceReplace=Показване на заменяща фактура
-ShowInvoiceAvoir=Показване на кредитно известие
-ShowInvoiceDeposit=Показване на авансова фактура
-ShowInvoiceSituation=Показване на ситуационна фактура
 UseSituationInvoices=Разрешаване на ситуационна фактура
 UseSituationInvoicesCreditNote=Разрешаване на кредитно известие за ситуационна фактура
 Retainedwarranty=Запазена гаранция
@@ -233,7 +226,6 @@ setretainedwarranty=Определете запазена гаранция
 setretainedwarrantyDateLimit=Определете крайна дата за запазена гаранция
 RetainedWarrantyDateLimit=Крайна дата на запазена гаранция
 RetainedWarrantyNeed100Percent=Необходимо е ситуационната фактура да бъде с напредък 100%%, за да бъде показана в PDF
-ShowPayment=Показване на плащане
 AlreadyPaid=Вече платено
 AlreadyPaidBack=Вече платено обратно
 AlreadyPaidNoCreditNotesNoDeposits=Вече платено (без кредитни известия и авансови плащания)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Генерирано от шаблонна фактура
 WarningInvoiceDateInFuture=Внимание, датата на фактурата е по-напред от текущата дата
 WarningInvoiceDateTooFarInFuture=Внимание,  датата на фактурата е твърде далеч от текущата дата
 ViewAvailableGlobalDiscounts=Преглед на налични отстъпки
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Статус
 PaymentConditionShortRECEP=При получаване
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=Тази опция е налична само при създаване на фактура от раздел "Клиент" на контрагента
 YouMustCreateInvoiceFromSupplierThird=Тази опция е налична само при създаването на фактура от раздел "Доставчик" на контрагента
 YouMustCreateStandardInvoiceFirstDesc=Първо трябва да създадете стандартна фактура и да я конвертирате в „шаблон“, за да създадете нова шаблонна фактура
-PDFCrabeDescription=PDF шаблон за фактура. Пълен шаблон за фактура 
+PDFCrabeDescription=PDF шаблон за фактура. Пълен шаблон за фактура (стара реализация на шаблон Sponge)
 PDFSpongeDescription=PDF шаблон за фактура. Пълен шаблон за фактура
 PDFCrevetteDescription=PDF шаблон за фактура. Пълен шаблон за ситуационни фактури
 TerreNumRefModelDesc1=Връща номер с формат %syymm-nnnn за стандартни фактури и %syymm-nnnn за кредитни бележки, където yy е година, mm е месец и nnnn е последователност без прекъсване и няма връщане към 0
diff --git a/htdocs/langs/bg_BG/modulebuilder.lang b/htdocs/langs/bg_BG/modulebuilder.lang
index f6582a9152d..fb58554aed1 100644
--- a/htdocs/langs/bg_BG/modulebuilder.lang
+++ b/htdocs/langs/bg_BG/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=Списък на записи в речници
 ListOfPermissionsDefined=Списък на дефинирани права
 SeeExamples=Вижте примери тук
 EnabledDesc=Условие това поле да бъде активно (Примери: 1 или $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Видимо ли е полето? (Примери: 0 = Никога не се вижда, 1 = Видимо в списък и формуляри за създаване / актуализиране / преглеждане, 2 = Видимо само в списък, 3 = Видимо само във формуляр за създаване / актуализиране / преглеждане (не и в списък), 4 = Видимо само в списък и във формуляр за актуализиране / преглеждане (не и за създаване), 5 = Видимо само в списък и във формуляр за преглеждане (не и за създаване и актуализиране). Използването на отрицателна стойност означава, че полето не се показва по подразбиране в списък, но може да бъде избрано за преглеждане). Може да бъде израз, например:<br>preg_match('/public/',$ _SERVER['PHP_SELF'])?0:1<br>($user->rights->vacation->define_holiday?1:0).
-DisplayOnPdfDesc=Показване на това поле в съвместими PDF документи .
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Показване в PDF
 IsAMeasureDesc=Може ли стойността в полето да бъде натрупвана, за да се получи обща в списъка? (Пример: 1 или 0)
 SearchAllDesc=Използва ли се полето за извършване на търсене, чрез инструмента за бързо търсене? (Пример: 1 или 0)
diff --git a/htdocs/langs/bg_BG/multicurrency.lang b/htdocs/langs/bg_BG/multicurrency.lang
new file mode 100644
index 00000000000..382ac1d2440
--- /dev/null
+++ b/htdocs/langs/bg_BG/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Валути
+ErrorAddRateFail=Грешка в добавения курс
+ErrorAddCurrencyFail=Грешка в добавената валута
+ErrorDeleteCurrencyFail=Грешка при изтриване
+multicurrency_syncronize_error=Грешка при синхронизиране: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Използване на датата на документа за намиране на валутния курс, вместо да използване на най-новия известен курс
+multicurrency_useOriginTx=Когато даден обект е създаден от друг запазва първоначалния курс от изходния обект (в противен случай използва най-новия известен курс)
+CurrencyLayerAccount=API на CurrencyLayer
+CurrencyLayerAccount_help_to_synchronize=Трябва да създадете акаунт в сайта %s, за да използвате тази функция. <br> Вземете своя <b>API ключ</b>. <br> Ако използвате безплатен акаунт, не може да променяте <b>валутния източник</b> (USD по подразбиране). <br> Ако основната ви валута не е USD, приложението автоматично ще я калкулира. <br><br> Ограничени сте до 1000 синхронизации на месец.
+multicurrency_appId=API ключ
+multicurrency_appCurrencySource=Валутен източник
+multicurrency_alternateCurrencySource=Алтернативен валутен източник
+CurrenciesUsed=Използвани валути
+CurrenciesUsed_help_to_add=Добавете различните валути и курсове, които трябва да използвате във вашите <b>предложения</b>, <b> поръчки </b> и др.
+rate=курс
+MulticurrencyReceived=Получена сума, основна валута
+MulticurrencyRemainderToTake=Оставаща сума, основна валута
+MulticurrencyPaymentAmount=Сума за плащане, оригинална валута
+AmountToOthercurrency=Сума до (във валута на сметката за получаване)
+CurrencyRateSyncSucceed=Синхронизирането на валутни курсове е извършено успешно
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Използване на валутата в документа при онлайн плащания
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index a0bc06032dd..7fae8e68de5 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Услуга за използване по редовете
 InvoiceGeneratedFromTimeSpent=Фактура %s е генерирана въз основа на отделеното време по проекта
 ProjectBillTimeDescription=Маркирайте, ако въвеждате график на задачите в проекта и планирате да генерирате фактура(и) за клиента от графика на задачите в проекта (не маркирайте, ако планирате да създадете фактура, която не се основава на въведеният график на задачите). Забележка: За да генерирате фактура, отидете в раздела "Отделено време" на проекта и изберете редовете, които да включите.
 ProjectFollowOpportunity=Проследяване на възможности
-ProjectFollowTasks=Проследяване на задачи
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Употреба
 UsageOpportunity=Употреба: Възможност
 UsageTasks=Употреба: Задачи
diff --git a/htdocs/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang
index 95a9f829429..1a39c7e0d2b 100644
--- a/htdocs/langs/bg_BG/website.lang
+++ b/htdocs/langs/bg_BG/website.lang
@@ -57,7 +57,7 @@ NoPageYet=Все още няма страници
 YouCanCreatePageOrImportTemplate=Може да създадете нова страница или да импортирате пълен шаблон на уебсайт
 SyntaxHelp=Помощ с конкретни съвети за синтаксиса
 YouCanEditHtmlSourceckeditor=Може да редактирате изходния HTML код с помощта на бутона 'Код' в редактора.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Може да включите PHP код в този изходен код с помощта на тагове <strong>&lt;?php ?&gt;</strong>. Налични са следните глобални променливи: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs. <br><br><span class="fa fa-bug"></span> Може също да включите съдържание на друга страница / контейнер със следния синтаксис: <br> <strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong> <br><br><span class="fa fa-bug"></span> Може да направите пренасочване към друга страница / контейнер със следния синтаксис (Забележка: не извеждайте никакво съдържание преди пренасочване):<br> <strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong> <br><br><span class="fa fa-link"></span> За да добавите връзка към друга страница, използвайте синтаксиса: <br> <strong>&lt;a href='alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong> <br><br><span class="fa fa-download"></span> За да включите <strong>връзка за изтегляне</strong> на файл, съхраняван в директорията с <strong>документи</strong>, използвайте обвивката <strong>document.php</strong>: <br> Например, за файл в documents / ECM (необходимо е да сте влязъл в системата), синтаксисът е: <br> <strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong> <br> За файл в documents / medias (директория с отворен обществен достъп) синтаксисът е: <br> <strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong> <br> За файл, споделен с връзка за споделяне (отворен достъп с помощта на хеш ключ за споделяне на файл), синтаксисът е: <br> <strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong> <br><br><span class="fa fa-picture-o"></span> За да вмъкнете <strong>изображение</strong>, съхранявано в директорията <strong>documents</strong>, използвайте обвивката <strong>viewimage.php</strong>: <br> Например, за изображение в documents / medias (директория с отворен обществен достъп) синтаксисът е: <br> <strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong> <br><br> Още примери за HTML или динамичен код са налични в <a href="%s" target="_blank">Wiki документацията</a> <br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Клониране на страница / контейнер
 CloneSite=Клониране на сайт
 SiteAdded=Уебсайтът е добавен
@@ -77,7 +77,7 @@ BlogPost=Блог пост
 WebsiteAccount=Уебсайт профил
 WebsiteAccounts=Уебсайт профили
 AddWebsiteAccount=Създаване на уебсайт профил
-BackToListOfThirdParty=Обратно към списъка с контрагенти
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Първо деактивирайте уебсайта
 MyContainerTitle=Заглавието на моя уебсайт
 AnotherContainer=Ето как да включите съдържание от друга страница / контейнер (тук може да получите грешка, ако активирате динамичен код, защото вграденият подконтейнер може да не съществува).
diff --git a/htdocs/langs/bg_BG/zapier.lang b/htdocs/langs/bg_BG/zapier.lang
new file mode 100644
index 00000000000..36779e36087
--- /dev/null
+++ b/htdocs/langs/bg_BG/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier за Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Модул Zapier за Dolibarr
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Настройка на Zapier за Dolibarr
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index 1f9382137ea..b8ce37a0956 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index 0205f246b0c..7eb67d7a4ab 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web server user/group
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Module <b>%s</b> must be enabled
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Users module setup
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang
index 5c9c86c1376..2a117204fec 100644
--- a/htdocs/langs/bn_BD/bills.lang
+++ b/htdocs/langs/bn_BD/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=Show invoice
-ShowInvoice=Show invoice
-ShowInvoiceReplace=Show replacing invoice
-ShowInvoiceAvoir=Show credit note
-ShowInvoiceDeposit=Show deposit invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/bn_BD/donations.lang b/htdocs/langs/bn_BD/donations.lang
index 5edc8d62033..de4bdf68f03 100644
--- a/htdocs/langs/bn_BD/donations.lang
+++ b/htdocs/langs/bn_BD/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Create a donation
 NewDonation=New donation
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Show donation
 PublicDonation=Public donation
 DonationsArea=Donations area
 DonationStatusPromiseNotValidated=Draft promise
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
 DonationTitle=Donation receipt
+DonationDate=Donation date
 DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
diff --git a/htdocs/langs/bn_BD/interventions.lang b/htdocs/langs/bn_BD/interventions.lang
index e7667ef6946..e5936f8246e 100644
--- a/htdocs/langs/bn_BD/interventions.lang
+++ b/htdocs/langs/bn_BD/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/bn_BD/modulebuilder.lang b/htdocs/langs/bn_BD/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/bn_BD/modulebuilder.lang
+++ b/htdocs/langs/bn_BD/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/bn_BD/multicurrency.lang b/htdocs/langs/bn_BD/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/bn_BD/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index cdc0e6b3c95..bb42bff3c87 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang
index c802b2d2ae8..bce2a09fb03 100644
--- a/htdocs/langs/bn_BD/website.lang
+++ b/htdocs/langs/bn_BD/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/bn_BD/zapier.lang b/htdocs/langs/bn_BD/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/bn_BD/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/bn_IN/accountancy.lang b/htdocs/langs/bn_IN/accountancy.lang
new file mode 100644
index 00000000000..b8ce37a0956
--- /dev/null
+++ b/htdocs/langs/bn_IN/accountancy.lang
@@ -0,0 +1,382 @@
+# Dolibarr language file - en_US - Accountancy (Double entries)
+Accountancy=Accountancy
+Accounting=Accounting
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
+ACCOUNTING_EXPORT_LABEL=Export label
+ACCOUNTING_EXPORT_AMOUNT=Export amount
+ACCOUNTING_EXPORT_DEVISE=Export currency
+Selectformat=Select the format for the file
+ACCOUNTING_EXPORT_FORMAT=Select the format for the file
+ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
+ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
+ThisService=This service
+ThisProduct=This product
+DefaultForService=Default for service
+DefaultForProduct=Default for product
+CantSuggest=Can't suggest
+AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journalization=Journalization
+Journaux=Journals
+JournalFinancial=Financial journals
+BackToChartofaccounts=Return chart of accounts
+Chartofaccounts=Chart of accounts
+CurrentDedicatedAccountingAccount=Current dedicated account
+AssignDedicatedAccountingAccount=New account to assign
+InvoiceLabel=Invoice label
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
+OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
+JournalizationInLedgerStatus=Status of journalization
+AlreadyInGeneralLedger=Already journalized in ledgers
+NotYetInGeneralLedger=Not yet journalized in ledgers
+GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
+DetailByAccount=Show detail by account
+AccountWithNonZeroValues=Accounts with non-zero values
+ListOfAccounts=List of accounts
+CountriesInEEC=Countries in EEC
+CountriesNotInEEC=Countries not in EEC
+CountriesInEECExceptMe=Countries in EEC except %s
+CountriesExceptMe=All countries except %s
+AccountantFiles=Export accounting documents
+
+MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
+MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
+MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+
+AccountancyArea=Accounting area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
+
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expenses (miscellaneous taxes). For this, use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
+AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
+AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+
+AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+Selectchartofaccounts=Select active chart of accounts
+ChangeAndLoad=Change and load
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+AccountAccountingShort=Account
+SubledgerAccount=Subledger account
+SubledgerAccountLabel=Subledger account label
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
+AccountAccountingSuggest=Accounting account suggested
+MenuDefaultAccounts=Default accounts
+MenuBankAccounts=Bank accounts
+MenuVatAccounts=Vat accounts
+MenuTaxAccounts=Tax accounts
+MenuExpenseReportAccounts=Expense report accounts
+MenuLoanAccounts=Loan accounts
+MenuProductsAccounts=Product accounts
+MenuClosureAccounts=Closure accounts
+MenuAccountancyClosure=Closure
+MenuAccountancyValidationMovements=Validate movements
+ProductsBinding=Products accounts
+TransferInAccounting=Transfer in accounting
+RegistrationInAccounting=Registration in accounting
+Binding=Binding to accounts
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Vendor invoice binding
+ExpenseReportsVentilation=Expense report binding
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+ValidTransaction=Validate transaction
+WriteBookKeeping=Register transactions in Ledger
+Bookkeeping=Ledger
+AccountBalance=Account balance
+ObjectsRef=Source object ref
+CAHTF=Total purchase vendor before tax
+TotalExpenseReport=Total expense report
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+ExpenseReportLines=Lines of expense reports to bind
+ExpenseReportLinesDone=Bound lines of expense reports
+IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
+
+
+Ventilate=Bind
+LineId=Id line
+Processing=Processing
+EndProcessing=Process terminated.
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+LineOfExpenseReport=Line of expense report
+NoAccountSelected=No accounting account selected
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+
+ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
+BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+
+ACCOUNTING_SELL_JOURNAL=Sell journal
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
+ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
+
+ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
+ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
+TransitionalAccount=Transitional bank transfer account
+
+ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
+DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+LabelAccount=Label account
+LabelOperation=Label operation
+Sens=Sens
+LetteringCode=Lettering code
+Lettering=Lettering
+Codejournal=Journal
+JournalLabel=Journal label
+NumPiece=Piece number
+TransactionNumShort=Num. transaction
+AccountingCategory=Personalized groups
+GroupByAccountAccounting=Group by accounting account
+AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
+ByAccounts=By accounts
+ByPredefinedAccountGroups=By predefined groups
+ByPersonalizedAccountGroups=By personalized groups
+ByYear=By year
+NotMatch=Not Set
+DeleteMvt=Delete Ledger lines
+DelMonth=Month to delete
+DelYear=Year to delete
+DelJournal=Journal to delete
+ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+FinanceJournal=Finance journal
+ExpenseReportsJournal=Expense reports journal
+DescFinanceJournal=Finance journal including all the types of payments by bank account
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+FeeAccountNotDefined=Account for fee not defined
+BankAccountNotDefined=Account for bank not defined
+CustomerInvoicePayment=Payment of invoice customer
+ThirdPartyAccount=Third-party account
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+AddCompteFromBK=Add accounting accounts to the group
+ReportThirdParty=List third-party account
+DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
+ListAccounts=List of the accounting accounts
+UnknownAccountForThirdparty=Unknown third-party account. We will use %s
+UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
+ShowOpeningBalance=Show opening balance
+HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
+
+Pcgtype=Group of account
+PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+
+Reconcilable=Reconcilable
+
+TotalVente=Total turnover before tax
+TotalMarge=Total sales margin
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
+Vide=-
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account (only record not already transfered in accountancy are visible)
+DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
+DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
+DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
+DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+
+DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
+OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+ValidateMovements=Validate movements
+DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
+SelectMonthAndValidate=Select month and validate movements
+
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
+Balancing=Balancing
+FicheVentilation=Binding card
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
+NoNewRecordSaved=No more record to journalize
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
+ShowTutorial=Show Tutorial
+NotReconciled=Not reconciled
+
+## Admin
+ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
+CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccountingJournal=Show accounting journal
+NatureOfJournal=Nature of Journal
+AccountingJournalType1=Miscellaneous operations
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
+NumberOfAccountancyEntries=Number of entries
+NumberOfAccountancyMovements=Number of movements
+
+## Export
+ExportDraftJournal=Export draft journal
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export for CEGID Expert Comptabilité
+Modelcsv_COALA=Export for Sage Coala
+Modelcsv_bob50=Export for Sage BOB 50
+Modelcsv_ciel=Export for Sage Ciel Compta or Compta Evolution
+Modelcsv_quadratus=Export for Quadratus QuadraCompta
+Modelcsv_ebp=Export for EBP
+Modelcsv_cogilog=Export for Cogilog
+Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
+Modelcsv_openconcerto=Export for OpenConcerto (Test)
+Modelcsv_configurable=Export CSV Configurable
+Modelcsv_FEC=Export FEC
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+ChartofaccountsId=Chart of accounts Id
+
+## Tools - Init accounting account on product / service
+InitAccountancy=Init accountancy
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
+DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
+Options=Options
+OptionModeProductSell=Mode sales
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
+OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
+OptionModeProductSellDesc=Show all products with accounting account for sales.
+OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
+OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
+OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
+CleanFixHistory=Remove accounting code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
+PredefinedGroups=Predefined groups
+WithoutValidAccount=Without valid dedicated account
+WithValidAccount=With valid dedicated account
+ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
+AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
+
+## Dictionary
+Range=Range of accounting account
+Calculated=Calculated
+Formula=Formula
+
+## Error
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
+ExportNotSupported=The export format setuped is not supported into this page
+BookeppingLineAlreayExists=Lines already existing into bookkeeping
+NoJournalDefined=No journal defined
+Binded=Lines bound
+ToBind=Lines to bind
+UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
+
+## Import
+ImportAccountingEntries=Accounting entries
+DateExport=Date export
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/bn_IN/admin.lang b/htdocs/langs/bn_IN/admin.lang
new file mode 100644
index 00000000000..7eb67d7a4ab
--- /dev/null
+++ b/htdocs/langs/bn_IN/admin.lang
@@ -0,0 +1,2002 @@
+# Dolibarr language file - Source file is en_US - admin
+Foundation=Foundation
+Version=Version
+Publisher=Publisher
+VersionProgram=Version program
+VersionLastInstall=Initial install version
+VersionLastUpgrade=Latest version upgrade
+VersionExperimental=Experimental
+VersionDevelopment=Development
+VersionUnknown=Unknown
+VersionRecommanded=Recommended
+FileCheck=Fileset Integrity Checks
+FileCheckDesc=This tool allows you to check the integrity of files and the setup of your application, comparing each file with the official one. The value of some setup constants may also be checked. You can use this tool to determine if any files have been modified (e.g by a hacker).
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files have been added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when the application is installed from an official package
+XmlNotFound=Xml Integrity File of application not found
+SessionId=Session ID
+SessionSaveHandler=Handler to save sessions
+SessionSavePath=Session save location
+PurgeSessions=Purge of sessions
+ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
+NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow listing all running sessions.
+LockNewSessions=Lock new connections
+ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself? Only user <b>%s</b> will be able to connect after that.
+UnlockNewSessions=Remove connection lock
+YourSession=Your session
+Sessions=Users Sessions
+WebUserGroup=Web server user/group
+NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
+DBStoringCharset=Database charset to store data
+DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
+ClientCharset=Client charset
+ClientSortingCharset=Client collation
+WarningModuleNotActive=Module <b>%s</b> must be enabled
+WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
+DolibarrSetup=Dolibarr install or upgrade
+InternalUser=Internal user
+ExternalUser=External user
+InternalUsers=Internal users
+ExternalUsers=External users
+GUISetup=Display
+SetupArea=Setup
+UploadNewTemplate=Upload new template(s)
+FormToTestFileUploadForm=Form to test file upload (according to setup)
+IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
+RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
+RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
+SecuritySetup=Security setup
+SecurityFilesDesc=Define here options related to security about uploading files.
+ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
+ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
+ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
+DictionarySetup=Dictionary setup
+Dictionary=Dictionaries
+ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
+ErrorCodeCantContainZero=Code can't contain value 0
+DisableJavascript=Disable JavaScript and Ajax functions
+DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
+NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
+JavascriptDisabled=JavaScript disabled
+UsePreviewTabs=Use preview tabs
+ShowPreview=Show preview
+PreviewNotAvailable=Preview not available
+ThemeCurrentlyActive=Theme currently active
+CurrentTimeZone=TimeZone PHP (server)
+MySQLTimeZone=TimeZone MySql (database)
+TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+Space=Space
+Table=Table
+Fields=Fields
+Index=Index
+Mask=Mask
+NextValue=Next value
+NextValueForInvoices=Next value (invoices)
+NextValueForCreditNotes=Next value (credit notes)
+NextValueForDeposit=Next value (down payment)
+NextValueForReplacements=Next value (replacements)
+MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
+MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page
+AntiVirusCommand=Full path to antivirus command
+AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusParam= More parameters on command line
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=Accounting module setup
+UserSetup=User management setup
+MultiCurrencySetup=Multi-currency setup
+MenuLimits=Limits and accuracy
+MenuIdParent=Parent menu ID
+DetailMenuIdParent=ID of parent menu (empty for a top menu)
+DetailPosition=Sort number to define menu position
+AllMenus=All
+NotConfigured=Module/Application not configured
+Active=Active
+SetupShort=Setup
+OtherOptions=Other options
+OtherSetup=Other Setup
+CurrentValueSeparatorDecimal=Decimal separator
+CurrentValueSeparatorThousand=Thousand separator
+Destination=Destination
+IdModule=Module ID
+IdPermissions=Permissions ID
+LanguageBrowserParameter=Parameter %s
+LocalisationDolibarrParameters=Localization parameters
+ClientTZ=Client Time Zone (user)
+ClientHour=Client time (user)
+OSTZ=Server OS Time Zone
+PHPTZ=PHP server Time Zone
+DaylingSavingTime=Daylight saving time
+CurrentHour=PHP Time (server)
+CurrentSessionTimeOut=Current session timeout
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a .htaccess file with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but of the timezone of the server.
+Box=Widget
+Boxes=Widgets
+MaxNbOfLinesForBoxes=Max. number of lines for widgets
+AllWidgetsWereEnabled=All available widgets are enabled
+PositionByDefault=Default order
+Position=Position
+MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
+MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br>Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenuForUsers=Menu for users
+LangFile=.lang file
+Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
+System=System
+SystemInfo=System information
+SystemToolsArea=System tools area
+SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature.
+Purge=Purge
+PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
+PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
+PurgeRunNow=Purge now
+PurgeNothingToDelete=No directory or files to delete.
+PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
+PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
+PurgeAuditEvents=Purge all security events
+ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
+GenerateBackup=Generate backup
+Backup=Backup
+Restore=Restore
+RunCommandSummary=Backup has been launched with the following command
+BackupResult=Backup result
+BackupFileSuccessfullyCreated=Backup file successfully generated
+YouCanDownloadBackupFile=The generated file can now be downloaded
+NoBackupFileAvailable=No backup files available.
+ExportMethod=Export method
+ImportMethod=Import method
+ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
+ImportMySqlDesc=To import a MySQL backup file, you may use phpMyAdmin via your hosting or use the mysql command from the Command line.<br>For example:
+ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
+ImportMySqlCommand=%s %s < mybackupfile.sql
+ImportPostgreSqlCommand=%s %s mybackupfile.sql
+FileNameToGenerate=Filename for backup:
+Compression=Compression
+CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
+CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
+ExportCompatibility=Compatibility of generated export file
+ExportUseMySQLQuickParameter=Use the --quick parameter
+ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
+MySqlExportParameters=MySQL export parameters
+PostgreSqlExportParameters= PostgreSQL export parameters
+UseTransactionnalMode=Use transactional mode
+FullPathToMysqldumpCommand=Full path to mysqldump command
+FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
+AddDropDatabase=Add DROP DATABASE command
+AddDropTable=Add DROP TABLE command
+ExportStructure=Structure
+NameColumn=Name columns
+ExtendedInsert=Extended INSERT
+NoLockBeforeInsert=No lock commands around INSERT
+DelayedInsert=Delayed insert
+EncodeBinariesInHexa=Encode binary data in hexadecimal
+IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
+AutoDetectLang=Autodetect (browser language)
+FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
+BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
+OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
+ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external app/modules
+ModulesDevelopYourModule=Develop your own app/modules
+ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
+DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
+NewModule=New
+FreeModule=Free
+CompatibleUpTo=Compatible with version %s
+NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
+CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
+SeeInMarkerPlace=See in Market place
+SeeSetupOfModule=See setup of module %s
+Updated=Updated
+Nouveauté=Novelty
+AchatTelechargement=Buy / Download
+GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
+DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming may develop a module.
+WebSiteDesc=External websites for more add-on (non-core) modules...
+DevelopYourModuleDesc=Some solutions to develop your own module...
+URL=URL
+RelativeURL=Relative URL
+BoxesAvailable=Widgets available
+BoxesActivated=Widgets activated
+ActivateOn=Activate on
+ActiveOn=Activated on
+SourceFile=Source file
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
+Required=Required
+UsedOnlyWithTypeOption=Used by some agenda option only
+Security=Security
+Passwords=Passwords
+DoNotStoreClearPassword=Encrypt passwords stored in database (NOT as plain-text). It is strongly recommended to activate this option.
+MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
+ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
+Feature=Feature
+DolibarrLicense=License
+Developpers=Developers/contributors
+OfficialWebSite=Dolibarr official web site
+OfficialWebSiteLocal=Local web site (%s)
+OfficialWiki=Dolibarr documentation / Wiki
+OfficialDemo=Dolibarr online demo
+OfficialMarketPlace=Official market place for external modules/addons
+OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
+ReferencedPreferredPartners=Preferred Partners
+OtherResources=Other resources
+ExternalResources=External Resources
+SocialNetworks=Social Networks
+ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
+ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
+HelpCenterDesc2=Some of these resources are only available in <b>english</b>.
+CurrentMenuHandler=Current menu handler
+MeasuringUnit=Measuring unit
+LeftMargin=Left margin
+TopMargin=Top margin
+PaperSize=Paper type
+Orientation=Orientation
+SpaceX=Space X
+SpaceY=Space Y
+FontSize=Font size
+Content=Content
+NoticePeriod=Notice period
+NewByMonth=New by month
+Emails=Emails
+EMailsSetup=Emails setup
+EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EmailSenderProfiles=Emails sender profiles
+EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
+MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix-like systems)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix-like systems)
+MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
+MAIN_MAIL_AUTOCOPY_TO= Copy (Bcc) all sent emails to
+MAIN_DISABLE_ALL_MAILS=Disable all email sending (for test purposes or demos)
+MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
+MAIN_MAIL_SENDMODE=Email sending method
+MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
+MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
+MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
+MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
+MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos)
+MAIN_SMS_SENDMODE=Method to use to send SMS
+MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending
+MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
+UserEmail=User email
+CompanyEmail=Company Email
+FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+ModuleSetup=Module setup
+ModulesSetup=Modules/Application setup
+ModuleFamilyBase=System
+ModuleFamilyCrm=Customer Relationship Management (CRM)
+ModuleFamilySrm=Vendor Relationship Management (VRM)
+ModuleFamilyProducts=Product Management (PM)
+ModuleFamilyHr=Human Resource Management (HR)
+ModuleFamilyProjects=Projects/Collaborative work
+ModuleFamilyOther=Other
+ModuleFamilyTechnic=Multi-modules tools
+ModuleFamilyExperimental=Experimental modules
+ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
+ModuleFamilyECM=Electronic Content Management (ECM)
+ModuleFamilyPortal=Websites and other frontal application
+ModuleFamilyInterface=Interfaces with external systems
+MenuHandlers=Menu handlers
+MenuAdmin=Menu editor
+DoNotUseInProduction=Do not use in production
+ThisIsProcessToFollow=Upgrade procedure:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+StepNb=Step %s
+FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
+DownloadPackageFromWebSite=Download package (for example from the official web site %s).
+UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
+YouCanSubmitFile=You can upload the .zip file of module package from here:
+CurrentVersion=Dolibarr current version
+CallUpdatePage=Browse to the page that updates the database structure and data: %s.
+LastStableVersion=Latest stable version
+LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
+UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
+GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
+GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
+GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
+ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
+ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
+DoTestServerAvailability=Test server connectivity
+DoTestSend=Test sending
+DoTestSendHTML=Test sending HTML
+ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
+UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
+SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
+UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
+DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
+DisableLinkToHelp=Hide link to online help "<b>%s</b>"
+AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
+ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
+MinLength=Minimum length
+LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
+LanguageFile=Language file
+ExamplesWithCurrentSetup=Examples with current configuration
+ListOfDirectories=List of OpenDocument templates directories
+ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
+NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
+FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
+FirstnameNamePosition=Position of Name/Lastname
+DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
+KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
+TestSubmitForm=Input test form
+ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours.
+ThemeDir=Skins directory
+ConnectionTimeout=Connection timeout
+ResponseTimeout=Response timeout
+SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
+ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
+SecurityToken=Key to secure URLs
+NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
+PDF=PDF
+PDFDesc=Global options for PDF generation.
+PDFAddressForging=Rules for address boxes
+HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
+PDFLocaltax=Rules for %s
+HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideDescOnPDF=Hide products description
+HideRefOnPDF=Hide products ref.
+HideDetailsOnPDF=Hide product lines details
+PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+Library=Library
+UrlGenerationParameters=Parameters to secure URLs
+SecurityTokenIsUnique=Use a unique securekey parameter for each URL
+EnterRefToBuildUrl=Enter reference for object %s
+GetSecuredUrl=Get calculated URL
+ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+OldVATRates=Old VAT rate
+NewVATRates=New VAT rate
+PriceBaseTypeToChange=Modify on prices with base reference value defined on
+MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
+String=String
+TextLong=Long text
+HtmlText=Html text
+Int=Integer
+Float=Float
+DateAndTime=Date and hour
+Unique=Unique
+Boolean=Boolean (one checkbox)
+ExtrafieldPhone = Phone
+ExtrafieldPrice = Price
+ExtrafieldMail = Email
+ExtrafieldUrl = Url
+ExtrafieldSelect = Select list
+ExtrafieldSelectList = Select from table
+ExtrafieldSeparator=Separator (not a field)
+ExtrafieldPassword=Password
+ExtrafieldRadio=Radio buttons (one choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
+ExtrafieldLink=Link to an object
+ComputedFormula=Computed field
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+Computedpersistent=Store computed field
+ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
+ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
+ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
+LibraryToBuildPDF=Library used for PDF generation
+LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
+SMS=SMS
+LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
+RefreshPhoneLink=Refresh link
+LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
+KeepEmptyToUseDefault=Keep empty to use default value
+DefaultLink=Default link
+SetAsDefault=Set as default
+ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
+ExternalModule=External module
+InstalledInto=Installed into directory %s
+BarcodeInitForthird-parties=Mass barcode init for third-parties
+BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
+CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
+InitEmptyBarCode=Init value for next %s empty records
+EraseAllCurrentBarCode=Erase all current barcode values
+ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
+AllBarcodeReset=All barcode values have been removed
+NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
+EnableFileCache=Enable file cache
+ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
+NoDetails=No additional details in footer
+DisplayCompanyInfo=Display company address
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
+EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
+ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code
+ModuleCompanyCodePanicum=Return an empty accounting code.
+ModuleCompanyCodeDigitaria=Returns a compound accounting code according to the name of the third party. The code consists of a prefix that can be defined in the first position followed by the number of characters defined in the third party code.
+ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
+ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+ClickToShowDescription=Click to show description
+DependsOn=This module needs the module(s)
+RequiredBy=This module is required by module(s)
+TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
+PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
+EnableDefaultValues=Enable customization of default values
+EnableOverwriteTranslation=Enable usage of overwritten translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
+AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
+FilesAttachedToEmail=Attach file
+SendEmailsReminders=Send agenda reminders by emails
+davDescription=Setup a WebDAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
+DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
+DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
+DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
+DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
+# Modules
+Module0Name=Users & Groups
+Module0Desc=Users / Employees and Groups management
+Module1Name=Third Parties
+Module1Desc=Companies and contacts management (customers, prospects...)
+Module2Name=Commercial
+Module2Desc=Commercial management
+Module10Name=Accounting (simplified)
+Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
+Module20Name=Proposals
+Module20Desc=Commercial proposal management
+Module22Name=Mass Emailings
+Module22Desc=Manage bulk emailing
+Module23Name=Energy
+Module23Desc=Monitoring the consumption of energies
+Module25Name=Sales Orders
+Module25Desc=Sales order management
+Module30Name=Invoices
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
+Module40Name=Vendors
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
+Module42Name=Debug Logs
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module49Name=Editors
+Module49Desc=Editor management
+Module50Name=Products
+Module50Desc=Management of Products
+Module51Name=Mass mailings
+Module51Desc=Mass paper mailing management
+Module52Name=Stocks
+Module52Desc=Stock management
+Module53Name=Services
+Module53Desc=Management of Services
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or recurring subscriptions)
+Module55Name=Barcodes
+Module55Desc=Barcode management
+Module56Name=Telephony
+Module56Desc=Telephony integration
+Module57Name=Bank Direct Debit payments
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module58Name=ClickToDial
+Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
+Module59Name=Bookmark4u
+Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
+Module60Name=Stickers
+Module60Desc=Management of stickers
+Module70Name=Interventions
+Module70Desc=Intervention management
+Module75Name=Expense and trip notes
+Module75Desc=Expense and trip notes management
+Module80Name=Shipments
+Module80Desc=Shipments and delivery note management
+Module85Name=Banks & Cash
+Module85Desc=Management of bank or cash accounts
+Module100Name=External Site
+Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module105Name=Mailman and SPIP
+Module105Desc=Mailman or SPIP interface for member module
+Module200Name=LDAP
+Module200Desc=LDAP directory synchronization
+Module210Name=PostNuke
+Module210Desc=PostNuke integration
+Module240Name=Data exports
+Module240Desc=Tool to export Dolibarr data (with assistance)
+Module250Name=Data imports
+Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module310Name=Members
+Module310Desc=Foundation members management
+Module320Name=RSS Feed
+Module320Desc=Add a RSS feed to Dolibarr pages
+Module330Name=Bookmarks & Shortcuts
+Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access
+Module400Name=Projects or Leads
+Module400Desc=Management of projects, leads/opportunities and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module410Name=Webcalendar
+Module410Desc=Webcalendar integration
+Module500Name=Taxes & Special Expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
+Module510Name=Salaries
+Module510Desc=Record and track employee payments
+Module520Name=Loans
+Module520Desc=Management of loans
+Module600Name=Notifications on business event
+Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
+Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
+Module610Name=Product Variants
+Module610Desc=Creation of product variants (color, size etc.)
+Module700Name=Donations
+Module700Desc=Donation management
+Module770Name=Expense Reports
+Module770Desc=Manage expense reports claims (transportation, meal, ...)
+Module1120Name=Vendor Commercial Proposals
+Module1120Desc=Request vendor commercial proposal and prices
+Module1200Name=Mantis
+Module1200Desc=Mantis integration
+Module1520Name=Document Generation
+Module1520Desc=Mass email document generation
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module2000Name=WYSIWYG editor
+Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
+Module2200Name=Dynamic Prices
+Module2200Desc=Use maths expressions for auto-generation of prices
+Module2300Name=Scheduled jobs
+Module2300Desc=Scheduled jobs management (alias cron or chrono table)
+Module2400Name=Events/Agenda
+Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
+Module2500Name=DMS / ECM
+Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
+Module2600Name=API/Web services (SOAP server)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API/Web services (REST server)
+Module2610Desc=Enable the Dolibarr REST server providing API services
+Module2660Name=Call WebServices (SOAP client)
+Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
+Module2700Name=Gravatar
+Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
+Module2800Desc=FTP Client
+Module2900Name=GeoIPMaxmind
+Module2900Desc=GeoIP Maxmind conversions capabilities
+Module3200Name=Unalterable Archives
+Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module4000Name=HRM
+Module4000Desc=Human resources management (management of department, employee contracts and feelings)
+Module5000Name=Multi-company
+Module5000Desc=Allows you to manage multiple companies
+Module6000Name=Workflow
+Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module10000Name=Websites
+Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
+Module20000Name=Leave Request Management
+Module20000Desc=Define and track employee leave requests
+Module39000Name=Product Lots
+Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
+Module40000Name=Multicurrency
+Module40000Desc=Use alternative currencies in prices and documents
+Module50000Name=PayBox
+Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50100Name=POS SimplePOS
+Module50100Desc=Point of Sale module SimplePOS (simple POS).
+Module50150Name=POS TakePOS
+Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50200Name=Paypal
+Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50300Name=Stripe
+Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50400Name=Accounting (double entry)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module54000Name=PrintIPP
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
+Module59000Name=Margins
+Module59000Desc=Module to manage margins
+Module60000Name=Commissions
+Module60000Desc=Module to manage commissions
+Module62000Name=Incoterms
+Module62000Desc=Add features to manage Incoterms
+Module63000Name=Resources
+Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
+Permission11=Read customer invoices
+Permission12=Create/modify customer invoices
+Permission13=Unvalidate customer invoices
+Permission14=Validate customer invoices
+Permission15=Send customer invoices by email
+Permission16=Create payments for customer invoices
+Permission19=Delete customer invoices
+Permission21=Read commercial proposals
+Permission22=Create/modify commercial proposals
+Permission24=Validate commercial proposals
+Permission25=Send commercial proposals
+Permission26=Close commercial proposals
+Permission27=Delete commercial proposals
+Permission28=Export commercial proposals
+Permission31=Read products
+Permission32=Create/modify products
+Permission34=Delete products
+Permission36=See/manage hidden products
+Permission38=Export products
+Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
+Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
+Permission44=Delete projects (shared project and projects I'm contact for)
+Permission45=Export projects
+Permission61=Read interventions
+Permission62=Create/modify interventions
+Permission64=Delete interventions
+Permission67=Export interventions
+Permission71=Read members
+Permission72=Create/modify members
+Permission74=Delete members
+Permission75=Setup types of membership
+Permission76=Export data
+Permission78=Read subscriptions
+Permission79=Create/modify subscriptions
+Permission81=Read customers orders
+Permission82=Create/modify customers orders
+Permission84=Validate customers orders
+Permission86=Send customers orders
+Permission87=Close customers orders
+Permission88=Cancel customers orders
+Permission89=Delete customers orders
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
+Permission95=Read reports
+Permission101=Read sendings
+Permission102=Create/modify sendings
+Permission104=Validate sendings
+Permission106=Export sendings
+Permission109=Delete sendings
+Permission111=Read financial accounts
+Permission112=Create/modify/delete and compare transactions
+Permission113=Setup financial accounts (create, manage categories)
+Permission114=Reconcile transactions
+Permission115=Export transactions and account statements
+Permission116=Transfers between accounts
+Permission117=Manage checks dispatching
+Permission121=Read third parties linked to user
+Permission122=Create/modify third parties linked to user
+Permission125=Delete third parties linked to user
+Permission126=Export third parties
+Permission141=Read all projects and tasks (also private projects for which I am not a contact)
+Permission142=Create/modify all projects and tasks (also private projects for which I am not a contact)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
+Permission146=Read providers
+Permission147=Read stats
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejections of direct debit payment orders
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
+Permission171=Read trips and expenses (yours and your subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
+Permission180=Read suppliers
+Permission181=Read purchase orders
+Permission182=Create/modify purchase orders
+Permission183=Validate purchase orders
+Permission184=Approve purchase orders
+Permission185=Order or cancel purchase orders
+Permission186=Receive purchase orders
+Permission187=Close purchase orders
+Permission188=Cancel purchase orders
+Permission192=Create lines
+Permission193=Cancel lines
+Permission194=Read the bandwidth lines
+Permission202=Create ADSL connections
+Permission203=Order connections orders
+Permission204=Order connections
+Permission205=Manage connections
+Permission206=Read connections
+Permission211=Read Telephony
+Permission212=Order lines
+Permission213=Activate line
+Permission214=Setup Telephony
+Permission215=Setup providers
+Permission221=Read emailings
+Permission222=Create/modify emailings (topic, recipients...)
+Permission223=Validate emailings (allows sending)
+Permission229=Delete emailings
+Permission237=View recipients and info
+Permission238=Manually send mailings
+Permission239=Delete mailings after validation or sent
+Permission241=Read categories
+Permission242=Create/modify categories
+Permission243=Delete categories
+Permission244=See the contents of the hidden categories
+Permission251=Read other users and groups
+PermissionAdvanced251=Read other users
+Permission252=Read permissions of other users
+Permission253=Create/modify other users, groups and permissions
+PermissionAdvanced253=Create/modify internal/external users and permissions
+Permission254=Create/modify external users only
+Permission255=Modify other users password
+Permission256=Delete or disable other users
+Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission271=Read CA
+Permission272=Read invoices
+Permission273=Issue invoices
+Permission281=Read contacts
+Permission282=Create/modify contacts
+Permission283=Delete contacts
+Permission286=Export contacts
+Permission291=Read tariffs
+Permission292=Set permissions on the tariffs
+Permission293=Modify customer's tariffs
+Permission300=Read barcodes
+Permission301=Create/modify barcodes
+Permission302=Delete barcodes
+Permission311=Read services
+Permission312=Assign service/subscription to contract
+Permission331=Read bookmarks
+Permission332=Create/modify bookmarks
+Permission333=Delete bookmarks
+Permission341=Read its own permissions
+Permission342=Create/modify his own user information
+Permission343=Modify his own password
+Permission344=Modify its own permissions
+Permission351=Read groups
+Permission352=Read groups permissions
+Permission353=Create/modify groups
+Permission354=Delete or disable groups
+Permission358=Export users
+Permission401=Read discounts
+Permission402=Create/modify discounts
+Permission403=Validate discounts
+Permission404=Delete discounts
+Permission430=Use Debug Bar
+Permission511=Read payments of salaries
+Permission512=Create/modify payments of salaries
+Permission514=Delete payments of salaries
+Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
+Permission531=Read services
+Permission532=Create/modify services
+Permission534=Delete services
+Permission536=See/manage hidden services
+Permission538=Export services
+Permission650=Read Bills of Materials
+Permission651=Create/Update Bills of Materials
+Permission652=Delete Bills of Materials
+Permission701=Read donations
+Permission702=Create/modify donations
+Permission703=Delete donations
+Permission771=Read expense reports (yours and your subordinates)
+Permission772=Create/modify expense reports
+Permission773=Delete expense reports
+Permission774=Read all expense reports (even for user not subordinates)
+Permission775=Approve expense reports
+Permission776=Pay expense reports
+Permission779=Export expense reports
+Permission1001=Read stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
+Permission1004=Read stock movements
+Permission1005=Create/modify stock movements
+Permission1101=Read delivery receipts
+Permission1102=Create/modify delivery receipts
+Permission1104=Validate delivery receipts
+Permission1109=Delete delivery receipts
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
+Permission1181=Read suppliers
+Permission1182=Read purchase orders
+Permission1183=Create/modify purchase orders
+Permission1184=Validate purchase orders
+Permission1185=Approve purchase orders
+Permission1186=Order purchase orders
+Permission1187=Acknowledge receipt of purchase orders
+Permission1188=Delete purchase orders
+Permission1190=Approve (second approval) purchase orders
+Permission1201=Get result of an export
+Permission1202=Create/Modify an export
+Permission1231=Read vendor invoices
+Permission1232=Create/modify vendor invoices
+Permission1233=Validate vendor invoices
+Permission1234=Delete vendor invoices
+Permission1235=Send vendor invoices by email
+Permission1236=Export vendor invoices, attributes and payments
+Permission1237=Export purchase orders and their details
+Permission1251=Run mass imports of external data into database (data load)
+Permission1321=Export customer invoices, attributes and payments
+Permission1322=Reopen a paid bill
+Permission1421=Export sales orders and attributes
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
+Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
+Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
+Permission2411=Read actions (events or tasks) of others
+Permission2412=Create/modify actions (events or tasks) of others
+Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
+Permission2501=Read/Download documents
+Permission2502=Download documents
+Permission2503=Submit or delete documents
+Permission2515=Setup documents directories
+Permission2801=Use FTP client in read mode (browse and download only)
+Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=Delete leave requests
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20006=Admin leave requests (setup and update balance)
+Permission20007=Approve leave requests
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
+Permission50101=Use Point of Sale
+Permission50201=Read transactions
+Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define fiscal periods. Validate transactions and close fiscal periods.
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
+Permission54001=Print
+Permission55001=Read polls
+Permission55002=Create/modify polls
+Permission59001=Read commercial margins
+Permission59002=Define commercial margins
+Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
+DictionaryCompanyType=Third-party types
+DictionaryCompanyJuridicalType=Third-party legal entities
+DictionaryProspectLevel=Prospect potential
+DictionaryCanton=States/Provinces
+DictionaryRegion=Regions
+DictionaryCountry=Countries
+DictionaryCurrency=Currencies
+DictionaryCivility=Honorific titles
+DictionaryActions=Types of agenda events
+DictionarySocialContributions=Types of social or fiscal taxes
+DictionaryVAT=VAT Rates or Sales Tax Rates
+DictionaryRevenueStamp=Amount of tax stamps
+DictionaryPaymentConditions=Payment Terms
+DictionaryPaymentModes=Payment Modes
+DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Website - Type of website pages/containers
+DictionaryEcotaxe=Ecotax (WEEE)
+DictionaryPaperFormat=Paper formats
+DictionaryFormatCards=Card formats
+DictionaryFees=Expense report - Types of expense report lines
+DictionarySendingMethods=Shipping methods
+DictionaryStaff=Number of Employees
+DictionaryAvailability=Delivery delay
+DictionaryOrderMethods=Ordering methods
+DictionarySource=Origin of proposals/orders
+DictionaryAccountancyCategory=Personalized groups for reports
+DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
+DictionaryEMailTemplates=Email Templates
+DictionaryUnits=Units
+DictionaryMeasuringUnits=Measuring Units
+DictionarySocialNetworks=Social Networks
+DictionaryProspectStatus=Prospect status
+DictionaryHolidayTypes=Types of leave
+DictionaryOpportunityStatus=Lead status for project/lead
+DictionaryExpenseTaxCat=Expense report - Transportation categories
+DictionaryExpenseTaxRange=Expense report - Range by transportation category
+SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
+BackToModuleList=Back to Module list
+BackToDictionaryList=Back to Dictionaries list
+TypeOfRevenueStamp=Type of tax stamp
+VATManagement=Sales Tax Management
+VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
+##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
+LTRate=Rate
+LocalTax1IsNotUsed=Do not use second tax
+LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
+LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax1Management=Second type of tax
+LocalTax1IsUsedExample=
+LocalTax1IsNotUsedExample=
+LocalTax2IsNotUsed=Do not use third tax
+LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
+LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax2Management=Third type of tax
+LocalTax2IsUsedExample=
+LocalTax2IsNotUsedExample=
+LocalTax1ManagementES=RE Management
+LocalTax1IsUsedDescES=The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
+LocalTax1IsNotUsedDescES=By default the proposed RE is 0. End of rule.
+LocalTax1IsUsedExampleES=In Spain they are professionals subject to some specific sections of the Spanish IAE.
+LocalTax1IsNotUsedExampleES=In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
+LocalTax2ManagementES=IRPF Management
+LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
+LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
+LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
+LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
+UseRevenueStamp=Use a tax stamp
+UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+CalcLocaltax=Reports on local taxes
+CalcLocaltax1=Sales - Purchases
+CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
+CalcLocaltax2=Purchases
+CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
+CalcLocaltax3=Sales
+CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+LabelUsedByDefault=Label used by default if no translation can be found for code
+LabelOnDocuments=Label on documents
+LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of a configuration constant
+NbOfDays=No. of days
+AtEndOfMonth=At end of month
+CurrentNext=Current/Next
+Offset=Offset
+AlwaysActive=Always active
+Upgrade=Upgrade
+MenuUpgrade=Upgrade / Extend
+AddExtensionThemeModuleOrOther=Deploy/install external app/module
+WebServer=Web server
+DocumentRootServer=Web server's root directory
+DataRootServer=Data files directory
+IP=IP
+Port=Port
+VirtualServerName=Virtual server name
+OS=OS
+PhpWebLink=Web-Php link
+Server=Server
+Database=Database
+DatabaseServer=Database host
+DatabaseName=Database name
+DatabasePort=Database port
+DatabaseUser=Database user
+DatabasePassword=Database password
+Tables=Tables
+TableName=Table name
+NbOfRecord=No. of records
+Host=Server
+DriverType=Driver type
+SummarySystem=System information summary
+SummaryConst=List of all Dolibarr setup parameters
+MenuCompanySetup=Company/Organization
+DefaultMenuManager= Standard menu manager
+DefaultMenuSmartphoneManager=Smartphone menu manager
+Skin=Skin theme
+DefaultSkin=Default skin theme
+MaxSizeList=Max length for list
+DefaultMaxSizeList=Default max length for lists
+DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
+MessageOfDay=Message of the day
+MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
+PermanentLeftSearchForm=Permanent search form on left menu
+DefaultLanguage=Default language
+EnableMultilangInterface=Enable multilanguage support
+EnableShowLogo=Show the company logo in the menu
+CompanyInfo=Company/Organization
+CompanyIds=Company/Organization identities
+CompanyName=Name
+CompanyAddress=Address
+CompanyZip=Zip
+CompanyTown=Town
+CompanyCountry=Country
+CompanyCurrency=Main currency
+CompanyObject=Object of the company
+IDCountry=ID country
+Logo=Logo
+LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
+LogoSquarred=Logo (squarred)
+LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
+DoNotSuggestPaymentMode=Do not suggest
+NoActiveBankAccountDefined=No active bank account defined
+OwnerOfBankAccount=Owner of bank account %s
+BankModuleNotActive=Bank accounts module not enabled
+ShowBugTrackLink=Show link "<strong>%s</strong>"
+Alerts=Alerts
+DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
+DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
+Delays_MAIN_DELAY_ACTIONS_TODO=Planned events (agenda events) not completed
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time
+Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Order not processed
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
+Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation
+Delays_MAIN_DELAY_MEMBERS=Delayed membership fee
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
+Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
+Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
+SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
+SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
+SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
+SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescription5=Other Setup menu entries manage optional parameters.
+LogEvents=Security audit events
+Audit=Audit
+InfoDolibarr=About Dolibarr
+InfoBrowser=About Browser
+InfoOS=About OS
+InfoWebServer=About Web Server
+InfoDatabase=About Database
+InfoPHP=About PHP
+InfoPerf=About Performances
+BrowserName=Browser name
+BrowserOS=Browser OS
+ListOfSecurityEvents=List of Dolibarr security events
+SecurityEventsPurged=Security events purged
+LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
+SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
+SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
+AccountantFileNumber=Accountant code
+DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
+AvailableModules=Available app/modules
+ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
+SessionTimeOut=Time out for session
+SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
+TriggersAvailable=Available triggers
+TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
+TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
+TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
+TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
+TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
+GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
+DictionaryDesc=Insert all reference data. You can add your values to the default.
+ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
+MiscellaneousDesc=All other security related parameters are defined here.
+LimitsSetup=Limits/Precision setup
+LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
+MAIN_MAX_DECIMALS_UNIT=Max. decimals for unit prices
+MAIN_MAX_DECIMALS_TOT=Max. decimals for total prices
+MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
+UnitPriceOfProduct=Net unit price of a product
+TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
+ParameterActiveForNextInputOnly=Parameter effective for next input only
+NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page.
+NoEventFoundWithCriteria=No security event has been found for this search criteria.
+SeeLocalSendMailSetup=See your local sendmail setup
+BackupDesc=A <b>complete</b> backup of a Dolibarr installation requires two steps.
+BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
+BackupDesc3=Backup the structure and contents of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
+BackupDescX=The archived directory should be stored in a secure place.
+BackupDescY=The generated dump file should be stored in a secure place.
+BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
+RestoreDesc=To restore a Dolibarr backup, two steps are required.
+RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
+RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
+RestoreMySQL=MySQL import
+ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+PreviousDumpFiles=Existing backup files
+PreviousArchiveFiles=Existing archive files
+WeekStartOnDay=First day of the week
+RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
+YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
+YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
+DownloadMoreSkins=More skins to download
+SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+ShowProfIdInAddress=Show professional id with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+TranslationUncomplete=Partial translation
+MAIN_DISABLE_METEO=Disable meteorological view
+MeteoStdMod=Standard mode
+MeteoStdModEnabled=Standard mode enabled
+MeteoPercentageMod=Percentage mode
+MeteoPercentageModEnabled=Percentage mode enabled
+MeteoUseMod=Click to use %s
+TestLoginToAPI=Test login to API
+ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
+ExternalAccess=External/Internet Access
+MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet)
+MAIN_PROXY_HOST=Proxy server: Name/Address
+MAIN_PROXY_PORT=Proxy server: Port
+MAIN_PROXY_USER=Proxy server: Login/User
+MAIN_PROXY_PASS=Proxy server: Password
+DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+ExtraFields=Complementary attributes
+ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsThirdParties=Complementary attributes (third party)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
+ExtraFieldsMember=Complementary attributes (member)
+ExtraFieldsMemberType=Complementary attributes (member type)
+ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
+ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
+ExtraFieldsSupplierOrders=Complementary attributes (orders)
+ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
+ExtraFieldsProject=Complementary attributes (projects)
+ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldHasWrongValue=Attribute %s has a wrong value.
+AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
+PathToDocuments=Path to documents
+PathDirectory=Directory
+SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+YouMustEnableOneModule=You must at least enable 1 module
+ClassNotFoundIntoPathWarning=Class %s not found in PHP path
+YesInSummer=Yes in summer
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
+SuhosinSessionEncrypt=Session storage encrypted by Suhosin
+ConditionIsCurrently=Condition is currently %s
+YouUseBestDriver=You use driver %s which is the best driver currently available.
+YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+SearchOptim=Search optimization
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
+BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
+AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
+AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
+FieldEdition=Edition of field %s
+FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
+GetBarCode=Get barcode
+NumberingModules=Numbering models
+##### Module password generation
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
+PasswordGenerationPerso=Return a password according to your personally defined configuration.
+SetupPerso=According to your configuration
+PasswordPatternDesc=Password pattern description
+##### Users setup #####
+RuleForGeneratedPasswords=Rules to generate and validate passwords
+DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
+UsersSetup=Users module setup
+UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
+##### HRM setup #####
+HRMSetup=HRM module setup
+##### Company setup #####
+CompanySetup=Companies module setup
+CompanyCodeChecker=Options for automatic generation of customer/vendor codes
+AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
+NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
+NotificationsDescUser=* per user, one user at a time.
+NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
+NotificationsDescGlobal=* or by setting global email addresses in this setup page.
+ModelModules=Document Templates
+DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
+WatermarkOnDraft=Watermark on draft document
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
+CompanyIdProfChecker=Rules for Professional IDs
+MustBeUnique=Must be unique?
+MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
+MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
+WebDavServer=Root URL of %s server: %s
+##### Webcal setup #####
+WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
+##### Invoices #####
+BillsSetup=Invoices module setup
+BillsNumberingModule=Invoices and credit notes numbering model
+BillsPDFModules=Invoice documents models
+BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
+PaymentsPDFModules=Payment documents models
+ForceInvoiceDate=Force invoice date to validation date
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
+SuggestPaymentByChequeToAddress=Suggest payment by check to
+FreeLegalTextOnInvoices=Free text on invoices
+WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
+PaymentsNumberingModule=Payments numbering model
+SuppliersPayment=Vendor payments
+SupplierPaymentSetup=Vendor payments setup
+##### Proposals #####
+PropalSetup=Commercial proposals module setup
+ProposalsNumberingModules=Commercial proposal numbering models
+ProposalsPDFModules=Commercial proposal documents models
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+FreeLegalTextOnProposal=Free text on commercial proposals
+WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
+##### Suppliers Orders #####
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
+##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+OrdersSetup=Sales Orders management setup
+OrdersNumberingModules=Orders numbering models
+OrdersModelModule=Order documents models
+FreeLegalTextOnOrders=Free text on orders
+WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+##### Interventions #####
+InterventionsSetup=Interventions module setup
+FreeLegalTextOnInterventions=Free text on intervention documents
+FicheinterNumberingModules=Intervention numbering models
+TemplatePDFInterventions=Intervention card documents models
+WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+##### Contracts #####
+ContractsSetup=Contracts/Subscriptions module setup
+ContractsNumberingModules=Contracts numbering modules
+TemplatePDFContracts=Contracts documents models
+FreeLegalTextOnContracts=Free text on contracts
+WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+##### Members #####
+MembersSetup=Members module setup
+MemberMainOptions=Main options
+AdherentLoginRequired= Manage a Login for each member
+AdherentMailRequired=Email required to create a new member
+MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
+MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+##### LDAP setup #####
+LDAPSetup=LDAP Setup
+LDAPGlobalParameters=Global parameters
+LDAPUsersSynchro=Users
+LDAPGroupsSynchro=Groups
+LDAPContactsSynchro=Contacts
+LDAPMembersSynchro=Members
+LDAPMembersTypesSynchro=Members types
+LDAPSynchronization=LDAP synchronisation
+LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
+LDAPToDolibarr=LDAP -> Dolibarr
+DolibarrToLDAP=Dolibarr -> LDAP
+LDAPNamingAttribute=Key in LDAP
+LDAPSynchronizeUsers=Organization of users in LDAP
+LDAPSynchronizeGroups=Organization of groups in LDAP
+LDAPSynchronizeContacts=Organization of contacts in LDAP
+LDAPSynchronizeMembers=Organization of foundation's members in LDAP
+LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
+LDAPPrimaryServer=Primary server
+LDAPSecondaryServer=Secondary server
+LDAPServerPort=Server port
+LDAPServerPortExample=Default port: 389
+LDAPServerProtocolVersion=Protocol version
+LDAPServerUseTLS=Use TLS
+LDAPServerUseTLSExample=Your LDAP server use TLS
+LDAPServerDn=Server DN
+LDAPAdminDn=Administrator DN
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
+LDAPPassword=Administrator password
+LDAPUserDn=Users' DN
+LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
+LDAPGroupDn=Groups' DN
+LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
+LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
+LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
+LDAPDnSynchroActive=Users and groups synchronization
+LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
+LDAPDnContactActive=Contacts' synchronization
+LDAPDnContactActiveExample=Activated/Unactivated synchronization
+LDAPDnMemberActive=Members' synchronization
+LDAPDnMemberActiveExample=Activated/Unactivated synchronization
+LDAPDnMemberTypeActive=Members types' synchronization
+LDAPDnMemberTypeActiveExample=Activated/Unactivated synchronization
+LDAPContactDn=Dolibarr contacts' DN
+LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
+LDAPMemberDn=Dolibarr members DN
+LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
+LDAPMemberObjectClassList=List of objectClass
+LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPMemberTypeDn=Dolibarr members types DN
+LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeObjectClassList=List of objectClass
+LDAPMemberTypeObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPUserObjectClassList=List of objectClass
+LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPGroupObjectClassList=List of objectClass
+LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPContactObjectClassList=List of objectClass
+LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPTestConnect=Test LDAP connection
+LDAPTestSynchroContact=Test contacts synchronization
+LDAPTestSynchroUser=Test user synchronization
+LDAPTestSynchroGroup=Test group synchronization
+LDAPTestSynchroMember=Test member synchronization
+LDAPTestSynchroMemberType=Test member type synchronization
+LDAPTestSearch= Test a LDAP search
+LDAPSynchroOK=Synchronization test successful
+LDAPSynchroKO=Failed synchronization test
+LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
+LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
+LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
+LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPSetupForVersion3=LDAP server configured for version 3
+LDAPSetupForVersion2=LDAP server configured for version 2
+LDAPDolibarrMapping=Dolibarr Mapping
+LDAPLdapMapping=LDAP Mapping
+LDAPFieldLoginUnix=Login (unix)
+LDAPFieldLoginExample=Example: uid
+LDAPFilterConnection=Search filter
+LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPFieldLoginSamba=Login (samba, activedirectory)
+LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldFullname=Full name
+LDAPFieldFullnameExample=Example: cn
+LDAPFieldPasswordNotCrypted=Password not encrypted
+LDAPFieldPasswordCrypted=Password encrypted
+LDAPFieldPasswordExample=Example: userPassword
+LDAPFieldCommonNameExample=Example: cn
+LDAPFieldName=Name
+LDAPFieldNameExample=Example: sn
+LDAPFieldFirstName=First name
+LDAPFieldFirstNameExample=Example: givenName
+LDAPFieldMail=Email address
+LDAPFieldMailExample=Example: mail
+LDAPFieldPhone=Professional phone number
+LDAPFieldPhoneExample=Example: telephonenumber
+LDAPFieldHomePhone=Personal phone number
+LDAPFieldHomePhoneExample=Example: homephone
+LDAPFieldMobile=Cellular phone
+LDAPFieldMobileExample=Example: mobile
+LDAPFieldFax=Fax number
+LDAPFieldFaxExample=Example: facsimiletelephonenumber
+LDAPFieldAddress=Street
+LDAPFieldAddressExample=Example: street
+LDAPFieldZip=Zip
+LDAPFieldZipExample=Example: postalcode
+LDAPFieldTown=Town
+LDAPFieldTownExample=Example: l
+LDAPFieldCountry=Country
+LDAPFieldDescription=Description
+LDAPFieldDescriptionExample=Example: description
+LDAPFieldNotePublic=Public Note
+LDAPFieldNotePublicExample=Example: publicnote
+LDAPFieldGroupMembers= Group members
+LDAPFieldGroupMembersExample= Example: uniqueMember
+LDAPFieldBirthdate=Birthdate
+LDAPFieldCompany=Company
+LDAPFieldCompanyExample=Example: o
+LDAPFieldSid=SID
+LDAPFieldSidExample=Example: objectsid
+LDAPFieldEndLastSubscription=Date of subscription end
+LDAPFieldTitle=Job position
+LDAPFieldTitleExample=Example: title
+LDAPFieldGroupid=Group id
+LDAPFieldGroupidExample=Exemple : gidnumber
+LDAPFieldUserid=User id
+LDAPFieldUseridExample=Exemple : uidnumber
+LDAPFieldHomedirectory=Home directory
+LDAPFieldHomedirectoryExample=Exemple : homedirectory
+LDAPFieldHomedirectoryprefix=Home directory prefix
+LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
+LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
+LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
+LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
+LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
+LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
+LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use thoose values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all thoose schemas loaded.
+ForANonAnonymousAccess=For an authenticated access (for a write access for example)
+PerfDolibarr=Performance setup/optimizing report
+YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
+NotInstalled=Not installed, so your server is not slowed down by this.
+ApplicativeCache=Applicative cache
+MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
+MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
+MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
+OPCodeCache=OPCode cache
+NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
+HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
+FilesOfTypeCached=Files of type %s are cached by HTTP server
+FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
+FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
+FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
+CacheByServer=Cache by server
+CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
+CacheByClient=Cache by browser
+CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
+DefaultCreateForm=Default values (to use on forms)
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
+DefaultMandatory=Mandatory form fields
+##### Products #####
+ProductSetup=Products module setup
+ServiceSetup=Services module setup
+ProductServiceSetup=Products and Services modules setup
+NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
+ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in the language of the third party
+UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
+SetDefaultBarcodeTypeProducts=Default barcode type to use for products
+SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
+ProductCodeChecker= Module for product code generation and checking (product or service)
+ProductOtherConf= Product / Service configuration
+IsNotADir=is not a directory!
+##### Syslog #####
+SyslogSetup=Logs module setup
+SyslogOutput=Logs outputs
+SyslogFacility=Facility
+SyslogLevel=Level
+SyslogFilename=File name and path
+YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
+ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
+OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+##### Donations #####
+DonationsSetup=Donation module setup
+DonationsReceiptModel=Template of donation receipt
+##### Barcode #####
+BarcodeSetup=Barcode setup
+PaperFormatModule=Print format module
+BarcodeEncodeModule=Barcode encoding type
+CodeBarGenerator=Barcode generator
+ChooseABarCode=No generator defined
+FormatNotSupportedByGenerator=Format not supported by this generator
+BarcodeDescEAN8=Barcode of type EAN8
+BarcodeDescEAN13=Barcode of type EAN13
+BarcodeDescUPC=Barcode of type UPC
+BarcodeDescISBN=Barcode of type ISBN
+BarcodeDescC39=Barcode of type C39
+BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
+GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
+BarcodeInternalEngine=Internal engine
+BarCodeNumberManager=Manager to auto define barcode numbers
+##### Prelevements #####
+WithdrawalsSetup=Setup of module Direct Debit payments
+##### ExternalRSS #####
+ExternalRSSSetup=External RSS imports setup
+NewRSS=New RSS Feed
+RSSUrl=RSS URL
+RSSUrlExample=An interesting RSS feed
+##### Mailing #####
+MailingSetup=EMailing module setup
+MailingEMailFrom=Sender email (From) for emails sent by emailing module
+MailingEMailError=Return Email (Errors-to) for emails with errors
+MailingDelay=Seconds to wait after sending next message
+##### Notification #####
+NotificationSetup=Email Notification module setup
+NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
+FixedEmailTarget=Recipient
+##### Sendings #####
+SendingsSetup=Shipping module setup
+SendingsReceiptModel=Sending receipt model
+SendingsNumberingModules=Sendings numbering modules
+SendingsAbility=Support shipping sheets for customer deliveries
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
+FreeLegalTextOnShippings=Free text on shipments
+##### Deliveries #####
+DeliveryOrderNumberingModules=Products deliveries receipt numbering module
+DeliveryOrderModel=Products deliveries receipt model
+DeliveriesOrderAbility=Support products deliveries receipts
+FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+##### FCKeditor #####
+AdvancedEditor=Advanced editor
+ActivateFCKeditor=Activate advanced editor for:
+FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
+FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
+FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
+FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
+FCKeditorForTicket=WYSIWIG creation/edition for tickets
+##### Stock #####
+StockSetup=Stock module setup
+IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+##### Menu #####
+MenuDeleted=Menu deleted
+Menus=Menus
+TreeMenuPersonalized=Personalized menus
+NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
+NewMenu=New menu
+Menu=Selection of menu
+MenuHandler=Menu handler
+MenuModule=Source module
+HideUnauthorizedMenu= Hide unauthorized menus (gray)
+DetailId=Id menu
+DetailMenuHandler=Menu handler where to show new menu
+DetailMenuModule=Module name if menu entry come from a module
+DetailType=Type of menu (top or left)
+DetailTitre=Menu label or label code for translation
+DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
+DetailEnabled=Condition to show or not entry
+DetailRight=Condition to display unauthorized grey menus
+DetailLangs=Lang file name for label code translation
+DetailUser=Intern / Extern / All
+Target=Target
+DetailTarget=Target for links (_blank top opens a new window)
+DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
+ModifMenu=Menu change
+DeleteMenu=Delete menu entry
+ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
+FailedToInitializeMenu=Failed to initialize menu
+##### Tax #####
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
+OptionVatMode=VAT due
+OptionVATDefault=Standard basis
+OptionVATDebitOption=Accrual basis
+OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
+OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
+SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option:
+OnDelivery=On delivery
+OnPayment=On payment
+OnInvoice=On invoice
+SupposedToBePaymentDate=Payment date used
+SupposedToBeInvoiceDate=Invoice date used
+Buy=Buy
+Sell=Sell
+InvoiceDateUsed=Invoice date used
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
+AccountancyCode=Accounting Code
+AccountancyCodeSell=Sale account. code
+AccountancyCodeBuy=Purchase account. code
+##### Agenda #####
+AgendaSetup=Events and agenda module setup
+PasswordTogetVCalExport=Key to authorize export link
+PastDelayVCalExport=Do not export event older than
+AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
+AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
+AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
+AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
+ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+##### Point Of Sale (CashDesk) #####
+CashDesk=Point of Sale
+CashDeskSetup=Point of Sales module setup
+CashDeskThirdPartyForSell=Default generic third party to use for sales
+CashDeskBankAccountForSell=Default account to use to receive cash payments
+CashDeskBankAccountForCheque=Default account to use to receive payments by check
+CashDeskBankAccountForCB=Default account to use to receive payments by credit cards
+CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with module Serial/Lot management (currently active) so stock decrease is disabled.
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
+CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
+CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
+CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+##### Bookmark #####
+BookmarkSetup=Bookmark module setup
+BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
+NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
+##### WebServices #####
+WebServicesSetup=Webservices module setup
+WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
+WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
+EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
+ApiExporerIs=You can explore and test the APIs at URL
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+##### Bank #####
+BankSetupModule=Bank module setup
+FreeLegalTextOnChequeReceipts=Free text on check receipts
+BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
+BankOrderGlobal=General
+BankOrderGlobalDesc=General display order
+BankOrderES=Spanish
+BankOrderESDesc=Spanish display order
+ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+##### Multicompany #####
+MultiCompanySetup=Multi-company module setup
+##### Suppliers #####
+SuppliersSetup=Vendor module setup
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
+SuppliersInvoiceModel=Complete template of Vendor Invoice
+SuppliersInvoiceNumberingModel=Vendor invoices numbering models
+IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
+##### GeoIPMaxmind #####
+GeoIPMaxmindSetup=GeoIP Maxmind module setup
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
+NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
+YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
+YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
+TestGeoIPResult=Test of a conversion IP -> country
+##### Projects #####
+ProjectsNumberingModules=Projects numbering module
+ProjectsSetup=Project module setup
+ProjectsModelModule=Project reports document model
+TasksNumberingModules=Tasks numbering module
+TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
+##### ECM (GED) #####
+##### Fiscal Year #####
+AccountingPeriods=Accounting periods
+AccountingPeriodCard=Accounting period
+NewFiscalYear=New accounting period
+OpenFiscalYear=Open accounting period
+CloseFiscalYear=Close accounting period
+DeleteFiscalYear=Delete accounting period
+ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
+ShowFiscalYear=Show accounting period
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
+Format=Format
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
+IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
+ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
+ExpenseReportNumberingModules=Expense reports numbering module
+NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerUser=List of automatic notifications per user*
+ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
+ListOfFixedNotifications=List of automatic fixed notifications
+GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+Threshold=Threshold
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
+SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
+SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
+HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+TextTitleColor=Text color of Page title
+LinkColor=Color of links
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
+MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
+NbAddedAutomatically=Number of days added to counters of users (automatically) each month
+EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+Enter0or1=Enter 0 or 1
+UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
+PositionIntoComboList=Position of line into combo lists
+SellTaxRate=Sale tax rate
+RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
+UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
+OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
+TemplateForElement=This template record is dedicated to which element
+TypeOfTemplate=Type of template
+TemplateIsVisibleByOwnerOnly=Template is visible to owner only
+VisibleEverywhere=Visible everywhere
+VisibleNowhere=Visible nowhere
+FixTZ=TimeZone fix
+FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
+ExpectedChecksum=Expected Checksum
+CurrentChecksum=Current Checksum
+ExpectedSize=Expected size
+CurrentSize=Current size
+ForcedConstants=Required constant values
+MailToSendProposal=Customer proposals
+MailToSendOrder=Sales orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Shipments
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracts
+MailToThirdparty=Third parties
+MailToMember=Members
+MailToUser=Users
+MailToProject=Projects page
+ByDefaultInList=Show by default on list view
+YouUseLastStableVersion=You use the latest stable version
+TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
+TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
+SeeChangeLog=See ChangeLog file (english only)
+AllPublishers=All publishers
+UnknownPublishers=Unknown publishers
+AddRemoveTabs=Add or remove tabs
+AddDataTables=Add object tables
+AddDictionaries=Add dictionaries tables
+AddData=Add objects or dictionaries data
+AddBoxes=Add widgets
+AddSheduledJobs=Add scheduled jobs
+AddHooks=Add hooks
+AddTriggers=Add triggers
+AddMenus=Add menus
+AddPermissions=Add permissions
+AddExportProfiles=Add export profiles
+AddImportProfiles=Add import profiles
+AddOtherPagesOrServices=Add other pages or services
+AddModels=Add document or numbering templates
+AddSubstitutions=Add keys substitutions
+DetectionNotPossible=Detection not possible
+UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
+ListOfAvailableAPIs=List of available APIs
+activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
+CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
+UserHasNoPermissions=This user has no permissions defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
+BaseCurrency=Reference currency of the company (go into setup of company to change this)
+WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
+WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
+MAIN_PDF_MARGIN_LEFT=Left margin on PDF
+MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
+MAIN_PDF_MARGIN_TOP=Top margin on PDF
+MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+NothingToSetup=There is no specific setup required for this module.
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+RemoveSpecialChars=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
+GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
+GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
+HelpOnTooltip=Help text to show on tooltip
+HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
+YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
+ChartLoaded=Chart of account loaded
+SocialNetworkSetup=Setup of module Social Networks
+EnableFeatureFor=Enable features for <strong>%s</strong>
+VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+EmailCollector=Email collector
+EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
+NewEmailCollector=New Email Collector
+EMailHost=Host of email IMAP server
+MailboxSourceDirectory=Mailbox source directory
+MailboxTargetDirectory=Mailbox target directory
+EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
+CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
+DateLastCollectResult=Date latest collect tried
+DateLastcollectResultOk=Date latest collect successfull
+LastResult=Latest result
+EmailCollectorConfirmCollectTitle=Email collect confirmation
+EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
+NoNewEmailToProcess=No new email (matching filters) to process
+NothingProcessed=Nothing done
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+RecordEvent=Record email event
+CreateLeadAndThirdParty=Create lead (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CodeLastResult=Latest result code
+NbOfEmailsInInbox=Number of emails in source directory
+LoadThirdPartyFromName=Load third party searching on %s (load only)
+LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+WithDolTrackingID=Dolibarr Reference found in Message ID
+WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+FormatZip=Zip
+MainMenuCode=Menu entry code (mainmenu)
+ECMAutoTree=Show automatic ECM tree
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OpeningHours=Opening hours
+OpeningHoursDesc=Enter here the regular opening hours of your company.
+ResourceSetup=Configuration of Resource module
+UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
+EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
+ConfirmUnactivation=Confirm module reset
+OnMobileOnly=On small screen (smartphone) only
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
+Protanopia=Protanopia
+Deuteranopes=Deuteranopes
+Tritanopes=Tritanopes
+ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
+DefaultCustomerType=Default thirdparty type for "New customer" creation form
+ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
+RootCategoryForProductsToSell=Root category of products to sell
+RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
+DebugBar=Debug Bar
+DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
+DebugBarSetup=DebugBar Setup
+GeneralOptions=General Options
+LogsLinesNumber=Number of lines to show on logs tab
+UseDebugBar=Use the debug bar
+DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
+WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
+ModuleActivated=Module %s is activated and slows the interface
+EXPORTS_SHARE_MODELS=Export models are share with everybody
+ExportSetup=Setup of module Export
+ImportSetup=Setup of module Import
+InstanceUniqueID=Unique ID of the instance
+SmallerThan=Smaller than
+LargerThan=Larger than
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
+EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
+RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
+AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+IPListExample=127.0.0.1 192.168.0.2 [::1]
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
+FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
+EmailTemplate=Template for email
+EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
+FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/bn_IN/agenda.lang b/htdocs/langs/bn_IN/agenda.lang
new file mode 100644
index 00000000000..2031241d2c9
--- /dev/null
+++ b/htdocs/langs/bn_IN/agenda.lang
@@ -0,0 +1,154 @@
+# Dolibarr language file - Source file is en_US - agenda
+IdAgenda=ID event
+Actions=Events
+Agenda=Agenda
+TMenuAgenda=Agenda
+Agendas=Agendas
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+ActionsOwnedByShort=Owner
+AffectedTo=Assigned to
+Event=Event
+Events=Events
+EventsNb=Number of events
+ListOfActions=List of events
+EventReports=Event reports
+Location=Location
+ToUserOfGroup=To any user in group
+EventOnFullDay=Event on all day(s)
+MenuToDoActions=All incomplete events
+MenuDoneActions=All terminated events
+MenuToDoMyActions=My incomplete events
+MenuDoneMyActions=My terminated events
+ListOfEvents=List of events (internal calendar)
+ActionsAskedBy=Events reported by
+ActionsToDoBy=Events assigned to
+ActionsDoneBy=Events done by
+ActionAssignedTo=Event assigned to
+ViewCal=Month view
+ViewDay=Day view
+ViewWeek=Week view
+ViewPerUser=Per user view
+ViewPerType=Per type view
+AutoActions= Automatic filling
+AgendaAutoActionDesc= Here you may define events which you want Dolibarr to create automatically  in Agenda. If nothing is checked, only manual actions will be included in logs and displayed in Agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
+AgendaSetupOtherDesc= This page provides options to allow the export of your Dolibarr events into an external calendar (Thunderbird, Google Calendar etc...)
+AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
+ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
+EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
+##### Agenda event labels #####
+NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
+ContractValidatedInDolibarr=Contract %s validated
+CONTRACT_DELETEInDolibarr=Contract %s deleted
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
+InvoiceDeleteDolibarr=Invoice %s deleted
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+MemberValidatedInDolibarr=Member %s validated
+MemberModifiedInDolibarr=Member %s modified
+MemberResiliatedInDolibarr=Member %s terminated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
+ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
+ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
+ShipmentDeletedInDolibarr=Shipment %s deleted
+OrderCreatedInDolibarr=Order %s created
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
+OrderApprovedInDolibarr=Order %s approved
+OrderRefusedInDolibarr=Order %s refused
+OrderBackToDraftInDolibarr=Order %s go back to draft status
+ProposalSentByEMail=Commercial proposal %s sent by email
+ContractSentByEMail=Contract %s sent by email
+OrderSentByEMail=Sales order %s sent by email
+InvoiceSentByEMail=Customer invoice %s sent by email
+SupplierOrderSentByEMail=Purchase order %s sent by email
+ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
+SupplierInvoiceSentByEMail=Vendor invoice %s sent by email
+ShippingSentByEMail=Shipment %s sent by email
+ShippingValidated= Shipment %s validated
+InterventionSentByEMail=Intervention %s sent by email
+ProposalDeleted=Proposal deleted
+OrderDeleted=Order deleted
+InvoiceDeleted=Invoice deleted
+DraftInvoiceDeleted=Draft invoice deleted
+PRODUCT_CREATEInDolibarr=Product %s created
+PRODUCT_MODIFYInDolibarr=Product %s modified
+PRODUCT_DELETEInDolibarr=Product %s deleted
+HOLIDAY_CREATEInDolibarr=Request for leave %s created
+HOLIDAY_MODIFYInDolibarr=Request for leave %s modified
+HOLIDAY_APPROVEInDolibarr=Request for leave %s approved
+HOLIDAY_VALIDATEInDolibarr=Request for leave %s validated
+HOLIDAY_DELETEInDolibarr=Request for leave %s deleted
+EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created
+EXPENSE_REPORT_VALIDATEInDolibarr=Expense report %s validated
+EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved
+EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted
+EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused
+PROJECT_CREATEInDolibarr=Project %s created
+PROJECT_MODIFYInDolibarr=Project %s modified
+PROJECT_DELETEInDolibarr=Project %s deleted
+TICKET_CREATEInDolibarr=Ticket %s created
+TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
+TICKET_CLOSEInDolibarr=Ticket %s closed
+TICKET_DELETEInDolibarr=Ticket %s deleted
+BOM_VALIDATEInDolibarr=BOM validated
+BOM_UNVALIDATEInDolibarr=BOM unvalidated
+BOM_CLOSEInDolibarr=BOM disabled
+BOM_REOPENInDolibarr=BOM reopen
+BOM_DELETEInDolibarr=BOM deleted
+MRP_MO_VALIDATEInDolibarr=MO validated
+MRP_MO_PRODUCEDInDolibarr=MO produced
+MRP_MO_DELETEInDolibarr=MO deleted
+##### End agenda events #####
+AgendaModelModule=Document templates for event
+DateActionStart=Start date
+DateActionEnd=End date
+AgendaUrlOptions1=You can also add following parameters to filter output:
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
+AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
+AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
+AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaHideBirthdayEvents=Hide birthdays of contacts
+Busy=Busy
+ExportDataset_event1=List of agenda events
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
+# External Sites ical
+ExportCal=Export calendar
+ExtSites=Import external calendars
+ExtSitesEnableThisTool=Show external calendars (defined in global setup) in Agenda. Does not affect external calendars defined by users.
+ExtSitesNbOfAgenda=Number of calendars
+AgendaExtNb=Calendar no. %s
+ExtSiteUrlAgenda=URL to access .ical file
+ExtSiteNoLabel=No Description
+VisibleTimeRange=Visible time range
+VisibleDaysRange=Visible days range
+AddEvent=Create event
+MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
+RepeatEvent=Repeat event
+EveryWeek=Every week
+EveryMonth=Every month
+DayOfMonth=Day of month
+DayOfWeek=Day of week
+DateStartPlusOne=Date start + 1 hour
diff --git a/htdocs/langs/bn_IN/assets.lang b/htdocs/langs/bn_IN/assets.lang
new file mode 100644
index 00000000000..ef04723c6c2
--- /dev/null
+++ b/htdocs/langs/bn_IN/assets.lang
@@ -0,0 +1,65 @@
+# Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+Assets = Assets
+NewAsset = New asset
+AccountancyCodeAsset = Accounting code (asset)
+AccountancyCodeDepreciationAsset = Accounting code (depreciation asset account)
+AccountancyCodeDepreciationExpense = Accounting code (depreciation expense account)
+NewAssetType=New asset type
+AssetsTypeSetup=Asset type setup
+AssetTypeModified=Asset type modified
+AssetType=Asset type
+AssetsLines=Assets
+DeleteType=Delete
+DeleteAnAssetType=Delete an asset type
+ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
+ShowTypeCard=Show type '%s'
+
+# Module label 'ModuleAssetsName'
+ModuleAssetsName = Assets
+# Module description 'ModuleAssetsDesc'
+ModuleAssetsDesc = Assets description
+
+#
+# Admin page
+#
+AssetsSetup = Assets setup
+Settings = Settings
+AssetsSetupPage = Assets setup page
+ExtraFieldsAssetsType = Complementary attributes (Asset type)
+AssetsType=Asset type
+AssetsTypeId=Asset type id
+AssetsTypeLabel=Asset type label
+AssetsTypes=Assets types
+
+#
+# Menu
+#
+MenuAssets = Assets
+MenuNewAsset = New asset
+MenuTypeAssets = Type assets
+MenuListAssets = List
+MenuNewTypeAssets = New
+MenuListTypeAssets = List
+
+#
+# Module
+#
+NewAssetType=New asset type
+NewAsset=New asset
diff --git a/htdocs/langs/bn_IN/banks.lang b/htdocs/langs/bn_IN/banks.lang
new file mode 100644
index 00000000000..e54239e9fb2
--- /dev/null
+++ b/htdocs/langs/bn_IN/banks.lang
@@ -0,0 +1,175 @@
+# Dolibarr language file - Source file is en_US - banks
+Bank=Bank
+MenuBankCash=Banks | Cash
+MenuVariousPayment=Miscellaneous payments
+MenuNewVariousPayment=New Miscellaneous payment
+BankName=Bank name
+FinancialAccount=Account
+BankAccount=Bank account
+BankAccounts=Bank accounts
+BankAccountsAndGateways=Bank accounts | Gateways
+ShowAccount=Show Account
+AccountRef=Financial account ref
+AccountLabel=Financial account label
+CashAccount=Cash account
+CashAccounts=Cash accounts
+CurrentAccounts=Current accounts
+SavingAccounts=Savings accounts
+ErrorBankLabelAlreadyExists=Financial account label already exists
+BankBalance=Balance
+BankBalanceBefore=Balance before
+BankBalanceAfter=Balance after
+BalanceMinimalAllowed=Minimum allowed balance
+BalanceMinimalDesired=Minimum desired balance
+InitialBankBalance=Initial balance
+EndBankBalance=End balance
+CurrentBalance=Current balance
+FutureBalance=Future balance
+ShowAllTimeBalance=Show balance from start
+AllTime=From start
+Reconciliation=Reconciliation
+RIB=Bank Account Number
+IBAN=IBAN number
+BIC=BIC/SWIFT code
+SwiftValid=BIC/SWIFT valid
+SwiftVNotalid=BIC/SWIFT not valid
+IbanValid=BAN valid
+IbanNotValid=BAN not valid
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
+AccountStatement=Account statement
+AccountStatementShort=Statement
+AccountStatements=Account statements
+LastAccountStatements=Last account statements
+IOMonthlyReporting=Monthly reporting
+BankAccountDomiciliation=Bank address
+BankAccountCountry=Account country
+BankAccountOwner=Account owner name
+BankAccountOwnerAddress=Account owner address
+RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
+CreateAccount=Create account
+NewBankAccount=New account
+NewFinancialAccount=New financial account
+MenuNewFinancialAccount=New financial account
+EditFinancialAccount=Edit account
+LabelBankCashAccount=Bank or cash label
+AccountType=Account type
+BankType0=Savings account
+BankType1=Current or credit card account
+BankType2=Cash account
+AccountsArea=Accounts area
+AccountCard=Account card
+DeleteAccount=Delete account
+ConfirmDeleteAccount=Are you sure you want to delete this account?
+Account=Account
+BankTransactionByCategories=Bank entries by categories
+BankTransactionForCategory=Bank entries for category <b>%s</b>
+RemoveFromRubrique=Remove link with category
+RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
+ListBankTransactions=List of bank entries
+IdTransaction=Transaction ID
+BankTransactions=Bank entries
+BankTransaction=Bank entry
+ListTransactions=List entries
+ListTransactionsByCategory=List entries/category
+TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
+Conciliable=Can be reconciled
+Conciliate=Reconcile
+Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
+ReconciliationLate=Reconciliation late
+IncludeClosedAccount=Include closed accounts
+OnlyOpenedAccount=Only open accounts
+AccountToCredit=Account to credit
+AccountToDebit=Account to debit
+DisableConciliation=Disable reconciliation feature for this account
+ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated entry
+StatusAccountOpened=Open
+StatusAccountClosed=Closed
+AccountIdShort=Number
+LineRecord=Transaction
+AddBankRecord=Add entry
+AddBankRecordLong=Add entry manually
+Conciliated=Reconciled
+ConciliatedBy=Reconciled by
+DateConciliating=Reconcile date
+BankLineConciliated=Entry reconciled with bank receipt
+Reconciled=Reconciled
+NotReconciled=Not reconciled
+CustomerInvoicePayment=Customer payment
+SupplierInvoicePayment=Vendor payment
+SubscriptionPayment=Subscription payment
+WithdrawalPayment=Debit payment order
+SocialContributionPayment=Social/fiscal tax payment
+BankTransfer=Bank transfer
+BankTransfers=Bank transfers
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferFrom=From
+TransferTo=To
+TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
+CheckTransmitter=Transmitter
+ValidateCheckReceipt=Validate this check receipt?
+ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done?
+DeleteCheckReceipt=Delete this check receipt?
+ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
+BankChecks=Bank checks
+BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
+ShowCheckReceipt=Show check deposit receipt
+NumberOfCheques=No. of check
+DeleteTransaction=Delete entry
+ConfirmDeleteTransaction=Are you sure you want to delete this entry?
+ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
+BankMovements=Movements
+PlannedTransactions=Planned entries
+Graph=Graphics
+ExportDataset_banque_1=Bank entries and account statement
+ExportDataset_banque_2=Deposit slip
+TransactionOnTheOtherAccount=Transaction on the other account
+PaymentNumberUpdateSucceeded=Payment number updated successfully
+PaymentNumberUpdateFailed=Payment number could not be updated
+PaymentDateUpdateSucceeded=Payment date updated successfully
+PaymentDateUpdateFailed=Payment date could not be updated
+Transactions=Transactions
+BankTransactionLine=Bank entry
+AllAccounts=All bank and cash accounts
+BackToAccount=Back to account
+ShowAllAccounts=Show for all accounts
+FutureTransaction=Future transaction. Unable to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+EventualyAddCategory=Eventually, specify a category in which to classify the records
+ToConciliate=To reconcile?
+ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
+DefaultRIB=Default BAN
+AllRIB=All BAN
+LabelRIB=BAN Label
+NoBANRecord=No BAN record
+DeleteARib=Delete BAN record
+ConfirmDeleteRib=Are you sure you want to delete this BAN record?
+RejectCheck=Check returned
+ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
+RejectCheckDate=Date the check was returned
+CheckRejected=Check returned
+CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
+VariousPayments=Miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
+SEPAMandate=SEPA mandate
+YourSEPAMandate=Your SEPA mandate
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
+BankColorizeMovement=Colorize movements
+BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
+BankColorizeMovementName1=Background color for debit movement
+BankColorizeMovementName2=Background color for credit movement
diff --git a/htdocs/langs/bn_IN/bills.lang b/htdocs/langs/bn_IN/bills.lang
new file mode 100644
index 00000000000..9f11d8ecf87
--- /dev/null
+++ b/htdocs/langs/bn_IN/bills.lang
@@ -0,0 +1,574 @@
+# Dolibarr language file - Source file is en_US - bills
+Bill=Invoice
+Bills=Invoices
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Vendor invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid vendor invoices
+BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsLate=Late payments
+BillsStatistics=Customers invoices statistics
+BillsStatisticsSuppliers=Vendors invoices statistics
+DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
+DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
+DisabledBecauseNotErasable=Disabled because cannot be erased
+InvoiceStandard=Standard invoice
+InvoiceStandardAsk=Standard invoice
+InvoiceStandardDesc=This kind of invoice is the common invoice.
+InvoiceDeposit=Down payment invoice
+InvoiceDepositAsk=Down payment invoice
+InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
+InvoiceProForma=Proforma invoice
+InvoiceProFormaAsk=Proforma invoice
+InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
+InvoiceReplacement=Replacement invoice
+InvoiceReplacementAsk=Replacement invoice for invoice
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceAvoir=Credit note
+InvoiceAvoirAsk=Credit note to correct invoice
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
+invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+ReplaceInvoice=Replace invoice %s
+ReplacementInvoice=Replacement invoice
+ReplacedByInvoice=Replaced by invoice %s
+ReplacementByInvoice=Replaced by invoice
+CorrectInvoice=Correct invoice %s
+CorrectionInvoice=Correction invoice
+UsedByInvoice=Used to pay invoice %s
+ConsumedBy=Consumed by
+NotConsumed=Not consumed
+NoReplacableInvoice=No replaceable invoices
+NoInvoiceToCorrect=No invoice to correct
+InvoiceHasAvoir=Was source of one or several credit notes
+CardBill=Invoice card
+PredefinedInvoices=Predefined Invoices
+Invoice=Invoice
+PdfInvoiceTitle=Invoice
+Invoices=Invoices
+InvoiceLine=Invoice line
+InvoiceCustomer=Customer invoice
+CustomerInvoice=Customer invoice
+CustomersInvoices=Customers invoices
+SupplierInvoice=Vendor invoice
+SuppliersInvoices=Vendors invoices
+SupplierBill=Vendor invoice
+SupplierBills=suppliers invoices
+Payment=Payment
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
+Payments=Payments
+PaymentsBack=Refunds
+paymentInInvoiceCurrency=in invoices currency
+PaidBack=Paid back
+DeletePayment=Delete payment
+ConfirmDeletePayment=Are you sure you want to delete this payment?
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+SupplierPayments=Vendor payments
+ReceivedPayments=Received payments
+ReceivedCustomersPayments=Payments received from customers
+PayedSuppliersPayments=Payments paid to vendors
+ReceivedCustomersPaymentsToValid=Received customers payments to validate
+PaymentsReportsForYear=Payments reports for %s
+PaymentsReports=Payments reports
+PaymentsAlreadyDone=Payments already done
+PaymentsBackAlreadyDone=Refunds already done
+PaymentRule=Payment rule
+PaymentMode=Payment Type
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
+IdPaymentMode=Payment Type (id)
+CodePaymentMode=Payment Type (code)
+LabelPaymentMode=Payment Type (label)
+PaymentModeShort=Payment Type
+PaymentTerm=Payment Term
+PaymentConditions=Payment Terms
+PaymentConditionsShort=Payment Terms
+PaymentAmount=Payment amount
+PaymentHigherThanReminderToPay=Payment higher than reminder to pay
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
+ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
+ClassifyPaidPartially=Classify 'Paid partially'
+ClassifyCanceled=Classify 'Abandoned'
+ClassifyClosed=Classify 'Closed'
+ClassifyUnBilled=Classify 'Unbilled'
+CreateBill=Create Invoice
+CreateCreditNote=Create credit note
+AddBill=Create invoice or credit note
+AddToDraftInvoices=Add to draft invoice
+DeleteBill=Delete invoice
+SearchACustomerInvoice=Search for a customer invoice
+SearchASupplierInvoice=Search for a vendor invoice
+CancelBill=Cancel an invoice
+SendRemindByMail=Send reminder by email
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
+ConvertToReduc=Mark as credit available
+ConvertExcessReceivedToReduc=Convert excess received into available credit
+ConvertExcessPaidToReduc=Convert excess paid into available discount
+EnterPaymentReceivedFromCustomer=Enter payment received from customer
+EnterPaymentDueToCustomer=Make payment due to customer
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+PriceBase=Price base
+BillStatus=Invoice status
+StatusOfGeneratedInvoices=Status of generated invoices
+BillStatusDraft=Draft (needs to be validated)
+BillStatusPaid=Paid
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
+BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusCanceled=Abandoned
+BillStatusValidated=Validated (needs to be paid)
+BillStatusStarted=Started
+BillStatusNotPaid=Not paid
+BillStatusNotRefunded=Not refunded
+BillStatusClosedUnpaid=Closed (unpaid)
+BillStatusClosedPaidPartially=Paid (partially)
+BillShortStatusDraft=Draft
+BillShortStatusPaid=Paid
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
+BillShortStatusConverted=Paid
+BillShortStatusCanceled=Abandoned
+BillShortStatusValidated=Validated
+BillShortStatusStarted=Started
+BillShortStatusNotPaid=Not paid
+BillShortStatusNotRefunded=Not refunded
+BillShortStatusClosedUnpaid=Closed
+BillShortStatusClosedPaidPartially=Paid (partially)
+PaymentStatusToValidShort=To validate
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
+ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
+ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
+ErrorBillNotFound=Invoice %s does not exist
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorDiscountAlreadyUsed=Error, discount already used
+ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
+ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
+ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
+BillFrom=From
+BillTo=To
+ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=Template / Recurring invoice
+NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
+FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
+NotARecurringInvoiceTemplate=Not a recurring template invoice
+NewBill=New invoice
+LastBills=Latest %s invoices
+LatestTemplateInvoices=Latest %s template invoices
+LatestCustomerTemplateInvoices=Latest %s customer template invoices
+LatestSupplierTemplateInvoices=Latest %s vendor template invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s vendor invoices
+AllBills=All invoices
+AllCustomerTemplateInvoices=All template invoices
+OtherBills=Other invoices
+DraftBills=Draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Vendor draft invoices
+Unpaid=Unpaid
+ErrorNoPaymentDefined=Error No payment defined
+ConfirmDeleteBill=Are you sure you want to delete this invoice?
+ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
+ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
+ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
+ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
+ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
+ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
+ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
+ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyAbandonReasonOther=Other
+ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
+ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
+ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
+ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
+ValidateBill=Validate invoice
+UnvalidateBill=Unvalidate invoice
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
+AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
+AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
+UseSituationInvoices=Allow situation invoice
+UseSituationInvoicesCreditNote=Allow situation invoice credit note
+Retainedwarranty=Retained warranty
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
+RetainedwarrantyDefaultPercent=Retained warranty default percent
+RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
+RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
+ToPayOn=To pay on %s
+toPayOn=to pay on %s
+RetainedWarranty=Retained Warranty
+PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
+DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
+setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
+setretainedwarranty=Set retained warranty
+setretainedwarrantyDateLimit=Set retained warranty date limit
+RetainedWarrantyDateLimit=Retained warranty date limit
+RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
+AlreadyPaid=Already paid
+AlreadyPaidBack=Already paid back
+AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
+Abandoned=Abandoned
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to refund
+Rest=Pending
+AmountExpected=Amount claimed
+ExcessReceived=Excess received
+ExcessPaid=Excess paid
+EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
+NoDraftBills=No draft invoices
+NoOtherDraftBills=No other draft invoices
+NoDraftInvoices=No draft invoices
+RefBill=Invoice ref
+ToBill=To bill
+RemainderToBill=Remainder to bill
+SendBillByMail=Send invoice by email
+SendReminderBillByMail=Send reminder by email
+RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
+MenuToValid=To valid
+DateMaxPayment=Payment due on
+DateInvoice=Invoice date
+DatePointOfTax=Point of tax
+NoInvoice=No invoice
+ClassifyBill=Classify invoice
+SupplierBillsToPay=Unpaid vendor invoices
+CustomerBillsUnpaid=Unpaid customer invoices
+NonPercuRecuperable=Non-recoverable
+SetConditions=Set Payment Terms
+SetMode=Set Payment Type
+SetRevenuStamp=Set revenue stamp
+Billed=Billed
+RecurringInvoices=Recurring invoices
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
+CustomersInvoicesAndPayments=Customer invoices and payments
+ExportDataset_invoice_1=Customer invoices and invoice details
+ExportDataset_invoice_2=Customer invoices and payments
+ProformaBill=Proforma Bill:
+Reduction=Reduction
+ReductionShort=Disc.
+Reductions=Reductions
+ReductionsShort=Disc.
+Discounts=Discounts
+AddDiscount=Create discount
+AddRelativeDiscount=Create relative discount
+EditRelativeDiscount=Edit relative discount
+AddGlobalDiscount=Create absolute discount
+EditGlobalDiscounts=Edit absolute discounts
+AddCreditNote=Create credit note
+ShowDiscount=Show discount
+ShowReduc=Show the discount
+ShowSourceInvoice=Show the source invoice
+RelativeDiscount=Relative discount
+GlobalDiscount=Global discount
+CreditNote=Credit note
+CreditNotes=Credit notes
+CreditNotesOrExcessReceived=Credit notes or excess received
+Deposit=Down payment
+Deposits=Down payments
+DiscountFromCreditNote=Discount from credit note %s
+DiscountFromDeposit=Down payments from invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
+AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
+CreditNoteDepositUse=Invoice must be validated to use this kind of credits
+NewGlobalDiscount=New absolute discount
+NewRelativeDiscount=New relative discount
+DiscountType=Discount type
+NoteReason=Note/Reason
+ReasonDiscount=Reason
+DiscountOfferedBy=Granted by
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Vendors discounts
+BillAddress=Bill address
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
+IdSocialContribution=Social/fiscal tax payment id
+PaymentId=Payment id
+PaymentRef=Payment ref.
+InvoiceId=Invoice id
+InvoiceRef=Invoice ref.
+InvoiceDateCreation=Invoice creation date
+InvoiceStatus=Invoice status
+InvoiceNote=Invoice note
+InvoicePaid=Invoice paid
+InvoicePaidCompletely=Paid completely
+InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
+OrderBilled=Order billed
+DonationPaid=Donation paid
+PaymentNumber=Payment number
+RemoveDiscount=Remove discount
+WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty)
+InvoiceNotChecked=No invoice selected
+ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
+DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
+NbOfPayments=No. of payments
+SplitDiscount=Split discount in two
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
+ConfirmRemoveDiscount=Are you sure you want to remove this discount?
+RelatedBill=Related invoice
+RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related vendor invoices
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoices already exist
+MergingPDFTool=Merging PDF tool
+AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
+PaymentNote=Payment note
+ListOfPreviousSituationInvoices=List of previous situation invoices
+ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+FrequencyUnit=Frequency unit
+toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
+NextDateToExecution=Date for next invoice generation
+NextDateToExecutionShort=Date next gen.
+DateLastGeneration=Date of latest generation
+DateLastGenerationShort=Date latest gen.
+MaxPeriodNumber=Max. number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
+InvoiceAutoValidate=Validate invoices automatically
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not reached yet
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
+WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
+WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
+ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
+# PaymentConditions
+Statut=Status
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShort30D=30 days
+PaymentCondition30D=30 days
+PaymentConditionShort30DENDMONTH=30 days of month-end
+PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort60D=60 days
+PaymentCondition60D=60 days
+PaymentConditionShort60DENDMONTH=60 days of month-end
+PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShortPT_DELIVERY=Delivery
+PaymentConditionPT_DELIVERY=On delivery
+PaymentConditionShortPT_ORDER=Order
+PaymentConditionPT_ORDER=On order
+PaymentConditionShortPT_5050=50-50
+PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+PaymentConditionShort10D=10 days
+PaymentCondition10D=10 days
+PaymentConditionShort10DENDMONTH=10 days of month-end
+PaymentCondition10DENDMONTH=Within 10 days following the end of the month
+PaymentConditionShort14D=14 days
+PaymentCondition14D=14 days
+PaymentConditionShort14DENDMONTH=14 days of month-end
+PaymentCondition14DENDMONTH=Within 14 days following the end of the month
+FixAmount=Fixed amount - 1 line with label '%s'
+VarAmount=Variable amount (%% tot.)
+VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
+VarAmountAllLines=Variable amount (%% tot.) - all same lines
+# PaymentType
+PaymentTypeVIR=Bank transfer
+PaymentTypeShortVIR=Bank transfer
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
+PaymentTypeLIQ=Cash
+PaymentTypeShortLIQ=Cash
+PaymentTypeCB=Credit card
+PaymentTypeShortCB=Credit card
+PaymentTypeCHQ=Check
+PaymentTypeShortCHQ=Check
+PaymentTypeTIP=TIP (Documents against Payment)
+PaymentTypeShortTIP=TIP Payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
+PaymentTypeTRA=Bank draft
+PaymentTypeShortTRA=Draft
+PaymentTypeFAC=Factor
+PaymentTypeShortFAC=Factor
+BankDetails=Bank details
+BankCode=Bank code
+DeskCode=Branch code
+BankAccountNumber=Account number
+BankAccountNumberKey=Checksum
+Residence=Address
+IBANNumber=IBAN account number
+IBAN=IBAN
+BIC=BIC/SWIFT
+BICNumber=BIC/SWIFT code
+ExtraInfos=Extra infos
+RegulatedOn=Regulated on
+ChequeNumber=Check N°
+ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
+ChequeMaker=Check/Transfer transmitter
+ChequeBank=Bank of Check
+CheckBank=Check
+NetToBePaid=Net to be paid
+PhoneNumber=Tel
+FullPhoneNumber=Telephone
+TeleFax=Fax
+PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration.
+IntracommunityVATNumber=Intra-Community VAT ID
+PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
+PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
+SendTo=sent to
+PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
+VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
+LawApplicationPart1=By application of the law 80.335 of 12/05/80
+LawApplicationPart2=the goods remain the property of
+LawApplicationPart3=the seller until full payment of
+LawApplicationPart4=their price.
+LimitedLiabilityCompanyCapital=SARL with Capital of
+UseLine=Apply
+UseDiscount=Use discount
+UseCredit=Use credit
+UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit
+MenuChequeDeposits=Check Deposits
+MenuCheques=Checks
+MenuChequesReceipts=Check receipts
+NewChequeDeposit=New deposit
+ChequesReceipts=Check receipts
+ChequesArea=Check deposits area
+ChequeDeposits=Check deposits
+Cheques=Checks
+DepositId=Id deposit
+NbCheque=Number of checks
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices
+ShowUnpaidAll=Show all unpaid invoices
+ShowUnpaidLateOnly=Show late unpaid invoices only
+PaymentInvoiceRef=Payment invoice %s
+ValidateInvoice=Validate invoice
+ValidateInvoices=Validate invoices
+Cash=Cash
+Reported=Delayed
+DisabledBecausePayments=Not possible since there are some payments
+CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+ExpectedToPay=Expected payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
+PayedByThisPayment=Paid by this payment
+ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
+ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
+ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
+ToMakePayment=Pay
+ToMakePaymentBack=Pay back
+ListOfYourUnpaidInvoices=List of unpaid invoices
+NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
+RevenueStamp=Tax stamp
+YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
+YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
+PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
+TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+EarlyClosingReason=Early closing reason
+EarlyClosingComment=Early closing note
+##### Types de contacts #####
+TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
+TypeContact_facture_external_BILLING=Customer invoice contact
+TypeContact_facture_external_SHIPPING=Customer shipping contact
+TypeContact_facture_external_SERVICE=Customer service contact
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
+TypeContact_invoice_supplier_external_BILLING=Vendor invoice contact
+TypeContact_invoice_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+# Situation invoices
+InvoiceFirstSituationAsk=First situation invoice
+InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
+InvoiceSituation=Situation invoice
+InvoiceSituationAsk=Invoice following the situation
+InvoiceSituationDesc=Create a new situation following an already existing one
+SituationAmount=Situation invoice amount(net)
+SituationDeduction=Situation subtraction
+ModifyAllLines=Modify all lines
+CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
+NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
+DisabledBecauseNotLastInCycle=The next situation already exists.
+DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
+CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
+NoSituations=No open situations
+InvoiceSituationLast=Final and general invoice
+PDFCrevetteSituationNumber=Situation N°%s
+PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
+PDFCrevetteSituationInvoiceTitle=Situation invoice
+PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
+TotalSituationInvoice=Total situation
+invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
+updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
+CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
+BillCreated=%s bill(s) created
+StatusOfGeneratedDocuments=Status of document generation
+DoNotGenerateDoc=Do not generate document file
+AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/bn_IN/blockedlog.lang b/htdocs/langs/bn_IN/blockedlog.lang
new file mode 100644
index 00000000000..5afae6e9e53
--- /dev/null
+++ b/htdocs/langs/bn_IN/blockedlog.lang
@@ -0,0 +1,54 @@
+BlockedLog=Unalterable Logs
+Field=Field
+BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525).
+Fingerprints=Archived events and fingerprints
+FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed).
+CompanyInitialKey=Company initial key (hash of genesis block)
+BrowseBlockedLog=Unalterable logs
+ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
+ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
+DownloadBlockChain=Download fingerprints
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
+OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
+AddedByAuthority=Stored into remote authority
+NotAddedByAuthorityYet=Not yet stored into remote authority
+ShowDetails=Show stored details
+logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
+logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
+logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
+logPAYMENT_ADD_TO_BANK=Payment added to bank
+logPAYMENT_CUSTOMER_CREATE=Customer payment created
+logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
+logDONATION_PAYMENT_CREATE=Donation payment created
+logDONATION_PAYMENT_DELETE=Donation payment logical deletion
+logBILL_PAYED=Customer invoice paid
+logBILL_UNPAYED=Customer invoice set unpaid
+logBILL_VALIDATE=Customer invoice validated
+logBILL_SENTBYMAIL=Customer invoice send by mail
+logBILL_DELETE=Customer invoice logically deleted
+logMODULE_RESET=Module BlockedLog was disabled
+logMODULE_SET=Module BlockedLog was enabled
+logDON_VALIDATE=Donation validated
+logDON_MODIFY=Donation modified
+logDON_DELETE=Donation logical deletion
+logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
+logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
+logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
+logCASHCONTROL_VALIDATE=Cash fence recording
+BlockedLogBillDownload=Customer invoice download
+BlockedLogBillPreview=Customer invoice preview
+BlockedlogInfoDialog=Log Details
+ListOfTrackedEvents=List of tracked events
+Fingerprint=Fingerprint
+DownloadLogCSV=Export archived logs (CSV)
+logDOC_PREVIEW=Preview of a validated document in order to print or download
+logDOC_DOWNLOAD=Download of a validated document in order to print or send
+DataOfArchivedEvent=Full datas of archived event
+ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
+BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
+BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
+OnlyNonValid=Non-valid
+TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
+RestrictYearToExport=Restrict month / year to export
diff --git a/htdocs/langs/bn_IN/bookmarks.lang b/htdocs/langs/bn_IN/bookmarks.lang
new file mode 100644
index 00000000000..87466cadcfa
--- /dev/null
+++ b/htdocs/langs/bn_IN/bookmarks.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - marque pages
+AddThisPageToBookmarks=Add current page to bookmarks
+Bookmark=Bookmark
+Bookmarks=Bookmarks
+ListOfBookmarks=List of bookmarks
+EditBookmarks=List/edit bookmarks
+NewBookmark=New bookmark
+ShowBookmark=Show bookmark
+OpenANewWindow=Open a new tab
+ReplaceWindow=Replace current tab
+BookmarkTargetNewWindowShort=New tab
+BookmarkTargetReplaceWindowShort=Current tab
+BookmarkTitle=Bookmark name
+UrlOrLink=URL
+BehaviourOnClick=Behaviour when a bookmark URL is selected
+CreateBookmark=Create bookmark
+SetHereATitleForLink=Set a name for the bookmark
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if the linked page should open in the current tab or a new tab
+BookmarksManagement=Bookmarks management
+BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/bn_IN/boxes.lang b/htdocs/langs/bn_IN/boxes.lang
new file mode 100644
index 00000000000..bd62684421a
--- /dev/null
+++ b/htdocs/langs/bn_IN/boxes.lang
@@ -0,0 +1,102 @@
+# Dolibarr language file - Source file is en_US - boxes
+BoxLoginInformation=Login Information
+BoxLastRssInfos=RSS Information
+BoxLastProducts=Latest %s Products/Services
+BoxProductsAlertStock=Stock alerts for products
+BoxLastProductsInContract=Latest %s contracted products/services
+BoxLastSupplierBills=Latest Vendor invoices
+BoxLastCustomerBills=Latest Customer invoices
+BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
+BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
+BoxLastProposals=Latest commercial proposals
+BoxLastProspects=Latest modified prospects
+BoxLastCustomers=Latest modified customers
+BoxLastSuppliers=Latest modified suppliers
+BoxLastCustomerOrders=Latest sales orders
+BoxLastActions=Latest actions
+BoxLastContracts=Latest contracts
+BoxLastContacts=Latest contacts/addresses
+BoxLastMembers=Latest members
+BoxFicheInter=Latest interventions
+BoxCurrentAccounts=Open accounts balance
+BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleLastRssInfos=Latest %s news from %s
+BoxTitleLastProducts=Products/Services: last %s modified
+BoxTitleProductsAlertStock=Products: stock alert
+BoxTitleLastSuppliers=Latest %s recorded suppliers
+BoxTitleLastModifiedSuppliers=Vendors: last %s modified
+BoxTitleLastModifiedCustomers=Customers: last %s modified
+BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
+BoxTitleLastModifiedProspects=Prospects: last %s modified
+BoxTitleLastModifiedMembers=Latest %s members
+BoxTitleLastFicheInter=Latest %s modified interventions
+BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
+BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
+BoxTitleCurrentAccounts=Open Accounts: balances
+BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
+BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
+BoxMyLastBookmarks=Bookmarks: latest %s
+BoxOldestExpiredServices=Oldest active expired services
+BoxLastExpiredServices=Latest %s oldest contacts with active expired services
+BoxTitleLastActionsToDo=Latest %s actions to do
+BoxTitleLastContracts=Latest %s modified contracts
+BoxTitleLastModifiedDonations=Latest %s modified donations
+BoxTitleLastModifiedExpenses=Latest %s modified expense reports
+BoxTitleLatestModifiedBoms=Latest %s modified BOMs
+BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
+FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
+LastRefreshDate=Latest refresh date
+NoRecordedBookmarks=No bookmarks defined.
+ClickToAdd=Click here to add.
+NoRecordedCustomers=No recorded customers
+NoRecordedContacts=No recorded contacts
+NoActionsToDo=No actions to do
+NoRecordedOrders=No recorded sales orders
+NoRecordedProposals=No recorded proposals
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid vendor invoices
+NoModifiedSupplierBills=No recorded vendor invoices
+NoRecordedProducts=No recorded products/services
+NoRecordedProspects=No recorded prospects
+NoContractedProducts=No products/services contracted
+NoRecordedContracts=No recorded contracts
+NoRecordedInterventions=No recorded interventions
+BoxLatestSupplierOrders=Latest purchase orders
+BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
+NoSupplierOrder=No recorded purchase order
+BoxCustomersInvoicesPerMonth=Customer Invoices per month
+BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
+BoxCustomersOrdersPerMonth=Sales Orders per month
+BoxSuppliersOrdersPerMonth=Vendor Orders per month
+BoxProposalsPerMonth=Proposals per month
+NoTooLowStockProducts=No products are under the low stock limit
+BoxProductDistribution=Products/Services Distribution
+ForObject=On %s
+BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
+BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
+BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
+BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
+BoxTitleLastModifiedPropals=Latest %s modified proposals
+ForCustomersInvoices=Customers invoices
+ForCustomersOrders=Customers orders
+ForProposals=Proposals
+LastXMonthRolling=The latest %s month rolling
+ChooseBoxToAdd=Add widget to your dashboard
+BoxAdded=Widget was added in your dashboard
+BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
+BoxLastManualEntries=Last manual entries in accountancy
+BoxTitleLastManualEntries=%s latest manual entries
+NoRecordedManualEntries=No manual entries record in accountancy
+BoxSuspenseAccount=Count accountancy operation with suspense account
+BoxTitleSuspenseAccount=Number of unallocated lines
+NumberOfLinesInSuspenseAccount=Number of line in suspense account
+SuspenseAccountNotDefined=Suspense account isn't defined
+BoxLastCustomerShipments=Last customer shipments
+BoxTitleLastCustomerShipments=Latest %s customer shipments
+NoRecordedShipments=No recorded customer shipment
diff --git a/htdocs/langs/bn_IN/cashdesk.lang b/htdocs/langs/bn_IN/cashdesk.lang
new file mode 100644
index 00000000000..0903a3d10bc
--- /dev/null
+++ b/htdocs/langs/bn_IN/cashdesk.lang
@@ -0,0 +1,110 @@
+# Language file - Source file is en_US - cashdesk
+CashDeskMenu=Point of sale
+CashDesk=Point of sale
+CashDeskBankCash=Bank account (cash)
+CashDeskBankCB=Bank account (card)
+CashDeskBankCheque=Bank account (cheque)
+CashDeskWarehouse=Warehouse
+CashdeskShowServices=Selling services
+CashDeskProducts=Products
+CashDeskStock=Stock
+CashDeskOn=on
+CashDeskThirdParty=Third party
+ShoppingCart=Shopping cart
+NewSell=New sell
+AddThisArticle=Add this article
+RestartSelling=Go back on sell
+SellFinished=Sale complete
+PrintTicket=Print ticket
+SendTicket=Send ticket
+NoProductFound=No article found
+ProductFound=product found
+NoArticle=No article
+Identification=Identification
+Article=Article
+Difference=Difference
+TotalTicket=Total ticket
+NoVAT=No VAT for this sale
+Change=Excess received
+BankToPay=Account for payment
+ShowCompany=Show company
+ShowStock=Show warehouse
+DeleteArticle=Click to remove this article
+FilterRefOrLabelOrBC=Search (Ref/Label)
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
+DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of Sale
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
+Receipt=Receipt
+Header=Header
+Footer=Footer
+AmountAtEndOfPeriod=Amount at end of period (day, month or year)
+TheoricalAmount=Theorical amount
+RealAmount=Real amount
+CashFence=Cash fence
+CashFenceDone=Cash fence done for the period
+NbOfInvoices=Nb of invoices
+Paymentnumpad=Type of Pad to enter payment
+Numberspad=Numbers Pad
+BillsCoinsPad=Coins and banknotes Pad
+DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
+TakeposNeedsCategories=TakePOS needs product categories to work
+OrderNotes=Order Notes
+CashDeskBankAccountFor=Default account to use for payments in
+NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
+PrintCustomerOnReceipts=Print customer on tickets|receipts
+EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
+ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
+POSTerminal=POS Terminal
+POSModule=POS Module
+BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
+CustomReceipt=Custom Receipt
+ReceiptName=Receipt Name
+ProductSupplements=Product Supplements
+SupplementCategory=Supplement category
+ColorTheme=Color theme
+Colorful=Colorful
+HeadBar=Head Bar
+SortProductField=Field for sorting products
+Browser=Browser
+BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
+TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
+PrintMethod=Print method
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ByTerminal=By terminal
+TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for POS sales
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
+BarRestaurant=Bar Restaurant
+AutoOrder=Customer auto order
diff --git a/htdocs/langs/bn_IN/categories.lang b/htdocs/langs/bn_IN/categories.lang
new file mode 100644
index 00000000000..30bace0574c
--- /dev/null
+++ b/htdocs/langs/bn_IN/categories.lang
@@ -0,0 +1,89 @@
+# Dolibarr language file - Source file is en_US - categories
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+RubriquesTransactions=Tags/Categories of transactions
+categories=tags/categories
+NoCategoryYet=No tag/category of this type created
+In=In
+AddIn=Add in
+modify=modify
+Classify=Classify
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Vendors tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
+UsersCategoriesArea=Users tags/categories area
+SubCats=Sub-categories
+CatList=List of tags/categories
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
+NoSubCat=No subcategory.
+SubCatOf=Subcategory
+FoundCats=Found tags/categories
+ImpossibleAddCat=Impossible to add the tag/category %s
+WasAddedSuccessfully=<b>%s</b> was added successfully.
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+ProductIsInCategories=Product/service is linked to following tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
+ClassifyInCategory=Add to tag/category
+NotCategorized=Without tag/category
+CategoryExistsAtSameLevel=This category already exists with this ref
+ContentsVisibleByAllShort=Contents visible by all
+ContentsNotVisibleByAllShort=Contents not visible by all
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Vendors tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
+SuppliersCategoriesShort=Vendors tags/categories
+CustomersCategoriesShort=Customers tags/categories
+ProspectsCategoriesShort=Prospects tags/categories
+CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
+AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
+UsersCategoriesShort=Users tags/categories
+StockCategoriesShort=Warehouse tags/categories
+ThisCategoryHasNoItems=This category does not contain any items.
+CategId=Tag/category id
+CatSupList=List of vendor tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatContactsLinks=Links between contacts/addresses and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
+DeleteFromCat=Remove from tags/category
+ExtraFieldsCategories=Complementary attributes
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
+CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
+AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show tag/category
+ByDefaultInList=By default in list
+ChooseCategory=Choose category
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/bn_IN/commercial.lang b/htdocs/langs/bn_IN/commercial.lang
new file mode 100644
index 00000000000..10c536e0d48
--- /dev/null
+++ b/htdocs/langs/bn_IN/commercial.lang
@@ -0,0 +1,80 @@
+# Dolibarr language file - Source file is en_US - commercial
+Commercial=Commerce
+CommercialArea=Commerce area
+Customer=Customer
+Customers=Customers
+Prospect=Prospect
+Prospects=Prospects
+DeleteAction=Delete an event
+NewAction=New event
+AddAction=Create event
+AddAnAction=Create an event
+AddActionRendezVous=Create a Rendez-vous event
+ConfirmDeleteAction=Are you sure you want to delete this event?
+CardAction=Event card
+ActionOnCompany=Related company
+ActionOnContact=Related contact
+TaskRDVWith=Meeting with %s
+ShowTask=Show task
+ShowAction=Show event
+ActionsReport=Events report
+ThirdPartiesOfSaleRepresentative=Third parties with sales representative
+SaleRepresentativesOfThirdParty=Sales representatives of third party
+SalesRepresentative=Sales representative
+SalesRepresentatives=Sales representatives
+SalesRepresentativeFollowUp=Sales representative (follow-up)
+SalesRepresentativeSignature=Sales representative (signature)
+NoSalesRepresentativeAffected=No particular sales representative assigned
+ShowCustomer=Show customer
+ShowProspect=Show prospect
+ListOfProspects=List of prospects
+ListOfCustomers=List of customers
+LastDoneTasks=Latest %s completed actions
+LastActionsToDo=Oldest %s not completed actions
+DoneAndToDoActions=Completed and To do events
+DoneActions=Completed events
+ToDoActions=Incomplete events
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
+StatusNotApplicable=Not applicable
+StatusActionToDo=To do
+StatusActionDone=Complete
+StatusActionInProcess=In process
+TasksHistoryForThisContact=Events for this contact
+LastProspectDoNotContact=Do not contact
+LastProspectNeverContacted=Never contacted
+LastProspectToContact=To contact
+LastProspectContactInProcess=Contact in process
+LastProspectContactDone=Contact done
+ActionAffectedTo=Event assigned to
+ActionDoneBy=Event done by
+ActionAC_TEL=Phone call
+ActionAC_FAX=Send fax
+ActionAC_PROP=Send proposal by mail
+ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
+ActionAC_RDV=Meetings
+ActionAC_INT=Intervention on site
+ActionAC_FAC=Send customer invoice by mail
+ActionAC_REL=Send customer invoice by mail (reminder)
+ActionAC_CLO=Close
+ActionAC_EMAILING=Send mass email
+ActionAC_COM=Send sales order by mail
+ActionAC_SHIP=Send shipping by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
+ActionAC_OTH=Other
+ActionAC_OTH_AUTO=Automatically inserted events
+ActionAC_MANUAL=Manually inserted events
+ActionAC_AUTO=Automatically inserted events
+ActionAC_OTH_AUTOShort=Auto
+Stats=Sales statistics
+StatusProsp=Prospect status
+DraftPropals=Draft commercial proposals
+NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commercial proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/bn_IN/companies.lang b/htdocs/langs/bn_IN/companies.lang
new file mode 100644
index 00000000000..0fad58c9389
--- /dev/null
+++ b/htdocs/langs/bn_IN/companies.lang
@@ -0,0 +1,458 @@
+# Dolibarr language file - Source file is en_US - companies
+ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
+ErrorSetACountryFirst=Set the country first
+SelectThirdParty=Select a third party
+ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+DeleteContact=Delete a contact/address
+ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+MenuNewThirdParty=New Third Party
+MenuNewCustomer=New Customer
+MenuNewProspect=New Prospect
+MenuNewSupplier=New Vendor
+MenuNewPrivateIndividual=New private individual
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New Third Party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
+CreateThirdPartyOnly=Create third party
+CreateThirdPartyAndContact=Create a third party + a child contact
+ProspectionArea=Prospection area
+IdThirdParty=Id third party
+IdCompany=Company Id
+IdContact=Contact Id
+Contacts=Contacts/Addresses
+ThirdPartyContacts=Third-party contacts
+ThirdPartyContact=Third-party contact/address
+Company=Company
+CompanyName=Company name
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias Name
+Companies=Companies
+CountryIsInEEC=Country is inside the European Economic Community
+PriceFormatInCurrentLanguage=Price display format in the current language and currency
+ThirdPartyName=Third-party name
+ThirdPartyEmail=Third-party email
+ThirdParty=Third-party
+ThirdParties=Third-parties
+ThirdPartyProspects=Prospects
+ThirdPartyProspectsStats=Prospects
+ThirdPartyCustomers=Customers
+ThirdPartyCustomersStats=Customers
+ThirdPartyCustomersWithIdProf12=Customers with %s or %s
+ThirdPartySuppliers=Vendors
+ThirdPartyType=Third-party type
+Individual=Private individual
+ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
+ParentCompany=Parent company
+Subsidiaries=Subsidiaries
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
+ReportByQuarter=Report by rate
+CivilityCode=Civility code
+RegisteredOffice=Registered office
+Lastname=Last name
+Firstname=First name
+PostOrFunction=Job position
+UserTitle=Title
+NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
+Address=Address
+State=State/Province
+StateCode=State/Province code
+StateShort=State
+Region=Region
+Region-State=Region - State
+Country=Country
+CountryCode=Country code
+CountryId=Country id
+Phone=Phone
+PhoneShort=Phone
+Skype=Skype
+Call=Call
+Chat=Chat
+PhonePro=Prof. phone
+PhonePerso=Pers. phone
+PhoneMobile=Mobile
+No_Email=Refuse bulk emailings
+Fax=Fax
+Zip=Zip Code
+Town=City
+Web=Web
+Poste= Position
+DefaultLang=Language default
+VATIsUsed=Sales tax used
+VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
+CopyAddressFromSoc=Copy address from third-party details
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
+PaymentBankAccount=Payment bank account
+OverAllProposals=Proposals
+OverAllOrders=Orders
+OverAllInvoices=Invoices
+OverAllSupplierProposals=Price requests
+##### Local Taxes #####
+LocalTax1IsUsed=Use second tax
+LocalTax1IsUsedES= RE is used
+LocalTax1IsNotUsedES= RE is not used
+LocalTax2IsUsed=Use third tax
+LocalTax2IsUsedES= IRPF is used
+LocalTax2IsNotUsedES= IRPF is not used
+WrongCustomerCode=Customer code invalid
+WrongSupplierCode=Vendor code invalid
+CustomerCodeModel=Customer code model
+SupplierCodeModel=Vendor code model
+Gencod=Barcode
+##### Professional ID #####
+ProfId1Short=Prof. id 1
+ProfId2Short=Prof. id 2
+ProfId3Short=Prof. id 3
+ProfId4Short=Prof. id 4
+ProfId5Short=Prof. id 5
+ProfId6Short=Prof. id 6
+ProfId1=Professional ID 1
+ProfId2=Professional ID 2
+ProfId3=Professional ID 3
+ProfId4=Professional ID 4
+ProfId5=Professional ID 5
+ProfId6=Professional ID 6
+ProfId1AR=Prof Id 1 (CUIT/CUIL)
+ProfId2AR=Prof Id 2 (Revenu brutes)
+ProfId3AR=-
+ProfId4AR=-
+ProfId5AR=-
+ProfId6AR=-
+ProfId1AT=Prof Id 1 (USt.-IdNr)
+ProfId2AT=Prof Id 2 (USt.-Nr)
+ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
+ProfId4AT=-
+ProfId5AT=-
+ProfId6AT=-
+ProfId1AU=Prof Id 1 (ABN)
+ProfId2AU=-
+ProfId3AU=-
+ProfId4AU=-
+ProfId5AU=-
+ProfId6AU=-
+ProfId1BE=Prof Id 1 (Professional number)
+ProfId2BE=-
+ProfId3BE=-
+ProfId4BE=-
+ProfId5BE=-
+ProfId6BE=-
+ProfId1BR=-
+ProfId2BR=IE (Inscricao Estadual)
+ProfId3BR=IM (Inscricao Municipal)
+ProfId4BR=CPF
+#ProfId5BR=CNAE
+#ProfId6BR=INSS
+ProfId1CH=-
+ProfId2CH=-
+ProfId3CH=Prof Id 1 (Federal number)
+ProfId4CH=Prof Id 2 (Commercial Record number)
+ProfId5CH=-
+ProfId6CH=-
+ProfId1CL=Prof Id 1 (R.U.T.)
+ProfId2CL=-
+ProfId3CL=-
+ProfId4CL=-
+ProfId5CL=-
+ProfId6CL=-
+ProfId1CO=Prof Id 1 (R.U.T.)
+ProfId2CO=-
+ProfId3CO=-
+ProfId4CO=-
+ProfId5CO=-
+ProfId6CO=-
+ProfId1DE=Prof Id 1 (USt.-IdNr)
+ProfId2DE=Prof Id 2 (USt.-Nr)
+ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId4DE=-
+ProfId5DE=-
+ProfId6DE=-
+ProfId1ES=Prof Id 1 (CIF/NIF)
+ProfId2ES=Prof Id 2 (Social security number)
+ProfId3ES=Prof Id 3 (CNAE)
+ProfId4ES=Prof Id 4 (Collegiate number)
+ProfId5ES=-
+ProfId6ES=-
+ProfId1FR=Prof Id 1 (SIREN)
+ProfId2FR=Prof Id 2 (SIRET)
+ProfId3FR=Prof Id 3 (NAF, old APE)
+ProfId4FR=Prof Id 4 (RCS/RM)
+ProfId5FR=-
+ProfId6FR=-
+ProfId1GB=Registration Number
+ProfId2GB=-
+ProfId3GB=SIC
+ProfId4GB=-
+ProfId5GB=-
+ProfId6GB=-
+ProfId1HN=Id prof. 1 (RTN)
+ProfId2HN=-
+ProfId3HN=-
+ProfId4HN=-
+ProfId5HN=-
+ProfId6HN=-
+ProfId1IN=Prof Id 1 (TIN)
+ProfId2IN=Prof Id 2 (PAN)
+ProfId3IN=Prof Id 3 (SRVC TAX)
+ProfId4IN=Prof Id 4
+ProfId5IN=Prof Id 5
+ProfId6IN=-
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
+ProfId1MA=Id prof. 1 (R.C.)
+ProfId2MA=Id prof. 2 (Patente)
+ProfId3MA=Id prof. 3 (I.F.)
+ProfId4MA=Id prof. 4 (C.N.S.S.)
+ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId6MA=-
+ProfId1MX=Prof Id 1 (R.F.C).
+ProfId2MX=Prof Id 2 (R..P. IMSS)
+ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId4MX=-
+ProfId5MX=-
+ProfId6MX=-
+ProfId1NL=KVK nummer
+ProfId2NL=-
+ProfId3NL=-
+ProfId4NL=Burgerservicenummer (BSN)
+ProfId5NL=-
+ProfId6NL=-
+ProfId1PT=Prof Id 1 (NIPC)
+ProfId2PT=Prof Id 2 (Social security number)
+ProfId3PT=Prof Id 3 (Commercial Record number)
+ProfId4PT=Prof Id 4 (Conservatory)
+ProfId5PT=-
+ProfId6PT=-
+ProfId1SN=RC
+ProfId2SN=NINEA
+ProfId3SN=-
+ProfId4SN=-
+ProfId5SN=-
+ProfId6SN=-
+ProfId1TN=Prof Id 1 (RC)
+ProfId2TN=Prof Id 2 (Fiscal matricule)
+ProfId3TN=Prof Id 3 (Douane code)
+ProfId4TN=Prof Id 4 (BAN)
+ProfId5TN=-
+ProfId6TN=-
+ProfId1US=Prof Id (FEIN)
+ProfId2US=-
+ProfId3US=-
+ProfId4US=-
+ProfId5US=-
+ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
+ProfId1RU=Prof Id 1 (OGRN)
+ProfId2RU=Prof Id 2 (INN)
+ProfId3RU=Prof Id 3 (KPP)
+ProfId4RU=Prof Id 4 (OKPO)
+ProfId5RU=-
+ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
+VATIntra=VAT ID
+VATIntraShort=VAT ID
+VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
+ProspectCustomer=Prospect / Customer
+Prospect=Prospect
+CustomerCard=Customer Card
+Customer=Customer
+CustomerRelativeDiscount=Relative customer discount
+SupplierRelativeDiscount=Relative vendor discount
+CustomerRelativeDiscountShort=Relative discount
+CustomerAbsoluteDiscountShort=Absolute discount
+CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
+CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
+CompanyHasAbsoluteDiscount=This customer has discounts available (credits notes or down payments) for <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
+CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
+CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
+DiscountNone=None
+Vendor=Vendor
+Supplier=Vendor
+AddContact=Create contact
+AddContactAddress=Create contact/address
+EditContact=Edit contact
+EditContactAddress=Edit contact/address
+Contact=Contact
+ContactId=Contact id
+ContactsAddresses=Contacts/Addresses
+FromContactName=Name:
+NoContactDefinedForThirdParty=No contact defined for this third party
+NoContactDefined=No contact defined
+DefaultContact=Default contact/address
+ContactByDefaultFor=Default contact/address for
+AddThirdParty=Create third party
+DeleteACompany=Delete a company
+PersonalInformations=Personal data
+AccountancyCode=Accounting account
+CustomerCode=Customer Code
+SupplierCode=Vendor Code
+CustomerCodeShort=Customer Code
+SupplierCodeShort=Vendor Code
+CustomerCodeDesc=Customer Code, unique for all customers
+SupplierCodeDesc=Vendor Code, unique for all vendors
+RequiredIfCustomer=Required if third party is a customer or prospect
+RequiredIfSupplier=Required if third party is a vendor
+ValidityControledByModule=Validity controlled by module
+ThisIsModuleRules=Rules for this module
+ProspectToContact=Prospect to contact
+CompanyDeleted=Company "%s" deleted from database.
+ListOfContacts=List of contacts/addresses
+ListOfContactsAddresses=List of contacts/addresses
+ListOfThirdParties=List of Third Parties
+ShowCompany=Third Party
+ShowContact=Contact-Address
+ContactsAllShort=All (No filter)
+ContactType=Contact type
+ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
+ContactForProposals=Proposal's contact
+ContactForContracts=Contract's contact
+ContactForInvoices=Invoice's contact
+NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
+NoContactForAnyProposal=This contact is not a contact for any commercial proposal
+NoContactForAnyContract=This contact is not a contact for any contract
+NoContactForAnyInvoice=This contact is not a contact for any invoice
+NewContact=New contact
+NewContactAddress=New Contact/Address
+MyContacts=My contacts
+Capital=Capital
+CapitalOf=Capital of %s
+EditCompany=Edit company
+ThisUserIsNot=This user is not a prospect, customer or vendor
+VATIntraCheck=Check
+VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
+VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
+NorProspectNorCustomer=Not prospect, nor customer
+JuridicalStatus=Legal Entity Type
+Staff=Employees
+ProspectLevelShort=Potential
+ProspectLevel=Prospect potential
+ContactPrivate=Private
+ContactPublic=Shared
+ContactVisibility=Visibility
+ContactOthers=Other
+OthersNotLinkedToThirdParty=Others, not linked to a third party
+ProspectStatus=Prospect status
+PL_NONE=None
+PL_UNKNOWN=Unknown
+PL_LOW=Low
+PL_MEDIUM=Medium
+PL_HIGH=High
+TE_UNKNOWN=-
+TE_STARTUP=Startup
+TE_GROUP=Large company
+TE_MEDIUM=Medium company
+TE_ADMIN=Governmental
+TE_SMALL=Small company
+TE_RETAIL=Retailer
+TE_WHOLE=Wholesaler
+TE_PRIVATE=Private individual
+TE_OTHER=Other
+StatusProspect-1=Do not contact
+StatusProspect0=Never contacted
+StatusProspect1=To be contacted
+StatusProspect2=Contact in process
+StatusProspect3=Contact done
+ChangeDoNotContact=Change status to 'Do not contact'
+ChangeNeverContacted=Change status to 'Never contacted'
+ChangeToContact=Change status to 'To be contacted'
+ChangeContactInProcess=Change status to 'Contact in process'
+ChangeContactDone=Change status to 'Contact done'
+ProspectsByStatus=Prospects by status
+NoParentCompany=None
+ExportCardToFormat=Export card to format
+ContactNotLinkedToCompany=Contact not linked to any third party
+DolibarrLogin=Dolibarr login
+NoDolibarrAccess=No Dolibarr access
+ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
+ExportDataset_company_2=Contacts and their properties
+ImportDataset_company_1=Third-parties and their properties
+ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ImportDataset_company_3=Third-parties Bank accounts
+ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
+PriceLevel=Price Level
+PriceLevelLabels=Price Level Labels
+DeliveryAddress=Delivery address
+AddAddress=Add address
+SupplierCategory=Vendor category
+JuridicalStatus200=Independent
+DeleteFile=Delete file
+ConfirmDeleteFile=Are you sure you want to delete this file?
+AllocateCommercial=Assigned to sales representative
+Organization=Organization
+FiscalYearInformation=Fiscal Year
+FiscalMonthStart=Starting month of the fiscal year
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
+YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
+YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
+ListSuppliersShort=List of Vendors
+ListProspectsShort=List of Prospects
+ListCustomersShort=List of Customers
+ThirdPartiesArea=Third Parties/Contacts
+LastModifiedThirdParties=Last %s modified Third Parties
+UniqueThirdParties=Total of Third Parties
+InActivity=Open
+ActivityCeased=Closed
+ThirdPartyIsClosed=Third party is closed
+ProductsIntoElements=List of products/services into %s
+CurrentOutstandingBill=Current outstanding bill
+OutstandingBill=Max. for outstanding bill
+OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
+MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
+ManagingDirectors=Manager(s) name (CEO, director, president...)
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ThirdpartiesMergeSuccess=Third parties have been merged
+SaleRepresentativeLogin=Login of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+#Imports
+PaymentTypeCustomer=Payment Type - Customer
+PaymentTermsCustomer=Payment Terms - Customer
+PaymentTypeSupplier=Payment Type - Vendor
+PaymentTermsSupplier=Payment Term - Vendor
+PaymentTypeBoth=Payment Type - Customer and Vendor
+MulticurrencyUsed=Use Multicurrency
+MulticurrencyCurrency=Currency
diff --git a/htdocs/langs/bn_IN/compta.lang b/htdocs/langs/bn_IN/compta.lang
new file mode 100644
index 00000000000..8a8c837ac87
--- /dev/null
+++ b/htdocs/langs/bn_IN/compta.lang
@@ -0,0 +1,266 @@
+# Dolibarr language file - Source file is en_US - compta
+MenuFinancial=Billing | Payment
+TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
+OptionMode=Option for accountancy
+OptionModeTrue=Option Incomes-Expenses
+OptionModeVirtual=Option Claims-Debts
+OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
+OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
+FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
+VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
+LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+Param=Setup
+RemainingAmountPayment=Amount payment remaining:
+Account=Account
+Accountparent=Parent account
+Accountsparent=Parent accounts
+Income=Income
+Outcome=Expense
+MenuReportInOut=Income / Expense
+ReportInOut=Balance of income and expenses
+ReportTurnover=Turnover invoiced
+ReportTurnoverCollected=Turnover collected
+PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party
+PaymentsNotLinkedToUser=Payments not linked to any user
+Profit=Profit
+AccountingResult=Accounting result
+BalanceBefore=Balance (before)
+Balance=Balance
+Debit=Debit
+Credit=Credit
+Piece=Accounting Doc.
+AmountHTVATRealReceived=Net collected
+AmountHTVATRealPaid=Net paid
+VATToPay=Tax sales
+VATReceived=Tax received
+VATToCollect=Tax purchases
+VATSummary=Tax monthly
+VATBalance=Tax Balance
+VATPaid=Tax paid
+LT1Summary=Tax 2 summary
+LT2Summary=Tax 3 summary
+LT1SummaryES=RE Balance
+LT2SummaryES=IRPF Balance
+LT1SummaryIN=CGST Balance
+LT2SummaryIN=SGST Balance
+LT1Paid=Tax 2 paid
+LT2Paid=Tax 3 paid
+LT1PaidES=RE Paid
+LT2PaidES=IRPF Paid
+LT1PaidIN=CGST Paid
+LT2PaidIN=SGST Paid
+LT1Customer=Tax 2 sales
+LT1Supplier=Tax 2 purchases
+LT1CustomerES=RE sales
+LT1SupplierES=RE purchases
+LT1CustomerIN=CGST sales
+LT1SupplierIN=CGST purchases
+LT2Customer=Tax 3 sales
+LT2Supplier=Tax 3 purchases
+LT2CustomerES=IRPF sales
+LT2SupplierES=IRPF purchases
+LT2CustomerIN=SGST sales
+LT2SupplierIN=SGST purchases
+VATCollected=VAT collected
+StatusToPay=To pay
+SpecialExpensesArea=Area for all special payments
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
+SocialContributionsDeductibles=Deductible social or fiscal taxes
+SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
+MenuSpecialExpenses=Special expenses
+MenuTaxAndDividends=Taxes and dividends
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New social/fiscal tax
+NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
+AccountancyTreasuryArea=Billing and payment area
+NewPayment=New payment
+PaymentCustomerInvoice=Customer invoice payment
+PaymentSupplierInvoice=vendor invoice payment
+PaymentSocialContribution=Social/fiscal tax payment
+PaymentVat=VAT payment
+ListPayment=List of payments
+ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of vendor payments
+DateStartPeriod=Date start period
+DateEndPeriod=Date end period
+newLT1Payment=New tax 2 payment
+newLT2Payment=New tax 3 payment
+LT1Payment=Tax 2 payment
+LT1Payments=Tax 2 payments
+LT2Payment=Tax 3 payment
+LT2Payments=Tax 3 payments
+newLT1PaymentES=New RE payment
+newLT2PaymentES=New IRPF payment
+LT1PaymentES=RE Payment
+LT1PaymentsES=RE Payments
+LT2PaymentES=IRPF Payment
+LT2PaymentsES=IRPF Payments
+VATPayment=Sales tax payment
+VATPayments=Sales tax payments
+VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
+NewLocalTaxPayment=New tax %s payment
+Refund=Refund
+SocialContributionsPayments=Social/fiscal taxes payments
+ShowVatPayment=Show VAT payment
+TotalToPay=Total to pay
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+CustomerAccountancyCode=Customer accounting code
+SupplierAccountancyCode=Vendor accounting code
+CustomerAccountancyCodeShort=Cust. account. code
+SupplierAccountancyCodeShort=Sup. account. code
+AccountNumber=Account number
+NewAccountingAccount=New account
+Turnover=Turnover invoiced
+TurnoverCollected=Turnover collected
+SalesTurnoverMinimum=Minimum turnover
+ByExpenseIncome=By expenses & incomes
+ByThirdParties=By third parties
+ByUserAuthorOfInvoice=By invoice author
+CheckReceipt=Check deposit
+CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Latest %s check receipts
+NewCheckReceipt=New discount
+NewCheckDeposit=New check deposit
+NewCheckDepositOn=Create receipt for deposit on account: %s
+NoWaitingChecks=No checks awaiting deposit.
+DateChequeReceived=Check reception date
+NbOfCheques=No. of checks
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
+CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
+CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
+CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
+CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
+CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
+CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
+CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
+CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
+CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
+CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
+AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
+AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
+AnnualByCompanies=Balance of income and expenses, by predefined groups of account
+AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
+AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
+SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
+SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
+SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
+RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
+RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
+RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
+RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
+RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
+SeePageForSetup=See menu <a href="%s">%s</a> for setup
+DepositsAreNotIncluded=- Down payment invoices are not included
+DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
+VATReportByCustomers=Sale tax report by customer
+VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
+SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
+SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
+RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
+RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
+OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
+PercentOfInvoice=%%/invoice
+NotUsedForGoods=Not used on goods
+ProposalStats=Statistics on proposals
+OrderStats=Statistics on orders
+InvoiceStats=Statistics on bills
+Dispatch=Dispatching
+Dispatched=Dispatched
+ToDispatch=To dispatch
+ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer
+SellsJournal=Sales Journal
+PurchasesJournal=Purchases Journal
+DescSellsJournal=Sales Journal
+DescPurchasesJournal=Purchases Journal
+CodeNotDef=Not defined
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
+DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
+Pcg_version=Chart of accounts models
+Pcg_type=Pcg type
+Pcg_subtype=Pcg subtype
+InvoiceLinesToDispatch=Invoice lines to dispatch
+ByProductsAndServices=By product and service
+RefExt=External ref
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+LinkedOrder=Link to order
+Mode1=Method 1
+Mode2=Method 2
+CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
+CalculationRuleDescSupplier=According to vendor, choose appropriate method to apply same calculation rule and get same result expected by your vendor.
+TurnoverPerProductInCommitmentAccountingNotRelevant=The report of Turnover collected per product is not available. This report is only available for turnover invoiced.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
+CalculationMode=Calculation mode
+AccountancyJournal=Accounting code journal
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+CloneTaxForNextMonth=Clone it for next month
+SimpleReport=Simple report
+AddExtraReport=Extra reports (add foreign and national customer report)
+OtherCountriesCustomersReport=Foreign customers report
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
+SameCountryCustomersWithVAT=National customers report
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
+LinkedFichinter=Link to an intervention
+ImportDataset_tax_contrib=Social/fiscal taxes
+ImportDataset_tax_vat=Vat payments
+ErrorBankAccountNotFound=Error: Bank account not found
+FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
+DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignment
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover invoiced by sale tax rate
+TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
+LabelToShow=Short label
+PurchaseTurnover=Purchase turnover
+PurchaseTurnoverCollected=Purchase turnover collected
+RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
+RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/bn_IN/contracts.lang b/htdocs/langs/bn_IN/contracts.lang
new file mode 100644
index 00000000000..47572c355ab
--- /dev/null
+++ b/htdocs/langs/bn_IN/contracts.lang
@@ -0,0 +1,101 @@
+# Dolibarr language file - Source file is en_US - contracts
+ContractsArea=Contracts area
+ListOfContracts=List of contracts
+AllContracts=All contracts
+ContractCard=Contract card
+ContractStatusNotRunning=Not running
+ContractStatusDraft=Draft
+ContractStatusValidated=Validated
+ContractStatusClosed=Closed
+ServiceStatusInitial=Not running
+ServiceStatusRunning=Running
+ServiceStatusNotLate=Running, not expired
+ServiceStatusNotLateShort=Not expired
+ServiceStatusLate=Running, expired
+ServiceStatusLateShort=Expired
+ServiceStatusClosed=Closed
+ShowContractOfService=Show contract of service
+Contracts=Contracts
+ContractsSubscriptions=Contracts/Subscriptions
+ContractsAndLine=Contracts and line of contracts
+Contract=Contract
+ContractLine=Contract line
+Closing=Closing
+NoContracts=No contracts
+MenuServices=Services
+MenuInactiveServices=Services not active
+MenuRunningServices=Running services
+MenuExpiredServices=Expired services
+MenuClosedServices=Closed services
+NewContract=New contract
+NewContractSubscription=New contract/subscription
+AddContract=Create contract
+DeleteAContract=Delete a contract
+ActivateAllOnContract=Activate all services
+CloseAContract=Close a contract
+ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
+ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
+ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
+ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract?
+ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
+ValidateAContract=Validate a contract
+ActivateService=Activate service
+ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b>?
+RefContract=Contract reference
+DateContract=Contract date
+DateServiceActivate=Service activation date
+ListOfServices=List of services
+ListOfInactiveServices=List of not active services
+ListOfExpiredServices=List of expired active services
+ListOfClosedServices=List of closed services
+ListOfRunningServices=List of running services
+NotActivatedServices=Inactive services (among validated contracts)
+BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
+LastContracts=Latest %s contracts
+LastModifiedServices=Latest %s modified services
+ContractStartDate=Start date
+ContractEndDate=End date
+DateStartPlanned=Planned start date
+DateStartPlannedShort=Planned start date
+DateEndPlanned=Planned end date
+DateEndPlannedShort=Planned end date
+DateStartReal=Real start date
+DateStartRealShort=Real start date
+DateEndReal=Real end date
+DateEndRealShort=Real end date
+CloseService=Close service
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
+ServiceStatus=Status of service
+DraftContracts=Drafts contracts
+CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
+ActivateAllContracts=Activate all contract lines
+CloseAllContracts=Close all contract lines
+DeleteContractLine=Delete a contract line
+ConfirmDeleteContractLine=Are you sure you want to delete this contract line?
+MoveToAnotherContract=Move service into another contract.
+ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract.
+ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
+PaymentRenewContractId=Renew contract line (number %s)
+ExpiredSince=Expiration date
+NoExpiredServices=No expired active services
+ListOfServicesToExpireWithDuration=List of Services to expire in %s days
+ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
+ListOfServicesToExpire=List of Services to expire
+NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
+StandardContractsTemplate=Standard contracts template
+ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
+LowerDateEndPlannedShort=Lower planned end date of active services
+SendContractRef=Contract information __REF__
+OtherContracts=Other contracts
+##### Types de contacts #####
+TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
+TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract
+TypeContact_contrat_external_BILLING=Billing customer contact
+TypeContact_contrat_external_CUSTOMER=Follow-up customer contact
+TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact
diff --git a/htdocs/langs/bn_IN/cron.lang b/htdocs/langs/bn_IN/cron.lang
new file mode 100644
index 00000000000..1de1251831a
--- /dev/null
+++ b/htdocs/langs/bn_IN/cron.lang
@@ -0,0 +1,84 @@
+# Dolibarr language file - Source file is en_US - cron
+# About page
+# Right
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
+# Admin
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
+CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
+CronJobProfiles=List of predefined cron job profiles
+# Menu
+EnabledAndDisabled=Enabled and disabled
+# Page list
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
+CronCommand=Command
+CronList=Scheduled jobs
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
+CronExecute=Launch scheduled job
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
+CronTask=Job
+CronNone=None
+CronDtStart=Not before
+CronDtEnd=Not after
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Start date of latest execution
+CronDtLastResult=End date of latest execution
+CronFrequency=Frequency
+CronClass=Class
+CronMethod=Method
+CronModule=Module
+CronNoJobs=No jobs registered
+CronPriority=Priority
+CronLabel=Label
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
+CronEach=Every
+JobFinished=Job launched and finished
+#Page card
+CronAdd= Add jobs
+CronEvery=Execute job each
+CronObject=Instance/Object to create
+CronArgs=Parameters
+CronSaveSucess=Save successfully
+CronNote=Comment
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+StatusAtInstall=Status at module installation
+CronStatusActiveBtn=Enable
+CronStatusInactiveBtn=Disable
+CronTaskInactive=This job is disabled
+CronId=Id
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
+CronFrom=From
+# Info
+# Common
+CronType=Job type
+CronType_method=Call method of a PHP Class
+CronType_command=Shell command
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
+JobDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
diff --git a/htdocs/langs/bn_IN/deliveries.lang b/htdocs/langs/bn_IN/deliveries.lang
new file mode 100644
index 00000000000..1f48c01de75
--- /dev/null
+++ b/htdocs/langs/bn_IN/deliveries.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - deliveries
+Delivery=Delivery
+DeliveryRef=Ref Delivery
+DeliveryCard=Receipt card
+DeliveryOrder=Delivery receipt
+DeliveryDate=Delivery date
+CreateDeliveryOrder=Generate delivery receipt
+DeliveryStateSaved=Delivery state saved
+SetDeliveryDate=Set shipping date
+ValidateDeliveryReceipt=Validate delivery receipt
+ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt?
+DeleteDeliveryReceipt=Delete delivery receipt
+DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b>?
+DeliveryMethod=Delivery method
+TrackingNumber=Tracking number
+DeliveryNotValidated=Delivery not validated
+StatusDeliveryCanceled=Canceled
+StatusDeliveryDraft=Draft
+StatusDeliveryValidated=Received
+# merou PDF model
+NameAndSignature=Name and Signature:
+ToAndDate=To___________________________________ on ____/_____/__________
+GoodStatusDeclaration=Have received the goods above in good condition,
+Deliverer=Deliverer:
+Sender=Sender
+Recipient=Recipient
+ErrorStockIsNotEnough=There's not enough stock
+Shippable=Shippable
+NonShippable=Not Shippable
+ShowReceiving=Show delivery receipt
+NonExistentOrder=Nonexistent order
diff --git a/htdocs/langs/bn_IN/dict.lang b/htdocs/langs/bn_IN/dict.lang
new file mode 100644
index 00000000000..ec315d97142
--- /dev/null
+++ b/htdocs/langs/bn_IN/dict.lang
@@ -0,0 +1,359 @@
+# Dolibarr language file - Source file is en_US - dict
+CountryFR=France
+CountryBE=Belgium
+CountryIT=Italy
+CountryES=Spain
+CountryDE=Germany
+CountryCH=Switzerland
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
+CountryUK=United Kingdom
+CountryIE=Ireland
+CountryCN=China
+CountryTN=Tunisia
+CountryUS=United States
+CountryMA=Morocco
+CountryDZ=Algeria
+CountryCA=Canada
+CountryTG=Togo
+CountryGA=Gabon
+CountryNL=Netherlands
+CountryHU=Hungary
+CountryRU=Russia
+CountrySE=Sweden
+CountryCI=Ivoiry Coast
+CountrySN=Senegal
+CountryAR=Argentina
+CountryCM=Cameroon
+CountryPT=Portugal
+CountrySA=Saudi Arabia
+CountryMC=Monaco
+CountryAU=Australia
+CountrySG=Singapore
+CountryAF=Afghanistan
+CountryAX=Åland Islands
+CountryAL=Albania
+CountryAS=American Samoa
+CountryAD=Andorra
+CountryAO=Angola
+CountryAI=Anguilla
+CountryAQ=Antarctica
+CountryAG=Antigua and Barbuda
+CountryAM=Armenia
+CountryAW=Aruba
+CountryAT=Austria
+CountryAZ=Azerbaijan
+CountryBS=Bahamas
+CountryBH=Bahrain
+CountryBD=Bangladesh
+CountryBB=Barbados
+CountryBY=Belarus
+CountryBZ=Belize
+CountryBJ=Benin
+CountryBM=Bermuda
+CountryBT=Bhutan
+CountryBO=Bolivia
+CountryBA=Bosnia and Herzegovina
+CountryBW=Botswana
+CountryBV=Bouvet Island
+CountryBR=Brazil
+CountryIO=British Indian Ocean Territory
+CountryBN=Brunei Darussalam
+CountryBG=Bulgaria
+CountryBF=Burkina Faso
+CountryBI=Burundi
+CountryKH=Cambodia
+CountryCV=Cape Verde
+CountryKY=Cayman Islands
+CountryCF=Central African Republic
+CountryTD=Chad
+CountryCL=Chile
+CountryCX=Christmas Island
+CountryCC=Cocos (Keeling) Islands
+CountryCO=Colombia
+CountryKM=Comoros
+CountryCG=Congo
+CountryCD=Congo, The Democratic Republic of the
+CountryCK=Cook Islands
+CountryCR=Costa Rica
+CountryHR=Croatia
+CountryCU=Cuba
+CountryCY=Cyprus
+CountryCZ=Czech Republic
+CountryDK=Denmark
+CountryDJ=Djibouti
+CountryDM=Dominica
+CountryDO=Dominican Republic
+CountryEC=Ecuador
+CountryEG=Egypt
+CountrySV=El Salvador
+CountryGQ=Equatorial Guinea
+CountryER=Eritrea
+CountryEE=Estonia
+CountryET=Ethiopia
+CountryFK=Falkland Islands
+CountryFO=Faroe Islands
+CountryFJ=Fiji Islands
+CountryFI=Finland
+CountryGF=French Guiana
+CountryPF=French Polynesia
+CountryTF=French Southern Territories
+CountryGM=Gambia
+CountryGE=Georgia
+CountryGH=Ghana
+CountryGI=Gibraltar
+CountryGR=Greece
+CountryGL=Greenland
+CountryGD=Grenada
+CountryGP=Guadeloupe
+CountryGU=Guam
+CountryGT=Guatemala
+CountryGN=Guinea
+CountryGW=Guinea-Bissau
+CountryGY=Guyana
+CountryHT=Haïti
+CountryHM=Heard Island and McDonald
+CountryVA=Holy See (Vatican City State)
+CountryHN=Honduras
+CountryHK=Hong Kong
+CountryIS=Iceland
+CountryIN=India
+CountryID=Indonesia
+CountryIR=Iran
+CountryIQ=Iraq
+CountryIL=Israel
+CountryJM=Jamaica
+CountryJP=Japan
+CountryJO=Jordan
+CountryKZ=Kazakhstan
+CountryKE=Kenya
+CountryKI=Kiribati
+CountryKP=North Korea
+CountryKR=South Korea
+CountryKW=Kuwait
+CountryKG=Kyrgyzstan
+CountryLA=Lao
+CountryLV=Latvia
+CountryLB=Lebanon
+CountryLS=Lesotho
+CountryLR=Liberia
+CountryLY=Libyan
+CountryLI=Liechtenstein
+CountryLT=Lithuania
+CountryLU=Luxembourg
+CountryMO=Macao
+CountryMK=Macedonia, the former Yugoslav of
+CountryMG=Madagascar
+CountryMW=Malawi
+CountryMY=Malaysia
+CountryMV=Maldives
+CountryML=Mali
+CountryMT=Malta
+CountryMH=Marshall Islands
+CountryMQ=Martinique
+CountryMR=Mauritania
+CountryMU=Mauritius
+CountryYT=Mayotte
+CountryMX=Mexico
+CountryFM=Micronesia
+CountryMD=Moldova
+CountryMN=Mongolia
+CountryMS=Monserrat
+CountryMZ=Mozambique
+CountryMM=Myanmar (Burma)
+CountryNA=Namibia
+CountryNR=Nauru
+CountryNP=Nepal
+CountryAN=Netherlands Antilles
+CountryNC=New Caledonia
+CountryNZ=New Zealand
+CountryNI=Nicaragua
+CountryNE=Niger
+CountryNG=Nigeria
+CountryNU=Niue
+CountryNF=Norfolk Island
+CountryMP=Northern Mariana Islands
+CountryNO=Norway
+CountryOM=Oman
+CountryPK=Pakistan
+CountryPW=Palau
+CountryPS=Palestinian Territory, Occupied
+CountryPA=Panama
+CountryPG=Papua New Guinea
+CountryPY=Paraguay
+CountryPE=Peru
+CountryPH=Philippines
+CountryPN=Pitcairn Islands
+CountryPL=Poland
+CountryPR=Puerto Rico
+CountryQA=Qatar
+CountryRE=Reunion
+CountryRO=Romania
+CountryRW=Rwanda
+CountrySH=Saint Helena
+CountryKN=Saint Kitts and Nevis
+CountryLC=Saint Lucia
+CountryPM=Saint Pierre and Miquelon
+CountryVC=Saint Vincent and Grenadines
+CountryWS=Samoa
+CountrySM=San Marino
+CountryST=Sao Tome and Principe
+CountryRS=Serbia
+CountrySC=Seychelles
+CountrySL=Sierra Leone
+CountrySK=Slovakia
+CountrySI=Slovenia
+CountrySB=Solomon Islands
+CountrySO=Somalia
+CountryZA=South Africa
+CountryGS=South Georgia and the South Sandwich Islands
+CountryLK=Sri Lanka
+CountrySD=Sudan
+CountrySR=Suriname
+CountrySJ=Svalbard and Jan Mayen
+CountrySZ=Swaziland
+CountrySY=Syrian
+CountryTW=Taiwan
+CountryTJ=Tajikistan
+CountryTZ=Tanzania
+CountryTH=Thailand
+CountryTL=Timor-Leste
+CountryTK=Tokelau
+CountryTO=Tonga
+CountryTT=Trinidad and Tobago
+CountryTR=Turkey
+CountryTM=Turkmenistan
+CountryTC=Turks and Caicos Islands
+CountryTV=Tuvalu
+CountryUG=Uganda
+CountryUA=Ukraine
+CountryAE=United Arab Emirates
+CountryUM=United States Minor Outlying Islands
+CountryUY=Uruguay
+CountryUZ=Uzbekistan
+CountryVU=Vanuatu
+CountryVE=Venezuela
+CountryVN=Viet Nam
+CountryVG=Virgin Islands, British
+CountryVI=Virgin Islands, U.S.
+CountryWF=Wallis and Futuna
+CountryEH=Western Sahara
+CountryYE=Yemen
+CountryZM=Zambia
+CountryZW=Zimbabwe
+CountryGG=Guernsey
+CountryIM=Isle of Man
+CountryJE=Jersey
+CountryME=Montenegro
+CountryBL=Saint Barthelemy
+CountryMF=Saint Martin
+
+##### Civilities #####
+CivilityMME=Mrs.
+CivilityMR=Mr.
+CivilityMLE=Ms.
+CivilityMTRE=Master
+CivilityDR=Doctor
+##### Currencies #####
+Currencyeuros=Euros
+CurrencyAUD=AU Dollars
+CurrencySingAUD=AU Dollar
+CurrencyCAD=CAN Dollars
+CurrencySingCAD=CAN Dollar
+CurrencyCHF=Swiss Francs
+CurrencySingCHF=Swiss Franc
+CurrencyEUR=Euros
+CurrencySingEUR=Euro
+CurrencyFRF=French Francs
+CurrencySingFRF=French Franc
+CurrencyGBP=GB Pounds
+CurrencySingGBP=GB Pound
+CurrencyINR=Indian rupees
+CurrencySingINR=Indian rupee
+CurrencyMAD=Dirham
+CurrencySingMAD=Dirham
+CurrencyMGA=Ariary
+CurrencySingMGA=Ariary
+CurrencyMUR=Mauritius rupees
+CurrencySingMUR=Mauritius rupee
+CurrencyNOK=Norwegian krones
+CurrencySingNOK=Norwegian kronas
+CurrencyTND=Tunisian dinars
+CurrencySingTND=Tunisian dinar
+CurrencyUSD=US Dollars
+CurrencySingUSD=US Dollar
+CurrencyUAH=Hryvnia
+CurrencySingUAH=Hryvnia
+CurrencyXAF=CFA Francs BEAC
+CurrencySingXAF=CFA Franc BEAC
+CurrencyXOF=CFA Francs BCEAO
+CurrencySingXOF=CFA Franc BCEAO
+CurrencyXPF=CFP Francs
+CurrencySingXPF=CFP Franc
+CurrencyCentEUR=cents
+CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=thousandth
+#### Input reasons #####
+DemandReasonTypeSRC_INTE=Internet
+DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
+DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
+DemandReasonTypeSRC_CAMP_PHO=Phone campaign
+DemandReasonTypeSRC_CAMP_FAX=Fax campaign
+DemandReasonTypeSRC_COMM=Commercial contact
+DemandReasonTypeSRC_SHOP=Shop contact
+DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_PARTNER=Partner
+DemandReasonTypeSRC_EMPLOYEE=Employee
+DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
+#### Paper formats ####
+PaperFormatEU4A0=Format 4A0
+PaperFormatEU2A0=Format 2A0
+PaperFormatEUA0=Format A0
+PaperFormatEUA1=Format A1
+PaperFormatEUA2=Format A2
+PaperFormatEUA3=Format A3
+PaperFormatEUA4=Format A4
+PaperFormatEUA5=Format A5
+PaperFormatEUA6=Format A6
+PaperFormatUSLETTER=Format Letter US
+PaperFormatUSLEGAL=Format Legal US
+PaperFormatUSEXECUTIVE=Format Executive US
+PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatCAP1=Format P1 Canada
+PaperFormatCAP2=Format P2 Canada
+PaperFormatCAP3=Format P3 Canada
+PaperFormatCAP4=Format P4 Canada
+PaperFormatCAP5=Format P5 Canada
+PaperFormatCAP6=Format P6 Canada
+#### Expense report categories ####
+ExpAutoCat=Car
+ExpCycloCat=Moped
+ExpMotoCat=Motorbike
+ExpAuto3CV=3 CV
+ExpAuto4CV=4 CV
+ExpAuto5CV=5 CV
+ExpAuto6CV=6 CV
+ExpAuto7CV=7 CV
+ExpAuto8CV=8 CV
+ExpAuto9CV=9 CV
+ExpAuto10CV=10 CV
+ExpAuto11CV=11 CV
+ExpAuto12CV=12 CV
+ExpAuto3PCV=3 CV and more
+ExpAuto4PCV=4 CV and more
+ExpAuto5PCV=5 CV and more
+ExpAuto6PCV=6 CV and more
+ExpAuto7PCV=7 CV and more
+ExpAuto8PCV=8 CV and more
+ExpAuto9PCV=9 CV and more
+ExpAuto10PCV=10 CV and more
+ExpAuto11PCV=11 CV and more
+ExpAuto12PCV=12 CV and more
+ExpAuto13PCV=13 CV and more
+ExpCyclo=Capacity lower to 50cm3
+ExpMoto12CV=Motorbike 1 or 2 CV
+ExpMoto345CV=Motorbike 3, 4 or 5 CV
+ExpMoto5PCV=Motorbike 5 CV and more
diff --git a/htdocs/langs/bn_IN/donations.lang b/htdocs/langs/bn_IN/donations.lang
new file mode 100644
index 00000000000..de4bdf68f03
--- /dev/null
+++ b/htdocs/langs/bn_IN/donations.lang
@@ -0,0 +1,34 @@
+# Dolibarr language file - Source file is en_US - donations
+Donation=Donation
+Donations=Donations
+DonationRef=Donation ref.
+Donor=Donor
+AddDonation=Create a donation
+NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation?
+PublicDonation=Public donation
+DonationsArea=Donations area
+DonationStatusPromiseNotValidated=Draft promise
+DonationStatusPromiseValidated=Validated promise
+DonationStatusPaid=Donation received
+DonationStatusPromiseNotValidatedShort=Draft
+DonationStatusPromiseValidatedShort=Validated
+DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDate=Donation date
+DonationDatePayment=Payment date
+ValidPromess=Validate promise
+DonationReceipt=Donation receipt
+DonationsModels=Documents models for donation receipts
+LastModifiedDonations=Latest %s modified donations
+DonationRecipient=Donation recipient
+IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+MinimumAmount=Minimum amount is  %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
+DonationValidated=Donation %s validated
diff --git a/htdocs/langs/bn_IN/ecm.lang b/htdocs/langs/bn_IN/ecm.lang
new file mode 100644
index 00000000000..369ac6dfdfa
--- /dev/null
+++ b/htdocs/langs/bn_IN/ecm.lang
@@ -0,0 +1,52 @@
+# Dolibarr language file - Source file is en_US - ecm
+ECMNbOfDocs=No. of documents in directory
+ECMSection=Directory
+ECMSectionManual=Manual directory
+ECMSectionAuto=Automatic directory
+ECMSectionsManual=Manual tree
+ECMSectionsAuto=Automatic tree
+ECMSections=Directories
+ECMRoot=ECM Root
+ECMNewSection=New directory
+ECMAddSection=Add directory
+ECMCreationDate=Creation date
+ECMNbOfFilesInDir=Number of files in directory
+ECMNbOfSubDir=Number of sub-directories
+ECMNbOfFilesInSubDir=Number of files in sub-directories
+ECMCreationUser=Creator
+ECMArea=DMS/ECM area
+ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.<br>* Manual directories can be used to save documents not linked to a particular element.
+ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
+ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMSearchByKeywords=Search by keywords
+ECMSearchByEntity=Search by object
+ECMSectionOfDocuments=Directories of documents
+ECMTypeAuto=Automatic
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
+ECMDocsByThirdParties=Documents linked to third parties
+ECMDocsByProposals=Documents linked to proposals
+ECMDocsByOrders=Documents linked to customers orders
+ECMDocsByContracts=Documents linked to contracts
+ECMDocsByInvoices=Documents linked to customers invoices
+ECMDocsByProducts=Documents linked to products
+ECMDocsByProjects=Documents linked to projects
+ECMDocsByUsers=Documents linked to users
+ECMDocsByInterventions=Documents linked to interventions
+ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to vendor proposals
+ECMNoDirectoryYet=No directory created
+ShowECMSection=Show directory
+DeleteSection=Remove directory
+ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
+ECMDirectoryForFiles=Relative directory for files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+ECMFileManager=File manager
+ECMSelectASection=Select a directory in the tree...
+DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
+ReSyncListOfDir=Resync list of directories
+HashOfFileContent=Hash of file content
+NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/bn_IN/errors.lang b/htdocs/langs/bn_IN/errors.lang
new file mode 100644
index 00000000000..7c67aeca8b5
--- /dev/null
+++ b/htdocs/langs/bn_IN/errors.lang
@@ -0,0 +1,265 @@
+# Dolibarr language file - Source file is en_US - errors
+
+# No errors
+NoErrorCommitIsDone=No error, we commit
+# Errors
+ErrorButCommitIsDone=Errors found but we validate despite this
+ErrorBadEMail=Email %s is wrong
+ErrorBadUrl=Url %s is wrong
+ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorLoginAlreadyExists=Login %s already exists.
+ErrorGroupAlreadyExists=Group %s already exists.
+ErrorRecordNotFound=Record not found.
+ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
+ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
+ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
+ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
+ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
+ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
+ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
+ErrorBadThirdPartyName=Bad value for third-party name
+ErrorProdIdIsMandatory=The %s is mandatory
+ErrorBadCustomerCodeSyntax=Bad syntax for customer code
+ErrorBadBarCodeSyntax=Bad syntax for barcode. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorCustomerCodeRequired=Customer code required
+ErrorBarCodeRequired=Barcode required
+ErrorCustomerCodeAlreadyUsed=Customer code already used
+ErrorBarCodeAlreadyUsed=Barcode already used
+ErrorPrefixRequired=Prefix required
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
+ErrorBadParameters=Bad parameters
+ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
+ErrorBadDateFormat=Value '%s' has wrong date format
+ErrorWrongDate=Date is not correct!
+ErrorFailedToWriteInDir=Failed to write in directory %s
+ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
+ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
+ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
+ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
+ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
+ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
+ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
+ErrorFileNotFound=File <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
+ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
+ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
+ErrorDirAlreadyExists=A directory with this name already exists.
+ErrorFileAlreadyExists=A file with this name already exists.
+ErrorPartialFile=File not received completely by server.
+ErrorNoTmpDir=Temporary directy %s does not exists.
+ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
+ErrorFileSizeTooLarge=File size is too large.
+ErrorFieldTooLong=Field %s is too long.
+ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum)
+ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum)
+ErrorNoValueForSelectType=Please fill value for select list
+ErrorNoValueForCheckBoxType=Please fill value for checkbox list
+ErrorNoValueForRadioType=Please fill value for radio list
+ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
+ErrorFieldCanNotContainSpecialCharacters=The field <b>%s</b> must not contains special characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
+ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
+ErrorNoAccountancyModuleLoaded=No accountancy module activated
+ErrorExportDuplicateProfil=This profile name already exists for this export set.
+ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
+ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
+ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
+ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
+ErrorRecordHasChildren=Failed to delete record since it has some child records.
+ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
+ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
+ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display.
+ErrorPasswordsMustMatch=Both typed passwords must match each other
+ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
+ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
+ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
+ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
+ErrorsOnXLines=%s errors found
+ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
+ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
+ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
+ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorBadMask=Error on mask
+ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
+ErrorBadMaskBadRazMonth=Error, bad reset value
+ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
+ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
+ErrorSelectAtLeastOne=Error, select at least one entry.
+ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
+ErrorProdIdAlreadyExist=%s is assigned to another third
+ErrorFailedToSendPassword=Failed to send password
+ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
+ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
+ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
+ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
+ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
+ErrorRecordAlreadyExists=Record already exists
+ErrorLabelAlreadyExists=This label already exists
+ErrorCantReadFile=Failed to read file '%s'
+ErrorCantReadDir=Failed to read directory '%s'
+ErrorBadLoginPassword=Bad value for login or password
+ErrorLoginDisabled=Your account has been disabled
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToChangePassword=Failed to change password
+ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
+ErrorLoginHasNoEmail=This user has no email address. Process aborted.
+ErrorBadValueForCode=Bad value for security code. Try again with new value...
+ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice.
+ErrorLinesCantBeNegativeForOneVATRate=Total of lines can't be negative for a given VAT rate.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
+ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
+ErrorNoActivatedBarcode=No barcode type activated
+ErrUnzipFails=Failed to unzip %s with ZipArchive
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
+ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
+ErrorModuleFileRequired=You must select a Dolibarr module package file
+ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
+ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
+ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
+ErrorNewValueCantMatchOldValue=New value can't be equal to old one
+ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
+ErrorFailedToAddContact=Failed to add contact
+ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
+ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
+ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
+ErrorWarehouseMustDiffers=Source and target warehouses must differs
+ErrorBadFormat=Bad format!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
+ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
+ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
+ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Operator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpression23=Unknown or non set variable '%s' in %s
+ErrorPriceExpression24=Variable '%s' exists but has no value
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
+ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
+ErrorSavingChanges=An error has occurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
+ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
+ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
+ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
+ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
+ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
+ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
+ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
+ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
+ErrorTaskAlreadyAssigned=Task already assigned to user
+ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
+ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
+ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
+ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
+ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
+ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
+ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
+ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
+ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
+ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
+ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
+ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
+ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, record is already transferred in accounting, deletion is not possible.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, language is mandatory if you set the page as a translation of another one.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
+ErrorBatchNoFoundForProductInWarehouse=No lot/serial found for product "%s" in warehouse "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this lot/serial for product "%s" in warehouse "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
+ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
+ErrorReplaceStringEmpty=Error, the string to replace into is empty
+# Warnings
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
+WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
+WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
+WarningEnableYourModulesApplications=Click here to enable your modules and applications
+WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.
+WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
+WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
+WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php</b>) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe.
+WarningsOnXLines=Warnings on <b>%s</b> source record(s)
+WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
+WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable the installation/migration tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Omitting the creation of this file is a grave security risk.
+WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
+WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
+WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
+WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
+WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
+WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
+WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
+WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectClosed=Project is closed. You must re-open it first.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
diff --git a/htdocs/langs/bn_IN/exports.lang b/htdocs/langs/bn_IN/exports.lang
new file mode 100644
index 00000000000..3549e3f8b23
--- /dev/null
+++ b/htdocs/langs/bn_IN/exports.lang
@@ -0,0 +1,135 @@
+# Dolibarr language file - Source file is en_US - exports
+ExportsArea=Exports
+ImportArea=Import
+NewExport=New Export
+NewImport=New Import
+ExportableDatas=Exportable dataset
+ImportableDatas=Importable dataset
+SelectExportDataSet=Choose dataset you want to export...
+SelectImportDataSet=Choose dataset you want to import...
+SelectExportFields=Choose the fields you want to export, or select a predefined export profile
+SelectImportFields=Choose the source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
+NotImportedFields=Fields of source file not imported
+SaveExportModel=Save your selections as an export profile/template (for reuse).
+SaveImportModel=Save this import profile (for reuse) ...
+ExportModelName=Export profile name
+ExportModelSaved=Export profile saved as <b>%s</b>.
+ExportableFields=Exportable fields
+ExportedFields=Exported fields
+ImportModelName=Import profile name
+ImportModelSaved=Import profile saved as <b>%s</b>.
+DatasetToExport=Dataset to export
+DatasetToImport=Import file into dataset
+ChooseFieldsOrdersAndTitle=Choose fields order...
+FieldsTitle=Fields title
+FieldTitle=Field title
+NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
+AvailableFormats=Available Formats
+LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
+Step=Step
+FormatedImport=Import Assistant
+FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
+FormatedImportDesc2=First step is to choose the kind of data you want to import, then the format of the source file, then the fields you want to import.
+FormatedExport=Export Assistant
+FormatedExportDesc1=These tools allow the export of personalized data using an assistant, to help you in the process without requiring technical knowledge.
+FormatedExportDesc2=First step is to choose a predefined dataset, then which fields you want to export, and in which order.
+FormatedExportDesc3=When data to export are selected, you can choose the format of the output file.
+Sheet=Sheet
+NoImportableData=No importable data (no module with definitions to allow data imports)
+FileSuccessfullyBuilt=File generated
+SQLUsedForExport=SQL Request used to extract data
+LineId=Id of line
+LineLabel=Label of line
+LineDescription=Description of line
+LineUnitPrice=Unit price of line
+LineVATRate=VAT Rate of line
+LineQty=Quantity for line
+LineTotalHT=Amount excl. tax for line
+LineTotalTTC=Amount with tax for line
+LineTotalVAT=Amount of VAT for line
+TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
+FileWithDataToImport=File with data to import
+FileToImport=Source file to import
+FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SourceFileFormat=Source file format
+FieldsInSourceFile=Fields in source file
+FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+Field=Field
+NoFields=No fields
+MoveField=Move field column number %s
+ExampleOfImportFile=Example_of_import_file
+SaveImportProfile=Save this import profile
+ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name.
+TablesTarget=Targeted tables
+FieldsTarget=Targeted fields
+FieldTarget=Targeted field
+FieldSource=Source field
+NbOfSourceLines=Number of lines in source file
+NowClickToTestTheImport=Check that the file format (field and string delimiters) of your file matches the options shown and that you have omitted the header line, or these will be flagged as errors in the following simulation.<br>Click on the "<b>%s</b>" button to run a check of the file structure/contents and simulate the import process.<br><b>No data will be changed in your database</b>.
+RunSimulateImportFile=Run Import Simulation
+FieldNeedSource=This field requires data from the source file
+SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
+InformationOnSourceFile=Information on source file
+InformationOnTargetTables=Information on target fields
+SelectAtLeastOneField=Switch at least one source field in the column of fields to export
+SelectFormat=Choose this import file format
+RunImportFile=Import Data
+NowClickToRunTheImport=Check the results of the import simulation. Correct any errors and re-test.<br>When the simulation reports no errors you may proceed to import the data into the database.
+DataLoadedWithId=The imported data will have an additional field in each database table with this import id: <b>%s</b>, to allow it to be searchable in the case of investigating a problem related to this import.
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+TooMuchErrors=There are still <b>%s</b> other source lines with errors but output has been limited.
+TooMuchWarnings=There are still <b>%s</b> other source lines with warnings but output has been limited.
+EmptyLine=Empty line (will be discarded)
+CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
+FileWasImported=File was imported with number <b>%s</b>.
+YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
+NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
+NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
+DataComeFromNoWhere=Value to insert comes from nowhere in source file.
+DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
+DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
+DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
+DataIsInsertedInto=Data coming from source file will be inserted into the following field:
+DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
+DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field:
+SourceRequired=Data value is mandatory
+SourceExample=Example of possible data value
+ExampleAnyRefFoundIntoElement=Any ref found for element <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
+CSVFormatDesc=<b>Comma Separated Value</b> file format (.csv).<br>This is a text file format where fields are separated by a separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ].
+Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is the native Excel 95 format (BIFF5).
+Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is the native Excel 2007 format (SpreadsheetML).
+TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
+ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate record (with this field added, all lines will own their own id and will differ).
+CsvOptions=CSV format options
+Separator=Field Separator
+Enclosure=String Delimiter
+SpecialCode=Special code
+ExportStringFilter=%% allows replacing one or more characters in the text
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD: filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD: filters on all previous years/months/days
+ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+ImportFromToLine=Limit range (From - To). Eg. to omit header line(s).
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines.<br>If the header lines are NOT omitted, this will result in multiple errors in the Import Simulation.
+KeepEmptyToGoToEndOfFile=Keep this field empty to process all lines to the end of the file.
+SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for an UPDATE import
+UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
+NoUpdateAttempt=No update attempt was performed, only insert
+ImportDataset_user_1=Users (employees or not) and properties
+ComputedField=Computed field
+## filters
+SelectFilterFields=If you want to filter on some values, just input values here.
+FilteredFields=Filtered fields
+FilteredFieldsValues=Value for filter
+FormatControlRule=Format control rule
+## imports updates
+KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
+NbInsert=Number of inserted lines: %s
+NbUpdate=Number of updated lines: %s
+MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
diff --git a/htdocs/langs/bn_IN/externalsite.lang b/htdocs/langs/bn_IN/externalsite.lang
new file mode 100644
index 00000000000..da4853df0df
--- /dev/null
+++ b/htdocs/langs/bn_IN/externalsite.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExternalSiteSetup=Setup link to external website
+ExternalSiteURL=External Site URL
+ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/bn_IN/ftp.lang b/htdocs/langs/bn_IN/ftp.lang
new file mode 100644
index 00000000000..d80b87c2715
--- /dev/null
+++ b/htdocs/langs/bn_IN/ftp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - ftp
+FTPClientSetup=FTP Client module setup
+NewFTPClient=New FTP connection setup
+FTPArea=FTP Area
+FTPAreaDesc=This screen shows a view of an FTP server.
+SetupOfFTPClientModuleNotComplete=The setup of the FTP client module seems to be incomplete
+FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
+FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
+FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
+FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
+FTPPassiveMode=Passive mode
+ChooseAFTPEntryIntoMenu=Choose a FTP site from the menu...
+FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/bn_IN/help.lang b/htdocs/langs/bn_IN/help.lang
new file mode 100644
index 00000000000..048de16d3c0
--- /dev/null
+++ b/htdocs/langs/bn_IN/help.lang
@@ -0,0 +1,23 @@
+# Dolibarr language file - Source file is en_US - help
+CommunitySupport=Forum/Wiki support
+EMailSupport=Emails support
+RemoteControlSupport=Online real-time / remote support
+OtherSupport=Other support
+ToSeeListOfAvailableRessources=To contact/see available resources:
+HelpCenter=Help Center
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
+TypeSupportCommunauty=Community (free)
+TypeSupportCommercial=Commercial
+TypeOfHelp=Type
+NeedHelpCenter=Need help or support?
+Efficiency=Efficiency
+TypeHelpOnly=Help only
+TypeHelpDev=Help+Development
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
+PossibleLanguages=Supported languages
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
+SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/bn_IN/holiday.lang b/htdocs/langs/bn_IN/holiday.lang
new file mode 100644
index 00000000000..82de49f9c5f
--- /dev/null
+++ b/htdocs/langs/bn_IN/holiday.lang
@@ -0,0 +1,133 @@
+# Dolibarr language file - Source file is en_US - holiday
+HRM=HRM
+Holidays=Leave
+CPTitreMenu=Leave
+MenuReportMonth=Monthly statement
+MenuAddCP=New leave request
+NotActiveModCP=You must enable the module Leave to view this page.
+AddCP=Make a leave request
+DateDebCP=Start date
+DateFinCP=End date
+DraftCP=Draft
+ToReviewCP=Awaiting approval
+ApprovedCP=Approved
+CancelCP=Canceled
+RefuseCP=Refused
+ValidatorCP=Approbator
+ListeCP=List of leave
+LeaveId=Leave ID
+ReviewedByCP=Will be approved by
+UserID=User ID
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
+DescCP=Description
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
+ErrorEndDateCP=You must select an end date greater than the start date.
+ErrorSQLCreateCP=An SQL error occurred during the creation:
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
+ReturnCP=Return to previous page
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosWorkflowCP=Information Workflow
+RequestByCP=Requested by
+TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
+NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DayIsANonWorkingDay=%s is a non working day
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
+EditCP=Edit
+DeleteCP=Delete
+ActionRefuseCP=Refuse
+ActionCancelCP=Cancel
+StatutCP=Status
+TitleDeleteCP=Delete the leave request
+ConfirmDeleteCP=Confirm the deletion of this leave request?
+ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
+CantCreateCP=You don't have the right to make leave requests.
+InvalidValidatorCP=You must choose an approbator to your leave request.
+NoDateDebut=You must select a start date.
+NoDateFin=You must select an end date.
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
+ConfirmValidCP=Are you sure you want to approve the leave request?
+DateValidCP=Date approved
+TitleToValidCP=Send leave request
+ConfirmToValidCP=Are you sure you want to send the leave request?
+TitleRefuseCP=Refuse the leave request
+ConfirmRefuseCP=Are you sure you want to refuse the leave request?
+NoMotifRefuseCP=You must choose a reason for refusing the request.
+TitleCancelCP=Cancel the leave request
+ConfirmCancelCP=Are you sure you want to cancel the leave request?
+DetailRefusCP=Reason for refusal
+DateRefusCP=Date of refusal
+DateCancelCP=Date of cancellation
+DefineEventUserCP=Assign an exceptional leave for a user
+addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
+MotifCP=Reason
+UserCP=User
+ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
+AddEventToUserOkCP=The addition of the exceptional leave has been completed.
+MenuLogCP=View change logs
+LogCP=Log of updates of available vacation days
+ActionByCP=Performed by
+UserUpdateCP=For the user
+PrevSoldeCP=Previous Balance
+NewSoldeCP=New Balance
+alreadyCPexist=A leave request has already been done on this period.
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
+BoxTitleLastLeaveRequests=Latest %s modified leave requests
+HolidaysMonthlyUpdate=Monthly update
+ManualUpdate=Manual update
+HolidaysCancelation=Leave request cancelation
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
+## Configuration du Module ##
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
+UpdateConfCPOK=Updated successfully.
+Module27130Name= Management of leave requests
+Module27130Desc= Management of leave requests
+ErrorMailNotSend=An error occurred while sending email:
+NoticePeriod=Notice period
+#Messages
+HolidaysToValidate=Validate leave requests
+HolidaysToValidateBody=Below is a leave request to validate
+HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
+HolidaysValidated=Validated leave requests
+HolidaysValidatedBody=Your leave request for %s to %s has been validated.
+HolidaysRefused=Request denied
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
+HolidaysCanceled=Canceled leaved request
+HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
+FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
+NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
+NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
diff --git a/htdocs/langs/bn_IN/hrm.lang b/htdocs/langs/bn_IN/hrm.lang
new file mode 100644
index 00000000000..3697c47e30d
--- /dev/null
+++ b/htdocs/langs/bn_IN/hrm.lang
@@ -0,0 +1,18 @@
+# Dolibarr language file - en_US - hrm
+# Admin
+HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
+Establishments=Establishments
+Establishment=Establishment
+NewEstablishment=New establishment
+DeleteEstablishment=Delete establishment
+ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
+OpenEtablishment=Open establishment
+CloseEtablishment=Close establishment
+# Dictionary
+DictionaryPublicHolidays=HRM - Public holidays
+DictionaryDepartment=HRM - Department list
+DictionaryFunction=HRM - Function list
+# Module
+Employees=Employees
+Employee=Employee
+NewEmployee=New employee
diff --git a/htdocs/langs/bn_IN/install.lang b/htdocs/langs/bn_IN/install.lang
new file mode 100644
index 00000000000..f67dff57184
--- /dev/null
+++ b/htdocs/langs/bn_IN/install.lang
@@ -0,0 +1,223 @@
+# Dolibarr language file - Source file is en_US - install
+InstallEasy=Just follow the instructions step by step.
+MiscellaneousChecks=Prerequisites check
+ConfFileExists=Configuration file <b>%s</b> exists.
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
+ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
+ConfFileReload=Reloading parameters from configuration file.
+PHPSupportSessions=This PHP supports sessions.
+PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportCalendar=This PHP supports calendars extensions.
+PHPSupportUTF8=This PHP supports UTF8 functions.
+PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupport=This PHP supports %s functions.
+PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
+ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
+ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
+ErrorDirDoesNotExists=Directory %s does not exist.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
+ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
+ErrorFailedToCreateDatabase=Failed to create database '%s'.
+ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
+ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
+ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
+ErrorDatabaseAlreadyExists=Database '%s' already exists.
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
+IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
+PHPVersion=PHP Version
+License=Using license
+ConfigurationFile=Configuration file
+WebPagesDirectory=Directory where web pages are stored
+DocumentsDirectory=Directory to store uploaded and generated documents
+URLRoot=URL Root
+ForceHttps=Force secure connections (https)
+CheckToForceHttps=Check this option to force secure connections (https).<br>This requires that the web server is configured with an SSL certificate.
+DolibarrDatabase=Dolibarr Database
+DatabaseType=Database type
+DriverType=Driver type
+Server=Server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
+ServerPortDescription=Database server port. Keep empty if unknown.
+DatabaseServer=Database server
+DatabaseName=Database name
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
+AdminPassword=Password for Dolibarr database owner.
+CreateDatabase=Create database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
+DatabaseSuperUserAccess=Database server - Superuser access
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
+ServerConnection=Server connection
+DatabaseCreation=Database creation
+CreateDatabaseObjects=Database objects creation
+ReferenceDataLoading=Reference data loading
+TablesAndPrimaryKeysCreation=Tables and Primary keys creation
+CreateTableAndPrimaryKey=Create table %s
+CreateOtherKeysForTable=Create foreign keys and indexes for table %s
+OtherKeysCreation=Foreign keys and indexes creation
+FunctionsCreation=Functions creation
+AdminAccountCreation=Administrator login creation
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
+SetupEnd=End of setup
+SystemIsInstalled=This installation is complete.
+SystemIsUpgraded=Dolibarr has been upgraded successfully.
+YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below:
+AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
+GoToDolibarr=Go to Dolibarr
+GoToSetupArea=Go to Dolibarr (setup area)
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
+GoToUpgradePage=Go to upgrade page again
+WithNoSlashAtTheEnd=Without the slash "/" at the end
+DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
+LoginAlreadyExists=Already exists
+DolibarrAdminLogin=Dolibarr admin login
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
+FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
+ChoosedMigrateScript=Choose migration script
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
+ProcessMigrateScript=Script processing
+ChooseYourSetupMode=Choose your setup mode and click "Start"...
+FreshInstall=Fresh install
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
+Upgrade=Upgrade
+UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
+Start=Start
+InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
+YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
+AlreadyDone=Already migrated
+DatabaseVersion=Database version
+ServerVersion=Database server version
+YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
+DBSortingCollation=Character sorting order
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
+OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
+RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
+FieldRenamed=Field renamed
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
+InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
+InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
+IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
+OpenBaseDir=PHP openbasedir parameter
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
+MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
+MigrationShippingDelivery=Upgrade storage of shipping
+MigrationShippingDelivery2=Upgrade storage of shipping 2
+MigrationFinished=Migration finished
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
+ActivateModule=Activate module %s
+ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
+SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
+NothingToDelete=Nothing to clean/delete
+NothingToDo=Nothing to do
+#########
+# upgrade
+MigrationFixData=Fix for denormalized data
+MigrationOrder=Data migration for customer's orders
+MigrationSupplierOrder=Data migration for vendor's orders
+MigrationProposal=Data migration for commercial proposals
+MigrationInvoice=Data migration for customer's invoices
+MigrationContract=Data migration for contracts
+MigrationSuccessfullUpdate=Upgrade successful
+MigrationUpdateFailed=Failed upgrade process
+MigrationRelationshipTables=Data migration for relationship tables (%s)
+MigrationPaymentsUpdate=Payment data correction
+MigrationPaymentsNumberToUpdate=%s payment(s) to update
+MigrationProcessPaymentUpdate=Update payment(s) %s
+MigrationPaymentsNothingToUpdate=No more things to do
+MigrationPaymentsNothingUpdatable=No more payments that can be corrected
+MigrationContractsUpdate=Contract data correction
+MigrationContractsNumberToUpdate=%s contract(s) to update
+MigrationContractsLineCreation=Create contract line for contract ref %s
+MigrationContractsNothingToUpdate=No more things to do
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
+MigrationContractsEmptyDatesUpdate=Contract empty date correction
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
+MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
+MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
+MigrationContractsInvalidDatesUpdate=Bad value date contract correction
+MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s)
+MigrationContractsInvalidDatesNumber=%s contracts modified
+MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct
+MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction
+MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
+MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct
+MigrationReopeningContracts=Open contract closed by error
+MigrationReopenThisContract=Reopen contract %s
+MigrationReopenedContractsNumber=%s contracts modified
+MigrationReopeningContractsNothingToUpdate=No closed contract to open
+MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
+MigrationBankTransfertsNothingToUpdate=All links are up to date
+MigrationShipmentOrderMatching=Sendings receipt update
+MigrationDeliveryOrderMatching=Delivery receipt update
+MigrationDeliveryDetail=Delivery update
+MigrationStockDetail=Update stock value of products
+MigrationMenusDetail=Update dynamic menus tables
+MigrationDeliveryAddress=Update delivery address in shipments
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
+MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
+MigrationProjectTaskTime=Update time spent in seconds
+MigrationActioncommElement=Update data on actions
+MigrationPaymentMode=Data migration for payment type
+MigrationCategorieAssociation=Migration of categories
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
+MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
+MigrationReloadModule=Reload module %s
+MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
+ClickHereToGoToApp=Click here to go to your application
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/bn_IN/interventions.lang b/htdocs/langs/bn_IN/interventions.lang
new file mode 100644
index 00000000000..e5936f8246e
--- /dev/null
+++ b/htdocs/langs/bn_IN/interventions.lang
@@ -0,0 +1,66 @@
+# Dolibarr language file - Source file is en_US - interventions
+Intervention=Intervention
+Interventions=Interventions
+InterventionCard=Intervention card
+NewIntervention=New intervention
+AddIntervention=Create intervention
+ChangeIntoRepeatableIntervention=Change to repeatable intervention
+ListOfInterventions=List of interventions
+ActionsOnFicheInter=Actions on intervention
+LastInterventions=Latest %s interventions
+AllInterventions=All interventions
+CreateDraftIntervention=Create draft
+InterventionContact=Intervention contact
+DeleteIntervention=Delete intervention
+ValidateIntervention=Validate intervention
+ModifyIntervention=Modify intervention
+DeleteInterventionLine=Delete intervention line
+ConfirmDeleteIntervention=Are you sure you want to delete this intervention?
+ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
+ConfirmModifyIntervention=Are you sure you want to modify this intervention?
+ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line?
+ConfirmCloneIntervention=Are you sure you want to clone this intervention?
+NameAndSignatureOfInternalContact=Name and signature of intervening:
+NameAndSignatureOfExternalContact=Name and signature of customer:
+DocumentModelStandard=Standard document model for interventions
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
+InterventionClassifyDone=Classify "Done"
+StatusInterInvoiced=Billed
+SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by email
+InterventionDeletedInDolibarr=Intervention %s deleted
+InterventionsArea=Interventions area
+DraftFichinter=Draft interventions
+LastModifiedInterventions=Latest %s modified interventions
+FichinterToProcess=Interventions to process
+TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
+PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
+PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
+UseDurationOnFichinter=Hides the duration field for intervention records
+UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records
+InterventionStatistics=Statistics of interventions
+NbOfinterventions=No. of intervention cards
+NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
+InterId=Intervention id
+InterRef=Intervention ref.
+InterDateCreation=Date creation intervention
+InterDuration=Duration intervention
+InterStatus=Status intervention
+InterNote=Note intervention
+InterLine=Line of intervention
+InterLineId=Line id intervention
+InterLineDate=Line date intervention
+InterLineDuration=Line duration intervention
+InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/bn_IN/languages.lang b/htdocs/langs/bn_IN/languages.lang
new file mode 100644
index 00000000000..6185183161b
--- /dev/null
+++ b/htdocs/langs/bn_IN/languages.lang
@@ -0,0 +1,89 @@
+# Dolibarr language file - Source file is en_US - languages
+Language_ar_AR=Arabic
+Language_ar_EG=Arabic (Egypt)
+Language_ar_SA=Arabic
+Language_bn_BD=Bengali
+Language_bg_BG=Bulgarian
+Language_bs_BA=Bosnian
+Language_ca_ES=Catalan
+Language_cs_CZ=Czech
+Language_da_DA=Danish
+Language_da_DK=Danish
+Language_de_DE=German
+Language_de_AT=German (Austria)
+Language_de_CH=German (Switzerland)
+Language_el_GR=Greek
+Language_el_CY=Greek (Cyprus)
+Language_en_AU=English (Australia)
+Language_en_CA=English (Canada)
+Language_en_GB=English (United Kingdom)
+Language_en_IN=English (India)
+Language_en_NZ=English (New Zealand)
+Language_en_SA=English (Saudi Arabia)
+Language_en_US=English (United States)
+Language_en_ZA=English (South Africa)
+Language_es_ES=Spanish
+Language_es_AR=Spanish (Argentina)
+Language_es_BO=Spanish (Bolivia)
+Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
+Language_es_EC=Spanish (Ecuador)
+Language_es_HN=Spanish (Honduras)
+Language_es_MX=Spanish (Mexico)
+Language_es_PA=Spanish (Panama)
+Language_es_PY=Spanish (Paraguay)
+Language_es_PE=Spanish (Peru)
+Language_es_PR=Spanish (Puerto Rico)
+Language_es_UY=Spanish (Uruguay)
+Language_es_VE=Spanish (Venezuela)
+Language_et_EE=Estonian
+Language_eu_ES=Basque
+Language_fa_IR=Persian
+Language_fi_FI=Finnish
+Language_fr_BE=French (Belgium)
+Language_fr_CA=French (Canada)
+Language_fr_CH=French (Switzerland)
+Language_fr_FR=French
+Language_fr_NC=French (New Caledonia)
+Language_fy_NL=Frisian
+Language_he_IL=Hebrew
+Language_hr_HR=Croatian
+Language_hu_HU=Hungarian
+Language_id_ID=Indonesian
+Language_is_IS=Icelandic
+Language_it_IT=Italian
+Language_ja_JP=Japanese
+Language_ka_GE=Georgian
+Language_km_KH=Khmer
+Language_kn_IN=Kannada
+Language_ko_KR=Korean
+Language_lo_LA=Lao
+Language_lt_LT=Lithuanian
+Language_lv_LV=Latvian
+Language_mk_MK=Macedonian
+Language_mn_MN=Mongolian
+Language_nb_NO=Norwegian (Bokmål)
+Language_nl_BE=Dutch (Belgium)
+Language_nl_NL=Dutch
+Language_pl_PL=Polish
+Language_pt_BR=Portuguese (Brazil)
+Language_pt_PT=Portuguese
+Language_ro_RO=Romanian
+Language_ru_RU=Russian
+Language_ru_UA=Russian (Ukraine)
+Language_tr_TR=Turkish
+Language_sl_SI=Slovenian
+Language_sv_SV=Swedish
+Language_sv_SE=Swedish
+Language_sq_AL=Albanian
+Language_sk_SK=Slovakian
+Language_sr_RS=Serbian
+Language_sw_SW=Kiswahili
+Language_th_TH=Thai
+Language_uk_UA=Ukrainian
+Language_uz_UZ=Uzbek
+Language_vi_VN=Vietnamese
+Language_zh_CN=Chinese
+Language_zh_TW=Chinese (Traditional)
+Language_bh_MY=Malay
diff --git a/htdocs/langs/bn_IN/ldap.lang b/htdocs/langs/bn_IN/ldap.lang
new file mode 100644
index 00000000000..8b6f0864215
--- /dev/null
+++ b/htdocs/langs/bn_IN/ldap.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - ldap
+YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
+UserMustChangePassNextLogon=User must change password on the domain %s
+LDAPInformationsForThisContact=Information in LDAP database for this contact
+LDAPInformationsForThisUser=Information in LDAP database for this user
+LDAPInformationsForThisGroup=Information in LDAP database for this group
+LDAPInformationsForThisMember=Information in LDAP database for this member
+LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPAttributes=LDAP attributes
+LDAPCard=LDAP card
+LDAPRecordNotFound=Record not found in LDAP database
+LDAPUsers=Users in LDAP database
+LDAPFieldStatus=Status
+LDAPFieldFirstSubscriptionDate=First subscription date
+LDAPFieldFirstSubscriptionAmount=First subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example: skypeName
+UserSynchronized=User synchronized
+GroupSynchronized=Group synchronized
+MemberSynchronized=Member synchronized
+MemberTypeSynchronized=Member type synchronized
+ContactSynchronized=Contact synchronized
+ForceSynchronize=Force synchronizing Dolibarr -> LDAP
+ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/bn_IN/link.lang b/htdocs/langs/bn_IN/link.lang
new file mode 100644
index 00000000000..1ffcd41a18b
--- /dev/null
+++ b/htdocs/langs/bn_IN/link.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - languages
+LinkANewFile=Link a new file/document
+LinkedFiles=Linked files and documents
+NoLinkFound=No registered links
+LinkComplete=The file has been linked successfully
+ErrorFileNotLinked=The file could not be linked
+LinkRemoved=The link %s has been removed
+ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
+ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+URLToLink=URL to link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/bn_IN/loan.lang b/htdocs/langs/bn_IN/loan.lang
new file mode 100644
index 00000000000..534dee08867
--- /dev/null
+++ b/htdocs/langs/bn_IN/loan.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+LoanPayment=Loan payment
+ShowLoanPayment=Show Loan Payment
+LoanCapital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+Term=Term
+LoanAccountancyCapitalCode=Accounting account capital
+LoanAccountancyInsuranceCode=Accounting account insurance
+LoanAccountancyInterestCode=Accounting account interest
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ListLoanAssociatedProject=List of loan associated with the project
+AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
+CreateCalcSchedule=Edit financial commitment
diff --git a/htdocs/langs/bn_IN/mailmanspip.lang b/htdocs/langs/bn_IN/mailmanspip.lang
new file mode 100644
index 00000000000..bab4b3576b4
--- /dev/null
+++ b/htdocs/langs/bn_IN/mailmanspip.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - mailmanspip
+MailmanSpipSetup=Mailman and SPIP module Setup
+MailmanTitle=Mailman mailing list system
+TestSubscribe=To test subscription to Mailman lists
+TestUnSubscribe=To test unsubscribe from Mailman lists
+MailmanCreationSuccess=Subscription test was executed successfully
+MailmanDeletionSuccess=Unsubscription test was executed successfully
+SynchroMailManEnabled=A Mailman update will be performed
+SynchroSpipEnabled=A Spip update will be performed
+DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
+DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
+DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
+DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
+SPIPTitle=SPIP Content Management System
+DescADHERENT_SPIP_SERVEUR=SPIP Server
+DescADHERENT_SPIP_DB=SPIP database name
+DescADHERENT_SPIP_USER=SPIP database login
+DescADHERENT_SPIP_PASS=SPIP database password
+AddIntoSpip=Add into SPIP
+AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
+AddIntoSpipError=Failed to add the user in SPIP
+DeleteIntoSpip=Remove from SPIP
+DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
+DeleteIntoSpipError=Failed to suppress the user from SPIP
+SPIPConnectionFailed=Failed to connect to SPIP
+SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
+SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
diff --git a/htdocs/langs/bn_IN/mails.lang b/htdocs/langs/bn_IN/mails.lang
new file mode 100644
index 00000000000..7b3bfd3852a
--- /dev/null
+++ b/htdocs/langs/bn_IN/mails.lang
@@ -0,0 +1,170 @@
+# Dolibarr language file - Source file is en_US - mails
+Mailing=EMailing
+EMailing=EMailing
+EMailings=EMailings
+AllEMailings=All eMailings
+MailCard=EMailing card
+MailRecipients=Recipients
+MailRecipient=Recipient
+MailTitle=Description
+MailFrom=Sender
+MailErrorsTo=Errors to
+MailReply=Reply to
+MailTo=Receiver(s)
+MailToUsers=To user(s)
+MailCC=Copy to
+MailToCCUsers=Copy to users(s)
+MailCCC=Cached copy to
+MailTopic=Email topic
+MailText=Message
+MailFile=Attached files
+MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
+ShowEMailing=Show emailing
+ListOfEMailings=List of emailings
+NewMailing=New emailing
+EditMailing=Edit emailing
+ResetMailing=Resend emailing
+DeleteMailing=Delete emailing
+DeleteAMailing=Delete an emailing
+PreviewMailing=Preview emailing
+CreateMailing=Create emailing
+TestMailing=Test email
+ValidMailing=Valid emailing
+MailingStatusDraft=Draft
+MailingStatusValidated=Validated
+MailingStatusSent=Sent
+MailingStatusSentPartialy=Sent partially
+MailingStatusSentCompletely=Sent completely
+MailingStatusError=Error
+MailingStatusNotSent=Not sent
+MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
+MailingSuccessfullyValidated=EMailing successfully validated
+MailUnsubcribe=Unsubscribe
+MailingStatusNotContact=Don't contact anymore
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
+ErrorMailRecipientIsEmpty=Email recipient is empty
+WarningNoEMailsAdded=No new Email to add to recipient's list.
+ConfirmValidMailing=Are you sure you want to validate this emailing?
+ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
+ConfirmDeleteMailing=Are you sure you want to delete this emailing?
+NbOfUniqueEMails=No. of unique emails
+NbOfEMails=No. of EMails
+TotalNbOfDistinctRecipients=Number of distinct recipients
+NoTargetYet=No recipients defined yet (Go on tab 'Recipients')
+NoRecipientEmail=No recipient email for %s
+RemoveRecipient=Remove recipient
+YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README.
+EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values
+MailingAddFile=Attach this file
+NoAttachedFiles=No attached files
+BadEMail=Bad value for Email
+ConfirmCloneEMailing=Are you sure you want to clone this emailing?
+CloneContent=Clone message
+CloneReceivers=Cloner recipients
+DateLastSend=Date of latest sending
+DateSending=Date sending
+SentTo=Sent to <b>%s</b>
+MailingStatusRead=Read
+YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubscribe from mailing list
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubscribe" feature
+EMailSentToNRecipients=Email sent to %s recipients.
+EMailSentForNElements=Email sent for %s elements.
+XTargetsAdded=<b>%s</b> recipients added into target list
+OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachments in mass sending in this version).
+AllRecipientSelected=The recipients of the %s record selected (if their email is known).
+GroupEmails=Group emails
+OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
+WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
+ResultOfMailSending=Result of mass Email sending
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
+SentXXXmessages=%s message(s) sent.
+ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
+MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
+MailingModuleDescContactsByCompanyCategory=Contacts by third-party category
+MailingModuleDescContactsByCategory=Contacts by categories
+MailingModuleDescContactsByFunction=Contacts by position
+MailingModuleDescEmailsFromFile=Emails from file
+MailingModuleDescEmailsFromUser=Emails input by user
+MailingModuleDescDolibarrUsers=Users with Emails
+MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+
+# Libelle des modules de liste de destinataires mailing
+LineInFile=Line %s in file
+RecipientSelectionModules=Defined requests for recipient's selection
+MailSelectedRecipients=Selected recipients
+MailingArea=EMailings area
+LastMailings=Latest %s emailings
+TargetsStatistics=Targets statistics
+NbOfCompaniesContacts=Unique contacts/addresses
+MailNoChangePossible=Recipients for validated emailing can't be changed
+SearchAMailing=Search mailing
+SendMailing=Send emailing
+SentBy=Sent by
+MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
+MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
+ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+TargetsReset=Clear list
+ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
+ToAddRecipientsChooseHere=Add recipients by choosing from the lists
+NbOfEMailingsReceived=Mass emailings received
+NbOfEMailingsSend=Mass emailings sent
+IdRecord=ID record
+DeliveryReceipt=Delivery Ack.
+YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
+TagCheckMail=Track mail opening
+TagUnsubscribe=Unsubscribe link
+TagSignature=Signature of sending user
+EMailRecipient=Recipient Email
+TagMailtoEmail=Recipient Email (including html "mailto:" link)
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
+# Module Notifications
+Notifications=Notifications
+NoNotificationsWillBeSent=No email notifications are planned for this event and company
+ANotificationsWillBeSent=1 notification will be sent by email
+SomeNotificationsWillBeSent=%s notifications will be sent by email
+AddNewNotification=Activate a new email notification target/event
+ListOfActiveNotifications=List all active targets/events for email notification
+ListOfNotificationsDone=List all email notifications sent
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
+UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
+UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
+MailAdvTargetRecipients=Recipients (advanced selection)
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchIntHelp=Use interval to select int or float value
+AdvTgtMinVal=Minimum value
+AdvTgtMaxVal=Maximum value
+AdvTgtSearchDtHelp=Use interval to select date value
+AdvTgtStartDt=Start dt.
+AdvTgtEndDt=End dt.
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third-party email or just contact email
+AdvTgtTypeOfIncude=Type of targeted email
+AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
+AddAll=Add all
+RemoveAll=Remove all
+ItemsCount=Item(s)
+AdvTgtNameTemplate=Filter name
+AdvTgtAddContact=Add emails according to criteria
+AdvTgtLoadFilter=Load filter
+AdvTgtDeleteFilter=Delete filter
+AdvTgtSaveFilter=Save filter
+AdvTgtCreateFilter=Create filter
+AdvTgtOrCreateNewFilter=Name of new filter
+NoContactWithCategoryFound=No contact/address with a category found
+NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+DefaultOutgoingEmailSetup=Default outgoing email setup
+Information=Information
+ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/bn_IN/main.lang b/htdocs/langs/bn_IN/main.lang
new file mode 100644
index 00000000000..824a5e495b8
--- /dev/null
+++ b/htdocs/langs/bn_IN/main.lang
@@ -0,0 +1,1035 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+# Note for Chinese:
+# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
+# stsongstdlight or cid0cs are for simplified Chinese
+# To read Chinese pdf with Linux: sudo apt-get install poppler-data
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
+DatabaseConnection=Database connection
+NoTemplateDefined=No template available for this email type
+AvailableVariables=Available substitution variables
+NoTranslation=No translation
+Translation=Translation
+EmptySearchString=Enter a non empty search string
+NoRecordFound=No record found
+NoRecordDeleted=No record deleted
+NotEnoughDataYet=Not enough data
+NoError=No error
+Error=Error
+Errors=Errors
+ErrorFieldRequired=Field '%s' is required
+ErrorFieldFormat=Field '%s' has a bad value
+ErrorFileDoesNotExists=File %s does not exist
+ErrorFailedToOpenFile=Failed to open file %s
+ErrorCanNotCreateDir=Cannot create dir %s
+ErrorCanNotReadDir=Cannot read dir %s
+ErrorConstantNotDefined=Parameter %s not defined
+ErrorUnknown=Unknown error
+ErrorSQL=SQL Error
+ErrorLogoFileNotFound=Logo file '%s' was not found
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
+ErrorGoToModuleSetup=Go to Module setup to fix this
+ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
+ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
+ErrorInternalErrorDetected=Error detected
+ErrorWrongHostParameter=Wrong host parameter
+ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post the form again.
+ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child record.
+ErrorWrongValue=Wrong value
+ErrorWrongValueForParameterX=Wrong value for parameter %s
+ErrorNoRequestInError=No request in error
+ErrorServiceUnavailableTryLater=Service not available at the moment. Try again later.
+ErrorDuplicateField=Duplicate value in a unique field
+ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back.
+ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
+ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
+ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
+ErrorFailedToSaveFile=Error, failed to save file.
+ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
+MaxNbOfRecordPerPage=Max. number of records per page
+NotAuthorized=You are not authorized to do that.
+SetDate=Set date
+SelectDate=Select a date
+SeeAlso=See also %s
+SeeHere=See here
+ClickHere=Click here
+Here=Here
+Apply=Apply
+BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
+FileGenerated=The file was successfully generated
+FileSaved=The file was successfully saved
+FileUploaded=The file was successfully uploaded
+FileTransferComplete=File(s) uploaded successfully
+FilesDeleted=File(s) successfully deleted
+FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
+NbOfEntries=No. of entries
+GoToWikiHelpPage=Read online help (Internet access needed)
+GoToHelpPage=Read help
+RecordSaved=Record saved
+RecordDeleted=Record deleted
+RecordGenerated=Record generated
+LevelOfFeature=Level of features
+NotDefined=Not defined
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
+Administrator=Administrator
+Undefined=Undefined
+PasswordForgotten=Password forgotten?
+NoAccount=No account?
+SeeAbove=See above
+HomeArea=Home
+LastConnexion=Last login
+PreviousConnexion=Previous login
+PreviousValue=Previous value
+ConnectedOnMultiCompany=Connected on environment
+ConnectedSince=Connected since
+AuthenticationMode=Authentication mode
+RequestedUrl=Requested URL
+DatabaseTypeManager=Database type manager
+RequestLastAccessInError=Latest database access request error
+ReturnCodeLastAccessInError=Return code for latest database access request error
+InformationLastAccessInError=Information for latest database access request error
+DolibarrHasDetectedError=Dolibarr has detected a technical error
+YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices)
+MoreInformation=More information
+TechnicalInformation=Technical information
+TechnicalID=Technical ID
+LineID=Line ID
+NotePublic=Note (public)
+NotePrivate=Note (private)
+PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
+DoTest=Test
+ToFilter=Filter
+NoFilter=No filter
+WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
+yes=yes
+Yes=Yes
+no=no
+No=No
+All=All
+Home=Home
+Help=Help
+OnlineHelp=Online help
+PageWiki=Wiki page
+MediaBrowser=Media browser
+Always=Always
+Never=Never
+Under=under
+Period=Period
+PeriodEndDate=End date for period
+SelectedPeriod=Selected period
+PreviousPeriod=Previous period
+Activate=Activate
+Activated=Activated
+Closed=Closed
+Closed2=Closed
+NotClosed=Not closed
+Enabled=Enabled
+Enable=Enable
+Deprecated=Deprecated
+Disable=Disable
+Disabled=Disabled
+Add=Add
+AddLink=Add link
+RemoveLink=Remove link
+AddToDraft=Add to draft
+Update=Update
+Close=Close
+CloseBox=Remove widget from your dashboard
+Confirm=Confirm
+ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
+Delete=Delete
+Remove=Remove
+Resiliate=Terminate
+Cancel=Cancel
+Modify=Modify
+Edit=Edit
+Validate=Validate
+ValidateAndApprove=Validate and Approve
+ToValidate=To validate
+NotValidated=Not validated
+Save=Save
+SaveAs=Save As
+SaveAndStay=Save and stay
+SaveAndNew=Save and new
+TestConnection=Test connection
+ToClone=Clone
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
+ConfirmClone=Choose data you want to clone:
+NoCloneOptionsSpecified=No data to clone defined.
+Of=of
+Go=Go
+Run=Run
+CopyOf=Copy of
+Show=Show
+Hide=Hide
+ShowCardHere=Show card
+Search=Search
+SearchOf=Search
+SearchMenuShortCut=Ctrl + shift + f
+Valid=Valid
+Approve=Approve
+Disapprove=Disapprove
+ReOpen=Re-Open
+Upload=Upload
+ToLink=Link
+Select=Select
+Choose=Choose
+Resize=Resize
+ResizeOrCrop=Resize or Crop
+Recenter=Recenter
+Author=Author
+User=User
+Users=Users
+Group=Group
+Groups=Groups
+NoUserGroupDefined=No user group defined
+Password=Password
+PasswordRetype=Retype your password
+NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
+Name=Name
+NameSlashCompany=Name / Company
+Person=Person
+Parameter=Parameter
+Parameters=Parameters
+Value=Value
+PersonalValue=Personal value
+NewObject=New %s
+NewValue=New value
+CurrentValue=Current value
+Code=Code
+Type=Type
+Language=Language
+MultiLanguage=Multi-language
+Note=Note
+Title=Title
+Label=Label
+RefOrLabel=Ref. or label
+Info=Log
+Family=Family
+Description=Description
+Designation=Description
+DescriptionOfLine=Description of line
+DateOfLine=Date of line
+DurationOfLine=Duration of line
+Model=Doc template
+DefaultModel=Default doc template
+Action=Event
+About=About
+Number=Number
+NumberByMonth=Number by month
+AmountByMonth=Amount by month
+Numero=Number
+Limit=Limit
+Limits=Limits
+Logout=Logout
+NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
+Connection=Login
+Setup=Setup
+Alert=Alert
+MenuWarnings=Alerts
+Previous=Previous
+Next=Next
+Cards=Cards
+Card=Card
+Now=Now
+HourStart=Start hour
+Date=Date
+DateAndHour=Date and hour
+DateToday=Today's date
+DateReference=Reference date
+DateStart=Start date
+DateEnd=End date
+DateCreation=Creation date
+DateCreationShort=Creat. date
+DateModification=Modification date
+DateModificationShort=Modif. date
+DateLastModification=Latest modification date
+DateValidation=Validation date
+DateClosing=Closing date
+DateDue=Due date
+DateValue=Value date
+DateValueShort=Value date
+DateOperation=Operation date
+DateOperationShort=Oper. Date
+DateLimit=Limit date
+DateRequest=Request date
+DateProcess=Process date
+DateBuild=Report build date
+DatePayment=Date of payment
+DateApprove=Approving date
+DateApprove2=Approving date (second approval)
+RegistrationDate=Registration date
+UserCreation=Creation user
+UserModification=Modification user
+UserValidation=Validation user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
+UserValidationShort=Valid. user
+DurationYear=year
+DurationMonth=month
+DurationWeek=week
+DurationDay=day
+DurationYears=years
+DurationMonths=months
+DurationWeeks=weeks
+DurationDays=days
+Year=Year
+Month=Month
+Week=Week
+WeekShort=Week
+Day=Day
+Hour=Hour
+Minute=Minute
+Second=Second
+Years=Years
+Months=Months
+Days=Days
+days=days
+Hours=Hours
+Minutes=Minutes
+Seconds=Seconds
+Weeks=Weeks
+Today=Today
+Yesterday=Yesterday
+Tomorrow=Tomorrow
+Morning=Morning
+Afternoon=Afternoon
+Quadri=Quadri
+MonthOfDay=Month of the day
+HourShort=H
+MinuteShort=mn
+Rate=Rate
+CurrencyRate=Currency conversion rate
+UseLocalTax=Include tax
+Bytes=Bytes
+KiloBytes=Kilobytes
+MegaBytes=Megabytes
+GigaBytes=Gigabytes
+TeraBytes=Terabytes
+UserAuthor=User of creation
+UserModif=User of last update
+b=b.
+Kb=Kb
+Mb=Mb
+Gb=Gb
+Tb=Tb
+Cut=Cut
+Copy=Copy
+Paste=Paste
+Default=Default
+DefaultValue=Default value
+DefaultValues=Default values/filters/sorting
+Price=Price
+PriceCurrency=Price (currency)
+UnitPrice=Unit price
+UnitPriceHT=Unit price (excl.)
+UnitPriceHTCurrency=Unit price (excl.) (currency)
+UnitPriceTTC=Unit price
+PriceU=U.P.
+PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
+PriceUTTC=U.P. (inc. tax)
+Amount=Amount
+AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
+AmountInvoicedHT=Amount invoiced (incl. tax)
+AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountPayment=Payment amount
+AmountHTShort=Amount (excl.)
+AmountTTCShort=Amount (inc. tax)
+AmountHT=Amount (excl. tax)
+AmountTTC=Amount (inc. tax)
+AmountVAT=Amount tax
+MulticurrencyAlreadyPaid=Already paid, original currency
+MulticurrencyRemainderToPay=Remain to pay, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+MulticurrencyAmountHT=Amount (excl. tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
+AmountLT1=Amount tax 2
+AmountLT2=Amount tax 3
+AmountLT1ES=Amount RE
+AmountLT2ES=Amount IRPF
+AmountTotal=Total amount
+AmountAverage=Average amount
+PriceQtyMinHT=Price quantity min. (excl. tax)
+PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+Percentage=Percentage
+Total=Total
+SubTotal=Subtotal
+TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
+TotalHTShortCurrency=Total (excl. in currency)
+TotalTTCShort=Total (inc. tax)
+TotalHT=Total (excl. tax)
+TotalHTforthispage=Total (excl. tax) for this page
+Totalforthispage=Total for this page
+TotalTTC=Total (inc. tax)
+TotalTTCToYourCredit=Total (inc. tax) to your credit
+TotalVAT=Total tax
+TotalVATIN=Total IGST
+TotalLT1=Total tax 2
+TotalLT2=Total tax 3
+TotalLT1ES=Total RE
+TotalLT2ES=Total IRPF
+TotalLT1IN=Total CGST
+TotalLT2IN=Total SGST
+HT=Excl. tax
+TTC=Inc. tax
+INCVATONLY=Inc. VAT
+INCT=Inc. all taxes
+VAT=Sales tax
+VATIN=IGST
+VATs=Sales taxes
+VATINs=IGST taxes
+LT1=Sales tax 2
+LT1Type=Sales tax 2 type
+LT2=Sales tax 3
+LT2Type=Sales tax 3 type
+LT1ES=RE
+LT2ES=IRPF
+LT1IN=CGST
+LT2IN=SGST
+LT1GC=Additionnal cents
+VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
+DefaultTaxRate=Default tax rate
+Average=Average
+Sum=Sum
+Delta=Delta
+StatusToPay=To pay
+RemainToPay=Remain to pay
+Module=Module/Application
+Modules=Modules/Applications
+Option=Option
+List=List
+FullList=Full list
+FullConversation=Full conversation
+Statistics=Statistics
+OtherStatistics=Other statistics
+Status=Status
+Favorite=Favorite
+ShortInfo=Info.
+Ref=Ref.
+ExternalRef=Ref. extern
+RefSupplier=Ref. vendor
+RefPayment=Ref. payment
+CommercialProposalsShort=Commercial proposals
+Comment=Comment
+Comments=Comments
+ActionsToDo=Events to do
+ActionsToDoShort=To do
+ActionsDoneShort=Done
+ActionNotApplicable=Not applicable
+ActionRunningNotStarted=To start
+ActionRunningShort=In progress
+ActionDoneShort=Finished
+ActionUncomplete=Incomplete
+LatestLinkedEvents=Latest %s linked events
+CompanyFoundation=Company/Organization
+Accountant=Accountant
+ContactsForCompany=Contacts for this third party
+ContactsAddressesForCompany=Contacts/addresses for this third party
+AddressesForCompany=Addresses for this third party
+ActionsOnCompany=Events for this third party
+ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
+ActionsOnMember=Events about this member
+ActionsOnProduct=Events about this product
+NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
+RequestAlreadyDone=Request already recorded
+Filter=Filter
+FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
+RemoveFilter=Remove filter
+ChartGenerated=Chart generated
+ChartNotGenerated=Chart not generated
+GeneratedOn=Build on %s
+Generate=Generate
+Duration=Duration
+TotalDuration=Total duration
+Summary=Summary
+DolibarrStateBoard=Database Statistics
+DolibarrWorkBoard=Open Items
+NoOpenedElementToProcess=No open element to process
+Available=Available
+NotYetAvailable=Not yet available
+NotAvailable=Not available
+Categories=Tags/categories
+Category=Tag/category
+By=By
+From=From
+FromLocation=From
+to=to
+To=to
+and=and
+or=or
+Other=Other
+Others=Others
+OtherInformations=Other information
+Quantity=Quantity
+Qty=Qty
+ChangedBy=Changed by
+ApprovedBy=Approved by
+ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
+ReCalculate=Recalculate
+ResultKo=Failure
+Reporting=Reporting
+Reportings=Reporting
+Draft=Draft
+Drafts=Drafts
+StatusInterInvoiced=Invoiced
+Validated=Validated
+Opened=Open
+OpenAll=Open (All)
+ClosedAll=Closed (All)
+New=New
+Discount=Discount
+Unknown=Unknown
+General=General
+Size=Size
+OriginalSize=Original size
+Received=Received
+Paid=Paid
+Topic=Subject
+ByCompanies=By third parties
+ByUsers=By user
+Links=Links
+Link=Link
+Rejects=Rejects
+Preview=Preview
+NextStep=Next step
+Datas=Data
+None=None
+NoneF=None
+NoneOrSeveral=None or several
+Late=Late
+LateDesc=An item is defined as Delayed as per the system configuration in menu Home - Setup - Alerts.
+NoItemLate=No late item
+Photo=Picture
+Photos=Pictures
+AddPhoto=Add picture
+DeletePicture=Picture delete
+ConfirmDeletePicture=Confirm picture deletion?
+Login=Login
+LoginEmail=Login (email)
+LoginOrEmail=Login or Email
+CurrentLogin=Current login
+EnterLoginDetail=Enter login details
+January=January
+February=February
+March=March
+April=April
+May=May
+June=June
+July=July
+August=August
+September=September
+October=October
+November=November
+December=December
+Month01=January
+Month02=February
+Month03=March
+Month04=April
+Month05=May
+Month06=June
+Month07=July
+Month08=August
+Month09=September
+Month10=October
+Month11=November
+Month12=December
+MonthShort01=Jan
+MonthShort02=Feb
+MonthShort03=Mar
+MonthShort04=Apr
+MonthShort05=May
+MonthShort06=Jun
+MonthShort07=Jul
+MonthShort08=Aug
+MonthShort09=Sep
+MonthShort10=Oct
+MonthShort11=Nov
+MonthShort12=Dec
+MonthVeryShort01=J
+MonthVeryShort02=F
+MonthVeryShort03=M
+MonthVeryShort04=A
+MonthVeryShort05=M
+MonthVeryShort06=J
+MonthVeryShort07=J
+MonthVeryShort08=A
+MonthVeryShort09=S
+MonthVeryShort10=O
+MonthVeryShort11=N
+MonthVeryShort12=D
+AttachedFiles=Attached files and documents
+JoinMainDoc=Join main document
+DateFormatYYYYMM=YYYY-MM
+DateFormatYYYYMMDD=YYYY-MM-DD
+DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
+ReportName=Report name
+ReportPeriod=Report period
+ReportDescription=Description
+Report=Report
+Keyword=Keyword
+Origin=Origin
+Legend=Legend
+Fill=Fill
+Reset=Reset
+File=File
+Files=Files
+NotAllowed=Not allowed
+ReadPermissionNotAllowed=Read permission not allowed
+AmountInCurrency=Amount in %s currency
+Example=Example
+Examples=Examples
+NoExample=No example
+FindBug=Report a bug
+NbOfThirdParties=Number of third parties
+NbOfLines=Number of lines
+NbOfObjects=Number of objects
+NbOfObjectReferers=Number of related items
+Referers=Related items
+TotalQuantity=Total quantity
+DateFromTo=From %s to %s
+DateFrom=From %s
+DateUntil=Until %s
+Check=Check
+Uncheck=Uncheck
+Internal=Internal
+External=External
+Internals=Internal
+Externals=External
+Warning=Warning
+Warnings=Warnings
+BuildDoc=Build Doc
+Entity=Environment
+Entities=Entities
+CustomerPreview=Customer preview
+SupplierPreview=Vendor preview
+ShowCustomerPreview=Show customer preview
+ShowSupplierPreview=Show vendor preview
+RefCustomer=Ref. customer
+Currency=Currency
+InfoAdmin=Information for administrators
+Undo=Undo
+Redo=Redo
+ExpandAll=Expand all
+UndoExpandAll=Undo expand
+SeeAll=See all
+Reason=Reason
+FeatureNotYetSupported=Feature not yet supported
+CloseWindow=Close window
+Response=Response
+Priority=Priority
+SendByMail=Send by email
+MailSentBy=Email sent by
+TextUsedInTheMessageBody=Email body
+SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
+Email=Email
+NoEMail=No email
+AlreadyRead=Already read
+NotRead=Not read
+NoMobilePhone=No mobile phone
+Owner=Owner
+FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
+Refresh=Refresh
+BackToList=Back to list
+GoBack=Go back
+CanBeModifiedIfOk=Can be modified if valid
+CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
+RecordCreatedSuccessfully=Record created successfully
+RecordModifiedSuccessfully=Record modified successfully
+RecordsModified=%s record(s) modified
+RecordsDeleted=%s record(s) deleted
+RecordsGenerated=%s record(s) generated
+AutomaticCode=Automatic code
+FeatureDisabled=Feature disabled
+MoveBox=Move widget
+Offered=Offered
+NotEnoughPermissions=You don't have permission for this action
+SessionName=Session name
+Method=Method
+Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+PartialWoman=Partial
+TotalWoman=Total
+NeverReceived=Never received
+Canceled=Canceled
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
+YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record in module setup
+Color=Color
+Documents=Linked files
+Documents2=Documents
+UploadDisabled=Upload disabled
+MenuAccountancy=Accounting
+MenuECM=Documents
+MenuAWStats=AWStats
+MenuMembers=Members
+MenuAgendaGoogle=Google agenda
+ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+NoFileFound=No documents saved in this directory
+CurrentUserLanguage=Current language
+CurrentTheme=Current theme
+CurrentMenuManager=Current menu manager
+Browser=Browser
+Layout=Layout
+Screen=Screen
+DisabledModules=Disabled modules
+For=For
+ForCustomer=For customer
+Signature=Signature
+DateOfSignature=Date of signature
+HidePassword=Show command with password hidden
+UnHidePassword=Show real command with clear password
+Root=Root
+RootOfMedias=Root of public medias (/medias)
+Informations=Information
+Page=Page
+Notes=Notes
+AddNewLine=Add new line
+AddFile=Add file
+FreeZone=Not a predefined product/service
+FreeLineOfType=Free-text item, type:
+CloneMainAttributes=Clone object with its main attributes
+ReGeneratePDF=Re-generate PDF
+PDFMerge=PDF Merge
+Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
+PrintContentArea=Show page to print main content area
+MenuManager=Menu manager
+WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
+CoreErrorTitle=System error
+CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
+CreditCard=Credit card
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
+FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
+FieldsWithIsForPublic=Fields with <b>%s</b> are shown in public list of members. If you don't want this, uncheck the "public" box.
+AccordingToGeoIPDatabase=(according to GeoIP conversion)
+Line=Line
+NotSupported=Not supported
+RequiredField=Required field
+Result=Result
+ToTest=Test
+ValidateBefore=Item must be validated before using this feature
+Visibility=Visibility
+Totalizable=Totalizable
+TotalizableDesc=This field is totalizable in list
+Private=Private
+Hidden=Hidden
+Resources=Resources
+Source=Source
+Prefix=Prefix
+Before=Before
+After=After
+IPAddress=IP address
+Frequency=Frequency
+IM=Instant messaging
+NewAttribute=New attribute
+AttributeCode=Attribute code
+URLPhoto=URL of photo/logo
+SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToTemplateInvoice=Link to template invoice
+LinkToSupplierOrder=Link to purchase order
+LinkToSupplierProposal=Link to vendor proposal
+LinkToSupplierInvoice=Link to vendor invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
+CreateDraft=Create draft
+SetToDraft=Back to draft
+ClickToEdit=Click to edit
+ClickToRefresh=Click to refresh
+EditWithEditor=Edit with CKEditor
+EditWithTextEditor=Edit with Text editor
+EditHTMLSource=Edit HTML Source
+ObjectDeleted=Object %s deleted
+ByCountry=By country
+ByTown=By town
+ByDate=By date
+ByMonthYear=By month/year
+ByYear=By year
+ByMonth=By month
+ByDay=By day
+BySalesRepresentative=By sales representative
+LinkedToSpecificUsers=Linked to a particular user contact
+NoResults=No results
+AdminTools=Admin Tools
+SystemTools=System tools
+ModulesSystemTools=Modules tools
+Test=Test
+Element=Element
+NoPhotoYet=No pictures available yet
+Dashboard=Dashboard
+MyDashboard=My Dashboard
+Deductible=Deductible
+from=from
+toward=toward
+Access=Access
+SelectAction=Select action
+SelectTargetUser=Select target user/employee
+HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
+SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
+OriginFileName=Original filename
+SetDemandReason=Set source
+SetBankAccount=Define Bank Account
+AccountCurrency=Account currency
+ViewPrivateNote=View notes
+XMoreLines=%s line(s) hidden
+ShowMoreLines=Show more/less lines
+PublicUrl=Public URL
+AddBox=Add box
+SelectElementAndClick=Select an element and click %s
+PrintFile=Print File %s
+ShowTransaction=Show entry on bank account
+ShowIntervention=Show intervention
+ShowContract=Show contract
+GoIntoSetupToChangeLogo=Go to Home - Setup - Company to change logo or go to Home - Setup - Display to hide.
+Deny=Deny
+Denied=Denied
+ListOf=List of %s
+ListOfTemplates=List of templates
+Gender=Gender
+Genderman=Man
+Genderwoman=Woman
+ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
+Mandatory=Mandatory
+Hello=Hello
+GoodBye=GoodBye
+Sincerely=Sincerely
+ConfirmDeleteObject=Are you sure you want to delete this object?
+DeleteLine=Delete line
+ConfirmDeleteLine=Are you sure you want to delete this line?
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records.
+NoRecordSelected=No record selected
+MassFilesArea=Area for files built by mass actions
+ShowTempMassFilesArea=Show area of files built by mass actions
+ConfirmMassDeletion=Bulk Delete confirmation
+ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
+RelatedObjects=Related Objects
+ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
+Progress=Progress
+ProgressShort=Progr.
+FrontOffice=Front office
+BackOffice=Back office
+Submit=Submit
+View=View
+Export=Export
+Exports=Exports
+ExportFilteredList=Export filtered list
+ExportList=Export list
+ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
+Miscellaneous=Miscellaneous
+Calendar=Calendar
+GroupBy=Group by...
+ViewFlatList=View flat list
+RemoveString=Remove string '%s'
+SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+DirectDownloadLink=Direct download link (public/external)
+DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+Download=Download
+DownloadDocument=Download document
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
+ModuleBuilder=Module and Application Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status?
+ImportId=Import id
+Events=Events
+EMailTemplates=Email templates
+FileNotShared=File not shared to external public
+Project=Project
+Projects=Projects
+LeadOrProject=Lead | Project
+LeadsOrProjects=Leads | Projects
+Lead=Lead
+Leads=Leads
+ListOpenLeads=List open leads
+ListOpenProjects=List open projects
+NewLeadOrProject=New lead or project
+Rights=Permissions
+LineNb=Line no.
+IncotermLabel=Incoterms
+TabLetteringCustomer=Customer lettering
+TabLetteringSupplier=Vendor lettering
+Monday=Monday
+Tuesday=Tuesday
+Wednesday=Wednesday
+Thursday=Thursday
+Friday=Friday
+Saturday=Saturday
+Sunday=Sunday
+MondayMin=Mo
+TuesdayMin=Tu
+WednesdayMin=We
+ThursdayMin=Th
+FridayMin=Fr
+SaturdayMin=Sa
+SundayMin=Su
+Day1=Monday
+Day2=Tuesday
+Day3=Wednesday
+Day4=Thursday
+Day5=Friday
+Day6=Saturday
+Day0=Sunday
+ShortMonday=M
+ShortTuesday=T
+ShortWednesday=W
+ShortThursday=T
+ShortFriday=F
+ShortSaturday=S
+ShortSunday=S
+SelectMailModel=Select an email template
+SetRef=Set ref
+Select2ResultFoundUseArrows=Some results found. Use arrows to select.
+Select2NotFound=No result found
+Select2Enter=Enter
+Select2MoreCharacter=or more character
+Select2MoreCharacters=or more characters
+Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
+Select2LoadingMoreResults=Loading more results...
+Select2SearchInProgress=Search in progress...
+SearchIntoThirdparties=Third parties
+SearchIntoContacts=Contacts
+SearchIntoMembers=Members
+SearchIntoUsers=Users
+SearchIntoProductsOrServices=Products or services
+SearchIntoProjects=Projects
+SearchIntoMO=Manufacturing Orders
+SearchIntoTasks=Tasks
+SearchIntoCustomerInvoices=Customer invoices
+SearchIntoSupplierInvoices=Vendor invoices
+SearchIntoCustomerOrders=Sales orders
+SearchIntoSupplierOrders=Purchase orders
+SearchIntoCustomerProposals=Commercial proposals
+SearchIntoSupplierProposals=Vendor proposals
+SearchIntoInterventions=Interventions
+SearchIntoContracts=Contracts
+SearchIntoCustomerShipments=Customer shipments
+SearchIntoExpenseReports=Expense reports
+SearchIntoLeaves=Leave
+SearchIntoTickets=Tickets
+CommentLink=Comments
+NbComments=Number of comments
+CommentPage=Comments space
+CommentAdded=Comment added
+CommentDeleted=Comment deleted
+Everybody=Everybody
+PayedBy=Paid by
+PayedTo=Paid to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft mass delete confirmation
+FileSharedViaALink=File shared via a link
+SelectAThirdPartyFirst=Select a third party first...
+YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
+AnalyticCode=Analytic code
+TMenuMRP=MRP
+ShowMoreInfos=Show More Infos
+NoFilesUploadedYet=Please upload a document first
+SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
+ContactDefault_agenda=Event
+ContactDefault_commande=Order
+ContactDefault_contrat=Contract
+ContactDefault_facture=Invoice
+ContactDefault_fichinter=Intervention
+ContactDefault_invoice_supplier=Supplier Invoice
+ContactDefault_order_supplier=Purchase Order
+ContactDefault_project=Project
+ContactDefault_project_task=Task
+ContactDefault_propal=Proposal
+ContactDefault_supplier_proposal=Supplier Proposal
+ContactDefault_ticket=Ticket
+ContactAddedAutomatically=Contact added from contact thirdparty roles
+More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+StatisticsOn=Statistics on
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
+Measures=Measures
+XAxis=X-Axis
+YAxis=Y-Axis
+StatusOfRefMustBe=Status of %s must be %s
+DeleteFileHeader=Confirm file delete
+DeleteFileText=Do you really want delete this file?
+ShowOtherLanguages=Show other languages
+SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
+NotUsedForThisCustomer=Not used for this customer
diff --git a/htdocs/langs/bn_IN/margins.lang b/htdocs/langs/bn_IN/margins.lang
new file mode 100644
index 00000000000..76ea8ad5c4d
--- /dev/null
+++ b/htdocs/langs/bn_IN/margins.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - marges
+
+Margin=Margin
+Margins=Margins
+TotalMargin=Total Margin
+MarginOnProducts=Margin / Products
+MarginOnServices=Margin / Services
+MarginRate=Margin rate
+MarkRate=Mark rate
+DisplayMarginRates=Display margin rates
+DisplayMarkRates=Display mark rates
+InputPrice=Input price
+margin=Profit margins management
+margesSetup=Profit margins management setup
+MarginDetails=Margin details
+ProductMargins=Product margins
+CustomerMargins=Customer margins
+SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
+UserMargins=User margins
+ProductService=Product or Service
+AllProducts=All products and services
+ChooseProduct/Service=Choose product or service
+ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
+ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
+UseDiscountAsProduct=As a product
+UseDiscountAsService=As a service
+UseDiscountOnTotal=On subtotal
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
+MargeType1=Margin on Best vendor price
+MargeType2=Margin on Weighted Average Price (WAP)
+MargeType3=Margin on Cost Price
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
+CostPrice=Cost price
+UnitCharges=Unit charges
+Charges=Charges
+AgentContactType=Commercial agent contact type
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
+CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/bn_IN/members.lang b/htdocs/langs/bn_IN/members.lang
new file mode 100644
index 00000000000..dd0a5bf49e2
--- /dev/null
+++ b/htdocs/langs/bn_IN/members.lang
@@ -0,0 +1,204 @@
+# Dolibarr language file - Source file is en_US - members
+MembersArea=Members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of terminated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Terminated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
+DateSubscription=Subscription date
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=Subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Terminated member
+MemberStatusResiliatedShort=Terminated
+MembersStatusToValid=Draft members
+MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Validated
+SubscriptionNotNeeded=No subscription needed
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+MemberTypeModified=Member type modified
+DeleteAMemberType=Delete a member type
+ConfirmDeleteMemberType=Are you sure you want to delete this member type?
+MemberTypeDeleted=Member type deleted
+MemberTypeCanNotBeDeleted=Member type can not be deleted
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome email
+SubscriptionRequired=Subscription required
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Terminate a member
+ConfirmResiliateMember=Are you sure you want to terminate this member?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions)?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public self-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public website with self-subscription form
+ForceMemberType=Force the member type
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembersModified=Latest %s modified members
+LastSubscriptionsModified=Latest %s modified subscriptions
+String=String
+Text=Text
+Int=Int
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+SubscriptionNotRecorded=Subscription not recorded
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct entry on bank account
+MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Latest member date
+LatestSubscriptionDate=Latest subscription date
+MemberNature=Nature of member
+Public=Information are public
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No VAT for subscriptions
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
+MembershipPaid=Membership paid for current period (until %s)
+YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
+XMembersClosed=%s member(s) closed
diff --git a/htdocs/langs/bn_IN/modulebuilder.lang b/htdocs/langs/bn_IN/modulebuilder.lang
new file mode 100644
index 00000000000..135ac1ae9ec
--- /dev/null
+++ b/htdocs/langs/bn_IN/modulebuilder.lang
@@ -0,0 +1,141 @@
+# Dolibarr language file - Source file is en_US - loan
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
+ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
+ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
+ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
+NewModule=New module
+NewObjectInModulebuilder=New object
+ModuleKey=Module key
+ObjectKey=Object key
+ModuleInitialized=Module initialized
+FilesForObjectInitialized=Files for new object '%s' initialized
+FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
+ModuleBuilderDescdescription=Enter here all general information that describe your module.
+ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
+ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
+ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
+ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
+ModuleBuilderDeschooks=This tab is dedicated to hooks.
+ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
+ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
+DangerZone=Danger zone
+BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
+BuildDocumentation=Build documentation
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
+DescriptionLong=Long description
+EditorName=Name of editor
+EditorUrl=URL of editor
+DescriptorFile=Descriptor file of module
+ClassFile=File for PHP DAO CRUD class
+ApiClassFile=File for PHP API class
+PageForList=PHP page for list of record
+PageForCreateEditView=PHP page to create/edit/view a record
+PageForAgendaTab=PHP page for event tab
+PageForDocumentTab=PHP page for document tab
+PageForNoteTab=PHP page for note tab
+PathToModulePackage=Path to zip of module/application package
+PathToModuleDocumentation=Path to file of module/application documentation (%s)
+SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
+FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Force update of .class and .sql files
+RegenerateMissingFiles=Generate missing files
+SpecificationFile=File of documentation
+LanguageFile=File for language
+ObjectProperties=Object Properties
+ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
+NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
+SearchAll=Used for 'search all'
+DatabaseIndex=Database index
+FileAlreadyExists=File %s already exists
+TriggersFile=File for triggers code
+HooksFile=File for hooks code
+ArrayOfKeyValues=Array of key-val
+ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
+WidgetFile=Widget file
+CSSFile=CSS file
+JSFile=Javascript file
+ReadmeFile=Readme file
+ChangeLog=ChangeLog file
+TestClassFile=File for PHP Unit Test class
+SqlFile=Sql file
+PageForLib=File for the common PHP library
+PageForObjLib=File for the PHP library dedicated to object
+SqlFileExtraFields=Sql file for complementary attributes
+SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
+AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
+UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Is a measure
+DirScanned=Directory scanned
+NoTrigger=No trigger
+NoWidget=No widget
+GoToApiExplorer=Go to API explorer
+ListOfMenusEntries=List of menu entries
+ListOfDictionariesEntries=List of dictionaries entries
+ListOfPermissionsDefined=List of defined permissions
+SeeExamples=See examples here
+EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdf=Display on PDF
+IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
+SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
+SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
+LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
+MenusDefDesc=Define here the menus provided by your module
+DictionariesDefDesc=Define here the dictionaries provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
+HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
+TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
+SeeIDsInUse=See IDs in use in your installation
+SeeReservedIDsRangeHere=See range of reserved IDs
+ToolkitForDevelopers=Toolkit for Dolibarr developers
+TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
+SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
+AddLanguageFile=Add language file
+YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
+DropTableIfEmpty=(Delete table if empty)
+TableDoesNotExists=The table %s does not exists
+TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
+UseAboutPage=Disable the about page
+UseDocFolder=Disable the documentation folder
+UseSpecificReadme=Use a specific ReadMe
+ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
+RealPathOfModule=Real path of module
+ContentCantBeEmpty=Content of file can't be empty
+WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
+CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
+JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
+CLIDesc=You can generate here some command line scripts you want to provide with your module.
+CLIFile=CLI File
+NoCLIFile=No CLI files
+UseSpecificEditorName = Use a specific editor name
+UseSpecificEditorURL = Use a specific editor URL
+UseSpecificFamily = Use a specific family
+UseSpecificAuthor = Use a specific author
+UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
+IncludeRefGeneration=The reference of object must be generated automatically
+IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
+IncludeDocGeneration=I want to generate some documents from the object
+IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
+ShowOnCombobox=Show value into combobox
+KeyForTooltip=Key for tooltip
+CSSClass=CSS Class
+NotEditable=Not editable
+ForeignKey=Foreign key
+TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/bn_IN/mrp.lang b/htdocs/langs/bn_IN/mrp.lang
new file mode 100644
index 00000000000..d3c4d3253c6
--- /dev/null
+++ b/htdocs/langs/bn_IN/mrp.lang
@@ -0,0 +1,76 @@
+Mrp=Manufacturing Orders
+MO=Manufacturing Order
+MRPDescription=Module to manage production and Manufacturing Orders (MO).
+MRPArea=MRP Area
+MrpSetupPage=Setup of module MRP
+MenuBOM=Bills of material
+LatestBOMModified=Latest %s Bills of materials modified
+LatestMOModified=Latest %s Manufacturing Orders modified
+Bom=Bills of Material
+BillOfMaterials=Bill of Material
+BOMsSetup=Setup of module BOM
+ListOfBOMs=List of bills of material - BOM
+ListOfManufacturingOrders=List of Manufacturing Orders
+NewBOM=New bill of material
+ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+BOMsNumberingModules=BOM numbering templates
+BOMsModelModule=BOM document templates
+MOsNumberingModules=MO numbering templates
+MOsModelModule=MO document templates
+FreeLegalTextOnBOMs=Free text on document of BOM
+WatermarkOnDraftBOMs=Watermark on draft BOM
+FreeLegalTextOnMOs=Free text on document of MO
+WatermarkOnDraftMOs=Watermark on draft MO
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
+ManufacturingEfficiency=Manufacturing efficiency
+ConsumptionEfficiency=Consumption efficiency
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
+DeleteBillOfMaterials=Delete Bill Of Materials
+DeleteMo=Delete Manufacturing Order
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+MenuMRP=Manufacturing Orders
+NewMO=New Manufacturing Order
+QtyToProduce=Qty to produce
+DateStartPlannedMo=Date start planned
+DateEndPlannedMo=Date end planned
+KeepEmptyForAsap=Empty means 'As Soon As Possible'
+EstimatedDuration=Estimated duration
+EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
+ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
+ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
+StatusMOProduced=Produced
+QtyFrozen=Frozen Qty
+QuantityFrozen=Frozen Quantity
+QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
+DisableStockChange=Stock change disabled
+DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
+BomAndBomLines=Bills Of Material and lines
+BOMLine=Line of BOM
+WarehouseForProduction=Warehouse for production
+CreateMO=Create MO
+ToConsume=To consume
+ToProduce=To produce
+QtyAlreadyConsumed=Qty already consumed
+QtyAlreadyProduced=Qty already produced
+QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
+ConsumeOrProduce=Consume or Produce
+ConsumeAndProduceAll=Consume and Produce All
+Manufactured=Manufactured
+TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
+ForAQuantityOf=For a quantity to produce of %s
+ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
+ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
+ProductionForRef=Production of %s
+AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
+NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
+AddNewConsumeLines=Add new line to consume
+ProductsToConsume=Products to consume
+ProductsToProduce=Products to produce
+UnitCost=Unit cost
+TotalCost=Total cost
diff --git a/htdocs/langs/bn_IN/multicurrency.lang b/htdocs/langs/bn_IN/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/bn_IN/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/bn_IN/oauth.lang b/htdocs/langs/bn_IN/oauth.lang
new file mode 100644
index 00000000000..075ff49a895
--- /dev/null
+++ b/htdocs/langs/bn_IN/oauth.lang
@@ -0,0 +1,32 @@
+# Dolibarr language file - Source file is en_US - oauth
+ConfigOAuth=OAuth Configuration
+OAuthServices=OAuth Services
+ManualTokenGeneration=Manual token generation
+TokenManager=Token Manager
+IsTokenGenerated=Is token generated ?
+NoAccessToken=No access token saved into local database
+HasAccessToken=A token was generated and saved into local database
+NewTokenStored=Token received and saved
+ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
+TokenDeleted=Token deleted
+RequestAccess=Click here to request/renew access and receive a new token to save
+DeleteAccess=Click here to delete token
+UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
+ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
+OAuthSetupForLogin=Page to generate an OAuth token
+SeePreviousTab=See previous tab
+OAuthIDSecret=OAuth ID and Secret
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=OAuth Google service
+OAUTH_GOOGLE_ID=OAuth Google Id
+OAUTH_GOOGLE_SECRET=OAuth Google Secret
+OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create OAuth credentials
+OAUTH_GITHUB_NAME=OAuth GitHub service
+OAUTH_GITHUB_ID=OAuth GitHub Id
+OAUTH_GITHUB_SECRET=OAuth GitHub Secret
+OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create OAuth credentials
+OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
+OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/bn_IN/opensurvey.lang b/htdocs/langs/bn_IN/opensurvey.lang
new file mode 100644
index 00000000000..7d26151fa16
--- /dev/null
+++ b/htdocs/langs/bn_IN/opensurvey.lang
@@ -0,0 +1,61 @@
+# Dolibarr language file - Source file is en_US - opensurvey
+Survey=Poll
+Surveys=Polls
+OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select the type of poll...
+NewSurvey=New poll
+OpenSurveyArea=Polls area
+AddACommentForPoll=You can add a comment into poll...
+AddComment=Add comment
+CreatePoll=Create poll
+PollTitle=Poll title
+ToReceiveEMailForEachVote=Receive an email for each vote
+TypeDate=Type date
+TypeClassic=Type standard
+OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
+RemoveAllDays=Remove all days
+CopyHoursOfFirstDay=Copy hours of first day
+RemoveAllHours=Remove all hours
+SelectedDays=Selected days
+TheBestChoice=The best choice currently is
+TheBestChoices=The best choices currently are
+with=with
+OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
+CommentsOfVoters=Comments of voters
+ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
+RemovePoll=Remove poll
+UrlForSurvey=URL to communicate to get a direct access to poll
+PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
+CreateSurveyDate=Create a date poll
+CreateSurveyStandard=Create a standard poll
+CheckBox=Simple checkbox
+YesNoList=List (empty/yes/no)
+PourContreList=List (empty/for/against)
+AddNewColumn=Add new column
+TitleChoice=Choice label
+ExportSpreadsheet=Export result spreadsheet
+ExpireDate=Limit date
+NbOfSurveys=Number of polls
+NbOfVoters=No. of voters
+SurveyResults=Results
+PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
+5MoreChoices=5 more choices
+Against=Against
+YouAreInivitedToVote=You are invited to vote for this poll
+VoteNameAlreadyExists=This name was already used for this poll
+AddADate=Add a date
+AddStartHour=Add start hour
+AddEndHour=Add end hour
+votes=vote(s)
+NoCommentYet=No comments have been posted for this poll yet
+CanComment=Voters can comment in the poll
+CanSeeOthersVote=Voters can see other people's vote
+SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
+BackToCurrentMonth=Back to current month
+ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
+ErrorOpenSurveyOneChoice=Enter at least one choice
+ErrorInsertingComment=There was an error while inserting your comment
+MoreChoices=Enter more choices for the voters
+SurveyExpiredInfo=The poll has been closed or voting delay has expired.
+EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
+ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/bn_IN/orders.lang b/htdocs/langs/bn_IN/orders.lang
new file mode 100644
index 00000000000..ad91e1eef63
--- /dev/null
+++ b/htdocs/langs/bn_IN/orders.lang
@@ -0,0 +1,189 @@
+# Dolibarr language file - Source file is en_US - orders
+OrdersArea=Customers orders area
+SuppliersOrdersArea=Purchase orders area
+OrderCard=Order card
+OrderId=Order Id
+Order=Order
+PdfOrderTitle=Order
+Orders=Orders
+OrderLine=Order line
+OrderDate=Order date
+OrderDateShort=Order date
+OrderToProcess=Order to process
+NewOrder=New order
+NewOrderSupplier=New Purchase Order
+ToOrder=Make order
+MakeOrder=Make order
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Sales Order
+CustomersOrders=Sales Orders
+CustomersOrdersRunning=Current sales orders
+CustomersOrdersAndOrdersLines=Sales orders and order details
+OrdersDeliveredToBill=Sales orders delivered to bill
+OrdersToBill=Sales orders delivered
+OrdersInProcess=Sales orders in process
+OrdersToProcess=Sales orders to process
+SuppliersOrdersToProcess=Purchase orders to process
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
+StatusOrderCanceledShort=Canceled
+StatusOrderDraftShort=Draft
+StatusOrderValidatedShort=Validated
+StatusOrderSentShort=In process
+StatusOrderSent=Shipment in process
+StatusOrderOnProcessShort=Ordered
+StatusOrderProcessedShort=Processed
+StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
+StatusOrderToBillShort=Delivered
+StatusOrderApprovedShort=Approved
+StatusOrderRefusedShort=Refused
+StatusOrderToProcessShort=To process
+StatusOrderReceivedPartiallyShort=Partially received
+StatusOrderReceivedAllShort=Products received
+StatusOrderCanceled=Canceled
+StatusOrderDraft=Draft (needs to be validated)
+StatusOrderValidated=Validated
+StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderProcessed=Processed
+StatusOrderToBill=Delivered
+StatusOrderApproved=Approved
+StatusOrderRefused=Refused
+StatusOrderReceivedPartially=Partially received
+StatusOrderReceivedAll=All products received
+ShippingExist=A shipment exists
+QtyOrdered=Qty ordered
+ProductQtyInDraft=Product quantity into draft orders
+ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
+MenuOrdersToBill=Orders delivered
+MenuOrdersToBill2=Billable orders
+ShipProduct=Ship product
+CreateOrder=Create Order
+RefuseOrder=Refuse order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
+ValidateOrder=Validate order
+UnvalidateOrder=Unvalidate order
+DeleteOrder=Delete order
+CancelOrder=Cancel order
+OrderReopened= Order %s re-open
+AddOrder=Create order
+AddPurchaseOrder=Create purchase order
+AddToDraftOrders=Add to draft order
+ShowOrder=Show order
+OrdersOpened=Orders to process
+NoDraftOrders=No draft orders
+NoOrder=No order
+NoSupplierOrder=No purchase order
+LastOrders=Latest %s sales orders
+LastCustomerOrders=Latest %s sales orders
+LastSupplierOrders=Latest %s purchase orders
+LastModifiedOrders=Latest %s modified orders
+AllOrders=All orders
+NbOfOrders=Number of orders
+OrdersStatistics=Order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
+NumberOfOrdersByMonth=Number of orders by month
+AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
+ListOfOrders=List of orders
+CloseOrder=Close order
+ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
+ConfirmDeleteOrder=Are you sure you want to delete this order?
+ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b>?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status?
+ConfirmCancelOrder=Are you sure you want to cancel this order?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
+GenerateBill=Generate invoice
+ClassifyShipped=Classify delivered
+DraftOrders=Draft orders
+DraftSuppliersOrders=Draft purchase orders
+OnProcessOrders=In process orders
+RefOrder=Ref. order
+RefCustomerOrder=Ref. order for customer
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
+SendOrderByMail=Send order by mail
+ActionsOnOrder=Events on order
+NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
+OrderMode=Order method
+AuthorRequest=Request author
+UserWithApproveOrderGrant=Users granted with "approve orders" permission.
+PaymentOrderRef=Payment of order %s
+ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
+DispatchSupplierOrder=Receiving purchase order %s
+FirstApprovalAlreadyDone=First approval already done
+SecondApprovalAlreadyDone=Second approval already done
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
+OtherOrders=Other orders
+##### Types de contacts #####
+TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
+TypeContact_commande_internal_SHIPPING=Representative following-up shipping
+TypeContact_commande_external_BILLING=Customer invoice contact
+TypeContact_commande_external_SHIPPING=Customer shipping contact
+TypeContact_commande_external_CUSTOMER=Customer contact following-up order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
+TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
+Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
+Error_OrderNotChecked=No orders to invoice selected
+# Order modes (how we receive order). Not the "why" are keys stored into dict.lang
+OrderByMail=Mail
+OrderByFax=Fax
+OrderByEMail=Email
+OrderByWWW=Online
+OrderByPhone=Phone
+# Documents models
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
+PDFEratostheneDescription=A complete order model
+PDFEdisonDescription=A simple order model
+PDFProformaDescription=A complete Proforma invoice template
+CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
+IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
+SetShippingMode=Set shipping mode
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Canceled
+StatusSupplierOrderDraftShort=Draft
+StatusSupplierOrderValidatedShort=Validated
+StatusSupplierOrderSentShort=In process
+StatusSupplierOrderSent=Shipment in process
+StatusSupplierOrderOnProcessShort=Ordered
+StatusSupplierOrderProcessedShort=Processed
+StatusSupplierOrderDelivered=Delivered
+StatusSupplierOrderDeliveredShort=Delivered
+StatusSupplierOrderToBillShort=Delivered
+StatusSupplierOrderApprovedShort=Approved
+StatusSupplierOrderRefusedShort=Refused
+StatusSupplierOrderToProcessShort=To process
+StatusSupplierOrderReceivedPartiallyShort=Partially received
+StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderCanceled=Canceled
+StatusSupplierOrderDraft=Draft (needs to be validated)
+StatusSupplierOrderValidated=Validated
+StatusSupplierOrderOnProcess=Ordered - Standby reception
+StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusSupplierOrderProcessed=Processed
+StatusSupplierOrderToBill=Delivered
+StatusSupplierOrderApproved=Approved
+StatusSupplierOrderRefused=Refused
+StatusSupplierOrderReceivedPartially=Partially received
+StatusSupplierOrderReceivedAll=All products received
diff --git a/htdocs/langs/bn_IN/other.lang b/htdocs/langs/bn_IN/other.lang
new file mode 100644
index 00000000000..ba85f51e739
--- /dev/null
+++ b/htdocs/langs/bn_IN/other.lang
@@ -0,0 +1,286 @@
+# Dolibarr language file - Source file is en_US - other
+SecurityCode=Security code
+NumberingShort=N°
+Tools=Tools
+TMenuTools=Tools
+ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
+Birthday=Birthday
+BirthdayDate=Birthday date
+DateToBirth=Birth date
+BirthdayAlertOn=birthday alert active
+BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (text) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+DocFileGeneratedInto=Doc file generated into <b>%s</b>.
+JumpToLogin=Disconnected. Go to login page...
+MessageForm=Message on online payment form
+MessageOK=Message on the return page for a validated payment
+MessageKO=Message on the return page for a canceled payment
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursively
+PoweredBy=Powered by
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+DateNextInvoiceBeforeGen=Date of next invoice (before generation)
+DateNextInvoiceAfterGen=Date of next invoice (after generation)
+GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
+OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Only the first selected field has been selected.
+AtLeastOneMeasureIsRequired=At least 1 field for measure is required
+AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
+LatestBlogPosts=Latest Blog Posts
+Notify_ORDER_VALIDATE=Sales order validated
+Notify_ORDER_SENTBYMAIL=Sales order sent by mail
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
+Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
+Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
+Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
+Notify_PROPAL_VALIDATE=Customer proposal validated
+Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
+Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
+Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
+Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
+Notify_WITHDRAW_CREDIT=Credit withdrawal
+Notify_WITHDRAW_EMIT=Perform withdrawal
+Notify_COMPANY_CREATE=Third party created
+Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_BILL_VALIDATE=Customer invoice validated
+Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_BILL_PAYED=Customer invoice paid
+Notify_BILL_CANCEL=Customer invoice canceled
+Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
+Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
+Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
+Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
+Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
+Notify_CONTRACT_VALIDATE=Contract validated
+Notify_FICHINTER_VALIDATE=Intervention validated
+Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
+Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
+Notify_SHIPPING_VALIDATE=Shipping validated
+Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail
+Notify_MEMBER_VALIDATE=Member validated
+Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_SUBSCRIPTION=Member subscribed
+Notify_MEMBER_RESILIATE=Member terminated
+Notify_MEMBER_DELETE=Member deleted
+Notify_PROJECT_CREATE=Project creation
+Notify_TASK_CREATE=Task created
+Notify_TASK_MODIFY=Task modified
+Notify_TASK_DELETE=Task deleted
+Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
+Notify_EXPENSE_REPORT_APPROVE=Expense report approved
+Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
+Notify_HOLIDAY_APPROVE=Leave request approved
+SeeModuleSetup=See setup of module %s
+NbOfAttachedFiles=Number of attached files/documents
+TotalSizeOfAttachedFiles=Total size of attached files/documents
+MaxSize=Maximum size
+AttachANewFile=Attach a new file/document
+LinkedObject=Linked object
+NbOfActiveNotifications=Number of notifications (no. of recipient emails)
+PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to remind you that the invoice  __REF__ seems to have not been paid. A copy of the invoice is attached as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find commercial proposal __REF__ attached \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price request __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
+ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
+DemoFundation=Manage members of a foundation
+DemoFundation2=Manage members and bank account of a foundation
+DemoCompanyServiceOnly=Company or freelance selling service only
+DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
+DemoCompanyAll=Company with multiple activities (all main modules)
+CreatedBy=Created by %s
+ModifiedBy=Modified by %s
+ValidatedBy=Validated by %s
+ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made latest change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made latest change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
+FileWasRemoved=File %s was removed
+DirWasRemoved=Directory %s was removed
+FeatureNotYetAvailable=Feature not yet available in the current version
+FeaturesSupported=Supported features
+Width=Width
+Height=Height
+Depth=Depth
+Top=Top
+Bottom=Bottom
+Left=Left
+Right=Right
+CalculatedWeight=Calculated weight
+CalculatedVolume=Calculated volume
+Weight=Weight
+WeightUnitton=tonne
+WeightUnitkg=kg
+WeightUnitg=g
+WeightUnitmg=mg
+WeightUnitpound=pound
+WeightUnitounce=ounce
+Length=Length
+LengthUnitm=m
+LengthUnitdm=dm
+LengthUnitcm=cm
+LengthUnitmm=mm
+Surface=Area
+SurfaceUnitm2=m²
+SurfaceUnitdm2=dm²
+SurfaceUnitcm2=cm²
+SurfaceUnitmm2=mm²
+SurfaceUnitfoot2=ft²
+SurfaceUnitinch2=in²
+Volume=Volume
+VolumeUnitm3=m³
+VolumeUnitdm3=dm³ (L)
+VolumeUnitcm3=cm³ (ml)
+VolumeUnitmm3=mm³ (µl)
+VolumeUnitfoot3=ft³
+VolumeUnitinch3=in³
+VolumeUnitounce=ounce
+VolumeUnitlitre=litre
+VolumeUnitgallon=gallon
+SizeUnitm=m
+SizeUnitdm=dm
+SizeUnitcm=cm
+SizeUnitmm=mm
+SizeUnitinch=inch
+SizeUnitfoot=foot
+SizeUnitpoint=point
+BugTracker=Bug tracker
+SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
+BackToLoginPage=Back to login page
+AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
+EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
+ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
+DolibarrDemo=Dolibarr ERP/CRM demo
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of sales orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of vendor proposals
+NumberOfSupplierOrders=Number of purchase orders
+NumberOfSupplierInvoices=Number of vendor invoices
+NumberOfContracts=Number of contracts
+NumberOfMos=Number of manufacturing orders
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on sales orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on vendor proposals
+NumberOfUnitsSupplierOrders=Number of units on purchase orders
+NumberOfUnitsSupplierInvoices=Number of units on vendor invoices
+NumberOfUnitsContracts=Number of units on contracts
+NumberOfUnitsMos=Number of units to produce in manufacturing orders
+EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
+EMailTextInterventionValidated=The intervention %s has been validated.
+EMailTextInvoiceValidated=Invoice %s has been validated.
+EMailTextInvoicePayed=Invoice %s has been paid.
+EMailTextProposalValidated=Proposal %s has been validated.
+EMailTextProposalClosedSigned=Proposal %s has been closed signed.
+EMailTextOrderValidated=Order %s has been validated.
+EMailTextOrderApproved=Order %s has been approved.
+EMailTextOrderValidatedBy=Order %s has been recorded by %s.
+EMailTextOrderApprovedBy=Order %s has been approved by %s.
+EMailTextOrderRefused=Order %s has been refused.
+EMailTextOrderRefusedBy=Order %s has been refused by %s.
+EMailTextExpeditionValidated=Shipping %s has been validated.
+EMailTextExpenseReportValidated=Expense report %s has been validated.
+EMailTextExpenseReportApproved=Expense report %s has been approved.
+EMailTextHolidayValidated=Leave request %s has been validated.
+EMailTextHolidayApproved=Leave request %s has been approved.
+ImportedWithSet=Importation data set
+DolibarrNotification=Automatic notification
+ResizeDesc=Enter new width <b>OR</b> new height. Ratio will be kept during resizing...
+NewLength=New width
+NewHeight=New height
+NewSizeAfterCropping=New size after cropping
+DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner)
+CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
+ImageEditor=Image editor
+YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s.
+YouReceiveMailBecauseOfNotification2=This event is the following:
+ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start".
+UseAdvancedPerms=Use the advanced permissions of some modules
+FileFormat=File format
+SelectAColor=Choose a color
+AddFiles=Add Files
+StartUpload=Start upload
+CancelUpload=Cancel upload
+FileIsTooBig=Files is too big
+PleaseBePatient=Please be patient...
+NewPassword=New password
+ResetPassword=Reset password
+RequestToResetPasswordReceived=A request to change your password has been received.
+NewKeyIs=This is your new keys to login
+NewKeyWillBe=Your new key to login to software will be
+ClickHereToGoTo=Click here to go to %s
+YouMustClickToChange=You must however first click on the following link to validate this password change
+ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
+Chart=Chart
+PassEncoding=Password encoding
+PermissionsAdd=Permissions added
+PermissionsDelete=Permissions removed
+YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+YourPasswordHasBeenReset=Your password has been reset successfully
+ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+MissingIds=Missing ids
+ThirdPartyCreatedByEmailCollector=Third party created by email collector from email MSGID %s
+ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s
+ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
+TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
+OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+
+##### Export #####
+ExportsArea=Exports area
+AvailableFormats=Available formats
+LibraryUsed=Library used
+LibraryVersion=Library version
+ExportableDatas=Exportable data
+NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
+##### External sites #####
+WebsiteSetup=Setup of module website
+WEBSITE_PAGEURL=URL of page
+WEBSITE_TITLE=Title
+WEBSITE_DESCRIPTION=Description
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
+WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
+
+MemoryUsage=Memory usage
+RequestDuration=Duration of request
+PopuProp=Products/Services by popularity in Proposals
+PopuCom=Products/Services by popularity in Orders
+ProductStatistics=Products/Services Statistics
+NbOfQtyInOrders=Qty in orders
diff --git a/htdocs/langs/bn_IN/paybox.lang b/htdocs/langs/bn_IN/paybox.lang
new file mode 100644
index 00000000000..1bbbef4017b
--- /dev/null
+++ b/htdocs/langs/bn_IN/paybox.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - paybox
+PayBoxSetup=PayBox module setup
+PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+Creditor=Creditor
+PaymentCode=Payment code
+PayBoxDoPayment=Pay with Paybox
+YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
+Continue=Next
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
+YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/bn_IN/paypal.lang b/htdocs/langs/bn_IN/paypal.lang
new file mode 100644
index 00000000000..5eb5f389445
--- /dev/null
+++ b/htdocs/langs/bn_IN/paypal.lang
@@ -0,0 +1,36 @@
+# Dolibarr language file - Source file is en_US - paypal
+PaypalSetup=PayPal module setup
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
+PAYPAL_API_SANDBOX=Mode test/sandbox
+PAYPAL_API_USER=API username
+PAYPAL_API_PASSWORD=API password
+PAYPAL_API_SIGNATURE=API signature
+PAYPAL_SSLVERSION=Curl SSL Version
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
+PaypalModeIntegral=Integral
+PaypalModeOnlyPaypal=PayPal only
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
+ThisIsTransactionId=This is id of transaction: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
+NewOnlinePaymentReceived=New online payment received
+NewOnlinePaymentFailed=New online payment tried but failed
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
+ReturnURLAfterPayment=Return URL after payment
+ValidationOfOnlinePaymentFailed=Validation of online payment failed
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
+DetailedErrorMessage=Detailed Error Message
+ShortErrorMessage=Short Error Message
+ErrorCode=Error Code
+ErrorSeverityCode=Error Severity Code
+OnlinePaymentSystem=Online payment system
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/bn_IN/printing.lang b/htdocs/langs/bn_IN/printing.lang
new file mode 100644
index 00000000000..16494583550
--- /dev/null
+++ b/htdocs/langs/bn_IN/printing.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - printing
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
+PrintingSetup=Setup of Direct Printing System
+PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer without needing to open the document in another application.
+MenuDirectPrinting=Direct Printing jobs
+DirectPrint=Direct print
+PrintingDriverDesc=Configuration variables for printing driver.
+ListDrivers=List of drivers
+PrintTestDesc=List of Printers.
+FileWasSentToPrinter=File %s was sent to printer
+ViaModule=via the module
+NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
+PleaseSelectaDriverfromList=Please select a driver from list.
+PleaseConfigureDriverfromList=Please configure the selected driver from list.
+SetupDriver=Driver setup
+TargetedPrinter=Targeted printer
+UserConf=Setup per user
+PRINTGCP_INFO=Google OAuth API setup
+PRINTGCP_AUTHLINK=Authentication
+PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
+PrintGCPDesc=This driver allows sending documents directly to a printer using Google Cloud Print.
+GCP_Name=Name
+GCP_displayName=Display Name
+GCP_Id=Printer Id
+GCP_OwnerName=Owner Name
+GCP_State=Printer State
+GCP_connectionStatus=Online State
+GCP_Type=Printer Type
+PrintIPPDesc=This driver allows sending of documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+IPP_Uri=Printer Uri
+IPP_Name=Printer Name
+IPP_State=Printer State
+IPP_State_reason=State reason
+IPP_State_reason1=State reason1
+IPP_BW=BW
+IPP_Color=Color
+IPP_Device=Device
+IPP_Media=Printer media
+IPP_Supported=Type of media
+DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
+GoogleAuthNotConfigured=Google OAuth has not been setup. Enable module OAuth and set a Google ID/Secret.
+GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
+PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
+PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
+PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+PrintTestDescprintipp=List of Printers for Cups.
diff --git a/htdocs/langs/bn_IN/productbatch.lang b/htdocs/langs/bn_IN/productbatch.lang
new file mode 100644
index 00000000000..54270c4a23b
--- /dev/null
+++ b/htdocs/langs/bn_IN/productbatch.lang
@@ -0,0 +1,24 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Use lot/serial number
+ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusNotOnBatch=No (lot/serial not used)
+ProductStatusOnBatchShort=Yes
+ProductStatusNotOnBatchShort=No
+Batch=Lot/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
+batch_number=Lot/Serial number
+BatchNumberShort=Lot/Serial
+EatByDate=Eat-by date
+SellByDate=Sell-by date
+DetailBatchNumber=Lot/Serial details
+printBatch=Lot/Serial: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
+StockDetailPerBatch=Stock detail per lot
diff --git a/htdocs/langs/bn_IN/products.lang b/htdocs/langs/bn_IN/products.lang
new file mode 100644
index 00000000000..a31243a07b6
--- /dev/null
+++ b/htdocs/langs/bn_IN/products.lang
@@ -0,0 +1,385 @@
+# Dolibarr language file - Source file is en_US - products
+ProductRef=Product ref.
+ProductLabel=Product label
+ProductLabelTranslated=Translated product label
+ProductDescription=Product description
+ProductDescriptionTranslated=Translated product description
+ProductNoteTranslated=Translated product note
+ProductServiceCard=Products/Services card
+TMenuProducts=Products
+TMenuServices=Services
+Products=Products
+Services=Services
+Product=Product
+Service=Service
+ProductId=Product/service id
+Create=Create
+Reference=Reference
+NewProduct=New product
+NewService=New service
+ProductVatMassChange=Global VAT Update
+ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
+MassBarcodeInit=Mass barcode init
+MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
+ProductAccountancyBuyCode=Accounting code (purchase)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
+ProductAccountancySellCode=Accounting code (sale)
+ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
+ProductAccountancySellExportCode=Accounting code (sale export)
+ProductOrService=Product or Service
+ProductsAndServices=Products and Services
+ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
+ProductsOnSale=Products for sale
+ProductsOnPurchase=Products for purchase
+ProductsOnSaleOnly=Products for sale only
+ProductsOnPurchaseOnly=Products for purchase only
+ProductsNotOnSell=Products not for sale and not for purchase
+ProductsOnSellAndOnBuy=Products for sale and for purchase
+ServicesOnSale=Services for sale
+ServicesOnPurchase=Services for purchase
+ServicesOnSaleOnly=Services for sale only
+ServicesOnPurchaseOnly=Services for purchase only
+ServicesNotOnSell=Services not for sale and not for purchase
+ServicesOnSellAndOnBuy=Services for sale and for purchase
+LastModifiedProductsAndServices=Last %s modified products/services
+LastRecordedProducts=Latest %s recorded products
+LastRecordedServices=Latest %s recorded services
+CardProduct0=Product
+CardProduct1=Service
+Stock=Stock
+MenuStocks=Stocks
+Stocks=Stocks and location (warehouse) of products
+Movements=Movements
+Sell=Sell
+Buy=Purchase
+OnSell=For sale
+OnBuy=For purchase
+NotOnSell=Not for sale
+ProductStatusOnSell=For sale
+ProductStatusNotOnSell=Not for sale
+ProductStatusOnSellShort=For sale
+ProductStatusNotOnSellShort=Not for sale
+ProductStatusOnBuy=For purchase
+ProductStatusNotOnBuy=Not for purchase
+ProductStatusOnBuyShort=For purchase
+ProductStatusNotOnBuyShort=Not for purchase
+UpdateVAT=Update vat
+UpdateDefaultPrice=Update default price
+UpdateLevelPrices=Update prices for each level
+AppliedPricesFrom=Applied from
+SellingPrice=Selling price
+SellingPriceHT=Selling price (excl. tax)
+SellingPriceTTC=Selling price (inc. tax)
+SellingMinPriceTTC=Minimum Selling price (inc. tax)
+CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceUsage=This value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
+NewPrice=New price
+MinPrice=Min. sell price
+EditSellingPriceLabel=Edit selling price label
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
+ContractStatusClosed=Closed
+ErrorProductAlreadyExists=A product with reference %s already exists.
+ErrorProductBadRefOrLabel=Wrong value for reference or label.
+ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
+Suppliers=Vendors
+SupplierRef=Vendor SKU
+ShowProduct=Show product
+ShowService=Show service
+ProductsAndServicesArea=Product and Services area
+ProductsArea=Product area
+ServicesArea=Services area
+ListOfStockMovements=List of stock movements
+BuyingPrice=Buying price
+PriceForEachProduct=Products with specific prices
+SupplierCard=Vendor card
+PriceRemoved=Price removed
+BarCode=Barcode
+BarcodeType=Barcode type
+SetDefaultBarcodeType=Set barcode type
+BarcodeValue=Barcode value
+NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
+ServiceLimitedDuration=If product is a service with limited duration:
+MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
+MultiPricesNumPrices=Number of prices
+AssociatedProductsAbility=Activate virtual products (kits)
+AssociatedProducts=Virtual products
+AssociatedProductsNumber=Number of products composing this virtual product
+ParentProductsNumber=Number of parent packaging product
+ParentProducts=Parent products
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+KeywordFilter=Keyword filter
+CategoryFilter=Category filter
+ProductToAddSearch=Search product to add
+NoMatchFound=No match found
+ListOfProductsServices=List of products/services
+ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
+ProductParentList=List of virtual products/services with this product as a component
+ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
+DeleteProduct=Delete a product/service
+ConfirmDeleteProduct=Are you sure you want to delete this product/service?
+ProductDeleted=Product/Service "%s" deleted from database.
+ExportDataset_produit_1=Products
+ExportDataset_service_1=Services
+ImportDataset_produit_1=Products
+ImportDataset_service_1=Services
+DeleteProductLine=Delete product line
+ConfirmDeleteProductLine=Are you sure you want to delete this product line?
+ProductSpecial=Special
+QtyMin=Min. purchase quantity
+PriceQtyMin=Price quantity min.
+PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
+VATRateForSupplierProduct=VAT Rate (for this vendor/product)
+DiscountQtyMin=Discount for this qty.
+NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
+NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedProductsToSell=Predefined Product
+PredefinedServicesToSell=Predefined Service
+PredefinedProductsAndServicesToSell=Predefined products/services to sell
+PredefinedProductsToPurchase=Predefined product to purchase
+PredefinedServicesToPurchase=Predefined services to purchase
+PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
+NotPredefinedProducts=Not predefined products/services
+GenerateThumb=Generate thumb
+ServiceNb=Service #%s
+ListProductServiceByPopularity=List of products/services by popularity
+ListProductByPopularity=List of products by popularity
+ListServiceByPopularity=List of services by popularity
+Finished=Manufactured product
+RowMaterial=Raw Material
+ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
+CloneContentProduct=Clone all main information of product/service
+ClonePricesProduct=Clone prices
+CloneCategoriesProduct=Clone tags/categories linked
+CloneCompositionProduct=Clone virtual product/service
+CloneCombinationsProduct=Clone product variants
+ProductIsUsed=This product is used
+NewRefForClone=Ref. of new product/service
+SellingPrices=Selling prices
+BuyingPrices=Buying prices
+CustomerPrices=Customer prices
+SuppliersPrices=Vendor prices
+SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
+CustomCode=Customs / Commodity / HS code
+CountryOrigin=Origin country
+Nature=Nature of product (material/finished)
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+lm=lm
+m2=m²
+m3=m³
+liter=liter
+l=L
+unitP=Piece
+unitSET=Set
+unitS=Second
+unitH=Hour
+unitD=Day
+unitG=Gram
+unitM=Meter
+unitLM=Linear meter
+unitM2=Square meter
+unitM3=Cubic meter
+unitL=Liter
+unitT=ton
+unitKG=kg
+unitG=Gram
+unitMG=mg
+unitLB=pound
+unitOZ=ounce
+unitM=Meter
+unitDM=dm
+unitCM=cm
+unitMM=mm
+unitFT=ft
+unitIN=in
+unitM2=Square meter
+unitDM2=dm²
+unitCM2=cm²
+unitMM2=mm²
+unitFT2=ft²
+unitIN2=in²
+unitM3=Cubic meter
+unitDM3=dm³
+unitCM3=cm³
+unitMM3=mm³
+unitFT3=ft³
+unitIN3=in³
+unitOZ3=ounce
+unitgallon=gallon
+ProductCodeModel=Product ref template
+ServiceCodeModel=Service ref template
+CurrentProductPrice=Current price
+AlwaysUseNewPrice=Always use current price of product/service
+AlwaysUseFixedPrice=Use the fixed price
+PriceByQuantity=Different prices by quantity
+DisablePriceByQty=Disable prices by quantity
+PriceByQuantityRange=Quantity range
+MultipriceRules=Price segment rules
+UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
+PercentVariationOver=%% variation over %s
+PercentDiscountOver=%% discount over %s
+KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
+VariantRefExample=Examples: COL, SIZE
+VariantLabelExample=Examples: Color, Size
+### composition fabrication
+Build=Produce
+ProductsMultiPrice=Products and prices for each price segment
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
+ProductSellByQuarterHT=Products turnover quarterly before tax
+ServiceSellByQuarterHT=Services turnover quarterly before tax
+Quarter1=1st. Quarter
+Quarter2=2nd. Quarter
+Quarter3=3rd. Quarter
+Quarter4=4th. Quarter
+BarCodePrintsheet=Print barcode
+PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
+NumberOfStickers=Number of stickers to print on page
+PrintsheetForOneBarCode=Print several stickers for one barcode
+BuildPageToPrint=Generate page to print
+FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
+FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
+DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
+BarCodeDataForProduct=Barcode information of product %s:
+BarCodeDataForThirdparty=Barcode information of third party %s:
+ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
+PriceByCustomer=Different prices for each customer
+PriceCatalogue=A single sell price per product/service
+PricingRule=Rules for selling prices
+AddCustomerPrice=Add price by customer
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+PriceByCustomerLog=Log of previous customer prices
+MinimumPriceLimit=Minimum price can't be lower then %s
+MinimumRecommendedPrice=Minimum recommended price is: %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
+PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=Available global values:
+PriceMode=Price mode
+PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Child products
+MinSupplierPrice=Minimum buying price
+MinCustomerPrice=Minimum selling price
+DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
+AddVariable=Add Variable
+AddUpdater=Add Updater
+GlobalVariables=Global variables
+VariableToUpdate=Variable to update
+GlobalVariableUpdaters=External updaters for variables
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Latest update
+CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product/service with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
+WarningSelectOneDocument=Please select at least one document
+DefaultUnitToShow=Unit
+NbOfQtyInProposals=Qty in proposals
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+ProductsOrServicesTranslations=Products/Services translations
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+WidthUnits=Width unit
+LengthUnits=Length unit
+HeightUnits=Height unit
+SurfaceUnits=Surface unit
+SizeUnits=Size unit
+DeleteProductBuyPrice=Delete buying price
+ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
+ProductSheet=Product sheet
+ServiceSheet=Service sheet
+PossibleValues=Possible values
+GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
+ProductSupplierDescription=Vendor description for the product
+UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
+PackagingForThisProduct=Packaging
+QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+
+#Attributes
+VariantAttributes=Variant attributes
+ProductAttributes=Variant attributes for products
+ProductAttributeName=Variant attribute %s
+ProductAttribute=Variant attribute
+ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
+ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
+ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
+ProductCombinations=Variants
+PropagateVariant=Propagate variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+NewProductCombinations=New variants
+EditProductCombinations=Editing variants
+SelectCombination=Select combination
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+NewProductAttributeValue=New attribute value
+ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
+ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
+TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
+DoNotRemovePreviousCombinations=Do not remove previous variants
+UsePercentageVariations=Use percentage variations
+PercentageVariation=Percentage variation
+ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
+NbOfDifferentValues=No. of different values
+NbProducts=Number of products
+ParentProduct=Parent product
+HideChildProducts=Hide variant products
+ShowChildProducts=Show variant products
+NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
+ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
+CloneDestinationReference=Destination product reference
+ErrorCopyProductCombinations=There was an error while copying the product variants
+ErrorDestinationProductNotFound=Destination product not found
+ErrorProductCombinationNotFound=Product variant not found
+ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
+ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
+DeleteLinkedProduct=Delete the child product linked to the combination
diff --git a/htdocs/langs/bn_IN/projects.lang b/htdocs/langs/bn_IN/projects.lang
new file mode 100644
index 00000000000..bb42bff3c87
--- /dev/null
+++ b/htdocs/langs/bn_IN/projects.lang
@@ -0,0 +1,267 @@
+# Dolibarr language file - Source file is en_US - projects
+RefProject=Ref. project
+ProjectRef=Project ref.
+ProjectId=Project Id
+ProjectLabel=Project label
+ProjectsArea=Projects Area
+ProjectStatus=Project status
+SharedProject=Everybody
+PrivateProject=Project contacts
+ProjectsImContactFor=Projects for I am explicitly a contact
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=All projects
+MyProjectsDesc=This view is limited to projects you are a contact for
+ProjectsPublicDesc=This view presents all projects you are allowed to read.
+TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
+TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
+ClosedProjectsAreHidden=Closed projects are not visible.
+TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
+TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
+NewProject=New project
+AddProject=Create project
+DeleteAProject=Delete a project
+DeleteATask=Delete a task
+ConfirmDeleteAProject=Are you sure you want to delete this project?
+ConfirmDeleteATask=Are you sure you want to delete this task?
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
+OpportunitiesStatusForProjects=Leads amount of projects by status
+ShowProject=Show project
+ShowTask=Show task
+SetProject=Set project
+NoProject=No project defined or owned
+NbOfProjects=Number of projects
+NbOfTasks=Number of tasks
+TimeSpent=Time spent
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
+TimesSpent=Time spent
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
+TaskTimeSpent=Time spent on tasks
+TaskTimeUser=User
+TaskTimeNote=Note
+TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on open projects
+WorkloadNotDefined=Workload not defined
+NewTimeSpent=Time spent
+MyTimeSpent=My time spent
+BillTime=Bill the time spent
+BillTimeShort=Bill time
+TimeToBill=Time not billed
+TimeBilled=Time billed
+Tasks=Tasks
+Task=Task
+TaskDateStart=Task start date
+TaskDateEnd=Task end date
+TaskDescription=Task description
+NewTask=New task
+AddTask=Create task
+AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
+AddHereTimeSpentForWeek=Add here time spent for this week/task
+Activity=Activity
+Activities=Tasks/activities
+MyActivities=My tasks/activities
+MyProjects=My projects
+MyProjectsArea=My projects Area
+DurationEffective=Effective duration
+ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently open tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
+ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
+Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GanttView=Gantt View
+ListProposalsAssociatedProject=List of the commercial proposals related to the project
+ListOrdersAssociatedProject=List of sales orders related to the project
+ListInvoicesAssociatedProject=List of customer invoices related to the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
+ListSupplierOrdersAssociatedProject=List of purchase orders related to the project
+ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project
+ListContractAssociatedProject=List of contracts related to the project
+ListShippingAssociatedProject=List of shippings related to the project
+ListFichinterAssociatedProject=List of interventions related to the project
+ListExpenseReportsAssociatedProject=List of expense reports related to the project
+ListDonationsAssociatedProject=List of donations related to the project
+ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
+ListSalariesAssociatedProject=List of payments of salaries related to the project
+ListActionsAssociatedProject=List of events related to the project
+ListMOAssociatedProject=List of manufacturing orders related to the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
+ActivityOnProjectToday=Activity on project today
+ActivityOnProjectYesterday=Activity on project yesterday
+ActivityOnProjectThisWeek=Activity on project this week
+ActivityOnProjectThisMonth=Activity on project this month
+ActivityOnProjectThisYear=Activity on project this year
+ChildOfProjectTask=Child of project/task
+ChildOfTask=Child of task
+TaskHasChild=Task has child
+NotOwnerOfProject=Not owner of this private project
+AffectedTo=Allocated to
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
+ValidateProject=Validate projet
+ConfirmValidateProject=Are you sure you want to validate this project?
+CloseAProject=Close project
+ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+ReOpenAProject=Open project
+ConfirmReOpenAProject=Are you sure you want to re-open this project?
+ProjectContact=Contacts of project
+TaskContact=Task contacts
+ActionsOnProject=Events on project
+YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
+DeleteATimeSpent=Delete time spent
+ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
+TaskRessourceLinks=Contacts of task
+ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
+NoTasks=No tasks for this project
+LinkedToAnotherCompany=Linked to other third party
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
+ErrorTimeSpentIsEmpty=Time spent is empty
+ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
+IfNeedToUseOtherObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
+CloneTasks=Clone tasks
+CloneContacts=Clone contacts
+CloneNotes=Clone notes
+CloneProjectFiles=Clone project joined files
+CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
+CloneMoveDate=Update project/tasks dates from now?
+ConfirmCloneProject=Are you sure to clone this project?
+ProjectReportDate=Change task dates according to new project start date
+ErrorShiftTaskDate=Impossible to shift task date according to new project start date
+ProjectsAndTasksLines=Projects and tasks
+ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
+ProjectModifiedInDolibarr=Project %s modified
+TaskCreatedInDolibarr=Task %s created
+TaskModifiedInDolibarr=Task %s modified
+TaskDeletedInDolibarr=Task %s deleted
+OpportunityStatus=Lead status
+OpportunityStatusShort=Lead status
+OpportunityProbability=Lead probability
+OpportunityProbabilityShort=Lead probab.
+OpportunityAmount=Lead amount
+OpportunityAmountShort=Lead amount
+OpportunityWeightedAmount=Opportunity weighted amount
+OpportunityWeightedAmountShort=Opp. weighted amount
+OpportunityAmountAverageShort=Average lead amount
+OpportunityAmountWeigthedShort=Weighted lead amount
+WonLostExcluded=Won/Lost excluded
+##### Types de contacts #####
+TypeContact_project_internal_PROJECTLEADER=Project leader
+TypeContact_project_external_PROJECTLEADER=Project leader
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_task_internal_TASKEXECUTIVE=Task executive
+TypeContact_project_task_external_TASKEXECUTIVE=Task executive
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
+TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
+SelectElement=Select element
+AddElement=Link to element
+# Documents models
+DocumentModelBeluga=Project document template for linked objects overview
+DocumentModelBaleine=Project document template for tasks
+DocumentModelTimeSpent=Project report template for time spent
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+ProjectReferers=Related items
+ProjectMustBeValidatedFirst=Project must be validated first
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerMonth=Input per month
+InputDetail=Input detail
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTheTask=Not assigned to the task
+NoUserAssignedToTheProject=No users assigned to this project
+TimeSpentBy=Time spent by
+TasksAssignedTo=Tasks assigned to
+AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
+AssignTask=Assign
+ProjectOverview=Overview
+ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
+ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
+ProjectNbProjectByMonth=No. of created projects by month
+ProjectNbTaskByMonth=No. of created tasks by month
+ProjectOppAmountOfProjectsByMonth=Amount of leads by month
+ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
+ProjectOpenedProjectByOppStatus=Open project/lead by lead status
+ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
+TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
+IdTaskTime=Id task time
+YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
+OpenedProjectsByThirdparties=Open projects by third parties
+OnlyOpportunitiesShort=Only leads
+OpenedOpportunitiesShort=Open leads
+NotOpenedOpportunitiesShort=Not an open lead
+NotAnOpportunityShort=Not a lead
+OpportunityTotalAmount=Total amount of leads
+OpportunityPonderatedAmount=Weighted amount of leads
+OpportunityPonderatedAmountDesc=Leads amount weighted with probability
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWON=Won
+OppStatusLOST=Lost
+Budget=Budget
+AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
+LatestProjects=Latest %s projects
+LatestModifiedProjects=Latest %s modified projects
+OtherFilteredTasks=Other filtered tasks
+NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
+ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+# Comments trans
+AllowCommentOnTask=Allow user comments on tasks
+AllowCommentOnProject=Allow user comments on projects
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=Information project %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
+NewTaskRefSuggested=Task ref already used, a new task ref is required
+TimeSpentInvoiced=Time spent billed
+TimeSpentForInvoice=Time spent
+OneLinePerUser=One line per user
+ServiceToUseOnLines=Service to use on lines
+InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
+ProjectFollowOpportunity=Follow opportunity
+ProjectFollowTasks=Follow tasks or time spent
+Usage=Usage
+UsageOpportunity=Usage: Opportunity
+UsageTasks=Usage: Tasks
+UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=New invoice
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/bn_IN/propal.lang b/htdocs/langs/bn_IN/propal.lang
new file mode 100644
index 00000000000..71d6857c909
--- /dev/null
+++ b/htdocs/langs/bn_IN/propal.lang
@@ -0,0 +1,86 @@
+# Dolibarr language file - Source file is en_US - propal
+Proposals=Commercial proposals
+Proposal=Commercial proposal
+ProposalShort=Proposal
+ProposalsDraft=Draft commercial proposals
+ProposalsOpened=Open commercial proposals
+CommercialProposal=Commercial proposal
+PdfCommercialProposalTitle=Commercial proposal
+ProposalCard=Proposal card
+NewProp=New commercial proposal
+NewPropal=New proposal
+Prospect=Prospect
+DeleteProp=Delete commercial proposal
+ValidateProp=Validate commercial proposal
+AddProp=Create proposal
+ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
+ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
+LastPropals=Latest %s proposals
+LastModifiedProposals=Latest %s modified proposals
+AllPropals=All proposals
+SearchAProposal=Search a proposal
+NoProposal=No proposal
+ProposalsStatistics=Commercial proposal's statistics
+NumberOfProposalsByMonth=Number by month
+AmountOfProposalsByMonthHT=Amount by month (excl. tax)
+NbOfProposals=Number of commercial proposals
+ShowPropal=Show proposal
+PropalsDraft=Drafts
+PropalsOpened=Open
+PropalStatusDraft=Draft (needs to be validated)
+PropalStatusValidated=Validated (proposal is open)
+PropalStatusSigned=Signed (needs billing)
+PropalStatusNotSigned=Not signed (closed)
+PropalStatusBilled=Billed
+PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated (open)
+PropalStatusClosedShort=Closed
+PropalStatusSignedShort=Signed
+PropalStatusNotSignedShort=Not signed
+PropalStatusBilledShort=Billed
+PropalsToClose=Commercial proposals to close
+PropalsToBill=Signed commercial proposals to bill
+ListOfProposals=List of commercial proposals
+ActionsOnPropal=Events on proposal
+RefProposal=Commercial proposal ref
+SendPropalByMail=Send commercial proposal by mail
+DatePropal=Date of proposal
+DateEndPropal=Validity ending date
+ValidityDuration=Validity duration
+CloseAs=Set status to
+SetAcceptedRefused=Set accepted/refused
+ErrorPropalNotFound=Propal %s not found
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
+CopyPropalFrom=Create commercial proposal by copying existing proposal
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
+DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
+ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
+ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
+ProposalsAndProposalsLines=Commercial proposal and lines
+ProposalLine=Proposal line
+AvailabilityPeriod=Availability delay
+SetAvailability=Set availability delay
+AfterOrder=after order
+OtherProposals=Other proposals
+##### Availability #####
+AvailabilityTypeAV_NOW=Immediate
+AvailabilityTypeAV_1W=1 week
+AvailabilityTypeAV_2W=2 weeks
+AvailabilityTypeAV_3W=3 weeks
+AvailabilityTypeAV_1M=1 month
+##### Types de contacts #####
+TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
+TypeContact_propal_external_BILLING=Customer invoice contact
+TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
+TypeContact_propal_external_SHIPPING=Customer contact for delivery
+# Document models
+DocModelAzurDescription=A complete proposal model (old implementation of Cyan template)
+DocModelCyanDescription=A complete proposal model
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
+ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/bn_IN/receiptprinter.lang b/htdocs/langs/bn_IN/receiptprinter.lang
new file mode 100644
index 00000000000..896eaa313dd
--- /dev/null
+++ b/htdocs/langs/bn_IN/receiptprinter.lang
@@ -0,0 +1,95 @@
+# Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
+PrinterAdded=Printer %s added
+PrinterUpdated=Printer %s updated
+PrinterDeleted=Printer %s deleted
+TestSentToPrinter=Test Sent To Printer %s
+ReceiptPrinter=Receipt printers
+ReceiptPrinterDesc=Setup of receipt printers
+ReceiptPrinterTemplateDesc=Setup of Templates
+ReceiptPrinterTypeDesc=Description of Receipt Printer's type
+ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
+ListPrinters=List of Printers
+SetupReceiptTemplate=Template Setup
+CONNECTOR_DUMMY=Dummy Printer
+CONNECTOR_NETWORK_PRINT=Network Printer
+CONNECTOR_FILE_PRINT=Local Printer
+CONNECTOR_WINDOWS_PRINT=Local Windows Printer
+CONNECTOR_CUPS_PRINT=Cups Printer
+CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
+CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
+CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
+CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
+PROFILE_DEFAULT=Default Profile
+PROFILE_SIMPLE=Simple Profile
+PROFILE_EPOSTEP=Epos Tep Profile
+PROFILE_P822D=P822D Profile
+PROFILE_STAR=Star Profile
+PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
+PROFILE_SIMPLE_HELP=Simple Profile No Graphics
+PROFILE_EPOSTEP_HELP=Epos Tep Profile
+PROFILE_P822D_HELP=P822D Profile No Graphics
+PROFILE_STAR_HELP=Star Profile
+DOL_LINE_FEED=Skip line
+DOL_ALIGN_LEFT=Left align text
+DOL_ALIGN_CENTER=Center text
+DOL_ALIGN_RIGHT=Right align text
+DOL_USE_FONT_A=Use font A of printer
+DOL_USE_FONT_B=Use font B of printer
+DOL_USE_FONT_C=Use font C of printer
+DOL_PRINT_BARCODE=Print barcode
+DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
+DOL_CUT_PAPER_FULL=Cut ticket completely
+DOL_CUT_PAPER_PARTIAL=Cut ticket partially
+DOL_OPEN_DRAWER=Open cash drawer
+DOL_ACTIVATE_BUZZER=Activate buzzer
+DOL_PRINT_QRCODE=Print QR Code
+DOL_PRINT_LOGO=Print logo of my company
+DOL_PRINT_LOGO_OLD=Print logo of my company (old printers)
+DOL_BOLD=Bold
+DOL_BOLD_DISABLED=Disable bold
+DOL_DOUBLE_HEIGHT=Double height size
+DOL_DOUBLE_WIDTH=Double width size
+DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
+DOL_UNDERLINE=Enable underline
+DOL_UNDERLINE_DISABLED=Disable underline
+DOL_BEEP=Beed sound
+DOL_PRINT_TEXT=Print text
+DOL_VALUE_DATE=Invoice date
+DOL_VALUE_DATE_TIME=Invoice date and time
+DOL_VALUE_YEAR=Invoice year
+DOL_VALUE_MONTH_LETTERS=Invoice month in letters
+DOL_VALUE_MONTH=Invoice month
+DOL_VALUE_DAY=Invoice day
+DOL_VALUE_DAY_LETTERS=Inovice day in letters
+DOL_LINE_FEED_REVERSE=Line feed reverse
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Invoice ref
+DOL_PRINT_OBJECT_LINES=Invoice lines
+DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
+DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
+DOL_VALUE_CUSTOMER_MAIL=Customer mail
+DOL_VALUE_CUSTOMER_PHONE=Customer phone
+DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
+DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
+DOL_VALUE_MYSOC_NAME=Your company name
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/bn_IN/receptions.lang b/htdocs/langs/bn_IN/receptions.lang
new file mode 100644
index 00000000000..010a7521846
--- /dev/null
+++ b/htdocs/langs/bn_IN/receptions.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - receptions
+ReceptionsSetup=Product Reception setup
+RefReception=Ref. reception
+Reception=Reception
+Receptions=Receptions
+AllReceptions=All Receptions
+Reception=Reception
+Receptions=Receptions
+ShowReception=Show Receptions
+ReceptionsArea=Receptions area
+ListOfReceptions=List of receptions
+ReceptionMethod=Reception method
+LastReceptions=Latest %s receptions
+StatisticsOfReceptions=Statistics for receptions
+NbOfReceptions=Number of receptions
+NumberOfReceptionsByMonth=Number of receptions by month
+ReceptionCard=Reception card
+NewReception=New reception
+CreateReception=Create reception
+QtyInOtherReceptions=Qty in other receptions
+OtherReceptionsForSameOrder=Other receptions for this order
+ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
+ReceptionsToValidate=Receptions to validate
+StatusReceptionCanceled=Canceled
+StatusReceptionDraft=Draft
+StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionProcessed=Processed
+StatusReceptionDraftShort=Draft
+StatusReceptionValidatedShort=Validated
+StatusReceptionProcessedShort=Processed
+ReceptionSheet=Reception sheet
+ConfirmDeleteReception=Are you sure you want to delete this reception?
+ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
+ConfirmCancelReception=Are you sure you want to cancel this reception?
+StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
+SendReceptionByEMail=Send reception by email
+SendReceptionRef=Submission of reception %s
+ActionsOnReception=Events on reception
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the order card.
+ReceptionLine=Reception line
+ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
+ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
+ReceptionsNumberingModules=Numbering module for receptions
+ReceptionsReceiptModel=Document templates for receptions
diff --git a/htdocs/langs/bn_IN/resource.lang b/htdocs/langs/bn_IN/resource.lang
new file mode 100644
index 00000000000..e8574dc680f
--- /dev/null
+++ b/htdocs/langs/bn_IN/resource.lang
@@ -0,0 +1,39 @@
+# Dolibarr language file - Source file is en_US - resource
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+ActionsOnResource=Events about this resource
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResource=Show resource
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+SelectResource=Select resource
+
+IdResource=Id resource
+AssetNumber=Serial number
+ResourceTypeCode=Resource type code
+ImportDataset_resource_1=Resources
+
+ErrorResourcesAlreadyInUse=Some resources are in use
+ErrorResourceUseInEvent=%s used in %s event
diff --git a/htdocs/langs/bn_IN/salaries.lang b/htdocs/langs/bn_IN/salaries.lang
new file mode 100644
index 00000000000..7c3c08a65bd
--- /dev/null
+++ b/htdocs/langs/bn_IN/salaries.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+Salary=Salary
+Salaries=Salaries
+NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
+SalaryPayment=Salary payment
+SalariesPayments=Salaries payments
+ShowSalaryPayment=Show salary payment
+THM=Average hourly rate
+TJM=Average daily rate
+CurrentSalary=Current salary
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/bn_IN/sendings.lang b/htdocs/langs/bn_IN/sendings.lang
new file mode 100644
index 00000000000..5ce3b7f67e9
--- /dev/null
+++ b/htdocs/langs/bn_IN/sendings.lang
@@ -0,0 +1,74 @@
+# Dolibarr language file - Source file is en_US - sendings
+RefSending=Ref. shipment
+Sending=Shipment
+Sendings=Shipments
+AllSendings=All Shipments
+Shipment=Shipment
+Shipments=Shipments
+ShowSending=Show Shipments
+Receivings=Delivery Receipts
+SendingsArea=Shipments area
+ListOfSendings=List of shipments
+SendingMethod=Shipping method
+LastSendings=Latest %s shipments
+StatisticsOfSendings=Statistics for shipments
+NbOfSendings=Number of shipments
+NumberOfShipmentsByMonth=Number of shipments by month
+SendingCard=Shipment card
+NewSending=New shipment
+CreateShipment=Create shipment
+QtyShipped=Qty shipped
+QtyShippedShort=Qty ship.
+QtyPreparedOrShipped=Qty prepared or shipped
+QtyToShip=Qty to ship
+QtyToReceive=Qty to receive
+QtyReceived=Qty received
+QtyInOtherShipments=Qty in other shipments
+KeepToShip=Remain to ship
+KeepToShipShort=Remain
+OtherSendingsForSameOrder=Other shipments for this order
+SendingsAndReceivingForSameOrder=Shipments and receipts for this order
+SendingsToValidate=Shipments to validate
+StatusSendingCanceled=Canceled
+StatusSendingDraft=Draft
+StatusSendingValidated=Validated (products to ship or already shipped)
+StatusSendingProcessed=Processed
+StatusSendingDraftShort=Draft
+StatusSendingValidatedShort=Validated
+StatusSendingProcessedShort=Processed
+SendingSheet=Shipment sheet
+ConfirmDeleteSending=Are you sure you want to delete this shipment?
+ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
+ConfirmCancelSending=Are you sure you want to cancel this shipment?
+DocumentModelMerou=Merou A5 model
+WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+DateDeliveryPlanned=Planned date of delivery
+RefDeliveryReceipt=Ref delivery receipt
+StatusReceipt=Status delivery receipt
+DateReceived=Date delivery received
+ClassifyReception=Classify reception
+SendShippingByEMail=Send shipment by email
+SendShippingRef=Submission of shipment %s
+ActionsOnShipping=Events on shipment
+LinkToTrackYourPackage=Link to track your package
+ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
+ShipmentLine=Shipment line
+ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
+ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
+ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
+NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+
+# Sending methods
+# ModelDocument
+DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty: %d)
diff --git a/htdocs/langs/bn_IN/sms.lang b/htdocs/langs/bn_IN/sms.lang
new file mode 100644
index 00000000000..055085eb16a
--- /dev/null
+++ b/htdocs/langs/bn_IN/sms.lang
@@ -0,0 +1,51 @@
+# Dolibarr language file - Source file is en_US - sms
+Sms=Sms
+SmsSetup=SMS setup
+SmsDesc=This page allows you to define global options on SMS features
+SmsCard=SMS Card
+AllSms=All SMS campaigns
+SmsTargets=Targets
+SmsRecipients=Targets
+SmsRecipient=Target
+SmsTitle=Description
+SmsFrom=Sender
+SmsTo=Target
+SmsTopic=Topic of SMS
+SmsText=Message
+SmsMessage=SMS Message
+ShowSms=Show SMS
+ListOfSms=List SMS campaigns
+NewSms=New SMS campaign
+EditSms=Edit SMS
+ResetSms=New sending
+DeleteSms=Delete SMS campaign
+DeleteASms=Remove a SMS campaign
+PreviewSms=Previuw SMS
+PrepareSms=Prepare SMS
+CreateSms=Create SMS
+SmsResult=Result of SMS sending
+TestSms=Test SMS
+ValidSms=Validate SMS
+ApproveSms=Approve SMS
+SmsStatusDraft=Draft
+SmsStatusValidated=Validated
+SmsStatusApproved=Approved
+SmsStatusSent=Sent
+SmsStatusSentPartialy=Sent partially
+SmsStatusSentCompletely=Sent completely
+SmsStatusError=Error
+SmsStatusNotSent=Not sent
+SmsSuccessfulySent=SMS correctly sent (from %s to %s)
+ErrorSmsRecipientIsEmpty=Number of target is empty
+WarningNoSmsAdded=No new phone number to add to target list
+ConfirmValidSms=Do you confirm validation of this campaign?
+NbOfUniqueSms=No. of unique phone numbers
+NbOfSms=No. of phone numbers
+ThisIsATestMessage=This is a test message
+SendSms=Send SMS
+SmsInfoCharRemain=No. of remaining characters
+SmsInfoNumero= (international format i.e.: +33899701761)
+DelayBeforeSending=Delay before sending (minutes)
+SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
+SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider.
+DisableStopIfSupported=Disable STOP message (if supported)
diff --git a/htdocs/langs/bn_IN/stocks.lang b/htdocs/langs/bn_IN/stocks.lang
new file mode 100644
index 00000000000..9856649b834
--- /dev/null
+++ b/htdocs/langs/bn_IN/stocks.lang
@@ -0,0 +1,220 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseCard=Warehouse card
+Warehouse=Warehouse
+Warehouses=Warehouses
+ParentWarehouse=Parent warehouse
+NewWarehouse=New warehouse / Stock Location
+WarehouseEdit=Modify warehouse
+MenuNewWarehouse=New warehouse
+WarehouseSource=Source warehouse
+WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
+AddOne=Add one
+DefaultWarehouse=Default warehouse
+WarehouseTarget=Target warehouse
+ValidateSending=Delete sending
+CancelSending=Cancel sending
+DeleteSending=Delete sending
+Stock=Stock
+Stocks=Stocks
+StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
+Movements=Movements
+ErrorWarehouseRefRequired=Warehouse reference name is required
+ListOfWarehouses=List of warehouses
+ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
+MovementId=Movement ID
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
+StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
+Location=Location
+LocationSummary=Short name location
+NumberOfDifferentProducts=Number of different products
+NumberOfProducts=Total number of products
+LastMovement=Latest movement
+LastMovements=Latest movements
+Units=Units
+Unit=Unit
+StockCorrection=Stock correction
+CorrectStock=Correct stock
+StockTransfer=Stock transfer
+TransferStock=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
+NumberOfUnit=Number of units
+UnitPurchaseValue=Unit purchase price
+StockTooLow=Stock too low
+StockLowerThanLimit=Stock lower than alert limit (%s)
+EnhancedValue=Value
+PMPValue=Weighted average price
+PMPValueShort=WAP
+EnhancedValueOfWarehouses=Warehouses value
+UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
+QtyDispatched=Quantity dispatched
+QtyDispatchedShort=Qty dispatched
+QtyToDispatchShort=Qty to dispatch
+OrderDispatch=Item receipts
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
+DeStockOnShipment=Decrease real stocks on shipping validation
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
+OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
+StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
+NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
+DispatchVerb=Dispatch
+StockLimitShort=Limit for alert
+StockLimit=Stock limit for alert
+StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+PhysicalStock=Physical Stock
+RealStock=Real Stock
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
+VirtualStock=Virtual stock
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+IdWarehouse=Id warehouse
+DescWareHouse=Description warehouse
+LieuWareHouse=Localisation warehouse
+WarehousesAndProducts=Warehouses and products
+WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
+AverageUnitPricePMPShort=Weighted average input price
+AverageUnitPricePMP=Weighted average input price
+SellPriceMin=Selling Unit Price
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
+EstimatedStockValueShort=Input stock value
+EstimatedStockValue=Input stock value
+DeleteAWarehouse=Delete a warehouse
+ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
+PersonalStock=Personal stock %s
+ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
+SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
+SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
+NoStockAction=No stock action
+DesiredStock=Desired Stock
+DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
+StockToBuy=To order
+Replenishment=Replenishment
+ReplenishmentOrders=Replenishment orders
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
+UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+UseVirtualStock=Use virtual stock
+UsePhysicalStock=Use physical stock
+CurentSelectionMode=Current selection mode
+CurentlyUsingVirtualStock=Virtual stock
+CurentlyUsingPhysicalStock=Physical stock
+RuleForStockReplenishment=Rule for stocks replenishment
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
+AlertOnly= Alerts only
+WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
+WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
+ForThisWarehouse=For this warehouse
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+Replenishments=Replenishments
+NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
+NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
+MassMovement=Mass movement
+SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+RecordMovement=Record transfer
+ReceivingForSameOrder=Receipts for this order
+StockMovementRecorded=Stock movements recorded
+RuleForStockAvailability=Rules on stock requirements
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
+MovementLabel=Label of movement
+TypeMovement=Type of movement
+DateMovement=Date of movement
+InventoryCode=Movement or inventory code
+IsInPackage=Contained into package
+WarehouseAllowNegativeTransfer=Stock can be negative
+qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
+ShowWarehouse=Show warehouse
+MovementCorrectStock=Stock correction for product %s
+MovementTransferStock=Stock transfer of product %s into another warehouse
+InventoryCodeShort=Inv./Mov. code
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
+ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
+OpenAll=Open for all actions
+OpenInternal=Open only for internal actions
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
+OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
+ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
+ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
+ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
+AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
+AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+InventoryDate=Inventory date
+NewInventory=New inventory
+inventorySetup = Inventory Setup
+inventoryCreatePermission=Create new inventory
+inventoryReadPermission=View inventories
+inventoryWritePermission=Update inventories
+inventoryValidatePermission=Validate inventory
+inventoryTitle=Inventory
+inventoryListTitle=Inventories
+inventoryListEmpty=No inventory in progress
+inventoryCreateDelete=Create/Delete inventory
+inventoryCreate=Create new
+inventoryEdit=Edit
+inventoryValidate=Validated
+inventoryDraft=Running
+inventorySelectWarehouse=Warehouse choice
+inventoryConfirmCreate=Create
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
+inventoryMvtStock=By inventory
+inventoryWarningProductAlreadyExists=This product is already into list
+SelectCategory=Category filter
+SelectFournisseur=Vendor filter
+inventoryOnDate=Inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
+inventoryChangePMPPermission=Allow to change PMP value for a product
+ColumnNewPMP=New unit PMP
+OnlyProdsInStock=Do not add product without stock
+TheoricalQty=Theorique qty
+TheoricalValue=Theorique qty
+LastPA=Last BP
+CurrentPA=Curent BP
+RecordedQty=Recorded Qty
+RealQty=Real Qty
+RealValue=Real Value
+RegulatedQty=Regulated Qty
+AddInventoryProduct=Add product to inventory
+AddProduct=Add
+ApplyPMP=Apply PMP
+FlushInventory=Flush inventory
+ConfirmFlushInventory=Do you confirm this action?
+InventoryFlushed=Inventory flushed
+ExitEditMode=Exit edition
+inventoryDeleteLine=Delete line
+RegulateStock=Regulate Stock
+ListInventory=List
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
+ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
+InventoryForASpecificWarehouse=Inventory for a specific warehouse
+InventoryForASpecificProduct=Inventory for a specific product
+StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
+ForceTo=Force to
diff --git a/htdocs/langs/bn_IN/stripe.lang b/htdocs/langs/bn_IN/stripe.lang
new file mode 100644
index 00000000000..844762040af
--- /dev/null
+++ b/htdocs/langs/bn_IN/stripe.lang
@@ -0,0 +1,72 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Stripe module setup
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
+StripeOrCBDoPayment=Pay with credit card or Stripe
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+Creditor=Creditor
+PaymentCode=Payment code
+StripeDoPayment=Pay with Stripe
+YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+Continue=Next
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment page for a sales order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment page for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.<br>For the URL of payments with no existing object, you may also add the parameter <strong>&noidempotency=1</strong> so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter)
+SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+NewStripePaymentReceived=New Stripe payment received
+NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
+STRIPE_TEST_SECRET_KEY=Secret test key
+STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
+STRIPE_LIVE_SECRET_KEY=Secret live key
+STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
+StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
+StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
+StripePayoutList=List of Stripe payouts
+ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
+ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
+PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
+ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
diff --git a/htdocs/langs/bn_IN/supplier_proposal.lang b/htdocs/langs/bn_IN/supplier_proposal.lang
new file mode 100644
index 00000000000..ce5bdf0425a
--- /dev/null
+++ b/htdocs/langs/bn_IN/supplier_proposal.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposalNew=New price request
+CommRequest=Price request
+CommRequests=Price requests
+SearchRequest=Find a request
+DraftRequests=Draft requests
+SupplierProposalsDraft=Draft vendor proposals
+LastModifiedRequests=Latest %s modified price requests
+RequestsOpened=Open price requests
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
+NewAskPrice=New price request
+ShowSupplierProposal=Show price request
+AddSupplierProposal=Create a price request
+SupplierProposalRefFourn=Vendor ref
+SupplierProposalDate=Delivery date
+SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
+ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
+DeleteAsk=Delete request
+ValidateAsk=Validate request
+SupplierProposalStatusDraft=Draft (needs to be validated)
+SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusClosed=Closed
+SupplierProposalStatusSigned=Accepted
+SupplierProposalStatusNotSigned=Refused
+SupplierProposalStatusDraftShort=Draft
+SupplierProposalStatusValidatedShort=Validated
+SupplierProposalStatusClosedShort=Closed
+SupplierProposalStatusSignedShort=Accepted
+SupplierProposalStatusNotSignedShort=Refused
+CopyAskFrom=Create a price request by copying an existing request
+CreateEmptyAsk=Create blank request
+ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
+ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
+SendAskByMail=Send price request by mail
+SendAskRef=Sending the price request %s
+SupplierProposalCard=Request card
+ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
+ActionsOnSupplierProposal=Events on price request
+DocModelAuroreDescription=A complete request model (logo...)
+CommercialAsk=Price request
+DefaultModelSupplierProposalCreate=Default model creation
+DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
+DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
+ListOfSupplierProposals=List of vendor proposal requests
+ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
+SupplierProposalsToClose=Vendor proposals to close
+SupplierProposalsToProcess=Vendor proposals to process
+LastSupplierProposals=Latest %s price requests
+AllPriceRequests=All requests
diff --git a/htdocs/langs/bn_IN/suppliers.lang b/htdocs/langs/bn_IN/suppliers.lang
new file mode 100644
index 00000000000..b69b11272b4
--- /dev/null
+++ b/htdocs/langs/bn_IN/suppliers.lang
@@ -0,0 +1,47 @@
+# Dolibarr language file - Source file is en_US - vendors
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
+History=History
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
+OrderDate=Order date
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
+SupplierPrices=Vendor prices
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
+Availability=Availability
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order details
+ApproveThisOrder=Approve this order
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
+DenyingThisOrder=Deny this order
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
+SupplierReputation=Vendor reputation
+DoNotOrderThisProductToThisSupplier=Do not order
+NotTheGoodQualitySupplier=Low quality
+ReputationForThisProduct=Reputation
+BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
+AllProductReferencesOfSupplier=All product / service references of vendor
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/bn_IN/ticket.lang b/htdocs/langs/bn_IN/ticket.lang
new file mode 100644
index 00000000000..80518c3401a
--- /dev/null
+++ b/htdocs/langs/bn_IN/ticket.lang
@@ -0,0 +1,305 @@
+# en_US lang file for module ticket
+# Copyright (C) 2013  Jean-François FERRY <hello@librethic.io>
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+Module56000Name=Tickets
+Module56000Desc=Ticket system for issue or request management
+
+Permission56001=See tickets
+Permission56002=Modify tickets
+Permission56003=Delete tickets
+Permission56004=Manage tickets
+Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+
+TicketDictType=Ticket - Types
+TicketDictCategory=Ticket - Groupes
+TicketDictSeverity=Ticket - Severities
+TicketDictResolution=Ticket - Resolution
+TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
+TicketTypeShortBUGHARD=Dysfonctionnement matériel
+TicketTypeShortCOM=Commercial question
+
+TicketTypeShortHELP=Request for functionnal help
+TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortPROJET=Project
+TicketTypeShortOTHER=Other
+
+TicketSeverityShortLOW=Low
+TicketSeverityShortNORMAL=Normal
+TicketSeverityShortHIGH=High
+TicketSeverityShortBLOCKING=Critical/Blocking
+
+ErrorBadEmailAddress=Field '%s' incorrect
+MenuTicketMyAssign=My tickets
+MenuTicketMyAssignNonClosed=My open tickets
+MenuListNonClosed=Open tickets
+
+TypeContact_ticket_internal_CONTRIBUTOR=Contributor
+TypeContact_ticket_internal_SUPPORTTEC=Assigned user
+TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
+TypeContact_ticket_external_CONTRIBUTOR=External contributor
+
+OriginEmail=Email source
+Notify_TICKET_SENTBYMAIL=Send ticket message by email
+
+# Status
+NotRead=Not read
+Read=Read
+Assigned=Assigned
+InProgress=In progress
+NeedMoreInformation=Waiting for information
+Answered=Answered
+Waiting=Waiting
+Closed=Closed
+Deleted=Deleted
+
+# Dict
+Type=Type
+Category=Analytic code
+Severity=Severity
+
+# Email templates
+MailToSendTicketMessage=To send email from ticket message
+
+#
+# Admin page
+#
+TicketSetup=Ticket module setup
+TicketSettings=Settings
+TicketSetupPage=
+TicketPublicAccess=A public interface requiring no identification is available at the following url
+TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
+TicketParamModule=Module variable setup
+TicketParamMail=Email setup
+TicketEmailNotificationFrom=Notification email from
+TicketEmailNotificationFromHelp=Used into ticket message answer by example
+TicketEmailNotificationTo=Notifications email to
+TicketEmailNotificationToHelp=Send email notifications to this address.
+TicketNewEmailBodyLabel=Text message sent after creating a ticket
+TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
+TicketParamPublicInterface=Public interface setup
+TicketsEmailMustExist=Require an existing email address to create a ticket
+TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket.
+PublicInterface=Public interface
+TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
+TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
+TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
+TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
+TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
+TicketPublicInterfaceTopicLabelAdmin=Interface title
+TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
+TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
+ExtraFieldsTicket=Extra attributes
+TicketCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
+TicketsDisableEmail=Do not send emails for ticket creation or message recording
+TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
+TicketsLogEnableEmail=Enable log by email
+TicketsLogEnableEmailHelp=At each change, an email will be sent **to each contact** associated with the ticket.
+TicketParams=Params
+TicketsShowModuleLogo=Display the logo of the module in the public interface
+TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
+TicketsShowCompanyLogo=Display the logo of the company in the public interface
+TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
+TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
+TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
+TicketsActivatePublicInterface=Activate public interface
+TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create tickets.
+TicketsAutoAssignTicket=Automatically assign the user who created the ticket
+TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
+TicketNumberingModules=Tickets numbering module
+TicketNotifyTiersAtCreation=Notify third party at creation
+TicketGroup=Group
+TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
+#
+# Index & list page
+#
+TicketsIndex=Tickets area
+TicketList=List of tickets
+TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
+NoTicketsFound=No ticket found
+NoUnreadTicketsFound=No unread ticket found
+TicketViewAllTickets=View all tickets
+TicketViewNonClosedOnly=View only open tickets
+TicketStatByStatus=Tickets by status
+OrderByDateAsc=Sort by ascending date
+OrderByDateDesc=Sort by descending date
+ShowAsConversation=Show as conversation list
+MessageListViewType=Show as table list
+
+#
+# Ticket card
+#
+Ticket=Ticket
+TicketCard=Ticket card
+CreateTicket=Create ticket
+EditTicket=Edit ticket
+TicketsManagement=Tickets Management
+CreatedBy=Created by
+NewTicket=New Ticket
+SubjectAnswerToTicket=Ticket answer
+TicketTypeRequest=Request type
+TicketCategory=Analytic code
+SeeTicket=See ticket
+TicketMarkedAsRead=Ticket has been marked as read
+TicketReadOn=Read on
+TicketCloseOn=Closing date
+MarkAsRead=Mark ticket as read
+TicketHistory=Ticket history
+AssignUser=Assign to user
+TicketAssigned=Ticket is now assigned
+TicketChangeType=Change type
+TicketChangeCategory=Change analytic code
+TicketChangeSeverity=Change severity
+TicketAddMessage=Add a message
+AddMessage=Add a message
+MessageSuccessfullyAdded=Ticket added
+TicketMessageSuccessfullyAdded=Message successfully added
+TicketMessagesList=Message list
+NoMsgForThisTicket=No message for this ticket
+Properties=Classification
+LatestNewTickets=Latest %s newest tickets (not read)
+TicketSeverity=Severity
+ShowTicket=See ticket
+RelatedTickets=Related tickets
+TicketAddIntervention=Create intervention
+CloseTicket=Close ticket
+CloseATicket=Close a ticket
+ConfirmCloseAticket=Confirm ticket closing
+ConfirmDeleteTicket=Please confirm ticket deleting
+TicketDeletedSuccess=Ticket deleted with success
+TicketMarkedAsClosed=Ticket marked as closed
+TicketDurationAuto=Calculated duration
+TicketDurationAutoInfos=Duration calculated automatically from intervention related
+TicketUpdated=Ticket updated
+SendMessageByEmail=Send message by email
+TicketNewMessage=New message
+ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
+TicketGoIntoContactTab=Please go into "Contacts" tab to select them
+TicketMessageMailIntro=Introduction
+TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
+TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
+TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
+TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
+TicketMessageMailSignature=Signature
+TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
+TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
+TicketMessageMailSignatureLabelAdmin=Signature of response email
+TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
+TicketMessageHelp=Only this text will be saved in the message list on ticket card.
+TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
+TimeElapsedSince=Time elapsed since
+TicketTimeToRead=Time elapsed before read
+TicketContacts=Contacts ticket
+TicketDocumentsLinked=Documents linked to ticket
+ConfirmReOpenTicket=Confirm reopen this ticket ?
+TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
+TicketAssignedToYou=Ticket assigned
+TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
+MarkMessageAsPrivate=Mark message as private
+TicketMessagePrivateHelp=This message will not display to external users
+TicketEmailOriginIssuer=Issuer at origin of the tickets
+InitialMessage=Initial Message
+LinkToAContract=Link to a contract
+TicketPleaseSelectAContract=Select a contract
+UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
+TicketMailExchanges=Mail exchanges
+TicketInitialMessageModified=Initial message modified
+TicketMessageSuccesfullyUpdated=Message successfully updated
+TicketChangeStatus=Change status
+TicketConfirmChangeStatus=Confirm the status change: %s ?
+TicketLogStatusChanged=Status changed: %s to %s
+TicketNotNotifyTiersAtCreate=Not notify company at create
+Unread=Unread
+TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
+PublicInterfaceNotEnabled=Public interface was not enabled
+ErrorTicketRefRequired=Ticket reference name is required
+
+#
+# Logs
+#
+TicketLogMesgReadBy=Ticket %s read by %s
+NoLogForThisTicket=No log for this ticket yet
+TicketLogAssignedTo=Ticket %s assigned to %s
+TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
+TicketLogClosedBy=Ticket %s closed by %s
+TicketLogReopen=Ticket %s re-open
+
+#
+# Public pages
+#
+TicketSystem=Ticket system
+ShowListTicketWithTrackId=Display ticket list from track ID
+ShowTicketWithTrackId=Display ticket from track ID
+TicketPublicDesc=You can create a support ticket or check from an existing ID.
+YourTicketSuccessfullySaved=Ticket has been successfully saved!
+MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
+PleaseRememberThisId=Please keep the tracking number that we might ask you later.
+TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
+TicketNewEmailSubjectCustomer=New support ticket
+TicketNewEmailBody=This is an automatic email to confirm you have registered a new ticket.
+TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
+TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
+TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
+TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
+TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
+TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
+TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
+TicketPublicMsgViewLogIn=Please enter ticket tracking ID
+TicketTrackId=Public Tracking ID
+OneOfTicketTrackId=One of your tracking ID
+ErrorTicketNotFound=Ticket with tracking ID %s not found!
+Subject=Subject
+ViewTicket=View ticket
+ViewMyTicketList=View my ticket list
+ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
+TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
+TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
+SeeThisTicketIntomanagementInterface=See ticket in management interface
+TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
+ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
+OldUser=Old user
+NewUser=New user
+NumberOfTicketsByMonth=Number of tickets per month
+NbOfTickets=Number of tickets
+# notifications
+TicketNotificationEmailSubject=Ticket %s updated
+TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
+TicketNotificationRecipient=Notification recipient
+TicketNotificationLogMessage=Log message
+TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
+TicketNotificationNumberEmailSent=Notification email sent: %s
+
+ActionsOnTicket=Events on ticket
+
+#
+# Boxes
+#
+BoxLastTicket=Latest created tickets
+BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicketContent=
+BoxLastTicketNoRecordedTickets=No recent unread tickets
+BoxLastModifiedTicket=Latest modified tickets
+BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastModifiedTicketContent=
+BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
diff --git a/htdocs/langs/bn_IN/trips.lang b/htdocs/langs/bn_IN/trips.lang
new file mode 100644
index 00000000000..654f14d6bf7
--- /dev/null
+++ b/htdocs/langs/bn_IN/trips.lang
@@ -0,0 +1,151 @@
+# Dolibarr language file - Source file is en_US - trips
+ShowExpenseReport=Show expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense reports
+ListOfFees=List of fees
+TypeFees=Types of fees
+ShowTrip=Show expense report
+NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
+CompanyVisited=Company/organization visited
+FeesKilometersOrAmout=Amount or kilometers
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportApproved=An expense report was approved
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
+ExpenseReportRefused=An expense report was refused
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
+ExpenseReportCanceled=An expense report was canceled
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
+ExpenseReportPaid=An expense report was paid
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripNDF=Informations expense report
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Other
+TF_TRIP=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hotel
+TF_TAXI=Taxi
+EX_KME=Mileage costs
+EX_FUE=Fuel CV
+EX_HOT=Hotel
+EX_PAR=Parking CV
+EX_TOL=Toll CV
+EX_TAX=Various Taxes
+EX_IND=Indemnity transportation subscription
+EX_SUM=Maintenance supply
+EX_SUO=Office supplies
+EX_CAR=Car rental
+EX_DOC=Documentation
+EX_CUR=Customers receiving
+EX_OTR=Other receiving
+EX_POS=Postage
+EX_CAM=CV maintenance and repair
+EX_EMM=Employees meal
+EX_GUM=Guests meal
+EX_BRE=Breakfast
+EX_FUE_VP=Fuel PV
+EX_TOL_VP=Toll PV
+EX_PAR_VP=Parking PV
+EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
+UploadANewFileNow=Upload a new document now
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+AucuneLigne=There is no expense report declared yet
+ModePaiement=Payment mode
+VALIDATOR=User responsible for approval
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paid by
+REFUSEUR=Denied by
+CANCEL_USER=Deleted by
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+BROUILLONNER=Reopen
+ExpenseReportRef=Ref. expense report
+ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+ConfirmRefuseTrip=Are you sure you want to deny this expense report?
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report?
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
+ConfirmCancelTrip=Are you sure you want to cancel this expense report?
+BrouillonnerTrip=Move back expense report to status "Draft"
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report?
+NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
+ExpenseReportsToApprove=Expense reports to approve
+ExpenseReportsToPay=Expense reports to pay
+ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
+ExpenseReportsIk=Expense report milles index
+ExpenseReportsRules=Expense report rules
+ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
+ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report
+expenseReportOffset=Offset
+expenseReportCoef=Coefficient
+expenseReportTotalForFive=Example with <u>d</u> = 5
+expenseReportRangeFromTo=from %d to %d
+expenseReportRangeMoreThan=more than %d
+expenseReportCoefUndefined=(value not defined)
+expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
+expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
+expenseReportPrintExample=offset + (d x coef) = %s
+ExpenseReportApplyTo=Apply to
+ExpenseReportDomain=Domain to apply
+ExpenseReportLimitOn=Limit on
+ExpenseReportDateStart=Date start
+ExpenseReportDateEnd=Date end
+ExpenseReportLimitAmount=Limite amount
+ExpenseReportRestrictive=Restrictive
+AllExpenseReport=All type of expense report
+OnExpense=Expense line
+ExpenseReportRuleSave=Expense report rule saved
+ExpenseReportRuleErrorOnSave=Error: %s
+RangeNum=Range %d
+ExpenseReportConstraintViolationError=Constraint violation id [%s]: %s  is superior to %s %s
+byEX_DAY=by day (limitation to %s)
+byEX_MON=by month (limitation to %s)
+byEX_YEA=by year (limitation to %s)
+byEX_EXP=by line (limitation to %s)
+ExpenseReportConstraintViolationWarning=Constraint violation id [%s]: %s  is superior to %s %s
+nolimitbyEX_DAY=by day (no limitation)
+nolimitbyEX_MON=by month (no limitation)
+nolimitbyEX_YEA=by year (no limitation)
+nolimitbyEX_EXP=by line (no limitation)
+CarCategory=Category of car
+ExpenseRangeOffset=Offset amount: %s
+RangeIk=Mileage range
+AttachTheNewLineToTheDocument=Attach the line to an uploaded document
diff --git a/htdocs/langs/bn_IN/users.lang b/htdocs/langs/bn_IN/users.lang
new file mode 100644
index 00000000000..41a5ebd0981
--- /dev/null
+++ b/htdocs/langs/bn_IN/users.lang
@@ -0,0 +1,118 @@
+# Dolibarr language file - Source file is en_US - users
+HRMArea=HRM area
+UserCard=User card
+GroupCard=Group card
+Permission=Permission
+Permissions=Permissions
+EditPassword=Edit password
+SendNewPassword=Regenerate and send password
+SendNewPasswordLink=Send link to reset password
+ReinitPassword=Regenerate password
+PasswordChangedTo=Password changed to: %s
+SubjectNewPassword=Your new password for %s
+GroupRights=Group permissions
+UserRights=User permissions
+UserGUISetup=User Display Setup
+DisableUser=Disable
+DisableAUser=Disable a user
+DeleteUser=Delete
+DeleteAUser=Delete a user
+EnableAUser=Enable a user
+DeleteGroup=Delete
+DeleteAGroup=Delete a group
+ConfirmDisableUser=Are you sure you want to disable user <b>%s</b>?
+ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b>?
+ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b>?
+ConfirmEnableUser=Are you sure you want to enable user <b>%s</b>?
+ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b>?
+ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
+NewUser=New user
+CreateUser=Create user
+LoginNotDefined=Login is not defined.
+NameNotDefined=Name is not defined.
+ListOfUsers=List of users
+SuperAdministrator=Super Administrator
+SuperAdministratorDesc=Global administrator
+AdministratorDesc=Administrator
+DefaultRights=Default Permissions
+DefaultRightsDesc=Define here the <u>default</u> permissions that are automatically granted to a <u>new</u> user (to modify permissions for existing users, go to the user card).
+DolibarrUsers=Dolibarr users
+LastName=Last name
+FirstName=First name
+ListOfGroups=List of groups
+NewGroup=New group
+CreateGroup=Create group
+RemoveFromGroup=Remove from group
+PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
+PasswordChangeRequest=Request to change password for <b>%s</b>
+PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+ConfirmPasswordReset=Confirm password reset
+MenuUsersAndGroups=Users & Groups
+LastGroupsCreated=Latest %s groups created
+LastUsersCreated=Latest %s users created
+ShowGroup=Show group
+ShowUser=Show user
+NonAffectedUsers=Non assigned users
+UserModified=User modified successfully
+PhotoFile=Photo file
+ListOfUsersInGroup=List of users in this group
+ListOfGroupsForUser=List of groups for this user
+LinkToCompanyContact=Link to third party / contact
+LinkedToDolibarrMember=Link to member
+LinkedToDolibarrUser=Link to Dolibarr user
+LinkedToDolibarrThirdParty=Link to Dolibarr third party
+CreateDolibarrLogin=Create a user
+CreateDolibarrThirdParty=Create a third party
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
+UsePersonalValue=Use personal value
+InternalUser=Internal user
+ExportDataset_user_1=Users and their properties
+DomainUser=Domain user %s
+Reactivate=Reactivate
+CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
+Inherited=Inherited
+UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
+UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
+IdPhoneCaller=Id phone caller
+NewUserCreated=User %s created
+NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
+EventUserModified=User %s modified
+UserDisabled=User %s disabled
+UserEnabled=User %s activated
+UserDeleted=User %s removed
+NewGroupCreated=Group %s created
+GroupModified=Group %s modified
+GroupDeleted=Group %s removed
+ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact?
+ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member?
+ConfirmCreateThirdParty=Are you sure you want to create a third party for this member?
+LoginToCreate=Login to create
+NameToCreate=Name of third party to create
+YourRole=Your roles
+YourQuotaOfUsersIsReached=Your quota of active users is reached !
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
+DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
+HierarchicalResponsible=Supervisor
+HierarchicView=Hierarchical view
+UseTypeFieldToChange=Use field Type to change
+OpenIDURL=OpenID URL
+LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Hours worked (per week)
+ExpectedWorkedHours=Expected worked hours per week
+ColorUser=Color of the user
+DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accounting code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Employment Start Date
+DateEmploymentEnd=Employment End Date
+CantDisableYourself=You can't disable your own user record
+ForceUserExpenseValidator=Force expense report validator
+ForceUserHolidayValidator=Force leave request validator
+ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/bn_IN/website.lang b/htdocs/langs/bn_IN/website.lang
new file mode 100644
index 00000000000..bce2a09fb03
--- /dev/null
+++ b/htdocs/langs/bn_IN/website.lang
@@ -0,0 +1,130 @@
+# Dolibarr language file - Source file is en_US - website
+Shortname=Code
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
+DeleteWebsite=Delete website
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
+WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
+WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
+WEBSITE_CSS_URL=URL of external CSS file
+WEBSITE_CSS_INLINE=CSS file content (common to all pages)
+WEBSITE_JS_INLINE=Javascript file content (common to all pages)
+WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
+WEBSITE_ROBOT=Robot file (robots.txt)
+WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
+HtmlHeaderPage=HTML header (specific to this page only)
+PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
+EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
+MediaFiles=Media library
+EditCss=Edit website properties
+EditMenu=Edit menu
+EditMedias=Edit medias
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
+AddWebsite=Add website
+Webpage=Web page/container
+AddPage=Add page/container
+HomePage=Home Page
+PageContainer=Page/container
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
+PageContent=Page/Contenair
+PageDeleted=Page/Contenair '%s' of website %s deleted
+PageAdded=Page/Contenair '%s' added
+ViewSiteInNewTab=View site in new tab
+ViewPageInNewTab=View page in new tab
+SetAsHomePage=Set as Home page
+RealURL=Real URL
+ViewWebsiteInProduction=View web site using home URLs
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+TestDeployOnWeb=Test/deploy on web
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
+NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
+SyntaxHelp=Help on specific syntax tips
+YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+ClonePage=Clone page/container
+CloneSite=Clone site
+SiteAdded=Website added
+ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
+PageIsANewTranslation=The new page is a translation of the current page ?
+LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
+ParentPageId=Parent page ID
+WebsiteId=Website ID
+CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
+FetchAndCreate=Fetch and Create
+ExportSite=Export website
+ImportSite=Import website template
+IDOfPage=Id of page
+Banner=Banner
+BlogPost=Blog post
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
+AddWebsiteAccount=Create web site account
+BackToListForThirdParty=Back to list for the third-party
+DisableSiteFirst=Disable website first
+MyContainerTitle=My web site title
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is a translation of
+ThisPageHasTranslationPages=This page/container has translation
+NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
+GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Search or Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
+MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
+EditInLineOnOff=Mode 'Edit inline' is %s
+ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
+GlobalCSSorJS=Global CSS/JS/Header file of web site
+BackToHomePage=Back to home page...
+TranslationLinks=Translation links
+YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not a website page
+UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
+MainLanguage=Main language
+OtherLanguages=Other languages
+UseManifest=Provide a manifest.json file
+PublicAuthorAlias=Public author alias
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
+ReplacementDoneInXPages=Replacement done in %s pages or containers
diff --git a/htdocs/langs/bn_IN/withdrawals.lang b/htdocs/langs/bn_IN/withdrawals.lang
new file mode 100644
index 00000000000..b1d6e30e329
--- /dev/null
+++ b/htdocs/langs/bn_IN/withdrawals.lang
@@ -0,0 +1,119 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
+NewStandingOrder=New direct debit order
+StandingOrderToProcess=To process
+WithdrawalsReceipts=Direct debit orders
+WithdrawalReceipt=Direct debit order
+LastWithdrawalReceipts=Latest %s direct debit files
+WithdrawalsLines=Direct debit order lines
+RequestStandingOrderToTreat=Request for direct debit payment order to process
+RequestStandingOrderTreated=Request for direct debit payment order processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
+AmountToWithdraw=Amount to withdraw
+WithdrawsRefused=Direct debit refused
+NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
+ResponsibleUser=User Responsible
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
+MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
+ClassCredited=Classify credited
+ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
+TransData=Transmission date
+TransMetod=Transmission method
+Send=Send
+Lines=Lines
+StandingOrderReject=Issue a rejection
+WithdrawalRefused=Withdrawal refused
+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=Invoice refused (Charge the rejection to customer)
+StatusDebitCredit=Status debit/credit
+StatusWaiting=Waiting
+StatusTrans=Sent
+StatusCredited=Credited
+StatusRefused=Refused
+StatusMotif0=Unspecified
+StatusMotif1=Insufficient funds
+StatusMotif2=Request contested
+StatusMotif3=No direct debit payment order
+StatusMotif4=Sales Order
+StatusMotif5=RIB unusable
+StatusMotif6=Account without balance
+StatusMotif7=Judicial Decision
+StatusMotif8=Other reason
+CreateForSepaFRST=Create direct debit file (SEPA FRST)
+CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
+CreateAll=Create direct debit file (all)
+CreateGuichet=Only office
+CreateBanque=Only bank
+OrderWaiting=Waiting for treatment
+NotifyTransmision=Withdrawal Transmission
+NotifyCredit=Withdrawal Credit
+NumeroNationalEmetter=National Transmitter Number
+WithBankUsingRIB=For bank accounts using RIB
+WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
+BankToReceiveWithdraw=Receiving Bank Account
+CreditDate=Credit on
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+WithdrawalFile=Withdrawal file
+SetToStatusSent=Set to status "File Sent"
+ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
+StatisticsByLineStatus=Statistics by status of lines
+RUM=UMR
+DateRUM=Mandate signature date
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
+WithdrawMode=Direct debit mode (FRST or RECUR)
+WithdrawRequestAmount=Amount of Direct debit request:
+WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
+SepaMandate=SEPA Direct Debit Mandate
+SepaMandateShort=SEPA Mandate
+PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
+SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+CreditorIdentifier=Creditor Identifier
+CreditorName=Creditor Name
+SEPAFillForm=(B) Please complete all the fields marked *
+SEPAFormYourName=Your name
+SEPAFormYourBAN=Your Bank Account Name (IBAN)
+SEPAFormYourBIC=Your Bank Identifier Code (BIC)
+SEPAFrstOrRecur=Type of payment
+ModeRECUR=Recurring payment
+ModeFRST=One-off payment
+PleaseCheckOne=Please check one only
+DirectDebitOrderCreated=Direct debit order %s created
+AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
+
+### Notifications
+InfoCreditSubject=Payment of direct debit payment order %s by the bank
+InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
+InfoTransSubject=Transmission of direct debit payment order %s to bank
+InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
+InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
+InfoRejectSubject=Direct debit payment order refused
+InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/bn_IN/workflow.lang b/htdocs/langs/bn_IN/workflow.lang
new file mode 100644
index 00000000000..be126eef0f4
--- /dev/null
+++ b/htdocs/langs/bn_IN/workflow.lang
@@ -0,0 +1,20 @@
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=Workflow module setup
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+# Autocreate
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
+# Autoclassify customer proposal or order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+AutomaticCreation=Automatic creation
+AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/bn_IN/zapier.lang b/htdocs/langs/bn_IN/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/bn_IN/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index 91457d1c271..39446ad24d9 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 8747ea5b951..0346cefe6a8 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web server user/group
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Modul <b>%s</b> mora biti omogućen
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Users module setup
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index 252e06a5c6c..919875b0135 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Iznos faktura
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Iznos faktura po mjesecu (bez PDV-a)
-ShowSocialContribution=Pokaži doprinose i poreze
-ShowBill=Prikaži fakturu
-ShowInvoice=Prikaži fakturu
-ShowInvoiceReplace=Prikaži zamjensku fakturu
-ShowInvoiceAvoir=Prikaži dobropis
-ShowInvoiceDeposit=Pokaži avansne fakture
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Prikaži uplatu
 AlreadyPaid=Već plaćeno
 AlreadyPaidBack=Već izvršen povrat uplate
 AlreadyPaidNoCreditNotesNoDeposits=Već plaćeno (bez KO i avansa)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Rok po preuzimanju
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=PDF šablon Crevette za račune. Kompletan šablon za situiranje privremenih situacija
 TerreNumRefModelDesc1=Predlaga številko v formatu %syymm-nnnn za standardne račune in %syymm-nnnn za dobropise kjer je yy leto, mm mesec in nnnn zaporedna broj brez presledkov in večja od 0
diff --git a/htdocs/langs/bs_BA/donations.lang b/htdocs/langs/bs_BA/donations.lang
index 07437d96091..cd5f4c3093a 100644
--- a/htdocs/langs/bs_BA/donations.lang
+++ b/htdocs/langs/bs_BA/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Create a donation
 NewDonation=Nova donacija
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Prikaži donaciju
 PublicDonation=Javne donacije
 DonationsArea=Područje za donacije
 DonationStatusPromiseNotValidated=Nacrt obećanja
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Nacrt
 DonationStatusPromiseValidatedShort=Potvrđena donacija
 DonationStatusPaidShort=Primljena donacija
 DonationTitle=Priznanica za donaciju
+DonationDate=Donation date
 DonationDatePayment=Datum uplate
 ValidPromess=Potvrdi obećanje
 DonationReceipt=Priznanica za donaciju
diff --git a/htdocs/langs/bs_BA/interventions.lang b/htdocs/langs/bs_BA/interventions.lang
index 928f7296836..fef8e77ea6b 100644
--- a/htdocs/langs/bs_BA/interventions.lang
+++ b/htdocs/langs/bs_BA/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Posljednjih %s izmijenjenih intervencija
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Kontakt kupca za kontrolu
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/bs_BA/modulebuilder.lang b/htdocs/langs/bs_BA/modulebuilder.lang
index b6546cf72ba..f77b9464f24 100644
--- a/htdocs/langs/bs_BA/modulebuilder.lang
+++ b/htdocs/langs/bs_BA/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 56127b173e0..4e6387a89ab 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang
index 735f153ab1f..a640f72129e 100644
--- a/htdocs/langs/bs_BA/website.lang
+++ b/htdocs/langs/bs_BA/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/bs_BA/zapier.lang b/htdocs/langs/bs_BA/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/bs_BA/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index 911c0fd32e5..744d72ed9b1 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Línies de factura comptabilitzades
 ExpenseReportLines=Línies d'informes de despeses a comptabilitzar
 ExpenseReportLinesDone=Línies comptabilitzades d'informes de despeses
 IntoAccount=Línia comptabilitzada amb el compte comptable
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Comptabilitza
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Compte comptable per registrar les donacions
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Compte comptable per a registrar les donacions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte comptable per defecte per als productes comprats (utilitzat si no es defineix en el producte)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Compte comptable per defecte pels productes venuts (s'utilitza si no es defineix en el full de producte)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Compte comptable per defecte per als productes venuts a la CEE (utilitzat si no es defineix en el producte)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Compte comptable per defecte per als productes venuts d'exportació (utilitzat si no es defineix en el producte)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte comptable per defecte per als serveis adquirits (s'utilitza si no es defineix en el full de servei)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte comptable per defecte per als serveis venuts (s'utilitza si no es defineix en el full de servei)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Compte comptable per defecte per als serveis venuts a la CEE (utilitzat si no es defineix en el servei)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Compte comptable per defecte per als serveis venuts i exportats fora de la CEE (utilitzat si no es defineix en el servei)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Tercer desconegut
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Compte de tercers no definit o tercer desconegut. Error de bloqueig.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Compte de tercers desconegut i compte d'espera no definit. Error de bloqueig
 PaymentsNotLinkedToProduct=Pagament no vinculat a cap producte / servei
+OpeningBalance=Opening balance
 ShowOpeningBalance=Mostra el saldo d'obertura
 HideOpeningBalance=Amagueu el balanç d'obertura
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Grup de compte
 PcgtypeDesc=S'utilitzen grups de comptes com a criteris predefinits de "filtre" i "agrupació" per a alguns informes de comptabilitat. Per exemple, "Ingressos" o "DESPESES" s'utilitzen com a grups per a comptes de comptabilitat de productes per crear l'informe de despeses / ingressos.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Marge total de vendes
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Exporta a Quadratus QuadraCompta
 Modelcsv_ebp=Exporta a EBP
 Modelcsv_cogilog=Exporta a Cogilog
 Modelcsv_agiris=Exporta a Agiris
-Modelcsv_LDCompta=Exporta per LD Compta (v9 i superior) (Prova)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Exporta per a OpenConcerto (Test)
 Modelcsv_configurable=Exporta CSV configurable
 Modelcsv_FEC=Exporta FEC
 Modelcsv_Sage50_Swiss=Exportació per Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Id pla comptable
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=En mode vendes
 OptionModeProductSellIntra=Les vendes de mode exportades a la CEE
 OptionModeProductSellExport=Les vendes de mode exportades a altres països
 OptionModeProductBuy=En mode compres
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Mostra tots els productes amb compte comptable per a les vendes.
 OptionModeProductSellIntraDesc=Mostra tots els productes amb compte comptable per a les vendes en CEE.
 OptionModeProductSellExportDesc=Mostra tots els productes amb compte comptable per a altres vendes a l’estranger.
 OptionModeProductBuyDesc=Mostra tots els productes amb compte comptable per a les compres.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Eliminar el codi comptable de les línies que no existeixen als gràfics de compte
 CleanHistory=Reinicia tota la comptabilització per l'any seleccionat
 PredefinedGroups=Grups predefinits
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=S'ha eliminat el compte del grup
 SaleLocal=Venda local
 SaleExport=Venda d’exportació
 SaleEEC=Venda en CEE
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Rang de compte comptable
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 2b9c2c4ea33..3cb95c70a42 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Servidor web usuari/grup
 NoSessionFound=Sembla que el seu PHP no pot llistar les sessions actives. El directori de salvaguardat de sessions (<b>%s</b>) pot estar protegit (per exemple, pels permisos del sistema operatiu o per la directiva open_basedir del seu PHP).
 DBStoringCharset=Codificació base de dades per emmagatzematge de dades
 DBSortingCharset=Codificació base de dades per classificar les dades
+HostCharset=Host charset
 ClientCharset=Joc de caràcters del client
 ClientSortingCharset="Collation" del client
 WarningModuleNotActive=Mòdul <b>%s</b> no actiu
@@ -99,9 +100,9 @@ NoMaxSizeByPHPLimit=Cap limitació interna en el seu servidor PHP
 MaxSizeForUploadedFiles=Tamany màxim dels documents a pujar (0 per prohibir la pujada)
 UseCaptchaCode=Utilització de codi gràfic (CAPTCHA) en el login
 AntiVirusCommand=Ruta completa cap al comandament antivirus
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusCommandExample=Exemple per al dimoni ClamAv (requerix clamav-daemon): /usr/bin/clamdscan<br>Exemple per a ClamWin (molt molt lent): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Paràmetres complementaris en la línia de comandes
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Exemple per al dimoni de ClamAv: --fdpass <br> Exemple per a ClamWin: --database = "C: \\ Program Files (x86) \\ ClamWin \\ lib"
 ComptaSetup=Configuració del mòdul Comptabilitat
 UserSetup=Configuració de gestió d'usuaris
 MultiCurrencySetup=Configuració multi-divisa
@@ -199,7 +200,7 @@ FeatureDisabledInDemo=Opció deshabilitada en demo
 FeatureAvailableOnlyOnStable=Funcionalitat disponible únicament en versions estables oficials 
 BoxesDesc=Els panells són components que mostren algunes dades que poden afegir-se per personalitzar algunes pàgines. Pots triar entre mostrar el panell o no seleccionant la pàgina de destí i fent clic a 'Activar', o fent clic en la paperera per desactivar.
 OnlyActiveElementsAreShown=Només els elements de <a href="%s"> mòduls activats</a> són mostrats
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesDesc=Els mòduls / aplicacions determinen quines funcions estan disponibles al programari. Alguns mòduls requereixen concedir permisos als usuaris després d'activar el mòdul. Feu clic al botó on / off <span class="small valignmiddle"> %s </span> de cada mòdul per habilitar o desactivar un mòdul / aplicació.
 ModulesMarketPlaceDesc=Pots trobar més mòduls per descarregar en pàgines web externes per internet...
 ModulesDeployDesc=Si els permisos en el seu sistema d'arxius ho permiteixen, pot utilitzar aquesta ferramente per instal·lar un mòdul extern. El mòdul estarà aleshores visible en la pestanya <strong>%s</strong>
 ModulesMarketPlaces=Trobar mòduls/complements externs
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Caselles de verificació
 ExtrafieldCheckBoxFromList=Caselles de verificació des de taula
 ExtrafieldLink=Enllaç a un objecte
 ComputedFormula=Camp calculat
-ComputedFormulaDesc=Podeu introduir aquí una fórmula usant altres propietats d'objecte o qualsevol codi PHP per obtenir un valor calculat dinàmic. Podeu utilitzar qualsevol fórmula compatible amb PHP, inclòs l'operador "?" i els següents objectes globals: <strong> $db, $conf, $langs, $mysoc, $user, $object</strong>. <br><strong> AVÍS</strong>: Només algunes propietats de $object poden estar disponibles. Si necessiteu una propietat que no s'hagi carregat, tan sols busqueu l'objecte en la formula com en el segon exemple. <br> L'ús d'un camp calculat significa que no podeu introduir cap valor des de la interfície. A més, si hi ha un error de sintaxi, la fórmula potser no torni res.  <br><br> Exemple de fórmula: <br> $object->id <10? round($object->id/2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)  <br><br> Exemple de recarrega d'object<br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br> Un altre exemple de fórmula per forçar la càrrega de l'objecte i el seu objecte principal: <br> (($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Emmagatzemar el camp computat
 ComputedpersistentDesc=Els camps addicionals computats s’emmagatzemaran a la base de dades, però, el valor només es tornarà a calcular quan l’objecte d’aquest camp s’ha canviat. Si el camp calculat depèn d'altres objectes o dades globals, aquest valor podria estar equivocat !!
 ExtrafieldParamHelpPassword=Mantenir aquest camp buit significa que el valor s'emmagatzema sense xifrar (el camp només ha d'estar amagat amb una estrella sobre la pantalla). <br> Establiu aquí el valor 'auto' per utilitzar la regla de xifrat per defecte per guardar la contrasenya a la base de dades (el valor llegit serà només el "hash", no hi haurà cap manera de recuperar el valor original)
@@ -449,7 +450,7 @@ DefaultLink=Enllaç per defecte
 SetAsDefault=Indica'l com Defecte
 ValueOverwrittenByUserSetup=Atenció: Aquest valor pot ser sobreescrit per un valor específic de la configuració de l'usuari (cada usuari pot tenir la seva pròpia url clicktodial)
 ExternalModule=Mòdul extern
-InstalledInto=Installed into directory %s
+InstalledInto=Instal·lat al directori %s
 BarcodeInitForthird-parties=Inicialització massiva de codis de barres per a tercers
 BarcodeInitForProductsOrServices=Inici massiu de codi de barres per productes o serveis
 CurrentlyNWithoutBarCode=Actualment, té <strong>%s</strong> registres a <strong>%s</strong> %s sense codi de barres definit.
@@ -991,7 +992,7 @@ VATIsNotUsedDesc=El tipus d'IVA proposat per defecte és 0. Aquest és el cas d'
 VATIsUsedExampleFR=A França, es tracta de les societats o organismes que trien un règim fiscal general (General simplificat o General normal), règim en el qual es declara l'IVA.
 VATIsNotUsedExampleFR=A França, es tracta d'associacions que no siguin declarades per vendes o empreses, organitzacions o professions liberals que hagin triat el sistema fiscal de la microempresa (Impost sobre vendes en franquícia) i paguen una franquícia. Impost sobre vendes sense declaració d'impost sobre vendes. Aquesta elecció mostrarà la referència "Impost sobre vendes no aplicable - art-293B de CGI" a les factures.
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
+TypeOfSaleTaxes=Tipus d’impost sobre vendes
 LTRate=Tarifa
 LocalTax1IsNotUsed=No subjecte
 LocalTax1IsUsedDesc=Utilitzar un 2on tipus d'impost (diferent de l'IVA)
@@ -1015,9 +1016,9 @@ LocalTax2IsUsedDescES=El tipus d'IRPF proposat per defecte en les creacions de p
 LocalTax2IsNotUsedDescES=El tipus d'IRPF proposat per defecte es 0. Final de regla.
 LocalTax2IsUsedExampleES=A Espanya, es tracta de persones físiques: autònoms i professionals independents que presten serveis i empreses que han triat el règim fiscal de mòduls.
 LocalTax2IsNotUsedExampleES=A Espanya, es tracta d'empreses no subjectes al règim fiscal de mòduls.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
-UseRevenueStamp=Use a tax stamp
-UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
+UseRevenueStamp=Utilitzar un segell fiscal
+UseRevenueStampExample=El valor del segell fiscal està definit per defecte en la configuració dels diccionaris (%s - %s - %s)
 CalcLocaltax=Informes d'impostos locals
 CalcLocaltax1=Vendes - Compres
 CalcLocaltax1Desc=Els informes es calculen amb la diferència entre les vendes i les compres
@@ -1025,7 +1026,7 @@ CalcLocaltax2=Compres
 CalcLocaltax2Desc=Els informes es basen en el total de les compres
 CalcLocaltax3=Vendes
 CalcLocaltax3Desc=Els informes es basen en el total de les vendes
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+NoLocalTaxXForThisCountry=Segons la configuració d’impostos (vegeu %s - %s - %s), el vostre país no necessita utilitzar aquest tipus d’impost
 LabelUsedByDefault=Etiqueta utilitzada per defecte si no es troba cap traducció per aquest codi
 LabelOnDocuments=Etiqueta sobre documents
 LabelOrTranslationKey=Clau de traducció o cadena
@@ -1116,8 +1117,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Informe de despeses per aprovar
 Delays_MAIN_DELAY_HOLIDAYS=Dies lliures a aprovar
 SetupDescription1=Abans de començar a utilitzar Dolibarr cal definir alguns paràmetres inicials i habilitar/configurar els mòduls.
 SetupDescription2=Les dues seccions següents són obligatòries (les dues primeres entrades al menú Configuració):
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Paràmetres bàsics utilitzats per personalitzar el comportament predeterminat de la teva aplicació (per exemple, per a les funcions relacionades amb el país).
+SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Aquest programari és un conjunt de molts mòduls / aplicacions. Els mòduls relacionats amb les vostres necessitats s’han d’activar i configurar. Les entrades del menú apareixen amb l’activació d’aquests mòduls.
 SetupDescription5=Altres entrades del menú d'instal·lació gestionen paràmetres opcionals.
 LogEvents=Auditoria de la seguretat d'esdeveniments
 Audit=Auditoria
@@ -1136,7 +1137,7 @@ LogEventDesc=Habiliteu el registre per a esdeveniments de seguretat específics.
 AreaForAdminOnly=Els paràmetres de configuració només poden ser establerts per <b>usuaris administradors</b>.
 SystemInfoDesc=La informació del sistema és informació tècnica accessible només en només lectura als administradors.
 SystemAreaForAdminOnly=Aquesta àrea només està disponible per als usuaris administradors. Els permisos d'usuari de Dolibarr no poden canviar aquesta restricció.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+CompanyFundationDesc=Editeu la informació de la vostra empresa / organització. Feu clic al botó "%s" al final de la pàgina quan hagi acabat.
 AccountantDesc=Si teniu un comptable extern, podeu editar aquí la seva informació.
 AccountantFileNumber=Número de fila
 DisplayDesc=Els paràmetres que afecten l'aspecte i el comportament de Dolibarr es poden modificar aquí.
@@ -1272,8 +1273,9 @@ RuleForGeneratedPasswords=Regles per generar i validar contrasenyes
 DisableForgetPasswordLinkOnLogonPage=No mostri l'enllaç "Contrasenya oblidada" a la pàgina d'inici de sessió
 UsersSetup=Configuració del mòdul usuaris
 UserMailRequired=Es necessita un correu electrònic per crear un nou usuari
-UsersDocModules=Document templates for documents generated from user record
-GroupsDocModules=Document templates for documents generated from a group record
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
+UsersDocModules=Plantilles de documents per a documents generats a partir d'un registre d'usuari
+GroupsDocModules=Plantilles de documents per a documents generats a partir d’un registre de grup
 ##### HRM setup #####
 HRMSetup=Configuració de mòdul de gestió de recursos humans
 ##### Company setup #####
@@ -1305,7 +1307,7 @@ BillsPDFModules=Models de documents de factures
 BillsPDFModulesAccordindToInvoiceType=Model de documents de factures d'acord amb el tipus de factura
 PaymentsPDFModules=Models de documents de pagament
 ForceInvoiceDate=Forçar la data de factura a la data de validació
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestedPaymentModesIfNotDefinedInInvoice=Mode de pagament per defecte suggerit per a la factura, quan no estigui definit a la factura
 SuggestPaymentByRIBOnAccount=Suggereix el pagament per retirada per compte
 SuggestPaymentByChequeToAddress=Suggereix pagament mitjançant xec a
 FreeLegalTextOnInvoices=Text lliure en factures
@@ -1317,7 +1319,7 @@ SupplierPaymentSetup=Configuració de pagaments a proveïdors
 PropalSetup=Configuració del mòdul Pressupostos
 ProposalsNumberingModules=Models de numeració de pressupostos
 ProposalsPDFModules=Models de documents de pressupostos
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Mode de pagament per defecte suggerit per al pressupost, quan no estigui definit al pressupost
 FreeLegalTextOnProposal=Text lliure en pressupostos
 WatermarkOnDraftProposal=Marca d'aigua en pressupostos esborrany (en cas d'estar buit)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar compte bancari del pressupost
@@ -1332,7 +1334,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Preguntar per el magatzem d'origen per a la
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Demana el compte bancari de destí de la comanda de compra
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Mode de pagament per defecte suggerit per a la comanda de venda, quan no estigui definit a la comanda de venda
 OrdersSetup=Configuració de gestió d'ordres de vendes
 OrdersNumberingModules=Models de numeració de comandes
 OrdersModelModule=Models de documents de comandes
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Configuració del mòdul Multi-empresa
 ##### Suppliers #####
 SuppliersSetup=Configuració del mòdul de Proveïdor
 SuppliersCommandModel=Plantilla completa de comanda de compra
-SuppliersCommandModelMuscadet=Plantilla completa de comanda de compra 
+SuppliersCommandModelMuscadet=Plantilla completa de comanda de compra (antiga implementació de la plantilla cornas)
 SuppliersInvoiceModel=Plantilla completa de factura de proveïdor
 SuppliersInvoiceNumberingModel=Models de numeració de factures de proveïdor
 IfSetToYesDontForgetPermission=Si establiu un valor vàlid, no us oblideu d'establir els permisos necessaris als grups o persones habilitades per la segona aprovació
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Oculta les imatges en el menú superior
 LeftMenuBackgroundColor=Color de fons pel menú de l'esquerra
 BackgroundTableTitleColor=Color de fons per línies de títol en taules
 BackgroundTableTitleTextColor=Color del text per a la línia del títol de la taula
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Color de fons per les línies senars de les taules
 BackgroundTableLineEvenColor=Color de fons per les línies parells de les taules
 MinimumNoticePeriod=Període mínim de notificació (La solicitud de dia lliure serà donada abans d'aquest període)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=No s'ha trobat la referència de Dolibarr a l'ID del missat
 FormatZip=Codi postal
 MainMenuCode=Codi d'entrada del menú (menu principal)
 ECMAutoTree=Mostra l'arbre ECM automàtic
-OperationParamDesc=Definiu els valors a utilitzar per a l’acció o com extreure valors. Per exemple: <br> objproperty1 = SET: abc <br> objproperty1 = SET: un valor amb substitució de __objpropietat1__ <br> objproperty3 = SETIFEMPTY: abc <br> objproperty4 = EXTRACTE: HEADER: X-Myheaderkey. * [^ s] + (. *) <br> options_myextrafield = EXTRACTE: ASSIGNATURA: ([^ s] *) <br> object.objproperty5 = EXTRACTE: COS: el nom de la meva empresa és ([^ s] *) <br><br> Utilitza un; char com a separador per extreure o establir diverses propietats.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Horari d'obertura
 OpeningHoursDesc=Introduïu aquí l'horari habitual d'obertura de la vostra empresa.
 ResourceSetup=Configuració del mòdul de recursos
@@ -1970,7 +1973,7 @@ WarningValueHigherSlowsDramaticalyOutput=Advertència, els valors més alts fren
 ModuleActivated=El mòdul %s està activat i alenteix la interfície
 EXPORTS_SHARE_MODELS=Els models d’exportació es comparteixen amb tothom
 ExportSetup=Configuració del mòdul Export
-ImportSetup=Setup of module Import
+ImportSetup=Configuració del mòdul Import
 InstanceUniqueID=ID únic de la instància
 SmallerThan=Menor que
 LargerThan=Major que
@@ -1991,7 +1994,9 @@ MakeAnonymousPing=Creeu un ping &quot;+1&quot; anònim al servidor de bases Doli
 FeatureNotAvailableWithReceptionModule=Funció no disponible quan el mòdul Recepció està habilitat
 EmailTemplate=Plantilla per correu electrònic
 EMailsWillHaveMessageID=Els correus electrònics tindran una etiqueta "Referències" que coincideix amb aquesta sintaxi
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
+PDF_USE_ALSO_LANGUAGE_CODE=Si voleu tenir alguns textos del vostre PDF duplicats en 2 idiomes diferents en el mateix PDF generat, heu d’establir aquí aquest segon idioma a fi que el PDF generat contingui 2 idiomes diferents a la mateixa pàgina, el triat per generar el PDF i aquest segon ( només algunes plantilles PDF suporten això). Manteniu-lo buit per a 1 idioma per PDF.
 FafaIconSocialNetworksDesc=Introduïu aquí el codi de la icona de FontAwesome. Si no sabeu què és FontAwesome, podeu utilitzar el llibre genèric d’adreces.
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
+RssNote=Nota: Cada definició de canal RSS proporciona un giny que heu d'habilitar per tenir-lo disponible al tauler de control
+JumpToBoxes=Vés a Configuració -> Ginys
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index b6726202768..ad19836153c 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=Nº de factures per mes
 AmountOfBills=Import de les factures
 AmountOfBillsHT=Import de factures (net d'impostos)
 AmountOfBillsByMonthHT=Import de les factures per mes (Sense IVA)
-ShowSocialContribution=Mostra els impostos varis
-ShowBill=Veure factura
-ShowInvoice=Veure factura
-ShowInvoiceReplace=Veure factura rectificativa
-ShowInvoiceAvoir=Veure abonament
-ShowInvoiceDeposit=Mostrar factura d'acompte
-ShowInvoiceSituation=Mostra la factura de situació
 UseSituationInvoices=Permetre la factura de la situació
 UseSituationInvoicesCreditNote=Permet la nota de crèdit de la factura de situació
 Retainedwarranty=Garantia retinguda
@@ -233,7 +226,6 @@ setretainedwarranty=Estableix la garantia retinguda
 setretainedwarrantyDateLimit=Estableix el límit de data de garantia conservada
 RetainedWarrantyDateLimit=Data límit de garantia retinguda
 RetainedWarrantyNeed100Percent=La factura de situació ha d’estar al progrés 100%% per mostrar-se en PDF
-ShowPayment=Veure pagament
 AlreadyPaid=Ja pagat
 AlreadyPaidBack=Ja reemborsat
 AlreadyPaidNoCreditNotesNoDeposits=Ja pagat (exclosos els abonaments i bestretes)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generat a partir de la plantilla factura %s
 WarningInvoiceDateInFuture=Alerta, la data de factura és major que la data actual
 WarningInvoiceDateTooFarInFuture=Alerta, la data de factura és molt antiga respecte la data actual
 ViewAvailableGlobalDiscounts=Veure descomptes disponibles
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Estat
 PaymentConditionShortRECEP=A la recepció
@@ -512,11 +505,11 @@ ToMakePayment=Pagar
 ToMakePaymentBack=Reemborsar
 ListOfYourUnpaidInvoices=Llistat de factures impagades
 NoteListOfYourUnpaidInvoices=Nota: Aquest llistat només conté factures de tercers que tens enllaçats com a agent comercial.
-RevenueStamp=Tax stamp
+RevenueStamp=Segell fiscal
 YouMustCreateInvoiceFromThird=Aquesta opció només està disponible al moment de crear una factura des de la llengüeta "Client" de tercers
 YouMustCreateInvoiceFromSupplierThird=Aquesta opció només està disponible quan es crea la factura des de la pestanya "proveïdor" d'un tercer
 YouMustCreateStandardInvoiceFirstDesc=Primer has de crear una factura estàndard i convertir-la en "plantilla" per crear una nova plantilla de factura
-PDFCrabeDescription=Plantilla de factura PDF Crabe. Una plantilla de factura completa 
+PDFCrabeDescription=Plantilla de factura PDF Crabe. Una plantilla de factura completa (implementació antiga de la plantilla Sponge)
 PDFSpongeDescription=Plantilla PDF de factures Sponge. Una plantilla de factura completa
 PDFCrevetteDescription=Plantilla Crevette per factures PDF. Una plantilla de factura completa per factures de situació.
 TerreNumRefModelDesc1=Retorna el nombre sota el format %syymm-nnnn per a les factures i %syymm-nnnn per als abonaments on yy és l'any, mm. el mes i nnnn un comptador seqüencial sense ruptura i sense permanència a 0
diff --git a/htdocs/langs/ca_ES/modulebuilder.lang b/htdocs/langs/ca_ES/modulebuilder.lang
index 2510d73baf5..ad2dd76cea9 100644
--- a/htdocs/langs/ca_ES/modulebuilder.lang
+++ b/htdocs/langs/ca_ES/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=Llista d'entrades de diccionaris
 ListOfPermissionsDefined=Llista de permisos definits
 SeeExamples=Mira exemples aquí
 EnabledDesc=Condició per tenir activat aquest camp (Exemples: 1 ó $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=És visible el camp? (Exemples: 0=Mai visible, 1=Visible en llistat i en formularis de crear/modificar/visualitzar, 2=Visible només en llistat, 3=Visible només en formularis de crear/modificar/visualitzar (no en llistat), 4=Visible en llistat i només en formularis de modificar/visualitzar (no al crear), 5=Visible en llistat i només en formularis de visualitzar (no al crear ni al modificar). Utilitzar el valor negatiu significa que el camp no es mostra per defecte al llistat, però es pot seleccionar per a la seva visualització). Pot ser una expressió, per exemple: <br> preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br> ($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Mostra aquest camp en documents PDF compatibles. Podeu gestionar la posició amb el camp "Posició". <br/> Actualment, els models PDF compatibles coneguts són: eratostè 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Mostra aquest camp en documents PDF compatibles. Podeu gestionar la posició amb el camp "Posició". <br/> Actualment, els models PDF compatibles coneguts són: eratosthene (comanda), espadon (enviament), sponge (factures), cyan (propal / pressupost), cornas (comanda del proveïdor) <br/> <br/><strong>Per al document :</strong><br/>0 = no es mostra<br/> 1 = mostra <br/> 2 = només si no està buit <br/> <br/> <strong> Per a les línies de documents: </strong> <br/> 0 = no es veuen les <br/> 1 = mostra en una columna <br/> = 3 = mostra a la columna de descripció de línia després de la descripció <br/> 4 = mostra a la columna de descripció després de la descripció només si no està buida
 DisplayOnPdf=Visualització en PDF
 IsAMeasureDesc=Es pot acumular el valor del camp per obtenir un total en la llista? (Exemples: 1 o 0)
 SearchAllDesc=El camp utilitzat per realitzar una cerca des de l'eina de cerca ràpida? (Exemples: 1 o 0)
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 906e3a6f5e4..aa4fe0eaa00 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -186,7 +186,7 @@ PlannedWorkload=Càrrega de treball prevista
 PlannedWorkloadShort=Càrrega de treball
 ProjectReferers=Registres relacionats
 ProjectMustBeValidatedFirst=El projecte primer ha de ser validat
-FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+FirstAddRessourceToAllocateTime=Assigna un recurs d'usuari com a contacte del projecte per assignar temps
 InputPerDay=Entrada per dia
 InputPerWeek=Entrada per setmana
 InputPerMonth=Entrada per mes
@@ -238,7 +238,7 @@ LatestModifiedProjects=Darrers %s projectes modificats
 OtherFilteredTasks=Altres tasques filtrades
 NoAssignedTasks=No es troben tasques assignades (assigni el projecte/tasques a l'usuari actual des del quadre de selecció superior per especificar-ne l'hora)
 ThirdPartyRequiredToGenerateInvoice=S'ha de definir un tercer en el projecte per poder facturar-lo.
-ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+ChooseANotYetAssignedTask=Trieu una tasca que encara no us ha estat assignada
 # Comments trans
 AllowCommentOnTask=Permet comentaris dels usuaris a les tasques
 AllowCommentOnProject=Permetre comentaris dels usuaris als projectes
@@ -255,8 +255,8 @@ ServiceToUseOnLines=Servei d'ús a les línies
 InvoiceGeneratedFromTimeSpent=La factura %s s'ha generat a partir del temps dedicat al projecte
 ProjectBillTimeDescription=Comproveu si heu introduït el full de temps en les tasques del projecte I teniu previst generar factures des del full de temps per facturar al client del projecte (no comproveu si voleu crear la factura que no es basa en els fulls de temps introduïts). Nota: Per generarla  factura, aneu a la pestanya "Temps introduït" del projecte i seleccioneu les línies que cal incloure.
 ProjectFollowOpportunity=Segueix l’oportunitat
-ProjectFollowTasks=Segueix les tasques
-Usage=Usage
+ProjectFollowTasks=Follow tasks or time spent
+Usage=Ús
 UsageOpportunity=Ús: Oportunitat
 UsageTasks=Ús: Tasques
 UsageBillTimeShort=Ús: temps de facturació
@@ -264,4 +264,4 @@ InvoiceToUse=Esborrany de factura a utilitzar
 NewInvoice=Nova factura
 OneLinePerTask=Una línia per tasca
 OneLinePerPeriod=Una línia per període
-RefTaskParent=Ref. Parent Task
+RefTaskParent=Ref. Tasca pare
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index 95f7f8fff4d..1db4f01b26e 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -57,7 +57,7 @@ NoPageYet=Encara sense pàgines
 YouCanCreatePageOrImportTemplate=Podeu crear una pàgina nova o importar una plantilla completa del lloc web
 SyntaxHelp=Ajuda sobre consells de sintaxi específics
 YouCanEditHtmlSourceckeditor=Podeu editar el codi font HTML usant el botó "Codi font" a l'editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Podeu incloure codi PHP a aquest origen mitjançant etiquetes <strong>&lt;?php ?&gt;</strong> . Estan disponibles les variables globals següents: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs. <br><br><span class="fa fa-bug"></span> També podeu incloure contingut d’una altra pàgina/contenidor amb la sintaxi següent: <br> <strong>&lt;?php includeContainer('alies_del_contenidor_a_incloure'); ?&gt;</strong> <br><br><span class="fa fa-bug"></span> Podeu fer una redirecció a una altra pàgina/contenidor amb la sintaxi següent (Nota: no produiu cap contingut de sortida abans d'una redirecció): <br> <strong>&lt;?php redirectToContainer('alies_del_contenidor_a_redireccionar'); ?&gt;</strong> <br><br><span class="fa fa-link"></span> Per afegir un enllaç a una altra pàgina, utilitzeu la sintaxi: <br> <strong>&lt;a href="alies_de_la_plana.php"&gt;elmeuenllaç&lt;a&gt;</strong> <br><br><span class="fa fa-download"></span> Per incloure un <strong>enllaç per baixar</strong> un fitxer emmagatzemat al directori  <strong>documents</strong> , utilitzeu l'empaquetador <strong>document.php</strong> : <br> Per exemple, per a un fitxer a documents/ecm (cal estar registrat), la sintaxi és: <br> <strong>&lt;a href="/document.php?modulepart=ecm&file=[directori_relatiu/]nomdefitxer.ext"&gt;</strong> <br> Per a un fitxer a documents/medias (directori obert per a accés públic), la sintaxi és: <br> <strong>&lt;a href="/document.php?modulepart=medias&file=[directori_relatiu/]nomdefitxer.ext"&gt;</strong> <br> Per a un fitxer compartit amb un enllaç de compartició (accés obert mitjançant la clau hash de compartició del fitxer), la sintaxi és: <br> <strong>&lt;a href="/document.php?hashp=claupublicadecomparticio"&gt;</strong> <br><br><span class="fa fa-picture-o"></span> Per incloure una <strong>imatge</strong> emmagatzemada al directori de <strong>documents</strong> , utilitzeu l'empaquetador <strong>viewimage.php</strong> : <br> Per exemple, per a una imatge a documents/medias (directori obert per a accés públic), la sintaxi és: <br> <strong>&lt;img src="/ viewimage.php?modulepart=medias&file=[directori_relatiu/]nomdelfitxer.ext"&gt;</strong> <br><br> Més exemples de codi HTML o dinàmic disponibles a <a href="%s" target="_blank">la documentació wiki</a> <br> .
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clona la pàgina/contenidor
 CloneSite=Clona el lloc
 SiteAdded=S'ha afegit el lloc web
@@ -77,7 +77,7 @@ BlogPost=Publicació del bloc
 WebsiteAccount=Compte del lloc web
 WebsiteAccounts=Comptes de lloc web
 AddWebsiteAccount=Crear un compte de lloc web
-BackToListOfThirdParty=Tornar a la llista de Tercers
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Deshabilita primer el lloc web
 MyContainerTitle=Títol del meu lloc web
 AnotherContainer=Així s’inclou contingut d’una altra pàgina / contenidor (pot ser que tingueu un error aquí si activeu el codi dinàmic perquè pot no existir el subconjunt incrustat)
diff --git a/htdocs/langs/ca_ES/zapier.lang b/htdocs/langs/ca_ES/zapier.lang
new file mode 100644
index 00000000000..d1cf95a01f8
--- /dev/null
+++ b/htdocs/langs/ca_ES/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier per a Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Mòdul Zapier per a Dolibarr
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Configuració de Zapier per a Dolibarr
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index 57aa23f2157..6be591f9d54 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Prověřené řádky faktury
 ExpenseReportLines=Řádky výkazů výdajů navázat
 ExpenseReportLinesDone=Vázané linie vyúčtování výdajů
 IntoAccount=Prověřit řádky v účetním účtu
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Prověřit
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Účtování účet registrovaných darů
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Účtovací účet pro registraci předplatného
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Účetní účet ve výchozím nastavení pro prodané produkty (použít, pokud není definován v listu produktu)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Účetní účet ve výchozím nastavení pro zakoupené služby (použít, pokud není definován v servisním listu)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Účetní účet ve výchozím nastavení pro prodané služby (použít, pokud není definován v servisním listu)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Účet subjektu není definován nebo neznámý subjekt. Chyba blokování.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Neznámý účet subjektu a účet čekání není definován. Chyba blokování
 PaymentsNotLinkedToProduct=Platba není spojena s žádným produktem / službou
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Skupina účtů
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Celkový obrat před zdaněním
 TotalMarge=Celkové tržby marže
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export pro Quadratus QuadraCompta
 Modelcsv_ebp=Export pro EBP
 Modelcsv_cogilog=Export pro Cogilog
 Modelcsv_agiris=Export pro Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV konfigurovatelný
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Schéma Id účtů
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=prodejní režim
 OptionModeProductSellIntra=Režim prodeje vyváženého v EHS
 OptionModeProductSellExport=Režim prodeje vyvážené v jiných zemích
 OptionModeProductBuy=Nákupní režim
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Zobrazit všechny produkty s vyúčtováním pro přímý prodej.
 OptionModeProductSellIntraDesc=Zobrazit všechny produkty s účetním účtem pro prodej v EHS.
 OptionModeProductSellExportDesc=Zobrazit všechny produkty s účetním účtem pro ostatní zahraniční prodeje.
 OptionModeProductBuyDesc=Zobrazit všechny produkty které připadají v úvahu pro nákupy.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Odstraňte účtovací kód z řádků, které neexistují ve schématech účtu
 CleanHistory=Obnovit všechny vazby pro vybraný rok
 PredefinedGroups=Předdefinované skupiny
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Účet byl odstraněn ze skupiny
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Řada účetních účtu
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 166b9aaaaf3..290281ecabb 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web server uživatel / skupina
 NoSessionFound=Nastavení Vašeho PHP Vám neumožňuje výpis aktivních relací. Složka sloužící k uložení relací <b>(%s)</b> může být chráněna (např. nastavením oprávnění OS nebo PHP open_basedir).
 DBStoringCharset=Znaková sada pro databázi s daty
 DBSortingCharset=Znaková sada pro řazení databáze s daty
+HostCharset=Host charset
 ClientCharset=Klientská znaková sada
 ClientSortingCharset=Srovnání klientů
 WarningModuleNotActive=Modul <b>%s</b> musí být povolen
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Zaškrtávače
 ExtrafieldCheckBoxFromList=Zaškrtávací políčka z tabulky
 ExtrafieldLink=Odkaz na objekt
 ComputedFormula=Vypočtené pole
-ComputedFormulaDesc=Zde můžete zadat vzorec pomocí jiných vlastností objektu nebo libovolného kódování PHP pro získání dynamické vypočtené hodnoty. Můžete použít libovolné kompatibilní formule PHP včetně "?" operátor stavu a následující globální objekt: <strong> $ db, $ conf, $ langs, $ mysoc, $ user, $ objekt </strong>. <br> <strong> VAROVÁNÍ </strong>: K dispozici jsou pouze některé vlastnosti objektu $. Pokud potřebujete vlastnosti, které nejsou načteny, jednoduše přiveďte objekt do vzorce, jako ve druhém příkladu. <br> Použití vypočítaného pole znamená, že nemůžete zadat libovolnou hodnotu z rozhraní. Také pokud existuje syntaktická chyba, vzorec může vrátit nic. <br> <br> Příklad vzorce: <br> $ object-> id < 10 ? round($object-> id / 2, 2): ($ objekt-> id + 2 * $ user-> id) * (int) substr ($ mysoc-> zip, 1, 2 ) <br> <br> Příklad pro opětovné načtení objektu <br> (($ reloadedobj = new Societe ($ db)) && ($ reloadedobj-> fetch ($ obj-> id? $ Obj-> id: > rowid: $ object-> id))> 0))? $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1' <br> <br> Jiný příklad vzoru pro zatížení objektu a jeho nadřazeného objektu: <br> ($ reloadedobj = new Task )) && ($ reloadedobj-> fetch ($ object-> id)> 0) && ($ secondloadedobj = nový projekt ($ db)) && ($ secondloadedobj-> fetch ($ reloadedobj-> fk_project)> 0))? $ secondloadedobj-> ref: 'Nadřazený projekt nebyl nalezen'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Uložte vypočítané pole
 ComputedpersistentDesc=Vypočítaná další pole pole budou uložena do databáze, hodnota však bude přepočítána pouze při změně objektu tohoto pole. Pokud vypočítané pole závisí na jiných objektech nebo globálních datech, může být tato hodnota špatná !!
 ExtrafieldParamHelpPassword=Pokud ponecháte toto pole prázdné, znamená to, že tato hodnota bude uložena bez šifrování (pole musí být skryto pouze s hvězdou na obrazovce). <br> Nastavte "auto" pro použití výchozího šifrovacího pravidla pro uložení hesla do databáze (pak hodnota bude číst pouze hash, žádný způsob získání původní hodnoty)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=Kurz IRPF ve výchozím nastavení při vytváření prosp
 LocalTax2IsNotUsedDescES=Standardně navrhovaný IRPF je 0. Konec pravidla.
 LocalTax2IsUsedExampleES=Ve Španělsku, na volné noze a nezávislí odborníci, kteří poskytují služby a firmy, kteří se rozhodli daňového systému modulů.
 LocalTax2IsNotUsedExampleES=Ve Španělsku jsou podniky, které nepodléhají daňovému systému modulů.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Zprávy o místních daních
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Pravidla pro generování a ověřování hesel
 DisableForgetPasswordLinkOnLogonPage=Na stránce Přihlášení nezobrazujte odkaz Zapomenuté heslo
 UsersSetup=Uživatelé modul nastavení
 UserMailRequired=K vytvoření nového uživatele potřebujete e-mail
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Nastavení více firemních modulů
 ##### Suppliers #####
 SuppliersSetup=Nastavení modulu dodavatele
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Číslovací modely faktur dodavatelů
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Skrýt obrázky v Top nabídky
 LeftMenuBackgroundColor=barva pozadí na levé menu
 BackgroundTableTitleColor=Barva pozadí pro tabulku názvu linky
 BackgroundTableTitleTextColor=Barva textu pro název řádku tabulky
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Barva pozadí pro liché řádky tabulky
 BackgroundTableLineEvenColor=barva pozadí pro sudé řádky tabulky
 MinimumNoticePeriod=Minimální výpovědní lhůta (Vaše žádost dovolená musí být provedeno před tímto zpožděním)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Vstupní kód nabídky (hlavní menu)
 ECMAutoTree=Zobrazit automatický strom ECM
-OperationParamDesc=Definujte hodnoty, které chcete použít pro akci, nebo jak extrahovat hodnoty. Například: <br> objproperty1 = SET: abc <br> objproperty1 = SET: hodnota s nahrazením __objproperty1__ <br> objproperty3 = SETIFEMPTY: abc <br> objproperty4 = EXTRACT: HEADER: X-Myheaderkey. * [^ s] + (. *) <br> options_myextrafield = EXTRACT: SUBJECT: ([^]] *) <br> object.objproperty5 = EXTRACT: BODY: Název mé společnosti je (^ ^] *) <br><br> Použijte; char jako oddělovač extrahovat nebo nastavit několik vlastností.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Otevírací doba
 OpeningHoursDesc=Zadejte zde běžnou pracovní dobu vaší společnosti.
 ResourceSetup=Konfigurace modulu zdrojů
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index 66ebc9db50c..85a6e50bad3 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=Počet faktur za měsíc
 AmountOfBills=Částka faktur
 AmountOfBillsHT=Výše faktur (bez daně)
 AmountOfBillsByMonthHT=Výše faktur za měsíc (bez daně)
-ShowSocialContribution=Zobrazit sociální / fiskální daně
-ShowBill=Zobrazit fakturu
-ShowInvoice=Zobrazit fakturu
-ShowInvoiceReplace=Zobrazit opravenou fakturu
-ShowInvoiceAvoir=Zobrazit dobropis
-ShowInvoiceDeposit=Zobrazit zálohovou fakturu
-ShowInvoiceSituation=Zobrazit fakturu situace
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Zobrazit platbu
 AlreadyPaid=Již zaplacené
 AlreadyPaidBack=Již vrácené platby
 AlreadyPaidNoCreditNotesNoDeposits=Již zaplacené (bez dobropisů a vkladů)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Upozornění: datum faktury je vyšší než aktuální datum
 WarningInvoiceDateTooFarInFuture=Upozornění: datum faktury je příliš daleko od aktuálního data
 ViewAvailableGlobalDiscounts=Zobrazit dostupné slevy
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Splatné k datu přijetí
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=Tato možnost je k dispozici pouze při vytváření faktury z karty "Zákazník" subjektu
 YouMustCreateInvoiceFromSupplierThird=Tato možnost je k dispozici pouze při vytváření faktury z karty "Prodejce" subjektu
 YouMustCreateStandardInvoiceFirstDesc=Musíte nejprve vytvořit standardní fakturu a převést ji do „šablony“ pro vytvoření nové šablony faktury
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Faktura Šablona PDF Sponge. Kompletní šablona faktury
 PDFCrevetteDescription=Faktura PDF šablony Crevette. Kompletní fakturu šablona pro situace faktur
 TerreNumRefModelDesc1=Vrátí číslo ve formátu %s yymm-nnnn pro standardní faktury a %s yymm-nnnn pro dobropisy, kde yy je rok, mm je měsíc a nnnn je sekvence bez přerušení a bez návratu k 0
diff --git a/htdocs/langs/cs_CZ/blockedlog.lang b/htdocs/langs/cs_CZ/blockedlog.lang
index d5505d61df0..bb64468a731 100644
--- a/htdocs/langs/cs_CZ/blockedlog.lang
+++ b/htdocs/langs/cs_CZ/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Nezměnitelné záznamy
 ShowAllFingerPrintsMightBeTooLong=Zobrazit všechny archivované záznamy (mohou být dlouhé)
 ShowAllFingerPrintsErrorsMightBeTooLong=Zobrazit všechny neplatné protokoly archivu (mohou být dlouhé)
 DownloadBlockChain=Stažení otisků prstů
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archivovaná položka protokolu není platná. To znamená, že někdo (hacker?) upravil některá data tohoto záznamu poté, co byl zaznamenán, nebo vymazal předchozí archivovaný záznam (zkontrolujte, zda existuje řádek s předchozím #).
 OkCheckFingerprintValidity=Archivovaný záznam protokolu je platný. Údaje na tomto řádku nebyly změněny a záznam je následující.
 OkCheckFingerprintValidityButChainIsKo=Archivovaný protokol se zdá být v porovnání s předchozím protokolem platný, ale řetězec byl dříve poškozen.
 AddedByAuthority=Uloženo do vzdálené autority
diff --git a/htdocs/langs/cs_CZ/commercial.lang b/htdocs/langs/cs_CZ/commercial.lang
index def4e02f40b..6224ac01080 100644
--- a/htdocs/langs/cs_CZ/commercial.lang
+++ b/htdocs/langs/cs_CZ/commercial.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Commerce
-CommercialArea=Commerce area
+Commercial=komerce
+CommercialArea=Obchodní oblast
 Customer=Zákazník
 Customers=Zákazníci
 Prospect=Cíl
diff --git a/htdocs/langs/cs_CZ/deliveries.lang b/htdocs/langs/cs_CZ/deliveries.lang
index 484ad45eeb9..e38b668da7f 100644
--- a/htdocs/langs/cs_CZ/deliveries.lang
+++ b/htdocs/langs/cs_CZ/deliveries.lang
@@ -2,7 +2,7 @@
 Delivery=Dodávka
 DeliveryRef=Ref Doručení
 DeliveryCard=Příjmová karta
-DeliveryOrder=Delivery receipt
+DeliveryOrder=Potvrzení o doručení
 DeliveryDate=Termín dodání
 CreateDeliveryOrder=Generovat doklad o doručení
 DeliveryStateSaved=Stav doručení byl uložen
diff --git a/htdocs/langs/cs_CZ/exports.lang b/htdocs/langs/cs_CZ/exports.lang
index 5f71e297bf6..85d98be9e68 100644
--- a/htdocs/langs/cs_CZ/exports.lang
+++ b/htdocs/langs/cs_CZ/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Pole název
 NowClickToGenerateToBuildExportFile=Nyní vyberte formát souboru v poli se seznamem a klikněte na "Generovat" pro vytvoření exportního souboru ...
 AvailableFormats=Dostupné formáty
 LibraryShort=Knihovna
+ExportCsvSeparator=Oddělovač Csv caracter
+ImportCsvSeparator=Oddělovač Csv caracter
 Step=Krok
 FormatedImport=Asistent importu
 FormatedImportDesc1=Tento modul umožňuje aktualizaci stávajících dat nebo přidávání nových objektů do databáze ze souboru bez technických znalostí pomocí asistenta.
@@ -37,7 +39,7 @@ FormatedExportDesc3=Při výběru dat pro export můžete zvolit formát výstup
 Sheet=List
 NoImportableData=Žádné importovatelné údaje (žádný modul s definicemi povolení importu dat)
 FileSuccessfullyBuilt=Soubor byl vygenerován
-SQLUsedForExport=SQL Request used to extract data
+SQLUsedForExport=Dotaz SQL použitý k extrahování dat
 LineId=Id řádku
 LineLabel=Označení řádku
 LineDescription=Popis řádku
diff --git a/htdocs/langs/cs_CZ/interventions.lang b/htdocs/langs/cs_CZ/interventions.lang
index 3c39ac6a792..f9dc01287b0 100644
--- a/htdocs/langs/cs_CZ/interventions.lang
+++ b/htdocs/langs/cs_CZ/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Oblast intervencí
 DraftFichinter=Návrhy intervence
 LastModifiedInterventions=Poslední %s modifikované intervence
 FichinterToProcess=Zpracovávané intervence
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=V návaznosti kontakt se zákazníkem
-# Modele numérotation
 PrintProductsOnFichinter=Tisk také řádky typu „produktu“ (nejen služby) na intervenční karty
 PrintProductsOnFichinterDetails=intervence generované z objednávek
 UseServicesDurationOnFichinter=Doba použití služby pro zásahy generovaných z objednávek
@@ -53,7 +51,6 @@ InterventionStatistics=Statistiky intervencí
 NbOfinterventions=Počet zásahových karet
 NumberOfInterventionsByMonth=Počet intervenčních karet podle měsíce (datum platnosti)
 AmountOfInteventionNotIncludedByDefault=Částka intervence není zahrnutá do výkazu zisku (ve většině případů se časové pásmo používá k počítání vynaloženého času). Přidejte možnost PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT na hodnotu 1 do domova-nastavení-jiné, abyste je zahrnovali.
-##### Exports #####
 InterId=intervence id
 InterRef=Intervence ref.
 InterDateCreation=Datum vytvoření intervence
@@ -65,3 +62,5 @@ InterLineId=Linka ID intervence
 InterLineDate=Řádek data intervence
 InterLineDuration=Linka trvání intervence
 InterLineDesc=Linka popis intervence
+RepeatableIntervention=Šablona intervence
+ToCreateAPredefinedIntervention=Chcete-li vytvořit předdefinovaný nebo opakující se zásah, vytvořte společný zásah a převeďte jej na intervenční šablonu
diff --git a/htdocs/langs/cs_CZ/languages.lang b/htdocs/langs/cs_CZ/languages.lang
index 81c1e8e5a31..53bbcc27024 100644
--- a/htdocs/langs/cs_CZ/languages.lang
+++ b/htdocs/langs/cs_CZ/languages.lang
@@ -65,7 +65,7 @@ Language_mk_MK=Makedonský
 Language_mn_MN=Mongolian
 Language_nb_NO=Norština (Bokmål)
 Language_nl_BE=Nizozemí (Belgie)
-Language_nl_NL=Dutch
+Language_nl_NL=holandský
 Language_pl_PL=Polsky
 Language_pt_BR=Portugalština (Brazílie)
 Language_pt_PT=Portugalština
diff --git a/htdocs/langs/cs_CZ/link.lang b/htdocs/langs/cs_CZ/link.lang
index 3d620dcba76..310b3935630 100644
--- a/htdocs/langs/cs_CZ/link.lang
+++ b/htdocs/langs/cs_CZ/link.lang
@@ -8,4 +8,4 @@ LinkRemoved=Odkaz %s byl odstraněn
 ErrorFailedToDeleteLink= Nepodařilo se odstranit odkaz '<b>%s</b>'
 ErrorFailedToUpdateLink= Nepodařilo se aktualizovat odkaz '<b>%s</b>'
 URLToLink=Připojit URL
-OverwriteIfExists=Overwrite file if exists
+OverwriteIfExists=Pokud existuje, přepište soubor
diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
index f154b82748f..a8bbd0da669 100644
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/htdocs/langs/cs_CZ/mails.lang
@@ -78,9 +78,9 @@ GroupEmails=Skupinové e-maily
 OneEmailPerRecipient=Jeden e-mail na jednoho příjemce (ve výchozím nastavení je vybrán jeden e-mail na záznam)
 WarningIfYouCheckOneRecipientPerEmail=Upozorňujeme, že pokud zaškrtnete toto políčko, znamená to, že bude odesláno pouze jeden e-mail pro několik vybraných záznamů, takže pokud vaše zpráva obsahuje substituční proměnné, které odkazují na data záznamu, nebude možné je nahradit.
 ResultOfMailSending=Výsledek masového odesílání e-mailu
-NbSelected=Number selected
-NbIgnored=Number ignored
-NbSent=Number sent
+NbSelected=Vybrané číslo
+NbIgnored=Číslo ignorováno
+NbSent=Číslo bylo odesláno
 SentXXXmessages=%s odeslaná zpráva(y).
 ConfirmUnvalidateEmailing=Opravdu chcete změnit e-mail <b> %s </b>pro návrh stavu?
 MailingModuleDescContactsWithThirdpartyFilter=Kontakt s filtry zákazníků
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=Žádný kontakt / adresa s nalezenou kategorií
 NoContactLinkedToThirdpartieWithCategoryFound=Žádný kontakt / adresa s nalezenou kategorií
 OutGoingEmailSetup=Nastavení odchozí pošty
 InGoingEmailSetup=Příchozí nastavení e-mailu
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+OutGoingEmailSetupForEmailing=Nastavení odchozí pošty (pro modul %s)
 DefaultOutgoingEmailSetup=Výchozí nastavení odchozí pošty
 Information=Informace
 ContactsWithThirdpartyFilter=Kontakty s filtrem subjektu
diff --git a/htdocs/langs/cs_CZ/margins.lang b/htdocs/langs/cs_CZ/margins.lang
index 5e183d746a9..be4b9a60b78 100644
--- a/htdocs/langs/cs_CZ/margins.lang
+++ b/htdocs/langs/cs_CZ/margins.lang
@@ -16,29 +16,30 @@ MarginDetails=Detaily marže
 ProductMargins=Produktová marže
 CustomerMargins=Zákaznická marže
 SalesRepresentativeMargins=Obchodní zástupce marže
+ContactOfInvoice=Kontakt na fakturu
 UserMargins=Uživatelské marže
 ProductService=Produkt nebo služba
 AllProducts=Všechny produkty a služby
 ChooseProduct/Service=Zvolte produkt nebo službu
-ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNull=Nákup síly/cena za cenu prodejní ceny, pokud není definována
+ForceBuyingPriceIfNullDetails=Není-li cena nákupu / cena stanovena a tato volba je zapnutá, bude marže nulová na řádku (cena nákupu / prodejní cena = prodejní cena), v opačném případě ("OFF") se marge rovná navrhovanému selhání.
 MARGIN_METHODE_FOR_DISCOUNT=Metoda marže pro globální slevy
 UseDiscountAsProduct=Jako produkt
 UseDiscountAsService=Jako služba
 UseDiscountOnTotal=Na mezisoučet
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definuje, zda globální sleva je považován za výrobek, službu, nebo pouze za mezisoučet pro výpočet marže.
-MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best vendor price
-MargeType2=Margin on Weighted Average Price (WAP)
-MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MARGIN_TYPE=Nákupní/prodejní cena implicitně navrhovaná pro výpočet marže
+MargeType1=Marže za nejlepší cenu dodavatele
+MargeType2=Marže z vážené průměrné ceny (WAP)
+MargeType3=Marže z prodejní ceny
+MarginTypeDesc=* Rozpětí pro nejlepší nákupní cenu = Prodejní cena - Nejlepší cena prodejce definovaná na produktové kartě <br> * Marže na váženou průměrnou cenu (WAP) = Prodejní cena (WAP) nebo nejlepší cena prodejce, pokud WAP ještě není definován <br> * Marže na nákladové ceně = Prodejní cena - Nákladová cena definovaná na produktové kartě nebo WAP, pokud cena není definována, nebo nejlepší cena prodejce, pokud WAP ještě není definován
 CostPrice=Náklady
 UnitCharges=Jednotkové poplatky
 Charges=Poplatky
 AgentContactType=Obchodní zástupce - typ kontaktu
-AgentContactTypeDetails=Definujete, jaký typ kontaktu (propojený na fakturách) bude použit pro zprávu o marži pro prodejního zástupce
+AgentContactTypeDetails=Určete, jaký typ kontaktu (propojený na fakturách) bude použit pro hlášení marží na jeden kontakt / adresu. Čtení statistik o kontaktu není spolehlivé, protože ve většině případů nemusí být kontakt výslovně definován na fakturách.
 rateMustBeNumeric=Hodnocení musí být číselná hodnota
 markRateShouldBeLesserThan100=Označení sazby by měla být nižší než 100
 ShowMarginInfos=Ukázat informace o marži
-CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+CheckMargins=Detail marže
+MarginPerSaleRepresentativeWarning=Zpráva o marži na uživatele používá spojení mezi subjekty a prodejními zástupci pro výpočet marže každého prodejního zástupce. Vzhledem k tomu, že některé subjekty nemusí mít žádný specializovaný prodej a některé subjekty mohou být propojeny s několika, některé částky nemusí být zahrnuty do této zprávy (pokud neexistuje obchodní zástupce) a některé se mohou objevit na různých řádcích (u každého prodejce) .
diff --git a/htdocs/langs/cs_CZ/modulebuilder.lang b/htdocs/langs/cs_CZ/modulebuilder.lang
index e339de2a10d..d97c60a25a2 100644
--- a/htdocs/langs/cs_CZ/modulebuilder.lang
+++ b/htdocs/langs/cs_CZ/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=Seznam definovaných oprávnění
 SeeExamples=Viz příklady zde
 EnabledDesc=Podmínka, aby bylo toto pole aktivní (příklady: 1 nebo $ conf-> global-> MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Může být hodnota pole kumulativní, aby se dostala do seznamu celkem? (Příklady: 1 nebo 0)
 SearchAllDesc=Používá se pole pro vyhledávání pomocí nástroje rychlého vyhledávání? (Příklady: 1 nebo 0)
diff --git a/htdocs/langs/cs_CZ/multicurrency.lang b/htdocs/langs/cs_CZ/multicurrency.lang
index 463f47b837e..602f80e50e4 100644
--- a/htdocs/langs/cs_CZ/multicurrency.lang
+++ b/htdocs/langs/cs_CZ/multicurrency.lang
@@ -18,3 +18,5 @@ MulticurrencyReceived=Přijatá, původní měna
 MulticurrencyRemainderToTake=Zbývající částka, původní měna
 MulticurrencyPaymentAmount=Výše platby, původní měna
 AmountToOthercurrency=Částka (v měně přijatého účtu)
+CurrencyRateSyncSucceed=Synchronizace měnového kurzu proběhla úspěšně
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Pro online platby použijte měnu dokumentu
diff --git a/htdocs/langs/cs_CZ/opensurvey.lang b/htdocs/langs/cs_CZ/opensurvey.lang
index bc050e5a4d0..a492c7dc953 100644
--- a/htdocs/langs/cs_CZ/opensurvey.lang
+++ b/htdocs/langs/cs_CZ/opensurvey.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - opensurvey
 Survey=Hlasování
 Surveys=Ankety
-OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select the type of poll...
+OrganizeYourMeetingEasily=Organizujte snadno své schůzky a hlasování. Nejprve vyberte typ hlasování ...
 NewSurvey=Nové hlasování
 OpenSurveyArea=Oblast anket
 AddACommentForPoll=Můžete přidat komentář do hlasování ...
diff --git a/htdocs/langs/cs_CZ/paybox.lang b/htdocs/langs/cs_CZ/paybox.lang
index f93de432261..f7c38c948a9 100644
--- a/htdocs/langs/cs_CZ/paybox.lang
+++ b/htdocs/langs/cs_CZ/paybox.lang
@@ -10,7 +10,7 @@ ToComplete=Chcete-li dokončit
 YourEMail=E-mail pro potvrzení platby
 Creditor=Věřitel
 PaymentCode=Platební kód
-PayBoxDoPayment=Pay with Paybox
+PayBoxDoPayment=Plaťte pomocí Payboxu
 YouWillBeRedirectedOnPayBox=Budete přesměrováni na zabezpečené stránky Paybox pro vstupní informace o kreditní kartě
 Continue=Další
 SetupPayBoxToHavePaymentCreatedAutomatically=Nastavte svůj Paybox pomocí url <b> %s </b> aby se platba automaticky vytvořila při ověření Payboxu.
@@ -28,4 +28,4 @@ PAYBOX_PAYONLINE_SENDEMAIL=E-mail pro upozornění po platbě (úspěch nebo sel
 PAYBOX_PBX_SITE=Hodnota PBX SITE
 PAYBOX_PBX_RANG=Hodnota pro PBX rozsah
 PAYBOX_PBX_IDENTIFIANT=Hodnota pro PBX ID
-PAYBOX_HMAC_KEY=HMAC key
+PAYBOX_HMAC_KEY=Klíč HMAC
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index 46eafc29ec1..4ec9466d21b 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Služba pro použití na tratích
 InvoiceGeneratedFromTimeSpent=Faktura %s byla vygenerována z času stráveného na projektu
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/cs_CZ/propal.lang b/htdocs/langs/cs_CZ/propal.lang
index 13c7456a1dd..f5fa0209917 100644
--- a/htdocs/langs/cs_CZ/propal.lang
+++ b/htdocs/langs/cs_CZ/propal.lang
@@ -76,11 +76,11 @@ TypeContact_propal_external_BILLING=Fakturační kontakt zákazníka
 TypeContact_propal_external_CUSTOMER=Kontakt se zákazníkem pro následující vypracované nabídky
 TypeContact_propal_external_SHIPPING=Zákaznický kontakt pro doručení
 # Document models
-DocModelAzurDescription=A complete proposal model 
-DocModelCyanDescription=A complete proposal model
+DocModelAzurDescription=Kompletní návrhový model (stará implementace azurové šablony)
+DocModelCyanDescription=Kompletní návrhový model
 DefaultModelPropalCreate=Tvorba z výchozí šablony
 DefaultModelPropalToBill=Výchozí šablona při uzavírání obchodní nabídky (bude se fakturovat)
 DefaultModelPropalClosed=Výchozí šablona při uzavírání obchodní nabídky (nevyfakturované)
 ProposalCustomerSignature=Písemný souhlas, razítko firmy, datum a podpis
 ProposalsStatisticsSuppliers=Statistika návrhů dodavatelů
-CaseFollowedBy=Case followed by
+CaseFollowedBy=Případ následovaný
diff --git a/htdocs/langs/cs_CZ/receptions.lang b/htdocs/langs/cs_CZ/receptions.lang
index 26d6208c97c..128f8c1cca0 100644
--- a/htdocs/langs/cs_CZ/receptions.lang
+++ b/htdocs/langs/cs_CZ/receptions.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionsSetup=Nastavení recepce produktu
 RefReception=Ref. recepce
 Reception=Recepce
 Receptions=Recepce
@@ -41,5 +41,5 @@ ReceptionLine=Linka recepce
 ProductQtyInReceptionAlreadySent=Množství již odeslaných produktů z objednávek zákazníka
 ProductQtyInSuppliersReceptionAlreadyRecevied=Množství produktu již obdrženo od otevřené dodavatelské objednávky
 ValidateOrderFirstBeforeReception=Nejprve musíte potvrdit objednávku, než budete moci přijímat recepce.
-ReceptionsNumberingModules=Numbering module for receptions
-ReceptionsReceiptModel=Document templates for receptions
+ReceptionsNumberingModules=Modul číslování pro recepce
+ReceptionsReceiptModel=Šablony dokumentů pro recepce
diff --git a/htdocs/langs/cs_CZ/resource.lang b/htdocs/langs/cs_CZ/resource.lang
index c5043871a8c..d39d6007e21 100644
--- a/htdocs/langs/cs_CZ/resource.lang
+++ b/htdocs/langs/cs_CZ/resource.lang
@@ -5,8 +5,8 @@ DeleteResource=Smazat zdroj
 ConfirmDeleteResourceElement=Potvrďte odstranění zdroje pro tento element
 NoResourceInDatabase=Žádný zdroj v databázi.
 NoResourceLinked=Žádný propojený zdroj
-
-ResourcePageIndex=Výpis zdrojů
+ActionsOnResource=Události týkající se tohoto zdroje
+ResourcePageIndex=Seznam zdrojů
 ResourceSingular=Zdroj
 ResourceCard=Karta zdroje
 AddResource=Vytvořit zdroj
@@ -18,7 +18,7 @@ ResourcesLinkedToElement=Zdroje propojené s prvkem
 
 ShowResource=Zobrazit zdroj
 
-ResourceElementPage=Prvky zdrojů
+ResourceElementPage=Zdroje prvku
 ResourceCreatedWithSuccess=Zdroj úspěšně vytvořen
 RessourceLineSuccessfullyDeleted=Propojení zdrojů bylo úspěšně odstraněno
 RessourceLineSuccessfullyUpdated=Propojení zdrojů bylo úspěšně aktualizováno
@@ -30,7 +30,10 @@ DictionaryResourceType=Typy zdrojů
 
 SelectResource=Výběr zdroje
 
-IdResource=Id resource
-AssetNumber=Serial number
-ResourceTypeCode=Resource type code
+IdResource=Id zdroje
+AssetNumber=Sériové číslo
+ResourceTypeCode=Kód typu zdroje
 ImportDataset_resource_1=Zdroje
+
+ErrorResourcesAlreadyInUse=Některé zdroje se používají
+ErrorResourceUseInEvent=%s použitý v %s události
diff --git a/htdocs/langs/cs_CZ/salaries.lang b/htdocs/langs/cs_CZ/salaries.lang
index c6518613796..3e5a2453e89 100644
--- a/htdocs/langs/cs_CZ/salaries.lang
+++ b/htdocs/langs/cs_CZ/salaries.lang
@@ -18,4 +18,4 @@ LastSalaries=Posledních %s plateb
 AllSalaries=Všechny mzdové platby
 SalariesStatistics=Statistika platů
 # Export
-SalariesAndPayments=Salaries and payments
+SalariesAndPayments=Platy a platby
diff --git a/htdocs/langs/cs_CZ/supplier_proposal.lang b/htdocs/langs/cs_CZ/supplier_proposal.lang
index 0cf790f22f3..4291db37a11 100644
--- a/htdocs/langs/cs_CZ/supplier_proposal.lang
+++ b/htdocs/langs/cs_CZ/supplier_proposal.lang
@@ -32,7 +32,7 @@ SupplierProposalStatusValidatedShort=Ověřeno
 SupplierProposalStatusClosedShort=Zavřeno
 SupplierProposalStatusSignedShort=Přijato
 SupplierProposalStatusNotSignedShort=Odmítnuto
-CopyAskFrom=Vytvoření cenového požadavku zkopírováním stávající žádosti
+CopyAskFrom=Vytvořte požadavek na cenu zkopírováním existujícího požadavku
 CreateEmptyAsk=Vytvořit prázdný požadavek
 ConfirmCloneAsk=Jste si jisti, že chcete naklonovat požadavek na cenu <b> %s </ b>?
 ConfirmReOpenAsk=Jste si jisti, že chcete otevřít zpět žádost o cenu <b> %s </ b>?
diff --git a/htdocs/langs/cs_CZ/users.lang b/htdocs/langs/cs_CZ/users.lang
index 265e3f116ec..83d483648c6 100644
--- a/htdocs/langs/cs_CZ/users.lang
+++ b/htdocs/langs/cs_CZ/users.lang
@@ -70,7 +70,7 @@ ExportDataset_user_1=Uživatelé a jejich vlastnosti
 DomainUser=Doménový uživatel %s
 Reactivate=Reaktivace
 CreateInternalUserDesc=Tento formulář umožňuje vytvořit interní uživatele ve vaší společnosti / organizaci. Chcete-li vytvořit externího uživatele (zákazník, dodavatel atd.), použijte tlačítko "Vytvořit uživatele Dolibarr z karty kontaktu subjektu.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=Interní  <b> uživatel </b> je uživatel, který je součástí vaší společnosti / organizace. <br> Externí uživatel <b> </b> je zákazník, prodejce nebo jiný (Vytvoření externího uživatele pro subjekt lze provést z kontaktního záznamu subjektu). <br> <br> V obou případech oprávnění definují práva na Dolibarr, také externí uživatel může mít jiného správce menu než interní uživatel (viz Domů - Nastavení - Displej)
 PermissionInheritedFromAGroup=Povolení uděleno, neboť je zděděno z některé uživatelské skupiny.
 Inherited=Zděděný
 UserWillBeInternalUser=Vytvořený uživatel bude interní (protože není spojen s žádnou třetí stranou)
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Vytvořený uživatel bude externí (protože je spojen s
 IdPhoneCaller=Id telefonu volajícího
 NewUserCreated=Uživatel %s vytvořil
 NewUserPassword=Změna hesla pro %s
+NewPasswordValidated=Vaše nové heslo bylo ověřeno a pro přihlášení jej musíte použít nyní.
 EventUserModified=Uživatel %s změněn
 UserDisabled=Uživatel %s zakázán
 UserEnabled=Uživatel %s aktivován
@@ -113,5 +114,5 @@ CantDisableYourself=Nelze zakázat vlastní uživatelský záznam
 ForceUserExpenseValidator=Validator výkazu výdajů
 ForceUserHolidayValidator=Vynutit validátor žádosti o dovolenou
 ValidatorIsSupervisorByDefault=Ve výchozím nastavení je validátor nadřazený nad uživatelem. Chcete-li zachovat toto chování, ponechte prázdné.
-UserPersonalEmail=Personal email
-UserPersonalMobile=Personal mobile phone
+UserPersonalEmail=Osobní email
+UserPersonalMobile=Osobní mobilní telefon
diff --git a/htdocs/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang
index 9abca0118ab..252f8b08a8b 100644
--- a/htdocs/langs/cs_CZ/website.lang
+++ b/htdocs/langs/cs_CZ/website.lang
@@ -57,7 +57,7 @@ NoPageYet=Zatím žádné stránky
 YouCanCreatePageOrImportTemplate=Můžete vytvořit novou stránku nebo importovat úplnou šablonu webových stránek
 SyntaxHelp=Nápověda ke konkrétním tipům pro syntaxi
 YouCanEditHtmlSourceckeditor=Zdrojový kód HTML můžete upravit pomocí tlačítka "Zdroj" v editoru.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Klonovat stránku / kontejner
 CloneSite=Kopie stránky
 SiteAdded=Webová stránka byla přidána
@@ -77,7 +77,7 @@ BlogPost=Příspěvek na blogu
 WebsiteAccount=Účet webových stránek
 WebsiteAccounts=Účty webových stránek
 AddWebsiteAccount=Vytvořte účet webových stránek
-BackToListOfThirdParty=Zpět na seznam pro subjekt
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Nejprve zakažte web
 MyContainerTitle=Název mé webové stránky
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/cs_CZ/withdrawals.lang b/htdocs/langs/cs_CZ/withdrawals.lang
index 27a7297267c..61a6184e297 100644
--- a/htdocs/langs/cs_CZ/withdrawals.lang
+++ b/htdocs/langs/cs_CZ/withdrawals.lang
@@ -69,15 +69,15 @@ WithBankUsingBANBIC=U bankovních účtů pomocí IBAN/BIC/SWIFT
 BankToReceiveWithdraw=Bankovní účet pro příjem
 CreditDate=Kredit na
 WithdrawalFileNotCapable=Nelze generovat soubor výběru příjmu pro vaši zemi %s (Vaše země není podporována)
-ShowWithdraw=Show Direct Debit Order
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
+ShowWithdraw=Zobrazit příkaz k inkasu
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Pokud však na faktuře dosud nebyl zpracován alespoň jeden příkaz k inkasu, nebude nastavena jako zaplacená, aby bylo možné provést předchozí výběr.
 DoStandingOrdersBeforePayments=Tato karta vám umožňuje požádat o trvalý příkaz. Jakmile to bude hotové,jděte do menu Bankovní údaje-> Výběry pro zřízení trvalého příkazu. Když je trvalý příkazu hotov, platba na faktuře bude automaticky zaznamenána a faktura uzavřena, pokud zbývající částka k placení je nula.
 WithdrawalFile=Soubor výběru
 SetToStatusSent=Nastavte na stav "Odeslaný soubor"
 ThisWillAlsoAddPaymentOnInvoice=Také budou zaznamenány platby na faktury a budou klasifikovány jako "Placené", pokud zůstane platit, je nulová
 StatisticsByLineStatus=Statistika podle stavu řádků
-RUM=Unique Mandate Reference (UMR)
-DateRUM=Mandate signature date
+RUM=UMR
+DateRUM=Povinné datum podpisu
 RUMLong=Unikátní Mandát Referenční
 RUMWillBeGenerated=Pokud je prázdná, po uložení informací o bankovním účtu se vytvoří UMR (jedinečný mandátový odkaz).
 WithdrawMode=Režim přímé inkaso (FRST nebo opakovat)
diff --git a/htdocs/langs/cs_CZ/zapier.lang b/htdocs/langs/cs_CZ/zapier.lang
new file mode 100644
index 00000000000..406cc11f80d
--- /dev/null
+++ b/htdocs/langs/cs_CZ/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier pro Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier pro Dolibarr modul
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Nastavení Zapieru pro Dolibarr
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 6cf90054f96..7a9d75ba444 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Fakturalinjer, der er bundet
 ExpenseReportLines=Udgiftsrapportlinjer, der skal bogføres
 ExpenseReportLinesDone=Linjer bundet til udgiftsrapporter
 IntoAccount=Bogfør linje i regnskabskonto
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bogfør
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Regnskabskonto til registrering af donationer
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Regnskabskonto for at registrere abonnementer
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Regnskabskonto som standard for de købte produkter (bruges hvis ikke defineret i produktarket)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Regnskabskonto som standard for solgte varer (hvis ikke defineret for varen)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Regnskabskonto som standard for de produkter, der sælges i EØF (bruges, hvis de ikke er defineret i produktarket)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Regnskabskonto som standard for de produkter, der er solgt og eksporteret ud af EØF (brugt, hvis ikke defineret i produktarket)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Regnskabskonto som standard for købte ydelser (hvis ikke defineret for varen)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Regnskabskonto som standard for solgte ydelser (hvis ikke defineret for varen)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Regnskabskonto som standard for de tjenester, der sælges i EØF (bruges, hvis de ikke er defineret i servicearket)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Regnskabskonto er som standard for de tjenester, der sælges og eksporteres ud af EØF (bruges, hvis de ikke er defineret i servicearket)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Tredjeparts ukend
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Tredjepartskonto ikke defineret eller tredjepart ukendt. Blokeringsfejl.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Ukendt tredjepartskonto og ventekonto er ikke defineret. Blokeringsfejl
 PaymentsNotLinkedToProduct=Betaling er ikke knyttet til noget produkt / tjeneste
+OpeningBalance=Opening balance
 ShowOpeningBalance=Vis åbningsbalance
 HideOpeningBalance=Skjul åbningsbalancen
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Kontoens gruppe
 PcgtypeDesc=Kontogruppe bruges som foruddefinerede 'filter' og 'gruppering' kriterier for nogle regnskabsrapporter. For eksempel bruges 'INKOMST' eller 'UDGIFT' som grupper til regnskabsmæssige regnskaber for produkter til at oprette omkostnings- / indkomstrapporten.
 
+Reconcilable=Reconcilable
+
 TotalVente=Samlet omsætning ekskl. moms
 TotalMarge=Samlet salgsforskel
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Eksport til Quadratus QuadraCompta
 Modelcsv_ebp=Eksport til EBP
 Modelcsv_cogilog=Eksport til Cogilog
 Modelcsv_agiris=Eksport til Agiris
-Modelcsv_LDCompta=Eksport til LD Compta (v9 og nyere) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Eksport til OpenConcerto (Test)
 Modelcsv_configurable=Eksporter CSV Konfigurerbar
 Modelcsv_FEC=Eksport FEC
 Modelcsv_Sage50_Swiss=Eksport til Sage 50 Schweiz
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=ID for kontoplan
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Salg
 OptionModeProductSellIntra=Mode salg eksporteret i EØF
 OptionModeProductSellExport=Mode salg eksporteret i andre lande
 OptionModeProductBuy=Køb
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Vis alle varer med salgskonto.
 OptionModeProductSellIntraDesc=Vis alle produkter med en regnskabskonto for salg i EØF.
 OptionModeProductSellExportDesc=Vis alle produkter med regnskabskonto for andet udenlandsk salg.
 OptionModeProductBuyDesc=Vis alle varer med købskonto.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Fjern regnskabskode fra linjer, der ikke eksisterer som posteringer på konto
 CleanHistory=Nulstil alle bogføringer for det valgte år
 PredefinedGroups=Foruddefinerede grupper
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Kontoen blev fjernet fra gruppen
 SaleLocal=Lokalt salg
 SaleExport=Eksport salg
 SaleEEC=Salg i EØF
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Interval for regnskabskonto
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index d4dde827a10..fa640a2ad1b 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Webserver bruger / gruppe
 NoSessionFound=Din PHP-konfiguration tillade ikke optagelse af aktive sessioner. Den mappe, der bruges til at gemme sessioner (<b> %s </b>), kan være beskyttet (for eksempel via operativsystemet eller ved PHP-direktivet open_basedir).
 DBStoringCharset=Database charset til at gemme data
 DBSortingCharset=Database charset for at sortere data
+HostCharset=Host charset
 ClientCharset=Klient karaktersæt
 ClientSortingCharset=Kunden sortering
 WarningModuleNotActive=<b>Modul %s</b> skal være aktiveret
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Afkrydsningsfelterne
 ExtrafieldCheckBoxFromList=Afkrydsningsfelter fra bordet
 ExtrafieldLink=Link til et objekt
 ComputedFormula=Beregnet felt
-ComputedFormulaDesc=Du kan indtaste en formel her ved hjælp af andre egenskaber af objekt eller nogen PHP-kodning for at få en dynamisk beregningsværdi. Du kan bruge alle PHP-kompatible formler, herunder "?" betingelsesoperatør og følgende globale objekt: <strong> $ db, $ conf, $ langs, $ mysoc, $ bruger, $ objekt </strong>. <br> <strong> ADVARSEL </strong>: Kun nogle egenskaber af $ objekt kan være tilgængelige. Hvis du har brug for egenskaber, der ikke er indlæst, skal du bare hente objektet i din formel som i andet eksempel. <br> Brug af et beregnet felt betyder, at du ikke kan indtaste nogen værdier fra interface. Hvis der også er en syntaksfejl, kan formlen ikke returnere noget. <br> <br> Eksempel på formel: <br> $ objekt-> id < 10 ? round($object-> id / 2, 2): ($ objekt-> id + 2 * $ bruger-> id) * (int) substr ($ mysoc-> zip, 1, 2 ) <br> <br> Eksempel på genindlæsning af objekt <br> (($ reloadedobj = ny Societe ($ db)) && ($ reloadedobj-> hent ($ obj-> id? $ Obj-> id: ($ obj-> rowid? $ Obj- > rowid: $ object-> id))> 0))? $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> kapital / 5: '-1' <br> <br> Øvrige eksempel på formel for at tvinge belastning af objekt og dets overordnede objekt: <br> (($ reloadedobj = ny opgave ($ db )) && ($ reloadedobj-> hent ($ objekt-> id)> 0) && ($ secondloadedobj = nyt projekt ($ db)) && ($ secondloadedobj-> hent ($ reloadedobj-> fk_project)> 0))? $ secondloadedobj-> ref: 'Forældreprojekt ikke fundet'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Gem computeren felt
 ComputedpersistentDesc=Beregnede ekstra felter gemmes i databasen, men værdien genberegnes dog først, når objektet i dette felt ændres. Hvis det beregnede felt afhænger af andre objekter eller globale data, kan denne værdi være forkert !!
 ExtrafieldParamHelpPassword=Blankt felt her betyder, at denne værdi vil blive gemt uden kryptering (feltet skal kun være skjult med stjerne på skærmen). <br> Vælg 'auto' for at bruge standardkrypteringsreglen til at gemme adgangskoden til databasen (så vil værdien gemmes som en en-vejs hash uden mulighed at hente den oprindelige værdi)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=IRPF-kursen som standard ved oprettelse af emner. fakturae
 LocalTax2IsNotUsedDescES=Som standard den foreslåede IRPF er 0. Slut på reglen.
 LocalTax2IsUsedExampleES=I Spanien, freelancere og selvstændige, der leverer tjenesteydelser og virksomheder, der har valgt at skattesystemet i de moduler.
 LocalTax2IsNotUsedExampleES=I Spanien er de virksomheder, der ikke er underlagt skattesystemer for moduler.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Rapporter om lokale skatter
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Regler for at generere og validere adgangskoder
 DisableForgetPasswordLinkOnLogonPage=Vis ikke linket "Glemt adgangskode" på siden Login
 UsersSetup=Opsætning af brugermodul
 UserMailRequired=Email nødvendig for at oprette en ny bruger
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Opsætning af multi-selskabsmodul
 ##### Suppliers #####
 SuppliersSetup=Opsætning af sælgermodul
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Leverandør fakturaer nummerering modeller
 IfSetToYesDontForgetPermission=Hvis det er indstillet til en ikke-nullværdi, skal du ikke glemme at give tilladelser til grupper eller brugere, der har tilladelse til den anden godkendelse
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Skjul billeder i topmenuen
 LeftMenuBackgroundColor=Baggrundsfarve til venstre menu
 BackgroundTableTitleColor=Baggrundsfarve til tabel titel linje
 BackgroundTableTitleTextColor=Tekstfarve til tabel titellinje
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Baggrundsfarve til ulige bord linjer
 BackgroundTableLineEvenColor=Baggrundsfarve til lige bordlinier
 MinimumNoticePeriod=Mindste opsigelsesperiode (din anmodning om orlov skal ske inden denne forsinkelse)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Postnummer
 MainMenuCode=Menu indtastningskode (hovedmenu)
 ECMAutoTree=Vis automatisk ECM-træ
-OperationParamDesc=Definer værdier, der skal bruges til handling, eller hvordan man uddrager værdier. For eksempel: <br> objproperty1 = SET: abc <br> objproperty1 = SET: en værdi med erstatning af __objproperty1__ <br> objproperty3 = SETIFEMPTY: abc <br> objproperty4 = EKSTRAKT: HEADER:. X-Myheaderkey * [^ \\ s] + (*). <br> options_myextrafield = EKSTRAKT: EMNE: ([^ \\ s] *) <br> object.objproperty5 = UDTAGELSE: BODY: Mit firmanavn er \\ s ([^ \\ s] *) <br><br> Brug en ; char som separator for at udtrække eller indstille flere egenskaber.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Åbningstider
 OpeningHoursDesc=Indtast her firmaets almindelige åbningstider.
 ResourceSetup=Konfiguration af ressource modul
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index b53f6bad382..f0882f22e4b 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=Antal fakturaer pr. Måned
 AmountOfBills=Mængden af fakturaer
 AmountOfBillsHT=Fakturabeløb (ekskl. Skat)
 AmountOfBillsByMonthHT=Mængden af ​​fakturaer efter måned (ekskl. moms)
-ShowSocialContribution=Vis skat/afgift
-ShowBill=Vis faktura
-ShowInvoice=Vis faktura
-ShowInvoiceReplace=Vis erstatning faktura
-ShowInvoiceAvoir=Vis kreditnota
-ShowInvoiceDeposit=Vis udbetalt faktura
-ShowInvoiceSituation=Vis faktura status
 UseSituationInvoices=Tillad midlertidig faktura
 UseSituationInvoicesCreditNote=Tillad midlertidig faktura kreditnota
 Retainedwarranty=Opretholdt garanti
@@ -233,7 +226,6 @@ setretainedwarranty=Indstil bevaret garanti
 setretainedwarrantyDateLimit=Indstil grænse for bevaret garanti
 RetainedWarrantyDateLimit=Opholdt garanti dato grænse
 RetainedWarrantyNeed100Percent=Midlertidig fakturaen skal være på 100%% fremgang for at blive vist på PDF
-ShowPayment=Vis betaling
 AlreadyPaid=Allerede betalt
 AlreadyPaidBack=Allerede tilbage betalt
 AlreadyPaidNoCreditNotesNoDeposits=Allerede betalt (uden kredit noter og udbetalinger)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Genereres fra skabelonfaktura %s
 WarningInvoiceDateInFuture=Advarsel, fakturadato er højere end den aktuelle dato
 WarningInvoiceDateTooFarInFuture=Advarsel, fakturadato er for langt fra den aktuelle dato
 ViewAvailableGlobalDiscounts=Se ledige rabatter
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Forfald ved modtagelse
diff --git a/htdocs/langs/da_DK/donations.lang b/htdocs/langs/da_DK/donations.lang
index 90494b266e0..99c32431c44 100644
--- a/htdocs/langs/da_DK/donations.lang
+++ b/htdocs/langs/da_DK/donations.lang
@@ -1,34 +1,34 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=Donation
-Donations=Donationer
+Donations=donationer
 DonationRef=Donation ref.
 Donor=Donor
-AddDonation=Create a donation
+AddDonation=Opret en donation
 NewDonation=Ny donation
-DeleteADonation=Delete a donation
-ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Show donation
-PublicDonation=Offentlige donation
+DeleteADonation=Slet en donation
+ConfirmDeleteADonation=Er du sikker på, at du vil slette denne donation?
+PublicDonation=Offentlig donation
 DonationsArea=Donationer område
 DonationStatusPromiseNotValidated=Udkast til løfte
-DonationStatusPromiseValidated=Valideret løfte
-DonationStatusPaid=Donationen er modtaget
+DonationStatusPromiseValidated=Bekræftet løfte
+DonationStatusPaid=Bidrag modtaget
 DonationStatusPromiseNotValidatedShort=Udkast
-DonationStatusPromiseValidatedShort=Valideret
+DonationStatusPromiseValidatedShort=bekræftet
 DonationStatusPaidShort=Modtaget
-DonationTitle=Donation receipt
+DonationTitle=Bidragskvittering
+DonationDate=Donation date
 DonationDatePayment=Betalingsdato
 ValidPromess=Validér løfte
-DonationReceipt=Donation receipt
+DonationReceipt=Bidragskvittering
 DonationsModels=Dokumenter modeller for donation kvitteringer
-LastModifiedDonations=Latest %s modified donations
-DonationRecipient=Donation recipient
-IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
-MinimumAmount=Minimum amount is  %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
-DonationPayment=Donation payment
-DonationValidated=Donation %s validated
+LastModifiedDonations=Seneste %s modificerede donationer
+DonationRecipient=Donation modtager
+IConfirmDonationReception=Modtageren erklærer modtagelsen som en donation af følgende beløb
+MinimumAmount=Minimumsbeløbet er %s
+FreeTextOnDonations=Fri tekst at vise i side fod
+FrenchOptions=Valgmuligheder for Frankrig
+DONATION_ART200=Vis artikel 200 fra CGI, hvis du er bekymret
+DONATION_ART238=Vis artikel 238 fra CGI, hvis du er bekymret
+DONATION_ART885=Vis artikel 885 fra CGI, hvis du er bekymret
+DonationPayment=Donation betaling
+DonationValidated=Donation %s bekræftet
diff --git a/htdocs/langs/da_DK/interventions.lang b/htdocs/langs/da_DK/interventions.lang
index 93b14f3b882..ab46fd73709 100644
--- a/htdocs/langs/da_DK/interventions.lang
+++ b/htdocs/langs/da_DK/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Ingrebsområde
 DraftFichinter=Udkast til indgreb
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Indgreb til behandling
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Opfølgning kunde kontakt
-# Modele numérotation
 PrintProductsOnFichinter=Udskriv også linjer af typen "produkt" (ikke kun tjenester) på ingreb kortet
 PrintProductsOnFichinterDetails=Et indgreb genereret af ordrer
 UseServicesDurationOnFichinter=Brug servicevarighed for indgreb genereret fra ordrer
@@ -53,14 +51,16 @@ InterventionStatistics=Statistikker af indgreb
 NbOfinterventions=Antal interventionskort
 NumberOfInterventionsByMonth=Antal interventionskort efter måned (dato for bekræftelse)
 AmountOfInteventionNotIncludedByDefault=Indgreb beløb er ikke medtaget som standard i overskud (i de fleste tilfælde benyttes tidsskemaer til at tælle tid). Tilføj valgmulighed PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT til 1 i home setup-andre for at inkludere dem.
-##### Exports #####
 InterId=Indgrebs id
 InterRef=Indgreb ref.
 InterDateCreation=Dato oprettelse for indgreb
 InterDuration=Varighed af indgreb
 InterStatus=Status
 InterNote=Bemærk indgreb
+InterLine=Line of intervention
 InterLineId=Line id indgreb
 InterLineDate=Linje dato indgreb
 InterLineDuration=Linje varighed indgreb
 InterLineDesc=Line beskrivelse af ingreb
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/da_DK/modulebuilder.lang b/htdocs/langs/da_DK/modulebuilder.lang
index 2dbf8babf97..22e7544086a 100644
--- a/htdocs/langs/da_DK/modulebuilder.lang
+++ b/htdocs/langs/da_DK/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=Liste over definerede tilladelser
 SeeExamples=Se eksempler her
 EnabledDesc=Tilstand at have dette felt aktivt (Eksempler: 1 eller $ conf-> global-> MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Kan værdien af ​​feltet akkumuleres for at få en samlet liste? (Eksempler: 1 eller 0)
 SearchAllDesc=Er feltet brugt til at foretage en søgning fra hurtigsøgningsværktøjet? (Eksempler: 1 eller 0)
diff --git a/htdocs/langs/da_DK/multicurrency.lang b/htdocs/langs/da_DK/multicurrency.lang
new file mode 100644
index 00000000000..8cc30637a10
--- /dev/null
+++ b/htdocs/langs/da_DK/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi-valuta
+ErrorAddRateFail=Fejl i tilføjet sats
+ErrorAddCurrencyFail=Fejl i tilføjet valuta
+ErrorDeleteCurrencyFail=Fejl sletning mislykkes
+multicurrency_syncronize_error=Synkroniseringsfejl: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Brug datoen for dokumentet til at finde valutakursen i stedet for at bruge den senest kendte sats
+multicurrency_useOriginTx=Når et objekt er oprettet fra et andet, skal du holde den oprindelige sats fra kildeobjektet (ellers bruge den senest kendte sats)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API-nøgle
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Brugte valutaer
+CurrenciesUsed_help_to_add=Tilføj de forskellige valutaer og satser, du skal bruge på dine <b> forslag </ b>, <b> ordrer </ b> osv.
+rate=sats
+MulticurrencyReceived=Modtaget, original valuta
+MulticurrencyRemainderToTake=Resterende beløb, original valuta
+MulticurrencyPaymentAmount=Betalingsbeløb, oprindelig valuta
+AmountToOthercurrency=Beløb til (i valuta for modtagende konto)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index 0637091484c..24862a0756c 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index c6b7dec2547..5c24c6d503d 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -57,7 +57,7 @@ NoPageYet=Ingen sider endnu
 YouCanCreatePageOrImportTemplate=Du kan oprette en ny side eller importere en fuld hjemmeside skabelon
 SyntaxHelp=Hjælp til specifikke syntax tips
 YouCanEditHtmlSourceckeditor=Du kan redigere HTML-kildekode ved hjælp af knappen "Kilde" i editoren.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Klon side / container
 CloneSite=Klon website
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blogindlæg
 WebsiteAccount=Website account
 WebsiteAccounts=Websitetskonti
 AddWebsiteAccount=Opret websitet konto
-BackToListOfThirdParty=Tilbage til listen for tredjepart
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Deaktiver hjemmesiden først
 MyContainerTitle=Min hjemmeside titel
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/da_DK/zapier.lang b/htdocs/langs/da_DK/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/da_DK/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/de_AT/accountancy.lang b/htdocs/langs/de_AT/accountancy.lang
new file mode 100644
index 00000000000..2c29355cd9e
--- /dev/null
+++ b/htdocs/langs/de_AT/accountancy.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
+MenuBankAccounts=Kontonummern
diff --git a/htdocs/langs/de_AT/externalsite.lang b/htdocs/langs/de_AT/externalsite.lang
new file mode 100644
index 00000000000..d481926dd08
--- /dev/null
+++ b/htdocs/langs/de_AT/externalsite.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExternalSiteSetup=Verknüpfung zur externen Website einrichten
+ExternalSiteURL=Externe Seiten-URL
+ExampleMyMenuEntry=Mein Menüeintrag
diff --git a/htdocs/langs/de_AT/modulebuilder.lang b/htdocs/langs/de_AT/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/de_AT/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/de_CH/assets.lang b/htdocs/langs/de_CH/assets.lang
new file mode 100644
index 00000000000..494d9491e34
--- /dev/null
+++ b/htdocs/langs/de_CH/assets.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - assets
+Assets =Vermögen
+NewAsset =Neuer Vermögenswert
+AccountancyCodeAsset =Buchungskonto (Vermögenswert)
+AccountancyCodeDepreciationAsset =Abschreibungskonto (Sachwert)
+AccountancyCodeDepreciationExpense =Abschreibungskonto (Aufwand)
+NewAssetType=Neuer Vermögenstyp
+AssetsTypeSetup=Vermögenstyp einrichten
+AssetTypeModified=Vermögenstyp geändert.
+AssetType=Vermögenstyp
+AssetsLines=Vermögen
+DeleteAnAssetType=Vermögenstyp löschen
+ConfirmDeleteAssetType=Bist du sicher, dass du diesen Vermögenstyp löschen willst?
+ShowTypeCard=Typ anzeigen '%s'
+ModuleAssetsName =Vermögen
+ModuleAssetsDesc =Beschreibung Vermögenswerte
+AssetsSetup =Einstellungen Vermögenswerte
+AssetsSetupPage =Einstellungen Vermögenswerte
+ExtraFieldsAssetsType =Ergänzende Attribute (Vermögenstyp)
+AssetsType=Vermögenstyp
+AssetsTypeId=ID Vermögenswert
+AssetsTypeLabel=Beschreibung Vermögenstyp
+AssetsTypes=Vermögenstypen
+MenuAssets =Vermögen
+MenuNewAsset =Neuer Vermögenswert
+MenuTypeAssets =Vermögenstype
+NewAsset=Neuer Vermögenswert
diff --git a/htdocs/langs/de_CH/blockedlog.lang b/htdocs/langs/de_CH/blockedlog.lang
new file mode 100644
index 00000000000..9a91c1cf7cf
--- /dev/null
+++ b/htdocs/langs/de_CH/blockedlog.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - blockedlog
+logBILL_VALIDATE=Rechnung freigegeben
+logMEMBER_SUBSCRIPTION_CREATE=Mitgliedsabonnement erstellt
+logMEMBER_SUBSCRIPTION_MODIFY=Mitgliedsabonnement geändert
+logMEMBER_SUBSCRIPTION_DELETE=Logische Löschung des Mitgliedsabonnements
diff --git a/htdocs/langs/de_CH/cashdesk.lang b/htdocs/langs/de_CH/cashdesk.lang
new file mode 100644
index 00000000000..426d9c97a7a
--- /dev/null
+++ b/htdocs/langs/de_CH/cashdesk.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+CashDesk=Kasse
+BankToPay=Zahlungskonto
diff --git a/htdocs/langs/de_CH/externalsite.lang b/htdocs/langs/de_CH/externalsite.lang
new file mode 100644
index 00000000000..9577afd0918
--- /dev/null
+++ b/htdocs/langs/de_CH/externalsite.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExternalSiteModuleNotComplete=Module ExternalSite wurde nicht richtig konfiguriert.
diff --git a/htdocs/langs/de_CH/ftp.lang b/htdocs/langs/de_CH/ftp.lang
new file mode 100644
index 00000000000..5062bcc5001
--- /dev/null
+++ b/htdocs/langs/de_CH/ftp.lang
@@ -0,0 +1,12 @@
+# Dolibarr language file - Source file is en_US - ftp
+NewFTPClient=Neue FTP-Verbindungseinstellungen
+FTPArea=FTP-Übersicht
+FTPAreaDesc=Die Ansicht zeigt einen FTP Server
+SetupOfFTPClientModuleNotComplete=Hoppla, das Setup dieses FTP-Client - Moduls ist unvollständig.
+FTPFeatureNotSupportedByYourPHP=Ihre PHP unterstützt keine FTP-Funktionen
+FailedToConnectToFTPServer=Konnte keine Verbindung zum FTP-Server aufbauen (Server %s, Port %s)
+FailedToConnectToFTPServerWithCredentials=Anmeldung am FTP-Server mit dem eingegebenen Benutzername/Passwort-Paar fehlgeschlagen
+FTPFailedToRemoveFile=Konnte Datei <b>%s</b> nicht entfernen.
+FTPFailedToRemoveDir=Ich kann das Verzeichnis <b>%s</b> nicht löschen.. Prüfe, ob du die Löschberechtigung hast und stelle sicher, dass es leer ist.
+ChooseAFTPEntryIntoMenu=Wähle eine FTP - Site im Menu aus.
+FailedToGetFile=Folgende Dateien konnten nicht geladen werden: %s
diff --git a/htdocs/langs/de_CH/link.lang b/htdocs/langs/de_CH/link.lang
new file mode 100644
index 00000000000..db7e1395400
--- /dev/null
+++ b/htdocs/langs/de_CH/link.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - link
+LinkANewFile=Verknüpfe eine neue Datei /Dokument
+LinkComplete=Die Datei wurde erfolgreich verlinkt
+ErrorFileNotLinked=Die Datei konnte nicht verlinkt werden
+URLToLink=URL zum Verlinken
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index 5906b03349a..5e855154efe 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -357,5 +357,4 @@ NoArticlesFoundForTheCategory=Dieser Kategorie ist nichts zugeordnet...
 ContactDefault_fichinter=Arbeitseinsatz
 ContactDefault_supplier_proposal=Partnerofferte
 ContactAddedAutomatically=Automatisch generierter Kontakt
-ShowDetails=Details anzeigen
 CustomReports=Eigene Berichte
diff --git a/htdocs/langs/de_CH/members.lang b/htdocs/langs/de_CH/members.lang
index 163b21c927b..ab909f68092 100644
--- a/htdocs/langs/de_CH/members.lang
+++ b/htdocs/langs/de_CH/members.lang
@@ -36,7 +36,6 @@ DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=E-Mail-Vorlage zum Senden einer E-Mail
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=E-Mail-Vorlage zum Senden einer E-Mail-Erinnerung, wenn das Abonnement abläuft
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=E-Mail-Vorlage zum Senden von E-Mails an ein Mitglied bei Kündigung der Mitgliedschaft
 DescADHERENT_MAIL_FROM=Absender E-Mail für automatische E-Mails
-ShowTypeCard=Typ anzeigen '%s'
 HTPasswordExport=htpassword Datei generieren
 MembersAndSubscriptions=Mitglieder und Abonnemente
 SubscriptionPayment=Zahlung des Mitgliedsbeitrags
diff --git a/htdocs/langs/de_CH/modulebuilder.lang b/htdocs/langs/de_CH/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/de_CH/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/de_CH/multicurrency.lang b/htdocs/langs/de_CH/multicurrency.lang
new file mode 100644
index 00000000000..1f8a2193356
--- /dev/null
+++ b/htdocs/langs/de_CH/multicurrency.lang
@@ -0,0 +1,20 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi-Währungen
+ErrorAddRateFail=Fehlerhafter Kurs
+ErrorAddCurrencyFail=Fehlerhafte Währung
+ErrorDeleteCurrencyFail=Löschen fehlgeschlagen
+multicurrency_syncronize_error=Synchronisierungsfehler %s.
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Beziehe den Wechselkurs auf das Dokumentendatum, statt auf den aktuellen Kurs.
+multicurrency_useOriginTx=Übernehme beim Duplizieren von Objekten dessen Wechselkurs, statt den aktuellsten.
+CurrencyLayerAccount=CurrencyLayer Schnittstelle
+CurrencyLayerAccount_help_to_synchronize=Für diese Funktion solltest du ein Konto auf deren Homepage %s erzeugen.<br>Dann erhälst du deinen <b>API Key</b>.<br>Beim Gratiskonto kannst du die Standardwährung USD nicht ändern.<br>Wenn deine Standardwährung eine andere ist, rechnet die Anwendung das automatisch um.<br><br> Du kannst maximal 1000 Abfragen pro Monat über die Schnittstelle schicken.
+multicurrency_appId=API Key
+multicurrency_appCurrencySource=Kurs Quelle
+multicurrency_alternateCurrencySource=Alternative Kursquelle
+CurrenciesUsed=Benutzte Währungen
+CurrenciesUsed_help_to_add=Füge die verschiedenen Währungen für deine benutzten <b>Offerten</b>,<b>Bestellungen</b> usw hinzu.
+rate=Kurs
+MulticurrencyReceived=Eingang in Orignalwährung
+MulticurrencyRemainderToTake=Restbetrag in Originalwährung
+MulticurrencyPaymentAmount=Zahlungsbetrag, Originalwährung
+AmountToOthercurrency=Entspricht in der Währung des Eingangkontos
diff --git a/htdocs/langs/de_CH/paypal.lang b/htdocs/langs/de_CH/paypal.lang
new file mode 100644
index 00000000000..e0d3951a16f
--- /dev/null
+++ b/htdocs/langs/de_CH/paypal.lang
@@ -0,0 +1,20 @@
+# Dolibarr language file - Source file is en_US - paypal
+PaypalDesc=Dieses Modul erlaubt die Annahme von Zahlungen über <a href="http://www.paypal.com" target="_blank">PayPal</a>. Sie können damit Zahlungen in Dolibarr tätigen und empfangen.
+PaypalOrCBDoPayment=Mit Paypal bezahlen (Guthaben oder Kreditkarte)
+PaypalDoPayment=Mit PayPal bezahlen
+PAYPAL_API_SANDBOX=Testmoduds/Sandbox
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Wähle zwischen Bezahlung mit reinem PayPal - Guthaben, oder Guthaben und Kreditkarte.
+ONLINE_PAYMENT_CSS_URL=URL zu spezieller CSS - Datei für die Bezahlseite (optional)
+PAYPAL_ADD_PAYMENT_URL=Automatisch den PayPal - Zahlungslink in Emails einbinden
+NewOnlinePaymentReceived=Neue PayPal - Zahlung erhalten
+NewOnlinePaymentFailed=PayPal - Zahlung hat nicht geklappt...
+ONLINE_PAYMENT_SENDEMAIL=Email - Adresse für Zahlungsbestätigungen und -fehler
+ValidationOfOnlinePaymentFailed=Die PayPal Zahlung wurde nicht autorisiert...
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Fehler beim Aufruf der Zahlungs - Bestätigungsseite.
+OnlinePaymentSystem=Online Bezahlsystem
+PaypalLiveEnabled=PayPal aktiv schalten (oder im Test- / Sandboxmodus laufen lassen)
+PaypalImportPayment=PayPal Zahlungen importieren
+PostActionAfterPayment=Nachbearbeitungen nach Zahlungen
+ARollbackWasPerformedOnPostActions=Alle Nachbearbeitungen wurden zurückgesetzt. Falls nötig, erledige jene von Hand.
+ValidationOfPaymentFailed=Die Zahlung wurde nicht frei gegeben...
+PayPalBalance=Aktuelles PayPal - Guthaben
diff --git a/htdocs/langs/de_CH/salaries.lang b/htdocs/langs/de_CH/salaries.lang
new file mode 100644
index 00000000000..bd6035c66c6
--- /dev/null
+++ b/htdocs/langs/de_CH/salaries.lang
@@ -0,0 +1,12 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Buchhaltungskonto für Partner Benutzer
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Das Buchhaltungskonto auf der Benutzerkarte wird nur im Nebenbuch journalisiert. Dieser Eintrag wird im Hauptbuch Geführt. Weiter ist das auch das Standardkonto, falls auf der Benutzerkarte kein Konto eingetragen ist.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Standard - Buchhaltungskonto für Lohnzahlungen
+AddSalaryPayment=Neue Lohnzahlung
+THM=Durchschnittlicher Stundenlohn
+TJM=Durchschnittlicher Tageslohn
+THMDescription=Wenn das Modul Projektmanagement aktiv ist, dient dieser Wert zum Berechnen der aktuellen Projektzeitkosten.
+TJMDescription=Dieser Wert ist im Moment rein informativ und fliesst in keinerlei Berechnungen ein.
+LastSalaries=Die neuesten %s Lohnzahlungen
+SalariesStatistics=Lohnstatistik
+SalariesAndPayments=Löhne und Lohnzahlungen
diff --git a/htdocs/langs/de_CH/zapier.lang b/htdocs/langs/de_CH/zapier.lang
new file mode 100644
index 00000000000..5adbcd70b7a
--- /dev/null
+++ b/htdocs/langs/de_CH/zapier.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - zapier
+ModuleZapierForDolibarrDesc =Modul Zapier für Dolibarr
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index b76df2c5e13..d6f388602a7 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=verbundene Rechnungszeilen
 ExpenseReportLines=Zeilen von Spesenabrechnungen zu verbinden
 ExpenseReportLinesDone=Gebundene Zeile von Spesenabrechnungen
 IntoAccount=mit dem Buchhaltungskonto verbundene Zeilen
+TotalForAccount=Total for accounting account
 
 
 Ventilate=zusammenfügen
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Buchhaltungskonto für Spenden
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Buchhaltungskonto für Abonnements
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard-Buchhaltungskonto für gekaufte Produkte \n(wenn nicht anders im Produktblatt definiert)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard-Buchhaltungskonto für die verkauften Produkte (wenn nicht anders im Produktblatt definiert)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Standard-Buchhaltungskonto für in die EU verkaufte Produkte \n(wird verwendet, wenn nicht im Produktblatt definiert)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Standard-Buchhaltungskonto für ausserhalb der EU verkaufte Produkte [EXPORT] \n(wird verwendet, wenn nicht im Produktblatt definiert) 
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard-Buchhaltungskonto für die gekauften Leistungen (wenn nicht anders im Produktblatt definiert)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard-Buchhaltungskonto für die verkauften Leistungen (wenn nicht anders im Produktblatt definiert)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Standard-Buchhaltungskonto für in die EU verkaufte Dienstleistungen \n(wird verwendet, wenn nicht im Produktblatt definiert) 
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Standard-Buchhaltungskonto für ausserhalb der EU verkaufte Dienstleistungen [EXPORT] \n(wird verwendet, wenn nicht im Produktblatt definiert) 
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Geschäftspartner
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Drittanbieter-Konto nicht definiert oder Drittanbieter unbekannt. Fehler beim Blockieren.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unbekanntes Drittanbieter-Konto und wartendes Konto nicht definiert. Fehler beim Blockieren
 PaymentsNotLinkedToProduct=Zahlung ist keinem Produkt oder Dienstleistung zugewisen
+OpeningBalance=Opening balance
 ShowOpeningBalance=Eröffnungsbilanz anzeigen
 HideOpeningBalance=Eröffnungsbilanz ausblenden
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Kontenklasse
 PcgtypeDesc=Kontengruppen werden für einige Buchhaltungsberichte als vordefinierte Filter- und Gruppierungskriterien verwendet. Beispielsweise werden "EINKOMMEN" oder "AUSGABEN" als Gruppen für die Buchhaltung von Produktkonten verwendet, um die Ausgaben- / Einnahmenrechnung zu erstellen.
 
+Reconcilable=Reconcilable
+
 TotalVente=Gesamtumsatz vor Steuern
 TotalMarge=Gesamtumsatzrendite
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export für Quadratus QuadraCompta
 Modelcsv_ebp=Export für EBP
 Modelcsv_cogilog=Export für Cogilog
 Modelcsv_agiris=Export für Agiris
-Modelcsv_LDCompta=Export für LD Compta (ab Version 9) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export für OpenConcerto (Test)
 Modelcsv_configurable=konfigurierbarer CSV-Export
 Modelcsv_FEC=Export nach FEC
 Modelcsv_Sage50_Swiss=Export für Sage 50 (Schweiz)
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Kontenplan ID
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Modus Verkäufe Inland
 OptionModeProductSellIntra=Modus Verkäufe in EU/EWG
 OptionModeProductSellExport=Modus Verkäufe Export (ausserhalb EU/EWG)
 OptionModeProductBuy=Modus Einkäufe
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Alle Produkte mit Buchhaltungskonto für Verkäufe Inland anzeigen.
 OptionModeProductSellIntraDesc=Alle Produkte mit Buchhaltungskonto für Verkäufe in EWG anzeigen.
 OptionModeProductSellExportDesc=Alle Produkte mit Abrechnungskonto für Verkäufe Ausland anzeigen.
 OptionModeProductBuyDesc=Alle Produkte mit Buchhaltungskonto für Einkäufe anzeigen.
+OptionModeProductBuyIntraDesc=Alle Produkte mit Buchhaltungskonto für Einkäufe in der EWG anzeigen.
+OptionModeProductBuyExportDesc=Alle Produkte mit Buchhaltungskonto für andere ausländische Einkäufe anzeigen.
 CleanFixHistory=Nicht existierenden Buchhaltungskonten von Positionen entfernen, die im Kontenplan nicht vorkommen.
 CleanHistory=Alle Zuordnungen für das ausgewählte Jahr zurücksetzen.
 PredefinedGroups=Vordefinierte Gruppen
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Konto aus der Gruppe entfernt
 SaleLocal=Verkauf Inland
 SaleExport=Verkauf Export (ausserhalb EWG)
 SaleEEC=Verkauf in EU/EWG
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Bereich von Sachkonten
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index be500d597ed..e179d2de0f3 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=WebServer Benutzer/Gruppen
 NoSessionFound=Ihre PHP -Konfiguration scheint keine Auflistung aktiver Sitzungen zuzulassen. Eventuell ist die Speicherung im Verzeichnis (<b>%s</b>) durch fehlende Berechtigungen blockiert (zum Beispiel: Betriebssystemberechtigungen oder open_basedir-Beschränkungen). 
 DBStoringCharset=Zeichensatz der Datenbank-Speicherung
 DBSortingCharset=Datenbank-Zeichensatz zum Sortieren von Daten
+HostCharset=Host charset
 ClientCharset=Client-Zeichensatz
 ClientSortingCharset=Client Sortierreihenfolge
 WarningModuleNotActive=Modul <b>%s</b> muss aktiviert sein
@@ -99,9 +100,9 @@ NoMaxSizeByPHPLimit=Hinweis: In Ihren PHP-Einstellungen sind keine Größenbesch
 MaxSizeForUploadedFiles=Maximale Größe für Dateiuploads (0 verbietet jegliche Uploads)
 UseCaptchaCode=Captcha-Code auf der Anmeldeseite verwenden
 AntiVirusCommand=Vollständiger Pfad zum installierten Virenschutz
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusCommandExample=Beispiel für einen ClamAv-Daemon (Clamav-Daemon erforderlich): /usr/bin/clamdscan <br> Beispiel für ClamWin (sehr, sehr langsam): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Weitere Kommandozeilen-Parameter für den Virenschutz
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Beispiel für einen ClamAv-Daemon: --fdpass <br> Beispiel für ClamWin: --database="C:\\Programme (x86)\\ClamWin\\lib"
 ComptaSetup=Buchhaltungsmoduls-Einstellungen
 UserSetup=Benutzerverwaltung Einstellungen
 MultiCurrencySetup=Modul Mehrfachwährungen - Einstellungen
@@ -199,7 +200,7 @@ FeatureDisabledInDemo=Funktion in der Demoversion deaktiviert
 FeatureAvailableOnlyOnStable=Diese Funktion steht nur in offiziellen stabilen Versionen zur Verfügung
 BoxesDesc=Boxen sind Komponenten, die einige Informationen anzeigen, die Sie hinzufügen können, um einige Seiten zu personalisieren. Sie können wählen, ob Sie die Box anzeigen möchten oder nicht, indem Sie die Zielseite auswählen und auf 'Aktivieren' klicken oder indem Sie auf den Papierkorb klicken, um es zu deaktivieren.
 OnlyActiveElementsAreShown=Nur Elemente aus <a href="%s">aktiven Module</a> werden angezeigt.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesDesc=Die Module / Anwendungen bestimmen, welche Funktionen in der Software verfügbar sind. Bei einigen Modulen müssen Benutzern nach Aktivierung des Moduls Berechtigungen erteilt werden. Klicken Sie auf die Ein / Aus-Schaltfläche <span class="small valignmiddle"> %s </span> jedes Moduls, um ein Modul / eine Anwendung zu aktivieren oder zu deaktivieren.
 ModulesMarketPlaceDesc=Sie finden weitere Module auf externen Web-Sites...
 ModulesDeployDesc=DateiWenn es die Berechtigungen in Ihrem Dateisystem zulassen, können Sie mit diesem Tool ein externes Modul bereitstellen. Das Modul ist dann auf der Registerkarte <strong>%s</strong> sichtbar. 
 ModulesMarketPlaces=Zusatzmodule / Erweiterungen
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Kontrollkästchen / Dropdownliste (mehrere Optionen auswählb
 ExtrafieldCheckBoxFromList=Kontrollkästchen / Dropdownliste aus DB-Tabelle (mehrere Optionen auswählbar)
 ExtrafieldLink=Verknüpftes Objekt
 ComputedFormula=Berechnetes Feld
-ComputedFormulaDesc=Sie können hier eine Formel eingeben, indem Sie andere Eigenschaften des Objekts oder eine beliebige PHP-Codierung verwenden, um einen dynamisch berechneten Wert zu erhalten. Sie können alle PHP-kompatiblen Formeln verwenden, einschließlich des &quot;?&quot; Bedingungsoperator und folgendes globales Objekt: <strong>$ db, $ conf, $ langs, $ mysoc, $ user, $ object</strong> . <br> <strong>WARNUNG</strong> : Möglicherweise sind nur einige Eigenschaften von $ object verfügbar. Wenn Sie Eigenschaften benötigen, die nicht geladen sind, holen Sie sich das Objekt wie im zweiten Beispiel in Ihre Formel. <br> Wenn Sie ein berechnetes Feld verwenden, können Sie keinen Wert von der Schnittstelle eingeben. Wenn ein Syntaxfehler vorliegt, gibt die Formel möglicherweise auch nichts zurück. <br><br> Beispiel der Formel: <br> $ object-&gt; id &lt;10? round ($ object-&gt; id / 2, 2): ($ object-&gt; id + 2 * $ user-&gt; id) * (int) substr ($ mysoc-&gt; zip, 1, 2) <br><br> Beispiel zum erneuten Laden eines Objekts <br> (($ reloadedobj = new Societe ($ db)) &amp;&amp; ($ reloadedobj-&gt; fetch ($ obj-&gt; id? $ obj-&gt; id: ($ obj-&gt; rowid? $ obj-&gt; rowid: $ object-&gt; id ))&gt; 0))? $ reloadedobj-&gt; array_options ['options_extrafieldkey'] * $ reloadedobj-&gt; capital / 5: '-1' <br><br> Ein weiteres Beispiel für eine Formel zum Erzwingen des Ladens eines Objekts und seines übergeordneten Objekts: <br> (($ reloadedobj = neue Aufgabe ($ db)) &amp;&amp; ($ reloadedobj-&gt; Abrufen ($ object-&gt; id)&gt; 0) &amp;&amp; ($ secondloadedobj = neues Projekt ($ db)) &amp;&amp; ($ secondloadedobj-&gt; Abrufen ($ reloadedobj-&gt; fk_project)&gt; 0))? $ secondloadedobj-&gt; ref: 'Übergeordnetes Projekt nicht gefunden'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Speichere berechnetes Feld
 ComputedpersistentDesc=Berechnete Extrafelder werden in der Datenbank gespeichert, dennoch wird ihr Wert nur dann neu berechnet wenn sich das Objekt zu diesem Feld ändert. Falls das berechnete Feld von anderen Objekten oder globalen Daten abhängt, kann sein Wert falsch sein!
 ExtrafieldParamHelpPassword=Wenn Sie dieses Feld leer lassen, wird dieser Wert unverschlüsselt gespeichert (das Feld darf nur mit einem Stern auf dem Bildschirm ausgeblendet werden). <br> Stellen Sie 'auto'; ein, um die Standardverschlüsselungsregel zum Speichern des Kennworts in der Datenbank zu verwenden (dann ist der gelesene Wert nur der Hash, keine Möglichkeit, den ursprünglichen Wert abzurufen).
@@ -448,8 +449,8 @@ KeepEmptyToUseDefault=Leer lassen für Standardwert
 DefaultLink=Standardlink
 SetAsDefault=Als Standard setzen
 ValueOverwrittenByUserSetup=Achtung, dieser Wert kann durch den Benutzer überschrieben werden (jeder kann seine eigene ClickToDial-URL setzen)
-ExternalModule=External module
-InstalledInto=Installed into directory %s
+ExternalModule=Externes Modul
+InstalledInto=Installiert in Verzeichnis %s
 BarcodeInitForthird-parties=alle Barcodes für Geschäftspartner initialisieren
 BarcodeInitForProductsOrServices=Alle Barcodes für Produkte oder Services initialisieren oder zurücksetzen
 CurrentlyNWithoutBarCode=Zur Zeit gibt es <strong>%s</strong> Datensätze in <strong>%s</strong> %s ohne Barcode.
@@ -950,7 +951,7 @@ DictionaryCanton=Bundesland/Kanton
 DictionaryRegion=Regionen
 DictionaryCountry=Länder
 DictionaryCurrency=Währungen
-DictionaryCivility=Honorific titles
+DictionaryCivility=Ehrentitel
 DictionaryActions=Typen von Kalender-Ereignissen
 DictionarySocialContributions=Arten von Steuern oder Sozialabgaben
 DictionaryVAT=USt.-Sätze
@@ -991,7 +992,7 @@ VATIsNotUsedDesc=Die vorgeschlagene USt. ist standardmäßig 0 für alle Fälle
 VATIsUsedExampleFR=In Frankreich sind damit Unternehmen oder Organisationen gemeint, die ein echtes Steuersystem haben (vereinfacht oder normal). Ein System, in dem die Mehrwertsteuer deklariert wird.
 VATIsNotUsedExampleFR=In Frankreich bedeutet es, dass keine Umsatzsteuer ausgewiesen wird oder Unternehmen, Organisationen oder Freiberufler, die als Kleinunternehmer tätig sind (Privilegiensteuer), Umsatzsteuern zahlen ohne selbst Umsatzsteuer auszuweisen.  Diese Auswahl zeigt den Hinweis "Umsatzsteuer nicht anwendbar - Artikel-293B des CGI" auf Rechnungen an.
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
+TypeOfSaleTaxes=Art der Umsatzsteuer
 LTRate=Rate
 LocalTax1IsNotUsed=Zweite Steuer nicht nutzen
 LocalTax1IsUsedDesc=Verwende eine zweite Art von Steuer (andere als erste)
@@ -1015,9 +1016,9 @@ LocalTax2IsUsedDescES=Die Einkommenssteuerrate beim Erstellen von Interessenten,
 LocalTax2IsNotUsedDescES=Standardmäßig ist die vorgeschlagene Einkommenssteuer 0. Ende der Regel.
 LocalTax2IsUsedExampleES=In Spanien, Freiberufler und unabhängigen Fachleuten, die ihre Dienstleistungen und Unternehmen, die das Steuersystem von Modulen gewählt haben.
 LocalTax2IsNotUsedExampleES=In Spanien sind das Unternehmen, die nicht dem Steuersystem für Module unterliegen.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
-UseRevenueStamp=Use a tax stamp
-UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
+UseRevenueStamp=Verwenden Sie eine Steuermarke
+UseRevenueStampExample=Der Wert der Steuermarke wird standardmäßig in der Einrichtung der Wörterbücher definiert (%s - %s - %s).
 CalcLocaltax=Berichte über lokale Steuern
 CalcLocaltax1=Sales - Käufe
 CalcLocaltax1Desc=Lokale Steuer-Reports werden mit der Differenz von lokalen Verkaufs- und Einkaufs-Steuern berechnet
@@ -1025,7 +1026,7 @@ CalcLocaltax2=Einkauf
 CalcLocaltax2Desc=Lokale Steuer-Reports sind die Summe der lokalen Steuern auf Einkäufe
 CalcLocaltax3=Verkauf
 CalcLocaltax3Desc=Lokale Steuer-Reports sind die Summe der lokalen Steuern auf Verkäufe
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+NoLocalTaxXForThisCountry=Gemäß der Einrichtung der Steuern (siehe %s - %s - %s) muss Ihr Land diese Art von Steuern nicht verwenden
 LabelUsedByDefault=Bezeichnung wird verwendet falls keine Übersetzung für den Code vorhanden ist.
 LabelOnDocuments=Bezeichnung auf Dokumenten
 LabelOrTranslationKey=Bezeichung oder Übersetzungsschlüssel
@@ -1116,8 +1117,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=zu genehmigende Spesenabrechnung
 Delays_MAIN_DELAY_HOLIDAYS=Zu genehmigende Urlaubsanträge
 SetupDescription1=Bevor Sie mit Dolibarr arbeiten können müssen grundlegende Einstellungen getätigt und Module freigeschalten / konfiguriert werden.
 SetupDescription2=Die folgenden zwei Punkte sind obligatorisch:
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescription3=<a href="%s"> %s -> %s </a> <br> <br> Grundlegende Parameter zum Anpassen des Standardverhaltens Ihrer Anwendung (z. B. für länderbezogene Funktionen).
+SetupDescription4=<a href="%s"> %s -> %s </a> <br> <br> Diese Software ist eine Suite vieler Module / Anwendungen. Die auf Ihre Bedürfnisse bezogenen Module müssen aktiviert und konfiguriert sein. Menüeinträge werden mit der Aktivierung dieser Module angezeigt.
 SetupDescription5=Andere Setup-Menüs verwalten optionale Parameter.
 LogEvents=Protokollierte Ereignisse
 Audit=Protokoll
@@ -1136,7 +1137,7 @@ LogEventDesc=Aktivieren Sie die Protokollierung für bestimmte Sicherheitsereign
 AreaForAdminOnly=Einstellungen können nur durch </b>Administratoren</b> verändert werden.
 SystemInfoDesc=Verschiedene systemrelevante, technische Informationen - Lesemodus und nur für Administratoren sichtbar.
 SystemAreaForAdminOnly=Dieser Bereich steht ausschließlich Administratoren zur Verfügung. Keine der Benutzerberechtigungen kann dies ändern.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+CompanyFundationDesc=Bearbeiten Sie die Informationen Ihres Unternehmens / Ihrer Organisation. Klicken Sie unten auf der Seite auf die Schaltfläche "%s", wenn Sie fertig sind.
 AccountantDesc=Falls Sie einen externen Buchhalter/Treuhänder haben, können Sie hier dessen Informationen hinterlegen.
 AccountantFileNumber=Buchhalter-Code
 DisplayDesc=Hier können Parameter zum Aussehen und Verhalten von Dolibarr angepasst werden.
@@ -1272,8 +1273,9 @@ RuleForGeneratedPasswords=Regeln für die Erstellung und Freigabe von Passwörte
 DisableForgetPasswordLinkOnLogonPage='Passwort vergessen'-Link nicht auf der Anmeldeseite anzeigen
 UsersSetup=Benutzermoduleinstellungen
 UserMailRequired=Für die Anlage eines neuen Benutzers ist eine E-Mail-Adresse erforderlich 
-UsersDocModules=Document templates for documents generated from user record
-GroupsDocModules=Document templates for documents generated from a group record
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
+UsersDocModules=Dokumentvorlagen für Dokumente, die aus dem Benutzerdatensatz generiert wurden
+GroupsDocModules=Dokumentvorlagen für Dokumente, die aus einem Gruppendatensatz generiert wurden
 ##### HRM setup #####
 HRMSetup=Personal Modul Einstellungen
 ##### Company setup #####
@@ -1305,7 +1307,7 @@ BillsPDFModules=PDF-Rechnungsvorlagen
 BillsPDFModulesAccordindToInvoiceType=Rechnung dokumentiert Modelle nach Rechnungsart
 PaymentsPDFModules=Zahlungsvorlagen
 ForceInvoiceDate=Rechnungsdatum ist zwingend Freigabedatum
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestedPaymentModesIfNotDefinedInInvoice=Vorgeschlagener, standardmäßiger Zahlungsmodus auf der Rechnung, falls nicht auf der Rechnung definiert
 SuggestPaymentByRIBOnAccount=Bankkonto für Bezahlung per Überweisung
 SuggestPaymentByChequeToAddress=Adresse für Zahlung per Scheck
 FreeLegalTextOnInvoices=Freier Rechtstext für Rechnungen
@@ -1317,7 +1319,7 @@ SupplierPaymentSetup=Einstellungen für Lieferantenzahlungen
 PropalSetup=Angebotsmoduleinstellungen
 ProposalsNumberingModules=Nummernvergabe für Angebote
 ProposalsPDFModules=Dokumentenvorlage(n)
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Vorgeschlagener, standardmäßiger Zahlungsmodus für Angebot, falls nicht im Angebot definiert
 FreeLegalTextOnProposal=Freier Rechtstext auf Angeboten
 WatermarkOnDraftProposal=Wasserzeichen auf Angebotsentwurf (leerlassen wenn keines benötigt wird)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Fragen Sie nach dem Bankkonto bei einem Angebot
@@ -1332,7 +1334,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Frage nach Lager für Aufträge
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Frage nach der Ziel-Bankverbindung der Lieferantenbestellung
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Vorgeschlagener, standardmäßiger Zahlungsmodus für Verkaufsaufträge, falls nicht in der Bestellung definiert
 OrdersSetup=Einstellungen für die Verwaltung von Verkaufsaufträgen
 OrdersNumberingModules=Nummernvergabe für Bestellungen
 OrdersModelModule=Dokumentenvorlage(n)
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Einstellungen des Modul Mandanten
 ##### Suppliers #####
 SuppliersSetup=Einrichtung des Lieferantenmoduls
 SuppliersCommandModel=Vollständige Bestellvorlage
-SuppliersCommandModelMuscadet=Vollständige Bestellvorlage 
+SuppliersCommandModelMuscadet=Vollständige Bestellvorlage (alte Implementierung der Cornas-Vorlage)
 SuppliersInvoiceModel=Vollständige Vorlage der Lieferantenrechnung
 SuppliersInvoiceNumberingModel=Lieferantenrechnungen Zähl-Modell
 IfSetToYesDontForgetPermission=Wenn ein Wert ungleich Null festgelegt ist, vergessen Sie nicht, Berechtigungen für Gruppen oder Benutzer bereitzustellen, die für die zweite Genehmigung zugelassen sind
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Symbole im oberen Menü ausblenden.
 LeftMenuBackgroundColor=Hintergrundfarbe für Menü Links
 BackgroundTableTitleColor=Hintergrundfarbe für Titelzeilen in Tabellen
 BackgroundTableTitleTextColor=Textfarbe der Tabellenüberschrift
+BackgroundTableTitleTextlinkColor=Textfarbe für die Tabellentitel-Linkzeile
 BackgroundTableLineOddColor=Hintergrundfarbe für ungerade Tabellenzeilen
 BackgroundTableLineEvenColor=Hintergrundfarbe für gerade Tabellenzeilen
 MinimumNoticePeriod=Mindestkündigungsfrist (Ihr Urlaubsantrag muss vor dieser Frist gestellt werden)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr-Referenz nicht in Nachrichten-ID gefunden
 FormatZip=PLZ
 MainMenuCode=Menüpunktcode (Hauptmenü)
 ECMAutoTree=Automatischen ECM-Baum anzeigen
-OperationParamDesc=Werte definieren, um Eigenschaften zu setzen oder Werte auszulesen. Beispiel:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Benutze ein Semikolon ';' als Trennzeichen um Eigenschaften zu setzen oder auszulesen.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Öffnungszeiten
 OpeningHoursDesc=Geben sie hier die regulären Öffnungszeiten vom Unternehmen an.
 ResourceSetup=Konfiguration vom Ressourcenmodul
@@ -1970,7 +1973,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warnung, höhere Werte verlangsamen die
 ModuleActivated=Modul %s is aktiviert und verlangsamt die Overfläche
 EXPORTS_SHARE_MODELS=Exportmodelle sind für jeden zugänglich.
 ExportSetup=Einrichtung Modul Export
-ImportSetup=Setup of module Import
+ImportSetup=Einrichtung des Modulimports
 InstanceUniqueID=Eindeutige ID dieser Instanz
 SmallerThan=Kleiner als
 LargerThan=Größer als
@@ -1991,7 +1994,9 @@ MakeAnonymousPing=Einen anonymen Ping '+1' an den Dolibarr-Foundation-Server (ei
 FeatureNotAvailableWithReceptionModule=Funtion nicht verfügbar, wenn Modul Wareneingang aktiviert ist
 EmailTemplate=E-Mail-Vorlage
 EMailsWillHaveMessageID=E-Mails haben ein Schlagwort "Referenzen", das dieser Syntax entspricht
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
+PDF_USE_ALSO_LANGUAGE_CODE=Wenn Sie möchten, dass einige Texte in Ihrem PDF in 2 verschiedenen Sprachen in demselben generierten PDF dupliziert werden, müssen Sie hier diese zweite Sprache festlegen, damit das generierte PDF zwei verschiedene Sprachen auf derselben Seite enthält, die beim Generieren von PDF ausgewählte und diese (dies wird nur von wenigen PDF-Vorlagen unterstützt). Für 1 Sprache pro PDF leer halten.
 FafaIconSocialNetworksDesc=Gib hier den Code für ein FontAwesome icon ein. Wenn du FontAwesome nicht kennst, kannst du den Standard 'fa-address-book' benutzen.
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
+RssNote=Hinweis: Jede RSS-Feed-Definition enthält ein Widget, das Sie aktivieren müssen, damit es im Dashboard verfügbar ist
+JumpToBoxes=Wechseln Sie zu Einstellungen -> Widgets
+MeasuringUnitTypeDesc=Verwenden Sie hier einen Wert wie "Größe", "Oberfläche", "Volumen", "Gewicht", "Zeit".
+MeasuringScaleDesc=Die Skala gibt die Anzahl der Stellen an, an denen Sie den Dezimalteil verschieben müssen, um mit der Standardreferenzeinheit übereinzustimmen. Für den Einheitentyp "Zeit" ist dies die Anzahl der Sekunden. Werte zwischen 80 und 99 sind reservierte Werte.
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index fbcf4801dab..177bbfed204 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -66,9 +66,9 @@ paymentInInvoiceCurrency=in Rechnungswährung
 PaidBack=Zurück bezahlt
 DeletePayment=Lösche Zahlung
 ConfirmDeletePayment=Möchten Sie diese Zahlung wirklich löschen?
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReduc=Möchten Sie diese %s in ein verfügbares Guthaben umwandeln?
 ConfirmConvertToReduc2=Der Betrag wird unter allen Rabatten gespeichert und kann als Rabatt für eine aktuelle oder zukünftige Rechnung für diesen Kunden verwendet werden.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
+ConfirmConvertToReducSupplier=Möchten Sie diese %s in ein verfügbares Guthaben umwandeln?
 ConfirmConvertToReducSupplier2=Der Betrag wird unter allen Rabatten gespeichert und kann als Rabatt für eine aktuelle oder zukünftige Rechnung dieses Anbieters verwendet werden.
 SupplierPayments=Lieferanten Zahlung
 ReceivedPayments=Erhaltene Zahlungen
@@ -209,20 +209,13 @@ NumberOfBillsByMonth=Anzahl Rechnungen pro Monat
 AmountOfBills=Anzahl der Rechnungen
 AmountOfBillsHT=Rechnungsbetrag (Netto ohne Steuern)
 AmountOfBillsByMonthHT=Gesamtbetrag Rechnungen pro Monat (inkl. Steuern)
-ShowSocialContribution=Zeige Sozialabgaben/Unternehmenssteuer
-ShowBill=Zeige Rechnung
-ShowInvoice=Zeige Rechnung
-ShowInvoiceReplace=Zeige Ersatzrechnung
-ShowInvoiceAvoir=Zeige Gutschrift
-ShowInvoiceDeposit=Anzahlungsrechnungen anzeigen
-ShowInvoiceSituation=Zeige Fortschritt-Rechnung
 UseSituationInvoices=Fortschritt-Rechnung zulassen
 UseSituationInvoicesCreditNote=Fortschritt-Rechnungsgutschrift zulassen
 Retainedwarranty=Zurückbehaltene Garantie
-AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
+AllowedInvoiceForRetainedWarranty=Zurückbehaltene Garantie, die auf die folgenden Arten von Rechnungen angewendet werden kann
 RetainedwarrantyDefaultPercent=Zurückbehaltene Garantie in Prozent
-RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
-RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
+RetainedwarrantyOnlyForSituation=Stellen Sie "einbehaltene Garantie" nur für Situationsrechnungen zur Verfügung
+RetainedwarrantyOnlyForSituationFinal=Auf Situationsrechnungen wird der globale Abzug der "einbehaltenen Garantie" nur auf die endgültige Situation angewendet
 ToPayOn=Zu zahlen am %s
 toPayOn=zu zahlen am %s
 RetainedWarranty=Zurückbehaltene Garantie
@@ -233,7 +226,6 @@ setretainedwarranty=Beibehaltung der Gewährleistung angeben
 setretainedwarrantyDateLimit=Datum für Beibehaltung der Gewährleistung angeben
 RetainedWarrantyDateLimit=Datum für Beibehaltung der Gewährleistung
 RetainedWarrantyNeed100Percent=Teilrechnung muss 100 %  %% vollständig sein, um im PDF zu erscheinen.
-ShowPayment=Zeige Zahlung
 AlreadyPaid=Bereits bezahlt
 AlreadyPaidBack=Bereits zurückbezahlt
 AlreadyPaidNoCreditNotesNoDeposits=Bereits bezahlt (ohne Gutschriften und Anzahlungen)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Erzeugt von der Rechnungsvorlage %s
 WarningInvoiceDateInFuture=Achtung, das Rechnungsdatum ist höher als das aktuelle Datum
 WarningInvoiceDateTooFarInFuture=Achtung, das Rechnungsdatum ist zu weit entfernt vom aktuellen Datum
 ViewAvailableGlobalDiscounts=Zeige verfügbare Rabatte
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=sofort
@@ -512,11 +505,11 @@ ToMakePayment=Bezahlen
 ToMakePaymentBack=Rückzahlung
 ListOfYourUnpaidInvoices=Liste aller unbezahlten Rechnungen
 NoteListOfYourUnpaidInvoices=Bitte beachten: Diese Liste enthält nur Rechnungen an Partner, bei denen Sie als Vertreter angegeben sind.
-RevenueStamp=Tax stamp
+RevenueStamp=Steuermarke
 YouMustCreateInvoiceFromThird=Diese Option ist nur verfügbar, wenn Sie eine Rechnung auf der Registerkarte "Kunde" eines Drittanbieters erstellen
 YouMustCreateInvoiceFromSupplierThird=Diese Option ist nur verfügbar, wenn Sie eine Rechnung auf der Registerkarte "Kreditor" eines Drittanbieters erstellen
 YouMustCreateStandardInvoiceFirstDesc=Zuerst muss eine Standardrechnung erstellt werden, dies kann dann in eine neue Rechnungsvorlage konvertiert werden
-PDFCrabeDescription=Rechnung PDF-Vorlage Crabe. Eine vollständige Rechnungsvorlage 
+PDFCrabeDescription=Rechnung PDF-Vorlage Crabe. Eine vollständige Rechnungsvorlage (alte Implementierung der Sponge-Vorlage)
 PDFSpongeDescription=Rechnung PDF-Vorlage Sponge. Eine vollständige Rechnungsvorlage
 PDFCrevetteDescription=PDF Rechnungsvorlage Crevette. Vollständige Rechnungsvolage für normale Rechnungen
 TerreNumRefModelDesc1=Liefert eine Nummer mit dem Format %syymm-nnnn für Standard-Rechnungen und %syymm-nnnn für Gutschriften, wobei yy=Jahr, mm=Monat und nnnn eine lückenlose Folge ohne Überlauf auf 0 ist
@@ -578,4 +571,4 @@ AutoFillDateTo=Enddatum der Dienstleistung auf das Rechnungsdatum setzen
 AutoFillDateToShort=Enddatum festlegen
 MaxNumberOfGenerationReached=Maximal Anzahl Generierungen erreicht
 BILL_DELETEInDolibarr=Rechnung gelöscht
-BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
+BILL_SUPPLIER_DELETEInDolibarr=Lieferantenrechnung gelöscht
diff --git a/htdocs/langs/de_DE/modulebuilder.lang b/htdocs/langs/de_DE/modulebuilder.lang
index 9081742aa45..332164aea50 100644
--- a/htdocs/langs/de_DE/modulebuilder.lang
+++ b/htdocs/langs/de_DE/modulebuilder.lang
@@ -83,9 +83,9 @@ ListOfDictionariesEntries=Liste der Wörterbucheinträge
 ListOfPermissionsDefined=Liste der definierten Berechtigungen
 SeeExamples=Beispiele hier
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Ist das Feld sichtbar ? (Beispiele: 0=Nie sichtbar, 1=Sichtbar in Auflistungen und Erstellungs-/Änderungs-/Anzeigeformularen, 2=Nur sichtbar in Auflistungen, 3=Nur sichtbar in Erstellungs-/Änderungs-/Anzeigeformularen (keine Auflistungen), 4=Nur sichtbar in Auflistungen und Änderungs-/Anzeigeformularen (keine Erstellungsformulare), 5=Nur sichtbar in Auflistungen und Anzeigeformularen (keine Erstellungs-/Änderungsformulare). Ein negativer Wert bedeutet, das Feld wird standardmäßig nicht angezeigt in der Auflistung, aber kann zur Anzeige ausgewählt werden). Ausdrücke können verwendet werden, z.B.:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
-DisplayOnPdf=Display on PDF
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdf=Anzeige auf PDF
 IsAMeasureDesc=Kann der Wert des Feldes kumuliert werden, um eine Summe in die Liste aufzunehmen? (Beispiele: 1 oder 0)
 SearchAllDesc=Wird das Feld verwendet, um eine Suche über das Schnellsuchwerkzeug durchzuführen? (Beispiele: 1 oder 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index 03dcfa404f7..bb6f57b46e3 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service für Leitungen
 InvoiceGeneratedFromTimeSpent=Die Rechnung %s wurde aus der für das Projekt aufgewendeten Zeit generiert
 ProjectBillTimeDescription=Prüfe, ob Arbeitszeittabellen für Projektaufgaben geführt werden UND ob Rechnungen aus dieser Arbeitszeittabelle erstellt werden sollen, um mit dem Kunden des Projekts abzurechnen (Prüfe nicht, ob Rechnungen erstellt werden sollen, die nicht auf Arbeitszeittabellen basieren). Hinweis: Um eine Rechnung zu erstellen, gehe auf die Registerkarte 'Zeitaufwand' des Projekts und wähle einzuschließende Zeilen aus.
 ProjectFollowOpportunity=Verkaufsmöglichkeiten nachverfolgen
-ProjectFollowTasks=Folgen Sie Aufgaben
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Anwendung: Verkaufsmöglichkeit
 UsageTasks=Verwendung: Aufgaben
diff --git a/htdocs/langs/de_DE/propal.lang b/htdocs/langs/de_DE/propal.lang
index df4124f1b8b..1122aa02c52 100644
--- a/htdocs/langs/de_DE/propal.lang
+++ b/htdocs/langs/de_DE/propal.lang
@@ -63,7 +63,7 @@ ProposalLine=Angebotsposition
 AvailabilityPeriod=Gültig bis
 SetAvailability=Gültigkeitszeitraum definieren
 AfterOrder=nach Bestellung
-OtherProposals=zeige weitere Angebote für diesen Partners
+OtherProposals=zeige weitere Angebote für diesen Partner
 ##### Availability #####
 AvailabilityTypeAV_NOW=Sofort
 AvailabilityTypeAV_1W=7 Tage
@@ -76,7 +76,7 @@ TypeContact_propal_external_BILLING=Kontakt für Kundenrechnungen
 TypeContact_propal_external_CUSTOMER=Kundenkontakt für Angebot
 TypeContact_propal_external_SHIPPING=Kundenkontakt für Lieferung
 # Document models
-DocModelAzurDescription=Ein vollständiges Angebotsmodell 
+DocModelAzurDescription=Ein vollständiges Angebotsmodell (alte Implementierung der Cyan-Vorlage)
 DocModelCyanDescription=Ein vollständiges Angebotsmodell
 DefaultModelPropalCreate=Erstellung Standardvorlage
 DefaultModelPropalToBill=Standard-Template, wenn Sie ein Angebot schließen wollen (zur Verrechung)
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index bfe140a6001..fb42a394cff 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -57,7 +57,7 @@ NoPageYet=Noch keine Seiten
 YouCanCreatePageOrImportTemplate=Sie können eine neue Seite erstellen oder eine komplette Website-Vorlage importieren
 SyntaxHelp=Hilfe zu bestimmten Syntaxtipps
 YouCanEditHtmlSourceckeditor=Sie können den HTML-Quellcode über die Schaltfläche "Quelle" im Editor bearbeiten.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> PHP Code kann in diesen Sourcecode durch Tags integriert werden <strong>&lt;?php ?&gt;</strong>. Folgende globale Variablen sind verfügbar: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> Inhalte anderer Seiten / Container können ebenfalls mit folgender Syntax übernommen werden:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> Eine Weiterleitung zu anderen Seiten / Containern erfolgt mit folgender Syntax (Hinweis: keine Inhalte vor der Weiterleitung ausgeben):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> Um einen Link zu einer anderen Seite zu integrieren, nutze folgende Syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> Um einen  <strong>Downloadlink</strong> zu einer Datei im Verzeichnis <strong>documents</strong> zu integrieren, nutze den <strong>document.php</strong> Wrapper:<br>Beispielsyntax für eine Datei im Verzeichnis documents/ecm (muss protokolliert werden):<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Beispielsyntax für eine Datei im Verzeichnis documents/medias (öffentlicher Zugriff):<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Beispielsyntax für eine freigegebene Datei mit Freigabelink (öffentlicher Zugriff mit dem geteilten Hash der Datei):<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> Um ein <strong>Bild</strong> im Verzeichnis <strong>documents</strong> herunterzuladen, benutze den <strong>viewimage.php</strong> Wrapper:<br>Beispielsyntax für ein Bild im Verzeichnis documents/medias (öffentlicher Zugriff):<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>Weitere Beispiele für HTML oder dynamischen Code sind verfügbar in der <a href="%s" target="_blank">Wiki Dokumentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Seite / Container klonen
 CloneSite=Website klonen
 SiteAdded=Website hinzugefügt 
@@ -77,7 +77,7 @@ BlogPost=Blog Eintrag
 WebsiteAccount=Website Konto
 WebsiteAccounts=Website Konten
 AddWebsiteAccount=Website-Konto erstellen
-BackToListOfThirdParty=Zurück zur Liste für Drittanbieter
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Webseite zuerst deaktivieren
 MyContainerTitle=Titel der Website
 AnotherContainer=So fügen Sie den Inhalt einer anderen Seite/eines anderen Containers ein (Sie könnten hierbei Fehler haben, wenn Sie dynamischen Code aktivieren, weil der eingebettete Subcontainer möglicherweise nicht existiert)
diff --git a/htdocs/langs/de_DE/zapier.lang b/htdocs/langs/de_DE/zapier.lang
new file mode 100644
index 00000000000..5922ed95485
--- /dev/null
+++ b/htdocs/langs/de_DE/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier für Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Modul: Zapier für Dolibarr
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Zapier für Dolibarr einrichten
diff --git a/htdocs/langs/el_CY/accountancy.lang b/htdocs/langs/el_CY/accountancy.lang
new file mode 100644
index 00000000000..9827b9d3795
--- /dev/null
+++ b/htdocs/langs/el_CY/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
diff --git a/htdocs/langs/el_CY/admin.lang b/htdocs/langs/el_CY/admin.lang
new file mode 100644
index 00000000000..27c312f77d7
--- /dev/null
+++ b/htdocs/langs/el_CY/admin.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - admin
+MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+Module56Name=Telephony
+Module56Desc=Telephony integration
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/el_CY/companies.lang b/htdocs/langs/el_CY/companies.lang
new file mode 100644
index 00000000000..6897cf22f06
--- /dev/null
+++ b/htdocs/langs/el_CY/companies.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - companies
+Contact=Contact
diff --git a/htdocs/langs/el_CY/modulebuilder.lang b/htdocs/langs/el_CY/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/el_CY/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/el_CY/projects.lang b/htdocs/langs/el_CY/projects.lang
new file mode 100644
index 00000000000..7e42793b0e9
--- /dev/null
+++ b/htdocs/langs/el_CY/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index bfd11f7ec8b..2671a163f4e 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Δεσμευμένες γραμμές τιμολογίων
 ExpenseReportLines=Γραμμές εκθέσεων δαπανών που δεσμεύουν
 ExpenseReportLinesDone=Δεσμευμένες αναφορές δαπανών
 IntoAccount=Συνδέστε τη γραμμή με τον λογαριασμό λογιστικής
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Δένω
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Λογαριασμός λογιστικής για τ
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Λογαριασμός λογιστικής για την εγγραφή συνδρομών
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Λογαριασμός λογιστικής από προεπιλογή για τα αγορασμένα προϊόντα (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντων)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Λογαριασμός από προεπιλογή για τα προϊόντα που αγοράστηκαν στην ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντος)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Λογαριασμός από προεπιλογή για τα προϊόντα που αγοράστηκαν και εισάγονται εκτός ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντος)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Λογαριασμός λογαριασμού από προεπιλογή για τα προϊόντα που πωλούνται (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντος)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Λογαριασμός λογιστικής από προεπιλογή για τα προϊόντα που πωλούνται στην ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντων)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Λογαριασμός λογαριασμού από προεπιλογή για τα προϊόντα που πωλούνται και εξάγονται εκτός ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντων)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Λογαριασμός λογαριασμού από προεπιλογή για τις υπηρεσίες που αγοράσατε (χρησιμοποιείται αν δεν ορίζεται στο φύλλο εξυπηρέτησης)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Λογαριασμός από προεπιλογή για τις υπηρεσίες που αγοράστηκαν στην ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο υπηρεσίας)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Λογαριασμός από προεπιλογή για τις υπηρεσίες που αγοράστηκαν και εισήχθησαν εκτός ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο υπηρεσίας)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Λογαριασμός λογαριασμού από προεπιλογή για τις υπηρεσίες πώλησης (χρησιμοποιείται αν δεν ορίζεται στο φύλλο εξυπηρέτησης)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Λογαριασμός λογαριασμού από προεπιλογή για τις υπηρεσίες που πωλούνται στην ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο υπηρεσιών)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Λογαριασμός λογαριασμού από προεπιλογή για τις υπηρεσίες που πωλούνται και εξάγονται εκτός ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο υπηρεσιών)
@@ -228,11 +234,15 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Άγνωστο τ
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Ο λογαριασμός τρίτου μέρους δεν έχει οριστεί ή είναι άγνωστος τρίτος. Σφάλμα αποκλεισμού.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Ο λογαριασμός λογαριασμού τρίτου μέρους και ο λογαριασμός αναμονής δεν έχουν οριστεί. Σφάλμα αποκλεισμού
 PaymentsNotLinkedToProduct=Πληρωμή που δεν συνδέεται με κανένα προϊόν / υπηρεσία
+OpeningBalance=Opening balance
 ShowOpeningBalance=Εμφάνιση αρχικού υπολοίπου
 HideOpeningBalance=Κρύψιμο αρχικού υπολοίπου
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Ομάδα του λογαριασμού
-PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+PcgtypeDesc=Η ομάδα λογαριασμού χρησιμοποιείται ως προκαθορισμένα κριτήρια «φίλτρου» και «ομαδοποίησης» για ορισμένες λογιστικές αναφορές. Για παράδειγμα, τα «ΕΙΣΟΔΗΜΑ» ή «ΕΞΟΔΑ» χρησιμοποιούνται ως ομάδες λογιστικών λογαριασμών προϊόντων για τη δημιουργία της αναφοράς εξόδων / εσόδων.
+
+Reconcilable=Συμβιβάσιμος
 
 TotalVente=Total turnover before tax
 TotalMarge=Συνολικό περιθώριο πωλήσεων
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Εξαγωγή για Quadratus QuadraCompta
 Modelcsv_ebp=Εξαγωγή για EBP
 Modelcsv_cogilog=Εξαγωγή για το Cogilog
 Modelcsv_agiris=Εξαγωγή για Agiris
-Modelcsv_LDCompta=Εξαγωγή για LD Compta (v9 και άνω) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Εξαγωγή για LD Compta (v10 και άνω)
 Modelcsv_openconcerto=Εξαγωγή για OpenConcerto (Test)
 Modelcsv_configurable=Εξαγωγή CSV εξαγωγής
 Modelcsv_FEC=Εξαγωγή FEC
 Modelcsv_Sage50_Swiss=Εξαγωγή για Sage 50 Ελβετία
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Λογαριασμός Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Κατάσταση πωλήσεων
 OptionModeProductSellIntra=Mode πωλήσεις που εξάγονται στην ΕΟΚ
 OptionModeProductSellExport=Mode πωλήσεις που εξάγονται σε άλλες χώρες
 OptionModeProductBuy=Κατάσταση αγορών
+OptionModeProductBuyIntra=Λειτουργίες που εισάγονται σε ΕΟΚ
+OptionModeProductBuyExport=Λειτουργία που αγοράστηκε εισαγόμενη από άλλες χώρες
 OptionModeProductSellDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό για πωλήσεις.
 OptionModeProductSellIntraDesc=Εμφάνιση όλων των προϊόντων με λογιστική καταγραφή πωλήσεων στην ΕΟΚ.
 OptionModeProductSellExportDesc=Εμφάνιση όλων των προϊόντων με λογαρια σμό για άλλες ξένες πωλήσεις.
 OptionModeProductBuyDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό για αγορές.
+OptionModeProductBuyIntraDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό για αγορές σε ΕΟΚ.
+OptionModeProductBuyExportDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό για άλλες αγορές στο εξωτερικό.
 CleanFixHistory=Καταργήστε τον κωδικό λογιστικής από γραμμές που δεν υπάρχουν στα γραφήματα λογαριασμού
 CleanHistory=Επαναφέρετε όλες τις συνδέσεις για το επιλεγμένο έτος
 PredefinedGroups=Προκαθορισμένες ομάδες
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Ο λογαριασμός αφαιρέθηκε από τ
 SaleLocal=Τοπική πώληση
 SaleExport=Εξαγωγή πώλησης
 SaleEEC=Πώληση στην ΕΟΚ
+SaleEECWithVAT=Πώληση σε ΕΟΚ με μηδενικό ΦΠΑ, επομένως υποθέτουμε ότι ΔΕΝ είναι ενδοκοινοτική πώληση και ο προτεινόμενος λογαριασμός είναι ο τυπικός λογαριασμός προϊόντος.
+SaleEECWithoutVATNumber=Πώληση σε ΕΟΚ χωρίς ΦΠΑ, αλλά δεν ορίζεται το ΑΦΜ τρίτου μέρους. Εφεδρικός λογαριασμός προϊόντος για τυπικές πωλήσεις. Εάν χρειαστεί, μπορείτε να διορθώσετε το αναγνωριστικό ΦΠΑ τρίτου μέρους ή τον λογαριασμό προϊόντος.
 
 ## Dictionary
 Range=Εύρος λογιστικού λογαριασμού
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 6a7c7ab2627..e9cfbc1009f 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Χειριστής/Ομάδα Διακομιστή Web
 NoSessionFound=Η διαμόρφωση της PHP σας φαίνεται να μην επιτρέπει την καταχώρηση των ενεργοποιημένων συνδεγριών. Ο κατάλογος που χρησιμοποιείται για την αποθήκευση των περιόδων σύνδεσης (<b>%s</b>) μπορεί να προστατεύεται (για παράδειγμα, από τα δικαιώματα των λειτουργικών συστημάτων ή από την οδηγία PHP open_basedir).
 DBStoringCharset=Σύνολο χαρακτήρων βάσης δεδομένων για την αποθήκευση δεδομένων
 DBSortingCharset=Σετ χαρακτήρων βάσης δεδομένων για ταξινόμηση δεδομένων
+HostCharset=Host charset
 ClientCharset=Σύνολο χαρακτήρων του χρήστη
 ClientSortingCharset=Συγκέντρωση πελατών
 WarningModuleNotActive=Το Module <b>%s</b> πρέπει να ενεργοποιηθεί
@@ -99,9 +100,9 @@ NoMaxSizeByPHPLimit=Σημείωση: Κανένα όριο δεν έχει ορ
 MaxSizeForUploadedFiles=Μέγιστο μέγεθος για μεταφόρτωση αρχείων (0 απορρίπτει οποιοδήποτε μεταφόρτωση)
 UseCaptchaCode=Χρησιμοποιήστε το γραφικό κώδικα (CAPTCHA) στη σελίδα εισόδου
 AntiVirusCommand=Πλήρης διαδρομή για την εντολή του antivirus
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusCommandExample=Παράδειγμα για το ClamAv Daemon (απαιτείται clamav-daemon): / usr / bin / clamdscan <br> Παράδειγμα για το ClamWin (πολύ αργό): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Περισσότερες παράμετροι στην γραμμή εντολής
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Παράδειγμα για το ClamAv Daemon: --fdpass <br> Παράδειγμα για το ClamWin: --database = "C: \\ Program Files (x86) \\ ClamWin \\ lib"
 ComptaSetup=Εγκατάσταση Λογιστικού module
 UserSetup=Ρύθμιση χρήστη
 MultiCurrencySetup=Ρύθμιση πολλαπλών νομισμάτων
@@ -199,7 +200,7 @@ FeatureDisabledInDemo=Δυνατότητα απενεργοποίησης στο
 FeatureAvailableOnlyOnStable=Το χαρακτηριστικό είναι διαθέσιμο μόνο σε επίσημες σταθερές εκδόσεις
 BoxesDesc=Τα γραφικά στοιχεία είναι στοιχεία που εμφανίζουν ορισμένες πληροφορίες που μπορείτε να προσθέσετε για να προσαρμόσετε ορισμένες σελίδες. Μπορείτε να επιλέξετε μεταξύ εμφάνισης του γραφικού στοιχείου ή όχι επιλέγοντας τη σελίδα προορισμού και κάνοντας κλικ στην επιλογή &#39;Ενεργοποίηση&#39; ή κάνοντας κλικ στο καλάθι απορριμάτων για να το απενεργοποιήσετε.
 OnlyActiveElementsAreShown=Μόνο στοιχεία από <a href="%s">ενεργοποιημένα modules</a> προβάλλονται.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesDesc=Οι ενότητες / εφαρμογές καθορίζουν ποιες δυνατότητες είναι διαθέσιμες στο λογισμικό. Ορισμένες λειτουργικές μονάδες απαιτούν να δοθούν δικαιώματα στους χρήστες μετά την ενεργοποίηση της λειτουργικής μονάδας. Κάντε κλικ στο κουμπί on / off <span class="small valignmiddle"> %s </span> κάθε μονάδας για να ενεργοποιήσετε ή να απενεργοποιήσετε μια ενότητα / εφαρμογή.
 ModulesMarketPlaceDesc=Μπορείτε να βρείτε περισσότερες ενότητες για να κατεβάσετε σε εξωτερικές ιστοσελίδες στο Internet ...
 ModulesDeployDesc=Εάν το επιτρέπουν τα δικαιώματα στο σύστημα αρχείων σας, μπορείτε να χρησιμοποιήσετε αυτό το εργαλείο για την ανάπτυξη εξωτερικής μονάδας. Η ενότητα θα είναι στη συνέχεια ορατή στην καρτέλα <strong>%s</strong> .
 ModulesMarketPlaces=Βρείτε εξωτερική εφαρμογή / ενότητες
@@ -222,7 +223,7 @@ DoliPartnersDesc=Κατάλογος εταιρειών που παρέχουν 
 WebSiteDesc=Εξωτερικοί ιστότοποι για περισσότερες πρόσθετες (μη πυρήνες) ενότητες ...
 DevelopYourModuleDesc=Μερικές λύσεις για να αναπτύξεις το δικό σου μοντέλο...
 URL=URL
-RelativeURL=Relative URL
+RelativeURL=Σχετική διεύθυνση URL
 BoxesAvailable=Διαθέσιμα Widgets
 BoxesActivated=Ενεργοποιημένα Widgets
 ActivateOn=Ενεργοποιήστε στις
@@ -330,7 +331,7 @@ SetupIsReadyForUse=Η εγκατάσταση της μονάδας ολοκλη
 NotExistsDirect=Ο εναλλακτικός ριζικός κατάλογος δεν ορίζεται σε έναν υπάρχοντα κατάλογο. <br>
 InfDirAlt=Από την έκδοση 3, είναι δυνατό να οριστεί ένας εναλλακτικός κατάλογος ρίζας. Αυτό σας επιτρέπει να αποθηκεύετε, σε έναν ειδικό κατάλογο, plug-ins και προσαρμοσμένα πρότυπα. <br> Απλά δημιουργήστε έναν κατάλογο στη ρίζα του Dolibarr (π.χ.: custom). <br>
 InfDirExample=<br> Στη συνέχεια, δηλώστε το στο αρχείο <strong>conf.php</strong> <br> $ dolibarr_main_url_root_alt = &#39;/ προσαρμοσμένο&#39; <br> $ dolibarr_main_document_root_alt = &#39;/ διαδρομή / του / dolibarr / htdocs / custom&#39; <br> Εάν οι γραμμές αυτές σχολιάζονται με &quot;#&quot;, για να τις ενεργοποιήσετε, απλώς αποσυνδέστε την αφαιρώντας τον χαρακτήρα &quot;#&quot;.
-YouCanSubmitFile=You can upload the .zip file of module package from here:
+YouCanSubmitFile=Μπορείτε να ανεβάσετε το αρχείο .zip του πακέτου ενότητας από εδώ:
 CurrentVersion=Έκδοση Dolibarr
 CallUpdatePage=Περιηγηθείτε στη σελίδα που ενημερώνει τη δομή και τα δεδομένα της βάσης δεδομένων: %s.
 LastStableVersion=Τελευταία σταθερή έκδοση
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Τα πλαίσια ελέγχου
 ExtrafieldCheckBoxFromList=Κουτάκια ελέγχου από το τραπέζι
 ExtrafieldLink=Σύνδεση με ένα αντικείμενο
 ComputedFormula=Υπολογισμένο πεδίο
-ComputedFormulaDesc=Μπορείτε να εισάγετε εδώ μια φόρμουλα χρησιμοποιώντας άλλες ιδιότητες του αντικειμένου ή οποιαδήποτε κωδικοποίηση PHP για να πάρετε μια δυναμική υπολογισμένη τιμή. Μπορείτε να χρησιμοποιήσετε τυχόν συμβατούς με την PHP τύπους, συμπεριλαμβανομένου του &quot;?&quot; και ακολουθώντας το συνολικό αντικείμενο: <strong>$ db, $ conf, $ langs, $ mysoc, $ user, $ object</strong> . <br> <strong>ΠΡΟΕΙΔΟΠΟΙΗΣΗ</strong> : Μπορούν να είναι διαθέσιμες μόνο κάποιες ιδιότητες του αντικειμένου $. Αν χρειάζεστε ιδιότητες που δεν έχουν φορτωθεί, απλώς μεταφέρετε το αντικείμενο στον τύπο σας όπως στο δεύτερο παράδειγμα. <br> Χρησιμοποιώντας ένα υπολογισμένο πεδίο σημαίνει ότι δεν μπορείτε να εισαγάγετε στον εαυτό σας καμία τιμή από τη διεπαφή. Επίσης, αν υπάρχει σφάλμα σύνταξης, ο τύπος μπορεί να μην επιστρέψει τίποτα. <br><br> Παράδειγμα του τύπου: <br> $ object-&gt; id &lt;10; ($ object-&gt; id / 2, 2): ($ object-&gt; id + 2 * $ user-&gt; id) * (int) <br><br> Παράδειγμα για επαναφόρτωση αντικειμένου <br> ($ reloadedobj = νέα Societe ($ db)) &amp;&amp; ($ reloadedobj-&gt; fetch ($ obj-&gt; id; $ obj-&gt; id: ($ obj-&gt; rowid; $ obj-&gt; rowid: $ object-&gt; id ))&gt; 0)); $ reloadedobj-&gt; array_options [&#39;options_extrafieldkey&#39;] * $ reloadedobj-&gt; κεφάλαιο / 5: &#39;-1&#39; <br><br> Άλλο παράδειγμα της φόρμουλας που ωθεί το φορτίο του αντικειμένου και το γονικό του αντικείμενο: <br> ($ reloadedobj = νέα εργασία ($ db)) &amp;&amp; ($ reloadedobj-&gt; fetch ($ object-&gt; id)&gt; 0) &amp;&amp; ($ secondloadedobj = reloadedobj-&gt; fk_project)&gt; 0)); $ secondloadedobj-&gt; ref: &#39;Το γονικό έργο δεν βρέθηκε&#39;
+ComputedFormulaDesc=Μπορείτε να εισαγάγετε εδώ έναν τύπο χρησιμοποιώντας άλλες ιδιότητες αντικειμένου ή οποιαδήποτε κωδικοποίηση PHP για να λάβετε μια δυναμική υπολογισμένη τιμή. Μπορείτε να χρησιμοποιήσετε οποιονδήποτε τύπο συμβατό με PHP, συμπεριλαμβανομένου του "?" τελεστής συνθηκών και ακόλουθο καθολικό αντικείμενο: <strong> $ db, $ conf, $ langs, $ mysoc, $ user, $ object </strong>. <br> <strong> ΠΡΟΕΙΔΟΠΟΙΗΣΗ </strong>: Μόνο ορισμένες ιδιότητες του αντικειμένου $ ενδέχεται να είναι διαθέσιμες. Εάν χρειάζεστε ιδιότητες που δεν έχουν φορτωθεί, απλώς φέρετε στον εαυτό σας το αντικείμενο στον τύπο σας, όπως στο δεύτερο παράδειγμα. <br> Η χρήση ενός υπολογισμένου πεδίου σημαίνει ότι δεν μπορείτε να εισαγάγετε στον εαυτό σας καμία τιμή από τη διεπαφή. Επίσης, εάν υπάρχει σφάλμα σύνταξης, ο τύπος ενδέχεται να μην επιστρέψει τίποτα. <br> <br> Παράδειγμα τύπου: <br> $ αντικείμενο-> id < 10 ? round($object-> id / 2, 2): ($ αντικείμενο-> id + 2 * $ user-> id) * (int) substr ($ mysoc-> zip, 1, ) <br> <br> Παράδειγμα επαναφόρτωσης αντικειμένου <br> (($ reloadedobj = new Societe ($ db)) && ($ reloadedobj-> fetchNoCompute ($ obj-> id? $ obj-> id - $ $ > rowid: $ αντικείμενο-> id))> 0)); $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1' <br> <br> Άλλο παράδειγμα φόρμουλας για την επιβολή φόρτου του αντικειμένου και του γονικού αντικειμένου: <br> (($ reloadedobj ) && ($ reloadedobj-> fetchNoCompute ($ object-> id)> 0) && ($ secondloadedobj = new Project ($ db)) && ($ secondloadedobj-> fetchNoCompute ($ reloadedobj-> fk_project)> 0)); $ secondloadedobj-> ref: "Το γονικό έργο δεν βρέθηκε"
 Computedpersistent=Αποθηκεύστε το υπολογισμένο πεδίο
 ComputedpersistentDesc=Τα υπολογισμένα επιπλέον πεδία θα αποθηκευτούν στη βάση δεδομένων, ωστόσο, η τιμή θα υπολογιστεί εκ νέου μόνο όταν αλλάξει το αντικείμενο αυτού του πεδίου. Εάν το υπολογιζόμενο πεδίο εξαρτάται από άλλα αντικείμενα ή παγκόσμια δεδομένα, αυτή η τιμή μπορεί να είναι λάθος!
 ExtrafieldParamHelpPassword=Αφήνοντας αυτό το πεδίο κενό σημαίνει ότι αυτή η τιμή θα αποθηκευτεί χωρίς κρυπτογράφηση (το πεδίο πρέπει να κρυφτεί μόνο με το αστέρι στην οθόνη). <br> Ρυθμίστε &#39;auto&#39; για να χρησιμοποιήσετε τον προεπιλεγμένο κανόνα κρυπτογράφησης για να αποθηκεύσετε τον κωδικό πρόσβασης στη βάση δεδομένων (τότε η ανάγνωση της τιμής θα είναι μόνο ο κατακερματισμός, κανένας τρόπος για να ανακτήσετε την αρχική τιμή)
@@ -448,8 +449,8 @@ KeepEmptyToUseDefault=Αφήστε κενό για να χρησιμοποιήσ
 DefaultLink=Προεπιλεγμένος σύνδεσμος
 SetAsDefault=Ορισμός ως προεπιλογή
 ValueOverwrittenByUserSetup=Προσοχή, αυτή η τιμή μπορεί να αντικατασταθεί από επιλογή του χρήστη (ο κάθε χρήστης μπορεί να κάνει τον δικό του σύνδεσμο clicktodial)
-ExternalModule=External module
-InstalledInto=Installed into directory %s
+ExternalModule=Εξωτερική μονάδα
+InstalledInto=Εγκαταστάθηκε στον κατάλογο %s
 BarcodeInitForthird-parties=Μαζικός κώδικας barcode για τρίτους
 BarcodeInitForProductsOrServices=Όγκος barcode init ή επαναφορά για προϊόντα ή υπηρεσίες
 CurrentlyNWithoutBarCode=Επί του παρόντος, έχετε <strong>%s</strong> ρεκόρ για <strong>%s</strong> %s χωρίς barcode ορίζεται.
@@ -645,7 +646,7 @@ Module50000Desc=Προσφέρετε στους πελάτες μια σελίδ
 Module50100Name=POS SimplePOS
 Module50100Desc=Μονάδα σημείου πώλησης SimplePOS (απλό POS).
 Module50150Name=POS TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50150Desc=Ενότητα σημείου πώλησης TakePOS (οθόνη αφής POS, για καταστήματα, μπαρ ή εστιατόρια).
 Module50200Name=Paypal
 Module50200Desc=Προσφέρετε στους πελάτες μια σελίδα PayPal online πληρωμής (λογαριασμός PayPal ή πιστωτικές / χρεωστικές κάρτες). Αυτό μπορεί να χρησιμοποιηθεί για να επιτρέψει στους πελάτες σας να πραγματοποιούν ad hoc πληρωμές ή πληρωμές που σχετίζονται με ένα συγκεκριμένο αντικείμενο Dolibarr (τιμολόγιο, παραγγελία κ.λπ.)
 Module50300Name=Ταινία
@@ -950,12 +951,12 @@ DictionaryCanton=Κράτη / Επαρχίες
 DictionaryRegion=Περιοχές
 DictionaryCountry=Χώρες
 DictionaryCurrency=Νόμισμα
-DictionaryCivility=Honorific titles
+DictionaryCivility=Τιμητικοί τίτλοι
 DictionaryActions=Τύποι συμβάντων ημερήσιας διάταξης
 DictionarySocialContributions=Είδη κοινωνικών ή φορολογικών φόρων
 DictionaryVAT=Τιμές ΦΠΑ ή φόρου επί των πωλήσεων
 DictionaryRevenueStamp=Ποσό των φορολογικών σφραγίδων
-DictionaryPaymentConditions=Οροι πληρωμής
+DictionaryPaymentConditions=Όροι πληρωμής
 DictionaryPaymentModes=Τρόποι πληρωμής
 DictionaryTypeContact=Τύποι Επικοινωνίας/Διεύθυνση
 DictionaryTypeOfContainer=Ιστοσελίδα - Τύπος ιστοσελίδων / δοχείων
@@ -991,7 +992,7 @@ VATIsNotUsedDesc=Από προεπιλογή, ο προτεινόμενος φό
 VATIsUsedExampleFR=Στη Γαλλία, σημαίνει ότι οι εταιρείες ή οι οργανώσεις έχουν ένα πραγματικό φορολογικό σύστημα (απλοποιημένο πραγματικό ή κανονικό πραγματικό). Ένα σύστημα στο οποίο δηλώνεται ο ΦΠΑ.
 VATIsNotUsedExampleFR=Στη Γαλλία, δηλώνονται ενώσεις που δεν έχουν δηλωθεί ως φόρος πωλήσεων ή εταιρείες, οργανώσεις ή ελεύθερα επαγγέλματα που επέλεξαν το φορολογικό σύστημα των μικροεπιχειρήσεων (Φόρος πωλήσεων σε franchise) και κατέβαλαν φόρο επί των πωλήσεων χωρίς καμία δήλωση φόρου επί των πωλήσεων. Αυτή η επιλογή θα εμφανίζει στα τιμολόγια την αναφορά &quot;Μη εφαρμοστέος φόρος πωλήσεων - art-293B του CGI&quot;.
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
+TypeOfSaleTaxes=Είδος φόρου επί των πωλήσεων
 LTRate=Τιμή
 LocalTax1IsNotUsed=Μην χρησιμοποιείτε δεύτερο φόρο
 LocalTax1IsUsedDesc=Χρησιμοποιήστε έναν δεύτερο τύπο φόρου (εκτός από τον πρώτο)
@@ -1015,9 +1016,9 @@ LocalTax2IsUsedDescES=Το ποσοστό IRPF από προεπιλογή κα
 LocalTax2IsNotUsedDescES=Από προεπιλογή, το προτεινόμενο IRPF είναι 0. Τέλος κανόνα.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=Στην Ισπανία είναι επιχειρήσεις που δεν υπόκεινται σε φορολογικό σύστημα ενοτήτων.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
-UseRevenueStamp=Use a tax stamp
-UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
+UseRevenueStamp=Χρησιμοποιήστε μια σφραγίδα φόρου
+UseRevenueStampExample=Η τιμή της φορολογικής σφραγίδας καθορίζεται από προεπιλογή στη ρύθμιση των λεξικών (%s - %s - %s)
 CalcLocaltax=Αναφορές για τοπικούς φόρους
 CalcLocaltax1=Πωλήσεις - Αγορές
 CalcLocaltax1Desc=Οι αναφορές τοπικών φόρων υπολογίζονται με τη διαφορά μεταξύ τοπικών πωλήσεων και τοπικών αγορών
@@ -1025,7 +1026,7 @@ CalcLocaltax2=Αγορές
 CalcLocaltax2Desc=Οι αναφορές τοπικών φόρων είναι το σύνολο των τοπικών αγορών
 CalcLocaltax3=Πωλήσεις
 CalcLocaltax3Desc=Οι αναφορές τοπικών φόρων είναι το σύνολο των τοπικών πωλήσεων
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+NoLocalTaxXForThisCountry=Σύμφωνα με τη ρύθμιση των φόρων (Βλέπε %s - %s - %s), η χώρα σας δεν χρειάζεται να χρησιμοποιεί τέτοιου είδους φόρους
 LabelUsedByDefault=Ετικέτα που χρησιμοποιείται από προεπιλογή εάν δεν υπάρχει μετάφραση για τον κώδικα
 LabelOnDocuments=Ετικέτα στα έγγραφα
 LabelOrTranslationKey=Κλειδί ετικέτας ή μετάφρασης
@@ -1116,8 +1117,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Έκθεση εξόδων για έγκριση
 Delays_MAIN_DELAY_HOLIDAYS=Αφήστε τα αιτήματα για έγκριση
 SetupDescription1=Πριν ξεκινήσετε τη χρήση του Dolibarr πρέπει να οριστούν ορισμένες αρχικές παράμετροι και να ενεργοποιηθούν / διαμορφωθούν οι ενότητες.
 SetupDescription2=Οι ακόλουθες δύο ενότητες είναι υποχρεωτικές (οι δύο πρώτες καταχωρίσεις στο μενού Ρύθμιση):
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Βασικές παράμετροι που χρησιμοποιούνται για την προσαρμογή της προεπιλεγμένης συμπεριφοράς της εφαρμογής σας (π.χ. για λειτουργίες που σχετίζονται με τη χώρα).
+SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Αυτό το λογισμικό είναι μια σειρά από πολλές ενότητες / εφαρμογές. Οι ενότητες που σχετίζονται με τις ανάγκες σας πρέπει να ενεργοποιηθούν και να διαμορφωθούν. Οι καταχωρήσεις μενού θα εμφανιστούν με την ενεργοποίηση αυτών των ενοτήτων.
 SetupDescription5=Άλλες καταχωρίσεις μενού ρυθμίσεων διαχειρίζονται προαιρετικές παραμέτρ
 LogEvents=Security audit events
 Audit=Ιστορικό εισόδου χρηστών
@@ -1136,7 +1137,7 @@ LogEventDesc=Ενεργοποιήστε την καταγραφή για συγ
 AreaForAdminOnly=Οι παράμετροι εγκατάστασης μπορούν να οριστούν μόνο από <b>χρήστες διαχειριστή</b> .
 SystemInfoDesc=Οι πληροφορίες συστήματος είναι διάφορες τεχνικές πληροφορίες που λαμβάνετε μόνο στη λειτουργία ανάγνωσης και είναι ορατές μόνο για τους διαχειριστές.
 SystemAreaForAdminOnly=Αυτή η περιοχή είναι διαθέσιμη μόνο σε χρήστες διαχειριστή. Τα δικαιώματα χρήστη Dolibarr δεν μπορούν να αλλάξουν αυτόν τον περιορισμό.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+CompanyFundationDesc=Επεξεργαστείτε τις πληροφορίες της εταιρείας / του οργανισμού σας. Κάντε κλικ στο κουμπί "%s" στο κάτω μέρος της σελίδας όταν τελειώσετε.
 AccountantDesc=Εάν έχετε έναν εξωτερικό λογιστή / λογιστή, μπορείτε να επεξεργαστείτε εδώ τις πληροφορίες του.
 AccountantFileNumber=Λογιστικό κώδικα
 DisplayDesc=Οι παράμετροι που επηρεάζουν την εμφάνιση και συμπεριφορά του Dolibarr μπορούν να τροποποιηθούν εδώ.
@@ -1272,8 +1273,9 @@ RuleForGeneratedPasswords=Κανόνες δημιουργίας και επικ
 DisableForgetPasswordLinkOnLogonPage=Να μην εμφανίζεται ο σύνδεσμος &quot;Ξεχασμένος κωδικός πρόσβασης&quot; στη σελίδα Σύνδεση
 UsersSetup=Ρυθμίσεις αρθρώματος χρηστών
 UserMailRequired=Απαιτείται ηλεκτρονικό ταχυδρομείο για τη δημιουργία νέου χρήστη
-UsersDocModules=Document templates for documents generated from user record
-GroupsDocModules=Document templates for documents generated from a group record
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
+UsersDocModules=Πρότυπα εγγράφων για έγγραφα που δημιουργούνται από εγγραφή χρήστη
+GroupsDocModules=Πρότυπα εγγράφων για έγγραφα που δημιουργούνται από εγγραφή ομάδας
 ##### HRM setup #####
 HRMSetup=Ρύθμιση μονάδας HRM
 ##### Company setup #####
@@ -1305,7 +1307,7 @@ BillsPDFModules=Μοντέλα εγγράφων τιμολογίου
 BillsPDFModulesAccordindToInvoiceType=Τα μοντέλα εγγράφων τιμολογίου σύμφωνα με τον τύπο τιμολογίου
 PaymentsPDFModules=Μοντέλα εγγράφων πληρωμής
 ForceInvoiceDate=Μετάβαση ημερομηνίας ισχύος τιμολογίου σε ημερομηνία επικύρωσης
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestedPaymentModesIfNotDefinedInInvoice=Προτεινόμενη μέθοδος πληρωμής στο τιμολόγιο από προεπιλογή, εάν δεν ορίζεται στο τιμολόγιο
 SuggestPaymentByRIBOnAccount=Προτείνετε την πληρωμή μέσω απόσυρσης στο λογαριασμό
 SuggestPaymentByChequeToAddress=Προτείνετε πληρωμή με επιταγή προς
 FreeLegalTextOnInvoices=Ελεύθερο κείμενο στα τιμολόγια
@@ -1317,7 +1319,7 @@ SupplierPaymentSetup=Ρυθμίσεις πληρωμών προμηθευτή
 PropalSetup=Ρύθμιση ενότητας εμπορικών προτάσεων
 ProposalsNumberingModules=Μοντέλα αριθμοδότησης εμπορικών προτάσεων
 ProposalsPDFModules=Μοντέλα εγγράφων εμπορικών προτάσεων
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Προτεινόμενος τρόπος πληρωμής στην πρόταση από προεπιλογή, εάν δεν ορίζεται στην πρόταση
 FreeLegalTextOnProposal=Ελεύθερο κείμενο στις προσφορές
 WatermarkOnDraftProposal=Υδατογράφημα σε προσχέδια εμπορικών προτάσεων (κανένα εάν δεν είναι κενό)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ρωτήστε για τον τραπεζικό λογαριασμό προορισμού της προσφοράς
@@ -1332,7 +1334,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ζητήστε από την αποθήκη
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ζητήστε τον προορισμό του τραπεζικού λογαριασμού της εντολής αγοράς
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Προτεινόμενη μέθοδος πληρωμής για παραγγελία πώλησης από προεπιλογή, εάν δεν καθορίζεται στην παραγγελία
 OrdersSetup=Ρύθμιση διαχείρισης παραγγελιών πωλήσεων
 OrdersNumberingModules=Μοντέλα αρίθμησης παραγγελιών
 OrdersModelModule=Παραγγείλετε μοντέλα εγγράφων
@@ -1697,9 +1699,9 @@ CashDeskIdWareHouse=Αναγκαστικός περιορισμός αποθήκ
 StockDecreaseForPointOfSaleDisabled=Η μείωση του αποθέματος από το σημείο πώλησης είναι απενεργοποιημένη
 StockDecreaseForPointOfSaleDisabledbyBatch=Η μείωση του αποθέματος στο POS δεν είναι συμβατή με τη διαχείριση σειριακής / παρτίδας μονάδας (αυτή τη στιγμή είναι ενεργή), επομένως η μείωση του αποθέματος είναι απενεργοποιημένη.
 CashDeskYouDidNotDisableStockDecease=Δεν απενεργοποιήσατε τη μείωση των μετοχών όταν πραγματοποιείτε μια πώληση από το σημείο πώλησης. Ως εκ τούτου απαιτείται αποθήκη.
-CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
-CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
-CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+CashDeskForceDecreaseStockLabel=Αναγκάστηκε η μείωση των αποθεμάτων για προϊόντα παρτίδας.
+CashDeskForceDecreaseStockDesc=Μειώστε πρώτα από τις παλαιότερες ημερομηνίες φαγητού και πώλησης.
+CashDeskReaderKeyCodeForEnter=Κωδικός κλειδιού για το "Enter" που ορίζεται στον αναγνώστη γραμμωτού κώδικα (Παράδειγμα: 13)
 ##### Bookmark #####
 BookmarkSetup=Bookmark module setup
 BookmarkDesc=Αυτή η ενότητα σάς επιτρέπει να διαχειρίζεστε σελιδοδείκτες. Μπορείτε επίσης να προσθέσετε συντομεύσεις σε όλες τις σελίδες Dolibarr ή σε εξωτερικούς ιστότοπους στο αριστερό σας μενού.
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Ρύθμιση μονάδας προμηθευτή
 SuppliersCommandModel=Πλήρες πρότυπο της εντολής αγοράς
-SuppliersCommandModelMuscadet=Πλήρες πρότυπο της εντολής αγοράς 
+SuppliersCommandModelMuscadet=Πλήρες πρότυπο της εντολής αγοράς (παλιά εφαρμογή του προτύπου cornas)
 SuppliersInvoiceModel=Πλήρες πρότυπο τιμολογίου προμηθευτή
 SuppliersInvoiceNumberingModel=Αριθμητικά μοντέλα τιμολογίων προμηθευτών
 IfSetToYesDontForgetPermission=Αν είναι ρυθμισμένη σε μη μηδενική τιμή, μην ξεχάσετε να δώσετε δικαιώματα σε ομάδες ή χρήστες που επιτρέπονται για τη δεύτερη έγκριση
@@ -1759,7 +1761,7 @@ CloseFiscalYear=Κλείσιμο λογιστικής περιόδου
 DeleteFiscalYear=Διαγραφή περιόδου λογιστικής
 ConfirmDeleteFiscalYear=Είστε σίγουροι ότι θα διαγράψετε αυτήν τη λογιστική περίοδο;
 ShowFiscalYear=Εμφάνιση λογιστικής περιόδου
-AlwaysEditable=Μπορεί πάντα να επεξεργαστή
+AlwaysEditable=Μπορεί πάντα να επεξεργαστεί
 MAIN_APPLICATION_TITLE=Αναγκαστικό ορατό όνομα της εφαρμογής (προειδοποίηση: η ρύθμιση του δικού σας ονόματος μπορεί να δημιουργήσει πρόβλημα στη λειτουργία Αυτόματης συμπλήρωσης σύνδεσης όταν χρησιμοποιείτε το DoliDroid εφαρμογή για κινητά)
 NbMajMin=Ελάχιστος αριθμός κεφαλαίων χαρακτήρων
 NbNumMin=Ελάχιστος αριθμός αριθμητικών χαρακτήρων
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Απόκρυψη εικόνων στο μενού &quot;Κ
 LeftMenuBackgroundColor=Χρώμα φόντου για το αριστερό μενού
 BackgroundTableTitleColor=Χρώμα φόντου για τη γραμμή επικεφαλίδας του πίνακα
 BackgroundTableTitleTextColor=Χρώμα κειμένου για τη γραμμή τίτλου πίνακα
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Χρώμα φόντου για τις περιττές (μονές) γραμμές του πίνακα
 BackgroundTableLineEvenColor=Χρώμα φόντου για τις άρτιες (ζυγές) γραμμές του πίνακα
 MinimumNoticePeriod=Ελάχιστη περίοδος προειδοποίησης (Η αίτησή σας πρέπει να γίνει πριν από αυτή την καθυστέρηση)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID= \nΑναφορά Dolibarr που δεν βρίσκετα
 FormatZip=Zip
 MainMenuCode=Κωδικός εισόδου μενού (mainmenu)
 ECMAutoTree=Εμφάνιση αυτόματης δομής ECM
-OperationParamDesc=Ορίστε τιμές που θα χρησιμοποιηθούν για δράση ή πώς να εξάγετε τιμές. Για παράδειγμα: <br> objproperty1 = SET: abc <br> objproperty1 = SET: τιμή με αντικατάσταση του __objproperty1__ <br> objproperty3 = SETIFEMPTY: abc <br> objproperty4 = EXTRACT: HEADER: X-Myheaderkey. * [^ \\ s] + (. *) <br> options_myextrafield = ΕΚΤΟΣ: ΘΕΜΑ: ([^ \\ s] *) <br> object.objproperty5 = ΕΚΤΟΣ: ΣΩΜΑ: Το όνομα της εταιρείας μου είναι \\ s ([^ \\ s] *) <br><br> Χρησιμοποίησε ένα ; char ως διαχωριστικό για να εξαγάγετε ή να ορίσετε πολλές ιδιότητες.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Ωρες λειτουργίας
 OpeningHoursDesc=Πληκτρολογήστε εδώ τις κανονικές ώρες λειτουργίας της εταιρείας σας.
 ResourceSetup=Διαμόρφωση της ενότητας πόρων
@@ -1970,7 +1973,7 @@ WarningValueHigherSlowsDramaticalyOutput=Προειδοποίηση, οι υψη
 ModuleActivated=Η ενότητα %s ενεργοποιείται και επιβραδύνει τη διεπαφή
 EXPORTS_SHARE_MODELS=Τα μοντέλα εξαγωγής είναι κοινά με όλους
 ExportSetup=Ρύθμιση εξαγωγής της ενότητας
-ImportSetup=Setup of module Import
+ImportSetup=Ρύθμιση εισαγωγής λειτουργικής μονάδας
 InstanceUniqueID=Μοναδικό αναγνωριστικό της παρουσίας
 SmallerThan=Μικρότερη από
 LargerThan=Μεγαλύτερο από
@@ -1991,7 +1994,9 @@ MakeAnonymousPing=Δημιουργήστε ένα ανώνυμο Ping &#39;+1&#3
 FeatureNotAvailableWithReceptionModule=Η λειτουργία δεν είναι διαθέσιμη όταν είναι ενεργοποιημένη η λειτουργία Υποδοχή
 EmailTemplate=Πρότυπο email
 EMailsWillHaveMessageID=Τα μηνύματα ηλεκτρονικού ταχυδρομείου θα έχουν μια ετικέτα "Αναφορές" που ταιριάζουν με αυτή τη σύνταξη
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
-FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
+PDF_USE_ALSO_LANGUAGE_CODE=Εάν θέλετε να αντιγράψετε ορισμένα κείμενα στο PDF σας σε 2 διαφορετικές γλώσσες στο ίδιο δημιουργημένο PDF, πρέπει να ορίσετε εδώ αυτήν τη δεύτερη γλώσσα, ώστε το παραγόμενο PDF να περιέχει 2 διαφορετικές γλώσσες στην ίδια σελίδα, αυτή που επιλέγεται κατά τη δημιουργία PDF και αυτή ( μόνο λίγα πρότυπα PDF το υποστηρίζουν αυτό). Κρατήστε κενό για 1 γλώσσα ανά PDF.
+FafaIconSocialNetworksDesc=Εισαγάγετε εδώ τον κωδικό ενός εικονιδίου FontAwesome. Εάν δεν γνωρίζετε τι είναι το FontAwesome, μπορείτε να χρησιμοποιήσετε τη γενική τιμή fa-address-book.
+RssNote=Σημείωση: Κάθε ορισμός τροφοδοσίας RSS παρέχει ένα widget που πρέπει να ενεργοποιήσετε για να το έχετε διαθέσιμο στον πίνακα ελέγχου
+JumpToBoxes=Μετάβαση στη ρύθμιση -> Widgets
+MeasuringUnitTypeDesc=Χρησιμοποιήστε εδώ μια τιμή όπως "μέγεθος", "επιφάνεια", "όγκος", "βάρος", "χρόνος"
+MeasuringScaleDesc=Η κλίμακα είναι ο αριθμός των θέσεων που πρέπει να μετακινήσετε το δεκαδικό μέρος ώστε να ταιριάζει με την προεπιλεγμένη μονάδα αναφοράς. Για τον τύπο μονάδας "time", είναι ο αριθμός των δευτερολέπτων. Οι τιμές μεταξύ 80 και 99 είναι δεσμευμένες τιμές.
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index f38dfa9741f..6891d2a860d 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -66,9 +66,9 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Διαγραφή Πληρωμής
 ConfirmDeletePayment=Είστε σίγουροι ότι θέλετε να διαγράψετε την πληρωμή;
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReduc=Θέλετε να μετατρέψετε αυτό το %s σε διαθέσιμη πίστωση;
 ConfirmConvertToReduc2=Το ποσό θα αποθηκευτεί σε όλες τις εκπτώσεις και θα μπορούσε να χρησιμοποιηθεί ως έκπτωση για ένα τρέχον ή μελλοντικό τιμολόγιο για αυτόν τον πελάτη.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
+ConfirmConvertToReducSupplier=Θέλετε να μετατρέψετε αυτό το %s σε διαθέσιμη πίστωση;
 ConfirmConvertToReducSupplier2=Το ποσό θα αποθηκευτεί σε όλες τις εκπτώσεις και θα μπορούσε να χρησιμοποιηθεί ως έκπτωση για ένα τρέχον ή μελλοντικό τιμολόγιο για αυτόν τον προμηθευτή.
 SupplierPayments=Πληρωμές προμηθευτών
 ReceivedPayments=Ληφθείσες Πληρωμές
@@ -88,8 +88,8 @@ CodePaymentMode=Τύπος πληρωμής (κωδικός)
 LabelPaymentMode=Είδος πληρωμής (ετικέτα)
 PaymentModeShort=Τρόπος πληρωμής
 PaymentTerm=Ορος πληρωμής
-PaymentConditions=Οροι πληρωμής
-PaymentConditionsShort=Οροι πληρωμής
+PaymentConditions=Όροι πληρωμής
+PaymentConditionsShort=Όροι πληρωμής
 PaymentAmount=Σύνολο πληρωμής
 PaymentHigherThanReminderToPay=Η πληρωμή είναι μεγαλύτερη από το υπόλοιπο
 HelpPaymentHigherThanReminderToPay=Προσοχή, το ποσό πληρωμής ενός ή περισσότερων λογαριασμών είναι μεγαλύτερο από το οφειλόμενο ποσό. <br> Επεξεργαστείτε την καταχώρησή σας, διαφορετικά επιβεβαιώστε και σκεφτείτε να δημιουργήσετε ένα πιστωτικό σημείωμα για το ποσό που λάβατε για κάθε επιπλέον χρεωστικό τιμολόγιο.
@@ -209,20 +209,13 @@ NumberOfBillsByMonth=Αριθμός τιμολογίων ανά μήνα
 AmountOfBills=Ποσό τιμολογίων
 AmountOfBillsHT=Ποσό τιμολογίων (καθαρό από φόρο)
 AmountOfBillsByMonthHT=Ποσό των τιμολογίων ανά μήνα (μετά από φόρους)
-ShowSocialContribution=Εμφάνιση κοινωνικών εισφορών / Φορολογικά
-ShowBill=Εμφάνιση τιμολογίου
-ShowInvoice=Εμφάνιση τιμολογίου
-ShowInvoiceReplace=Εμφάνιση τιμολογίου αντικατάστασης
-ShowInvoiceAvoir=Εμφάνιση πιστωτικού τιμολογίου
-ShowInvoiceDeposit=Εμφάνιση τιμολογίου κατάθεσης
-ShowInvoiceSituation=Εμφάνιση κατάστασης τιμολογίου
 UseSituationInvoices=Να επιτρέπεται το τιμολόγιο κατάστασης
 UseSituationInvoicesCreditNote=Επιτρέψτε το πιστωτικό σημείωμα τιμολογίου κατάστασης
 Retainedwarranty=Διατηρημένη εγγύηση
-AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
+AllowedInvoiceForRetainedWarranty=Διατηρούμενη εγγύηση που μπορεί να χρησιμοποιηθεί στους ακόλουθους τύπους τιμολογίων
 RetainedwarrantyDefaultPercent=Διατηρημένο ποσοστό εξόφλησης εγγύησης
-RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
-RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
+RetainedwarrantyOnlyForSituation=Διαθέστε την "διατηρούμενη εγγύηση" διαθέσιμη μόνο για τιμολόγια κατάστασης
+RetainedwarrantyOnlyForSituationFinal=Σε τιμολόγια κατάστασης, η παγκόσμια έκπτωση "διατηρούμενη εγγύηση" εφαρμόζεται μόνο στην τελική κατάσταση
 ToPayOn=Να πληρώσετε για %s
 toPayOn=να πληρώσει για %s
 RetainedWarranty=Διατηρημένη εγγύηση
@@ -233,7 +226,6 @@ setretainedwarranty=Ορίστε την παραληφθείσα εγγύηση
 setretainedwarrantyDateLimit=Ορίστε το όριο ημερομηνίας εγγύησης που διατηρήθηκε
 RetainedWarrantyDateLimit=Διατηρημένο όριο ημερομηνίας εγγύησης
 RetainedWarrantyNeed100Percent=Το τιμολόγιο κατάστασης πρέπει να είναι στο 100%% για να εμφανίζεται σε PDF
-ShowPayment=Εμφάνιση πληρωμής
 AlreadyPaid=Ήδη πληρωμένο
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Ήδη πληρωμένο (χωρίς πιστώσεις ή καταθέσεις)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Δημιουργήθηκε από το τιμολόγιο
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=Δείτε τις διαθέσιμες εκπτώσεις
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Κατάσταση
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -512,11 +505,11 @@ ToMakePayment=Πληρωμή
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=Κατάλογος των απλήρωτων τιμολογίων
 NoteListOfYourUnpaidInvoices=Σημείωση: Αυτή η λίστα περιέχει μόνο τα τιμολόγια για λογαριασμό Πελ./Προμ. που συνδέονται με τον εκπρόσωπο πώλησης.
-RevenueStamp=Tax stamp
+RevenueStamp=Φορόσημο
 YouMustCreateInvoiceFromThird=Αυτή η επιλογή είναι διαθέσιμη μόνο όταν δημιουργείτε τιμολόγιο από την καρτέλα &quot;Πελάτης&quot; τρίτου μέρους
 YouMustCreateInvoiceFromSupplierThird=Αυτή η επιλογή είναι διαθέσιμη μόνο κατά τη δημιουργία τιμολογίου από την καρτέλα &quot;Προμηθευτής&quot; τρίτου μέρους
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Πρότυπο τιμολόγιο PDF Crabe. Ένα πλήρες πρότυπο τιμολογίου 
+PDFCrabeDescription=Πρότυπο τιμολόγιο PDF Crabe. Ένα πλήρες πρότυπο τιμολογίου (παλιά εφαρμογή του προτύπου Sponge)
 PDFSpongeDescription=Τιμολόγιο πρότυπο PDF Σφουγγάρι. Ένα πλήρες πρότυπο τιμολογίου
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Επιστρέψετε αριθμό με μορφή %syymm-nnnn για τυπικά τιμολόγια και %syymm-nnnn για πιστωτικά τιμολόγια όπου yy είναι το έτος, mm είναι ο μήνας και nnnn είναι μια ακολουθία αρίθμησης χωρίς διάλειμμα και χωρίς επιστροφή στο 0
@@ -578,4 +571,4 @@ AutoFillDateTo=Ορίστε την ημερομηνία λήξης της γρα
 AutoFillDateToShort=Ορίστε την ημερομηνία λήξης
 MaxNumberOfGenerationReached=Μέγιστος αριθμός γονιδίων. επιτευχθεί
 BILL_DELETEInDolibarr=Το τιμολόγιο διαγράφηκε
-BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
+BILL_SUPPLIER_DELETEInDolibarr=Το τιμολόγιο προμηθευτή διαγράφηκε
diff --git a/htdocs/langs/el_GR/modulebuilder.lang b/htdocs/langs/el_GR/modulebuilder.lang
index 08497ab4ef8..e0758bc6a64 100644
--- a/htdocs/langs/el_GR/modulebuilder.lang
+++ b/htdocs/langs/el_GR/modulebuilder.lang
@@ -83,9 +83,9 @@ ListOfDictionariesEntries=Λίστα καταχωρήσεων λεξικών
 ListOfPermissionsDefined=Λίστα καθορισμένων δικαιωμάτων
 SeeExamples=Δείτε παραδείγματα εδώ
 EnabledDesc=Προϋπόθεση να είναι ενεργό αυτό το πεδίο (Παραδείγματα: 1 ή $ conf-&gt; global-&gt; MYMODULE_MYOPTION)
-VisibleDesc=Είναι το πεδίο ορατό; (Παραδείγματα: 0 = Ποτέ δεν είναι ορατό, 1 = Ορατή στη λίστα και δημιουργία / ενημέρωση / προβολή φορμών, 2 = Ορατή μόνο στη λίστα, 3 = Ορατή στη δημιουργία / ενημέρωση / προβολή της φόρμας(όχι λίστα), 4=Ορατή στη λίστα και ενημέρωση/προβολή φόρμας μόνο (όχι δημιουργία), 5=Ορατή στη λίστα τέλους φόρμας μόνο. (όχι δημιουργία, όχι ενημέρωση). Χρησιμοποιώντας μία αρνητική τιμή σημαίνει ότι το πεδίο δεν εμφανίζεται από προεπιλογή στη λίστα αλλά μπορεί να επιλεγεί για προβολή). Μπορεί να είναι μια έκφραση, για παράδειγμα: <br> preg_match ('/ public /', $ _SERVER ['PHP_SELF']); 0: 1 <br> ($ user-> rights-> holiday-> define_holiday; ? 1 : 0) 
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
-DisplayOnPdf=Display on PDF
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Εμφανίστε αυτό το πεδίο σε συμβατά έγγραφα PDF, μπορείτε να διαχειριστείτε τη θέση με το πεδίο "Θέση". <br/> Επί του παρόντος, γνωστά μοντέλα συμβατούς PDF είναι: Ερατοσθένης ο Κυρηναίος (σειρά), espadon (πλοίο), σφουγγάρι (τιμολόγια), κυανό (propal / εισαγωγικά), cornas (αύξων προμηθευτή) <br/> <br/> <strong> Για εγγράφου: </strong> <br/> 0 = δεν εμφανίζονται <br/> 1 = οθόνη <br/> 2 = εμφανιστεί μόνο αν δεν αδειάσει <br/> <br/> <strong> Για τις γραμμές εγγράφου: </strong> <br/> 0 = δεν εμφανίζονται <br/> 1 = εμφανίζονται σε μια στήλη <br/> 3 = οθόνη στη στήλη περιγραφή γραμμή μετά την περιγραφή <br/> 4 = οθόνη στη στήλη περιγραφή μετά την περιγραφή μόνο αν δεν είναι άδεια
+DisplayOnPdf=Εμφάνιση σε PDF
 IsAMeasureDesc=Μπορεί η τιμή του πεδίου να συσσωρευτεί για να πάρει ένα σύνολο σε λίστα; (Παραδείγματα: 1 ή 0)
 SearchAllDesc=Χρησιμοποιείται το πεδίο για την αναζήτηση από το εργαλείο γρήγορης αναζήτησης; (Παραδείγματα: 1 ή 0)
 SpecDefDesc=Εισαγάγετε εδώ όλη την τεκμηρίωση που θέλετε να παράσχετε με τη λειτουργική σας μονάδα, η οποία δεν έχει ήδη καθοριστεί από άλλες καρτέλες. Μπορείτε να χρησιμοποιήσετε το .md ή καλύτερα, την πλούσια σύνταξη .asciidoc.
diff --git a/htdocs/langs/el_GR/multicurrency.lang b/htdocs/langs/el_GR/multicurrency.lang
index 47224ec0301..935d1ba45a6 100644
--- a/htdocs/langs/el_GR/multicurrency.lang
+++ b/htdocs/langs/el_GR/multicurrency.lang
@@ -1,20 +1,22 @@
 # Dolibarr language file - Source file is en_US - multicurrency
-MultiCurrency=Multi currency
-ErrorAddRateFail=Error in added rate
-ErrorAddCurrencyFail=Error in added currency
-ErrorDeleteCurrencyFail=Error delete fail
-multicurrency_syncronize_error=Σφάλμα συγχρονισμού:%s
-MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use date of document to find currency rate, instead of using latest known rate
-multicurrency_useOriginTx=When an object is created from another, keep the original rate of source object (otherwise use the latest known rate)
+MultiCurrency=Πολλαπλό νόμισμα
+ErrorAddRateFail=Σφάλμα στο προστιθέμενο ποσοστό
+ErrorAddCurrencyFail=Σφάλμα στο προστιθέμενο νόμισμα
+ErrorDeleteCurrencyFail=Σφάλμα κατάργησης διαγραφής
+multicurrency_syncronize_error=Σφάλμα συγχρονισμού: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Χρησιμοποιήστε την ημερομηνία του εγγράφου για να βρείτε την ισοτιμία του νομίσματος, αντί να χρησιμοποιήσετε την τελευταία γνωστή τιμή
+multicurrency_useOriginTx=Όταν ένα αντικείμενο δημιουργείται από άλλο, διατηρήστε τον αρχικό ρυθμό από το αντικείμενο προέλευσης (διαφορετικά χρησιμοποιήστε την τελευταία γνωστή τιμή)
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=You sould create an account on their website to use this functionnality<br>Get your <b>API key</b><br />If you use a free account you can't change the <b>currency source</b> (USD by default)<br />But if your main currency isn't USD you can use the <b>alternate currency source</b> to force you main currency<br /><br />You are limited at 1000 synchronizations per month
-multicurrency_appId=API key
-multicurrency_appCurrencySource=Currency source
-multicurrency_alternateCurrencySource=Alternate currency source
-CurrenciesUsed=Currencies used
-CurrenciesUsed_help_to_add=Add the differents currencies and rates you need to use on you <b>proposals</b>, <b>orders</b>, etc.
-rate=rate
-MulticurrencyReceived=Received, original currency
-MulticurrencyRemainderToTake=Remaining amout, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyLayerAccount_help_to_synchronize=Πρέπει να δημιουργήσετε έναν λογαριασμό στον ιστότοπο %s για να χρησιμοποιήσετε αυτήν τη λειτουργία. <br> Αποκτήστε το <b>κλειδί API</b> . <br> Εάν χρησιμοποιείτε έναν δωρεάν λογαριασμό, δεν μπορείτε να αλλάξετε το <b>νόμισμα προέλευσης</b> (από προεπιλογή το USD). <br> Εάν το κύριο νόμισμά σας δεν είναι δολάρια ΗΠΑ, η εφαρμογή θα υπολογίσει αυτόματα τον υπολογισμό. <br><br> Είστε περιορισμένοι σε 1000 συγχρονισμούς ανά μήνα.
+multicurrency_appId=API κλειδί
+multicurrency_appCurrencySource=Πηγή νόμισμα
+multicurrency_alternateCurrencySource=Εναλλασσόμενο νόμισμα προέλευσης
+CurrenciesUsed=Χρησιμοποιούμενα νομίσματα
+CurrenciesUsed_help_to_add=Προσθέστε τα διαφορετικά νομίσματα και τα ποσοστά που πρέπει να χρησιμοποιήσετε για τις <b>προτάσεις</b> σας, <b>παραγγελίες</b> κλπ.
+rate=τιμή
+MulticurrencyReceived=Λήφθηκε, αρχικό νόμισμα
+MulticurrencyRemainderToTake=Το υπόλοιπο ποσό, το αρχικό νόμισμα
+MulticurrencyPaymentAmount=Ποσό πληρωμής, αρχικό νόμισμα
+AmountToOthercurrency=Ποσό σε (σε νόμισμα του λογαριασμού λήψης)
+CurrencyRateSyncSucceed=Ο συγχρονισμός συναλλαγματικών ισοτιμιών ολοκληρώθηκε με επιτυχία
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Χρησιμοποιήστε το νόμισμα του εγγράφου για διαδικτυακές πληρωμές
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index a94c36251e3..d19eef671e6 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -39,8 +39,8 @@ ShowProject=Εμφάνιση έργου
 ShowTask=Εμφάνιση Εργασίας
 SetProject=Set project
 NoProject=No project defined or owned
-NbOfProjects=Number of projects
-NbOfTasks=Number of tasks
+NbOfProjects=Αριθμός έργων
+NbOfTasks=Αριθμός εργασιών
 TimeSpent=Χρόνος που δαπανήθηκε
 TimeSpentByYou=Χρόνος που δαπανάται από εσάς
 TimeSpentByUser=Χρόνος που δαπανάται από τον χρήστη
@@ -102,7 +102,7 @@ ListDonationsAssociatedProject=Κατάλογος δωρεών που σχετί
 ListVariousPaymentsAssociatedProject=Κατάλογος των διαφόρων πληρωμών που σχετίζονται με το έργο
 ListSalariesAssociatedProject=Κατάλογος των μισθών που σχετίζονται με το σχέδιο
 ListActionsAssociatedProject=Κατάλογος συμβάντων που σχετίζονται με το έργο
-ListMOAssociatedProject=List of manufacturing orders related to the project
+ListMOAssociatedProject=Κατάλογος παραγγελιών κατασκευής που σχετίζονται με το έργο
 ListTaskTimeUserProject=Κατάλογος του χρόνου που καταναλώνεται για τα καθήκοντα του έργου
 ListTaskTimeForTask=Κατάλογος του χρόνου που καταναλώνεται στην εργασία
 ActivityOnProjectToday=Δραστηριότητα στο έργο σήμερα
@@ -162,8 +162,8 @@ OpportunityProbability=Πιθανότητα μολύβδου
 OpportunityProbabilityShort=Επικεφαλής probab.
 OpportunityAmount=Ποσό μολύβδου
 OpportunityAmountShort=Ποσό μολύβδου
-OpportunityWeightedAmount=Opportunity weighted amount
-OpportunityWeightedAmountShort=Opp. weighted amount
+OpportunityWeightedAmount=Σταθμισμένο ποσό ευκαιρίας
+OpportunityWeightedAmountShort=Αντί. σταθμισμένο ποσό
 OpportunityAmountAverageShort=Μέσο ποσό μολύβδου
 OpportunityAmountWeigthedShort=Σταθμισμένο ποσό μολύβδου
 WonLostExcluded=Κερδισμένο / Lost αποκλεισμένο
@@ -186,7 +186,7 @@ PlannedWorkload=Σχέδιο φόρτου εργασίας
 PlannedWorkloadShort=Φόρτος εργασίας
 ProjectReferers=Σχετικά αντικείμενα
 ProjectMustBeValidatedFirst=Το έργο πρέπει να επικυρωθεί πρώτα
-FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+FirstAddRessourceToAllocateTime=Ορίστε έναν πόρο χρήστη ως επαφή του έργου για να διαθέσετε χρόνο
 InputPerDay=Εισαγωγή ανά ημέρα
 InputPerWeek=Εισαγωγή ανά εβδομάδα
 InputPerMonth=Είσοδος / εισαγωγή ανά μήνα
@@ -238,7 +238,7 @@ LatestModifiedProjects=Τελευταία τροποποιημένα έργα %s
 OtherFilteredTasks=Άλλες φιλτραρισμένες εργασίες
 NoAssignedTasks=Δεν εντοπίστηκαν καθήκοντα που έχουν ανατεθεί (αναθέστε το έργο / εργασίες στον τρέχοντα χρήστη από το κορυφαίο πλαίσιο επιλογής για να εισάγετε χρόνο σε αυτό)
 ThirdPartyRequiredToGenerateInvoice=Ένα τρίτο μέρος πρέπει να οριστεί στο έργο για να μπορεί να το τιμολογεί.
-ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+ChooseANotYetAssignedTask=Επιλέξτε μια εργασία που δεν σας έχει ανατεθεί ακόμη
 # Comments trans
 AllowCommentOnTask=Επιτρέψτε στα σχόλια των χρηστών τις εργασίες
 AllowCommentOnProject=Να επιτρέπεται στα σχόλια των χρηστών τα έργα
@@ -255,8 +255,8 @@ ServiceToUseOnLines=Υπηρεσία για χρήση σε γραμμές
 InvoiceGeneratedFromTimeSpent=Το τιμολόγιο %s δημιουργήθηκε από το χρόνο που αφιερώσατε στο έργο
 ProjectBillTimeDescription=Ελέγξτε αν εισάγετε φύλλο κατανομής για τα καθήκοντα του έργου και σχεδιάζετε να δημιουργήσετε τιμολόγιο(α) από το δελτίο χρόνου για να χρεώσετε τον πελάτη του έργου (μην ελέγξετε αν σκοπεύετε να δημιουργήσετε τιμολόγιο που δεν βασίζεται σε καταγεγραμμένα φύλλα εργασίας). Σημείωση: Για να δημιουργήσετε τιμολόγιο, μεταβείτε στην καρτέλα 'Χρόνος δαπάνης' του έργου και επιλέξτε γραμμές που θα συμπεριληφθούν.
 ProjectFollowOpportunity=Ακολουθήστε την ευκαιρία
-ProjectFollowTasks=Ακολουθήστε τις εργασίες
-Usage=Usage
+ProjectFollowTasks=Follow tasks or time spent
+Usage=Χρήση
 UsageOpportunity=Χρήση: Ευκαιρία
 UsageTasks=Χρήση: Εργασίες
 UsageBillTimeShort=Χρήση: Χρόνος λογαριασμού
@@ -264,4 +264,4 @@ InvoiceToUse=Προσχέδιο τιμολογίου προς χρήση
 NewInvoice=Νέο τιμολόγιο
 OneLinePerTask=Μια γραμμή ανά εργασία
 OneLinePerPeriod=Μία γραμμή ανά περίοδο
-RefTaskParent=Ref. Parent Task
+RefTaskParent=Αναφ. Γονική εργασία
diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
index b64c183fce7..5f0d574f8f0 100644
--- a/htdocs/langs/el_GR/website.lang
+++ b/htdocs/langs/el_GR/website.lang
@@ -43,7 +43,7 @@ SetAsHomePage=Ορισμός σαν αρχική σελίδα
 RealURL=Πραγματική διεύθυνση URL
 ViewWebsiteInProduction=Προβάλετε τον ιστότοπο χρησιμοποιώντας τις διευθύνσεις URL για το σπίτι
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
-ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
+ExampleToUseInApacheVirtualHostConfig=Παράδειγμα χρήσης στη ρύθμιση εικονικού κεντρικού υπολογιστή Apache:
 YouCanAlsoTestWithPHPS=<u>Χρήση με ενσωματωμένο διακομιστή PHP</u> <br> Στο περιβάλλον ανάπτυξης, μπορεί να προτιμάτε να δοκιμάσετε τον ιστότοπο με τον ενσωματωμένο διακομιστή ιστού PHP (απαιτείται PHP 5.5) εκτελώντας <br> <strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Εκτελέστε τον ιστότοπό σας με έναν άλλο πάροχο φιλοξενίας Dolibarr</u> <br> Αν δεν διαθέτετε διακομιστή ιστού όπως το Apache ή το NGinx που διατίθεται στο Διαδίκτυο, μπορείτε να εξάγετε και να εισάγετε την ιστοσελίδα σας σε μια άλλη παρουσία Dolibarr που παρέχεται από έναν άλλο πάροχο φιλοξενίας Dolibarr που παρέχει πλήρη ενσωμάτωση στην ενότητα Website. Μπορείτε να βρείτε μια λίστα με ορισμένους παρόχους φιλοξενίας Dolibarr στη <a href="https://saas.dolibarr.org" target="_blank">διεύθυνση https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Ελέγξτε επίσης ότι ο εικονικός κεντρικός υπολογιστής έχει άδεια <strong>%s</strong> σε αρχεία σε <br> <strong>%s</strong>
@@ -57,7 +57,7 @@ NoPageYet=Δεν υπάρχουν ακόμη σελίδες
 YouCanCreatePageOrImportTemplate=Μπορείτε να δημιουργήσετε μια νέα σελίδα ή να εισαγάγετε ένα πλήρες πρότυπο ιστότοπου
 SyntaxHelp=Βοήθεια για συγκεκριμένες συμβουλές σύνταξης
 YouCanEditHtmlSourceckeditor=Μπορείτε να επεξεργαστείτε τον πηγαίο κώδικα HTML χρησιμοποιώντας το κουμπί &quot;Source&quot; στο πρόγραμμα επεξεργασίας.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Μπορείτε να ενσωματώσετε PHP κώδικα μέσα στην πηγή χρησιμοποιώντας tag <strong>&lt;?php ?&gt;</strong>. Οι ακόλουθες γενικές μεταβλητές είναι διαθέσιμες: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> Επίσης, μπορείτε να ενσωματώσετε τα περιεχόμενα μίας άλλης σελίδας με την παρακάτω σύνταξη:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> Μπορείτε να κάνετε ανακατεύθυνση σε άλλη σελίδα/περιεχόμενο με την ακόλουθη σύνταξη (παρατήρηση: μην εξάγετε περιχόμενο πριν την ανακατεύθυνση):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> Για να προσθέσετε σύνδεσμο προς άλλη σελίδα, χρησιμοποιήστε τη σύνταξη:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> Για να συμπεριλάβετε ενα  <strong>σύνδεσμο κατεβάσματος</strong> αρχείου αποθηκευμένου στα <strong>documents</strong> φάκελο, χρησιμοποιήστε <strong>document.php</strong> wrapper:<br>Παράδειγμα, για αρχείο στα documents/ecm (χρειάζεται να είναι καταγεγραμμένο), σύνταξη είναι:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Για κοινό αρχείο με κοινό σύνδεσμο (ανοιχτή πρόσβαση με κοινό κλειδί αρχείου), η σύνταξη είναι:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> Για να ενσωματώσετε μια <strong>image</strong> αποθηκευμένη στο  <strong>documents</strong> φάκελο, χρησιμοποιήστε το<strong>viewimage.php</strong> wrapper:<br>Παράδειγμα, για μια εικόνα στο documents/medias (ανοιχτός φάκελος για κοινή χρήση), η σύνταξη είναι :<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>Περισσότερα παραδείγματα HTML ή δυναμικό κώδικα διαθεσιμότητα στο <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Σελίδα κλωνοποίησης / κοντέινερ
 CloneSite=Κλωνήστε τον ιστότοπο
 SiteAdded=Προστέθηκε ιστότοπος
@@ -77,7 +77,7 @@ BlogPost=Ανάρτηση
 WebsiteAccount=Λογαριασμός ιστοτόπου
 WebsiteAccounts=Λογαριασμοί ιστοτόπων
 AddWebsiteAccount=Δημιουργία λογαριασμού ιστότοπου
-BackToListOfThirdParty=Επιστροφή στη λίστα για τρίτο μέρος
+BackToListForThirdParty=Επιστροφή στη λίστα για το τρίτο μέρος
 DisableSiteFirst=Απενεργοποιήστε πρώτα τον ιστότοπο
 MyContainerTitle=Ο τίτλος ιστότοπού μου
 AnotherContainer=Αυτός είναι ο τρόπος με τον οποίο μπορείτε να συμπεριλάβετε περιεχόμενο μιας άλλης σελίδας / κοντέινερ (ενδεχομένως να έχετε ένα σφάλμα αν ενεργοποιήσετε τον δυναμικό κώδικα επειδή ο ενσωματωμένος υποελεγχος δεν υπάρχει)
@@ -85,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Λυπούμαστε, αυτός ο ιστότο
 WEBSITE_USE_WEBSITE_ACCOUNTS=Ενεργοποιήστε τον πίνακα λογαριασμού web site
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Ενεργοποιήστε τον πίνακα για να αποθηκεύσετε λογαριασμούς ιστότοπων (login / pass) για κάθε ιστότοπο / τρίτο μέρος
 YouMustDefineTheHomePage=Πρέπει πρώτα να ορίσετε την προεπιλεγμένη Αρχική σελίδα
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContentFuture=Προειδοποίηση: Η δημιουργία ιστοσελίδας με εισαγωγή εξωτερικής ιστοσελίδας προορίζεται για έμπειρους χρήστες. Ανάλογα με την πολυπλοκότητα της σελίδας προέλευσης, το αποτέλεσμα της εισαγωγής ενδέχεται να διαφέρει από το πρωτότυπο. Επίσης, εάν η σελίδα προέλευσης χρησιμοποιεί κοινά στυλ CSS ή javascript σε διένεξη, ενδέχεται να σπάσει την εμφάνιση ή τις δυνατότητες του προγράμματος επεξεργασίας ιστότοπου όταν εργάζεστε σε αυτήν τη σελίδα. Αυτή η μέθοδος είναι ένας πιο γρήγορος τρόπος για να δημιουργήσετε μια σελίδα, αλλά συνιστάται να δημιουργήσετε τη νέα σας σελίδα από το μηδέν ή από ένα προτεινόμενο πρότυπο σελίδας. <br> Σημειώστε επίσης ότι ο ενσωματωμένος επεξεργαστής ενδέχεται να μην λειτουργεί σωστά όταν χρησιμοποιείται σε μια αρπαγή εξωτερική σελίδα.
 OnlyEditionOfSourceForGrabbedContent=Μόνο έκδοση πηγής HTML είναι δυνατή όταν το περιεχόμενο έχει ληφθεί από έναν εξωτερικό ιστότοπο
 GrabImagesInto=Πιάσε επίσης τις εικόνες που βρέθηκαν στο css και τη σελίδα.
 ImagesShouldBeSavedInto=Οι εικόνες πρέπει να αποθηκεύονται στον κατάλογο
@@ -122,9 +122,9 @@ BackToHomePage=Επιστροφή στην αρχική σελίδα...
 TranslationLinks=Μεταφραστικές συνδέσεις
 YouTryToAccessToAFileThatIsNotAWebsitePage=Προσπαθείτε να έχετε πρόσβαση σε μια σελίδα που δεν είναι σελίδα ιστότοπου
 UseTextBetween5And70Chars=Για καλές πρακτικές SEO, χρησιμοποιήστε ένα κείμενο μεταξύ 5 και 70 χαρακτήρων
-MainLanguage=Main language
-OtherLanguages=Other languages
-UseManifest=Provide a manifest.json file
-PublicAuthorAlias=Public author alias
-AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
-ReplacementDoneInXPages=Replacement done in %s pages or containers
+MainLanguage=Κύρια γλώσσα
+OtherLanguages=Άλλες γλώσσες
+UseManifest=Καταχωρίστε ένα αρχείο manifest.json
+PublicAuthorAlias=Δημόσιο συντάκτης ψευδώνυμο
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Οι διαθέσιμες γλώσσες ορίζονται σε ιδιότητες ιστότοπου
+ReplacementDoneInXPages=Η αντικατάσταση έγινε σε σελίδες ή κοντέινερ %s
diff --git a/htdocs/langs/el_GR/zapier.lang b/htdocs/langs/el_GR/zapier.lang
new file mode 100644
index 00000000000..b8f19d33469
--- /dev/null
+++ b/htdocs/langs/el_GR/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier για Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Μονάδα Zapier για Dolibarr
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Εγκατάσταση του Zapier για Dolibarr
diff --git a/htdocs/langs/en_AU/accountancy.lang b/htdocs/langs/en_AU/accountancy.lang
new file mode 100644
index 00000000000..9827b9d3795
--- /dev/null
+++ b/htdocs/langs/en_AU/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
diff --git a/htdocs/langs/en_AU/modulebuilder.lang b/htdocs/langs/en_AU/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/en_AU/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/en_AU/projects.lang b/htdocs/langs/en_AU/projects.lang
new file mode 100644
index 00000000000..7e42793b0e9
--- /dev/null
+++ b/htdocs/langs/en_AU/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
diff --git a/htdocs/langs/en_CA/accountancy.lang b/htdocs/langs/en_CA/accountancy.lang
new file mode 100644
index 00000000000..9827b9d3795
--- /dev/null
+++ b/htdocs/langs/en_CA/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
diff --git a/htdocs/langs/en_CA/modulebuilder.lang b/htdocs/langs/en_CA/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/en_CA/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/en_CA/projects.lang b/htdocs/langs/en_CA/projects.lang
new file mode 100644
index 00000000000..7e42793b0e9
--- /dev/null
+++ b/htdocs/langs/en_CA/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
diff --git a/htdocs/langs/en_GB/donations.lang b/htdocs/langs/en_GB/donations.lang
new file mode 100644
index 00000000000..d5a1d7a9289
--- /dev/null
+++ b/htdocs/langs/en_GB/donations.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - donations
+DonationsModels=Documents examples for donation receipts
+IConfirmDonationReception=The recipient declares receipt, as a donation, of the following amount
diff --git a/htdocs/langs/en_GB/externalsite.lang b/htdocs/langs/en_GB/externalsite.lang
new file mode 100644
index 00000000000..1febedb9fed
--- /dev/null
+++ b/htdocs/langs/en_GB/externalsite.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExternalSiteModuleNotComplete=Module "External Site" was not configured properly.
diff --git a/htdocs/langs/en_GB/ftp.lang b/htdocs/langs/en_GB/ftp.lang
new file mode 100644
index 00000000000..f1ea309c715
--- /dev/null
+++ b/htdocs/langs/en_GB/ftp.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - ftp
+FTPFailedToRemoveFile=Failed to delete file <b>%s</b>.
diff --git a/htdocs/langs/en_GB/modulebuilder.lang b/htdocs/langs/en_GB/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/en_GB/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/en_GB/multicurrency.lang b/htdocs/langs/en_GB/multicurrency.lang
new file mode 100644
index 00000000000..84e26a93979
--- /dev/null
+++ b/htdocs/langs/en_GB/multicurrency.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+ErrorDeleteCurrencyFail=Error deletion failed
diff --git a/htdocs/langs/en_GB/paypal.lang b/htdocs/langs/en_GB/paypal.lang
new file mode 100644
index 00000000000..7af701c5d12
--- /dev/null
+++ b/htdocs/langs/en_GB/paypal.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - paypal
+PAYPAL_API_SANDBOX=Mode (test/sandbox)
+PaypalModeIntegral=Integrated
+ThisIsTransactionId=This is the transaction id: <b>%s</b>
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system, returned an error
diff --git a/htdocs/langs/en_GB/salaries.lang b/htdocs/langs/en_GB/salaries.lang
new file mode 100644
index 00000000000..6023f538fa0
--- /dev/null
+++ b/htdocs/langs/en_GB/salaries.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Financial account used for user third parties
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Financial account by default for wage payments
+SalariesPayments=Salaries payment
diff --git a/htdocs/langs/en_GB/sms.lang b/htdocs/langs/en_GB/sms.lang
new file mode 100644
index 00000000000..4cc61b0bafc
--- /dev/null
+++ b/htdocs/langs/en_GB/sms.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - sms
+Sms=SMS
diff --git a/htdocs/langs/en_IN/accountancy.lang b/htdocs/langs/en_IN/accountancy.lang
new file mode 100644
index 00000000000..9827b9d3795
--- /dev/null
+++ b/htdocs/langs/en_IN/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
diff --git a/htdocs/langs/en_IN/modulebuilder.lang b/htdocs/langs/en_IN/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/en_IN/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/en_SG/accountancy.lang b/htdocs/langs/en_SG/accountancy.lang
new file mode 100644
index 00000000000..9827b9d3795
--- /dev/null
+++ b/htdocs/langs/en_SG/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
diff --git a/htdocs/langs/en_SG/admin.lang b/htdocs/langs/en_SG/admin.lang
new file mode 100644
index 00000000000..ba0e9ccd3d4
--- /dev/null
+++ b/htdocs/langs/en_SG/admin.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - admin
+MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+Module56Name=Telephony
+Module56Desc=Telephony integration
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_SG/companies.lang b/htdocs/langs/en_SG/companies.lang
new file mode 100644
index 00000000000..6897cf22f06
--- /dev/null
+++ b/htdocs/langs/en_SG/companies.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - companies
+Contact=Contact
diff --git a/htdocs/langs/en_SG/main.lang b/htdocs/langs/en_SG/main.lang
new file mode 100644
index 00000000000..2e691473326
--- /dev/null
+++ b/htdocs/langs/en_SG/main.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
diff --git a/htdocs/langs/en_SG/modulebuilder.lang b/htdocs/langs/en_SG/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/en_SG/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/en_SG/projects.lang b/htdocs/langs/en_SG/projects.lang
new file mode 100644
index 00000000000..7e42793b0e9
--- /dev/null
+++ b/htdocs/langs/en_SG/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
diff --git a/htdocs/langs/es_AR/accountancy.lang b/htdocs/langs/es_AR/accountancy.lang
new file mode 100644
index 00000000000..021d4098e74
--- /dev/null
+++ b/htdocs/langs/es_AR/accountancy.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_EXPORT_SEPARATORCSV=Separador de columna para exportar archivo
+ACCOUNTING_EXPORT_DATE=Formato de fecha para exportar archivo
+ACCOUNTING_EXPORT_PIECE=Exportar número de pieza
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exportar con cuenta global
+ACCOUNTING_EXPORT_AMOUNT=Exportar monto
+ACCOUNTING_EXPORT_DEVISE=Exportar moneda
+Selectformat=Elegir el formato del archivo
+ACCOUNTING_EXPORT_FORMAT=Seleccione el formato para el archivo
+ACCOUNTING_EXPORT_PREFIX_SPEC=Especificar el prefijo para el nombre de archivo
+DefaultForService=Predeterminado para servicio
+DefaultForProduct=Predeterminado para producto
+AccountancySetupDoneFromAccountancyMenu=La mayor parte de la configuración de la contabilidad se hace desde el menú %s
+ConfigAccountingExpert=Experto en la configuración del módulo contabilidad
+Journalization=Contabilización
+Journaux=Diarios Contables
+JournalFinancial=Diarios Financieros
+AssignDedicatedAccountingAccount=Nueva cuenta para asignar
+InvoiceLabel=Etiqueta de la factura
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
new file mode 100644
index 00000000000..46e7a7b46eb
--- /dev/null
+++ b/htdocs/langs/es_AR/admin.lang
@@ -0,0 +1,626 @@
+# Dolibarr language file - Source file is en_US - admin
+VersionProgram=Version del programa
+VersionLastInstall=Versión de instalación inicial
+VersionLastUpgrade=Actualización de la última versión
+VersionUnknown=Desconocido
+VersionRecommanded=Recomendado
+FileCheck=Comprobaciones de integridad del conjunto de archivos
+FileCheckDesc=Esta herramienta le permite verificar la integridad de los archivos y la configuración de su aplicación, comparando cada archivo con el oficial. También se puede verificar el valor de algunas constantes de configuración. Puede usar esta herramienta para determinar si algún archivo ha sido modificado (por ejemplo, por un pirata informático).
+FileIntegrityIsOkButFilesWereAdded=La verificación de integridad de los archivos ha pasado, sin embargo, se han agregado algunos archivos nuevos.
+FileIntegritySomeFilesWereRemovedOrModified=La verificación de integridad de archivos ha fallado. Algunos archivos fueron modificados, eliminados o agregados.
+GlobalChecksum=Suma de control global
+MakeIntegrityAnalysisFrom=Hacer análisis de integridad de los archivos de aplicación de
+LocalSignature=Firma local embebida (menos confiable)
+RemoteSignature=Firma remota remota (más confiable)
+FilesMissing=Archivos perdidos
+FilesAdded=Archivos Agregados
+FileCheckDolibarr=Comprobar la integridad de los archivos de la aplicación.
+AvailableOnlyOnPackagedVersions=El archivo local para la verificación de integridad solo está disponible cuando la aplicación se instala desde un paquete oficial
+XmlNotFound=Archivo de integridad xml de aplicación no encontrada
+SessionId=ID de sesión
+SessionSaveHandler=Controlador para guardar sesiones
+SessionSavePath=Ubicación de guardado de sesión
+ConfirmPurgeSessions=¿De verdad quieres purgar todas las sesiones? Esto desconectará a todos los usuarios (excepto a ti mismo).
+NoSessionListWithThisHandler=Guardar el controlador de sesión configurado en su PHP no permite enumerar todas las sesiones en ejecución.
+ConfirmLockNewSessions=¿Estás seguro de que deseas restringir cualquier nueva conexión de Dolibarr a ti mismo? Solo el usuario <b> %s </b> podrá conectarse después de eso.
+UnlockNewSessions=Quitar el bloqueo de conexión
+YourSession=Tu sesion
+Sessions=Sesiones de Usuarios
+WebUserGroup=Usuario / grupo del servidor web
+NoSessionFound=Su configuración de PHP parece no permitir el listado de sesiones activas. El directorio utilizado para guardar sesiones (<b> %s </b>) puede estar protegido (por ejemplo, por permisos del sistema operativo o por la directiva PHP open_basedir).
+DBStoringCharset=Codificación de caracteres de base de datos para almacenar datos
+DBSortingCharset=Codificación de caracteres de base de datos para ordenar los datos
+ClientCharset=Codificación de caracteres del cliente
+WarningModuleNotActive=El módulo <b> %s </b> debe estar habilitado
+WarningOnlyPermissionOfActivatedModules=Aquí solo se muestran los permisos relacionados con los módulos activados. Puede activar otros módulos en la página Inicio-> Configuración-> Módulos.
+DolibarrSetup=Dolibarr instala o actualiza
+GUISetup=Monitor
+SetupArea=Preparar
+UploadNewTemplate=Subir nueva (s) plantilla (s)
+FormToTestFileUploadForm=Formulario para probar la carga de archivos (según la configuración)
+IfModuleEnabled=Nota: solo es efectivo si el módulo <b> %s </b> está habilitado
+RemoveLock=Elimine / renombre el archivo <b> %s </b> si existe, para permitir el uso de la herramienta Actualizar / Instalar.
+RestoreLock=Restaure el archivo <b> %s </b>, solo con permiso de lectura, para deshabilitar cualquier uso posterior de la herramienta Actualizar / Instalar.
+SecuritySetup=Configuración de seguridad
+SecurityFilesDesc=Define aquí las opciones relacionadas con la seguridad sobre la carga de archivos.
+ErrorModuleRequirePHPVersion=Error, este módulo requiere la versión de PHP %s o superior
+ErrorModuleRequireDolibarrVersion=Error, este módulo requiere la versión de Dolibarr %s o superior
+ErrorDecimalLargerThanAreForbidden=Error, no se admite una precisión mayor que <b> %s </b>.
+DictionarySetup=Configuración del diccionario
+Dictionary=Los diccionarios
+ErrorReservedTypeSystemSystemAuto=El valor 'sistema' y 'systemauto' para el tipo están reservados. Puede usar 'usuario' como valor para agregar su propio registro
+ErrorCodeCantContainZero=El código no puede contener valor 0
+DisableJavascript=Deshabilitar funciones JavaScript y Ajax
+DisableJavascriptNote=Nota: Para fines de prueba o debug. Para la optimización para personas ciegas o navegadores de texto, puede preferir usar la configuración en el perfil del usuario.
+UseSearchToSelectCompanyTooltip=Además, si tiene un gran número de terceros (> 100 000), puede aumentar la velocidad configurando la constante COMPANY_DONOTSEARCH_ANYWHERE en 1 en Configuración-> Otro. La búsqueda se limitará entonces al inicio de la cadena.
+UseSearchToSelectContactTooltip=Además, si tiene un gran número de terceros (> 100 000), puede aumentar la velocidad configurando la constante CONTACT_DONOTSEARCH_ANYWHERE en 1 en Configuración-> Otro. La búsqueda se limitará entonces al inicio de la cadena.
+DelaiedFullListToSelectCompany=Espere hasta que se presione una tecla antes de cargar el contenido de la lista de combo de terceros<br>. Esto puede aumentar el rendimiento si tiene un gran número de terceros, pero es menos conveniente.
+DelaiedFullListToSelectContact=Espere hasta que se presione una tecla antes de cargar el contenido de la lista de combo de contactos. <br> Esto puede aumentar el rendimiento si tiene una gran cantidad de contactos, pero es menos conveniente.
+NumberOfKeyToSearch=Número de caracteres para ejecutar la búsqueda: %s
+NumberOfBytes=Cantidad de bytes
+NotAvailableWhenAjaxDisabled=No disponible cuando Ajax deshabilitado
+AllowToSelectProjectFromOtherCompany=En el documento de un tercero, puede elegir un proyecto vinculado a otro tercero
+JavascriptDisabled=JavaScript desactivado
+UsePreviewTabs=Usar pestañas de vista previa
+ShowPreview=Mostrar vista previa
+CurrentTimeZone=TimeZone PHP (servidor)
+MySQLTimeZone=TimeZone MySql (base de datos)
+TZHasNoEffect=Las fechas son almacenadas y devueltas por el servidor de base de datos como si se mantuvieran como una cadena enviada. La zona horaria solo tiene efecto cuando se usa la función UNIX_TIMESTAMP (que Dolibarr no debe usar, por lo que la base de datos TZ no debería tener ningún efecto, incluso si se cambia después de ingresar los datos).
+Space=Espacio
+NextValue=Siguiente valor
+NextValueForInvoices=Siguiente valor (facturas)
+NextValueForCreditNotes=Siguiente valor (notas de crédito)
+NextValueForDeposit=Siguiente valor (pago inicial)
+NextValueForReplacements=Siguiente valor (reemplazos)
+MustBeLowerThanPHPLimit=Nota: <b> su </b> configuración PHP actualmente limita el tamaño máximo de archivo para subir a <b> %s </b> %s, independientemente del valor de este parámetro
+NoMaxSizeByPHPLimit=Nota: no hay límite establecido en su configuración de PHP
+MaxSizeForUploadedFiles=Tamaño máximo para archivos cargados (0 para no permitir ninguna carga)
+UseCaptchaCode=Use el código gráfico (CAPTCHA) en la página de inicio de sesión
+AntiVirusCommand=Ruta completa al comando antivirus
+AntiVirusCommandExample=Ejemplo para ClamAv Daemon (requiere clamav-daemon): /usr/bin/clamdscan<br>Ejemplo para ClamWin (muy muy lento): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusParam=Más parámetros en la línea de comando
+AntiVirusParamExample=Ejemplo para ClamAv Daemon: --fdpass<br>Ejemplo para ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=Configuración del módulo de contabilidad
+UserSetup=Configuración de gestión de usuarios
+MultiCurrencySetup=Configuración multi-moneda
+MenuLimits=Límites y exactitud
+MenuIdParent=ID del menú principal
+DetailMenuIdParent=ID del menú principal (vacío para un menú superior)
+DetailPosition=Ordenar número para definir la posición del menú
+NotConfigured=Módulo / Aplicación no configurada
+SetupShort=Configuración
+OtherSetup=Otra configuración
+CurrentValueSeparatorThousand=Separador de miles
+Destination=Destino
+IdModule=ID de módulo
+IdPermissions=ID de permisos
+LanguageBrowserParameter=Parámetro %s
+ClientTZ=Zona horaria del cliente (usuario)
+ClientHour=Tiempo del cliente (usuario)
+OSTZ=Zona horaria del SO del servidor
+PHPTZ=Zona horaria del servidor PHP
+DaylingSavingTime=Horario de verano
+CurrentHour=Tiempo de PHP (servidor)
+CurrentSessionTimeOut=Tiempo de espera de la sesión actual
+YouCanEditPHPTZ=Para configurar una zona horaria de PHP diferente (no es necesario), puede intentar agregar un archivo .htaccess con una línea como esta "SetEnv TZ Europe / Paris"
+HoursOnThisPageAreOnServerTZ=La advertencia, a diferencia de otras pantallas, las horas en esta página no se encuentran en su zona horaria local, sino de la zona horaria del servidor.
+MaxNbOfLinesForBoxes=Max. número de líneas para widgets
+PositionByDefault=Orden por defecto
+MenusDesc=Los gestores de menú establecen el contenido de las dos barras de menú (horizontal y vertical).
+MenusEditorDesc=El editor de menú le permite definir entradas de menú personalizadas. Utilícelo con cuidado para evitar la inestabilidad y las entradas de menú permanentemente inalcanzables. <br> Algunos módulos agregan entradas de menú (en el menú <b> Todos </b> en su mayoría). Si elimina por error algunas de estas entradas, puede restaurarlas desactivando y volviendo a habilitar el módulo.
+MenuForUsers=Menú para usuarios.
+Language_en_US_es_MX_etc=Lenguaje (en_US, es_MX,...)
+SystemInfo=Información del sistema
+SystemToolsArea=Área de herramientas del sistema
+SystemToolsAreaDesc=Esta área proporciona funciones de administración. Utilice el menú para elegir la función requerida.
+PurgeAreaDesc=Esta página le permite eliminar todos los archivos generados o almacenados por Dolibarr (archivos temporales o todos los archivos en el directorio <b> %s </b>). Usando esta característica normalmente no es necesario. Se proporciona como una solución para los usuarios cuyo Dolibarr está alojado por un proveedor que no ofrece permisos para eliminar archivos generados por el servidor web.
+PurgeDeleteLogFile=Elimine los archivos de registro, incluido el <b> %s </b> definido para el módulo Syslog (sin riesgo de perder datos)
+PurgeDeleteTemporaryFiles=Eliminar todos los archivos temporales (no hay risgo de perder información), Nota: La eliminación se realizará sólo si la carpeta temporal sólo fue creada hace 24 horas.
+PurgeDeleteTemporaryFilesShort=Borrar archivos temporales
+PurgeDeleteAllFilesInDocumentsDir=Elimine todos los archivos en el directorio: <b> %s </b>. <br> Esto eliminará todos los documentos generados relacionados con elementos (terceros, facturas, etc.), archivos cargados en el módulo ECM, volcados de copia de seguridad de la base de datos y archivos temporales. archivos.
+PurgeRunNow=Purga ahora
+PurgeNothingToDelete=No hay directorio o archivos para eliminar.
+PurgeNDirectoriesDeleted=<b> %s </b> archivos o directorios eliminados.
+PurgeNDirectoriesFailed=Error al eliminar los archivos o directorios de <b> %s </b>.
+PurgeAuditEvents=Purgar todos los eventos de seguridad
+ConfirmPurgeAuditEvents=¿Está seguro de que desea purgar todos los eventos de seguridad? Todos los registros de seguridad se eliminarán, no se eliminarán otros datos.
+Backup=Apoyo
+Restore=Restaurar
+RunCommandSummary=La copia de seguridad se ha iniciado con el siguiente comando
+BackupResult=Resultado de copia de seguridad
+BackupFileSuccessfullyCreated=Archivo de copia de seguridad generado correctamente
+YouCanDownloadBackupFile=El archivo generado ahora se puede descargar
+NoBackupFileAvailable=No hay archivos de copia de seguridad disponibles.
+ToBuildBackupFileClickHere=Para crear un archivo de copia de seguridad, haga clic en <a href="%s"> aquí </a>.
+ImportMySqlDesc=Para importar un archivo de copia de seguridad de MySQL, puede usar phpMyAdmin a través de su alojamiento o el comando mysql desde la línea de comandos. Por ejemplo:
+ImportPostgreSqlDesc=Para importar un archivo de copia de seguridad, debe usar el comando pg_restore desde la línea de comandos:
+FileNameToGenerate=Nombre de archivo para copia de seguridad:
+CommandsToDisableForeignKeysForImport=Comando para deshabilitar claves foráneas en la importación
+CommandsToDisableForeignKeysForImportWarning=Obligatorio si desea poder restaurar su volcado de SQL más tarde
+ExportCompatibility=Compatibilidad del archivo de exportación generado.
+MySqlExportParameters=Parámetros de exportación de MySQL
+PostgreSqlExportParameters=Parámetros de exportación de PostgreSQL
+UseTransactionnalMode=Usa el modo transaccional
+FullPathToMysqldumpCommand=Ruta completa al comando mysqldump
+FullPathToPostgreSQLdumpCommand=Ruta completa al comando pg_dump
+AddDropDatabase=Agregar comando DROP DATABASE
+AddDropTable=Agregar comando DROP TABLE
+NameColumn=Columnas de nombres
+ExtendedInsert=Extendido INSERT
+NoLockBeforeInsert=No hay comandos de bloqueo alrededor de INSERT
+DelayedInsert=Inserto retrasado
+EncodeBinariesInHexa=Codificar datos binarios en hexadecimal.
+IgnoreDuplicateRecords=Ignorar errores de registro duplicado (INSERT IGNORE)
+AutoDetectLang=Autodetección (idioma del navegador)
+FeatureDisabledInDemo=Función deshabilitada en demo
+FeatureAvailableOnlyOnStable=Característica solo disponible en versiones oficiales estables
+BoxesDesc=Los widgets son componentes que muestran información que puede agregar para personalizar algunas páginas. Puede elegir entre mostrar el widget o no seleccionando la página de destino y haciendo clic en 'Activar', o haciendo clic en la papelera para deshabilitarla.
+OnlyActiveElementsAreShown=Solo se muestran los elementos de <a href="%s"> módulos habilitados </a>.
+ModulesDeployDesc=Si los permisos en su sistema de archivos lo permiten, puede utilizar esta herramienta para implementar un módulo externo. El módulo será visible en la pestaña <strong> %s </strong>.
+ModulesMarketPlaces=Encuentra aplicaciones / módulos externos
+ModulesDevelopYourModule=Desarrolle su propia aplicación / módulos
+ModulesDevelopDesc=También puede desarrollar su propio módulo o encontrar un socio para desarrollar uno para usted.
+DOLISTOREdescriptionLong=En lugar de activar el sitio web <a href="https://www.dolistore.com"> www.dolistore.com </a> para encontrar un módulo externo, puede utilizar esta herramienta integrada que realizará la búsqueda en el Mercado externo para usted (puede ser lento, necesita un acceso a Internet) ...
+NotCompatible=Este modulo no parece ser compatible con su Dolibarr %s (Min %s - Max %s).
+AchatTelechargement=Comprar / Descargar
+GoModuleSetupArea=Para implementar/instalar un nuevo módulo, vaya al área de configuración del Módulo: <a href="%s">%s</a>.
+DoliStoreDesc=DoliStore, la tienda oficial para adquirir módulos externos de Dolibarr ERP/CRM
+DoliPartnersDesc=Lista de empresas que ofrecen módulos o características desarrollados a medida.<br>Nota: dado que Dolibarr es una aplicación de código abierto, <i>cualquiera</i> con experiencia en programación PHP puede desarrollar un módulo.
+WebSiteDesc=Sitios web externos para más módulos adicionales (no básicos)...
+DevelopYourModuleDesc=Algunas soluciones para desarrollar su propio módulo...
+RelativeURL=URL relativa
+BoxesAvailable=Widgets disponibles
+BoxesActivated=Widgets activos
+ActiveOn=Activado en
+SourceFile=Archivo fuente
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible solo si JavaScript no está deshabilitado
+Required=Requeridos
+UsedOnlyWithTypeOption=Utilizado solo por alguna opción de agenda
+DoNotStoreClearPassword=Cifrar las contraseñas almacenadas en la base de datos (NO como texto plano). Se recomienda encarecidamente activar esta opción.
+MainDbPasswordFileConfEncrypted=Cifre la contraseña de la base de datos almacenada en conf.php. Se recomienda encarecidamente activar esta opción.
+InstrucToEncodePass=Para tener una contraseña cifrada en el archivo <b>conf.php</b>, reemplace la línea <br><b>$ dolibarr_main_db_pass="...";</b><br>por<br><b>$ dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=Para descifrar (limpiar) la contraseña en el archivo <b>conf.php</b>, reemplace la línea <br><b>$ dolibarr_main_db_pass="crypted: ...";</b> <br>por<br><b>$ dolibarr_main_db_pass="%s";</b>
+ProtectAndEncryptPdfFiles=Proteger los archivos PDF generados. Esto NO se recomienda ya que interrumpe la generación masiva de PDF.
+ProtectAndEncryptPdfFilesDesc=Al proteger un documento PDF, está disponible para leer e imprimir con cualquier navegador. Sin embargo, editar y copiar ya no es posible. Tenga en cuenta que el uso de esta función hace que la creación de archivos PDF combinados globales no funcione.
+Feature=Funcionalidad
+Developpers=Desarrolladores/contrubuyentes
+OfficialWiki=Documentación Dolibarr / Wiki
+OfficialDemo=Demo online Dolibarr
+OfficialMarketPlace=Mercado oficial de módulos externos/complementos
+OfficialWebHostingService=Servicios de alojamiento web referenciados (alojamiento en la nube)
+ReferencedPreferredPartners=Socios preferidos
+ForDocumentationSeeWiki=Para la documentación del usuario o desarrollador (Doc, preguntas frecuentes ...), <br> consulte la Wiki de Dolibarr: <br><b> <a href="%s" target="_blank"> %s </a> </b>
+ForAnswersSeeForum=Para cualquier otra pregunta o ayuda, puede utilizar el foro de Dolibarr: <br> <b> <a href="%s" target="_blank"> %s </a> </b>
+HelpCenterDesc1=Aquí hay algunos recursos para obtener ayuda y apoyo con Dolibarr.
+HelpCenterDesc2=Algunos de estos recursos solo están disponibles en <b> inglés </b>.
+CurrentMenuHandler=Controlador de menú actual
+SpaceX=Espacio X
+SpaceY=Espacio Y
+Emails=Correos electronicos
+EMailsSetup=Configuración de correos electrónicos
+EMailsDesc=Esta página le permite anular sus parámetros de PHP predeterminados para el envío de correo electrónico. En la mayoría de los casos en Unix / Linux OS, la configuración de PHP es correcta y estos parámetros no son necesarios.
+EmailSenderProfiles=Perfil del enviador de correos electrónicos
+EMailsSenderProfileDesc=Puedes dejar esta sección vacía. Si ingresas algunos correos aquí, se agregarán a la lista de posibles remitentes en el cuadro combinado cuando escribas un nuevo correo.
+MAIN_MAIL_SMTP_PORT=Puerto SMTP / SMTPS (valor predeterminado en php.ini: <b> %s </b>)
+MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (valor predeterminado en php.ini: <b> %s </b>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Puerto SMTP / SMTPS (no definido en PHP en sistemas similares a Unix)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Host (no definido en PHP en sistemas similares a Unix)
+MAIN_MAIL_EMAIL_FROM=Correo electrónico del remitente para correos electrónicos automáticos (valor predeterminado en php.ini: <b> %s </b>)
+MAIN_MAIL_ERRORS_TO=Email utilizado para retorno de error de correo (campos 'Errores a' en los correos electrónicos enviados)
+MAIN_MAIL_AUTOCOPY_TO=Copiar (Bcc) todos los correos electrónicos enviados a
+MAIN_DISABLE_ALL_MAILS=Deshabilitar todo el envío de correo electrónico (para propósitos de prueba o demostraciones)
+MAIN_MAIL_FORCE_SENDTO=Enviar todos los correos electrónicos a (en lugar de destinatarios reales, para fines de prueba)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Sugerir correos de empleados (si están definidos) en la lista de destinatarios predefinidos al escribir un nuevo correo.
+MAIN_MAIL_SENDMODE=Método de envío de correo electrónico
+MAIN_MAIL_SMTPS_ID=ID de SMTP (si el servidor de envío requiere autenticación)
+MAIN_MAIL_SMTPS_PW=Contraseña SMTP (si el servidor de envío requiere autenticación)
+MAIN_MAIL_EMAIL_TLS=Usar cifrado TLS (SSL)
+MAIN_MAIL_EMAIL_STARTTLS=Usar cifrado TLS (STARTTLS)
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Usa DKIM para generar firma de correo electrónico
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Dominio de correo electrónico para usar con dkim
+MAIN_DISABLE_ALL_SMS=Deshabilitar todo el envío de SMS (para propósitos de prueba o demostraciones)
+MAIN_SMS_SENDMODE=Método a utilizar para enviar SMS.
+MAIN_MAIL_SMS_FROM=Número de teléfono del remitente predeterminado para el envío de SMS
+MAIN_MAIL_DEFAULT_FROMTYPE=Correo electrónico predeterminado del remitente para envío manual (correo electrónico del usuario o correo electrónico de la empresa)
+UserEmail=Email del usuario
+CompanyEmail=Email de la empresa
+FeatureNotAvailableOnLinux=Característica no disponible en Unix como sistemas. Prueba tu programa de sendmail localmente.
+SubmitTranslation=Si la traducción de este idioma no está completa o si encuentra errores, puede corregirlos editando los archivos en el directorio <b> langs / %s </b> y enviar su cambio a www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=Si la traducción de este idioma no está completa o si encuentra errores, puede corregirlo editando los archivos en el directorio <b> langs / %s </b> y presentando los archivos modificados en dolibarr.org/forum o para los desarrolladores en github.com/ Dolibarr / dolibarr.
+ModulesSetup=Configuración de módulos / aplicaciones
+ModuleFamilyCrm=Gestión de la relación con el cliente (CRM)
+ModuleFamilySrm=Gestión de relaciones con proveedores (VRM)
+ModuleFamilyProducts=Gestión de producto (PM)
+ModuleFamilyHr=Gestión de Recursos Humanos (HR)
+ModuleFamilyProjects=Proyectos / Trabajo colaborativo.
+ModuleFamilyTechnic=Herramientas multimodulos
+ModuleFamilyFinancial=Módulos Financieros (Contabilidad / Tesorería)
+ModuleFamilyECM=Gestión de contenidos electrónicos (ECM)
+ModuleFamilyPortal=Sitios web y otras aplicaciones frontales.
+ModuleFamilyInterface=Interfaces con sistemas externos.
+MenuHandlers=Manejadores de menú
+MenuAdmin=Editor de menú
+DoNotUseInProduction=No utilizar en producción.
+ThisIsAlternativeProcessToFollow=Esta es una configuración alternativa para procesar manualmente:
+FindPackageFromWebSite=Encuentre un paquete que proporcione las funciones que necesita (por ejemplo, en el sitio web oficial %s).
+DownloadPackageFromWebSite=Descargue el paquete (por ejemplo, desde el sitio web oficial %s).
+UnpackPackageInDolibarrRoot=Desempaquetar / descomprima los archivos empaquetados en su directorio del servidor Dolibarr: <b> %s </b>
+UnpackPackageInModulesRoot=Para implementar / instalar un módulo externo, desempaquete / descomprima los archivos empaquetados en el directorio del servidor dedicado a los módulos externos: <br> <b> %s </b>
+SetupIsReadyForUse=El despliegue del módulo ha finalizado. Sin embargo, debe habilitar y configurar el módulo en su aplicación ingresando a los módulos de configuración de la página: <a href="%s"> %s </a>.
+NotExistsDirect=El directorio raíz alternativo no está definido en un directorio existente. <br>
+InfDirAlt=Desde la versión 3, es posible definir un directorio raíz alternativo. Esto le permite almacenar, en un directorio dedicado, complementos y plantillas personalizadas. <br> Simplemente cree un directorio en la raíz de Dolibarr (por ejemplo: personalizado). <br>
+InfDirExample=<br> Luego declara en el archivo <strong> conf.php </strong> <br> $ dolibarr_main_url_root_alt = '/ personalizado' <br> $ dolibarr_main_document_root_alt = '/ path / of / dolibarr / htdocs / custom' <br> Si estas líneas están comentadas con "#", para habilitarlas, simplemente elimine el comentario eliminando el carácter "#".
+YouCanSubmitFile=Puedes cargar el archivo .zip del paquete del módulo desde aquí:
+CallUpdatePage=Vaya a la página que actualiza la estructura y la información la base de datos: %s.
+LastStableVersion=Ultima versión estable
+LastActivationDate=Fecha de última activación
+LastActivationAuthor=Autor de última activación
+LastActivationIP=IP de última activación
+UpdateServerOffline=Actualizar servidor fuera de línea
+WithCounter=Administrar un contador
+ExampleOfDirectoriesForModelGen=Ejemplo de  sintaxis:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+String=Cuerda
+Module30Name=Facturas
+Module54Name=Contratos/suscripciones
+Module56Name=Telephony
+Module56Desc=Telephony integration
+Module80Name=Los envíos
+Module510Name=Sueldos
+Module4000Name=ARH
+Module62000Name=Incotérminos
+Permission23001=Leer tarea programada
+Permission23002=Crear/actualizar tarea programada
+Permission23003=Eliminar tarea programada
+Permission23004=Ejecutar tarea programada
+DictionaryProspectLevel=Cliente potencia
+DictionaryProspectStatus=Estado del cliente potencial
+DictionaryExpenseTaxRange=Informe de gastos - Rango categoría de transporte
+BackToModuleList=Volver a la lista de módulos
+BackToDictionaryList=Volver a la lista de diccionarios
+TypeOfRevenueStamp=Tipo de timbre fiscal
+VATManagement=Gestión de impuestos de ventas
+VATIsUsedDesc=De forma predeterminada, al crear prospectos, facturas, pedidos, etc., la tasa del impuesto sobre las ventas sigue la regla estándar activa: <br> Si el vendedor no está sujeto al impuesto sobre las ventas, entonces el impuesto sobre las ventas se establece de manera predeterminada en 0. Fin de la regla. <br> Si (país del vendedor = país del comprador), entonces el impuesto a las ventas por defecto es igual al impuesto a las ventas del producto en el país del vendedor. Fin de la regla. <br> Si el vendedor y el comprador están en la Comunidad Europea y los productos son productos relacionados con el transporte (flete, transporte, línea aérea), el IVA predeterminado es 0. Esta regla depende del país del vendedor. Consulte con su contador. El IVA debe ser pagado por el comprador a la oficina de aduanas de su país y no al vendedor. Fin de la regla. <br> Si el vendedor y el comprador se encuentran en la Comunidad Europea y el comprador no es una empresa (con un número de IVA intracomunitario registrado), el IVA está predeterminado para el tipo de IVA del país del vendedor. Fin de la regla. <br> Si el vendedor y el comprador están en la Comunidad Europea y el comprador es una empresa (con un número de IVA intracomunitario registrado), el IVA es 0 por defecto. Fin de la regla. <br> En cualquier otro caso, el valor predeterminado propuesto es Impuesto de ventas = 0. Fin de la regla
+VATIsNotUsedDesc=Por defecto, el impuesto a las ventas propuesto es 0, que puede usarse para casos como asociaciones, individuos o pequeñas empresas.
+VATIsUsedExampleFR=En Francia, significa empresas u organizaciones que tienen un sistema fiscal real (real real o normal simplificado). Un sistema en el que se declara el IVA.
+VATIsNotUsedExampleFR=En Francia, significa asociaciones que no están declaradas sin impuestos de ventas o compañías, organizaciones o profesiones liberales que han elegido el sistema fiscal de microempresas (impuestos a las ventas en franquicia) y pagaron una franquicia Impuestos a las ventas sin ninguna declaración de impuestos a las ventas. Esta opción mostrará la referencia "Impuesto de ventas no aplicable - art-293B de CGI" en las facturas.
+LTRate=Tarifa
+LocalTax1IsNotUsed=No usar segundo impuesto
+LocalTax1IsUsedDesc=Use un segundo tipo de impuesto (además del primero)
+LocalTax1IsNotUsedDesc=No use otro tipo de impuesto (además del primero)
+LocalTax1Management=Segundo tipo de impuesto
+LocalTax2IsNotUsed=No usar el tercer impuesto
+LocalTax2IsUsedDesc=Use un tercer tipo de impuesto (además del primero)
+LocalTax2IsNotUsedDesc=No use otro tipo de impuesto (además del primero)
+LocalTax2Management=Tercer tipo de impuesto
+LocalTax1ManagementES=Gestión de RE
+LocalTax1IsUsedDescES=La tasa de RE por defecto al crear prospectos, facturas, pedidos, etc. sigue la regla estándar activa: <br> Si el comprador no está sujeto a RE, RE por defecto = 0. Fin de la regla. <br> Si el comprador está sujeto a RE, entonces RE es el predeterminado. Fin de la regla. <br>
+LocalTax1IsNotUsedDescES=Por defecto, el RE propuesto es 0. Fin de la regla.
+LocalTax1IsUsedExampleES=En España son profesionales sujetos a algunas secciones específicas del IAE español.
+LocalTax1IsNotUsedExampleES=En España son profesionales y sociedades y están sujetos a determinadas secciones del IAE español.
+LocalTax2ManagementES=Gestión de IRPF
+LocalTax2IsUsedDescES=La tasa de IRPF por defecto al crear prospectos, facturas, pedidos, etc. sigue la regla estándar activa: <br> Si el vendedor no está sujeto a IRPF, entonces IRPF por defecto = 0. Fin de la regla. <br> Si el vendedor está sujeto a IRPF, entonces el IRPF por defecto. Fin de la regla. <br>
+LocalTax2IsNotUsedDescES=Por defecto, el IRPF propuesto es 0. Fin de la regla.
+LocalTax2IsUsedExampleES=En España, autónomos y profesionales independientes que prestan servicios y empresas que han optado por el sistema tributario de los módulos.
+LocalTax2IsNotUsedExampleES=En España son empresas no sujetas al régimen fiscal de los módulos.
+CalcLocaltax=Informes sobre impuestos locales
+CalcLocaltax1Desc=Los informes de impuestos locales se calculan con la diferencia entre las ventas de impuestos locales y las compras de impuestos locales
+CalcLocaltax2Desc=Los informes de impuestos locales son el total de las compras de impuestos locales.
+CalcLocaltax3Desc=Los informes de impuestos locales son el total de las ventas de impuestos locales.
+LabelUsedByDefault=Etiqueta utilizada de forma predeterminada si no se puede encontrar una traducción para el código
+LabelOnDocuments=Etiqueta en los documentos
+LabelOrTranslationKey=Etiqueta o clave de traducción
+NbOfDays=Numero de dias
+CurrentNext=Actual / Siguiente
+Offset=Compensar
+Upgrade=Mejorar
+MenuUpgrade=Actualizar / Extender
+AddExtensionThemeModuleOrOther=Implementar / instalar una aplicación / módulo externo
+DocumentRootServer=Directorio raíz del servidor web
+DataRootServer=Directorio de archivos de datos
+PhpWebLink=Enlace web-php
+DatabaseServer=Base de datos host
+DatabasePort=Puerto de base de datos
+DatabaseUser=Usuario de la base de datos
+NbOfRecord=No. de registros
+SummarySystem=Resumen de información del sistema
+SummaryConst=Lista de todos los parámetros de configuración de Dolibarr
+MenuCompanySetup=Empresa / Organización
+DefaultMenuManager=Gestor de menú estándar
+DefaultMenuSmartphoneManager=Gestor de menú de smartphone
+Skin=Tema del skin
+DefaultSkin=Tema del skin por defecto
+MaxSizeList=Longitud máxima para la lista
+DefaultMaxSizeList=Longitud máxima predeterminada para listas
+CompanyInfo=Empresa / Organización
+CompanyAddress=DIrección
+MiscellaneousDesc=Todos los demás parámetros relacionados con la seguridad se definen aquí.
+LimitsSetup=Límites / configuración de precisión
+LimitsDesc=Puede definir los límites, precisiones y optimizaciones utilizadas por Dolibarr aquí
+MAIN_MAX_DECIMALS_UNIT=Max. decimales para precios unitarios
+MAIN_MAX_DECIMALS_TOT=Max. decimales para precios totales
+MAIN_MAX_DECIMALS_SHOWN=Max. decimales para precios <b> mostrados en pantalla </b>. Agregue un punto suspensivo <b> ... </b> después de este parámetro (por ejemplo, "2 ...") si desea ver "<b> ... </b>" con el sufijo del precio truncado.
+MAIN_ROUNDING_RULE_TOT=Paso del rango de redondeo (para países donde el redondeo se realiza en otra cosa que no sea la base 10. Por ejemplo, ponga 0.05 si el redondeo se realiza en 0.05 pasos)
+UnitPriceOfProduct=Precio unitario neto de un producto.
+TotalPriceAfterRounding=Precio total (sin IVA / IVA incluido) después del redondeo
+ParameterActiveForNextInputOnly=Parámetro efectivo para la siguiente entrada solamente
+NoEventOrNoAuditSetup=No se ha registrado ningún evento de seguridad. Esto es normal si la auditoría no se ha habilitado en la página "Configuración - Seguridad - Eventos".
+NoEventFoundWithCriteria=No se ha encontrado ningún evento de seguridad para este criterio de búsqueda.
+SeeLocalSendMailSetup=Vea su configuración local de sendmail
+BackupDesc=Una copia de seguridad <b> completa </b> de una instalación de Dolibarr requiere dos pasos.
+BackupDesc3=Realice una copia de seguridad de la estructura y el contenido de su base de datos (<b> %s </b>) en un archivo de volcado. Para ello, puede utilizar el siguiente asistente.
+BackupDescX=El directorio archivado debe almacenarse en un lugar seguro.
+BackupDescY=El archivo de volcado generado debe almacenarse en un lugar seguro.
+BackupPHPWarning=La copia de seguridad no se puede garantizar con este método. Anterior recomendado.
+RestoreDesc=Para restaurar una copia de seguridad de Dolibarr, se requieren dos pasos.
+RestoreDesc2=Restaure el archivo de copia de seguridad (archivo zip, por ejemplo) del directorio "documentos" a una nueva instalación de Dolibarr o en este directorio de documentos actual (<b> %s </b>).
+RestoreDesc3=Restaure la estructura de la base de datos y los datos de un archivo de volcado de respaldo en la base de datos de la nueva instalación de Dolibarr o en la base de datos de esta instalación actual (<b> %s </b>). Advertencia: una vez que se complete la restauración, debe usar un nombre de usuario / contraseña, que existía desde el momento de la copia de seguridad / instalación para volver a conectarse. <br> Para restaurar una base de datos de copia de seguridad en esta instalación actual, puede seguir a este asistente.
+ForcedToByAModule=Esta regla es forzada a <b> %s </b> por un módulo activado
+RunningUpdateProcessMayBeRequired=Parece que es necesario ejecutar el proceso de actualización (la versión del programa %s difiere de la versión de la base de datos %s)
+YouMustRunCommandFromCommandLineAfterLoginToUser=Debe ejecutar este comando desde la línea de comandos después de iniciar sesión en un shell con el usuario <b> %s </b> o debe agregar la opción -W al final de la línea de comandos para proporcionar la contraseña de <b> %s </b>.
+YourPHPDoesNotHaveSSLSupport=Funciones SSL no disponibles en tu PHP
+DownloadMoreSkins=Más skins para descargar
+SimpleNumRefModelDesc=Devuelve el número de referencia con el formato %syymm-nnnn donde yy es año, mm es mes y nnnn es secuencial sin reinicio
+ShowProfIdInAddress=Mostrar identificación profesional con direcciones
+ShowVATIntaInAddress=Ocultar número de IVA intracomunitario con direcciones
+MeteoStdMod=Modo estandar
+MeteoPercentageModEnabled=Modo porcentual habilitado
+MeteoUseMod=Haga clic para utilizar %s
+TestLoginToAPI=Prueba de inicio de sesión por API
+ExternalAccess=Acceso externo / internet
+MAIN_PROXY_USE=Use un servidor proxy (de lo contrario el acceso es directo a internet)
+MAIN_PROXY_HOST=Servidor proxy: Nombre / Dirección
+MAIN_PROXY_USER=Servidor proxy: Login / Usuario
+DefineHereComplementaryAttributes=Defina aquí cualquier atributo adicional / personalizado que desee incluir para: %s
+ExtraFields=Atributos complementarios
+ExtraFieldsLines=Atributos complementarios (líneas)
+ExtraFieldsLinesRec=Atributos complementarios (plantillas facturas líneas)
+ExtraFieldsSupplierOrdersLines=Atributos complementarios (líneas de orden)
+ExtraFieldsSupplierInvoicesLines=Atributos complementarios (líneas de factura)
+ExtraFieldsThirdParties=Atributos complementarios (tercero)
+ExtraFieldsContacts=Atributos complementarios (contactos / dirección)
+ExtraFieldsMember=Atributos complementarios (miembro)
+ExtraFieldsMemberType=Atributos complementarios (tipo de miembro)
+ExtraFieldsCustomerInvoices=Atributos complementarios (facturas)
+ExtraFieldsCustomerInvoicesRec=Atributos complementarios (plantillas facturas).
+ExtraFieldsSupplierOrders=Atributos complementarios (pedidos)
+ExtraFieldsSupplierInvoices=Atributos complementarios (facturas)
+ExtraFieldsProject=Atributos complementarios (proyectos)
+ExtraFieldsProjectTask=Atributos complementarios (tareas)
+ExtraFieldHasWrongValue=El atributo %s tiene un valor incorrecto.
+AlphaNumOnlyLowerCharsAndNoSpace=Solo caracteres alfanuméricos y minúsculas sin espacio.
+SendmailOptionNotComplete=Advertencia, en algunos sistemas Linux, para enviar email desde su correo, la configuración de ejecución de sendmail debe contener la opción -ba (parámetro mail.force_extra_parameters en su archivo php.ini). Si algunos destinatarios nunca reciben correos electrónicos, intente editar este parámetro de PHP con mail.force_extra_parameters = -ba).
+PathToDocuments=Ruta a los documentos
+SendmailOptionMayHurtBuggedMTA=La función para enviar correos electrónicos utilizando el método "PHP mail direct" generará un mensaje de correo que algunos servidores de correo de recepción podrían no analizar correctamente. El resultado es que algunos correos no pueden ser leídos por personas alojadas en esas plataformas con errores. Este es el caso de algunos proveedores de Internet (Ex: Orange en Francia). Este no es un problema con Dolibarr o PHP, sino con el servidor de correo receptor. Sin embargo, puede agregar una opción MAIN_FIX_FOR_BUGGED_MTA a 1 en Configuración - Otros para modificar Dolibarr para evitar esto. Sin embargo, puede experimentar problemas con otros servidores que usan estrictamente el estándar SMTP. La otra solución (recomendada) es usar el método "biblioteca de sockets SMTP", que no tiene inconvenientes.
+TranslationSetup=Configuración de la traducción
+TranslationOverwriteKey=Sobrescribir una cadena de traducción
+TranslationDesc=Cómo configurar el idioma de la pantalla: <br> * Predeterminado / Sistema: menú <strong> Inicio -> Configuración -> Pantalla </strong> <br> * Por usuario: haga clic en el nombre de usuario en la parte superior de la pantalla y modifique en la pestaña <strong> Interfaz de usuario </strong> en la ficha del usuario.
+TranslationOverwriteDesc=También puede anular cadenas que llenan la siguiente tabla. Elija su idioma en el menú desplegable "%s", inserte la cadena de clave de traducción en "%s" y su nueva traducción en "%s"
+TranslationOverwriteDesc2=Puede usar la otra pestaña para ayudarlo a saber qué clave de traducción usar
+TranslationString=Cadena de traducción
+CurrentTranslationString=Cadena de traducción actual
+WarningAtLeastKeyOrTranslationRequired=Se requiere un criterio de búsqueda al menos para la clave o la cadena de traducción
+NewTranslationStringToShow=Nueva cadena de traducción para mostrar
+OriginalValueWas=La traducción original se sobrescribe. El valor original era: <br> <br> %s
+TransKeyWithoutOriginalValue=Has forzado una nueva traducción para la clave de traducción '<strong> %s </strong>' que no existe en ningún archivo de idioma
+TotalNumberOfActivatedModules=Aplicación / módulos activados: <b> %s </b> / <b> %s </b>
+YouMustEnableOneModule=Debes habilitar al menos 1 módulo
+ClassNotFoundIntoPathWarning=La clase %s no se encuentra en la ruta de PHP
+YesInSummer=Si en verano
+OnlyFollowingModulesAreOpenedToExternalUsers=Tenga en cuenta que solo los siguientes módulos están disponibles para usuarios externos (independientemente de los permisos de dichos usuarios) y solo si se otorgan permisos: <br>
+SuhosinSessionEncrypt=Almacenamiento de sesión cifrado por Suhosin.
+ConditionIsCurrently=La condición es actualmente %s
+YouUseBestDriver=Utiliza el controlador %s, que es el mejor controlador disponible actualmente.
+YouDoNotUseBestDriver=Utiliza el controlador %s pero se recomienda el controlador %s.
+SearchOptim=Optimización de búsqueda
+BrowserIsOK=Está utilizando el navegador web %s. Este navegador está bien para la seguridad y el rendimiento.
+BrowserIsKO=Está utilizando el navegador web %s. Se sabe que este navegador es una mala elección para la seguridad, el rendimiento y la confiabilidad. Recomendamos utilizar Firefox, Chrome, Opera o Safari.
+AddRefInList=Mostrar la lista de referencia cliente / vendedor (lista de selección o cuadro combinado) y la mayoría del hipervínculo. <br> Los terceros aparecerán con un formato de nombre de "CC12345 - SC45678 - The Big Company corp". en lugar de "The Big Company corp".
+AddAdressInList=Mostrar la lista de información de la dirección del cliente / proveedor (seleccionar lista o combobox) <br> Los terceros aparecerán con un formato de nombre de "The Big Company corp. - 21 jump street 123456 Big town - USA" en lugar de "The Big Company corp".
+AskForPreferredShippingMethod=Pregunte por el método de envío preferido para terceros.
+FillThisOnlyIfRequired=Ejemplo: +2 (rellenar solo si se experimentan problemas de compensación de zona horaria)
+PasswordGenerationStandard=Devuelva una contraseña generada de acuerdo con el algoritmo interno de Dolibarr: 8 caracteres que contienen números compartidos y caracteres en minúscula.
+PasswordGenerationNone=No sugiera una contraseña generada. La contraseña debe escribirse manualmente.
+PasswordGenerationPerso=Devuelva una contraseña de acuerdo con su configuración definida personalmente.
+SetupPerso=Según su configuración
+PasswordPatternDesc=Descripción del patrón de contraseña
+DisableForgetPasswordLinkOnLogonPage=No mostrar el enlace "Contraseña olvidada" en la página de inicio de sesión
+UsersSetup=Configuración del módulo de usuarios
+UserMailRequired=Email requerido para crear un nuevo usuario
+HRMSetup=Configuración del módulo HRM
+CompanySetup=Configuración del módulo de empresas.
+CompanyCodeChecker=Opciones para la generación automática de códigos de clientes / proveedores.
+AccountCodeManager=Opciones para la generación automática de códigos contables de clientes / proveedores.
+NotificationsDesc=Las notificaciones por correo electrónico se pueden enviar automáticamente para algunos eventos de Dolibarr. <br> Los destinatarios de las notificaciones se pueden definir:
+NotificationsDescUser=* por usuario, un usuario a la vez.
+NotificationsDescGlobal=* o configurando direcciones de correo electrónico globales en esta página de configuración.
+DocumentModelOdt=Genere documentos desde plantillas de OpenDocument (archivos .ODT / .ODS de LibreOffice, OpenOffice, KOffice, TextEdit, ...)
+WatermarkOnDraft=Marca de agua en el proyecto de documento
+JSOnPaimentBill=Activar función para autocompletar líneas de pago en forma de pago
+CompanyIdProfChecker=Reglas para las identificaciones profesionales
+MustBeMandatory=¿Obligatorio crear terceros (si se define el número de IVA o el tipo de empresa)?
+MustBeInvoiceMandatory=¿Obligatorio validar las facturas?
+TechnicalServicesProvided=Servicios tecnicos prestados
+WebDAVSetupDesc=Este es el enlace para acceder al directorio WebDAV. Contiene un directorio "público" abierto a cualquier usuario que conozca la URL (si se permite el acceso al directorio público) y un directorio "privado" que necesita una cuenta / contraseña de inicio de sesión para acceder.
+WebDavServer=URL raíz del servidor %s: %s
+WebCalUrlForVCalExport=Un enlace de exportación a formato <b> %s </b> está disponible en el siguiente enlace: %s
+BillsSetup=Configuración del módulo de facturas.
+BillsNumberingModule=Modelo de numeración de facturas y notas de crédito.
+BillsPDFModules=Modelos de documentos de factura.
+BillsPDFModulesAccordindToInvoiceType=La factura documenta los modelos según el tipo de factura.
+PaymentsPDFModules=Modelos de documentos de pago.
+ForceInvoiceDate=Forzar fecha de factura a fecha de validación
+SuggestPaymentByRIBOnAccount=Sugerir pago por retiro en cuenta
+SuggestPaymentByChequeToAddress=Sugerir pago por cheque a
+FreeLegalTextOnInvoices=Texto libre en las facturas.
+WatermarkOnDraftInvoices=Marca de agua en los proyectos de factura (ninguno si está vacío)
+PaymentsNumberingModule=Modelo de numeración de pagos.
+SuppliersPayment=Pagos a proveedores
+SupplierPaymentSetup=Configuración de pagos de proveedores
+PropalSetup=Configuración del módulo de propuestas comerciales.
+ProposalsNumberingModules=Propuesta de modelos de numeración comercial.
+ProposalsPDFModules=Propuesta comercial de modelos de documentos.
+FreeLegalTextOnProposal=Texto libre sobre propuestas comerciales.
+WatermarkOnDraftProposal=Marca de agua en el borrador de propuestas comerciales (ninguna si está vacía)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Consultar el destino de la cuenta bancaria de la propuesta.
+SupplierProposalSetup=Solicitud de precios de configuración del módulo de proveedores
+SupplierProposalNumberingModules=Solicitudes de precios proveedores de numeración de modelos.
+SupplierProposalPDFModules=Solicitudes de precios proveedores documentos modelos.
+FreeLegalTextOnSupplierProposal=Texto libre en las solicitudes de precios proveedores
+WatermarkOnDraftSupplierProposal=Marca de agua en los proveedores de solicitudes de precios de borrador (ninguno si está vacío)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Pregunte por el destino de la cuenta bancaria de la solicitud de precio
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Pregunte por la fuente de almacén para el pedido
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Pregunte por el destino de la cuenta bancaria de orden de compra
+OrdersNumberingModules=Modelos de numeración de pedidos.
+OrdersModelModule=Pedir modelos de documentos 
+WatermarkOnDraftOrders=Marca de agua en órdenes de giro (ninguna si está vacía)
+ShippableOrderIconInList=Agregar un ícono en la lista de Órdenes que indica si la orden es enviable
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Consultar el destino de la cuenta bancaria del pedido.
+InterventionsSetup=Configuración del módulo de intervenciones.
+FreeLegalTextOnInterventions=Texto libre en documentos de intervención.
+FicheinterNumberingModules=Modelos de numeración de intervención.
+TemplatePDFInterventions=Modelos de documentos de ficha de la intervención.
+WatermarkOnDraftInterventionCards=Marca de agua en los documentos de la ficha de la intervención (ninguno si está vacío)
+ContractsSetup=Configuración del módulo Contratos / Suscripciones.
+ContractsNumberingModules=Contratos de numeración de módulos.
+TemplatePDFContracts=Contratos modelos de documentos.
+FreeLegalTextOnContracts=Texto libre sobre contratos.
+WatermarkOnDraftContractCards=Marca de agua en los proyectos de contrato (ninguno si está vacío)
+MembersSetup=Configuración del módulo de miembros
+MemberMainOptions=Principales opciones
+AdherentLoginRequired=Administrar un inicio de sesión para cada miembro
+AdherentMailRequired=Correo electrónico requerido para crear un nuevo miembro
+MemberSendInformationByMailByDefault=La casilla de verificación para enviar la confirmación de correo a los miembros (validación o nueva suscripción) está activada de forma predeterminada
+MEMBER_REMINDER_EMAIL=Habilite el recordatorio automático <b> por correo electrónico </b> de las suscripciones caducadas. Nota: el módulo <strong> %s </strong> debe estar habilitado y configurado correctamente para enviar recordatorios.
+LDAPSetup=Configuración LDAP
+LDAPGroupsSynchro=Los grupos
+LDAPSynchronizeUsers=Organización de usuarios en LDAP.
+LDAPSynchronizeGroups=Organización de grupos en LDAP.
+LDAPSynchronizeContacts=Organización de contactos en LDAP.
+LDAPSynchronizeMembers=Organización de los miembros de la fundación en LDAP.
+LDAPSynchronizeMembersTypes=Organización de los tipos de miembros de la fundación en LDAP.
+LDAPServerPort=Puerto de servicio
+LDAPServerPortExample=Puerto predeterminado: 389
+LDAPServerUseTLS=Utilizar TLS
+LDAPServerUseTLSExample=Su servidor LDAP utiliza TLS
+LDAPServerDn=DN de servidor
+LDAPAdminDn=Administrador DN
+LDAPAdminDnExample=DN completo (por ejemplo: cn = admin, dc = ejemplo, dc = com o cn = Administrador, cn = Usuarios, dc = ejemplo, dc = com para el directorio activo)
+LDAPPassword=Contraseña de administrador
+LDAPUserDn=DN de usuarios
+LDAPUserDnExample=DN completo (por ejemplo: ou = usuarios, dc = ejemplo, dc = com)
+LDAPGroupDn=DN de grupos
+LDAPGroupDnExample=DN completo (por ejemplo: ou = grupos, dc = ejemplo, dc = com)
+LDAPServerExample=Dirección del servidor (por ejemplo, localhost, 192.168.0.2, ldaps: //ldap.example.com/)
+LDAPServerDnExample=DN completo (por ejemplo: dc = ejemplo, dc = com)
+LDAPDnSynchroActive=Sincronización de usuarios y grupos.
+LDAPDnSynchroActiveExample=Sincronización LDAP a Dolibarr o Dolibarr a LDAP
+LDAPDnContactActiveExample=Sincronización activada / desactivada
+LDAPDnMemberActive=Sincronización de miembros
+LDAPDnMemberActiveExample=Sincronización activada / desactivada
+LDAPDnMemberTypeActive=Sincronización de tipos de miembros
+LDAPDnMemberTypeActiveExample=Sincronización activada / desactivada
+LDAPContactDn=Contacto de Dolibarr 'DN
+LDAPContactDnExample=DN completo (por ejemplo: ou = contactos, dc = ejemplo, dc = com)
+LDAPMemberDn=Miembros de Dolibarr DN
+LDAPMemberDnExample=DN completo (por ejemplo: ou = miembros, dc = ejemplo, dc = com)
+LDAPMemberObjectClassListExample=Lista de atributos de registro que definen objectClass (ej: top, inetOrgPerson o top, usuario para el directorio activo)
+LDAPMemberTypeDn=Miembros de Dolibarr tipos DN
+LDAPMemberTypepDnExample=DN completo (por ejemplo: ou = memberstypes, dc = example, dc = com)
+LDAPMemberTypeObjectClassListExample=Lista de atributos de registro que definen objectClass (por ejemplo, top, groupOfUniqueNames)
+LDAPUserObjectClassListExample=Lista de atributos de registro que definen objectClass (ej: top, inetOrgPerson o top, usuario para el directorio activo)
+LDAPGroupObjectClassListExample=Lista de atributos de registro que definen objectClass (por ejemplo, top, groupOfUniqueNames)
+LDAPContactObjectClassListExample=Lista de atributos de registro que definen objectClass (ej: top, inetOrgPerson o top, usuario para el directorio activo)
+LDAPFieldZip=Cremallera
+LDAPFieldCompany=Compañía
+Target=Destino
+PositionIntoComboList=Posición de la línea en las listas de combo
+SellTaxRate=Tasa de impuesto de venta
+RecuperableOnly=Sí, para el IVA "No percibido pero recuperable" dedicado a algún estado de Francia. Mantenga el valor en "No" en todos los demás casos.
+UrlTrackingDesc=Si el proveedor o el servicio de transporte ofrece una página o sitio web para verificar el estado de sus envíos, puede ingresar aquí. Puede usar la clave {TRACKID} en los parámetros de la URL para que el sistema la reemplace con el número de seguimiento que el usuario ingresó en la ficha del viaje.
+OpportunityPercent=Cuando cree un cliente potencial, definirá una cantidad estimada de proyecto / cliente potencial. De acuerdo con el estado del cliente potencial, esta cantidad se puede multiplicar por esta tasa para evaluar la cantidad total que todos sus clientes potenciales pueden generar. El valor es un porcentaje (entre 0 y 100).
+TemplateForElement=Este registro de plantilla está dedicado a qué elemento
+TemplateIsVisibleByOwnerOnly=La plantilla es visible solo para el propietario
+VisibleNowhere=Visible en ninguna parte
+FixTZ=Arreglo de zona horaria
+FillFixTZOnlyIfRequired=Ejemplo: +2 (rellenar solo si el problema lo experimentó)
+ExpectedChecksum=Suma de comprobación esperada
+CurrentChecksum=Checksum actual
+ForcedConstants=Valores constantes requeridos
+MailToSendProposal=Propuestas de clientes
+MailToSendOrder=Ordenes de Venta
+MailToSendInvoice=Facturas de clientes
+MailToSendShipment=Los envíos
+MailToSendSupplierRequestForQuotation=Solicitud de presupuesto
+MailToSendSupplierOrder=Ordenes de compra
+MailToSendSupplierInvoice=Facturas de proveedores
+MailToSendContract=Los contratos
+MailToProject=Página de proyectos
+ByDefaultInList=Mostrar por defecto en la vista de lista
+YouUseLastStableVersion=Usas la última versión estable
+TitleExampleForMajorRelease=Ejemplo de mensaje que puede usar para anunciar esta versión principal (no dude en usarlo en sus sitios web)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s está disponible. La versión %s es una versión importante con muchas características nuevas tanto para usuarios como para desarrolladores. Puede descargarlo desde el área de descarga del portal https://www.dolibarr.org (subdirectorio Estable versiones). Puede leer <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> para obtener una lista completa de los cambios.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s está disponible. La versión %s es una versión de mantenimiento, por lo que solo contiene correcciones de errores. Recomendamos a todos los usuarios actualizar a esta versión. Una versión de mantenimiento no introduce nuevas funciones o cambios en la base de datos. Puede descargarlo desde el área de descarga del portal https://www.dolibarr.org (subdirectorio Estable versiones). Puede leer el <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> para obtener una lista completa de los cambios.
+ModelModulesProduct=Plantillas para documentos de productos.
+ToGenerateCodeDefineAutomaticRuleFirst=Para poder generar códigos automáticamente, primero debe definir un administrador para definir automáticamente el número de código de barras.
+SeeSubstitutionVars=Ver * nota para la lista de posibles variables de sustitución
+SeeChangeLog=Ver archivo ChangeLog (solo en inglés)
+AllPublishers=Todos los editores
+AddRemoveTabs=Añadir o eliminar pestañas
+AddDataTables=Añadir tablas de objetos
+AddDictionaries=Añadir tablas de diccionarios
+AddData=Añadir objetos o datos de diccionarios.
+AddBoxes=Agregar widgets
+AddSheduledJobs=Añadir trabajos programados
+AddHooks=Añadir ganchos
+AddTriggers=Añadir disparadores
+AddMenus=Añadir menús
+AddPermissions=Agregar permisos
+AddExportProfiles=Añadir perfiles de exportación
+AddImportProfiles=Añadir perfiles de importación
+AddOtherPagesOrServices=Añadir otras páginas o servicios
+AddModels=Añadir plantillas de numeración o documento
+AddSubstitutions=Añadir claves sustituciones
+DetectionNotPossible=No es posible la deteccion
+UrlToGetKeyToUseAPIs=Url para obtener el token para utilizar la API (una vez que se ha recibido, se guarda en la tabla de usuarios de la base de datos y debe proporcionarse en cada llamada a la API)
+ListOfAvailableAPIs=Lista de APIs disponibles
+activateModuleDependNotSatisfied=El módulo "%s" depende del módulo "%s", que falta, por lo que es posible que el módulo "%1$s" no funcione correctamente. Instale el módulo "%2$s" o deshabilite el módulo "%1$s" si quiere estar a salvo de alguna sorpresa
+CommandIsNotInsideAllowedCommands=El comando que está intentando ejecutar no está en la lista de comandos permitidos definidos en el parámetro <strong> $ dolibarr_main_restrict_os_commands </strong> en el archivo <strong> conf.php </strong>.
+LandingPage=Página de inicio
+SamePriceAlsoForSharedCompanies=Si utiliza un módulo de varias empresas, con la opción "Precio único", el precio también será el mismo para todas las empresas si los productos se comparten entre entornos.
+ModuleEnabledAdminMustCheckRights=Se ha activado el módulo. Los permisos para los módulos activados se otorgaron solo a los usuarios administrativos. Es posible que deba otorgar permisos a otros usuarios o grupos manualmente si es necesario.
+UserHasNoPermissions=Este usuario no tiene permisos definidos.
+TypeCdr=Use "Ninguno" si la fecha de pago es la fecha de la factura más un delta en días (delta es el campo "%s"). <br> Utilice "Al final del mes", si, después del delta, la fecha debe aumentarse para alcanzar. el final del mes (+ un opcional "%s" en días)<br>  Use "Actual / Siguiente" para que la fecha del plazo de pago sea el primer Nth del mes después de delta (delta es el campo "%s", N se almacena en el campo "%s")
+WarningNoteModulePOSForFrenchLaw=Este módulo %s cumple con las leyes francesas (Loi Finance 2016) porque el módulo de Registros no reversibles se activa automáticamente.
+WarningInstallationMayBecomeNotCompliantWithLaw=Está intentando instalar el módulo %s que es un módulo externo. Activar un módulo externo significa que confía en el editor de ese módulo y que está seguro de que este módulo no afecta negativamente el comportamiento de su aplicación y cumple con las leyes de su país (%s). Si el módulo introduce una característica ilegal, usted se hace responsable del uso de software ilegal.
+NothingToSetup=No se requiere ninguna configuración específica para este módulo.
+SetToYesIfGroupIsComputationOfOtherGroups=Establézcalo en sí si este grupo es un cálculo de otros grupos
+EnterCalculationRuleIfPreviousFieldIsYes=Introduzca la regla de cálculo si el campo anterior se estableció en Sí (por ejemplo, 'CODEGRP1 + CODEGRP2')
+COMPANY_AQUARIUM_CLEAN_REGEX=Filtro de expresiones regulares para limpiar el valor (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=Oficial de protección de datos (DPO, privacidad de datos o contacto GDPR)
+GDPRContactDesc=Si almacena datos sobre empresas / ciudadanos europeos, puede nombrar al contacto que es responsable del Reglamento general de protección de datos aquí
+HelpOnTooltip=Texto de ayuda para mostrar en información sobre herramientas
+HelpOnTooltipDesc=Coloque texto o una clave de traducción aquí para que el texto se muestre en una información sobre herramientas cuando este campo aparezca en un formulario
+YouCanDeleteFileOnServerWith=Puede eliminar este archivo en el servidor con la línea de comandos: <br> %s
+ChartLoaded=Plan de cuenta cargado
+VATIsUsedIsOff=Nota: La opción de usar el impuesto sobre las ventas o el IVA se ha establecido en <strong> Desactivado </strong> en el menú %s - %s, por lo que el impuesto sobre las ventas o IVA utilizado siempre será 0 para las ventas.
+FeatureSupportedOnTextFieldsOnly=Advertencia, función compatible solo en los campos de texto. También se debe establecer un parámetro de URL action = create o action = edit O el nombre de la página debe terminar con 'new.php' para activar esta función.
+EmailCollector=Recolector de correo electronico
+EmailCollectorDescription=Agregue un trabajo programado y una página de configuración para escanear los buzones de correo electrónico con regularidad (usando el protocolo IMAP) y registre los correos electrónicos recibidos en su aplicación, en el lugar correcto y / o cree algunos registros automáticamente (como clientes potenciales).
+NewEmailCollector=Nuevo recolector de email
+EMailHost=Host de correo electrónico del servidor IMAP
+EmailcollectorOperations=Operaciones a realizar por coleccionista.
+EmailCollectorConfirmCollectTitle=Correo electrónico recoger confirmación
+EmailCollectorConfirmCollect=¿Quieres ejecutar la colección para este coleccionista ahora?
+NoNewEmailToProcess=No hay correo electrónico nuevo (filtros coincidentes) para procesar
+RecordEvent=Grabar evento de correo electrónico
+CreateLeadAndThirdParty=Crear plomo (y tercero si es necesario)
+CodeLastResult=Último código de resultado
+ECMAutoTree=Mostrar arbol ECM automatico
+ResourceSetup=Configuración del módulo de recursos
+UseSearchToSelectResource=Use un formulario de búsqueda para elegir un recurso (en lugar de una lista desplegable).
+DisabledResourceLinkUser=Deshabilitar la función para vincular un recurso a los usuarios
+DisabledResourceLinkContact=Deshabilitar función para vincular un recurso a contactos
+ConfirmUnactivation=Confirmar el reinicio del módulo
+OnMobileOnly=Solo en pantalla pequeña (teléfono inteligente)
+DisableProspectCustomerType=Deshabilite el tipo de tercero "Prospect + Customer" (por lo tanto, el tercero debe ser Prospect o Customer pero no pueden ser ambos)
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_AR/agenda.lang b/htdocs/langs/es_AR/agenda.lang
new file mode 100644
index 00000000000..73caf6295b2
--- /dev/null
+++ b/htdocs/langs/es_AR/agenda.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - agenda
+Event=Evento
+DateActionEnd=Fecha de fin
diff --git a/htdocs/langs/es_AR/banks.lang b/htdocs/langs/es_AR/banks.lang
new file mode 100644
index 00000000000..b9ae63c8b2c
--- /dev/null
+++ b/htdocs/langs/es_AR/banks.lang
@@ -0,0 +1,87 @@
+# Dolibarr language file - Source file is en_US - banks
+MenuNewVariousPayment=Nuevo Pago Varios
+BankName=Nombre del Banco
+BankAccount=Cuenta Bancaria
+ShowAccount=Mostrar Cuenta
+AccountRef=Cuenta Financiera de Referencia
+AccountLabel=Nombre de Cuenta Financiera
+CashAccount=Cuenta Caja
+CashAccounts=Cuentas Caja
+CurrentAccounts=Cuentas Corrientes
+SavingAccounts=Cajas de Ahorro
+ErrorBankLabelAlreadyExists=La etiqueta de la cuenta financiera ya existe
+BankBalanceBefore=Saldo previo
+BalanceMinimalAllowed=Saldo mínimo permitido
+FutureBalance=Saldo futuro
+ShowAllTimeBalance=Mostrar saldo desde el inicio
+AllTime=Desde el inicio
+Reconciliation=Reconciliación
+RIB=Número de cuenta bancaria
+SwiftValid=BIC/swift válido
+AccountStatement=Estado de cuenta
+AccountStatementShort=Estado
+AccountStatements=Estado de cuentas
+LastAccountStatements=Ultimo estado de cuentas
+IOMonthlyReporting=Reporte mensual
+BankAccountDomiciliation=Dirección del Banco
+BankAccountOwner=Nombre del Dueño de la cuenta
+BankAccountOwnerAddress=Dirección del dueño de la cuenta
+MenuNewFinancialAccount=Nueva cuenta financiera
+EditFinancialAccount=Editar cuentga
+LabelBankCashAccount=Banco o Caja
+AccountType=Tipo de Cuenta
+BankType0=Caja de ahorro
+BankType1=Cuenta Corriente
+BankType2=Cuenta Caja
+AccountsArea=Area de Cuentas
+AccountCard=Ficha de la cuenta
+DeleteAccount=Eliminar Cuenta
+ConfirmDeleteAccount=¿Está seguro que quiere eliminar esta cuenta?
+IdTransaction=ID de transacción
+BankTransactions=Registros Bancarios
+ListTransactions=Listar registros
+ListTransactionsByCategory=Listar registros por categoría
+TransactionsToConciliateShort=Para reconciliar
+Conciliable=Puede ser reconciliado
+Conciliate=Reconciliar
+Conciliation=Reconciliación
+OnlyOpenedAccount=Sólo cuentas abiertas
+AccountToCredit=Cuenta Crédito
+AccountToDebit=Cuenta Débito
+DisableConciliation=Deshabilitar reconciliación para esta cuenta
+ConciliationDisabled=Reconciliación deshabilitada
+StatusAccountClosed=Cerrado
+LineRecord=Transacción
+AddBankRecord=Agregar Registro
+AddBankRecordLong=Agregar Registro Manualmente
+ConciliatedBy=Reconciliado por
+DateConciliating=Fecha de Reconciliación
+BankLineConciliated=Registro reconciliado con extracto bancario
+SupplierInvoicePayment=Pago de Proveedor
+WithdrawalPayment=Orden de débito
+TransferTo=A
+ValidateCheckReceipt=¿Validar recibo de cheque?
+BankChecks=Cheques bancarios
+BankChecksToReceipt=Cheques que esperan a depositarse
+BankChecksToReceiptShort=Cheques que esperan a depositarse
+NumberOfCheques=Número de cheque
+PlannedTransactions=Registros planeados
+ExportDataset_banque_1=Registros bancarios y estado de la cuenta
+AllAccounts=Todas las cuentas bancarias y cajas
+ShowAllAccounts=Mostrar todas las cuentas
+FutureTransaction=Transacción futura. Imposible reconciliar
+ToConciliate=¿Para reconciliar?
+DefaultRIB=BAN predeterminado
+AllRIB=Todos los BAN
+LabelRIB=Etiqueta BAN
+NoBANRecord=No hay registros BAN
+DeleteARib=Eliminar registro BAN
+ConfirmDeleteRib=¿Está seguro que quiere eliminar este registro BAN?
+ConfirmRejectCheck=¿Está seguro que quiere marcar este cheque como rechazado?
+RejectCheckDate=Fecha cuando fue devuelto el cheque
+BankAccountModelModule=Template para cuentas bancarias
+VariousPayment=Pago Varios
+ShowVariousPayment=Mostrar Pagos Varios
+AddVariousPayment=Agregar pago varios
+BankColorizeMovementName1=Color de fondo para movimiento de débito
+BankColorizeMovementName2=Color de fondo para movimiento de crédito
diff --git a/htdocs/langs/es_AR/bills.lang b/htdocs/langs/es_AR/bills.lang
new file mode 100644
index 00000000000..829e6f47ce3
--- /dev/null
+++ b/htdocs/langs/es_AR/bills.lang
@@ -0,0 +1,37 @@
+# Dolibarr language file - Source file is en_US - bills
+BillsCustomers=Facturas de clientes
+BillsCustomer=Factura de Cliente
+BillsSuppliers=Facturas de proveedores
+BillsCustomersUnpaid=Facturas impagas de cliente
+BillsCustomersUnpaidForCompany=Facturas impagas de cliente para %s
+BillsSuppliersUnpaid=Facturas impagas de proveedor
+BillsSuppliersUnpaidForCompany=Facturas impagas de proveedor para %s
+InvoiceAvoir=Nota de crédito
+InvoiceCustomer=Factura de Cliente
+CustomerInvoice=Factura de Cliente
+CustomersInvoices=Facturas de clientes
+SupplierInvoice=Factura de Proveedor
+SupplierBill=Factura de Proveedor
+PaymentAmount=Monto pagado
+BillStatusDraft=Borrador (necesita ser validado)
+BillStatusPaid=Pagado
+BillShortStatusPaid=Pagado
+BillShortStatusConverted=Pagado
+BillShortStatusValidated=Validado
+BillShortStatusClosedUnpaid=Cerrado
+PaymentStatusToValidShort=Para confirmar
+BillFrom=De
+BillTo=A
+StandingOrders=Ordenes por débito automático
+StandingOrder=Orden de Débito Automático
+SupplierBillsToPay=Facturas impagas de proveedor
+CustomerBillsUnpaid=Facturas impaga de cliente
+CreditNote=Nota de crédito
+CreditNotes=Notas de credito
+PaymentConditionShortPT_DELIVERY=Entrega
+PaymentTypePRE=Orden de pago por débito automático
+PaymentTypeShortPRE=Orden de débito
+PaymentTypeCB=Tarjeta de crédito
+PaymentTypeShortCB=Tarjeta de crédito
+Residence=DIrección
+CheckBank=Cheque
diff --git a/htdocs/langs/es_AR/blockedlog.lang b/htdocs/langs/es_AR/blockedlog.lang
new file mode 100644
index 00000000000..5b0a4d9d1b5
--- /dev/null
+++ b/htdocs/langs/es_AR/blockedlog.lang
@@ -0,0 +1,35 @@
+# Dolibarr language file - Source file is en_US - blockedlog
+BlockedLogDesc=Este módulo rastrea algunos eventos en un registro inalterable (que no puedes modificar una vez registrado) en una cadena de bloques, en tiempo real. Este módulo proporciona compatibilidad con los requisitos de las leyes de algunos países (como Francia con la ley Finanzas 2016 - Norma NF525).
+Fingerprints=Eventos archivados y huellas digitales
+FingerprintsDesc=Esta es la herramienta para examinar o extraer los registros inalterables. Éstos se generan y archivan localmente en una tabla dedicada, en tiempo real cuando registras un evento de negocios. Puede usar esta herramienta para exportar este archivo y guardarlo en un soporte externo (algunos países, como Francia, solicitan que lo hagas todos los años). Debes tener en cuenta que no hay ninguna función para purgar estos registros y cada cambio que se intente realizar directamente (por ejemplo, por un hacker) se informará con una huella digital inválida. Si realmente necesitas purgar esta tabla porque usaste la aplicación para hacer una demostración/prueba y deseas limpiar sus datos para comenzar su producción, puedes pedirle a t administrador que restablezca la base de datos (se eliminará toda la información).
+CompanyInitialKey=Clave inicial de la empresa (hash del bloque génesis)
+DownloadBlockChain=Descargar huellas digitales
+OkCheckFingerprintValidity=El registro archivado es válido. Los datos de esta línea no se modificaron y la entrada es correlativa a la anterior.
+OkCheckFingerprintValidityButChainIsKo=El registro archivado parece válido en comparación con el anterior, pero la cadena estaba previamente dañada.
+AddedByAuthority=Almacenado con autoridad remota
+NotAddedByAuthorityYet=Aún no almacenado con autoridad remota
+ShowDetails=Mostrar detalles de registros almacenados
+logPAYMENT_VARIOUS_CREATE=Pago creado (no asignado a una factura)
+logPAYMENT_VARIOUS_MODIFY=Pago modificado (no asignado a una factura)
+logPAYMENT_VARIOUS_DELETE=Borrado lógico de un pago (no asignado a una factura)
+logPAYMENT_ADD_TO_BANK=Pago agregado al banco
+logPAYMENT_CUSTOMER_CREATE=Pago de cliente creado
+logPAYMENT_CUSTOMER_DELETE=Borrado lógico de un pago de cliente
+logDONATION_PAYMENT_CREATE=Pago de donación cread
+logDONATION_PAYMENT_DELETE=Borrado lógico de una donación
+logBILL_PAYED=Factura de cliente marcada como paga
+logBILL_UNPAYED=Factura de cliente marcada como impaga
+logBILL_VALIDATE=Factura de cliente validada
+logBILL_SENTBYMAIL=Factura de cliente enviada por corre
+logBILL_DELETE=Borrado lógico de una factura de cliente
+logDON_DELETE=Borrado lógico de una donación
+logMEMBER_SUBSCRIPTION_DELETE=Borrado lógico de una suscripción de miembro
+logCASHCONTROL_VALIDATE=Registro de flujo de efectivo
+ListOfTrackedEvents=Lista de eventos rastreados
+logDOC_DOWNLOAD=Descarga de un documento validado para imprimir o enviar
+DataOfArchivedEvent=Datos completos del evento archivado
+ImpossibleToReloadObject=Objeto original (tipo %s, id %s) no vinculado (consulte la columna 'Datos completos' para obtener los datos inalterables guardados)
+BlockedLogAreRequiredByYourCountryLegislation=La legislación de su país puede requerir el módulo de registros inalterables. Al desactivar este módulo puede invalidar cualquier transacción futura con respecto a la ley y el uso de software legal, ya que no pueden ser validados por una auditoría fiscal.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=El módulo de registros inalterables se activó debido a la legislación de su país. Al desactivar este módulo puede invalidar cualquier transacción futura con respecto a la ley y el uso de software legal, ya que no pueden ser validados por una auditoría fiscal.
+BlockedLogDisableNotAllowedForCountry=Lista de países donde el uso de este módulo es obligatorio (solo para evitar deshabilitar el módulo por error, si su país está en esta lista no es posible deshabilitar el módulo sin editar esta lista primero. Tenga en cuenta también que habilitar/deshabilitar este módulo guardará un registro inalterable).
+TooManyRecordToScanRestrictFilters=Demasiados registros para escanear/analizar. Por favor reduzca la lista con filtros más restrictivos.
diff --git a/htdocs/langs/es_AR/bookmarks.lang b/htdocs/langs/es_AR/bookmarks.lang
new file mode 100644
index 00000000000..e6283a5823b
--- /dev/null
+++ b/htdocs/langs/es_AR/bookmarks.lang
@@ -0,0 +1,18 @@
+# Dolibarr language file - Source file is en_US - bookmarks
+AddThisPageToBookmarks=Agregar página actual a favoritos
+Bookmark=Favorito
+Bookmarks=Favoritos
+ListOfBookmarks=Lista de favoritos
+EditBookmarks=Listar/editar favoritos
+NewBookmark=Nuevo favorito
+ShowBookmark=Mostrar favorito
+OpenANewWindow=Abrir en nueva pestaña
+ReplaceWindow=Reemplazar pestaña actual
+BookmarkTitle=Nombre del favorito
+BehaviourOnClick=Comportamiento al seleccionar la URL de un favorito
+CreateBookmark=Crear favorito
+SetHereATitleForLink=Elegir un nombre para el favorito
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Usar un enlace externo/absoluto (https://URL) o un enlace interno/relativo (/DOLIBARR_ROOT/htdocs/...)
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Elegir si el sitio vinculado debe abrirse en la pestaña actual o en una nueva
+BookmarksManagement=Administración de favoritos
+BookmarksMenuShortCut=Ctrl+Shift+M
diff --git a/htdocs/langs/es_AR/boxes.lang b/htdocs/langs/es_AR/boxes.lang
new file mode 100644
index 00000000000..a76803696e3
--- /dev/null
+++ b/htdocs/langs/es_AR/boxes.lang
@@ -0,0 +1,73 @@
+# Dolibarr language file - Source file is en_US - boxes
+BoxLoginInformation=Información de Usuario
+BoxLastRssInfos=Información RSS
+BoxLastProducts=Ultimos %s Productos/Servicios
+BoxLastProductsInContract=Últimos %s productos / servicios contratados
+BoxLastSupplierBills=Últimas facturas de proveedor
+BoxLastCustomerBills=Últimas facturas de cliente
+BoxOldestUnpaidCustomerBills=Facturas de cliente sin pagar más antiguas
+BoxOldestUnpaidSupplierBills=Facturas de proveedor sin pagar más antiguas
+BoxLastCustomerOrders=Últimas órdenes de venta
+BoxCurrentAccounts=Saldo de cuentas abiertas
+BoxTitleLastRssInfos=Últimas %snoticias de %s
+BoxTitleLastProducts=Productos/Servicios: Últimos%s modificados
+BoxTitleLastModifiedSuppliers=Proveedores: últimos %s modificados
+BoxTitleLastModifiedCustomers=Clientes: últimos %s modificados
+BoxTitleLastModifiedProspects=Clientes Potenciales: últimos %s modificados
+BoxTitleLastFicheInter=Ultimas %s intervenciones modificadas
+BoxTitleOldestUnpaidCustomerBills=Facturas de cliente: %s más antiguas sin pagar
+BoxTitleOldestUnpaidSupplierBills=Facturas de proveedor: %s más antiguas sin pagar
+BoxTitleSupplierOrdersAwaitingReception=Pedidos de proveedor en espera de recepción
+BoxTitleLastModifiedContacts=Contactos/Direcciones: últimos %s modificados
+BoxMyLastBookmarks=Favoritos: últimos %s
+BoxOldestExpiredServices=Servicios activos vencidos más antiguos
+BoxLastExpiredServices=Últimos %s contratos más antiguos con servicios activos vencidos
+BoxTitleLastModifiedDonations=Últimas donaciones modificadas %s
+BoxTitleLatestModifiedBoms=Últimas %s BOMs modificadas
+BoxTitleLatestModifiedMos=Últimas %s órdenes de fabricación modificadas
+BoxGlobalActivity=Actividad global (facturas, presupuestos, órdenes)
+FailedToRefreshDataInfoNotUpToDate=Error al actualizar flujo RSS. Última fecha de actualización exitosa: %s
+LastRefreshDate=Última fecha de actualización
+NoRecordedBookmarks=No hay favoritos definidos.
+ClickToAdd=Haga clic aquí para agregar.
+NoRecordedCustomers=No hay clientes registrados
+NoRecordedContacts=No hay contactos grabados
+NoActionsToDo=No hay acciones que realizar.
+NoRecordedOrders=No hay órdenes de venta registradas
+NoRecordedProposals=No hay presupuestos registrads
+NoRecordedInvoices=No hay facturas de cliente registradas
+NoUnpaidCustomerBills=No hay facturas de cliente sin pagar
+NoUnpaidSupplierBills=No hay facturas de proveedor sin pagar
+NoModifiedSupplierBills=No hay facturas de proveedor registradas
+NoRecordedProducts=No hay productos/servicios registrados
+NoRecordedProspects=No hay clientes potenciales registrados
+NoContractedProducts=No hay productos/servicios contratados
+NoRecordedContracts=No hay contratos registrados
+NoRecordedInterventions=No hay intervenciones registradas
+BoxLatestSupplierOrders=Últimas órdenes de compra
+BoxLatestSupplierOrdersAwaitingReception=Últimas órdenes de compra (pendientes de recepción)
+NoSupplierOrder=No hay órdenes de compra registradas
+BoxCustomersInvoicesPerMonth=Facturas de clientes por mes
+BoxSuppliersInvoicesPerMonth=Facturas de proveedor por mes
+BoxCustomersOrdersPerMonth=Órdenes de venta por mes
+BoxSuppliersOrdersPerMonth=Ordenes de Proveedor por mes
+NoTooLowStockProducts=Ningún producto está por debajo del límite inferior de stock
+BoxProductDistribution=Distribución de Productos/Servicios
+BoxTitleLastModifiedSupplierBills=Facturas de proveedor: últimas %s modificadas
+BoxTitleLatestModifiedSupplierOrders=Órdenes de proveedor: últimos %s modificados
+BoxTitleLastModifiedCustomerBills=Facturas de cliente: últimas %s modificadas
+BoxTitleLastModifiedCustomerOrders=Órdenes de venta: últimas %s modificadas
+ForCustomersInvoices=Facturas de clientes
+ForCustomersOrders=Órdenes de Clientes
+LastXMonthRolling=Los últimos %s meses consecutivo s
+ChooseBoxToAdd=Agregar widget a su dashboard
+BoxAdded=El widget fue agregado a su tablero
+BoxLastManualEntries=Últimas entradas contables
+NoRecordedManualEntries=No hay registros contables manuales
+BoxSuspenseAccount=Operación de cuenta contable con cuenta temporal
+BoxTitleSuspenseAccount=Número de líneas no sin asignar
+NumberOfLinesInSuspenseAccount=Número de línea en cuenta temporal
+SuspenseAccountNotDefined=No se ha definido Cuenta temporal
+BoxLastCustomerShipments=Últimos envíos de clientes
+BoxTitleLastCustomerShipments=Últimos %s envíos de clientes
+NoRecordedShipments=No se ha registrado el envío del cliente
diff --git a/htdocs/langs/es_AR/cashdesk.lang b/htdocs/langs/es_AR/cashdesk.lang
new file mode 100644
index 00000000000..b57a3cfc4d9
--- /dev/null
+++ b/htdocs/langs/es_AR/cashdesk.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+CashDeskMenu=Punto de venta
+CashDesk=Punto de venta
+CashdeskShowServices=Servicios de Venta
+History=Historial
diff --git a/htdocs/langs/es_AR/categories.lang b/htdocs/langs/es_AR/categories.lang
new file mode 100644
index 00000000000..a3fec9ee376
--- /dev/null
+++ b/htdocs/langs/es_AR/categories.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - categories
+ExtraFieldsCategories=Atributos complementarios
diff --git a/htdocs/langs/es_AR/commercial.lang b/htdocs/langs/es_AR/commercial.lang
new file mode 100644
index 00000000000..d85913580a1
--- /dev/null
+++ b/htdocs/langs/es_AR/commercial.lang
@@ -0,0 +1,65 @@
+# Dolibarr language file - Source file is en_US - commercial
+Commercial=Comercio
+CommercialArea=Área de Comercio
+Prospects=Clientes Potenciales
+AddAnAction=Crea un evento
+AddActionRendezVous=Crear una reunión
+ConfirmDeleteAction=¿Estás seguro que quieres eliminar este evento?
+CardAction=Ficha del evento
+ActionOnCompany=Compañía vinculada
+TaskRDVWith=Reunión con %s
+ShowTask=Mostrar tarea
+ShowAction=Mostrar evento
+ThirdPartiesOfSaleRepresentative=Terceros con vendedor.
+SaleRepresentativesOfThirdParty=Vendedores del tercero
+SalesRepresentative=Vendedor
+SalesRepresentatives=Vendedores
+SalesRepresentativeFollowUp=Vendedor (seguimiento)
+SalesRepresentativeSignature=Vendedor (firmante)
+NoSalesRepresentativeAffected=No hay asignado ningún vendedor
+ShowCustomer=Mostrar cliente
+ShowProspect=Mostrar cliente potencia
+ListOfProspects=Lista de clientes potenciales
+ListOfCustomers=Lista de clientes
+LastDoneTasks=Últimas %s acciones completas
+LastActionsToDo=%s Acciones más antiguas incompletas
+DoneAndToDoActions=Eventos completados y por hacer
+DoneActions=Eventos completados
+ToDoActions=Eventos incompletos
+SendPropalRef=Envío de presupuesto %s
+SendOrderRef=Envío de orden %s
+StatusNotApplicable=No aplicables
+StatusActionToDo=Para hacer
+StatusActionDone=Completo
+StatusActionInProcess=En proceso
+TasksHistoryForThisContact=Eventos para este contacto
+LastProspectNeverContacted=Nunca contactado
+LastProspectToContact=Contactar
+LastProspectContactDone=Contacto realizado
+ActionDoneBy=Evento realizado por
+ActionAC_FAX=Enviar fax
+ActionAC_PROP=Enviar presupuesto por correo
+ActionAC_EMAIL=Enviar correo
+ActionAC_EMAIL_IN=Recepción de correo
+ActionAC_RDV=Reuniones
+ActionAC_INT=Intervención en el sitio
+ActionAC_FAC=Enviar factura de cliente por correo
+ActionAC_REL=Enviar factura de cliente por correo (recordatorio)
+ActionAC_CLO=Cerrar
+ActionAC_EMAILING=Enviar correo masivo
+ActionAC_COM=Enviar órden de venta por correo
+ActionAC_SHIP=Enviar información de envío por correo
+ActionAC_SUP_ORD=Enviar orden de compra por correo
+ActionAC_SUP_INV=Enviar factura de proveedor por correo
+ActionAC_OTH=Otro
+ActionAC_OTH_AUTO=Eventos insertados automáticamente
+ActionAC_MANUAL=Eventos insertados manualmente
+ActionAC_AUTO=Eventos insertados automáticamente
+ActionAC_OTH_AUTOShort=Automático
+Stats=Estadísticas de ventas
+StatusProsp=Estado del cliente potencial
+DraftPropals=Presupuestos en borrador
+ToOfferALinkForOnlineSignature=Vínculo para firma digital
+ThisScreenAllowsYouToSignDocFrom=Esta pantalla te permitirá aceptar, firmar o rechazar un presupuesto
+SignatureProposalRef=Firma del presupuesto %s
+FeatureOnlineSignDisabled=La funcionalidad para la firma digital está deshabilitada o el documento fue generado antes de habilitar la función
diff --git a/htdocs/langs/es_AR/companies.lang b/htdocs/langs/es_AR/companies.lang
new file mode 100644
index 00000000000..4c5dc7d6e1a
--- /dev/null
+++ b/htdocs/langs/es_AR/companies.lang
@@ -0,0 +1,275 @@
+# Dolibarr language file - Source file is en_US - companies
+ErrorCompanyNameAlreadyExists=El nombre de compañía %s ya existe. Elija otro diferente.
+ErrorSetACountryFirst=Establecer primero el país
+ConfirmDeleteCompany=¿Estás seguro que quieres eliminar esta empresa y toda su información vinculada?
+DeleteContact=Eliminar un contacto/dirección
+ConfirmDeleteContact=¿Estás seguro que quieres eliminar este contacto y toda su información vinculada?
+MenuNewThirdParty=Nuevo Tercero
+MenuNewCustomer=Nuevo Cliente
+MenuNewProspect=Nuevo Cliente Potencial
+MenuNewSupplier=Nuevo Proveedor
+MenuNewPrivateIndividual=Nuevo contacto particular
+NewCompany=Nueva compañía (posible cliente, cliente, proveedor)
+NewThirdParty=Nuevo Tercero (posible cliente, cliente, proveedor)
+CreateThirdPartyOnly=Crear Tercero
+CreateThirdPartyAndContact=Crear tercero + Contacto
+ProspectionArea=Área de clientes
+IdThirdParty=ID Tercero
+IdCompany=ID Compañía
+IdContact=ID Contacto
+Contacts=Contactos/Direcciones
+ThirdPartyContacts=Contactos del Tercero
+ThirdPartyContact=Cntactos/Direcciones del Tercero
+Company=Compañía
+CompanyName=Nombre de la compañía
+AliasNames=Alias (comercial, marca registrada, ...)
+AliasNameShort=Alias
+Companies=Compañías
+CountryIsInEEC=El país está dentro de la Comunidad Europea
+PriceFormatInCurrentLanguage=Formato de visualización de precios en el idioma y moneda actuales
+ThirdPartyEmail=E-mail del tercero
+ThirdPartyProspects=Clientes Potenciales
+ThirdPartyProspectsStats=Clientes Potenciales
+ThirdPartyCustomersWithIdProf12=Clientes con %s o %s
+ThirdPartyType=Tipo de Tercero
+Individual=Contacto particular
+ToCreateContactWithSameName=Creará automáticamente un contacto/dirección con la misma información que el subordinado del tercero. En la mayoría de los casos, incluso si su tercero es una persona física, basta con crear un tercero.
+ParentCompany=Empresa padre
+Subsidiaries=Subsidiarias
+CivilityCode=Código civil
+RegisteredOffice=Oficina registrada
+Lastname=Apellido
+UserTitle=Título
+Address=Drección
+State=Estado/Provincia
+StateCode=Código postal del Estado/Provincia
+CountryCode=Código de País
+CountryId=ID de País
+Chat=Chate
+PhonePro=Teléfono profesional
+PhonePerso=Teléfono Persona
+PhoneMobile=Celular
+No_Email=Rechazar correos masivos
+Town=Ciudad
+Poste=Posición
+DefaultLang=Lenguaje por defect
+VATIsUsed=Aplica IVA
+VATIsUsedWhenSelling=Define si el tercero incluye impuesto de ventas o no cuando hace una factura a sus clientes
+VATIsNotUsed=No aplica IVA
+CopyAddressFromSoc=Copiar dirección de detalles del tercero
+ThirdpartyNotCustomerNotSupplierSoNoRef=Tercero, ni cliente ni vendedor, no hay objetos de referencia disponibles
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Tercero, ni cliente ni vendedor, los descuentos no están disponibles.
+PaymentBankAccount=Cuenta bancaria para pagos
+OverAllOrders=Órdenes
+OverAllSupplierProposals=Solicitudes de precio
+LocalTax1IsUsed=Usar segundo impuesto
+LocalTax1IsUsedES=Aplica Impuesto a las Ganancias
+LocalTax1IsNotUsedES=No aplica Impuesto a las Ganancias
+LocalTax2IsUsed=Utilizar el tercer impuesto
+LocalTax2IsUsedES=Aplica IRPF
+LocalTax2IsNotUsedES=No aplica IRPF
+WrongCustomerCode=Código inválido de cliente
+WrongSupplierCode=Código inválido de proveedor
+CustomerCodeModel=Modelo de código de cliente
+SupplierCodeModel=Modelo de código de proveedor
+ProfId1Short=ID Prof. 1
+ProfId2Short=ID Prof. 2
+ProfId3Short=ID Prof. 3
+ProfId4Short=ID Prof. 4
+ProfId5Short=ID Prof. 5
+ProfId6Short=ID Prof. 6
+ProfId1=ID Profesional 1
+ProfId2=ID Profesional 2
+ProfId3=ID Profesional 3
+ProfId4=ID Profesional 4
+ProfId5=ID Profesional 5
+ProfId6=ID Profesional 6
+ProfId2AR=IIBB
+ProfId1AT=ID Prof 1 (USt.-IdNr)
+ProfId2AT=ID Prof 2 (Ust.-Nr)
+ProfId3AT=ID Prof 3 (Handelsregister-Nr.)
+ProfId1AU=ID Prof 1 (ABN)
+ProfId1BE=ID Prof 1 (Número profesional)
+ProfId2BR=IE (Inscripción Estatal)
+ProfId3BR=IM (Inscripción Municipal)
+ProfId3CH=ID Prof 1 (Número federal)
+ProfId4CH=ID Prof 2 (Número de registro comercial)
+ProfId1CL=ID Prof 1 (RUT)
+ProfId1CO=ID Prof 1 (RUT)
+ProfId1DE=ID Prof 1 (USt.-IdNr)
+ProfId2DE=ID Prof 2 (Ust.-Nr)
+ProfId3DE=ID Prof 3 (Handelsregister-Nr.)
+ProfId1ES=ID Prof 1 (CIF/NIF)
+ProfId2ES=ID Prof 2 (Número del seguro social)
+ProfId3ES=ID prof 3 (CNAE)
+ProfId4ES=ID Prof 4 (Número colegiado)
+ProfId1FR=ID Prof 1 (SIREN)
+ProfId2FR=ID Prof 2 (SIRET)
+ProfId3FR=ID Prof 3 (NAF, old APE)
+ProfId4FR=ID Prof 4 (RCS/RM)
+ProfId1GB=Número de registro
+ProfId1HN=ID Prof 1 (RTN)
+ProfId1IN=ID Prof 1 (TIN)
+ProfId2IN=ID Prof 2 (PAN)
+ProfId3IN=ID Prof 3 (SRVC TAX)
+ProfId4IN=ID Prof 4
+ProfId5IN=ID Prof 5
+ProfId1LU=ID Prof 1 (RCS Luxemburgo)
+ProfId2LU=ID Prof 2 (permiso de comercio)
+ProfId1MA=ID Prof 1 (RC)
+ProfId2MA=ID Prof 2 (Patente)
+ProfId3MA=ID Prof 3 (IF)
+ProfId4MA=ID Prof 4 (CNSS)
+ProfId5MA=ID Prof 5 (ICE)
+ProfId1MX=ID Prof 1 (RFC)
+ProfId2MX=ID Prof 2 (RP IMSS)
+ProfId3MX=ID Prof 3 (Charter Profesional)
+ProfId4NL=BSN
+ProfId1PT=ID Prof 1 (NIPC)
+ProfId2PT=ID Prof 2 (Número del seguro social)
+ProfId3PT=ID Prof 3 (Número de registro comercial)
+ProfId4PT=ID Prof 4 (Conservatorio)
+ProfId1TN=ID Prof 1 (RC)
+ProfId2TN=ID Prof 2 (matrícula fiscal)
+ProfId3TN=ID Prof 3 (código Douane)
+ProfId4TN=ID Prof 4 (BAN)
+ProfId1US=ID Prof (FEIN)
+ProfId1RO=ID Prof 1 (CUI)
+ProfId2RO=ID Prof 2 (NI)
+ProfId3RO=ID Prof 3 (CAEN)
+ProfId5RO=ID Prof 5 (EUID)
+ProfId1RU=ID Prof 1 (OGRN)
+ProfId2RU=ID Prof 2 (INN)
+ProfId3RU=ID Prof 3 (KPP)
+ProfId4RU=ID Prof 4 (OKPO)
+ProfId2DZ=Artículo
+VATIntra=ID IVA
+VATIntraShort=ID IVA
+VATIntraSyntaxIsValid=La sintaxis es correcta
+VATReturn=Devolución de IVA
+ProspectCustomer=Cliente Potencial / Cliente
+CustomerCard=Ficha de Cliente
+CustomerRelativeDiscount=Descuento por cliente
+SupplierRelativeDiscount=Descuento por proveedor
+CustomerAbsoluteDiscountShort=Descuento absoluto
+CompanyHasRelativeDiscount=Este cliente tiene un descuento predeterminado de <b>%s%%</b>
+CompanyHasNoRelativeDiscount=Este cliente no tiene un descuento relativo predeterminado
+HasRelativeDiscountFromSupplier=Tienes un descuento predeterminado de <b>%s%%</b> de este proveedor
+HasNoRelativeDiscountFromSupplier=No tienes un descuento relativo predeterminado de este proveedor.
+CompanyHasAbsoluteDiscount=Este cliente tiene descuentos disponibles (notas de crédito o anticipos) para <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Este cliente tiene descuentos disponibles (comerciales, anticipos) para <b>%s</b> %s
+CompanyHasCreditNote=Este cliente todavía tiene notas de crédito para <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=No tienes crédito de descuento disponible con este proveedor
+HasAbsoluteDiscountFromSupplier=Tienes descuentos disponibles (notas de crédito o anticipos) para <b>%s</b> %s de este proveedor
+HasDownPaymentOrCommercialDiscountFromSupplier=Tienes descuentos disponibles (comerciales, anticipos) para <b>%s</b> %s de este proveedor
+HasCreditNoteFromSupplier=Tienes notas de crédito para <b>%s</b> %s de este proveedor
+CompanyHasNoAbsoluteDiscount=Este cliente no tiene crédito de descuento disponible
+CustomerAbsoluteDiscountAllUsers=Descuentos absolutos para clientes (otorgados por todos los usuarios)
+CustomerAbsoluteDiscountMy=Descuentos absolutos para clientes (otorgados por usted)
+SupplierAbsoluteDiscountAllUsers=Descuentos absolutos de proveedor (ingresados por todos los usuarios)
+SupplierAbsoluteDiscountMy=Descuentos absolutos de proveedor (ingresados por usted)
+DiscountNone=Ninguno
+ContactId=ID de Contacto
+NoContactDefinedForThirdParty=No hay contactos definido para este tercero
+NoContactDefined=Ningún contactos definidos
+DefaultContact=Contacto/dirección predeterminados
+ContactByDefaultFor=Contacto/dirección predeterminados para
+AddThirdParty=Crear Tercero
+CustomerCode=Código de cliente
+SupplierCode=Código de proveedor
+CustomerCodeShort=Código de cliente
+SupplierCodeShort=Código de proveedor
+CustomerCodeDesc=Código de cliente, único para cada cliente
+SupplierCodeDesc=Código de proveedor, único para cada proveedor
+RequiredIfCustomer=Es requerido si el tercero es un cliente o cliente potencial
+RequiredIfSupplier=Es requerido si el tercero es un proveedor
+ValidityControledByModule=Validez controlada por el módulo
+ThisIsModuleRules=Reglas para este módulo
+CompanyDeleted=Empresa "%s" eliminada de la base de datos
+ListOfContacts=Lista de contactos/direcciones
+ListOfContactsAddresses=Lista de contactos/direcciones
+ListOfThirdParties=Lista de terceros
+ContactType=Tipo de Contacto
+ContactForOrders=Contacto de la orden
+ContactForOrdersOrShipments=Contacto de la orden o su envío
+ContactForProposals=Contacto del presupuesto
+ContactForContracts=Contacto del contrato
+ContactForInvoices=Contacto de facturación
+NoContactForAnyOrder=Este contacto no es un contacto para ninguna orden.
+NoContactForAnyOrderOrShipments=Este contacto no es un contacto para ninguna orden o envío
+NoContactForAnyProposal=Este contacto no es un contacto por un presupuesto
+NoContactForAnyContract=Este contacto no es un contacto por un contrato
+NoContactForAnyInvoice=Este contacto no es un contacto por una factura
+NewContactAddress=Nuevo contacto/dirección
+EditCompany=Editar empresa
+ThisUserIsNot=Este usuario no es un cliente, cliente potencial o proveedor.
+VATIntraCheck=Cheque
+VATIntraCheckDesc=El ID de IVA debe incluir el prefijo del país. El enlace <b>%s</b> utiliza el servicio de verificación de IVA europeo (VIES) que requiere acceso a Internet desde Dolibarr.
+VATIntraCheckableOnEUSite=Consulte el ID de IVA intracomunitario en el sitio web de la Comisión Europea
+VATIntraManualCheck=También puedes consultar manualmente en el sitio web de la Comisión Europea <a href="%s" target="_blank">%s</a>
+ErrorVATCheckMS_UNAVAILABLE=No es posible comprobar. El servicio de verificación no lo proporciona el estado del miembro (%s).
+NorProspectNorCustomer=Ni cliente ni cliente potencial
+JuridicalStatus=Tipo de entidad legal
+ProspectLevel=Cliente potencia
+OthersNotLinkedToThirdParty=Otros, no vinculados a un tercero
+ProspectStatus=Estado del cliente potencial
+PL_NONE=Ninguna
+TE_GROUP=Empresa grande
+TE_MEDIUM=PyME
+TE_ADMIN=Pública
+TE_SMALL=Pequeña empresa
+ChangeDoNotContact=Marcar como 'No contactar'
+ChangeNeverContacted=Marcar como 'Nunca contactado'
+ChangeToContact=Marcar como 'A contactar'
+ChangeContactInProcess=Marcar como 'Contacto en curso'
+ChangeContactDone=Marcar como 'Contacto realizado'
+ContactNotLinkedToCompany=Contacto no vinculado a ningún tercero
+DolibarrLogin=Usuario Dlibarr
+NoDolibarrAccess=Sin acceso a Dolibarr
+ExportDataset_company_1=Terceros (empresas/fundaciones/personas físicas) y sus propiedades.
+ImportDataset_company_1=Terceros y sus propiedades
+ImportDataset_company_2=Contactos/direcciones adicionales de terceros y atributos
+ImportDataset_company_4=Vendedores de terceros (asignar vendedores/usuarios a empresas)
+PriceLevel=Nivel de precio
+PriceLevelLabels=Etiquetas de nivel de precio
+DeliveryAddress=Dirección de entrega
+DeleteFile=Eliminar archivo
+ConfirmDeleteFile=¿Estás seguro que quieres eliminar este archivo?
+AllocateCommercial=Asignado al vendedor
+Organization=Organización
+FiscalYearInformation=Año fiscal
+FiscalMonthStart=Mes de inicio del año fiscal
+SocialNetworksFacebookURL=Facebook
+SocialNetworksTwitterURL=Twitter
+SocialNetworksLinkedinURL=Linkedin
+SocialNetworksInstagramURL=Instagram
+SocialNetworksYoutubeURL=Youtube
+SocialNetworksGithubURL=GitHub
+YouMustAssignUserMailFirst=Debes crear un correo para este usuario antes de poder agregar una notificación por correo.
+YouMustCreateContactFirst=Para poder agregar notificaciones por correo, primero debes definir contactos con correos válidos para el tercero
+ListSuppliersShort=Lista de proveedores
+ListProspectsShort=Lista de Clientes Potenciales
+ListCustomersShort=Lista de clientes
+ThirdPartiesArea=Terceros/Contactos
+LastModifiedThirdParties=Últimos%s terceros modificados
+UniqueThirdParties=Total de terceros
+InActivity=Abierto
+ThirdPartyIsClosed=El tercero está cerrado.
+CurrentOutstandingBill=Factura pendiente actual
+OutstandingBill=Max. por factura pendiente
+OutstandingBillReached=Max. alcanzado por factura pendiente
+OrderMinAmount=Monto mínimo por orden
+MonkeyNumRefModelDesc=Devuelve un número con el formato %syymm-nnnn para el código del cliente y %syymm-nnnn para el código del proveedor donde yy es el año, mm es el mes y nnnn es una secuencia sin interrupción ni retorno a 0.
+LeopardNumRefModelDesc=El código es gratis. Este código puede modificarse en cualquier momento.
+ManagingDirectors=Nombre(s) del gerente (CEO, director, presidente...)
+MergeOriginThirdparty=Duplicar el tercero (tercero que quieres eliminar)
+ConfirmMergeThirdparties=¿Estás seguro que quieres fusionar este tercero con el actual? Todos los objetos vinculados (facturas, pedidos, ...) se moverán al tercero actual, luego se eliminará el tercero seleccionado.
+ThirdpartiesMergeSuccess=Los terceros se han fusionado
+SaleRepresentativeLogin=Usuario del vendedor
+SaleRepresentativeFirstname=Nombre del vendedor
+SaleRepresentativeLastname=Apellido del vendedor
+ErrorThirdpartiesMerge=Se produjo un error al eliminar los terceros. Por favor revisa el registro. Los cambios se han reversado.
+NewCustomerSupplierCodeProposed=Código de cliente o proveedor ya utilizado, se ha sugerido un nuevo código
+PaymentTypeBoth=Tipo de pago - cliente y proveedor
+MulticurrencyUsed=Usar diferentes monedas
+MulticurrencyCurrency=Moneda
diff --git a/htdocs/langs/es_AR/compta.lang b/htdocs/langs/es_AR/compta.lang
new file mode 100644
index 00000000000..787596fa042
--- /dev/null
+++ b/htdocs/langs/es_AR/compta.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - compta
+Param=Preparar
+ByThirdParties=Por terceros
+CodeNotDef=Sin definir
+LinkedOrder=Enlazar a orden
diff --git a/htdocs/langs/es_AR/contracts.lang b/htdocs/langs/es_AR/contracts.lang
new file mode 100644
index 00000000000..78228bc46c5
--- /dev/null
+++ b/htdocs/langs/es_AR/contracts.lang
@@ -0,0 +1,77 @@
+# Dolibarr language file - Source file is en_US - contracts
+ContractsArea=Area de Contratos
+ListOfContracts=Lista de contratos
+ContractCard=Ficha del contrato
+ContractStatusNotRunning=Inactivos
+ServiceStatusInitial=Inactivos
+ServiceStatusRunning=Activos
+ServiceStatusNotLate=Activos, no vencidos
+ServiceStatusNotLateShort=No vencidos
+ServiceStatusLate=Activos, vencidos
+ServiceStatusLateShort=Vencidos
+ShowContractOfService=Mostrar contrato de servicio
+Contracts=Los contratos
+ContractsSubscriptions=Contratos/suscripciones
+ContractsAndLine=Contratos y línea de contratos
+MenuExpiredServices=Servicios vencidos
+MenuClosedServices=Servicios finalizados
+DeleteAContract=Eliminar contrato
+CloseAContract=Cerrar contrato
+ConfirmDeleteAContract=¿Estás seguro que quieres eliminar este contrato y todos sus servicios?
+ConfirmValidateContract=¿Estás seguro que quieres validar este contrato bajo el nombre <b>%s</b>?
+ConfirmActivateAllOnContract=Esto activará todos los servicios (aún no activos). ¿Estás seguro que quieres activar todos los servicios?
+ConfirmCloseContract=Esto cerrará todos los servicios (activos o no). ¿Estás seguro que quieres cerrar este contrato?
+ConfirmCloseService=¿Estás seguro que quieres cerrar este servicio con fecha <b>%s</b>?
+ValidateAContract=Validar contrato
+ActivateService=Activar servicio
+ConfirmActivateService=¿Estás seguro que quieres activar este servicio con fecha <b>%s</b>?
+RefContract=Referencia de contrato
+DateContract=Fecha de contrato
+DateServiceActivate=Fecha de activación del servicio
+ListOfServices=Lista de servicios
+ListOfInactiveServices=Lista de servicios inactivos
+ListOfExpiredServices=Lista de servicios activos vencidos
+ListOfClosedServices=Lista de servicios cerrados
+ListOfRunningServices=Lista de servicios activos
+NotActivatedServices=Servicios inactivos (entre contratos validados)
+BoardNotActivatedServices=Servicios para activar entre contratos validados
+BoardNotActivatedServicesShort=Servicios para activar
+LastContracts=Ultimos %s contratos
+LastModifiedServices=Ultimos %s servicios modificados
+ContractStartDate=Fecha de inicio
+ContractEndDate=Fecha de fin
+DateStartPlanned=Fecha planificada de inicio
+DateStartPlannedShort=Fecha planificada de inicio
+DateEndPlanned=Fecha planificada de fin
+DateEndPlannedShort=Fecha planificada de fin
+DateStartReal=Fecha real de inicio
+DateStartRealShort=Fecha real de inicio
+DateEndReal=Fecha real de fin
+DateEndRealShort=Fecha real de fin
+CloseService=Servicio cerrado
+BoardExpiredServices=Servicios vencidos
+BoardExpiredServicesShort=Servicios vencidos
+DraftContracts=Borradores de contratos
+CloseRefusedBecauseOneServiceActive=El contrato no puede cerrarse mientras alguno de sus servicios esté activo
+CloseAllContracts=Cerrar todas las líneas del contrato
+DeleteContractLine=Eliminar una línea del contrato
+ConfirmDeleteContractLine=¿Estás seguro que quieres eliminar esta línea del contrato?
+MoveToAnotherContract=Mover servicio a otro contrato.
+ConfirmMoveToAnotherContract=He seleccionado un nuevo contrato destino y confirmo que quiero mover este servicio a ese contrato.
+ConfirmMoveToAnotherContractQuestion=¿Desea elegir a qué contrato existente (del mismo tercero) quiere mover este servicio?
+PaymentRenewContractId=Renovar línea de contrato (número %s)
+ExpiredSince=Fecha de vencimiento
+NoExpiredServices=No hay servicios activos vencidos
+ListOfServicesToExpireWithDuration=Lista de servicios que vencen en %s días
+ListOfServicesToExpireWithDurationNeg=Lista de servicios vencidos hace más de %s días
+ListOfServicesToExpire=Lista de servicios a vencer
+NoteListOfYourExpiredServices=Esta lista contiene sólo los servicios de contratos de terceros que tienes relacionados como representante de ventas.
+StandardContractsTemplate=Template estándar de contratos
+OnlyLinesWithTypeServiceAreUsed=Sólo serán clonadas las líneas de tipo "Servicio".
+ConfirmCloneContract=¿Estás seguro que quieres clonar el contrato <b>%s</b>?
+LowerDateEndPlannedShort=Fecha más temprana planificada de finalización de los servicios activos
+TypeContact_contrat_internal_SALESREPSIGN=Representante de ventas firmante del contrato
+TypeContact_contrat_internal_SALESREPFOLL=Representante de ventas encargado del seguimiento del contrato
+TypeContact_contrat_external_BILLING=Contacto de facturación del cliente
+TypeContact_contrat_external_CUSTOMER=Contacto de seguimiento del cliente
+TypeContact_contrat_external_SALESREPSIGN=Contacto del cliente firmante del contrato
diff --git a/htdocs/langs/es_AR/cron.lang b/htdocs/langs/es_AR/cron.lang
new file mode 100644
index 00000000000..f3f72b8cb2f
--- /dev/null
+++ b/htdocs/langs/es_AR/cron.lang
@@ -0,0 +1,58 @@
+# Dolibarr language file - Source file is en_US - cron
+Permission23101 =Leer tarea programada
+Permission23102 =Crear/actualizar tarea programada
+Permission23103 =Eliminar tarea programada
+Permission23104 =Ejecutar tarea programada
+CronSetup=Configuración para administración de tareas programadas
+URLToLaunchCronJobs=URL para verificar y ejecutar tareas programadas calificadas
+OrToLaunchASpecificJob=O para verificar y ejecutar una tarea específica
+KeyForCronAccess=Clave de seguridad para la URL para ejecutar tareas programadas
+FileToLaunchCronJobs=Línea de comandos para verificar y ejecutar tareas programadas calificadas
+CronExplainHowToRunUnix=O el ambiente de Unix que deberías utilizar para una entrada programada para ejecutar el comando cada 5 minutos
+CronExplainHowToRunWin=En el ambiente de Microsoft(tm) Windows puedes usar las herramientas de Tareas programadas para ejecutar la línea de comandos cada 5 minutos
+CronJobDefDesc=Los perfiles de tareas programadas se definen en el archivo descriptor del módulo. Cuando el módulo está activo, se cargan y están disponibles para que puedas administrar las tareas desde el menú de herramientas de administración %s.
+CronJobProfiles=Lista de perfiles predefinidos de tareas planificadas
+CronLastOutput=Resultado de la última ejecución
+CronLastResult=Último código de resultado
+CronDelete=Eliminar tareas programadas
+CronConfirmDelete=¿Estás seguro de que quieres eliminar estas tareas programadas?
+CronConfirmExecute=¿Estás seguro que quieres ejecutar estas tareas programadas ahora mismo?
+CronInfo=El módulo de tareas programadas te permite programar tareas para que sean ejecutadas automáticamente. Las tareas también pueden ejecutarse manualmente.
+CronDtStart=No antes que
+CronDtEnd=No después que
+CronDtNextLaunch=Próxima ejecución
+CronDtLastLaunch=Fecha de inicio de última ejecución
+CronDtLastResult=Fecha de fin de última ejecución
+CronMethod=Método
+CronModule=Módulo
+CronNoJobs=No se han registrado tareas
+CronNbRun=Cantidad de ejecuciones
+CronMaxRun=Cantidad máxima de ejecuciones
+CronEach=Cada
+JobFinished=Tarea ejecutada y finalizada
+CronAdd=Agregar tareas
+CronEvery=Ejecutar tarea cada
+CronArgs=Parámetros
+CronNote=Comentar
+CronFieldMandatory=Los campos %s son obligatorios
+CronErrEndDateStartDt=La fecha de finalización no puede ser anterior a la fecha de inicio
+StatusAtInstall=Estado de la instalación del módulo
+CronStatusActiveBtn=Habilitar
+CronStatusInactiveBtn=Deshabilitar
+CronTaskInactive=Esta tarea está deshabilitada
+CronClassFile=Nombre de archivo y clase
+CronModuleHelp=Nombre del directorio del módulo Dolibarr (también funciona con el módulo externo Dolibarr). <BR> Por ejemplo, para llamar al objeto fetch del objeto Producto Dolibarr /htdocs/<u>product</u>/class/product.class.php, el valor para el módulo es <br><i>product</i>
+CronClassFileHelp=La ruta relativa y el nombre del archivo a cargar (la ruta es relativa al directorio raíz del servidor web). <BR> Por ejemplo para llamar al método de fetch del objeto Producto Dolibarr /htdocs/product/class/ <u> product.class.php</u>, el valor de nombre de archivo de clase es <br><i>product/class/product.class.php</i>
+CronObjectHelp=El nombre del objeto a cargar. <BR> Por ejemplo para llamar al método fetch del objeto Producto Dolibarr /htdocs/product/class/product.class.php, el valor para el nombre del archivo de la clase es <br><i>Product</i>
+CronMethodHelp=El objeto método a ejecutar. <BR> Por ejemplo para llamar al método fetch del objeto Producto Dolibarr /htdocs/product/class/product.class.php, el valor para el método es <br><i>fetch</i>
+CronArgsHelp=Los argumentos del método. <BR> Por ejemplo para llamar al método fetch del objeto Producto Dolibarr /htdocs/product/class/product.class.php, el valor para los parámetros puede ser <br><i>0, ProductRef</i>
+CronCommandHelp=La línea de comandos del sistema para ejecutar.
+CronCreateJob=Crear nueva Tarea Programadas
+CronType_method=Método de llamada de una clase PHP
+CronCannotLoadClass=No se puede cargar el archivo de clase %s (para usar la clase %s)
+CronCannotLoadObject=Se cargó el archivo de clase %s, pero el objeto %s no se encontró en él
+UseMenuModuleToolsToAddCronJobs=Vaya al menú "<a href="%s">Inicio - Herramientas administrativas - Tareas programadas</a>" para ver y editar tareas programadas.
+JobDisabled=Tarea deshabilitada
+MakeLocalDatabaseDumpShort=Resguardo local de la base de datos
+MakeLocalDatabaseDump=Crear un dump de la base de datos local. Los parámetros son: compresión ('gz' o 'bz' o 'ninguno'), tipo de copia de seguridad ('mysql', 'pgsql', 'auto'), 1, 'auto' o nombre de archivo para construir, número de archivos de copia de seguridad para mantener
+WarningCronDelayed=Atención, por motivos de rendimiento, sea cual sea la próxima fecha de ejecución de las tareas programadas, sus trabajos pueden demorarse hasta un máximo de %s horas, antes de ejecutarse.
diff --git a/htdocs/langs/es_AR/deliveries.lang b/htdocs/langs/es_AR/deliveries.lang
new file mode 100644
index 00000000000..e8e7afa810a
--- /dev/null
+++ b/htdocs/langs/es_AR/deliveries.lang
@@ -0,0 +1,23 @@
+# Dolibarr language file - Source file is en_US - deliveries
+Delivery=Entrega
+DeliveryRef=Ref. Entrega
+DeliveryCard=Ficha del comprobante
+DeliveryOrder=Comprobantede Entrega
+CreateDeliveryOrder=Generar comprobante de entrega
+SetDeliveryDate=Establecer fecha de envío
+ValidateDeliveryReceipt=Validar comprobante de entrega
+ValidateDeliveryReceiptConfirm=¿Estás seguro que quieres validar este comprobante de entrega?
+DeleteDeliveryReceipt=Eliminar comprobante de entrega
+DeleteDeliveryReceiptConfirm=¿Estás seguro de que quieres eliminar el comprobante de entrega <b>%s</b>?
+DeliveryMethod=Método de entrega
+TrackingNumber=Código de seguimiento
+DeliveryNotValidated=Entrega no validada
+StatusDeliveryCanceled=Cancelado
+NameAndSignature=Nombre y firma:
+ToAndDate=Para___________________________________ en ____ / _____ / __________
+GoodStatusDeclaration=He recibido los productos mencionados en buenas condiciones,
+Deliverer=Entregó:
+Sender=Emisor
+NonShippable=No se puede enviar
+ShowReceiving=Mostrar comprobante de entrega
+NonExistentOrder=Orden inexistente
diff --git a/htdocs/langs/es_AR/dict.lang b/htdocs/langs/es_AR/dict.lang
new file mode 100644
index 00000000000..4496170bfd1
--- /dev/null
+++ b/htdocs/langs/es_AR/dict.lang
@@ -0,0 +1,87 @@
+# Dolibarr language file - Source file is en_US - dict
+CountryNL=Holanda
+CountryAZ=Ayerbazán
+CountryBH=Bahrein
+CountryBM=Islas Bermudas
+CountryBW=Boswana
+CountryCX=Isla de Navidad
+CountryCC=Islas de Cocos (Keeling)
+CountryCZ=Republica checa
+CountryFO=Islas Faroe
+CountryFJ=Islas Fiyi
+CountryGF=Guayana Francesa
+CountryTF=Territorios Franceses del Sur
+CountryGY=Guayana
+CountryHM=Heard Island y McDonald
+CountryVA=Santa Sede (Estado de la Ciudad del Vaticano)
+CountryIQ=Irak
+CountryJO=Jordán
+CountryKG=Kirguistán
+CountryMK=Macedonia, la ex Yugoslava de
+CountryMX=México
+CountryPS=Territorio Palestino Ocupado
+CountryPG=Papúa-Nueva Guinea
+CountrySH=Santa Helena
+CountryVC=San Vicente y Granadinas
+CountrySO=Somalía
+CountryZA=Sudáfrica
+CountryGS=Islas Georgia y Sándwich del Sur
+CountrySJ=Svalbard y Jan Mayen
+CountrySZ=Swazilandia
+CountryUM=Islas Ultramarinas Menores de Estados Unidos
+CountryVI=Islas Vírgenes, EEUU
+CountryEH=Sahara Occidental
+CountryIM=Isla del hombre
+CountryBL=San Bartolomé
+CountryMF=San Martín
+CivilityMME=Sra.
+CivilityMR=Sr.
+CivilityMLE=Srita.
+CivilityMTRE=Mr.
+CivilityDR=Doc.
+CurrencyAUD=Dólares Australianos
+CurrencySingAUD=Dólar Australiano
+CurrencyCAD=Dólares Canadienses
+CurrencySingCAD=Dólar Canadiense
+CurrencyINR=Rupias
+CurrencySingINR=Rupia
+CurrencyMGA=Ariarys
+CurrencyMUR=Rupias de Mauricio
+CurrencySingMUR=Rupia de Mauricio
+CurrencySingNOK=Corona noruega
+CurrencyUSD=Dólares estadounidenses
+CurrencySingUSD=Dólar estadounidense
+CurrencyUAH=Jrivnia
+CurrencySingUAH=Jrivnia
+CurrencySingXOF=Franc CFA BCEAO
+CurrencyCentEUR=centavos
+CurrencyCentSingEUR=centavo
+DemandReasonTypeSRC_CAMP_MAIL=Campaña de Mailing
+DemandReasonTypeSRC_CAMP_EMAIL=Campaña de Mailing
+DemandReasonTypeSRC_CAMP_FAX=Campaña de fax
+DemandReasonTypeSRC_SHOP=Contacto de la tienda
+PaperFormatUSLETTER=Formato Carta EEUU
+PaperFormatUSLEGAL=Formato Legal EEUU
+PaperFormatUSEXECUTIVE=Formato Ejecutivo EEUU
+PaperFormatUSLEDGER=Formato de libro mayor/tabloide
+PaperFormatCAP1=Formato P1 Canadá
+PaperFormatCAP2=Formato P2 Canadá
+PaperFormatCAP3=Formato P3 Canadá
+PaperFormatCAP4=Formato P4 Canadá
+PaperFormatCAP5=Formato P5 Canadá
+PaperFormatCAP6=Formato P6 Canadá
+ExpAuto3PCV=3 CV y más
+ExpAuto4PCV=4 CV y más
+ExpAuto5PCV=5 CV y más
+ExpAuto6PCV=6 CV y más
+ExpAuto7PCV=7 CV y más
+ExpAuto8PCV=8 CV y más
+ExpAuto9PCV=9 CV y más
+ExpAuto10PCV=10 CV y más
+ExpAuto11PCV=11 CV y más
+ExpAuto12PCV=12 CV y más
+ExpAuto13PCV=13 CV y más
+ExpCyclo=Capacidad inferior a 50 cm3
+ExpMoto12CV=Moto 1 o 2 CV
+ExpMoto345CV=Moto 3, 4 o 5 CV
+ExpMoto5PCV=Moto 5 CV y más
diff --git a/htdocs/langs/es_AR/donations.lang b/htdocs/langs/es_AR/donations.lang
new file mode 100644
index 00000000000..49195ca8ece
--- /dev/null
+++ b/htdocs/langs/es_AR/donations.lang
@@ -0,0 +1,20 @@
+# Dolibarr language file - Source file is en_US - donations
+DonationRef=Ref. Donación
+ConfirmDeleteADonation=¿Estás seguro de que quieres eliminar esta donación?
+DonationStatusPromiseNotValidated=Compromiso en borrador
+DonationStatusPromiseValidated=Compromiso validad
+DonationStatusPaid=Donación recibida
+DonationStatusPromiseNotValidatedShort=Borrador
+DonationStatusPromiseValidatedShort=Validado
+DonationStatusPaidShort=Recibido
+DonationTitle=Comprobante de donación
+ValidPromess=Validar compromiso
+DonationReceipt=Comprobante de donación
+DonationsModels=Modelos de documentos para comprobantes de donación
+DonationRecipient=Destinatario de la donación
+IConfirmDonationReception=El destinatario declara haber recibido, como donación, el siguiente monto
+MinimumAmount=El monto mínimo es %s
+FreeTextOnDonations=Texto para mostrar en el pie de página
+DONATION_ART200=Si le interesa, puede ver el artículo 200 del CGI (Código General de Impuestos)
+DONATION_ART238=Si le interesa, puede ver el artículo 238 del CGI (Código General de Impuestos)
+DONATION_ART885=Si le interesa, puede ver el artículo 885 del CGI (Código General de Impuestos)
diff --git a/htdocs/langs/es_AR/ecm.lang b/htdocs/langs/es_AR/ecm.lang
new file mode 100644
index 00000000000..960a8ceef4d
--- /dev/null
+++ b/htdocs/langs/es_AR/ecm.lang
@@ -0,0 +1,50 @@
+# Dolibarr language file - Source file is en_US - ecm
+ECMNbOfDocs=Cantidad de documentos en la carpeta
+ECMSection=Carpeta
+ECMSectionManual=Carpeta manual
+ECMSectionAuto=Carpeta automática
+ECMSectionsManual=Arbol Manual
+ECMSectionsAuto=Arbol automático
+ECMSections=Carpetas
+ECMRoot=Raíz ACE
+ECMNewSection=Crear Carpeta
+ECMAddSection=Agregar Carpeta
+ECMCreationDate=Fecha de Creación
+ECMNbOfFilesInDir=Cantidad de archivos en la carpeta
+ECMNbOfSubDir=Cantidad de sub-carpetas
+ECMNbOfFilesInSubDir=Cantidad de archivos en sub-carpetas
+ECMArea=Area SAD/ACE
+ECMAreaDesc=El área de SAD/ACE (Sistema de Administración de Documentos / Administración de Contenido Electrónico) te permite guardar, compartir y rápidamente buscar todo tipo de documentos en Dolibarr.
+ECMAreaDesc2=* Las carpetas automáticas son llenadas automáticamente al agregar documentos desde la ficha de un elemento. <br> * Las carpetas manuales pueden ser usadas para guardar documentos no enlazados a un elemento en particular.
+ECMSectionWasRemoved=Carpeta <b>%s</b> ha sido eliminada.
+ECMSectionWasCreated=Carpeta <b>%s</b> ha sido creada.
+ECMSearchByKeywords=Búsqueda por palabras clave
+ECMSearchByEntity=Búsqueda por objeto
+ECMSectionOfDocuments=Carpetas de documentos
+ECMDocsBySocialContributions=Documentos vinculados a impuestos fiscales o sociales
+ECMDocsByThirdParties=Documentos vinculados a terceros
+ECMDocsByProposals=Documentos vinculados a propuestas
+ECMDocsByOrders=Documentos vinculados a órdenes de cliente
+ECMDocsByContracts=Documentos vinculados a contratos
+ECMDocsByInvoices=Documentos vinculados a facturas de cliente
+ECMDocsByProducts=Documentos vinculados a productos
+ECMDocsByProjects=Documentos vinculados a proyectos
+ECMDocsByUsers=Documentos vinculados a usuarios
+ECMDocsByInterventions=Documentos vinculados a intervenciones
+ECMDocsByExpenseReports=Documentos vinculados a reportes de gastos
+ECMDocsByHolidays=Documentos vinculados a vacaciones
+ECMDocsBySupplierProposals=Documentos vinculados a propuestas de proveedor
+ECMNoDirectoryYet=No hay carpetas creadas
+ShowECMSection=Mostrar carpeta
+DeleteSection=Eliminar carpeta
+ConfirmDeleteSection=¿Confirmas que quieres eliminar la carpeta <b>%s</b>?
+ECMDirectoryForFiles=Directorio correspondiente para archivos
+CannotRemoveDirectoryContainsFilesOrDirs=No se puede eliminar porque contiene algunos archivos o sub-carpetas
+CannotRemoveDirectoryContainsFiles=No se puede eliminar porque contiene algunos archivos
+ECMFileManager=Administrador de archivos
+ECMSelectASection=Seleccione una carpeta del árbol...
+DirNotSynchronizedSyncFirst=Esta carpeta parece haberse creado o modificado por fuera del módulo de ECM. Deberás primero presionar el botón Re-sincronizar para sincronizar el disco y la base de datos para obtener el contenido de esta carpeta
+ReSyncListOfDir=Re-sincronizar lista de carpetas
+HashOfFileContent=Hash del contenido del archivo
+NoDirectoriesFound=No se han encontrado carpetas
+FileNotYetIndexedInDatabase=El archivo no se ha indizado todavía en la base de datos (intenta volver a cargarlo)
diff --git a/htdocs/langs/es_AR/externalsite.lang b/htdocs/langs/es_AR/externalsite.lang
new file mode 100644
index 00000000000..b7942f1500e
--- /dev/null
+++ b/htdocs/langs/es_AR/externalsite.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExternalSiteSetup=Establezca un enlace al sitio web externo
+ExternalSiteModuleNotComplete=El módulo SitioExterno no fue configurado apropiadamente.
diff --git a/htdocs/langs/es_AR/ftp.lang b/htdocs/langs/es_AR/ftp.lang
new file mode 100644
index 00000000000..2ccb645c797
--- /dev/null
+++ b/htdocs/langs/es_AR/ftp.lang
@@ -0,0 +1,13 @@
+# Dolibarr language file - Source file is en_US - ftp
+FTPClientSetup=Configuración de módulo de cliente FTP
+NewFTPClient=Configuración de nueva conexión FTP
+FTPArea=Area FTP
+FTPAreaDesc=Esta pantalla muestra una vista de un servidor FTP.
+SetupOfFTPClientModuleNotComplete=La configuración del módulo de cliente FTP parece estar incompleta
+FTPFeatureNotSupportedByYourPHP=Tu versión de PHP no soporta funciones FTP
+FailedToConnectToFTPServer=Error al conectar al servidor FTP (servidor %s, puerto %s)
+FailedToConnectToFTPServerWithCredentials=Error al iniciar sesión en el servidor FTP con el usuario/contraseña definidos
+FTPFailedToRemoveFile=Error al remover archivo <b>%s</b>.
+FTPFailedToRemoveDir=Error al remover carpeta <b>%s</b>: revise los permisos y que la carpeta esté vacía.
+ChooseAFTPEntryIntoMenu=Elija un sitio FTP desde el menú...
+FailedToGetFile=Error al obtener archivos %s
diff --git a/htdocs/langs/es_AR/help.lang b/htdocs/langs/es_AR/help.lang
new file mode 100644
index 00000000000..2448fcf85b3
--- /dev/null
+++ b/htdocs/langs/es_AR/help.lang
@@ -0,0 +1,19 @@
+# Dolibarr language file - Source file is en_US - help
+CommunitySupport=Foro/Soporte Wiki
+EMailSupport=E-mail del soporte
+RemoteControlSupport=Soporte en línea en tiempo real / remoto
+OtherSupport=Otro soporte
+ToSeeListOfAvailableRessources=Para contactar / ver los recursos disponibles:
+HelpCenter=Centro de ayuda
+DolibarrHelpCenter=Ayuda de Dolibarr y Centro de Soporte
+ToGoBackToDolibarr=De otra forma, <a href="%s">haga click aquí para continuar utilizando Dolibarr</a>.
+TypeSupportCommunauty=Comunidad (gratuito)
+Efficiency=Eficiencia
+TypeHelpOnly=Sólo ayuda
+TypeHelpDev=Ayuda+Desarroll
+TypeHelpDevForm=Ayuda+Desarrollo+Capacitación
+BackToHelpCenter=De otra forma, <a href="%s">vuelva al Inicio del Centro de Ayuda</a>.
+LinkToGoldMember=Podés llamar a uno de los profesores seleccionados por Dolibarr en tu lenguaje (%s) haciendo click en su Widget (el estado y el precio máximo se actualizan automáticamente):
+PossibleLanguages=Lenguajes soportados
+SubscribeToFoundation=Contribuye al proyecto Dolibarr, suscríbete a la fundación
+SeeOfficalSupport=Para soporte oficial de Dolibarr en tu lenguaje: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/es_AR/holiday.lang b/htdocs/langs/es_AR/holiday.lang
new file mode 100644
index 00000000000..047d26e65d1
--- /dev/null
+++ b/htdocs/langs/es_AR/holiday.lang
@@ -0,0 +1,44 @@
+# Dolibarr language file - Source file is en_US - holiday
+HRM=ARH
+Holidays=Licencia
+CPTitreMenu=Licencia
+MenuAddCP=Nueva solicitud de licencia
+NotActiveModCP=Debe habilitar el módulo de Licencias para ver esta página.
+AddCP=Crear una solicitud de licencia
+DateDebCP=Fecha de inicio
+DateFinCP=Fecha de fin
+ToReviewCP=Esperando aprobación
+ApprovedCP=Aprobado
+CancelCP=Cancelado
+RefuseCP=Rechazado
+ValidatorCP=Aprobador
+ListeCP=Lista de licencias
+LeaveId=ID de Licencia
+ReviewedByCP=Será aprobada por
+UserForApprovalID=ID de usuario aprobador
+UserForApprovalFirstname=Nombre de aprobador
+UserForApprovalLastname=Apellido de aprobador
+UserForApprovalLogin=Usuario aprobador
+SendRequestCP=Crear solicitud de licencia
+DelayToRequestCP=Las solicitudes de licencias deben realizarse al menos <b>%s día(s)</b> antes.
+MenuConfCP=Saldo de licencia
+SoldeCPUser=El saldo de licencias es de <b>%s</b> días.
+ErrorEndDateCP=Debes seleccionar una fecha de finalización mayor que la fecha de inicio.
+ErrorSQLCreateCP=Se produjo un error de SQL durante la creación:
+ErrorIDFicheCP=Se ha producido un error, la solicitud de licencia no existe.
+ErrorUserViewCP=No tienes autorización para leer esta solicitud de licencia.
+InfosWorkflowCP=Flujo de la información
+RequestByCP=Solicitado por
+TitreRequestCP=Solicitud de licencia
+TypeOfLeaveId=ID de tipo de licencia
+TypeOfLeaveCode=Código de tipo de licencia
+TypeOfLeaveLabel=Etiqueta de tipo de licencia
+NbUseDaysCP=Número de días consumidos de vacaciones
+NbUseDaysCPShortInMonth=Días consumidos en el mes
+DateStartInMonth=Fecha de inicio en elmes
+DateEndInMonth=Fecha de finalización en el mes
+EditCP=Editar
+DeleteCP=Borrar
+ActionCancelCP=Cancelar
+TitleDeleteCP=Eliminar esta solicitud de licencia
+ConfirmDeleteCP=¿Confirmas la eliminación de esta solicitud de licencia?
diff --git a/htdocs/langs/es_AR/hrm.lang b/htdocs/langs/es_AR/hrm.lang
new file mode 100644
index 00000000000..d59d800d23a
--- /dev/null
+++ b/htdocs/langs/es_AR/hrm.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - hrm
+HRM_EMAIL_EXTERNAL_SERVICE=E-mail para evitar el servicio externo de gestión de RRHH
+ConfirmDeleteEstablishment=¿Está seguro que quiere eliminar este establecimiento?
+DictionaryPublicHolidays=Gestión de RRHH - Feriados
+DictionaryDepartment=Gestión de RRHH - Departamentos
+DictionaryFunction=Gestión de RRHH - Funciones
diff --git a/htdocs/langs/es_AR/install.lang b/htdocs/langs/es_AR/install.lang
new file mode 100644
index 00000000000..0b56734de7c
--- /dev/null
+++ b/htdocs/langs/es_AR/install.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - install
+InstallEasy=Simplemente siga las instrucciones paso a paso.
+MiscellaneousChecks=Verificación de prerequisitos
+ConfFileDoesNotExistsAndCouldNotBeCreated=¡El archivo de configuración <b>%s</b> no existe ni se pudo crear!
+ConfFileCouldBeCreated=Se ha creado el archivo de configuración <b>%s</b>.
diff --git a/htdocs/langs/es_AR/interventions.lang b/htdocs/langs/es_AR/interventions.lang
new file mode 100644
index 00000000000..9a42329ecd2
--- /dev/null
+++ b/htdocs/langs/es_AR/interventions.lang
@@ -0,0 +1,47 @@
+# Dolibarr language file - Source file is en_US - interventions
+InterventionCard=Ficha de la intervención
+NewIntervention=Nueva intervención
+ChangeIntoRepeatableIntervention=Cambiar a intervención iterativa
+ListOfInterventions=Lista de intervenciones
+ActionsOnFicheInter=Acciones en la intervención
+LastInterventions=Ultimas %s intervenciones
+InterventionContact=Contacto de la intervención
+DeleteInterventionLine=Eliminar línea de la intervención
+ConfirmDeleteIntervention=¿Estás seguro de que quieres eliminar esta intervención?
+ConfirmValidateIntervention=¿Estás seguro de que quieres validar esta intervención con el nombre <b> %s</b>?
+ConfirmModifyIntervention=¿Estás seguro de que quieres modificar esta intervención?
+ConfirmDeleteInterventionLine=¿Estás seguro de que quieres eliminar esta línea de la intervención?
+ConfirmCloneIntervention=¿Estás seguro de que quieres clonar esta intervención?
+NameAndSignatureOfInternalContact=Nombre y firma de la intervención:
+DocumentModelStandard=Modelo estándar de documento para intervenciones
+InterventionCardsAndInterventionLines=Intervenciones y sus líneas.
+InterventionClassifyBilled=Marcar como "Facturado"
+InterventionClassifyUnBilled=Marcar como "Sin facturar"
+InterventionClassifyDone=Marcar como "Listo"
+SendInterventionByMail=Enviar intervención por correo
+InterventionClassifiedBilledInDolibarr=Intervención %s marcada como facturada
+InterventionClassifiedUnbilledInDolibarr=Intervención %s marcada como sin facturar
+InterventionSentByEMail=Intervención %s enviada por correo
+InterventionsArea=Área de Intervenciones
+DraftFichinter=Intervenciones en borrador
+LastModifiedInterventions=Ultimas %s intervenciones modificadas
+TypeContact_fichinter_external_CUSTOMER=Contacto para seguimiento del cliente
+PrintProductsOnFichinter=Imprima también líneas de tipo "producto" (no solo servicios) en la ficha de la intervención
+PrintProductsOnFichinterDetails=intervenciones generadas a partir de órdenes
+UseServicesDurationOnFichinter=Usar la duración de los servicios para las intervenciones generadas a partir de órdenes.
+UseDurationOnFichinter=Oculta el campo de duración para los registros de intervención.
+UseDateWithoutHourOnFichinter=Oculta horas y minutos del campo de fecha para registros de intervención
+NbOfinterventions=Cantidad de fichas de intervención
+NumberOfInterventionsByMonth=Cantidad de fichas de intervención por mes (fecha de validación)
+AmountOfInteventionNotIncludedByDefault=El monto de la intervención no se incluye por defecto en las ganancias (en la mayoría de los casos, las hojas de tiempo se utilizan para contar el tiempo dedicado). Agregue la clave PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT con valor 1 en Inicio - Configuración - Otros, para incluirlos.
+InterId=ID de intervención
+InterRef=Ref. de Intervención
+InterDateCreation=Fecha de creación de la intervención
+InterDuration=Duración de la intervención
+InterStatus=Estado de la intervención
+InterNote=Nota de la intervención
+InterLine=Línea de la intervención
+InterLineId=ID de línea de la intervención
+InterLineDate=Fecha de línea de la intervención
+InterLineDuration=Duración de la línea de la intervención
+InterLineDesc=Descripción de la línea de la intervención
diff --git a/htdocs/langs/es_AR/languages.lang b/htdocs/langs/es_AR/languages.lang
new file mode 100644
index 00000000000..e0d14830649
--- /dev/null
+++ b/htdocs/langs/es_AR/languages.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - languages
+Language_ar_AR=Arabe
+Language_ar_EG=Arabe (Egipto)
+Language_ar_SA=Arabe
+Language_fi_FI=Finlandés
+Language_lv_LV=Letón
+Language_nl_BE=Holandés (Bélgica)
+Language_nl_NL=Holandés
+Language_uk_UA=Ucraniano
+Language_uz_UZ=Uzbeko
+Language_zh_TW=Chino (tradicional)
diff --git a/htdocs/langs/es_AR/ldap.lang b/htdocs/langs/es_AR/ldap.lang
new file mode 100644
index 00000000000..2f880d6434b
--- /dev/null
+++ b/htdocs/langs/es_AR/ldap.lang
@@ -0,0 +1,19 @@
+# Dolibarr language file - Source file is en_US - ldap
+YouMustChangePassNextLogon=La contraseña para el usuario <b>%s</b> en el dominio <b>%s</b> debe ser modificada.
+UserMustChangePassNextLogon=El usuario deberá cambiar la contraseña en el dominio %s
+LDAPInformationsForThisContact=Información en base LDAP para este contacto
+LDAPInformationsForThisUser=Información en base LDAP para este usuario
+LDAPInformationsForThisGroup=Información en base LDAP para este grupo
+LDAPInformationsForThisMember=Información en base LDAP para este miembro
+LDAPInformationsForThisMemberType=Información en base LDAP para este tipo de miembro
+LDAPRecordNotFound=El registro no se ha encontrado en la base LDAP
+LDAPUsers=Usuarios en base LDAP
+LDAPFieldStatus=Estado
+LDAPFieldFirstSubscriptionDate=Fecha de primera suscripción
+LDAPFieldFirstSubscriptionAmount=Monto de primera suscripción
+LDAPFieldLastSubscriptionDate=Fecha de última suscripción
+LDAPFieldLastSubscriptionAmount=Monto de última suscripción
+LDAPFieldSkype=ID Skype
+LDAPFieldSkypeExample=Ejemplo: ombreSkype
+ErrorFailedToReadLDAP=Error al leer base LDAP. Revise la configuración del módulo LDAP y su acceso a la base de datos.
+PasswordOfUserInLDAP=Contraseña para usuario en LDAP
diff --git a/htdocs/langs/es_AR/link.lang b/htdocs/langs/es_AR/link.lang
new file mode 100644
index 00000000000..3dbd72adba5
--- /dev/null
+++ b/htdocs/langs/es_AR/link.lang
@@ -0,0 +1,10 @@
+# Dolibarr language file - Source file is en_US - link
+LinkANewFile=Enlazar a un nuevo archivo/documento
+LinkedFiles=Archivos y documentos enlazados
+NoLinkFound=No hay enlaces registrados
+LinkComplete=El archivo se ha enlazado correctamente
+ErrorFileNotLinked=El archivo no pudo ser enlazado
+LinkRemoved=El enlace %s ha sido eliminado
+ErrorFailedToDeleteLink=Error al eliminar el enlace '<b>%s</b>'
+ErrorFailedToUpdateLink=Error al actualizar enlace '<b>%s</b>'
+URLToLink=URL del enlace
diff --git a/htdocs/langs/es_AR/loan.lang b/htdocs/langs/es_AR/loan.lang
new file mode 100644
index 00000000000..d75a600b702
--- /dev/null
+++ b/htdocs/langs/es_AR/loan.lang
@@ -0,0 +1,20 @@
+# Dolibarr language file - Source file is en_US - loan
+ShowLoan=Mostrar Préstamo
+PaymentLoan=Pago de Préstamo
+LoanPayment=Pago de Préstamo
+ShowLoanPayment=Mostrar Pago de Préstamo
+Nbterms=Número de cuota
+LoanAccountancyCapitalCode=Cuenta contable de capital
+LoanAccountancyInsuranceCode=Cuenta contable de seguro
+LoanAccountancyInterestCode=Cuenta contable de interés
+ConfirmDeleteLoan=Confirmar la eliminación de este préstamo
+LoanDeleted=El préstamo se ha eliminado correctamente
+ConfirmPayLoan=Confirmar clasificar este préstamo como pagado
+ListLoanAssociatedProject=Lista de préstamos asociados con el proyecto
+AddLoan=Crear préstamo
+FinancialCommitment=Compromiso financiero
+ConfigLoan=Configuración del módulo de préstamos
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Cuenta contable predeterminada para capital
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Cuenta contable predeterminada para interés
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Cuenta contable predeterminada para seguro
+CreateCalcSchedule=Editar compromiso financiero
diff --git a/htdocs/langs/es_AR/mailmanspip.lang b/htdocs/langs/es_AR/mailmanspip.lang
new file mode 100644
index 00000000000..700cfd3bb70
--- /dev/null
+++ b/htdocs/langs/es_AR/mailmanspip.lang
@@ -0,0 +1,26 @@
+# Dolibarr language file - Source file is en_US - mailmanspip
+MailmanSpipSetup=Configuración de módulos Mensajería y SPIP
+MailmanTitle=Sistema de lista de envío de correos
+TestSubscribe=Para probar la suscripción a las listas de Envío de Correos
+TestUnSubscribe=Para probar desuscribirse a las listas de Envío de Correos
+MailmanCreationSuccess=La prueba de suscripción se ha ejecutado correctamente
+MailmanDeletionSuccess=La prueba de desuscripción se ha ejecutado correctamente
+SynchroMailManEnabled=Será realizada una actualización en la lista de envío de correos
+SynchroSpipEnabled=Será realizada una actualización en el módulo SPIP
+DescADHERENT_MAILMAN_ADMINPW=Contraseña de administrador de Envío de Correos
+DescADHERENT_MAILMAN_URL=URL para suscripciones a la lista de envío de correos
+DescADHERENT_MAILMAN_UNSUB_URL=URL para desuscripciones a la lista de envío de correos
+DescADHERENT_MAILMAN_LISTS=Lista(s) para inscripción automática de nuevos miembros (separados por una coma)
+SPIPTitle=Sistema de Administración de Contenido SPIP
+DescADHERENT_SPIP_DB=Nombre de la base de datos SPIP
+DescADHERENT_SPIP_USER=Usuario de base de datos SPIP
+DescADHERENT_SPIP_PASS=Contraseña de base de datos SPIP
+AddIntoSpip=Agregar en SPIP
+AddIntoSpipConfirmation=¿Estás seguro que deseas agregar a este miembro dentro de la SPIP?
+AddIntoSpipError=Error al agregar el usuario en SPIP
+DeleteIntoSpip=Quitar de SPIP
+DeleteIntoSpipConfirmation=¿Estás seguro que deseas quitar a este miembro de SPIP?
+DeleteIntoSpipError=Error al suprimir el usuario de SPIP
+SPIPConnectionFailed=Error al conectarse a SPIP
+SuccessToAddToMailmanList=%s agregado correctamente a la lista de envío de correos %s o base de datos SPIP
+SuccessToRemoveToMailmanList=%s fue eliminado correctamente de la lista de envío de correos %s o base de datos SPIP
diff --git a/htdocs/langs/es_AR/mails.lang b/htdocs/langs/es_AR/mails.lang
new file mode 100644
index 00000000000..02b4225c64c
--- /dev/null
+++ b/htdocs/langs/es_AR/mails.lang
@@ -0,0 +1,134 @@
+# Dolibarr language file - Source file is en_US - mails
+Mailing=Correo
+EMailing=Correo
+EMailings=Correos
+AllEMailings=Todos los correos
+MailCard=Ficha del correo
+MailFrom=Emisor
+MailToUsers=Para usuario(s)
+MailCC=Copiar a
+MailToCCUsers=Copiar a usuario(s)
+MailCCC=Colocar en copia a
+MailTopic=Asunto del correo
+MailFile=Archivos adjuntos
+MailMessage=Cuerpo del correo
+SubjectNotIn=Fuera del asunto
+BodyNotIn=Fuera del cuerpo
+ShowEMailing=Mostrar correo
+ListOfEMailings=Lista de correos
+NewMailing=Nuevo correo
+EditMailing=Editar correo
+ResetMailing=Reenviar correo
+DeleteMailing=Eliminar correo
+DeleteAMailing=Eliminar un correo
+PreviewMailing=Previsualizar correo
+CreateMailing=Crear correo
+TestMailing=Probar correo
+ValidMailing=Validar correo
+MailSuccessfulySent=Correo (de %s a %s) aceptado correctamente para entregar
+MailingSuccessfullyValidated=Correo validado correctamente
+MailUnsubcribe=Desuscribir
+MailingStatusNotContact=No volver a contactar
+MailingStatusReadAndUnsubscribe=Leer y desuscribir
+ErrorMailRecipientIsEmpty=La lista de remitentes está vacía
+WarningNoEMailsAdded=No hay nuevos correos para agregar a la lista de destinatarios
+ConfirmValidMailing=¿Estás seguro que quieres validar este correo?
+ConfirmResetMailing=Advertencia, al reinicializar el correo <b>%s</b>, estás permitiendo que se realice el reenvío masivo de este correo. ¿Estás seguro que quieres hacer ésto?
+ConfirmDeleteMailing=¿Estás seguro que quieres eliminar este correo?
+NbOfUniqueEMails=Cantidad de correos únicos
+NbOfEMails=Cantidad de correos
+TotalNbOfDistinctRecipients=Cantidad de destinatarios únicos
+NoTargetYet=No se han definido todavía los destinatarios (dirígete hacia la pestaña 'Destinatarios')
+NoRecipientEmail=No hay destinatario para el correo %s
+RemoveRecipient=Quitar destinatario
+YouCanAddYourOwnPredefindedListHere=Para crear tu módulo de selector de correos, ver htdocs/core/modules/mailings/README.
+EMailTestSubstitutionReplacedByGenericValues=Cuando se utiliza el modo de prueba, las variables de substitución son reemplazadas por valores genéricos
+NoAttachedFiles=No hay archivos adjuntos
+BadEMail=Valor erróneo para correo
+ConfirmCloneEMailing=¿Estás seguro que quieres clonar este correo?
+DateSending=Fecha de envío
+MailingStatusRead=Leído
+YourMailUnsubcribeOK=El correo <b>%s</b>  ha sido correctamente desuscripto de la lista de correos
+ActivateCheckReadKey=Clave utilizada para encriptar la URL utilizada para las funcionalidades "Confirmación de lectura" y "Desuscribir"
+EMailSentToNRecipients=Correo enviado a los destinatarios %s.
+EMailSentForNElements=Correo enviado a %s elementos.
+XTargetsAdded=<b>%s</b> destinatarios agregados dentro de la lista de objetivos
+OnlyPDFattachmentSupported=Si los documentos PDF fueron generados por los objetos a enviar, ellos serán adjuntados al correo. Si no, no será enviado ningún correo (además, sólo están soportados documentos pdf como adjuntos de envíos masivos en esta versión).
+AllRecipientSelected=Los destinatarios del registro seleccionado %s (si su correo es conocido).
+GroupEmails=Agrupar correos
+OneEmailPerRecipient=Un correo por destinatario (por defecto, un correo por registro seleccionado)
+WarningIfYouCheckOneRecipientPerEmail=Advertencia, si activas esta casilla, significa que sólo será enviado un correo para varios registros diferentes seleccionados, entonces si tu mensaje contiene variables de substitución referidas a los datos de un registro, se hace imposible reemplazarlas.
+ResultOfMailSending=Resultado de envío masivo de correos
+NbSelected=Cantidad de seleccionados
+NbIgnored=Cantidad de ignorados
+NbSent=Cantidad de enviados
+SentXXXmessages=%s mensaje(s) enviado(s).
+ConfirmUnvalidateEmailing=¿Estás seguro que quieres cambiar el estado del correo <b>%s</b> a borrador?
+MailingModuleDescContactsWithThirdpartyFilter=Contactos con filtros de cliente
+MailingModuleDescContactsByCompanyCategory=Contactos por categoría de tercero
+MailingModuleDescContactsByCategory=Contactos por categorías
+MailingModuleDescEmailsFromFile=Correos desde archivo
+MailingModuleDescEmailsFromUser=Correos ingresados por el usuario
+MailingModuleDescDolibarrUsers=Usuarios con correos
+MailingModuleDescThirdPartiesByCategories=Terceros (por categorías)
+SendingFromWebInterfaceIsNotAllowed=No está permitido el envío desde interfaz web.
+LineInFile=Línea %s del archivo
+RecipientSelectionModules=Solicitudes definidas para la selección del destinatario
+MailingArea=Area de correos
+LastMailings=Ultimos %s correos
+TargetsStatistics=Estadísticas de objetivo
+NbOfCompaniesContacts=Contactos/direcciones únicas
+MailNoChangePossible=Los destinatarios no pueden cambiarse para  un correo validado
+SearchAMailing=Buscar correo
+SendMailing=Enviar correo
+MailingNeedCommand=El envío de correos puede realizarse desde la consola. Consulta al administrador del servidor para ejecutar el siguiente comando para enviar el correo a todos los destinatarios:
+MailingNeedCommand2=De todas formas puedes enviarlos en línea agregando el parámetro MAILING_LIMIT_SENDBYWEB con el valor máximo de correos que quieres enviar por cada sesión. Para esto, ve a Inicio - Configuración - Otros.
+ConfirmSendingEmailing=Si quieres enviar el correo directamente de esta pantalla, ¿estás seguro que quieres enviar el correo ahora desde tu navegador?
+LimitSendingEmailing=Nota: El envío de correos desde la interfaz web se realiza en etapas por motivos de seguridad y timeout, <b>%s</b> destinatarios a la vez por cada sesión de envío.
+TargetsReset=Limpiar lista
+ToClearAllRecipientsClickHere=Haga click aquí para limpiar la lista de destinatarios de este correo
+ToAddRecipientsChooseHere=Agregar destinatarios eligiéndolos de las listas
+NbOfEMailingsReceived=Correos masivos recibidos
+NbOfEMailingsSend=Correos masivos enviados
+IdRecord=ID de registro
+DeliveryReceipt=Confirmación de entrega
+YouCanUseCommaSeparatorForSeveralRecipients=Puedes usar la <b>coma</b> para separar varios destinatarios.
+TagCheckMail=Informar la apertura de correo
+TagUnsubscribe=Enlace para desuscripción
+TagSignature=Firma del emisor
+EMailRecipient=Correo del destinatario
+TagMailtoEmail=Correo del destinatario (incluyendo el enlace htm "mailto:")
+NoEmailSentBadSenderOrRecipientEmail=No se han enviado correos. El correo del emisor o destinatario están incorrectos. Verifique el perfil del usuario.
+NoNotificationsWillBeSent=No se han planificado notificaciones por correo para este evento y compañía
+ANotificationsWillBeSent=1 notificación werá enviada por correo
+SomeNotificationsWillBeSent=%s notificaciones serán enviadas por correo
+AddNewNotification=Activar una nueva notificación por mail para ese objetivo/evento
+ListOfActiveNotifications=Listar todos los objetivos/eventos activos para la notificación por correo
+ListOfNotificationsDone=Listar todas las notificaciones enviadas por correo
+MailSendSetupIs=La configuración de envío de correo ha sido establecida a '%s'. Este modo no puede ser utilizado para envío masivo de correos.
+MailSendSetupIs2=Debes dirigirte primero, utilizando una cuenta de administrador, al menú %s Inicio - Configuración - Correos%s para cambiar el parámetro <strong>'%s'</strong> para utilizar el modo '%s'. Con este modo, podrás entrar en la configuración del servidor SMTP provisto por tu proveedor de internet y utilizar la funcionalidad de envío masivo de correos.
+MailSendSetupIs3=Si tienes alguna consulta acerca de cómo configurar tu servidor SMTP, puedes preguntarle a %s.
+YouCanAlsoUseSupervisorKeyword=Puedes también agregar la clave <strong>__SUPERVISOREMAIL__</strong> para tener un correo enviado hacia el supervisor del usuario (sólo funciona si el correo es definido por el supervisor)
+NbOfTargetedContacts=Cantidad de contactos de correo objetivo
+UseFormatFileEmailToTarget=El archivo importado debe tener el formato <strong>correo;nombre;primer nombre;otro</strong>
+UseFormatInputEmailToTarget=Ingrese una cadena con el formato <strong>correo;nombre;primer nombre;otro</strong>
+AdvTgtTitle=Complete los campos para agregar los terceros o contactos/direcciones de correo al objetivo
+AdvTgtSearchTextHelp=Utilice %% como comodines. Por ejemplo para encontrar todos los item como <b>jean, joe, jim</b>, puedes ingresar <b>j%%</b>, también puedes usar ; como separador de valores, y usar ! para exceptuarlo. Por ejemplo  <b>jean;joe;jim%%;!jimo;!jima%</b> para ubicar a todos los jean, joe, comenzando con jim pero no jimo ni nada que comience con jima
+AdvTgtSearchIntHelp=Utilice el intervalo para seleccionar entero o valor decimal
+AdvTgtMaxVal=Valor máximo
+AdvTgtSearchDtHelp=Utilice intervalos para seleccionar el valor de fecha
+AdvTgtStartDt=Fecha de inicio
+AdvTgtEndDt=Fecha de fin
+AdvTgtTypeOfIncudeHelp=Correo del tercero objetivo y de su contacto, o sólo correo del tercero o sólo correo del contacto
+AdvTgtTypeOfIncude=Tipo de correo del objetivo
+AdvTgtContactHelp=Usar solamente si tu objetivo es el contacto en "Tipo de correo del objetivo"
+AddAll=Agregar todos
+RemoveAll=Quitar todos
+AdvTgtAddContact=Agregar correos acorde al criterio
+AdvTgtOrCreateNewFilter=Nombre del filtro nuevo
+NoContactWithCategoryFound=No se encontraron contactos/direcciones con la categoría buscada
+NoContactLinkedToThirdpartieWithCategoryFound=No se encontraron contactos/direcciones con la categoría buscada
+OutGoingEmailSetup=Configuración de correo saliente
+InGoingEmailSetup=Configuración de correo entrante
+DefaultOutgoingEmailSetup=Configuración de correo saliente por defecto
+ContactsWithThirdpartyFilter=Contactos con filtro de terceros
diff --git a/htdocs/langs/es_AR/main.lang b/htdocs/langs/es_AR/main.lang
index a48f7399746..ec90b66535b 100644
--- a/htdocs/langs/es_AR/main.lang
+++ b/htdocs/langs/es_AR/main.lang
@@ -127,7 +127,6 @@ Save=Guardar
 SaveAs=Guarda Como
 TestConnection=Probar conexión
 ToClone=Clonar
-ConfirmCloneAsk=¿Estás seguro que quieres clonar el objeto <b>%s</b>?
 ConfirmClone=Elija datos que quiere clonar:
 NoCloneOptionsSpecified=Datos para clonar sin definir
 Run=Correr
@@ -213,7 +212,6 @@ AmountTTC=Monto (con imp.)
 AmountVAT=Monto impuesto
 MulticurrencyAlreadyPaid=Ya pagado, moneda original
 MulticurrencyRemainderToPay=Faltante a pagar, moneda original
-MulticurrencyPaymentAmount=Monto del pago, moneda original
 MulticurrencyAmountHT=Monto (neto), moneda original
 MulticurrencyAmountTTC=Monto (inc. imp.), moneda original
 MulticurrencyAmountVAT=Monto del impuesto, moneda original
@@ -300,7 +298,6 @@ ChangedBy=Cambiado por
 ResultKo=Falla
 Reporting=Informando
 Reportings=Informando
-StatusInterInvoiced=Facturado
 Opened=Abierto
 ClosedAll=Cerrado (todo)
 ByCompanies=Por terceros
diff --git a/htdocs/langs/es_AR/margins.lang b/htdocs/langs/es_AR/margins.lang
new file mode 100644
index 00000000000..27e9744383d
--- /dev/null
+++ b/htdocs/langs/es_AR/margins.lang
@@ -0,0 +1,36 @@
+# Dolibarr language file - Source file is en_US - margins
+MarginRate=Tasa de margen
+MarkRate=Marcar tasa
+DisplayMarginRates=Mostrar tasas de margen
+DisplayMarkRates=Mostrar marca de tasas
+InputPrice=Precio de entrada
+margin=Administración de márgenes de ganancia
+margesSetup=Configuración de Administración de márgenes de ganancia
+MarginDetails=Detalles de margen
+ProductMargins=Márgenes de producto
+CustomerMargins=Márgenes de cliente
+SalesRepresentativeMargins=Márgenes de representante de ventas
+ContactOfInvoice=Contacto de facturación
+UserMargins=Márgenes de usuario
+AllProducts=Todos los productos y servicios.
+ChooseProduct/Service=Elige producto o servicio
+ForceBuyingPriceIfNull=Forzar el costo al precio de venta si no está definido
+ForceBuyingPriceIfNullDetails=Si el costo no está definido, y esta opción está "ACTIVADA", el margen será cero en cada línea (costo = precio de venta), de lo contrario ("DESACTIVADO"), el margen será igual al valor sugerido por defecto.
+MARGIN_METHODE_FOR_DISCOUNT=Método de margen para descuentos globales
+UseDiscountOnTotal=En subtotal
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Define si un descuento global se debe tratar como un producto, un servicio o solo como un subtotal para el cálculo del margen.
+MARGIN_TYPE=Costo sugerido por defecto para el cálculo del margen
+MargeType1=Margen sobre el mejor precio del proveedor
+MargeType2=Margen sobre el precio promedio ponderado (PPP)
+MargeType3=Margen sobre costo
+MarginTypeDesc=* Margen sobre el mejor costo = Precio de venta - Mejor precio de proveedor definido en la ficha del producto <br> * Margen sobre el Precio promedio ponderado (PPP) = Precio de venta - PPP del producto o mejor precio del proveedor si PPP aún no está definido <br> * Margen de costo = Precio de venta - Costo definido en la ficha del producto o PPP si el costo no está definido, o el mejor precio del proveedor si PPP aún no está definido
+CostPrice=Costo
+UnitCharges=Cargos unitarios
+Charges=Cargos
+AgentContactType=Tipo de contacto de agente comercial
+AgentContactTypeDetails=Defina qué tipo de contacto (vinculado en las facturas) se utilizará para el informe de margen por contacto/dirección. Tenga en cuenta que la lectura de estadísticas de un contacto no es confiable ya que en la mayoría de los casos el contacto puede no estar explícitamente en las facturas.
+rateMustBeNumeric=La tarifa debe ser un valor numérico
+markRateShouldBeLesserThan100=La marca de tasa debe ser inferior a 100
+ShowMarginInfos=Mostrar información de margen
+CheckMargins=Detalle de márgenes
+MarginPerSaleRepresentativeWarning=El informe de margen por usuario utiliza el vínculo entre terceros y representantes de ventas para calcular el margen de cada uno. Debido a que algunos terceros pueden no tener un representante dedicado y algunos terceros pueden estar vinculados a varios, algunos montos pueden no estar incluidos en este informe (si no hay un representante) y algunos pueden aparecer en líneas diferentes (para cada uno) .
diff --git a/htdocs/langs/es_AR/members.lang b/htdocs/langs/es_AR/members.lang
new file mode 100644
index 00000000000..8b4b025101f
--- /dev/null
+++ b/htdocs/langs/es_AR/members.lang
@@ -0,0 +1,159 @@
+# Dolibarr language file - Source file is en_US - members
+MembersArea=Area de miembros
+MemberCard=Ficha de miembro
+SubscriptionCard=Ficha de la suscripción
+ShowMember=Mostrar ficha de miembro
+ThirdpartyNotLinkedToMember=Tercero no vinculado a un miembro
+MembersTickets=Tickets de miembros
+FundationMembers=Miembros de la fundación
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Otro miembro (nombre: <b>%s</b>, usuario: <b>%s</b>) está vinculado al tercero <b>%s</b>. Debes quitar primero este vínculo pues un tercero no puede estar vinculado a más de un miembro (y viceversa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=Por motivos de seguridad, debe tener permisos para editar todos los usuarios para poder vincular a un miembro a un usuario que no sea suyo.
+SetLinkToThirdParty=Vincular a un tercedo de Dolibarr
+MembersCards=Cartas de presentación de miembros
+MembersList=Lista de miembros
+MembersListToValid=Lista de miembros en estado borrador (a ser validados)
+MembersListValid=Lista de miembros válidos
+MembersListUpToDate=Lista de miembros válidos con suscripción al día
+MembersListNotUpToDate=Lista de miembros válidos con suscripción vencida
+MembersListResiliated=Lista de miembros terminados
+MembersListQualified=Lista de miembros calificados
+MenuMembersToValidate=Miembros en Borrador
+MenuMembersValidated=Miembros válidos
+MenuMembersNotUpToDate=Miembros vencidos
+MenuMembersResiliated=Miembros terminados
+MembersWithSubscriptionToReceive=Miembros con suscripción para recibir
+MembersWithSubscriptionToReceiveShort=Suscripción para recibir
+DateSubscription=Fecha de suscripción
+DateEndSubscription=Fecha de finalización de suscripción
+EndSubscription=Finalizar suscripción
+SubscriptionId=ID de Suscripción
+MemberId=ID Miembro
+MemberTypeId=ID Tipo de Miembro
+MemberTypeLabel=Etiqueta Tipo de miembro
+MemberStatusDraft=Borrador (necesita ser validado)
+MemberStatusActive=Validado (esperando suscripción)
+MemberStatusActiveLate=Subscripción vencida
+MemberStatusActiveLateShort=Vencidos
+MemberStatusPaid=Suscripción al día
+MemberStatusResiliated=Miembro terminado
+MemberStatusResiliatedShort=Terminado
+MembersStatusToValid=Miembros en Borrador
+MembersStatusResiliated=Miembros terminados
+MemberStatusNoSubscription=Validado (no necesita suscripción)
+MemberStatusNoSubscriptionShort=Válido
+NewCotisation=Nueva contribución
+PaymentSubscription=Nuevo pago de contribución
+SubscriptionEndDate=Fecha de finalización de la suscripción
+MembersTypeSetup=Configuración de tipo de miembros
+ConfirmDeleteMemberType=¿Estás seguro de que quieres eliminar este tipo de miembro?
+MemberTypeCanNotBeDeleted=El tipo de miembro no se puede eliminar
+NewSubscription=Nueva suscripción
+NewSubscriptionDesc=Este formulario te permite registrar tu suscripción como un nuevo miembro de la fundación. Si deseas renovar tu suscripción (si ya eres miembro), comunícate con la fundación al correo %s.
+Subscription=Suscripción
+Subscriptions=Suscripciones
+SubscriptionLate=Tarde
+SubscriptionNotReceived=Suscripción nunca recibida
+ListOfSubscriptions=Listado de suscripciones
+SendCardByMail=Enviar ficha por correo
+NoTypeDefinedGoToSetup=No hay tipos de miembros definidos. Vé al menú "Tipos de miembros"
+WelcomeEMail=Correo de bienvenida
+SubscriptionRequired=Se requiere suscripción
+VoteAllowed=Voto permitido
+MorPhy=Moral/Físico
+ResiliateMember=Terminar a un miembro
+ConfirmResiliateMember=¿Estás seguro de que quieres terminar con este miembro?
+DeleteMember=Eliminar a un miembro
+ConfirmDeleteMember=¿Estás seguro de que quieres eliminar a este miembro (eliminar un miembro eliminará todas sus suscripciones)?
+DeleteSubscription=Eliminar una suscripción
+ConfirmDeleteSubscription=¿Estás seguro de que quieres eliminar esta suscripción?
+Filehtpasswd=archivo htpasswd
+ConfirmValidateMember=¿Estás seguro que quieres validar a este miembro?
+PublicMemberList=Lista pública de miembros
+BlankSubscriptionForm=Formulario público de auto suscripción
+BlankSubscriptionFormDesc=Dolibarr puede proporcionarte una URL/sitio web público para permitir que los visitantes externos puedan solicitar suscribirse a la fundación. Si se habilita un módulo de pago en línea, también se puede proporcionar automáticamente un formulario para este fin.
+EnablePublicSubscriptionForm=Habilite el sitio público con el formulario de auto suscripción
+ExportDataset_member_1=Miembros y suscripciones
+LastMembersModified=Últimos %smiembros modificados
+LastSubscriptionsModified=Últimas %ssuscripciones modificadas
+Text=Texto
+PublicMemberCard=Ficha pública de miembro
+SubscriptionNotRecorded=Suscripción no guardada
+AddSubscription=Crear suscripción
+ShowSubscription=Mostrar suscripción
+SendingAnEMailToMember=Enviar correo con información al miembro
+SendingEmailOnAutoSubscription=Enviar correo al registrarse automáticamente
+SendingEmailOnMemberValidation=Enviar correo al validar un miembro nuevo
+SendingEmailOnNewSubscription=Enviar correo al tener una nueva suscripción
+SendingReminderForExpiredSubscription=Enviar recordatorio por suscripciones vencidas
+SendingEmailOnCancelation=Enviar correo al cancelar
+YourMembershipRequestWasReceived=Tu membresía fue recibida.
+YourMembershipWasValidated=Tu membresía fue validada
+YourSubscriptionWasRecorded=Su nueva suscripción fue guardada
+YourMembershipWasCanceled=Tu membresía fue cancelada
+CardContent=Contenido de tu ficha de miembro
+ThisIsContentOfYourMembershipRequestWasReceived=Queremos hacerle saber que se recibió su solicitud de membresía. <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=Queremos hacerle saber que su nueva suscripción fue grabada. <br> <br>
+ThisIsContentOfSubscriptionReminderEmail=Queremos informarle que su suscripción está a punto de caducar o que ya venció (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Esperamos que la renueves. <br><br>
+ThisIsContentOfYourCard=Este es un resumen de la información que tenemos sobre usted. Por favor contáctenos si algo está incorrecto.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Asunto del correo de notificación recibido en caso de auto-inscripción de un invitado
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Contenido del correo de notificación recibido en caso de auto-inscripción de un invitado
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template a utilizar para enviar correos a un miembro al momento de la auto-suscripción
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template a utilizar para enviar correos a un miembro al momento de su validación
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template a utilizar para enviar correos a un miembro al momento del registro de una nueva suscripción
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template a utilizar para enviar recordatorios cuando una suscripción está a punto de vencer
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template a utilizar para enviar correos a un miembro al momento de su cancelación
+DescADHERENT_MAIL_FROM=Remitente para correos automáticos
+DescADHERENT_ETIQUETTE_TYPE=Formato de página de etiquetas
+DescADHERENT_ETIQUETTE_TEXT=Texto impreso en hojas de direcciones de miembros
+DescADHERENT_CARD_TYPE=Formato de la página de fichas
+DescADHERENT_CARD_HEADER_TEXT=Encabezado impreso en las fichas de los miembros
+DescADHERENT_CARD_TEXT=Laterial impreso en las fichas del miembro (justificado a izquierda)
+DescADHERENT_CARD_TEXT_RIGHT=Lateral impreso en fichas de los miembros (justificado a derecha)
+DescADHERENT_CARD_FOOTER_TEXT=Pié de página impreso en las fichas de los miembros
+HTPasswordExport=Generación de archivo htpassword
+MembersAndSubscriptions=Miembros y Suscripciones
+MoreActions=Acción complementaria al registrarse
+MoreActionsOnSubscription=Acción complementaria sugerida por defecto al registrar una suscripción
+MoreActionBankDirect=Crear una registro en la cuenta bancaria
+MoreActionBankViaInvoice=Crear una factura y un pago en cuenta bancaria
+MoreActionInvoiceOnly=Crea una factura sin pago
+LinkToGeneratedPages=Generar tarjetas de visita
+LinkToGeneratedPagesDesc=Esta pantalla te permite generar archivos PDF con la carta de presentación para todos sus miembros o un miembro en particular.
+DocForAllMembersCards=Generar cartas de presentación para todos los miembros.
+DocForOneMemberCards=Generar cartas de presentación para un miembro en particular
+DocForLabels=Generar hojas de direcciones
+SubscriptionPayment=Pago de Suscripción
+LastSubscriptionDate=Fecha del último pago de suscripción
+LastSubscriptionAmount=Monto de la última suscripción
+MembersStatisticsByState=Estadísticas de miembros por estado/provincia
+MembersStatisticsByTown=Estadísticas de miembros por ciudad
+NbOfMembers=Cantidad de miembros
+NoValidatedMemberYet=No se encontraron miembros válidos
+MembersByCountryDesc=Esta pantalla muestra estadísticas de miembros por países. Sin embargo, el gráfico depende del servicio en línea de Google y está disponible solo si se está conectado a Internet.
+MembersByStateDesc=Esta pantalla muestra estadísticas de miembros por estado/provincias/región.
+MembersByTownDesc=Esta pantalla muestra estadísticas de miembros por ciudad.
+MembersStatisticsDesc=Elige las estadísticas que deseas visualizar ...
+LastMemberDate=Fecha de último miembro
+LatestSubscriptionDate=Fecha de última suscripción
+Public=La información es pública.
+NewMemberbyWeb=Nuevo miembro agregado. Esperando aprobación
+NewMemberForm=Formulario de miembro nuevo
+SubscriptionsStatistics=Estadísticas sobre suscripciones
+NbOfSubscriptions=Cantidad de suscripciones
+AmountOfSubscriptions=Monto de suscripciones
+TurnoverOrBudget=Volumen de negocios (para una empresa) o Presupuesto (para una fundación)
+DefaultAmount=Monto de suscripción por defecto
+CanEditAmount=El visitante puede elegir/editar el monto de su suscripción
+MEMBER_NEWFORM_PAYONLINE=Ve a la página de pago en línea
+MembersStatisticsByProperties=Estadísticas de miembros por naturaleza
+MembersByNature=Esta pantalla muestra estadísticas de miembros por naturaleza.
+MembersByRegion=Esta pantalla muestra estadísticas de miembros por región.
+VATToUseForSubscriptions=Tipo de IVA a utilizar para suscripciones
+NoVatOnSubscription=Sin IVA para suscripciones
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producto utilizado para la línea de suscripción en la factura: %s
+SubscriptionRecorded=Suscripción registrada
+NoEmailSentToMember=No se han enviado correos al miembro
+EmailSentToMember=Correo enviado al miembro a %s
+SendReminderForExpiredSubscriptionTitle=Enviar recordatorio por correo para la suscripción vencida
+SendReminderForExpiredSubscription=Enviar un recordatorio por correo a los miembros cuando la suscripción esté por vencer (el parámetro es el número de días previos al final de la suscripción para enviar el recordatorio. Puede ser una lista de días separados por punto y coma, por ejemplo '10;5;0;-5 ')
+YouMayFindYourInvoiceInThisEmail=Puede encontrar su factura adjunta a este correo
diff --git a/htdocs/langs/es_AR/modulebuilder.lang b/htdocs/langs/es_AR/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/es_AR/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/es_AR/mrp.lang b/htdocs/langs/es_AR/mrp.lang
new file mode 100644
index 00000000000..a8b70a8377e
--- /dev/null
+++ b/htdocs/langs/es_AR/mrp.lang
@@ -0,0 +1,16 @@
+# Dolibarr language file - Source file is en_US - mrp
+Mrp=Ordenes de Fabricación
+MO=Orden de Fabricación
+MRPDescription=Módulo para administrar producción y Ordenes de Fabricación (OF).
+MRPArea=Area MRP
+MrpSetupPage=Configuración de módulo MRP
+MenuBOM=Lista de materiales
+LatestBOMModified=Ultimas %s Lista de materiales modificada
+LatestMOModified=Ultimas %s Ordenes de Fabricación modificadas
+Bom=Listas de materiales
+BillOfMaterials=Lista de materiales
+BOMsSetup=Configuración de módulo de BOM
+ListOfBOMs=Lista de Listas de materiales - BOM
+ListOfManufacturingOrders=Lista de Ordenes de Fabricación
+NewBOM=Nueva Lista de materiales
+MenuMRP=Ordenes de Fabricación
diff --git a/htdocs/langs/es_AR/multicurrency.lang b/htdocs/langs/es_AR/multicurrency.lang
new file mode 100644
index 00000000000..00d17a8c384
--- /dev/null
+++ b/htdocs/langs/es_AR/multicurrency.lang
@@ -0,0 +1,17 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi-moneda
+ErrorAddRateFail=Error en tasa de cambio agregada
+ErrorAddCurrencyFail=Error en moneda agregada
+multicurrency_syncronize_error=Error de sincronización: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Utilice la fecha del documento para encontrar la tasa de cambio de la moneda, en lugar de utilizar la última tasa conocida
+multicurrency_useOriginTx=Cuando un objeto es creado por otro, mantener la tasa original del objeto origen (caso contrario utilizar la última tasa conocida)
+CurrencyLayerAccount_help_to_synchronize=Para utilizar esta funcionalidad debes crearte una cuenta en el sitio web %s. <br> Obtiene tu <b> clave API</b>. <br>Si utilizas una cuenta gratuita, no podrás cambiar el <b> origen de la moneda </b> (por defecto USD). <br> Si tu moneda principal no es USD, la aplicación la recalculará de forma automática. <br> <br> Tienes un límite de 1000 sincronizaciones por mes.
+multicurrency_appCurrencySource=Origen de la moneda
+multicurrency_alternateCurrencySource=Origen alternativo de la moneda
+CurrenciesUsed=Monedas utilizadas
+CurrenciesUsed_help_to_add=Agrega las monedas diferentes y las tasas de cambio que necesites utilizar en tus <b>propuestas</b>, <b>órdenes</b> etc.
+rate=tasa de cambio
+MulticurrencyReceived=Recibido, moneda original
+MulticurrencyRemainderToTake=Monto restante, moneda original
+MulticurrencyPaymentAmount=Monto del pago, moneda original
+AmountToOthercurrency=Monto para (en moneda de cuenta recibida)
diff --git a/htdocs/langs/es_AR/opensurvey.lang b/htdocs/langs/es_AR/opensurvey.lang
new file mode 100644
index 00000000000..a5e3f27088d
--- /dev/null
+++ b/htdocs/langs/es_AR/opensurvey.lang
@@ -0,0 +1,41 @@
+# Dolibarr language file - Source file is en_US - opensurvey
+OrganizeYourMeetingEasily=Organiza tus reuniones y encuestas fácilmente. Primero selecciona el tipo de encuesta...
+OpenSurveyArea=Área de encuestas
+AddACommentForPoll=Puedes agregar un comentario en la encuesta...
+AddComment=Agregar comentario
+ToReceiveEMailForEachVote=Recibir un correo por cada voto
+OpenSurveyStep2=Selecciona tus fechas entre los días que ves libres (en gris). Los seleccionados se marcarán en verdes. Puedes anular la selección de un día seleccionado haciendo clic nuevamente en él
+RemoveAllDays=Quitar todos los días
+CopyHoursOfFirstDay=Copia horas del primer día
+RemoveAllHours=Quitar todas las horas
+TheBestChoice=La mejor opción actualmente es
+TheBestChoices=Las mejores opciones actualmente son
+OpenSurveyHowTo=Si aceptas votar en esta encuesta, debes dar su nombre, elegir los valores que mejor se adapten a ti y validar con el botón más al final de la línea.
+ConfirmRemovalOfPoll=¿Estás seguro de que quieres eliminar esta encuesta (y todos sus votos)?
+UrlForSurvey=URL para comunicarse y obtener acceso directo a la encuesta
+PollOnChoice=Estás creando una encuesta de tipo multiple-choice. Ingrese primero todas las opciones posibles para su encuesta:
+CreateSurveyStandard=Crea una encuesta estándar
+CheckBox=Casilla de verificación simple
+YesNoList=Lista (vacío/si/no)
+AddNewColumn=Agregar nueva columna
+TitleChoice=Etiqueta de elección
+ExportSpreadsheet=Exportar hoja de cálculo de resultados
+NbOfSurveys=Cantidad de encuestas
+NbOfVoters=Cantidad de votantes
+PollAdminDesc=Puedes cambiar todas las líneas de esta encuesta con el botón "Editar". También puedes eliminar una columna o una línea con %s. Y agregar una nueva columna con %s.
+YouAreInivitedToVote=Te han invitado a votar en esta encuesta
+VoteNameAlreadyExists=Este nombre ya se usó para esta encuesta
+AddADate=Agregar una fecha
+AddStartHour=Agregar hora de inicio
+AddEndHour=Agregar hora de finalización
+NoCommentYet=Aún no se han publicado comentarios para esta encuesta
+CanSeeOthersVote=Los votantes pueden ver el voto de otras personas
+SelectDayDesc=Para cada día seleccionado, puedes elegir o no, las horas de reunión en el siguiente formato:<br>- vacío, <br>- "8h", "8H" u "8:00" para indicar la hora de inicio de una reunión,<br>- "8-11", "8h-11h", "8H-11H" u "8:00-11:00" para indicar la hora de inicio y fin de una reunión,<br>- "8h15-11h15", "8H15-11H15" u "8:15-11:15" para lo mismo pero con minutos.
+BackToCurrentMonth=Regresar al mes actual
+ErrorOpenSurveyFillFirstSection=No has completado la primera sección de la creación de la encuesta.
+ErrorOpenSurveyOneChoice=Ingrese al menos una opción
+ErrorInsertingComment=Hubo un error al insertar tu comentario
+MoreChoices=Ingrese más opciones para los votantes
+SurveyExpiredInfo=La encuesta se cerró o la demora en la votación ha vencido.
+EmailSomeoneVoted=%s ha completado una línea.\nPuedes encontrar su encuesta en el enlace:\n%s
+UserMustBeSameThanUserUsedToVote=Debes haber votado y usar el mismo usuario que usaste para votar, para publicar un comentario.
diff --git a/htdocs/langs/es_AR/orders.lang b/htdocs/langs/es_AR/orders.lang
new file mode 100644
index 00000000000..6b544aac2fa
--- /dev/null
+++ b/htdocs/langs/es_AR/orders.lang
@@ -0,0 +1,19 @@
+# Dolibarr language file - Source file is en_US - orders
+Order=Orden
+PdfOrderTitle=Orden
+Orders=Órdenes
+OrderDateShort=Fecha de la Orden
+SuppliersOrders=Ordenes de compra
+CustomerOrder=Ordenes de venta
+StatusOrderCanceledShort=Cancelado
+StatusOrderSentShort=En proceso
+StatusOrderToProcessShort=Para procesar
+StatusOrderCanceled=Cancelado
+StatusOrderDraft=Borrador (necesita ser validado)
+StatusSupplierOrderCanceledShort=Cancelado
+StatusSupplierOrderSentShort=En proceso
+StatusSupplierOrderProcessedShort=Procesado
+StatusSupplierOrderToProcessShort=Para procesar
+StatusSupplierOrderCanceled=Cancelado
+StatusSupplierOrderDraft=Borrador (necesita ser validado)
+StatusSupplierOrderProcessed=Procesado
diff --git a/htdocs/langs/es_AR/other.lang b/htdocs/langs/es_AR/other.lang
new file mode 100644
index 00000000000..47aa202007c
--- /dev/null
+++ b/htdocs/langs/es_AR/other.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - other
+Notify_BILL_VALIDATE=Factura de cliente validada
+Notify_BILL_PAYED=Factura de cliente pagada
diff --git a/htdocs/langs/es_AR/paybox.lang b/htdocs/langs/es_AR/paybox.lang
new file mode 100644
index 00000000000..cfb35349278
--- /dev/null
+++ b/htdocs/langs/es_AR/paybox.lang
@@ -0,0 +1,24 @@
+# Dolibarr language file - Source file is en_US - paybox
+PayBoxSetup=Configuración del módulo PayBox
+PayBoxDesc=Este módulo ofrece páginas para permitir el pago en <a href="http://www.paybox.com" target="_blank">Paybox</a> a los clientes. Esto se puede utilizar para un pago gratuito o para un pago en un objeto Dolibarr en particular (factura, orden, ...)
+FollowingUrlAreAvailableToMakePayments=Las siguientes URL están disponibles para ofrecer a un cliente una página para realizar un pago para elementos de Dolibarr
+WelcomeOnPaymentPage=Bienvenido a nuestro servicio de pago en línea.
+ThisScreenAllowsYouToPay=Esta pantalla le permite realizar un pago en línea a %s.
+ThisIsInformationOnPayment=Esta es información sobre el pago a realizar
+ToComplete=Para completar
+YourEMail=Correo electrónico para recibir confirmación de pago
+Creditor=Acreedor
+PayBoxDoPayment=Pagar con Paybox
+YouWillBeRedirectedOnPayBox=Serás redirigido al sitio seguro de Paybox para ingresar la información de su tarjeta de crédito
+Continue=Siguiente
+SetupPayBoxToHavePaymentCreatedAutomatically=Configure su Paybox con la URL <b> %s </b> para que el pago se cree automáticamente cuando Paybox lo valide.
+YourPaymentHasBeenRecorded=Esta página confirma que su pago ha sido registrado. Gracias.
+YourPaymentHasNotBeenRecorded=Su pago NO ha sido registrado y la transacción ha sido cancelada. Gracias.
+InformationToFindParameters=Ayuda para encontrar la información de su cuenta %s
+PAYBOX_CGI_URL_V2=URL del módulo CGI para pago con Paybox
+VendorName=Nombre del proveedor
+CSSUrlForPaymentForm=URL de hoja de estilo CSS para formulario de pago
+NewPayboxPaymentReceived=Nuevo pago de Paybox recibido
+NewPayboxPaymentFailed=Se intentó un nuevo pago de Paybox pero falló
+PAYBOX_PAYONLINE_SENDEMAIL=Notificación por correo luego del intento de pago (exitoso o fallido)
+PAYBOX_PBX_RANG=Valor para PBX Rang
diff --git a/htdocs/langs/es_AR/paypal.lang b/htdocs/langs/es_AR/paypal.lang
new file mode 100644
index 00000000000..4d5d6959c57
--- /dev/null
+++ b/htdocs/langs/es_AR/paypal.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - paypal
+PaypalSetup=Configuración de módulo de PayPal
+PaypalDesc=Este módulo permite los pagos de clientes vía <a href="http://www.paypal.com" target="_blank">PayPal</a>. Esto puede ser usado para un simple pago o para un pago relacionado a un objeto de Dolibarr (factura, orden, ...)
+PaypalOrCBDoPayment=Pagar con PayPal (tarjeta o PayPal)
+PaypalDoPayment=Pagar con PayPal
+PAYPAL_API_SANDBOX=Modo de prueba/sandbox
+PAYPAL_API_USER=Nombre de Usuario de la API
+PAYPAL_API_PASSWORD=Contraseña de la API
+PAYPAL_API_SIGNATURE=Firma de la API
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Ofrecer pago "integral" (tarjeta de crédito+PayPal) o sólo "PayPal"
+ONLINE_PAYMENT_CSS_URL=URL opcional de hoja de estilo CSS en sitio online de pagos
+ThisIsTransactionId=Este es el ID de transacción: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Incluír la URL para pago por PayPal en documentos enviados por e-mail.
+NewOnlinePaymentReceived=Nuevo pago online recibido
+NewOnlinePaymentFailed=Nuevo intento fallido de pago online
+ONLINE_PAYMENT_SENDEMAIL=La dirección de e-mail para las notificaciones luego de cada intento de pago (tanto para los correctos como los fallidos)
+ReturnURLAfterPayment=Volver a la URL luego del pago
+ValidationOfOnlinePaymentFailed=La la validación de pago online ha fallado
+PaymentSystemConfirmPaymentPageWasCalledButFailed=El sitio de confirmación del pago que fue llamado por el sistema de pagos ha devuelto un error
+SetExpressCheckoutAPICallFailed=Llamada a función API SetExpressCheckout ha fallado
+DoExpressCheckoutPaymentAPICallFailed=Llamada a función API DoExpressCheckoutPayment ha fallado
+DetailedErrorMessage=Mensaje detallado del error
+ShortErrorMessage=Mensaje breve del error
+ErrorCode=Códgo de error
+ErrorSeverityCode=Código de severidad del error
+PaypalLiveEnabled=Modo "en vivo" de PayPal activo (caso contrario modo prueba/sandbox)
+PaypalImportPayment=Importar pagos de PayPa
+PostActionAfterPayment=Acciones posteriores a los pagos
+ARollbackWasPerformedOnPostActions=Se han deshecho los cambios en las acciones de posteo. Deberás completar estas acciones manualmente si fueran necesarias.
+ValidationOfPaymentFailed=La validación del pago ha fallado
+PayPalBalance=Crédito PayPal
diff --git a/htdocs/langs/es_AR/printing.lang b/htdocs/langs/es_AR/printing.lang
new file mode 100644
index 00000000000..e6a39eaf4ac
--- /dev/null
+++ b/htdocs/langs/es_AR/printing.lang
@@ -0,0 +1,46 @@
+# Dolibarr language file - Source file is en_US - printing
+Module64000Name=Impresión directa
+Module64000Desc=Habilitar Sistema de Impresión Directa
+PrintingSetup=Configuración de Sistema de Impresión Directa
+PrintingDesc=Este módulo agregará un botón para Imprimir en varios módulos para permitir que los documentos puedan imprimirse directamente sin necesidad de abrir el documento en otra aplicación.
+MenuDirectPrinting=Tareas de Impresión Directa
+DirectPrint=Impresión Directa
+PrintingDriverDesc=Configuración de variables para Driver de Impresión
+ListDrivers=Lista de drivers
+PrintTestDesc=Lista de Iimpresoras
+FileWasSentToPrinter=Archivo %s fue enviado a la impresora
+ViaModule=vía módulo
+NoActivePrintingModuleFound=No hay un driver activo para imprimir el documento. Revisa la configuración del módulo %s
+PleaseSelectaDriverfromList=Por favor elige un driver de la lista.
+PleaseConfigureDriverfromList=Por favor configure el driver seleccionado de la lista.
+SetupDriver=Configuración del Driver
+TargetedPrinter=Impresora Seleccionada
+PRINTGCP_INFO=Configuración de Google OAuth API
+PRINTGCP_TOKEN_ACCESS=Token para Google Cloud Print OAuth
+PrintGCPDesc=Este driver permite el envío de documentos directamente a una impresora utilizando Google Cloud Print.
+GCP_displayName=Mostrar Nombre
+GCP_Id=ID de Impresora
+GCP_OwnerName=Nombre del Dueño
+GCP_State=Estado de la Impresora
+GCP_connectionStatus=Estado En Línea
+GCP_Type=Tipo de Impresora
+PrintIPPDesc=Este driver permite el envío de documentos directamente a una impresora. Requiere sistema Linux con CUPS instalado.
+PRINTIPP_HOST=Servidor de impresora
+PRINTIPP_USER=Iniciar Sesión
+NoDefaultPrinterDefined=No se ha predeterminado una impresora
+DefaultPrinter=Impresora predeterminada
+IPP_Uri=URL de Impresora
+IPP_Name=Nombre de Impresora
+IPP_State=Estado de la Impresora
+IPP_State_reason=Motivo del Estado
+IPP_State_reason1=Motivo1 del Estado
+IPP_BW=Blanco y Negro
+IPP_Media=Calidad de Impresión
+IPP_Supported=Tipo de Calidad
+DirectPrintingJobsDesc=Esta página muestra todos los trabajos de impresión encontrados para las impresoras disponibles.
+GoogleAuthNotConfigured=No se ha configurado Google OAuth. Habilita el módulo OAuth y seleccione un ID secreto de Google.
+GoogleAuthConfigured=Las credenciales de Google OAuth fueron encontradas en la configuración del módulo OAuth
+PrintingDriverDescprintgcp=Las variables de configuración para el driver de impresión Google Cloud Print.
+PrintingDriverDescprintipp=Configuración de variables para el driver de impresión Cups.
+PrintTestDescprintgcp=Lista de Impresoras para Google Cloud Print
+PrintTestDescprintipp=Lista de Impresoras para Cups.
diff --git a/htdocs/langs/es_AR/productbatch.lang b/htdocs/langs/es_AR/productbatch.lang
new file mode 100644
index 00000000000..88c6543e9e2
--- /dev/null
+++ b/htdocs/langs/es_AR/productbatch.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - productbatch
+ManageLotSerial=Usar lote / número de serie
+ProductStatusOnBatch=Sí (se requiere lote / serie)
+ProductStatusNotOnBatch=No (lote / serie no utilizado)
+Batch=Lote / Serie
+atleast1batchfield=Fecha de consumición o Fecha de venta o Número de lote / serie
+batch_number=Número de lote / serie
+BatchNumberShort=Lote / Serie
+EatByDate=Fecha de comer
+SellByDate=Fecha de caducidad
+DetailBatchNumber=Detalles de lote / serie
+printBatch=Lote / Serie: %s
+printEatby=Coma por: %s
+printSellby=Venta por: %s
+printQty=Cantidad: %d
+AddDispatchBatchLine=Añadir una línea para el envío de vida útil
+WhenProductBatchModuleOnOptionAreForced=Cuando el módulo Lote / Serie está activado, la disminución automática de existencias se ve obligada a "Disminuir las existencias reales en la validación de envío" y el modo de aumento automático se fuerza a "Incrementar las existencias reales en el envío manual a almacenes" y no se puede editar. Otras opciones se pueden definir como quieras.
+ProductDoesNotUseBatchSerial=Este producto no usa lote / número de serie.
+ProductLotSetup=Configuración de lote de módulo / serie
+ShowCurrentStockOfLot=Mostrar stock actual para pareja producto / lote
+ShowLogOfMovementIfLot=Mostrar registro de movimientos para pareja producto / lote.
diff --git a/htdocs/langs/es_AR/products.lang b/htdocs/langs/es_AR/products.lang
new file mode 100644
index 00000000000..c42f5e892b4
--- /dev/null
+++ b/htdocs/langs/es_AR/products.lang
@@ -0,0 +1,7 @@
+# Dolibarr language file - Source file is en_US - products
+ProductRef=Ref. Producto
+ProductLabel=Etiqueta del producto
+ProductLabelTranslated=Etiqueta traducida del producto
+ProductDescriptionTranslated=Descripción traducida del producto
+ExportDataset_produit_1=Productos
+SuppliersPrices=Precio de Proveedor
diff --git a/htdocs/langs/es_AR/projects.lang b/htdocs/langs/es_AR/projects.lang
new file mode 100644
index 00000000000..4a193522103
--- /dev/null
+++ b/htdocs/langs/es_AR/projects.lang
@@ -0,0 +1,8 @@
+# Dolibarr language file - Source file is en_US - projects
+RefProject=Ref. Proyecto
+ProjectId=ID de Proyecto
+ProjectLabel=Etiqueta de Proyecto
+ProjectsArea=Area de Proyectos
+SharedProject=Todos
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
+OppStatusPROPO=Propuesta
diff --git a/htdocs/langs/es_AR/propal.lang b/htdocs/langs/es_AR/propal.lang
new file mode 100644
index 00000000000..4f0494200d1
--- /dev/null
+++ b/htdocs/langs/es_AR/propal.lang
@@ -0,0 +1,9 @@
+# Dolibarr language file - Source file is en_US - propal
+Proposals=Propuesta comercial
+ProposalShort=Propuesta
+ProposalsDraft=Presupuestos en borrador
+Prospect=Cliente Potencia
+PropalsDraft=Borradores
+PropalsOpened=Abierto
+PropalStatusDraft=Borrador (necesita ser validado)
+DefaultModelPropalCreate=Creación de modelo por defecto
diff --git a/htdocs/langs/es_AR/receptions.lang b/htdocs/langs/es_AR/receptions.lang
new file mode 100644
index 00000000000..f2ed852d480
--- /dev/null
+++ b/htdocs/langs/es_AR/receptions.lang
@@ -0,0 +1,29 @@
+# Dolibarr language file - Source file is en_US - receptions
+ReceptionsSetup=Configuración de recepción de productos
+Reception=Recepción
+ReceptionsArea=Área de recepciones
+NbOfReceptions=Cantidad de recepciones
+NumberOfReceptionsByMonth=Cantidad de recepciones por mes
+ReceptionCard=Ficha de la recepción
+QtyInOtherReceptions=Cantidad en otras recepciones
+OtherReceptionsForSameOrder=Otras recepciones para esta orden
+ReceptionsAndReceivingForSameOrder=Recepciones y recibos de esta orden.
+ReceptionsToValidate=Recepciones para validar
+StatusReceptionCanceled=Cancelada
+StatusReceptionValidated=Validada (productos para enviar o ya enviados)
+StatusReceptionProcessed=Procesada
+StatusReceptionValidatedShort=Validada
+StatusReceptionProcessedShort=Procesada
+ConfirmDeleteReception=¿Estás seguro de que quieres eliminar esta recepción?
+ConfirmValidateReception=¿Estás seguro de que quieres validar esta recepción con referencia <b>%s</b>?
+ConfirmCancelReception=¿Estás seguro de que quieres cancelar esta recepción?
+StatsOnReceptionsOnlyValidated=Estadísticas realizadas sólo con recepciones validadas. Se utilizó la fecha de validación de la recepción (la fecha prevista de entrega no siempre se conoce).
+SendReceptionByEMail=Enviar recepción por correo
+SendReceptionRef=Envío de recepción %s
+ActionsOnReception=Eventos en recepción
+ReceptionCreationIsDoneFromOrder=Por el momento, la creación de una nueva recepción se realiza desde la ficha de la orden.
+ProductQtyInReceptionAlreadySent=Cantidad de productos enviados de las órdenes de ventas abietras
+ProductQtyInSuppliersReceptionAlreadyRecevied=Cantidad de productos ya recibidos de las órdenes de proveedor abiertas
+ValidateOrderFirstBeforeReception=Primero debes validar la orden antes de poder hacer recepciones.
+ReceptionsNumberingModules=Módulo de numeración para recepciones.
+ReceptionsReceiptModel=Plantillas de documento para recepciones
diff --git a/htdocs/langs/es_AR/resource.lang b/htdocs/langs/es_AR/resource.lang
new file mode 100644
index 00000000000..6a5dbc5612a
--- /dev/null
+++ b/htdocs/langs/es_AR/resource.lang
@@ -0,0 +1,19 @@
+# Dolibarr language file - Source file is en_US - resource
+ConfirmDeleteResourceElement=Confirmar eliminación del recurso para este elemento
+NoResourceInDatabase=No hay recursos en la base de datos.
+NoResourceLinked=Ningún recurso vinculado
+ResourcePageIndex=Lista de recursos
+ResourceCard=Ficha de recurso
+AddResource=Crea un recurso
+ResourceFormLabel_ref=Nombre del recurso
+ResourceType=Tipo del recurso
+ResourceFormLabel_description=Descripción del recurso
+ResourcesLinkedToElement=Recursos vinculados al elemento
+ShowResource=Mostrar recurso
+ResourceElementPage=Recursos del elemento
+RessourceLineSuccessfullyDeleted=Línea del recurso eliminada correctamente
+RessourceLineSuccessfullyUpdated=Línea del recurso actualizada correctamente
+ResourceLinkedWithSuccess=Recurso vinculado con éxito
+ConfirmDeleteResource=Confirma eliminación de este recurso
+IdResource=ID del recurso
+ResourceTypeCode=Código de tipo de recurso
diff --git a/htdocs/langs/es_AR/salaries.lang b/htdocs/langs/es_AR/salaries.lang
new file mode 100644
index 00000000000..4b2e3729400
--- /dev/null
+++ b/htdocs/langs/es_AR/salaries.lang
@@ -0,0 +1,20 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Cuenta contable utilizada para terceros contratados
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=La cuenta contable definida en la ficha del usuario se usará solo para la contabilidad en el libro mayor. Esta se usará para el Libro Diario y como valor predeterminado de la contabilidad del Libro Mayor si no fue definida una cuenta contable del usuario.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Cuenta contable por defecto para pago de sueldos
+Salary=Sueldo
+Salaries=Sueldos
+NewSalaryPayment=Nuevo pago de sueldo
+AddSalaryPayment=Agregar pago de sueldo
+SalaryPayment=Pago de sueldo
+SalariesPayments=Pagos de sueldos
+ShowSalaryPayment=Mostrar pago de sueldo
+THM=Valor promedio por hora
+TJM=Valor promedio por día
+CurrentSalary=Sueldo actual
+THMDescription=Este valor podría ser usado para calcular el costo de tiempo insumido en un proyecto ingresado por los usuarios si se usa el Módulo de Proyectos
+TJMDescription=Este valor es sólo informativo y no será utilizado para cálculo alguno
+LastSalaries=Ultimos %s pagos de sueldos
+AllSalaries=Todos los pagos de sueldo
+SalariesStatistics=Estadísticas de sueldos
+SalariesAndPayments=Sueldos y pagos
diff --git a/htdocs/langs/es_AR/sendings.lang b/htdocs/langs/es_AR/sendings.lang
new file mode 100644
index 00000000000..0fab9dbcf71
--- /dev/null
+++ b/htdocs/langs/es_AR/sendings.lang
@@ -0,0 +1,56 @@
+# Dolibarr language file - Source file is en_US - sendings
+RefSending=Ref. viaje
+Sending=Viaje
+Sendings=Viajes
+AllSendings=Todos los viajes
+Shipment=Viaje
+Shipments=Viajes
+ShowSending=Mostrar viajes
+Receivings=Comprobantes de entrega
+SendingsArea=Área de envíos
+ListOfSendings=Lista de viajes
+LastSendings=Últimos %s viajes
+NbOfSendings=Cantidad de viajes
+NumberOfShipmentsByMonth=Cantidad de viajes por mes
+SendingCard=Ficha del viaje
+NewSending=Nuevo viaje
+CreateShipment=Crear viaje
+QtyShipped=Cantidad enviada
+QtyShippedShort=Cantidad enviada
+QtyPreparedOrShipped=Cantidad preparada o enviada
+QtyToShip=Cantidad para enviar
+QtyToReceive=Cantidad para recibir
+QtyReceived=Cantidad recibida
+QtyInOtherShipments=Cantidad en otros viajes
+KeepToShip=Pendiente de enviar
+OtherSendingsForSameOrder=Otros viajes para esta orden
+SendingsAndReceivingForSameOrder=Viajes y recepciones de esta orden
+SendingsToValidate=Viajes para validar
+StatusSendingCanceled=Cancelado
+StatusSendingValidated=Validado (productos para enviar o ya enviados)
+SendingSheet=Hoja de viaje
+ConfirmDeleteSending=¿Estás seguro que quieres eliminar este viaje?
+ConfirmValidateSending=¿Estás seguro que quieres validar este viaje con referencia <b>%s</b>?
+ConfirmCancelSending=¿Estás seguro que quieres cancelar este viaje?
+WarningNoQtyLeftToSend=Advertencia, no hay productos esperando para ser enviados.
+StatsOnShipmentsOnlyValidated=Estadísticas realizadas sólo sobre viajes validados. La fecha utilizada es la de validación del viaje (la fecha de entrega prevista no siempre se conoce).
+RefDeliveryReceipt=Ref. comprobante de entrega
+StatusReceipt=Estado del comprobante de entrega
+DateReceived=Fecha de entrega
+SendShippingByEMail=Enviar detalles del viaje por correo
+SendShippingRef=Enviar el viaje %s
+ActionsOnShipping=Eventos del viaje
+LinkToTrackYourPackage=Vínculo al seguimiento del envío
+ShipmentCreationIsDoneFromOrder=Por el momento, la creación de un nuevo viaje se realiza desde la ficha de la orden.
+ShipmentLine=Línea del viaje
+ProductQtyInCustomersOrdersRunning=Cantidad de productos de órdenes de venta abiertas
+ProductQtyInSuppliersOrdersRunning=Cantidad de productos de órdenes de compra abiertas
+ProductQtyInShipmentAlreadySent=Cantidad de productos enviados de órdenes de venta abiertas
+ProductQtyInSuppliersShipmentAlreadyRecevied=Cantidad de productos enviados de órdenes de compra abiertas
+NoProductToShipFoundIntoStock=No se encontró ningún producto para enviar en el almacén <b>%s</b>. Corrija el stock o regrese para elegir otro almacén.
+WeightVolShort=Peso/Volmen
+ValidateOrderFirstBeforeShipment=Primero debes validar la orden antes de poder realizar viajes.
+DocumentModelTyphon=Modelo de documento completo para comprobantes de entrega (logotipo...)
+SumOfProductVolumes=Suma de volúmenes de productos
+SumOfProductWeights=Suma de pesos de productos
+DetailWarehouseFormat=Peso:%s (Cantidad: %d)
diff --git a/htdocs/langs/es_AR/sms.lang b/htdocs/langs/es_AR/sms.lang
new file mode 100644
index 00000000000..a6066003f1b
--- /dev/null
+++ b/htdocs/langs/es_AR/sms.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - sms
+SmsSetup=Configuración de SMS
+SmsDesc=Esta página te permite definir opciones globales en funcionalidades de SMS
+SmsCard=Tarjeta SMS
+SmsTargets=Destinos
+SmsRecipients=Destinos
+SmsRecipient=Destino
+SmsTo=Destino
+SmsTopic=Título del SMS
+SmsMessage=Mensaje SMS
+ListOfSms=Listar campañas SMS
+DeleteASms=Remover una campaña SMS
+SmsResult=Resultado de envío de SMS
+SmsStatusSent=Enviar
+SmsStatusSentPartialy=Enviar parcial
+SmsStatusSentCompletely=Enviar completo
+SmsSuccessfulySent=SMS correctamente enviado (de %s a %s)
+ErrorSmsRecipientIsEmpty=La cantidad de destinos está vacía
+WarningNoSmsAdded=No hay nuevos teléfonos añadidos a la lista de destinos
+NbOfUniqueSms=Cantidad de teléfonos únicos
+NbOfSms=Cantidad de teléfonos
+SmsInfoCharRemain=Número de caracteres restantes
+SmsInfoNumero=(formato internacional, por ejemplo: +33899701761)
+DelayBeforeSending=Demora en el envío (minutos)
+SmsNoPossibleSenderFound=No hay emisor disponible. Revise la configuración de su proveedor de SMS
+SmsNoPossibleRecipientFound=No hay destino disponible. Revise la configuración de su proveedor de SMS.
+DisableStopIfSupported=Deshabilitar mensaje de STOP (si está soportado)
diff --git a/htdocs/langs/es_AR/stocks.lang b/htdocs/langs/es_AR/stocks.lang
new file mode 100644
index 00000000000..ecd269206da
--- /dev/null
+++ b/htdocs/langs/es_AR/stocks.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - stocks
+inventoryEdit=Editar
+inventoryDraft=Activos
+AddProduct=Agregar
+inventoryDeleteLine=Eliminar línea
+ListInventory=Lista
diff --git a/htdocs/langs/es_AR/supplier_proposal.lang b/htdocs/langs/es_AR/supplier_proposal.lang
new file mode 100644
index 00000000000..cc00f748bb2
--- /dev/null
+++ b/htdocs/langs/es_AR/supplier_proposal.lang
@@ -0,0 +1,43 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=Presupuestos de proveedores
+supplier_proposalDESC=Administrar solicitudes de precios a proveedores
+SupplierProposalNew=Nueva solicitud de precio
+CommRequest=Solicitud de precio
+CommRequests=Solicitudes de precio
+SearchRequest=Encontrar una solicitud
+DraftRequests=Solicitudes en borrador
+SupplierProposalsDraft=Presupuestos de proveedor en borrador
+LastModifiedRequests=Últimas %s solicitudes de precio modificadas
+RequestsOpened=Solicitudes de precio abiertas
+SupplierProposalArea=Área de presupuestos de proveedores
+SupplierProposals=Presupuestos de proveedores
+SupplierProposalsShort=Presupuestos de proveedores
+NewAskPrice=Nueva solicitud de precio
+ShowSupplierProposal=Mostrar solicitud de precio
+AddSupplierProposal=Crear una solicitud de precio
+SupplierProposalRefFournNotice=Antes de cambiar a "Aceptado", revise bien las referencias de los proveedores.
+ConfirmValidateAsk=¿Estás seguro que quieres validar esta solicitud de precio con nombre <b>%s</b>?
+DeleteAsk=Eliminar solicitud
+ValidateAsk=Validar solicitud
+SupplierProposalStatusDraft=Borrador (necesita ser validado)
+SupplierProposalStatusValidated=Validado (la solicitud está abierta)
+CopyAskFrom=Crear una solicitud de precio a partir de una existente
+CreateEmptyAsk=Crear solicitud en blanco
+ConfirmCloneAsk=¿Estás seguro que quieres clonar la solicitud de precio <b>%s</b>?
+ConfirmReOpenAsk=¿Estás seguro que quieres abrir nuevamente la solicitud de precio <b>%s</b>?
+SendAskByMail=Enviar solicitud de precio por corre
+SendAskRef=Enviando la solicitud de precio %s
+SupplierProposalCard=Ficha de solicitud de precio
+ConfirmDeleteAsk=¿Estás seguro que quieres eliminar esta solicitud de precio <b>%s</b>?
+ActionsOnSupplierProposal=Eventos con solicitud de precio
+DocModelAuroreDescription=Un modelo de solicitud completo (logo...)
+CommercialAsk=Solicitud de precio
+DefaultModelSupplierProposalCreate=Creación de modelo por defecto
+DefaultModelSupplierProposalToBill=Plantilla predeterminada para cerrar una solicitud de precio (aceptada)
+DefaultModelSupplierProposalClosed=Plantilla predeterminada para cerrar una solicitud de precio (rechazada)
+ListOfSupplierProposals=Lista de presupuestos de proveedores
+ListSupplierProposalsAssociatedProject=Lista de presupuestos de proveedores asociados al proyecto
+SupplierProposalsToClose=Presupuestos de proveedor para cerrar
+SupplierProposalsToProcess=Presupuestos de proveedor para procesar
+LastSupplierProposals=Últimas %s solicitudes de precio
+AllPriceRequests=Todas las solicitudes
diff --git a/htdocs/langs/es_AR/suppliers.lang b/htdocs/langs/es_AR/suppliers.lang
new file mode 100644
index 00000000000..dc19381abf8
--- /dev/null
+++ b/htdocs/langs/es_AR/suppliers.lang
@@ -0,0 +1,37 @@
+# Dolibarr language file - Source file is en_US - suppliers
+SuppliersInvoice=Factura de Proveedor
+ShowSupplierInvoice=Mostrar Factura de Proveedor
+NewSupplier=Nuevo Proveedor
+ListOfSuppliers=Lista de Proveedores
+ShowSupplier=Mostrar Proveedor
+OrderDate=Fecha de la Orden
+TotalBuyingPriceMinShort=Total de precios de compra de subproductos
+TotalSellingPriceMinShort=Total de precios de venta de subproductos
+AddSupplierPrice=Agregar precio de compra
+SupplierPrices=Precio de Proveedor
+NoRecordedSuppliers=No hay proveedor registrado
+SupplierPayment=Pago de Proveedor
+SuppliersArea=Area de Proveedor
+RefSupplierShort=Ref. Proveedor
+ExportDataset_fournisseur_1=Facturas de proveedor y su detalle
+ExportDataset_fournisseur_2=Facturas de proveedor y sus pagos
+ExportDataset_fournisseur_3=Ordenes de compra y su detalle
+ApproveThisOrder=Aprobar esta orden
+ConfirmApproveThisOrder=¿Está seguro que quiere aprobar la orden <b>%s</b>?
+DenyingThisOrder=Declinar esta orden
+ConfirmDenyingThisOrder=¿Está seguro que quiere rechazar esta orden <b>%s</b>?
+ConfirmCancelThisOrder=¿Está seguro que quiere cancelar esta orden <b>%s</b>?
+AddSupplierOrder=Crear orden de compra
+ListOfSupplierProductForSupplier=Lista de productos y precios por proveedor <b>%s</b>
+SentToSuppliers=Enviado a los proveedores
+ListOfSupplierOrders=Lista de órdenes de compra
+MenuOrdersSupplierToBill=Ordenes de compra a facturar
+NbDaysToDelivery=Demora de entrega (días)
+DescNbDaysToDelivery=La mayor demora de entrega de los productos de esta orden
+SupplierReputation=Reputación de proveedor
+DoNotOrderThisProductToThisSupplier=No solicitar
+NotTheGoodQualitySupplier=Baja calidad
+BuyerName=Nombre de comprador
+AllProductServicePrices=Todos los precios de productos / servicios
+AllProductReferencesOfSupplier=Todas las referencias de proveedor de productos / servicios
+BuyingPriceNumShort=Precio de Proveedor
diff --git a/htdocs/langs/es_AR/trips.lang b/htdocs/langs/es_AR/trips.lang
new file mode 100644
index 00000000000..864eb785dcb
--- /dev/null
+++ b/htdocs/langs/es_AR/trips.lang
@@ -0,0 +1,118 @@
+# Dolibarr language file - Source file is en_US - trips
+ShowExpenseReport=Mostrar informe de gastos
+Trips=Informe de gastos
+TripsAndExpenses=Informes de gastos
+TripsAndExpensesStatistics=Estadísticas de informes de gastos
+TripCard=Ficha del Informe de gastos
+AddTrip=Crear informe de gastos
+ListOfTrips=Lista de informes de gastos
+ListOfFees=Lista de tarifas
+TypeFees=Tipos de tarifas
+ShowTrip=Mostrar informe de gastos
+NewTrip=Nuevo informe de gastos
+FeesKilometersOrAmout=Cantidad o kilómetros
+DeleteTrip=Eliminar informe de gastos
+ConfirmDeleteTrip=¿Está seguro de que desea eliminar este informe de gastos?
+ListTripsAndExpenses=Lista de informes de gastos
+ListToApprove=Esperando aprobación
+ExpensesArea=Area de informes de gastos
+ClassifyRefunded=Clasificar como 'Reembolsado'
+ExpenseReportWaitingForApproval=Se ha enviado un nuevo informe de gastos para su aprobación.
+ExpenseReportWaitingForApprovalMessage=Se ha enviado un nuevo informe de gastos y está a la espera de su aprobación. <br> -Usuario: %s <br> - Período: %s <br> Haga click aquí para validar: %s
+ExpenseReportWaitingForReApproval=Se ha enviado un informe de gastos para su re-aprobación
+ExpenseReportWaitingForReApprovalMessage=Se ha enviado un nuevo informe de gastos y está a la espera de su re-aprobación. <br> El %s, rechazaste aprobar este informe de gastos por el siguiente motivo: %s. <br>Una nueva versión ha sido propuesta y está a la espera de tu aprobación. <br> - Usuario: %s <br> - Período: %s<br>Haga click aquí para validar: %s
+ExpenseReportApproved=Se ha aprobado un informe de gastos
+ExpenseReportApprovedMessage=El informe de gastos %s está aprobado. <br> - Usuario: %s<br> - Aprobado por: %s<br> Haga click aquí para mostrar el informe de gastos: %s
+ExpenseReportRefused=Se ha rechazado un informe de gastos
+ExpenseReportRefusedMessage=El informe de gastos %s está rechazado. <br> - Usuario: %s<br> - Rechazado por: %s<br> - Motivo del rechazo: %s<br>haga click aquí apra mostrar el informe de gastos: %s
+ExpenseReportCanceled=Se ha cancelado un informe de gastos
+ExpenseReportCanceledMessage=El informe de gastos %s se ha cancelado. <br> - Usuario: %s - <br>Cancelado por: %s <br>- Motivo de la cancelación: %s<br>Haga click aquí para mostrar el informe de gastos: %s
+ExpenseReportPaid=Se ha pagado un informe de gastos
+ExpenseReportPaidMessage=El informe de gastos %s ha sido abonado.<br> - Usuario: %s<br> - Pagado por: %s<br>Haga click aquí para mostrar el informe de gastos: %s
+TripId=ID del informe de gastos
+AnyOtherInThisListCanValidate=Persona a quién reportar para validación.
+TripNDF=Detalles del informe de gastos
+PDFStandardExpenseReports=Template estándar de informe de gastos para generar un documendo PDF
+ExpenseReportLine=Línea de informe de gastos
+TF_TRIP=Viático
+TF_LUNCH=Almuerzo
+TF_METRO=Subte
+TF_BUS=Autobús
+TF_CAR=Auto
+EX_FUE=Combustible en valor original
+EX_PAR=Estacionamiento en valor original
+EX_TOL=Peaje en valor original
+EX_IND=Suscripción a indemnización por transporte
+EX_SUM=Suministro por mantenimiento
+EX_SUO=Suministros de Oficina
+EX_CAR=Alquiler de auto
+EX_CUR=Recibos de Cliente
+EX_OTR=Otros recibos
+EX_POS=Gastos de envío
+EX_CAM=Mantenimiento y reparaciones en valor original
+EX_EMM=Comida para los empleados
+EX_GUM=Comida para invitados
+EX_FUE_VP=Combustible en valor actual
+EX_TOL_VP=Peaje en valor actual
+EX_PAR_VP=Estacionamiento en valor actual
+EX_CAM_VP=Mantenimiento y reparaciones en valor actual
+DefaultCategoryCar=Método de transporte por defecto
+DefaultRangeNumber=Rango numérico por defecto
+UploadANewFileNow=Cargar un nuevo documento
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, la regla de numeración de referencia de informe de gastos no ha sido definida en la configuración del módulo 'Informe de Gastos'
+ErrorDoubleDeclaration=Tienes declarado otro informe de gastos para un rango de fechas similar.
+AucuneLigne=Aún no se han declarado informes de gastos
+ModePaiement=Método de pago
+REFUSEUR=Rechazado por
+MOTIF_REFUS=Motivo
+MOTIF_CANCEL=Motivo
+DATE_REFUS=Fecha de rechazo
+DATE_CANCEL=Fecha de cancelación
+BROUILLONNER=Reabierto
+ExpenseReportRef=Informe de gastos de referencia
+ValidateAndSubmit=Validar y enviar para aprobación
+ValidatedWaitingApproval=Validado (a la espera de aprobación)
+NOT_AUTHOR=No eres el autor de este informe de gastos. La operación se ha cancelado.
+ConfirmRefuseTrip=¿Estás seguro que quieres rechazar este informe de gastos?
+ValideTrip=Aprobar informe de gastos
+ConfirmValideTrip=¿Estás seguro que quieres aprobar este informe de gastos
+PaidTrip=Pagar un informe de gastos
+ConfirmPaidTrip=¿Estás seguro que quieres cambiar el estado de este informe de gastos a "Pagado"?
+ConfirmCancelTrip=¿Estás seguro que quieres cancelar este informe de gastos?
+BrouillonnerTrip=Cambiar el informe de gastos a "borrador"
+ConfirmBrouillonnerTrip=¿Estás seguro que quieres cambiar este informe de gastos a "Borrador"?
+SaveTrip=Validar informe de gastos
+ConfirmSaveTrip=¿Estás seguro que quieres validar este informe de gastos?
+NoTripsToExportCSV=No se ha cargado un informe de gastos para exportar para este período.
+ExpenseReportPayment=Pago de informe de gastos
+ExpenseReportsToApprove=Informes de gastos para aprobar
+ExpenseReportsToPay=Informes de gastos para pagar
+ConfirmCloneExpenseReport=¿Estás seguro que quieres clonar este informe de gastos?
+ExpenseReportsIk=Indice de kilómetros Informe de gastos
+ExpenseReportsRules=Reglas de informe de gastos
+ExpenseReportIkDesc=Puedes modificar el cálculo del gasto de kilómetros por categoría y rango que fueron definidos previamente. <b>d</b> es la distancia en kilómetros
+ExpenseReportRulesDesc=Puedes crear o actualizar cualquier regla de cálculo. Esto será utilizado cuando el usuario quiera crear un nuevo informe de gastos
+expenseReportOffset=Compensación
+expenseReportTotalForFive=Ejemplo con <u>d</u> = 5
+expenseReportRangeFromTo=desde %d hasta %d
+expenseReportCatDisabled=Categoría deshabilitada - Por favor revisar la clave c_exp_tax_cat en el diccionario
+expenseReportRangeDisabled=Rango deshabilitado - Por favor revisar la clave c_exp_tax_range en el diccionario
+ExpenseReportDomain=Dominio donde aplicar
+ExpenseReportLimitOn=Limitar a
+ExpenseReportDateStart=Fecha de inicio
+ExpenseReportDateEnd=Fecha de fin
+ExpenseReportLimitAmount=Monto límite
+ExpenseReportRestrictive=Restringido
+ExpenseReportConstraintViolationError=Violación de regla ID [%s]: %s es superior a %s %s
+byEX_DAY=por día (limitado a %s)
+byEX_MON=por mes (limitado a %s)
+byEX_YEA=por año (limitado a %s)
+byEX_EXP=por línea (limitado a %s)
+ExpenseReportConstraintViolationWarning=Violación de regla ID [%s]: %s es superior a %s %s
+nolimitbyEX_DAY=por día (sin límite)
+nolimitbyEX_MON=por mes (sin límite)
+nolimitbyEX_YEA=por año (sin límite)
+nolimitbyEX_EXP=por línea (sin límite)
+CarCategory=Tipo de auto
+ExpenseRangeOffset=Monto de compensación: %s
+AttachTheNewLineToTheDocument=Adjuntar la línea a un documento cargado
diff --git a/htdocs/langs/es_AR/users.lang b/htdocs/langs/es_AR/users.lang
new file mode 100644
index 00000000000..4c77e324b5b
--- /dev/null
+++ b/htdocs/langs/es_AR/users.lang
@@ -0,0 +1,81 @@
+# Dolibarr language file - Source file is en_US - users
+HRMArea=Area de Recursos Humanos
+UserCard=Ficha del Usuario
+GroupCard=Ficha del Grupo
+Permission=Permiso
+EditPassword=Cambiar contraseña
+SendNewPassword=Regenerar y enviar contraseña
+SendNewPasswordLink=Enviar enlace para nueva contraseña
+ReinitPassword=Regenerar contraseña
+PasswordChangedTo=Contraseña cambiada a: %s
+SubjectNewPassword=Tu nueva contraseña para %s
+UserRights=Permisos de usuario
+UserGUISetup=Configuración de pantalla de usuario
+EnableAUser=Activar un usuario
+ConfirmDisableUser=¿Estás seguro que quieres desactivar al usuario <b>%s</b>?
+ConfirmDeleteUser=¿Estás seguro de que quieres eliminar el usuario <b>%s</b>?
+ConfirmDeleteGroup=¿Estás seguro de que quieres eliminar el grupo <b>%s</b>?
+ConfirmEnableUser=¿Estás seguro de que quieres habilitar el usuario <b>%s</b>?
+ConfirmReinitPassword=¿Estás seguro de que quieres generar una nueva contraseña para el usuario <b>%s</b>?
+ConfirmSendNewPassword=¿Estás seguro de que quieres generar y enviar una nueva contraseña para el usuario <b>%s</b>?
+LoginNotDefined=El usuario para ingreso no está definido.
+NameNotDefined=El nombre no está definido.
+ListOfUsers=Lista de usuarios
+SuperAdministrator=Super administrador
+DefaultRightsDesc=Defina aquí los permisos <u>por defecto</u> otorgados automáticamente a un usuario <u>nuevo</u> (para modificar los permisos de los usuarios existentes, vaya a la ficha del usuario).
+DolibarrUsers=Usuarios de Dolibarr
+LastName=Apellido
+ListOfGroups=Lista de grupos
+CreateGroup=Crear grupo
+RemoveFromGroup=Quitar del grupo
+PasswordChangedAndSentTo=La contraseña fue modificada y enviada a <b>%s</b>.
+PasswordChangeRequest=Solicitud de cambio de contraseña para <b>%s</b>
+PasswordChangeRequestSent=Solicitud de cambio de contraseña para <b>%s</b> enviado a <b>%s</b>.
+ShowGroup=Mostrar grupo
+ShowUser=Mostrar usuario
+NonAffectedUsers=Usuarios no asignados
+UserModified=Usuario modificado correctamente
+PhotoFile=Archivo de fotos
+ListOfUsersInGroup=Lista de usuarios en este grupo
+ListOfGroupsForUser=Lista de grupos para este usuario
+LinkToCompanyContact=Enlazar a un tercero / contacto
+LinkedToDolibarrMember=Enlazar al miembro
+LinkedToDolibarrUser=Enlazar a un usuario de Dolibarr
+LinkedToDolibarrThirdParty=Enlace a un tercero de Dolibarr
+CreateDolibarrLogin=Crear un usuario
+CreateDolibarrThirdParty=Crea un tercero
+LoginAccountDisableInDolibarr=Cuenta deshabilitada en Dolibarr.
+UsePersonalValue=Usar valor personal
+ExportDataset_user_1=Usuarios y sus propiedades
+DomainUser=Usuario de dominio %s
+CreateInternalUserDesc=Este formulario te permite crear un usuario interno en tu empresa/organización. Para crear un usuario externo (cliente, proveedor, etc.), use el botón 'Crear usuario Dolibarr' de la ficha del contacto de ese tercero.
+PermissionInheritedFromAGroup=Permiso otorgado porque se heredó de uno de los grupos de usuarios.
+UserWillBeInternalUser=El usuario creado será un usuario interno (porque no está vinculado a un tercero en particular)
+UserWillBeExternalUser=El usuario creado será un usuario externo (porque está vinculado a un tercero en particular)
+IdPhoneCaller=Identificador de llamadas
+NewUserCreated=Usuario %s creado
+NewUserPassword=Cambio de contraseña para %s
+UserDisabled=Usuario %s desactivado
+ConfirmCreateContact=¿Estás seguro que quieres crear una cuenta Dolibarr para este contacto?
+ConfirmCreateLogin=¿Estás seguro que quieres crear una cuenta Dolibarr para este miembro?
+ConfirmCreateThirdParty=¿Estás seguro que quieres crear un tercero para este miembro?
+LoginToCreate=Usuario a crear
+NameToCreate=Nombre del tercero para crear
+YourRole=Tus roles
+YourQuotaOfUsersIsReached=¡Se ha alcanzado su cuota de usuarios activos!
+NbOfUsers=Cantidad de usuarios
+NbOfPermissions=Cantidad de permisos
+DontDowngradeSuperAdmin=Solo un superadministrador puede degradar a un superadministrador
+UseTypeFieldToChange=Use el campo Tipo para cambiar
+OpenIDURL=URL de OpenID
+LoginUsingOpenID=Utilizar OpenID para ingresar
+ExpectedWorkedHours=Horas trabajadas previstas por semana
+ColorUser=Color del usuario
+DisabledInMonoUserMode=Deshabilitado en modo mantenimiento
+UserAccountancyCode=Código contable del usuario
+UserLogoff=Cerrar sesión
+UserLogged=Usuario registrado
+DateEmploymentEnd=Fecha de finalización del empleo
+ForceUserExpenseValidator=Forzar validador de informe de gastos
+ForceUserHolidayValidator=Forzar validador de licencias del usuario
+ValidatorIsSupervisorByDefault=Por defecto, el validador es el supervisor del usuario. Déjalo vacío para mantener este comportamiento.
diff --git a/htdocs/langs/es_AR/website.lang b/htdocs/langs/es_AR/website.lang
new file mode 100644
index 00000000000..ff1df53c2d8
--- /dev/null
+++ b/htdocs/langs/es_AR/website.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - website
+ReadPerm=Leído
+WebsiteAccounts=Cuentas de sitio web
diff --git a/htdocs/langs/es_AR/withdrawals.lang b/htdocs/langs/es_AR/withdrawals.lang
new file mode 100644
index 00000000000..bea9b30e1da
--- /dev/null
+++ b/htdocs/langs/es_AR/withdrawals.lang
@@ -0,0 +1,100 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+CustomersStandingOrdersArea=Area de órdenes de pago por débito automático
+SuppliersStandingOrdersArea=Area de órdenes de pago por crédito automático
+StandingOrdersPayment=Ordenes de pago por débito automático
+StandingOrderPayment=Orden de pago por débito automático
+NewStandingOrder=Nueva orden por débito automático
+StandingOrderToProcess=Para procesar
+WithdrawalsReceipts=Ordenes por débito automático
+WithdrawalReceipt=Orden de Débito Automático
+LastWithdrawalReceipts=Ultimos %s archivos de débito automático
+WithdrawalsLines=Líneas de orden de débito automático
+RequestStandingOrderToTreat=Solicitud para pago por débito automático para procesar
+RequestStandingOrderTreated=Solicitud para pago por débito automático procesada
+NotPossibleForThisStatusOfWithdrawReceiptORLine=No se puede realizar. El estado de la extracción debe estar como 'acreditado' antes de declarar un rechazo en las líneas especificadas.
+NbOfInvoiceToWithdraw=Cantidad de facturas que están a la espera de orden de débito automático
+NbOfInvoiceToWithdrawWithInfo=Cantidad de facturas de cliente con ordenes de pago por débito automático que tienen diferente información de cuenta bancaria definida
+InvoiceWaitingWithdraw=Facturas a la espera del débito automático
+AmountToWithdraw=Monto para extraer
+WithdrawsRefused=Débito automático rechazado
+NoInvoiceToWithdraw=No hay facturas de cliente a la espera de 'Solicitudes de débito automático". Vaya a la pestaña '%s' y luego a la ficha de la factura que desee para hacer una solicitud.
+ResponsibleUser=Usuario responsable
+WithdrawalsSetup=Configuración de pago por débito automático
+WithdrawStatistics=Estadísticas de pago por débito automático
+WithdrawRejectStatistics=Estadísticas de rechazos en pago por débito automático
+LastWithdrawalReceipt=Ultimos %s comprobantes de débito automático
+MakeWithdrawRequest=Crear una solicitud de pago por débito automático
+WithdrawRequestsDone=%s solicitudes registradas de pago por débito automático
+ThirdPartyBankCode=Código bancario del tercero
+NoInvoiceCouldBeWithdrawed=La factura no se ha debitado correctamente. Revise que las facturas estén en las compañías con un IBAN válido y que el mismo tenga un MRU (Mandato de Referencia Unico) con modo <strong>%s</strong>.
+ClassCredited=Clasificar como acreditado
+ClassCreditedConfirm=¿Estás seguro que quieres clasificar este comprobante de extracción como acreditado en tu cuenta bancaria?
+TransData=Fecha de transmisión
+TransMetod=Método de transmisión
+StandingOrderReject=Cargar un rechazo
+WithdrawalRefused=Extracción rechazada
+WithdrawalRefusedConfirm=¿Estás seguro que quieres ingresar un rechazo en la extracción para la empresa?
+RefusedData=Fecha de rechazo
+RefusedReason=Motivo del rechazo
+RefusedInvoicing=Facturar el rechazo
+NoInvoiceRefused=No cargar el rechazo
+InvoiceRefused=Factura rechazada (cargar el rechazo al cliente)
+StatusTrans=Enviar
+StatusCredited=Acreditado
+StatusRefused=Rechazado
+StatusMotif0=Sin especificar
+StatusMotif1=Fondos insuficientes
+StatusMotif2=Solicitud en disputa
+StatusMotif3=No hay orden de pago por débito automático
+StatusMotif4=Ordenes de venta
+StatusMotif5=RIB inutilizable
+StatusMotif8=Otra razon
+CreateForSepaFRST=Crear archivo de débito automático (SEPA FRST)
+CreateForSepaRCUR=Crear archivo de débito automático (SEPA RCUR)
+CreateAll=Crear archivo de débito automático (todos)
+OrderWaiting=A la espera de procesamiento
+NotifyTransmision=Transmisión de extracción
+NotifyCredit=Crédito de Extracción
+NumeroNationalEmetter=Número de transmisor nacional
+WithBankUsingRIB=Para cuentas bancarias que utilizan RIB
+WithBankUsingBANBIC=Para cuentas bancarias que utilizan IBAN/BIC/SWIFT
+BankToReceiveWithdraw=Cuenta bancaria destino
+CreditDate=Acreditar en
+WithdrawalFileNotCapable=No se puede generar el archivo de comprobante de extracción para su país %s (su país no es compatible)
+ShowWithdraw=Mostrar orden de débito automático
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene al menos una orden de pago por débito automático aún no procesada, no se establecerá como pagada para permitir la administración previa de extracciones.
+DoStandingOrdersBeforePayments=Esta pestaña le permite solicitar una orden de pago por débito automático. Una vez realizada, vaya al menú Banco-> Ordenes de débito automático para administrar la orden. Cuando se cierra la orden de pago, se registrará automáticamente en la factura y quedará cerrada si queda saldada.
+WithdrawalFile=Archivo de extracción
+SetToStatusSent=Colocar estado como "Archivo enviado"
+ThisWillAlsoAddPaymentOnInvoice=Esto también registrará los pagos a las facturas y las clasificará como "Pagadas" si la misma está saldada
+StatisticsByLineStatus=Estadísticas por estado de líneas
+RUMLong=Referencia única de mandato
+RUMWillBeGenerated=Si está vacío, se generará una RUM (referencia de mandato única) una vez que se guarde la información de la cuenta bancaria.
+WithdrawMode=Modo de débito automático (FRST o RECUR)
+WithdrawRequestAmount=Monto de solicitud de débito automático:
+WithdrawRequestErrorNilAmount=No se puede crear una solicitud de débito automático para un monto vacío.
+SepaMandate=Mandato de Débito Automático SEPA
+PleaseReturnMandate=Por favor, envíe este formulario de mandato por correo a %s o por correo a
+SEPALegalText=Al firmar este formulario de mandato, autorizas (A) %s a enviar instrucciones a su banco para debitar su cuenta y (B) a su banco para debitar su cuenta de acuerdo con las instrucciones de %s. Como parte de sus derechos, tiene derecho a un reembolso de su banco bajo los términos y condiciones de su acuerdo bancario. Se debe reclamar un reembolso dentro de las 8 semanas a partir de la fecha en que se realizó el débit de su cuenta. Sus derechos respecto al mandato anterior se explican en una declaración que puede obtener de su banco.
+CreditorIdentifier=Identificador del acreedor
+CreditorName=Nombre del acreedor
+SEPAFillForm=(B) Por favor complete todos los campos marcados *
+SEPAFormYourName=Tu nombre
+SEPAFormYourBAN=Su nombre de cuenta bancaria (IBAN)
+SEPAFormYourBIC=Su código de identificación bancaria (BIC)
+PleaseCheckOne=Por favor marque uno sólo
+DirectDebitOrderCreated=Orden de débito automático %s creada
+AmountRequested=Monto solicitada
+CreateForSepa=Crear archivo de débito automático
+ICS=Identificador CI de acreedor
+END_TO_END=Etiqueta "EndToEndId" SEPA XML: identificación única asignada por transacción
+USTRD=Etiqueta "Unstructured" SEPA XML
+ADDDAYS=Agregar días a la fecha de ejecución
+InfoCreditSubject=Pago de la orden de pago por débito automático %s por parte del banco
+InfoCreditMessage=La orden de pago por débito automático %s ha sido pagada por el banco <br> Datos de pago: %s
+InfoTransSubject=Transmisión de la orden de pago de débito directo %s al banco
+InfoTransMessage=La órden de pago por débito automático %s ha sido enviado al banco por %s %s. <br> <br>
+InfoTransData=Monto: %s <br> Método: %s <br> Fecha: %s
+InfoRejectSubject=Orden de pago por débito automático rechazada
+InfoRejectMessage=Hola, <br> <br> la orden de pago de débito automático de la factura %s relacionada con la empresa %s, con un monto de %s ha sido rechazada por el banco.<br><br>--<br> %s
+ModeWarning=No se configuró la opción para el modo real, nos detendremos después de esta simulación
diff --git a/htdocs/langs/es_AR/workflow.lang b/htdocs/langs/es_AR/workflow.lang
new file mode 100644
index 00000000000..c5bed780ec6
--- /dev/null
+++ b/htdocs/langs/es_AR/workflow.lang
@@ -0,0 +1,15 @@
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=Configuración de módulo Workflow
+WorkflowDesc=Este módulo provee algunas acciones automáticas. Por defecto, el Workflow está abierto (puedes hacer lo que quieras en la orden) pero aquí puedes activar algunas acciones automáticas.
+ThereIsNoWorkflowToModify=Con los módulos activados, no hay modificaciones disponibles al workflow.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear automáticamente una orden de venta luego que una propuesta comercial está firmada (la nueva orden tendrá el mismo monto de la propuesta).
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente luego que una propuesta comercial está firmada (la nueva factura tendrá el mismo monto de la propuesta).
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente luego que un contrato esté validado
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente luego que una orden de venta está cerrada (la nueva factura tendrá el mismo monto que la orden)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasificar su propuesta de origen como facturada cuando la orden de venta esté configurada como facturada (y si el monto del pedido es el mismo que el monto total de su propuesta firmada)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasificar su propuesta de origen como facturada cuando la factura de cliente esté validada (y el monto de la factura sea el mismo que el total de su propuesta firmada)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasificar su orden de venta como facturada cuando la factura de cliente esté validada (y el monto de la factura sea el mismo que el total de su orden)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasificar su orden de venta como facturada cuando la factura del cliente esté marcada como "Pagada" (y el monto de la factura sea el mismo que el total de su orden)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasificar su orden de venta como enviada cuando el viaje esté validado (y la cantidad enviada en todos sus viajes sea la misma que en el pedido para actualizar)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasificar su propuesta de origen de proveedor como facturada cuando la factura del proveedor esté validada (y que el monto de la factura sea el mismo que el total de su propuesta)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasificar su orden de compra como facturada cuando la factura de proveedor esté validada (y el monto de la factura sea el mismo que el total de su orden)
diff --git a/htdocs/langs/es_AR/zapier.lang b/htdocs/langs/es_AR/zapier.lang
new file mode 100644
index 00000000000..86ef12c8559
--- /dev/null
+++ b/htdocs/langs/es_AR/zapier.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - zapier
+ModuleZapierForDolibarrDesc =Módulo Zapier para Dolibarr
+ZapierForDolibarrSetup =Configurar Zapier para Dolibarr
diff --git a/htdocs/langs/es_BO/accountancy.lang b/htdocs/langs/es_BO/accountancy.lang
new file mode 100644
index 00000000000..9827b9d3795
--- /dev/null
+++ b/htdocs/langs/es_BO/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
diff --git a/htdocs/langs/es_BO/admin.lang b/htdocs/langs/es_BO/admin.lang
new file mode 100644
index 00000000000..27c312f77d7
--- /dev/null
+++ b/htdocs/langs/es_BO/admin.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - admin
+MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+Module56Name=Telephony
+Module56Desc=Telephony integration
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_BO/companies.lang b/htdocs/langs/es_BO/companies.lang
new file mode 100644
index 00000000000..6897cf22f06
--- /dev/null
+++ b/htdocs/langs/es_BO/companies.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - companies
+Contact=Contact
diff --git a/htdocs/langs/es_BO/modulebuilder.lang b/htdocs/langs/es_BO/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/es_BO/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/es_BO/projects.lang b/htdocs/langs/es_BO/projects.lang
new file mode 100644
index 00000000000..7e42793b0e9
--- /dev/null
+++ b/htdocs/langs/es_BO/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 5d7ab1c604e..91fa2cf60a0 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -1151,7 +1151,6 @@ BarcodeDescDATAMATRIX=Código de barras del tipo Datamatrix
 BarcodeDescQRCODE=Código de barras del tipo de código QR
 GenbarcodeLocation=Herramienta de línea de comandos de generación de código de barras (utilizada por el motor interno para algunos tipos de códigos de barras). Debe ser compatible con "genbarcode". <br> Por ejemplo: / usr / local / bin / genbarcode
 BarCodeNumberManager=Administrador para definir automáticamente los números de código de barras
-WithdrawalsSetup=Configuración del módulo de pagos de débito directo.
 ExternalRSSSetup=Configuración de importaciones de RSS externo
 NewRSS=Nueva fuente RSS
 RSSUrlExample=Una fuente RSS interesante
@@ -1234,7 +1233,6 @@ ClickToDialUrlDesc=Se llama a Url cuando se hace clic en el picto de un teléfon
 ClickToDialDesc=Este módulo hace que los números de teléfono hagan clic enlaces Un clic en el icono hará que su teléfono llame al número. Esto se puede usar para llamar a un sistema de centro de llamadas de Dolibarr que puede llamar al número de teléfono en un sistema SIP, por ejemplo.
 ClickToDialUseTelLink=Use solo un enlace "tel:" en los números de teléfono
 ClickToDialUseTelLinkDesc=Use este método si sus usuarios tienen un softphone o una interfaz de software instalada en la misma computadora que el navegador y se le llama cuando hace clic en un enlace de su navegador que comienza con &quot;tel:&quot;. Si necesita una solución de servidor completa (sin necesidad de instalación de software local), debe configurar esto en &quot;No&quot; y completar el siguiente campo.
-CashDesk=Punto de venta
 CashDeskSetup=Configuración del módulo de punto de venta
 CashDeskThirdPartyForSell=Tercero genérico predeterminado para usar en ventas
 CashDeskBankAccountForSell=Cuenta predeterminada para usar para recibir pagos en efectivo
diff --git a/htdocs/langs/es_CL/blockedlog.lang b/htdocs/langs/es_CL/blockedlog.lang
new file mode 100644
index 00000000000..49d3348ac1a
--- /dev/null
+++ b/htdocs/langs/es_CL/blockedlog.lang
@@ -0,0 +1,19 @@
+# Dolibarr language file - Source file is en_US - blockedlog
+BlockedLogDesc=Este módulo rastrea algunos eventos en un registro inalterable (que no se puede modificar una vez registrado) en una cadena de bloques, en tiempo real. Este módulo proporciona compatibilidad con los requisitos de las leyes de algunos países (como Francia con la ley Finanzas 2016 - Norme NF525).
+FingerprintsDesc=Esta es la herramienta para navegar o extraer los registros inalterables. Los registros inalterables se generan y archivan localmente en una tabla dedicada, en tiempo real cuando registra un evento de negocios. Puede usar esta herramienta para exportar este archivo y guardarlo en un soporte externo (algunos países, como Francia, le piden que lo haga todos los años). Tenga en cuenta que no hay ninguna función para eliminar este registro y que todos los cambios que se intentaron realizar directamente en este registro (por ejemplo, un pirata informático) se informarán con una huella digital no válida. Si realmente necesita purgar esta tabla porque usó su aplicación para una demostración / propósito de prueba y desea limpiar sus datos para comenzar su producción, puede pedir a su revendedor o integrador que reinicie su base de datos (se eliminarán todos sus datos).
+OkCheckFingerprintValidity=El registro de registro archivado es válido. Los datos en esta línea no se modificaron y la entrada sigue a la anterior.
+logPAYMENT_VARIOUS_CREATE=Pago (no asignado a una factura) creado
+logPAYMENT_VARIOUS_MODIFY=Pago (no asignado a una factura) modificado
+logPAYMENT_VARIOUS_DELETE=Pago (no asignado a una factura) supresión lógica.
+logPAYMENT_ADD_TO_BANK=Pago agregado al banco
+logBILL_UNPAYED=Factura del cliente fijada sin pagar
+logBILL_VALIDATE=Factura del cliente validada
+logBILL_SENTBYMAIL=Factura del cliente enviar por correo
+logMEMBER_SUBSCRIPTION_DELETE=Suscripción de miembros de eliminación lógica
+logCASHCONTROL_VALIDATE=Grabación de la cerca de efectivo
+ListOfTrackedEvents=Lista de eventos rastreados
+logDOC_PREVIEW=Vista previa de un documento validado para imprimir o descargar.
+ImpossibleToReloadObject=Objeto original (escriba %s, id %s) no vinculado (consulte la columna &#39;Datos completos&#39; para obtener datos guardados inalterables)
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=El módulo de Registros inalterables se activó debido a la legislación de su país. La desactivación de este módulo puede invalidar cualquier transacción futura con respecto a la ley y el uso de software legal, ya que no pueden ser validados por una auditoría fiscal.
+BlockedLogDisableNotAllowedForCountry=Lista de países donde el uso de este módulo es obligatorio (solo para evitar deshabilitar el módulo por error, si su país está en esta lista, no es posible deshabilitar el módulo sin editar primero esta lista. Tenga en cuenta también que habilitar / deshabilitar este módulo mantener una pista en el registro inalterable).
+TooManyRecordToScanRestrictFilters=Demasiados registros para escanear / analizar. Por favor restringe la lista con filtros más restrictivos.
diff --git a/htdocs/langs/es_CL/cashdesk.lang b/htdocs/langs/es_CL/cashdesk.lang
new file mode 100644
index 00000000000..a7597878ea3
--- /dev/null
+++ b/htdocs/langs/es_CL/cashdesk.lang
@@ -0,0 +1,43 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+CashDeskMenu=Punto de venta
+CashDesk=Punto de venta
+CashDeskBankCB=Cuenta bancaria (tarjeta)
+CashDeskBankCheque=Cuenta bancaria (cheque)
+CashdeskShowServices=Venta de servicios
+CashDeskOn=en
+ShoppingCart=Carrito de compras
+RestartSelling=Vuelve a vender
+SellFinished=Venta completa
+PrintTicket=Boleto impreso
+ProductFound=producto encontrado
+NoArticle=Sin artículo
+TotalTicket=Boleto total
+NoVAT=Sin IVA para esta venta
+Change=Exceso recibido
+BankToPay=Cuenta para el pago
+ShowCompany=Mostrar compañía
+ShowStock=Mostrar almacén
+DeleteArticle=Haga clic para eliminar este artículo
+FilterRefOrLabelOrBC=Búsqueda (Ref / Label)
+UserNeedPermissionToEditStockToUsePos=Solicita disminuir el stock en la creación de facturas, por lo que el usuario que usa POS debe tener permiso para editar el stock.
+DolibarrReceiptPrinter=Impresora de recibos Dolibarr
+PointOfSale=Punto de venta
+CloseBill=Cerrar bill
+TakeposConnectorNecesary=Se requiere &#39;conector TakePOS&#39;
+OrderPrinters=Encargar impresoras
+Receipt=Recibo
+Header=Encabezamiento
+Footer=Pie de página
+TheoricalAmount=Cantidad teórica
+RealAmount=Cantidad real
+CashFenceDone=Cerca de efectivo hecha para el período.
+NbOfInvoices=N° de facturas
+OrderNotes=pedidos
+CashDeskBankAccountFor=Cuenta predeterminada para usar para pagos en
+EnableBarOrRestaurantFeatures=Habilitar características para bar o restaurante
+ConfirmDeletionOfThisPOSSale=¿Confirma usted la eliminación de esta venta actual?
+ConfirmDiscardOfThisPOSSale=¿Quieres descartar esta venta actual?
+History=Historia
+TerminalSelect=Seleccione el terminal que desea utilizar:
+BasicPhoneLayout=Usar diseño básico para teléfonos.
+DirectPaymentButton=Botón de pago directo en efectivo
diff --git a/htdocs/langs/es_CL/categories.lang b/htdocs/langs/es_CL/categories.lang
new file mode 100644
index 00000000000..1af6a813239
--- /dev/null
+++ b/htdocs/langs/es_CL/categories.lang
@@ -0,0 +1,76 @@
+# Dolibarr language file - Source file is en_US - categories
+Rubrique=Etiqueta / Categoría
+Rubriques=Etiquetas / Categorías
+RubriquesTransactions=Etiquetas / Categorías de transacciones
+categories=etiquetas / categorías
+NoCategoryYet=No se creó ninguna etiqueta / categoría de este tipo
+AddIn=Añadir
+modify=modificar
+CategoriesArea=Etiquetas / Categorías area
+ProductsCategoriesArea=Productos / Servicios tags / categorías area
+SuppliersCategoriesArea=Etiquetas de proveedores / área de categorías
+CustomersCategoriesArea=Etiquetas de clientes / área de categorías
+MembersCategoriesArea=Etiquetas de los miembros / área de categorías
+ContactsCategoriesArea=Etiquetas de contactos / categorías
+AccountsCategoriesArea=Etiquetas de cuentas / área de categorías
+ProjectsCategoriesArea=Área de etiquetas / categorías de proyectos
+UsersCategoriesArea=Etiquetas de usuarios / área de categorías
+CatList=Lista de etiquetas / categorías
+NewCategory=Nueva etiqueta / categoría
+ModifCat=Modificar etiqueta / categoría
+CatCreated=Etiqueta / categoría creada
+CreateCat=Crear etiqueta / categoría
+CreateThisCat=Crear esta etiqueta / categoría
+NoSubCat=Sin subcategoría.
+FoundCats=Etiquetas / categorías encontradas
+ImpossibleAddCat=Imposible agregar la etiqueta / categoría %s
+WasAddedSuccessfully=<b>%s</b> fue agregado correctamente.
+ObjectAlreadyLinkedToCategory=El elemento ya está vinculado a esta etiqueta / categoría.
+ProductIsInCategories=El producto / servicio está vinculado a las siguientes etiquetas / categorías
+CompanyIsInCustomersCategories=Este tercero está vinculado a las siguientes etiquetas / categorías de clientes / prospectos
+CompanyIsInSuppliersCategories=Este tercero está vinculado a las siguientes etiquetas / categorías de proveedores
+MemberIsInCategories=Este miembro está vinculado a las siguientes etiquetas / categorías de miembros
+ContactIsInCategories=Este contacto está vinculado a las siguientes etiquetas / categorías de contactos
+ProductHasNoCategory=Este producto / servicio no está en ninguna etiqueta / categoría
+CompanyHasNoCategory=Este tercero no está en ninguna etiqueta / categoría
+MemberHasNoCategory=Este miembro no está en ninguna etiqueta / categoría
+ContactHasNoCategory=Este contacto no está en ninguna etiqueta / categoría
+ProjectHasNoCategory=Este proyecto no está en ninguna etiqueta / categoría
+ClassifyInCategory=Agregar a etiqueta / categoría
+NotCategorized=Sin etiqueta / categoría
+CategoryExistsAtSameLevel=Esta categoría ya existe con esta ref
+DeleteCategory=Eliminar etiqueta / categoría
+ConfirmDeleteCategory=¿Seguro que quieres eliminar esta etiqueta / categoría?
+NoCategoriesDefined=Sin etiqueta / categoría definida
+SuppliersCategoryShort=Etiqueta / categoría de vendedores
+CustomersCategoryShort=Etiqueta / categoría de clientes
+ProductsCategoryShort=Etiqueta / categoría de productos
+MembersCategoryShort=Etiqueta / categoría de miembros
+SuppliersCategoriesShort=Etiquetas / categorías de proveedores
+CustomersCategoriesShort=Tags/categorías de clientes
+ProspectsCategoriesShort=Etiquetas / categorías de prospectos
+CustomersProspectsCategoriesShort=Cust./Prosp. etiquetas / categorías
+ProductsCategoriesShort=Etiquetas / categorías de productos
+MembersCategoriesShort=Etiquetas / categorías de miembros
+ContactCategoriesShort=tags/categorías de contactos
+AccountsCategoriesShort=Etiquetas / categorías de cuentas
+ProjectsCategoriesShort=Etiquetas / categorías de proyectos
+UsersCategoriesShort=Etiquetas / categorías de usuarios
+StockCategoriesShort=Etiquetas / categorías de almacén
+CategId=ID de etiqueta / categoría
+CatSupList=Lista de etiquetas / categorías de proveedores
+CatCusList=Lista de etiquetas / categorías de clientes / prospectos
+CatProdList=Lista de etiquetas / categorías de productos
+CatMemberList=Lista de etiquetas / categorías de miembros
+CatContactList=Lista de etiquetas / categorías de contacto
+CatSupLinks=Enlaces entre proveedores y etiquetas / categorías
+CatCusLinks=Enlaces entre clientes / prospectos y etiquetas / categorías
+CatProdLinks=Enlaces entre productos / servicios y etiquetas / categorías
+CatProJectLinks=Enlaces entre proyectos y etiquetas / categorías
+ExtraFieldsCategories=Atributos complementarios
+CategoriesSetup=Configuración de etiquetas / categorías
+CategorieRecursiv=Enlace con la etiqueta / categoría principal automáticamente
+AddProductServiceIntoCategory=Agregue el siguiente producto / servicio
+ShowCategory=Mostrar etiqueta / categoría
+ChooseCategory=Elegir la categoría
+StocksCategoriesArea=Área de Categorías de Almacenes
diff --git a/htdocs/langs/es_CL/contracts.lang b/htdocs/langs/es_CL/contracts.lang
new file mode 100644
index 00000000000..618102c3020
--- /dev/null
+++ b/htdocs/langs/es_CL/contracts.lang
@@ -0,0 +1,74 @@
+# Dolibarr language file - Source file is en_US - contracts
+ContractsArea=Área de contratos
+ListOfContracts=Lista de contratos
+ContractCard=Tarjeta de contrato
+ContractStatusNotRunning=No corras
+ServiceStatusInitial=No corras
+ServiceStatusRunning=Corriendo
+ServiceStatusNotLate=Corriendo, no caducado
+ServiceStatusNotLateShort=No caducado
+ServiceStatusLate=Corriendo, expirado
+ShowContractOfService=Mostrar contrato de servicio
+ContractsAndLine=Contratos y línea de contratos
+Closing=Clausura
+MenuInactiveServices=Servicios no activos
+MenuRunningServices=Servicios en uso
+MenuExpiredServices=Servicios caducados
+AddContract=Crear actividad
+ConfirmDeleteAContract=¿Seguro que quieres eliminar este contrato y todos sus servicios?
+ConfirmValidateContract=¿Estas seguro que deseas validar este contrato con el nombre de <b>%s</b>?
+ConfirmActivateAllOnContract=Esto abrirá todos los servicios (aún no activos). ¿Estás seguro de que deseas abrir todos los servicios?
+ConfirmCloseContract=Esto cerrará todos los servicios (activos o no). ¿Seguro que quieres cerrar este contrato?
+ConfirmCloseService=¿Estas seguro que quieres cerrar este servicio con fecha <b>%s</b>?
+ActivateService=Activar servicio
+ConfirmActivateService=¿Estas seguro que quieres activar este servicio con fecha <b>%s</b>?
+RefContract=Referencia del contrato
+DateContract=Fecha del contrato
+DateServiceActivate=Fecha de activación del servicio
+ListOfServices=Lista de servicios
+ListOfInactiveServices=Lista de servicios no activos
+ListOfExpiredServices=Lista de servicios activos caducados
+ListOfClosedServices=Lista de servicios cerrados
+ListOfRunningServices=Lista de servicios en ejecución
+NotActivatedServices=Servicios inactivos (entre los contratos validados)
+BoardNotActivatedServices=Servicios para activar entre contratos validados
+BoardNotActivatedServicesShort=Servicios para activar
+ContractStartDate=Fecha de inicio
+ContractEndDate=Fecha final
+DateStartPlanned=Fecha de inicio planificada
+DateStartPlannedShort=Fecha de inicio planificada
+DateEndPlanned=Fecha de finalización planificada
+DateEndPlannedShort=Fecha de finalización planificada
+DateStartReal=Fecha de inicio real
+DateStartRealShort=Fecha de inicio real
+DateEndReal=Fecha de finalización real
+DateEndRealShort=Fecha de finalización real
+CloseService=Cerrar servicio
+BoardRunningServices=Servicios en ejecución
+BoardRunningServicesShort=Servicios en ejecución
+BoardExpiredServicesShort=Servicios vencidos
+DraftContracts=Borradores de contratos
+CloseRefusedBecauseOneServiceActive=El contrato no se puede cerrar ya que hay al menos un servicio abierto en él
+ActivateAllContracts=Activar todas las líneas de contrato
+CloseAllContracts=Cierre todas las líneas de contrato
+DeleteContractLine=Eliminar una línea de contrato
+ConfirmDeleteContractLine=¿Estás seguro de que deseas eliminar esta línea de contrato?
+MoveToAnotherContract=Mueva el servicio a otro contrato.
+ConfirmMoveToAnotherContract=Escogí un nuevo contrato objetivo y confirmo que deseo transferir este servicio a este contrato.
+ConfirmMoveToAnotherContractQuestion=Elija en qué contrato existente (del mismo tercero), desea mover este servicio?
+PaymentRenewContractId=Renovar la línea del contrato (número %s)
+ExpiredSince=Fecha de caducidad
+NoExpiredServices=Sin servicios activos caducados
+ListOfServicesToExpireWithDuration=Lista de servicios caducará en %s días
+ListOfServicesToExpireWithDurationNeg=Lista de servicios caducados desde más de %s días
+ListOfServicesToExpire=Lista de servicios para vencer
+NoteListOfYourExpiredServices=Esta lista contiene solo servicios de contratos para terceros a los que está vinculado como representante de ventas.
+StandardContractsTemplate=Plantilla de contratos estándar
+OnlyLinesWithTypeServiceAreUsed=Solo se clonarán las líneas con el tipo "Servicio".
+ConfirmCloneContract=¿Está seguro que quiere clonar el contrato <b>%s</b>?
+LowerDateEndPlannedShort=Fecha de finalización planificada más baja de los servicios activos
+TypeContact_contrat_internal_SALESREPSIGN=Representante de ventas firmando contrato
+TypeContact_contrat_internal_SALESREPFOLL=Contrato de seguimiento del representante de ventas
+TypeContact_contrat_external_BILLING=Contacto de cliente de facturación
+TypeContact_contrat_external_CUSTOMER=Seguimiento de contacto con el cliente
+TypeContact_contrat_external_SALESREPSIGN=Firma del contrato de contacto con el cliente
diff --git a/htdocs/langs/es_CL/cron.lang b/htdocs/langs/es_CL/cron.lang
new file mode 100644
index 00000000000..2e5a82e0aca
--- /dev/null
+++ b/htdocs/langs/es_CL/cron.lang
@@ -0,0 +1,63 @@
+# Dolibarr language file - Source file is en_US - cron
+Permission23101 =Leer trabajo programado
+Permission23102 =Crear / actualizar trabajo programado
+Permission23103 =Eliminar trabajo programado
+Permission23104 =Ejecutar trabajo programado
+CronSetup=Configuración programada de gestión de trabajos
+URLToLaunchCronJobs=URL para verificar e iniciar trabajos cron calificados
+OrToLaunchASpecificJob=O para verificar e iniciar un trabajo específico
+KeyForCronAccess=Clave de seguridad para URL para iniciar trabajos cron
+FileToLaunchCronJobs=Línea de comando para verificar e iniciar trabajos cron calificados
+CronExplainHowToRunUnix=En el entorno Unix, debe usar la siguiente entrada crontab para ejecutar la línea de comando cada 5 minutos
+CronExplainHowToRunWin=En el entorno de Microsoft (tm) Windows, puede usar las herramientas de tareas programadas para ejecutar la línea de comandos cada 5 minutos
+CronJobDefDesc=Los perfiles de trabajo cron están definidos en el archivo descriptor del módulo. Cuando el módulo está activado, están cargados y disponibles para que pueda administrar los trabajos desde el menú de herramientas de administrador %s.
+CronJobProfiles=Lista de perfiles de trabajo cron predefinidos
+EnabledAndDisabled=Habilitado e inhabilitado
+CronLastOutput=Salida más reciente
+CronLastResult=Código de resultado más reciente
+CronCommand=Mando
+CronList=Trabajos programados
+CronDelete=Eliminar trabajos programados
+CronConfirmDelete=¿Seguro que quieres eliminar estos trabajos programados?
+CronExecute=Lanzar trabajo programado
+CronConfirmExecute=¿Estás seguro de que deseas ejecutar estos trabajos programados ahora?
+CronInfo=El módulo de trabajo programado permite programar trabajos para ejecutarlos automáticamente. Los trabajos también se pueden iniciar manualmente.
+CronTask=Trabajo
+CronDtStart=No antes
+CronDtNextLaunch=Siguiente ejecución
+CronDtLastResult=Fecha de finalización de la última ejecución
+CronMethod=Método
+CronModule=Módulo
+CronNoJobs=No hay trabajos registrados
+CronNbRun=Número de lanzamientos
+CronMaxRun=Número máximo de lanzamientos
+CronEach=Cada
+JobFinished=Trabajo lanzado y terminado
+CronAdd=Agregar trabajos
+CronEvery=Ejecutar el trabajo cada
+CronObject=Instancia / Objeto para crear
+CronArgs=Parámetros
+CronSaveSucess=Guardado exitosamente
+CronFieldMandatory=Fields %s es obligatorio
+CronErrEndDateStartDt=La fecha de finalización no puede ser anterior a la fecha de inicio
+CronStatusActiveBtn=Habilitar
+CronStatusInactiveBtn=Inhabilitar
+CronTaskInactive=Este trabajo está deshabilitado
+CronId=Carné de identidad
+CronModuleHelp=Nombre del directorio del módulo Dolibarr (también funciona con un módulo externo Dolibarr). <BR> Por ejemplo, para llamar al método fetch de Dolibarr Product object / htdocs / <u>product</u> /class/product.class.php, el valor para el módulo es <br> <i>producto</i>
+CronClassFileHelp=La ruta relativa y el nombre del archivo a cargar (la ruta es relativa al directorio raíz del servidor web). <BR> Por ejemplo, para llamar al método fetch del objeto del producto Dolibarr htdocs / product / class / <u>product.class.php</u> , el valor para el nombre del archivo de clase es <br> <i>producto / clase / producto.clase.php</i>
+CronObjectHelp=El nombre del objeto a cargar. <BR> Por ejemplo, para llamar al método fetch del objeto del producto Dolibarr /htdocs/product/class/product.class.php, el valor para el nombre del archivo de clase es <br> <i>Producto</i>
+CronMethodHelp=El método objeto para lanzar. <BR> Por ejemplo, para llamar al método fetch del objeto del producto Dolibarr /htdocs/product/class/product.class.php, el valor para method es <br> <i>ha podido recuperar</i>
+CronArgsHelp=Los argumentos del método. <BR> Por ejemplo, para llamar al método fetch del objeto del producto Dolibarr /htdocs/product/class/product.class.php, el valor para los parámetros puede ser <br> <i>0, ProductRef</i>
+CronCommandHelp=La línea de comando del sistema para ejecutar.
+CronCreateJob=Crear nuevo trabajo programado
+CronType=Tipo de empleo
+CronType_method=Método de llamada de una clase de PHP
+CronType_command=Comando de shell
+CronCannotLoadClass=No se puede cargar el archivo de clase %s (para usar la clase %s)
+CronCannotLoadObject=Se cargó el archivo de clase %s, pero no se encontró el objeto %s en él
+UseMenuModuleToolsToAddCronJobs=Vaya al menú "<a href="%s">Inicio - Herramientas de administración - Trabajos programados</a>" para ver y editar trabajos programados.
+JobDisabled=Trabajo deshabilitado
+MakeLocalDatabaseDumpShort=Copia de seguridad local
+MakeLocalDatabaseDump=Crear un volcado de base de datos local. Los parámetros son: compresión (&#39;gz&#39; o &#39;bz&#39; o &#39;ninguno&#39;), tipo de copia de seguridad (&#39;mysql&#39;, &#39;pgsql&#39;, &#39;auto&#39;), 1, &#39;auto&#39; o nombre de archivo para compilar, número de archivos de copia de seguridad para mantener
+WarningCronDelayed=Atención, para fines de rendimiento, cualquiera que sea la próxima fecha de ejecución de trabajos habilitados, sus trabajos pueden demorarse hasta un máximo de %s horas, antes de ejecutarse.
diff --git a/htdocs/langs/es_CL/deliveries.lang b/htdocs/langs/es_CL/deliveries.lang
new file mode 100644
index 00000000000..a0426d8f4b9
--- /dev/null
+++ b/htdocs/langs/es_CL/deliveries.lang
@@ -0,0 +1,24 @@
+# Dolibarr language file - Source file is en_US - deliveries
+Delivery=Entrega
+DeliveryRef=Entrega de Ref
+DeliveryCard=Tarjeta de recibo
+DeliveryOrder=Recibo de entrega
+CreateDeliveryOrder=Generar recibo de entrega
+SetDeliveryDate=Establecer fecha de envío
+ValidateDeliveryReceipt=Validar recibo de entrega
+ValidateDeliveryReceiptConfirm=¿Seguro que quieres validar este recibo de entrega?
+DeleteDeliveryReceipt=Eliminar recibo de entrega
+DeleteDeliveryReceiptConfirm=¿Estás seguro de que deseas eliminar el recibo de entrega <b>%s</b>?
+DeliveryMethod=Método de entrega
+TrackingNumber=El número de rastreo
+DeliveryNotValidated=Entrega no validada
+StatusDeliveryCanceled=Cancelado
+NameAndSignature=Nombre y firma:
+ToAndDate=A___________________________________ el ____ / _____ / __________
+GoodStatusDeclaration=Han recibido los productos anteriores en buenas condiciones,
+Deliverer=Entregador:
+Sender=Remitente
+Recipient=Recipiente
+NonShippable=No se puede enviar
+ShowReceiving=Mostrar recibo de entrega
+NonExistentOrder=Orden inexistente
diff --git a/htdocs/langs/es_CL/dict.lang b/htdocs/langs/es_CL/dict.lang
new file mode 100644
index 00000000000..89abf19299b
--- /dev/null
+++ b/htdocs/langs/es_CL/dict.lang
@@ -0,0 +1,78 @@
+# Dolibarr language file - Source file is en_US - dict
+CountryTG=Ir
+CountryCI=Costa de Ivoiry
+CountryBH=Bahrein
+CountryBY=Belarús
+CountryBM=islas Bermudas
+CountryBT=Bhután
+CountryBA=Bosnia y Herzegovina
+CountryCX=Isla de Navidad
+CountryCD=Congo, República Democrática del
+CountryFO=Islas Faroe
+CountryGF=Guayana Francesa
+CountryPF=Polinesia francés
+CountryTF=Territorios Franceses del Sur
+CountryGL=Tierra Verde
+CountryGY=Guayana
+CountryHM=Heard Island y McDonald
+CountryVA=Santa Sede (Estado de la Ciudad del Vaticano)
+CountryIR=Corrí
+CountryIQ=Irak
+CountryJO=Jordán
+CountryLY=libio
+CountryMK=Macedonia, la ex Yugoslavia de
+CountryMX=Méjico
+CountryPS=Territorio Palestino, Ocupado
+CountryPG=Papúa Nueva Guinea
+CountryQA=Katar
+CountrySH=Santa Helena
+CountryZA=Sudáfrica
+CountryGS=Georgia del sur y las islas Sandwich del sur
+CountrySJ=Svalbard y Jan Mayen
+CountrySZ=Swazilandia
+CountrySY=Sirio
+CountryUM=Islas menores alejadas de los Estados Unidos
+CountryVI=Islas Vírgenes, EE. UU.
+CountryEH=Sahara Occidental
+CountryBL=San Bartolomé
+CountryMF=San Martín
+CivilityMME=Sra.
+CivilityMR=Sr.
+CivilityMLE=Sra.
+CurrencyAUD=Dólares AU
+CurrencySingAUD=Dólar AU
+CurrencyCAD=CAN dólares
+CurrencySingCAD=Dólar CAN
+CurrencyGBP=GB libras
+CurrencySingGBP=GB Libra
+CurrencyMUR=Rupias de Mauricio
+CurrencySingMUR=Rupia de Mauricio
+CurrencyNOK=Krones noruegos
+CurrencyUSD=Dolares estadounidenses
+CurrencySingUSD=Dólar estadounidense
+CurrencyXPF=CFP francos
+CurrencySingXPF=CFP Franco
+CurrencyCentEUR=centavos
+CurrencyCentSingEUR=centavo
+CurrencyCentINR=Paisa
+CurrencyCentSingINR=Paise
+DemandReasonTypeSRC_CAMP_MAIL=Campaña de correo
+DemandReasonTypeSRC_CAMP_EMAIL=Campaña de correo electrónico
+DemandReasonTypeSRC_CAMP_FAX=Campaña de fax
+DemandReasonTypeSRC_SHOP=Comprar contacto
+DemandReasonTypeSRC_PARTNER=Compañero
+DemandReasonTypeSRC_SPONSORING=Patrocinio
+PaperFormatUSLETTER=Letra de formato US
+PaperFormatUSLEGAL=Formato Legal US
+PaperFormatUSEXECUTIVE=Formato Ejecutivo US
+PaperFormatUSLEDGER=Formato Ledger / Tabloid
+PaperFormatCAP1=Formato P1 Canadá
+PaperFormatCAP2=Formato P2 Canadá
+PaperFormatCAP3=Formato P3 Canadá
+PaperFormatCAP4=Formato P4 Canadá
+PaperFormatCAP5=Formato P5 Canadá
+PaperFormatCAP6=Formato P6 Canadá
+ExpCyclo=Capacidad más baja a 50cm3
+ExpMoto12CV=Moto 1 o 2 CV
+ExpMoto345CV=Moto 3, 4 o 5 CV
+ExpMoto5PCV=Moto de 5 CV y ​​más
diff --git a/htdocs/langs/es_CL/errors.lang b/htdocs/langs/es_CL/errors.lang
new file mode 100644
index 00000000000..58aca3bb9e9
--- /dev/null
+++ b/htdocs/langs/es_CL/errors.lang
@@ -0,0 +1,214 @@
+# Dolibarr language file - Source file is en_US - errors
+NoErrorCommitIsDone=Sin error, nos comprometemos
+ErrorButCommitIsDone=Errores encontrados pero validamos a pesar de esto
+ErrorBadEMail=Correo electrónico %s es incorrecto
+ErrorBadUrl=Url %s está mal
+ErrorBadValueForParamNotAString=Mal valor para su parámetro En general, se agrega cuando falta la traducción.
+ErrorLoginAlreadyExists=Login %s ya existe.
+ErrorRecordNotFound=Registro no encontrado.
+ErrorFailToCopyFile=Fallo al copiar el archivo '<b>%s</b>' en '<b>%s</b>'.
+ErrorFailToCopyDir=Error al copiar el directorio '<b>%s</b>' en '<b>%s</b>'.
+ErrorFailToRenameFile=Falló al renombrar el archivo '<b>%s</b>' en '<b>%s</b>'.
+ErrorFailToDeleteFile=Falló al eliminar el archivo '<b>%s</b>'.
+ErrorFailToCreateFile=Falló al crear el archivo '<b>%s</b>'.
+ErrorFailToRenameDir=Falló al renombrar el directorio '<b>%s</b>' a '<b>%s</b>'.
+ErrorFailToCreateDir=Falló al crear el directorio '<b>%s</b>'.
+ErrorFailToDeleteDir=Falló al borrar el directorio '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Falló al reemplazar el archivo '<b>%s</b>'.
+ErrorFailToGenerateFile=Falló al generar el archivo '<b>%s</b>'.
+ErrorCashAccountAcceptsOnlyCashMoney=Esta cuenta bancaria es una cuenta de efectivo, por lo que solo acepta pagos de tipo efectivo.
+ErrorFromToAccountsMustDiffers=Las cuentas bancarias de origen y destino deben ser diferentes.
+ErrorBadThirdPartyName=Mal valor para el nombre de terceros
+ErrorBadCustomerCodeSyntax=Mala sintaxis para el código de cliente
+ErrorBadBarCodeSyntax=Mala sintaxis para el código de barras. Puede ser que establezca un tipo de código de barras incorrecto o que haya definido una máscara de código de barras para la numeración que no coincida con el valor escaneado.
+ErrorCustomerCodeRequired=Código de cliente requerido
+ErrorCustomerCodeAlreadyUsed=Código de cliente ya usado
+ErrorBarCodeAlreadyUsed=Código de barras ya utilizado
+ErrorPrefixRequired=Prefijo requerido
+ErrorBadSupplierCodeSyntax=Mala sintaxis para el código de proveedor
+ErrorSupplierCodeRequired=Se requiere código de proveedor
+ErrorBadParameters=Malos parámetros
+ErrorBadValueForParameter=Valor incorrecto '%s' para el parámetro '%s'
+ErrorBadImageFormat=El archivo de imagen no tiene un formato compatible (Su PHP no admite funciones para convertir imágenes de este formato)
+ErrorBadDateFormat=El valor '%s' tiene formato de fecha incorrecto
+ErrorFailedToWriteInDir=Error al escribir en el directorio %s
+ErrorFoundBadEmailInFile=Se encontró una sintaxis de correo electrónico incorrecta para %s líneas en el archivo (línea de ejemplo %s con correo electrónico = %s)
+ErrorUserCannotBeDelete=El usuario no puede ser eliminado. Tal vez esté asociado a entidades dolibarr.
+ErrorFieldsRequired=Algunos campos requeridos no fueron completados.
+ErrorSubjectIsRequired=El tema del correo electrónico es obligatorio
+ErrorFailedToCreateDir=Error al crear un directorio. Compruebe que el usuario del servidor web tenga permisos para escribir en el directorio de documentos de Dolibarr. Si el parámetro <b> safe_mode </ b> está habilitado en este PHP, verifique que los archivos php de Dolibarr sean propiedad del usuario (o grupo) del servidor web.
+ErrorNoMailDefinedForThisUser=Sin correo definido para este usuario
+ErrorFeatureNeedJavascript=Esta característica necesita javascript para activarse para funcionar. Cambie esto en la configuración - visualización.
+ErrorTopMenuMustHaveAParentWithId0=Un menú de tipo 'Superior' no puede tener un menú principal. Pon 0 en el menú principal o elige un menú de tipo 'Izquierda'.
+ErrorLeftMenuMustHaveAParentId=Un menú de tipo 'Izquierda' debe tener una identificación principal.
+ErrorFileNotFound=Archivo <b>%s</b> no encontrado (Ruta incorrecta, permisos incorrectos o acceso denegado por PHP open_basedir o el parámetro safe_mode)
+ErrorDirNotFound=Directorio <b>%s</b> no encontrado (ruta incorrecta, permisos incorrectos o acceso denegado por PHP open_basedir o parámetro safe_mode)
+ErrorFunctionNotAvailableInPHP=La función <b>%s</b> es necesaria para esta función, pero no está disponible en esta versión/configuración de PHP.
+ErrorDirAlreadyExists=Ya existe un directorio con este nombre.
+ErrorPartialFile=Archivo no recibido por completo por el servidor.
+ErrorNoTmpDir=La directiva temporal %s no existe.
+ErrorUploadBlockedByAddon=Carga bloqueada por un plugin PHP / Apache.
+ErrorFileSizeTooLarge=El tamaño del archivo es demasiado grande.
+ErrorSizeTooLongForIntType=Tamaño demasiado largo para el tipo int (%s dígitos máximo)
+ErrorSizeTooLongForVarcharType=Tamaño demasiado largo para el tipo de cadena (%s caracteres máximo)
+ErrorNoValueForSelectType=Por favor complete el valor para la lista de selección
+ErrorNoValueForCheckBoxType=Por favor complete el valor para la lista de casillas de verificación
+ErrorNoValueForRadioType=Por favor complete el valor para la lista de radio
+ErrorBadFormatValueList=El valor de la lista no puede tener más de una coma: <u>%s</u>, pero necesita al menos una: clave, valor
+ErrorFieldCanNotContainSpecialCharacters=El campo <b>%s</b> no debe contener caracteres especiales.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=El campo <b>%s</b> no debe contener caracteres especiales, ni mayúsculas, y no puede contener solo números.
+ErrorFieldMustHaveXChar=El campo <b>%s</b> debe tener al menos %s caracteres.
+ErrorNoAccountancyModuleLoaded=Sin módulo de contabilidad activado
+ErrorExportDuplicateProfil=Este nombre de perfil ya existe para este conjunto de exportación.
+ErrorLDAPSetupNotComplete=La coincidencia Dolibarr-LDAP no está completa.
+ErrorLDAPMakeManualTest=Se ha generado un archivo .ldif en el directorio %s. Intente cargarlo manualmente desde la línea de comando para tener más información sobre los errores.
+ErrorCantSaveADoneUserWithZeroPercentage=No se puede guardar una acción con &quot;estado no iniciado&quot; si el campo &quot;hecho por&quot; también se llena.
+ErrorRefAlreadyExists=La referencia utilizada para la creación ya existe.
+ErrorPleaseTypeBankTransactionReportName=Ingrese el nombre del extracto bancario donde se debe informar la entrada (Formato AAAAMM o AAAAMMDD)
+ErrorRecordHasChildren=Error al eliminar el registro ya que tiene algunos registros secundarios.
+ErrorRecordIsUsedCantDelete=No se puede borrar el registro. Ya está usado o incluido en otro objeto.
+ErrorModuleRequireJavascript=Javascript no debe deshabilitarse para que esta característica funcione. Para activar / desactivar Javascript, vaya al menú Inicio-> Configuración-> Pantalla.
+ErrorPasswordsMustMatch=Ambas contraseñas mecanografiadas deben coincidir
+ErrorContactEMail=Se produjo un error técnico. Comuníquese con el administrador para seguir el correo electrónico <b>%s</b> y proporcione el código de error <b>%s</b> en su mensaje, o agregue una copia de pantalla de esta página.
+ErrorWrongValueForField=Campo <b>%s</b> : &#39; <b>%s</b> &#39; no coincide con la regla de expresión regular <b>%s</b>
+ErrorFieldValueNotIn=El campo <b>%s</b> : &#39; <b>%s</b> &#39; no es un valor encontrado en el campo <b>%s</b> de <b>%s</b>
+ErrorFieldRefNotIn=Campo <b>%s</b> : &#39; <b>%s</b> &#39; no es una <b>referencia %s</b> existente
+ErrorsOnXLines=Se encontraron errores %s
+ErrorFileIsInfectedWithAVirus=El programa antivirus no pudo validar el archivo (el archivo podría estar infectado por un virus)
+ErrorSpecialCharNotAllowedForField=Los caracteres especiales no están permitidos para el campo "%s"
+ErrorNumRefModel=Existe una referencia en la base de datos (%s) y no es compatible con esta regla de numeración. Elimine la referencia de registro o renombrada para activar este módulo.
+ErrorQtyTooLowForThisSupplier=Cantidad demasiado baja para este proveedor o ningún precio definido en este producto para este proveedor
+ErrorOrdersNotCreatedQtyTooLow=Algunos pedidos no se han creado debido a cantidades demasiado bajas
+ErrorModuleSetupNotComplete=La configuración del módulo %s parece estar incompleta. Vaya a Inicio - Configuración - Módulos para completar.
+ErrorBadMaskFailedToLocatePosOfSequence=Error, máscara sin número de secuencia
+ErrorBadMaskBadRazMonth=Error, mal valor de reinicio
+ErrorCounterMustHaveMoreThan3Digits=El contador debe tener más de 3 dígitos
+ErrorDeleteNotPossibleLineIsConsolidated=La eliminación no es posible porque el registro está vinculado a una transacción bancaria conciliada
+ErrorProdIdAlreadyExist=%s está asignado a otro tercio
+ErrorFailedToSendPassword=Error al enviar la contraseña
+ErrorFailedToLoadRSSFile=No puede obtener la fuente RSS. Intente agregar constante MAIN_SIMPLEXMLLOAD_DEBUG si los mensajes de error no proporcionan suficiente información.
+ErrorForbidden=Acceso denegado. <br> Intenta acceder a una página, área o función de un módulo deshabilitado o sin estar en una sesión autenticada o que no está permitido para su usuario.
+ErrorForbidden2=El administrador de Dolibarr puede definir el permiso para este inicio de sesión desde el menú %s->%s.
+ErrorForbidden3=Parece que Dolibarr no se usa a través de una sesión autenticada. Eche un vistazo a la documentación de configuración de Dolibarr para saber cómo administrar las autenticaciones (htaccess, mod_auth u otras ...).
+ErrorNoImagickReadimage=La clase Imagick no se encuentra en este PHP. No hay vista previa disponible. Los administradores pueden desactivar esta pestaña desde el menú Configuración - Pantalla.
+ErrorRecordAlreadyExists=El registro ya existe
+ErrorCantReadFile=Error al leer el archivo '%s'
+ErrorCantReadDir=Error al leer el directorio '%s'
+ErrorBadLoginPassword=Mal valor para el inicio de sesión o la contraseña
+ErrorLoginDisabled=Su cuenta ha sido deshabilitada
+ErrorFailedToRunExternalCommand=Error al ejecutar el comando externo. Verifique que esté disponible y ejecutable por su servidor PHP. Si PHP <b> Safe Mode </ b> está habilitado, verifique que el comando esté dentro de un directorio definido por el parámetro <b> safe_mode_exec_dir </ b>.
+ErrorFailedToChangePassword=Error al cambiar la contraseña
+ErrorLoginDoesNotExists=Usuario con inicio de sesión <b>%s</b> no se pudo encontrar.
+ErrorLoginHasNoEmail=Este usuario no tiene una dirección de correo electrónico. Proceso abortado
+ErrorBadValueForCode=Mal valor para el código de seguridad. Inténtalo de nuevo con un nuevo valor ...
+ErrorQtyForCustomerInvoiceCantBeNegative=La cantidad para la línea en las facturas del cliente no puede ser negativa
+ErrorWebServerUserHasNotPermission=La cuenta de usuario <b>%s</b> utilizada para ejecutar el servidor web no tiene permiso para eso
+ErrorNoActivatedBarcode=Ningún tipo de código de barras activado
+ErrUnzipFails=Error al descomprimir %s con ZipArchive
+ErrNoZipEngine=No hay motor para comprimir / descomprimir el archivo %s en este PHP
+ErrorFileMustBeADolibarrPackage=El archivo %s debe ser un paquete zip de Dolibarr
+ErrorModuleFileRequired=Debe seleccionar un archivo de paquete de módulo de Dolibarr
+ErrorPhpCurlNotInstalled=PHP CURL no está instalado, esto es esencial para hablar con Paypal
+ErrorFailedToAddToMailmanList=Error al agregar el registro %s a la lista de correo %s o la base SPIP
+ErrorFailedToRemoveToMailmanList=Error al eliminar el registro %s de la lista de correo %s o la base SPIP
+ErrorNewValueCantMatchOldValue=El nuevo valor no puede ser igual al anterior
+ErrorFailedToValidatePasswordReset=Error al reiniciar la contraseña Puede ser que el reinicio ya haya sido hecho (este enlace puede usarse solo una vez). Si no, intente reiniciar el proceso de reinicio.
+ErrorToConnectToMysqlCheckInstance=La conexión a la base de datos falla. Comprobar el servidor de la base de datos se está ejecutando (por ejemplo, con mysql / mariadb, puede ejecutarlo desde la línea de comandos con 'sudo service mysql start').
+ErrorFailedToAddContact=Error al agregar contacto
+ErrorDateMustBeBeforeToday=La fecha no puede ser mayor que hoy
+ErrorPaymentModeDefinedToWithoutSetup=Se configuró un modo de pago para que escriba %s pero la configuración de la Factura del módulo no se completó para definir la información que se mostrará para este modo de pago.
+ErrorPHPNeedModule=Error, su PHP debe tener el módulo <b>%s</b> instalado para usar esta característica.
+ErrorOpenIDSetupNotComplete=Configura el archivo de configuración de Dolibarr para permitir la autenticación de OpenID, pero la URL del servicio OpenID no está definida en la constante %s
+ErrorWarehouseMustDiffers=Los almacenes de origen y destino deben diferir
+ErrorBadFormat=Mal formato!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, este miembro aún no está vinculado a ningún tercero. Vincular miembro a un tercero existente o crear un tercero nuevo antes de crear una suscripción con factura.
+ErrorThereIsSomeDeliveries=Error, hay algunas entregas vinculadas a este envío. Supresión rechazada.
+ErrorCantDeletePaymentReconciliated=No se puede eliminar un pago que generó una entrada bancaria reconciliada
+ErrorCantDeletePaymentSharedWithPayedInvoice=No se puede eliminar un pago compartido por al menos una factura con estado Pagado
+ErrorPriceExpression3=Variable no definida '%s' en definición de función
+ErrorPriceExpression4=Carácter ilegal '%s'
+ErrorPriceExpression5=Inesperado '%s'
+ErrorPriceExpression6=Número incorrecto de argumentos (%s dado, %s esperado)
+ErrorPriceExpression8=Operador inesperado '%s'
+ErrorPriceExpression9=Se produjo un error inesperado
+ErrorPriceExpression10=El operador &#39;%s&#39; carece de operando
+ErrorPriceExpression11=Esperando '%s'
+ErrorPriceExpression17=Variable no definida '%s'
+ErrorPriceExpression21=Resultado vacío '%s'
+ErrorPriceExpression22=Resultado negativo '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Los almacenes de origen y destino deben diferir
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error al tratar de realizar un movimiento de stock sin información de lote / serie, en el producto '%s' que requiere información de lote / serie
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Todas las recepciones grabadas primero deben verificarse (aprobarse o denegarse) antes de que se les permita realizar esta acción.
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Todas las recepciones grabadas primero deben verificarse (aprobarse) antes de que se les permita realizar esta acción.
+ErrorGlobalVariableUpdater0=La solicitud HTTP falló con el error '%s'
+ErrorGlobalVariableUpdater1=Formato JSON no válido '%s'
+ErrorGlobalVariableUpdater3=Los datos solicitados no se encontraron en el resultado
+ErrorGlobalVariableUpdater5=No se seleccionó ninguna variable global
+ErrorFieldMustBeANumeric=El campo <b>%s</b> debe ser un valor numérico
+ErrorMandatoryParametersNotProvided=Parámetros obligatorios no proporcionados
+ErrorOppStatusRequiredIfAmount=Usted establece una cantidad estimada para este plomo. Así que también debes ingresar su estado.
+ErrorFailedToLoadModuleDescriptorForXXX=Error al cargar la clase de descriptor de módulo para %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Mala definición de la matriz de menús en el descriptor del módulo (valor incorrecto para la tecla fk_menu)
+ErrorSavingChanges=Se ha producido un error al guardar los cambios.
+ErrorWarehouseRequiredIntoShipmentLine=Se requiere un almacén en la línea para enviar
+ErrorSupplierCountryIsNotDefined=El país para este vendedor no está definido. Corrija esto primero.
+ErrorsThirdpartyMerge=Error al fusionar los dos registros. Solicitud cancelada
+ErrorStockIsNotEnoughToAddProductOnOrder=Stock no es suficiente para que el producto %s lo agregue a un nuevo pedido.
+ErrorStockIsNotEnoughToAddProductOnInvoice=Stock no es suficiente para que el producto %s lo agregue a una nueva factura.
+ErrorStockIsNotEnoughToAddProductOnShipment=Stock no es suficiente para que el producto %s lo agregue a un nuevo envío.
+ErrorStockIsNotEnoughToAddProductOnProposal=Stock no es suficiente para que el producto %s lo agregue a una nueva propuesta.
+ErrorFailedToLoadLoginFileForMode=Error al obtener la clave de inicio de sesión para el modo '%s'.
+ErrorModuleNotFound=Archivo del módulo no fue encontrado.
+ErrorFieldAccountNotDefinedForBankLine=Valor para la cuenta de contabilidad no definida para el ID de línea de origen %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Valor para la cuenta de contabilidad no definida para el ID de factura %s (%s)
+ErrorFieldAccountNotDefinedForLine=Valor para la cuenta de contabilidad no definida para la línea (%s)
+ErrorBankStatementNameMustFollowRegex=Error, el nombre del extracto bancario debe seguir la siguiente regla de sintaxis %s
+ErrorPhpMailDelivery=Verifique que no use una cantidad demasiado alta de destinatarios y que el contenido de su correo electrónico no sea similar al de un correo no deseado. Pídale también a su administrador que verifique los archivos de registro del cortafuegos y del servidor para obtener una información más completa.
+ErrorUserNotAssignedToTask=El usuario debe ser asignado a la tarea para poder ingresar el tiempo consumido.
+ErrorModuleFileSeemsToHaveAWrongFormat=El paquete del módulo parece tener un formato incorrecto.
+ErrorFilenameDosNotMatchDolibarrPackageRules=El nombre del paquete de módulo (<strong>%s</strong>) no coincide con la sintaxis del nombre esperado: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, nombre de disparador duplicado %s. Ya cargado desde %s.
+ErrorNoWarehouseDefined=Error, no hay almacenes definidos.
+ErrorBadLinkSourceSetButBadValueForRef=El enlace que usas no es válido. Se define una 'fuente' para el pago, pero el valor para 'ref' no es válido.
+ErrorTooManyErrorsProcessStopped=Demasiados errores El proceso fue detenido.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=La validación masiva no es posible cuando se establece una opción para aumentar / disminuir el stock en esta acción (debe validar uno por uno para que pueda definir el depósito para aumentar / disminuir)
+ErrorObjectMustHaveStatusDraftToBeValidated=El objeto %s debe tener el estado 'Borrador' para ser validado.
+ErrorObjectMustHaveLinesToBeValidated=El objeto %s debe tener líneas para ser validadas.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Solo se pueden enviar facturas validadas mediante la acción masiva "Enviar por correo electrónico".
+ErrorDiscountLargerThanRemainToPaySplitItBefore=El descuento que intentas aplicar es más grande que el que queda por pagar. Divida el descuento en 2 descuentos más pequeños antes.
+ErrorFileNotFoundWithSharedLink=Archivo no fue encontrado. Puede ser que la clave compartida se haya modificado o que el archivo se haya eliminado recientemente.
+ErrorProductBarCodeAlreadyExists=El código de barras del producto %s ya existe en otra referencia del producto.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Tenga en cuenta también que no es posible utilizar productos virtuales para aumentar / disminuir automáticamente subproductos cuando al menos un subproducto (o subproducto de subproductos) necesita un número de serie / lote.
+ErrorDescRequiredForFreeProductLines=La descripción es obligatoria para líneas con producto gratis
+ErrorAPageWithThisNameOrAliasAlreadyExists=La página / contenedor <strong>%s</strong> tiene el mismo nombre o alias alternativo que el que intenta utilizar
+ErrorDuringChartLoad=Error al cargar el cuadro de cuentas. Si algunas cuentas no se cargaron, aún puede ingresarlas manualmente.
+ErrorBadSyntaxForParamKeyForContent=Mala sintaxis para param keyforcontent. Debe tener un valor que comience con %s o %s
+ErrorVariableKeyForContentMustBeSet=Error, la constante con el nombre %s (con contenido de texto para mostrar) o %s (con url externa para mostrar) debe configurarse.
+ErrorURLMustStartWithHttp=La URL %s debe comenzar con http: // o https: //
+ErrorNewRefIsAlreadyUsed=Error, la nueva referencia ya está en uso.
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, eliminar el pago vinculado a una factura cerrada no es posible.
+ErrorObjectMustHaveStatusActiveToBeDisabled=serLos objetos deben tener el estado 'Activo' para ser deshabilitado
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Los objetos deben tener el estado 'Borrador' o 'Deshabilitado' para ser habilitados
+ErrorNoFieldWithAttributeShowoncombobox=Ningún campo tiene la propiedad 'showoncombobox' en la definición del objeto '%s'. No hay forma de mostrar la combolista.
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Su parámetro PHP upload_max_filesize (%s) es más alto que el parámetro PHP post_max_size (%s). Esta no es una configuración consistente.
+WarningPasswordSetWithNoAccount=Se estableció una contraseña para este miembro. Sin embargo, no se creó ninguna cuenta de usuario. Por lo tanto, esta contraseña se almacena pero no se puede usar para iniciar sesión en Dolibarr. Puede ser utilizado por un módulo / interfaz externo, pero si no necesita definir ningún nombre de usuario o contraseña para un miembro, puede desactivar la opción "Administrar un inicio de sesión para cada miembro" desde la configuración del módulo Miembro. Si necesita administrar un inicio de sesión pero no necesita ninguna contraseña, puede mantener este campo vacío para evitar esta advertencia. Nota: El correo electrónico también se puede utilizar como inicio de sesión si el miembro está vinculado a un usuario.
+WarningEnableYourModulesApplications=Haga clic aquí para habilitar sus módulos y aplicaciones
+WarningSafeModeOnCheckExecDir=Advertencia, la opción PHP <b> safe_mode </ b> está activada, por lo que el comando debe almacenarse dentro de un directorio declarado por el parámetro php <b> safe_mode_exec_dir </ b>.
+WarningBookmarkAlreadyExists=Ya existe un marcador con este título o este objetivo (URL).
+WarningPassIsEmpty=Advertencia, la contraseña de la base de datos está vacía. Este es un agujero de seguridad. Debe agregar una contraseña a su base de datos y cambiar su archivo conf.php para reflejar esto.
+WarningConfFileMustBeReadOnly=Advertencia, el servidor web puede sobrescribir su archivo de configuración (<b> htdocs / conf / conf.php </ b>). Este es un serio agujero de seguridad. Modificar los permisos en el archivo para que esté en modo de solo lectura para el usuario del sistema operativo utilizado por el servidor web. Si usa el formato Windows y FAT para su disco, debe saber que este sistema de archivos no permite agregar permisos en el archivo, por lo que no puede ser completamente seguro.
+WarningsOnXLines=Advertencias en <b>%s</b> registro(s) fuente
+WarningNoDocumentModelActivated=No se ha activado ningún modelo para la generación de documentos. Se elegirá un modelo por defecto hasta que verifique la configuración de su módulo.
+WarningLockFileDoesNotExists=Advertencia: una vez finalizada la instalación, debe deshabilitar las herramientas de instalación / migración agregando un archivo <b>install.lock</b> en el directorio <b>%s</b> . Omitir la creación de este archivo es un grave riesgo para la seguridad.
+WarningUntilDirRemoved=Todas las advertencias de seguridad (visibles solo para usuarios de administración) permanecerán activas mientras la vulnerabilidad esté presente (o se agregue la constante MAIN_REMOVE_INSTALL_WARNING en Configuración-&gt; Otra configuración).
+WarningCloseAlways=Advertencia, el cierre se realiza incluso si la cantidad difiere entre los elementos de origen y destino. Habilite esta función con precaución.
+WarningUsingThisBoxSlowDown=Advertencia, usar este recuadro ralentiza seriamente todas las páginas que muestran el recuadro.
+WarningClickToDialUserSetupNotComplete=La configuración de la información ClickToDial para su usuario no está completa (consulte la ficha ClickToDial en su tarjeta de usuario).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Característica deshabilitada cuando la configuración de la pantalla está optimizada para navegadores ciegos o de texto.
+WarningPaymentDateLowerThanInvoiceDate=La fecha de pago (%s) es anterior a la fecha de factura (%s) para la factura %s.
+WarningTooManyDataPleaseUseMoreFilters=Demasiados datos (más de %s líneas). Utilice más filtros o configure la constante %s en un límite superior.
+WarningSomeLinesWithNullHourlyRate=Algunas veces fueron registradas por algunos usuarios mientras que su tarifa por hora no estaba definida. Se utilizó un valor de 0 %s por hora, pero esto puede dar como resultado una valoración incorrecta del tiempo empleado.
+WarningYourLoginWasModifiedPleaseLogin=Su inicio de sesión fue modificado. Por motivos de seguridad, deberá iniciar sesión con su nuevo nombre de usuario antes de la siguiente acción.
+WarningNumberOfRecipientIsRestrictedInMassAction=Advertencia, el número de destinatarios diferentes se limita a <b>%s</b> cuando se usan las acciones masivas en las listas
+WarningProjectClosed=El proyecto está cerrado. Debes volver a abrirlo primero.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Algunas transacciones bancarias se eliminaron después de que se generó el recibo, incluidos ellos. Por lo tanto, el número de cheques y el total del recibo pueden diferir del número y el total en la lista.
diff --git a/htdocs/langs/es_CL/exports.lang b/htdocs/langs/es_CL/exports.lang
new file mode 100644
index 00000000000..d30d032606e
--- /dev/null
+++ b/htdocs/langs/es_CL/exports.lang
@@ -0,0 +1,106 @@
+# Dolibarr language file - Source file is en_US - exports
+ImportableDatas=Conjunto de datos importable
+SelectExportDataSet=Elija el conjunto de datos que quiera exportar ...
+SelectImportDataSet=Elija el conjunto de datos que desea importar ...
+SelectExportFields=Elija los campos que desea exportar o seleccione un perfil de exportación predefinido
+SelectImportFields=Elija los campos de archivo de origen que desea importar y su campo de destino en la base de datos moviéndolos hacia arriba y hacia abajo con el ancla %s, o seleccione un perfil de importación predefinido:
+NotImportedFields=Campos del archivo fuente no importados
+SaveExportModel=Guarde sus selecciones como un perfil / plantilla de exportación (para reutilizar).
+SaveImportModel=Guardar este perfil de importación (para reutilizar) ...
+ExportModelName=Exportar nombre de perfil
+ExportModelSaved=Exportar perfil guardado como <b>%s</b> .
+ExportedFields=Campos exportados
+ImportModelName=Importar nombre de perfil
+ImportModelSaved=Importar perfil guardado como <b>%s</b> .
+DatasetToExport=Dataset para exportar
+DatasetToImport=Importar archivo al conjunto de datos
+ChooseFieldsOrdersAndTitle=Elija campos orden ...
+FieldsTitle=Título de los campos
+FieldTitle=Título del campo
+NowClickToGenerateToBuildExportFile=Ahora, seleccione el formato de archivo en el cuadro combinado y haga clic en &quot;Generar&quot; para compilar el archivo de exportación ...
+LibraryShort=Biblioteca
+FormatedImport=Asistente de Importación
+FormatedImportDesc2=El primer paso es elegir el tipo de datos que desea importar, luego el formato del archivo fuente y luego los campos que desea importar.
+FormatedExportDesc1=Estas herramientas permiten la exportación de datos personalizados con un asistente, para ayudarlo en el proceso sin necesidad de conocimientos técnicos.
+FormatedExportDesc2=El primer paso es elegir un conjunto de datos predefinido, luego los campos que desea exportar y en qué orden.
+FormatedExportDesc3=Cuando se seleccionan los datos para exportar, puede elegir el formato del archivo de salida.
+NoImportableData=No hay datos importables (no hay un módulo con definiciones para permitir la importación de datos)
+LineDescription=Descripción de la línea
+LineUnitPrice=Precio unitario de línea
+LineVATRate=Tasa de IVA
+LineQty=Cantidad por línea
+LineTotalHT=Cantidad excl. impuesto por línea
+LineTotalTTC=Monto con impuesto por línea
+LineTotalVAT=Cantidad de IVA por línea
+TypeOfLineServiceOrProduct=Tipo de línea (0 = producto, 1 = servicio)
+FileWithDataToImport=Archivo con datos para importar
+FileToImport=Archivo fuente para importar
+FileMustHaveOneOfFollowingFormat=El archivo a importar debe tener uno de los siguientes formatos.
+DownloadEmptyExample=Descargar archivo de plantilla con información de contenido de campo (* son campos obligatorios)
+ChooseFormatOfFileToImport=Elija el formato de archivo que se usará como formato de archivo de importación haciendo clic en el icono %s para seleccionarlo ...
+SourceFileFormat=Formato de archivo fuente
+FieldsInSourceFile=Campos en el archivo fuente
+FieldsInTargetDatabase=Campos de destino en la base de datos Dolibarr (negrita = obligatorio)
+NoFields=Sin campos
+MoveField=Mover el número de columna de campo %s
+SaveImportProfile=Guarde este perfil de importación
+ErrorImportDuplicateProfil=Error al guardar este perfil de importación con este nombre. Ya existe un perfil existente con este nombre.
+TablesTarget=Tablas dirigidas
+FieldsTarget=Campos dirigidos
+FieldTarget=Campo dirigido
+FieldSource=Campo fuente
+NbOfSourceLines=Número de líneas en el archivo fuente
+NowClickToTestTheImport=Verifique que el formato del archivo (delimitadores de campo y cadena) de su archivo coincida con las opciones que se muestran y que haya omitido la línea del encabezado, o estos se marcarán como errores en la siguiente simulación. <br> Haga clic en el botón &quot; <b>%s</b> &quot; para ejecutar una verificación de la estructura / contenido del archivo y simular el proceso de importación. <br> <b>No se cambiarán datos en su base de datos</b> .
+RunSimulateImportFile=Ejecutar simulación de importación
+FieldNeedSource=Este campo requiere datos del archivo fuente
+SomeMandatoryFieldHaveNoSource=Algunos campos obligatorios no tienen origen desde el archivo de datos
+InformationOnSourceFile=Información sobre el archivo fuente
+InformationOnTargetTables=Información sobre los campos objetivo
+SelectAtLeastOneField=Cambie al menos un campo fuente en la columna de campos para exportar
+SelectFormat=Elija este formato de archivo de importación
+RunImportFile=Datos de importacion
+NowClickToRunTheImport=Compruebe los resultados de la simulación de importación. Corrija cualquier error y vuelva a probar. <br> Cuando la simulación no informe errores, puede proceder a importar los datos a la base de datos.
+DataLoadedWithId=Los datos importados tendrán un campo adicional en cada tabla de base de datos con este ID de importación: <b>%s</b> , para permitir su búsqueda en el caso de investigar un problema relacionado con esta importación.
+ErrorMissingMandatoryValue=Los datos obligatorios están vacíos en el archivo fuente para el campo <b>%s</b> .
+TooMuchErrors=Todavía hay <b>%s</b> otras líneas de origen con errores pero la salida ha sido limitada.
+TooMuchWarnings=Todavía hay <b>%s</b> otras líneas de origen con advertencias pero la salida ha sido limitada.
+EmptyLine=Línea vacía (se descartará)
+FileWasImported=El archivo se importó con el número <b>%s</b>.
+YouCanUseImportIdToFindRecord=Puede encontrar todos los registros importados en su base de datos al filtrar en el campo <b>import_key = &#39;%s&#39;</b> .
+NbOfLinesOK=Número de líneas sin errores y sin advertencias: <b>%s</b>.
+NbOfLinesImported=Número de líneas importadas con éxito: <b>%s</b>.
+DataComeFromNoWhere=El valor para insertar proviene de ninguna parte en el archivo fuente.
+DataComeFromFileFieldNb=El valor para insertar proviene del campo número <b>%s</b> en el archivo fuente.
+DataComeFromIdFoundFromRef=El valor que proviene del campo número <b>%s</b> del archivo de origen se usará para encontrar el id del objeto principal que se usará (por lo que el objeto <b>%s</b> que tiene la referencia del archivo de origen debe existir en la base de datos).
+DataComeFromIdFoundFromCodeId=El código que proviene del campo número <b>%s</b> del archivo de origen se usará para encontrar el id del objeto primario que se usará (por lo tanto, el código del archivo de origen debe existir en el diccionario <b>%s</b> ). Tenga en cuenta que si conoce el ID, también puede usarlo en el archivo fuente en lugar del código. La importación debe funcionar en ambos casos.
+DataIsInsertedInto=Los datos provenientes del archivo fuente se insertarán en el siguiente campo:
+DataIDSourceIsInsertedInto=La identificación del objeto principal se encontró utilizando los datos en el archivo de origen, se insertará en el siguiente campo:
+DataCodeIDSourceIsInsertedInto=La identificación de la línea padre encontrada a partir del código, se insertará en el siguiente campo:
+SourceRequired=El valor de los datos es obligatorio
+SourceExample=Ejemplo de posible valor de datos
+ExampleAnyRefFoundIntoElement=Cualquier referencia encontrada para el elemento <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Cualquier código (o id) encontrado en el diccionario <b>%s</b>
+CSVFormatDesc=Formato de archivo de <b>valores separados por comas</b> (.csv). <br> Este es un formato de archivo de texto donde los campos están separados por un separador [%s]. Si se encuentra un separador dentro de un contenido de campo, el campo se redondea con un carácter redondo [%s]. El carácter de escape para escapar del carácter redondo es [%s].
+Excel95FormatDesc=Formato de archivo de <b>Excel</b> (.xls) <br> Este es el formato nativo de Excel 95 (BIFF5).
+Excel2007FormatDesc=Formato de archivo de <b>Excel</b> (.xlsx) <br> Este es el formato nativo de Excel 2007 (SpreadsheetML).
+TsvFormatDesc=<b> Formato de archivo separado por tabuladores </ b> (.tsv) <br> Este es un formato de archivo de texto donde los campos están separados por un tabulador [tabulador].
+ExportFieldAutomaticallyAdded=El campo <b>%s</b> se agregó automáticamente. Evitará que tenga líneas similares para tratar como registros duplicados (con este campo agregado, todas las líneas tendrán su propia identificación y serán diferentes).
+Enclosure=Delimitador de cuerdas
+ExportStringFilter=%% permite reemplazar uno o más caracteres en el texto
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filtros por año / mes / día <br> YYYY + YYYY, YYYYMM + YYYYMM, YYYYMMDD + YYYYMMDD: filtros en un rango de años / meses / días <br> &gt; YYYY,&gt; YYYYMM,&gt; YYYYMMDD: filtros en todos los años / meses / días siguientes <br> &lt;YYYY, &lt;YYYYMM, &lt;YYYYMMDD: filtros en todos los años / meses / días anteriores
+ExportNumericFilter=NNNNN filtra por un valor <br> NNNNN + NNNNN filtra en un rango de valores <br> <NNNNN filtra por valores más bajos <br >> NNNNN filtra por valores más altos
+ImportFromLine=Importar desde el número de línea
+EndAtLineNb=Terminar en el número de línea
+ImportFromToLine=Rango límite (de - a). P.ej. para omitir las líneas de encabezado.
+SetThisValueTo2ToExcludeFirstLine=Por ejemplo, establezca este valor en 3 para excluir las 2 primeras líneas. <br> Si las líneas del encabezado NO se omiten, esto dará lugar a múltiples errores en la Simulación de Importación.
+KeepEmptyToGoToEndOfFile=Mantenga este campo vacío para procesar todas las líneas hasta el final del archivo.
+SelectPrimaryColumnsForUpdateAttempt=Seleccione la (s) columna (s) para usar como clave principal para una importación de ACTUALIZACIÓN
+UpdateNotYetSupportedForThisImport=La actualización no es compatible con este tipo de importación (solo insertar)
+NoUpdateAttempt=No se realizó ningún intento de actualización, solo inserte
+ImportDataset_user_1=Usuarios (empleados o no) y propiedades
+ComputedField=Campo computado
+SelectFilterFields=Si quiere filtrar algunos valores, simplemente ingrese los valores aquí.
+FilteredFieldsValues=Valor para el filtro
+FormatControlRule=Regla de control de formato
+KeysToUseForUpdates=Clave (columna) a usar para <b>actualizar</b> los datos existentes
+NbInsert=Número de líneas insertadas: %s
diff --git a/htdocs/langs/es_CL/externalsite.lang b/htdocs/langs/es_CL/externalsite.lang
new file mode 100644
index 00000000000..d9fc1b5c46b
--- /dev/null
+++ b/htdocs/langs/es_CL/externalsite.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExternalSiteSetup=Enlace de configuración al sitio web externo
+ExternalSiteModuleNotComplete=El módulo ExternalSite no se configuró correctamente.
diff --git a/htdocs/langs/es_CL/ftp.lang b/htdocs/langs/es_CL/ftp.lang
new file mode 100644
index 00000000000..57e90e9ac58
--- /dev/null
+++ b/htdocs/langs/es_CL/ftp.lang
@@ -0,0 +1,13 @@
+# Dolibarr language file - Source file is en_US - ftp
+FTPClientSetup=Configuración del módulo FTP Client
+NewFTPClient=Nueva configuración de conexión FTP
+FTPArea=Área de FTP
+FTPAreaDesc=Esta pantalla muestra una vista de un servidor FTP.
+SetupOfFTPClientModuleNotComplete=La configuración del módulo de cliente FTP parece estar incompleta
+FTPFeatureNotSupportedByYourPHP=Su PHP no es compatible con funciones de FTP
+FailedToConnectToFTPServer=Error al conectarse al servidor FTP (servidor %s, puerto %s)
+FailedToConnectToFTPServerWithCredentials=Error al iniciar sesión en el servidor FTP con inicio de sesión / contraseña definidos
+FTPFailedToRemoveFile=Falló al eliminar el archivo <b>%s</b>.
+FTPFailedToRemoveDir=Error al eliminar el directorio <b>%s</b> : verifique los permisos y que el directorio esté vacío.
+ChooseAFTPEntryIntoMenu=Elija un sitio FTP del menú ...
+FailedToGetFile=Error al obtener los archivos %s
diff --git a/htdocs/langs/es_CL/help.lang b/htdocs/langs/es_CL/help.lang
new file mode 100644
index 00000000000..d7aae58d771
--- /dev/null
+++ b/htdocs/langs/es_CL/help.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - help
+CommunitySupport=Foro / Wiki support
+EMailSupport=Soporte de correos electrónicos
+RemoteControlSupport=Soporte en línea en tiempo real / remoto
+OtherSupport=Otro soporte
+ToSeeListOfAvailableRessources=Para contactar / ver los recursos disponibles:
+HelpCenter=Centro de ayuda
+DolibarrHelpCenter=Centro de Ayuda y Soporte Dolibarr
+ToGoBackToDolibarr=De lo contrario, <a href="%s">haga clic aquí para continuar usando Dolibarr</a> .
+TypeOfSupport=Tipo de apoyo
+TypeSupportCommunauty=Comunidad (gratis)
+NeedHelpCenter=¿Necesitas ayuda o soporte?
+Efficiency=Eficiencia
+TypeHelpOnly=Ayuda solo
+TypeHelpDev=Ayuda + Desarrollo
+TypeHelpDevForm=Ayuda + Desarrollo + Entrenamiento
+BackToHelpCenter=De lo contrario, <a href="%s">vuelva a la página de inicio del centro de ayuda</a> .
+LinkToGoldMember=Puede llamar a uno de los capacitadores preseleccionados por Dolibarr para su idioma (%s) haciendo clic en su Widget (el estado y el precio máximo se actualizan automáticamente):
+PossibleLanguages=Idiomas admitidos
+SubscribeToFoundation=Ayuda al proyecto Dolibarr, suscríbete a la fundación.
+SeeOfficalSupport=Para obtener asistencia oficial de Dolibarr en su idioma: <br> <b> <a href="%s" target="_blank"> %s </a> </ b>
diff --git a/htdocs/langs/es_CL/holiday.lang b/htdocs/langs/es_CL/holiday.lang
new file mode 100644
index 00000000000..80542681b19
--- /dev/null
+++ b/htdocs/langs/es_CL/holiday.lang
@@ -0,0 +1,105 @@
+# Dolibarr language file - Source file is en_US - holiday
+Holidays=Salir
+CPTitreMenu=Salir
+MenuAddCP=Nueva solicitud de permiso
+NotActiveModCP=Debes habilitar el módulo Deja para ver esta página.
+AddCP=Hacer una solicitud de permiso
+DateDebCP=Fecha inicial
+DateFinCP=Fecha final
+ToReviewCP=Esperando aprobacion
+ApprovedCP=Aprobado
+CancelCP=Cancelado
+RefuseCP=Rechazado
+ValidatorCP=Aprobador
+ListeCP=Lista de licencia
+LeaveId=Dejar ID
+ReviewedByCP=Será aprobado por
+UserForApprovalID=ID de aprobación del usuario
+SendRequestCP=Crear solicitud de permiso
+DelayToRequestCP=Las solicitudes de ausencia deben hacerse al menos <b> %s día (s) </ b> antes que ellas.
+MenuConfCP=Balance de licencia
+SoldeCPUser=El saldo de la licencia es <b>%s</b> días.
+ErrorEndDateCP=Debe seleccionar una fecha de finalización mayor que la fecha de inicio.
+ErrorSQLCreateCP=Se produjo un error SQL durante la creación:
+ErrorIDFicheCP=Se ha producido un error, la solicitud de ausencia no existe.
+ReturnCP=volver a la pagina anterior
+ErrorUserViewCP=No está autorizado a leer esta solicitud de permiso.
+InfosWorkflowCP=Flujo de trabajo de información
+RequestByCP=Solicitado por
+TitreRequestCP=Dejar petición
+TypeOfLeaveId=Tipo de ID de ausencia
+TypeOfLeaveCode=Tipo de código de licencia
+TypeOfLeaveLabel=Tipo de etiqueta de permiso
+NbUseDaysCP=Número de días de vacaciones consumidos
+EditCP=Editar
+DeleteCP=Borrar
+ActionRefuseCP=Desperdicios
+ActionCancelCP=Cancelar
+TitleDeleteCP=Eliminar la solicitud de licencia
+ConfirmDeleteCP=Confirmar la eliminación de esta solicitud de permiso
+ErrorCantDeleteCP=Error. No tiene derecho a eliminar esta solicitud de permiso.
+CantCreateCP=Usted no tiene el derecho de hacer solicitudes de ausencia.
+InvalidValidatorCP=Debe elegir un moderador para su solicitud de licencia.
+NoDateDebut=Debe seleccionar una fecha de inicio.
+NoDateFin=Debe seleccionar una fecha de finalización.
+ErrorDureeCP=Su solicitud de ausencia no contiene día laborable.
+TitleValidCP=Aprobar la solicitud de permiso
+ConfirmValidCP=¿Seguro que quieres aprobar la solicitud de permiso?
+DateValidCP=Fecha aprobada
+TitleToValidCP=Enviar solicitud de licencia
+ConfirmToValidCP=¿Seguro que quieres enviar la solicitud de permiso?
+TitleRefuseCP=Rechazar la solicitud de permiso
+ConfirmRefuseCP=¿Seguro que quieres rechazar la solicitud de permiso?
+NoMotifRefuseCP=Debe elegir un motivo para rechazar la solicitud.
+TitleCancelCP=Cancelar la solicitud de permiso
+ConfirmCancelCP=¿Seguro que quieres cancelar la solicitud de permiso?
+DetailRefusCP=Motivo de rechazo
+DateRefusCP=Fecha de rechazo
+DateCancelCP=Fecha de cancelación
+DefineEventUserCP=Asignar una licencia excepcional para un usuario
+addEventToUserCP=Asignar permiso
+MotifCP=Razón
+ErrorAddEventToUserCP=Se produjo un error al agregar la licencia excepcional.
+AddEventToUserOkCP=La adición de la licencia excepcional se ha completado.
+MenuLogCP=Ver registros de cambios
+LogCP=Registro de actualizaciones de días de vacaciones disponibles
+ActionByCP=Interpretado por
+PrevSoldeCP=Balance anterior
+NewSoldeCP=Nuevo equilibrio
+alreadyCPexist=Ya se ha hecho una solicitud de licencia en este período.
+FirstDayOfHoliday=Primer día de vacaciones
+LastDayOfHoliday=Último día de vacaciones
+BoxTitleLastLeaveRequests=Las últimas %s solicitudes de permiso modificadas
+HolidaysCancelation=Deje la cancelación de la solicitud
+EmployeeLastname=Apellido del empleado
+TypeWasDisabledOrRemoved=El tipo de licencia (id. %s) fue desactivado o eliminado
+LastHolidays=Últimas %s solicitudes de ausencia
+AllHolidays=Todas las solicitudes de licencia
+LEAVE_PAID=Vacaciones pagas
+LEAVE_OTHER=Otra licencia
+LEAVE_PAID_FR=Vacaciones pagas
+LastUpdateCP=Última actualización automática de la asignación de vacaciones.
+MonthOfLastMonthlyUpdate=Mes de la última actualización automática de la asignación de vacaciones
+UpdateConfCPOK=Actualizado correctamente.
+Module27130Name=Gestión de solicitudes de ausencia
+Module27130Desc=Gestión de solicitudes de ausencia
+ErrorMailNotSend=Se produjo un error al enviar un correo electrónico:
+HolidaysToValidate=Validar solicitudes de ausencia
+HolidaysToValidateBody=A continuación hay una solicitud de permiso para validar
+HolidaysToValidateDelay=Esta solicitud de permiso se realizará en un período de menos de %s días.
+HolidaysToValidateAlertSolde=El usuario que realizó esta solicitud de licencia no tiene suficientes días disponibles.
+HolidaysValidated=Solicitudes de ausencia validadas
+HolidaysValidatedBody=Su solicitud de licencia para %s a %s ha sido validada.
+HolidaysRefused=Solicitud rechazada
+HolidaysRefusedBody=Su solicitud de permiso para %s a %s se ha denegado por el siguiente motivo:
+HolidaysCanceled=Solicitud de hoja cancelada
+HolidaysCanceledBody=Su solicitud de licencia para %s a %s ha sido cancelada.
+FollowedByACounter=1: este tipo de permiso debe ir seguido de un contador. El contador se incrementa de forma manual o automática y cuando se valida una solicitud de permiso, el contador disminuye. <br> 0: No seguido de un contador.
+NoLeaveWithCounterDefined=No hay tipos de permisos definidos que deban ser seguidos por un contador
+GoIntoDictionaryHolidayTypes=Ir a <strong>Inicio - Configuración - Diccionarios - Tipo de permiso</strong> para configurar los diferentes tipos de hojas.
+HolidaySetup=Configuración del módulo Holiday
+HolidaysNumberingModules=Deja peticiones numerando modelos.
+TemplatePDFHolidays=Plantilla para solicitudes de permisos PDF
+FreeLegalTextOnHolidays=Texto libre en PDF
+WatermarkOnDraftHolidayCards=Marcas de agua en las solicitudes de permiso de proyecto
+NobodyHasPermissionToValidateHolidays=Nadie tiene permiso para validar vacaciones
diff --git a/htdocs/langs/es_CL/hrm.lang b/htdocs/langs/es_CL/hrm.lang
new file mode 100644
index 00000000000..c7114548f10
--- /dev/null
+++ b/htdocs/langs/es_CL/hrm.lang
@@ -0,0 +1,7 @@
+# Dolibarr language file - Source file is en_US - hrm
+HRM_EMAIL_EXTERNAL_SERVICE=Correo electrónico para evitar el servicio externo de RRHH
+ConfirmDeleteEstablishment=¿Estás seguro de que deseas eliminar este establecimiento?
+OpenEtablishment=Establecimiento abierto
+DictionaryPublicHolidays=Gestión de recursos humanos: días festivos
+DictionaryDepartment=RRHH - Lista de departamentos
+DictionaryFunction=HHRR - Lista de funciones
diff --git a/htdocs/langs/es_CL/languages.lang b/htdocs/langs/es_CL/languages.lang
new file mode 100644
index 00000000000..58d896e2259
--- /dev/null
+++ b/htdocs/langs/es_CL/languages.lang
@@ -0,0 +1,49 @@
+# Dolibarr language file - Source file is en_US - languages
+Language_ar_AR=Arábica
+Language_ar_SA=Arábica
+Language_bn_BD=bengalí
+Language_bg_BG=búlgaro
+Language_bs_BA=bosnio
+Language_ca_ES=catalán
+Language_cs_CZ=checo
+Language_da_DA=danés
+Language_da_DK=danés
+Language_de_DE=alemán
+Language_el_GR=griego
+Language_en_GB=Inglés (reino unido)
+Language_eu_ES=vasco
+Language_fa_IR=persa
+Language_fi_FI=finlandés
+Language_fr_FR=francés
+Language_fy_NL=frisio
+Language_he_IL=hebreo
+Language_hr_HR=croata
+Language_hu_HU=húngaro
+Language_id_ID=indonesio
+Language_is_IS=islandés
+Language_it_IT=italiano
+Language_ja_JP=japonés
+Language_ka_GE=georgiano
+Language_ko_KR=coreano
+Language_lt_LT=lituano
+Language_lv_LV=letón
+Language_mk_MK=macedónio
+Language_mn_MN=mongol
+Language_nl_BE=Holandés (Bélgica)
+Language_pl_PL=polaco
+Language_pt_PT=portugués
+Language_ro_RO=rumano
+Language_ru_RU=ruso
+Language_tr_TR=turco
+Language_sl_SI=esloveno
+Language_sv_SV=sueco
+Language_sv_SE=sueco
+Language_sq_AL=albanés
+Language_sr_RS=serbio
+Language_th_TH=tailandés
+Language_uk_UA=ucranio
+Language_uz_UZ=Uzbekistán
+Language_vi_VN=vietnamita
+Language_zh_CN=chino
+Language_zh_TW=Chino (tradicional)
+Language_bh_MY=malayo
diff --git a/htdocs/langs/es_CL/ldap.lang b/htdocs/langs/es_CL/ldap.lang
new file mode 100644
index 00000000000..f90f34b9cf1
--- /dev/null
+++ b/htdocs/langs/es_CL/ldap.lang
@@ -0,0 +1,17 @@
+# Dolibarr language file - Source file is en_US - ldap
+YouMustChangePassNextLogon=El password para el usuario <b>%s</b> en el dominio <b>%s</b> debe ser cambiado.
+UserMustChangePassNextLogon=El usuario debe cambiar la contraseña en el dominio %s
+LDAPInformationsForThisContact=Información en la base de datos LDAP para este contacto
+LDAPInformationsForThisUser=Información en la base de datos LDAP para este usuario
+LDAPInformationsForThisGroup=Información en la base de datos LDAP para este grupo
+LDAPInformationsForThisMember=Información en la base de datos LDAP para este miembro
+LDAPCard=Tarjeta LDAP
+LDAPFieldStatus=Estado
+LDAPFieldFirstSubscriptionDate=Primera fecha de suscripción
+LDAPFieldFirstSubscriptionAmount=Primera cantidad de suscripción
+LDAPFieldLastSubscriptionDate=Última fecha de suscripción
+LDAPFieldLastSubscriptionAmount=Último monto de suscripción
+LDAPFieldSkype=Identificación del skype
+LDAPFieldSkypeExample=Ejemplo: skypeName
+ForceSynchronize=Fuerza sincronizando Dolibarr -> LDAP
+ErrorFailedToReadLDAP=Error al leer la base de datos LDAP. Verifique la configuración del módulo LDAP y la accesibilidad de la base de datos.
diff --git a/htdocs/langs/es_CL/link.lang b/htdocs/langs/es_CL/link.lang
new file mode 100644
index 00000000000..b3f562fac79
--- /dev/null
+++ b/htdocs/langs/es_CL/link.lang
@@ -0,0 +1,10 @@
+# Dolibarr language file - Source file is en_US - link
+LinkANewFile=Enlace un nuevo archivo / documento
+LinkedFiles=Links archivos y documentos
+NoLinkFound=No hay enlaces registrados
+LinkComplete=El archivo ha sido vinculado exitosamente
+ErrorFileNotLinked=El archivo no pudo ser vinculado
+LinkRemoved=El enlace %s ha sido eliminado
+ErrorFailedToDeleteLink=Error al eliminar el enlace '<b>%s</b>'
+ErrorFailedToUpdateLink=Error al actualizar el enlace '<b>%s</b>'
+URLToLink=URL para enlazar
diff --git a/htdocs/langs/es_CL/loan.lang b/htdocs/langs/es_CL/loan.lang
new file mode 100644
index 00000000000..f24bbf5b732
--- /dev/null
+++ b/htdocs/langs/es_CL/loan.lang
@@ -0,0 +1,24 @@
+# Dolibarr language file - Source file is en_US - loan
+NewLoan=Nuevo préstamo
+ShowLoan=Mostrar préstamo
+LoanPayment=Pago de préstamo
+ShowLoanPayment=Mostrar pago de préstamo
+Interest=Interesar
+Nbterms=Numero de términos
+Term=Término
+LoanAccountancyCapitalCode=Capital de cuenta contable
+LoanAccountancyInsuranceCode=Seguro de cuenta contable
+LoanAccountancyInterestCode=Intereses contables contables
+ConfirmDeleteLoan=Confirmar la eliminación de este préstamo
+LoanDeleted=Préstamo eliminado con éxito
+ConfirmPayLoan=Confirmar clasificar pagó este préstamo
+ListLoanAssociatedProject=Lista de préstamo asociado con el proyecto
+AddLoan=Crear un préstamo
+FinancialCommitment=Compromiso financiero
+InterestAmount=Interesar
+CapitalRemain=Remanente capital
+ConfigLoan=Configuración del módulo de préstamo
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Capital de cuenta contable por defecto
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=El interés de cuenta contable por defecto
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Seguro de cuenta contable por defecto
+CreateCalcSchedule=Edita el compromiso financiero
diff --git a/htdocs/langs/es_CL/mailmanspip.lang b/htdocs/langs/es_CL/mailmanspip.lang
new file mode 100644
index 00000000000..34a39aa742a
--- /dev/null
+++ b/htdocs/langs/es_CL/mailmanspip.lang
@@ -0,0 +1,24 @@
+# Dolibarr language file - Source file is en_US - mailmanspip
+MailmanTitle=Sistema de listas de correo de Mailman
+TestSubscribe=Para probar la suscripción a las listas de Mailman
+TestUnSubscribe=Para probar la cancelación de suscripción a las listas de Mailman
+MailmanCreationSuccess=La prueba de suscripción se ejecutó con éxito
+MailmanDeletionSuccess=La prueba de cancelación se ejecutó con éxito
+SynchroMailManEnabled=Se realizará una actualización de Mailman
+SynchroSpipEnabled=Se realizará una actualización de Spip
+DescADHERENT_MAILMAN_ADMINPW=Contraseña de administrador de Mailman
+DescADHERENT_MAILMAN_URL=URL para las suscripciones de Mailman
+DescADHERENT_MAILMAN_UNSUB_URL=URL para la cancelación de suscripciones de Mailman
+DescADHERENT_MAILMAN_LISTS=Lista (s) para la inscripción automática de nuevos miembros (separados por una coma)
+SPIPTitle=Sistema de gestión de contenido SPIP
+DescADHERENT_SPIP_DB=Nombre de la base de datos SPIP
+DescADHERENT_SPIP_USER=Inicio de sesión en la base de datos
+DescADHERENT_SPIP_PASS=Contraseña de la base de datos SPIP
+AddIntoSpip=Agregar a SPIP
+AddIntoSpipConfirmation=¿Seguro que quieres agregar este miembro a SPIP?
+AddIntoSpipError=Error al agregar al usuario en SPIP
+DeleteIntoSpip=Eliminar de SPIP
+DeleteIntoSpipConfirmation=¿Seguro que quieres eliminar este miembro de SPIP?
+DeleteIntoSpipError=Error al suprimir al usuario de SPIP
+SuccessToAddToMailmanList=%s se agregó correctamente a la lista de carteros %s o base de datos SPIP
+SuccessToRemoveToMailmanList=%s eliminado correctamente de la lista de correo %s o de la base de datos SPIP
diff --git a/htdocs/langs/es_CL/mails.lang b/htdocs/langs/es_CL/mails.lang
new file mode 100644
index 00000000000..381e5510788
--- /dev/null
+++ b/htdocs/langs/es_CL/mails.lang
@@ -0,0 +1,131 @@
+# Dolibarr language file - Source file is en_US - mails
+EMailings=Emailings
+AllEMailings=Todos los eMailings
+MailCard=Tarjeta de correo electrónico
+MailRecipient=Recipiente
+MailTo=Receptor (es)
+MailToUsers=Para el usuario(s)
+MailCC=Copiar a
+MailToCCUsers=Copiar a los usuario(s)
+MailCCC=Copia en caché para
+MailTopic=Tema de correo electrónico
+MailFile=Archivos adjuntos
+MailMessage=Cuerpo del correo electronico
+SubjectNotIn=No en asunto
+BodyNotIn=No en cuerpo
+ShowEMailing=Mostrar correo electrónico
+ListOfEMailings=Lista de correos electrónicos
+NewMailing=Nuevo correo electrónico
+EditMailing=Edite el correo electrónico
+ResetMailing=Reenviar correos electrónicos
+DeleteMailing=Eliminar correo electrónico
+DeleteAMailing=Eliminar un correo electrónico
+PreviewMailing=Enviar un correo electrónico
+CreateMailing=Crear correos electrónicos
+TestMailing=Email de prueba
+ValidMailing=Correo electrónico válido
+MailingStatusSent=Expedido
+MailingStatusSentCompletely=Enviado por completo
+MailSuccessfulySent=Correo electrónico (de %s a %s) aceptado con éxito para la entrega
+MailingSuccessfullyValidated=EMailing validado con éxito
+MailUnsubcribe=Darse de baja
+MailingStatusNotContact=No contactes más
+MailingStatusReadAndUnsubscribe=Leer y cancelar suscripción
+ErrorMailRecipientIsEmpty=El destinatario del correo electrónico está vacío
+WarningNoEMailsAdded=No hay un nuevo correo electrónico para agregar a la lista del destinatario.
+ConfirmValidMailing=¿Seguro que quieres validar este correo electrónico?
+ConfirmResetMailing=Advertencia, al volver a inicializar el correo electrónico <b>%s</b> , permitirá reenviar este correo electrónico en un correo masivo. ¿Seguro que quieres hacer esto?
+ConfirmDeleteMailing=¿Estás seguro de que deseas eliminar este correo electrónico?
+NbOfUniqueEMails=No. de emails únicos
+NbOfEMails=Núm. De correos
+TotalNbOfDistinctRecipients=Número de destinatarios distintos
+NoTargetYet=Aún no hay destinatarios definidos (Vaya a la pestaña 'Destinatarios')
+NoRecipientEmail=No hay correo electrónico del destinatario para %s
+YouCanAddYourOwnPredefindedListHere=Para crear su módulo selector de correo electrónico, consulte htdocs / core / modules / mailings / README.
+EMailTestSubstitutionReplacedByGenericValues=Al usar el modo de prueba, las variables de sustitución son reemplazadas por valores genéricos
+MailingAddFile=Adjunte este archivo
+NoAttachedFiles=No hay archivos adjuntos
+BadEMail=Mal valor para el correo electrónico
+ConfirmCloneEMailing=¿Seguro que quieres clonar este correo electrónico?
+CloneContent=Mensaje de clonación
+CloneReceivers=Cloner recipientes
+DateSending=Fecha de envío
+MailingStatusRead=Leer
+YourMailUnsubcribeOK=El correo electrónico <b>%s</b> se <b>cancela</b> correctamente de la lista de correo
+ActivateCheckReadKey=Clave utilizada para cifrar la URL utilizada para la función &quot;Leer recibo&quot; y &quot;Anular suscripción&quot;
+EMailSentToNRecipients=Correo electrónico enviado a destinatarios %s.
+EMailSentForNElements=Correo electrónico enviado para los elementos %s.
+XTargetsAdded=<b>%s</b> destinatarios añadidos a la lista de objetivos
+OnlyPDFattachmentSupported=Si los documentos PDF ya se generaron para que los objetos se envíen, se adjuntarán al correo electrónico. De lo contrario, no se enviará ningún correo electrónico (también, tenga en cuenta que solo los documentos pdf son compatibles como archivos adjuntos en el envío masivo en esta versión).
+AllRecipientSelected=Los destinatarios del registro %s seleccionado (si se conoce su correo electrónico).
+GroupEmails=Correos electrónicos grupales
+OneEmailPerRecipient=Un correo electrónico por destinatario (de forma predeterminada, un correo electrónico por registro seleccionado)
+WarningIfYouCheckOneRecipientPerEmail=Advertencia, si marca esta casilla, significa que solo se enviará un correo electrónico para varios registros diferentes seleccionados, por lo tanto, si su mensaje contiene variables de sustitución que hacen referencia a datos de un registro, no será posible reemplazarlos.
+ResultOfMailSending=Resultado del envío masivo de correo electrónico
+NbSelected=Numero seleccionado
+NbIgnored=Número ignorado
+NbSent=Número enviado
+SentXXXmessages=%s mensaje (s) enviado.
+ConfirmUnvalidateEmailing=¿Seguro que quieres cambiar el correo electrónico <b>%s</b> al estado de borrador?
+MailingModuleDescContactsWithThirdpartyFilter=Contacto con los filtros del cliente
+MailingModuleDescContactsByCompanyCategory=Contactos por categoría de terceros
+MailingModuleDescContactsByCategory=Contactos por categorías
+MailingModuleDescEmailsFromFile=Correos electrónicos del archivo
+MailingModuleDescEmailsFromUser=Mensajes de correo electrónico ingresados ​​por el usuario
+MailingModuleDescDolibarrUsers=Usuarios con correos electrónicos
+MailingModuleDescThirdPartiesByCategories=Terceros (por categorías)
+RecipientSelectionModules=Solicitudes definidas para la selección del destinatario
+MailingArea=Área de correos
+LastMailings=Últimos %s correos electrónicos
+TargetsStatistics=Estadísticas de objetivos
+MailNoChangePossible=Los destinatarios de correos electrónicos validados no se pueden cambiar
+SearchAMailing=Correo de búsqueda
+SendMailing=Enviar correo electrónico
+MailingNeedCommand=El envío de un correo electrónico se puede realizar desde la línea de comandos. Pídale a su administrador del servidor que ejecute el siguiente comando para enviar el correo electrónico a todos los destinatarios:
+MailingNeedCommand2=Sin embargo, puede enviarlos en línea agregando el parámetro MAILING_LIMIT_SENDBYWEB con el valor del número máximo de correos electrónicos que desea enviar por sesión. Para esto, vaya a Inicio - Configuración - Otro.
+ConfirmSendingEmailing=Si desea enviar un correo electrónico directamente desde esta pantalla, confirme que está seguro de que desea enviar un correo electrónico ahora desde su navegador.
+LimitSendingEmailing=Nota: El envío de correos electrónicos desde la interfaz web se realiza varias veces por razones de seguridad y tiempo de espera, <b>%s</b> destinatarios a la vez para cada sesión de envío.
+TargetsReset=Limpiar lista
+ToClearAllRecipientsClickHere=Haga clic aquí para borrar la lista de destinatarios para este correo electrónico
+ToAddRecipientsChooseHere=Agregue destinatarios eligiendo de las listas
+NbOfEMailingsReceived=Correos electrónicos masivos recibidos
+NbOfEMailingsSend=Correos electrónicos masivos enviados
+IdRecord=Registro de ID
+DeliveryReceipt=Entrega Ack.
+YouCanUseCommaSeparatorForSeveralRecipients=Puede usar el separador <b> coma </ b> para especificar varios destinatarios.
+TagCheckMail=Seguir la apertura del correo
+TagUnsubscribe=Darse de baja enlace
+EMailRecipient=Receptor de E-mail
+TagMailtoEmail=Correo electrónico del destinatario (incluido el enlace html &quot;mailto:&quot;)
+NoEmailSentBadSenderOrRecipientEmail=Sin correo electrónico enviado Correo electrónico malo del remitente o del destinatario. Verificar el perfil del usuario.
+NoNotificationsWillBeSent=No se planean notificaciones por correo electrónico para este evento y compañía
+ANotificationsWillBeSent=1 notificación será enviada por correo electrónico
+SomeNotificationsWillBeSent=%s notificaciones serán enviadas por correo electrónico
+AddNewNotification=Activar un nuevo objetivo / evento de notificación por correo electrónico
+ListOfActiveNotifications=Enumerar todos los objetivos / eventos activos para recibir notificaciones por correo electrónico
+ListOfNotificationsDone=Enumerar todas las notificaciones de correo electrónico enviadas
+MailSendSetupIs=La configuración del envío de correo electrónico se ha configurado en '%s'. Este modo no se puede usar para enviar correos masivos.
+MailSendSetupIs2=Primero debe ir, con una cuenta de administrador, al menú %sHome-Configuración - EMails%s para cambiar el parámetro <strong>'%s'</strong> para usar el modo '%s'. Con este modo, puede ingresar a la configuración del servidor SMTP proporcionado por su Proveedor de servicios de Internet y usar la función de envío masivo de correos electrónicos.
+MailSendSetupIs3=Si tiene alguna pregunta sobre cómo configurar su servidor SMTP, puede solicitarlo al %s.
+YouCanAlsoUseSupervisorKeyword=También puede agregar la palabra clave <strong> __ SUPERVISOREMAIL __ </ strong> para enviar un correo electrónico al supervisor del usuario (solo funciona si se define un correo electrónico para este supervisor)
+NbOfTargetedContacts=Número actual de correos electrónicos de contacto dirigidos
+UseFormatFileEmailToTarget=El archivo importado debe tener formato <strong> correo electrónico; nombre; nombre; otro </ strong>
+UseFormatInputEmailToTarget=Ingrese una cadena con formato <strong> correo electrónico; nombre; nombre; otro </ strong>
+AdvTgtTitle=Rellene los campos de entrada para preseleccionar los terceros o contactos / direcciones para orientar
+AdvTgtSearchTextHelp=Utilice %% como comodines. Por ejemplo, para encontrar todos los elementos como <b>jean, joe, jim</b> , puede ingresar <b>j%%</b> , también puede usar; como separador de valor, y uso! Para excepto este valor. Por ejemplo, <b>jean; joe; jim%%;! Jimo;! Jima%</b> apuntará a todos los jean, joe, comienza con jim pero no jimo y no todo lo que comienza con jima
+AdvTgtSearchIntHelp=Use intervalo para seleccionar el valor int o float
+AdvTgtMaxVal=Valor máximo
+AdvTgtSearchDtHelp=Usar intervalo para seleccionar el valor de la fecha
+AdvTgtStartDt=Comienza dt.
+AdvTgtEndDt=Fin dt.
+AdvTgtTypeOfIncudeHelp=Correo electrónico de destino de terceros y correo electrónico de contacto de terceros, o simplemente correo electrónico de terceros o simplemente correo electrónico de contacto
+AdvTgtTypeOfIncude=Tipo de correo electrónico específico
+AdvTgtContactHelp=Úselo solo si dirige el contacto a "Tipo de correo electrónico específico"
+ItemsCount=Artículos)
+AdvTgtAddContact=Añadir emails según criterio
+AdvTgtLoadFilter=Filtro de carga
+NoContactWithCategoryFound=Sin contacto / dirección con una categoría encontrada
+NoContactLinkedToThirdpartieWithCategoryFound=Sin contacto / dirección con una categoría encontrada
+OutGoingEmailSetup=Configuración de correo electrónico saliente
+InGoingEmailSetup=Configuración de correo electrónico entrante
+DefaultOutgoingEmailSetup=Configuración predeterminada de correo electrónico saliente
diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
index 97f6ad69598..08a5806e837 100644
--- a/htdocs/langs/es_CL/main.lang
+++ b/htdocs/langs/es_CL/main.lang
@@ -193,7 +193,6 @@ AmountTTC=Monto (impuesto inc.)
 AmountVAT=IVA
 MulticurrencyAlreadyPaid=Ya pagado, moneda original.
 MulticurrencyRemainderToPay=Permanecer en el pago, moneda original
-MulticurrencyPaymentAmount=Importe del pago, moneda original
 MulticurrencyAmountHT=Importe (sin IVA), moneda original
 MulticurrencyAmountTTC=Importe (inc. De impuestos), moneda original
 MulticurrencyAmountVAT=Importe de la cantidad, moneda original
diff --git a/htdocs/langs/es_CL/margins.lang b/htdocs/langs/es_CL/margins.lang
new file mode 100644
index 00000000000..4e0e7e2941b
--- /dev/null
+++ b/htdocs/langs/es_CL/margins.lang
@@ -0,0 +1,34 @@
+# Dolibarr language file - Source file is en_US - margins
+MarginRate=Tasa de margen
+DisplayMarginRates=Mostrar tasas de margen
+InputPrice=Precio de entrada
+margin=Gestión de márgenes de beneficio
+margesSetup=Configuración de administración de márgenes de beneficio
+MarginDetails=Detalles de margen
+ProductMargins=Márgenes del producto
+CustomerMargins=Márgenes de clientes
+SalesRepresentativeMargins=Márgenes de representante de ventas
+UserMargins=Márgenes de usuario
+ProductService=Producto o Servicio
+ChooseProduct/Service=Elija producto o servicio
+ForceBuyingPriceIfNull=Forzar compra / precio de costo a precio de venta si no se define
+ForceBuyingPriceIfNullDetails=Si el precio de compra / costo no está definido, y esta opción es "ON", el margen será cero en línea (precio de compra / costo = precio de venta), de lo contrario ("OFF"), marge será igual al valor predeterminado sugerido.
+MARGIN_METHODE_FOR_DISCOUNT=Método de margen para descuentos globales
+UseDiscountAsProduct=Como producto
+UseDiscountOnTotal=En subtotal
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Define si un descuento global se trata como un producto, un servicio o solo en el subtotal para el cálculo del margen.
+MARGIN_TYPE=Precio de compra / costo sugerido por defecto para el cálculo del margen
+MargeType1=Margen en el mejor precio de proveedor
+MargeType2=Margen sobre el precio promedio ponderado (WAP)
+MargeType3=Margen en el precio de costo
+MarginTypeDesc=* Margen al mejor precio de compra = Precio de venta: el mejor precio de proveedor definido en la tarjeta del producto <br> * Margen sobre el Precio Promedio Ponderado (WAP) = Precio de Venta - Precio Promedio Ponderado del Producto (WAP) o el mejor precio del vendedor si WAP aún no está definido <br> * Margen al precio de costo = Precio de venta: precio de costo definido en la tarjeta del producto o WAP si el precio de costo no está definido, o el mejor precio de proveedor si WAP aún no está definido
+CostPrice=Precio de coste
+UnitCharges=Cargos por unidad
+Charges=Cargos
+AgentContactType=Tipo de contacto de agente comercial
+AgentContactTypeDetails=Defina qué tipo de contacto (vinculado en las facturas) se utilizará para el informe de margen por contacto / dirección. Tenga en cuenta que la lectura de estadísticas de un contacto no es confiable ya que en la mayoría de los casos el contacto puede no estar definido explícitamente en las facturas.
+rateMustBeNumeric=La tasa debe ser un valor numérico
+markRateShouldBeLesserThan100=La tasa de marca debe ser inferior a 100
+ShowMarginInfos=Mostrar información de margen
+CheckMargins=Detalle de márgenes
+MarginPerSaleRepresentativeWarning=El informe de margen por usuario utiliza el enlace entre terceros y representantes de ventas para calcular el margen de cada representante de ventas. Debido a que algunas terceras partes pueden no tener un representante de ventas dedicado y algunas terceras partes pueden estar vinculadas a varios, es posible que algunas cantidades no se incluyan en este informe (si no hay un representante de ventas) y algunas pueden aparecer en diferentes líneas (para cada representante de ventas) .
diff --git a/htdocs/langs/es_CL/modulebuilder.lang b/htdocs/langs/es_CL/modulebuilder.lang
new file mode 100644
index 00000000000..47b125e00a7
--- /dev/null
+++ b/htdocs/langs/es_CL/modulebuilder.lang
@@ -0,0 +1,97 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleBuilderDesc=Esta herramienta solo debe ser utilizada por usuarios o desarrolladores experimentados. Proporciona utilidades para construir o editar tu propio módulo. La documentación para el desarrollo manual alternativo <a href="%s" target="_blank">está aquí</a>.
+EnterNameOfModuleDesc=Ingrese el nombre del módulo / aplicación para crear sin espacios. Use letras mayúsculas para separar palabras (por ejemplo: MyModule, EcommerceForShop, SyncWithMySystem ...)
+EnterNameOfObjectDesc=Ingrese el nombre del objeto para crear sin espacios. Use mayúsculas para separar las palabras (por ejemplo: MyObject, Student, Teacher ...). Se generará el archivo de clase CRUD, pero también el archivo API, páginas para listar / agregar / editar / eliminar objetos y archivos SQL.
+ModuleBuilderDesc2=Ruta donde se generan / editan los módulos (primer directorio para módulos externos definidos en %s): <strong>%s</strong>
+ModuleBuilderDesc3=Se encontraron módulos generados/editables: <strong>%s</strong>
+NewObjectInModulebuilder=Nuevo Objeto
+ObjectKey=Clave de objeto
+FilesForObjectInitialized=Archivos para el nuevo objeto '%s' inicializados
+FilesForObjectUpdated=Archivos para el objeto '%s' actualizados (archivos .sql y archivo .class.php)
+ModuleBuilderDescdescription=Ingrese aquí toda la información general que describe su módulo.
+ModuleBuilderDescspecifications=Puede ingresar aquí una descripción detallada de las especificaciones de su módulo que aún no está estructurada en otras pestañas. Así que tienes a tu alcance todas las reglas a desarrollar. También este contenido de texto se incluirá en la documentación generada (ver la última pestaña). Puede usar el formato Markdown, pero se recomienda usar el formato Asciidoc (comparación entre .md y .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Defina aquí los objetos que desea administrar con su módulo. Se generará una clase CRUD DAO, archivos SQL, registro de objetos de la página a la lista, para crear / editar / ver un registro y una API.
+ModuleBuilderDescmenus=Esta pestaña está dedicada a definir las entradas de menú proporcionadas por su módulo.
+ModuleBuilderDesctriggers=Esta es la vista de los desencadenadores proporcionados por su módulo. Para incluir el código ejecutado cuando se inicia un evento empresarial desencadenado, simplemente edite este archivo.
+ModuleBuilderDeschooks=Esta pestaña está dedicada a los ganchos.
+ModuleBuilderDescwidgets=Esta pestaña está dedicada a administrar / construir widgets.
+ModuleBuilderDescbuildpackage=Puede generar aquí un archivo de paquete "listo para distribuir" (un archivo .zip normalizado) de su módulo y un archivo de documentación "listo para distribuir". Simplemente haga clic en el botón para construir el paquete o archivo de documentación.
+EnterNameOfModuleToDeleteDesc=Puedes borrar tu módulo. ADVERTENCIA: ¡Se eliminarán todos los archivos de codificación del módulo (generados o creados manualmente) Y los datos y la documentación estructurados!
+EnterNameOfObjectToDeleteDesc=Puede eliminar un objeto. ADVERTENCIA: ¡Se eliminarán todos los archivos de codificación (generados o creados manualmente) relacionados con el objeto!
+BuildPackage=Paquete de compilación
+BuildPackageDesc=Puede generar un paquete zip de su aplicación para que esté listo para distribuirlo en cualquier Dolibarr. También puede distribuirlo o venderlo en un mercado como <a href="https://www.dolistore.com">DoliStore.com</a> .
+BuildDocumentation=Documentación de construcción
+ModuleIsNotActive=Este módulo aún no está activado. Vaya a %s para hacerlo en vivo o haga clic aquí:
+ModuleIsLive=Este módulo ha sido activado. Cualquier cambio puede romper una característica actual en vivo.
+DescriptorFile=Archivo descriptivo del módulo
+ClassFile=Archivo para la clase DAO CRUD de PHP
+ApiClassFile=Archivo para PHP clase API
+PageForList=Página de PHP para la lista de registro
+PageForCreateEditView=Página de PHP para crear / editar / ver un registro
+PageForAgendaTab=Página PHP para pestaña de evento
+PageForDocumentTab=Página PHP para la pestaña del documento
+PageForNoteTab=Página PHP para la pestaña de notas
+PathToModulePackage=Ruta de acceso al paquete de módulo / aplicación
+PathToModuleDocumentation=Ruta al archivo del módulo / documentación de la aplicación (%s)
+SpaceOrSpecialCharAreNotAllowed=No se permiten espacios ni caracteres especiales.
+FileNotYetGenerated=Archivo aún no generado
+RegenerateMissingFiles=Generar archivos perdidos
+ConfirmDeleteProperty=¿Está seguro de que desea eliminar la propiedad <strong>%s</strong> ? Esto cambiará el código en la clase de PHP pero también eliminará la columna de la definición de tabla del objeto.
+NotNull=No nulo
+NotNullDesc=1 = Establecer la base de datos en NOT NULL. -1 = Permitir valores nulos y forzar valor a NULL si está vacío ('' o 0).
+SearchAll=Usado para 'buscar todo'
+DatabaseIndex=Índice de base
+FileAlreadyExists=El archivo %s ya existe
+TriggersFile=Archivo para código de disparadores
+HooksFile=Archivo para el código de ganchos
+ArrayOfKeyValues=Matriz de llave-val
+WidgetFile=Archivo de widgets
+CSSFile=archivo CSS
+JSFile=archivo Javascript
+ReadmeFile=Archivo Léame
+ChangeLog=Archivo ChangeLog
+TestClassFile=Archivo para clase de prueba de unidad de PHP
+SqlFile=Archivo Sql
+PageForLib=Archivo para la biblioteca común PHP
+PageForObjLib=Archivo para la librería PHP dedicada a objetos
+SqlFileKey=Archivo Sql para claves
+SqlFileKeyExtraFields=Archivo Sql para claves de atributos complementarios.
+AnObjectAlreadyExistWithThisNameAndDiffCase=Ya existe un objeto con este nombre y un caso diferente
+UseAsciiDocFormat=Puede usar el formato Markdown, pero se recomienda usar el formato Asciidoc (omparison entre .md y .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+DirScanned=Directorio escaneado
+NoTrigger=Sin disparador
+NoWidget=Sin widget
+ListOfDictionariesEntries=Lista de entradas del diccionario
+ListOfPermissionsDefined=Lista de permisos definidos
+SeeExamples=Ver ejemplos aquí
+EnabledDesc=Condición para tener este campo activo (Ejemplos: 1 o $ conf-> global-> MYMODULE_MYOPTION)
+IsAMeasureDesc=¿Se puede acumular el valor de campo para obtener un total en la lista? (Ejemplos: 1 o 0)
+SearchAllDesc=¿Se utiliza el campo para realizar una búsqueda desde la herramienta de búsqueda rápida? (Ejemplos: 1 o 0)
+LanguageDefDesc=Ingrese en estos archivos, toda la clave y la traducción para cada archivo de idioma.
+MenusDefDesc=Define aquí los menús proporcionados por su módulo.
+DictionariesDefDesc=Defina aquí los diccionarios proporcionados por su módulo
+PermissionsDefDesc=Define aquí los nuevos permisos proporcionados por su módulo.
+MenusDefDescTooltip=Los menús proporcionados por su módulo / aplicación se definen en la matriz <strong>$ this-&gt; menus</strong> en el archivo descriptor del módulo. Puede editar manualmente este archivo o utilizar el editor incrustado. <br><br> Nota: Una vez definidos (y el módulo se reactiva), los menús también están visibles en el editor de menú disponible para los usuarios administradores en %s.
+DictionariesDefDescTooltip=Los diccionarios proporcionados por su módulo/aplicación son definidos en el arreglo <strong>$this->dictionaries</strong> en el archivo de descripción del módulo. Usted puede editar manualmente este archivo o usar el editor incorporado.<br><br>Nota: Una vez definido  (y  re-activado el módulo), diccionarios sólo estarán visibles en el área de configuración para los usuarios administradores %s.
+PermissionsDefDescTooltip=Los permisos proporcionados por su módulo / aplicación se definen en la matriz <strong>$ this-&gt; rights</strong> en el archivo descriptor del módulo. Puede editar manualmente este archivo o utilizar el editor incrustado. <br><br> Nota: Una vez definidos (y el módulo se reactiva), los permisos son visibles en la configuración de permisos predeterminada %s.
+HooksDefDesc=Defina en la propiedad <b> module_parts ['hooks'] </ b>, en el descriptor del módulo, el contexto de los enlaces que desea administrar (la búsqueda de '<b> initHooks puede encontrar la lista de contextos (</ b> 'en el código del núcleo). <br> Edite el archivo hook para agregar el código de sus funciones enganchadas (las funciones enganchables se pueden encontrar mediante una búsqueda en' <b> executeHooks </ b> 'en el código central).
+TriggerDefDesc=Defina en el archivo desencadenante el código que desea ejecutar para cada evento comercial ejecutado.
+SeeIDsInUse=Ver ID en uso en su instalación
+SeeReservedIDsRangeHere=Ver rango de ID reservados
+ToolkitForDevelopers=Toolkit para desarrolladores de Dolibarr
+TryToUseTheModuleBuilder=Si tiene conocimientos de SQL y PHP, puede utilizar el asistente de creación de módulos nativos. <br> Habilite el módulo <strong>%s</strong> y use el asistente haciendo clic en <span class="fa fa-bug"></span> en el menú superior derecho. <br> Advertencia: esta es una función avanzada para desarrolladores, ¡ <b>no</b> experimente en su sitio de producción!
+InitStructureFromExistingTable=Construya la cadena de matriz de estructura de una tabla existente
+UseAboutPage=Deshabilitar la página acerca de
+UseDocFolder=Desactivar la carpeta de documentación.
+UseSpecificReadme=Use un archivo Léame específico
+WidgetDesc=Puede generar y editar aquí los widgets que se incrustarán con su módulo.
+UseSpecificEditorName =Usa un nombre de editor específico
+UseSpecificEditorURL =Usa un editor URL específico
+UseSpecificFamily =Usa una familia específica
+UseSpecificVersion =Usa una versión inicial específica
+ModuleMustBeEnabled=El módulo / aplicación debe ser habilitado primero
+IncludeDocGenerationHelp=Si marca esto, se generará algún código para agregar un cuadro "Generar documento" en el registro.
+ShowOnCombobox=Mostrar valor en el cuadro combinado
+KeyForTooltip=Clave para información sobre herramientas
+ForeignKey=Clave Foránea
+TypeOfFieldsHelp=Tipos de campos:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' significa que podemos agregar a + boton despues de el combo para crear el registro, 'filter' puede ser  'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' por ejemplo)
diff --git a/htdocs/langs/es_CL/mrp.lang b/htdocs/langs/es_CL/mrp.lang
new file mode 100644
index 00000000000..c523e0836b6
--- /dev/null
+++ b/htdocs/langs/es_CL/mrp.lang
@@ -0,0 +1,39 @@
+# Dolibarr language file - Source file is en_US - mrp
+Mrp=Ordenes de Fabricación
+MO=Orden de Fabricación
+MrpSetupPage=Configuración del módulo de MRP
+MenuBOM=Facturas de material
+LatestBOMModified=Últimas %s Cuentas de materiales modificadas
+LatestMOModified=Últimas %s Ordenes de Fabricación modificadas
+Bom=Factura de Materiales
+BillOfMaterials=Lista de materiales
+ListOfBOMs=Lista de listas de materiales - BOM
+ListOfManufacturingOrders=Lista de pedidos de fabricación
+ProductBOMHelp=Producto a crear con este BOM.<br>Nota: Productos con la propiedad 'Naturaleza del producto' = 'Materia Prima' No son visibles en esta lista.
+BOMsNumberingModules=Plantillas de numeración de listas de materiales
+BOMsModelModule=Lista de Materiales-BOM plantillas de documentos
+MOsNumberingModules=Plantilla de numeración MO
+MOsModelModule=Plantillas de Documentos MO
+FreeLegalTextOnBOMs=Texto libre en el documento de BOM
+WatermarkOnDraftBOMs=Marca de agua en el borrador de la lista de materiales
+FreeLegalTextOnMOs=Texto Libre en el documento de MO
+WatermarkOnDraftMOs=Marca de agua de borrador MO
+ConfirmCloneBillOfMaterials=¿Estas seguro de que deseas clonar la Factura de materiales %s ?
+ConfirmCloneMo=¿Estas seguro de que deseas clonar la Orden de Fabricación (MO) %s ?
+DeleteBillOfMaterials=Eliminar lista de materiales
+DeleteMo=Borrar Orden de Fabricación-MO
+ConfirmDeleteBillOfMaterials=¿Estás seguro de que deseas eliminar esta lista de materiales?
+ConfirmDeleteMo=¿Está seguro de que desea eliminar esta lista de materiales?
+QtyToProduce=Cantidad para producir
+DateStartPlannedMo=Fecha de inicio prevista
+DateEndPlannedMo=Fecha de finalización prevista
+KeepEmptyForAsap=Vacío significa &#39;Tan pronto como sea posible&#39;
+EstimatedDurationDesc=Duración estimada para fabricar este producto utilizando esta lista de materiales-BOM
+ConfirmValidateBom=¿Está seguro de que desea validar la lista de materiales con la referencia <strong>%s</strong>? (podrá usarlo para crear nuevos pedidos de fabricación)
+ConfirmCloseBom=¿Está seguro de que desea cancelar esta lista de materiales (ya no podrá usarla para crear nuevas órdenes de fabricación)?
+ConfirmReopenBom=¿Está seguro de que desea volver a abrir esta lista de materiales (podrá usarla para crear nuevos pedidos de fabricación)
+QtyFrozen=Cantidad congelada
+QuantityFrozen=Cantidad congelada
+BOMLine=Línea de BOM
+WarehouseForProduction=Almacén de producción
+CreateMO=Crear Orden de Fabricación
diff --git a/htdocs/langs/es_CL/multicurrency.lang b/htdocs/langs/es_CL/multicurrency.lang
new file mode 100644
index 00000000000..f65650c397a
--- /dev/null
+++ b/htdocs/langs/es_CL/multicurrency.lang
@@ -0,0 +1,15 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+ErrorAddRateFail=Error en la velocidad agregada
+ErrorAddCurrencyFail=Error en la moneda agregada
+multicurrency_syncronize_error=Error de sincronización: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use la fecha del documento para encontrar la tasa de cambio en lugar de usar la última tasa conocida
+multicurrency_useOriginTx=Cuando se crea un objeto a partir de otro, mantenga la tasa original del objeto de origen (de lo contrario, use la última tasa conocida)
+CurrencyLayerAccount=API CurrencyLayer
+CurrencyLayerAccount_help_to_synchronize=Debe utilizar una cuenta en el sitio web %s para usar esta funcionalidad. <br> Obtenga su <b>clave API</b> . <br> Si usa una cuenta gratuita, no puede cambiar la <b>moneda de origen</b> (USD de forma predeterminada). <br> Si su moneda principal no es el USD, la aplicación la recalculará automáticamente. <br><br> Usted está limitado a 1000 sincronizaciones por mes.
+multicurrency_appCurrencySource=Moneda de origen
+multicurrency_alternateCurrencySource=Moneda de origen alternativa
+CurrenciesUsed=Monedas utilizadas
+CurrenciesUsed_help_to_add=Agregue las diferentes monedas y tasas que necesita usar en sus <b>propuestas</b> , <b>pedidos</b> , etc.
+MulticurrencyReceived=Recibido, moneda original
+MulticurrencyRemainderToTake=Importe restante, moneda original.
+MulticurrencyPaymentAmount=Importe del pago, moneda original
diff --git a/htdocs/langs/es_CL/oauth.lang b/htdocs/langs/es_CL/oauth.lang
new file mode 100644
index 00000000000..779555f86ab
--- /dev/null
+++ b/htdocs/langs/es_CL/oauth.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - oauth
+ConfigOAuth=Configuración de OAuth
+ManualTokenGeneration=Generación de tokens manual
+TokenManager=Administrador de fichas
+IsTokenGenerated=¿Se genera token?
+NoAccessToken=No token de acceso guardado en la base de datos local
+HasAccessToken=Se generó un token y se guardó en la base de datos local
+ToCheckDeleteTokenOnProvider=Haga clic aquí para verificar / eliminar la autorización guardada por %s proveedor OAuth
+RequestAccess=Haga clic aquí para solicitar / renovar el acceso y recibir un nuevo token para guardar
+DeleteAccess=Haga clic aquí para borrar el token
+UseTheFollowingUrlAsRedirectURI=Use la siguiente URL como el URI de redireccionamiento cuando cree sus credenciales con su proveedor de OAuth:
+ListOfSupportedOauthProviders=Ingrese las credenciales proporcionadas por su proveedor OAuth2. Sólo se enumeran aquí los proveedores OAuth2 compatibles. Estos servicios pueden ser utilizados por otros módulos que necesitan autenticación OAuth2.
+OAuthSetupForLogin=Página para generar una ficha OAuth
+SeePreviousTab=Ver la pestaña anterior
+OAuthIDSecret=ID de OAuth y secreto
+TOKEN_EXPIRED=Token expiró
+TOKEN_EXPIRE_AT=Token caduca a las
+OAUTH_GOOGLE_NAME=OAuth servicio de Google
+OAUTH_GOOGLE_DESC=Vaya a <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">esta página y</a> luego &quot;Credenciales&quot; para crear las credenciales de OAuth
+OAUTH_GITHUB_NAME=Servicio OAuth GitHub
+OAUTH_GITHUB_ID=Identificación de OAuth GitHub
+OAUTH_GITHUB_DESC=Vaya a <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">esta página y</a> luego &quot;Registre una nueva aplicación&quot; para crear las credenciales de OAuth
diff --git a/htdocs/langs/es_CL/opensurvey.lang b/htdocs/langs/es_CL/opensurvey.lang
new file mode 100644
index 00000000000..647520b51d7
--- /dev/null
+++ b/htdocs/langs/es_CL/opensurvey.lang
@@ -0,0 +1,41 @@
+# Dolibarr language file - Source file is en_US - opensurvey
+Surveys=Centro
+OpenSurveyArea=Área de encuestas
+AddACommentForPoll=Puede agregar un comentario en la encuesta ...
+AddComment=Agregar comentario
+ToReceiveEMailForEachVote=Recibe un correo electrónico por cada voto
+TypeDate=Escriba la fecha
+OpenSurveyStep2=Seleccione sus fechas entre los días libres (gris). Los días seleccionados son verdes. Puede anular la selección de un día seleccionado previamente haciendo clic nuevamente en él.
+CopyHoursOfFirstDay=Copia las horas del primer día
+TheBestChoice=La mejor opción actualmente es
+TheBestChoices=Las mejores opciones actualmente son
+OpenSurveyHowTo=Si acepta votar en esta encuesta, debe dar su nombre, elegir los valores que mejor se adapten a sus necesidades y validar con el botón más al final de la línea.
+CommentsOfVoters=Comentarios de votantes
+ConfirmRemovalOfPoll=¿Seguro que quieres eliminar esta encuesta (y todos los votos)?
+UrlForSurvey=URL para comunicarse para obtener un acceso directo a la encuesta
+PollOnChoice=Está creando una encuesta para hacer una elección múltiple para una encuesta. Primero ingrese todas las opciones posibles para su encuesta:
+CheckBox=Casilla de verificación simple
+YesNoList=Lista (vacía / sí / no)
+PourContreList=Lista (vacía / a favor / en contra)
+AddNewColumn=Agregar nueva columna
+TitleChoice=Etiqueta de elección
+ExportSpreadsheet=Exportar hoja de cálculo de resultados
+NbOfSurveys=Numero de encuestas
+NbOfVoters=No. de votantes
+PollAdminDesc=Puedes cambiar todas las líneas de votación de esta encuesta con el botón "Editar". También puede eliminar una columna o una línea con %s. También puede agregar una nueva columna con %s.
+YouAreInivitedToVote=Estás invitado a votar por esta encuesta
+VoteNameAlreadyExists=Este nombre ya fue utilizado para esta encuesta
+AddADate=Agrega una fecha
+AddStartHour=Agregar hora de inicio
+AddEndHour=Agregar hora final
+votes=votos)
+NoCommentYet=Aún no se han publicado comentarios para esta encuesta
+CanSeeOthersVote=Los votantes pueden ver el voto de otras personas
+SelectDayDesc=Para cada día seleccionado, puede elegir, o no, las horas de reunión en el siguiente formato: <br> vacio <br> - &quot;8h&quot;, &quot;8H&quot; o &quot;8:00&quot; para dar la hora de inicio de una reunión, <br> - &quot;8-11&quot;, &quot;8h-11h&quot;, &quot;8H-11H&quot; o &quot;8: 00-11: 00&quot; para dar la hora de inicio y finalización de una reunión, <br> - &quot;8h15-11h15&quot;, &quot;8H15-11H15&quot; o &quot;8: 15-11: 15&quot; para la misma cosa pero con minutos.
+ErrorOpenSurveyFillFirstSection=No has llenado la primera sección de la encuesta.
+ErrorOpenSurveyOneChoice=Ingrese al menos una opción
+ErrorInsertingComment=Hubo un error al insertar tu comentario
+MoreChoices=Ingrese más opciones para los votantes
+SurveyExpiredInfo=La encuesta se ha cerrado o el retraso en la votación ha expirado.
+EmailSomeoneVoted=%s ha llenado una línea.\nPuede encontrar su encuesta en el enlace:\n%s
+UserMustBeSameThanUserUsedToVote=Debes haber votado y usar el mismo nombre de usuario que el que solías votar, publicar un comentario
diff --git a/htdocs/langs/es_CL/orders.lang b/htdocs/langs/es_CL/orders.lang
index e876b0ea557..3667212a64f 100644
--- a/htdocs/langs/es_CL/orders.lang
+++ b/htdocs/langs/es_CL/orders.lang
@@ -6,7 +6,6 @@ OrderId=Solicitar ID
 Order=Orden
 PdfOrderTitle=Orden
 OrderLine=Fila para ordenar
-OrderDate=Fecha de orden
 OrderDateShort=Fecha de orden
 OrderToProcess=Orden para procesar
 NewOrder=Nueva orden
diff --git a/htdocs/langs/es_CL/paybox.lang b/htdocs/langs/es_CL/paybox.lang
new file mode 100644
index 00000000000..3049702c5a7
--- /dev/null
+++ b/htdocs/langs/es_CL/paybox.lang
@@ -0,0 +1,25 @@
+# Dolibarr language file - Source file is en_US - paybox
+PayBoxSetup=Configuración del módulo PayBox
+PayBoxDesc=Este módulo ofrece páginas para permitir el pago en <a href="http://www.paybox.com" target="_blank"> Paybox </a> por parte de los clientes. Esto se puede utilizar para un pago gratuito o para un pago en un objeto Dolibarr particular (factura, orden, ...)
+FollowingUrlAreAvailableToMakePayments=Las siguientes URL están disponibles para ofrecer una página a un cliente para realizar un pago en objetos Dolibarr
+WelcomeOnPaymentPage=Bienvenido a nuestro servicio de pago en línea.
+ThisScreenAllowsYouToPay=Esta pantalla le permite realizar un pago en línea a %s.
+ThisIsInformationOnPayment=Esta es información sobre el pago a hacer
+ToComplete=Completar
+YourEMail=Correo electrónico para recibir la confirmación del pago
+Creditor=Acreedor
+YouWillBeRedirectedOnPayBox=Será redirigido a la página segura de Paybox para ingresar su información de tarjeta de crédito
+Continue=Siguiente
+SetupPayBoxToHavePaymentCreatedAutomatically=Configure su Paybox con url <b>%s</b> para que el pago se cree automáticamente cuando sea validado por Paybox.
+YourPaymentHasBeenRecorded=Esta página confirma que su pago ha sido registrado. Gracias.
+YourPaymentHasNotBeenRecorded=Su pago NO ha sido registrado y la transacción ha sido cancelada. Gracias.
+AccountParameter=Parámetros de cuenta
+InformationToFindParameters=Ayuda para encontrar su información de cuenta %s
+PAYBOX_CGI_URL_V2=Url del módulo de pago CGI para el pago
+CSSUrlForPaymentForm=URL de hoja de estilo CSS para formulario de pago
+NewPayboxPaymentReceived=Nuevo pago de Paybox recibido
+NewPayboxPaymentFailed=El nuevo pago de Paybox intentó pero falló
+PAYBOX_PAYONLINE_SENDEMAIL=Notificación por correo electrónico después del intento de pago (éxito o falla)
+PAYBOX_PBX_SITE=Valor para el SITIO PBX
+PAYBOX_PBX_RANG=Valor para PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Valor para ID de PBX
diff --git a/htdocs/langs/es_CL/paypal.lang b/htdocs/langs/es_CL/paypal.lang
new file mode 100644
index 00000000000..e05b97afd9d
--- /dev/null
+++ b/htdocs/langs/es_CL/paypal.lang
@@ -0,0 +1,28 @@
+# Dolibarr language file - Source file is en_US - paypal
+PaypalSetup=Configuración del módulo de PayPal
+PaypalDesc=Este módulo permite el pago por los clientes a través de <a href="http://www.paypal.com" target="_blank">PayPal</a> . Esto se puede utilizar para un pago ad-hoc o para un pago relacionado con un objeto Dolibarr (factura, pedido, ...)
+PaypalOrCBDoPayment=Pague con PayPal (Tarjeta o PayPal)
+PaypalDoPayment=Pagar con PayPal
+PAYPAL_API_SANDBOX=Prueba de modo / sandbox
+PAYPAL_API_USER=Nombre de usuario API
+PAYPAL_API_PASSWORD=Contraseña API
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Oferta de pago &quot;integral&quot; (Tarjeta de crédito + PayPal) o &quot;PayPal&quot; solamente
+PaypalModeOnlyPaypal=Solo PayPal
+ThisIsTransactionId=Este es el id de la transacción: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Incluya la url de pago de PayPal cuando envíe un documento por correo electrónico
+NewOnlinePaymentFailed=Se intentó nuevo pago en línea pero falló
+ONLINE_PAYMENT_SENDEMAIL=Dirección de correo electrónico para notificaciones después de cada intento de pago (para éxito y falla)
+ReturnURLAfterPayment=URL de devolución después del pago
+ValidationOfOnlinePaymentFailed=La validación del pago en línea falló
+PaymentSystemConfirmPaymentPageWasCalledButFailed=La página de confirmación de pago fue llamada por el sistema de pago devuelto por un error
+SetExpressCheckoutAPICallFailed=La llamada a la API SetExpressCheckout falló.
+DoExpressCheckoutPaymentAPICallFailed=La llamada a DoExpressCheckoutPayment API falló.
+ShortErrorMessage=Mensaje de error corto
+ErrorSeverityCode=Código de Severidad de Error
+OnlinePaymentSystem=Sistema de pago en línea
+PaypalLiveEnabled=Modo &quot;en vivo&quot; de PayPal habilitado (de lo contrario, modo de prueba / sandbox)
+PaypalImportPayment=Importar pagos de PayPal
+PostActionAfterPayment=Publicar acciones después de los pagos
+ARollbackWasPerformedOnPostActions=Se realizó una reversión en todas las acciones de publicación. Debe completar las acciones de publicación manualmente si son necesarias.
+ValidationOfPaymentFailed=La validación del pago ha fallado
+PayPalBalance=Credito paypal
diff --git a/htdocs/langs/es_CL/printing.lang b/htdocs/langs/es_CL/printing.lang
new file mode 100644
index 00000000000..5fbc9ffaa6c
--- /dev/null
+++ b/htdocs/langs/es_CL/printing.lang
@@ -0,0 +1,40 @@
+# Dolibarr language file - Source file is en_US - printing
+Module64000Name=Impresión directa
+Module64000Desc=Habilitar el sistema de impresión directa
+PrintingSetup=Configuración del sistema de impresión directa
+PrintingDesc=Este módulo agrega un botón Imprimir a varios módulos para permitir que los documentos se impriman directamente en una impresora sin necesidad de abrir el documento en otra aplicación.
+MenuDirectPrinting=Trabajos de impresión directa
+PrintingDriverDesc=Variables de configuración para imprimir el controlador.
+ListDrivers=Lista de controladores
+PrintTestDesc=Lista de impresoras.
+FileWasSentToPrinter=El archivo %s fue enviado a la impresora
+PleaseSelectaDriverfromList=Seleccione un controlador de la lista.
+PleaseConfigureDriverfromList=Por favor, configure el controlador seleccionado de la lista.
+SetupDriver=Configuración del controlador
+TargetedPrinter=Impresora dirigida
+PRINTGCP_TOKEN_ACCESS=Token OAuth de Google Cloud Print
+PrintGCPDesc=Este controlador permite enviar documentos directamente a una impresora utilizando Google Cloud Print.
+GCP_displayName=Nombre para mostrar
+GCP_Id=ID de impresora
+GCP_OwnerName=Nombre del dueño
+GCP_State=Estado de la impresora
+GCP_connectionStatus=Estado en línea
+GCP_Type=Tipo de impresora
+PrintIPPDesc=Este controlador permite el envío de documentos directamente a una impresora. Requiere un sistema Linux con CUPS instalado.
+PRINTIPP_HOST=Servidor de impresión
+PRINTIPP_USER=Iniciar sesión
+NoDefaultPrinterDefined=No hay una impresora predeterminada definida
+DefaultPrinter=Impresora predeterminada
+IPP_Uri=Impresora Uri
+IPP_Name=Nombre de la impresora
+IPP_State=Estado de la impresora
+IPP_State_reason1=Razón del estado1
+IPP_Media=Medios de impresión
+IPP_Supported=Tipo de medio
+DirectPrintingJobsDesc=Esta página enumera los trabajos de impresión encontrados para las impresoras disponibles.
+GoogleAuthNotConfigured=Google OAuth no ha sido configurado. Habilite el módulo OAuth y establezca un ID de Google / Secreto.
+GoogleAuthConfigured=Las credenciales de Google OAuth se encontraron en la configuración del módulo OAuth.
+PrintingDriverDescprintgcp=Variables de configuración para imprimir el controlador Google Cloud Print.
+PrintingDriverDescprintipp=Variables de configuración para imprimir Copas de conductor.
+PrintTestDescprintgcp=Lista de impresoras para Google Cloud Print.
+PrintTestDescprintipp=Lista de impresoras para tazas.
diff --git a/htdocs/langs/es_CL/productbatch.lang b/htdocs/langs/es_CL/productbatch.lang
new file mode 100644
index 00000000000..2b603794eab
--- /dev/null
+++ b/htdocs/langs/es_CL/productbatch.lang
@@ -0,0 +1,20 @@
+# Dolibarr language file - Source file is en_US - productbatch
+ManageLotSerial=Use el número de lote / serie
+ProductStatusOnBatch=Sí (se requiere lote / serie)
+ProductStatusNotOnBatch=No (lote / serie no utilizada)
+Batch=Lote / serie
+atleast1batchfield=Fecha de caducidad o fecha de caducidad o Número de lote / serie
+batch_number=Número de lote / serie
+BatchNumberShort=Lote / serie
+SellByDate=Fecha de caducidad
+DetailBatchNumber=Detalles de lote / serie
+printBatch=Lote / Serie: %s
+printEatby=Comer por: %s
+printSellby=Vende por: %s
+printQty=Cantidad: %d
+AddDispatchBatchLine=Agregue una línea para el despacho de vida útil
+WhenProductBatchModuleOnOptionAreForced=Cuando el módulo Lot / Serial está activado, la disminución automática de stock se ve obligada a "Disminuir existencias reales en la validación de envío" y el modo de aumento automático se fuerza a "Aumentar las existencias reales en el envío manual a almacenes" y no se puede editar. Se pueden definir otras opciones como desee.
+ProductDoesNotUseBatchSerial=Este producto no usa lote / número de serie
+ProductLotSetup=Configuración del lote del módulo / serie
+ShowCurrentStockOfLot=Muestra el stock actual para el producto / lote de pareja
+ShowLogOfMovementIfLot=Mostrar registro de movimientos para el producto / lote de pareja
diff --git a/htdocs/langs/es_CL/products.lang b/htdocs/langs/es_CL/products.lang
index 62693a1c76b..68a62a9257c 100644
--- a/htdocs/langs/es_CL/products.lang
+++ b/htdocs/langs/es_CL/products.lang
@@ -50,7 +50,6 @@ ErrorProductAlreadyExists=Un producto con referencia %s ya existe.
 ErrorProductBadRefOrLabel=Valor incorrecto para referencia o etiqueta.
 ErrorProductClone=Hubo un problema al intentar clonar el producto o servicio.
 ErrorPriceCantBeLowerThanMinPrice=Error, el precio no puede ser inferior al precio mínimo.
-Suppliers=Vendedores
 SupplierRef=SKU del proveedor
 ProductsAndServicesArea=Área de productos y servicios
 ProductsArea=Área de producto
diff --git a/htdocs/langs/es_CL/receiptprinter.lang b/htdocs/langs/es_CL/receiptprinter.lang
new file mode 100644
index 00000000000..1f60b9358e9
--- /dev/null
+++ b/htdocs/langs/es_CL/receiptprinter.lang
@@ -0,0 +1,36 @@
+# Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Configuración del módulo ReceiptPrinter
+PrinterAdded=Impresora %s agregada
+TestSentToPrinter=Prueba enviada a la impresora %s
+ReceiptPrinter=Impresoras de recibo
+ReceiptPrinterDesc=Configuración de impresoras de recibos
+ReceiptPrinterTypeDesc=Descripción del tipo de impresora de recibo
+ReceiptPrinterProfileDesc=Descripción del perfil de la impresora de recibos
+ListPrinters=Lista de impresoras
+SetupReceiptTemplate=Configuración de plantilla
+CONNECTOR_DUMMY=Impresora simulada
+CONNECTOR_FILE_PRINT=Impresora local
+CONNECTOR_DUMMY_HELP=Impresora falsa para prueba, no hace nada
+CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x: 9100
+CONNECTOR_FILE_PRINT_HELP=/ dev / usb / lp0, / dev / usb / lp1
+CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt\nPrinter
+PROFILE_EPOSTEP=Perfil de Epos Tep
+PROFILE_STAR=Perfil de estrella
+PROFILE_DEFAULT_HELP=Perfil predeterminado adecuado para impresoras Epson
+PROFILE_SIMPLE_HELP=Perfil simple sin gráficos
+PROFILE_EPOSTEP_HELP=Perfil de punta épica
+PROFILE_P822D_HELP=Perfil P822D Sin gráficos
+PROFILE_STAR_HELP=Perfil de estrella
+DOL_ALIGN_LEFT=Texto de alineación a la izquierda
+DOL_ALIGN_CENTER=Texto central
+DOL_ALIGN_RIGHT=Alinear el texto a la derecha
+DOL_USE_FONT_A=Use la fuente A de la impresora
+DOL_USE_FONT_B=Use la fuente B de la impresora
+DOL_USE_FONT_C=Use la fuente C de la impresora
+DOL_PRINT_BARCODE=Imprimir código de barras
+DOL_PRINT_BARCODE_CUSTOMER_ID=Imprimir identificación del cliente del código de barras
+DOL_CUT_PAPER_FULL=Corte el boleto por completo
+DOL_CUT_PAPER_PARTIAL=Corte el boleto parcialmente
+DOL_OPEN_DRAWER=Abrir cajón de efectivo
+DOL_ACTIVATE_BUZZER=Activar zumbador
+DOL_PRINT_QRCODE=Imprimir código QR
diff --git a/htdocs/langs/es_CL/resource.lang b/htdocs/langs/es_CL/resource.lang
new file mode 100644
index 00000000000..6e295126b59
--- /dev/null
+++ b/htdocs/langs/es_CL/resource.lang
@@ -0,0 +1,19 @@
+# Dolibarr language file - Source file is en_US - resource
+ConfirmDeleteResourceElement=Confirma eliminar el recurso para este elemento
+NoResourceLinked=Sin recursos vinculados
+ResourcePageIndex=Lista de recursos
+ResourceCard=Tarjeta de recursos
+AddResource=Crea un recurso
+ResourceFormLabel_ref=Nombre del recurso
+ResourceFormLabel_description=Descripción del recurso
+ResourcesLinkedToElement=Recursos vinculados al elemento
+ShowResource=Mostrar recurso
+ResourceElementPage=Recursos de elementos
+ResourceCreatedWithSuccess=Recurso creado con éxito
+RessourceLineSuccessfullyDeleted=La línea de recursos eliminó correctamente
+RessourceLineSuccessfullyUpdated=La línea de recursos se actualizó correctamente
+ResourceLinkedWithSuccess=Recurso vinculado con el éxito
+ConfirmDeleteResource=Confirmar para eliminar este recurso
+RessourceSuccessfullyDeleted=Recurso borrado con éxito
+IdResource=Recurso Id
+ResourceTypeCode=Código de tipo de recurso
diff --git a/htdocs/langs/es_CL/salaries.lang b/htdocs/langs/es_CL/salaries.lang
new file mode 100644
index 00000000000..074abf0685a
--- /dev/null
+++ b/htdocs/langs/es_CL/salaries.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Cuenta de contabilidad utilizada para terceros usuarios
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=La cuenta de contabilidad dedicada definida en la tarjeta de usuario se usará solo para la contabilidad de Libro mayor auxiliar. Este se usará para el Libro mayor y como valor predeterminado de la contabilidad del Libro mayor auxiliar si no se define una cuenta de usuario dedicada en el usuario.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Cuenta de contabilidad por defecto para pagos de salarios
+NewSalaryPayment=Nuevo pago de salario
+SalariesPayments=Sueldos pagos
+ShowSalaryPayment=Mostrar pago de sueldo
+THM=Promedio de tarifa por hora
+TJM=Tarifa diaria promedio
+THMDescription=Este valor se puede usar para calcular el costo del tiempo consumido en un proyecto ingresado por los usuarios si se usa el proyecto de módulo
+TJMDescription=Este valor es actualmente solo para información y no se utiliza para ningún cálculo
diff --git a/htdocs/langs/es_CL/sendings.lang b/htdocs/langs/es_CL/sendings.lang
new file mode 100644
index 00000000000..f250e751edb
--- /dev/null
+++ b/htdocs/langs/es_CL/sendings.lang
@@ -0,0 +1,48 @@
+# Dolibarr language file - Source file is en_US - sendings
+Receivings=Recibos de entrega
+SendingsArea=Área de envíos
+ListOfSendings=Lista de envíos
+StatisticsOfSendings=Estadísticas para envíos
+NbOfSendings=Cantidad de envios
+SendingCard=Tarjeta de envío
+QtyShipped=Cantidad enviada
+QtyShippedShort=Qty enviar.
+QtyPreparedOrShipped=Cantidad preparada o enviada
+QtyToShip=Cantidad para enviar
+QtyToReceive=Cantidad para recibir
+QtyReceived=Cantidad recibida
+QtyInOtherShipments=Cantidad en otros envíos
+KeepToShip=Permanecer en el barco
+KeepToShipShort=Permanecer
+OtherSendingsForSameOrder=Otros envíos para esta orden
+SendingsAndReceivingForSameOrder=Envíos y recibos para esta orden
+SendingsToValidate=Envíos para validar
+StatusSendingCanceled=Cancelado
+StatusSendingValidated=Validado (productos para enviar o ya enviados)
+StatusSendingProcessed=Procesada
+StatusSendingProcessedShort=Procesada
+SendingSheet=Hoja de envío
+ConfirmDeleteSending=¿Seguro que quieres eliminar este envío?
+ConfirmValidateSending=¿Estas seguro que quieres validar este envió con referencia <b>%s</b>?
+ConfirmCancelSending=¿Seguro que quieres cancelar este envío?
+WarningNoQtyLeftToSend=Advertencia, no hay productos esperando ser enviados.
+StatsOnShipmentsOnlyValidated=Estadísticas realizadas en envíos solo validadas. La fecha utilizada es la fecha de validación del envío (no siempre se conoce la fecha de entrega planificada).
+DateDeliveryPlanned=Fecha planificada de entrega
+RefDeliveryReceipt=Ref. Recibo de entrega
+StatusReceipt=Recibo de entrega del estado
+DateReceived=Fecha de entrega recibida
+SendShippingByEMail=Enviar envío por correo electrónico
+SendShippingRef=Presentación del envío %s
+ActionsOnShipping=Eventos en el envío
+LinkToTrackYourPackage=Enlace para rastrear tu paquete
+ShipmentCreationIsDoneFromOrder=Por el momento, la creación de un nuevo envio se realiza desde el módulo comercial en pedido de cliente.
+ShipmentLine=Línea de envío
+ProductQtyInShipmentAlreadySent=Cantidad de producto de pedido abierto ya enviado
+NoProductToShipFoundIntoStock=No hay productos para enviar encontrados en el almacén <b>%s</b> . Corregir el stock o volver a elegir otro almacén.
+WeightVolShort=Peso / Vol.
+ValidateOrderFirstBeforeShipment=Primero debe validar la orden antes de poder hacer envíos.
+DocumentModelTyphon=Modelo de documento más completo para recibos de entrega (logotipo ...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER no definido
+SumOfProductVolumes=Suma de volúmenes de productos
+SumOfProductWeights=Suma de los pesos del producto
+DetailWarehouseFormat=W: %s (Cantidad: %d)
diff --git a/htdocs/langs/es_CL/sms.lang b/htdocs/langs/es_CL/sms.lang
new file mode 100644
index 00000000000..bdc248785d8
--- /dev/null
+++ b/htdocs/langs/es_CL/sms.lang
@@ -0,0 +1,33 @@
+# Dolibarr language file - Source file is en_US - sms
+SmsSetup=Configuración de SMS
+SmsDesc=Esta página le permite definir opciones globales en las características de SMS
+SmsCard=Tarjeta de SMS
+AllSms=Todas las campañas de SMS
+SmsTargets=Objetivos
+SmsRecipients=Objetivos
+SmsRecipient=Objetivo
+SmsFrom=Remitente
+SmsTo=Objetivo
+SmsTopic=Tema de SMS
+SmsMessage=Mensaje SMS
+ListOfSms=Listar campañas de SMS
+NewSms=Nueva campaña de SMS
+DeleteSms=Eliminar campaña de SMS
+DeleteASms=Eliminar una campaña de SMS
+PreviewSms=Previo SMS
+TestSms=Prueba de SMS
+ApproveSms=Aprobar sms
+SmsStatusSent=Expedido
+SmsStatusSentCompletely=Enviado por completo
+SmsSuccessfulySent=SMS enviados correctamente (desde %s a %s)
+ErrorSmsRecipientIsEmpty=El número de objetivo está vacío
+WarningNoSmsAdded=No hay un nuevo número de teléfono para agregar a la lista de objetivos
+ConfirmValidSms=¿Confirma usted la validación de esta campaña?
+NbOfUniqueSms=No. de números de teléfono únicos
+NbOfSms=No. de numeros telefonicos
+SmsInfoCharRemain=No. de personajes restantes
+SmsInfoNumero=(formato internacional es decir: +33899701761)
+DelayBeforeSending=Retraso antes del envío (minutos)
+SmsNoPossibleSenderFound=No hay remitente disponible Verifique la configuración de su proveedor de SMS.
+SmsNoPossibleRecipientFound=Sin objetivo disponible Verifique la configuración de su proveedor de SMS.
+DisableStopIfSupported=Deshabilitar el mensaje STOP (si es compatible)
diff --git a/htdocs/langs/es_CL/stripe.lang b/htdocs/langs/es_CL/stripe.lang
new file mode 100644
index 00000000000..0930c555e3e
--- /dev/null
+++ b/htdocs/langs/es_CL/stripe.lang
@@ -0,0 +1,37 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Configuración del módulo de banda
+StripeDesc=Ofrezca a los clientes una página de pago en línea de Stripe para pagos con tarjetas de crédito / cebit a través de <a href="http://www.stripe.com" target="_blank">Stripe</a> . Esto se puede usar para permitir que sus clientes realicen pagos ad-hoc o para pagos relacionados con un objeto Dolibarr en particular (factura, pedido, ...)
+STRIPE_PAYONLINE_SENDEMAIL=Notificación por correo electrónico después de un intento de pago (éxito o falla)
+StripeDoPayment=Pagar con la raya
+YouWillBeRedirectedOnStripe=Se te redirigirá a la página de Banda segura para ingresar la información de tu tarjeta de crédito
+ToOfferALinkForOnlinePayment=URL para el pago %s
+ToOfferALinkForOnlinePaymentOnOrder=URL para ofrecer una %s pagina de pago en línea para una Orden de Ventas
+ToOfferALinkForOnlinePaymentOnInvoice=URL para ofrecer una %s pagina de pago en linea para una Factura de Cliente
+ToOfferALinkForOnlinePaymentOnContractLine=URL para ofrecer una %s pagina de pago en línea para una línea de contrato
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL para ofrecer una %s página de pago en línea de cualquier cantidad sin objeto existente
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL para ofrecer una %s página de pago en línea para una suscripción de miembro
+ToOfferALinkForOnlinePaymentOnDonation=URL para ofrecer una %s página de pago en línea para el pago de una donación
+YouCanAddTagOnUrl=También puede agregar el parámetro url <b>&tag=<i>value</i></b> a cualquiera de esos URL (obligatorio solo para pagos no vinculados a un objeto) para agregar su propia etiqueta de comentario de pago.<br>Para la URL de pagos sin objeto existente, también puede agregar el parámetro <strong>&noidempotency=1</strong> por lo que el mismo enlace con la misma etiqueta se puede usar varias veces (algunos modos de pago pueden limitar el pago a 1 por cada enlace diferente sin este parámetro)
+SetupStripeToHavePaymentCreatedAutomatically=Configure su Stripe con url <b>%s</b> para que el pago se cree automáticamente cuando se valida con Stripe.
+STRIPE_CGI_URL_V2=Módulo de CGI de Url of Stripe para el pago
+NewStripePaymentFailed=Se intentó el nuevo pago de Stripe pero falló
+STRIPE_TEST_SECRET_KEY=Clave de prueba secreta
+STRIPE_TEST_PUBLISHABLE_KEY=Clave de prueba publicable
+STRIPE_LIVE_SECRET_KEY=Clave secreta en vivo
+STRIPE_LIVE_PUBLISHABLE_KEY=Clave en vivo publicable
+StripeLiveEnabled=Stripe live enabled (de lo contrario, prueba / modo de espacio aislado)
+StripeImportPayment=Importar pagos en franja
+ExampleOfTestCreditCard=Ejemplo de tarjeta de crédito para la prueba: %s =&gt; válido, %s =&gt; error CVC, %s =&gt; caducado, %s =&gt; cargo falla
+StripeGateways=Pasarelas de banda
+BankAccountForBankTransfer=Cuenta bancaria para pagos de fondos
+StripeAccount=Cuenta de banda
+StripeChargeList=Lista de cargas de la raya
+StripeTransactionList=Lista de transacciones de banda
+StripeCustomerId=Identificación de cliente de Stripe
+StripePaymentModes=Modos de pago de banda
+StripeID=Identificación de la raya
+ConfirmDeleteCard=¿Seguro que quieres eliminar esta tarjeta de crédito o débito?
+ShowInStripe=Mostrar en raya
+StripeUserAccountForActions=Cuenta de usuario para usar para la notificación por correo electrónico de algunos eventos de Stripe (pagos de Stripe)
+StripePayoutList=Lista de pagos de la raya
+ToOfferALinkForLiveWebhook=Enlace para configurar Stripe WebHook para llamar a la IPN (modo en vivo)
diff --git a/htdocs/langs/es_CL/suppliers.lang b/htdocs/langs/es_CL/suppliers.lang
new file mode 100644
index 00000000000..454867a7125
--- /dev/null
+++ b/htdocs/langs/es_CL/suppliers.lang
@@ -0,0 +1,39 @@
+# Dolibarr language file - Source file is en_US - suppliers
+Suppliers=Vendedores
+SuppliersInvoice=Factura del proveedor
+ShowSupplierInvoice=Mostrar factura del vendedor
+NewSupplier=Nuevo vendedor
+ListOfSuppliers=Lista de proveedores
+ShowSupplier=Mostrar vendedor
+OrderDate=Fecha de orden
+TotalBuyingPriceMinShort=Total de subproductos de precios de compra
+TotalSellingPriceMinShort=Total de subproductos precios de venta
+AddSupplierPrice=Agregar precio de compra
+ChangeSupplierPrice=Cambiar el precio de compra
+SupplierPrices=Precios del proveedor
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Esta referencia de proveedor ya está asociada con un producto: %s
+NoRecordedSuppliers=Ningún vendedor registrado
+SupplierPayment=Pago del proveedor
+SuppliersArea=Área del vendedor
+RefSupplierShort=Ref. vendedor
+ExportDataset_fournisseur_1=Facturas de proveedores y detalles de las facturas.
+ExportDataset_fournisseur_2=Facturas y pagos del vendedor
+ExportDataset_fournisseur_3=Pedidos de compra y detalles del pedido
+ApproveThisOrder=Aprobar esta orden
+ConfirmApproveThisOrder=¿Seguro que quieres aprobar la orden <b>%s</b>?
+DenyingThisOrder=Negar esta orden
+ConfirmDenyingThisOrder=¿Seguro que quieres denegar este pedido <b>%s</b>?
+ConfirmCancelThisOrder=¿Seguro que quieres cancelar esta orden <b>%s</b>?
+AddSupplierOrder=Crear orden de compra
+ListOfSupplierProductForSupplier=Lista de productos y precios de proveedor <b> %s </ b>
+SentToSuppliers=Enviado a los vendedores
+ListOfSupplierOrders=Lista de órdenes de compra
+MenuOrdersSupplierToBill=Órdenes de compra para facturar
+NbDaysToDelivery=Plazo de entrega (días)
+DescNbDaysToDelivery=El mayor retraso de entrega de los productos de este pedido.
+SupplierReputation=Reputación del vendedor
+DoNotOrderThisProductToThisSupplier=No ordene
+NotTheGoodQualitySupplier=Baja calidad
+AllProductServicePrices=Todos los precios de productos/servicios
+AllProductReferencesOfSupplier=Todas las referencias de productos / servicios del vendedor.
+BuyingPriceNumShort=Precios del proveedor
diff --git a/htdocs/langs/es_CL/trips.lang b/htdocs/langs/es_CL/trips.lang
new file mode 100644
index 00000000000..19aba371335
--- /dev/null
+++ b/htdocs/langs/es_CL/trips.lang
@@ -0,0 +1,101 @@
+# Dolibarr language file - Source file is en_US - trips
+ShowExpenseReport=Mostrar informe de gastos
+Trips=Reporte de gastos
+TripsAndExpenses=Informes de gastos
+TripsAndExpensesStatistics=Estadísticas de informes de gastos
+TripCard=Boleta de calificaciones de gastos
+AddTrip=Crear informe de gastos
+ListOfTrips=Lista de informes de gastos
+ListOfFees=Lista de tarifas
+TypeFees=Tipos de tarifas
+ShowTrip=Mostrar informe de gastos
+NewTrip=Nuevo informe de gastos
+LastExpenseReports=Últimos informes de gastos %s
+CompanyVisited=Compañía / organización visitada
+FeesKilometersOrAmout=Cantidad o kilómetros
+DeleteTrip=Eliminar informe de gastos
+ConfirmDeleteTrip=¿Estás seguro de que deseas eliminar este informe de gastos?
+ListTripsAndExpenses=Lista de informes de gastos
+ExpensesArea=Área de informes de gastos
+ExpenseReportWaitingForApproval=Se ha enviado un nuevo informe de gastos para su aprobación
+ExpenseReportWaitingForApprovalMessage=Se ha enviado un nuevo informe de gastos y está en espera de aprobación. <br> - Usuario: %s <br> - Período: %s <br> Haga clic aquí para validar: %s
+ExpenseReportWaitingForReApproval=Un informe de gastos ha sido enviado para su nueva aprobación
+ExpenseReportWaitingForReApprovalMessage=Se ha enviado un informe de gastos y está a la espera de su nueva aprobación. <br> %s, usted se negó a aprobar el informe de gastos por este motivo: %s. <br> Se ha propuesto una nueva versión y está esperando su aprobación. <Br > - Usuario: %s <br> - Período: %s <br> Haga clic aquí para validar: %s
+ExpenseReportApproved=Se aprobó un informe de gastos
+ExpenseReportApprovedMessage=Se aprobó el informe de gastos %s. <br> - Usuario: %s <br> - Aprobado por: %s <br> Haga clic aquí para ver el informe de gastos: %s
+ExpenseReportRefused=Se rechazó un informe de gastos
+ExpenseReportRefusedMessage=Se rechazó el informe de gastos %s. <br> - Usuario: %s <br> - Rechazado por: %s <br> - Motivo de denegación: %s <br> Haga clic aquí para ver el informe de gastos: %s
+ExpenseReportCanceled=Se canceló un informe de gastos
+ExpenseReportCanceledMessage=Se canceló el informe de gastos %s. <br> - Usuario: %s <br> - Cancelado por: %s <br> - Motivo de cancelación: %s <br> Haga clic aquí para ver el informe de gastos: %s
+ExpenseReportPaid=Se pagó un informe de gastos
+ExpenseReportPaidMessage=Se pagó el informe de gastos %s. <br> - Usuario: %s <br> - Pagado por: %s <br> Haga clic aquí para ver el informe de gastos: %s
+TripId=Informe de gastos Id
+AnyOtherInThisListCanValidate=Persona para informar para validación.
+TripSociete=Empresa de información
+TripNDF=Informe de gastos de información
+PDFStandardExpenseReports=Plantilla estándar para generar un documento PDF para el informe de gastos
+ExpenseReportLine=Línea de informe de gastos
+TF_LUNCH=Almuerzo
+TF_BUS=Autobús
+EX_FUE=CV de combustible
+EX_PAR=Aparcamiento CV
+EX_TAX=Varios impuestos
+EX_SUM=Suministro de mantenimiento
+EX_CAR=Alquiler de coches
+EX_CUR=Clientes recibiendo
+EX_OTR=Otro que recibe
+EX_CAM=Mantenimiento y reparación de CV
+EX_EMM=Comida de los empleados
+EX_GUM=Comida de los invitados
+EX_FUE_VP=Combustible PV
+EX_PAR_VP=Aparcamiento PV
+EX_CAM_VP=Mantenimiento y reparación de PV
+UploadANewFileNow=Sube un nuevo documento ahora
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, la regla para la referencia de numeración del informe de gastos no se definió en la configuración del módulo 'Informe de gastos'
+ErrorDoubleDeclaration=Ha declarado otro informe de gastos en un rango de fechas similar.
+AucuneLigne=Aún no hay un informe de gastos declarado
+VALIDATOR=Usuario responsable de la aprobación
+AUTHOR=Grabado por
+REFUSEUR=Negado por
+DATE_REFUS=Negar la fecha
+DATE_CANCEL=Fecha de cancelación
+ExpenseReportRef=Ref. informe de gastos
+ValidateAndSubmit=Validar y enviar para su aprobación
+ValidatedWaitingApproval=Validado (esperando aprobación)
+NOT_AUTHOR=Usted no es el autor de este informe de gastos. Operación cancelada
+ConfirmRefuseTrip=¿Seguro que quieres negar este informe de gastos?
+ValideTrip=Aprobar informe de gastos
+ConfirmValideTrip=¿Seguro que quieres aprobar este informe de gastos?
+PaidTrip=Pague un informe de gastos
+ConfirmPaidTrip=¿Está seguro de que desea cambiar el estado de este informe de gastos a "Pagado"?
+ConfirmCancelTrip=¿Estás seguro de que deseas cancelar este informe de gastos?
+BrouillonnerTrip=Mueve el informe de gastos al estado "Borrador"
+ConfirmBrouillonnerTrip=¿Está seguro de que desea mover este informe de gastos al estado "Borrador"?
+SaveTrip=Validar informe de gastos
+ConfirmSaveTrip=¿Seguro que quieres validar este informe de gastos?
+NoTripsToExportCSV=Ningún informe de gastos para exportar para este período.
+ExpenseReportPayment=Pago del informe de gastos
+ExpenseReportsToApprove=Informes de gastos para aprobar
+ExpenseReportsToPay=Informes de gastos para pagar
+ConfirmCloneExpenseReport=¿Seguro que quieres clonar este informe de gastos?
+ExpenseReportsIk=Informe de gastos índice milles
+ExpenseReportsRules=Reglas de informe de gastos
+ExpenseReportIkDesc=Puede modificar el cálculo de los gastos por kilómetro por categoría y rango a los que están previamente definidos. <b> d </ b> es la distancia en kilómetros
+ExpenseReportRulesDesc=Puede crear o actualizar cualquier regla de cálculo. Esta parte se usará cuando el usuario cree un nuevo informe de gastos
+expenseReportOffset=Compensar
+expenseReportTotalForFive=Ejemplo con <u> d </ u> = 5
+expenseReportCatDisabled=Categoría desactivada: consulte el diccionario c_exp_tax_cat
+expenseReportRangeDisabled=Rango deshabilitado: consulte el dictionay de c_exp_tax_range
+expenseReportPrintExample=desplazamiento + (d x coef) = %s
+ExpenseReportApplyTo=Aplicar para
+ExpenseReportDomain=Dominio para aplicar
+ExpenseReportDateStart=Fecha de inicio
+ExpenseReportDateEnd=Fecha de término
+ExpenseReportLimitAmount=Cantidad límite
+OnExpense=Línea de gasto
+ExpenseReportRuleSave=Regla de informe de gastos guardada
+ExpenseReportConstraintViolationError=Identificación de infracción de restricción [%s]: %s es superior a %s %s
+ExpenseReportConstraintViolationWarning=Identificación de infracción de restricción [%s]: %s es superior a %s %s
+CarCategory=Categoría de automóvil
+ExpenseRangeOffset=Cantidad de compensación: %s
+AttachTheNewLineToTheDocument=Adjuntar la línea a un documento cargado
diff --git a/htdocs/langs/es_CL/users.lang b/htdocs/langs/es_CL/users.lang
new file mode 100644
index 00000000000..71626be966d
--- /dev/null
+++ b/htdocs/langs/es_CL/users.lang
@@ -0,0 +1,86 @@
+# Dolibarr language file - Source file is en_US - users
+HRMArea=Área de RRHH
+UserCard=Tarjeta de usuario
+GroupCard=Tarjeta grupal
+Permission=Permiso
+EditPassword=Editar contraseña
+SendNewPassword=Regenerar y enviar contraseña
+ReinitPassword=Regenerar la contraseña
+PasswordChangedTo=La contraseña ha cambiado a: %s
+SubjectNewPassword=Tu nueva contraseña para %s
+GroupRights=Permisos grupales
+UserRights=Permisos de usuario
+UserGUISetup=Configuración de pantalla de usuario
+DisableUser=Inhabilitar
+DisableAUser=Deshabilitar un usuario
+DeleteUser=Borrar
+EnableAUser=Habilitar un usuario
+DeleteGroup=Borrar
+ConfirmDisableUser=¿Seguro que quieres deshabilitar al usuario <b>%s</b>?
+ConfirmDeleteUser=¿Seguro que quieres eliminar al usuario <b>%s</b>?
+ConfirmDeleteGroup=¿Seguro que quieres eliminar el grupo <b>%s</b>?
+ConfirmEnableUser=¿Seguro que quieres habilitar al usuario <b>%s</b>?
+ConfirmReinitPassword=¿Seguro que quieres generar una nueva contraseña para el usuario <b>%s</b>?
+ConfirmSendNewPassword=¿Estás seguro de que deseas generar y enviar una nueva contraseña para el usuario <b>%s</b>?
+LoginNotDefined=El inicio de sesión no está definido.
+NameNotDefined=El nombre no está definido.
+ListOfUsers=Lista de usuarios
+SuperAdministrator=Súper administrador
+DefaultRights=Permisos predeterminados
+DefaultRightsDesc=Defina aquí los permisos <u>predeterminados</u> que se otorgan automáticamente a un <u>nuevo</u> usuario (para modificar los permisos de los usuarios existentes, vaya a la tarjeta de usuario).
+DolibarrUsers=Usuarios de Dolibarr
+LastName=Apellido
+FirstName=Primer nombre
+ListOfGroups=Lista de grupos
+CreateGroup=Crea un grupo
+RemoveFromGroup=Sacar del grupo
+PasswordChangedAndSentTo=La contraseña se cambió y se envió a  <b>%s</b>.
+PasswordChangeRequestSent=Solicitud para cambiar la contraseña de <b>%s</b> enviada a <b>%s</b>.
+LastGroupsCreated=Los últimos grupos %s creados
+ShowGroup=Mostrar grupo
+ShowUser=Mostrar usuario
+NonAffectedUsers=Usuarios no asignados
+UserModified=Usuario modificado con éxito
+PhotoFile=Archivo de foto
+ListOfUsersInGroup=Lista de usuarios en este grupo
+ListOfGroupsForUser=Lista de grupos para este usuario
+LinkToCompanyContact=Enlace a un tercero / contacto
+LinkedToDolibarrMember=Enlace al miembro
+LinkedToDolibarrUser=Enlace al usuario de Dolibarr
+LinkedToDolibarrThirdParty=Enlace a Dolibarr third party
+CreateDolibarrLogin=Crear un usuario
+CreateDolibarrThirdParty=Crea un tercero
+LoginAccountDisableInDolibarr=Cuenta desactivada en Dolibarr.
+UsePersonalValue=Use valor personal
+DomainUser=Usuario del dominio %s
+CreateInternalUserDesc=Este formulario le permite crear un usuario interno en su empresa / organización. Para crear un usuario externo (cliente, proveedor, etc.), use el botón &quot;Crear usuario de Dolibarr&quot; de la tarjeta de contacto de ese tercero.
+PermissionInheritedFromAGroup=Permiso otorgado porque se hereda de uno de un grupo de usuarios.
+UserWillBeInternalUser=El usuario creado será un usuario interno (porque no está vinculado a un tercero en particular)
+UserWillBeExternalUser=El usuario creado será un usuario externo (porque está vinculado a un tercero en particular)
+IdPhoneCaller=Identificación del teléfono
+NewUserCreated=Usuario %s creado
+NewUserPassword=Cambio de contraseña para %s
+UserDisabled=Usuario %s deshabilitado
+ConfirmCreateContact=¿Seguro que quieres crear una cuenta de Dolibarr para este contacto?
+ConfirmCreateLogin=¿Seguro que quieres crear una cuenta de Dolibarr para este miembro?
+ConfirmCreateThirdParty=¿Seguro que quieres crear un tercero para este miembro?
+LoginToCreate=Inicia sesión para crear
+NameToCreate=Nombre de tercero a crear
+YourRole=Tus roles
+YourQuotaOfUsersIsReached=¡Su cuota de usuarios activos se alcanza!
+NbOfUsers=No. de usuarios
+NbOfPermissions=No. de permisos
+DontDowngradeSuperAdmin=Solo una superadmina puede degradar una superadmina
+HierarchicView=Vista Jerárquica
+UseTypeFieldToChange=Use el campo Tipo para cambiar
+OpenIDURL=URL OpenID
+LoginUsingOpenID=Use OpenID para iniciar sesión
+ExpectedWorkedHours=Horas trabajadas esperadas por semana
+ColorUser=Color del usuario
+DisabledInMonoUserMode=Desactivado en modo de mantenimiento
+UserAccountancyCode=Código de contabilidad del usuario
+UserLogoff=Cierre de sesión de usuario
+UserLogged=Usuario registrado
+CantDisableYourself=No puedes deshabilitar tu propio registro de usuario
+ForceUserExpenseValidator=Validar el validador de informes de gastos
+ForceUserHolidayValidator=Forzar validación de solicitud de licencia
diff --git a/htdocs/langs/es_CL/website.lang b/htdocs/langs/es_CL/website.lang
new file mode 100644
index 00000000000..e3da9a4f314
--- /dev/null
+++ b/htdocs/langs/es_CL/website.lang
@@ -0,0 +1,75 @@
+# Dolibarr language file - Source file is en_US - website
+WebsiteSetupDesc=Crea aquí los sitios web que deseas utilizar. Luego entra en el menú de sitios web para editarlos.
+ConfirmDeleteWebsite=¿Estás seguro de que deseas eliminar este sitio web? Todas sus páginas y contenido también serán eliminados. Los archivos cargados (como en el directorio de medios, el módulo ECM, ...) permanecerán.
+WEBSITE_PAGENAME=Nombre / alias de la página
+WEBSITE_ALIASALT=Nombres de página alternativos / alias
+WEBSITE_ALIASALTDesc=Utilice aquí la lista de otros nombres / alias para que también se pueda acceder a la página usando estos otros nombres / alias (por ejemplo, el nombre anterior después de cambiar el nombre del alias para mantener el enlace posterior en funcionamiento). La sintaxis es: <br> alternativename1, alternativename2, ...
+WEBSITE_CSS_URL=URL del archivo CSS externo
+WEBSITE_ROBOT=Archivo Robot (robots.txt)
+WEBSITE_HTACCESS=Sitio web .htaccess archivo
+EnterHereLicenseInformation=Ingrese aquí metadatos o información de licencia para llenar un archivo README.md. si distribuye su sitio web como plantilla, el archivo se incluirá en el paquete temptate.
+PageNameAliasHelp=Nombre o alias de la página.<br> Este alias también se usa para forjar una URL SEO cuando el sitio web se ejecuta desde un host virtual de un servidor web (como Apacke, Nginx, ...). Use el botón "<strong>%s</strong>" para editar este alias.
+MediaFiles=Mediateca
+EditCss=Editar prop del sitio web
+EditMenu=Editar menú
+EditMedias=Editar medios
+EditPageMeta=Edita prop pag/contenedor
+Webpage=Página web / contenedor
+AddPage=Añadir página / contenedor
+PageContainer=Página / contenedor
+PreviewOfSiteNotYetAvailable=Vista previa de su sitio web <strong>%s</strong> aún no está disponible. Primero debe &#39; <strong>Importar una plantilla de sitio web completa</strong> &#39; o simplemente &#39; <strong>Agregar una página / contenedor</strong> &#39;.
+RequestedPageHasNoContentYet=La página solicitada con el id. %s aún no tiene contenido o el archivo de caché .tpl.php fue eliminado. Edita el contenido de la página para resolver esto.
+SiteDeleted=Sitio web &#39;%s&#39; eliminado
+PageContent=Página / Contenair
+PageDeleted=Página / Contenair '%s' del sitio web %s eliminado
+PageAdded=Página / Contenair '%s' agregado
+ViewSiteInNewTab=Ver el sitio en una pestaña nueva
+ViewPageInNewTab=Ver página en nueva pestaña
+SetAsHomePage=Establecer como página de inicio
+RealURL=URL real
+ViewWebsiteInProduction=Ver el sitio web usando las URL de origen
+YouCanAlsoTestWithPHPS=<u>Usar con el servidor PHP incorporado</u> <br> En el entorno de desarrollo, es posible que prefiera probar el sitio con el servidor web incorporado PHP (se requiere PHP 5.5) ejecutando <br> <strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Compruebe también que el host virtual tiene permiso <strong>%s</strong>en los archivos en<br><strong>%s</strong>
+ReadPerm=Leer
+TestDeployOnWeb=Prueba / despliegue en la web
+PreviewSiteServedByWebServer=<u> Obtenga una vista previa de %s en una nueva pestaña. </ u> <br> <br> El %s será atendido por un servidor web externo (como Apache, Nginx, IIS). Debe instalar y configurar este servidor antes de apuntar al directorio: <br> <strong> %s </ strong> <br> URL servida por un servidor externo: <br> <strong> %s </ strong>
+PreviewSiteServedByDolibarr=<u> Obtenga una vista previa de %s en una nueva pestaña. </ u> <br> <br> El servidor Dolibarr servirá %s, por lo que no necesita ningún servidor web adicional (como Apache, Nginx, IIS) para su instalación. < br> El inconveniente es que la URL de las páginas no es fácil de usar y comienza con la ruta de Dolibarr. <br> URL servida por Dolibarr: <br> <strong> %s </ strong> <br> <br> Para usar la suya servidor web externo para servir a este sitio web, crear un servidor virtual en su servidor web que apunte en el directorio <br> <strong> %s </ strong> <br> y luego ingresar el nombre de este servidor virtual y hacer clic en el otro botón de vista previa .
+VirtualHostUrlNotDefined=La URL del servidor virtual servido por un servidor web externo no está definido
+NoPageYet=No hay páginas aún
+SyntaxHelp=Ayuda en consejos de sintaxis específicos
+YouCanEditHtmlSourceckeditor=Puede editar el código fuente HTML usando el botón "Fuente" en el editor.
+ClonePage=Clonar página / contenedor
+SiteAdded=Sitio web añadido
+ConfirmClonePage=Ingrese el código / alias de la página nueva y si es una traducción de la página clonada.
+PageIsANewTranslation=La nueva página es una traducción de la página actual?
+ParentPageId=ID de página padre
+CreateByFetchingExternalPage=Crear página / contenedor obteniendo página de URL externa ...
+OrEnterPageInfoManually=O crea una página desde cero o desde una plantilla de página ...
+ExportSite=Sitio web de exportación
+Banner=Bandera
+DisableSiteFirst=Deshabilitar sitio web primero
+MyContainerTitle=El título de mi sitio web
+AnotherContainer=Así es como se incluye el contenido de otra página / contenedor (puede tener un error aquí si habilita el código dinámico porque el subcontenedor incrustado puede no existir)
+SorryWebsiteIsCurrentlyOffLine=Lo sentimos, este sitio web está actualmente fuera de línea. Vuelve más tarde ...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Habilitar la tabla de cuenta del sitio web
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Habilite la tabla para almacenar las cuentas del sitio web (inicio de sesión / pase) para cada sitio web / tercero
+YouMustDefineTheHomePage=Primero debe definir la página de inicio predeterminada
+OnlyEditionOfSourceForGrabbedContent=Solo es posible la edición de código fuente HTML cuando el contenido fue capturado de un sitio externo
+GrabImagesInto=Agarra también imágenes encontradas en css y página.
+WebsiteRootOfImages=Directorio raíz para imágenes de sitios web
+AliasPageAlreadyExists=La página de alias <strong> %s </ strong> ya existe
+ExternalURLMustStartWithHttp=La URL externa debe comenzar con http: // o https: //
+ZipOfWebsitePackageToLoad=o Elija un paquete de plantillas de sitio web incorporado
+ThisPageIsTranslationOf=Esta página / contenedor es una traducción de
+ThisPageHasTranslationPages=Esta página / contenedor tiene traducción
+NoWebSiteCreateOneFirst=Todavía no se ha creado ningún sitio web. Crea uno primero.
+GoTo=Ir
+DynamicPHPCodeContainsAForbiddenInstruction=Agregue el código PHP dinámico que contiene la instrucción de PHP &#39; <strong>%s</strong> &#39; que está prohibida por defecto como contenido dinámico (vea las opciones ocultas WEBSITE_PHP_ALLOW_xxx para aumentar la lista de comandos permitidos).
+SearchReplaceInto=Búsqueda | Reemplazar en
+CSSContentTooltipHelp=Ingrese aquí el contenido CSS. Para evitar cualquier conflicto con el CSS de la aplicación, asegúrese de anteponer todas las declaraciones con la clase .bodywebsite. Por ejemplo: <br><br> #mycssselector, input.myclass: hover {...} <br> debe ser <br> .bodywebsite #mycssselector, .bodywebsite input.myclass: hover {...} <br><br> Nota: Si tiene un archivo grande sin este prefijo, puede usar &#39;lessc&#39; para convertirlo y agregar el prefijo .bodywebsite en todas partes.
+LinkAndScriptsHereAreNotLoadedInEditor=Advertencia: Este contenido se genera solo cuando se accede al sitio desde un servidor. No se usa en modo Edición, por lo que si necesita cargar archivos javascript también en modo edición, simplemente agregue su etiqueta &#39;script src = ...&#39; en la página.
+EditInLineOnOff=El modo &#39;Editar en línea&#39; es %s
+ShowSubContainersOnOff=El modo para ejecutar &#39;contenido dinámico&#39; es %s
+GlobalCSSorJS=Archivo global CSS / JS / Header del sitio web
+TranslationLinks=Enlaces de Traducción
+YouTryToAccessToAFileThatIsNotAWebsitePage=Usted intenta acceder a una página que no es una página web
diff --git a/htdocs/langs/es_CL/withdrawals.lang b/htdocs/langs/es_CL/withdrawals.lang
new file mode 100644
index 00000000000..3d2ae093d19
--- /dev/null
+++ b/htdocs/langs/es_CL/withdrawals.lang
@@ -0,0 +1,102 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+CustomersStandingOrdersArea=Área de órdenes de pago de débito directo
+SuppliersStandingOrdersArea=Área de órdenes de pago de crédito directo
+StandingOrdersPayment=Órdenes de pago de débito directo
+StandingOrderPayment=Orden de pago de débito directo
+NewStandingOrder=Nueva orden de débito directo
+StandingOrderToProcess=Para procesar
+WithdrawalsReceipts=Órdenes de débito directo
+WithdrawalReceipt=Orden de débito directo
+LastWithdrawalReceipts=Últimos archivos de débito directo %s
+WithdrawalsLines=Líneas de orden de débito directo
+RequestStandingOrderToTreat=Solicitud de orden de pago de débito directo para procesar
+RequestStandingOrderTreated=Solicitud de orden de pago de débito directo procesada
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Aún no es posible El estado de retirada se debe establecer en 'acreditado' antes de declarar el rechazo en líneas específicas.
+NbOfInvoiceToWithdraw=Nº de factura calificada con orden de domiciliación bancaria en espera.
+NbOfInvoiceToWithdrawWithInfo=Número de facturas de clientes con órdenes de pago de débito directo que tienen información de cuenta bancaria definida
+InvoiceWaitingWithdraw=Factura esperando débito directo
+AmountToWithdraw=Cantidad a retirar
+WithdrawsRefused=Débito directo rechazado
+NoInvoiceToWithdraw=No hay ninguna factura del cliente con 'Solicitudes de débito directo' abiertas esperando. Vaya a la pestaña '%s' en la tarjeta de factura para realizar una solicitud.
+ResponsibleUser=Usuario responsable
+WithdrawalsSetup=Configuración de pago de débito directo
+WithdrawStatistics=Estadísticas de pago con domiciliación bancaria
+WithdrawRejectStatistics=Estadísticas de rechazo de pago de domiciliación bancaria
+LastWithdrawalReceipt=Últimos recibos de débito directo %s
+MakeWithdrawRequest=Hacer una solicitud de pago de débito directo
+WithdrawRequestsDone=%s solicitudes de pago de débito directo registradas
+ThirdPartyBankCode=Código bancario de terceros
+NoInvoiceCouldBeWithdrawed=Ninguna factura debitada con éxito. Verifique que las facturas sean de compañías con un IBAN válido y que el IBAN tenga un UMR (referencia única de mandato) con el modo <strong>%s</strong> .
+ClassCredited=Clasificar acreditado
+ClassCreditedConfirm=¿Seguro que quieres clasificar este recibo de retiro como acreditado en tu cuenta bancaria?
+TransData=Fecha de transmisión
+TransMetod=Método de transmisión
+StandingOrderReject=Emitir un rechazo
+WithdrawalRefused=Retiro rechazado
+WithdrawalRefusedConfirm=¿Estás seguro de que deseas ingresar un rechazo de retiro para la sociedad?
+RefusedData=Fecha de rechazo
+RefusedReason=Motivo del rechazo
+RefusedInvoicing=Facturando el rechazo
+NoInvoiceRefused=No cargues el rechazo
+InvoiceRefused=Factura rechazada (cargar el rechazo al cliente)
+StatusDebitCredit=Estado de débito / crédito
+StatusWaiting=Esperando
+StatusTrans=Expedido
+StatusCredited=Acreditado
+StatusRefused=Rechazado
+StatusMotif0=Sin especificar
+StatusMotif1=Fondos insuficientes
+StatusMotif2=Solicitud impugnada
+StatusMotif3=Sin orden de pago de débito directo
+StatusMotif4=Órdenes de venta
+StatusMotif5=RIB inutilizable
+StatusMotif8=Otra razon
+CreateForSepaFRST=Crear un archivo de domiciliación bancaria (SEPA FRST)
+CreateForSepaRCUR=Crear un archivo de domiciliación bancaria (SEPAR RCUR)
+CreateAll=Crear un archivo de domiciliación bancaria (todos)
+CreateGuichet=Solo oficina
+CreateBanque=Solo banco
+OrderWaiting=Esperando tratamiento
+NotifyTransmision=Transmisión de extracción
+NotifyCredit=Crédito de Retiro
+NumeroNationalEmetter=Número de transmisor nacional
+WithBankUsingRIB=Para cuentas bancarias que usan RIB
+WithBankUsingBANBIC=Para cuentas bancarias que usan IBAN / BIC / SWIFT
+BankToReceiveWithdraw=Recibiendo cuenta bancaria
+CreditDate=Crédito en
+WithdrawalFileNotCapable=No se puede generar un archivo de recibo de retiro para su país %s (Su país no es compatible)
+ShowWithdraw=Mostrar orden de débito directo
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene al menos una orden de pago por débito directo aún no procesada, no se establecerá como pagada para permitir la gestión previa de retiros.
+DoStandingOrdersBeforePayments=Esta pestaña le permite solicitar una orden de pago de débito directo. Una vez hecho esto, vaya al menú Bank-> Direct Debit orders para administrar la orden de pago de débito directo. Cuando se cierra la orden de pago, el pago en la factura se registrará automáticamente y la factura se cerrará si el resto para pagar es nulo.
+WithdrawalFile=Archivo de retiro
+SetToStatusSent=Establecer el estado "Archivo enviado"
+ThisWillAlsoAddPaymentOnInvoice=Esto también registrará los pagos a las facturas y los clasificará como "Pagado" si queda para pagar es nulo.
+StatisticsByLineStatus=Estadísticas por estado de líneas
+RUMLong=Referencia única de mandatos
+RUMWillBeGenerated=Si está vacío, se generará una UMR (referencia única de mandato) una vez que se guarde la información de la cuenta bancaria.
+WithdrawMode=Modo de domiciliación bancaria (FRST o RECUR)
+WithdrawRequestAmount=Cantidad de solicitud de débito directo:
+WithdrawRequestErrorNilAmount=No se puede crear una solicitud de domiciliación bancaria para el importe vacío.
+SepaMandate=Mandato de débito directo de la SEPA
+PleaseReturnMandate=Envíe este formulario de mandato por correo electrónico al %s o por correo electrónico a
+SEPALegalText=Al firmar este formulario de mandato, usted autoriza (A) %s a enviar instrucciones a su banco para que debiten en su cuenta y (B) a que su banco cargue en su cuenta de acuerdo con las instrucciones del %s. Como parte de sus derechos, tiene derecho a un reembolso de su banco en los términos y condiciones de su acuerdo con su banco. Se debe reclamar un reembolso dentro de las 8 semanas a partir de la fecha en que se debitó su cuenta. Sus derechos con respecto al mandato anterior se explican en una declaración que puede obtener de su banco.
+CreditorIdentifier=Identificador del acreedor
+CreditorName=Nombre del acreedor
+SEPAFillForm=(B) Por favor complete todos los campos marcados *
+SEPAFormYourName=Tu nombre
+SEPAFormYourBAN=Su nombre de cuenta bancaria (IBAN)
+SEPAFormYourBIC=Su código de identificación bancaria (BIC)
+PleaseCheckOne=Por favor marque uno solo
+DirectDebitOrderCreated=Orden de débito directo %s creado
+AmountRequested=Monto solicitado
+CreateForSepa=Crear un archivo de débito directo
+END_TO_END=Etiqueta XML SEPA &quot;EndToEndId&quot; - ID única asignada por transacción
+USTRD=Etiqueta XML no estructurada de SEPA
+InfoCreditSubject=Pago de la orden de pago de débito directo %s por el banco
+InfoCreditMessage=La orden de pago de débito directo %s ha sido pagada por el banco <br> Datos de pago: %s
+InfoTransSubject=Transmisión de la orden de pago de débito directo %s al banco
+InfoTransMessage=La orden de pago de débito directo %s ha sido enviada al banco por %s %s. <br> <br>
+InfoTransData=Cantidad: %s <br> Método: %s <br> Fecha: %s
+InfoRejectSubject=Orden de pago de débito directo rechazada
+InfoRejectMessage=Hola, <br> <br> el pedido de pago de débito directo de la factura %s relacionado con la empresa %s, con un importe de %s ha sido rechazado por el banco. <br> <br> - <br> %s
+ModeWarning=La opción para el modo real no se configuró, nos detenemos después de esta simulación
diff --git a/htdocs/langs/es_CO/accountancy.lang b/htdocs/langs/es_CO/accountancy.lang
new file mode 100644
index 00000000000..7cd257d2edd
--- /dev/null
+++ b/htdocs/langs/es_CO/accountancy.lang
@@ -0,0 +1,203 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_EXPORT_SEPARATORCSV=Separador de columnas para el archivo de exportación
+ACCOUNTING_EXPORT_DATE=Formato de fecha para el archivo de exportación
+ACCOUNTING_EXPORT_PIECE=Exportar el número de pieza.
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exportar con cuenta global
+ACCOUNTING_EXPORT_LABEL=Etiqueta de exportación
+ACCOUNTING_EXPORT_AMOUNT=Cantidad de exportación
+ACCOUNTING_EXPORT_DEVISE=Moneda de exportación
+Selectformat=Selecciona el formato para el archivo.
+ACCOUNTING_EXPORT_FORMAT=Selecciona el formato para el archivo.
+ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique el prefijo para el nombre del archivo.
+DefaultForService=Por defecto para el servicio
+DefaultForProduct=Predeterminado para producto
+CantSuggest=No puedo sugerir
+ConfigAccountingExpert=Configuración del módulo experto en contabilidad.
+Journalization=Periodización
+Journaux=Revistas
+JournalFinancial=Revistas financieras
+BackToChartofaccounts=Tabla de retorno de cuentas
+Chartofaccounts=Catálogo de cuentas
+CurrentDedicatedAccountingAccount=Cuenta dedicada actual
+AssignDedicatedAccountingAccount=Nueva cuenta para asignar
+InvoiceLabel=Etiqueta de factura
+OverviewOfAmountOfLinesNotBound=Resumen de la cantidad de líneas no vinculadas a una cuenta contable
+OverviewOfAmountOfLinesBound=Resumen de la cantidad de líneas ya unidas a una cuenta contable
+DeleteCptCategory=Eliminar cuenta contable del grupo
+JournalizationInLedgerStatus=Estado de la periodización
+AlreadyInGeneralLedger=Ya publicado en libros de contabilidad.
+NotYetInGeneralLedger=Aún no se ha publicado en los libros de contabilidad.
+GroupIsEmptyCheckSetup=El grupo está vacío, verifique la configuración del grupo de contabilidad personalizado
+DetailByAccount=Mostrar detalle por cuenta
+AccountWithNonZeroValues=Cuentas con valores distintos de cero.
+CountriesInEECExceptMe=Países en EEC excepto %s
+MainAccountForCustomersNotDefined=Cuenta contable principal para clientes no definidos en la configuración.
+MainAccountForSuppliersNotDefined=Cuenta de contabilidad principal para proveedores no definidos en la configuración.
+MainAccountForUsersNotDefined=Cuenta de contabilidad principal para usuarios no definidos en la configuración.
+MainAccountForVatPaymentNotDefined=Cuenta contable principal para el pago del IVA no definido en la configuración
+AccountancyArea=Area de contabilidad
+AccountancyAreaDescActionOnce=Las siguientes acciones generalmente se ejecutan una sola vez, o una vez al año ...
+AccountancyAreaDescActionOnceBis=Se deben seguir los siguientes pasos para ahorrarle tiempo en el futuro, sugiriéndole la cuenta contable predeterminada correcta al realizar el registro por diario (escribiendo el registro en Revistas y Libro mayor)
+AccountancyAreaDescActionFreq=Las siguientes acciones generalmente se ejecutan cada mes, semana o día para compañías muy grandes ...
+AccountancyAreaDescJournalSetup=PASO %s: cree o verifique el contenido de su lista de revistas desde el menú %s
+AccountancyAreaDescChartModel=PASO %s: Cree un modelo de plan de cuenta desde el menú %s
+AccountancyAreaDescChart=PASO %s: cree o verifique el contenido de su plan de cuentas desde el menú %s
+AccountancyAreaDescVat=PASO %s: Defina cuentas contables para cada tasa de IVA. Para ello, utilice la entrada de menú %s.
+AccountancyAreaDescDefault=PASO %s: Defina cuentas de contabilidad predeterminadas. Para ello, utilice la entrada de menú %s.
+AccountancyAreaDescExpenseReport=PASO %s: Defina cuentas de contabilidad predeterminadas para cada tipo de informe de gastos. Para ello, utilice la entrada de menú %s.
+AccountancyAreaDescSal=PASO %s: Defina cuentas contables predeterminadas para el pago de salarios. Para ello, utilice la entrada de menú %s.
+AccountancyAreaDescContrib=PASO %s: Defina cuentas de contabilidad predeterminadas para gastos especiales (impuestos diversos). Para ello, utilice la entrada de menú %s.
+AccountancyAreaDescDonation=PASO %s: Defina cuentas de contabilidad predeterminadas para donación. Para ello, utilice la entrada de menú %s.
+AccountancyAreaDescMisc=PASO %s: Defina cuentas predeterminadas obligatorias y cuentas contables predeterminadas para transacciones misceláneas. Para ello, utilice la entrada de menú %s.
+AccountancyAreaDescLoan=PASO %s: Defina cuentas de contabilidad predeterminadas para préstamos. Para ello, utilice la entrada de menú %s.
+AccountancyAreaDescBank=PASO %s: Defina cuentas contables y código de diario para cada banco y cuentas financieras. Para ello, utilice la entrada de menú %s.
+AccountancyAreaDescProd=PASO %s: Defina cuentas de contabilidad en sus productos / servicios. Para ello, utilice la entrada de menú %s.
+AccountancyAreaDescBind=PASO %s: verifique el enlace entre las líneas %s existentes y la cuenta contable se realiza, por lo que la aplicación podrá registrar transacciones en el libro mayor en un solo clic. Completar los enlaces que faltan. Para ello, utilice la entrada de menú %s.
+AccountancyAreaDescWriteRecords=PASO %s: Escriba transacciones en el Libro mayor. Para esto, vaya al menú <strong> %s </strong> y haga clic en el botón <strong> %s </strong>.
+AccountancyAreaDescAnalyze=PASO %s: agregue o edite transacciones existentes y genere informes y exportaciones.
+AccountancyAreaDescClosePeriod=PASO %s: Cierre el período para que no podamos realizar modificaciones en el futuro.
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Un paso obligatorio en la configuración no se completó (el diario del código contable no está definido para todas las cuentas bancarias)
+Selectchartofaccounts=Seleccionar plan de cuentas activo
+ChangeAndLoad=Cambio y carga
+ShowAccountingAccount=Mostrar cuenta contable
+MenuDefaultAccounts=Cuentas por defecto
+MenuBankAccounts=cuentas bancarias
+MenuVatAccounts=Vat cuentas
+MenuExpenseReportAccounts=Cuentas de informe de gastos
+MenuLoanAccounts=Cuentas de prestamo
+MenuProductsAccounts=Cuentas de productos
+CustomersVentilation=Encuadernación factura cliente
+SuppliersVentilation=Encuadernación factura de proveedor
+ExpenseReportsVentilation=Informe de gastos vinculante
+CreateMvts=Crear nueva transacción
+UpdateMvts=Modificación de una transacción
+ValidTransaction=Validar transaccion
+Bookkeeping=Libro mayor
+ObjectsRef=Ref. Objeto fuente
+TotalExpenseReport=Informe de gastos totales
+InvoiceLines=Líneas de facturas a unir.
+InvoiceLinesDone=Líneas enlazadas de facturas.
+ExpenseReportLines=Informes de líneas de gasto a enlazar.
+ExpenseReportLinesDone=Reportes de líneas de gasto.
+IntoAccount=Línea de enlace con la cuenta contable.
+Ventilate=Enlazar
+LineId=Línea de identificación
+SelectedLines=Lineas seleccionadas
+Lineofinvoice=Línea de factura
+LineOfExpenseReport=Informe de línea de gastos
+NoAccountSelected=Ninguna cuenta contable seleccionada
+VentilatedinAccount=Enlazado exitosamente a la cuenta contable.
+NotVentilatedinAccount=No vinculado a la cuenta contable.
+XLineSuccessfullyBinded=%s productos / servicios vinculados con éxito a una cuenta contable
+XLineFailedToBeBinded=%s productos / servicios no estaban vinculados a ninguna cuenta contable
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comience la clasificación de la página "Enlace para hacer" según los elementos más recientes.
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comience la clasificación de la página "Encuadernación hecha" por los elementos más recientes.
+ACCOUNTING_LENGTH_DESCRIPTION=Truncar la descripción de productos y servicios en las listas después de x caracteres (Mejor = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncar el formulario de descripción de la cuenta de productos y servicios en los listados después de x caracteres (Mejor = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Longitud de las cuentas de contabilidad general (si establece el valor en 6 aquí, la cuenta '706' aparecerá como '706000' en la pantalla)
+BANK_DISABLE_DIRECT_INPUT=Deshabilitar el registro directo de la transacción en la cuenta bancaria
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilitar borrador de exportación en la revista
+ACCOUNTING_SELL_JOURNAL=Diario de venta
+ACCOUNTING_PURCHASE_JOURNAL=Diario de compra
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Revista miscelánea
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Diario de informe de gastos
+ACCOUNTING_SOCIAL_JOURNAL=Revista social
+ACCOUNTING_HAS_NEW_JOURNAL=Tiene nuevo diario
+ACCOUNTING_ACCOUNT_SUSPENSE=Cuenta contable de espera.
+DONATION_ACCOUNTINGACCOUNT=Cuenta contable para registrar donaciones.
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cuenta contable por defecto para los productos vendidos (se usa si no se define en la hoja del producto)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Cuenta de contabilidad por defecto para los servicios comprados (se usa si no está definido en la hoja de servicio)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cuenta de contabilidad por defecto para los servicios vendidos (se usa si no se define en la hoja de servicio)
+LabelAccount=Etiqueta de cuenta
+LabelOperation=Operación de etiquetas
+LetteringCode=Codigo de letras
+Codejournal=diario
+NumPiece=Número de pieza
+TransactionNumShort=Num. transacción
+GroupByAccountAccounting=Grupo por cuenta contable
+AccountingAccountGroupsDesc=Puede definir aquí algunos grupos de cuentas contables. Serán utilizados para informes contables personalizados.
+ByPredefinedAccountGroups=Por grupos predefinidos.
+DeleteMvt=Eliminar líneas de libro mayor
+DelYear=Año para borrar
+DelJournal=Diario para eliminar
+ConfirmDeleteMvtPartial=Esto eliminará la transacción del Libro mayor (se eliminarán todas las líneas relacionadas con la misma transacción)
+FinanceJournal=Revista de finanzas
+ExpenseReportsJournal=Diario de informes de gastos
+DescFinanceJournal=Revista financiera que incluye todos los tipos de pagos por cuenta bancaria.
+DescJournalOnlyBindedVisible=Esta es una vista de registro que está vinculada a una cuenta de contabilidad y se puede registrar en el Libro mayor.
+VATAccountNotDefined=Cuenta para el IVA no definido
+ThirdpartyAccountNotDefined=Cuenta por tercero no definida.
+ProductAccountNotDefined=Cuenta por producto no definido.
+FeeAccountNotDefined=Cuenta por tarifa no definida
+BankAccountNotDefined=Cuenta para banco no definida
+CustomerInvoicePayment=Pago de factura al cliente.
+NewAccountingMvt=Nueva transaccion
+NumMvts=Numero de transacción
+ListeMvts=Lista de movimientos
+ErrorDebitCredit=Débito y crédito no pueden tener un valor al mismo tiempo
+AddCompteFromBK=Añadir cuentas de contabilidad al grupo.
+ListAccounts=Listado de las cuentas contables.
+PaymentsNotLinkedToProduct=Pago no vinculado a ningún producto / servicio.
+TotalVente=Rotación total antes de impuestos
+TotalMarge=Margen total de ventas
+DescVentilCustomer=Consulte aquí la lista de líneas de factura del cliente vinculadas (o no) a una cuenta contable del producto
+DescVentilMore=En la mayoría de los casos, si utiliza productos o servicios predefinidos y configura el número de cuenta en la tarjeta de producto / servicio, la aplicación podrá hacer todo el enlace entre sus líneas de factura y la cuenta contable de su plan de cuentas, solo en un clic con el botón <strong> "%s" </strong>. Si la cuenta no se configuró en las tarjetas de productos / servicios o si todavía tiene algunas líneas que no están vinculadas a una cuenta, deberá realizar un enlace manual desde el menú "<strong> %s </strong>".
+DescVentilDoneCustomer=Consulte aquí la lista de las líneas de facturas de los clientes y su cuenta contable del producto.
+DescVentilTodoCustomer=Enlazar líneas de factura aún no vinculadas con una cuenta contable de producto
+ChangeAccount=Cambie la cuenta de contabilidad de producto / servicio para las líneas seleccionadas con la siguiente cuenta de contabilidad:
+DescVentilTodoExpenseReport=Líneas de informe de gastos de enlace no vinculadas con una cuenta contable de comisiones
+DescVentilExpenseReport=Consulte aquí la lista de líneas de informe de gastos vinculadas (o no) a una cuenta de contabilidad de comisiones.
+DescVentilExpenseReportMore=Si configura una cuenta contable según el tipo de líneas de informe de gastos, la aplicación podrá realizar toda la vinculación entre sus líneas de informe de gastos y la cuenta contable de su plan de cuentas, solo con un clic con el botón <strong> "%s" </strong>. Si la cuenta no se estableció en el diccionario de tarifas o si todavía tiene algunas líneas no vinculadas a ninguna cuenta, deberá realizar un enlace manual desde el menú "<strong> %s </strong>".
+DescVentilDoneExpenseReport=Consulte aquí la lista de líneas de informes de gastos y sus cuentas contables.
+AutomaticBindingDone=Encuadernación automática hecha
+ErrorAccountancyCodeIsAlreadyUse=Error, no puede eliminar esta cuenta de contabilidad porque se usa
+MvtNotCorrectlyBalanced=Movimiento no equilibrado correctamente. Débito = %s | Crédito = %s
+Balancing=Equilibrio
+FicheVentilation=Tarjeta de encuadernación
+GeneralLedgerIsWritten=Las transacciones están escritas en el libro mayor.
+GeneralLedgerSomeRecordWasNotRecorded=Algunas de las transacciones no pudieron ser periodizadas. Si no hay otro mensaje de error, probablemente sea porque ya estaban registrados.
+NoNewRecordSaved=No hay más récord para periodizar.
+ListOfProductsWithoutAccountingAccount=Lista de productos no vinculados a ninguna cuenta contable.
+ChangeBinding=Cambiar el enlace
+Accounted=Contabilizado en libro mayor
+NotYetAccounted=Aún no contabilizado en el libro mayor.
+ApplyMassCategories=Aplicar categorías de masa
+CategoryDeleted=Se ha eliminado la categoría de la cuenta contable.
+AccountingJournals=Revistas contables
+AccountingJournal=Diario de contabilidad
+NewAccountingJournal=Nueva revista contable
+AccountingJournalType1=Operaciones misceláneas
+AccountingJournalType5=Informe de gastos
+AccountingJournalType9=Ha-nuevo
+ErrorAccountingJournalIsAlreadyUse=Esta revista ya está en uso.
+AccountingAccountForSalesTaxAreDefinedInto=Nota: la cuenta contable del impuesto sobre las ventas se define en el menú <b> %s </b> - <b> %s </b>
+ExportDraftJournal=Exportar borrador de revista
+Selectmodelcsv=Selecciona un modelo de exportación.
+Modelcsv_configurable=Exportar CSV Configurable
+ChartofaccountsId=ID del plan de cuentas
+InitAccountancy=Contable inicial
+InitAccountancyDesc=Esta página se puede usar para inicializar una cuenta contable en productos y servicios que no tiene una cuenta contable definida para ventas y compras.
+DefaultBindingDesc=Esta página se puede usar para configurar una cuenta predeterminada para vincular el registro de transacciones sobre salarios de pago, donaciones, impuestos y IVA cuando no se haya establecido una cuenta contable específica.
+OptionModeProductSell=Modo de ventas
+OptionModeProductBuy=Compras de modo
+OptionModeProductSellDesc=Mostrar todos los productos con cuenta contable para ventas.
+OptionModeProductBuyDesc=Mostrar todos los productos con cuenta contable para compras.
+CleanFixHistory=Eliminar el código de contabilidad de las líneas que no existen en los cuadros de cuenta
+CleanHistory=Restablecer todos los enlaces para el año seleccionado
+PredefinedGroups=Grupos predefinidos
+WithValidAccount=Con cuenta dedicada válida.
+ValueNotIntoChartOfAccount=Este valor de la cuenta contable no existe en el plan de cuentas.
+SomeMandatoryStepsOfSetupWereNotDone=Algunos pasos obligatorios de configuración no se realizaron, por favor complete
+ErrorNoAccountingCategoryForThisCountry=No hay grupo de cuentas contables disponible para el país %s (Consulte Inicio - Configuración - Diccionarios)
+ErrorInvoiceContainsLinesNotYetBounded=Intenta registrar en el diario algunas líneas de la factura <strong> %s </strong>, pero algunas otras líneas aún no están vinculadas a la cuenta contable. La periodización de todas las líneas de factura para esta factura se rechazan.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Algunas líneas en la factura no están vinculadas a la cuenta contable.
+ExportNotSupported=El formato de exportación configurado no es compatible con esta página.
+BookeppingLineAlreayExists=Líneas ya existentes en la contabilidad.
+NoJournalDefined=Ninguna revista definida
+Binded=Líneas enlazadas
+ToBind=Líneas para unir
+UseMenuToSetBindindManualy=Líneas aún no enlazadas, use el menú <a href="%s"> %s </a> para hacer el enlace manualmente
+ImportAccountingEntries=Asientos contables
+WarningReportNotReliable=Advertencia, este informe no se basa en el Libro mayor, por lo que no contiene la transacción modificada manualmente en el Libro mayor. Si su publicación está actualizada, la vista de contabilidad es más precisa.
+ExpenseReportJournal=Diario de informe de gastos
+InventoryJournal=Diario de inventario
diff --git a/htdocs/langs/es_CO/agenda.lang b/htdocs/langs/es_CO/agenda.lang
index 0b448cdeb31..11fff680032 100644
--- a/htdocs/langs/es_CO/agenda.lang
+++ b/htdocs/langs/es_CO/agenda.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - agenda
-AffectedTo=Asignado a
 Event=Acción
 DateActionEnd=Fecha final
diff --git a/htdocs/langs/es_CO/boxes.lang b/htdocs/langs/es_CO/boxes.lang
new file mode 100644
index 00000000000..6a5f709d318
--- /dev/null
+++ b/htdocs/langs/es_CO/boxes.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - boxes
+ForCustomersInvoices=Facturas de clientes
+ForProposals=Propuestas
diff --git a/htdocs/langs/es_CO/categories.lang b/htdocs/langs/es_CO/categories.lang
new file mode 100644
index 00000000000..c3bc80d45d8
--- /dev/null
+++ b/htdocs/langs/es_CO/categories.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - categories
+Rubriques=Etiquetas / Categorías
+ExtraFieldsCategories=Atributos complementarios
diff --git a/htdocs/langs/es_CO/contracts.lang b/htdocs/langs/es_CO/contracts.lang
new file mode 100644
index 00000000000..393d5e7a8bb
--- /dev/null
+++ b/htdocs/langs/es_CO/contracts.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - contracts
+Contracts=Los contratos
+ContractsSubscriptions=Contratos / Suscripciones
+ContractStartDate=Fecha de inicio
+ContractEndDate=Fecha final
diff --git a/htdocs/langs/es_CO/exports.lang b/htdocs/langs/es_CO/exports.lang
new file mode 100644
index 00000000000..e11e442a7e3
--- /dev/null
+++ b/htdocs/langs/es_CO/exports.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - exports
+LibraryShort=Biblioteca
+ComputedField=Campo computado
diff --git a/htdocs/langs/es_CO/install.lang b/htdocs/langs/es_CO/install.lang
new file mode 100644
index 00000000000..776f7f166d2
--- /dev/null
+++ b/htdocs/langs/es_CO/install.lang
@@ -0,0 +1,179 @@
+# Dolibarr language file - Source file is en_US - install
+InstallEasy=Simplemente siga las instrucciones paso a paso.
+MiscellaneousChecks=Verificación de requisitos previos
+ConfFileExists=El archivo de configuración <b> %s </b> existe.
+ConfFileDoesNotExistsAndCouldNotBeCreated=El archivo de configuración <b> %s </b> no existe y no se pudo crear.
+ConfFileCouldBeCreated=Se puede crear el archivo de configuración <b> %s </b>.
+ConfFileIsNotWritable=El archivo de configuración <b> %s </b> no se puede escribir. Compruebe los permisos. Para la primera instalación, su servidor web debe poder escribir en este archivo durante el proceso de configuración ("chmod 666", por ejemplo, en un sistema operativo tipo Unix).
+ConfFileIsWritable=El archivo de configuración <b> %s </b> se puede escribir.
+ConfFileMustBeAFileNotADir=El archivo de configuración <b> %s </b> debe ser un archivo, no un directorio.
+ConfFileReload=Recarga de parámetros desde archivo de configuración.
+PHPSupportSessions=Este PHP soporta sesiones.
+PHPSupportPOSTGETOk=Este PHP soporta las variables POST y GET.
+PHPSupportPOSTGETKo=Es posible que su configuración de PHP no admita las variables POST y / o GET. Verifique el parámetro <b> variables_order </b> en php.ini.
+PHPSupportGD=Este PHP soporta funciones gráficas GD.
+PHPSupportCurl=Este PHP soporta Curl.
+PHPSupportUTF8=Este PHP soporta funciones UTF8.
+PHPMemoryOK=La memoria de sesión de PHP max está configurada en <b> %s </b>. Esto debería ser suficiente.
+PHPMemoryTooLow=La memoria de sesión de PHP max está configurada en <b> %s </b> bytes. Esto es demasiado bajo. Cambie su <b> php.ini </b> para establecer el parámetro <b> memory_limit </b> en al menos <b> %s </b> bytes.
+Recheck=Haga clic aquí para una prueba más detallada
+ErrorPHPDoesNotSupportSessions=Su instalación de PHP no soporta sesiones. Esta función es necesaria para permitir que Dolibarr funcione. Compruebe su configuración de PHP y permisos del directorio de sesiones.
+ErrorPHPDoesNotSupportGD=Su instalación de PHP no soporta funciones gráficas de GD. No habrá gráficos disponibles.
+ErrorPHPDoesNotSupportCurl=Su instalación de PHP no es compatible con Curl.
+ErrorPHPDoesNotSupportUTF8=Su instalación de PHP no es compatible con las funciones UTF8. Dolibarr no puede funcionar correctamente. Resuelve esto antes de instalar Dolibarr.
+ErrorDirDoesNotExists=El directorio %s no existe.
+ErrorGoBackAndCorrectParameters=Regresa y revisa / corrige los parámetros.
+ErrorWrongValueForParameter=Es posible que haya escrito un valor incorrecto para el parámetro '%s'.
+ErrorFailedToConnectToDatabase=Error al conectarse a la base de datos '%s'.
+ErrorDatabaseVersionTooLow=Versión de la base de datos (%s) demasiado antigua. Se requiere la versión %s o superior.
+ErrorPHPVersionTooLow=La versión de PHP es muy antigua. Se requiere la versión %s.
+ErrorConnectedButDatabaseNotFound=La conexión al servidor fue exitosa pero no se encontró la base de datos '%s'.
+IfDatabaseNotExistsGoBackAndUncheckCreate=Si la base de datos no existe, vuelva atrás y marque la opción "Crear base de datos".
+IfDatabaseExistsGoBackAndCheckCreate=Si la base de datos ya existe, vuelva atrás y desmarque la opción "Crear base de datos".
+WarningBrowserTooOld=La versión del navegador es demasiado antigua. Se recomienda encarecidamente actualizar su navegador a una versión reciente de Firefox, Chrome u Opera.
+License=Usando licencia
+WebPagesDirectory=Directorio donde se almacenan las páginas web
+DocumentsDirectory=Directorio para almacenar documentos cargados y generados.
+URLRoot=URL de raíz
+CheckToForceHttps=Marque esta opción para forzar conexiones seguras (https). Esto requiere que el servidor web esté configurado con un certificado SSL.
+DolibarrDatabase=Base de datos de Dolibarr
+DatabaseType=Tipo de base de datos
+ServerAddressDescription=Nombre o dirección IP para el servidor de base de datos. Normalmente, 'localhost' cuando el servidor de la base de datos está alojado en el mismo servidor que el servidor web.
+ServerPortDescription=Puerto del servidor de base de datos. Mantener vacío si se desconoce.
+DatabasePrefix=Prefijo de tabla de base de datos
+AdminLogin=Cuenta de usuario para el propietario de la base de datos Dolibarr.
+PasswordAgain=Vuelva a escribir la confirmación de la contraseña
+AdminPassword=Contraseña para el propietario de la base de datos Dolibarr.
+CreateDatabase=Crear base de datos
+CreateUser=Cree una cuenta de usuario o otorgue permiso de cuenta de usuario en la base de datos de Dolibarr
+DatabaseSuperUserAccess=Servidor de base de datos - Acceso de superusuario
+CheckToCreateDatabase=Marque la casilla si la base de datos aún no existe y, por lo tanto, debe crearse. <br> En este caso, también debe ingresar el nombre de usuario y la contraseña de la cuenta de superusuario en la parte inferior de esta página.
+CheckToCreateUser=Marque la casilla si: <br> la cuenta de usuario de la base de datos aún no existe y, por lo tanto, debe crearse, o <br> si la cuenta de usuario existe pero la base de datos no existe y se deben otorgar permisos. <br> En este caso, debe ingresar la cuenta de usuario y la contraseña, y <b> también </b> el nombre de la cuenta del superusuario y la contraseña en la parte inferior de esta página. Si esta casilla no está marcada, el propietario de la base de datos y la contraseña ya deben existir.
+KeepEmptyIfNoPassword=Deje en blanco si el superusuario no tiene contraseña (NO se recomienda)
+ServerConnection=Conexión de servidor
+DatabaseCreation=Creación de base de datos
+CreateDatabaseObjects=Creación de objetos de base de datos
+ReferenceDataLoading=Carga de datos de referencia
+TablesAndPrimaryKeysCreation=Creación de tablas y claves primarias.
+CreateTableAndPrimaryKey=Crear tabla %s
+CreateOtherKeysForTable=Cree claves externas e índices para la tabla %s
+OtherKeysCreation=Creación de claves externas e índices.
+AdminAccountCreation=Creación de inicio de sesión de administrador
+PleaseTypePassword=Por favor escriba una contraseña, las contraseñas vacías no están permitidas!
+PleaseTypeALogin=Por favor escriba un nombre de usuario!
+PasswordsMismatch=Las contraseñas difieren, por favor intente de nuevo!
+SetupEnd=Fin de la configuracion
+SystemIsInstalled=Esta instalación está completa.
+SystemIsUpgraded=Dolibarr se ha actualizado con éxito.
+YouNeedToPersonalizeSetup=Debe configurar Dolibarr para que se adapte a sus necesidades (aspecto, características, ...). Para hacer esto, por favor siga el siguiente enlace:
+AdminLoginCreatedSuccessfuly=El inicio de sesión del administrador de Dolibarr '<b> %s </b>' se creó correctamente.
+GoToDolibarr=Ir a dolibarr
+GoToSetupArea=Ir a Dolibarr (área de configuración)
+GoToUpgradePage=Ir a la página de actualización de nuevo
+WithNoSlashAtTheEnd=Sin la barra "/" al final
+AdminLoginAlreadyExists=La cuenta de administrador de Dolibarr '<b> %s </b>' ya existe. Vuelve si quieres crear otro.
+FailedToCreateAdminLogin=Error al crear la cuenta de administrador de Dolibarr.
+WarningRemoveInstallDir=Una advertencia, por razones de seguridad, una vez que se complete la instalación o actualización, debe agregar un archivo llamado <b> install.lock </b> en el directorio de documentos de Dolibarr para evitar nuevamente el uso accidental / malicioso de las herramientas de instalación.
+ChoosedMigrateScript=Elegir script de migración
+DataMigration=Migración de base de datos (datos)
+DatabaseMigration=Migración de base de datos (estructura + algunos datos)
+ProcessMigrateScript=Procesamiento de guiones
+ChooseYourSetupMode=Elija su modo de configuración y haga clic en "Inicio" ...
+FreshInstall=Instalación nueva
+FreshInstallDesc=Utilice este modo si esta es su primera instalación. Si no, este modo puede reparar una instalación previa incompleta. Si desea actualizar su versión, elija el modo "Actualizar".
+UpgradeDesc=Utilice este modo si ha reemplazado los archivos antiguos de Dolibarr con archivos de una versión más nueva. Esto actualizará su base de datos y datos.
+Start=comienzo
+InstallNotAllowed=Configuración no permitida por los permisos <b> conf.php </b>
+YouMustCreateWithPermission=Debe crear el archivo %s y establecer permisos de escritura para el servidor web durante el proceso de instalación.
+AlreadyDone=Ya migrado
+DatabaseVersion=Versión de base de datos
+ServerVersion=Versión del servidor de base de datos
+YouMustCreateItAndAllowServerToWrite=Debe crear este directorio y permitir que el servidor web escriba en él.
+DBSortingCollation=Orden de clasificacion de personajes
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Seleccionó crear la base de datos <b> %s </b>, pero para esto, Dolibarr necesita conectarse al servidor <b> %s </b> con el superusuario <b> %s </b>.
+YouAskLoginCreationSoDolibarrNeedToConnect=Seleccionó crear el usuario de la base de datos <b> %s </b>, pero para esto, Dolibarr necesita conectarse al servidor <b> %s </b> con el superusuario <b> %s </b>.
+BecauseConnectionFailedParametersMayBeWrong=Falló la conexión de la base de datos: los parámetros del host o superusuario deben ser incorrectos.
+OrphelinsPaymentsDetectedByMethod=Pago de huérfanos detectado por el método %s
+RemoveItManuallyAndPressF5ToContinue=Retíralo manualmente y presiona F5 para continuar.
+IfLoginDoesNotExistsCheckCreateUser=Si el usuario aún no existe, debe marcar la opción "Crear usuario"
+ErrorConnection=Servidor "<b> %s </b>", nombre de la base de datos "<b> %s </b>", inicio de sesión "<b> %s </b>", o la contraseña de la base de datos puede ser incorrecta o la versión del cliente de PHP puede ser incorrecta demasiado viejo en comparación con la versión de la base de datos.
+InstallChoiceRecommanded=Opción recomendada para instalar la versión <b> %s </b> de su versión actual <b> %s </b>
+InstallChoiceSuggested=<b> Opción de instalación sugerida por el instalador </b>.
+MigrateIsDoneStepByStep=La versión dirigida (%s) tiene un espacio de varias versiones. El asistente de instalación volverá a sugerir una migración adicional una vez que este se complete.
+CheckThatDatabasenameIsCorrect=Compruebe que el nombre de la base de datos "<b> %s </b>" sea correcto.
+IfAlreadyExistsCheckOption=Si este nombre es correcto y la base de datos aún no existe, debe marcar la opción "Crear base de datos".
+OpenBaseDir=Parámetro PHP openbasedir
+YouAskToCreateDatabaseSoRootRequired=Has marcado la casilla "Crear base de datos". Para esto, debe proporcionar el nombre de usuario / contraseña del superusuario (parte inferior del formulario).
+YouAskToCreateDatabaseUserSoRootRequired=Has marcado la casilla "Crear propietario de base de datos". Para esto, debe proporcionar el nombre de usuario / contraseña del superusuario (parte inferior del formulario).
+NextStepMightLastALongTime=El paso actual puede tardar varios minutos. Por favor, espere hasta que la siguiente pantalla se muestre completamente antes de continuar.
+MigrationShippingDelivery=Actualizar el almacenamiento de envío
+MigrationShippingDelivery2=Actualización de almacenamiento de envío 2
+MigrationFinished=Migración terminada
+LastStepDesc=<strong> Último paso </strong>: defina aquí el nombre de usuario y la contraseña que desea utilizar para conectarse a Dolibarr. <b> No pierda esto, ya que es la cuenta maestra para administrar todas las demás cuentas de usuario / adicionales. </b>
+ActivateModule=Activar módulo %s
+ShowEditTechnicalParameters=Haga clic aquí para mostrar / editar parámetros avanzados (modo experto)
+WarningUpgrade=Advertencia:\n¿Ejecutó primero una copia de seguridad de la base de datos?\nEsto es muy recomendable. La pérdida de datos (debido a, por ejemplo, errores en mysql versión 5.5.40 / 41/42/43) puede ser posible durante este proceso, por lo que es esencial realizar un volcado completo de su base de datos antes de iniciar cualquier migración.\n\nHaga clic en Aceptar para iniciar el proceso de migración ...
+ErrorDatabaseVersionForbiddenForMigration=La versión de su base de datos es %s. Tiene un error crítico que hace posible la pérdida de datos si realiza cambios estructurales en su base de datos, como lo requiere el proceso de migración. Por esta razón, no se permitirá la migración hasta que actualice su base de datos a una versión de capa (parcheada) (lista de versiones de buggy conocidas: %s)
+KeepDefaultValuesWamp=Utilizó el asistente de configuración de Dolibarr de DoliWamp, por lo que los valores propuestos aquí ya están optimizados. Cámbialas solo si sabes lo que estás haciendo.
+KeepDefaultValuesDeb=Usó el asistente de configuración de Dolibarr de un paquete de Linux (Ubuntu, Debian, Fedora ...), por lo que los valores propuestos aquí ya están optimizados. Solo se debe ingresar la contraseña del propietario de la base de datos para crear. Cambie otros parámetros solo si sabe lo que está haciendo.
+KeepDefaultValuesMamp=Utilizó el asistente de configuración de Dolibarr de DoliMamp, por lo que los valores propuestos aquí ya están optimizados. Cámbialas solo si sabes lo que estás haciendo.
+KeepDefaultValuesProxmox=Utilizó el asistente de configuración de Dolibarr desde un dispositivo virtual Proxmox, por lo que los valores propuestos aquí ya están optimizados. Cámbialas solo si sabes lo que estás haciendo.
+UpgradeExternalModule=Ejecutar proceso de actualización dedicado de módulo externo
+SetAtLeastOneOptionAsUrlParameter=Establecer al menos una opción como parámetro en la URL. Por ejemplo: '... repair.php? Standard = confirmado'
+NothingToDelete=Nada que limpiar / borrar
+MigrationFixData=Arreglo para datos desnormalizados
+MigrationOrder=Migración de datos para pedidos del cliente.
+MigrationSupplierOrder=Migración de datos para pedidos de proveedores.
+MigrationProposal=Migración de datos para propuestas comerciales.
+MigrationInvoice=Migración de datos para las facturas del cliente.
+MigrationContract=Migración de datos para contratos.
+MigrationSuccessfullUpdate=Actualización exitosa
+MigrationUpdateFailed=Proceso de actualización fallido
+MigrationRelationshipTables=Migración de datos para tablas de relaciones (%s)
+MigrationPaymentsUpdate=Corrección de datos de pago
+MigrationPaymentsNumberToUpdate=%s pago (s) para actualizar
+MigrationProcessPaymentUpdate=Actualización de pago (s) %s
+MigrationPaymentsNothingToUpdate=No mas cosas que hacer
+MigrationPaymentsNothingUpdatable=No más pagos que puedan ser corregidos.
+MigrationContractsUpdate=Corrección de datos del contrato.
+MigrationContractsNumberToUpdate=%s contrato (s) para actualizar
+MigrationContractsLineCreation=Crear línea de contrato para contrato ref %s
+MigrationContractsNothingToUpdate=No mas cosas que hacer
+MigrationContractsFieldDontExist=El campo fk_facture ya no existe. Nada que hacer.
+MigrationContractsEmptyDatesUpdate=Contrato de fecha vacía de corrección
+MigrationContractsEmptyDatesUpdateSuccess=La corrección de la fecha vacía del contrato se realizó correctamente
+MigrationContractsEmptyDatesNothingToUpdate=Sin contrato fecha vacía para corregir.
+MigrationContractsEmptyCreationDatesNothingToUpdate=No hay fecha de creación del contrato para corregir.
+MigrationContractsInvalidDatesUpdate=Corrección del contrato de fecha de mal valor
+MigrationContractsInvalidDateFix=Contrato correcto %s (Fecha del contrato = %s, Fecha de inicio del servicio mín = %s)
+MigrationContractsInvalidDatesNothingToUpdate=No hay fecha con mal valor para corregir.
+MigrationContractsIncoherentCreationDateUpdate=Corrección de fecha de creación de contrato de mal valor.
+MigrationContractsIncoherentCreationDateUpdateSuccess=Corrección de fecha de creación de contrato de mal valor realizada correctamente
+MigrationContractsIncoherentCreationDateNothingToUpdate=No hay mal valor para la fecha de creación del contrato para corregir
+MigrationReopeningContracts=Contrato abierto cerrado por error
+MigrationReopenThisContract=Reabrir contrato %s
+MigrationReopeningContractsNothingToUpdate=No hay contrato cerrado para abrir
+MigrationBankTransfertsUpdate=Actualización de enlaces entre entrada bancaria y transferencia bancaria.
+MigrationBankTransfertsNothingToUpdate=Todos los enlaces están actualizados.
+MigrationShipmentOrderMatching=Actualización del recibo de envíos
+MigrationDeliveryOrderMatching=Actualización del recibo de entrega
+MigrationDeliveryDetail=Actualización de entrega
+MigrationStockDetail=Actualizar el valor de stock de los productos.
+MigrationMenusDetail=Actualizar tablas dinámicas de menús.
+MigrationDeliveryAddress=Actualizar la dirección de entrega en los envíos.
+MigrationProjectTaskActors=Migración de datos para la tabla llx_projet_task_actors
+MigrationProjectUserResp=Campo de migración de datos fk_user_resp de llx_projet a llx_element_contact
+MigrationProjectTaskTime=Tiempo de actualización gastado en segundos
+MigrationActioncommElement=Actualizar datos sobre acciones.
+MigrationCategorieAssociation=Migración de categorías
+MigrationEvents=Migración de eventos para agregar el propietario del evento en la tabla de asignación
+MigrationEventsContact=Migración de eventos para agregar contactos de eventos a la tabla de asignación
+MigrationRemiseEntity=Actualizar el valor del campo de entidad de llx_societe_remise
+MigrationRemiseExceptEntity=Actualizar el valor del campo de entidad de llx_societe_remise_except
+MigrationUserRightsEntity=Actualizar el valor del campo de entidad de llx_user_rights
+MigrationUserGroupRightsEntity=Actualizar el valor del campo de entidad de llx_usergroup_rights
+MigrationResetBlockedLog=Restablecer módulo BlockedLog para algoritmo v7
+ErrorFoundDuringMigration=Se informaron errores durante el proceso de migración, por lo que el siguiente paso no está disponible. Para ignorar los errores, puede <a href="%s"> hacer clic aquí </a>, pero es posible que la aplicación o algunas funciones no funcionen correctamente hasta que se resuelvan los errores.
+YouTryInstallDisabledByDirLock=La aplicación intentó actualizarse automáticamente, pero las páginas de instalación / actualización se han deshabilitado por seguridad (directorio renombrado con el sufijo .lock). <br>
+YouTryInstallDisabledByFileLock=La aplicación intentó auto actualizarse, pero las páginas de instalación / actualización se han deshabilitado por seguridad (debido a la existencia de un archivo de bloqueo <strong> install.lock </strong> en el directorio de documentos de dolibarr). <br>
+ClickOnLinkOrRemoveManualy=Haga clic en el siguiente enlace. Si siempre ve esta misma página, debe eliminar / cambiar el nombre del archivo install.lock en el directorio de documentos.
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index 6711dc4e08e..ae50a789189 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -89,7 +89,6 @@ PriceUHTCurrency=U.P (moneda)
 PriceUTTC=ARRIBA. (inc. impuestos)
 MulticurrencyAlreadyPaid=Ya pagado, moneda original.
 MulticurrencyRemainderToPay=Quedan por pagar, moneda original.
-MulticurrencyPaymentAmount=Importe del pago, moneda original
 MulticurrencyAmountTTC=Importe (inc. De impuestos), moneda original
 MulticurrencyAmountVAT=Importe impuesto, moneda original
 Totalforthispage=Total para esta página
diff --git a/htdocs/langs/es_CO/modulebuilder.lang b/htdocs/langs/es_CO/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/es_CO/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/es_CO/multicurrency.lang b/htdocs/langs/es_CO/multicurrency.lang
new file mode 100644
index 00000000000..aaede0c21d6
--- /dev/null
+++ b/htdocs/langs/es_CO/multicurrency.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MulticurrencyPaymentAmount=Importe del pago, moneda original
diff --git a/htdocs/langs/es_CO/other.lang b/htdocs/langs/es_CO/other.lang
new file mode 100644
index 00000000000..428db92d092
--- /dev/null
+++ b/htdocs/langs/es_CO/other.lang
@@ -0,0 +1,142 @@
+# Dolibarr language file - Source file is en_US - other
+SecurityCode=Código de seguridad
+NumberingShort=NORTE
+Tools=Herramientas
+TMenuTools=Herramientas
+ToolsDesc=Todas las herramientas no incluidas en otras entradas del menú se agrupan aquí. <br> Se puede acceder a todas las herramientas a través del menú de la izquierda.
+Birthday=Cumpleaños
+BirthdayAlertOn=alerta de cumpleaños activa
+BirthdayAlertOff=alerta de cumpleaños inactiva
+MonthOfInvoice=Mes (número 1-12) de fecha de factura
+TextMonthOfInvoice=Mes (texto) de fecha de factura
+PreviousMonthOfInvoice=Mes anterior (número 1-12) de fecha de factura
+TextPreviousMonthOfInvoice=Mes anterior (texto) de fecha de factura
+NextMonthOfInvoice=Mes siguiente (número 1-12) de fecha de factura
+TextNextMonthOfInvoice=Mes siguiente (texto) de fecha de factura
+ZipFileGeneratedInto=Archivo zip generado en <b> %s </b>.
+DocFileGeneratedInto=Archivo doc generado en <b> %s </b>.
+MessageForm=Mensaje en forma de pago en línea
+ContentOfDirectoryIsNotEmpty=El contenido de este directorio no está vacío.
+DeleteAlsoContentRecursively=Marque para eliminar todo el contenido recursivamente
+YearOfInvoice=Año de facturación
+PreviousYearOfInvoice=Año anterior de la fecha de facturación
+NextYearOfInvoice=Siguiente año de la fecha de facturación
+DateNextInvoiceAfterGen=Fecha de la próxima factura (posterior a la generación).
+Notify_PROPAL_VALIDATE=Propuesta del cliente validada.
+Notify_PROPAL_CLOSE_SIGNED=Propuesta de cliente cerrada firmada
+Notify_PROPAL_CLOSE_REFUSED=Propuesta de cliente cerrada rechazada
+Notify_PROPAL_SENTBYMAIL=Propuesta comercial enviada por correo.
+Notify_WITHDRAW_TRANSMIT=Retiro de transmisión
+Notify_WITHDRAW_CREDIT=Retiro de crédito
+Notify_WITHDRAW_EMIT=Realizar retirada
+Notify_COMPANY_CREATE=Tercero creado
+Notify_COMPANY_SENTBYMAIL=Correos enviados desde tarjeta de terceros
+Notify_BILL_VALIDATE=Factura del cliente validada
+Notify_BILL_UNVALIDATE=Factura del cliente sin validar
+Notify_BILL_CANCEL=Factura de cliente cancelada
+Notify_BILL_SENTBYMAIL=Factura del cliente enviada por correo
+Notify_CONTRACT_VALIDATE=Contrato validado
+Notify_FICHINTER_ADD_CONTACT=Contacto agregado a la intervención.
+Notify_FICHINTER_SENTBYMAIL=Intervención enviada por correo.
+Notify_SHIPPING_VALIDATE=Envío validado
+Notify_SHIPPING_SENTBYMAIL=Envios enviados por correo
+Notify_MEMBER_VALIDATE=Miembro validado
+Notify_MEMBER_SUBSCRIPTION=Miembro suscrito
+Notify_MEMBER_RESILIATE=Miembro cancelado
+Notify_MEMBER_DELETE=Miembro eliminado
+Notify_PROJECT_CREATE=Creación de proyectos
+Notify_HOLIDAY_VALIDATE=Deja la solicitud validada (se requiere aprobación)
+Notify_HOLIDAY_APPROVE=Dejar la solicitud aprobada
+SeeModuleSetup=Ver configuración del módulo %s
+NbOfAttachedFiles=Número de archivos / documentos adjuntos
+TotalSizeOfAttachedFiles=Tamaño total de los archivos / documentos adjuntos
+MaxSize=Talla máxima
+AttachANewFile=Adjuntar un nuevo archivo / documento
+LinkedObject=Objeto vinculado
+NbOfActiveNotifications=Número de notificaciones (número de correos electrónicos del destinatario)
+PredefinedMailTest=__(Hola)__\nEste es un correo de prueba enviado a __EMAIL__.\nLas dos líneas están separadas por un retorno de carro.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hola)__\nEste es un correo de <b> prueba </b> (la palabra prueba debe estar en negrita). <br> Las dos líneas están separadas por un retorno de carro. <br> <br> __USER_SIGNATURE__
+PredefinedMailContentLink=Puede hacer clic en el enlace de abajo para realizar su pago si aún no lo ha hecho.\n\n%s\n\n
+DemoDesc=Dolibarr es un ERP / CRM compacto que soporta varios módulos de negocios. Una demostración que muestre todos los módulos no tiene sentido ya que este escenario nunca ocurre (varios cientos disponibles). Por lo tanto, varios perfiles de demostración están disponibles.
+ChooseYourDemoProfilMore=... o cree su propio perfil <br> (selección manual del módulo)
+DemoFundation=Administrar miembros de una fundación.
+DemoFundation2=Gestionar miembros y cuenta bancaria de una fundación.
+DemoCompanyServiceOnly=Empresa o servicio de venta independiente solamente
+DemoCompanyShopWithCashDesk=Gestiona una tienda con un mostrador de caja.
+DemoCompanyAll=Empresa con múltiples actividades (todos los módulos principales)
+CreatedById=ID de usuario que creó
+ModifiedById=Identificación de usuario que hizo el último cambio
+ValidatedById=ID de usuario que validó
+CanceledById=Identificación de usuario que canceló
+ClosedById=ID de usuario que cerró
+CreatedByLogin=Inicio de sesión de usuario que creó
+ModifiedByLogin=Inicio de sesión de usuario que hizo el último cambio
+ValidatedByLogin=Inicio de sesión de usuario que validó
+CanceledByLogin=Inicio de sesión de usuario que canceló
+ClosedByLogin=Inicio de sesión de usuario que cerró
+FileWasRemoved=El archivo %s fue eliminado
+DirWasRemoved=Directorio %s fue eliminado
+FeatureNotYetAvailable=Característica aún no disponible en la versión actual
+FeaturesSupported=Características compatibles
+Width=Anchura
+Height=Altura
+Depth=Profundidad
+Top=Parte superior
+Bottom=Fondo
+WeightUnitg=sol
+LengthUnitm=metro
+Surface=Zona
+SurfaceUnitdm2=dm
+SurfaceUnitfoot2=pies cuadrados
+SizeUnitm=metro
+BugTracker=Localizador de bichos
+SendNewPasswordDesc=Este formulario le permite solicitar una nueva contraseña. Se enviará a su dirección de correo electrónico. <br> El cambio entrará en vigencia una vez que haga clic en el enlace de confirmación en el correo electrónico. <br> Revise su bandeja de entrada.
+BackToLoginPage=Volver a la página de inicio de sesión
+AuthenticationDoesNotAllowSendNewPassword=El modo de autenticación es <b> %s </b>. <br> En este modo, Dolibarr no puede saber ni cambiar su contraseña. Póngase en contacto con el administrador del sistema si desea cambiar su contraseña.
+EnableGDLibraryDesc=Instale o habilite la biblioteca GD en su instalación de PHP para usar esta opción.
+ProfIdShortDesc=<b> La identificación del profesor %s </b> es una información que depende del país tercero. <br> Por ejemplo, para el país <b> %s </b>, es el código <b> %s </b>.
+DolibarrDemo=Dolibarr ERP / CRM demo
+StatsByNumberOfUnits=Estadísticas por suma de cantidad de productos / servicios.
+StatsByNumberOfEntities=Estadísticas en número de entidades referentes (n. ° de factura, o pedido ...)
+NumberOfProposals=Numero de propuestas
+NumberOfCustomerInvoices=Número de facturas de clientes
+NumberOfUnitsProposals=Número de unidades sobre propuestas.
+NumberOfUnitsCustomerInvoices=Número de unidades en las facturas de los clientes.
+EMailTextInterventionAddedContact=Se le ha asignado una nueva intervención %s.
+EMailTextInterventionValidated=La intervención %s ha sido validada.
+ImportedWithSet=Conjunto de datos de importación
+ResizeDesc=Introduzca el nuevo ancho <b> O </b> nueva altura. La relación se mantendrá durante el cambio de tamaño ...
+NewSizeAfterCropping=Nuevo tamaño después de recortar
+DefineNewAreaToPick=Defina una nueva área en la imagen para elegir (haga clic izquierdo en la imagen y luego arrastre hasta que llegue a la esquina opuesta)
+CurrentInformationOnImage=Esta herramienta fue diseñada para ayudarte a redimensionar o recortar una imagen. Esta es la información sobre la imagen editada actual.
+YouReceiveMailBecauseOfNotification=Recibirá este mensaje porque su correo electrónico se agregó a la lista de destinos para recibir información sobre eventos particulares en el software %s de %s.
+YouReceiveMailBecauseOfNotification2=Este evento es el siguiente:
+ThisIsListOfModules=Esta es una lista de módulos preseleccionados por este perfil de demostración (en esta demostración solo se ven los módulos más comunes). Edite esto para tener una demostración más personalizada y haga clic en "Inicio".
+UseAdvancedPerms=Utilice los permisos avanzados de algunos módulos.
+SelectAColor=Elige un color
+AddFiles=Agregar archivos
+StartUpload=Iniciar la subida
+CancelUpload=Cancelar carga
+FileIsTooBig=Archivos es demasiado grande
+PleaseBePatient=Por favor sea paciente...
+ResetPassword=Restablecer la contraseña
+RequestToResetPasswordReceived=Se ha recibido una solicitud para cambiar tu contraseña.
+NewKeyIs=Estas son tus nuevas claves para iniciar sesión.
+NewKeyWillBe=Su nueva clave para iniciar sesión en el software será
+ClickHereToGoTo=Haga clic aquí para ir a %s
+YouMustClickToChange=Sin embargo, primero debe hacer clic en el siguiente enlace para validar este cambio de contraseña.
+ForgetIfNothing=Si no solicitó este cambio, simplemente olvide este correo electrónico. Sus credenciales se mantienen seguras.
+IfAmountHigherThan=Si la cantidad es superior a <strong> %s </strong>
+SourcesRepository=Repositorio de fuentes
+PassEncoding=Codificación de contraseña
+YourPasswordMustHaveAtLeastXChars=Su contraseña debe tener al menos <strong> %s </strong> caracteres
+YourPasswordHasBeenReset=Tu contraseña ha sido restablecida con éxito
+SMSSentTo=SMS enviados a %s
+MissingIds=IDs que faltan
+ExportsArea=Area de exportaciones
+LibraryUsed=Biblioteca utilizada
+LibraryVersion=Versión de la biblioteca
+NoExportableData=No hay datos exportables (no hay módulos cargados con datos exportables o faltan permisos)
+WebsiteSetup=Configuración del sitio web del módulo.
+WEBSITE_KEYWORDS=Palabras clave
+LinesToImport=Líneas para importar
diff --git a/htdocs/langs/es_CO/productbatch.lang b/htdocs/langs/es_CO/productbatch.lang
new file mode 100644
index 00000000000..b49891f9a6b
--- /dev/null
+++ b/htdocs/langs/es_CO/productbatch.lang
@@ -0,0 +1,20 @@
+# Dolibarr language file - Source file is en_US - productbatch
+ManageLotSerial=Use número de lote/serie
+ProductStatusOnBatch=Si (lote/serie requerido)
+ProductStatusNotOnBatch=No (lote/serie no usado)
+atleast1batchfield=Fecha de consumo o fecha de venta o número de lote/serie
+batch_number=Número de lote/serie
+EatByDate=Fecha de consumo
+SellByDate=Fecha de venta
+DetailBatchNumber=Detalles lote/serie
+printBatch=Lote/serie: %s
+printEatby=Consumido-por: %s
+printSellby=Vendido-por: %s
+printQty=Cantidad: 1%d
+AddDispatchBatchLine=Añadir una línea para la duración del despacho
+WhenProductBatchModuleOnOptionAreForced=Cuando el módulo Lote/Serie está activado, la reducción automática de existencias se ve obligada a 'Reducir las existencias reales en la validación de envío' y el modo de aumento automático es forzado a 'Incrementar las existencias reales en el envío manual entre almacenes' y no puede ser editado. Otras opciones se pueden definir a su gusto.
+ProductDoesNotUseBatchSerial=Este producto no utiliza número de lote/serie:
+ProductLotSetup=Configuración de modulo lote/serie
+ShowCurrentStockOfLot=Mostrar valores actuales por pareja producto/lote
+ShowLogOfMovementIfLot=Mostrar registro de movimientos por pareja producto/lote
+StockDetailPerBatch=Valores detallados por lote
diff --git a/htdocs/langs/es_CO/products.lang b/htdocs/langs/es_CO/products.lang
new file mode 100644
index 00000000000..1f376268421
--- /dev/null
+++ b/htdocs/langs/es_CO/products.lang
@@ -0,0 +1,192 @@
+# Dolibarr language file - Source file is en_US - products
+ProductRef=Producto ref.
+ProductLabel=Etiqueta del producto
+ProductLabelTranslated=Etiqueta traducida del producto
+ProductDescriptionTranslated=Descripción traducida del producto.
+ProductNoteTranslated=Nota de producto traducida
+ProductServiceCard=Tarjeta de productos / servicios
+ProductId=Identificación de producto / servicio
+MassBarcodeInit=Inicio de código de barras masivo
+MassBarcodeInitDesc=Esta página se puede usar para inicializar un código de barras en objetos que no tienen un código de barras definido. Verifique antes de que se complete la configuración del código de barras del módulo.
+ProductAccountancyBuyCode=Código contable (compra)
+ProductAccountancySellCode=Código contable (venta)
+ProductAccountancySellExportCode=Código contable (venta exportación)
+ProductsOnSaleOnly=Productos para la venta solamente
+ProductsOnPurchaseOnly=Productos para la compra solamente
+ProductsNotOnSell=Productos no a la venta y no a la compra.
+ProductsOnSellAndOnBuy=Productos para la venta y para la compra.
+ServicesOnSaleOnly=Servicios a la venta solamente
+ServicesOnPurchaseOnly=Servicios para la compra solamente
+ServicesNotOnSell=Servicios no a la venta y no a la compra.
+ServicesOnSellAndOnBuy=Servicios para la venta y para la compra.
+LastRecordedProducts=Últimos %s productos grabados
+LastRecordedServices=Últimos servicios grabados %s
+Stock=Valores
+MenuStocks=Cepo
+OnBuy=Para comprar
+NotOnSell=No para la venta
+ProductStatusNotOnSell=No para la venta
+ProductStatusNotOnSellShort=No para la venta
+ProductStatusOnBuy=Para comprar
+ProductStatusNotOnBuy=No para la compra
+ProductStatusOnBuyShort=Para comprar
+ProductStatusNotOnBuyShort=No para la compra
+UpdateVAT=Actualizar vat
+UpdateDefaultPrice=Actualizar precio por defecto
+UpdateLevelPrices=Actualizar precios para cada nivel.
+SellingPriceTTC=Precio de venta (impuestos incluidos)
+CostPriceUsage=Este valor podría ser utilizado para el cálculo del margen.
+SoldAmount=Cantidad vendida
+PurchasedAmount=Cantidad comprada
+EditSellingPriceLabel=Editar etiqueta de precio de venta
+CantBeLessThanMinPrice=El precio de venta no puede ser inferior al mínimo permitido para este producto (%s sin impuestos). Este mensaje también puede aparecer si escribe un descuento demasiado importante.
+ErrorProductAlreadyExists=Ya existe un producto con referencia %s.
+ErrorProductBadRefOrLabel=Valor incorrecto para referencia o etiqueta.
+ErrorProductClone=Hubo un problema al intentar clonar el producto o servicio.
+ErrorPriceCantBeLowerThanMinPrice=Error, el precio no puede ser más bajo que el precio mínimo.
+ProductsAndServicesArea=Área de productos y servicios.
+ProductsArea=Area de producto
+ServicesArea=Area de servicios
+ListOfStockMovements=Lista de movimientos de stock
+PriceForEachProduct=Productos con precios específicos.
+SetDefaultBarcodeType=Establecer el tipo de código de barras
+BarcodeValue=Valor de código de barras
+NoteNotVisibleOnBill=Nota (no visible en facturas, propuestas ...)
+ServiceLimitedDuration=Si el producto es un servicio con duración limitada:
+MultiPricesNumPrices=Numero de precios
+AssociatedProductsAbility=Activar productos virtuales (kits)
+AssociatedProducts=Productos virtuales
+AssociatedProductsNumber=Número de productos que componen este producto virtual.
+ParentProductsNumber=Número de producto de embalaje principal
+ParentProducts=Productos para padres
+IfZeroItIsNotAVirtualProduct=Si es 0, este producto no es un producto virtual.
+IfZeroItIsNotUsedByVirtualProduct=Si es 0, este producto no es utilizado por ningún producto virtual
+KeywordFilter=Filtro de palabras clave
+CategoryFilter=Filtro de categoria
+ProductToAddSearch=Buscar producto para añadir
+NoMatchFound=No se encontraron coincidencias
+ListOfProductsServices=Lista de productos / servicios
+ProductParentList=Lista de productos / servicios virtuales con este producto como componente
+ErrorAssociationIsFatherOfThis=Uno de los productos seleccionados es padre con el producto actual
+DeleteProduct=Eliminar un producto / servicio
+ConfirmDeleteProduct=¿Estás seguro de que quieres eliminar este producto / servicio?
+ProductDeleted=Producto / Servicio "%s" eliminado de la base de datos.
+ExportDataset_produit_1=Productos
+DeleteProductLine=Eliminar línea de productos
+ConfirmDeleteProductLine=¿Estás seguro de que quieres eliminar esta línea de productos?
+PredefinedProductsAndServicesToSell=Productos / servicios predefinidos para vender.
+PredefinedProductsToPurchase=Producto predefinido a comprar.
+PredefinedServicesToPurchase=Servicios predefinidos para la compra.
+PredefinedProductsAndServicesToPurchase=Productos / servicios predefinidos para comprar.
+NotPredefinedProducts=Productos / servicios no predefinidos
+GenerateThumb=Generar pulgar
+ServiceNb=Servicio # %s
+ListProductServiceByPopularity=Lista de productos / servicios por popularidad
+ListProductByPopularity=Listado de productos por popularidad.
+ListServiceByPopularity=Listado de servicios por popularidad.
+ConfirmCloneProduct=¿Está seguro de que desea clonar el producto o servicio <b> %s </b>?
+CloneContentProduct=Clona toda la información principal del producto / servicio.
+ClonePricesProduct=Precios de clon
+CloneCombinationsProduct=Variantes de productos clonados.
+ProductIsUsed=Este producto es usado
+NewRefForClone=Árbitro. de nuevo producto / servicio
+CustomerPrices=Precios al cliente
+CustomCode=Aduanas / productos / código HS
+p=u
+d=re
+g=sol
+m=metro
+unitP=Trozo
+ProductCodeModel=Plantilla de referencia del producto
+ServiceCodeModel=Plantilla de servicio de ref
+AlwaysUseNewPrice=Utilizar siempre el precio actual del producto / servicio.
+AlwaysUseFixedPrice=Usar el precio fijo
+PriceByQuantity=Diferentes precios por cantidad.
+DisablePriceByQty=Desactivar precios por cantidad.
+PriceByQuantityRange=Rango Cantidad
+MultipriceRules=Reglas del segmento de precios
+UseMultipriceRules=Utilice reglas de segmento de precios (definidas en la configuración del módulo del producto) para calcular automáticamente los precios de todos los demás segmentos de acuerdo con el primer segmento
+PercentVariationOver=variación %% sobre %s
+KeepEmptyForAutoCalculation=Manténgalo vacío para que esto se calcule automáticamente por peso o volumen de productos
+ProductsMultiPrice=Productos y precios para cada segmento de precios.
+ProductsOrServiceMultiPrice=Precios al cliente (de productos o servicios, multiples precios).
+ProductSellByQuarterHT=Rotación de productos trimestral antes de impuestos.
+ServiceSellByQuarterHT=Servicio de facturación trimestral antes de impuestos.
+Quarter1=1er. Trimestre
+Quarter2=2do. Trimestre
+Quarter3=3er. Trimestre
+Quarter4=4to. Trimestre
+NumberOfStickers=Número de stickers para imprimir en la página.
+PrintsheetForOneBarCode=Imprimir varios adhesivos para un código de barras
+BuildPageToPrint=Generar página para imprimir
+FillBarCodeTypeAndValueManually=Rellene el tipo de código de barras y el valor manualmente.
+FillBarCodeTypeAndValueFromProduct=Rellene el tipo de código de barras y el valor del código de barras de un producto.
+FillBarCodeTypeAndValueFromThirdParty=Rellene el tipo de código de barras y el valor del código de barras de un tercero.
+ResetBarcodeForAllRecords=Defina el valor del código de barras para todos los registros (esto también restablecerá el valor del código de barras ya definido con nuevos valores)
+PriceByCustomer=Diferentes precios para cada cliente.
+PriceCatalogue=Un solo precio de venta por producto / servicio.
+PricingRule=Reglas para los precios de venta.
+AddCustomerPrice=Añadir precio por cliente
+ForceUpdateChildPriceSoc=Establecer el mismo precio en las filiales de los clientes.
+PriceByCustomerLog=Registro de precios de clientes anteriores
+MinimumPriceLimit=El precio mínimo no puede ser más bajo que %s
+PriceExpressionSelected=Expresión de precio seleccionado
+PriceExpressionEditorHelp1="precio = 2 + 2" o "2 + 2" para establecer el precio. Utilizar ; separar expresiones
+PriceExpressionEditorHelp2=Puede acceder a ExtraFields con variables como <b> # extrafield_myextrafieldkey # </b> y variables globales con <b> # global_mycode # </b>
+PriceMode=Modo de precio
+ComposedProductIncDecStock=Aumentar / Disminuir acciones en cambio de padres
+MinSupplierPrice=Precio de compra mínimo
+MinCustomerPrice=Precio de venta minimo
+DynamicPriceConfiguration=Configuración dinámica de precios
+AddUpdater=Añadir actualizador
+GlobalVariableUpdaterType0=Datos JSON
+GlobalVariableUpdaterHelp0=Analiza los datos JSON de la URL especificada, VALUE especifica la ubicación del valor relevante,
+GlobalVariableUpdaterHelpFormat0=Formato para solicitud {"URL": "http://example.com/urlofjson", "VALUE": "array1, array2, targetvalue"}
+GlobalVariableUpdaterType1=Datos del servicio web
+GlobalVariableUpdaterHelp1=Analiza los datos del servicio web de la URL especificada, NS especifica el espacio de nombres, VALUE especifica la ubicación del valor relevante, DATA debe contener los datos a enviar y METHOD es el método WS que llama
+GlobalVariableUpdaterHelpFormat1=El formato para la solicitud es {"URL": "http://example.com/urlofws", "VALUE": "array, targetvalue", "NS": "http://example.com/urlofns", "METHOD" : "myWSMethod", "DATA": {"your": "data", "to": "send"}}
+CorrectlyUpdated=Correctamente actualizado
+PropalMergePdfProductActualFile=Los archivos que se usan para agregar a PDF Azur son / son
+PropalMergePdfProductChooseFile=Seleccionar archivos PDF
+IncludingProductWithTag=Incluyendo producto / servicio con etiqueta.
+DefaultPriceRealPriceMayDependOnCustomer=Precio por defecto, el precio real puede depender del cliente.
+WarningSelectOneDocument=Por favor seleccione al menos un documento
+NbOfQtyInProposals=Cantidad en propuestas
+ClinkOnALinkOfColumn=Haga clic en un enlace de la columna %s para obtener una vista detallada ...
+TranslatedLabel=Etiqueta traducida
+TranslatedDescription=Descripción traducida
+TranslatedNote=Notas traducidas
+WeightUnits=Unidad de peso
+VolumeUnits=Unidad de volumen
+SizeUnits=Unidad de tamaño
+ConfirmDeleteProductBuyPrice=¿Estás seguro de que quieres eliminar este precio de compra?
+VariantAttributes=Atributos variantes
+ProductAttributes=Atributos de variante para productos.
+ProductAttributeName=Atributo de la variante %s
+ProductAttribute=Atributo variante
+ProductAttributeDeleteDialog=¿Estás seguro de que quieres eliminar este atributo? Todos los valores serán eliminados
+ProductAttributeValueDeleteDialog=¿Está seguro de que desea eliminar el valor "%s" con la referencia "%s" de este atributo?
+ProductCombinationDeleteDialog=¿Seguro que quieres eliminar la variante del producto "<strong> %s </strong>"?
+ProductCombinationAlreadyUsed=Hubo un error al borrar la variante. Por favor verifica que no esté siendo utilizado en ningún objeto.
+PropagateVariant=Variantes de propagación
+HideProductCombinations=Ocultar variante de productos en el selector de productos.
+EditProductCombination=Variante de edición
+EditProductCombinations=Variantes de edición
+SelectCombination=Seleccionar combinacion
+Features=Caracteristicas
+PriceImpact=Impacto de precio
+WeightImpact=Impacto del peso
+ErrorCreatingProductAttributeValue=Se produjo un error al crear el valor del atributo. Podría ser porque ya existe un valor con esa referencia.
+ProductCombinationGeneratorWarning=Si continúas, antes de generar nuevas variantes, todas las anteriores serán BORRADAS. Los ya existentes serán actualizados con los nuevos valores.
+TooMuchCombinationsWarning=La generación de muchas variantes puede resultar en un alto uso de la CPU y la memoria, y Dolibarr no puede crearlas. Habilitar la opción "%s" puede ayudar a reducir el uso de memoria.
+DoNotRemovePreviousCombinations=No eliminar variantes anteriores.
+ErrorDeletingGeneratedProducts=Se ha producido un error al intentar eliminar las variantes de producto existentes.
+NbOfDifferentValues=No. de valores diferentes
+ParentProduct=Producto principal
+HideChildProducts=Ocultar productos variantes
+ShowChildProducts=Mostrar productos variantes
+NoEditVariants=Vaya a la tarjeta del producto principal y edite el impacto del precio de las variantes en la pestaña de variantes
+ConfirmCloneProductCombinations=¿Desea copiar todas las variantes del producto al otro producto principal con la referencia dada?
+CloneDestinationReference=Referencia del producto destino
+ErrorCopyProductCombinations=Se ha producido un error al copiar las variantes del producto.
+ErrorDestinationProductNotFound=Producto de destino no encontrado
diff --git a/htdocs/langs/es_CO/projects.lang b/htdocs/langs/es_CO/projects.lang
new file mode 100644
index 00000000000..680a7006fb5
--- /dev/null
+++ b/htdocs/langs/es_CO/projects.lang
@@ -0,0 +1,163 @@
+# Dolibarr language file - Source file is en_US - projects
+RefProject=Árbitro. proyecto
+ProjectRef=Proyecto ref.
+ProjectId=Projecto ID
+ProjectLabel=Etiqueta del proyecto
+ProjectsArea=Area de proyectos
+SharedProject=Todos
+PrivateProject=Contactos del proyecto
+AllAllowedProjects=Todo el proyecto que puedo leer (mío + público)
+MyProjectsDesc=Esta vista se limita a los proyectos para los que es un contacto.
+ProjectsPublicDesc=Esta vista presenta todos los proyectos que se le permite leer.
+TasksOnProjectsPublicDesc=Esta vista presenta todas las tareas en los proyectos que se le permite leer.
+ProjectsPublicTaskDesc=Esta vista presenta todos los proyectos y tareas que puede leer.
+ProjectsDesc=Esta vista presenta todos los proyectos (sus permisos de usuario le otorgan permiso para ver todo).
+TasksOnProjectsDesc=Esta vista presenta todas las tareas en todos los proyectos (sus permisos de usuario le otorgan permiso para ver todo).
+MyTasksDesc=Esta vista se limita a proyectos o tareas para las que es un contacto.
+OnlyOpenedProject=Solo los proyectos abiertos son visibles (los proyectos en estado borrador o cerrado no son visibles).
+TasksPublicDesc=Esta vista presenta todos los proyectos y tareas que puede leer.
+TasksDesc=Esta vista presenta todos los proyectos y tareas (sus permisos de usuario le otorgan permiso para ver todo).
+AllTaskVisibleButEditIfYouAreAssigned=Todas las tareas para proyectos calificados son visibles, pero puede ingresar el tiempo solo para la tarea asignada al usuario seleccionado. Asigne tarea si necesita ingresar tiempo en ella.
+OnlyYourTaskAreVisible=Sólo las tareas asignadas a usted son visibles. Asigne una tarea a usted mismo si no está visible y necesita ingresar tiempo en ella.
+ProjectCategories=Etiquetas / categorías del proyecto
+DeleteAProject=Borrar un proyecto
+ConfirmDeleteAProject=¿Estás seguro de que quieres eliminar este proyecto?
+ConfirmDeleteATask=¿Estás seguro de que quieres eliminar esta tarea?
+OpportunitiesStatusForOpenedProjects=Lleva cantidad de proyectos abiertos por estado
+OpportunitiesStatusForProjects=Lleva cantidad de proyectos por estado.
+ShowProject=Mostrar proyecto
+SetProject=Proyecto conjunto
+NoProject=Ningún proyecto definido o propio
+TimeSpent=Tiempo usado
+TimeSpentByYou=Tiempo pasado por ti
+TimeSpentByUser=Tiempo empleado por el usuario
+TimesSpent=Tiempo usado
+TaskTimeSpent=Tiempo dedicado a las tareas.
+TasksOnOpenedProject=Tareas en proyectos abiertos.
+NewTimeSpent=Tiempo usado
+MyTimeSpent=Mi tiempo pasado
+BillTime=Factura el tiempo empleado
+TaskDateStart=Fecha de inicio de la tarea
+TaskDateEnd=Fecha de finalización de la tarea
+TaskDescription=Descripción de la tarea
+AddTimeSpent=Crear tiempo dedicado
+AddHereTimeSpentForDay=Agregue aquí el tiempo dedicado a este día / tarea
+Activities=Tareas / actividades
+MyActivities=Mis tareas / actividades
+MyProjectsArea=Mis proyectos area
+ProgressDeclared=Progreso declarado
+ProgressCalculated=Progreso calculado
+Time=Hora
+ListOfTasks=Lista de tareas
+GoToListOfTimeConsumed=Ir a la lista de tiempo consumido
+ListProposalsAssociatedProject=Listado de las propuestas comerciales relacionadas con el proyecto.
+ListInvoicesAssociatedProject=Listado de facturas de clientes relacionadas con el proyecto.
+ListPredefinedInvoicesAssociatedProject=Lista de facturas de plantillas de clientes relacionadas con el proyecto.
+ListContractAssociatedProject=Listado de contratos relacionados con el proyecto.
+ListShippingAssociatedProject=Listado de envíos relacionados con el proyecto.
+ListFichinterAssociatedProject=Listado de intervenciones relacionadas con el proyecto.
+ListExpenseReportsAssociatedProject=Listado de informes de gastos relacionados con el proyecto.
+ListDonationsAssociatedProject=Listado de donaciones relacionadas con el proyecto.
+ListVariousPaymentsAssociatedProject=Lista de pagos varios relacionados con el proyecto.
+ListSalariesAssociatedProject=Listado de pagos de sueldos relacionados con el proyecto.
+ListActionsAssociatedProject=Listado de eventos relacionados con el proyecto.
+ListTaskTimeUserProject=Lista de tiempo consumido en tareas de proyecto.
+ListTaskTimeForTask=Lista de tiempo consumido en la tarea
+ActivityOnProjectToday=Actividad en proyecto hoy
+ActivityOnProjectYesterday=Actividad en proyecto ayer
+ActivityOnProjectThisWeek=Actividad en proyecto esta semana.
+ActivityOnProjectThisMonth=Actividad en proyecto este mes
+ActivityOnProjectThisYear=Actividad en proyecto este año.
+ChildOfProjectTask=Hijo del proyecto / tarea
+TaskHasChild=Tarea tiene hijo
+NotOwnerOfProject=No propietario de este proyecto privado.
+CantRemoveProject=Este proyecto no se puede eliminar, ya que se hace referencia a otros objetos (factura, pedidos u otros). Ver la pestaña de referers.
+ValidateProject=Validar projet
+ConfirmValidateProject=¿Seguro que quieres validar este proyecto?
+ConfirmCloseAProject=¿Seguro que quieres cerrar este proyecto?
+AlsoCloseAProject=También cierre el proyecto (manténgalo abierto si aún necesita seguir las tareas de producción en él)
+ReOpenAProject=Proyecto abierto
+ConfirmReOpenAProject=¿Seguro que quieres volver a abrir este proyecto?
+ActionsOnProject=Eventos en proyecto
+YouAreNotContactOfProject=No eres contacto de este proyecto privado.
+UserIsNotContactOfProject=El usuario no es un contacto de este proyecto privado.
+DeleteATimeSpent=Eliminar el tiempo pasado
+ConfirmDeleteATimeSpent=¿Estás seguro de que quieres eliminar este tiempo pasado?
+DoNotShowMyTasksOnly=Ver también tareas no asignadas a mí.
+ShowMyTasksOnly=Ver solo las tareas asignadas a mi
+ProjectsDedicatedToThisThirdParty=Proyectos dedicados a este tercero.
+NoTasks=No hay tareas para este proyecto.
+LinkedToAnotherCompany=Vinculado a otro tercero
+TaskIsNotAssignedToUser=Tarea no asignada al usuario. Use el botón '<strong> %s </strong>' para asignar la tarea ahora.
+ErrorTimeSpentIsEmpty=El tiempo gastado está vacío
+ThisWillAlsoRemoveTasks=Esta acción también eliminará todas las tareas del proyecto (<b> %s </b> tareas en este momento) y todas las entradas de tiempo invertido.
+CloneTasks=Tareas de clonacion
+CloneContacts=Clonar contactos
+CloneNotes=Notas de clones
+CloneProjectFiles=Proyecto clonado archivos unidos
+CloneTaskFiles=Clonar las tareas unidas a los archivos (si las tareas están clonadas)
+CloneMoveDate=Actualizar fechas de proyecto / tareas a partir de ahora?
+ConfirmCloneProject=¿Seguro que vas a clonar este proyecto?
+ProjectReportDate=Cambiar fechas de tareas de acuerdo a la nueva fecha de inicio del proyecto.
+ErrorShiftTaskDate=Imposible cambiar la fecha de la tarea de acuerdo con la nueva fecha de inicio del proyecto
+TaskCreatedInDolibarr=Tarea %s creada
+TaskModifiedInDolibarr=Tarea %s modificada
+TaskDeletedInDolibarr=Tarea %s eliminada
+OpportunityStatus=Estado de plomo
+OpportunityProbability=Probabilidad de plomo
+OpportunityAmount=Cantidad de plomo
+WonLostExcluded=Ganados / Perdidos excluidos
+TypeContact_project_internal_PROJECTLEADER=Líder del proyecto
+TypeContact_project_external_PROJECTLEADER=Líder del proyecto
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Contribuyente
+TypeContact_project_external_PROJECTCONTRIBUTOR=Contribuyente
+TypeContact_project_task_internal_TASKEXECUTIVE=Ejecutivo de tareas
+TypeContact_project_task_external_TASKEXECUTIVE=Ejecutivo de tareas
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Contribuyente
+TypeContact_project_task_external_TASKCONTRIBUTOR=Contribuyente
+SelectElement=Seleccionar elemento
+AddElement=Enlace al elemento
+DocumentModelBeluga=Plantilla de documento de proyecto para la descripción de objetos vinculados
+DocumentModelBaleine=Plantilla de documento de proyecto para tareas
+PlannedWorkload=Carga de trabajo planificada
+ProjectReferers=Artículos relacionados
+ProjectMustBeValidatedFirst=El proyecto debe ser validado primero
+TimeAlreadyRecorded=Este es el tiempo pasado ya registrado para esta tarea / día y el usuario %s
+ProjectsWithThisUserAsContact=Proyectos con este usuario como contacto.
+TasksWithThisUserAsContact=Tareas asignadas a este usuario.
+ResourceNotAssignedToProject=No asignado al proyecto.
+ResourceNotAssignedToTheTask=No asignado a la tarea.
+NoUserAssignedToTheProject=No hay usuarios asignados a este proyecto.
+TimeSpentBy=Tiempo pasado por
+AssignTaskToMe=Asigname tarea
+AssignTaskToUser=Asignar tarea a %s
+SelectTaskToAssign=Seleccionar tarea para asignar ...
+ProjectOverview=Visión general
+ManageTasks=Usar proyectos para seguir tareas y / o informar el tiempo empleado (hojas de tiempo)
+ManageOpportunitiesStatus=Usar proyectos para seguir leads / oportunidades.
+ProjectNbProjectByMonth=Nº de proyectos creados por mes.
+ProjectNbTaskByMonth=Nº de tareas creadas por mes.
+ProjectOppAmountOfProjectsByMonth=Cantidad de leads por mes
+ProjectWeightedOppAmountOfProjectsByMonth=Cantidad ponderada de clientes potenciales por mes
+ProjectOpenedProjectByOppStatus=Abrir proyecto / liderar por estado de plomo
+ProjectsStatistics=Estadísticas sobre proyectos / leads
+TasksStatistics=Estadísticas de proyecto / tareas de plomo
+TaskAssignedToEnterTime=Tarea asignada. Debe ser posible introducir el tiempo en esta tarea.
+IdTaskTime=Tiempo de tarea de identificación
+OpenedProjectsByThirdparties=Proyectos abiertos por terceros.
+OnlyOpportunitiesShort=Solo lleva
+OpenedOpportunitiesShort=Conductores abiertos
+NotAnOpportunityShort=No es una pista
+OpportunityTotalAmount=Cantidad total de clientes potenciales
+OpportunityPonderatedAmount=Cantidad ponderada de clientes potenciales
+OpportunityPonderatedAmountDesc=Cantidad de leads ponderada con probabilidad
+OppStatusQUAL=Calificación
+OppStatusPROPO=Propuesta
+LatestProjects=Últimos proyectos %s
+LatestModifiedProjects=Últimos proyectos modificados %s
+AllowCommentOnTask=Permitir comentarios de usuarios en tareas
+AllowCommentOnProject=Permitir comentarios de usuarios en proyectos
+DontHavePermissionForCloseProject=No tiene permisos para cerrar el proyecto %s
+RecordsClosed=%s proyecto (s) cerrado (s)
+SendProjectRef=Proyecto de información %s
+TimeSpentForInvoice=Tiempo usado
diff --git a/htdocs/langs/es_CO/salaries.lang b/htdocs/langs/es_CO/salaries.lang
new file mode 100644
index 00000000000..a4085292909
--- /dev/null
+++ b/htdocs/langs/es_CO/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Cuenta contable utilizada para usuarios de terceros
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=La cuenta de contabilidad dedicada definida en la tarjeta de usuario se usará solo para la contabilidad del libro auxiliar. Este se usará para el Libro mayor y como valor predeterminado de la contabilidad del libro auxiliar si la cuenta de contabilidad del usuario dedicada no está definida.
diff --git a/htdocs/langs/es_CO/sms.lang b/htdocs/langs/es_CO/sms.lang
new file mode 100644
index 00000000000..e2f7ed66501
--- /dev/null
+++ b/htdocs/langs/es_CO/sms.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - sms
+SmsRecipient=Objetivo
+SmsTo=Objetivo
diff --git a/htdocs/langs/es_CO/stocks.lang b/htdocs/langs/es_CO/stocks.lang
index 2a064596410..7ea4665b427 100644
--- a/htdocs/langs/es_CO/stocks.lang
+++ b/htdocs/langs/es_CO/stocks.lang
@@ -1,7 +1,4 @@
 # Dolibarr language file - Source file is en_US - stocks
-Stock=Valores
-Stocks=Cepo
-ListOfStockMovements=Lista de movimientos de stock
 inventoryEdit=Editar
 SelectCategory=Filtro de categoria
 inventoryDeleteLine=Eliminar linea
diff --git a/htdocs/langs/es_CO/supplier_proposal.lang b/htdocs/langs/es_CO/supplier_proposal.lang
new file mode 100644
index 00000000000..23837b787b0
--- /dev/null
+++ b/htdocs/langs/es_CO/supplier_proposal.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposals=Propuestas de proveedores
+SupplierProposalsShort=Propuestas de proveedores
+SupplierProposalStatusDraft=Borrador (necesita ser validado)
diff --git a/htdocs/langs/es_CO/suppliers.lang b/htdocs/langs/es_CO/suppliers.lang
new file mode 100644
index 00000000000..7bd957f2702
--- /dev/null
+++ b/htdocs/langs/es_CO/suppliers.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - suppliers
+NewSupplier=Nuevo vendedor
+RefSupplierShort=Árbitro. vendedor
diff --git a/htdocs/langs/es_CO/trips.lang b/htdocs/langs/es_CO/trips.lang
new file mode 100644
index 00000000000..7095262d44a
--- /dev/null
+++ b/htdocs/langs/es_CO/trips.lang
@@ -0,0 +1,40 @@
+# Dolibarr language file - Source file is en_US - trips
+ShowExpenseReport=Mostrar reporte de gastos
+Trips=Reporte de gastos
+ShowTrip=Mostrar reporte de gastos
+NewTrip=Nuevo reporte de gastos
+DeleteTrip=Borrar reporte de gastos
+ExpenseReportApproved=Un reporte de gastos fue aprobado
+ExpenseReportRefused=Un reporte de gastos fue rechazado
+ExpenseReportPaid=Un reporte de gastos fue pagado
+REFUSEUR=Rechazado por
+CANCEL_USER=Borrado por
+DATE_REFUS=Fecha de rechazo
+ValidateAndSubmit=Validar y enviar para aprobación
+ConfirmRefuseTrip=Séguro que quiere rechazar este reporte de gastos?
+ValideTrip=Aprobar reporte de gastos
+ConfirmValideTrip=Séguro que quiere aprobar este reporte de gastos?
+PaidTrip=Pagar un reporte de gastos
+ConfirmCancelTrip=Séguro que quiere cancelar este reporte de gastos?
+SaveTrip=Validar reporte de gastos
+ConfirmSaveTrip=Séguro que quiere validar este reporte de gastos?
+NoTripsToExportCSV=No hay reportes de gasto para este periodo
+ExpenseReportPayment=Pago de reporte de gasto
+ExpenseReportsToApprove=Reportes de gastos por aprobar
+ExpenseReportsToPay=Reportes de gastos por pagar
+ConfirmCloneExpenseReport=Séguro que quiere clonar este reporte de gastos?
+ExpenseReportsRules=reglas para reporte de gastos
+ExpenseReportRulesDesc=Usted puede crear o actualizar cualquier regla de cálculo. \nÉsta parte se usará Cuando un usuario crée un nuevo reporte de gastos.
+expenseReportOffset=Compensar
+expenseReportTotalForFive=Ejemplo con 1 d 1 = 5
+expenseReportRangeFromTo=de 1%d a 1%d
+ExpenseReportLimitAmount=Monto límite
+byEX_DAY=Por día (límite de 1%s)
+byEX_MON=Por mes (límite de 1%s)
+byEX_YEA=Por (límite de 1%s)
+byEX_EXP=Por línea (límite de 1%s)
+nolimitbyEX_DAY=Por día (sin límite)
+nolimitbyEX_MON=Por mes (sin límite)
+nolimitbyEX_YEA=Por (sin límite)
+nolimitbyEX_EXP=Por línea (sin límite)
+CarCategory=Categoría de carro:
diff --git a/htdocs/langs/es_CO/users.lang b/htdocs/langs/es_CO/users.lang
new file mode 100644
index 00000000000..b6c1a01ffe9
--- /dev/null
+++ b/htdocs/langs/es_CO/users.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - users
+MenuUsersAndGroups=Usuarios y Grupos
diff --git a/htdocs/langs/es_CO/withdrawals.lang b/htdocs/langs/es_CO/withdrawals.lang
new file mode 100644
index 00000000000..2320346b97c
--- /dev/null
+++ b/htdocs/langs/es_CO/withdrawals.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+StandingOrderPayment=Orden de pago de domiciliación bancaria
+WithdrawalsReceipts=Órdenes de débito directo
+WithdrawalReceipt=Orden de domiciliación bancaria
+StatusRefused=Rechazado
diff --git a/htdocs/langs/es_CO/workflow.lang b/htdocs/langs/es_CO/workflow.lang
new file mode 100644
index 00000000000..ae09b907f97
--- /dev/null
+++ b/htdocs/langs/es_CO/workflow.lang
@@ -0,0 +1,15 @@
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=Configuración del módulo de flujo de trabajo
+WorkflowDesc=Este módulo proporciona algunas acciones automáticas. De manera predeterminada, el flujo de trabajo está abierto (puede hacer las cosas en el orden que desee) pero aquí puede activar algunas acciones automáticas.
+ThereIsNoWorkflowToModify=No hay modificaciones de flujo de trabajo disponibles con los módulos activados.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear automáticamente un pedido de ventas después de firmar una propuesta comercial (el nuevo pedido tendrá la misma cantidad que la propuesta)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente después de firmar una propuesta comercial (la nueva factura tendrá el mismo importe que la propuesta)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente después de validar un contrato
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente después de cerrar un pedido de ventas (la nueva factura tendrá el mismo importe que el pedido)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasifique la propuesta de origen vinculada como facturada cuando el pedido de ventas esté configurado como facturado (y si el monto del pedido es el mismo que el monto total de la propuesta vinculada firmada)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasifique la propuesta de origen vinculada como facturada cuando se valida la factura del cliente (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada firmada)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasifique el pedido de ventas de origen vinculado como facturado cuando se valida la factura del cliente (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasifique el pedido de ventas de origen vinculado como facturado cuando la factura del cliente se establece como pagada (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasifique el pedido de ventas de origen vinculado como enviado cuando se valida un envío (y si la cantidad enviada por todos los envíos es la misma que en el pedido para actualizar)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasifique la propuesta del proveedor de origen vinculado como facturada cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasifique el pedido de compra de origen vinculado como facturado cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
diff --git a/htdocs/langs/es_CO/zapier.lang b/htdocs/langs/es_CO/zapier.lang
new file mode 100644
index 00000000000..b1de821259f
--- /dev/null
+++ b/htdocs/langs/es_CO/zapier.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - zapier
+ModuleZapierForDolibarrDesc =Modulo Zapier para Dolibarr
diff --git a/htdocs/langs/es_DO/accountancy.lang b/htdocs/langs/es_DO/accountancy.lang
new file mode 100644
index 00000000000..9827b9d3795
--- /dev/null
+++ b/htdocs/langs/es_DO/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
diff --git a/htdocs/langs/es_DO/companies.lang b/htdocs/langs/es_DO/companies.lang
new file mode 100644
index 00000000000..6897cf22f06
--- /dev/null
+++ b/htdocs/langs/es_DO/companies.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - companies
+Contact=Contact
diff --git a/htdocs/langs/es_DO/modulebuilder.lang b/htdocs/langs/es_DO/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/es_DO/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/es_DO/projects.lang b/htdocs/langs/es_DO/projects.lang
new file mode 100644
index 00000000000..7e42793b0e9
--- /dev/null
+++ b/htdocs/langs/es_DO/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
diff --git a/htdocs/langs/es_EC/accountancy.lang b/htdocs/langs/es_EC/accountancy.lang
new file mode 100644
index 00000000000..17040a8e488
--- /dev/null
+++ b/htdocs/langs/es_EC/accountancy.lang
@@ -0,0 +1,268 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_EXPORT_SEPARATORCSV=Separador de columnas para el archivo de exportación
+ACCOUNTING_EXPORT_DATE=Formato de fecha para el archivo de exportación
+ACCOUNTING_EXPORT_PIECE=Exportar el número de pieza
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exportar con cuenta global
+ACCOUNTING_EXPORT_LABEL=Etiqueta de exportación
+ACCOUNTING_EXPORT_AMOUNT=Cantidad de la exportación
+ACCOUNTING_EXPORT_DEVISE=Moneda de exportación
+ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique el prefijo para el nombre de archivo
+DefaultForService=Predeterminado para servicio
+CantSuggest=No puedo sugerir
+AccountancySetupDoneFromAccountancyMenu=La mayoría de la configuración de la contabilidad se realiza desde el menú%s
+ConfigAccountingExpert=Configuración del experto en contabilidad de módulos
+Journaux=Revistas
+JournalFinancial=Revistas financieras
+BackToChartofaccounts=Retorno gráfico de cuentas
+Chartofaccounts=Catálogo de cuentas
+CurrentDedicatedAccountingAccount=Cuenta dedicada actual
+AssignDedicatedAccountingAccount=Nueva cuenta para asignar
+InvoiceLabel=Etiqueta de factura
+OverviewOfAmountOfLinesNotBound=Descripción general de la cantidad de líneas no vinculadas a una cuenta de contabilidad
+OverviewOfAmountOfLinesBound=Descripción general de la cantidad de líneas ya vinculadas a una cuenta de contabilidad
+DeleteCptCategory=Eliminar cuenta de contabilidad del grupo
+ConfirmDeleteCptCategory=¿Está seguro de que desea eliminar esta cuenta contable del grupo de cuentas contables?
+JournalizationInLedgerStatus=Estado de la publicación
+AlreadyInGeneralLedger=Ya registrado en diarios
+NotYetInGeneralLedger=No se ha registrado en los libros mayores
+GroupIsEmptyCheckSetup=El grupo está vacío, compruebe la configuración del grupo de contabilidad personalizado
+DetailByAccount=Mostrar detalles por cuenta
+AccountWithNonZeroValues=Cuentas con valores distintos de cero.
+MainAccountForCustomersNotDefined=Cuenta principal de contabilidad para clientes no definidos en la configuración
+MainAccountForSuppliersNotDefined=Cuenta contable principal para proveedores no definidos en la configuración
+MainAccountForUsersNotDefined=Cuenta principal de contabilidad para usuarios no definidos en la configuración
+MainAccountForVatPaymentNotDefined=Principal cuenta contable para el pago del IVA no definido en la configuración
+MainAccountForSubscriptionPaymentNotDefined=Cuenta contable principal para el pago de suscripción no definida en la configuración
+AccountancyArea=Área de contabilidad
+AccountancyAreaDescActionOnce=Las siguientes acciones normalmente se ejecutan una sola vez, o una vez al año ...
+AccountancyAreaDescActionOnceBis=Los siguientes pasos deben hacerse para ahorrar tiempo en el futuro, sugiriendo que la cuenta de contabilidad predeterminada correcta al hacer la publicación (registro de escritura en revistas y libro mayor)
+AccountancyAreaDescActionFreq=Las siguientes acciones se ejecutan generalmente cada mes, semana o día para empresas muy grandes ...
+AccountancyAreaDescJournalSetup=PASO%s: Crea o comprueba el contenido de tu lista de diario desde el menú%s
+AccountancyAreaDescChartModel=PASO%s: Cree un modelo de gráfico de cuenta desde el menú%s
+AccountancyAreaDescChart=PASO%s: Crea o comprueba contenido de tu gráfico de cuenta desde el menú%s
+AccountancyAreaDescVat=PASO%s: Definir cuentas contables para cada tipo de IVA. Para ello, utilice la entrada de menú%s.
+AccountancyAreaDescDefault=PASO %s: Defina las cuentas contables predeterminadas. Para esto, usa la entrada del menú %s.
+AccountancyAreaDescExpenseReport=PASO%s: Defina cuentas de contabilidad predeterminadas para cada tipo de informe de gastos. Para ello, utilice la entrada de menú%s.
+AccountancyAreaDescSal=PASO%s: Defina las cuentas contables predeterminadas para el pago de los salarios. Para ello, utilice la entrada de menú%s.
+AccountancyAreaDescContrib=PASO %s: Defina las cuentas contables predeterminadas para gastos especiales (impuestos diversos). Para ello, utilice la entrada de menú %s.
+AccountancyAreaDescDonation=PASO%s: Defina las cuentas contables predeterminadas para la donación. Para ello, utilice la entrada de menú%s.
+AccountancyAreaDescSubscription=PASO %s: defina cuentas contables predeterminadas para la suscripción de miembros. Para esto, use la entrada del menú %s.
+AccountancyAreaDescMisc=PASO%s: Definir cuenta predeterminada obligatoria y cuentas contables predeterminadas para transacciones diversas. Para ello, utilice la entrada de menú%s.
+AccountancyAreaDescLoan=PASO%s: Defina las cuentas contables predeterminadas para los préstamos. Para ello, utilice la entrada de menú%s.
+AccountancyAreaDescBank=PASO%s: Definir cuentas contables y código de diario para cada banco y cuentas financieras. Para ello, utilice la entrada de menú%s.
+AccountancyAreaDescProd=PASO%s: define cuentas contables en sus productos / servicios. Para ello, utilice la entrada de menú%s.
+AccountancyAreaDescBind=PASO%s: Compruebe la vinculación entre las líneas%s existentes y la cuenta de contabilidad se hace, por lo que la aplicación será capaz de periodizar las transacciones en Ledger en un solo clic. Complete los enlaces que falten. Para ello, utilice la entrada de menú%s.
+AccountancyAreaDescWriteRecords=PASO%s: Escribir transacciones en el Libro mayor. Para ello, vaya al menú <strong>%s</strong> y haga clic en el botón <strong>%s</strong>.
+AccountancyAreaDescAnalyze=PASO%s: Añadir o editar transacciones existentes y generar informes y exportaciones.
+AccountancyAreaDescClosePeriod=PASO%s: Período de cierre para que no podamos hacer modificaciones en un futuro.
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Un paso obligatorio en la instalación no estaba completo (diario de código de contabilidad no definido para todas las cuentas bancarias)
+Selectchartofaccounts=Seleccionar el plan de cuentas activo
+Addanaccount=Agregar una cuenta de contabilidad
+AccountAccounting=Cuenta de contabilidad
+SubledgerAccount=Cuenta auxiliar
+SubledgerAccountLabel=Etiqueta de cuenta auxiliar
+ShowAccountingAccount=Mostrar cuenta contable
+ShowAccountingJournal=Mostrar registro de contabilidad
+MenuDefaultAccounts=Cuentas predeterminadas
+MenuBankAccounts=Cuentas bancarias
+MenuExpenseReportAccounts=Cuentas de informes de gastos
+MenuProductsAccounts=Cuentas de productos
+MenuClosureAccounts=Cuentas de cierre
+MenuAccountancyClosure=Cierre
+ProductsBinding=Productos
+Binding=Vinculación a cuentas
+CustomersVentilation=Factura del cliente vinculante
+SuppliersVentilation=Factura del proveedor vinculada
+ExpenseReportsVentilation=Relación de informes de gastos
+CreateMvts=Crear nueva transacción
+UpdateMvts=Modificación de una transacción
+ValidTransaction=Validar transacción
+WriteBookKeeping=Registrar transacciones en Ledger
+Bookkeeping=Libro mayor
+ObjectsRef=Objeto fuente ref
+CAHTF=Proveedor de compra total antes de impuestos
+TotalExpenseReport=Informe de gastos totales
+InvoiceLines=Líneas de facturas para enlazar
+InvoiceLinesDone=Líneas vinculadas de facturas
+ExpenseReportLines=Líneas de informes de gastos para enlazar
+ExpenseReportLinesDone=Líneas de informes de gastos vinculados
+IntoAccount=Vincular la línea con la cuenta de contabilidad
+TotalForAccount=Total para cuenta contable
+Ventilate=Enlazar
+LineId=Línea de identificación
+EndProcessing=Proceso finalizado.
+Lineofinvoice=Línea de factura
+LineOfExpenseReport=Informe de línea de gastos
+NoAccountSelected=No se ha seleccionado ninguna cuenta de contabilidad
+VentilatedinAccount=Vinculado con éxito a la cuenta contable
+NotVentilatedinAccount=No vinculado a la cuenta contable
+XLineSuccessfullyBinded=%s productos/servicios vinculados con éxito a una cuenta de contabilidad
+XLineFailedToBeBinded=Los productos/servicios de%s no estaban vinculados a ninguna cuenta contable
+ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a unir mostrados por página (máximo recomendado: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comienza la clasificación de la página "Vinculación a hacer" por los elementos más recientes
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comienza la clasificación de la página "Encuadernación realizada" por los elementos más recientes
+ACCOUNTING_LENGTH_DESCRIPTION=Truncar la descripción de los productos y servicios en los listados después de los caracteres x (Mejor
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncar el formulario de descripción de la cuenta de producto y servicios en los listados después de los caracteres x (Mejor
+ACCOUNTING_LENGTH_GACCOUNT=Longitud de las cuentas de contabilidad general (si establece el valor a 6 aquí, la cuenta '706' aparecerá como '706000' en la pantalla)
+ACCOUNTING_LENGTH_AACCOUNT=Longitud de las cuentas contables de terceros (si establece el valor en 6 aquí, la cuenta '401' aparecerá como '401000' en la pantalla)
+ACCOUNTING_MANAGE_ZERO=Permitir gestionar diferentes números de ceros al final de una cuenta contable. Necesario por algunos países (como Suiza). Si está desactivado (predeterminado), puede configurar los siguientes dos parámetros para pedirle a la aplicación que agregue ceros virtuales.
+BANK_DISABLE_DIRECT_INPUT=Inhabilitar la grabación directa de la transacción en una cuenta bancaria
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilitar la exportación del borrador en el diario
+ACCOUNTANCY_COMBO_FOR_AUX=Habilite la lista combinada para la cuenta subsidiaria (puede ser lenta si tiene muchos terceros)
+ACCOUNTING_SELL_JOURNAL=Vender un diario
+ACCOUNTING_PURCHASE_JOURNAL=Diario de compra
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario diverso
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Diario de informes de gastos
+ACCOUNTING_RESULT_PROFIT=Cuenta contable de resultados (beneficio)
+ACCOUNTING_RESULT_LOSS=Cuenta contable de resultados (pérdida)
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Cuenta contable de transferencia bancaria transitoria
+TransitionalAccount=Cuenta de transferencia bancaria transitoria
+ACCOUNTING_ACCOUNT_SUSPENSE=Cuenta de cuenta de espera
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Cuenta contable para registrar suscripciones
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta contable por defecto para los productos comprados (se usa si no se define en la hoja de productos)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Cuenta contable por defecto para los productos comprados en EEC (se usa si no se define en la hoja de productos)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Cuenta contable por defecto para los productos comprados e importados fuera de la CEE (usado si no está definido en la hoja de productos)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cuenta contable por defecto para los productos vendidos (utilizada si no se define en la hoja del producto)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Cuenta contable por defecto para los productos vendidos en la CEE (utilizada si no se define en la hoja de producto)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Cuenta contable por defecto para los productos vendidos y exportados fuera de la CEE (usado si no está definido en la hoja de producto)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Cuenta contable por defecto para los servicios comprados (utilizado si no se define en la hoja de servicio)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Cuenta contable por defecto para los servicios comprados en EEC (utilizada si no está definida en la hoja de servicios)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Cuenta contable por defecto para los servicios comprados e importados fuera de la CEE (se usa si no se define en la hoja de servicios)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Contabilidad por defecto para los servicios vendidos (utilizado si no se define en la hoja de servicio)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Cuenta contable por defecto para los servicios vendidos en la CEE (utilizada si no se define en la hoja de servicios)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Cuenta contable por defecto para los servicios vendidos y exportados fuera de la CEE (usado si no está definido en la hoja de servicios)
+LabelAccount=Cuenta de etiqueta
+LabelOperation=Operación de etiquetas
+LetteringCode=Codigo de letras
+Codejournal=diario
+NumPiece=Número de pieza
+TransactionNumShort=Num. transacción
+GroupByAccountAccounting=Grupo por cuenta contable
+AccountingAccountGroupsDesc=Puede definir aquí algunos grupos de cuentas contables. Se usarán para informes de contabilidad personalizados.
+DeleteMvt=Eliminar líneas de libro mayor
+DelMonth=Mes para borrar
+DelJournal=Diario para borrar
+ConfirmDeleteMvt=Esto eliminará todas las líneas del Libro mayor para el año / mes y / o de una revista específica (se requiere al menos un criterio). Deberá volver a utilizar la función 'Registro en contabilidad' para que el registro eliminado vuelva al libro mayor.
+FinanceJournal=Diario de finanzas
+ExpenseReportsJournal=Diario de informes de gastos
+DescFinanceJournal=Revista financiera que incluye todos los tipos de pagos por cuenta bancaria
+DescJournalOnlyBindedVisible=Esta es una vista de registro que está vinculada a una cuenta de contabilidad y se puede registrar en el Libro mayor.
+VATAccountNotDefined=Cuenta IVA no definida
+ThirdpartyAccountNotDefined=Cuenta para terceros no definida
+ProductAccountNotDefined=Cuenta para producto no definido
+FeeAccountNotDefined=Cuenta por cuota no definida
+BankAccountNotDefined=Cuenta bancaria no definida
+CustomerInvoicePayment=Pago del cliente de la factura
+ThirdPartyAccount=Cuenta de terceros
+NewAccountingMvt=Nueva transacción
+NumMvts=Numero de transacción
+ListeMvts=Lista de movimientos
+ErrorDebitCredit=El débito y el crédito no pueden tener un valor al mismo tiempo
+ReportThirdParty=Lista de cuenta de terceros
+DescThirdPartyReport=Consulte aquí la lista de clientes y proveedores de terceros y sus cuentas contables
+ListAccounts=Lista de las cuentas contables
+UnknownAccountForThirdparty=Cuenta de terceros desconocida. Usaremos %s
+UnknownAccountForThirdpartyBlocking=Cuenta de terceros desconocida. Error de bloqueo
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Cuenta de terceros no definida o tercero desconocido. Usaremos %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Terceros desconocidos y subledger no definidos en el pago. Mantendremos vacío el valor de la cuenta auxiliar.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Cuenta de terceros no definida o tercero desconocido. Error de bloqueo
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Cuenta de terceros desconocida y cuenta en espera no definida. Error de bloqueo
+PaymentsNotLinkedToProduct=Pago no vinculado a ningún producto / servicio
+OpeningBalance=Saldo de apertura
+ShowOpeningBalance=Mostrar saldo inicial
+HideOpeningBalance=Ocultar saldo inicial
+PcgtypeDesc=Los grupos de cuentas se utilizan como criterios predefinidos de "filtro" y "agrupación" para algunos informes contables. Por ejemplo, 'INGRESOS' o 'GASTOS' se utilizan como grupos para las cuentas contables de productos para construir el informe de gastos / ingresos.
+Reconcilable=Conciliable
+TotalVente=Volumen de negocios total antes de impuestos
+TotalMarge=Margen total de ventas
+DescVentilCustomer=Consulte aquí la lista de líneas de factura de cliente vinculadas (o no) a una cuenta de contabilidad de producto
+DescVentilMore=En la mayoría de los casos, si utiliza productos o servicios predefinidos y configura el número de cuenta en la tarjeta de producto/servicio, la aplicación podrá realizar todas las vinculaciones entre sus líneas de factura y la cuenta contable de su plan de cuentas, solo en un clic con el botón <strong> "%s"</strong>. Si la cuenta no se configuró en las tarjetas de producto/servicio o si todavía tiene algunas líneas que no están vinculadas a una cuenta, deberá realizar un enlace manual desde el menú "<strong>%s</strong>".
+DescVentilDoneCustomer=Consulte aquí la lista de líneas de clientes de facturas y su cuenta de contabilidad de productos
+DescVentilTodoCustomer=Vincular líneas de factura no consolidadas con una cuenta de contabilidad de producto
+ChangeAccount=Cambie la cuenta de contabilidad de producto/servicio para las líneas seleccionadas con la siguiente cuenta de contabilidad:
+DescVentilSupplier=Consulte aquí la lista de líneas de factura del proveedor vinculadas o aún no vinculadas a una cuenta contable del producto (solo se puede ver el registro que no se ha transferido en la contabilidad)
+DescVentilDoneSupplier=Consulte aquí la lista de las líneas de facturas de proveedores y su cuenta contable
+DescVentilTodoExpenseReport=Vincular las líneas de informes de gastos no consolidadas con una cuenta de contabilidad de cargos
+DescVentilExpenseReport=Consulte aquí la lista de líneas de reporte de gastos vinculadas (o no) a una cuenta contable de honorarios
+DescVentilExpenseReportMore=Si configura una cuenta contable en el tipo de líneas de informe de gastos, la aplicación podrá hacer todo el enlace entre sus líneas de informe de gastos y la cuenta contable de su plan de cuentas, solo con un clic con el botón <strong>"%s"</strong>. Si la cuenta no se configuró en el diccionario de tarifas o si todavía tiene algunas líneas que no están vinculadas a ninguna cuenta, deberá realizar un enlace manual desde el menú "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Consulte aquí la lista de las líneas de informes de gastos y su cuenta contable de honorarios
+OverviewOfMovementsNotValidated=Paso 1/ Resumen de movimientos no validados. (Necesario para cerrar un año fiscal)
+DescValidateMovements=Se prohíbe cualquier modificación o eliminación de escritura, letras y eliminaciones. Todas las entradas para un ejercicio deben validarse; de lo contrario, no será posible cerrar
+AutomaticBindingDone=Unión automática realizada
+ErrorAccountancyCodeIsAlreadyUse=Error, no puede eliminar esta cuenta de contabilidad porque se utiliza
+MvtNotCorrectlyBalanced=El movimiento no está correctamente equilibrado. Débito = %s | Crédito = %s
+Balancing=Balance
+FicheVentilation=Tarjeta obligatoria
+GeneralLedgerIsWritten=Las transacciones se escriben en el libro mayor
+GeneralLedgerSomeRecordWasNotRecorded=Algunas de las transacciones no pueden ser contabilizadas. Si no hay otro mensaje de error, esto es probablemente porque ya estaban en el diario.
+NoNewRecordSaved=No más registro para calendarizar
+ListOfProductsWithoutAccountingAccount=Lista de productos no vinculados a ninguna cuenta contable
+ChangeBinding=Cambiar la encuadernación
+Accounted=Contabilizado en el libro mayor
+NotYetAccounted=Aún no contabilizado en el libro mayor
+ShowTutorial=Tutorial de presentación
+NotReconciled=No conciliado
+ApplyMassCategories=Aplicar categorías de masas
+AddAccountFromBookKeepingWithNoCategories=Cuenta disponible aún no en el grupo personalizado
+CategoryDeleted=Se ha eliminado la categoría de la cuenta de contabilidad
+AccountingJournals=Diarios/libros de contabilidad
+AccountingJournal=Diario de contabilidad
+NewAccountingJournal=Nueva revista de contabilidad
+AccountingJournalType1=Operaciones misceláneas / varias
+AccountingJournalType5=Informe de gastos
+AccountingJournalType9=Tiene nuevo
+ErrorAccountingJournalIsAlreadyUse=Esta revista ya utiliza
+AccountingAccountForSalesTaxAreDefinedInto=Nota: la cuenta de contabilidad para el impuesto a las ventas se define en el menú <b>%s</b> - <b>%s</b>
+ExportDraftJournal=Exportar borrador de diario
+Modelcsv_CEGID=Exportación para CEGID Expert Comptabilité
+Modelcsv_COALA=Exportación para Sage Coala
+Modelcsv_bob50=Exportar para Sage BOB 50
+Modelcsv_ciel=Exportar para Sage Ciel Compta o Compta Evolution
+Modelcsv_quadratus=Exportar para Quadratus QuadraCompta
+Modelcsv_ebp=Exportar para EBP
+Modelcsv_cogilog=Exportar para Cogilog
+Modelcsv_agiris=Exportar para Agiris
+Modelcsv_LDCompta=Exportar para LD Compta (v9) (Prueba)
+Modelcsv_LDCompta10=Exportar para LD Compta (v10 y superior)
+Modelcsv_openconcerto=Exportar para OpenConcerto (prueba)
+Modelcsv_configurable=Exportar CSV Configurable
+Modelcsv_FEC=Exportar FEC
+Modelcsv_Sage50_Swiss=Exportación para Sage 50 Suiza
+Modelcsv_winfic=Exportar Winfic - eWinfic - WinSis Compta
+ChartofaccountsId=ID de la cuenta de cuentas
+InitAccountancy=Contabilidad inicial
+InitAccountancyDesc=Esta página se puede utilizar para inicializar una cuenta de contabilidad en productos y servicios que no tiene definida una cuenta de contabilidad para ventas y compras.
+DefaultBindingDesc=Esta página se puede utilizar para establecer una cuenta predeterminada para utilizar para vincular el registro de transacciones sobre salarios de pago, donaciones, impuestos y IVA cuando no se haya establecido ninguna cuenta de contabilidad específica.
+DefaultClosureDesc=Esta página se puede usar para establecer los parámetros utilizados para los cierres contables.
+OptionModeProductSell=Modo de venta
+OptionModeProductSellIntra=Ventas de modo exportadas en CEE
+OptionModeProductSellExport=Ventas de modo exportadas a otros países
+OptionModeProductBuy=Compras en modo
+OptionModeProductBuyIntra=Compras en modo importadas en la CEE
+OptionModeProductBuyExport=Modo comprado importado de otros países
+OptionModeProductSellDesc=Mostrar todos los productos con cuenta contable para ventas.
+OptionModeProductSellIntraDesc=Mostrar todos los productos con cuenta contable para ventas en EEC.
+OptionModeProductBuyDesc=Mostrar todos los productos con cuenta contable para compras.
+OptionModeProductBuyIntraDesc=Mostrar todos los productos con cuenta contable para compras en EEC.
+OptionModeProductBuyExportDesc=Mostrar todos los productos con cuenta contable para otras compras en el extranjero.
+CleanFixHistory=Eliminar código de contabilidad de las líneas que no existen en los gráficos de cuenta
+CleanHistory=Restablecer todos los enlaces del año seleccionado
+PredefinedGroups=Grupos predefinidos
+WithValidAccount=Con una cuenta dedicada válida
+ValueNotIntoChartOfAccount=Este valor de la cuenta de contabilidad no existe en el gráfico de la cuenta
+SaleEECWithVAT=Venta en CEE con un IVA no nulo, por lo que suponemos que esto NO es una venta intracomunitaria y la cuenta sugerida es la cuenta de producto estándar.
+SaleEECWithoutVATNumber=Venta en CEE sin IVA pero el ID de IVA de un tercero no está definido. Recurrimos a la cuenta del producto para ventas estándar. Puede corregir el ID de IVA de un tercero o la cuenta del producto si es necesario.
+Range=Gama de cuentas contables
+SomeMandatoryStepsOfSetupWereNotDone=No se han realizado algunos pasos obligatorios de la configuración, por favor, complelos
+ErrorNoAccountingCategoryForThisCountry=No hay grupo de cuentas de contabilidad disponible para el país%s (Consulte Inicio - Configuración - Diccionarios)
+ErrorInvoiceContainsLinesNotYetBounded=Intenta escribir en el diario algunas campos de la factura <strong>%s</strong>, pero algunas otros campos aún no están limitados a la cuenta de contabilidad. Se rechaza la periodización de todos los campos de factura para esta factura.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Algunos campos en la factura no están vinculadas a la cuenta contable.
+ExportNotSupported=El formato de exportación configurado no se admite en esta página
+BookeppingLineAlreayExists=Líneas ya existentes en la contabilidad.
+NoJournalDefined=Ninguna revista definida
+Binded=Líneas enlazadas
+ToBind=Líneas para atar
+UseMenuToSetBindindManualy=Líneas aún no enlazadas, use el menú <a href="%s">%s</a> para hacer el enlace manualmente.
+WarningReportNotReliable=Advertencia, este informe no se basa en el Libro mayor, por lo que no contiene la transacción modificada manualmente en el Libro mayor. Si su publicación está actualizada, la vista de contabilidad es más precisa.
+ExpenseReportJournal=Diario del informe de gastos
+InventoryJournal=Diario de inventario
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index ee7219ee2f0..fc0330d6eaf 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -762,7 +762,6 @@ PermanentLeftSearchForm=Formulario de búsqueda permanente en el menú de la izq
 EnableMultilangInterface=Habilitar soporte multilenguaje
 CompanyInfo=Empresa / Organización
 CompanyIds=Identidades de la empresa / organización
-CompanyName=Nombre
 CompanyZip=Código Postal
 CompanyTown=Ciudad
 CompanyCurrency=Moneda principal
@@ -1128,7 +1127,6 @@ BarcodeDescDATAMATRIX=Código de barras tipo Datamatrix
 BarcodeDescQRCODE=Código de barras tipo código QR
 GenbarcodeLocation=Herramienta de línea de comandos de generación de códigos de barras. Debe ser compatible con "genbarcode". <br> Por ejemplo: / usr / local / bin / genbarcode
 BarCodeNumberManager=Administración para definir automáticamente los números de códigos de barras
-WithdrawalsSetup=Configuración del módulo de pagos de débito directo.
 ExternalRSSSetup=Configuración de las importaciones RSS
 NewRSS=Nuevo RSS Feed
 RSSUrl=URL RSS
@@ -1193,7 +1191,6 @@ Buy=Comprar
 Sell=Vender
 InvoiceDateUsed=Fecha de factura debidamente
 YourCompanyDoesNotUseVAT=Su empresa ha sido definida para no usar el IVA (Inicio - Configuración - Compañía / Organización), por lo que no hay opciones de IVA para configurar.
-AccountancyCode=Código de contabilidad
 AccountancyCodeSell=Cuenta de venta. código
 AccountancyCodeBuy=Cuenta de compra. código
 AgendaSetup=Eventos y configuración del módulo de agenda
@@ -1213,7 +1210,6 @@ ClickToDialUrlDesc=URL llamada cuando se hace clic en el icono de teléfono. En
 ClickToDialDesc=Este módulo hace que los números de teléfono hagan clic en los enlaces. Un clic en el icono hará que su teléfono llame al número. Esto se puede usar para llamar a un sistema de centro de llamadas de Dolibarr que puede llamar al número de teléfono en un sistema SIP, por ejemplo.
 ClickToDialUseTelLink=Utilizar sólo un enlace "tel:" en los números de teléfono
 ClickToDialUseTelLinkDesc=Use este método si sus usuarios tienen un softphone o una interfaz de software instalada en la misma computadora que el navegador y se le llama cuando hace clic en un enlace de su navegador que comienza con "tel:". Si necesita una solución de servidor completa (sin necesidad de instalación de software local), debe configurar esto en "No" y completar el siguiente campo.
-CashDesk=Punto de venta
 CashDeskSetup=Configuración del módulo de punto de venta
 CashDeskThirdPartyForSell=Tercero genérico predeterminado para usar en ventas
 CashDeskBankAccountForSell=Cuenta predeterminada para recibir pagos en efectivo
diff --git a/htdocs/langs/es_EC/agenda.lang b/htdocs/langs/es_EC/agenda.lang
new file mode 100644
index 00000000000..12bf1ad38ff
--- /dev/null
+++ b/htdocs/langs/es_EC/agenda.lang
@@ -0,0 +1,108 @@
+# Dolibarr language file - Source file is en_US - agenda
+ActionsOwnedBy=Evento propiedad de
+Event=Evento
+ListOfActions=Lista de eventos
+ToUserOfGroup=A cualquier usuario en grupo
+EventOnFullDay=Evento todo el día(s)
+MenuToDoActions=Todos los eventos incompletos
+MenuDoneActions=Todos los eventos terminados
+ListOfEvents=Lista de eventos (calendario interno)
+ActionsAskedBy=Eventos reportados por
+ViewCal=Vista de mes
+ViewDay=Vista del día
+ViewWeek=Vista de semana
+AutoActions=Llenado automático
+AgendaAutoActionDesc=Aquí puede definir eventos que desea que Dolibarr cree automáticamente en Agenda. Si no se marca nada, solo las acciones manuales se incluirán en los registros y se mostrarán en la Agenda. El seguimiento automático de las acciones comerciales realizadas en los objetos (validación, cambio de estado) no se guardará.
+AgendaSetupOtherDesc=Esta página ofrece opciones para permitir la exportación de sus eventos Dolibarr a un calendario externo (Thunderbird, Google Calendar, etc.)
+AgendaExtSitesDesc=Esta página permite declarar fuentes externas de calendarios para ver sus eventos en la agenda de Dolibarr.
+ActionsEvents=Eventos para los que Dolibarr creará automáticamente una acción en agenda
+EventRemindersByEmailNotEnabled=Los recordatorios de eventos por correo electrónico no se habilitaron en la %s configuración del módulo.
+NewCompanyToDolibarr=Cliente/Proveedor %s creado
+COMPANY_DELETEInDolibarr=Cliente/Proveedor %s eliminado
+ContractValidatedInDolibarr=Contrato%s validado
+PropalClosedSignedInDolibarr=Propuesta%s firmada
+PropalClosedRefusedInDolibarr=Propuesta%s rechazada
+PropalValidatedInDolibarr=Propuesta%s validada
+PropalClassifiedBilledInDolibarr=Propuesta%s clasificados facturados
+InvoiceValidatedInDolibarr=Se ha validado la factura%s
+InvoiceValidatedInDolibarrFromPos=Factura%s validada desde POS
+InvoiceBackToDraftInDolibarr=La factura%s vuelve al estado de borrador
+InvoiceDeleteDolibarr=Se ha eliminado la factura%s
+InvoicePaidInDolibarr=La factura%s cambió a pagada
+InvoiceCanceledInDolibarr=Se canceló la factura%s
+MemberValidatedInDolibarr=Miembro%s validado
+MemberModifiedInDolibarr=Miembro%s modificado
+MemberResiliatedInDolibarr=Miembro%s terminado
+MemberDeletedInDolibarr=Miembro%s eliminado
+MemberSubscriptionAddedInDolibarr=Suscripción %s para miembro %s agregado
+MemberSubscriptionModifiedInDolibarr=Suscripción %s para miembro %s modificado
+MemberSubscriptionDeletedInDolibarr=Suscripción %s para miembro %s eliminado
+ShipmentValidatedInDolibarr=Se ha validado el envío%s
+ShipmentClassifyClosedInDolibarr=Envío%s clasificados facturados
+ShipmentUnClassifyCloseddInDolibarr=Envío %s clasificado reabrir
+ShipmentBackToDraftInDolibarr=Envío %s volver al estado de borrador
+ShipmentDeletedInDolibarr=Se ha eliminado el envío%s
+OrderCreatedInDolibarr=Orden%s creada
+OrderValidatedInDolibarr=Orden%s validado
+OrderDeliveredInDolibarr=Orden%s clasificado entregado
+OrderCanceledInDolibarr=Orden%s cancelada
+OrderBilledInDolibarr=Orden%s clasificado facturado
+OrderApprovedInDolibarr=Orden aprobada%s
+OrderRefusedInDolibarr=Orden%s rechazada
+OrderBackToDraftInDolibarr=Orden%s volver al estado de borrador
+ProposalSentByEMail=Propuesta comercial %s enviada por correo electrónico
+ContractSentByEMail=Contrato %s enviado por correo electrónico
+OrderSentByEMail=Pedido de ventas %s enviado por correo electrónico
+InvoiceSentByEMail=Factura del cliente %s enviada por correo electrónico
+SupplierOrderSentByEMail=Pedido de compra %s enviado por correo electrónico
+ORDER_SUPPLIER_DELETEInDolibarr=Pedido de compra %s eliminado
+SupplierInvoiceSentByEMail=Factura del proveedor %s enviada por correo electrónico
+ShippingSentByEMail=Envío %s enviado por correo electrónico
+ShippingValidated= Se ha validado el envío%s
+ProposalDeleted=Propuesta eliminada
+InvoiceDeleted=Se eliminó la factura
+PRODUCT_CREATEInDolibarr=Producto%s creado
+PRODUCT_MODIFYInDolibarr=Producto%s modificado
+PRODUCT_DELETEInDolibarr=Producto%s eliminado
+HOLIDAY_CREATEInDolibarr=Solicitud de licencia %s creada
+HOLIDAY_MODIFYInDolibarr=Solicitud de licencia %s modificada
+HOLIDAY_APPROVEInDolibarr=Solicitud de licencia %s aprobada
+HOLIDAY_DELETEInDolibarr=Solicitud de licencia %s eliminada
+EXPENSE_REPORT_CREATEInDolibarr=Se ha creado el informe de gastos%s
+EXPENSE_REPORT_VALIDATEInDolibarr=Informe de gastos%s validado
+EXPENSE_REPORT_APPROVEInDolibarr=Informe de gastos%s aprobado
+EXPENSE_REPORT_DELETEInDolibarr=Informe de gastos%s eliminado
+EXPENSE_REPORT_REFUSEDInDolibarr=Informe de gastos%s rechazado
+PROJECT_CREATEInDolibarr=Proyecto%s creado
+PROJECT_MODIFYInDolibarr=Proyecto%s modificado
+PROJECT_DELETEInDolibarr=Proyecto%s eliminado
+TICKET_CLOSEInDolibarr=Boleto %s cerrado
+BOM_VALIDATEInDolibarr=BOM validado
+BOM_UNVALIDATEInDolibarr=BOM no validado
+BOM_CLOSEInDolibarr=Lista de materiales deshabilitada
+BOM_REOPENInDolibarr=BOM reabrir
+MRP_MO_VALIDATEInDolibarr=MO validado
+MRP_MO_PRODUCEDInDolibarr=MO producido
+MRP_MO_DELETEInDolibarr=MO eliminado
+AgendaModelModule=Plantillas de documento para el evento
+DateActionEnd=Fecha final
+AgendaUrlOptions1=También puede agregar los siguientes parámetros a la salida del filtro:
+AgendaUrlOptions3=<b>logina=%s</b> para restringir la salida a acciones propiedad de un usuario <b>%s</b>.
+AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> para restringir la salida a acciones que no pertenecen al usuario <b>%s</b>.
+AgendaUrlOptions4=<b> logint =%s </ b> para restringir la salida a las acciones asignadas al usuario <b>%s</b> (propietario y otros).
+AgendaUrlOptionsProject=<b>project = __ PROJECT_ID__</b> para restringir el resultado a acciones vinculadas al proyecto <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype = systemauto</b> para excluir eventos automáticos.
+AgendaUrlOptionsIncludeHolidays= <b>includeholidays=1</b> para incluir eventos de vacaciones.
+AgendaHideBirthdayEvents=Ocultar los cumpleaños de los contactos
+ExportDataset_event1=Lista de eventos de la agenda
+DefaultWorkingDays=Intervalo de días laborales por defecto en la semana (Ejemplo: 1-5, 1-6)
+DefaultWorkingHours=Horas de trabajo por defecto en el día (Ejemplo: 9-18)
+ExtSites=Importar calendarios externos
+ExtSitesEnableThisTool=Mostrar calendarios externos (definidos en la configuración global) en Agenda. No afecta a los calendarios externos definidos por los usuarios.
+AgendaExtNb=Calendario #. %s
+ExtSiteUrlAgenda=URL para acceder al archivo .ical
+VisibleTimeRange=Intervalo de tiempo visible
+DateActionBegin=Iniciar la fecha del evento
+ConfirmCloneEvent=¿Seguro que desea clonar el evento <b>%s</b>?
+DayOfMonth=Dia del mes
+DateStartPlusOne=Fecha de inicio + 1 hora
diff --git a/htdocs/langs/es_EC/banks.lang b/htdocs/langs/es_EC/banks.lang
new file mode 100644
index 00000000000..674db7869f0
--- /dev/null
+++ b/htdocs/langs/es_EC/banks.lang
@@ -0,0 +1,120 @@
+# Dolibarr language file - Source file is en_US - banks
+MenuBankCash=Bancos / Efectivo
+BankAccounts=Cuentas bancarias
+BankAccountsAndGateways=Cuentas bancarias | Puertas de enlace
+AccountRef=Cuenta bancaria ref
+AccountLabel=Etiqueta de la cuenta bancaria
+CashAccount=Cuenta de efectivo
+CashAccounts=Cuentas de caja
+CurrentAccounts=Cuentas actuales
+SavingAccounts=Cuentas de ahorros
+ErrorBankLabelAlreadyExists=La etiqueta de la cuenta bancaria ya existe
+BankBalanceBefore=Saldo antes
+BankBalanceAfter=Saldo después
+BalanceMinimalAllowed=Saldo mínimo permitido
+FutureBalance=Saldo futuro
+ShowAllTimeBalance=Mostrar saldo desde el inicio
+AllTime=Desde el principio
+RIB=Número de cuenta bancaria
+AccountStatement=Estado de cuenta
+AccountStatementShort=Estado
+AccountStatements=Estados de cuenta
+LastAccountStatements=Últimos estados de cuenta
+IOMonthlyReporting=Reporte mensual
+BankAccountDomiciliation=Dirección del banco
+BankAccountOwner=Nombre del propietario de la cuenta
+BankAccountOwnerAddress=Dirección del propietario de la cuenta
+RIBControlError=La comprobación de integridad de los valores ha fallado. Esto significa que la información para este número de cuenta no está completa o es incorrecta (verifique el país, los números y el IBAN).
+NewFinancialAccount=Nueva cuenta bancaria
+MenuNewFinancialAccount=Nueva cuenta bancaria
+EditFinancialAccount=Editar cuenta
+LabelBankCashAccount=Etiqueta bancaria o de caja
+BankType0=Cuenta de ahorros
+BankType1=Cuenta corriente o tarjeta de crédito
+BankType2=Cuenta de efectivo
+AccountsArea=Área de cuentas
+AccountCard=Tarjeta de cuenta
+DeleteAccount=Borrar cuenta
+ConfirmDeleteAccount=¿Seguro que quieres eliminar esta cuenta?
+BankTransactionByCategories=Transacciones bancarias por categorías
+BankTransactionForCategory=Transacciones bancarias para la categoría <b>%s</b>
+RemoveFromRubrique=Eliminar el enlace con la categoría
+RemoveFromRubriqueConfirm=¿Seguro que quieres eliminar el enlace entre la transaccion y la categoría?
+ListBankTransactions=Lista de transacciones bancarias
+IdTransaction=ID de transacción
+BankTransactions=Transacciones bancarias
+BankTransaction=Transacción bancaria
+ListTransactions=Listar transacciones/categoría
+ListTransactionsByCategory=Listar transacciones/categoría
+TransactionsToConciliate=Transacciones para conciliar
+TransactionsToConciliateShort=Para reconciliar
+Conciliable=Se puede conciliar
+SaveStatementOnly=Guardar solo declaración
+ReconciliationLate=Conciliación tardia
+OnlyOpenedAccount=Sólo cuentas abiertas
+AccountToCredit=Cuenta a acreditar
+AccountToDebit=Cuenta a debitar
+DisableConciliation=Deshabilitar la función de conciliación de esta cuenta
+LinkedToAConciliatedTransaction=Vinculado a una entrada conciliada
+StatusAccountClosed=Cerrado
+LineRecord=Transacción
+AddBankRecord=Añadir entrada
+AddBankRecordLong=Añadir entrada manualmente
+Conciliated=Conciliado
+DateConciliating=Fecha de conciliación
+BankLineConciliated=Entrada conciliada con recibo bancario
+Reconciled=Conciliado
+SupplierInvoicePayment=Pago del proveedor
+WithdrawalPayment=Orden de pago de débito
+SocialContributionPayment=Pago de impuestos sociales y fiscales
+TransferDesc=Transferencia de una cuenta a otra, Dolibarr escribirá dos registros (un débito en la cuenta de origen y un crédito en la cuenta de destino). Se utilizará la misma cantidad (excepto el signo), la etiqueta y la fecha para esta transacción)
+TransferTo=A
+TransferFromToDone=Se ha registrado una transferencia de <b>%s</b> to <b>%s</b> of <b>%s</b> %s.
+CheckTransmitter=Transmisor
+ValidateCheckReceipt=¿Validar este recibo de cheque?
+ConfirmValidateCheckReceipt=¿Está seguro de que desea validar este recibo de cheque, no se podrá realizar ningún cambio una vez hecho esto?
+DeleteCheckReceipt=¿Eliminar este recibo de cheque?
+ConfirmDeleteCheckReceipt=¿Seguro que desea eliminar este recibo de cheque?
+BankChecks=Cheques bancarios
+BankChecksToReceipt=Cheques a la espera de depósito
+BankChecksToReceiptShort=Cheques a la espera de depósito
+ShowCheckReceipt=Mostrar recibo de depósito de cheque
+NumberOfCheques=No. de cheque
+DeleteTransaction=Eliminar la entrada
+ConfirmDeleteTransaction=¿Estás seguro de que quieres borrar esta entrada?
+ThisWillAlsoDeleteBankRecord=Esto también eliminará la entrada de banco generada
+PlannedTransactions=Entradas planificadas
+ExportDataset_banque_1=Entradas bancarias y estado de cuenta
+ExportDataset_banque_2=Depósito
+TransactionOnTheOtherAccount=Transacción en la otra cuenta
+PaymentNumberUpdateFailed=No se pudo actualizar el número de pago.
+PaymentDateUpdateFailed=No se pudo actualizar la fecha de pago
+BankTransactionLine=Transacción bancaria
+AllAccounts=Todas las cuentas bancarias y de efectivo
+ShowAllAccounts=Mostrar todas las cuentas
+FutureTransaction=Transacción futura Incapaz de conciliar.
+SelectChequeTransactionAndGenerate=Seleccione/filtrar cheques para incluir en el recibo de depósito de cheques y haga clic en "Crear".
+InputReceiptNumber=Elija el estado de cuenta bancario relacionado con la conciliación. Utilice un valor numérico clasificable: MMYYYY o DDMMYYYY
+EventualyAddCategory=Eventualmente, especifique una categoría en la que clasificar los registros
+ToConciliate=¿Para conciliar?
+ThenCheckLinesAndConciliate=Luego, compruebe las líneas presentes en el extracto bancario y haga click
+DefaultRIB=Predeterminado BAN
+AllRIB=Todas las BAN
+LabelRIB=Etiqueta de BAN
+NoBANRecord=Sin registro BAN
+DeleteARib=Eliminar registro BAN
+ConfirmDeleteRib=¿Está seguro de que desea eliminar este registro BAN?
+ConfirmRejectCheck=¿Está seguro de que desea marcar este cheque como rechazado?
+CheckRejectedAndInvoicesReopened=Cheque devuelto y reapertura de facturas
+BankAccountModelModule=Plantillas de documentos para cuentas bancarias
+DocumentModelSepaMandate=Plantilla de mandato de la SEPA. Útil para los países europeos en la CEE solamente.
+DocumentModelBan=Plantilla para imprimir una página con información BAN.
+NewVariousPayment=Nuevo pago misceláneo
+VariousPayment=Pago misceláneo
+ShowVariousPayment=Mostrar pago misceláneo
+AddVariousPayment=Agregar pago misceláneo
+FindYourSEPAMandate=Este es su mandato de SEPA para autorizar a nuestra empresa a realizar un pedido de débito directo a su banco. Devuélvalo firmado (escaneo del documento firmado) o envíelo por correo a
+AutoReportLastAccountStatement=Rellene automáticamente el campo 'número de extracto bancario' con el último número de extracto al realizar la conciliación
+CashControl=POS Limite de efectivo
+NewCashFence=Nuevo limite de efectivo
+BankColorizeMovementDesc=Si esta función está habilitada, puede elegir un color de fondo específico para los movimientos de débito o crédito
diff --git a/htdocs/langs/es_EC/bills.lang b/htdocs/langs/es_EC/bills.lang
new file mode 100644
index 00000000000..de506df2649
--- /dev/null
+++ b/htdocs/langs/es_EC/bills.lang
@@ -0,0 +1,441 @@
+# Dolibarr language file - Source file is en_US - bills
+BillsCustomers=Facturas de clientes
+BillsCustomer=Factura del cliente
+BillsSuppliers=Facturas del vendedor / proveedor
+BillsCustomersUnpaid=Facturas de clientes no pagadas
+BillsCustomersUnpaidForCompany=Facturas de clientes no pagadas para%s
+BillsSuppliersUnpaid=Facturas impagas de proveedores
+BillsSuppliersUnpaidForCompany=Facturas impagas de proveedores por %s
+BillsLate=Pagos atrasados
+BillsStatistics=Estadísticas de facturas de clientes
+DisabledBecauseDispatchedInBookkeeping=Desactivado porque la factura se envió a la contabilidad
+DisabledBecauseNotLastInvoice=Desactivado porque la factura no se puede borrar. Algunas facturas se registraron después de esta y crearán agujeros en la contabilidad.
+DisabledBecauseNotErasable=Desactivado porque no se puede borrar
+InvoiceStandardDesc=Este tipo de factura es la factura común.
+InvoiceDepositDesc=Este tipo de factura se realiza cuando se ha recibido un pago inicial.
+InvoiceProForma=Factura de proforma
+InvoiceProFormaAsk=Factura de proforma
+InvoiceProFormaDesc=<b>Factura proforma</b> es una imagen de una factura real pero no tiene valor de contabilidad.
+InvoiceReplacement=Factura de reemplazo
+InvoiceReplacementAsk=Factura de reemplazo para factura
+InvoiceReplacementDesc= <b>La factura de reemplazo</b> se usa para reemplazar completamente una factura sin que ya se haya recibido el pago. <br><br> Nota: Solo se pueden reemplazar las facturas sin pago. Si la factura que reemplaza aún no está cerrada, se cerrará automáticamente a 'abandonada'.
+InvoiceAvoir=Nota de crédito
+InvoiceAvoirAsk=Nota de crédito para corregir la factura
+InvoiceAvoirDesc=La <b>nota de crédito</b> es una factura negativa utilizada para corregir el hecho de que una factura muestra una cantidad que difiere de la cantidad realmente pagada (por ejemplo, el cliente pagó demasiado por error o no pagará la cantidad completa ya que se devolvieron algunos productos) .
+invoiceAvoirWithLines=Crear nota de crédito con líneas de la factura de origen
+invoiceAvoirWithPaymentRestAmount=Crear nota de crédito con factura pendiente de pago pendiente
+invoiceAvoirLineWithPaymentRestAmount=Nota de crédito por el monto pendiente de pago
+ReplaceInvoice=Reemplazar la factura%s
+ReplacementInvoice=Factura de reemplazo
+ReplacedByInvoice=Reemplazada por la factura%s
+ReplacementByInvoice=Reemplazada por factura
+CorrectInvoice=Factura correcta%s
+CorrectionInvoice=Factura de corrección
+UsedByInvoice=Se utiliza para pagar la factura%s
+NoReplacableInvoice=No hay facturas reemplazables
+NoInvoiceToCorrect=Ninguna factura para corregir
+InvoiceHasAvoir=Fue fuente de una o varias notas de crédito
+CardBill=Tarjeta de factura
+PredefinedInvoices=Facturas predefinidas
+InvoiceCustomer=Factura del cliente
+CustomerInvoice=Factura del cliente
+CustomersInvoices=Facturas de clientes
+SupplierInvoice=Factura del proveedor
+SupplierBill=Factura del proveedor
+SupplierBills=facturas de proveedores
+PaymentBack=Reembolso
+CustomerInvoicePaymentBack=Reembolso
+paymentInInvoiceCurrency=en moneda de facturas
+DeletePayment=Eliminar pago
+ConfirmDeletePayment=¿Está seguro de que desea eliminar este pago?
+ConfirmConvertToReduc=¿Desea convertir este %s en un crédito disponible?
+ConfirmConvertToReduc2=El monto se guardará entre todos los descuentos y podría usarse como un descuento para una factura actual o futura para este cliente.
+ConfirmConvertToReducSupplier=¿Desea convertir este %s en un crédito disponible?
+ConfirmConvertToReducSupplier2=El monto se guardará entre todos los descuentos y podría usarse como un descuento para una factura actual o futura para este proveedor.
+SupplierPayments=Pagos a proveedores
+ReceivedCustomersPayments=Pagos recibidos de clientes
+PayedSuppliersPayments=Pagos pagados a proveedores
+ReceivedCustomersPaymentsToValid=Pagos de clientes recibidos para validar
+PaymentsReportsForYear=Informes de pagos de%s
+PaymentsAlreadyDone=Pagos ya realizados
+PaymentRule=Regla de pago
+PaymentTypeDC=Tarjeta de crédito débito
+PaymentTerm=Plazo de pago
+PaymentConditions=Términos de pago
+PaymentConditionsShort=Términos de pago
+PaymentAmount=Monto del pago
+PaymentHigherThanReminderToPay=Pago más alto que un recordatorio para pagar
+HelpPaymentHigherThanReminderToPay=Atención, el monto de pago de una o más facturas es mayor que el monto pendiente de pago. <br> Edite su entrada, de lo contrario confirme y considere crear una nota de crédito por el exceso recibido por cada factura pagada en exceso.
+HelpPaymentHigherThanReminderToPaySupplier=Atención, el monto de pago de una o más facturas es mayor que el monto pendiente de pago. <br> Edite su entrada, de lo contrario confirme y considere crear una nota de crédito por el exceso pagado por cada factura pagada en exceso.
+ClassifyPaid=Clasificar 'Pago'
+ClassifyUnPaid=Clasificar 'Sin pagar'
+ClassifyPaidPartially=Clasificar 'Pago parcial'
+ClassifyCanceled=Clasificar 'Abandoned'
+ClassifyUnBilled=Clasificar 'Sin Cobro'
+CreateCreditNote=Crear nota de crédito
+AddBill=Crear factura o nota de crédito
+AddToDraftInvoices=Agregar al proyecto de factura
+SearchACustomerInvoice=Buscar una factura de cliente
+CancelBill=Cancelar una factura
+SendRemindByMail=Enviar recordatorio por correo electrónico
+DoPayment=Introducir pago
+DoPaymentBack=Introducir reembolso
+ConvertToReduc=Marcar como crédito disponible
+ConvertExcessReceivedToReduc=Convertir el pago en exceso recibido en crédito disponible
+ConvertExcessPaidToReduc=Convierte el exceso pagado en descuento disponible
+EnterPaymentReceivedFromCustomer=Introduzca el pago recibido del cliente
+EnterPaymentDueToCustomer=Realizar el pago debido al cliente
+DisabledBecauseRemainderToPayIsZero=Discapacitados porque el resto del pago es cero
+PriceBase=Base de precios
+BillStatusDraft=Proyecto (necesita ser validado)
+BillStatusPaid=Pagado
+BillStatusPaidBackOrConverted=Reembolso de nota de crédito o marcado como crédito disponible
+BillStatusConverted=Pagado (listo para el consumo en la factura final)
+BillStatusCanceled=Abandonado
+BillStatusValidated=Validado (debe ser pagado)
+BillStatusStarted=Empezado
+BillStatusNotPaid=No pagado
+BillStatusNotRefunded=No devuelto
+BillStatusClosedUnpaid=Cerrado (sin pagar)
+BillStatusClosedPaidPartially=Pagado (parcialmente)
+BillShortStatusPaid=Pagado
+BillShortStatusPaidBackOrConverted=Reembolsado o convertido
+Refunded=Reembolsado
+BillShortStatusConverted=Pagado
+BillShortStatusCanceled=Abandonado
+BillShortStatusValidated=validado
+BillShortStatusStarted=Empezado
+BillShortStatusNotPaid=No pagado
+BillShortStatusNotRefunded=No devuelto
+BillShortStatusClosedUnpaid=Cerrado
+BillShortStatusClosedPaidPartially=Pagado (parcialmente)
+PaymentStatusToValidShort=Validar
+ErrorVATIntraNotConfigured=Valor de IVA intracomunitario aún no definido
+ErrorNoPaiementModeConfigured=No hay un tipo de pago predeterminado definido. Vaya a la configuración del módulo Factura para solucionar esto.
+ErrorCreateBankAccount=Cree una cuenta bancaria, luego vaya al panel Configuración del módulo Factura para definir los tipos de pago
+ErrorBillNotFound=La factura%s no existe
+ErrorInvoiceAlreadyReplaced=Error, intentó validar una factura para reemplazarla %s. Pero este ya ha sido sustituido por la factura %s.
+ErrorDiscountAlreadyUsed=Error, descuento ya utilizado
+ErrorInvoiceAvoirMustBeNegative=Error, la factura correcta debe tener un importe negativo
+ErrorInvoiceOfThisTypeMustBePositive=Error, este tipo de factura debe tener una cantidad que excluya impuestos positivos (o nulos)
+ErrorCantCancelIfReplacementInvoiceNotValidated=Error, no se puede cancelar una factura que ha sido sustituida por otra factura que todavía está en estado de borrador
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Esta parte u otra ya está en uso, por lo que no se pueden eliminar las series de descuento.
+BillFrom=De
+BillTo=A
+ActionsOnBill=Acciones en factura
+RecurringInvoiceTemplate=Plantilla / factura recurrente
+NoQualifiedRecurringInvoiceTemplateFound=Ninguna factura de plantilla recurrente calificada para la generación.
+FoundXQualifiedRecurringInvoiceTemplate=Se encontró%s facturas de plantilla recurrente calificadas para generación.
+NotARecurringInvoiceTemplate=No es una plantilla de plantilla recurrente
+LastBills=Últimas facturas%s
+LatestTemplateInvoices=Últimas facturas de plantilla%s
+LatestCustomerTemplateInvoices=Últimas facturas de plantilla de cliente%s
+LatestSupplierTemplateInvoices=Últimas facturas de plantilla de proveedor %s
+LastCustomersBills=Últimas facturas de clientes%s
+LastSuppliersBills=Últimas facturas de proveedores %s
+DraftBills=Proyecto de facturas
+CustomersDraftInvoices=Facturas de borrador del cliente
+SuppliersDraftInvoices=Borrador de facturas de proveedores
+Unpaid=No pagado
+ConfirmDeleteBill=¿Está seguro de que desea eliminar esta factura?
+ConfirmValidateBill=¿Está seguro de que desea validar esta factura con la referencia <b>%s </b>?
+ConfirmUnvalidateBill=¿Está seguro de que desea cambiar la factura <b>%s </b> al estado de borrador?
+ConfirmClassifyPaidBill=¿Seguro que desea cambiar la factura <b>%s </b> al estado pagado?
+ConfirmCancelBill=¿Seguro que desea cancelar la factura <b>%s </b>?
+ConfirmCancelBillQuestion=¿Por qué desea clasificar esta factura 'abandonada'?
+ConfirmClassifyPaidPartially=¿Seguro que desea cambiar la factura <b>%s </b> al estado pagado?
+ConfirmClassifyPaidPartiallyQuestion=Esta factura no se ha pagado por completo. ¿Cuál es la razón para cerrar esta factura?
+ConfirmClassifyPaidPartiallyReasonAvoir=Permanecer sin pagar <b>(%s%s)</b> es un descuento otorgado porque el pago se realizó antes del término. Regularizo el IVA con una nota de crédito.
+ConfirmClassifyPaidPartiallyReasonDiscount=Restante sin pagar <b>(%s%s)</b> es un descuento otorgado porque el pago se realizó antes del término.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=El resto del impuesto <b> (%s%s) </b> es un descuento concedido porque el pago se realizó antes del plazo. Acepto perder el IVA en este descuento.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=El resto del impuesto <b> (%s%s) </b> es un descuento concedido porque el pago se realizó antes del plazo. Recupero el IVA en este descuento sin una nota de crédito.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Mal cliente
+ConfirmClassifyPaidPartiallyReasonProductReturned=Productos devueltos parcialmente
+ConfirmClassifyPaidPartiallyReasonOther=Cantidad abandonada por otra razón
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Esta opción es posible si su factura ha recibido comentarios adecuados. (Ejemplo «Solo el impuesto correspondiente al precio que se ha pagado realmente da derecho a deducción»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=En algunos países, esta opción podría ser posible solo si su factura contiene las notas correctas.
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=Utilice esta opción si la otra no le conviene
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Un <b>mal cliente</b> es un cliente que se niega a pagar su deuda.
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Esta opción se utiliza cuando el pago no está completo porque algunos de los productos fueron devueltos
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Utilice esta opción si todos los demás no son adecuados, por ejemplo, en la siguiente situación: <br> - el pago no se completó porque algunos productos se devolvieron. <br> - la cantidad reclamada es demasiado importante porque se olvidó un descuento. <br> En todos los casos, la cantidad reclamada en exceso debe ser corregida en el sistema de contabilidad creando una nota de crédito.
+ConfirmClassifyAbandonReasonOtherDesc=Esta opción se utilizará en todos los demás casos. Por ejemplo, porque planea crear una factura de reemplazo.
+ConfirmCustomerPayment=¿Confirma esta entrada de pago para <b>%s</b>%s?
+ConfirmSupplierPayment=¿Confirma esta entrada de pago para <b>%s</b>%s?
+ConfirmValidatePayment=¿Está seguro de que desea validar este pago? No se puede hacer ningún cambio una vez que se haya validado el pago.
+UnvalidateBill=No validar la factura
+NumberOfBillsByMonth=Nº de facturas por mes.
+AmountOfBills=Cantidad de facturas
+AmountOfBillsHT=Importe de las facturas (neto de impuestos)
+AmountOfBillsByMonthHT=Importe de las facturas por mes (neto de impuestos)
+UseSituationInvoicesCreditNote=Permitir situación factura nota de crédito
+AllowedInvoiceForRetainedWarranty=Garantía retenida utilizable en los siguientes tipos de facturas
+RetainedwarrantyDefaultPercent=Garantía retenida por ciento por defecto
+RetainedwarrantyOnlyForSituation=Haga que la "garantía retenida" esté disponible solo para facturas situacionales
+RetainedwarrantyOnlyForSituationFinal=En las facturas de situación, la deducción global de "garantía retenida" se aplica solo en la situación final
+setPaymentConditionsShortRetainedWarranty=Establecer condiciones de pago de garantía retenidas
+setretainedwarranty=Establecer garantía retenida
+setretainedwarrantyDateLimit=Establecer límite de fecha de garantía retenida
+AlreadyPaidBack=Ya pagado de vuelta
+AlreadyPaidNoCreditNotesNoDeposits=Ya pagado (sin notas de crédito y anticipos)
+Abandoned=Abandonado
+RemainderToPay=Restante sin pagar
+RemainderToTake=Cantidad restante a tomar
+RemainderToPayBack=Cantidad restante para reembolso
+AmountExpected=Cantidad reclamada
+ExcessReceived=Exceso recibido
+ExcessPaid=Exceso de pago
+EscompteOffered=Descuento ofrecido (pago antes del plazo)
+SendBillRef=Presentación de la factura%s
+SendReminderBillRef=Presentación de la factura%s (recordatorio)
+StandingOrders=Pedidos de domiciliación bancaria
+StandingOrder=Orden de dèbito directo
+NoDraftBills=Ningún proyecto de facturas
+NoOtherDraftBills=Ningún otro proyecto de facturas
+NoDraftInvoices=Ningún proyecto de facturas
+RefBill=Factura ref
+ToBill=Cobrar
+RemainderToBill=Resto para facturar
+SendBillByMail=Enviar factura por correo electrónico
+SendReminderBillByMail=Enviar recordatorio por correo electrónico
+RelatedCommercialProposals=Propuestas comerciales relacionadas
+RelatedRecurringCustomerInvoices=Facturas recurrentes relacionadas con los clientes
+MenuToValid=Para validar
+DateMaxPayment=Pago debido en
+DateInvoice=Fecha de la factura
+DatePointOfTax=Punto de impuestos
+NoInvoice=Sin factura
+ClassifyBill=Clasificar factura
+SupplierBillsToPay=Facturas de proveedores impagos
+CustomerBillsUnpaid=Facturas de clientes no pagadas
+NonPercuRecuperable=No recuperable
+SetConditions=Establecer condiciones de pago
+SetMode=Establecer tipo de pago
+SetRevenuStamp=Establecer sello de ingresos
+Repeatable=Modelo
+ChangeIntoRepeatableInvoice=Convertir en plantilla de factura
+CreateFromRepeatableInvoice=Crear desde la plantilla de factura
+CustomersInvoicesAndInvoiceLines=Facturas del cliente y detalles de la factura.
+CustomersInvoicesAndPayments=Facturas y pagos de clientes
+ExportDataset_invoice_1=Facturas del cliente y detalles de la factura.
+ExportDataset_invoice_2=Facturas y pagos de clientes
+ProformaBill=Proyecto de Ley Proforma:
+ReductionShort=Desct.
+Reductions=Reducciones
+ReductionsShort=Desct.
+AddDiscount=Crear descuento
+AddGlobalDiscount=Crear descuento absoluto
+EditGlobalDiscounts=Editar descuentos absolutos
+AddCreditNote=Crear nota de crédito
+ShowDiscount=Mostrar descuento
+ShowReduc=Mostrar el descuento
+ShowSourceInvoice=Mostrar la factura de origen
+GlobalDiscount=Descuento global
+CreditNote=Nota de crédito
+CreditNotes=Notas de crédito
+Deposit=Pago inicial
+Deposits=Bajo pago
+DiscountFromCreditNote=Descuento de la nota de crédito%s
+DiscountFromDeposit=Pago inicial de la factura%s
+DiscountFromExcessReceived=Pagos en exceso de la factura %s
+DiscountFromExcessPaid=Pagos en exceso de la factura %s
+AbsoluteDiscountUse=Este tipo de crédito puede ser utilizado en la factura antes de su validación
+CreditNoteDepositUse=La factura debe ser validada para usar este tipo de créditos
+NewGlobalDiscount=Nuevo descuento absoluto
+NewRelativeDiscount=Nuevo descuento relativo
+ReasonDiscount=Razón
+DiscountOfferedBy=Concedido por
+DiscountStillRemaining=Descuentos o créditos disponibles
+DiscountAlreadyCounted=Descuentos o créditos ya utilizado
+CustomerDiscounts=Descuentos para clientes
+BillAddress=Dirección de Bill
+HelpAbandonBadCustomer=Esta cantidad se ha abandonado (el cliente dice que es un mal cliente) y se considera una pérdida excepcional.
+HelpAbandonOther=Esta cantidad se ha abandonado debido a que se trató de un error (el cliente o la factura equivocados se reemplazaron por otro, por ejemplo)
+IdSocialContribution=ID de pago de impuestos sociales/fiscales
+PaymentId=ID de pago
+PaymentRef=Pago ref.
+InvoiceId=ID de factura
+InvoiceRef=Factura ref.
+InvoiceDateCreation=Fecha de creación de la factura
+InvoiceStatus=Estado de la factura
+InvoiceNote=Nota de factura
+InvoicePaidCompletelyHelp=Factura que se paga por completo. Esto excluye las facturas que se pagan parcialmente. Para obtener una lista de todas las facturas 'Cerradas' o no 'Cerradas', prefiera usar un filtro en el estado de la factura.
+WatermarkOnDraftBill=Marca de agua en facturas de proyecto (nada si está vacía)
+InvoiceNotChecked=No hay factura seleccionada
+ConfirmCloneInvoice=¿Seguro que desea copiar esta factura <b>%s</b>?
+DisabledBecauseReplacedInvoice=Acción desactivada porque la factura ha sido reemplazada
+DescTaxAndDividendsArea=Esta área presenta un resumen de todos los pagos realizados por gastos especiales. Aquí solo se incluyen registros con pagos durante el año fijo.
+NbOfPayments=No. de pagos
+SplitDiscount=Descuento dividido en dos
+ConfirmSplitDiscount=¿Seguro que quieres dividir este descuento de <b> %s </b> %s en dos descuentos más pequeños?
+TypeAmountOfEachNewDiscount=Cantidad de entrada para cada una de dos partes:
+TotalOfTwoDiscountMustEqualsOriginal=El total de los dos nuevos descuentos debe ser igual al monto del descuento original.
+ConfirmRemoveDiscount=¿Seguro que quieres eliminar este descuento?
+RelatedBill=Factura relacionada
+RelatedBills=Facturas relacionadas
+RelatedCustomerInvoices=Facturas de clientes relacionadas
+RelatedSupplierInvoices=Facturas de proveedores relacionados
+WarningBillExist=Advertencia, una o más facturas ya existen
+MergingPDFTool=Fusionar herramienta PDF
+AmountPaymentDistributedOnInvoice=Importe de pago distribuido en la factura
+PaymentOnDifferentThirdBills=Permitir pagos en diferentes facturas de cliente/proveedor, pero la misma empresa matriz
+PaymentNote=Nota de pago
+ListOfPreviousSituationInvoices=Lista de facturas de situación anterior
+ListOfNextSituationInvoices=Lista de facturas de situación siguiente
+ListOfSituationInvoices=Lista de facturas de situación
+CurrentSituationTotal=Situación actual total
+FrequencyPer_d=Cada%s días
+FrequencyPer_m=Cada%s meses
+FrequencyPer_y=Todos los años
+FrequencyUnit=Unidad de frecuencia
+toolTipFrequency=Ejemplos: <b><b>Set 7, Día</b>: dar una nueva factura cada 7 días <br><b> Establecer 3, Mes </b>: dar una nueva factura cada 3 meses
+NextDateToExecution=Fecha para la próxima generación de facturas
+DateLastGeneration=Fecha de última generación
+MaxPeriodNumber=Max. número de generación de facturas
+NbOfGenerationDone=Número de generación de factura ya realizada
+NbOfGenerationDoneShort=Número de generación realizada
+MaxGenerationReached=Número máximo de generaciones alcanzadas
+GeneratedFromRecurringInvoice=Generado a partir de la plantilla de factura recurrente%s
+DateIsNotEnough=Fecha no alcanzada todavía
+InvoiceGeneratedFromTemplate=Factura%s generada a partir de la factura de plantilla recurrente%s
+GeneratedFromTemplate=Generado a partir de la factura de plantilla %s
+WarningInvoiceDateInFuture=Advertencia, la fecha de factura es superior a la fecha actual
+WarningInvoiceDateTooFarInFuture=Advertencia, la fecha de factura es demasiado lejos de la fecha actual
+PaymentConditionShortRECEP=Debido a la recepción
+PaymentConditionRECEP=Debido a la recepción
+PaymentConditionShort30D=30 dias
+PaymentCondition30D=30 dias
+PaymentConditionShort30DENDMONTH=30 días del final del mes
+PaymentCondition30DENDMONTH=Dentro de los 30 días siguientes al final del mes
+PaymentCondition60D=60 días
+PaymentConditionShort60DENDMONTH=60 días de fin de mes
+PaymentCondition60DENDMONTH=Dentro de los 60 días siguientes al final del mes
+PaymentConditionShortPT_DELIVERY=Entrega
+PaymentConditionPT_DELIVERY=En la entrega
+PaymentConditionPT_ORDER=En orden
+PaymentConditionPT_5050=50 %% por adelantado, 50 %% en la entrega
+PaymentConditionShort10DENDMONTH=10 días del final del mes
+PaymentCondition10DENDMONTH=Dentro de los 10 días siguientes al final del mes
+PaymentConditionShort14D=14 dias
+PaymentCondition14D=14 dias
+PaymentConditionShort14DENDMONTH=14 días del final del mes
+PaymentCondition14DENDMONTH=Dentro de los 14 días siguientes al final del mes
+FixAmount=Cantidad fija: 1 línea con la etiqueta '%s'
+VarAmount=Cantidad variable (%% tot.)
+VarAmountOneLine=Cantidad variable (%% total.) - 1 línea con la etiqueta '%s'
+VarAmountAllLines=Cantidad variable (%% tot.) - todas las mismas líneas
+PaymentTypePRE=Orden de pago por domiciliación bancaria
+PaymentTypeShortPRE=Orden de pago de débito
+PaymentTypeCB=Tarjeta de crédito
+PaymentTypeShortCB=Tarjeta de crédito
+PaymentTypeCHQ=Comprobar
+PaymentTypeShortCHQ=Comprobar
+PaymentTypeTIP=TIP (documentos contra pago)
+PaymentTypeShortTIP=Pago de TIP
+PaymentTypeTRA=giro bancario
+BankDetails=Detalles del banco
+BankCode=codigo bancario
+DeskCode=Código de sucursal
+BankAccountNumber=Número de cuenta
+BankAccountNumberKey=Suma de comprobación
+ExtraInfos=Más información
+RegulatedOn=Regulado en
+ChequeNumber=Verificar N °
+ChequeOrTransferNumber=N ° de cheque/transferencia
+ChequeBordereau=Ver calendario
+ChequeMaker=Comprobar/transferir el transmisor
+ChequeBank=Banco de Cheques
+CheckBank=Comprobar
+PhoneNumber=Teléfono
+PrettyLittleSentence=Aceptar el monto de los pagos debidos por cheques emitidos en mi nombre como Miembro de una asociación contable aprobada por la Administración Fiscal.
+IntracommunityVATNumber=ID de IVA intracomunitario
+PaymentByChequeOrderedTo=Los pagos de cheques (impuestos incluidos) se pagan a %s, enviar a
+PaymentByChequeOrderedToShort=Los pagos de cheques (impuestos incluidos) se pagan a
+PaymentByTransferOnThisBankAccount=Pago por transferencia a la siguiente cuenta bancaria
+VATIsNotUsedForInvoice=* IVA no aplicable art-293B de CGI
+LawApplicationPart2=la mercancía sigue siendo propiedad de
+LawApplicationPart3=El vendedor hasta el pago total de
+LawApplicationPart4=su precio.
+LimitedLiabilityCompanyCapital=SARL con Capital de
+UseDiscount=Utilizar descuento
+UseCredit=Utilizar crédito
+UseCreditNoteInInvoicePayment=Reducir la cantidad a pagar con este crédito
+MenuChequeDeposits=Depósitos de cheques
+MenuCheques=Cheques
+MenuChequesReceipts=Verificar recibos
+ChequesReceipts=Verificar recibos
+ChequesArea=Área de depósitos de cheques
+ChequeDeposits=Depósitos de cheques
+DepositId=Depósito de identificación
+CreditNoteConvertedIntoDiscount=Este%s se ha convertido en%s
+UsBillingContactAsIncoiveRecipientIfExist=Use el contacto/dirección con el tipo 'contacto de facturación' en lugar de la dirección de un tercero como destinatario de las facturas
+ShowUnpaidAll=Mostrar todas las facturas impagadas
+ShowUnpaidLateOnly=Mostrar facturas atrasadas no pagadas
+PaymentInvoiceRef=Factura de pago%s
+ValidateInvoices=Validar facturas
+Reported=Retrasado
+DisabledBecausePayments=No es posible ya que hay algunos pagos
+CantRemovePaymentWithOneInvoicePaid=No se puede eliminar el pago ya que hay al menos una factura clasificada como pagada
+ExpectedToPay=Pago esperado
+CantRemoveConciliatedPayment=No se puede eliminar el pago reconciliado
+PayedByThisPayment=Pago por este pago
+ClosePaidInvoicesAutomatically=Clasifique automáticamente todas las facturas estándar, de anticipo o de reemplazo como "Pagadas" cuando el pago se realice por completo.
+ClosePaidCreditNotesAutomatically=Clasifique automáticamente todas las notas de crédito como "Pagadas" cuando el reembolso se realice por completo.
+AllCompletelyPayedInvoiceWillBeClosed=Todas las facturas sin remanente a pagar se cerrarán automáticamente con el estado "Pagado".
+ToMakePayment=Paga
+ToMakePaymentBack=Pagar
+ListOfYourUnpaidInvoices=Lista de facturas impagadas
+NoteListOfYourUnpaidInvoices=Nota: Esta lista sólo contiene facturas para terceros a los que está vinculado como representante de ventas.
+RevenueStamp=Sello fiscal
+YouMustCreateInvoiceFromThird=Esta opción solo está disponible cuando se crea una factura desde la pestaña "Cliente" de un tercero
+YouMustCreateInvoiceFromSupplierThird=Esta opción solo está disponible cuando se crea una factura desde la pestaña "Proveedor" de terceros
+YouMustCreateStandardInvoiceFirstDesc=Primero debe crear una factura estándar y convertirla en "plantilla" para crear una nueva plantilla de factura
+PDFCrabeDescription=Factura PDF plantilla Crabe. Una plantilla de factura completa (implementación anterior de la plantilla Sponge)
+PDFSpongeDescription=Factura PDF plantilla de esponja. Una plantilla de factura completa.
+PDFCrevetteDescription=Plantilla de factura PDF Crevette. Una plantilla completa de facturas para facturas de situación
+TerreNumRefModelDesc1=Número de devolución con el formato%syymm-nnnn para facturas estándar y%syymm-nnnn para notas de crédito donde yy es año, mm es mes y nnnn es una secuencia sin interrupción y sin retorno a 0
+MarsNumRefModelDesc1=Número de devolución con el formato%syymm-nnnn para facturas estándar,%syymm-nnnn para facturas de reemplazo,%syymm-nnnn para facturas de pago inicial y%syymm-nnnn para notas de crédito donde yy es año, mm es mes y nnnn es una secuencia con sin descanso y sin retorno a 0
+TerreNumRefModelError=Un proyecto de ley que comienza con $ syymm ya existe y no es compatible con este modelo de secuencia. Eliminar o cambiar el nombre para activar este módulo.
+CactusNumRefModelDesc1=Número de devolución con el formato%syymm-nnnn para facturas estándar,%syymm-nnnn para notas de crédito y%syymm-nnnn para facturas de pago inicial donde yy es año, mm es mes y nnnn es una secuencia sin interrupción y sin retorno a 0
+TypeContact_facture_internal_SALESREPFOLL=Representante de seguimiento de factura de cliente
+TypeContact_facture_external_BILLING=Contacto de factura de cliente
+TypeContact_facture_external_SHIPPING=Contacto de envío del cliente
+TypeContact_facture_external_SERVICE=Contacto de servicio al cliente
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Representante de seguimiento de la factura del proveedor
+TypeContact_invoice_supplier_external_BILLING=Contacto de factura del vendedor
+TypeContact_invoice_supplier_external_SHIPPING=Contacto de envío del proveedor
+TypeContact_invoice_supplier_external_SERVICE=Contacto de servicio del proveedor
+InvoiceFirstSituationAsk=Primera factura de situación
+InvoiceFirstSituationDesc=Las <b> facturas de situación </b> están vinculadas a situaciones relacionadas con una progresión, por ejemplo, la progresión de una construcción. Cada situación está ligada a una factura.
+InvoiceSituationAsk=Factura tras la situación
+InvoiceSituationDesc=Crear una nueva situación después de una ya existente
+SituationAmount=Importe de la factura de la situación (neto)
+SituationDeduction=Sustracción de la situación
+CreateNextSituationInvoice=Crear la siguiente situación
+ErrorFindNextSituationInvoice=Error al no poder encontrar la referencia en el siguiente ciclo de situación
+ErrorOutingSituationInvoiceOnUpdate=No se puede publicar esta factura de situación.
+NotLastInCycle=Esta factura no es la última en ciclo y no debe ser modificada.
+DisabledBecauseNotLastInCycle=La siguiente situación ya existe.
+DisabledBecauseFinal=Esta situación es definitiva.
+situationInvoiceShortcode_AS=COMO
+situationInvoiceShortcode_S=D
+CantBeLessThanMinPercent=El progreso no puede ser menor que su valor en la situación anterior.
+NoSituations=No hay situaciones abiertas
+PDFCrevetteSituationNumber=Situación N °%s
+PDFCrevetteSituationInvoiceLineDecompte=Factura de situación - COUNT
+PDFCrevetteSituationInvoiceLine=Situación N ° %s: Inv. N ° %s en %s
+TotalSituationInvoice=Situación total
+invoiceLineProgressError=El avance de la línea de factura no puede ser mayor o igual que la siguiente línea de factura
+updatePriceNextInvoiceErrorUpdateline=Error: actualizar precio en línea de factura: %s
+ToCreateARecurringInvoice=Para crear una factura recurrente para este contrato, primero cree este proyecto de factura, luego convierta en una plantilla de factura y defina la frecuencia para la generación de futuras facturas.
+ToCreateARecurringInvoiceGene=Para generar facturas futuras de forma regular y manual, simplemente vaya al menú <strong>%s -%s -%s</strong>.
+ToCreateARecurringInvoiceGeneAuto=Si necesita que esas facturas se generen automáticamente, solicite a su administrador que habilite y configure el módulo <strong> %s </strong>. Tenga en cuenta que ambos métodos (manual y automático) se pueden usar juntos sin riesgo de duplicación.
+DeleteRepeatableInvoice=Eliminar factura de plantilla
+ConfirmDeleteRepeatableInvoice=¿Está seguro de que desea eliminar la factura de la plantilla?
+CreateOneBillByThird=Crear una factura por terceros (de lo contrario, una factura por pedido)
+BillCreated=%s facturas creadas
+AutoFillDateFrom=Establecer fecha de inicio para la línea de servicio con fecha de factura
+AutoFillDateFromShort=Establecer fecha de inicio
+AutoFillDateToShort=Establecer fecha de finalización
+MaxNumberOfGenerationReached=Número máximo de generación alcanzado
+BILL_DELETEInDolibarr=Se eliminó la factura
+BILL_SUPPLIER_DELETEInDolibarr=Factura de proveedor eliminada
diff --git a/htdocs/langs/es_EC/bookmarks.lang b/htdocs/langs/es_EC/bookmarks.lang
new file mode 100644
index 00000000000..19eb00c59c9
--- /dev/null
+++ b/htdocs/langs/es_EC/bookmarks.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - bookmarks
+AddThisPageToBookmarks=Añadir página actual a favoritos
+ListOfBookmarks=Lista de marcadores
+EditBookmarks=Mostrar/editar marcadores
+ShowBookmark=Mostrar marcador
+ReplaceWindow=Reemplazar pestaña actual
+BehaviourOnClick=Comportamiento al seleccionar una URL de marcador
+SetHereATitleForLink=Establecer un nombre para el marcador
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Utilice un enlace externo / absoluto (https://URL) o un enlace interno / relativo (/DOLIBARR_ROOT/htdocs/...)
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Elija si la página vinculada debe abrirse en la pestaña actual o en una pestaña nueva
+BookmarksManagement=Administración de marcadores
diff --git a/htdocs/langs/es_EC/boxes.lang b/htdocs/langs/es_EC/boxes.lang
new file mode 100644
index 00000000000..68072918006
--- /dev/null
+++ b/htdocs/langs/es_EC/boxes.lang
@@ -0,0 +1,77 @@
+# Dolibarr language file - Source file is en_US - boxes
+BoxLoginInformation=Información de inicio de sesión
+BoxLastRssInfos=Información RSS
+BoxLastProducts=Últimos Productos / Servicios %s
+BoxProductsAlertStock=Alertas de stock de productos
+BoxLastSupplierBills=Últimas facturas de proveedor
+BoxLastCustomerBills=Últimas facturas de clientes
+BoxOldestUnpaidCustomerBills=Las facturas de clientes no pagadas más antiguas
+BoxOldestUnpaidSupplierBills=Facturas de proveedores sin pagar más antiguas
+BoxLastProposals=Últimas propuestas comerciales
+BoxLastProspects=Últimas perspectivas modificadas
+BoxLastCustomers=Clientes más recientes
+BoxLastSuppliers=Los últimos proveedores modificados
+BoxLastCustomerOrders=Últimos pedidos de venta
+BoxLastMembers=Los últimos miembros
+BoxCurrentAccounts=Saldo de cuentas abiertas
+BoxTitleLastProducts=Productos / Servicios: last %s modificado
+BoxTitleLastModifiedSuppliers=Proveedores: último %s modificado
+BoxTitleLastModifiedCustomers=Clientes: último %s modificado
+BoxTitleLastCustomersOrProspects=Últimos %s clientes o prospectos
+BoxTitleLastCustomerBills=Las últimas facturas de clientes modificadas %s
+BoxTitleLastSupplierBills=Las últimas facturas de proveedor modificadas %s
+BoxTitleLastModifiedProspects=Perspectivas: última %s modificada
+BoxTitleLastModifiedMembers=Ultimos %s miembros más recientes
+BoxTitleOldestUnpaidCustomerBills=Facturas de clientes: más antiguas sin pagar %s
+BoxTitleOldestUnpaidSupplierBills=Facturas de proveedores: el más antiguo %s sin pagar
+BoxTitleSupplierOrdersAwaitingReception=Pedidos de proveedores en espera de recepción
+BoxTitleLastModifiedContacts=Contactos / Direcciones: última %s modificada
+BoxMyLastBookmarks=Marcadores: último %s
+BoxOldestExpiredServices=Servicios expirados más antiguos
+BoxLastExpiredServices=Últimos %s contactos más antiguos con servicios activos expirados
+BoxTitleLastActionsToDo=Últimas %s acciones para hacer
+BoxTitleLatestModifiedBoms=Últimas BOMs modificadas %s
+BoxTitleLatestModifiedMos=Últimas órdenes de fabricación modificadas %s
+BoxGlobalActivity=Actividad global (facturas, propuestas, pedidos)
+BoxTitleGoodCustomers=%s Buenos clientes
+FailedToRefreshDataInfoNotUpToDate=Error al actualizar el flujo de RSS. Última fecha de actualización exitosa: %s
+LastRefreshDate=Fecha de actualización más reciente
+NoRecordedBookmarks=No se han definido marcadores.
+ClickToAdd=Haga clic aquí para agregar.
+NoRecordedCustomers=No hay clientes registrados
+NoRecordedContacts=No hay contactos registrados
+NoActionsToDo=No hay acciones que hacer
+NoRecordedOrders=No hay pedidos de venta registrados
+NoRecordedProposals=No hay propuestas registradas
+NoRecordedInvoices=No hay facturas de clientes registradas
+NoUnpaidCustomerBills=Sin facturas de clientes no pagadas
+NoUnpaidSupplierBills=No hay facturas de proveedor sin pagar
+NoModifiedSupplierBills=No hay facturas de proveedor registradas
+NoRecordedProducts=No hay productos/servicios registrados
+NoRecordedProspects=No hay perspectivas registradas
+NoContractedProducts=No hay productos/servicios contratados
+NoRecordedContracts=No hay contratos registrados
+NoRecordedInterventions=No hay intervenciones registradas
+BoxLatestSupplierOrders=Últimas órdenes de compra
+BoxLatestSupplierOrdersAwaitingReception=Últimas órdenes de compra (con una recepción pendiente)
+NoSupplierOrder=No hay orden de compra registrada
+BoxCustomersInvoicesPerMonth=Facturas de clientes por mes
+BoxCustomersOrdersPerMonth=Pedidos de ventas por mes
+BoxSuppliersOrdersPerMonth=Pedidos de proveedores por mes
+BoxProposalsPerMonth=Propuestas al mes
+NoTooLowStockProducts=Ningún producto está bajo el límite de stock bajo
+BoxProductDistribution=Productos / Servicios de Distribución.
+BoxTitleLastModifiedSupplierBills=Facturas de proveedores: última modificación de %s
+BoxTitleLatestModifiedSupplierOrders=Pedidos de proveedores: última modificación de %s
+BoxTitleLastModifiedCustomerBills=Facturas del cliente: última %s modificada
+BoxTitleLastModifiedCustomerOrders=Pedidos de ventas: última modificación de %s
+BoxTitleLastModifiedPropals=Últimas propuestas modificadas%s
+ForCustomersInvoices=Facturas de clientes
+ForProposals=Propuestas
+ChooseBoxToAdd=Añadir widget a tu panel de control
+BoxAdded=Widget fue agregado en tu panel de control
+NoRecordedManualEntries=No hay registros de entradas manuales en contabilidad
+BoxSuspenseAccount=Cuenta la operación de contabilidad con cuenta de suspenso
+BoxLastCustomerShipments=Últimos envíos de clientes
+BoxTitleLastCustomerShipments=Últimos envíos de clientes %s
+NoRecordedShipments=No se registraron envíos de clientes
diff --git a/htdocs/langs/es_EC/cashdesk.lang b/htdocs/langs/es_EC/cashdesk.lang
new file mode 100644
index 00000000000..689ad03abb7
--- /dev/null
+++ b/htdocs/langs/es_EC/cashdesk.lang
@@ -0,0 +1,71 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+CashDeskMenu=Punto de venta
+CashDesk=Punto de venta
+CashDeskBankCash=Cuenta bancaria (en efectivo)
+CashDeskBankCB=Cuenta bancaria (tarjeta)
+CashDeskBankCheque=Cuenta bancaria (cheque)
+CashdeskShowServices=Servicios de venta
+CashDeskOn=en
+CashDeskThirdParty=Cliente/Proveedor
+ShoppingCart=Carrito de compras
+RestartSelling=Volver a vender
+SellFinished=Venta completa
+PrintTicket=Imprimir ticket
+SendTicket=Enviar ticket
+NoProductFound=No se encontró ningún artículo
+NoArticle=Sin artículo
+TotalTicket=Ticket total
+NoVAT=No hay IVA para esta venta
+Change=Exceso recibido
+BankToPay=Cuenta para el pago
+ShowCompany=Mostrar empresa
+ShowStock=Mostrar almacén
+DeleteArticle=Haga clic para eliminar este artículo
+FilterRefOrLabelOrBC=Buscar (Ref/Etiqueta)
+UserNeedPermissionToEditStockToUsePos=Solicita disminuir el stock en la creación de facturas, por lo que el usuario que usa POS debe tener permiso para editar el stock.
+DolibarrReceiptPrinter=Dolibarr Impresora de recibos
+PointOfSale=Punto de venta
+TakeposConnectorNecesary=Se requiere 'conector TakePOS'
+Receipt=Recibo
+Header=Encabezado
+Footer=Pie de página
+AmountAtEndOfPeriod=Cantidad al final del período (día, mes o año)
+TheoricalAmount=Cantidad teórica
+RealAmount=Cantidad real
+CashFence=Valla de efectivo
+CashFenceDone=Cerca de efectivo hecha para el período.
+NbOfInvoices=Nb de facturas
+Paymentnumpad=Tipo de Pad para ingresar el pago
+Numberspad=Pad de números
+BillsCoinsPad=Pad de monedas y billetes
+TakeposNeedsCategories=TakePOS necesita categorías de productos para funcionar
+CashDeskBankAccountFor=Cuenta predeterminada para usar para pagos en
+NoPaimementModesDefined=No hay modo de pavimento definido en la configuración de TakePOS
+TicketVatGrouped=IVA grupal por tasa en tickets recibos
+AutoPrintTickets=Imprimir automáticamente tickets / recibos
+PrintCustomerOnReceipts=Imprimir al cliente en boletos / recibos
+EnableBarOrRestaurantFeatures=Habilitar funciones para bar o restaurante
+ConfirmDeletionOfThisPOSSale=¿Confirma la eliminación de esta venta actual?
+ConfirmDiscardOfThisPOSSale=¿Quieres descartar esta venta actual?
+History=Historia
+BasicPhoneLayout=Usar diseño básico para teléfonos
+DirectPaymentButton=Botón de pago directo en efectivo
+Colorful=Vistoso
+SortProductField=Campo para clasificar productos
+BrowserMethodDescription=Impresión de recibos simple y fácil. Solo unos pocos parámetros para configurar el recibo. Imprimir a través del navegador.
+TakeposConnectorMethodDescription=Módulo externo con características adicionales. Posibilidad de imprimir desde la nube.
+PrintMethod=Método de impresión
+ReceiptPrinterMethodDescription=Método potente con muchos parámetros. Completamente personalizable con plantillas. No se puede imprimir desde la nube.
+ByTerminal=Por terminal
+TakeposNumpadUsePaymentIcon=Usar icono de pago en el teclado numérico
+CashDeskRefNumberingModules=Módulo de numeración para ventas POS
+CashDeskGenericMaskCodes6 =<br><b>{TN} </b>la etiqueta se usa para agregar el número de terminal
+TakeposGroupSameProduct=Agrupar las mismas líneas de productos
+StartAParallelSale=Comience una nueva venta paralela
+ControlCashOpening=Control de caja en la posición de apertura
+CloseCashFence=Cerca de efectivo
+CashReport=Informe de caja
+MainPrinterToUse=Impresora principal para usar
+OrderPrinterToUse=Solicitar impresora para usar
+MainTemplateToUse=Plantilla principal para usar
+OrderTemplateToUse=Plantilla de pedido para usar
diff --git a/htdocs/langs/es_EC/categories.lang b/htdocs/langs/es_EC/categories.lang
new file mode 100644
index 00000000000..1c15391eea7
--- /dev/null
+++ b/htdocs/langs/es_EC/categories.lang
@@ -0,0 +1,60 @@
+# Dolibarr language file - Source file is en_US - categories
+Rubriques=Etiquetas/Categorías
+NoCategoryYet=No se ha creado ninguna etiqueta/categoría de este tipo
+AddIn=Añadir
+CategoriesArea=Etiquetas/Categorías área
+ProductsCategoriesArea=Área de etiquetas/categorías de productos/servicios
+SuppliersCategoriesArea=Área de etiquetas / categorías de proveedores
+CustomersCategoriesArea=Categorías de etiquetas/categorías de clientes
+MembersCategoriesArea=Miembros tags/categories area
+ContactsCategoriesArea=Zona de etiquetas/categorías de contactos
+AccountsCategoriesArea=Cuentas tags/categories area
+ProjectsCategoriesArea=Área de etiquetas/categorías de proyectos
+UsersCategoriesArea=Etiquetas de usuarios / área de categorías
+CatList=Lista de etiquetas/categorías
+CreateThisCat=Crea esta etiqueta/categoría
+NoSubCat=No subcategoría.
+FoundCats=Etiquetas/categorías encontradas
+ImpossibleAddCat=Imposible agregar la etiqueta/categoría%s
+WasAddedSuccessfully=<b>%s</b> se agregó correctamente.
+ObjectAlreadyLinkedToCategory=El elemento ya está vinculado a esta etiqueta/categoría.
+ProductIsInCategories=El producto/servicio está vinculado a las siguientes etiquetas/categorías
+CompanyIsInCustomersCategories=Este tercero está vinculado a los siguientes clientes/posibles etiquetas/categorías
+CompanyIsInSuppliersCategories=Este tercero está vinculado a las siguientes etiquetas / categorías de proveedores
+MemberIsInCategories=Este miembro está enlazado a los siguientes miembros tags/categories
+ContactIsInCategories=Este contacto está vinculado a los siguientes contactos tags/categories
+ProductHasNoCategory=Este producto/servicio no está en ninguna etiquetas/categorías
+CompanyHasNoCategory=Este tercero no está en ninguna etiqueta/categoría
+MemberHasNoCategory=Este miembro no está en ninguna de las etiquetas/categorías
+ContactHasNoCategory=Este contacto no aparece en ninguna etiqueta/categoría
+ProjectHasNoCategory=Este proyecto no está en ninguna etiqueta/categoría
+ClassifyInCategory=Añadir a etiqueta/categoría
+CategoryExistsAtSameLevel=Esta categoría ya existe con esta referencia
+ConfirmDeleteCategory=¿Estás seguro de que quieres eliminar esta etiqueta/categoría?
+SuppliersCategoryShort=Etiqueta / categoría de proveedores
+CustomersCategoryShort=Etiqueta de los clientes/categoría
+ProductsCategoryShort=Productos tag/category
+MembersCategoryShort=Miembros tag/category
+SuppliersCategoriesShort=Etiquetas / categorías de proveedores
+ProspectsCategoriesShort=Etiquetas/categorías de las perspectivas
+CustomersProspectsCategoriesShort=Cust./Prosp. etiquetas / categorías
+ProductsCategoriesShort=Productos etiquetas/categorías
+MembersCategoriesShort=Etiquetas/categorías de los miembros
+AccountsCategoriesShort=Etiquetas/categorías de cuentas
+ProjectsCategoriesShort=Proyectos etiquetas/categorías
+UsersCategoriesShort=Etiquetas/categorías de usuarios
+StockCategoriesShort=Etiquetas / categorías de almacén
+CategId=ID de etiqueta/categoría
+CatSupList=Lista de etiquetas / categorías de proveedores
+CatCusList=Lista de etiquetas/categorías de cliente/prospecto
+CatProdList=Lista de productos etiquetas/categorías
+CatMemberList=Lista de miembros tags/categories
+CatContactList=Lista de etiquetas/categorías de contacto
+CatCusLinks=Enlaces entre clientes/prospectos y etiquetas/categorías
+CatContactsLinks=Enlaces entre contactos / direcciones y etiquetas / categorías
+ExtraFieldsCategories=Atributos complementarios
+CategorieRecursiv=Vincular automáticamente con la etiqueta/categoría principal
+AddProductServiceIntoCategory=Agregue el siguiente producto/servicio
+ChooseCategory=Elegir la categoría
+StocksCategoriesArea=Área de Categorías de Almacenes
+ActionCommCategoriesArea=Área de Categorías de Eventos
diff --git a/htdocs/langs/es_EC/commercial.lang b/htdocs/langs/es_EC/commercial.lang
new file mode 100644
index 00000000000..85789b47b39
--- /dev/null
+++ b/htdocs/langs/es_EC/commercial.lang
@@ -0,0 +1,65 @@
+# Dolibarr language file - Source file is en_US - commercial
+Commercial=Comercio
+CommercialArea=Área de comercio
+Prospects=Prospectos
+AddActionRendezVous=Crear un evento Rendez-vous
+ConfirmDeleteAction=¿Seguro que quieres eliminar este evento?
+CardAction=Tarjeta de evento
+ActionOnCompany=Compañía vinculada
+TaskRDVWith=Reunión con%s
+ShowTask=Mostrar tarea
+ShowAction=Mostrar evento
+ThirdPartiesOfSaleRepresentative=Cliente/Proveedor con representante de ventas
+SaleRepresentativesOfThirdParty=Representantes de ventas de cliente/proveedor
+SalesRepresentative=Representante de ventas
+SalesRepresentatives=Representantes de ventas
+SalesRepresentativeFollowUp=Representante de ventas (seguimiento)
+SalesRepresentativeSignature=Representante de ventas (firma)
+NoSalesRepresentativeAffected=Ningún representante de ventas asignado
+ShowCustomer=Mostrar cliente
+ShowProspect=Mostrar perspectiva
+ListOfProspects=Lista de prospectos
+ListOfCustomers=Lista de clientes
+LastDoneTasks=Últimas acciones%s completadas
+LastActionsToDo=Acciones%s no completadas más antiguas
+DoneAndToDoActions=Eventos Completos y Por hacer
+DoneActions=Eventos terminados
+ToDoActions=Eventos incompletos
+SendPropalRef=Presentación de la propuesta comercial%s
+SendOrderRef=Presentación de la orden%s
+StatusNotApplicable=No aplica
+StatusActionToDo=Que hacer
+StatusActionDone=Completar
+StatusActionInProcess=En proceso
+TasksHistoryForThisContact=Eventos para este contacto
+LastProspectDoNotContact=Sin contacto
+LastProspectNeverContacted=Nunca contactado
+LastProspectToContact=Contactar
+LastProspectContactInProcess=Contacto en proceso
+LastProspectContactDone=Contacto hecho
+ActionDoneBy=Evento realizado por
+ActionAC_FAX=Enviar fax
+ActionAC_PROP=Enviar propuesta por correo
+ActionAC_EMAIL=Enviar correo electrónico
+ActionAC_EMAIL_IN=Recepción de correo electrónico
+ActionAC_RDV=Reuniones
+ActionAC_INT=Intervención en el sitio
+ActionAC_FAC=Envíe la factura del cliente por correo
+ActionAC_REL=Envíe la factura del cliente por correo (recordatorio)
+ActionAC_CLO=Cerrado
+ActionAC_EMAILING=Enviar correo electrónico masivo
+ActionAC_COM=Enviar pedido de ventas por correo
+ActionAC_SHIP=Enviar envío por correo
+ActionAC_SUP_ORD=Enviar pedido de compra por correo
+ActionAC_SUP_INV=Enviar la factura del proveedor por correo
+ActionAC_OTH=Otro
+ActionAC_OTH_AUTO=Eventos insertados automáticamente
+ActionAC_MANUAL=Eventos insertados manualmente
+ActionAC_AUTO=Eventos insertados automáticamente
+ActionAC_OTH_AUTOShort=Automático
+Stats=Estadísticas de ventas
+StatusProsp=Estado del prospecto
+DraftPropals=Proyecto de propuestas comerciales
+WelcomeOnOnlineSignaturePage=Bienvenido a la página para aceptar propuestas comerciales de %s
+ThisScreenAllowsYouToSignDocFrom=Esta pantalla le permite aceptar y firmar, o rechazar, una propuesta de cotización/comercial
+SignatureProposalRef=Firma de cotización/propuesta comercial %s.
diff --git a/htdocs/langs/es_EC/companies.lang b/htdocs/langs/es_EC/companies.lang
new file mode 100644
index 00000000000..6d6fffcf7d9
--- /dev/null
+++ b/htdocs/langs/es_EC/companies.lang
@@ -0,0 +1,278 @@
+# Dolibarr language file - Source file is en_US - companies
+ErrorCompanyNameAlreadyExists=El nombre de la empresa %s ya existe. Elija otro.
+ErrorSetACountryFirst=Establecer primero el país
+SelectThirdParty=Seleccione un cliente/proveedor
+ConfirmDeleteCompany=¿Está seguro de que desea eliminar esta empresa y toda la información heredada?
+DeleteContact=Eliminar un contacto / dirección
+ConfirmDeleteContact=¿Está seguro de que desea eliminar este contacto y toda la información heredada?
+MenuNewThirdParty=Nuevo Cliente/Proveedore
+MenuNewProspect=Nuevo prospecto
+NewCompany=Nueva compañía (prospecto, cliente, vendedor)
+NewThirdParty=Nuevo tercero (prospecto, cliente, proveedor)
+CreateDolibarrThirdPartySupplier=Crear un tercero (vendedor/proveedor)
+CreateThirdPartyOnly=Crear clientes/proveedors
+CreateThirdPartyAndContact=Crear un cliente/proveedor + un contacto
+ProspectionArea=Área de Prospección
+IdThirdParty=ID cliente/proveedor
+IdCompany=ID de la compañía
+IdContact=ID de contacto
+Contacts=Contactos / Direcciones
+ThirdPartyContacts=Contactos de cliente/proveedor
+ThirdPartyContact=Contacto / dirección de cliente/proveedor
+CompanyName=Nombre de empresa
+AliasNames=Nombre de alias (comercial, marca registrada, ...)
+Companies=Compañías
+CountryIsInEEC=El país está dentro de la Comunidad Económica Europea.
+PriceFormatInCurrentLanguage=Formato de visualización de precios en el idioma y moneda actuales
+ThirdPartyName=Nombre de un cliente/proveedor
+ThirdPartyEmail=Correo electrónico de cliente/proveedor
+ThirdParty=Cliente/Proveedor
+ThirdParties=Clientes/Proveedors
+ThirdPartyProspects=Prospecto
+ThirdPartyProspectsStats=Prospecto
+ThirdPartyCustomersWithIdProf12=Clientes con %s o %s
+ThirdPartySuppliers=Vendedores/Proveedores
+ThirdPartyType=Tipo de cliente/proveedor
+Individual=Individuo privado
+ToCreateContactWithSameName=Creará automáticamente un contacto / dirección con la misma información que el cliente/proveedor bajo el cliente/proveedor. En la mayoría de los casos, incluso si su cliente/proveedor es una persona física, basta con crear un cliente/proveedor.
+ParentCompany=Empresa matriz
+Subsidiaries=Sucursales
+CivilityCode=Código civil - RUC
+RegisteredOffice=Oficina registrada
+Lastname=Apellido
+PostOrFunction=Cargo
+UserTitle=Título
+NatureOfThirdParty=Naturaleza del cliente/proveedor
+StateCode=Código de estado / provincia
+StateShort=Provincia
+Region-State=Región - Provincia
+CountryCode=Código de país
+CountryId=ID del país
+Call=Llamada
+PhonePro=Teléfono Trabajo
+PhonePerso=Teléfono Personal
+PhoneMobile=Celular
+No_Email=Rechazar correos masivos
+Town=Ciudad
+Poste=Posición
+VATIsUsed=Impuesto a las ventas utilizado
+VATIsUsedWhenSelling=Esto define si este tercero incluye un impuesto a la venta o no cuando realiza una factura a sus propios clientes.
+VATIsNotUsed=Impuesto a las ventas no utilizado
+CopyAddressFromSoc=Copiar dirección de detalles de cliente/proveedor
+ThirdpartyNotCustomerNotSupplierSoNoRef=Ni cliente, Ni vendedor, no hay objetos de referencia disponibles.
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Cliente/Proveedor, ni cliente ni vendedor, los descuentos no están disponibles.
+OverAllProposals=Propuestas
+OverAllSupplierProposals=Solicitudes de precios
+LocalTax1IsUsed=Utilice el segundo impuesto
+LocalTax1IsUsedES=RE se utiliza
+LocalTax1IsNotUsedES=RE no se utiliza
+LocalTax2IsUsed=Utilizar tercer impuesto
+LocalTax2IsUsedES=IRPF se utiliza
+LocalTax2IsNotUsedES=IRPF no se utiliza
+WrongCustomerCode=Código de cliente inválido
+WrongSupplierCode=Código de proveedor no válido
+CustomerCodeModel=Modelo de código de cliente
+SupplierCodeModel=Modelo de código de proveedor
+ProfId1Short=ID Prof. 1
+ProfId2Short=ID Prof. 2
+ProfId3Short=ID Prof. 3
+ProfId4Short=ID Prof. 4
+ProfId5Short=ID Prof. 5
+ProfId6Short=ID Prof. 6
+ProfId1=ID Profesional 1
+ProfId2=ID Profesional 2
+ProfId3=ID Profesional 3
+ProfId4=ID Profesional 4
+ProfId5=ID Profesional 5
+ProfId6=ID Profesional 6
+ProfId1AR=ID Prof. 1 (CUIT / CUIL)
+ProfId2AR=ID Prof. 2 (Ingresos brutos)
+ProfId1AT=ID Prof. 1 (USt.-IdNr)
+ProfId2AT=ID Prof. 2 (USt.-Nr)
+ProfId3AT=ID Prof. 3 (Número de registro comercial)
+ProfId1AU=ID Prof. 1 (ABN)
+ProfId1BE=ID Prof. 1 (Número profesional)
+ProfId2BR=IE (Inscripción Estadística)
+ProfId3BR=IM (Inscripción Municipal)
+ProfId3CH=ID Prof. 1 (Federal number)
+ProfId4CH=ID Prof. 2 (Commercial Record number)
+ProfId1CL=ID Prof. 1 (R.U.T.)
+ProfId1CO=ID Prof. 1 (R.U.T.)
+ProfId1DE=ID Prof. 1 (USt.-IdNr)
+ProfId2DE=ID Prof. 2 (USt.-Nr)
+ProfId3DE=ID Prof. 3 (Número de registro comercial)
+ProfId1ES=ID Prof. 1 (CIF/NIF)
+ProfId2ES=ID Prof. 2 (Número de seguridad social)
+ProfId3ES=ID Prof. 3 (CNAE)
+ProfId4ES=ID Prof. 4 (Número colegiado)
+ProfId1FR=ID Prof. 1 (SIREN)
+ProfId2FR=ID Prof. 2 (SIRET)
+ProfId3FR=ID Prof. 3 (NAF, old APE)
+ProfId4FR=ID Prof. 4 (RCS/RM)
+ProfId1GB=Número de registro
+ProfId1HN=ID prof. 1 (RTN)
+ProfId1IN=ID Prof. 1 (TIN)
+ProfId2IN=ID Prof. 2 (PAN)
+ProfId3IN=ID Prof. 3 (SRVC TAX)
+ProfId4IN=ID Prof. 4
+ProfId5IN=ID Prof. 5
+ProfId1LU=ID Prof. 1 (R.C.S. Luxembourg)
+ProfId2LU=ID Prof. 2 (Permiso de negocio)
+ProfId5MA=ID Prof. 5 (I.C.E.)
+ProfId1MX=ID Prof. 1 (R.F.C).
+ProfId2MX=ID Prof. 2 (R..P. IMSS)
+ProfId3MX=ID Prof. 3 (Profesional Charter)
+ProfId4NL=Número de Servicio Ciudadano (BSN)
+ProfId1PT=ID Prof. 1 (NIPC)
+ProfId2PT=ID Prof. 2 (Número de seguridad social)
+ProfId3PT=ID Prof. 3 (Número de registro comercial)
+ProfId4PT=ID Prof. 4 (Conservatorio)
+ProfId1TN=ID Prof. 1 (RC)
+ProfId2TN=ID Prof. 2 (Número de registro fiscal)
+ProfId3TN=ID Prof. 3 (Código aduanero)
+ProfId4TN=ID Prof. 4 (BAN)
+ProfId1US=Id del Prof (FEIN)
+ProfId1RO=Id profesional 1 (CUI)
+ProfId2RO=Id profesional 2 (Nr. Înmatriculare)
+ProfId3RO=Id profesional 3 (CAEN)
+ProfId5RO=Id profesional 5 (EUID)
+ProfId1RU=ID Prof. 1 (OGRN)
+ProfId2RU=ID Prof. 2 (INN)
+ProfId3RU=ID Prof. 3 (KPP)
+ProfId4RU=ID Prof. 4 (OKPO)
+VATIntra=ID de IVA
+VATIntraShort=ID de IVA
+VATIntraSyntaxIsValid=La sintaxis es válida
+VATReturn=Devolución del IVA
+ProspectCustomer=Prospecto / Cliente
+CustomerCard=Tarjeta de cliente
+CustomerRelativeDiscount=Descuento relativo del cliente
+SupplierRelativeDiscount=Descuento relativo del vendedor
+CustomerAbsoluteDiscountShort=Descuento absoluto
+CompanyHasRelativeDiscount=Este cliente tiene un descuento predeterminado de <b>%s%%</b>
+CompanyHasNoRelativeDiscount=Este cliente no tiene descuento relativo por defecto
+HasRelativeDiscountFromSupplier=Tiene un descuento predeterminado de <b> %s%% </b> de este proveedor
+HasNoRelativeDiscountFromSupplier=No tiene un descuento relativo predeterminado de este proveedor.
+CompanyHasAbsoluteDiscount=Este cliente tiene descuentos disponibles (notas de créditos o anticipos) para <b>%s</b>%s
+CompanyHasDownPaymentOrCommercialDiscount=Este cliente tiene descuentos disponibles (comerciales, anticipos) para <b>%s</b>%s
+CompanyHasCreditNote=Este cliente todavía tiene notas de crédito para <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=No tiene crédito de descuento disponible de este proveedor
+HasAbsoluteDiscountFromSupplier=Tiene descuentos disponibles (notas de crédito o anticipos) para <b> %s </b> %s de este proveedor
+HasDownPaymentOrCommercialDiscountFromSupplier=Tiene descuentos disponibles (comerciales, pagos iniciales) para <b> %s </b> %s de este proveedor
+HasCreditNoteFromSupplier=Tiene notas de crédito para <b> %s </b> %s de este proveedor
+CompanyHasNoAbsoluteDiscount=Este cliente no tiene crédito de descuento disponible
+CustomerAbsoluteDiscountAllUsers=Descuentos totales de clientes (concedidos por todos los usuarios)
+CustomerAbsoluteDiscountMy=Descuentos totales de clientes (otorgados por usted)
+SupplierAbsoluteDiscountAllUsers=Descuentos absolutos de proveedores (ingresados por todos los usuarios)
+SupplierAbsoluteDiscountMy=Descuentos absolutos de proveedores (ingresados por usted mismo)
+ContactId=ID de contacto
+NoContactDefinedForThirdParty=Ningún contacto definido para este cliente/proveedor
+DefaultContact=Dirección/contacto predeterminado
+ContactByDefaultFor=Contacto / dirección predeterminados para
+AddThirdParty=Crear cliente/proveedor
+AccountancyCode=Cuenta de contabilidad
+CustomerCode=Código de cliente
+SupplierCode=Código de proveedor
+CustomerCodeShort=Código de cliente
+SupplierCodeShort=Código de proveedor
+CustomerCodeDesc=Código de cliente, único para todos los clientes.
+SupplierCodeDesc=Código de proveedor, único para todos los proveedores
+RequiredIfCustomer=Requerido si un cliente/proveedor es un cliente o un cliente potencial
+RequiredIfSupplier=Requerido si un tercero es un vendedor
+ValidityControledByModule=Validez controlada por módulo
+ProspectToContact=Prospecto para contactar
+CompanyDeleted=Empresa "%s" eliminada de la base de datos.
+ListOfContacts=Lista de contactos / direcciones
+ListOfContactsAddresses=Lista de contactos / direcciones
+ListOfThirdParties=Lista de cliente/proveedor
+ShowContact=Dirección de contacto
+ContactsAllShort=Todos (Sin filtro)
+ContactType=Tipo de Contacto
+ContactForOrders=Contacto del pedido
+ContactForOrdersOrShipments=Contacto de los pedidos o envíos
+ContactForProposals=Contacto de la propuesta
+ContactForContracts=Contacto del contrato
+ContactForInvoices=Contacto de la factura
+NoContactForAnyOrder=Este contacto no es un contacto para ningún pedido
+NoContactForAnyOrderOrShipments=Este contacto no es un contacto para ningún pedido o envío
+NoContactForAnyProposal=Este contacto no es un contacto para ninguna propuesta comercial
+NoContactForAnyContract=Este contacto no es un contacto para ningún contrato
+NoContactForAnyInvoice=Este contacto no es un contacto para ninguna factura
+NewContactAddress=Nuevo contacto/dirección
+EditCompany=Editar empresa
+ThisUserIsNot=Este usuario no es un prospecto, cliente o vendedor.
+VATIntraCheck=Comprobar
+VATIntraCheckDesc=La identificación del IVA debe incluir el prefijo del país. El enlace <b> %s </b> utiliza el servicio de verificación de IVA europeo (VIES) que requiere acceso a Internet desde el servidor Dolibarr.
+VATIntraCheckURL=Http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckableOnEUSite=Consulte el ID de IVA intracomunitario en el sitio web de la Comisión Europea
+VATIntraManualCheck=También puede consultar manualmente en el sitio web de la Comisión Europea. <a href="%s" target="_blank">%s</a>
+ErrorVATCheckMS_UNAVAILABLE=No es posible el chequeo. El servicio de chequeo no es proporcionado por el estado miembro (%s).
+NorProspectNorCustomer=No prospecto, ni cliente
+JuridicalStatus=Tipo de entidad jurídica
+ProspectLevel=Prospecto potencial
+OthersNotLinkedToThirdParty=Otros, no vinculados a cliente/proveedor
+ProspectStatus=Estado del prospecto
+PL_NONE=Ninguna
+TE_STARTUP=Puesta en marcha
+TE_GROUP=Empresa grande
+TE_MEDIUM=Empresa mediana
+TE_ADMIN=Gubernamental
+TE_SMALL=Empresa pequeña
+TE_RETAIL=Al por menor
+TE_PRIVATE=Privado
+StatusProspect1=Para ser contactado
+StatusProspect2=Contacto en proceso
+StatusProspect3=Contacto hecho
+ChangeDoNotContact=Cambiar estado a 'No contactar'
+ChangeNeverContacted=Cambiar estado a 'Nunca contactado'
+ChangeToContact=Cambiar estado a 'Para ser contactado'
+ChangeContactInProcess=Cambiar estado a 'Contacto en proceso'
+ChangeContactDone=Cambiar estado a 'Contacto hecho'
+ProspectsByStatus=Prospecto por estatus
+ExportCardToFormat=Exportar la tarjeta al formato
+ContactNotLinkedToCompany=Contacto no vinculado a cliente/proveedor
+DolibarrLogin=Dolibarr inicio de sesión
+NoDolibarrAccess=No hay acceso a Dolibarr
+ExportDataset_company_1=Terceros (empresas / fundaciones / personas físicas) y sus propiedades.
+ExportDataset_company_2=Contactos y sus propiedades.
+ImportDataset_company_2=Contactos / direcciones adicionales de terceros y atributos
+ImportDataset_company_4=Representantes de ventas de terceros (asignar representantes de ventas / usuarios a empresas)
+PriceLevelLabels=Etiquetas de nivel de precio
+DeliveryAddress=Dirección de entrega
+SupplierCategory=Categoría del vendedor
+DeleteFile=Borrar archivo
+ConfirmDeleteFile=¿Estás seguro de que quieres eliminar este archivo?
+AllocateCommercial=Asignado al representante de ventas
+Organization=Organización
+FiscalYearInformation=Año fiscal
+FiscalMonthStart=Mes de inicio del ejercicio del año fiscal
+YouMustAssignUserMailFirst=Debe crear un correo electrónico para este usuario antes de poder agregar una notificación por correo electrónico.
+YouMustCreateContactFirst=Para poder agregar notificaciones por correo electrónico, primero debe definir contactos con correos electrónicos válidos para los cliente/proveedor
+ListSuppliersShort=Lista de proveedores
+ListProspectsShort=Lista de prospectos
+ListCustomersShort=Lista de clientes
+ThirdPartiesArea=Clientes/Proveedores y Contactos
+LastModifiedThirdParties=Últimos %s clientes/proveedores modificados
+UniqueThirdParties=Total de clientes/proveedores
+InActivity=Abierto
+ThirdPartyIsClosed=El clientes/proveedores está cerrado
+ProductsIntoElements=Lista de productos / servicios en %s
+CurrentOutstandingBill=Factura actual pendiente
+OutstandingBill=Max. Por factura pendiente
+OutstandingBillReached=Max. Para la factura pendiente alcanzada
+OrderMinAmount=Monto mínimo para la orden
+MonkeyNumRefModelDesc=Devuelva un número con el formato %syymm-nnnn para el código de cliente y %syymm-nnnn para el código de proveedor donde yy es año, mm es mes y nnnn es una secuencia sin interrupción y sin retorno a 0.
+LeopardNumRefModelDesc=El código es gratuito. Este código se puede modificar en cualquier momento.
+ManagingDirectors=Nombre del Gerente(s) (CEO, director, presidente ...)
+MergeOriginThirdparty=Duplicar clientes/proveedores (clientes/proveedores que desea eliminar)
+MergeThirdparties=Combinar clientes/proveedores
+ConfirmMergeThirdparties=¿Está seguro de que desea fusionar este cliente/proveedor con el actual? Todos los objetos vinculados (facturas, pedidos, ...) se moverán al cliente/proveedor actual, luego se eliminará el cliente/proveedor.
+ThirdpartiesMergeSuccess=Los clientes/proveedores se han fusionado
+SaleRepresentativeLogin=Inicio de sesión del representante de ventas
+SaleRepresentativeFirstname=Nombre del representante de ventas
+SaleRepresentativeLastname=Apellido del representante de ventas
+ErrorThirdpartiesMerge=Hubo un error al eliminar los clientes/proveedores. Por favor revise el registro. Los cambios han sido revertidos.
+KeepEmptyIfGenericAddress=Mantenga este campo vacío si esta dirección es una dirección genérica
+PaymentTermsSupplier=Plazo de pago - Vendedor
+MulticurrencyUsed=Usar monedas múltiples
+MulticurrencyCurrency=Moneda
diff --git a/htdocs/langs/es_EC/compta.lang b/htdocs/langs/es_EC/compta.lang
new file mode 100644
index 00000000000..d89eb2e1e4d
--- /dev/null
+++ b/htdocs/langs/es_EC/compta.lang
@@ -0,0 +1,227 @@
+# Dolibarr language file - Source file is en_US - compta
+MenuFinancial=Facturación | Pago
+TaxModuleSetupToModifyRules=Vaya a <a href="%s"> Configuración del módulo Impuestos </a> para modificar las reglas de cálculo
+TaxModuleSetupToModifyRulesLT=Vaya a <a href="%s"> configuración de la empresa </a> para modificar las reglas de cálculo
+OptionMode=Opción de contabilidad
+OptionModeVirtual=Opción de Reclamaciones-Deudas
+OptionModeTrueDesc=En este contexto, el volumen de negocios se calcula sobre los pagos (fecha de los pagos). La validez de las cifras sólo se garantiza si la contabilidad se examina a través de las entradas/salidas de las cuentas a través de facturas.
+OptionModeVirtualDesc=En este contexto, el volumen de negocios se calcula sobre facturas (fecha de validación). Cuando estas facturas son debidas, hayan sido pagadas o no, se enumeran en la salida del volumen de ventas.
+FeatureIsSupportedInInOutModeOnly=Función disponible únicamente en el modo de contabilidad CREDITS-DEBTS (consulte la configuración del módulo de contabilidad)
+VATReportBuildWithOptionDefinedInModule=Las cantidades que se muestran aquí se calculan utilizando reglas definidas por la configuración del módulo de impuestos.
+LTReportBuildWithOptionDefinedInModule=Los importes mostrados aquí se calculan utilizando reglas definidas por la configuración de la empresa.
+Param=Configurar
+RemainingAmountPayment=Cantidad del pago restante:
+Accountparent=Cuenta para padres
+Accountsparent=Cuentas de padres
+MenuReportInOut=Ingresos / Gastos
+ReportInOut=Balance de ingresos y gastos
+ReportTurnover=Facturación facturada
+ReportTurnoverCollected=Facturación recolectada
+PaymentsNotLinkedToInvoice=Pagos no vinculados a ninguna factura, por lo que no están vinculados a terceros
+PaymentsNotLinkedToUser=Pagos no vinculados a ningún usuario
+Profit=Ganacias
+Debit=Débito
+Credit=Crédito
+Piece=Documentos Contables
+AmountHTVATRealReceived=Neto recaudado
+AmountHTVATRealPaid=Neto pagado
+VATToPay=Impuestos de venta IVA
+VATReceived=Impuesto recibido
+VATToCollect=Impuesto de compras
+VATSummary=Impuesto mensual
+VATBalance=Saldo fiscal / Balance
+VATPaid=Impuesto pagado
+LT1Summary=Resumen del impuesto 2
+LT2Summary=Resumen del impuesto 3
+LT2SummaryES=Saldo del IRPF
+LT2SummaryIN=Saldo de SGST
+LT1Paid=Impuesto 2 pagado
+LT2Paid=Impuesto 3 pagado
+LT1PaidES=RE pagado
+LT2PaidES=IRPF pagado
+LT1PaidIN=CGST pagado
+LT2PaidIN=SGST pagado
+LT1Customer=Impuestos 2 ventas
+LT1Supplier=Impuestos 2 compras
+LT1CustomerES=Ventas de RE
+LT1SupplierES=RE compras
+LT1SupplierIN=Compras de CGST
+LT2Customer=Impuestos 3 ventas
+LT2Supplier=Impuestos 3 compras
+LT2CustomerES=Ventas del IRPF
+LT2SupplierES=Compras del IRPF
+LT2CustomerIN=Ventas del SGST
+LT2SupplierIN=Compras de SGST
+VATCollected=IVA recaudado
+StatusToPay=Pagar
+SpecialExpensesArea=Área para todos los pagos especiales
+SocialContribution=Impuesto social o fiscal
+LabelContrib=Contribución de la etiqueta
+TypeContrib=Tipo de contribución
+MenuSpecialExpenses=Gastos especiales
+MenuTaxAndDividends=Impuestos y dividendos
+MenuNewSocialContribution=Nuevo impuesto social/fiscal
+NewSocialContribution=Nuevo impuesto social/fiscal
+AddSocialContribution=Añadir impuestos sociales/fiscales
+ContributionsToPay=Impuestos sociales/fiscales a pagar
+AccountancyTreasuryArea=Área de facturación y pago
+PaymentCustomerInvoice=Pago de la factura del cliente
+PaymentSupplierInvoice=pago de factura del proveedor
+PaymentSocialContribution=Pago de impuestos sociales y fiscales
+PaymentVat=Pago del IVA
+ListPayment=Lista de pagos
+ListOfCustomerPayments=Lista de pagos de clientes
+ListOfSupplierPayments=Lista de pagos de proveedores
+DateStartPeriod=Fecha inicio período
+DateEndPeriod=Fecha fin período
+newLT1Payment=Nuevo pago de impuestos 2
+newLT2Payment=Nuevo pago de impuestos 3
+LT1Payment=Pago de impuestos 2
+LT1Payments=Impuestos 2 pagos
+LT2Payment=Pago de impuestos 3
+LT2Payments=Impuestos 3 pagos
+newLT1PaymentES=Nuevo pago RE
+newLT2PaymentES=Nuevo pago IRPF
+LT1PaymentES=RE pago
+LT1PaymentsES=Pagos RE
+LT2PaymentES=Pago del IRPF
+LT2PaymentsES=Pagos del IRPF
+VATPayment=Pago del impuesto sobre las ventas
+VATPayments=Pagos del impuesto sobre la venta
+VATRefund=Reembolso de impuestos de venta
+NewVATPayment=Nuevo pago del IVA
+NewLocalTaxPayment=Nuevo pago de impuestos %s
+Refund=Reembolso
+SocialContributionsPayments=Pagos de impuestos sociales y fiscales
+ShowVatPayment=Mostrar pago de IVA
+BalanceVisibilityDependsOnSortAndFilters=El equilibrio es visible en esta lista sólo si la tabla está ordenada ascendiendo en%s y filtrada para una cuenta bancaria
+CustomerAccountancyCode=Código de contabilidad del cliente
+SupplierAccountancyCode=Código contable del proveedor
+CustomerAccountancyCodeShort=Cuenta de cliente. código
+SupplierAccountancyCodeShort=Cuenta del proveedor. código
+Turnover=Facturación facturada
+TurnoverCollected=Facturación recolectada
+SalesTurnoverMinimum=Facturación mínima
+ByThirdParties=Por cliente
+ByUserAuthorOfInvoice=Por el autor de la factura
+CheckReceipt=Depósito de cheques
+CheckReceiptShort=Depósito de cheques
+LastCheckReceiptShort=Últimos comprobantes de comprobación%s
+NewCheckReceipt=Nuevo descuento
+NewCheckDeposit=Nuevo depósito de cheques
+NewCheckDepositOn=Crear recibo para depósito en cuenta:%s
+NoWaitingChecks=No hay cheques a la espera de depósito.
+DateChequeReceived=Consultar fecha de recepción
+NbOfCheques=No. de cheques
+PaySocialContribution=Pagar un impuesto social/fiscal
+ConfirmPaySocialContribution=¿Está seguro de que desea clasificar este impuesto social o fiscal como pagado?
+DeleteSocialContribution=Eliminar un pago de impuestos sociales o fiscales
+ConfirmDeleteSocialContribution=¿Seguro que desea eliminar este pago de impuestos sociales/fiscales?
+ExportDataset_tax_1=Impuestos y pagos sociales y fiscales
+CalcModeVATDebt=Modo <b>%sVAT en la contabilidad de compromiso%s </b>.
+CalcModeVATEngagement=Modo <b>%sVAT en los ingresos-gastos%s </b>.
+CalcModeDebt=Análisis de facturas registradas conocidas incluso si aún no se contabilizan en el libro mayor.
+CalcModeEngagement=Análisis de los pagos registrados conocidos, incluso si aún no se contabilizan en el Libro mayor.
+CalcModeBookkeeping=Análisis de los datos registrados en la tabla de Contabilidad.
+CalcModeLT1= Modo <b>%sRE en facturas de clientes - facturas de proveedores%s </b>
+CalcModeLT1Debt=Modo <b>%sRE en las facturas del cliente%s </b>
+CalcModeLT1Rec= Modo <b>%sRE en facturas de proveedores%s </b>
+CalcModeLT2= Modo <b>%sIRPF en facturas de clientes - facturas de proveedores%s </b>
+CalcModeLT2Debt=Modo <b>%sIRPF en las facturas del cliente%s </b>
+CalcModeLT2Rec= Modo <b>%sIRPF en las facturas de los proveedores%s </b>
+AnnualSummaryDueDebtMode=Balance de ingresos y gastos, resumen anual
+AnnualSummaryInputOutputMode=Balance de ingresos y gastos, resumen anual
+AnnualByCompaniesDueDebtMode=Balance de ingresos y gastos, detalle por grupos predefinidos, modo <b>%sClaims-Deudas%s </b> dicho <b> Compromiso de contabilidad </b>.
+AnnualByCompaniesInputOutputMode=Balance de ingresos y gastos, detalle por grupos predefinidos, modo <b>%sIngresos-Gastos%s </b> dicho <b> contabilidad de caja </b>.
+SeeReportInInputOutputMode=Vea %s el análisis de pagos %s para cálcular los pagos efectuados, incluso si aún no se contabilizaron en el Libro mayor.
+SeeReportInDueDebtMode=Vea %s el análisis de facturas %s para un cálculo basado en facturas registradas conocidas, incluso si aún no se contabilizaron en el Libro mayor.
+SeeReportInBookkeepingMode=Consulte el informe <b>%s Libro Mayor %s </b> para un cálculo en <b> la tabla contable del Libro Mayor </b>
+RulesAmountWithTaxIncluded=Los importes mostrados son con todos los impuestos incluidos
+RulesResultDue=- Incluye facturas pendientes, gastos, IVA, donaciones ya sean pagadas o no. También incluye salarios pagados. <br>- se basa en la fecha de facturación de las facturas y en la fecha de vencimiento de los gastos o pagos de impuestos. Para los salarios definidos con el módulo Salario, se utiliza la fecha de pago del valor.
+RulesResultInOut=Incluye los pagos reales realizados en facturas, gastos, IVA y sueldos. <br> - Se basa en las fechas de pago de las facturas, gastos, IVA y salarios. la fecha de donación para la donación.
+RulesCADue=- Incluye las facturas vencidas del cliente, ya sean pagadas o no. <br>: se basa en la fecha de facturación de estas facturas. <br>
+RulesCAIn=- Incluye todos los pagos efectivos de las facturas recibidas de los clientes. <br>: se basa en la fecha de pago de estas facturas <br>
+RulesCATotalSaleJournal=Incluye todas las líneas de crédito del Diario Ventas.
+RulesResultBookkeepingPersonalized=Muestra un registro en su libro mayor con cuentas contables <b> agrupadas por grupos personalizados </b>
+SeePageForSetup=Consulte el menú <a href="%s">%s </a> para la configuración
+DepositsAreNotIncluded=- Las facturas de anticipo no están incluidas.
+DepositsAreIncluded=Las facturas de pago inicial están incluidas
+LT1ReportByCustomers=Informe el impuesto 2 por un cliente/proveedor
+LT2ReportByCustomers=Informe el impuesto 3 por un cliente/proveedor
+LT1ReportByCustomersES=Informe de terceros RE
+LT2ReportByCustomersES=Informe de terceros IRPF
+VATReport=Informe de impuestos de venta
+VATReportByPeriods=Informe de impuestos de venta por período
+VATReportByRates=Informe de impuestos a la venta IVA por tarifas
+VATReportByThirdParties=Informe de impuestos a la venta IVA por clientes/proveedores
+VATReportByCustomers=Informe de IVA por cliente
+VATReportByCustomersInInputOutputMode=Informe del cliente IVA cobrado y pagado
+VATReportByQuartersInInputOutputMode=Reporte por tasa de impuesto a la venta del impuesto recaudado y pagado
+LT1ReportByQuarters=Informe el impuesto 2 por tasa
+LT2ReportByQuarters=Informe el impuesto 3 por tasa
+LT1ReportByQuartersES=Informe de la tasa de RE
+LT2ReportByQuartersES=Informe del IRPF
+SeeVATReportInInputOutputMode=Consulte el informe <b>%sVAT encasement%s </b> para un cálculo estándar
+SeeVATReportInDueDebtMode=Consulte el informe <b>%sVAT en el flujo%s </b> para un cálculo con una opción en el flujo
+RulesVATInServices=por servicios, el informe incluye las normas sobre el IVA realmente recibidas o emitidas sobre la base de la fecha de pago.
+RulesVATInProducts=- Para los activos materiales, el informe incluye el IVA recibido o emitido sobre la base de la fecha de pago.
+RulesVATDueServices=por servicios, el informe incluye facturas de IVA vencidas, pagadas o no, basadas en la fecha de factura.
+RulesVATDueProducts=- Para los activos materiales, el informe incluye las facturas del IVA, en función de la fecha de la factura.
+OptionVatInfoModuleComptabilite=Nota: Para los activos materiales, debe utilizar la fecha de entrega para ser más justo.
+NotUsedForGoods=No se utiliza en las mercancías
+ProposalStats=Estadísticas de las propuestas
+InvoiceStats=Estadísticas de las facturas
+Dispatch=Despacho
+Dispatched=Enviado
+ToDispatch=Para el despacho
+ThirdPartyMustBeEditAsCustomer=Tercero debe ser definido como un cliente
+SellsJournal=Diario de Ventas
+DescSellsJournal=Diario de Ventas
+CodeNotDef=Sin definición
+WarningDepositsNotIncluded=Las facturas de pago inicial no se incluyen en esta versión con este módulo de contabilidad.
+DatePaymentTermCantBeLowerThanObjectDate=La fecha del plazo de pago no puede ser inferior a la fecha del objeto.
+Pcg_version=Plan de modelos de cuentas
+Pcg_type=Tipo de Pcg
+Pcg_subtype=Subtipo Pcg
+InvoiceLinesToDispatch=Líneas de factura para enviar
+ByProductsAndServices=Por producto y servicio
+RefExt=Referencia externa
+ToCreateAPredefinedInvoice=Para crear una factura de plantilla, cree una factura estándar y, a continuación, sin validarla, haga clic en el botón "%s".
+LinkedOrder=Enlace al pedido
+CalculationRuleDesc=Para calcular el IVA total, hay dos métodos: <br> El método 1 redondea la tina en cada línea y luego los suma. <br> El método 2 suma todas las tinas en cada línea y luego redondea el resultado. <br> El resultado final puede diferir de pocos centavos. El modo predeterminado es modo <b>%s </b>.
+CalculationRuleDescSupplier=Según el proveedor, elija el método apropiado para aplicar la misma regla de cálculo y obtener el mismo resultado esperado por su proveedor.
+TurnoverPerProductInCommitmentAccountingNotRelevant=El informe de la facturación obtenida por producto no está disponible. Este informe solo está disponible para facturación facturada.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=El informe de Facturación recaudada por tasa de impuesto a la venta IVA no está disponible. Este informe solo está disponible para facturación facturada.
+AccountancyJournal=Diario de código de contabilidad
+ACCOUNTING_VAT_SOLD_ACCOUNT=Cuenta de contabilidad de forma predeterminada para el IVA sobre las ventas (se usa si no está definido en la configuración del diccionario de IVA)
+ACCOUNTING_VAT_BUY_ACCOUNT=Cuenta de contabilidad de forma predeterminada para el IVA en compras (se usa si no está definido en la configuración del diccionario de IVA)
+ACCOUNTING_VAT_PAY_ACCOUNT=Cuenta contable por defecto para el pago del IVA
+ACCOUNTING_ACCOUNT_CUSTOMER=Cuenta de contabilidad utilizada para terceros clientes
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=La cuenta contable dedicada definida en la tarjeta de clientes/proveedores se utilizará solo para la contabilidad de Libro Mayor Auxiliar. Este se usará para el Libro Mayor General y como valor predeterminado de la contabilidad del Libro Mayor Auxiliar si no se define una cuenta de cuenta del cliente dedicada a un clientes/proveedores.
+ACCOUNTING_ACCOUNT_SUPPLIER=Cuenta de contabilidad utilizada para clientes/proveedores
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=La cuenta de contabilidad dedicada definida en la tarjeta de un tercero se usará solo para la contabilidad del Libro auxiliar. Este se usará para el Libro mayor y como valor predeterminado de la contabilidad del libro auxiliar si no se define la cuenta de contabilidad del proveedor dedicada en un tercero.
+ConfirmCloneTax=Confirmar clonar un impuesto social/fiscal.
+CloneTaxForNextMonth=Clonarlo para el próximo mes
+SimpleReport=Informe simple
+AddExtraReport=Informes adicionales (agregar informe de clientes extranjeros y nacionales)
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basado en que las dos primeras letras del número de IVA son diferentes del código de país de su propia compañía
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Basado en que las dos primeras letras del número de IVA son iguales que el código de país de su propia compañía
+LinkedFichinter=Enlace a una intervención
+ImportDataset_tax_contrib=Impuestos sociales y fiscales
+ErrorBankAccountNotFound=Error: Cuenta bancaria no encontrada
+FiscalPeriod=Período contable
+ListSocialContributionAssociatedProject=Lista de contribuciones sociales asociadas al proyecto
+AccountingAffectation=Asignación de cuentas contables
+LastDayTaxIsRelatedTo=Último día del período el impuesto está relacionado con
+VATDue=Impuesto de venta IVA reclamado
+ByVatRate=Por tasa de impuesto a la venta IVA
+TurnoverbyVatrate=Facturación facturada por tasa de impuesto a la venta IVA
+TurnoverCollectedbyVatrate=Facturación recaudada por tasa de impuesto a la venta IVA
+PurchasebyVatrate=Compra por tasa de impuestos de venta IVA
+PurchaseTurnover=Volumen de compras
+PurchaseTurnoverCollected=Volumen de compras recogido
+RulesPurchaseTurnoverDue=- Incluye las facturas vencidas del proveedor, ya sean pagadas o no. <br>: se basa en la fecha de facturación de estas facturas. <br>
+RulesPurchaseTurnoverIn=- Incluye todos los pagos efectivos de facturas hechas a proveedores. <br>: se basa en la fecha de pago de estas facturas <br>
+RulesPurchaseTurnoverTotalPurchaseJournal=Incluye todas las líneas de débito del diario de compras.
+ReportPurchaseTurnover=Factura de facturación facturada
+ReportPurchaseTurnoverCollected=Volumen de compras recogido
diff --git a/htdocs/langs/es_EC/contracts.lang b/htdocs/langs/es_EC/contracts.lang
new file mode 100644
index 00000000000..2afe55800d2
--- /dev/null
+++ b/htdocs/langs/es_EC/contracts.lang
@@ -0,0 +1,75 @@
+# Dolibarr language file - Source file is en_US - contracts
+ContractsArea=Área de contratos
+ListOfContracts=Lista de contratos
+ContractCard=Tarjeta de contrato
+ContractStatusNotRunning=No Abierto
+ServiceStatusInitial=No Abierto
+ServiceStatusRunning=Abierto
+ServiceStatusNotLate=Abierto, no expirado
+ServiceStatusNotLateShort=No ha expirado
+ServiceStatusLate=Abierto, caducado
+ServiceStatusLateShort=Muerto
+ShowContractOfService=Mostrar contrato de servicio
+ContractsSubscriptions=Contratos / Suscripciones
+ContractsAndLine=Contratos y línea de contratos
+Closing=Clausura
+MenuInactiveServices=Servicios no activos
+MenuRunningServices=Servicios en uso
+NewContractSubscription=Nuevo contrato / suscripción
+ConfirmDeleteAContract=¿Está seguro de que desea eliminar este contrato y todos sus servicios?
+ConfirmValidateContract=¿Está seguro de que desea validar este contrato bajo el nombre <b>%s</b>?
+ConfirmActivateAllOnContract=Esto abrirá todos los servicios (aún no activos). ¿Estás seguro de que quieres abrir todos los servicios?
+ConfirmCloseContract=Esto cerrará todos los servicios (activos o no). ¿Estás seguro de que quieres cerrar este contrato?
+ConfirmCloseService=¿Está seguro de que desea cerrar este servicio con la fecha <b>%s</b>?
+ActivateService=Activar servicio
+ConfirmActivateService=¿Está seguro de que desea activar este servicio con la fecha <b>%s</b>?
+RefContract=Referencia del contrato
+DateContract=Fecha del contrato
+DateServiceActivate=Fecha de activación del servicio
+ListOfServices=Lista de servicios
+ListOfInactiveServices=Lista de servicios no activos
+ListOfExpiredServices=Lista de servicios activos vencidos
+ListOfClosedServices=Lista de servicios cerrados
+ListOfRunningServices=Lista de servicios en ejecución
+NotActivatedServices=Servicios inactivos (entre contratos validados)
+BoardNotActivatedServices=Servicios para activar entre contratos validados
+BoardNotActivatedServicesShort=Servicios para activar
+ContractStartDate=Fecha de inicio
+ContractEndDate=Fecha final
+DateStartPlanned=Fecha de inicio prevista
+DateStartPlannedShort=Fecha de inicio prevista
+DateEndPlanned=Fecha de finalización prevista
+DateEndPlannedShort=Fecha de finalización prevista
+DateStartReal=Fecha de inicio real
+DateStartRealShort=Fecha de inicio real
+DateEndReal=Fecha de finalización real
+DateEndRealShort=Fecha de finalización real
+CloseService=Servicio de cierre
+BoardRunningServices=Servicios en ejecución
+BoardRunningServicesShort=Servicios en ejecución
+BoardExpiredServices=Servicios vencidos
+BoardExpiredServicesShort=Servicios vencidos
+DraftContracts=Contratos de proyectos
+CloseRefusedBecauseOneServiceActive=El contrato no se puede cerrar ya que hay al menos un servicio abierto en él
+CloseAllContracts=Cerrar todas las líneas del contrato
+DeleteContractLine=Eliminar una línea de contrato
+ConfirmDeleteContractLine=¿Está seguro de que desea eliminar esta línea de contrato?
+MoveToAnotherContract=Mueva el servicio a otro contrato.
+ConfirmMoveToAnotherContract=He elegido un nuevo contrato objetivo y confirmo que quiero trasladar este servicio a este contrato.
+ConfirmMoveToAnotherContractQuestion=Elegir en qué contrato existente (del mismo tercero), desea mover este servicio a?
+PaymentRenewContractId=Renovar la línea del contrato (número %s)
+ExpiredSince=Fecha de caducidad
+NoExpiredServices=Sin servicios activos caducados
+ListOfServicesToExpireWithDuration=Lista de servicios que vence en %s días
+ListOfServicesToExpireWithDurationNeg=Lista de servicios caducados desde más de %s días
+ListOfServicesToExpire=Lista de servicios a expirar
+NoteListOfYourExpiredServices=Esta lista contiene únicamente servicios de contratos para terceros a los que está vinculado como representante de ventas.
+StandardContractsTemplate=Plantilla de contratos estándar
+OnlyLinesWithTypeServiceAreUsed=Sólo se clonarán líneas con el tipo "Servicio".
+ConfirmCloneContract=¿Seguro que desea clonar el contrato <b>%s</b>?
+LowerDateEndPlannedShort=Fecha menor planificada de finalización de los servicios activos.
+TypeContact_contrat_internal_SALESREPSIGN=Representante de ventas firma contrato
+TypeContact_contrat_internal_SALESREPFOLL=Contrato de seguimiento del representante de ventas
+TypeContact_contrat_external_BILLING=Facturación de contacto con el cliente
+TypeContact_contrat_external_CUSTOMER=Seguimiento del contacto con el cliente
+TypeContact_contrat_external_SALESREPSIGN=Firma contrato contacto con el cliente
diff --git a/htdocs/langs/es_EC/cron.lang b/htdocs/langs/es_EC/cron.lang
new file mode 100644
index 00000000000..1bcb97a8f7b
--- /dev/null
+++ b/htdocs/langs/es_EC/cron.lang
@@ -0,0 +1,64 @@
+# Dolibarr language file - Source file is en_US - cron
+Permission23101 =Leer trabajo programada
+Permission23102 =Crear / actualizar trabajo programado
+Permission23103 =Eliminar trabajo programado
+Permission23104 =Ejecutar trabajo programado
+CronSetup=Configuración de administración de trabajos programada
+URLToLaunchCronJobs=URL para verificar e iniciar trabajos calificados de cron
+OrToLaunchASpecificJob=O para comprobar y lanzar un trabajo específico
+KeyForCronAccess=Clave de seguridad para la URL para iniciar trabajos cron
+FileToLaunchCronJobs=Línea de comandos para comprobar y poner en marcha trabajos calificados de cron
+CronExplainHowToRunUnix=En el entorno Unix, debe utilizar la siguiente entrada crontab para ejecutar la línea de comandos cada 5 minutos
+CronExplainHowToRunWin=En el entorno de Microsoft(tm) Windows, puede usar las herramientas de tareas programadas para ejecutar la línea de comandos cada 5 minutos
+CronMethodDoesNotExists=La clase%s no contiene ningún método%s
+CronJobDefDesc=Los perfiles de trabajo de Cron se definen en el archivo descriptor del módulo. Cuando el módulo está activado, se cargan y están disponibles para que pueda administrar los trabajos desde el menú de herramientas de administración%s.
+CronJobProfiles=Lista de perfiles de trabajo cron predefinidos
+EnabledAndDisabled=Activado y desactivado
+CronLastOutput=Última salida de ejecución
+CronLastResult=Último código de resultado
+CronCommand=Mando
+CronList=Trabajos programados
+CronDelete=Eliminar trabajos programados
+CronConfirmDelete=¿Está seguro de que desea eliminar estos trabajos programados?
+CronExecute=Iniciar el trabajo programado
+CronConfirmExecute=¿Está seguro de que desea ejecutar estos trabajos programados ahora?
+CronInfo=El módulo de trabajo programado permite programar tareas para ejecutarlas automáticamente. Los trabajos también se pueden iniciar manualmente.
+CronTask=Trabajo
+CronDtStart=No antes
+CronDtNextLaunch=Próxima ejecución
+CronDtLastResult=Fecha de finalización de la última ejecución
+CronMethod=Método
+CronModule=Módulo
+CronNoJobs=No hay trabajos registrados
+CronNbRun=Numero de lanzamientos
+CronMaxRun=Número máximo de lanzamientos
+CronEach=Cada
+JobFinished=Trabajo puesto en marcha y terminado
+CronAdd=Añadir trabajos
+CronEvery=Ejecutar trabajo cada
+CronObject=Instancia/Objeto para crear
+CronArgs=Parámetros
+CronSaveSucess=Guardado exitosamente
+CronFieldMandatory=Los campos%s son obligatorios
+CronErrEndDateStartDt=La fecha de finalización no puede ser anterior a la fecha de inicio
+CronStatusActiveBtn=Habilitar
+CronStatusInactiveBtn=En rehabilitación
+CronTaskInactive=Este trabajo está deshabilitado
+CronId=Carné de identidad
+CronModuleHelp=Nombre del directorio del módulo Dolibarr (también funciona con un módulo Dolibarr externo). <BR> Por ejemplo, para llamar al método fetch del objeto del producto Dolibarr /htdocs/<u>product</u>/class/product.class.php, el valor para el módulo es <br><i>product</i>
+CronClassFileHelp=La ruta relativa y el nombre del archivo a cargar (la ruta es relativa al directorio raíz del servidor web).  <BR>Por ejemplo, para llamar al método fetch del objeto del producto Dolibarr htdocs/product/class/ <u>product.class.php</u>, el valor para el nombre del archivo de clase es <br><i>product/class/product.class.php</i>
+CronObjectHelp=El nombre del objeto a cargar. <BR>Por ejemplo, para llamar al método fetch del objeto del producto Dolibarr /htdocs/product/class/product.class.php, el valor para el nombre de archivo de clase es <br><i>Product</i>
+CronMethodHelp=El método objeto para lanzar. <BR>Por ejemplo, para llamar al método fetch del objeto del producto Dolibarr /htdocs/product/class/product.class.php, el valor para el método es <br><i>fetch</i>
+CronArgsHelp=Los argumentos del método. <BR> Por ejemplo, para llamar al método fetch del objeto del producto Dolibarr /htdocs/product/class/product.class.php, el valor para los parámetros puede ser <br><i>0, ProductRef</i>
+CronCommandHelp=La línea de comandos del sistema a ejecutar.
+CronCreateJob=Crear nuevo trabajo programado
+CronType=Tipo de empleo
+CronType_method=Método de llamada de una clase PHP
+CronType_command=Comando shell
+CronCannotLoadClass=No se puede cargar el archivo de clase %s (para usar la clase %s)
+CronCannotLoadObject=Se cargó el archivo de clase %s, pero no se encontró el objeto %s en él
+UseMenuModuleToolsToAddCronJobs=Vaya al menú "<a href="%s">Inicio - Herramientas de administración - Trabajos programados</a>" para ver y editar trabajos programados.
+JobDisabled=Trabajo desactivado
+MakeLocalDatabaseDumpShort=Copia de seguridad local
+MakeLocalDatabaseDump=Crear un volcado de base de datos local. Los parámetros son: compresión ('gz' o 'bz' o 'ninguno'), tipo de copia de seguridad ('mysql', 'pgsql', 'auto'), 1, 'auto' o nombre de archivo para compilar, número de archivos de copia de seguridad para mantener
+WarningCronDelayed=Atención, para propósitos de rendimiento, sea cual sea la siguiente fecha de ejecución de trabajos habilitados, sus trabajos pueden retrasarse hasta un máximo de%s horas, antes de ejecutarse.
diff --git a/htdocs/langs/es_EC/deliveries.lang b/htdocs/langs/es_EC/deliveries.lang
new file mode 100644
index 00000000000..4de8529748d
--- /dev/null
+++ b/htdocs/langs/es_EC/deliveries.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - deliveries
+Delivery=Entrega
+DeliveryRef=Referencia de Entrega
+DeliveryCard=Tarjeta de recibo
+DeliveryOrder=Recibo de entrega
+CreateDeliveryOrder=Generar recibo de entrega
+SetDeliveryDate=Establecer fecha de envío
+ValidateDeliveryReceipt=Validar el recibo de entrega
+ValidateDeliveryReceiptConfirm=¿Está seguro de que desea validar este recibo de entrega?
+DeleteDeliveryReceipt=Eliminar recibo de entrega
+DeleteDeliveryReceiptConfirm=¿Está seguro de que desea eliminar el recibo de entrega <b>%s</b>?
+DeliveryMethod=Método de entrega
+TrackingNumber=Número de rastreo
+DeliveryNotValidated=Entrega no validada
+StatusDeliveryCanceled=Cancelado
+NameAndSignature=Nombre y firma:
+ToAndDate=Para___________________________________ en ____ / _____ / __________
+GoodStatusDeclaration=Se recibido los productos arriba descritos en buenas condiciones,
+Deliverer=Distribuidor
+Sender=Remitente
+ShowReceiving=Mostrar recibo de entrega
+NonExistentOrder=Orden inexistente
diff --git a/htdocs/langs/es_EC/dict.lang b/htdocs/langs/es_EC/dict.lang
new file mode 100644
index 00000000000..f17500e0d6a
--- /dev/null
+++ b/htdocs/langs/es_EC/dict.lang
@@ -0,0 +1,82 @@
+# Dolibarr language file - Source file is en_US - dict
+CountryBH=Bahrein
+CountryBY=Belarús
+CountryBM=Islas Bermudas
+CountryBA=Bosnia y Herzegovina
+CountryCX=Isla de Navidad
+CountryCD=Congo, República Democrática del
+CountryFO=Islas Faroe
+CountryGF=Guayana Francesa
+CountryPF=Polinesia francés
+CountryTF=Territorios Franceses del Sur
+CountryGL=Tierra Verde
+CountryGY=Guayana
+CountryHM=Heard Island y McDonald
+CountryVA=Santa Sede (Estado de la Ciudad del Vaticano)
+CountryIR=Corrí
+CountryIQ=Irak
+CountryJO=Jordán
+CountryLY=libio
+CountryMK=Macedonia, antigua Yugoslavia de
+CountryMX=Méjico
+CountryPS=Territorio Palestino, Ocupado
+CountryPG=Papúa Nueva Guinea
+CountryQA=Katar
+CountryZA=Sudáfrica
+CountryGS=Georgia del sur y las islas Sandwich del sur
+CountrySJ=Svalbard y Jan Mayen
+CountrySZ=Swazilandia
+CountrySY=Sirio
+CountryUM=Islas menores alejadas de los Estados Unidos
+CountryVI=Islas Vírgenes, EE.UU.
+CountryEH=Sahara Occidental
+CountryGG=Guernesey
+CountryBL=San Bartolomé
+CountryMF=San Martín
+CivilityMME=Señora.
+CivilityMR=Señor.
+CivilityMLE=Sra.
+CurrencyAUD=Dólares australianos
+CurrencySingAUD=Dólar australiano
+CurrencyCAD=Dólares CAN
+CurrencySingCAD=Dólar canadiense
+CurrencyMUR=Rupias de Mauricio
+CurrencySingMUR=Rupia de Mauricio
+CurrencyNOK=Krones noruegos
+CurrencySingNOK=Corona Noruega
+CurrencyUSD=Dólares estadounidenses
+CurrencySingUSD=Dólar estadounidense
+CurrencyXAF=Franco CFA BEAC
+CurrencyXOF=CFA Francos BCEAO
+CurrencyCentEUR=centavos
+CurrencyCentSingEUR=centavo
+CurrencyCentINR=Paisa
+CurrencyCentSingINR=Paise
+DemandReasonTypeSRC_CAMP_MAIL=Campaña de envío
+DemandReasonTypeSRC_CAMP_EMAIL=Campaña de EMailing
+DemandReasonTypeSRC_CAMP_FAX=Campaña de fax
+DemandReasonTypeSRC_SHOP=Contacto de la tienda
+DemandReasonTypeSRC_PARTNER=Compañero
+DemandReasonTypeSRC_SPONSORING=Patrocinio
+PaperFormatUSLETTER=Formato Carta US
+PaperFormatUSLEGAL=Formato Legal US
+PaperFormatUSEXECUTIVE=Formato Ejecutivo EE.UU.
+PaperFormatUSLEDGER=Formato Ledger / Tabloide
+PaperFormatCAP1=Formato P1 Canadá
+PaperFormatCAP2=Formato P2 Canadá
+PaperFormatCAP3=Formato P3 Canadá
+PaperFormatCAP4=Formato P4 Canadá
+PaperFormatCAP5=Formato P5 Canadá
+PaperFormatCAP6=Formato P6 Canadá
+ExpAuto3PCV=3 CV y más
+ExpAuto4PCV=4 CV y más
+ExpAuto5PCV=5 CV y más
+ExpAuto6PCV=6 CV y más
+ExpAuto7PCV=7 CV y más
+ExpAuto8PCV=8 CV y más
+ExpAuto9PCV=9 CV y más
+ExpAuto10PCV=10 CV y más
+ExpAuto11PCV=11 CV y más
+ExpAuto12PCV=12 CV y más
+ExpAuto13PCV=13 CV y más
+ExpMoto5PCV=Motos 5 CV y más
diff --git a/htdocs/langs/es_EC/donations.lang b/htdocs/langs/es_EC/donations.lang
new file mode 100644
index 00000000000..4d3a9bf355b
--- /dev/null
+++ b/htdocs/langs/es_EC/donations.lang
@@ -0,0 +1,18 @@
+# Dolibarr language file - Source file is en_US - donations
+DonationRef=Donación ref.
+ConfirmDeleteADonation=¿Seguro que quieres eliminar esta donación?
+DonationStatusPromiseNotValidated=Promesa de proyecto
+DonationStatusPaid=Donación recibida
+DonationStatusPromiseNotValidatedShort=Borrador
+DonationStatusPromiseValidatedShort=Validado
+DonationStatusPaidShort=Recibido
+DonationsModels=Modelos de documentos para recibos de donaciones
+LastModifiedDonations=Últimas donaciones modificadas%s
+DonationRecipient=Destinatario de la donación
+IConfirmDonationReception=El destinatario declara la recepción, como una donación, de la cantidad siguiente
+MinimumAmount=La cantidad mínima es%s
+FreeTextOnDonations=Texto libre para mostrar en pie de página
+DONATION_ART200=Mostrar el artículo 200 de CGI si está interesado
+DONATION_ART238=Mostrar el artículo 238 de CGI si usted está preocupado
+DONATION_ART885=Mostrar el artículo 885 de CGI si está interesado
+DonationPayment=Pago de donaciones
diff --git a/htdocs/langs/es_EC/ecm.lang b/htdocs/langs/es_EC/ecm.lang
new file mode 100644
index 00000000000..b63b9896fda
--- /dev/null
+++ b/htdocs/langs/es_EC/ecm.lang
@@ -0,0 +1,34 @@
+# Dolibarr language file - Source file is en_US - ecm
+ECMNbOfDocs=Nº de documentos en el directorio.
+ECMRoot=Raíz de ECM
+ECMCreationDate=Fecha de creación
+ECMNbOfFilesInSubDir=Número de archivos en subdirectorios
+ECMArea=Área de DMS/ECM
+ECMAreaDesc=El área SGD/GCE (Sistema de Gestión de Documentos / Gestión de Contenido Electrónico) le permite guardar, compartir y buscar rápidamente todo tipo de documentos en Dolibarr.
+ECMAreaDesc2=* Los directorios automáticos se rellenan automáticamente al agregar documentos desde la tarjeta de un elemento. <br> * Los directorios manuales se pueden utilizar para guardar documentos no vinculados a un elemento en particular.
+ECMSectionWasRemoved=Se ha eliminado el directorio <b>%s</b>.
+ECMSectionWasCreated=Directorio <b>%s</b> ha sido creado.
+ECMSearchByKeywords=Búsqueda por palabras clave
+ECMSearchByEntity=Búsqueda por objeto
+ECMDocsBySocialContributions=Documentos vinculados a impuestos sociales o fiscales
+ECMDocsByThirdParties=Documentos vinculados a cliente/proveedor
+ECMDocsByProposals=Documentos vinculados a propuestas
+ECMDocsByOrders=Documentos vinculados a pedidos de clientes
+ECMDocsByContracts=Documentos vinculados a contratos
+ECMDocsByInvoices=Documentos vinculados a facturas de clientes
+ECMDocsByProducts=Documentos vinculados a los productos
+ECMDocsByProjects=Documentos vinculados a proyectos
+ECMDocsByUsers=Documentos vinculados a usuarios
+ECMDocsByInterventions=Documentos relacionados con las intervenciones
+ECMDocsByExpenseReports=Documentos vinculados a los informes de gastos
+ECMDocsByHolidays=Documentos vinculados a vacaciones
+ECMDocsBySupplierProposals=Documentos vinculados a propuestas de proveedores
+ECMNoDirectoryYet=Ningún directorio creado
+DeleteSection=Eliminar directorio
+ConfirmDeleteSection=¿Puede confirmar que desea eliminar el directorio <b>%s</b>?
+ECMDirectoryForFiles=Directorio relativo de archivos
+CannotRemoveDirectoryContainsFilesOrDirs=La eliminación no es posible porque contiene algunos archivos o subdirectorios
+CannotRemoveDirectoryContainsFiles=La eliminación no es posible porque contiene algunos archivos
+ECMFileManager=Administrador de archivos
+ECMSelectASection=Seleccione un directorio en el árbol ...
+DirNotSynchronizedSyncFirst=Este directorio parece ser creado o modificado fuera del módulo ECM. Primero debe hacer clic en el botón "Resincronizar" para sincronizar el disco y la base de datos para obtener el contenido de este directorio.
diff --git a/htdocs/langs/es_EC/errors.lang b/htdocs/langs/es_EC/errors.lang
new file mode 100644
index 00000000000..a76ded9bf88
--- /dev/null
+++ b/htdocs/langs/es_EC/errors.lang
@@ -0,0 +1,225 @@
+# Dolibarr language file - Source file is en_US - errors
+NoErrorCommitIsDone=No hay error, nos comprometemos
+ErrorButCommitIsDone=Errores encontrados pero validamos a pesar de esto
+ErrorBadEMail=El correo electrónico %s está mal
+ErrorBadUrl=La URL%s está incorrecta
+ErrorBadValueForParamNotAString=Valor incorrecto para su parámetro. Se anexa generalmente cuando falta la traducción.
+ErrorLoginAlreadyExists=La conexión%s ya existe.
+ErrorGroupAlreadyExists=El grupo%s ya existe.
+ErrorRecordNotFound=Registro no encontrado.
+ErrorFailToCopyDir=Error al copiar el directorio '<b>%s</b>' en '<b>%s</b>'.
+ErrorFailToRenameFile=Error al cambiar el nombre del archivo '<b>%s</b>' en '<b>%s</b>'.
+ErrorFailToCreateFile=Error al crear el archivo '<b>%s</b>'.
+ErrorFailToRenameDir=Error al cambiar el nombre del directorio '<b>%s</b>' en '<b>%s</b>'.
+ErrorFailToCreateDir=Error al crear el directorio '<b>%s</b>'.
+ErrorFailToGenerateFile=No se pudo generar el archivo '<b>%s</b>'.
+ErrorCashAccountAcceptsOnlyCashMoney=Esta cuenta bancaria es una cuenta de efectivo, por lo que acepta pagos de tipo efectivo solamente.
+ErrorFromToAccountsMustDiffers=Las cuentas bancarias de origen y destino deben ser diferentes.
+ErrorBadThirdPartyName=Valor erroneo para el nombre de un cliente/proveedor
+ErrorProdIdIsMandatory=El%s es obligatorio
+ErrorBadCustomerCodeSyntax=Mala sintaxis para el código del cliente
+ErrorBadBarCodeSyntax=Mala sintaxis para el código de barras. Puede establecer un tipo de código de barras incorrecto o definir una máscara de código de barras para la numeración que no coincide con el valor escaneado.
+ErrorCustomerCodeRequired=Se requiere código de cliente
+ErrorBarCodeAlreadyUsed=Código de barras ya utilizado
+ErrorPrefixRequired=Prefijo requerido
+ErrorBadSupplierCodeSyntax=Mala sintaxis para el código de proveedor
+ErrorSupplierCodeRequired=Se requiere código de proveedor
+ErrorBadValueForParameter=Valor erróneo '%s' para el parámetro '%s'
+ErrorBadImageFormat=El archivo de imagen no tiene un formato compatible (Su PHP no admite funciones para convertir imágenes de este formato)
+ErrorBadDateFormat=El valor '%s' tiene un formato de fecha incorrecto
+ErrorFailedToWriteInDir=Error al escribir en el directorio%s
+ErrorFoundBadEmailInFile=Se encontró una sintaxis de correo electrónico incorrecta para%s líneas en el archivo (ejemplo línea%s con correo electrónico
+ErrorUserCannotBeDelete=El usuario no puede ser eliminado. Tal vez esté asociado a entidades dolibarr.
+ErrorFieldsRequired=Algunos campos requeridos no fueron llenados.
+ErrorSubjectIsRequired=El tema del correo electrónico es obligatorio
+ErrorFailedToCreateDir=Error al crear un directorio. Compruebe que el usuario del servidor Web tiene permisos para escribir en el directorio de documentos de Dolibarr. Si el parámetro <b> safe_mode </ b> está habilitado en este PHP, compruebe que los archivos php de Dolibarr pertenecen al usuario del servidor web (o grupo).
+ErrorNoMailDefinedForThisUser=No hay correo definido para este usuario
+ErrorFeatureNeedJavascript=Esta característica necesita javascript para ser activado para trabajar. Cambie esto en la pantalla de configuración.
+ErrorTopMenuMustHaveAParentWithId0=Un menú del tipo 'Top' no puede tener un menú padre. Ponga 0 en el menú padre o elija un menú de tipo 'Izquierda'.
+ErrorLeftMenuMustHaveAParentId=Un menú de tipo 'Izquierda' debe tener un ID padre.
+ErrorFileNotFound=Archivo <b>%s</b> no encontrado (Camino incorrecto, permisos incorrectos o acceso denegado por PHP openbasedir o parámetro safe_mode)
+ErrorDirNotFound=Directorio <b>%s</b> no encontrado (Camino incorrecto, permisos incorrectos o acceso denegado por PHP openbasedir o parámetro safe_mode)
+ErrorFunctionNotAvailableInPHP=La función <b>%s</b> es necesaria para esta función, pero no está disponible en esta versión / configuración de PHP.
+ErrorDirAlreadyExists=Ya existe un directorio con este nombre.
+ErrorPartialFile=Archivo no recibido completamente por el servidor.
+ErrorNoTmpDir=La dirección temporal%s no existe.
+ErrorUploadBlockedByAddon=Carga bloqueada por un complemento PHP/Apache.
+ErrorFileSizeTooLarge=El tamaño del archivo es demasiado grande.
+ErrorFieldTooLong=El campo %s es demasiado largo.
+ErrorSizeTooLongForIntType=Tamaño demasiado largo para el tipo int (dígitos%s máximo)
+ErrorSizeTooLongForVarcharType=Tamaño demasiado largo para el tipo de cadena (%s caracteres máximo)
+ErrorNoValueForSelectType=Por favor, rellene el valor de la lista de selección
+ErrorNoValueForCheckBoxType=Por favor, rellene el valor de la casilla de verificación
+ErrorNoValueForRadioType=Por favor, rellene el valor de la lista de radio
+ErrorBadFormatValueList=El valor de la lista no puede tener más de una coma: <u>%s </u>, pero necesita al menos una: key, value
+ErrorFieldCanNotContainSpecialCharacters=El campo <b>%s</b> no debe contener caracteres especiales.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=El campo <b>%s</b> no debe contener caracteres especiales, ni mayúsculas, y no puede contener solo números.
+ErrorFieldMustHaveXChar=El campo <b>%s</b> debe tener al menos %s caracteres.
+ErrorNoAccountancyModuleLoaded=No se ha activado ningún módulo de contabilidad
+ErrorExportDuplicateProfil=Este nombre de perfil ya existe para este conjunto de exportación.
+ErrorLDAPSetupNotComplete=Dolibarr-LDAP no está completo.
+ErrorLDAPMakeManualTest=Se ha generado un archivo .ldif en el directorio%s. Trate de cargarlo manualmente desde la línea de comandos para obtener más información sobre los errores.
+ErrorCantSaveADoneUserWithZeroPercentage=No se puede guardar una acción con "estado no iniciado" si el campo "hecho por" también se llena.
+ErrorRefAlreadyExists=La referencia usada para la creación ya existe.
+ErrorPleaseTypeBankTransactionReportName=Ingrese el nombre del extracto bancario donde se debe informar la entrada (Formato AAAAMM o AAAAMMDD)
+ErrorRecordHasChildren=Error al eliminar el registro ya que tiene algunos registros secundarios.
+ErrorRecordHasAtLeastOneChildOfType=El objeto tiene al menos un hijo del tipo%s
+ErrorRecordIsUsedCantDelete=No se puede borrar el registro. Ya está usado o incluido en otro objeto.
+ErrorModuleRequireJavascript=Javascript no debe desactivarse para que esta función funcione. Para activar / desactivar JavaScript, vaya al menú Inicio-> Configuración-> Mostrar.
+ErrorPasswordsMustMatch=Las contraseñas escritas deben coincidir entre sí
+ErrorContactEMail=Se produjo un error técnico. Comuníquese con el administrador para seguir el correo electrónico <b>%s</b> y proporcionar el código de error <b>%s</b> en su mensaje, o agregue una copia de pantalla de esta página.
+ErrorWrongValueForField=El campo <b>%s</b>: '<b>%s</b>' no coincide con la expresión regular regla <b>%s</b>
+ErrorFieldValueNotIn=El campo <b>%s</b>: '<b>%s</b>' no es un valor que se encuentra en el campo <b>%s</b> de <b>%s</b>
+ErrorFieldRefNotIn=Campo <b>%s</b>: '<b>%s</b>' no es una <b>%s</b> referencia existente
+ErrorFileIsInfectedWithAVirus=El programa antivirus no pudo validar el archivo (el archivo podría estar infectado por un virus)
+ErrorSpecialCharNotAllowedForField=No se permiten caracteres especiales para el campo "%s"
+ErrorNumRefModel=Existe una referencia en la base de datos (%s) y no es compatible con esta regla de numeración. Elimine la referencia de registro o renombrado para activar este módulo.
+ErrorQtyTooLowForThisSupplier=Cantidad demasiado baja para este proveedor o ningún precio definido en este producto para este proveedor
+ErrorOrdersNotCreatedQtyTooLow=Algunos pedidos no se han creado debido a cantidades demasiado bajas
+ErrorModuleSetupNotComplete=La configuración del módulo %s parece estar incompleta. Vaya a Inicio - Configuración - Módulos para completar.
+ErrorBadMaskFailedToLocatePosOfSequence=Error, máscara sin número de secuencia
+ErrorBadMaskBadRazMonth=Error, valor de reinicio incorrecto
+ErrorCounterMustHaveMoreThan3Digits=El contador debe tener más de 3 dígitos
+ErrorSelectAtLeastOne=Error, seleccione al menos una entrada.
+ErrorDeleteNotPossibleLineIsConsolidated=No es posible eliminar porque el registro está vinculado a una transacción bancaria que está conciliada
+ErrorProdIdAlreadyExist=%s se asigna a otro tercio
+ErrorFailedToSendPassword=Error al enviar la contraseña
+ErrorFailedToLoadRSSFile=No puede obtener el feed RSS. Intente agregar constante MAIN_SIMPLEXMLLOAD_DEBUG si los mensajes de error no proporcionan suficiente información.
+ErrorForbidden=Acceso denegado. <br> Intenta acceder a una página, área o función de un módulo deshabilitado o sin estar en una sesión autenticada o que no está permitido a tu usuario.
+ErrorForbidden2=El administrador de Dolibarr puede definir el permiso para este inicio de sesión desde el menú%s ->%s.
+ErrorForbidden3=Parece que Dolibarr no se utiliza a través de una sesión autenticada. Echa un vistazo a la documentación de configuración de Dolibarr para saber cómo administrar las autenticaciones (htaccess, mod_auth u otros ...).
+ErrorNoImagickReadimage=La clase Imagick no se encuentra en este PHP. No hay vista previa disponible. Los administradores pueden deshabilitar esta pestaña desde el menú Configuración - Mostrar.
+ErrorRecordAlreadyExists=El registro ya existe
+ErrorLabelAlreadyExists=Esta etiqueta ya existe.
+ErrorCantReadFile=Error al leer el archivo '%s'
+ErrorCantReadDir=Error al leer el directorio '%s'
+ErrorBadLoginPassword=Valor incorrecto para el inicio de sesión o la contraseña
+ErrorLoginDisabled=Su cuenta ha sido deshabilitada
+ErrorFailedToRunExternalCommand=Error al ejecutar el comando externo. Compruebe que está disponible y ejecutado por su servidor PHP. Si está habilitado PHP <b> Modo a prueba de errores </ b>, compruebe que el comando esté dentro de un directorio definido por el parámetro <b> safe_mode_exec_dir </ b>.
+ErrorFailedToChangePassword=Error al cambiar la contraseña
+ErrorLoginDoesNotExists=El usuario con acceso <b>%s</b> no se pudo encontrar.
+ErrorLoginHasNoEmail=Este usuario no tiene dirección de correo electrónico. Proceso abortado.
+ErrorBadValueForCode=Valor incorrecto para el código de seguridad. Pruebe de nuevo con nuevo valor ...
+ErrorBothFieldCantBeNegative=Los campos%s y%s no pueden ser negativos
+ErrorFieldCantBeNegativeOnInvoice=El campo <strong>%s</strong> no puede ser negativo en este tipo de factura. Si necesita agregar una línea de descuento, simplemente cree el descuento primero (del campo '%s' en la tarjeta de cliente/proveedor) y aplíquelo a la factura.
+ErrorLinesCantBeNegativeForOneVATRate=El total de líneas no puede ser negativo para una tasa de IVA dada.
+ErrorQtyForCustomerInvoiceCantBeNegative=Cantidad de línea en las facturas de los clientes no puede ser negativa
+ErrorWebServerUserHasNotPermission=La cuenta de usuario <b>%s</b> utilizada para ejecutar el servidor web no tiene permiso para ello
+ErrorNoActivatedBarcode=No se ha activado ningún tipo de código de barras
+ErrUnzipFails=Error al descomprimir%s con ZipArchive
+ErrNoZipEngine=No hay motor para zip / descomprimir%s archivo en este PHP
+ErrorFileMustBeADolibarrPackage=El archivo%s debe ser un paquete Dolibarr zip
+ErrorModuleFileRequired=Debe seleccionar un archivo de paquete de módulo Dolibarr
+ErrorPhpCurlNotInstalled=PHP CURL no está instalado, esto es esencial para hablar con Paypal
+ErrorFailedToAddToMailmanList=Error al agregar el registro%s a la lista de Mailman%s o la base SPIP
+ErrorFailedToRemoveToMailmanList=No se pudo eliminar el registro%s en la lista de Mailman%s o en la base SPIP
+ErrorNewValueCantMatchOldValue=El nuevo valor no puede ser igual al anterior
+ErrorFailedToValidatePasswordReset=Error al reiniciar la contraseña. Puede ser el reinit ya estaba hecho (este enlace puede ser utilizado sólo una vez). Si no es así, intente reiniciar el proceso reinit.
+ErrorToConnectToMysqlCheckInstance=La conexión a la base de datos fallo. Compruebe el servidor de base de datos si está en ejecución (por ejemplo, con MySQL/MariaDB, se puede iniciar desde la línea de comandos con 'sudo service mysql start').
+ErrorFailedToAddContact=No se pudo agregar el contacto
+ErrorDateMustBeBeforeToday=La fecha no puede ser mayor que hoy
+ErrorPaymentModeDefinedToWithoutSetup=Se estableció un modo de pago para escribir%s, pero la configuración del módulo Factura no se completó para definir la información que se mostrará para este modo de pago.
+ErrorPHPNeedModule=Error, tu PHP debe tener el módulo <b>%s</b> instalado para usar esta función.
+ErrorOpenIDSetupNotComplete=Configure el archivo de configuración Dolibarr para permitir la autenticación OpenID, pero la URL del servicio OpenID no está definida en%s constante
+ErrorWarehouseMustDiffers=Los almacenes de origen y destino deben diferir
+ErrorBadFormat=Mal formato
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, este miembro aún no está vinculado a ningún tercero. Vincule un miembro a un tercero existente o cree un nuevo tercero antes de crear la suscripción con factura.
+ErrorThereIsSomeDeliveries=Error, hay algunas entregas vinculadas a este envío. Se ha rechazado la eliminación.
+ErrorCantDeletePaymentReconciliated=No se puede eliminar un pago que generó una entrada bancaria que se reconcilió
+ErrorCantDeletePaymentSharedWithPayedInvoice=No se puede eliminar un pago compartido por al menos una factura con estado Pagado
+ErrorPriceExpression3=Variable no definida '%s' en la definición de la función
+ErrorPriceExpression4=Caracteres ilegales'
+ErrorPriceExpression5=Inesperado '%s'
+ErrorPriceExpression6=Número incorrecto de argumentos (%s dado,%s esperado)
+ErrorPriceExpression8=Operador inesperado '%s'
+ErrorPriceExpression9=Se ha producido un error inesperado
+ErrorPriceExpression11=Esperando '%s'
+ErrorPriceExpression17=Variable no definida '%s'
+ErrorPriceExpression21=Resultado vacío '%s'
+ErrorPriceExpression22=Resultado negativo '%s'
+ErrorPriceExpression23=Variable desconocida o no establecida '%s' en%s
+ErrorSrcAndTargetWarehouseMustDiffers=Los almacenes de origen y destino deben diferir
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, tratando de hacer un movimiento de stock sin lote/serie, en el producto '%s' que requiere información de lotes/serie
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Todas las recepciones grabadas deben primero ser verificadas (aprobadas o denegadas) antes de que se les permita hacer esta acción
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Todas las recepciones grabadas deben primero ser verificadas (aprobadas) antes de que se les permita hacer esta acción
+ErrorGlobalVariableUpdater0=Error de la solicitud HTTP con error '%s'
+ErrorGlobalVariableUpdater1=El formato JSON no válido '%s'
+ErrorGlobalVariableUpdater2=Parámetro faltante '%s'
+ErrorGlobalVariableUpdater3=Los datos solicitados no se encontraron en el resultado
+ErrorGlobalVariableUpdater4=El cliente SOAP falló con error '%s'
+ErrorGlobalVariableUpdater5=Ninguna variable global seleccionada
+ErrorFieldMustBeANumeric=El campo <b>%s</b> debe ser un valor numérico
+ErrorMandatoryParametersNotProvided=Parámetros obligatorios no proporcionados
+ErrorOppStatusRequiredIfAmount=Establece una cantidad estimada para este cliente potencial. Por lo tanto, también debe ingresar su estado.
+ErrorFailedToLoadModuleDescriptorForXXX=Error al cargar la clase del descriptor del módulo para%s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Mala definición de la matriz de menús en el descriptor del módulo (valor incorrecto para la tecla fk_menu)
+ErrorSavingChanges=Se ha producido un error al guardar los cambios.
+ErrorWarehouseRequiredIntoShipmentLine=El almacén se requiere en la línea para enviar
+ErrorFileMustHaveFormat=El archivo debe tener el formato%s
+ErrorSupplierCountryIsNotDefined=El país para este vendedor no está definido. Corrija esto primero.
+ErrorsThirdpartyMerge=Error al fusionar los dos registros. Solicitud cancelada.
+ErrorStockIsNotEnoughToAddProductOnOrder=El inventario no es suficiente para que el producto%s lo agregue a un nuevo pedido.
+ErrorStockIsNotEnoughToAddProductOnInvoice=El inventario no es suficiente para que el producto%s lo agregue a una nueva factura.
+ErrorStockIsNotEnoughToAddProductOnShipment=El inventario no es suficiente para que el producto%s lo agregue a un nuevo envío.
+ErrorStockIsNotEnoughToAddProductOnProposal=El inventario no es suficiente para que el producto%s lo agregue a una nueva propuesta.
+ErrorFailedToLoadLoginFileForMode=Error al obtener la clave de inicio de sesión para el modo '%s'.
+ErrorModuleNotFound=No se encontró el archivo del módulo.
+ErrorFieldAccountNotDefinedForBankLine=Valor de la cuenta de Contabilidad no definido para la ID de la línea de origen%s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Valor de la cuenta de Contabilidad no definido para el ID de factura%s (%s)
+ErrorFieldAccountNotDefinedForLine=Valor para la cuenta de Contabilidad no definido para la línea (%s)
+ErrorBankStatementNameMustFollowRegex=Error, el nombre de la cuenta bancaria debe seguir la siguiente regla de sintaxis%s
+ErrorPhpMailDelivery=Compruebe que no utilice un número demasiado alto de destinatarios y que su contenido de correo electrónico no sea similar a un Spam. Pida también a su administrador que verifique los archivos de los cortafuegos y de los registros del servidor para obtener una información más completa.
+ErrorUserNotAssignedToTask=El usuario debe ser asignado a la tarea para poder ingresar tiempo consumido.
+ErrorModuleFileSeemsToHaveAWrongFormat=El paquete del módulo parece tener un formato incorrecto.
+ErrorFilenameDosNotMatchDolibarrPackageRules=El nombre del paquete de módulos (<strong>%s </ strong>) no coincide con la sintaxis de nombre esperada: <strong>%s </ strong>
+ErrorDuplicateTrigger=Error, nombre del disparador duplicado%s. Ya está cargado desde%s.
+ErrorNoWarehouseDefined=Error, no se han definido almacenes.
+ErrorBadLinkSourceSetButBadValueForRef=El enlace que utiliza no es válido. Se define una 'fuente' de pago, pero el valor de 'ref' no es válido.
+ErrorTooManyErrorsProcessStopped=Demasiados errores. Se detuvo el proceso.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=La validación de masas no es posible cuando la opción de aumentar / disminuir stock se establece en esta acción (debe validar uno por uno para que pueda definir el almacén para aumentar / disminuir)
+ErrorObjectMustHaveStatusDraftToBeValidated=El objeto%s debe tener el estado 'Borrador' para ser validado.
+ErrorObjectMustHaveLinesToBeValidated=El objeto%s debe tener líneas a validar.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Sólo se pueden enviar facturas validadas mediante la acción masiva "Enviar por correo electrónico".
+ErrorDiscountLargerThanRemainToPaySplitItBefore=El descuento que usted intenta aplicar es más grande que permanecer para pagar. Divida el descuento en 2 descuentos más pequeños antes.
+ErrorFileNotFoundWithSharedLink=Archivo no fue encontrado. Puede ser que la clave compartida se haya modificado o que el archivo se haya eliminado recientemente.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Tenga en cuenta que no es posible utilizar productos virtuales para aumentar/disminuir automáticamente subproductos cuando al menos un subproducto (o subproducto de subproductos) necesita un número de serie/lote.
+ErrorDescRequiredForFreeProductLines=La descripción es obligatoria para campos con producto gratis
+ErrorDuringChartLoad=Error al cargar el plan de cuentas. Si no se cargaron algunas cuentas, aún puede ingresarlas manualmente.
+ErrorBadSyntaxForParamKeyForContent=Mala sintaxis para param keyforcontent. Debe tener un valor que comience con %s o %s
+ErrorVariableKeyForContentMustBeSet=Error, se debe establecer la constante con el nombre %s (con contenido de texto para mostrar) o %s (con url externa para mostrar).
+ErrorURLMustStartWithHttp=La URL %s debe comenzar con http: // o https: //
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, no es posible eliminar el pago vinculado a una factura cerrada.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Los objetos deben tener el estado 'Activo' para estar deshabilitado
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Los objetos deben tener el estado 'Borrador' o 'Deshabilitado' para estar habilitado
+ErrorNoFieldWithAttributeShowoncombobox=Ningún campo tiene la propiedad 'showoncombobox' en la definición del objeto '%s'. No hay forma de mostrar la combolista.
+ProblemIsInSetupOfTerminal=El problema está en la configuración del terminal %s.
+ErrorAddAtLeastOneLineFirst=Agregue al menos una línea primero
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, el idioma es obligatorio si configura la página como una traducción de otra.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, el idioma de la página traducida es el mismo que este.
+ErrorBatchNoFoundForProductInWarehouse=No se encontró lote / serie para el producto "%s" en el almacén "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No hay suficiente cantidad para este lote / serie para el producto "%s" en el almacén "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=Solo es posible 1 campo para 'Agrupar por' (otros se descartan)
+ErrorTooManyDifferentValueForSelectedGroupBy=Se encontraron demasiados valores diferentes (más de <b>%s</b>) para el campo '<b>%s</b>', por lo que no podemos usarlo para los gráficos. El campo 'Agrupar por' ha sido eliminado. ¿Puede ser que quieras usarlo como un eje X?
+ErrorReplaceStringEmpty=Error, la cadena para reemplazar está vacía
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Su parámetro PHP upload_max_filesize (%s) es más alto que el parámetro PHP post_max_size (%s). Esta no es una configuración consistente.
+WarningPasswordSetWithNoAccount=Se ha establecido una contraseña para este miembro. Sin embargo, no se creó ninguna cuenta de usuario. Por lo tanto, esta contraseña está almacenada pero no puede utilizarse para iniciar sesión en Dolibarr. Puede ser utilizado por un módulo / interfaz externo, pero si no necesita definir ningún inicio de sesión ni contraseña para un miembro, puede desactivar la opción "Administrar un inicio de sesión para cada miembro" desde la instalación del módulo miembro. Si necesita administrar un inicio de sesión pero no necesita ninguna contraseña, puede mantener este campo vacío para evitar esta advertencia. Nota: El correo electrónico también se puede utilizar como inicio de sesión si el miembro está vinculado a un usuario.
+WarningMandatorySetupNotComplete=Haga clic aquí para configurar los parámetros obligatorios.
+WarningEnableYourModulesApplications=Haga clic aquí para habilitar sus módulos y aplicaciones.
+WarningSafeModeOnCheckExecDir=Advertencia, la opción PHP <b> safe_mode </b> está activada para que el comando se almacene dentro de un directorio declarado por el parámetro php <b> safe_mode_exec_dir </b>.
+WarningBookmarkAlreadyExists=Ya existe un marcador con este título o este destino (URL).
+WarningPassIsEmpty=Advertencia, la contraseña de la base de datos está vacía. Este es un agujero de seguridad. Debe agregar una contraseña a su base de datos y cambiar su archivo conf.php para reflejar esto.
+WarningConfFileMustBeReadOnly=Advertencia, el archivo de configuración (<b> htdocs / conf / conf.php </b>) puede ser sobrescrito por el servidor web. Este es un grave agujero de seguridad. Modifique los permisos en el archivo para que estén en modo de sólo lectura para el usuario del sistema operativo utilizado por el servidor Web. Si utiliza el formato Windows y FAT para su disco, debe saber que este sistema de archivos no permite agregar permisos en el archivo, por lo que no puede ser completamente seguro.
+WarningsOnXLines=Advertencias en <b>%s</b> registro (s) de origen
+WarningNoDocumentModelActivated=No se ha activado ningún modelo para la generación de documentos. Se elegirá un modelo por defecto hasta que verifique la configuración de su módulo.
+WarningLockFileDoesNotExists=Advertencia, una vez finalizada la configuración, debe deshabilitar las herramientas de instalación / migración agregando un archivo <b>install.lock</b> en el directorio <b>%s</b>. Omitir la creación de este archivo es un grave riesgo de seguridad.
+WarningUntilDirRemoved=Todas las advertencias de seguridad (visibles solo para usuarios de administración) permanecerán activas mientras la vulnerabilidad esté presente (o se agregue la constante MAIN_REMOVE_INSTALL_WARNING en Configuración-> Otra configuración).
+WarningCloseAlways=Advertencia, el cierre se realiza incluso si la cantidad difiere entre los elementos de origen y destino. Active esta función con precaución.
+WarningUsingThisBoxSlowDown=Advertencia, usar esta casilla ralentizar seriamente todas las páginas que muestran la caja.
+WarningClickToDialUserSetupNotComplete=La configuración de la información de ClickToDial para su usuario no está completa (vea la pestaña ClickToDial en su tarjeta de usuario).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Función desactivada cuando la configuración de la pantalla está optimizada para navegadores de persona o de texto.
+WarningPaymentDateLowerThanInvoiceDate=La fecha de pago (%s) es anterior a la fecha de factura (%s) para la factura%s.
+WarningTooManyDataPleaseUseMoreFilters=Demasiados datos (más de%s líneas). Utilice más filtros o establezca el%s constante en un límite superior.
+WarningSomeLinesWithNullHourlyRate=Algunas veces fueron grabadas por algunos usuarios mientras que su tasa horaria no fue definida. Se usó un valor de 0%s por hora, pero esto puede dar lugar a una valoración errónea del tiempo empleado.
+WarningYourLoginWasModifiedPleaseLogin=Se ha modificado tu nombre de usuario. Por razones de seguridad, tendrá que iniciar sesión con su nuevo inicio de sesión antes de la siguiente acción.
+WarningNumberOfRecipientIsRestrictedInMassAction=Advertencia, el número de destinatarios diferentes se limita a <b>%s</b> cuando se utilizan las acciones en masa en las listas\n
+WarningSomeBankTransactionByChequeWereRemovedAfter=Algunas transacciones bancarias se eliminaron después de que se generó el recibo, incluidos ellos. Por lo tanto, el número de cheques y el total del recibo pueden diferir del número y el total en la lista.
diff --git a/htdocs/langs/es_EC/exports.lang b/htdocs/langs/es_EC/exports.lang
new file mode 100644
index 00000000000..b1f9927f4d1
--- /dev/null
+++ b/htdocs/langs/es_EC/exports.lang
@@ -0,0 +1,109 @@
+# Dolibarr language file - Source file is en_US - exports
+SelectExportDataSet=Elija el dataset que desea exportar...
+SelectImportDataSet=Elija el dataset que desea importar...
+SelectExportFields=Elija los campos que desea exportar o seleccione un perfil de exportación predefinido
+SelectImportFields=Elija los campos de archivo de origen que desea importar y su campo de destino en la base de datos moviéndolos hacia arriba y hacia abajo con el ancla %s, o seleccione un perfil de importación predefinido:
+NotImportedFields=Campos del archivo de origen no importados
+SaveExportModel=Guarde sus selecciones como un perfil / plantilla de exportación (para reutilizarlo).
+SaveImportModel=Guardar este perfil de importación (para reutilizarlo) ...
+ExportModelName=Exportar nombre del perfil
+ExportModelSaved=Exportar perfil guardado como <b>%s</b>.
+ExportedFields=Campos exportados
+ImportModelName=Importar nombre de perfil
+ImportModelSaved=Importar perfil guardado como <b>%s</b>.
+DatasetToExport=Juego de datos para exportar
+DatasetToImport=Importar archivo en conjunto de datos
+ChooseFieldsOrdersAndTitle=Seleccione el orden de los campos...
+FieldsTitle=Título de los campos
+FieldTitle=Título del campo
+NowClickToGenerateToBuildExportFile=Ahora, seleccione el formato de archivo en el cuadro combinado y haga clic en "Generar" para compilar el archivo de exportación ...
+LibraryShort=Biblioteca
+FormatedImport=Asistente de Importación
+FormatedImportDesc1=Este módulo le permite actualizar los datos existentes o agregar nuevos objetos a la base de datos desde un archivo sin conocimientos técnicos, usando un asistente.
+FormatedImportDesc2=El primer paso es elegir el tipo de datos que desea importar, luego el formato del archivo fuente y luego los campos que desea importar.
+FormatedExportDesc1=Estas herramientas permiten la exportación de datos personalizados con un asistente, para ayudarlo en el proceso sin necesidad de conocimientos técnicos.
+FormatedExportDesc2=El primer paso es elegir un conjunto de datos predefinido, luego los campos que desea exportar y en qué orden.
+FormatedExportDesc3=Cuando se seleccionan los datos para exportar, puede elegir el formato del archivo de salida.
+NoImportableData=Ningún dato importable (sin módulo con definiciones para permitir importaciones de datos)
+SQLUsedForExport=Solicitud SQL utilizada para extraer datos
+LineDescription=Descripción de la línea
+LineVATRate=Tasa de IVA de la línea
+LineQty=Cantidad por línea
+LineTotalHT=Cantidad excl. impuesto por línea
+LineTotalTTC=Importe con impuesto para la línea
+LineTotalVAT=Importe del IVA para la línea
+TypeOfLineServiceOrProduct=Tipo de línea (0 = producto, 1 = servicio)
+FileWithDataToImport=Archivo con datos para importar
+FileToImport=Archivo de origen para importar
+FileMustHaveOneOfFollowingFormat=El archivo a importar debe tener uno de los siguientes formatos.
+DownloadEmptyExample=Descargar archivo de plantilla con información de contenido de campo (* son campos obligatorios)
+ChooseFormatOfFileToImport=Elija el formato de archivo para usar como formato de archivo de importación haciendo clic en el icono %s para seleccionarlo ...
+SourceFileFormat=Formato del archivo fuente
+FieldsInSourceFile=Campos del archivo de origen
+FieldsInTargetDatabase=Campos de destino en la base de datos Dolibarr (negrita
+NoFields=Sin campos
+MoveField=Mover número de columna de campo%s
+ExampleOfImportFile=Ejemplo_de_archivo_import
+ErrorImportDuplicateProfil=Error al guardar este perfil de importación con este nombre. Ya existe un perfil existente con este nombre.
+TablesTarget=Tablas específicas
+FieldsTarget=Campos específicos
+FieldTarget=Campo de orientación
+FieldSource=Campo de origen
+NbOfSourceLines=Número de líneas en el archivo de origen
+NowClickToTestTheImport=Verifique que el formato del archivo (delimitadores de campo y cadena) de su archivo coincida con las opciones que se muestran y que ha omitido la línea de encabezado, o se marcarán como errores en la siguiente simulación. <br> Haga clic en el botón "<b>%s</b>" para ejecutar una verificación de la estructura / contenido del archivo y simular el proceso de importación. <br> <b> No se modificarán datos en su base de datos </b>.
+RunSimulateImportFile=Ejecutar simulación de importación
+FieldNeedSource=Este campo requiere datos del archivo de origen
+SomeMandatoryFieldHaveNoSource=Algunos campos obligatorios no tienen fuente de archivo de datos
+InformationOnSourceFile=Información sobre el archivo fuente
+InformationOnTargetTables=Información sobre los campos objetivo
+SelectAtLeastOneField=Cambiar al menos un campo de origen en la columna de campos para exportar
+SelectFormat=Elija este formato de archivo de importación
+RunImportFile=Datos de importacion
+NowClickToRunTheImport=166/5000\nCompruebe los resultados de la simulación de importación. Corrija cualquier error y vuelva a realizar la prueba. <br> Cuando la simulación no informe errores, puede proceder a importar los datos a la base de datos.
+DataLoadedWithId=Los datos importados tendrán un campo adicional en cada tabla de base de datos con este ID de importación: <b> %s </b>, para permitir que se pueda buscar en el caso de investigar un problema relacionado con esta importación.
+ErrorMissingMandatoryValue=Los datos obligatorios están vacíos en el archivo fuente para el campo <b>%s</b>.
+TooMuchErrors=Todavía hay <b>%s</b> otras líneas fuente con errores, pero la salida ha sido limitada.
+TooMuchWarnings=Todavía hay <b>%s</b> otras líneas fuente con advertencias pero la salida ha sido limitada.
+EmptyLine=Línea vacía (se descartará)
+CorrectErrorBeforeRunningImport=<b>Debe</b> corregir todos los errores <b>antes</b> de ejecutar la importación definitiva.
+FileWasImported=Se importó el archivo con el número <b>%s</b>.
+YouCanUseImportIdToFindRecord=Puede encontrar todos los registros importados en su base de datos al filtrar en el campo <b>import_key ='%s'</b>.
+NbOfLinesOK=Número de líneas sin errores y sin advertencias: <b>%s</b>.
+NbOfLinesImported=Número de líneas importadas correctamente: <b>%s</b>.
+DataComeFromNoWhere=El valor de insertar viene de ninguna parte en el archivo de origen.
+DataComeFromFileFieldNb=El valor del inserto viene del número de campo <b>%s</b> en el archivo de origen.
+DataComeFromIdFoundFromRef=El valor que proviene del número <b>%s</b> de campo del archivo de origen se utilizará para encontrar el ID del objeto principal que se usará (por lo que el objeto <b>%s</b> que tiene la referencia del archivo de origen debe existir en la base de datos).
+DataComeFromIdFoundFromCodeId=El código que proviene del número <b>%s</b> de campo del archivo de origen se usará para encontrar la identificación del objeto principal que se usará (por lo que el código del archivo de origen debe existir en el diccionario <b>%s</b>). Tenga en cuenta que si conoce el ID, también puede usarlo en el archivo de origen en lugar del código. La importación debería funcionar en ambos casos.
+DataIsInsertedInto=Los datos procedentes del archivo fuente se insertarán en el siguiente campo:
+DataIDSourceIsInsertedInto=El ID del objeto principal se encontró utilizando los datos en el archivo de origen, se insertará en el siguiente campo:
+DataCodeIDSourceIsInsertedInto=El id de la línea principal encontrada en el código, se insertará en el siguiente campo:
+SourceRequired=El valor de los datos es obligatorio
+SourceExample=Ejemplo de posible valor de datos
+ExampleAnyRefFoundIntoElement=Cualquier referencia encontrada para el elemento <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Cualquier código (o id) encontrado en el diccionario <b>%s</b>
+CSVFormatDesc=<b> Formato de archivo de valores separados por comas</b> (.csv). <br>Este es un formato de archivo de texto donde los campos están separados por un separador [ %s ]. Si se encuentra un separador dentro del contenido de un campo, el campo se redondea con un carácter redondo [ %s ]. El personaje de escape para escapar del personaje redondo es [ %s ].
+Excel95FormatDesc=Formato de archivo de <b> Excel </b> (.xls) <br> Este es el formato nativo de Excel 95 (BIFF5).
+Excel2007FormatDesc=Formato de archivo de <b>Excel</b> (.xlsx) <br> Este es el formato nativo de Excel 2007 (SpreadsheetML).
+TsvFormatDesc=<b> Formato de archivo de separación de valores </b> (.tsv) <br> Este es un formato de archivo de texto en el que los campos están separados por tabulador [pestaña].
+ExportFieldAutomaticallyAdded=El campo <b>%s</b> se agregó automáticamente. Evitará que usted tenga líneas similares para ser tratado como expediente duplicado (con este campo agregado, todas las líneas poseerán su propia identificación y diferirán).
+Enclosure=Delimitador de cuerdas
+ExportStringFilter=%% permite reemplazar uno o más caracteres en el texto
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filtra por un año / mes / día<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filtra en un rango de años / meses / días<br> > YYYY, > YYYYMM, > YYYYMMDD: filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD: filtros en todos los años / meses / días anteriores
+ExportNumericFilter=Filtros NNNNN por un valor<br>Filtros NNNNN + NNNNN sobre un rango de valores<br><Filtros NNNNN por valores inferiores<br>Filtros NNNNN por valores más altos
+ImportFromLine=Importación a partir del número de línea
+EndAtLineNb=Finalizar en el número de línea
+ImportFromToLine=Rango límite (De - Para). Ej. Para omitir la línea(s) de encabezado.
+SetThisValueTo2ToExcludeFirstLine=Por ejemplo, establezca este valor en 3 para excluir las 2 primeras líneas. <br> Si las líneas del encabezado NO se omiten, esto generará múltiples errores en la simulación de importación.
+KeepEmptyToGoToEndOfFile=Mantenga este campo vacío para procesar todas las líneas hasta el final del archivo.
+SelectPrimaryColumnsForUpdateAttempt=Seleccione la columna(s) para usar como clave principal para una importación de ACTUALIZACIÓN
+UpdateNotYetSupportedForThisImport=La actualización no es compatible con este tipo de importación (sólo insertar)
+NoUpdateAttempt=No se realizó ningún intento de actualización, sólo insertar
+ImportDataset_user_1=Usuarios (empleados o no) y propiedades
+ComputedField=Campo calculado
+SelectFilterFields=Si desea filtrar algunos valores, simplemente ingrese valores aquí.
+FilteredFieldsValues=Valor del filtro
+FormatControlRule=Regla de control de formato
+KeysToUseForUpdates=Clave (columna) a usar para <b> actualizar </b> los datos existentes
+NbInsert=Número de líneas insertadas:%s
+NbUpdate=Número de líneas actualizadas:%s
+MultipleRecordFoundWithTheseFilters=Se han encontrado varios registros con estos filtros:%s
diff --git a/htdocs/langs/es_EC/externalsite.lang b/htdocs/langs/es_EC/externalsite.lang
new file mode 100644
index 00000000000..2ebc56b30e5
--- /dev/null
+++ b/htdocs/langs/es_EC/externalsite.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExternalSiteSetup=Configurar enlace a un sitio web externo
+ExternalSiteModuleNotComplete=El módulo SitioExterno no estaba configurado correctamente.
+ExampleMyMenuEntry=Mi entrada en el menú
diff --git a/htdocs/langs/es_EC/ftp.lang b/htdocs/langs/es_EC/ftp.lang
new file mode 100644
index 00000000000..6a3ad20d130
--- /dev/null
+++ b/htdocs/langs/es_EC/ftp.lang
@@ -0,0 +1,12 @@
+# Dolibarr language file - Source file is en_US - ftp
+NewFTPClient=Nueva configuración de conexión FTP
+FTPArea=Área de FTP
+FTPAreaDesc=Esta pantalla muestra una vista de un servidor FTP.
+SetupOfFTPClientModuleNotComplete=La configuración del módulo de cliente FTP parece estar incompleta
+FTPFeatureNotSupportedByYourPHP=Su PHP no admite funciones FTP
+FailedToConnectToFTPServer=Error al conectarse al servidor FTP (servidor%s, puerto%s)
+FailedToConnectToFTPServerWithCredentials=Error al iniciar sesión en el servidor FTP con nombre de usuario/contraseña definidos
+FTPFailedToRemoveFile=Error al eliminar el archivo <b>%s</b>.
+FTPFailedToRemoveDir=Error al eliminar el directorio <b>%s</b>: verifique los permisos y que el directorio esté vacío.
+ChooseAFTPEntryIntoMenu=Elija un sitio FTP del menú ...
+FailedToGetFile=Error al obtener los archivos %s
diff --git a/htdocs/langs/es_EC/help.lang b/htdocs/langs/es_EC/help.lang
new file mode 100644
index 00000000000..42a326106a6
--- /dev/null
+++ b/htdocs/langs/es_EC/help.lang
@@ -0,0 +1,18 @@
+# Dolibarr language file - Source file is en_US - help
+CommunitySupport=Foro de soporte
+EMailSupport=Soporte por correos electrónicos
+RemoteControlSupport=Soporte en línea en tiempo real / remoto
+OtherSupport=Otro soporte
+HelpCenter=Centro de ayuda
+DolibarrHelpCenter=Centro de Ayuda y Soporte Dolibarr
+TypeOfSupport=Tipo de apoyo
+TypeSupportCommunauty=Comunidad (gratis)
+NeedHelpCenter=¿Necesita ayuda o apoyo?
+Efficiency=Eficiencia
+TypeHelpOnly=Solo ayuda
+TypeHelpDevForm=Ayuda + Desarrollo + Entrenamiento
+BackToHelpCenter=De lo contrario, <a href="%s">vuelva a la página de inicio del centro de ayuda</a>.
+LinkToGoldMember=Puede llamar a uno de los capacitadores preseleccionados por Dolibarr para su idioma (%s) haciendo clic en su Widget (el estado y el precio máximo se actualizan automáticamente):
+PossibleLanguages=Idiomas admitidos
+SubscribeToFoundation=Ayuda al proyecto Dolibarr, suscríbete a la fundación.
+SeeOfficalSupport=Para soporte oficial de Dolibarr en tu idioma: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/es_EC/holiday.lang b/htdocs/langs/es_EC/holiday.lang
new file mode 100644
index 00000000000..948a8d8d808
--- /dev/null
+++ b/htdocs/langs/es_EC/holiday.lang
@@ -0,0 +1,108 @@
+# Dolibarr language file - Source file is en_US - holiday
+Holidays=Hoja
+CPTitreMenu=Hoja
+MenuAddCP=Nueva solicitud de licencia
+NotActiveModCP=Debes habilitar el módulo Licencia para ver esta página.
+AddCP=Hacer una solicitud de licencia
+DateDebCP=Fecha de inicio
+DateFinCP=Fecha final
+ToReviewCP=Esperando aprobacion
+ApprovedCP=Aprobado
+CancelCP=Cancelado
+RefuseCP=Rechazado
+ListeCP=Lista de licencia
+LeaveId=ID de Salida
+ReviewedByCP=Será aprobado por
+UserForApprovalID=ID de aprobación del usuario
+UserForApprovalFirstname=Nombre del usuario de aprobación
+SendRequestCP=Crear solicitud de licencia
+DelayToRequestCP=Las solicitudes de permiso deben ser hechas al menos <b>%s día (s) </b> antes de ellas.
+MenuConfCP=Balance de licencia
+SoldeCPUser=El saldo de licencia es <b>%s</b> dias
+ErrorEndDateCP=Debe seleccionar una fecha de finalización mayor que la fecha de inicio.
+ErrorSQLCreateCP=Se produjo un error SQL durante la creación:
+ErrorIDFicheCP=Se ha producido un error, la solicitud de licencia no existe.
+ReturnCP=volver a la pagina anterior
+ErrorUserViewCP=Usted no está autorizado a leer esta solicitud de licencia.
+InfosWorkflowCP=Flujo de trabajo de información
+RequestByCP=Solicitado por
+TitreRequestCP=Dejar petición
+TypeOfLeaveId=Tipo de ID de salida
+TypeOfLeaveCode=Tipo de código de salida
+TypeOfLeaveLabel=Tipo de etiqueta de salida
+NbUseDaysCP=Número de días de vacaciones consumidos
+NbUseDaysCPShortInMonth=Días consumidos en el mes
+EditCP=Editar
+DeleteCP=Borrar
+ActionRefuseCP=Desperdicios
+ActionCancelCP=Cancelar
+TitleDeleteCP=Eliminar la solicitud de licencia
+ConfirmDeleteCP=Confirmar la eliminación de esta solicitud de licencia?
+ErrorCantDeleteCP=Error no tiene derecho a eliminar esta solicitud de licencia.
+CantCreateCP=Usted no tiene derecho a hacer solicitudes de licencia.
+InvalidValidatorCP=Usted debe elegir un aprobador para su solicitud de licencia.
+NoDateDebut=Debe seleccionar una fecha de inicio.
+NoDateFin=Debe seleccionar una fecha de finalización.
+ErrorDureeCP=Su solicitud de permiso no contiene días hábiles.
+TitleValidCP=Aprobar la solicitud de permiso
+ConfirmValidCP=¿Estás seguro de que quieres aprobar la solicitud de licencia?
+DateValidCP=Fecha de aprobación
+TitleToValidCP=Enviar solicitud de licencia
+ConfirmToValidCP=¿Estás seguro de que quieres enviar la solicitud de permiso?
+TitleRefuseCP=Rechazar la solicitud de licencia
+ConfirmRefuseCP=¿Estás seguro de que quieres rechazar la solicitud de licencia?
+NoMotifRefuseCP=Debe elegir una razón para rechazar la solicitud.
+TitleCancelCP=Cancelar la solicitud de licencia
+ConfirmCancelCP=¿Está seguro de que desea cancelar la solicitud de licencia?
+DetailRefusCP=Razón de la denegación
+DateRefusCP=Fecha de la denegación
+DateCancelCP=Fecha de cancelación
+DefineEventUserCP=Asignar una licencia excepcional para un usuario
+addEventToUserCP=Asignar licencia
+NotTheAssignedApprover=Usted no es el usuario para autorizar asignado
+MotifCP=Razón
+ErrorAddEventToUserCP=Se ha producido un error al agregar la licencia excepcional.
+AddEventToUserOkCP=La adición de la licencia excepcional ha sido completada.
+MenuLogCP=Ver registros de cambios
+LogCP=Registro de actualizaciones de los días de vacaciones disponibles
+ActionByCP=Interpretado por
+PrevSoldeCP=Balance anterior
+NewSoldeCP=Nuevo equilibrio
+alreadyCPexist=Ya se ha hecho una solicitud de permiso en este período
+FirstDayOfHoliday=Primer día de vacaciones
+LastDayOfHoliday=Último día de vacaciones
+BoxTitleLastLeaveRequests=Últimas solicitudes de licencia modificadas%s
+HolidaysCancelation=Cancelación de la solicitud de permiso
+EmployeeLastname=Apellido del empleado
+TypeWasDisabledOrRemoved=El tipo de licencia (id%s) fue deshabilitado o eliminado
+LastHolidays=Últimas %s solicitudes de permiso
+AllHolidays=Todas las solicitudes de permiso
+LEAVE_PAID=Vacaciones pagas
+LEAVE_SICK=Permiso por enfermedad
+LEAVE_OTHER=Otro permiso
+LEAVE_PAID_FR=Vacaciones pagas
+LastUpdateCP=Última actualización automática de la asignación de vacaciones
+MonthOfLastMonthlyUpdate=Mes de la última actualización automática de la asignación de vacaciones
+UpdateConfCPOK=Actualizado correctamente.
+Module27130Name= Gestión de solicitudes de licencia
+Module27130Desc= Gestión de solicitudes de licencia
+ErrorMailNotSend=Se ha producido un error al enviar un correo electrónico:
+HolidaysToValidate=Validar solicitudes de licencia
+HolidaysToValidateBody=A continuación se muestra una solicitud de permiso para validar
+HolidaysToValidateDelay=Esta solicitud de licencia tendrá lugar dentro de un período de menos de%s días.
+HolidaysToValidateAlertSolde=El usuario que realizó esta solicitud de licencia no tiene suficientes días disponibles.
+HolidaysValidated=Solicitud de licencia validada
+HolidaysValidatedBody=Su solicitud de licencia para%s a%s ha sido validada.
+HolidaysRefused=Solicitud rechazada
+HolidaysRefusedBody=Su solicitud de licencia para %s a %s ha sido denegada por el siguiente motivo:
+HolidaysCanceled=Solicitud de hoja cancelada
+HolidaysCanceledBody=Se ha cancelado la solicitud de licencia de%s a%s.
+FollowedByACounter=1: Este tipo de permiso debe ser seguido por un contador. El contador se incrementa manual o automáticamente y cuando se valida una solicitud de permiso, el contador se decrementa. <br> 0: No seguido por un contador.
+NoLeaveWithCounterDefined=No hay tipos de permiso definidos que necesitan ser seguidos por un contador
+GoIntoDictionaryHolidayTypes=Ir a <strong> Inicio - Configuración - Diccionarios - Tipo de permiso </strong> para configurar los diferentes tipos de permisos.
+HolidaySetup=Configuración del módulo Vacaciones
+HolidaysNumberingModules=Solicitud de licencia modelos de numeración
+TemplatePDFHolidays=Plantilla para solicitudes de permisos PDF
+FreeLegalTextOnHolidays=Texto libre en PDF
+WatermarkOnDraftHolidayCards=Marcas de agua en las solicitudes de permiso borrador
+NobodyHasPermissionToValidateHolidays=Nadie tiene permiso para validar vacaciones
diff --git a/htdocs/langs/es_EC/hrm.lang b/htdocs/langs/es_EC/hrm.lang
new file mode 100644
index 00000000000..73edf08dd2c
--- /dev/null
+++ b/htdocs/langs/es_EC/hrm.lang
@@ -0,0 +1,7 @@
+# Dolibarr language file - Source file is en_US - hrm
+HRM_EMAIL_EXTERNAL_SERVICE=Correo electrónico para prevenir el servicio externo de RRHH
+ConfirmDeleteEstablishment=¿Estás seguro de que deseas eliminar este establecimiento?
+OpenEtablishment=Establecimiento abierto
+DictionaryPublicHolidays=HRM - Días festivos
+DictionaryDepartment=RRHH - Lista de departamento
+DictionaryFunction=RRHH - Lista de funciones
diff --git a/htdocs/langs/es_EC/install.lang b/htdocs/langs/es_EC/install.lang
new file mode 100644
index 00000000000..8e8276536a9
--- /dev/null
+++ b/htdocs/langs/es_EC/install.lang
@@ -0,0 +1,191 @@
+# Dolibarr language file - Source file is en_US - install
+InstallEasy=Siga las instrucciones paso a paso.
+MiscellaneousChecks=Comprobación de requisitos previos
+ConfFileExists=Existe el archivo de configuración <b>%s</b>.
+ConfFileDoesNotExistsAndCouldNotBeCreated=¡El archivo de configuración <b>%s</b> no existe y no se pudo crear!
+ConfFileCouldBeCreated=Se podría crear el archivo de configuración<b>%s</b>.
+ConfFileIsNotWritable=El archivo de configuración <b>%s</b> no se puede escribir. Compruebe los permisos. Para la primera instalación, su servidor web debe poder escribir en este archivo durante el proceso de configuración ("chmod 666", por ejemplo, en un sistema operativo tipo Unix).
+ConfFileIsWritable=El archivo de configuración<b>%s</b> puede escribirse.
+ConfFileMustBeAFileNotADir=El archivo de configuración <b>%s</b> debe ser un archivo, no un directorio.
+ConfFileReload=Recarga de parámetros desde un archivo de configuración.
+PHPSupportSessions=Este PHP soporta sesiones.
+PHPSupportPOSTGETOk=Este PHP soporta las variables POST y GET.
+PHPSupportPOSTGETKo=Es posible que su configuración de PHP no admita las variables POST y/o GET. Compruebe el parámetro <b>variables_order</b> en php.ini.
+PHPSupportGD=Este PHP soporta funciones gráficas GD.
+PHPSupportCurl=Este PHP soporta Curl.
+PHPSupportUTF8=Este PHP soporta funciones UTF8.
+PHPSupportIntl=Este PHP soporta funciones Intl.
+PHPSupportxDebug=Este PHP admite funciones de depuración extendidas.
+PHPSupport=Este PHP admite funciones %s.
+PHPMemoryOK=La memoria de sesión PHP max está configurada en<b>%s</b>. Esto debería ser suficiente.
+PHPMemoryTooLow=Su memoria de sesión de PHP max está configurada en <b>%s</b> bytes. Esto es demasiado bajo. Cambie su <b>php.ini</b> para establecer el parámetro <b>memory_limit</b> en al menos <b>%s</b>bytes.
+Recheck=Haga clic aquí para una prueba más detallada
+ErrorPHPDoesNotSupportSessions=Su instalación de PHP no soporta sesiones. Esta función es necesaria para permitir que Dolibarr funcione. Compruebe su configuración de PHP y permisos del directorio de sesiones.
+ErrorPHPDoesNotSupportGD=Su instalación de PHP no soporta funciones gráficas de GD. No habrá gráficos disponibles.
+ErrorPHPDoesNotSupportCurl=Su instalación de PHP no admite Curl.
+ErrorPHPDoesNotSupportCalendar=Su instalación de PHP no admite extensiones de calendario php.
+ErrorPHPDoesNotSupportUTF8=Su instalación de PHP no es compatible con las funciones UTF8. Dolibarr no puede funcionar correctamente. Resuelve esto antes de instalar Dolibarr.
+ErrorPHPDoesNotSupportIntl=Su instalación de PHP no es compatible con las funciones Intl.
+ErrorPHPDoesNotSupportxDebug=Su instalación de PHP no admite funciones de depuración ampliadas.
+ErrorPHPDoesNotSupport=Su instalación de PHP no es compatible con las funciones %s.
+ErrorDirDoesNotExists=El directorio%s no existe.
+ErrorGoBackAndCorrectParameters=Regresa y revisa/corrige los parámetros.
+ErrorWrongValueForParameter=Es posible que haya escrito un valor incorrecto para el parámetro '%s'.
+ErrorFailedToConnectToDatabase=Error al conectarse a la base de datos '%s'.
+ErrorDatabaseVersionTooLow=Versión de base de datos (%s) demasiado antigua. Se requiere la versión%s o superior.
+ErrorPHPVersionTooLow=La versión de PHP es demasiado antigua. Se requiere la versión%s.
+ErrorConnectedButDatabaseNotFound=La conexión al servidor fue exitosa pero la base de datos '%s' no se encontró
+IfDatabaseNotExistsGoBackAndUncheckCreate=Si la base de datos no existe, vuelva atrás y marque la opción "Crear base de datos".
+IfDatabaseExistsGoBackAndCheckCreate=Si la base de datos ya existe, vuelva atrás y desactive la opción "Crear base de datos".
+WarningBrowserTooOld=La versión del navegador es demasiado antigua. Se recomienda encarecidamente actualizar su navegador a una versión reciente de Firefox, Chrome u Opera.
+PHPVersion=Versión de PHP
+License=Uso de licencia
+WebPagesDirectory=Directorio donde se guardan las páginas web
+DocumentsDirectory=Directorio para almacenar los documentos subidos y generados
+URLRoot=URL de la raíz
+CheckToForceHttps=Marque esta opción para forzar conexiones seguras (https). <br> Esto requiere que el servidor web esté configurado con un certificado SSL.
+DatabaseType=Tipo de base de datos
+ServerAddressDescription=Nombre o dirección IP para el servidor de base de datos. Normalmente, 'localhost' cuando el servidor de la base de datos está alojado en el mismo servidor que el servidor web.
+ServerPortDescription=Puerto del servidor de base de datos. Manténgase vacío si es desconocido.
+DatabasePrefix=Prefijo de tabla de base de datos
+AdminLogin=Cuenta de usuario para el propietario de la base de datos Dolibarr.
+PasswordAgain=Vuelva a escribir la confirmación de la contraseña
+AdminPassword=Contraseña para el propietario de la base de datos de Dolibarr.
+CreateDatabase=Crear base de datos
+CreateUser=Cree una cuenta de usuario o otorgue permiso de cuenta de usuario en la base de datos de Dolibarr
+DatabaseSuperUserAccess=Servidor de base de datos - Acceso de superusuario
+CheckToCreateDatabase=Marque la casilla si la base de datos aún no existe y, por lo tanto, debe crearse. <br>En este caso, también debe ingresar el nombre de usuario y la contraseña de la cuenta de superusuario en la parte inferior de esta página.
+CheckToCreateUser=Marque la casilla si: <br>la cuenta de usuario de la base de datos aún no existe y, por lo tanto, debe crearse, o <br>si la cuenta de usuario existe pero la base de datos no existe y se deben otorgar permisos. <br>En este caso, debe ingresar la cuenta de usuario y la contraseña y <b>también</b> el nombre de usuario y la contraseña del superusuario en la parte inferior de esta página. Si esta casilla no está marcada, el propietario de la base de datos y la contraseña ya deben existir.
+KeepEmptyIfNoPassword=Deje en blanco si el superusuario no tiene contraseña (NO se recomienda)
+ServerConnection=Conexión del servidor
+DatabaseCreation=Creación de bases de datos
+CreateDatabaseObjects=Creación de objetos de base de datos
+ReferenceDataLoading=Carga de datos de referencia
+TablesAndPrimaryKeysCreation=Creación de tablas y claves primarias
+CreateTableAndPrimaryKey=Crear tabla%s
+CreateOtherKeysForTable=Crear claves e índices externos para la tabla%s
+OtherKeysCreation=Creación de claves e índices extranjeros
+AdminAccountCreation=Creación de inicio de sesión de administrador
+PleaseTypePassword=Por favor escriba una contraseña, las contraseñas vacías no están permitidas!
+PleaseTypeALogin=Por favor escriba un nombre de usuario!
+PasswordsMismatch=Las contraseñas difieren, por favor intente de nuevo!
+SetupEnd=Fin de la configuración
+SystemIsInstalled=Esta instalación ha finalizado.
+SystemIsUpgraded=Dolibarr se ha actualizado con éxito.
+YouNeedToPersonalizeSetup=Debe configurar Dolibarr para adaptarse a sus necesidades (apariencia, características, ...). Para ello, siga el siguiente enlace:
+AdminLoginCreatedSuccessfuly=El inicio de sesión del administrador Dolibarr '<b>%s </b>' se ha creado correctamente.
+GoToDolibarr=Ir a Dolibarr
+GoToSetupArea=Ir a Dolibarr (área de configuración)
+GoToUpgradePage=Ir a la página de actualización de nuevo
+WithNoSlashAtTheEnd=Sin la barra "/" al final
+DirectoryRecommendation= <span class="warning">IMPORTANTE</span>: debe usar un directorio que esté fuera de las páginas web (por lo tanto, no use un subdirectorio del parámetro anterior).
+AdminLoginAlreadyExists=La cuenta de administrador de Dolibarr '<b>%s</b>' ya existe. Regrese si quiere crear otro.
+FailedToCreateAdminLogin=Error al crear la cuenta de administrador de Dolibarr.
+WarningRemoveInstallDir=Advertencia, por razones de seguridad, una vez que se complete la instalación o actualización, debe agregar un archivo llamado <b>install.lock</b> en el directorio de documentos de Dolibarr para evitar nuevamente el uso accidental / malicioso de las herramientas de instalación.
+ChoosedMigrateScript=Elegir secuencia de comandos de migración
+DataMigration=Migración de base de datos (datos)
+DatabaseMigration=Migración de la base de datos (estructura + algunos datos)
+ProcessMigrateScript=Procesamiento de scripts
+ChooseYourSetupMode=Elige tu modo de configuración y haz clic en "Inicio" ...
+FreshInstall=Instalación nueva
+FreshInstallDesc=Utilice este modo si esta es su primera instalación. Si no, este modo puede reparar una instalación previa incompleta. Si desea actualizar su versión, elija el modo "Actualizar".
+UpgradeDesc=Utilice este modo si ha reemplazado archivos viejos de Dolibarr con archivos de una versión más reciente. Esto actualizará su base de datos y datos.
+Start=Comienzo
+InstallNotAllowed=El programa de instalación no está permitido por los permisos <b> conf.php</b>
+YouMustCreateWithPermission=Debe crear el archivo%s y establecer permisos de escritura para el servidor web durante el proceso de instalación.
+AlreadyDone=Ya migrado
+DatabaseVersion=Versión de base de datos
+ServerVersion=Versión del servidor de base de datos
+YouMustCreateItAndAllowServerToWrite=Debe crear este directorio y permitir que el servidor web escriba en él.
+DBSortingCollation=Orden de clasificación de caracteres
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Seleccionó crear base de datos <b>%s</b>, pero para esto, Dolibarr necesita conectarse al servidor <b>%s</b> con permisos de superusuario <b>%s</b>.
+YouAskLoginCreationSoDolibarrNeedToConnect=Seleccionó crear usuario de base de datos <b>%s</b>, pero para esto, Dolibarr necesita conectarse al servidor <b>%s</b> con permisos de superusuario <b>%s</b>.
+BecauseConnectionFailedParametersMayBeWrong=Falló la conexión de la base de datos: los parámetros del host o superusuario deben ser incorrectos.
+OrphelinsPaymentsDetectedByMethod=Pago de huérfanos detectado por el método%s
+RemoveItManuallyAndPressF5ToContinue=Quítelo manualmente y presione F5 para continuar.
+IfLoginDoesNotExistsCheckCreateUser=Si el usuario aún no existe, debe marcar la opción "Crear usuario"
+ErrorConnection=El servidor "<b>%s</b>", el nombre de la base de datos "<b>%s</b>", el inicio de sesión "<b>%s</b>" o la contraseña de la base de datos pueden estar equivocados o la versión del cliente PHP puede ser demasiado antigua en comparación con la versión de la base de datos.
+InstallChoiceRecommanded=Opción recomendada para instalar la versión<b>%s</b> de su versión actual<b>%s</b>
+InstallChoiceSuggested=<b> Instale la opción sugerida por el instalador </b>.
+MigrateIsDoneStepByStep=La versión apuntada (%s) tiene un hueco de varias versiones. El asistente de instalación volverá a sugerir una migración adicional una vez que este se complete.
+CheckThatDatabasenameIsCorrect=Compruebe que el nombre de la base de datos "<b>%s</b>" sea correcto.
+IfAlreadyExistsCheckOption=Si este nombre es correcto y esa base de datos aún no existe, debe marcar la opción "Crear base de datos".
+OpenBaseDir=PHP parámetro openbasedir
+YouAskToCreateDatabaseSoRootRequired=Has marcado la casilla "Crear base de datos". Para esto, debe proporcionar el nombre de usuario / contraseña del superusuario (parte inferior del formulario).
+YouAskToCreateDatabaseUserSoRootRequired=Has marcado la casilla "Crear propietario de base de datos". Para esto, debe proporcionar el nombre de usuario / contraseña del superusuario (parte inferior del formulario).
+NextStepMightLastALongTime=El paso actual puede tardar varios minutos. Por favor, espere hasta que la siguiente pantalla se muestre completamente antes de continuar.
+MigrationCustomerOrderShipping=Migrar envíos para el almacenamiento de pedidos de ventas
+MigrationShippingDelivery=Actualizar el almacenamiento del envío
+MigrationShippingDelivery2=Actualizar almacenamiento de envío 2
+MigrationFinished=Migración terminada
+LastStepDesc=<strong>Último paso</strong>: Defina aquí el nombre de usuario y la contraseña que desea utilizar para conectarse a Dolibarr. <b>No pierda esto, ya que es la cuenta maestra para administrar todas las otras cuentas de usuario / adicionales.</b>
+ActivateModule=Activar módulo%s
+ShowEditTechnicalParameters=Haga clic aquí para mostrar / editar parámetros avanzados (modo experto)
+WarningUpgrade=Advertencia:\n¿Ejecutó primero una copia de seguridad de la base de datos?\nEsto es muy recomendable. La pérdida de datos (debido a, por ejemplo, errores en mysql versión 5.5.40 / 41/42/43) puede ser posible durante este proceso, por lo que es esencial realizar un volcado completo de su base de datos antes de iniciar cualquier migración.\n\nHaga clic en Aceptar para iniciar el proceso de migración ...
+ErrorDatabaseVersionForbiddenForMigration=Su versión de base de datos es %s. Tiene un error crítico que hace posible la pérdida de datos si realiza cambios estructurales en su base de datos, como lo requiere el proceso de migración. Por esta razón, no se permitirá la migración hasta que actualice su base de datos a una versión de capa (parcheada) (lista de versiones con errores conocidas: %s)
+KeepDefaultValuesWamp=Utilizó el asistente de configuración de Dolibarr de DoliWamp, por lo que los valores propuestos aquí ya están optimizados. Cámbialas solo si sabes lo que estás haciendo.
+KeepDefaultValuesDeb=Usó el asistente de configuración de Dolibarr de un paquete de Linux (Ubuntu, Debian, Fedora ...), por lo que los valores propuestos aquí ya están optimizados. Solo se debe ingresar la contraseña del propietario de la base de datos para crear. Cambie otros parámetros solo si sabe lo que está haciendo.
+KeepDefaultValuesMamp=Utilizó el asistente de configuración de Dolibarr de DoliMamp, por lo que los valores propuestos aquí ya están optimizados. Cámbialas solo si sabes lo que estás haciendo.
+KeepDefaultValuesProxmox=Utilizó el asistente de configuración de Dolibarr desde un dispositivo virtual Proxmox, por lo que los valores propuestos aquí ya están optimizados. Cámbialas solo si sabes lo que estás haciendo.
+UpgradeExternalModule=Ejecutar proceso de actualización dedicado de módulo externo
+SetAtLeastOneOptionAsUrlParameter=Establezca al menos una opción como parámetro en URL. Por ejemplo: '...repair.php?Standard=confirmed'
+MigrationOrder=Migración de datos para órdenes del cliente
+MigrationSupplierOrder=Migración de datos para pedidos del proveedor
+MigrationProposal=Migración de datos para propuestas comerciales
+MigrationInvoice=Migración de datos para facturas del cliente
+MigrationContract=Migración de datos para contratos
+MigrationSuccessfullUpdate=Actualización exitosa
+MigrationUpdateFailed=Proceso de actualización fallido
+MigrationRelationshipTables=Migración de datos para tablas de relaciones (%s)
+MigrationPaymentsUpdate=Corrección de datos de pago
+MigrationPaymentsNumberToUpdate=%s pago(s) para actualizar
+MigrationProcessPaymentUpdate=Actualizar pago(s)%s
+MigrationPaymentsNothingToUpdate=No más cosas que hacer
+MigrationPaymentsNothingUpdatable=No más pagos que se puedan corregir
+MigrationContractsUpdate=Corrección de datos contractuales
+MigrationContractsNumberToUpdate=%s contrato (s) para actualizar
+MigrationContractsLineCreation=Crear línea de contrato para la referencia de contrato%s
+MigrationContractsNothingToUpdate=No más cosas que hacer
+MigrationContractsFieldDontExist=El campo fk_facture ya no existe. Nada que hacer.
+MigrationContractsEmptyDatesUpdate=Corrección de la fecha del contrato vacía
+MigrationContractsEmptyDatesUpdateSuccess=La corrección de la fecha vacía del contrato se realizó con éxito
+MigrationContractsEmptyDatesNothingToUpdate=No hay fecha de contrato vacía para corregir
+MigrationContractsEmptyCreationDatesNothingToUpdate=Ninguna fecha de creación del contrato para corregir
+MigrationContractsInvalidDatesUpdate=Corrección de contrato de fecha de valor incorrecto
+MigrationContractsInvalidDateFix=Contrato correcto%s (Fecha del contrato
+MigrationContractsInvalidDatesNothingToUpdate=No hay fecha con mal valor para corregir
+MigrationContractsIncoherentCreationDateUpdate=Corrección de fecha de creación de contrato de valor incorrecto
+MigrationContractsIncoherentCreationDateUpdateSuccess=Corrección de la fecha de creación del contrato de valor incorrecto realizada correctamente
+MigrationContractsIncoherentCreationDateNothingToUpdate=Ningún valor negativo para la fecha de creación del contrato para corregir
+MigrationReopeningContracts=Contrato abierto cerrado por error
+MigrationReopenThisContract=Reabrir el contrato%s
+MigrationReopeningContractsNothingToUpdate=No hay contrato cerrado para abrir
+MigrationBankTransfertsUpdate=Actualizar enlaces entre la entrada bancaria y una transferencia bancaria
+MigrationBankTransfertsNothingToUpdate=Todos los enlaces están actualizados
+MigrationShipmentOrderMatching=Actualización del recibo de envío
+MigrationDeliveryOrderMatching=Actualización del recibo de entrega
+MigrationDeliveryDetail=Actualización de entrega
+MigrationStockDetail=Actualizar el valor de stock de los productos
+MigrationMenusDetail=Actualizar tablas de menús dinámicos
+MigrationDeliveryAddress=Actualizar la dirección de entrega en envíos
+MigrationProjectTaskActors=Migración de datos para la tabla llx_projet_task_actors
+MigrationProjectUserResp=Campo de migración de datos fk_user_resp de llx_projet a llx_element_contact
+MigrationProjectTaskTime=Tiempo de actualización en segundos
+MigrationActioncommElement=Actualizar datos sobre acciones
+MigrationPaymentMode=Migración de datos por tipo de pago
+MigrationCategorieAssociation=Migración de categorías
+MigrationEvents=Migración de eventos para agregar el propietario del evento en la tabla de asignación
+MigrationEventsContact=Migración de eventos para agregar contactos de eventos a la tabla de asignación
+MigrationRemiseEntity=Valor de campo de entidad de actualización de llx_societe_remise
+MigrationRemiseExceptEntity=Valor de campo de entidad de actualización de llx_societe_remise_except
+MigrationUserRightsEntity=Actualizar el valor del campo de entidad de llx_user_rights
+MigrationUserGroupRightsEntity=Actualizar el valor del campo de entidad de llx_usergroup_rights
+MigrationUserPhotoPath=Migración de rutas de fotos para usuarios.
+MigrationFieldsSocialNetworks=Migración de redes sociales de campos de usuarios (%s)
+MigrationReloadModule=Actualizar módulo%s
+ErrorFoundDuringMigration=Se informaron errore(s) durante el proceso de migración, por lo que el siguiente paso no está disponible. Para ignorar los errores, puede hacer <a href="%s">clic aquí</a>, pero es posible que la aplicación o algunas características no funcionen correctamente hasta que se resuelvan los errores.
+YouTryInstallDisabledByDirLock=La aplicación intentó auto actualizarse, pero las páginas de instalación / actualización se han deshabilitado por seguridad (directorio renombrado con el sufijo .lock).<br>
+YouTryInstallDisabledByFileLock=La aplicación intentó actualizarse automáticamente, pero las páginas de instalación / actualización se han deshabilitado por seguridad (debido a la existencia de un archivo de bloqueo <strong>install.lock</strong> en el directorio de documentos de dolibarr). <br>
+ClickOnLinkOrRemoveManualy=Haga clic en el siguiente enlace. Si siempre ve esta misma página, debe eliminar / cambiar el nombre del archivo install.lock en el directorio de documentos.
+Loaded=Cargado
+FunctionTest=Prueba de funcionamiento
diff --git a/htdocs/langs/es_EC/interventions.lang b/htdocs/langs/es_EC/interventions.lang
new file mode 100644
index 00000000000..b8c803099da
--- /dev/null
+++ b/htdocs/langs/es_EC/interventions.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - interventions
+InterventionCard=Tarjeta de intervención
+NewIntervention=Nueva intervención
+ChangeIntoRepeatableIntervention=Cambio a intervención repetible.
+ListOfInterventions=Lista de intervenciones
+ActionsOnFicheInter=Acciones de intervención
+LastInterventions=Últimas intervenciones%s
+CreateDraftIntervention=Crear proyecto
+InterventionContact=Contacto de intervención
+DeleteIntervention=Eliminar la intervención
+ValidateIntervention=Validar la intervención
+ModifyIntervention=Modificar la intervención
+DeleteInterventionLine=Borrar línea de intervención
+ConfirmDeleteIntervention=¿Seguro que desea eliminar esta intervención?
+ConfirmValidateIntervention=¿Está seguro de que desea validar esta intervención bajo el nombre <b>%s</b>?
+ConfirmModifyIntervention=¿Está seguro de que desea modificar esta intervención?
+ConfirmDeleteInterventionLine=¿Está seguro de que desea eliminar esta línea de intervención?
+ConfirmCloneIntervention=¿Seguro que quieres clonar esta intervención?
+NameAndSignatureOfInternalContact=Nombre y firma de la intervención:
+DocumentModelStandard=Modelo de documento estándar para intervenciones
+InterventionCardsAndInterventionLines=Intervenciones y líneas de intervención
+InterventionClassifyBilled=Clasificar "Facturado"
+InterventionClassifyUnBilled=Clasificar "Sin Cobro"
+InterventionClassifyDone=Clasificar "Hecho"
+SendInterventionRef=Presentación de la intervención%s
+SendInterventionByMail=Enviar intervención por correo electrónico
+InterventionCreatedInDolibarr=Intervención%s creada
+InterventionValidatedInDolibarr=Intervención%s validada
+InterventionModifiedInDolibarr=Intervención%s modificada
+InterventionClassifiedBilledInDolibarr=Intervención%s establecida como facturada
+InterventionClassifiedUnbilledInDolibarr=Intervención%s establecida como no facturada
+InterventionSentByEMail=Intervención %s enviada por correo electrónico
+InterventionDeletedInDolibarr=Intervención%s eliminada
+InterventionsArea=Área de intervenciones
+DraftFichinter=Proyectos de intervención
+LastModifiedInterventions=Últimas%s intervenciones modificadas
+FichinterToProcess=Intervenciones para procesar
+TypeContact_fichinter_external_CUSTOMER=Seguimiento del contacto con el cliente
+PrintProductsOnFichinter=Imprimir también líneas de tipo "producto" (no sólo servicios) en tarjeta de intervención
+PrintProductsOnFichinterDetails=intervenciones generadas a partir de pedidos
+UseServicesDurationOnFichinter=Utilizar la duración de los servicios para las intervenciones generadas a partir de pedidos
+NbOfinterventions=Nº de tarjetas de intervención.
+NumberOfInterventionsByMonth=Nº de tarjetas de intervención por mes (fecha de validación).
+AmountOfInteventionNotIncludedByDefault=La cantidad de intervención no se incluye por defecto en ganancias (en la mayoría de los casos, las hojas de tiempo se usan para contar el tiempo invertido). Agregue la opción PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT a 1 en home-setup-other para incluirlos.
+InterId=ID de intervención
+InterRef=Intervención ref.
+InterDateCreation=Intervención de creación de fecha
+InterDuration=Intervención de duración
+InterStatus=Intervención de estado
+InterNote=Observe la intervención
+InterLineId=Intervención de línea de identificación
+InterLineDate=Intervención de línea de fecha
+InterLineDuration=Intervención de duración de línea
+InterLineDesc=Intervención de descripción de línea
diff --git a/htdocs/langs/es_EC/languages.lang b/htdocs/langs/es_EC/languages.lang
new file mode 100644
index 00000000000..fefdc0c6536
--- /dev/null
+++ b/htdocs/langs/es_EC/languages.lang
@@ -0,0 +1,8 @@
+# Dolibarr language file - Source file is en_US - languages
+Language_ar_AR=Arábica
+Language_ar_SA=Arábica
+Language_fi_FI=Finlandés
+Language_lv_LV=Letón
+Language_mk_MK=Macedónio
+Language_nl_BE=Holandés (Bélgica)
+Language_nl_NL=Holandés
diff --git a/htdocs/langs/es_EC/ldap.lang b/htdocs/langs/es_EC/ldap.lang
new file mode 100644
index 00000000000..7822f0d974b
--- /dev/null
+++ b/htdocs/langs/es_EC/ldap.lang
@@ -0,0 +1,17 @@
+# Dolibarr language file - Source file is en_US - ldap
+YouMustChangePassNextLogon=Se debe cambiar la contraseña para el usuario <b>%s</b> en el dominio <b>%s</b>.
+UserMustChangePassNextLogon=El usuario debe cambiar la contraseña en el dominio %s
+LDAPInformationsForThisContact=Información en la base de datos LDAP para este contacto
+LDAPInformationsForThisUser=Información en la base de datos LDAP para este usuario
+LDAPInformationsForThisGroup=Información en la base de datos LDAP para este grupo
+LDAPInformationsForThisMember=Información en la base de datos LDAP para este miembro
+LDAPCard=Tarjeta LDAP
+LDAPFieldStatus=Estado
+LDAPFieldFirstSubscriptionDate=Primera fecha de suscripción
+LDAPFieldFirstSubscriptionAmount=Primer importe de suscripción
+LDAPFieldLastSubscriptionDate=Última fecha de suscripción
+LDAPFieldLastSubscriptionAmount=Cantidad de suscripción más reciente
+LDAPFieldSkype=ID de skype
+LDAPFieldSkypeExample=Ejemplo: nombre de skype
+UserSynchronized=Sincronizado por el usuario
+ErrorFailedToReadLDAP=Error al leer la base de datos LDAP. Compruebe la configuración del módulo LDAP y la accesibilidad a la base de datos.
diff --git a/htdocs/langs/es_EC/link.lang b/htdocs/langs/es_EC/link.lang
new file mode 100644
index 00000000000..6c96ddd0f55
--- /dev/null
+++ b/htdocs/langs/es_EC/link.lang
@@ -0,0 +1,9 @@
+# Dolibarr language file - Source file is en_US - link
+LinkedFiles=Archivos enlazados y documentos
+NoLinkFound=No hay enlaces registrados
+LinkComplete=El archivo se ha vinculado correctamente
+ErrorFileNotLinked=No se pudo vincular el archivo.
+LinkRemoved=Se ha eliminado el enlace %s
+ErrorFailedToDeleteLink=No se pudo eliminar el vínculo '<b>%s</b>'
+URLToLink=URL para vincular
+OverwriteIfExists=Sobrescribir archivo si existe
diff --git a/htdocs/langs/es_EC/loan.lang b/htdocs/langs/es_EC/loan.lang
new file mode 100644
index 00000000000..cc9ea776587
--- /dev/null
+++ b/htdocs/langs/es_EC/loan.lang
@@ -0,0 +1,23 @@
+# Dolibarr language file - Source file is en_US - loan
+NewLoan=Nuevo préstamo
+ShowLoan=Mostrar préstamo
+LoanPayment=Pago de préstamo
+ShowLoanPayment=Mostrar el pago del préstamo
+Interest=Interes
+Nbterms=Número de términos
+Term=Término
+LoanAccountancyCapitalCode=Capital de cuenta contable
+LoanAccountancyInsuranceCode=Seguro de cuenta contable
+LoanAccountancyInterestCode=Interés de la cuenta contable
+ConfirmDeleteLoan=Confirmar la eliminación de este préstamo
+LoanDeleted=Préstamo eliminado con éxito
+ConfirmPayLoan=Confirmar clasificar pagó este préstamo
+ListLoanAssociatedProject=Lista del préstamo asociado al proyecto
+AddLoan=Crear préstamo
+FinancialCommitment=Compromiso financiero
+InterestAmount=Interes
+ConfigLoan=Configuración del módulo préstamo
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Capital de cuenta contable por defecto
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Interés de la cuenta contable por defecto
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Seguro de cuenta contable por defecto
+CreateCalcSchedule=Edita el compromiso financiero
diff --git a/htdocs/langs/es_EC/mailmanspip.lang b/htdocs/langs/es_EC/mailmanspip.lang
new file mode 100644
index 00000000000..6b8fb02ecff
--- /dev/null
+++ b/htdocs/langs/es_EC/mailmanspip.lang
@@ -0,0 +1,24 @@
+# Dolibarr language file - Source file is en_US - mailmanspip
+MailmanTitle=Sistema de listas de correo de Mailman
+TestSubscribe=Para probar la suscripción a las listas de Mailman
+TestUnSubscribe=Para probar la cancelación de la suscripción de las listas de Mailman
+MailmanCreationSuccess=La prueba de suscripción se ejecutó correctamente
+MailmanDeletionSuccess=La prueba de cancelación de la suscripción se ejecutó correctamente
+SynchroMailManEnabled=Se realizará una actualización Mailman
+SynchroSpipEnabled=Se realizará una actualización de Spip
+DescADHERENT_MAILMAN_ADMINPW=Contraseña del administrador de Mailman
+DescADHERENT_MAILMAN_URL=URL para las suscripciones de Mailman
+DescADHERENT_MAILMAN_UNSUB_URL=URL para cancelación de suscripciones de Mailman
+DescADHERENT_MAILMAN_LISTS=Lista(s) para la inscripción automática de nuevos miembros (separados por una coma)
+SPIPTitle=Sistema de gestión de contenido SPIP
+DescADHERENT_SPIP_DB=Nombre de la base de datos SPIP
+DescADHERENT_SPIP_USER=Iniciar sesión en la base de datos SPIP
+DescADHERENT_SPIP_PASS=Contraseña de base de datos SPIP
+AddIntoSpipConfirmation=¿Estás seguro de que quieres agregar este miembro a SPIP?
+AddIntoSpipError=Error al agregar el usuario en SPIP
+DeleteIntoSpip=Eliminar de SPIP
+DeleteIntoSpipConfirmation=¿Seguro que quieres eliminar este miembro de SPIP?
+DeleteIntoSpipError=Error al suprimir el usuario de SPIP
+SPIPConnectionFailed=Error al conectarse a SPIP
+SuccessToAddToMailmanList=%sse ha agregado correctamente a la lista de mailman%s o la base de datos SPIP
+SuccessToRemoveToMailmanList=%sse ha eliminado correctamente de la lista de carpetas%s o de la base de datos SPIP
diff --git a/htdocs/langs/es_EC/mails.lang b/htdocs/langs/es_EC/mails.lang
new file mode 100644
index 00000000000..d55c916e59a
--- /dev/null
+++ b/htdocs/langs/es_EC/mails.lang
@@ -0,0 +1,129 @@
+# Dolibarr language file - Source file is en_US - mails
+AllEMailings=Todos los eMailings
+MailCard=Tarjeta EMailing
+MailTo=Receptor(es)
+MailToUsers=Para el usuario(s)
+MailCC=Copiar a
+MailToCCUsers=Copiar a los usuario(s)
+MailCCC=Copia en caché a
+MailTopic=Tema de correo electrónico
+MailFile=Archivos adjuntos
+MailMessage=Cuerpo del correo electronico
+SubjectNotIn=No en el tema
+ShowEMailing=Mostrar correos electrónicos
+ListOfEMailings=Lista de correos electrónicos
+NewMailing=Nuevo correo electrónico
+EditMailing=Editar correos electrónicos
+ResetMailing=Reenviar correo electrónico
+DeleteMailing=Eliminar correo electrónico
+DeleteAMailing=Eliminar un correo electrónico
+PreviewMailing=Previsualizar correo electrónico
+CreateMailing=Crear correo electrónico
+TestMailing=Email de prueba
+ValidMailing=Correo electrónico válido
+MailingStatusValidated=validado
+MailSuccessfulySent=Correo electrónico (de %s a %s) aceptado correctamente para entrega
+MailingSuccessfullyValidated=EMailing validado con éxito
+MailUnsubcribe=Anular la suscripción
+MailingStatusNotContact=No contacte más
+MailingStatusReadAndUnsubscribe=Leer y darse de baja
+ErrorMailRecipientIsEmpty=El destinatario del correo electrónico está vacío
+WarningNoEMailsAdded=No hay correo electrónico nuevo para agregar a la lista de destinatarios.
+ConfirmValidMailing=¿Estás seguro de que quieres validar este correo electrónico?
+ConfirmResetMailing=Advertencia, al reiniciar el correo electrónico <b>%s</b>, permitirá el reenvío de este correo electrónico en un correo masivo. ¿Seguro que quieres hacer esto?
+ConfirmDeleteMailing=¿Estás seguro de que deseas eliminar este correo electrónico?
+NbOfUniqueEMails=No. de emails únicos
+NbOfEMails=Núm. de Emails
+TotalNbOfDistinctRecipients=Número de destinatarios distintos
+NoTargetYet=No se han definido aún destinatarios (ir a la pestaña 'Destinatarios')
+NoRecipientEmail=No hay correo electrónico del destinatario de %s
+YouCanAddYourOwnPredefindedListHere=Para crear su módulo selector de correo electrónico, consulte htdocs/core/modules/mailings/README.
+EMailTestSubstitutionReplacedByGenericValues=Cuando se utiliza el modo de prueba, las variables de sustitución se reemplazan por valores genéricos
+NoAttachedFiles=No hay archivos adjuntos
+BadEMail=Mal valor para el correo electrónico
+ConfirmCloneEMailing=¿Estás seguro de que quieres clonar este correo electrónico?
+CloneReceivers=Cloner destinatarios
+DateSending=Fecha de envío
+MailingStatusRead=Leer
+YourMailUnsubcribeOK=El correo electrónico <b>%s</b> está correctamente desuscrito de la lista de correo
+ActivateCheckReadKey=Clave utilizada para cifrar la URL utilizada para la función "Leer recibo" y "Anular suscripción"
+EMailSentToNRecipients=Correo electrónico enviado a %s destinatarios.
+EMailSentForNElements=Correo electrónico enviado para %s elementos.
+XTargetsAdded=<b>%s</b> destinatarios agregados a la lista de destino
+OnlyPDFattachmentSupported=Si los documentos PDF ya se generaron para que los objetos se envíen, se adjuntarán al correo electrónico. De lo contrario, no se enviará correo electrónico (también, tenga en cuenta que solo los documentos pdf son compatibles como archivos adjuntos en el envío masivo en esta versión).
+AllRecipientSelected=Los destinatarios del registro %s seleccionado (si se conoce su correo electrónico).
+GroupEmails=Agrupar correos electrónicos
+OneEmailPerRecipient=Un correo electrónico por destinatario (de manera predeterminada, un correo electrónico por registro seleccionado)
+WarningIfYouCheckOneRecipientPerEmail=Advertencia: si marca esta casilla, significa que solo se enviará un correo electrónico para varios registros diferentes seleccionados, de modo que si su mensaje contiene variables de sustitución que se refieren a los datos de un registro, no será posible reemplazarlos.
+ResultOfMailSending=Resultado del envío masivo de correos electrónicos
+NbSelected=Numero seleccionado
+NbIgnored=Número ignorado
+NbSent=Numero enviado
+SentXXXmessages=%smensaje(s) enviados.
+ConfirmUnvalidateEmailing=¿Está seguro de que desea cambiar el correo electrónico <b>%s</b> al estado de borrador?
+MailingModuleDescContactsWithThirdpartyFilter=Contacto con filtros de clientes
+MailingModuleDescContactsByCompanyCategory=Contactos por categoría de terceros
+MailingModuleDescContactsByCategory=Contactos por categorías
+MailingModuleDescEmailsFromFile=E-mails del archivo
+MailingModuleDescEmailsFromUser=Correo electrónico enviado por el usuario
+MailingModuleDescDolibarrUsers=Usuarios con mensajes de correo electrónico
+MailingModuleDescThirdPartiesByCategories=Clientes/Proveedores (por categorías)
+LineInFile=Línea %s en el archivo
+RecipientSelectionModules=Solicitudes definidas para la selección del destinatario
+MailingArea=Zona EMailings
+LastMailings=Últimos %s emails
+TargetsStatistics=Estadísticas de objetivos
+NbOfCompaniesContacts=Contactos / direcciones únicos
+MailNoChangePossible=Los destinatarios de correo electrónico validado no se pueden cambiar
+SearchAMailing=Búsqueda por correo
+SendMailing=Enviar correo electrónico
+MailingNeedCommand=El envío de un correo electrónico se puede realizar desde la línea de comandos. Pida al administrador del servidor que inicie el siguiente comando para enviar el correo electrónico a todos los destinatarios:
+MailingNeedCommand2=Sin embargo, puede enviarlos en línea agregando el parámetro MAILING_LIMIT_SENDBYWEB con el valor del número máximo de correos electrónicos que desea enviar por sesión. Para ello, vaya a Inicio - Configuración - Otros.
+ConfirmSendingEmailing=Si desea enviar mensajes de correo electrónico directamente desde esta pantalla, confirme que está seguro de que desea enviar correo electrónico ahora desde su navegador.
+LimitSendingEmailing=Nota: El envío de correos electrónicos desde la interfaz web se realiza en varias ocasiones por razones de seguridad y de tiempo de espera, <b>%s</b> destinatarios a la vez para cada sesión de envío.
+TargetsReset=Limpiar lista
+ToClearAllRecipientsClickHere=Haga clic aquí para borrar la lista de destinatarios de este correo electrónico
+ToAddRecipientsChooseHere=Agregar destinatarios eligiendo de las listas
+NbOfEMailingsReceived=Envíos masivos recibidos
+NbOfEMailingsSend=Envíos masivos enviados
+IdRecord=Registro de identificación
+DeliveryReceipt=Entrega Ack.
+YouCanUseCommaSeparatorForSeveralRecipients=Puede utilizar el separador <b> coma </b> para especificar varios destinatarios.
+TagCheckMail=Seguimiento de la apertura del correo
+TagUnsubscribe=Cancelar la suscripción al enlace
+TagSignature=Firma del usuario enviado
+EMailRecipient=Receptor de E-mail
+TagMailtoEmail=Correo electrónico del destinatario (incluido el enlace html "mailto:")
+NoEmailSentBadSenderOrRecipientEmail=No hay correo electrónico enviado. Correo electrónico incorrecto del remitente o del destinatario. Verifique el perfil de usuario.
+NoNotificationsWillBeSent=No hay notificaciones por correo electrónico para este evento y la empresa
+ANotificationsWillBeSent=Se enviará una notificación por correo electrónico
+SomeNotificationsWillBeSent=Las notificaciones de %s se enviarán por correo electrónico
+AddNewNotification=Activar un nuevo destino / evento de notificación por correo electrónico
+ListOfActiveNotifications=Lista todos los destinos / eventos activos para la notificación por correo electrónico
+ListOfNotificationsDone=Lista todas las notificaciones por correo electrónico enviadas
+MailSendSetupIs=La configuración del envío de correo electrónico se ha configurado en '%s'. Este modo no se puede utilizar para enviar correos electrónicos masivos.
+MailSendSetupIs2=Primero debe ir, con una cuenta de administrador, al menú %s Home - Setup - EMails%s para cambiar el parámetro <strong> '%s' </strong> para usar el modo '%s'. Con este modo, puede ingresar la configuración del servidor SMTP proporcionado por su proveedor de servicios de Internet y usar la función de correo electrónico masivo.
+MailSendSetupIs3=Si tiene alguna pregunta sobre cómo configurar su servidor SMTP, puede preguntar a %s.
+YouCanAlsoUseSupervisorKeyword=También puede agregar la palabra clave <strong> __ SUPERVISOREMAIL __ </strong> para enviar el correo electrónico al supervisor del usuario (sólo funciona si se define un correo electrónico para este supervisor)
+NbOfTargetedContacts=Número actual de correos electrónicos de contacto
+UseFormatFileEmailToTarget=El archivo importado debe tener formato <strong> correo electrónico; nombre; nombre; otro </ strong>
+UseFormatInputEmailToTarget=Introduzca una cadena con formato <strong> correo electrónico; nombre; nombre; otro </strong>
+AdvTgtTitle=Rellene los campos de entrada para preseleccionar los clientes/proveedores o contactos/direcciones de destino
+AdvTgtSearchTextHelp=Utilizar como comodines %%. Por ejemplo, para encontrar todos los elementos como <b>jean, joe, jim</b>, puede ingresar <b>j%%</b>, también puede usar ; como separador de valor, y uso ! para excepto este valor. Por ejemplo, <b>jean;joe;jim%%;!Jimo;!Jima%</b> apuntará a todos los jean, joe, comienza con jim pero no jimo y no todo lo que comienza con jima
+AdvTgtSearchIntHelp=Utilice el intervalo para seleccionar el valor int o float
+AdvTgtMaxVal=Valor máximo
+AdvTgtSearchDtHelp=Usar el intervalo para seleccionar el valor de fecha
+AdvTgtStartDt=Iniciar dt.
+AdvTgtEndDt=Final dt.
+AdvTgtTypeOfIncudeHelp=Correo electrónico de destino del tercero y correo electrónico de contacto del tercero, o solo correo electrónico de terceros o solo correo electrónico de contacto
+AdvTgtTypeOfIncude=Tipo de correo electrónico orientado
+AdvTgtContactHelp=Úselo sólo si segmenta el contacto en "Tipo de correo electrónico orientado"
+ItemsCount=Artículo(s)
+AdvTgtAddContact=Añadir emails según criterio.
+AdvTgtLoadFilter=Filtro de carga
+NoContactWithCategoryFound=No hay contacto/dirección con una categoría encontrada
+NoContactLinkedToThirdpartieWithCategoryFound=No hay contacto/dirección con una categoría encontrada
+OutGoingEmailSetup=Configuración de correo saliente
+InGoingEmailSetup=Configuración de correo entrante
+OutGoingEmailSetupForEmailing=Configuración del correo electrónico saliente (para el módulo %s)
+ContactsWithThirdpartyFilter=Contactos con filtro de terceros
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index 334b37cc089..159dd3b4084 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -179,7 +179,6 @@ AmountTTC=Valor (inc. IVA)
 AmountVAT=Impuesto sobre el Valor
 MulticurrencyAlreadyPaid=Ya pagado, moneda original.
 MulticurrencyRemainderToPay=Seguir pagando, moneda de origen
-MulticurrencyPaymentAmount=Monto a pagar, moneda de origen
 MulticurrencyAmountTTC=Valor (inc. impuestos), moneda de origen
 MulticurrencyAmountVAT=Valor del impuesto, moneda de origen
 AmountLT1=Valor del impuesto 2
@@ -208,7 +207,6 @@ VATCode=Código de tasa impositiva
 VATNPR=Tasa de impuesto NPR
 DefaultTaxRate=Tasa de impuesto predeterminada
 Average=Promedio
-StatusToPay=Pagar
 RemainToPay=Seguir pagando
 Module=Módulo/Aplicación
 Modules=Módulos/Aplicaciones
diff --git a/htdocs/langs/es_EC/margins.lang b/htdocs/langs/es_EC/margins.lang
new file mode 100644
index 00000000000..c9a6111c6da
--- /dev/null
+++ b/htdocs/langs/es_EC/margins.lang
@@ -0,0 +1,34 @@
+# Dolibarr language file - Source file is en_US - margins
+MarginRate=Tasa de margen
+MarkRate=Tasa de marca
+DisplayMarginRates=Mostrar tasas de margen
+DisplayMarkRates=Mostrar las tasas de las marcas
+InputPrice=Precio de insumos
+margin=Gestión de márgenes de beneficio
+margesSetup=Configuración de administración de márgenes de beneficio
+MarginDetails=Detalles del margen
+ProductMargins=Márgenes del producto
+CustomerMargins=Márgenes del cliente
+SalesRepresentativeMargins=Márgenes del representante de ventas
+UserMargins=Márgenes de usuario
+ChooseProduct/Service=Elija un producto o servicio
+ForceBuyingPriceIfNull=Forzar la compra/precio de coste al precio de venta si no se define
+ForceBuyingPriceIfNullDetails=Si el precio de compra/costo no está definido, y esta opción "ON", el margen será cero en línea (precio de compra/costo = precio de venta), de lo contrario ("OFF"), el margen será igual al valor predeterminado sugerido.
+MARGIN_METHODE_FOR_DISCOUNT=Método de margen para descuentos globales
+UseDiscountOnTotal=En subtotal
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Define si un descuento global se trata como un producto, un servicio o sólo en el subtotal para el cálculo del margen.
+MARGIN_TYPE=Precio de compra sugerido por defecto para el cálculo del margen
+MargeType1=Margen en el mejor precio de proveedor
+MargeType2=Margen sobre el precio medio ponderado (WAP)
+MargeType3=Margen sobre el precio de coste
+MarginTypeDesc=* Margen sobre el mejor precio de compra = Precio de venta - Mejor precio de proveedor definido en la tarjeta del producto <br> * Margen sobre el Precio promedio ponderado (WAP) = Precio de venta - Precio promedio ponderado del producto (WAP) o mejor precio del proveedor si WAP aún no está definido <br> * Margen on Precio de costo = Precio de venta: precio de costo definido en la tarjeta del producto o WAP si el precio de costo no está definido, o el mejor precio del proveedor si WAP aún no está definido
+CostPrice=Precio de coste
+UnitCharges=Cargos unitarios
+Charges=Cargos
+AgentContactType=Tipo de contacto del agente comercial
+AgentContactTypeDetails=Defina qué tipo de contacto (vinculado en las facturas) se utilizará para el informe de margen por contacto / dirección. Tenga en cuenta que la lectura de estadísticas de un contacto no es confiable ya que en la mayoría de los casos el contacto puede no estar definido explícitamente en las facturas.
+rateMustBeNumeric=La tasa debe ser un valor numérico
+markRateShouldBeLesserThan100=La tasa de marca debe ser inferior a 100
+ShowMarginInfos=Mostrar información de margen
+CheckMargins=Detalle de márgenes
+MarginPerSaleRepresentativeWarning=El informe de margen por usuario utiliza el enlace entre terceros y representantes de ventas para calcular el margen de cada representante de ventas. Debido a que algunas terceras partes pueden no tener un representante de ventas dedicado y algunas terceras partes pueden estar vinculadas a varias, es posible que algunas cantidades no se incluyan en este informe (si no hay un representante de ventas) y algunas pueden aparecer en diferentes líneas (para cada representante de ventas).
diff --git a/htdocs/langs/es_EC/members.lang b/htdocs/langs/es_EC/members.lang
new file mode 100644
index 00000000000..36bd3d0b1d2
--- /dev/null
+++ b/htdocs/langs/es_EC/members.lang
@@ -0,0 +1,161 @@
+# Dolibarr language file - Source file is en_US - members
+MembersArea=Área de miembros
+MemberCard=Tarjeta de miembro
+SubscriptionCard=Tarjeta de suscripción
+ShowMember=Mostrar tarjeta de miembro
+ThirdpartyNotLinkedToMember=Cliente/Proveedor no vinculado a un miembro
+MembersTickets=Entradas para miembros
+FundationMembers=Miembros de la Fundación
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Otro miembro (nombre: <b>%s</b>, inicio de sesión: <b>%s</b>) ya está vinculado a un tercero <b>%s</b>. Quite primero este enlace porque un tercero no puede estar vinculado a un solo miembro (y viceversa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=Por razones de seguridad, se le deben otorgar permisos para editar todos los usuarios para poder vincular un miembro a un usuario que no es suyo.
+SetLinkToUser=Enlace a un usuario de Dolibarr
+SetLinkToThirdParty=Enlace a un tercero de Dolibarr
+MembersCards=Tarjetas de visita de los miembros
+MembersList=Lista de miembros
+MembersListToValid=Lista de proyectos de miembros (a validar)
+MembersListValid=Lista de miembros válidos
+MembersListUpToDate=Lista de miembros válidos con suscripción actualizada
+MembersListNotUpToDate=Lista de miembros válidos con suscripción desactualizada
+MembersListResiliated=Lista de miembros terminados
+MembersListQualified=Lista de miembros calificados
+MenuMembersToValidate=Miembros del draft
+MenuMembersUpToDate=Miembros actualizados
+MenuMembersNotUpToDate=Miembros fuera de fecha
+MenuMembersResiliated=Miembros terminados
+MembersWithSubscriptionToReceive=Miembros con suscripción para recibir
+MembersWithSubscriptionToReceiveShort=Suscripción para recibir
+DateSubscription=Fecha de suscripción
+DateEndSubscription=Fecha de finalización de la suscripción
+EndSubscription=Suscripción final
+SubscriptionId=ID de suscripción
+MemberId=Identificación de miembro
+MemberTypeId=ID del tipo de miembro
+MemberTypeLabel=Etiqueta del tipo de miembro
+MemberStatusDraft=Proyecto (necesita ser validado)
+MemberStatusActive=Validado (suscripción en espera)
+MemberStatusActiveShort=validado
+MemberStatusActiveLate=Subscripcion vencida
+MemberStatusActiveLateShort=Muerto
+MemberStatusPaid=Suscripción actualizada
+MemberStatusPaidShort=A hoy
+MemberStatusResiliated=Miembro terminado
+MemberStatusResiliatedShort=Terminado
+MembersStatusToValid=Miembros del draft
+MembersStatusResiliated=Miembros terminados
+NewCotisation=Nueva contribución
+PaymentSubscription=Nuevo pago de contribución
+SubscriptionEndDate=Fecha de finalización de la suscripción
+MembersTypeSetup=Configuración de tipo de miembro
+ConfirmDeleteMemberType=¿Estás seguro de que quieres eliminar este tipo de miembro?
+MemberTypeCanNotBeDeleted=El tipo de miembro no se puede eliminar.
+NewSubscription=Nueva suscripción
+NewSubscriptionDesc=Este formulario le permite registrar su suscripción como un nuevo miembro de la fundación. Si desea renovar su suscripción (si ya es miembro), póngase en contacto con la junta de la fundación en su lugar por correo electrónico %s.
+Subscription=Suscripción
+Subscriptions=Suscripciones
+SubscriptionLate=Tarde
+SubscriptionNotReceived=Suscripción nunca recibida
+ListOfSubscriptions=Lista de suscripciones
+SendCardByMail=Enviar tarjeta por correo electrónico
+NoTypeDefinedGoToSetup=No se han definido tipos de miembros. Ir al menú "Tipos de miembros"
+WelcomeEMail=Correo electrónico de bienvenida
+SubscriptionRequired=Se requiere suscripción
+VoteAllowed=Voto permitido
+Physical=Natural
+Moral=Juridica
+MorPhy=Juridica/Natural
+ResiliateMember=Terminar un miembro
+ConfirmResiliateMember=¿Estás seguro de que quieres terminar este miembro?
+ConfirmDeleteMember=¿Está seguro de que desea eliminar este miembro (la eliminación de un miembro eliminará todas sus suscripciones)?
+DeleteSubscription=Eliminar una suscripción
+ConfirmDeleteSubscription=¿Está seguro de que desea eliminar esta suscripción?
+Filehtpasswd=archivo htpasswd
+ConfirmValidateMember=¿Estás seguro de que quieres validar a este miembro?
+PublicMemberList=Lista de miembros públicos
+BlankSubscriptionForm=Formulario de auto-suscripción pública
+BlankSubscriptionFormDesc=Dolibarr puede proporcionarle una URL / sitio web público para que los visitantes externos puedan solicitar suscribirse a la fundación. Si se habilita un módulo de pago en línea, también puede proporcionarse automáticamente un formulario de pago.
+EnablePublicSubscriptionForm=Habilitar el sitio web público con formulario de suscripción automática
+ExportDataset_member_1=Miembros y suscripciones
+LastSubscriptionsModified=Últimas %s suscripciones modificadas
+Text=Texto
+PublicMemberCard=Tarjeta pública miembro
+SubscriptionNotRecorded=Suscripción no registrada
+AddSubscription=Crear suscripción
+ShowSubscription=Mostrar suscripción
+SendingAnEMailToMember=Envío de información de correo electrónico a un miembro
+SendingEmailOnAutoSubscription=Envío de correo electrónico en el registro automático
+SendingEmailOnMemberValidation=Enviando un correo electrónico sobre la validación de un nuevo miembro
+SendingEmailOnNewSubscription=Envío de correo electrónico con nueva suscripción
+SendingReminderForExpiredSubscription=Envío de recordatorio para suscripciones caducadas
+SendingEmailOnCancelation=Enviando correo electrónico sobre cancelación
+YourMembershipWasValidated=Su membresía fue validada
+YourSubscriptionWasRecorded=Su nueva suscripción fue guardada
+YourMembershipWasCanceled=Su membresía fue cancelada
+CardContent=Contenido de su tarjeta de miembro
+ThisIsContentOfYourMembershipRequestWasReceived=Queremos informarle que se recibió su solicitud de membresía. <br><br>
+ThisIsContentOfYourMembershipWasValidated=Queremos informarle que su membresía fue validada con la siguiente información: <br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=Queremos informarle que su nueva suscripción fue guardada. <br><br>
+ThisIsContentOfSubscriptionReminderEmail=Queremos informarle que su suscripción está a punto de caducar o que ya caducó (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Esperamos que lo renueves. <br><br>
+ThisIsContentOfYourCard=Este es un resumen de la información que tenemos sobre usted. Por favor contáctenos si algo es incorrecto. <br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Asunto del correo electrónico de notificación recibido en caso de autoinscripción de un invitado
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Contenido del correo electrónico de notificación recibido en caso de autoinscripción de un invitado
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Plantilla de correo electrónico para usar para enviar correos electrónicos a un miembro en la suscripción automática del miembro
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Plantilla de correo electrónico para usar para enviar correos electrónicos a un miembro en la validación de miembro
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Plantilla de correo electrónico para usar para enviar correos electrónicos a un miembro en una nueva grabación de suscripción
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Plantilla de correo electrónico para usar para enviar recordatorios por correo electrónico cuando la suscripción esté por caducar
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Plantilla de correo electrónico para usar para enviar correos electrónicos a un miembro en caso de cancelación de miembro
+DescADHERENT_MAIL_FROM=Correo electrónico del remitente para correos electrónicos automáticos
+DescADHERENT_ETIQUETTE_TYPE=Formato de la página de etiquetas
+DescADHERENT_ETIQUETTE_TEXT=Texto impreso en las hojas de direcciones de los miembros
+DescADHERENT_CARD_TYPE=Formato de la página de tarjetas
+DescADHERENT_CARD_HEADER_TEXT=Texto impreso en la parte superior de las tarjetas de miembro
+DescADHERENT_CARD_TEXT=Texto impreso en las tarjetas de miembro (alinee a la izquierda)
+DescADHERENT_CARD_TEXT_RIGHT=Texto impreso en las tarjetas de miembro (alinear a la derecha)
+DescADHERENT_CARD_FOOTER_TEXT=Texto impreso en la parte inferior de las tarjetas de miembro
+HTPasswordExport=generación de archivos htpassword
+MembersAndSubscriptions= Miembros y Suscripciones
+MoreActions=Acción complementaria sobre la grabación
+MoreActionsOnSubscription=Acción complementaria, sugerida de forma predeterminada al grabar una suscripción
+MoreActionBankDirect=Crear una entrada directa en una cuenta bancaria
+MoreActionBankViaInvoice=Crear una factura y un pago en cuenta bancaria
+MoreActionInvoiceOnly=Crear una factura sin pago
+LinkToGeneratedPages=Generar tarjetas de visita
+LinkToGeneratedPagesDesc=Esta pantalla le permite generar archivos PDF con tarjetas de visita para todos sus miembros o un miembro en particular.
+DocForAllMembersCards=Genere tarjetas de visita para todos los miembros
+DocForOneMemberCards=Generar tarjetas de visita para un miembro en particular
+DocForLabels=Generar hojas de direcciones
+SubscriptionPayment=Pago de suscripción
+LastSubscriptionDate=Fecha del último pago de suscripción
+LastSubscriptionAmount=Cantidad de la última suscripción
+MembersStatisticsByCountries=Estadísticas de los miembros por país
+MembersStatisticsByState=Estadísticas de los miembros por estado / provincia
+MembersStatisticsByTown=Estadísticas de los miembros por ciudad
+MembersStatisticsByRegion=Estadísticas de los miembros por región
+NoValidatedMemberYet=No se han encontrado miembros validados
+MembersByCountryDesc=Esta pantalla muestra estadísticas de los miembros por países. Gráfico depende sin embargo en el servicio de graficas en línea de Google y está disponible sólo si una conexión a Internet está funcionando.
+MembersByStateDesc=Esta pantalla muestra estadísticas sobre los miembros por estado / provincias / cantón.
+MembersByTownDesc=Esta pantalla muestra estadísticas sobre los miembros por ciudad.
+MembersStatisticsDesc=Elija las estadísticas que desea leer ...
+MenuMembersStats=Estadística
+LatestSubscriptionDate=Última fecha de suscripción
+Public=La información es pública
+NewMemberbyWeb=Nuevo miembro añadido. Esperando aprobacion
+NewMemberForm=Formulario para nuevos miembros
+SubscriptionsStatistics=Estadísticas de suscripciones
+NbOfSubscriptions=Número de suscripciones
+AmountOfSubscriptions=Cantidad de suscripciones
+TurnoverOrBudget=Facturación (para una empresa) o Presupuesto (para una fundación)
+DefaultAmount=Cantidad predeterminada de suscripción
+CanEditAmount=El visitante puede elegir / editar el importe de su suscripción
+MEMBER_NEWFORM_PAYONLINE=Ir a la página de pago en línea integrada
+MembersStatisticsByProperties=Estadísticas de miembros por naturaleza
+MembersByNature=Esta pantalla muestra estadísticas sobre miembros por naturaleza.
+MembersByRegion=Esta pantalla muestra las estadísticas de los miembros por región.
+VATToUseForSubscriptions=Tasa del IVA a utilizar para las suscripciones
+NoVatOnSubscription=Sin IVA para suscripciones
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producto utilizado para la línea de suscripción en la factura: %s
+NoEmailSentToMember=No se envió ningún correo electrónico al miembro
+EmailSentToMember=Correo electrónico enviado a un miembro en %s
+SendReminderForExpiredSubscriptionTitle=Enviar recordatorio por correo electrónico para la suscripción caducada
+SendReminderForExpiredSubscription=Enviar recordatorio por correo electrónico a los miembros cuando la suscripción está a punto de caducar (el parámetro es el número de días antes del final de la suscripción para enviar el recordatorio. Puede ser una lista de días separados por un punto y coma, por ejemplo, '10; 5; 0; -5 ')
+YouMayFindYourInvoiceInThisEmail=Puede encontrar su factura adjunta a este correo electrónico
+XMembersClosed=%s miembro(s) cerrado
diff --git a/htdocs/langs/es_EC/modulebuilder.lang b/htdocs/langs/es_EC/modulebuilder.lang
new file mode 100644
index 00000000000..03aba55c7e3
--- /dev/null
+++ b/htdocs/langs/es_EC/modulebuilder.lang
@@ -0,0 +1,93 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleBuilderDesc=Esta herramienta solo debe ser utilizada por usuarios o desarrolladores experimentados. Proporciona utilidades para construir o editar su propio módulo. La documentación para el desarrollo manual alternativo <a href="%s" target="_blank"> está aquí </a>.
+EnterNameOfModuleDesc=Introduzca el nombre del módulo/aplicación para crear sin espacios. Utilice mayúsculas para separar palabras (Por ejemplo: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Introduzca el nombre del objeto a crear sin espacios. Use mayúsculas para separar palabras (Por ejemplo: MyObject, Student, Teacher...). Se generará el archivo de clase CRUD, pero también archivos API, páginas para listar/agregar/editar/eliminar objetos y archivos SQL.
+ModuleBuilderDesc2=Ruta donde se generan / editan los módulos (primer directorio para módulos externos definidos en %s): <strong> %s </strong>
+ModuleBuilderDesc4=Un módulo se detecta como 'editable' cuando el archivo <strong>%s</strong>existe en la raíz del directorio del módulo
+ObjectKey=Clave de objeto
+FilesForObjectInitialized=Archivos para el nuevo objeto '%s' inicializado
+FilesForObjectUpdated=Archivos del objeto '%s' actualizados (archivos .sql y archivo .class.php)
+ModuleBuilderDescdescription=Ingrese aquí toda la información general que describe su módulo.
+ModuleBuilderDescspecifications=Puede ingresar aquí una descripción detallada de las especificaciones de su módulo que aún no está estructurada en otras pestañas. Así que tienes a tu alcance todas las reglas a desarrollar. También este contenido de texto se incluirá en la documentación generada (ver la última pestaña). Puede usar el formato Markdown, pero se recomienda usar el formato Asciidoc (comparación entre .md y .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Defina aquí los objetos que desea administrar con su módulo. Se creará una clase CRO DAO, archivos SQL, página para listar el registro de objetos, para crear/editar/ver un registro y API.
+ModuleBuilderDesctriggers=Esta es la vista de los activadores proporcionados por su módulo. Para incluir el código ejecutado cuando se inicia un evento de negocio activado, simplemente edite este archivo.
+ModuleBuilderDeschooks=Esta pestaña está dedicada a los ganchos.
+ModuleBuilderDescbuildpackage=Puede generar aquí un archivo de paquete "listo para distribuir" (un archivo .zip normalizado) de su módulo y un archivo de documentación "listo para distribuir". Simplemente haga clic en el botón para crear el paquete o el archivo de documentación.
+EnterNameOfModuleToDeleteDesc=Puedes borrar tu módulo. ADVERTENCIA: ¡Todos los archivos de codificación del módulo (generados o creados manualmente) Y los datos estructurados y la documentación serán eliminados!
+EnterNameOfObjectToDeleteDesc=Puedes borrar un objeto. ADVERTENCIA: ¡Se eliminarán todos los archivos de codificación (generados o creados manualmente) relacionados con el objeto!
+BuildPackage=Paquete de construcción
+BuildPackageDesc=Puede generar un paquete zip de su aplicación para que esté listo para distribuirlo en cualquier Dolibarr. También puede distribuirlo o venderlo en el mercado como <a href="https://www.dolistore.com"> DoliStore.com </a>.
+BuildDocumentation=Crear documentación
+ModuleIsNotActive=Este módulo no está activado todavía. Vaya a para %s hacerlo en vivo o haga clic aquí:
+ModuleIsLive=Este módulo ha sido activado. Cualquier cambio puede romper una función en vivo actual.
+DescriptorFile=Archivo de descripción del módulo
+ClassFile=Archivo para la clase PHP DAO CRUD
+ApiClassFile=Archivo para la clase API de PHP
+PageForList=Página de PHP para la lista de registro
+PathToModulePackage=Ruta de acceso zip del módulo/paquete de aplicación
+PathToModuleDocumentation=Ruta al archivo de la documentación del módulo / aplicación (%s)
+SpaceOrSpecialCharAreNotAllowed=No se permiten espacios ni caracteres especiales.
+FileNotYetGenerated=Archivo aún no generado
+RegenerateMissingFiles=Generar archivos perdidos
+ConfirmDeleteProperty=¿Estás seguro de que quieres eliminar la propiedad <strong>%s</strong>? Esto cambiará el código en la clase de PHP pero también eliminará la columna de la definición de la tabla del objeto.
+NotNull=No nulo
+SearchAll=Se utiliza para "buscar todos"
+FileAlreadyExists=El archivo %s ya existe
+TriggersFile=Archivo para el código de activadores
+HooksFile=Archivo de código de ganchos
+ArrayOfKeyValues=Matriz de key-val
+ArrayOfKeyValuesDesc=Conjunto de claves y valores si el campo es una lista combinada con valores fijos
+WidgetFile=Archivo de widgets
+ReadmeFile=Archivo Léame
+ChangeLog=Archivo ChangeLog
+TestClassFile=Archivo para la clase de prueba de unidad de PHP
+SqlFile=Archivo SQL
+PageForLib=Archivo para la biblioteca PHP común
+PageForObjLib=Archivo para la biblioteca PHP dedicada al objeto
+SqlFileExtraFields=Archivo SQL para atributos complementarios
+SqlFileKey=Archivo SQL para las claves
+SqlFileKeyExtraFields=Archivo SQL para claves de atributos complementarios
+UseAsciiDocFormat=Puede usar el formato Markdown, pero se recomienda usar el formato Asciidoc (omparison entre .md y .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+NoTrigger=Sin disparador
+GoToApiExplorer=Ir a explorador de API
+ListOfDictionariesEntries=Lista de entradas de diccionarios
+ListOfPermissionsDefined=Lista de permisos definidos
+SeeExamples=Ver ejemplos aquí
+EnabledDesc=Condición para tener este campo activo (Ejemplos:1 o $conf->global->MYMODULE_MYOPTION)
+VisibleDesc=¿Es visible el campo? (Ejemplos: 0=Nunca visible, 1=Visible en la lista y crear / actualizar / ver formularios, 2=Visible solo en la lista, 3=Visible solo en el formulario crear / actualizar / ver (no en la lista), 4=Visible en la lista y actualizar / ver solo el formulario (no crear), 5=Visible solo en el formulario de vista final de la lista (no crear, no actualizar) <br><br>El uso de un valor negativo significa que el campo no se muestra de forma predeterminada en la lista, pero puede seleccionarse para verlo). <br><br>Puede ser una expresión, por ejemplo: <br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Muestre este campo en documentos PDF compatibles, puede administrar la posición con el campo "Posición". <br/> Actualmente, conocidos modelos compatibles PDF son: Eratóstenes (orden), espadon (nave), esponja (facturas), cian (propal / cita), Cornas (orden de proveedor) <br/> <br/> <strong> Para documento: </strong> <br/> 0 = No se ven las <br/> 1 = display <br/> 2 = sólo si no está vacío <br/> <br/> <strong> Para las líneas de documentos: </strong> <br/> 0 = no se ven las <br/> 1 = muestran en una columna <br/> 3 = display en la columna de descripción de línea después de la descripción <br/> 4 = display en la columna de descripción después de la descripción solo si no está vacía
+DisplayOnPdf=Mostrar en PDF
+IsAMeasureDesc=¿Se puede acumular el valor de campo para obtener un total en la lista? (Ejemplos: 1 o 0)
+SearchAllDesc=¿Se utiliza el campo para realizar una búsqueda desde la herramienta de búsqueda rápida? (Ejemplos: 1 o 0)
+SpecDefDesc=Ingrese aquí toda la documentación que desea proporcionar con su módulo que no está definido por otras pestañas. Puede usar .md o mejor, la rica sintaxis .asciidoc.
+LanguageDefDesc=Ingrese en estos archivos, toda la clave y la traducción para cada archivo de idioma.
+MenusDefDesc=Defina aquí los menús proporcionados por su módulo
+DictionariesDefDesc=Defina aquí los diccionarios proporcionados por su módulo
+PermissionsDefDesc=Defina aquí los nuevos permisos proporcionados por su módulo
+MenusDefDescTooltip=Los menús proporcionados por su módulo / aplicación se definen en la matriz <strong>$this->menus</strong> en el archivo descriptor del módulo. Puede editar este archivo manualmente o usar el editor incorporado. <br><br> Nota: Una vez definidos (y el módulo reactivado), los menús también son visibles en el editor de menús disponibles para los usuarios administradores en %s.
+DictionariesDefDescTooltip=Los diccionarios proporcionados por su módulo / aplicación se definen en la matriz <strong>$this->dictionaries</strong> en el archivo descriptor del módulo. Puede editar este archivo manualmente o usar el editor incorporado. <br><br> Nota: Una vez definidos (y el módulo reactivado), los diccionarios también son visibles en el área de configuración para los usuarios administradores en %s.
+PermissionsDefDescTooltip=Los permisos proporcionados por su módulo / aplicación se definen en la matriz <strong>$this->rights</strong> en el archivo descriptor del módulo. Puede editar este archivo manualmente o usar el editor incorporado. <br><br> Nota: Una vez definidos (y el módulo reactivado), los permisos son visibles en la configuración de permisos predeterminada %s.
+HooksDefDesc=Defina en la propiedad <b>module_parts ['hooks'] </b>, en el descriptor de módulo, el contexto de los ganchos que desea administrar (puede encontrar una lista de contextos mediante una búsqueda en '<b>initHooks(</b>' en el código central) .<br> Edite el archivo gancho para agregar el código de sus funciones enganchadas (las funciones que se conectan se pueden encontrar mediante una búsqueda en '<b>executeHooks</b>' en el código central).
+TriggerDefDesc=Defina en el archivo de activación el código que desea ejecutar para cada evento empresarial ejecutado.
+SeeIDsInUse=Consulte ID en uso en su instalación.
+SeeReservedIDsRangeHere=Ver el rango de ID reservados
+ToolkitForDevelopers=Kit de herramientas para desarrolladores de Dolibarr
+TryToUseTheModuleBuilder=Si tiene conocimientos de SQL y PHP, puede usar el asistente de creación de módulos nativos. <br>Habilite el módulo <strong>%s</strong> y use el asistente haciendo clic <span class="fa fa-bug"></span> en el menú superior derecho. <br>Advertencia: esta es una función avanzada para desarrolladores, <b>no</b> experimente en su sitio de producción !
+SeeTopRightMenu=Ver <span class="fa fa-bug"></span>en el menú superior derecho
+InitStructureFromExistingTable=Construya la estructura de la cadena matriz de una tabla existente
+UseAboutPage=Deshabilitar la página acerca de
+UseDocFolder=Desactivar la carpeta de documentación.
+UseSpecificReadme=Use un archivo Léame específico
+RealPathOfModule=Camino real del módulo
+WidgetDesc=Puede generar y editar aquí los widgets que se integrarán con su módulo.
+UseSpecificEditorName =Use un nombre de editor específico
+UseSpecificEditorURL =Use una URL de editor específica
+UseSpecificFamily =Use una familia específica
+UseSpecificAuthor =Use un autor específico
+UseSpecificVersion =Use una versión inicial específica
+ModuleMustBeEnabled=El módulo / aplicación debe habilitarse primero
+IncludeDocGenerationHelp=Si marca esto, se generará algún código para agregar un cuadro "Generar documento" en el registro.
+ShowOnCombobox=Mostrar valor en el cuadro combinado
+KeyForTooltip=Clave para información sobre herramientas
+ForeignKey=Clave externa
+TypeOfFieldsHelp=Tipo de campos: <br> varchar(99), doble(24,8), real, texto, html, fecha y hora, marca de tiempo, entero, entero:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' significa que agregamos un botón + después del combo para crear el registro, 'filtro' puede ser 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' por ejemplo)
diff --git a/htdocs/langs/es_EC/mrp.lang b/htdocs/langs/es_EC/mrp.lang
new file mode 100644
index 00000000000..4b2c77a8d0b
--- /dev/null
+++ b/htdocs/langs/es_EC/mrp.lang
@@ -0,0 +1,50 @@
+# Dolibarr language file - Source file is en_US - mrp
+MRPDescription=Módulo para gestionar producción y pedidos de fabricación (MO).
+MenuBOM=Facturas de material
+LatestBOMModified=Últimas listas de materiales modificados %s
+LatestMOModified=Últimas órdenes de fabricación %s modificadas
+Bom=Facturas de material
+BillOfMaterials=Lista de materiales
+ListOfBOMs=Lista de listas de materiales - BOM
+ListOfManufacturingOrders=Lista de pedidos de fabricación
+ProductBOMHelp=Producto para crear con esta BOM. <br> Nota: Los productos con la propiedad 'Naturaleza del producto' = 'Materia prima' no son visibles en esta lista.
+BOMsNumberingModules=Plantillas de numeración BOM
+BOMsModelModule=Plantillas de documentos BOM
+MOsNumberingModules=Plantillas de numeración MO
+MOsModelModule=Plantillas de documentos MO
+FreeLegalTextOnBOMs=Texto libre en el documento de BOM
+WatermarkOnDraftBOMs=Marca de agua en el borrador de lista de materiales
+FreeLegalTextOnMOs=Texto libre en el documento de MO
+WatermarkOnDraftMOs=Marca de agua en borrador MO
+ConfirmCloneBillOfMaterials=¿Está seguro de que desea clonar la lista de materiales %s?
+ConfirmCloneMo=¿Está seguro de que desea clonar la orden de fabricación %s?
+ConsumptionEfficiency=Eficiencia de consumo
+ValueOfMeansLoss=Valor de 0.95 significa un promedio de 5%% de pérdida durante la producción
+ValueOfMeansLossForProductProduced=El valor de 0.95 significa un promedio de 5%% de pérdida del producto producido
+DeleteBillOfMaterials=Eliminar lista de materiales
+DeleteMo=Eliminar orden de fabricación
+ConfirmDeleteBillOfMaterials=¿Está seguro de que desea eliminar esta lista de materiales?
+ConfirmDeleteMo=¿Está seguro de que desea eliminar esta lista de materiales?
+QtyToProduce=Cantidad para producir
+DateStartPlannedMo=Fecha de inicio prevista
+DateEndPlannedMo=Fecha de finalización prevista
+ConfirmValidateBom=¿Está seguro de que desea validar la lista de materiales con la referencia <strong>%s</strong> (podrá utilizarla para crear nuevos pedidos de fabricación)
+ConfirmCloseBom=¿Está seguro de que desea cancelar esta lista de materiales (ya no podrá usarla para crear nuevas órdenes de fabricación)?
+ConfirmReopenBom=¿Está seguro de que desea volver a abrir esta lista de materiales (podrá usarla para crear nuevos pedidos de fabricación)
+QtyFrozen=Cantidad congelada
+QuantityFrozen=Cantidad congelada
+DisableStockChangeHelp=Cuando se establece este indicador, no hay cambio de existencias en este producto, sea cual sea la cantidad consumida
+BOMLine=Línea de BOM
+CreateMO=Crear MO
+ToConsume=Consumir
+ToProduce=Para producir
+QtyAlreadyConsumed=Cantidad ya consumida
+QtyAlreadyProduced=Cantidad ya producida
+ConsumeOrProduce=Consumir o Producir
+ConfirmValidateMo=¿Está seguro de que desea validar esta orden de fabricación?
+ConfirmProductionDesc=Al hacer clic en '%s', validará el consumo y / o la producción de las cantidades establecidas. Esto también actualizará el stock y registrará movimientos de stock.
+AutoCloseMO=Cierre automáticamente la orden de fabricación si se alcanzan cantidades para consumir y producir
+ProductQtyToProduceByMO=Quentidad de producto aún por producir por MO abierto
+AddNewConsumeLines=Agregar nueva línea para consumir
+ProductsToConsume=Productos para consumir
+ProductsToProduce=Productos para producir
diff --git a/htdocs/langs/es_EC/multicurrency.lang b/htdocs/langs/es_EC/multicurrency.lang
new file mode 100644
index 00000000000..5ff0eab3f84
--- /dev/null
+++ b/htdocs/langs/es_EC/multicurrency.lang
@@ -0,0 +1,18 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+ErrorAddRateFail=Error en la tasa agregada
+ErrorAddCurrencyFail=Error en la moneda añadida
+ErrorDeleteCurrencyFail=Error al eliminar la falla
+multicurrency_syncronize_error=Error de sincronización: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use la fecha del documento para encontrar la tasa de cambio, en lugar de usar la última tasa conocida
+multicurrency_useOriginTx=Cuando se crea un objeto a partir de otro, mantenga la tasa original del objeto de origen (de lo contrario, use la última tasa conocida)
+CurrencyLayerAccount=API de CurrencyLayer
+CurrencyLayerAccount_help_to_synchronize=Debe crear una cuenta en el sitio web %s para usar esta funcionalidad. <br> Obtenga su clave API <b> </b>. <br> Si usa una cuenta gratuita, no puede cambiar la <b>moneda de origen</b> (USD por defecto). <br> Si su moneda principal no es USD, la aplicación lo recalculará automáticamente. <br> <br> Está limitado a 1000 sincronizaciones por mes.
+multicurrency_appCurrencySource=Moneda de origen
+multicurrency_alternateCurrencySource=Moneda de origen alternativa
+CurrenciesUsed=Monedas utilizadas
+CurrenciesUsed_help_to_add=Agregue las diferentes monedas y tasas que necesita utilizar en sus <b>propuestas</b>, <b>pedidos</b>, etc.
+rate=Tasa
+MulticurrencyReceived=Recibido, moneda original
+MulticurrencyRemainderToTake=Importe restante, moneda original.
+MulticurrencyPaymentAmount=Monto a pagar, moneda de origen
+AmountToOthercurrency=Cantidad a (en la moneda de la cuenta receptora)
diff --git a/htdocs/langs/es_EC/oauth.lang b/htdocs/langs/es_EC/oauth.lang
new file mode 100644
index 00000000000..bcc7139dc28
--- /dev/null
+++ b/htdocs/langs/es_EC/oauth.lang
@@ -0,0 +1,23 @@
+# Dolibarr language file - Source file is en_US - oauth
+ConfigOAuth=Configuración de OAuth
+OAuthServices=Servicios de OAuth
+ManualTokenGeneration=Generación de tokens manual
+TokenManager=Administrador de tokens
+IsTokenGenerated=¿El token se genero?
+NoAccessToken=Ningún token de acceso guardado en la base de datos local
+HasAccessToken=Se generó un token y se guardó en la base de datos local
+ToCheckDeleteTokenOnProvider=Haga clic aquí para comprobar/eliminar la autorización guardada por%s Proveedor de OAuth
+RequestAccess=Haga clic aquí para solicitar/renovar el acceso y reciba un nuevo token para guardar
+DeleteAccess=Haga clic aquí para eliminar token
+UseTheFollowingUrlAsRedirectURI=Use la siguiente URL como URI de redireccionamiento al crear sus credenciales con su proveedor de OAuth:
+ListOfSupportedOauthProviders=Ingrese las credenciales proporcionadas por su proveedor de OAuth2. Aquí solo se enumeran los proveedores de OAuth2 compatibles. Estos servicios pueden ser utilizados por otros módulos que necesitan autenticación OAuth2.
+SeePreviousTab=Ver pestaña anterior
+OAuthIDSecret=OAuth ID y secreto
+TOKEN_REFRESH=Actualizar Token Presente
+TOKEN_EXPIRE_AT=El token expira en
+TOKEN_DELETE=Eliminar el token guardado
+OAUTH_GOOGLE_NAME=Servicio de Google OAuth
+OAUTH_GOOGLE_ID=ID de Google de OAuth
+OAUTH_GOOGLE_DESC=Vaya a <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">esta página</a> y luego a "Credenciales" para crear credenciales de OAuth
+OAUTH_GITHUB_NAME=Servicio OAuth GitHub
+OAUTH_GITHUB_DESC=Vaya a <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">esta página</a> y luego "Registre una nueva aplicación" para crear credenciales de OAuth
diff --git a/htdocs/langs/es_EC/opensurvey.lang b/htdocs/langs/es_EC/opensurvey.lang
new file mode 100644
index 00000000000..95e4234b4f1
--- /dev/null
+++ b/htdocs/langs/es_EC/opensurvey.lang
@@ -0,0 +1,35 @@
+# Dolibarr language file - Source file is en_US - opensurvey
+OrganizeYourMeetingEasily=Organice sus reuniones y encuestas fácilmente. Primero seleccione el tipo de encuesta ...
+OpenSurveyArea=Área de Encuestas
+AddACommentForPoll=Puedes agregar un comentario a la encuesta ...
+AddComment=Agregar comentario
+ToReceiveEMailForEachVote=Reciba un correo electrónico para cada voto
+TypeDate=Tipo de fecha
+OpenSurveyStep2=Seleccione sus fechas entre los días libres (gris). Los días seleccionados son verdes. Puede anular la selección de un día seleccionado previamente haciendo clic nuevamente en él.
+TheBestChoice=La mejor opción actualmente es
+TheBestChoices=Las mejores opciones actualmente son
+OpenSurveyHowTo=Si acepta votar en esta encuesta, debe dar su nombre, elegir los valores que mejor le convengan y validar con el botón más al final de la línea.
+ConfirmRemovalOfPoll=¿Seguro que quieres eliminar esta encuesta (y todos los votos)
+UrlForSurvey=URL para comunicarse para obtener acceso directo a la encuesta
+PollOnChoice=Está creando una encuesta para realizar una elección múltiple para una encuesta. Primero escriba todas las opciones posibles para su encuesta:
+CheckBox=Casilla de verificación simple
+YesNoList=Lista (vacío/si/no)
+PourContreList=Lista (vacío/por/contra)
+AddNewColumn=Agregar nueva columna
+TitleChoice=Etiqueta de elección
+ExportSpreadsheet=Exportar hoja de cálculo de resultados
+NbOfVoters=No. de encuestados
+PollAdminDesc=Se le permite cambiar todas las líneas de votación de esta encuesta con el botón "Editar". También puede eliminar una columna o una línea con% s. También puede agregar una nueva columna con% s.
+5MoreChoices=5 más opciones
+YouAreInivitedToVote=Estás invitado a votar por esta encuesta
+VoteNameAlreadyExists=Este nombre ya se utilizó para esta encuesta
+AddEndHour=Añadir hora final
+NoCommentYet=Aún no hay comentarios en esta encuesta
+CanSeeOthersVote=Los votantes pueden ver el voto de otras personas
+SelectDayDesc=Para cada día seleccionado, puede elegir, o no, las horas de reunión en el siguiente formato: <br> - vacío, <br> - "8h", "8H" u "8:00" para indicar la hora de inicio de una reunión, <br> - "8- 11 "," 8h-11h "," 8H-11H "u" 8: 00-11: 00 "para indicar la hora de inicio y finalización de una reunión, <br> -" 8h15-11h15 "," 8H15-11H15 "u" 8: 15-11: 15 "para lo mismo pero con minutos.
+ErrorOpenSurveyFillFirstSection=No has llenado la primera sección de la creación de la encuesta
+ErrorInsertingComment=Se ha producido un error al insertar tu comentario.
+MoreChoices=Ingrese más opciones para los votantes
+SurveyExpiredInfo=La encuesta ha sido cerrada o el plazo de votación ha expirado.
+EmailSomeoneVoted=%s ha llenado una línea. \nPuede encontrar su encuesta en el enlace: \n%s
+UserMustBeSameThanUserUsedToVote=Debes haber votado y usar el mismo nombre de usuario que el que solías votar, para publicar un comentario
diff --git a/htdocs/langs/es_EC/orders.lang b/htdocs/langs/es_EC/orders.lang
new file mode 100644
index 00000000000..942acb41d5b
--- /dev/null
+++ b/htdocs/langs/es_EC/orders.lang
@@ -0,0 +1,142 @@
+# Dolibarr language file - Source file is en_US - orders
+OrdersArea=Área de pedidos de clientes
+SuppliersOrdersArea=Área de pedidos de compras
+OrderCard=Tarjeta de pedido
+OrderId=Solicitar ID
+Order=Orden
+PdfOrderTitle=Orden
+OrderLine=Fila para ordenar
+OrderDateShort=Fecha de orden
+OrderToProcess=Orden para procesar
+NewOrder=Nueva orden
+NewOrderSupplier=Nueva orden de compra
+ToOrder=Hacer orden
+MakeOrder=Hacer orden
+SupplierOrder=Orden de compra
+SuppliersOrders=Ordenes de compra
+SuppliersOrdersRunning=Pedidos de compra actuales
+CustomerOrder=Pedidos
+CustomersOrders=Ordenes de venta
+CustomersOrdersRunning=Pedidos actuales
+CustomersOrdersAndOrdersLines=Pedidos y detalles de pedidos
+OrdersDeliveredToBill=Pedidos entregados a la factura
+OrdersToBill=Pedidos entregados
+OrdersInProcess=Pedidos en proceso
+OrdersToProcess=Pedidos para procesar
+SuppliersOrdersToProcess=Órdenes de compra para procesar
+SuppliersOrdersAwaitingReception=Órdenes de compra en espera de recepción
+StatusOrderCanceledShort=Cancelado
+StatusOrderSentShort=En proceso
+StatusOrderSent=Envío en proceso
+StatusOrderOnProcessShort=Ordenado
+StatusOrderProcessedShort=Procesada
+StatusOrderDelivered=Entregado
+StatusOrderDeliveredShort=Entregado
+StatusOrderToBillShort=Entregado
+StatusOrderToProcessShort=Para procesar
+StatusOrderCanceled=Cancelado
+StatusOrderDraft=Proyecto (necesita ser validado)
+StatusOrderValidated=validado
+StatusOrderOnProcess=Pedido - Recepción en espera
+StatusOrderOnProcessWithValidation=Pedido - Recepción o validación en espera
+StatusOrderProcessed=Procesada
+StatusOrderToBill=Entregado
+ShippingExist=Existe un envío
+QtyOrdered=Cant. ordenada
+ProductQtyInDraft=Cantidad del producto en proyectos de pedido
+ProductQtyInDraftOrWaitingApproved=Cantidad del producto en proyectos o pedidos aprobados, aún no solicitados
+MenuOrdersToBill=Órdenes entregadas
+ShipProduct=Producto de la nave
+RefuseOrder=Orden de rechazo
+ApproveOrder=Aprobar la orden
+Approve2Order=Aprobar el pedido (segundo nivel)
+ValidateOrder=Validar pedido
+UnvalidateOrder=Anular la orden
+DeleteOrder=Eliminar orden
+CancelOrder=Cancelar orden
+OrderReopened=Orden %s reabrir
+AddPurchaseOrder=Crear orden de compra
+AddToDraftOrders=Añadir al proyecto de orden
+OrdersOpened=Órdenes a procesar
+NoDraftOrders=Ningún proyecto de órdenes
+NoOrder=Sin orden
+LastOrders=Últimos pedidos %s
+LastCustomerOrders=Últimos pedidos %s
+LastSupplierOrders=Últimas %s órdenes de compra
+LastModifiedOrders=Últimos %s pedidos modificados
+AllOrders=Todas las órdenes
+NbOfOrders=Numero de ordenes
+OrdersStatistics=Estadísticas de Order
+OrdersStatisticsSuppliers=Estadísticas de orden de compra
+AmountOfOrdersByMonthHT=Cantidad de pedidos por mes (sin impuestos)
+ListOfOrders=Lista de pedidos
+ConfirmCloseOrder=¿Está seguro de que desea configurar este pedido para entregado? Una vez que se entrega un pedido, se puede configurar para facturarse.
+ConfirmDeleteOrder=¿Seguro que quieres eliminar este pedido?
+ConfirmValidateOrder=¿Está seguro de que desea validar este pedido con el nombre <b>%s</b>?
+ConfirmUnvalidateOrder=¿Seguro que desea restaurar la orden <b>%s</b> para borrar el estado?
+ConfirmCancelOrder=¿Seguro que desea cancelar este pedido?
+ConfirmMakeOrder=¿Seguro que desea confirmar que realizó esta orden en <b>%s</b>?
+GenerateBill=Generar factura
+ClassifyShipped=Clasificar entregado
+DraftOrders=Proyectos de órdenes
+DraftSuppliersOrders=Borrador de órdenes de compra
+OnProcessOrders=En órdenes de proceso
+RefOrder=Ref. orden
+RefCustomerOrder=Ref. orden para el cliente
+RefOrderSupplier=Referencia orden para el vendedor
+RefOrderSupplierShort=Referencia orden al vendedor
+SendOrderByMail=Enviar pedido por correo
+ActionsOnOrder=Eventos bajo pedido
+NoArticleOfTypeProduct=Ningún artículo del tipo 'producto', por lo que no se puede enviar ningún artículo para este pedido
+AuthorRequest=Solicitar autor
+UserWithApproveOrderGrant=Usuarios concedidos con el permiso de "aprobar órdenes".
+PaymentOrderRef=Pago del pedido %s
+ConfirmCloneOrder=¿Está seguro de que desea clonar esta orden <b>%s</b>?
+DispatchSupplierOrder=Recepción de orden de compra %s
+FirstApprovalAlreadyDone=Primera aprobación ya realizada
+SecondApprovalAlreadyDone=Segunda aprobación ya realizada
+SupplierOrderReceivedInDolibarr=Orden de compra %s recibida %s
+SupplierOrderSubmitedInDolibarr=Orden de compra %s enviada
+SupplierOrderClassifiedBilled=Conjunto de ordenes de compra %s facturado
+OtherOrders=Otras órdenes
+TypeContact_commande_internal_SALESREPFOLL=Representante de seguimiento del pedido
+TypeContact_commande_internal_SHIPPING=Envío de seguimiento representativo
+TypeContact_commande_external_BILLING=Contacto de factura de cliente
+TypeContact_commande_external_SHIPPING=Contacto de envío del cliente
+TypeContact_commande_external_CUSTOMER=Orden de seguimiento del contacto del cliente
+TypeContact_order_supplier_internal_SALESREPFOLL=Orden de compra de seguimiento representativa
+TypeContact_order_supplier_internal_SHIPPING=Envío de seguimiento representativo
+TypeContact_order_supplier_external_BILLING=Contacto de factura del vendedor
+TypeContact_order_supplier_external_SHIPPING=Contacto de envío del proveedor
+TypeContact_order_supplier_external_CUSTOMER=Orden de seguimiento del contacto del proveedor
+Error_OrderNotChecked=No hay pedidos para facturar seleccionados
+OrderByEMail= Email
+PDFEinsteinDescription=Un modelo de pedido completo (antigua implementación de la plantilla Eratosthene)
+PDFEratostheneDescription=Un modelo de orden completo
+PDFEdisonDescription=Un modelo de pedido simple
+PDFProformaDescription=Una plantilla completa de factura Proforma
+CreateInvoiceForThisCustomer=Ordenes de factura
+NoOrdersToInvoice=No hay pedidos facturables
+CloseProcessedOrdersAutomatically=Clasifique "Procesado" todos los pedidos seleccionados.
+OrderCreation=Creación de órdenes
+Ordered=Ordenado
+OrderFail=Se ha producido un error durante la creación de los pedidos.
+ToBillSeveralOrderSelectCustomer=Para crear una factura para varios pedidos, haga clic primero en el cliente, luego elija "%s".
+OptionToSetOrderBilledNotEnabled=La opción del flujo de trabajo del módulo, para establecer el pedido en 'Facturado' automáticamente cuando se valida la factura, no está habilitada, por lo que deberá establecer el estado de los pedidos en 'Facturado' manualmente después de que se haya generado la factura.
+CloseReceivedSupplierOrdersAutomatically=Cierre el pedido al estado "%s" automáticamente si se reciben todos los productos.
+SetShippingMode=Establecer modo de envío
+StatusSupplierOrderCanceledShort=Cancelado
+StatusSupplierOrderSentShort=En proceso
+StatusSupplierOrderSent=Envío en proceso
+StatusSupplierOrderOnProcessShort=Ordenado
+StatusSupplierOrderProcessedShort=Procesada
+StatusSupplierOrderDelivered=Entregado
+StatusSupplierOrderDeliveredShort=Entregado
+StatusSupplierOrderToBillShort=Entregado
+StatusSupplierOrderToProcessShort=Para procesar
+StatusSupplierOrderCanceled=Cancelado
+StatusSupplierOrderDraft=Proyecto (necesita ser validado)
+StatusSupplierOrderOnProcess=Pedido - Recepción en espera
+StatusSupplierOrderOnProcessWithValidation=Pedido - Recepción o validación en espera
+StatusSupplierOrderProcessed=Procesada
+StatusSupplierOrderToBill=Entregado
diff --git a/htdocs/langs/es_EC/other.lang b/htdocs/langs/es_EC/other.lang
new file mode 100644
index 00000000000..9aeec1f879e
--- /dev/null
+++ b/htdocs/langs/es_EC/other.lang
@@ -0,0 +1,198 @@
+# Dolibarr language file - Source file is en_US - other
+SecurityCode=Código de seguridad
+Tools=Herramientas
+TMenuTools=Herramientas
+ToolsDesc=Todas las herramientas no incluidas en otras entradas del menú se agrupan aquí. <br> Se puede acceder a todas las herramientas a través del menú de la izquierda.
+Birthday=Cumpleaños
+BirthdayAlertOn=alerta de cumpleaños activa
+BirthdayAlertOff=alerta de cumpleaños inactiva
+MonthOfInvoice=Mes (número 1-12) de la fecha de la factura
+TextMonthOfInvoice=Mes (texto) de la fecha de la factura
+PreviousMonthOfInvoice=Mes anterior (número 1-12) de la fecha de la factura
+ZipFileGeneratedInto=Archivo comprimido generado en <b>%s</b>.
+DocFileGeneratedInto=Archivo de Doc generado en <b>%s</b>.
+MessageOK=Mensaje en la página de devolución para un pago validado
+MessageKO=Mensaje en la página de devolución para un pago cancelado
+ContentOfDirectoryIsNotEmpty=El contenido de este directorio no está vacío.
+DeleteAlsoContentRecursively=Marque para eliminar todo el contenido recursivamente
+PoweredBy=Energizado por
+NextYearOfInvoice=Año siguiente de la fecha de la factura
+GraphInBarsAreLimitedToNMeasures=Los gráficos se limitan a las medidas %s en el modo 'Barras'. En su lugar, se seleccionó automáticamente el modo 'Líneas'.
+AtLeastOneMeasureIsRequired=Se requiere al menos 1 campo para medir
+AtLeastOneXAxisIsRequired=Se requiere al menos 1 campo para el eje X
+LatestBlogPosts=Últimas publicaciones de blog
+Notify_ORDER_VALIDATE=Pedido de ventas validado
+Notify_ORDER_SENTBYMAIL=Pedido de ventas enviado por correo
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Orden de compra enviada por correo electrónico
+Notify_ORDER_SUPPLIER_VALIDATE=Orden de compra registrada
+Notify_ORDER_SUPPLIER_APPROVE=Orden de compra aprobada
+Notify_ORDER_SUPPLIER_REFUSE=Orden de compra rechazada
+Notify_PROPAL_VALIDATE=Propuesta de cliente validada
+Notify_PROPAL_CLOSE_SIGNED=Propuesta de cliente cerrada firmada
+Notify_PROPAL_CLOSE_REFUSED=Propuesta de cliente cerrada rechazada
+Notify_PROPAL_SENTBYMAIL=Propuesta comercial enviada por correo
+Notify_WITHDRAW_TRANSMIT=Retirada de la transmisión
+Notify_WITHDRAW_CREDIT=Retiro de crédito
+Notify_WITHDRAW_EMIT=Realizar el retiro
+Notify_COMPANY_CREATE=Clientes/Proveedores creados
+Notify_COMPANY_SENTBYMAIL=Correos enviados desde tarjeta de terceros
+Notify_BILL_VALIDATE=Factura del cliente validada
+Notify_BILL_UNVALIDATE=Factura del cliente no validada
+Notify_BILL_CANCEL=Factura del cliente cancelada
+Notify_BILL_SENTBYMAIL=Factura del cliente enviada por correo
+Notify_BILL_SUPPLIER_VALIDATE=Factura de proveedor validada
+Notify_BILL_SUPPLIER_PAYED=Factura del proveedor pagada
+Notify_BILL_SUPPLIER_SENTBYMAIL=Factura de proveedor enviada por correo
+Notify_BILL_SUPPLIER_CANCELED=Factura de proveedor cancelada
+Notify_CONTRACT_VALIDATE=Contrato validado
+Notify_FICHINTER_VALIDATE=Intervención validada
+Notify_FICHINTER_ADD_CONTACT=Contacto añadido a la intervención
+Notify_FICHINTER_SENTBYMAIL=Intervención enviada por correo
+Notify_SHIPPING_VALIDATE=Envío validado
+Notify_SHIPPING_SENTBYMAIL=Envío enviado por correo
+Notify_MEMBER_VALIDATE=Miembro validado
+Notify_MEMBER_SUBSCRIPTION=Miembro suscripto
+Notify_MEMBER_RESILIATE=Miembro terminado
+Notify_MEMBER_DELETE=Miembro eliminado
+Notify_PROJECT_CREATE=Creación del proyecto
+Notify_TASK_DELETE=Tarea borrada
+Notify_HOLIDAY_VALIDATE=Deja la solicitud validada (se requiere aprobación)
+Notify_HOLIDAY_APPROVE=Dejar la solicitud aprobada
+SeeModuleSetup=Consulte la configuración del módulo%s
+NbOfAttachedFiles=Número de archivos/documentos adjuntos
+TotalSizeOfAttachedFiles=Tamaño total de archivos/documentos adjuntos
+MaxSize=Talla máxima
+AttachANewFile=Adjuntar un nuevo archivo/documento
+LinkedObject=Objeto enlazado
+NbOfActiveNotifications=Número de notificaciones (número de correos electrónicos del destinatario)
+PredefinedMailTest=Se trata de un correo de prueba enviado a __EMAIL __.\nLas dos líneas están separadas por un retorno de carro.\n\n__SIGNATURE__
+PredefinedMailTestHtml=Se trata de un </b>test</b> correo (la palabra prueba debe estar en negrita).</b> Las dos líneas están separadas por un retorno de carro.</b><br> __SIGNATURE__
+PredefinedMailContentContract=aa__PERSONALIZED __\n\n__SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hola)__\n\nEncuentre la factura __REF__ adjunta\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sinceramente)__\n\n__ FIRMA DEL USUARIO__
+PredefinedMailContentSendInvoiceReminder=__(Hola)__\n\nNos gustaría recordarle que la factura __REF__ parece no haberse pagado. Se adjunta una copia de la factura como recordatorio.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sinceramente)__\n\n__ FIRMA DEL USUARIO__
+PredefinedMailContentSendProposal=__(Hola)__\n\nEncuentre la propuesta comercial __REF__ adjunta\n\n\n__(Sinceramente)__\n\n__ FIRMA DEL USUARIO__
+PredefinedMailContentSendSupplierProposal=__(Hola)__\n\nPor favor encuentre la solicitud de precio __REF__ adjunta\n\n\n__(Sinceramente)__\n\n__ FIRMA DEL USUARIO__
+PredefinedMailContentSendOrder=__(Hola)__\n\nPor favor encuentre la orden __REF__ adjunta\n\n\n__(Sinceramente)__\n\n__ FIRMA DEL USUARIO__
+PredefinedMailContentSendSupplierOrder=__(Hola)__\n\nPor favor encuentre nuestro pedido __REF__ adjunto\n\n\n__(Sinceramente)__\n\n__ FIRMA DEL USUARIO__
+PredefinedMailContentSendSupplierInvoice=__(Hola)__\n\nEncuentre la factura __REF__ adjunta\n\n\n__(Sinceramente)__\n\n__ FIRMA DEL USUARIO__
+PredefinedMailContentSendShipping=__(Hola)__\n\nPor favor encuentre el envío __REF__ adjunto\n\n\n__(Sinceramente)__\n\n__ FIRMA DEL USUARIO__
+PredefinedMailContentSendFichInter=__(Hola)__\n\nPor favor encuentre la intervención __REF__ adjunta\n\n\n__(Sinceramente)__\n\n__ FIRMA DEL USUARIO__
+PredefinedMailContentThirdparty=__CONTACTCIVNAME __\n\n__PERSONALIZED __\n\n__SIGNATURE__
+PredefinedMailContentContact=aa__PERSONALIZED __\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED __\n\n__SIGNATURE__
+DemoDesc=Dolibarr es un ERP/CRM compacto que soporta varios módulos de negocio. Una demostración que muestra todos los módulos no tiene sentido ya que este escenario nunca ocurre (varios cientos disponibles). Por lo tanto, varios perfiles de demostración están disponibles.
+ChooseYourDemoProfil=Elige el perfil de demostración que mejor se adapte a tus necesidades ...
+ChooseYourDemoProfilMore=...o crear su propio perfil</b> (selección manual de módulos)
+DemoFundation=Administrar miembros de una fundación
+DemoFundation2=Administrar miembros y cuenta bancaria de una fundación
+DemoCompanyServiceOnly=Empresa o servicio de venta independiente solamente
+DemoCompanyShopWithCashDesk=Administrar una tienda con una caja
+DemoCompanyAll=Empresa con múltiples actividades (todos los módulos principales)
+ModifiedBy=Modificado por%s
+ValidatedBy=Validado por%s
+ClosedBy=Cerrado por%s
+CreatedById=ID de usuario que creó
+ModifiedById=ID de usuario que realizó el último cambio
+ValidatedById=ID de usuario que validó
+CanceledById=ID de usuario que canceló
+ClosedById=ID de usuario que cerró
+CreatedByLogin=Usuario que creó
+ModifiedByLogin=Usuario que realizó el último cambio
+ValidatedByLogin=Usuario que validó
+CanceledByLogin=Inicio de sesión de usuario que canceló
+ClosedByLogin=Usuario que cerró
+FileWasRemoved=Se ha eliminado el archivo%s
+DirWasRemoved=Se ha eliminado el directorio%s
+FeatureNotYetAvailable=Característica aún no disponible en la versión actual
+FeaturesSupported=Funciones admitidas
+Width=Anchura
+Height=Altura
+Depth=Profundidad
+Top=Parte superior
+Bottom=Fondo
+WeightUnitg=gramo
+LengthUnitm=metro
+SurfaceUnitinch2=en²
+SizeUnitm=metro
+BugTracker=Localizador de bichos
+SendNewPasswordDesc=Este formulario le permite solicitar una nueva contraseña. Se enviará a su dirección de correo electrónico. <br> El cambio se hará efectivo una vez que haga clic en el enlace de confirmación en el correo electrónico. <br> Compruebe su bandeja de entrada.
+BackToLoginPage=Volver a la página de inicio de sesión
+AuthenticationDoesNotAllowSendNewPassword=El modo de autenticación es <b>%s</b>. <br>En este modo, Dolibarr no puede saber ni cambiar su contraseña. <br> Póngase en contacto con el administrador del sistema si desea cambiar su contraseña.
+EnableGDLibraryDesc=Instale o active la biblioteca GD en su instalación de PHP para usar esta opción.
+ProfIdShortDesc=</b>Prof Id%s</b> es una información que depende de un tercer país.</b> Por ejemplo, para el país <b>%s</b>, es el código <b>%s</b>.
+DolibarrDemo=Demostración de ERP/CRM de Dolibarr
+StatsByNumberOfUnits=Estadísticas de suma de cantidad de productos/servicios
+StatsByNumberOfEntities=Estadísticas en número de entidades referentes (n.° de factura, o pedido ...)
+NumberOfProposals=Número de propuestas
+NumberOfCustomerOrders=Número de pedidos de ventas
+NumberOfCustomerInvoices=Número de facturas de clientes
+NumberOfSupplierProposals=Número de propuestas de proveedores
+NumberOfSupplierOrders=Numero de ordenes de compra
+NumberOfSupplierInvoices=Número de facturas de proveedor
+NumberOfContracts=Numero de contratos
+NumberOfMos=Número de pedidos de fabricación.
+NumberOfUnitsProposals=Número de unidades en las propuestas
+NumberOfUnitsCustomerOrders=Número de unidades en pedidos de ventas
+NumberOfUnitsCustomerInvoices=Número de unidades en facturas de clientes
+NumberOfUnitsSupplierProposals=Número de unidades en propuestas de proveedores
+NumberOfUnitsSupplierOrders=Número de unidades en pedidos de compra
+NumberOfUnitsSupplierInvoices=Número de unidades en facturas de proveedor
+NumberOfUnitsContracts=Número de unidades en contratos
+NumberOfUnitsMos=Número de unidades para producir en pedidos de fabricación.
+EMailTextInterventionAddedContact=Se te ha asignado una nueva intervención %s.
+EMailTextInterventionValidated=La intervención%s ha sido validada.
+EMailTextInvoiceValidated=La factura %s ha sido validada.
+EMailTextInvoicePayed=Se ha pagado la factura %s.
+EMailTextProposalValidated=La propuesta %s ha sido validada.
+EMailTextProposalClosedSigned=La propuesta %s ha sido cerrada y firmada.
+EMailTextOrderApproved=El pedido %s ha sido aprobado.
+EMailTextOrderApprovedBy=El pedido %s ha sido aprobado por %s.
+EMailTextOrderRefused=El pedido %s ha sido rechazado.
+EMailTextOrderRefusedBy=El pedido %s ha sido rechazado por %s.
+EMailTextHolidayValidated=Dejar solicitud %s ha sido validado.
+EMailTextHolidayApproved=Dejar solicitud %s ha sido aprobado.
+ImportedWithSet=Conjunto de datos de importación
+ResizeDesc=Introduzca nueva anchura </b>O</b> nueva altura. Ratio se mantendrá durante el cambio de tamaño ...
+NewSizeAfterCropping=Nuevo tamaño después del recorte
+DefineNewAreaToPick=Defina el área nueva en la imagen para recoger (clic izquierdo en la imagen y luego arrastrar hasta llegar a la esquina opuesta)
+CurrentInformationOnImage=Esta herramienta fue diseñada para ayudarte a redimensionar o recortar una imagen. Esta es la información sobre la imagen editada actual.
+YouReceiveMailBecauseOfNotification=Recibirá este mensaje porque su correo electrónico se ha agregado a la lista de destinos para ser informado de eventos particulares en%s software de%s.
+YouReceiveMailBecauseOfNotification2=Este evento es el siguiente:
+ThisIsListOfModules=Esta es una lista de módulos preseleccionados por este perfil de demostración (sólo los módulos más comunes son visibles en esta demo). Edita esto para tener una demostración más personalizada y haz clic en "Inicio".
+UseAdvancedPerms=Utilice los permisos avanzados de algunos módulos
+SelectAColor=Elige un color
+AddFiles=Agregar archivos
+StartUpload=Iniciar la subida
+CancelUpload=Cancelar la subida
+FileIsTooBig=Los archivos son demasiado grandes
+PleaseBePatient=Por favor sea paciente...
+ResetPassword=Restablecer la contraseña
+RequestToResetPasswordReceived=Se recibió una solicitud para cambiar su contraseña.
+NewKeyIs=Esta es tu nueva clave para ingresar
+NewKeyWillBe=Su nueva clave para acceder al software será
+ClickHereToGoTo=Haga clic aquí para ir a%s
+YouMustClickToChange=Sin embargo, primero debe hacer clic en el siguiente enlace para validar este cambio de contraseña
+ForgetIfNothing=Si no solicitó este cambio, simplemente olvide este correo electrónico. Sus credenciales se mantienen seguras.
+IfAmountHigherThan=Si la cantidad es mayor que <strong>%s</strong>
+SourcesRepository=Repositorio de fuentes
+PassEncoding=Codificación de contraseña
+PermissionsAdd=Permisos agregados
+YourPasswordMustHaveAtLeastXChars=Su contraseña debe tener al menos <strong>%s</strong> caracteres
+MissingIds=IDs que faltan
+ThirdPartyCreatedByEmailCollector=Tercero creado por el recopilador de correo electrónico desde el correo electrónico MSGID %s
+ContactCreatedByEmailCollector=Contacto / dirección creada por el recopilador de correo electrónico del correo electrónico MSGID %s
+ProjectCreatedByEmailCollector=Proyecto creado por el recopilador de correo electrónico de correo electrónico MSGID %s
+TicketCreatedByEmailCollector=Ticket creado por el recopilador de correo electrónico desde el correo electrónico MSGID %s
+ExportsArea=Área de Exportaciones
+LibraryUsed=Biblioteca utilizada
+LibraryVersion=Versión de la biblioteca
+NoExportableData=No hay datos exportables (no se han cargado módulos con datos exportables o se han perdido permisos)
+WebsiteSetup=Configuración del sitio web del módulo
+WEBSITE_IMAGEDesc=Ruta relativa de los medios de imagen. Puede mantener esto vacío ya que rara vez se usa (puede ser usado por contenido dinámico para mostrar una miniatura en una lista de publicaciones de blog). Use __WEBSITE_KEY__ en la ruta si la ruta depende del nombre del sitio web (por ejemplo: image / __ WEBSITE_KEY __ / stories / myimage.png).
+WEBSITE_KEYWORDS=Palabras claves
+LinesToImport=Líneas para importar
+RequestDuration=Duración de la solicitud.
+PopuProp=Productos / Servicios por popularidad en Propuestas
+PopuCom=Productos / Servicios por popularidad en Pedidos
+ProductStatistics=Estadísticas de productos / servicios
+NbOfQtyInOrders=Cantidad en pedidos
diff --git a/htdocs/langs/es_EC/paybox.lang b/htdocs/langs/es_EC/paybox.lang
new file mode 100644
index 00000000000..4e13080316d
--- /dev/null
+++ b/htdocs/langs/es_EC/paybox.lang
@@ -0,0 +1,24 @@
+# Dolibarr language file - Source file is en_US - paybox
+PayBoxSetup=Configuración del módulo PayBox
+PayBoxDesc=Este módulo ofrece páginas para permitir el pago en <a href="http://www.paybox.com" target="_blank">Paybox</a> por los clientes. Esto se puede utilizar para un pago gratuito o para un pago en un objeto particular Dolibarr (factura, pedido, ...)
+FollowingUrlAreAvailableToMakePayments=Las siguientes URL están disponibles para ofrecer una página a un cliente para realizar un pago en objetos de Dolibarr
+WelcomeOnPaymentPage=Bienvenido a nuestro servicio de pago en línea.
+ThisScreenAllowsYouToPay=Esta pantalla le permite realizar un pago en línea a%s.
+ThisIsInformationOnPayment=Esta es información sobre el pago a hacer
+ToComplete=Completar
+YourEMail=Correo electrónico para recibir confirmación de pago
+Creditor=Acreedor
+PayBoxDoPayment=Paga con Paybox
+YouWillBeRedirectedOnPayBox=Se le redirigirá a la página segura de Paybox para ingresar su información de tarjeta de crédito.
+Continue=Siguiente
+SetupPayBoxToHavePaymentCreatedAutomatically=Configure su Paybox con url <b>%s</b> para que el pago se cree automáticamente cuando sea validado por Paybox.
+YourPaymentHasBeenRecorded=Esta página confirma que se ha registrado su pago.
+YourPaymentHasNotBeenRecorded=Su pago NO ha sido registrado y la transacción ha sido cancelada. Gracias.
+InformationToFindParameters=Ayuda para encontrar la información de tu cuenta de%s
+PAYBOX_CGI_URL_V2=URL del módulo CGI de Paybox para el pago
+CSSUrlForPaymentForm=URL de estilo de hoja CSS para el formulario de pago
+NewPayboxPaymentReceived=Nuevo pago de Paybox recibido
+NewPayboxPaymentFailed=Nuevo pago de Paybox probado pero fallido
+PAYBOX_PAYONLINE_SENDEMAIL=Notificación por correo electrónico después del intento de pago (exitoso o fallido)
+PAYBOX_PBX_RANG=Valor para PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Valor para ID de PBX
diff --git a/htdocs/langs/es_EC/paypal.lang b/htdocs/langs/es_EC/paypal.lang
new file mode 100644
index 00000000000..f32e57aad14
--- /dev/null
+++ b/htdocs/langs/es_EC/paypal.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - paypal
+PaypalDesc=Este módulo permite el pago de los clientes a través de <a href="http://www.paypal.com" target="_blank">PayPal</a>. Esto se puede usar para un pago ad-hoc o para un pago relacionado con un objeto Dolibarr (factura, pedido, ...)
+PaypalOrCBDoPayment=Pague con PayPal (tarjeta o PayPal)
+PaypalDoPayment=Pagar con PayPal
+PAYPAL_API_SANDBOX=Modo de prueba/sandbox
+PAYPAL_API_USER=Nombre de usuario de API
+PAYPAL_API_PASSWORD=Contraseña de la API
+PAYPAL_API_SIGNATURE=Firma de la API
+PAYPAL_SSLVERSION=Curl Versión SSL
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Ofrecer pago "integral" (tarjeta de crédito + PayPal) o solo "PayPal"
+ThisIsTransactionId=Este es id de transacción: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Incluya la URL de pago de PayPal cuando envíe un documento por correo electrónico
+NewOnlinePaymentFailed=Nuevo pago en línea intentado pero fallo
+ONLINE_PAYMENT_SENDEMAIL=Dirección de correo electrónico para notificaciones después de cada intento de pago (para éxito y fracaso)
+ReturnURLAfterPayment=Volver URL después del pago
+ValidationOfOnlinePaymentFailed=No se pudo validar el pago en línea
+SetExpressCheckoutAPICallFailed=Falló la llamada a la API de SetExpressCheckout.
+DoExpressCheckoutPaymentAPICallFailed=Falló la llamada a la API de DoExpressCheckoutPayment.
+ShortErrorMessage=Mensaje de error corto
+ErrorSeverityCode=Código de error severo
+OnlinePaymentSystem=Sistema de pago en línea
+PaypalLiveEnabled=Modo "en vivo" de PayPal habilitado (de lo contrario, modo de prueba / sandbox)
+PaypalImportPayment=Importar pagos de PayPal
+PostActionAfterPayment=Publicar acciones después de los pagos
+ARollbackWasPerformedOnPostActions=Se realizó una reversión en todas las acciones de publicación. Debe completar las acciones de publicación manualmente si son necesarias.
+ValidationOfPaymentFailed=La validación del pago ha fallado
+PayPalBalance=Crédito de PayPal
diff --git a/htdocs/langs/es_EC/printing.lang b/htdocs/langs/es_EC/printing.lang
new file mode 100644
index 00000000000..2be03e63e39
--- /dev/null
+++ b/htdocs/langs/es_EC/printing.lang
@@ -0,0 +1,41 @@
+# Dolibarr language file - Source file is en_US - printing
+Module64000Desc=Habilitar sistema de impresión directa
+PrintingSetup=Configuración del sistema de impresión directa
+PrintingDesc=Este módulo agrega un botón Imprimir a varios módulos para permitir que los documentos se impriman directamente en una impresora sin necesidad de abrir el documento en otra aplicación.
+MenuDirectPrinting=Empleos de Direct Printing
+PrintingDriverDesc=Variables de configuración para el controlador de impresión.
+ListDrivers=Lista de conductores
+PrintTestDesc=Lista de impresoras.
+FileWasSentToPrinter=Se ha enviado el archivo%s a la impresora
+NoActivePrintingModuleFound=No hay un controlador activo para imprimir el documento. Verifique la configuración del módulo%s.
+PleaseSelectaDriverfromList=Seleccione un controlador de la lista.
+PleaseConfigureDriverfromList=Configure el controlador seleccionado de la lista.
+SetupDriver=Configuración del controlador
+TargetedPrinter=Impresora orientada
+PRINTGCP_TOKEN_ACCESS=Token de Google Cloud Print OAuth
+PrintGCPDesc=Este controlador permite enviar documentos directamente a una impresora utilizando Google Cloud Print.
+GCP_displayName=Nombre para mostrar
+GCP_Id=ID de la impresora
+GCP_OwnerName=Nombre del dueño
+GCP_State=Estado de la impresora
+GCP_connectionStatus=Estado en línea
+GCP_Type=Tipo de impresora
+PrintIPPDesc=Este controlador permite el envío de documentos directamente a una impresora. Requiere un sistema Linux con CUPS instalado.
+PRINTIPP_HOST=Servidor de impresión
+PRINTIPP_USER=Iniciar sesión
+NoDefaultPrinterDefined=No se ha definido ninguna impresora predeterminada
+DefaultPrinter=Impresora predeterminada
+IPP_Uri=Impresora Uri
+IPP_Name=Nombre de la impresora
+IPP_State=Estado de la impresora
+IPP_State_reason=Razón del Estado
+IPP_State_reason1=Razón estatal1
+IPP_Media=Medios de impresión
+IPP_Supported=Tipo de medio
+DirectPrintingJobsDesc=Esta página muestra los trabajos de impresión que se encuentran para las impresoras disponibles.
+GoogleAuthNotConfigured=Google OAuth no se ha configurado. Habilite el módulo OAuth y configure un ID / secreto de Google.
+GoogleAuthConfigured=Las credenciales de OAuth de Google se encontraron en la configuración del módulo OAuth.
+PrintingDriverDescprintgcp=Variables de configuración para el controlador de impresión Google Cloud Print.
+PrintingDriverDescprintipp=Variables de configuración para imprimir con el controlador CUPS
+PrintTestDescprintgcp=Lista de impresoras para Google Cloud Print.
+PrintTestDescprintipp=Lista de impresoras con soporte para CUPS
diff --git a/htdocs/langs/es_EC/productbatch.lang b/htdocs/langs/es_EC/productbatch.lang
new file mode 100644
index 00000000000..347913cbe2c
--- /dev/null
+++ b/htdocs/langs/es_EC/productbatch.lang
@@ -0,0 +1,19 @@
+# Dolibarr language file - Source file is en_US - productbatch
+ManageLotSerial=Utilice el número de lote/serie
+ProductStatusOnBatch=Sí (se requiere lote/serie)
+ProductStatusNotOnBatch=No (lote/serie no utilizado)
+atleast1batchfield=Fecha de entrega o Fecha de caducidad o Lote/Número de serie
+batch_number=Lote/Número de serie
+EatByDate=Fecha de entrega
+SellByDate=Fecha de caducidad
+DetailBatchNumber=Detalles de la serie/Lote
+printBatch=Lote/Serie: %s
+printEatby=Entrega: %s
+printSellby=Vendido-por: %s
+printQty=Cantidad: %d
+AddDispatchBatchLine=Agregar una línea para el envío de la vida útil
+WhenProductBatchModuleOnOptionAreForced=Cuando el módulo Lote/Serial está activado, la disminución automática de stock se ve obligada a "Disminuir existencias reales en la validación de envío" y el modo de aumento automático se fuerza a "Aumentar las existencias reales en el envío manual a los almacenes" y no se puede editar. Se pueden definir otras opciones como desee.
+ProductDoesNotUseBatchSerial=Este producto no utiliza el número de lote/serie
+ProductLotSetup=Configuración del módulo lote/serie
+ShowCurrentStockOfLot=Mostrar el stock actual de producto/lote
+ShowLogOfMovementIfLot=Mostrar el registro de los movimientos de producto/lote
diff --git a/htdocs/langs/es_EC/products.lang b/htdocs/langs/es_EC/products.lang
new file mode 100644
index 00000000000..8117b924284
--- /dev/null
+++ b/htdocs/langs/es_EC/products.lang
@@ -0,0 +1,234 @@
+# Dolibarr language file - Source file is en_US - products
+ProductRef=Producto ref.
+ProductLabel=Etiqueta del producto
+ProductLabelTranslated=Etiqueta del producto traducido
+ProductDescriptionTranslated=Descripción del producto traducido
+ProductNoteTranslated=Nota de producto traducida
+ProductServiceCard=Tarjeta de productos/servicios
+ProductId=ID del producto/servicio
+ProductVatMassChange=Actualización global del IVA
+ProductVatMassChangeDesc=¡Esta herramienta actualiza la tasa de IVA definida en <b><u>TODOS</u></b> productos y servicios!
+MassBarcodeInit=Iniciación de código de barras masivo
+MassBarcodeInitDesc=Esta página puede usarse para inicializar un código de barras en objetos que no tienen código de barras definido. Compruebe antes de que la configuración del código de barras del módulo esté completa.
+ProductAccountancyBuyCode=Código de contabilidad (compra)
+ProductAccountancyBuyIntraCode=Código contable (compra intracomunitaria)
+ProductAccountancyBuyExportCode=Código de contabilidad (importación de compra)
+ProductAccountancySellCode=Código de contabilidad (venta)
+ProductsOnPurchase=Productos a la venta
+ProductsOnSaleOnly=Productos para la venta solamente
+ProductsOnPurchaseOnly=Productos para la compra solamente
+ProductsNotOnSell=Productos no para la venta y no para la compra
+ProductsOnSellAndOnBuy=Productos para la venta y para la compra
+ServicesOnPurchase=Servicios de compra
+ServicesOnSaleOnly=Servicios para la venta solamente
+ServicesOnPurchaseOnly=Servicios para la compra solamente
+ServicesNotOnSell=Servicios no a la venta y no a la compra
+ServicesOnSellAndOnBuy=Servicios para la venta y para la compra
+LastModifiedProductsAndServices=Últimos productos / servicios modificados %s
+LastRecordedServices=Últimos %s servicios grabados
+MenuStocks=Dispuesto
+Stocks=Stocks y ubicación (almacén) de productos
+OnBuy=Para comprar
+NotOnSell=No para la venta
+ProductStatusNotOnSell=No para la venta
+ProductStatusNotOnSellShort=No para la venta
+ProductStatusOnBuy=Para comprar
+ProductStatusNotOnBuy=No para la compra
+ProductStatusOnBuyShort=Para comprar
+ProductStatusNotOnBuyShort=No para la compra
+UpdateVAT=Actualizar IVA
+UpdateDefaultPrice=Actualizar precio predeterminado
+UpdateLevelPrices=Actualizar precios para cada nivel
+SellingPriceHT=Precio de venta (sin impuestos)
+SellingPriceTTC=Precio de venta (impuestos incluidos)
+CostPriceDescription=Este campo de precio (sin impuestos) se puede utilizar para almacenar la cantidad promedio que este producto le cuesta a su empresa. Puede ser cualquier precio que calcule usted mismo, por ejemplo, a partir del precio promedio de compra más el costo promedio de producción y distribución.
+CostPriceUsage=Este valor podría utilizarse para el cálculo del margen.
+SoldAmount=Cantidad vendida
+PurchasedAmount=Cantidad comprada
+MinPrice=Min. precio de venta
+EditSellingPriceLabel=Editar etiqueta de precio de venta
+CantBeLessThanMinPrice=El precio de venta no puede ser inferior al mínimo permitido para este producto (%s sin impuestos). Este mensaje también puede aparecer si escribe un descuento demasiado importante.
+ErrorProductAlreadyExists=Ya existe un producto con la referencia %s.
+ErrorProductBadRefOrLabel=Valor incorrecto para referencia o etiqueta.
+ErrorProductClone=Se produjo un problema al intentar clonar el producto o servicio.
+ErrorPriceCantBeLowerThanMinPrice=Error, el precio no puede ser inferior al precio mínimo.
+SupplierRef=SKU del proveedor
+ProductsAndServicesArea=Área de productos y servicios
+ProductsArea=Área de producto
+ServicesArea=Área de servicios
+ListOfStockMovements=Lista de movimientos de stock
+SupplierCard=Tarjeta de vendedor
+SetDefaultBarcodeType=Establecer el tipo de código de barras
+NoteNotVisibleOnBill=Nota (no visible en facturas, propuestas...)
+ServiceLimitedDuration=Si el producto es un servicio con duración limitada:
+MultiPricesAbility=Múltiples segmentos de precios por producto / servicio (cada cliente está en un segmento de precios)
+MultiPricesNumPrices=Número de precios
+AssociatedProductsAbility=Activar productos virtuales (kits)
+AssociatedProducts=Productos virtuales
+AssociatedProductsNumber=Número de productos que componen este producto virtual
+ParentProductsNumber=Número de producto de embalaje principal
+ParentProducts=Productos para los padres
+IfZeroItIsNotUsedByVirtualProduct=Si 0, este producto no es utilizado por ningún producto virtual
+KeywordFilter=Filtro de palabras clave
+CategoryFilter=Filtro de categoría
+ProductToAddSearch=Buscar producto para agregar
+NoMatchFound=No se encontraron coincidencias
+ListOfProductsServices=Lista de productos/servicios
+ProductAssociationList=Lista de productos / servicios que son componente(s) de este producto/kit virtual
+ProductParentList=Lista de productos/servicios virtuales con este producto como un componente
+ErrorAssociationIsFatherOfThis=Uno del producto seleccionado es padre con el producto actual
+ConfirmDeleteProduct=¿Está seguro de que desea eliminar este producto/servicio?
+ProductDeleted=Producto/Servicio "%s" eliminado de la base de datos.
+ExportDataset_produit_1=Productos
+DeleteProductLine=Eliminar línea de productos
+ConfirmDeleteProductLine=¿Está seguro de que desea eliminar esta línea de productos?
+QtyMin=Min. Cantidad de compra
+PriceQtyMin=Precio cantidad min.
+PriceQtyMinCurrency=Precio (moneda) para esta cantidad. (sin descuento)
+VATRateForSupplierProduct=Tasa de IVA (para este vendedor / producto)
+DiscountQtyMin=Descuento por esta cantidad.
+NoPriceDefinedForThisSupplier=No hay precio / cantidad definida para este vendedor / producto
+NoSupplierPriceDefinedForThisProduct=No hay precio / cantidad de proveedor definido para este producto
+PredefinedProductsToSell=Producto Predefinido
+PredefinedServicesToSell=Servicio Predefinido
+PredefinedProductsAndServicesToSell=productos/servicios predefinidos para vender
+PredefinedProductsToPurchase=Producto predefinido para compra
+PredefinedProductsAndServicesToPurchase=Productos/servicios predefinidos para comprar.
+NotPredefinedProducts=productos/servicios no predefinidos
+GenerateThumb=Generar el pulgar
+ServiceNb=Servicio #%s
+ListProductServiceByPopularity=Lista de productos/servicios por popularidad
+ListProductByPopularity=Lista de productos por popularidad
+ListServiceByPopularity=Lista de servicios por popularidad
+ConfirmCloneProduct=¿Está seguro de que desea clonar el producto o servicio <b>%s</b>?
+CloneContentProduct=Clonar toda la información principal del producto/servicio.
+CloneCategoriesProduct=Clonar etiquetas / categorías vinculadas
+CloneCompositionProduct=Clonar producto / servicio virtual
+CloneCombinationsProduct=Variantes del producto clon
+ProductIsUsed=Este producto se utiliza
+NewRefForClone=Árbitro. de nuevo producto/servicio
+CustomerPrices=Precios de los clientes
+SuppliersPrices=Precios del proveedor
+SuppliersPricesOfProductsOrServices=Precios de proveedor (de productos o servicios)
+CustomCode=Código de Aduanas / Productos / HS
+Nature=Naturaleza del producto (material / acabado)
+g=gramo
+m=metro
+unitD=Dia
+unitFT=pie
+unitIN2=en²
+ProductCodeModel=Modelo de referencia del producto
+ServiceCodeModel=Plantilla de referencia de servicio
+AlwaysUseNewPrice=Utilice siempre el precio actual del producto/servicio
+AlwaysUseFixedPrice=Utilizar el precio fijo
+PriceByQuantity=Diferentes precios por cantidad
+DisablePriceByQty=Deshabilitar precios por cantidad
+PriceByQuantityRange=Rango Cantidad
+MultipriceRules=Reglas del segmento de precios
+UseMultipriceRules=Utilice las reglas de segmento de precios (definidas en la configuración del módulo del producto) para calcular automáticamente los precios de todos los demás segmentos de acuerdo con el primer segmento
+KeepEmptyForAutoCalculation=Manténgase vacío para que esto se calcule automáticamente de peso o volumen de productos
+VariantRefExample=Ejemplos: COL, TAMAÑO
+VariantLabelExample=Ejemplos: color, tamaño
+ProductsOrServiceMultiPrice=Precios de clientes (de productos o servicios, precios múltiples)
+ProductSellByQuarterHT=Volumen de ventas trimestral antes de impuestos
+ServiceSellByQuarterHT=Volumen de ventas de los servicios trimestralmente antes de impuestos
+Quarter1=1er. Trimestre
+Quarter2=2do. Trimestre
+Quarter3=3er. Trimestre
+Quarter4=4to. Trimestre
+BarCodePrintsheet=Imprimir código de barras
+PageToGenerateBarCodeSheets=Con esta herramienta, puede imprimir hojas de etiquetas de códigos de barras. Elija el formato de su página de calcomanías, el tipo de código de barras y el valor del código de barras, luego haga clic en el botón <b>%s</b>.
+NumberOfStickers=Número de pegatinas a imprimir en la página
+PrintsheetForOneBarCode=Imprimir varias pegatinas para un código de barras
+BuildPageToPrint=Generar página para imprimir
+FillBarCodeTypeAndValueManually=Rellene el código de barras y el valor manualmente.
+FillBarCodeTypeAndValueFromProduct=Rellene el tipo de código de barras y el valor del código de barras de un producto.
+FillBarCodeTypeAndValueFromThirdParty=Rellene el tipo de código de barras y el valor del código de barras de un cliente/proveedor.
+DefinitionOfBarCodeForProductNotComplete=La definición del tipo o valor del código de barras no está completa para el producto %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definición de tipo o valor de código de barras no completo para terceros %s.
+BarCodeDataForThirdparty=Información de código de barras de terceros %s:
+ResetBarcodeForAllRecords=Define el valor del código de barras para todos los registros (esto también restablecerá el valor del código de barras ya definido con nuevos valores)
+PriceByCustomer=Diferentes precios para cada cliente
+PriceCatalogue=Un precio de venta único por producto/servicio
+PricingRule=Reglas para los precios de venta.
+AddCustomerPrice=Añadir precio por cliente
+ForceUpdateChildPriceSoc=Establecer el mismo precio en las filiales de clientes
+PriceByCustomerLog=Registro de precios anteriores del cliente
+MinimumPriceLimit=El precio mínimo no puede ser inferior a %s
+PriceExpressionEditor=Editor de expresiones de precios
+PriceExpressionSelected=Expresión de precio seleccionada
+PriceExpressionEditorHelp1=precio = 2 + 2 o "2 + 2" para establecer el precio. Utilizar ; separar las expresiones
+PriceExpressionEditorHelp2=Puede acceder a ExtraFields con variables como <b>#extrafield_myextrafieldkey #</b> y variables globales con <b> #global_mycode #</b>
+PriceExpressionEditorHelp3=Tanto en el producto / servicio como en los precios del proveedor hay disponibles estas variables: <br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=Solo en precio de producto / servicio: <b>#supplier_min_price#</b><br> Solo en precios de proveedor: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceMode=Modo de precio
+PriceNumeric=Numero
+ComposedProductIncDecStock=Aumentar/Disminuir el stock en el cambio de padres
+ComposedProduct=Productos para niños
+MinCustomerPrice=Precio mínimo de compra
+DynamicPriceConfiguration=Configuración dinámica de precios
+DynamicPriceDesc=Puede definir fórmulas matemáticas para calcular los precios del Cliente o Proveedor. Dichas fórmulas pueden usar todos los operadores matemáticos, algunas constantes y variables. Puede definir aquí las variables que desea utilizar. Si la variable necesita una actualización automática, puede definir la URL externa para permitir que Dolibarr actualice el valor automáticamente.
+AddUpdater=Añadir actualizador
+VariableToUpdate=Variable para actualizar
+GlobalVariableUpdaterType0=Datos JSON
+GlobalVariableUpdaterHelp0=Analiza los datos JSON de la URL especificada, VALUE especifica la ubicación del valor relevante,
+GlobalVariableUpdaterHelpFormat0=Formato de la solicitud {"URL": "http://example.com/urlofjson", "VALUE": "array1, array2, targetvalue"}
+GlobalVariableUpdaterType1=Datos de WebService
+GlobalVariableUpdaterHelp1=Analiza los datos de WebService desde la URL especificada, NS especifica el espacio de nombres, VALUE especifica la ubicación del valor relevante, DATA debe contener los datos a enviar y METHOD es el método WS llamante
+GlobalVariableUpdaterHelpFormat1=El formato de la solicitud es {"URL": "http://example.com/urlofws", "VALUE": "array, targetvalue", "NS": "http://example.com/urlofns", "METHOD" : "myWSMethod", "DATA": {"tu": "datos", "para": "enviar"}}
+PropalMergePdfProductActualFile=Los archivos se utilizan para agregar en PDF Azur son/es
+PropalMergePdfProductChooseFile=Seleccionar archivos PDF
+IncludingProductWithTag=Incluye producto/servicio con etiqueta
+DefaultPriceRealPriceMayDependOnCustomer=Precio predeterminado, el precio real puede depender del cliente
+NbOfQtyInProposals=Cantidad en las propuestas
+ClinkOnALinkOfColumn=Haga clic en un enlace de la columna %s para obtener una vista detallada ...
+ProductsOrServicesTranslations=Traducciones de productos / servicios
+TranslatedLabel=Etiqueta traducida
+TranslatedDescription=Descripción traducida
+TranslatedNote=Notas traducidas
+WeightUnits=Unidad de peso
+VolumeUnits=Unidad de volumen
+WidthUnits=Unidad de ancho
+LengthUnits=Unidad de longitud
+HeightUnits=Unidad de altura
+SurfaceUnits=Unidad de superficie
+SizeUnits=Unidad de tamaño
+ConfirmDeleteProductBuyPrice=¿Seguro que quieres eliminar este precio de compra?
+UseProductFournDesc=Agregue una función para definir las descripciones de los productos definidos por los proveedores, además de las descripciones para los clientes.
+ProductSupplierDescription=Descripción del vendedor del producto
+UseProductSupplierPackaging=Utilice el embalaje según los precios del proveedor (recalcule las cantidades según el conjunto de envases según el precio del proveedor al agregar / actualizar la línea en los documentos del proveedor)
+PackagingForThisProduct=Embalaje
+QtyRecalculatedWithPackaging=La cantidad de la línea se recalculó de acuerdo con el embalaje del proveedor.
+VariantAttributes=Atributos variantes
+ProductAttributes=Atributos variantes para los productos
+ProductAttributeName=Atributo de variante %s
+ProductAttributeDeleteDialog=¿Seguro que desea eliminar este atributo? Todos los valores se eliminarán
+ProductAttributeValueDeleteDialog=¿Seguro que desea eliminar el valor "%s" con la referencia "%s" de este atributo?
+ProductCombinationDeleteDialog=¿Seguro que quieres eliminar la variante del producto "<strong>%s</strong>"?
+ProductCombinationAlreadyUsed=Se ha producido un error al eliminar la variante. Compruebe que no se está utilizando en ningún objeto
+PropagateVariant=Propagación de variantes
+HideProductCombinations=Ocultar productos variantes en el selector de productos
+EditProductCombination=Variante de edición
+EditProductCombinations=Edición de variantes
+SelectCombination=Seleccionar combinación
+Features=Caracteristicas
+PriceImpact=Impacto en los precios
+WeightImpact=Impacto de peso
+ErrorCreatingProductAttributeValue=Se ha producido un error al crear el valor del atributo. Podría ser porque ya existe un valor existente con esa referencia
+ProductCombinationGeneratorWarning=Si continúa, antes de generar nuevas variantes, todas las anteriores serán eliminadas. Los ya existentes se actualizarán con los nuevos valores
+TooMuchCombinationsWarning=Generar un montón de variantes puede dar lugar a CPU de alta, uso de memoria y Dolibarr no es capaz de crearlos. Habilitar la opción "%s" puede ayudar a reducir el uso de memoria.
+DoNotRemovePreviousCombinations=No elimine las variantes anteriores
+ErrorDeletingGeneratedProducts=Se produjo un error al intentar eliminar variantes de producto existentes
+NbOfDifferentValues=No. de valores diferentes
+NbProducts=Número de productos
+HideChildProducts=Ocultar productos variantes
+ShowChildProducts=Mostrar productos variantes
+NoEditVariants=Vaya a la tarjeta del producto principal y edite el impacto del precio de las variantes en la pestaña de variantes
+ConfirmCloneProductCombinations=¿Desea copiar todas las variantes del producto en el otro producto padre con la referencia dada?
+ErrorCopyProductCombinations=Se produjo un error al copiar las variantes del producto
+ErrorDestinationProductNotFound=Producto de destino no encontrado
+ErrorProductCombinationNotFound=Variante del producto no encontrada
+ActionAvailableOnVariantProductOnly=Acción solo disponible en la variante de producto
+ProductsPricePerCustomer=Precios de productos por cliente
+ProductSupplierExtraFields=Atributos adicionales (precios de proveedor)
+DeleteLinkedProduct=Eliminar el producto hijo vinculado a la combinación
diff --git a/htdocs/langs/es_EC/projects.lang b/htdocs/langs/es_EC/projects.lang
new file mode 100644
index 00000000000..c6862d814da
--- /dev/null
+++ b/htdocs/langs/es_EC/projects.lang
@@ -0,0 +1,190 @@
+# Dolibarr language file - Source file is en_US - projects
+ProjectRef=Proyecto ref.
+ProjectId=Id del proyecto
+ProjectLabel=Etiqueta del proyecto
+ProjectsArea=Área de Proyectos
+SharedProject=Todos
+PrivateProject=Contactos del proyecto
+ProjectsImContactFor=Proyectos en el que explícitamente soy un contacto
+AllAllowedProjects=Todo el proyecto que puedo leer (mio + público)
+MyProjectsDesc=Esta vista está limitada a los proyectos para los que se le asignaron
+ProjectsPublicDesc=Esta vista presenta todos los proyectos que se le permite leer.
+TasksOnProjectsPublicDesc=Esta vista presenta todas las tareas de los proyectos que se le permite leer.
+ProjectsPublicTaskDesc=Esta vista presenta todos los proyectos y tareas que se le permite leer.
+ProjectsDesc=Esta vista presenta todos los proyectos (los permisos de usuario le otorgan permiso para ver todo).
+TasksOnProjectsDesc=Esta vista presenta todas las tareas de todos los proyectos (los permisos de usuario le otorgan permiso para ver todo).
+MyTasksDesc=Esta vista se limita a proyectos o tareas para los que se le asignaron
+OnlyOpenedProject=Sólo los proyectos abiertos son visibles (los proyectos en borrador o estado cerrado no son visibles).
+TasksPublicDesc=Esta vista presenta todos los proyectos y tareas que se le permite leer.
+TasksDesc=Esta vista presenta todos los proyectos y tareas (los permisos de usuario le otorgan permiso para ver todo).
+AllTaskVisibleButEditIfYouAreAssigned=Todas las tareas para proyectos calificados son visibles, pero puede ingresar solo el timepo para la tarea asignada al usuario seleccionado. Si necesita ingresar tiempo en la tarea debe asignarle un usuario.
+OnlyYourTaskAreVisible=Sólo las tareas asignadas a usted son visibles. Asigne la tarea a sí mismo si no está visible y necesita introducir tiempo en ella.
+ImportDatasetTasks=Tareas de los proyectos
+ConfirmDeleteAProject=¿Está seguro de que desea eliminar este proyecto?
+ConfirmDeleteATask=¿Seguro que desea eliminar esta tarea?
+OpportunitiesStatusForOpenedProjects=Cantidad de proyectos abiertos por estado
+OpportunitiesStatusForProjects=Cantidad de proyectos por estado.
+ShowProject=Mostrar proyecto
+SetProject=Establecer proyecto
+NoProject=Ningún proyecto definido o propiedad
+NbOfProjects=Numero de proyectos
+NbOfTasks=Numero de tareas
+TimeSpent=Tiempo usado
+TimeSpentByYou=Tiempo pasado por usted
+TimeSpentByUser=Tiempo empleado por el usuario
+TimesSpent=Tiempo usado
+TaskId=ID de tarea
+RefTask=Tarea ref.
+LabelTask=Etiqueta de tarea
+TaskTimeSpent=Tiempo dedicado a las tareas
+TasksOnOpenedProject=Tareas sobre proyectos abiertos
+NewTimeSpent=Tiempo usado
+MyTimeSpent=Mi tiempo usado
+BillTime=Facturar el tiempo utilizado
+BillTimeShort=Tiempo a facturar
+TaskDateStart=Fecha de inicio de la tarea
+TaskDateEnd=Fecha de finalización de la tarea
+TaskDescription=Descripción de la tarea
+AddTimeSpent=Crear tiempo
+AddHereTimeSpentForDay=Añadir aquí el tiempo dedicado a este día/tarea
+Activities=Tareas / actividades
+MyProjectsArea=Mis proyectos
+ProgressDeclared=Progreso declarado
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=El progreso declarado es menos %s que la progresión calculada
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=El progreso declarado es más %s que la progresión calculada
+ProgressCalculated=Progreso calculado
+Time=Hora
+ListOfTasks=Lista de tareas
+GoToListOfTimeConsumed=Ir a la lista de tiempo consumido
+ListProposalsAssociatedProject=Listado de las propuestas comerciales relacionadas con el proyecto.
+ListOrdersAssociatedProject=Listado de pedidos de cliente relacionados con el proyecto.
+ListInvoicesAssociatedProject=Listado de facturas de clientes relacionadas con el proyecto.
+ListPredefinedInvoicesAssociatedProject=Lista de facturas de plantillas de clientes relacionadas con el proyecto.
+ListSupplierOrdersAssociatedProject=Lista de órdenes de compra relacionadas con el proyecto.
+ListSupplierInvoicesAssociatedProject=Lista de facturas de proveedores relacionadas con el proyecto.
+ListContractAssociatedProject=Listado de contratos relacionados con el proyecto.
+ListShippingAssociatedProject=Listado de envíos relacionados con el proyecto.
+ListFichinterAssociatedProject=Listado de intervenciones relacionadas con el proyecto.
+ListExpenseReportsAssociatedProject=Listado de informes de gastos relacionados con el proyecto.
+ListDonationsAssociatedProject=Listado de donaciones relacionadas con el proyecto.
+ListVariousPaymentsAssociatedProject=Lista de pagos varios relacionados con el proyecto.
+ListSalariesAssociatedProject=Listado de pagos de sueldos relacionados con el proyecto.
+ListActionsAssociatedProject=Listado de eventos relacionados con el proyecto.
+ListMOAssociatedProject=Lista de pedidos de fabricación relacionados con el proyecto.
+ListTaskTimeUserProject=Lista de tiempo consumido en las tareas del proyecto
+ListTaskTimeForTask=Mostrar el tiempo invertido en la tarea
+ActivityOnProjectToday=Actividad en proyecto hoy
+ActivityOnProjectYesterday=Actividad en proyecto ayer
+ActivityOnProjectThisWeek=Actividad en proyecto esta semana
+ActivityOnProjectThisMonth=Actividad en proyecto este mes
+ActivityOnProjectThisYear=Actividad en proyecto este año
+ChildOfProjectTask=Hijo del proyecto/tarea
+ChildOfTask=Tarea relacionada
+TaskHasChild=La tarea tiene subcategorias
+NotOwnerOfProject=No propietario de este proyecto privado
+CantRemoveProject=Este proyecto no se puede quitar ya que es referenciado por otros objetos (factura, pedidos u otros). Consulte la pestaña referentes.
+ConfirmValidateProject=¿Está seguro de que desea validar este proyecto?
+ConfirmCloseAProject=¿Estás seguro de que quieres cerrar este proyecto?
+AlsoCloseAProject=También cierre el proyecto (manténgalo abierto si todavía necesita seguir las tareas de producción en él)
+ReOpenAProject=Proyecto abierto
+ConfirmReOpenAProject=¿Está seguro de que desea volver a abrir este proyecto?
+ActionsOnProject=Eventos en el proyecto
+YouAreNotContactOfProject=Usted no es un contacto de este proyecto privado
+DeleteATimeSpent=Eliminar el tiempo pasado
+ConfirmDeleteATimeSpent=¿Está seguro de que desea eliminar este tiempo pasado?
+DoNotShowMyTasksOnly=Ver también tareas que no me han sido asignadas
+ShowMyTasksOnly=Ver sólo las tareas asignadas a mí
+TaskRessourceLinks=Contactos de tarea
+LinkedToAnotherCompany=Vinculado a terceros
+TaskIsNotAssignedToUser=Tarea no asignada al usuario. Utilice el botón '<strong>%s</strong>' para asignar tarea ahora.
+ErrorTimeSpentIsEmpty=El tiempo que pasa está vacío
+ThisWillAlsoRemoveTasks=Esta acción también eliminará todas las tareas del proyecto (<b>%s</b> tareas en este momento) y todas las entradas de tiempo gastado.
+IfNeedToUseOtherObjectKeepEmpty=Si algunos objetos (factura, pedido, ...), pertenecientes a otro tercero, deben estar vinculados al proyecto a crear, mantenerlo vacío para que el proyecto sea de terceros.
+CloneTasks=Clonar tareas
+CloneContacts=Contactos del clon
+CloneNotes=Clonar notas
+CloneProjectFiles=El proyecto Clone se unió a los archivos
+CloneTaskFiles=Clonar tarea(s) se unieron a los archivos (si tarea(s) clonado)
+CloneMoveDate=Actualizar las fechas de proyecto/tareas a partir de ahora?
+ConfirmCloneProject=¿Está seguro de clonar este proyecto?
+ProjectReportDate=Cambiar las fechas de las tareas según la fecha de inicio del nuevo proyecto
+ErrorShiftTaskDate=Imposible cambiar la fecha de la tarea de acuerdo con la fecha de inicio del nuevo proyecto
+ProjectCreatedInDolibarr=Proyecto%s created
+ProjectModifiedInDolibarr=Proyecto%s modificado
+TaskCreatedInDolibarr=Tarea%s creada
+TaskModifiedInDolibarr=Tarea%s modificada
+TaskDeletedInDolibarr=Se eliminó la tarea%s
+OpportunityStatus=Estado de clientes potenciales
+OpportunityStatusShort=Estado de clientes potenciales
+OpportunityProbability=Probabilidad de clientes potenciales
+OpportunityProbabilityShort=Probabilidad de plomo.
+OpportunityAmount=Cantidad de clientes potenciales
+OpportunityAmountShort=Cantidad de clientes potenciales
+OpportunityWeightedAmount=Cantidad ponderada de oportunidad
+OpportunityWeightedAmountShort=Opp. cantidad ponderada
+OpportunityAmountAverageShort=Cantidad de plomo promedio
+OpportunityAmountWeigthedShort=Cantidad de plomo ponderada
+WonLostExcluded=Ganado/perdido excluido
+TypeContact_project_internal_PROJECTLEADER=Líder del proyecto
+TypeContact_project_external_PROJECTLEADER=Líder del proyecto
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Contribuyente
+TypeContact_project_external_PROJECTCONTRIBUTOR=Contribuyente
+TypeContact_project_task_internal_TASKEXECUTIVE=Ejecutivo de tareas
+TypeContact_project_task_external_TASKEXECUTIVE=Ejecutivo de tareas
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Contribuyente
+TypeContact_project_task_external_TASKCONTRIBUTOR=Contribuyente
+SelectElement=Seleccionar elemento
+AddElement=Enlace al elemento
+DocumentModelBeluga=Plantilla de documento de proyecto para la descripción de objetos vinculados
+DocumentModelBaleine=Plantilla de documento de proyecto para tareas
+DocumentModelTimeSpent=Plantilla de informe de proyecto por tiempo dedicado
+ProjectReferers=Artículos relacionados
+ProjectMustBeValidatedFirst=El proyecto debe ser validado primero
+FirstAddRessourceToAllocateTime=Asignar un recurso de usuario como contacto del proyecto para asignar tiempo
+InputDetail=Detalle de entradas
+TimeAlreadyRecorded=Este es el tiempo gastado ya registrado para esta tarea/día y el usuario%s
+NoUserAssignedToTheProject=No hay usuarios asignados a este proyecto.
+TimeSpentBy=Tiempo invertido por
+AssignTaskToMe=Asignar tarea a mí
+AssignTaskToUser=Asignar tarea a%s
+SelectTaskToAssign=Seleccione tarea para asignar ...
+ProjectOverview=Visión de conjunto
+ManageTasks=Usar proyectos para seguir tareas y/o informar el tiempo empleado (hojas de tiempo)
+ManageOpportunitiesStatus=Utilizar proyectos para seguir a clientes potenciales
+ProjectNbProjectByMonth=Nº de proyectos creados por mes.
+ProjectNbTaskByMonth=Nº de tareas creadas por mes.
+ProjectOppAmountOfProjectsByMonth=Cantidad de clientes potenciales por mes
+ProjectWeightedOppAmountOfProjectsByMonth=Cantidad ponderada de clientes potenciales por mes
+ProjectOpenedProjectByOppStatus=Abrir proyecto / liderar por estado de clientes potenciales
+TasksStatistics=Estadísticas sobre tareas de proyecto/lead
+TaskAssignedToEnterTime=Tarea asignada. Es posible introducir tiempo en esta tarea.
+IdTaskTime=Tiempo de la tarea de identificación
+YouCanCompleteRef=Si desea completar la referencia con algún sufijo, se recomienda agregar un carácter - para separarlo, por lo que la numeración automática seguirá funcionando correctamente para los próximos proyectos. Por ejemplo %s-MYSUFFIX
+OnlyOpportunitiesShort=Solo clientes potenciales
+OpenedOpportunitiesShort=Clientes potenciales abiertos
+NotOpenedOpportunitiesShort=No es una pista abierta
+NotAnOpportunityShort=No es un clientes potenciales
+OpportunityTotalAmount=Cantidad total de clientes potenciales
+OpportunityPonderatedAmount=Cantidad ponderada de clientes potenciales
+OpportunityPonderatedAmountDesc=Cantidad de clientes potenciales ponderada con probabilidad
+OppStatusQUAL=Calificación
+OppStatusPROPO=Propuesta
+AllowToLinkFromOtherCompany=Permitir vincular proyecto desde otra empresa <br><br><u>Valores admitidos:</u><br> - Mantener vacío: Puede vincular cualquier proyecto de la empresa (predeterminado)<br> - "todos": puede vincular cualquier proyecto, incluso proyectos de otras empresas<br> - Una lista de identificadores de terceros separados por comas: puede vincular todos los proyectos de estos terceros (Ejemplo: 123,4795,53)<br>
+LatestProjects=Últimos %s proyectos
+LatestModifiedProjects=Últimos proyectos modificados %s
+NoAssignedTasks=No se encontraron tareas asignadas (asigne proyectos / tareas al usuario actual desde el cuadro de selección superior para ingresar el tiempo)
+ChooseANotYetAssignedTask=Elige una tarea que aún no te haya sido asignada
+AllowCommentOnProject=Permitir comentarios de los usuarios sobre proyectos
+RecordsClosed=%sproyecto(s) cerrado
+SendProjectRef=Información del proyecto %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=El módulo 'Salarios' debe estar habilitado para definir la tarifa por hora de los empleados para tener el tiempo gastado valorizado
+NewTaskRefSuggested=Referencia de tarea ya utilizada, se requiere una nueva referencia de tarea
+TimeSpentInvoiced=Tiempo gastado facturado
+TimeSpentForInvoice=Tiempo usado
+ServiceToUseOnLines=Servicio a utilizar en líneas
+InvoiceGeneratedFromTimeSpent=La factura %s se ha generado a partir del tiempo dedicado al proyecto
+ProjectBillTimeDescription=Verifique si ingresa la hoja de tiempo en las tareas del proyecto Y planea generar factura(s) de la hoja de tiempo para facturar al cliente del proyecto (no verifique si planea crear una factura que no se base en las hojas de tiempo ingresadas). Nota: Para generar la factura, vaya a la pestaña 'Tiempo empleado' del proyecto y seleccione las líneas para incluir.
+ProjectFollowTasks=Siga las tareas o el tiempo dedicado
+Usage=Uso
+UsageBillTimeShort=Uso: Tiempo a facturar
+RefTaskParent=Árbitro. Tarea principal
diff --git a/htdocs/langs/es_EC/propal.lang b/htdocs/langs/es_EC/propal.lang
new file mode 100644
index 00000000000..552a01bc521
--- /dev/null
+++ b/htdocs/langs/es_EC/propal.lang
@@ -0,0 +1,68 @@
+# Dolibarr language file - Source file is en_US - propal
+Proposals=Propuestas comerciales
+Proposal=Propuesta comercial
+ProposalShort=Propuesta
+ProposalsDraft=Proyecto de anuncios comerciales
+ProposalsOpened=Abrir propuestas comerciales
+CommercialProposal=Propuesta comercial
+PdfCommercialProposalTitle=Propuesta comercial
+ProposalCard=Tarjeta de propuesta
+NewProp=Nueva propuesta comercial
+NewPropal=Nueva propuesta
+Prospect=Prospecto
+DeleteProp=Eliminar propuesta comercial
+ValidateProp=Validar propuesta comercial
+AddProp=Crear propuesta
+ConfirmDeleteProp=¿Estás seguro de que quieres eliminar esta propuesta comercial?
+ConfirmValidateProp=¿Está seguro de que desea validar esta propuesta comercial bajo el nombre <b>%s</b>?
+LastPropals=Últimas propuestas%s
+LastModifiedProposals=Últimas propuestas modificadas%s
+AllPropals=Todas las propuestas
+SearchAProposal=Buscar una propuesta
+NoProposal=Ninguna propuesta
+ProposalsStatistics=Estadísticas de la propuesta comercial
+NumberOfProposalsByMonth=Número por meses
+AmountOfProposalsByMonthHT=Cantidad por mes (sin impuestos)
+NbOfProposals=Número de propuestas comerciales
+ShowPropal=Mostrar propuesta
+PropalsDraft=Borradores
+PropalsOpened=Abierto
+PropalStatusDraft=Proyecto (necesita ser validado)
+PropalStatusValidated=Validado (la propuesta está abierta)
+PropalStatusSigned=Firmado (necesita facturación)
+PropalsToClose=Propuestas comerciales para cerrar
+PropalsToBill=Firmar propuestas comerciales para facturar
+ListOfProposals=Lista de propuestas comerciales
+ActionsOnPropal=Eventos a propuesta
+RefProposal=Propuesta comercial ref
+SendPropalByMail=Enviar propuesta comercial por correo
+DatePropal=Fecha de la propuesta
+DateEndPropal=Fecha de finalización de la validez
+ValidityDuration=Duración de la validez
+CloseAs=Establecer el estado en
+ErrorPropalNotFound=Propal%s no encontrado
+AddToDraftProposals=Añadir a proyecto de propuesta
+NoDraftProposals=Ningún proyecto de propuesta
+CopyPropalFrom=Crear propuesta comercial copiando la propuesta existente
+CreateEmptyPropal=Crear una propuesta comercial vacía o desde la lista de productos/servicios.
+DefaultProposalDurationValidity=Duración de la validez de la propuesta comercial predeterminada (en días)
+UseCustomerContactAsPropalRecipientIfExist=Utilice el contacto/dirección con el tipo 'Propuesta de seguimiento de contacto' si se define en lugar de la dirección de un tercero como dirección del destinatario de la propuesta
+ConfirmClonePropal=¿Seguro que desea clonar la propuesta comercial <b>%s</b>?
+ConfirmReOpenProp=¿Está seguro de que desea volver a abrir la propuesta comercial <b>%s</b>?
+ProposalsAndProposalsLines=Propuesta comercial y líneas
+ProposalLine=Línea de propuesta
+AvailabilityPeriod=Demora de disponibilidad
+SetAvailability=Establecer retraso de disponibilidad
+AfterOrder=despues de orden
+OtherProposals=Otras propuestas
+AvailabilityTypeAV_NOW=Inmediato
+TypeContact_propal_internal_SALESREPFOLL=Propuestas de seguimiento representativas
+TypeContact_propal_external_BILLING=Contacto de factura de cliente
+TypeContact_propal_external_CUSTOMER=Contacto con el cliente
+TypeContact_propal_external_SHIPPING=Contacto con el cliente para la entrega
+DocModelAzurDescription=Un modelo de propuesta completo (implementación anterior de la plantilla Cyan)
+DocModelCyanDescription=Un modelo de propuesta completo
+DefaultModelPropalCreate=Creación de modelo predeterminada
+DefaultModelPropalToBill=Plantilla predeterminada al cerrar una propuesta empresarial (a facturar)
+DefaultModelPropalClosed=Plantilla predeterminada al cerrar una propuesta empresarial (no facturada)
+ProposalsStatisticsSuppliers=Estadísticas de propuestas de proveedores
diff --git a/htdocs/langs/es_EC/receiptprinter.lang b/htdocs/langs/es_EC/receiptprinter.lang
new file mode 100644
index 00000000000..e2face3445a
--- /dev/null
+++ b/htdocs/langs/es_EC/receiptprinter.lang
@@ -0,0 +1,74 @@
+# Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Configuración del módulo ReceiptPrinter
+PrinterAdded=Se añadió la impresora%s
+PrinterUpdated=Impresora%s actualizada
+PrinterDeleted=Se ha suprimido la impresora%s
+TestSentToPrinter=Prueba enviada a la impresora%s
+ReceiptPrinter=Impresoras de recibos
+ReceiptPrinterDesc=Configuración de impresoras de recibos
+ReceiptPrinterTypeDesc=Descripción del recibo Tipo de impresora
+ReceiptPrinterProfileDesc=Descripción de Receipt Printer's Profile
+ListPrinters=Lista de impresoras
+SetupReceiptTemplate=Configuración de la plantilla
+CONNECTOR_DUMMY=Impresora ficticia
+CONNECTOR_FILE_PRINT=Impresora local
+CONNECTOR_CUPS_PRINT=Impresora CUPS
+CONNECTOR_DUMMY_HELP=Impresora falsa para la prueba, no hace nada
+CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x: 9100
+CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb: //FooUser:secreto@computername/grupo de trabajo/impresora de recibos
+CONNECTOR_CUPS_PRINT_HELP=Nombre de la impresora CUPS, ejemplo: HPRT_TP805L
+PROFILE_SIMPLE=Perfil sencillo
+PROFILE_EPOSTEP=Epos Tep Perfil
+PROFILE_P822D=P822D Perfil
+PROFILE_STAR=Perfil de la Estrella
+PROFILE_DEFAULT_HELP=Perfil predeterminado adecuado para impresoras Epson
+PROFILE_EPOSTEP_HELP=Epos Tep Perfil
+PROFILE_P822D_HELP=P822D Perfil Sin gráficos
+PROFILE_STAR_HELP=Perfil de la Estrella
+DOL_ALIGN_LEFT=Alinea el texto a la izquierda
+DOL_ALIGN_CENTER=Texto central
+DOL_ALIGN_RIGHT=Alinea el texto a la derecha
+DOL_PRINT_BARCODE=Imprimir código de barras
+DOL_PRINT_BARCODE_CUSTOMER_ID=Imprimir ID de cliente de código de barras
+DOL_CUT_PAPER_FULL=Cortar boleto por completo
+DOL_CUT_PAPER_PARTIAL=Cortar el ticket parcialmente
+DOL_OPEN_DRAWER=Abrir cajón de efectivo
+DOL_ACTIVATE_BUZZER=Activar zumbador
+DOL_DEFAULT_HEIGHT_WIDTH=Tamaño predeterminado de altura y ancho
+DOL_BEEP=Sonido de la abeja
+DOL_VALUE_DATE=Fecha de la factura
+DOL_VALUE_DATE_TIME=Fecha y hora de factura
+DOL_VALUE_YEAR=Año de factura
+DOL_VALUE_MONTH_LETTERS=Factura mes en letras
+DOL_VALUE_MONTH=Mes de la factura
+DOL_VALUE_DAY=Día de la factura
+DOL_VALUE_DAY_LETTERS=Inovice day en letras
+DOL_LINE_FEED_REVERSE=Avance de línea inversa
+DOL_VALUE_OBJECT_ID=ID de factura
+DOL_VALUE_OBJECT_REF=Factura ref
+DOL_PRINT_OBJECT_LINES=Líneas de factura
+DOL_VALUE_CUSTOMER_FIRSTNAME=Nombre del cliente
+DOL_VALUE_CUSTOMER_LASTNAME=Apellido del cliente
+DOL_VALUE_CUSTOMER_MAIL=Correo del cliente
+DOL_VALUE_CUSTOMER_PHONE=Teléfono del cliente
+DOL_VALUE_CUSTOMER_MOBILE=Cliente móvil
+DOL_VALUE_CUSTOMER_SKYPE=Cliente Skype
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Número de impuesto al cliente
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Saldo de la cuenta del cliente
+DOL_VALUE_MYSOC_NAME=El nombre de tu compañía
+DOL_VALUE_MYSOC_ADDRESS=Dirección de su empresa
+DOL_VALUE_MYSOC_ZIP=Su código postal
+DOL_VALUE_MYSOC_TOWN=Tu ciudad
+DOL_VALUE_MYSOC_COUNTRY=Tu país
+DOL_VALUE_MYSOC_IDPROF1=Su IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Su IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Tu IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Su IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Tu IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Su IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=ID de IVA intracomunitario
+DOL_VALUE_VENDOR_LASTNAME=Apellido del vendedor
+DOL_VALUE_VENDOR_FIRSTNAME=Nombre del vendedor
+DOL_VALUE_VENDOR_MAIL=Correo del vendedor
+DOL_VALUE_CUSTOMER_POINTS=Puntos del cliente
+DOL_VALUE_OBJECT_POINTS=Puntos de objeto
diff --git a/htdocs/langs/es_EC/resource.lang b/htdocs/langs/es_EC/resource.lang
new file mode 100644
index 00000000000..56da8dacd21
--- /dev/null
+++ b/htdocs/langs/es_EC/resource.lang
@@ -0,0 +1,17 @@
+# Dolibarr language file - Source file is en_US - resource
+ConfirmDeleteResourceElement=Confirmar eliminar el recurso para este elemento
+NoResourceInDatabase=Ningún recurso en la base de datos.
+NoResourceLinked=Ningún recurso vinculado
+ResourcePageIndex=Lista de recursos
+ResourceCard=Tarjeta de recursos
+ResourceFormLabel_ref=Nombre del recurso
+ResourceFormLabel_description=Descripción del recurso
+ResourcesLinkedToElement=Recursos vinculados al elemento
+ShowResource=Mostrar recurso
+ResourceElementPage=Elemento del recurso
+RessourceLineSuccessfullyDeleted=Línea de recursos eliminada correctamente
+RessourceLineSuccessfullyUpdated=Línea de recursos actualizada correctamente
+ResourceLinkedWithSuccess=Recurso vinculado con éxito
+ConfirmDeleteResource=Confirmar para eliminar este recurso
+IdResource=Id del recurso
+ResourceTypeCode=Código del tipo de recurso
diff --git a/htdocs/langs/es_EC/salaries.lang b/htdocs/langs/es_EC/salaries.lang
new file mode 100644
index 00000000000..0f639c609c2
--- /dev/null
+++ b/htdocs/langs/es_EC/salaries.lang
@@ -0,0 +1,17 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Contabilidad utilizada para cliente/proveedor usuarios
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=La cuenta de contabilidad dedicada definida en la tarjeta de usuario se usará solo para la contabilidad de Libro mayor auxiliar. Este se usará para el Libro mayor y como valor predeterminado de la contabilidad del Libro mayor auxiliar si no se define una cuenta de usuario dedicada en el usuario.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Cuenta de contabilidad por defecto para pagos de sueldos
+Salary=Sueldo
+Salaries=Sueldos
+NewSalaryPayment=Nuevo pago de sueldo
+SalaryPayment=Pago de sueldo
+SalariesPayments=Pagos de sueldos
+ShowSalaryPayment=Mostrar pago de sueldo
+THM=Tasa promedio por hora
+TJM=Tarifa diaria promedio
+CurrentSalary=Sueldo actual
+THMDescription=Este valor puede usarse para calcular el costo del tiempo consumido en un proyecto ingresado por los usuarios si se usa el proyecto del módulo
+TJMDescription=Actualmente, este valor es solo informativo y no se utiliza para ningún cálculo
+LastSalaries=Últimos %s pagos de sueldos
+AllSalaries=Todos los pagos de sueldos
diff --git a/htdocs/langs/es_EC/sendings.lang b/htdocs/langs/es_EC/sendings.lang
new file mode 100644
index 00000000000..08d25169ac0
--- /dev/null
+++ b/htdocs/langs/es_EC/sendings.lang
@@ -0,0 +1,51 @@
+# Dolibarr language file - Source file is en_US - sendings
+RefSending=Ref. de envío
+Receivings=Recibos de entrega
+SendingsArea=Área de envíos
+ListOfSendings=Lista de envíos
+SendingCard=Tarjeta de envío
+QtyShipped=Cantidad enviada
+QtyShippedShort=Cantidad de envío.
+QtyPreparedOrShipped=Cantidad preparada o enviada
+QtyToShip=Cant. enviada
+QtyToReceive=Cantidad para recibir
+QtyReceived=Cantidad recibida
+QtyInOtherShipments=Cantidad en otros envíos
+KeepToShip=Restante enviar
+KeepToShipShort=Restante
+OtherSendingsForSameOrder=Otros envíos para este pedido
+SendingsAndReceivingForSameOrder=Envíos y recibos para este pedido
+SendingsToValidate=Envíos para validar
+StatusSendingCanceled=Cancelado
+StatusSendingValidated=Validado (productos para enviar o ya enviar)
+StatusSendingProcessed=Procesada
+StatusSendingValidatedShort=validado
+StatusSendingProcessedShort=Procesada
+SendingSheet=Hoja de envío
+ConfirmDeleteSending=¿Seguro que desea eliminar este envío?
+ConfirmValidateSending=¿Está seguro de que desea validar este envío con la referencia <b>%s</b>?
+ConfirmCancelSending=¿Seguro que desea cancelar este envío?
+DocumentModelMerou=Modelo A5 de Merou
+WarningNoQtyLeftToSend=Advertencia, ningunos productos que esperan para ser enviados.
+StatsOnShipmentsOnlyValidated=Las estadísticas realizadas sobre envíos sólo se validan. La fecha utilizada es la fecha de validación del envío (no siempre se conoce la fecha de entrega planeada).
+RefDeliveryReceipt=Recibo de entrega de ref
+StatusReceipt=Recibo de entrega de estado
+DateReceived=Fecha de entrega recibida
+SendShippingByEMail=Enviar envío por correo electrónico
+SendShippingRef=Presentación del envío %s
+ActionsOnShipping=Eventos en el envío
+LinkToTrackYourPackage=Enlace para rastrear su paquete
+ShipmentCreationIsDoneFromOrder=Por el momento, la creación de un nuevo envío se hace desde la tarjeta de pedido.
+ShipmentLine=Línea de envío
+ProductQtyInCustomersOrdersRunning=Cantidad de producto de pedidos de venta abiertos
+ProductQtyInSuppliersOrdersRunning=Cantidad de producto de órdenes de compra abiertas
+ProductQtyInShipmentAlreadySent=Cantidad de producto de pedido abierto ya enviado
+ProductQtyInSuppliersShipmentAlreadyRecevied=Cantidad de producto de órdenes de compra abiertas ya recibidas
+NoProductToShipFoundIntoStock=Ningún producto para enviar encontrado en el almacén <b>%s</b>. Corregir el stock o volver a elegir otro almacén.
+ValidateOrderFirstBeforeShipment=Primero debe validar el pedido antes de poder realizar envíos.
+DocumentModelTyphon=Modelo de documento más completo para recibos de entrega (logo ...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER no definido
+SumOfProductVolumes=Suma de volúmenes de producto
+SumOfProductWeights=Suma de los pesos del producto
+DetailWarehouseNumber= Detalles del almacén
+DetailWarehouseFormat=W: %s (Cantidad: %d)
diff --git a/htdocs/langs/es_EC/sms.lang b/htdocs/langs/es_EC/sms.lang
new file mode 100644
index 00000000000..bb89fa66f19
--- /dev/null
+++ b/htdocs/langs/es_EC/sms.lang
@@ -0,0 +1,29 @@
+# Dolibarr language file - Source file is en_US - sms
+SmsSetup=Configuración de SMS
+SmsDesc=Esta página le permite definir opciones globales en las características de SMS
+SmsCard=Tarjeta SMS
+AllSms=Todas las campañas de SMS
+SmsTargets=Objetivos
+SmsRecipients=Objetivos
+SmsRecipient=Objetivo
+SmsFrom=Remitente
+SmsTo=Objetivo
+SmsTopic=Tema de SMS
+SmsMessage=Mensaje SMS
+ListOfSms=Listar campañas de SMS
+NewSms=Nueva campaña de SMS
+DeleteSms=Eliminar campaña de SMS
+DeleteASms=Eliminar una campaña de SMS
+PreviewSms=Vista previa de SMS
+TestSms=Prueba de SMS
+SmsSuccessfulySent=SMS correctamente enviado (de %s a %s)
+ErrorSmsRecipientIsEmpty=El número de destino está vacío
+WarningNoSmsAdded=No hay ningún número de teléfono nuevo que agregar a la lista de destino
+ConfirmValidSms=¿Confirma usted la validación de esta campaña?
+NbOfUniqueSms=No. de números de teléfono únicos
+NbOfSms=No. de numeros telefonicos
+SmsInfoCharRemain=No. de caracteres restantes
+SmsInfoNumero=(formato internacional, es decir: +33899701761)
+DelayBeforeSending=Retraso antes del envío (minutos)
+SmsNoPossibleSenderFound=No hay remitente disponible. Compruebe la configuración de su proveedor de SMS.
+SmsNoPossibleRecipientFound=Ningún objetivo disponible. Compruebe la configuración de su proveedor de SMS.
diff --git a/htdocs/langs/es_EC/stocks.lang b/htdocs/langs/es_EC/stocks.lang
new file mode 100644
index 00000000000..88ed5a7e742
--- /dev/null
+++ b/htdocs/langs/es_EC/stocks.lang
@@ -0,0 +1,167 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseCard=Tarjeta de almacén
+ParentWarehouse=Almacén de los padres
+NewWarehouse=Nuevo almacén / ubicación de stock
+WarehouseEdit=Modificar almacén
+WarehouseSource=Almacén de origen
+WarehouseSourceNotDefined=Ningún almacén definido
+AddOne=Agrega uno
+DefaultWarehouse=Almacén predeterminado
+WarehouseTarget=Almacén de destino
+ValidateSending=Eliminar envío
+CancelSending=Cancelar el envío
+StocksByLotSerial=Inventario por lote/serie
+LotSerial=Lotes/publicaciones en serie
+LotSerialList=Lista de lotes/series
+ErrorWarehouseRefRequired=Se requiere el nombre de referencia del almacén
+ListOfWarehouses=Lista de almacenes
+ListOfInventories=Lista de inventarios
+MovementId=ID del movimiento
+StockMovementForId=ID de movimiento %d
+ListMouvementStockProject=Lista de movimientos de inventario asociado al proyecto
+StocksArea=Área de almacenes
+IncludeAlsoDraftOrders=Incluya también borradores de órdenes
+Location=Ubicación
+LocationSummary=Ubicación del nombre corto
+NumberOfProducts=Número total de productos
+StockCorrection=Corrección de inventario
+CorrectStock=Inventario correcto
+StockTransfer=Transferencia de inventario
+TransferStock=Transferir inventario
+MassStockTransferShort=Transferencia de inventario masiva
+StockMovement=Movimiento de inventario
+StockMovements=Movimiento de inventario
+NumberOfUnit=Número de unidades
+StockTooLow=Inventario demasiado bajo
+StockLowerThanLimit=Inventario más bajo que el límite de alerta (%s)
+PMPValue=Precio medio ponderado
+EnhancedValueOfWarehouses=Valor de almacenes
+UserWarehouseAutoCreate=Crear un almacén de usuario automáticamente al crear un usuario
+AllowAddLimitStockByWarehouse=Administre también el valor del stock mínimo y deseado por emparejamiento (almacén de productos) además del valor del stock mínimo y deseado por producto
+IndependantSubProductStock=El stock de producto y el stock de subproducto son independientes.
+QtyDispatched=Cantidad despachada
+QtyDispatchedShort=Cantidad enviada
+QtyToDispatchShort=Cantidad de envío
+OrderDispatch=Recibos de artículos
+RuleForStockManagementDecrease=Seleccione Regla para la reducción automática de existencias (siempre es posible una reducción manual, incluso si se activa una regla de disminución automática)
+RuleForStockManagementIncrease=Elija la regla para el aumento automático de existencias (siempre es posible un aumento manual, incluso si se activa una regla de aumento automático)
+DeStockOnBill=Disminuir las existencias reales en la validación de la factura del cliente / nota de crédito
+DeStockOnValidateOrder=Disminuir las existencias reales al validar el pedido de cliente
+DeStockOnShipment=Disminuir inventario real en la validación de envío
+DeStockOnShipmentOnClosing=Disminuir las existencias reales cuando el envío se establece en cerrado
+ReStockOnBill=Aumentar las existencias reales en la validación de la factura / nota de crédito del proveedor
+ReStockOnValidateOrder=Aumentar las existencias reales en la aprobación de la orden de compra
+ReStockOnDispatchOrder=Aumentar las existencias reales en el envío manual al almacén, después de la orden de compra recibo de mercancías
+StockOnReception=Aumentar las existencias reales en la validación de recepción
+StockOnReceptionOnClosing=Aumentar las existencias reales cuando la recepción está cerrada
+OrderStatusNotReadyToDispatch=El pedido no tiene todavía o no más un estatus que permita despachar productos en bodegas.
+StockDiffPhysicTeoric=Explicación de la diferencia entre Inventario físico y virtual
+NoPredefinedProductToDispatch=No hay productos predefinidos para este objeto. Por lo tanto, no se requiere despacho en Inventario.
+DispatchVerb=Envío
+StockLimitShort=Límite para la alerta
+StockLimit=Límite de Inventario para alerta
+StockLimitDesc=(vacío) significa que no hay advertencia.<br>0 se puede utilizar para una advertencia tan pronto como el inventario esté vacío.
+PhysicalStock=Inventario FISICO
+RealStock=Inventario Real
+RealStockDesc=El stock físico / real es el stock actualmente en los almacenes.
+RealStockWillAutomaticallyWhen=El stock real se modificará de acuerdo con esta regla (como se define en el módulo Stock):
+VirtualStock=Inventario Virtual
+VirtualStockDesc=El stock virtual es el stock calculado disponible una vez que se cierran todas las acciones abiertas / pendientes (que afectan a los stocks) (órdenes de compra recibidas, órdenes de venta enviadas, etc.)
+IdWarehouse=Id del Almacén
+DescWareHouse=Descripción de almacén
+LieuWareHouse=Almacén de localización
+WarehousesAndProductsBatchDetail=Almacenes y productos (con detalle por lote / serie)
+AverageUnitPricePMPShort=Precio medio ponderado de los insumos
+AverageUnitPricePMP=Precio medio ponderado de los insumos
+SellPriceMin=Precio unitario de venta
+EstimatedStockValueSellShort=Valor para la venta
+EstimatedStockValueSell=Valor para la venta
+EstimatedStockValueShort=Valor del inventario de entrada
+EstimatedStockValue=Valor del inventario de entrada
+ConfirmDeleteWarehouse=¿Seguro que desea eliminar el almacén <b>%s</b>?
+PersonalStock=Inventario personal %s
+ThisWarehouseIsPersonalStock=Este almacén representa el Inventario personal de %s %s
+SelectWarehouseForStockDecrease=Elegir almacén para utilizar para disminuir inventario
+SelectWarehouseForStockIncrease=Elija un almacén para utilizarlo para aumentar el inventario
+NoStockAction=No hay acción de inventario
+DesiredStockDesc=Esta cantidad de inventario será el valor utilizado para llenar el inventario por recurso de reposición.
+StockToBuy=Ordenar
+Replenishment=Reposición
+ReplenishmentOrders=Órdenes de reabastecimiento
+VirtualDiffersFromPhysical=De acuerdo con las opciones de acciones de aumento/disminución, el Inventario físico y el Inventario virtual (órdenes físicas y actuales) pueden diferir
+UseVirtualStockByDefault=Utilizar el inventario virtual de forma predeterminada, en lugar del inventario físico, para la función de reposición
+UseVirtualStock=Utilizar Inventario virtual
+UsePhysicalStock=Usar inventario físico
+CurentlyUsingVirtualStock=Inventario Virtual
+CurentlyUsingPhysicalStock=Inventario Físico
+RuleForStockReplenishment=Regla para la reposición de Inventario
+SelectProductWithNotNullQty=Seleccione al menos un producto con una cantidad no nula y un proveedor
+AlertOnly= Sólo alertas
+WarehouseForStockDecrease=El almacén <b>%s</b> se utilizará para la disminución de inventario
+WarehouseForStockIncrease=El almacén <b>%s</b> se utilizará para el aumento de inventario
+ReplenishmentStatusDesc=Esta es una lista de todos los productos con un stock inferior al deseado (o inferior al valor de alerta si la casilla de verificación "solo alerta" está marcada). Con la casilla de verificación, puede crear pedidos de compra para completar la diferencia.
+ReplenishmentOrdersDesc=Esta es una lista de todas las órdenes de compra abiertas, incluidos los productos predefinidos. Aquí solo se pueden ver pedidos abiertos con productos predefinidos, de modo que los pedidos que pueden afectar las existencias.
+Replenishments=Reabastecimientos
+NbOfProductBeforePeriod=Cantidad del producto%s en Inventario antes del período seleccionado (<%s)
+NbOfProductAfterPeriod=Cantidad del producto%s en Inventario después del período seleccionado (>%s)
+MassMovement=Movimiento masivo
+SelectProductInAndOutWareHouse=Seleccione un producto, una cantidad, un almacén de origen y un almacén de destino, luego haga clic en "%s". Una vez hecho esto para todos los movimientos requeridos, haga clic en "%s".
+RecordMovement=Transferencia de registros
+ReceivingForSameOrder=Recibos para este pedido
+StockMovementRecorded=Movimientos de inventario registrados
+RuleForStockAvailability=Reglas sobre requerimientos de inventario
+StockMustBeEnoughForInvoice=El nivel de stock debe ser suficiente para agregar el producto/servicio a la factura (la verificación se realiza en el stock real actual al agregar una línea en la factura, independientemente de la regla para el cambio automático de stock)
+StockMustBeEnoughForOrder=El nivel de stock debe ser suficiente para agregar el producto/servicio al pedido (la verificación se realiza en el stock real actual al agregar una línea en el pedido, cualquiera que sea la regla para el cambio automático de inventario)
+StockMustBeEnoughForShipment=El nivel de stock debe ser suficiente para agregar el producto/servicio al envío (la verificación se realiza en el stock real actual al agregar una línea en el envío, independientemente de la regla para el cambio automático de stock)
+InventoryCode=Código de movimiento o inventario
+WarehouseAllowNegativeTransfer=La acción puede ser negativa
+qtyToTranferIsNotEnough=No tiene stock suficiente en su almacén de origen y su configuración no permite existencias negativas.
+qtyToTranferLotIsNotEnough=No tiene suficiente stock, para este número de lote, de su almacén de origen y su configuración no permite existencias negativas (Cantidad para el producto '%s' con el lote '%s' es %s en el almacén '%s').
+MovementCorrectStock=Corrección del inventario del producto%s
+MovementTransferStock=Transferencia de inventario de producto%s a otro almacén
+InventoryCodeShort=Inv./Mov. Código
+NoPendingReceptionOnSupplierOrder=No hay recepción pendiente debido a una orden de compra abierta
+ThisSerialAlreadyExistWithDifferentDate=Este número de lote/número de serie (<strong>%s</strong>) ya existe pero con fecha de comer o vender diferente (<strong>%s</strong> pero escribe <strong>%s</strong>).
+OpenInternal=Abrir sólo para acciones internas
+UseDispatchStatus=Use un estado de despacho (aprobar / rechazar) para las líneas de productos en la recepción de la orden de compra
+OptionMULTIPRICESIsOn=La opción "varios precios por segmento" está activada. Significa que un producto tiene varios precios de venta por lo que el valor para la venta no se puede calcular
+ProductStockWarehouseCreated=Límite de inventario para alerta e inventario óptimo deseado correctamente creado
+ProductStockWarehouseUpdated=Límite de inventario para alerta e inventario óptimo deseado correctamente actualizado
+ProductStockWarehouseDeleted=Límite de inventario para alerta e inventario óptimo deseado correctamente eliminado
+AddNewProductStockWarehouse=Establecer un nuevo límite para la alerta y el inventario óptimo deseado
+AddStockLocationLine=Disminuir la cantidad a continuación, haga clic para agregar otro almacén para este producto
+InventoryDate=Fecha del inventario
+inventorySetup =Configuración del inventario
+inventoryWritePermission=Actualizar los inventarios
+inventoryListEmpty=Ningún inventario en curso
+inventoryEdit=Editar
+inventoryDraft=Abierto
+inventoryOfWarehouse=Inventario para almacén: %s
+inventoryErrorQtyAdd=Error: una cantidad es menor que cero
+inventoryWarningProductAlreadyExists=Este producto ya está en la lista
+SelectCategory=Filtro de categoría
+SelectFournisseur=Filtro de proveedores
+INVENTORY_DISABLE_VIRTUAL=Producto virtual (kit): no disminuya el stock de un producto hijo
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Utilice el precio de compra si no se puede encontrar el último precio de compra
+inventoryChangePMPPermission=Permitir cambiar el valor PMP de un producto
+OnlyProdsInStock=No añada producto sin inventario
+TheoricalQty=Cantidad teórica
+TheoricalValue=Cantidad teórica
+LastPA=Última BP
+RealQty=Cantidad real
+RealValue=Valor real
+RegulatedQty=Cantidad regulada
+FlushInventory=Inventario de descarga
+ConfirmFlushInventory=¿Confirma usted esta acción?
+InventoryFlushed=Inventario descargado
+ExitEditMode=Edición de salida
+inventoryDeleteLine=Borrar línea
+RegulateStock=Regular inventario
+ListInventory=Lista
+StockSupportServices=Servicios de gestión de stock.
+StockSupportServicesDesc=De forma predeterminada, solo puede almacenar productos del tipo "producto". También puede almacenar un producto de tipo "servicio" si tanto el módulo Servicios como esta opción están habilitados.
+StockDecreaseAfterCorrectTransfer=Disminución por corrección/transferencia
+StockIncrease=Aumento de existencias
+StockDecrease=Disminución de existencias
+InventoryForASpecificWarehouse=Inventario para un almacén específico
+InventoryForASpecificProduct=Inventario para un producto específico
diff --git a/htdocs/langs/es_EC/stripe.lang b/htdocs/langs/es_EC/stripe.lang
new file mode 100644
index 00000000000..eb665991887
--- /dev/null
+++ b/htdocs/langs/es_EC/stripe.lang
@@ -0,0 +1,37 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Configuración del módulo de Stripe
+StripeDesc=Ofrezca a los clientes una página de pago en línea de Stripe para pagos con tarjetas de crédito / debito a través de <a href="http://www.stripe.com" target="_blank"> Stripe </a>. Esto se puede utilizar para permitir a sus clientes realizar pagos ad-hoc o para pagos relacionados con un objeto Dolibarr en particular (factura, pedido, ...)
+StripeOrCBDoPayment=Pague con tarjeta de crédito o Stripe
+STRIPE_PAYONLINE_SENDEMAIL=Notificación por correo electrónico después de un intento de pago (exitoso o fallido)
+StripeDoPayment=Pagar con raya
+YouWillBeRedirectedOnStripe=Se le redirigirá a la página de Stripe protegida para ingresar su información de tarjeta de crédito
+ToOfferALinkForOnlinePayment=URL para el pago de%s
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL para ofrecer una página de pago en línea %s de cualquier monto sin objeto existente
+YouCanAddTagOnUrl=También puede agregar el parámetro de URL <b>&tag=<i>valor</i></b> a cualquiera de esos URL (obligatorio solo para pagos no vinculados a un objeto) para agregar su propia etiqueta de comentario de pago. <br> Para la URL de pagos sin objeto existente, también puede agregar el parámetro <strong>&noidempotency=1</strong> para que el mismo enlace con la misma etiqueta se pueda usar varias veces (algún modo de pago puede limitar el pago a 1 para cada enlace diferente sin esto parámetro)
+SetupStripeToHavePaymentCreatedAutomatically=Configure su Stripe con URL <b>%s</b> para que el pago se cree automáticamente cuando sea validado por Stripe.
+STRIPE_CGI_URL_V2=Módulo URL de Stripe CGI para el pago
+NewStripePaymentFailed=Nuevo pago de Stripe probado pero fallido
+FailedToChargeCard=Error al cargar la tarjeta
+STRIPE_TEST_SECRET_KEY=Clave de prueba secreta
+STRIPE_TEST_PUBLISHABLE_KEY=Clave de prueba publicable
+STRIPE_LIVE_SECRET_KEY=Clave secreta en vivo
+STRIPE_LIVE_PUBLISHABLE_KEY=Clave viva publicada
+STRIPE_LIVE_WEBHOOK_KEY=Webhook clave en vivo
+ONLINE_PAYMENT_WAREHOUSE=Stock para usar en la disminución de inventario cuando se realiza el pago en línea <br> (TODO Cuando la opción para disminuir el inventario se realiza en una acción en la factura y el pago en línea se genera la factura?)
+StripeLiveEnabled=Stripe activado en vivo (de lo contrario modo prueba/sandbox)
+StripeImportPayment=Importar pagos en franja
+ExampleOfTestCreditCard=Ejemplo de tarjeta de crédito para prueba: %s => válido, %s => error CVC, %s => vencido, %s => el cargo falla
+StripeGateways=Gateways de Tripe
+BankAccountForBankTransfer=Cuenta bancaria para pagos de fondos
+StripeAccount=Cuenta de Stripe
+StripeChargeList=Lista de cargas de Stripe
+StripeTransactionList=Lista de transacciones de Stripe
+StripeCustomerId=ID de cliente de Stripe
+LocalID=ID Local
+StripeID=ID de Stripe
+ConfirmDeleteCard=¿Seguro que quieres eliminar esta tarjeta de crédito o débito?
+StripeUserAccountForActions=Cuenta de usuario para usar para la notificación por correo electrónico de algunos eventos de Stripe (pagos de Stripe)
+ToOfferALinkForTestWebhook=Enlace para configurar Stripe WebHook para llamar a IPN (modo de prueba)
+ToOfferALinkForLiveWebhook=Enlace para configurar Stripe WebHook para llamar a IPN (modo en vivo)
+ClickHereToTryAgain=<a href="%s">Haga clic aquí para volver a intentarlo...</a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Debido a las fuertes reglas de autenticación del cliente, la creación de una tarjeta debe hacerse desde la oficina administrativa de Stripe. Puede hacer clic aquí para activar el registro de cliente de Stripe: %s
diff --git a/htdocs/langs/es_EC/supplier_proposal.lang b/htdocs/langs/es_EC/supplier_proposal.lang
new file mode 100644
index 00000000000..5fe0738f765
--- /dev/null
+++ b/htdocs/langs/es_EC/supplier_proposal.lang
@@ -0,0 +1,46 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=Propuestas comerciales del vendedor
+supplier_proposalDESC=Gestionar solicitudes de precios a proveedores
+SupplierProposalNew=Nueva solicitud de precio
+CommRequest=Precio requerido
+CommRequests=Solicitudes de precios
+SearchRequest=Buscar una solicitud
+DraftRequests=Solicitudes preliminares
+SupplierProposalsDraft=Borrador de propuestas de proveedores
+LastModifiedRequests=Las últimas solicitudes de precios modificados%s
+RequestsOpened=Solicitud de precio abierto
+SupplierProposalArea=Área de propuestas de proveedores
+SupplierProposalShort=Propuesta del vendedor
+SupplierProposals=Propuestas del vendedor
+SupplierProposalsShort=Propuestas del vendedor
+NewAskPrice=Nueva solicitud de precio
+ShowSupplierProposal=Mostrar pedido de precio
+AddSupplierProposal=Crear una solicitud de precio
+SupplierProposalRefFourn=Referencias del vendedor
+SupplierProposalRefFournNotice=Antes de cerrar a "Aceptado", piense en captar referencias de proveedores.
+ConfirmValidateAsk=¿Está seguro de que desea validar esta solicitud de precio bajo el nombre <b>%s</b>?
+DeleteAsk=Borrar petición
+ValidateAsk=Validar solicitud
+SupplierProposalStatusDraft=Proyecto (necesita ser validado)
+SupplierProposalStatusValidated=Validado (la solicitud está abierta)
+SupplierProposalStatusValidatedShort=validado
+CopyAskFrom=Cree una solicitud de precio copiando una solicitud existente
+CreateEmptyAsk=Crear solicitud en blanco
+ConfirmCloneAsk=¿Seguro que desea clonar la solicitud de precios <b>%s</b>?
+ConfirmReOpenAsk=¿Seguro que desea volver a abrir la solicitud de precios <b>%s</b>?
+SendAskByMail=Enviar solicitud de precio por correo
+SendAskRef=Enviando la solicitud de precio %s
+SupplierProposalCard=Solicitar tarjeta
+ConfirmDeleteAsk=¿Seguro que desea eliminar esta solicitud de precios <b>%s</b>?
+ActionsOnSupplierProposal=Eventos sobre la solicitud de precio
+DocModelAuroreDescription=Un modelo de solicitud completa (logo ...)
+CommercialAsk=Precio requerido
+DefaultModelSupplierProposalCreate=Creación de modelo predeterminada
+DefaultModelSupplierProposalToBill=Plantilla predeterminada al cerrar una solicitud de precio (aceptada)
+DefaultModelSupplierProposalClosed=Plantilla predeterminada al cerrar una solicitud de precio (rechazada)
+ListOfSupplierProposals=Lista de solicitudes de propuestas de proveedores
+ListSupplierProposalsAssociatedProject=Lista de propuestas de proveedores asociadas con el proyecto
+SupplierProposalsToClose=Propuestas del proveedor para cerrar
+SupplierProposalsToProcess=Propuestas del proveedor para procesar
+LastSupplierProposals=Últimas solicitudes de precios%s
+AllPriceRequests=Todas las solicitudes
diff --git a/htdocs/langs/es_EC/suppliers.lang b/htdocs/langs/es_EC/suppliers.lang
new file mode 100644
index 00000000000..6b01cbb42a3
--- /dev/null
+++ b/htdocs/langs/es_EC/suppliers.lang
@@ -0,0 +1,36 @@
+# Dolibarr language file - Source file is en_US - suppliers
+Suppliers=Vendedores/Proveedores
+SuppliersInvoice=Factura del proveedor
+ShowSupplierInvoice=Mostrar factura del proveedor
+ListOfSuppliers=Lista de proveedores
+ShowSupplier=Mostrar vendedor/proveedor
+OrderDate=Fecha de orden
+TotalBuyingPriceMinShort=Total de subproductos de los precios de compra
+TotalSellingPriceMinShort=Total de subproductos precios de venta
+ChangeSupplierPrice=Cambiar el precio de compra
+SupplierPrices=Precios del proveedor
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Esta referencia del proveedor ya está asociada con un producto: %s
+NoRecordedSuppliers=Ningún vendedor/proveedor registrado
+SupplierPayment=Pago del proveedor
+SuppliersArea=Área del vendedor/proveedor
+RefSupplierShort=Referencia del proveedor
+ExportDataset_fournisseur_1=Facturas de proveedores y detalles de las facturas.
+ExportDataset_fournisseur_2=Facturas y pagos del vendedor
+ExportDataset_fournisseur_3=Pedidos de compra y detalles del pedido
+ConfirmApproveThisOrder=¿Estás seguro de que quieres aprobar la orden <b>%s</b>?
+DenyingThisOrder=Negar esta orden
+ConfirmDenyingThisOrder=¿Seguro que quiere negar esta orden <b>%s</b>?
+ConfirmCancelThisOrder=¿Está seguro de que desea cancelar este pedido <b>%s</b>?
+AddSupplierOrder=Crear orden de compra
+ListOfSupplierProductForSupplier=Lista de productos y precios para el vendedor <b>%s</b>
+SentToSuppliers=Enviado a los vendedores
+ListOfSupplierOrders=Lista de órdenes de compra
+MenuOrdersSupplierToBill=Órdenes de compra para facturar
+NbDaysToDelivery=Retraso en la entrega (días)
+DescNbDaysToDelivery=El mayor retraso de entrega de los productos de este pedido
+SupplierReputation=Reputación del vendedor
+DoNotOrderThisProductToThisSupplier=No ordenes
+NotTheGoodQualitySupplier=Baja calidad
+AllProductServicePrices=Todos los precios de productos / servicios
+AllProductReferencesOfSupplier=Todas las referencias de producto / servicio del vendedor
+BuyingPriceNumShort=Precios del proveedor
diff --git a/htdocs/langs/es_EC/trips.lang b/htdocs/langs/es_EC/trips.lang
new file mode 100644
index 00000000000..e3976df3b1d
--- /dev/null
+++ b/htdocs/langs/es_EC/trips.lang
@@ -0,0 +1,95 @@
+# Dolibarr language file - Source file is en_US - trips
+ShowExpenseReport=Mostrar informe de gastos
+Trips=Reporte de gastos
+TripsAndExpenses=Informes de gastos
+TripsAndExpensesStatistics=Estadísticas de informes de gastos
+TripCard=Tarjeta de reporte de gastos
+AddTrip=Crear informe de gastos
+ListOfTrips=Lista de informes de gastos
+ListOfFees=Lista de tarifas
+ShowTrip=Mostrar informe de gastos
+NewTrip=Nuevo informe de gastos
+LastExpenseReports=Últimos informes de gastos %s
+CompanyVisited=Compañía/organización visitada
+FeesKilometersOrAmout=Cantidad o kilómetros
+DeleteTrip=Eliminar informe de gastos
+ConfirmDeleteTrip=¿Está seguro de que desea eliminar este informe de gastos?
+ListTripsAndExpenses=Lista de informes de gastos
+ListToApprove=A la espera de la aprobación
+ExpensesArea=Área de informes de gastos
+ClassifyRefunded=Clasifique 'Reembolsado'
+ExpenseReportWaitingForApproval=Se ha presentado un nuevo informe de gastos para su aprobación
+ExpenseReportWaitingForApprovalMessage=Se ha enviado un nuevo informe de gastos y está esperando su aprobación. <br> - Usuario: %s <br> - Período: %s<br> haga clic aquí para validar: %s
+ExpenseReportWaitingForReApproval=Se ha presentado un informe de gastos para su re-aprobación
+ExpenseReportWaitingForReApprovalMessage=Se ha enviado un informe de gastos y está a la espera de la nueva aprobación. <br> El usuario %s,  negó la aprobación del informe de gastos por este motivo: %s. <br> Se ha propuesto una nueva versión y está esperando su aprobación. <br> - Usuario: %s<br> - Período: %s<br> haga clic aquí para validar: %s
+ExpenseReportApproved=Se aprobó un informe de gastos
+ExpenseReportApprovedMessage=El informe de gastos %s fue aprobado. <br> - Usuario: %s<br> - Aprobado por: %s<br> Haga clic aquí para mostrar el informe de gastos: %s
+ExpenseReportRefused=Se rechazó un informe de gastos
+ExpenseReportRefusedMessage=El informe de gastos %s fue rechazado. <br>- Usuario: %s<br> - Rechazado por: %s<br> - Motivo de rechazo: %s<br> haga clic aquí para mostrar el informe de gastos: %s
+ExpenseReportCanceled=Se canceló un informe de gastos
+ExpenseReportCanceledMessage=El informe de gastos %s fue cancelado. <br> - Usuario: %s<br> - Cancelado por: %s<br> - Motivo de cancelación: %s<br> haga clic aquí para mostrar el informe de gastos: %s
+ExpenseReportPaid=Se pagó un informe de gastos
+ExpenseReportPaidMessage=El informe de gastos %s fue pagado. <br> - Usuario: %s<br> - Pagado por: %s<br> haga clic aquí para mostrar el informe de gastos: %s
+TripId=Informe de gastos de identificación
+AnyOtherInThisListCanValidate=Persona a informar para la validación.
+TripSociete=Empresa de información
+TripNDF=Informaciones sobre el informe de gastos
+PDFStandardExpenseReports=Plantilla estándar para generar un documento PDF para el informe de gastos
+ExpenseReportLine=Línea de reporte de gastos
+TF_LUNCH=Almuerzo
+TF_TRAIN=Trole
+TF_CAR=Automovil
+EX_FUE=CV de combustible
+EX_PAR=CV de estacionamiento
+EX_TOL=CV Peaje
+EX_TAX=Varios impuestos
+EX_SUM=Suministro de mantenimiento
+EX_CAR=Alquiler de automovil
+EX_CUR=Los clientes que reciben
+EX_CAM=CV Mantenimiento y reparación
+EX_EMM=Comida de los empleados
+EX_FUE_VP=PV de combustible
+EX_TOL_VP=PV Peaje
+EX_PAR_VP=PV Estacionamiento
+EX_CAM_VP=PV Mantenimiento y reparación
+UploadANewFileNow=Sube un nuevo documento ahora
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, la regla para la referencia de numeración del informe de gastos no se definió en la configuración del módulo 'Informe de gastos'
+ErrorDoubleDeclaration=Ha declarado otro informe de gastos en un intervalo de fechas similar.
+AucuneLigne=No se ha declarado ningún informe de gastos
+VALIDATOR=Usuario responsable de la aprobación
+AUTHOR=Grabado por
+REFUSEUR=Negado por
+CANCEL_USER=Suprimido por
+DATE_REFUS=Denegar fecha
+DATE_CANCEL=Fecha de cancelación
+ExpenseReportRef=Árbitro. informe de gastos
+ValidateAndSubmit=Validar y enviar para su aprobación
+NOT_AUTHOR=Usted no es el autor de este informe de gastos. Operación cancelada.
+ConfirmRefuseTrip=¿Está seguro de que desea negar este informe de gastos?
+ValideTrip=Aprobar informe de gastos
+ConfirmValideTrip=¿Está seguro de que desea aprobar este informe de gastos?
+PaidTrip=Pagar un informe de gastos
+ConfirmPaidTrip=¿Está seguro de que desea cambiar el estado de este informe de gastos a "Pago"?
+ConfirmCancelTrip=¿Está seguro de que desea cancelar este informe de gastos?
+BrouillonnerTrip=Mover atrás el informe de gastos al estado "Borrador"
+ConfirmBrouillonnerTrip=¿Está seguro de que desea mover este informe de gastos al estado "Borrador"?
+SaveTrip=Validar informe de gastos
+ConfirmSaveTrip=¿Está seguro de que desea validar este informe de gastos?
+NoTripsToExportCSV=No hay reporte de gastos a la exportación para este período.
+ExpenseReportPayment=Pago del informe de gastos
+ExpenseReportsToApprove=Informes de gastos para aprobar
+ExpenseReportsToPay=Informes de gastos a pagar
+ConfirmCloneExpenseReport=¿Seguro que desea copiar este informe de gastos?
+ExpenseReportsIk=Índice de millaje de informes de gastos
+ExpenseReportIkDesc=Se puede modificar el cálculo de los kilómetros de gasto por categoría y por rango que se definen previamente. <b> d </ b> es la distancia en kilómetros
+expenseReportOffset=Compensar
+expenseReportTotalForFive=Ejemplo con <u>d</u> = 5
+expenseReportPrintExample=desplazamiento + (d x coef) = %S
+ExpenseReportApplyTo=Aplicar para
+ExpenseReportDateStart=Fecha de inicio
+ExpenseReportDateEnd=Fecha final
+ExpenseReportLimitAmount=Cantidad limitada
+ExpenseReportConstraintViolationError=Infracción de restricción id [%s]: %s es superior a %s %s
+ExpenseReportConstraintViolationWarning=Infracción de restricción id [%s]: %s es superior a %s %s
+ExpenseRangeOffset=Cantidad de compensación: %s
+AttachTheNewLineToTheDocument=Adjunte la línea a un documento cargado
diff --git a/htdocs/langs/es_EC/users.lang b/htdocs/langs/es_EC/users.lang
new file mode 100644
index 00000000000..5020c38edae
--- /dev/null
+++ b/htdocs/langs/es_EC/users.lang
@@ -0,0 +1,87 @@
+# Dolibarr language file - Source file is en_US - users
+HRMArea=Área Recursos Humanos
+UserCard=Tarjeta de usuario
+GroupCard=Tarjeta de grupo
+Permission=Permiso
+EditPassword=Editar contraseña
+SendNewPassword=Regenerar y enviar contraseña
+ReinitPassword=Regenerar contraseña
+PasswordChangedTo=La contraseña cambió a: %s
+UserRights=Permisos de usuario
+UserGUISetup=Configuración de pantalla del usuario
+DisableUser=En rehabilitación
+DisableAUser=Deshabilitar un usuario
+DeleteUser=Borrar
+EnableAUser=Habilitar un usuario
+DeleteGroup=Borrar
+ConfirmDisableUser=¿Estás seguro de que quieres deshabilitar el usuario <b>%s</b>?
+ConfirmDeleteUser=¿Seguro que desea eliminar el usuario <b>%s</b>?
+ConfirmDeleteGroup=¿Seguro que desea eliminar el grupo <b>%s</b>?
+ConfirmEnableUser=¿Seguro que quieres habilitar el usuario <b>%s</b>?
+ConfirmReinitPassword=¿Seguro que desea generar una nueva contraseña para el usuario <b>%s</b>?
+ConfirmSendNewPassword=¿Está seguro de que desea generar y enviar una nueva contraseña para el usuario <b>%s</b>?
+LoginNotDefined=El inicio de sesión no está definido.
+NameNotDefined=El nombre no está definido.
+ListOfUsers=Lista de usuarios
+DefaultRights=Permisos predeterminados
+DefaultRightsDesc=Defina aquí los permisos predeterminados <u>predeterminados</u> que se otorgan automáticamente a un nuevo usuario <u>nuevo</u> (para modificar los permisos de los usuarios existentes, vaya a la tarjeta de usuario).
+DolibarrUsers=Usuarios de Dolibarr
+LastName=Apellido
+FirstName=Primer nombre
+ListOfGroups=Lista de grupos
+CreateGroup=Crea un grupo
+RemoveFromGroup=Sacar del grupo
+PasswordChangedAndSentTo=Se cambió la contraseña y se envió a <b>%s</b>.
+PasswordChangeRequestSent=Solicitud de cambio de contraseña para <b>%s</b> enviada a <b>%s</b>.
+LastUsersCreated=Últimos usuarios de %s creados
+ShowGroup=Mostrar grupo
+ShowUser=Mostrar usuario
+NonAffectedUsers=Usuarios no asignados
+UserModified=Usuario modificado correctamente
+PhotoFile=Archivo de fotos
+ListOfUsersInGroup=Lista de usuarios de este grupo
+ListOfGroupsForUser=Lista de grupos de este usuario
+LinkToCompanyContact=Enlace a un tercero / contacto
+LinkedToDolibarrMember=Enlace al miembro
+LinkedToDolibarrUser=Enlace al usuario de Dolibarr
+LinkedToDolibarrThirdParty=Enlace a Dolibarr terceros
+CreateDolibarrLogin=Crear un usuario
+LoginAccountDisableInDolibarr=Cuenta desactivada en Dolibarr.
+UsePersonalValue=Usar valor personal
+DomainUser=Usuario del dominio %s
+CreateInternalUserDesc=Este formulario le permite crear un usuario interno en su empresa / organización. Para crear un usuario externo (cliente, proveedor, etc.), use el botón 'Crear usuario Dolibarr' de la tarjeta de contacto de ese tercero.
+InternalExternalDesc=Un usuario interno <b> </b> es un usuario que forma parte de su empresa / organización. <br> Un usuario externo <b> externo </b> es un cliente, proveedor u otro (La creación de un usuario externo para un tercero se puede hacer desde el registro de contacto del tercero). <br> <br> En ambos casos, los permisos definen los derechos en Dolibarr, también el usuario externo puede tener un administrador de menú diferente al usuario interno (Ver Inicio - Configuración - Pantalla)
+PermissionInheritedFromAGroup=Permiso concedido porque lo a heredado de un usuario de un grupo de usuarios.
+UserWillBeInternalUser=El usuario creado será un usuario interno (porque no está vinculado a un tercero en particular)
+UserWillBeExternalUser=El usuario creado será un usuario externo (debido a que está vinculado a un tercero en particular)
+IdPhoneCaller=Identificador de llamadas
+NewUserCreated=Se ha creado el usuario %s
+NewUserPassword=Cambio de contraseña para %s
+EventUserModified=El usuario %s modificado
+UserDisabled=El usuario %s inhabilitado
+UserEnabled=El usuario %s está activado
+UserDeleted=El usuario %s eliminado
+ConfirmCreateContact=¿Estás seguro de que quieres crear una cuenta Dolibarr para este contacto?
+ConfirmCreateLogin=¿Estás seguro de que quieres crear una cuenta de Dolibarr para este miembro?
+ConfirmCreateThirdParty=¿Estás seguro de que quieres crear un tercero para este miembro?
+LoginToCreate=Ingresar para crear
+NameToCreate=Nombre del tercero para crear
+YourRole=Sus funciones
+YourQuotaOfUsersIsReached=¡Se alcanza su cuota de usuarios activos!
+NbOfUsers=No. de usuarios
+NbOfPermissions=No. de permisos
+DontDowngradeSuperAdmin=Sólo una superadmin puede degradar una superadmin
+UseTypeFieldToChange=Utilice el campo Tipo para cambiar
+OpenIDURL=URL de OpenID
+LoginUsingOpenID=Utilice OpenID para iniciar sesión
+ExpectedWorkedHours=Horas trabajadas esperadas por semana
+ColorUser=Color del usuario
+DisabledInMonoUserMode=Desactivado en el modo de mantenimiento
+UserAccountancyCode=Código de contabilidad de usuario
+UserLogoff=Cerrar sesión de usuario
+UserLogged=Usuario registrado
+DateEmploymentEnd=Fecha de finalización del empleo
+ForceUserExpenseValidator=Validar el validador de informes de gastos
+ForceUserHolidayValidator=Forzar validación de solicitud de licencia
+UserPersonalEmail=Email personal
+UserPersonalMobile=Teléfono móvil personal
diff --git a/htdocs/langs/es_EC/website.lang b/htdocs/langs/es_EC/website.lang
new file mode 100644
index 00000000000..41a4748bb60
--- /dev/null
+++ b/htdocs/langs/es_EC/website.lang
@@ -0,0 +1,74 @@
+# Dolibarr language file - Source file is en_US - website
+WebsiteSetupDesc=Crea aquí los sitios web que deseas utilizar. A continuación, vaya a los sitios web de menú para editarlos.
+ConfirmDeleteWebsite=¿Estás seguro de que deseas eliminar este sitio web? Todas sus páginas y contenido también serán eliminados. Los archivos cargados (como en el directorio de medios, el módulo ECM, ...) permanecerán.
+WEBSITE_PAGENAME=Nombre de página/alias
+WEBSITE_ALIASALT=Nombres de página alternativos/alias
+WEBSITE_ALIASALTDesc=Utilice aquí la lista de otros nombres/alias para que también se pueda acceder a la página usando estos otros nombres/alias (por ejemplo, el nombre anterior después de cambiar el nombre del alias para mantener el enlace posterior en funcionamiento). La sintaxis es:<br> alternativename1, alternativename2, ...
+WEBSITE_CSS_URL=URL del archivo CSS externo
+WEBSITE_HTML_HEADER=Adición en la parte inferior del encabezado HTML (común en todas las páginas)
+WEBSITE_HTACCESS=Sitio web .htaccess archivo
+EnterHereLicenseInformation=Ingrese aquí metadatos o información de licencia para llenar un archivo README.md. si distribuye su sitio web como plantilla, el archivo se incluirá en el paquete temptate.
+PageNameAliasHelp=Nombre o alias de la página. <br> Este alias también se utiliza para forjar una URL SEO cuando el sitio web se ejecuta desde un host virtual de un servidor Web (como Apacke, Nginx, ...). Utilice el botón "<strong>%s</ strong>" para editar este alias.
+MediaFiles=Mediateca
+EditCss=Editar propiedades web
+EditMenu=Editar menú
+EditPageMeta=Editar propiedades
+Webpage=Página web/contenedor
+HomePage=Página Principal
+PreviewOfSiteNotYetAvailable=Vista previa de su sitio web <strong>%s</strong> aún no disponible. Primero debe '<strong>Importar una plantilla de sitio web completa</strong>' o simplemente '<strong>Agregar una página / contenedor</strong>'.
+RequestedPageHasNoContentYet=La página solicitada con id %s todavía no tiene contenido o el archivo de caché .tpl.php fue eliminado. Editar el contenido de la página para resolver esto.
+PageContent=Página/Contenair
+PageDeleted=Página/Contenair '%s' del sitio web %s eliminado
+PageAdded=Página/Contenair '%s' añadido
+ViewSiteInNewTab=Ver el sitio en una nueva pestaña
+ViewPageInNewTab=Ver la página en una nueva pestaña
+SetAsHomePage=Establecer como página de inicio
+RealURL=URL real
+ViewWebsiteInProduction=Ver sitio web utilizando las URL de inicio
+SetHereVirtualHost=<u>uso con Apache/NGinx/...</u><br>Crea en su servidor web (Apache, Nginx, ...) de un host virtual dedicado con PHP habilitado y un directorio raíz en<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Ejemplo para usar en la configuración del host virtual Apache:
+YouCanAlsoTestWithPHPS=<u>Para usar con el servidor PHP incorporado</u><br> en el entorno de desarrollo, es posible que prefiera probar el sitio con el servidor web PHP incorporado (se requiere PHP 5.5) ejecutando<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP= <u> Ejecute su sitio web con otro proveedor de alojamiento Dolibarr </u> <br> Si no tiene un servidor web como Apache o NGinx disponible en Internet, puede exportar e importar su sitio web a otra instancia de Dolibarr proporcionada por otro proveedor de alojamiento Dolibarr que proporcione el servicio completo integración con el módulo del sitio web. Puede encontrar una lista de algunos proveedores de hosting Dolibarr en <a href="https://saas.dolibarr.org" target="_blank"> https://saas.dolibarr.org </a>
+CheckVirtualHostPerms=Verifique también que el host virtual tenga permiso para <strong>%s</strong> en los archivos <br><strong>%s</strong>
+ReadPerm=Leer
+TestDeployOnWeb=Probar / implementar en la web
+PreviewSiteServedByWebServer=<u>Vista previa %s en una nueva pestaña. </u> <br><br>La %s servirá un servidor web externo (como Apache, Nginx, IIS). Debe instalar y configurar este servidor antes de apuntar al directorio:<br><strong>%s</strong><br> URL servida por un servidor externo:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Vista previa %s en una nueva pestaña.</u><br><br> La %s servirá el servidor de Dolibarr para que no necesite instalar ningún servidor web adicional (como Apache, Nginx, IIS). <br> El inconveniente es que la URL de las páginas no es fácil de usar y comienza con la ruta de acceso de su Dolibarr. <br> URL servido por Dolibarr:<br><strong>%s</strong><br><br> para usar su propio servidor web externo para servir este sitio web, cree un host virtual en su servidor web que señale el directorio <br><strong>%s</strong><br> luego ingrese el nombre de este servidor virtual y haga clic en el otro botón de vista previa.
+VirtualHostUrlNotDefined=URL del host virtual servido por el servidor web externo no definido
+SyntaxHelp=Ayuda sobre consejos de sintaxis específicos
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span>Puede incluir código PHP en esta fuente usando etiquetas <strong>&lt;?php ?&gt;</strong>. Las siguientes variables globales están disponibles: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs. <br><br><span class="fa fa-bug"></span>También puede incluir contenido de otra página / contenedor con la siguiente sintaxis:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span>Puede hacer una redirección a otra página / contenedor con la siguiente sintaxis (Nota: no envíe ningún contenido antes de una redirección):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span>para agregar un enlace a otra página, use la sintaxis:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> Para incluir un <strong>enlace para descargar</strong> un archivo almacenado en el <strong>documentos</strong> directorio, use el <strong>document.php</strong>envoltura:<br> Ejemplo, para un archivo en documentos / ecm (debe registrarse), la sintaxis es: <br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Para un archivo en documentos / medios (directorio abierto para acceso público), la sintaxis es: <br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Para un archivo compartido con un enlace compartido (acceso abierto utilizando la clave hash para compartir archivos), la sintaxis es:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span>Para incluir un<strong>imagen</strong> almacenado en el <strong>documentos</strong> directorio, use el <strong>viewimage.php</strong> envoltura: <br>Ejemplo, para una imagen en documentos / medios (directorio abierto para acceso público), la sintaxis es: <br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>Más ejemplos de HTML o código dinámico disponibles en <a href="%s" target="_blank">la documentación wiki</a><br>.
+SiteAdded=Sitio web añadido
+LanguageMustNotBeSameThanClonedPage=Clonar una página como traducción. El idioma de la nueva página debe ser diferente al idioma de la página de origen.
+OrEnterPageInfoManually=O crea una página desde cero o desde una plantilla de página ...
+IDOfPage=Id de página
+BackToListForThirdParty=Volver a la lista de terceros
+DisableSiteFirst=Deshabilitar sitio web primero
+AnotherContainer=Así es como se incluye el contenido de otra página / contenedor (puede tener un error aquí si habilita el código dinámico porque el subcontenedor incrustado puede no existir)
+SorryWebsiteIsCurrentlyOffLine=Lo sentimos, este sitio web está actualmente fuera de línea. Vuelve más tarde ...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Habilitar la tabla de cuenta del sitio web
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Habilite la tabla para almacenar las cuentas del sitio web (inicio de sesión / pase) para cada sitio web / tercero
+YouMustDefineTheHomePage=Primero debe definir la página de inicio predeterminada
+OnlyEditionOfSourceForGrabbedContentFuture=Advertencia: la creación de una página web mediante la importación de una página web externa está reservada para usuarios experimentados. Dependiendo de la complejidad de la página de origen, el resultado de la importación puede diferir del original. Además, si la página de origen usa estilos CSS comunes o JavaScript conflictivo, puede romper el aspecto o las características del editor del sitio web cuando se trabaja en esta página. Este método es una forma más rápida de crear una página, pero se recomienda crear su nueva página desde cero o desde una plantilla de página sugerida. <br> Tenga en cuenta también que el editor en línea puede no funcionar correctamente cuando se usa en una página externa capturada.
+OnlyEditionOfSourceForGrabbedContent=Solo es posible la edición de código fuente HTML cuando el contenido fue capturado de un sitio externo
+WebsiteRootOfImages=Directorio raíz para imágenes de sitios web
+AliasPageAlreadyExists=La página Alias <strong>%s</strong> ya existe
+ThisPageIsTranslationOf=Esta página / contenedor es una traducción de
+NoWebSiteCreateOneFirst=No se ha creado ningún sitio web todavía. Crea uno primero.
+GoTo=Ir
+DynamicPHPCodeContainsAForbiddenInstruction=Agrega código PHP dinámico que contiene la instrucción PHP '<strong> %s </strong>' que está prohibido por defecto como contenido dinámico (ver opciones ocultas WEBSITE_PHP_ALLOW_xxx para aumentar la lista de comandos permitidos).
+NotAllowedToAddDynamicContent=No tiene permiso para agregar o editar contenido dinámico PHP en sitios web. Pida permiso o simplemente mantenga el código en las etiquetas php sin modificar.
+ReplaceWebsiteContent=Buscar o reemplazar contenido del sitio web
+DeleteAlsoJs=¿Eliminar también todos los archivos JavaScript específicos de este sitio web?
+DeleteAlsoMedias=¿Eliminar también todos los archivos multimedia específicos de este sitio web?
+MyWebsitePages=Mis páginas del sitio web
+SearchReplaceInto=Búsqueda | Reemplazar en
+CSSContentTooltipHelp=Ingrese aquí el contenido CSS. Para evitar cualquier conflicto con el CSS de la aplicación, asegúrese de anteponer todas las declaraciones con la clase .bodywebsite. Por ejemplo:<br><br>#mycssselector, input.myclass:hover { ... }<br>debe ser<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Nota: Si tiene un archivo grande sin este prefijo, puede usar 'lessc' para convertirlo y agregar el prefijo .bodywebsite en todas partes.\n 
+LinkAndScriptsHereAreNotLoadedInEditor=Advertencia: Este contenido se genera solo cuando se accede al sitio desde un servidor. No se usa en modo Edición, por lo que si necesita cargar archivos javascript también en modo edición, simplemente agregue su etiqueta 'script src = ...' en la página.
+EditInLineOnOff=El modo 'Editar en línea' es %s
+ShowSubContainersOnOff=El modo para ejecutar 'contenido dinámico' es %s
+MainLanguage=Lenguaje principal
+OtherLanguages=Otros idiomas
+UseManifest=Proporcione un archivo manifest.json
+PublicAuthorAlias=Alias de autor público
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Los idiomas disponibles se definen en las propiedades del sitio web
+ReplacementDoneInXPages=Reemplazo realizado en páginas o contenedores %s
diff --git a/htdocs/langs/es_EC/withdrawals.lang b/htdocs/langs/es_EC/withdrawals.lang
new file mode 100644
index 00000000000..0b7b0147e43
--- /dev/null
+++ b/htdocs/langs/es_EC/withdrawals.lang
@@ -0,0 +1,100 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+CustomersStandingOrdersArea=Área de órdenes de pago por débito directo
+SuppliersStandingOrdersArea=Área de pedidos de pago directo de crédito
+StandingOrdersPayment=Ordenes de pago por débito directo
+StandingOrderPayment=Orden de pago por domiciliación bancaria
+NewStandingOrder=Nueva orden de domiciliación bancaria
+StandingOrderToProcess=Para procesar
+WithdrawalsReceipts=Pedidos de domiciliación bancaria
+WithdrawalReceipt=Orden de dèbito directo
+LastWithdrawalReceipts=Últimos archivos de débito directo %s
+WithdrawalsLines=Líneas de pedido de débito directo
+RequestStandingOrderToTreat=Solicitud de orden de pago por domiciliación bancaria para procesar
+RequestStandingOrderTreated=Solicitud de orden de pago por domiciliación procesada
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Todavía no es posible. El estado de retiro debe establecerse en "acreditado" antes de declarar el rechazo en líneas específicas.
+NbOfInvoiceToWithdraw=Nº de factura calificada con orden de domiciliación bancaria en espera.
+NbOfInvoiceToWithdrawWithInfo=Número de facturas de clientes con órdenes de pago de débito directo que tienen información de cuenta bancaria definida
+InvoiceWaitingWithdraw=Factura en espera de domiciliación bancaria
+AmountToWithdraw=Cantidad a retirar
+WithdrawsRefused=Deposito directo rechazado
+NoInvoiceToWithdraw=No hay factura de cliente con "solicitudes de débito directo" abierta. Vaya a la pestaña '%s' en la tarjeta de factura para hacer una solicitud.
+ResponsibleUser=Usuario responsable
+WithdrawalsSetup=Configuración de pago por débito directo
+WithdrawStatistics=Estadísticas de pago por débito directo
+WithdrawRejectStatistics=Estadísticas de rechazo de pagos por débito directo
+LastWithdrawalReceipt=Últimos recibos de débito directo %s
+MakeWithdrawRequest=Realizar una solicitud de pago por débito directo
+WithdrawRequestsDone=%s solicitudes de pago por débito directo registradas
+ThirdPartyBankCode=Código bancario de terceros
+NoInvoiceCouldBeWithdrawed=Ninguna factura debitada con éxito. Verifique que las facturas estén en compañías con un IBAN válido y que el IBAN tenga un UMR (referencia única de mandato) con el modo <strong>%s</strong>.
+ClassCredited=Clasificar acreditado
+ClassCreditedConfirm=¿Seguro que desea clasificar este recibo de retiro como acreditado en su cuenta bancaria?
+TransData=Fecha de transmisión
+TransMetod=Método de transmisión
+StandingOrderReject=Emitir un rechazo
+WithdrawalRefused=Retiro rechazado
+WithdrawalRefusedConfirm=¿Está seguro de que desea introducir un rechazo de retiro para la sociedad
+RefusedData=Fecha de rechazo
+RefusedReason=Motivo del rechazo
+RefusedInvoicing=Facturación del rechazo
+NoInvoiceRefused=No cargue el rechazo
+InvoiceRefused=Factura rechazada (Cargar el rechazo al cliente)
+StatusWaiting=Esperando
+StatusTrans=Enviado
+StatusCredited=Acreditado
+StatusRefused=Rechazado
+StatusMotif1=Fondos insuficientes
+StatusMotif2=Solicitud impugnada
+StatusMotif3=No hay orden de pago por domiciliación bancaria
+StatusMotif4=Órdenes de venta
+StatusMotif5=RIB inutilizable
+StatusMotif8=Otra razon
+CreateForSepaFRST=Crear archivo de débito directo (SEPA FRST)
+CreateForSepaRCUR=Crear archivo de débito directo (SEPA RCUR)
+CreateAll=Crear archivo de débito directo (todos)
+CreateBanque=Solo banco
+OrderWaiting=Esperando tratamiento
+NotifyTransmision=Transmisión de retirada
+NotifyCredit=Crédito por Retiro
+NumeroNationalEmetter=Número del Transmisor Nacional
+WithBankUsingRIB=Para cuentas bancarias utilizando RIB
+WithBankUsingBANBIC=Para cuentas bancarias utilizando IBAN/BIC/SWIFT
+BankToReceiveWithdraw=Cuenta bancaria receptora
+CreditDate=Crédito en
+WithdrawalFileNotCapable=No se puede generar el archivo de recibo de retiro para su país %s (su país no es compatible)
+ShowWithdraw=Mostrar orden de débito directo
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene al menos una orden de pago de débito directo aún no procesada, no se establecerá como pagada para permitir la gestión previa de retiros.
+DoStandingOrdersBeforePayments=Esta pestaña le permite solicitar una orden de pago por débito directo. Una vez hecho esto, vaya al menú de Banco-> órdenes de Débito Directo para administrar la orden de débito directo. Cuando se cierra la orden de pago, el pago en factura se registra automáticamente y la factura se cierra si el resto a pagar es nulo.
+WithdrawalFile=Archivo de retiro
+SetToStatusSent=Establecer en estado "Archivo enviado"
+ThisWillAlsoAddPaymentOnInvoice=Esto también registrará los pagos a facturas y los clasificará como "Pago" si permanecen a pagar es nulo
+StatisticsByLineStatus=Estadísticas por estado de las líneas
+RUMLong=Referencia única de mandato
+RUMWillBeGenerated=Si está vacío, se generará una UMR (referencia de mandato única) una vez que se guarde la información de la cuenta bancaria.
+WithdrawMode=Modo de débito directo (FRST o RECUR)
+WithdrawRequestAmount=Importe de la solicitud de domiciliación bancaria:
+WithdrawRequestErrorNilAmount=No se puede crear una solicitud de domiciliación bancaria por cantidad vacía.
+SepaMandate=Mandato de Débito Directo SEPA
+SepaMandateShort=Mandato de SEPA
+PleaseReturnMandate=Por favor devuelva este formulario de mandato por correo electrónico a %s o por correo a
+SEPALegalText=Al firmar este formulario de mandato, usted autoriza (A) %s a enviar instrucciones a su banco para débitar su cuenta y (B) a su banco a débitar su cuenta de acuerdo con las instrucciones de %s. Como parte de sus derechos, usted tiene derecho a un reembolso de su banco bajo los términos y condiciones de su acuerdo con su banco. El reembolso se debe reclamar dentro de 8 semanas a partir de la fecha en que su cuenta fue debitada. Sus derechos con respecto al mandato anterior se explican en una declaración que puede obtener de su banco.
+CreditorIdentifier=Identificador de acreedor
+CreditorName=Nombre del acreedor
+SEPAFillForm=(B) Por favor complete todos los campos marcados con *
+SEPAFormYourName=Tu nombre
+SEPAFormYourBAN=Su nombre de cuenta bancaria (IBAN)
+SEPAFormYourBIC=Su código de identificación bancaria (BIC)
+PleaseCheckOne=Por favor, marque uno solo
+DirectDebitOrderCreated=Orden de domiciliación %s creada
+CreateForSepa=Crear un archivo de débito directo
+END_TO_END=Etiqueta XML SEPA "EndToEndId": identificación única asignada por transacción
+USTRD=Etiqueta XML SEPA "no estructurada"
+ADDDAYS=Agregar días a la fecha de ejecución
+InfoCreditSubject=Pago de la orden de pago por débito directo %s por el banco
+InfoCreditMessage=La orden de pago por débito directo %s ha sido pagada por el banco<br>Datos de pago: %s
+InfoTransSubject=Transmisión de orden de pago por débito directo %s al banco
+InfoTransMessage=La orden de pago por débito directo %s ha sido enviada al banco por %s %s.<br><br>
+InfoTransData=Cantidad: %s <br> Método: %s<br>Fecha: %s
+InfoRejectSubject=Orden de pago por débito directo rechazada
+InfoRejectMessage=Hola, <br><br>la orden de pago por débito directo de la factura %s relacionada con la empresa %s, con una cantidad de %s ha sido rechazada por el banco. <br><br>--<br>%s
+ModeWarning=Opción para el modo real no se estableció, nos detenemos después de esta simulación
diff --git a/htdocs/langs/es_EC/workflow.lang b/htdocs/langs/es_EC/workflow.lang
new file mode 100644
index 00000000000..1ae33221454
--- /dev/null
+++ b/htdocs/langs/es_EC/workflow.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=Tamaño original
+ThereIsNoWorkflowToModify=No hay modificaciones de flujo de trabajo disponibles con los módulos activados.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear automáticamente un pedido de ventas después de firmar una propuesta comercial (el nuevo pedido tendrá la misma cantidad que la propuesta)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Cree automáticamente una factura de cliente después de que se firme una propuesta comercial (la nueva factura tendrá el mismo monto que la propuesta)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente después de validar un contrato
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente después de cerrar un pedido de ventas (la nueva factura tendrá el mismo importe que el pedido)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasifique la propuesta de origen vinculada como facturada cuando el pedido de ventas esté configurado como facturado (y si el monto del pedido es el mismo que el monto total de la propuesta vinculada firmada)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasifique la propuesta de origen vinculado como facturada cuando la factura del cliente se valida (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada firmada)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasifique el pedido de ventas de origen vinculado como facturado cuando se valida la factura del cliente (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasifique el pedido de ventas de origen vinculado como facturado cuando la factura del cliente se establece como pagada (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasifique el pedido de ventas de origen vinculado como enviado cuando se valida un envío (y si la cantidad enviada por todos los envíos es la misma que en el pedido para actualizar)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasifique la propuesta del proveedor de origen vinculado como facturada cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasifique la orden de compra de origen vinculado como facturada cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 909d0a3d874..e1bac9ea90f 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Líneas de facturas contabilizadas
 ExpenseReportLines=Líneas de informes de gastos a contabilizar
 ExpenseReportLinesDone=Líneas de informes de gastos contabilizadas
 IntoAccount=Contabilizar línea con la cuenta contable
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Contabilizar
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Cuenta contable para registrar donaciones
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Cuenta contable para registrar subscripciones
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta contable predeterminada para los productos comprados (si no se define en el producto)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cuenta contable predeterminada para los productos vendidos (si no se define en el producto)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Cuenta contable predeterminada para los productos vendidos en la CEE (si no se define en el producto)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Cuenta contable predeterminada para los productos vendidos fuera de la CEE (si no se define en el producto)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Cuenta contable predeterminada para los servicios comprados (si no se define en el servicio)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cuenta contable predeterminada para los servicios vendidos (si no se define en el servico)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Cuenta contable predeterminada para los servicios vendidos en la CEE (si no se define en el servico)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Cuenta contable predeterminada para los servicios vendidos fuera de la CEE (si no se define en el producto)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Tercero desconoci
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Cuenta del tercero desconocida o tercero desconocido. Error de bloqueo
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Cuenta del tercero desconocida y cuenta de espera no definida. Error de bloqueo
 PaymentsNotLinkedToProduct=Pagos no vinculados a un producto/servicio
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Grupo de cuenta
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total facturación antes de impuestos
 TotalMarge=Total margen ventas
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Exportar a Quadratus QuadraCompta
 Modelcsv_ebp=Exportar a EBP
 Modelcsv_cogilog=Eportar a Cogilog
 Modelcsv_agiris=Exportar a Agiris
-Modelcsv_LDCompta=Exportar para LD Compta (v9 y superior) (En pruebas)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Exportar a OpenConcerto (En pruebas)
 Modelcsv_configurable=Exportación CSV Configurable
 Modelcsv_FEC=Exportación FEC
 Modelcsv_Sage50_Swiss=Exportación a Sage 50 Suiza
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Id plan contable
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Modo ventas
 OptionModeProductSellIntra=Modo Ventas exportación CEE
 OptionModeProductSellExport=Modo ventas exportación otros paises
 OptionModeProductBuy=Modo compras
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Mostrar todos los productos con cuenta contable de ventas
 OptionModeProductSellIntraDesc=Mostrar todos los productos con cuenta contable para ventas en CEE.
 OptionModeProductSellExportDesc=Mostrar todos los productos con cuenta contable para otras ventas al exterior.
 OptionModeProductBuyDesc=Mostrar todos los productos con cuenta contable de compras
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Eliminar código contable de las líneas que no existen en el plan contable
 CleanHistory=Resetear todos los vínculos del año seleccionado
 PredefinedGroups=Grupos personalizados
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Cuenta eliminada del grupo
 SaleLocal=Venta local
 SaleExport=Venta de exportación
 SaleEEC=Venta en CEE
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Rango de cuenta contable
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index b334bd80e13..3256a1806f7 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Servidor web usuario/grupo
 NoSessionFound=Parece que su PHP no puede listar las sesiones activas. El directorio de salvaguardado de sesiones (<b>%s</b>) puede estar protegido (por ejemplo, por los permisos del sistema operativo o por la directiva open_basedir de su PHP).
 DBStoringCharset=Codificación de la base de datos para el almacenamiento de datos
 DBSortingCharset=Codificación de la base de datos para clasificar los datos
+HostCharset=Host charset
 ClientCharset=Juego de caracteres del cliente
 ClientSortingCharset=Colación de clientes
 WarningModuleNotActive=El módulo <b>%s</b> debe ser activado
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Casilla de verificación
 ExtrafieldCheckBoxFromList=Casilla de selección de tabla
 ExtrafieldLink=Objeto adjuntado
 ComputedFormula=Campo combinado
-ComputedFormulaDesc=Puede introducir aquí una fórmula utilizando otras propiedades de objeto o cualquier código PHP para obtener un valor calculado dinámico. Puede utilizar cualquier fórmula compatible con PHP, incluido el operador de condición "?" y los objetos globales siguientes: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>ATENCIÓN</strong>: Sólo algunas propiedades de $object pueden estar disponibles. Si necesita propiedades no cargadas, solo busque el objeto en su fórmula como en el segundo ejemplo. <br>Usando un campo computado significa que no puede ingresar ningún valor de la interfaz. Además, si hay un error de sintaxis, la fórmula puede devolver nada. <br><br>Ejemplo de fórmula: <br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br> Ejemlo de recarga de objeto<br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Otro ejemplo de fórmula para forzar la carga del objeto y su objeto principal:  <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Almacenar campo combinado
 ComputedpersistentDesc=Los campos adicionales calculados se almacenarán en la base de datos, sin embargo, el valor solo se volverá a calcular cuando se cambie el objeto de este campo. ¡Si el campo calculado depende de otros objetos o datos globales, este valor podría ser incorrecto!
 ExtrafieldParamHelpPassword=Mantener este campo vacío significa que el valor se almacenará sin cifrado (el campo permanecerá solo oculto con estrellas en la pantalla). <br>Establezca aquí el valor 'auto' para usar la regla de cifrado predeterminada para guardar la contraseña en la base de datos (entonces el valor leído será solo el hash, no hay forma de recuperar el valor original)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=El tipo de IRPF propuesto por defecto en las creaciones de
 LocalTax2IsNotUsedDescES=El tipo de IRPF propuesto por defecto es 0. Final de regla.
 LocalTax2IsUsedExampleES=En España, se trata de personas físicas: autónomos y profesionales independientes que prestan servicios y empresas que han elegido el régimen fiscal de módulos.
 LocalTax2IsNotUsedExampleES=En España, se trata de empresas no sujetas al régimen fiscal de módulos.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Informes de impuestos locales
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Reglas para generar y validar contraseñas.
 DisableForgetPasswordLinkOnLogonPage=No mostrar el vínculo "Contraseña olvidada" en la página de login
 UsersSetup=Configuración del módulo usuarios
 UserMailRequired=E-Mail necesario para crear un usuario nuevo
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Configuración del módulo Multi-empresa
 ##### Suppliers #####
 SuppliersSetup=Configuración del módulo de proveedores
 SuppliersCommandModel=Plantilla completa de Pedidos a proveedores
-SuppliersCommandModelMuscadet=Plantilla completa de la orden de compra 
+SuppliersCommandModelMuscadet=Plantilla completa de la orden de compra (implementación anterior de la plantilla de cornas)
 SuppliersInvoiceModel=Plantilla completa de Factura de proveedor
 SuppliersInvoiceNumberingModel=Modelos de numeración de facturas de proveedor
 IfSetToYesDontForgetPermission=Si se establece en un valor no nulo, no olvide proporcionar permisos a los grupos o usuarios permitidos para la segunda aprobación
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Ocultar imágenes en el Menú superior
 LeftMenuBackgroundColor=Color de fondo para el Menú izquierdo
 BackgroundTableTitleColor=Color de fondo para Tabla título línea
 BackgroundTableTitleTextColor=Color del texto para la línea de título de la tabla
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Color de fondo para líneas de tabla odd
 BackgroundTableLineEvenColor=Color de fondo para todas las líneas de tabl
 MinimumNoticePeriod=Período mínimo de notificación (Su solicitud de licencia debe hacerse antes de este período)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Referencia Dolibarr no encontrada en ID de mensaje
 FormatZip=Código postal
 MainMenuCode=Código de entrada del menú (menú principal)
 ECMAutoTree=Mostrar arbol automático GED
-OperationParamDesc=Defina valores para usar para la acción, o cómo extraer valores. Por ejemplo: <br> objproperty1=SET:abc<br>objproperty1=SET:un valor con reemplazo de __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4 =EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:el nombre de mi empresa es\\s([^\\s]*) <br><br>Utilizar el caracter  ; como separador para extraer o configurar varias propiedades.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Horario de apertura
 OpeningHoursDesc=Teclea el horario normal de apertura de tu compañía.
 ResourceSetup=Configuración del módulo Recursos
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index e482f089e54..0e13bb6e406 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=Nº de facturas por mes
 AmountOfBills=Importe de las facturas
 AmountOfBillsHT=Importe de las facturas (Sin IVA)
 AmountOfBillsByMonthHT=Importe de las facturas por mes (Sin IVA)
-ShowSocialContribution=Ver tasa social/fiscal
-ShowBill=Ver factura
-ShowInvoice=Ver factura
-ShowInvoiceReplace=Ver factura rectificativa
-ShowInvoiceAvoir=Ver abono
-ShowInvoiceDeposit=Ver factura de anticipo
-ShowInvoiceSituation=Ver situación factura
 UseSituationInvoices=Permitir factura de situación
 UseSituationInvoicesCreditNote=Permitir factura de situación de abono
 Retainedwarranty=Garantía retenida
@@ -233,7 +226,6 @@ setretainedwarranty=Definir garantía retenida
 setretainedwarrantyDateLimit=Definir fecha límite de garantía retenida
 RetainedWarrantyDateLimit=Fecha límite de garantía retenida
 RetainedWarrantyNeed100Percent=La factura de situación debe estar en el progreso 100%% para que se muestre en PDF
-ShowPayment=Ver pago
 AlreadyPaid=Ya pagado
 AlreadyPaidBack=Ya reembolsado
 AlreadyPaidNoCreditNotesNoDeposits=Ya pagado (excluidos los abonos y anticipos)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generado desde la plantilla de facturas recurrentes %s
 WarningInvoiceDateInFuture=Atención: la fecha de la factura es mayor que la fecha actual
 WarningInvoiceDateTooFarInFuture=Atención: la fecha de la factura es muy lejana a la fecha actual
 ViewAvailableGlobalDiscounts=Ver los descuentos disponibles
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Estado
 PaymentConditionShortRECEP=Acuse de recibo
@@ -444,7 +437,7 @@ PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Datos bancarios
 BankCode=Código banco
-DeskCode=Código de oficina
+DeskCode=Oficina
 BankAccountNumber=Número cuenta
 BankAccountNumberKey=DC
 Residence=Dirección
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=Esta opción solo está disponible al crear una factura desde la pestaña 'cliente' del tercero
 YouMustCreateInvoiceFromSupplierThird=Esta opción solo está disponible al crear una factura desde la pestaña 'proveedor' del tercero
 YouMustCreateStandardInvoiceFirstDesc=Tiene que crear una factura estandar antes de convertirla a "plantilla" para crear una nueva plantilla de factura
-PDFCrabeDescription=Factura PDF plantilla Crabe. Una plantilla de factura completa 
+PDFCrabeDescription=Factura PDF plantilla Crabe. Una plantilla de factura completa (antigua implementación de la plantilla Sponge)
 PDFSpongeDescription=Modelo de factura Esponja. Una plantilla de factura completa.
 PDFCrevetteDescription=Modelo PDF de factura Crevette. Un completo modelo de facturas de situación
 TerreNumRefModelDesc1=Devuelve el número bajo el formato %syymm-nnnn para las facturas, %syymm-nnnn para las facturas rectificativas y %syymm-nnnn para los abonos donde yy es el año, mm. el mes y nnnn un contador secuencial sin ruptura y sin permanencia a 0
diff --git a/htdocs/langs/es_ES/modulebuilder.lang b/htdocs/langs/es_ES/modulebuilder.lang
index 5ce907dcc4f..53e0ce43f50 100644
--- a/htdocs/langs/es_ES/modulebuilder.lang
+++ b/htdocs/langs/es_ES/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=Listado de entradas de diccionarios
 ListOfPermissionsDefined=Listado de permisos definidos
 SeeExamples=Vea ejemplos aquí
 EnabledDesc=Condición para tener este campo activo (Ejemplos: 1 o $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=¿El campo es visible? (Ejemplos: 0=Nunca visible, 1=Visible en la lista y en formularios de creación/actualización/visualización, 2=Visible únicamente en la lista, 3=Visible únicamente en formularios de creación/actualización/visualización (no en la lista),4=Visible en la lista y en formularios únicamente de actualización/visualización (no en creación),5=Visible en la lista y en formularios únicamente de visualización (ni en creación ni en actualización). Usar un valor negativo significa que por defecto no se muestra el campo en la lista pero puede ser seleccionado para su visualización) Puede ser una expresión, por ejemplo: <br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=¿Se puede acumular el valor del campo para obtener un total en el listado? (Ejemplos: 1 o 0)
 SearchAllDesc=¿El campo se usa para realizar una búsqueda desde la herramienta de búsqueda rápida? (Ejemplos: 1 o 0)
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 89bfa4e3b90..763e2b2cb06 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Servicio a utilizar en lineas.
 InvoiceGeneratedFromTimeSpent=Se ha generado la factura %s a partir del tiempo empleado en el proyecto
 ProjectBillTimeDescription=Verifique si ingresa la hoja de horas trabajadas en las tareas del proyecto y planea generar factura(s) a partir de la hoja para facturar al cliente del proyecto (no lo verifique si planea crear una factura que no se base en las hojas de horas trabajadas ingresadas). Nota: Para generar la factura, vaya a la pestaña 'Tiempo empleado' del proyecto y seleccione las líneas a incluir.
 ProjectFollowOpportunity=Seguir oportunidad
-ProjectFollowTasks=Seguir tareas
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Uso: Oportunidad
 UsageTasks=Uso: Tareas
diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang
index f0b7e73215f..b76d1c83cf6 100644
--- a/htdocs/langs/es_ES/website.lang
+++ b/htdocs/langs/es_ES/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No hay páginas todavía
 YouCanCreatePageOrImportTemplate=Puede crear una nueva página o importar una plantilla de sitio web completa
 SyntaxHelp=Ayuda en la sintaxis del código
 YouCanEditHtmlSourceckeditor=Puede editar código fuente HTML utilizando el botón "Origen" en el editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Puede incluir código PHP en esta fuente usando las etiquetas <strong>&lt;? Php?&gt;</strong> . Las siguientes variables globales están disponibles: $ conf, $ db, $ mysoc, $ user, $ website, $ websitepage, $ weblangs. <br><br><span class="fa fa-bug"></span> También puede incluir contenido de otra página / contenedor con la siguiente sintaxis: <br> <strong>&lt;? php includeContainer ('alias_of_container_to_include'); ?&gt;</strong> <br><br><span class="fa fa-bug"></span> Puede hacer una redirección a otra página / contenedor con la siguiente sintaxis (Nota: no envíe ningún contenido antes de una redirección): <br> <strong>&lt;? php redirectToContainer ('alias_of_container_to_redirect_to'); ?&gt;</strong> <br><br><span class="fa fa-link"></span> Para agregar un enlace a otra página, use la sintaxis: <br> <strong>&lt;a href=&quot;alias_of_page_to_link_to.php&quot;&gt; mylink &lt;a&gt;</strong> <br><br><span class="fa fa-download"></span> Para incluir un <strong>enlace para descargar</strong> un archivo almacenado en el directorio de <strong>documentos</strong> , use el contenedor <strong>document.php</strong> : <br> Ejemplo, para un archivo en documentos / ecm (debe registrarse), la sintaxis es: <br> <strong>&lt;a href=&quot;/document.php?modulepart=ecm&amp;file=[relative_dir/font&gt;filename.ext&quot;&gt;</strong> <br> Para un archivo en documentos / medios (directorio abierto para acceso público), la sintaxis es: <br> <strong>&lt;a href=&quot;/document.php?modulepart=medias&amp;file=[relative_dir/font&gt;filename.ext&quot;&gt;</strong> <br> Para un archivo compartido con un enlace compartido (acceso abierto utilizando la clave hash para compartir archivos), la sintaxis es: <br> <strong>&lt;a href=&quot;/document.php?hashp=publicsharekeyoffile&quot;&gt;</strong> <br><br><span class="fa fa-picture-o"></span> Para incluir una <strong>imagen</strong> almacenada en el directorio de <strong>documentos</strong> , use el contenedor <strong>viewimage.php</strong> : <br> Ejemplo, para una imagen en documentos / medios (directorio abierto para acceso público), la sintaxis es: <br> <strong>&lt;img src = &quot;/ viewimage.php? modulepart = medias &amp; file = [relative_dir /] filename.ext&quot;&gt;</strong> <br><br> Más ejemplos de HTML o código dinámico disponibles en <a href="%s" target="_blank">la documentación wiki</a> <br> .
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clonar página/contenedor
 CloneSite=Clonar sitio
 SiteAdded=Sitio web agregado
@@ -77,7 +77,7 @@ BlogPost=Entrada en el blog
 WebsiteAccount=Cuenta del sitio web
 WebsiteAccounts=Cuentas del sitio web
 AddWebsiteAccount=Crear cuenta de sitio web
-BackToListOfThirdParty=Volver a la lista de Terceros
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Deshabilite primero el sitio web
 MyContainerTitle=Título de mi sitio web
 AnotherContainer=Así es como se incluye el contenido de otra página/contenedor (puede tener un error aquí si habilita el código dinámico porque el subcontenedor incrustado puede no existir)
diff --git a/htdocs/langs/es_GT/accountancy.lang b/htdocs/langs/es_GT/accountancy.lang
new file mode 100644
index 00000000000..9827b9d3795
--- /dev/null
+++ b/htdocs/langs/es_GT/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
diff --git a/htdocs/langs/es_GT/admin.lang b/htdocs/langs/es_GT/admin.lang
new file mode 100644
index 00000000000..27c312f77d7
--- /dev/null
+++ b/htdocs/langs/es_GT/admin.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - admin
+MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+Module56Name=Telephony
+Module56Desc=Telephony integration
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_GT/companies.lang b/htdocs/langs/es_GT/companies.lang
new file mode 100644
index 00000000000..6897cf22f06
--- /dev/null
+++ b/htdocs/langs/es_GT/companies.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - companies
+Contact=Contact
diff --git a/htdocs/langs/es_GT/main.lang b/htdocs/langs/es_GT/main.lang
new file mode 100644
index 00000000000..2e691473326
--- /dev/null
+++ b/htdocs/langs/es_GT/main.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
diff --git a/htdocs/langs/es_GT/modulebuilder.lang b/htdocs/langs/es_GT/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/es_GT/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/es_GT/projects.lang b/htdocs/langs/es_GT/projects.lang
new file mode 100644
index 00000000000..7e42793b0e9
--- /dev/null
+++ b/htdocs/langs/es_GT/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
diff --git a/htdocs/langs/es_HN/accountancy.lang b/htdocs/langs/es_HN/accountancy.lang
new file mode 100644
index 00000000000..9827b9d3795
--- /dev/null
+++ b/htdocs/langs/es_HN/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
diff --git a/htdocs/langs/es_HN/admin.lang b/htdocs/langs/es_HN/admin.lang
new file mode 100644
index 00000000000..27c312f77d7
--- /dev/null
+++ b/htdocs/langs/es_HN/admin.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - admin
+MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+Module56Name=Telephony
+Module56Desc=Telephony integration
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_HN/companies.lang b/htdocs/langs/es_HN/companies.lang
new file mode 100644
index 00000000000..6897cf22f06
--- /dev/null
+++ b/htdocs/langs/es_HN/companies.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - companies
+Contact=Contact
diff --git a/htdocs/langs/es_HN/modulebuilder.lang b/htdocs/langs/es_HN/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/es_HN/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/es_HN/projects.lang b/htdocs/langs/es_HN/projects.lang
new file mode 100644
index 00000000000..7e42793b0e9
--- /dev/null
+++ b/htdocs/langs/es_HN/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
diff --git a/htdocs/langs/es_MX/agenda.lang b/htdocs/langs/es_MX/agenda.lang
index d4917197047..aa8f360dcfd 100644
--- a/htdocs/langs/es_MX/agenda.lang
+++ b/htdocs/langs/es_MX/agenda.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - agenda
 ActionsOwnedBy=Evento propiedad de
-AffectedTo=Asignado a
 Event=Evento
 ListOfActions=Lista de eventos
 ToUserOfGroup=A cualquier usuario del grupo
diff --git a/htdocs/langs/es_MX/boxes.lang b/htdocs/langs/es_MX/boxes.lang
new file mode 100644
index 00000000000..4ca95308953
--- /dev/null
+++ b/htdocs/langs/es_MX/boxes.lang
@@ -0,0 +1,13 @@
+# Dolibarr language file - Source file is en_US - boxes
+BoxLoginInformation=Información de Login
+BoxLastRssInfos=Información RSS
+BoxLastProducts=Últimos %s Productos/Servicios
+BoxLastSupplierBills=Últimas facturas de proveedor
+BoxLastCustomerBills=Últimas facturas de clientes
+BoxOldestUnpaidCustomerBills=Facturas de clientes sin pagar más antiguas
+BoxOldestUnpaidSupplierBills=Facturas de proveedores sin pagar más antiguas
+BoxLastProposals=Últimas propuestas comerciales
+BoxLastCustomerOrders=Últimos pedidos de venta
+BoxCurrentAccounts=Saldo de cuentas abiertas
+BoxTitleLastModifiedPropals=Últimas %s cotizaciones modificadas
+ForProposals=Propuestas
diff --git a/htdocs/langs/es_MX/errors.lang b/htdocs/langs/es_MX/errors.lang
new file mode 100644
index 00000000000..a1307643505
--- /dev/null
+++ b/htdocs/langs/es_MX/errors.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - errors
+ErrorSubjectIsRequired=El tema del correo electrónico es obligatorio
+ErrorFieldAccountNotDefinedForLine=Valor para la cuenta contable no definido para la línea (%s)
+ErrorTooManyErrorsProcessStopped=Demasiados errores. Se detuvo el proceso.
diff --git a/htdocs/langs/es_MX/externalsite.lang b/htdocs/langs/es_MX/externalsite.lang
new file mode 100644
index 00000000000..0576f5b0be1
--- /dev/null
+++ b/htdocs/langs/es_MX/externalsite.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExternalSiteSetup=Configurar vínculo a un sitio web externo
+ExternalSiteModuleNotComplete=El módulo ExternalSite no estaba configurado correctamente.
+ExampleMyMenuEntry=Mi entrada en el menú
diff --git a/htdocs/langs/es_MX/ftp.lang b/htdocs/langs/es_MX/ftp.lang
new file mode 100644
index 00000000000..68ba0a1ab91
--- /dev/null
+++ b/htdocs/langs/es_MX/ftp.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - ftp
+FTPClientSetup=Configuración del módulo Cliente FTP
+NewFTPClient=Configuración de nueva conexión FTP
+FTPAreaDesc=Esta pantalla muestra una vista de un servidor FTP
+SetupOfFTPClientModuleNotComplete=La configuración del módulo Cliente FTP parece estar incompleta
+FailedToConnectToFTPServer=Error al conectarse al servidor FTP (servidor %s, puerto %s)
+FailedToConnectToFTPServerWithCredentials=Error al iniciar sesión en el servidor FTP con el login/password definidos
+FTPFailedToRemoveFile=Error al eliminar el archivo <b> %s </b>.
+FTPFailedToRemoveDir=Error al eliminar el directorio <b> %s </b>: verifique los permisos y que el directorio esté vacío.
+ChooseAFTPEntryIntoMenu=Elija un sitio FTP del menú...
+FailedToGetFile=Error al obtener archivos %s
diff --git a/htdocs/langs/es_MX/interventions.lang b/htdocs/langs/es_MX/interventions.lang
new file mode 100644
index 00000000000..38725ecbb96
--- /dev/null
+++ b/htdocs/langs/es_MX/interventions.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - interventions
+StatusInterInvoiced=Facturada
diff --git a/htdocs/langs/es_MX/link.lang b/htdocs/langs/es_MX/link.lang
new file mode 100644
index 00000000000..b97dcbc1a69
--- /dev/null
+++ b/htdocs/langs/es_MX/link.lang
@@ -0,0 +1,10 @@
+# Dolibarr language file - Source file is en_US - link
+LinkANewFile=Vincular un nuevo archivo / documento
+LinkedFiles=Archivos enlazados y documentos
+NoLinkFound=No hay enlaces registrados
+LinkComplete=El archivo se ha vinculado correctamente
+ErrorFileNotLinked=No se pudo vincular el archivo.
+LinkRemoved=Se ha eliminado el enlace %s
+ErrorFailedToDeleteLink=No se pudo eliminar el vínculo '<b> %s </b>'
+ErrorFailedToUpdateLink=Error al actualizar el vínculo '<b> %s </b>'
+URLToLink=URL para vincular
diff --git a/htdocs/langs/es_MX/mails.lang b/htdocs/langs/es_MX/mails.lang
new file mode 100644
index 00000000000..9846afc3bbb
--- /dev/null
+++ b/htdocs/langs/es_MX/mails.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - mails
+MailMessage=Cuerpo del correo electronico
diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
index 16bf9b6bbec..257b51e4abb 100644
--- a/htdocs/langs/es_MX/main.lang
+++ b/htdocs/langs/es_MX/main.lang
@@ -85,7 +85,6 @@ DefaultValue=Valor predeterminado
 PriceUTTC=P.U. (IVA incl.)
 AmountInvoice=Importe de la factura
 AmountPayment=Importe de pago
-MulticurrencyPaymentAmount=Monto del pago, moneda original
 AmountLT1=Importe impuestos 2
 AmountLT2=Importe impuestos 3
 AmountAverage=Importe promedio
diff --git a/htdocs/langs/es_MX/modulebuilder.lang b/htdocs/langs/es_MX/modulebuilder.lang
new file mode 100644
index 00000000000..d2e2992eac2
--- /dev/null
+++ b/htdocs/langs/es_MX/modulebuilder.lang
@@ -0,0 +1,12 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ObjectKey=Clave de objeto
+ModuleBuilderDeschooks=Esta pestaña está dedicada a los ganchos.
+ModuleBuilderDescwidgets=Esta pestaña está dedicada a administrar / crear widgets.
+BuildDocumentation=Crear documentación
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
+DescriptorFile=Archivo descriptor del módulo
+ApiClassFile=Archivo para la clase API de PHP
+PageForList=Página PHP para la lista de registro
+PathToModulePackage=Ruta del módulo/aplicación zip
+SpaceOrSpecialCharAreNotAllowed=No se permiten espacios ni caracteres especiales.
+FileNotYetGenerated=Archivo aún no generado
diff --git a/htdocs/langs/es_MX/multicurrency.lang b/htdocs/langs/es_MX/multicurrency.lang
new file mode 100644
index 00000000000..f4741d43a4f
--- /dev/null
+++ b/htdocs/langs/es_MX/multicurrency.lang
@@ -0,0 +1,18 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Divisas múltiples
+ErrorAddRateFail=Error en la tasa agregada
+ErrorAddCurrencyFail=Error en la divisa añadida
+ErrorDeleteCurrencyFail=Error en la eliminación
+multicurrency_syncronize_error=Error de sincronización: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use la fecha del documento para encontrar la tasa de cambio, en lugar de usar la última tasa conocida
+multicurrency_useOriginTx=Cuando se crea un objeto a partir de otro, mantenga la tasa original del objeto fuente (de lo contrario, use la tasa conocida más reciente)
+CurrencyLayerAccount=API de CurrencyLayer
+CurrencyLayerAccount_help_to_synchronize=Debe crear una cuenta en el sitio web %s para usar esta funcionalidad. <br> Obtenga su clave API <b> </b>. <br> Si usa una cuenta gratuita, no puede cambiar la moneda de origen <b> </b> (USD por defecto). <br> Si su moneda principal no es USD, la aplicación lo recalculará automáticamente. <br> <br> Está limitado a 1000 sincronizaciones por mes.
+multicurrency_appCurrencySource=Divisa de origen
+multicurrency_alternateCurrencySource=Divisa de origen alternativa
+CurrenciesUsed=Divisas utilizadas
+CurrenciesUsed_help_to_add=Agregue las diferentes divisas y tasas que necesita usar en sus propuestas <b> </b>, <b> pedidos </b> etc.
+MulticurrencyReceived=Recibido, divisa original
+MulticurrencyRemainderToTake=Importe restante, divisa original
+MulticurrencyPaymentAmount=Monto del pago, divisa original
+AmountToOthercurrency=Importe para (en la divisa de la cuenta receptora)
diff --git a/htdocs/langs/es_MX/oauth.lang b/htdocs/langs/es_MX/oauth.lang
new file mode 100644
index 00000000000..922201394e7
--- /dev/null
+++ b/htdocs/langs/es_MX/oauth.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - oauth
+ConfigOAuth=Configuración de OAuth
+OAuthServices=Servicios de OAuth
+ManualTokenGeneration=Generación manual de tokens
+TokenManager=Administrador de tokens
+IsTokenGenerated=¿Se generó el token?
+NoAccessToken=Ningún token de acceso guardado en la base de datos local
+HasAccessToken=Se generó un token y se guardó en la base de datos local.
+ToCheckDeleteTokenOnProvider=Haga clic aquí para verificar / eliminar la autorización guardada por el proveedor de OAuth %s
+RequestAccess=Haga clic aquí para solicitar / renovar el acceso y recibir un nuevo token para guardar
+UseTheFollowingUrlAsRedirectURI=Use la siguiente URL como URI de redireccionamiento al crear sus credenciales con su proveedor de OAuth:
+ListOfSupportedOauthProviders=Ingrese las credenciales proporcionadas por su proveedor de OAuth2. Aquí solo se enumeran los proveedores de OAuth2 compatibles. Estos servicios pueden ser utilizados por otros módulos que necesitan autenticación OAuth2.
+SeePreviousTab=Ver pestaña anterior
+OAuthIDSecret=ID OAuth y Secret
+TOKEN_EXPIRED=Token caducado
+TOKEN_EXPIRE_AT=El token caduca a las
+OAUTH_GOOGLE_NAME=Servicio de Google OAuth
+OAUTH_GOOGLE_ID=ID de Google OAuth
+OAUTH_GOOGLE_DESC=Vaya a <a class="notasortlink" href="https://console.developers.google.com/" target="_blank"> esta página </a> y luego a "Credenciales" para crear credenciales de OAuth
+OAUTH_GITHUB_NAME=Servicio OAuth GitHub
+OAUTH_GITHUB_ID=Id OAuth GitHub
+OAUTH_GITHUB_DESC=Vaya a <a class="notasortlink" href="https://github.com/settings/developers" target="_blank"> esta página </a> y luego "Registre una nueva aplicación" para crear credenciales de OAuth
diff --git a/htdocs/langs/es_MX/products.lang b/htdocs/langs/es_MX/products.lang
index c1c5cf61af4..8ade985e293 100644
--- a/htdocs/langs/es_MX/products.lang
+++ b/htdocs/langs/es_MX/products.lang
@@ -2,7 +2,6 @@
 ProductId=ID de producto / servicio
 CantBeLessThanMinPrice=El precio de venta no puede ser inferior al mínimo permitido para este producto (%s sin impuestos). Este mensaje también puede aparecer si escribe un descuento demasiado importante.
 ErrorProductBadRefOrLabel=Valor incorrecto para referencia o etiqueta.
-Suppliers=Vendedores
 ProductsAndServicesArea=Área de productos y servicios
 ProductsArea=Área de producto
 SetDefaultBarcodeType=Establecer el tipo de código de barras
diff --git a/htdocs/langs/es_MX/projects.lang b/htdocs/langs/es_MX/projects.lang
new file mode 100644
index 00000000000..6131522fb16
--- /dev/null
+++ b/htdocs/langs/es_MX/projects.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - projects
+AddHereTimeSpentForDay=Añadir aquí el tiempo dedicado a este día / tarea
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
+OppStatusPROPO=Cotización
diff --git a/htdocs/langs/es_MX/receiptprinter.lang b/htdocs/langs/es_MX/receiptprinter.lang
new file mode 100644
index 00000000000..e1f2f09db2f
--- /dev/null
+++ b/htdocs/langs/es_MX/receiptprinter.lang
@@ -0,0 +1,19 @@
+# Dolibarr language file - Source file is en_US - receiptprinter
+TestSentToPrinter=Prueba enviada a la impresora %s
+ReceiptPrinterDesc=Configuración de impresoras de recibos
+CONNECTOR_DUMMY=Impresora ficticia
+CONNECTOR_FILE_PRINT=Impresora local
+CONNECTOR_DUMMY_HELP=Impresora falsa para la prueba, no hace nada
+CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x: 9100
+CONNECTOR_FILE_PRINT_HELP=/dev/usb /lp0, /dev/ usb/lp1
+CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser: secret@computername/grupo de trabajo/ impresoraderecibos
+DOL_ALIGN_LEFT=Alinea el texto a la izquierda
+DOL_ALIGN_CENTER=Texto del centro
+DOL_ALIGN_RIGHT=Alinea el texto a la derecha
+DOL_USE_FONT_C=Utilizar la fuente C de la impresora
+DOL_PRINT_BARCODE=Imprimir código de barras
+DOL_PRINT_BARCODE_CUSTOMER_ID=Imprimir ID de cliente de código de barras
+DOL_CUT_PAPER_FULL=Cortar ticket por completo
+DOL_CUT_PAPER_PARTIAL=Cortar el ticket parcialmente
+DOL_OPEN_DRAWER=Abrir cajón de efectivo
+DOL_ACTIVATE_BUZZER=Activar zumbador
diff --git a/htdocs/langs/es_MX/salaries.lang b/htdocs/langs/es_MX/salaries.lang
new file mode 100644
index 00000000000..67866c1d344
--- /dev/null
+++ b/htdocs/langs/es_MX/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+THM=Tasa promedio por hora
+TJM=Tasa diaria promedio
diff --git a/htdocs/langs/es_MX/suppliers.lang b/htdocs/langs/es_MX/suppliers.lang
new file mode 100644
index 00000000000..f0609ce1413
--- /dev/null
+++ b/htdocs/langs/es_MX/suppliers.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - suppliers
+Suppliers=Vendedores
diff --git a/htdocs/langs/es_MX/website.lang b/htdocs/langs/es_MX/website.lang
new file mode 100644
index 00000000000..c290dfeb729
--- /dev/null
+++ b/htdocs/langs/es_MX/website.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - website
+HomePage=Página Principal
+NoPageYet=Sin páginas aun
+GrabImagesInto=Insertar también las imágenes encontradas en CSS y página.
diff --git a/htdocs/langs/es_MX/workflow.lang b/htdocs/langs/es_MX/workflow.lang
new file mode 100644
index 00000000000..7993a64d096
--- /dev/null
+++ b/htdocs/langs/es_MX/workflow.lang
@@ -0,0 +1,15 @@
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=Configuración del módulo de flujo de trabajo
+WorkflowDesc=Este módulo proporciona algunas acciones automáticas. De manera predeterminada, el flujo de trabajo está abierto (puede hacer las cosas en el orden que desee) pero aquí puede activar algunas acciones automáticas.
+ThereIsNoWorkflowToModify=No hay modificaciones de flujo de trabajo disponibles con los módulos activados.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear automáticamente un pedido de ventas después de firmar una propuesta comercial (el nuevo pedido tendrá el mismo importe que la propuesta)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente después de firmar una propuesta comercial (la nueva factura tendrá el mismo importe que la propuesta)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente después de validar un contrato
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente después de cerrar un pedido de ventas (la nueva factura tendrá el mismo importe que el pedido)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasifique la propuesta de origen vinculada como facturada cuando el pedido de ventas esté configurado como facturado (y si el monto del pedido es el mismo que el monto total de la propuesta vinculada firmada)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasifique la propuesta de origen vinculada como facturada cuando se valida la factura del cliente (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada firmada)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasifique el pedido de ventas de origen vinculado como facturado cuando se valida la factura del cliente (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasifique el pedido de ventas de origen vinculado como facturado cuando la factura del cliente se establece como pagada (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasifique el pedido de ventas de origen vinculado como enviado cuando se valida un envío (y si la cantidad enviada por todos los envíos es la misma que en el pedido para actualizar)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasifique la propuesta del proveedor de origen vinculado como facturada cuando se valide la factura del proveedor (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasifique el pedido de compra de origen vinculado como facturado cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
diff --git a/htdocs/langs/es_MX/zapier.lang b/htdocs/langs/es_MX/zapier.lang
new file mode 100644
index 00000000000..191720d465a
--- /dev/null
+++ b/htdocs/langs/es_MX/zapier.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - zapier
+ModuleZapierForDolibarrDesc =Módulo Zapier para Dolibarr
diff --git a/htdocs/langs/es_PA/accountancy.lang b/htdocs/langs/es_PA/accountancy.lang
new file mode 100644
index 00000000000..9827b9d3795
--- /dev/null
+++ b/htdocs/langs/es_PA/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
diff --git a/htdocs/langs/es_PA/companies.lang b/htdocs/langs/es_PA/companies.lang
new file mode 100644
index 00000000000..6897cf22f06
--- /dev/null
+++ b/htdocs/langs/es_PA/companies.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - companies
+Contact=Contact
diff --git a/htdocs/langs/es_PA/modulebuilder.lang b/htdocs/langs/es_PA/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/es_PA/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/es_PA/projects.lang b/htdocs/langs/es_PA/projects.lang
new file mode 100644
index 00000000000..7e42793b0e9
--- /dev/null
+++ b/htdocs/langs/es_PA/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
diff --git a/htdocs/langs/es_PE/agenda.lang b/htdocs/langs/es_PE/agenda.lang
new file mode 100644
index 00000000000..689bffa0fdf
--- /dev/null
+++ b/htdocs/langs/es_PE/agenda.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - agenda
+ListOfActions=Lista de eventos
diff --git a/htdocs/langs/es_PE/assets.lang b/htdocs/langs/es_PE/assets.lang
new file mode 100644
index 00000000000..7eee01f4abb
--- /dev/null
+++ b/htdocs/langs/es_PE/assets.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - assets
+DeleteType=Borrar
diff --git a/htdocs/langs/es_PE/banks.lang b/htdocs/langs/es_PE/banks.lang
new file mode 100644
index 00000000000..68b1fdb8954
--- /dev/null
+++ b/htdocs/langs/es_PE/banks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - banks
+StatusAccountOpened=Abrir
+StatusAccountClosed=Cerrado
diff --git a/htdocs/langs/es_PE/bookmarks.lang b/htdocs/langs/es_PE/bookmarks.lang
new file mode 100644
index 00000000000..fa33f8df135
--- /dev/null
+++ b/htdocs/langs/es_PE/bookmarks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - bookmarks
+AddThisPageToBookmarks=Agregar página actual a marcadores
diff --git a/htdocs/langs/es_PE/cashdesk.lang b/htdocs/langs/es_PE/cashdesk.lang
new file mode 100644
index 00000000000..2486b6f71de
--- /dev/null
+++ b/htdocs/langs/es_PE/cashdesk.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+CashDeskMenu=Punto de venta
+CashDesk=Punto de venta
diff --git a/htdocs/langs/es_PE/commercial.lang b/htdocs/langs/es_PE/commercial.lang
new file mode 100644
index 00000000000..6fcebccd4b3
--- /dev/null
+++ b/htdocs/langs/es_PE/commercial.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - commercial
+ActionAC_CLO=Cerrado
diff --git a/htdocs/langs/es_PE/cron.lang b/htdocs/langs/es_PE/cron.lang
new file mode 100644
index 00000000000..96e3d29ed2c
--- /dev/null
+++ b/htdocs/langs/es_PE/cron.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - cron
+CronStatusActiveBtn=Activado
+CronStatusInactiveBtn=Inhabilitar
diff --git a/htdocs/langs/es_PE/donations.lang b/htdocs/langs/es_PE/donations.lang
new file mode 100644
index 00000000000..53d835a8a1c
--- /dev/null
+++ b/htdocs/langs/es_PE/donations.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - donations
+DonationStatusPromiseNotValidatedShort=Borrador
+DonationStatusPaidShort=Recibido
diff --git a/htdocs/langs/es_PE/externalsite.lang b/htdocs/langs/es_PE/externalsite.lang
new file mode 100644
index 00000000000..5250a01cd56
--- /dev/null
+++ b/htdocs/langs/es_PE/externalsite.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExternalSiteSetup=Configurar enlace al sitio web externo
+ExternalSiteModuleNotComplete=El modulo Sitio Web Externo no esta configurado apropiadamente
+ExampleMyMenuEntry=Mi entrada al menú
diff --git a/htdocs/langs/es_PE/help.lang b/htdocs/langs/es_PE/help.lang
new file mode 100644
index 00000000000..47e4527dd88
--- /dev/null
+++ b/htdocs/langs/es_PE/help.lang
@@ -0,0 +1,20 @@
+# Dolibarr language file - Source file is en_US - help
+CommunitySupport=Foro / Soporte Wiki
+EMailSupport=Soporte de correos electrónicos.
+RemoteControlSupport=En linea, tiempo real / Soporte remoto
+OtherSupport=Otro Soporte
+ToSeeListOfAvailableRessources=Para contacto / ver fuentes disponibles
+HelpCenter=Centro de ayuda
+DolibarrHelpCenter=Dolibarr Ayuda y Centro de Soporte
+ToGoBackToDolibarr=De otra manera, <a href="%s">click aquí para continuar usando Dolibarr </a>.
+TypeSupportCommunauty=Comunidad (libre)
+NeedHelpCenter=Necesita ayuda o soporte?
+Efficiency=Eficiencia
+TypeHelpOnly=Solo ayuda
+TypeHelpDev=Ayudar+Desarrollar
+TypeHelpDevForm=Ayuda+Desarrollo+Entrenamiento
+BackToHelpCenter=De otra manera, <a href="%s">volver al centro de ayuda de la página principal </a>.
+LinkToGoldMember=Puede llamar a uno de los entrenadores preseleccionados por Dolibarr para su idioma (%s) haciendo clic en su Widget (estado y precio máximo son actualizados automáticamente):
+PossibleLanguages=Idiomas soportados
+SubscribeToFoundation=Ayuda al proyecto Dolibarr, suscríbete a la fundación
+SeeOfficalSupport=Para el soporte oficial de Dolibarr en su idioma: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/es_PE/holiday.lang b/htdocs/langs/es_PE/holiday.lang
new file mode 100644
index 00000000000..d1993b0f33b
--- /dev/null
+++ b/htdocs/langs/es_PE/holiday.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - holiday
+EditCP=Editar
+DeleteCP=Borrar
+ActionCancelCP=Cancelar
diff --git a/htdocs/langs/es_PE/interventions.lang b/htdocs/langs/es_PE/interventions.lang
new file mode 100644
index 00000000000..71789345f39
--- /dev/null
+++ b/htdocs/langs/es_PE/interventions.lang
@@ -0,0 +1,9 @@
+# Dolibarr language file - Source file is en_US - interventions
+InterventionCard=Ficha de intervención
+NewIntervention=Nueva intervención
+ChangeIntoRepeatableIntervention=Cambiar a intervención frecuente
+ActionsOnFicheInter=Acciones sobre la intervención
+LastInterventions=Últimas %sintervenciones
+InterventionContact=Contacto de intervención
+DeleteIntervention=Borrar intervención
+InterDuration=Duración de intervención
diff --git a/htdocs/langs/es_PE/mails.lang b/htdocs/langs/es_PE/mails.lang
new file mode 100644
index 00000000000..89f3524e991
--- /dev/null
+++ b/htdocs/langs/es_PE/mails.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - mails
+MailingStatusRead=Leer
diff --git a/htdocs/langs/es_PE/main.lang b/htdocs/langs/es_PE/main.lang
index f6216220edc..ecb8bb29791 100644
--- a/htdocs/langs/es_PE/main.lang
+++ b/htdocs/langs/es_PE/main.lang
@@ -43,7 +43,6 @@ SearchOf=Buscar
 ReOpen=Re-Abrir
 Upload=Subir
 AmountVAT=Importe impuesto
-MulticurrencyPaymentAmount=Monto pagado, moneda original
 MulticurrencyAmountVAT=Importe impuesto, moneda original
 TotalVAT=Total impuesto
 TTC=IGV incluido
diff --git a/htdocs/langs/es_PE/margins.lang b/htdocs/langs/es_PE/margins.lang
new file mode 100644
index 00000000000..2a8cac5af8b
--- /dev/null
+++ b/htdocs/langs/es_PE/margins.lang
@@ -0,0 +1,13 @@
+# Dolibarr language file - Source file is en_US - margins
+MarginRate=Ratio de margen
+DisplayMarginRates=Mostrar ratios de margen
+InputPrice=Precio de entrada
+UserMargins=Margenes de usuario
+ProductService=Producto o Servicio
+AllProducts=Todos los Productos y Servicios
+ChooseProduct/Service=Escoge producto o servicio
+UseDiscountOnTotal=En subtotal
+CostPrice=Precio de costo
+UnitCharges=Cargos unitarios
+Charges=Cargos
+CheckMargins=Detalles de los márgenes
diff --git a/htdocs/langs/es_PE/modulebuilder.lang b/htdocs/langs/es_PE/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/es_PE/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/es_PE/multicurrency.lang b/htdocs/langs/es_PE/multicurrency.lang
new file mode 100644
index 00000000000..99cd1a14d95
--- /dev/null
+++ b/htdocs/langs/es_PE/multicurrency.lang
@@ -0,0 +1,20 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multimoneda
+ErrorAddRateFail=Error al añadir el tipo
+ErrorAddCurrencyFail=Error al añadir la moneda
+ErrorDeleteCurrencyFail=Fallo al eliminar
+multicurrency_syncronize_error=Error de sincronización:%s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Usar la fecha del documento para encontrar el tipo de cambio, en lugar de usar el último tipo cambio conocido
+multicurrency_useOriginTx=Cuando un objeto es creado desde otro, mantener el tipo de cambio original desde el objeto fuente (otro usar el último cambio conocido)
+CurrencyLayerAccount=API Módulo Monedas
+CurrencyLayerAccount_help_to_synchronize=Debe crear una cuenta en el sitio web %s para usar esta funcionalidad.<br> Obtenga su <b> Llave API </b>.<br> Si usa una cuenta libre, no puede cambiar la <b> moneda origen </b> (USD predeterminado). <br> Si su moneda principal no es USD, la aplicación lo recalculará automáticamente. <br> <br> Está limitado a 1000 sincronizaciones por mes.
+multicurrency_appId=Llave API
+multicurrency_appCurrencySource=Moneda origen
+multicurrency_alternateCurrencySource=Moneda origen alterna
+CurrenciesUsed=Monedas usadas
+CurrenciesUsed_help_to_add=Añadir las diferentes monedas y tipos de cambio que necesita usar en sus <b> propuestas </b>, <b> ordenes </b> etc.
+rate=tipo de cambio
+MulticurrencyReceived=Recibido, moneda original
+MulticurrencyRemainderToTake=Monto pendiente, moneda original
+MulticurrencyPaymentAmount=Monto pagado, moneda original
+AmountToOthercurrency=Monto (en moneda de la cuenta receptora)
diff --git a/htdocs/langs/es_PE/products.lang b/htdocs/langs/es_PE/products.lang
new file mode 100644
index 00000000000..d29e3ce3677
--- /dev/null
+++ b/htdocs/langs/es_PE/products.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - products
+ProductRef=Ref. de producto
+ProductLabel=Etiqueta del producto
+ProductServiceCard=Ficha Productos/Servicios
+ProductOrService=Producto o Servicio
+ExportDataset_produit_1=Productos
diff --git a/htdocs/langs/es_PE/projects.lang b/htdocs/langs/es_PE/projects.lang
new file mode 100644
index 00000000000..9abf8160ac0
--- /dev/null
+++ b/htdocs/langs/es_PE/projects.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - projects
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
+OppStatusPROPO=Cotización
diff --git a/htdocs/langs/es_PE/salaries.lang b/htdocs/langs/es_PE/salaries.lang
new file mode 100644
index 00000000000..f7ca43beb1f
--- /dev/null
+++ b/htdocs/langs/es_PE/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Cuenta contable usada por el usuario del tercero
diff --git a/htdocs/langs/es_PE/stocks.lang b/htdocs/langs/es_PE/stocks.lang
new file mode 100644
index 00000000000..aa3e15a560f
--- /dev/null
+++ b/htdocs/langs/es_PE/stocks.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - stocks
+QtyDispatchedShort=Cant. despachada
+MovementCorrectStock=Corrección de stock del producto %s
+inventoryEdit=Editar
diff --git a/htdocs/langs/es_PE/trips.lang b/htdocs/langs/es_PE/trips.lang
new file mode 100644
index 00000000000..15199d635e8
--- /dev/null
+++ b/htdocs/langs/es_PE/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+EX_SUO=Suministros de oficina
diff --git a/htdocs/langs/es_PE/users.lang b/htdocs/langs/es_PE/users.lang
new file mode 100644
index 00000000000..185c0f9f101
--- /dev/null
+++ b/htdocs/langs/es_PE/users.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - users
+DisableUser=Inhabilitar
+DeleteUser=Borrar
+DeleteGroup=Borrar
diff --git a/htdocs/langs/es_PE/website.lang b/htdocs/langs/es_PE/website.lang
new file mode 100644
index 00000000000..85fd95deb49
--- /dev/null
+++ b/htdocs/langs/es_PE/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+ReadPerm=Leer
diff --git a/htdocs/langs/es_PE/workflow.lang b/htdocs/langs/es_PE/workflow.lang
new file mode 100644
index 00000000000..f6bd3f07716
--- /dev/null
+++ b/htdocs/langs/es_PE/workflow.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=Configuración del módulo de Flujo de Trabajo
diff --git a/htdocs/langs/es_PY/accountancy.lang b/htdocs/langs/es_PY/accountancy.lang
new file mode 100644
index 00000000000..9827b9d3795
--- /dev/null
+++ b/htdocs/langs/es_PY/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
diff --git a/htdocs/langs/es_PY/admin.lang b/htdocs/langs/es_PY/admin.lang
new file mode 100644
index 00000000000..27c312f77d7
--- /dev/null
+++ b/htdocs/langs/es_PY/admin.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - admin
+MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+Module56Name=Telephony
+Module56Desc=Telephony integration
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_PY/companies.lang b/htdocs/langs/es_PY/companies.lang
new file mode 100644
index 00000000000..6897cf22f06
--- /dev/null
+++ b/htdocs/langs/es_PY/companies.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - companies
+Contact=Contact
diff --git a/htdocs/langs/es_PY/modulebuilder.lang b/htdocs/langs/es_PY/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/es_PY/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/es_PY/projects.lang b/htdocs/langs/es_PY/projects.lang
new file mode 100644
index 00000000000..7e42793b0e9
--- /dev/null
+++ b/htdocs/langs/es_PY/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
diff --git a/htdocs/langs/es_PY/zapier.lang b/htdocs/langs/es_PY/zapier.lang
new file mode 100644
index 00000000000..c7cc16646c5
--- /dev/null
+++ b/htdocs/langs/es_PY/zapier.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - zapier
+ModuleZapierForDolibarrDesc =Zapier para modulo Dolibarr
+ZapierForDolibarrSetup =Instalacion de Zapier para Dolibarr
diff --git a/htdocs/langs/es_US/accountancy.lang b/htdocs/langs/es_US/accountancy.lang
new file mode 100644
index 00000000000..9827b9d3795
--- /dev/null
+++ b/htdocs/langs/es_US/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
diff --git a/htdocs/langs/es_US/admin.lang b/htdocs/langs/es_US/admin.lang
new file mode 100644
index 00000000000..27c312f77d7
--- /dev/null
+++ b/htdocs/langs/es_US/admin.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - admin
+MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+Module56Name=Telephony
+Module56Desc=Telephony integration
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_US/companies.lang b/htdocs/langs/es_US/companies.lang
new file mode 100644
index 00000000000..6897cf22f06
--- /dev/null
+++ b/htdocs/langs/es_US/companies.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - companies
+Contact=Contact
diff --git a/htdocs/langs/es_US/main.lang b/htdocs/langs/es_US/main.lang
new file mode 100644
index 00000000000..2e691473326
--- /dev/null
+++ b/htdocs/langs/es_US/main.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
diff --git a/htdocs/langs/es_US/modulebuilder.lang b/htdocs/langs/es_US/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/es_US/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/es_US/projects.lang b/htdocs/langs/es_US/projects.lang
new file mode 100644
index 00000000000..7e42793b0e9
--- /dev/null
+++ b/htdocs/langs/es_US/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
diff --git a/htdocs/langs/es_UY/accountancy.lang b/htdocs/langs/es_UY/accountancy.lang
new file mode 100644
index 00000000000..9827b9d3795
--- /dev/null
+++ b/htdocs/langs/es_UY/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
diff --git a/htdocs/langs/es_UY/admin.lang b/htdocs/langs/es_UY/admin.lang
new file mode 100644
index 00000000000..27c312f77d7
--- /dev/null
+++ b/htdocs/langs/es_UY/admin.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - admin
+MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+Module56Name=Telephony
+Module56Desc=Telephony integration
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_UY/companies.lang b/htdocs/langs/es_UY/companies.lang
new file mode 100644
index 00000000000..6897cf22f06
--- /dev/null
+++ b/htdocs/langs/es_UY/companies.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - companies
+Contact=Contact
diff --git a/htdocs/langs/es_UY/modulebuilder.lang b/htdocs/langs/es_UY/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/es_UY/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/es_UY/projects.lang b/htdocs/langs/es_UY/projects.lang
new file mode 100644
index 00000000000..7e42793b0e9
--- /dev/null
+++ b/htdocs/langs/es_UY/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
diff --git a/htdocs/langs/es_VE/accountancy.lang b/htdocs/langs/es_VE/accountancy.lang
new file mode 100644
index 00000000000..9827b9d3795
--- /dev/null
+++ b/htdocs/langs/es_VE/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
diff --git a/htdocs/langs/es_VE/categories.lang b/htdocs/langs/es_VE/categories.lang
new file mode 100644
index 00000000000..a3fec9ee376
--- /dev/null
+++ b/htdocs/langs/es_VE/categories.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - categories
+ExtraFieldsCategories=Atributos complementarios
diff --git a/htdocs/langs/es_VE/dict.lang b/htdocs/langs/es_VE/dict.lang
new file mode 100644
index 00000000000..7510f6f7bdd
--- /dev/null
+++ b/htdocs/langs/es_VE/dict.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - dict
+ExpAutoCat=Carro
diff --git a/htdocs/langs/es_VE/modulebuilder.lang b/htdocs/langs/es_VE/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/es_VE/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index 125d57fa712..3b7e45ac3cc 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 61216902bb9..9c8a6573db8 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Veebiserveri kasutaja/grupp
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Märgistik, mida kasutatakse andmete salvestamiseks andmebaasi
 DBSortingCharset=Märgistik, mida kasutada andmete sorteerimiseks andmebaasis
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Moodul <b>%s</b> peab olema sisse lülitatud.
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Märkeruudud
 ExtrafieldCheckBoxFromList=Märkeruudud tabelist
 ExtrafieldLink=Viide objektile
 ComputedFormula=Arvutatud väli
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=Vaikimisi pakutud IRPF on 0. Reegli lõpp.
 LocalTax2IsUsedExampleES=Hispaanias on nad vabakutselised ja spetsialistid, kes pakuvad teenuseid ja ettevõtted, kes on valinud moodulipõhise maksusüsteemi.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Kasutajate mooduli seadistamine
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Mitme ettevõtte mooduli seadistamine
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Postiindeks
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index 8cba62107af..990cafbf5c7 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Arvete summa
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Arvete summa kuus (maksudeta)
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=Näita arvet
-ShowInvoice=Näita arvet
-ShowInvoiceReplace=Näita asendusarvet
-ShowInvoiceAvoir=Näita kreeditarvet
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Näita makset
 AlreadyPaid=Juba makstud
 AlreadyPaidBack=Juba tagasi makstud
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Staatus
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Tagastab numbri formaadiga %syymm-nnnn tavaliste arvete jaoks ja %syymm-nnnn kreeditarvete jaoks, kus yy on aasta, mm on kuu ja nnnn on katkestusteta jada, mis ei lähe kunagi 0 tagasi.
diff --git a/htdocs/langs/et_EE/donations.lang b/htdocs/langs/et_EE/donations.lang
index 3ce6a497b4a..1642553abef 100644
--- a/htdocs/langs/et_EE/donations.lang
+++ b/htdocs/langs/et_EE/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Create a donation
 NewDonation=Uus annetus
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Kuva annetus
 PublicDonation=Avalik annetus
 DonationsArea=Annetuste ala
 DonationStatusPromiseNotValidated=Lubaduse mustand
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Mustand
 DonationStatusPromiseValidatedShort=KInnitatud
 DonationStatusPaidShort=Vastu võetud
 DonationTitle=Annetuse kviitung
+DonationDate=Donation date
 DonationDatePayment=Maksekuupäev
 ValidPromess=Kinnita lubadus
 DonationReceipt=Annetuse kviitung
diff --git a/htdocs/langs/et_EE/interventions.lang b/htdocs/langs/et_EE/interventions.lang
index f9a8bb06dfe..9f2db49e62c 100644
--- a/htdocs/langs/et_EE/interventions.lang
+++ b/htdocs/langs/et_EE/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Kliendi kontakt järelkajaks
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/et_EE/modulebuilder.lang b/htdocs/langs/et_EE/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/et_EE/modulebuilder.lang
+++ b/htdocs/langs/et_EE/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/et_EE/multicurrency.lang b/htdocs/langs/et_EE/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/et_EE/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index a95136a3c6f..37b54e96354 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/et_EE/website.lang b/htdocs/langs/et_EE/website.lang
index e4e7e3df2e9..19b7c38d1c9 100644
--- a/htdocs/langs/et_EE/website.lang
+++ b/htdocs/langs/et_EE/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/et_EE/zapier.lang b/htdocs/langs/et_EE/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/et_EE/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index 1f9382137ea..b8ce37a0956 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index c9419be95f2..3ec57b27021 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web-zerbitzariaren erabiltzailea/taldea
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=<b>%s</b> moduluak gaituta egon behar du
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Users module setup
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index 394296e5cce..9a4c8f55e10 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Faktura kopurua
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=Faktura erakutsi
-ShowInvoice=Faktura erakutsi
-ShowInvoiceReplace=Show replacing invoice
-ShowInvoiceAvoir=Show credit note
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Ordainketa erakutsi
 AlreadyPaid=Jada ordainduta
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/eu_ES/donations.lang b/htdocs/langs/eu_ES/donations.lang
index 413f5a28f1c..9b8f2e76c05 100644
--- a/htdocs/langs/eu_ES/donations.lang
+++ b/htdocs/langs/eu_ES/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Create a donation
 NewDonation=New donation
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Show donation
 PublicDonation=Public donation
 DonationsArea=Donations area
 DonationStatusPromiseNotValidated=Draft promise
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
 DonationTitle=Donation receipt
+DonationDate=Donation date
 DonationDatePayment=Ordainketa data
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
diff --git a/htdocs/langs/eu_ES/interventions.lang b/htdocs/langs/eu_ES/interventions.lang
index e7667ef6946..e5936f8246e 100644
--- a/htdocs/langs/eu_ES/interventions.lang
+++ b/htdocs/langs/eu_ES/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/eu_ES/modulebuilder.lang b/htdocs/langs/eu_ES/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/eu_ES/modulebuilder.lang
+++ b/htdocs/langs/eu_ES/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/eu_ES/multicurrency.lang b/htdocs/langs/eu_ES/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/eu_ES/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index 51753eb8d14..2d78af80fc2 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/eu_ES/website.lang b/htdocs/langs/eu_ES/website.lang
index edc9561faea..45e420e2549 100644
--- a/htdocs/langs/eu_ES/website.lang
+++ b/htdocs/langs/eu_ES/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/eu_ES/zapier.lang b/htdocs/langs/eu_ES/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/eu_ES/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index 15f67cc5a13..75703b7c214 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=سطور بند شدۀ صورت‌حساب‌ها
 ExpenseReportLines=سطور گزارش هزینه‌ها که باید بند شوند
 ExpenseReportLinesDone=سطور بندشدۀ گزارش هزینه‌ها
 IntoAccount=بندکردن سطر به حساب حسابداری
+TotalForAccount=Total for accounting account
 
 
 Ventilate=بندکردن
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=حساب حساب‌داری ثبت کمک و اعا
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=حساب حساب‌داری ثبت اشتراک‌ها
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=حساب حساب‌داری پیش‌فرض برای محصولات فروخته شده (در صورت عدم تعریف در برگۀ محصولات استفاده می‌شود)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=حساب حساب‌داری پیش‌فرض برای خدمات خریداری شده (در صورت عدم تعریف در برگۀ خدمات استفاده می‌شود)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=حساب حساب‌داری پیش‌فرض برای خدمات فروخته شده (در صورت عدم تعریف در برگۀ خدمات استفاده می‌شود)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=حساب شخص‌سوم تعریف نشده یا شخص سوم ناشناخته است. خطای انسدادی
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=حساب شخص‌سوم ناشناخته و حساب انتظار تعریف نشده است. خطای انسدادی
 PaymentsNotLinkedToProduct=پرداخت به هیچ محصول/خدمتی وصل نشده است
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=گروه حساب
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=جمع گردش‌مالی پیش‌از محاسبۀ مالیات
 TotalMarge=حاشیه فروش کل
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=صدور برای Quadratus QuadraCompta
 Modelcsv_ebp=صدور برای EBP
 Modelcsv_cogilog=صدور برای Cogilog
 Modelcsv_agiris=صدور برای Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=صادرکردن برای OpenConcerto  (آزمایشی)
 Modelcsv_configurable= صدور قابل پیکربندی CSV 
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=صادرکردن برای Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=ساختار شناسۀ حساب‌‌ها
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=حالت فروش
 OptionModeProductSellIntra=حالت فروش به شکل EEC صادر می‌گردد
 OptionModeProductSellExport=حالت فروش به حالت سایر کشورها صادر می‌گرد
 OptionModeProductBuy=حالت خرید
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=نمایش همۀ محصولات دارای حساب‌حساب‌داری برای فروش
 OptionModeProductSellIntraDesc=نمایش همۀ محصولات در حساب حسابداری برای فروش در EEC
 OptionModeProductSellExportDesc=نمایش همۀ محصولات در حساب حسابداری برای سایر فروش‌های خارجی
 OptionModeProductBuyDesc=نمایش همۀ محصولات دارای حساب‌حساب‌داری برای خرید
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=حذف کد حساب‌داری از سطوری که در ساختار و نمودار حساب  وجود ندارند
 CleanHistory=بازسازی همۀ بندشدن‌ها برای سال انتخاب شده
 PredefinedGroups=گروه‌های از پیش‌تعریف شده
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=حساب از گروه حذف شده‌است
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=بازۀ حساب حساب‌داری
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 48a9b656aa4..846bacb3666 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=کاربرِ/گروهِ سرویس‌دهندۀ‌وب
 NoSessionFound=به نظر می‌رسد پیکربندی PHP شما امکان فهرست‌کردن نشست‌های فعال را نداشته باشد. ممکن است پوشه‌ای که برای ذخیرۀ نشست‌ها مورد استفاده است (<b>%s</b>)  حفاظت شده باشد (مثلا بواسطۀ مجوزهای سیستم‌عامل یا با تمهیدات   open_basedir در PHP).
 DBStoringCharset=تنظیمات کدبندی Charset بانک داده برای ذخیره داده‌ها
 DBSortingCharset=تنظیمات کدبندی Charset بانک داده برای مرتب‌سازی داده‌ها
+HostCharset=Host charset
 ClientCharset=تنظیمات Charset مشتری
 ClientSortingCharset=تنظیمات collation مشتری
 WarningModuleNotActive=واحد <b>%s</b> باید فعال باشد
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=کادرهای تائید
 ExtrafieldCheckBoxFromList=کادرهای تائید از جدول
 ExtrafieldLink=پیوند به یک شیء
 ComputedFormula=بخش محاسبه شده
-ComputedFormulaDesc=شما در این‌جا می‌توانید فرمولی را با استفاده از مشخصات دیگر یک شیء یا یک کدنوشتۀ PHP وارد نمائید تا یک مقدار پویای محاسبه شده دریافت کنید. شما همچنین می‌توانید هر فرمول سازگار با PHP را به همراه عمل‌گر شرطی  "?" وارد نمائید که با یک شیء سراسری دنبال می‌شود: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>. <br><strong>هشدار</strong>: تنها برخی از مشخصه‌های $object در دسترس هستند. در صورتی که نیاز به مشخصه‌ای دارید که بارگذاری نشده، همانند مثال دوم خودتان باید آن شیء را واکشی نمائید.<br> استفاده از یک بخش محاسبه‌شده به آن معناست که شما قادر نخواهید باد که از رابط خود مقداری وارد نمائید. همچنین، در صورتی که یک خطای نوشتاری وجود داشته باشد، فرمول هیچ چیز ارائه نخواهد داد.<br><br>مثال فرمول:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br> مثال بارگذاری مجدد شیئ<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1' <br><br> مثال دیگر فرمول برای اازام به بارگذاری شیء و والد آن:<br> (($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=بخش محاسبه‌شدۀ فروشگاه
 ComputedpersistentDesc=بخش‌های محاسبه‌شدۀ اضافی در پایگاه داده ذخیره خواهند شد، به‌هرحال مقدار تنها در زمانی دوباره محاسبه خواهد شد که شیء این بخش تغییر کند. در صورتی که بخش محاسبه‌شده به سایر اشیاء یا داده‌های سراسری وابسته باشد، این مقدار ممکن است خطا باشد!!
 ExtrafieldParamHelpPassword=خالی رها کردن این بخش به معنای این است که مقدار بدون حفاظت ذخیره خواهد شد (بخش مربوطه باید با یک ستاره روی صفحه پنهان باشد).<br> 'auto' را برای استفاده از قواعد حفاظت برای ذخیرۀ گذرواژه در بانک‌داده ذخیره کنید (مقدار خوانده شده کدبندی شده است و امکان خواندن مقدار اصلی دیگر وجود نخواهد داشت)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=نرخ پیش‌فرض IRPF در هنگام ساخت مش
 LocalTax2IsNotUsedDescES=به طور پیش‌فرض IRPF  مطروحه برابر با 0 است. پایان قاعده.
 LocalTax2IsUsedExampleES=در اسپانیا، خوداشتغالان، و متخصصین مستقل که ارائه دهندۀ خدمات هستند و شرکت‌هائی که سامانۀ مالیاتی modules را برگزیده‌اند.
 LocalTax2IsNotUsedExampleES=در اسپانیا مشاغلی هستند که درسامانۀ مالیاتی modules موضوعیت ندارند.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=گزارش مالیات‌های محلی
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=قواعد تولید و اعتبارسنجی گذرو
 DisableForgetPasswordLinkOnLogonPage=در صفحۀ ورود پیوند "فراموشی گذرواژه" نمایش داده نشود
 UsersSetup=برپاسازی واحد کاربران
 UserMailRequired=برای ایجاد یک کاربر جدید یک رایانامه لازم است
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=برپاسازی واحد چندشرکتی
 ##### Suppliers #####
 SuppliersSetup=برپاسازی واحد فروشندگان
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=روش‌های شماره‌گذاری صورت‌حساب فروشندگان
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=پنهان کردن تصاویر فهرست بالا
 LeftMenuBackgroundColor=رنگ پس‌زمینۀ فهرست سمت چپ
 BackgroundTableTitleColor=رنگ پس‌زمیۀ سطر عنوان جدول
 BackgroundTableTitleTextColor=رنگ نوشتۀ سطر عنوان جدول
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=رنگ پس‌زمینۀ سطور فرد جدول
 BackgroundTableLineEvenColor=رنگ پس‌زمینۀ سطور زوج جدول
 MinimumNoticePeriod=حداقل بازۀ خبردهی (درخواست مرخصی شما باید حداقل با این فاصلۀ زمانی انجام شود)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=کدپستی
 MainMenuCode=کد ورودی فهرست (فهرست اصلی)
 ECMAutoTree=نمایش ساختاردرختی خودکار ECM
-OperationParamDesc=مقادیر تعریف شده برای کنش-action یا چگونگی استخراج مقادیر را این‌جا تعریف کنید. برای مثال: <br>objproperty1=SET:abc<br> objproperty1=SET:a value with replacement of __objproperty1__ <br> objproperty3=SETIFEMPTY:abc <br> objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*) <br> options_myextrafield=EXTRACT:SUBJECT:([^\\s]*) <br> object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*) <br><br> از یک ویرگول‌نقطۀ انگلیسی ; به‌عنوان جداکنندۀ یا استخراجی یا تنظیم چند گروه مشخصات استفاده کنید.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=ساعات کار
 OpeningHoursDesc=ساعات کاری معمول شرکت خود را در این بخش وارد نمائید
 ResourceSetup=پیکربندی واحد منابع
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index 1d081bbe11c..873505c2680 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=تعداد صورت‌حساب‌ها در ماه
 AmountOfBills=مبلغ صورت‌حساب‌ها
 AmountOfBillsHT=مبلغ صورت‌حساب‌ها (خالص پس از کسر مالیات)
 AmountOfBillsByMonthHT=مبلغ ماهیانۀ صورت‌حساب‌ها (خالص پس از کسر مالیات)
-ShowSocialContribution=نمایش مالیات اجتماعی/مالی
-ShowBill=نمایش صورت‌حساب
-ShowInvoice=نمایش صورت‌حساب
-ShowInvoiceReplace=نمایش صورت‌حساب جایگزین
-ShowInvoiceAvoir=نمایش یادداشت اعتباری
-ShowInvoiceDeposit=نمایش صورت‌حساب پیش‌پرداخت
-ShowInvoiceSituation=نمایش صورت‌حساب وضعیت
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=نمایش پرداخت
 AlreadyPaid=قبلا پرداخت‌شده است
 AlreadyPaidBack=مبلغ قبلا بازگردانده شده است
 AlreadyPaidNoCreditNotesNoDeposits=قبلا پرداخت شده است (بدون یادداشت‌های اعتباری و پیش‌پرداخت)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=تولید شده از قالب صورت‌حسابی %s
 WarningInvoiceDateInFuture=هشدار! تاریخ صورت‌حساب بیشتر از تاریخ کنونی است
 WarningInvoiceDateTooFarInFuture=هشدار! تاریخ صورت‌حساب از تاریخ امروز بسیار دور است
 ViewAvailableGlobalDiscounts=نمایش تخفیف‌های موجود
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=وضعیت
 PaymentConditionShortRECEP=در هنگام دریافت
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=این گزینه تنها وقتی فعال است که شما صورت‌حساب را از زبانۀ "مشتری" یک شخص سوم می‌سازید
 YouMustCreateInvoiceFromSupplierThird=این گزینه تنها وقتی فعال است که شما صورت‌حساب را از زبانۀ "فروشنده" یک شخص سوم می‌سازید
 YouMustCreateStandardInvoiceFirstDesc=شما باید ابتدا یک صورت‌حساب استاندارد ساخته و سپس آن را تبدیل به "قالب" کنید تا یک صورت‌حساب قالبی ساخته باشید
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=قالب PDF صورت‌حساب Sponge. یک قالب کامل صورت‌حساب 
 PDFCrevetteDescription=قالب PDF صورت‌حساب Crevette. یک قالب کامل صورت‌حساب برای صورت‌حساب‌های وضعیت
 TerreNumRefModelDesc1=بازگرداندن عدد با شکل %syymm-nnnn برای صورت‌حساب‌های استاندارد و %syymm-nnnn برای یادداشت‌های اعتباری که در آن yy نمایندۀ سال، mm ماه و nnnn یک شمارنده بدون توقف و بدون بازگشت به 0 است
diff --git a/htdocs/langs/fa_IR/donations.lang b/htdocs/langs/fa_IR/donations.lang
index 9f15e4ae3b2..3d2c3bf387c 100644
--- a/htdocs/langs/fa_IR/donations.lang
+++ b/htdocs/langs/fa_IR/donations.lang
@@ -7,7 +7,6 @@ AddDonation=ایجاد یک عنوان کمک‌مالی
 NewDonation=کمک‌مالی جدید
 DeleteADonation=حذف یک کمک‌مالی
 ConfirmDeleteADonation=آیا مطمئن هستید می‌خواهید این کمک مالی را حذف کنید؟
-ShowDonation=نمایش کمک‌مالی
 PublicDonation=کمک‌مالی علنی
 DonationsArea=بخش کمک‌های مالی
 DonationStatusPromiseNotValidated=پیش‌نویس وعده
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=پیش‌نویس
 DonationStatusPromiseValidatedShort=معتبر شد
 DonationStatusPaidShort=دریافت شد
 DonationTitle=رسید کمک‌مالی
+DonationDate=Donation date
 DonationDatePayment=تاریخ پرداخت
 ValidPromess=تائید وعده
 DonationReceipt=رسید کمک‌مالی
diff --git a/htdocs/langs/fa_IR/interventions.lang b/htdocs/langs/fa_IR/interventions.lang
index 78e3fc1feca..546e61e10b5 100644
--- a/htdocs/langs/fa_IR/interventions.lang
+++ b/htdocs/langs/fa_IR/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=بخش پادرمیانی
 DraftFichinter=پادرمیانی‌های پیش‌نویس
 LastModifiedInterventions=آخرین %s پادرمیانی ویرایش شده
 FichinterToProcess=پادرمیانی‌های قابل پردازش
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=طرف‌تماس پیگیر مشتری
-# Modele numérotation
 PrintProductsOnFichinter=همچنین سطور نوع "محصول" (نه فقط خدمات) روی کارت پادرمیانی چاپ شود
 PrintProductsOnFichinterDetails=پادرمیانی‌های تولید شده از سفارش‌ها
 UseServicesDurationOnFichinter=استفاده از طول‌مدت خدمات برای پادرمیانی‌های تولید شده از سفارش‌ها
@@ -53,14 +51,16 @@ InterventionStatistics=آمار پادرمیانی‌ها
 NbOfinterventions=تعداد کارت‌های پادرمیانی
 NumberOfInterventionsByMonth=تعداد کارت‌های پادرمیانی بر حسب ما (تاریخ تائید اعتبار)
 AmountOfInteventionNotIncludedByDefault=به طور پیش‌فرض مبلغ پادرمیانی در سود محاسبه نمی‌شود (در اکثر موارد، برگه‌های زمان برای محاسبۀ زمان صرف شده استفاده می‌شوند). برای شامل کردن سود آن‌ها گزینۀ PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT را در خانه-برپاسازی-سایر به 1 تغییر دهید.
-##### Exports #####
 InterId=شناسۀ پادرمیانی
 InterRef=ش.ارجاع پادرمیانی
 InterDateCreation=تاریخ ساخت پادرمیانی
 InterDuration=طول‌مدت پادرمیانی
 InterStatus=وضعیت پادرمیانی
 InterNote=یادداشت پادرمیانی
+InterLine=Line of intervention
 InterLineId=شناسۀ سطر پادرمیانی
 InterLineDate=تاریخ سطر پادرمیانی
 InterLineDuration=طول‌مدت سطر پادرمیانی
 InterLineDesc=توضیحات سطر پادرمیانی
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/fa_IR/modulebuilder.lang b/htdocs/langs/fa_IR/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/fa_IR/modulebuilder.lang
+++ b/htdocs/langs/fa_IR/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/fa_IR/multicurrency.lang b/htdocs/langs/fa_IR/multicurrency.lang
new file mode 100644
index 00000000000..0c144dac2ec
--- /dev/null
+++ b/htdocs/langs/fa_IR/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=چند واحدپولی
+ErrorAddRateFail=خطا در نرخ اضافه شده
+ErrorAddCurrencyFail=خطا در واحدپولی اضافه شده
+ErrorDeleteCurrencyFail=خطا، حذف مقدور نیست
+multicurrency_syncronize_error=خطای همگام‌سازی: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=از تاریخ سند برای پیدا کردن نرخ واحد‌پولی به جای استفاده از آخرین نرخ معلوم استفاده شود
+multicurrency_useOriginTx=هنگامی که یک شیء از شیء دیگر ساخته شد، نرخ اصلی از شیء مبدأ حفظ شود (در غیر این‌صورت آخرین نرخ شناخته شده استفاده می‌شود)
+CurrencyLayerAccount=رابط‌برنامه‌نویسی کاربردی CurrencyLayer
+CurrencyLayerAccount_help_to_synchronize=برای استفاده از این قابلیت باید یک حساب‌کاربری روی سایت %s بسازید. <br> سپس <b>کلید API</b> خود را دریافت نمائید. <br> در صورتی که از حساب رایگان استفاده می‌کنید شما نمی‌توانید <b>واحدپولی مبدأ</b> (یعنی دلار به شکل پیش‌فرض) را تغییر دهید. <br> در صورتی که واحدپولی اصلی شما دلارآمریکا نیست، این برنامه به طور خودکار آن را محاسبه خواهد کرد. <br><br> شما در ماه محدود به 1000 همگام سازی هستید.
+multicurrency_appId=کلید API
+multicurrency_appCurrencySource=واحدپولی مبدأ
+multicurrency_alternateCurrencySource=واحدپولی جایگزین مبدأ
+CurrenciesUsed=واحدهای پولی استفاده شده
+CurrenciesUsed_help_to_add=واحدهای پولی مبدأ و نرخ مربوطه را که احتیاج دارید در <b>پیشنهادها</b>، <b>سفارش‌ها</b> و غیره استفاده شوند وارد کنید
+rate=نرخ
+MulticurrencyReceived=دریافت شد، نرخ اصلی
+MulticurrencyRemainderToTake=مقدار باقی‌مانده، واحد پولی اصلی
+MulticurrencyPaymentAmount=نرخ پرداختی، واحدپولی اصلی
+AmountToOthercurrency=مبلغ به (در واحدپولی حساب دریافت کننده)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index 5327af215ec..d2886d5f9ae 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=خدمات برای استفاده بر سطور
 InvoiceGeneratedFromTimeSpent=صورت‌حساب %s بر اساس زمان صرف شده روی طرح تولید شد
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/fa_IR/website.lang b/htdocs/langs/fa_IR/website.lang
index 5269bce74f7..85387497d64 100644
--- a/htdocs/langs/fa_IR/website.lang
+++ b/htdocs/langs/fa_IR/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=حساب‌های وبگاه
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/fa_IR/zapier.lang b/htdocs/langs/fa_IR/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/fa_IR/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index 733c0148cd3..354d1833531 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Sitoa
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index fbfd6d12524..5bf229dcf33 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web-palvelimen käyttäjä / ryhmä
 NoSessionFound=PHP:n asetukset estävät aktiivisten istuntojen listaamisen. Istuntojen tallennushakemisto (<b>%s</b>) voi olla suojattu (Käyttöjärjestelmäoikeudet tai PHP: n open_basedir).
 DBStoringCharset=Tietokannan merkistö tietojen tallennukseen
 DBSortingCharset=Tietokannan merkistö tietojen lajitteluun
+HostCharset=Host charset
 ClientCharset=Clientin merkistö
 ClientSortingCharset=Clientin ulkoasu
 WarningModuleNotActive=<b>Moduuli %s</b> on oltava käytössä
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Valintaruudut
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=Oletuksena ehdotettu IRPF on 0. Loppu sääntö.
 LocalTax2IsUsedExampleES=Espanjassa, freelancer ja itsenäisten ammatinharjoittajien, jotka tarjoavat palveluja ja yrityksiä, jotka ovat valinneet verojärjestelmän moduuleja.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Raportit paikallisista veroista
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Käyttäjät moduuli setup
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-yhtiö moduulin asetukset
 ##### Suppliers #####
 SuppliersSetup='Toimittaja' - moduulin asetukset
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Piilota kuvat ylävalikosta
 LeftMenuBackgroundColor=Taustaväri alavalikolle
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Postinumero
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Aukioloajat
 OpeningHoursDesc=Yrityksen tavalliset aukioloajat
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/fi_FI/assets.lang b/htdocs/langs/fi_FI/assets.lang
index 3646f4159f1..8d7c8f33c1a 100644
--- a/htdocs/langs/fi_FI/assets.lang
+++ b/htdocs/langs/fi_FI/assets.lang
@@ -26,7 +26,7 @@ AssetsTypeSetup=Asset type setup
 AssetTypeModified=Asset type modified
 AssetType=Varannon tyyppi
 AssetsLines=Varannot
-DeleteType=Poistaa
+DeleteType=Poista
 DeleteAnAssetType=Delete an asset type
 ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
 ShowTypeCard=Näytä tyyppi ' %s'
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index b13aef1031d..a781ab260d3 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Määrä laskuista
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Määrä laskut kuukausittain (verojen jälkeen)
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=Näytä lasku
-ShowInvoice=Näytä lasku
-ShowInvoiceReplace=Näytä korvaa lasku
-ShowInvoiceAvoir=Näytä menoilmoitus
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Näytä tilannetilasku
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Näytä maksu
 AlreadyPaid=Jo maksanut
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=Katso saatavilla olevat alennukset
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Tila
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/fi_FI/donations.lang b/htdocs/langs/fi_FI/donations.lang
index 93072e82e4b..1cb5e0a33a7 100644
--- a/htdocs/langs/fi_FI/donations.lang
+++ b/htdocs/langs/fi_FI/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Create a donation
 NewDonation=Uusi lahjoitus
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Show donation
 PublicDonation=Julkiset lahjoitus
 DonationsArea=Lahjoitukset alueella
 DonationStatusPromiseNotValidated=Luonnos lupaus
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Vedos
 DonationStatusPromiseValidatedShort=Validoidut
 DonationStatusPaidShort=Vastatut
 DonationTitle=Donation receipt
+DonationDate=Donation date
 DonationDatePayment=Maksupäivä
 ValidPromess=Vahvista lupaus
 DonationReceipt=Donation receipt
diff --git a/htdocs/langs/fi_FI/interventions.lang b/htdocs/langs/fi_FI/interventions.lang
index 9ba791d48b3..d01ef905476 100644
--- a/htdocs/langs/fi_FI/interventions.lang
+++ b/htdocs/langs/fi_FI/interventions.lang
@@ -24,7 +24,7 @@ NameAndSignatureOfInternalContact=Name and signature of intervening:
 NameAndSignatureOfExternalContact=Name and signature of customer:
 DocumentModelStandard=Vakioasiakirja malli interventioiden
 InterventionCardsAndInterventionLines=Interventions and lines of interventions
-InterventionClassifyBilled=Luokitella &quot;Laskutetaan&quot;
+InterventionClassifyBilled=Luokittele "laskutettu"
 InterventionClassifyUnBilled=Classify "Unbilled"
 InterventionClassifyDone=Classify "Done"
 StatusInterInvoiced=Laskutetaan
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Seurata asiakkaiden yhteystiedot
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 779f8b5c519..ad39167d919 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -426,6 +426,7 @@ Modules=Moduulit/Applikaatiot
 Option=Vaihtoehto
 List=Luettelo
 FullList=Täydellinen luettelo
+FullConversation=Full conversation
 Statistics=Tilastot
 OtherStatistics=Muut tilastot
 Status=Tila
@@ -847,7 +848,7 @@ ShowTempMassFilesArea=Show area of files built by mass actions
 ConfirmMassDeletion=Bulk Delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
 RelatedObjects=Related Objects
-ClassifyBilled=Luokittele laskutetaan
+ClassifyBilled=Luokittele laskutetuksi
 ClassifyUnbilled=Classify unbilled
 Progress=Edistyminen
 ProgressShort=Progr.
@@ -953,12 +954,13 @@ SearchIntoMembers=Jäsenet
 SearchIntoUsers=Käyttäjät
 SearchIntoProductsOrServices=Tuotteet tai palvelut
 SearchIntoProjects=Projektit
+SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Tehtävät
 SearchIntoCustomerInvoices=Asiakkaiden laskut
 SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Asiakkaan tilaukset
 SearchIntoSupplierOrders=Ostotilaukset
-SearchIntoCustomerProposals=Tarjoukset asiakkaille
+SearchIntoCustomerProposals=Tarjoukset
 SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Sopimukset
@@ -1028,3 +1030,6 @@ YAxis=Y-Axis
 StatusOfRefMustBe=Status of %s must be %s
 DeleteFileHeader=Confirm file delete
 DeleteFileText=Do you really want delete this file?
+ShowOtherLanguages=Show other languages
+SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
+NotUsedForThisCustomer=Not used for this customer
diff --git a/htdocs/langs/fi_FI/margins.lang b/htdocs/langs/fi_FI/margins.lang
index d4f7e3dbb23..d1b075c7bc3 100644
--- a/htdocs/langs/fi_FI/margins.lang
+++ b/htdocs/langs/fi_FI/margins.lang
@@ -16,6 +16,7 @@ MarginDetails=Margin details
 ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
 UserMargins=User margins
 ProductService=Tuote tai palvelu
 AllProducts=Kaikki tuotteet ja palvelut
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
-CostPrice=Cost price
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
+CostPrice=Kustannushinta
 UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/fi_FI/modulebuilder.lang b/htdocs/langs/fi_FI/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/fi_FI/modulebuilder.lang
+++ b/htdocs/langs/fi_FI/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/fi_FI/multicurrency.lang b/htdocs/langs/fi_FI/multicurrency.lang
new file mode 100644
index 00000000000..c285b180058
--- /dev/null
+++ b/htdocs/langs/fi_FI/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Suorituksen summa, alkuperäinen valuutta
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 15cb4c2d1e9..6fa3b77b08e 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -166,7 +166,7 @@ CustomerPrices=Asiakas hinnat
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
-CountryOrigin=Alkuperä maa
+CountryOrigin=Alkuperämaa
 Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=Yksikkö
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index f21074d9938..5dc84d3c585 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/fi_FI/sendings.lang b/htdocs/langs/fi_FI/sendings.lang
index 2713619694a..f45dd858ab4 100644
--- a/htdocs/langs/fi_FI/sendings.lang
+++ b/htdocs/langs/fi_FI/sendings.lang
@@ -16,7 +16,7 @@ NbOfSendings=Toimitusten lukumäärä
 NumberOfShipmentsByMonth=Number of shipments by month
 SendingCard=Toimituskortti
 NewSending=Uusi toimitus
-CreateShipment=Luo lähettäminen
+CreateShipment=Luo lähetys
 QtyShipped=Kpl lähetetty
 QtyShippedShort=Qty ship.
 QtyPreparedOrShipped=Qty prepared or shipped
@@ -31,7 +31,7 @@ SendingsAndReceivingForSameOrder=Tämän tilauksen toimitukset ja kuittaukset
 SendingsToValidate=Toimitu
 StatusSendingCanceled=Peruttu
 StatusSendingDraft=Vedos
-StatusSendingValidated=Validoidut (tuotteet alukselle tai jo lähettänyt)
+StatusSendingValidated=Validoidut (lähetettävät tai lähetetyt tuotteet)
 StatusSendingProcessed=Jalostettu
 StatusSendingDraftShort=Vedos
 StatusSendingValidatedShort=Validoidut
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index 79f95bf0d9a..8c8273e4411 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -1,17 +1,17 @@
 # Dolibarr language file - Source file is en_US - stocks
 WarehouseCard=Warehouse-kortti
-Warehouse=Warehouse
+Warehouse=Varasto
 Warehouses=Varastot
 ParentWarehouse=Parent warehouse
 NewWarehouse=New warehouse / Stock Location
-WarehouseEdit=Muokkaa varasto
+WarehouseEdit=Muokkaa varastoa
 MenuNewWarehouse=Uusi varasto
-WarehouseSource=Lähde varasto
+WarehouseSource=Lähdevarasto
 WarehouseSourceNotDefined=No warehouse defined,
 AddWarehouse=Create warehouse
 AddOne=Add one
 DefaultWarehouse=Default warehouse
-WarehouseTarget=Kohdekieli varasto
+WarehouseTarget=Kohdevarasto
 ValidateSending=Poista lähettäminen
 CancelSending=Peruuta lähettäminen
 DeleteSending=Poista lähettäminen
@@ -22,7 +22,7 @@ LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
 Movements=Liikkeet
 ErrorWarehouseRefRequired=Warehouse viite nimi tarvitaan
-ListOfWarehouses=Luettelo varastoissa
+ListOfWarehouses=Luettelo varastoista
 ListOfStockMovements=Luettelo varastojen muutokset
 ListOfInventories=List of inventories
 MovementId=Movement ID
@@ -80,7 +80,7 @@ StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
 PhysicalStock=Physical Stock
-RealStock=Real Stock
+RealStock=Varastossa
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual varastossa
diff --git a/htdocs/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang
index 3685a0886b6..306041a8f3f 100644
--- a/htdocs/langs/fi_FI/website.lang
+++ b/htdocs/langs/fi_FI/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Kloonaa sivusto
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/fi_FI/withdrawals.lang b/htdocs/langs/fi_FI/withdrawals.lang
index be3ff8c56ce..76b959d9d33 100644
--- a/htdocs/langs/fi_FI/withdrawals.lang
+++ b/htdocs/langs/fi_FI/withdrawals.lang
@@ -27,7 +27,7 @@ MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
-ClassCredited=Luokittele hyvitetään
+ClassCredited=Luokittele hyvitetyksi
 ClassCreditedConfirm=Oletko varma, että haluat luokitella tämän vetäytymisen vastaanottamisesta kuin hyvitetty pankkitilisi?
 TransData=Päivämäärä Lähetetty
 TransMetod=Menetelmä Lähetetty
@@ -50,7 +50,7 @@ StatusMotif0=Määrittelemätön
 StatusMotif1=Säännös insuffisante
 StatusMotif2=Tirage conteste
 StatusMotif3=No direct debit payment order
-StatusMotif4=Sales Order
+StatusMotif4=Myyntitilaus
 StatusMotif5=RIB inexploitable
 StatusMotif6=Huomioon ilman tasapaino
 StatusMotif7=Ratkaisusta
diff --git a/htdocs/langs/fi_FI/zapier.lang b/htdocs/langs/fi_FI/zapier.lang
new file mode 100644
index 00000000000..2a84e392559
--- /dev/null
+++ b/htdocs/langs/fi_FI/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier Dolibarr:lle
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier Dolibarr-moduulille
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Zapier Dolibarr:lle asetukset
diff --git a/htdocs/langs/fr_BE/agenda.lang b/htdocs/langs/fr_BE/agenda.lang
index d2102705f02..0e9fcea385a 100644
--- a/htdocs/langs/fr_BE/agenda.lang
+++ b/htdocs/langs/fr_BE/agenda.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - agenda
-AffectedTo=Assigné à
 ListOfActions=Liste d'événements
 MenuToDoActions=Tous les événements incomplets
 MenuDoneActions=Tous les événements terminés
diff --git a/htdocs/langs/fr_BE/modulebuilder.lang b/htdocs/langs/fr_BE/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/fr_BE/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/fr_BE/products.lang b/htdocs/langs/fr_BE/products.lang
new file mode 100644
index 00000000000..e6f65995020
--- /dev/null
+++ b/htdocs/langs/fr_BE/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+LastModifiedProductsAndServices=%s derniers produits/services
diff --git a/htdocs/langs/fr_BE/projects.lang b/htdocs/langs/fr_BE/projects.lang
new file mode 100644
index 00000000000..7e42793b0e9
--- /dev/null
+++ b/htdocs/langs/fr_BE/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
diff --git a/htdocs/langs/fr_CH/accountancy.lang b/htdocs/langs/fr_CH/accountancy.lang
new file mode 100644
index 00000000000..9827b9d3795
--- /dev/null
+++ b/htdocs/langs/fr_CH/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
diff --git a/htdocs/langs/fr_CH/admin.lang b/htdocs/langs/fr_CH/admin.lang
new file mode 100644
index 00000000000..27c312f77d7
--- /dev/null
+++ b/htdocs/langs/fr_CH/admin.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - admin
+MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+Module56Name=Telephony
+Module56Desc=Telephony integration
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_CH/modulebuilder.lang b/htdocs/langs/fr_CH/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/fr_CH/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/fr_CH/projects.lang b/htdocs/langs/fr_CH/projects.lang
new file mode 100644
index 00000000000..7e42793b0e9
--- /dev/null
+++ b/htdocs/langs/fr_CH/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
diff --git a/htdocs/langs/fr_CI/accountancy.lang b/htdocs/langs/fr_CI/accountancy.lang
new file mode 100644
index 00000000000..9827b9d3795
--- /dev/null
+++ b/htdocs/langs/fr_CI/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
diff --git a/htdocs/langs/fr_CI/admin.lang b/htdocs/langs/fr_CI/admin.lang
new file mode 100644
index 00000000000..27c312f77d7
--- /dev/null
+++ b/htdocs/langs/fr_CI/admin.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - admin
+MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+Module56Name=Telephony
+Module56Desc=Telephony integration
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_CI/main.lang b/htdocs/langs/fr_CI/main.lang
new file mode 100644
index 00000000000..2e691473326
--- /dev/null
+++ b/htdocs/langs/fr_CI/main.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
diff --git a/htdocs/langs/fr_CI/modulebuilder.lang b/htdocs/langs/fr_CI/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/fr_CI/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/fr_CI/projects.lang b/htdocs/langs/fr_CI/projects.lang
new file mode 100644
index 00000000000..7e42793b0e9
--- /dev/null
+++ b/htdocs/langs/fr_CI/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
diff --git a/htdocs/langs/fr_CM/accountancy.lang b/htdocs/langs/fr_CM/accountancy.lang
new file mode 100644
index 00000000000..9827b9d3795
--- /dev/null
+++ b/htdocs/langs/fr_CM/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
diff --git a/htdocs/langs/fr_CM/admin.lang b/htdocs/langs/fr_CM/admin.lang
new file mode 100644
index 00000000000..27c312f77d7
--- /dev/null
+++ b/htdocs/langs/fr_CM/admin.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - admin
+MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+Module56Name=Telephony
+Module56Desc=Telephony integration
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_CM/main.lang b/htdocs/langs/fr_CM/main.lang
new file mode 100644
index 00000000000..2e691473326
--- /dev/null
+++ b/htdocs/langs/fr_CM/main.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
diff --git a/htdocs/langs/fr_CM/modulebuilder.lang b/htdocs/langs/fr_CM/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/fr_CM/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/fr_CM/projects.lang b/htdocs/langs/fr_CM/projects.lang
new file mode 100644
index 00000000000..7e42793b0e9
--- /dev/null
+++ b/htdocs/langs/fr_CM/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index eece6bb3014..0263549e3f2 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -2,7 +2,7 @@
 Accountancy=Comptabilité
 Accounting=Comptabilité
 ACCOUNTING_EXPORT_SEPARATORCSV=Séparateur de colonnes pour le fichier exporté
-ACCOUNTING_EXPORT_DATE=Format de date pour le fichier d'exportation
+ACCOUNTING_EXPORT_DATE=Format de date pour le fichier d'export
 ACCOUNTING_EXPORT_PIECE=Exporter la référence de la pièce ?
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exporter avec les lignes regroupées ?
 ACCOUNTING_EXPORT_LABEL=Exporter le libellé
@@ -93,7 +93,7 @@ AccountAccountingSuggest=Code comptable suggéré
 MenuDefaultAccounts=Comptes par défaut
 MenuBankAccounts=Comptes bancaires
 MenuVatAccounts=Comptes TVA
-MenuTaxAccounts=Comptes charges
+MenuTaxAccounts=Comptes charges soc./fisc.
 MenuExpenseReportAccounts=Comptes notes de frais
 MenuLoanAccounts=Comptes emprunts
 MenuProductsAccounts=Comptes produits
@@ -121,6 +121,7 @@ InvoiceLinesDone=Lignes de factures liées
 ExpenseReportLines=Lignes de notes de frais à lier
 ExpenseReportLinesDone=Lignes de notes de frais liées
 IntoAccount=Lier ligne avec le compte comptable
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Lier
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Compte comptable pour l'enregistrement des dons
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Compte comptable pour enregistrer les adhésions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte comptable par défaut pour les produits achetés (utilisé si non défini dans la fiche produit)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Compte comptable par défaut pour les produits achetés dans la CEE (utilisé si non défini dans la fiche produit)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Compte comptable par défaut pour les produits achetés et importés hors de la CEE (utilisé si non défini dans la fiche produit)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Compte comptable par défaut pour les produits vendus (utilisé si non défini dans la fiche produit)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Code comptable par défaut pour les produits vendus dans la CEE (utilisé si non définie dans la fiche produit)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Code comptable par défaut pour les produits vendus et exportés hors de la CEE (utilisé si non définie dans la fiche produit)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte comptable par défaut pour les services achetés (utilisé si non défini dans la fiche service)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Compte comptable par défaut pour les services achetés dans la CEE (utilisé si non défini dans la fiche service)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Compte comptable par défaut pour les services achetés et importés hors de la CEE (utilisé si non défini dans la fiche service)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte comptable par défaut pour les services vendus (utilisé si non défini dans la fiche service)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Compte comptable par défaut pour les services vendus dans la CEE (utilisé si non défini dans la fiche service)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Code comptable par défaut pour les services vendus et exportés hors de la CEE (utilisé si non définie dans la fiche produit)
@@ -228,11 +234,15 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Tiers inconnu et
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Compte tiers non défini ou inconnu. Erreur bloquante.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Compte tiers inconnu et compte d'attente non défini. Erreur blocante.
 PaymentsNotLinkedToProduct=Paiement non lié à un produit / service
-ShowOpeningBalance=Show opening balance
-HideOpeningBalance=Hide opening balance
+OpeningBalance=Opening balance
+ShowOpeningBalance=Afficher balance d'ouverture
+HideOpeningBalance=Cacher balance d'ouverture
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Groupe de comptes comptables
-PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+PcgtypeDesc=Les groupes de comptes sont utilisés comme critères de filtre et de regroupement prédéfinis pour certains rapports de comptabilité. Par exemple, «INCOME» ou «EXPENSE» sont utilisés en tant que groupes pour la comptabilité afin de générer le rapport dépenses / revenus.
+
+Reconcilable=Rapprochable
 
 TotalVente=Total chiffre affaires hors taxe
 TotalMarge=Total marge
@@ -308,10 +318,12 @@ Modelcsv_ebp=Export vers EBP
 Modelcsv_cogilog=Export vers Cogilog
 Modelcsv_agiris=Export vers Agiris
 Modelcsv_LDCompta=Export pour LD Compta (v9 et supérieur) (Test)
+Modelcsv_LDCompta10=Export pour LD Compta (v10 et supérieure)
 Modelcsv_openconcerto=Export pour OpenConcerto (Test)
 Modelcsv_configurable=Export configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export pour Sage 50 Suisse
+Modelcsv_winfic=Export pour Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Id plan comptable
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode ventes
 OptionModeProductSellIntra=Mode ventes exportées dans la CEE
 OptionModeProductSellExport=Mode ventes exportées dans d'autres pays
 OptionModeProductBuy=Mode achats
+OptionModeProductBuyIntra=Mode achats importés depuis la CEE
+OptionModeProductBuyExport=Mode achats importés dans d'autres pays
 OptionModeProductSellDesc=Afficher tous les produits/services avec le compte comptable pour les ventes.
 OptionModeProductSellIntraDesc=Afficher tous les produits avec un compte comptabilité pour les ventes dans la CEE.
 OptionModeProductSellExportDesc=Afficher tous les produits avec un compte comptable pour les autres ventes à les autres pays.
 OptionModeProductBuyDesc=Afficher tous les produits/services avec le compte comptable pour les achats.
+OptionModeProductBuyIntraDesc=Afficher tous les produits avec un compte comptable pour les achats dans les pays CEE.
+OptionModeProductBuyExportDesc=Afficher tous les produits avec un compte comptable pour les achats dans les pays hors CEE.
 CleanFixHistory=Effacer les données comptables des lignes qui n'existent pas dans le plan comptable
 CleanHistory=Réinitialiser tous les liens pour l'année sélectionnée
 PredefinedGroups=Groupes prédéfinis
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Compte supprimé du groupe
 SaleLocal=Vente locale
 SaleExport=Vente export
 SaleEEC=Vente dans la CEE
+SaleEECWithVAT=Vente dans la CEE avec un taux de TVA non nul, on considère qu'il s'agit d'une vente intracommunutaire à un assujetti à la TVA et le compte comptable suggéré est le compte comptable de vente classique.
+SaleEECWithoutVATNumber=Vente dans la CEE avec un taux de TVA nul mais sans numéro de TVA intracommunutaire renseigné dans la fiche du tiers. Nous forçons ainsi le compte comptable de vente classique. Il est nécessaire de renseigner le numéro de TVA intracommunautaire dans la fiche du tiers ou changer le compte comptable de vente si nécessaire.
 
 ## Dictionary
 Range=Plage de comptes
@@ -358,7 +376,7 @@ UseMenuToSetBindindManualy=Lignes non encore liées, utilisez le menu <a href="%
 
 ## Import
 ImportAccountingEntries=Écritures comptables
-DateExport=Date d'exportation
+DateExport=Date d'export
 WarningReportNotReliable=Attention : ce rapport n'est pas basé sur le grand livre et ne contient donc pas les écritures manuelles qui lui ont été ajoutées. Si votre journalisation est à jour, la vue depuis le grand livre sera plus précise.
 ExpenseReportJournal=Journal des notes de frais
 InventoryJournal=Journal d'inventaire
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 172153852e3..8d18f60c27b 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Utilisateur/groupe du serveur Web
 NoSessionFound=Votre PHP ne semble pas pouvoir lister les sessions actives. Le répertoire de sauvegarde des sessions (<b>%s</b>) est peut être protégé (Par exemple, par les permissions de l'OS ou par la directive open_basedir de votre PHP, ce qui d'un point de vue sécurité est une bonne chose).
 DBStoringCharset=Encodage base pour stockage données
 DBSortingCharset=Encodage base pour tri des données
+HostCharset=Host charset
 ClientCharset=Jeu de caractères du client
 ClientSortingCharset=Jeu de caractère de tri du client
 WarningModuleNotActive=Le module <b>%s</b> doit être activé pour utiliser cette fonction.
@@ -199,7 +200,7 @@ FeatureDisabledInDemo=Fonction désactivée dans la démo
 FeatureAvailableOnlyOnStable=Fonction disponible uniquement sur les versions officielles stables
 BoxesDesc=Les widgets sont des composants montrant des informations que vous pouvez ajouter à vos pages pour les personnaliser. Vous pouvez choisir de les afficher ou non en sélectionnant la page cible et en cliquant sur "Activer" ou "Désactiver".
 OnlyActiveElementsAreShown=Seuls les éléments en rapport avec un <a href="%s">module actif</a> sont présentés.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesDesc=Les modules Dolibarr définissent quelles fonctionnalités sont disponibles dans le logiciel. Certains modules / applications nécessitent, après activation, d'accorder des autorisations aux utilisateurs. Cliquez sur le bouton activé/désactivé <span class="small valignmiddle">%s</span> pour activer un module/application.
 ModulesMarketPlaceDesc=D'autres modules/extensions sont disponibles en téléchargement sur des sites externes sur Internet...
 ModulesDeployDesc=Si les permissions de votre système de fichier le permettent , vous pouvez utiliser cet outil pour déployer un module externe. Le module sera alors visible dans l'onglet <strong>%s</strong>.
 ModulesMarketPlaces=Rechercher un module/application externe
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Cases à cocher
 ExtrafieldCheckBoxFromList=Cases à cocher issues d'une table
 ExtrafieldLink=Lien vers un objet
 ComputedFormula=Champ calculé
-ComputedFormulaDesc=Vous pouvez entrer ici une formule utilisant les propriétés objet ou tout code PHP pour obtenir des valeurs dynamiques. Vous pouvez utiliser toute formule compatible PHP, incluant l'opérateur conditionnel "?", et les objets globaux : <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>ATTENTION</strong> : Seulement quelques propriétés de l'objet $object pourraient être disponibles. Si vous avez besoin de propriétés non chargées, créez vous même une instance de l'objet dans votre formule, comme dans le deuxième exemple.<br>Utiliser un champs calculé signifie que vous ne pouvez pas entrer vous même toute valeur à partir de l'interface. Aussi, s'il y a une erreur de syntaxe, la formule pourrait ne rien retourner.<br><br>Exemple de formule:<br> $object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Exemple pour recharger l'objet: <br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Un autre exemple de formule pour forcer le rechargement d'un objet et de son objet parent:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Objet parent projet non trouvé'
+ComputedFormulaDesc=Vous pouvez entrer ici une formule utilisant les propriétés objet ou tout code PHP pour obtenir des valeurs dynamiques. Vous pouvez utiliser toute formule compatible PHP, incluant l'opérateur conditionnel "?", et les objets globaux suivants : <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>ATTENTION</strong> : Seulement quelques propriétés de l'objet $object pourraient être disponibles. Si vous avez besoin de propriétés non chargées, créez vous même une instance de l'objet dans votre formule, comme dans le deuxième exemple.<br>Utiliser un champs calculé signifie que vous ne pouvez pas entrer vous même toute valeur à partir de l'interface. Aussi, s'il y a une erreur de syntaxe, la formule pourrait ne rien retourner.<br><br>Exemple de formule:<br> $object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Exemple pour recharger l'objet: <br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Un autre exemple de formule pour forcer le rechargement d'un objet et de son objet parent:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Objet parent projet non trouvé'
 Computedpersistent=Stocker le champ calculé
 ComputedpersistentDesc=Les champs supplémentaires calculés seront stockés dans la base de données. Toutefois, la valeur ne sera recalculée que lorsque l'objet de ce champ sera modifié. Si le champ calculé dépend d'autres objets ou de données globales, cette valeur peut être fausse !!
 ExtrafieldParamHelpPassword=Laissez ce champ vide signifie que la valeur sera stockée sans cryptage (le champ doit juste être caché avec des étoiles sur l'écran).<br> Définissez la valeur 'auto' pour utiliser la règle de cryptage par défaut pour enregistrer le mot de passe dans la base de données (ensuite la valeur utilisée sera le hash uniquement, sans moyen de retrouver la valeur d'origine)
@@ -448,8 +449,8 @@ KeepEmptyToUseDefault=Laisser ce champ vide pour utiliser la valeur par défaut
 DefaultLink=Lien par défaut
 SetAsDefault=Définir par défaut
 ValueOverwrittenByUserSetup=Attention, cette valeur peut être écrasée par une valeur spécifique à la configuration de l'utilisateur (chaque utilisateur pouvant avoir sa propre URL « clicktodial »)
-ExternalModule=External module
-InstalledInto=Installed into directory %s
+ExternalModule=Module externe
+InstalledInto=Installé dans le répertoire %s
 BarcodeInitForthird-parties=Initialisation du code-barre en masse pour les tiers
 BarcodeInitForProductsOrServices=Initialisation ou purge en masse des codes-barre des produits ou services
 CurrentlyNWithoutBarCode=Actuellement, vous avez <strong>%s</strong> enregistrements sur <strong>%s</strong> %s sans code barre défini.
@@ -950,7 +951,7 @@ DictionaryCanton=Etats/Province
 DictionaryRegion=Régions
 DictionaryCountry=Pays
 DictionaryCurrency=Monnaies
-DictionaryCivility=Honorific titles
+DictionaryCivility=Titres de civilité
 DictionaryActions=Liste des types d'événements de l'agenda
 DictionarySocialContributions=Types de charges sociales ou fiscales
 DictionaryVAT=Taux de TVA ou de Taxes de Ventes
@@ -991,7 +992,7 @@ VATIsNotUsedDesc=Le taux de TVA proposé par défaut est 0. C'est le cas d'assoc
 VATIsUsedExampleFR=En France, cela signifie que les entreprises ou les organisations sont assujetis à la tva (réel ou normal).
 VATIsNotUsedExampleFR=En France, il s'agit des associations ne déclarant pas de TVA ou sociétés, organismes ou professions libérales ayant choisi le régime fiscal micro entreprise (TVA en franchise) et payant une TVA en franchise sans faire de déclaration de TVA. Ce choix fait de plus apparaître la mention "TVA non applicable - art-293B du CGI" sur les factures.
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
+TypeOfSaleTaxes=Type de taxe de vente
 LTRate=Taux
 LocalTax1IsNotUsed=Non assujeti
 LocalTax1IsUsedDesc=Utilisation d'un 2ème type taxe (autre que le premier)
@@ -1015,9 +1016,9 @@ LocalTax2IsUsedDescES=Le IRPF proposé par défaut lors de la création de propa
 LocalTax2IsNotUsedDescES=L'IRPF proposé par défaut est 0. Fin de règle.
 LocalTax2IsUsedExampleES=En Espagne, ce sont des professionnels autonomes et indépendants qui offrent des services, et des sociétés qui ont choisi le système fiscal du module.
 LocalTax2IsNotUsedExampleES=En Espagne, ce sont des sociétés qui ne sont pas soumises au système fiscal du module.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
-UseRevenueStamp=Use a tax stamp
-UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
+UseRevenueStamp=Utilisez un timbre fiscal
+UseRevenueStampExample=La valeur du timbre fiscal est définie par défaut dans la configuration des dictionnaires (%s - %s - %s)
 CalcLocaltax=Rapports sur les taxes locales
 CalcLocaltax1=Ventes - Achats
 CalcLocaltax1Desc=Les rapports des Taxes locales sont calculées avec la différence entre les taxes locales de ventes et les taxes locales d'achats
@@ -1025,7 +1026,7 @@ CalcLocaltax2=Achats
 CalcLocaltax2Desc=Le Rapport des Taxes locales sont le total des taxes locales d'achats
 CalcLocaltax3=Ventes
 CalcLocaltax3Desc=Le Rapports des Taxes locales sont le total des taxes locales de ventes
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+NoLocalTaxXForThisCountry=Selon la configuration des taxes (voir %s - %s - %s), votre pays n'a pas besoin d'utiliser ce type de taxe
 LabelUsedByDefault=Libellé qui sera utilisé si aucune traduction n'est trouvée pour ce code
 LabelOnDocuments=Libellé sur les documents
 LabelOrTranslationKey=Libellé ou clé de traduction
@@ -1272,7 +1273,7 @@ RuleForGeneratedPasswords=Règle pour la génération des mots de passe proposé
 DisableForgetPasswordLinkOnLogonPage=Cacher le lien "Mot de passe oublié" sur la page de connexion
 UsersSetup=Configuration du module utilisateurs
 UserMailRequired=Email requis pour créer un nouvel utilisateur
-UserHideInactive=Cacher les utilisateurs inactifs
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Modèles de documents pour les documents générés à partir de la fiche utilisateur
 GroupsDocModules=Modèles de documents pour les documents générés à partir de la fiche d'un groupe
 ##### HRM setup #####
@@ -1306,7 +1307,7 @@ BillsPDFModules=Modèle de document de factures
 BillsPDFModulesAccordindToInvoiceType=Modèles de documents de facturation en fonction du type de facture
 PaymentsPDFModules=Modèle de document pour les règlements
 ForceInvoiceDate=Forcer la date de facturation à la date de validation (seulement de Brouillon à Impayée)
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestedPaymentModesIfNotDefinedInInvoice=Mode de paiement suggéré sur la facture par défaut s'il n'est pas défini sur la facture
 SuggestPaymentByRIBOnAccount=Proposer paiement par virement sur le compte
 SuggestPaymentByChequeToAddress=Proposer paiement par chèque à l'ordre et adresse de
 FreeLegalTextOnInvoices=Mention complémentaire sur les factures
@@ -1318,7 +1319,7 @@ SupplierPaymentSetup=Configuration des règlements fournisseurs
 PropalSetup=Configuration du module Propositions Commerciales
 ProposalsNumberingModules=Modèles de numérotation des propositions commerciales
 ProposalsPDFModules=Modèles de documents de propositions commerciales
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Mode de paiement suggéré sur les propositions par défaut s'il n'est pas défini au niveau de la proposition
 FreeLegalTextOnProposal=Mention complémentaire sur les propositions commerciales
 WatermarkOnDraftProposal=Filigrane sur les brouillons de propositions commerciales (aucun si vide)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Saisir le compte bancaire cible lors de la proposition commerciale
@@ -1333,7 +1334,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Demander pour l'entrepôt-source pour la co
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Demandez le compte bancaire destination de commande fournisseur
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Mode de paiement suggéré sur le document de la commande par défaut s'il n'est pas défini sur la commande
 OrdersSetup=Configuration du module Commandes
 OrdersNumberingModules=Modèles de numérotation des commandes
 OrdersModelModule=Modèles de document des commandes
@@ -1732,7 +1733,7 @@ MultiCompanySetup=Configuration du module Multi-société
 ##### Suppliers #####
 SuppliersSetup=Configuration du module Fournisseurs
 SuppliersCommandModel=Modèle de commande fournisseur complet 
-SuppliersCommandModelMuscadet=Modèle de commande fournisseur complet 
+SuppliersCommandModelMuscadet=Modèle de commande fournisseur complet (ancienne implémentation du modèle Cornas)
 SuppliersInvoiceModel=Modèle de facture fournisseur complet
 SuppliersInvoiceNumberingModel=Modèles de numérotation des factures fournisseur
 IfSetToYesDontForgetPermission=Si positionné sur une valeur non nulle, n'oubliez pas de donner les permissions aux groupes ou utilisateurs qui auront le droit de cette seconde approbation.
@@ -1804,7 +1805,7 @@ TopMenuDisableImages=Cacher les images du menu principal
 LeftMenuBackgroundColor=Couleur de fond pour le menu Gauche
 BackgroundTableTitleColor=Couleur de fond pour la ligne de titres des liste/tableaux
 BackgroundTableTitleTextColor=Couleur du texte pour la ligne de titre des tableaux
-BackgroundTableTitleTextlinkColor=Couleur du texte pour la ligne de titre lien des tableaux
+BackgroundTableTitleTextlinkColor=Couleur du texte pour la ligne de lien du titre du tableau
 BackgroundTableLineOddColor=Couleur de fond pour les lignes impaires des tables
 BackgroundTableLineEvenColor=Couleur de fond pour les lignes paires des tales
 MinimumNoticePeriod=Période de préavis minimum (Votre demande de congé doit être faite avant ce délai)
@@ -1938,7 +1939,7 @@ WithoutDolTrackingID=Référence Dolibarr non trouvée dans l'ID du message
 FormatZip=Zip
 MainMenuCode=Code d'entrée du menu (mainmenu)
 ECMAutoTree=Afficher l'arborescence GED automatique
-OperationParamDesc=Définissez les valeurs à utiliser pour l'action, ou comment extraire les valeurs. Par exemple: <br> objproperty1 = SET:abc <br> objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4 = EXTRACT: HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br> <br> Utilisez un charactère ; comme séparateur pour extraire ou définir plusieurs propriétés.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Heures d'ouverture
 OpeningHoursDesc=Entrez ici les heures d'ouverture régulières de votre entreprise.
 ResourceSetup=Configuration du module Ressource
@@ -1995,5 +1996,7 @@ EmailTemplate=Modèle d'e-mail
 EMailsWillHaveMessageID=Les e-mails auront une étiquette 'References' correspondant à cette syntaxe
 PDF_USE_ALSO_LANGUAGE_CODE=Si vous souhaitez que certains textes de votre PDF soient dupliqués dans 2 langues différentes dans le même PDF généré, vous devez définir ici cette deuxième langue pour que le PDF généré contienne 2 langues différentes dans la même page, celle choisie lors de la génération du PDF et celle-ci (seuls quelques modèles PDF prennent en charge cette fonction). Gardez vide pour 1 langue par PDF.
 FafaIconSocialNetworksDesc=Entrez ici le code d'une icône FontAwesome. Si vous ne savez pas ce qu'est FontAwesome, vous pouvez utiliser la valeur générique fa-address-book.
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
+RssNote=Remarque: Chaque définition de flux RSS fournit un widget que vous devez activer pour qu'il soit disponible dans le tableau de bord
+JumpToBoxes=Aller à la Configuration -> Widgets
+MeasuringUnitTypeDesc=Utilisez ici une valeur comme "taille", "surface", "volume", "poids", "temps".
+MeasuringScaleDesc=L'échelle est le nombre de positions où vous devez déplacer la partie décimale pour qu'elle corresponde à l'unité de référence par défaut. Pour le type d'unité "temps", c'est le nombre de secondes. Les valeurs comprises entre 80 et 99 sont des valeurs réservées.
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 6ad3faba02d..db442bb5705 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -209,20 +209,13 @@ NumberOfBillsByMonth=Nb de factures par mois
 AmountOfBills=Montant de factures
 AmountOfBillsHT=Montant des factures (HT)
 AmountOfBillsByMonthHT=Montant de factures par mois (HT)
-ShowSocialContribution=Afficher charge fiscale/sociale
-ShowBill=Afficher facture
-ShowInvoice=Afficher facture
-ShowInvoiceReplace=Afficher facture de remplacement
-ShowInvoiceAvoir=Afficher facture d'avoir
-ShowInvoiceDeposit=Afficher facture d'acompte
-ShowInvoiceSituation=Afficher la facture de situation
 UseSituationInvoices=Autoriser les factures de situation
 UseSituationInvoicesCreditNote=Autoriser les avoirs de factures de situation
 Retainedwarranty=Retenue de garantie
-AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
+AllowedInvoiceForRetainedWarranty=Garantie conservée utilisable sur les types de factures suivants
 RetainedwarrantyDefaultPercent=Pourcentage par défaut de la retenue de garantie
-RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
-RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
+RetainedwarrantyOnlyForSituation=Rendre la "retenue de garantie" disponible uniquement pour les factures de situation
+RetainedwarrantyOnlyForSituationFinal=Sur les factures de situation, la déduction globale pour "retenue de garantie" n'est appliquée que sur la facture de situation finale
 ToPayOn=A payer sur %s
 toPayOn=à payer sur %s
 RetainedWarranty=Retenue de garantie
@@ -233,7 +226,6 @@ setretainedwarranty=Définir la retenue de garantie
 setretainedwarrantyDateLimit=Définir la date limite de retenue de garantie
 RetainedWarrantyDateLimit=Date limite de retenue de garantie
 RetainedWarrantyNeed100Percent=La facture de la situation doit être à 100%% progress pour être affichée sur le PDF
-ShowPayment=Afficher règlement
 AlreadyPaid=Déjà réglé
 AlreadyPaidBack=Déjà remboursé
 AlreadyPaidNoCreditNotesNoDeposits=Déjà réglé (hors avoirs et acomptes)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Généré à partir du modèle de facture %s
 WarningInvoiceDateInFuture=Attention, la date de facturation est antérieur à la date actuelle
 WarningInvoiceDateTooFarInFuture=Attention, la date de facturation est trop éloignée de la date actuelle
 ViewAvailableGlobalDiscounts=Voir les remises disponibles
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=État
 PaymentConditionShortRECEP=A réception
@@ -512,11 +505,11 @@ ToMakePayment=Payer
 ToMakePaymentBack=Rembourser
 ListOfYourUnpaidInvoices=Liste des factures impayées
 NoteListOfYourUnpaidInvoices=Remarque: Cette liste ne contient que les factures des Tiers pour lesquels vous êtes le commercial affecté.
-RevenueStamp=Tax stamp
+RevenueStamp=Timbre fiscal
 YouMustCreateInvoiceFromThird=Cette option est disponible uniquement lors de la création de factures depuis l'onglet "client" du tiers
 YouMustCreateInvoiceFromSupplierThird=Cette option est disponible uniquement lors de la création d'une facture depuis l'onglet "fournisseur" d'un tiers
 YouMustCreateStandardInvoiceFirstDesc=Pour créer une facture modèle, vous devez d'abord créer une facture standard brouillon et la convertir en modèle.
-PDFCrabeDescription=Modèle de facture PDF Crabe. Un modèle de facture complet 
+PDFCrabeDescription=Modèle de facture PDF Crabe. Un modèle de facture complet (ancienne implémentation du modèle Sponge)
 PDFSpongeDescription=Modèle de facture PDF Sponge. Un modèle de facture complet
 PDFCrevetteDescription=Modèle de facture PDF Crevette (modèle complet pour les factures de situation)
 TerreNumRefModelDesc1=Renvoie le numéro sous la forme %syymm-nnnn pour les factures et factures de remplacement, %syymm-nnnn pour les avoirs et %syymm-nnnn pour les acomptes où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index f07b314db1b..d1aa1c677fa 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -49,7 +49,7 @@ Footer=Bas de page
 AmountAtEndOfPeriod=Montant en fin de période (jour, mois ou année)
 TheoricalAmount=Montant théorique
 RealAmount=Montant réel
-CashFence=Cash fence
+CashFence=Clôture de caisse
 CashFenceDone=Clôture de caisse faite pour la période
 NbOfInvoices=Nb de factures
 Paymentnumpad=Type de pavé pour entrer le paiement
@@ -90,7 +90,7 @@ HeadBar=Bandeau du haut
 SortProductField=Champ de tri des produits
 Browser=Navigateur
 BrowserMethodDescription=Impression simple et facile des reçus. Seuls quelques paramètres pour configurer le reçu. Impression via le navigateur.
-TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
+TakeposConnectorMethodDescription=Module externe avec fonctionnalités supplémentaires. Possibilité d'imprimer depuis le cloud.
 PrintMethod=Méthode d'impression
 ReceiptPrinterMethodDescription=Méthode puissante avec beaucoup de paramètres. Entièrement personnalisable avec des modèles. Impossible d'imprimer à partir du cloud.
 ByTerminal=Par terminal
@@ -102,7 +102,9 @@ StartAParallelSale=Lancer une nouvelle vente en parallèle
 ControlCashOpening=Popup d'ouverture de caisse à l'ouverture
 CloseCashFence=Clôturer la caisse
 CashReport=Rapport de caisse
-MainPrinterToUse=Main printer to use
-OrderPrinterToUse=Printer to use
-MainTemplateToUse=Main template to use
-OrderTemplateToUse=Template to use for order
+MainPrinterToUse=Imprimante principale à utiliser
+OrderPrinterToUse=Imprimante à utiliser
+MainTemplateToUse=Modèle principal à utiliser
+OrderTemplateToUse=Modèle de commande à utiliser
+BarRestaurant=Bar Restaurant
+AutoOrder=Commande automatique du client
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index 850f1e99263..7101ec05242 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -325,7 +325,8 @@ CompanyDeleted=La société "%s" a été supprimée de la base.
 ListOfContacts=Liste des contacts
 ListOfContactsAddresses=Liste des contacts/adresses
 ListOfThirdParties=Liste des tiers
-ShowContact=Afficher contact
+ShowCompany=Tiers
+ShowContact=Adresse de contact
 ContactsAllShort=Tous (pas de filtre)
 ContactType=Type de contact
 ContactForOrders=Contact de commandes
@@ -446,7 +447,7 @@ SaleRepresentativeFirstname=Prénom du commercial
 SaleRepresentativeLastname=Nom du commercial
 ErrorThirdpartiesMerge=Une erreur est survenue lors de la suppression de ce tiers. Consultez les log. La modification a été annulée.
 NewCustomerSupplierCodeProposed=Code client ou fournisseur déjà utilisé, un nouveau code est suggéré
-KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+KeepEmptyIfGenericAddress=Gardez ce champ vide si cette adresse est une adresse générique
 #Imports
 PaymentTypeCustomer=Type de paiement - Client
 PaymentTermsCustomer=Conditions de paiement - Client
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index d4c59754898..3eb8b17150a 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=Voir %sanalyse des paiements%s pour un calcul sur les
 SeeReportInDueDebtMode=Voir %sanalyse des factures%s pour un calcul basé sur les factures enregistrées connues même si elles ne sont pas encore comptabilisées dans le Grand Livre.
 SeeReportInBookkeepingMode=Voir le <b> %sRapport sur le Grand Livre%s </b> pour un calcul sur les <b> tables du Grand Livre</b>
 RulesAmountWithTaxIncluded=- Les montants affichés sont les montants taxe incluse
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
+RulesResultDue=- Il comprend les factures impayées, les dépenses, la TVA, les dons, qu'ils soient payées ou non. Il comprend également les salaires versés. <br> - Il est basé sur la date de facturation des factures et sur la date des dépenses et paiement des taxes. Pour les salaires définis avec le module Salaire, la date de valeur du paiement est utilisée.
 RulesResultInOut=- Il comprend les paiements réels effectués sur les factures, les dépenses, la TVA et les salaires. <br> - Il est basé sur les dates de paiement des factures, les dépenses, la TVA et les salaires. La date du don pour le don.
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
+RulesCADue=- Il inclut les factures clients dues, qu'elles soient payées ou non.<br>- Il se base sur la date de facturation de ces factures.<br>
 RulesCAIn=- Il inclut les règlements effectivement reçus des factures clients.<br>- Il se base sur la date de règlement de ces factures<br>
 RulesCATotalSaleJournal=Il comprend toutes les lignes du journal de vente.
 RulesAmountOnInOutBookkeepingRecord=Cela inclut les enregistrements dans votre Grand Livre ayant les comptes de comptabilité qui ont le groupe "EXPENSE" ou "INCOME"
@@ -255,12 +255,12 @@ TurnoverbyVatrate=Chiffre d'affaire facturé par taux de TVA
 TurnoverCollectedbyVatrate=Chiffre d'affaires encaissé par taux de TVA
 PurchasebyVatrate=Achat par taux de TVA
 LabelToShow=Libellé court
-PurchaseTurnover=Purchase turnover
-PurchaseTurnoverCollected=Purchase turnover collected
-RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
-RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
-RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
-ReportPurchaseTurnover=Purchase turnover invoiced
-ReportPurchaseTurnoverCollected=Purchase turnover collected
-IncludeVarpaysInResults = Inclure les payments divers dans les rapports
-IncludeLoansInResults = Inclure les emprunts dans les rapports
+PurchaseTurnover=Chiffre d'affaires d'achat
+PurchaseTurnoverCollected=Chiffre d'affaires d'achat collecté
+RulesPurchaseTurnoverDue=- Il comprend les factures dues par le fournisseur, qu'elles soient payées ou non. <br> - Il est basé sur la date de facturation de ces factures. <br>
+RulesPurchaseTurnoverIn=- Il comprend tous les paiements effectifs des factures effectuées aux fournisseurs. <br> - Il est basé sur la date de paiement de ces factures <br>
+RulesPurchaseTurnoverTotalPurchaseJournal=Il comprend toutes les lignes de débit du journal d'achat.
+ReportPurchaseTurnover=Chiffre d'affaires d'achat facturé
+ReportPurchaseTurnoverCollected=Chiffre d'affaires d'achat encaissé
+IncludeVarpaysInResults = Inclure divers paiements dans les rapports
+IncludeLoansInResults = Inclure les prêts dans les rapports
diff --git a/htdocs/langs/fr_FR/interventions.lang b/htdocs/langs/fr_FR/interventions.lang
index 407e8dbec26..43722fe2bfd 100644
--- a/htdocs/langs/fr_FR/interventions.lang
+++ b/htdocs/langs/fr_FR/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Espace interventions
 DraftFichinter=Interventions brouillon
 LastModifiedInterventions=Les %s dernières interventions modifiées
 FichinterToProcess=Interventions à traiter
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Contact client suivi de l'intervention
-# Modele numérotation
 PrintProductsOnFichinter=Imprimer aussi les lignes de type "produit" (pas seulement de type service) sur les fiches d'intervention
 PrintProductsOnFichinterDetails=interventions générées à partir des commandes
 UseServicesDurationOnFichinter=Utiliser la durée des services dans les interventions créées depuis des commandes
@@ -53,7 +51,6 @@ InterventionStatistics=Statistiques des interventions
 NbOfinterventions=Nb de fiches d'intervention
 NumberOfInterventionsByMonth=Nb de fiches d'intervention par mois (date de validation)
 AmountOfInteventionNotIncludedByDefault=Le total des interventions 'nest pas inclus par défaut dans les profits (dans la plupart des cas, les feuilles de temps totalisent le temps passé). Activez l'option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT à 1 dans Accueil > Condiguration > Divers
-##### Exports #####
 InterId=Id intervention
 InterRef=Intervention ref.
 InterDateCreation=Date création intervention
@@ -65,3 +62,5 @@ InterLineId=Id ligne intervention
 InterLineDate=Date ligne intervention
 InterLineDuration=Durée ligne intervention
 InterLineDesc=Description ligne intervention
+RepeatableIntervention=Modèle d'intervention
+ToCreateAPredefinedIntervention=Pour créer une intervention prédéfinie ou récurrente, créez une intervention standard et convertissez-la en modèle d'intervention
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 611d27d7723..03212c77540 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -426,6 +426,7 @@ Modules=Modules/Applications
 Option=Option
 List=Liste
 FullList=Liste complète
+FullConversation=Conversation complète
 Statistics=Statistiques
 OtherStatistics=Autres statistiques
 Status=État
@@ -830,8 +831,8 @@ Gender=Genre
 Genderman=Homme
 Genderwoman=Femme
 ViewList=Vue liste
-ViewGantt=Gantt view
-ViewKanban=Kanban view
+ViewGantt=Vue Gantt
+ViewKanban=Vue Kanban
 Mandatory=Obligatoire
 Hello=Bonjour
 GoodBye=Au revoir
@@ -953,6 +954,7 @@ SearchIntoMembers=Adhérents
 SearchIntoUsers=Utilisateurs
 SearchIntoProductsOrServices=Produits ou services
 SearchIntoProjects=Projets
+SearchIntoMO=Ordres de fabrication
 SearchIntoTasks=Tâches
 SearchIntoCustomerInvoices=Factures clients
 SearchIntoSupplierInvoices=Factures fournisseur
@@ -1026,5 +1028,8 @@ Measures=Mesures
 XAxis=Axe X
 YAxis=Axe Y
 StatusOfRefMustBe=Le statut de %s doit être %s
-DeleteFileHeader=Confirm file delete
-DeleteFileText=Do you really want delete this file?
+DeleteFileHeader=Confirmer la suppression du fichier
+DeleteFileText=Voulez-vous vraiment supprimer ce fichier?
+ShowOtherLanguages=Afficher les autres langues
+SwitchInEditModeToAddTranslation=Passer en mode édition pour ajouter des traductions pour cette langue
+NotUsedForThisCustomer=Non utilisé pour ce client
diff --git a/htdocs/langs/fr_FR/modulebuilder.lang b/htdocs/langs/fr_FR/modulebuilder.lang
index 5c88c9173ac..ea734dd7587 100644
--- a/htdocs/langs/fr_FR/modulebuilder.lang
+++ b/htdocs/langs/fr_FR/modulebuilder.lang
@@ -83,9 +83,9 @@ ListOfDictionariesEntries=Liste des entrées de dictionnaires
 ListOfPermissionsDefined=Liste des permissions
 SeeExamples=Voir des exemples ici
 EnabledDesc=Condition pour que ce champ soit actif (Exemples: 1 ou $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Le champ est-il visible ? (Exemples: 0 = Jamais visible, 1 = Visible sur les listes et formulaires de création/mise à jour/visualisation, 2 = Visible uniquement sur la liste, 3 = Visible uniquement sur le formulaire de création/mise à jour/affichage (pas les listes), 4=Visible sur les listes et formulaire de mise à jour et affichage uniquement (pas en création), 5=Visible sur les listes et formulaire en lecture (pas en création ni modification). Utiliser une valeur négative signifie que le champ n'est pas affiché par défaut sur la liste mais peut être sélectionné pour l'affichage). Il peut s'agir d'une expression, par exemple :  <br> preg_match('/public/', $_SERVER['PHP_SELF'])?0:1 <br> ($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
-DisplayOnPdf=Display on PDF
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Affichez ce champ sur les documents PDF compatibles, vous pouvez gérer la position avec le champ "Position". <br/> Actuellement, les modèles compatibles PDF connus sont: Eratostene (ordre), Espadon (navire), une éponge (factures), cyan (Propal / citation), Cornas (commande fournisseur) <br/> <br/> <strong> Pour le document: </strong> <br/> 0 = non affiché <br/> 1 = affiché <br/> 2 = affiché uniquement si non vide <br/> <br/> <strong> Pour les lignes de document: </strong> <br/> 0 = non affiché <br/> 1 = affiché dans une colonne <br/> 3 = affiché dans la colonne de description de ligne après la description <br/> 4 = affiché dans la colonne de description après le description uniquement si non vide
+DisplayOnPdf=Afficher sur PDF
 IsAMeasureDesc=Peut-on cumuler la valeur du champ pour obtenir un total dans les listes ? (Exemples: 1 ou 0)
 SearchAllDesc=Le champ doit-il être utilisé pour effectuer une recherche à partir de l'outil de recherche rapide ? (Exemples: 1 ou 0)
 SpecDefDesc=Entrez ici toute la documentation que vous souhaitez joindre au module et qui n'a pas encore été définis dans d'autres onglets. Vous pouvez utiliser .md ou, mieux, la syntaxe enrichie .asciidoc.
@@ -94,7 +94,7 @@ MenusDefDesc=Définissez ici les menus fournis par votre module
 DictionariesDefDesc=Définissez ici les dictionnaires fournis par le module
 PermissionsDefDesc=Définissez ici les nouvelles permissions fournies par votre module
 MenusDefDescTooltip=Les menus fournis par votre module / application sont définis dans le tableau <strong>$this->menus</strong> dans le fichier descripteur de module. Vous pouvez modifier manuellement ce fichier ou utiliser l'éditeur intégré. <br><br> Remarque: une fois définis (et les modules réactivés), les menus sont également visibles dans l'éditeur de menus mis à la disposition des utilisateurs administrateurs sur %s.
-DictionariesDefDescTooltip=Les dictionnaires fournis par votre module/application sont définis dans le tableau <strong>$this->dictionnaires</strong> dans le fichier descripteur de module. Vous pouvez modifier manuellement ce fichier ou utiliser l'éditeur intégré. <br><br> Remarque: une fois définis (et réactivés par le module), les dictionnaires sont également visibles dans la zone de configuration par les utilisateurs administrateurs sur %s.
+DictionariesDefDescTooltip=Les dictionnaires fournis par votre module/application sont définis dans le tableau <strong>$this->dictionaries</strong> dans le fichier descripteur de module. Vous pouvez modifier manuellement ce fichier ou utiliser l'éditeur intégré. <br><br> Remarque: une fois définis (et module réactivé), les dictionnaires sont également visibles dans la zone de configuration par les utilisateurs administrateurs sur %s.
 PermissionsDefDescTooltip=Les autorisations fournies par votre module / application sont définies dans le tableau <strong>$this->rights</strong> dans le fichier descripteur de module. Vous pouvez modifier manuellement ce fichier ou utiliser l'éditeur intégré. <br><br> Remarque: une fois définies (et le module réactivé), les autorisations sont visibles dans la configuration par défaut des autorisations %s.
 HooksDefDesc=Définissez dans la propriété <b> module_parts ['hooks'] </b>, dans le descripteur de module, le contexte des hooks à gérer (la liste des contextes peut être trouvée par une recherche sur '<b> initHooks (</b>' dans le code du noyau). <br> Editez le fichier hook pour ajouter le code de vos fonctions hookées (les fonctions hookables peuvent être trouvées par une recherche sur '<b> executeHooks </b>' dans le code core).
 TriggerDefDesc=Définissez dans le fichier trigger le code que vous souhaitez exécuter pour chaque événement métier exécuté.
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index c7720799935..4c1ee9a3c33 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -22,7 +22,7 @@ ClosedProjectsAreHidden=Les projets fermés ne sont pas visible.
 TasksPublicDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité.
 TasksDesc=Cette vue présente tous les projets et tâches (vos habilitations vous offrant une vue exhaustive).
 AllTaskVisibleButEditIfYouAreAssigned=Toutes les tâches des projets sont visibles mais il n'est possible de saisir du temps passé que sur celles assignées à l'utilisateur sélectionné.\nAssignez la tâche si elle ne l'est pas déjà pour pouvoir saisir du temps dessus.
-OnlyYourTaskAreVisible=Seules les tâches qui vous sont assignées sont visibles. Assignez vous une tâche pour la voir et saisir du temps passé
+OnlyYourTaskAreVisible=Seules les tâches qui vous sont assignées sont visibles. Assignez vous une tâche pour la voir et saisir du temps.
 ImportDatasetTasks=Tâches des projets
 ProjectCategories=Catégories/tags de projet
 NewProject=Nouveau projet
@@ -162,7 +162,7 @@ OpportunityProbability=Probabilité d'opportunité
 OpportunityProbabilityShort=Prob. opp.
 OpportunityAmount=Montant opportunité
 OpportunityAmountShort=Montant opportunité
-OpportunityWeightedAmount=Montant pondéré opportunité
+OpportunityWeightedAmount=Montant pondéré des opportunités
 OpportunityWeightedAmountShort=Montant pondéré opp.
 OpportunityAmountAverageShort=montant moyen des opportunités
 OpportunityAmountWeigthedShort=Montant pondéré des opportunités
@@ -186,7 +186,7 @@ PlannedWorkload=Charge de travail prévue
 PlannedWorkloadShort=Charge de travail
 ProjectReferers=Objets associés
 ProjectMustBeValidatedFirst=Le projet doit être validé d'abord
-FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+FirstAddRessourceToAllocateTime=Affecter un utilisateur comme contact du projet pour saisir des temps
 InputPerDay=Saisie par jour
 InputPerWeek=Saisie par semaine
 InputPerMonth=Saisie par mois
@@ -238,7 +238,7 @@ LatestModifiedProjects=Les %s derniers projets modifiés
 OtherFilteredTasks=Autres tâches filtrées
 NoAssignedTasks=Aucune tâche assignée (assignez un projet/tâche à l'utilisateur depuis la liste déroulante utilisateur en haut pour pouvoir saisir du temps dessus)
 ThirdPartyRequiredToGenerateInvoice=Un tiers doit être défini sur le projet pour pouvoir le facturer.
-ChooseANotYetAssignedTask=Choisissez une tâches qui ne vous pas encore assignée
+ChooseANotYetAssignedTask=Choisissez une tâches qui ne vous est pas encore assignée
 # Comments trans
 AllowCommentOnTask=Autoriser les utilisateurs à ajouter des commentaires sur les tâches
 AllowCommentOnProject=Autoriser les commentaires utilisateur sur les projets
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service à utiliser sur les lignes
 InvoiceGeneratedFromTimeSpent=La facture %s a été générée à partir du temps passé sur le projet
 ProjectBillTimeDescription=Cochez si vous saisissez du temps sur les tâches du projet ET prévoyez de générer des factures à partir des temps pour facturer le client du projet (ne cochez pas si vous comptez créer une facture qui n'est pas basée sur la saisie des temps). Note: Pour générer une facture, aller sur l'onglet 'Temps consommé' du project et sélectionnez les lignes à inclure.
 ProjectFollowOpportunity=Suivre une opportunité 
-ProjectFollowTasks=Suivre une tache
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Utilisation: Opportunité
 UsageTasks=Utilisation: Tâches
diff --git a/htdocs/langs/fr_FR/receiptprinter.lang b/htdocs/langs/fr_FR/receiptprinter.lang
index 8ed2664fa67..a092201b65b 100644
--- a/htdocs/langs/fr_FR/receiptprinter.lang
+++ b/htdocs/langs/fr_FR/receiptprinter.lang
@@ -63,33 +63,33 @@ DOL_VALUE_MONTH_LETTERS=Mois de facturation en lettres
 DOL_VALUE_MONTH=Mois de facturation
 DOL_VALUE_DAY=Jour de facturation
 DOL_VALUE_DAY_LETTERS=Jour de facturation en lettres
-DOL_LINE_FEED_REVERSE=Line feed reverse
-DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_LINE_FEED_REVERSE=Retour à la ligne
+DOL_VALUE_OBJECT_ID=ID de la facture
 DOL_VALUE_OBJECT_REF=Réf facture
-DOL_PRINT_OBJECT_LINES=Invoice lines
-DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
-DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
-DOL_VALUE_CUSTOMER_MAIL=Customer mail
-DOL_VALUE_CUSTOMER_PHONE=Customer phone
-DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
-DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
-DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
-DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
-DOL_VALUE_MYSOC_NAME=Your company name
-DOL_VALUE_MYSOC_ADDRESS=Your company address
-DOL_VALUE_MYSOC_ZIP=Your zip code
-DOL_VALUE_MYSOC_TOWN=Your town
-DOL_VALUE_MYSOC_COUNTRY=Your country
-DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
-DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
-DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
-DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
-DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
-DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_PRINT_OBJECT_LINES=Lignes de facture
+DOL_VALUE_CUSTOMER_FIRSTNAME=Prénom du client
+DOL_VALUE_CUSTOMER_LASTNAME=Nom du client
+DOL_VALUE_CUSTOMER_MAIL=Email client
+DOL_VALUE_CUSTOMER_PHONE=Téléphone du client
+DOL_VALUE_CUSTOMER_MOBILE=Portable du client
+DOL_VALUE_CUSTOMER_SKYPE=Skype du client
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Numéro TVA du client
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Solde du compte client
+DOL_VALUE_MYSOC_NAME=Nom de votre société
+DOL_VALUE_MYSOC_ADDRESS=Adresse de votre société
+DOL_VALUE_MYSOC_ZIP=Votre code postal
+DOL_VALUE_MYSOC_TOWN=Votre ville
+DOL_VALUE_MYSOC_COUNTRY=Votre pays
+DOL_VALUE_MYSOC_IDPROF1=Votre IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Votre IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Votre IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Votre IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Votre IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Votre IDPROF6
 DOL_VALUE_MYSOC_TVA_INTRA=Numéro de TVA intracommunautaire
 DOL_VALUE_MYSOC_CAPITAL=Capital
-DOL_VALUE_VENDOR_LASTNAME=Vendor last name
-DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
-DOL_VALUE_VENDOR_MAIL=Vendor mail
-DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_VENDOR_LASTNAME=Nom du vendeur
+DOL_VALUE_VENDOR_FIRSTNAME=Prénom du vendeur
+DOL_VALUE_VENDOR_MAIL=Email du vendeur
+DOL_VALUE_CUSTOMER_POINTS=Points client
 DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 36c16959e50..1ed6c956e66 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=L'utilisateur créé sera un utilisateur externe (car li
 IdPhoneCaller=Identifiant appelant (téléphone)
 NewUserCreated=Création utilisateur %s
 NewUserPassword=Changement mot de passe de %s
+NewPasswordValidated=Votre nouveau mot de passe a été validé et doit être utilisé maintenant pour vous connecter.
 EventUserModified=Modification utilisateur %s
 UserDisabled=Désactivation utilisateur %s
 UserEnabled=Activation utilisateur %s
@@ -113,5 +114,5 @@ CantDisableYourself=Vous ne pouvez pas désactiver votre propre compte utilisate
 ForceUserExpenseValidator=Forcer le valideur des notes de frais
 ForceUserHolidayValidator=Forcer le valideur des congés
 ValidatorIsSupervisorByDefault=Par défaut, le valideur est le responsable hiérarchique de l'utilisateur. Gardez vide pour conserver ce comportement.
-UserPersonalEmail=Personal email
-UserPersonalMobile=Personal mobile phone
+UserPersonalEmail=Email personnel
+UserPersonalMobile=Téléphone portable personnel
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index ab903c9bc6a..f24b01e192a 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -57,7 +57,7 @@ NoPageYet=Pas de page pour l'instant
 YouCanCreatePageOrImportTemplate=Vous pouvez créer une nouvelle page ou importer un modèle de site Web complet.
 SyntaxHelp=Aide sur quelques astuces spécifiques de syntaxe 
 YouCanEditHtmlSourceckeditor=Vous pouvez éditer le code source en activant l'éditeur HTML avec le bouton "Source".
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Vous pouvez inclure du code PHP dans cette source en utilisant les balises <strong>&lt;?php ?&gt;</strong>. Les variables globales suivantes sont disponibles: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs. <br><br><span class="fa fa-bug"></span> Vous pouvez également inclure le contenu d'une autre page / conteneur avec la syntaxe suivante: <br> <strong>&lt;? php includeContainer ('alias_of_container_to_include'); ?&gt;</strong> <br><br><span class="fa fa-bug"></span> Vous pouvez créer une redirection vers une autre page / conteneur avec la syntaxe suivante (Remarque: ne pas afficher de contenu avant une redirection): <br> <strong>&lt;? php redirectToContainer ('alias_of_container_to_redirect_to'); ?&gt;</strong> <br><br><span class="fa fa-link"></span> Pour ajouter un lien vers une autre page, utilisez la syntaxe: <br> <strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong> <br><br><span class="fa fa-download"></span> Pour inclure un <strong>lien pour télécharger</strong> un fichier stocké dans le répertoire des <strong>documents</strong> , utilisez l'encapsuleur <strong>document.php</strong> : <br> Exemple, pour un fichier dans documents/ecm (besoin d'être loggué), la syntaxe est: <br> <strong>&lt;a href="/document.php?modulepart=ecm&amp;file=[relative_dir/]filename.ext"&gt;</strong> <br> Pour un fichier dans des documents/médias (répertoire ouvert pour accès public), la syntaxe est: <br> <strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong> <br> Pour un fichier partagé avec un lien de partage (accès ouvert en utilisant la clé de partage du fichier), la syntaxe est la suivante: <br> <strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong> <br><br><span class="fa fa-picture-o"></span> Pour inclure une <strong>image</strong> stockée dans le répertoire <strong>documents</strong>, utilisez le wrapper <strong>viewimage.php</strong> : <br> Exemple, pour une image dans des documents/médias (répertoire ouvert), la syntaxe est: <br> <strong>&lt;img src = "/viewimage.php?modulepart=media&file=[relative_dir/]filename.ext"&gt;</strong> <br><br> Plus d'exemples de code HTML ou dynamique sont disponibles sur <a href="%s" target="_blank">la documentation du wiki</a><br> .
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Cloner la page/container
 CloneSite=Cloner le site
 SiteAdded=Site web ajouté
@@ -77,7 +77,7 @@ BlogPost=Article de Blog
 WebsiteAccount=Compte de site Web
 WebsiteAccounts=Comptes de site web
 AddWebsiteAccount=Créer un compte de site web
-BackToListOfThirdParty=Retour à la liste pour le Tiers
+BackToListForThirdParty=Retour à la liste pour le tiers
 DisableSiteFirst=Désactiver le site Web d'abord
 MyContainerTitle=Titre de mon site web
 AnotherContainer=Voici comment inclure le contenu d'une autre page/conteneur (vous pouvez avoir une erreur ici si vous activez le code dynamique car le sous-conteneur incorporé peut ne pas exister)
@@ -127,4 +127,4 @@ OtherLanguages=Autres langues
 UseManifest=Fournir un fichier manifest.json
 PublicAuthorAlias=Alias publique de l'auteur
 AvailableLanguagesAreDefinedIntoWebsiteProperties=Les langues disponibles sont définies dans les propriétés du site Web
-ReplacementDoneInXPages=Replacement done in %s pages or containers
+ReplacementDoneInXPages=Remplacement effectué dans %s pages ou des conteneurs
diff --git a/htdocs/langs/fr_GA/accountancy.lang b/htdocs/langs/fr_GA/accountancy.lang
new file mode 100644
index 00000000000..9827b9d3795
--- /dev/null
+++ b/htdocs/langs/fr_GA/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
diff --git a/htdocs/langs/fr_GA/admin.lang b/htdocs/langs/fr_GA/admin.lang
new file mode 100644
index 00000000000..27c312f77d7
--- /dev/null
+++ b/htdocs/langs/fr_GA/admin.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - admin
+MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+Module56Name=Telephony
+Module56Desc=Telephony integration
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_GA/main.lang b/htdocs/langs/fr_GA/main.lang
new file mode 100644
index 00000000000..2e691473326
--- /dev/null
+++ b/htdocs/langs/fr_GA/main.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
diff --git a/htdocs/langs/fr_GA/modulebuilder.lang b/htdocs/langs/fr_GA/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/fr_GA/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/fr_GA/projects.lang b/htdocs/langs/fr_GA/projects.lang
new file mode 100644
index 00000000000..7e42793b0e9
--- /dev/null
+++ b/htdocs/langs/fr_GA/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
diff --git a/htdocs/langs/gl_ES/accountancy.lang b/htdocs/langs/gl_ES/accountancy.lang
new file mode 100644
index 00000000000..27f6d9f08b9
--- /dev/null
+++ b/htdocs/langs/gl_ES/accountancy.lang
@@ -0,0 +1,382 @@
+# Dolibarr language file - en_US - Accountancy (Double entries)
+Accountancy=Accountancy
+Accounting=Contabilidade
+ACCOUNTING_EXPORT_SEPARATORCSV=Separador de columnas no ficheiro de exportación
+ACCOUNTING_EXPORT_DATE=Formato de data no ficheiro de exportación
+ACCOUNTING_EXPORT_PIECE=Exportar o número de asento
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exportar coa conta global
+ACCOUNTING_EXPORT_LABEL=Exportar etiqueta
+ACCOUNTING_EXPORT_AMOUNT=Exportar importe
+ACCOUNTING_EXPORT_DEVISE=Exportar divisa
+Selectformat=Seleccione o formato do ficheiro
+ACCOUNTING_EXPORT_FORMAT=Seleccione o formato do ficheiro
+ACCOUNTING_EXPORT_ENDLINE=Seleccione o tipo de retorno de carro
+ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique o prefixo do nome de ficheiro
+ThisService=Este servizo
+ThisProduct=Este produto
+DefaultForService=Predeterminado para o servizo
+DefaultForProduct=Predeterminado para o produto
+CantSuggest=Non pode suxerirse
+AccountancySetupDoneFromAccountancyMenu=A maior parte da configuración da contabilidad realizase dende o menú %s
+ConfigAccountingExpert=Configuración do módulo contabilidade avanzada
+Journalization=Procesar diarios
+Journaux=Diarios
+JournalFinancial=Diarios financieiros
+BackToChartofaccounts=Voltar ao plan contable
+Chartofaccounts=Plan contable
+CurrentDedicatedAccountingAccount=Conta contable adicada
+AssignDedicatedAccountingAccount=Nova conta a asignar
+InvoiceLabel=Etiqueta factura
+OverviewOfAmountOfLinesNotBound=Resumo da cantidade de liñas non vinculadas a unha conta contable
+OverviewOfAmountOfLinesBound=Resumo da cantidade de liñas xa vinculadas a unha conta contable
+OtherInfo=Outra información
+DeleteCptCategory=Eliminar a conta contable do grupo
+ConfirmDeleteCptCategory=¿Está certo de querer eliminar esta conta contable do grupo de contas contables?
+JournalizationInLedgerStatus=Estado de diario
+AlreadyInGeneralLedger=Xa rexistrado no Libro Maior
+NotYetInGeneralLedger=Non foi rexistrado aínda no Libro Maior
+GroupIsEmptyCheckSetup=O grupo está baleiro, comprobe a configuración d a personalización de grupos contables
+DetailByAccount=Amosar detalles por conta
+AccountWithNonZeroValues=Contas con valores non cero
+ListOfAccounts=Listaxe de contas
+CountriesInEEC=Países na CEE
+CountriesNotInEEC=Países non CEE
+CountriesInEECExceptMe=Todos os paises incluidos na CEE excepto %s
+CountriesExceptMe=Todos os países excepto %s
+AccountantFiles=Exportar documentos contables
+
+MainAccountForCustomersNotDefined=Conta contable principal para clientes non definida na configuración
+MainAccountForSuppliersNotDefined=Conta contable principal para provedores non definida na configuración
+MainAccountForUsersNotDefined=Conta contable principal para usuarios non definida na configuración
+MainAccountForVatPaymentNotDefined=Conta contable principal para pagos de IVE non definida na configuración
+MainAccountForSubscriptionPaymentNotDefined=Conta contable principal para o pago de subscricións non definida na configuración
+
+AccountancyArea=Área contabilidade
+AccountancyAreaDescIntro=O uso do módulo de contabilidade realízase en varios pasos:
+AccountancyAreaDescActionOnce=As seguintes accións execútanse normalmente unha soa vez, ou unha vez ao ano...
+AccountancyAreaDescActionOnceBis=Os seguintes pasos deben facerse para aforrar tempo no futuro, suxerindo a conta contable predeterminada correcta para realizar os diarios (escritura dos rexistros nos Diarios e Libro Maior)
+AccountancyAreaDescActionFreq=As seguintes accións execútanse normalmente cada mes, semana ou día en empresas moi grandes...
+
+AccountancyAreaDescJournalSetup=PASO %s: Cree ou mire o contido da sua listaxe de diarios dende o menú %s
+AccountancyAreaDescChartModel=PASO %s: Crea un modelo do plan xeral contable dende o menú %s
+AccountancyAreaDescChart=PASO %s: Crear ou mirar o contido do seu plan xeral contable dende o menú %s
+
+AccountancyAreaDescVat=PASO %s: Defina as contas contables para cada tasa de IVE. Para iso, use a entrada do menú %s.
+AccountancyAreaDescDefault=PASO %s: Defina as contas contables por defecto. Para iso, use a entrada do menú %s.
+AccountancyAreaDescExpenseReport=PASO %s: Defina as contas contables por defecto para cada tipo de informe de gastos. Para iso, use a entrada do menú %s.
+AccountancyAreaDescSal=PASO %s: Defina as contas contables para os pagos de salarios. Para iso, use a entrada do menú %s.
+AccountancyAreaDescContrib=PASO %s: Defina as contas contables dos gastos especiais (impostos varios). Para iso, use a entrada do menú %s.
+AccountancyAreaDescDonation=PASO %s: Defina as contas contables para as donacións. Para iso, use a entrada do menú %s.
+AccountancyAreaDescSubscription=STEP %s: Defina as contas contables por defecto para a subscrición de membros. Para iso, use a entrada do menú %s.
+AccountancyAreaDescMisc=PASO %s: Defina a conta por defecto obrigada e as contas contables por defecto para transaccións varias. Para iso, use a entrada do menú %s.
+AccountancyAreaDescLoan=PASO %s: Defina as contas contables por defecto para préstamos. Para iso, use a entrada do menú %s.\n
+AccountancyAreaDescBank=PASO %s: Defina as contas contables e o código para cada conta bancaria e financiera. Pode empezar dende a páxina %s.
+AccountancyAreaDescProd=PASO %s: Defina as contas contables nos seus produtos/servizos. Para elo pode utilizar o menú %s.
+
+AccountancyAreaDescBind=PASO %s: Mire que os enlaces entre as liñas %s existentes e as contas contables son correctos, para que a aplicación poda rexistrar as transaccións no Libro Maior nun só clic. Complete os enlaces que falten. Para iso, utilice a entrada de menú %s.
+AccountancyAreaDescWriteRecords=PASO %s: Escribir as transaccións no Libro Maior. Para iso, entre no menú <strong>%s</strong>, e faga clic no botón <strong>%s</strong>.
+AccountancyAreaDescAnalyze=PASO %s: Engadir ou editar transaccións existentes, xerar informes e exportacións.
+
+AccountancyAreaDescClosePeriod=PASO %s: Pechar periodo, polo que non poderá facer modificacións nun futuro.
+
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Non foi completado un paso obrigatorio na configuración (conta contable non definida en todas as contas bancarias)
+Selectchartofaccounts=Seleccione un plan contable activo
+ChangeAndLoad=Cambiar e cargar
+Addanaccount=Engadir unha conta contable
+AccountAccounting=Conta contable
+AccountAccountingShort=Conta
+SubledgerAccount=Subconta contable
+SubledgerAccountLabel=Etiqueta subconta contable
+ShowAccountingAccount=Amosar contabilidade
+ShowAccountingJournal=Amosar diario contable
+AccountAccountingSuggest=Conta contable suxerida
+MenuDefaultAccounts=Contas contables por defecto
+MenuBankAccounts=Contas Bancarias
+MenuVatAccounts=Contas de IVE
+MenuTaxAccounts=Contas de impostos
+MenuExpenseReportAccounts=Contas de informes de gastos
+MenuLoanAccounts=Contas de préstamos
+MenuProductsAccounts=Contas de produtos
+MenuClosureAccounts=Contas de peche
+MenuAccountancyClosure=Closure
+MenuAccountancyValidationMovements=Validate movements
+ProductsBinding=Contas de produtos
+TransferInAccounting=Transfer in accounting
+RegistrationInAccounting=Registration in accounting
+Binding=Contabilizar
+CustomersVentilation=Contabilizar facturas a clientes
+SuppliersVentilation=Contabilizar facturas de provedores
+ExpenseReportsVentilation=Contabilizar informes de gastos
+CreateMvts=Crear nova transacción
+UpdateMvts=Modificación dunha transacción
+ValidTransaction=Transacción validada
+WriteBookKeeping=Register transactions in Ledger
+Bookkeeping=Libro Maior
+AccountBalance=Saldo da conta
+ObjectsRef=Referencia de obxecto orixe
+CAHTF=Total compras a provedor antes de impostos
+TotalExpenseReport=Total informe de gastos
+InvoiceLines=Liñas de facturas a contabilizar
+InvoiceLinesDone=Liñas de facturas contabilizadas
+ExpenseReportLines=Liñas de informes de gastos a contabilizar
+ExpenseReportLinesDone=Liñas de informes de gastos contabilizadas
+IntoAccount=Contabilizar liña coa conta contable
+TotalForAccount=Total for accounting account
+
+
+Ventilate=Contabilizar
+LineId=Id liña
+Processing=Procesamento
+EndProcessing=Proceso terminado.
+SelectedLines=Liñas seleccionadas
+Lineofinvoice=Liña da factura
+LineOfExpenseReport=Liña de informe de gastos
+NoAccountSelected=Non foi seleccionada conta contable
+VentilatedinAccount=Contabilizada con éxito na conta contable
+NotVentilatedinAccount=Conta sen contabilización na contabilidad
+XLineSuccessfullyBinded=%s produtos/servizos relacionados correctamente nunha conta contable
+XLineFailedToBeBinded=%s produtos/servizos sen conta contable
+
+ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a contabilizar que amósanse por páxina (máximo recomendado: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ordear as páxinas de contabilización "A contabilizar" polos elementos mais recentes
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ordear as páxinas de contabilización "Contabilizadas" polos elementos mais recentes
+
+ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
+BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
+ACCOUNTANCY_COMBO_FOR_AUX=Habilita a lista combinada para a conta subsidiaria (pode ser lento se tes moitos terceiros)
+
+ACCOUNTING_SELL_JOURNAL=Diario de vendas
+ACCOUNTING_PURCHASE_JOURNAL=Diario de compras
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario de operacións diversas
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Informe de gastos diario
+ACCOUNTING_SOCIAL_JOURNAL=Diario social
+ACCOUNTING_HAS_NEW_JOURNAL=Ten un novo diario
+
+ACCOUNTING_RESULT_PROFIT=Conta de resultado contable (Beneficio)
+ACCOUNTING_RESULT_LOSS=Conta de resultado contable (Perda)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Diario de peche
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Conta contable de transferencia bancaria
+TransitionalAccount=Transitional bank transfer account
+
+ACCOUNTING_ACCOUNT_SUSPENSE=Conta contable de operacións pendentes de asignar
+DONATION_ACCOUNTINGACCOUNT=Conta contable de rexistro de donacións
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Conta contable de rexistro subscricións
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Conta contable predeterminada para os produtos vendidos (usada se non están definidos na folla de produtos)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Conta contable predeterminada para os servizos comprados (usada se non están definidos na folla de servizos)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Conta contable predeterminada para os servizos vendidos (usada se non están definidos na folla de servizos)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
+
+Doctype=Tipo de documento
+Docdate=Data
+Docref=Referencia
+LabelAccount=Etiqueta conta
+LabelOperation=Etiqueta operación
+Sens=Sentido
+LetteringCode=Codigo de letras
+Lettering=Lettering
+Codejournal=Diario
+JournalLabel=Etiqueta diario
+NumPiece=Apunte
+TransactionNumShort=Núm. transacción
+AccountingCategory=Grupos personalizados
+GroupByAccountAccounting=Agrupar por conta contable
+AccountingAccountGroupsDesc=Pode definir aquí algúns grupos de contas contables. Serán usadas para informes de contabilidade personalizados.
+ByAccounts=Por contas
+ByPredefinedAccountGroups=Por grupos predefinidos
+ByPersonalizedAccountGroups=Por grupos personalizados
+ByYear=Por ano
+NotMatch=Non establecido
+DeleteMvt=Eliminar liñas do Libro Maior
+DelMonth=Month to delete
+DelYear=Ano a eliminar
+DelJournal=Diario a eliminar
+ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+FinanceJournal=Diario financiero
+ExpenseReportsJournal=Diario informe de gastos
+DescFinanceJournal=Finance journal including all the types of payments by bank account
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+VATAccountNotDefined=Conta contable para IVE non definida
+ThirdpartyAccountNotDefined=Conta contable para terceiro non definida
+ProductAccountNotDefined=Conta contable para produto non definida
+FeeAccountNotDefined=Conta de gastos non definida
+BankAccountNotDefined=Conta contable bancaria no definida
+CustomerInvoicePayment=Cobro de factura a cliente
+ThirdPartyAccount=Conta de terceiro
+NewAccountingMvt=Novo movemento
+NumMvts=Número de movemento
+ListeMvts=Listaxe de movementos
+ErrorDebitCredit=Debe e Haber non poden conter un valor ao mesmo tempo
+AddCompteFromBK=Engadir contas contables ao grupo
+ReportThirdParty=Listaxe de contas de terceiros
+DescThirdPartyReport=Consulte aquí o listaxe de clientes e provedores e os seus códigos contables
+ListAccounts=Listaxe de contas contables
+UnknownAccountForThirdparty=Conta contable de terceiro descoñecida, usaremos %s
+UnknownAccountForThirdpartyBlocking=Conta contable de terceiro descoñecida. Erro de bloqueo.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Conta contable de terceiro non definida ou terceiro descoñecido. Erro de bloqueo.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
+ShowOpeningBalance=Show opening balance
+HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
+
+Pcgtype=Grupo de conta
+PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+
+Reconcilable=Reconcilable
+
+TotalVente=Total facturación antes de impostos
+TotalMarge=Total marxe vendas
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
+Vide=-
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account (only record not already transfered in accountancy are visible)
+DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
+DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
+DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
+DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+
+DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
+OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+ValidateMovements=Validate movements
+DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
+SelectMonthAndValidate=Select month and validate movements
+
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
+Balancing=Balancing
+FicheVentilation=Binding card
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
+NoNewRecordSaved=No more record to journalize
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
+ShowTutorial=Show Tutorial
+NotReconciled=Non reconciliado
+
+## Admin
+ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
+CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccountingJournal=Amosar diario contable
+NatureOfJournal=Nature of Journal
+AccountingJournalType1=Miscellaneous operations
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Banco
+AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventario
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
+NumberOfAccountancyEntries=Number of entries
+NumberOfAccountancyMovements=Number of movements
+
+## Export
+ExportDraftJournal=Export draft journal
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export for CEGID Expert Comptabilité
+Modelcsv_COALA=Export for Sage Coala
+Modelcsv_bob50=Export for Sage BOB 50
+Modelcsv_ciel=Export for Sage Ciel Compta or Compta Evolution
+Modelcsv_quadratus=Export for Quadratus QuadraCompta
+Modelcsv_ebp=Export for EBP
+Modelcsv_cogilog=Export for Cogilog
+Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
+Modelcsv_openconcerto=Export for OpenConcerto (Test)
+Modelcsv_configurable=Export CSV Configurable
+Modelcsv_FEC=Export FEC
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+ChartofaccountsId=Chart of accounts Id
+
+## Tools - Init accounting account on product / service
+InitAccountancy=Init accountancy
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
+DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
+Options=Options
+OptionModeProductSell=Mode sales
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
+OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
+OptionModeProductSellDesc=Show all products with accounting account for sales.
+OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
+OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
+OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
+CleanFixHistory=Remove accounting code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
+PredefinedGroups=Predefined groups
+WithoutValidAccount=Without valid dedicated account
+WithValidAccount=With valid dedicated account
+ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
+AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
+
+## Dictionary
+Range=Range of accounting account
+Calculated=Calculado
+Formula=Fórmula
+
+## Error
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
+ExportNotSupported=The export format setuped is not supported into this page
+BookeppingLineAlreayExists=Lines already existing into bookkeeping
+NoJournalDefined=No journal defined
+Binded=Lines bound
+ToBind=Lines to bind
+UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
+
+## Import
+ImportAccountingEntries=Accounting entries
+DateExport=Date export
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/gl_ES/admin.lang b/htdocs/langs/gl_ES/admin.lang
new file mode 100644
index 00000000000..2ac9627eb55
--- /dev/null
+++ b/htdocs/langs/gl_ES/admin.lang
@@ -0,0 +1,2002 @@
+# Dolibarr language file - Source file is en_US - admin
+Foundation=Fundación
+Version=Versión
+Publisher=Editor
+VersionProgram=Versión do programa
+VersionLastInstall=Versión da instalación inicial
+VersionLastUpgrade=Versión da última actualización
+VersionExperimental=Experimental
+VersionDevelopment=Desenvolvemento
+VersionUnknown=Descoñecida
+VersionRecommanded=Recomendada
+FileCheck=Comprobador da integridade de ficheiros
+FileCheckDesc=Esta ferramenta permítelle verificar a integridade dos ficheiros e a configuración da súa aplicación, comparando cada ficheiro co oficial. Tamén podese verificar o valor de algunhas constantes de configuración. Pódes utilizar esta ferramenta para detectar se algúns ficheiros foron modificados (ex. por un hacker).
+FileIntegrityIsStrictlyConformedWithReference=A integridade dos ficheiros axústase estritamente a referencia.
+FileIntegrityIsOkButFilesWereAdded=A comprobación da integridade dos ficheiros foi correcta, con todo engadíronse algunhos ficheiros novos.
+FileIntegritySomeFilesWereRemovedOrModified=A comprobación da integridade de ficheiros fallou. Algunhos ficheiros foron modificados, eliminados ou agregados.
+GlobalChecksum=Suma de comprobación global
+MakeIntegrityAnalysisFrom=Realizar a análise da integridade dos ficheiros da aplicación dende
+LocalSignature=Sinatura local incrustada (menos segura)
+RemoteSignature=Sinatura remota (mais segura)
+FilesMissing=Arquivos non atopados
+FilesUpdated=Arquivos actualizados
+FilesModified=Arquivos modificados
+FilesAdded=Arquivos engadidos
+FileCheckDolibarr=Comprobar a integradade dos ficheiros da aplicación
+AvailableOnlyOnPackagedVersions=O ficheiro local para a comprobación da integridade só está dispoñible cando a aplicación instálase dende un paquete oficial
+XmlNotFound=Non atópase o ficheiro xml de Integridade
+SessionId=ID sesión
+SessionSaveHandler=Manexador para gardar sesións
+SessionSavePath=Ruta para gardar sesión
+PurgeSessions=Purga de sesións
+ConfirmPurgeSessions=¿Realmente desexa purgar todas as sesións? Isto desconectará todos os usuarios (excepto a si mesmo).
+NoSessionListWithThisHandler=O xestor de sesións configurado no seu PHP non permite amosar as sesións en curso
+LockNewSessions=Bloquear novas conexións
+ConfirmLockNewSessions=¿Está certo de querer restrinxir calquera novo aceso a Dolibarr únicamente ao seu usuario? Só o usuario <b>%s</b> poderá conectarse despois disto.
+UnlockNewSessions=Eliminar bloqueo de conexións
+YourSession=A súa sesión
+Sessions=Sesións de usuarios
+WebUserGroup=Usuario/grupo do servidor web
+NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
+DBStoringCharset=Xogo de caracteres da base de dados para almacenar os dados
+DBSortingCharset=Xogo de caracteres da base de dados para ordear os dados
+HostCharset=Host charset
+ClientCharset=Client charset
+ClientSortingCharset=Client collation
+WarningModuleNotActive=O módulo <b>%s</b> debe activarse
+WarningOnlyPermissionOfActivatedModules=Só os permisos relacionados cos modulos activados mostránse aqui. Vostede pode activar outros módulos na páxina Inicio->Configuración->Módulos.
+DolibarrSetup=Instalar ou actualizar Dolibarr
+InternalUser=Usuario interno
+ExternalUser=Usuario externo
+InternalUsers=Usuarios internos
+ExternalUsers=Usuarios externos
+GUISetup=Pantalla
+SetupArea=Config.
+UploadNewTemplate=Nova(s) prantilla(s) actualizada(s)
+FormToTestFileUploadForm=Formulario para verificar a subida de ficheiros (segundo a configuración)
+IfModuleEnabled=Nota: sí, é efectivo só se o módulo <b>%s</b> está habilitado
+RemoveLock=Elimine o ficheiro <b>%s</b>, se existe, para permitir o uso da ferramenta de Actualización/Instalación.
+RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
+SecuritySetup=Configuración de seguridade
+SecurityFilesDesc=Define here options related to security about uploading files.
+ErrorModuleRequirePHPVersion=Erro, este módulo require a versión %s ou maior de PHP
+ErrorModuleRequireDolibarrVersion=Erro, este módulo require a versión %s ou maior de Dolibarr
+ErrorDecimalLargerThanAreForbidden=Erro, a precisión maior de <b>%s</b> non está soportada.
+DictionarySetup=Configuración dos Diccionarios
+Dictionary=Diccionarios
+ErrorReservedTypeSystemSystemAuto=O valor 'system' e 'systemauto' para o tipo está reservado. Vostede pode empregar 'user' como valor para engadir o seu propio rexistro
+ErrorCodeCantContainZero=O código non pode conter o valor 0
+DisableJavascript=Inhabilitar as funcións JavaScript e Ajax
+DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
+NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
+JavascriptDisabled=Javascript desactivado
+UsePreviewTabs=Ver lapelas vista previa
+ShowPreview=Ver vista previa
+PreviewNotAvailable=Vista previa non dispoñible
+ThemeCurrentlyActive=Tema actualmente activo
+CurrentTimeZone=Zona horaria PHP (Servidor)
+MySQLTimeZone=Zona horaria MySql (base de datos)
+TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+Space=Área
+Table=Taboa
+Fields=Campos
+Index=Índice
+Mask=Máscara
+NextValue=Próximo valor
+NextValueForInvoices=Próximo valor (facturas)
+NextValueForCreditNotes=Próximo valor (abonos)
+NextValueForDeposit=Próximo valor (anticipos)
+NextValueForReplacements=Próximo valor (rectificativas)
+MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+NoMaxSizeByPHPLimit=Nota: Ningunha limitación está configurada no seu servidor PHP
+MaxSizeForUploadedFiles=Tamaño máximo dos ficheiros a subir (0 para desactivar a subida)
+UseCaptchaCode=Utilización de código gráfico (CAPTCHA) na páxina de inicio de sesión
+AntiVirusCommand=Ruta completa ao comando do antivirus
+AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusParam= Mais parámetors na liña de comandos
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=Configuración do módulo Contabilidade
+UserSetup=Configuración na xestión de usuarios
+MultiCurrencySetup=Configuración do módulo multimoeda
+MenuLimits=Límites e precisión
+MenuIdParent=Id do menú pai
+DetailMenuIdParent=ID do menú pai (baleiro para un menú superior)
+DetailPosition=Número de orde para definir a posición do menú
+AllMenus=Todos
+NotConfigured=Módulo/Aplicación non configurado
+Active=Activo
+SetupShort=Config.
+OtherOptions=Outras opcións
+OtherSetup=Outra configuración
+CurrentValueSeparatorDecimal=Separador decimal
+CurrentValueSeparatorThousand=Separador miles
+Destination=Destino
+IdModule=Identificador do modulo
+IdPermissions=Identificador de permisos
+LanguageBrowserParameter=Parámetro %s
+LocalisationDolibarrParameters=Parámetros de localización
+ClientTZ=Zona Horaria Cliente (usuario)
+ClientHour=Hora Cliente (usuario)
+OSTZ=Zona Horaria Servidor
+PHPTZ=Zona Horaria Servidor PHP
+DaylingSavingTime=Horario de verán (usuario)
+CurrentHour=Hora PHP (servidor)
+CurrentSessionTimeOut=Timeout sesión actual
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a .htaccess file with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Atención, ao contrario doutras pantallas, o horario nesta páxina non atópase na súa zona horaria local, atópase na zona horaria do servidor.
+Box=Panel
+Boxes=Paneis
+MaxNbOfLinesForBoxes=Número máximo de liñas para paneis
+AllWidgetsWereEnabled=Todos os widgets dispoñibles están activados
+PositionByDefault=Posición por defecto
+Position=Posición
+MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
+MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br>Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenuForUsers=Menú para os usuarios
+LangFile=ficheiro .lang
+Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
+System=Sistema
+SystemInfo=Infomación do Sistema
+SystemToolsArea=Área utilidades do sistema
+SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature.
+Purge=Purga
+PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
+PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Eliminar ficheiros temporais purgados
+PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
+PurgeRunNow=Purgar agora
+PurgeNothingToDelete=Sen directorios ou ficheiros a eliminar.
+PurgeNDirectoriesDeleted=<b>%s</b> ficheiros ou directorios eliminados
+PurgeNDirectoriesFailed=Erro ao eliminar <b>%s</b> ficheiros ou directorios.
+PurgeAuditEvents=Purgar todos os eventos de seguridade
+ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
+GenerateBackup=Xerar copia de seguridade
+Backup=Copia de seguridade
+Restore=Restore
+RunCommandSummary=Backup has been launched with the following command
+BackupResult=Resultado da copia de seguridade
+BackupFileSuccessfullyCreated=Backup file successfully generated
+YouCanDownloadBackupFile=The generated file can now be downloaded
+NoBackupFileAvailable=No backup files available.
+ExportMethod=Export method
+ImportMethod=Método de importación
+ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
+ImportMySqlDesc=To import a MySQL backup file, you may use phpMyAdmin via your hosting or use the mysql command from the Command line.<br>For example:
+ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
+ImportMySqlCommand=%s %s < mybackupfile.sql
+ImportPostgreSqlCommand=%s %s mybackupfile.sql
+FileNameToGenerate=Nombre do ficheiro de copia de seguridade:
+Compression=Compresión
+CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
+CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
+ExportCompatibility=Compatibility of generated export file
+ExportUseMySQLQuickParameter=Use the --quick parameter
+ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
+MySqlExportParameters=MySQL export parameters
+PostgreSqlExportParameters= PostgreSQL export parameters
+UseTransactionnalMode=Use transactional mode
+FullPathToMysqldumpCommand=Full path to mysqldump command
+FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
+AddDropDatabase=Engados orde DROP DATABASE
+AddDropTable=Engadir orde DROP TABLE
+ExportStructure=Structure
+NameColumn=Name columns
+ExtendedInsert=Extended INSERT
+NoLockBeforeInsert=No lock commands around INSERT
+DelayedInsert=Delayed insert
+EncodeBinariesInHexa=Encode binary data in hexadecimal
+IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
+AutoDetectLang=Autodetectar (idioma navegador)
+FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
+BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
+OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
+ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external app/modules
+ModulesDevelopYourModule=Develop your own app/modules
+ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
+DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
+NewModule=Novo
+FreeModule=Free
+CompatibleUpTo=Compatible coa versión %s
+NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
+CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
+SeeInMarkerPlace=See in Market place
+SeeSetupOfModule=See setup of module %s
+Updated=Actualizado
+Nouveauté=Novidade
+AchatTelechargement=Compra/Descarga
+GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
+DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming may develop a module.
+WebSiteDesc=External websites for more add-on (non-core) modules...
+DevelopYourModuleDesc=Some solutions to develop your own module...
+URL=URL
+RelativeURL=Relative URL
+BoxesAvailable=Widgets available
+BoxesActivated=Widgets activated
+ActivateOn=Activate on
+ActiveOn=Activated on
+SourceFile=Source file
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
+Required=Required
+UsedOnlyWithTypeOption=Used by some agenda option only
+Security=Security
+Passwords=Passwords
+DoNotStoreClearPassword=Encrypt passwords stored in database (NOT as plain-text). It is strongly recommended to activate this option.
+MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
+ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
+Feature=Feature
+DolibarrLicense=License
+Developpers=Developers/contributors
+OfficialWebSite=Dolibarr official web site
+OfficialWebSiteLocal=Local web site (%s)
+OfficialWiki=Dolibarr documentation / Wiki
+OfficialDemo=Dolibarr online demo
+OfficialMarketPlace=Official market place for external modules/addons
+OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
+ReferencedPreferredPartners=Preferred Partners
+OtherResources=Other resources
+ExternalResources=External Resources
+SocialNetworks=Social Networks
+ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
+ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
+HelpCenterDesc2=Some of these resources are only available in <b>english</b>.
+CurrentMenuHandler=Current menu handler
+MeasuringUnit=Unidade de medida
+LeftMargin=Marxe esquerdo
+TopMargin=Marxe superior
+PaperSize=Tipo de papel
+Orientation=Orientación
+SpaceX=Área X
+SpaceY=Área Y
+FontSize=Tamaño da fonte
+Content=Contido
+NoticePeriod=Prazo de aviso
+NewByMonth=Novo por mes
+Emails=E-Mails
+EMailsSetup=Configuración e-mails
+EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EmailSenderProfiles=Emails sender profiles
+EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
+MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix-like systems)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix-like systems)
+MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
+MAIN_MAIL_AUTOCOPY_TO= Copy (Bcc) all sent emails to
+MAIN_DISABLE_ALL_MAILS=Disable all email sending (for test purposes or demos)
+MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
+MAIN_MAIL_SENDMODE=Email sending method
+MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
+MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
+MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
+MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
+MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos)
+MAIN_SMS_SENDMODE=Method to use to send SMS
+MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending
+MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
+UserEmail=User email
+CompanyEmail=Company Email
+FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+ModuleSetup=Configuración do Módulo
+ModulesSetup=Configuración dos Módulos/Aplicacións
+ModuleFamilyBase=Sistema
+ModuleFamilyCrm=Xestión da Relación co Cliente (CRM)
+ModuleFamilySrm=Xestión d Relacións co Provedore (VRM)
+ModuleFamilyProducts=Xestión de produtos (PM)
+ModuleFamilyHr=Xestión de Recursos Humanos (HR)
+ModuleFamilyProjects=Proxectos/Traballo colaborativo
+ModuleFamilyOther=Outro
+ModuleFamilyTechnic=Ferramenta para Multi Módulos
+ModuleFamilyExperimental=Módulos experimentais
+ModuleFamilyFinancial=Módulos financieros (Contabilidade/Tesourería)
+ModuleFamilyECM=Xestión Electrónica de Contidos (GED)
+ModuleFamilyPortal=Sitios Web e outras aplicacións frontais
+ModuleFamilyInterface=Interfaces con sistemas externos
+MenuHandlers=Xestores de menú
+MenuAdmin=Editor de menú
+DoNotUseInProduction=Non usar en produción
+ThisIsProcessToFollow=Upgrade procedure:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+StepNb=Step %s
+FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
+DownloadPackageFromWebSite=Download package (for example from the official web site %s).
+UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
+YouCanSubmitFile=You can upload the .zip file of module package from here:
+CurrentVersion=Dolibarr current version
+CallUpdatePage=Browse to the page that updates the database structure and data: %s.
+LastStableVersion=Latest stable version
+LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
+UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
+GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
+GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
+GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
+ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
+ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
+DoTestServerAvailability=Test server connectivity
+DoTestSend=Test sending
+DoTestSendHTML=Test sending HTML
+ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
+UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
+SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
+UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
+DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
+DisableLinkToHelp=Hide link to online help "<b>%s</b>"
+AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
+ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
+MinLength=Minimum length
+LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
+LanguageFile=Language file
+ExamplesWithCurrentSetup=Examples with current configuration
+ListOfDirectories=List of OpenDocument templates directories
+ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
+NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
+FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
+FirstnameNamePosition=Position of Name/Lastname
+DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
+KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
+TestSubmitForm=Input test form
+ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours.
+ThemeDir=Skins directory
+ConnectionTimeout=Connection timeout
+ResponseTimeout=Response timeout
+SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
+ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
+SecurityToken=Key to secure URLs
+NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
+PDF=PDF
+PDFDesc=Global options for PDF generation.
+PDFAddressForging=Rules for address boxes
+HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
+PDFLocaltax=Rules for %s
+HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideDescOnPDF=Hide products description
+HideRefOnPDF=Hide products ref.
+HideDetailsOnPDF=Hide product lines details
+PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+Library=Library
+UrlGenerationParameters=Parameters to secure URLs
+SecurityTokenIsUnique=Use a unique securekey parameter for each URL
+EnterRefToBuildUrl=Enter reference for object %s
+GetSecuredUrl=Get calculated URL
+ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+OldVATRates=Old VAT rate
+NewVATRates=New VAT rate
+PriceBaseTypeToChange=Modify on prices with base reference value defined on
+MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
+String=String
+TextLong=Long text
+HtmlText=Html text
+Int=Integer
+Float=Float
+DateAndTime=Data e hora
+Unique=Único
+Boolean=Boolean (unha caixa de verificación)
+ExtrafieldPhone = Teléfono
+ExtrafieldPrice = Prezo
+ExtrafieldMail = Correo
+ExtrafieldUrl = Url
+ExtrafieldSelect = Listaxe de selección
+ExtrafieldSelectList = Listaxe dende unha taboa
+ExtrafieldSeparator=Separador (non é un campo)
+ExtrafieldPassword=Contrasinal
+ExtrafieldRadio=Botón tipo radio (só un seleccionado)
+ExtrafieldCheckBox=Caixa de verificación
+ExtrafieldCheckBoxFromList=Caixa de verificaciión de táboa
+ExtrafieldLink=Vínculo a un obxecto
+ComputedFormula=Computed field
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+Computedpersistent=Store computed field
+ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
+ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
+ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
+LibraryToBuildPDF=Library used for PDF generation
+LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
+SMS=SMS
+LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
+RefreshPhoneLink=Refresh link
+LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
+KeepEmptyToUseDefault=Keep empty to use default value
+DefaultLink=Default link
+SetAsDefault=Set as default
+ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
+ExternalModule=External module
+InstalledInto=Installed into directory %s
+BarcodeInitForthird-parties=Mass barcode init for third-parties
+BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
+CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
+InitEmptyBarCode=Init value for next %s empty records
+EraseAllCurrentBarCode=Erase all current barcode values
+ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
+AllBarcodeReset=All barcode values have been removed
+NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
+EnableFileCache=Enable file cache
+ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
+NoDetails=No additional details in footer
+DisplayCompanyInfo=Display company address
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
+EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
+ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code
+ModuleCompanyCodePanicum=Return an empty accounting code.
+ModuleCompanyCodeDigitaria=Returns a compound accounting code according to the name of the third party. The code consists of a prefix that can be defined in the first position followed by the number of characters defined in the third party code.
+ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
+ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+ClickToShowDescription=Click to show description
+DependsOn=This module needs the module(s)
+RequiredBy=This module is required by module(s)
+TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
+PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
+EnableDefaultValues=Enable customization of default values
+EnableOverwriteTranslation=Enable usage of overwritten translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
+AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
+FilesAttachedToEmail=Attach file
+SendEmailsReminders=Send agenda reminders by emails
+davDescription=Setup a WebDAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
+DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
+DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
+DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
+DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
+# Modules
+Module0Name=Usuarios e grupos
+Module0Desc=Xestión de Usuarios / Empregados e grupos
+Module1Name=Terceiros
+Module1Desc=Xestión de empresas e contactos (clientes, clientes potenciais...)
+Module2Name=Comercial
+Module2Desc=Xestión comercial
+Module10Name=Accounting (simplified)
+Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
+Module20Name=Orzamentos
+Module20Desc=Xestión de orzamentos/propostas comerciais
+Module22Name=Mailings Masivos
+Module22Desc=Administración e envío de E-Mails masivos
+Module23Name=Enerxía
+Module23Desc=Monitoriza o consumo de enerxías
+Module25Name=Pedidos de clientes
+Module25Desc=Xestión de pedidos de clientes
+Module30Name=Facturas e abonos
+Module30Desc=Xestión de facturas e abonos a clientes. Xestión de facturas e abonos de provedores
+Module40Name=Provedores
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
+Module42Name=Rexistros de depuración
+Module42Desc=Xeración de logs (ficheiros, syslog,...). Ditos rexistros son para propósitos técnicos/depuración.
+Module49Name=Editores
+Module49Desc=Xestión de editores
+Module50Name=Produtos
+Module50Desc=Xestión de produtos
+Module51Name=Mailings masivos
+Module51Desc=Administraciónde correo de papel en masa
+Module52Name=Stocks
+Module52Desc=Stock management
+Module53Name=Servizos
+Module53Desc=Xestión de servizos
+Module54Name=Contratos/Suscricións
+Module54Desc=Xestión de contratos (servizos ou suscripcións recurrentes)
+Module55Name=Códigos de barras
+Module55Desc=Xestión dos códigos de barras
+Module56Name=Telefonía
+Module56Desc=Integración da telefonía
+Module57Name=Domiciliacións bancarias
+Module57Desc=Xestión de domiciliacións. Tamén inclue xeración de ficheiro SEPA para países Europeos.
+Module58Name=ClickToDial
+Module58Desc=Integración con sistema ClickToDial (Asterisk, ...)
+Module59Name=Bookmark4u
+Module59Desc=Engade función para xerar unha conta Bookmark4u dende unha conta Dolibarr
+Module60Name=Stickers
+Module60Desc=Management of stickers
+Module70Name=Intervencións
+Module70Desc=Xestión das intervencións
+Module75Name=Notas de gasto e desprazamentos
+Module75Desc=Xestión das notas de gasto e desprazamentos
+Module80Name=Expedicións
+Module80Desc=Xestión de expedicións e recepcións
+Module85Name=Bancos & Efectivo
+Module85Desc=Xestión das contas de contas bancarias ou efectivo
+Module100Name=Sitio web externo
+Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module105Name=Mailman e SPIP
+Module105Desc=Interfaz con Mailman ou SPIP para o módulo Membros
+Module200Name=LDAP
+Module200Desc=Sincronización co directorio LDAP
+Module210Name=PostNuke
+Module210Desc=Integración con PostNuke
+Module240Name=Exportaciones de datos
+Module240Desc=Tool to export Dolibarr data (with assistance)
+Module250Name=Importación de datos
+Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module310Name=Membros
+Module310Desc=Xestión de membros dunha Fundación/Asociación
+Module320Name=Fíos RSS
+Module320Desc=Adición de fíos de información RSS nas páxinas Dolibarr
+Module330Name=Marcadores e atallos
+Module330Desc=Crear marcadores, sempre accesibles, a páxinas internas ou externas as que acostuma acceder
+Module400Name=Proxectos ou Oportunidades
+Module400Desc=Xestión de proxectos, oportunidades/leads e/o tarefas. Tamén podes asignar calquera elemento (factura, pedido, orzamento, intervención...) a un proxecto e ter unha vista transversal do proxecto
+Module410Name=Webcalendar
+Module410Desc=Integración con Webcalendar
+Module500Name=Impostos e gastos especiais
+Module500Desc=Xestión de outros gastos (impostos, gastos sociais ou fiscais, dividendos...)
+Module510Name=Salarios
+Module510Desc=Rexistro e seguemento do pago dos salarios aos seus empregados
+Module520Name=Crédito
+Module520Desc=Xestión de créditos
+Module600Name=Notifications on business event
+Module600Desc=Enviar notificaciones por e-mail desencadenados por algunos eventos de negocios: para os usuarios (configuración definida para cada usuario), para contactos de terceiros (configuración definida en cada terceiro) ou e-mails específicos
+Module600Long=Teña conta que este módulo envía e-mails en tempo real cuando prodúcese un evento. Se está buscando unha función para enviar recordatorios por e-mail dos eventos da súa axenda, vaia á configuración do módulo Axenda.
+Module610Name=Variantes de produtos
+Module610Desc=Permite a creación de variantes de produtos (cor, talla, etc.)
+Module700Name=Donacións
+Module700Desc=Xestión de donacións
+Module770Name=Informes de gastos
+Module770Desc=Xestión de informes de gastos (transporte, alimentación...)
+Module1120Name=Orzamento de provedor
+Module1120Desc=Solicitude orzamento e prezos a provedor
+Module1200Name=Mantis
+Module1200Desc=Integración con Mantis
+Module1520Name=Xeración Documento
+Module1520Desc=Xeración de documentos de correo masivo
+Module1780Name=Etiquetas/Categorías
+Module1780Desc=Crear etiquetas/categoría (produtos, clientes, provedores, contactos ou membros)
+Module2000Name=Editor WYSIWYG
+Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
+Module2200Name=Dynamic Prices
+Module2200Desc=Use maths expressions for auto-generation of prices
+Module2300Name=Scheduled jobs
+Module2300Desc=Scheduled jobs management (alias cron or chrono table)
+Module2400Name=Events/Agenda
+Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
+Module2500Name=DMS / ECM
+Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
+Module2600Name=API/Web services (SOAP server)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API/Web services (REST server)
+Module2610Desc=Enable the Dolibarr REST server providing API services
+Module2660Name=Call WebServices (SOAP client)
+Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
+Module2700Name=Gravatar
+Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
+Module2800Desc=FTP Client
+Module2900Name=GeoIPMaxmind
+Module2900Desc=GeoIP Maxmind conversions capabilities
+Module3200Name=Unalterable Archives
+Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module4000Name=HRM
+Module4000Desc=Human resources management (management of department, employee contracts and feelings)
+Module5000Name=Multi-empresa
+Module5000Desc=Permite xestionar varias empresas
+Module6000Name=Fluxo de traballo
+Module6000Desc=Xestión de fluxoo de traballo (creación automática dun obxecto e/ou cambio de estado automático)
+Module10000Name=Sitios web
+Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
+Module20000Name=Leave Request Management
+Module20000Desc=Define and track employee leave requests
+Module39000Name=Product Lots
+Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
+Module40000Name=Multicurrency
+Module40000Desc=Use alternative currencies in prices and documents
+Module50000Name=PayBox
+Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50100Name=POS SimplePOS
+Module50100Desc=Point of Sale module SimplePOS (simple POS).
+Module50150Name=POS TakePOS
+Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50200Name=Paypal
+Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50300Name=Stripe
+Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50400Name=Accounting (double entry)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module54000Name=PrintIPP
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
+Module55000Name=Enquisa ou Voto
+Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
+Module59000Name=Margins
+Module59000Desc=Module to manage margins
+Module60000Name=Commissions
+Module60000Desc=Module to manage commissions
+Module62000Name=Incoterms
+Module62000Desc=Engade funcións para xestionar Incoterms
+Module63000Name=Recursos
+Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
+Permission11=Consultar facturas de cliente
+Permission12=Crear/Modificar facturas de cliente
+Permission13=Unvalidate customer invoices
+Permission14=Validar facturas de cliente
+Permission15=Enviar facturas de cliente por correo
+Permission16=Emitir pagos de facturas de cliente
+Permission19=Eliminar facturas de cliente
+Permission21=Consultar orzamentos comerciais
+Permission22=Crear/modificar orzamentos comerciais
+Permission24=Validar orzamentos comerciais
+Permission25=Enviar orzamentos comerciais
+Permission26=Cerrar orzamentos comerciais
+Permission27=Eliminar orzamentos comerciais
+Permission28=Exportar orzamentos comerciais
+Permission31=Consultar produtos
+Permission32=Crear/modificar produtos
+Permission34=Eliminar produtos
+Permission36=Ver/xestionar produtos ocultos
+Permission38=Exportar produtos
+Permission41=Consultar proxectos e tarefas (proxectos compartidos e proxectos dos que son contacto). Tamén pode introducir tempos consumidos, para mín ou os meus subordinados, en tarefas asignadas (Follas de tempo).
+Permission42=Crear/modificar proxectos (proxectos compartidos e proxectos dos que son contacto). Tamén pode crear tarefas e asignar usuarios a proxectos e tarefas
+Permission44=Eliminar proxectos (compartidos ou son contacto)
+Permission45=Exportar proxectos
+Permission61=Consultar intervencións
+Permission62=Crear/modificar intervencións
+Permission64=Eliminar intervencións
+Permission67=Exportar intervencións
+Permission71=Consultar membros
+Permission72=Crear/modificar membros
+Permission74=Eliminar membros
+Permission75=Configurar tipos dos membros
+Permission76=Exportar datos
+Permission78=Consultar cotizacións
+Permission79=Crear/modificar cotizacións
+Permission81=Consultar pedidos de clientes
+Permission82=Crear/modificar pedidos de clientes
+Permission84=Validar pedidos de clientes
+Permission86=Enviar pedidos de clientes
+Permission87=Pechar pedidos de clientes
+Permission88=Anular pedidos de clientes
+Permission89=Eliminar pedidos de clientes
+Permission91=Consultar impostos sociais ou fiscais e IVE
+Permission92=Crear/modificar impostos sociais ou fiscais e IVE
+Permission93=Eliminar impostos sociais ou fiscais e IVE
+Permission94=Exportar impostos sociais ou fiscais
+Permission95=Consultar balances e resultados
+Permission101=Consultar expedicións
+Permission102=Crear/modificar expedicións
+Permission104=Validar expedicións
+Permission106=Exportar expedicións
+Permission109=Eliminar expedicións
+Permission111=Consultar contas financieras
+Permission112=Crear/modificar/eliminar e comparar movementos bancarios
+Permission113=Configurar contas financieras (crear, xestionar categorías)
+Permission114=Reconciliar transaccións
+Permission115=Exportar transaccións e extractos de conta
+Permission116=Transferencias entre contas
+Permission117=Xestionar envío de cheques
+Permission121=Consultar empresas
+Permission122=Crear/modificar terceiros vinculados ao usuario
+Permission125=Eliminar terceiros vinculados ao usuario
+Permission126=Exportar las empresas
+Permission141=Read all projects and tasks (also private projects for which I am not a contact)
+Permission142=Create/modify all projects and tasks (also private projects for which I am not a contact)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
+Permission146=Consultar provedores
+Permission147=Consultar estatísticas
+Permission151=Leer domiciliacións
+Permission152=Crear/modificar domiciliacións
+Permission153=Enviar/Trasmitir domiciliacións
+Permission154=Rexistrar Abonos/Devolucións de domiciliacións
+Permission161=Consultar contratos/suscricións
+Permission162=Crear/modificar contratos/suscripcións
+Permission163=Activar un servizo/suscripción dun contrato
+Permission164=Desactivar un servizo/suscripcion dun contrato
+Permission165=Eliminar contratos/suscripcións
+Permission167=Exportar contratos
+Permission171=Ler viaxes e gastos (seus e dos seus subordinados)
+Permission172=Crear/modificar viaxes e gastos
+Permission173=Eliminar viaxes e gastos
+Permission174=Ler todos os viaxes e gastos
+Permission178=Exportar viaxes e gastos
+Permission180=Consultar provedores
+Permission181=Consultar pedidos a provedores
+Permission182=Crear/modificar pedidos a provedores
+Permission183=Validar pedidos a provedores
+Permission184=Aprobar pedidos a provedores
+Permission185=Ordenar ou cancelar pedidos a provedores
+Permission186=Recibir pedidos de provedores
+Permission187=Pechar pedidos a provedores
+Permission188=Anular pedidos a provedores
+Permission192=Crear liñas
+Permission193=Cancelar liñas
+Permission194=Consultar o ancho de banda de liñas
+Permission202=Crear conexións ADSL
+Permission203=Order connections orders
+Permission204=Order connections
+Permission205=Manage connections
+Permission206=Read connections
+Permission211=Read Telephony
+Permission212=Order lines
+Permission213=Activate line
+Permission214=Setup Telephony
+Permission215=Setup providers
+Permission221=Read emailings
+Permission222=Create/modify emailings (topic, recipients...)
+Permission223=Validate emailings (allows sending)
+Permission229=Delete emailings
+Permission237=View recipients and info
+Permission238=Manually send mailings
+Permission239=Delete mailings after validation or sent
+Permission241=Read categories
+Permission242=Create/modify categories
+Permission243=Delete categories
+Permission244=See the contents of the hidden categories
+Permission251=Read other users and groups
+PermissionAdvanced251=Read other users
+Permission252=Read permissions of other users
+Permission253=Create/modify other users, groups and permissions
+PermissionAdvanced253=Create/modify internal/external users and permissions
+Permission254=Create/modify external users only
+Permission255=Modify other users password
+Permission256=Delete or disable other users
+Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission271=Consultar CA
+Permission272=Consultar facturas
+Permission273=Emitir facturas
+Permission281=Consultar contactos
+Permission282=Crear/modificar contactos
+Permission283=Eliminar contactos
+Permission286=Exportar contactos
+Permission291=Consultar tarifas
+Permission292=Definir permisos sobre as tarifas
+Permission293=Modificar tarifas de clientes
+Permission300=Ler códigos de barras
+Permission301=Crear/modificar códigos de barras
+Permission302=Eliminar código de barras
+Permission311=Consultar servizos
+Permission312=Asignar servizos/suscricións a un contrato
+Permission331=Consultar marcadores
+Permission332=Crear/modificar marcadores
+Permission333=Eliminar marcadores
+Permission341=Consultar os seus propios permisos
+Permission342=Crear/modificar a súa propia información de usuario
+Permission343=Modificar su propia contrasinal
+Permission344=Modificar os seus propios permisos
+Permission351=Consultar os grupos
+Permission352=Consultar os permisos de grupos
+Permission353=Crear/modificar os grupos
+Permission354=Eliminar ou desactivar grupos
+Permission358=Exportar usuarios
+Permission401=Read discounts
+Permission402=Create/modify discounts
+Permission403=Validate discounts
+Permission404=Delete discounts
+Permission430=Use Debug Bar
+Permission511=Read payments of salaries
+Permission512=Create/modify payments of salaries
+Permission514=Delete payments of salaries
+Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
+Permission531=Consultar servizos
+Permission532=Create/modify services
+Permission534=Delete services
+Permission536=See/manage hidden services
+Permission538=Export services
+Permission650=Read Bills of Materials
+Permission651=Create/Update Bills of Materials
+Permission652=Delete Bills of Materials
+Permission701=Read donations
+Permission702=Create/modify donations
+Permission703=Delete donations
+Permission771=Read expense reports (yours and your subordinates)
+Permission772=Create/modify expense reports
+Permission773=Delete expense reports
+Permission774=Read all expense reports (even for user not subordinates)
+Permission775=Approve expense reports
+Permission776=Pay expense reports
+Permission779=Export expense reports
+Permission1001=Consultar stocks
+Permission1002=Crear/modificar almacéns
+Permission1003=Eliminar almacéns
+Permission1004=Consultar movementos de stock
+Permission1005=Crear/modificar movementos de stock
+Permission1101=Read delivery receipts
+Permission1102=Create/modify delivery receipts
+Permission1104=Validate delivery receipts
+Permission1109=Delete delivery receipts
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
+Permission1181=Consultar provedores
+Permission1182=Consultar pedidos a provedores
+Permission1183=Crear/modificar pedidos a provedores
+Permission1184=Validar pedidos a provedores
+Permission1185=Aprobar pedidos a provedores
+Permission1186=Enviar pedidos a provedores
+Permission1187=Acknowledge receipt of purchase orders
+Permission1188=Delete purchase orders
+Permission1190=Approve (second approval) purchase orders
+Permission1201=Get result of an export
+Permission1202=Create/Modify an export
+Permission1231=Read vendor invoices
+Permission1232=Create/modify vendor invoices
+Permission1233=Validate vendor invoices
+Permission1234=Delete vendor invoices
+Permission1235=Send vendor invoices by email
+Permission1236=Export vendor invoices, attributes and payments
+Permission1237=Export purchase orders and their details
+Permission1251=Run mass imports of external data into database (data load)
+Permission1321=Export customer invoices, attributes and payments
+Permission1322=Reopen a paid bill
+Permission1421=Export sales orders and attributes
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
+Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
+Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
+Permission2411=Read actions (events or tasks) of others
+Permission2412=Create/modify actions (events or tasks) of others
+Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
+Permission2501=Read/Download documents
+Permission2502=Download documents
+Permission2503=Submit or delete documents
+Permission2515=Setup documents directories
+Permission2801=Use FTP client in read mode (browse and download only)
+Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=Delete leave requests
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20006=Admin leave requests (setup and update balance)
+Permission20007=Approve leave requests
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
+Permission50101=Use Point of Sale
+Permission50201=Consultar as transaccións
+Permission50202=Importar as transaccións
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define fiscal periods. Validate transactions and close fiscal periods.
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
+Permission54001=Imprimir
+Permission55001=Consultar enquisas
+Permission55002=Crear/modificar enquisas
+Permission59001=Consultar marxes comerciais
+Permission59002=Definir marxes comerciais
+Permission59003=Consultar todas as marxes de usuario
+Permission63001=Consultar recursos
+Permission63002=Crear/modificar recursos
+Permission63003=Eliminar recursos
+Permission63004=Vincular recursos a eventos da axenda
+DictionaryCompanyType=Tipos de terceiros
+DictionaryCompanyJuridicalType=Formas xurídicas de terceiros
+DictionaryProspectLevel=Cliente potencial
+DictionaryCanton=States/Provinces
+DictionaryRegion=Regions
+DictionaryCountry=Countries
+DictionaryCurrency=Moedas
+DictionaryCivility=Honorific titles
+DictionaryActions=Types of agenda events
+DictionarySocialContributions=Types of social or fiscal taxes
+DictionaryVAT=VAT Rates or Sales Tax Rates
+DictionaryRevenueStamp=Amount of tax stamps
+DictionaryPaymentConditions=Payment Terms
+DictionaryPaymentModes=Payment Modes
+DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Website - Type of website pages/containers
+DictionaryEcotaxe=Ecotax (WEEE)
+DictionaryPaperFormat=Paper formats
+DictionaryFormatCards=Card formats
+DictionaryFees=Expense report - Types of expense report lines
+DictionarySendingMethods=Shipping methods
+DictionaryStaff=Number of Employees
+DictionaryAvailability=Delivery delay
+DictionaryOrderMethods=Ordering methods
+DictionarySource=Origin of proposals/orders
+DictionaryAccountancyCategory=Personalized groups for reports
+DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
+DictionaryEMailTemplates=Email Templates
+DictionaryUnits=Units
+DictionaryMeasuringUnits=Measuring Units
+DictionarySocialNetworks=Social Networks
+DictionaryProspectStatus=Estado do cliente potencial
+DictionaryHolidayTypes=Types of leave
+DictionaryOpportunityStatus=Lead status for project/lead
+DictionaryExpenseTaxCat=Expense report - Transportation categories
+DictionaryExpenseTaxRange=Expense report - Range by transportation category
+SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
+BackToModuleList=Back to Module list
+BackToDictionaryList=Back to Dictionaries list
+TypeOfRevenueStamp=Type of tax stamp
+VATManagement=Sales Tax Management
+VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
+##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
+LTRate=Tipo
+LocalTax1IsNotUsed=Do not use second tax
+LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
+LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax1Management=Second type of tax
+LocalTax1IsUsedExample=
+LocalTax1IsNotUsedExample=
+LocalTax2IsNotUsed=Do not use third tax
+LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
+LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax2Management=Third type of tax
+LocalTax2IsUsedExample=
+LocalTax2IsNotUsedExample=
+LocalTax1ManagementES=Xestión RE
+LocalTax1IsUsedDescES=The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
+LocalTax1IsNotUsedDescES=By default the proposed RE is 0. End of rule.
+LocalTax1IsUsedExampleES=In Spain they are professionals subject to some specific sections of the Spanish IAE.
+LocalTax1IsNotUsedExampleES=In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
+LocalTax2ManagementES=IRPF Management
+LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
+LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
+LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
+LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
+UseRevenueStamp=Use a tax stamp
+UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+CalcLocaltax=Reports on local taxes
+CalcLocaltax1=Sales - Purchases
+CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
+CalcLocaltax2=Purchases
+CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
+CalcLocaltax3=Sales
+CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+LabelUsedByDefault=Label used by default if no translation can be found for code
+LabelOnDocuments=Label on documents
+LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of a configuration constant
+NbOfDays=Nº de días
+AtEndOfMonth=A fin de mes
+CurrentNext=Actual/Siguinte
+Offset=Decálogo
+AlwaysActive=Sempre activo
+Upgrade=Actualización
+MenuUpgrade=Actualización / Extensión
+AddExtensionThemeModuleOrOther=Implantar/Instalar app/módulo externo
+WebServer=Servidor web
+DocumentRootServer=Directorio raíz do servidor web
+DataRootServer=Directorio raíz dos ficheiros de datos
+IP=IP
+Port=Porto
+VirtualServerName=Nome do servidor virtual
+OS=SO
+PhpWebLink=Vínculo Web-PHP
+Server=Servidor
+Database=Base de datos
+DatabaseServer=Host da base de datos
+DatabaseName=Nome da base de datos
+DatabasePort=Porto da base de datos
+DatabaseUser=Usuario da base de datos
+DatabasePassword=Contrasinal da base de datos
+Tables=Taboas
+TableName=Nome da taboa
+NbOfRecord=Nº de rexistros
+Host=Servidor
+DriverType=Tipo de driver
+SummarySystem=System information summary
+SummaryConst=List of all Dolibarr setup parameters
+MenuCompanySetup=Empresa/Organización
+DefaultMenuManager= Xestor do menú estándar
+DefaultMenuSmartphoneManager=Xestor de menú smartphone
+Skin=Tema visual
+DefaultSkin=Tema visual por defecto
+MaxSizeList=Lonxitude máxima de listaxes
+DefaultMaxSizeList=Default max length for lists
+DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
+MessageOfDay=Message of the day
+MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
+PermanentLeftSearchForm=Permanent search form on left menu
+DefaultLanguage=Default language
+EnableMultilangInterface=Enable multilanguage support
+EnableShowLogo=Show the company logo in the menu
+CompanyInfo=Empresa/Organización
+CompanyIds=Identificación da Empresa/Organización
+CompanyName=Nome
+CompanyAddress=Enderezo
+CompanyZip=Código postal
+CompanyTown=Poboación
+CompanyCountry=País
+CompanyCurrency=Main currency
+CompanyObject=Object of the company
+IDCountry=ID country
+Logo=Logo
+LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
+LogoSquarred=Logo (squarred)
+LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
+DoNotSuggestPaymentMode=Do not suggest
+NoActiveBankAccountDefined=No active bank account defined
+OwnerOfBankAccount=Owner of bank account %s
+BankModuleNotActive=Bank accounts module not enabled
+ShowBugTrackLink=Show link "<strong>%s</strong>"
+Alerts=Alertas
+DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
+DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
+Delays_MAIN_DELAY_ACTIONS_TODO=Planned events (agenda events) not completed
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time
+Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Order not processed
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
+Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation
+Delays_MAIN_DELAY_MEMBERS=Delayed membership fee
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
+Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
+Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
+SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
+SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
+SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
+SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescription5=Other Setup menu entries manage optional parameters.
+LogEvents=Security audit events
+Audit=Auditoría
+InfoDolibarr=About Dolibarr
+InfoBrowser=About Browser
+InfoOS=About OS
+InfoWebServer=About Web Server
+InfoDatabase=About Database
+InfoPHP=About PHP
+InfoPerf=About Performances
+BrowserName=Nome do navegador
+BrowserOS=Browser OS
+ListOfSecurityEvents=List of Dolibarr security events
+SecurityEventsPurged=Security events purged
+LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
+SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
+SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
+AccountantFileNumber=Accountant code
+DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
+AvailableModules=Available app/modules
+ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
+SessionTimeOut=Time out for session
+SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
+TriggersAvailable=Available triggers
+TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
+TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
+TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
+TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
+TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
+GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
+DictionaryDesc=Insert all reference data. You can add your values to the default.
+ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
+MiscellaneousDesc=All other security related parameters are defined here.
+LimitsSetup=Limits/Precision setup
+LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
+MAIN_MAX_DECIMALS_UNIT=Max. decimals for unit prices
+MAIN_MAX_DECIMALS_TOT=Max. decimals for total prices
+MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
+UnitPriceOfProduct=Net unit price of a product
+TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
+ParameterActiveForNextInputOnly=Parameter effective for next input only
+NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page.
+NoEventFoundWithCriteria=No security event has been found for this search criteria.
+SeeLocalSendMailSetup=See your local sendmail setup
+BackupDesc=A <b>complete</b> backup of a Dolibarr installation requires two steps.
+BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
+BackupDesc3=Backup the structure and contents of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
+BackupDescX=The archived directory should be stored in a secure place.
+BackupDescY=The generated dump file should be stored in a secure place.
+BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
+RestoreDesc=To restore a Dolibarr backup, two steps are required.
+RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
+RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
+RestoreMySQL=MySQL import
+ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+PreviousDumpFiles=Existing backup files
+PreviousArchiveFiles=Existing archive files
+WeekStartOnDay=First day of the week
+RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
+YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
+YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
+DownloadMoreSkins=More skins to download
+SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+ShowProfIdInAddress=Show professional id with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+TranslationUncomplete=Partial translation
+MAIN_DISABLE_METEO=Disable meteorological view
+MeteoStdMod=Standard mode
+MeteoStdModEnabled=Standard mode enabled
+MeteoPercentageMod=Percentage mode
+MeteoPercentageModEnabled=Percentage mode enabled
+MeteoUseMod=Click to use %s
+TestLoginToAPI=Test login to API
+ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
+ExternalAccess=External/Internet Access
+MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet)
+MAIN_PROXY_HOST=Proxy server: Name/Address
+MAIN_PROXY_PORT=Proxy server: Port
+MAIN_PROXY_USER=Proxy server: Login/User
+MAIN_PROXY_PASS=Proxy server: Password
+DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+ExtraFields=Complementary attributes
+ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsThirdParties=Complementary attributes (third party)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
+ExtraFieldsMember=Complementary attributes (member)
+ExtraFieldsMemberType=Complementary attributes (member type)
+ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
+ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
+ExtraFieldsSupplierOrders=Complementary attributes (orders)
+ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
+ExtraFieldsProject=Complementary attributes (projects)
+ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldHasWrongValue=Attribute %s has a wrong value.
+AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
+PathToDocuments=Path to documents
+PathDirectory=Directory
+SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+YouMustEnableOneModule=You must at least enable 1 module
+ClassNotFoundIntoPathWarning=Class %s not found in PHP path
+YesInSummer=Yes in summer
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
+SuhosinSessionEncrypt=Session storage encrypted by Suhosin
+ConditionIsCurrently=Condition is currently %s
+YouUseBestDriver=You use driver %s which is the best driver currently available.
+YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+SearchOptim=Search optimization
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
+BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
+AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
+AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
+FieldEdition=Edition of field %s
+FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
+GetBarCode=Get barcode
+NumberingModules=Numbering models
+##### Module password generation
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
+PasswordGenerationPerso=Return a password according to your personally defined configuration.
+SetupPerso=According to your configuration
+PasswordPatternDesc=Password pattern description
+##### Users setup #####
+RuleForGeneratedPasswords=Rules to generate and validate passwords
+DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
+UsersSetup=Users module setup
+UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
+##### HRM setup #####
+HRMSetup=HRM module setup
+##### Company setup #####
+CompanySetup=Companies module setup
+CompanyCodeChecker=Options for automatic generation of customer/vendor codes
+AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
+NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
+NotificationsDescUser=* per user, one user at a time.
+NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
+NotificationsDescGlobal=* or by setting global email addresses in this setup page.
+ModelModules=Document Templates
+DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
+WatermarkOnDraft=Watermark on draft document
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
+CompanyIdProfChecker=Rules for Professional IDs
+MustBeUnique=Must be unique?
+MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
+MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
+WebDavServer=Root URL of %s server: %s
+##### Webcal setup #####
+WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
+##### Invoices #####
+BillsSetup=Invoices module setup
+BillsNumberingModule=Invoices and credit notes numbering model
+BillsPDFModules=Invoice documents models
+BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
+PaymentsPDFModules=Payment documents models
+ForceInvoiceDate=Force invoice date to validation date
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
+SuggestPaymentByChequeToAddress=Suggest payment by check to
+FreeLegalTextOnInvoices=Free text on invoices
+WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
+PaymentsNumberingModule=Payments numbering model
+SuppliersPayment=Vendor payments
+SupplierPaymentSetup=Vendor payments setup
+##### Proposals #####
+PropalSetup=Commercial proposals module setup
+ProposalsNumberingModules=Commercial proposal numbering models
+ProposalsPDFModules=Commercial proposal documents models
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+FreeLegalTextOnProposal=Free text on commercial proposals
+WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
+##### Suppliers Orders #####
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
+##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+OrdersSetup=Sales Orders management setup
+OrdersNumberingModules=Orders numbering models
+OrdersModelModule=Order documents models
+FreeLegalTextOnOrders=Free text on orders
+WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+##### Interventions #####
+InterventionsSetup=Interventions module setup
+FreeLegalTextOnInterventions=Free text on intervention documents
+FicheinterNumberingModules=Intervention numbering models
+TemplatePDFInterventions=Intervention card documents models
+WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+##### Contracts #####
+ContractsSetup=Contracts/Subscriptions module setup
+ContractsNumberingModules=Contracts numbering modules
+TemplatePDFContracts=Contracts documents models
+FreeLegalTextOnContracts=Free text on contracts
+WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+##### Members #####
+MembersSetup=Members module setup
+MemberMainOptions=Main options
+AdherentLoginRequired= Manage a Login for each member
+AdherentMailRequired=Email required to create a new member
+MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
+MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+##### LDAP setup #####
+LDAPSetup=LDAP Setup
+LDAPGlobalParameters=Parámetros globais
+LDAPUsersSynchro=Usuarios
+LDAPGroupsSynchro=Grupos
+LDAPContactsSynchro=Contactos
+LDAPMembersSynchro=Membros
+LDAPMembersTypesSynchro=Tipos de membros
+LDAPSynchronization=Sincronización LDAP
+LDAPFunctionsNotAvailableOnPHP=As funcións LDAP non están dispoñibles no seu PHP
+LDAPToDolibarr=LDAP -> Dolibarr
+DolibarrToLDAP=Dolibarr -> LDAP
+LDAPNamingAttribute=Clave en LDAP
+LDAPSynchronizeUsers=Organización dos usuarios en LDAP
+LDAPSynchronizeGroups=Organización dos grupos en LDAP
+LDAPSynchronizeContacts=Organización dos contactos en LDAP
+LDAPSynchronizeMembers=Organización dos membros da Fundación en LDAP
+LDAPSynchronizeMembersTypes=Organización dos tipos de membros da Fundación en LDAP
+LDAPPrimaryServer=Servidor primario
+LDAPSecondaryServer=Servidor secundario
+LDAPServerPort=Porto do servidor
+LDAPServerPortExample=Porto por defecto : 389
+LDAPServerProtocolVersion=Versión de protocolo
+LDAPServerUseTLS=Use TLS
+LDAPServerUseTLSExample=Your LDAP server use TLS
+LDAPServerDn=Server DN
+LDAPAdminDn=Administrator DN
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
+LDAPPassword=Administrator password
+LDAPUserDn=Users' DN
+LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
+LDAPGroupDn=Groups' DN
+LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
+LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
+LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
+LDAPDnSynchroActive=Users and groups synchronization
+LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
+LDAPDnContactActive=Contacts' synchronization
+LDAPDnContactActiveExample=Activated/Unactivated synchronization
+LDAPDnMemberActive=Members' synchronization
+LDAPDnMemberActiveExample=Activated/Unactivated synchronization
+LDAPDnMemberTypeActive=Members types' synchronization
+LDAPDnMemberTypeActiveExample=Activated/Unactivated synchronization
+LDAPContactDn=Dolibarr contacts' DN
+LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
+LDAPMemberDn=Dolibarr members DN
+LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
+LDAPMemberObjectClassList=List of objectClass
+LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPMemberTypeDn=Dolibarr members types DN
+LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeObjectClassList=List of objectClass
+LDAPMemberTypeObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPUserObjectClassList=List of objectClass
+LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPGroupObjectClassList=List of objectClass
+LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPContactObjectClassList=List of objectClass
+LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPTestConnect=Probar a conexión LDAP
+LDAPTestSynchroContact=Test contacts synchronization
+LDAPTestSynchroUser=Test user synchronization
+LDAPTestSynchroGroup=Test group synchronization
+LDAPTestSynchroMember=Test member synchronization
+LDAPTestSynchroMemberType=Test member type synchronization
+LDAPTestSearch= Test a LDAP search
+LDAPSynchroOK=Synchronization test successful
+LDAPSynchroKO=Failed synchronization test
+LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
+LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
+LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
+LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPSetupForVersion3=LDAP server configured for version 3
+LDAPSetupForVersion2=LDAP server configured for version 2
+LDAPDolibarrMapping=Dolibarr Mapping
+LDAPLdapMapping=LDAP Mapping
+LDAPFieldLoginUnix=Login (unix)
+LDAPFieldLoginExample=Exemplo : uid
+LDAPFilterConnection=Search filter
+LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPFieldLoginSamba=Login (samba, activedirectory)
+LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldFullname=Nome completo
+LDAPFieldFullnameExample=Example: cn
+LDAPFieldPasswordNotCrypted=Password not encrypted
+LDAPFieldPasswordCrypted=Password encrypted
+LDAPFieldPasswordExample=Example: userPassword
+LDAPFieldCommonNameExample=Example: cn
+LDAPFieldName=Nome
+LDAPFieldNameExample=Example: sn
+LDAPFieldFirstName=Nome
+LDAPFieldFirstNameExample=Example: givenName
+LDAPFieldMail=Email address
+LDAPFieldMailExample=Example: mail
+LDAPFieldPhone=Professional phone number
+LDAPFieldPhoneExample=Example: telephonenumber
+LDAPFieldHomePhone=Personal phone number
+LDAPFieldHomePhoneExample=Example: homephone
+LDAPFieldMobile=Cellular phone
+LDAPFieldMobileExample=Example: mobile
+LDAPFieldFax=Fax number
+LDAPFieldFaxExample=Example: facsimiletelephonenumber
+LDAPFieldAddress=Street
+LDAPFieldAddressExample=Example: street
+LDAPFieldZip=Código postal
+LDAPFieldZipExample=Example: postalcode
+LDAPFieldTown=Poboación
+LDAPFieldTownExample=Example: l
+LDAPFieldCountry=País
+LDAPFieldDescription=Descrición
+LDAPFieldDescriptionExample=Example: description
+LDAPFieldNotePublic=Public Note
+LDAPFieldNotePublicExample=Example: publicnote
+LDAPFieldGroupMembers= Group members
+LDAPFieldGroupMembersExample= Example: uniqueMember
+LDAPFieldBirthdate=Birthdate
+LDAPFieldCompany=Empresa
+LDAPFieldCompanyExample=Example: o
+LDAPFieldSid=SID
+LDAPFieldSidExample=Example: objectsid
+LDAPFieldEndLastSubscription=Date of subscription end
+LDAPFieldTitle=Posto de traballo
+LDAPFieldTitleExample=Example: title
+LDAPFieldGroupid=Group id
+LDAPFieldGroupidExample=Exemple : gidnumber
+LDAPFieldUserid=User id
+LDAPFieldUseridExample=Exemple : uidnumber
+LDAPFieldHomedirectory=Home directory
+LDAPFieldHomedirectoryExample=Exemple : homedirectory
+LDAPFieldHomedirectoryprefix=Home directory prefix
+LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
+LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
+LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
+LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
+LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
+LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
+LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use thoose values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all thoose schemas loaded.
+ForANonAnonymousAccess=For an authenticated access (for a write access for example)
+PerfDolibarr=Performance setup/optimizing report
+YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
+NotInstalled=Not installed, so your server is not slowed down by this.
+ApplicativeCache=Applicative cache
+MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
+MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
+MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
+OPCodeCache=OPCode cache
+NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
+HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
+FilesOfTypeCached=Files of type %s are cached by HTTP server
+FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
+FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
+FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
+CacheByServer=Cache by server
+CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
+CacheByClient=Cache by browser
+CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
+DefaultCreateForm=Default values (to use on forms)
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
+DefaultMandatory=Mandatory form fields
+##### Products #####
+ProductSetup=Configuración do módulo Produtos
+ServiceSetup=Configuración do módulo Servizos
+ProductServiceSetup=Configuración dos módulos Produtos e Servizos
+NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
+ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in the language of the third party
+UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
+SetDefaultBarcodeTypeProducts=Default barcode type to use for products
+SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
+ProductCodeChecker= Module for product code generation and checking (product or service)
+ProductOtherConf= Product / Service configuration
+IsNotADir=is not a directory!
+##### Syslog #####
+SyslogSetup=Logs module setup
+SyslogOutput=Logs outputs
+SyslogFacility=Facility
+SyslogLevel=Level
+SyslogFilename=File name and path
+YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
+ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
+OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+##### Donations #####
+DonationsSetup=Donation module setup
+DonationsReceiptModel=Template of donation receipt
+##### Barcode #####
+BarcodeSetup=Configuración dos códigos de barras
+PaperFormatModule=Módulos de formatos de impresión
+BarcodeEncodeModule=Tipos de códigos de barras
+CodeBarGenerator=Xerador de código de barras
+ChooseABarCode=No generator defined
+FormatNotSupportedByGenerator=Format not supported by this generator
+BarcodeDescEAN8=Códigos de barras tipo EAN8
+BarcodeDescEAN13=Códigos de barras tipo EAN13
+BarcodeDescUPC=Códigos de barras tipo UPC
+BarcodeDescISBN=Códigos de barras tipo ISBN
+BarcodeDescC39=Códigos de barras tipo C39
+BarcodeDescC128=Códigos de barras tipo C128
+BarcodeDescDATAMATRIX=Códigos de barras tipo Datamatrix
+BarcodeDescQRCODE=Códigos de barras tipo código QR
+GenbarcodeLocation=Ferramenta de xeración de códigos de barras na liña de comandos (usada polo motor interno para determinados tipos de códigos de barras). Ten que ser compatible con "genbarcode".<br>Por exemplo: /usr/local/bin/genbarcode
+BarcodeInternalEngine=Motor interno
+BarCodeNumberManager=Xestor para auto definir números de código de barras
+##### Prelevements #####
+WithdrawalsSetup=Setup of module Direct Debit payments
+##### ExternalRSS #####
+ExternalRSSSetup=External RSS imports setup
+NewRSS=New RSS Feed
+RSSUrl=RSS URL
+RSSUrlExample=An interesting RSS feed
+##### Mailing #####
+MailingSetup=EMailing module setup
+MailingEMailFrom=Sender email (From) for emails sent by emailing module
+MailingEMailError=Return Email (Errors-to) for emails with errors
+MailingDelay=Seconds to wait after sending next message
+##### Notification #####
+NotificationSetup=Email Notification module setup
+NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
+FixedEmailTarget=Recipient
+##### Sendings #####
+SendingsSetup=Shipping module setup
+SendingsReceiptModel=Sending receipt model
+SendingsNumberingModules=Sendings numbering modules
+SendingsAbility=Support shipping sheets for customer deliveries
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
+FreeLegalTextOnShippings=Free text on shipments
+##### Deliveries #####
+DeliveryOrderNumberingModules=Products deliveries receipt numbering module
+DeliveryOrderModel=Products deliveries receipt model
+DeliveriesOrderAbility=Support products deliveries receipts
+FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+##### FCKeditor #####
+AdvancedEditor=Advanced editor
+ActivateFCKeditor=Activate advanced editor for:
+FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
+FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
+FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
+FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
+FCKeditorForTicket=WYSIWIG creation/edition for tickets
+##### Stock #####
+StockSetup=Stock module setup
+IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+##### Menu #####
+MenuDeleted=Menú eliminado
+Menus=Menús
+TreeMenuPersonalized=Menús personalizados
+NotTopTreeMenuPersonalized=Menús personalizados non ligados a un menú superior
+NewMenu=New menu
+Menu=Selection of menu
+MenuHandler=Menu handler
+MenuModule=Source module
+HideUnauthorizedMenu= Hide unauthorized menus (gray)
+DetailId=Id menu
+DetailMenuHandler=Menu handler where to show new menu
+DetailMenuModule=Module name if menu entry come from a module
+DetailType=Type of menu (top or left)
+DetailTitre=Menu label or label code for translation
+DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
+DetailEnabled=Condition to show or not entry
+DetailRight=Condition to display unauthorized grey menus
+DetailLangs=Lang file name for label code translation
+DetailUser=Intern / Extern / All
+Target=Destinatario
+DetailTarget=Target for links (_blank top opens a new window)
+DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
+ModifMenu=Menu change
+DeleteMenu=Delete menu entry
+ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
+FailedToInitializeMenu=Failed to initialize menu
+##### Tax #####
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
+OptionVatMode=VAT due
+OptionVATDefault=Standard basis
+OptionVATDebitOption=Accrual basis
+OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
+OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
+SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option:
+OnDelivery=On delivery
+OnPayment=On payment
+OnInvoice=On invoice
+SupposedToBePaymentDate=Payment date used
+SupposedToBeInvoiceDate=Invoice date used
+Buy=Buy
+Sell=Vendas
+InvoiceDateUsed=Invoice date used
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
+AccountancyCode=Accounting Code
+AccountancyCodeSell=Sale account. code
+AccountancyCodeBuy=Purchase account. code
+##### Agenda #####
+AgendaSetup=Events and agenda module setup
+PasswordTogetVCalExport=Key to authorize export link
+PastDelayVCalExport=Do not export event older than
+AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
+AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
+AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
+AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
+ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+##### Point Of Sale (CashDesk) #####
+CashDesk=Point of Sale
+CashDeskSetup=Point of Sales module setup
+CashDeskThirdPartyForSell=Default generic third party to use for sales
+CashDeskBankAccountForSell=Default account to use to receive cash payments
+CashDeskBankAccountForCheque=Default account to use to receive payments by check
+CashDeskBankAccountForCB=Default account to use to receive payments by credit cards
+CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with module Serial/Lot management (currently active) so stock decrease is disabled.
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
+CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
+CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
+CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+##### Bookmark #####
+BookmarkSetup=Bookmark module setup
+BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
+NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
+##### WebServices #####
+WebServicesSetup=Webservices module setup
+WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
+WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
+EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
+ApiExporerIs=You can explore and test the APIs at URL
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+##### Bank #####
+BankSetupModule=Bank module setup
+FreeLegalTextOnChequeReceipts=Free text on check receipts
+BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
+BankOrderGlobal=Xeral
+BankOrderGlobalDesc=General display order
+BankOrderES=Español
+BankOrderESDesc=Spanish display order
+ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+##### Multicompany #####
+MultiCompanySetup=Multi-company module setup
+##### Suppliers #####
+SuppliersSetup=Vendor module setup
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
+SuppliersInvoiceModel=Complete template of Vendor Invoice
+SuppliersInvoiceNumberingModel=Vendor invoices numbering models
+IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
+##### GeoIPMaxmind #####
+GeoIPMaxmindSetup=GeoIP Maxmind module setup
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
+NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
+YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
+YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
+TestGeoIPResult=Test of a conversion IP -> country
+##### Projects #####
+ProjectsNumberingModules=Projects numbering module
+ProjectsSetup=Project module setup
+ProjectsModelModule=Project reports document model
+TasksNumberingModules=Tasks numbering module
+TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
+##### ECM (GED) #####
+##### Fiscal Year #####
+AccountingPeriods=Accounting periods
+AccountingPeriodCard=Accounting period
+NewFiscalYear=New accounting period
+OpenFiscalYear=Open accounting period
+CloseFiscalYear=Close accounting period
+DeleteFiscalYear=Delete accounting period
+ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
+ShowFiscalYear=Show accounting period
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
+Format=Format
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
+IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
+ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
+ExpenseReportNumberingModules=Expense reports numbering module
+NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerUser=List of automatic notifications per user*
+ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
+ListOfFixedNotifications=List of automatic fixed notifications
+GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+Threshold=Threshold
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
+SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
+SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
+HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+TextTitleColor=Text color of Page title
+LinkColor=Color of links
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
+MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
+NbAddedAutomatically=Number of days added to counters of users (automatically) each month
+EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+Enter0or1=Enter 0 or 1
+UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
+PositionIntoComboList=Position of line into combo lists
+SellTaxRate=Sale tax rate
+RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
+UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
+OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
+TemplateForElement=This template record is dedicated to which element
+TypeOfTemplate=Type of template
+TemplateIsVisibleByOwnerOnly=Template is visible to owner only
+VisibleEverywhere=Visible everywhere
+VisibleNowhere=Visible nowhere
+FixTZ=TimeZone fix
+FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
+ExpectedChecksum=Expected Checksum
+CurrentChecksum=Current Checksum
+ExpectedSize=Expected size
+CurrentSize=Current size
+ForcedConstants=Required constant values
+MailToSendProposal=Orzamentos a clientes
+MailToSendOrder=Pedidos de clientes
+MailToSendInvoice=Facturas a clientes
+MailToSendShipment=Envíos
+MailToSendIntervention=Intervencións
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Pedidos a provedores
+MailToSendSupplierInvoice=Facturas provedor
+MailToSendContract=Contratos
+MailToThirdparty=Terceiros
+MailToMember=Membros
+MailToUser=Usuarios
+MailToProject=Páxina proxectos
+ByDefaultInList=Show by default on list view
+YouUseLastStableVersion=You use the latest stable version
+TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
+TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
+SeeChangeLog=See ChangeLog file (english only)
+AllPublishers=All publishers
+UnknownPublishers=Unknown publishers
+AddRemoveTabs=Add or remove tabs
+AddDataTables=Add object tables
+AddDictionaries=Add dictionaries tables
+AddData=Add objects or dictionaries data
+AddBoxes=Add widgets
+AddSheduledJobs=Add scheduled jobs
+AddHooks=Add hooks
+AddTriggers=Add triggers
+AddMenus=Engade menús
+AddPermissions=Add permissions
+AddExportProfiles=Add export profiles
+AddImportProfiles=Add import profiles
+AddOtherPagesOrServices=Add other pages or services
+AddModels=Add document or numbering templates
+AddSubstitutions=Add keys substitutions
+DetectionNotPossible=Detection not possible
+UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
+ListOfAvailableAPIs=List of available APIs
+activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
+CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
+UserHasNoPermissions=This user has no permissions defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
+BaseCurrency=Reference currency of the company (go into setup of company to change this)
+WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
+WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
+MAIN_PDF_MARGIN_LEFT=Left margin on PDF
+MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
+MAIN_PDF_MARGIN_TOP=Top margin on PDF
+MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+NothingToSetup=There is no specific setup required for this module.
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+RemoveSpecialChars=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
+GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
+GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
+HelpOnTooltip=Help text to show on tooltip
+HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
+YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
+ChartLoaded=Chart of account loaded
+SocialNetworkSetup=Setup of module Social Networks
+EnableFeatureFor=Enable features for <strong>%s</strong>
+VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+EmailCollector=Email collector
+EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
+NewEmailCollector=New Email Collector
+EMailHost=Host of email IMAP server
+MailboxSourceDirectory=Mailbox source directory
+MailboxTargetDirectory=Mailbox target directory
+EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
+CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
+DateLastCollectResult=Date latest collect tried
+DateLastcollectResultOk=Date latest collect successfull
+LastResult=Latest result
+EmailCollectorConfirmCollectTitle=Email collect confirmation
+EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
+NoNewEmailToProcess=No new email (matching filters) to process
+NothingProcessed=Nothing done
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+RecordEvent=Record email event
+CreateLeadAndThirdParty=Create lead (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CodeLastResult=Latest result code
+NbOfEmailsInInbox=Number of emails in source directory
+LoadThirdPartyFromName=Load third party searching on %s (load only)
+LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+WithDolTrackingID=Dolibarr Reference found in Message ID
+WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+FormatZip=Código postal
+MainMenuCode=Menu entry code (mainmenu)
+ECMAutoTree=Show automatic ECM tree
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OpeningHours=Opening hours
+OpeningHoursDesc=Enter here the regular opening hours of your company.
+ResourceSetup=Configuration of Resource module
+UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
+EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
+ConfirmUnactivation=Confirm module reset
+OnMobileOnly=On small screen (smartphone) only
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
+Protanopia=Protanopia
+Deuteranopes=Deuteranopes
+Tritanopes=Tritanopes
+ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
+DefaultCustomerType=Default thirdparty type for "New customer" creation form
+ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
+RootCategoryForProductsToSell=Root category of products to sell
+RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
+DebugBar=Debug Bar
+DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
+DebugBarSetup=DebugBar Setup
+GeneralOptions=General Options
+LogsLinesNumber=Number of lines to show on logs tab
+UseDebugBar=Use the debug bar
+DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
+WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
+ModuleActivated=Module %s is activated and slows the interface
+EXPORTS_SHARE_MODELS=Export models are share with everybody
+ExportSetup=Setup of module Export
+ImportSetup=Setup of module Import
+InstanceUniqueID=Unique ID of the instance
+SmallerThan=Smaller than
+LargerThan=Larger than
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
+EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
+RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
+AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+IPListExample=127.0.0.1 192.168.0.2 [::1]
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
+FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
+EmailTemplate=Template for email
+EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
+FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/gl_ES/agenda.lang b/htdocs/langs/gl_ES/agenda.lang
new file mode 100644
index 00000000000..6c845e7be1b
--- /dev/null
+++ b/htdocs/langs/gl_ES/agenda.lang
@@ -0,0 +1,154 @@
+# Dolibarr language file - Source file is en_US - agenda
+IdAgenda=ID de evento
+Actions=Eventos
+Agenda=Axenda
+TMenuAgenda=Axenda
+Agendas=Axendas
+LocalAgenda=Calendario interno
+ActionsOwnedBy=Evento propiedade de
+ActionsOwnedByShort=Propietario
+AffectedTo=Asignada a
+Event=Evento
+Events=Eventos
+EventsNb=Número de eventos
+ListOfActions=Listaxe de eventos
+EventReports=Informes de evento
+Location=Localización
+ToUserOfGroup=A calquera usuario do grupo
+EventOnFullDay=Evento para todo o(s) día(s)
+MenuToDoActions=Todos os eventos incompletos
+MenuDoneActions=Todos os eventos rematados
+MenuToDoMyActions=Meus eventos incompletos
+MenuDoneMyActions=Meus eventos rematados
+ListOfEvents=Listaxe de acontecementos (calendario interno)
+ActionsAskedBy=Eventos rexistrados por
+ActionsToDoBy=Eventos asignados a
+ActionsDoneBy=Eventos realizados por
+ActionAssignedTo=Evento asignado a
+ViewCal=Vista mensual
+ViewDay=Vista diaria
+ViewWeek=Vista semanal
+ViewPerUser=Vista por usuario
+ViewPerType=Vista por tipo
+AutoActions= Inclusión automática na axenda
+AgendaAutoActionDesc= Aquí podes definir os eventos que queras que Dolibarr cre automáticamente in Agenda. Se non sinalas nada,  só as accións manuais serán visualizadas na axenda. O seguemento automático de accións comerciais sobre obxectos (validación, cambio de estado, non será gardado.
+AgendaSetupOtherDesc= Esta páxina ten opcións que permiten a configuración da exportación dos eventos de Dolibarr a un calendario externo (Thunderbird, Google Calendar etc...)
+AgendaExtSitesDesc=Esta páxina permite configurar fontes externas de calendarios para ver os seus eventos dentro da axenda Dolibarr.
+ActionsEvents=Eventos para que Dolibarr cre unha acción na axenda automáticamente
+EventRemindersByEmailNotEnabled=Lembranzas de eventos por correo non foron activados na configuración do módulo %s.
+##### Agenda event labels #####
+NewCompanyToDolibarr=Terceiro %s creado
+COMPANY_DELETEInDolibarr=Third party %s deleted
+ContractValidatedInDolibarr=Contrato %s validado
+CONTRACT_DELETEInDolibarr=Contrato %s eliminado
+PropalClosedSignedInDolibarr=Orzamento %s asinado
+PropalClosedRefusedInDolibarr=Orzamento %s rexeitado
+PropalValidatedInDolibarr=Orzamento %s validado
+PropalClassifiedBilledInDolibarr=Orzamento %s clasificado como facturado
+InvoiceValidatedInDolibarr=Factura %s validada
+InvoiceValidatedInDolibarrFromPos=Factura %s validada desde TPV
+InvoiceBackToDraftInDolibarr=Factura %s de volta a borrador
+InvoiceDeleteDolibarr=Factura %s eliminada
+InvoicePaidInDolibarr=Factura %s cambiada a pagada
+InvoiceCanceledInDolibarr=Factura %s cancelada
+MemberValidatedInDolibarr=Membro %s validado
+MemberModifiedInDolibarr=Membro %s modificado
+MemberResiliatedInDolibarr=Membro %s rematado
+MemberDeletedInDolibarr=Membro %s eliminado
+MemberSubscriptionAddedInDolibarr=Suscrición %s do membro %s engadida
+MemberSubscriptionModifiedInDolibarr=Suscrición %s do membro %s modificada
+MemberSubscriptionDeletedInDolibarr=Suscrición %s do membro %s eliminada
+ShipmentValidatedInDolibarr=Expedición %s validada
+ShipmentClassifyClosedInDolibarr=Expedición %s clasificada como pagada
+ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
+ShipmentBackToDraftInDolibarr=Expedición %s de volta ao estatus de borrador
+ShipmentDeletedInDolibarr=Expedición %s eliminada
+OrderCreatedInDolibarr=Pedido %s creado
+OrderValidatedInDolibarr=Pedido %s validado
+OrderDeliveredInDolibarr=Pedido %s clasificado como enviado
+OrderCanceledInDolibarr=Pedido %s anulado
+OrderBilledInDolibarr=Pedido %s clasificado como facturado
+OrderApprovedInDolibarr=Pedido %s aprobado
+OrderRefusedInDolibarr=Pedido %s rexeitado
+OrderBackToDraftInDolibarr=Pedido %s de volta ao estaus borrador
+ProposalSentByEMail=Orzamento %s enviado por e-mail
+ContractSentByEMail=Contrato %s enviado por e-Mail
+OrderSentByEMail=Pedido de cliente %s enviado por e-mail
+InvoiceSentByEMail=Factura a cliente %s enviada por e-mail
+SupplierOrderSentByEMail=Pedido a proveedor %s enviado por e-mail
+ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
+SupplierInvoiceSentByEMail=Factura de proveedor %s enviada por e-mail
+ShippingSentByEMail=Expedición %s enviada por email
+ShippingValidated= Expedición %s validada
+InterventionSentByEMail=Intervención %s enviada por e-mail
+ProposalDeleted=Orzamento eliminado
+OrderDeleted=Pedido eliminado
+InvoiceDeleted=Factura eliminada
+DraftInvoiceDeleted=Draft invoice deleted
+PRODUCT_CREATEInDolibarr=Produto %s creado
+PRODUCT_MODIFYInDolibarr=Produto %s modificado
+PRODUCT_DELETEInDolibarr=Produto %s eliminado
+HOLIDAY_CREATEInDolibarr=Request for leave %s created
+HOLIDAY_MODIFYInDolibarr=Request for leave %s modified
+HOLIDAY_APPROVEInDolibarr=Request for leave %s approved
+HOLIDAY_VALIDATEInDolibarr=Request for leave %s validated
+HOLIDAY_DELETEInDolibarr=Request for leave %s deleted
+EXPENSE_REPORT_CREATEInDolibarr=Informe de gastos %s creado
+EXPENSE_REPORT_VALIDATEInDolibarr=Informe de gastos %s validado
+EXPENSE_REPORT_APPROVEInDolibarr=Informe de gastos %s aprobado
+EXPENSE_REPORT_DELETEInDolibarr=Informe de gastos %s eliminado
+EXPENSE_REPORT_REFUSEDInDolibarr=Informe de gastos %s rexeitado
+PROJECT_CREATEInDolibarr=Proxecto %s creado
+PROJECT_MODIFYInDolibarr=Proxecto %s modificado
+PROJECT_DELETEInDolibarr=Proxecto %s eliminado
+TICKET_CREATEInDolibarr=Ticket %s creado
+TICKET_MODIFYInDolibarr=Ticket %s modificado
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
+TICKET_CLOSEInDolibarr=Ticket %s closed
+TICKET_DELETEInDolibarr=Ticket %s eliminado
+BOM_VALIDATEInDolibarr=BOM validated
+BOM_UNVALIDATEInDolibarr=BOM unvalidated
+BOM_CLOSEInDolibarr=BOM disabled
+BOM_REOPENInDolibarr=BOM reopen
+BOM_DELETEInDolibarr=BOM deleted
+MRP_MO_VALIDATEInDolibarr=MO validated
+MRP_MO_PRODUCEDInDolibarr=MO produced
+MRP_MO_DELETEInDolibarr=MO deleted
+##### End agenda events #####
+AgendaModelModule=Prantillas de documentos para eventos
+DateActionStart=Data de inicio
+DateActionEnd=Data de fin
+AgendaUrlOptions1=Pode tamén engadir os seguintes parámetros ao filtro de saida:
+AgendaUrlOptions3=<b>logina=%s</b> para restrinxir saída as accións pertencentes ao usuario <b>%s</b>.
+AgendaUrlOptionsNotAdmin=<b> logina =!%s</b> para restrinxir saída as accións que non pertencen ao usuario <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b>para restrinxir saída as accións asignadas ao usuario <b>%s</b>(propietario e outros).
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> para restrinxir saída de accións asociadas ao proxecto <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype = systemauto</b> para excluir o evento automáticamente.
+AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
+AgendaShowBirthdayEvents=Amosar cumpreanos dos contactos
+AgendaHideBirthdayEvents=Ocultar cumpreanos dos contactos
+Busy=Ocupado
+ExportDataset_event1=Listaxe de eventos da axenda
+DefaultWorkingDays=Xornada laboral semanal por defecto (Por exemplo: 1-5, 1-6)
+DefaultWorkingHours=Xornada laboral diaria en horas (Por exemplo 9-18)
+# External Sites ical
+ExportCal=Exportar calendario
+ExtSites=Importar calendarios externos
+ExtSitesEnableThisTool=Amosar calendarios externos (definido na configuración global) na axenda. Non afecta aos calendarios externos definidos polos usuarios
+ExtSitesNbOfAgenda=Número de calendarios
+AgendaExtNb=Calendario nº %s
+ExtSiteUrlAgenda=Url de acceso ao ficheiro .ical
+ExtSiteNoLabel=Sen descrición
+VisibleTimeRange=Rango de tempo visible
+VisibleDaysRange=Rango de días visibles
+AddEvent=Crear evento
+MyAvailability=A miña dispoñibilidade
+ActionType=Tipo de evento
+DateActionBegin=Data de comezo do evento
+ConfirmCloneEvent=¿Esta certo de querer clonar o evento <b>%s</b>?
+RepeatEvent=Repetir evento
+EveryWeek=Cada semana
+EveryMonth=Cada mes
+DayOfMonth=Día do mes
+DayOfWeek=Día da semana
+DateStartPlusOne=Data inicio +1 hora
diff --git a/htdocs/langs/gl_ES/assets.lang b/htdocs/langs/gl_ES/assets.lang
new file mode 100644
index 00000000000..7bc7e8d73a1
--- /dev/null
+++ b/htdocs/langs/gl_ES/assets.lang
@@ -0,0 +1,65 @@
+# Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+Assets = Assets
+NewAsset = New asset
+AccountancyCodeAsset = Accounting code (asset)
+AccountancyCodeDepreciationAsset = Accounting code (depreciation asset account)
+AccountancyCodeDepreciationExpense = Accounting code (depreciation expense account)
+NewAssetType=New asset type
+AssetsTypeSetup=Asset type setup
+AssetTypeModified=Asset type modified
+AssetType=Asset type
+AssetsLines=Assets
+DeleteType=Eliminar
+DeleteAnAssetType=Delete an asset type
+ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
+ShowTypeCard=Show type '%s'
+
+# Module label 'ModuleAssetsName'
+ModuleAssetsName = Assets
+# Module description 'ModuleAssetsDesc'
+ModuleAssetsDesc = Assets description
+
+#
+# Admin page
+#
+AssetsSetup = Assets setup
+Settings = Settings
+AssetsSetupPage = Assets setup page
+ExtraFieldsAssetsType = Complementary attributes (Asset type)
+AssetsType=Asset type
+AssetsTypeId=Asset type id
+AssetsTypeLabel=Asset type label
+AssetsTypes=Assets types
+
+#
+# Menu
+#
+MenuAssets = Assets
+MenuNewAsset = New asset
+MenuTypeAssets = Type assets
+MenuListAssets = Listaxe
+MenuNewTypeAssets = Novo
+MenuListTypeAssets = Listaxe
+
+#
+# Module
+#
+NewAssetType=New asset type
+NewAsset=New asset
diff --git a/htdocs/langs/gl_ES/banks.lang b/htdocs/langs/gl_ES/banks.lang
new file mode 100644
index 00000000000..b9198633c7b
--- /dev/null
+++ b/htdocs/langs/gl_ES/banks.lang
@@ -0,0 +1,175 @@
+# Dolibarr language file - Source file is en_US - banks
+Bank=Banco
+MenuBankCash=Bancos | Caixa
+MenuVariousPayment=Pagos varios
+MenuNewVariousPayment=Novos pagos varios
+BankName=Nome do banco
+FinancialAccount=Conta
+BankAccount=Conta bancaria
+BankAccounts=Contas Bancarias
+BankAccountsAndGateways=Contas bancarias | Pasarelas
+ShowAccount=Amosar conta
+AccountRef=Ref. conta financiera
+AccountLabel=Etiqueta conta financiera
+CashAccount=Conta caixa
+CashAccounts=Contas caixa
+CurrentAccounts=Contas correntes
+SavingAccounts=Contas de aforro
+ErrorBankLabelAlreadyExists=Etiqueta de conta financiera xa existente
+BankBalance=Saldo
+BankBalanceBefore=Saldo anterior
+BankBalanceAfter=Saldo posterior
+BalanceMinimalAllowed=Saldo mínimo autorizado
+BalanceMinimalDesired=Saldo mínimo desexado
+InitialBankBalance=Saldo inicial
+EndBankBalance=Saldo final
+CurrentBalance=Saldo actual
+FutureBalance=Saldo previsto
+ShowAllTimeBalance=Amosar balance dende o principio
+AllTime=Dende o inicio
+Reconciliation=Conciliación
+RIB=Conta bancaria
+IBAN=Número IBAN
+BIC=Código BIC/SWIFT
+SwiftValid=BIC/SWIFT válido
+SwiftVNotalid=BIC/SWIFT non válido
+IbanValid=IBAN válido
+IbanNotValid=IBAN non válido
+StandingOrders=Domiciliacións
+StandingOrder=Domiciliación
+AccountStatement=Extracto da conta
+AccountStatementShort=Extracto
+AccountStatements=Extractos da conta
+LastAccountStatements=Últimos extractos bancarios
+IOMonthlyReporting=Informe mensual
+BankAccountDomiciliation=Enderezo do Banco
+BankAccountCountry=País do Banco
+BankAccountOwner=Nome do titular da conta
+BankAccountOwnerAddress=Enderezo do titular da conta
+RIBControlError=Fallo na integridade dos datos. O número da conta é incompleto ou incorrecto (revisa o país, números e IBAN).
+CreateAccount=Crear conta
+NewBankAccount=Nova conta
+NewFinancialAccount=Nova conta financiera
+MenuNewFinancialAccount=Nova conta
+EditFinancialAccount=Edición conta
+LabelBankCashAccount=Etiqueta da conta ou caixa
+AccountType=Tipo de conta
+BankType0=Conta bancaria de aforros
+BankType1=Conta bancaria corrente
+BankType2=Conta caixa
+AccountsArea=Área contas
+AccountCard=Ficha conta
+DeleteAccount=Eliminación de conta
+ConfirmDeleteAccount=¿Está certo de querer eliminar esta conta?
+Account=Conta
+BankTransactionByCategories=Rexistros bancarios por categorías
+BankTransactionForCategory=Rexistros bancarios pola categoría <b>%s</b>
+RemoveFromRubrique=Eliminar vínculo coa categoría
+RemoveFromRubriqueConfirm=¿Está certo de querer eliminar o vínculo entre o rexistro e a categoría?
+ListBankTransactions=Listaxe de rexistros bancarios
+IdTransaction=Id de transacción
+BankTransactions=Rexistros bancarios
+BankTransaction=Rexistro bancario
+ListTransactions=Listaxe rexistros
+ListTransactionsByCategory=Listaxe rexistros/categoría
+TransactionsToConciliate=Rexistros a conciliar
+TransactionsToConciliateShort=To reconcile
+Conciliable=Pode ser conciliado
+Conciliate=Conciliar
+Conciliation=Conciliación
+SaveStatementOnly=Gardar só extracto
+ReconciliationLate=Conciliación tardía
+IncludeClosedAccount=Incluir contas pechadas
+OnlyOpenedAccount=Só contas abiertas
+AccountToCredit=Conta de crédito
+AccountToDebit=Conta de débito
+DisableConciliation=Desactivar a función de conciliación para esta conta
+ConciliationDisabled=Función de conciliación desactivada
+LinkedToAConciliatedTransaction=Vinculada a un rexistro conciliado
+StatusAccountOpened=Aberta
+StatusAccountClosed=Pechada
+AccountIdShort=Número
+LineRecord=Rexistro
+AddBankRecord=Engadir rexistro
+AddBankRecordLong=Engadir rexistro manual
+Conciliated=Reconciliado
+ConciliatedBy=Reconciliado por
+DateConciliating=Data de reconciliación
+BankLineConciliated=Entry reconciled with bank receipt
+Reconciled=Reconciliado
+NotReconciled=Non reconciliado
+CustomerInvoicePayment=Cobro a cliente
+SupplierInvoicePayment=Pago a provedor
+SubscriptionPayment=Pago cota
+WithdrawalPayment=Debit payment order
+SocialContributionPayment=Pago de imposto social/fiscal
+BankTransfer=Transferencia bancaria
+BankTransfers=Transferencias bancarias
+MenuBankInternalTransfer=Transferencia interna
+TransferDesc=Ao transferir dunha conta a outra, Dolibarr crea dous rexistros contables (un de débito na conta orixe e un de crédito na conta destino). Do mesmo importe (salvo o signo), a etiqueta e a data serán usadas para esta transacción.
+TransferFrom=De
+TransferTo=A
+TransferFromToDone=A transferencia de <b>%s</b> hacia <b>%s</b> de <b>%s</b> %s foi rexistrada.
+CheckTransmitter=Emisor
+ValidateCheckReceipt=¿Validar este cheque recibido?
+ConfirmValidateCheckReceipt=¿Está certo de querer validar esta remesa? (ningunha modificación será posible unha vez sexa aprobada)
+DeleteCheckReceipt=¿Eliminar esta remesa?
+ConfirmDeleteCheckReceipt=¿Está certo de querer eliminar esta remesa?
+BankChecks=Cheques bancarios
+BankChecksToReceipt=Cheques agardando o deposito
+BankChecksToReceiptShort=Cheques agardando o deposito
+ShowCheckReceipt=Amosar remesa recibida
+NumberOfCheques=Nº de cheque
+DeleteTransaction=Eliminar rexistro
+ConfirmDeleteTransaction=¿Está certo de querer eliminar este rexistro?
+ThisWillAlsoDeleteBankRecord=Isto tamén eliminará o rexistro bancario
+BankMovements=Movementos
+PlannedTransactions=Rexistros previstos
+Graph=Gráficos
+ExportDataset_banque_1=Rexistros bancarios e extractos de conta
+ExportDataset_banque_2=Xustificante bancario
+TransactionOnTheOtherAccount=Transacción sobre a outra conta
+PaymentNumberUpdateSucceeded=Número de pago actualizado correctamente
+PaymentNumberUpdateFailed=Numero de pago non puido ser actualizado
+PaymentDateUpdateSucceeded=Data de pago actualizada correctamente
+PaymentDateUpdateFailed=Data de pago non puido ser actualizada
+Transactions=Transaccións
+BankTransactionLine=Rexistro bancario
+AllAccounts=Todas as contas bancarias e de caixa
+BackToAccount=Voltar á conta
+ShowAllAccounts=Amosar para todas as contas
+FutureTransaction=Transacción futura. Non é posible a reconciliación.
+SelectChequeTransactionAndGenerate=Seleccione/filtre cheques a engadir na remesa de cheches e facga click en "Crear".
+InputReceiptNumber=Escolla o extracto relacionado coa conciliación. Use o valor númerico ordenable: YYMM or YYYYMMDD
+EventualyAddCategory=Eventualmente, especifique a categoría na que quere clasificar os rexistros
+ToConciliate=A reconciliar?
+ThenCheckLinesAndConciliate=Entón, chequea as liñas presentes no extracto bancario e faga click
+DefaultRIB=Conta bancaria por defecto
+AllRIB=Todas as contas bancarias
+LabelRIB=Nome da conta bancaria
+NoBANRecord=Ningunha conta bancaria
+DeleteARib=Borrar rexistro bancario
+ConfirmDeleteRib=¿Está certo de querer eliminar esta conta bancaria?
+RejectCheck=Cheque rexeitado
+ConfirmRejectCheck=¿Está certo de querer marcar este cheque como rexeitado?
+RejectCheckDate=Data de rexeitamento do cheque
+CheckRejected=Cheque rexeitado
+CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
+BankAccountModelModule=Modelos de documentos para contas bancarias
+DocumentModelSepaMandate=Prantilla de orde SEPA. Útil só para países membros da UE.
+DocumentModelBan=Prantilla para imprimir unha páxina coa información IBAN.
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
+VariousPayments=Pagos varios
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
+SEPAMandate=Orde SEPA
+YourSEPAMandate=A súa orde SEPA
+FindYourSEPAMandate=Esta é a súa orde SEPA para autorizar a nosa empresa a realizar un petición de débito ao seu banco. Envíea de volta asinada (dixitalice o documento asinado) ou envíe por correo a
+AutoReportLastAccountStatement=Automaticanete cubra a etiqueta 'numero de extracto bancario' co último número de extracto de cando fixo a reconciliación
+CashControl=POS cash fence
+NewCashFence=New cash fence
+BankColorizeMovement=Colorize movements
+BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
+BankColorizeMovementName1=Background color for debit movement
+BankColorizeMovementName2=Background color for credit movement
diff --git a/htdocs/langs/gl_ES/bills.lang b/htdocs/langs/gl_ES/bills.lang
new file mode 100644
index 00000000000..26d835196c8
--- /dev/null
+++ b/htdocs/langs/gl_ES/bills.lang
@@ -0,0 +1,574 @@
+# Dolibarr language file - Source file is en_US - bills
+Bill=Invoice
+Bills=Facturas e abonos
+BillsCustomers=Facturas a clientes
+BillsCustomer=Customer invoice
+BillsSuppliers=Facturas provedor
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid vendor invoices
+BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsLate=Late payments
+BillsStatistics=Customers invoices statistics
+BillsStatisticsSuppliers=Vendors invoices statistics
+DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
+DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
+DisabledBecauseNotErasable=Disabled because cannot be erased
+InvoiceStandard=Standard invoice
+InvoiceStandardAsk=Standard invoice
+InvoiceStandardDesc=This kind of invoice is the common invoice.
+InvoiceDeposit=Down payment invoice
+InvoiceDepositAsk=Down payment invoice
+InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
+InvoiceProForma=Proforma invoice
+InvoiceProFormaAsk=Proforma invoice
+InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
+InvoiceReplacement=Replacement invoice
+InvoiceReplacementAsk=Replacement invoice for invoice
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceAvoir=Credit note
+InvoiceAvoirAsk=Credit note to correct invoice
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
+invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+ReplaceInvoice=Replace invoice %s
+ReplacementInvoice=Replacement invoice
+ReplacedByInvoice=Replaced by invoice %s
+ReplacementByInvoice=Replaced by invoice
+CorrectInvoice=Correct invoice %s
+CorrectionInvoice=Correction invoice
+UsedByInvoice=Used to pay invoice %s
+ConsumedBy=Consumed by
+NotConsumed=Not consumed
+NoReplacableInvoice=No replaceable invoices
+NoInvoiceToCorrect=No invoice to correct
+InvoiceHasAvoir=Was source of one or several credit notes
+CardBill=Invoice card
+PredefinedInvoices=Predefined Invoices
+Invoice=Invoice
+PdfInvoiceTitle=Invoice
+Invoices=Facturas e abonos
+InvoiceLine=Invoice line
+InvoiceCustomer=Customer invoice
+CustomerInvoice=Customer invoice
+CustomersInvoices=Facturas a clientes
+SupplierInvoice=Vendor invoice
+SuppliersInvoices=Vendors invoices
+SupplierBill=Vendor invoice
+SupplierBills=suppliers invoices
+Payment=Payment
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
+Payments=Payments
+PaymentsBack=Refunds
+paymentInInvoiceCurrency=in invoices currency
+PaidBack=Paid back
+DeletePayment=Delete payment
+ConfirmDeletePayment=Are you sure you want to delete this payment?
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+SupplierPayments=Vendor payments
+ReceivedPayments=Received payments
+ReceivedCustomersPayments=Payments received from customers
+PayedSuppliersPayments=Payments paid to vendors
+ReceivedCustomersPaymentsToValid=Received customers payments to validate
+PaymentsReportsForYear=Payments reports for %s
+PaymentsReports=Payments reports
+PaymentsAlreadyDone=Payments already done
+PaymentsBackAlreadyDone=Refunds already done
+PaymentRule=Payment rule
+PaymentMode=Payment Type
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
+IdPaymentMode=Payment Type (id)
+CodePaymentMode=Payment Type (code)
+LabelPaymentMode=Payment Type (label)
+PaymentModeShort=Payment Type
+PaymentTerm=Payment Term
+PaymentConditions=Payment Terms
+PaymentConditionsShort=Payment Terms
+PaymentAmount=Importe pago
+PaymentHigherThanReminderToPay=Payment higher than reminder to pay
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
+ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
+ClassifyPaidPartially=Classify 'Paid partially'
+ClassifyCanceled=Classify 'Abandoned'
+ClassifyClosed=Classify 'Closed'
+ClassifyUnBilled=Classify 'Unbilled'
+CreateBill=Create Invoice
+CreateCreditNote=Create credit note
+AddBill=Create invoice or credit note
+AddToDraftInvoices=Add to draft invoice
+DeleteBill=Delete invoice
+SearchACustomerInvoice=Search for a customer invoice
+SearchASupplierInvoice=Search for a vendor invoice
+CancelBill=Cancel an invoice
+SendRemindByMail=Send reminder by email
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
+ConvertToReduc=Mark as credit available
+ConvertExcessReceivedToReduc=Convert excess received into available credit
+ConvertExcessPaidToReduc=Convert excess paid into available discount
+EnterPaymentReceivedFromCustomer=Enter payment received from customer
+EnterPaymentDueToCustomer=Make payment due to customer
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+PriceBase=Price base
+BillStatus=Invoice status
+StatusOfGeneratedInvoices=Status of generated invoices
+BillStatusDraft=Borrador (é preciso validar)
+BillStatusPaid=Pago
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
+BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusCanceled=Abandoned
+BillStatusValidated=Validated (needs to be paid)
+BillStatusStarted=Started
+BillStatusNotPaid=Not paid
+BillStatusNotRefunded=Not refunded
+BillStatusClosedUnpaid=Closed (unpaid)
+BillStatusClosedPaidPartially=Paid (partially)
+BillShortStatusDraft=Borrador
+BillShortStatusPaid=Pago
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
+BillShortStatusConverted=Pago
+BillShortStatusCanceled=Abandoned
+BillShortStatusValidated=Validado
+BillShortStatusStarted=Started
+BillShortStatusNotPaid=Not paid
+BillShortStatusNotRefunded=Not refunded
+BillShortStatusClosedUnpaid=Pechada
+BillShortStatusClosedPaidPartially=Paid (partially)
+PaymentStatusToValidShort=A validar
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
+ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
+ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
+ErrorBillNotFound=Invoice %s does not exist
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorDiscountAlreadyUsed=Error, discount already used
+ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
+ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
+ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
+BillFrom=De
+BillTo=A
+ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=Template / Recurring invoice
+NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
+FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
+NotARecurringInvoiceTemplate=Not a recurring template invoice
+NewBill=New invoice
+LastBills=Latest %s invoices
+LatestTemplateInvoices=Latest %s template invoices
+LatestCustomerTemplateInvoices=Latest %s customer template invoices
+LatestSupplierTemplateInvoices=Latest %s vendor template invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s vendor invoices
+AllBills=All invoices
+AllCustomerTemplateInvoices=All template invoices
+OtherBills=Other invoices
+DraftBills=Draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Vendor draft invoices
+Unpaid=Unpaid
+ErrorNoPaymentDefined=Error No payment defined
+ConfirmDeleteBill=Are you sure you want to delete this invoice?
+ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
+ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
+ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
+ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
+ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
+ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
+ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
+ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyAbandonReasonOther=Outro
+ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
+ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
+ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
+ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
+ValidateBill=Validate invoice
+UnvalidateBill=Unvalidate invoice
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
+AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
+AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
+UseSituationInvoices=Allow situation invoice
+UseSituationInvoicesCreditNote=Allow situation invoice credit note
+Retainedwarranty=Retained warranty
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
+RetainedwarrantyDefaultPercent=Retained warranty default percent
+RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
+RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
+ToPayOn=To pay on %s
+toPayOn=to pay on %s
+RetainedWarranty=Retained Warranty
+PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
+DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
+setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
+setretainedwarranty=Set retained warranty
+setretainedwarrantyDateLimit=Set retained warranty date limit
+RetainedWarrantyDateLimit=Retained warranty date limit
+RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
+AlreadyPaid=Already paid
+AlreadyPaidBack=Already paid back
+AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
+Abandoned=Abandoned
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to refund
+Rest=Pendente
+AmountExpected=Amount claimed
+ExcessReceived=Excess received
+ExcessPaid=Excess paid
+EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Desconto
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
+StandingOrders=Direct debit orders
+StandingOrder=Domiciliación
+NoDraftBills=No draft invoices
+NoOtherDraftBills=No other draft invoices
+NoDraftInvoices=No draft invoices
+RefBill=Invoice ref
+ToBill=To bill
+RemainderToBill=Remainder to bill
+SendBillByMail=Send invoice by email
+SendReminderBillByMail=Send reminder by email
+RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
+MenuToValid=To valid
+DateMaxPayment=Payment due on
+DateInvoice=Invoice date
+DatePointOfTax=Point of tax
+NoInvoice=No invoice
+ClassifyBill=Classify invoice
+SupplierBillsToPay=Unpaid vendor invoices
+CustomerBillsUnpaid=Unpaid customer invoices
+NonPercuRecuperable=Non-recoverable
+SetConditions=Set Payment Terms
+SetMode=Set Payment Type
+SetRevenuStamp=Set revenue stamp
+Billed=Facturado
+RecurringInvoices=Recurring invoices
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
+CustomersInvoicesAndPayments=Customer invoices and payments
+ExportDataset_invoice_1=Customer invoices and invoice details
+ExportDataset_invoice_2=Customer invoices and payments
+ProformaBill=Proforma Bill:
+Reduction=Reduction
+ReductionShort=Disc.
+Reductions=Reductions
+ReductionsShort=Disc.
+Discounts=Discounts
+AddDiscount=Create discount
+AddRelativeDiscount=Create relative discount
+EditRelativeDiscount=Edit relative discount
+AddGlobalDiscount=Create absolute discount
+EditGlobalDiscounts=Edit absolute discounts
+AddCreditNote=Create credit note
+ShowDiscount=Show discount
+ShowReduc=Show the discount
+ShowSourceInvoice=Show the source invoice
+RelativeDiscount=Desconto relativo
+GlobalDiscount=Global discount
+CreditNote=Credit note
+CreditNotes=Credit notes
+CreditNotesOrExcessReceived=Credit notes or excess received
+Deposit=Down payment
+Deposits=Down payments
+DiscountFromCreditNote=Discount from credit note %s
+DiscountFromDeposit=Down payments from invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
+AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
+CreditNoteDepositUse=Invoice must be validated to use this kind of credits
+NewGlobalDiscount=New absolute discount
+NewRelativeDiscount=New relative discount
+DiscountType=Discount type
+NoteReason=Note/Reason
+ReasonDiscount=Razón
+DiscountOfferedBy=Granted by
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Vendors discounts
+BillAddress=Bill address
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
+IdSocialContribution=Social/fiscal tax payment id
+PaymentId=Payment id
+PaymentRef=Payment ref.
+InvoiceId=Invoice id
+InvoiceRef=Invoice ref.
+InvoiceDateCreation=Invoice creation date
+InvoiceStatus=Invoice status
+InvoiceNote=Invoice note
+InvoicePaid=Invoice paid
+InvoicePaidCompletely=Paid completely
+InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
+OrderBilled=Order billed
+DonationPaid=Donation paid
+PaymentNumber=Payment number
+RemoveDiscount=Remove discount
+WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty)
+InvoiceNotChecked=No invoice selected
+ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
+DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
+NbOfPayments=No. of payments
+SplitDiscount=Split discount in two
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
+ConfirmRemoveDiscount=Are you sure you want to remove this discount?
+RelatedBill=Related invoice
+RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related vendor invoices
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoices already exist
+MergingPDFTool=Merging PDF tool
+AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
+PaymentNote=Payment note
+ListOfPreviousSituationInvoices=List of previous situation invoices
+ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+FrequencyUnit=Frequency unit
+toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
+NextDateToExecution=Date for next invoice generation
+NextDateToExecutionShort=Date next gen.
+DateLastGeneration=Date of latest generation
+DateLastGenerationShort=Date latest gen.
+MaxPeriodNumber=Max. number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
+InvoiceAutoValidate=Validate invoices automatically
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not reached yet
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
+WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
+WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
+ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
+# PaymentConditions
+Statut=Estado
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShort30D=30 days
+PaymentCondition30D=30 days
+PaymentConditionShort30DENDMONTH=30 days of month-end
+PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort60D=60 days
+PaymentCondition60D=60 days
+PaymentConditionShort60DENDMONTH=60 days of month-end
+PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShortPT_DELIVERY=Delivery
+PaymentConditionPT_DELIVERY=On delivery
+PaymentConditionShortPT_ORDER=Pedido
+PaymentConditionPT_ORDER=On order
+PaymentConditionShortPT_5050=50-50
+PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+PaymentConditionShort10D=10 days
+PaymentCondition10D=10 days
+PaymentConditionShort10DENDMONTH=10 days of month-end
+PaymentCondition10DENDMONTH=Within 10 days following the end of the month
+PaymentConditionShort14D=14 days
+PaymentCondition14D=14 days
+PaymentConditionShort14DENDMONTH=14 days of month-end
+PaymentCondition14DENDMONTH=Within 14 days following the end of the month
+FixAmount=Fixed amount - 1 line with label '%s'
+VarAmount=Variable amount (%% tot.)
+VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
+VarAmountAllLines=Variable amount (%% tot.) - all same lines
+# PaymentType
+PaymentTypeVIR=Transferencia bancaria
+PaymentTypeShortVIR=Transferencia bancaria
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
+PaymentTypeLIQ=Cash
+PaymentTypeShortLIQ=Cash
+PaymentTypeCB=Tarxeta de crédito
+PaymentTypeShortCB=Tarxeta de crédito
+PaymentTypeCHQ=Verificar
+PaymentTypeShortCHQ=Verificar
+PaymentTypeTIP=TIP (Documents against Payment)
+PaymentTypeShortTIP=TIP Payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
+PaymentTypeTRA=Bank draft
+PaymentTypeShortTRA=Borrador
+PaymentTypeFAC=Factor
+PaymentTypeShortFAC=Factor
+BankDetails=Bank details
+BankCode=Bank code
+DeskCode=Branch code
+BankAccountNumber=Account number
+BankAccountNumberKey=Checksum
+Residence=Enderezo
+IBANNumber=IBAN account number
+IBAN=IBAN
+BIC=BIC/SWIFT
+BICNumber=Código BIC/SWIFT
+ExtraInfos=Extra infos
+RegulatedOn=Regulated on
+ChequeNumber=Check N°
+ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
+ChequeMaker=Check/Transfer transmitter
+ChequeBank=Bank of Check
+CheckBank=Verificar
+NetToBePaid=Net to be paid
+PhoneNumber=Tel
+FullPhoneNumber=Telephone
+TeleFax=Fax
+PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration.
+IntracommunityVATNumber=Intra-Community VAT ID
+PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
+PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
+SendTo=sent to
+PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
+VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
+LawApplicationPart1=By application of the law 80.335 of 12/05/80
+LawApplicationPart2=the goods remain the property of
+LawApplicationPart3=the seller until full payment of
+LawApplicationPart4=their price.
+LimitedLiabilityCompanyCapital=SARL with Capital of
+UseLine=Aplicar
+UseDiscount=Use discount
+UseCredit=Use credit
+UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit
+MenuChequeDeposits=Check Deposits
+MenuCheques=Checks
+MenuChequesReceipts=Check receipts
+NewChequeDeposit=New deposit
+ChequesReceipts=Check receipts
+ChequesArea=Check deposits area
+ChequeDeposits=Check deposits
+Cheques=Checks
+DepositId=Id deposit
+NbCheque=Number of checks
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices
+ShowUnpaidAll=Show all unpaid invoices
+ShowUnpaidLateOnly=Show late unpaid invoices only
+PaymentInvoiceRef=Payment invoice %s
+ValidateInvoice=Validate invoice
+ValidateInvoices=Validate invoices
+Cash=Cash
+Reported=Delayed
+DisabledBecausePayments=Not possible since there are some payments
+CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+ExpectedToPay=Expected payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
+PayedByThisPayment=Paid by this payment
+ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
+ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
+ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
+ToMakePayment=Pay
+ToMakePaymentBack=Pay back
+ListOfYourUnpaidInvoices=List of unpaid invoices
+NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
+RevenueStamp=Tax stamp
+YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
+YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
+PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
+TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+EarlyClosingReason=Early closing reason
+EarlyClosingComment=Early closing note
+##### Types de contacts #####
+TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
+TypeContact_facture_external_BILLING=Contacto cliente facturación pedido
+TypeContact_facture_external_SHIPPING=Contacto cliente entrega pedido
+TypeContact_facture_external_SERVICE=Customer service contact
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
+TypeContact_invoice_supplier_external_BILLING=Contacto provedor factura
+TypeContact_invoice_supplier_external_SHIPPING=Contacto seguemento envío a provedor
+TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+# Situation invoices
+InvoiceFirstSituationAsk=First situation invoice
+InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
+InvoiceSituation=Situation invoice
+InvoiceSituationAsk=Invoice following the situation
+InvoiceSituationDesc=Create a new situation following an already existing one
+SituationAmount=Situation invoice amount(net)
+SituationDeduction=Situation subtraction
+ModifyAllLines=Modify all lines
+CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
+NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
+DisabledBecauseNotLastInCycle=The next situation already exists.
+DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=D
+CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
+NoSituations=No open situations
+InvoiceSituationLast=Final and general invoice
+PDFCrevetteSituationNumber=Situation N°%s
+PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
+PDFCrevetteSituationInvoiceTitle=Situation invoice
+PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
+TotalSituationInvoice=Total situation
+invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
+updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
+CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
+BillCreated=%s bill(s) created
+StatusOfGeneratedDocuments=Status of document generation
+DoNotGenerateDoc=Do not generate document file
+AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Factura eliminada
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/gl_ES/blockedlog.lang b/htdocs/langs/gl_ES/blockedlog.lang
new file mode 100644
index 00000000000..5afae6e9e53
--- /dev/null
+++ b/htdocs/langs/gl_ES/blockedlog.lang
@@ -0,0 +1,54 @@
+BlockedLog=Unalterable Logs
+Field=Field
+BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525).
+Fingerprints=Archived events and fingerprints
+FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed).
+CompanyInitialKey=Company initial key (hash of genesis block)
+BrowseBlockedLog=Unalterable logs
+ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
+ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
+DownloadBlockChain=Download fingerprints
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
+OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
+AddedByAuthority=Stored into remote authority
+NotAddedByAuthorityYet=Not yet stored into remote authority
+ShowDetails=Show stored details
+logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
+logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
+logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
+logPAYMENT_ADD_TO_BANK=Payment added to bank
+logPAYMENT_CUSTOMER_CREATE=Customer payment created
+logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
+logDONATION_PAYMENT_CREATE=Donation payment created
+logDONATION_PAYMENT_DELETE=Donation payment logical deletion
+logBILL_PAYED=Customer invoice paid
+logBILL_UNPAYED=Customer invoice set unpaid
+logBILL_VALIDATE=Customer invoice validated
+logBILL_SENTBYMAIL=Customer invoice send by mail
+logBILL_DELETE=Customer invoice logically deleted
+logMODULE_RESET=Module BlockedLog was disabled
+logMODULE_SET=Module BlockedLog was enabled
+logDON_VALIDATE=Donation validated
+logDON_MODIFY=Donation modified
+logDON_DELETE=Donation logical deletion
+logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
+logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
+logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
+logCASHCONTROL_VALIDATE=Cash fence recording
+BlockedLogBillDownload=Customer invoice download
+BlockedLogBillPreview=Customer invoice preview
+BlockedlogInfoDialog=Log Details
+ListOfTrackedEvents=List of tracked events
+Fingerprint=Fingerprint
+DownloadLogCSV=Export archived logs (CSV)
+logDOC_PREVIEW=Preview of a validated document in order to print or download
+logDOC_DOWNLOAD=Download of a validated document in order to print or send
+DataOfArchivedEvent=Full datas of archived event
+ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
+BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
+BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
+OnlyNonValid=Non-valid
+TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
+RestrictYearToExport=Restrict month / year to export
diff --git a/htdocs/langs/gl_ES/bookmarks.lang b/htdocs/langs/gl_ES/bookmarks.lang
new file mode 100644
index 00000000000..93ef36b3e51
--- /dev/null
+++ b/htdocs/langs/gl_ES/bookmarks.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - marque pages
+AddThisPageToBookmarks=Engadir a páxina actual aos marcadores
+Bookmark=Marcador
+Bookmarks=Marcadores
+ListOfBookmarks=Listaxe de marcadores
+EditBookmarks=Listar/editar marcadores
+NewBookmark=Novo marcador
+ShowBookmark=Amosar marcadores
+OpenANewWindow=Abrir nunha nova xanela
+ReplaceWindow=Reemplazar a xanela actual
+BookmarkTargetNewWindowShort=Nova xanela
+BookmarkTargetReplaceWindowShort=Xanela actual
+BookmarkTitle=Nome do marcador
+UrlOrLink=URL
+BehaviourOnClick=Comportamento cando un marcador URL é seleccionado
+CreateBookmark=Crear marcador
+SetHereATitleForLink=Indicar un nome para o marcador
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Usar unha externa/absoluta URL (https://URL) ou unha interna/relativa URL de Dolibarr (/DOLIBARR_ROOT/htdocs/...)
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Escolla se debe abrir a páxina nesta xanela ou nunha nova xanela
+BookmarksManagement=Xestión de marcadores
+BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/gl_ES/boxes.lang b/htdocs/langs/gl_ES/boxes.lang
new file mode 100644
index 00000000000..b2acfbb98a0
--- /dev/null
+++ b/htdocs/langs/gl_ES/boxes.lang
@@ -0,0 +1,102 @@
+# Dolibarr language file - Source file is en_US - boxes
+BoxLoginInformation=Información login
+BoxLastRssInfos=Fíos de información RSS
+BoxLastProducts=Últimos %s produtos/servizos
+BoxProductsAlertStock=Alertas de stock para produtos
+BoxLastProductsInContract=Últimos %s produtos/servizos contratados
+BoxLastSupplierBills=Últimas facturas de provedores
+BoxLastCustomerBills=Últimas facturas a clientes
+BoxOldestUnpaidCustomerBills=Facturas a clientes mais antigas pendentes de cobro
+BoxOldestUnpaidSupplierBills=Facturas de provedores mais antigas pendentes de pago
+BoxLastProposals=Últimos orzamentos
+BoxLastProspects=Últimos clientes potenciaiss modificados
+BoxLastCustomers=Últimos clientes modificados
+BoxLastSuppliers=Últimos provedores modificados
+BoxLastCustomerOrders=Últimas facturas a clientes
+BoxLastActions=Últimas accións
+BoxLastContracts=Últimos contratos
+BoxLastContacts=Últimos contactos/enderezos
+BoxLastMembers=Últimos membros
+BoxFicheInter=Últimas intervencións
+BoxCurrentAccounts=Balance de contas abertas
+BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleLastRssInfos=Últimas %s novas de %s
+BoxTitleLastProducts=Produtos/Servizos: Últimos %s modificados
+BoxTitleProductsAlertStock=Produtos: alerta de stock
+BoxTitleLastSuppliers=Últimos %s provedores rexistrados
+BoxTitleLastModifiedSuppliers=Provedores: últimos %s modificados
+BoxTitleLastModifiedCustomers=Clientes: últimos %s modificados
+BoxTitleLastCustomersOrProspects=Últimos %s clientes ou clientes potenciais
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
+BoxTitleLastModifiedProspects=Orzamentos: Últimos %s modificados
+BoxTitleLastModifiedMembers=Últimos %s membros
+BoxTitleLastFicheInter=Últimas %s intervencións modificadas
+BoxTitleOldestUnpaidCustomerBills=Facturas Clientes: mais antigas %s pendentes de cobro
+BoxTitleOldestUnpaidSupplierBills=Facturas Provedores: mais antigas %s pendentes de pago
+BoxTitleCurrentAccounts=Contas abertas: balance
+BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
+BoxTitleLastModifiedContacts=Contactos/Enderezos: Últimos %s modificados
+BoxMyLastBookmarks=Bookmarks: latest %s
+BoxOldestExpiredServices=Servizos antigos expirados
+BoxLastExpiredServices=Últimos %s contratos mais antigos con servizos expirados
+BoxTitleLastActionsToDo=Últimas %s accións a realizar
+BoxTitleLastContracts=Últimos %s contratos modificados
+BoxTitleLastModifiedDonations=Últimas %s donacións modificadas
+BoxTitleLastModifiedExpenses=Últimos %s informes de gastos modificados
+BoxTitleLatestModifiedBoms=Latest %s modified BOMs
+BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxGlobalActivity=Actividade global (facturas, orzamentos, ordes)
+BoxGoodCustomers=Bos clientes
+BoxTitleGoodCustomers=%s Bos clientes
+FailedToRefreshDataInfoNotUpToDate=Erro ao actualizar o RSS. Último refresco correcto na data: %s
+LastRefreshDate=Última data de refresco
+NoRecordedBookmarks=Non hai marcadores definidos
+ClickToAdd=Faga clic aquí para engadir.
+NoRecordedCustomers=Ningún cliente rexistrado
+NoRecordedContacts=Ningún contacto regxistrado
+NoActionsToDo=Sen eventos a realizar
+NoRecordedOrders=Sen pedidos de clientes rexistrados
+NoRecordedProposals=Sen orzamentos rexistrados
+NoRecordedInvoices=Sen facturas a clientes rexistradas
+NoUnpaidCustomerBills=Non hai facturas a clientes pendentes de cobro
+NoUnpaidSupplierBills=Non hai facturas de provedores pendentes de pago
+NoModifiedSupplierBills=Sen facturas de provedor rexistradas
+NoRecordedProducts=Sen produtos/servizos rexistrados
+NoRecordedProspects=Sen clientes potenciais rexistrados
+NoContractedProducts=Sen produtos/servizos contratados
+NoRecordedContracts=Sen contratos rexistrados
+NoRecordedInterventions=Sen intervencións gardadas
+BoxLatestSupplierOrders=Últimos pedidos a provedores
+BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
+NoSupplierOrder=Sen pedidos a provedores
+BoxCustomersInvoicesPerMonth=Facturas a clientes por mes
+BoxSuppliersInvoicesPerMonth=Facturas de provedores por mes
+BoxCustomersOrdersPerMonth=Pedidos de clientes por mes
+BoxSuppliersOrdersPerMonth=Pedidos a provedores por mes
+BoxProposalsPerMonth=Orzamentos por mes
+NoTooLowStockProducts=Sen produtos por debaixo do stock mínimo
+BoxProductDistribution=Distribución de produtos/servizos
+ForObject=On %s
+BoxTitleLastModifiedSupplierBills=Facturas Provedor: útimas %s modificadas
+BoxTitleLatestModifiedSupplierOrders=Pedidos Provedor: últimos %s modificados
+BoxTitleLastModifiedCustomerBills=Facturas Clientes: últimas %s modificadas
+BoxTitleLastModifiedCustomerOrders=Pedidos Clientes: últimos %s pedidos modificados
+BoxTitleLastModifiedPropals=Últimos %s orzamentos modificados
+ForCustomersInvoices=Facturas a clientes
+ForCustomersOrders=Pedidos de clientes
+ForProposals=Orzamentos
+LastXMonthRolling=Os últimos %s meses consecutivos
+ChooseBoxToAdd=Engadir panel ao seu taboleiro
+BoxAdded=O panel foi agregado ao seu taboleiro
+BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
+BoxLastManualEntries=Last manual entries in accountancy
+BoxTitleLastManualEntries=%s latest manual entries
+NoRecordedManualEntries=No manual entries record in accountancy
+BoxSuspenseAccount=Count accountancy operation with suspense account
+BoxTitleSuspenseAccount=Number of unallocated lines
+NumberOfLinesInSuspenseAccount=Number of line in suspense account
+SuspenseAccountNotDefined=Suspense account isn't defined
+BoxLastCustomerShipments=Last customer shipments
+BoxTitleLastCustomerShipments=Latest %s customer shipments
+NoRecordedShipments=No recorded customer shipment
diff --git a/htdocs/langs/gl_ES/cashdesk.lang b/htdocs/langs/gl_ES/cashdesk.lang
new file mode 100644
index 00000000000..3c4236bf89f
--- /dev/null
+++ b/htdocs/langs/gl_ES/cashdesk.lang
@@ -0,0 +1,110 @@
+# Language file - Source file is en_US - cashdesk
+CashDeskMenu=Point of sale
+CashDesk=Point of sale
+CashDeskBankCash=Bank account (cash)
+CashDeskBankCB=Bank account (card)
+CashDeskBankCheque=Bank account (cheque)
+CashDeskWarehouse=Warehouse
+CashdeskShowServices=Selling services
+CashDeskProducts=Produtos
+CashDeskStock=Stock
+CashDeskOn=on
+CashDeskThirdParty=Third party
+ShoppingCart=Shopping cart
+NewSell=New sell
+AddThisArticle=Add this article
+RestartSelling=Go back on sell
+SellFinished=Sale complete
+PrintTicket=Print ticket
+SendTicket=Send ticket
+NoProductFound=No article found
+ProductFound=product found
+NoArticle=No article
+Identification=Identification
+Article=Article
+Difference=Difference
+TotalTicket=Total ticket
+NoVAT=No VAT for this sale
+Change=Excess received
+BankToPay=Account for payment
+ShowCompany=Show company
+ShowStock=Show warehouse
+DeleteArticle=Click to remove this article
+FilterRefOrLabelOrBC=Search (Ref/Label)
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
+DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of Sale
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
+Receipt=Receipt
+Header=Header
+Footer=Footer
+AmountAtEndOfPeriod=Amount at end of period (day, month or year)
+TheoricalAmount=Theorical amount
+RealAmount=Real amount
+CashFence=Cash fence
+CashFenceDone=Cash fence done for the period
+NbOfInvoices=Nb of invoices
+Paymentnumpad=Type of Pad to enter payment
+Numberspad=Numbers Pad
+BillsCoinsPad=Coins and banknotes Pad
+DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
+TakeposNeedsCategories=TakePOS needs product categories to work
+OrderNotes=Order Notes
+CashDeskBankAccountFor=Default account to use for payments in
+NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
+PrintCustomerOnReceipts=Print customer on tickets|receipts
+EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
+ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
+POSTerminal=POS Terminal
+POSModule=POS Module
+BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
+CustomReceipt=Custom Receipt
+ReceiptName=Receipt Name
+ProductSupplements=Product Supplements
+SupplementCategory=Supplement category
+ColorTheme=Color theme
+Colorful=Colorful
+HeadBar=Head Bar
+SortProductField=Field for sorting products
+Browser=Navegador
+BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
+TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
+PrintMethod=Print method
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ByTerminal=By terminal
+TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for POS sales
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
+BarRestaurant=Bar Restaurant
+AutoOrder=Customer auto order
diff --git a/htdocs/langs/gl_ES/categories.lang b/htdocs/langs/gl_ES/categories.lang
new file mode 100644
index 00000000000..679bd032588
--- /dev/null
+++ b/htdocs/langs/gl_ES/categories.lang
@@ -0,0 +1,89 @@
+# Dolibarr language file - Source file is en_US - categories
+Rubrique=Tag/Category
+Rubriques=Etiquetas/Categorías
+RubriquesTransactions=Tags/Categories of transactions
+categories=tags/categories
+NoCategoryYet=No tag/category of this type created
+In=In
+AddIn=Add in
+modify=modify
+Classify=Classify
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Vendors tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
+UsersCategoriesArea=Users tags/categories area
+SubCats=Sub-categories
+CatList=List of tags/categories
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
+NoSubCat=No subcategory.
+SubCatOf=Subcategory
+FoundCats=Found tags/categories
+ImpossibleAddCat=Impossible to add the tag/category %s
+WasAddedSuccessfully=<b>%s</b> was added successfully.
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+ProductIsInCategories=Product/service is linked to following tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
+ClassifyInCategory=Add to tag/category
+NotCategorized=Without tag/category
+CategoryExistsAtSameLevel=This category already exists with this ref
+ContentsVisibleByAllShort=Contents visible by all
+ContentsNotVisibleByAllShort=Contents not visible by all
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Vendors tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
+SuppliersCategoriesShort=Vendors tags/categories
+CustomersCategoriesShort=Customers tags/categories
+ProspectsCategoriesShort=Prospects tags/categories
+CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
+AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
+UsersCategoriesShort=Users tags/categories
+StockCategoriesShort=Warehouse tags/categories
+ThisCategoryHasNoItems=This category does not contain any items.
+CategId=Tag/category id
+CatSupList=List of vendor tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatContactsLinks=Links between contacts/addresses and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
+DeleteFromCat=Remove from tags/category
+ExtraFieldsCategories=Complementary attributes
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
+CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
+AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show tag/category
+ByDefaultInList=By default in list
+ChooseCategory=Choose category
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/gl_ES/commercial.lang b/htdocs/langs/gl_ES/commercial.lang
new file mode 100644
index 00000000000..6c69d81c243
--- /dev/null
+++ b/htdocs/langs/gl_ES/commercial.lang
@@ -0,0 +1,80 @@
+# Dolibarr language file - Source file is en_US - commercial
+Commercial=Commerce
+CommercialArea=Commerce area
+Customer=Cliente
+Customers=Clientes
+Prospect=Cliente potencial
+Prospects=Clientes potenciais
+DeleteAction=Delete an event
+NewAction=New event
+AddAction=Crear evento
+AddAnAction=Create an event
+AddActionRendezVous=Create a Rendez-vous event
+ConfirmDeleteAction=Are you sure you want to delete this event?
+CardAction=Event card
+ActionOnCompany=Related company
+ActionOnContact=Related contact
+TaskRDVWith=Meeting with %s
+ShowTask=Ver tarefa
+ShowAction=Show event
+ActionsReport=Events report
+ThirdPartiesOfSaleRepresentative=Third parties with sales representative
+SaleRepresentativesOfThirdParty=Sales representatives of third party
+SalesRepresentative=Sales representative
+SalesRepresentatives=Sales representatives
+SalesRepresentativeFollowUp=Sales representative (follow-up)
+SalesRepresentativeSignature=Sales representative (signature)
+NoSalesRepresentativeAffected=No particular sales representative assigned
+ShowCustomer=Show customer
+ShowProspect=Show prospect
+ListOfProspects=List of prospects
+ListOfCustomers=List of customers
+LastDoneTasks=Latest %s completed actions
+LastActionsToDo=Oldest %s not completed actions
+DoneAndToDoActions=Completed and To do events
+DoneActions=Completed events
+ToDoActions=Incomplete events
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
+StatusNotApplicable=Non aplicable
+StatusActionToDo=A realizar
+StatusActionDone=Complete
+StatusActionInProcess=Expedición en curso
+TasksHistoryForThisContact=Events for this contact
+LastProspectDoNotContact=Non contactar
+LastProspectNeverContacted=Nunca contactado
+LastProspectToContact=To contact
+LastProspectContactInProcess=Contacto en curso
+LastProspectContactDone=Contacto realizado
+ActionAffectedTo=Evento asignado a
+ActionDoneBy=Event done by
+ActionAC_TEL=Phone call
+ActionAC_FAX=Send fax
+ActionAC_PROP=Send proposal by mail
+ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
+ActionAC_RDV=Meetings
+ActionAC_INT=Intervention on site
+ActionAC_FAC=Send customer invoice by mail
+ActionAC_REL=Send customer invoice by mail (reminder)
+ActionAC_CLO=Pechar
+ActionAC_EMAILING=Send mass email
+ActionAC_COM=Send sales order by mail
+ActionAC_SHIP=Send shipping by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
+ActionAC_OTH=Outro
+ActionAC_OTH_AUTO=Automatically inserted events
+ActionAC_MANUAL=Manually inserted events
+ActionAC_AUTO=Automatically inserted events
+ActionAC_OTH_AUTOShort=Auto
+Stats=Sales statistics
+StatusProsp=Estado do cliente potencial
+DraftPropals=Draft commercial proposals
+NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commercial proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/gl_ES/companies.lang b/htdocs/langs/gl_ES/companies.lang
new file mode 100644
index 00000000000..c61f543ab32
--- /dev/null
+++ b/htdocs/langs/gl_ES/companies.lang
@@ -0,0 +1,458 @@
+# Dolibarr language file - Source file is en_US - companies
+ErrorCompanyNameAlreadyExists=O nome da empresa %s xa existe. Escolla outro.
+ErrorSetACountryFirst=Defina en primeiro lugar o país
+SelectThirdParty=Seleccionar un terceiro
+ConfirmDeleteCompany=¿Está certo de querer eliminar esta empresa e toda a súa información inmanente?
+DeleteContact=Eliminar un contacto/enderezo
+ConfirmDeleteContact=¿Está certo de querer eliminar este contacto e toda a información inmanente?
+MenuNewThirdParty=Novo terceiro
+MenuNewCustomer=Novo cliente
+MenuNewProspect=Novo cliente potencial
+MenuNewSupplier=Novo provedor
+MenuNewPrivateIndividual=Novo particular
+NewCompany=Nova empresa (cliente potencial, cliente, provedor)
+NewThirdParty=Novo terceiro (cliente potencial, cliente, provedor)
+CreateDolibarrThirdPartySupplier=Crear un terceiro (provedor)
+CreateThirdPartyOnly=Crear un terceiro
+CreateThirdPartyAndContact=Crear un terceiro + un contacto asociado
+ProspectionArea=Área de prospección
+IdThirdParty=ID terceiro
+IdCompany=Id empresa
+IdContact=Id contacto
+Contacts=Contactos/Enderezos
+ThirdPartyContacts=Contactos terceiros
+ThirdPartyContact=Contacto terceiro/enderezo
+Company=Empresa
+CompanyName=Razón social
+AliasNames=Apodo (comercial, marca rexistrada, ...)
+AliasNameShort=Apodo
+Companies=Empresas
+CountryIsInEEC=País dentro da Comunidade Económica Europea
+PriceFormatInCurrentLanguage=Formato de prezo no idioma actual
+ThirdPartyName=Nome do terceiro
+ThirdPartyEmail=E-mail do terceiro
+ThirdParty=Terceiro
+ThirdParties=Terceiros
+ThirdPartyProspects=Clientes potenciais
+ThirdPartyProspectsStats=Clientes potenciais
+ThirdPartyCustomers=Clientes
+ThirdPartyCustomersStats=Clientes
+ThirdPartyCustomersWithIdProf12=Clientes con %s ó %s
+ThirdPartySuppliers=Provedores
+ThirdPartyType=Tipo de terceiro
+Individual=Particular
+ToCreateContactWithSameName=Creará automáticamente un contacto/enderezo coa mesma información que o terceiro noutro terceiro. Na maioría dos casos, aínda que o terceiro sexa una persona física, creando un terciro só é suficiente.
+ParentCompany=Sede empresa
+Subsidiaries=Filiais
+ReportByMonth=Informe por mes
+ReportByCustomers=Informe por cliente
+ReportByQuarter=Informe por taxa
+CivilityCode=Código cortesía
+RegisteredOffice=Domicilio social
+Lastname=Apelidos
+Firstname=Nome
+PostOrFunction=Posto de traballo
+UserTitle=Título
+NatureOfThirdParty=Natureza do terceiro
+NatureOfContact=Natureza do contacto
+Address=Enderezo
+State=Provincia/Estado
+StateCode=State/Province code
+StateShort=Provincia/Estado
+Region=Rexión
+Region-State=Rexión - Estado
+Country=País
+CountryCode=Código país
+CountryId=Id país
+Phone=Teléfono
+PhoneShort=Teléfono
+Skype=Skype
+Call=Chamar
+Chat=Chat
+PhonePro=Teléf. traballo
+PhonePerso=Teléf. particular
+PhoneMobile=Móbil
+No_Email=Rexeitar e-mails masivos
+Fax=Fax
+Zip=Código postal
+Town=Poboación
+Web=Web
+Poste= Posto
+DefaultLang=Idioma por defecto
+VATIsUsed=Suxeito a IVE
+VATIsUsedWhenSelling=Esto define se este terceiro inclúe un imposto á venda ou non cando emite unha factura aos seus propios clientes
+VATIsNotUsed=Non suxeito a IVE
+CopyAddressFromSoc=Copiar enderezo do detalle do terceiro
+ThirdpartyNotCustomerNotSupplierSoNoRef=Terceiro que non é cliente nin provedor, sen obxectos referenciados
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Terceiro que non é cliente nin provedor, descontos non dispoñibles
+PaymentBankAccount=Conta bancaria de pago
+OverAllProposals=Orzamentos
+OverAllOrders=Pedimentos
+OverAllInvoices=Facturas e abonos
+OverAllSupplierProposals=Prezo orzamentos
+##### Local Taxes #####
+LocalTax1IsUsed=Usar segunda taxa
+LocalTax1IsUsedES= Suxeito a RE
+LocalTax1IsNotUsedES= Non suxeito a RE
+LocalTax2IsUsed=Usar taxa terceiros
+LocalTax2IsUsedES= Suxeito a IRPF
+LocalTax2IsNotUsedES= Non suxeito a IRPF
+WrongCustomerCode=Código cliente incorrecto
+WrongSupplierCode=Código provedor incorrecto
+CustomerCodeModel=Modelo de código cliente
+SupplierCodeModel=Modelo de código provedor
+Gencod=Código de barras
+##### Professional ID #####
+ProfId1Short=Id Prof 1
+ProfId2Short=Id Prof 2
+ProfId3Short=Id Prof 3
+ProfId4Short=Id Prof 4
+ProfId5Short=Id Prof 5
+ProfId6Short=Id Prof 6
+ProfId1=ID profesional 1
+ProfId2=ID profesional 2
+ProfId3=ID profesional 3
+ProfId4=ID profesional 4
+ProfId5=ID profesional 5
+ProfId6=ID profesional 6
+ProfId1AR=Id Prof 1 (CUIT/CUIL)CUIT/CUIL
+ProfId2AR=Id Prof (Ingresos brutos)
+ProfId3AR=-
+ProfId4AR=-
+ProfId5AR=-
+ProfId6AR=-
+ProfId1AT=Id Prof 1 (USt.-IdNr)
+ProfId2AT=Id Prof 2 (USt.-Nr)
+ProfId3AT=Id Prof 3 (Handelsregister-Nr.)
+ProfId4AT=-
+ProfId5AT=-
+ProfId6AT=-
+ProfId1AU=Id Prof 1 (ABN)
+ProfId2AU=-
+ProfId3AU=-
+ProfId4AU=-
+ProfId5AU=-
+ProfId6AU=-
+ProfId1BE=Id Prof 1 (Número de colexiado)
+ProfId2BE=-
+ProfId3BE=-
+ProfId4BE=-
+ProfId5BE=-
+ProfId6BE=-
+ProfId1BR=-
+ProfId2BR=IE (Inscrición Estadual)
+ProfId3BR=IM (Inscrición Municipal)
+ProfId4BR=CPF
+#ProfId5BR=CNAE
+#ProfId6BR=INSS
+ProfId1CH=-
+ProfId2CH=-
+ProfId3CH=Id Prof 1 (Número federal)
+ProfId4CH=Id Prof 2 (Número de rexistro comercial)
+ProfId5CH=-
+ProfId6CH=-
+ProfId1CL=Id Prof 1 (R.U.T.)
+ProfId2CL=-
+ProfId3CL=-
+ProfId4CL=-
+ProfId5CL=-
+ProfId6CL=-
+ProfId1CO=Id Prof 1 (R.U.T.)
+ProfId2CO=-
+ProfId3CO=-
+ProfId4CO=-
+ProfId5CO=-
+ProfId6CO=-
+ProfId1DE=Id prof. 1 (USt.-IdNr)
+ProfId2DE=Id prof. 2 (USt.-Nr)
+ProfId3DE=Id prof. 3 (Handelsregister-Nr.)
+ProfId4DE=-
+ProfId5DE=-
+ProfId6DE=-
+ProfId1ES=Id Prof 1 (CIF/NIF)
+ProfId2ES=Id Prof 2 (Núm. seguridade social)
+ProfId3ES=Id Prof 3 (CNAE)
+ProfId4ES=Id Prof 4 (Número colexiado)
+ProfId5ES=-
+ProfId6ES=-
+ProfId1FR=Id Prof 1 (SIREN)
+ProfId2FR=Id Prof 2 (SIRET)
+ProfId3FR=Id Prof 3 (NAF, antigo APE)
+ProfId4FR=Id Prof 4 (RCS/RM)
+ProfId5FR=-
+ProfId6FR=-
+ProfId1GB=Número rexistro
+ProfId2GB=-
+ProfId3GB=SIC
+ProfId4GB=-
+ProfId5GB=-
+ProfId6GB=-
+ProfId1HN=Id prof. 1 (RTN)
+ProfId2HN=-
+ProfId3HN=-
+ProfId4HN=-
+ProfId5HN=-
+ProfId6HN=-
+ProfId1IN=Id prof. 1 (TIN)
+ProfId2IN=Id prof. 2 (PAN)
+ProfId3IN=Id prof. 3 (SRVC TAX)
+ProfId4IN=Id prof. 4
+ProfId5IN=Id prof. 5
+ProfId6IN=-
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
+ProfId2LU=Id. prof. 2 (Negocios permitidos)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
+ProfId1MA=Id prof. 1 (R.C.)
+ProfId2MA=Id prof. 2 (Patente)
+ProfId3MA=Id prof. 3 (I.F.)
+ProfId4MA=Id prof. 4 (C.N.S.S.)
+ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId6MA=-
+ProfId1MX=Id prof. 1 (R.F.C.)
+ProfId2MX=Id prof. 2 (Rexistro Patroal IMSS)
+ProfId3MX=Id prof. 2 (Cédula Profesional)
+ProfId4MX=-
+ProfId5MX=-
+ProfId6MX=-
+ProfId1NL=Número KVK
+ProfId2NL=-
+ProfId3NL=-
+ProfId4NL=-
+ProfId5NL=-
+ProfId6NL=-
+ProfId1PT=Id prof. 1 (NIPC)
+ProfId2PT=Id prof. 2 (Número seguridade social)
+ProfId3PT=Id prof. 3 (Número rexistro comercial)
+ProfId4PT=Id prof. 4 (Conservatorio)
+ProfId5PT=-
+ProfId6PT=-
+ProfId1SN=RC
+ProfId2SN=NINEA
+ProfId3SN=-
+ProfId4SN=-
+ProfId5SN=-
+ProfId6SN=-
+ProfId1TN=Id prof. 1 (RC)
+ProfId2TN=Id prof. 2 (Matrícula fiscal)
+ProfId3TN=Id prof. 3 (Código de aduana)
+ProfId4TN=Id prof. 4 (BAN)
+ProfId5TN=-
+ProfId6TN=-
+ProfId1US=Id prof. (FEIN)
+ProfId2US=-
+ProfId3US=-
+ProfId4US=-
+ProfId5US=-
+ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
+ProfId1RU=Id prof. 1 (OGRN)
+ProfId2RU=Id prof. 2 (INN)
+ProfId3RU=Id prof. 3 (KPP)
+ProfId4RU=Id prof. 4 (OKPO)
+ProfId5RU=-
+ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
+VATIntra=CIF/NIF intracomunitario
+VATIntraShort=CIF intra.
+VATIntraSyntaxIsValid=Sintaxe é válida
+VATReturn=Devolución IVE
+ProspectCustomer=Cliente potencial/Cliente
+Prospect=Cliente potencial
+CustomerCard=Ficha cliente
+Customer=Cliente
+CustomerRelativeDiscount=Desconto relativo a cliente
+SupplierRelativeDiscount=Desconto relativo a provedor
+CustomerRelativeDiscountShort=Desconto relativo
+CustomerAbsoluteDiscountShort=Desconto fixo
+CompanyHasRelativeDiscount=Este cliente ten un desconto por defecto de <b>%s%%</b>
+CompanyHasNoRelativeDiscount=Este cliente non ten descontos relativos por defecto
+HasRelativeDiscountFromSupplier=Ten un desconto predeterminado de <b> %s%%</b> neste provedor
+HasNoRelativeDiscountFromSupplier=Non ten desconto relativo predeterminado neste provedor
+CompanyHasAbsoluteDiscount=Este cliente ten descontos (abonos ou anticipos) dispoñibles para <b>%s %s</b>
+CompanyHasDownPaymentOrCommercialDiscount=Este cliente ten descontos dispoñibles (anticipos, comerciais) para <b>%s</b> %s
+CompanyHasCreditNote=Este cliente ten anticipos dispoñibles en <b>%s %s</b>
+HasNoAbsoluteDiscountFromSupplier=Non ten ningún crédito de desconto dispoñible neste provedor
+HasAbsoluteDiscountFromSupplier=Ten descontos dispoñibles (notas de créditos ou anticipos) para <b> %s </b> %s deste provedor
+HasDownPaymentOrCommercialDiscountFromSupplier=Ten descontos dispoñibles (comerciais, anticipos) para <b> %s </b> %s deste provedor
+HasCreditNoteFromSupplier=Ten abonos para <b> %s </b> %s deste provedor
+CompanyHasNoAbsoluteDiscount=Este cliente non ten mais descontos fixos dispoñibles
+CustomerAbsoluteDiscountAllUsers=Descontos fixos a clientes (acordado por todos os usuarios)
+CustomerAbsoluteDiscountMy=Descontos fixos a clientes (acordados persoalmente)
+SupplierAbsoluteDiscountAllUsers=Descontos fixos de provedores (acordado por todos os usuarios)
+SupplierAbsoluteDiscountMy=Descontos fixos de provedores (acordados persoalmente)
+DiscountNone=Ningún
+Vendor=Vendedor
+Supplier=Provedor
+AddContact=Crear contacto
+AddContactAddress=Crear contacto/enderezo
+EditContact=Editar contacto
+EditContactAddress=Editar contacto/enderezo
+Contact=Contacto
+ContactId=Id contacto
+ContactsAddresses=Contactos/Enderezos
+FromContactName=Nome:
+NoContactDefinedForThirdParty=Ningún contacto definido para este terceiro
+NoContactDefined=Ningún contacto definido
+DefaultContact=Contacto por defecto
+ContactByDefaultFor=Contacto/Enderezo por defecto
+AddThirdParty=Crear terceiro
+DeleteACompany=Eliminar unha empresa
+PersonalInformations=Información persoal
+AccountancyCode=Conta contable
+CustomerCode=Código cliente
+SupplierCode=Código provedor
+CustomerCodeShort=Código cliente
+SupplierCodeShort=Código provedor
+CustomerCodeDesc=Código cliente, único para todos os clientes
+SupplierCodeDesc=Código provedor, único para todos os provedores
+RequiredIfCustomer=Requerido se o terceiro é un cliente ou cliente potencial
+RequiredIfSupplier=Requerido se o terceiro é un provedor
+ValidityControledByModule=Validación controlada polo módulo
+ThisIsModuleRules=Regras para este módulo.
+ProspectToContact=Cliente potencial a contactar
+CompanyDeleted=A empresa "%s" foi eliminada
+ListOfContacts=Listaxe de contactos
+ListOfContactsAddresses=Listaxe de contactos/enderezos
+ListOfThirdParties=Listaxe de terceiros
+ShowCompany=Third Party
+ShowContact=Contact-Address
+ContactsAllShort=Todos (sen filtro)
+ContactType=Tipo de contacto
+ContactForOrders=Contacto de pedimentos
+ContactForOrdersOrShipments=Contacto de pedimentos ou envíos
+ContactForProposals=Contacto de orzamentos
+ContactForContracts=Contacto de contratos
+ContactForInvoices=Contacto de facturas
+NoContactForAnyOrder=Este contacto non é contacto de ningún pedimento
+NoContactForAnyOrderOrShipments=Este contacto non é contacto de ningún pedimento o envío
+NoContactForAnyProposal=Este contacto non é contacto de ningún orzamento
+NoContactForAnyContract=Este contacto non é contacto de ningún contrato
+NoContactForAnyInvoice=Este contacto non é contacto de ningunha factura
+NewContact=Novo contacto
+NewContactAddress=Novo Contacto/Enderezo
+MyContacts=Meus contactos
+Capital=Capital
+CapitalOf=Capital de %s
+EditCompany=Modificar empresa
+ThisUserIsNot=This user is not a prospect, customer or vendor
+VATIntraCheck=Verificar
+VATIntraCheckDesc=El enlace <b>%s</b> permite consultar no servizo europeo de control de números de IVE intracomunitario (VIES). Requírese acceso a internet dende o servidor Dolibarr para o servizo.
+VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckableOnEUSite=Verificar o CIF/NIF intracomunitario na web da Comisión Europea
+VATIntraManualCheck=Pode tamén verificar manualmente na web da Comisión Europea <a href="%s" target="_blank">%s</a>
+ErrorVATCheckMS_UNAVAILABLE=Comprobación imposible. O servizo de comprobación non é fornecido polo Estado membro (%s).
+NorProspectNorCustomer=Nin cliente, nin cliente potencial
+JuridicalStatus=Forma xurídica
+Staff=Empregados
+ProspectLevelShort=Potencial
+ProspectLevel=Cliente potencial
+ContactPrivate=Privado
+ContactPublic=Compartido
+ContactVisibility=Visibilidade
+ContactOthers=Outro
+OthersNotLinkedToThirdParty=Outros, non vinculados a un terceiro
+ProspectStatus=Estado do cliente potencial
+PL_NONE=Ningún
+PL_UNKNOWN=Descoñecido
+PL_LOW=Baixo
+PL_MEDIUM=Medio
+PL_HIGH=Alto
+TE_UNKNOWN=-
+TE_STARTUP=Startup
+TE_GROUP=Gran empresa
+TE_MEDIUM=PYME
+TE_ADMIN=Administración
+TE_SMALL=PYME
+TE_RETAIL=Minorista
+TE_WHOLE=Maiorista
+TE_PRIVATE=Particular
+TE_OTHER=Outro
+StatusProspect-1=Non contactar
+StatusProspect0=Nunca contactado
+StatusProspect1=A contactar
+StatusProspect2=Contacto en curso
+StatusProspect3=Contacto realizado
+ChangeDoNotContact=Cambiar o estado a 'Non contactar'
+ChangeNeverContacted=Cambiar o estado a 'Nunca contactado'
+ChangeToContact=Cambiar o estado a 'A contactar'
+ChangeContactInProcess=Cambiar o estado a 'Contacto en curso'
+ChangeContactDone=Cambiar o estado a 'Contacto realizado'
+ProspectsByStatus=Clientes potenciais por estado
+NoParentCompany=Ningunha
+ExportCardToFormat=Exportar ficha a formato
+ContactNotLinkedToCompany=Contacto non vinculado a un terceiro
+DolibarrLogin=Login no Dolibarr
+NoDolibarrAccess=Sen acceso a Dolibarr
+ExportDataset_company_1=Terceiros (Empresas / fundacións / particulares) e as súas propiedades
+ExportDataset_company_2=Contactos e as súas propiedades
+ImportDataset_company_1=Terceiros e as súas propiedades
+ImportDataset_company_2=Contactos/Enderezos e atributos de terceiros
+ImportDataset_company_3=Contas bancarias de terceiros
+ImportDataset_company_4=Comerciais de Terceiros (Asigna comerciais/usuarios a empresas)
+PriceLevel=Nivel de prezos
+PriceLevelLabels=Etiquetas de nivel de prezos
+DeliveryAddress=Enderezo de envío
+AddAddress=Engadir enderezo
+SupplierCategory=Categoría de provedor
+JuridicalStatus200=Independente
+DeleteFile=Eliminación dun arquivo
+ConfirmDeleteFile=¿Está certo de querer eliminar este arquivo?
+AllocateCommercial=Asignado a comercial
+Organization=Organización
+FiscalYearInformation=Ano fiscal
+FiscalMonthStart=Mes de inicio do ano fiscal
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
+YouMustAssignUserMailFirst=Primeiro tes que asignar un e-mail para este usuario para poder engadilo en notificaciónss de e-mail.
+YouMustCreateContactFirst=Para poder engadir notificaciones por e-mail, primeiro tes que definir contactos con e-mails válidos para terceiros
+ListSuppliersShort=Listaxe de provedores
+ListProspectsShort=Listaxe de clientes potenciais
+ListCustomersShort=Listaxe de clientes
+ThirdPartiesArea=Área de Terceiros/Contactos
+LastModifiedThirdParties=Últimos %s terceiros modificados
+UniqueThirdParties=Total de terceiros únicos
+InActivity=Activo
+ActivityCeased=Pechada
+ThirdPartyIsClosed=O terceiro está pechado
+ProductsIntoElements=Listaxe de produtos/servizos en %s
+CurrentOutstandingBill=Risco alcanzado
+OutstandingBill=Importe máximo para facturas pendentes
+OutstandingBillReached=Importe máximo para facturas pendentes
+OrderMinAmount=Importe mínimo para pedimento
+MonkeyNumRefModelDesc=Devolve un número co formato %syymm-nnnn para os códigos de clientes e %syymm-nnnn para os códigos dos provedores, onde yy é o ano, mm é o mes e nnnn é unha secuencia sen ruptura e sen voltar a 0.
+LeopardNumRefModelDesc=Código libre. Pode ser modificado en calquera momento.
+ManagingDirectors=Administrador(es) (CEO, director, presidente, etc.)
+MergeOriginThirdparty=Terceiro duplicado (terceiro a eliminar)
+MergeThirdparties=Fusionar terceiros
+ConfirmMergeThirdparties=¿Está certo de querer fusionar este terceiro co actual? Todos os obxectos relacionados (facturas, pedimentos, ..) moveranse ao terceiro actual, e o terceiro será eliminado.
+ThirdpartiesMergeSuccess=Os terceiros foron fusionados
+SaleRepresentativeLogin=Inicio de sesión do comercial
+SaleRepresentativeFirstname=Nome do comercial
+SaleRepresentativeLastname=Apelidos do comercial
+ErrorThirdpartiesMerge=Aconteceu un erro a eliminar os terceiros. Pregase comprobe o log. Os cambios foron anulados.
+NewCustomerSupplierCodeProposed=Código de cliente ou provedor xa usado, un novo código é suxerido
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+#Imports
+PaymentTypeCustomer=Tipo de pago - Cliente
+PaymentTermsCustomer=Termos de pago - Cliente
+PaymentTypeSupplier=Tipo de pago - Provedor
+PaymentTermsSupplier=Termos de pago - Provedor
+PaymentTypeBoth=Payment Type - Customer and Vendor
+MulticurrencyUsed=Use MultiMoeda
+MulticurrencyCurrency=Moeda
diff --git a/htdocs/langs/gl_ES/compta.lang b/htdocs/langs/gl_ES/compta.lang
new file mode 100644
index 00000000000..dad8d434561
--- /dev/null
+++ b/htdocs/langs/gl_ES/compta.lang
@@ -0,0 +1,266 @@
+# Dolibarr language file - Source file is en_US - compta
+MenuFinancial=Billing | Payment
+TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
+OptionMode=Option for accountancy
+OptionModeTrue=Option Incomes-Expenses
+OptionModeVirtual=Option Claims-Debts
+OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
+OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
+FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
+VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
+LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+Param=Config.
+RemainingAmountPayment=Amount payment remaining:
+Account=Conta
+Accountparent=Parent account
+Accountsparent=Parent accounts
+Income=Income
+Outcome=Expense
+MenuReportInOut=Income / Expense
+ReportInOut=Balance of income and expenses
+ReportTurnover=Turnover invoiced
+ReportTurnoverCollected=Turnover collected
+PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party
+PaymentsNotLinkedToUser=Payments not linked to any user
+Profit=Profit
+AccountingResult=Accounting result
+BalanceBefore=Balance (before)
+Balance=Saldo
+Debit=Debit
+Credit=Credit
+Piece=Accounting Doc.
+AmountHTVATRealReceived=Net collected
+AmountHTVATRealPaid=Net paid
+VATToPay=Tax sales
+VATReceived=Tax received
+VATToCollect=Tax purchases
+VATSummary=Tax monthly
+VATBalance=Tax Balance
+VATPaid=Tax paid
+LT1Summary=Tax 2 summary
+LT2Summary=Tax 3 summary
+LT1SummaryES=RE Balance
+LT2SummaryES=IRPF Balance
+LT1SummaryIN=CGST Balance
+LT2SummaryIN=SGST Balance
+LT1Paid=Tax 2 paid
+LT2Paid=Tax 3 paid
+LT1PaidES=RE Paid
+LT2PaidES=IRPF Paid
+LT1PaidIN=CGST Paid
+LT2PaidIN=SGST Paid
+LT1Customer=Tax 2 sales
+LT1Supplier=Tax 2 purchases
+LT1CustomerES=RE sales
+LT1SupplierES=RE purchases
+LT1CustomerIN=CGST sales
+LT1SupplierIN=CGST purchases
+LT2Customer=Tax 3 sales
+LT2Supplier=Tax 3 purchases
+LT2CustomerES=IRPF sales
+LT2SupplierES=IRPF purchases
+LT2CustomerIN=SGST sales
+LT2SupplierIN=SGST purchases
+VATCollected=VAT collected
+StatusToPay=To pay
+SpecialExpensesArea=Area for all special payments
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
+SocialContributionsDeductibles=Deductible social or fiscal taxes
+SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
+MenuSpecialExpenses=Special expenses
+MenuTaxAndDividends=Taxes and dividends
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New social/fiscal tax
+NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
+AccountancyTreasuryArea=Billing and payment area
+NewPayment=New payment
+PaymentCustomerInvoice=Customer invoice payment
+PaymentSupplierInvoice=vendor invoice payment
+PaymentSocialContribution=Pago de imposto social/fiscal
+PaymentVat=VAT payment
+ListPayment=List of payments
+ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of vendor payments
+DateStartPeriod=Date start period
+DateEndPeriod=Date end period
+newLT1Payment=New tax 2 payment
+newLT2Payment=New tax 3 payment
+LT1Payment=Tax 2 payment
+LT1Payments=Tax 2 payments
+LT2Payment=Tax 3 payment
+LT2Payments=Tax 3 payments
+newLT1PaymentES=New RE payment
+newLT2PaymentES=New IRPF payment
+LT1PaymentES=RE Payment
+LT1PaymentsES=RE Payments
+LT2PaymentES=IRPF Payment
+LT2PaymentsES=IRPF Payments
+VATPayment=Sales tax payment
+VATPayments=Sales tax payments
+VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
+NewLocalTaxPayment=New tax %s payment
+Refund=Refund
+SocialContributionsPayments=Social/fiscal taxes payments
+ShowVatPayment=Show VAT payment
+TotalToPay=Total to pay
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+CustomerAccountancyCode=Customer accounting code
+SupplierAccountancyCode=Vendor accounting code
+CustomerAccountancyCodeShort=Cust. account. code
+SupplierAccountancyCodeShort=Sup. account. code
+AccountNumber=Account number
+NewAccountingAccount=Nova conta
+Turnover=Turnover invoiced
+TurnoverCollected=Turnover collected
+SalesTurnoverMinimum=Minimum turnover
+ByExpenseIncome=By expenses & incomes
+ByThirdParties=Por terceiros
+ByUserAuthorOfInvoice=By invoice author
+CheckReceipt=Check deposit
+CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Latest %s check receipts
+NewCheckReceipt=New discount
+NewCheckDeposit=New check deposit
+NewCheckDepositOn=Create receipt for deposit on account: %s
+NoWaitingChecks=No checks awaiting deposit.
+DateChequeReceived=Check reception date
+NbOfCheques=No. of checks
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
+CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
+CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
+CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
+CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
+CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
+CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
+CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
+CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
+CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
+CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
+AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
+AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
+AnnualByCompanies=Balance of income and expenses, by predefined groups of account
+AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
+AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
+SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
+SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
+SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
+RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
+RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
+RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
+RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
+RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
+SeePageForSetup=See menu <a href="%s">%s</a> for setup
+DepositsAreNotIncluded=- Down payment invoices are not included
+DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
+VATReportByCustomers=Sale tax report by customer
+VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
+SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
+SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
+RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
+RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
+OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
+PercentOfInvoice=%%/invoice
+NotUsedForGoods=Not used on goods
+ProposalStats=Statistics on proposals
+OrderStats=Statistics on orders
+InvoiceStats=Statistics on bills
+Dispatch=Dispatching
+Dispatched=Dispatched
+ToDispatch=To dispatch
+ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer
+SellsJournal=Sales Journal
+PurchasesJournal=Purchases Journal
+DescSellsJournal=Sales Journal
+DescPurchasesJournal=Purchases Journal
+CodeNotDef=Non definido
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
+DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
+Pcg_version=Chart of accounts models
+Pcg_type=Pcg type
+Pcg_subtype=Pcg subtype
+InvoiceLinesToDispatch=Invoice lines to dispatch
+ByProductsAndServices=By product and service
+RefExt=External ref
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+LinkedOrder=Vincular a pedido
+Mode1=Method 1
+Mode2=Method 2
+CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
+CalculationRuleDescSupplier=According to vendor, choose appropriate method to apply same calculation rule and get same result expected by your vendor.
+TurnoverPerProductInCommitmentAccountingNotRelevant=The report of Turnover collected per product is not available. This report is only available for turnover invoiced.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
+CalculationMode=Calculation mode
+AccountancyJournal=Accounting code journal
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+CloneTaxForNextMonth=Clone it for next month
+SimpleReport=Simple report
+AddExtraReport=Extra reports (add foreign and national customer report)
+OtherCountriesCustomersReport=Foreign customers report
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
+SameCountryCustomersWithVAT=National customers report
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
+LinkedFichinter=Link to an intervention
+ImportDataset_tax_contrib=Social/fiscal taxes
+ImportDataset_tax_vat=Vat payments
+ErrorBankAccountNotFound=Error: Bank account not found
+FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
+DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignment
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover invoiced by sale tax rate
+TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
+LabelToShow=Etiqueta curta
+PurchaseTurnover=Purchase turnover
+PurchaseTurnoverCollected=Purchase turnover collected
+RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
+RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/gl_ES/contracts.lang b/htdocs/langs/gl_ES/contracts.lang
new file mode 100644
index 00000000000..91d06661e8f
--- /dev/null
+++ b/htdocs/langs/gl_ES/contracts.lang
@@ -0,0 +1,101 @@
+# Dolibarr language file - Source file is en_US - contracts
+ContractsArea=Contracts area
+ListOfContracts=List of contracts
+AllContracts=All contracts
+ContractCard=Contract card
+ContractStatusNotRunning=Not running
+ContractStatusDraft=Borrador
+ContractStatusValidated=Validado
+ContractStatusClosed=Pechada
+ServiceStatusInitial=Not running
+ServiceStatusRunning=Running
+ServiceStatusNotLate=Running, not expired
+ServiceStatusNotLateShort=Not expired
+ServiceStatusLate=Running, expired
+ServiceStatusLateShort=Expired
+ServiceStatusClosed=Pechada
+ShowContractOfService=Show contract of service
+Contracts=Contratos
+ContractsSubscriptions=Contratos/Suscricións
+ContractsAndLine=Contracts and line of contracts
+Contract=Contract
+ContractLine=Contract line
+Closing=Closing
+NoContracts=No contracts
+MenuServices=Servizos
+MenuInactiveServices=Services not active
+MenuRunningServices=Running services
+MenuExpiredServices=Expired services
+MenuClosedServices=Closed services
+NewContract=New contract
+NewContractSubscription=New contract/subscription
+AddContract=Create contract
+DeleteAContract=Delete a contract
+ActivateAllOnContract=Activate all services
+CloseAContract=Close a contract
+ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
+ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
+ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
+ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract?
+ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
+ValidateAContract=Validate a contract
+ActivateService=Activate service
+ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b>?
+RefContract=Contract reference
+DateContract=Contract date
+DateServiceActivate=Service activation date
+ListOfServices=List of services
+ListOfInactiveServices=List of not active services
+ListOfExpiredServices=List of expired active services
+ListOfClosedServices=List of closed services
+ListOfRunningServices=List of running services
+NotActivatedServices=Inactive services (among validated contracts)
+BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
+LastContracts=Latest %s contracts
+LastModifiedServices=Latest %s modified services
+ContractStartDate=Data de inicio
+ContractEndDate=Data de fin
+DateStartPlanned=Planned start date
+DateStartPlannedShort=Planned start date
+DateEndPlanned=Planned end date
+DateEndPlannedShort=Planned end date
+DateStartReal=Real start date
+DateStartRealShort=Real start date
+DateEndReal=Real end date
+DateEndRealShort=Real end date
+CloseService=Close service
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
+ServiceStatus=Status of service
+DraftContracts=Drafts contracts
+CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
+ActivateAllContracts=Activate all contract lines
+CloseAllContracts=Close all contract lines
+DeleteContractLine=Delete a contract line
+ConfirmDeleteContractLine=Are you sure you want to delete this contract line?
+MoveToAnotherContract=Move service into another contract.
+ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract.
+ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
+PaymentRenewContractId=Renew contract line (number %s)
+ExpiredSince=Expiration date
+NoExpiredServices=No expired active services
+ListOfServicesToExpireWithDuration=List of Services to expire in %s days
+ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
+ListOfServicesToExpire=List of Services to expire
+NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
+StandardContractsTemplate=Standard contracts template
+ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
+LowerDateEndPlannedShort=Lower planned end date of active services
+SendContractRef=Contract information __REF__
+OtherContracts=Other contracts
+##### Types de contacts #####
+TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
+TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract
+TypeContact_contrat_external_BILLING=Billing customer contact
+TypeContact_contrat_external_CUSTOMER=Follow-up customer contact
+TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact
diff --git a/htdocs/langs/gl_ES/cron.lang b/htdocs/langs/gl_ES/cron.lang
new file mode 100644
index 00000000000..0d13a042fbc
--- /dev/null
+++ b/htdocs/langs/gl_ES/cron.lang
@@ -0,0 +1,84 @@
+# Dolibarr language file - Source file is en_US - cron
+# About page
+# Right
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
+# Admin
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
+CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
+CronJobProfiles=List of predefined cron job profiles
+# Menu
+EnabledAndDisabled=Enabled and disabled
+# Page list
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
+CronCommand=Command
+CronList=Scheduled jobs
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
+CronExecute=Launch scheduled job
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
+CronTask=Job
+CronNone=Ningún
+CronDtStart=Not before
+CronDtEnd=Not after
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Start date of latest execution
+CronDtLastResult=End date of latest execution
+CronFrequency=Frecuencia
+CronClass=Class
+CronMethod=Método
+CronModule=Module
+CronNoJobs=No jobs registered
+CronPriority=Prioridade
+CronLabel=Etiqueta
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
+CronEach=Every
+JobFinished=Job launched and finished
+#Page card
+CronAdd= Add jobs
+CronEvery=Execute job each
+CronObject=Instance/Object to create
+CronArgs=Parámetros
+CronSaveSucess=Save successfully
+CronNote=Comentario
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+StatusAtInstall=Status at module installation
+CronStatusActiveBtn=Activo
+CronStatusInactiveBtn=Desactivar
+CronTaskInactive=This job is disabled
+CronId=Id
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
+CronFrom=De
+# Info
+# Common
+CronType=Job type
+CronType_method=Call method of a PHP Class
+CronType_command=Shell command
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
+JobDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
diff --git a/htdocs/langs/gl_ES/deliveries.lang b/htdocs/langs/gl_ES/deliveries.lang
new file mode 100644
index 00000000000..f97f863389b
--- /dev/null
+++ b/htdocs/langs/gl_ES/deliveries.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - deliveries
+Delivery=Delivery
+DeliveryRef=Ref Delivery
+DeliveryCard=Receipt card
+DeliveryOrder=Delivery receipt
+DeliveryDate=Delivery date
+CreateDeliveryOrder=Generate delivery receipt
+DeliveryStateSaved=Delivery state saved
+SetDeliveryDate=Set shipping date
+ValidateDeliveryReceipt=Validate delivery receipt
+ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt?
+DeleteDeliveryReceipt=Delete delivery receipt
+DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b>?
+DeliveryMethod=Delivery method
+TrackingNumber=Tracking number
+DeliveryNotValidated=Delivery not validated
+StatusDeliveryCanceled=Anulado
+StatusDeliveryDraft=Borrador
+StatusDeliveryValidated=Recibido
+# merou PDF model
+NameAndSignature=Name and Signature:
+ToAndDate=To___________________________________ on ____/_____/__________
+GoodStatusDeclaration=Have received the goods above in good condition,
+Deliverer=Deliverer:
+Sender=Remitente
+Recipient=Recipient
+ErrorStockIsNotEnough=There's not enough stock
+Shippable=Shippable
+NonShippable=Not Shippable
+ShowReceiving=Show delivery receipt
+NonExistentOrder=Nonexistent order
diff --git a/htdocs/langs/gl_ES/dict.lang b/htdocs/langs/gl_ES/dict.lang
new file mode 100644
index 00000000000..ec315d97142
--- /dev/null
+++ b/htdocs/langs/gl_ES/dict.lang
@@ -0,0 +1,359 @@
+# Dolibarr language file - Source file is en_US - dict
+CountryFR=France
+CountryBE=Belgium
+CountryIT=Italy
+CountryES=Spain
+CountryDE=Germany
+CountryCH=Switzerland
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
+CountryUK=United Kingdom
+CountryIE=Ireland
+CountryCN=China
+CountryTN=Tunisia
+CountryUS=United States
+CountryMA=Morocco
+CountryDZ=Algeria
+CountryCA=Canada
+CountryTG=Togo
+CountryGA=Gabon
+CountryNL=Netherlands
+CountryHU=Hungary
+CountryRU=Russia
+CountrySE=Sweden
+CountryCI=Ivoiry Coast
+CountrySN=Senegal
+CountryAR=Argentina
+CountryCM=Cameroon
+CountryPT=Portugal
+CountrySA=Saudi Arabia
+CountryMC=Monaco
+CountryAU=Australia
+CountrySG=Singapore
+CountryAF=Afghanistan
+CountryAX=Åland Islands
+CountryAL=Albania
+CountryAS=American Samoa
+CountryAD=Andorra
+CountryAO=Angola
+CountryAI=Anguilla
+CountryAQ=Antarctica
+CountryAG=Antigua and Barbuda
+CountryAM=Armenia
+CountryAW=Aruba
+CountryAT=Austria
+CountryAZ=Azerbaijan
+CountryBS=Bahamas
+CountryBH=Bahrain
+CountryBD=Bangladesh
+CountryBB=Barbados
+CountryBY=Belarus
+CountryBZ=Belize
+CountryBJ=Benin
+CountryBM=Bermuda
+CountryBT=Bhutan
+CountryBO=Bolivia
+CountryBA=Bosnia and Herzegovina
+CountryBW=Botswana
+CountryBV=Bouvet Island
+CountryBR=Brazil
+CountryIO=British Indian Ocean Territory
+CountryBN=Brunei Darussalam
+CountryBG=Bulgaria
+CountryBF=Burkina Faso
+CountryBI=Burundi
+CountryKH=Cambodia
+CountryCV=Cape Verde
+CountryKY=Cayman Islands
+CountryCF=Central African Republic
+CountryTD=Chad
+CountryCL=Chile
+CountryCX=Christmas Island
+CountryCC=Cocos (Keeling) Islands
+CountryCO=Colombia
+CountryKM=Comoros
+CountryCG=Congo
+CountryCD=Congo, The Democratic Republic of the
+CountryCK=Cook Islands
+CountryCR=Costa Rica
+CountryHR=Croatia
+CountryCU=Cuba
+CountryCY=Cyprus
+CountryCZ=Czech Republic
+CountryDK=Denmark
+CountryDJ=Djibouti
+CountryDM=Dominica
+CountryDO=Dominican Republic
+CountryEC=Ecuador
+CountryEG=Egypt
+CountrySV=El Salvador
+CountryGQ=Equatorial Guinea
+CountryER=Eritrea
+CountryEE=Estonia
+CountryET=Ethiopia
+CountryFK=Falkland Islands
+CountryFO=Faroe Islands
+CountryFJ=Fiji Islands
+CountryFI=Finland
+CountryGF=French Guiana
+CountryPF=French Polynesia
+CountryTF=French Southern Territories
+CountryGM=Gambia
+CountryGE=Georgia
+CountryGH=Ghana
+CountryGI=Gibraltar
+CountryGR=Greece
+CountryGL=Greenland
+CountryGD=Grenada
+CountryGP=Guadeloupe
+CountryGU=Guam
+CountryGT=Guatemala
+CountryGN=Guinea
+CountryGW=Guinea-Bissau
+CountryGY=Guyana
+CountryHT=Haïti
+CountryHM=Heard Island and McDonald
+CountryVA=Holy See (Vatican City State)
+CountryHN=Honduras
+CountryHK=Hong Kong
+CountryIS=Iceland
+CountryIN=India
+CountryID=Indonesia
+CountryIR=Iran
+CountryIQ=Iraq
+CountryIL=Israel
+CountryJM=Jamaica
+CountryJP=Japan
+CountryJO=Jordan
+CountryKZ=Kazakhstan
+CountryKE=Kenya
+CountryKI=Kiribati
+CountryKP=North Korea
+CountryKR=South Korea
+CountryKW=Kuwait
+CountryKG=Kyrgyzstan
+CountryLA=Lao
+CountryLV=Latvia
+CountryLB=Lebanon
+CountryLS=Lesotho
+CountryLR=Liberia
+CountryLY=Libyan
+CountryLI=Liechtenstein
+CountryLT=Lithuania
+CountryLU=Luxembourg
+CountryMO=Macao
+CountryMK=Macedonia, the former Yugoslav of
+CountryMG=Madagascar
+CountryMW=Malawi
+CountryMY=Malaysia
+CountryMV=Maldives
+CountryML=Mali
+CountryMT=Malta
+CountryMH=Marshall Islands
+CountryMQ=Martinique
+CountryMR=Mauritania
+CountryMU=Mauritius
+CountryYT=Mayotte
+CountryMX=Mexico
+CountryFM=Micronesia
+CountryMD=Moldova
+CountryMN=Mongolia
+CountryMS=Monserrat
+CountryMZ=Mozambique
+CountryMM=Myanmar (Burma)
+CountryNA=Namibia
+CountryNR=Nauru
+CountryNP=Nepal
+CountryAN=Netherlands Antilles
+CountryNC=New Caledonia
+CountryNZ=New Zealand
+CountryNI=Nicaragua
+CountryNE=Niger
+CountryNG=Nigeria
+CountryNU=Niue
+CountryNF=Norfolk Island
+CountryMP=Northern Mariana Islands
+CountryNO=Norway
+CountryOM=Oman
+CountryPK=Pakistan
+CountryPW=Palau
+CountryPS=Palestinian Territory, Occupied
+CountryPA=Panama
+CountryPG=Papua New Guinea
+CountryPY=Paraguay
+CountryPE=Peru
+CountryPH=Philippines
+CountryPN=Pitcairn Islands
+CountryPL=Poland
+CountryPR=Puerto Rico
+CountryQA=Qatar
+CountryRE=Reunion
+CountryRO=Romania
+CountryRW=Rwanda
+CountrySH=Saint Helena
+CountryKN=Saint Kitts and Nevis
+CountryLC=Saint Lucia
+CountryPM=Saint Pierre and Miquelon
+CountryVC=Saint Vincent and Grenadines
+CountryWS=Samoa
+CountrySM=San Marino
+CountryST=Sao Tome and Principe
+CountryRS=Serbia
+CountrySC=Seychelles
+CountrySL=Sierra Leone
+CountrySK=Slovakia
+CountrySI=Slovenia
+CountrySB=Solomon Islands
+CountrySO=Somalia
+CountryZA=South Africa
+CountryGS=South Georgia and the South Sandwich Islands
+CountryLK=Sri Lanka
+CountrySD=Sudan
+CountrySR=Suriname
+CountrySJ=Svalbard and Jan Mayen
+CountrySZ=Swaziland
+CountrySY=Syrian
+CountryTW=Taiwan
+CountryTJ=Tajikistan
+CountryTZ=Tanzania
+CountryTH=Thailand
+CountryTL=Timor-Leste
+CountryTK=Tokelau
+CountryTO=Tonga
+CountryTT=Trinidad and Tobago
+CountryTR=Turkey
+CountryTM=Turkmenistan
+CountryTC=Turks and Caicos Islands
+CountryTV=Tuvalu
+CountryUG=Uganda
+CountryUA=Ukraine
+CountryAE=United Arab Emirates
+CountryUM=United States Minor Outlying Islands
+CountryUY=Uruguay
+CountryUZ=Uzbekistan
+CountryVU=Vanuatu
+CountryVE=Venezuela
+CountryVN=Viet Nam
+CountryVG=Virgin Islands, British
+CountryVI=Virgin Islands, U.S.
+CountryWF=Wallis and Futuna
+CountryEH=Western Sahara
+CountryYE=Yemen
+CountryZM=Zambia
+CountryZW=Zimbabwe
+CountryGG=Guernsey
+CountryIM=Isle of Man
+CountryJE=Jersey
+CountryME=Montenegro
+CountryBL=Saint Barthelemy
+CountryMF=Saint Martin
+
+##### Civilities #####
+CivilityMME=Mrs.
+CivilityMR=Mr.
+CivilityMLE=Ms.
+CivilityMTRE=Master
+CivilityDR=Doctor
+##### Currencies #####
+Currencyeuros=Euros
+CurrencyAUD=AU Dollars
+CurrencySingAUD=AU Dollar
+CurrencyCAD=CAN Dollars
+CurrencySingCAD=CAN Dollar
+CurrencyCHF=Swiss Francs
+CurrencySingCHF=Swiss Franc
+CurrencyEUR=Euros
+CurrencySingEUR=Euro
+CurrencyFRF=French Francs
+CurrencySingFRF=French Franc
+CurrencyGBP=GB Pounds
+CurrencySingGBP=GB Pound
+CurrencyINR=Indian rupees
+CurrencySingINR=Indian rupee
+CurrencyMAD=Dirham
+CurrencySingMAD=Dirham
+CurrencyMGA=Ariary
+CurrencySingMGA=Ariary
+CurrencyMUR=Mauritius rupees
+CurrencySingMUR=Mauritius rupee
+CurrencyNOK=Norwegian krones
+CurrencySingNOK=Norwegian kronas
+CurrencyTND=Tunisian dinars
+CurrencySingTND=Tunisian dinar
+CurrencyUSD=US Dollars
+CurrencySingUSD=US Dollar
+CurrencyUAH=Hryvnia
+CurrencySingUAH=Hryvnia
+CurrencyXAF=CFA Francs BEAC
+CurrencySingXAF=CFA Franc BEAC
+CurrencyXOF=CFA Francs BCEAO
+CurrencySingXOF=CFA Franc BCEAO
+CurrencyXPF=CFP Francs
+CurrencySingXPF=CFP Franc
+CurrencyCentEUR=cents
+CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=thousandth
+#### Input reasons #####
+DemandReasonTypeSRC_INTE=Internet
+DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
+DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
+DemandReasonTypeSRC_CAMP_PHO=Phone campaign
+DemandReasonTypeSRC_CAMP_FAX=Fax campaign
+DemandReasonTypeSRC_COMM=Commercial contact
+DemandReasonTypeSRC_SHOP=Shop contact
+DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_PARTNER=Partner
+DemandReasonTypeSRC_EMPLOYEE=Employee
+DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
+#### Paper formats ####
+PaperFormatEU4A0=Format 4A0
+PaperFormatEU2A0=Format 2A0
+PaperFormatEUA0=Format A0
+PaperFormatEUA1=Format A1
+PaperFormatEUA2=Format A2
+PaperFormatEUA3=Format A3
+PaperFormatEUA4=Format A4
+PaperFormatEUA5=Format A5
+PaperFormatEUA6=Format A6
+PaperFormatUSLETTER=Format Letter US
+PaperFormatUSLEGAL=Format Legal US
+PaperFormatUSEXECUTIVE=Format Executive US
+PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatCAP1=Format P1 Canada
+PaperFormatCAP2=Format P2 Canada
+PaperFormatCAP3=Format P3 Canada
+PaperFormatCAP4=Format P4 Canada
+PaperFormatCAP5=Format P5 Canada
+PaperFormatCAP6=Format P6 Canada
+#### Expense report categories ####
+ExpAutoCat=Car
+ExpCycloCat=Moped
+ExpMotoCat=Motorbike
+ExpAuto3CV=3 CV
+ExpAuto4CV=4 CV
+ExpAuto5CV=5 CV
+ExpAuto6CV=6 CV
+ExpAuto7CV=7 CV
+ExpAuto8CV=8 CV
+ExpAuto9CV=9 CV
+ExpAuto10CV=10 CV
+ExpAuto11CV=11 CV
+ExpAuto12CV=12 CV
+ExpAuto3PCV=3 CV and more
+ExpAuto4PCV=4 CV and more
+ExpAuto5PCV=5 CV and more
+ExpAuto6PCV=6 CV and more
+ExpAuto7PCV=7 CV and more
+ExpAuto8PCV=8 CV and more
+ExpAuto9PCV=9 CV and more
+ExpAuto10PCV=10 CV and more
+ExpAuto11PCV=11 CV and more
+ExpAuto12PCV=12 CV and more
+ExpAuto13PCV=13 CV and more
+ExpCyclo=Capacity lower to 50cm3
+ExpMoto12CV=Motorbike 1 or 2 CV
+ExpMoto345CV=Motorbike 3, 4 or 5 CV
+ExpMoto5PCV=Motorbike 5 CV and more
diff --git a/htdocs/langs/gl_ES/donations.lang b/htdocs/langs/gl_ES/donations.lang
new file mode 100644
index 00000000000..16cf65e2c5f
--- /dev/null
+++ b/htdocs/langs/gl_ES/donations.lang
@@ -0,0 +1,34 @@
+# Dolibarr language file - Source file is en_US - donations
+Donation=Donation
+Donations=Donacións
+DonationRef=Donation ref.
+Donor=Donor
+AddDonation=Create a donation
+NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation?
+PublicDonation=Public donation
+DonationsArea=Donations area
+DonationStatusPromiseNotValidated=Draft promise
+DonationStatusPromiseValidated=Validated promise
+DonationStatusPaid=Donation received
+DonationStatusPromiseNotValidatedShort=Borrador
+DonationStatusPromiseValidatedShort=Validado
+DonationStatusPaidShort=Recibido
+DonationTitle=Donation receipt
+DonationDate=Donation date
+DonationDatePayment=Payment date
+ValidPromess=Validate promise
+DonationReceipt=Donation receipt
+DonationsModels=Documents models for donation receipts
+LastModifiedDonations=Últimas %s donacións modificadas
+DonationRecipient=Donation recipient
+IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+MinimumAmount=Minimum amount is  %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
+DonationValidated=Donation %s validated
diff --git a/htdocs/langs/gl_ES/ecm.lang b/htdocs/langs/gl_ES/ecm.lang
new file mode 100644
index 00000000000..31d4da0f388
--- /dev/null
+++ b/htdocs/langs/gl_ES/ecm.lang
@@ -0,0 +1,52 @@
+# Dolibarr language file - Source file is en_US - ecm
+ECMNbOfDocs=No. of documents in directory
+ECMSection=Directory
+ECMSectionManual=Manual directory
+ECMSectionAuto=Automatic directory
+ECMSectionsManual=Manual tree
+ECMSectionsAuto=Automatic tree
+ECMSections=Directories
+ECMRoot=ECM Root
+ECMNewSection=New directory
+ECMAddSection=Add directory
+ECMCreationDate=Data de creación
+ECMNbOfFilesInDir=Number of files in directory
+ECMNbOfSubDir=Number of sub-directories
+ECMNbOfFilesInSubDir=Number of files in sub-directories
+ECMCreationUser=Creator
+ECMArea=DMS/ECM area
+ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.<br>* Manual directories can be used to save documents not linked to a particular element.
+ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
+ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMSearchByKeywords=Search by keywords
+ECMSearchByEntity=Search by object
+ECMSectionOfDocuments=Directories of documents
+ECMTypeAuto=Automatic
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
+ECMDocsByThirdParties=Documents linked to third parties
+ECMDocsByProposals=Documents linked to proposals
+ECMDocsByOrders=Documents linked to customers orders
+ECMDocsByContracts=Documents linked to contracts
+ECMDocsByInvoices=Documents linked to customers invoices
+ECMDocsByProducts=Documents linked to products
+ECMDocsByProjects=Documents linked to projects
+ECMDocsByUsers=Documents linked to users
+ECMDocsByInterventions=Documents linked to interventions
+ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to vendor proposals
+ECMNoDirectoryYet=No directory created
+ShowECMSection=Show directory
+DeleteSection=Remove directory
+ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
+ECMDirectoryForFiles=Relative directory for files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+ECMFileManager=File manager
+ECMSelectASection=Select a directory in the tree...
+DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
+ReSyncListOfDir=Resync list of directories
+HashOfFileContent=Hash of file content
+NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/gl_ES/errors.lang b/htdocs/langs/gl_ES/errors.lang
new file mode 100644
index 00000000000..7c67aeca8b5
--- /dev/null
+++ b/htdocs/langs/gl_ES/errors.lang
@@ -0,0 +1,265 @@
+# Dolibarr language file - Source file is en_US - errors
+
+# No errors
+NoErrorCommitIsDone=No error, we commit
+# Errors
+ErrorButCommitIsDone=Errors found but we validate despite this
+ErrorBadEMail=Email %s is wrong
+ErrorBadUrl=Url %s is wrong
+ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorLoginAlreadyExists=Login %s already exists.
+ErrorGroupAlreadyExists=Group %s already exists.
+ErrorRecordNotFound=Record not found.
+ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
+ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
+ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
+ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
+ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
+ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
+ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
+ErrorBadThirdPartyName=Bad value for third-party name
+ErrorProdIdIsMandatory=The %s is mandatory
+ErrorBadCustomerCodeSyntax=Bad syntax for customer code
+ErrorBadBarCodeSyntax=Bad syntax for barcode. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorCustomerCodeRequired=Customer code required
+ErrorBarCodeRequired=Barcode required
+ErrorCustomerCodeAlreadyUsed=Customer code already used
+ErrorBarCodeAlreadyUsed=Barcode already used
+ErrorPrefixRequired=Prefix required
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
+ErrorBadParameters=Bad parameters
+ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
+ErrorBadDateFormat=Value '%s' has wrong date format
+ErrorWrongDate=Date is not correct!
+ErrorFailedToWriteInDir=Failed to write in directory %s
+ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
+ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
+ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
+ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
+ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
+ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
+ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
+ErrorFileNotFound=File <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
+ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
+ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
+ErrorDirAlreadyExists=A directory with this name already exists.
+ErrorFileAlreadyExists=A file with this name already exists.
+ErrorPartialFile=File not received completely by server.
+ErrorNoTmpDir=Temporary directy %s does not exists.
+ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
+ErrorFileSizeTooLarge=File size is too large.
+ErrorFieldTooLong=Field %s is too long.
+ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum)
+ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum)
+ErrorNoValueForSelectType=Please fill value for select list
+ErrorNoValueForCheckBoxType=Please fill value for checkbox list
+ErrorNoValueForRadioType=Please fill value for radio list
+ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
+ErrorFieldCanNotContainSpecialCharacters=The field <b>%s</b> must not contains special characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
+ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
+ErrorNoAccountancyModuleLoaded=No accountancy module activated
+ErrorExportDuplicateProfil=This profile name already exists for this export set.
+ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
+ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
+ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
+ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
+ErrorRecordHasChildren=Failed to delete record since it has some child records.
+ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
+ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
+ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display.
+ErrorPasswordsMustMatch=Both typed passwords must match each other
+ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
+ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
+ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
+ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
+ErrorsOnXLines=%s errors found
+ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
+ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
+ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
+ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorBadMask=Error on mask
+ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
+ErrorBadMaskBadRazMonth=Error, bad reset value
+ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
+ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
+ErrorSelectAtLeastOne=Error, select at least one entry.
+ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
+ErrorProdIdAlreadyExist=%s is assigned to another third
+ErrorFailedToSendPassword=Failed to send password
+ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
+ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
+ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
+ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
+ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
+ErrorRecordAlreadyExists=Record already exists
+ErrorLabelAlreadyExists=This label already exists
+ErrorCantReadFile=Failed to read file '%s'
+ErrorCantReadDir=Failed to read directory '%s'
+ErrorBadLoginPassword=Bad value for login or password
+ErrorLoginDisabled=Your account has been disabled
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToChangePassword=Failed to change password
+ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
+ErrorLoginHasNoEmail=This user has no email address. Process aborted.
+ErrorBadValueForCode=Bad value for security code. Try again with new value...
+ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice.
+ErrorLinesCantBeNegativeForOneVATRate=Total of lines can't be negative for a given VAT rate.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
+ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
+ErrorNoActivatedBarcode=No barcode type activated
+ErrUnzipFails=Failed to unzip %s with ZipArchive
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
+ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
+ErrorModuleFileRequired=You must select a Dolibarr module package file
+ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
+ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
+ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
+ErrorNewValueCantMatchOldValue=New value can't be equal to old one
+ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
+ErrorFailedToAddContact=Failed to add contact
+ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
+ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
+ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
+ErrorWarehouseMustDiffers=Source and target warehouses must differs
+ErrorBadFormat=Bad format!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
+ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
+ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
+ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Operator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpression23=Unknown or non set variable '%s' in %s
+ErrorPriceExpression24=Variable '%s' exists but has no value
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
+ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
+ErrorSavingChanges=An error has occurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
+ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
+ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
+ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
+ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
+ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
+ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
+ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
+ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
+ErrorTaskAlreadyAssigned=Task already assigned to user
+ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
+ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
+ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
+ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
+ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
+ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
+ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
+ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
+ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
+ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
+ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
+ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
+ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, record is already transferred in accounting, deletion is not possible.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, language is mandatory if you set the page as a translation of another one.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
+ErrorBatchNoFoundForProductInWarehouse=No lot/serial found for product "%s" in warehouse "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this lot/serial for product "%s" in warehouse "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
+ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
+ErrorReplaceStringEmpty=Error, the string to replace into is empty
+# Warnings
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
+WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
+WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
+WarningEnableYourModulesApplications=Click here to enable your modules and applications
+WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.
+WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
+WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
+WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php</b>) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe.
+WarningsOnXLines=Warnings on <b>%s</b> source record(s)
+WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
+WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable the installation/migration tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Omitting the creation of this file is a grave security risk.
+WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
+WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
+WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
+WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
+WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
+WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
+WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
+WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectClosed=Project is closed. You must re-open it first.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
diff --git a/htdocs/langs/gl_ES/exports.lang b/htdocs/langs/gl_ES/exports.lang
new file mode 100644
index 00000000000..b4c9be1a706
--- /dev/null
+++ b/htdocs/langs/gl_ES/exports.lang
@@ -0,0 +1,135 @@
+# Dolibarr language file - Source file is en_US - exports
+ExportsArea=Exportacións
+ImportArea=Import
+NewExport=New Export
+NewImport=New Import
+ExportableDatas=Exportable dataset
+ImportableDatas=Importable dataset
+SelectExportDataSet=Choose dataset you want to export...
+SelectImportDataSet=Choose dataset you want to import...
+SelectExportFields=Choose the fields you want to export, or select a predefined export profile
+SelectImportFields=Choose the source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
+NotImportedFields=Fields of source file not imported
+SaveExportModel=Save your selections as an export profile/template (for reuse).
+SaveImportModel=Save this import profile (for reuse) ...
+ExportModelName=Export profile name
+ExportModelSaved=Export profile saved as <b>%s</b>.
+ExportableFields=Exportable fields
+ExportedFields=Exported fields
+ImportModelName=Import profile name
+ImportModelSaved=Import profile saved as <b>%s</b>.
+DatasetToExport=Dataset to export
+DatasetToImport=Import file into dataset
+ChooseFieldsOrdersAndTitle=Choose fields order...
+FieldsTitle=Fields title
+FieldTitle=Field title
+NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
+AvailableFormats=Available Formats
+LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
+Step=Step
+FormatedImport=Import Assistant
+FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
+FormatedImportDesc2=First step is to choose the kind of data you want to import, then the format of the source file, then the fields you want to import.
+FormatedExport=Export Assistant
+FormatedExportDesc1=These tools allow the export of personalized data using an assistant, to help you in the process without requiring technical knowledge.
+FormatedExportDesc2=First step is to choose a predefined dataset, then which fields you want to export, and in which order.
+FormatedExportDesc3=When data to export are selected, you can choose the format of the output file.
+Sheet=Sheet
+NoImportableData=No importable data (no module with definitions to allow data imports)
+FileSuccessfullyBuilt=File generated
+SQLUsedForExport=SQL Request used to extract data
+LineId=Id of line
+LineLabel=Label of line
+LineDescription=Descrición de liña
+LineUnitPrice=Unit price of line
+LineVATRate=VAT Rate of line
+LineQty=Quantity for line
+LineTotalHT=Amount excl. tax for line
+LineTotalTTC=Amount with tax for line
+LineTotalVAT=Amount of VAT for line
+TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
+FileWithDataToImport=File with data to import
+FileToImport=Source file to import
+FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SourceFileFormat=Source file format
+FieldsInSourceFile=Fields in source file
+FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+Field=Field
+NoFields=No fields
+MoveField=Move field column number %s
+ExampleOfImportFile=Example_of_import_file
+SaveImportProfile=Save this import profile
+ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name.
+TablesTarget=Targeted tables
+FieldsTarget=Targeted fields
+FieldTarget=Targeted field
+FieldSource=Source field
+NbOfSourceLines=Number of lines in source file
+NowClickToTestTheImport=Check that the file format (field and string delimiters) of your file matches the options shown and that you have omitted the header line, or these will be flagged as errors in the following simulation.<br>Click on the "<b>%s</b>" button to run a check of the file structure/contents and simulate the import process.<br><b>No data will be changed in your database</b>.
+RunSimulateImportFile=Run Import Simulation
+FieldNeedSource=This field requires data from the source file
+SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
+InformationOnSourceFile=Information on source file
+InformationOnTargetTables=Information on target fields
+SelectAtLeastOneField=Switch at least one source field in the column of fields to export
+SelectFormat=Choose this import file format
+RunImportFile=Import Data
+NowClickToRunTheImport=Check the results of the import simulation. Correct any errors and re-test.<br>When the simulation reports no errors you may proceed to import the data into the database.
+DataLoadedWithId=The imported data will have an additional field in each database table with this import id: <b>%s</b>, to allow it to be searchable in the case of investigating a problem related to this import.
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+TooMuchErrors=There are still <b>%s</b> other source lines with errors but output has been limited.
+TooMuchWarnings=There are still <b>%s</b> other source lines with warnings but output has been limited.
+EmptyLine=Empty line (will be discarded)
+CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
+FileWasImported=File was imported with number <b>%s</b>.
+YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
+NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
+NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
+DataComeFromNoWhere=Value to insert comes from nowhere in source file.
+DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
+DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
+DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
+DataIsInsertedInto=Data coming from source file will be inserted into the following field:
+DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
+DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field:
+SourceRequired=Data value is mandatory
+SourceExample=Example of possible data value
+ExampleAnyRefFoundIntoElement=Any ref found for element <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
+CSVFormatDesc=<b>Comma Separated Value</b> file format (.csv).<br>This is a text file format where fields are separated by a separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ].
+Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is the native Excel 95 format (BIFF5).
+Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is the native Excel 2007 format (SpreadsheetML).
+TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
+ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate record (with this field added, all lines will own their own id and will differ).
+CsvOptions=CSV format options
+Separator=Field Separator
+Enclosure=String Delimiter
+SpecialCode=Special code
+ExportStringFilter=%% allows replacing one or more characters in the text
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD: filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD: filters on all previous years/months/days
+ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+ImportFromToLine=Limit range (From - To). Eg. to omit header line(s).
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines.<br>If the header lines are NOT omitted, this will result in multiple errors in the Import Simulation.
+KeepEmptyToGoToEndOfFile=Keep this field empty to process all lines to the end of the file.
+SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for an UPDATE import
+UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
+NoUpdateAttempt=No update attempt was performed, only insert
+ImportDataset_user_1=Users (employees or not) and properties
+ComputedField=Computed field
+## filters
+SelectFilterFields=If you want to filter on some values, just input values here.
+FilteredFields=Filtered fields
+FilteredFieldsValues=Value for filter
+FormatControlRule=Format control rule
+## imports updates
+KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
+NbInsert=Number of inserted lines: %s
+NbUpdate=Number of updated lines: %s
+MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
diff --git a/htdocs/langs/gl_ES/externalsite.lang b/htdocs/langs/gl_ES/externalsite.lang
new file mode 100644
index 00000000000..38e8a11823b
--- /dev/null
+++ b/htdocs/langs/gl_ES/externalsite.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExternalSiteSetup=Configuración do enlace ao sitio web externo
+ExternalSiteURL=URL do sitio web externo
+ExternalSiteModuleNotComplete=O módulo do sitio externo non foi configurado correctamente.
+ExampleMyMenuEntry=O meu menú de entrada
diff --git a/htdocs/langs/gl_ES/ftp.lang b/htdocs/langs/gl_ES/ftp.lang
new file mode 100644
index 00000000000..d80b87c2715
--- /dev/null
+++ b/htdocs/langs/gl_ES/ftp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - ftp
+FTPClientSetup=FTP Client module setup
+NewFTPClient=New FTP connection setup
+FTPArea=FTP Area
+FTPAreaDesc=This screen shows a view of an FTP server.
+SetupOfFTPClientModuleNotComplete=The setup of the FTP client module seems to be incomplete
+FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
+FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
+FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
+FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
+FTPPassiveMode=Passive mode
+ChooseAFTPEntryIntoMenu=Choose a FTP site from the menu...
+FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/gl_ES/help.lang b/htdocs/langs/gl_ES/help.lang
new file mode 100644
index 00000000000..7b6c242b896
--- /dev/null
+++ b/htdocs/langs/gl_ES/help.lang
@@ -0,0 +1,23 @@
+# Dolibarr language file - Source file is en_US - help
+CommunitySupport=Forum/Wiki support
+EMailSupport=Emails support
+RemoteControlSupport=Online real-time / remote support
+OtherSupport=Other support
+ToSeeListOfAvailableRessources=To contact/see available resources:
+HelpCenter=Help Center
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
+TypeSupportCommunauty=Community (free)
+TypeSupportCommercial=Comercial
+TypeOfHelp=Tipo
+NeedHelpCenter=Need help or support?
+Efficiency=Efficiency
+TypeHelpOnly=Help only
+TypeHelpDev=Help+Development
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
+PossibleLanguages=Supported languages
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
+SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/gl_ES/holiday.lang b/htdocs/langs/gl_ES/holiday.lang
new file mode 100644
index 00000000000..4a5eb743482
--- /dev/null
+++ b/htdocs/langs/gl_ES/holiday.lang
@@ -0,0 +1,133 @@
+# Dolibarr language file - Source file is en_US - holiday
+HRM=HRM
+Holidays=Día libre
+CPTitreMenu=Día libre
+MenuReportMonth=Estado mensual
+MenuAddCP=Nova petición de vacacións
+NotActiveModCP=Debe activar o módulo Días libres para ver esta páxina
+AddCP=Realizar unha petición de días libres
+DateDebCP=Data de inicio
+DateFinCP=Data de fin
+DraftCP=Borrador
+ToReviewCP=Agardando aprobación
+ApprovedCP=Aprobada
+CancelCP=Anulada
+RefuseCP=Rexeitada
+ValidatorCP=Validador
+ListeCP=Listaxe de días libres
+LeaveId=ID Vacacións
+ReviewedByCP=Será revisada por
+UserID=User ID
+UserForApprovalID=ID de usuario de aprobación
+UserForApprovalFirstname=Nome do usuario de aprobación
+UserForApprovalLastname=Apelido do usuario de aprobación
+UserForApprovalLogin=Inicio de sesión de usuario de aprobación
+DescCP=Descrición
+SendRequestCP=Crear a petición de días libres
+DelayToRequestCP=As peticións de días libres deben realizarse alo menos <b>%s días</b> antes.
+MenuConfCP=Balance de días libres
+SoldeCPUser=O seu saldo é de <b>%s días</b>.
+ErrorEndDateCP=Debe indicar unha data de fin maior á data de inicio.
+ErrorSQLCreateCP=Aconteceu un erro de SQL durante a creación :
+ErrorIDFicheCP=Aconteceu un erro, esta solicitude non existe.
+ReturnCP=Voltar á páxina anterior
+ErrorUserViewCP=Non está autorizado a ler esta petición de días libres.
+InfosWorkflowCP=Información do workflow
+RequestByCP=Pedido por
+TitreRequestCP=Pedido de días libres
+TypeOfLeaveId=ID tipo de días libres
+TypeOfLeaveCode=Código tipo de días libres
+TypeOfLeaveLabel=Tipo de etiqueta de días libres
+NbUseDaysCP=Número de vacacións consumidos
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
+NbUseDaysCPShort=Días consumidos
+NbUseDaysCPShortInMonth=Días consumidos en mes
+DayIsANonWorkingDay=%s is a non working day
+DateStartInMonth=Data de inicio en mes
+DateEndInMonth=Data de fin en mes
+EditCP=Editar
+DeleteCP=Eliminar
+ActionRefuseCP=Rexeitar
+ActionCancelCP=Cancelar
+StatutCP=Estado
+TitleDeleteCP=Eliminar a petición de días libres
+ConfirmDeleteCP=¿Está certo de querer eliminar esta petición de días libres?
+ErrorCantDeleteCP=Erro, non ten permisos para eliminar esta petición de días libres.
+CantCreateCP=Non ten permisos para realizar peticións de días libres.
+InvalidValidatorCP=Debe escoller un validador para a súa petición de días libres.
+NoDateDebut=Debe indicar unha data de inicio.
+NoDateFin=Debe indicar unha data de fin.
+ErrorDureeCP=A súa petición de días libres non contén ningún día hábil.
+TitleValidCP=Aprobar a petición de días libres
+ConfirmValidCP=¿Está certo de querer validar esta petición de días libres?
+DateValidCP=Data de aprobación
+TitleToValidCP=Enviar a petición de días libres
+ConfirmToValidCP=¿Está certo de querer enviar a petición de días libres?
+TitleRefuseCP=Rexeitar a petición de días libres
+ConfirmRefuseCP=¿Está certo de querer rexeitar a petición de días libres?
+NoMotifRefuseCP=Debe seleccionar un motivo para rexeitar esta petición.
+TitleCancelCP=Cancelar a petición de días libres
+ConfirmCancelCP=¿Está certo de querer anular a petición de días libres?
+DetailRefusCP=Motivo do rexeitamento
+DateRefusCP=Data do rexeitamento
+DateCancelCP=Data da cancelación
+DefineEventUserCP=Asignar excepcionalmente días libres a un usuario
+addEventToUserCP=Asignar este permiso
+NotTheAssignedApprover=Vostede non é o aprobador asignado
+MotifCP=Razón
+UserCP=Usuario
+ErrorAddEventToUserCP=Aconteceu un erro na asignación do permiso excepcional.
+AddEventToUserOkCP=Engadiuse o permiso excepcional.
+MenuLogCP=Ver rexistro de cambios
+LogCP=Historial de actualizacións de vacacións
+ActionByCP=Realizado por
+UserUpdateCP=Para o usuario
+PrevSoldeCP=Saldo anterior
+NewSoldeCP=Novo saldo
+alreadyCPexist=Xa foi efectuada unha petición de días libres para este período.
+FirstDayOfHoliday=Primeiro día de vacacións
+LastDayOfHoliday=Último día vacacións
+BoxTitleLastLeaveRequests=Últimas %s solicitudes de días libres modificadas
+HolidaysMonthlyUpdate=Actualización mensual
+ManualUpdate=Actualización manual
+HolidaysCancelation=Cancelación días libres
+EmployeeLastname=Apelidos do empregado
+EmployeeFirstname=Nome do empregado
+TypeWasDisabledOrRemoved=O tipo de día libre (id %s) foi desactivado ou eliminado
+LastHolidays=Últimas %s solicitudes de días libres
+AllHolidays=Todas as solicitudes de días libres
+HalfDay=Medio día
+NotTheAssignedApprover=Vostede non é o aprobador asignado
+LEAVE_PAID=Vacación
+LEAVE_SICK=Baixa por enfermidade
+LEAVE_OTHER=Outro motivo de día libre
+LEAVE_PAID_FR=Vacación
+## Configuration du Module ##
+LastUpdateCP=Última actualización automática de días libres
+MonthOfLastMonthlyUpdate=Mes da última actualización automática de días libres
+UpdateConfCPOK=Actualización efectuada.
+Module27130Name= Xestión dos días libres
+Module27130Desc= Xestión dos días libres
+ErrorMailNotSend=Aconteceu un erro no envío do e-mail :
+NoticePeriod=Prazo de aviso
+#Messages
+HolidaysToValidate=Días libres a validar
+HolidaysToValidateBody=A continuación atopará unha solicitude de días libres a validar
+HolidaysToValidateDelay=Esta solicitude de días libres terá lugar nun prazo de menos de %s días.
+HolidaysToValidateAlertSolde=O usuario que fixo esta solicitude de días libres non dispón de suficintes días dispoñibles.
+HolidaysValidated=Días libres validados
+HolidaysValidatedBody=A súa solicitude de días libres dende o %s ao %s foi validada.
+HolidaysRefused=Solicitude denegada
+HolidaysRefusedBody=A súa solicitude de días libres dende o %s ao %s foi denegada polo seguinte motivo :
+HolidaysCanceled=Días libres cancelados
+HolidaysCanceledBody=A súa solicitude de días libres dende o %s ao %s foi cancelada.
+FollowedByACounter=1: Este tipo de día libre precisa ser seguido por un contador. O contador incrementase manualmente ou automáticamente e cando valídase unha solicitude, o contador disminue.<br> 0: Non é seguido por un contador.
+NoLeaveWithCounterDefined=Non hai ningún tipo de peticións de días libres definida que precisen ser seguidas por un contador
+GoIntoDictionaryHolidayTypes=Vaia a <strong>Inicio - Configuración - Diccionarios - Tipos de días libres </strong> para configurar os diferentes tipos de días libres.
+HolidaySetup=Configuración do módulo Vacacións
+HolidaysNumberingModules=Modelos de numeración de petición de días libres
+TemplatePDFHolidays=Prantilla PDF para petición de días libres
+FreeLegalTextOnHolidays=Texto libre no PDF
+WatermarkOnDraftHolidayCards=Marca de auga no borrador de petición de días libres
+HolidaysToApprove=Holidays to approve
+NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
diff --git a/htdocs/langs/gl_ES/hrm.lang b/htdocs/langs/gl_ES/hrm.lang
new file mode 100644
index 00000000000..1417a11698a
--- /dev/null
+++ b/htdocs/langs/gl_ES/hrm.lang
@@ -0,0 +1,18 @@
+# Dolibarr language file - en_US - hrm
+# Admin
+HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
+Establishments=Establishments
+Establishment=Establishment
+NewEstablishment=New establishment
+DeleteEstablishment=Delete establishment
+ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
+OpenEtablishment=Open establishment
+CloseEtablishment=Close establishment
+# Dictionary
+DictionaryPublicHolidays=HRM - Public holidays
+DictionaryDepartment=HRM - Department list
+DictionaryFunction=HRM - Function list
+# Module
+Employees=Empregados
+Employee=Employee
+NewEmployee=New employee
diff --git a/htdocs/langs/gl_ES/install.lang b/htdocs/langs/gl_ES/install.lang
new file mode 100644
index 00000000000..1b822223782
--- /dev/null
+++ b/htdocs/langs/gl_ES/install.lang
@@ -0,0 +1,223 @@
+# Dolibarr language file - Source file is en_US - install
+InstallEasy=Just follow the instructions step by step.
+MiscellaneousChecks=Prerequisites check
+ConfFileExists=Configuration file <b>%s</b> exists.
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
+ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
+ConfFileReload=Reloading parameters from configuration file.
+PHPSupportSessions=This PHP supports sessions.
+PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportCalendar=This PHP supports calendars extensions.
+PHPSupportUTF8=This PHP supports UTF8 functions.
+PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupport=This PHP supports %s functions.
+PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
+ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
+ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
+ErrorDirDoesNotExists=Directory %s does not exist.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
+ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
+ErrorFailedToCreateDatabase=Failed to create database '%s'.
+ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
+ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
+ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
+ErrorDatabaseAlreadyExists=Database '%s' already exists.
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
+IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
+PHPVersion=PHP Version
+License=Using license
+ConfigurationFile=Configuration file
+WebPagesDirectory=Directory where web pages are stored
+DocumentsDirectory=Directory to store uploaded and generated documents
+URLRoot=URL Root
+ForceHttps=Force secure connections (https)
+CheckToForceHttps=Check this option to force secure connections (https).<br>This requires that the web server is configured with an SSL certificate.
+DolibarrDatabase=Dolibarr Database
+DatabaseType=Database type
+DriverType=Tipo de driver
+Server=Servidor
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
+ServerPortDescription=Database server port. Keep empty if unknown.
+DatabaseServer=Database server
+DatabaseName=Nome da base de datos
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
+AdminPassword=Password for Dolibarr database owner.
+CreateDatabase=Create database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
+DatabaseSuperUserAccess=Database server - Superuser access
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
+ServerConnection=Server connection
+DatabaseCreation=Database creation
+CreateDatabaseObjects=Database objects creation
+ReferenceDataLoading=Reference data loading
+TablesAndPrimaryKeysCreation=Tables and Primary keys creation
+CreateTableAndPrimaryKey=Create table %s
+CreateOtherKeysForTable=Create foreign keys and indexes for table %s
+OtherKeysCreation=Foreign keys and indexes creation
+FunctionsCreation=Functions creation
+AdminAccountCreation=Administrator login creation
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
+SetupEnd=End of setup
+SystemIsInstalled=This installation is complete.
+SystemIsUpgraded=Dolibarr has been upgraded successfully.
+YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below:
+AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
+GoToDolibarr=Go to Dolibarr
+GoToSetupArea=Go to Dolibarr (setup area)
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
+GoToUpgradePage=Go to upgrade page again
+WithNoSlashAtTheEnd=Without the slash "/" at the end
+DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
+LoginAlreadyExists=Already exists
+DolibarrAdminLogin=Dolibarr admin login
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
+FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
+ChoosedMigrateScript=Choose migration script
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
+ProcessMigrateScript=Script processing
+ChooseYourSetupMode=Choose your setup mode and click "Start"...
+FreshInstall=Fresh install
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
+Upgrade=Actualización
+UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
+Start=Start
+InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
+YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
+AlreadyDone=Already migrated
+DatabaseVersion=Database version
+ServerVersion=Database server version
+YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
+DBSortingCollation=Character sorting order
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
+OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
+RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
+FieldRenamed=Field renamed
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
+InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
+InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
+IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
+OpenBaseDir=PHP openbasedir parameter
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
+MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
+MigrationShippingDelivery=Upgrade storage of shipping
+MigrationShippingDelivery2=Upgrade storage of shipping 2
+MigrationFinished=Migration finished
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
+ActivateModule=Activate module %s
+ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
+SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
+NothingToDelete=Nothing to clean/delete
+NothingToDo=Nothing to do
+#########
+# upgrade
+MigrationFixData=Fix for denormalized data
+MigrationOrder=Data migration for customer's orders
+MigrationSupplierOrder=Data migration for vendor's orders
+MigrationProposal=Data migration for commercial proposals
+MigrationInvoice=Data migration for customer's invoices
+MigrationContract=Data migration for contracts
+MigrationSuccessfullUpdate=Upgrade successful
+MigrationUpdateFailed=Failed upgrade process
+MigrationRelationshipTables=Data migration for relationship tables (%s)
+MigrationPaymentsUpdate=Payment data correction
+MigrationPaymentsNumberToUpdate=%s payment(s) to update
+MigrationProcessPaymentUpdate=Update payment(s) %s
+MigrationPaymentsNothingToUpdate=No more things to do
+MigrationPaymentsNothingUpdatable=No more payments that can be corrected
+MigrationContractsUpdate=Contract data correction
+MigrationContractsNumberToUpdate=%s contract(s) to update
+MigrationContractsLineCreation=Create contract line for contract ref %s
+MigrationContractsNothingToUpdate=No more things to do
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
+MigrationContractsEmptyDatesUpdate=Contract empty date correction
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
+MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
+MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
+MigrationContractsInvalidDatesUpdate=Bad value date contract correction
+MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s)
+MigrationContractsInvalidDatesNumber=%s contracts modified
+MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct
+MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction
+MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
+MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct
+MigrationReopeningContracts=Open contract closed by error
+MigrationReopenThisContract=Reopen contract %s
+MigrationReopenedContractsNumber=%s contracts modified
+MigrationReopeningContractsNothingToUpdate=No closed contract to open
+MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
+MigrationBankTransfertsNothingToUpdate=All links are up to date
+MigrationShipmentOrderMatching=Sendings receipt update
+MigrationDeliveryOrderMatching=Delivery receipt update
+MigrationDeliveryDetail=Delivery update
+MigrationStockDetail=Update stock value of products
+MigrationMenusDetail=Update dynamic menus tables
+MigrationDeliveryAddress=Update delivery address in shipments
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
+MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
+MigrationProjectTaskTime=Update time spent in seconds
+MigrationActioncommElement=Update data on actions
+MigrationPaymentMode=Data migration for payment type
+MigrationCategorieAssociation=Migration of categories
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
+MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
+MigrationReloadModule=Reload module %s
+MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
+ClickHereToGoToApp=Click here to go to your application
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/gl_ES/interventions.lang b/htdocs/langs/gl_ES/interventions.lang
new file mode 100644
index 00000000000..8896e77e348
--- /dev/null
+++ b/htdocs/langs/gl_ES/interventions.lang
@@ -0,0 +1,66 @@
+# Dolibarr language file - Source file is en_US - interventions
+Intervention=Intervention
+Interventions=Intervencións
+InterventionCard=Intervention card
+NewIntervention=New intervention
+AddIntervention=Create intervention
+ChangeIntoRepeatableIntervention=Change to repeatable intervention
+ListOfInterventions=List of interventions
+ActionsOnFicheInter=Actions on intervention
+LastInterventions=Latest %s interventions
+AllInterventions=All interventions
+CreateDraftIntervention=Crear borrador
+InterventionContact=Intervention contact
+DeleteIntervention=Delete intervention
+ValidateIntervention=Validate intervention
+ModifyIntervention=Modify intervention
+DeleteInterventionLine=Delete intervention line
+ConfirmDeleteIntervention=Are you sure you want to delete this intervention?
+ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
+ConfirmModifyIntervention=Are you sure you want to modify this intervention?
+ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line?
+ConfirmCloneIntervention=Are you sure you want to clone this intervention?
+NameAndSignatureOfInternalContact=Name and signature of intervening:
+NameAndSignatureOfExternalContact=Name and signature of customer:
+DocumentModelStandard=Standard document model for interventions
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
+InterventionClassifyDone=Classify "Done"
+StatusInterInvoiced=Facturado
+SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervención %s enviada por e-mail
+InterventionDeletedInDolibarr=Intervention %s deleted
+InterventionsArea=Interventions area
+DraftFichinter=Draft interventions
+LastModifiedInterventions=Últimas %s intervencións modificadas
+FichinterToProcess=Interventions to process
+TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
+PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
+PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
+UseDurationOnFichinter=Hides the duration field for intervention records
+UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records
+InterventionStatistics=Statistics of interventions
+NbOfinterventions=No. of intervention cards
+NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
+InterId=Intervention id
+InterRef=Intervention ref.
+InterDateCreation=Date creation intervention
+InterDuration=Duration intervention
+InterStatus=Status intervention
+InterNote=Note intervention
+InterLine=Line of intervention
+InterLineId=Line id intervention
+InterLineDate=Line date intervention
+InterLineDuration=Line duration intervention
+InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/gl_ES/languages.lang b/htdocs/langs/gl_ES/languages.lang
new file mode 100644
index 00000000000..2bee3acad18
--- /dev/null
+++ b/htdocs/langs/gl_ES/languages.lang
@@ -0,0 +1,89 @@
+# Dolibarr language file - Source file is en_US - languages
+Language_ar_AR=Árabe
+Language_ar_EG=Arabic (Egypt)
+Language_ar_SA=Árabe
+Language_bn_BD=Bengali
+Language_bg_BG=Búlgaro
+Language_bs_BA=Bosnio
+Language_ca_ES=Catalán
+Language_cs_CZ=Checo
+Language_da_DA=Danés
+Language_da_DK=Danés
+Language_de_DE=Alemán
+Language_de_AT=Alemán (Austria)
+Language_de_CH=German (Switzerland)
+Language_el_GR=Grego
+Language_el_CY=Greek (Cyprus)
+Language_en_AU=Inglés (Australia)
+Language_en_CA=English (Canada)
+Language_en_GB=Inglés (Reino Unido)
+Language_en_IN=Inglés (India)
+Language_en_NZ=Inglés (Nova Celandia)
+Language_en_SA=Inglés (Arabia Saudita)
+Language_en_US=Inglés (Estados Unidos)
+Language_en_ZA=Inglés (Sudáfrica)
+Language_es_ES=Español
+Language_es_AR=Español (Arxentina)
+Language_es_BO=Spanish (Bolivia)
+Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
+Language_es_EC=Spanish (Ecuador)
+Language_es_HN=Español (Honduras)
+Language_es_MX=Español (México)
+Language_es_PA=Spanish (Panama)
+Language_es_PY=Español (Paraguay)
+Language_es_PE=Español (Perú)
+Language_es_PR=Español (Porto Rico)
+Language_es_UY=Spanish (Uruguay)
+Language_es_VE=Spanish (Venezuela)
+Language_et_EE=Estoniano
+Language_eu_ES=Éuscaro
+Language_fa_IR=Persa
+Language_fi_FI=Finnish
+Language_fr_BE=Francés (Bélxica)
+Language_fr_CA=Francés (Canadá)
+Language_fr_CH=Francés (Suíza)
+Language_fr_FR=Francés
+Language_fr_NC=Francés (Nova Caledonia)
+Language_fy_NL=Frisian
+Language_he_IL=Hebreo
+Language_hr_HR=Croata
+Language_hu_HU=Húngaro
+Language_id_ID=Indonesian
+Language_is_IS=Islandés
+Language_it_IT=Italiano
+Language_ja_JP=Xaponés
+Language_ka_GE=Georgian
+Language_km_KH=Khmer
+Language_kn_IN=Kannada
+Language_ko_KR=Coreano
+Language_lo_LA=Lao
+Language_lt_LT=Lituano
+Language_lv_LV=Letón
+Language_mk_MK=Macedonio
+Language_mn_MN=Mongolian
+Language_nb_NO=Noruegués (Bokmål)
+Language_nl_BE=Holandés (Bélxica)
+Language_nl_NL=Dutch
+Language_pl_PL=Polaco
+Language_pt_BR=Portugués (Brasil)
+Language_pt_PT=Portugués
+Language_ro_RO=Romanés
+Language_ru_RU=Ruso
+Language_ru_UA=Ruso (Ucraína)
+Language_tr_TR=Turco
+Language_sl_SI=Esloveno
+Language_sv_SV=Sueco
+Language_sv_SE=Sueco
+Language_sq_AL=Albanian
+Language_sk_SK=Eslovaco
+Language_sr_RS=Serbian
+Language_sw_SW=Kiswahili
+Language_th_TH=Thai
+Language_uk_UA=Ucraíno
+Language_uz_UZ=Usbeco
+Language_vi_VN=Vietnamita
+Language_zh_CN=Chinés
+Language_zh_TW=Chinés (tradicional)
+Language_bh_MY=Malay
diff --git a/htdocs/langs/gl_ES/ldap.lang b/htdocs/langs/gl_ES/ldap.lang
new file mode 100644
index 00000000000..2afb9618134
--- /dev/null
+++ b/htdocs/langs/gl_ES/ldap.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - ldap
+YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
+UserMustChangePassNextLogon=User must change password on the domain %s
+LDAPInformationsForThisContact=Information in LDAP database for this contact
+LDAPInformationsForThisUser=Information in LDAP database for this user
+LDAPInformationsForThisGroup=Information in LDAP database for this group
+LDAPInformationsForThisMember=Information in LDAP database for this member
+LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPAttributes=LDAP attributes
+LDAPCard=LDAP card
+LDAPRecordNotFound=Record not found in LDAP database
+LDAPUsers=Users in LDAP database
+LDAPFieldStatus=Estado
+LDAPFieldFirstSubscriptionDate=First subscription date
+LDAPFieldFirstSubscriptionAmount=First subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example: skypeName
+UserSynchronized=User synchronized
+GroupSynchronized=Group synchronized
+MemberSynchronized=Member synchronized
+MemberTypeSynchronized=Member type synchronized
+ContactSynchronized=Contact synchronized
+ForceSynchronize=Force synchronizing Dolibarr -> LDAP
+ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/gl_ES/link.lang b/htdocs/langs/gl_ES/link.lang
new file mode 100644
index 00000000000..1ffcd41a18b
--- /dev/null
+++ b/htdocs/langs/gl_ES/link.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - languages
+LinkANewFile=Link a new file/document
+LinkedFiles=Linked files and documents
+NoLinkFound=No registered links
+LinkComplete=The file has been linked successfully
+ErrorFileNotLinked=The file could not be linked
+LinkRemoved=The link %s has been removed
+ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
+ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+URLToLink=URL to link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/gl_ES/loan.lang b/htdocs/langs/gl_ES/loan.lang
new file mode 100644
index 00000000000..d260f06419e
--- /dev/null
+++ b/htdocs/langs/gl_ES/loan.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Crédito
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+LoanPayment=Loan payment
+ShowLoanPayment=Show Loan Payment
+LoanCapital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+Term=Term
+LoanAccountancyCapitalCode=Accounting account capital
+LoanAccountancyInsuranceCode=Accounting account insurance
+LoanAccountancyInterestCode=Accounting account interest
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ListLoanAssociatedProject=List of loan associated with the project
+AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
+CreateCalcSchedule=Edit financial commitment
diff --git a/htdocs/langs/gl_ES/mailmanspip.lang b/htdocs/langs/gl_ES/mailmanspip.lang
new file mode 100644
index 00000000000..bab4b3576b4
--- /dev/null
+++ b/htdocs/langs/gl_ES/mailmanspip.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - mailmanspip
+MailmanSpipSetup=Mailman and SPIP module Setup
+MailmanTitle=Mailman mailing list system
+TestSubscribe=To test subscription to Mailman lists
+TestUnSubscribe=To test unsubscribe from Mailman lists
+MailmanCreationSuccess=Subscription test was executed successfully
+MailmanDeletionSuccess=Unsubscription test was executed successfully
+SynchroMailManEnabled=A Mailman update will be performed
+SynchroSpipEnabled=A Spip update will be performed
+DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
+DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
+DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
+DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
+SPIPTitle=SPIP Content Management System
+DescADHERENT_SPIP_SERVEUR=SPIP Server
+DescADHERENT_SPIP_DB=SPIP database name
+DescADHERENT_SPIP_USER=SPIP database login
+DescADHERENT_SPIP_PASS=SPIP database password
+AddIntoSpip=Add into SPIP
+AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
+AddIntoSpipError=Failed to add the user in SPIP
+DeleteIntoSpip=Remove from SPIP
+DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
+DeleteIntoSpipError=Failed to suppress the user from SPIP
+SPIPConnectionFailed=Failed to connect to SPIP
+SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
+SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
diff --git a/htdocs/langs/gl_ES/mails.lang b/htdocs/langs/gl_ES/mails.lang
new file mode 100644
index 00000000000..d05826326fc
--- /dev/null
+++ b/htdocs/langs/gl_ES/mails.lang
@@ -0,0 +1,170 @@
+# Dolibarr language file - Source file is en_US - mails
+Mailing=EMailing
+EMailing=EMailing
+EMailings=EMailings
+AllEMailings=All eMailings
+MailCard=EMailing card
+MailRecipients=Recipients
+MailRecipient=Recipient
+MailTitle=Descrición
+MailFrom=Remitente
+MailErrorsTo=Errors to
+MailReply=Reply to
+MailTo=Receiver(s)
+MailToUsers=To user(s)
+MailCC=Copy to
+MailToCCUsers=Copy to users(s)
+MailCCC=Cached copy to
+MailTopic=Email topic
+MailText=Mensaxe
+MailFile=Attached files
+MailMessage=Texto no corpo da mensaxe
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
+ShowEMailing=Show emailing
+ListOfEMailings=List of emailings
+NewMailing=New emailing
+EditMailing=Edit emailing
+ResetMailing=Resend emailing
+DeleteMailing=Delete emailing
+DeleteAMailing=Delete an emailing
+PreviewMailing=Preview emailing
+CreateMailing=Create emailing
+TestMailing=Test email
+ValidMailing=Valid emailing
+MailingStatusDraft=Borrador
+MailingStatusValidated=Validado
+MailingStatusSent=Enviado
+MailingStatusSentPartialy=Enviado parcialmente
+MailingStatusSentCompletely=Envío completado
+MailingStatusError=Erro
+MailingStatusNotSent=Non enviado
+MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
+MailingSuccessfullyValidated=EMailing successfully validated
+MailUnsubcribe=Unsubscribe
+MailingStatusNotContact=Don't contact anymore
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
+ErrorMailRecipientIsEmpty=Email recipient is empty
+WarningNoEMailsAdded=No new Email to add to recipient's list.
+ConfirmValidMailing=Are you sure you want to validate this emailing?
+ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
+ConfirmDeleteMailing=Are you sure you want to delete this emailing?
+NbOfUniqueEMails=No. of unique emails
+NbOfEMails=No. of EMails
+TotalNbOfDistinctRecipients=Number of distinct recipients
+NoTargetYet=No recipients defined yet (Go on tab 'Recipients')
+NoRecipientEmail=No recipient email for %s
+RemoveRecipient=Remove recipient
+YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README.
+EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values
+MailingAddFile=Attach this file
+NoAttachedFiles=No attached files
+BadEMail=Bad value for Email
+ConfirmCloneEMailing=Are you sure you want to clone this emailing?
+CloneContent=Clone message
+CloneReceivers=Cloner recipients
+DateLastSend=Date of latest sending
+DateSending=Date sending
+SentTo=Sent to <b>%s</b>
+MailingStatusRead=Read
+YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubscribe from mailing list
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubscribe" feature
+EMailSentToNRecipients=Email sent to %s recipients.
+EMailSentForNElements=Email sent for %s elements.
+XTargetsAdded=<b>%s</b> recipients added into target list
+OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachments in mass sending in this version).
+AllRecipientSelected=The recipients of the %s record selected (if their email is known).
+GroupEmails=Group emails
+OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
+WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
+ResultOfMailSending=Result of mass Email sending
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
+SentXXXmessages=%s message(s) sent.
+ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
+MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
+MailingModuleDescContactsByCompanyCategory=Contacts by third-party category
+MailingModuleDescContactsByCategory=Contacts by categories
+MailingModuleDescContactsByFunction=Contacts by position
+MailingModuleDescEmailsFromFile=Emails from file
+MailingModuleDescEmailsFromUser=Emails input by user
+MailingModuleDescDolibarrUsers=Users with Emails
+MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+
+# Libelle des modules de liste de destinataires mailing
+LineInFile=Line %s in file
+RecipientSelectionModules=Defined requests for recipient's selection
+MailSelectedRecipients=Selected recipients
+MailingArea=EMailings area
+LastMailings=Latest %s emailings
+TargetsStatistics=Targets statistics
+NbOfCompaniesContacts=Unique contacts/addresses
+MailNoChangePossible=Recipients for validated emailing can't be changed
+SearchAMailing=Search mailing
+SendMailing=Send emailing
+SentBy=Sent by
+MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
+MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
+ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+TargetsReset=Clear list
+ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
+ToAddRecipientsChooseHere=Add recipients by choosing from the lists
+NbOfEMailingsReceived=Mass emailings received
+NbOfEMailingsSend=Mass emailings sent
+IdRecord=ID record
+DeliveryReceipt=Delivery Ack.
+YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
+TagCheckMail=Track mail opening
+TagUnsubscribe=Unsubscribe link
+TagSignature=Signature of sending user
+EMailRecipient=Recipient Email
+TagMailtoEmail=Recipient Email (including html "mailto:" link)
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
+# Module Notifications
+Notifications=Notificacións
+NoNotificationsWillBeSent=No email notifications are planned for this event and company
+ANotificationsWillBeSent=1 notification will be sent by email
+SomeNotificationsWillBeSent=%s notifications will be sent by email
+AddNewNotification=Activate a new email notification target/event
+ListOfActiveNotifications=List all active targets/events for email notification
+ListOfNotificationsDone=List all email notifications sent
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
+UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
+UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
+MailAdvTargetRecipients=Recipients (advanced selection)
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchIntHelp=Use interval to select int or float value
+AdvTgtMinVal=Minimum value
+AdvTgtMaxVal=Maximum value
+AdvTgtSearchDtHelp=Use interval to select date value
+AdvTgtStartDt=Start dt.
+AdvTgtEndDt=End dt.
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third-party email or just contact email
+AdvTgtTypeOfIncude=Type of targeted email
+AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
+AddAll=Add all
+RemoveAll=Remove all
+ItemsCount=Item(s)
+AdvTgtNameTemplate=Filter name
+AdvTgtAddContact=Add emails according to criteria
+AdvTgtLoadFilter=Load filter
+AdvTgtDeleteFilter=Delete filter
+AdvTgtSaveFilter=Save filter
+AdvTgtCreateFilter=Create filter
+AdvTgtOrCreateNewFilter=Name of new filter
+NoContactWithCategoryFound=No contact/address with a category found
+NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+DefaultOutgoingEmailSetup=Default outgoing email setup
+Information=Información
+ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/gl_ES/main.lang b/htdocs/langs/gl_ES/main.lang
new file mode 100644
index 00000000000..1370106591b
--- /dev/null
+++ b/htdocs/langs/gl_ES/main.lang
@@ -0,0 +1,1035 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+# Note for Chinese:
+# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
+# stsongstdlight or cid0cs are for simplified Chinese
+# To read Chinese pdf with Linux: sudo apt-get install poppler-data
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=,
+SeparatorThousand=.
+FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
+FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%H:%M
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
+DatabaseConnection=Conexión á base de datos
+NoTemplateDefined=Sen prantilla dispoñible para este tipo de e-mail
+AvailableVariables=Variables de substitución dispoñibles
+NoTranslation=Sen tradución
+Translation=Tradución
+EmptySearchString=Enter a non empty search string
+NoRecordFound=Non atopáronse rexistros
+NoRecordDeleted=Non foi eliminado o rexistro
+NotEnoughDataYet=Non hai suficintes datos
+NoError=Ningún erro
+Error=Erro
+Errors=Errores
+ErrorFieldRequired=O campo '%s' é obrigatorio
+ErrorFieldFormat=O campo '%s' ten un valor incorrecto
+ErrorFileDoesNotExists=O arquivo %s non existe
+ErrorFailedToOpenFile=Fallou ao abrir o arquivo %s
+ErrorCanNotCreateDir=Non pode crear o directorio %s
+ErrorCanNotReadDir=Non pode ler o directorio %s
+ErrorConstantNotDefined=Parámetro %s non definido
+ErrorUnknown=Erro descoñecido
+ErrorSQL=Erro de SQL
+ErrorLogoFileNotFound=O arquivo do logo '%s' non atópase
+ErrorGoToGlobalSetup=Vaia á configuración 'Empresa/Organización' para corrixir isto
+ErrorGoToModuleSetup=Vaia á configuración do módulo para corrixir isto
+ErrorFailedToSendMail=Erro no envío do e-mail (emisor=%s, destinatario=%s)
+ErrorFileNotUploaded=Non foi posible actualizar o arquivo. Revisa que o tamaño non excede o máximo permitido, que hai espazo libre no disco e que non hai xa un arquivo co mesmo nome no directorio.
+ErrorInternalErrorDetected=Erro detectado
+ErrorWrongHostParameter=Parámetro do servidor erroneo
+ErrorYourCountryIsNotDefined=O seu país non está definido. Vaia ao Inicio-Configuración-Edición e cubra novamente o formulario
+ErrorRecordIsUsedByChild=Fallo ao suprimir este rexistro. O rexistro está a ser utilizado como pai de alo menos un rexistro fillo.
+ErrorWrongValue=Valor incorrecto
+ErrorWrongValueForParameterX=Valor incorrecto do parámetro %s
+ErrorNoRequestInError=Ningunha petición con erro
+ErrorServiceUnavailableTryLater=Service not available at the moment. Try again later.
+ErrorDuplicateField=Duplicate value in a unique field
+ErrorSomeErrorWereFoundRollbackIsDone=Atopáronse algúns erros. Modificacións desfeitas.
+ErrorConfigParameterNotDefined=O parámetro <b>%s</b> no está definido no   arquivo de configuración Dolibarr <b>conf.php</b>.
+ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
+ErrorNoVATRateDefinedForSellerCountry=Error, ningún tipo de IVE definido para o país '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
+ErrorFailedToSaveFile=Error, failed to save file.
+ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
+MaxNbOfRecordPerPage=Número máximo de rexistros por páxina
+NotAuthorized=Non estás autorizado para facer isto.
+SetDate=Fixar data
+SelectDate=Seleccione unha data
+SeeAlso=Vexa tamén %s
+SeeHere=Vexa aquí
+ClickHere=Faga clic aquí
+Here=Aquí
+Apply=Aplicar
+BackgroundColorByDefault=Cor de fondo por defecto
+FileRenamed=O arquivo foi renomeado correctamente
+FileGenerated=O arquivo fo xerado correctamente
+FileSaved=O arquivo foi gardado correctamente
+FileUploaded=O arquivo subiuse correctamente
+FileTransferComplete=Arquivo(s) subidos(s) correctamente
+FilesDeleted=Arquivos(s) eliminados correctamente
+FileWasNotUploaded=Un arquivo foi seleccionado para xuntalo, pero ainda non foi subido. Faga clic en "Xuntar este arquivo" para subilo.
+NbOfEntries=Nº de entradas
+GoToWikiHelpPage=Ler a axuda en liña (é preciso acceso a Internet )
+GoToHelpPage=Ler a axuda
+RecordSaved=Rexistro gardado
+RecordDeleted=Rexistro eliminado
+RecordGenerated=Record generated
+LevelOfFeature=Nivel de funcións
+NotDefined=Non definido
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
+Administrator=Administrador
+Undefined=Non definido
+PasswordForgotten=¿Esqueceu a súa contrasinal?
+NoAccount=¿Sen conta?
+SeeAbove=Mencionado anteriormente
+HomeArea=Inicio
+LastConnexion=Última conexión
+PreviousConnexion=Conexión anterior
+PreviousValue=Valor previo
+ConnectedOnMultiCompany=Conexión á entidade
+ConnectedSince=Conectado dende
+AuthenticationMode=Modo de autentificación
+RequestedUrl=URL solicitada
+DatabaseTypeManager=Tipo de xestor de base de datos
+RequestLastAccessInError=Último acceso á base de datos con erro na solicitude
+ReturnCodeLastAccessInError=Código de retorno de acceso á base de datos con erro para a última petición
+InformationLastAccessInError=Información do último erro de petición de acceso de base de datos
+DolibarrHasDetectedError=Dolibarr detectou un erro técnico
+YouCanSetOptionDolibarrMainProdToZero=Pode ler o arquivo log ou establecer a opción $dolibarr_main_prod a '0' no seu arquivo de configuración para obter mais información.
+InformationToHelpDiagnose=Esta información pode ser útil para propstas de diagnóstico (pode configurar a opción $dolibarr_main_prod to '1' para eliminar as notificacións)
+MoreInformation=Mais información
+TechnicalInformation=Información técnica
+TechnicalID=ID Técnica
+LineID=Line ID
+NotePublic=Nota (pública)
+NotePrivate=Nota (privada)
+PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
+DoTest=Probar
+ToFilter=Filtrar
+NoFilter=Sen filtro
+WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
+yes=sí
+Yes=Sí
+no=non
+No=Non
+All=Todo
+Home=Inicio
+Help=Axuda
+OnlineHelp=Axuda en liña
+PageWiki=Páxina Wiki
+MediaBrowser=Navegador de medios
+Always=Sempre
+Never=Nunca
+Under=baixo
+Period=Período
+PeriodEndDate=Data fin do período
+SelectedPeriod=Período seleccionado
+PreviousPeriod=Período anterior
+Activate=Activar
+Activated=Activado
+Closed=Pechada
+Closed2=Pechada
+NotClosed=Non pechado
+Enabled=Activado
+Enable=Activo
+Deprecated=Obsoleto
+Disable=Desactivar
+Disabled=Desactivado
+Add=Engadir
+AddLink=Víncular
+RemoveLink=Eliminar vínculo
+AddToDraft=Engadir a borrador
+Update=Actualizar
+Close=Pechar
+CloseBox=Eliminar panel do seu taboleiro
+Confirm=Confirmar
+ConfirmSendCardByMail=¿Realmente quere enviar o contido desta ficha por correo a <b>%s</b>?
+Delete=Eliminar
+Remove=Retirar
+Resiliate=Terminar
+Cancel=Cancelar
+Modify=Modificar
+Edit=Editar
+Validate=Validar
+ValidateAndApprove=Validar e Aprobar
+ToValidate=A validar
+NotValidated=Non validado
+Save=Gardar
+SaveAs=Gardar como
+SaveAndStay=Save and stay
+SaveAndNew=Save and new
+TestConnection=Probar a conexión
+ToClone=Copiar
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
+ConfirmClone=Escolla os datos que desexa copiar:
+NoCloneOptionsSpecified=Non hai datos definidos para copiar
+Of=de
+Go=Ir
+Run=Lanzar
+CopyOf=Copia de
+Show=Ver
+Hide=Oculto
+ShowCardHere=Ver a ficha
+Search=Procurar
+SearchOf=Procura
+SearchMenuShortCut=Ctrl + shift + f
+Valid=Validar
+Approve=Aprobar
+Disapprove=Desaprobar
+ReOpen=Reabrir
+Upload=Actualizar arquivo
+ToLink=Vínculo
+Select=Seleccionar
+Choose=Escoller
+Resize=Redimensionar
+ResizeOrCrop=Cambiar o tamaño ou cortar
+Recenter=Encadrar
+Author=Autor
+User=Usuario
+Users=Usuarios
+Group=Grupo
+Groups=Grupos
+NoUserGroupDefined=Non hai definido grupo de usuarios
+Password=Contrasinal
+PasswordRetype=Repetir o teu contrasinal
+NoteSomeFeaturesAreDisabled=Ten conta que moitos módulos/funcionalidades foron desactivados nesta demo.
+Name=Nome
+NameSlashCompany=Name / Company
+Person=Persoa
+Parameter=Parámetro
+Parameters=Parámetros
+Value=Valor
+PersonalValue=Valor persoalizado
+NewObject=Novo %s
+NewValue=Novo valor
+CurrentValue=Valor actual
+Code=Código
+Type=Tipo
+Language=Idioma
+MultiLanguage=Multiidioma
+Note=Nota
+Title=Título
+Label=Etiqueta
+RefOrLabel=Ref. ou etiqueta
+Info=Log
+Family=Familia
+Description=Descrición
+Designation=Descrición
+DescriptionOfLine=Descrición de liña
+DateOfLine=Data da liña
+DurationOfLine=Permanecia da liña
+Model=Prantilla documento
+DefaultModel=Prantilla por defecto do documento
+Action=Acción
+About=Acerca de
+Number=Número
+NumberByMonth=Número por mes
+AmountByMonth=Importe por mes
+Numero=Número
+Limit=Límite
+Limits=Límites
+Logout=Desconectar
+NoLogoutProcessWithAuthMode=Sen funcionalidades de desconexión co modo de autenticación <b>%s</b>
+Connection=Usuario
+Setup=Config.
+Alert=Alerta
+MenuWarnings=Alertas
+Previous=Anterior
+Next=Seguinte
+Cards=Fichas
+Card=Ficha
+Now=Agora
+HourStart=Hora de inicio
+Date=Data
+DateAndHour=Data e hora
+DateToday=Data de hoxe
+DateReference=Data de referencia
+DateStart=Data de inicio
+DateEnd=Data de fin
+DateCreation=Data de creación
+DateCreationShort=Data creac.
+DateModification=Data de modificación
+DateModificationShort=Data modif.
+DateLastModification=Última data de modificación
+DateValidation=Data de validación
+DateClosing=Data de peche
+DateDue=Data de vencemento
+DateValue=Data do valor
+DateValueShort=Data do valor
+DateOperation=Data da operación
+DateOperationShort=Data oper.
+DateLimit=Data límite
+DateRequest=Data da consulta
+DateProcess=Data do proceso
+DateBuild=Data xeración do informe
+DatePayment=Data de pago
+DateApprove=Data de aprobación
+DateApprove2=Data de aprobación (segunda aprobación)
+RegistrationDate=Data de rexistro
+UserCreation=Usuario creador
+UserModification=Usuario da modificación
+UserValidation=Usuario da validación
+UserCreationShort=Usuario Crea.
+UserModificationShort=Usuario Modif.
+UserValidationShort=Usuario valid.
+DurationYear=ano
+DurationMonth=mes
+DurationWeek=semana
+DurationDay=día
+DurationYears=anos
+DurationMonths=meses
+DurationWeeks=semanas
+DurationDays=días
+Year=Ano
+Month=Mes
+Week=Semana
+WeekShort=Semana
+Day=Día
+Hour=Hora
+Minute=Minuto
+Second=Segundo
+Years=Anos
+Months=Meses
+Days=Días
+days=días
+Hours=Horas
+Minutes=Minutos
+Seconds=Segundos
+Weeks=Semanas
+Today=Hoxe
+Yesterday=Onte
+Tomorrow=Mañá
+Morning=Na mañá
+Afternoon=Na tarde
+Quadri=Trimestre
+MonthOfDay=Mes do día
+HourShort=H
+MinuteShort=min
+Rate=Tipo
+CurrencyRate=Taxa de conversión de moeda
+UseLocalTax=Incluir taxas
+Bytes=Bytes
+KiloBytes=Kilobytes
+MegaBytes=Megabytes
+GigaBytes=Gigabytes
+TeraBytes=Terabytes
+UserAuthor=Usuario da creación
+UserModif=Usuario da última actualización
+b=b.
+Kb=Kb
+Mb=Mb
+Gb=Gb
+Tb=Tb
+Cut=Cortar
+Copy=Copiar
+Paste=Pegar
+Default=Por defecto
+DefaultValue=Valor por defecto
+DefaultValues=Valores/filtros/ordenacións por defecto
+Price=Prezo
+PriceCurrency=Prezo (moeda)
+UnitPrice=Prezo unitario
+UnitPriceHT=Prezo base
+UnitPriceHTCurrency=Prezo unitario (sen impostos) (moeda)
+UnitPriceTTC=Prezo unitario
+PriceU=P.U.
+PriceUHT=P.U. (rede)
+PriceUHTCurrency=P.U. (divisa)
+PriceUTTC=P.U. (i.i.)
+Amount=Importe
+AmountInvoice=Importe factura
+AmountInvoiced=Importe facturado
+AmountInvoicedHT=Amount invoiced (incl. tax)
+AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountPayment=Importe pago
+AmountHTShort=Base imp. (e.i.)
+AmountTTCShort=Importe (i.i.)
+AmountHT=Base impoñible (e.i.)
+AmountTTC=Importe total (i.i.)
+AmountVAT=Importe IVE
+MulticurrencyAlreadyPaid=Xa pago na divisa orixinal
+MulticurrencyRemainderToPay=Pendente de pago na divisa orixinal
+MulticurrencyPaymentAmount=Importe total na divisa orixinal
+MulticurrencyAmountHT=Base impoñible na divisa orixinal (e.i.)
+MulticurrencyAmountTTC=Total na divisa orixinal (i.i.)
+MulticurrencyAmountVAT=Importe IVE na divisa orixinal
+AmountLT1=Importe Imposto 2
+AmountLT2=Importe Imposto 3
+AmountLT1ES=Importe RE
+AmountLT2ES=Importe IRPF
+AmountTotal=Importe total
+AmountAverage=Importe medio
+PriceQtyMinHT=Prezo cantidade min. (e.i.)
+PriceQtyMinHTCurrency=Prezo cantidade min. (e.i.) (moeda)
+Percentage=Porcentaxe
+Total=Total
+SubTotal=Subtotal
+TotalHTShort=Importe (e.i.)
+TotalHT100Short=Total 100%% (excl.)
+TotalHTShortCurrency=Total (divisa)
+TotalTTCShort=Total
+TotalHT=Base impoñible
+TotalHTforthispage=Total (base impoñible) nesta páxina
+Totalforthispage=Total nesta páxina
+TotalTTC=Total
+TotalTTCToYourCredit=Total a crédito
+TotalVAT=Total IVE
+TotalVATIN=IGST total
+TotalLT1=Total Imposto 2
+TotalLT2=Total Imposto 3
+TotalLT1ES=Total RE
+TotalLT2ES=Total IRPF
+TotalLT1IN=Total CGST
+TotalLT2IN=SGST total
+HT=Sen IVE
+TTC=IVE incluido
+INCVATONLY=I.V.E. inc.
+INCT=Inc. todas as taxas
+VAT=IVE
+VATIN=IGST
+VATs=Tasas sobre vendas
+VATINs=Impostos IGST
+LT1=Vendas imposto RE
+LT1Type=Tipo de imposto RE ás vendas
+LT2=Vendas imposto IRPF
+LT2Type=Imposto IRPF nas vendas
+LT1ES=RE
+LT2ES=IRPF
+LT1IN=CGST
+LT2IN=SGST
+LT1GC=Additionnal cents
+VATRate=Taxa IVE
+VATCode=Código taxa IVE
+VATNPR=Taxa NPR
+DefaultTaxRate=Taxa de imposto por defecto
+Average=Media
+Sum=Suma
+Delta=Diferencia
+StatusToPay=To pay
+RemainToPay=Resta por pagar
+Module=Módulo/Aplicación
+Modules=Módulos/Aplicacións
+Option=Opción
+List=Listaxe
+FullList=Listaxe completo
+FullConversation=Full conversation
+Statistics=Estatísticas
+OtherStatistics=Outras estatísticas
+Status=Estado
+Favorite=Favorito
+ShortInfo=Info.
+Ref=Ref.
+ExternalRef=Ref. externa
+RefSupplier=Ref. provedor
+RefPayment=Ref. pago
+CommercialProposalsShort=Orzamentos
+Comment=Comentario
+Comments=Comentarios
+ActionsToDo=Eventos a realizar
+ActionsToDoShort=A realizar
+ActionsDoneShort=Realizados
+ActionNotApplicable=Non aplicable
+ActionRunningNotStarted=Non comezado
+ActionRunningShort=En progreso
+ActionDoneShort=Terminado
+ActionUncomplete=Incompleto
+LatestLinkedEvents=Últimos %s eventos vinculados
+CompanyFoundation=Empresa/Organización
+Accountant=Contable
+ContactsForCompany=Contactos deste terceiro
+ContactsAddressesForCompany=Contactos/enderezos deste terceiro
+AddressesForCompany=Enderezos deste terceiro
+ActionsOnCompany=Eventos deste terceiro
+ActionsOnContact=Eventos deste contacto/enderezo
+ActionsOnContract=Events for this contract
+ActionsOnMember=Eventos deste membro
+ActionsOnProduct=Eventos deste produto
+NActionsLate=%s en atraso
+ToDo=A realizar
+Completed=Realizado
+Running=En progreso
+RequestAlreadyDone=Solicitude xa rexistrada
+Filter=Filtro
+FilterOnInto=Procurar critero '<strong>%s</strong>' nas filas %s
+RemoveFilter=Eliminar filtro
+ChartGenerated=Gráficos xerados
+ChartNotGenerated=Gráfico non xerado
+GeneratedOn=Xerado sobre %s
+Generate=Xerar
+Duration=Permanencia
+TotalDuration=Permanencia total
+Summary=Resumo
+DolibarrStateBoard=Estatísticas da base de datos
+DolibarrWorkBoard=Items pendentes
+NoOpenedElementToProcess=No open element to process
+Available=Dispoñible
+NotYetAvailable=Aínda non dispoñible
+NotAvailable=Non dispoñible
+Categories=Etiquetas/categorías
+Category=Etiqueta/categoría
+By=Por
+From=De
+FromLocation=De
+to=a
+To=a
+and=e
+or=ou
+Other=Outro
+Others=Outros
+OtherInformations=Outra información
+Quantity=Cantidade
+Qty=Cant.
+ChangedBy=Modificado por
+ApprovedBy=Aprobado por
+ApprovedBy2=Aprobado por (segunda aprobación)
+Approved=Aprobado
+Refused=Rexeitado
+ReCalculate=Recalcular
+ResultKo=Erro
+Reporting=Informe
+Reportings=Informes
+Draft=Borrador
+Drafts=Borradores
+StatusInterInvoiced=Invoiced
+Validated=Validado
+Opened=Activo
+OpenAll=Open (All)
+ClosedAll=Closed (All)
+New=Novo
+Discount=Desconto
+Unknown=Descoñecido
+General=Xeral
+Size=Tamaño
+OriginalSize=Tamaño orixinal
+Received=Recibido
+Paid=Pago
+Topic=Asunto
+ByCompanies=Por terceiros
+ByUsers=Por usuario
+Links=Vinculos
+Link=Vínculo
+Rejects=Devolucións
+Preview=Vista previa
+NextStep=Seguinte paso
+Datas=Datos
+None=Nada
+NoneF=Ningunha
+NoneOrSeveral=Ningún ou varios
+Late=Atraso
+LateDesc=Un rexistro está definido como atrasado segundo a configuración do sistema no menú menú Inicio - Configuración - Alertas.
+NoItemLate=Sen items en atraso
+Photo=Foto
+Photos=Fotos
+AddPhoto=Engadir foto
+DeletePicture=Eliminar imaxe
+ConfirmDeletePicture=¿Confirma a eliminación da imaxe?
+Login=Login
+LoginEmail=Login (e-mail)
+LoginOrEmail=Login ou e-mail
+CurrentLogin=Login actual
+EnterLoginDetail=Introduza os datos de inicio de sesión
+January=xaneiro
+February=febreiro
+March=marzo
+April=abril
+May=maio
+June=xuño
+July=xullo
+August=agosto
+September=setembro
+October=outubro
+November=novembro
+December=decembro
+Month01=xaneiro
+Month02=febreiro
+Month03=marzo
+Month04=abril
+Month05=maio
+Month06=xuño
+Month07=xullo
+Month08=agosto
+Month09=setembro
+Month10=ocutubro
+Month11=novembro
+Month12=decembro
+MonthShort01=xan.
+MonthShort02=feb.
+MonthShort03=mar.
+MonthShort04=abr.
+MonthShort05=ma.
+MonthShort06=xun.
+MonthShort07=xul.
+MonthShort08=ago.
+MonthShort09=sep.
+MonthShort10=out.
+MonthShort11=nov.
+MonthShort12=dec.
+MonthVeryShort01=X
+MonthVeryShort02=F
+MonthVeryShort03=M
+MonthVeryShort04=A
+MonthVeryShort05=M
+MonthVeryShort06=X
+MonthVeryShort07=X
+MonthVeryShort08=A
+MonthVeryShort09=S
+MonthVeryShort10=O
+MonthVeryShort11=N
+MonthVeryShort12=D
+AttachedFiles=Arquivos e documentos a xuntar
+JoinMainDoc=Engadir ao documento principal
+DateFormatYYYYMM=YYYY-MM
+DateFormatYYYYMMDD=YYYY-MM-DD
+DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
+ReportName=Nome do informe
+ReportPeriod=Período do informe
+ReportDescription=Descrición
+Report=Informe
+Keyword=Clave
+Origin=Orixe
+Legend=Lenda
+Fill=Encher
+Reset=Baleirar
+File=Arquivo
+Files=Arquivos
+NotAllowed=Non autorizado
+ReadPermissionNotAllowed=Sen permisos de lectura
+AmountInCurrency=Importes en %s moeda
+Example=Exemplo
+Examples=Exemplos
+NoExample=Sen exemplo
+FindBug=Reportar un erro
+NbOfThirdParties=Número de terceros
+NbOfLines=Números de liñas
+NbOfObjects=Número de obxectos
+NbOfObjectReferers=Nª de items relacionados
+Referers=Items relacionados
+TotalQuantity=Cantidade total
+DateFromTo=De %s a %s
+DateFrom=A partires de %s
+DateUntil=Ata %s
+Check=Verificar
+Uncheck=Eliminar verificación
+Internal=Interno
+External=Externo
+Internals=Internos
+Externals=Externos
+Warning=Alerta
+Warnings=Alertas
+BuildDoc=Xerar o documento
+Entity=Entidade
+Entities=Entidades
+CustomerPreview=Historial cliente
+SupplierPreview=Historial provedor
+ShowCustomerPreview=Amosar historial do cliente
+ShowSupplierPreview=Amosar historial do provedor
+RefCustomer=Ref. cliente
+Currency=Moeda
+InfoAdmin=Información para os administradores
+Undo=Anular
+Redo=Facer de novo
+ExpandAll=Expandir todo
+UndoExpandAll=Contraer todo
+SeeAll=Ver todo
+Reason=Razón
+FeatureNotYetSupported=Funcionalidade ainda non soportada
+CloseWindow=Pechar xanela
+Response=Resposta
+Priority=Prioridade
+SendByMail=Enviar por e-mail
+MailSentBy=E-mail enviado por
+TextUsedInTheMessageBody=Texto no corpo da mensaxe
+SendAcknowledgementByMail=Enviar correo de confirmación
+SendMail=Enviar correol
+Email=E-mail
+NoEMail=Sen e-mail
+AlreadyRead=Xá lido
+NotRead=Non lido
+NoMobilePhone=Sen teléfono móbil
+Owner=Propietario
+FollowingConstantsWillBeSubstituted=As seguintes constantes serán substituidas polo seu valor correspondente.
+Refresh=Refrescar
+BackToList=Voltar á listaxe
+GoBack=Voltar atrás
+CanBeModifiedIfOk=Pode modificarse se é valido
+CanBeModifiedIfKo=Pode modificarse se non é valido
+ValueIsValid=Valor válido
+ValueIsNotValid=Valor non válido
+RecordCreatedSuccessfully=Rexistro creado correctamente
+RecordModifiedSuccessfully=Rexistro modificado correctamente
+RecordsModified=%s rexistros modificados
+RecordsDeleted=%s rexistros eliminados
+RecordsGenerated=%s rexistro(s) xerado(s)
+AutomaticCode=Creación automática de código
+FeatureDisabled=Función desactivada
+MoveBox=Mover panel
+Offered=Oferta
+NotEnoughPermissions=Non ten permisos para esta acción
+SessionName=Nome sesión
+Method=Método
+Receive=Recepción
+CompleteOrNoMoreReceptionExpected=Completado ou no agárdase mais
+ExpectedValue=Valor agardado
+PartialWoman=Parcial
+TotalWoman=Total
+NeverReceived=Nunca recibido
+Canceled=Cancelado
+YouCanChangeValuesForThisListFromDictionarySetup=Pode cambiar os valores desta listaxe no menú Configuración->Diccionarios
+YouCanChangeValuesForThisListFrom=Pode cambiar os valores desta listaxe dende o menú %s
+YouCanSetDefaultValueInModuleSetup=Pode establecer o valor predeterminado que é utilízado cando crease un novo rexistro na configuración do módulo
+Color=Cor
+Documents=Documentos vinculados
+Documents2=Documentos
+UploadDisabled=Subida desactivada
+MenuAccountancy=Contabilidade
+MenuECM=Documentos
+MenuAWStats=AWStats
+MenuMembers=Membros
+MenuAgendaGoogle=Axenda Google
+ThisLimitIsDefinedInSetup=Límite Dolibarr (Menú Inicio-configuración-seguridade): %s Kb, PHP limit: %s Kb
+NoFileFound=Non hai documentos gardados neste directorio
+CurrentUserLanguage=Idioma actual
+CurrentTheme=Tema actual
+CurrentMenuManager=Xestor menú actual
+Browser=Navegador
+Layout=Presentación
+Screen=Pantalla
+DisabledModules=Módulos desactivados
+For=Para
+ForCustomer=Para cliente
+Signature=Sinatura
+DateOfSignature=Data da sinatura
+HidePassword=Amosar comando con contrasinal oculta
+UnHidePassword=Amosar comando con contrasinal á vista
+Root=Raíz
+RootOfMedias=Root of public medias (/medias)
+Informations=Información
+Page=Páxina
+Notes=Notas
+AddNewLine=Engadir nova liña
+AddFile=Engadir arquivo
+FreeZone=Sen produtos/servizos predefinidos
+FreeLineOfType=Entrada libre, tipo:
+CloneMainAttributes=Clonar o obxecto con estes atributos principais
+ReGeneratePDF=Xerar de novo o PDF
+PDFMerge=Fusión PDF
+Merge=Fusión
+DocumentModelStandardPDF=Modelo PDF estándard
+PrintContentArea=Amosar páxina de impresión da zona central
+MenuManager=Xestor de menú
+WarningYouAreInMaintenanceMode=Atención, está en modo mantemento, só o login <b>%s</b> está autorizado para utilizar a aplicación neste momento.
+CoreErrorTitle=Erro de sistema
+CoreErrorMessage=O sentimos, pero aconteceu un erro. Póñase en contacto co administrador do sistema para comprobar os rexistros ou desactive $dolibarr_main_prod=1 para obter mais información.
+CreditCard=Tarxeta de crédito
+ValidatePayment=Validar pago
+CreditOrDebitCard=Tarxeta de crédito ou débito
+FieldsWithAreMandatory=Os campos marcados cun <b>%s</b> son obrigatorios
+FieldsWithIsForPublic=Os campos marcados co <b>%s</b> amosaránse na lista pública de membros. Se non desexa velos, desactive a caixa "público".
+AccordingToGeoIPDatabase=(obtido por conversión GeoIP)
+Line=Líña
+NotSupported=Non soportado
+RequiredField=Campo obrigatorio
+Result=Resultado
+ToTest=Probar
+ValidateBefore=Item must be validated before using this feature
+Visibility=Visibilidade
+Totalizable=Totalizable
+TotalizableDesc=Este campo é totalizable nas listaxes
+Private=Privado
+Hidden=Caché
+Resources=Recursos
+Source=Orixe
+Prefix=Prefixo
+Before=Antes
+After=Despois
+IPAddress=Enderezo IP
+Frequency=Frecuencia
+IM=Mensaxería instantánea
+NewAttribute=Novo atributo
+AttributeCode=Código
+URLPhoto=Url da foto/logo
+SetLinkToAnotherThirdParty=Vincular a outro terceiro
+LinkTo=Vincular a
+LinkToProposal=Vincular a pedido
+LinkToOrder=Vincular a pedido
+LinkToInvoice=Vincular a factura
+LinkToTemplateInvoice=Vincular a prantilla de factura
+LinkToSupplierOrder=Vincular a pedido a provedor
+LinkToSupplierProposal=Vincular a orzamento de provedor
+LinkToSupplierInvoice=Vincular a factura de provedor
+LinkToContract=Vincular a contrato
+LinkToIntervention=Vincular a intervención
+LinkToTicket=Link to ticket
+CreateDraft=Crear borrador
+SetToDraft=Voltar a borrador
+ClickToEdit=Clic para editar
+ClickToRefresh=Clic para actualizar
+EditWithEditor=Editar con CKEditor
+EditWithTextEditor=Editar con editor de texto
+EditHTMLSource=Editar código HTML
+ObjectDeleted=Obxecto %s eliminado
+ByCountry=Por país
+ByTown=Por poboación
+ByDate=Por data
+ByMonthYear=Por mes/ano
+ByYear=Por ano
+ByMonth=Por mes
+ByDay=Por día
+BySalesRepresentative=Por comercial
+LinkedToSpecificUsers=Vinculado a un contacto de usuario particular
+NoResults=Ningún resultado
+AdminTools=Ferramentas de administración
+SystemTools=Utilidades do sistema
+ModulesSystemTools=Utilidades de módulos
+Test=Proba
+Element=Elemento
+NoPhotoYet=Ainda non ten fotografía dispoñible
+Dashboard=Taboleiro
+MyDashboard=Meu taboleiro
+Deductible=Deducible
+from=de
+toward=cara a
+Access=Acceso
+SelectAction=Seleccione acción
+SelectTargetUser=Seleccionar usuario/empregado de destino
+HelpCopyToClipboard=Use Ctrl+C para copiar ao portapapeis
+SaveUploadedFileWithMask=Gardar o arquivo no servidor co nome "<strong>%s</strong>" (senón "%s")
+OriginFileName=Nome do arquivo orixe
+SetDemandReason=Definir orixe
+SetBankAccount=Definir conta bancaria
+AccountCurrency=Moeda da conta
+ViewPrivateNote=Ver notas
+XMoreLines=%s líña(s) ocultas
+ShowMoreLines=Amosar mais/menos liñas
+PublicUrl=URL pública
+AddBox=Engadir caixa
+SelectElementAndClick=Seleccione un elemento e faga clic %s
+PrintFile=Imprimir Arquivo %s
+ShowTransaction=Amosar rexistro na conta bancaria
+ShowIntervention=Amosar intervención
+ShowContract=Amosar contrato
+GoIntoSetupToChangeLogo=Vaia a Inicio->Configuración->Empresa/Institución para cambiar o logo ou vaia a Inicio->Configuración->Entorno para ocultalo
+Deny=Denegar
+Denied=Denegada
+ListOf=Lista de %s
+ListOfTemplates=Listaxe de prantillas
+Gender=Sexo
+Genderman=Home
+Genderwoman=Muller
+ViewList=Vista de listaxe
+ViewGantt=Gantt view
+ViewKanban=Kanban view
+Mandatory=Obrigatorio
+Hello=Ola
+GoodBye=Adeus
+Sincerely=Atentamente
+ConfirmDeleteObject=Are you sure you want to delete this object?
+DeleteLine=Eliminación de liña
+ConfirmDeleteLine=¿Está certo de querer eliminar esta liña?
+NoPDFAvailableForDocGenAmongChecked=Sen PDF dispoñibles para a xeración de documentos entre os rexistros seleccionados
+TooManyRecordForMassAction=Demasiados rexistros seleccionados para a acción masiva. A acción está restrinxida a unha listaxe de %s rexistros.
+NoRecordSelected=Sen rexistros seleccionados
+MassFilesArea=Área de arquivos xerados por accións masivas
+ShowTempMassFilesArea=Amosar área de arquivos xerados por accións masivas
+ConfirmMassDeletion=Confirmación borrado masivo
+ConfirmMassDeletionQuestion=¿Estás certo de querer eliminar os %s rexistro(s) seleccionado(s)?
+RelatedObjects=Obxectos relacionados
+ClassifyBilled=Clasificar facturado
+ClassifyUnbilled=Clasificar non facturado
+Progress=Progreso
+ProgressShort=Progr.
+FrontOffice=Front office
+BackOffice=Back office
+Submit=Submit
+View=Ver
+Export=Exportar
+Exports=Exportacións
+ExportFilteredList=Listaxe filtrado de exportación
+ExportList=Listaxe de exportación
+ExportOptions=Opcións de exportación
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
+Miscellaneous=Miscelánea
+Calendar=Calendario
+GroupBy=Agrupado por...
+ViewFlatList=Ver listaxe plana
+RemoveString=Eliminar cadea '%s'
+SomeTranslationAreUncomplete=Algúns dos idiomas ofrecidos poden estar parcialmente traducidos ou poden conter erros. Axuda a corrixir teu idioma rexistrándose en <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+DirectDownloadLink=Enlace de descarga directa (público/externo)
+DirectDownloadInternalLink=Enlace de descarga directa (precisa estar rexistrado e precisa permisos)
+Download=Descargar
+DownloadDocument=Descargar o documento
+ActualizeCurrency=Actualizar o tipo de cambio
+Fiscalyear=Ano fiscal
+ModuleBuilder=Module and Application Builder
+SetMultiCurrencyCode=Establecer moeda
+BulkActions=Accións masivas
+ClickToShowHelp=Faga clic para amosar a axuda sobre ferramentas
+WebSite=Sitio web
+WebSites=Sitios web
+WebSiteAccounts=Contas do sitio web
+ExpenseReport=Informe de gasto
+ExpenseReports=Informes de gastos
+HR=RRHH
+HRAndBank=RRHH e bancos
+AutomaticallyCalculated=Calculado automáticamente
+TitleSetToDraft=De volta ao borrador
+ConfirmSetToDraft=¿Está certo de querer voltar ao estado Borrador?
+ImportId=ID de importación
+Events=Eventos
+EMailTemplates=Prantillas E-mail
+FileNotShared=Arquivo non compartido ao público externo
+Project=Proxecto
+Projects=Proxectos
+LeadOrProject=Oportunidade | Proxecto
+LeadsOrProjects=Oportunidades | Proxectos
+Lead=Oportunidade
+Leads=Oportunidades
+ListOpenLeads=Listaxe oportunidades abertas
+ListOpenProjects=Listaxe proxectos abertos
+NewLeadOrProject=Nova oportunidade ou proxecto
+Rights=Permisos
+LineNb=Líña no.
+IncotermLabel=Incoterms
+TabLetteringCustomer=Letras do cliente
+TabLetteringSupplier=Letras do provedor
+Monday=lúns
+Tuesday=martes
+Wednesday=mércores
+Thursday=xoves
+Friday=venres
+Saturday=sábado
+Sunday=domingo
+MondayMin=Lu
+TuesdayMin=Ma
+WednesdayMin=Mi
+ThursdayMin=Xo
+FridayMin=Ve
+SaturdayMin=Sa
+SundayMin=Do
+Day1=lúns
+Day2=martes
+Day3=mércores
+Day4=xoves
+Day5=venres
+Day6=sábado
+Day0=domingo
+ShortMonday=L
+ShortTuesday=M
+ShortWednesday=Me
+ShortThursday=X
+ShortFriday=V
+ShortSaturday=S
+ShortSunday=D
+SelectMailModel=Seleccione unha prantilla de correo
+SetRef=Establecer ref
+Select2ResultFoundUseArrows=Algúns resultados atopados. Use as frechas para seleccionar.
+Select2NotFound=Non atopáronse resultados
+Select2Enter=Introducir
+Select2MoreCharacter=ou mais caracteres
+Select2MoreCharacters=ou mais caracteres
+Select2MoreCharactersMore=<strong>Sintaxe de procura:</strong><br><kbd><strong> |</strong></kbd><kbd> O</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Calquera carácter</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Comeza con</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> Remata con</kbd> (ab$)<br>
+Select2LoadingMoreResults=Cargando mais resultados...
+Select2SearchInProgress=Procura en progreso...
+SearchIntoThirdparties=Terceiros
+SearchIntoContacts=Contactos
+SearchIntoMembers=Membros
+SearchIntoUsers=Usuarios
+SearchIntoProductsOrServices=Produtos ou servizos
+SearchIntoProjects=Proxectos
+SearchIntoMO=Manufacturing Orders
+SearchIntoTasks=Tarefas
+SearchIntoCustomerInvoices=Facturas a clientes
+SearchIntoSupplierInvoices=Facturas provedor
+SearchIntoCustomerOrders=Pedidos de clientes
+SearchIntoSupplierOrders=Pedidos a provedor
+SearchIntoCustomerProposals=Orzamentos
+SearchIntoSupplierProposals=Orzamentos de provedor
+SearchIntoInterventions=Intervencións
+SearchIntoContracts=Contratos
+SearchIntoCustomerShipments=Envíos a clientes
+SearchIntoExpenseReports=Informes de gastos
+SearchIntoLeaves=Día libre
+SearchIntoTickets=Tickets
+CommentLink=Comentarios
+NbComments=Número de comentarios
+CommentPage=Espazo de comentarios
+CommentAdded=Comentario engadido
+CommentDeleted=Comentario borrado
+Everybody=Proxecto compartido
+PayedBy=Pagado por
+PayedTo=Pagado a
+Monthly=Mensual
+Quarterly=Trimestral
+Annual=Anual
+Local=Local
+Remote=Remoto
+LocalAndRemote=Local e remoto
+KeyboardShortcut=Atallo de teclado
+AssignedTo=Asignada a
+Deletedraft=Eliminar borrador
+ConfirmMassDraftDeletion=Confirmación de borrado en masa
+FileSharedViaALink=Arquivo compartido ao través dun vínculo
+SelectAThirdPartyFirst=Selecciona un terceiro antes...
+YouAreCurrentlyInSandboxMode=Estás actualmente no modo %s "sandbox"
+Inventory=Inventario
+AnalyticCode=Analytic code
+TMenuMRP=MRP
+ShowMoreInfos=Show More Infos
+NoFilesUploadedYet=Please upload a document first
+SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
+ToClose=To close
+ToProcess=A procesar
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
+ContactDefault_agenda=Evento
+ContactDefault_commande=Pedido
+ContactDefault_contrat=Contract
+ContactDefault_facture=Invoice
+ContactDefault_fichinter=Intervention
+ContactDefault_invoice_supplier=Supplier Invoice
+ContactDefault_order_supplier=Purchase Order
+ContactDefault_project=Proxecto
+ContactDefault_project_task=Tarefa
+ContactDefault_propal=Orzamento
+ContactDefault_supplier_proposal=Supplier Proposal
+ContactDefault_ticket=Ticket
+ContactAddedAutomatically=Contact added from contact thirdparty roles
+More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+StatisticsOn=Statistics on
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
+Measures=Measures
+XAxis=X-Axis
+YAxis=Y-Axis
+StatusOfRefMustBe=Status of %s must be %s
+DeleteFileHeader=Confirm file delete
+DeleteFileText=Do you really want delete this file?
+ShowOtherLanguages=Show other languages
+SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
+NotUsedForThisCustomer=Not used for this customer
diff --git a/htdocs/langs/gl_ES/margins.lang b/htdocs/langs/gl_ES/margins.lang
new file mode 100644
index 00000000000..cde55c81ae7
--- /dev/null
+++ b/htdocs/langs/gl_ES/margins.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - marges
+
+Margin=Margin
+Margins=Margins
+TotalMargin=Total Margin
+MarginOnProducts=Margin / Products
+MarginOnServices=Margin / Services
+MarginRate=Margin rate
+MarkRate=Mark rate
+DisplayMarginRates=Display margin rates
+DisplayMarkRates=Display mark rates
+InputPrice=Input price
+margin=Profit margins management
+margesSetup=Profit margins management setup
+MarginDetails=Margin details
+ProductMargins=Product margins
+CustomerMargins=Customer margins
+SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
+UserMargins=User margins
+ProductService=Produto ou servizo
+AllProducts=All products and services
+ChooseProduct/Service=Choose product or service
+ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
+ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
+UseDiscountAsProduct=As a product
+UseDiscountAsService=As a service
+UseDiscountOnTotal=On subtotal
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
+MargeType1=Margin on Best vendor price
+MargeType2=Margin on Weighted Average Price (WAP)
+MargeType3=Margin on Cost Price
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
+CostPrice=Cost price
+UnitCharges=Unit charges
+Charges=Charges
+AgentContactType=Commercial agent contact type
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
+CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/gl_ES/members.lang b/htdocs/langs/gl_ES/members.lang
new file mode 100644
index 00000000000..cba81a285c5
--- /dev/null
+++ b/htdocs/langs/gl_ES/members.lang
@@ -0,0 +1,204 @@
+# Dolibarr language file - Source file is en_US - members
+MembersArea=Members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Membros
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of terminated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Terminated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
+DateSubscription=Subscription date
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Tipos de membros
+MemberStatusDraft=Borrador (é preciso validar)
+MemberStatusDraftShort=Borrador
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validado
+MemberStatusActiveLate=Subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Terminated member
+MemberStatusResiliatedShort=Terminated
+MembersStatusToValid=Draft members
+MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Validado
+SubscriptionNotNeeded=No subscription needed
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+MemberTypeModified=Member type modified
+DeleteAMemberType=Delete a member type
+ConfirmDeleteMemberType=Are you sure you want to delete this member type?
+MemberTypeDeleted=Member type deleted
+MemberTypeCanNotBeDeleted=Member type can not be deleted
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Atraso
+SubscriptionNotReceived=Subscription never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome email
+SubscriptionRequired=Subscription required
+DeleteType=Eliminar
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Terminate a member
+ConfirmResiliateMember=Are you sure you want to terminate this member?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions)?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public self-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public website with self-subscription form
+ForceMemberType=Force the member type
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Membros
+LastMembersModified=Latest %s modified members
+LastSubscriptionsModified=Latest %s modified subscriptions
+String=String
+Text=Text
+Int=Int
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+SubscriptionNotRecorded=Subscription not recorded
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct entry on bank account
+MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Pago cota
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Estatísticas
+LastMemberDate=Latest member date
+LatestSubscriptionDate=Latest subscription date
+MemberNature=Nature of member
+Public=Information are public
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No VAT for subscriptions
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
+MembershipPaid=Membership paid for current period (until %s)
+YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
+XMembersClosed=%s member(s) closed
diff --git a/htdocs/langs/gl_ES/modulebuilder.lang b/htdocs/langs/gl_ES/modulebuilder.lang
new file mode 100644
index 00000000000..135ac1ae9ec
--- /dev/null
+++ b/htdocs/langs/gl_ES/modulebuilder.lang
@@ -0,0 +1,141 @@
+# Dolibarr language file - Source file is en_US - loan
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
+ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
+ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
+ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
+NewModule=New module
+NewObjectInModulebuilder=New object
+ModuleKey=Module key
+ObjectKey=Object key
+ModuleInitialized=Module initialized
+FilesForObjectInitialized=Files for new object '%s' initialized
+FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
+ModuleBuilderDescdescription=Enter here all general information that describe your module.
+ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
+ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
+ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
+ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
+ModuleBuilderDeschooks=This tab is dedicated to hooks.
+ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
+ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
+DangerZone=Danger zone
+BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
+BuildDocumentation=Build documentation
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
+DescriptionLong=Long description
+EditorName=Name of editor
+EditorUrl=URL of editor
+DescriptorFile=Descriptor file of module
+ClassFile=File for PHP DAO CRUD class
+ApiClassFile=File for PHP API class
+PageForList=PHP page for list of record
+PageForCreateEditView=PHP page to create/edit/view a record
+PageForAgendaTab=PHP page for event tab
+PageForDocumentTab=PHP page for document tab
+PageForNoteTab=PHP page for note tab
+PathToModulePackage=Path to zip of module/application package
+PathToModuleDocumentation=Path to file of module/application documentation (%s)
+SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
+FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Force update of .class and .sql files
+RegenerateMissingFiles=Generate missing files
+SpecificationFile=File of documentation
+LanguageFile=File for language
+ObjectProperties=Object Properties
+ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
+NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
+SearchAll=Used for 'search all'
+DatabaseIndex=Database index
+FileAlreadyExists=File %s already exists
+TriggersFile=File for triggers code
+HooksFile=File for hooks code
+ArrayOfKeyValues=Array of key-val
+ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
+WidgetFile=Widget file
+CSSFile=CSS file
+JSFile=Javascript file
+ReadmeFile=Readme file
+ChangeLog=ChangeLog file
+TestClassFile=File for PHP Unit Test class
+SqlFile=Sql file
+PageForLib=File for the common PHP library
+PageForObjLib=File for the PHP library dedicated to object
+SqlFileExtraFields=Sql file for complementary attributes
+SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
+AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
+UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Is a measure
+DirScanned=Directory scanned
+NoTrigger=No trigger
+NoWidget=No widget
+GoToApiExplorer=Go to API explorer
+ListOfMenusEntries=List of menu entries
+ListOfDictionariesEntries=List of dictionaries entries
+ListOfPermissionsDefined=List of defined permissions
+SeeExamples=See examples here
+EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdf=Display on PDF
+IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
+SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
+SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
+LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
+MenusDefDesc=Define here the menus provided by your module
+DictionariesDefDesc=Define here the dictionaries provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
+HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
+TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
+SeeIDsInUse=See IDs in use in your installation
+SeeReservedIDsRangeHere=See range of reserved IDs
+ToolkitForDevelopers=Toolkit for Dolibarr developers
+TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
+SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
+AddLanguageFile=Add language file
+YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
+DropTableIfEmpty=(Delete table if empty)
+TableDoesNotExists=The table %s does not exists
+TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
+UseAboutPage=Disable the about page
+UseDocFolder=Disable the documentation folder
+UseSpecificReadme=Use a specific ReadMe
+ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
+RealPathOfModule=Real path of module
+ContentCantBeEmpty=Content of file can't be empty
+WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
+CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
+JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
+CLIDesc=You can generate here some command line scripts you want to provide with your module.
+CLIFile=CLI File
+NoCLIFile=No CLI files
+UseSpecificEditorName = Use a specific editor name
+UseSpecificEditorURL = Use a specific editor URL
+UseSpecificFamily = Use a specific family
+UseSpecificAuthor = Use a specific author
+UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
+IncludeRefGeneration=The reference of object must be generated automatically
+IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
+IncludeDocGeneration=I want to generate some documents from the object
+IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
+ShowOnCombobox=Show value into combobox
+KeyForTooltip=Key for tooltip
+CSSClass=CSS Class
+NotEditable=Not editable
+ForeignKey=Foreign key
+TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/gl_ES/mrp.lang b/htdocs/langs/gl_ES/mrp.lang
new file mode 100644
index 00000000000..d3c4d3253c6
--- /dev/null
+++ b/htdocs/langs/gl_ES/mrp.lang
@@ -0,0 +1,76 @@
+Mrp=Manufacturing Orders
+MO=Manufacturing Order
+MRPDescription=Module to manage production and Manufacturing Orders (MO).
+MRPArea=MRP Area
+MrpSetupPage=Setup of module MRP
+MenuBOM=Bills of material
+LatestBOMModified=Latest %s Bills of materials modified
+LatestMOModified=Latest %s Manufacturing Orders modified
+Bom=Bills of Material
+BillOfMaterials=Bill of Material
+BOMsSetup=Setup of module BOM
+ListOfBOMs=List of bills of material - BOM
+ListOfManufacturingOrders=List of Manufacturing Orders
+NewBOM=New bill of material
+ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+BOMsNumberingModules=BOM numbering templates
+BOMsModelModule=BOM document templates
+MOsNumberingModules=MO numbering templates
+MOsModelModule=MO document templates
+FreeLegalTextOnBOMs=Free text on document of BOM
+WatermarkOnDraftBOMs=Watermark on draft BOM
+FreeLegalTextOnMOs=Free text on document of MO
+WatermarkOnDraftMOs=Watermark on draft MO
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
+ManufacturingEfficiency=Manufacturing efficiency
+ConsumptionEfficiency=Consumption efficiency
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
+DeleteBillOfMaterials=Delete Bill Of Materials
+DeleteMo=Delete Manufacturing Order
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+MenuMRP=Manufacturing Orders
+NewMO=New Manufacturing Order
+QtyToProduce=Qty to produce
+DateStartPlannedMo=Date start planned
+DateEndPlannedMo=Date end planned
+KeepEmptyForAsap=Empty means 'As Soon As Possible'
+EstimatedDuration=Estimated duration
+EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
+ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
+ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
+StatusMOProduced=Produced
+QtyFrozen=Frozen Qty
+QuantityFrozen=Frozen Quantity
+QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
+DisableStockChange=Stock change disabled
+DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
+BomAndBomLines=Bills Of Material and lines
+BOMLine=Line of BOM
+WarehouseForProduction=Warehouse for production
+CreateMO=Create MO
+ToConsume=To consume
+ToProduce=To produce
+QtyAlreadyConsumed=Qty already consumed
+QtyAlreadyProduced=Qty already produced
+QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
+ConsumeOrProduce=Consume or Produce
+ConsumeAndProduceAll=Consume and Produce All
+Manufactured=Manufactured
+TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
+ForAQuantityOf=For a quantity to produce of %s
+ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
+ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
+ProductionForRef=Production of %s
+AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
+NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
+AddNewConsumeLines=Add new line to consume
+ProductsToConsume=Products to consume
+ProductsToProduce=Products to produce
+UnitCost=Unit cost
+TotalCost=Total cost
diff --git a/htdocs/langs/gl_ES/multicurrency.lang b/htdocs/langs/gl_ES/multicurrency.lang
new file mode 100644
index 00000000000..4e50a29d774
--- /dev/null
+++ b/htdocs/langs/gl_ES/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Importe total na divisa orixinal
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/gl_ES/oauth.lang b/htdocs/langs/gl_ES/oauth.lang
new file mode 100644
index 00000000000..075ff49a895
--- /dev/null
+++ b/htdocs/langs/gl_ES/oauth.lang
@@ -0,0 +1,32 @@
+# Dolibarr language file - Source file is en_US - oauth
+ConfigOAuth=OAuth Configuration
+OAuthServices=OAuth Services
+ManualTokenGeneration=Manual token generation
+TokenManager=Token Manager
+IsTokenGenerated=Is token generated ?
+NoAccessToken=No access token saved into local database
+HasAccessToken=A token was generated and saved into local database
+NewTokenStored=Token received and saved
+ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
+TokenDeleted=Token deleted
+RequestAccess=Click here to request/renew access and receive a new token to save
+DeleteAccess=Click here to delete token
+UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
+ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
+OAuthSetupForLogin=Page to generate an OAuth token
+SeePreviousTab=See previous tab
+OAuthIDSecret=OAuth ID and Secret
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=OAuth Google service
+OAUTH_GOOGLE_ID=OAuth Google Id
+OAUTH_GOOGLE_SECRET=OAuth Google Secret
+OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create OAuth credentials
+OAUTH_GITHUB_NAME=OAuth GitHub service
+OAUTH_GITHUB_ID=OAuth GitHub Id
+OAUTH_GITHUB_SECRET=OAuth GitHub Secret
+OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create OAuth credentials
+OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
+OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/gl_ES/opensurvey.lang b/htdocs/langs/gl_ES/opensurvey.lang
new file mode 100644
index 00000000000..9f83fcfb4f3
--- /dev/null
+++ b/htdocs/langs/gl_ES/opensurvey.lang
@@ -0,0 +1,61 @@
+# Dolibarr language file - Source file is en_US - opensurvey
+Survey=Poll
+Surveys=Polls
+OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select the type of poll...
+NewSurvey=New poll
+OpenSurveyArea=Polls area
+AddACommentForPoll=You can add a comment into poll...
+AddComment=Add comment
+CreatePoll=Create poll
+PollTitle=Poll title
+ToReceiveEMailForEachVote=Receive an email for each vote
+TypeDate=Type date
+TypeClassic=Type standard
+OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
+RemoveAllDays=Remove all days
+CopyHoursOfFirstDay=Copy hours of first day
+RemoveAllHours=Remove all hours
+SelectedDays=Selected days
+TheBestChoice=The best choice currently is
+TheBestChoices=The best choices currently are
+with=with
+OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
+CommentsOfVoters=Comments of voters
+ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
+RemovePoll=Remove poll
+UrlForSurvey=URL to communicate to get a direct access to poll
+PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
+CreateSurveyDate=Create a date poll
+CreateSurveyStandard=Create a standard poll
+CheckBox=Simple checkbox
+YesNoList=List (empty/yes/no)
+PourContreList=List (empty/for/against)
+AddNewColumn=Add new column
+TitleChoice=Choice label
+ExportSpreadsheet=Export result spreadsheet
+ExpireDate=Data límite
+NbOfSurveys=Number of polls
+NbOfVoters=No. of voters
+SurveyResults=Results
+PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
+5MoreChoices=5 more choices
+Against=Against
+YouAreInivitedToVote=You are invited to vote for this poll
+VoteNameAlreadyExists=This name was already used for this poll
+AddADate=Add a date
+AddStartHour=Add start hour
+AddEndHour=Add end hour
+votes=vote(s)
+NoCommentYet=No comments have been posted for this poll yet
+CanComment=Voters can comment in the poll
+CanSeeOthersVote=Voters can see other people's vote
+SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
+BackToCurrentMonth=Back to current month
+ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
+ErrorOpenSurveyOneChoice=Enter at least one choice
+ErrorInsertingComment=There was an error while inserting your comment
+MoreChoices=Enter more choices for the voters
+SurveyExpiredInfo=The poll has been closed or voting delay has expired.
+EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
+ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/gl_ES/orders.lang b/htdocs/langs/gl_ES/orders.lang
new file mode 100644
index 00000000000..5c1385df66c
--- /dev/null
+++ b/htdocs/langs/gl_ES/orders.lang
@@ -0,0 +1,189 @@
+# Dolibarr language file - Source file is en_US - orders
+OrdersArea=Área pedimentos de clientes
+SuppliersOrdersArea=Área pedimentos a provedores
+OrderCard=Ficha pedimento
+OrderId=Id pedimento
+Order=Pedimento
+PdfOrderTitle=Pedimento
+Orders=Pedimentos
+OrderLine=Liña de pedimento
+OrderDate=Data pedimento
+OrderDateShort=Data de pedimento
+OrderToProcess=Pedimento a procesar
+NewOrder=Novo pedimento
+NewOrderSupplier=New Purchase Order
+ToOrder=Realizar pedimento
+MakeOrder=Realizar pedimento
+SupplierOrder=Pedimento a provedor
+SuppliersOrders=Pedimentos a provedores
+SuppliersOrdersRunning=Pedimentos a provedores actuais
+CustomerOrder=Conta bloqueada
+CustomersOrders=Pedimentos de clientes
+CustomersOrdersRunning=Pedimentos de clientes en curso
+CustomersOrdersAndOrdersLines=Pedimentos de clientes e liñas de pedimento
+OrdersDeliveredToBill=Pedimentos de clientes enviados a facturar
+OrdersToBill=Pedimentos de clientes enviados
+OrdersInProcess=Pedimentos de clientes en proceso
+OrdersToProcess=Pedimentos de clientes a procesar
+SuppliersOrdersToProcess=Pedimentos a provedores a procesar
+SuppliersOrdersAwaitingReception=Pedimentos agardando recepción
+AwaitingReception=Agardando recepción
+StatusOrderCanceledShort=Anulado
+StatusOrderDraftShort=Borrador
+StatusOrderValidatedShort=Validado
+StatusOrderSentShort=Expedición en curso
+StatusOrderSent=Envío en curso
+StatusOrderOnProcessShort=Pedimento
+StatusOrderProcessedShort=Procesado
+StatusOrderDelivered=Emitido
+StatusOrderDeliveredShort=Enviado
+StatusOrderToBillShort=Emitido
+StatusOrderApprovedShort=Aprobado
+StatusOrderRefusedShort=Rexeitado
+StatusOrderToProcessShort=A procesar
+StatusOrderReceivedPartiallyShort=Recibido parcialmente
+StatusOrderReceivedAllShort=Produtos recibidos
+StatusOrderCanceled=Anulado
+StatusOrderDraft=Borrador (a validar)
+StatusOrderValidated=Validado
+StatusOrderOnProcess=Pedimento - Agardando recepción
+StatusOrderOnProcessWithValidation=Pedimento - Agardando recibir ou validar
+StatusOrderProcessed=Procesado
+StatusOrderToBill=Emitido
+StatusOrderApproved=Aprobado
+StatusOrderRefused=Rexeitado
+StatusOrderReceivedPartially=Recibido parcialmente
+StatusOrderReceivedAll=Todos os productos recibidos
+ShippingExist=Existe unha expedición
+QtyOrdered=Cant. pedida
+ProductQtyInDraft=Cantidades en borrador de pedimentos
+ProductQtyInDraftOrWaitingApproved=Cantidades en borrador de pedimentos ou aprobados, pero non realizados
+MenuOrdersToBill=Pedimentos a facturar
+MenuOrdersToBill2=Pedimentos facturables
+ShipProduct=Enviar produto
+CreateOrder=Crear pedimento
+RefuseOrder=Rexeitar o pedimento
+ApproveOrder=Aprobar pedimento
+Approve2Order=Aprobar pedimento (segundo nivel)
+ValidateOrder=Validar o pedimento
+UnvalidateOrder=Desvalidar o pedimento
+DeleteOrder=Eliminar o pedimento
+CancelOrder=Anular o pedimento
+OrderReopened= Order %s re-open
+AddOrder=Crear pedimento
+AddPurchaseOrder=Create purchase order
+AddToDraftOrders=Engadir a pedimento borrador
+ShowOrder=Amosar pedimento
+OrdersOpened=Pedimentos a procesar
+NoDraftOrders=Sen pedimentos borrador
+NoOrder=Sen pedimentos
+NoSupplierOrder=Sen orde de compra
+LastOrders=Últimos %s pedimentos de clientes
+LastCustomerOrders=Últimos %s pedimentos de clientes
+LastSupplierOrders=Últimas %s ordes de compra
+LastModifiedOrders=Últimos %s pedimentos de clientes modificados
+AllOrders=Todos os pedimentos
+NbOfOrders=Número de pedimentos
+OrdersStatistics=Estatísticas de pedimentos de clientes
+OrdersStatisticsSuppliers=Estatísticas de ordes de pedimento
+NumberOfOrdersByMonth=Número de pedimentos por mes
+AmountOfOrdersByMonthHT=Importe total de pedimentos por mes (sen IVE)
+ListOfOrders=Listaxe de pedimentos
+CloseOrder=Pechar pedimento
+ConfirmCloseOrder=¿Está seguro de querer clasificar este pedimento como enviado? Una vez enviado un pedimento, solo podrá facturarse
+ConfirmDeleteOrder=¿Está seguro de querer eliminar este pedimento?
+ConfirmValidateOrder=¿Está seguro de querer validar este pedimento bajo la referencia <b>%s</b> ?
+ConfirmUnvalidateOrder=¿Está seguro de querer restaurar el pedimento <b>%s</b> al estado borrador?
+ConfirmCancelOrder=¿Está seguro de querer anular este pedimento?
+ConfirmMakeOrder=¿Está seguro de querer confirmar este pedimento en fecha de <b>%s</b> ?
+GenerateBill=Facturar
+ClassifyShipped=Clasificar enviado
+DraftOrders=Pedimentos borrador
+DraftSuppliersOrders=Ordes de pedimentos borrador
+OnProcessOrders=Pedimentos en proceso
+RefOrder=Ref. pedimento
+RefCustomerOrder=Ref. pedimento para o cliente
+RefOrderSupplier=Ref. pedimento para o provedor
+RefOrderSupplierShort=Ref. ped. prov.
+SendOrderByMail=Enviar pedimento por e-mail
+ActionsOnOrder=Eventos sobre o pedimento
+NoArticleOfTypeProduct=Non hai artigos de tipo 'producto' y por lo tanto enviables en este pedimento
+OrderMode=Método de pedimento
+AuthorRequest=Autor/Solicitante
+UserWithApproveOrderGrant=Usuarios habilitados para aprobar os pedimentos
+PaymentOrderRef=Pago pedimento %s
+ConfirmCloneOrder=¿Está seguro de querer clonar este pedimento <b>%s</b>?
+DispatchSupplierOrder=Recepción do pedimento a provedor %s
+FirstApprovalAlreadyDone=Primeira aprobación realizada
+SecondApprovalAlreadyDone=Segunda aprobación realizada
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
+OtherOrders=Outros pedimentos
+##### Types de contacts #####
+TypeContact_commande_internal_SALESREPFOLL=Responsable seguemento do pedimento cliente
+TypeContact_commande_internal_SHIPPING=Responsable envío pedimento cliente
+TypeContact_commande_external_BILLING=Contacto cliente facturación pedimento
+TypeContact_commande_external_SHIPPING=Contacto cliente entrega pedimento
+TypeContact_commande_external_CUSTOMER=Contacto cliente seguemento pedimento
+TypeContact_order_supplier_internal_SALESREPFOLL=Comercial seguimento pedimento de compra
+TypeContact_order_supplier_internal_SHIPPING=Responsable recepción pedimento a provedor
+TypeContact_order_supplier_external_BILLING=Contacto provedor factura
+TypeContact_order_supplier_external_SHIPPING=Contacto seguemento envío aprovedor
+TypeContact_order_supplier_external_CUSTOMER=Contacto seguemento pedimento a provedor
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constante COMMANDE_SUPPLIER_ADDON no definida
+Error_COMMANDE_ADDON_NotDefined=Constante COMMANDE_ADDON non definida
+Error_OrderNotChecked=Non foron seleccionados pedimentos a facturar
+# Order modes (how we receive order). Not the "why" are keys stored into dict.lang
+OrderByMail=Correo
+OrderByFax=Fax
+OrderByEMail=E-Mail
+OrderByWWW=En liña
+OrderByPhone=Teléfono
+# Documents models
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
+PDFEratostheneDescription=A complete order model
+PDFEdisonDescription=Modelo de pedimento simple
+PDFProformaDescription=A complete Proforma invoice template
+CreateInvoiceForThisCustomer=Facturar pedimentos
+CreateInvoiceForThisSupplier=Facturar pedimentos
+NoOrdersToInvoice=Sen pedimentos facturables
+CloseProcessedOrdersAutomatically=Clasificar automáticamente como "Procesados" os pedimentos seleccionados.
+OrderCreation=Creación pedimento
+Ordered=Pedimento
+OrderCreated=Os seus pedimentos foron creados
+OrderFail=Produciuse un erro durante na creación dos seus pedimentos
+CreateOrders=Crear pedimentos
+ToBillSeveralOrderSelectCustomer=Para crear unha factura para numerosos pedimentos, faga primero click sobre o cliente e despois escolla "%s".
+OptionToSetOrderBilledNotEnabled=Opción do modulo fluxo de traballo, modificar o pedimento a 'Facturado' automáticamente cando a factura é validada, está desactivado, polo que hai que modificar o estado da orde a 'Facturado' manualmente despois de que a factura sexa xerada.
+IfValidateInvoiceIsNoOrderStayUnbilled=Se a validación da factura é 'Non', a orde retornará a modo 'Non facturado' ata que a factura sexa validada.
+CloseReceivedSupplierOrdersAutomatically=Pechar pedimento a modo "%s" automaticamente se todos os produtos foron recibidos.
+SetShippingMode=Indica o modo de envío
+WithReceptionFinished=Con recepción finalizada
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Anulada
+StatusSupplierOrderDraftShort=Borrador
+StatusSupplierOrderValidatedShort=Validado
+StatusSupplierOrderSentShort=Expedición en curso
+StatusSupplierOrderSent=Envío en curso
+StatusSupplierOrderOnProcessShort=Pedido
+StatusSupplierOrderProcessedShort=Procesado
+StatusSupplierOrderDelivered=Emitido
+StatusSupplierOrderDeliveredShort=Emitido
+StatusSupplierOrderToBillShort=Emitido
+StatusSupplierOrderApprovedShort=Aprobada
+StatusSupplierOrderRefusedShort=Rexeitada
+StatusSupplierOrderToProcessShort=A procesar
+StatusSupplierOrderReceivedPartiallyShort=Recibido parcialmente
+StatusSupplierOrderReceivedAllShort=Produtos recibidos
+StatusSupplierOrderCanceled=Anulada
+StatusSupplierOrderDraft=Borrador (é preciso validar)
+StatusSupplierOrderValidated=Validado
+StatusSupplierOrderOnProcess=Pedido - Agardando recepción
+StatusSupplierOrderOnProcessWithValidation=Pedido - Agardando recibir ou validar
+StatusSupplierOrderProcessed=Procesado
+StatusSupplierOrderToBill=Emitido
+StatusSupplierOrderApproved=Aprobada
+StatusSupplierOrderRefused=Rexeitada
+StatusSupplierOrderReceivedPartially=Recibido parcialmente
+StatusSupplierOrderReceivedAll=Todos os productos recibidos
diff --git a/htdocs/langs/gl_ES/other.lang b/htdocs/langs/gl_ES/other.lang
new file mode 100644
index 00000000000..6dcdf5749a9
--- /dev/null
+++ b/htdocs/langs/gl_ES/other.lang
@@ -0,0 +1,286 @@
+# Dolibarr language file - Source file is en_US - other
+SecurityCode=Security code
+NumberingShort=N°
+Tools=Tools
+TMenuTools=Tools
+ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
+Birthday=Birthday
+BirthdayDate=Birthday date
+DateToBirth=Birth date
+BirthdayAlertOn=birthday alert active
+BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (text) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+DocFileGeneratedInto=Doc file generated into <b>%s</b>.
+JumpToLogin=Disconnected. Go to login page...
+MessageForm=Message on online payment form
+MessageOK=Message on the return page for a validated payment
+MessageKO=Message on the return page for a canceled payment
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursively
+PoweredBy=Powered by
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+DateNextInvoiceBeforeGen=Date of next invoice (before generation)
+DateNextInvoiceAfterGen=Date of next invoice (after generation)
+GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
+OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Only the first selected field has been selected.
+AtLeastOneMeasureIsRequired=At least 1 field for measure is required
+AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
+LatestBlogPosts=Latest Blog Posts
+Notify_ORDER_VALIDATE=Sales order validated
+Notify_ORDER_SENTBYMAIL=Sales order sent by mail
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
+Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
+Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
+Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
+Notify_PROPAL_VALIDATE=Customer proposal validated
+Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
+Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
+Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
+Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
+Notify_WITHDRAW_CREDIT=Credit withdrawal
+Notify_WITHDRAW_EMIT=Perform withdrawal
+Notify_COMPANY_CREATE=Third party created
+Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_BILL_VALIDATE=Customer invoice validated
+Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_BILL_PAYED=Customer invoice paid
+Notify_BILL_CANCEL=Customer invoice canceled
+Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
+Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
+Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
+Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
+Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
+Notify_CONTRACT_VALIDATE=Contract validated
+Notify_FICHINTER_VALIDATE=Intervention validated
+Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
+Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
+Notify_SHIPPING_VALIDATE=Shipping validated
+Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail
+Notify_MEMBER_VALIDATE=Member validated
+Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_SUBSCRIPTION=Member subscribed
+Notify_MEMBER_RESILIATE=Member terminated
+Notify_MEMBER_DELETE=Member deleted
+Notify_PROJECT_CREATE=Project creation
+Notify_TASK_CREATE=Task created
+Notify_TASK_MODIFY=Task modified
+Notify_TASK_DELETE=Task deleted
+Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
+Notify_EXPENSE_REPORT_APPROVE=Expense report approved
+Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
+Notify_HOLIDAY_APPROVE=Leave request approved
+SeeModuleSetup=See setup of module %s
+NbOfAttachedFiles=Number of attached files/documents
+TotalSizeOfAttachedFiles=Total size of attached files/documents
+MaxSize=Maximum size
+AttachANewFile=Attach a new file/document
+LinkedObject=Linked object
+NbOfActiveNotifications=Number of notifications (no. of recipient emails)
+PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to remind you that the invoice  __REF__ seems to have not been paid. A copy of the invoice is attached as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find commercial proposal __REF__ attached \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price request __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
+ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
+DemoFundation=Manage members of a foundation
+DemoFundation2=Manage members and bank account of a foundation
+DemoCompanyServiceOnly=Company or freelance selling service only
+DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
+DemoCompanyAll=Company with multiple activities (all main modules)
+CreatedBy=Created by %s
+ModifiedBy=Modified by %s
+ValidatedBy=Validated by %s
+ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made latest change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made latest change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
+FileWasRemoved=File %s was removed
+DirWasRemoved=Directory %s was removed
+FeatureNotYetAvailable=Feature not yet available in the current version
+FeaturesSupported=Supported features
+Width=Width
+Height=Height
+Depth=Depth
+Top=Top
+Bottom=Bottom
+Left=Left
+Right=Right
+CalculatedWeight=Calculated weight
+CalculatedVolume=Calculated volume
+Weight=Weight
+WeightUnitton=tonne
+WeightUnitkg=kg
+WeightUnitg=g
+WeightUnitmg=mg
+WeightUnitpound=pound
+WeightUnitounce=ounce
+Length=Length
+LengthUnitm=m
+LengthUnitdm=dm
+LengthUnitcm=cm
+LengthUnitmm=mm
+Surface=Area
+SurfaceUnitm2=m²
+SurfaceUnitdm2=dm²
+SurfaceUnitcm2=cm²
+SurfaceUnitmm2=mm²
+SurfaceUnitfoot2=ft²
+SurfaceUnitinch2=in²
+Volume=Volume
+VolumeUnitm3=m³
+VolumeUnitdm3=dm³ (L)
+VolumeUnitcm3=cm³ (ml)
+VolumeUnitmm3=mm³ (µl)
+VolumeUnitfoot3=ft³
+VolumeUnitinch3=in³
+VolumeUnitounce=ounce
+VolumeUnitlitre=litre
+VolumeUnitgallon=gallon
+SizeUnitm=m
+SizeUnitdm=dm
+SizeUnitcm=cm
+SizeUnitmm=mm
+SizeUnitinch=inch
+SizeUnitfoot=foot
+SizeUnitpoint=point
+BugTracker=Bug tracker
+SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
+BackToLoginPage=Back to login page
+AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
+EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
+ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
+DolibarrDemo=Dolibarr ERP/CRM demo
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of sales orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of vendor proposals
+NumberOfSupplierOrders=Number of purchase orders
+NumberOfSupplierInvoices=Number of vendor invoices
+NumberOfContracts=Number of contracts
+NumberOfMos=Number of manufacturing orders
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on sales orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on vendor proposals
+NumberOfUnitsSupplierOrders=Number of units on purchase orders
+NumberOfUnitsSupplierInvoices=Number of units on vendor invoices
+NumberOfUnitsContracts=Number of units on contracts
+NumberOfUnitsMos=Number of units to produce in manufacturing orders
+EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
+EMailTextInterventionValidated=The intervention %s has been validated.
+EMailTextInvoiceValidated=Invoice %s has been validated.
+EMailTextInvoicePayed=Invoice %s has been paid.
+EMailTextProposalValidated=Proposal %s has been validated.
+EMailTextProposalClosedSigned=Proposal %s has been closed signed.
+EMailTextOrderValidated=Order %s has been validated.
+EMailTextOrderApproved=Order %s has been approved.
+EMailTextOrderValidatedBy=Order %s has been recorded by %s.
+EMailTextOrderApprovedBy=Order %s has been approved by %s.
+EMailTextOrderRefused=Order %s has been refused.
+EMailTextOrderRefusedBy=Order %s has been refused by %s.
+EMailTextExpeditionValidated=Shipping %s has been validated.
+EMailTextExpenseReportValidated=Expense report %s has been validated.
+EMailTextExpenseReportApproved=Expense report %s has been approved.
+EMailTextHolidayValidated=Leave request %s has been validated.
+EMailTextHolidayApproved=Leave request %s has been approved.
+ImportedWithSet=Importation data set
+DolibarrNotification=Automatic notification
+ResizeDesc=Enter new width <b>OR</b> new height. Ratio will be kept during resizing...
+NewLength=New width
+NewHeight=New height
+NewSizeAfterCropping=New size after cropping
+DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner)
+CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
+ImageEditor=Image editor
+YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s.
+YouReceiveMailBecauseOfNotification2=This event is the following:
+ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start".
+UseAdvancedPerms=Use the advanced permissions of some modules
+FileFormat=File format
+SelectAColor=Choose a color
+AddFiles=Add Files
+StartUpload=Start upload
+CancelUpload=Cancel upload
+FileIsTooBig=Files is too big
+PleaseBePatient=Please be patient...
+NewPassword=New password
+ResetPassword=Reset password
+RequestToResetPasswordReceived=A request to change your password has been received.
+NewKeyIs=This is your new keys to login
+NewKeyWillBe=Your new key to login to software will be
+ClickHereToGoTo=Click here to go to %s
+YouMustClickToChange=You must however first click on the following link to validate this password change
+ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
+Chart=Chart
+PassEncoding=Password encoding
+PermissionsAdd=Permissions added
+PermissionsDelete=Permissions removed
+YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+YourPasswordHasBeenReset=Your password has been reset successfully
+ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+MissingIds=Missing ids
+ThirdPartyCreatedByEmailCollector=Third party created by email collector from email MSGID %s
+ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s
+ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
+TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
+OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+
+##### Export #####
+ExportsArea=Exports area
+AvailableFormats=Available formats
+LibraryUsed=Library used
+LibraryVersion=Library version
+ExportableDatas=Exportable data
+NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
+##### External sites #####
+WebsiteSetup=Setup of module website
+WEBSITE_PAGEURL=URL of page
+WEBSITE_TITLE=Título
+WEBSITE_DESCRIPTION=Descrición
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
+WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
+
+MemoryUsage=Memory usage
+RequestDuration=Duration of request
+PopuProp=Products/Services by popularity in Proposals
+PopuCom=Products/Services by popularity in Orders
+ProductStatistics=Products/Services Statistics
+NbOfQtyInOrders=Qty in orders
diff --git a/htdocs/langs/gl_ES/paybox.lang b/htdocs/langs/gl_ES/paybox.lang
new file mode 100644
index 00000000000..e993d94eb67
--- /dev/null
+++ b/htdocs/langs/gl_ES/paybox.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - paybox
+PayBoxSetup=PayBox module setup
+PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+Creditor=Creditor
+PaymentCode=Payment code
+PayBoxDoPayment=Pay with Paybox
+YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
+Continue=Seguinte
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
+YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/gl_ES/paypal.lang b/htdocs/langs/gl_ES/paypal.lang
new file mode 100644
index 00000000000..5eb5f389445
--- /dev/null
+++ b/htdocs/langs/gl_ES/paypal.lang
@@ -0,0 +1,36 @@
+# Dolibarr language file - Source file is en_US - paypal
+PaypalSetup=PayPal module setup
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
+PAYPAL_API_SANDBOX=Mode test/sandbox
+PAYPAL_API_USER=API username
+PAYPAL_API_PASSWORD=API password
+PAYPAL_API_SIGNATURE=API signature
+PAYPAL_SSLVERSION=Curl SSL Version
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
+PaypalModeIntegral=Integral
+PaypalModeOnlyPaypal=PayPal only
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
+ThisIsTransactionId=This is id of transaction: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
+NewOnlinePaymentReceived=New online payment received
+NewOnlinePaymentFailed=New online payment tried but failed
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
+ReturnURLAfterPayment=Return URL after payment
+ValidationOfOnlinePaymentFailed=Validation of online payment failed
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
+DetailedErrorMessage=Detailed Error Message
+ShortErrorMessage=Short Error Message
+ErrorCode=Error Code
+ErrorSeverityCode=Error Severity Code
+OnlinePaymentSystem=Online payment system
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/gl_ES/printing.lang b/htdocs/langs/gl_ES/printing.lang
new file mode 100644
index 00000000000..8c4c9f92a6f
--- /dev/null
+++ b/htdocs/langs/gl_ES/printing.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - printing
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
+PrintingSetup=Setup of Direct Printing System
+PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer without needing to open the document in another application.
+MenuDirectPrinting=Direct Printing jobs
+DirectPrint=Direct print
+PrintingDriverDesc=Configuration variables for printing driver.
+ListDrivers=List of drivers
+PrintTestDesc=List of Printers.
+FileWasSentToPrinter=File %s was sent to printer
+ViaModule=via the module
+NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
+PleaseSelectaDriverfromList=Please select a driver from list.
+PleaseConfigureDriverfromList=Please configure the selected driver from list.
+SetupDriver=Driver setup
+TargetedPrinter=Targeted printer
+UserConf=Setup per user
+PRINTGCP_INFO=Google OAuth API setup
+PRINTGCP_AUTHLINK=Authentication
+PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
+PrintGCPDesc=This driver allows sending documents directly to a printer using Google Cloud Print.
+GCP_Name=Nome
+GCP_displayName=Display Name
+GCP_Id=Printer Id
+GCP_OwnerName=Owner Name
+GCP_State=Printer State
+GCP_connectionStatus=Online State
+GCP_Type=Printer Type
+PrintIPPDesc=This driver allows sending of documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Porto
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Contrasinal
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+IPP_Uri=Printer Uri
+IPP_Name=Printer Name
+IPP_State=Printer State
+IPP_State_reason=State reason
+IPP_State_reason1=State reason1
+IPP_BW=BW
+IPP_Color=Cor
+IPP_Device=Device
+IPP_Media=Printer media
+IPP_Supported=Type of media
+DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
+GoogleAuthNotConfigured=Google OAuth has not been setup. Enable module OAuth and set a Google ID/Secret.
+GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
+PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
+PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
+PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+PrintTestDescprintipp=List of Printers for Cups.
diff --git a/htdocs/langs/gl_ES/productbatch.lang b/htdocs/langs/gl_ES/productbatch.lang
new file mode 100644
index 00000000000..1c19e4fb96f
--- /dev/null
+++ b/htdocs/langs/gl_ES/productbatch.lang
@@ -0,0 +1,24 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Use lot/serial number
+ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusNotOnBatch=No (lot/serial not used)
+ProductStatusOnBatchShort=Sí
+ProductStatusNotOnBatchShort=Non
+Batch=Lot/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
+batch_number=Lot/Serial number
+BatchNumberShort=Lot/Serial
+EatByDate=Eat-by date
+SellByDate=Sell-by date
+DetailBatchNumber=Lot/Serial details
+printBatch=Lot/Serial: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
+StockDetailPerBatch=Stock detail per lot
diff --git a/htdocs/langs/gl_ES/products.lang b/htdocs/langs/gl_ES/products.lang
new file mode 100644
index 00000000000..218207e2737
--- /dev/null
+++ b/htdocs/langs/gl_ES/products.lang
@@ -0,0 +1,385 @@
+# Dolibarr language file - Source file is en_US - products
+ProductRef=Ref. produto
+ProductLabel=Etiqueta produto
+ProductLabelTranslated=Tradución etiqueta de produto
+ProductDescription=Product description
+ProductDescriptionTranslated=Tradución da descrición de produto
+ProductNoteTranslated=Tradución notas de produto
+ProductServiceCard=Ficha Produto/Servizo
+TMenuProducts=Produtos
+TMenuServices=Servizos
+Products=Produtos
+Services=Servizos
+Product=Produto
+Service=Servizo
+ProductId=ID produto/servizo
+Create=Crear
+Reference=Referencia
+NewProduct=Novo produto
+NewService=Novo servizo
+ProductVatMassChange=Cambio de IVE masivo
+ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
+MassBarcodeInit=Mass barcode init
+MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
+ProductAccountancyBuyCode=Código contable (compra)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
+ProductAccountancySellCode=Código contable (venda)
+ProductAccountancySellIntraCode=Código contable (venda intracomunitaria)
+ProductAccountancySellExportCode=Código contable (venda de exportación)
+ProductOrService=Produto ou servizo
+ProductsAndServices=Produtos e servizos
+ProductsOrServices=Produtos ou servizos
+ProductsPipeServices=Produtos | Servizos
+ProductsOnSale=Products for sale
+ProductsOnPurchase=Products for purchase
+ProductsOnSaleOnly=Produtos só á venda
+ProductsOnPurchaseOnly=Produtos só en compra
+ProductsNotOnSell=Produtos nin á venda nin en compra
+ProductsOnSellAndOnBuy=Produtos en venda e en compra
+ServicesOnSale=Services for sale
+ServicesOnPurchase=Services for purchase
+ServicesOnSaleOnly=Servizos só á venda
+ServicesOnPurchaseOnly=Servizos só en compra
+ServicesNotOnSell=Servizos fora de venda e de compra
+ServicesOnSellAndOnBuy=Servizos á venda e en compra
+LastModifiedProductsAndServices=Últimos %s produtos/servizos modificados
+LastRecordedProducts=Últimos %s produtos rexistrados
+LastRecordedServices=Últimos %s servizos rexistrados
+CardProduct0=Produto
+CardProduct1=Servizo
+Stock=Stock
+MenuStocks=Stocks
+Stocks=Stocks e localización de produtos (almacén)
+Movements=Movementos
+Sell=Vendas
+Buy=Compras
+OnSell=En venda
+OnBuy=En compra
+NotOnSell=Fora de venda
+ProductStatusOnSell=En venda
+ProductStatusNotOnSell=Fora de venda
+ProductStatusOnSellShort=En venda
+ProductStatusNotOnSellShort=Fora de venda
+ProductStatusOnBuy=En compra
+ProductStatusNotOnBuy=Fora de compra
+ProductStatusOnBuyShort=En compra
+ProductStatusNotOnBuyShort=Fora de compra
+UpdateVAT=Actualizar IVE
+UpdateDefaultPrice=Actualizar prezo por defecto
+UpdateLevelPrices=Actualizar prezos para cada nivel
+AppliedPricesFrom=Prezo de venda
+SellingPrice=Prezo de venda
+SellingPriceHT=Prezo de venda sen IVE
+SellingPriceTTC=Prezo de venda con IVE
+SellingMinPriceTTC=Minimum Selling price (inc. tax)
+CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceUsage=This value could be used for margin calculation.
+SoldAmount=Importe vendas
+PurchasedAmount=Importe compras
+NewPrice=Novo prezo
+MinPrice=Prezo de venda mín.
+EditSellingPriceLabel=Editar etiqueta prezo de venda
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
+ContractStatusClosed=Pechada
+ErrorProductAlreadyExists=Un produto coa referencia %s xa existe.
+ErrorProductBadRefOrLabel=Wrong value for reference or label.
+ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
+Suppliers=Provedores
+SupplierRef=Vendor SKU
+ShowProduct=Amosar produto
+ShowService=Amosar servizo
+ProductsAndServicesArea=Área produtos e servizos
+ProductsArea=Área Produtos
+ServicesArea=Área Servizos
+ListOfStockMovements=Listaxe de movementos de stock
+BuyingPrice=Prezo de compra
+PriceForEachProduct=Produtos con prezos específicos
+SupplierCard=Ficha provedor
+PriceRemoved=Prezo eliminado
+BarCode=Código de barras
+BarcodeType=Tipo de código de barras
+SetDefaultBarcodeType=Defina o tipo de código de barras
+BarcodeValue=Valor do código de barras
+NoteNotVisibleOnBill=Nota (non visible nas facturas, orzamentos...)
+ServiceLimitedDuration=Se o produto é un servizo con duración limitada :
+MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
+MultiPricesNumPrices=Number of prices
+AssociatedProductsAbility=Activate virtual products (kits)
+AssociatedProducts=Virtual products
+AssociatedProductsNumber=Number of products composing this virtual product
+ParentProductsNumber=Number of parent packaging product
+ParentProducts=Parent products
+IfZeroItIsNotAVirtualProduct=Se 0, este produto non é un produto virtual
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+KeywordFilter=Filtro por clave
+CategoryFilter=Category filter
+ProductToAddSearch=Search product to add
+NoMatchFound=No match found
+ListOfProductsServices=List of products/services
+ProductAssociationList=Listaxe de produtos/servizos que compoñen este produto virtual /produto/kit
+ProductParentList=List of virtual products/services with this product as a component
+ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
+DeleteProduct=Eliminar un produto/servizo
+ConfirmDeleteProduct=¿Está certo de querer eliminar este produto/servizo?
+ProductDeleted=O produto/servizo "%s" foi eliminado da base de datos.
+ExportDataset_produit_1=Produtos
+ExportDataset_service_1=Servizos
+ImportDataset_produit_1=Produtos
+ImportDataset_service_1=Servizos
+DeleteProductLine=Eliminar liña  de produto
+ConfirmDeleteProductLine=¿Está certo de querer eliminar esta liña  de produto?
+ProductSpecial=Especial
+QtyMin=Cantidad mínima de compra
+PriceQtyMin=Price quantity min.
+PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
+VATRateForSupplierProduct=Tasa IVE (para este produto/provedor)
+DiscountQtyMin=Desconto para esta cantidade
+NoPriceDefinedForThisSupplier=Ningún prezo/cant. definido para este provedor/produto
+NoSupplierPriceDefinedForThisProduct=Ningún prezo/cant. a provedor definida para este produto
+PredefinedProductsToSell=Produtos predefinidos
+PredefinedServicesToSell=Servizos predefinidos
+PredefinedProductsAndServicesToSell=Produtos/servizos predefinidos á venda
+PredefinedProductsToPurchase=Produto predefinido para compra
+PredefinedServicesToPurchase=Servizos predefinidos para comprar
+PredefinedProductsAndServicesToPurchase=Produtos/servizos predefinidos para compra
+NotPredefinedProducts=Sen produtos/servizos predefinidos
+GenerateThumb=Xerar a etiqueta
+ServiceNb=Servizo no %s
+ListProductServiceByPopularity=Listaxe de produtos/servizos por popularidade
+ListProductByPopularity=Listaxe de produtos por popularidade
+ListServiceByPopularity=Listaxe de servizos por popularidade
+Finished=Produto manufacturado
+RowMaterial=Materia prima
+ConfirmCloneProduct=¿Está certo de querer clonar o produto ou servizo <b>%s</b>?
+CloneContentProduct=Clonar a información principal do produto/servizo
+ClonePricesProduct=Clonar prezos
+CloneCategoriesProduct=Clone tags/categories linked
+CloneCompositionProduct=Clone virtual product/service
+CloneCombinationsProduct=Clonar variantes de produto
+ProductIsUsed=Este produto é utilizado
+NewRefForClone=Ref. do novo produto/servizo
+SellingPrices=Prezos de venda
+BuyingPrices=Prezos de compra
+CustomerPrices=Prezos a clientes
+SuppliersPrices=Prezos a provedores
+SuppliersPricesOfProductsOrServices=Prezos de provedores (de produtos ou servizos)
+CustomCode=Código aduaneiro / Mercancía /
+CountryOrigin=País de orixe
+Nature=Nature of product (material/finished)
+ShortLabel=Etiqueta curta
+Unit=Unidade
+p=u.
+set=conxunto
+se=conxunto
+second=segundo
+s=s
+hour=hora
+h=h
+day=día
+d=d
+kilogram=kilogramo
+kg=Kg
+gram=gramo
+g=g
+meter=metro
+m=m
+lm=ml
+m2=m²
+m3=m³
+liter=litro
+l=L
+unitP=Peza
+unitSET=Conxunto
+unitS=Segundo
+unitH=Hora
+unitD=Día
+unitG=Gramo
+unitM=Metro
+unitLM=Metro lineal
+unitM2=Metro cadrado
+unitM3=Metro cúbico
+unitL=Litro
+unitT=ton
+unitKG=kg
+unitG=Gramo
+unitMG=mg
+unitLB=pound
+unitOZ=ounce
+unitM=Metro
+unitDM=dm
+unitCM=cm
+unitMM=mm
+unitFT=ft
+unitIN=in
+unitM2=Metro cadrado
+unitDM2=dm²
+unitCM2=cm²
+unitMM2=mm²
+unitFT2=ft²
+unitIN2=in²
+unitM3=Metro cúbico
+unitDM3=dm³
+unitCM3=cm³
+unitMM3=mm³
+unitFT3=ft³
+unitIN3=in³
+unitOZ3=ounce
+unitgallon=gallon
+ProductCodeModel=Modelo de ref. de produto
+ServiceCodeModel=Modelo de ref. de servizo
+CurrentProductPrice=Prezo actual
+AlwaysUseNewPrice=Usar sempre o prezo actual de produto/servizo
+AlwaysUseFixedPrice=Usar o prezo fixado
+PriceByQuantity=Prezos diferentes por cantidade
+DisablePriceByQty=Desactivar prezos por cantidade
+PriceByQuantityRange=Rango cantidade
+MultipriceRules=Regras para segmento de prezos
+UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
+PercentVariationOver=%% variación sobre %s
+PercentDiscountOver=%% desconto sobre %s
+KeepEmptyForAutoCalculation=Mantéñase baleiro para que calcule automáticamente o peso ou volume dos produtos
+VariantRefExample=Examples: COL, SIZE
+VariantLabelExample=Examples: Color, Size
+### composition fabrication
+Build=Fabricar
+ProductsMultiPrice=Produtos e prezos para cada segmento de prezos
+ProductsOrServiceMultiPrice=Prezos a clientes (de produtos ou servizos, multiprezos)
+ProductSellByQuarterHT=Facturación trimestral de produtos antes de impostos
+ServiceSellByQuarterHT=Facturación trimestral de servizos antes de impostos
+Quarter1=1º trimestre
+Quarter2=2º trimestre
+Quarter3=3º trimestre
+Quarter4=4º trimestre
+BarCodePrintsheet=Imprimir código de barras
+PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
+NumberOfStickers=Number of stickers to print on page
+PrintsheetForOneBarCode=Print several stickers for one barcode
+BuildPageToPrint=Generate page to print
+FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
+FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
+DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
+BarCodeDataForProduct=Información do código de barras do produto %s:
+BarCodeDataForThirdparty=Información do código de barras do terceiro %s:
+ResetBarcodeForAllRecords=Definir valores de codigo de barras para todos os rexistros (isto restablecerá os valores de códigos de barras xa rexistrados cos novos valores)
+PriceByCustomer=Diferentes prezos para cada cliente
+PriceCatalogue=Un prezo único de venda por produto/servizo
+PricingRule=Regras para prezos de venda
+AddCustomerPrice=Configurar prezo po cliente
+ForceUpdateChildPriceSoc=Establecer o mesmo prezo nas filiais dos clientes
+PriceByCustomerLog=Historial de prezos previos a clientes
+MinimumPriceLimit=O prezo mínimo non pode ser menor que %s
+MinimumRecommendedPrice=O prezo mínimo recomendado é: %s
+PriceExpressionEditor=Editor de expresión de prezos
+PriceExpressionSelected=Expresión de prezos seleccionada
+PriceExpressionEditorHelp1="price = 2 + 2" ou "2 + 2" para configurar un prezo. Use ; para separar expresións
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
+PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=Valores globais dispoñibles:
+PriceMode=Modo prezo
+PriceNumeric=Número
+DefaultPrice=Prezo por defecto
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Child products
+MinSupplierPrice=Prezo mínimo de compra
+MinCustomerPrice=Prezo mínimo de venda
+DynamicPriceConfiguration=Configuración de prezo dinámico
+DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
+AddVariable=Engadir variable
+AddUpdater=Engadir Actualizador
+GlobalVariables=Variables globais
+VariableToUpdate=Variable a actualizar
+GlobalVariableUpdaters=External updaters for variables
+GlobalVariableUpdaterType0=datos JSON
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
+UpdateInterval=Intervalo de actualización (minutos)
+LastUpdated=Última actualización
+CorrectlyUpdated=Actualizado correctamente
+PropalMergePdfProductActualFile=Arcquivos usados para engadir no PDF Azur son
+PropalMergePdfProductChooseFile=Seleccione os arquivos PDF
+IncludingProductWithTag=Produtos/servizos incluidos co tag
+DefaultPriceRealPriceMayDependOnCustomer=Prezo por defecto, ou prezo real pode depender do cliente
+WarningSelectOneDocument=Seleccione alo menos un documento
+DefaultUnitToShow=Unidade
+NbOfQtyInProposals=Cant. en orzamentos
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+ProductsOrServicesTranslations=Tradución Produtos/Servizos
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+WidthUnits=Width unit
+LengthUnits=Length unit
+HeightUnits=Height unit
+SurfaceUnits=Surface unit
+SizeUnits=Size unit
+DeleteProductBuyPrice=Delete buying price
+ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
+ProductSheet=Product sheet
+ServiceSheet=Service sheet
+PossibleValues=Possible values
+GoOnMenuToCreateVairants=Vaia ao menú %s - %s para preparar variables de atributos (como cores, tamaño, ...)
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
+ProductSupplierDescription=Vendor description for the product
+UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
+PackagingForThisProduct=Packaging
+QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+
+#Attributes
+VariantAttributes=Atributos variantes
+ProductAttributes=Atributos variantes para produtos
+ProductAttributeName=Atributo variante %s
+ProductAttribute=Atributo variante
+ProductAttributeDeleteDialog=¿Está certo de querer eliminar este atributo? Todos os valores serán eliminados
+ProductAttributeValueDeleteDialog=¿Está certo de querer eliminar o valor "%s" con referencia "%s" deste atributo?
+ProductCombinationDeleteDialog=¿Está certo de querer eliminar a variante do produto "<strong>%s</strong>"?
+ProductCombinationAlreadyUsed=Aconteceu un erro eliminando a variante. Comprobe que non está a ser usada por algún obxecto
+ProductCombinations=Variantes
+PropagateVariant=Propagar variantes
+HideProductCombinations=Ocultar as variantes de produto no selector de produtos
+ProductCombination=Variante
+NewProductCombination=Nova variante
+EditProductCombination=Editando variante
+NewProductCombinations=Novas variantes
+EditProductCombinations=Editando variantes
+SelectCombination=Seleccione combinación
+ProductCombinationGenerator=Xerador de variantes
+Features=Funcións
+PriceImpact=Impacto no prezo
+WeightImpact=Impacto no peso
+NewProductAttribute=Novo atributo
+NewProductAttributeValue=Novo valor de atributo
+ErrorCreatingProductAttributeValue=Ocurriu un erro ao crear o valor do atributo. Esto pode ser por que xa existía un valor con esta referencia
+ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
+TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
+DoNotRemovePreviousCombinations=Non remover variantes previas
+UsePercentageVariations=Utilizar variacións porcentuais
+PercentageVariation=Variación porcentual
+ErrorDeletingGeneratedProducts=Aconteceu un erro mentres eliminaba as variantes de produtos existentes
+NbOfDifferentValues=Nº de valores diferentes
+NbProducts=Number of products
+ParentProduct=Parent product
+HideChildProducts=Ocultar as variantes de produtos
+ShowChildProducts=Amosar a variantes de produtos
+NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
+ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
+CloneDestinationReference=Referencia de produto de destino
+ErrorCopyProductCombinations=Aconteceu un erro ao copiar as variantes de produto
+ErrorDestinationProductNotFound=Destino do produto non atopado
+ErrorProductCombinationNotFound=Variante do produto non atopada
+ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
+ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
+DeleteLinkedProduct=Delete the child product linked to the combination
diff --git a/htdocs/langs/gl_ES/projects.lang b/htdocs/langs/gl_ES/projects.lang
new file mode 100644
index 00000000000..b3f52fd5964
--- /dev/null
+++ b/htdocs/langs/gl_ES/projects.lang
@@ -0,0 +1,267 @@
+# Dolibarr language file - Source file is en_US - projects
+RefProject=Ref. proxecto
+ProjectRef=Ref. proxecto
+ProjectId=Id proxecto
+ProjectLabel=Etiqueta proxecto
+ProjectsArea=Área proxectos
+ProjectStatus=Estado do proxecto
+SharedProject=Proxecto compartido
+PrivateProject=Contactos proxecto
+ProjectsImContactFor=Proxectos dos que son contacto explícito
+AllAllowedProjects=Todos os proxectos que podo ler (meus + públicos)
+AllProjects=Todos os proxectos
+MyProjectsDesc=Esta vista está limitada a aqueles proxectos dos que é un contacto
+ProjectsPublicDesc=Esta vista amosa todos os proxectos dos que ten dereito a visualizar.
+TasksOnProjectsPublicDesc=Esta vista amosa todos os proxectos dos que ten dereito a visualizar.
+ProjectsPublicTaskDesc=Esta vista amosa todos os proxectos e tarefas dos que ten dereito a visualizar.
+ProjectsDesc=Esta vista amosa todos os proxectos (os seus permisos de usuario permítenlle ter unha visión completa).
+TasksOnProjectsDesc=Esta vista amosa todos as tarefas (os seus permisos de usuario permítenlle ter unha visión completa).
+MyTasksDesc=Esta vista limítase aos proxectos ou tarefas nos que vostede é un contacto nelas
+OnlyOpenedProject=Só os proxectos abertos son visibles (os proxectos en estado borrador ou pechado non son visibles).
+ClosedProjectsAreHidden=Os proxectos pechados non son visibles.
+TasksPublicDesc=Esta vista amosa todos os proxectos e tarefas nos que vostede ten dereito a visualizar.
+TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+ImportDatasetTasks=Tarefas de proxectos
+ProjectCategories=Etiquetas/categorías de proxectos
+NewProject=Novo proxecto
+AddProject=Crear proxecto
+DeleteAProject=Eliminar un proxecto
+DeleteATask=Eliminar unha tarefa
+ConfirmDeleteAProject=¿Está certo de querer eliminar este proxecto?
+ConfirmDeleteATask=¿Está certo de querer eliminar esta tarefa?
+OpenedProjects=Proxectos abertos
+OpenedTasks=Tarefas abertas
+OpportunitiesStatusForOpenedProjects=Importe oportunidades de proxectos abertos por estado
+OpportunitiesStatusForProjects=Importe oportunidades de proxectos por estado
+ShowProject=Ver proxecto
+ShowTask=Ver tarefa
+SetProject=Definir proxecto
+NoProject=Ningún proxecto definido ou propiedade de
+NbOfProjects=Number of projects
+NbOfTasks=Number of tasks
+TimeSpent=Tempo adicado
+TimeSpentByYou=Tempo adicado por vostede
+TimeSpentByUser=Tempo adicado por usuario
+TimesSpent=Tempos adicados
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
+TaskTimeSpent=Tempo adicado en tarefas
+TaskTimeUser=Usuario
+TaskTimeNote=Nota
+TaskTimeDate=Data
+TasksOnOpenedProject=Tarefas en proxectos abertos
+WorkloadNotDefined=Carga de traballo non definida
+NewTimeSpent=Tempo adicado
+MyTimeSpent=Meu tempo adicado
+BillTime=Facturar tempo adicado
+BillTimeShort=Facturar tempo
+TimeToBill=Time not billed
+TimeBilled=Time billed
+Tasks=Tarefas
+Task=Tarefa
+TaskDateStart=Data inicio tarefa
+TaskDateEnd=Data finalización tarefa
+TaskDescription=Descrición tarefa
+NewTask=Nova tarefa
+AddTask=Crear tarefa
+AddTimeSpent=Engadir tempo adicado
+AddHereTimeSpentForDay=Engadir tempo empregado neste día día/tarefa
+AddHereTimeSpentForWeek=Add here time spent for this week/task
+Activity=Actividade
+Activities=Tarefas/actividades
+MyActivities=As miñas tarefas/actividades
+MyProjects=Os meus proxectos
+MyProjectsArea=A miña Área de proxectos
+DurationEffective=Duración efectiva
+ProgressDeclared=Progresión declarada
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently open tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
+ProgressCalculated=Progresión calculada
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
+Time=Tempo
+ListOfTasks=Listaxe de tarefas
+GoToListOfTimeConsumed=Ir á listaxe de tempos empregados
+GanttView=Vista de Gantt
+ListProposalsAssociatedProject=Listaxe de orzamentos asociados ao proxecto
+ListOrdersAssociatedProject=Listaxe de pedidos de clientes asociados ao proxecto
+ListInvoicesAssociatedProject=Listaxe de facturas a clientes asociadas ao proxecto
+ListPredefinedInvoicesAssociatedProject=Listaxe de facturas asociadas ao proxecto
+ListSupplierOrdersAssociatedProject=Listaxe de pedidos a proveedor asociados ao proxecto
+ListSupplierInvoicesAssociatedProject=Listaxe de facturas de proveedores asociadas ao proxecto
+ListContractAssociatedProject=Listaxe de contratos asociados ao proxecto
+ListShippingAssociatedProject=Listaxe de envíos asociados ao proxecto
+ListFichinterAssociatedProject=Listaxe de intervencións asociadas ao proxecto
+ListExpenseReportsAssociatedProject=Listaxe de informes de gastos asociados ao proxecto
+ListDonationsAssociatedProject=Listaxe de donacións asociadas ao proxecto
+ListVariousPaymentsAssociatedProject=Listaxe de pagos diversos asociados ao proxecto
+ListSalariesAssociatedProject=Listaxe de pagos de salarios asociados ao proxecto
+ListActionsAssociatedProject=Listaxe de eventos asociados ao proxecto
+ListMOAssociatedProject=List of manufacturing orders related to the project
+ListTaskTimeUserProject=Listaxe de tempo empregado en tarefas do proxecto
+ListTaskTimeForTask=Listaxe de tempo empregado na tarefa
+ActivityOnProjectToday=Actividade no proxecto hoxe
+ActivityOnProjectYesterday=Actividade no proxecto onte
+ActivityOnProjectThisWeek=Actividade no proxecto esta semana
+ActivityOnProjectThisMonth=Actividade no proxecto este mes
+ActivityOnProjectThisYear=Actividade no proxecto este ano
+ChildOfProjectTask=Fío da tarefa
+ChildOfTask=Fío da tarefa
+TaskHasChild=A tarefa ten fíos
+NotOwnerOfProject=Non é dono deste proxecto privado
+AffectedTo=Asignado a
+CantRemoveProject=Este proxecto non pode ser eliminado porque está referenciado por algúns outros obxectoss (facturas, pedidos ou outras). Ver lapela de referencias.
+ValidateProject=Validar proxecto
+ConfirmValidateProject=¿Está certo de querer validar este proxecto?
+CloseAProject=Pechar proxecto
+ConfirmCloseAProject=¿Está certo de querer pechar este proxecto?
+AlsoCloseAProject=Pechar tamén o proxecto (manter aberto se aínda precisa continuar coas tarefas de produción nel)
+ReOpenAProject=Reabrir proxecto
+ConfirmReOpenAProject=Está certo de querer reabrir este proxecto?
+ProjectContact=Contacts of project
+TaskContact=Contactos de tarefas
+ActionsOnProject=Eventos do proxecto
+YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
+DeleteATimeSpent=Delete time spent
+ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
+TaskRessourceLinks=Contacts of task
+ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
+NoTasks=No tasks for this project
+LinkedToAnotherCompany=Linked to other third party
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
+ErrorTimeSpentIsEmpty=Time spent is empty
+ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
+IfNeedToUseOtherObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
+CloneTasks=Clonar as tarefas
+CloneContacts=Clonar os contactos
+CloneNotes=Clonar a notas
+CloneProjectFiles=Clone project joined files
+CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
+CloneMoveDate=Update project/tasks dates from now?
+ConfirmCloneProject=Are you sure to clone this project?
+ProjectReportDate=Change task dates according to new project start date
+ErrorShiftTaskDate=Impossible to shift task date according to new project start date
+ProjectsAndTasksLines=Projects and tasks
+ProjectCreatedInDolibarr=Proxecto %s creado
+ProjectValidatedInDolibarr=Proxecto %s validado
+ProjectModifiedInDolibarr=Proxecto %s modificado
+TaskCreatedInDolibarr=La tarefa %s fue creada
+TaskModifiedInDolibarr=La tarefa %s fue modificada
+TaskDeletedInDolibarr=La tarefa %s fue eliminada
+OpportunityStatus=Estado de oportunidade
+OpportunityStatusShort=Est. Oport.
+OpportunityProbability=Probabilidade de oportunidade
+OpportunityProbabilityShort=Prob. Opor.
+OpportunityAmount=Importe Oport.
+OpportunityAmountShort=Importe oportunidade
+OpportunityWeightedAmount=Opportunity weighted amount
+OpportunityWeightedAmountShort=Opp. weighted amount
+OpportunityAmountAverageShort=Importe promedio oportunidade
+OpportunityAmountWeigthedShort=Importe ponderado oportunidade
+WonLostExcluded=Excluidos Gañados/Perdidos
+##### Types de contacts #####
+TypeContact_project_internal_PROJECTLEADER=Xefe de proxecto
+TypeContact_project_external_PROJECTLEADER=Xefe de proxecto
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Participante
+TypeContact_project_external_PROJECTCONTRIBUTOR=Participante
+TypeContact_project_task_internal_TASKEXECUTIVE=Responsable
+TypeContact_project_task_external_TASKEXECUTIVE=Responsable
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Participante
+TypeContact_project_task_external_TASKCONTRIBUTOR=Participante
+SelectElement=Escolla elemento
+AddElement=Vincular ao elmento
+# Documents models
+DocumentModelBeluga=Prantilla de documento do para a descrición dos obxectos vinculados
+DocumentModelBaleine=Prantilla de documendo do proxecto para tarefas
+DocumentModelTimeSpent=Prantilla de informe de proxecto para o tempo empregado
+PlannedWorkload=Carga de traballo planificada
+PlannedWorkloadShort=Carga de traballo
+ProjectReferers=Items relacionados
+ProjectMustBeValidatedFirst=O proxecto previamente ten que validarse
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+InputPerDay=Entrada por día
+InputPerWeek=Entrada por semana
+InputPerMonth=Input per month
+InputDetail=Detalle de entrada
+TimeAlreadyRecorded=Tempo adicado xa rexistrado para esta tarefa/día e usuario %s
+ProjectsWithThisUserAsContact=Proxectos con este usuario como contacto
+TasksWithThisUserAsContact=Tarefas asignadas a este usuario
+ResourceNotAssignedToProject=Non asignado ao proxecto
+ResourceNotAssignedToTheTask=Non asignado á tarefa
+NoUserAssignedToTheProject=Ningún usuario asignado a este proxecto
+TimeSpentBy=Tempo empregado por
+TasksAssignedTo=Tarefas asignadas a
+AssignTaskToMe=Asignarme a tarefa
+AssignTaskToUser=Asignar a tarefa a %s
+SelectTaskToAssign=Escolla tarefa a asignar...
+AssignTask=Asignar
+ProjectOverview=Resumo
+ManageTasks=Usar proxectos para seguir tarefas e/ou tempos empregados (follas de tempo)
+ManageOpportunitiesStatus=Usar proxectos para seguir oportunidades
+ProjectNbProjectByMonth=Nº de proxectos creados por mes
+ProjectNbTaskByMonth=Nº de tarefas creadas por mes
+ProjectOppAmountOfProjectsByMonth=Importe de oportunidades por mes
+ProjectWeightedOppAmountOfProjectsByMonth=Importe medio oportinidades por mes
+ProjectOpenedProjectByOppStatus=Proxectos/oportunidades abertas por estado da oportunidade
+ProjectsStatistics=Estatísticas sobre proxectos/oportunidades
+TasksStatistics=Estatísticas sobre tarefas en proxectos/oportunidade
+TaskAssignedToEnterTime=Tarefa asignada. Debería poder introducir tempos nesta tarefa.
+IdTaskTime=Id tempo da tarefa
+YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
+OpenedProjectsByThirdparties=Proxectos abertos de terceiros
+OnlyOpportunitiesShort=Só oportunidades
+OpenedOpportunitiesShort=Oportunidades abertas
+NotOpenedOpportunitiesShort=Not an open lead
+NotAnOpportunityShort=Non é unha oportunidade
+OpportunityTotalAmount=Importe total de oportunidades
+OpportunityPonderatedAmount=Importe medio de oportunidades
+OpportunityPonderatedAmountDesc=Importe medio oportunidades con probabilidade
+OppStatusPROSP=Prospección
+OppStatusQUAL=Cualificación
+OppStatusPROPO=Orzamento
+OppStatusNEGO=Negociación
+OppStatusPENDING=Pendente
+OppStatusWON=Gañado
+OppStatusLOST=Perdido
+Budget=Orzamento
+AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
+LatestProjects=Últimos %s proxectos
+LatestModifiedProjects=Últimos %s proxectos modificados
+OtherFilteredTasks=Outras tarefas filtradas
+NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
+ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+# Comments trans
+AllowCommentOnTask=Allow user comments on tasks
+AllowCommentOnProject=Allow user comments on projects
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=Informacións do proxecto %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
+NewTaskRefSuggested=Task ref already used, a new task ref is required
+TimeSpentInvoiced=Tenpo empregado facturado
+TimeSpentForInvoice=Tempo empregado
+OneLinePerUser=One line per user
+ServiceToUseOnLines=Service to use on lines
+InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
+ProjectFollowOpportunity=Follow opportunity
+ProjectFollowTasks=Follow tasks or time spent
+Usage=Usage
+UsageOpportunity=Usage: Opportunity
+UsageTasks=Usage: Tasks
+UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=New invoice
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/gl_ES/propal.lang b/htdocs/langs/gl_ES/propal.lang
new file mode 100644
index 00000000000..6af409942a9
--- /dev/null
+++ b/htdocs/langs/gl_ES/propal.lang
@@ -0,0 +1,86 @@
+# Dolibarr language file - Source file is en_US - propal
+Proposals=Orzamentos
+Proposal=Commercial proposal
+ProposalShort=Orzamento
+ProposalsDraft=Draft commercial proposals
+ProposalsOpened=Open commercial proposals
+CommercialProposal=Commercial proposal
+PdfCommercialProposalTitle=Commercial proposal
+ProposalCard=Proposal card
+NewProp=New commercial proposal
+NewPropal=New proposal
+Prospect=Cliente potencial
+DeleteProp=Delete commercial proposal
+ValidateProp=Validate commercial proposal
+AddProp=Create proposal
+ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
+ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
+LastPropals=Latest %s proposals
+LastModifiedProposals=Últimos %s orzamentos modificados
+AllPropals=All proposals
+SearchAProposal=Search a proposal
+NoProposal=No proposal
+ProposalsStatistics=Commercial proposal's statistics
+NumberOfProposalsByMonth=Número por mes
+AmountOfProposalsByMonthHT=Amount by month (excl. tax)
+NbOfProposals=Number of commercial proposals
+ShowPropal=Show proposal
+PropalsDraft=Borradores
+PropalsOpened=Aberta
+PropalStatusDraft=Borrador (é preciso validar)
+PropalStatusValidated=Validated (proposal is open)
+PropalStatusSigned=Signed (needs billing)
+PropalStatusNotSigned=Not signed (closed)
+PropalStatusBilled=Facturado
+PropalStatusDraftShort=Borrador
+PropalStatusValidatedShort=Validated (open)
+PropalStatusClosedShort=Pechada
+PropalStatusSignedShort=Signed
+PropalStatusNotSignedShort=Not signed
+PropalStatusBilledShort=Facturado
+PropalsToClose=Commercial proposals to close
+PropalsToBill=Signed commercial proposals to bill
+ListOfProposals=List of commercial proposals
+ActionsOnPropal=Events on proposal
+RefProposal=Commercial proposal ref
+SendPropalByMail=Send commercial proposal by mail
+DatePropal=Date of proposal
+DateEndPropal=Validity ending date
+ValidityDuration=Validity duration
+CloseAs=Set status to
+SetAcceptedRefused=Set accepted/refused
+ErrorPropalNotFound=Propal %s not found
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
+CopyPropalFrom=Create commercial proposal by copying existing proposal
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
+DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
+ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
+ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
+ProposalsAndProposalsLines=Commercial proposal and lines
+ProposalLine=Proposal line
+AvailabilityPeriod=Availability delay
+SetAvailability=Set availability delay
+AfterOrder=after order
+OtherProposals=Other proposals
+##### Availability #####
+AvailabilityTypeAV_NOW=Immediate
+AvailabilityTypeAV_1W=1 week
+AvailabilityTypeAV_2W=2 weeks
+AvailabilityTypeAV_3W=3 weeks
+AvailabilityTypeAV_1M=1 month
+##### Types de contacts #####
+TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
+TypeContact_propal_external_BILLING=Contacto cliente facturación pedido
+TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
+TypeContact_propal_external_SHIPPING=Customer contact for delivery
+# Document models
+DocModelAzurDescription=A complete proposal model (old implementation of Cyan template)
+DocModelCyanDescription=A complete proposal model
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
+ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/gl_ES/receiptprinter.lang b/htdocs/langs/gl_ES/receiptprinter.lang
new file mode 100644
index 00000000000..c4ac81e8fe8
--- /dev/null
+++ b/htdocs/langs/gl_ES/receiptprinter.lang
@@ -0,0 +1,95 @@
+# Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
+PrinterAdded=Printer %s added
+PrinterUpdated=Printer %s updated
+PrinterDeleted=Printer %s deleted
+TestSentToPrinter=Test Sent To Printer %s
+ReceiptPrinter=Receipt printers
+ReceiptPrinterDesc=Setup of receipt printers
+ReceiptPrinterTemplateDesc=Setup of Templates
+ReceiptPrinterTypeDesc=Description of Receipt Printer's type
+ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
+ListPrinters=List of Printers
+SetupReceiptTemplate=Template Setup
+CONNECTOR_DUMMY=Dummy Printer
+CONNECTOR_NETWORK_PRINT=Network Printer
+CONNECTOR_FILE_PRINT=Local Printer
+CONNECTOR_WINDOWS_PRINT=Local Windows Printer
+CONNECTOR_CUPS_PRINT=Cups Printer
+CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
+CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
+CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
+CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
+PROFILE_DEFAULT=Default Profile
+PROFILE_SIMPLE=Simple Profile
+PROFILE_EPOSTEP=Epos Tep Profile
+PROFILE_P822D=P822D Profile
+PROFILE_STAR=Star Profile
+PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
+PROFILE_SIMPLE_HELP=Simple Profile No Graphics
+PROFILE_EPOSTEP_HELP=Epos Tep Profile
+PROFILE_P822D_HELP=P822D Profile No Graphics
+PROFILE_STAR_HELP=Star Profile
+DOL_LINE_FEED=Skip line
+DOL_ALIGN_LEFT=Left align text
+DOL_ALIGN_CENTER=Center text
+DOL_ALIGN_RIGHT=Right align text
+DOL_USE_FONT_A=Use font A of printer
+DOL_USE_FONT_B=Use font B of printer
+DOL_USE_FONT_C=Use font C of printer
+DOL_PRINT_BARCODE=Imprimir código de barras
+DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
+DOL_CUT_PAPER_FULL=Cut ticket completely
+DOL_CUT_PAPER_PARTIAL=Cut ticket partially
+DOL_OPEN_DRAWER=Open cash drawer
+DOL_ACTIVATE_BUZZER=Activate buzzer
+DOL_PRINT_QRCODE=Print QR Code
+DOL_PRINT_LOGO=Print logo of my company
+DOL_PRINT_LOGO_OLD=Print logo of my company (old printers)
+DOL_BOLD=Bold
+DOL_BOLD_DISABLED=Disable bold
+DOL_DOUBLE_HEIGHT=Double height size
+DOL_DOUBLE_WIDTH=Double width size
+DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
+DOL_UNDERLINE=Enable underline
+DOL_UNDERLINE_DISABLED=Disable underline
+DOL_BEEP=Beed sound
+DOL_PRINT_TEXT=Print text
+DOL_VALUE_DATE=Invoice date
+DOL_VALUE_DATE_TIME=Invoice date and time
+DOL_VALUE_YEAR=Invoice year
+DOL_VALUE_MONTH_LETTERS=Invoice month in letters
+DOL_VALUE_MONTH=Invoice month
+DOL_VALUE_DAY=Invoice day
+DOL_VALUE_DAY_LETTERS=Inovice day in letters
+DOL_LINE_FEED_REVERSE=Line feed reverse
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Invoice ref
+DOL_PRINT_OBJECT_LINES=Invoice lines
+DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
+DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
+DOL_VALUE_CUSTOMER_MAIL=Customer mail
+DOL_VALUE_CUSTOMER_PHONE=Customer phone
+DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
+DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
+DOL_VALUE_MYSOC_NAME=Your company name
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/gl_ES/receptions.lang b/htdocs/langs/gl_ES/receptions.lang
new file mode 100644
index 00000000000..bc33c30d4e1
--- /dev/null
+++ b/htdocs/langs/gl_ES/receptions.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - receptions
+ReceptionsSetup=Product Reception setup
+RefReception=Ref. reception
+Reception=Reception
+Receptions=Receptions
+AllReceptions=All Receptions
+Reception=Reception
+Receptions=Receptions
+ShowReception=Show Receptions
+ReceptionsArea=Receptions area
+ListOfReceptions=List of receptions
+ReceptionMethod=Reception method
+LastReceptions=Latest %s receptions
+StatisticsOfReceptions=Statistics for receptions
+NbOfReceptions=Number of receptions
+NumberOfReceptionsByMonth=Number of receptions by month
+ReceptionCard=Reception card
+NewReception=New reception
+CreateReception=Create reception
+QtyInOtherReceptions=Qty in other receptions
+OtherReceptionsForSameOrder=Other receptions for this order
+ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
+ReceptionsToValidate=Receptions to validate
+StatusReceptionCanceled=Anulado
+StatusReceptionDraft=Borrador
+StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionProcessed=Procesado
+StatusReceptionDraftShort=Borrador
+StatusReceptionValidatedShort=Validado
+StatusReceptionProcessedShort=Procesado
+ReceptionSheet=Reception sheet
+ConfirmDeleteReception=Are you sure you want to delete this reception?
+ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
+ConfirmCancelReception=Are you sure you want to cancel this reception?
+StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
+SendReceptionByEMail=Send reception by email
+SendReceptionRef=Submission of reception %s
+ActionsOnReception=Events on reception
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the order card.
+ReceptionLine=Reception line
+ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
+ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
+ReceptionsNumberingModules=Numbering module for receptions
+ReceptionsReceiptModel=Document templates for receptions
diff --git a/htdocs/langs/gl_ES/resource.lang b/htdocs/langs/gl_ES/resource.lang
new file mode 100644
index 00000000000..360dbebb5ac
--- /dev/null
+++ b/htdocs/langs/gl_ES/resource.lang
@@ -0,0 +1,39 @@
+# Dolibarr language file - Source file is en_US - resource
+MenuResourceIndex=Recursos
+MenuResourceAdd=New resource
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+ActionsOnResource=Events about this resource
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResource=Show resource
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+SelectResource=Select resource
+
+IdResource=Id resource
+AssetNumber=Serial number
+ResourceTypeCode=Resource type code
+ImportDataset_resource_1=Recursos
+
+ErrorResourcesAlreadyInUse=Some resources are in use
+ErrorResourceUseInEvent=%s used in %s event
diff --git a/htdocs/langs/gl_ES/salaries.lang b/htdocs/langs/gl_ES/salaries.lang
new file mode 100644
index 00000000000..3054758f469
--- /dev/null
+++ b/htdocs/langs/gl_ES/salaries.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+Salary=Salary
+Salaries=Salarios
+NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
+SalaryPayment=Salary payment
+SalariesPayments=Salaries payments
+ShowSalaryPayment=Show salary payment
+THM=Average hourly rate
+TJM=Average daily rate
+CurrentSalary=Current salary
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/gl_ES/sendings.lang b/htdocs/langs/gl_ES/sendings.lang
new file mode 100644
index 00000000000..7a2a0c2ce0b
--- /dev/null
+++ b/htdocs/langs/gl_ES/sendings.lang
@@ -0,0 +1,74 @@
+# Dolibarr language file - Source file is en_US - sendings
+RefSending=Ref. shipment
+Sending=Shipment
+Sendings=Envíos
+AllSendings=All Shipments
+Shipment=Shipment
+Shipments=Envíos
+ShowSending=Show Shipments
+Receivings=Delivery Receipts
+SendingsArea=Shipments area
+ListOfSendings=List of shipments
+SendingMethod=Shipping method
+LastSendings=Latest %s shipments
+StatisticsOfSendings=Statistics for shipments
+NbOfSendings=Number of shipments
+NumberOfShipmentsByMonth=Number of shipments by month
+SendingCard=Shipment card
+NewSending=New shipment
+CreateShipment=Create shipment
+QtyShipped=Qty shipped
+QtyShippedShort=Qty ship.
+QtyPreparedOrShipped=Qty prepared or shipped
+QtyToShip=Qty to ship
+QtyToReceive=Qty to receive
+QtyReceived=Qty received
+QtyInOtherShipments=Qty in other shipments
+KeepToShip=Remain to ship
+KeepToShipShort=Remain
+OtherSendingsForSameOrder=Other shipments for this order
+SendingsAndReceivingForSameOrder=Shipments and receipts for this order
+SendingsToValidate=Shipments to validate
+StatusSendingCanceled=Anulado
+StatusSendingDraft=Borrador
+StatusSendingValidated=Validated (products to ship or already shipped)
+StatusSendingProcessed=Procesado
+StatusSendingDraftShort=Borrador
+StatusSendingValidatedShort=Validado
+StatusSendingProcessedShort=Procesado
+SendingSheet=Shipment sheet
+ConfirmDeleteSending=Are you sure you want to delete this shipment?
+ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
+ConfirmCancelSending=Are you sure you want to cancel this shipment?
+DocumentModelMerou=Merou A5 model
+WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+DateDeliveryPlanned=Planned date of delivery
+RefDeliveryReceipt=Ref delivery receipt
+StatusReceipt=Status delivery receipt
+DateReceived=Date delivery received
+ClassifyReception=Classify reception
+SendShippingByEMail=Send shipment by email
+SendShippingRef=Submission of shipment %s
+ActionsOnShipping=Events on shipment
+LinkToTrackYourPackage=Link to track your package
+ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
+ShipmentLine=Shipment line
+ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
+ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
+ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
+NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+
+# Sending methods
+# ModelDocument
+DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty: %d)
diff --git a/htdocs/langs/gl_ES/sms.lang b/htdocs/langs/gl_ES/sms.lang
new file mode 100644
index 00000000000..75f91e553c4
--- /dev/null
+++ b/htdocs/langs/gl_ES/sms.lang
@@ -0,0 +1,51 @@
+# Dolibarr language file - Source file is en_US - sms
+Sms=SMS
+SmsSetup=Configuración dos SMS
+SmsDesc=Esta páxina permite definir as opcións globais dos SMS
+SmsCard=Ficha SMS
+AllSms=Todas as campañas SMS
+SmsTargets=Destinatarios
+SmsRecipients=Destinatarios
+SmsRecipient=Destinatario
+SmsTitle=Descrición
+SmsFrom=Remitente
+SmsTo=Destinatario
+SmsTopic=Asunto do SMS
+SmsText=Mensaxe
+SmsMessage=Mensaxe SMS
+ShowSms=Amosar SMS
+ListOfSms=Listaxe de campañas SMS
+NewSms=Nova campaña de SMS
+EditSms=Editar SMS
+ResetSms=Enviando novo
+DeleteSms=Borrar campaña SMS
+DeleteASms=Retirar campaña SMS
+PreviewSms=Previo SMS
+PrepareSms=Preparar SMS
+CreateSms=Crear SMS
+SmsResult=Resultado do envío de SMS
+TestSms=Test de SMS
+ValidSms=Validar SMS
+ApproveSms=Aprobar SMS
+SmsStatusDraft=Borrador
+SmsStatusValidated=Validado
+SmsStatusApproved=Aprobado
+SmsStatusSent=Enviado
+SmsStatusSentPartialy=Enviado parcialmente
+SmsStatusSentCompletely=Envío completado
+SmsStatusError=Erro
+SmsStatusNotSent=Non enviado
+SmsSuccessfulySent=SMS enviado correctamente (de 1%s a 1%s )
+ErrorSmsRecipientIsEmpty=Number of target is empty
+WarningNoSmsAdded=No new phone number to add to target list
+ConfirmValidSms=Do you confirm validation of this campaign?
+NbOfUniqueSms=No. of unique phone numbers
+NbOfSms=No. of phone numbers
+ThisIsATestMessage=This is a test message
+SendSms=Send SMS
+SmsInfoCharRemain=No. of remaining characters
+SmsInfoNumero= (international format i.e.: +33899701761)
+DelayBeforeSending=Delay before sending (minutes)
+SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
+SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider.
+DisableStopIfSupported=Disable STOP message (if supported)
diff --git a/htdocs/langs/gl_ES/stocks.lang b/htdocs/langs/gl_ES/stocks.lang
new file mode 100644
index 00000000000..a8acfdb4045
--- /dev/null
+++ b/htdocs/langs/gl_ES/stocks.lang
@@ -0,0 +1,220 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseCard=Warehouse card
+Warehouse=Warehouse
+Warehouses=Warehouses
+ParentWarehouse=Parent warehouse
+NewWarehouse=New warehouse / Stock Location
+WarehouseEdit=Modify warehouse
+MenuNewWarehouse=New warehouse
+WarehouseSource=Source warehouse
+WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
+AddOne=Add one
+DefaultWarehouse=Default warehouse
+WarehouseTarget=Target warehouse
+ValidateSending=Delete sending
+CancelSending=Cancel sending
+DeleteSending=Delete sending
+Stock=Stock
+Stocks=Stocks
+StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
+Movements=Movementos
+ErrorWarehouseRefRequired=Warehouse reference name is required
+ListOfWarehouses=List of warehouses
+ListOfStockMovements=Listaxe de movementos de stock
+ListOfInventories=List of inventories
+MovementId=Movement ID
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
+StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
+Location=Localización
+LocationSummary=Short name location
+NumberOfDifferentProducts=Number of different products
+NumberOfProducts=Total number of products
+LastMovement=Latest movement
+LastMovements=Latest movements
+Units=Units
+Unit=Unidade
+StockCorrection=Stock correction
+CorrectStock=Correct stock
+StockTransfer=Stock transfer
+TransferStock=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
+NumberOfUnit=Number of units
+UnitPurchaseValue=Unit purchase price
+StockTooLow=Stock too low
+StockLowerThanLimit=Stock lower than alert limit (%s)
+EnhancedValue=Valor
+PMPValue=Weighted average price
+PMPValueShort=WAP
+EnhancedValueOfWarehouses=Warehouses value
+UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
+QtyDispatched=Quantity dispatched
+QtyDispatchedShort=Qty dispatched
+QtyToDispatchShort=Qty to dispatch
+OrderDispatch=Item receipts
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
+DeStockOnShipment=Decrease real stocks on shipping validation
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
+OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
+StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
+NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
+DispatchVerb=Dispatch
+StockLimitShort=Limit for alert
+StockLimit=Stock limit for alert
+StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+PhysicalStock=Physical Stock
+RealStock=Real Stock
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
+VirtualStock=Virtual stock
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+IdWarehouse=Id warehouse
+DescWareHouse=Description warehouse
+LieuWareHouse=Localisation warehouse
+WarehousesAndProducts=Warehouses and products
+WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
+AverageUnitPricePMPShort=Weighted average input price
+AverageUnitPricePMP=Weighted average input price
+SellPriceMin=Selling Unit Price
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
+EstimatedStockValueShort=Input stock value
+EstimatedStockValue=Input stock value
+DeleteAWarehouse=Delete a warehouse
+ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
+PersonalStock=Personal stock %s
+ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
+SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
+SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
+NoStockAction=No stock action
+DesiredStock=Desired Stock
+DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
+StockToBuy=To order
+Replenishment=Replenishment
+ReplenishmentOrders=Replenishment orders
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
+UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+UseVirtualStock=Use virtual stock
+UsePhysicalStock=Use physical stock
+CurentSelectionMode=Current selection mode
+CurentlyUsingVirtualStock=Virtual stock
+CurentlyUsingPhysicalStock=Physical stock
+RuleForStockReplenishment=Rule for stocks replenishment
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
+AlertOnly= Alerts only
+WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
+WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
+ForThisWarehouse=For this warehouse
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+Replenishments=Replenishments
+NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
+NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
+MassMovement=Mass movement
+SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+RecordMovement=Record transfer
+ReceivingForSameOrder=Receipts for this order
+StockMovementRecorded=Stock movements recorded
+RuleForStockAvailability=Rules on stock requirements
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
+MovementLabel=Label of movement
+TypeMovement=Type of movement
+DateMovement=Date of movement
+InventoryCode=Movement or inventory code
+IsInPackage=Contained into package
+WarehouseAllowNegativeTransfer=Stock can be negative
+qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
+ShowWarehouse=Show warehouse
+MovementCorrectStock=Stock correction for product %s
+MovementTransferStock=Stock transfer of product %s into another warehouse
+InventoryCodeShort=Inv./Mov. code
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
+ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
+OpenAll=Open for all actions
+OpenInternal=Open only for internal actions
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
+OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
+ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
+ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
+ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
+AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
+AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+InventoryDate=Inventory date
+NewInventory=New inventory
+inventorySetup = Inventory Setup
+inventoryCreatePermission=Create new inventory
+inventoryReadPermission=View inventories
+inventoryWritePermission=Update inventories
+inventoryValidatePermission=Validate inventory
+inventoryTitle=Inventario
+inventoryListTitle=Inventories
+inventoryListEmpty=No inventory in progress
+inventoryCreateDelete=Create/Delete inventory
+inventoryCreate=Create new
+inventoryEdit=Editar
+inventoryValidate=Validado
+inventoryDraft=Running
+inventorySelectWarehouse=Warehouse choice
+inventoryConfirmCreate=Crear
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
+inventoryMvtStock=By inventory
+inventoryWarningProductAlreadyExists=This product is already into list
+SelectCategory=Category filter
+SelectFournisseur=Vendor filter
+inventoryOnDate=Inventario
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
+inventoryChangePMPPermission=Allow to change PMP value for a product
+ColumnNewPMP=New unit PMP
+OnlyProdsInStock=Do not add product without stock
+TheoricalQty=Theorique qty
+TheoricalValue=Theorique qty
+LastPA=Last BP
+CurrentPA=Curent BP
+RecordedQty=Recorded Qty
+RealQty=Real Qty
+RealValue=Real Value
+RegulatedQty=Regulated Qty
+AddInventoryProduct=Add product to inventory
+AddProduct=Engadir
+ApplyPMP=Apply PMP
+FlushInventory=Flush inventory
+ConfirmFlushInventory=Do you confirm this action?
+InventoryFlushed=Inventory flushed
+ExitEditMode=Exit edition
+inventoryDeleteLine=Eliminación de liña
+RegulateStock=Regulate Stock
+ListInventory=Listaxe
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
+ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
+InventoryForASpecificWarehouse=Inventory for a specific warehouse
+InventoryForASpecificProduct=Inventory for a specific product
+StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
+ForceTo=Force to
diff --git a/htdocs/langs/gl_ES/stripe.lang b/htdocs/langs/gl_ES/stripe.lang
new file mode 100644
index 00000000000..38f22b6ab4d
--- /dev/null
+++ b/htdocs/langs/gl_ES/stripe.lang
@@ -0,0 +1,72 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Stripe module setup
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
+StripeOrCBDoPayment=Pay with credit card or Stripe
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+Creditor=Creditor
+PaymentCode=Payment code
+StripeDoPayment=Pay with Stripe
+YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+Continue=Seguinte
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment page for a sales order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment page for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.<br>For the URL of payments with no existing object, you may also add the parameter <strong>&noidempotency=1</strong> so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter)
+SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+NewStripePaymentReceived=New Stripe payment received
+NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
+STRIPE_TEST_SECRET_KEY=Secret test key
+STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
+STRIPE_LIVE_SECRET_KEY=Secret live key
+STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
+StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
+StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
+StripePayoutList=List of Stripe payouts
+ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
+ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
+PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
+ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
diff --git a/htdocs/langs/gl_ES/supplier_proposal.lang b/htdocs/langs/gl_ES/supplier_proposal.lang
new file mode 100644
index 00000000000..41ee3f3fc21
--- /dev/null
+++ b/htdocs/langs/gl_ES/supplier_proposal.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposalNew=New price request
+CommRequest=Price request
+CommRequests=Prezo orzamentos
+SearchRequest=Find a request
+DraftRequests=Draft requests
+SupplierProposalsDraft=Draft vendor proposals
+LastModifiedRequests=Latest %s modified price requests
+RequestsOpened=Open price requests
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Orzamentos de provedor
+SupplierProposalsShort=Orzamentos de provedor
+NewAskPrice=New price request
+ShowSupplierProposal=Show price request
+AddSupplierProposal=Create a price request
+SupplierProposalRefFourn=Vendor ref
+SupplierProposalDate=Delivery date
+SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
+ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
+DeleteAsk=Delete request
+ValidateAsk=Validate request
+SupplierProposalStatusDraft=Borrador (é preciso validar)
+SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusClosed=Pechada
+SupplierProposalStatusSigned=Accepted
+SupplierProposalStatusNotSigned=Rexeitado
+SupplierProposalStatusDraftShort=Borrador
+SupplierProposalStatusValidatedShort=Validado
+SupplierProposalStatusClosedShort=Pechada
+SupplierProposalStatusSignedShort=Accepted
+SupplierProposalStatusNotSignedShort=Rexeitado
+CopyAskFrom=Create a price request by copying an existing request
+CreateEmptyAsk=Create blank request
+ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
+ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
+SendAskByMail=Send price request by mail
+SendAskRef=Sending the price request %s
+SupplierProposalCard=Request card
+ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
+ActionsOnSupplierProposal=Events on price request
+DocModelAuroreDescription=A complete request model (logo...)
+CommercialAsk=Price request
+DefaultModelSupplierProposalCreate=Default model creation
+DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
+DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
+ListOfSupplierProposals=List of vendor proposal requests
+ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
+SupplierProposalsToClose=Vendor proposals to close
+SupplierProposalsToProcess=Vendor proposals to process
+LastSupplierProposals=Latest %s price requests
+AllPriceRequests=All requests
diff --git a/htdocs/langs/gl_ES/suppliers.lang b/htdocs/langs/gl_ES/suppliers.lang
new file mode 100644
index 00000000000..fa0d1ea5ab6
--- /dev/null
+++ b/htdocs/langs/gl_ES/suppliers.lang
@@ -0,0 +1,47 @@
+# Dolibarr language file - Source file is en_US - vendors
+Suppliers=Provedores
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
+History=History
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
+OrderDate=Data pedido
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
+SupplierPrices=Prezos a provedores
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Pago a provedor
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. provedor
+Availability=Availability
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order details
+ApproveThisOrder=Approve this order
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
+DenyingThisOrder=Deny this order
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
+SupplierReputation=Vendor reputation
+DoNotOrderThisProductToThisSupplier=Do not order
+NotTheGoodQualitySupplier=Low quality
+ReputationForThisProduct=Reputation
+BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
+AllProductReferencesOfSupplier=All product / service references of vendor
+BuyingPriceNumShort=Prezos a provedores
diff --git a/htdocs/langs/gl_ES/ticket.lang b/htdocs/langs/gl_ES/ticket.lang
new file mode 100644
index 00000000000..1167d2d8c69
--- /dev/null
+++ b/htdocs/langs/gl_ES/ticket.lang
@@ -0,0 +1,305 @@
+# en_US lang file for module ticket
+# Copyright (C) 2013  Jean-François FERRY <hello@librethic.io>
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+Module56000Name=Tickets
+Module56000Desc=Ticket system for issue or request management
+
+Permission56001=See tickets
+Permission56002=Modify tickets
+Permission56003=Delete tickets
+Permission56004=Manage tickets
+Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+
+TicketDictType=Ticket - Types
+TicketDictCategory=Ticket - Groupes
+TicketDictSeverity=Ticket - Severities
+TicketDictResolution=Ticket - Resolution
+TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
+TicketTypeShortBUGHARD=Dysfonctionnement matériel
+TicketTypeShortCOM=Commercial question
+
+TicketTypeShortHELP=Request for functionnal help
+TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortPROJET=Proxecto
+TicketTypeShortOTHER=Outro
+
+TicketSeverityShortLOW=Baixo
+TicketSeverityShortNORMAL=Normal
+TicketSeverityShortHIGH=Alto
+TicketSeverityShortBLOCKING=Critical/Blocking
+
+ErrorBadEmailAddress=Field '%s' incorrect
+MenuTicketMyAssign=My tickets
+MenuTicketMyAssignNonClosed=My open tickets
+MenuListNonClosed=Open tickets
+
+TypeContact_ticket_internal_CONTRIBUTOR=Participante
+TypeContact_ticket_internal_SUPPORTTEC=Assigned user
+TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
+TypeContact_ticket_external_CONTRIBUTOR=External contributor
+
+OriginEmail=Email source
+Notify_TICKET_SENTBYMAIL=Send ticket message by email
+
+# Status
+NotRead=Non lido
+Read=Read
+Assigned=Assigned
+InProgress=En progreso
+NeedMoreInformation=Waiting for information
+Answered=Answered
+Waiting=Waiting
+Closed=Pechada
+Deleted=Deleted
+
+# Dict
+Type=Tipo
+Category=Analytic code
+Severity=Severity
+
+# Email templates
+MailToSendTicketMessage=To send email from ticket message
+
+#
+# Admin page
+#
+TicketSetup=Ticket module setup
+TicketSettings=Settings
+TicketSetupPage=
+TicketPublicAccess=A public interface requiring no identification is available at the following url
+TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
+TicketParamModule=Module variable setup
+TicketParamMail=Email setup
+TicketEmailNotificationFrom=Notification email from
+TicketEmailNotificationFromHelp=Used into ticket message answer by example
+TicketEmailNotificationTo=Notifications email to
+TicketEmailNotificationToHelp=Send email notifications to this address.
+TicketNewEmailBodyLabel=Text message sent after creating a ticket
+TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
+TicketParamPublicInterface=Public interface setup
+TicketsEmailMustExist=Require an existing email address to create a ticket
+TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket.
+PublicInterface=Public interface
+TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
+TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
+TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
+TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
+TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
+TicketPublicInterfaceTopicLabelAdmin=Interface title
+TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
+TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
+ExtraFieldsTicket=Extra attributes
+TicketCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
+TicketsDisableEmail=Do not send emails for ticket creation or message recording
+TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
+TicketsLogEnableEmail=Enable log by email
+TicketsLogEnableEmailHelp=At each change, an email will be sent **to each contact** associated with the ticket.
+TicketParams=Params
+TicketsShowModuleLogo=Display the logo of the module in the public interface
+TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
+TicketsShowCompanyLogo=Display the logo of the company in the public interface
+TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
+TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
+TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
+TicketsActivatePublicInterface=Activate public interface
+TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create tickets.
+TicketsAutoAssignTicket=Automatically assign the user who created the ticket
+TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
+TicketNumberingModules=Tickets numbering module
+TicketNotifyTiersAtCreation=Notify third party at creation
+TicketGroup=Grupo
+TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
+#
+# Index & list page
+#
+TicketsIndex=Tickets area
+TicketList=List of tickets
+TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
+NoTicketsFound=No ticket found
+NoUnreadTicketsFound=No unread ticket found
+TicketViewAllTickets=View all tickets
+TicketViewNonClosedOnly=View only open tickets
+TicketStatByStatus=Tickets by status
+OrderByDateAsc=Sort by ascending date
+OrderByDateDesc=Sort by descending date
+ShowAsConversation=Show as conversation list
+MessageListViewType=Show as table list
+
+#
+# Ticket card
+#
+Ticket=Ticket
+TicketCard=Ticket card
+CreateTicket=Create ticket
+EditTicket=Edit ticket
+TicketsManagement=Tickets Management
+CreatedBy=Created by
+NewTicket=New Ticket
+SubjectAnswerToTicket=Ticket answer
+TicketTypeRequest=Request type
+TicketCategory=Analytic code
+SeeTicket=See ticket
+TicketMarkedAsRead=Ticket has been marked as read
+TicketReadOn=Read on
+TicketCloseOn=Data de peche
+MarkAsRead=Mark ticket as read
+TicketHistory=Ticket history
+AssignUser=Assign to user
+TicketAssigned=Ticket is now assigned
+TicketChangeType=Change type
+TicketChangeCategory=Change analytic code
+TicketChangeSeverity=Change severity
+TicketAddMessage=Add a message
+AddMessage=Add a message
+MessageSuccessfullyAdded=Ticket added
+TicketMessageSuccessfullyAdded=Message successfully added
+TicketMessagesList=Message list
+NoMsgForThisTicket=No message for this ticket
+Properties=Classification
+LatestNewTickets=Latest %s newest tickets (not read)
+TicketSeverity=Severity
+ShowTicket=See ticket
+RelatedTickets=Related tickets
+TicketAddIntervention=Create intervention
+CloseTicket=Close ticket
+CloseATicket=Close a ticket
+ConfirmCloseAticket=Confirm ticket closing
+ConfirmDeleteTicket=Please confirm ticket deleting
+TicketDeletedSuccess=Ticket deleted with success
+TicketMarkedAsClosed=Ticket marked as closed
+TicketDurationAuto=Calculated duration
+TicketDurationAutoInfos=Duration calculated automatically from intervention related
+TicketUpdated=Ticket updated
+SendMessageByEmail=Send message by email
+TicketNewMessage=New message
+ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
+TicketGoIntoContactTab=Please go into "Contacts" tab to select them
+TicketMessageMailIntro=Introduction
+TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
+TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
+TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
+TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
+TicketMessageMailSignature=Sinatura
+TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
+TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
+TicketMessageMailSignatureLabelAdmin=Signature of response email
+TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
+TicketMessageHelp=Only this text will be saved in the message list on ticket card.
+TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
+TimeElapsedSince=Time elapsed since
+TicketTimeToRead=Time elapsed before read
+TicketContacts=Contacts ticket
+TicketDocumentsLinked=Documents linked to ticket
+ConfirmReOpenTicket=Confirm reopen this ticket ?
+TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
+TicketAssignedToYou=Ticket assigned
+TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
+MarkMessageAsPrivate=Mark message as private
+TicketMessagePrivateHelp=This message will not display to external users
+TicketEmailOriginIssuer=Issuer at origin of the tickets
+InitialMessage=Initial Message
+LinkToAContract=Link to a contract
+TicketPleaseSelectAContract=Select a contract
+UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
+TicketMailExchanges=Mail exchanges
+TicketInitialMessageModified=Initial message modified
+TicketMessageSuccesfullyUpdated=Message successfully updated
+TicketChangeStatus=Change status
+TicketConfirmChangeStatus=Confirm the status change: %s ?
+TicketLogStatusChanged=Status changed: %s to %s
+TicketNotNotifyTiersAtCreate=Not notify company at create
+Unread=Unread
+TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
+PublicInterfaceNotEnabled=Public interface was not enabled
+ErrorTicketRefRequired=Ticket reference name is required
+
+#
+# Logs
+#
+TicketLogMesgReadBy=Ticket %s read by %s
+NoLogForThisTicket=No log for this ticket yet
+TicketLogAssignedTo=Ticket %s assigned to %s
+TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
+TicketLogClosedBy=Ticket %s closed by %s
+TicketLogReopen=Ticket %s re-open
+
+#
+# Public pages
+#
+TicketSystem=Ticket system
+ShowListTicketWithTrackId=Display ticket list from track ID
+ShowTicketWithTrackId=Display ticket from track ID
+TicketPublicDesc=You can create a support ticket or check from an existing ID.
+YourTicketSuccessfullySaved=Ticket has been successfully saved!
+MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
+PleaseRememberThisId=Please keep the tracking number that we might ask you later.
+TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
+TicketNewEmailSubjectCustomer=New support ticket
+TicketNewEmailBody=This is an automatic email to confirm you have registered a new ticket.
+TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
+TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
+TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
+TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
+TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
+TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
+TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
+TicketPublicMsgViewLogIn=Please enter ticket tracking ID
+TicketTrackId=Public Tracking ID
+OneOfTicketTrackId=One of your tracking ID
+ErrorTicketNotFound=Ticket with tracking ID %s not found!
+Subject=Asunto
+ViewTicket=View ticket
+ViewMyTicketList=View my ticket list
+ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
+TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
+TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
+SeeThisTicketIntomanagementInterface=See ticket in management interface
+TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
+ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
+OldUser=Old user
+NewUser=Novo usuario
+NumberOfTicketsByMonth=Number of tickets per month
+NbOfTickets=Number of tickets
+# notifications
+TicketNotificationEmailSubject=Ticket %s updated
+TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
+TicketNotificationRecipient=Notification recipient
+TicketNotificationLogMessage=Log message
+TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
+TicketNotificationNumberEmailSent=Notification email sent: %s
+
+ActionsOnTicket=Events on ticket
+
+#
+# Boxes
+#
+BoxLastTicket=Latest created tickets
+BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicketContent=
+BoxLastTicketNoRecordedTickets=No recent unread tickets
+BoxLastModifiedTicket=Latest modified tickets
+BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastModifiedTicketContent=
+BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
diff --git a/htdocs/langs/gl_ES/trips.lang b/htdocs/langs/gl_ES/trips.lang
new file mode 100644
index 00000000000..9b585d46fd8
--- /dev/null
+++ b/htdocs/langs/gl_ES/trips.lang
@@ -0,0 +1,151 @@
+# Dolibarr language file - Source file is en_US - trips
+ShowExpenseReport=Show expense report
+Trips=Informes de gastos
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense reports
+ListOfFees=List of fees
+TypeFees=Types of fees
+ShowTrip=Show expense report
+NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
+CompanyVisited=Company/organization visited
+FeesKilometersOrAmout=Amount or kilometers
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportApproved=An expense report was approved
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
+ExpenseReportRefused=An expense report was refused
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
+ExpenseReportCanceled=An expense report was canceled
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
+ExpenseReportPaid=An expense report was paid
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripNDF=Informations expense report
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Outro
+TF_TRIP=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hotel
+TF_TAXI=Taxi
+EX_KME=Mileage costs
+EX_FUE=Fuel CV
+EX_HOT=Hotel
+EX_PAR=Parking CV
+EX_TOL=Toll CV
+EX_TAX=Various Taxes
+EX_IND=Indemnity transportation subscription
+EX_SUM=Maintenance supply
+EX_SUO=Office supplies
+EX_CAR=Car rental
+EX_DOC=Documentation
+EX_CUR=Customers receiving
+EX_OTR=Other receiving
+EX_POS=Postage
+EX_CAM=CV maintenance and repair
+EX_EMM=Employees meal
+EX_GUM=Guests meal
+EX_BRE=Breakfast
+EX_FUE_VP=Fuel PV
+EX_TOL_VP=Toll PV
+EX_PAR_VP=Parking PV
+EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
+UploadANewFileNow=Upload a new document now
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+AucuneLigne=There is no expense report declared yet
+ModePaiement=Payment mode
+VALIDATOR=User responsible for approval
+VALIDOR=Aprobado por
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Pagado por
+REFUSEUR=Denied by
+CANCEL_USER=Deleted by
+MOTIF_REFUS=Razón
+MOTIF_CANCEL=Razón
+DATE_REFUS=Deny date
+DATE_SAVE=Data de validación
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+BROUILLONNER=Reopen
+ExpenseReportRef=Ref. expense report
+ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+ConfirmRefuseTrip=Are you sure you want to deny this expense report?
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report?
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
+ConfirmCancelTrip=Are you sure you want to cancel this expense report?
+BrouillonnerTrip=Move back expense report to status "Draft"
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report?
+NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
+ExpenseReportsToApprove=Expense reports to approve
+ExpenseReportsToPay=Expense reports to pay
+ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
+ExpenseReportsIk=Expense report milles index
+ExpenseReportsRules=Expense report rules
+ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
+ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report
+expenseReportOffset=Decálogo
+expenseReportCoef=Coefficient
+expenseReportTotalForFive=Example with <u>d</u> = 5
+expenseReportRangeFromTo=from %d to %d
+expenseReportRangeMoreThan=more than %d
+expenseReportCoefUndefined=(value not defined)
+expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
+expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
+expenseReportPrintExample=offset + (d x coef) = %s
+ExpenseReportApplyTo=Apply to
+ExpenseReportDomain=Domain to apply
+ExpenseReportLimitOn=Limit on
+ExpenseReportDateStart=Date start
+ExpenseReportDateEnd=Date end
+ExpenseReportLimitAmount=Limite amount
+ExpenseReportRestrictive=Restrictive
+AllExpenseReport=All type of expense report
+OnExpense=Expense line
+ExpenseReportRuleSave=Expense report rule saved
+ExpenseReportRuleErrorOnSave=Error: %s
+RangeNum=Range %d
+ExpenseReportConstraintViolationError=Constraint violation id [%s]: %s  is superior to %s %s
+byEX_DAY=by day (limitation to %s)
+byEX_MON=by month (limitation to %s)
+byEX_YEA=by year (limitation to %s)
+byEX_EXP=by line (limitation to %s)
+ExpenseReportConstraintViolationWarning=Constraint violation id [%s]: %s  is superior to %s %s
+nolimitbyEX_DAY=by day (no limitation)
+nolimitbyEX_MON=by month (no limitation)
+nolimitbyEX_YEA=by year (no limitation)
+nolimitbyEX_EXP=by line (no limitation)
+CarCategory=Category of car
+ExpenseRangeOffset=Offset amount: %s
+RangeIk=Mileage range
+AttachTheNewLineToTheDocument=Attach the line to an uploaded document
diff --git a/htdocs/langs/gl_ES/users.lang b/htdocs/langs/gl_ES/users.lang
new file mode 100644
index 00000000000..3b598c04a22
--- /dev/null
+++ b/htdocs/langs/gl_ES/users.lang
@@ -0,0 +1,118 @@
+# Dolibarr language file - Source file is en_US - users
+HRMArea=Área Recursos humáns
+UserCard=Ficha usuario
+GroupCard=Ficha grupo
+Permission=Permiso
+Permissions=Permisos
+EditPassword=Editar contrasinal
+SendNewPassword=Xerar e enviar novo contrasinal
+SendNewPasswordLink=Enviar enlace para restablecer o contrasinal
+ReinitPassword=Xerar novo contrasinal
+PasswordChangedTo=Contrasinal modificado para: %s
+SubjectNewPassword=O seu novo contrasinal para %s
+GroupRights=Permisos de grupo
+UserRights=Permisos usuario
+UserGUISetup=Interfaz usuario
+DisableUser=Desactivar
+DisableAUser=Desactivar un usuario
+DeleteUser=Eliminar
+DeleteAUser=Eliminar un usuario
+EnableAUser=Activar un usuario
+DeleteGroup=Eliminar
+DeleteAGroup=Eliminar un grupo
+ConfirmDisableUser=Está certo de querer desactivar o usuario <b>%s</b>?
+ConfirmDeleteUser=¿Está certo de querer eliminar o usuario <b>%s</b>?
+ConfirmDeleteGroup=¿Está certo de querer eliminar o grupo <b>%s</b>?
+ConfirmEnableUser=¿Está certo de querer activar o usuario <b>%s</b>?
+ConfirmReinitPassword=¿Está certo de querer xerar un novo contrasinal ao usuario <b>%s</b>?
+ConfirmSendNewPassword=¿Está certo de querer xerar e enviar un novo contrasinal ao usuario <b>%s</b>?
+NewUser=Novo usuario
+CreateUser=Engadir usuario
+LoginNotDefined=O usuario non está definido
+NameNotDefined=O nome non está definido
+ListOfUsers=Listaxe de usuarios
+SuperAdministrator=Super Administrador
+SuperAdministratorDesc=Administrador global
+AdministratorDesc=Administrador
+DefaultRights=Permisos por defecto
+DefaultRightsDesc=Defina aquí os permisos <u>por defecto</u>, é dicir: os permisos que serán asignados automáticamente a un <u>novo</u> usuario no momento da súa creación (Ver a ficha usuario para cambiar os permisos a un usuario existente).
+DolibarrUsers=Usuarios Dolibarr
+LastName=Apelidos
+FirstName=Nome
+ListOfGroups=Listaxe de grupos
+NewGroup=Novo grupo
+CreateGroup=Engadir o grupo
+RemoveFromGroup=Eliminar do grupo
+PasswordChangedAndSentTo=Contrasinal cambiado e enviado a <b>%s</b>.
+PasswordChangeRequest=Solicitude para cambiar o contrasinal de <b>%s</b>
+PasswordChangeRequestSent=Solicitude de cambio de contrasinal para <b>%s</b> enviado a <b>%s</b>.
+ConfirmPasswordReset=Confirmar restablecemento de contrasinal
+MenuUsersAndGroups=Usuarios e grupos
+LastGroupsCreated=Últimos %s grupos creados
+LastUsersCreated=Últimos %s usuarios creados
+ShowGroup=Ver grupo
+ShowUser=Ver usuario
+NonAffectedUsers=Usuarios non asignados
+UserModified=Usuario correctamente modificado
+PhotoFile=Ficheiro foto
+ListOfUsersInGroup=Listaxe de usuarios deste grupo
+ListOfGroupsForUser=Listaxe de grupos deste usuario
+LinkToCompanyContact=Enlace terceiros / contactos
+LinkedToDolibarrMember=Enlace membro
+LinkedToDolibarrUser=Enlace a usuario Dolibarr
+LinkedToDolibarrThirdParty=Enlace a terceiro Dolibarr
+CreateDolibarrLogin=Crear un usuario
+CreateDolibarrThirdParty=Crear un terceiro
+LoginAccountDisableInDolibarr=A conta está desactivada en Dolibarr
+UsePersonalValue=Utilizar valores persoalizados
+InternalUser=Usuario interno
+ExportDataset_user_1=Usuarios e as súas propiedades.
+DomainUser=Usuario de dominio
+Reactivate=Reactivar
+CreateInternalUserDesc=Este formulario permitelle engadir un usuario interno para a súa empresa/organización. Para crear un usuario externo (cliente, provedor, etc...), use o botón "Crear usuario Dolibarr" dende unha ficha dun contacto do terceiro.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+PermissionInheritedFromAGroup=O permiso concédese xa que o hereda dun grupo ao cal pertence o usuario.
+Inherited=Heredado
+UserWillBeInternalUser=O usuario creado será un usuario interno (xa que non está ligado a un terceiro en particular)
+UserWillBeExternalUser=O usuario creado será un usuario externo (xa que está ligado a un terceiro en particular)
+IdPhoneCaller=ID chamada recibida (teléfono)
+NewUserCreated=usuario %s creado
+NewUserPassword=Password cambiado para %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
+EventUserModified=Usuario %s modificado
+UserDisabled=Usuario %s deshabilitado
+UserEnabled=Usuario %s activado
+UserDeleted=Usuario %s eliminado
+NewGroupCreated=Grupo %s engadido
+GroupModified=Grupo %s modificado
+GroupDeleted=Grupo %s eliminado
+ConfirmCreateContact=¿Está certo de querer crear unha conta Dolibarr para este contacto?
+ConfirmCreateLogin=¿Está certo de querer crear unha conta Dolibarr para este membro?
+ConfirmCreateThirdParty=¿Está certo de querer crear un terceiro para este membro?
+LoginToCreate=Login a crear
+NameToCreate=Nome do terceiro a crear
+YourRole=Os seus roles
+YourQuotaOfUsersIsReached=¡Máximo de cota de usuarios activos!
+NbOfUsers=Nº de usuarios
+NbOfPermissions=Nº de permisos
+DontDowngradeSuperAdmin=Sólo un superadmin pode degradar un superadmin
+HierarchicalResponsible=Supervisor
+HierarchicView=Vista xerárquica
+UseTypeFieldToChange=Modificar o campo Tipo para cambiar
+OpenIDURL=URL OpenID
+LoginUsingOpenID=Usar OpenID para iniciar sesión
+WeeklyHours=Horas traballadas (por semana)
+ExpectedWorkedHours=Horas previstas por semana
+ColorUser=Cor para o usuario
+DisabledInMonoUserMode=Desactivado en modo mantemento
+UserAccountancyCode=Código contable usuario
+UserLogoff=Usuario desconectado
+UserLogged=Usuario conectado
+DateEmployment=Data de contratación do empregado
+DateEmploymentEnd=Data de baixa do empregado
+CantDisableYourself=You can't disable your own user record
+ForceUserExpenseValidator=Force expense report validator
+ForceUserHolidayValidator=Force leave request validator
+ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/gl_ES/website.lang b/htdocs/langs/gl_ES/website.lang
new file mode 100644
index 00000000000..1e930afcec1
--- /dev/null
+++ b/htdocs/langs/gl_ES/website.lang
@@ -0,0 +1,130 @@
+# Dolibarr language file - Source file is en_US - website
+Shortname=Código
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
+DeleteWebsite=Delete website
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
+WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
+WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
+WEBSITE_CSS_URL=URL of external CSS file
+WEBSITE_CSS_INLINE=CSS file content (common to all pages)
+WEBSITE_JS_INLINE=Javascript file content (common to all pages)
+WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
+WEBSITE_ROBOT=Robot file (robots.txt)
+WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
+HtmlHeaderPage=HTML header (specific to this page only)
+PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
+EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
+MediaFiles=Media library
+EditCss=Edit website properties
+EditMenu=Edit menu
+EditMedias=Edit medias
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
+AddWebsite=Add website
+Webpage=Web page/container
+AddPage=Add page/container
+HomePage=Home Page
+PageContainer=Page/container
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
+PageContent=Page/Contenair
+PageDeleted=Page/Contenair '%s' of website %s deleted
+PageAdded=Page/Contenair '%s' added
+ViewSiteInNewTab=View site in new tab
+ViewPageInNewTab=View page in new tab
+SetAsHomePage=Set as Home page
+RealURL=Real URL
+ViewWebsiteInProduction=View web site using home URLs
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+TestDeployOnWeb=Test/deploy on web
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
+NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
+SyntaxHelp=Help on specific syntax tips
+YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+ClonePage=Clone page/container
+CloneSite=Clone site
+SiteAdded=Website added
+ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
+PageIsANewTranslation=The new page is a translation of the current page ?
+LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
+ParentPageId=Parent page ID
+WebsiteId=Website ID
+CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
+FetchAndCreate=Fetch and Create
+ExportSite=Export website
+ImportSite=Import website template
+IDOfPage=Id of page
+Banner=Banner
+BlogPost=Blog post
+WebsiteAccount=Website account
+WebsiteAccounts=Contas do sitio web
+AddWebsiteAccount=Create web site account
+BackToListForThirdParty=Back to list for the third-party
+DisableSiteFirst=Disable website first
+MyContainerTitle=My web site title
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is a translation of
+ThisPageHasTranslationPages=This page/container has translation
+NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
+GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Search or Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
+MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
+EditInLineOnOff=Mode 'Edit inline' is %s
+ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
+GlobalCSSorJS=Global CSS/JS/Header file of web site
+BackToHomePage=Back to home page...
+TranslationLinks=Translation links
+YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not a website page
+UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
+MainLanguage=Main language
+OtherLanguages=Other languages
+UseManifest=Provide a manifest.json file
+PublicAuthorAlias=Public author alias
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
+ReplacementDoneInXPages=Replacement done in %s pages or containers
diff --git a/htdocs/langs/gl_ES/withdrawals.lang b/htdocs/langs/gl_ES/withdrawals.lang
new file mode 100644
index 00000000000..6ecb64032c0
--- /dev/null
+++ b/htdocs/langs/gl_ES/withdrawals.lang
@@ -0,0 +1,119 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
+NewStandingOrder=New direct debit order
+StandingOrderToProcess=A procesar
+WithdrawalsReceipts=Direct debit orders
+WithdrawalReceipt=Domiciliación
+LastWithdrawalReceipts=Latest %s direct debit files
+WithdrawalsLines=Direct debit order lines
+RequestStandingOrderToTreat=Request for direct debit payment order to process
+RequestStandingOrderTreated=Request for direct debit payment order processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
+AmountToWithdraw=Amount to withdraw
+WithdrawsRefused=Direct debit refused
+NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
+ResponsibleUser=User Responsible
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
+MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
+ClassCredited=Classify credited
+ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
+TransData=Transmission date
+TransMetod=Transmission method
+Send=Send
+Lines=Lines
+StandingOrderReject=Issue a rejection
+WithdrawalRefused=Withdrawal refused
+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=Invoice refused (Charge the rejection to customer)
+StatusDebitCredit=Status debit/credit
+StatusWaiting=Waiting
+StatusTrans=Enviado
+StatusCredited=Credited
+StatusRefused=Rexeitado
+StatusMotif0=Unspecified
+StatusMotif1=Insufficient funds
+StatusMotif2=Request contested
+StatusMotif3=No direct debit payment order
+StatusMotif4=Pedido de cliente
+StatusMotif5=RIB unusable
+StatusMotif6=Account without balance
+StatusMotif7=Judicial Decision
+StatusMotif8=Other reason
+CreateForSepaFRST=Create direct debit file (SEPA FRST)
+CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
+CreateAll=Create direct debit file (all)
+CreateGuichet=Only office
+CreateBanque=Only bank
+OrderWaiting=Waiting for treatment
+NotifyTransmision=Withdrawal Transmission
+NotifyCredit=Withdrawal Credit
+NumeroNationalEmetter=National Transmitter Number
+WithBankUsingRIB=For bank accounts using RIB
+WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
+BankToReceiveWithdraw=Receiving Bank Account
+CreditDate=Credit on
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+WithdrawalFile=Withdrawal file
+SetToStatusSent=Set to status "File Sent"
+ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
+StatisticsByLineStatus=Statistics by status of lines
+RUM=UMR
+DateRUM=Mandate signature date
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
+WithdrawMode=Direct debit mode (FRST or RECUR)
+WithdrawRequestAmount=Amount of Direct debit request:
+WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
+SepaMandate=SEPA Direct Debit Mandate
+SepaMandateShort=SEPA Mandate
+PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
+SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+CreditorIdentifier=Creditor Identifier
+CreditorName=Creditor Name
+SEPAFillForm=(B) Please complete all the fields marked *
+SEPAFormYourName=Your name
+SEPAFormYourBAN=Your Bank Account Name (IBAN)
+SEPAFormYourBIC=Your Bank Identifier Code (BIC)
+SEPAFrstOrRecur=Type of payment
+ModeRECUR=Recurring payment
+ModeFRST=One-off payment
+PleaseCheckOne=Please check one only
+DirectDebitOrderCreated=Direct debit order %s created
+AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
+
+### Notifications
+InfoCreditSubject=Payment of direct debit payment order %s by the bank
+InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
+InfoTransSubject=Transmission of direct debit payment order %s to bank
+InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
+InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
+InfoRejectSubject=Direct debit payment order refused
+InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/gl_ES/workflow.lang b/htdocs/langs/gl_ES/workflow.lang
new file mode 100644
index 00000000000..be126eef0f4
--- /dev/null
+++ b/htdocs/langs/gl_ES/workflow.lang
@@ -0,0 +1,20 @@
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=Workflow module setup
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+# Autocreate
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
+# Autoclassify customer proposal or order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+AutomaticCreation=Automatic creation
+AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/gl_ES/zapier.lang b/htdocs/langs/gl_ES/zapier.lang
new file mode 100644
index 00000000000..fdaaf449595
--- /dev/null
+++ b/htdocs/langs/gl_ES/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier para Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier para modulo de Dolibarr
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Configuración de Zapier para Dolibarr
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index 1f9382137ea..b8ce37a0956 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 854aae23e84..8285f39c5df 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=שרת אינטרנט המשתמש / קבוצה
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=מאגר המידע charset לאחסון נתונים
 DBSortingCharset=מאגר המידע charset למיין נתונים
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=<b>%s</b> מודול יש להפעיל
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=כברירת מחדל IRPF המוצע הוא 0. קץ שלטון.
 LocalTax2IsUsedExampleES=בספרד, פרילנסרים ובעלי מקצוע עצמאיים המספקים שירותים וחברות אשר בחרו במערכת המס של מודולים.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=משתמשים מודול ההתקנה
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=רב החברה מודול ההתקנה
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=רוכסן
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index 758cad0418b..643972c94a5 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=Show invoice
-ShowInvoice=Show invoice
-ShowInvoiceReplace=Show replacing invoice
-ShowInvoiceAvoir=Show credit note
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/he_IL/donations.lang b/htdocs/langs/he_IL/donations.lang
index 6936e94040a..e554d722f9d 100644
--- a/htdocs/langs/he_IL/donations.lang
+++ b/htdocs/langs/he_IL/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Create a donation
 NewDonation=New donation
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Show donation
 PublicDonation=Public donation
 DonationsArea=Donations area
 DonationStatusPromiseNotValidated=Draft promise
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
 DonationTitle=Donation receipt
+DonationDate=Donation date
 DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
diff --git a/htdocs/langs/he_IL/interventions.lang b/htdocs/langs/he_IL/interventions.lang
index e7294616187..f09d69912e1 100644
--- a/htdocs/langs/he_IL/interventions.lang
+++ b/htdocs/langs/he_IL/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/he_IL/modulebuilder.lang b/htdocs/langs/he_IL/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/he_IL/modulebuilder.lang
+++ b/htdocs/langs/he_IL/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/he_IL/multicurrency.lang b/htdocs/langs/he_IL/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/he_IL/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index dd2e3b9d0f2..2eb71eb7ff0 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang
index c802b2d2ae8..bce2a09fb03 100644
--- a/htdocs/langs/he_IL/website.lang
+++ b/htdocs/langs/he_IL/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/he_IL/zapier.lang b/htdocs/langs/he_IL/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/he_IL/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/hi_IN/accountancy.lang b/htdocs/langs/hi_IN/accountancy.lang
new file mode 100644
index 00000000000..cf5c727024d
--- /dev/null
+++ b/htdocs/langs/hi_IN/accountancy.lang
@@ -0,0 +1,382 @@
+# Dolibarr language file - en_US - Accountancy (Double entries)
+Accountancy=Accountancy
+Accounting=लेखांकन
+ACCOUNTING_EXPORT_SEPARATORCSV=निर्यात फ़ाइल के लिए कॉलम विभाजक
+ACCOUNTING_EXPORT_DATE=निर्यात फ़ाइल के लिए दिनांक प्रारूप
+ACCOUNTING_EXPORT_PIECE=निर्यात टुकड़े की संख्या
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=वैश्विक खाते के साथ निर्यात करें
+ACCOUNTING_EXPORT_LABEL=निर्यात लेबल
+ACCOUNTING_EXPORT_AMOUNT=निर्यात राशि
+ACCOUNTING_EXPORT_DEVISE=निर्यात मुद्रा
+Selectformat=फ़ाइल के लिए प्रारूप का चयन करें
+ACCOUNTING_EXPORT_FORMAT=फ़ाइल के लिए प्रारूप का चयन करें
+ACCOUNTING_EXPORT_ENDLINE=परिवहन लागत वापसी प्रकार का चयन करें
+ACCOUNTING_EXPORT_PREFIX_SPEC=फ़ाइल नाम के लिए उपसर्ग निर्दिष्ट करें
+ThisService=यह सेवा
+ThisProduct=यह उत्पाद
+DefaultForService=सेवा के लिए डिफ़ॉल्ट
+DefaultForProduct=उत्पाद के लिए डिफ़ॉल्ट
+CantSuggest=सुझाव नहीं दे सकते
+AccountancySetupDoneFromAccountancyMenu=लेखाकर्म का अधिकांश सेटअप मेनू से किया जाता है %s
+ConfigAccountingExpert=मॉड्यूल लेखांकन विशेषज्ञ का कन्फ़िग्यर्एशन
+Journalization=रोज़नामचीकरण
+Journaux=बहीखाता
+JournalFinancial=वित्तीय बहीखाता
+BackToChartofaccounts=प्रतिफल लेखा जोखा का व्यौरा
+Chartofaccounts=लेखा जोखा का व्यौरा
+CurrentDedicatedAccountingAccount=चालू समर्पित खाता
+AssignDedicatedAccountingAccount=निर्दिष्ट करने के लिए नया खाता
+InvoiceLabel=चालान लेबल
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
+OtherInfo=अन्य सूचना
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
+JournalizationInLedgerStatus=Status of journalization
+AlreadyInGeneralLedger=Already journalized in ledgers
+NotYetInGeneralLedger=Not yet journalized in ledgers
+GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
+DetailByAccount=Show detail by account
+AccountWithNonZeroValues=Accounts with non-zero values
+ListOfAccounts=खातों की सूची
+CountriesInEEC=Countries in EEC
+CountriesNotInEEC=Countries not in EEC
+CountriesInEECExceptMe=Countries in EEC except %s
+CountriesExceptMe=All countries except %s
+AccountantFiles=Export accounting documents
+
+MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
+MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
+MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+
+AccountancyArea=लेखा क्षेत्र
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
+
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expenses (miscellaneous taxes). For this, use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
+AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
+AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+
+AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+Selectchartofaccounts=Select active chart of accounts
+ChangeAndLoad=Change and load
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+AccountAccountingShort=Account
+SubledgerAccount=Subledger account
+SubledgerAccountLabel=Subledger account label
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
+AccountAccountingSuggest=Accounting account suggested
+MenuDefaultAccounts=Default accounts
+MenuBankAccounts=Bank accounts
+MenuVatAccounts=Vat accounts
+MenuTaxAccounts=Tax accounts
+MenuExpenseReportAccounts=Expense report accounts
+MenuLoanAccounts=Loan accounts
+MenuProductsAccounts=Product accounts
+MenuClosureAccounts=Closure accounts
+MenuAccountancyClosure=Closure
+MenuAccountancyValidationMovements=Validate movements
+ProductsBinding=Products accounts
+TransferInAccounting=Transfer in accounting
+RegistrationInAccounting=Registration in accounting
+Binding=Binding to accounts
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Vendor invoice binding
+ExpenseReportsVentilation=Expense report binding
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+ValidTransaction=Validate transaction
+WriteBookKeeping=Register transactions in Ledger
+Bookkeeping=Ledger
+AccountBalance=Account balance
+ObjectsRef=Source object ref
+CAHTF=Total purchase vendor before tax
+TotalExpenseReport=Total expense report
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+ExpenseReportLines=Lines of expense reports to bind
+ExpenseReportLinesDone=Bound lines of expense reports
+IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
+
+
+Ventilate=Bind
+LineId=Id line
+Processing=Processing
+EndProcessing=Process terminated.
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+LineOfExpenseReport=Line of expense report
+NoAccountSelected=No accounting account selected
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+
+ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
+BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+
+ACCOUNTING_SELL_JOURNAL=Sell journal
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
+ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
+
+ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
+ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
+TransitionalAccount=Transitional bank transfer account
+
+ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
+DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+LabelAccount=Label account
+LabelOperation=Label operation
+Sens=Sens
+LetteringCode=Lettering code
+Lettering=Lettering
+Codejournal=Journal
+JournalLabel=Journal label
+NumPiece=Piece number
+TransactionNumShort=Num. transaction
+AccountingCategory=Personalized groups
+GroupByAccountAccounting=Group by accounting account
+AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
+ByAccounts=By accounts
+ByPredefinedAccountGroups=By predefined groups
+ByPersonalizedAccountGroups=By personalized groups
+ByYear=By year
+NotMatch=Not Set
+DeleteMvt=Delete Ledger lines
+DelMonth=Month to delete
+DelYear=Year to delete
+DelJournal=Journal to delete
+ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+FinanceJournal=Finance journal
+ExpenseReportsJournal=Expense reports journal
+DescFinanceJournal=Finance journal including all the types of payments by bank account
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+FeeAccountNotDefined=Account for fee not defined
+BankAccountNotDefined=Account for bank not defined
+CustomerInvoicePayment=Payment of invoice customer
+ThirdPartyAccount=Third-party account
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+AddCompteFromBK=Add accounting accounts to the group
+ReportThirdParty=List third-party account
+DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
+ListAccounts=List of the accounting accounts
+UnknownAccountForThirdparty=Unknown third-party account. We will use %s
+UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
+ShowOpeningBalance=Show opening balance
+HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
+
+Pcgtype=Group of account
+PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+
+Reconcilable=Reconcilable
+
+TotalVente=Total turnover before tax
+TotalMarge=Total sales margin
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
+Vide=-
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account (only record not already transfered in accountancy are visible)
+DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
+DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
+DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
+DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+
+DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
+OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+ValidateMovements=Validate movements
+DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
+SelectMonthAndValidate=Select month and validate movements
+
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
+Balancing=Balancing
+FicheVentilation=Binding card
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
+NoNewRecordSaved=No more record to journalize
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
+ShowTutorial=Show Tutorial
+NotReconciled=Not reconciled
+
+## Admin
+ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
+CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccountingJournal=Show accounting journal
+NatureOfJournal=Nature of Journal
+AccountingJournalType1=Miscellaneous operations
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
+NumberOfAccountancyEntries=Number of entries
+NumberOfAccountancyMovements=Number of movements
+
+## Export
+ExportDraftJournal=Export draft journal
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export for CEGID Expert Comptabilité
+Modelcsv_COALA=Export for Sage Coala
+Modelcsv_bob50=Export for Sage BOB 50
+Modelcsv_ciel=Export for Sage Ciel Compta or Compta Evolution
+Modelcsv_quadratus=Export for Quadratus QuadraCompta
+Modelcsv_ebp=Export for EBP
+Modelcsv_cogilog=Export for Cogilog
+Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
+Modelcsv_openconcerto=Export for OpenConcerto (Test)
+Modelcsv_configurable=Export CSV Configurable
+Modelcsv_FEC=Export FEC
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+ChartofaccountsId=Chart of accounts Id
+
+## Tools - Init accounting account on product / service
+InitAccountancy=Init accountancy
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
+DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
+Options=Options
+OptionModeProductSell=Mode sales
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
+OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
+OptionModeProductSellDesc=Show all products with accounting account for sales.
+OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
+OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
+OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
+CleanFixHistory=Remove accounting code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
+PredefinedGroups=Predefined groups
+WithoutValidAccount=Without valid dedicated account
+WithValidAccount=With valid dedicated account
+ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
+AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
+
+## Dictionary
+Range=Range of accounting account
+Calculated=Calculated
+Formula=Formula
+
+## Error
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
+ExportNotSupported=The export format setuped is not supported into this page
+BookeppingLineAlreayExists=Lines already existing into bookkeeping
+NoJournalDefined=No journal defined
+Binded=Lines bound
+ToBind=Lines to bind
+UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
+
+## Import
+ImportAccountingEntries=Accounting entries
+DateExport=Date export
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/hi_IN/admin.lang b/htdocs/langs/hi_IN/admin.lang
new file mode 100644
index 00000000000..5b67c600bd5
--- /dev/null
+++ b/htdocs/langs/hi_IN/admin.lang
@@ -0,0 +1,2002 @@
+# Dolibarr language file - Source file is en_US - admin
+Foundation=प्रतिष्ठान
+Version=संस्करण
+Publisher=प्रकाशक
+VersionProgram=संस्करण कार्यक्रम
+VersionLastInstall=प्रारंभिक संस्थापित संस्करण
+VersionLastUpgrade=नवीनतम संस्करण का उन्नयन
+VersionExperimental=प्रायोगिक
+VersionDevelopment=डेवलोपमेन्ट
+VersionUnknown=अज्ञात
+VersionRecommanded=संस्तुत
+FileCheck=फाइलसेट अखंडता की जाँच
+FileCheckDesc=यह उपकरण आपको आधिकारिक फ़ाइल के साथ प्रत्येक फ़ाइल की तुलना करते हुए, फ़ाइलों की अखंडता और आपके एप्लिकेशन के सेटअप की जांच करने की अनुमति देता है। कुछ सेटअप स्थिरांक के मूल्य को भी जांचा जा सकता है। आप इस उपकरण का उपयोग यह निर्धारित करने के लिए कर सकते हैं कि क्या कोई फाइल संशोधित की गई है (जैसे किसी हैकर द्वारा)।
+FileIntegrityIsStrictlyConformedWithReference=फ़ाइलें अखंडता को कड़ाई से संदर्भ के साथ संधारित किया गया है।
+FileIntegrityIsOkButFilesWereAdded=फ़ाइलें अखंडता जांच पास हो गई हैं, हालांकि कुछ नई फाइलें जोड़ी गई हैं।
+FileIntegritySomeFilesWereRemovedOrModified=फ़ाइलें अखंडता की जाँच में विफल हो गई है। कुछ फ़ाइलों को संशोधित, हटाया या जोड़ा गया हैं।
+GlobalChecksum=सार्वभौम चेकसम
+MakeIntegrityAnalysisFrom=एप्लिकेशन फ़ाइलों की अखंडता का विश्लेषण करें
+LocalSignature=एंबेडेड स्थानीय हस्ताक्षर (कम विश्वसनीय)
+RemoteSignature=दूरस्थ दूर हस्ताक्षर (अधिक विश्वसनीय)
+FilesMissing=गुम फ़ाइलें
+FilesUpdated=नवीनीकृत फ़ाइलें
+FilesModified=संशोधित फ़ाइलें
+FilesAdded=जोड़ी गई फ़ाइलें 
+FileCheckDolibarr=एप्लिकेशन फ़ाइलों की अखंडता की जाँच करें
+AvailableOnlyOnPackagedVersions=अखंडता जाँच के लिए स्थानीय फ़ाइल केवल तब उपलब्ध होती है जब आवेदन आधिकारिक पैकेज से स्थापित किया जाता है
+XmlNotFound=एप्लिकेशन की Xml इंटीग्रिटी फ़ाइल नहीं मिली
+SessionId=सत्र पहचान
+SessionSaveHandler=सत्र बचाने के लिए संचालक
+SessionSavePath=सत्र संचय स्थान 
+PurgeSessions=सत्र का परिशोध
+ConfirmPurgeSessions=क्या आप वास्तव में सभी सत्रों को शुद्ध करना चाहते हैं? यह प्रत्येक उपयोगकर्ता (स्वयं को छोड़कर) को डिस्कनेक्ट कर देगा।
+NoSessionListWithThisHandler=अपने PHP में कॉन्फ़िगर किए गए सत्र संचालक को सभी चालू सत्रों को सूचीबद्ध करने की अनुमति नहीं देता है।
+LockNewSessions=नए कनेक्शन लॉक करें
+ConfirmLockNewSessions=क्या आप वाकई Dolibarr के किसी भी नये कनेक्शन को अपने तक सीमित रखना चाहते हैं? इसके बाद सिर्फ़ यूजर <b>%s</b> ही कनेक्ट कर पाएंगे।
+UnlockNewSessions=कनेक्शन लॉक हटाए
+YourSession=आपका सत्र
+Sessions=उपयोगकर्ताओं का सत्र
+WebUserGroup=वेब सर्वर उपयोगकर्ता / समूह
+NoSessionFound=आपका PHP कॉन्फ़िगरेशन सक्रिय सत्रों की सूची की अनुमति नहीं देता है। सत्र संरक्षण के लिए उपयोग की गई डायरेक्टरी ( <b>%s</b>) शायद संरक्षित की गई है (उदाहरण के लिए OS अनुमतियाँ या PHP निर्देशक द्वारा open_basedir)।
+DBStoringCharset=डेटाबेस डेटा संग्रहीत करने के लिए charset
+DBSortingCharset=डेटा को सॉर्ट करने के लिए डेटाबेस charset 
+HostCharset=Host charset
+ClientCharset=Client charset
+ClientSortingCharset=Client collation
+WarningModuleNotActive=Module <b>%s</b> must be enabled
+WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
+DolibarrSetup=Dolibarr install or upgrade
+InternalUser=Internal user
+ExternalUser=External user
+InternalUsers=Internal users
+ExternalUsers=External users
+GUISetup=Display
+SetupArea=Setup
+UploadNewTemplate=Upload new template(s)
+FormToTestFileUploadForm=Form to test file upload (according to setup)
+IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
+RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
+RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
+SecuritySetup=Security setup
+SecurityFilesDesc=Define here options related to security about uploading files.
+ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
+ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
+ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
+DictionarySetup=Dictionary setup
+Dictionary=Dictionaries
+ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
+ErrorCodeCantContainZero=Code can't contain value 0
+DisableJavascript=Disable JavaScript and Ajax functions
+DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
+NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
+JavascriptDisabled=JavaScript disabled
+UsePreviewTabs=Use preview tabs
+ShowPreview=Show preview
+PreviewNotAvailable=Preview not available
+ThemeCurrentlyActive=Theme currently active
+CurrentTimeZone=TimeZone PHP (server)
+MySQLTimeZone=TimeZone MySql (database)
+TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+Space=Space
+Table=Table
+Fields=Fields
+Index=Index
+Mask=Mask
+NextValue=Next value
+NextValueForInvoices=Next value (invoices)
+NextValueForCreditNotes=Next value (credit notes)
+NextValueForDeposit=Next value (down payment)
+NextValueForReplacements=Next value (replacements)
+MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
+MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page
+AntiVirusCommand=Full path to antivirus command
+AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusParam= More parameters on command line
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=Accounting module setup
+UserSetup=User management setup
+MultiCurrencySetup=Multi-currency setup
+MenuLimits=Limits and accuracy
+MenuIdParent=Parent menu ID
+DetailMenuIdParent=ID of parent menu (empty for a top menu)
+DetailPosition=Sort number to define menu position
+AllMenus=All
+NotConfigured=Module/Application not configured
+Active=Active
+SetupShort=Setup
+OtherOptions=Other options
+OtherSetup=Other Setup
+CurrentValueSeparatorDecimal=Decimal separator
+CurrentValueSeparatorThousand=Thousand separator
+Destination=Destination
+IdModule=Module ID
+IdPermissions=Permissions ID
+LanguageBrowserParameter=Parameter %s
+LocalisationDolibarrParameters=Localization parameters
+ClientTZ=Client Time Zone (user)
+ClientHour=Client time (user)
+OSTZ=Server OS Time Zone
+PHPTZ=PHP server Time Zone
+DaylingSavingTime=Daylight saving time
+CurrentHour=PHP Time (server)
+CurrentSessionTimeOut=Current session timeout
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a .htaccess file with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but of the timezone of the server.
+Box=Widget
+Boxes=Widgets
+MaxNbOfLinesForBoxes=Max. number of lines for widgets
+AllWidgetsWereEnabled=All available widgets are enabled
+PositionByDefault=Default order
+Position=Position
+MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
+MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br>Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenuForUsers=Menu for users
+LangFile=.lang file
+Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
+System=System
+SystemInfo=System information
+SystemToolsArea=System tools area
+SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature.
+Purge=Purge
+PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
+PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
+PurgeRunNow=Purge now
+PurgeNothingToDelete=No directory or files to delete.
+PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
+PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
+PurgeAuditEvents=Purge all security events
+ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
+GenerateBackup=Generate backup
+Backup=Backup
+Restore=Restore
+RunCommandSummary=Backup has been launched with the following command
+BackupResult=Backup result
+BackupFileSuccessfullyCreated=Backup file successfully generated
+YouCanDownloadBackupFile=The generated file can now be downloaded
+NoBackupFileAvailable=No backup files available.
+ExportMethod=Export method
+ImportMethod=Import method
+ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
+ImportMySqlDesc=To import a MySQL backup file, you may use phpMyAdmin via your hosting or use the mysql command from the Command line.<br>For example:
+ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
+ImportMySqlCommand=%s %s < mybackupfile.sql
+ImportPostgreSqlCommand=%s %s mybackupfile.sql
+FileNameToGenerate=Filename for backup:
+Compression=Compression
+CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
+CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
+ExportCompatibility=Compatibility of generated export file
+ExportUseMySQLQuickParameter=Use the --quick parameter
+ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
+MySqlExportParameters=MySQL export parameters
+PostgreSqlExportParameters= PostgreSQL export parameters
+UseTransactionnalMode=Use transactional mode
+FullPathToMysqldumpCommand=Full path to mysqldump command
+FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
+AddDropDatabase=Add DROP DATABASE command
+AddDropTable=Add DROP TABLE command
+ExportStructure=Structure
+NameColumn=Name columns
+ExtendedInsert=Extended INSERT
+NoLockBeforeInsert=No lock commands around INSERT
+DelayedInsert=Delayed insert
+EncodeBinariesInHexa=Encode binary data in hexadecimal
+IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
+AutoDetectLang=Autodetect (browser language)
+FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
+BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
+OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
+ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external app/modules
+ModulesDevelopYourModule=Develop your own app/modules
+ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
+DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
+NewModule=New
+FreeModule=Free
+CompatibleUpTo=Compatible with version %s
+NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
+CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
+SeeInMarkerPlace=See in Market place
+SeeSetupOfModule=See setup of module %s
+Updated=Updated
+Nouveauté=Novelty
+AchatTelechargement=Buy / Download
+GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
+DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming may develop a module.
+WebSiteDesc=External websites for more add-on (non-core) modules...
+DevelopYourModuleDesc=Some solutions to develop your own module...
+URL=URL
+RelativeURL=Relative URL
+BoxesAvailable=Widgets available
+BoxesActivated=Widgets activated
+ActivateOn=Activate on
+ActiveOn=Activated on
+SourceFile=Source file
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
+Required=Required
+UsedOnlyWithTypeOption=Used by some agenda option only
+Security=Security
+Passwords=Passwords
+DoNotStoreClearPassword=Encrypt passwords stored in database (NOT as plain-text). It is strongly recommended to activate this option.
+MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
+ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
+Feature=Feature
+DolibarrLicense=License
+Developpers=Developers/contributors
+OfficialWebSite=Dolibarr official web site
+OfficialWebSiteLocal=Local web site (%s)
+OfficialWiki=Dolibarr documentation / Wiki
+OfficialDemo=Dolibarr online demo
+OfficialMarketPlace=Official market place for external modules/addons
+OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
+ReferencedPreferredPartners=Preferred Partners
+OtherResources=Other resources
+ExternalResources=External Resources
+SocialNetworks=Social Networks
+ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
+ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
+HelpCenterDesc2=Some of these resources are only available in <b>english</b>.
+CurrentMenuHandler=Current menu handler
+MeasuringUnit=Measuring unit
+LeftMargin=Left margin
+TopMargin=Top margin
+PaperSize=Paper type
+Orientation=Orientation
+SpaceX=Space X
+SpaceY=Space Y
+FontSize=Font size
+Content=Content
+NoticePeriod=Notice period
+NewByMonth=New by month
+Emails=Emails
+EMailsSetup=Emails setup
+EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EmailSenderProfiles=Emails sender profiles
+EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
+MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix-like systems)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix-like systems)
+MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
+MAIN_MAIL_AUTOCOPY_TO= Copy (Bcc) all sent emails to
+MAIN_DISABLE_ALL_MAILS=Disable all email sending (for test purposes or demos)
+MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
+MAIN_MAIL_SENDMODE=Email sending method
+MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
+MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
+MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
+MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
+MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos)
+MAIN_SMS_SENDMODE=Method to use to send SMS
+MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending
+MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
+UserEmail=User email
+CompanyEmail=Company Email
+FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+ModuleSetup=Module setup
+ModulesSetup=Modules/Application setup
+ModuleFamilyBase=System
+ModuleFamilyCrm=Customer Relationship Management (CRM)
+ModuleFamilySrm=Vendor Relationship Management (VRM)
+ModuleFamilyProducts=Product Management (PM)
+ModuleFamilyHr=Human Resource Management (HR)
+ModuleFamilyProjects=Projects/Collaborative work
+ModuleFamilyOther=Other
+ModuleFamilyTechnic=Multi-modules tools
+ModuleFamilyExperimental=Experimental modules
+ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
+ModuleFamilyECM=Electronic Content Management (ECM)
+ModuleFamilyPortal=Websites and other frontal application
+ModuleFamilyInterface=Interfaces with external systems
+MenuHandlers=Menu handlers
+MenuAdmin=Menu editor
+DoNotUseInProduction=Do not use in production
+ThisIsProcessToFollow=Upgrade procedure:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+StepNb=Step %s
+FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
+DownloadPackageFromWebSite=Download package (for example from the official web site %s).
+UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
+YouCanSubmitFile=You can upload the .zip file of module package from here:
+CurrentVersion=Dolibarr current version
+CallUpdatePage=Browse to the page that updates the database structure and data: %s.
+LastStableVersion=Latest stable version
+LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
+UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
+GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
+GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
+GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
+ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
+ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
+DoTestServerAvailability=Test server connectivity
+DoTestSend=Test sending
+DoTestSendHTML=Test sending HTML
+ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
+UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
+SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
+UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
+DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
+DisableLinkToHelp=Hide link to online help "<b>%s</b>"
+AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
+ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
+MinLength=Minimum length
+LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
+LanguageFile=Language file
+ExamplesWithCurrentSetup=Examples with current configuration
+ListOfDirectories=List of OpenDocument templates directories
+ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
+NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
+FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
+FirstnameNamePosition=Position of Name/Lastname
+DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
+KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
+TestSubmitForm=Input test form
+ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours.
+ThemeDir=Skins directory
+ConnectionTimeout=Connection timeout
+ResponseTimeout=Response timeout
+SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
+ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
+SecurityToken=Key to secure URLs
+NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
+PDF=PDF
+PDFDesc=Global options for PDF generation.
+PDFAddressForging=Rules for address boxes
+HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
+PDFLocaltax=Rules for %s
+HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideDescOnPDF=Hide products description
+HideRefOnPDF=Hide products ref.
+HideDetailsOnPDF=Hide product lines details
+PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+Library=Library
+UrlGenerationParameters=Parameters to secure URLs
+SecurityTokenIsUnique=Use a unique securekey parameter for each URL
+EnterRefToBuildUrl=Enter reference for object %s
+GetSecuredUrl=Get calculated URL
+ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+OldVATRates=Old VAT rate
+NewVATRates=New VAT rate
+PriceBaseTypeToChange=Modify on prices with base reference value defined on
+MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
+String=String
+TextLong=Long text
+HtmlText=Html text
+Int=Integer
+Float=Float
+DateAndTime=Date and hour
+Unique=Unique
+Boolean=Boolean (one checkbox)
+ExtrafieldPhone = Phone
+ExtrafieldPrice = Price
+ExtrafieldMail = Email
+ExtrafieldUrl = Url
+ExtrafieldSelect = Select list
+ExtrafieldSelectList = Select from table
+ExtrafieldSeparator=Separator (not a field)
+ExtrafieldPassword=Password
+ExtrafieldRadio=Radio buttons (one choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
+ExtrafieldLink=Link to an object
+ComputedFormula=Computed field
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+Computedpersistent=Store computed field
+ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
+ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
+ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
+LibraryToBuildPDF=Library used for PDF generation
+LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
+SMS=SMS
+LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
+RefreshPhoneLink=Refresh link
+LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
+KeepEmptyToUseDefault=Keep empty to use default value
+DefaultLink=Default link
+SetAsDefault=Set as default
+ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
+ExternalModule=External module
+InstalledInto=Installed into directory %s
+BarcodeInitForthird-parties=Mass barcode init for third-parties
+BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
+CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
+InitEmptyBarCode=Init value for next %s empty records
+EraseAllCurrentBarCode=Erase all current barcode values
+ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
+AllBarcodeReset=All barcode values have been removed
+NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
+EnableFileCache=Enable file cache
+ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
+NoDetails=No additional details in footer
+DisplayCompanyInfo=Display company address
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
+EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
+ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code
+ModuleCompanyCodePanicum=Return an empty accounting code.
+ModuleCompanyCodeDigitaria=Returns a compound accounting code according to the name of the third party. The code consists of a prefix that can be defined in the first position followed by the number of characters defined in the third party code.
+ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
+ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+ClickToShowDescription=Click to show description
+DependsOn=This module needs the module(s)
+RequiredBy=This module is required by module(s)
+TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
+PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
+EnableDefaultValues=Enable customization of default values
+EnableOverwriteTranslation=Enable usage of overwritten translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
+AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
+FilesAttachedToEmail=Attach file
+SendEmailsReminders=Send agenda reminders by emails
+davDescription=Setup a WebDAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
+DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
+DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
+DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
+DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
+# Modules
+Module0Name=Users & Groups
+Module0Desc=Users / Employees and Groups management
+Module1Name=Third Parties
+Module1Desc=Companies and contacts management (customers, prospects...)
+Module2Name=Commercial
+Module2Desc=Commercial management
+Module10Name=Accounting (simplified)
+Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
+Module20Name=Proposals
+Module20Desc=Commercial proposal management
+Module22Name=Mass Emailings
+Module22Desc=Manage bulk emailing
+Module23Name=Energy
+Module23Desc=Monitoring the consumption of energies
+Module25Name=Sales Orders
+Module25Desc=Sales order management
+Module30Name=Invoices
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
+Module40Name=Vendors
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
+Module42Name=Debug Logs
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module49Name=Editors
+Module49Desc=Editor management
+Module50Name=Products
+Module50Desc=Management of Products
+Module51Name=Mass mailings
+Module51Desc=Mass paper mailing management
+Module52Name=Stocks
+Module52Desc=Stock management
+Module53Name=Services
+Module53Desc=Management of Services
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or recurring subscriptions)
+Module55Name=Barcodes
+Module55Desc=Barcode management
+Module56Name=Telephony
+Module56Desc=Telephony integration
+Module57Name=Bank Direct Debit payments
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module58Name=ClickToDial
+Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
+Module59Name=Bookmark4u
+Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
+Module60Name=Stickers
+Module60Desc=Management of stickers
+Module70Name=Interventions
+Module70Desc=Intervention management
+Module75Name=Expense and trip notes
+Module75Desc=Expense and trip notes management
+Module80Name=Shipments
+Module80Desc=Shipments and delivery note management
+Module85Name=Banks & Cash
+Module85Desc=Management of bank or cash accounts
+Module100Name=External Site
+Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module105Name=Mailman and SPIP
+Module105Desc=Mailman or SPIP interface for member module
+Module200Name=LDAP
+Module200Desc=LDAP directory synchronization
+Module210Name=PostNuke
+Module210Desc=PostNuke integration
+Module240Name=Data exports
+Module240Desc=Tool to export Dolibarr data (with assistance)
+Module250Name=Data imports
+Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module310Name=Members
+Module310Desc=Foundation members management
+Module320Name=RSS Feed
+Module320Desc=Add a RSS feed to Dolibarr pages
+Module330Name=Bookmarks & Shortcuts
+Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access
+Module400Name=Projects or Leads
+Module400Desc=Management of projects, leads/opportunities and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module410Name=Webcalendar
+Module410Desc=Webcalendar integration
+Module500Name=Taxes & Special Expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
+Module510Name=Salaries
+Module510Desc=Record and track employee payments
+Module520Name=Loans
+Module520Desc=Management of loans
+Module600Name=Notifications on business event
+Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
+Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
+Module610Name=Product Variants
+Module610Desc=Creation of product variants (color, size etc.)
+Module700Name=Donations
+Module700Desc=Donation management
+Module770Name=Expense Reports
+Module770Desc=Manage expense reports claims (transportation, meal, ...)
+Module1120Name=Vendor Commercial Proposals
+Module1120Desc=Request vendor commercial proposal and prices
+Module1200Name=Mantis
+Module1200Desc=Mantis integration
+Module1520Name=Document Generation
+Module1520Desc=Mass email document generation
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module2000Name=WYSIWYG editor
+Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
+Module2200Name=Dynamic Prices
+Module2200Desc=Use maths expressions for auto-generation of prices
+Module2300Name=Scheduled jobs
+Module2300Desc=Scheduled jobs management (alias cron or chrono table)
+Module2400Name=Events/Agenda
+Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
+Module2500Name=DMS / ECM
+Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
+Module2600Name=API/Web services (SOAP server)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API/Web services (REST server)
+Module2610Desc=Enable the Dolibarr REST server providing API services
+Module2660Name=Call WebServices (SOAP client)
+Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
+Module2700Name=Gravatar
+Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
+Module2800Desc=FTP Client
+Module2900Name=GeoIPMaxmind
+Module2900Desc=GeoIP Maxmind conversions capabilities
+Module3200Name=Unalterable Archives
+Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module4000Name=HRM
+Module4000Desc=Human resources management (management of department, employee contracts and feelings)
+Module5000Name=Multi-company
+Module5000Desc=Allows you to manage multiple companies
+Module6000Name=Workflow
+Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module10000Name=Websites
+Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
+Module20000Name=Leave Request Management
+Module20000Desc=Define and track employee leave requests
+Module39000Name=Product Lots
+Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
+Module40000Name=Multicurrency
+Module40000Desc=Use alternative currencies in prices and documents
+Module50000Name=PayBox
+Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50100Name=POS SimplePOS
+Module50100Desc=Point of Sale module SimplePOS (simple POS).
+Module50150Name=POS TakePOS
+Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50200Name=Paypal
+Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50300Name=Stripe
+Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50400Name=Accounting (double entry)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module54000Name=PrintIPP
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
+Module59000Name=Margins
+Module59000Desc=Module to manage margins
+Module60000Name=Commissions
+Module60000Desc=Module to manage commissions
+Module62000Name=Incoterms
+Module62000Desc=Add features to manage Incoterms
+Module63000Name=Resources
+Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
+Permission11=Read customer invoices
+Permission12=Create/modify customer invoices
+Permission13=Unvalidate customer invoices
+Permission14=Validate customer invoices
+Permission15=Send customer invoices by email
+Permission16=Create payments for customer invoices
+Permission19=Delete customer invoices
+Permission21=Read commercial proposals
+Permission22=Create/modify commercial proposals
+Permission24=Validate commercial proposals
+Permission25=Send commercial proposals
+Permission26=Close commercial proposals
+Permission27=Delete commercial proposals
+Permission28=Export commercial proposals
+Permission31=Read products
+Permission32=Create/modify products
+Permission34=Delete products
+Permission36=See/manage hidden products
+Permission38=Export products
+Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
+Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
+Permission44=Delete projects (shared project and projects I'm contact for)
+Permission45=Export projects
+Permission61=Read interventions
+Permission62=Create/modify interventions
+Permission64=Delete interventions
+Permission67=Export interventions
+Permission71=Read members
+Permission72=Create/modify members
+Permission74=Delete members
+Permission75=Setup types of membership
+Permission76=Export data
+Permission78=Read subscriptions
+Permission79=Create/modify subscriptions
+Permission81=Read customers orders
+Permission82=Create/modify customers orders
+Permission84=Validate customers orders
+Permission86=Send customers orders
+Permission87=Close customers orders
+Permission88=Cancel customers orders
+Permission89=Delete customers orders
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
+Permission95=Read reports
+Permission101=Read sendings
+Permission102=Create/modify sendings
+Permission104=Validate sendings
+Permission106=Export sendings
+Permission109=Delete sendings
+Permission111=Read financial accounts
+Permission112=Create/modify/delete and compare transactions
+Permission113=Setup financial accounts (create, manage categories)
+Permission114=Reconcile transactions
+Permission115=Export transactions and account statements
+Permission116=Transfers between accounts
+Permission117=Manage checks dispatching
+Permission121=Read third parties linked to user
+Permission122=Create/modify third parties linked to user
+Permission125=Delete third parties linked to user
+Permission126=Export third parties
+Permission141=Read all projects and tasks (also private projects for which I am not a contact)
+Permission142=Create/modify all projects and tasks (also private projects for which I am not a contact)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
+Permission146=Read providers
+Permission147=Read stats
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejections of direct debit payment orders
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
+Permission171=Read trips and expenses (yours and your subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
+Permission180=Read suppliers
+Permission181=Read purchase orders
+Permission182=Create/modify purchase orders
+Permission183=Validate purchase orders
+Permission184=Approve purchase orders
+Permission185=Order or cancel purchase orders
+Permission186=Receive purchase orders
+Permission187=Close purchase orders
+Permission188=Cancel purchase orders
+Permission192=Create lines
+Permission193=Cancel lines
+Permission194=Read the bandwidth lines
+Permission202=Create ADSL connections
+Permission203=Order connections orders
+Permission204=Order connections
+Permission205=Manage connections
+Permission206=Read connections
+Permission211=Read Telephony
+Permission212=Order lines
+Permission213=Activate line
+Permission214=Setup Telephony
+Permission215=Setup providers
+Permission221=Read emailings
+Permission222=Create/modify emailings (topic, recipients...)
+Permission223=Validate emailings (allows sending)
+Permission229=Delete emailings
+Permission237=View recipients and info
+Permission238=Manually send mailings
+Permission239=Delete mailings after validation or sent
+Permission241=Read categories
+Permission242=Create/modify categories
+Permission243=Delete categories
+Permission244=See the contents of the hidden categories
+Permission251=Read other users and groups
+PermissionAdvanced251=Read other users
+Permission252=Read permissions of other users
+Permission253=Create/modify other users, groups and permissions
+PermissionAdvanced253=Create/modify internal/external users and permissions
+Permission254=Create/modify external users only
+Permission255=Modify other users password
+Permission256=Delete or disable other users
+Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission271=Read CA
+Permission272=Read invoices
+Permission273=Issue invoices
+Permission281=Read contacts
+Permission282=Create/modify contacts
+Permission283=Delete contacts
+Permission286=Export contacts
+Permission291=Read tariffs
+Permission292=Set permissions on the tariffs
+Permission293=Modify customer's tariffs
+Permission300=Read barcodes
+Permission301=Create/modify barcodes
+Permission302=Delete barcodes
+Permission311=Read services
+Permission312=Assign service/subscription to contract
+Permission331=Read bookmarks
+Permission332=Create/modify bookmarks
+Permission333=Delete bookmarks
+Permission341=Read its own permissions
+Permission342=Create/modify his own user information
+Permission343=Modify his own password
+Permission344=Modify its own permissions
+Permission351=Read groups
+Permission352=Read groups permissions
+Permission353=Create/modify groups
+Permission354=Delete or disable groups
+Permission358=Export users
+Permission401=Read discounts
+Permission402=Create/modify discounts
+Permission403=Validate discounts
+Permission404=Delete discounts
+Permission430=Use Debug Bar
+Permission511=Read payments of salaries
+Permission512=Create/modify payments of salaries
+Permission514=Delete payments of salaries
+Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
+Permission531=Read services
+Permission532=Create/modify services
+Permission534=Delete services
+Permission536=See/manage hidden services
+Permission538=Export services
+Permission650=Read Bills of Materials
+Permission651=Create/Update Bills of Materials
+Permission652=Delete Bills of Materials
+Permission701=Read donations
+Permission702=Create/modify donations
+Permission703=Delete donations
+Permission771=Read expense reports (yours and your subordinates)
+Permission772=Create/modify expense reports
+Permission773=Delete expense reports
+Permission774=Read all expense reports (even for user not subordinates)
+Permission775=Approve expense reports
+Permission776=Pay expense reports
+Permission779=Export expense reports
+Permission1001=Read stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
+Permission1004=Read stock movements
+Permission1005=Create/modify stock movements
+Permission1101=Read delivery receipts
+Permission1102=Create/modify delivery receipts
+Permission1104=Validate delivery receipts
+Permission1109=Delete delivery receipts
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
+Permission1181=Read suppliers
+Permission1182=Read purchase orders
+Permission1183=Create/modify purchase orders
+Permission1184=Validate purchase orders
+Permission1185=Approve purchase orders
+Permission1186=Order purchase orders
+Permission1187=Acknowledge receipt of purchase orders
+Permission1188=Delete purchase orders
+Permission1190=Approve (second approval) purchase orders
+Permission1201=Get result of an export
+Permission1202=Create/Modify an export
+Permission1231=Read vendor invoices
+Permission1232=Create/modify vendor invoices
+Permission1233=Validate vendor invoices
+Permission1234=Delete vendor invoices
+Permission1235=Send vendor invoices by email
+Permission1236=Export vendor invoices, attributes and payments
+Permission1237=Export purchase orders and their details
+Permission1251=Run mass imports of external data into database (data load)
+Permission1321=Export customer invoices, attributes and payments
+Permission1322=Reopen a paid bill
+Permission1421=Export sales orders and attributes
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
+Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
+Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
+Permission2411=Read actions (events or tasks) of others
+Permission2412=Create/modify actions (events or tasks) of others
+Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
+Permission2501=Read/Download documents
+Permission2502=Download documents
+Permission2503=Submit or delete documents
+Permission2515=Setup documents directories
+Permission2801=Use FTP client in read mode (browse and download only)
+Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=Delete leave requests
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20006=Admin leave requests (setup and update balance)
+Permission20007=Approve leave requests
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
+Permission50101=Use Point of Sale
+Permission50201=Read transactions
+Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define fiscal periods. Validate transactions and close fiscal periods.
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
+Permission54001=Print
+Permission55001=Read polls
+Permission55002=Create/modify polls
+Permission59001=Read commercial margins
+Permission59002=Define commercial margins
+Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
+DictionaryCompanyType=Third-party types
+DictionaryCompanyJuridicalType=Third-party legal entities
+DictionaryProspectLevel=Prospect potential
+DictionaryCanton=States/Provinces
+DictionaryRegion=Regions
+DictionaryCountry=Countries
+DictionaryCurrency=Currencies
+DictionaryCivility=Honorific titles
+DictionaryActions=Types of agenda events
+DictionarySocialContributions=Types of social or fiscal taxes
+DictionaryVAT=VAT Rates or Sales Tax Rates
+DictionaryRevenueStamp=Amount of tax stamps
+DictionaryPaymentConditions=Payment Terms
+DictionaryPaymentModes=Payment Modes
+DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Website - Type of website pages/containers
+DictionaryEcotaxe=Ecotax (WEEE)
+DictionaryPaperFormat=Paper formats
+DictionaryFormatCards=Card formats
+DictionaryFees=Expense report - Types of expense report lines
+DictionarySendingMethods=Shipping methods
+DictionaryStaff=Number of Employees
+DictionaryAvailability=Delivery delay
+DictionaryOrderMethods=Ordering methods
+DictionarySource=Origin of proposals/orders
+DictionaryAccountancyCategory=Personalized groups for reports
+DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
+DictionaryEMailTemplates=Email Templates
+DictionaryUnits=Units
+DictionaryMeasuringUnits=Measuring Units
+DictionarySocialNetworks=Social Networks
+DictionaryProspectStatus=Prospect status
+DictionaryHolidayTypes=Types of leave
+DictionaryOpportunityStatus=Lead status for project/lead
+DictionaryExpenseTaxCat=Expense report - Transportation categories
+DictionaryExpenseTaxRange=Expense report - Range by transportation category
+SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
+BackToModuleList=Back to Module list
+BackToDictionaryList=Back to Dictionaries list
+TypeOfRevenueStamp=Type of tax stamp
+VATManagement=Sales Tax Management
+VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
+##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
+LTRate=Rate
+LocalTax1IsNotUsed=Do not use second tax
+LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
+LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax1Management=Second type of tax
+LocalTax1IsUsedExample=
+LocalTax1IsNotUsedExample=
+LocalTax2IsNotUsed=Do not use third tax
+LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
+LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax2Management=Third type of tax
+LocalTax2IsUsedExample=
+LocalTax2IsNotUsedExample=
+LocalTax1ManagementES=RE Management
+LocalTax1IsUsedDescES=The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
+LocalTax1IsNotUsedDescES=By default the proposed RE is 0. End of rule.
+LocalTax1IsUsedExampleES=In Spain they are professionals subject to some specific sections of the Spanish IAE.
+LocalTax1IsNotUsedExampleES=In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
+LocalTax2ManagementES=IRPF Management
+LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
+LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
+LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
+LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
+UseRevenueStamp=Use a tax stamp
+UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+CalcLocaltax=Reports on local taxes
+CalcLocaltax1=Sales - Purchases
+CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
+CalcLocaltax2=Purchases
+CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
+CalcLocaltax3=Sales
+CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+LabelUsedByDefault=Label used by default if no translation can be found for code
+LabelOnDocuments=Label on documents
+LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of a configuration constant
+NbOfDays=No. of days
+AtEndOfMonth=At end of month
+CurrentNext=Current/Next
+Offset=Offset
+AlwaysActive=Always active
+Upgrade=Upgrade
+MenuUpgrade=Upgrade / Extend
+AddExtensionThemeModuleOrOther=Deploy/install external app/module
+WebServer=Web server
+DocumentRootServer=Web server's root directory
+DataRootServer=Data files directory
+IP=IP
+Port=Port
+VirtualServerName=Virtual server name
+OS=OS
+PhpWebLink=Web-Php link
+Server=Server
+Database=Database
+DatabaseServer=Database host
+DatabaseName=Database name
+DatabasePort=Database port
+DatabaseUser=Database user
+DatabasePassword=Database password
+Tables=Tables
+TableName=Table name
+NbOfRecord=No. of records
+Host=Server
+DriverType=Driver type
+SummarySystem=System information summary
+SummaryConst=List of all Dolibarr setup parameters
+MenuCompanySetup=Company/Organization
+DefaultMenuManager= Standard menu manager
+DefaultMenuSmartphoneManager=Smartphone menu manager
+Skin=Skin theme
+DefaultSkin=Default skin theme
+MaxSizeList=Max length for list
+DefaultMaxSizeList=Default max length for lists
+DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
+MessageOfDay=Message of the day
+MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
+PermanentLeftSearchForm=Permanent search form on left menu
+DefaultLanguage=Default language
+EnableMultilangInterface=Enable multilanguage support
+EnableShowLogo=Show the company logo in the menu
+CompanyInfo=Company/Organization
+CompanyIds=Company/Organization identities
+CompanyName=Name
+CompanyAddress=Address
+CompanyZip=Zip
+CompanyTown=Town
+CompanyCountry=Country
+CompanyCurrency=Main currency
+CompanyObject=Object of the company
+IDCountry=ID country
+Logo=Logo
+LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
+LogoSquarred=Logo (squarred)
+LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
+DoNotSuggestPaymentMode=Do not suggest
+NoActiveBankAccountDefined=No active bank account defined
+OwnerOfBankAccount=Owner of bank account %s
+BankModuleNotActive=Bank accounts module not enabled
+ShowBugTrackLink=Show link "<strong>%s</strong>"
+Alerts=Alerts
+DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
+DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
+Delays_MAIN_DELAY_ACTIONS_TODO=Planned events (agenda events) not completed
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time
+Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Order not processed
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
+Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation
+Delays_MAIN_DELAY_MEMBERS=Delayed membership fee
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
+Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
+Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
+SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
+SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
+SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
+SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescription5=Other Setup menu entries manage optional parameters.
+LogEvents=Security audit events
+Audit=Audit
+InfoDolibarr=About Dolibarr
+InfoBrowser=About Browser
+InfoOS=About OS
+InfoWebServer=About Web Server
+InfoDatabase=About Database
+InfoPHP=About PHP
+InfoPerf=About Performances
+BrowserName=Browser name
+BrowserOS=Browser OS
+ListOfSecurityEvents=List of Dolibarr security events
+SecurityEventsPurged=Security events purged
+LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
+SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
+SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
+AccountantFileNumber=Accountant code
+DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
+AvailableModules=Available app/modules
+ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
+SessionTimeOut=Time out for session
+SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
+TriggersAvailable=Available triggers
+TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
+TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
+TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
+TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
+TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
+GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
+DictionaryDesc=Insert all reference data. You can add your values to the default.
+ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
+MiscellaneousDesc=All other security related parameters are defined here.
+LimitsSetup=Limits/Precision setup
+LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
+MAIN_MAX_DECIMALS_UNIT=Max. decimals for unit prices
+MAIN_MAX_DECIMALS_TOT=Max. decimals for total prices
+MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
+UnitPriceOfProduct=Net unit price of a product
+TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
+ParameterActiveForNextInputOnly=Parameter effective for next input only
+NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page.
+NoEventFoundWithCriteria=No security event has been found for this search criteria.
+SeeLocalSendMailSetup=See your local sendmail setup
+BackupDesc=A <b>complete</b> backup of a Dolibarr installation requires two steps.
+BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
+BackupDesc3=Backup the structure and contents of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
+BackupDescX=The archived directory should be stored in a secure place.
+BackupDescY=The generated dump file should be stored in a secure place.
+BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
+RestoreDesc=To restore a Dolibarr backup, two steps are required.
+RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
+RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
+RestoreMySQL=MySQL import
+ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+PreviousDumpFiles=Existing backup files
+PreviousArchiveFiles=Existing archive files
+WeekStartOnDay=First day of the week
+RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
+YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
+YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
+DownloadMoreSkins=More skins to download
+SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+ShowProfIdInAddress=Show professional id with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+TranslationUncomplete=Partial translation
+MAIN_DISABLE_METEO=Disable meteorological view
+MeteoStdMod=Standard mode
+MeteoStdModEnabled=Standard mode enabled
+MeteoPercentageMod=Percentage mode
+MeteoPercentageModEnabled=Percentage mode enabled
+MeteoUseMod=Click to use %s
+TestLoginToAPI=Test login to API
+ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
+ExternalAccess=External/Internet Access
+MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet)
+MAIN_PROXY_HOST=Proxy server: Name/Address
+MAIN_PROXY_PORT=Proxy server: Port
+MAIN_PROXY_USER=Proxy server: Login/User
+MAIN_PROXY_PASS=Proxy server: Password
+DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+ExtraFields=Complementary attributes
+ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsThirdParties=Complementary attributes (third party)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
+ExtraFieldsMember=Complementary attributes (member)
+ExtraFieldsMemberType=Complementary attributes (member type)
+ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
+ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
+ExtraFieldsSupplierOrders=Complementary attributes (orders)
+ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
+ExtraFieldsProject=Complementary attributes (projects)
+ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldHasWrongValue=Attribute %s has a wrong value.
+AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
+PathToDocuments=Path to documents
+PathDirectory=Directory
+SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+YouMustEnableOneModule=You must at least enable 1 module
+ClassNotFoundIntoPathWarning=Class %s not found in PHP path
+YesInSummer=Yes in summer
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
+SuhosinSessionEncrypt=Session storage encrypted by Suhosin
+ConditionIsCurrently=Condition is currently %s
+YouUseBestDriver=You use driver %s which is the best driver currently available.
+YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+SearchOptim=Search optimization
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
+BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
+AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
+AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
+FieldEdition=Edition of field %s
+FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
+GetBarCode=Get barcode
+NumberingModules=Numbering models
+##### Module password generation
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
+PasswordGenerationPerso=Return a password according to your personally defined configuration.
+SetupPerso=According to your configuration
+PasswordPatternDesc=Password pattern description
+##### Users setup #####
+RuleForGeneratedPasswords=Rules to generate and validate passwords
+DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
+UsersSetup=Users module setup
+UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
+##### HRM setup #####
+HRMSetup=HRM module setup
+##### Company setup #####
+CompanySetup=Companies module setup
+CompanyCodeChecker=Options for automatic generation of customer/vendor codes
+AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
+NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
+NotificationsDescUser=* per user, one user at a time.
+NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
+NotificationsDescGlobal=* or by setting global email addresses in this setup page.
+ModelModules=Document Templates
+DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
+WatermarkOnDraft=Watermark on draft document
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
+CompanyIdProfChecker=Rules for Professional IDs
+MustBeUnique=Must be unique?
+MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
+MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
+WebDavServer=Root URL of %s server: %s
+##### Webcal setup #####
+WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
+##### Invoices #####
+BillsSetup=Invoices module setup
+BillsNumberingModule=Invoices and credit notes numbering model
+BillsPDFModules=Invoice documents models
+BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
+PaymentsPDFModules=Payment documents models
+ForceInvoiceDate=Force invoice date to validation date
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
+SuggestPaymentByChequeToAddress=Suggest payment by check to
+FreeLegalTextOnInvoices=Free text on invoices
+WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
+PaymentsNumberingModule=Payments numbering model
+SuppliersPayment=Vendor payments
+SupplierPaymentSetup=Vendor payments setup
+##### Proposals #####
+PropalSetup=Commercial proposals module setup
+ProposalsNumberingModules=Commercial proposal numbering models
+ProposalsPDFModules=Commercial proposal documents models
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+FreeLegalTextOnProposal=Free text on commercial proposals
+WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
+##### Suppliers Orders #####
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
+##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+OrdersSetup=Sales Orders management setup
+OrdersNumberingModules=Orders numbering models
+OrdersModelModule=Order documents models
+FreeLegalTextOnOrders=Free text on orders
+WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+##### Interventions #####
+InterventionsSetup=Interventions module setup
+FreeLegalTextOnInterventions=Free text on intervention documents
+FicheinterNumberingModules=Intervention numbering models
+TemplatePDFInterventions=Intervention card documents models
+WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+##### Contracts #####
+ContractsSetup=Contracts/Subscriptions module setup
+ContractsNumberingModules=Contracts numbering modules
+TemplatePDFContracts=Contracts documents models
+FreeLegalTextOnContracts=Free text on contracts
+WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+##### Members #####
+MembersSetup=Members module setup
+MemberMainOptions=Main options
+AdherentLoginRequired= Manage a Login for each member
+AdherentMailRequired=Email required to create a new member
+MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
+MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+##### LDAP setup #####
+LDAPSetup=LDAP Setup
+LDAPGlobalParameters=Global parameters
+LDAPUsersSynchro=Users
+LDAPGroupsSynchro=Groups
+LDAPContactsSynchro=Contacts
+LDAPMembersSynchro=Members
+LDAPMembersTypesSynchro=Members types
+LDAPSynchronization=LDAP synchronisation
+LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
+LDAPToDolibarr=LDAP -> Dolibarr
+DolibarrToLDAP=Dolibarr -> LDAP
+LDAPNamingAttribute=Key in LDAP
+LDAPSynchronizeUsers=Organization of users in LDAP
+LDAPSynchronizeGroups=Organization of groups in LDAP
+LDAPSynchronizeContacts=Organization of contacts in LDAP
+LDAPSynchronizeMembers=Organization of foundation's members in LDAP
+LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
+LDAPPrimaryServer=Primary server
+LDAPSecondaryServer=Secondary server
+LDAPServerPort=Server port
+LDAPServerPortExample=Default port: 389
+LDAPServerProtocolVersion=Protocol version
+LDAPServerUseTLS=Use TLS
+LDAPServerUseTLSExample=Your LDAP server use TLS
+LDAPServerDn=Server DN
+LDAPAdminDn=Administrator DN
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
+LDAPPassword=Administrator password
+LDAPUserDn=Users' DN
+LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
+LDAPGroupDn=Groups' DN
+LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
+LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
+LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
+LDAPDnSynchroActive=Users and groups synchronization
+LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
+LDAPDnContactActive=Contacts' synchronization
+LDAPDnContactActiveExample=Activated/Unactivated synchronization
+LDAPDnMemberActive=Members' synchronization
+LDAPDnMemberActiveExample=Activated/Unactivated synchronization
+LDAPDnMemberTypeActive=Members types' synchronization
+LDAPDnMemberTypeActiveExample=Activated/Unactivated synchronization
+LDAPContactDn=Dolibarr contacts' DN
+LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
+LDAPMemberDn=Dolibarr members DN
+LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
+LDAPMemberObjectClassList=List of objectClass
+LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPMemberTypeDn=Dolibarr members types DN
+LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeObjectClassList=List of objectClass
+LDAPMemberTypeObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPUserObjectClassList=List of objectClass
+LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPGroupObjectClassList=List of objectClass
+LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPContactObjectClassList=List of objectClass
+LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPTestConnect=Test LDAP connection
+LDAPTestSynchroContact=Test contacts synchronization
+LDAPTestSynchroUser=Test user synchronization
+LDAPTestSynchroGroup=Test group synchronization
+LDAPTestSynchroMember=Test member synchronization
+LDAPTestSynchroMemberType=Test member type synchronization
+LDAPTestSearch= Test a LDAP search
+LDAPSynchroOK=Synchronization test successful
+LDAPSynchroKO=Failed synchronization test
+LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
+LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
+LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
+LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPSetupForVersion3=LDAP server configured for version 3
+LDAPSetupForVersion2=LDAP server configured for version 2
+LDAPDolibarrMapping=Dolibarr Mapping
+LDAPLdapMapping=LDAP Mapping
+LDAPFieldLoginUnix=Login (unix)
+LDAPFieldLoginExample=Example: uid
+LDAPFilterConnection=Search filter
+LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPFieldLoginSamba=Login (samba, activedirectory)
+LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldFullname=Full name
+LDAPFieldFullnameExample=Example: cn
+LDAPFieldPasswordNotCrypted=Password not encrypted
+LDAPFieldPasswordCrypted=Password encrypted
+LDAPFieldPasswordExample=Example: userPassword
+LDAPFieldCommonNameExample=Example: cn
+LDAPFieldName=Name
+LDAPFieldNameExample=Example: sn
+LDAPFieldFirstName=First name
+LDAPFieldFirstNameExample=Example: givenName
+LDAPFieldMail=Email address
+LDAPFieldMailExample=Example: mail
+LDAPFieldPhone=Professional phone number
+LDAPFieldPhoneExample=Example: telephonenumber
+LDAPFieldHomePhone=Personal phone number
+LDAPFieldHomePhoneExample=Example: homephone
+LDAPFieldMobile=Cellular phone
+LDAPFieldMobileExample=Example: mobile
+LDAPFieldFax=Fax number
+LDAPFieldFaxExample=Example: facsimiletelephonenumber
+LDAPFieldAddress=Street
+LDAPFieldAddressExample=Example: street
+LDAPFieldZip=Zip
+LDAPFieldZipExample=Example: postalcode
+LDAPFieldTown=Town
+LDAPFieldTownExample=Example: l
+LDAPFieldCountry=Country
+LDAPFieldDescription=Description
+LDAPFieldDescriptionExample=Example: description
+LDAPFieldNotePublic=Public Note
+LDAPFieldNotePublicExample=Example: publicnote
+LDAPFieldGroupMembers= Group members
+LDAPFieldGroupMembersExample= Example: uniqueMember
+LDAPFieldBirthdate=Birthdate
+LDAPFieldCompany=Company
+LDAPFieldCompanyExample=Example: o
+LDAPFieldSid=SID
+LDAPFieldSidExample=Example: objectsid
+LDAPFieldEndLastSubscription=Date of subscription end
+LDAPFieldTitle=Job position
+LDAPFieldTitleExample=Example: title
+LDAPFieldGroupid=Group id
+LDAPFieldGroupidExample=Exemple : gidnumber
+LDAPFieldUserid=User id
+LDAPFieldUseridExample=Exemple : uidnumber
+LDAPFieldHomedirectory=Home directory
+LDAPFieldHomedirectoryExample=Exemple : homedirectory
+LDAPFieldHomedirectoryprefix=Home directory prefix
+LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
+LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
+LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
+LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
+LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
+LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
+LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use thoose values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all thoose schemas loaded.
+ForANonAnonymousAccess=For an authenticated access (for a write access for example)
+PerfDolibarr=Performance setup/optimizing report
+YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
+NotInstalled=Not installed, so your server is not slowed down by this.
+ApplicativeCache=Applicative cache
+MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
+MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
+MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
+OPCodeCache=OPCode cache
+NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
+HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
+FilesOfTypeCached=Files of type %s are cached by HTTP server
+FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
+FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
+FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
+CacheByServer=Cache by server
+CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
+CacheByClient=Cache by browser
+CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
+DefaultCreateForm=Default values (to use on forms)
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
+DefaultMandatory=Mandatory form fields
+##### Products #####
+ProductSetup=Products module setup
+ServiceSetup=Services module setup
+ProductServiceSetup=Products and Services modules setup
+NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
+ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in the language of the third party
+UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
+SetDefaultBarcodeTypeProducts=Default barcode type to use for products
+SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
+ProductCodeChecker= Module for product code generation and checking (product or service)
+ProductOtherConf= Product / Service configuration
+IsNotADir=is not a directory!
+##### Syslog #####
+SyslogSetup=Logs module setup
+SyslogOutput=Logs outputs
+SyslogFacility=Facility
+SyslogLevel=Level
+SyslogFilename=File name and path
+YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
+ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
+OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+##### Donations #####
+DonationsSetup=Donation module setup
+DonationsReceiptModel=Template of donation receipt
+##### Barcode #####
+BarcodeSetup=Barcode setup
+PaperFormatModule=Print format module
+BarcodeEncodeModule=Barcode encoding type
+CodeBarGenerator=Barcode generator
+ChooseABarCode=No generator defined
+FormatNotSupportedByGenerator=Format not supported by this generator
+BarcodeDescEAN8=Barcode of type EAN8
+BarcodeDescEAN13=Barcode of type EAN13
+BarcodeDescUPC=Barcode of type UPC
+BarcodeDescISBN=Barcode of type ISBN
+BarcodeDescC39=Barcode of type C39
+BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
+GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
+BarcodeInternalEngine=Internal engine
+BarCodeNumberManager=Manager to auto define barcode numbers
+##### Prelevements #####
+WithdrawalsSetup=Setup of module Direct Debit payments
+##### ExternalRSS #####
+ExternalRSSSetup=External RSS imports setup
+NewRSS=New RSS Feed
+RSSUrl=RSS URL
+RSSUrlExample=An interesting RSS feed
+##### Mailing #####
+MailingSetup=EMailing module setup
+MailingEMailFrom=Sender email (From) for emails sent by emailing module
+MailingEMailError=Return Email (Errors-to) for emails with errors
+MailingDelay=Seconds to wait after sending next message
+##### Notification #####
+NotificationSetup=Email Notification module setup
+NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
+FixedEmailTarget=Recipient
+##### Sendings #####
+SendingsSetup=Shipping module setup
+SendingsReceiptModel=Sending receipt model
+SendingsNumberingModules=Sendings numbering modules
+SendingsAbility=Support shipping sheets for customer deliveries
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
+FreeLegalTextOnShippings=Free text on shipments
+##### Deliveries #####
+DeliveryOrderNumberingModules=Products deliveries receipt numbering module
+DeliveryOrderModel=Products deliveries receipt model
+DeliveriesOrderAbility=Support products deliveries receipts
+FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+##### FCKeditor #####
+AdvancedEditor=Advanced editor
+ActivateFCKeditor=Activate advanced editor for:
+FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
+FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
+FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
+FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
+FCKeditorForTicket=WYSIWIG creation/edition for tickets
+##### Stock #####
+StockSetup=Stock module setup
+IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+##### Menu #####
+MenuDeleted=Menu deleted
+Menus=Menus
+TreeMenuPersonalized=Personalized menus
+NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
+NewMenu=New menu
+Menu=Selection of menu
+MenuHandler=Menu handler
+MenuModule=Source module
+HideUnauthorizedMenu= Hide unauthorized menus (gray)
+DetailId=Id menu
+DetailMenuHandler=Menu handler where to show new menu
+DetailMenuModule=Module name if menu entry come from a module
+DetailType=Type of menu (top or left)
+DetailTitre=Menu label or label code for translation
+DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
+DetailEnabled=Condition to show or not entry
+DetailRight=Condition to display unauthorized grey menus
+DetailLangs=Lang file name for label code translation
+DetailUser=Intern / Extern / All
+Target=Target
+DetailTarget=Target for links (_blank top opens a new window)
+DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
+ModifMenu=Menu change
+DeleteMenu=Delete menu entry
+ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
+FailedToInitializeMenu=Failed to initialize menu
+##### Tax #####
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
+OptionVatMode=VAT due
+OptionVATDefault=Standard basis
+OptionVATDebitOption=Accrual basis
+OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
+OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
+SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option:
+OnDelivery=On delivery
+OnPayment=On payment
+OnInvoice=On invoice
+SupposedToBePaymentDate=Payment date used
+SupposedToBeInvoiceDate=Invoice date used
+Buy=Buy
+Sell=Sell
+InvoiceDateUsed=Invoice date used
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
+AccountancyCode=Accounting Code
+AccountancyCodeSell=Sale account. code
+AccountancyCodeBuy=Purchase account. code
+##### Agenda #####
+AgendaSetup=Events and agenda module setup
+PasswordTogetVCalExport=Key to authorize export link
+PastDelayVCalExport=Do not export event older than
+AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
+AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
+AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
+AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
+ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+##### Point Of Sale (CashDesk) #####
+CashDesk=Point of Sale
+CashDeskSetup=Point of Sales module setup
+CashDeskThirdPartyForSell=Default generic third party to use for sales
+CashDeskBankAccountForSell=Default account to use to receive cash payments
+CashDeskBankAccountForCheque=Default account to use to receive payments by check
+CashDeskBankAccountForCB=Default account to use to receive payments by credit cards
+CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with module Serial/Lot management (currently active) so stock decrease is disabled.
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
+CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
+CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
+CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+##### Bookmark #####
+BookmarkSetup=Bookmark module setup
+BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
+NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
+##### WebServices #####
+WebServicesSetup=Webservices module setup
+WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
+WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
+EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
+ApiExporerIs=You can explore and test the APIs at URL
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+##### Bank #####
+BankSetupModule=Bank module setup
+FreeLegalTextOnChequeReceipts=Free text on check receipts
+BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
+BankOrderGlobal=General
+BankOrderGlobalDesc=General display order
+BankOrderES=Spanish
+BankOrderESDesc=Spanish display order
+ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+##### Multicompany #####
+MultiCompanySetup=Multi-company module setup
+##### Suppliers #####
+SuppliersSetup=Vendor module setup
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
+SuppliersInvoiceModel=Complete template of Vendor Invoice
+SuppliersInvoiceNumberingModel=Vendor invoices numbering models
+IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
+##### GeoIPMaxmind #####
+GeoIPMaxmindSetup=GeoIP Maxmind module setup
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
+NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
+YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
+YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
+TestGeoIPResult=Test of a conversion IP -> country
+##### Projects #####
+ProjectsNumberingModules=Projects numbering module
+ProjectsSetup=Project module setup
+ProjectsModelModule=Project reports document model
+TasksNumberingModules=Tasks numbering module
+TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
+##### ECM (GED) #####
+##### Fiscal Year #####
+AccountingPeriods=Accounting periods
+AccountingPeriodCard=Accounting period
+NewFiscalYear=New accounting period
+OpenFiscalYear=Open accounting period
+CloseFiscalYear=Close accounting period
+DeleteFiscalYear=Delete accounting period
+ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
+ShowFiscalYear=Show accounting period
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
+Format=Format
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
+IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
+ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
+ExpenseReportNumberingModules=Expense reports numbering module
+NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerUser=List of automatic notifications per user*
+ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
+ListOfFixedNotifications=List of automatic fixed notifications
+GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+Threshold=Threshold
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
+SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
+SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
+HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+TextTitleColor=Text color of Page title
+LinkColor=Color of links
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
+MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
+NbAddedAutomatically=Number of days added to counters of users (automatically) each month
+EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+Enter0or1=Enter 0 or 1
+UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
+PositionIntoComboList=Position of line into combo lists
+SellTaxRate=Sale tax rate
+RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
+UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
+OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
+TemplateForElement=This template record is dedicated to which element
+TypeOfTemplate=Type of template
+TemplateIsVisibleByOwnerOnly=Template is visible to owner only
+VisibleEverywhere=Visible everywhere
+VisibleNowhere=Visible nowhere
+FixTZ=TimeZone fix
+FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
+ExpectedChecksum=Expected Checksum
+CurrentChecksum=Current Checksum
+ExpectedSize=Expected size
+CurrentSize=Current size
+ForcedConstants=Required constant values
+MailToSendProposal=Customer proposals
+MailToSendOrder=Sales orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Shipments
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracts
+MailToThirdparty=Third parties
+MailToMember=Members
+MailToUser=Users
+MailToProject=Projects page
+ByDefaultInList=Show by default on list view
+YouUseLastStableVersion=You use the latest stable version
+TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
+TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
+SeeChangeLog=See ChangeLog file (english only)
+AllPublishers=All publishers
+UnknownPublishers=Unknown publishers
+AddRemoveTabs=Add or remove tabs
+AddDataTables=Add object tables
+AddDictionaries=Add dictionaries tables
+AddData=Add objects or dictionaries data
+AddBoxes=Add widgets
+AddSheduledJobs=Add scheduled jobs
+AddHooks=Add hooks
+AddTriggers=Add triggers
+AddMenus=Add menus
+AddPermissions=Add permissions
+AddExportProfiles=Add export profiles
+AddImportProfiles=Add import profiles
+AddOtherPagesOrServices=Add other pages or services
+AddModels=Add document or numbering templates
+AddSubstitutions=Add keys substitutions
+DetectionNotPossible=Detection not possible
+UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
+ListOfAvailableAPIs=List of available APIs
+activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
+CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
+UserHasNoPermissions=This user has no permissions defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
+BaseCurrency=Reference currency of the company (go into setup of company to change this)
+WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
+WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
+MAIN_PDF_MARGIN_LEFT=Left margin on PDF
+MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
+MAIN_PDF_MARGIN_TOP=Top margin on PDF
+MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+NothingToSetup=There is no specific setup required for this module.
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+RemoveSpecialChars=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
+GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
+GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
+HelpOnTooltip=Help text to show on tooltip
+HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
+YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
+ChartLoaded=Chart of account loaded
+SocialNetworkSetup=Setup of module Social Networks
+EnableFeatureFor=Enable features for <strong>%s</strong>
+VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+EmailCollector=Email collector
+EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
+NewEmailCollector=New Email Collector
+EMailHost=Host of email IMAP server
+MailboxSourceDirectory=Mailbox source directory
+MailboxTargetDirectory=Mailbox target directory
+EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
+CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
+DateLastCollectResult=Date latest collect tried
+DateLastcollectResultOk=Date latest collect successfull
+LastResult=Latest result
+EmailCollectorConfirmCollectTitle=Email collect confirmation
+EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
+NoNewEmailToProcess=No new email (matching filters) to process
+NothingProcessed=Nothing done
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+RecordEvent=Record email event
+CreateLeadAndThirdParty=Create lead (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CodeLastResult=Latest result code
+NbOfEmailsInInbox=Number of emails in source directory
+LoadThirdPartyFromName=Load third party searching on %s (load only)
+LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+WithDolTrackingID=Dolibarr Reference found in Message ID
+WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+FormatZip=Zip
+MainMenuCode=Menu entry code (mainmenu)
+ECMAutoTree=Show automatic ECM tree
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OpeningHours=Opening hours
+OpeningHoursDesc=Enter here the regular opening hours of your company.
+ResourceSetup=Configuration of Resource module
+UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
+EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
+ConfirmUnactivation=Confirm module reset
+OnMobileOnly=On small screen (smartphone) only
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
+Protanopia=Protanopia
+Deuteranopes=Deuteranopes
+Tritanopes=Tritanopes
+ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
+DefaultCustomerType=Default thirdparty type for "New customer" creation form
+ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
+RootCategoryForProductsToSell=Root category of products to sell
+RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
+DebugBar=Debug Bar
+DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
+DebugBarSetup=DebugBar Setup
+GeneralOptions=General Options
+LogsLinesNumber=Number of lines to show on logs tab
+UseDebugBar=Use the debug bar
+DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
+WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
+ModuleActivated=Module %s is activated and slows the interface
+EXPORTS_SHARE_MODELS=Export models are share with everybody
+ExportSetup=Setup of module Export
+ImportSetup=Setup of module Import
+InstanceUniqueID=Unique ID of the instance
+SmallerThan=Smaller than
+LargerThan=Larger than
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
+EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
+RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
+AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+IPListExample=127.0.0.1 192.168.0.2 [::1]
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
+FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
+EmailTemplate=Template for email
+EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
+FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/hi_IN/agenda.lang b/htdocs/langs/hi_IN/agenda.lang
new file mode 100644
index 00000000000..2031241d2c9
--- /dev/null
+++ b/htdocs/langs/hi_IN/agenda.lang
@@ -0,0 +1,154 @@
+# Dolibarr language file - Source file is en_US - agenda
+IdAgenda=ID event
+Actions=Events
+Agenda=Agenda
+TMenuAgenda=Agenda
+Agendas=Agendas
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+ActionsOwnedByShort=Owner
+AffectedTo=Assigned to
+Event=Event
+Events=Events
+EventsNb=Number of events
+ListOfActions=List of events
+EventReports=Event reports
+Location=Location
+ToUserOfGroup=To any user in group
+EventOnFullDay=Event on all day(s)
+MenuToDoActions=All incomplete events
+MenuDoneActions=All terminated events
+MenuToDoMyActions=My incomplete events
+MenuDoneMyActions=My terminated events
+ListOfEvents=List of events (internal calendar)
+ActionsAskedBy=Events reported by
+ActionsToDoBy=Events assigned to
+ActionsDoneBy=Events done by
+ActionAssignedTo=Event assigned to
+ViewCal=Month view
+ViewDay=Day view
+ViewWeek=Week view
+ViewPerUser=Per user view
+ViewPerType=Per type view
+AutoActions= Automatic filling
+AgendaAutoActionDesc= Here you may define events which you want Dolibarr to create automatically  in Agenda. If nothing is checked, only manual actions will be included in logs and displayed in Agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
+AgendaSetupOtherDesc= This page provides options to allow the export of your Dolibarr events into an external calendar (Thunderbird, Google Calendar etc...)
+AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
+ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
+EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
+##### Agenda event labels #####
+NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
+ContractValidatedInDolibarr=Contract %s validated
+CONTRACT_DELETEInDolibarr=Contract %s deleted
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
+InvoiceDeleteDolibarr=Invoice %s deleted
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+MemberValidatedInDolibarr=Member %s validated
+MemberModifiedInDolibarr=Member %s modified
+MemberResiliatedInDolibarr=Member %s terminated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
+ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
+ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
+ShipmentDeletedInDolibarr=Shipment %s deleted
+OrderCreatedInDolibarr=Order %s created
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
+OrderApprovedInDolibarr=Order %s approved
+OrderRefusedInDolibarr=Order %s refused
+OrderBackToDraftInDolibarr=Order %s go back to draft status
+ProposalSentByEMail=Commercial proposal %s sent by email
+ContractSentByEMail=Contract %s sent by email
+OrderSentByEMail=Sales order %s sent by email
+InvoiceSentByEMail=Customer invoice %s sent by email
+SupplierOrderSentByEMail=Purchase order %s sent by email
+ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
+SupplierInvoiceSentByEMail=Vendor invoice %s sent by email
+ShippingSentByEMail=Shipment %s sent by email
+ShippingValidated= Shipment %s validated
+InterventionSentByEMail=Intervention %s sent by email
+ProposalDeleted=Proposal deleted
+OrderDeleted=Order deleted
+InvoiceDeleted=Invoice deleted
+DraftInvoiceDeleted=Draft invoice deleted
+PRODUCT_CREATEInDolibarr=Product %s created
+PRODUCT_MODIFYInDolibarr=Product %s modified
+PRODUCT_DELETEInDolibarr=Product %s deleted
+HOLIDAY_CREATEInDolibarr=Request for leave %s created
+HOLIDAY_MODIFYInDolibarr=Request for leave %s modified
+HOLIDAY_APPROVEInDolibarr=Request for leave %s approved
+HOLIDAY_VALIDATEInDolibarr=Request for leave %s validated
+HOLIDAY_DELETEInDolibarr=Request for leave %s deleted
+EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created
+EXPENSE_REPORT_VALIDATEInDolibarr=Expense report %s validated
+EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved
+EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted
+EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused
+PROJECT_CREATEInDolibarr=Project %s created
+PROJECT_MODIFYInDolibarr=Project %s modified
+PROJECT_DELETEInDolibarr=Project %s deleted
+TICKET_CREATEInDolibarr=Ticket %s created
+TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
+TICKET_CLOSEInDolibarr=Ticket %s closed
+TICKET_DELETEInDolibarr=Ticket %s deleted
+BOM_VALIDATEInDolibarr=BOM validated
+BOM_UNVALIDATEInDolibarr=BOM unvalidated
+BOM_CLOSEInDolibarr=BOM disabled
+BOM_REOPENInDolibarr=BOM reopen
+BOM_DELETEInDolibarr=BOM deleted
+MRP_MO_VALIDATEInDolibarr=MO validated
+MRP_MO_PRODUCEDInDolibarr=MO produced
+MRP_MO_DELETEInDolibarr=MO deleted
+##### End agenda events #####
+AgendaModelModule=Document templates for event
+DateActionStart=Start date
+DateActionEnd=End date
+AgendaUrlOptions1=You can also add following parameters to filter output:
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
+AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
+AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
+AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaHideBirthdayEvents=Hide birthdays of contacts
+Busy=Busy
+ExportDataset_event1=List of agenda events
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
+# External Sites ical
+ExportCal=Export calendar
+ExtSites=Import external calendars
+ExtSitesEnableThisTool=Show external calendars (defined in global setup) in Agenda. Does not affect external calendars defined by users.
+ExtSitesNbOfAgenda=Number of calendars
+AgendaExtNb=Calendar no. %s
+ExtSiteUrlAgenda=URL to access .ical file
+ExtSiteNoLabel=No Description
+VisibleTimeRange=Visible time range
+VisibleDaysRange=Visible days range
+AddEvent=Create event
+MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
+RepeatEvent=Repeat event
+EveryWeek=Every week
+EveryMonth=Every month
+DayOfMonth=Day of month
+DayOfWeek=Day of week
+DateStartPlusOne=Date start + 1 hour
diff --git a/htdocs/langs/hi_IN/assets.lang b/htdocs/langs/hi_IN/assets.lang
new file mode 100644
index 00000000000..ef04723c6c2
--- /dev/null
+++ b/htdocs/langs/hi_IN/assets.lang
@@ -0,0 +1,65 @@
+# Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+Assets = Assets
+NewAsset = New asset
+AccountancyCodeAsset = Accounting code (asset)
+AccountancyCodeDepreciationAsset = Accounting code (depreciation asset account)
+AccountancyCodeDepreciationExpense = Accounting code (depreciation expense account)
+NewAssetType=New asset type
+AssetsTypeSetup=Asset type setup
+AssetTypeModified=Asset type modified
+AssetType=Asset type
+AssetsLines=Assets
+DeleteType=Delete
+DeleteAnAssetType=Delete an asset type
+ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
+ShowTypeCard=Show type '%s'
+
+# Module label 'ModuleAssetsName'
+ModuleAssetsName = Assets
+# Module description 'ModuleAssetsDesc'
+ModuleAssetsDesc = Assets description
+
+#
+# Admin page
+#
+AssetsSetup = Assets setup
+Settings = Settings
+AssetsSetupPage = Assets setup page
+ExtraFieldsAssetsType = Complementary attributes (Asset type)
+AssetsType=Asset type
+AssetsTypeId=Asset type id
+AssetsTypeLabel=Asset type label
+AssetsTypes=Assets types
+
+#
+# Menu
+#
+MenuAssets = Assets
+MenuNewAsset = New asset
+MenuTypeAssets = Type assets
+MenuListAssets = List
+MenuNewTypeAssets = New
+MenuListTypeAssets = List
+
+#
+# Module
+#
+NewAssetType=New asset type
+NewAsset=New asset
diff --git a/htdocs/langs/hi_IN/banks.lang b/htdocs/langs/hi_IN/banks.lang
new file mode 100644
index 00000000000..e54239e9fb2
--- /dev/null
+++ b/htdocs/langs/hi_IN/banks.lang
@@ -0,0 +1,175 @@
+# Dolibarr language file - Source file is en_US - banks
+Bank=Bank
+MenuBankCash=Banks | Cash
+MenuVariousPayment=Miscellaneous payments
+MenuNewVariousPayment=New Miscellaneous payment
+BankName=Bank name
+FinancialAccount=Account
+BankAccount=Bank account
+BankAccounts=Bank accounts
+BankAccountsAndGateways=Bank accounts | Gateways
+ShowAccount=Show Account
+AccountRef=Financial account ref
+AccountLabel=Financial account label
+CashAccount=Cash account
+CashAccounts=Cash accounts
+CurrentAccounts=Current accounts
+SavingAccounts=Savings accounts
+ErrorBankLabelAlreadyExists=Financial account label already exists
+BankBalance=Balance
+BankBalanceBefore=Balance before
+BankBalanceAfter=Balance after
+BalanceMinimalAllowed=Minimum allowed balance
+BalanceMinimalDesired=Minimum desired balance
+InitialBankBalance=Initial balance
+EndBankBalance=End balance
+CurrentBalance=Current balance
+FutureBalance=Future balance
+ShowAllTimeBalance=Show balance from start
+AllTime=From start
+Reconciliation=Reconciliation
+RIB=Bank Account Number
+IBAN=IBAN number
+BIC=BIC/SWIFT code
+SwiftValid=BIC/SWIFT valid
+SwiftVNotalid=BIC/SWIFT not valid
+IbanValid=BAN valid
+IbanNotValid=BAN not valid
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
+AccountStatement=Account statement
+AccountStatementShort=Statement
+AccountStatements=Account statements
+LastAccountStatements=Last account statements
+IOMonthlyReporting=Monthly reporting
+BankAccountDomiciliation=Bank address
+BankAccountCountry=Account country
+BankAccountOwner=Account owner name
+BankAccountOwnerAddress=Account owner address
+RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
+CreateAccount=Create account
+NewBankAccount=New account
+NewFinancialAccount=New financial account
+MenuNewFinancialAccount=New financial account
+EditFinancialAccount=Edit account
+LabelBankCashAccount=Bank or cash label
+AccountType=Account type
+BankType0=Savings account
+BankType1=Current or credit card account
+BankType2=Cash account
+AccountsArea=Accounts area
+AccountCard=Account card
+DeleteAccount=Delete account
+ConfirmDeleteAccount=Are you sure you want to delete this account?
+Account=Account
+BankTransactionByCategories=Bank entries by categories
+BankTransactionForCategory=Bank entries for category <b>%s</b>
+RemoveFromRubrique=Remove link with category
+RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
+ListBankTransactions=List of bank entries
+IdTransaction=Transaction ID
+BankTransactions=Bank entries
+BankTransaction=Bank entry
+ListTransactions=List entries
+ListTransactionsByCategory=List entries/category
+TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
+Conciliable=Can be reconciled
+Conciliate=Reconcile
+Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
+ReconciliationLate=Reconciliation late
+IncludeClosedAccount=Include closed accounts
+OnlyOpenedAccount=Only open accounts
+AccountToCredit=Account to credit
+AccountToDebit=Account to debit
+DisableConciliation=Disable reconciliation feature for this account
+ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated entry
+StatusAccountOpened=Open
+StatusAccountClosed=Closed
+AccountIdShort=Number
+LineRecord=Transaction
+AddBankRecord=Add entry
+AddBankRecordLong=Add entry manually
+Conciliated=Reconciled
+ConciliatedBy=Reconciled by
+DateConciliating=Reconcile date
+BankLineConciliated=Entry reconciled with bank receipt
+Reconciled=Reconciled
+NotReconciled=Not reconciled
+CustomerInvoicePayment=Customer payment
+SupplierInvoicePayment=Vendor payment
+SubscriptionPayment=Subscription payment
+WithdrawalPayment=Debit payment order
+SocialContributionPayment=Social/fiscal tax payment
+BankTransfer=Bank transfer
+BankTransfers=Bank transfers
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferFrom=From
+TransferTo=To
+TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
+CheckTransmitter=Transmitter
+ValidateCheckReceipt=Validate this check receipt?
+ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done?
+DeleteCheckReceipt=Delete this check receipt?
+ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
+BankChecks=Bank checks
+BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
+ShowCheckReceipt=Show check deposit receipt
+NumberOfCheques=No. of check
+DeleteTransaction=Delete entry
+ConfirmDeleteTransaction=Are you sure you want to delete this entry?
+ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
+BankMovements=Movements
+PlannedTransactions=Planned entries
+Graph=Graphics
+ExportDataset_banque_1=Bank entries and account statement
+ExportDataset_banque_2=Deposit slip
+TransactionOnTheOtherAccount=Transaction on the other account
+PaymentNumberUpdateSucceeded=Payment number updated successfully
+PaymentNumberUpdateFailed=Payment number could not be updated
+PaymentDateUpdateSucceeded=Payment date updated successfully
+PaymentDateUpdateFailed=Payment date could not be updated
+Transactions=Transactions
+BankTransactionLine=Bank entry
+AllAccounts=All bank and cash accounts
+BackToAccount=Back to account
+ShowAllAccounts=Show for all accounts
+FutureTransaction=Future transaction. Unable to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+EventualyAddCategory=Eventually, specify a category in which to classify the records
+ToConciliate=To reconcile?
+ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
+DefaultRIB=Default BAN
+AllRIB=All BAN
+LabelRIB=BAN Label
+NoBANRecord=No BAN record
+DeleteARib=Delete BAN record
+ConfirmDeleteRib=Are you sure you want to delete this BAN record?
+RejectCheck=Check returned
+ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
+RejectCheckDate=Date the check was returned
+CheckRejected=Check returned
+CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
+VariousPayments=Miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
+SEPAMandate=SEPA mandate
+YourSEPAMandate=Your SEPA mandate
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
+BankColorizeMovement=Colorize movements
+BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
+BankColorizeMovementName1=Background color for debit movement
+BankColorizeMovementName2=Background color for credit movement
diff --git a/htdocs/langs/hi_IN/bills.lang b/htdocs/langs/hi_IN/bills.lang
new file mode 100644
index 00000000000..9f11d8ecf87
--- /dev/null
+++ b/htdocs/langs/hi_IN/bills.lang
@@ -0,0 +1,574 @@
+# Dolibarr language file - Source file is en_US - bills
+Bill=Invoice
+Bills=Invoices
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Vendor invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid vendor invoices
+BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsLate=Late payments
+BillsStatistics=Customers invoices statistics
+BillsStatisticsSuppliers=Vendors invoices statistics
+DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
+DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
+DisabledBecauseNotErasable=Disabled because cannot be erased
+InvoiceStandard=Standard invoice
+InvoiceStandardAsk=Standard invoice
+InvoiceStandardDesc=This kind of invoice is the common invoice.
+InvoiceDeposit=Down payment invoice
+InvoiceDepositAsk=Down payment invoice
+InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
+InvoiceProForma=Proforma invoice
+InvoiceProFormaAsk=Proforma invoice
+InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
+InvoiceReplacement=Replacement invoice
+InvoiceReplacementAsk=Replacement invoice for invoice
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceAvoir=Credit note
+InvoiceAvoirAsk=Credit note to correct invoice
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
+invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+ReplaceInvoice=Replace invoice %s
+ReplacementInvoice=Replacement invoice
+ReplacedByInvoice=Replaced by invoice %s
+ReplacementByInvoice=Replaced by invoice
+CorrectInvoice=Correct invoice %s
+CorrectionInvoice=Correction invoice
+UsedByInvoice=Used to pay invoice %s
+ConsumedBy=Consumed by
+NotConsumed=Not consumed
+NoReplacableInvoice=No replaceable invoices
+NoInvoiceToCorrect=No invoice to correct
+InvoiceHasAvoir=Was source of one or several credit notes
+CardBill=Invoice card
+PredefinedInvoices=Predefined Invoices
+Invoice=Invoice
+PdfInvoiceTitle=Invoice
+Invoices=Invoices
+InvoiceLine=Invoice line
+InvoiceCustomer=Customer invoice
+CustomerInvoice=Customer invoice
+CustomersInvoices=Customers invoices
+SupplierInvoice=Vendor invoice
+SuppliersInvoices=Vendors invoices
+SupplierBill=Vendor invoice
+SupplierBills=suppliers invoices
+Payment=Payment
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
+Payments=Payments
+PaymentsBack=Refunds
+paymentInInvoiceCurrency=in invoices currency
+PaidBack=Paid back
+DeletePayment=Delete payment
+ConfirmDeletePayment=Are you sure you want to delete this payment?
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+SupplierPayments=Vendor payments
+ReceivedPayments=Received payments
+ReceivedCustomersPayments=Payments received from customers
+PayedSuppliersPayments=Payments paid to vendors
+ReceivedCustomersPaymentsToValid=Received customers payments to validate
+PaymentsReportsForYear=Payments reports for %s
+PaymentsReports=Payments reports
+PaymentsAlreadyDone=Payments already done
+PaymentsBackAlreadyDone=Refunds already done
+PaymentRule=Payment rule
+PaymentMode=Payment Type
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
+IdPaymentMode=Payment Type (id)
+CodePaymentMode=Payment Type (code)
+LabelPaymentMode=Payment Type (label)
+PaymentModeShort=Payment Type
+PaymentTerm=Payment Term
+PaymentConditions=Payment Terms
+PaymentConditionsShort=Payment Terms
+PaymentAmount=Payment amount
+PaymentHigherThanReminderToPay=Payment higher than reminder to pay
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
+ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
+ClassifyPaidPartially=Classify 'Paid partially'
+ClassifyCanceled=Classify 'Abandoned'
+ClassifyClosed=Classify 'Closed'
+ClassifyUnBilled=Classify 'Unbilled'
+CreateBill=Create Invoice
+CreateCreditNote=Create credit note
+AddBill=Create invoice or credit note
+AddToDraftInvoices=Add to draft invoice
+DeleteBill=Delete invoice
+SearchACustomerInvoice=Search for a customer invoice
+SearchASupplierInvoice=Search for a vendor invoice
+CancelBill=Cancel an invoice
+SendRemindByMail=Send reminder by email
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
+ConvertToReduc=Mark as credit available
+ConvertExcessReceivedToReduc=Convert excess received into available credit
+ConvertExcessPaidToReduc=Convert excess paid into available discount
+EnterPaymentReceivedFromCustomer=Enter payment received from customer
+EnterPaymentDueToCustomer=Make payment due to customer
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+PriceBase=Price base
+BillStatus=Invoice status
+StatusOfGeneratedInvoices=Status of generated invoices
+BillStatusDraft=Draft (needs to be validated)
+BillStatusPaid=Paid
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
+BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusCanceled=Abandoned
+BillStatusValidated=Validated (needs to be paid)
+BillStatusStarted=Started
+BillStatusNotPaid=Not paid
+BillStatusNotRefunded=Not refunded
+BillStatusClosedUnpaid=Closed (unpaid)
+BillStatusClosedPaidPartially=Paid (partially)
+BillShortStatusDraft=Draft
+BillShortStatusPaid=Paid
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
+BillShortStatusConverted=Paid
+BillShortStatusCanceled=Abandoned
+BillShortStatusValidated=Validated
+BillShortStatusStarted=Started
+BillShortStatusNotPaid=Not paid
+BillShortStatusNotRefunded=Not refunded
+BillShortStatusClosedUnpaid=Closed
+BillShortStatusClosedPaidPartially=Paid (partially)
+PaymentStatusToValidShort=To validate
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
+ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
+ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
+ErrorBillNotFound=Invoice %s does not exist
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorDiscountAlreadyUsed=Error, discount already used
+ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
+ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
+ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
+BillFrom=From
+BillTo=To
+ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=Template / Recurring invoice
+NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
+FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
+NotARecurringInvoiceTemplate=Not a recurring template invoice
+NewBill=New invoice
+LastBills=Latest %s invoices
+LatestTemplateInvoices=Latest %s template invoices
+LatestCustomerTemplateInvoices=Latest %s customer template invoices
+LatestSupplierTemplateInvoices=Latest %s vendor template invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s vendor invoices
+AllBills=All invoices
+AllCustomerTemplateInvoices=All template invoices
+OtherBills=Other invoices
+DraftBills=Draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Vendor draft invoices
+Unpaid=Unpaid
+ErrorNoPaymentDefined=Error No payment defined
+ConfirmDeleteBill=Are you sure you want to delete this invoice?
+ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
+ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
+ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
+ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
+ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
+ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
+ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
+ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyAbandonReasonOther=Other
+ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
+ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
+ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
+ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
+ValidateBill=Validate invoice
+UnvalidateBill=Unvalidate invoice
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
+AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
+AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
+UseSituationInvoices=Allow situation invoice
+UseSituationInvoicesCreditNote=Allow situation invoice credit note
+Retainedwarranty=Retained warranty
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
+RetainedwarrantyDefaultPercent=Retained warranty default percent
+RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
+RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
+ToPayOn=To pay on %s
+toPayOn=to pay on %s
+RetainedWarranty=Retained Warranty
+PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
+DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
+setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
+setretainedwarranty=Set retained warranty
+setretainedwarrantyDateLimit=Set retained warranty date limit
+RetainedWarrantyDateLimit=Retained warranty date limit
+RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
+AlreadyPaid=Already paid
+AlreadyPaidBack=Already paid back
+AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
+Abandoned=Abandoned
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to refund
+Rest=Pending
+AmountExpected=Amount claimed
+ExcessReceived=Excess received
+ExcessPaid=Excess paid
+EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
+NoDraftBills=No draft invoices
+NoOtherDraftBills=No other draft invoices
+NoDraftInvoices=No draft invoices
+RefBill=Invoice ref
+ToBill=To bill
+RemainderToBill=Remainder to bill
+SendBillByMail=Send invoice by email
+SendReminderBillByMail=Send reminder by email
+RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
+MenuToValid=To valid
+DateMaxPayment=Payment due on
+DateInvoice=Invoice date
+DatePointOfTax=Point of tax
+NoInvoice=No invoice
+ClassifyBill=Classify invoice
+SupplierBillsToPay=Unpaid vendor invoices
+CustomerBillsUnpaid=Unpaid customer invoices
+NonPercuRecuperable=Non-recoverable
+SetConditions=Set Payment Terms
+SetMode=Set Payment Type
+SetRevenuStamp=Set revenue stamp
+Billed=Billed
+RecurringInvoices=Recurring invoices
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
+CustomersInvoicesAndPayments=Customer invoices and payments
+ExportDataset_invoice_1=Customer invoices and invoice details
+ExportDataset_invoice_2=Customer invoices and payments
+ProformaBill=Proforma Bill:
+Reduction=Reduction
+ReductionShort=Disc.
+Reductions=Reductions
+ReductionsShort=Disc.
+Discounts=Discounts
+AddDiscount=Create discount
+AddRelativeDiscount=Create relative discount
+EditRelativeDiscount=Edit relative discount
+AddGlobalDiscount=Create absolute discount
+EditGlobalDiscounts=Edit absolute discounts
+AddCreditNote=Create credit note
+ShowDiscount=Show discount
+ShowReduc=Show the discount
+ShowSourceInvoice=Show the source invoice
+RelativeDiscount=Relative discount
+GlobalDiscount=Global discount
+CreditNote=Credit note
+CreditNotes=Credit notes
+CreditNotesOrExcessReceived=Credit notes or excess received
+Deposit=Down payment
+Deposits=Down payments
+DiscountFromCreditNote=Discount from credit note %s
+DiscountFromDeposit=Down payments from invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
+AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
+CreditNoteDepositUse=Invoice must be validated to use this kind of credits
+NewGlobalDiscount=New absolute discount
+NewRelativeDiscount=New relative discount
+DiscountType=Discount type
+NoteReason=Note/Reason
+ReasonDiscount=Reason
+DiscountOfferedBy=Granted by
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Vendors discounts
+BillAddress=Bill address
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
+IdSocialContribution=Social/fiscal tax payment id
+PaymentId=Payment id
+PaymentRef=Payment ref.
+InvoiceId=Invoice id
+InvoiceRef=Invoice ref.
+InvoiceDateCreation=Invoice creation date
+InvoiceStatus=Invoice status
+InvoiceNote=Invoice note
+InvoicePaid=Invoice paid
+InvoicePaidCompletely=Paid completely
+InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
+OrderBilled=Order billed
+DonationPaid=Donation paid
+PaymentNumber=Payment number
+RemoveDiscount=Remove discount
+WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty)
+InvoiceNotChecked=No invoice selected
+ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
+DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
+NbOfPayments=No. of payments
+SplitDiscount=Split discount in two
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
+ConfirmRemoveDiscount=Are you sure you want to remove this discount?
+RelatedBill=Related invoice
+RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related vendor invoices
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoices already exist
+MergingPDFTool=Merging PDF tool
+AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
+PaymentNote=Payment note
+ListOfPreviousSituationInvoices=List of previous situation invoices
+ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+FrequencyUnit=Frequency unit
+toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
+NextDateToExecution=Date for next invoice generation
+NextDateToExecutionShort=Date next gen.
+DateLastGeneration=Date of latest generation
+DateLastGenerationShort=Date latest gen.
+MaxPeriodNumber=Max. number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
+InvoiceAutoValidate=Validate invoices automatically
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not reached yet
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
+WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
+WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
+ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
+# PaymentConditions
+Statut=Status
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShort30D=30 days
+PaymentCondition30D=30 days
+PaymentConditionShort30DENDMONTH=30 days of month-end
+PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort60D=60 days
+PaymentCondition60D=60 days
+PaymentConditionShort60DENDMONTH=60 days of month-end
+PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShortPT_DELIVERY=Delivery
+PaymentConditionPT_DELIVERY=On delivery
+PaymentConditionShortPT_ORDER=Order
+PaymentConditionPT_ORDER=On order
+PaymentConditionShortPT_5050=50-50
+PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+PaymentConditionShort10D=10 days
+PaymentCondition10D=10 days
+PaymentConditionShort10DENDMONTH=10 days of month-end
+PaymentCondition10DENDMONTH=Within 10 days following the end of the month
+PaymentConditionShort14D=14 days
+PaymentCondition14D=14 days
+PaymentConditionShort14DENDMONTH=14 days of month-end
+PaymentCondition14DENDMONTH=Within 14 days following the end of the month
+FixAmount=Fixed amount - 1 line with label '%s'
+VarAmount=Variable amount (%% tot.)
+VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
+VarAmountAllLines=Variable amount (%% tot.) - all same lines
+# PaymentType
+PaymentTypeVIR=Bank transfer
+PaymentTypeShortVIR=Bank transfer
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
+PaymentTypeLIQ=Cash
+PaymentTypeShortLIQ=Cash
+PaymentTypeCB=Credit card
+PaymentTypeShortCB=Credit card
+PaymentTypeCHQ=Check
+PaymentTypeShortCHQ=Check
+PaymentTypeTIP=TIP (Documents against Payment)
+PaymentTypeShortTIP=TIP Payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
+PaymentTypeTRA=Bank draft
+PaymentTypeShortTRA=Draft
+PaymentTypeFAC=Factor
+PaymentTypeShortFAC=Factor
+BankDetails=Bank details
+BankCode=Bank code
+DeskCode=Branch code
+BankAccountNumber=Account number
+BankAccountNumberKey=Checksum
+Residence=Address
+IBANNumber=IBAN account number
+IBAN=IBAN
+BIC=BIC/SWIFT
+BICNumber=BIC/SWIFT code
+ExtraInfos=Extra infos
+RegulatedOn=Regulated on
+ChequeNumber=Check N°
+ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
+ChequeMaker=Check/Transfer transmitter
+ChequeBank=Bank of Check
+CheckBank=Check
+NetToBePaid=Net to be paid
+PhoneNumber=Tel
+FullPhoneNumber=Telephone
+TeleFax=Fax
+PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration.
+IntracommunityVATNumber=Intra-Community VAT ID
+PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
+PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
+SendTo=sent to
+PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
+VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
+LawApplicationPart1=By application of the law 80.335 of 12/05/80
+LawApplicationPart2=the goods remain the property of
+LawApplicationPart3=the seller until full payment of
+LawApplicationPart4=their price.
+LimitedLiabilityCompanyCapital=SARL with Capital of
+UseLine=Apply
+UseDiscount=Use discount
+UseCredit=Use credit
+UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit
+MenuChequeDeposits=Check Deposits
+MenuCheques=Checks
+MenuChequesReceipts=Check receipts
+NewChequeDeposit=New deposit
+ChequesReceipts=Check receipts
+ChequesArea=Check deposits area
+ChequeDeposits=Check deposits
+Cheques=Checks
+DepositId=Id deposit
+NbCheque=Number of checks
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices
+ShowUnpaidAll=Show all unpaid invoices
+ShowUnpaidLateOnly=Show late unpaid invoices only
+PaymentInvoiceRef=Payment invoice %s
+ValidateInvoice=Validate invoice
+ValidateInvoices=Validate invoices
+Cash=Cash
+Reported=Delayed
+DisabledBecausePayments=Not possible since there are some payments
+CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+ExpectedToPay=Expected payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
+PayedByThisPayment=Paid by this payment
+ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
+ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
+ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
+ToMakePayment=Pay
+ToMakePaymentBack=Pay back
+ListOfYourUnpaidInvoices=List of unpaid invoices
+NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
+RevenueStamp=Tax stamp
+YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
+YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
+PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
+TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+EarlyClosingReason=Early closing reason
+EarlyClosingComment=Early closing note
+##### Types de contacts #####
+TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
+TypeContact_facture_external_BILLING=Customer invoice contact
+TypeContact_facture_external_SHIPPING=Customer shipping contact
+TypeContact_facture_external_SERVICE=Customer service contact
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
+TypeContact_invoice_supplier_external_BILLING=Vendor invoice contact
+TypeContact_invoice_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+# Situation invoices
+InvoiceFirstSituationAsk=First situation invoice
+InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
+InvoiceSituation=Situation invoice
+InvoiceSituationAsk=Invoice following the situation
+InvoiceSituationDesc=Create a new situation following an already existing one
+SituationAmount=Situation invoice amount(net)
+SituationDeduction=Situation subtraction
+ModifyAllLines=Modify all lines
+CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
+NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
+DisabledBecauseNotLastInCycle=The next situation already exists.
+DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
+CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
+NoSituations=No open situations
+InvoiceSituationLast=Final and general invoice
+PDFCrevetteSituationNumber=Situation N°%s
+PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
+PDFCrevetteSituationInvoiceTitle=Situation invoice
+PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
+TotalSituationInvoice=Total situation
+invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
+updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
+CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
+BillCreated=%s bill(s) created
+StatusOfGeneratedDocuments=Status of document generation
+DoNotGenerateDoc=Do not generate document file
+AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/hi_IN/blockedlog.lang b/htdocs/langs/hi_IN/blockedlog.lang
new file mode 100644
index 00000000000..5afae6e9e53
--- /dev/null
+++ b/htdocs/langs/hi_IN/blockedlog.lang
@@ -0,0 +1,54 @@
+BlockedLog=Unalterable Logs
+Field=Field
+BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525).
+Fingerprints=Archived events and fingerprints
+FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed).
+CompanyInitialKey=Company initial key (hash of genesis block)
+BrowseBlockedLog=Unalterable logs
+ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
+ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
+DownloadBlockChain=Download fingerprints
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
+OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
+AddedByAuthority=Stored into remote authority
+NotAddedByAuthorityYet=Not yet stored into remote authority
+ShowDetails=Show stored details
+logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
+logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
+logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
+logPAYMENT_ADD_TO_BANK=Payment added to bank
+logPAYMENT_CUSTOMER_CREATE=Customer payment created
+logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
+logDONATION_PAYMENT_CREATE=Donation payment created
+logDONATION_PAYMENT_DELETE=Donation payment logical deletion
+logBILL_PAYED=Customer invoice paid
+logBILL_UNPAYED=Customer invoice set unpaid
+logBILL_VALIDATE=Customer invoice validated
+logBILL_SENTBYMAIL=Customer invoice send by mail
+logBILL_DELETE=Customer invoice logically deleted
+logMODULE_RESET=Module BlockedLog was disabled
+logMODULE_SET=Module BlockedLog was enabled
+logDON_VALIDATE=Donation validated
+logDON_MODIFY=Donation modified
+logDON_DELETE=Donation logical deletion
+logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
+logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
+logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
+logCASHCONTROL_VALIDATE=Cash fence recording
+BlockedLogBillDownload=Customer invoice download
+BlockedLogBillPreview=Customer invoice preview
+BlockedlogInfoDialog=Log Details
+ListOfTrackedEvents=List of tracked events
+Fingerprint=Fingerprint
+DownloadLogCSV=Export archived logs (CSV)
+logDOC_PREVIEW=Preview of a validated document in order to print or download
+logDOC_DOWNLOAD=Download of a validated document in order to print or send
+DataOfArchivedEvent=Full datas of archived event
+ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
+BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
+BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
+OnlyNonValid=Non-valid
+TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
+RestrictYearToExport=Restrict month / year to export
diff --git a/htdocs/langs/hi_IN/bookmarks.lang b/htdocs/langs/hi_IN/bookmarks.lang
new file mode 100644
index 00000000000..87466cadcfa
--- /dev/null
+++ b/htdocs/langs/hi_IN/bookmarks.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - marque pages
+AddThisPageToBookmarks=Add current page to bookmarks
+Bookmark=Bookmark
+Bookmarks=Bookmarks
+ListOfBookmarks=List of bookmarks
+EditBookmarks=List/edit bookmarks
+NewBookmark=New bookmark
+ShowBookmark=Show bookmark
+OpenANewWindow=Open a new tab
+ReplaceWindow=Replace current tab
+BookmarkTargetNewWindowShort=New tab
+BookmarkTargetReplaceWindowShort=Current tab
+BookmarkTitle=Bookmark name
+UrlOrLink=URL
+BehaviourOnClick=Behaviour when a bookmark URL is selected
+CreateBookmark=Create bookmark
+SetHereATitleForLink=Set a name for the bookmark
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if the linked page should open in the current tab or a new tab
+BookmarksManagement=Bookmarks management
+BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/hi_IN/boxes.lang b/htdocs/langs/hi_IN/boxes.lang
new file mode 100644
index 00000000000..bd62684421a
--- /dev/null
+++ b/htdocs/langs/hi_IN/boxes.lang
@@ -0,0 +1,102 @@
+# Dolibarr language file - Source file is en_US - boxes
+BoxLoginInformation=Login Information
+BoxLastRssInfos=RSS Information
+BoxLastProducts=Latest %s Products/Services
+BoxProductsAlertStock=Stock alerts for products
+BoxLastProductsInContract=Latest %s contracted products/services
+BoxLastSupplierBills=Latest Vendor invoices
+BoxLastCustomerBills=Latest Customer invoices
+BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
+BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
+BoxLastProposals=Latest commercial proposals
+BoxLastProspects=Latest modified prospects
+BoxLastCustomers=Latest modified customers
+BoxLastSuppliers=Latest modified suppliers
+BoxLastCustomerOrders=Latest sales orders
+BoxLastActions=Latest actions
+BoxLastContracts=Latest contracts
+BoxLastContacts=Latest contacts/addresses
+BoxLastMembers=Latest members
+BoxFicheInter=Latest interventions
+BoxCurrentAccounts=Open accounts balance
+BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleLastRssInfos=Latest %s news from %s
+BoxTitleLastProducts=Products/Services: last %s modified
+BoxTitleProductsAlertStock=Products: stock alert
+BoxTitleLastSuppliers=Latest %s recorded suppliers
+BoxTitleLastModifiedSuppliers=Vendors: last %s modified
+BoxTitleLastModifiedCustomers=Customers: last %s modified
+BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
+BoxTitleLastModifiedProspects=Prospects: last %s modified
+BoxTitleLastModifiedMembers=Latest %s members
+BoxTitleLastFicheInter=Latest %s modified interventions
+BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
+BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
+BoxTitleCurrentAccounts=Open Accounts: balances
+BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
+BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
+BoxMyLastBookmarks=Bookmarks: latest %s
+BoxOldestExpiredServices=Oldest active expired services
+BoxLastExpiredServices=Latest %s oldest contacts with active expired services
+BoxTitleLastActionsToDo=Latest %s actions to do
+BoxTitleLastContracts=Latest %s modified contracts
+BoxTitleLastModifiedDonations=Latest %s modified donations
+BoxTitleLastModifiedExpenses=Latest %s modified expense reports
+BoxTitleLatestModifiedBoms=Latest %s modified BOMs
+BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
+FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
+LastRefreshDate=Latest refresh date
+NoRecordedBookmarks=No bookmarks defined.
+ClickToAdd=Click here to add.
+NoRecordedCustomers=No recorded customers
+NoRecordedContacts=No recorded contacts
+NoActionsToDo=No actions to do
+NoRecordedOrders=No recorded sales orders
+NoRecordedProposals=No recorded proposals
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid vendor invoices
+NoModifiedSupplierBills=No recorded vendor invoices
+NoRecordedProducts=No recorded products/services
+NoRecordedProspects=No recorded prospects
+NoContractedProducts=No products/services contracted
+NoRecordedContracts=No recorded contracts
+NoRecordedInterventions=No recorded interventions
+BoxLatestSupplierOrders=Latest purchase orders
+BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
+NoSupplierOrder=No recorded purchase order
+BoxCustomersInvoicesPerMonth=Customer Invoices per month
+BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
+BoxCustomersOrdersPerMonth=Sales Orders per month
+BoxSuppliersOrdersPerMonth=Vendor Orders per month
+BoxProposalsPerMonth=Proposals per month
+NoTooLowStockProducts=No products are under the low stock limit
+BoxProductDistribution=Products/Services Distribution
+ForObject=On %s
+BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
+BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
+BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
+BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
+BoxTitleLastModifiedPropals=Latest %s modified proposals
+ForCustomersInvoices=Customers invoices
+ForCustomersOrders=Customers orders
+ForProposals=Proposals
+LastXMonthRolling=The latest %s month rolling
+ChooseBoxToAdd=Add widget to your dashboard
+BoxAdded=Widget was added in your dashboard
+BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
+BoxLastManualEntries=Last manual entries in accountancy
+BoxTitleLastManualEntries=%s latest manual entries
+NoRecordedManualEntries=No manual entries record in accountancy
+BoxSuspenseAccount=Count accountancy operation with suspense account
+BoxTitleSuspenseAccount=Number of unallocated lines
+NumberOfLinesInSuspenseAccount=Number of line in suspense account
+SuspenseAccountNotDefined=Suspense account isn't defined
+BoxLastCustomerShipments=Last customer shipments
+BoxTitleLastCustomerShipments=Latest %s customer shipments
+NoRecordedShipments=No recorded customer shipment
diff --git a/htdocs/langs/hi_IN/cashdesk.lang b/htdocs/langs/hi_IN/cashdesk.lang
new file mode 100644
index 00000000000..0903a3d10bc
--- /dev/null
+++ b/htdocs/langs/hi_IN/cashdesk.lang
@@ -0,0 +1,110 @@
+# Language file - Source file is en_US - cashdesk
+CashDeskMenu=Point of sale
+CashDesk=Point of sale
+CashDeskBankCash=Bank account (cash)
+CashDeskBankCB=Bank account (card)
+CashDeskBankCheque=Bank account (cheque)
+CashDeskWarehouse=Warehouse
+CashdeskShowServices=Selling services
+CashDeskProducts=Products
+CashDeskStock=Stock
+CashDeskOn=on
+CashDeskThirdParty=Third party
+ShoppingCart=Shopping cart
+NewSell=New sell
+AddThisArticle=Add this article
+RestartSelling=Go back on sell
+SellFinished=Sale complete
+PrintTicket=Print ticket
+SendTicket=Send ticket
+NoProductFound=No article found
+ProductFound=product found
+NoArticle=No article
+Identification=Identification
+Article=Article
+Difference=Difference
+TotalTicket=Total ticket
+NoVAT=No VAT for this sale
+Change=Excess received
+BankToPay=Account for payment
+ShowCompany=Show company
+ShowStock=Show warehouse
+DeleteArticle=Click to remove this article
+FilterRefOrLabelOrBC=Search (Ref/Label)
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
+DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of Sale
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
+Receipt=Receipt
+Header=Header
+Footer=Footer
+AmountAtEndOfPeriod=Amount at end of period (day, month or year)
+TheoricalAmount=Theorical amount
+RealAmount=Real amount
+CashFence=Cash fence
+CashFenceDone=Cash fence done for the period
+NbOfInvoices=Nb of invoices
+Paymentnumpad=Type of Pad to enter payment
+Numberspad=Numbers Pad
+BillsCoinsPad=Coins and banknotes Pad
+DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
+TakeposNeedsCategories=TakePOS needs product categories to work
+OrderNotes=Order Notes
+CashDeskBankAccountFor=Default account to use for payments in
+NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
+PrintCustomerOnReceipts=Print customer on tickets|receipts
+EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
+ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
+POSTerminal=POS Terminal
+POSModule=POS Module
+BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
+CustomReceipt=Custom Receipt
+ReceiptName=Receipt Name
+ProductSupplements=Product Supplements
+SupplementCategory=Supplement category
+ColorTheme=Color theme
+Colorful=Colorful
+HeadBar=Head Bar
+SortProductField=Field for sorting products
+Browser=Browser
+BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
+TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
+PrintMethod=Print method
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ByTerminal=By terminal
+TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for POS sales
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
+BarRestaurant=Bar Restaurant
+AutoOrder=Customer auto order
diff --git a/htdocs/langs/hi_IN/categories.lang b/htdocs/langs/hi_IN/categories.lang
new file mode 100644
index 00000000000..30bace0574c
--- /dev/null
+++ b/htdocs/langs/hi_IN/categories.lang
@@ -0,0 +1,89 @@
+# Dolibarr language file - Source file is en_US - categories
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+RubriquesTransactions=Tags/Categories of transactions
+categories=tags/categories
+NoCategoryYet=No tag/category of this type created
+In=In
+AddIn=Add in
+modify=modify
+Classify=Classify
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Vendors tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
+UsersCategoriesArea=Users tags/categories area
+SubCats=Sub-categories
+CatList=List of tags/categories
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
+NoSubCat=No subcategory.
+SubCatOf=Subcategory
+FoundCats=Found tags/categories
+ImpossibleAddCat=Impossible to add the tag/category %s
+WasAddedSuccessfully=<b>%s</b> was added successfully.
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+ProductIsInCategories=Product/service is linked to following tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
+ClassifyInCategory=Add to tag/category
+NotCategorized=Without tag/category
+CategoryExistsAtSameLevel=This category already exists with this ref
+ContentsVisibleByAllShort=Contents visible by all
+ContentsNotVisibleByAllShort=Contents not visible by all
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Vendors tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
+SuppliersCategoriesShort=Vendors tags/categories
+CustomersCategoriesShort=Customers tags/categories
+ProspectsCategoriesShort=Prospects tags/categories
+CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
+AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
+UsersCategoriesShort=Users tags/categories
+StockCategoriesShort=Warehouse tags/categories
+ThisCategoryHasNoItems=This category does not contain any items.
+CategId=Tag/category id
+CatSupList=List of vendor tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatContactsLinks=Links between contacts/addresses and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
+DeleteFromCat=Remove from tags/category
+ExtraFieldsCategories=Complementary attributes
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
+CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
+AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show tag/category
+ByDefaultInList=By default in list
+ChooseCategory=Choose category
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/hi_IN/commercial.lang b/htdocs/langs/hi_IN/commercial.lang
new file mode 100644
index 00000000000..10c536e0d48
--- /dev/null
+++ b/htdocs/langs/hi_IN/commercial.lang
@@ -0,0 +1,80 @@
+# Dolibarr language file - Source file is en_US - commercial
+Commercial=Commerce
+CommercialArea=Commerce area
+Customer=Customer
+Customers=Customers
+Prospect=Prospect
+Prospects=Prospects
+DeleteAction=Delete an event
+NewAction=New event
+AddAction=Create event
+AddAnAction=Create an event
+AddActionRendezVous=Create a Rendez-vous event
+ConfirmDeleteAction=Are you sure you want to delete this event?
+CardAction=Event card
+ActionOnCompany=Related company
+ActionOnContact=Related contact
+TaskRDVWith=Meeting with %s
+ShowTask=Show task
+ShowAction=Show event
+ActionsReport=Events report
+ThirdPartiesOfSaleRepresentative=Third parties with sales representative
+SaleRepresentativesOfThirdParty=Sales representatives of third party
+SalesRepresentative=Sales representative
+SalesRepresentatives=Sales representatives
+SalesRepresentativeFollowUp=Sales representative (follow-up)
+SalesRepresentativeSignature=Sales representative (signature)
+NoSalesRepresentativeAffected=No particular sales representative assigned
+ShowCustomer=Show customer
+ShowProspect=Show prospect
+ListOfProspects=List of prospects
+ListOfCustomers=List of customers
+LastDoneTasks=Latest %s completed actions
+LastActionsToDo=Oldest %s not completed actions
+DoneAndToDoActions=Completed and To do events
+DoneActions=Completed events
+ToDoActions=Incomplete events
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
+StatusNotApplicable=Not applicable
+StatusActionToDo=To do
+StatusActionDone=Complete
+StatusActionInProcess=In process
+TasksHistoryForThisContact=Events for this contact
+LastProspectDoNotContact=Do not contact
+LastProspectNeverContacted=Never contacted
+LastProspectToContact=To contact
+LastProspectContactInProcess=Contact in process
+LastProspectContactDone=Contact done
+ActionAffectedTo=Event assigned to
+ActionDoneBy=Event done by
+ActionAC_TEL=Phone call
+ActionAC_FAX=Send fax
+ActionAC_PROP=Send proposal by mail
+ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
+ActionAC_RDV=Meetings
+ActionAC_INT=Intervention on site
+ActionAC_FAC=Send customer invoice by mail
+ActionAC_REL=Send customer invoice by mail (reminder)
+ActionAC_CLO=Close
+ActionAC_EMAILING=Send mass email
+ActionAC_COM=Send sales order by mail
+ActionAC_SHIP=Send shipping by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
+ActionAC_OTH=Other
+ActionAC_OTH_AUTO=Automatically inserted events
+ActionAC_MANUAL=Manually inserted events
+ActionAC_AUTO=Automatically inserted events
+ActionAC_OTH_AUTOShort=Auto
+Stats=Sales statistics
+StatusProsp=Prospect status
+DraftPropals=Draft commercial proposals
+NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commercial proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/hi_IN/companies.lang b/htdocs/langs/hi_IN/companies.lang
new file mode 100644
index 00000000000..e200fd8adb8
--- /dev/null
+++ b/htdocs/langs/hi_IN/companies.lang
@@ -0,0 +1,458 @@
+# Dolibarr language file - Source file is en_US - companies
+ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
+ErrorSetACountryFirst=Set the country first
+SelectThirdParty=Select a third party
+ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+DeleteContact=Delete a contact/address
+ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+MenuNewThirdParty=New Third Party
+MenuNewCustomer=New Customer
+MenuNewProspect=New Prospect
+MenuNewSupplier=New Vendor
+MenuNewPrivateIndividual=New private individual
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New Third Party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
+CreateThirdPartyOnly=Create third party
+CreateThirdPartyAndContact=Create a third party + a child contact
+ProspectionArea=Prospection area
+IdThirdParty=Id third party
+IdCompany=Company Id
+IdContact=Contact Id
+Contacts=Contacts/Addresses
+ThirdPartyContacts=Third-party contacts
+ThirdPartyContact=Third-party contact/address
+Company=Company
+CompanyName=Company name
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias Name
+Companies=Companies
+CountryIsInEEC=Country is inside the European Economic Community
+PriceFormatInCurrentLanguage=Price display format in the current language and currency
+ThirdPartyName=Third-party name
+ThirdPartyEmail=Third-party email
+ThirdParty=Third-party
+ThirdParties=Third-parties
+ThirdPartyProspects=Prospects
+ThirdPartyProspectsStats=Prospects
+ThirdPartyCustomers=Customers
+ThirdPartyCustomersStats=Customers
+ThirdPartyCustomersWithIdProf12=Customers with %s or %s
+ThirdPartySuppliers=Vendors
+ThirdPartyType=Third-party type
+Individual=Private individual
+ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
+ParentCompany=Parent company
+Subsidiaries=Subsidiaries
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
+ReportByQuarter=Report by rate
+CivilityCode=Civility code
+RegisteredOffice=Registered office
+Lastname=Last name
+Firstname=First name
+PostOrFunction=Job position
+UserTitle=Title
+NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
+Address=Address
+State=State/Province
+StateCode=State/Province code
+StateShort=State
+Region=Region
+Region-State=Region - State
+Country=Country
+CountryCode=Country code
+CountryId=Country id
+Phone=Phone
+PhoneShort=Phone
+Skype=Skype
+Call=Call
+Chat=Chat
+PhonePro=Prof. phone
+PhonePerso=Pers. phone
+PhoneMobile=Mobile
+No_Email=Refuse bulk emailings
+Fax=Fax
+Zip=Zip Code
+Town=City
+Web=Web
+Poste= Position
+DefaultLang=Language default
+VATIsUsed=Sales tax used
+VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
+CopyAddressFromSoc=Copy address from third-party details
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
+PaymentBankAccount=Payment bank account
+OverAllProposals=Proposals
+OverAllOrders=Orders
+OverAllInvoices=Invoices
+OverAllSupplierProposals=Price requests
+##### Local Taxes #####
+LocalTax1IsUsed=Use second tax
+LocalTax1IsUsedES= RE is used
+LocalTax1IsNotUsedES= RE is not used
+LocalTax2IsUsed=Use third tax
+LocalTax2IsUsedES= IRPF is used
+LocalTax2IsNotUsedES= IRPF is not used
+WrongCustomerCode=Customer code invalid
+WrongSupplierCode=Vendor code invalid
+CustomerCodeModel=Customer code model
+SupplierCodeModel=Vendor code model
+Gencod=Barcode
+##### Professional ID #####
+ProfId1Short=Prof. id 1
+ProfId2Short=Prof. id 2
+ProfId3Short=Prof. id 3
+ProfId4Short=Prof. id 4
+ProfId5Short=Prof. id 5
+ProfId6Short=Prof. id 6
+ProfId1=Professional ID 1
+ProfId2=Professional ID 2
+ProfId3=Professional ID 3
+ProfId4=Professional ID 4
+ProfId5=Professional ID 5
+ProfId6=Professional ID 6
+ProfId1AR=Prof Id 1 (CUIT/CUIL)
+ProfId2AR=Prof Id 2 (Revenu brutes)
+ProfId3AR=-
+ProfId4AR=-
+ProfId5AR=-
+ProfId6AR=-
+ProfId1AT=Prof Id 1 (USt.-IdNr)
+ProfId2AT=Prof Id 2 (USt.-Nr)
+ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
+ProfId4AT=-
+ProfId5AT=-
+ProfId6AT=-
+ProfId1AU=Prof Id 1 (ABN)
+ProfId2AU=-
+ProfId3AU=-
+ProfId4AU=-
+ProfId5AU=-
+ProfId6AU=-
+ProfId1BE=Prof Id 1 (Professional number)
+ProfId2BE=-
+ProfId3BE=-
+ProfId4BE=-
+ProfId5BE=-
+ProfId6BE=-
+ProfId1BR=-
+ProfId2BR=IE (Inscricao Estadual)
+ProfId3BR=IM (Inscricao Municipal)
+ProfId4BR=CPF
+#ProfId5BR=CNAE
+#ProfId6BR=INSS
+ProfId1CH=-
+ProfId2CH=-
+ProfId3CH=Prof Id 1 (Federal number)
+ProfId4CH=Prof Id 2 (Commercial Record number)
+ProfId5CH=-
+ProfId6CH=-
+ProfId1CL=Prof Id 1 (R.U.T.)
+ProfId2CL=-
+ProfId3CL=-
+ProfId4CL=-
+ProfId5CL=-
+ProfId6CL=-
+ProfId1CO=Prof Id 1 (R.U.T.)
+ProfId2CO=-
+ProfId3CO=-
+ProfId4CO=-
+ProfId5CO=-
+ProfId6CO=-
+ProfId1DE=Prof Id 1 (USt.-IdNr)
+ProfId2DE=Prof Id 2 (USt.-Nr)
+ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId4DE=-
+ProfId5DE=-
+ProfId6DE=-
+ProfId1ES=Prof Id 1 (CIF/NIF)
+ProfId2ES=Prof Id 2 (Social security number)
+ProfId3ES=Prof Id 3 (CNAE)
+ProfId4ES=Prof Id 4 (Collegiate number)
+ProfId5ES=-
+ProfId6ES=-
+ProfId1FR=Prof Id 1 (SIREN)
+ProfId2FR=Prof Id 2 (SIRET)
+ProfId3FR=Prof Id 3 (NAF, old APE)
+ProfId4FR=Prof Id 4 (RCS/RM)
+ProfId5FR=-
+ProfId6FR=-
+ProfId1GB=Registration Number
+ProfId2GB=-
+ProfId3GB=SIC
+ProfId4GB=-
+ProfId5GB=-
+ProfId6GB=-
+ProfId1HN=Id prof. 1 (RTN)
+ProfId2HN=-
+ProfId3HN=-
+ProfId4HN=-
+ProfId5HN=-
+ProfId6HN=-
+ProfId1IN=Prof Id 1 (TIN)
+ProfId2IN=Prof Id 2 (PAN)
+ProfId3IN=Prof Id 3 (SRVC TAX)
+ProfId4IN=Prof Id 4
+ProfId5IN=Prof Id 5
+ProfId6IN=-
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
+ProfId1MA=Id prof. 1 (R.C.)
+ProfId2MA=Id prof. 2 (Patente)
+ProfId3MA=Id prof. 3 (I.F.)
+ProfId4MA=Id prof. 4 (C.N.S.S.)
+ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId6MA=-
+ProfId1MX=Prof Id 1 (R.F.C).
+ProfId2MX=Prof Id 2 (R..P. IMSS)
+ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId4MX=-
+ProfId5MX=-
+ProfId6MX=-
+ProfId1NL=KVK nummer
+ProfId2NL=-
+ProfId3NL=-
+ProfId4NL=Burgerservicenummer (BSN)
+ProfId5NL=-
+ProfId6NL=-
+ProfId1PT=Prof Id 1 (NIPC)
+ProfId2PT=Prof Id 2 (Social security number)
+ProfId3PT=Prof Id 3 (Commercial Record number)
+ProfId4PT=Prof Id 4 (Conservatory)
+ProfId5PT=-
+ProfId6PT=-
+ProfId1SN=RC
+ProfId2SN=NINEA
+ProfId3SN=-
+ProfId4SN=-
+ProfId5SN=-
+ProfId6SN=-
+ProfId1TN=Prof Id 1 (RC)
+ProfId2TN=Prof Id 2 (Fiscal matricule)
+ProfId3TN=Prof Id 3 (Douane code)
+ProfId4TN=Prof Id 4 (BAN)
+ProfId5TN=-
+ProfId6TN=-
+ProfId1US=Prof Id (FEIN)
+ProfId2US=-
+ProfId3US=-
+ProfId4US=-
+ProfId5US=-
+ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
+ProfId1RU=Prof Id 1 (OGRN)
+ProfId2RU=Prof Id 2 (INN)
+ProfId3RU=Prof Id 3 (KPP)
+ProfId4RU=Prof Id 4 (OKPO)
+ProfId5RU=-
+ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
+VATIntra=VAT ID
+VATIntraShort=VAT ID
+VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
+ProspectCustomer=Prospect / Customer
+Prospect=Prospect
+CustomerCard=Customer Card
+Customer=Customer
+CustomerRelativeDiscount=Relative customer discount
+SupplierRelativeDiscount=Relative vendor discount
+CustomerRelativeDiscountShort=Relative discount
+CustomerAbsoluteDiscountShort=Absolute discount
+CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
+CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
+CompanyHasAbsoluteDiscount=This customer has discounts available (credits notes or down payments) for <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
+CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
+CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
+DiscountNone=None
+Vendor=Vendor
+Supplier=Vendor
+AddContact=Create contact
+AddContactAddress=Create contact/address
+EditContact=Edit contact
+EditContactAddress=Edit contact/address
+Contact=Contact
+ContactId=Contact id
+ContactsAddresses=Contacts/Addresses
+FromContactName=Name:
+NoContactDefinedForThirdParty=No contact defined for this third party
+NoContactDefined=No contact defined
+DefaultContact=Default contact/address
+ContactByDefaultFor=Default contact/address for
+AddThirdParty=Create third party
+DeleteACompany=Delete a company
+PersonalInformations=Personal data
+AccountancyCode=Accounting account
+CustomerCode=Customer Code
+SupplierCode=Vendor Code
+CustomerCodeShort=Customer Code
+SupplierCodeShort=Vendor Code
+CustomerCodeDesc=Customer Code, unique for all customers
+SupplierCodeDesc=Vendor Code, unique for all vendors
+RequiredIfCustomer=Required if third party is a customer or prospect
+RequiredIfSupplier=Required if third party is a vendor
+ValidityControledByModule=Validity controlled by module
+ThisIsModuleRules=Rules for this module
+ProspectToContact=Prospect to contact
+CompanyDeleted=Company "%s" deleted from database.
+ListOfContacts=List of contacts/addresses
+ListOfContactsAddresses=List of contacts/addresses
+ListOfThirdParties=List of Third Parties
+ShowCompany=Third Party
+ShowContact=Contact-Address
+ContactsAllShort=All (No filter)
+ContactType=Contact type
+ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
+ContactForProposals=Proposal's contact
+ContactForContracts=Contract's contact
+ContactForInvoices=Invoice's contact
+NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
+NoContactForAnyProposal=This contact is not a contact for any commercial proposal
+NoContactForAnyContract=This contact is not a contact for any contract
+NoContactForAnyInvoice=This contact is not a contact for any invoice
+NewContact=New contact
+NewContactAddress=New Contact/Address
+MyContacts=My contacts
+Capital=Capital
+CapitalOf=Capital of %s
+EditCompany=Edit company
+ThisUserIsNot=This user is not a prospect, customer or vendor
+VATIntraCheck=Check
+VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
+VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
+NorProspectNorCustomer=Not prospect, nor customer
+JuridicalStatus=Legal Entity Type
+Staff=Employees
+ProspectLevelShort=Potential
+ProspectLevel=Prospect potential
+ContactPrivate=Private
+ContactPublic=Shared
+ContactVisibility=Visibility
+ContactOthers=Other
+OthersNotLinkedToThirdParty=Others, not linked to a third party
+ProspectStatus=Prospect status
+PL_NONE=None
+PL_UNKNOWN=अज्ञात
+PL_LOW=Low
+PL_MEDIUM=Medium
+PL_HIGH=High
+TE_UNKNOWN=-
+TE_STARTUP=Startup
+TE_GROUP=Large company
+TE_MEDIUM=Medium company
+TE_ADMIN=Governmental
+TE_SMALL=Small company
+TE_RETAIL=Retailer
+TE_WHOLE=Wholesaler
+TE_PRIVATE=Private individual
+TE_OTHER=Other
+StatusProspect-1=Do not contact
+StatusProspect0=Never contacted
+StatusProspect1=To be contacted
+StatusProspect2=Contact in process
+StatusProspect3=Contact done
+ChangeDoNotContact=Change status to 'Do not contact'
+ChangeNeverContacted=Change status to 'Never contacted'
+ChangeToContact=Change status to 'To be contacted'
+ChangeContactInProcess=Change status to 'Contact in process'
+ChangeContactDone=Change status to 'Contact done'
+ProspectsByStatus=Prospects by status
+NoParentCompany=None
+ExportCardToFormat=Export card to format
+ContactNotLinkedToCompany=Contact not linked to any third party
+DolibarrLogin=Dolibarr login
+NoDolibarrAccess=No Dolibarr access
+ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
+ExportDataset_company_2=Contacts and their properties
+ImportDataset_company_1=Third-parties and their properties
+ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ImportDataset_company_3=Third-parties Bank accounts
+ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
+PriceLevel=Price Level
+PriceLevelLabels=Price Level Labels
+DeliveryAddress=Delivery address
+AddAddress=Add address
+SupplierCategory=Vendor category
+JuridicalStatus200=Independent
+DeleteFile=Delete file
+ConfirmDeleteFile=Are you sure you want to delete this file?
+AllocateCommercial=Assigned to sales representative
+Organization=Organization
+FiscalYearInformation=Fiscal Year
+FiscalMonthStart=Starting month of the fiscal year
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
+YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
+YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
+ListSuppliersShort=List of Vendors
+ListProspectsShort=List of Prospects
+ListCustomersShort=List of Customers
+ThirdPartiesArea=Third Parties/Contacts
+LastModifiedThirdParties=Last %s modified Third Parties
+UniqueThirdParties=Total of Third Parties
+InActivity=Open
+ActivityCeased=Closed
+ThirdPartyIsClosed=Third party is closed
+ProductsIntoElements=List of products/services into %s
+CurrentOutstandingBill=Current outstanding bill
+OutstandingBill=Max. for outstanding bill
+OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
+MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
+ManagingDirectors=Manager(s) name (CEO, director, president...)
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ThirdpartiesMergeSuccess=Third parties have been merged
+SaleRepresentativeLogin=Login of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+#Imports
+PaymentTypeCustomer=Payment Type - Customer
+PaymentTermsCustomer=Payment Terms - Customer
+PaymentTypeSupplier=Payment Type - Vendor
+PaymentTermsSupplier=Payment Term - Vendor
+PaymentTypeBoth=Payment Type - Customer and Vendor
+MulticurrencyUsed=Use Multicurrency
+MulticurrencyCurrency=Currency
diff --git a/htdocs/langs/hi_IN/compta.lang b/htdocs/langs/hi_IN/compta.lang
new file mode 100644
index 00000000000..8a8c837ac87
--- /dev/null
+++ b/htdocs/langs/hi_IN/compta.lang
@@ -0,0 +1,266 @@
+# Dolibarr language file - Source file is en_US - compta
+MenuFinancial=Billing | Payment
+TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
+OptionMode=Option for accountancy
+OptionModeTrue=Option Incomes-Expenses
+OptionModeVirtual=Option Claims-Debts
+OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
+OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
+FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
+VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
+LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+Param=Setup
+RemainingAmountPayment=Amount payment remaining:
+Account=Account
+Accountparent=Parent account
+Accountsparent=Parent accounts
+Income=Income
+Outcome=Expense
+MenuReportInOut=Income / Expense
+ReportInOut=Balance of income and expenses
+ReportTurnover=Turnover invoiced
+ReportTurnoverCollected=Turnover collected
+PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party
+PaymentsNotLinkedToUser=Payments not linked to any user
+Profit=Profit
+AccountingResult=Accounting result
+BalanceBefore=Balance (before)
+Balance=Balance
+Debit=Debit
+Credit=Credit
+Piece=Accounting Doc.
+AmountHTVATRealReceived=Net collected
+AmountHTVATRealPaid=Net paid
+VATToPay=Tax sales
+VATReceived=Tax received
+VATToCollect=Tax purchases
+VATSummary=Tax monthly
+VATBalance=Tax Balance
+VATPaid=Tax paid
+LT1Summary=Tax 2 summary
+LT2Summary=Tax 3 summary
+LT1SummaryES=RE Balance
+LT2SummaryES=IRPF Balance
+LT1SummaryIN=CGST Balance
+LT2SummaryIN=SGST Balance
+LT1Paid=Tax 2 paid
+LT2Paid=Tax 3 paid
+LT1PaidES=RE Paid
+LT2PaidES=IRPF Paid
+LT1PaidIN=CGST Paid
+LT2PaidIN=SGST Paid
+LT1Customer=Tax 2 sales
+LT1Supplier=Tax 2 purchases
+LT1CustomerES=RE sales
+LT1SupplierES=RE purchases
+LT1CustomerIN=CGST sales
+LT1SupplierIN=CGST purchases
+LT2Customer=Tax 3 sales
+LT2Supplier=Tax 3 purchases
+LT2CustomerES=IRPF sales
+LT2SupplierES=IRPF purchases
+LT2CustomerIN=SGST sales
+LT2SupplierIN=SGST purchases
+VATCollected=VAT collected
+StatusToPay=To pay
+SpecialExpensesArea=Area for all special payments
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
+SocialContributionsDeductibles=Deductible social or fiscal taxes
+SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
+MenuSpecialExpenses=Special expenses
+MenuTaxAndDividends=Taxes and dividends
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New social/fiscal tax
+NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
+AccountancyTreasuryArea=Billing and payment area
+NewPayment=New payment
+PaymentCustomerInvoice=Customer invoice payment
+PaymentSupplierInvoice=vendor invoice payment
+PaymentSocialContribution=Social/fiscal tax payment
+PaymentVat=VAT payment
+ListPayment=List of payments
+ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of vendor payments
+DateStartPeriod=Date start period
+DateEndPeriod=Date end period
+newLT1Payment=New tax 2 payment
+newLT2Payment=New tax 3 payment
+LT1Payment=Tax 2 payment
+LT1Payments=Tax 2 payments
+LT2Payment=Tax 3 payment
+LT2Payments=Tax 3 payments
+newLT1PaymentES=New RE payment
+newLT2PaymentES=New IRPF payment
+LT1PaymentES=RE Payment
+LT1PaymentsES=RE Payments
+LT2PaymentES=IRPF Payment
+LT2PaymentsES=IRPF Payments
+VATPayment=Sales tax payment
+VATPayments=Sales tax payments
+VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
+NewLocalTaxPayment=New tax %s payment
+Refund=Refund
+SocialContributionsPayments=Social/fiscal taxes payments
+ShowVatPayment=Show VAT payment
+TotalToPay=Total to pay
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+CustomerAccountancyCode=Customer accounting code
+SupplierAccountancyCode=Vendor accounting code
+CustomerAccountancyCodeShort=Cust. account. code
+SupplierAccountancyCodeShort=Sup. account. code
+AccountNumber=Account number
+NewAccountingAccount=New account
+Turnover=Turnover invoiced
+TurnoverCollected=Turnover collected
+SalesTurnoverMinimum=Minimum turnover
+ByExpenseIncome=By expenses & incomes
+ByThirdParties=By third parties
+ByUserAuthorOfInvoice=By invoice author
+CheckReceipt=Check deposit
+CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Latest %s check receipts
+NewCheckReceipt=New discount
+NewCheckDeposit=New check deposit
+NewCheckDepositOn=Create receipt for deposit on account: %s
+NoWaitingChecks=No checks awaiting deposit.
+DateChequeReceived=Check reception date
+NbOfCheques=No. of checks
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
+CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
+CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
+CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
+CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
+CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
+CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
+CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
+CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
+CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
+CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
+AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
+AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
+AnnualByCompanies=Balance of income and expenses, by predefined groups of account
+AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
+AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
+SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
+SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
+SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
+RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
+RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
+RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
+RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
+RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
+SeePageForSetup=See menu <a href="%s">%s</a> for setup
+DepositsAreNotIncluded=- Down payment invoices are not included
+DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
+VATReportByCustomers=Sale tax report by customer
+VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
+SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
+SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
+RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
+RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
+OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
+PercentOfInvoice=%%/invoice
+NotUsedForGoods=Not used on goods
+ProposalStats=Statistics on proposals
+OrderStats=Statistics on orders
+InvoiceStats=Statistics on bills
+Dispatch=Dispatching
+Dispatched=Dispatched
+ToDispatch=To dispatch
+ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer
+SellsJournal=Sales Journal
+PurchasesJournal=Purchases Journal
+DescSellsJournal=Sales Journal
+DescPurchasesJournal=Purchases Journal
+CodeNotDef=Not defined
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
+DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
+Pcg_version=Chart of accounts models
+Pcg_type=Pcg type
+Pcg_subtype=Pcg subtype
+InvoiceLinesToDispatch=Invoice lines to dispatch
+ByProductsAndServices=By product and service
+RefExt=External ref
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+LinkedOrder=Link to order
+Mode1=Method 1
+Mode2=Method 2
+CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
+CalculationRuleDescSupplier=According to vendor, choose appropriate method to apply same calculation rule and get same result expected by your vendor.
+TurnoverPerProductInCommitmentAccountingNotRelevant=The report of Turnover collected per product is not available. This report is only available for turnover invoiced.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
+CalculationMode=Calculation mode
+AccountancyJournal=Accounting code journal
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+CloneTaxForNextMonth=Clone it for next month
+SimpleReport=Simple report
+AddExtraReport=Extra reports (add foreign and national customer report)
+OtherCountriesCustomersReport=Foreign customers report
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
+SameCountryCustomersWithVAT=National customers report
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
+LinkedFichinter=Link to an intervention
+ImportDataset_tax_contrib=Social/fiscal taxes
+ImportDataset_tax_vat=Vat payments
+ErrorBankAccountNotFound=Error: Bank account not found
+FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
+DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignment
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover invoiced by sale tax rate
+TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
+LabelToShow=Short label
+PurchaseTurnover=Purchase turnover
+PurchaseTurnoverCollected=Purchase turnover collected
+RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
+RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/hi_IN/contracts.lang b/htdocs/langs/hi_IN/contracts.lang
new file mode 100644
index 00000000000..47572c355ab
--- /dev/null
+++ b/htdocs/langs/hi_IN/contracts.lang
@@ -0,0 +1,101 @@
+# Dolibarr language file - Source file is en_US - contracts
+ContractsArea=Contracts area
+ListOfContracts=List of contracts
+AllContracts=All contracts
+ContractCard=Contract card
+ContractStatusNotRunning=Not running
+ContractStatusDraft=Draft
+ContractStatusValidated=Validated
+ContractStatusClosed=Closed
+ServiceStatusInitial=Not running
+ServiceStatusRunning=Running
+ServiceStatusNotLate=Running, not expired
+ServiceStatusNotLateShort=Not expired
+ServiceStatusLate=Running, expired
+ServiceStatusLateShort=Expired
+ServiceStatusClosed=Closed
+ShowContractOfService=Show contract of service
+Contracts=Contracts
+ContractsSubscriptions=Contracts/Subscriptions
+ContractsAndLine=Contracts and line of contracts
+Contract=Contract
+ContractLine=Contract line
+Closing=Closing
+NoContracts=No contracts
+MenuServices=Services
+MenuInactiveServices=Services not active
+MenuRunningServices=Running services
+MenuExpiredServices=Expired services
+MenuClosedServices=Closed services
+NewContract=New contract
+NewContractSubscription=New contract/subscription
+AddContract=Create contract
+DeleteAContract=Delete a contract
+ActivateAllOnContract=Activate all services
+CloseAContract=Close a contract
+ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
+ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
+ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
+ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract?
+ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
+ValidateAContract=Validate a contract
+ActivateService=Activate service
+ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b>?
+RefContract=Contract reference
+DateContract=Contract date
+DateServiceActivate=Service activation date
+ListOfServices=List of services
+ListOfInactiveServices=List of not active services
+ListOfExpiredServices=List of expired active services
+ListOfClosedServices=List of closed services
+ListOfRunningServices=List of running services
+NotActivatedServices=Inactive services (among validated contracts)
+BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
+LastContracts=Latest %s contracts
+LastModifiedServices=Latest %s modified services
+ContractStartDate=Start date
+ContractEndDate=End date
+DateStartPlanned=Planned start date
+DateStartPlannedShort=Planned start date
+DateEndPlanned=Planned end date
+DateEndPlannedShort=Planned end date
+DateStartReal=Real start date
+DateStartRealShort=Real start date
+DateEndReal=Real end date
+DateEndRealShort=Real end date
+CloseService=Close service
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
+ServiceStatus=Status of service
+DraftContracts=Drafts contracts
+CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
+ActivateAllContracts=Activate all contract lines
+CloseAllContracts=Close all contract lines
+DeleteContractLine=Delete a contract line
+ConfirmDeleteContractLine=Are you sure you want to delete this contract line?
+MoveToAnotherContract=Move service into another contract.
+ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract.
+ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
+PaymentRenewContractId=Renew contract line (number %s)
+ExpiredSince=Expiration date
+NoExpiredServices=No expired active services
+ListOfServicesToExpireWithDuration=List of Services to expire in %s days
+ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
+ListOfServicesToExpire=List of Services to expire
+NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
+StandardContractsTemplate=Standard contracts template
+ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
+LowerDateEndPlannedShort=Lower planned end date of active services
+SendContractRef=Contract information __REF__
+OtherContracts=Other contracts
+##### Types de contacts #####
+TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
+TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract
+TypeContact_contrat_external_BILLING=Billing customer contact
+TypeContact_contrat_external_CUSTOMER=Follow-up customer contact
+TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact
diff --git a/htdocs/langs/hi_IN/cron.lang b/htdocs/langs/hi_IN/cron.lang
new file mode 100644
index 00000000000..1de1251831a
--- /dev/null
+++ b/htdocs/langs/hi_IN/cron.lang
@@ -0,0 +1,84 @@
+# Dolibarr language file - Source file is en_US - cron
+# About page
+# Right
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
+# Admin
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
+CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
+CronJobProfiles=List of predefined cron job profiles
+# Menu
+EnabledAndDisabled=Enabled and disabled
+# Page list
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
+CronCommand=Command
+CronList=Scheduled jobs
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
+CronExecute=Launch scheduled job
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
+CronTask=Job
+CronNone=None
+CronDtStart=Not before
+CronDtEnd=Not after
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Start date of latest execution
+CronDtLastResult=End date of latest execution
+CronFrequency=Frequency
+CronClass=Class
+CronMethod=Method
+CronModule=Module
+CronNoJobs=No jobs registered
+CronPriority=Priority
+CronLabel=Label
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
+CronEach=Every
+JobFinished=Job launched and finished
+#Page card
+CronAdd= Add jobs
+CronEvery=Execute job each
+CronObject=Instance/Object to create
+CronArgs=Parameters
+CronSaveSucess=Save successfully
+CronNote=Comment
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+StatusAtInstall=Status at module installation
+CronStatusActiveBtn=Enable
+CronStatusInactiveBtn=Disable
+CronTaskInactive=This job is disabled
+CronId=Id
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
+CronFrom=From
+# Info
+# Common
+CronType=Job type
+CronType_method=Call method of a PHP Class
+CronType_command=Shell command
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
+JobDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
diff --git a/htdocs/langs/hi_IN/deliveries.lang b/htdocs/langs/hi_IN/deliveries.lang
new file mode 100644
index 00000000000..1f48c01de75
--- /dev/null
+++ b/htdocs/langs/hi_IN/deliveries.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - deliveries
+Delivery=Delivery
+DeliveryRef=Ref Delivery
+DeliveryCard=Receipt card
+DeliveryOrder=Delivery receipt
+DeliveryDate=Delivery date
+CreateDeliveryOrder=Generate delivery receipt
+DeliveryStateSaved=Delivery state saved
+SetDeliveryDate=Set shipping date
+ValidateDeliveryReceipt=Validate delivery receipt
+ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt?
+DeleteDeliveryReceipt=Delete delivery receipt
+DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b>?
+DeliveryMethod=Delivery method
+TrackingNumber=Tracking number
+DeliveryNotValidated=Delivery not validated
+StatusDeliveryCanceled=Canceled
+StatusDeliveryDraft=Draft
+StatusDeliveryValidated=Received
+# merou PDF model
+NameAndSignature=Name and Signature:
+ToAndDate=To___________________________________ on ____/_____/__________
+GoodStatusDeclaration=Have received the goods above in good condition,
+Deliverer=Deliverer:
+Sender=Sender
+Recipient=Recipient
+ErrorStockIsNotEnough=There's not enough stock
+Shippable=Shippable
+NonShippable=Not Shippable
+ShowReceiving=Show delivery receipt
+NonExistentOrder=Nonexistent order
diff --git a/htdocs/langs/hi_IN/dict.lang b/htdocs/langs/hi_IN/dict.lang
new file mode 100644
index 00000000000..ec315d97142
--- /dev/null
+++ b/htdocs/langs/hi_IN/dict.lang
@@ -0,0 +1,359 @@
+# Dolibarr language file - Source file is en_US - dict
+CountryFR=France
+CountryBE=Belgium
+CountryIT=Italy
+CountryES=Spain
+CountryDE=Germany
+CountryCH=Switzerland
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
+CountryUK=United Kingdom
+CountryIE=Ireland
+CountryCN=China
+CountryTN=Tunisia
+CountryUS=United States
+CountryMA=Morocco
+CountryDZ=Algeria
+CountryCA=Canada
+CountryTG=Togo
+CountryGA=Gabon
+CountryNL=Netherlands
+CountryHU=Hungary
+CountryRU=Russia
+CountrySE=Sweden
+CountryCI=Ivoiry Coast
+CountrySN=Senegal
+CountryAR=Argentina
+CountryCM=Cameroon
+CountryPT=Portugal
+CountrySA=Saudi Arabia
+CountryMC=Monaco
+CountryAU=Australia
+CountrySG=Singapore
+CountryAF=Afghanistan
+CountryAX=Åland Islands
+CountryAL=Albania
+CountryAS=American Samoa
+CountryAD=Andorra
+CountryAO=Angola
+CountryAI=Anguilla
+CountryAQ=Antarctica
+CountryAG=Antigua and Barbuda
+CountryAM=Armenia
+CountryAW=Aruba
+CountryAT=Austria
+CountryAZ=Azerbaijan
+CountryBS=Bahamas
+CountryBH=Bahrain
+CountryBD=Bangladesh
+CountryBB=Barbados
+CountryBY=Belarus
+CountryBZ=Belize
+CountryBJ=Benin
+CountryBM=Bermuda
+CountryBT=Bhutan
+CountryBO=Bolivia
+CountryBA=Bosnia and Herzegovina
+CountryBW=Botswana
+CountryBV=Bouvet Island
+CountryBR=Brazil
+CountryIO=British Indian Ocean Territory
+CountryBN=Brunei Darussalam
+CountryBG=Bulgaria
+CountryBF=Burkina Faso
+CountryBI=Burundi
+CountryKH=Cambodia
+CountryCV=Cape Verde
+CountryKY=Cayman Islands
+CountryCF=Central African Republic
+CountryTD=Chad
+CountryCL=Chile
+CountryCX=Christmas Island
+CountryCC=Cocos (Keeling) Islands
+CountryCO=Colombia
+CountryKM=Comoros
+CountryCG=Congo
+CountryCD=Congo, The Democratic Republic of the
+CountryCK=Cook Islands
+CountryCR=Costa Rica
+CountryHR=Croatia
+CountryCU=Cuba
+CountryCY=Cyprus
+CountryCZ=Czech Republic
+CountryDK=Denmark
+CountryDJ=Djibouti
+CountryDM=Dominica
+CountryDO=Dominican Republic
+CountryEC=Ecuador
+CountryEG=Egypt
+CountrySV=El Salvador
+CountryGQ=Equatorial Guinea
+CountryER=Eritrea
+CountryEE=Estonia
+CountryET=Ethiopia
+CountryFK=Falkland Islands
+CountryFO=Faroe Islands
+CountryFJ=Fiji Islands
+CountryFI=Finland
+CountryGF=French Guiana
+CountryPF=French Polynesia
+CountryTF=French Southern Territories
+CountryGM=Gambia
+CountryGE=Georgia
+CountryGH=Ghana
+CountryGI=Gibraltar
+CountryGR=Greece
+CountryGL=Greenland
+CountryGD=Grenada
+CountryGP=Guadeloupe
+CountryGU=Guam
+CountryGT=Guatemala
+CountryGN=Guinea
+CountryGW=Guinea-Bissau
+CountryGY=Guyana
+CountryHT=Haïti
+CountryHM=Heard Island and McDonald
+CountryVA=Holy See (Vatican City State)
+CountryHN=Honduras
+CountryHK=Hong Kong
+CountryIS=Iceland
+CountryIN=India
+CountryID=Indonesia
+CountryIR=Iran
+CountryIQ=Iraq
+CountryIL=Israel
+CountryJM=Jamaica
+CountryJP=Japan
+CountryJO=Jordan
+CountryKZ=Kazakhstan
+CountryKE=Kenya
+CountryKI=Kiribati
+CountryKP=North Korea
+CountryKR=South Korea
+CountryKW=Kuwait
+CountryKG=Kyrgyzstan
+CountryLA=Lao
+CountryLV=Latvia
+CountryLB=Lebanon
+CountryLS=Lesotho
+CountryLR=Liberia
+CountryLY=Libyan
+CountryLI=Liechtenstein
+CountryLT=Lithuania
+CountryLU=Luxembourg
+CountryMO=Macao
+CountryMK=Macedonia, the former Yugoslav of
+CountryMG=Madagascar
+CountryMW=Malawi
+CountryMY=Malaysia
+CountryMV=Maldives
+CountryML=Mali
+CountryMT=Malta
+CountryMH=Marshall Islands
+CountryMQ=Martinique
+CountryMR=Mauritania
+CountryMU=Mauritius
+CountryYT=Mayotte
+CountryMX=Mexico
+CountryFM=Micronesia
+CountryMD=Moldova
+CountryMN=Mongolia
+CountryMS=Monserrat
+CountryMZ=Mozambique
+CountryMM=Myanmar (Burma)
+CountryNA=Namibia
+CountryNR=Nauru
+CountryNP=Nepal
+CountryAN=Netherlands Antilles
+CountryNC=New Caledonia
+CountryNZ=New Zealand
+CountryNI=Nicaragua
+CountryNE=Niger
+CountryNG=Nigeria
+CountryNU=Niue
+CountryNF=Norfolk Island
+CountryMP=Northern Mariana Islands
+CountryNO=Norway
+CountryOM=Oman
+CountryPK=Pakistan
+CountryPW=Palau
+CountryPS=Palestinian Territory, Occupied
+CountryPA=Panama
+CountryPG=Papua New Guinea
+CountryPY=Paraguay
+CountryPE=Peru
+CountryPH=Philippines
+CountryPN=Pitcairn Islands
+CountryPL=Poland
+CountryPR=Puerto Rico
+CountryQA=Qatar
+CountryRE=Reunion
+CountryRO=Romania
+CountryRW=Rwanda
+CountrySH=Saint Helena
+CountryKN=Saint Kitts and Nevis
+CountryLC=Saint Lucia
+CountryPM=Saint Pierre and Miquelon
+CountryVC=Saint Vincent and Grenadines
+CountryWS=Samoa
+CountrySM=San Marino
+CountryST=Sao Tome and Principe
+CountryRS=Serbia
+CountrySC=Seychelles
+CountrySL=Sierra Leone
+CountrySK=Slovakia
+CountrySI=Slovenia
+CountrySB=Solomon Islands
+CountrySO=Somalia
+CountryZA=South Africa
+CountryGS=South Georgia and the South Sandwich Islands
+CountryLK=Sri Lanka
+CountrySD=Sudan
+CountrySR=Suriname
+CountrySJ=Svalbard and Jan Mayen
+CountrySZ=Swaziland
+CountrySY=Syrian
+CountryTW=Taiwan
+CountryTJ=Tajikistan
+CountryTZ=Tanzania
+CountryTH=Thailand
+CountryTL=Timor-Leste
+CountryTK=Tokelau
+CountryTO=Tonga
+CountryTT=Trinidad and Tobago
+CountryTR=Turkey
+CountryTM=Turkmenistan
+CountryTC=Turks and Caicos Islands
+CountryTV=Tuvalu
+CountryUG=Uganda
+CountryUA=Ukraine
+CountryAE=United Arab Emirates
+CountryUM=United States Minor Outlying Islands
+CountryUY=Uruguay
+CountryUZ=Uzbekistan
+CountryVU=Vanuatu
+CountryVE=Venezuela
+CountryVN=Viet Nam
+CountryVG=Virgin Islands, British
+CountryVI=Virgin Islands, U.S.
+CountryWF=Wallis and Futuna
+CountryEH=Western Sahara
+CountryYE=Yemen
+CountryZM=Zambia
+CountryZW=Zimbabwe
+CountryGG=Guernsey
+CountryIM=Isle of Man
+CountryJE=Jersey
+CountryME=Montenegro
+CountryBL=Saint Barthelemy
+CountryMF=Saint Martin
+
+##### Civilities #####
+CivilityMME=Mrs.
+CivilityMR=Mr.
+CivilityMLE=Ms.
+CivilityMTRE=Master
+CivilityDR=Doctor
+##### Currencies #####
+Currencyeuros=Euros
+CurrencyAUD=AU Dollars
+CurrencySingAUD=AU Dollar
+CurrencyCAD=CAN Dollars
+CurrencySingCAD=CAN Dollar
+CurrencyCHF=Swiss Francs
+CurrencySingCHF=Swiss Franc
+CurrencyEUR=Euros
+CurrencySingEUR=Euro
+CurrencyFRF=French Francs
+CurrencySingFRF=French Franc
+CurrencyGBP=GB Pounds
+CurrencySingGBP=GB Pound
+CurrencyINR=Indian rupees
+CurrencySingINR=Indian rupee
+CurrencyMAD=Dirham
+CurrencySingMAD=Dirham
+CurrencyMGA=Ariary
+CurrencySingMGA=Ariary
+CurrencyMUR=Mauritius rupees
+CurrencySingMUR=Mauritius rupee
+CurrencyNOK=Norwegian krones
+CurrencySingNOK=Norwegian kronas
+CurrencyTND=Tunisian dinars
+CurrencySingTND=Tunisian dinar
+CurrencyUSD=US Dollars
+CurrencySingUSD=US Dollar
+CurrencyUAH=Hryvnia
+CurrencySingUAH=Hryvnia
+CurrencyXAF=CFA Francs BEAC
+CurrencySingXAF=CFA Franc BEAC
+CurrencyXOF=CFA Francs BCEAO
+CurrencySingXOF=CFA Franc BCEAO
+CurrencyXPF=CFP Francs
+CurrencySingXPF=CFP Franc
+CurrencyCentEUR=cents
+CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=thousandth
+#### Input reasons #####
+DemandReasonTypeSRC_INTE=Internet
+DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
+DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
+DemandReasonTypeSRC_CAMP_PHO=Phone campaign
+DemandReasonTypeSRC_CAMP_FAX=Fax campaign
+DemandReasonTypeSRC_COMM=Commercial contact
+DemandReasonTypeSRC_SHOP=Shop contact
+DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_PARTNER=Partner
+DemandReasonTypeSRC_EMPLOYEE=Employee
+DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
+#### Paper formats ####
+PaperFormatEU4A0=Format 4A0
+PaperFormatEU2A0=Format 2A0
+PaperFormatEUA0=Format A0
+PaperFormatEUA1=Format A1
+PaperFormatEUA2=Format A2
+PaperFormatEUA3=Format A3
+PaperFormatEUA4=Format A4
+PaperFormatEUA5=Format A5
+PaperFormatEUA6=Format A6
+PaperFormatUSLETTER=Format Letter US
+PaperFormatUSLEGAL=Format Legal US
+PaperFormatUSEXECUTIVE=Format Executive US
+PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatCAP1=Format P1 Canada
+PaperFormatCAP2=Format P2 Canada
+PaperFormatCAP3=Format P3 Canada
+PaperFormatCAP4=Format P4 Canada
+PaperFormatCAP5=Format P5 Canada
+PaperFormatCAP6=Format P6 Canada
+#### Expense report categories ####
+ExpAutoCat=Car
+ExpCycloCat=Moped
+ExpMotoCat=Motorbike
+ExpAuto3CV=3 CV
+ExpAuto4CV=4 CV
+ExpAuto5CV=5 CV
+ExpAuto6CV=6 CV
+ExpAuto7CV=7 CV
+ExpAuto8CV=8 CV
+ExpAuto9CV=9 CV
+ExpAuto10CV=10 CV
+ExpAuto11CV=11 CV
+ExpAuto12CV=12 CV
+ExpAuto3PCV=3 CV and more
+ExpAuto4PCV=4 CV and more
+ExpAuto5PCV=5 CV and more
+ExpAuto6PCV=6 CV and more
+ExpAuto7PCV=7 CV and more
+ExpAuto8PCV=8 CV and more
+ExpAuto9PCV=9 CV and more
+ExpAuto10PCV=10 CV and more
+ExpAuto11PCV=11 CV and more
+ExpAuto12PCV=12 CV and more
+ExpAuto13PCV=13 CV and more
+ExpCyclo=Capacity lower to 50cm3
+ExpMoto12CV=Motorbike 1 or 2 CV
+ExpMoto345CV=Motorbike 3, 4 or 5 CV
+ExpMoto5PCV=Motorbike 5 CV and more
diff --git a/htdocs/langs/hi_IN/donations.lang b/htdocs/langs/hi_IN/donations.lang
new file mode 100644
index 00000000000..de4bdf68f03
--- /dev/null
+++ b/htdocs/langs/hi_IN/donations.lang
@@ -0,0 +1,34 @@
+# Dolibarr language file - Source file is en_US - donations
+Donation=Donation
+Donations=Donations
+DonationRef=Donation ref.
+Donor=Donor
+AddDonation=Create a donation
+NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation?
+PublicDonation=Public donation
+DonationsArea=Donations area
+DonationStatusPromiseNotValidated=Draft promise
+DonationStatusPromiseValidated=Validated promise
+DonationStatusPaid=Donation received
+DonationStatusPromiseNotValidatedShort=Draft
+DonationStatusPromiseValidatedShort=Validated
+DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDate=Donation date
+DonationDatePayment=Payment date
+ValidPromess=Validate promise
+DonationReceipt=Donation receipt
+DonationsModels=Documents models for donation receipts
+LastModifiedDonations=Latest %s modified donations
+DonationRecipient=Donation recipient
+IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+MinimumAmount=Minimum amount is  %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
+DonationValidated=Donation %s validated
diff --git a/htdocs/langs/hi_IN/ecm.lang b/htdocs/langs/hi_IN/ecm.lang
new file mode 100644
index 00000000000..369ac6dfdfa
--- /dev/null
+++ b/htdocs/langs/hi_IN/ecm.lang
@@ -0,0 +1,52 @@
+# Dolibarr language file - Source file is en_US - ecm
+ECMNbOfDocs=No. of documents in directory
+ECMSection=Directory
+ECMSectionManual=Manual directory
+ECMSectionAuto=Automatic directory
+ECMSectionsManual=Manual tree
+ECMSectionsAuto=Automatic tree
+ECMSections=Directories
+ECMRoot=ECM Root
+ECMNewSection=New directory
+ECMAddSection=Add directory
+ECMCreationDate=Creation date
+ECMNbOfFilesInDir=Number of files in directory
+ECMNbOfSubDir=Number of sub-directories
+ECMNbOfFilesInSubDir=Number of files in sub-directories
+ECMCreationUser=Creator
+ECMArea=DMS/ECM area
+ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.<br>* Manual directories can be used to save documents not linked to a particular element.
+ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
+ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMSearchByKeywords=Search by keywords
+ECMSearchByEntity=Search by object
+ECMSectionOfDocuments=Directories of documents
+ECMTypeAuto=Automatic
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
+ECMDocsByThirdParties=Documents linked to third parties
+ECMDocsByProposals=Documents linked to proposals
+ECMDocsByOrders=Documents linked to customers orders
+ECMDocsByContracts=Documents linked to contracts
+ECMDocsByInvoices=Documents linked to customers invoices
+ECMDocsByProducts=Documents linked to products
+ECMDocsByProjects=Documents linked to projects
+ECMDocsByUsers=Documents linked to users
+ECMDocsByInterventions=Documents linked to interventions
+ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to vendor proposals
+ECMNoDirectoryYet=No directory created
+ShowECMSection=Show directory
+DeleteSection=Remove directory
+ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
+ECMDirectoryForFiles=Relative directory for files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+ECMFileManager=File manager
+ECMSelectASection=Select a directory in the tree...
+DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
+ReSyncListOfDir=Resync list of directories
+HashOfFileContent=Hash of file content
+NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/hi_IN/errors.lang b/htdocs/langs/hi_IN/errors.lang
new file mode 100644
index 00000000000..7c67aeca8b5
--- /dev/null
+++ b/htdocs/langs/hi_IN/errors.lang
@@ -0,0 +1,265 @@
+# Dolibarr language file - Source file is en_US - errors
+
+# No errors
+NoErrorCommitIsDone=No error, we commit
+# Errors
+ErrorButCommitIsDone=Errors found but we validate despite this
+ErrorBadEMail=Email %s is wrong
+ErrorBadUrl=Url %s is wrong
+ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorLoginAlreadyExists=Login %s already exists.
+ErrorGroupAlreadyExists=Group %s already exists.
+ErrorRecordNotFound=Record not found.
+ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
+ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
+ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
+ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
+ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
+ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
+ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
+ErrorBadThirdPartyName=Bad value for third-party name
+ErrorProdIdIsMandatory=The %s is mandatory
+ErrorBadCustomerCodeSyntax=Bad syntax for customer code
+ErrorBadBarCodeSyntax=Bad syntax for barcode. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorCustomerCodeRequired=Customer code required
+ErrorBarCodeRequired=Barcode required
+ErrorCustomerCodeAlreadyUsed=Customer code already used
+ErrorBarCodeAlreadyUsed=Barcode already used
+ErrorPrefixRequired=Prefix required
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
+ErrorBadParameters=Bad parameters
+ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
+ErrorBadDateFormat=Value '%s' has wrong date format
+ErrorWrongDate=Date is not correct!
+ErrorFailedToWriteInDir=Failed to write in directory %s
+ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
+ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
+ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
+ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
+ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
+ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
+ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
+ErrorFileNotFound=File <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
+ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
+ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
+ErrorDirAlreadyExists=A directory with this name already exists.
+ErrorFileAlreadyExists=A file with this name already exists.
+ErrorPartialFile=File not received completely by server.
+ErrorNoTmpDir=Temporary directy %s does not exists.
+ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
+ErrorFileSizeTooLarge=File size is too large.
+ErrorFieldTooLong=Field %s is too long.
+ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum)
+ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum)
+ErrorNoValueForSelectType=Please fill value for select list
+ErrorNoValueForCheckBoxType=Please fill value for checkbox list
+ErrorNoValueForRadioType=Please fill value for radio list
+ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
+ErrorFieldCanNotContainSpecialCharacters=The field <b>%s</b> must not contains special characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
+ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
+ErrorNoAccountancyModuleLoaded=No accountancy module activated
+ErrorExportDuplicateProfil=This profile name already exists for this export set.
+ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
+ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
+ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
+ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
+ErrorRecordHasChildren=Failed to delete record since it has some child records.
+ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
+ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
+ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display.
+ErrorPasswordsMustMatch=Both typed passwords must match each other
+ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
+ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
+ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
+ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
+ErrorsOnXLines=%s errors found
+ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
+ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
+ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
+ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorBadMask=Error on mask
+ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
+ErrorBadMaskBadRazMonth=Error, bad reset value
+ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
+ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
+ErrorSelectAtLeastOne=Error, select at least one entry.
+ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
+ErrorProdIdAlreadyExist=%s is assigned to another third
+ErrorFailedToSendPassword=Failed to send password
+ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
+ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
+ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
+ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
+ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
+ErrorRecordAlreadyExists=Record already exists
+ErrorLabelAlreadyExists=This label already exists
+ErrorCantReadFile=Failed to read file '%s'
+ErrorCantReadDir=Failed to read directory '%s'
+ErrorBadLoginPassword=Bad value for login or password
+ErrorLoginDisabled=Your account has been disabled
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToChangePassword=Failed to change password
+ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
+ErrorLoginHasNoEmail=This user has no email address. Process aborted.
+ErrorBadValueForCode=Bad value for security code. Try again with new value...
+ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice.
+ErrorLinesCantBeNegativeForOneVATRate=Total of lines can't be negative for a given VAT rate.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
+ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
+ErrorNoActivatedBarcode=No barcode type activated
+ErrUnzipFails=Failed to unzip %s with ZipArchive
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
+ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
+ErrorModuleFileRequired=You must select a Dolibarr module package file
+ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
+ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
+ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
+ErrorNewValueCantMatchOldValue=New value can't be equal to old one
+ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
+ErrorFailedToAddContact=Failed to add contact
+ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
+ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
+ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
+ErrorWarehouseMustDiffers=Source and target warehouses must differs
+ErrorBadFormat=Bad format!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
+ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
+ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
+ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Operator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpression23=Unknown or non set variable '%s' in %s
+ErrorPriceExpression24=Variable '%s' exists but has no value
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
+ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
+ErrorSavingChanges=An error has occurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
+ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
+ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
+ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
+ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
+ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
+ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
+ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
+ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
+ErrorTaskAlreadyAssigned=Task already assigned to user
+ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
+ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
+ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
+ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
+ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
+ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
+ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
+ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
+ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
+ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
+ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
+ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
+ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, record is already transferred in accounting, deletion is not possible.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, language is mandatory if you set the page as a translation of another one.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
+ErrorBatchNoFoundForProductInWarehouse=No lot/serial found for product "%s" in warehouse "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this lot/serial for product "%s" in warehouse "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
+ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
+ErrorReplaceStringEmpty=Error, the string to replace into is empty
+# Warnings
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
+WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
+WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
+WarningEnableYourModulesApplications=Click here to enable your modules and applications
+WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.
+WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
+WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
+WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php</b>) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe.
+WarningsOnXLines=Warnings on <b>%s</b> source record(s)
+WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
+WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable the installation/migration tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Omitting the creation of this file is a grave security risk.
+WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
+WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
+WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
+WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
+WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
+WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
+WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
+WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectClosed=Project is closed. You must re-open it first.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
diff --git a/htdocs/langs/hi_IN/exports.lang b/htdocs/langs/hi_IN/exports.lang
new file mode 100644
index 00000000000..3549e3f8b23
--- /dev/null
+++ b/htdocs/langs/hi_IN/exports.lang
@@ -0,0 +1,135 @@
+# Dolibarr language file - Source file is en_US - exports
+ExportsArea=Exports
+ImportArea=Import
+NewExport=New Export
+NewImport=New Import
+ExportableDatas=Exportable dataset
+ImportableDatas=Importable dataset
+SelectExportDataSet=Choose dataset you want to export...
+SelectImportDataSet=Choose dataset you want to import...
+SelectExportFields=Choose the fields you want to export, or select a predefined export profile
+SelectImportFields=Choose the source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
+NotImportedFields=Fields of source file not imported
+SaveExportModel=Save your selections as an export profile/template (for reuse).
+SaveImportModel=Save this import profile (for reuse) ...
+ExportModelName=Export profile name
+ExportModelSaved=Export profile saved as <b>%s</b>.
+ExportableFields=Exportable fields
+ExportedFields=Exported fields
+ImportModelName=Import profile name
+ImportModelSaved=Import profile saved as <b>%s</b>.
+DatasetToExport=Dataset to export
+DatasetToImport=Import file into dataset
+ChooseFieldsOrdersAndTitle=Choose fields order...
+FieldsTitle=Fields title
+FieldTitle=Field title
+NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
+AvailableFormats=Available Formats
+LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
+Step=Step
+FormatedImport=Import Assistant
+FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
+FormatedImportDesc2=First step is to choose the kind of data you want to import, then the format of the source file, then the fields you want to import.
+FormatedExport=Export Assistant
+FormatedExportDesc1=These tools allow the export of personalized data using an assistant, to help you in the process without requiring technical knowledge.
+FormatedExportDesc2=First step is to choose a predefined dataset, then which fields you want to export, and in which order.
+FormatedExportDesc3=When data to export are selected, you can choose the format of the output file.
+Sheet=Sheet
+NoImportableData=No importable data (no module with definitions to allow data imports)
+FileSuccessfullyBuilt=File generated
+SQLUsedForExport=SQL Request used to extract data
+LineId=Id of line
+LineLabel=Label of line
+LineDescription=Description of line
+LineUnitPrice=Unit price of line
+LineVATRate=VAT Rate of line
+LineQty=Quantity for line
+LineTotalHT=Amount excl. tax for line
+LineTotalTTC=Amount with tax for line
+LineTotalVAT=Amount of VAT for line
+TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
+FileWithDataToImport=File with data to import
+FileToImport=Source file to import
+FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SourceFileFormat=Source file format
+FieldsInSourceFile=Fields in source file
+FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+Field=Field
+NoFields=No fields
+MoveField=Move field column number %s
+ExampleOfImportFile=Example_of_import_file
+SaveImportProfile=Save this import profile
+ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name.
+TablesTarget=Targeted tables
+FieldsTarget=Targeted fields
+FieldTarget=Targeted field
+FieldSource=Source field
+NbOfSourceLines=Number of lines in source file
+NowClickToTestTheImport=Check that the file format (field and string delimiters) of your file matches the options shown and that you have omitted the header line, or these will be flagged as errors in the following simulation.<br>Click on the "<b>%s</b>" button to run a check of the file structure/contents and simulate the import process.<br><b>No data will be changed in your database</b>.
+RunSimulateImportFile=Run Import Simulation
+FieldNeedSource=This field requires data from the source file
+SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
+InformationOnSourceFile=Information on source file
+InformationOnTargetTables=Information on target fields
+SelectAtLeastOneField=Switch at least one source field in the column of fields to export
+SelectFormat=Choose this import file format
+RunImportFile=Import Data
+NowClickToRunTheImport=Check the results of the import simulation. Correct any errors and re-test.<br>When the simulation reports no errors you may proceed to import the data into the database.
+DataLoadedWithId=The imported data will have an additional field in each database table with this import id: <b>%s</b>, to allow it to be searchable in the case of investigating a problem related to this import.
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+TooMuchErrors=There are still <b>%s</b> other source lines with errors but output has been limited.
+TooMuchWarnings=There are still <b>%s</b> other source lines with warnings but output has been limited.
+EmptyLine=Empty line (will be discarded)
+CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
+FileWasImported=File was imported with number <b>%s</b>.
+YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
+NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
+NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
+DataComeFromNoWhere=Value to insert comes from nowhere in source file.
+DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
+DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
+DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
+DataIsInsertedInto=Data coming from source file will be inserted into the following field:
+DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
+DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field:
+SourceRequired=Data value is mandatory
+SourceExample=Example of possible data value
+ExampleAnyRefFoundIntoElement=Any ref found for element <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
+CSVFormatDesc=<b>Comma Separated Value</b> file format (.csv).<br>This is a text file format where fields are separated by a separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ].
+Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is the native Excel 95 format (BIFF5).
+Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is the native Excel 2007 format (SpreadsheetML).
+TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
+ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate record (with this field added, all lines will own their own id and will differ).
+CsvOptions=CSV format options
+Separator=Field Separator
+Enclosure=String Delimiter
+SpecialCode=Special code
+ExportStringFilter=%% allows replacing one or more characters in the text
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD: filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD: filters on all previous years/months/days
+ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+ImportFromToLine=Limit range (From - To). Eg. to omit header line(s).
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines.<br>If the header lines are NOT omitted, this will result in multiple errors in the Import Simulation.
+KeepEmptyToGoToEndOfFile=Keep this field empty to process all lines to the end of the file.
+SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for an UPDATE import
+UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
+NoUpdateAttempt=No update attempt was performed, only insert
+ImportDataset_user_1=Users (employees or not) and properties
+ComputedField=Computed field
+## filters
+SelectFilterFields=If you want to filter on some values, just input values here.
+FilteredFields=Filtered fields
+FilteredFieldsValues=Value for filter
+FormatControlRule=Format control rule
+## imports updates
+KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
+NbInsert=Number of inserted lines: %s
+NbUpdate=Number of updated lines: %s
+MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
diff --git a/htdocs/langs/hi_IN/externalsite.lang b/htdocs/langs/hi_IN/externalsite.lang
new file mode 100644
index 00000000000..da4853df0df
--- /dev/null
+++ b/htdocs/langs/hi_IN/externalsite.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExternalSiteSetup=Setup link to external website
+ExternalSiteURL=External Site URL
+ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/hi_IN/ftp.lang b/htdocs/langs/hi_IN/ftp.lang
new file mode 100644
index 00000000000..d80b87c2715
--- /dev/null
+++ b/htdocs/langs/hi_IN/ftp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - ftp
+FTPClientSetup=FTP Client module setup
+NewFTPClient=New FTP connection setup
+FTPArea=FTP Area
+FTPAreaDesc=This screen shows a view of an FTP server.
+SetupOfFTPClientModuleNotComplete=The setup of the FTP client module seems to be incomplete
+FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
+FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
+FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
+FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
+FTPPassiveMode=Passive mode
+ChooseAFTPEntryIntoMenu=Choose a FTP site from the menu...
+FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/hi_IN/help.lang b/htdocs/langs/hi_IN/help.lang
new file mode 100644
index 00000000000..048de16d3c0
--- /dev/null
+++ b/htdocs/langs/hi_IN/help.lang
@@ -0,0 +1,23 @@
+# Dolibarr language file - Source file is en_US - help
+CommunitySupport=Forum/Wiki support
+EMailSupport=Emails support
+RemoteControlSupport=Online real-time / remote support
+OtherSupport=Other support
+ToSeeListOfAvailableRessources=To contact/see available resources:
+HelpCenter=Help Center
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
+TypeSupportCommunauty=Community (free)
+TypeSupportCommercial=Commercial
+TypeOfHelp=Type
+NeedHelpCenter=Need help or support?
+Efficiency=Efficiency
+TypeHelpOnly=Help only
+TypeHelpDev=Help+Development
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
+PossibleLanguages=Supported languages
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
+SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/hi_IN/holiday.lang b/htdocs/langs/hi_IN/holiday.lang
new file mode 100644
index 00000000000..82de49f9c5f
--- /dev/null
+++ b/htdocs/langs/hi_IN/holiday.lang
@@ -0,0 +1,133 @@
+# Dolibarr language file - Source file is en_US - holiday
+HRM=HRM
+Holidays=Leave
+CPTitreMenu=Leave
+MenuReportMonth=Monthly statement
+MenuAddCP=New leave request
+NotActiveModCP=You must enable the module Leave to view this page.
+AddCP=Make a leave request
+DateDebCP=Start date
+DateFinCP=End date
+DraftCP=Draft
+ToReviewCP=Awaiting approval
+ApprovedCP=Approved
+CancelCP=Canceled
+RefuseCP=Refused
+ValidatorCP=Approbator
+ListeCP=List of leave
+LeaveId=Leave ID
+ReviewedByCP=Will be approved by
+UserID=User ID
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
+DescCP=Description
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
+ErrorEndDateCP=You must select an end date greater than the start date.
+ErrorSQLCreateCP=An SQL error occurred during the creation:
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
+ReturnCP=Return to previous page
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosWorkflowCP=Information Workflow
+RequestByCP=Requested by
+TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
+NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DayIsANonWorkingDay=%s is a non working day
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
+EditCP=Edit
+DeleteCP=Delete
+ActionRefuseCP=Refuse
+ActionCancelCP=Cancel
+StatutCP=Status
+TitleDeleteCP=Delete the leave request
+ConfirmDeleteCP=Confirm the deletion of this leave request?
+ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
+CantCreateCP=You don't have the right to make leave requests.
+InvalidValidatorCP=You must choose an approbator to your leave request.
+NoDateDebut=You must select a start date.
+NoDateFin=You must select an end date.
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
+ConfirmValidCP=Are you sure you want to approve the leave request?
+DateValidCP=Date approved
+TitleToValidCP=Send leave request
+ConfirmToValidCP=Are you sure you want to send the leave request?
+TitleRefuseCP=Refuse the leave request
+ConfirmRefuseCP=Are you sure you want to refuse the leave request?
+NoMotifRefuseCP=You must choose a reason for refusing the request.
+TitleCancelCP=Cancel the leave request
+ConfirmCancelCP=Are you sure you want to cancel the leave request?
+DetailRefusCP=Reason for refusal
+DateRefusCP=Date of refusal
+DateCancelCP=Date of cancellation
+DefineEventUserCP=Assign an exceptional leave for a user
+addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
+MotifCP=Reason
+UserCP=User
+ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
+AddEventToUserOkCP=The addition of the exceptional leave has been completed.
+MenuLogCP=View change logs
+LogCP=Log of updates of available vacation days
+ActionByCP=Performed by
+UserUpdateCP=For the user
+PrevSoldeCP=Previous Balance
+NewSoldeCP=New Balance
+alreadyCPexist=A leave request has already been done on this period.
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
+BoxTitleLastLeaveRequests=Latest %s modified leave requests
+HolidaysMonthlyUpdate=Monthly update
+ManualUpdate=Manual update
+HolidaysCancelation=Leave request cancelation
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
+## Configuration du Module ##
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
+UpdateConfCPOK=Updated successfully.
+Module27130Name= Management of leave requests
+Module27130Desc= Management of leave requests
+ErrorMailNotSend=An error occurred while sending email:
+NoticePeriod=Notice period
+#Messages
+HolidaysToValidate=Validate leave requests
+HolidaysToValidateBody=Below is a leave request to validate
+HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
+HolidaysValidated=Validated leave requests
+HolidaysValidatedBody=Your leave request for %s to %s has been validated.
+HolidaysRefused=Request denied
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
+HolidaysCanceled=Canceled leaved request
+HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
+FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
+NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
+NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
diff --git a/htdocs/langs/hi_IN/hrm.lang b/htdocs/langs/hi_IN/hrm.lang
new file mode 100644
index 00000000000..3697c47e30d
--- /dev/null
+++ b/htdocs/langs/hi_IN/hrm.lang
@@ -0,0 +1,18 @@
+# Dolibarr language file - en_US - hrm
+# Admin
+HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
+Establishments=Establishments
+Establishment=Establishment
+NewEstablishment=New establishment
+DeleteEstablishment=Delete establishment
+ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
+OpenEtablishment=Open establishment
+CloseEtablishment=Close establishment
+# Dictionary
+DictionaryPublicHolidays=HRM - Public holidays
+DictionaryDepartment=HRM - Department list
+DictionaryFunction=HRM - Function list
+# Module
+Employees=Employees
+Employee=Employee
+NewEmployee=New employee
diff --git a/htdocs/langs/hi_IN/install.lang b/htdocs/langs/hi_IN/install.lang
new file mode 100644
index 00000000000..f67dff57184
--- /dev/null
+++ b/htdocs/langs/hi_IN/install.lang
@@ -0,0 +1,223 @@
+# Dolibarr language file - Source file is en_US - install
+InstallEasy=Just follow the instructions step by step.
+MiscellaneousChecks=Prerequisites check
+ConfFileExists=Configuration file <b>%s</b> exists.
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
+ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
+ConfFileReload=Reloading parameters from configuration file.
+PHPSupportSessions=This PHP supports sessions.
+PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportCalendar=This PHP supports calendars extensions.
+PHPSupportUTF8=This PHP supports UTF8 functions.
+PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupport=This PHP supports %s functions.
+PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
+ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
+ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
+ErrorDirDoesNotExists=Directory %s does not exist.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
+ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
+ErrorFailedToCreateDatabase=Failed to create database '%s'.
+ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
+ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
+ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
+ErrorDatabaseAlreadyExists=Database '%s' already exists.
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
+IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
+PHPVersion=PHP Version
+License=Using license
+ConfigurationFile=Configuration file
+WebPagesDirectory=Directory where web pages are stored
+DocumentsDirectory=Directory to store uploaded and generated documents
+URLRoot=URL Root
+ForceHttps=Force secure connections (https)
+CheckToForceHttps=Check this option to force secure connections (https).<br>This requires that the web server is configured with an SSL certificate.
+DolibarrDatabase=Dolibarr Database
+DatabaseType=Database type
+DriverType=Driver type
+Server=Server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
+ServerPortDescription=Database server port. Keep empty if unknown.
+DatabaseServer=Database server
+DatabaseName=Database name
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
+AdminPassword=Password for Dolibarr database owner.
+CreateDatabase=Create database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
+DatabaseSuperUserAccess=Database server - Superuser access
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
+ServerConnection=Server connection
+DatabaseCreation=Database creation
+CreateDatabaseObjects=Database objects creation
+ReferenceDataLoading=Reference data loading
+TablesAndPrimaryKeysCreation=Tables and Primary keys creation
+CreateTableAndPrimaryKey=Create table %s
+CreateOtherKeysForTable=Create foreign keys and indexes for table %s
+OtherKeysCreation=Foreign keys and indexes creation
+FunctionsCreation=Functions creation
+AdminAccountCreation=Administrator login creation
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
+SetupEnd=End of setup
+SystemIsInstalled=This installation is complete.
+SystemIsUpgraded=Dolibarr has been upgraded successfully.
+YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below:
+AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
+GoToDolibarr=Go to Dolibarr
+GoToSetupArea=Go to Dolibarr (setup area)
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
+GoToUpgradePage=Go to upgrade page again
+WithNoSlashAtTheEnd=Without the slash "/" at the end
+DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
+LoginAlreadyExists=Already exists
+DolibarrAdminLogin=Dolibarr admin login
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
+FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
+ChoosedMigrateScript=Choose migration script
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
+ProcessMigrateScript=Script processing
+ChooseYourSetupMode=Choose your setup mode and click "Start"...
+FreshInstall=Fresh install
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
+Upgrade=Upgrade
+UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
+Start=Start
+InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
+YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
+AlreadyDone=Already migrated
+DatabaseVersion=Database version
+ServerVersion=Database server version
+YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
+DBSortingCollation=Character sorting order
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
+OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
+RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
+FieldRenamed=Field renamed
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
+InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
+InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
+IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
+OpenBaseDir=PHP openbasedir parameter
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
+MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
+MigrationShippingDelivery=Upgrade storage of shipping
+MigrationShippingDelivery2=Upgrade storage of shipping 2
+MigrationFinished=Migration finished
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
+ActivateModule=Activate module %s
+ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
+SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
+NothingToDelete=Nothing to clean/delete
+NothingToDo=Nothing to do
+#########
+# upgrade
+MigrationFixData=Fix for denormalized data
+MigrationOrder=Data migration for customer's orders
+MigrationSupplierOrder=Data migration for vendor's orders
+MigrationProposal=Data migration for commercial proposals
+MigrationInvoice=Data migration for customer's invoices
+MigrationContract=Data migration for contracts
+MigrationSuccessfullUpdate=Upgrade successful
+MigrationUpdateFailed=Failed upgrade process
+MigrationRelationshipTables=Data migration for relationship tables (%s)
+MigrationPaymentsUpdate=Payment data correction
+MigrationPaymentsNumberToUpdate=%s payment(s) to update
+MigrationProcessPaymentUpdate=Update payment(s) %s
+MigrationPaymentsNothingToUpdate=No more things to do
+MigrationPaymentsNothingUpdatable=No more payments that can be corrected
+MigrationContractsUpdate=Contract data correction
+MigrationContractsNumberToUpdate=%s contract(s) to update
+MigrationContractsLineCreation=Create contract line for contract ref %s
+MigrationContractsNothingToUpdate=No more things to do
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
+MigrationContractsEmptyDatesUpdate=Contract empty date correction
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
+MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
+MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
+MigrationContractsInvalidDatesUpdate=Bad value date contract correction
+MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s)
+MigrationContractsInvalidDatesNumber=%s contracts modified
+MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct
+MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction
+MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
+MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct
+MigrationReopeningContracts=Open contract closed by error
+MigrationReopenThisContract=Reopen contract %s
+MigrationReopenedContractsNumber=%s contracts modified
+MigrationReopeningContractsNothingToUpdate=No closed contract to open
+MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
+MigrationBankTransfertsNothingToUpdate=All links are up to date
+MigrationShipmentOrderMatching=Sendings receipt update
+MigrationDeliveryOrderMatching=Delivery receipt update
+MigrationDeliveryDetail=Delivery update
+MigrationStockDetail=Update stock value of products
+MigrationMenusDetail=Update dynamic menus tables
+MigrationDeliveryAddress=Update delivery address in shipments
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
+MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
+MigrationProjectTaskTime=Update time spent in seconds
+MigrationActioncommElement=Update data on actions
+MigrationPaymentMode=Data migration for payment type
+MigrationCategorieAssociation=Migration of categories
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
+MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
+MigrationReloadModule=Reload module %s
+MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
+ClickHereToGoToApp=Click here to go to your application
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/hi_IN/interventions.lang b/htdocs/langs/hi_IN/interventions.lang
new file mode 100644
index 00000000000..e5936f8246e
--- /dev/null
+++ b/htdocs/langs/hi_IN/interventions.lang
@@ -0,0 +1,66 @@
+# Dolibarr language file - Source file is en_US - interventions
+Intervention=Intervention
+Interventions=Interventions
+InterventionCard=Intervention card
+NewIntervention=New intervention
+AddIntervention=Create intervention
+ChangeIntoRepeatableIntervention=Change to repeatable intervention
+ListOfInterventions=List of interventions
+ActionsOnFicheInter=Actions on intervention
+LastInterventions=Latest %s interventions
+AllInterventions=All interventions
+CreateDraftIntervention=Create draft
+InterventionContact=Intervention contact
+DeleteIntervention=Delete intervention
+ValidateIntervention=Validate intervention
+ModifyIntervention=Modify intervention
+DeleteInterventionLine=Delete intervention line
+ConfirmDeleteIntervention=Are you sure you want to delete this intervention?
+ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
+ConfirmModifyIntervention=Are you sure you want to modify this intervention?
+ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line?
+ConfirmCloneIntervention=Are you sure you want to clone this intervention?
+NameAndSignatureOfInternalContact=Name and signature of intervening:
+NameAndSignatureOfExternalContact=Name and signature of customer:
+DocumentModelStandard=Standard document model for interventions
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
+InterventionClassifyDone=Classify "Done"
+StatusInterInvoiced=Billed
+SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by email
+InterventionDeletedInDolibarr=Intervention %s deleted
+InterventionsArea=Interventions area
+DraftFichinter=Draft interventions
+LastModifiedInterventions=Latest %s modified interventions
+FichinterToProcess=Interventions to process
+TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
+PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
+PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
+UseDurationOnFichinter=Hides the duration field for intervention records
+UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records
+InterventionStatistics=Statistics of interventions
+NbOfinterventions=No. of intervention cards
+NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
+InterId=Intervention id
+InterRef=Intervention ref.
+InterDateCreation=Date creation intervention
+InterDuration=Duration intervention
+InterStatus=Status intervention
+InterNote=Note intervention
+InterLine=Line of intervention
+InterLineId=Line id intervention
+InterLineDate=Line date intervention
+InterLineDuration=Line duration intervention
+InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/hi_IN/languages.lang b/htdocs/langs/hi_IN/languages.lang
new file mode 100644
index 00000000000..6185183161b
--- /dev/null
+++ b/htdocs/langs/hi_IN/languages.lang
@@ -0,0 +1,89 @@
+# Dolibarr language file - Source file is en_US - languages
+Language_ar_AR=Arabic
+Language_ar_EG=Arabic (Egypt)
+Language_ar_SA=Arabic
+Language_bn_BD=Bengali
+Language_bg_BG=Bulgarian
+Language_bs_BA=Bosnian
+Language_ca_ES=Catalan
+Language_cs_CZ=Czech
+Language_da_DA=Danish
+Language_da_DK=Danish
+Language_de_DE=German
+Language_de_AT=German (Austria)
+Language_de_CH=German (Switzerland)
+Language_el_GR=Greek
+Language_el_CY=Greek (Cyprus)
+Language_en_AU=English (Australia)
+Language_en_CA=English (Canada)
+Language_en_GB=English (United Kingdom)
+Language_en_IN=English (India)
+Language_en_NZ=English (New Zealand)
+Language_en_SA=English (Saudi Arabia)
+Language_en_US=English (United States)
+Language_en_ZA=English (South Africa)
+Language_es_ES=Spanish
+Language_es_AR=Spanish (Argentina)
+Language_es_BO=Spanish (Bolivia)
+Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
+Language_es_EC=Spanish (Ecuador)
+Language_es_HN=Spanish (Honduras)
+Language_es_MX=Spanish (Mexico)
+Language_es_PA=Spanish (Panama)
+Language_es_PY=Spanish (Paraguay)
+Language_es_PE=Spanish (Peru)
+Language_es_PR=Spanish (Puerto Rico)
+Language_es_UY=Spanish (Uruguay)
+Language_es_VE=Spanish (Venezuela)
+Language_et_EE=Estonian
+Language_eu_ES=Basque
+Language_fa_IR=Persian
+Language_fi_FI=Finnish
+Language_fr_BE=French (Belgium)
+Language_fr_CA=French (Canada)
+Language_fr_CH=French (Switzerland)
+Language_fr_FR=French
+Language_fr_NC=French (New Caledonia)
+Language_fy_NL=Frisian
+Language_he_IL=Hebrew
+Language_hr_HR=Croatian
+Language_hu_HU=Hungarian
+Language_id_ID=Indonesian
+Language_is_IS=Icelandic
+Language_it_IT=Italian
+Language_ja_JP=Japanese
+Language_ka_GE=Georgian
+Language_km_KH=Khmer
+Language_kn_IN=Kannada
+Language_ko_KR=Korean
+Language_lo_LA=Lao
+Language_lt_LT=Lithuanian
+Language_lv_LV=Latvian
+Language_mk_MK=Macedonian
+Language_mn_MN=Mongolian
+Language_nb_NO=Norwegian (Bokmål)
+Language_nl_BE=Dutch (Belgium)
+Language_nl_NL=Dutch
+Language_pl_PL=Polish
+Language_pt_BR=Portuguese (Brazil)
+Language_pt_PT=Portuguese
+Language_ro_RO=Romanian
+Language_ru_RU=Russian
+Language_ru_UA=Russian (Ukraine)
+Language_tr_TR=Turkish
+Language_sl_SI=Slovenian
+Language_sv_SV=Swedish
+Language_sv_SE=Swedish
+Language_sq_AL=Albanian
+Language_sk_SK=Slovakian
+Language_sr_RS=Serbian
+Language_sw_SW=Kiswahili
+Language_th_TH=Thai
+Language_uk_UA=Ukrainian
+Language_uz_UZ=Uzbek
+Language_vi_VN=Vietnamese
+Language_zh_CN=Chinese
+Language_zh_TW=Chinese (Traditional)
+Language_bh_MY=Malay
diff --git a/htdocs/langs/hi_IN/ldap.lang b/htdocs/langs/hi_IN/ldap.lang
new file mode 100644
index 00000000000..8b6f0864215
--- /dev/null
+++ b/htdocs/langs/hi_IN/ldap.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - ldap
+YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
+UserMustChangePassNextLogon=User must change password on the domain %s
+LDAPInformationsForThisContact=Information in LDAP database for this contact
+LDAPInformationsForThisUser=Information in LDAP database for this user
+LDAPInformationsForThisGroup=Information in LDAP database for this group
+LDAPInformationsForThisMember=Information in LDAP database for this member
+LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPAttributes=LDAP attributes
+LDAPCard=LDAP card
+LDAPRecordNotFound=Record not found in LDAP database
+LDAPUsers=Users in LDAP database
+LDAPFieldStatus=Status
+LDAPFieldFirstSubscriptionDate=First subscription date
+LDAPFieldFirstSubscriptionAmount=First subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example: skypeName
+UserSynchronized=User synchronized
+GroupSynchronized=Group synchronized
+MemberSynchronized=Member synchronized
+MemberTypeSynchronized=Member type synchronized
+ContactSynchronized=Contact synchronized
+ForceSynchronize=Force synchronizing Dolibarr -> LDAP
+ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/hi_IN/link.lang b/htdocs/langs/hi_IN/link.lang
new file mode 100644
index 00000000000..1ffcd41a18b
--- /dev/null
+++ b/htdocs/langs/hi_IN/link.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - languages
+LinkANewFile=Link a new file/document
+LinkedFiles=Linked files and documents
+NoLinkFound=No registered links
+LinkComplete=The file has been linked successfully
+ErrorFileNotLinked=The file could not be linked
+LinkRemoved=The link %s has been removed
+ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
+ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+URLToLink=URL to link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/hi_IN/loan.lang b/htdocs/langs/hi_IN/loan.lang
new file mode 100644
index 00000000000..534dee08867
--- /dev/null
+++ b/htdocs/langs/hi_IN/loan.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+LoanPayment=Loan payment
+ShowLoanPayment=Show Loan Payment
+LoanCapital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+Term=Term
+LoanAccountancyCapitalCode=Accounting account capital
+LoanAccountancyInsuranceCode=Accounting account insurance
+LoanAccountancyInterestCode=Accounting account interest
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ListLoanAssociatedProject=List of loan associated with the project
+AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
+CreateCalcSchedule=Edit financial commitment
diff --git a/htdocs/langs/hi_IN/mailmanspip.lang b/htdocs/langs/hi_IN/mailmanspip.lang
new file mode 100644
index 00000000000..bab4b3576b4
--- /dev/null
+++ b/htdocs/langs/hi_IN/mailmanspip.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - mailmanspip
+MailmanSpipSetup=Mailman and SPIP module Setup
+MailmanTitle=Mailman mailing list system
+TestSubscribe=To test subscription to Mailman lists
+TestUnSubscribe=To test unsubscribe from Mailman lists
+MailmanCreationSuccess=Subscription test was executed successfully
+MailmanDeletionSuccess=Unsubscription test was executed successfully
+SynchroMailManEnabled=A Mailman update will be performed
+SynchroSpipEnabled=A Spip update will be performed
+DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
+DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
+DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
+DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
+SPIPTitle=SPIP Content Management System
+DescADHERENT_SPIP_SERVEUR=SPIP Server
+DescADHERENT_SPIP_DB=SPIP database name
+DescADHERENT_SPIP_USER=SPIP database login
+DescADHERENT_SPIP_PASS=SPIP database password
+AddIntoSpip=Add into SPIP
+AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
+AddIntoSpipError=Failed to add the user in SPIP
+DeleteIntoSpip=Remove from SPIP
+DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
+DeleteIntoSpipError=Failed to suppress the user from SPIP
+SPIPConnectionFailed=Failed to connect to SPIP
+SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
+SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
diff --git a/htdocs/langs/hi_IN/mails.lang b/htdocs/langs/hi_IN/mails.lang
new file mode 100644
index 00000000000..7b3bfd3852a
--- /dev/null
+++ b/htdocs/langs/hi_IN/mails.lang
@@ -0,0 +1,170 @@
+# Dolibarr language file - Source file is en_US - mails
+Mailing=EMailing
+EMailing=EMailing
+EMailings=EMailings
+AllEMailings=All eMailings
+MailCard=EMailing card
+MailRecipients=Recipients
+MailRecipient=Recipient
+MailTitle=Description
+MailFrom=Sender
+MailErrorsTo=Errors to
+MailReply=Reply to
+MailTo=Receiver(s)
+MailToUsers=To user(s)
+MailCC=Copy to
+MailToCCUsers=Copy to users(s)
+MailCCC=Cached copy to
+MailTopic=Email topic
+MailText=Message
+MailFile=Attached files
+MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
+ShowEMailing=Show emailing
+ListOfEMailings=List of emailings
+NewMailing=New emailing
+EditMailing=Edit emailing
+ResetMailing=Resend emailing
+DeleteMailing=Delete emailing
+DeleteAMailing=Delete an emailing
+PreviewMailing=Preview emailing
+CreateMailing=Create emailing
+TestMailing=Test email
+ValidMailing=Valid emailing
+MailingStatusDraft=Draft
+MailingStatusValidated=Validated
+MailingStatusSent=Sent
+MailingStatusSentPartialy=Sent partially
+MailingStatusSentCompletely=Sent completely
+MailingStatusError=Error
+MailingStatusNotSent=Not sent
+MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
+MailingSuccessfullyValidated=EMailing successfully validated
+MailUnsubcribe=Unsubscribe
+MailingStatusNotContact=Don't contact anymore
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
+ErrorMailRecipientIsEmpty=Email recipient is empty
+WarningNoEMailsAdded=No new Email to add to recipient's list.
+ConfirmValidMailing=Are you sure you want to validate this emailing?
+ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
+ConfirmDeleteMailing=Are you sure you want to delete this emailing?
+NbOfUniqueEMails=No. of unique emails
+NbOfEMails=No. of EMails
+TotalNbOfDistinctRecipients=Number of distinct recipients
+NoTargetYet=No recipients defined yet (Go on tab 'Recipients')
+NoRecipientEmail=No recipient email for %s
+RemoveRecipient=Remove recipient
+YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README.
+EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values
+MailingAddFile=Attach this file
+NoAttachedFiles=No attached files
+BadEMail=Bad value for Email
+ConfirmCloneEMailing=Are you sure you want to clone this emailing?
+CloneContent=Clone message
+CloneReceivers=Cloner recipients
+DateLastSend=Date of latest sending
+DateSending=Date sending
+SentTo=Sent to <b>%s</b>
+MailingStatusRead=Read
+YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubscribe from mailing list
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubscribe" feature
+EMailSentToNRecipients=Email sent to %s recipients.
+EMailSentForNElements=Email sent for %s elements.
+XTargetsAdded=<b>%s</b> recipients added into target list
+OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachments in mass sending in this version).
+AllRecipientSelected=The recipients of the %s record selected (if their email is known).
+GroupEmails=Group emails
+OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
+WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
+ResultOfMailSending=Result of mass Email sending
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
+SentXXXmessages=%s message(s) sent.
+ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
+MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
+MailingModuleDescContactsByCompanyCategory=Contacts by third-party category
+MailingModuleDescContactsByCategory=Contacts by categories
+MailingModuleDescContactsByFunction=Contacts by position
+MailingModuleDescEmailsFromFile=Emails from file
+MailingModuleDescEmailsFromUser=Emails input by user
+MailingModuleDescDolibarrUsers=Users with Emails
+MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+
+# Libelle des modules de liste de destinataires mailing
+LineInFile=Line %s in file
+RecipientSelectionModules=Defined requests for recipient's selection
+MailSelectedRecipients=Selected recipients
+MailingArea=EMailings area
+LastMailings=Latest %s emailings
+TargetsStatistics=Targets statistics
+NbOfCompaniesContacts=Unique contacts/addresses
+MailNoChangePossible=Recipients for validated emailing can't be changed
+SearchAMailing=Search mailing
+SendMailing=Send emailing
+SentBy=Sent by
+MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
+MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
+ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+TargetsReset=Clear list
+ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
+ToAddRecipientsChooseHere=Add recipients by choosing from the lists
+NbOfEMailingsReceived=Mass emailings received
+NbOfEMailingsSend=Mass emailings sent
+IdRecord=ID record
+DeliveryReceipt=Delivery Ack.
+YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
+TagCheckMail=Track mail opening
+TagUnsubscribe=Unsubscribe link
+TagSignature=Signature of sending user
+EMailRecipient=Recipient Email
+TagMailtoEmail=Recipient Email (including html "mailto:" link)
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
+# Module Notifications
+Notifications=Notifications
+NoNotificationsWillBeSent=No email notifications are planned for this event and company
+ANotificationsWillBeSent=1 notification will be sent by email
+SomeNotificationsWillBeSent=%s notifications will be sent by email
+AddNewNotification=Activate a new email notification target/event
+ListOfActiveNotifications=List all active targets/events for email notification
+ListOfNotificationsDone=List all email notifications sent
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
+UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
+UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
+MailAdvTargetRecipients=Recipients (advanced selection)
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchIntHelp=Use interval to select int or float value
+AdvTgtMinVal=Minimum value
+AdvTgtMaxVal=Maximum value
+AdvTgtSearchDtHelp=Use interval to select date value
+AdvTgtStartDt=Start dt.
+AdvTgtEndDt=End dt.
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third-party email or just contact email
+AdvTgtTypeOfIncude=Type of targeted email
+AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
+AddAll=Add all
+RemoveAll=Remove all
+ItemsCount=Item(s)
+AdvTgtNameTemplate=Filter name
+AdvTgtAddContact=Add emails according to criteria
+AdvTgtLoadFilter=Load filter
+AdvTgtDeleteFilter=Delete filter
+AdvTgtSaveFilter=Save filter
+AdvTgtCreateFilter=Create filter
+AdvTgtOrCreateNewFilter=Name of new filter
+NoContactWithCategoryFound=No contact/address with a category found
+NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+DefaultOutgoingEmailSetup=Default outgoing email setup
+Information=Information
+ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/hi_IN/main.lang b/htdocs/langs/hi_IN/main.lang
new file mode 100644
index 00000000000..797698ef70e
--- /dev/null
+++ b/htdocs/langs/hi_IN/main.lang
@@ -0,0 +1,1035 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+# Note for Chinese:
+# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
+# stsongstdlight or cid0cs are for simplified Chinese
+# To read Chinese pdf with Linux: sudo apt-get install poppler-data
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
+DatabaseConnection=Database connection
+NoTemplateDefined=No template available for this email type
+AvailableVariables=Available substitution variables
+NoTranslation=No translation
+Translation=Translation
+EmptySearchString=Enter a non empty search string
+NoRecordFound=No record found
+NoRecordDeleted=No record deleted
+NotEnoughDataYet=Not enough data
+NoError=No error
+Error=Error
+Errors=Errors
+ErrorFieldRequired=Field '%s' is required
+ErrorFieldFormat=Field '%s' has a bad value
+ErrorFileDoesNotExists=File %s does not exist
+ErrorFailedToOpenFile=Failed to open file %s
+ErrorCanNotCreateDir=Cannot create dir %s
+ErrorCanNotReadDir=Cannot read dir %s
+ErrorConstantNotDefined=Parameter %s not defined
+ErrorUnknown=Unknown error
+ErrorSQL=SQL Error
+ErrorLogoFileNotFound=Logo file '%s' was not found
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
+ErrorGoToModuleSetup=Go to Module setup to fix this
+ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
+ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
+ErrorInternalErrorDetected=Error detected
+ErrorWrongHostParameter=Wrong host parameter
+ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post the form again.
+ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child record.
+ErrorWrongValue=Wrong value
+ErrorWrongValueForParameterX=Wrong value for parameter %s
+ErrorNoRequestInError=No request in error
+ErrorServiceUnavailableTryLater=Service not available at the moment. Try again later.
+ErrorDuplicateField=Duplicate value in a unique field
+ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back.
+ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
+ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
+ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
+ErrorFailedToSaveFile=Error, failed to save file.
+ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
+MaxNbOfRecordPerPage=Max. number of records per page
+NotAuthorized=You are not authorized to do that.
+SetDate=Set date
+SelectDate=Select a date
+SeeAlso=See also %s
+SeeHere=See here
+ClickHere=Click here
+Here=Here
+Apply=Apply
+BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
+FileGenerated=The file was successfully generated
+FileSaved=The file was successfully saved
+FileUploaded=The file was successfully uploaded
+FileTransferComplete=File(s) uploaded successfully
+FilesDeleted=File(s) successfully deleted
+FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
+NbOfEntries=No. of entries
+GoToWikiHelpPage=Read online help (Internet access needed)
+GoToHelpPage=Read help
+RecordSaved=Record saved
+RecordDeleted=Record deleted
+RecordGenerated=Record generated
+LevelOfFeature=Level of features
+NotDefined=Not defined
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
+Administrator=Administrator
+Undefined=Undefined
+PasswordForgotten=Password forgotten?
+NoAccount=No account?
+SeeAbove=See above
+HomeArea=Home
+LastConnexion=Last login
+PreviousConnexion=Previous login
+PreviousValue=Previous value
+ConnectedOnMultiCompany=Connected on environment
+ConnectedSince=Connected since
+AuthenticationMode=Authentication mode
+RequestedUrl=Requested URL
+DatabaseTypeManager=Database type manager
+RequestLastAccessInError=Latest database access request error
+ReturnCodeLastAccessInError=Return code for latest database access request error
+InformationLastAccessInError=Information for latest database access request error
+DolibarrHasDetectedError=Dolibarr has detected a technical error
+YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices)
+MoreInformation=More information
+TechnicalInformation=Technical information
+TechnicalID=Technical ID
+LineID=Line ID
+NotePublic=Note (public)
+NotePrivate=Note (private)
+PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
+DoTest=Test
+ToFilter=Filter
+NoFilter=No filter
+WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
+yes=yes
+Yes=Yes
+no=no
+No=No
+All=All
+Home=Home
+Help=Help
+OnlineHelp=Online help
+PageWiki=Wiki page
+MediaBrowser=Media browser
+Always=Always
+Never=Never
+Under=under
+Period=Period
+PeriodEndDate=End date for period
+SelectedPeriod=Selected period
+PreviousPeriod=Previous period
+Activate=Activate
+Activated=Activated
+Closed=Closed
+Closed2=Closed
+NotClosed=Not closed
+Enabled=Enabled
+Enable=Enable
+Deprecated=Deprecated
+Disable=Disable
+Disabled=Disabled
+Add=Add
+AddLink=Add link
+RemoveLink=Remove link
+AddToDraft=Add to draft
+Update=Update
+Close=Close
+CloseBox=Remove widget from your dashboard
+Confirm=Confirm
+ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
+Delete=Delete
+Remove=Remove
+Resiliate=Terminate
+Cancel=Cancel
+Modify=Modify
+Edit=Edit
+Validate=Validate
+ValidateAndApprove=Validate and Approve
+ToValidate=To validate
+NotValidated=Not validated
+Save=Save
+SaveAs=Save As
+SaveAndStay=Save and stay
+SaveAndNew=Save and new
+TestConnection=Test connection
+ToClone=Clone
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
+ConfirmClone=Choose data you want to clone:
+NoCloneOptionsSpecified=No data to clone defined.
+Of=of
+Go=Go
+Run=Run
+CopyOf=Copy of
+Show=Show
+Hide=Hide
+ShowCardHere=Show card
+Search=Search
+SearchOf=Search
+SearchMenuShortCut=Ctrl + shift + f
+Valid=Valid
+Approve=Approve
+Disapprove=Disapprove
+ReOpen=Re-Open
+Upload=Upload
+ToLink=Link
+Select=Select
+Choose=Choose
+Resize=Resize
+ResizeOrCrop=Resize or Crop
+Recenter=Recenter
+Author=Author
+User=User
+Users=Users
+Group=Group
+Groups=Groups
+NoUserGroupDefined=No user group defined
+Password=Password
+PasswordRetype=Retype your password
+NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
+Name=Name
+NameSlashCompany=Name / Company
+Person=Person
+Parameter=Parameter
+Parameters=Parameters
+Value=Value
+PersonalValue=Personal value
+NewObject=New %s
+NewValue=New value
+CurrentValue=Current value
+Code=Code
+Type=Type
+Language=Language
+MultiLanguage=Multi-language
+Note=Note
+Title=Title
+Label=Label
+RefOrLabel=Ref. or label
+Info=Log
+Family=Family
+Description=Description
+Designation=Description
+DescriptionOfLine=Description of line
+DateOfLine=Date of line
+DurationOfLine=Duration of line
+Model=Doc template
+DefaultModel=Default doc template
+Action=Event
+About=About
+Number=Number
+NumberByMonth=Number by month
+AmountByMonth=Amount by month
+Numero=Number
+Limit=Limit
+Limits=Limits
+Logout=Logout
+NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
+Connection=Login
+Setup=Setup
+Alert=Alert
+MenuWarnings=Alerts
+Previous=Previous
+Next=Next
+Cards=Cards
+Card=Card
+Now=Now
+HourStart=Start hour
+Date=Date
+DateAndHour=Date and hour
+DateToday=Today's date
+DateReference=Reference date
+DateStart=Start date
+DateEnd=End date
+DateCreation=Creation date
+DateCreationShort=Creat. date
+DateModification=Modification date
+DateModificationShort=Modif. date
+DateLastModification=Latest modification date
+DateValidation=Validation date
+DateClosing=Closing date
+DateDue=Due date
+DateValue=Value date
+DateValueShort=Value date
+DateOperation=Operation date
+DateOperationShort=Oper. Date
+DateLimit=Limit date
+DateRequest=Request date
+DateProcess=Process date
+DateBuild=Report build date
+DatePayment=Date of payment
+DateApprove=Approving date
+DateApprove2=Approving date (second approval)
+RegistrationDate=Registration date
+UserCreation=Creation user
+UserModification=Modification user
+UserValidation=Validation user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
+UserValidationShort=Valid. user
+DurationYear=year
+DurationMonth=month
+DurationWeek=week
+DurationDay=day
+DurationYears=years
+DurationMonths=months
+DurationWeeks=weeks
+DurationDays=days
+Year=Year
+Month=Month
+Week=Week
+WeekShort=Week
+Day=Day
+Hour=Hour
+Minute=Minute
+Second=Second
+Years=Years
+Months=Months
+Days=Days
+days=days
+Hours=Hours
+Minutes=Minutes
+Seconds=Seconds
+Weeks=Weeks
+Today=Today
+Yesterday=Yesterday
+Tomorrow=Tomorrow
+Morning=Morning
+Afternoon=Afternoon
+Quadri=Quadri
+MonthOfDay=Month of the day
+HourShort=H
+MinuteShort=mn
+Rate=Rate
+CurrencyRate=Currency conversion rate
+UseLocalTax=Include tax
+Bytes=Bytes
+KiloBytes=Kilobytes
+MegaBytes=Megabytes
+GigaBytes=Gigabytes
+TeraBytes=Terabytes
+UserAuthor=User of creation
+UserModif=User of last update
+b=b.
+Kb=Kb
+Mb=Mb
+Gb=Gb
+Tb=Tb
+Cut=Cut
+Copy=Copy
+Paste=Paste
+Default=Default
+DefaultValue=Default value
+DefaultValues=Default values/filters/sorting
+Price=Price
+PriceCurrency=Price (currency)
+UnitPrice=Unit price
+UnitPriceHT=Unit price (excl.)
+UnitPriceHTCurrency=Unit price (excl.) (currency)
+UnitPriceTTC=Unit price
+PriceU=U.P.
+PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
+PriceUTTC=U.P. (inc. tax)
+Amount=Amount
+AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
+AmountInvoicedHT=Amount invoiced (incl. tax)
+AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountPayment=Payment amount
+AmountHTShort=Amount (excl.)
+AmountTTCShort=Amount (inc. tax)
+AmountHT=Amount (excl. tax)
+AmountTTC=Amount (inc. tax)
+AmountVAT=Amount tax
+MulticurrencyAlreadyPaid=Already paid, original currency
+MulticurrencyRemainderToPay=Remain to pay, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+MulticurrencyAmountHT=Amount (excl. tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
+AmountLT1=Amount tax 2
+AmountLT2=Amount tax 3
+AmountLT1ES=Amount RE
+AmountLT2ES=Amount IRPF
+AmountTotal=Total amount
+AmountAverage=Average amount
+PriceQtyMinHT=Price quantity min. (excl. tax)
+PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+Percentage=Percentage
+Total=Total
+SubTotal=Subtotal
+TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
+TotalHTShortCurrency=Total (excl. in currency)
+TotalTTCShort=Total (inc. tax)
+TotalHT=Total (excl. tax)
+TotalHTforthispage=Total (excl. tax) for this page
+Totalforthispage=Total for this page
+TotalTTC=Total (inc. tax)
+TotalTTCToYourCredit=Total (inc. tax) to your credit
+TotalVAT=Total tax
+TotalVATIN=Total IGST
+TotalLT1=Total tax 2
+TotalLT2=Total tax 3
+TotalLT1ES=Total RE
+TotalLT2ES=Total IRPF
+TotalLT1IN=Total CGST
+TotalLT2IN=Total SGST
+HT=Excl. tax
+TTC=Inc. tax
+INCVATONLY=Inc. VAT
+INCT=Inc. all taxes
+VAT=Sales tax
+VATIN=IGST
+VATs=Sales taxes
+VATINs=IGST taxes
+LT1=Sales tax 2
+LT1Type=Sales tax 2 type
+LT2=Sales tax 3
+LT2Type=Sales tax 3 type
+LT1ES=RE
+LT2ES=IRPF
+LT1IN=CGST
+LT2IN=SGST
+LT1GC=Additionnal cents
+VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
+DefaultTaxRate=Default tax rate
+Average=Average
+Sum=Sum
+Delta=Delta
+StatusToPay=To pay
+RemainToPay=Remain to pay
+Module=Module/Application
+Modules=Modules/Applications
+Option=Option
+List=List
+FullList=Full list
+FullConversation=Full conversation
+Statistics=Statistics
+OtherStatistics=Other statistics
+Status=Status
+Favorite=Favorite
+ShortInfo=Info.
+Ref=Ref.
+ExternalRef=Ref. extern
+RefSupplier=Ref. vendor
+RefPayment=Ref. payment
+CommercialProposalsShort=Commercial proposals
+Comment=Comment
+Comments=Comments
+ActionsToDo=Events to do
+ActionsToDoShort=To do
+ActionsDoneShort=Done
+ActionNotApplicable=Not applicable
+ActionRunningNotStarted=To start
+ActionRunningShort=In progress
+ActionDoneShort=Finished
+ActionUncomplete=Incomplete
+LatestLinkedEvents=Latest %s linked events
+CompanyFoundation=Company/Organization
+Accountant=Accountant
+ContactsForCompany=Contacts for this third party
+ContactsAddressesForCompany=Contacts/addresses for this third party
+AddressesForCompany=Addresses for this third party
+ActionsOnCompany=Events for this third party
+ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
+ActionsOnMember=Events about this member
+ActionsOnProduct=Events about this product
+NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
+RequestAlreadyDone=Request already recorded
+Filter=Filter
+FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
+RemoveFilter=Remove filter
+ChartGenerated=Chart generated
+ChartNotGenerated=Chart not generated
+GeneratedOn=Build on %s
+Generate=Generate
+Duration=Duration
+TotalDuration=Total duration
+Summary=Summary
+DolibarrStateBoard=Database Statistics
+DolibarrWorkBoard=Open Items
+NoOpenedElementToProcess=No open element to process
+Available=Available
+NotYetAvailable=Not yet available
+NotAvailable=Not available
+Categories=Tags/categories
+Category=Tag/category
+By=By
+From=From
+FromLocation=From
+to=to
+To=to
+and=and
+or=or
+Other=Other
+Others=Others
+OtherInformations=अन्य सूचना
+Quantity=Quantity
+Qty=Qty
+ChangedBy=Changed by
+ApprovedBy=Approved by
+ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
+ReCalculate=Recalculate
+ResultKo=Failure
+Reporting=Reporting
+Reportings=Reporting
+Draft=Draft
+Drafts=Drafts
+StatusInterInvoiced=Invoiced
+Validated=Validated
+Opened=Open
+OpenAll=Open (All)
+ClosedAll=Closed (All)
+New=New
+Discount=Discount
+Unknown=अज्ञात
+General=General
+Size=Size
+OriginalSize=Original size
+Received=Received
+Paid=Paid
+Topic=Subject
+ByCompanies=By third parties
+ByUsers=By user
+Links=Links
+Link=Link
+Rejects=Rejects
+Preview=Preview
+NextStep=Next step
+Datas=Data
+None=None
+NoneF=None
+NoneOrSeveral=None or several
+Late=Late
+LateDesc=An item is defined as Delayed as per the system configuration in menu Home - Setup - Alerts.
+NoItemLate=No late item
+Photo=Picture
+Photos=Pictures
+AddPhoto=Add picture
+DeletePicture=Picture delete
+ConfirmDeletePicture=Confirm picture deletion?
+Login=Login
+LoginEmail=Login (email)
+LoginOrEmail=Login or Email
+CurrentLogin=Current login
+EnterLoginDetail=Enter login details
+January=January
+February=February
+March=March
+April=April
+May=May
+June=June
+July=July
+August=August
+September=September
+October=October
+November=November
+December=December
+Month01=January
+Month02=February
+Month03=March
+Month04=April
+Month05=May
+Month06=June
+Month07=July
+Month08=August
+Month09=September
+Month10=October
+Month11=November
+Month12=December
+MonthShort01=Jan
+MonthShort02=Feb
+MonthShort03=Mar
+MonthShort04=Apr
+MonthShort05=May
+MonthShort06=Jun
+MonthShort07=Jul
+MonthShort08=Aug
+MonthShort09=Sep
+MonthShort10=Oct
+MonthShort11=Nov
+MonthShort12=Dec
+MonthVeryShort01=J
+MonthVeryShort02=F
+MonthVeryShort03=M
+MonthVeryShort04=A
+MonthVeryShort05=M
+MonthVeryShort06=J
+MonthVeryShort07=J
+MonthVeryShort08=A
+MonthVeryShort09=S
+MonthVeryShort10=O
+MonthVeryShort11=N
+MonthVeryShort12=D
+AttachedFiles=Attached files and documents
+JoinMainDoc=Join main document
+DateFormatYYYYMM=YYYY-MM
+DateFormatYYYYMMDD=YYYY-MM-DD
+DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
+ReportName=Report name
+ReportPeriod=Report period
+ReportDescription=Description
+Report=Report
+Keyword=Keyword
+Origin=Origin
+Legend=Legend
+Fill=Fill
+Reset=Reset
+File=File
+Files=Files
+NotAllowed=Not allowed
+ReadPermissionNotAllowed=Read permission not allowed
+AmountInCurrency=Amount in %s currency
+Example=Example
+Examples=Examples
+NoExample=No example
+FindBug=Report a bug
+NbOfThirdParties=Number of third parties
+NbOfLines=Number of lines
+NbOfObjects=Number of objects
+NbOfObjectReferers=Number of related items
+Referers=Related items
+TotalQuantity=Total quantity
+DateFromTo=From %s to %s
+DateFrom=From %s
+DateUntil=Until %s
+Check=Check
+Uncheck=Uncheck
+Internal=Internal
+External=External
+Internals=Internal
+Externals=External
+Warning=Warning
+Warnings=Warnings
+BuildDoc=Build Doc
+Entity=Environment
+Entities=Entities
+CustomerPreview=Customer preview
+SupplierPreview=Vendor preview
+ShowCustomerPreview=Show customer preview
+ShowSupplierPreview=Show vendor preview
+RefCustomer=Ref. customer
+Currency=Currency
+InfoAdmin=Information for administrators
+Undo=Undo
+Redo=Redo
+ExpandAll=Expand all
+UndoExpandAll=Undo expand
+SeeAll=See all
+Reason=Reason
+FeatureNotYetSupported=Feature not yet supported
+CloseWindow=Close window
+Response=Response
+Priority=Priority
+SendByMail=Send by email
+MailSentBy=Email sent by
+TextUsedInTheMessageBody=Email body
+SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
+Email=Email
+NoEMail=No email
+AlreadyRead=Already read
+NotRead=Not read
+NoMobilePhone=No mobile phone
+Owner=Owner
+FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
+Refresh=Refresh
+BackToList=Back to list
+GoBack=Go back
+CanBeModifiedIfOk=Can be modified if valid
+CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
+RecordCreatedSuccessfully=Record created successfully
+RecordModifiedSuccessfully=Record modified successfully
+RecordsModified=%s record(s) modified
+RecordsDeleted=%s record(s) deleted
+RecordsGenerated=%s record(s) generated
+AutomaticCode=Automatic code
+FeatureDisabled=Feature disabled
+MoveBox=Move widget
+Offered=Offered
+NotEnoughPermissions=You don't have permission for this action
+SessionName=Session name
+Method=Method
+Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+PartialWoman=Partial
+TotalWoman=Total
+NeverReceived=Never received
+Canceled=Canceled
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
+YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record in module setup
+Color=Color
+Documents=Linked files
+Documents2=Documents
+UploadDisabled=Upload disabled
+MenuAccountancy=लेखांकन
+MenuECM=Documents
+MenuAWStats=AWStats
+MenuMembers=Members
+MenuAgendaGoogle=Google agenda
+ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+NoFileFound=No documents saved in this directory
+CurrentUserLanguage=Current language
+CurrentTheme=Current theme
+CurrentMenuManager=Current menu manager
+Browser=Browser
+Layout=Layout
+Screen=Screen
+DisabledModules=Disabled modules
+For=For
+ForCustomer=For customer
+Signature=Signature
+DateOfSignature=Date of signature
+HidePassword=Show command with password hidden
+UnHidePassword=Show real command with clear password
+Root=Root
+RootOfMedias=Root of public medias (/medias)
+Informations=Information
+Page=Page
+Notes=Notes
+AddNewLine=Add new line
+AddFile=Add file
+FreeZone=Not a predefined product/service
+FreeLineOfType=Free-text item, type:
+CloneMainAttributes=Clone object with its main attributes
+ReGeneratePDF=Re-generate PDF
+PDFMerge=PDF Merge
+Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
+PrintContentArea=Show page to print main content area
+MenuManager=Menu manager
+WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
+CoreErrorTitle=System error
+CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
+CreditCard=Credit card
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
+FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
+FieldsWithIsForPublic=Fields with <b>%s</b> are shown in public list of members. If you don't want this, uncheck the "public" box.
+AccordingToGeoIPDatabase=(according to GeoIP conversion)
+Line=Line
+NotSupported=Not supported
+RequiredField=Required field
+Result=Result
+ToTest=Test
+ValidateBefore=Item must be validated before using this feature
+Visibility=Visibility
+Totalizable=Totalizable
+TotalizableDesc=This field is totalizable in list
+Private=Private
+Hidden=Hidden
+Resources=Resources
+Source=Source
+Prefix=Prefix
+Before=Before
+After=After
+IPAddress=IP address
+Frequency=Frequency
+IM=Instant messaging
+NewAttribute=New attribute
+AttributeCode=Attribute code
+URLPhoto=URL of photo/logo
+SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToTemplateInvoice=Link to template invoice
+LinkToSupplierOrder=Link to purchase order
+LinkToSupplierProposal=Link to vendor proposal
+LinkToSupplierInvoice=Link to vendor invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
+CreateDraft=Create draft
+SetToDraft=Back to draft
+ClickToEdit=Click to edit
+ClickToRefresh=Click to refresh
+EditWithEditor=Edit with CKEditor
+EditWithTextEditor=Edit with Text editor
+EditHTMLSource=Edit HTML Source
+ObjectDeleted=Object %s deleted
+ByCountry=By country
+ByTown=By town
+ByDate=By date
+ByMonthYear=By month/year
+ByYear=By year
+ByMonth=By month
+ByDay=By day
+BySalesRepresentative=By sales representative
+LinkedToSpecificUsers=Linked to a particular user contact
+NoResults=No results
+AdminTools=Admin Tools
+SystemTools=System tools
+ModulesSystemTools=Modules tools
+Test=Test
+Element=Element
+NoPhotoYet=No pictures available yet
+Dashboard=Dashboard
+MyDashboard=My Dashboard
+Deductible=Deductible
+from=from
+toward=toward
+Access=Access
+SelectAction=Select action
+SelectTargetUser=Select target user/employee
+HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
+SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
+OriginFileName=Original filename
+SetDemandReason=Set source
+SetBankAccount=Define Bank Account
+AccountCurrency=Account currency
+ViewPrivateNote=View notes
+XMoreLines=%s line(s) hidden
+ShowMoreLines=Show more/less lines
+PublicUrl=Public URL
+AddBox=Add box
+SelectElementAndClick=Select an element and click %s
+PrintFile=Print File %s
+ShowTransaction=Show entry on bank account
+ShowIntervention=Show intervention
+ShowContract=Show contract
+GoIntoSetupToChangeLogo=Go to Home - Setup - Company to change logo or go to Home - Setup - Display to hide.
+Deny=Deny
+Denied=Denied
+ListOf=List of %s
+ListOfTemplates=List of templates
+Gender=Gender
+Genderman=Man
+Genderwoman=Woman
+ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
+Mandatory=Mandatory
+Hello=Hello
+GoodBye=GoodBye
+Sincerely=Sincerely
+ConfirmDeleteObject=Are you sure you want to delete this object?
+DeleteLine=Delete line
+ConfirmDeleteLine=Are you sure you want to delete this line?
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records.
+NoRecordSelected=No record selected
+MassFilesArea=Area for files built by mass actions
+ShowTempMassFilesArea=Show area of files built by mass actions
+ConfirmMassDeletion=Bulk Delete confirmation
+ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
+RelatedObjects=Related Objects
+ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
+Progress=Progress
+ProgressShort=Progr.
+FrontOffice=Front office
+BackOffice=Back office
+Submit=Submit
+View=View
+Export=Export
+Exports=Exports
+ExportFilteredList=Export filtered list
+ExportList=Export list
+ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
+Miscellaneous=Miscellaneous
+Calendar=Calendar
+GroupBy=Group by...
+ViewFlatList=View flat list
+RemoveString=Remove string '%s'
+SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+DirectDownloadLink=Direct download link (public/external)
+DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+Download=Download
+DownloadDocument=Download document
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
+ModuleBuilder=Module and Application Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status?
+ImportId=Import id
+Events=Events
+EMailTemplates=Email templates
+FileNotShared=File not shared to external public
+Project=Project
+Projects=Projects
+LeadOrProject=Lead | Project
+LeadsOrProjects=Leads | Projects
+Lead=Lead
+Leads=Leads
+ListOpenLeads=List open leads
+ListOpenProjects=List open projects
+NewLeadOrProject=New lead or project
+Rights=Permissions
+LineNb=Line no.
+IncotermLabel=Incoterms
+TabLetteringCustomer=Customer lettering
+TabLetteringSupplier=Vendor lettering
+Monday=Monday
+Tuesday=Tuesday
+Wednesday=Wednesday
+Thursday=Thursday
+Friday=Friday
+Saturday=Saturday
+Sunday=Sunday
+MondayMin=Mo
+TuesdayMin=Tu
+WednesdayMin=We
+ThursdayMin=Th
+FridayMin=Fr
+SaturdayMin=Sa
+SundayMin=Su
+Day1=Monday
+Day2=Tuesday
+Day3=Wednesday
+Day4=Thursday
+Day5=Friday
+Day6=Saturday
+Day0=Sunday
+ShortMonday=M
+ShortTuesday=T
+ShortWednesday=W
+ShortThursday=T
+ShortFriday=F
+ShortSaturday=S
+ShortSunday=S
+SelectMailModel=Select an email template
+SetRef=Set ref
+Select2ResultFoundUseArrows=Some results found. Use arrows to select.
+Select2NotFound=No result found
+Select2Enter=Enter
+Select2MoreCharacter=or more character
+Select2MoreCharacters=or more characters
+Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
+Select2LoadingMoreResults=Loading more results...
+Select2SearchInProgress=Search in progress...
+SearchIntoThirdparties=Third parties
+SearchIntoContacts=Contacts
+SearchIntoMembers=Members
+SearchIntoUsers=Users
+SearchIntoProductsOrServices=Products or services
+SearchIntoProjects=Projects
+SearchIntoMO=Manufacturing Orders
+SearchIntoTasks=Tasks
+SearchIntoCustomerInvoices=Customer invoices
+SearchIntoSupplierInvoices=Vendor invoices
+SearchIntoCustomerOrders=Sales orders
+SearchIntoSupplierOrders=Purchase orders
+SearchIntoCustomerProposals=Commercial proposals
+SearchIntoSupplierProposals=Vendor proposals
+SearchIntoInterventions=Interventions
+SearchIntoContracts=Contracts
+SearchIntoCustomerShipments=Customer shipments
+SearchIntoExpenseReports=Expense reports
+SearchIntoLeaves=Leave
+SearchIntoTickets=Tickets
+CommentLink=Comments
+NbComments=Number of comments
+CommentPage=Comments space
+CommentAdded=Comment added
+CommentDeleted=Comment deleted
+Everybody=Everybody
+PayedBy=Paid by
+PayedTo=Paid to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft mass delete confirmation
+FileSharedViaALink=File shared via a link
+SelectAThirdPartyFirst=Select a third party first...
+YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
+AnalyticCode=Analytic code
+TMenuMRP=MRP
+ShowMoreInfos=Show More Infos
+NoFilesUploadedYet=Please upload a document first
+SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
+ContactDefault_agenda=Event
+ContactDefault_commande=Order
+ContactDefault_contrat=Contract
+ContactDefault_facture=Invoice
+ContactDefault_fichinter=Intervention
+ContactDefault_invoice_supplier=Supplier Invoice
+ContactDefault_order_supplier=Purchase Order
+ContactDefault_project=Project
+ContactDefault_project_task=Task
+ContactDefault_propal=Proposal
+ContactDefault_supplier_proposal=Supplier Proposal
+ContactDefault_ticket=Ticket
+ContactAddedAutomatically=Contact added from contact thirdparty roles
+More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+StatisticsOn=Statistics on
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
+Measures=Measures
+XAxis=X-Axis
+YAxis=Y-Axis
+StatusOfRefMustBe=Status of %s must be %s
+DeleteFileHeader=Confirm file delete
+DeleteFileText=Do you really want delete this file?
+ShowOtherLanguages=Show other languages
+SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
+NotUsedForThisCustomer=Not used for this customer
diff --git a/htdocs/langs/hi_IN/margins.lang b/htdocs/langs/hi_IN/margins.lang
new file mode 100644
index 00000000000..76ea8ad5c4d
--- /dev/null
+++ b/htdocs/langs/hi_IN/margins.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - marges
+
+Margin=Margin
+Margins=Margins
+TotalMargin=Total Margin
+MarginOnProducts=Margin / Products
+MarginOnServices=Margin / Services
+MarginRate=Margin rate
+MarkRate=Mark rate
+DisplayMarginRates=Display margin rates
+DisplayMarkRates=Display mark rates
+InputPrice=Input price
+margin=Profit margins management
+margesSetup=Profit margins management setup
+MarginDetails=Margin details
+ProductMargins=Product margins
+CustomerMargins=Customer margins
+SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
+UserMargins=User margins
+ProductService=Product or Service
+AllProducts=All products and services
+ChooseProduct/Service=Choose product or service
+ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
+ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
+UseDiscountAsProduct=As a product
+UseDiscountAsService=As a service
+UseDiscountOnTotal=On subtotal
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
+MargeType1=Margin on Best vendor price
+MargeType2=Margin on Weighted Average Price (WAP)
+MargeType3=Margin on Cost Price
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
+CostPrice=Cost price
+UnitCharges=Unit charges
+Charges=Charges
+AgentContactType=Commercial agent contact type
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
+CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/hi_IN/members.lang b/htdocs/langs/hi_IN/members.lang
new file mode 100644
index 00000000000..dd0a5bf49e2
--- /dev/null
+++ b/htdocs/langs/hi_IN/members.lang
@@ -0,0 +1,204 @@
+# Dolibarr language file - Source file is en_US - members
+MembersArea=Members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of terminated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Terminated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
+DateSubscription=Subscription date
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=Subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Terminated member
+MemberStatusResiliatedShort=Terminated
+MembersStatusToValid=Draft members
+MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Validated
+SubscriptionNotNeeded=No subscription needed
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+MemberTypeModified=Member type modified
+DeleteAMemberType=Delete a member type
+ConfirmDeleteMemberType=Are you sure you want to delete this member type?
+MemberTypeDeleted=Member type deleted
+MemberTypeCanNotBeDeleted=Member type can not be deleted
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome email
+SubscriptionRequired=Subscription required
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Terminate a member
+ConfirmResiliateMember=Are you sure you want to terminate this member?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions)?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public self-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public website with self-subscription form
+ForceMemberType=Force the member type
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembersModified=Latest %s modified members
+LastSubscriptionsModified=Latest %s modified subscriptions
+String=String
+Text=Text
+Int=Int
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+SubscriptionNotRecorded=Subscription not recorded
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct entry on bank account
+MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Latest member date
+LatestSubscriptionDate=Latest subscription date
+MemberNature=Nature of member
+Public=Information are public
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No VAT for subscriptions
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
+MembershipPaid=Membership paid for current period (until %s)
+YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
+XMembersClosed=%s member(s) closed
diff --git a/htdocs/langs/hi_IN/modulebuilder.lang b/htdocs/langs/hi_IN/modulebuilder.lang
new file mode 100644
index 00000000000..135ac1ae9ec
--- /dev/null
+++ b/htdocs/langs/hi_IN/modulebuilder.lang
@@ -0,0 +1,141 @@
+# Dolibarr language file - Source file is en_US - loan
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
+ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
+ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
+ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
+NewModule=New module
+NewObjectInModulebuilder=New object
+ModuleKey=Module key
+ObjectKey=Object key
+ModuleInitialized=Module initialized
+FilesForObjectInitialized=Files for new object '%s' initialized
+FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
+ModuleBuilderDescdescription=Enter here all general information that describe your module.
+ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
+ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
+ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
+ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
+ModuleBuilderDeschooks=This tab is dedicated to hooks.
+ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
+ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
+DangerZone=Danger zone
+BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
+BuildDocumentation=Build documentation
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
+DescriptionLong=Long description
+EditorName=Name of editor
+EditorUrl=URL of editor
+DescriptorFile=Descriptor file of module
+ClassFile=File for PHP DAO CRUD class
+ApiClassFile=File for PHP API class
+PageForList=PHP page for list of record
+PageForCreateEditView=PHP page to create/edit/view a record
+PageForAgendaTab=PHP page for event tab
+PageForDocumentTab=PHP page for document tab
+PageForNoteTab=PHP page for note tab
+PathToModulePackage=Path to zip of module/application package
+PathToModuleDocumentation=Path to file of module/application documentation (%s)
+SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
+FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Force update of .class and .sql files
+RegenerateMissingFiles=Generate missing files
+SpecificationFile=File of documentation
+LanguageFile=File for language
+ObjectProperties=Object Properties
+ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
+NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
+SearchAll=Used for 'search all'
+DatabaseIndex=Database index
+FileAlreadyExists=File %s already exists
+TriggersFile=File for triggers code
+HooksFile=File for hooks code
+ArrayOfKeyValues=Array of key-val
+ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
+WidgetFile=Widget file
+CSSFile=CSS file
+JSFile=Javascript file
+ReadmeFile=Readme file
+ChangeLog=ChangeLog file
+TestClassFile=File for PHP Unit Test class
+SqlFile=Sql file
+PageForLib=File for the common PHP library
+PageForObjLib=File for the PHP library dedicated to object
+SqlFileExtraFields=Sql file for complementary attributes
+SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
+AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
+UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Is a measure
+DirScanned=Directory scanned
+NoTrigger=No trigger
+NoWidget=No widget
+GoToApiExplorer=Go to API explorer
+ListOfMenusEntries=List of menu entries
+ListOfDictionariesEntries=List of dictionaries entries
+ListOfPermissionsDefined=List of defined permissions
+SeeExamples=See examples here
+EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdf=Display on PDF
+IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
+SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
+SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
+LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
+MenusDefDesc=Define here the menus provided by your module
+DictionariesDefDesc=Define here the dictionaries provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
+HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
+TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
+SeeIDsInUse=See IDs in use in your installation
+SeeReservedIDsRangeHere=See range of reserved IDs
+ToolkitForDevelopers=Toolkit for Dolibarr developers
+TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
+SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
+AddLanguageFile=Add language file
+YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
+DropTableIfEmpty=(Delete table if empty)
+TableDoesNotExists=The table %s does not exists
+TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
+UseAboutPage=Disable the about page
+UseDocFolder=Disable the documentation folder
+UseSpecificReadme=Use a specific ReadMe
+ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
+RealPathOfModule=Real path of module
+ContentCantBeEmpty=Content of file can't be empty
+WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
+CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
+JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
+CLIDesc=You can generate here some command line scripts you want to provide with your module.
+CLIFile=CLI File
+NoCLIFile=No CLI files
+UseSpecificEditorName = Use a specific editor name
+UseSpecificEditorURL = Use a specific editor URL
+UseSpecificFamily = Use a specific family
+UseSpecificAuthor = Use a specific author
+UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
+IncludeRefGeneration=The reference of object must be generated automatically
+IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
+IncludeDocGeneration=I want to generate some documents from the object
+IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
+ShowOnCombobox=Show value into combobox
+KeyForTooltip=Key for tooltip
+CSSClass=CSS Class
+NotEditable=Not editable
+ForeignKey=Foreign key
+TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/hi_IN/mrp.lang b/htdocs/langs/hi_IN/mrp.lang
new file mode 100644
index 00000000000..d3c4d3253c6
--- /dev/null
+++ b/htdocs/langs/hi_IN/mrp.lang
@@ -0,0 +1,76 @@
+Mrp=Manufacturing Orders
+MO=Manufacturing Order
+MRPDescription=Module to manage production and Manufacturing Orders (MO).
+MRPArea=MRP Area
+MrpSetupPage=Setup of module MRP
+MenuBOM=Bills of material
+LatestBOMModified=Latest %s Bills of materials modified
+LatestMOModified=Latest %s Manufacturing Orders modified
+Bom=Bills of Material
+BillOfMaterials=Bill of Material
+BOMsSetup=Setup of module BOM
+ListOfBOMs=List of bills of material - BOM
+ListOfManufacturingOrders=List of Manufacturing Orders
+NewBOM=New bill of material
+ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+BOMsNumberingModules=BOM numbering templates
+BOMsModelModule=BOM document templates
+MOsNumberingModules=MO numbering templates
+MOsModelModule=MO document templates
+FreeLegalTextOnBOMs=Free text on document of BOM
+WatermarkOnDraftBOMs=Watermark on draft BOM
+FreeLegalTextOnMOs=Free text on document of MO
+WatermarkOnDraftMOs=Watermark on draft MO
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
+ManufacturingEfficiency=Manufacturing efficiency
+ConsumptionEfficiency=Consumption efficiency
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
+DeleteBillOfMaterials=Delete Bill Of Materials
+DeleteMo=Delete Manufacturing Order
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+MenuMRP=Manufacturing Orders
+NewMO=New Manufacturing Order
+QtyToProduce=Qty to produce
+DateStartPlannedMo=Date start planned
+DateEndPlannedMo=Date end planned
+KeepEmptyForAsap=Empty means 'As Soon As Possible'
+EstimatedDuration=Estimated duration
+EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
+ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
+ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
+StatusMOProduced=Produced
+QtyFrozen=Frozen Qty
+QuantityFrozen=Frozen Quantity
+QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
+DisableStockChange=Stock change disabled
+DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
+BomAndBomLines=Bills Of Material and lines
+BOMLine=Line of BOM
+WarehouseForProduction=Warehouse for production
+CreateMO=Create MO
+ToConsume=To consume
+ToProduce=To produce
+QtyAlreadyConsumed=Qty already consumed
+QtyAlreadyProduced=Qty already produced
+QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
+ConsumeOrProduce=Consume or Produce
+ConsumeAndProduceAll=Consume and Produce All
+Manufactured=Manufactured
+TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
+ForAQuantityOf=For a quantity to produce of %s
+ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
+ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
+ProductionForRef=Production of %s
+AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
+NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
+AddNewConsumeLines=Add new line to consume
+ProductsToConsume=Products to consume
+ProductsToProduce=Products to produce
+UnitCost=Unit cost
+TotalCost=Total cost
diff --git a/htdocs/langs/hi_IN/multicurrency.lang b/htdocs/langs/hi_IN/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/hi_IN/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/hi_IN/oauth.lang b/htdocs/langs/hi_IN/oauth.lang
new file mode 100644
index 00000000000..075ff49a895
--- /dev/null
+++ b/htdocs/langs/hi_IN/oauth.lang
@@ -0,0 +1,32 @@
+# Dolibarr language file - Source file is en_US - oauth
+ConfigOAuth=OAuth Configuration
+OAuthServices=OAuth Services
+ManualTokenGeneration=Manual token generation
+TokenManager=Token Manager
+IsTokenGenerated=Is token generated ?
+NoAccessToken=No access token saved into local database
+HasAccessToken=A token was generated and saved into local database
+NewTokenStored=Token received and saved
+ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
+TokenDeleted=Token deleted
+RequestAccess=Click here to request/renew access and receive a new token to save
+DeleteAccess=Click here to delete token
+UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
+ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
+OAuthSetupForLogin=Page to generate an OAuth token
+SeePreviousTab=See previous tab
+OAuthIDSecret=OAuth ID and Secret
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=OAuth Google service
+OAUTH_GOOGLE_ID=OAuth Google Id
+OAUTH_GOOGLE_SECRET=OAuth Google Secret
+OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create OAuth credentials
+OAUTH_GITHUB_NAME=OAuth GitHub service
+OAUTH_GITHUB_ID=OAuth GitHub Id
+OAUTH_GITHUB_SECRET=OAuth GitHub Secret
+OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create OAuth credentials
+OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
+OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/hi_IN/opensurvey.lang b/htdocs/langs/hi_IN/opensurvey.lang
new file mode 100644
index 00000000000..7d26151fa16
--- /dev/null
+++ b/htdocs/langs/hi_IN/opensurvey.lang
@@ -0,0 +1,61 @@
+# Dolibarr language file - Source file is en_US - opensurvey
+Survey=Poll
+Surveys=Polls
+OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select the type of poll...
+NewSurvey=New poll
+OpenSurveyArea=Polls area
+AddACommentForPoll=You can add a comment into poll...
+AddComment=Add comment
+CreatePoll=Create poll
+PollTitle=Poll title
+ToReceiveEMailForEachVote=Receive an email for each vote
+TypeDate=Type date
+TypeClassic=Type standard
+OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
+RemoveAllDays=Remove all days
+CopyHoursOfFirstDay=Copy hours of first day
+RemoveAllHours=Remove all hours
+SelectedDays=Selected days
+TheBestChoice=The best choice currently is
+TheBestChoices=The best choices currently are
+with=with
+OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
+CommentsOfVoters=Comments of voters
+ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
+RemovePoll=Remove poll
+UrlForSurvey=URL to communicate to get a direct access to poll
+PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
+CreateSurveyDate=Create a date poll
+CreateSurveyStandard=Create a standard poll
+CheckBox=Simple checkbox
+YesNoList=List (empty/yes/no)
+PourContreList=List (empty/for/against)
+AddNewColumn=Add new column
+TitleChoice=Choice label
+ExportSpreadsheet=Export result spreadsheet
+ExpireDate=Limit date
+NbOfSurveys=Number of polls
+NbOfVoters=No. of voters
+SurveyResults=Results
+PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
+5MoreChoices=5 more choices
+Against=Against
+YouAreInivitedToVote=You are invited to vote for this poll
+VoteNameAlreadyExists=This name was already used for this poll
+AddADate=Add a date
+AddStartHour=Add start hour
+AddEndHour=Add end hour
+votes=vote(s)
+NoCommentYet=No comments have been posted for this poll yet
+CanComment=Voters can comment in the poll
+CanSeeOthersVote=Voters can see other people's vote
+SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
+BackToCurrentMonth=Back to current month
+ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
+ErrorOpenSurveyOneChoice=Enter at least one choice
+ErrorInsertingComment=There was an error while inserting your comment
+MoreChoices=Enter more choices for the voters
+SurveyExpiredInfo=The poll has been closed or voting delay has expired.
+EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
+ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/hi_IN/orders.lang b/htdocs/langs/hi_IN/orders.lang
new file mode 100644
index 00000000000..ad91e1eef63
--- /dev/null
+++ b/htdocs/langs/hi_IN/orders.lang
@@ -0,0 +1,189 @@
+# Dolibarr language file - Source file is en_US - orders
+OrdersArea=Customers orders area
+SuppliersOrdersArea=Purchase orders area
+OrderCard=Order card
+OrderId=Order Id
+Order=Order
+PdfOrderTitle=Order
+Orders=Orders
+OrderLine=Order line
+OrderDate=Order date
+OrderDateShort=Order date
+OrderToProcess=Order to process
+NewOrder=New order
+NewOrderSupplier=New Purchase Order
+ToOrder=Make order
+MakeOrder=Make order
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Sales Order
+CustomersOrders=Sales Orders
+CustomersOrdersRunning=Current sales orders
+CustomersOrdersAndOrdersLines=Sales orders and order details
+OrdersDeliveredToBill=Sales orders delivered to bill
+OrdersToBill=Sales orders delivered
+OrdersInProcess=Sales orders in process
+OrdersToProcess=Sales orders to process
+SuppliersOrdersToProcess=Purchase orders to process
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
+StatusOrderCanceledShort=Canceled
+StatusOrderDraftShort=Draft
+StatusOrderValidatedShort=Validated
+StatusOrderSentShort=In process
+StatusOrderSent=Shipment in process
+StatusOrderOnProcessShort=Ordered
+StatusOrderProcessedShort=Processed
+StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
+StatusOrderToBillShort=Delivered
+StatusOrderApprovedShort=Approved
+StatusOrderRefusedShort=Refused
+StatusOrderToProcessShort=To process
+StatusOrderReceivedPartiallyShort=Partially received
+StatusOrderReceivedAllShort=Products received
+StatusOrderCanceled=Canceled
+StatusOrderDraft=Draft (needs to be validated)
+StatusOrderValidated=Validated
+StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderProcessed=Processed
+StatusOrderToBill=Delivered
+StatusOrderApproved=Approved
+StatusOrderRefused=Refused
+StatusOrderReceivedPartially=Partially received
+StatusOrderReceivedAll=All products received
+ShippingExist=A shipment exists
+QtyOrdered=Qty ordered
+ProductQtyInDraft=Product quantity into draft orders
+ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
+MenuOrdersToBill=Orders delivered
+MenuOrdersToBill2=Billable orders
+ShipProduct=Ship product
+CreateOrder=Create Order
+RefuseOrder=Refuse order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
+ValidateOrder=Validate order
+UnvalidateOrder=Unvalidate order
+DeleteOrder=Delete order
+CancelOrder=Cancel order
+OrderReopened= Order %s re-open
+AddOrder=Create order
+AddPurchaseOrder=Create purchase order
+AddToDraftOrders=Add to draft order
+ShowOrder=Show order
+OrdersOpened=Orders to process
+NoDraftOrders=No draft orders
+NoOrder=No order
+NoSupplierOrder=No purchase order
+LastOrders=Latest %s sales orders
+LastCustomerOrders=Latest %s sales orders
+LastSupplierOrders=Latest %s purchase orders
+LastModifiedOrders=Latest %s modified orders
+AllOrders=All orders
+NbOfOrders=Number of orders
+OrdersStatistics=Order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
+NumberOfOrdersByMonth=Number of orders by month
+AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
+ListOfOrders=List of orders
+CloseOrder=Close order
+ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
+ConfirmDeleteOrder=Are you sure you want to delete this order?
+ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b>?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status?
+ConfirmCancelOrder=Are you sure you want to cancel this order?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
+GenerateBill=Generate invoice
+ClassifyShipped=Classify delivered
+DraftOrders=Draft orders
+DraftSuppliersOrders=Draft purchase orders
+OnProcessOrders=In process orders
+RefOrder=Ref. order
+RefCustomerOrder=Ref. order for customer
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
+SendOrderByMail=Send order by mail
+ActionsOnOrder=Events on order
+NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
+OrderMode=Order method
+AuthorRequest=Request author
+UserWithApproveOrderGrant=Users granted with "approve orders" permission.
+PaymentOrderRef=Payment of order %s
+ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
+DispatchSupplierOrder=Receiving purchase order %s
+FirstApprovalAlreadyDone=First approval already done
+SecondApprovalAlreadyDone=Second approval already done
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
+OtherOrders=Other orders
+##### Types de contacts #####
+TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
+TypeContact_commande_internal_SHIPPING=Representative following-up shipping
+TypeContact_commande_external_BILLING=Customer invoice contact
+TypeContact_commande_external_SHIPPING=Customer shipping contact
+TypeContact_commande_external_CUSTOMER=Customer contact following-up order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
+TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
+Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
+Error_OrderNotChecked=No orders to invoice selected
+# Order modes (how we receive order). Not the "why" are keys stored into dict.lang
+OrderByMail=Mail
+OrderByFax=Fax
+OrderByEMail=Email
+OrderByWWW=Online
+OrderByPhone=Phone
+# Documents models
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
+PDFEratostheneDescription=A complete order model
+PDFEdisonDescription=A simple order model
+PDFProformaDescription=A complete Proforma invoice template
+CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
+IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
+SetShippingMode=Set shipping mode
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Canceled
+StatusSupplierOrderDraftShort=Draft
+StatusSupplierOrderValidatedShort=Validated
+StatusSupplierOrderSentShort=In process
+StatusSupplierOrderSent=Shipment in process
+StatusSupplierOrderOnProcessShort=Ordered
+StatusSupplierOrderProcessedShort=Processed
+StatusSupplierOrderDelivered=Delivered
+StatusSupplierOrderDeliveredShort=Delivered
+StatusSupplierOrderToBillShort=Delivered
+StatusSupplierOrderApprovedShort=Approved
+StatusSupplierOrderRefusedShort=Refused
+StatusSupplierOrderToProcessShort=To process
+StatusSupplierOrderReceivedPartiallyShort=Partially received
+StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderCanceled=Canceled
+StatusSupplierOrderDraft=Draft (needs to be validated)
+StatusSupplierOrderValidated=Validated
+StatusSupplierOrderOnProcess=Ordered - Standby reception
+StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusSupplierOrderProcessed=Processed
+StatusSupplierOrderToBill=Delivered
+StatusSupplierOrderApproved=Approved
+StatusSupplierOrderRefused=Refused
+StatusSupplierOrderReceivedPartially=Partially received
+StatusSupplierOrderReceivedAll=All products received
diff --git a/htdocs/langs/hi_IN/other.lang b/htdocs/langs/hi_IN/other.lang
new file mode 100644
index 00000000000..ba85f51e739
--- /dev/null
+++ b/htdocs/langs/hi_IN/other.lang
@@ -0,0 +1,286 @@
+# Dolibarr language file - Source file is en_US - other
+SecurityCode=Security code
+NumberingShort=N°
+Tools=Tools
+TMenuTools=Tools
+ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
+Birthday=Birthday
+BirthdayDate=Birthday date
+DateToBirth=Birth date
+BirthdayAlertOn=birthday alert active
+BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (text) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+DocFileGeneratedInto=Doc file generated into <b>%s</b>.
+JumpToLogin=Disconnected. Go to login page...
+MessageForm=Message on online payment form
+MessageOK=Message on the return page for a validated payment
+MessageKO=Message on the return page for a canceled payment
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursively
+PoweredBy=Powered by
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+DateNextInvoiceBeforeGen=Date of next invoice (before generation)
+DateNextInvoiceAfterGen=Date of next invoice (after generation)
+GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
+OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Only the first selected field has been selected.
+AtLeastOneMeasureIsRequired=At least 1 field for measure is required
+AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
+LatestBlogPosts=Latest Blog Posts
+Notify_ORDER_VALIDATE=Sales order validated
+Notify_ORDER_SENTBYMAIL=Sales order sent by mail
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
+Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
+Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
+Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
+Notify_PROPAL_VALIDATE=Customer proposal validated
+Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
+Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
+Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
+Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
+Notify_WITHDRAW_CREDIT=Credit withdrawal
+Notify_WITHDRAW_EMIT=Perform withdrawal
+Notify_COMPANY_CREATE=Third party created
+Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_BILL_VALIDATE=Customer invoice validated
+Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_BILL_PAYED=Customer invoice paid
+Notify_BILL_CANCEL=Customer invoice canceled
+Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
+Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
+Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
+Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
+Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
+Notify_CONTRACT_VALIDATE=Contract validated
+Notify_FICHINTER_VALIDATE=Intervention validated
+Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
+Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
+Notify_SHIPPING_VALIDATE=Shipping validated
+Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail
+Notify_MEMBER_VALIDATE=Member validated
+Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_SUBSCRIPTION=Member subscribed
+Notify_MEMBER_RESILIATE=Member terminated
+Notify_MEMBER_DELETE=Member deleted
+Notify_PROJECT_CREATE=Project creation
+Notify_TASK_CREATE=Task created
+Notify_TASK_MODIFY=Task modified
+Notify_TASK_DELETE=Task deleted
+Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
+Notify_EXPENSE_REPORT_APPROVE=Expense report approved
+Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
+Notify_HOLIDAY_APPROVE=Leave request approved
+SeeModuleSetup=See setup of module %s
+NbOfAttachedFiles=Number of attached files/documents
+TotalSizeOfAttachedFiles=Total size of attached files/documents
+MaxSize=Maximum size
+AttachANewFile=Attach a new file/document
+LinkedObject=Linked object
+NbOfActiveNotifications=Number of notifications (no. of recipient emails)
+PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to remind you that the invoice  __REF__ seems to have not been paid. A copy of the invoice is attached as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find commercial proposal __REF__ attached \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price request __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
+ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
+DemoFundation=Manage members of a foundation
+DemoFundation2=Manage members and bank account of a foundation
+DemoCompanyServiceOnly=Company or freelance selling service only
+DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
+DemoCompanyAll=Company with multiple activities (all main modules)
+CreatedBy=Created by %s
+ModifiedBy=Modified by %s
+ValidatedBy=Validated by %s
+ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made latest change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made latest change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
+FileWasRemoved=File %s was removed
+DirWasRemoved=Directory %s was removed
+FeatureNotYetAvailable=Feature not yet available in the current version
+FeaturesSupported=Supported features
+Width=Width
+Height=Height
+Depth=Depth
+Top=Top
+Bottom=Bottom
+Left=Left
+Right=Right
+CalculatedWeight=Calculated weight
+CalculatedVolume=Calculated volume
+Weight=Weight
+WeightUnitton=tonne
+WeightUnitkg=kg
+WeightUnitg=g
+WeightUnitmg=mg
+WeightUnitpound=pound
+WeightUnitounce=ounce
+Length=Length
+LengthUnitm=m
+LengthUnitdm=dm
+LengthUnitcm=cm
+LengthUnitmm=mm
+Surface=Area
+SurfaceUnitm2=m²
+SurfaceUnitdm2=dm²
+SurfaceUnitcm2=cm²
+SurfaceUnitmm2=mm²
+SurfaceUnitfoot2=ft²
+SurfaceUnitinch2=in²
+Volume=Volume
+VolumeUnitm3=m³
+VolumeUnitdm3=dm³ (L)
+VolumeUnitcm3=cm³ (ml)
+VolumeUnitmm3=mm³ (µl)
+VolumeUnitfoot3=ft³
+VolumeUnitinch3=in³
+VolumeUnitounce=ounce
+VolumeUnitlitre=litre
+VolumeUnitgallon=gallon
+SizeUnitm=m
+SizeUnitdm=dm
+SizeUnitcm=cm
+SizeUnitmm=mm
+SizeUnitinch=inch
+SizeUnitfoot=foot
+SizeUnitpoint=point
+BugTracker=Bug tracker
+SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
+BackToLoginPage=Back to login page
+AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
+EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
+ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
+DolibarrDemo=Dolibarr ERP/CRM demo
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of sales orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of vendor proposals
+NumberOfSupplierOrders=Number of purchase orders
+NumberOfSupplierInvoices=Number of vendor invoices
+NumberOfContracts=Number of contracts
+NumberOfMos=Number of manufacturing orders
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on sales orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on vendor proposals
+NumberOfUnitsSupplierOrders=Number of units on purchase orders
+NumberOfUnitsSupplierInvoices=Number of units on vendor invoices
+NumberOfUnitsContracts=Number of units on contracts
+NumberOfUnitsMos=Number of units to produce in manufacturing orders
+EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
+EMailTextInterventionValidated=The intervention %s has been validated.
+EMailTextInvoiceValidated=Invoice %s has been validated.
+EMailTextInvoicePayed=Invoice %s has been paid.
+EMailTextProposalValidated=Proposal %s has been validated.
+EMailTextProposalClosedSigned=Proposal %s has been closed signed.
+EMailTextOrderValidated=Order %s has been validated.
+EMailTextOrderApproved=Order %s has been approved.
+EMailTextOrderValidatedBy=Order %s has been recorded by %s.
+EMailTextOrderApprovedBy=Order %s has been approved by %s.
+EMailTextOrderRefused=Order %s has been refused.
+EMailTextOrderRefusedBy=Order %s has been refused by %s.
+EMailTextExpeditionValidated=Shipping %s has been validated.
+EMailTextExpenseReportValidated=Expense report %s has been validated.
+EMailTextExpenseReportApproved=Expense report %s has been approved.
+EMailTextHolidayValidated=Leave request %s has been validated.
+EMailTextHolidayApproved=Leave request %s has been approved.
+ImportedWithSet=Importation data set
+DolibarrNotification=Automatic notification
+ResizeDesc=Enter new width <b>OR</b> new height. Ratio will be kept during resizing...
+NewLength=New width
+NewHeight=New height
+NewSizeAfterCropping=New size after cropping
+DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner)
+CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
+ImageEditor=Image editor
+YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s.
+YouReceiveMailBecauseOfNotification2=This event is the following:
+ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start".
+UseAdvancedPerms=Use the advanced permissions of some modules
+FileFormat=File format
+SelectAColor=Choose a color
+AddFiles=Add Files
+StartUpload=Start upload
+CancelUpload=Cancel upload
+FileIsTooBig=Files is too big
+PleaseBePatient=Please be patient...
+NewPassword=New password
+ResetPassword=Reset password
+RequestToResetPasswordReceived=A request to change your password has been received.
+NewKeyIs=This is your new keys to login
+NewKeyWillBe=Your new key to login to software will be
+ClickHereToGoTo=Click here to go to %s
+YouMustClickToChange=You must however first click on the following link to validate this password change
+ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
+Chart=Chart
+PassEncoding=Password encoding
+PermissionsAdd=Permissions added
+PermissionsDelete=Permissions removed
+YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+YourPasswordHasBeenReset=Your password has been reset successfully
+ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+MissingIds=Missing ids
+ThirdPartyCreatedByEmailCollector=Third party created by email collector from email MSGID %s
+ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s
+ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
+TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
+OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+
+##### Export #####
+ExportsArea=Exports area
+AvailableFormats=Available formats
+LibraryUsed=Library used
+LibraryVersion=Library version
+ExportableDatas=Exportable data
+NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
+##### External sites #####
+WebsiteSetup=Setup of module website
+WEBSITE_PAGEURL=URL of page
+WEBSITE_TITLE=Title
+WEBSITE_DESCRIPTION=Description
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
+WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
+
+MemoryUsage=Memory usage
+RequestDuration=Duration of request
+PopuProp=Products/Services by popularity in Proposals
+PopuCom=Products/Services by popularity in Orders
+ProductStatistics=Products/Services Statistics
+NbOfQtyInOrders=Qty in orders
diff --git a/htdocs/langs/hi_IN/paybox.lang b/htdocs/langs/hi_IN/paybox.lang
new file mode 100644
index 00000000000..1bbbef4017b
--- /dev/null
+++ b/htdocs/langs/hi_IN/paybox.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - paybox
+PayBoxSetup=PayBox module setup
+PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+Creditor=Creditor
+PaymentCode=Payment code
+PayBoxDoPayment=Pay with Paybox
+YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
+Continue=Next
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
+YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/hi_IN/paypal.lang b/htdocs/langs/hi_IN/paypal.lang
new file mode 100644
index 00000000000..5eb5f389445
--- /dev/null
+++ b/htdocs/langs/hi_IN/paypal.lang
@@ -0,0 +1,36 @@
+# Dolibarr language file - Source file is en_US - paypal
+PaypalSetup=PayPal module setup
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
+PAYPAL_API_SANDBOX=Mode test/sandbox
+PAYPAL_API_USER=API username
+PAYPAL_API_PASSWORD=API password
+PAYPAL_API_SIGNATURE=API signature
+PAYPAL_SSLVERSION=Curl SSL Version
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
+PaypalModeIntegral=Integral
+PaypalModeOnlyPaypal=PayPal only
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
+ThisIsTransactionId=This is id of transaction: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
+NewOnlinePaymentReceived=New online payment received
+NewOnlinePaymentFailed=New online payment tried but failed
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
+ReturnURLAfterPayment=Return URL after payment
+ValidationOfOnlinePaymentFailed=Validation of online payment failed
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
+DetailedErrorMessage=Detailed Error Message
+ShortErrorMessage=Short Error Message
+ErrorCode=Error Code
+ErrorSeverityCode=Error Severity Code
+OnlinePaymentSystem=Online payment system
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/hi_IN/printing.lang b/htdocs/langs/hi_IN/printing.lang
new file mode 100644
index 00000000000..16494583550
--- /dev/null
+++ b/htdocs/langs/hi_IN/printing.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - printing
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
+PrintingSetup=Setup of Direct Printing System
+PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer without needing to open the document in another application.
+MenuDirectPrinting=Direct Printing jobs
+DirectPrint=Direct print
+PrintingDriverDesc=Configuration variables for printing driver.
+ListDrivers=List of drivers
+PrintTestDesc=List of Printers.
+FileWasSentToPrinter=File %s was sent to printer
+ViaModule=via the module
+NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
+PleaseSelectaDriverfromList=Please select a driver from list.
+PleaseConfigureDriverfromList=Please configure the selected driver from list.
+SetupDriver=Driver setup
+TargetedPrinter=Targeted printer
+UserConf=Setup per user
+PRINTGCP_INFO=Google OAuth API setup
+PRINTGCP_AUTHLINK=Authentication
+PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
+PrintGCPDesc=This driver allows sending documents directly to a printer using Google Cloud Print.
+GCP_Name=Name
+GCP_displayName=Display Name
+GCP_Id=Printer Id
+GCP_OwnerName=Owner Name
+GCP_State=Printer State
+GCP_connectionStatus=Online State
+GCP_Type=Printer Type
+PrintIPPDesc=This driver allows sending of documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+IPP_Uri=Printer Uri
+IPP_Name=Printer Name
+IPP_State=Printer State
+IPP_State_reason=State reason
+IPP_State_reason1=State reason1
+IPP_BW=BW
+IPP_Color=Color
+IPP_Device=Device
+IPP_Media=Printer media
+IPP_Supported=Type of media
+DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
+GoogleAuthNotConfigured=Google OAuth has not been setup. Enable module OAuth and set a Google ID/Secret.
+GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
+PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
+PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
+PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+PrintTestDescprintipp=List of Printers for Cups.
diff --git a/htdocs/langs/hi_IN/productbatch.lang b/htdocs/langs/hi_IN/productbatch.lang
new file mode 100644
index 00000000000..54270c4a23b
--- /dev/null
+++ b/htdocs/langs/hi_IN/productbatch.lang
@@ -0,0 +1,24 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Use lot/serial number
+ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusNotOnBatch=No (lot/serial not used)
+ProductStatusOnBatchShort=Yes
+ProductStatusNotOnBatchShort=No
+Batch=Lot/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
+batch_number=Lot/Serial number
+BatchNumberShort=Lot/Serial
+EatByDate=Eat-by date
+SellByDate=Sell-by date
+DetailBatchNumber=Lot/Serial details
+printBatch=Lot/Serial: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
+StockDetailPerBatch=Stock detail per lot
diff --git a/htdocs/langs/hi_IN/products.lang b/htdocs/langs/hi_IN/products.lang
new file mode 100644
index 00000000000..a31243a07b6
--- /dev/null
+++ b/htdocs/langs/hi_IN/products.lang
@@ -0,0 +1,385 @@
+# Dolibarr language file - Source file is en_US - products
+ProductRef=Product ref.
+ProductLabel=Product label
+ProductLabelTranslated=Translated product label
+ProductDescription=Product description
+ProductDescriptionTranslated=Translated product description
+ProductNoteTranslated=Translated product note
+ProductServiceCard=Products/Services card
+TMenuProducts=Products
+TMenuServices=Services
+Products=Products
+Services=Services
+Product=Product
+Service=Service
+ProductId=Product/service id
+Create=Create
+Reference=Reference
+NewProduct=New product
+NewService=New service
+ProductVatMassChange=Global VAT Update
+ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
+MassBarcodeInit=Mass barcode init
+MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
+ProductAccountancyBuyCode=Accounting code (purchase)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
+ProductAccountancySellCode=Accounting code (sale)
+ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
+ProductAccountancySellExportCode=Accounting code (sale export)
+ProductOrService=Product or Service
+ProductsAndServices=Products and Services
+ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
+ProductsOnSale=Products for sale
+ProductsOnPurchase=Products for purchase
+ProductsOnSaleOnly=Products for sale only
+ProductsOnPurchaseOnly=Products for purchase only
+ProductsNotOnSell=Products not for sale and not for purchase
+ProductsOnSellAndOnBuy=Products for sale and for purchase
+ServicesOnSale=Services for sale
+ServicesOnPurchase=Services for purchase
+ServicesOnSaleOnly=Services for sale only
+ServicesOnPurchaseOnly=Services for purchase only
+ServicesNotOnSell=Services not for sale and not for purchase
+ServicesOnSellAndOnBuy=Services for sale and for purchase
+LastModifiedProductsAndServices=Last %s modified products/services
+LastRecordedProducts=Latest %s recorded products
+LastRecordedServices=Latest %s recorded services
+CardProduct0=Product
+CardProduct1=Service
+Stock=Stock
+MenuStocks=Stocks
+Stocks=Stocks and location (warehouse) of products
+Movements=Movements
+Sell=Sell
+Buy=Purchase
+OnSell=For sale
+OnBuy=For purchase
+NotOnSell=Not for sale
+ProductStatusOnSell=For sale
+ProductStatusNotOnSell=Not for sale
+ProductStatusOnSellShort=For sale
+ProductStatusNotOnSellShort=Not for sale
+ProductStatusOnBuy=For purchase
+ProductStatusNotOnBuy=Not for purchase
+ProductStatusOnBuyShort=For purchase
+ProductStatusNotOnBuyShort=Not for purchase
+UpdateVAT=Update vat
+UpdateDefaultPrice=Update default price
+UpdateLevelPrices=Update prices for each level
+AppliedPricesFrom=Applied from
+SellingPrice=Selling price
+SellingPriceHT=Selling price (excl. tax)
+SellingPriceTTC=Selling price (inc. tax)
+SellingMinPriceTTC=Minimum Selling price (inc. tax)
+CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceUsage=This value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
+NewPrice=New price
+MinPrice=Min. sell price
+EditSellingPriceLabel=Edit selling price label
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
+ContractStatusClosed=Closed
+ErrorProductAlreadyExists=A product with reference %s already exists.
+ErrorProductBadRefOrLabel=Wrong value for reference or label.
+ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
+Suppliers=Vendors
+SupplierRef=Vendor SKU
+ShowProduct=Show product
+ShowService=Show service
+ProductsAndServicesArea=Product and Services area
+ProductsArea=Product area
+ServicesArea=Services area
+ListOfStockMovements=List of stock movements
+BuyingPrice=Buying price
+PriceForEachProduct=Products with specific prices
+SupplierCard=Vendor card
+PriceRemoved=Price removed
+BarCode=Barcode
+BarcodeType=Barcode type
+SetDefaultBarcodeType=Set barcode type
+BarcodeValue=Barcode value
+NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
+ServiceLimitedDuration=If product is a service with limited duration:
+MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
+MultiPricesNumPrices=Number of prices
+AssociatedProductsAbility=Activate virtual products (kits)
+AssociatedProducts=Virtual products
+AssociatedProductsNumber=Number of products composing this virtual product
+ParentProductsNumber=Number of parent packaging product
+ParentProducts=Parent products
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+KeywordFilter=Keyword filter
+CategoryFilter=Category filter
+ProductToAddSearch=Search product to add
+NoMatchFound=No match found
+ListOfProductsServices=List of products/services
+ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
+ProductParentList=List of virtual products/services with this product as a component
+ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
+DeleteProduct=Delete a product/service
+ConfirmDeleteProduct=Are you sure you want to delete this product/service?
+ProductDeleted=Product/Service "%s" deleted from database.
+ExportDataset_produit_1=Products
+ExportDataset_service_1=Services
+ImportDataset_produit_1=Products
+ImportDataset_service_1=Services
+DeleteProductLine=Delete product line
+ConfirmDeleteProductLine=Are you sure you want to delete this product line?
+ProductSpecial=Special
+QtyMin=Min. purchase quantity
+PriceQtyMin=Price quantity min.
+PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
+VATRateForSupplierProduct=VAT Rate (for this vendor/product)
+DiscountQtyMin=Discount for this qty.
+NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
+NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedProductsToSell=Predefined Product
+PredefinedServicesToSell=Predefined Service
+PredefinedProductsAndServicesToSell=Predefined products/services to sell
+PredefinedProductsToPurchase=Predefined product to purchase
+PredefinedServicesToPurchase=Predefined services to purchase
+PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
+NotPredefinedProducts=Not predefined products/services
+GenerateThumb=Generate thumb
+ServiceNb=Service #%s
+ListProductServiceByPopularity=List of products/services by popularity
+ListProductByPopularity=List of products by popularity
+ListServiceByPopularity=List of services by popularity
+Finished=Manufactured product
+RowMaterial=Raw Material
+ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
+CloneContentProduct=Clone all main information of product/service
+ClonePricesProduct=Clone prices
+CloneCategoriesProduct=Clone tags/categories linked
+CloneCompositionProduct=Clone virtual product/service
+CloneCombinationsProduct=Clone product variants
+ProductIsUsed=This product is used
+NewRefForClone=Ref. of new product/service
+SellingPrices=Selling prices
+BuyingPrices=Buying prices
+CustomerPrices=Customer prices
+SuppliersPrices=Vendor prices
+SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
+CustomCode=Customs / Commodity / HS code
+CountryOrigin=Origin country
+Nature=Nature of product (material/finished)
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+lm=lm
+m2=m²
+m3=m³
+liter=liter
+l=L
+unitP=Piece
+unitSET=Set
+unitS=Second
+unitH=Hour
+unitD=Day
+unitG=Gram
+unitM=Meter
+unitLM=Linear meter
+unitM2=Square meter
+unitM3=Cubic meter
+unitL=Liter
+unitT=ton
+unitKG=kg
+unitG=Gram
+unitMG=mg
+unitLB=pound
+unitOZ=ounce
+unitM=Meter
+unitDM=dm
+unitCM=cm
+unitMM=mm
+unitFT=ft
+unitIN=in
+unitM2=Square meter
+unitDM2=dm²
+unitCM2=cm²
+unitMM2=mm²
+unitFT2=ft²
+unitIN2=in²
+unitM3=Cubic meter
+unitDM3=dm³
+unitCM3=cm³
+unitMM3=mm³
+unitFT3=ft³
+unitIN3=in³
+unitOZ3=ounce
+unitgallon=gallon
+ProductCodeModel=Product ref template
+ServiceCodeModel=Service ref template
+CurrentProductPrice=Current price
+AlwaysUseNewPrice=Always use current price of product/service
+AlwaysUseFixedPrice=Use the fixed price
+PriceByQuantity=Different prices by quantity
+DisablePriceByQty=Disable prices by quantity
+PriceByQuantityRange=Quantity range
+MultipriceRules=Price segment rules
+UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
+PercentVariationOver=%% variation over %s
+PercentDiscountOver=%% discount over %s
+KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
+VariantRefExample=Examples: COL, SIZE
+VariantLabelExample=Examples: Color, Size
+### composition fabrication
+Build=Produce
+ProductsMultiPrice=Products and prices for each price segment
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
+ProductSellByQuarterHT=Products turnover quarterly before tax
+ServiceSellByQuarterHT=Services turnover quarterly before tax
+Quarter1=1st. Quarter
+Quarter2=2nd. Quarter
+Quarter3=3rd. Quarter
+Quarter4=4th. Quarter
+BarCodePrintsheet=Print barcode
+PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
+NumberOfStickers=Number of stickers to print on page
+PrintsheetForOneBarCode=Print several stickers for one barcode
+BuildPageToPrint=Generate page to print
+FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
+FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
+DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
+BarCodeDataForProduct=Barcode information of product %s:
+BarCodeDataForThirdparty=Barcode information of third party %s:
+ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
+PriceByCustomer=Different prices for each customer
+PriceCatalogue=A single sell price per product/service
+PricingRule=Rules for selling prices
+AddCustomerPrice=Add price by customer
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+PriceByCustomerLog=Log of previous customer prices
+MinimumPriceLimit=Minimum price can't be lower then %s
+MinimumRecommendedPrice=Minimum recommended price is: %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
+PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=Available global values:
+PriceMode=Price mode
+PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Child products
+MinSupplierPrice=Minimum buying price
+MinCustomerPrice=Minimum selling price
+DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
+AddVariable=Add Variable
+AddUpdater=Add Updater
+GlobalVariables=Global variables
+VariableToUpdate=Variable to update
+GlobalVariableUpdaters=External updaters for variables
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Latest update
+CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product/service with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
+WarningSelectOneDocument=Please select at least one document
+DefaultUnitToShow=Unit
+NbOfQtyInProposals=Qty in proposals
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+ProductsOrServicesTranslations=Products/Services translations
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+WidthUnits=Width unit
+LengthUnits=Length unit
+HeightUnits=Height unit
+SurfaceUnits=Surface unit
+SizeUnits=Size unit
+DeleteProductBuyPrice=Delete buying price
+ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
+ProductSheet=Product sheet
+ServiceSheet=Service sheet
+PossibleValues=Possible values
+GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
+ProductSupplierDescription=Vendor description for the product
+UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
+PackagingForThisProduct=Packaging
+QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+
+#Attributes
+VariantAttributes=Variant attributes
+ProductAttributes=Variant attributes for products
+ProductAttributeName=Variant attribute %s
+ProductAttribute=Variant attribute
+ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
+ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
+ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
+ProductCombinations=Variants
+PropagateVariant=Propagate variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+NewProductCombinations=New variants
+EditProductCombinations=Editing variants
+SelectCombination=Select combination
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+NewProductAttributeValue=New attribute value
+ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
+ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
+TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
+DoNotRemovePreviousCombinations=Do not remove previous variants
+UsePercentageVariations=Use percentage variations
+PercentageVariation=Percentage variation
+ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
+NbOfDifferentValues=No. of different values
+NbProducts=Number of products
+ParentProduct=Parent product
+HideChildProducts=Hide variant products
+ShowChildProducts=Show variant products
+NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
+ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
+CloneDestinationReference=Destination product reference
+ErrorCopyProductCombinations=There was an error while copying the product variants
+ErrorDestinationProductNotFound=Destination product not found
+ErrorProductCombinationNotFound=Product variant not found
+ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
+ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
+DeleteLinkedProduct=Delete the child product linked to the combination
diff --git a/htdocs/langs/hi_IN/projects.lang b/htdocs/langs/hi_IN/projects.lang
new file mode 100644
index 00000000000..bb42bff3c87
--- /dev/null
+++ b/htdocs/langs/hi_IN/projects.lang
@@ -0,0 +1,267 @@
+# Dolibarr language file - Source file is en_US - projects
+RefProject=Ref. project
+ProjectRef=Project ref.
+ProjectId=Project Id
+ProjectLabel=Project label
+ProjectsArea=Projects Area
+ProjectStatus=Project status
+SharedProject=Everybody
+PrivateProject=Project contacts
+ProjectsImContactFor=Projects for I am explicitly a contact
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=All projects
+MyProjectsDesc=This view is limited to projects you are a contact for
+ProjectsPublicDesc=This view presents all projects you are allowed to read.
+TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
+TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
+ClosedProjectsAreHidden=Closed projects are not visible.
+TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
+TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
+NewProject=New project
+AddProject=Create project
+DeleteAProject=Delete a project
+DeleteATask=Delete a task
+ConfirmDeleteAProject=Are you sure you want to delete this project?
+ConfirmDeleteATask=Are you sure you want to delete this task?
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
+OpportunitiesStatusForProjects=Leads amount of projects by status
+ShowProject=Show project
+ShowTask=Show task
+SetProject=Set project
+NoProject=No project defined or owned
+NbOfProjects=Number of projects
+NbOfTasks=Number of tasks
+TimeSpent=Time spent
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
+TimesSpent=Time spent
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
+TaskTimeSpent=Time spent on tasks
+TaskTimeUser=User
+TaskTimeNote=Note
+TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on open projects
+WorkloadNotDefined=Workload not defined
+NewTimeSpent=Time spent
+MyTimeSpent=My time spent
+BillTime=Bill the time spent
+BillTimeShort=Bill time
+TimeToBill=Time not billed
+TimeBilled=Time billed
+Tasks=Tasks
+Task=Task
+TaskDateStart=Task start date
+TaskDateEnd=Task end date
+TaskDescription=Task description
+NewTask=New task
+AddTask=Create task
+AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
+AddHereTimeSpentForWeek=Add here time spent for this week/task
+Activity=Activity
+Activities=Tasks/activities
+MyActivities=My tasks/activities
+MyProjects=My projects
+MyProjectsArea=My projects Area
+DurationEffective=Effective duration
+ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently open tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
+ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
+Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GanttView=Gantt View
+ListProposalsAssociatedProject=List of the commercial proposals related to the project
+ListOrdersAssociatedProject=List of sales orders related to the project
+ListInvoicesAssociatedProject=List of customer invoices related to the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
+ListSupplierOrdersAssociatedProject=List of purchase orders related to the project
+ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project
+ListContractAssociatedProject=List of contracts related to the project
+ListShippingAssociatedProject=List of shippings related to the project
+ListFichinterAssociatedProject=List of interventions related to the project
+ListExpenseReportsAssociatedProject=List of expense reports related to the project
+ListDonationsAssociatedProject=List of donations related to the project
+ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
+ListSalariesAssociatedProject=List of payments of salaries related to the project
+ListActionsAssociatedProject=List of events related to the project
+ListMOAssociatedProject=List of manufacturing orders related to the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
+ActivityOnProjectToday=Activity on project today
+ActivityOnProjectYesterday=Activity on project yesterday
+ActivityOnProjectThisWeek=Activity on project this week
+ActivityOnProjectThisMonth=Activity on project this month
+ActivityOnProjectThisYear=Activity on project this year
+ChildOfProjectTask=Child of project/task
+ChildOfTask=Child of task
+TaskHasChild=Task has child
+NotOwnerOfProject=Not owner of this private project
+AffectedTo=Allocated to
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
+ValidateProject=Validate projet
+ConfirmValidateProject=Are you sure you want to validate this project?
+CloseAProject=Close project
+ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+ReOpenAProject=Open project
+ConfirmReOpenAProject=Are you sure you want to re-open this project?
+ProjectContact=Contacts of project
+TaskContact=Task contacts
+ActionsOnProject=Events on project
+YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
+DeleteATimeSpent=Delete time spent
+ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
+TaskRessourceLinks=Contacts of task
+ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
+NoTasks=No tasks for this project
+LinkedToAnotherCompany=Linked to other third party
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
+ErrorTimeSpentIsEmpty=Time spent is empty
+ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
+IfNeedToUseOtherObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
+CloneTasks=Clone tasks
+CloneContacts=Clone contacts
+CloneNotes=Clone notes
+CloneProjectFiles=Clone project joined files
+CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
+CloneMoveDate=Update project/tasks dates from now?
+ConfirmCloneProject=Are you sure to clone this project?
+ProjectReportDate=Change task dates according to new project start date
+ErrorShiftTaskDate=Impossible to shift task date according to new project start date
+ProjectsAndTasksLines=Projects and tasks
+ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
+ProjectModifiedInDolibarr=Project %s modified
+TaskCreatedInDolibarr=Task %s created
+TaskModifiedInDolibarr=Task %s modified
+TaskDeletedInDolibarr=Task %s deleted
+OpportunityStatus=Lead status
+OpportunityStatusShort=Lead status
+OpportunityProbability=Lead probability
+OpportunityProbabilityShort=Lead probab.
+OpportunityAmount=Lead amount
+OpportunityAmountShort=Lead amount
+OpportunityWeightedAmount=Opportunity weighted amount
+OpportunityWeightedAmountShort=Opp. weighted amount
+OpportunityAmountAverageShort=Average lead amount
+OpportunityAmountWeigthedShort=Weighted lead amount
+WonLostExcluded=Won/Lost excluded
+##### Types de contacts #####
+TypeContact_project_internal_PROJECTLEADER=Project leader
+TypeContact_project_external_PROJECTLEADER=Project leader
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_task_internal_TASKEXECUTIVE=Task executive
+TypeContact_project_task_external_TASKEXECUTIVE=Task executive
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
+TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
+SelectElement=Select element
+AddElement=Link to element
+# Documents models
+DocumentModelBeluga=Project document template for linked objects overview
+DocumentModelBaleine=Project document template for tasks
+DocumentModelTimeSpent=Project report template for time spent
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+ProjectReferers=Related items
+ProjectMustBeValidatedFirst=Project must be validated first
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerMonth=Input per month
+InputDetail=Input detail
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTheTask=Not assigned to the task
+NoUserAssignedToTheProject=No users assigned to this project
+TimeSpentBy=Time spent by
+TasksAssignedTo=Tasks assigned to
+AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
+AssignTask=Assign
+ProjectOverview=Overview
+ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
+ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
+ProjectNbProjectByMonth=No. of created projects by month
+ProjectNbTaskByMonth=No. of created tasks by month
+ProjectOppAmountOfProjectsByMonth=Amount of leads by month
+ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
+ProjectOpenedProjectByOppStatus=Open project/lead by lead status
+ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
+TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
+IdTaskTime=Id task time
+YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
+OpenedProjectsByThirdparties=Open projects by third parties
+OnlyOpportunitiesShort=Only leads
+OpenedOpportunitiesShort=Open leads
+NotOpenedOpportunitiesShort=Not an open lead
+NotAnOpportunityShort=Not a lead
+OpportunityTotalAmount=Total amount of leads
+OpportunityPonderatedAmount=Weighted amount of leads
+OpportunityPonderatedAmountDesc=Leads amount weighted with probability
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWON=Won
+OppStatusLOST=Lost
+Budget=Budget
+AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
+LatestProjects=Latest %s projects
+LatestModifiedProjects=Latest %s modified projects
+OtherFilteredTasks=Other filtered tasks
+NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
+ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+# Comments trans
+AllowCommentOnTask=Allow user comments on tasks
+AllowCommentOnProject=Allow user comments on projects
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=Information project %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
+NewTaskRefSuggested=Task ref already used, a new task ref is required
+TimeSpentInvoiced=Time spent billed
+TimeSpentForInvoice=Time spent
+OneLinePerUser=One line per user
+ServiceToUseOnLines=Service to use on lines
+InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
+ProjectFollowOpportunity=Follow opportunity
+ProjectFollowTasks=Follow tasks or time spent
+Usage=Usage
+UsageOpportunity=Usage: Opportunity
+UsageTasks=Usage: Tasks
+UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=New invoice
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/hi_IN/propal.lang b/htdocs/langs/hi_IN/propal.lang
new file mode 100644
index 00000000000..71d6857c909
--- /dev/null
+++ b/htdocs/langs/hi_IN/propal.lang
@@ -0,0 +1,86 @@
+# Dolibarr language file - Source file is en_US - propal
+Proposals=Commercial proposals
+Proposal=Commercial proposal
+ProposalShort=Proposal
+ProposalsDraft=Draft commercial proposals
+ProposalsOpened=Open commercial proposals
+CommercialProposal=Commercial proposal
+PdfCommercialProposalTitle=Commercial proposal
+ProposalCard=Proposal card
+NewProp=New commercial proposal
+NewPropal=New proposal
+Prospect=Prospect
+DeleteProp=Delete commercial proposal
+ValidateProp=Validate commercial proposal
+AddProp=Create proposal
+ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
+ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
+LastPropals=Latest %s proposals
+LastModifiedProposals=Latest %s modified proposals
+AllPropals=All proposals
+SearchAProposal=Search a proposal
+NoProposal=No proposal
+ProposalsStatistics=Commercial proposal's statistics
+NumberOfProposalsByMonth=Number by month
+AmountOfProposalsByMonthHT=Amount by month (excl. tax)
+NbOfProposals=Number of commercial proposals
+ShowPropal=Show proposal
+PropalsDraft=Drafts
+PropalsOpened=Open
+PropalStatusDraft=Draft (needs to be validated)
+PropalStatusValidated=Validated (proposal is open)
+PropalStatusSigned=Signed (needs billing)
+PropalStatusNotSigned=Not signed (closed)
+PropalStatusBilled=Billed
+PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated (open)
+PropalStatusClosedShort=Closed
+PropalStatusSignedShort=Signed
+PropalStatusNotSignedShort=Not signed
+PropalStatusBilledShort=Billed
+PropalsToClose=Commercial proposals to close
+PropalsToBill=Signed commercial proposals to bill
+ListOfProposals=List of commercial proposals
+ActionsOnPropal=Events on proposal
+RefProposal=Commercial proposal ref
+SendPropalByMail=Send commercial proposal by mail
+DatePropal=Date of proposal
+DateEndPropal=Validity ending date
+ValidityDuration=Validity duration
+CloseAs=Set status to
+SetAcceptedRefused=Set accepted/refused
+ErrorPropalNotFound=Propal %s not found
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
+CopyPropalFrom=Create commercial proposal by copying existing proposal
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
+DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
+ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
+ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
+ProposalsAndProposalsLines=Commercial proposal and lines
+ProposalLine=Proposal line
+AvailabilityPeriod=Availability delay
+SetAvailability=Set availability delay
+AfterOrder=after order
+OtherProposals=Other proposals
+##### Availability #####
+AvailabilityTypeAV_NOW=Immediate
+AvailabilityTypeAV_1W=1 week
+AvailabilityTypeAV_2W=2 weeks
+AvailabilityTypeAV_3W=3 weeks
+AvailabilityTypeAV_1M=1 month
+##### Types de contacts #####
+TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
+TypeContact_propal_external_BILLING=Customer invoice contact
+TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
+TypeContact_propal_external_SHIPPING=Customer contact for delivery
+# Document models
+DocModelAzurDescription=A complete proposal model (old implementation of Cyan template)
+DocModelCyanDescription=A complete proposal model
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
+ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/hi_IN/receiptprinter.lang b/htdocs/langs/hi_IN/receiptprinter.lang
new file mode 100644
index 00000000000..896eaa313dd
--- /dev/null
+++ b/htdocs/langs/hi_IN/receiptprinter.lang
@@ -0,0 +1,95 @@
+# Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
+PrinterAdded=Printer %s added
+PrinterUpdated=Printer %s updated
+PrinterDeleted=Printer %s deleted
+TestSentToPrinter=Test Sent To Printer %s
+ReceiptPrinter=Receipt printers
+ReceiptPrinterDesc=Setup of receipt printers
+ReceiptPrinterTemplateDesc=Setup of Templates
+ReceiptPrinterTypeDesc=Description of Receipt Printer's type
+ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
+ListPrinters=List of Printers
+SetupReceiptTemplate=Template Setup
+CONNECTOR_DUMMY=Dummy Printer
+CONNECTOR_NETWORK_PRINT=Network Printer
+CONNECTOR_FILE_PRINT=Local Printer
+CONNECTOR_WINDOWS_PRINT=Local Windows Printer
+CONNECTOR_CUPS_PRINT=Cups Printer
+CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
+CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
+CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
+CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
+PROFILE_DEFAULT=Default Profile
+PROFILE_SIMPLE=Simple Profile
+PROFILE_EPOSTEP=Epos Tep Profile
+PROFILE_P822D=P822D Profile
+PROFILE_STAR=Star Profile
+PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
+PROFILE_SIMPLE_HELP=Simple Profile No Graphics
+PROFILE_EPOSTEP_HELP=Epos Tep Profile
+PROFILE_P822D_HELP=P822D Profile No Graphics
+PROFILE_STAR_HELP=Star Profile
+DOL_LINE_FEED=Skip line
+DOL_ALIGN_LEFT=Left align text
+DOL_ALIGN_CENTER=Center text
+DOL_ALIGN_RIGHT=Right align text
+DOL_USE_FONT_A=Use font A of printer
+DOL_USE_FONT_B=Use font B of printer
+DOL_USE_FONT_C=Use font C of printer
+DOL_PRINT_BARCODE=Print barcode
+DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
+DOL_CUT_PAPER_FULL=Cut ticket completely
+DOL_CUT_PAPER_PARTIAL=Cut ticket partially
+DOL_OPEN_DRAWER=Open cash drawer
+DOL_ACTIVATE_BUZZER=Activate buzzer
+DOL_PRINT_QRCODE=Print QR Code
+DOL_PRINT_LOGO=Print logo of my company
+DOL_PRINT_LOGO_OLD=Print logo of my company (old printers)
+DOL_BOLD=Bold
+DOL_BOLD_DISABLED=Disable bold
+DOL_DOUBLE_HEIGHT=Double height size
+DOL_DOUBLE_WIDTH=Double width size
+DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
+DOL_UNDERLINE=Enable underline
+DOL_UNDERLINE_DISABLED=Disable underline
+DOL_BEEP=Beed sound
+DOL_PRINT_TEXT=Print text
+DOL_VALUE_DATE=Invoice date
+DOL_VALUE_DATE_TIME=Invoice date and time
+DOL_VALUE_YEAR=Invoice year
+DOL_VALUE_MONTH_LETTERS=Invoice month in letters
+DOL_VALUE_MONTH=Invoice month
+DOL_VALUE_DAY=Invoice day
+DOL_VALUE_DAY_LETTERS=Inovice day in letters
+DOL_LINE_FEED_REVERSE=Line feed reverse
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Invoice ref
+DOL_PRINT_OBJECT_LINES=Invoice lines
+DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
+DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
+DOL_VALUE_CUSTOMER_MAIL=Customer mail
+DOL_VALUE_CUSTOMER_PHONE=Customer phone
+DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
+DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
+DOL_VALUE_MYSOC_NAME=Your company name
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/hi_IN/receptions.lang b/htdocs/langs/hi_IN/receptions.lang
new file mode 100644
index 00000000000..010a7521846
--- /dev/null
+++ b/htdocs/langs/hi_IN/receptions.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - receptions
+ReceptionsSetup=Product Reception setup
+RefReception=Ref. reception
+Reception=Reception
+Receptions=Receptions
+AllReceptions=All Receptions
+Reception=Reception
+Receptions=Receptions
+ShowReception=Show Receptions
+ReceptionsArea=Receptions area
+ListOfReceptions=List of receptions
+ReceptionMethod=Reception method
+LastReceptions=Latest %s receptions
+StatisticsOfReceptions=Statistics for receptions
+NbOfReceptions=Number of receptions
+NumberOfReceptionsByMonth=Number of receptions by month
+ReceptionCard=Reception card
+NewReception=New reception
+CreateReception=Create reception
+QtyInOtherReceptions=Qty in other receptions
+OtherReceptionsForSameOrder=Other receptions for this order
+ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
+ReceptionsToValidate=Receptions to validate
+StatusReceptionCanceled=Canceled
+StatusReceptionDraft=Draft
+StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionProcessed=Processed
+StatusReceptionDraftShort=Draft
+StatusReceptionValidatedShort=Validated
+StatusReceptionProcessedShort=Processed
+ReceptionSheet=Reception sheet
+ConfirmDeleteReception=Are you sure you want to delete this reception?
+ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
+ConfirmCancelReception=Are you sure you want to cancel this reception?
+StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
+SendReceptionByEMail=Send reception by email
+SendReceptionRef=Submission of reception %s
+ActionsOnReception=Events on reception
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the order card.
+ReceptionLine=Reception line
+ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
+ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
+ReceptionsNumberingModules=Numbering module for receptions
+ReceptionsReceiptModel=Document templates for receptions
diff --git a/htdocs/langs/hi_IN/resource.lang b/htdocs/langs/hi_IN/resource.lang
new file mode 100644
index 00000000000..e8574dc680f
--- /dev/null
+++ b/htdocs/langs/hi_IN/resource.lang
@@ -0,0 +1,39 @@
+# Dolibarr language file - Source file is en_US - resource
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+ActionsOnResource=Events about this resource
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResource=Show resource
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+SelectResource=Select resource
+
+IdResource=Id resource
+AssetNumber=Serial number
+ResourceTypeCode=Resource type code
+ImportDataset_resource_1=Resources
+
+ErrorResourcesAlreadyInUse=Some resources are in use
+ErrorResourceUseInEvent=%s used in %s event
diff --git a/htdocs/langs/hi_IN/salaries.lang b/htdocs/langs/hi_IN/salaries.lang
new file mode 100644
index 00000000000..7c3c08a65bd
--- /dev/null
+++ b/htdocs/langs/hi_IN/salaries.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+Salary=Salary
+Salaries=Salaries
+NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
+SalaryPayment=Salary payment
+SalariesPayments=Salaries payments
+ShowSalaryPayment=Show salary payment
+THM=Average hourly rate
+TJM=Average daily rate
+CurrentSalary=Current salary
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/hi_IN/sendings.lang b/htdocs/langs/hi_IN/sendings.lang
new file mode 100644
index 00000000000..5ce3b7f67e9
--- /dev/null
+++ b/htdocs/langs/hi_IN/sendings.lang
@@ -0,0 +1,74 @@
+# Dolibarr language file - Source file is en_US - sendings
+RefSending=Ref. shipment
+Sending=Shipment
+Sendings=Shipments
+AllSendings=All Shipments
+Shipment=Shipment
+Shipments=Shipments
+ShowSending=Show Shipments
+Receivings=Delivery Receipts
+SendingsArea=Shipments area
+ListOfSendings=List of shipments
+SendingMethod=Shipping method
+LastSendings=Latest %s shipments
+StatisticsOfSendings=Statistics for shipments
+NbOfSendings=Number of shipments
+NumberOfShipmentsByMonth=Number of shipments by month
+SendingCard=Shipment card
+NewSending=New shipment
+CreateShipment=Create shipment
+QtyShipped=Qty shipped
+QtyShippedShort=Qty ship.
+QtyPreparedOrShipped=Qty prepared or shipped
+QtyToShip=Qty to ship
+QtyToReceive=Qty to receive
+QtyReceived=Qty received
+QtyInOtherShipments=Qty in other shipments
+KeepToShip=Remain to ship
+KeepToShipShort=Remain
+OtherSendingsForSameOrder=Other shipments for this order
+SendingsAndReceivingForSameOrder=Shipments and receipts for this order
+SendingsToValidate=Shipments to validate
+StatusSendingCanceled=Canceled
+StatusSendingDraft=Draft
+StatusSendingValidated=Validated (products to ship or already shipped)
+StatusSendingProcessed=Processed
+StatusSendingDraftShort=Draft
+StatusSendingValidatedShort=Validated
+StatusSendingProcessedShort=Processed
+SendingSheet=Shipment sheet
+ConfirmDeleteSending=Are you sure you want to delete this shipment?
+ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
+ConfirmCancelSending=Are you sure you want to cancel this shipment?
+DocumentModelMerou=Merou A5 model
+WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+DateDeliveryPlanned=Planned date of delivery
+RefDeliveryReceipt=Ref delivery receipt
+StatusReceipt=Status delivery receipt
+DateReceived=Date delivery received
+ClassifyReception=Classify reception
+SendShippingByEMail=Send shipment by email
+SendShippingRef=Submission of shipment %s
+ActionsOnShipping=Events on shipment
+LinkToTrackYourPackage=Link to track your package
+ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
+ShipmentLine=Shipment line
+ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
+ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
+ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
+NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+
+# Sending methods
+# ModelDocument
+DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty: %d)
diff --git a/htdocs/langs/hi_IN/sms.lang b/htdocs/langs/hi_IN/sms.lang
new file mode 100644
index 00000000000..055085eb16a
--- /dev/null
+++ b/htdocs/langs/hi_IN/sms.lang
@@ -0,0 +1,51 @@
+# Dolibarr language file - Source file is en_US - sms
+Sms=Sms
+SmsSetup=SMS setup
+SmsDesc=This page allows you to define global options on SMS features
+SmsCard=SMS Card
+AllSms=All SMS campaigns
+SmsTargets=Targets
+SmsRecipients=Targets
+SmsRecipient=Target
+SmsTitle=Description
+SmsFrom=Sender
+SmsTo=Target
+SmsTopic=Topic of SMS
+SmsText=Message
+SmsMessage=SMS Message
+ShowSms=Show SMS
+ListOfSms=List SMS campaigns
+NewSms=New SMS campaign
+EditSms=Edit SMS
+ResetSms=New sending
+DeleteSms=Delete SMS campaign
+DeleteASms=Remove a SMS campaign
+PreviewSms=Previuw SMS
+PrepareSms=Prepare SMS
+CreateSms=Create SMS
+SmsResult=Result of SMS sending
+TestSms=Test SMS
+ValidSms=Validate SMS
+ApproveSms=Approve SMS
+SmsStatusDraft=Draft
+SmsStatusValidated=Validated
+SmsStatusApproved=Approved
+SmsStatusSent=Sent
+SmsStatusSentPartialy=Sent partially
+SmsStatusSentCompletely=Sent completely
+SmsStatusError=Error
+SmsStatusNotSent=Not sent
+SmsSuccessfulySent=SMS correctly sent (from %s to %s)
+ErrorSmsRecipientIsEmpty=Number of target is empty
+WarningNoSmsAdded=No new phone number to add to target list
+ConfirmValidSms=Do you confirm validation of this campaign?
+NbOfUniqueSms=No. of unique phone numbers
+NbOfSms=No. of phone numbers
+ThisIsATestMessage=This is a test message
+SendSms=Send SMS
+SmsInfoCharRemain=No. of remaining characters
+SmsInfoNumero= (international format i.e.: +33899701761)
+DelayBeforeSending=Delay before sending (minutes)
+SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
+SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider.
+DisableStopIfSupported=Disable STOP message (if supported)
diff --git a/htdocs/langs/hi_IN/stocks.lang b/htdocs/langs/hi_IN/stocks.lang
new file mode 100644
index 00000000000..9856649b834
--- /dev/null
+++ b/htdocs/langs/hi_IN/stocks.lang
@@ -0,0 +1,220 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseCard=Warehouse card
+Warehouse=Warehouse
+Warehouses=Warehouses
+ParentWarehouse=Parent warehouse
+NewWarehouse=New warehouse / Stock Location
+WarehouseEdit=Modify warehouse
+MenuNewWarehouse=New warehouse
+WarehouseSource=Source warehouse
+WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
+AddOne=Add one
+DefaultWarehouse=Default warehouse
+WarehouseTarget=Target warehouse
+ValidateSending=Delete sending
+CancelSending=Cancel sending
+DeleteSending=Delete sending
+Stock=Stock
+Stocks=Stocks
+StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
+Movements=Movements
+ErrorWarehouseRefRequired=Warehouse reference name is required
+ListOfWarehouses=List of warehouses
+ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
+MovementId=Movement ID
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
+StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
+Location=Location
+LocationSummary=Short name location
+NumberOfDifferentProducts=Number of different products
+NumberOfProducts=Total number of products
+LastMovement=Latest movement
+LastMovements=Latest movements
+Units=Units
+Unit=Unit
+StockCorrection=Stock correction
+CorrectStock=Correct stock
+StockTransfer=Stock transfer
+TransferStock=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
+NumberOfUnit=Number of units
+UnitPurchaseValue=Unit purchase price
+StockTooLow=Stock too low
+StockLowerThanLimit=Stock lower than alert limit (%s)
+EnhancedValue=Value
+PMPValue=Weighted average price
+PMPValueShort=WAP
+EnhancedValueOfWarehouses=Warehouses value
+UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
+QtyDispatched=Quantity dispatched
+QtyDispatchedShort=Qty dispatched
+QtyToDispatchShort=Qty to dispatch
+OrderDispatch=Item receipts
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
+DeStockOnShipment=Decrease real stocks on shipping validation
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
+OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
+StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
+NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
+DispatchVerb=Dispatch
+StockLimitShort=Limit for alert
+StockLimit=Stock limit for alert
+StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+PhysicalStock=Physical Stock
+RealStock=Real Stock
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
+VirtualStock=Virtual stock
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+IdWarehouse=Id warehouse
+DescWareHouse=Description warehouse
+LieuWareHouse=Localisation warehouse
+WarehousesAndProducts=Warehouses and products
+WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
+AverageUnitPricePMPShort=Weighted average input price
+AverageUnitPricePMP=Weighted average input price
+SellPriceMin=Selling Unit Price
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
+EstimatedStockValueShort=Input stock value
+EstimatedStockValue=Input stock value
+DeleteAWarehouse=Delete a warehouse
+ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
+PersonalStock=Personal stock %s
+ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
+SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
+SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
+NoStockAction=No stock action
+DesiredStock=Desired Stock
+DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
+StockToBuy=To order
+Replenishment=Replenishment
+ReplenishmentOrders=Replenishment orders
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
+UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+UseVirtualStock=Use virtual stock
+UsePhysicalStock=Use physical stock
+CurentSelectionMode=Current selection mode
+CurentlyUsingVirtualStock=Virtual stock
+CurentlyUsingPhysicalStock=Physical stock
+RuleForStockReplenishment=Rule for stocks replenishment
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
+AlertOnly= Alerts only
+WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
+WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
+ForThisWarehouse=For this warehouse
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+Replenishments=Replenishments
+NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
+NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
+MassMovement=Mass movement
+SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+RecordMovement=Record transfer
+ReceivingForSameOrder=Receipts for this order
+StockMovementRecorded=Stock movements recorded
+RuleForStockAvailability=Rules on stock requirements
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
+MovementLabel=Label of movement
+TypeMovement=Type of movement
+DateMovement=Date of movement
+InventoryCode=Movement or inventory code
+IsInPackage=Contained into package
+WarehouseAllowNegativeTransfer=Stock can be negative
+qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
+ShowWarehouse=Show warehouse
+MovementCorrectStock=Stock correction for product %s
+MovementTransferStock=Stock transfer of product %s into another warehouse
+InventoryCodeShort=Inv./Mov. code
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
+ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
+OpenAll=Open for all actions
+OpenInternal=Open only for internal actions
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
+OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
+ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
+ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
+ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
+AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
+AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+InventoryDate=Inventory date
+NewInventory=New inventory
+inventorySetup = Inventory Setup
+inventoryCreatePermission=Create new inventory
+inventoryReadPermission=View inventories
+inventoryWritePermission=Update inventories
+inventoryValidatePermission=Validate inventory
+inventoryTitle=Inventory
+inventoryListTitle=Inventories
+inventoryListEmpty=No inventory in progress
+inventoryCreateDelete=Create/Delete inventory
+inventoryCreate=Create new
+inventoryEdit=Edit
+inventoryValidate=Validated
+inventoryDraft=Running
+inventorySelectWarehouse=Warehouse choice
+inventoryConfirmCreate=Create
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
+inventoryMvtStock=By inventory
+inventoryWarningProductAlreadyExists=This product is already into list
+SelectCategory=Category filter
+SelectFournisseur=Vendor filter
+inventoryOnDate=Inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
+inventoryChangePMPPermission=Allow to change PMP value for a product
+ColumnNewPMP=New unit PMP
+OnlyProdsInStock=Do not add product without stock
+TheoricalQty=Theorique qty
+TheoricalValue=Theorique qty
+LastPA=Last BP
+CurrentPA=Curent BP
+RecordedQty=Recorded Qty
+RealQty=Real Qty
+RealValue=Real Value
+RegulatedQty=Regulated Qty
+AddInventoryProduct=Add product to inventory
+AddProduct=Add
+ApplyPMP=Apply PMP
+FlushInventory=Flush inventory
+ConfirmFlushInventory=Do you confirm this action?
+InventoryFlushed=Inventory flushed
+ExitEditMode=Exit edition
+inventoryDeleteLine=Delete line
+RegulateStock=Regulate Stock
+ListInventory=List
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
+ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
+InventoryForASpecificWarehouse=Inventory for a specific warehouse
+InventoryForASpecificProduct=Inventory for a specific product
+StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
+ForceTo=Force to
diff --git a/htdocs/langs/hi_IN/stripe.lang b/htdocs/langs/hi_IN/stripe.lang
new file mode 100644
index 00000000000..844762040af
--- /dev/null
+++ b/htdocs/langs/hi_IN/stripe.lang
@@ -0,0 +1,72 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Stripe module setup
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
+StripeOrCBDoPayment=Pay with credit card or Stripe
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+Creditor=Creditor
+PaymentCode=Payment code
+StripeDoPayment=Pay with Stripe
+YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+Continue=Next
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment page for a sales order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment page for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.<br>For the URL of payments with no existing object, you may also add the parameter <strong>&noidempotency=1</strong> so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter)
+SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+NewStripePaymentReceived=New Stripe payment received
+NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
+STRIPE_TEST_SECRET_KEY=Secret test key
+STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
+STRIPE_LIVE_SECRET_KEY=Secret live key
+STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
+StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
+StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
+StripePayoutList=List of Stripe payouts
+ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
+ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
+PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
+ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
diff --git a/htdocs/langs/hi_IN/supplier_proposal.lang b/htdocs/langs/hi_IN/supplier_proposal.lang
new file mode 100644
index 00000000000..ce5bdf0425a
--- /dev/null
+++ b/htdocs/langs/hi_IN/supplier_proposal.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposalNew=New price request
+CommRequest=Price request
+CommRequests=Price requests
+SearchRequest=Find a request
+DraftRequests=Draft requests
+SupplierProposalsDraft=Draft vendor proposals
+LastModifiedRequests=Latest %s modified price requests
+RequestsOpened=Open price requests
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
+NewAskPrice=New price request
+ShowSupplierProposal=Show price request
+AddSupplierProposal=Create a price request
+SupplierProposalRefFourn=Vendor ref
+SupplierProposalDate=Delivery date
+SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
+ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
+DeleteAsk=Delete request
+ValidateAsk=Validate request
+SupplierProposalStatusDraft=Draft (needs to be validated)
+SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusClosed=Closed
+SupplierProposalStatusSigned=Accepted
+SupplierProposalStatusNotSigned=Refused
+SupplierProposalStatusDraftShort=Draft
+SupplierProposalStatusValidatedShort=Validated
+SupplierProposalStatusClosedShort=Closed
+SupplierProposalStatusSignedShort=Accepted
+SupplierProposalStatusNotSignedShort=Refused
+CopyAskFrom=Create a price request by copying an existing request
+CreateEmptyAsk=Create blank request
+ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
+ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
+SendAskByMail=Send price request by mail
+SendAskRef=Sending the price request %s
+SupplierProposalCard=Request card
+ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
+ActionsOnSupplierProposal=Events on price request
+DocModelAuroreDescription=A complete request model (logo...)
+CommercialAsk=Price request
+DefaultModelSupplierProposalCreate=Default model creation
+DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
+DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
+ListOfSupplierProposals=List of vendor proposal requests
+ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
+SupplierProposalsToClose=Vendor proposals to close
+SupplierProposalsToProcess=Vendor proposals to process
+LastSupplierProposals=Latest %s price requests
+AllPriceRequests=All requests
diff --git a/htdocs/langs/hi_IN/suppliers.lang b/htdocs/langs/hi_IN/suppliers.lang
new file mode 100644
index 00000000000..b69b11272b4
--- /dev/null
+++ b/htdocs/langs/hi_IN/suppliers.lang
@@ -0,0 +1,47 @@
+# Dolibarr language file - Source file is en_US - vendors
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
+History=History
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
+OrderDate=Order date
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
+SupplierPrices=Vendor prices
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
+Availability=Availability
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order details
+ApproveThisOrder=Approve this order
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
+DenyingThisOrder=Deny this order
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
+SupplierReputation=Vendor reputation
+DoNotOrderThisProductToThisSupplier=Do not order
+NotTheGoodQualitySupplier=Low quality
+ReputationForThisProduct=Reputation
+BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
+AllProductReferencesOfSupplier=All product / service references of vendor
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/hi_IN/ticket.lang b/htdocs/langs/hi_IN/ticket.lang
new file mode 100644
index 00000000000..80518c3401a
--- /dev/null
+++ b/htdocs/langs/hi_IN/ticket.lang
@@ -0,0 +1,305 @@
+# en_US lang file for module ticket
+# Copyright (C) 2013  Jean-François FERRY <hello@librethic.io>
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+Module56000Name=Tickets
+Module56000Desc=Ticket system for issue or request management
+
+Permission56001=See tickets
+Permission56002=Modify tickets
+Permission56003=Delete tickets
+Permission56004=Manage tickets
+Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+
+TicketDictType=Ticket - Types
+TicketDictCategory=Ticket - Groupes
+TicketDictSeverity=Ticket - Severities
+TicketDictResolution=Ticket - Resolution
+TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
+TicketTypeShortBUGHARD=Dysfonctionnement matériel
+TicketTypeShortCOM=Commercial question
+
+TicketTypeShortHELP=Request for functionnal help
+TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortPROJET=Project
+TicketTypeShortOTHER=Other
+
+TicketSeverityShortLOW=Low
+TicketSeverityShortNORMAL=Normal
+TicketSeverityShortHIGH=High
+TicketSeverityShortBLOCKING=Critical/Blocking
+
+ErrorBadEmailAddress=Field '%s' incorrect
+MenuTicketMyAssign=My tickets
+MenuTicketMyAssignNonClosed=My open tickets
+MenuListNonClosed=Open tickets
+
+TypeContact_ticket_internal_CONTRIBUTOR=Contributor
+TypeContact_ticket_internal_SUPPORTTEC=Assigned user
+TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
+TypeContact_ticket_external_CONTRIBUTOR=External contributor
+
+OriginEmail=Email source
+Notify_TICKET_SENTBYMAIL=Send ticket message by email
+
+# Status
+NotRead=Not read
+Read=Read
+Assigned=Assigned
+InProgress=In progress
+NeedMoreInformation=Waiting for information
+Answered=Answered
+Waiting=Waiting
+Closed=Closed
+Deleted=Deleted
+
+# Dict
+Type=Type
+Category=Analytic code
+Severity=Severity
+
+# Email templates
+MailToSendTicketMessage=To send email from ticket message
+
+#
+# Admin page
+#
+TicketSetup=Ticket module setup
+TicketSettings=Settings
+TicketSetupPage=
+TicketPublicAccess=A public interface requiring no identification is available at the following url
+TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
+TicketParamModule=Module variable setup
+TicketParamMail=Email setup
+TicketEmailNotificationFrom=Notification email from
+TicketEmailNotificationFromHelp=Used into ticket message answer by example
+TicketEmailNotificationTo=Notifications email to
+TicketEmailNotificationToHelp=Send email notifications to this address.
+TicketNewEmailBodyLabel=Text message sent after creating a ticket
+TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
+TicketParamPublicInterface=Public interface setup
+TicketsEmailMustExist=Require an existing email address to create a ticket
+TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket.
+PublicInterface=Public interface
+TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
+TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
+TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
+TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
+TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
+TicketPublicInterfaceTopicLabelAdmin=Interface title
+TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
+TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
+ExtraFieldsTicket=Extra attributes
+TicketCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
+TicketsDisableEmail=Do not send emails for ticket creation or message recording
+TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
+TicketsLogEnableEmail=Enable log by email
+TicketsLogEnableEmailHelp=At each change, an email will be sent **to each contact** associated with the ticket.
+TicketParams=Params
+TicketsShowModuleLogo=Display the logo of the module in the public interface
+TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
+TicketsShowCompanyLogo=Display the logo of the company in the public interface
+TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
+TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
+TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
+TicketsActivatePublicInterface=Activate public interface
+TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create tickets.
+TicketsAutoAssignTicket=Automatically assign the user who created the ticket
+TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
+TicketNumberingModules=Tickets numbering module
+TicketNotifyTiersAtCreation=Notify third party at creation
+TicketGroup=Group
+TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
+#
+# Index & list page
+#
+TicketsIndex=Tickets area
+TicketList=List of tickets
+TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
+NoTicketsFound=No ticket found
+NoUnreadTicketsFound=No unread ticket found
+TicketViewAllTickets=View all tickets
+TicketViewNonClosedOnly=View only open tickets
+TicketStatByStatus=Tickets by status
+OrderByDateAsc=Sort by ascending date
+OrderByDateDesc=Sort by descending date
+ShowAsConversation=Show as conversation list
+MessageListViewType=Show as table list
+
+#
+# Ticket card
+#
+Ticket=Ticket
+TicketCard=Ticket card
+CreateTicket=Create ticket
+EditTicket=Edit ticket
+TicketsManagement=Tickets Management
+CreatedBy=Created by
+NewTicket=New Ticket
+SubjectAnswerToTicket=Ticket answer
+TicketTypeRequest=Request type
+TicketCategory=Analytic code
+SeeTicket=See ticket
+TicketMarkedAsRead=Ticket has been marked as read
+TicketReadOn=Read on
+TicketCloseOn=Closing date
+MarkAsRead=Mark ticket as read
+TicketHistory=Ticket history
+AssignUser=Assign to user
+TicketAssigned=Ticket is now assigned
+TicketChangeType=Change type
+TicketChangeCategory=Change analytic code
+TicketChangeSeverity=Change severity
+TicketAddMessage=Add a message
+AddMessage=Add a message
+MessageSuccessfullyAdded=Ticket added
+TicketMessageSuccessfullyAdded=Message successfully added
+TicketMessagesList=Message list
+NoMsgForThisTicket=No message for this ticket
+Properties=Classification
+LatestNewTickets=Latest %s newest tickets (not read)
+TicketSeverity=Severity
+ShowTicket=See ticket
+RelatedTickets=Related tickets
+TicketAddIntervention=Create intervention
+CloseTicket=Close ticket
+CloseATicket=Close a ticket
+ConfirmCloseAticket=Confirm ticket closing
+ConfirmDeleteTicket=Please confirm ticket deleting
+TicketDeletedSuccess=Ticket deleted with success
+TicketMarkedAsClosed=Ticket marked as closed
+TicketDurationAuto=Calculated duration
+TicketDurationAutoInfos=Duration calculated automatically from intervention related
+TicketUpdated=Ticket updated
+SendMessageByEmail=Send message by email
+TicketNewMessage=New message
+ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
+TicketGoIntoContactTab=Please go into "Contacts" tab to select them
+TicketMessageMailIntro=Introduction
+TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
+TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
+TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
+TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
+TicketMessageMailSignature=Signature
+TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
+TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
+TicketMessageMailSignatureLabelAdmin=Signature of response email
+TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
+TicketMessageHelp=Only this text will be saved in the message list on ticket card.
+TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
+TimeElapsedSince=Time elapsed since
+TicketTimeToRead=Time elapsed before read
+TicketContacts=Contacts ticket
+TicketDocumentsLinked=Documents linked to ticket
+ConfirmReOpenTicket=Confirm reopen this ticket ?
+TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
+TicketAssignedToYou=Ticket assigned
+TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
+MarkMessageAsPrivate=Mark message as private
+TicketMessagePrivateHelp=This message will not display to external users
+TicketEmailOriginIssuer=Issuer at origin of the tickets
+InitialMessage=Initial Message
+LinkToAContract=Link to a contract
+TicketPleaseSelectAContract=Select a contract
+UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
+TicketMailExchanges=Mail exchanges
+TicketInitialMessageModified=Initial message modified
+TicketMessageSuccesfullyUpdated=Message successfully updated
+TicketChangeStatus=Change status
+TicketConfirmChangeStatus=Confirm the status change: %s ?
+TicketLogStatusChanged=Status changed: %s to %s
+TicketNotNotifyTiersAtCreate=Not notify company at create
+Unread=Unread
+TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
+PublicInterfaceNotEnabled=Public interface was not enabled
+ErrorTicketRefRequired=Ticket reference name is required
+
+#
+# Logs
+#
+TicketLogMesgReadBy=Ticket %s read by %s
+NoLogForThisTicket=No log for this ticket yet
+TicketLogAssignedTo=Ticket %s assigned to %s
+TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
+TicketLogClosedBy=Ticket %s closed by %s
+TicketLogReopen=Ticket %s re-open
+
+#
+# Public pages
+#
+TicketSystem=Ticket system
+ShowListTicketWithTrackId=Display ticket list from track ID
+ShowTicketWithTrackId=Display ticket from track ID
+TicketPublicDesc=You can create a support ticket or check from an existing ID.
+YourTicketSuccessfullySaved=Ticket has been successfully saved!
+MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
+PleaseRememberThisId=Please keep the tracking number that we might ask you later.
+TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
+TicketNewEmailSubjectCustomer=New support ticket
+TicketNewEmailBody=This is an automatic email to confirm you have registered a new ticket.
+TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
+TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
+TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
+TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
+TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
+TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
+TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
+TicketPublicMsgViewLogIn=Please enter ticket tracking ID
+TicketTrackId=Public Tracking ID
+OneOfTicketTrackId=One of your tracking ID
+ErrorTicketNotFound=Ticket with tracking ID %s not found!
+Subject=Subject
+ViewTicket=View ticket
+ViewMyTicketList=View my ticket list
+ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
+TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
+TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
+SeeThisTicketIntomanagementInterface=See ticket in management interface
+TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
+ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
+OldUser=Old user
+NewUser=New user
+NumberOfTicketsByMonth=Number of tickets per month
+NbOfTickets=Number of tickets
+# notifications
+TicketNotificationEmailSubject=Ticket %s updated
+TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
+TicketNotificationRecipient=Notification recipient
+TicketNotificationLogMessage=Log message
+TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
+TicketNotificationNumberEmailSent=Notification email sent: %s
+
+ActionsOnTicket=Events on ticket
+
+#
+# Boxes
+#
+BoxLastTicket=Latest created tickets
+BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicketContent=
+BoxLastTicketNoRecordedTickets=No recent unread tickets
+BoxLastModifiedTicket=Latest modified tickets
+BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastModifiedTicketContent=
+BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
diff --git a/htdocs/langs/hi_IN/trips.lang b/htdocs/langs/hi_IN/trips.lang
new file mode 100644
index 00000000000..654f14d6bf7
--- /dev/null
+++ b/htdocs/langs/hi_IN/trips.lang
@@ -0,0 +1,151 @@
+# Dolibarr language file - Source file is en_US - trips
+ShowExpenseReport=Show expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense reports
+ListOfFees=List of fees
+TypeFees=Types of fees
+ShowTrip=Show expense report
+NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
+CompanyVisited=Company/organization visited
+FeesKilometersOrAmout=Amount or kilometers
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportApproved=An expense report was approved
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
+ExpenseReportRefused=An expense report was refused
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
+ExpenseReportCanceled=An expense report was canceled
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
+ExpenseReportPaid=An expense report was paid
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripNDF=Informations expense report
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Other
+TF_TRIP=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hotel
+TF_TAXI=Taxi
+EX_KME=Mileage costs
+EX_FUE=Fuel CV
+EX_HOT=Hotel
+EX_PAR=Parking CV
+EX_TOL=Toll CV
+EX_TAX=Various Taxes
+EX_IND=Indemnity transportation subscription
+EX_SUM=Maintenance supply
+EX_SUO=Office supplies
+EX_CAR=Car rental
+EX_DOC=Documentation
+EX_CUR=Customers receiving
+EX_OTR=Other receiving
+EX_POS=Postage
+EX_CAM=CV maintenance and repair
+EX_EMM=Employees meal
+EX_GUM=Guests meal
+EX_BRE=Breakfast
+EX_FUE_VP=Fuel PV
+EX_TOL_VP=Toll PV
+EX_PAR_VP=Parking PV
+EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
+UploadANewFileNow=Upload a new document now
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+AucuneLigne=There is no expense report declared yet
+ModePaiement=Payment mode
+VALIDATOR=User responsible for approval
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paid by
+REFUSEUR=Denied by
+CANCEL_USER=Deleted by
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+BROUILLONNER=Reopen
+ExpenseReportRef=Ref. expense report
+ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+ConfirmRefuseTrip=Are you sure you want to deny this expense report?
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report?
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
+ConfirmCancelTrip=Are you sure you want to cancel this expense report?
+BrouillonnerTrip=Move back expense report to status "Draft"
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report?
+NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
+ExpenseReportsToApprove=Expense reports to approve
+ExpenseReportsToPay=Expense reports to pay
+ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
+ExpenseReportsIk=Expense report milles index
+ExpenseReportsRules=Expense report rules
+ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
+ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report
+expenseReportOffset=Offset
+expenseReportCoef=Coefficient
+expenseReportTotalForFive=Example with <u>d</u> = 5
+expenseReportRangeFromTo=from %d to %d
+expenseReportRangeMoreThan=more than %d
+expenseReportCoefUndefined=(value not defined)
+expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
+expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
+expenseReportPrintExample=offset + (d x coef) = %s
+ExpenseReportApplyTo=Apply to
+ExpenseReportDomain=Domain to apply
+ExpenseReportLimitOn=Limit on
+ExpenseReportDateStart=Date start
+ExpenseReportDateEnd=Date end
+ExpenseReportLimitAmount=Limite amount
+ExpenseReportRestrictive=Restrictive
+AllExpenseReport=All type of expense report
+OnExpense=Expense line
+ExpenseReportRuleSave=Expense report rule saved
+ExpenseReportRuleErrorOnSave=Error: %s
+RangeNum=Range %d
+ExpenseReportConstraintViolationError=Constraint violation id [%s]: %s  is superior to %s %s
+byEX_DAY=by day (limitation to %s)
+byEX_MON=by month (limitation to %s)
+byEX_YEA=by year (limitation to %s)
+byEX_EXP=by line (limitation to %s)
+ExpenseReportConstraintViolationWarning=Constraint violation id [%s]: %s  is superior to %s %s
+nolimitbyEX_DAY=by day (no limitation)
+nolimitbyEX_MON=by month (no limitation)
+nolimitbyEX_YEA=by year (no limitation)
+nolimitbyEX_EXP=by line (no limitation)
+CarCategory=Category of car
+ExpenseRangeOffset=Offset amount: %s
+RangeIk=Mileage range
+AttachTheNewLineToTheDocument=Attach the line to an uploaded document
diff --git a/htdocs/langs/hi_IN/users.lang b/htdocs/langs/hi_IN/users.lang
new file mode 100644
index 00000000000..41a5ebd0981
--- /dev/null
+++ b/htdocs/langs/hi_IN/users.lang
@@ -0,0 +1,118 @@
+# Dolibarr language file - Source file is en_US - users
+HRMArea=HRM area
+UserCard=User card
+GroupCard=Group card
+Permission=Permission
+Permissions=Permissions
+EditPassword=Edit password
+SendNewPassword=Regenerate and send password
+SendNewPasswordLink=Send link to reset password
+ReinitPassword=Regenerate password
+PasswordChangedTo=Password changed to: %s
+SubjectNewPassword=Your new password for %s
+GroupRights=Group permissions
+UserRights=User permissions
+UserGUISetup=User Display Setup
+DisableUser=Disable
+DisableAUser=Disable a user
+DeleteUser=Delete
+DeleteAUser=Delete a user
+EnableAUser=Enable a user
+DeleteGroup=Delete
+DeleteAGroup=Delete a group
+ConfirmDisableUser=Are you sure you want to disable user <b>%s</b>?
+ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b>?
+ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b>?
+ConfirmEnableUser=Are you sure you want to enable user <b>%s</b>?
+ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b>?
+ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
+NewUser=New user
+CreateUser=Create user
+LoginNotDefined=Login is not defined.
+NameNotDefined=Name is not defined.
+ListOfUsers=List of users
+SuperAdministrator=Super Administrator
+SuperAdministratorDesc=Global administrator
+AdministratorDesc=Administrator
+DefaultRights=Default Permissions
+DefaultRightsDesc=Define here the <u>default</u> permissions that are automatically granted to a <u>new</u> user (to modify permissions for existing users, go to the user card).
+DolibarrUsers=Dolibarr users
+LastName=Last name
+FirstName=First name
+ListOfGroups=List of groups
+NewGroup=New group
+CreateGroup=Create group
+RemoveFromGroup=Remove from group
+PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
+PasswordChangeRequest=Request to change password for <b>%s</b>
+PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+ConfirmPasswordReset=Confirm password reset
+MenuUsersAndGroups=Users & Groups
+LastGroupsCreated=Latest %s groups created
+LastUsersCreated=Latest %s users created
+ShowGroup=Show group
+ShowUser=Show user
+NonAffectedUsers=Non assigned users
+UserModified=User modified successfully
+PhotoFile=Photo file
+ListOfUsersInGroup=List of users in this group
+ListOfGroupsForUser=List of groups for this user
+LinkToCompanyContact=Link to third party / contact
+LinkedToDolibarrMember=Link to member
+LinkedToDolibarrUser=Link to Dolibarr user
+LinkedToDolibarrThirdParty=Link to Dolibarr third party
+CreateDolibarrLogin=Create a user
+CreateDolibarrThirdParty=Create a third party
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
+UsePersonalValue=Use personal value
+InternalUser=Internal user
+ExportDataset_user_1=Users and their properties
+DomainUser=Domain user %s
+Reactivate=Reactivate
+CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
+Inherited=Inherited
+UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
+UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
+IdPhoneCaller=Id phone caller
+NewUserCreated=User %s created
+NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
+EventUserModified=User %s modified
+UserDisabled=User %s disabled
+UserEnabled=User %s activated
+UserDeleted=User %s removed
+NewGroupCreated=Group %s created
+GroupModified=Group %s modified
+GroupDeleted=Group %s removed
+ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact?
+ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member?
+ConfirmCreateThirdParty=Are you sure you want to create a third party for this member?
+LoginToCreate=Login to create
+NameToCreate=Name of third party to create
+YourRole=Your roles
+YourQuotaOfUsersIsReached=Your quota of active users is reached !
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
+DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
+HierarchicalResponsible=Supervisor
+HierarchicView=Hierarchical view
+UseTypeFieldToChange=Use field Type to change
+OpenIDURL=OpenID URL
+LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Hours worked (per week)
+ExpectedWorkedHours=Expected worked hours per week
+ColorUser=Color of the user
+DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accounting code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Employment Start Date
+DateEmploymentEnd=Employment End Date
+CantDisableYourself=You can't disable your own user record
+ForceUserExpenseValidator=Force expense report validator
+ForceUserHolidayValidator=Force leave request validator
+ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/hi_IN/website.lang b/htdocs/langs/hi_IN/website.lang
new file mode 100644
index 00000000000..bce2a09fb03
--- /dev/null
+++ b/htdocs/langs/hi_IN/website.lang
@@ -0,0 +1,130 @@
+# Dolibarr language file - Source file is en_US - website
+Shortname=Code
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
+DeleteWebsite=Delete website
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
+WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
+WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
+WEBSITE_CSS_URL=URL of external CSS file
+WEBSITE_CSS_INLINE=CSS file content (common to all pages)
+WEBSITE_JS_INLINE=Javascript file content (common to all pages)
+WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
+WEBSITE_ROBOT=Robot file (robots.txt)
+WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
+HtmlHeaderPage=HTML header (specific to this page only)
+PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
+EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
+MediaFiles=Media library
+EditCss=Edit website properties
+EditMenu=Edit menu
+EditMedias=Edit medias
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
+AddWebsite=Add website
+Webpage=Web page/container
+AddPage=Add page/container
+HomePage=Home Page
+PageContainer=Page/container
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
+PageContent=Page/Contenair
+PageDeleted=Page/Contenair '%s' of website %s deleted
+PageAdded=Page/Contenair '%s' added
+ViewSiteInNewTab=View site in new tab
+ViewPageInNewTab=View page in new tab
+SetAsHomePage=Set as Home page
+RealURL=Real URL
+ViewWebsiteInProduction=View web site using home URLs
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+TestDeployOnWeb=Test/deploy on web
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
+NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
+SyntaxHelp=Help on specific syntax tips
+YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+ClonePage=Clone page/container
+CloneSite=Clone site
+SiteAdded=Website added
+ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
+PageIsANewTranslation=The new page is a translation of the current page ?
+LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
+ParentPageId=Parent page ID
+WebsiteId=Website ID
+CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
+FetchAndCreate=Fetch and Create
+ExportSite=Export website
+ImportSite=Import website template
+IDOfPage=Id of page
+Banner=Banner
+BlogPost=Blog post
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
+AddWebsiteAccount=Create web site account
+BackToListForThirdParty=Back to list for the third-party
+DisableSiteFirst=Disable website first
+MyContainerTitle=My web site title
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is a translation of
+ThisPageHasTranslationPages=This page/container has translation
+NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
+GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Search or Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
+MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
+EditInLineOnOff=Mode 'Edit inline' is %s
+ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
+GlobalCSSorJS=Global CSS/JS/Header file of web site
+BackToHomePage=Back to home page...
+TranslationLinks=Translation links
+YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not a website page
+UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
+MainLanguage=Main language
+OtherLanguages=Other languages
+UseManifest=Provide a manifest.json file
+PublicAuthorAlias=Public author alias
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
+ReplacementDoneInXPages=Replacement done in %s pages or containers
diff --git a/htdocs/langs/hi_IN/withdrawals.lang b/htdocs/langs/hi_IN/withdrawals.lang
new file mode 100644
index 00000000000..b1d6e30e329
--- /dev/null
+++ b/htdocs/langs/hi_IN/withdrawals.lang
@@ -0,0 +1,119 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
+NewStandingOrder=New direct debit order
+StandingOrderToProcess=To process
+WithdrawalsReceipts=Direct debit orders
+WithdrawalReceipt=Direct debit order
+LastWithdrawalReceipts=Latest %s direct debit files
+WithdrawalsLines=Direct debit order lines
+RequestStandingOrderToTreat=Request for direct debit payment order to process
+RequestStandingOrderTreated=Request for direct debit payment order processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
+AmountToWithdraw=Amount to withdraw
+WithdrawsRefused=Direct debit refused
+NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
+ResponsibleUser=User Responsible
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
+MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
+ClassCredited=Classify credited
+ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
+TransData=Transmission date
+TransMetod=Transmission method
+Send=Send
+Lines=Lines
+StandingOrderReject=Issue a rejection
+WithdrawalRefused=Withdrawal refused
+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=Invoice refused (Charge the rejection to customer)
+StatusDebitCredit=Status debit/credit
+StatusWaiting=Waiting
+StatusTrans=Sent
+StatusCredited=Credited
+StatusRefused=Refused
+StatusMotif0=Unspecified
+StatusMotif1=Insufficient funds
+StatusMotif2=Request contested
+StatusMotif3=No direct debit payment order
+StatusMotif4=Sales Order
+StatusMotif5=RIB unusable
+StatusMotif6=Account without balance
+StatusMotif7=Judicial Decision
+StatusMotif8=Other reason
+CreateForSepaFRST=Create direct debit file (SEPA FRST)
+CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
+CreateAll=Create direct debit file (all)
+CreateGuichet=Only office
+CreateBanque=Only bank
+OrderWaiting=Waiting for treatment
+NotifyTransmision=Withdrawal Transmission
+NotifyCredit=Withdrawal Credit
+NumeroNationalEmetter=National Transmitter Number
+WithBankUsingRIB=For bank accounts using RIB
+WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
+BankToReceiveWithdraw=Receiving Bank Account
+CreditDate=Credit on
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+WithdrawalFile=Withdrawal file
+SetToStatusSent=Set to status "File Sent"
+ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
+StatisticsByLineStatus=Statistics by status of lines
+RUM=UMR
+DateRUM=Mandate signature date
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
+WithdrawMode=Direct debit mode (FRST or RECUR)
+WithdrawRequestAmount=Amount of Direct debit request:
+WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
+SepaMandate=SEPA Direct Debit Mandate
+SepaMandateShort=SEPA Mandate
+PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
+SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+CreditorIdentifier=Creditor Identifier
+CreditorName=Creditor Name
+SEPAFillForm=(B) Please complete all the fields marked *
+SEPAFormYourName=Your name
+SEPAFormYourBAN=Your Bank Account Name (IBAN)
+SEPAFormYourBIC=Your Bank Identifier Code (BIC)
+SEPAFrstOrRecur=Type of payment
+ModeRECUR=Recurring payment
+ModeFRST=One-off payment
+PleaseCheckOne=Please check one only
+DirectDebitOrderCreated=Direct debit order %s created
+AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
+
+### Notifications
+InfoCreditSubject=Payment of direct debit payment order %s by the bank
+InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
+InfoTransSubject=Transmission of direct debit payment order %s to bank
+InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
+InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
+InfoRejectSubject=Direct debit payment order refused
+InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/hi_IN/workflow.lang b/htdocs/langs/hi_IN/workflow.lang
new file mode 100644
index 00000000000..be126eef0f4
--- /dev/null
+++ b/htdocs/langs/hi_IN/workflow.lang
@@ -0,0 +1,20 @@
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=Workflow module setup
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+# Autocreate
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
+# Autoclassify customer proposal or order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+AutomaticCreation=Automatic creation
+AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/hi_IN/zapier.lang b/htdocs/langs/hi_IN/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/hi_IN/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index 506c379e981..0838fa32941 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Načini prodaje
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Načini nabavke
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Raspon obračunskog računa
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index b8fe65b6f57..5555183e943 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web Server korisnik/grupa
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Charset baze za sortiranje podataka
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Modul <b>%s</b> mora biti omogućen
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Poveži s objektom
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=Kao zadano preporučeni IRPF je 0. Kraj prvila.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Izvještaji o lokalnim porezima
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Podešavanje modula korisnka
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Više poduzeća module podešavanje
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Sakrij slike u gornjem izborniku
 LeftMenuBackgroundColor=Boja pozadine lijevog izbornika
 BackgroundTableTitleColor=Boja pozadine za zaglavlje tablica
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Boja pozadine za neparne redove u tablici
 BackgroundTableLineEvenColor=Boja pozadine za parne redove u tablici
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=PBR
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index 5631061f309..e033143aff2 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=Broj računa po mjesecu
 AmountOfBills=Broj računa
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Iznos računa po mjesecu (bez PDV-a)
-ShowSocialContribution=Prikaži društveni/fiskalni porez
-ShowBill=Prikaži račun
-ShowInvoice=Prikaži račun
-ShowInvoiceReplace=Prikaži zamjenski računa
-ShowInvoiceAvoir=Prikaži storno računa/knjižno odobrenje
-ShowInvoiceDeposit=Prikaži račun za predujam
-ShowInvoiceSituation=Prikaži račun etape
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Prikaži plaćanje
 AlreadyPaid=Plaćeno do sada
 AlreadyPaidBack=Povrati do sada
 AlreadyPaidNoCreditNotesNoDeposits=Uplaćeni iznos (bez knjižnih odobrenja i predujmova)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Dospijeće po primitku
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=Kako biste izradili novi predložak računa morate prvo izraditi običan račun i onda ga promijeniti u "predložak"
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=PDF račun prema Crevette predlošku. Kompletan predložak računa za etape
 TerreNumRefModelDesc1=Vraća broj u formatu %syymm-nnnn za standardne račune i %syymm-nnnn za odobrenja gdje je yy godina, mm je mjesec i nnnn je sljedni broj bez prekida i bez mogučnosti povratka na 0
diff --git a/htdocs/langs/hr_HR/donations.lang b/htdocs/langs/hr_HR/donations.lang
index 134409d1d52..d7c4d18809a 100644
--- a/htdocs/langs/hr_HR/donations.lang
+++ b/htdocs/langs/hr_HR/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Izradi donaciju
 NewDonation=Nova donacija
 DeleteADonation=Obriši donaciju
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Prikaži donaciju
 PublicDonation=Javna donacija
 DonationsArea=Donacije
 DonationStatusPromiseNotValidated=Skica obečanja
@@ -17,11 +16,12 @@ DonationStatusPromiseNotValidatedShort=Skica
 DonationStatusPromiseValidatedShort=Ovjereno
 DonationStatusPaidShort=Primljeno
 DonationTitle=Račun za donaciju
+DonationDate=Donation date
 DonationDatePayment=Datum plačanja
 ValidPromess=Ovjeri obečanje
 DonationReceipt=Račun za donaciju
 DonationsModels=Modeli dokumenata za račune donacija
-LastModifiedDonations=Zadnjih %s promjenjenih donacija
+LastModifiedDonations=Zadnje %s promijenjene donacije
 DonationRecipient=Primatelj donacije
 IConfirmDonationReception=Primatelj objavljuje primitak, kao donaciju, sljedećeg iznosa
 MinimumAmount=Minimalni iznos je %s
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index cbc8e21d8c2..6cdf2638483 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -5,7 +5,7 @@ DIRECTION=ltr
 # stsongstdlight or cid0cs are for simplified Chinese
 # To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
-FONTSIZEFORPDF=9
+FONTSIZEFORPDF=10
 SeparatorDecimal=,
 SeparatorThousand=.
 FormatDateShort=%d/%m/%Y
@@ -59,7 +59,7 @@ ErrorNoRequestInError=Nema zahtjeva s greškom
 ErrorServiceUnavailableTryLater=Usluga trenutno nije dostupna. Pokušajte ponovo poslije.
 ErrorDuplicateField=Dvostruka vrijednost za jedno polje
 ErrorSomeErrorWereFoundRollbackIsDone=Pronađene su greške. Izmjene povućene.
-ErrorConfigParameterNotDefined=Značajka <b>%s</b> nije određena u Dolibarr datoteci s postavkama <b>conf.php</b>.
+ErrorConfigParameterNotDefined=Značajka <b>%s</b> nije određena u dototeci s postavkama Dolibarra <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Korisnik <b>%s</b> ne postoji u bazi Dolibarra
 ErrorNoVATRateDefinedForSellerCountry=Greška, za zemlju '%s' nisu upisane stope poreza
 ErrorNoSocialContributionForSellerCountry=Greška, za zemlju '%s' nisu upisani društveni/fiskalni porezi.
@@ -426,6 +426,7 @@ Modules=Moduli/Aplikacije
 Option=Opcija
 List=Popis
 FullList=Cijeli popis
+FullConversation=Full conversation
 Statistics=Statistika
 OtherStatistics=Ostale statistike
 Status=Stanje
@@ -722,7 +723,7 @@ Notes=Bilješke
 AddNewLine=Dodaj novu stavku
 AddFile=Dodaj datoteku
 FreeZone=Ovaj proizvod/usluga nije predhodno upisan
-FreeLineOfType=Slobodan upis, vrsta stavke:
+FreeLineOfType=Slobodan upis, vrsta:
 CloneMainAttributes=Kloniraj predmet sa svim glavnim svojstvima
 ReGeneratePDF=Re-generate PDF
 PDFMerge=Spoji PDF
@@ -882,7 +883,7 @@ SetMultiCurrencyCode=Odredi valutu
 BulkActions=Opsežne radnje
 ClickToShowHelp=Klikni za prikaz pomoći
 WebSite=Website
-WebSites=Web lokacije
+WebSites=Mrežne stranice
 WebSiteAccounts=Website accounts
 ExpenseReport=Izvještaj troškova
 ExpenseReports=Izvještaji troškova
@@ -953,6 +954,7 @@ SearchIntoMembers=Članovi
 SearchIntoUsers=Korisnici
 SearchIntoProductsOrServices=Proizvodi ili usluge
 SearchIntoProjects=Projekti
+SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Zadaci
 SearchIntoCustomerInvoices=Računi za kupce
 SearchIntoSupplierInvoices=Ulazni računi
@@ -998,9 +1000,9 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=Za zatvaranje
-ToProcess=Za obradu
+ToProcess=Za provedbu
 ToApprove=To approve
-GlobalOpenedElemView=Global view
+GlobalOpenedElemView=Opći pregled
 NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
 NoArticlesFoundForTheCategory=No article found for the category
 ToAcceptRefuse=Za prihvatiti | odbiti
@@ -1008,7 +1010,7 @@ ContactDefault_agenda=Događaj
 ContactDefault_commande=Narudžba kupca
 ContactDefault_contrat=Ugovor
 ContactDefault_facture=Račun
-ContactDefault_fichinter=Intervencija
+ContactDefault_fichinter=Zahvat
 ContactDefault_invoice_supplier=Supplier Invoice
 ContactDefault_order_supplier=Purchase Order
 ContactDefault_project=Projekt
@@ -1028,3 +1030,6 @@ YAxis=Y-Axis
 StatusOfRefMustBe=Status of %s must be %s
 DeleteFileHeader=Confirm file delete
 DeleteFileText=Do you really want delete this file?
+ShowOtherLanguages=Show other languages
+SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
+NotUsedForThisCustomer=Not used for this customer
diff --git a/htdocs/langs/hr_HR/modulebuilder.lang b/htdocs/langs/hr_HR/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/hr_HR/modulebuilder.lang
+++ b/htdocs/langs/hr_HR/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/hr_HR/multicurrency.lang b/htdocs/langs/hr_HR/multicurrency.lang
new file mode 100644
index 00000000000..d88a98f2a6e
--- /dev/null
+++ b/htdocs/langs/hr_HR/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Preostali iznos, izvorna valuta
+MulticurrencyPaymentAmount=Iznos plaćanja, prvotna valuta
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index 05b5aaff31a..66fc8dd3384 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Usluga za uporabu na linijama
 InvoiceGeneratedFromTimeSpent=Račun %s generiran je od vremena utrišenog na projektu
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Upotreba: Prilika
 UsageTasks=Upotreba: Zadaci
diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang
index d7acd018105..b93f725b338 100644
--- a/htdocs/langs/hr_HR/website.lang
+++ b/htdocs/langs/hr_HR/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/hr_HR/zapier.lang b/htdocs/langs/hr_HR/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/hr_HR/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index b547bf274de..b104ad68c84 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Teljes eladási marzs
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index bc4e1be3552..e564f090666 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -12,8 +12,8 @@ VersionRecommanded=Ajánlott
 FileCheck=A fájlkészlet integritásának ellenőrzése
 FileCheckDesc=Ez az eszköz lehetővé teszi a fájlok integritásának és az alkalmazás beállításainak ellenőrzését, összehasonlítva az egyes fájlokat a hivatalos fájlokkal. Bizonyos beállítási állandók értékét szintén ellenőrizni lehet. Ezzel az eszközzel meghatározhatja, hogy valamelyik fájlt módosították-e (például egy hacker).
 FileIntegrityIsStrictlyConformedWithReference=A fájlok integritása szigorúan megfelel a referenciának.
-FileIntegrityIsOkButFilesWereAdded=A fájlok integritásának ellenőrzése sikeres volt, azonban néhány új fájlt hozzáadtak.
-FileIntegritySomeFilesWereRemovedOrModified=A fájlok integritásának ellenőrzése sikertelen. Néhány fájlt módosítottak, eltávolítottak vagy hozzáadtak.
+FileIntegrityIsOkButFilesWereAdded=A fájlok integritásának ellenőrzése sikeres volt, azonban néhány új fájl hozzá lett adva.
+FileIntegritySomeFilesWereRemovedOrModified=A fájlok integritásának ellenőrzése nem járt sikerrel. Néhány fájl módosítva lett, el lett távolítva vagy hozzá lett adva.
 GlobalChecksum=Globális ellenőrző összeg
 MakeIntegrityAnalysisFrom=Alkalmazásfájlok integritásának elemzése
 LocalSignature=Beágyazott helyi aláírás (kevésbé megbízható)
@@ -40,6 +40,7 @@ WebUserGroup=Webszerver felhasználója / csoportja
 NoSessionFound=Úgy tűnik, hogy a PHP-konfigurációja nem engedélyezi az aktív munkamenetek felsorolását. A munkamenetek mentéséhez használt könyvtár (<b>%s</b>) védett lehet (például operációs rendszer jogosultság vagy open_basedir PHP irányelv).
 DBStoringCharset=Az adatbázis adattárolási karakterkészlete
 DBSortingCharset=Az adatbázis adatrendezési karakterkészlete
+HostCharset=Host charset
 ClientCharset=Ügyfél karakterkészlet
 ClientSortingCharset=Ügyfél karakterkészlet egyeztetés
 WarningModuleNotActive=A <b>%s</b> modult engedélyezni kell
@@ -65,7 +66,7 @@ DictionarySetup=Szótár beállítása
 Dictionary=Szótárak
 ErrorReservedTypeSystemSystemAuto=A "system" és a "systemauto" típusértékek foglaltak. Saját bejegyzés hozzáadására használhatja a "user" értéket.
 ErrorCodeCantContainZero=A kód nem tartalmazhatja a 0 értéket
-DisableJavascript=Disable JavaScript és Ajax funkciókkal
+DisableJavascript=JavaScript és Ajax funkciók letiltása
 DisableJavascriptNote=Megjegyzés: teszt vagy hibakeresés céljából. A vak vagy szöveges böngészők optimalizálásához lehetséges, hogy a felhasználói profilban érdemes beállítani
 UseSearchToSelectCompanyTooltip=Ha nagyszámú partnerrel rendelkezik (> 100 000), akkor növelheti a sebességet, ha a COMPANY_DONOTSEARCH_ANYWHERE értéket 1-re állítja a Beállítás-> Egyéb menüben. A keresés ezután a karakterlánc elejére korlátozódik.
 UseSearchToSelectContactTooltip=Ha nagyszámú harmadik fél van (> 100 000), akkor növelheti a sebességet, ha a CONTACT_DONOTSEARCH_ANYWHERE állandó értéket 1-re állítja a Beállítás-> Egyéb menüben. A keresés ezután a karakterlánc elejére korlátozódik.
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Jelölőnégyzeteket
 ExtrafieldCheckBoxFromList=Jelölőnégyzetek a táblából
 ExtrafieldLink=Link egy objektumhoz
 ComputedFormula=Számított mező
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Számított mező mentése
 ComputedpersistentDesc=A kiszámított extra mezőket az adatbázis tárolja, azonban az érték csak akkor kerül újraszámításra, ha a mező objektuma megváltozik. Ha a kiszámított mező más objektumoktól vagy globális adatoktól függ, akkor ez az érték rossz lehet!
 ExtrafieldParamHelpPassword=Ha ezt a mezőt üresen hagyja, akkor ez az érték titkosítás nélkül lesz tárolva (a mezőt csak a csillaggal lehet elrejteni a képernyőn). <br> Állítsa be az „auto” értéket az alapértelmezett titkosítási szabály használatával a jelszó adatbázisba mentéséhez (akkor az olvasott érték csak hash kód lesz, az eredeti érték nem olvasható)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=Alapértelmezésben a javasolt IRPF 0. Vége a szabály.
 LocalTax2IsUsedExampleES=Spanyolországban, szabadúszók és független szakemberek, akik szolgáltatásokat nyújtanak és a vállalatok akik úgy döntöttek, az adórendszer a modulok.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=A jelszavak létrehozására és érvényesítésére
 DisableForgetPasswordLinkOnLogonPage=Ne jelenítse meg az "Elfelejtett jelszó" linket a Bejelentkezés oldalon
 UsersSetup=Felhasználók modul beállítása
 UserMailRequired=Új felhasználó létrehozásához e-mail szükséges
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Több cég setup modul
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index f1aaa7a59e7..18f7c42c99c 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Számlák összege
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Összege a számlák havonta (adózott)
-ShowSocialContribution=Mutasd a szociális adót
-ShowBill=Számla megjelenítése
-ShowInvoice=Számla megjelenítése
-ShowInvoiceReplace=Helyetesítő számla megjelenítése
-ShowInvoiceAvoir=Jóváírás mutatása
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Fizetés mutatása
 AlreadyPaid=Már kifizetett
 AlreadyPaidBack=Visszafizetés megtörtént
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Státusz
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/hu_HU/donations.lang b/htdocs/langs/hu_HU/donations.lang
index 84aac702dfd..a1673755055 100644
--- a/htdocs/langs/hu_HU/donations.lang
+++ b/htdocs/langs/hu_HU/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Create a donation
 NewDonation=Új adomány
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Show donation
 PublicDonation=Publikus adomány
 DonationsArea=Adomány terület
 DonationStatusPromiseNotValidated=Igéret vázlat
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Vázlat
 DonationStatusPromiseValidatedShort=Hitelesített
 DonationStatusPaidShort=Kapott
 DonationTitle=Donation receipt
+DonationDate=Donation date
 DonationDatePayment=Fizetési határidő
 ValidPromess=Érvényesítés ígéret
 DonationReceipt=Donation receipt
diff --git a/htdocs/langs/hu_HU/interventions.lang b/htdocs/langs/hu_HU/interventions.lang
index 4755bac2007..40f2ec4977c 100644
--- a/htdocs/langs/hu_HU/interventions.lang
+++ b/htdocs/langs/hu_HU/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Ügyfél kapcsolat követés
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/hu_HU/modulebuilder.lang b/htdocs/langs/hu_HU/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/hu_HU/modulebuilder.lang
+++ b/htdocs/langs/hu_HU/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index 0b9ee0449c2..50a4460b1ab 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
index 4548cbdf7ed..1b6e840db9d 100644
--- a/htdocs/langs/hu_HU/website.lang
+++ b/htdocs/langs/hu_HU/website.lang
@@ -57,7 +57,7 @@ NoPageYet=Még nincs oldal
 YouCanCreatePageOrImportTemplate=Készíthet új oldalt, vagy importálhat egy teljes webhelysablont
 SyntaxHelp=Súgó a konkrét szintaxis-tippekhez
 YouCanEditHtmlSourceckeditor=A HTML forráskódot a szerkesztőben a &quot;Forrás&quot; gombbal szerkesztheti.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Oldal / tároló klónozása
 CloneSite=Klón webhely
 SiteAdded=Webhely hozzáadva
@@ -77,7 +77,7 @@ BlogPost=Blog bejegyzés
 WebsiteAccount=Weboldal-account
 WebsiteAccounts=Webhely-accountok
 AddWebsiteAccount=Hozzon létre webhely accountot
-BackToListOfThirdParty=Vissza a harmadik felek listájához
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Először tiltsa le a webhelyet
 MyContainerTitle=Saját webhelyem címe
 AnotherContainer=Így lehet beépíteni egy másik oldal / tároló tartalmát (itt lehet hiba, ha engedélyezi a dinamikus kódot, mert a beágyazott konténer nem létezik)
diff --git a/htdocs/langs/hu_HU/zapier.lang b/htdocs/langs/hu_HU/zapier.lang
new file mode 100644
index 00000000000..3b4fd59132c
--- /dev/null
+++ b/htdocs/langs/hu_HU/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr modul
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Zapier for Dolibarr beállítása
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index e4768b87f5f..863d677e5da 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total margin penjualan
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode penjualan
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode pembelian
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Rentang akun-akun akuntansi
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index acbf3ab23a7..dfb3b7223f4 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Server web untuk pengguna ( user ) / grup.
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Karakter set atau charset untuk menyimpan data
 DBSortingCharset=Karakter set atau charset didalam Database untuk penyortiran data
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Modul <b>%s</b> harus di nyalakan
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Users module setup
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Kode Pos
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index adafb4ff710..6cd5f0ac5cf 100644
--- a/htdocs/langs/id_ID/bills.lang
+++ b/htdocs/langs/id_ID/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=Show invoice
-ShowInvoice=Show invoice
-ShowInvoiceReplace=Show replacing invoice
-ShowInvoiceAvoir=Show credit note
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/id_ID/donations.lang b/htdocs/langs/id_ID/donations.lang
index 503432517ad..ef8cce95038 100644
--- a/htdocs/langs/id_ID/donations.lang
+++ b/htdocs/langs/id_ID/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Create a donation
 NewDonation=New donation
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Show donation
 PublicDonation=Public donation
 DonationsArea=Donations area
 DonationStatusPromiseNotValidated=Draft promise
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Konsep
 DonationStatusPromiseValidatedShort=Divalidasi
 DonationStatusPaidShort=Received
 DonationTitle=Donation receipt
+DonationDate=Donation date
 DonationDatePayment=Tanggal pembayaran
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
diff --git a/htdocs/langs/id_ID/interventions.lang b/htdocs/langs/id_ID/interventions.lang
index e7667ef6946..e5936f8246e 100644
--- a/htdocs/langs/id_ID/interventions.lang
+++ b/htdocs/langs/id_ID/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/id_ID/modulebuilder.lang b/htdocs/langs/id_ID/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/id_ID/modulebuilder.lang
+++ b/htdocs/langs/id_ID/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/id_ID/multicurrency.lang b/htdocs/langs/id_ID/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/id_ID/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index d207986f87c..2e2ab925585 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/id_ID/website.lang b/htdocs/langs/id_ID/website.lang
index c802b2d2ae8..bce2a09fb03 100644
--- a/htdocs/langs/id_ID/website.lang
+++ b/htdocs/langs/id_ID/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/id_ID/zapier.lang b/htdocs/langs/id_ID/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/id_ID/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index b9a78b69be0..04161db7e5a 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index a9a52b04b77..fc6f20d8da7 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Vefþjóninn notandi / hópur
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Gagnasafn msgstr til að geyma gögn
 DBSortingCharset=Gagnasafn msgstr til að flokka gögn
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=<b>Module %s </b> verður að vera virkt
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=Sjálfgefið er fyrirhuguð IRPF er 0. Lok reglu.
 LocalTax2IsUsedExampleES=Á Spáni freelancers og sjálfstæða sérfræðinga sem veita þjónustu og fyrirtæki sem hafa valið skatt kerfi eininga.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Notendur mát skipulag
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-fyrirtæki mát skipulag
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index 87fd0e67073..021a6a69fb8 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Upphæð á reikningi
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Upphæð á reikningi eftir mánuði (eftir skatta)
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=Sýna reikning
-ShowInvoice=Sýna reikning
-ShowInvoiceReplace=Sýna skipta Reikningar
-ShowInvoiceAvoir=Sýna kredit athugið
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Sýna greiðslu
 AlreadyPaid=Þegar greitt
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/is_IS/donations.lang b/htdocs/langs/is_IS/donations.lang
index bc1a2f2d943..ecf48a28958 100644
--- a/htdocs/langs/is_IS/donations.lang
+++ b/htdocs/langs/is_IS/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Create a donation
 NewDonation=New málefnið
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Show donation
 PublicDonation=Almenn framlög
 DonationsArea=Fjárframlög area
 DonationStatusPromiseNotValidated=Drög að lofa
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Víxill
 DonationStatusPromiseValidatedShort=Staðfestar
 DonationStatusPaidShort=Móttekin
 DonationTitle=Donation receipt
+DonationDate=Donation date
 DonationDatePayment=Gjalddagi
 ValidPromess=Staðfesta loforð
 DonationReceipt=Donation receipt
diff --git a/htdocs/langs/is_IS/interventions.lang b/htdocs/langs/is_IS/interventions.lang
index 395f3cd1ca6..97a9f4d2785 100644
--- a/htdocs/langs/is_IS/interventions.lang
+++ b/htdocs/langs/is_IS/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Eftir upp viðskiptavina samband
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/is_IS/modulebuilder.lang b/htdocs/langs/is_IS/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/is_IS/modulebuilder.lang
+++ b/htdocs/langs/is_IS/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/is_IS/multicurrency.lang b/htdocs/langs/is_IS/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/is_IS/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index 7333330d5c4..e65a23d7fc4 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/is_IS/website.lang b/htdocs/langs/is_IS/website.lang
index a43243bd41a..7cb01917290 100644
--- a/htdocs/langs/is_IS/website.lang
+++ b/htdocs/langs/is_IS/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/is_IS/zapier.lang b/htdocs/langs/is_IS/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/is_IS/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/it_CH/accountancy.lang b/htdocs/langs/it_CH/accountancy.lang
new file mode 100644
index 00000000000..9827b9d3795
--- /dev/null
+++ b/htdocs/langs/it_CH/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
diff --git a/htdocs/langs/it_CH/admin.lang b/htdocs/langs/it_CH/admin.lang
new file mode 100644
index 00000000000..b81932f9f03
--- /dev/null
+++ b/htdocs/langs/it_CH/admin.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - admin
+Module56Name=Telephony
+Module56Desc=Telephony integration
diff --git a/htdocs/langs/it_CH/companies.lang b/htdocs/langs/it_CH/companies.lang
new file mode 100644
index 00000000000..6897cf22f06
--- /dev/null
+++ b/htdocs/langs/it_CH/companies.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - companies
+Contact=Contact
diff --git a/htdocs/langs/it_CH/main.lang b/htdocs/langs/it_CH/main.lang
new file mode 100644
index 00000000000..2e691473326
--- /dev/null
+++ b/htdocs/langs/it_CH/main.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
diff --git a/htdocs/langs/it_CH/projects.lang b/htdocs/langs/it_CH/projects.lang
new file mode 100644
index 00000000000..7e42793b0e9
--- /dev/null
+++ b/htdocs/langs/it_CH/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index 66b70b12ea1..9be0770d70b 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Righe di fatture bloccate
 ExpenseReportLines=Linee di note spese da associare
 ExpenseReportLinesDone=Linee vincolate di note spese
 IntoAccount=Collega linee con il piano dei conti
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Associa
@@ -233,8 +234,10 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Mostra bilancio di apertura
 HideOpeningBalance=Nascondi bilancio di apertura
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Gruppo di conto
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -314,12 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
 Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Id Piano dei Conti
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index a0a16030215..a790bf4a540 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -20,8 +20,8 @@ LocalSignature=Firma locale incorporata (meno affidabile)
 RemoteSignature=Firma remota (più affidabile)
 FilesMissing=File mancanti
 FilesUpdated=File aggiornati
-FilesModified=Files modificati
-FilesAdded=Files aggiunti
+FilesModified=File modificati
+FilesAdded=File aggiunti
 FileCheckDolibarr=Controlla l'integrità dei file dell'applicazione
 AvailableOnlyOnPackagedVersions=Il file locale per la verifica d'integrità è disponibile solo quando l'applicazione è installata da un pacchetto ufficiale
 XmlNotFound=File xml di controllo integrità non trovato
@@ -40,6 +40,7 @@ WebUserGroup=Utente/gruppo del server web (per esempio www-data)
 NoSessionFound=La tua configurazione PHP sembra non permetta di mostrare le sessioni attive. La directory utilizzata per salvare le sessioni (<b>%s</b>) potrebbe non essere protetta (per esempio tramite permessi SO oppure dalla direttiva PHP open_basedir).
 DBStoringCharset=Charset per il salvataggio dei dati nel database
 DBSortingCharset=Set di caratteri del database per ordinare i dati
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Il modulo <b> %s </b> deve essere attivato
@@ -222,7 +223,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 WebSiteDesc=Siti web esterni per ulteriori moduli add-on (non essenziali)...
 DevelopYourModuleDesc=Spunti per sviluppare il tuo modulo...
 URL=Collegamento
-RelativeURL=Relative URL
+RelativeURL=Indirizzo URL relativo
 BoxesAvailable=Widget disponibili
 BoxesActivated=Widget attivi
 ActivateOn=Attiva sul
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Collegamento ad un oggetto
 ComputedFormula=Campo calcolato
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -448,8 +449,8 @@ KeepEmptyToUseDefault=Lasciare vuoto per utilizzare il valore di default
 DefaultLink=Link predefinito
 SetAsDefault=Imposta come predefinito
 ValueOverwrittenByUserSetup=Attenzione, questo valore potrebbe essere sovrascritto da un impostazione specifica dell'utente (ogni utente può settare il proprio url clicktodial)
-ExternalModule=External module
-InstalledInto=Installed into directory %s
+ExternalModule=Modulo esterno
+InstalledInto=Installato nella directory %s
 BarcodeInitForthird-parties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
@@ -738,7 +739,7 @@ Permission154=Record Credits/Rejections of direct debit payment orders
 Permission161=Leggi contratti / abbonamenti
 Permission162=Crea/modifica contratti/abbonamenti
 Permission163=Attiva un servizio/sottoscrizione di un contratto
-Permission164=Disable a service/subscription of a contract
+Permission164=Disattivare un servizio di un contratto
 Permission165=Elimina contratti / abbonamenti
 Permission167=Esportare contratti
 Permission171=Vedi viaggi e spese (propri e i suoi subordinati)
@@ -802,7 +803,7 @@ Permission300=Read barcodes
 Permission301=Create/modify barcodes
 Permission302=Delete barcodes
 Permission311=Vedere servizi
-Permission312=Assign service/subscription to contract
+Permission312=Assegnare un servizio a un contratto
 Permission331=Vedere segnalibri
 Permission332=Creare/modificare segnalibri
 Permission333=Eliminare segnalibri
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=Per impostazione predefinita la proposta di IRPF è 0. Fine della regola.
 LocalTax2IsUsedExampleES=In Spagna, liberi professionisti e freelance che forniscono servizi e le aziende che hanno scelto il regime fiscale modulare.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1188,7 +1189,7 @@ SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where
 ShowProfIdInAddress=Nei documenti mostra identità professionale completa di:
 ShowVATIntaInAddress=Nascondi il numero di partita IVA intracomunitaria negli indirizzi
 TranslationUncomplete=Traduzione incompleta
-MAIN_DISABLE_METEO=Disable meteorological view
+MAIN_DISABLE_METEO=Disabilita visualizzazione meteo
 MeteoStdMod=Standard mode
 MeteoStdModEnabled=Standard mode enabled
 MeteoPercentageMod=Modalità percentuale
@@ -1257,7 +1258,7 @@ PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
-FieldEdition=Edition of field %s
+FieldEdition=Modifica del campo %s
 FillThisOnlyIfRequired=Per esempio: +2 (compilare solo se ci sono problemi di scostamento del fuso orario)
 GetBarCode=Ottieni codice a barre
 NumberingModules=Numbering models
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Non mostrare il link "Password dimenticata?" nella pagina di accesso
 UsersSetup=Impostazioni modulo utenti
 UserMailRequired=È obbligatorio inserire un indirizzo email per creare un nuovo utente
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1305,7 +1307,7 @@ BillsPDFModules=Modelli fattura in pdf
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
 ForceInvoiceDate=Forza la data della fattura alla data di convalida
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggerire le modalità predefinite di pagamento delle fatture, se non definite già nella fattura
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
 SuggestPaymentByChequeToAddress=Suggest payment by check to
 FreeLegalTextOnInvoices=Testo libero sulle fatture
@@ -1317,10 +1319,10 @@ SupplierPaymentSetup=Impostazioni pagamenti fornitori
 PropalSetup=Impostazioni proposte commerciali
 ProposalsNumberingModules=Modelli di numerazione della proposta commerciale
 ProposalsPDFModules=Modelli per pdf proposta commerciale
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Suggerire le modalità predefinite di pagamento delle proposte, se non definite già nella proposta
 FreeLegalTextOnProposal=Testo libero sulle proposte commerciali
 WatermarkOnDraftProposal=Bozze dei preventivi filigranate (nessuna filigrana se vuoto)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Richiedi conto bancario di destinazione sulle proposte
 ##### SupplierProposal #####
 SupplierProposalSetup=Price requests suppliers module setup
 SupplierProposalNumberingModules=Price requests suppliers numbering models
@@ -1332,7 +1334,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Suggerire le modalità predefinite di pagamento degli ordini, se non definite già nell'ordine
 OrdersSetup=Impostazione gestione Ordini Cliente
 OrdersNumberingModules=Modelli di numerazione ordini
 OrdersModelModule=Modelli per ordini in pdf
@@ -1358,7 +1360,7 @@ MemberMainOptions=Opzioni principali
 AdherentLoginRequired= Gestire un account di accesso per ogni membro
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox per inviare una mail di conferma per i membri (è attiva per impostazione predefinita)
-VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
+VisitorCanChooseItsPaymentMode=Il visitatore può scegliere tra le modalità di pagamento disponibili
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 ##### LDAP setup #####
 LDAPSetup=Impostazioni del protocollo LDAP
@@ -1729,9 +1731,9 @@ ChequeReceiptsNumberingModule=Check Receipts Numbering Module
 ##### Multicompany #####
 MultiCompanySetup=Impostazioni modulo multiazienda
 ##### Suppliers #####
-SuppliersSetup=Vendor module setup
+SuppliersSetup=Impostazioni modulo fornitori
 SuppliersCommandModel=Modello completo dell'ordine d'acquisto
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Modello completo di fattura fornitore
 SuppliersInvoiceNumberingModel=Modello per la numerazione delle fatture fornitore
 IfSetToYesDontForgetPermission=Se impostato su un valore non nullo, non dimenticare di fornire autorizzazioni a gruppi o utenti autorizzati per la seconda approvazione
@@ -1803,12 +1805,13 @@ TopMenuDisableImages=Nascondi le icone nel menu superiore
 LeftMenuBackgroundColor=Colore di sfondo menù laterale
 BackgroundTableTitleColor=Colore di sfondo della riga di intestazione
 BackgroundTableTitleTextColor=Colore del testo per la riga del titolo delle tabelle
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Colore di sfondo per le linee dispari delle tabelle
 BackgroundTableLineEvenColor=Colore di sfondo per le linee pari delle tabelle
 MinimumNoticePeriod=Periodo minimo di avviso (le richieste di ferie/permesso dovranno essere effettuate prima di questo periodo)
 NbAddedAutomatically=Numero di giorni aggiunti ai contatori di utenti (automaticamente) ogni mese
 EnterAnyCode=Questo campo contiene un riferimento per identificare la linea. Inserisci qualsiasi valore di tua scelta, ma senza caratteri speciali.
-Enter0or1=Enter 0 or 1
+Enter0or1=Inserire 0 o 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=Il colore RGB è nel formato HEX, es:FF0000
 PositionIntoComboList=Posizione di questo modello nella menu a tendina
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Tracking ID not found
 FormatZip=CAP
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Orari di apertura
 OpeningHoursDesc=Inserisci gli orari di apertura regolare della tua azienda.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index 6473762dbcc..5394de1c8f9 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -80,13 +80,13 @@ PaymentsReports=Report pagamenti
 PaymentsAlreadyDone=Pagamenti già fatti
 PaymentsBackAlreadyDone=Rimborso già effettuato
 PaymentRule=Regola pagamento
-PaymentMode=Payment Type
+PaymentMode=Tipo di pagamento
 PaymentTypeDC=Carta di Debito/Credito
 PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Tipo di pagamento (id)
+CodePaymentMode=Tipo di pagamento (codice)
+LabelPaymentMode=Tipo di pagamento (etichetta)
+PaymentModeShort=Tipo di pagamento
 PaymentTerm=Payment Term
 PaymentConditions=Termini di Pagamento
 PaymentConditionsShort=Termini di Pagamento
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=Numero di fatture per mese
 AmountOfBills=Importo delle fatture
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Importo delle fatture per mese (al netto delle imposte)
-ShowSocialContribution=Mostra imposte sociali/fiscali
-ShowBill=Visualizza fattura
-ShowInvoice=Visualizza fattura
-ShowInvoiceReplace=Visualizza la fattura sostitutiva
-ShowInvoiceAvoir=Visualizza nota di credito
-ShowInvoiceDeposit=Mostra fattura d'acconto
-ShowInvoiceSituation=Mostra avanzamento lavori
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Visualizza pagamento
 AlreadyPaid=Già pagato
 AlreadyPaidBack=Già rimborsato
 AlreadyPaidNoCreditNotesNoDeposits=Già pagata (senza note di credito e note d'accredito)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Attenzione, la data della fattura è successiva alla data odierna
 WarningInvoiceDateTooFarInFuture=Attenzione, la data della fattura è troppo lontana dalla data odierna
 ViewAvailableGlobalDiscounts=Mostra gli sconti disponibili
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Stato
 PaymentConditionShortRECEP=Rimessa diretta
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=Per creare un nuovo modelo bisogna prima creare una fattura normale e poi convertirla.
-PDFCrabeDescription=Modello di fattura PDF Crabe. Un modello completo di fattura 
+PDFCrabeDescription=Modello di fattura PDF Crabe. Un modello completo di fattura (vecchia implementazione del modello Sponge)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Modello di fattura Crevette. Template completo per le fatture (Modello raccomandato)
 TerreNumRefModelDesc1=Restituisce un numero nel formato %syymm-nnnn per le fatture, %syymm-nnnn per le note di credito e %syymm-nnnn per i versamenti, dove yy è l'anno, mm è il mese e nnnn è una sequenza progressiva, senza salti e che non si azzera.
diff --git a/htdocs/langs/it_IT/commercial.lang b/htdocs/langs/it_IT/commercial.lang
index ae6a92c63b0..45304358bf6 100644
--- a/htdocs/langs/it_IT/commercial.lang
+++ b/htdocs/langs/it_IT/commercial.lang
@@ -19,7 +19,7 @@ ShowTask=Visualizza compito
 ShowAction=Visualizza azione
 ActionsReport=Prospetto azioni
 ThirdPartiesOfSaleRepresentative=Soggetti terzi con agenti di vendita
-SaleRepresentativesOfThirdParty=Agenti di vendita di soggetti terzi
+SaleRepresentativesOfThirdParty=Agenti di vendita del soggetto terzo
 SalesRepresentative=Venditore
 SalesRepresentatives=Venditori
 SalesRepresentativeFollowUp=Venditore (di follow-up)
@@ -73,8 +73,8 @@ StatusProsp=Stato del cliente potenziale
 DraftPropals=Bozze di proposte commerciali
 NoLimit=Nessun limite
 ToOfferALinkForOnlineSignature=Link per firma online
-WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
+WelcomeOnOnlineSignaturePage=Benvenuti nella pagina per accettare proposte commerciali da %s
 ThisScreenAllowsYouToSignDocFrom=Questa schermata consente di accettare e firmare, o rifiutare, un preventivo/proposta commerciale
 ThisIsInformationOnDocumentToSign=Queste sono informazioni sul documento da accettare o rifiutare
-SignatureProposalRef=Signature of quote/commercial proposal %s
+SignatureProposalRef=Firma del preventivo/proposta commerciale %s
 FeatureOnlineSignDisabled=Funzionalità per la firma online disattivata o documento generato prima che la funzione fosse abilitata
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index fc4477d1495..c70da08be62 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -188,7 +188,7 @@ ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
+ErrorStockIsNotEnoughToAddProductOnProposal=Le scorte del prodotto %s non sono sufficienti per aggiungerlo in una nuova proposta.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=Impossibile trovare il file del modulo
 ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
@@ -240,8 +240,8 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
-WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
-WarningEnableYourModulesApplications=Click here to enable your modules and applications
+WarningMandatorySetupNotComplete=I parametri di configurazione obbligatori non sono ancora stati definiti.
+WarningEnableYourModulesApplications=Attiva i moduli/applicazioni per iniziare ad utilizzare il software
 WarningSafeModeOnCheckExecDir=Attenzione: quando è attiva l'opzione <b>safe_mode</b>, il comando deve essere contenuto in una directory dichiarata dal parametro <b>safe_mode_exec_dir</b>.
 WarningBookmarkAlreadyExists=Un segnalibro per questo link (URL) o con lo stesso titolo esiste già.
 WarningPassIsEmpty=Attenzione, il database è accessibile senza password. Questa è una grave falla di sicurezza! Si dovrebbe aggiungere una password per il database e cambiare il file <b>conf.php</b> di conseguenza.
diff --git a/htdocs/langs/it_IT/exports.lang b/htdocs/langs/it_IT/exports.lang
index bf0ca6d90bc..0e0af4a9030 100644
--- a/htdocs/langs/it_IT/exports.lang
+++ b/htdocs/langs/it_IT/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Campi titolo
 NowClickToGenerateToBuildExportFile=Ora, fare clic su "Genera" per generare il file di esportazione ...
 AvailableFormats=Formati disponibili
 LibraryShort=Libreria
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Passaggio
 FormatedImport=Importazione assistita
 FormatedImportDesc1=Questa sezione consente di importare dati personalizzati, utilizzando un assistente per aiutarti nel processo anche senza conoscenze tecniche.
@@ -119,7 +121,7 @@ KeepEmptyToGoToEndOfFile=Lascia il campo vuoto per andare alla fine del file
 SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for update attempt
 UpdateNotYetSupportedForThisImport=Il caricamento non è supportato per questo tipo di importazione (solo inserimento)
 NoUpdateAttempt=No update attempt was performed, only insert
-ImportDataset_user_1=Untenti (dipendenti o no) e proprietà
+ImportDataset_user_1=Utenti (dipendenti o no) e proprietà
 ComputedField=Computed field
 ## filters
 SelectFilterFields=Se vuoi filtrare su qualche valore, inserisci qui il valore.
diff --git a/htdocs/langs/it_IT/holiday.lang b/htdocs/langs/it_IT/holiday.lang
index 4dde053c1ee..1a91af8aeb4 100644
--- a/htdocs/langs/it_IT/holiday.lang
+++ b/htdocs/langs/it_IT/holiday.lang
@@ -99,8 +99,8 @@ AllHolidays=Tutte le richieste di permesso
 HalfDay=Mezza giornata
 NotTheAssignedApprover=You are not the assigned approver
 LEAVE_PAID=Paid vacation
-LEAVE_SICK=Sick leave
-LEAVE_OTHER=Other leave
+LEAVE_SICK=Malattia
+LEAVE_OTHER=Altro
 LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leave allocation
@@ -129,5 +129,5 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
-HolidaysToApprove=Holidays to approve
+HolidaysToApprove=Ferie da approvare
 NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
diff --git a/htdocs/langs/it_IT/modulebuilder.lang b/htdocs/langs/it_IT/modulebuilder.lang
index cf8f9ec36dc..fb1de1a4cad 100644
--- a/htdocs/langs/it_IT/modulebuilder.lang
+++ b/htdocs/langs/it_IT/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=Elenco voci dizionari
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=Vedi esempi qui
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Il campo è visibile? (Esempi: 0=Mai visibile, 1=Visibile sugli elenchi e nei form di creazione/modifica/visualizzazione, 2=Visibile solo negli elenchi, 3=Visibile solo nei form di creazione/modifica/visualizzazione (no elenchi), 4=Visibile negli elenchi e solo nei form di modifica/visualizzazione (no creazione). Utilizza un valore negativo se desideri che il campo non sia visibile di default negli elenchi, ma possa essere selezionato per la visualizzazione. Puoi utilizzare anche un'espressione regolare come ad esempio: <br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene <br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Mostra sul PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Il campo è utilizzato per effettuare una ricerca dallo strumento di ricerca rapida? (Esempi: 1 o 0)
diff --git a/htdocs/langs/it_IT/multicurrency.lang b/htdocs/langs/it_IT/multicurrency.lang
index 68c8f699e00..1dafc929e0b 100644
--- a/htdocs/langs/it_IT/multicurrency.lang
+++ b/htdocs/langs/it_IT/multicurrency.lang
@@ -12,7 +12,7 @@ multicurrency_appId=Chiave API
 multicurrency_appCurrencySource=Currency source
 multicurrency_alternateCurrencySource=Alternate currency source
 CurrenciesUsed=Currencies used
-CurrenciesUsed_help_to_add=Add the differents currencies and rates you need to use on you <b>proposals</b>, <b>orders</b>, etc.
+CurrenciesUsed_help_to_add=Aggiunge le diverse valute e tassi di cambio che si desiderano utilizzare su <b>proposte</b> , <b>ordini</b> , ecc.
 rate=rate
 MulticurrencyReceived=Received, original currency
 MulticurrencyRemainderToTake=Remaining amout, original currency
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index 36119e72677..0fef5921397 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -42,8 +42,8 @@ Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
 Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
 Notify_PROPAL_VALIDATE=proposta convalidata
-Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
+Notify_PROPAL_CLOSE_SIGNED=Proposta del cliente chiusa come firmata
+Notify_PROPAL_CLOSE_REFUSED=Proposta del cliente chiusa come rifiutata
 Notify_PROPAL_SENTBYMAIL=Proposta inviata per email
 Notify_WITHDRAW_TRANSMIT=Invia prelievo
 Notify_WITHDRAW_CREDIT=Accredita prelievo
@@ -189,7 +189,7 @@ NumberOfCustomerInvoices=Numero di ordini fornitore
 NumberOfSupplierProposals=Numero di proposte del fornitore
 NumberOfSupplierOrders=Numero ordini d'acquisto
 NumberOfSupplierInvoices=Number of vendor invoices
-NumberOfContracts=Number of contracts
+NumberOfContracts=Numero di contratti
 NumberOfMos=Number of manufacturing orders
 NumberOfUnitsProposals=Numero di unità nei preventivi
 NumberOfUnitsCustomerOrders=Numero di unità sugli ordini cliente
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index d59b8e7d6b5..6917266e6df 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Opportunità da seguire
-ProjectFollowTasks=Attività di progetto
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Utilizzo
 UsageOpportunity=Utilizzo: opportunità
 UsageTasks=Uso: Compiti
diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang
index f411690e00c..c3ab2f4d430 100644
--- a/htdocs/langs/it_IT/website.lang
+++ b/htdocs/langs/it_IT/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Articoli sul blog
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Torna all'elenco per terze parti
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/it_IT/zapier.lang b/htdocs/langs/it_IT/zapier.lang
new file mode 100644
index 00000000000..cf2795a5fbe
--- /dev/null
+++ b/htdocs/langs/it_IT/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier per Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier per modulo Dolibarr
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Installazione di Zapier per Dolibarr
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index 1f9382137ea..b8ce37a0956 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index 0205f246b0c..7eb67d7a4ab 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web server user/group
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Module <b>%s</b> must be enabled
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Users module setup
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang
index 8c22ce0159a..9f11d8ecf87 100644
--- a/htdocs/langs/ka_GE/bills.lang
+++ b/htdocs/langs/ka_GE/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=Show invoice
-ShowInvoice=Show invoice
-ShowInvoiceReplace=Show replacing invoice
-ShowInvoiceAvoir=Show credit note
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/ka_GE/donations.lang b/htdocs/langs/ka_GE/donations.lang
index 5edc8d62033..de4bdf68f03 100644
--- a/htdocs/langs/ka_GE/donations.lang
+++ b/htdocs/langs/ka_GE/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Create a donation
 NewDonation=New donation
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Show donation
 PublicDonation=Public donation
 DonationsArea=Donations area
 DonationStatusPromiseNotValidated=Draft promise
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
 DonationTitle=Donation receipt
+DonationDate=Donation date
 DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
diff --git a/htdocs/langs/ka_GE/interventions.lang b/htdocs/langs/ka_GE/interventions.lang
index e7667ef6946..e5936f8246e 100644
--- a/htdocs/langs/ka_GE/interventions.lang
+++ b/htdocs/langs/ka_GE/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/ka_GE/modulebuilder.lang b/htdocs/langs/ka_GE/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/ka_GE/modulebuilder.lang
+++ b/htdocs/langs/ka_GE/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/ka_GE/multicurrency.lang b/htdocs/langs/ka_GE/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/ka_GE/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index cdc0e6b3c95..bb42bff3c87 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/ka_GE/website.lang b/htdocs/langs/ka_GE/website.lang
index c802b2d2ae8..bce2a09fb03 100644
--- a/htdocs/langs/ka_GE/website.lang
+++ b/htdocs/langs/ka_GE/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/ka_GE/zapier.lang b/htdocs/langs/ka_GE/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/ka_GE/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/km_KH/accountancy.lang b/htdocs/langs/km_KH/accountancy.lang
new file mode 100644
index 00000000000..b8ce37a0956
--- /dev/null
+++ b/htdocs/langs/km_KH/accountancy.lang
@@ -0,0 +1,382 @@
+# Dolibarr language file - en_US - Accountancy (Double entries)
+Accountancy=Accountancy
+Accounting=Accounting
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
+ACCOUNTING_EXPORT_LABEL=Export label
+ACCOUNTING_EXPORT_AMOUNT=Export amount
+ACCOUNTING_EXPORT_DEVISE=Export currency
+Selectformat=Select the format for the file
+ACCOUNTING_EXPORT_FORMAT=Select the format for the file
+ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
+ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
+ThisService=This service
+ThisProduct=This product
+DefaultForService=Default for service
+DefaultForProduct=Default for product
+CantSuggest=Can't suggest
+AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journalization=Journalization
+Journaux=Journals
+JournalFinancial=Financial journals
+BackToChartofaccounts=Return chart of accounts
+Chartofaccounts=Chart of accounts
+CurrentDedicatedAccountingAccount=Current dedicated account
+AssignDedicatedAccountingAccount=New account to assign
+InvoiceLabel=Invoice label
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
+OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
+JournalizationInLedgerStatus=Status of journalization
+AlreadyInGeneralLedger=Already journalized in ledgers
+NotYetInGeneralLedger=Not yet journalized in ledgers
+GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
+DetailByAccount=Show detail by account
+AccountWithNonZeroValues=Accounts with non-zero values
+ListOfAccounts=List of accounts
+CountriesInEEC=Countries in EEC
+CountriesNotInEEC=Countries not in EEC
+CountriesInEECExceptMe=Countries in EEC except %s
+CountriesExceptMe=All countries except %s
+AccountantFiles=Export accounting documents
+
+MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
+MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
+MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+
+AccountancyArea=Accounting area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
+
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expenses (miscellaneous taxes). For this, use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
+AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
+AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+
+AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+Selectchartofaccounts=Select active chart of accounts
+ChangeAndLoad=Change and load
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+AccountAccountingShort=Account
+SubledgerAccount=Subledger account
+SubledgerAccountLabel=Subledger account label
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
+AccountAccountingSuggest=Accounting account suggested
+MenuDefaultAccounts=Default accounts
+MenuBankAccounts=Bank accounts
+MenuVatAccounts=Vat accounts
+MenuTaxAccounts=Tax accounts
+MenuExpenseReportAccounts=Expense report accounts
+MenuLoanAccounts=Loan accounts
+MenuProductsAccounts=Product accounts
+MenuClosureAccounts=Closure accounts
+MenuAccountancyClosure=Closure
+MenuAccountancyValidationMovements=Validate movements
+ProductsBinding=Products accounts
+TransferInAccounting=Transfer in accounting
+RegistrationInAccounting=Registration in accounting
+Binding=Binding to accounts
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Vendor invoice binding
+ExpenseReportsVentilation=Expense report binding
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+ValidTransaction=Validate transaction
+WriteBookKeeping=Register transactions in Ledger
+Bookkeeping=Ledger
+AccountBalance=Account balance
+ObjectsRef=Source object ref
+CAHTF=Total purchase vendor before tax
+TotalExpenseReport=Total expense report
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+ExpenseReportLines=Lines of expense reports to bind
+ExpenseReportLinesDone=Bound lines of expense reports
+IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
+
+
+Ventilate=Bind
+LineId=Id line
+Processing=Processing
+EndProcessing=Process terminated.
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+LineOfExpenseReport=Line of expense report
+NoAccountSelected=No accounting account selected
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+
+ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
+BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+
+ACCOUNTING_SELL_JOURNAL=Sell journal
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
+ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
+
+ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
+ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
+TransitionalAccount=Transitional bank transfer account
+
+ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
+DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+LabelAccount=Label account
+LabelOperation=Label operation
+Sens=Sens
+LetteringCode=Lettering code
+Lettering=Lettering
+Codejournal=Journal
+JournalLabel=Journal label
+NumPiece=Piece number
+TransactionNumShort=Num. transaction
+AccountingCategory=Personalized groups
+GroupByAccountAccounting=Group by accounting account
+AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
+ByAccounts=By accounts
+ByPredefinedAccountGroups=By predefined groups
+ByPersonalizedAccountGroups=By personalized groups
+ByYear=By year
+NotMatch=Not Set
+DeleteMvt=Delete Ledger lines
+DelMonth=Month to delete
+DelYear=Year to delete
+DelJournal=Journal to delete
+ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+FinanceJournal=Finance journal
+ExpenseReportsJournal=Expense reports journal
+DescFinanceJournal=Finance journal including all the types of payments by bank account
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+FeeAccountNotDefined=Account for fee not defined
+BankAccountNotDefined=Account for bank not defined
+CustomerInvoicePayment=Payment of invoice customer
+ThirdPartyAccount=Third-party account
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+AddCompteFromBK=Add accounting accounts to the group
+ReportThirdParty=List third-party account
+DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
+ListAccounts=List of the accounting accounts
+UnknownAccountForThirdparty=Unknown third-party account. We will use %s
+UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
+ShowOpeningBalance=Show opening balance
+HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
+
+Pcgtype=Group of account
+PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+
+Reconcilable=Reconcilable
+
+TotalVente=Total turnover before tax
+TotalMarge=Total sales margin
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
+Vide=-
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account (only record not already transfered in accountancy are visible)
+DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
+DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
+DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
+DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+
+DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
+OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+ValidateMovements=Validate movements
+DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
+SelectMonthAndValidate=Select month and validate movements
+
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
+Balancing=Balancing
+FicheVentilation=Binding card
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
+NoNewRecordSaved=No more record to journalize
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
+ShowTutorial=Show Tutorial
+NotReconciled=Not reconciled
+
+## Admin
+ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
+CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccountingJournal=Show accounting journal
+NatureOfJournal=Nature of Journal
+AccountingJournalType1=Miscellaneous operations
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
+NumberOfAccountancyEntries=Number of entries
+NumberOfAccountancyMovements=Number of movements
+
+## Export
+ExportDraftJournal=Export draft journal
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export for CEGID Expert Comptabilité
+Modelcsv_COALA=Export for Sage Coala
+Modelcsv_bob50=Export for Sage BOB 50
+Modelcsv_ciel=Export for Sage Ciel Compta or Compta Evolution
+Modelcsv_quadratus=Export for Quadratus QuadraCompta
+Modelcsv_ebp=Export for EBP
+Modelcsv_cogilog=Export for Cogilog
+Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
+Modelcsv_openconcerto=Export for OpenConcerto (Test)
+Modelcsv_configurable=Export CSV Configurable
+Modelcsv_FEC=Export FEC
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+ChartofaccountsId=Chart of accounts Id
+
+## Tools - Init accounting account on product / service
+InitAccountancy=Init accountancy
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
+DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
+Options=Options
+OptionModeProductSell=Mode sales
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
+OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
+OptionModeProductSellDesc=Show all products with accounting account for sales.
+OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
+OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
+OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
+CleanFixHistory=Remove accounting code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
+PredefinedGroups=Predefined groups
+WithoutValidAccount=Without valid dedicated account
+WithValidAccount=With valid dedicated account
+ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
+AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
+
+## Dictionary
+Range=Range of accounting account
+Calculated=Calculated
+Formula=Formula
+
+## Error
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
+ExportNotSupported=The export format setuped is not supported into this page
+BookeppingLineAlreayExists=Lines already existing into bookkeeping
+NoJournalDefined=No journal defined
+Binded=Lines bound
+ToBind=Lines to bind
+UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
+
+## Import
+ImportAccountingEntries=Accounting entries
+DateExport=Date export
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/km_KH/admin.lang b/htdocs/langs/km_KH/admin.lang
new file mode 100644
index 00000000000..7eb67d7a4ab
--- /dev/null
+++ b/htdocs/langs/km_KH/admin.lang
@@ -0,0 +1,2002 @@
+# Dolibarr language file - Source file is en_US - admin
+Foundation=Foundation
+Version=Version
+Publisher=Publisher
+VersionProgram=Version program
+VersionLastInstall=Initial install version
+VersionLastUpgrade=Latest version upgrade
+VersionExperimental=Experimental
+VersionDevelopment=Development
+VersionUnknown=Unknown
+VersionRecommanded=Recommended
+FileCheck=Fileset Integrity Checks
+FileCheckDesc=This tool allows you to check the integrity of files and the setup of your application, comparing each file with the official one. The value of some setup constants may also be checked. You can use this tool to determine if any files have been modified (e.g by a hacker).
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files have been added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when the application is installed from an official package
+XmlNotFound=Xml Integrity File of application not found
+SessionId=Session ID
+SessionSaveHandler=Handler to save sessions
+SessionSavePath=Session save location
+PurgeSessions=Purge of sessions
+ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
+NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow listing all running sessions.
+LockNewSessions=Lock new connections
+ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself? Only user <b>%s</b> will be able to connect after that.
+UnlockNewSessions=Remove connection lock
+YourSession=Your session
+Sessions=Users Sessions
+WebUserGroup=Web server user/group
+NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
+DBStoringCharset=Database charset to store data
+DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
+ClientCharset=Client charset
+ClientSortingCharset=Client collation
+WarningModuleNotActive=Module <b>%s</b> must be enabled
+WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
+DolibarrSetup=Dolibarr install or upgrade
+InternalUser=Internal user
+ExternalUser=External user
+InternalUsers=Internal users
+ExternalUsers=External users
+GUISetup=Display
+SetupArea=Setup
+UploadNewTemplate=Upload new template(s)
+FormToTestFileUploadForm=Form to test file upload (according to setup)
+IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
+RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
+RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
+SecuritySetup=Security setup
+SecurityFilesDesc=Define here options related to security about uploading files.
+ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
+ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
+ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
+DictionarySetup=Dictionary setup
+Dictionary=Dictionaries
+ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
+ErrorCodeCantContainZero=Code can't contain value 0
+DisableJavascript=Disable JavaScript and Ajax functions
+DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
+NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
+JavascriptDisabled=JavaScript disabled
+UsePreviewTabs=Use preview tabs
+ShowPreview=Show preview
+PreviewNotAvailable=Preview not available
+ThemeCurrentlyActive=Theme currently active
+CurrentTimeZone=TimeZone PHP (server)
+MySQLTimeZone=TimeZone MySql (database)
+TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+Space=Space
+Table=Table
+Fields=Fields
+Index=Index
+Mask=Mask
+NextValue=Next value
+NextValueForInvoices=Next value (invoices)
+NextValueForCreditNotes=Next value (credit notes)
+NextValueForDeposit=Next value (down payment)
+NextValueForReplacements=Next value (replacements)
+MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
+MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page
+AntiVirusCommand=Full path to antivirus command
+AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusParam= More parameters on command line
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=Accounting module setup
+UserSetup=User management setup
+MultiCurrencySetup=Multi-currency setup
+MenuLimits=Limits and accuracy
+MenuIdParent=Parent menu ID
+DetailMenuIdParent=ID of parent menu (empty for a top menu)
+DetailPosition=Sort number to define menu position
+AllMenus=All
+NotConfigured=Module/Application not configured
+Active=Active
+SetupShort=Setup
+OtherOptions=Other options
+OtherSetup=Other Setup
+CurrentValueSeparatorDecimal=Decimal separator
+CurrentValueSeparatorThousand=Thousand separator
+Destination=Destination
+IdModule=Module ID
+IdPermissions=Permissions ID
+LanguageBrowserParameter=Parameter %s
+LocalisationDolibarrParameters=Localization parameters
+ClientTZ=Client Time Zone (user)
+ClientHour=Client time (user)
+OSTZ=Server OS Time Zone
+PHPTZ=PHP server Time Zone
+DaylingSavingTime=Daylight saving time
+CurrentHour=PHP Time (server)
+CurrentSessionTimeOut=Current session timeout
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a .htaccess file with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but of the timezone of the server.
+Box=Widget
+Boxes=Widgets
+MaxNbOfLinesForBoxes=Max. number of lines for widgets
+AllWidgetsWereEnabled=All available widgets are enabled
+PositionByDefault=Default order
+Position=Position
+MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
+MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br>Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenuForUsers=Menu for users
+LangFile=.lang file
+Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
+System=System
+SystemInfo=System information
+SystemToolsArea=System tools area
+SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature.
+Purge=Purge
+PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
+PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
+PurgeRunNow=Purge now
+PurgeNothingToDelete=No directory or files to delete.
+PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
+PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
+PurgeAuditEvents=Purge all security events
+ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
+GenerateBackup=Generate backup
+Backup=Backup
+Restore=Restore
+RunCommandSummary=Backup has been launched with the following command
+BackupResult=Backup result
+BackupFileSuccessfullyCreated=Backup file successfully generated
+YouCanDownloadBackupFile=The generated file can now be downloaded
+NoBackupFileAvailable=No backup files available.
+ExportMethod=Export method
+ImportMethod=Import method
+ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
+ImportMySqlDesc=To import a MySQL backup file, you may use phpMyAdmin via your hosting or use the mysql command from the Command line.<br>For example:
+ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
+ImportMySqlCommand=%s %s < mybackupfile.sql
+ImportPostgreSqlCommand=%s %s mybackupfile.sql
+FileNameToGenerate=Filename for backup:
+Compression=Compression
+CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
+CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
+ExportCompatibility=Compatibility of generated export file
+ExportUseMySQLQuickParameter=Use the --quick parameter
+ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
+MySqlExportParameters=MySQL export parameters
+PostgreSqlExportParameters= PostgreSQL export parameters
+UseTransactionnalMode=Use transactional mode
+FullPathToMysqldumpCommand=Full path to mysqldump command
+FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
+AddDropDatabase=Add DROP DATABASE command
+AddDropTable=Add DROP TABLE command
+ExportStructure=Structure
+NameColumn=Name columns
+ExtendedInsert=Extended INSERT
+NoLockBeforeInsert=No lock commands around INSERT
+DelayedInsert=Delayed insert
+EncodeBinariesInHexa=Encode binary data in hexadecimal
+IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
+AutoDetectLang=Autodetect (browser language)
+FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
+BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
+OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
+ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external app/modules
+ModulesDevelopYourModule=Develop your own app/modules
+ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
+DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
+NewModule=New
+FreeModule=Free
+CompatibleUpTo=Compatible with version %s
+NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
+CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
+SeeInMarkerPlace=See in Market place
+SeeSetupOfModule=See setup of module %s
+Updated=Updated
+Nouveauté=Novelty
+AchatTelechargement=Buy / Download
+GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
+DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming may develop a module.
+WebSiteDesc=External websites for more add-on (non-core) modules...
+DevelopYourModuleDesc=Some solutions to develop your own module...
+URL=URL
+RelativeURL=Relative URL
+BoxesAvailable=Widgets available
+BoxesActivated=Widgets activated
+ActivateOn=Activate on
+ActiveOn=Activated on
+SourceFile=Source file
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
+Required=Required
+UsedOnlyWithTypeOption=Used by some agenda option only
+Security=Security
+Passwords=Passwords
+DoNotStoreClearPassword=Encrypt passwords stored in database (NOT as plain-text). It is strongly recommended to activate this option.
+MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
+ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
+Feature=Feature
+DolibarrLicense=License
+Developpers=Developers/contributors
+OfficialWebSite=Dolibarr official web site
+OfficialWebSiteLocal=Local web site (%s)
+OfficialWiki=Dolibarr documentation / Wiki
+OfficialDemo=Dolibarr online demo
+OfficialMarketPlace=Official market place for external modules/addons
+OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
+ReferencedPreferredPartners=Preferred Partners
+OtherResources=Other resources
+ExternalResources=External Resources
+SocialNetworks=Social Networks
+ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
+ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
+HelpCenterDesc2=Some of these resources are only available in <b>english</b>.
+CurrentMenuHandler=Current menu handler
+MeasuringUnit=Measuring unit
+LeftMargin=Left margin
+TopMargin=Top margin
+PaperSize=Paper type
+Orientation=Orientation
+SpaceX=Space X
+SpaceY=Space Y
+FontSize=Font size
+Content=Content
+NoticePeriod=Notice period
+NewByMonth=New by month
+Emails=Emails
+EMailsSetup=Emails setup
+EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EmailSenderProfiles=Emails sender profiles
+EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
+MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix-like systems)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix-like systems)
+MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
+MAIN_MAIL_AUTOCOPY_TO= Copy (Bcc) all sent emails to
+MAIN_DISABLE_ALL_MAILS=Disable all email sending (for test purposes or demos)
+MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
+MAIN_MAIL_SENDMODE=Email sending method
+MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
+MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
+MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
+MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
+MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos)
+MAIN_SMS_SENDMODE=Method to use to send SMS
+MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending
+MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
+UserEmail=User email
+CompanyEmail=Company Email
+FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+ModuleSetup=Module setup
+ModulesSetup=Modules/Application setup
+ModuleFamilyBase=System
+ModuleFamilyCrm=Customer Relationship Management (CRM)
+ModuleFamilySrm=Vendor Relationship Management (VRM)
+ModuleFamilyProducts=Product Management (PM)
+ModuleFamilyHr=Human Resource Management (HR)
+ModuleFamilyProjects=Projects/Collaborative work
+ModuleFamilyOther=Other
+ModuleFamilyTechnic=Multi-modules tools
+ModuleFamilyExperimental=Experimental modules
+ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
+ModuleFamilyECM=Electronic Content Management (ECM)
+ModuleFamilyPortal=Websites and other frontal application
+ModuleFamilyInterface=Interfaces with external systems
+MenuHandlers=Menu handlers
+MenuAdmin=Menu editor
+DoNotUseInProduction=Do not use in production
+ThisIsProcessToFollow=Upgrade procedure:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+StepNb=Step %s
+FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
+DownloadPackageFromWebSite=Download package (for example from the official web site %s).
+UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
+YouCanSubmitFile=You can upload the .zip file of module package from here:
+CurrentVersion=Dolibarr current version
+CallUpdatePage=Browse to the page that updates the database structure and data: %s.
+LastStableVersion=Latest stable version
+LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
+UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
+GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
+GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
+GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
+ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
+ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
+DoTestServerAvailability=Test server connectivity
+DoTestSend=Test sending
+DoTestSendHTML=Test sending HTML
+ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
+UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
+SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
+UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
+DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
+DisableLinkToHelp=Hide link to online help "<b>%s</b>"
+AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
+ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
+MinLength=Minimum length
+LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
+LanguageFile=Language file
+ExamplesWithCurrentSetup=Examples with current configuration
+ListOfDirectories=List of OpenDocument templates directories
+ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
+NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
+FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
+FirstnameNamePosition=Position of Name/Lastname
+DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
+KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
+TestSubmitForm=Input test form
+ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours.
+ThemeDir=Skins directory
+ConnectionTimeout=Connection timeout
+ResponseTimeout=Response timeout
+SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
+ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
+SecurityToken=Key to secure URLs
+NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
+PDF=PDF
+PDFDesc=Global options for PDF generation.
+PDFAddressForging=Rules for address boxes
+HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
+PDFLocaltax=Rules for %s
+HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideDescOnPDF=Hide products description
+HideRefOnPDF=Hide products ref.
+HideDetailsOnPDF=Hide product lines details
+PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+Library=Library
+UrlGenerationParameters=Parameters to secure URLs
+SecurityTokenIsUnique=Use a unique securekey parameter for each URL
+EnterRefToBuildUrl=Enter reference for object %s
+GetSecuredUrl=Get calculated URL
+ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+OldVATRates=Old VAT rate
+NewVATRates=New VAT rate
+PriceBaseTypeToChange=Modify on prices with base reference value defined on
+MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
+String=String
+TextLong=Long text
+HtmlText=Html text
+Int=Integer
+Float=Float
+DateAndTime=Date and hour
+Unique=Unique
+Boolean=Boolean (one checkbox)
+ExtrafieldPhone = Phone
+ExtrafieldPrice = Price
+ExtrafieldMail = Email
+ExtrafieldUrl = Url
+ExtrafieldSelect = Select list
+ExtrafieldSelectList = Select from table
+ExtrafieldSeparator=Separator (not a field)
+ExtrafieldPassword=Password
+ExtrafieldRadio=Radio buttons (one choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
+ExtrafieldLink=Link to an object
+ComputedFormula=Computed field
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+Computedpersistent=Store computed field
+ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
+ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
+ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
+LibraryToBuildPDF=Library used for PDF generation
+LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
+SMS=SMS
+LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
+RefreshPhoneLink=Refresh link
+LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
+KeepEmptyToUseDefault=Keep empty to use default value
+DefaultLink=Default link
+SetAsDefault=Set as default
+ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
+ExternalModule=External module
+InstalledInto=Installed into directory %s
+BarcodeInitForthird-parties=Mass barcode init for third-parties
+BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
+CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
+InitEmptyBarCode=Init value for next %s empty records
+EraseAllCurrentBarCode=Erase all current barcode values
+ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
+AllBarcodeReset=All barcode values have been removed
+NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
+EnableFileCache=Enable file cache
+ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
+NoDetails=No additional details in footer
+DisplayCompanyInfo=Display company address
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
+EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
+ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code
+ModuleCompanyCodePanicum=Return an empty accounting code.
+ModuleCompanyCodeDigitaria=Returns a compound accounting code according to the name of the third party. The code consists of a prefix that can be defined in the first position followed by the number of characters defined in the third party code.
+ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
+ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+ClickToShowDescription=Click to show description
+DependsOn=This module needs the module(s)
+RequiredBy=This module is required by module(s)
+TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
+PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
+EnableDefaultValues=Enable customization of default values
+EnableOverwriteTranslation=Enable usage of overwritten translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
+AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
+FilesAttachedToEmail=Attach file
+SendEmailsReminders=Send agenda reminders by emails
+davDescription=Setup a WebDAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
+DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
+DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
+DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
+DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
+# Modules
+Module0Name=Users & Groups
+Module0Desc=Users / Employees and Groups management
+Module1Name=Third Parties
+Module1Desc=Companies and contacts management (customers, prospects...)
+Module2Name=Commercial
+Module2Desc=Commercial management
+Module10Name=Accounting (simplified)
+Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
+Module20Name=Proposals
+Module20Desc=Commercial proposal management
+Module22Name=Mass Emailings
+Module22Desc=Manage bulk emailing
+Module23Name=Energy
+Module23Desc=Monitoring the consumption of energies
+Module25Name=Sales Orders
+Module25Desc=Sales order management
+Module30Name=Invoices
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
+Module40Name=Vendors
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
+Module42Name=Debug Logs
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module49Name=Editors
+Module49Desc=Editor management
+Module50Name=Products
+Module50Desc=Management of Products
+Module51Name=Mass mailings
+Module51Desc=Mass paper mailing management
+Module52Name=Stocks
+Module52Desc=Stock management
+Module53Name=Services
+Module53Desc=Management of Services
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or recurring subscriptions)
+Module55Name=Barcodes
+Module55Desc=Barcode management
+Module56Name=Telephony
+Module56Desc=Telephony integration
+Module57Name=Bank Direct Debit payments
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module58Name=ClickToDial
+Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
+Module59Name=Bookmark4u
+Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
+Module60Name=Stickers
+Module60Desc=Management of stickers
+Module70Name=Interventions
+Module70Desc=Intervention management
+Module75Name=Expense and trip notes
+Module75Desc=Expense and trip notes management
+Module80Name=Shipments
+Module80Desc=Shipments and delivery note management
+Module85Name=Banks & Cash
+Module85Desc=Management of bank or cash accounts
+Module100Name=External Site
+Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module105Name=Mailman and SPIP
+Module105Desc=Mailman or SPIP interface for member module
+Module200Name=LDAP
+Module200Desc=LDAP directory synchronization
+Module210Name=PostNuke
+Module210Desc=PostNuke integration
+Module240Name=Data exports
+Module240Desc=Tool to export Dolibarr data (with assistance)
+Module250Name=Data imports
+Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module310Name=Members
+Module310Desc=Foundation members management
+Module320Name=RSS Feed
+Module320Desc=Add a RSS feed to Dolibarr pages
+Module330Name=Bookmarks & Shortcuts
+Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access
+Module400Name=Projects or Leads
+Module400Desc=Management of projects, leads/opportunities and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module410Name=Webcalendar
+Module410Desc=Webcalendar integration
+Module500Name=Taxes & Special Expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
+Module510Name=Salaries
+Module510Desc=Record and track employee payments
+Module520Name=Loans
+Module520Desc=Management of loans
+Module600Name=Notifications on business event
+Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
+Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
+Module610Name=Product Variants
+Module610Desc=Creation of product variants (color, size etc.)
+Module700Name=Donations
+Module700Desc=Donation management
+Module770Name=Expense Reports
+Module770Desc=Manage expense reports claims (transportation, meal, ...)
+Module1120Name=Vendor Commercial Proposals
+Module1120Desc=Request vendor commercial proposal and prices
+Module1200Name=Mantis
+Module1200Desc=Mantis integration
+Module1520Name=Document Generation
+Module1520Desc=Mass email document generation
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module2000Name=WYSIWYG editor
+Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
+Module2200Name=Dynamic Prices
+Module2200Desc=Use maths expressions for auto-generation of prices
+Module2300Name=Scheduled jobs
+Module2300Desc=Scheduled jobs management (alias cron or chrono table)
+Module2400Name=Events/Agenda
+Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
+Module2500Name=DMS / ECM
+Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
+Module2600Name=API/Web services (SOAP server)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API/Web services (REST server)
+Module2610Desc=Enable the Dolibarr REST server providing API services
+Module2660Name=Call WebServices (SOAP client)
+Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
+Module2700Name=Gravatar
+Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
+Module2800Desc=FTP Client
+Module2900Name=GeoIPMaxmind
+Module2900Desc=GeoIP Maxmind conversions capabilities
+Module3200Name=Unalterable Archives
+Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module4000Name=HRM
+Module4000Desc=Human resources management (management of department, employee contracts and feelings)
+Module5000Name=Multi-company
+Module5000Desc=Allows you to manage multiple companies
+Module6000Name=Workflow
+Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module10000Name=Websites
+Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
+Module20000Name=Leave Request Management
+Module20000Desc=Define and track employee leave requests
+Module39000Name=Product Lots
+Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
+Module40000Name=Multicurrency
+Module40000Desc=Use alternative currencies in prices and documents
+Module50000Name=PayBox
+Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50100Name=POS SimplePOS
+Module50100Desc=Point of Sale module SimplePOS (simple POS).
+Module50150Name=POS TakePOS
+Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50200Name=Paypal
+Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50300Name=Stripe
+Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50400Name=Accounting (double entry)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module54000Name=PrintIPP
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
+Module59000Name=Margins
+Module59000Desc=Module to manage margins
+Module60000Name=Commissions
+Module60000Desc=Module to manage commissions
+Module62000Name=Incoterms
+Module62000Desc=Add features to manage Incoterms
+Module63000Name=Resources
+Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
+Permission11=Read customer invoices
+Permission12=Create/modify customer invoices
+Permission13=Unvalidate customer invoices
+Permission14=Validate customer invoices
+Permission15=Send customer invoices by email
+Permission16=Create payments for customer invoices
+Permission19=Delete customer invoices
+Permission21=Read commercial proposals
+Permission22=Create/modify commercial proposals
+Permission24=Validate commercial proposals
+Permission25=Send commercial proposals
+Permission26=Close commercial proposals
+Permission27=Delete commercial proposals
+Permission28=Export commercial proposals
+Permission31=Read products
+Permission32=Create/modify products
+Permission34=Delete products
+Permission36=See/manage hidden products
+Permission38=Export products
+Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
+Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
+Permission44=Delete projects (shared project and projects I'm contact for)
+Permission45=Export projects
+Permission61=Read interventions
+Permission62=Create/modify interventions
+Permission64=Delete interventions
+Permission67=Export interventions
+Permission71=Read members
+Permission72=Create/modify members
+Permission74=Delete members
+Permission75=Setup types of membership
+Permission76=Export data
+Permission78=Read subscriptions
+Permission79=Create/modify subscriptions
+Permission81=Read customers orders
+Permission82=Create/modify customers orders
+Permission84=Validate customers orders
+Permission86=Send customers orders
+Permission87=Close customers orders
+Permission88=Cancel customers orders
+Permission89=Delete customers orders
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
+Permission95=Read reports
+Permission101=Read sendings
+Permission102=Create/modify sendings
+Permission104=Validate sendings
+Permission106=Export sendings
+Permission109=Delete sendings
+Permission111=Read financial accounts
+Permission112=Create/modify/delete and compare transactions
+Permission113=Setup financial accounts (create, manage categories)
+Permission114=Reconcile transactions
+Permission115=Export transactions and account statements
+Permission116=Transfers between accounts
+Permission117=Manage checks dispatching
+Permission121=Read third parties linked to user
+Permission122=Create/modify third parties linked to user
+Permission125=Delete third parties linked to user
+Permission126=Export third parties
+Permission141=Read all projects and tasks (also private projects for which I am not a contact)
+Permission142=Create/modify all projects and tasks (also private projects for which I am not a contact)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
+Permission146=Read providers
+Permission147=Read stats
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejections of direct debit payment orders
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
+Permission171=Read trips and expenses (yours and your subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
+Permission180=Read suppliers
+Permission181=Read purchase orders
+Permission182=Create/modify purchase orders
+Permission183=Validate purchase orders
+Permission184=Approve purchase orders
+Permission185=Order or cancel purchase orders
+Permission186=Receive purchase orders
+Permission187=Close purchase orders
+Permission188=Cancel purchase orders
+Permission192=Create lines
+Permission193=Cancel lines
+Permission194=Read the bandwidth lines
+Permission202=Create ADSL connections
+Permission203=Order connections orders
+Permission204=Order connections
+Permission205=Manage connections
+Permission206=Read connections
+Permission211=Read Telephony
+Permission212=Order lines
+Permission213=Activate line
+Permission214=Setup Telephony
+Permission215=Setup providers
+Permission221=Read emailings
+Permission222=Create/modify emailings (topic, recipients...)
+Permission223=Validate emailings (allows sending)
+Permission229=Delete emailings
+Permission237=View recipients and info
+Permission238=Manually send mailings
+Permission239=Delete mailings after validation or sent
+Permission241=Read categories
+Permission242=Create/modify categories
+Permission243=Delete categories
+Permission244=See the contents of the hidden categories
+Permission251=Read other users and groups
+PermissionAdvanced251=Read other users
+Permission252=Read permissions of other users
+Permission253=Create/modify other users, groups and permissions
+PermissionAdvanced253=Create/modify internal/external users and permissions
+Permission254=Create/modify external users only
+Permission255=Modify other users password
+Permission256=Delete or disable other users
+Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission271=Read CA
+Permission272=Read invoices
+Permission273=Issue invoices
+Permission281=Read contacts
+Permission282=Create/modify contacts
+Permission283=Delete contacts
+Permission286=Export contacts
+Permission291=Read tariffs
+Permission292=Set permissions on the tariffs
+Permission293=Modify customer's tariffs
+Permission300=Read barcodes
+Permission301=Create/modify barcodes
+Permission302=Delete barcodes
+Permission311=Read services
+Permission312=Assign service/subscription to contract
+Permission331=Read bookmarks
+Permission332=Create/modify bookmarks
+Permission333=Delete bookmarks
+Permission341=Read its own permissions
+Permission342=Create/modify his own user information
+Permission343=Modify his own password
+Permission344=Modify its own permissions
+Permission351=Read groups
+Permission352=Read groups permissions
+Permission353=Create/modify groups
+Permission354=Delete or disable groups
+Permission358=Export users
+Permission401=Read discounts
+Permission402=Create/modify discounts
+Permission403=Validate discounts
+Permission404=Delete discounts
+Permission430=Use Debug Bar
+Permission511=Read payments of salaries
+Permission512=Create/modify payments of salaries
+Permission514=Delete payments of salaries
+Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
+Permission531=Read services
+Permission532=Create/modify services
+Permission534=Delete services
+Permission536=See/manage hidden services
+Permission538=Export services
+Permission650=Read Bills of Materials
+Permission651=Create/Update Bills of Materials
+Permission652=Delete Bills of Materials
+Permission701=Read donations
+Permission702=Create/modify donations
+Permission703=Delete donations
+Permission771=Read expense reports (yours and your subordinates)
+Permission772=Create/modify expense reports
+Permission773=Delete expense reports
+Permission774=Read all expense reports (even for user not subordinates)
+Permission775=Approve expense reports
+Permission776=Pay expense reports
+Permission779=Export expense reports
+Permission1001=Read stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
+Permission1004=Read stock movements
+Permission1005=Create/modify stock movements
+Permission1101=Read delivery receipts
+Permission1102=Create/modify delivery receipts
+Permission1104=Validate delivery receipts
+Permission1109=Delete delivery receipts
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
+Permission1181=Read suppliers
+Permission1182=Read purchase orders
+Permission1183=Create/modify purchase orders
+Permission1184=Validate purchase orders
+Permission1185=Approve purchase orders
+Permission1186=Order purchase orders
+Permission1187=Acknowledge receipt of purchase orders
+Permission1188=Delete purchase orders
+Permission1190=Approve (second approval) purchase orders
+Permission1201=Get result of an export
+Permission1202=Create/Modify an export
+Permission1231=Read vendor invoices
+Permission1232=Create/modify vendor invoices
+Permission1233=Validate vendor invoices
+Permission1234=Delete vendor invoices
+Permission1235=Send vendor invoices by email
+Permission1236=Export vendor invoices, attributes and payments
+Permission1237=Export purchase orders and their details
+Permission1251=Run mass imports of external data into database (data load)
+Permission1321=Export customer invoices, attributes and payments
+Permission1322=Reopen a paid bill
+Permission1421=Export sales orders and attributes
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
+Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
+Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
+Permission2411=Read actions (events or tasks) of others
+Permission2412=Create/modify actions (events or tasks) of others
+Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
+Permission2501=Read/Download documents
+Permission2502=Download documents
+Permission2503=Submit or delete documents
+Permission2515=Setup documents directories
+Permission2801=Use FTP client in read mode (browse and download only)
+Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=Delete leave requests
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20006=Admin leave requests (setup and update balance)
+Permission20007=Approve leave requests
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
+Permission50101=Use Point of Sale
+Permission50201=Read transactions
+Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define fiscal periods. Validate transactions and close fiscal periods.
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
+Permission54001=Print
+Permission55001=Read polls
+Permission55002=Create/modify polls
+Permission59001=Read commercial margins
+Permission59002=Define commercial margins
+Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
+DictionaryCompanyType=Third-party types
+DictionaryCompanyJuridicalType=Third-party legal entities
+DictionaryProspectLevel=Prospect potential
+DictionaryCanton=States/Provinces
+DictionaryRegion=Regions
+DictionaryCountry=Countries
+DictionaryCurrency=Currencies
+DictionaryCivility=Honorific titles
+DictionaryActions=Types of agenda events
+DictionarySocialContributions=Types of social or fiscal taxes
+DictionaryVAT=VAT Rates or Sales Tax Rates
+DictionaryRevenueStamp=Amount of tax stamps
+DictionaryPaymentConditions=Payment Terms
+DictionaryPaymentModes=Payment Modes
+DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Website - Type of website pages/containers
+DictionaryEcotaxe=Ecotax (WEEE)
+DictionaryPaperFormat=Paper formats
+DictionaryFormatCards=Card formats
+DictionaryFees=Expense report - Types of expense report lines
+DictionarySendingMethods=Shipping methods
+DictionaryStaff=Number of Employees
+DictionaryAvailability=Delivery delay
+DictionaryOrderMethods=Ordering methods
+DictionarySource=Origin of proposals/orders
+DictionaryAccountancyCategory=Personalized groups for reports
+DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
+DictionaryEMailTemplates=Email Templates
+DictionaryUnits=Units
+DictionaryMeasuringUnits=Measuring Units
+DictionarySocialNetworks=Social Networks
+DictionaryProspectStatus=Prospect status
+DictionaryHolidayTypes=Types of leave
+DictionaryOpportunityStatus=Lead status for project/lead
+DictionaryExpenseTaxCat=Expense report - Transportation categories
+DictionaryExpenseTaxRange=Expense report - Range by transportation category
+SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
+BackToModuleList=Back to Module list
+BackToDictionaryList=Back to Dictionaries list
+TypeOfRevenueStamp=Type of tax stamp
+VATManagement=Sales Tax Management
+VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
+##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
+LTRate=Rate
+LocalTax1IsNotUsed=Do not use second tax
+LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
+LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax1Management=Second type of tax
+LocalTax1IsUsedExample=
+LocalTax1IsNotUsedExample=
+LocalTax2IsNotUsed=Do not use third tax
+LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
+LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax2Management=Third type of tax
+LocalTax2IsUsedExample=
+LocalTax2IsNotUsedExample=
+LocalTax1ManagementES=RE Management
+LocalTax1IsUsedDescES=The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
+LocalTax1IsNotUsedDescES=By default the proposed RE is 0. End of rule.
+LocalTax1IsUsedExampleES=In Spain they are professionals subject to some specific sections of the Spanish IAE.
+LocalTax1IsNotUsedExampleES=In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
+LocalTax2ManagementES=IRPF Management
+LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
+LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
+LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
+LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
+UseRevenueStamp=Use a tax stamp
+UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+CalcLocaltax=Reports on local taxes
+CalcLocaltax1=Sales - Purchases
+CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
+CalcLocaltax2=Purchases
+CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
+CalcLocaltax3=Sales
+CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+LabelUsedByDefault=Label used by default if no translation can be found for code
+LabelOnDocuments=Label on documents
+LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of a configuration constant
+NbOfDays=No. of days
+AtEndOfMonth=At end of month
+CurrentNext=Current/Next
+Offset=Offset
+AlwaysActive=Always active
+Upgrade=Upgrade
+MenuUpgrade=Upgrade / Extend
+AddExtensionThemeModuleOrOther=Deploy/install external app/module
+WebServer=Web server
+DocumentRootServer=Web server's root directory
+DataRootServer=Data files directory
+IP=IP
+Port=Port
+VirtualServerName=Virtual server name
+OS=OS
+PhpWebLink=Web-Php link
+Server=Server
+Database=Database
+DatabaseServer=Database host
+DatabaseName=Database name
+DatabasePort=Database port
+DatabaseUser=Database user
+DatabasePassword=Database password
+Tables=Tables
+TableName=Table name
+NbOfRecord=No. of records
+Host=Server
+DriverType=Driver type
+SummarySystem=System information summary
+SummaryConst=List of all Dolibarr setup parameters
+MenuCompanySetup=Company/Organization
+DefaultMenuManager= Standard menu manager
+DefaultMenuSmartphoneManager=Smartphone menu manager
+Skin=Skin theme
+DefaultSkin=Default skin theme
+MaxSizeList=Max length for list
+DefaultMaxSizeList=Default max length for lists
+DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
+MessageOfDay=Message of the day
+MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
+PermanentLeftSearchForm=Permanent search form on left menu
+DefaultLanguage=Default language
+EnableMultilangInterface=Enable multilanguage support
+EnableShowLogo=Show the company logo in the menu
+CompanyInfo=Company/Organization
+CompanyIds=Company/Organization identities
+CompanyName=Name
+CompanyAddress=Address
+CompanyZip=Zip
+CompanyTown=Town
+CompanyCountry=Country
+CompanyCurrency=Main currency
+CompanyObject=Object of the company
+IDCountry=ID country
+Logo=Logo
+LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
+LogoSquarred=Logo (squarred)
+LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
+DoNotSuggestPaymentMode=Do not suggest
+NoActiveBankAccountDefined=No active bank account defined
+OwnerOfBankAccount=Owner of bank account %s
+BankModuleNotActive=Bank accounts module not enabled
+ShowBugTrackLink=Show link "<strong>%s</strong>"
+Alerts=Alerts
+DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
+DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
+Delays_MAIN_DELAY_ACTIONS_TODO=Planned events (agenda events) not completed
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time
+Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Order not processed
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
+Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation
+Delays_MAIN_DELAY_MEMBERS=Delayed membership fee
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
+Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
+Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
+SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
+SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
+SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
+SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescription5=Other Setup menu entries manage optional parameters.
+LogEvents=Security audit events
+Audit=Audit
+InfoDolibarr=About Dolibarr
+InfoBrowser=About Browser
+InfoOS=About OS
+InfoWebServer=About Web Server
+InfoDatabase=About Database
+InfoPHP=About PHP
+InfoPerf=About Performances
+BrowserName=Browser name
+BrowserOS=Browser OS
+ListOfSecurityEvents=List of Dolibarr security events
+SecurityEventsPurged=Security events purged
+LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
+SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
+SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
+AccountantFileNumber=Accountant code
+DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
+AvailableModules=Available app/modules
+ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
+SessionTimeOut=Time out for session
+SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
+TriggersAvailable=Available triggers
+TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
+TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
+TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
+TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
+TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
+GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
+DictionaryDesc=Insert all reference data. You can add your values to the default.
+ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
+MiscellaneousDesc=All other security related parameters are defined here.
+LimitsSetup=Limits/Precision setup
+LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
+MAIN_MAX_DECIMALS_UNIT=Max. decimals for unit prices
+MAIN_MAX_DECIMALS_TOT=Max. decimals for total prices
+MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
+UnitPriceOfProduct=Net unit price of a product
+TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
+ParameterActiveForNextInputOnly=Parameter effective for next input only
+NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page.
+NoEventFoundWithCriteria=No security event has been found for this search criteria.
+SeeLocalSendMailSetup=See your local sendmail setup
+BackupDesc=A <b>complete</b> backup of a Dolibarr installation requires two steps.
+BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
+BackupDesc3=Backup the structure and contents of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
+BackupDescX=The archived directory should be stored in a secure place.
+BackupDescY=The generated dump file should be stored in a secure place.
+BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
+RestoreDesc=To restore a Dolibarr backup, two steps are required.
+RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
+RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
+RestoreMySQL=MySQL import
+ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+PreviousDumpFiles=Existing backup files
+PreviousArchiveFiles=Existing archive files
+WeekStartOnDay=First day of the week
+RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
+YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
+YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
+DownloadMoreSkins=More skins to download
+SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+ShowProfIdInAddress=Show professional id with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+TranslationUncomplete=Partial translation
+MAIN_DISABLE_METEO=Disable meteorological view
+MeteoStdMod=Standard mode
+MeteoStdModEnabled=Standard mode enabled
+MeteoPercentageMod=Percentage mode
+MeteoPercentageModEnabled=Percentage mode enabled
+MeteoUseMod=Click to use %s
+TestLoginToAPI=Test login to API
+ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
+ExternalAccess=External/Internet Access
+MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet)
+MAIN_PROXY_HOST=Proxy server: Name/Address
+MAIN_PROXY_PORT=Proxy server: Port
+MAIN_PROXY_USER=Proxy server: Login/User
+MAIN_PROXY_PASS=Proxy server: Password
+DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+ExtraFields=Complementary attributes
+ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsThirdParties=Complementary attributes (third party)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
+ExtraFieldsMember=Complementary attributes (member)
+ExtraFieldsMemberType=Complementary attributes (member type)
+ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
+ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
+ExtraFieldsSupplierOrders=Complementary attributes (orders)
+ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
+ExtraFieldsProject=Complementary attributes (projects)
+ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldHasWrongValue=Attribute %s has a wrong value.
+AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
+PathToDocuments=Path to documents
+PathDirectory=Directory
+SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+YouMustEnableOneModule=You must at least enable 1 module
+ClassNotFoundIntoPathWarning=Class %s not found in PHP path
+YesInSummer=Yes in summer
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
+SuhosinSessionEncrypt=Session storage encrypted by Suhosin
+ConditionIsCurrently=Condition is currently %s
+YouUseBestDriver=You use driver %s which is the best driver currently available.
+YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+SearchOptim=Search optimization
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
+BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
+AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
+AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
+FieldEdition=Edition of field %s
+FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
+GetBarCode=Get barcode
+NumberingModules=Numbering models
+##### Module password generation
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
+PasswordGenerationPerso=Return a password according to your personally defined configuration.
+SetupPerso=According to your configuration
+PasswordPatternDesc=Password pattern description
+##### Users setup #####
+RuleForGeneratedPasswords=Rules to generate and validate passwords
+DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
+UsersSetup=Users module setup
+UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
+##### HRM setup #####
+HRMSetup=HRM module setup
+##### Company setup #####
+CompanySetup=Companies module setup
+CompanyCodeChecker=Options for automatic generation of customer/vendor codes
+AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
+NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
+NotificationsDescUser=* per user, one user at a time.
+NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
+NotificationsDescGlobal=* or by setting global email addresses in this setup page.
+ModelModules=Document Templates
+DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
+WatermarkOnDraft=Watermark on draft document
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
+CompanyIdProfChecker=Rules for Professional IDs
+MustBeUnique=Must be unique?
+MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
+MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
+WebDavServer=Root URL of %s server: %s
+##### Webcal setup #####
+WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
+##### Invoices #####
+BillsSetup=Invoices module setup
+BillsNumberingModule=Invoices and credit notes numbering model
+BillsPDFModules=Invoice documents models
+BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
+PaymentsPDFModules=Payment documents models
+ForceInvoiceDate=Force invoice date to validation date
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
+SuggestPaymentByChequeToAddress=Suggest payment by check to
+FreeLegalTextOnInvoices=Free text on invoices
+WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
+PaymentsNumberingModule=Payments numbering model
+SuppliersPayment=Vendor payments
+SupplierPaymentSetup=Vendor payments setup
+##### Proposals #####
+PropalSetup=Commercial proposals module setup
+ProposalsNumberingModules=Commercial proposal numbering models
+ProposalsPDFModules=Commercial proposal documents models
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+FreeLegalTextOnProposal=Free text on commercial proposals
+WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
+##### Suppliers Orders #####
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
+##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+OrdersSetup=Sales Orders management setup
+OrdersNumberingModules=Orders numbering models
+OrdersModelModule=Order documents models
+FreeLegalTextOnOrders=Free text on orders
+WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+##### Interventions #####
+InterventionsSetup=Interventions module setup
+FreeLegalTextOnInterventions=Free text on intervention documents
+FicheinterNumberingModules=Intervention numbering models
+TemplatePDFInterventions=Intervention card documents models
+WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+##### Contracts #####
+ContractsSetup=Contracts/Subscriptions module setup
+ContractsNumberingModules=Contracts numbering modules
+TemplatePDFContracts=Contracts documents models
+FreeLegalTextOnContracts=Free text on contracts
+WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+##### Members #####
+MembersSetup=Members module setup
+MemberMainOptions=Main options
+AdherentLoginRequired= Manage a Login for each member
+AdherentMailRequired=Email required to create a new member
+MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
+MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+##### LDAP setup #####
+LDAPSetup=LDAP Setup
+LDAPGlobalParameters=Global parameters
+LDAPUsersSynchro=Users
+LDAPGroupsSynchro=Groups
+LDAPContactsSynchro=Contacts
+LDAPMembersSynchro=Members
+LDAPMembersTypesSynchro=Members types
+LDAPSynchronization=LDAP synchronisation
+LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
+LDAPToDolibarr=LDAP -> Dolibarr
+DolibarrToLDAP=Dolibarr -> LDAP
+LDAPNamingAttribute=Key in LDAP
+LDAPSynchronizeUsers=Organization of users in LDAP
+LDAPSynchronizeGroups=Organization of groups in LDAP
+LDAPSynchronizeContacts=Organization of contacts in LDAP
+LDAPSynchronizeMembers=Organization of foundation's members in LDAP
+LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
+LDAPPrimaryServer=Primary server
+LDAPSecondaryServer=Secondary server
+LDAPServerPort=Server port
+LDAPServerPortExample=Default port: 389
+LDAPServerProtocolVersion=Protocol version
+LDAPServerUseTLS=Use TLS
+LDAPServerUseTLSExample=Your LDAP server use TLS
+LDAPServerDn=Server DN
+LDAPAdminDn=Administrator DN
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
+LDAPPassword=Administrator password
+LDAPUserDn=Users' DN
+LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
+LDAPGroupDn=Groups' DN
+LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
+LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
+LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
+LDAPDnSynchroActive=Users and groups synchronization
+LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
+LDAPDnContactActive=Contacts' synchronization
+LDAPDnContactActiveExample=Activated/Unactivated synchronization
+LDAPDnMemberActive=Members' synchronization
+LDAPDnMemberActiveExample=Activated/Unactivated synchronization
+LDAPDnMemberTypeActive=Members types' synchronization
+LDAPDnMemberTypeActiveExample=Activated/Unactivated synchronization
+LDAPContactDn=Dolibarr contacts' DN
+LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
+LDAPMemberDn=Dolibarr members DN
+LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
+LDAPMemberObjectClassList=List of objectClass
+LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPMemberTypeDn=Dolibarr members types DN
+LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeObjectClassList=List of objectClass
+LDAPMemberTypeObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPUserObjectClassList=List of objectClass
+LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPGroupObjectClassList=List of objectClass
+LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPContactObjectClassList=List of objectClass
+LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPTestConnect=Test LDAP connection
+LDAPTestSynchroContact=Test contacts synchronization
+LDAPTestSynchroUser=Test user synchronization
+LDAPTestSynchroGroup=Test group synchronization
+LDAPTestSynchroMember=Test member synchronization
+LDAPTestSynchroMemberType=Test member type synchronization
+LDAPTestSearch= Test a LDAP search
+LDAPSynchroOK=Synchronization test successful
+LDAPSynchroKO=Failed synchronization test
+LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
+LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
+LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
+LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPSetupForVersion3=LDAP server configured for version 3
+LDAPSetupForVersion2=LDAP server configured for version 2
+LDAPDolibarrMapping=Dolibarr Mapping
+LDAPLdapMapping=LDAP Mapping
+LDAPFieldLoginUnix=Login (unix)
+LDAPFieldLoginExample=Example: uid
+LDAPFilterConnection=Search filter
+LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPFieldLoginSamba=Login (samba, activedirectory)
+LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldFullname=Full name
+LDAPFieldFullnameExample=Example: cn
+LDAPFieldPasswordNotCrypted=Password not encrypted
+LDAPFieldPasswordCrypted=Password encrypted
+LDAPFieldPasswordExample=Example: userPassword
+LDAPFieldCommonNameExample=Example: cn
+LDAPFieldName=Name
+LDAPFieldNameExample=Example: sn
+LDAPFieldFirstName=First name
+LDAPFieldFirstNameExample=Example: givenName
+LDAPFieldMail=Email address
+LDAPFieldMailExample=Example: mail
+LDAPFieldPhone=Professional phone number
+LDAPFieldPhoneExample=Example: telephonenumber
+LDAPFieldHomePhone=Personal phone number
+LDAPFieldHomePhoneExample=Example: homephone
+LDAPFieldMobile=Cellular phone
+LDAPFieldMobileExample=Example: mobile
+LDAPFieldFax=Fax number
+LDAPFieldFaxExample=Example: facsimiletelephonenumber
+LDAPFieldAddress=Street
+LDAPFieldAddressExample=Example: street
+LDAPFieldZip=Zip
+LDAPFieldZipExample=Example: postalcode
+LDAPFieldTown=Town
+LDAPFieldTownExample=Example: l
+LDAPFieldCountry=Country
+LDAPFieldDescription=Description
+LDAPFieldDescriptionExample=Example: description
+LDAPFieldNotePublic=Public Note
+LDAPFieldNotePublicExample=Example: publicnote
+LDAPFieldGroupMembers= Group members
+LDAPFieldGroupMembersExample= Example: uniqueMember
+LDAPFieldBirthdate=Birthdate
+LDAPFieldCompany=Company
+LDAPFieldCompanyExample=Example: o
+LDAPFieldSid=SID
+LDAPFieldSidExample=Example: objectsid
+LDAPFieldEndLastSubscription=Date of subscription end
+LDAPFieldTitle=Job position
+LDAPFieldTitleExample=Example: title
+LDAPFieldGroupid=Group id
+LDAPFieldGroupidExample=Exemple : gidnumber
+LDAPFieldUserid=User id
+LDAPFieldUseridExample=Exemple : uidnumber
+LDAPFieldHomedirectory=Home directory
+LDAPFieldHomedirectoryExample=Exemple : homedirectory
+LDAPFieldHomedirectoryprefix=Home directory prefix
+LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
+LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
+LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
+LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
+LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
+LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
+LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use thoose values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all thoose schemas loaded.
+ForANonAnonymousAccess=For an authenticated access (for a write access for example)
+PerfDolibarr=Performance setup/optimizing report
+YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
+NotInstalled=Not installed, so your server is not slowed down by this.
+ApplicativeCache=Applicative cache
+MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
+MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
+MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
+OPCodeCache=OPCode cache
+NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
+HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
+FilesOfTypeCached=Files of type %s are cached by HTTP server
+FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
+FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
+FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
+CacheByServer=Cache by server
+CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
+CacheByClient=Cache by browser
+CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
+DefaultCreateForm=Default values (to use on forms)
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
+DefaultMandatory=Mandatory form fields
+##### Products #####
+ProductSetup=Products module setup
+ServiceSetup=Services module setup
+ProductServiceSetup=Products and Services modules setup
+NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
+ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in the language of the third party
+UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
+SetDefaultBarcodeTypeProducts=Default barcode type to use for products
+SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
+ProductCodeChecker= Module for product code generation and checking (product or service)
+ProductOtherConf= Product / Service configuration
+IsNotADir=is not a directory!
+##### Syslog #####
+SyslogSetup=Logs module setup
+SyslogOutput=Logs outputs
+SyslogFacility=Facility
+SyslogLevel=Level
+SyslogFilename=File name and path
+YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
+ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
+OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+##### Donations #####
+DonationsSetup=Donation module setup
+DonationsReceiptModel=Template of donation receipt
+##### Barcode #####
+BarcodeSetup=Barcode setup
+PaperFormatModule=Print format module
+BarcodeEncodeModule=Barcode encoding type
+CodeBarGenerator=Barcode generator
+ChooseABarCode=No generator defined
+FormatNotSupportedByGenerator=Format not supported by this generator
+BarcodeDescEAN8=Barcode of type EAN8
+BarcodeDescEAN13=Barcode of type EAN13
+BarcodeDescUPC=Barcode of type UPC
+BarcodeDescISBN=Barcode of type ISBN
+BarcodeDescC39=Barcode of type C39
+BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
+GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
+BarcodeInternalEngine=Internal engine
+BarCodeNumberManager=Manager to auto define barcode numbers
+##### Prelevements #####
+WithdrawalsSetup=Setup of module Direct Debit payments
+##### ExternalRSS #####
+ExternalRSSSetup=External RSS imports setup
+NewRSS=New RSS Feed
+RSSUrl=RSS URL
+RSSUrlExample=An interesting RSS feed
+##### Mailing #####
+MailingSetup=EMailing module setup
+MailingEMailFrom=Sender email (From) for emails sent by emailing module
+MailingEMailError=Return Email (Errors-to) for emails with errors
+MailingDelay=Seconds to wait after sending next message
+##### Notification #####
+NotificationSetup=Email Notification module setup
+NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
+FixedEmailTarget=Recipient
+##### Sendings #####
+SendingsSetup=Shipping module setup
+SendingsReceiptModel=Sending receipt model
+SendingsNumberingModules=Sendings numbering modules
+SendingsAbility=Support shipping sheets for customer deliveries
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
+FreeLegalTextOnShippings=Free text on shipments
+##### Deliveries #####
+DeliveryOrderNumberingModules=Products deliveries receipt numbering module
+DeliveryOrderModel=Products deliveries receipt model
+DeliveriesOrderAbility=Support products deliveries receipts
+FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+##### FCKeditor #####
+AdvancedEditor=Advanced editor
+ActivateFCKeditor=Activate advanced editor for:
+FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
+FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
+FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
+FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
+FCKeditorForTicket=WYSIWIG creation/edition for tickets
+##### Stock #####
+StockSetup=Stock module setup
+IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+##### Menu #####
+MenuDeleted=Menu deleted
+Menus=Menus
+TreeMenuPersonalized=Personalized menus
+NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
+NewMenu=New menu
+Menu=Selection of menu
+MenuHandler=Menu handler
+MenuModule=Source module
+HideUnauthorizedMenu= Hide unauthorized menus (gray)
+DetailId=Id menu
+DetailMenuHandler=Menu handler where to show new menu
+DetailMenuModule=Module name if menu entry come from a module
+DetailType=Type of menu (top or left)
+DetailTitre=Menu label or label code for translation
+DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
+DetailEnabled=Condition to show or not entry
+DetailRight=Condition to display unauthorized grey menus
+DetailLangs=Lang file name for label code translation
+DetailUser=Intern / Extern / All
+Target=Target
+DetailTarget=Target for links (_blank top opens a new window)
+DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
+ModifMenu=Menu change
+DeleteMenu=Delete menu entry
+ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
+FailedToInitializeMenu=Failed to initialize menu
+##### Tax #####
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
+OptionVatMode=VAT due
+OptionVATDefault=Standard basis
+OptionVATDebitOption=Accrual basis
+OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
+OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
+SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option:
+OnDelivery=On delivery
+OnPayment=On payment
+OnInvoice=On invoice
+SupposedToBePaymentDate=Payment date used
+SupposedToBeInvoiceDate=Invoice date used
+Buy=Buy
+Sell=Sell
+InvoiceDateUsed=Invoice date used
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
+AccountancyCode=Accounting Code
+AccountancyCodeSell=Sale account. code
+AccountancyCodeBuy=Purchase account. code
+##### Agenda #####
+AgendaSetup=Events and agenda module setup
+PasswordTogetVCalExport=Key to authorize export link
+PastDelayVCalExport=Do not export event older than
+AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
+AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
+AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
+AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
+ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+##### Point Of Sale (CashDesk) #####
+CashDesk=Point of Sale
+CashDeskSetup=Point of Sales module setup
+CashDeskThirdPartyForSell=Default generic third party to use for sales
+CashDeskBankAccountForSell=Default account to use to receive cash payments
+CashDeskBankAccountForCheque=Default account to use to receive payments by check
+CashDeskBankAccountForCB=Default account to use to receive payments by credit cards
+CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with module Serial/Lot management (currently active) so stock decrease is disabled.
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
+CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
+CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
+CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+##### Bookmark #####
+BookmarkSetup=Bookmark module setup
+BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
+NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
+##### WebServices #####
+WebServicesSetup=Webservices module setup
+WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
+WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
+EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
+ApiExporerIs=You can explore and test the APIs at URL
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+##### Bank #####
+BankSetupModule=Bank module setup
+FreeLegalTextOnChequeReceipts=Free text on check receipts
+BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
+BankOrderGlobal=General
+BankOrderGlobalDesc=General display order
+BankOrderES=Spanish
+BankOrderESDesc=Spanish display order
+ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+##### Multicompany #####
+MultiCompanySetup=Multi-company module setup
+##### Suppliers #####
+SuppliersSetup=Vendor module setup
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
+SuppliersInvoiceModel=Complete template of Vendor Invoice
+SuppliersInvoiceNumberingModel=Vendor invoices numbering models
+IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
+##### GeoIPMaxmind #####
+GeoIPMaxmindSetup=GeoIP Maxmind module setup
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
+NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
+YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
+YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
+TestGeoIPResult=Test of a conversion IP -> country
+##### Projects #####
+ProjectsNumberingModules=Projects numbering module
+ProjectsSetup=Project module setup
+ProjectsModelModule=Project reports document model
+TasksNumberingModules=Tasks numbering module
+TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
+##### ECM (GED) #####
+##### Fiscal Year #####
+AccountingPeriods=Accounting periods
+AccountingPeriodCard=Accounting period
+NewFiscalYear=New accounting period
+OpenFiscalYear=Open accounting period
+CloseFiscalYear=Close accounting period
+DeleteFiscalYear=Delete accounting period
+ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
+ShowFiscalYear=Show accounting period
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
+Format=Format
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
+IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
+ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
+ExpenseReportNumberingModules=Expense reports numbering module
+NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerUser=List of automatic notifications per user*
+ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
+ListOfFixedNotifications=List of automatic fixed notifications
+GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+Threshold=Threshold
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
+SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
+SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
+HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+TextTitleColor=Text color of Page title
+LinkColor=Color of links
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
+MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
+NbAddedAutomatically=Number of days added to counters of users (automatically) each month
+EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+Enter0or1=Enter 0 or 1
+UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
+PositionIntoComboList=Position of line into combo lists
+SellTaxRate=Sale tax rate
+RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
+UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
+OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
+TemplateForElement=This template record is dedicated to which element
+TypeOfTemplate=Type of template
+TemplateIsVisibleByOwnerOnly=Template is visible to owner only
+VisibleEverywhere=Visible everywhere
+VisibleNowhere=Visible nowhere
+FixTZ=TimeZone fix
+FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
+ExpectedChecksum=Expected Checksum
+CurrentChecksum=Current Checksum
+ExpectedSize=Expected size
+CurrentSize=Current size
+ForcedConstants=Required constant values
+MailToSendProposal=Customer proposals
+MailToSendOrder=Sales orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Shipments
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracts
+MailToThirdparty=Third parties
+MailToMember=Members
+MailToUser=Users
+MailToProject=Projects page
+ByDefaultInList=Show by default on list view
+YouUseLastStableVersion=You use the latest stable version
+TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
+TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
+SeeChangeLog=See ChangeLog file (english only)
+AllPublishers=All publishers
+UnknownPublishers=Unknown publishers
+AddRemoveTabs=Add or remove tabs
+AddDataTables=Add object tables
+AddDictionaries=Add dictionaries tables
+AddData=Add objects or dictionaries data
+AddBoxes=Add widgets
+AddSheduledJobs=Add scheduled jobs
+AddHooks=Add hooks
+AddTriggers=Add triggers
+AddMenus=Add menus
+AddPermissions=Add permissions
+AddExportProfiles=Add export profiles
+AddImportProfiles=Add import profiles
+AddOtherPagesOrServices=Add other pages or services
+AddModels=Add document or numbering templates
+AddSubstitutions=Add keys substitutions
+DetectionNotPossible=Detection not possible
+UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
+ListOfAvailableAPIs=List of available APIs
+activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
+CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
+UserHasNoPermissions=This user has no permissions defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
+BaseCurrency=Reference currency of the company (go into setup of company to change this)
+WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
+WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
+MAIN_PDF_MARGIN_LEFT=Left margin on PDF
+MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
+MAIN_PDF_MARGIN_TOP=Top margin on PDF
+MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+NothingToSetup=There is no specific setup required for this module.
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+RemoveSpecialChars=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
+GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
+GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
+HelpOnTooltip=Help text to show on tooltip
+HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
+YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
+ChartLoaded=Chart of account loaded
+SocialNetworkSetup=Setup of module Social Networks
+EnableFeatureFor=Enable features for <strong>%s</strong>
+VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+EmailCollector=Email collector
+EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
+NewEmailCollector=New Email Collector
+EMailHost=Host of email IMAP server
+MailboxSourceDirectory=Mailbox source directory
+MailboxTargetDirectory=Mailbox target directory
+EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
+CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
+DateLastCollectResult=Date latest collect tried
+DateLastcollectResultOk=Date latest collect successfull
+LastResult=Latest result
+EmailCollectorConfirmCollectTitle=Email collect confirmation
+EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
+NoNewEmailToProcess=No new email (matching filters) to process
+NothingProcessed=Nothing done
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+RecordEvent=Record email event
+CreateLeadAndThirdParty=Create lead (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CodeLastResult=Latest result code
+NbOfEmailsInInbox=Number of emails in source directory
+LoadThirdPartyFromName=Load third party searching on %s (load only)
+LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+WithDolTrackingID=Dolibarr Reference found in Message ID
+WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+FormatZip=Zip
+MainMenuCode=Menu entry code (mainmenu)
+ECMAutoTree=Show automatic ECM tree
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OpeningHours=Opening hours
+OpeningHoursDesc=Enter here the regular opening hours of your company.
+ResourceSetup=Configuration of Resource module
+UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
+EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
+ConfirmUnactivation=Confirm module reset
+OnMobileOnly=On small screen (smartphone) only
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
+Protanopia=Protanopia
+Deuteranopes=Deuteranopes
+Tritanopes=Tritanopes
+ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
+DefaultCustomerType=Default thirdparty type for "New customer" creation form
+ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
+RootCategoryForProductsToSell=Root category of products to sell
+RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
+DebugBar=Debug Bar
+DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
+DebugBarSetup=DebugBar Setup
+GeneralOptions=General Options
+LogsLinesNumber=Number of lines to show on logs tab
+UseDebugBar=Use the debug bar
+DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
+WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
+ModuleActivated=Module %s is activated and slows the interface
+EXPORTS_SHARE_MODELS=Export models are share with everybody
+ExportSetup=Setup of module Export
+ImportSetup=Setup of module Import
+InstanceUniqueID=Unique ID of the instance
+SmallerThan=Smaller than
+LargerThan=Larger than
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
+EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
+RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
+AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+IPListExample=127.0.0.1 192.168.0.2 [::1]
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
+FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
+EmailTemplate=Template for email
+EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
+FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/km_KH/agenda.lang b/htdocs/langs/km_KH/agenda.lang
new file mode 100644
index 00000000000..2031241d2c9
--- /dev/null
+++ b/htdocs/langs/km_KH/agenda.lang
@@ -0,0 +1,154 @@
+# Dolibarr language file - Source file is en_US - agenda
+IdAgenda=ID event
+Actions=Events
+Agenda=Agenda
+TMenuAgenda=Agenda
+Agendas=Agendas
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+ActionsOwnedByShort=Owner
+AffectedTo=Assigned to
+Event=Event
+Events=Events
+EventsNb=Number of events
+ListOfActions=List of events
+EventReports=Event reports
+Location=Location
+ToUserOfGroup=To any user in group
+EventOnFullDay=Event on all day(s)
+MenuToDoActions=All incomplete events
+MenuDoneActions=All terminated events
+MenuToDoMyActions=My incomplete events
+MenuDoneMyActions=My terminated events
+ListOfEvents=List of events (internal calendar)
+ActionsAskedBy=Events reported by
+ActionsToDoBy=Events assigned to
+ActionsDoneBy=Events done by
+ActionAssignedTo=Event assigned to
+ViewCal=Month view
+ViewDay=Day view
+ViewWeek=Week view
+ViewPerUser=Per user view
+ViewPerType=Per type view
+AutoActions= Automatic filling
+AgendaAutoActionDesc= Here you may define events which you want Dolibarr to create automatically  in Agenda. If nothing is checked, only manual actions will be included in logs and displayed in Agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
+AgendaSetupOtherDesc= This page provides options to allow the export of your Dolibarr events into an external calendar (Thunderbird, Google Calendar etc...)
+AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
+ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
+EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
+##### Agenda event labels #####
+NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
+ContractValidatedInDolibarr=Contract %s validated
+CONTRACT_DELETEInDolibarr=Contract %s deleted
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
+InvoiceDeleteDolibarr=Invoice %s deleted
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+MemberValidatedInDolibarr=Member %s validated
+MemberModifiedInDolibarr=Member %s modified
+MemberResiliatedInDolibarr=Member %s terminated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
+ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
+ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
+ShipmentDeletedInDolibarr=Shipment %s deleted
+OrderCreatedInDolibarr=Order %s created
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
+OrderApprovedInDolibarr=Order %s approved
+OrderRefusedInDolibarr=Order %s refused
+OrderBackToDraftInDolibarr=Order %s go back to draft status
+ProposalSentByEMail=Commercial proposal %s sent by email
+ContractSentByEMail=Contract %s sent by email
+OrderSentByEMail=Sales order %s sent by email
+InvoiceSentByEMail=Customer invoice %s sent by email
+SupplierOrderSentByEMail=Purchase order %s sent by email
+ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
+SupplierInvoiceSentByEMail=Vendor invoice %s sent by email
+ShippingSentByEMail=Shipment %s sent by email
+ShippingValidated= Shipment %s validated
+InterventionSentByEMail=Intervention %s sent by email
+ProposalDeleted=Proposal deleted
+OrderDeleted=Order deleted
+InvoiceDeleted=Invoice deleted
+DraftInvoiceDeleted=Draft invoice deleted
+PRODUCT_CREATEInDolibarr=Product %s created
+PRODUCT_MODIFYInDolibarr=Product %s modified
+PRODUCT_DELETEInDolibarr=Product %s deleted
+HOLIDAY_CREATEInDolibarr=Request for leave %s created
+HOLIDAY_MODIFYInDolibarr=Request for leave %s modified
+HOLIDAY_APPROVEInDolibarr=Request for leave %s approved
+HOLIDAY_VALIDATEInDolibarr=Request for leave %s validated
+HOLIDAY_DELETEInDolibarr=Request for leave %s deleted
+EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created
+EXPENSE_REPORT_VALIDATEInDolibarr=Expense report %s validated
+EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved
+EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted
+EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused
+PROJECT_CREATEInDolibarr=Project %s created
+PROJECT_MODIFYInDolibarr=Project %s modified
+PROJECT_DELETEInDolibarr=Project %s deleted
+TICKET_CREATEInDolibarr=Ticket %s created
+TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
+TICKET_CLOSEInDolibarr=Ticket %s closed
+TICKET_DELETEInDolibarr=Ticket %s deleted
+BOM_VALIDATEInDolibarr=BOM validated
+BOM_UNVALIDATEInDolibarr=BOM unvalidated
+BOM_CLOSEInDolibarr=BOM disabled
+BOM_REOPENInDolibarr=BOM reopen
+BOM_DELETEInDolibarr=BOM deleted
+MRP_MO_VALIDATEInDolibarr=MO validated
+MRP_MO_PRODUCEDInDolibarr=MO produced
+MRP_MO_DELETEInDolibarr=MO deleted
+##### End agenda events #####
+AgendaModelModule=Document templates for event
+DateActionStart=Start date
+DateActionEnd=End date
+AgendaUrlOptions1=You can also add following parameters to filter output:
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
+AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
+AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
+AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaHideBirthdayEvents=Hide birthdays of contacts
+Busy=Busy
+ExportDataset_event1=List of agenda events
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
+# External Sites ical
+ExportCal=Export calendar
+ExtSites=Import external calendars
+ExtSitesEnableThisTool=Show external calendars (defined in global setup) in Agenda. Does not affect external calendars defined by users.
+ExtSitesNbOfAgenda=Number of calendars
+AgendaExtNb=Calendar no. %s
+ExtSiteUrlAgenda=URL to access .ical file
+ExtSiteNoLabel=No Description
+VisibleTimeRange=Visible time range
+VisibleDaysRange=Visible days range
+AddEvent=Create event
+MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
+RepeatEvent=Repeat event
+EveryWeek=Every week
+EveryMonth=Every month
+DayOfMonth=Day of month
+DayOfWeek=Day of week
+DateStartPlusOne=Date start + 1 hour
diff --git a/htdocs/langs/km_KH/banks.lang b/htdocs/langs/km_KH/banks.lang
new file mode 100644
index 00000000000..e54239e9fb2
--- /dev/null
+++ b/htdocs/langs/km_KH/banks.lang
@@ -0,0 +1,175 @@
+# Dolibarr language file - Source file is en_US - banks
+Bank=Bank
+MenuBankCash=Banks | Cash
+MenuVariousPayment=Miscellaneous payments
+MenuNewVariousPayment=New Miscellaneous payment
+BankName=Bank name
+FinancialAccount=Account
+BankAccount=Bank account
+BankAccounts=Bank accounts
+BankAccountsAndGateways=Bank accounts | Gateways
+ShowAccount=Show Account
+AccountRef=Financial account ref
+AccountLabel=Financial account label
+CashAccount=Cash account
+CashAccounts=Cash accounts
+CurrentAccounts=Current accounts
+SavingAccounts=Savings accounts
+ErrorBankLabelAlreadyExists=Financial account label already exists
+BankBalance=Balance
+BankBalanceBefore=Balance before
+BankBalanceAfter=Balance after
+BalanceMinimalAllowed=Minimum allowed balance
+BalanceMinimalDesired=Minimum desired balance
+InitialBankBalance=Initial balance
+EndBankBalance=End balance
+CurrentBalance=Current balance
+FutureBalance=Future balance
+ShowAllTimeBalance=Show balance from start
+AllTime=From start
+Reconciliation=Reconciliation
+RIB=Bank Account Number
+IBAN=IBAN number
+BIC=BIC/SWIFT code
+SwiftValid=BIC/SWIFT valid
+SwiftVNotalid=BIC/SWIFT not valid
+IbanValid=BAN valid
+IbanNotValid=BAN not valid
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
+AccountStatement=Account statement
+AccountStatementShort=Statement
+AccountStatements=Account statements
+LastAccountStatements=Last account statements
+IOMonthlyReporting=Monthly reporting
+BankAccountDomiciliation=Bank address
+BankAccountCountry=Account country
+BankAccountOwner=Account owner name
+BankAccountOwnerAddress=Account owner address
+RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
+CreateAccount=Create account
+NewBankAccount=New account
+NewFinancialAccount=New financial account
+MenuNewFinancialAccount=New financial account
+EditFinancialAccount=Edit account
+LabelBankCashAccount=Bank or cash label
+AccountType=Account type
+BankType0=Savings account
+BankType1=Current or credit card account
+BankType2=Cash account
+AccountsArea=Accounts area
+AccountCard=Account card
+DeleteAccount=Delete account
+ConfirmDeleteAccount=Are you sure you want to delete this account?
+Account=Account
+BankTransactionByCategories=Bank entries by categories
+BankTransactionForCategory=Bank entries for category <b>%s</b>
+RemoveFromRubrique=Remove link with category
+RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
+ListBankTransactions=List of bank entries
+IdTransaction=Transaction ID
+BankTransactions=Bank entries
+BankTransaction=Bank entry
+ListTransactions=List entries
+ListTransactionsByCategory=List entries/category
+TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
+Conciliable=Can be reconciled
+Conciliate=Reconcile
+Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
+ReconciliationLate=Reconciliation late
+IncludeClosedAccount=Include closed accounts
+OnlyOpenedAccount=Only open accounts
+AccountToCredit=Account to credit
+AccountToDebit=Account to debit
+DisableConciliation=Disable reconciliation feature for this account
+ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated entry
+StatusAccountOpened=Open
+StatusAccountClosed=Closed
+AccountIdShort=Number
+LineRecord=Transaction
+AddBankRecord=Add entry
+AddBankRecordLong=Add entry manually
+Conciliated=Reconciled
+ConciliatedBy=Reconciled by
+DateConciliating=Reconcile date
+BankLineConciliated=Entry reconciled with bank receipt
+Reconciled=Reconciled
+NotReconciled=Not reconciled
+CustomerInvoicePayment=Customer payment
+SupplierInvoicePayment=Vendor payment
+SubscriptionPayment=Subscription payment
+WithdrawalPayment=Debit payment order
+SocialContributionPayment=Social/fiscal tax payment
+BankTransfer=Bank transfer
+BankTransfers=Bank transfers
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferFrom=From
+TransferTo=To
+TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
+CheckTransmitter=Transmitter
+ValidateCheckReceipt=Validate this check receipt?
+ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done?
+DeleteCheckReceipt=Delete this check receipt?
+ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
+BankChecks=Bank checks
+BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
+ShowCheckReceipt=Show check deposit receipt
+NumberOfCheques=No. of check
+DeleteTransaction=Delete entry
+ConfirmDeleteTransaction=Are you sure you want to delete this entry?
+ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
+BankMovements=Movements
+PlannedTransactions=Planned entries
+Graph=Graphics
+ExportDataset_banque_1=Bank entries and account statement
+ExportDataset_banque_2=Deposit slip
+TransactionOnTheOtherAccount=Transaction on the other account
+PaymentNumberUpdateSucceeded=Payment number updated successfully
+PaymentNumberUpdateFailed=Payment number could not be updated
+PaymentDateUpdateSucceeded=Payment date updated successfully
+PaymentDateUpdateFailed=Payment date could not be updated
+Transactions=Transactions
+BankTransactionLine=Bank entry
+AllAccounts=All bank and cash accounts
+BackToAccount=Back to account
+ShowAllAccounts=Show for all accounts
+FutureTransaction=Future transaction. Unable to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+EventualyAddCategory=Eventually, specify a category in which to classify the records
+ToConciliate=To reconcile?
+ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
+DefaultRIB=Default BAN
+AllRIB=All BAN
+LabelRIB=BAN Label
+NoBANRecord=No BAN record
+DeleteARib=Delete BAN record
+ConfirmDeleteRib=Are you sure you want to delete this BAN record?
+RejectCheck=Check returned
+ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
+RejectCheckDate=Date the check was returned
+CheckRejected=Check returned
+CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
+VariousPayments=Miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
+SEPAMandate=SEPA mandate
+YourSEPAMandate=Your SEPA mandate
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
+BankColorizeMovement=Colorize movements
+BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
+BankColorizeMovementName1=Background color for debit movement
+BankColorizeMovementName2=Background color for credit movement
diff --git a/htdocs/langs/km_KH/bills.lang b/htdocs/langs/km_KH/bills.lang
new file mode 100644
index 00000000000..9f11d8ecf87
--- /dev/null
+++ b/htdocs/langs/km_KH/bills.lang
@@ -0,0 +1,574 @@
+# Dolibarr language file - Source file is en_US - bills
+Bill=Invoice
+Bills=Invoices
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Vendor invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid vendor invoices
+BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsLate=Late payments
+BillsStatistics=Customers invoices statistics
+BillsStatisticsSuppliers=Vendors invoices statistics
+DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
+DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
+DisabledBecauseNotErasable=Disabled because cannot be erased
+InvoiceStandard=Standard invoice
+InvoiceStandardAsk=Standard invoice
+InvoiceStandardDesc=This kind of invoice is the common invoice.
+InvoiceDeposit=Down payment invoice
+InvoiceDepositAsk=Down payment invoice
+InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
+InvoiceProForma=Proforma invoice
+InvoiceProFormaAsk=Proforma invoice
+InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
+InvoiceReplacement=Replacement invoice
+InvoiceReplacementAsk=Replacement invoice for invoice
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceAvoir=Credit note
+InvoiceAvoirAsk=Credit note to correct invoice
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
+invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+ReplaceInvoice=Replace invoice %s
+ReplacementInvoice=Replacement invoice
+ReplacedByInvoice=Replaced by invoice %s
+ReplacementByInvoice=Replaced by invoice
+CorrectInvoice=Correct invoice %s
+CorrectionInvoice=Correction invoice
+UsedByInvoice=Used to pay invoice %s
+ConsumedBy=Consumed by
+NotConsumed=Not consumed
+NoReplacableInvoice=No replaceable invoices
+NoInvoiceToCorrect=No invoice to correct
+InvoiceHasAvoir=Was source of one or several credit notes
+CardBill=Invoice card
+PredefinedInvoices=Predefined Invoices
+Invoice=Invoice
+PdfInvoiceTitle=Invoice
+Invoices=Invoices
+InvoiceLine=Invoice line
+InvoiceCustomer=Customer invoice
+CustomerInvoice=Customer invoice
+CustomersInvoices=Customers invoices
+SupplierInvoice=Vendor invoice
+SuppliersInvoices=Vendors invoices
+SupplierBill=Vendor invoice
+SupplierBills=suppliers invoices
+Payment=Payment
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
+Payments=Payments
+PaymentsBack=Refunds
+paymentInInvoiceCurrency=in invoices currency
+PaidBack=Paid back
+DeletePayment=Delete payment
+ConfirmDeletePayment=Are you sure you want to delete this payment?
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+SupplierPayments=Vendor payments
+ReceivedPayments=Received payments
+ReceivedCustomersPayments=Payments received from customers
+PayedSuppliersPayments=Payments paid to vendors
+ReceivedCustomersPaymentsToValid=Received customers payments to validate
+PaymentsReportsForYear=Payments reports for %s
+PaymentsReports=Payments reports
+PaymentsAlreadyDone=Payments already done
+PaymentsBackAlreadyDone=Refunds already done
+PaymentRule=Payment rule
+PaymentMode=Payment Type
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
+IdPaymentMode=Payment Type (id)
+CodePaymentMode=Payment Type (code)
+LabelPaymentMode=Payment Type (label)
+PaymentModeShort=Payment Type
+PaymentTerm=Payment Term
+PaymentConditions=Payment Terms
+PaymentConditionsShort=Payment Terms
+PaymentAmount=Payment amount
+PaymentHigherThanReminderToPay=Payment higher than reminder to pay
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
+ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
+ClassifyPaidPartially=Classify 'Paid partially'
+ClassifyCanceled=Classify 'Abandoned'
+ClassifyClosed=Classify 'Closed'
+ClassifyUnBilled=Classify 'Unbilled'
+CreateBill=Create Invoice
+CreateCreditNote=Create credit note
+AddBill=Create invoice or credit note
+AddToDraftInvoices=Add to draft invoice
+DeleteBill=Delete invoice
+SearchACustomerInvoice=Search for a customer invoice
+SearchASupplierInvoice=Search for a vendor invoice
+CancelBill=Cancel an invoice
+SendRemindByMail=Send reminder by email
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
+ConvertToReduc=Mark as credit available
+ConvertExcessReceivedToReduc=Convert excess received into available credit
+ConvertExcessPaidToReduc=Convert excess paid into available discount
+EnterPaymentReceivedFromCustomer=Enter payment received from customer
+EnterPaymentDueToCustomer=Make payment due to customer
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+PriceBase=Price base
+BillStatus=Invoice status
+StatusOfGeneratedInvoices=Status of generated invoices
+BillStatusDraft=Draft (needs to be validated)
+BillStatusPaid=Paid
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
+BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusCanceled=Abandoned
+BillStatusValidated=Validated (needs to be paid)
+BillStatusStarted=Started
+BillStatusNotPaid=Not paid
+BillStatusNotRefunded=Not refunded
+BillStatusClosedUnpaid=Closed (unpaid)
+BillStatusClosedPaidPartially=Paid (partially)
+BillShortStatusDraft=Draft
+BillShortStatusPaid=Paid
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
+BillShortStatusConverted=Paid
+BillShortStatusCanceled=Abandoned
+BillShortStatusValidated=Validated
+BillShortStatusStarted=Started
+BillShortStatusNotPaid=Not paid
+BillShortStatusNotRefunded=Not refunded
+BillShortStatusClosedUnpaid=Closed
+BillShortStatusClosedPaidPartially=Paid (partially)
+PaymentStatusToValidShort=To validate
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
+ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
+ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
+ErrorBillNotFound=Invoice %s does not exist
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorDiscountAlreadyUsed=Error, discount already used
+ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
+ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
+ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
+BillFrom=From
+BillTo=To
+ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=Template / Recurring invoice
+NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
+FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
+NotARecurringInvoiceTemplate=Not a recurring template invoice
+NewBill=New invoice
+LastBills=Latest %s invoices
+LatestTemplateInvoices=Latest %s template invoices
+LatestCustomerTemplateInvoices=Latest %s customer template invoices
+LatestSupplierTemplateInvoices=Latest %s vendor template invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s vendor invoices
+AllBills=All invoices
+AllCustomerTemplateInvoices=All template invoices
+OtherBills=Other invoices
+DraftBills=Draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Vendor draft invoices
+Unpaid=Unpaid
+ErrorNoPaymentDefined=Error No payment defined
+ConfirmDeleteBill=Are you sure you want to delete this invoice?
+ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
+ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
+ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
+ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
+ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
+ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
+ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
+ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyAbandonReasonOther=Other
+ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
+ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
+ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
+ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
+ValidateBill=Validate invoice
+UnvalidateBill=Unvalidate invoice
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
+AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
+AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
+UseSituationInvoices=Allow situation invoice
+UseSituationInvoicesCreditNote=Allow situation invoice credit note
+Retainedwarranty=Retained warranty
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
+RetainedwarrantyDefaultPercent=Retained warranty default percent
+RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
+RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
+ToPayOn=To pay on %s
+toPayOn=to pay on %s
+RetainedWarranty=Retained Warranty
+PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
+DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
+setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
+setretainedwarranty=Set retained warranty
+setretainedwarrantyDateLimit=Set retained warranty date limit
+RetainedWarrantyDateLimit=Retained warranty date limit
+RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
+AlreadyPaid=Already paid
+AlreadyPaidBack=Already paid back
+AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
+Abandoned=Abandoned
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to refund
+Rest=Pending
+AmountExpected=Amount claimed
+ExcessReceived=Excess received
+ExcessPaid=Excess paid
+EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
+NoDraftBills=No draft invoices
+NoOtherDraftBills=No other draft invoices
+NoDraftInvoices=No draft invoices
+RefBill=Invoice ref
+ToBill=To bill
+RemainderToBill=Remainder to bill
+SendBillByMail=Send invoice by email
+SendReminderBillByMail=Send reminder by email
+RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
+MenuToValid=To valid
+DateMaxPayment=Payment due on
+DateInvoice=Invoice date
+DatePointOfTax=Point of tax
+NoInvoice=No invoice
+ClassifyBill=Classify invoice
+SupplierBillsToPay=Unpaid vendor invoices
+CustomerBillsUnpaid=Unpaid customer invoices
+NonPercuRecuperable=Non-recoverable
+SetConditions=Set Payment Terms
+SetMode=Set Payment Type
+SetRevenuStamp=Set revenue stamp
+Billed=Billed
+RecurringInvoices=Recurring invoices
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
+CustomersInvoicesAndPayments=Customer invoices and payments
+ExportDataset_invoice_1=Customer invoices and invoice details
+ExportDataset_invoice_2=Customer invoices and payments
+ProformaBill=Proforma Bill:
+Reduction=Reduction
+ReductionShort=Disc.
+Reductions=Reductions
+ReductionsShort=Disc.
+Discounts=Discounts
+AddDiscount=Create discount
+AddRelativeDiscount=Create relative discount
+EditRelativeDiscount=Edit relative discount
+AddGlobalDiscount=Create absolute discount
+EditGlobalDiscounts=Edit absolute discounts
+AddCreditNote=Create credit note
+ShowDiscount=Show discount
+ShowReduc=Show the discount
+ShowSourceInvoice=Show the source invoice
+RelativeDiscount=Relative discount
+GlobalDiscount=Global discount
+CreditNote=Credit note
+CreditNotes=Credit notes
+CreditNotesOrExcessReceived=Credit notes or excess received
+Deposit=Down payment
+Deposits=Down payments
+DiscountFromCreditNote=Discount from credit note %s
+DiscountFromDeposit=Down payments from invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
+AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
+CreditNoteDepositUse=Invoice must be validated to use this kind of credits
+NewGlobalDiscount=New absolute discount
+NewRelativeDiscount=New relative discount
+DiscountType=Discount type
+NoteReason=Note/Reason
+ReasonDiscount=Reason
+DiscountOfferedBy=Granted by
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Vendors discounts
+BillAddress=Bill address
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
+IdSocialContribution=Social/fiscal tax payment id
+PaymentId=Payment id
+PaymentRef=Payment ref.
+InvoiceId=Invoice id
+InvoiceRef=Invoice ref.
+InvoiceDateCreation=Invoice creation date
+InvoiceStatus=Invoice status
+InvoiceNote=Invoice note
+InvoicePaid=Invoice paid
+InvoicePaidCompletely=Paid completely
+InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
+OrderBilled=Order billed
+DonationPaid=Donation paid
+PaymentNumber=Payment number
+RemoveDiscount=Remove discount
+WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty)
+InvoiceNotChecked=No invoice selected
+ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
+DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
+NbOfPayments=No. of payments
+SplitDiscount=Split discount in two
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
+ConfirmRemoveDiscount=Are you sure you want to remove this discount?
+RelatedBill=Related invoice
+RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related vendor invoices
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoices already exist
+MergingPDFTool=Merging PDF tool
+AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
+PaymentNote=Payment note
+ListOfPreviousSituationInvoices=List of previous situation invoices
+ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+FrequencyUnit=Frequency unit
+toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
+NextDateToExecution=Date for next invoice generation
+NextDateToExecutionShort=Date next gen.
+DateLastGeneration=Date of latest generation
+DateLastGenerationShort=Date latest gen.
+MaxPeriodNumber=Max. number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
+InvoiceAutoValidate=Validate invoices automatically
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not reached yet
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
+WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
+WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
+ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
+# PaymentConditions
+Statut=Status
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShort30D=30 days
+PaymentCondition30D=30 days
+PaymentConditionShort30DENDMONTH=30 days of month-end
+PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort60D=60 days
+PaymentCondition60D=60 days
+PaymentConditionShort60DENDMONTH=60 days of month-end
+PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShortPT_DELIVERY=Delivery
+PaymentConditionPT_DELIVERY=On delivery
+PaymentConditionShortPT_ORDER=Order
+PaymentConditionPT_ORDER=On order
+PaymentConditionShortPT_5050=50-50
+PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+PaymentConditionShort10D=10 days
+PaymentCondition10D=10 days
+PaymentConditionShort10DENDMONTH=10 days of month-end
+PaymentCondition10DENDMONTH=Within 10 days following the end of the month
+PaymentConditionShort14D=14 days
+PaymentCondition14D=14 days
+PaymentConditionShort14DENDMONTH=14 days of month-end
+PaymentCondition14DENDMONTH=Within 14 days following the end of the month
+FixAmount=Fixed amount - 1 line with label '%s'
+VarAmount=Variable amount (%% tot.)
+VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
+VarAmountAllLines=Variable amount (%% tot.) - all same lines
+# PaymentType
+PaymentTypeVIR=Bank transfer
+PaymentTypeShortVIR=Bank transfer
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
+PaymentTypeLIQ=Cash
+PaymentTypeShortLIQ=Cash
+PaymentTypeCB=Credit card
+PaymentTypeShortCB=Credit card
+PaymentTypeCHQ=Check
+PaymentTypeShortCHQ=Check
+PaymentTypeTIP=TIP (Documents against Payment)
+PaymentTypeShortTIP=TIP Payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
+PaymentTypeTRA=Bank draft
+PaymentTypeShortTRA=Draft
+PaymentTypeFAC=Factor
+PaymentTypeShortFAC=Factor
+BankDetails=Bank details
+BankCode=Bank code
+DeskCode=Branch code
+BankAccountNumber=Account number
+BankAccountNumberKey=Checksum
+Residence=Address
+IBANNumber=IBAN account number
+IBAN=IBAN
+BIC=BIC/SWIFT
+BICNumber=BIC/SWIFT code
+ExtraInfos=Extra infos
+RegulatedOn=Regulated on
+ChequeNumber=Check N°
+ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
+ChequeMaker=Check/Transfer transmitter
+ChequeBank=Bank of Check
+CheckBank=Check
+NetToBePaid=Net to be paid
+PhoneNumber=Tel
+FullPhoneNumber=Telephone
+TeleFax=Fax
+PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration.
+IntracommunityVATNumber=Intra-Community VAT ID
+PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
+PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
+SendTo=sent to
+PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
+VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
+LawApplicationPart1=By application of the law 80.335 of 12/05/80
+LawApplicationPart2=the goods remain the property of
+LawApplicationPart3=the seller until full payment of
+LawApplicationPart4=their price.
+LimitedLiabilityCompanyCapital=SARL with Capital of
+UseLine=Apply
+UseDiscount=Use discount
+UseCredit=Use credit
+UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit
+MenuChequeDeposits=Check Deposits
+MenuCheques=Checks
+MenuChequesReceipts=Check receipts
+NewChequeDeposit=New deposit
+ChequesReceipts=Check receipts
+ChequesArea=Check deposits area
+ChequeDeposits=Check deposits
+Cheques=Checks
+DepositId=Id deposit
+NbCheque=Number of checks
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices
+ShowUnpaidAll=Show all unpaid invoices
+ShowUnpaidLateOnly=Show late unpaid invoices only
+PaymentInvoiceRef=Payment invoice %s
+ValidateInvoice=Validate invoice
+ValidateInvoices=Validate invoices
+Cash=Cash
+Reported=Delayed
+DisabledBecausePayments=Not possible since there are some payments
+CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+ExpectedToPay=Expected payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
+PayedByThisPayment=Paid by this payment
+ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
+ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
+ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
+ToMakePayment=Pay
+ToMakePaymentBack=Pay back
+ListOfYourUnpaidInvoices=List of unpaid invoices
+NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
+RevenueStamp=Tax stamp
+YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
+YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
+PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
+TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+EarlyClosingReason=Early closing reason
+EarlyClosingComment=Early closing note
+##### Types de contacts #####
+TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
+TypeContact_facture_external_BILLING=Customer invoice contact
+TypeContact_facture_external_SHIPPING=Customer shipping contact
+TypeContact_facture_external_SERVICE=Customer service contact
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
+TypeContact_invoice_supplier_external_BILLING=Vendor invoice contact
+TypeContact_invoice_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+# Situation invoices
+InvoiceFirstSituationAsk=First situation invoice
+InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
+InvoiceSituation=Situation invoice
+InvoiceSituationAsk=Invoice following the situation
+InvoiceSituationDesc=Create a new situation following an already existing one
+SituationAmount=Situation invoice amount(net)
+SituationDeduction=Situation subtraction
+ModifyAllLines=Modify all lines
+CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
+NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
+DisabledBecauseNotLastInCycle=The next situation already exists.
+DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
+CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
+NoSituations=No open situations
+InvoiceSituationLast=Final and general invoice
+PDFCrevetteSituationNumber=Situation N°%s
+PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
+PDFCrevetteSituationInvoiceTitle=Situation invoice
+PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
+TotalSituationInvoice=Total situation
+invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
+updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
+CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
+BillCreated=%s bill(s) created
+StatusOfGeneratedDocuments=Status of document generation
+DoNotGenerateDoc=Do not generate document file
+AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/km_KH/bookmarks.lang b/htdocs/langs/km_KH/bookmarks.lang
new file mode 100644
index 00000000000..87466cadcfa
--- /dev/null
+++ b/htdocs/langs/km_KH/bookmarks.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - marque pages
+AddThisPageToBookmarks=Add current page to bookmarks
+Bookmark=Bookmark
+Bookmarks=Bookmarks
+ListOfBookmarks=List of bookmarks
+EditBookmarks=List/edit bookmarks
+NewBookmark=New bookmark
+ShowBookmark=Show bookmark
+OpenANewWindow=Open a new tab
+ReplaceWindow=Replace current tab
+BookmarkTargetNewWindowShort=New tab
+BookmarkTargetReplaceWindowShort=Current tab
+BookmarkTitle=Bookmark name
+UrlOrLink=URL
+BehaviourOnClick=Behaviour when a bookmark URL is selected
+CreateBookmark=Create bookmark
+SetHereATitleForLink=Set a name for the bookmark
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if the linked page should open in the current tab or a new tab
+BookmarksManagement=Bookmarks management
+BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/km_KH/boxes.lang b/htdocs/langs/km_KH/boxes.lang
new file mode 100644
index 00000000000..bd62684421a
--- /dev/null
+++ b/htdocs/langs/km_KH/boxes.lang
@@ -0,0 +1,102 @@
+# Dolibarr language file - Source file is en_US - boxes
+BoxLoginInformation=Login Information
+BoxLastRssInfos=RSS Information
+BoxLastProducts=Latest %s Products/Services
+BoxProductsAlertStock=Stock alerts for products
+BoxLastProductsInContract=Latest %s contracted products/services
+BoxLastSupplierBills=Latest Vendor invoices
+BoxLastCustomerBills=Latest Customer invoices
+BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
+BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
+BoxLastProposals=Latest commercial proposals
+BoxLastProspects=Latest modified prospects
+BoxLastCustomers=Latest modified customers
+BoxLastSuppliers=Latest modified suppliers
+BoxLastCustomerOrders=Latest sales orders
+BoxLastActions=Latest actions
+BoxLastContracts=Latest contracts
+BoxLastContacts=Latest contacts/addresses
+BoxLastMembers=Latest members
+BoxFicheInter=Latest interventions
+BoxCurrentAccounts=Open accounts balance
+BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleLastRssInfos=Latest %s news from %s
+BoxTitleLastProducts=Products/Services: last %s modified
+BoxTitleProductsAlertStock=Products: stock alert
+BoxTitleLastSuppliers=Latest %s recorded suppliers
+BoxTitleLastModifiedSuppliers=Vendors: last %s modified
+BoxTitleLastModifiedCustomers=Customers: last %s modified
+BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
+BoxTitleLastModifiedProspects=Prospects: last %s modified
+BoxTitleLastModifiedMembers=Latest %s members
+BoxTitleLastFicheInter=Latest %s modified interventions
+BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
+BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
+BoxTitleCurrentAccounts=Open Accounts: balances
+BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
+BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
+BoxMyLastBookmarks=Bookmarks: latest %s
+BoxOldestExpiredServices=Oldest active expired services
+BoxLastExpiredServices=Latest %s oldest contacts with active expired services
+BoxTitleLastActionsToDo=Latest %s actions to do
+BoxTitleLastContracts=Latest %s modified contracts
+BoxTitleLastModifiedDonations=Latest %s modified donations
+BoxTitleLastModifiedExpenses=Latest %s modified expense reports
+BoxTitleLatestModifiedBoms=Latest %s modified BOMs
+BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
+FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
+LastRefreshDate=Latest refresh date
+NoRecordedBookmarks=No bookmarks defined.
+ClickToAdd=Click here to add.
+NoRecordedCustomers=No recorded customers
+NoRecordedContacts=No recorded contacts
+NoActionsToDo=No actions to do
+NoRecordedOrders=No recorded sales orders
+NoRecordedProposals=No recorded proposals
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid vendor invoices
+NoModifiedSupplierBills=No recorded vendor invoices
+NoRecordedProducts=No recorded products/services
+NoRecordedProspects=No recorded prospects
+NoContractedProducts=No products/services contracted
+NoRecordedContracts=No recorded contracts
+NoRecordedInterventions=No recorded interventions
+BoxLatestSupplierOrders=Latest purchase orders
+BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
+NoSupplierOrder=No recorded purchase order
+BoxCustomersInvoicesPerMonth=Customer Invoices per month
+BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
+BoxCustomersOrdersPerMonth=Sales Orders per month
+BoxSuppliersOrdersPerMonth=Vendor Orders per month
+BoxProposalsPerMonth=Proposals per month
+NoTooLowStockProducts=No products are under the low stock limit
+BoxProductDistribution=Products/Services Distribution
+ForObject=On %s
+BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
+BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
+BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
+BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
+BoxTitleLastModifiedPropals=Latest %s modified proposals
+ForCustomersInvoices=Customers invoices
+ForCustomersOrders=Customers orders
+ForProposals=Proposals
+LastXMonthRolling=The latest %s month rolling
+ChooseBoxToAdd=Add widget to your dashboard
+BoxAdded=Widget was added in your dashboard
+BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
+BoxLastManualEntries=Last manual entries in accountancy
+BoxTitleLastManualEntries=%s latest manual entries
+NoRecordedManualEntries=No manual entries record in accountancy
+BoxSuspenseAccount=Count accountancy operation with suspense account
+BoxTitleSuspenseAccount=Number of unallocated lines
+NumberOfLinesInSuspenseAccount=Number of line in suspense account
+SuspenseAccountNotDefined=Suspense account isn't defined
+BoxLastCustomerShipments=Last customer shipments
+BoxTitleLastCustomerShipments=Latest %s customer shipments
+NoRecordedShipments=No recorded customer shipment
diff --git a/htdocs/langs/km_KH/cashdesk.lang b/htdocs/langs/km_KH/cashdesk.lang
new file mode 100644
index 00000000000..0903a3d10bc
--- /dev/null
+++ b/htdocs/langs/km_KH/cashdesk.lang
@@ -0,0 +1,110 @@
+# Language file - Source file is en_US - cashdesk
+CashDeskMenu=Point of sale
+CashDesk=Point of sale
+CashDeskBankCash=Bank account (cash)
+CashDeskBankCB=Bank account (card)
+CashDeskBankCheque=Bank account (cheque)
+CashDeskWarehouse=Warehouse
+CashdeskShowServices=Selling services
+CashDeskProducts=Products
+CashDeskStock=Stock
+CashDeskOn=on
+CashDeskThirdParty=Third party
+ShoppingCart=Shopping cart
+NewSell=New sell
+AddThisArticle=Add this article
+RestartSelling=Go back on sell
+SellFinished=Sale complete
+PrintTicket=Print ticket
+SendTicket=Send ticket
+NoProductFound=No article found
+ProductFound=product found
+NoArticle=No article
+Identification=Identification
+Article=Article
+Difference=Difference
+TotalTicket=Total ticket
+NoVAT=No VAT for this sale
+Change=Excess received
+BankToPay=Account for payment
+ShowCompany=Show company
+ShowStock=Show warehouse
+DeleteArticle=Click to remove this article
+FilterRefOrLabelOrBC=Search (Ref/Label)
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
+DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of Sale
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
+Receipt=Receipt
+Header=Header
+Footer=Footer
+AmountAtEndOfPeriod=Amount at end of period (day, month or year)
+TheoricalAmount=Theorical amount
+RealAmount=Real amount
+CashFence=Cash fence
+CashFenceDone=Cash fence done for the period
+NbOfInvoices=Nb of invoices
+Paymentnumpad=Type of Pad to enter payment
+Numberspad=Numbers Pad
+BillsCoinsPad=Coins and banknotes Pad
+DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
+TakeposNeedsCategories=TakePOS needs product categories to work
+OrderNotes=Order Notes
+CashDeskBankAccountFor=Default account to use for payments in
+NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
+PrintCustomerOnReceipts=Print customer on tickets|receipts
+EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
+ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
+POSTerminal=POS Terminal
+POSModule=POS Module
+BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
+CustomReceipt=Custom Receipt
+ReceiptName=Receipt Name
+ProductSupplements=Product Supplements
+SupplementCategory=Supplement category
+ColorTheme=Color theme
+Colorful=Colorful
+HeadBar=Head Bar
+SortProductField=Field for sorting products
+Browser=Browser
+BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
+TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
+PrintMethod=Print method
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ByTerminal=By terminal
+TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for POS sales
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
+BarRestaurant=Bar Restaurant
+AutoOrder=Customer auto order
diff --git a/htdocs/langs/km_KH/categories.lang b/htdocs/langs/km_KH/categories.lang
new file mode 100644
index 00000000000..30bace0574c
--- /dev/null
+++ b/htdocs/langs/km_KH/categories.lang
@@ -0,0 +1,89 @@
+# Dolibarr language file - Source file is en_US - categories
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+RubriquesTransactions=Tags/Categories of transactions
+categories=tags/categories
+NoCategoryYet=No tag/category of this type created
+In=In
+AddIn=Add in
+modify=modify
+Classify=Classify
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Vendors tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
+UsersCategoriesArea=Users tags/categories area
+SubCats=Sub-categories
+CatList=List of tags/categories
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
+NoSubCat=No subcategory.
+SubCatOf=Subcategory
+FoundCats=Found tags/categories
+ImpossibleAddCat=Impossible to add the tag/category %s
+WasAddedSuccessfully=<b>%s</b> was added successfully.
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+ProductIsInCategories=Product/service is linked to following tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
+ClassifyInCategory=Add to tag/category
+NotCategorized=Without tag/category
+CategoryExistsAtSameLevel=This category already exists with this ref
+ContentsVisibleByAllShort=Contents visible by all
+ContentsNotVisibleByAllShort=Contents not visible by all
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Vendors tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
+SuppliersCategoriesShort=Vendors tags/categories
+CustomersCategoriesShort=Customers tags/categories
+ProspectsCategoriesShort=Prospects tags/categories
+CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
+AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
+UsersCategoriesShort=Users tags/categories
+StockCategoriesShort=Warehouse tags/categories
+ThisCategoryHasNoItems=This category does not contain any items.
+CategId=Tag/category id
+CatSupList=List of vendor tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatContactsLinks=Links between contacts/addresses and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
+DeleteFromCat=Remove from tags/category
+ExtraFieldsCategories=Complementary attributes
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
+CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
+AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show tag/category
+ByDefaultInList=By default in list
+ChooseCategory=Choose category
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/km_KH/commercial.lang b/htdocs/langs/km_KH/commercial.lang
new file mode 100644
index 00000000000..10c536e0d48
--- /dev/null
+++ b/htdocs/langs/km_KH/commercial.lang
@@ -0,0 +1,80 @@
+# Dolibarr language file - Source file is en_US - commercial
+Commercial=Commerce
+CommercialArea=Commerce area
+Customer=Customer
+Customers=Customers
+Prospect=Prospect
+Prospects=Prospects
+DeleteAction=Delete an event
+NewAction=New event
+AddAction=Create event
+AddAnAction=Create an event
+AddActionRendezVous=Create a Rendez-vous event
+ConfirmDeleteAction=Are you sure you want to delete this event?
+CardAction=Event card
+ActionOnCompany=Related company
+ActionOnContact=Related contact
+TaskRDVWith=Meeting with %s
+ShowTask=Show task
+ShowAction=Show event
+ActionsReport=Events report
+ThirdPartiesOfSaleRepresentative=Third parties with sales representative
+SaleRepresentativesOfThirdParty=Sales representatives of third party
+SalesRepresentative=Sales representative
+SalesRepresentatives=Sales representatives
+SalesRepresentativeFollowUp=Sales representative (follow-up)
+SalesRepresentativeSignature=Sales representative (signature)
+NoSalesRepresentativeAffected=No particular sales representative assigned
+ShowCustomer=Show customer
+ShowProspect=Show prospect
+ListOfProspects=List of prospects
+ListOfCustomers=List of customers
+LastDoneTasks=Latest %s completed actions
+LastActionsToDo=Oldest %s not completed actions
+DoneAndToDoActions=Completed and To do events
+DoneActions=Completed events
+ToDoActions=Incomplete events
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
+StatusNotApplicable=Not applicable
+StatusActionToDo=To do
+StatusActionDone=Complete
+StatusActionInProcess=In process
+TasksHistoryForThisContact=Events for this contact
+LastProspectDoNotContact=Do not contact
+LastProspectNeverContacted=Never contacted
+LastProspectToContact=To contact
+LastProspectContactInProcess=Contact in process
+LastProspectContactDone=Contact done
+ActionAffectedTo=Event assigned to
+ActionDoneBy=Event done by
+ActionAC_TEL=Phone call
+ActionAC_FAX=Send fax
+ActionAC_PROP=Send proposal by mail
+ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
+ActionAC_RDV=Meetings
+ActionAC_INT=Intervention on site
+ActionAC_FAC=Send customer invoice by mail
+ActionAC_REL=Send customer invoice by mail (reminder)
+ActionAC_CLO=Close
+ActionAC_EMAILING=Send mass email
+ActionAC_COM=Send sales order by mail
+ActionAC_SHIP=Send shipping by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
+ActionAC_OTH=Other
+ActionAC_OTH_AUTO=Automatically inserted events
+ActionAC_MANUAL=Manually inserted events
+ActionAC_AUTO=Automatically inserted events
+ActionAC_OTH_AUTOShort=Auto
+Stats=Sales statistics
+StatusProsp=Prospect status
+DraftPropals=Draft commercial proposals
+NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commercial proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/km_KH/companies.lang b/htdocs/langs/km_KH/companies.lang
new file mode 100644
index 00000000000..0fad58c9389
--- /dev/null
+++ b/htdocs/langs/km_KH/companies.lang
@@ -0,0 +1,458 @@
+# Dolibarr language file - Source file is en_US - companies
+ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
+ErrorSetACountryFirst=Set the country first
+SelectThirdParty=Select a third party
+ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+DeleteContact=Delete a contact/address
+ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+MenuNewThirdParty=New Third Party
+MenuNewCustomer=New Customer
+MenuNewProspect=New Prospect
+MenuNewSupplier=New Vendor
+MenuNewPrivateIndividual=New private individual
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New Third Party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
+CreateThirdPartyOnly=Create third party
+CreateThirdPartyAndContact=Create a third party + a child contact
+ProspectionArea=Prospection area
+IdThirdParty=Id third party
+IdCompany=Company Id
+IdContact=Contact Id
+Contacts=Contacts/Addresses
+ThirdPartyContacts=Third-party contacts
+ThirdPartyContact=Third-party contact/address
+Company=Company
+CompanyName=Company name
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias Name
+Companies=Companies
+CountryIsInEEC=Country is inside the European Economic Community
+PriceFormatInCurrentLanguage=Price display format in the current language and currency
+ThirdPartyName=Third-party name
+ThirdPartyEmail=Third-party email
+ThirdParty=Third-party
+ThirdParties=Third-parties
+ThirdPartyProspects=Prospects
+ThirdPartyProspectsStats=Prospects
+ThirdPartyCustomers=Customers
+ThirdPartyCustomersStats=Customers
+ThirdPartyCustomersWithIdProf12=Customers with %s or %s
+ThirdPartySuppliers=Vendors
+ThirdPartyType=Third-party type
+Individual=Private individual
+ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
+ParentCompany=Parent company
+Subsidiaries=Subsidiaries
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
+ReportByQuarter=Report by rate
+CivilityCode=Civility code
+RegisteredOffice=Registered office
+Lastname=Last name
+Firstname=First name
+PostOrFunction=Job position
+UserTitle=Title
+NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
+Address=Address
+State=State/Province
+StateCode=State/Province code
+StateShort=State
+Region=Region
+Region-State=Region - State
+Country=Country
+CountryCode=Country code
+CountryId=Country id
+Phone=Phone
+PhoneShort=Phone
+Skype=Skype
+Call=Call
+Chat=Chat
+PhonePro=Prof. phone
+PhonePerso=Pers. phone
+PhoneMobile=Mobile
+No_Email=Refuse bulk emailings
+Fax=Fax
+Zip=Zip Code
+Town=City
+Web=Web
+Poste= Position
+DefaultLang=Language default
+VATIsUsed=Sales tax used
+VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
+CopyAddressFromSoc=Copy address from third-party details
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
+PaymentBankAccount=Payment bank account
+OverAllProposals=Proposals
+OverAllOrders=Orders
+OverAllInvoices=Invoices
+OverAllSupplierProposals=Price requests
+##### Local Taxes #####
+LocalTax1IsUsed=Use second tax
+LocalTax1IsUsedES= RE is used
+LocalTax1IsNotUsedES= RE is not used
+LocalTax2IsUsed=Use third tax
+LocalTax2IsUsedES= IRPF is used
+LocalTax2IsNotUsedES= IRPF is not used
+WrongCustomerCode=Customer code invalid
+WrongSupplierCode=Vendor code invalid
+CustomerCodeModel=Customer code model
+SupplierCodeModel=Vendor code model
+Gencod=Barcode
+##### Professional ID #####
+ProfId1Short=Prof. id 1
+ProfId2Short=Prof. id 2
+ProfId3Short=Prof. id 3
+ProfId4Short=Prof. id 4
+ProfId5Short=Prof. id 5
+ProfId6Short=Prof. id 6
+ProfId1=Professional ID 1
+ProfId2=Professional ID 2
+ProfId3=Professional ID 3
+ProfId4=Professional ID 4
+ProfId5=Professional ID 5
+ProfId6=Professional ID 6
+ProfId1AR=Prof Id 1 (CUIT/CUIL)
+ProfId2AR=Prof Id 2 (Revenu brutes)
+ProfId3AR=-
+ProfId4AR=-
+ProfId5AR=-
+ProfId6AR=-
+ProfId1AT=Prof Id 1 (USt.-IdNr)
+ProfId2AT=Prof Id 2 (USt.-Nr)
+ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
+ProfId4AT=-
+ProfId5AT=-
+ProfId6AT=-
+ProfId1AU=Prof Id 1 (ABN)
+ProfId2AU=-
+ProfId3AU=-
+ProfId4AU=-
+ProfId5AU=-
+ProfId6AU=-
+ProfId1BE=Prof Id 1 (Professional number)
+ProfId2BE=-
+ProfId3BE=-
+ProfId4BE=-
+ProfId5BE=-
+ProfId6BE=-
+ProfId1BR=-
+ProfId2BR=IE (Inscricao Estadual)
+ProfId3BR=IM (Inscricao Municipal)
+ProfId4BR=CPF
+#ProfId5BR=CNAE
+#ProfId6BR=INSS
+ProfId1CH=-
+ProfId2CH=-
+ProfId3CH=Prof Id 1 (Federal number)
+ProfId4CH=Prof Id 2 (Commercial Record number)
+ProfId5CH=-
+ProfId6CH=-
+ProfId1CL=Prof Id 1 (R.U.T.)
+ProfId2CL=-
+ProfId3CL=-
+ProfId4CL=-
+ProfId5CL=-
+ProfId6CL=-
+ProfId1CO=Prof Id 1 (R.U.T.)
+ProfId2CO=-
+ProfId3CO=-
+ProfId4CO=-
+ProfId5CO=-
+ProfId6CO=-
+ProfId1DE=Prof Id 1 (USt.-IdNr)
+ProfId2DE=Prof Id 2 (USt.-Nr)
+ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId4DE=-
+ProfId5DE=-
+ProfId6DE=-
+ProfId1ES=Prof Id 1 (CIF/NIF)
+ProfId2ES=Prof Id 2 (Social security number)
+ProfId3ES=Prof Id 3 (CNAE)
+ProfId4ES=Prof Id 4 (Collegiate number)
+ProfId5ES=-
+ProfId6ES=-
+ProfId1FR=Prof Id 1 (SIREN)
+ProfId2FR=Prof Id 2 (SIRET)
+ProfId3FR=Prof Id 3 (NAF, old APE)
+ProfId4FR=Prof Id 4 (RCS/RM)
+ProfId5FR=-
+ProfId6FR=-
+ProfId1GB=Registration Number
+ProfId2GB=-
+ProfId3GB=SIC
+ProfId4GB=-
+ProfId5GB=-
+ProfId6GB=-
+ProfId1HN=Id prof. 1 (RTN)
+ProfId2HN=-
+ProfId3HN=-
+ProfId4HN=-
+ProfId5HN=-
+ProfId6HN=-
+ProfId1IN=Prof Id 1 (TIN)
+ProfId2IN=Prof Id 2 (PAN)
+ProfId3IN=Prof Id 3 (SRVC TAX)
+ProfId4IN=Prof Id 4
+ProfId5IN=Prof Id 5
+ProfId6IN=-
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
+ProfId1MA=Id prof. 1 (R.C.)
+ProfId2MA=Id prof. 2 (Patente)
+ProfId3MA=Id prof. 3 (I.F.)
+ProfId4MA=Id prof. 4 (C.N.S.S.)
+ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId6MA=-
+ProfId1MX=Prof Id 1 (R.F.C).
+ProfId2MX=Prof Id 2 (R..P. IMSS)
+ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId4MX=-
+ProfId5MX=-
+ProfId6MX=-
+ProfId1NL=KVK nummer
+ProfId2NL=-
+ProfId3NL=-
+ProfId4NL=Burgerservicenummer (BSN)
+ProfId5NL=-
+ProfId6NL=-
+ProfId1PT=Prof Id 1 (NIPC)
+ProfId2PT=Prof Id 2 (Social security number)
+ProfId3PT=Prof Id 3 (Commercial Record number)
+ProfId4PT=Prof Id 4 (Conservatory)
+ProfId5PT=-
+ProfId6PT=-
+ProfId1SN=RC
+ProfId2SN=NINEA
+ProfId3SN=-
+ProfId4SN=-
+ProfId5SN=-
+ProfId6SN=-
+ProfId1TN=Prof Id 1 (RC)
+ProfId2TN=Prof Id 2 (Fiscal matricule)
+ProfId3TN=Prof Id 3 (Douane code)
+ProfId4TN=Prof Id 4 (BAN)
+ProfId5TN=-
+ProfId6TN=-
+ProfId1US=Prof Id (FEIN)
+ProfId2US=-
+ProfId3US=-
+ProfId4US=-
+ProfId5US=-
+ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
+ProfId1RU=Prof Id 1 (OGRN)
+ProfId2RU=Prof Id 2 (INN)
+ProfId3RU=Prof Id 3 (KPP)
+ProfId4RU=Prof Id 4 (OKPO)
+ProfId5RU=-
+ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
+VATIntra=VAT ID
+VATIntraShort=VAT ID
+VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
+ProspectCustomer=Prospect / Customer
+Prospect=Prospect
+CustomerCard=Customer Card
+Customer=Customer
+CustomerRelativeDiscount=Relative customer discount
+SupplierRelativeDiscount=Relative vendor discount
+CustomerRelativeDiscountShort=Relative discount
+CustomerAbsoluteDiscountShort=Absolute discount
+CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
+CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
+CompanyHasAbsoluteDiscount=This customer has discounts available (credits notes or down payments) for <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
+CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
+CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
+DiscountNone=None
+Vendor=Vendor
+Supplier=Vendor
+AddContact=Create contact
+AddContactAddress=Create contact/address
+EditContact=Edit contact
+EditContactAddress=Edit contact/address
+Contact=Contact
+ContactId=Contact id
+ContactsAddresses=Contacts/Addresses
+FromContactName=Name:
+NoContactDefinedForThirdParty=No contact defined for this third party
+NoContactDefined=No contact defined
+DefaultContact=Default contact/address
+ContactByDefaultFor=Default contact/address for
+AddThirdParty=Create third party
+DeleteACompany=Delete a company
+PersonalInformations=Personal data
+AccountancyCode=Accounting account
+CustomerCode=Customer Code
+SupplierCode=Vendor Code
+CustomerCodeShort=Customer Code
+SupplierCodeShort=Vendor Code
+CustomerCodeDesc=Customer Code, unique for all customers
+SupplierCodeDesc=Vendor Code, unique for all vendors
+RequiredIfCustomer=Required if third party is a customer or prospect
+RequiredIfSupplier=Required if third party is a vendor
+ValidityControledByModule=Validity controlled by module
+ThisIsModuleRules=Rules for this module
+ProspectToContact=Prospect to contact
+CompanyDeleted=Company "%s" deleted from database.
+ListOfContacts=List of contacts/addresses
+ListOfContactsAddresses=List of contacts/addresses
+ListOfThirdParties=List of Third Parties
+ShowCompany=Third Party
+ShowContact=Contact-Address
+ContactsAllShort=All (No filter)
+ContactType=Contact type
+ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
+ContactForProposals=Proposal's contact
+ContactForContracts=Contract's contact
+ContactForInvoices=Invoice's contact
+NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
+NoContactForAnyProposal=This contact is not a contact for any commercial proposal
+NoContactForAnyContract=This contact is not a contact for any contract
+NoContactForAnyInvoice=This contact is not a contact for any invoice
+NewContact=New contact
+NewContactAddress=New Contact/Address
+MyContacts=My contacts
+Capital=Capital
+CapitalOf=Capital of %s
+EditCompany=Edit company
+ThisUserIsNot=This user is not a prospect, customer or vendor
+VATIntraCheck=Check
+VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
+VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
+NorProspectNorCustomer=Not prospect, nor customer
+JuridicalStatus=Legal Entity Type
+Staff=Employees
+ProspectLevelShort=Potential
+ProspectLevel=Prospect potential
+ContactPrivate=Private
+ContactPublic=Shared
+ContactVisibility=Visibility
+ContactOthers=Other
+OthersNotLinkedToThirdParty=Others, not linked to a third party
+ProspectStatus=Prospect status
+PL_NONE=None
+PL_UNKNOWN=Unknown
+PL_LOW=Low
+PL_MEDIUM=Medium
+PL_HIGH=High
+TE_UNKNOWN=-
+TE_STARTUP=Startup
+TE_GROUP=Large company
+TE_MEDIUM=Medium company
+TE_ADMIN=Governmental
+TE_SMALL=Small company
+TE_RETAIL=Retailer
+TE_WHOLE=Wholesaler
+TE_PRIVATE=Private individual
+TE_OTHER=Other
+StatusProspect-1=Do not contact
+StatusProspect0=Never contacted
+StatusProspect1=To be contacted
+StatusProspect2=Contact in process
+StatusProspect3=Contact done
+ChangeDoNotContact=Change status to 'Do not contact'
+ChangeNeverContacted=Change status to 'Never contacted'
+ChangeToContact=Change status to 'To be contacted'
+ChangeContactInProcess=Change status to 'Contact in process'
+ChangeContactDone=Change status to 'Contact done'
+ProspectsByStatus=Prospects by status
+NoParentCompany=None
+ExportCardToFormat=Export card to format
+ContactNotLinkedToCompany=Contact not linked to any third party
+DolibarrLogin=Dolibarr login
+NoDolibarrAccess=No Dolibarr access
+ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
+ExportDataset_company_2=Contacts and their properties
+ImportDataset_company_1=Third-parties and their properties
+ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ImportDataset_company_3=Third-parties Bank accounts
+ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
+PriceLevel=Price Level
+PriceLevelLabels=Price Level Labels
+DeliveryAddress=Delivery address
+AddAddress=Add address
+SupplierCategory=Vendor category
+JuridicalStatus200=Independent
+DeleteFile=Delete file
+ConfirmDeleteFile=Are you sure you want to delete this file?
+AllocateCommercial=Assigned to sales representative
+Organization=Organization
+FiscalYearInformation=Fiscal Year
+FiscalMonthStart=Starting month of the fiscal year
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
+YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
+YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
+ListSuppliersShort=List of Vendors
+ListProspectsShort=List of Prospects
+ListCustomersShort=List of Customers
+ThirdPartiesArea=Third Parties/Contacts
+LastModifiedThirdParties=Last %s modified Third Parties
+UniqueThirdParties=Total of Third Parties
+InActivity=Open
+ActivityCeased=Closed
+ThirdPartyIsClosed=Third party is closed
+ProductsIntoElements=List of products/services into %s
+CurrentOutstandingBill=Current outstanding bill
+OutstandingBill=Max. for outstanding bill
+OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
+MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
+ManagingDirectors=Manager(s) name (CEO, director, president...)
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ThirdpartiesMergeSuccess=Third parties have been merged
+SaleRepresentativeLogin=Login of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+#Imports
+PaymentTypeCustomer=Payment Type - Customer
+PaymentTermsCustomer=Payment Terms - Customer
+PaymentTypeSupplier=Payment Type - Vendor
+PaymentTermsSupplier=Payment Term - Vendor
+PaymentTypeBoth=Payment Type - Customer and Vendor
+MulticurrencyUsed=Use Multicurrency
+MulticurrencyCurrency=Currency
diff --git a/htdocs/langs/km_KH/compta.lang b/htdocs/langs/km_KH/compta.lang
new file mode 100644
index 00000000000..8a8c837ac87
--- /dev/null
+++ b/htdocs/langs/km_KH/compta.lang
@@ -0,0 +1,266 @@
+# Dolibarr language file - Source file is en_US - compta
+MenuFinancial=Billing | Payment
+TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
+OptionMode=Option for accountancy
+OptionModeTrue=Option Incomes-Expenses
+OptionModeVirtual=Option Claims-Debts
+OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
+OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
+FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
+VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
+LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+Param=Setup
+RemainingAmountPayment=Amount payment remaining:
+Account=Account
+Accountparent=Parent account
+Accountsparent=Parent accounts
+Income=Income
+Outcome=Expense
+MenuReportInOut=Income / Expense
+ReportInOut=Balance of income and expenses
+ReportTurnover=Turnover invoiced
+ReportTurnoverCollected=Turnover collected
+PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party
+PaymentsNotLinkedToUser=Payments not linked to any user
+Profit=Profit
+AccountingResult=Accounting result
+BalanceBefore=Balance (before)
+Balance=Balance
+Debit=Debit
+Credit=Credit
+Piece=Accounting Doc.
+AmountHTVATRealReceived=Net collected
+AmountHTVATRealPaid=Net paid
+VATToPay=Tax sales
+VATReceived=Tax received
+VATToCollect=Tax purchases
+VATSummary=Tax monthly
+VATBalance=Tax Balance
+VATPaid=Tax paid
+LT1Summary=Tax 2 summary
+LT2Summary=Tax 3 summary
+LT1SummaryES=RE Balance
+LT2SummaryES=IRPF Balance
+LT1SummaryIN=CGST Balance
+LT2SummaryIN=SGST Balance
+LT1Paid=Tax 2 paid
+LT2Paid=Tax 3 paid
+LT1PaidES=RE Paid
+LT2PaidES=IRPF Paid
+LT1PaidIN=CGST Paid
+LT2PaidIN=SGST Paid
+LT1Customer=Tax 2 sales
+LT1Supplier=Tax 2 purchases
+LT1CustomerES=RE sales
+LT1SupplierES=RE purchases
+LT1CustomerIN=CGST sales
+LT1SupplierIN=CGST purchases
+LT2Customer=Tax 3 sales
+LT2Supplier=Tax 3 purchases
+LT2CustomerES=IRPF sales
+LT2SupplierES=IRPF purchases
+LT2CustomerIN=SGST sales
+LT2SupplierIN=SGST purchases
+VATCollected=VAT collected
+StatusToPay=To pay
+SpecialExpensesArea=Area for all special payments
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
+SocialContributionsDeductibles=Deductible social or fiscal taxes
+SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
+MenuSpecialExpenses=Special expenses
+MenuTaxAndDividends=Taxes and dividends
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New social/fiscal tax
+NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
+AccountancyTreasuryArea=Billing and payment area
+NewPayment=New payment
+PaymentCustomerInvoice=Customer invoice payment
+PaymentSupplierInvoice=vendor invoice payment
+PaymentSocialContribution=Social/fiscal tax payment
+PaymentVat=VAT payment
+ListPayment=List of payments
+ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of vendor payments
+DateStartPeriod=Date start period
+DateEndPeriod=Date end period
+newLT1Payment=New tax 2 payment
+newLT2Payment=New tax 3 payment
+LT1Payment=Tax 2 payment
+LT1Payments=Tax 2 payments
+LT2Payment=Tax 3 payment
+LT2Payments=Tax 3 payments
+newLT1PaymentES=New RE payment
+newLT2PaymentES=New IRPF payment
+LT1PaymentES=RE Payment
+LT1PaymentsES=RE Payments
+LT2PaymentES=IRPF Payment
+LT2PaymentsES=IRPF Payments
+VATPayment=Sales tax payment
+VATPayments=Sales tax payments
+VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
+NewLocalTaxPayment=New tax %s payment
+Refund=Refund
+SocialContributionsPayments=Social/fiscal taxes payments
+ShowVatPayment=Show VAT payment
+TotalToPay=Total to pay
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+CustomerAccountancyCode=Customer accounting code
+SupplierAccountancyCode=Vendor accounting code
+CustomerAccountancyCodeShort=Cust. account. code
+SupplierAccountancyCodeShort=Sup. account. code
+AccountNumber=Account number
+NewAccountingAccount=New account
+Turnover=Turnover invoiced
+TurnoverCollected=Turnover collected
+SalesTurnoverMinimum=Minimum turnover
+ByExpenseIncome=By expenses & incomes
+ByThirdParties=By third parties
+ByUserAuthorOfInvoice=By invoice author
+CheckReceipt=Check deposit
+CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Latest %s check receipts
+NewCheckReceipt=New discount
+NewCheckDeposit=New check deposit
+NewCheckDepositOn=Create receipt for deposit on account: %s
+NoWaitingChecks=No checks awaiting deposit.
+DateChequeReceived=Check reception date
+NbOfCheques=No. of checks
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
+CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
+CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
+CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
+CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
+CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
+CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
+CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
+CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
+CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
+CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
+AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
+AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
+AnnualByCompanies=Balance of income and expenses, by predefined groups of account
+AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
+AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
+SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
+SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
+SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
+RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
+RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
+RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
+RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
+RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
+SeePageForSetup=See menu <a href="%s">%s</a> for setup
+DepositsAreNotIncluded=- Down payment invoices are not included
+DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
+VATReportByCustomers=Sale tax report by customer
+VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
+SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
+SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
+RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
+RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
+OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
+PercentOfInvoice=%%/invoice
+NotUsedForGoods=Not used on goods
+ProposalStats=Statistics on proposals
+OrderStats=Statistics on orders
+InvoiceStats=Statistics on bills
+Dispatch=Dispatching
+Dispatched=Dispatched
+ToDispatch=To dispatch
+ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer
+SellsJournal=Sales Journal
+PurchasesJournal=Purchases Journal
+DescSellsJournal=Sales Journal
+DescPurchasesJournal=Purchases Journal
+CodeNotDef=Not defined
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
+DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
+Pcg_version=Chart of accounts models
+Pcg_type=Pcg type
+Pcg_subtype=Pcg subtype
+InvoiceLinesToDispatch=Invoice lines to dispatch
+ByProductsAndServices=By product and service
+RefExt=External ref
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+LinkedOrder=Link to order
+Mode1=Method 1
+Mode2=Method 2
+CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
+CalculationRuleDescSupplier=According to vendor, choose appropriate method to apply same calculation rule and get same result expected by your vendor.
+TurnoverPerProductInCommitmentAccountingNotRelevant=The report of Turnover collected per product is not available. This report is only available for turnover invoiced.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
+CalculationMode=Calculation mode
+AccountancyJournal=Accounting code journal
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+CloneTaxForNextMonth=Clone it for next month
+SimpleReport=Simple report
+AddExtraReport=Extra reports (add foreign and national customer report)
+OtherCountriesCustomersReport=Foreign customers report
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
+SameCountryCustomersWithVAT=National customers report
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
+LinkedFichinter=Link to an intervention
+ImportDataset_tax_contrib=Social/fiscal taxes
+ImportDataset_tax_vat=Vat payments
+ErrorBankAccountNotFound=Error: Bank account not found
+FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
+DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignment
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover invoiced by sale tax rate
+TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
+LabelToShow=Short label
+PurchaseTurnover=Purchase turnover
+PurchaseTurnoverCollected=Purchase turnover collected
+RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
+RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/km_KH/contracts.lang b/htdocs/langs/km_KH/contracts.lang
new file mode 100644
index 00000000000..47572c355ab
--- /dev/null
+++ b/htdocs/langs/km_KH/contracts.lang
@@ -0,0 +1,101 @@
+# Dolibarr language file - Source file is en_US - contracts
+ContractsArea=Contracts area
+ListOfContracts=List of contracts
+AllContracts=All contracts
+ContractCard=Contract card
+ContractStatusNotRunning=Not running
+ContractStatusDraft=Draft
+ContractStatusValidated=Validated
+ContractStatusClosed=Closed
+ServiceStatusInitial=Not running
+ServiceStatusRunning=Running
+ServiceStatusNotLate=Running, not expired
+ServiceStatusNotLateShort=Not expired
+ServiceStatusLate=Running, expired
+ServiceStatusLateShort=Expired
+ServiceStatusClosed=Closed
+ShowContractOfService=Show contract of service
+Contracts=Contracts
+ContractsSubscriptions=Contracts/Subscriptions
+ContractsAndLine=Contracts and line of contracts
+Contract=Contract
+ContractLine=Contract line
+Closing=Closing
+NoContracts=No contracts
+MenuServices=Services
+MenuInactiveServices=Services not active
+MenuRunningServices=Running services
+MenuExpiredServices=Expired services
+MenuClosedServices=Closed services
+NewContract=New contract
+NewContractSubscription=New contract/subscription
+AddContract=Create contract
+DeleteAContract=Delete a contract
+ActivateAllOnContract=Activate all services
+CloseAContract=Close a contract
+ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
+ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
+ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
+ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract?
+ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
+ValidateAContract=Validate a contract
+ActivateService=Activate service
+ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b>?
+RefContract=Contract reference
+DateContract=Contract date
+DateServiceActivate=Service activation date
+ListOfServices=List of services
+ListOfInactiveServices=List of not active services
+ListOfExpiredServices=List of expired active services
+ListOfClosedServices=List of closed services
+ListOfRunningServices=List of running services
+NotActivatedServices=Inactive services (among validated contracts)
+BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
+LastContracts=Latest %s contracts
+LastModifiedServices=Latest %s modified services
+ContractStartDate=Start date
+ContractEndDate=End date
+DateStartPlanned=Planned start date
+DateStartPlannedShort=Planned start date
+DateEndPlanned=Planned end date
+DateEndPlannedShort=Planned end date
+DateStartReal=Real start date
+DateStartRealShort=Real start date
+DateEndReal=Real end date
+DateEndRealShort=Real end date
+CloseService=Close service
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
+ServiceStatus=Status of service
+DraftContracts=Drafts contracts
+CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
+ActivateAllContracts=Activate all contract lines
+CloseAllContracts=Close all contract lines
+DeleteContractLine=Delete a contract line
+ConfirmDeleteContractLine=Are you sure you want to delete this contract line?
+MoveToAnotherContract=Move service into another contract.
+ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract.
+ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
+PaymentRenewContractId=Renew contract line (number %s)
+ExpiredSince=Expiration date
+NoExpiredServices=No expired active services
+ListOfServicesToExpireWithDuration=List of Services to expire in %s days
+ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
+ListOfServicesToExpire=List of Services to expire
+NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
+StandardContractsTemplate=Standard contracts template
+ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
+LowerDateEndPlannedShort=Lower planned end date of active services
+SendContractRef=Contract information __REF__
+OtherContracts=Other contracts
+##### Types de contacts #####
+TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
+TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract
+TypeContact_contrat_external_BILLING=Billing customer contact
+TypeContact_contrat_external_CUSTOMER=Follow-up customer contact
+TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact
diff --git a/htdocs/langs/km_KH/cron.lang b/htdocs/langs/km_KH/cron.lang
new file mode 100644
index 00000000000..1de1251831a
--- /dev/null
+++ b/htdocs/langs/km_KH/cron.lang
@@ -0,0 +1,84 @@
+# Dolibarr language file - Source file is en_US - cron
+# About page
+# Right
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
+# Admin
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
+CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
+CronJobProfiles=List of predefined cron job profiles
+# Menu
+EnabledAndDisabled=Enabled and disabled
+# Page list
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
+CronCommand=Command
+CronList=Scheduled jobs
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
+CronExecute=Launch scheduled job
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
+CronTask=Job
+CronNone=None
+CronDtStart=Not before
+CronDtEnd=Not after
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Start date of latest execution
+CronDtLastResult=End date of latest execution
+CronFrequency=Frequency
+CronClass=Class
+CronMethod=Method
+CronModule=Module
+CronNoJobs=No jobs registered
+CronPriority=Priority
+CronLabel=Label
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
+CronEach=Every
+JobFinished=Job launched and finished
+#Page card
+CronAdd= Add jobs
+CronEvery=Execute job each
+CronObject=Instance/Object to create
+CronArgs=Parameters
+CronSaveSucess=Save successfully
+CronNote=Comment
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+StatusAtInstall=Status at module installation
+CronStatusActiveBtn=Enable
+CronStatusInactiveBtn=Disable
+CronTaskInactive=This job is disabled
+CronId=Id
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
+CronFrom=From
+# Info
+# Common
+CronType=Job type
+CronType_method=Call method of a PHP Class
+CronType_command=Shell command
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
+JobDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
diff --git a/htdocs/langs/km_KH/deliveries.lang b/htdocs/langs/km_KH/deliveries.lang
new file mode 100644
index 00000000000..1f48c01de75
--- /dev/null
+++ b/htdocs/langs/km_KH/deliveries.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - deliveries
+Delivery=Delivery
+DeliveryRef=Ref Delivery
+DeliveryCard=Receipt card
+DeliveryOrder=Delivery receipt
+DeliveryDate=Delivery date
+CreateDeliveryOrder=Generate delivery receipt
+DeliveryStateSaved=Delivery state saved
+SetDeliveryDate=Set shipping date
+ValidateDeliveryReceipt=Validate delivery receipt
+ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt?
+DeleteDeliveryReceipt=Delete delivery receipt
+DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b>?
+DeliveryMethod=Delivery method
+TrackingNumber=Tracking number
+DeliveryNotValidated=Delivery not validated
+StatusDeliveryCanceled=Canceled
+StatusDeliveryDraft=Draft
+StatusDeliveryValidated=Received
+# merou PDF model
+NameAndSignature=Name and Signature:
+ToAndDate=To___________________________________ on ____/_____/__________
+GoodStatusDeclaration=Have received the goods above in good condition,
+Deliverer=Deliverer:
+Sender=Sender
+Recipient=Recipient
+ErrorStockIsNotEnough=There's not enough stock
+Shippable=Shippable
+NonShippable=Not Shippable
+ShowReceiving=Show delivery receipt
+NonExistentOrder=Nonexistent order
diff --git a/htdocs/langs/km_KH/dict.lang b/htdocs/langs/km_KH/dict.lang
new file mode 100644
index 00000000000..ec315d97142
--- /dev/null
+++ b/htdocs/langs/km_KH/dict.lang
@@ -0,0 +1,359 @@
+# Dolibarr language file - Source file is en_US - dict
+CountryFR=France
+CountryBE=Belgium
+CountryIT=Italy
+CountryES=Spain
+CountryDE=Germany
+CountryCH=Switzerland
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
+CountryUK=United Kingdom
+CountryIE=Ireland
+CountryCN=China
+CountryTN=Tunisia
+CountryUS=United States
+CountryMA=Morocco
+CountryDZ=Algeria
+CountryCA=Canada
+CountryTG=Togo
+CountryGA=Gabon
+CountryNL=Netherlands
+CountryHU=Hungary
+CountryRU=Russia
+CountrySE=Sweden
+CountryCI=Ivoiry Coast
+CountrySN=Senegal
+CountryAR=Argentina
+CountryCM=Cameroon
+CountryPT=Portugal
+CountrySA=Saudi Arabia
+CountryMC=Monaco
+CountryAU=Australia
+CountrySG=Singapore
+CountryAF=Afghanistan
+CountryAX=Åland Islands
+CountryAL=Albania
+CountryAS=American Samoa
+CountryAD=Andorra
+CountryAO=Angola
+CountryAI=Anguilla
+CountryAQ=Antarctica
+CountryAG=Antigua and Barbuda
+CountryAM=Armenia
+CountryAW=Aruba
+CountryAT=Austria
+CountryAZ=Azerbaijan
+CountryBS=Bahamas
+CountryBH=Bahrain
+CountryBD=Bangladesh
+CountryBB=Barbados
+CountryBY=Belarus
+CountryBZ=Belize
+CountryBJ=Benin
+CountryBM=Bermuda
+CountryBT=Bhutan
+CountryBO=Bolivia
+CountryBA=Bosnia and Herzegovina
+CountryBW=Botswana
+CountryBV=Bouvet Island
+CountryBR=Brazil
+CountryIO=British Indian Ocean Territory
+CountryBN=Brunei Darussalam
+CountryBG=Bulgaria
+CountryBF=Burkina Faso
+CountryBI=Burundi
+CountryKH=Cambodia
+CountryCV=Cape Verde
+CountryKY=Cayman Islands
+CountryCF=Central African Republic
+CountryTD=Chad
+CountryCL=Chile
+CountryCX=Christmas Island
+CountryCC=Cocos (Keeling) Islands
+CountryCO=Colombia
+CountryKM=Comoros
+CountryCG=Congo
+CountryCD=Congo, The Democratic Republic of the
+CountryCK=Cook Islands
+CountryCR=Costa Rica
+CountryHR=Croatia
+CountryCU=Cuba
+CountryCY=Cyprus
+CountryCZ=Czech Republic
+CountryDK=Denmark
+CountryDJ=Djibouti
+CountryDM=Dominica
+CountryDO=Dominican Republic
+CountryEC=Ecuador
+CountryEG=Egypt
+CountrySV=El Salvador
+CountryGQ=Equatorial Guinea
+CountryER=Eritrea
+CountryEE=Estonia
+CountryET=Ethiopia
+CountryFK=Falkland Islands
+CountryFO=Faroe Islands
+CountryFJ=Fiji Islands
+CountryFI=Finland
+CountryGF=French Guiana
+CountryPF=French Polynesia
+CountryTF=French Southern Territories
+CountryGM=Gambia
+CountryGE=Georgia
+CountryGH=Ghana
+CountryGI=Gibraltar
+CountryGR=Greece
+CountryGL=Greenland
+CountryGD=Grenada
+CountryGP=Guadeloupe
+CountryGU=Guam
+CountryGT=Guatemala
+CountryGN=Guinea
+CountryGW=Guinea-Bissau
+CountryGY=Guyana
+CountryHT=Haïti
+CountryHM=Heard Island and McDonald
+CountryVA=Holy See (Vatican City State)
+CountryHN=Honduras
+CountryHK=Hong Kong
+CountryIS=Iceland
+CountryIN=India
+CountryID=Indonesia
+CountryIR=Iran
+CountryIQ=Iraq
+CountryIL=Israel
+CountryJM=Jamaica
+CountryJP=Japan
+CountryJO=Jordan
+CountryKZ=Kazakhstan
+CountryKE=Kenya
+CountryKI=Kiribati
+CountryKP=North Korea
+CountryKR=South Korea
+CountryKW=Kuwait
+CountryKG=Kyrgyzstan
+CountryLA=Lao
+CountryLV=Latvia
+CountryLB=Lebanon
+CountryLS=Lesotho
+CountryLR=Liberia
+CountryLY=Libyan
+CountryLI=Liechtenstein
+CountryLT=Lithuania
+CountryLU=Luxembourg
+CountryMO=Macao
+CountryMK=Macedonia, the former Yugoslav of
+CountryMG=Madagascar
+CountryMW=Malawi
+CountryMY=Malaysia
+CountryMV=Maldives
+CountryML=Mali
+CountryMT=Malta
+CountryMH=Marshall Islands
+CountryMQ=Martinique
+CountryMR=Mauritania
+CountryMU=Mauritius
+CountryYT=Mayotte
+CountryMX=Mexico
+CountryFM=Micronesia
+CountryMD=Moldova
+CountryMN=Mongolia
+CountryMS=Monserrat
+CountryMZ=Mozambique
+CountryMM=Myanmar (Burma)
+CountryNA=Namibia
+CountryNR=Nauru
+CountryNP=Nepal
+CountryAN=Netherlands Antilles
+CountryNC=New Caledonia
+CountryNZ=New Zealand
+CountryNI=Nicaragua
+CountryNE=Niger
+CountryNG=Nigeria
+CountryNU=Niue
+CountryNF=Norfolk Island
+CountryMP=Northern Mariana Islands
+CountryNO=Norway
+CountryOM=Oman
+CountryPK=Pakistan
+CountryPW=Palau
+CountryPS=Palestinian Territory, Occupied
+CountryPA=Panama
+CountryPG=Papua New Guinea
+CountryPY=Paraguay
+CountryPE=Peru
+CountryPH=Philippines
+CountryPN=Pitcairn Islands
+CountryPL=Poland
+CountryPR=Puerto Rico
+CountryQA=Qatar
+CountryRE=Reunion
+CountryRO=Romania
+CountryRW=Rwanda
+CountrySH=Saint Helena
+CountryKN=Saint Kitts and Nevis
+CountryLC=Saint Lucia
+CountryPM=Saint Pierre and Miquelon
+CountryVC=Saint Vincent and Grenadines
+CountryWS=Samoa
+CountrySM=San Marino
+CountryST=Sao Tome and Principe
+CountryRS=Serbia
+CountrySC=Seychelles
+CountrySL=Sierra Leone
+CountrySK=Slovakia
+CountrySI=Slovenia
+CountrySB=Solomon Islands
+CountrySO=Somalia
+CountryZA=South Africa
+CountryGS=South Georgia and the South Sandwich Islands
+CountryLK=Sri Lanka
+CountrySD=Sudan
+CountrySR=Suriname
+CountrySJ=Svalbard and Jan Mayen
+CountrySZ=Swaziland
+CountrySY=Syrian
+CountryTW=Taiwan
+CountryTJ=Tajikistan
+CountryTZ=Tanzania
+CountryTH=Thailand
+CountryTL=Timor-Leste
+CountryTK=Tokelau
+CountryTO=Tonga
+CountryTT=Trinidad and Tobago
+CountryTR=Turkey
+CountryTM=Turkmenistan
+CountryTC=Turks and Caicos Islands
+CountryTV=Tuvalu
+CountryUG=Uganda
+CountryUA=Ukraine
+CountryAE=United Arab Emirates
+CountryUM=United States Minor Outlying Islands
+CountryUY=Uruguay
+CountryUZ=Uzbekistan
+CountryVU=Vanuatu
+CountryVE=Venezuela
+CountryVN=Viet Nam
+CountryVG=Virgin Islands, British
+CountryVI=Virgin Islands, U.S.
+CountryWF=Wallis and Futuna
+CountryEH=Western Sahara
+CountryYE=Yemen
+CountryZM=Zambia
+CountryZW=Zimbabwe
+CountryGG=Guernsey
+CountryIM=Isle of Man
+CountryJE=Jersey
+CountryME=Montenegro
+CountryBL=Saint Barthelemy
+CountryMF=Saint Martin
+
+##### Civilities #####
+CivilityMME=Mrs.
+CivilityMR=Mr.
+CivilityMLE=Ms.
+CivilityMTRE=Master
+CivilityDR=Doctor
+##### Currencies #####
+Currencyeuros=Euros
+CurrencyAUD=AU Dollars
+CurrencySingAUD=AU Dollar
+CurrencyCAD=CAN Dollars
+CurrencySingCAD=CAN Dollar
+CurrencyCHF=Swiss Francs
+CurrencySingCHF=Swiss Franc
+CurrencyEUR=Euros
+CurrencySingEUR=Euro
+CurrencyFRF=French Francs
+CurrencySingFRF=French Franc
+CurrencyGBP=GB Pounds
+CurrencySingGBP=GB Pound
+CurrencyINR=Indian rupees
+CurrencySingINR=Indian rupee
+CurrencyMAD=Dirham
+CurrencySingMAD=Dirham
+CurrencyMGA=Ariary
+CurrencySingMGA=Ariary
+CurrencyMUR=Mauritius rupees
+CurrencySingMUR=Mauritius rupee
+CurrencyNOK=Norwegian krones
+CurrencySingNOK=Norwegian kronas
+CurrencyTND=Tunisian dinars
+CurrencySingTND=Tunisian dinar
+CurrencyUSD=US Dollars
+CurrencySingUSD=US Dollar
+CurrencyUAH=Hryvnia
+CurrencySingUAH=Hryvnia
+CurrencyXAF=CFA Francs BEAC
+CurrencySingXAF=CFA Franc BEAC
+CurrencyXOF=CFA Francs BCEAO
+CurrencySingXOF=CFA Franc BCEAO
+CurrencyXPF=CFP Francs
+CurrencySingXPF=CFP Franc
+CurrencyCentEUR=cents
+CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=thousandth
+#### Input reasons #####
+DemandReasonTypeSRC_INTE=Internet
+DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
+DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
+DemandReasonTypeSRC_CAMP_PHO=Phone campaign
+DemandReasonTypeSRC_CAMP_FAX=Fax campaign
+DemandReasonTypeSRC_COMM=Commercial contact
+DemandReasonTypeSRC_SHOP=Shop contact
+DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_PARTNER=Partner
+DemandReasonTypeSRC_EMPLOYEE=Employee
+DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
+#### Paper formats ####
+PaperFormatEU4A0=Format 4A0
+PaperFormatEU2A0=Format 2A0
+PaperFormatEUA0=Format A0
+PaperFormatEUA1=Format A1
+PaperFormatEUA2=Format A2
+PaperFormatEUA3=Format A3
+PaperFormatEUA4=Format A4
+PaperFormatEUA5=Format A5
+PaperFormatEUA6=Format A6
+PaperFormatUSLETTER=Format Letter US
+PaperFormatUSLEGAL=Format Legal US
+PaperFormatUSEXECUTIVE=Format Executive US
+PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatCAP1=Format P1 Canada
+PaperFormatCAP2=Format P2 Canada
+PaperFormatCAP3=Format P3 Canada
+PaperFormatCAP4=Format P4 Canada
+PaperFormatCAP5=Format P5 Canada
+PaperFormatCAP6=Format P6 Canada
+#### Expense report categories ####
+ExpAutoCat=Car
+ExpCycloCat=Moped
+ExpMotoCat=Motorbike
+ExpAuto3CV=3 CV
+ExpAuto4CV=4 CV
+ExpAuto5CV=5 CV
+ExpAuto6CV=6 CV
+ExpAuto7CV=7 CV
+ExpAuto8CV=8 CV
+ExpAuto9CV=9 CV
+ExpAuto10CV=10 CV
+ExpAuto11CV=11 CV
+ExpAuto12CV=12 CV
+ExpAuto3PCV=3 CV and more
+ExpAuto4PCV=4 CV and more
+ExpAuto5PCV=5 CV and more
+ExpAuto6PCV=6 CV and more
+ExpAuto7PCV=7 CV and more
+ExpAuto8PCV=8 CV and more
+ExpAuto9PCV=9 CV and more
+ExpAuto10PCV=10 CV and more
+ExpAuto11PCV=11 CV and more
+ExpAuto12PCV=12 CV and more
+ExpAuto13PCV=13 CV and more
+ExpCyclo=Capacity lower to 50cm3
+ExpMoto12CV=Motorbike 1 or 2 CV
+ExpMoto345CV=Motorbike 3, 4 or 5 CV
+ExpMoto5PCV=Motorbike 5 CV and more
diff --git a/htdocs/langs/km_KH/donations.lang b/htdocs/langs/km_KH/donations.lang
new file mode 100644
index 00000000000..de4bdf68f03
--- /dev/null
+++ b/htdocs/langs/km_KH/donations.lang
@@ -0,0 +1,34 @@
+# Dolibarr language file - Source file is en_US - donations
+Donation=Donation
+Donations=Donations
+DonationRef=Donation ref.
+Donor=Donor
+AddDonation=Create a donation
+NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation?
+PublicDonation=Public donation
+DonationsArea=Donations area
+DonationStatusPromiseNotValidated=Draft promise
+DonationStatusPromiseValidated=Validated promise
+DonationStatusPaid=Donation received
+DonationStatusPromiseNotValidatedShort=Draft
+DonationStatusPromiseValidatedShort=Validated
+DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDate=Donation date
+DonationDatePayment=Payment date
+ValidPromess=Validate promise
+DonationReceipt=Donation receipt
+DonationsModels=Documents models for donation receipts
+LastModifiedDonations=Latest %s modified donations
+DonationRecipient=Donation recipient
+IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+MinimumAmount=Minimum amount is  %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
+DonationValidated=Donation %s validated
diff --git a/htdocs/langs/km_KH/ecm.lang b/htdocs/langs/km_KH/ecm.lang
new file mode 100644
index 00000000000..369ac6dfdfa
--- /dev/null
+++ b/htdocs/langs/km_KH/ecm.lang
@@ -0,0 +1,52 @@
+# Dolibarr language file - Source file is en_US - ecm
+ECMNbOfDocs=No. of documents in directory
+ECMSection=Directory
+ECMSectionManual=Manual directory
+ECMSectionAuto=Automatic directory
+ECMSectionsManual=Manual tree
+ECMSectionsAuto=Automatic tree
+ECMSections=Directories
+ECMRoot=ECM Root
+ECMNewSection=New directory
+ECMAddSection=Add directory
+ECMCreationDate=Creation date
+ECMNbOfFilesInDir=Number of files in directory
+ECMNbOfSubDir=Number of sub-directories
+ECMNbOfFilesInSubDir=Number of files in sub-directories
+ECMCreationUser=Creator
+ECMArea=DMS/ECM area
+ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.<br>* Manual directories can be used to save documents not linked to a particular element.
+ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
+ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMSearchByKeywords=Search by keywords
+ECMSearchByEntity=Search by object
+ECMSectionOfDocuments=Directories of documents
+ECMTypeAuto=Automatic
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
+ECMDocsByThirdParties=Documents linked to third parties
+ECMDocsByProposals=Documents linked to proposals
+ECMDocsByOrders=Documents linked to customers orders
+ECMDocsByContracts=Documents linked to contracts
+ECMDocsByInvoices=Documents linked to customers invoices
+ECMDocsByProducts=Documents linked to products
+ECMDocsByProjects=Documents linked to projects
+ECMDocsByUsers=Documents linked to users
+ECMDocsByInterventions=Documents linked to interventions
+ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to vendor proposals
+ECMNoDirectoryYet=No directory created
+ShowECMSection=Show directory
+DeleteSection=Remove directory
+ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
+ECMDirectoryForFiles=Relative directory for files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+ECMFileManager=File manager
+ECMSelectASection=Select a directory in the tree...
+DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
+ReSyncListOfDir=Resync list of directories
+HashOfFileContent=Hash of file content
+NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/km_KH/errors.lang b/htdocs/langs/km_KH/errors.lang
new file mode 100644
index 00000000000..7c67aeca8b5
--- /dev/null
+++ b/htdocs/langs/km_KH/errors.lang
@@ -0,0 +1,265 @@
+# Dolibarr language file - Source file is en_US - errors
+
+# No errors
+NoErrorCommitIsDone=No error, we commit
+# Errors
+ErrorButCommitIsDone=Errors found but we validate despite this
+ErrorBadEMail=Email %s is wrong
+ErrorBadUrl=Url %s is wrong
+ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorLoginAlreadyExists=Login %s already exists.
+ErrorGroupAlreadyExists=Group %s already exists.
+ErrorRecordNotFound=Record not found.
+ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
+ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
+ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
+ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
+ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
+ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
+ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
+ErrorBadThirdPartyName=Bad value for third-party name
+ErrorProdIdIsMandatory=The %s is mandatory
+ErrorBadCustomerCodeSyntax=Bad syntax for customer code
+ErrorBadBarCodeSyntax=Bad syntax for barcode. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorCustomerCodeRequired=Customer code required
+ErrorBarCodeRequired=Barcode required
+ErrorCustomerCodeAlreadyUsed=Customer code already used
+ErrorBarCodeAlreadyUsed=Barcode already used
+ErrorPrefixRequired=Prefix required
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
+ErrorBadParameters=Bad parameters
+ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
+ErrorBadDateFormat=Value '%s' has wrong date format
+ErrorWrongDate=Date is not correct!
+ErrorFailedToWriteInDir=Failed to write in directory %s
+ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
+ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
+ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
+ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
+ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
+ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
+ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
+ErrorFileNotFound=File <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
+ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
+ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
+ErrorDirAlreadyExists=A directory with this name already exists.
+ErrorFileAlreadyExists=A file with this name already exists.
+ErrorPartialFile=File not received completely by server.
+ErrorNoTmpDir=Temporary directy %s does not exists.
+ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
+ErrorFileSizeTooLarge=File size is too large.
+ErrorFieldTooLong=Field %s is too long.
+ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum)
+ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum)
+ErrorNoValueForSelectType=Please fill value for select list
+ErrorNoValueForCheckBoxType=Please fill value for checkbox list
+ErrorNoValueForRadioType=Please fill value for radio list
+ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
+ErrorFieldCanNotContainSpecialCharacters=The field <b>%s</b> must not contains special characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
+ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
+ErrorNoAccountancyModuleLoaded=No accountancy module activated
+ErrorExportDuplicateProfil=This profile name already exists for this export set.
+ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
+ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
+ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
+ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
+ErrorRecordHasChildren=Failed to delete record since it has some child records.
+ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
+ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
+ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display.
+ErrorPasswordsMustMatch=Both typed passwords must match each other
+ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
+ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
+ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
+ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
+ErrorsOnXLines=%s errors found
+ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
+ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
+ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
+ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorBadMask=Error on mask
+ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
+ErrorBadMaskBadRazMonth=Error, bad reset value
+ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
+ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
+ErrorSelectAtLeastOne=Error, select at least one entry.
+ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
+ErrorProdIdAlreadyExist=%s is assigned to another third
+ErrorFailedToSendPassword=Failed to send password
+ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
+ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
+ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
+ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
+ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
+ErrorRecordAlreadyExists=Record already exists
+ErrorLabelAlreadyExists=This label already exists
+ErrorCantReadFile=Failed to read file '%s'
+ErrorCantReadDir=Failed to read directory '%s'
+ErrorBadLoginPassword=Bad value for login or password
+ErrorLoginDisabled=Your account has been disabled
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToChangePassword=Failed to change password
+ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
+ErrorLoginHasNoEmail=This user has no email address. Process aborted.
+ErrorBadValueForCode=Bad value for security code. Try again with new value...
+ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice.
+ErrorLinesCantBeNegativeForOneVATRate=Total of lines can't be negative for a given VAT rate.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
+ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
+ErrorNoActivatedBarcode=No barcode type activated
+ErrUnzipFails=Failed to unzip %s with ZipArchive
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
+ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
+ErrorModuleFileRequired=You must select a Dolibarr module package file
+ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
+ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
+ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
+ErrorNewValueCantMatchOldValue=New value can't be equal to old one
+ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
+ErrorFailedToAddContact=Failed to add contact
+ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
+ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
+ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
+ErrorWarehouseMustDiffers=Source and target warehouses must differs
+ErrorBadFormat=Bad format!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
+ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
+ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
+ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Operator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpression23=Unknown or non set variable '%s' in %s
+ErrorPriceExpression24=Variable '%s' exists but has no value
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
+ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
+ErrorSavingChanges=An error has occurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
+ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
+ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
+ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
+ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
+ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
+ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
+ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
+ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
+ErrorTaskAlreadyAssigned=Task already assigned to user
+ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
+ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
+ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
+ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
+ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
+ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
+ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
+ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
+ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
+ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
+ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
+ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
+ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, record is already transferred in accounting, deletion is not possible.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, language is mandatory if you set the page as a translation of another one.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
+ErrorBatchNoFoundForProductInWarehouse=No lot/serial found for product "%s" in warehouse "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this lot/serial for product "%s" in warehouse "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
+ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
+ErrorReplaceStringEmpty=Error, the string to replace into is empty
+# Warnings
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
+WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
+WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
+WarningEnableYourModulesApplications=Click here to enable your modules and applications
+WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.
+WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
+WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
+WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php</b>) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe.
+WarningsOnXLines=Warnings on <b>%s</b> source record(s)
+WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
+WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable the installation/migration tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Omitting the creation of this file is a grave security risk.
+WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
+WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
+WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
+WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
+WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
+WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
+WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
+WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectClosed=Project is closed. You must re-open it first.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
diff --git a/htdocs/langs/km_KH/exports.lang b/htdocs/langs/km_KH/exports.lang
new file mode 100644
index 00000000000..3549e3f8b23
--- /dev/null
+++ b/htdocs/langs/km_KH/exports.lang
@@ -0,0 +1,135 @@
+# Dolibarr language file - Source file is en_US - exports
+ExportsArea=Exports
+ImportArea=Import
+NewExport=New Export
+NewImport=New Import
+ExportableDatas=Exportable dataset
+ImportableDatas=Importable dataset
+SelectExportDataSet=Choose dataset you want to export...
+SelectImportDataSet=Choose dataset you want to import...
+SelectExportFields=Choose the fields you want to export, or select a predefined export profile
+SelectImportFields=Choose the source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
+NotImportedFields=Fields of source file not imported
+SaveExportModel=Save your selections as an export profile/template (for reuse).
+SaveImportModel=Save this import profile (for reuse) ...
+ExportModelName=Export profile name
+ExportModelSaved=Export profile saved as <b>%s</b>.
+ExportableFields=Exportable fields
+ExportedFields=Exported fields
+ImportModelName=Import profile name
+ImportModelSaved=Import profile saved as <b>%s</b>.
+DatasetToExport=Dataset to export
+DatasetToImport=Import file into dataset
+ChooseFieldsOrdersAndTitle=Choose fields order...
+FieldsTitle=Fields title
+FieldTitle=Field title
+NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
+AvailableFormats=Available Formats
+LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
+Step=Step
+FormatedImport=Import Assistant
+FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
+FormatedImportDesc2=First step is to choose the kind of data you want to import, then the format of the source file, then the fields you want to import.
+FormatedExport=Export Assistant
+FormatedExportDesc1=These tools allow the export of personalized data using an assistant, to help you in the process without requiring technical knowledge.
+FormatedExportDesc2=First step is to choose a predefined dataset, then which fields you want to export, and in which order.
+FormatedExportDesc3=When data to export are selected, you can choose the format of the output file.
+Sheet=Sheet
+NoImportableData=No importable data (no module with definitions to allow data imports)
+FileSuccessfullyBuilt=File generated
+SQLUsedForExport=SQL Request used to extract data
+LineId=Id of line
+LineLabel=Label of line
+LineDescription=Description of line
+LineUnitPrice=Unit price of line
+LineVATRate=VAT Rate of line
+LineQty=Quantity for line
+LineTotalHT=Amount excl. tax for line
+LineTotalTTC=Amount with tax for line
+LineTotalVAT=Amount of VAT for line
+TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
+FileWithDataToImport=File with data to import
+FileToImport=Source file to import
+FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SourceFileFormat=Source file format
+FieldsInSourceFile=Fields in source file
+FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+Field=Field
+NoFields=No fields
+MoveField=Move field column number %s
+ExampleOfImportFile=Example_of_import_file
+SaveImportProfile=Save this import profile
+ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name.
+TablesTarget=Targeted tables
+FieldsTarget=Targeted fields
+FieldTarget=Targeted field
+FieldSource=Source field
+NbOfSourceLines=Number of lines in source file
+NowClickToTestTheImport=Check that the file format (field and string delimiters) of your file matches the options shown and that you have omitted the header line, or these will be flagged as errors in the following simulation.<br>Click on the "<b>%s</b>" button to run a check of the file structure/contents and simulate the import process.<br><b>No data will be changed in your database</b>.
+RunSimulateImportFile=Run Import Simulation
+FieldNeedSource=This field requires data from the source file
+SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
+InformationOnSourceFile=Information on source file
+InformationOnTargetTables=Information on target fields
+SelectAtLeastOneField=Switch at least one source field in the column of fields to export
+SelectFormat=Choose this import file format
+RunImportFile=Import Data
+NowClickToRunTheImport=Check the results of the import simulation. Correct any errors and re-test.<br>When the simulation reports no errors you may proceed to import the data into the database.
+DataLoadedWithId=The imported data will have an additional field in each database table with this import id: <b>%s</b>, to allow it to be searchable in the case of investigating a problem related to this import.
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+TooMuchErrors=There are still <b>%s</b> other source lines with errors but output has been limited.
+TooMuchWarnings=There are still <b>%s</b> other source lines with warnings but output has been limited.
+EmptyLine=Empty line (will be discarded)
+CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
+FileWasImported=File was imported with number <b>%s</b>.
+YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
+NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
+NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
+DataComeFromNoWhere=Value to insert comes from nowhere in source file.
+DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
+DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
+DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
+DataIsInsertedInto=Data coming from source file will be inserted into the following field:
+DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
+DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field:
+SourceRequired=Data value is mandatory
+SourceExample=Example of possible data value
+ExampleAnyRefFoundIntoElement=Any ref found for element <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
+CSVFormatDesc=<b>Comma Separated Value</b> file format (.csv).<br>This is a text file format where fields are separated by a separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ].
+Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is the native Excel 95 format (BIFF5).
+Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is the native Excel 2007 format (SpreadsheetML).
+TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
+ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate record (with this field added, all lines will own their own id and will differ).
+CsvOptions=CSV format options
+Separator=Field Separator
+Enclosure=String Delimiter
+SpecialCode=Special code
+ExportStringFilter=%% allows replacing one or more characters in the text
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD: filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD: filters on all previous years/months/days
+ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+ImportFromToLine=Limit range (From - To). Eg. to omit header line(s).
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines.<br>If the header lines are NOT omitted, this will result in multiple errors in the Import Simulation.
+KeepEmptyToGoToEndOfFile=Keep this field empty to process all lines to the end of the file.
+SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for an UPDATE import
+UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
+NoUpdateAttempt=No update attempt was performed, only insert
+ImportDataset_user_1=Users (employees or not) and properties
+ComputedField=Computed field
+## filters
+SelectFilterFields=If you want to filter on some values, just input values here.
+FilteredFields=Filtered fields
+FilteredFieldsValues=Value for filter
+FormatControlRule=Format control rule
+## imports updates
+KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
+NbInsert=Number of inserted lines: %s
+NbUpdate=Number of updated lines: %s
+MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
diff --git a/htdocs/langs/km_KH/externalsite.lang b/htdocs/langs/km_KH/externalsite.lang
new file mode 100644
index 00000000000..da4853df0df
--- /dev/null
+++ b/htdocs/langs/km_KH/externalsite.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExternalSiteSetup=Setup link to external website
+ExternalSiteURL=External Site URL
+ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/km_KH/ftp.lang b/htdocs/langs/km_KH/ftp.lang
new file mode 100644
index 00000000000..d80b87c2715
--- /dev/null
+++ b/htdocs/langs/km_KH/ftp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - ftp
+FTPClientSetup=FTP Client module setup
+NewFTPClient=New FTP connection setup
+FTPArea=FTP Area
+FTPAreaDesc=This screen shows a view of an FTP server.
+SetupOfFTPClientModuleNotComplete=The setup of the FTP client module seems to be incomplete
+FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
+FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
+FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
+FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
+FTPPassiveMode=Passive mode
+ChooseAFTPEntryIntoMenu=Choose a FTP site from the menu...
+FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/km_KH/help.lang b/htdocs/langs/km_KH/help.lang
new file mode 100644
index 00000000000..048de16d3c0
--- /dev/null
+++ b/htdocs/langs/km_KH/help.lang
@@ -0,0 +1,23 @@
+# Dolibarr language file - Source file is en_US - help
+CommunitySupport=Forum/Wiki support
+EMailSupport=Emails support
+RemoteControlSupport=Online real-time / remote support
+OtherSupport=Other support
+ToSeeListOfAvailableRessources=To contact/see available resources:
+HelpCenter=Help Center
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
+TypeSupportCommunauty=Community (free)
+TypeSupportCommercial=Commercial
+TypeOfHelp=Type
+NeedHelpCenter=Need help or support?
+Efficiency=Efficiency
+TypeHelpOnly=Help only
+TypeHelpDev=Help+Development
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
+PossibleLanguages=Supported languages
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
+SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/km_KH/holiday.lang b/htdocs/langs/km_KH/holiday.lang
new file mode 100644
index 00000000000..82de49f9c5f
--- /dev/null
+++ b/htdocs/langs/km_KH/holiday.lang
@@ -0,0 +1,133 @@
+# Dolibarr language file - Source file is en_US - holiday
+HRM=HRM
+Holidays=Leave
+CPTitreMenu=Leave
+MenuReportMonth=Monthly statement
+MenuAddCP=New leave request
+NotActiveModCP=You must enable the module Leave to view this page.
+AddCP=Make a leave request
+DateDebCP=Start date
+DateFinCP=End date
+DraftCP=Draft
+ToReviewCP=Awaiting approval
+ApprovedCP=Approved
+CancelCP=Canceled
+RefuseCP=Refused
+ValidatorCP=Approbator
+ListeCP=List of leave
+LeaveId=Leave ID
+ReviewedByCP=Will be approved by
+UserID=User ID
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
+DescCP=Description
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
+ErrorEndDateCP=You must select an end date greater than the start date.
+ErrorSQLCreateCP=An SQL error occurred during the creation:
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
+ReturnCP=Return to previous page
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosWorkflowCP=Information Workflow
+RequestByCP=Requested by
+TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
+NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DayIsANonWorkingDay=%s is a non working day
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
+EditCP=Edit
+DeleteCP=Delete
+ActionRefuseCP=Refuse
+ActionCancelCP=Cancel
+StatutCP=Status
+TitleDeleteCP=Delete the leave request
+ConfirmDeleteCP=Confirm the deletion of this leave request?
+ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
+CantCreateCP=You don't have the right to make leave requests.
+InvalidValidatorCP=You must choose an approbator to your leave request.
+NoDateDebut=You must select a start date.
+NoDateFin=You must select an end date.
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
+ConfirmValidCP=Are you sure you want to approve the leave request?
+DateValidCP=Date approved
+TitleToValidCP=Send leave request
+ConfirmToValidCP=Are you sure you want to send the leave request?
+TitleRefuseCP=Refuse the leave request
+ConfirmRefuseCP=Are you sure you want to refuse the leave request?
+NoMotifRefuseCP=You must choose a reason for refusing the request.
+TitleCancelCP=Cancel the leave request
+ConfirmCancelCP=Are you sure you want to cancel the leave request?
+DetailRefusCP=Reason for refusal
+DateRefusCP=Date of refusal
+DateCancelCP=Date of cancellation
+DefineEventUserCP=Assign an exceptional leave for a user
+addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
+MotifCP=Reason
+UserCP=User
+ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
+AddEventToUserOkCP=The addition of the exceptional leave has been completed.
+MenuLogCP=View change logs
+LogCP=Log of updates of available vacation days
+ActionByCP=Performed by
+UserUpdateCP=For the user
+PrevSoldeCP=Previous Balance
+NewSoldeCP=New Balance
+alreadyCPexist=A leave request has already been done on this period.
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
+BoxTitleLastLeaveRequests=Latest %s modified leave requests
+HolidaysMonthlyUpdate=Monthly update
+ManualUpdate=Manual update
+HolidaysCancelation=Leave request cancelation
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
+## Configuration du Module ##
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
+UpdateConfCPOK=Updated successfully.
+Module27130Name= Management of leave requests
+Module27130Desc= Management of leave requests
+ErrorMailNotSend=An error occurred while sending email:
+NoticePeriod=Notice period
+#Messages
+HolidaysToValidate=Validate leave requests
+HolidaysToValidateBody=Below is a leave request to validate
+HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
+HolidaysValidated=Validated leave requests
+HolidaysValidatedBody=Your leave request for %s to %s has been validated.
+HolidaysRefused=Request denied
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
+HolidaysCanceled=Canceled leaved request
+HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
+FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
+NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
+NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
diff --git a/htdocs/langs/km_KH/hrm.lang b/htdocs/langs/km_KH/hrm.lang
new file mode 100644
index 00000000000..3697c47e30d
--- /dev/null
+++ b/htdocs/langs/km_KH/hrm.lang
@@ -0,0 +1,18 @@
+# Dolibarr language file - en_US - hrm
+# Admin
+HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
+Establishments=Establishments
+Establishment=Establishment
+NewEstablishment=New establishment
+DeleteEstablishment=Delete establishment
+ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
+OpenEtablishment=Open establishment
+CloseEtablishment=Close establishment
+# Dictionary
+DictionaryPublicHolidays=HRM - Public holidays
+DictionaryDepartment=HRM - Department list
+DictionaryFunction=HRM - Function list
+# Module
+Employees=Employees
+Employee=Employee
+NewEmployee=New employee
diff --git a/htdocs/langs/km_KH/install.lang b/htdocs/langs/km_KH/install.lang
new file mode 100644
index 00000000000..f67dff57184
--- /dev/null
+++ b/htdocs/langs/km_KH/install.lang
@@ -0,0 +1,223 @@
+# Dolibarr language file - Source file is en_US - install
+InstallEasy=Just follow the instructions step by step.
+MiscellaneousChecks=Prerequisites check
+ConfFileExists=Configuration file <b>%s</b> exists.
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
+ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
+ConfFileReload=Reloading parameters from configuration file.
+PHPSupportSessions=This PHP supports sessions.
+PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportCalendar=This PHP supports calendars extensions.
+PHPSupportUTF8=This PHP supports UTF8 functions.
+PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupport=This PHP supports %s functions.
+PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
+ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
+ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
+ErrorDirDoesNotExists=Directory %s does not exist.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
+ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
+ErrorFailedToCreateDatabase=Failed to create database '%s'.
+ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
+ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
+ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
+ErrorDatabaseAlreadyExists=Database '%s' already exists.
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
+IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
+PHPVersion=PHP Version
+License=Using license
+ConfigurationFile=Configuration file
+WebPagesDirectory=Directory where web pages are stored
+DocumentsDirectory=Directory to store uploaded and generated documents
+URLRoot=URL Root
+ForceHttps=Force secure connections (https)
+CheckToForceHttps=Check this option to force secure connections (https).<br>This requires that the web server is configured with an SSL certificate.
+DolibarrDatabase=Dolibarr Database
+DatabaseType=Database type
+DriverType=Driver type
+Server=Server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
+ServerPortDescription=Database server port. Keep empty if unknown.
+DatabaseServer=Database server
+DatabaseName=Database name
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
+AdminPassword=Password for Dolibarr database owner.
+CreateDatabase=Create database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
+DatabaseSuperUserAccess=Database server - Superuser access
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
+ServerConnection=Server connection
+DatabaseCreation=Database creation
+CreateDatabaseObjects=Database objects creation
+ReferenceDataLoading=Reference data loading
+TablesAndPrimaryKeysCreation=Tables and Primary keys creation
+CreateTableAndPrimaryKey=Create table %s
+CreateOtherKeysForTable=Create foreign keys and indexes for table %s
+OtherKeysCreation=Foreign keys and indexes creation
+FunctionsCreation=Functions creation
+AdminAccountCreation=Administrator login creation
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
+SetupEnd=End of setup
+SystemIsInstalled=This installation is complete.
+SystemIsUpgraded=Dolibarr has been upgraded successfully.
+YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below:
+AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
+GoToDolibarr=Go to Dolibarr
+GoToSetupArea=Go to Dolibarr (setup area)
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
+GoToUpgradePage=Go to upgrade page again
+WithNoSlashAtTheEnd=Without the slash "/" at the end
+DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
+LoginAlreadyExists=Already exists
+DolibarrAdminLogin=Dolibarr admin login
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
+FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
+ChoosedMigrateScript=Choose migration script
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
+ProcessMigrateScript=Script processing
+ChooseYourSetupMode=Choose your setup mode and click "Start"...
+FreshInstall=Fresh install
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
+Upgrade=Upgrade
+UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
+Start=Start
+InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
+YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
+AlreadyDone=Already migrated
+DatabaseVersion=Database version
+ServerVersion=Database server version
+YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
+DBSortingCollation=Character sorting order
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
+OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
+RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
+FieldRenamed=Field renamed
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
+InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
+InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
+IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
+OpenBaseDir=PHP openbasedir parameter
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
+MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
+MigrationShippingDelivery=Upgrade storage of shipping
+MigrationShippingDelivery2=Upgrade storage of shipping 2
+MigrationFinished=Migration finished
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
+ActivateModule=Activate module %s
+ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
+SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
+NothingToDelete=Nothing to clean/delete
+NothingToDo=Nothing to do
+#########
+# upgrade
+MigrationFixData=Fix for denormalized data
+MigrationOrder=Data migration for customer's orders
+MigrationSupplierOrder=Data migration for vendor's orders
+MigrationProposal=Data migration for commercial proposals
+MigrationInvoice=Data migration for customer's invoices
+MigrationContract=Data migration for contracts
+MigrationSuccessfullUpdate=Upgrade successful
+MigrationUpdateFailed=Failed upgrade process
+MigrationRelationshipTables=Data migration for relationship tables (%s)
+MigrationPaymentsUpdate=Payment data correction
+MigrationPaymentsNumberToUpdate=%s payment(s) to update
+MigrationProcessPaymentUpdate=Update payment(s) %s
+MigrationPaymentsNothingToUpdate=No more things to do
+MigrationPaymentsNothingUpdatable=No more payments that can be corrected
+MigrationContractsUpdate=Contract data correction
+MigrationContractsNumberToUpdate=%s contract(s) to update
+MigrationContractsLineCreation=Create contract line for contract ref %s
+MigrationContractsNothingToUpdate=No more things to do
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
+MigrationContractsEmptyDatesUpdate=Contract empty date correction
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
+MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
+MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
+MigrationContractsInvalidDatesUpdate=Bad value date contract correction
+MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s)
+MigrationContractsInvalidDatesNumber=%s contracts modified
+MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct
+MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction
+MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
+MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct
+MigrationReopeningContracts=Open contract closed by error
+MigrationReopenThisContract=Reopen contract %s
+MigrationReopenedContractsNumber=%s contracts modified
+MigrationReopeningContractsNothingToUpdate=No closed contract to open
+MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
+MigrationBankTransfertsNothingToUpdate=All links are up to date
+MigrationShipmentOrderMatching=Sendings receipt update
+MigrationDeliveryOrderMatching=Delivery receipt update
+MigrationDeliveryDetail=Delivery update
+MigrationStockDetail=Update stock value of products
+MigrationMenusDetail=Update dynamic menus tables
+MigrationDeliveryAddress=Update delivery address in shipments
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
+MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
+MigrationProjectTaskTime=Update time spent in seconds
+MigrationActioncommElement=Update data on actions
+MigrationPaymentMode=Data migration for payment type
+MigrationCategorieAssociation=Migration of categories
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
+MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
+MigrationReloadModule=Reload module %s
+MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
+ClickHereToGoToApp=Click here to go to your application
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/km_KH/interventions.lang b/htdocs/langs/km_KH/interventions.lang
new file mode 100644
index 00000000000..e5936f8246e
--- /dev/null
+++ b/htdocs/langs/km_KH/interventions.lang
@@ -0,0 +1,66 @@
+# Dolibarr language file - Source file is en_US - interventions
+Intervention=Intervention
+Interventions=Interventions
+InterventionCard=Intervention card
+NewIntervention=New intervention
+AddIntervention=Create intervention
+ChangeIntoRepeatableIntervention=Change to repeatable intervention
+ListOfInterventions=List of interventions
+ActionsOnFicheInter=Actions on intervention
+LastInterventions=Latest %s interventions
+AllInterventions=All interventions
+CreateDraftIntervention=Create draft
+InterventionContact=Intervention contact
+DeleteIntervention=Delete intervention
+ValidateIntervention=Validate intervention
+ModifyIntervention=Modify intervention
+DeleteInterventionLine=Delete intervention line
+ConfirmDeleteIntervention=Are you sure you want to delete this intervention?
+ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
+ConfirmModifyIntervention=Are you sure you want to modify this intervention?
+ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line?
+ConfirmCloneIntervention=Are you sure you want to clone this intervention?
+NameAndSignatureOfInternalContact=Name and signature of intervening:
+NameAndSignatureOfExternalContact=Name and signature of customer:
+DocumentModelStandard=Standard document model for interventions
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
+InterventionClassifyDone=Classify "Done"
+StatusInterInvoiced=Billed
+SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by email
+InterventionDeletedInDolibarr=Intervention %s deleted
+InterventionsArea=Interventions area
+DraftFichinter=Draft interventions
+LastModifiedInterventions=Latest %s modified interventions
+FichinterToProcess=Interventions to process
+TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
+PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
+PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
+UseDurationOnFichinter=Hides the duration field for intervention records
+UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records
+InterventionStatistics=Statistics of interventions
+NbOfinterventions=No. of intervention cards
+NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
+InterId=Intervention id
+InterRef=Intervention ref.
+InterDateCreation=Date creation intervention
+InterDuration=Duration intervention
+InterStatus=Status intervention
+InterNote=Note intervention
+InterLine=Line of intervention
+InterLineId=Line id intervention
+InterLineDate=Line date intervention
+InterLineDuration=Line duration intervention
+InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/km_KH/languages.lang b/htdocs/langs/km_KH/languages.lang
new file mode 100644
index 00000000000..6185183161b
--- /dev/null
+++ b/htdocs/langs/km_KH/languages.lang
@@ -0,0 +1,89 @@
+# Dolibarr language file - Source file is en_US - languages
+Language_ar_AR=Arabic
+Language_ar_EG=Arabic (Egypt)
+Language_ar_SA=Arabic
+Language_bn_BD=Bengali
+Language_bg_BG=Bulgarian
+Language_bs_BA=Bosnian
+Language_ca_ES=Catalan
+Language_cs_CZ=Czech
+Language_da_DA=Danish
+Language_da_DK=Danish
+Language_de_DE=German
+Language_de_AT=German (Austria)
+Language_de_CH=German (Switzerland)
+Language_el_GR=Greek
+Language_el_CY=Greek (Cyprus)
+Language_en_AU=English (Australia)
+Language_en_CA=English (Canada)
+Language_en_GB=English (United Kingdom)
+Language_en_IN=English (India)
+Language_en_NZ=English (New Zealand)
+Language_en_SA=English (Saudi Arabia)
+Language_en_US=English (United States)
+Language_en_ZA=English (South Africa)
+Language_es_ES=Spanish
+Language_es_AR=Spanish (Argentina)
+Language_es_BO=Spanish (Bolivia)
+Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
+Language_es_EC=Spanish (Ecuador)
+Language_es_HN=Spanish (Honduras)
+Language_es_MX=Spanish (Mexico)
+Language_es_PA=Spanish (Panama)
+Language_es_PY=Spanish (Paraguay)
+Language_es_PE=Spanish (Peru)
+Language_es_PR=Spanish (Puerto Rico)
+Language_es_UY=Spanish (Uruguay)
+Language_es_VE=Spanish (Venezuela)
+Language_et_EE=Estonian
+Language_eu_ES=Basque
+Language_fa_IR=Persian
+Language_fi_FI=Finnish
+Language_fr_BE=French (Belgium)
+Language_fr_CA=French (Canada)
+Language_fr_CH=French (Switzerland)
+Language_fr_FR=French
+Language_fr_NC=French (New Caledonia)
+Language_fy_NL=Frisian
+Language_he_IL=Hebrew
+Language_hr_HR=Croatian
+Language_hu_HU=Hungarian
+Language_id_ID=Indonesian
+Language_is_IS=Icelandic
+Language_it_IT=Italian
+Language_ja_JP=Japanese
+Language_ka_GE=Georgian
+Language_km_KH=Khmer
+Language_kn_IN=Kannada
+Language_ko_KR=Korean
+Language_lo_LA=Lao
+Language_lt_LT=Lithuanian
+Language_lv_LV=Latvian
+Language_mk_MK=Macedonian
+Language_mn_MN=Mongolian
+Language_nb_NO=Norwegian (Bokmål)
+Language_nl_BE=Dutch (Belgium)
+Language_nl_NL=Dutch
+Language_pl_PL=Polish
+Language_pt_BR=Portuguese (Brazil)
+Language_pt_PT=Portuguese
+Language_ro_RO=Romanian
+Language_ru_RU=Russian
+Language_ru_UA=Russian (Ukraine)
+Language_tr_TR=Turkish
+Language_sl_SI=Slovenian
+Language_sv_SV=Swedish
+Language_sv_SE=Swedish
+Language_sq_AL=Albanian
+Language_sk_SK=Slovakian
+Language_sr_RS=Serbian
+Language_sw_SW=Kiswahili
+Language_th_TH=Thai
+Language_uk_UA=Ukrainian
+Language_uz_UZ=Uzbek
+Language_vi_VN=Vietnamese
+Language_zh_CN=Chinese
+Language_zh_TW=Chinese (Traditional)
+Language_bh_MY=Malay
diff --git a/htdocs/langs/km_KH/ldap.lang b/htdocs/langs/km_KH/ldap.lang
new file mode 100644
index 00000000000..8b6f0864215
--- /dev/null
+++ b/htdocs/langs/km_KH/ldap.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - ldap
+YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
+UserMustChangePassNextLogon=User must change password on the domain %s
+LDAPInformationsForThisContact=Information in LDAP database for this contact
+LDAPInformationsForThisUser=Information in LDAP database for this user
+LDAPInformationsForThisGroup=Information in LDAP database for this group
+LDAPInformationsForThisMember=Information in LDAP database for this member
+LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPAttributes=LDAP attributes
+LDAPCard=LDAP card
+LDAPRecordNotFound=Record not found in LDAP database
+LDAPUsers=Users in LDAP database
+LDAPFieldStatus=Status
+LDAPFieldFirstSubscriptionDate=First subscription date
+LDAPFieldFirstSubscriptionAmount=First subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example: skypeName
+UserSynchronized=User synchronized
+GroupSynchronized=Group synchronized
+MemberSynchronized=Member synchronized
+MemberTypeSynchronized=Member type synchronized
+ContactSynchronized=Contact synchronized
+ForceSynchronize=Force synchronizing Dolibarr -> LDAP
+ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/km_KH/link.lang b/htdocs/langs/km_KH/link.lang
new file mode 100644
index 00000000000..1ffcd41a18b
--- /dev/null
+++ b/htdocs/langs/km_KH/link.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - languages
+LinkANewFile=Link a new file/document
+LinkedFiles=Linked files and documents
+NoLinkFound=No registered links
+LinkComplete=The file has been linked successfully
+ErrorFileNotLinked=The file could not be linked
+LinkRemoved=The link %s has been removed
+ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
+ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+URLToLink=URL to link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/km_KH/loan.lang b/htdocs/langs/km_KH/loan.lang
new file mode 100644
index 00000000000..534dee08867
--- /dev/null
+++ b/htdocs/langs/km_KH/loan.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+LoanPayment=Loan payment
+ShowLoanPayment=Show Loan Payment
+LoanCapital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+Term=Term
+LoanAccountancyCapitalCode=Accounting account capital
+LoanAccountancyInsuranceCode=Accounting account insurance
+LoanAccountancyInterestCode=Accounting account interest
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ListLoanAssociatedProject=List of loan associated with the project
+AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
+CreateCalcSchedule=Edit financial commitment
diff --git a/htdocs/langs/km_KH/mailmanspip.lang b/htdocs/langs/km_KH/mailmanspip.lang
new file mode 100644
index 00000000000..bab4b3576b4
--- /dev/null
+++ b/htdocs/langs/km_KH/mailmanspip.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - mailmanspip
+MailmanSpipSetup=Mailman and SPIP module Setup
+MailmanTitle=Mailman mailing list system
+TestSubscribe=To test subscription to Mailman lists
+TestUnSubscribe=To test unsubscribe from Mailman lists
+MailmanCreationSuccess=Subscription test was executed successfully
+MailmanDeletionSuccess=Unsubscription test was executed successfully
+SynchroMailManEnabled=A Mailman update will be performed
+SynchroSpipEnabled=A Spip update will be performed
+DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
+DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
+DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
+DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
+SPIPTitle=SPIP Content Management System
+DescADHERENT_SPIP_SERVEUR=SPIP Server
+DescADHERENT_SPIP_DB=SPIP database name
+DescADHERENT_SPIP_USER=SPIP database login
+DescADHERENT_SPIP_PASS=SPIP database password
+AddIntoSpip=Add into SPIP
+AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
+AddIntoSpipError=Failed to add the user in SPIP
+DeleteIntoSpip=Remove from SPIP
+DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
+DeleteIntoSpipError=Failed to suppress the user from SPIP
+SPIPConnectionFailed=Failed to connect to SPIP
+SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
+SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
diff --git a/htdocs/langs/km_KH/mails.lang b/htdocs/langs/km_KH/mails.lang
new file mode 100644
index 00000000000..7b3bfd3852a
--- /dev/null
+++ b/htdocs/langs/km_KH/mails.lang
@@ -0,0 +1,170 @@
+# Dolibarr language file - Source file is en_US - mails
+Mailing=EMailing
+EMailing=EMailing
+EMailings=EMailings
+AllEMailings=All eMailings
+MailCard=EMailing card
+MailRecipients=Recipients
+MailRecipient=Recipient
+MailTitle=Description
+MailFrom=Sender
+MailErrorsTo=Errors to
+MailReply=Reply to
+MailTo=Receiver(s)
+MailToUsers=To user(s)
+MailCC=Copy to
+MailToCCUsers=Copy to users(s)
+MailCCC=Cached copy to
+MailTopic=Email topic
+MailText=Message
+MailFile=Attached files
+MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
+ShowEMailing=Show emailing
+ListOfEMailings=List of emailings
+NewMailing=New emailing
+EditMailing=Edit emailing
+ResetMailing=Resend emailing
+DeleteMailing=Delete emailing
+DeleteAMailing=Delete an emailing
+PreviewMailing=Preview emailing
+CreateMailing=Create emailing
+TestMailing=Test email
+ValidMailing=Valid emailing
+MailingStatusDraft=Draft
+MailingStatusValidated=Validated
+MailingStatusSent=Sent
+MailingStatusSentPartialy=Sent partially
+MailingStatusSentCompletely=Sent completely
+MailingStatusError=Error
+MailingStatusNotSent=Not sent
+MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
+MailingSuccessfullyValidated=EMailing successfully validated
+MailUnsubcribe=Unsubscribe
+MailingStatusNotContact=Don't contact anymore
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
+ErrorMailRecipientIsEmpty=Email recipient is empty
+WarningNoEMailsAdded=No new Email to add to recipient's list.
+ConfirmValidMailing=Are you sure you want to validate this emailing?
+ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
+ConfirmDeleteMailing=Are you sure you want to delete this emailing?
+NbOfUniqueEMails=No. of unique emails
+NbOfEMails=No. of EMails
+TotalNbOfDistinctRecipients=Number of distinct recipients
+NoTargetYet=No recipients defined yet (Go on tab 'Recipients')
+NoRecipientEmail=No recipient email for %s
+RemoveRecipient=Remove recipient
+YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README.
+EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values
+MailingAddFile=Attach this file
+NoAttachedFiles=No attached files
+BadEMail=Bad value for Email
+ConfirmCloneEMailing=Are you sure you want to clone this emailing?
+CloneContent=Clone message
+CloneReceivers=Cloner recipients
+DateLastSend=Date of latest sending
+DateSending=Date sending
+SentTo=Sent to <b>%s</b>
+MailingStatusRead=Read
+YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubscribe from mailing list
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubscribe" feature
+EMailSentToNRecipients=Email sent to %s recipients.
+EMailSentForNElements=Email sent for %s elements.
+XTargetsAdded=<b>%s</b> recipients added into target list
+OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachments in mass sending in this version).
+AllRecipientSelected=The recipients of the %s record selected (if their email is known).
+GroupEmails=Group emails
+OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
+WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
+ResultOfMailSending=Result of mass Email sending
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
+SentXXXmessages=%s message(s) sent.
+ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
+MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
+MailingModuleDescContactsByCompanyCategory=Contacts by third-party category
+MailingModuleDescContactsByCategory=Contacts by categories
+MailingModuleDescContactsByFunction=Contacts by position
+MailingModuleDescEmailsFromFile=Emails from file
+MailingModuleDescEmailsFromUser=Emails input by user
+MailingModuleDescDolibarrUsers=Users with Emails
+MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+
+# Libelle des modules de liste de destinataires mailing
+LineInFile=Line %s in file
+RecipientSelectionModules=Defined requests for recipient's selection
+MailSelectedRecipients=Selected recipients
+MailingArea=EMailings area
+LastMailings=Latest %s emailings
+TargetsStatistics=Targets statistics
+NbOfCompaniesContacts=Unique contacts/addresses
+MailNoChangePossible=Recipients for validated emailing can't be changed
+SearchAMailing=Search mailing
+SendMailing=Send emailing
+SentBy=Sent by
+MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
+MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
+ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+TargetsReset=Clear list
+ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
+ToAddRecipientsChooseHere=Add recipients by choosing from the lists
+NbOfEMailingsReceived=Mass emailings received
+NbOfEMailingsSend=Mass emailings sent
+IdRecord=ID record
+DeliveryReceipt=Delivery Ack.
+YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
+TagCheckMail=Track mail opening
+TagUnsubscribe=Unsubscribe link
+TagSignature=Signature of sending user
+EMailRecipient=Recipient Email
+TagMailtoEmail=Recipient Email (including html "mailto:" link)
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
+# Module Notifications
+Notifications=Notifications
+NoNotificationsWillBeSent=No email notifications are planned for this event and company
+ANotificationsWillBeSent=1 notification will be sent by email
+SomeNotificationsWillBeSent=%s notifications will be sent by email
+AddNewNotification=Activate a new email notification target/event
+ListOfActiveNotifications=List all active targets/events for email notification
+ListOfNotificationsDone=List all email notifications sent
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
+UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
+UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
+MailAdvTargetRecipients=Recipients (advanced selection)
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchIntHelp=Use interval to select int or float value
+AdvTgtMinVal=Minimum value
+AdvTgtMaxVal=Maximum value
+AdvTgtSearchDtHelp=Use interval to select date value
+AdvTgtStartDt=Start dt.
+AdvTgtEndDt=End dt.
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third-party email or just contact email
+AdvTgtTypeOfIncude=Type of targeted email
+AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
+AddAll=Add all
+RemoveAll=Remove all
+ItemsCount=Item(s)
+AdvTgtNameTemplate=Filter name
+AdvTgtAddContact=Add emails according to criteria
+AdvTgtLoadFilter=Load filter
+AdvTgtDeleteFilter=Delete filter
+AdvTgtSaveFilter=Save filter
+AdvTgtCreateFilter=Create filter
+AdvTgtOrCreateNewFilter=Name of new filter
+NoContactWithCategoryFound=No contact/address with a category found
+NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+DefaultOutgoingEmailSetup=Default outgoing email setup
+Information=Information
+ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/km_KH/margins.lang b/htdocs/langs/km_KH/margins.lang
new file mode 100644
index 00000000000..76ea8ad5c4d
--- /dev/null
+++ b/htdocs/langs/km_KH/margins.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - marges
+
+Margin=Margin
+Margins=Margins
+TotalMargin=Total Margin
+MarginOnProducts=Margin / Products
+MarginOnServices=Margin / Services
+MarginRate=Margin rate
+MarkRate=Mark rate
+DisplayMarginRates=Display margin rates
+DisplayMarkRates=Display mark rates
+InputPrice=Input price
+margin=Profit margins management
+margesSetup=Profit margins management setup
+MarginDetails=Margin details
+ProductMargins=Product margins
+CustomerMargins=Customer margins
+SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
+UserMargins=User margins
+ProductService=Product or Service
+AllProducts=All products and services
+ChooseProduct/Service=Choose product or service
+ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
+ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
+UseDiscountAsProduct=As a product
+UseDiscountAsService=As a service
+UseDiscountOnTotal=On subtotal
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
+MargeType1=Margin on Best vendor price
+MargeType2=Margin on Weighted Average Price (WAP)
+MargeType3=Margin on Cost Price
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
+CostPrice=Cost price
+UnitCharges=Unit charges
+Charges=Charges
+AgentContactType=Commercial agent contact type
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
+CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/km_KH/members.lang b/htdocs/langs/km_KH/members.lang
new file mode 100644
index 00000000000..dd0a5bf49e2
--- /dev/null
+++ b/htdocs/langs/km_KH/members.lang
@@ -0,0 +1,204 @@
+# Dolibarr language file - Source file is en_US - members
+MembersArea=Members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of terminated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Terminated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
+DateSubscription=Subscription date
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=Subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Terminated member
+MemberStatusResiliatedShort=Terminated
+MembersStatusToValid=Draft members
+MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Validated
+SubscriptionNotNeeded=No subscription needed
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+MemberTypeModified=Member type modified
+DeleteAMemberType=Delete a member type
+ConfirmDeleteMemberType=Are you sure you want to delete this member type?
+MemberTypeDeleted=Member type deleted
+MemberTypeCanNotBeDeleted=Member type can not be deleted
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome email
+SubscriptionRequired=Subscription required
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Terminate a member
+ConfirmResiliateMember=Are you sure you want to terminate this member?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions)?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public self-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public website with self-subscription form
+ForceMemberType=Force the member type
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembersModified=Latest %s modified members
+LastSubscriptionsModified=Latest %s modified subscriptions
+String=String
+Text=Text
+Int=Int
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+SubscriptionNotRecorded=Subscription not recorded
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct entry on bank account
+MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Latest member date
+LatestSubscriptionDate=Latest subscription date
+MemberNature=Nature of member
+Public=Information are public
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No VAT for subscriptions
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
+MembershipPaid=Membership paid for current period (until %s)
+YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
+XMembersClosed=%s member(s) closed
diff --git a/htdocs/langs/km_KH/modulebuilder.lang b/htdocs/langs/km_KH/modulebuilder.lang
new file mode 100644
index 00000000000..135ac1ae9ec
--- /dev/null
+++ b/htdocs/langs/km_KH/modulebuilder.lang
@@ -0,0 +1,141 @@
+# Dolibarr language file - Source file is en_US - loan
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
+ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
+ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
+ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
+NewModule=New module
+NewObjectInModulebuilder=New object
+ModuleKey=Module key
+ObjectKey=Object key
+ModuleInitialized=Module initialized
+FilesForObjectInitialized=Files for new object '%s' initialized
+FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
+ModuleBuilderDescdescription=Enter here all general information that describe your module.
+ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
+ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
+ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
+ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
+ModuleBuilderDeschooks=This tab is dedicated to hooks.
+ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
+ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
+DangerZone=Danger zone
+BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
+BuildDocumentation=Build documentation
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
+DescriptionLong=Long description
+EditorName=Name of editor
+EditorUrl=URL of editor
+DescriptorFile=Descriptor file of module
+ClassFile=File for PHP DAO CRUD class
+ApiClassFile=File for PHP API class
+PageForList=PHP page for list of record
+PageForCreateEditView=PHP page to create/edit/view a record
+PageForAgendaTab=PHP page for event tab
+PageForDocumentTab=PHP page for document tab
+PageForNoteTab=PHP page for note tab
+PathToModulePackage=Path to zip of module/application package
+PathToModuleDocumentation=Path to file of module/application documentation (%s)
+SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
+FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Force update of .class and .sql files
+RegenerateMissingFiles=Generate missing files
+SpecificationFile=File of documentation
+LanguageFile=File for language
+ObjectProperties=Object Properties
+ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
+NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
+SearchAll=Used for 'search all'
+DatabaseIndex=Database index
+FileAlreadyExists=File %s already exists
+TriggersFile=File for triggers code
+HooksFile=File for hooks code
+ArrayOfKeyValues=Array of key-val
+ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
+WidgetFile=Widget file
+CSSFile=CSS file
+JSFile=Javascript file
+ReadmeFile=Readme file
+ChangeLog=ChangeLog file
+TestClassFile=File for PHP Unit Test class
+SqlFile=Sql file
+PageForLib=File for the common PHP library
+PageForObjLib=File for the PHP library dedicated to object
+SqlFileExtraFields=Sql file for complementary attributes
+SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
+AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
+UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Is a measure
+DirScanned=Directory scanned
+NoTrigger=No trigger
+NoWidget=No widget
+GoToApiExplorer=Go to API explorer
+ListOfMenusEntries=List of menu entries
+ListOfDictionariesEntries=List of dictionaries entries
+ListOfPermissionsDefined=List of defined permissions
+SeeExamples=See examples here
+EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdf=Display on PDF
+IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
+SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
+SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
+LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
+MenusDefDesc=Define here the menus provided by your module
+DictionariesDefDesc=Define here the dictionaries provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
+HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
+TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
+SeeIDsInUse=See IDs in use in your installation
+SeeReservedIDsRangeHere=See range of reserved IDs
+ToolkitForDevelopers=Toolkit for Dolibarr developers
+TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
+SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
+AddLanguageFile=Add language file
+YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
+DropTableIfEmpty=(Delete table if empty)
+TableDoesNotExists=The table %s does not exists
+TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
+UseAboutPage=Disable the about page
+UseDocFolder=Disable the documentation folder
+UseSpecificReadme=Use a specific ReadMe
+ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
+RealPathOfModule=Real path of module
+ContentCantBeEmpty=Content of file can't be empty
+WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
+CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
+JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
+CLIDesc=You can generate here some command line scripts you want to provide with your module.
+CLIFile=CLI File
+NoCLIFile=No CLI files
+UseSpecificEditorName = Use a specific editor name
+UseSpecificEditorURL = Use a specific editor URL
+UseSpecificFamily = Use a specific family
+UseSpecificAuthor = Use a specific author
+UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
+IncludeRefGeneration=The reference of object must be generated automatically
+IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
+IncludeDocGeneration=I want to generate some documents from the object
+IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
+ShowOnCombobox=Show value into combobox
+KeyForTooltip=Key for tooltip
+CSSClass=CSS Class
+NotEditable=Not editable
+ForeignKey=Foreign key
+TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/km_KH/multicurrency.lang b/htdocs/langs/km_KH/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/km_KH/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/km_KH/oauth.lang b/htdocs/langs/km_KH/oauth.lang
new file mode 100644
index 00000000000..075ff49a895
--- /dev/null
+++ b/htdocs/langs/km_KH/oauth.lang
@@ -0,0 +1,32 @@
+# Dolibarr language file - Source file is en_US - oauth
+ConfigOAuth=OAuth Configuration
+OAuthServices=OAuth Services
+ManualTokenGeneration=Manual token generation
+TokenManager=Token Manager
+IsTokenGenerated=Is token generated ?
+NoAccessToken=No access token saved into local database
+HasAccessToken=A token was generated and saved into local database
+NewTokenStored=Token received and saved
+ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
+TokenDeleted=Token deleted
+RequestAccess=Click here to request/renew access and receive a new token to save
+DeleteAccess=Click here to delete token
+UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
+ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
+OAuthSetupForLogin=Page to generate an OAuth token
+SeePreviousTab=See previous tab
+OAuthIDSecret=OAuth ID and Secret
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=OAuth Google service
+OAUTH_GOOGLE_ID=OAuth Google Id
+OAUTH_GOOGLE_SECRET=OAuth Google Secret
+OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create OAuth credentials
+OAUTH_GITHUB_NAME=OAuth GitHub service
+OAUTH_GITHUB_ID=OAuth GitHub Id
+OAUTH_GITHUB_SECRET=OAuth GitHub Secret
+OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create OAuth credentials
+OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
+OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/km_KH/opensurvey.lang b/htdocs/langs/km_KH/opensurvey.lang
new file mode 100644
index 00000000000..7d26151fa16
--- /dev/null
+++ b/htdocs/langs/km_KH/opensurvey.lang
@@ -0,0 +1,61 @@
+# Dolibarr language file - Source file is en_US - opensurvey
+Survey=Poll
+Surveys=Polls
+OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select the type of poll...
+NewSurvey=New poll
+OpenSurveyArea=Polls area
+AddACommentForPoll=You can add a comment into poll...
+AddComment=Add comment
+CreatePoll=Create poll
+PollTitle=Poll title
+ToReceiveEMailForEachVote=Receive an email for each vote
+TypeDate=Type date
+TypeClassic=Type standard
+OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
+RemoveAllDays=Remove all days
+CopyHoursOfFirstDay=Copy hours of first day
+RemoveAllHours=Remove all hours
+SelectedDays=Selected days
+TheBestChoice=The best choice currently is
+TheBestChoices=The best choices currently are
+with=with
+OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
+CommentsOfVoters=Comments of voters
+ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
+RemovePoll=Remove poll
+UrlForSurvey=URL to communicate to get a direct access to poll
+PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
+CreateSurveyDate=Create a date poll
+CreateSurveyStandard=Create a standard poll
+CheckBox=Simple checkbox
+YesNoList=List (empty/yes/no)
+PourContreList=List (empty/for/against)
+AddNewColumn=Add new column
+TitleChoice=Choice label
+ExportSpreadsheet=Export result spreadsheet
+ExpireDate=Limit date
+NbOfSurveys=Number of polls
+NbOfVoters=No. of voters
+SurveyResults=Results
+PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
+5MoreChoices=5 more choices
+Against=Against
+YouAreInivitedToVote=You are invited to vote for this poll
+VoteNameAlreadyExists=This name was already used for this poll
+AddADate=Add a date
+AddStartHour=Add start hour
+AddEndHour=Add end hour
+votes=vote(s)
+NoCommentYet=No comments have been posted for this poll yet
+CanComment=Voters can comment in the poll
+CanSeeOthersVote=Voters can see other people's vote
+SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
+BackToCurrentMonth=Back to current month
+ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
+ErrorOpenSurveyOneChoice=Enter at least one choice
+ErrorInsertingComment=There was an error while inserting your comment
+MoreChoices=Enter more choices for the voters
+SurveyExpiredInfo=The poll has been closed or voting delay has expired.
+EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
+ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/km_KH/orders.lang b/htdocs/langs/km_KH/orders.lang
new file mode 100644
index 00000000000..ad91e1eef63
--- /dev/null
+++ b/htdocs/langs/km_KH/orders.lang
@@ -0,0 +1,189 @@
+# Dolibarr language file - Source file is en_US - orders
+OrdersArea=Customers orders area
+SuppliersOrdersArea=Purchase orders area
+OrderCard=Order card
+OrderId=Order Id
+Order=Order
+PdfOrderTitle=Order
+Orders=Orders
+OrderLine=Order line
+OrderDate=Order date
+OrderDateShort=Order date
+OrderToProcess=Order to process
+NewOrder=New order
+NewOrderSupplier=New Purchase Order
+ToOrder=Make order
+MakeOrder=Make order
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Sales Order
+CustomersOrders=Sales Orders
+CustomersOrdersRunning=Current sales orders
+CustomersOrdersAndOrdersLines=Sales orders and order details
+OrdersDeliveredToBill=Sales orders delivered to bill
+OrdersToBill=Sales orders delivered
+OrdersInProcess=Sales orders in process
+OrdersToProcess=Sales orders to process
+SuppliersOrdersToProcess=Purchase orders to process
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
+StatusOrderCanceledShort=Canceled
+StatusOrderDraftShort=Draft
+StatusOrderValidatedShort=Validated
+StatusOrderSentShort=In process
+StatusOrderSent=Shipment in process
+StatusOrderOnProcessShort=Ordered
+StatusOrderProcessedShort=Processed
+StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
+StatusOrderToBillShort=Delivered
+StatusOrderApprovedShort=Approved
+StatusOrderRefusedShort=Refused
+StatusOrderToProcessShort=To process
+StatusOrderReceivedPartiallyShort=Partially received
+StatusOrderReceivedAllShort=Products received
+StatusOrderCanceled=Canceled
+StatusOrderDraft=Draft (needs to be validated)
+StatusOrderValidated=Validated
+StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderProcessed=Processed
+StatusOrderToBill=Delivered
+StatusOrderApproved=Approved
+StatusOrderRefused=Refused
+StatusOrderReceivedPartially=Partially received
+StatusOrderReceivedAll=All products received
+ShippingExist=A shipment exists
+QtyOrdered=Qty ordered
+ProductQtyInDraft=Product quantity into draft orders
+ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
+MenuOrdersToBill=Orders delivered
+MenuOrdersToBill2=Billable orders
+ShipProduct=Ship product
+CreateOrder=Create Order
+RefuseOrder=Refuse order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
+ValidateOrder=Validate order
+UnvalidateOrder=Unvalidate order
+DeleteOrder=Delete order
+CancelOrder=Cancel order
+OrderReopened= Order %s re-open
+AddOrder=Create order
+AddPurchaseOrder=Create purchase order
+AddToDraftOrders=Add to draft order
+ShowOrder=Show order
+OrdersOpened=Orders to process
+NoDraftOrders=No draft orders
+NoOrder=No order
+NoSupplierOrder=No purchase order
+LastOrders=Latest %s sales orders
+LastCustomerOrders=Latest %s sales orders
+LastSupplierOrders=Latest %s purchase orders
+LastModifiedOrders=Latest %s modified orders
+AllOrders=All orders
+NbOfOrders=Number of orders
+OrdersStatistics=Order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
+NumberOfOrdersByMonth=Number of orders by month
+AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
+ListOfOrders=List of orders
+CloseOrder=Close order
+ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
+ConfirmDeleteOrder=Are you sure you want to delete this order?
+ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b>?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status?
+ConfirmCancelOrder=Are you sure you want to cancel this order?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
+GenerateBill=Generate invoice
+ClassifyShipped=Classify delivered
+DraftOrders=Draft orders
+DraftSuppliersOrders=Draft purchase orders
+OnProcessOrders=In process orders
+RefOrder=Ref. order
+RefCustomerOrder=Ref. order for customer
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
+SendOrderByMail=Send order by mail
+ActionsOnOrder=Events on order
+NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
+OrderMode=Order method
+AuthorRequest=Request author
+UserWithApproveOrderGrant=Users granted with "approve orders" permission.
+PaymentOrderRef=Payment of order %s
+ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
+DispatchSupplierOrder=Receiving purchase order %s
+FirstApprovalAlreadyDone=First approval already done
+SecondApprovalAlreadyDone=Second approval already done
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
+OtherOrders=Other orders
+##### Types de contacts #####
+TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
+TypeContact_commande_internal_SHIPPING=Representative following-up shipping
+TypeContact_commande_external_BILLING=Customer invoice contact
+TypeContact_commande_external_SHIPPING=Customer shipping contact
+TypeContact_commande_external_CUSTOMER=Customer contact following-up order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
+TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
+Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
+Error_OrderNotChecked=No orders to invoice selected
+# Order modes (how we receive order). Not the "why" are keys stored into dict.lang
+OrderByMail=Mail
+OrderByFax=Fax
+OrderByEMail=Email
+OrderByWWW=Online
+OrderByPhone=Phone
+# Documents models
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
+PDFEratostheneDescription=A complete order model
+PDFEdisonDescription=A simple order model
+PDFProformaDescription=A complete Proforma invoice template
+CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
+IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
+SetShippingMode=Set shipping mode
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Canceled
+StatusSupplierOrderDraftShort=Draft
+StatusSupplierOrderValidatedShort=Validated
+StatusSupplierOrderSentShort=In process
+StatusSupplierOrderSent=Shipment in process
+StatusSupplierOrderOnProcessShort=Ordered
+StatusSupplierOrderProcessedShort=Processed
+StatusSupplierOrderDelivered=Delivered
+StatusSupplierOrderDeliveredShort=Delivered
+StatusSupplierOrderToBillShort=Delivered
+StatusSupplierOrderApprovedShort=Approved
+StatusSupplierOrderRefusedShort=Refused
+StatusSupplierOrderToProcessShort=To process
+StatusSupplierOrderReceivedPartiallyShort=Partially received
+StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderCanceled=Canceled
+StatusSupplierOrderDraft=Draft (needs to be validated)
+StatusSupplierOrderValidated=Validated
+StatusSupplierOrderOnProcess=Ordered - Standby reception
+StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusSupplierOrderProcessed=Processed
+StatusSupplierOrderToBill=Delivered
+StatusSupplierOrderApproved=Approved
+StatusSupplierOrderRefused=Refused
+StatusSupplierOrderReceivedPartially=Partially received
+StatusSupplierOrderReceivedAll=All products received
diff --git a/htdocs/langs/km_KH/other.lang b/htdocs/langs/km_KH/other.lang
new file mode 100644
index 00000000000..ba85f51e739
--- /dev/null
+++ b/htdocs/langs/km_KH/other.lang
@@ -0,0 +1,286 @@
+# Dolibarr language file - Source file is en_US - other
+SecurityCode=Security code
+NumberingShort=N°
+Tools=Tools
+TMenuTools=Tools
+ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
+Birthday=Birthday
+BirthdayDate=Birthday date
+DateToBirth=Birth date
+BirthdayAlertOn=birthday alert active
+BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (text) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+DocFileGeneratedInto=Doc file generated into <b>%s</b>.
+JumpToLogin=Disconnected. Go to login page...
+MessageForm=Message on online payment form
+MessageOK=Message on the return page for a validated payment
+MessageKO=Message on the return page for a canceled payment
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursively
+PoweredBy=Powered by
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+DateNextInvoiceBeforeGen=Date of next invoice (before generation)
+DateNextInvoiceAfterGen=Date of next invoice (after generation)
+GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
+OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Only the first selected field has been selected.
+AtLeastOneMeasureIsRequired=At least 1 field for measure is required
+AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
+LatestBlogPosts=Latest Blog Posts
+Notify_ORDER_VALIDATE=Sales order validated
+Notify_ORDER_SENTBYMAIL=Sales order sent by mail
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
+Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
+Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
+Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
+Notify_PROPAL_VALIDATE=Customer proposal validated
+Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
+Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
+Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
+Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
+Notify_WITHDRAW_CREDIT=Credit withdrawal
+Notify_WITHDRAW_EMIT=Perform withdrawal
+Notify_COMPANY_CREATE=Third party created
+Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_BILL_VALIDATE=Customer invoice validated
+Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_BILL_PAYED=Customer invoice paid
+Notify_BILL_CANCEL=Customer invoice canceled
+Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
+Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
+Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
+Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
+Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
+Notify_CONTRACT_VALIDATE=Contract validated
+Notify_FICHINTER_VALIDATE=Intervention validated
+Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
+Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
+Notify_SHIPPING_VALIDATE=Shipping validated
+Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail
+Notify_MEMBER_VALIDATE=Member validated
+Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_SUBSCRIPTION=Member subscribed
+Notify_MEMBER_RESILIATE=Member terminated
+Notify_MEMBER_DELETE=Member deleted
+Notify_PROJECT_CREATE=Project creation
+Notify_TASK_CREATE=Task created
+Notify_TASK_MODIFY=Task modified
+Notify_TASK_DELETE=Task deleted
+Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
+Notify_EXPENSE_REPORT_APPROVE=Expense report approved
+Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
+Notify_HOLIDAY_APPROVE=Leave request approved
+SeeModuleSetup=See setup of module %s
+NbOfAttachedFiles=Number of attached files/documents
+TotalSizeOfAttachedFiles=Total size of attached files/documents
+MaxSize=Maximum size
+AttachANewFile=Attach a new file/document
+LinkedObject=Linked object
+NbOfActiveNotifications=Number of notifications (no. of recipient emails)
+PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to remind you that the invoice  __REF__ seems to have not been paid. A copy of the invoice is attached as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find commercial proposal __REF__ attached \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price request __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
+ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
+DemoFundation=Manage members of a foundation
+DemoFundation2=Manage members and bank account of a foundation
+DemoCompanyServiceOnly=Company or freelance selling service only
+DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
+DemoCompanyAll=Company with multiple activities (all main modules)
+CreatedBy=Created by %s
+ModifiedBy=Modified by %s
+ValidatedBy=Validated by %s
+ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made latest change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made latest change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
+FileWasRemoved=File %s was removed
+DirWasRemoved=Directory %s was removed
+FeatureNotYetAvailable=Feature not yet available in the current version
+FeaturesSupported=Supported features
+Width=Width
+Height=Height
+Depth=Depth
+Top=Top
+Bottom=Bottom
+Left=Left
+Right=Right
+CalculatedWeight=Calculated weight
+CalculatedVolume=Calculated volume
+Weight=Weight
+WeightUnitton=tonne
+WeightUnitkg=kg
+WeightUnitg=g
+WeightUnitmg=mg
+WeightUnitpound=pound
+WeightUnitounce=ounce
+Length=Length
+LengthUnitm=m
+LengthUnitdm=dm
+LengthUnitcm=cm
+LengthUnitmm=mm
+Surface=Area
+SurfaceUnitm2=m²
+SurfaceUnitdm2=dm²
+SurfaceUnitcm2=cm²
+SurfaceUnitmm2=mm²
+SurfaceUnitfoot2=ft²
+SurfaceUnitinch2=in²
+Volume=Volume
+VolumeUnitm3=m³
+VolumeUnitdm3=dm³ (L)
+VolumeUnitcm3=cm³ (ml)
+VolumeUnitmm3=mm³ (µl)
+VolumeUnitfoot3=ft³
+VolumeUnitinch3=in³
+VolumeUnitounce=ounce
+VolumeUnitlitre=litre
+VolumeUnitgallon=gallon
+SizeUnitm=m
+SizeUnitdm=dm
+SizeUnitcm=cm
+SizeUnitmm=mm
+SizeUnitinch=inch
+SizeUnitfoot=foot
+SizeUnitpoint=point
+BugTracker=Bug tracker
+SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
+BackToLoginPage=Back to login page
+AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
+EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
+ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
+DolibarrDemo=Dolibarr ERP/CRM demo
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of sales orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of vendor proposals
+NumberOfSupplierOrders=Number of purchase orders
+NumberOfSupplierInvoices=Number of vendor invoices
+NumberOfContracts=Number of contracts
+NumberOfMos=Number of manufacturing orders
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on sales orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on vendor proposals
+NumberOfUnitsSupplierOrders=Number of units on purchase orders
+NumberOfUnitsSupplierInvoices=Number of units on vendor invoices
+NumberOfUnitsContracts=Number of units on contracts
+NumberOfUnitsMos=Number of units to produce in manufacturing orders
+EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
+EMailTextInterventionValidated=The intervention %s has been validated.
+EMailTextInvoiceValidated=Invoice %s has been validated.
+EMailTextInvoicePayed=Invoice %s has been paid.
+EMailTextProposalValidated=Proposal %s has been validated.
+EMailTextProposalClosedSigned=Proposal %s has been closed signed.
+EMailTextOrderValidated=Order %s has been validated.
+EMailTextOrderApproved=Order %s has been approved.
+EMailTextOrderValidatedBy=Order %s has been recorded by %s.
+EMailTextOrderApprovedBy=Order %s has been approved by %s.
+EMailTextOrderRefused=Order %s has been refused.
+EMailTextOrderRefusedBy=Order %s has been refused by %s.
+EMailTextExpeditionValidated=Shipping %s has been validated.
+EMailTextExpenseReportValidated=Expense report %s has been validated.
+EMailTextExpenseReportApproved=Expense report %s has been approved.
+EMailTextHolidayValidated=Leave request %s has been validated.
+EMailTextHolidayApproved=Leave request %s has been approved.
+ImportedWithSet=Importation data set
+DolibarrNotification=Automatic notification
+ResizeDesc=Enter new width <b>OR</b> new height. Ratio will be kept during resizing...
+NewLength=New width
+NewHeight=New height
+NewSizeAfterCropping=New size after cropping
+DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner)
+CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
+ImageEditor=Image editor
+YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s.
+YouReceiveMailBecauseOfNotification2=This event is the following:
+ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start".
+UseAdvancedPerms=Use the advanced permissions of some modules
+FileFormat=File format
+SelectAColor=Choose a color
+AddFiles=Add Files
+StartUpload=Start upload
+CancelUpload=Cancel upload
+FileIsTooBig=Files is too big
+PleaseBePatient=Please be patient...
+NewPassword=New password
+ResetPassword=Reset password
+RequestToResetPasswordReceived=A request to change your password has been received.
+NewKeyIs=This is your new keys to login
+NewKeyWillBe=Your new key to login to software will be
+ClickHereToGoTo=Click here to go to %s
+YouMustClickToChange=You must however first click on the following link to validate this password change
+ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
+Chart=Chart
+PassEncoding=Password encoding
+PermissionsAdd=Permissions added
+PermissionsDelete=Permissions removed
+YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+YourPasswordHasBeenReset=Your password has been reset successfully
+ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+MissingIds=Missing ids
+ThirdPartyCreatedByEmailCollector=Third party created by email collector from email MSGID %s
+ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s
+ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
+TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
+OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+
+##### Export #####
+ExportsArea=Exports area
+AvailableFormats=Available formats
+LibraryUsed=Library used
+LibraryVersion=Library version
+ExportableDatas=Exportable data
+NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
+##### External sites #####
+WebsiteSetup=Setup of module website
+WEBSITE_PAGEURL=URL of page
+WEBSITE_TITLE=Title
+WEBSITE_DESCRIPTION=Description
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
+WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
+
+MemoryUsage=Memory usage
+RequestDuration=Duration of request
+PopuProp=Products/Services by popularity in Proposals
+PopuCom=Products/Services by popularity in Orders
+ProductStatistics=Products/Services Statistics
+NbOfQtyInOrders=Qty in orders
diff --git a/htdocs/langs/km_KH/paybox.lang b/htdocs/langs/km_KH/paybox.lang
new file mode 100644
index 00000000000..1bbbef4017b
--- /dev/null
+++ b/htdocs/langs/km_KH/paybox.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - paybox
+PayBoxSetup=PayBox module setup
+PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+Creditor=Creditor
+PaymentCode=Payment code
+PayBoxDoPayment=Pay with Paybox
+YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
+Continue=Next
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
+YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/km_KH/paypal.lang b/htdocs/langs/km_KH/paypal.lang
new file mode 100644
index 00000000000..5eb5f389445
--- /dev/null
+++ b/htdocs/langs/km_KH/paypal.lang
@@ -0,0 +1,36 @@
+# Dolibarr language file - Source file is en_US - paypal
+PaypalSetup=PayPal module setup
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
+PAYPAL_API_SANDBOX=Mode test/sandbox
+PAYPAL_API_USER=API username
+PAYPAL_API_PASSWORD=API password
+PAYPAL_API_SIGNATURE=API signature
+PAYPAL_SSLVERSION=Curl SSL Version
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
+PaypalModeIntegral=Integral
+PaypalModeOnlyPaypal=PayPal only
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
+ThisIsTransactionId=This is id of transaction: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
+NewOnlinePaymentReceived=New online payment received
+NewOnlinePaymentFailed=New online payment tried but failed
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
+ReturnURLAfterPayment=Return URL after payment
+ValidationOfOnlinePaymentFailed=Validation of online payment failed
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
+DetailedErrorMessage=Detailed Error Message
+ShortErrorMessage=Short Error Message
+ErrorCode=Error Code
+ErrorSeverityCode=Error Severity Code
+OnlinePaymentSystem=Online payment system
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/km_KH/printing.lang b/htdocs/langs/km_KH/printing.lang
new file mode 100644
index 00000000000..16494583550
--- /dev/null
+++ b/htdocs/langs/km_KH/printing.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - printing
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
+PrintingSetup=Setup of Direct Printing System
+PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer without needing to open the document in another application.
+MenuDirectPrinting=Direct Printing jobs
+DirectPrint=Direct print
+PrintingDriverDesc=Configuration variables for printing driver.
+ListDrivers=List of drivers
+PrintTestDesc=List of Printers.
+FileWasSentToPrinter=File %s was sent to printer
+ViaModule=via the module
+NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
+PleaseSelectaDriverfromList=Please select a driver from list.
+PleaseConfigureDriverfromList=Please configure the selected driver from list.
+SetupDriver=Driver setup
+TargetedPrinter=Targeted printer
+UserConf=Setup per user
+PRINTGCP_INFO=Google OAuth API setup
+PRINTGCP_AUTHLINK=Authentication
+PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
+PrintGCPDesc=This driver allows sending documents directly to a printer using Google Cloud Print.
+GCP_Name=Name
+GCP_displayName=Display Name
+GCP_Id=Printer Id
+GCP_OwnerName=Owner Name
+GCP_State=Printer State
+GCP_connectionStatus=Online State
+GCP_Type=Printer Type
+PrintIPPDesc=This driver allows sending of documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+IPP_Uri=Printer Uri
+IPP_Name=Printer Name
+IPP_State=Printer State
+IPP_State_reason=State reason
+IPP_State_reason1=State reason1
+IPP_BW=BW
+IPP_Color=Color
+IPP_Device=Device
+IPP_Media=Printer media
+IPP_Supported=Type of media
+DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
+GoogleAuthNotConfigured=Google OAuth has not been setup. Enable module OAuth and set a Google ID/Secret.
+GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
+PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
+PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
+PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+PrintTestDescprintipp=List of Printers for Cups.
diff --git a/htdocs/langs/km_KH/productbatch.lang b/htdocs/langs/km_KH/productbatch.lang
new file mode 100644
index 00000000000..54270c4a23b
--- /dev/null
+++ b/htdocs/langs/km_KH/productbatch.lang
@@ -0,0 +1,24 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Use lot/serial number
+ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusNotOnBatch=No (lot/serial not used)
+ProductStatusOnBatchShort=Yes
+ProductStatusNotOnBatchShort=No
+Batch=Lot/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
+batch_number=Lot/Serial number
+BatchNumberShort=Lot/Serial
+EatByDate=Eat-by date
+SellByDate=Sell-by date
+DetailBatchNumber=Lot/Serial details
+printBatch=Lot/Serial: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
+StockDetailPerBatch=Stock detail per lot
diff --git a/htdocs/langs/km_KH/products.lang b/htdocs/langs/km_KH/products.lang
new file mode 100644
index 00000000000..a31243a07b6
--- /dev/null
+++ b/htdocs/langs/km_KH/products.lang
@@ -0,0 +1,385 @@
+# Dolibarr language file - Source file is en_US - products
+ProductRef=Product ref.
+ProductLabel=Product label
+ProductLabelTranslated=Translated product label
+ProductDescription=Product description
+ProductDescriptionTranslated=Translated product description
+ProductNoteTranslated=Translated product note
+ProductServiceCard=Products/Services card
+TMenuProducts=Products
+TMenuServices=Services
+Products=Products
+Services=Services
+Product=Product
+Service=Service
+ProductId=Product/service id
+Create=Create
+Reference=Reference
+NewProduct=New product
+NewService=New service
+ProductVatMassChange=Global VAT Update
+ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
+MassBarcodeInit=Mass barcode init
+MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
+ProductAccountancyBuyCode=Accounting code (purchase)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
+ProductAccountancySellCode=Accounting code (sale)
+ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
+ProductAccountancySellExportCode=Accounting code (sale export)
+ProductOrService=Product or Service
+ProductsAndServices=Products and Services
+ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
+ProductsOnSale=Products for sale
+ProductsOnPurchase=Products for purchase
+ProductsOnSaleOnly=Products for sale only
+ProductsOnPurchaseOnly=Products for purchase only
+ProductsNotOnSell=Products not for sale and not for purchase
+ProductsOnSellAndOnBuy=Products for sale and for purchase
+ServicesOnSale=Services for sale
+ServicesOnPurchase=Services for purchase
+ServicesOnSaleOnly=Services for sale only
+ServicesOnPurchaseOnly=Services for purchase only
+ServicesNotOnSell=Services not for sale and not for purchase
+ServicesOnSellAndOnBuy=Services for sale and for purchase
+LastModifiedProductsAndServices=Last %s modified products/services
+LastRecordedProducts=Latest %s recorded products
+LastRecordedServices=Latest %s recorded services
+CardProduct0=Product
+CardProduct1=Service
+Stock=Stock
+MenuStocks=Stocks
+Stocks=Stocks and location (warehouse) of products
+Movements=Movements
+Sell=Sell
+Buy=Purchase
+OnSell=For sale
+OnBuy=For purchase
+NotOnSell=Not for sale
+ProductStatusOnSell=For sale
+ProductStatusNotOnSell=Not for sale
+ProductStatusOnSellShort=For sale
+ProductStatusNotOnSellShort=Not for sale
+ProductStatusOnBuy=For purchase
+ProductStatusNotOnBuy=Not for purchase
+ProductStatusOnBuyShort=For purchase
+ProductStatusNotOnBuyShort=Not for purchase
+UpdateVAT=Update vat
+UpdateDefaultPrice=Update default price
+UpdateLevelPrices=Update prices for each level
+AppliedPricesFrom=Applied from
+SellingPrice=Selling price
+SellingPriceHT=Selling price (excl. tax)
+SellingPriceTTC=Selling price (inc. tax)
+SellingMinPriceTTC=Minimum Selling price (inc. tax)
+CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceUsage=This value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
+NewPrice=New price
+MinPrice=Min. sell price
+EditSellingPriceLabel=Edit selling price label
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
+ContractStatusClosed=Closed
+ErrorProductAlreadyExists=A product with reference %s already exists.
+ErrorProductBadRefOrLabel=Wrong value for reference or label.
+ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
+Suppliers=Vendors
+SupplierRef=Vendor SKU
+ShowProduct=Show product
+ShowService=Show service
+ProductsAndServicesArea=Product and Services area
+ProductsArea=Product area
+ServicesArea=Services area
+ListOfStockMovements=List of stock movements
+BuyingPrice=Buying price
+PriceForEachProduct=Products with specific prices
+SupplierCard=Vendor card
+PriceRemoved=Price removed
+BarCode=Barcode
+BarcodeType=Barcode type
+SetDefaultBarcodeType=Set barcode type
+BarcodeValue=Barcode value
+NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
+ServiceLimitedDuration=If product is a service with limited duration:
+MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
+MultiPricesNumPrices=Number of prices
+AssociatedProductsAbility=Activate virtual products (kits)
+AssociatedProducts=Virtual products
+AssociatedProductsNumber=Number of products composing this virtual product
+ParentProductsNumber=Number of parent packaging product
+ParentProducts=Parent products
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+KeywordFilter=Keyword filter
+CategoryFilter=Category filter
+ProductToAddSearch=Search product to add
+NoMatchFound=No match found
+ListOfProductsServices=List of products/services
+ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
+ProductParentList=List of virtual products/services with this product as a component
+ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
+DeleteProduct=Delete a product/service
+ConfirmDeleteProduct=Are you sure you want to delete this product/service?
+ProductDeleted=Product/Service "%s" deleted from database.
+ExportDataset_produit_1=Products
+ExportDataset_service_1=Services
+ImportDataset_produit_1=Products
+ImportDataset_service_1=Services
+DeleteProductLine=Delete product line
+ConfirmDeleteProductLine=Are you sure you want to delete this product line?
+ProductSpecial=Special
+QtyMin=Min. purchase quantity
+PriceQtyMin=Price quantity min.
+PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
+VATRateForSupplierProduct=VAT Rate (for this vendor/product)
+DiscountQtyMin=Discount for this qty.
+NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
+NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedProductsToSell=Predefined Product
+PredefinedServicesToSell=Predefined Service
+PredefinedProductsAndServicesToSell=Predefined products/services to sell
+PredefinedProductsToPurchase=Predefined product to purchase
+PredefinedServicesToPurchase=Predefined services to purchase
+PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
+NotPredefinedProducts=Not predefined products/services
+GenerateThumb=Generate thumb
+ServiceNb=Service #%s
+ListProductServiceByPopularity=List of products/services by popularity
+ListProductByPopularity=List of products by popularity
+ListServiceByPopularity=List of services by popularity
+Finished=Manufactured product
+RowMaterial=Raw Material
+ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
+CloneContentProduct=Clone all main information of product/service
+ClonePricesProduct=Clone prices
+CloneCategoriesProduct=Clone tags/categories linked
+CloneCompositionProduct=Clone virtual product/service
+CloneCombinationsProduct=Clone product variants
+ProductIsUsed=This product is used
+NewRefForClone=Ref. of new product/service
+SellingPrices=Selling prices
+BuyingPrices=Buying prices
+CustomerPrices=Customer prices
+SuppliersPrices=Vendor prices
+SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
+CustomCode=Customs / Commodity / HS code
+CountryOrigin=Origin country
+Nature=Nature of product (material/finished)
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+lm=lm
+m2=m²
+m3=m³
+liter=liter
+l=L
+unitP=Piece
+unitSET=Set
+unitS=Second
+unitH=Hour
+unitD=Day
+unitG=Gram
+unitM=Meter
+unitLM=Linear meter
+unitM2=Square meter
+unitM3=Cubic meter
+unitL=Liter
+unitT=ton
+unitKG=kg
+unitG=Gram
+unitMG=mg
+unitLB=pound
+unitOZ=ounce
+unitM=Meter
+unitDM=dm
+unitCM=cm
+unitMM=mm
+unitFT=ft
+unitIN=in
+unitM2=Square meter
+unitDM2=dm²
+unitCM2=cm²
+unitMM2=mm²
+unitFT2=ft²
+unitIN2=in²
+unitM3=Cubic meter
+unitDM3=dm³
+unitCM3=cm³
+unitMM3=mm³
+unitFT3=ft³
+unitIN3=in³
+unitOZ3=ounce
+unitgallon=gallon
+ProductCodeModel=Product ref template
+ServiceCodeModel=Service ref template
+CurrentProductPrice=Current price
+AlwaysUseNewPrice=Always use current price of product/service
+AlwaysUseFixedPrice=Use the fixed price
+PriceByQuantity=Different prices by quantity
+DisablePriceByQty=Disable prices by quantity
+PriceByQuantityRange=Quantity range
+MultipriceRules=Price segment rules
+UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
+PercentVariationOver=%% variation over %s
+PercentDiscountOver=%% discount over %s
+KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
+VariantRefExample=Examples: COL, SIZE
+VariantLabelExample=Examples: Color, Size
+### composition fabrication
+Build=Produce
+ProductsMultiPrice=Products and prices for each price segment
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
+ProductSellByQuarterHT=Products turnover quarterly before tax
+ServiceSellByQuarterHT=Services turnover quarterly before tax
+Quarter1=1st. Quarter
+Quarter2=2nd. Quarter
+Quarter3=3rd. Quarter
+Quarter4=4th. Quarter
+BarCodePrintsheet=Print barcode
+PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
+NumberOfStickers=Number of stickers to print on page
+PrintsheetForOneBarCode=Print several stickers for one barcode
+BuildPageToPrint=Generate page to print
+FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
+FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
+DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
+BarCodeDataForProduct=Barcode information of product %s:
+BarCodeDataForThirdparty=Barcode information of third party %s:
+ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
+PriceByCustomer=Different prices for each customer
+PriceCatalogue=A single sell price per product/service
+PricingRule=Rules for selling prices
+AddCustomerPrice=Add price by customer
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+PriceByCustomerLog=Log of previous customer prices
+MinimumPriceLimit=Minimum price can't be lower then %s
+MinimumRecommendedPrice=Minimum recommended price is: %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
+PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=Available global values:
+PriceMode=Price mode
+PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Child products
+MinSupplierPrice=Minimum buying price
+MinCustomerPrice=Minimum selling price
+DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
+AddVariable=Add Variable
+AddUpdater=Add Updater
+GlobalVariables=Global variables
+VariableToUpdate=Variable to update
+GlobalVariableUpdaters=External updaters for variables
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Latest update
+CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product/service with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
+WarningSelectOneDocument=Please select at least one document
+DefaultUnitToShow=Unit
+NbOfQtyInProposals=Qty in proposals
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+ProductsOrServicesTranslations=Products/Services translations
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+WidthUnits=Width unit
+LengthUnits=Length unit
+HeightUnits=Height unit
+SurfaceUnits=Surface unit
+SizeUnits=Size unit
+DeleteProductBuyPrice=Delete buying price
+ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
+ProductSheet=Product sheet
+ServiceSheet=Service sheet
+PossibleValues=Possible values
+GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
+ProductSupplierDescription=Vendor description for the product
+UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
+PackagingForThisProduct=Packaging
+QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+
+#Attributes
+VariantAttributes=Variant attributes
+ProductAttributes=Variant attributes for products
+ProductAttributeName=Variant attribute %s
+ProductAttribute=Variant attribute
+ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
+ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
+ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
+ProductCombinations=Variants
+PropagateVariant=Propagate variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+NewProductCombinations=New variants
+EditProductCombinations=Editing variants
+SelectCombination=Select combination
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+NewProductAttributeValue=New attribute value
+ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
+ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
+TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
+DoNotRemovePreviousCombinations=Do not remove previous variants
+UsePercentageVariations=Use percentage variations
+PercentageVariation=Percentage variation
+ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
+NbOfDifferentValues=No. of different values
+NbProducts=Number of products
+ParentProduct=Parent product
+HideChildProducts=Hide variant products
+ShowChildProducts=Show variant products
+NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
+ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
+CloneDestinationReference=Destination product reference
+ErrorCopyProductCombinations=There was an error while copying the product variants
+ErrorDestinationProductNotFound=Destination product not found
+ErrorProductCombinationNotFound=Product variant not found
+ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
+ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
+DeleteLinkedProduct=Delete the child product linked to the combination
diff --git a/htdocs/langs/km_KH/projects.lang b/htdocs/langs/km_KH/projects.lang
new file mode 100644
index 00000000000..bb42bff3c87
--- /dev/null
+++ b/htdocs/langs/km_KH/projects.lang
@@ -0,0 +1,267 @@
+# Dolibarr language file - Source file is en_US - projects
+RefProject=Ref. project
+ProjectRef=Project ref.
+ProjectId=Project Id
+ProjectLabel=Project label
+ProjectsArea=Projects Area
+ProjectStatus=Project status
+SharedProject=Everybody
+PrivateProject=Project contacts
+ProjectsImContactFor=Projects for I am explicitly a contact
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=All projects
+MyProjectsDesc=This view is limited to projects you are a contact for
+ProjectsPublicDesc=This view presents all projects you are allowed to read.
+TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
+TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
+ClosedProjectsAreHidden=Closed projects are not visible.
+TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
+TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
+NewProject=New project
+AddProject=Create project
+DeleteAProject=Delete a project
+DeleteATask=Delete a task
+ConfirmDeleteAProject=Are you sure you want to delete this project?
+ConfirmDeleteATask=Are you sure you want to delete this task?
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
+OpportunitiesStatusForProjects=Leads amount of projects by status
+ShowProject=Show project
+ShowTask=Show task
+SetProject=Set project
+NoProject=No project defined or owned
+NbOfProjects=Number of projects
+NbOfTasks=Number of tasks
+TimeSpent=Time spent
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
+TimesSpent=Time spent
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
+TaskTimeSpent=Time spent on tasks
+TaskTimeUser=User
+TaskTimeNote=Note
+TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on open projects
+WorkloadNotDefined=Workload not defined
+NewTimeSpent=Time spent
+MyTimeSpent=My time spent
+BillTime=Bill the time spent
+BillTimeShort=Bill time
+TimeToBill=Time not billed
+TimeBilled=Time billed
+Tasks=Tasks
+Task=Task
+TaskDateStart=Task start date
+TaskDateEnd=Task end date
+TaskDescription=Task description
+NewTask=New task
+AddTask=Create task
+AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
+AddHereTimeSpentForWeek=Add here time spent for this week/task
+Activity=Activity
+Activities=Tasks/activities
+MyActivities=My tasks/activities
+MyProjects=My projects
+MyProjectsArea=My projects Area
+DurationEffective=Effective duration
+ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently open tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
+ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
+Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GanttView=Gantt View
+ListProposalsAssociatedProject=List of the commercial proposals related to the project
+ListOrdersAssociatedProject=List of sales orders related to the project
+ListInvoicesAssociatedProject=List of customer invoices related to the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
+ListSupplierOrdersAssociatedProject=List of purchase orders related to the project
+ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project
+ListContractAssociatedProject=List of contracts related to the project
+ListShippingAssociatedProject=List of shippings related to the project
+ListFichinterAssociatedProject=List of interventions related to the project
+ListExpenseReportsAssociatedProject=List of expense reports related to the project
+ListDonationsAssociatedProject=List of donations related to the project
+ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
+ListSalariesAssociatedProject=List of payments of salaries related to the project
+ListActionsAssociatedProject=List of events related to the project
+ListMOAssociatedProject=List of manufacturing orders related to the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
+ActivityOnProjectToday=Activity on project today
+ActivityOnProjectYesterday=Activity on project yesterday
+ActivityOnProjectThisWeek=Activity on project this week
+ActivityOnProjectThisMonth=Activity on project this month
+ActivityOnProjectThisYear=Activity on project this year
+ChildOfProjectTask=Child of project/task
+ChildOfTask=Child of task
+TaskHasChild=Task has child
+NotOwnerOfProject=Not owner of this private project
+AffectedTo=Allocated to
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
+ValidateProject=Validate projet
+ConfirmValidateProject=Are you sure you want to validate this project?
+CloseAProject=Close project
+ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+ReOpenAProject=Open project
+ConfirmReOpenAProject=Are you sure you want to re-open this project?
+ProjectContact=Contacts of project
+TaskContact=Task contacts
+ActionsOnProject=Events on project
+YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
+DeleteATimeSpent=Delete time spent
+ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
+TaskRessourceLinks=Contacts of task
+ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
+NoTasks=No tasks for this project
+LinkedToAnotherCompany=Linked to other third party
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
+ErrorTimeSpentIsEmpty=Time spent is empty
+ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
+IfNeedToUseOtherObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
+CloneTasks=Clone tasks
+CloneContacts=Clone contacts
+CloneNotes=Clone notes
+CloneProjectFiles=Clone project joined files
+CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
+CloneMoveDate=Update project/tasks dates from now?
+ConfirmCloneProject=Are you sure to clone this project?
+ProjectReportDate=Change task dates according to new project start date
+ErrorShiftTaskDate=Impossible to shift task date according to new project start date
+ProjectsAndTasksLines=Projects and tasks
+ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
+ProjectModifiedInDolibarr=Project %s modified
+TaskCreatedInDolibarr=Task %s created
+TaskModifiedInDolibarr=Task %s modified
+TaskDeletedInDolibarr=Task %s deleted
+OpportunityStatus=Lead status
+OpportunityStatusShort=Lead status
+OpportunityProbability=Lead probability
+OpportunityProbabilityShort=Lead probab.
+OpportunityAmount=Lead amount
+OpportunityAmountShort=Lead amount
+OpportunityWeightedAmount=Opportunity weighted amount
+OpportunityWeightedAmountShort=Opp. weighted amount
+OpportunityAmountAverageShort=Average lead amount
+OpportunityAmountWeigthedShort=Weighted lead amount
+WonLostExcluded=Won/Lost excluded
+##### Types de contacts #####
+TypeContact_project_internal_PROJECTLEADER=Project leader
+TypeContact_project_external_PROJECTLEADER=Project leader
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_task_internal_TASKEXECUTIVE=Task executive
+TypeContact_project_task_external_TASKEXECUTIVE=Task executive
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
+TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
+SelectElement=Select element
+AddElement=Link to element
+# Documents models
+DocumentModelBeluga=Project document template for linked objects overview
+DocumentModelBaleine=Project document template for tasks
+DocumentModelTimeSpent=Project report template for time spent
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+ProjectReferers=Related items
+ProjectMustBeValidatedFirst=Project must be validated first
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerMonth=Input per month
+InputDetail=Input detail
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTheTask=Not assigned to the task
+NoUserAssignedToTheProject=No users assigned to this project
+TimeSpentBy=Time spent by
+TasksAssignedTo=Tasks assigned to
+AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
+AssignTask=Assign
+ProjectOverview=Overview
+ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
+ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
+ProjectNbProjectByMonth=No. of created projects by month
+ProjectNbTaskByMonth=No. of created tasks by month
+ProjectOppAmountOfProjectsByMonth=Amount of leads by month
+ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
+ProjectOpenedProjectByOppStatus=Open project/lead by lead status
+ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
+TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
+IdTaskTime=Id task time
+YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
+OpenedProjectsByThirdparties=Open projects by third parties
+OnlyOpportunitiesShort=Only leads
+OpenedOpportunitiesShort=Open leads
+NotOpenedOpportunitiesShort=Not an open lead
+NotAnOpportunityShort=Not a lead
+OpportunityTotalAmount=Total amount of leads
+OpportunityPonderatedAmount=Weighted amount of leads
+OpportunityPonderatedAmountDesc=Leads amount weighted with probability
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWON=Won
+OppStatusLOST=Lost
+Budget=Budget
+AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
+LatestProjects=Latest %s projects
+LatestModifiedProjects=Latest %s modified projects
+OtherFilteredTasks=Other filtered tasks
+NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
+ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+# Comments trans
+AllowCommentOnTask=Allow user comments on tasks
+AllowCommentOnProject=Allow user comments on projects
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=Information project %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
+NewTaskRefSuggested=Task ref already used, a new task ref is required
+TimeSpentInvoiced=Time spent billed
+TimeSpentForInvoice=Time spent
+OneLinePerUser=One line per user
+ServiceToUseOnLines=Service to use on lines
+InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
+ProjectFollowOpportunity=Follow opportunity
+ProjectFollowTasks=Follow tasks or time spent
+Usage=Usage
+UsageOpportunity=Usage: Opportunity
+UsageTasks=Usage: Tasks
+UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=New invoice
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/km_KH/propal.lang b/htdocs/langs/km_KH/propal.lang
new file mode 100644
index 00000000000..71d6857c909
--- /dev/null
+++ b/htdocs/langs/km_KH/propal.lang
@@ -0,0 +1,86 @@
+# Dolibarr language file - Source file is en_US - propal
+Proposals=Commercial proposals
+Proposal=Commercial proposal
+ProposalShort=Proposal
+ProposalsDraft=Draft commercial proposals
+ProposalsOpened=Open commercial proposals
+CommercialProposal=Commercial proposal
+PdfCommercialProposalTitle=Commercial proposal
+ProposalCard=Proposal card
+NewProp=New commercial proposal
+NewPropal=New proposal
+Prospect=Prospect
+DeleteProp=Delete commercial proposal
+ValidateProp=Validate commercial proposal
+AddProp=Create proposal
+ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
+ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
+LastPropals=Latest %s proposals
+LastModifiedProposals=Latest %s modified proposals
+AllPropals=All proposals
+SearchAProposal=Search a proposal
+NoProposal=No proposal
+ProposalsStatistics=Commercial proposal's statistics
+NumberOfProposalsByMonth=Number by month
+AmountOfProposalsByMonthHT=Amount by month (excl. tax)
+NbOfProposals=Number of commercial proposals
+ShowPropal=Show proposal
+PropalsDraft=Drafts
+PropalsOpened=Open
+PropalStatusDraft=Draft (needs to be validated)
+PropalStatusValidated=Validated (proposal is open)
+PropalStatusSigned=Signed (needs billing)
+PropalStatusNotSigned=Not signed (closed)
+PropalStatusBilled=Billed
+PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated (open)
+PropalStatusClosedShort=Closed
+PropalStatusSignedShort=Signed
+PropalStatusNotSignedShort=Not signed
+PropalStatusBilledShort=Billed
+PropalsToClose=Commercial proposals to close
+PropalsToBill=Signed commercial proposals to bill
+ListOfProposals=List of commercial proposals
+ActionsOnPropal=Events on proposal
+RefProposal=Commercial proposal ref
+SendPropalByMail=Send commercial proposal by mail
+DatePropal=Date of proposal
+DateEndPropal=Validity ending date
+ValidityDuration=Validity duration
+CloseAs=Set status to
+SetAcceptedRefused=Set accepted/refused
+ErrorPropalNotFound=Propal %s not found
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
+CopyPropalFrom=Create commercial proposal by copying existing proposal
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
+DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
+ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
+ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
+ProposalsAndProposalsLines=Commercial proposal and lines
+ProposalLine=Proposal line
+AvailabilityPeriod=Availability delay
+SetAvailability=Set availability delay
+AfterOrder=after order
+OtherProposals=Other proposals
+##### Availability #####
+AvailabilityTypeAV_NOW=Immediate
+AvailabilityTypeAV_1W=1 week
+AvailabilityTypeAV_2W=2 weeks
+AvailabilityTypeAV_3W=3 weeks
+AvailabilityTypeAV_1M=1 month
+##### Types de contacts #####
+TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
+TypeContact_propal_external_BILLING=Customer invoice contact
+TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
+TypeContact_propal_external_SHIPPING=Customer contact for delivery
+# Document models
+DocModelAzurDescription=A complete proposal model (old implementation of Cyan template)
+DocModelCyanDescription=A complete proposal model
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
+ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/km_KH/receiptprinter.lang b/htdocs/langs/km_KH/receiptprinter.lang
new file mode 100644
index 00000000000..896eaa313dd
--- /dev/null
+++ b/htdocs/langs/km_KH/receiptprinter.lang
@@ -0,0 +1,95 @@
+# Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
+PrinterAdded=Printer %s added
+PrinterUpdated=Printer %s updated
+PrinterDeleted=Printer %s deleted
+TestSentToPrinter=Test Sent To Printer %s
+ReceiptPrinter=Receipt printers
+ReceiptPrinterDesc=Setup of receipt printers
+ReceiptPrinterTemplateDesc=Setup of Templates
+ReceiptPrinterTypeDesc=Description of Receipt Printer's type
+ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
+ListPrinters=List of Printers
+SetupReceiptTemplate=Template Setup
+CONNECTOR_DUMMY=Dummy Printer
+CONNECTOR_NETWORK_PRINT=Network Printer
+CONNECTOR_FILE_PRINT=Local Printer
+CONNECTOR_WINDOWS_PRINT=Local Windows Printer
+CONNECTOR_CUPS_PRINT=Cups Printer
+CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
+CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
+CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
+CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
+PROFILE_DEFAULT=Default Profile
+PROFILE_SIMPLE=Simple Profile
+PROFILE_EPOSTEP=Epos Tep Profile
+PROFILE_P822D=P822D Profile
+PROFILE_STAR=Star Profile
+PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
+PROFILE_SIMPLE_HELP=Simple Profile No Graphics
+PROFILE_EPOSTEP_HELP=Epos Tep Profile
+PROFILE_P822D_HELP=P822D Profile No Graphics
+PROFILE_STAR_HELP=Star Profile
+DOL_LINE_FEED=Skip line
+DOL_ALIGN_LEFT=Left align text
+DOL_ALIGN_CENTER=Center text
+DOL_ALIGN_RIGHT=Right align text
+DOL_USE_FONT_A=Use font A of printer
+DOL_USE_FONT_B=Use font B of printer
+DOL_USE_FONT_C=Use font C of printer
+DOL_PRINT_BARCODE=Print barcode
+DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
+DOL_CUT_PAPER_FULL=Cut ticket completely
+DOL_CUT_PAPER_PARTIAL=Cut ticket partially
+DOL_OPEN_DRAWER=Open cash drawer
+DOL_ACTIVATE_BUZZER=Activate buzzer
+DOL_PRINT_QRCODE=Print QR Code
+DOL_PRINT_LOGO=Print logo of my company
+DOL_PRINT_LOGO_OLD=Print logo of my company (old printers)
+DOL_BOLD=Bold
+DOL_BOLD_DISABLED=Disable bold
+DOL_DOUBLE_HEIGHT=Double height size
+DOL_DOUBLE_WIDTH=Double width size
+DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
+DOL_UNDERLINE=Enable underline
+DOL_UNDERLINE_DISABLED=Disable underline
+DOL_BEEP=Beed sound
+DOL_PRINT_TEXT=Print text
+DOL_VALUE_DATE=Invoice date
+DOL_VALUE_DATE_TIME=Invoice date and time
+DOL_VALUE_YEAR=Invoice year
+DOL_VALUE_MONTH_LETTERS=Invoice month in letters
+DOL_VALUE_MONTH=Invoice month
+DOL_VALUE_DAY=Invoice day
+DOL_VALUE_DAY_LETTERS=Inovice day in letters
+DOL_LINE_FEED_REVERSE=Line feed reverse
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Invoice ref
+DOL_PRINT_OBJECT_LINES=Invoice lines
+DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
+DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
+DOL_VALUE_CUSTOMER_MAIL=Customer mail
+DOL_VALUE_CUSTOMER_PHONE=Customer phone
+DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
+DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
+DOL_VALUE_MYSOC_NAME=Your company name
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/km_KH/resource.lang b/htdocs/langs/km_KH/resource.lang
new file mode 100644
index 00000000000..e8574dc680f
--- /dev/null
+++ b/htdocs/langs/km_KH/resource.lang
@@ -0,0 +1,39 @@
+# Dolibarr language file - Source file is en_US - resource
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+ActionsOnResource=Events about this resource
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResource=Show resource
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+SelectResource=Select resource
+
+IdResource=Id resource
+AssetNumber=Serial number
+ResourceTypeCode=Resource type code
+ImportDataset_resource_1=Resources
+
+ErrorResourcesAlreadyInUse=Some resources are in use
+ErrorResourceUseInEvent=%s used in %s event
diff --git a/htdocs/langs/km_KH/salaries.lang b/htdocs/langs/km_KH/salaries.lang
new file mode 100644
index 00000000000..7c3c08a65bd
--- /dev/null
+++ b/htdocs/langs/km_KH/salaries.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+Salary=Salary
+Salaries=Salaries
+NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
+SalaryPayment=Salary payment
+SalariesPayments=Salaries payments
+ShowSalaryPayment=Show salary payment
+THM=Average hourly rate
+TJM=Average daily rate
+CurrentSalary=Current salary
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/km_KH/sendings.lang b/htdocs/langs/km_KH/sendings.lang
new file mode 100644
index 00000000000..5ce3b7f67e9
--- /dev/null
+++ b/htdocs/langs/km_KH/sendings.lang
@@ -0,0 +1,74 @@
+# Dolibarr language file - Source file is en_US - sendings
+RefSending=Ref. shipment
+Sending=Shipment
+Sendings=Shipments
+AllSendings=All Shipments
+Shipment=Shipment
+Shipments=Shipments
+ShowSending=Show Shipments
+Receivings=Delivery Receipts
+SendingsArea=Shipments area
+ListOfSendings=List of shipments
+SendingMethod=Shipping method
+LastSendings=Latest %s shipments
+StatisticsOfSendings=Statistics for shipments
+NbOfSendings=Number of shipments
+NumberOfShipmentsByMonth=Number of shipments by month
+SendingCard=Shipment card
+NewSending=New shipment
+CreateShipment=Create shipment
+QtyShipped=Qty shipped
+QtyShippedShort=Qty ship.
+QtyPreparedOrShipped=Qty prepared or shipped
+QtyToShip=Qty to ship
+QtyToReceive=Qty to receive
+QtyReceived=Qty received
+QtyInOtherShipments=Qty in other shipments
+KeepToShip=Remain to ship
+KeepToShipShort=Remain
+OtherSendingsForSameOrder=Other shipments for this order
+SendingsAndReceivingForSameOrder=Shipments and receipts for this order
+SendingsToValidate=Shipments to validate
+StatusSendingCanceled=Canceled
+StatusSendingDraft=Draft
+StatusSendingValidated=Validated (products to ship or already shipped)
+StatusSendingProcessed=Processed
+StatusSendingDraftShort=Draft
+StatusSendingValidatedShort=Validated
+StatusSendingProcessedShort=Processed
+SendingSheet=Shipment sheet
+ConfirmDeleteSending=Are you sure you want to delete this shipment?
+ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
+ConfirmCancelSending=Are you sure you want to cancel this shipment?
+DocumentModelMerou=Merou A5 model
+WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+DateDeliveryPlanned=Planned date of delivery
+RefDeliveryReceipt=Ref delivery receipt
+StatusReceipt=Status delivery receipt
+DateReceived=Date delivery received
+ClassifyReception=Classify reception
+SendShippingByEMail=Send shipment by email
+SendShippingRef=Submission of shipment %s
+ActionsOnShipping=Events on shipment
+LinkToTrackYourPackage=Link to track your package
+ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
+ShipmentLine=Shipment line
+ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
+ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
+ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
+NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+
+# Sending methods
+# ModelDocument
+DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty: %d)
diff --git a/htdocs/langs/km_KH/sms.lang b/htdocs/langs/km_KH/sms.lang
new file mode 100644
index 00000000000..055085eb16a
--- /dev/null
+++ b/htdocs/langs/km_KH/sms.lang
@@ -0,0 +1,51 @@
+# Dolibarr language file - Source file is en_US - sms
+Sms=Sms
+SmsSetup=SMS setup
+SmsDesc=This page allows you to define global options on SMS features
+SmsCard=SMS Card
+AllSms=All SMS campaigns
+SmsTargets=Targets
+SmsRecipients=Targets
+SmsRecipient=Target
+SmsTitle=Description
+SmsFrom=Sender
+SmsTo=Target
+SmsTopic=Topic of SMS
+SmsText=Message
+SmsMessage=SMS Message
+ShowSms=Show SMS
+ListOfSms=List SMS campaigns
+NewSms=New SMS campaign
+EditSms=Edit SMS
+ResetSms=New sending
+DeleteSms=Delete SMS campaign
+DeleteASms=Remove a SMS campaign
+PreviewSms=Previuw SMS
+PrepareSms=Prepare SMS
+CreateSms=Create SMS
+SmsResult=Result of SMS sending
+TestSms=Test SMS
+ValidSms=Validate SMS
+ApproveSms=Approve SMS
+SmsStatusDraft=Draft
+SmsStatusValidated=Validated
+SmsStatusApproved=Approved
+SmsStatusSent=Sent
+SmsStatusSentPartialy=Sent partially
+SmsStatusSentCompletely=Sent completely
+SmsStatusError=Error
+SmsStatusNotSent=Not sent
+SmsSuccessfulySent=SMS correctly sent (from %s to %s)
+ErrorSmsRecipientIsEmpty=Number of target is empty
+WarningNoSmsAdded=No new phone number to add to target list
+ConfirmValidSms=Do you confirm validation of this campaign?
+NbOfUniqueSms=No. of unique phone numbers
+NbOfSms=No. of phone numbers
+ThisIsATestMessage=This is a test message
+SendSms=Send SMS
+SmsInfoCharRemain=No. of remaining characters
+SmsInfoNumero= (international format i.e.: +33899701761)
+DelayBeforeSending=Delay before sending (minutes)
+SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
+SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider.
+DisableStopIfSupported=Disable STOP message (if supported)
diff --git a/htdocs/langs/km_KH/stocks.lang b/htdocs/langs/km_KH/stocks.lang
new file mode 100644
index 00000000000..9856649b834
--- /dev/null
+++ b/htdocs/langs/km_KH/stocks.lang
@@ -0,0 +1,220 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseCard=Warehouse card
+Warehouse=Warehouse
+Warehouses=Warehouses
+ParentWarehouse=Parent warehouse
+NewWarehouse=New warehouse / Stock Location
+WarehouseEdit=Modify warehouse
+MenuNewWarehouse=New warehouse
+WarehouseSource=Source warehouse
+WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
+AddOne=Add one
+DefaultWarehouse=Default warehouse
+WarehouseTarget=Target warehouse
+ValidateSending=Delete sending
+CancelSending=Cancel sending
+DeleteSending=Delete sending
+Stock=Stock
+Stocks=Stocks
+StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
+Movements=Movements
+ErrorWarehouseRefRequired=Warehouse reference name is required
+ListOfWarehouses=List of warehouses
+ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
+MovementId=Movement ID
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
+StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
+Location=Location
+LocationSummary=Short name location
+NumberOfDifferentProducts=Number of different products
+NumberOfProducts=Total number of products
+LastMovement=Latest movement
+LastMovements=Latest movements
+Units=Units
+Unit=Unit
+StockCorrection=Stock correction
+CorrectStock=Correct stock
+StockTransfer=Stock transfer
+TransferStock=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
+NumberOfUnit=Number of units
+UnitPurchaseValue=Unit purchase price
+StockTooLow=Stock too low
+StockLowerThanLimit=Stock lower than alert limit (%s)
+EnhancedValue=Value
+PMPValue=Weighted average price
+PMPValueShort=WAP
+EnhancedValueOfWarehouses=Warehouses value
+UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
+QtyDispatched=Quantity dispatched
+QtyDispatchedShort=Qty dispatched
+QtyToDispatchShort=Qty to dispatch
+OrderDispatch=Item receipts
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
+DeStockOnShipment=Decrease real stocks on shipping validation
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
+OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
+StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
+NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
+DispatchVerb=Dispatch
+StockLimitShort=Limit for alert
+StockLimit=Stock limit for alert
+StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+PhysicalStock=Physical Stock
+RealStock=Real Stock
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
+VirtualStock=Virtual stock
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+IdWarehouse=Id warehouse
+DescWareHouse=Description warehouse
+LieuWareHouse=Localisation warehouse
+WarehousesAndProducts=Warehouses and products
+WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
+AverageUnitPricePMPShort=Weighted average input price
+AverageUnitPricePMP=Weighted average input price
+SellPriceMin=Selling Unit Price
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
+EstimatedStockValueShort=Input stock value
+EstimatedStockValue=Input stock value
+DeleteAWarehouse=Delete a warehouse
+ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
+PersonalStock=Personal stock %s
+ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
+SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
+SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
+NoStockAction=No stock action
+DesiredStock=Desired Stock
+DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
+StockToBuy=To order
+Replenishment=Replenishment
+ReplenishmentOrders=Replenishment orders
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
+UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+UseVirtualStock=Use virtual stock
+UsePhysicalStock=Use physical stock
+CurentSelectionMode=Current selection mode
+CurentlyUsingVirtualStock=Virtual stock
+CurentlyUsingPhysicalStock=Physical stock
+RuleForStockReplenishment=Rule for stocks replenishment
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
+AlertOnly= Alerts only
+WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
+WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
+ForThisWarehouse=For this warehouse
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+Replenishments=Replenishments
+NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
+NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
+MassMovement=Mass movement
+SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+RecordMovement=Record transfer
+ReceivingForSameOrder=Receipts for this order
+StockMovementRecorded=Stock movements recorded
+RuleForStockAvailability=Rules on stock requirements
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
+MovementLabel=Label of movement
+TypeMovement=Type of movement
+DateMovement=Date of movement
+InventoryCode=Movement or inventory code
+IsInPackage=Contained into package
+WarehouseAllowNegativeTransfer=Stock can be negative
+qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
+ShowWarehouse=Show warehouse
+MovementCorrectStock=Stock correction for product %s
+MovementTransferStock=Stock transfer of product %s into another warehouse
+InventoryCodeShort=Inv./Mov. code
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
+ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
+OpenAll=Open for all actions
+OpenInternal=Open only for internal actions
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
+OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
+ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
+ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
+ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
+AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
+AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+InventoryDate=Inventory date
+NewInventory=New inventory
+inventorySetup = Inventory Setup
+inventoryCreatePermission=Create new inventory
+inventoryReadPermission=View inventories
+inventoryWritePermission=Update inventories
+inventoryValidatePermission=Validate inventory
+inventoryTitle=Inventory
+inventoryListTitle=Inventories
+inventoryListEmpty=No inventory in progress
+inventoryCreateDelete=Create/Delete inventory
+inventoryCreate=Create new
+inventoryEdit=Edit
+inventoryValidate=Validated
+inventoryDraft=Running
+inventorySelectWarehouse=Warehouse choice
+inventoryConfirmCreate=Create
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
+inventoryMvtStock=By inventory
+inventoryWarningProductAlreadyExists=This product is already into list
+SelectCategory=Category filter
+SelectFournisseur=Vendor filter
+inventoryOnDate=Inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
+inventoryChangePMPPermission=Allow to change PMP value for a product
+ColumnNewPMP=New unit PMP
+OnlyProdsInStock=Do not add product without stock
+TheoricalQty=Theorique qty
+TheoricalValue=Theorique qty
+LastPA=Last BP
+CurrentPA=Curent BP
+RecordedQty=Recorded Qty
+RealQty=Real Qty
+RealValue=Real Value
+RegulatedQty=Regulated Qty
+AddInventoryProduct=Add product to inventory
+AddProduct=Add
+ApplyPMP=Apply PMP
+FlushInventory=Flush inventory
+ConfirmFlushInventory=Do you confirm this action?
+InventoryFlushed=Inventory flushed
+ExitEditMode=Exit edition
+inventoryDeleteLine=Delete line
+RegulateStock=Regulate Stock
+ListInventory=List
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
+ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
+InventoryForASpecificWarehouse=Inventory for a specific warehouse
+InventoryForASpecificProduct=Inventory for a specific product
+StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
+ForceTo=Force to
diff --git a/htdocs/langs/km_KH/stripe.lang b/htdocs/langs/km_KH/stripe.lang
new file mode 100644
index 00000000000..844762040af
--- /dev/null
+++ b/htdocs/langs/km_KH/stripe.lang
@@ -0,0 +1,72 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Stripe module setup
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
+StripeOrCBDoPayment=Pay with credit card or Stripe
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+Creditor=Creditor
+PaymentCode=Payment code
+StripeDoPayment=Pay with Stripe
+YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+Continue=Next
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment page for a sales order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment page for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.<br>For the URL of payments with no existing object, you may also add the parameter <strong>&noidempotency=1</strong> so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter)
+SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+NewStripePaymentReceived=New Stripe payment received
+NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
+STRIPE_TEST_SECRET_KEY=Secret test key
+STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
+STRIPE_LIVE_SECRET_KEY=Secret live key
+STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
+StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
+StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
+StripePayoutList=List of Stripe payouts
+ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
+ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
+PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
+ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
diff --git a/htdocs/langs/km_KH/supplier_proposal.lang b/htdocs/langs/km_KH/supplier_proposal.lang
new file mode 100644
index 00000000000..ce5bdf0425a
--- /dev/null
+++ b/htdocs/langs/km_KH/supplier_proposal.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposalNew=New price request
+CommRequest=Price request
+CommRequests=Price requests
+SearchRequest=Find a request
+DraftRequests=Draft requests
+SupplierProposalsDraft=Draft vendor proposals
+LastModifiedRequests=Latest %s modified price requests
+RequestsOpened=Open price requests
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
+NewAskPrice=New price request
+ShowSupplierProposal=Show price request
+AddSupplierProposal=Create a price request
+SupplierProposalRefFourn=Vendor ref
+SupplierProposalDate=Delivery date
+SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
+ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
+DeleteAsk=Delete request
+ValidateAsk=Validate request
+SupplierProposalStatusDraft=Draft (needs to be validated)
+SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusClosed=Closed
+SupplierProposalStatusSigned=Accepted
+SupplierProposalStatusNotSigned=Refused
+SupplierProposalStatusDraftShort=Draft
+SupplierProposalStatusValidatedShort=Validated
+SupplierProposalStatusClosedShort=Closed
+SupplierProposalStatusSignedShort=Accepted
+SupplierProposalStatusNotSignedShort=Refused
+CopyAskFrom=Create a price request by copying an existing request
+CreateEmptyAsk=Create blank request
+ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
+ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
+SendAskByMail=Send price request by mail
+SendAskRef=Sending the price request %s
+SupplierProposalCard=Request card
+ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
+ActionsOnSupplierProposal=Events on price request
+DocModelAuroreDescription=A complete request model (logo...)
+CommercialAsk=Price request
+DefaultModelSupplierProposalCreate=Default model creation
+DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
+DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
+ListOfSupplierProposals=List of vendor proposal requests
+ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
+SupplierProposalsToClose=Vendor proposals to close
+SupplierProposalsToProcess=Vendor proposals to process
+LastSupplierProposals=Latest %s price requests
+AllPriceRequests=All requests
diff --git a/htdocs/langs/km_KH/suppliers.lang b/htdocs/langs/km_KH/suppliers.lang
new file mode 100644
index 00000000000..b69b11272b4
--- /dev/null
+++ b/htdocs/langs/km_KH/suppliers.lang
@@ -0,0 +1,47 @@
+# Dolibarr language file - Source file is en_US - vendors
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
+History=History
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
+OrderDate=Order date
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
+SupplierPrices=Vendor prices
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
+Availability=Availability
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order details
+ApproveThisOrder=Approve this order
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
+DenyingThisOrder=Deny this order
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
+SupplierReputation=Vendor reputation
+DoNotOrderThisProductToThisSupplier=Do not order
+NotTheGoodQualitySupplier=Low quality
+ReputationForThisProduct=Reputation
+BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
+AllProductReferencesOfSupplier=All product / service references of vendor
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/km_KH/trips.lang b/htdocs/langs/km_KH/trips.lang
new file mode 100644
index 00000000000..654f14d6bf7
--- /dev/null
+++ b/htdocs/langs/km_KH/trips.lang
@@ -0,0 +1,151 @@
+# Dolibarr language file - Source file is en_US - trips
+ShowExpenseReport=Show expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense reports
+ListOfFees=List of fees
+TypeFees=Types of fees
+ShowTrip=Show expense report
+NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
+CompanyVisited=Company/organization visited
+FeesKilometersOrAmout=Amount or kilometers
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportApproved=An expense report was approved
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
+ExpenseReportRefused=An expense report was refused
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
+ExpenseReportCanceled=An expense report was canceled
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
+ExpenseReportPaid=An expense report was paid
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripNDF=Informations expense report
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Other
+TF_TRIP=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hotel
+TF_TAXI=Taxi
+EX_KME=Mileage costs
+EX_FUE=Fuel CV
+EX_HOT=Hotel
+EX_PAR=Parking CV
+EX_TOL=Toll CV
+EX_TAX=Various Taxes
+EX_IND=Indemnity transportation subscription
+EX_SUM=Maintenance supply
+EX_SUO=Office supplies
+EX_CAR=Car rental
+EX_DOC=Documentation
+EX_CUR=Customers receiving
+EX_OTR=Other receiving
+EX_POS=Postage
+EX_CAM=CV maintenance and repair
+EX_EMM=Employees meal
+EX_GUM=Guests meal
+EX_BRE=Breakfast
+EX_FUE_VP=Fuel PV
+EX_TOL_VP=Toll PV
+EX_PAR_VP=Parking PV
+EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
+UploadANewFileNow=Upload a new document now
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+AucuneLigne=There is no expense report declared yet
+ModePaiement=Payment mode
+VALIDATOR=User responsible for approval
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paid by
+REFUSEUR=Denied by
+CANCEL_USER=Deleted by
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+BROUILLONNER=Reopen
+ExpenseReportRef=Ref. expense report
+ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+ConfirmRefuseTrip=Are you sure you want to deny this expense report?
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report?
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
+ConfirmCancelTrip=Are you sure you want to cancel this expense report?
+BrouillonnerTrip=Move back expense report to status "Draft"
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report?
+NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
+ExpenseReportsToApprove=Expense reports to approve
+ExpenseReportsToPay=Expense reports to pay
+ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
+ExpenseReportsIk=Expense report milles index
+ExpenseReportsRules=Expense report rules
+ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
+ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report
+expenseReportOffset=Offset
+expenseReportCoef=Coefficient
+expenseReportTotalForFive=Example with <u>d</u> = 5
+expenseReportRangeFromTo=from %d to %d
+expenseReportRangeMoreThan=more than %d
+expenseReportCoefUndefined=(value not defined)
+expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
+expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
+expenseReportPrintExample=offset + (d x coef) = %s
+ExpenseReportApplyTo=Apply to
+ExpenseReportDomain=Domain to apply
+ExpenseReportLimitOn=Limit on
+ExpenseReportDateStart=Date start
+ExpenseReportDateEnd=Date end
+ExpenseReportLimitAmount=Limite amount
+ExpenseReportRestrictive=Restrictive
+AllExpenseReport=All type of expense report
+OnExpense=Expense line
+ExpenseReportRuleSave=Expense report rule saved
+ExpenseReportRuleErrorOnSave=Error: %s
+RangeNum=Range %d
+ExpenseReportConstraintViolationError=Constraint violation id [%s]: %s  is superior to %s %s
+byEX_DAY=by day (limitation to %s)
+byEX_MON=by month (limitation to %s)
+byEX_YEA=by year (limitation to %s)
+byEX_EXP=by line (limitation to %s)
+ExpenseReportConstraintViolationWarning=Constraint violation id [%s]: %s  is superior to %s %s
+nolimitbyEX_DAY=by day (no limitation)
+nolimitbyEX_MON=by month (no limitation)
+nolimitbyEX_YEA=by year (no limitation)
+nolimitbyEX_EXP=by line (no limitation)
+CarCategory=Category of car
+ExpenseRangeOffset=Offset amount: %s
+RangeIk=Mileage range
+AttachTheNewLineToTheDocument=Attach the line to an uploaded document
diff --git a/htdocs/langs/km_KH/users.lang b/htdocs/langs/km_KH/users.lang
new file mode 100644
index 00000000000..41a5ebd0981
--- /dev/null
+++ b/htdocs/langs/km_KH/users.lang
@@ -0,0 +1,118 @@
+# Dolibarr language file - Source file is en_US - users
+HRMArea=HRM area
+UserCard=User card
+GroupCard=Group card
+Permission=Permission
+Permissions=Permissions
+EditPassword=Edit password
+SendNewPassword=Regenerate and send password
+SendNewPasswordLink=Send link to reset password
+ReinitPassword=Regenerate password
+PasswordChangedTo=Password changed to: %s
+SubjectNewPassword=Your new password for %s
+GroupRights=Group permissions
+UserRights=User permissions
+UserGUISetup=User Display Setup
+DisableUser=Disable
+DisableAUser=Disable a user
+DeleteUser=Delete
+DeleteAUser=Delete a user
+EnableAUser=Enable a user
+DeleteGroup=Delete
+DeleteAGroup=Delete a group
+ConfirmDisableUser=Are you sure you want to disable user <b>%s</b>?
+ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b>?
+ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b>?
+ConfirmEnableUser=Are you sure you want to enable user <b>%s</b>?
+ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b>?
+ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
+NewUser=New user
+CreateUser=Create user
+LoginNotDefined=Login is not defined.
+NameNotDefined=Name is not defined.
+ListOfUsers=List of users
+SuperAdministrator=Super Administrator
+SuperAdministratorDesc=Global administrator
+AdministratorDesc=Administrator
+DefaultRights=Default Permissions
+DefaultRightsDesc=Define here the <u>default</u> permissions that are automatically granted to a <u>new</u> user (to modify permissions for existing users, go to the user card).
+DolibarrUsers=Dolibarr users
+LastName=Last name
+FirstName=First name
+ListOfGroups=List of groups
+NewGroup=New group
+CreateGroup=Create group
+RemoveFromGroup=Remove from group
+PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
+PasswordChangeRequest=Request to change password for <b>%s</b>
+PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+ConfirmPasswordReset=Confirm password reset
+MenuUsersAndGroups=Users & Groups
+LastGroupsCreated=Latest %s groups created
+LastUsersCreated=Latest %s users created
+ShowGroup=Show group
+ShowUser=Show user
+NonAffectedUsers=Non assigned users
+UserModified=User modified successfully
+PhotoFile=Photo file
+ListOfUsersInGroup=List of users in this group
+ListOfGroupsForUser=List of groups for this user
+LinkToCompanyContact=Link to third party / contact
+LinkedToDolibarrMember=Link to member
+LinkedToDolibarrUser=Link to Dolibarr user
+LinkedToDolibarrThirdParty=Link to Dolibarr third party
+CreateDolibarrLogin=Create a user
+CreateDolibarrThirdParty=Create a third party
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
+UsePersonalValue=Use personal value
+InternalUser=Internal user
+ExportDataset_user_1=Users and their properties
+DomainUser=Domain user %s
+Reactivate=Reactivate
+CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
+Inherited=Inherited
+UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
+UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
+IdPhoneCaller=Id phone caller
+NewUserCreated=User %s created
+NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
+EventUserModified=User %s modified
+UserDisabled=User %s disabled
+UserEnabled=User %s activated
+UserDeleted=User %s removed
+NewGroupCreated=Group %s created
+GroupModified=Group %s modified
+GroupDeleted=Group %s removed
+ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact?
+ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member?
+ConfirmCreateThirdParty=Are you sure you want to create a third party for this member?
+LoginToCreate=Login to create
+NameToCreate=Name of third party to create
+YourRole=Your roles
+YourQuotaOfUsersIsReached=Your quota of active users is reached !
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
+DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
+HierarchicalResponsible=Supervisor
+HierarchicView=Hierarchical view
+UseTypeFieldToChange=Use field Type to change
+OpenIDURL=OpenID URL
+LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Hours worked (per week)
+ExpectedWorkedHours=Expected worked hours per week
+ColorUser=Color of the user
+DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accounting code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Employment Start Date
+DateEmploymentEnd=Employment End Date
+CantDisableYourself=You can't disable your own user record
+ForceUserExpenseValidator=Force expense report validator
+ForceUserHolidayValidator=Force leave request validator
+ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/km_KH/website.lang b/htdocs/langs/km_KH/website.lang
new file mode 100644
index 00000000000..bce2a09fb03
--- /dev/null
+++ b/htdocs/langs/km_KH/website.lang
@@ -0,0 +1,130 @@
+# Dolibarr language file - Source file is en_US - website
+Shortname=Code
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
+DeleteWebsite=Delete website
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
+WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
+WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
+WEBSITE_CSS_URL=URL of external CSS file
+WEBSITE_CSS_INLINE=CSS file content (common to all pages)
+WEBSITE_JS_INLINE=Javascript file content (common to all pages)
+WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
+WEBSITE_ROBOT=Robot file (robots.txt)
+WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
+HtmlHeaderPage=HTML header (specific to this page only)
+PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
+EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
+MediaFiles=Media library
+EditCss=Edit website properties
+EditMenu=Edit menu
+EditMedias=Edit medias
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
+AddWebsite=Add website
+Webpage=Web page/container
+AddPage=Add page/container
+HomePage=Home Page
+PageContainer=Page/container
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
+PageContent=Page/Contenair
+PageDeleted=Page/Contenair '%s' of website %s deleted
+PageAdded=Page/Contenair '%s' added
+ViewSiteInNewTab=View site in new tab
+ViewPageInNewTab=View page in new tab
+SetAsHomePage=Set as Home page
+RealURL=Real URL
+ViewWebsiteInProduction=View web site using home URLs
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+TestDeployOnWeb=Test/deploy on web
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
+NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
+SyntaxHelp=Help on specific syntax tips
+YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+ClonePage=Clone page/container
+CloneSite=Clone site
+SiteAdded=Website added
+ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
+PageIsANewTranslation=The new page is a translation of the current page ?
+LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
+ParentPageId=Parent page ID
+WebsiteId=Website ID
+CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
+FetchAndCreate=Fetch and Create
+ExportSite=Export website
+ImportSite=Import website template
+IDOfPage=Id of page
+Banner=Banner
+BlogPost=Blog post
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
+AddWebsiteAccount=Create web site account
+BackToListForThirdParty=Back to list for the third-party
+DisableSiteFirst=Disable website first
+MyContainerTitle=My web site title
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is a translation of
+ThisPageHasTranslationPages=This page/container has translation
+NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
+GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Search or Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
+MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
+EditInLineOnOff=Mode 'Edit inline' is %s
+ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
+GlobalCSSorJS=Global CSS/JS/Header file of web site
+BackToHomePage=Back to home page...
+TranslationLinks=Translation links
+YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not a website page
+UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
+MainLanguage=Main language
+OtherLanguages=Other languages
+UseManifest=Provide a manifest.json file
+PublicAuthorAlias=Public author alias
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
+ReplacementDoneInXPages=Replacement done in %s pages or containers
diff --git a/htdocs/langs/km_KH/withdrawals.lang b/htdocs/langs/km_KH/withdrawals.lang
new file mode 100644
index 00000000000..b1d6e30e329
--- /dev/null
+++ b/htdocs/langs/km_KH/withdrawals.lang
@@ -0,0 +1,119 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
+NewStandingOrder=New direct debit order
+StandingOrderToProcess=To process
+WithdrawalsReceipts=Direct debit orders
+WithdrawalReceipt=Direct debit order
+LastWithdrawalReceipts=Latest %s direct debit files
+WithdrawalsLines=Direct debit order lines
+RequestStandingOrderToTreat=Request for direct debit payment order to process
+RequestStandingOrderTreated=Request for direct debit payment order processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
+AmountToWithdraw=Amount to withdraw
+WithdrawsRefused=Direct debit refused
+NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
+ResponsibleUser=User Responsible
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
+MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
+ClassCredited=Classify credited
+ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
+TransData=Transmission date
+TransMetod=Transmission method
+Send=Send
+Lines=Lines
+StandingOrderReject=Issue a rejection
+WithdrawalRefused=Withdrawal refused
+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=Invoice refused (Charge the rejection to customer)
+StatusDebitCredit=Status debit/credit
+StatusWaiting=Waiting
+StatusTrans=Sent
+StatusCredited=Credited
+StatusRefused=Refused
+StatusMotif0=Unspecified
+StatusMotif1=Insufficient funds
+StatusMotif2=Request contested
+StatusMotif3=No direct debit payment order
+StatusMotif4=Sales Order
+StatusMotif5=RIB unusable
+StatusMotif6=Account without balance
+StatusMotif7=Judicial Decision
+StatusMotif8=Other reason
+CreateForSepaFRST=Create direct debit file (SEPA FRST)
+CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
+CreateAll=Create direct debit file (all)
+CreateGuichet=Only office
+CreateBanque=Only bank
+OrderWaiting=Waiting for treatment
+NotifyTransmision=Withdrawal Transmission
+NotifyCredit=Withdrawal Credit
+NumeroNationalEmetter=National Transmitter Number
+WithBankUsingRIB=For bank accounts using RIB
+WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
+BankToReceiveWithdraw=Receiving Bank Account
+CreditDate=Credit on
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+WithdrawalFile=Withdrawal file
+SetToStatusSent=Set to status "File Sent"
+ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
+StatisticsByLineStatus=Statistics by status of lines
+RUM=UMR
+DateRUM=Mandate signature date
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
+WithdrawMode=Direct debit mode (FRST or RECUR)
+WithdrawRequestAmount=Amount of Direct debit request:
+WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
+SepaMandate=SEPA Direct Debit Mandate
+SepaMandateShort=SEPA Mandate
+PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
+SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+CreditorIdentifier=Creditor Identifier
+CreditorName=Creditor Name
+SEPAFillForm=(B) Please complete all the fields marked *
+SEPAFormYourName=Your name
+SEPAFormYourBAN=Your Bank Account Name (IBAN)
+SEPAFormYourBIC=Your Bank Identifier Code (BIC)
+SEPAFrstOrRecur=Type of payment
+ModeRECUR=Recurring payment
+ModeFRST=One-off payment
+PleaseCheckOne=Please check one only
+DirectDebitOrderCreated=Direct debit order %s created
+AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
+
+### Notifications
+InfoCreditSubject=Payment of direct debit payment order %s by the bank
+InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
+InfoTransSubject=Transmission of direct debit payment order %s to bank
+InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
+InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
+InfoRejectSubject=Direct debit payment order refused
+InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/km_KH/workflow.lang b/htdocs/langs/km_KH/workflow.lang
new file mode 100644
index 00000000000..be126eef0f4
--- /dev/null
+++ b/htdocs/langs/km_KH/workflow.lang
@@ -0,0 +1,20 @@
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=Workflow module setup
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+# Autocreate
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
+# Autoclassify customer proposal or order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+AutomaticCreation=Automatic creation
+AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/km_KH/zapier.lang b/htdocs/langs/km_KH/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/km_KH/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index 1f9382137ea..b8ce37a0956 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index 99ac4fe564d..b2c9e35f1e6 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web server user/group
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Module <b>%s</b> must be enabled
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Users module setup
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang
index 634599d74e4..43b5460d816 100644
--- a/htdocs/langs/kn_IN/bills.lang
+++ b/htdocs/langs/kn_IN/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=Show invoice
-ShowInvoice=Show invoice
-ShowInvoiceReplace=Show replacing invoice
-ShowInvoiceAvoir=Show credit note
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/kn_IN/donations.lang b/htdocs/langs/kn_IN/donations.lang
index 5edc8d62033..de4bdf68f03 100644
--- a/htdocs/langs/kn_IN/donations.lang
+++ b/htdocs/langs/kn_IN/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Create a donation
 NewDonation=New donation
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Show donation
 PublicDonation=Public donation
 DonationsArea=Donations area
 DonationStatusPromiseNotValidated=Draft promise
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
 DonationTitle=Donation receipt
+DonationDate=Donation date
 DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
diff --git a/htdocs/langs/kn_IN/interventions.lang b/htdocs/langs/kn_IN/interventions.lang
index e7667ef6946..e5936f8246e 100644
--- a/htdocs/langs/kn_IN/interventions.lang
+++ b/htdocs/langs/kn_IN/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/kn_IN/modulebuilder.lang b/htdocs/langs/kn_IN/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/kn_IN/modulebuilder.lang
+++ b/htdocs/langs/kn_IN/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/kn_IN/multicurrency.lang b/htdocs/langs/kn_IN/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/kn_IN/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index cdc0e6b3c95..bb42bff3c87 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/kn_IN/website.lang b/htdocs/langs/kn_IN/website.lang
index c802b2d2ae8..bce2a09fb03 100644
--- a/htdocs/langs/kn_IN/website.lang
+++ b/htdocs/langs/kn_IN/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/kn_IN/zapier.lang b/htdocs/langs/kn_IN/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/kn_IN/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index b094e0fa6e8..3cb63bca795 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=묶음 처리된 청구서 항목
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=회계계좌로 연결
+TotalForAccount=Total for accounting account
 
 
 Ventilate=묶음 처리
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 6ae752012ad..cb4c843759a 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web server user/group
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Module <b>%s</b> must be enabled
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Users module setup
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
index a00d26ae67d..8c4825d0a10 100644
--- a/htdocs/langs/ko_KR/bills.lang
+++ b/htdocs/langs/ko_KR/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=Show invoice
-ShowInvoice=Show invoice
-ShowInvoiceReplace=Show replacing invoice
-ShowInvoiceAvoir=Show credit note
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=상태
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/ko_KR/donations.lang b/htdocs/langs/ko_KR/donations.lang
index e141edd12e3..598df2a957e 100644
--- a/htdocs/langs/ko_KR/donations.lang
+++ b/htdocs/langs/ko_KR/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Create a donation
 NewDonation=New donation
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Show donation
 PublicDonation=Public donation
 DonationsArea=Donations area
 DonationStatusPromiseNotValidated=Draft promise
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=초안
 DonationStatusPromiseValidatedShort=확인 됨
 DonationStatusPaidShort=받음
 DonationTitle=Donation receipt
+DonationDate=Donation date
 DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
diff --git a/htdocs/langs/ko_KR/interventions.lang b/htdocs/langs/ko_KR/interventions.lang
index 7c917866a97..3be481c3ddf 100644
--- a/htdocs/langs/ko_KR/interventions.lang
+++ b/htdocs/langs/ko_KR/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=최신 %s 개입 된 개입
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/ko_KR/modulebuilder.lang b/htdocs/langs/ko_KR/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/ko_KR/modulebuilder.lang
+++ b/htdocs/langs/ko_KR/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index 1c20f4ddeb2..91a09d7867d 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/ko_KR/website.lang b/htdocs/langs/ko_KR/website.lang
index e206a0172b2..87518e26e88 100644
--- a/htdocs/langs/ko_KR/website.lang
+++ b/htdocs/langs/ko_KR/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/ko_KR/zapier.lang b/htdocs/langs/ko_KR/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/ko_KR/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index 4e594724604..6505792d2df 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index e5ec3641e2e..5de7dc50ed7 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web server user/group
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Module <b>%s</b> must be enabled
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Users module setup
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index 8c22ce0159a..9f11d8ecf87 100644
--- a/htdocs/langs/lo_LA/bills.lang
+++ b/htdocs/langs/lo_LA/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=Show invoice
-ShowInvoice=Show invoice
-ShowInvoiceReplace=Show replacing invoice
-ShowInvoiceAvoir=Show credit note
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/lo_LA/donations.lang b/htdocs/langs/lo_LA/donations.lang
index 5edc8d62033..de4bdf68f03 100644
--- a/htdocs/langs/lo_LA/donations.lang
+++ b/htdocs/langs/lo_LA/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Create a donation
 NewDonation=New donation
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Show donation
 PublicDonation=Public donation
 DonationsArea=Donations area
 DonationStatusPromiseNotValidated=Draft promise
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
 DonationTitle=Donation receipt
+DonationDate=Donation date
 DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
diff --git a/htdocs/langs/lo_LA/interventions.lang b/htdocs/langs/lo_LA/interventions.lang
index e7667ef6946..e5936f8246e 100644
--- a/htdocs/langs/lo_LA/interventions.lang
+++ b/htdocs/langs/lo_LA/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/lo_LA/modulebuilder.lang b/htdocs/langs/lo_LA/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/lo_LA/modulebuilder.lang
+++ b/htdocs/langs/lo_LA/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/lo_LA/multicurrency.lang b/htdocs/langs/lo_LA/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/lo_LA/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index 494e4317bf2..45749567b65 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang
index c802b2d2ae8..bce2a09fb03 100644
--- a/htdocs/langs/lo_LA/website.lang
+++ b/htdocs/langs/lo_LA/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/lo_LA/zapier.lang b/htdocs/langs/lo_LA/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/lo_LA/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index a6ea5cd4d4d..d0689dd8625 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Priskirtos sąskaitų faktūrų eilutės
 ExpenseReportLines=Išlaidų ataskaitų eilutės, kurias reikia priskirti
 ExpenseReportLinesDone=Priskirtos išlaidų ataskaitų eilutės
 IntoAccount=Priskirta eilutė su apskaitos sąskaita
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Priskirti
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Iš viso pardavimų marža
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Rėžimas pardavimas
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Rėžimas pirkimai
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index bd85f3830b6..dab8c8ed04e 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Tinklo serverio naudotojas/grupė
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Duomenų bazės simbolių rinkinys duomenų talpinimui
 DBSortingCharset=Duomenų bazės simbolių rinkinys duomenų rūšiavimui
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=<b>%s</b> modulis turi būti įjungtas
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Nuoroda į objektą,
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=Pagal nutylėjimą siūloma IRPF yra 0. Taisyklės pabaiga.
 LocalTax2IsUsedExampleES=Ispanijoje, laisvai samdomi ir nepriklausomi specialistai, kurie teikia paslaugas ir įmonės, kurios pasirinko modulių mokesčių sistemą.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Ataskaitos apie vietinius mokesčius
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Vartotojų modulio nuostatos
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-įmonės modulio nustatymas
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Pašto kodas
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index 89e47957999..c39c8d7715c 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Sąskaitų-faktūrų suma
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Sąskaitų-faktūrų suma pagal mėnesius (atskaičius mokesčius)
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=Rodyti sąskaitą-faktūrą
-ShowInvoice=Rodyti sąskaitą-faktūrą
-ShowInvoiceReplace=Rodyti pakeičiančią sąskaitą-faktūrą
-ShowInvoiceAvoir=Rodyti kreditinę sąskaitą
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Rodyti mokėjimą
 AlreadyPaid=Jau apmokėta
 AlreadyPaidBack=Mokėjimas jau grąžintas
 AlreadyPaidNoCreditNotesNoDeposits=Jau sumokėta (be kreditinių sąskaitų ir pradinės įmokos)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Būklė
 PaymentConditionShortRECEP=Išankstinis mokėjimas
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Grąžinimo numeris formatu %syymm-nnnn standartinėms sąskaitoms-faktūroms ir %syymm-nnnn kreditinėms sąskaitoms, kur yy yra metai, mm mėnuo ir nnnn yra seka be pertrūkių ir be grįžimo į 0
diff --git a/htdocs/langs/lt_LT/donations.lang b/htdocs/langs/lt_LT/donations.lang
index e23b0061f4c..e5d41a26e63 100644
--- a/htdocs/langs/lt_LT/donations.lang
+++ b/htdocs/langs/lt_LT/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Create a donation
 NewDonation=Nauja auka
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Rodyti auką
 PublicDonation=Viešos aukos
 DonationsArea=Aukų sritis
 DonationStatusPromiseNotValidated=Pažado projektas
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Projektas/apmatai
 DonationStatusPromiseValidatedShort=Pripažintas galiojančiu
 DonationStatusPaidShort=Gautas
 DonationTitle=Aukos įplaukos
+DonationDate=Donation date
 DonationDatePayment=Mokėjimo data
 ValidPromess=Pažadą pripažinti galiojančiu
 DonationReceipt=Aukos įplaukos
diff --git a/htdocs/langs/lt_LT/interventions.lang b/htdocs/langs/lt_LT/interventions.lang
index 3e84e690840..12016151c84 100644
--- a/htdocs/langs/lt_LT/interventions.lang
+++ b/htdocs/langs/lt_LT/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Sekantis kiento kontaktas
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/lt_LT/modulebuilder.lang b/htdocs/langs/lt_LT/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/lt_LT/modulebuilder.lang
+++ b/htdocs/langs/lt_LT/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/lt_LT/multicurrency.lang b/htdocs/langs/lt_LT/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/lt_LT/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index 088db490d25..074a445c738 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/lt_LT/website.lang b/htdocs/langs/lt_LT/website.lang
index 7b50688fee0..579db61e1ce 100644
--- a/htdocs/langs/lt_LT/website.lang
+++ b/htdocs/langs/lt_LT/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/lt_LT/zapier.lang b/htdocs/langs/lt_LT/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/lt_LT/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index 63c215f1588..637831a8f1f 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Iesaistīto rēķinu līnijas
 ExpenseReportLines=Izdevumu atskaites līnijas, kas saistītas
 ExpenseReportLinesDone=Saistītās izdevumu pārskatu līnijas
 IntoAccount=Bind line ar grāmatvedības kontu
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Saistīt
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Grāmatvedības konts, lai reģistrētu abonementus
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Nopirkto produktu grāmatvedības konts pēc noklusējuma (tiek izmantots, ja tas nav definēts produktu lapā)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Grāmatvedības konts pēc noklusējuma nopirktajiem produktiem EEK (lietots, ja nav definēts produktu lapā)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Grāmatvedības konts pēc noklusējuma nopirktajiem produktiem un importētajiem no EEK (izmantots, ja tas nav noteikts produkta lapā)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Grāmatvedības konts pēc noklusējuma pārdotajiem produktiem (izmanto, ja produkta lapā nav noteikts).
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Grāmatvedības konts pēc noklusējuma ražojumiem, ko pārdod EEK (izmanto, ja nav definēts produktu lapā)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Grāmatvedības konts pēc noklusējuma produktiem, kas pārdoti un eksportēti no EEK (izmantots, ja tas nav noteikts produkta lapā)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Grāmatvedības konts pēc noklusējuma par nopirktajiem pakalpojumiem (lieto, ja tas nav noteikts pakalpojuma lapā)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Grāmatvedības konts pēc noklusējuma nopirktajiem pakalpojumiem EEK (izmantots, ja pakalpojuma lapā nav noteikts)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Grāmatvedības konts pēc noklusējuma par nopirktajiem pakalpojumiem un ievestajiem no EEK (tiek izmantots, ja pakalpojuma lapā tas nav noteikts)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Grāmatvedības konts pēc noklusējuma pārdotajiem pakalpojumiem (izmanto, ja tas nav noteikts pakalpojuma lapā)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Grāmatvedības konts pēc noklusējuma par pakalpojumiem, kas pārdoti EEK (izmantots, ja nav definēts pakalpojumu lapā)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Grāmatvedības konts pēc noklusējuma par pakalpojumiem, kas pārdoti un eksportēti no EEK (tiek izmantoti, ja tie nav definēti pakalpojumu lapā)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Trešā puse nav
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Trešās puses konts nav definēts vai trešā persona nav zināma. Bloķēšanas kļūda.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Nav noteikts nezināms trešās puses konts un gaidīšanas konts. Bloķēšanas kļūda
 PaymentsNotLinkedToProduct=Maksājums nav saistīts ar kādu produktu / pakalpojumu
+OpeningBalance=Opening balance
 ShowOpeningBalance=Rādīt sākuma atlikumu
 HideOpeningBalance=Slēpt sākuma atlikumu
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Kontu grupa
 PcgtypeDesc=Kontu grupa tiek izmantota kā iepriekš definēti “filtra” un “grupēšanas” kritēriji dažiem grāmatvedības pārskatiem. Piemēram, “IENĀKUMS” vai “IZDEVUMI” tiek izmantoti kā produktu uzskaites kontu grupas, lai izveidotu izdevumu / ienākumu pārskatu.
 
+Reconcilable=Samierināms
+
 TotalVente=Kopējais apgrozījums pirms nodokļu nomaksas
 TotalMarge=Kopējā pārdošanas starpība
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Eksportēt Quadratus QuadraCompta
 Modelcsv_ebp=Eksportēt uz EBP
 Modelcsv_cogilog=Eksportēt uz Cogilog
 Modelcsv_agiris=Eksports uz Agiris
-Modelcsv_LDCompta=Eksports LD Compta (v9 un jaunākiem) (pārbaude)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Eksports LD Compta (v10 un jaunākiem)
 Modelcsv_openconcerto=Eksportēt OpenConcerto (tests)
 Modelcsv_configurable=Eksportēt CSV konfigurējamu
 Modelcsv_FEC=Eksporta FEC
 Modelcsv_Sage50_Swiss=Eksports uz Sage 50 Šveici
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Kontu konts. Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode pārdošana
 OptionModeProductSellIntra=Pārdošanas veids, ko eksportē EEK
 OptionModeProductSellExport=Pārdošanas režīms citās valstīs
 OptionModeProductBuy=Mode pirkumi
+OptionModeProductBuyIntra=Režīma pirkumi, kas importēti EEK
+OptionModeProductBuyExport=Režīms, kas iegādāts importēts no citām valstīm
 OptionModeProductSellDesc=Parādiet visus produktus ar grāmatvedības kontu pārdošanai.
 OptionModeProductSellIntraDesc=Rādīt visus produktus ar grāmatvedības kontu pārdošanai EEK.
 OptionModeProductSellExportDesc=Rādīt visus produktus ar grāmatvedības kontu citiem ārvalstu pārdošanas darījumiem.
 OptionModeProductBuyDesc=Parādiet visus produktus ar grāmatvedības kontu pirkumiem.
+OptionModeProductBuyIntraDesc=Rādīt visus produktus ar grāmatvedības kontu pirkumiem EEK.
+OptionModeProductBuyExportDesc=Rādīt visus produktus ar grāmatvedības kontu citiem ārvalstu pirkumiem.
 CleanFixHistory=Noņemiet grāmatvedības kodu no rindām, kas nav konta diagrammās
 CleanHistory=Atiestatīt visas saistītās vērtības izvēlētajam gadam
 PredefinedGroups=Iepriekš definētas grupas
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Konts ir noņemts no grupas
 SaleLocal=Vietējā pārdošana
 SaleExport=Eksporta pārdošana
 SaleEEC=Pārdošana EEK
+SaleEECWithVAT=Pārdošana EEK ar PVN nav spēkā, tāpēc domājams, ka tā NAV iekšējā tirdzniecība, un ieteiktais konts ir standarta produkta konts.
+SaleEECWithoutVATNumber=Pārdošana EEK bez PVN, bet trešās puses PVN ID nav definēts. Mēs atteicamies no standarta produkta standarta konta. Ja nepieciešams, varat salabot trešās personas PVN ID vai produkta kontu.
 
 ## Dictionary
 Range=Grāmatvedības konta diapazons
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 9ebc336d896..c06873de562 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web servera lietotājs/grupa
 NoSessionFound=Šķiet, ka jūsu PHP konfigurācija neļauj iekļaut aktīvās sesijas. Direktorija, kuru izmanto sesiju saglabāšanai (<b>%s</b>), var būt aizsargāta (piemēram, ar OS atļaujām vai PHP direktīvu open_basedir).
 DBStoringCharset=Datu bāzes kodējuma datu uzglabāšanai
 DBSortingCharset=Datu bāzes rakstzīmju kopa, lai kārtotu datus
+HostCharset=Host charset
 ClientCharset=Klienta kodējums
 ClientSortingCharset=Klientu salīdzināšana
 WarningModuleNotActive=Modulim <b>%s</b> ir jābūt aktivizētam
@@ -99,9 +100,9 @@ NoMaxSizeByPHPLimit=Piezīme: Nav limits tiek noteikts jūsu PHP konfigurācijā
 MaxSizeForUploadedFiles=Maksimālais augšupielādējamo failu izmērs (0 nepieļaut failu augšupielādi)
 UseCaptchaCode=Izmantot grafisko kodu (CAPTCHA) pieteikšanās lapā
 AntiVirusCommand=Pilns ceļš antivīrusa komandai
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusCommandExample=ClamAv Daemon piemērs (nepieciešams clamav-daemon): / usr / bin / clamdscan <br> ClamWin piemērs (ļoti ļoti lēns): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Papildus komandrindas parametri
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=ClamAv Daemon piemērs: --fdpass <br> ClamWin piemērs: --database = "C: \\ Program Files (x86) \\ ClamWin \\ lib"
 ComptaSetup=Uzskaites moduļa iestatīšana
 UserSetup=Lietotāju pārvaldības iestatīšana
 MultiCurrencySetup=Daudzvalūtu iestatījumi
@@ -199,7 +200,7 @@ FeatureDisabledInDemo=Iespēja bloķēta demo versijā
 FeatureAvailableOnlyOnStable=Funkcija ir pieejama tikai oficiālajā stabilā versijā
 BoxesDesc=Logrīki ir sastāvdaļas, kas parāda informāciju, kuru varat pievienot, lai personalizētu dažas lapas. Varat izvēlēties starp widget parādīšanu, izvēloties mērķa lapu un noklikšķinot uz Aktivizēt, vai noklikšķinot uz atkritnes, lai to atspējotu.
 OnlyActiveElementsAreShown=Tikai elementi no <a href="%s">iespējotiem moduļiem</a> tiek rādīti.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesDesc=Moduļi / lietojumprogrammas nosaka, kuras funkcijas ir pieejamas programmatūrā. Dažiem moduļiem pēc moduļa aktivizēšanas lietotājiem ir jāpiešķir atļaujas. Lai ieslēgtu vai deaktivizētu moduli / lietojumprogrammu, noklikšķiniet uz ieslēgšanas / izslēgšanas pogas <span class="small valignmiddle"> %s </span>.
 ModulesMarketPlaceDesc=Jūs varat atrast vairāk moduļu, lai lejupielādētu ārējās tīmekļa vietnēs internetā ...
 ModulesDeployDesc=Ja atļaujas jūsu failu sistēmā to atļauj, varat izmantot šo rīku, lai izvietotu ārēju moduli. Tad modulis būs redzams cilnē <strong> %s </strong>.
 ModulesMarketPlaces=Atrastt ārējo lietotni / moduļus
@@ -222,7 +223,7 @@ DoliPartnersDesc=Uzņēmumi, kas piedāvā pielāgotus izstrādātus moduļus va
 WebSiteDesc=Ārējās vietnes vairākiem papildinājumiem (bez kodols) moduļiem ...
 DevelopYourModuleDesc=Daži risinājumi, lai izstrādātu savu moduli ...
 URL=URL
-RelativeURL=Relative URL
+RelativeURL=Relatīvais URL
 BoxesAvailable=Pieejamie logrīki
 BoxesActivated=Logrīki aktivizēti
 ActivateOn=Aktivizēt
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Izvēles rūtiņas
 ExtrafieldCheckBoxFromList=Izvēles rūtiņas no tabulas
 ExtrafieldLink=Saite uz objektu
 ComputedFormula=Aprēķinātais lauks
-ComputedFormulaDesc=Šeit varat ievadīt formulu, izmantojot citas objekta īpašības vai jebkuru PHP kodējumu, lai iegūtu dinamisku aprēķināto vērtību. Jūs varat izmantot jebkuru PHP saderīgu formulu, ieskaitot "?" stāvokļa operators un šāds globāls objekts: <strong> $ db, $ conf, $ langs, $ mysoc, $ user, $ object </strong>. <br> <strong> BRĪDINĀJUMS </strong>: tikai daži $ $ rekvizīti objekts var būt pieejams. Ja jums nav vajadzīgo īpašību, vienkārši ielādējiet objektu savā formulā, piemēram, otrajā piemērā. <br> Izmantojot aprēķināto lauku, jūs nevarat ievadīt sev nekādu vērtību no saskarnes. Arī tad, ja ir sintakses kļūda, formula nevar atgriezties neko. <br> <br> Piemērs formulas: <br> $ object-> id <10? apaļa ($ object-> id / 2, 2): ($ object-> id + 2 * $ user-> id) * (int) substr ($ mysoc-> zip, 1, 2) <br> <br> Piemērs, lai ielādētu objektu <br> (($ reloadedobj = jauns Societe ($ db)) & & ($ reloadedobj-> ielādēt ($ obj-> id? $ Obj-> id: ($ obj-> rowid? $ Obj-> rowid: $ object-> id))> 0))? $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1' <br> <br> Cits piemērs formulas, lai piespiestu objektu slodzi un tā mātes objektu: <br> (($ reloadedobj = jauns uzdevums ($ db)) && ($ reloadedobj-> fetch ($ object-> id)> 0) & & ($ secondloadedobj = jauns projekts ($ db)) & & ($ secondloadedobj-> fetch ($ reloadedobj-> fk_project )> 0))? $ secondloadedobj-> ref: 'Vecāku projekts nav atrasts'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Veikt aprēķinātu lauku
 ComputedpersistentDesc=Aprēķinātie papildu lauki tiks saglabāti datubāzē, taču vērtība tiks pārrēķināta tikai tad, kad mainīsies šī lauka objekts. Ja aprēķinātais lauks ir atkarīgs no citiem objektiem vai globāliem datiem, šī vērtība var būt nepareiza!
 ExtrafieldParamHelpPassword=Atstājot šo lauku tukšu, tas nozīmē, ka šī vērtība tiks saglabāta bez šifrēšanas (laukam jābūt paslēptai tikai ar zvaigznīti uz ekrāna). <br> Iestatiet 'auto', lai izmantotu noklusējuma šifrēšanas kārtulu, lai saglabātu paroli datubāzē (pēc tam vērtība lasīt būs ashh tikai, nav iespējams izgūt sākotnējo vērtību)
@@ -448,8 +449,8 @@ KeepEmptyToUseDefault=Saglabājiet tukšu, lai izmantotu noklusēto vērtību
 DefaultLink=Noklusējuma saite
 SetAsDefault=Iestatīt kā noklusējumu
 ValueOverwrittenByUserSetup=Uzmanību, šī vērtība var pārrakstīt ar lietotāja konkrētu uzstādīšanu (katrs lietotājs var iestatīt savu klikšķini lai zvanītu URL)
-ExternalModule=External module
-InstalledInto=Installed into directory %s
+ExternalModule=Ārējais modulis
+InstalledInto=Instalēta direktorijā %s
 BarcodeInitForthird-parties=Masveida svītru kodu veidošana trešajām personām
 BarcodeInitForProductsOrServices=Masveida svītrkodu veidošana produktu vai pakalpojumu atiestatīšana
 CurrentlyNWithoutBarCode=Pašlaik jums ir <strong>%s</strong> ierakstu <strong>%s</strong> %s bez definēta svītrukoda.
@@ -950,7 +951,7 @@ DictionaryCanton=Valstis/provinces
 DictionaryRegion=Reģions
 DictionaryCountry=Valstis
 DictionaryCurrency=Valūtas
-DictionaryCivility=Honorific titles
+DictionaryCivility=Goda tituli
 DictionaryActions=Darba kārtības pasākumu veidi
 DictionarySocialContributions=Sociālo vai nodokļu nodokļu veidi
 DictionaryVAT=PVN likmes vai pārdošanas procentu likmes
@@ -991,7 +992,7 @@ VATIsNotUsedDesc=Pēc noklusējuma piedāvātais pārdošanas nodoklis ir 0, ko
 VATIsUsedExampleFR=Francijā tas nozīmē uzņēmumus vai organizācijas, kurām ir reāla fiskālā sistēma (vienkāršota reāla vai reāla). Sistēma, kurā izmanto PVN.
 VATIsNotUsedExampleFR=Francijā tas nozīmē asociācijas, kas nav deklarētas par tirdzniecības nodokli, vai uzņēmumi, organizācijas vai brīvās profesijas, kas izvēlējušās mikrouzņēmumu fiskālo sistēmu (pārdošanas nodoklis franšīzē) un samaksājuši franšīzes pārdošanas nodokli bez pārdošanas nodokļa deklarācijas. Ar šo izvēli rēķinos būs redzama atsauce "Nav piemērojams pārdošanas nodoklis - CGI 293.B pants".
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
+TypeOfSaleTaxes=Tirdzniecības nodokļa veids
 LTRate=Likme
 LocalTax1IsNotUsed=Nelietot otru nodokli
 LocalTax1IsUsedDesc=Izmantojiet otra veida nodokļus (izņemot pirmo)
@@ -1015,9 +1016,9 @@ LocalTax2IsUsedDescES=IRPF likme pēc noklusējuma, veidojot izredzes, rēķinus
 LocalTax2IsNotUsedDescES=Pēc noklusējuma ierosinātā IRPF ir 0. Beigas varu.
 LocalTax2IsUsedExampleES=Spānijā, ārštata un neatkarīgi profesionāļi, kas sniedz pakalpojumus un uzņēmumiem, kuri ir izvēlējušies nodokļu sistēmu moduļus.
 LocalTax2IsNotUsedExampleES=Spānijā šie uzņēmumi nav pakļauti moduļu nodokļu sistēmai.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
-UseRevenueStamp=Use a tax stamp
-UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
+UseRevenueStamp=Izmantojiet nodokļu zīmogu
+UseRevenueStampExample=Nodokļu markas vērtību pēc noklusējuma definē vārdnīcu iestatīšanā (%s - %s - %s)
 CalcLocaltax=Ziņojumi par vietējiem nodokļiem
 CalcLocaltax1=Pārdošana - pirkumi
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
@@ -1025,7 +1026,7 @@ CalcLocaltax2=Pirkumi
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
 CalcLocaltax3=Pārdošanas
 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+NoLocalTaxXForThisCountry=Saskaņā ar nodokļu iestatīšanu (sk. %s - %s - %s), jūsu valstij šāda veida nodokļi nav jāizmanto.
 LabelUsedByDefault=Label izmantots pēc noklusējuma, ja nav tulkojuma var atrast kodu
 LabelOnDocuments=Dokumentu marķējums
 LabelOrTranslationKey=Uzlīme vai tulkošanas taustiņš
@@ -1116,8 +1117,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Izdevumu pārskats kurš jāapstiprina
 Delays_MAIN_DELAY_HOLIDAYS=Atstājiet lūgumus apstiprināt
 SetupDescription1=Pirms sākat lietot Dolibarr, jānosaka daži sākotnējie parametri un moduļi ir iespējoti / konfigurēti.
 SetupDescription2=Šīs divas sadaļas ir obligātas (divi pirmie ieraksti iestatīšanas izvēlnē):
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Pamata parametri, ko izmanto, lai pielāgotu ar jūsu lietojumprogrammu saistīto noklusējuma uzvedību (piemēram, valstij).
+SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Šī programmatūra ir daudzu moduļu / lietojumprogrammu komplekts. Ar jūsu vajadzībām saistītajiem moduļiem jābūt iespējotiem un konfigurētiem. Parādīsies izvēlnes ieraksti, aktivizējot šos moduļus.
 SetupDescription5=Citi iestatījumu izvēlnes ieraksti pārvalda izvēles parametrus.
 LogEvents=Drošības audita notikumi
 Audit=Audits
@@ -1136,7 +1137,7 @@ LogEventDesc=Iespējot konkrētu drošības notikumu reģistrēšanu. Administra
 AreaForAdminOnly=Iestatīšanas parametrus var iestatīt tikai <b> administratora lietotāji </b>.
 SystemInfoDesc=Sistēmas informācija ir dažādi tehniskā informācija jums tikai lasīšanas režīmā un redzama tikai administratoriem.
 SystemAreaForAdminOnly=Šī sadaļa ir pieejama tikai administratora lietotājiem. Dolibarr lietotāja atļaujas nevar mainīt šo ierobežojumu.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+CompanyFundationDesc=Rediģējiet sava uzņēmuma / organizācijas informāciju. Kad tas ir izdarīts, noklikšķiniet uz pogas "%s" lapas apakšā.
 AccountantDesc=Ja jums ir ārējais grāmatvedis / grāmatvedis, varat rediģēt šeit savu informāciju.
 AccountantFileNumber=Grāmatveža kods
 DisplayDesc=Šeit var mainīt parametrus, kas ietekmē Dolibarr izskatu un uzvedību.
@@ -1272,8 +1273,9 @@ RuleForGeneratedPasswords=Noteikumi paroļu ģenerēšanai un apstiprināšanai
 DisableForgetPasswordLinkOnLogonPage=Nerādīt saiti "Aizmirsta parole" pieteikšanās lapā
 UsersSetup=Lietotāju moduļa uzstādīšana
 UserMailRequired=Lai izveidotu jaunu lietotāju, nepieciešams e-pasts
-UsersDocModules=Document templates for documents generated from user record
-GroupsDocModules=Document templates for documents generated from a group record
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
+UsersDocModules=Dokumentu veidnes dokumentiem, kas ģenerēti no lietotāja ieraksta
+GroupsDocModules=Dokumentu veidnes dokumentiem, kas ģenerēti no grupas ieraksta
 ##### HRM setup #####
 HRMSetup=HRM moduļa iestatīšana
 ##### Company setup #####
@@ -1305,7 +1307,7 @@ BillsPDFModules=Rēķina dokumentu modeļi
 BillsPDFModulesAccordindToInvoiceType=Rēķinu dokumentu modeļi atbilstoši rēķina veidam
 PaymentsPDFModules=Maksājumu dokumentu paraugi
 ForceInvoiceDate=Force rēķina datumu apstiprināšanas datuma
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestedPaymentModesIfNotDefinedInInvoice=Ierosinātais maksājuma režīms rēķinā pēc noklusējuma, ja tas nav definēts rēķinā
 SuggestPaymentByRIBOnAccount=Iesakiet norēķinu ar norēķinu kontu
 SuggestPaymentByChequeToAddress=Ieteikt maksājumu ar čeku uz
 FreeLegalTextOnInvoices=Brīvs teksts uz rēķiniem
@@ -1317,7 +1319,7 @@ SupplierPaymentSetup=Pārdevēja maksājumu iestatīšana
 PropalSetup=Commercial priekšlikumi modulis uzstādīšana
 ProposalsNumberingModules=Komerciālie priekšlikumu numerācijas modeļi
 ProposalsPDFModules=Komerciālie priekšlikumu dokumentu modeļi
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Piedāvāto maksājumu režīms pēc noklusējuma, ja tas nav definēts priekšlikumā
 FreeLegalTextOnProposal=Brīvais teksts komerciālajos priekšlikumos
 WatermarkOnDraftProposal=Ūdenszīme projektu komerciālo priekšlikumu (none ja tukšs)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
@@ -1332,7 +1334,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Pieprasīt noliktavas avotu pasūtīšanai
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Pieprasiet bankas konta galamērķi pirkuma pasūtījumā
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Ieteiktais maksājuma režīms pārdošanas pasūtījumā pēc noklusējuma, ja tas pasūtījumā nav definēts
 OrdersSetup=Pārdošanas pasūtījumu pārvaldības iestatīšana
 OrdersNumberingModules=Pasūtījumu numerācijas modeļi
 OrdersModelModule=Pasūtīt dokumenti modeļi
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Slēpt attēlus augšējā izvēlnē
 LeftMenuBackgroundColor=Fona krāsa kreisajai izvēlnei
 BackgroundTableTitleColor=Fona krāsa tabulas virsraksta līnijai
 BackgroundTableTitleTextColor=Teksta krāsa tabulas virsraksta rindai
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Ziņojuma ID nav atrasta Dolibarr atsauce
 FormatZip=Pasta indekss
 MainMenuCode=Izvēlnes ievades kods (mainmenu)
 ECMAutoTree=Rādīt automātisko ECM koku
-OperationParamDesc=Definējiet vērtības, kas izmantojamas darbībai vai kā iegūt vērtības. Piemēram: <br> objproperty1 = SET: abc <br> objproperty1 = SET: vērtība, aizvietojot __objproperty1__ <br> objproperty3 = SETIFEMPTY: abc <br> objproperty4 = EXTRACT: HEADER: X-Myheaderkey. * [^ s] + (. *) <br> options_myextrafield = EKSTRAKTS: TEMATI: ([^ s] *) <br> object.objproperty5 = EXTRACT: ĶERMEŅA: Mans uzņēmuma nosaukums ir ([^ s] *) <br><br> Lieto ; atdalīt, lai iegūtu vai iestatītu vairākas īpašības.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Darba laiks
 OpeningHoursDesc=Ievadiet šeit sava uzņēmuma pastāvīgo darba laiku.
 ResourceSetup=Resursu moduļa konfigurēšana
@@ -1970,7 +1973,7 @@ WarningValueHigherSlowsDramaticalyOutput=Brīdinājums, augstākas vērtības pa
 ModuleActivated=Modulis %s ir aktivizēts un palēnina saskarni
 EXPORTS_SHARE_MODELS=Eksporta modeļi ir kopīgi ar visiem
 ExportSetup=Moduļa Eksportēšana iestatīšana
-ImportSetup=Setup of module Import
+ImportSetup=Moduļa importēšanas iestatīšana
 InstanceUniqueID=Unikāls gadījuma ID
 SmallerThan=Mazāks nekā
 LargerThan=Lielāks nekā
@@ -1991,7 +1994,9 @@ MakeAnonymousPing=Izveidojiet anonīmu Ping '+1' Dolibarr pamata serverim (to ve
 FeatureNotAvailableWithReceptionModule=Funkcija nav pieejama, ja ir iespējota moduļa uztveršana
 EmailTemplate=E-pasta veidne
 EMailsWillHaveMessageID=E-pastam būs tags “Atsauces”, kas atbilst šai sintaksei
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
+PDF_USE_ALSO_LANGUAGE_CODE=Ja vēlaties, lai daži PDF faili tiktu dublēti 2 dažādās valodās tajā pašā ģenerētajā PDF failā, jums šeit ir jāiestata šī otrā valoda, lai ģenerētais PDF saturētu vienā un tajā pašā lappusē 2 dažādas valodas, vienu izvēloties, ģenerējot PDF, un šo ( tikai dažas PDF veidnes to atbalsta). Vienā PDF formātā atstājiet tukšumu 1 valodā.
 FafaIconSocialNetworksDesc=Šeit ievadiet FontAwesome ikonas kodu. Ja jūs nezināt, kas ir FontAwesome, varat izmantot vispārīgo vērtību fa-adrešu grāmata.
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
+RssNote=Piezīme. Katra RSS plūsmas definīcija nodrošina logrīku, kas jums jāiespējo, lai tas būtu pieejams informācijas panelī
+JumpToBoxes=Pāriet uz Iestatīšana -> logrīki
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index 677a2029051..ec1e589cc9e 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -66,9 +66,9 @@ paymentInInvoiceCurrency=rēķinu valūtā
 PaidBack=Atmaksāts atpakaļ
 DeletePayment=Izdzēst maksājumu
 ConfirmDeletePayment=Vai tiešām vēlaties dzēst šo maksājumu?
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReduc=Vai vēlaties pārveidot šo %s par pieejamu kredītu?
 ConfirmConvertToReduc2=Summa tiks saglabāta starp visām atlaidēm un to var izmantot kā atlaidi pašreizējam vai nākotnes rēķinam par šo klientu.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
+ConfirmConvertToReducSupplier=Vai vēlaties pārveidot šo %s par pieejamu kredītu?
 ConfirmConvertToReducSupplier2=Summa tiks saglabāta starp visām atlaidēm un to var izmantot kā atlaidi pašreizējam vai nākamajam rēķinam par šo pārdevēju.
 SupplierPayments=Pārdevēja maksājumi
 ReceivedPayments=Saņemtie maksājumi
@@ -209,20 +209,13 @@ NumberOfBillsByMonth=Rēķinu skaits mēnesī
 AmountOfBills=Rēķinu summa
 AmountOfBillsHT=Rēķinu summa (bez nodokļiem)
 AmountOfBillsByMonthHT=Summa rēķini mēnesī (neto pēc nodokļiem)
-ShowSocialContribution=Rādīt sociālo/fiskālo nodokli
-ShowBill=Rādīt rēķinu
-ShowInvoice=Rādīt rēķinu
-ShowInvoiceReplace=Rādīt aizstājošo rēķinu
-ShowInvoiceAvoir=Rādīt kredīta piezīmi
-ShowInvoiceDeposit=Parādiet maksājuma rēķinu
-ShowInvoiceSituation=Rādīt situāciju rēķinu
 UseSituationInvoices=Atļaut rēķinu par situāciju
 UseSituationInvoicesCreditNote=Atļaut situācijas rēķina kredītvēstuli
 Retainedwarranty=Saglabāta garantija
-AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
+AllowedInvoiceForRetainedWarranty=Saglabātā garantija, kas izmantojama šāda veida rēķinos
 RetainedwarrantyDefaultPercent=Saglabātais garantijas noklusējuma procents
-RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
-RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
+RetainedwarrantyOnlyForSituation=Padariet “saglabāto garantiju” pieejamu tikai faktūrrēķiniem
+RetainedwarrantyOnlyForSituationFinal=Situācijas faktūrrēķinos globālo “ieturētās garantijas” atskaitījumu piemēro tikai galīgajai situācijai
 ToPayOn=Maksāt %s
 toPayOn=maksāt pa tālruni %s
 RetainedWarranty=Saglabātā garantija
@@ -233,7 +226,6 @@ setretainedwarranty=Iestatiet saglabāto garantiju
 setretainedwarrantyDateLimit=Iestatiet saglabātā garantijas datuma ierobežojumu
 RetainedWarrantyDateLimit=Saglabātais garantijas termiņš
 RetainedWarrantyNeed100Percent=Situācijas rēķinam jābūt 100%% gaitai, lai tas tiktu parādīts PDF formātā
-ShowPayment=Rādīt maksājumu
 AlreadyPaid=Jau samaksāts
 AlreadyPaidBack=Jau atgriezta nauda
 AlreadyPaidNoCreditNotesNoDeposits=Jau samaksāts (bez kredīta piezīmes un noguldījumiem)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Izveidots no veidnes rēķina %s
 WarningInvoiceDateInFuture=Brīdinājums! Rēķina datums ir lielāks par pašreizējo datumu
 WarningInvoiceDateTooFarInFuture=Brīdinājums, rēķina datums ir pārāk tālu no pašreizējā datuma
 ViewAvailableGlobalDiscounts=Skatīt pieejamās atlaides
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Statuss
 PaymentConditionShortRECEP=Pienākas pēc saņemšanas
@@ -512,11 +505,11 @@ ToMakePayment=Maksāt
 ToMakePaymentBack=Atmaksāt
 ListOfYourUnpaidInvoices=Saraksts ar neapmaksātiem rēķiniem
 NoteListOfYourUnpaidInvoices=Piezīme: Šis saraksts satur tikai rēķinus par trešo pušu Jums ir saistīti ar kā pārdošanas pārstāvis.
-RevenueStamp=Tax stamp
+RevenueStamp=Nodokļa zīmogs
 YouMustCreateInvoiceFromThird=Šī opcija ir pieejama tikai tad, ja izveidojat rēķinu no trešās personas cilnes "Klients"
 YouMustCreateInvoiceFromSupplierThird=Šī opcija ir pieejama tikai tad, ja izveidojat rēķinu no trešās puses cilnes „Pārdevējs”
 YouMustCreateStandardInvoiceFirstDesc=Vispirms vispirms jāizveido standarta rēķins un jāpārveido tas par "veidni", lai izveidotu jaunu veidnes rēķinu
-PDFCrabeDescription=Rēķina PDF veidne Krabis. Pilna rēķina veidne 
+PDFCrabeDescription=Rēķina PDF veidne Krabis. Pilna rēķina veidne (vecā Sponge veidnes ieviešana)
 PDFSpongeDescription=Rēķina PDF veidne Sponge. Pilnīga rēķina veidne
 PDFCrevetteDescription=Rēķina PDF veidne Crevette. Pabeigta rēķina veidne situāciju rēķiniem
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -578,4 +571,4 @@ AutoFillDateTo=Iestatīt pakalpojuma līnijas beigu datumu ar nākamo rēķina d
 AutoFillDateToShort=Iestatīt beigu datumu
 MaxNumberOfGenerationReached=Maksimālais gen. sasniedza
 BILL_DELETEInDolibarr=Rēķins dzēsts
-BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
+BILL_SUPPLIER_DELETEInDolibarr=Piegādātāja rēķins ir izdzēsts
diff --git a/htdocs/langs/lv_LV/modulebuilder.lang b/htdocs/langs/lv_LV/modulebuilder.lang
index 88e0c5b2dc9..ed5c37a00ea 100644
--- a/htdocs/langs/lv_LV/modulebuilder.lang
+++ b/htdocs/langs/lv_LV/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=Vārdnīcu ierakstu saraksts
 ListOfPermissionsDefined=Noteikto atļauju saraksts
 SeeExamples=Skatiet piemērus šeit
 EnabledDesc=Nosacījums, lai šis lauks būtu aktīvs (piemēri: 1 vai $ conf-> globāla-> MYMODULE_MYOPTION)
-VisibleDesc=Vai lauks ir redzams? (Piemēri: 0 = nekad nav redzams, 1 = redzams sarakstā un izveidojiet / atjauniniet / skatiet veidlapas, 2 = ir redzams tikai sarakstā, 3 = ir redzams tikai izveides / atjaunināšanas / skata formā (nav sarakstā), 4 = ir redzams sarakstā un tikai atjaunināt / skatīt formu (neveidot), 5 = redzama tikai saraksta beigu skata formā (neveidot, ne atjaunināt.) Negatīvas vērtības līdzekļu lauka izmantošana pēc noklusējuma netiek parādīta sarakstā, bet to var atlasīt apskatei. Tas var būt izteiciens, piemēram: <br> preg_match ('/ public /', $ _SERVER ['PHP_SELF'])? 0: 1 <br> ($ user-> rights-> holiday-> define_holiday? 1: 0)
-DisplayOnPdfDesc=Parādiet šo lauku saderīgos PDF dokumentos. Varat pārvaldīt pozīciju ar lauku "Position". <br/> Pašlaik zināmie saderīgie PDF modeļi ir: eratosteēns 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Parādiet šo lauku saderīgos PDF dokumentos. Varat pārvaldīt pozīciju ar lauku "Position". <br/> Pašlaik zināms savietojamie PDF modeļi ir: Eratostens (rīkojums), Espadon (kuģis), sūkli (rēķini), ciāna (propal / citāts), Cornas (piegādātājs rīkojums) <br/> <br/> <strong> Par dokumenta: </strong> <br/> 0 = nav redzams <br/> 1 = displejs <br/> 2 = parādīt tikai tad, ja nav iztukšot <br/> <br/> <strong> dokumentu līnijas: </strong> <br/> 0 = nav redzama <br/> 1 = parādīti kolonnā <br/> 3 = displeja līnija apraksta slejā pēc apraksta <br/> 4 = displeja apraksta ailē pēc tam, kad apraksts tikai tad, ja nav tukšs
 DisplayOnPdf=Displejs PDF formātā
 IsAMeasureDesc=Vai lauka vērtību var uzkrāties, lai kopsumma tiktu iekļauta sarakstā? (Piemēri: 1 vai 0)
 SearchAllDesc=Vai laukums tiek izmantots, lai veiktu meklēšanu no ātrās meklēšanas rīka? (Piemēri: 1 vai 0)
diff --git a/htdocs/langs/lv_LV/multicurrency.lang b/htdocs/langs/lv_LV/multicurrency.lang
index db7d0aaacdb..cb7103d1f51 100644
--- a/htdocs/langs/lv_LV/multicurrency.lang
+++ b/htdocs/langs/lv_LV/multicurrency.lang
@@ -18,3 +18,5 @@ MulticurrencyReceived=Saņemta oriģinālā valūta
 MulticurrencyRemainderToTake=Atlikušā summa, oriģināla valūta
 MulticurrencyPaymentAmount=Maksājuma summa, oriģinālajā valūtā
 AmountToOthercurrency=Summa līdz (konta saņemšanas valūtā)
+CurrencyRateSyncSucceed=Valūtas kursa sinhronizācija ir veiksmīga
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Maksājumiem tiešsaistē izmantojiet dokumenta valūtu
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index 75fbe01f961..d0fa1eae9a8 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -186,7 +186,7 @@ PlannedWorkload=Plānotais darba apjoms
 PlannedWorkloadShort=Darba slodze
 ProjectReferers=Saistītās vienības
 ProjectMustBeValidatedFirst=Projektu vispirms jāpārbauda
-FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+FirstAddRessourceToAllocateTime=Piešķiriet lietotāja resursam kā projekta kontaktpersonai laika piešķiršanai
 InputPerDay=Ievades dienā
 InputPerWeek=Ievades nedēļā
 InputPerMonth=Ievade mēnesī
@@ -238,7 +238,7 @@ LatestModifiedProjects=Jaunākie %s labotie projekti
 OtherFilteredTasks=Citi filtrētie uzdevumi
 NoAssignedTasks=Nekādi piešķirtie uzdevumi nav atrasti (piešķiriet projektu / uzdevumus pašreizējam lietotājam no augšējā atlases lodziņa, lai ievadītu laiku tajā)
 ThirdPartyRequiredToGenerateInvoice=Lai varētu to izrēķināt, projektā ir jādefinē trešā persona.
-ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+ChooseANotYetAssignedTask=Izvēlieties uzdevumu, kas jums vēl nav uzticēts
 # Comments trans
 AllowCommentOnTask=Atļaut lietotāju komentārus par uzdevumiem
 AllowCommentOnProject=Atļaut lietotājam komentēt projektus
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Pakalpojums, ko izmantot līnijās
 InvoiceGeneratedFromTimeSpent=Rēķins %s ir radīts no projekta pavadīta laika
 ProjectBillTimeDescription=Pārbaudiet, vai projekta uzdevumos ievadāt laika kontrolsarakstu UN Plānojat no laika kontrolsaraksta ģenerēt rēķinu (rēķinus), lai projekta klientam izrakstītu rēķinu (nepārbaudiet, vai plānojat izveidot rēķinu, kas nav balstīts uz ievadītajām laika kontrollapām). Piezīme. Lai ģenerētu rēķinu, dodieties uz projekta cilni “Pavadītais laiks” un atlasiet iekļaujamās līnijas.
 ProjectFollowOpportunity=Izmantojiet iespēju
-ProjectFollowTasks=Izpildiet uzdevumus
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Lietošana
 UsageOpportunity=Lietošana: Iespēja
 UsageTasks=Lietošana: uzdevumi
@@ -264,4 +264,4 @@ InvoiceToUse=Izmantojamais rēķina projekts
 NewInvoice=Jauns rēķins
 OneLinePerTask=Viena rinda katram uzdevumam
 OneLinePerPeriod=Viena rindiņa vienam periodam
-RefTaskParent=Ref. Parent Task
+RefTaskParent=Ref. Vecāku uzdevums
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index 844b54e8c18..a082a305ac6 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -43,7 +43,7 @@ SetAsHomePage=Iestatīt kā mājas lapu
 RealURL=Reāls URL
 ViewWebsiteInProduction=Apskatīt vietni, izmantojot mājas URL
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
-ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
+ExampleToUseInApacheVirtualHostConfig=Piemērs izmantošanai Apache virtuālā resursdatora iestatīšanā:
 YouCanAlsoTestWithPHPS=<u> Izmantojiet ar PHP serveri. </u> <br> Izstrādājot vidi, jūs varat izvēlēties testēt vietni ar PHP tīmekļa serveri (nepieciešams PHP 5.5), palaižot <br><strong> php -S 0.0. 0.0 8080-t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Izmantojiet savu vietni kopā ar citu Dolibarr mitināšanas pakalpojumu sniedzēju</u> <br> Ja jums nav pieejams tāds interneta serveris kā Apache vai NGinx, varat eksportēt un importēt savu vietni citā Dolibarr instancē, kuru nodrošina cits Dolibarr mitināšanas pakalpojumu sniedzējs un kas nodrošina pilnīgu integrāciju ar vietnes moduli. Dažu Dolibarr mitināšanas pakalpojumu sniedzēju sarakstu varat atrast vietnē <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Pārbaudiet arī to, vai virtuālajam serverim ir atļauja <strong>%s</strong> failiem vietnē <br><strong>%s</strong>
@@ -57,7 +57,7 @@ NoPageYet=Vēl nav nevienas lapas
 YouCanCreatePageOrImportTemplate=Jūs varat izveidot jaunu lapu vai importēt pilnu vietnes veidni
 SyntaxHelp=Palīdzība par konkrētiem sintakses padomiem
 YouCanEditHtmlSourceckeditor=Jūs varat rediģēt HTML avota kodu, izmantojot redaktorā pogu "Avots".
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Šajā avotā varat iekļaut PHP kodu, izmantojot tagus <strong>&lt;? Php?&gt;</strong> . Ir pieejami šādi globālie mainīgie: $ conf, $ db, $ mysoc, $ user, $ website, $ websitepage, $ weblangs. <br><br><span class="fa fa-bug"></span> Varat arī iekļaut citas lapas / konteinera saturu ar šādu sintaksi: <br> <strong>&lt;? php includeContainer ('alias_of_container_to_include'); ?&gt;</strong> <br><br><span class="fa fa-bug"></span> Jūs varat veikt novirzīšanu uz citu lapu / konteineru ar šādu sintaksi (piezīme: pirms novirzīšanas neizvadiet saturu): <br> <strong>&lt;? php redirectToContainer ('alias_of_container_to_redirect_to'); ?&gt;</strong> <br><br><span class="fa fa-link"></span> Lai pievienotu saiti citai lapai, izmantojiet sintakse: <br> <strong>&lt;a href=&quot;alias_of_page_to_link_to.php&quot;&gt; mana saite &lt;a&gt;</strong> <br><br><span class="fa fa-download"></span> Lai iekļautu <strong>saiti</strong> <strong>dokumentu</strong> direktorijā saglabāta faila <strong>lejupielādei</strong> , izmantojiet iesaiņojumu <strong>document.php</strong> : <br> Piemēram, failam dokumentos / ecm (nepieciešams reģistrēties) sintakse ir: <br> <strong>&lt;a href=&quot;/document.php?modulepart=ecm&amp;file=[relative_dir/&gt;faila nosaukums.ext&quot;&gt;</strong> <br> Failam dokumentos / plašsaziņas līdzekļos (atvērts direktorijs publiskai piekļuvei) sintakse ir: <br> <strong>&lt;a href=&quot;/document.php?modulepart=medias&amp;file=[relative_dir/ ]faila nosaukums.ext&quot;&gt;</strong> <br> Failam, kas koplietots ar koplietošanas saiti (atvērta piekļuve, izmantojot faila koplietošanas hash atslēgu), sintakse ir šāda: <br> <strong>&lt;a href=&quot;/document.php?hashp=publicsharekeyoffile&quot;&gt;</strong> <br><br><span class="fa fa-picture-o"></span> Lai iekļautu <strong>attēlu</strong> saglabāto uz <strong>dokumentu</strong> direktoriju, izmantojiet <strong>viewimage.php</strong> iesaiņojums: <br> Piemērs attēlam dokumentos / datu nesējos (atvērts direktorijs publiskai piekļuvei) sintakse ir: <br> <strong>&lt;img src = &quot;/ viewimage.php? modulepart = medias &amp; file = [relia_dir /] filename.ext&quot;&gt;</strong> <br><br> Vairāk HTML vai dinamiskā koda piemēru, kas pieejami <a href="%s" target="_blank">wiki dokumentācijā</a> <br> .
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Klonēt lapu / konteineru
 CloneSite=Klonēt vietni
 SiteAdded=Tīmekļa vietne ir pievienota
@@ -77,7 +77,7 @@ BlogPost=Emuāra ziņa
 WebsiteAccount=Tīmekļa vietnes konts
 WebsiteAccounts=Tīmekļa vietnes konti
 AddWebsiteAccount=Izveidot mājas lapas kontu
-BackToListOfThirdParty=Atpakaļ uz trešo pušu sarakstu
+BackToListForThirdParty=Atpakaļ uz trešo personu sarakstu
 DisableSiteFirst=Vispirms atspējojiet vietni
 MyContainerTitle=Manas tīmekļa vietnes virsraksts
 AnotherContainer=Šis ir veids, kā iekļaut citas lapas / konteinera saturu (šeit, iespējams, iespējot dinamisko kodu, iespējams, ir kļūda, jo iegultais apakštvertne, iespējams, neeksistē)
@@ -85,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Diemžēl šī vietne pašlaik nav pieejama. Lūd
 WEBSITE_USE_WEBSITE_ACCOUNTS=Iespējot tīmekļa vietnes kontu tabulu
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Ļauj tabulai saglabāt tīmekļa vietņu kontus (pieteikšanās / caurlaide) katrai vietnei / trešajai pusei
 YouMustDefineTheHomePage=Vispirms ir jādefinē noklusējuma sākumlapa
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContentFuture=Brīdinājums: Web lapas izveidošana, importējot ārēju Web lapu, ir paredzēta pieredzējušiem lietotājiem. Atkarībā no avota lapas sarežģītības importēšanas rezultāts var atšķirties no oriģināla. Arī tad, ja avota lapā tiek izmantoti parastie CSS stili vai konfliktējošais javascript, strādājot ar šo lapu, tas var sabojāt vietnes redaktora izskatu vai funkcijas. Šī metode ir ātrāks veids, kā izveidot lapu, taču ieteicams jauno lapu izveidot no nulles vai no ieteiktās lapas veidnes. <br> Ņemiet vērā arī to, ka iebūvētais redaktors, iespējams, nedarbosies pareizi, ja to izmanto satvertā ārējā lapā.
 OnlyEditionOfSourceForGrabbedContent=Tikai HTML avota izdevums ir pieejams, ja saturs tiek satverts no ārējas vietnes
 GrabImagesInto=Grab arī attēlus, kas atrodami CSS un lapā.
 ImagesShouldBeSavedInto=Attēli jāuzglabā mapē
@@ -125,6 +125,6 @@ UseTextBetween5And70Chars=Lai iegūtu labu SEO praksi, izmantojiet tekstu no 5 l
 MainLanguage=Galvenā valoda
 OtherLanguages=Citas valodas
 UseManifest=Norādiet failu manifest.json
-PublicAuthorAlias=Public author alias
-AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
-ReplacementDoneInXPages=Replacement done in %s pages or containers
+PublicAuthorAlias=Publiskā autora pseidonīms
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Pieejamās valodas tiek definētas vietņu īpašumos
+ReplacementDoneInXPages=Aizvietošana veikta %s lappusēs vai konteineros
diff --git a/htdocs/langs/lv_LV/zapier.lang b/htdocs/langs/lv_LV/zapier.lang
new file mode 100644
index 00000000000..918fcac049e
--- /dev/null
+++ b/htdocs/langs/lv_LV/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier priekš Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Par zapier Dolibarr moduli
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Zapier iestatīšana Dolibarr
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index 9065ad63188..e28fa585d99 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index f5d4aafd77e..a95d988c6e5 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web server user/group
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Module <b>%s</b> must be enabled
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Users module setup
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
index d8c64f369c9..8754c8f2ce5 100644
--- a/htdocs/langs/mk_MK/bills.lang
+++ b/htdocs/langs/mk_MK/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=Show invoice
-ShowInvoice=Show invoice
-ShowInvoiceReplace=Show replacing invoice
-ShowInvoiceAvoir=Show credit note
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/mk_MK/donations.lang b/htdocs/langs/mk_MK/donations.lang
index 5edc8d62033..ef16fd82b38 100644
--- a/htdocs/langs/mk_MK/donations.lang
+++ b/htdocs/langs/mk_MK/donations.lang
@@ -7,16 +7,16 @@ AddDonation=Create a donation
 NewDonation=New donation
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Show donation
 PublicDonation=Public donation
 DonationsArea=Donations area
 DonationStatusPromiseNotValidated=Draft promise
 DonationStatusPromiseValidated=Validated promise
 DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
-DonationStatusPromiseValidatedShort=Validated
+DonationStatusPromiseValidatedShort=Валидирано
 DonationStatusPaidShort=Received
 DonationTitle=Donation receipt
+DonationDate=Donation date
 DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
diff --git a/htdocs/langs/mk_MK/interventions.lang b/htdocs/langs/mk_MK/interventions.lang
index e7667ef6946..e5936f8246e 100644
--- a/htdocs/langs/mk_MK/interventions.lang
+++ b/htdocs/langs/mk_MK/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/mk_MK/modulebuilder.lang b/htdocs/langs/mk_MK/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/mk_MK/modulebuilder.lang
+++ b/htdocs/langs/mk_MK/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/mk_MK/multicurrency.lang b/htdocs/langs/mk_MK/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/mk_MK/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index cdc0e6b3c95..bb42bff3c87 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/mk_MK/website.lang b/htdocs/langs/mk_MK/website.lang
index c802b2d2ae8..bce2a09fb03 100644
--- a/htdocs/langs/mk_MK/website.lang
+++ b/htdocs/langs/mk_MK/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/mk_MK/zapier.lang b/htdocs/langs/mk_MK/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/mk_MK/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/mn_MN/accountancy.lang b/htdocs/langs/mn_MN/accountancy.lang
index 1f9382137ea..b8ce37a0956 100644
--- a/htdocs/langs/mn_MN/accountancy.lang
+++ b/htdocs/langs/mn_MN/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index 0205f246b0c..7eb67d7a4ab 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web server user/group
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Module <b>%s</b> must be enabled
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Users module setup
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/mn_MN/bills.lang b/htdocs/langs/mn_MN/bills.lang
index 8c22ce0159a..9f11d8ecf87 100644
--- a/htdocs/langs/mn_MN/bills.lang
+++ b/htdocs/langs/mn_MN/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=Show invoice
-ShowInvoice=Show invoice
-ShowInvoiceReplace=Show replacing invoice
-ShowInvoiceAvoir=Show credit note
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/mn_MN/donations.lang b/htdocs/langs/mn_MN/donations.lang
index 5edc8d62033..de4bdf68f03 100644
--- a/htdocs/langs/mn_MN/donations.lang
+++ b/htdocs/langs/mn_MN/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Create a donation
 NewDonation=New donation
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Show donation
 PublicDonation=Public donation
 DonationsArea=Donations area
 DonationStatusPromiseNotValidated=Draft promise
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
 DonationTitle=Donation receipt
+DonationDate=Donation date
 DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
diff --git a/htdocs/langs/mn_MN/interventions.lang b/htdocs/langs/mn_MN/interventions.lang
index e7667ef6946..e5936f8246e 100644
--- a/htdocs/langs/mn_MN/interventions.lang
+++ b/htdocs/langs/mn_MN/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/mn_MN/modulebuilder.lang b/htdocs/langs/mn_MN/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/mn_MN/modulebuilder.lang
+++ b/htdocs/langs/mn_MN/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/mn_MN/multicurrency.lang b/htdocs/langs/mn_MN/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/mn_MN/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/mn_MN/projects.lang b/htdocs/langs/mn_MN/projects.lang
index cdc0e6b3c95..bb42bff3c87 100644
--- a/htdocs/langs/mn_MN/projects.lang
+++ b/htdocs/langs/mn_MN/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/mn_MN/website.lang b/htdocs/langs/mn_MN/website.lang
index c802b2d2ae8..bce2a09fb03 100644
--- a/htdocs/langs/mn_MN/website.lang
+++ b/htdocs/langs/mn_MN/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/mn_MN/zapier.lang b/htdocs/langs/mn_MN/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/mn_MN/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 96dbc561dd8..7a21d725e36 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bundne fakturalinjer
 ExpenseReportLines=Utgiftsrapport-linjer som skal bindes
 ExpenseReportLinesDone=Bundne utgiftsrapport-linjer
 IntoAccount=Bind linje med regnskapskonto
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Regnskapskonto for registrering av donasjoner
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Regnskapskonto for å registrere abonnementer
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Regnskapskonto som standard for de kjøpte varene (brukt hvis ikke definert i produktarket)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Regnskapskonto som standard for kjøpte produkter i EU (brukt hvis ikke definert i produktarket)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Regnskapskonto som standard for kjøpte produkter og importert ut av EU (brukt hvis ikke definert i produktarket)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard regnskapskonto for solgte varer (brukt hvis ikke definert på varekortet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Regnskapskonto som standard for varene som selges i EU (brukt hvis ikke definert i varearket)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Regnskapskonto som standard for produktene som er solgt og eksportert ut av EU (brukt hvis ikke definert i varearket)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard regnskapskonto for kjøpte tjenester (brukt hvis ikke definert på tjenestekortet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Regnskapskonto som standard for kjøpte tjenester i EU (brukt hvis ikke definert i tjenestearket)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Regnskapskonto som standard for kjøpte tjenester og importert ut av EU (brukt hvis ikke definert i tjenestearket)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard regnskapskonto for solgte tjenester (brukt hvis ikke definert på tjenestekortet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Regnskapskonto som standard for tjenestene som selges i EU (brukes hvis ikke definert i tjenestearket)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Regnskapskonto som standard for tjenestene som er solgt og eksportert ut av EU (brukt hvis ikke definert i tjenestearket)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Tredjepart ukjent
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Tredjepartskonto ikke definert eller tredjepart ukjent. Blokkeringsfeil.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Ukjent tredjepartskonto og ventekonto ikke definert. Blokkeringsfeil
 PaymentsNotLinkedToProduct=Betaling ikke knyttet til noen vare/tjeneste
+OpeningBalance=Opening balance
 ShowOpeningBalance=Vis åpningsbalanse
 HideOpeningBalance=Skjul åpningsbalansen
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Kontogruppe
 PcgtypeDesc=Kontogruppe brukes som forhåndsdefinerte 'filter' og 'gruppering' kriterier for noen regnskapsrapporter. For eksempel blir 'INNTEKT' eller 'UTGIFT' brukt som grupper for regnskapsføring av varer for å lage utgifts-/inntektsrapporten.
 
+Reconcilable=Kan avstemmes
+
 TotalVente=Total omsetning før skatt
 TotalMarge=Total salgsmargin
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Eksport til Quadratus QuadraCompta
 Modelcsv_ebp=Eksport tilEBP
 Modelcsv_cogilog=Eksport til Cogilog
 Modelcsv_agiris=Eksport til Agiris
-Modelcsv_LDCompta=Eksporter for LD Compta (v9 og høyere) (Test)
+Modelcsv_LDCompta=Eksport for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Eksporter for LD Compta (v10 og høyere)
 Modelcsv_openconcerto=Eksport for OpenConcerto (Test)
 Modelcsv_configurable=Eksport CSV Konfigurerbar
 Modelcsv_FEC=Eksporter FEC
 Modelcsv_Sage50_Swiss=Eksport for Sage 50 Switzerland
+Modelcsv_winfic=Eksporter Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Kontoplan ID
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Salgsmodus
 OptionModeProductSellIntra=Modussalg eksportert i EU
 OptionModeProductSellExport=Modussalg eksportert i andre land
 OptionModeProductBuy=Innkjøpsmodus
+OptionModeProductBuyIntra=Moduskjøp importert i EU
+OptionModeProductBuyExport=Moduskjøp importert fra andre land
 OptionModeProductSellDesc=Vis alle varer for salg, med regnskapskonto
 OptionModeProductSellIntraDesc=Vis alle varer med regnskapskonto for salg innen EU
 OptionModeProductSellExportDesc=Vis alle varer med regnskapskonto for andre internasjonale salg.
 OptionModeProductBuyDesc=Vis alle varer for kjøp, med regnskapskonto
+OptionModeProductBuyIntraDesc=Vis alle produkter med regnskapskonto for kjøp i EU.
+OptionModeProductBuyExportDesc=Vis alle produkter med regnskapskonto for andre utenlandske kjøp.
 CleanFixHistory=Fjern regnskapskode fra linjer som ikke finnes i kontooversikt
 CleanHistory=Nullstill alle bindinger for valgt år
 PredefinedGroups=Forhåndsdefinerte grupper
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Kontoen er fjernet fra gruppen
 SaleLocal=Lokalt salg
 SaleExport=Eksportsalg
 SaleEEC=Salg i EU
+SaleEECWithVAT=Salg i EU med mva som ikke er null, så vi antar at dette IKKE er et intra-EU salg og den foreslåtte kontoen er standard produktkonto.
+SaleEECWithoutVATNumber=Salg i EU uten mva, men mva-ID for tredjepart er ikke definert. Vi faller tilbake på produktkontoen for standard salg. Du kan fikse mva-ID for tredjepart eller produktkonto om nødvendig.
 
 ## Dictionary
 Range= Oversikt over regnskapskonto
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index dd75edd09bf..30532f0de69 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Webserver bruker/gruppe
 NoSessionFound=Din PHP-konfigurasjon ser ut til å ikke tillate oppføring av aktive økter. Mappen som brukes til å lagre økter (<b> %s </b>) kan være beskyttet (for eksempel av operativsystemer eller ved hjelp av PHP-direktivet open_basedir).
 DBStoringCharset=Databasetegnsett for lagring av data
 DBSortingCharset=Databasetegnsett for sortering av data
+HostCharset=Host charset
 ClientCharset=Klien karaktersett
 ClientSortingCharset=Klientsammenstilling
 WarningModuleNotActive=Modulen <b>%s</b> må være slått på
@@ -99,9 +100,9 @@ NoMaxSizeByPHPLimit=Merk: Det er ikke satt noen begrensninger i din PHP-konfigur
 MaxSizeForUploadedFiles=Maksimal filstørrelse for opplasting av filer (0 for å ikke tillate opplasting)
 UseCaptchaCode=Bruk Capthca på innloggingsside
 AntiVirusCommand=Full sti til antivirus kommandoen
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusCommandExample=Eksempel for ClamAv Daemon (krever clamav-daemon): /usr/bin/clamdscan<br>Eksempel på ClamWin (veldig veldig treg): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Flere parametre på kommandolinjen
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Eksempel for ClamAv Daemon: --fdpass <br> Eksempel for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Oppsett av regnskapsmodul
 UserSetup=Oppsett av brukere
 MultiCurrencySetup=Oppsett av fler-valuta
@@ -199,7 +200,7 @@ FeatureDisabledInDemo=Funksjonen er slått av i demo
 FeatureAvailableOnlyOnStable=Egenskapen er kun tilgjengelig på offisielle, stabile versjoner
 BoxesDesc=Widgets er komponenter som viser litt informasjon du kan legge til for å tilpasse noen sider. Du kan velge mellom å vise widgeten eller ikke ved å velge målside og klikke på "Aktiver", eller ved å klikke på papirkurven for å deaktivere den.
 OnlyActiveElementsAreShown=Bare elementer fra <a href="%s">aktiverte moduler</a> vises.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesDesc=Modulene/applikasjonene bestemmer hvilke funksjoner som er tilgjengelige i programvaren. Noen moduler krever at tillatelse gis til brukere etter at modulen er aktivert. Klikk på/av-knappen<span class="small valignmiddle">%s</span> for hver modul for å aktivere eller deaktivere en modul/applikasjon.
 ModulesMarketPlaceDesc=Du kan finne flere moduler for nedlasting på eksterne nettsteder.
 ModulesDeployDesc=Hvis tillatelser for filsystemet tillater det, kan du bruke dette verktøyet til å distribuere en ekstern modul. Modulen vil da være synlig under fanen <strong>%s</strong>.
 ModulesMarketPlaces=Finn eksterne apper/moduler
@@ -222,7 +223,7 @@ DoliPartnersDesc=Liste over selskaper som tilbyr spesialutviklede moduler eller
 WebSiteDesc=Eksterne nettsteder for flere tilleggs- (ikke-kjerne) moduler ...
 DevelopYourModuleDesc=Noen løsninger for å utvikle din egen modul...
 URL=URL
-RelativeURL=Relative URL
+RelativeURL=Relativ URL
 BoxesAvailable=Tilgjengelige widgeter
 BoxesActivated=Aktiverte widgeter
 ActivateOn=Aktivert på
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Sjekkbokser
 ExtrafieldCheckBoxFromList=Avkrysningsbokser fra tabell
 ExtrafieldLink=Lenke til et objekt
 ComputedFormula=Beregnet felt
-ComputedFormulaDesc=Her kan du skrive inn en formel ved hjelp av andre objektegenskaper eller PHP-koding for å få en dynamisk beregningnet verdi. Du kan bruke PHP-kompatible formler, inkludert "?" operator og følgende globale objekt: <strong> $db, $conf, $langs, $mysoc, $user, $objekt </strong>. <br><br><Strong> ADVARSEL </strong>: Kanskje bare noen egenskaper på $objekt er tilgjengelig. Hvis du trenger egenskaper som ikke er lastet, kan du bare hente objektet i formelen din som i det andre eksempelet. <br> Ved å bruke et beregnet felt betyr det at du ikke selv kan angi noen verdi fra grensesnittet. Også, hvis det er en syntaksfeil, kan det hende formelen ikke returnerer noe. <br> <br> Eksempel på formel: <br> $objekt->id<10? round ($object->id / 2, 2) : ($object-> id + 2 *$user->id) * (int) substr($mysoc->zip, 1, 2) <br> <br> Eksempel på å ny innlasting av objekt <br> (($reloadedobj = new Societe ($db)) && ($reloadedobj->fetch($obj-> id? $ obj-> id: ($obj-> rowid? $obj-> rowid: $object-> id))> 0))? $reloadedobj-> array_options ['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1' <br> <br> Annet eksempel på formel for å tvinge lasting av objekt og dets overordnede objekt: <br> (($reloadedobj = Ny oppgave ($db)) && ($reloadedobj->fetch($objekt->id)> 0) && ($secondloadedobj = nytt prosjekt ($db)) && ($secondloadedobj->fetch($reloadedobj-> fk_project )> 0))? $secondloadedobj-> ref: 'Foreldreprosjekt ikke funnet'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Lagre beregnede felt
 ComputedpersistentDesc=Beregnede ekstrafelt vil bli lagret i databasen, men verdien blir bare omregnet når objektet til dette feltet endres. Hvis det beregnede feltet avhenger av andre objekter eller globale data, kan denne verdien være feil!
 ExtrafieldParamHelpPassword=Hvis dette feltet er tomt, vil denne verdien bli lagret uten kryptering (feltet må bare skjules med stjerne på skjermen). <br> Angi 'auto' for å bruke standard krypteringsregel for å lagre passordet i databasen (da vil verdiavlesning være bare hash, uten noen måte å hente opprinnelig verdi på)
@@ -448,8 +449,8 @@ KeepEmptyToUseDefault=Hold tomt for å bruke standardverdien
 DefaultLink=Standard kobling
 SetAsDefault=Sett som standard
 ValueOverwrittenByUserSetup=Advarsel, denne verdien kan bli overskrevet av brukerspesifikke oppsett (hver bruker kan sette sitt eget clicktodial url)
-ExternalModule=External module
-InstalledInto=Installed into directory %s
+ExternalModule=Ekstern modul
+InstalledInto=Installert i mappen %s
 BarcodeInitForthird-parties=Masseinitiering av strekkoder for tredjeparter
 BarcodeInitForProductsOrServices=Masseinitiering eller sletting av strekkoder for varer og tjenester
 CurrentlyNWithoutBarCode=For øyeblikket har du <strong>%s</strong> poster på <strong>%s</strong> %s uten strekkode.
@@ -950,7 +951,7 @@ DictionaryCanton=Stater/provinser
 DictionaryRegion=Region
 DictionaryCountry=Land
 DictionaryCurrency=Valutaer
-DictionaryCivility=Honorific titles
+DictionaryCivility=Ærestittel
 DictionaryActions=Typer agendahendelser
 DictionarySocialContributions=Typer av sosiale avgifter og skatter
 DictionaryVAT=MVA satser
@@ -991,7 +992,7 @@ VATIsNotUsedDesc=Foreslått MVA er som standard 0. Den kan brukes mot foreninger
 VATIsUsedExampleFR=I Frankrike betyr det at bedrifter eller organisasjoner har et reelt finanssystem (forenklet reell eller normal reell). Et system hvor MVA er erklært.
 VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
+TypeOfSaleTaxes=Type omsetningsavgift
 LTRate=Rate
 LocalTax1IsNotUsed=Ikke bruk andre skatter
 LocalTax1IsUsedDesc=Bruk en annen type skatt (annet enn den første)
@@ -1015,8 +1016,8 @@ LocalTax2IsUsedDescES=Standard RE-sats når du oppretter prospekter, fakturaer,
 LocalTax2IsNotUsedDescES=Som standard er den foreslåtte IRPF er 0. Slutt på regelen.
 LocalTax2IsUsedExampleES=I Spania, for frilansere og selvstendige som leverer tjenester, og bedrifter som har valgt moduler for skattesystem.
 LocalTax2IsNotUsedExampleES=I Spania er de bedrifter som ikke er ikke skattepliktige
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
-UseRevenueStamp=Use a tax stamp
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
+UseRevenueStamp=Bruk et avgiftsstempel
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Rapport over lokale avgifter 
 CalcLocaltax1=Salg - Innkjøp
@@ -1272,7 +1273,8 @@ RuleForGeneratedPasswords=Regler for å generere og validere passord
 DisableForgetPasswordLinkOnLogonPage=Ikke vis koblingen "Glemt passord" på innloggingssiden
 UsersSetup=Oppsett av brukermodulen
 UserMailRequired=E-postadresse kreves for å opprette en ny bruker
-UsersDocModules=Document templates for documents generated from user record
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
+UsersDocModules=Dokumentmaler for dokumenter generert fra brukerpost
 GroupsDocModules=Dokumentmaler for dokumenter generert fra en gruppeoppføring
 ##### HRM setup #####
 HRMSetup=Oppsett av HRM-modul
@@ -1305,7 +1307,7 @@ BillsPDFModules=Fakturamaler
 BillsPDFModulesAccordindToInvoiceType=Faktura-dokumentmodeller etter fakturatype
 PaymentsPDFModules=Betalingsdokumentmodeller
 ForceInvoiceDate=Tving fakturadato til godkjenningsdato
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestedPaymentModesIfNotDefinedInInvoice=Foreslått betalingsmodus på faktura som standard hvis den ikke er definert på fakturaen
 SuggestPaymentByRIBOnAccount=Foreslå betaling trukket fra konto
 SuggestPaymentByChequeToAddress=Foreslå betaling med sjekk til
 FreeLegalTextOnInvoices=Fritekst på fakturaer
@@ -1317,7 +1319,7 @@ SupplierPaymentSetup=Oppsett av leverandørbetaling
 PropalSetup=Oppsett av modulen Tilbud
 ProposalsNumberingModules=Nummereringsmodul for tilbud
 ProposalsPDFModules=Tilbudsmaler
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Forslag til betalingsmodus på tilbud som standard hvis ikke definert i tilbudet
 FreeLegalTextOnProposal=Fritekst på tilbud
 WatermarkOnDraftProposal=Vannmerke på tilbudskladder (ingen hvis tom)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Be om bankkonto for tilbudet
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Oppsett av multi-selskap-modulen
 ##### Suppliers #####
 SuppliersSetup=Oppsett av leverandørmodul
 SuppliersCommandModel=Komplett mal for innkjøpsordre
-SuppliersCommandModelMuscadet=Komplett mal for innkjøpsordre 
+SuppliersCommandModelMuscadet=Komplett mal for innkjøpsordre (gammel implementering av cornas mal)
 SuppliersInvoiceModel=Komplett mal for leverandørfaktura
 SuppliersInvoiceNumberingModel=Leverandørfaktura nummereringsmodeller
 IfSetToYesDontForgetPermission=Hvis satt til en ikke-nullverdi, ikke glem å gi tillatelser til grupper eller brukere som er tillatt for den andre godkjenningen
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Skjul bilder i toppmeny
 LeftMenuBackgroundColor=Bakgrunnsfarge for venstre meny
 BackgroundTableTitleColor=Bakgrunnsfarge for tittellinje i tabellen
 BackgroundTableTitleTextColor=Tekstfarge for tabellens tittellinje
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Bakgrunnsfarge for oddetalls-tabellinjer
 BackgroundTableLineEvenColor=Bakgrunnsfarge for partalls-tabellinjer
 MinimumNoticePeriod=Frist for beskjed (Feriesøknaden må sendes inn før denne fristen)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr referanse ikke funnet i Meldings-ID
 FormatZip=Postnummer
 MainMenuCode=Meny-oppføringskode (hovedmeny)
 ECMAutoTree=Vis ECM-tre automatisk 
-OperationParamDesc=Definer verdier som skal brukes til handlinger, eller hvordan du trekker ut verdier. For eksempel: <br> objproperty1=SET:abc <br> objproperty1=SET: en verdi med erstatning for __objproperty1__ <br> objproperty3=SETIFEMPTY:abc <br> objproperty4=EXTRACT:HEADER:.X-Myheaderkey.*[^\\s]+(*). <br> options_myextrafield=EXTRACT:SUBJECT:([^\\s]*) <br> object.objproperty5=EXTRACT:BODY:Mitt firmanavn er\\s([^\\s]*) <br><br> Bruk semikolon som separator for å trekke ut eller sette flere egenskaper.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Åpningstider
 OpeningHoursDesc=Skriv inn de vanlige åpningstidene for bedriften din.
 ResourceSetup=Konfigurasjon av ressursmodulen
@@ -1970,7 +1973,7 @@ WarningValueHigherSlowsDramaticalyOutput=Advarsel, høyere verdier reduserer res
 ModuleActivated=Modul %s er aktivert og bremser grensesnittet
 EXPORTS_SHARE_MODELS=Eksportmodellene er delt med alle
 ExportSetup=Oppsett av modul Eksport
-ImportSetup=Setup of module Import
+ImportSetup=Oppsett av importmodul
 InstanceUniqueID=Unik ID for forekomsten
 SmallerThan=Mindre enn
 LargerThan=Større enn
@@ -1994,4 +1997,6 @@ EMailsWillHaveMessageID=E-postmeldinger vil være merket 'Referanser' som samsva
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Skriv inn koden til et FontAwesome-ikon. Hvis du ikke vet hva som er FontAwesome, kan du bruke den generelle verdien fa-adresseboken.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
+JumpToBoxes=Gå til Setup -> Widgets
+MeasuringUnitTypeDesc=Bruk en verdi som "størrelse", "overflate", "volum", "vekt", "tid"
+MeasuringScaleDesc=Skalaen er antall steder du må flytte kommaet for å samsvare med standard referansenhet. For enhetstypen "tid" er det antall sekunder. Verdier mellom 80 og 99 er reserverte verdier.
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 9b288bf1ffa..39a212a6f30 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -66,9 +66,9 @@ paymentInInvoiceCurrency=i faktura-valuta
 PaidBack=Tilbakebetalt
 DeletePayment=Slett betaling
 ConfirmDeletePayment=Er du sikker på at du vil slette denne betalingen?
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReduc=Vil du konvertere denne %s til en tilgjengelig kreditt?
 ConfirmConvertToReduc2=Beløpet vil bli lagret blant alle rabatter og kan brukes som en rabatt for en nåværende eller fremtidig faktura for denne kunden.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
+ConfirmConvertToReducSupplier=Vil du konvertere denne %s til en tilgjengelig kreditt?
 ConfirmConvertToReducSupplier2=Beløpet vil bli lagret blant alle rabatter og kan brukes som en rabatt for en nåværende eller en fremtidig faktura for denne leverandøren.
 SupplierPayments=Leverandørbetalinger
 ReceivedPayments=Mottatte betalinger
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=Antall fakturaer pr. måned
 AmountOfBills=Totalbeløp fakturaer
 AmountOfBillsHT=Sum fakturaer pr. mnd (eks. MVA)
 AmountOfBillsByMonthHT=Sum fakturaer pr. mnd (eks. MVA)
-ShowSocialContribution=Vis skatter og avgifter
-ShowBill=Vis faktura
-ShowInvoice=Vis faktura
-ShowInvoiceReplace=Vis erstatningsfaktura
-ShowInvoiceAvoir=Vis kreditnota
-ShowInvoiceDeposit=Vis nedbetalingsfaktura
-ShowInvoiceSituation=Vis delfaktura
 UseSituationInvoices=Tillat delfaktura
 UseSituationInvoicesCreditNote=Tillat delfaktura kreditnota
 Retainedwarranty=Tilbakehold
@@ -233,7 +226,6 @@ setretainedwarranty=Sett tilbakehold
 setretainedwarrantyDateLimit=Sett tilbakehold frist
 RetainedWarrantyDateLimit=Tilbakehold frist
 RetainedWarrantyNeed100Percent=Delfakturaen må være på 100%% fremdrift for å vises på PDF
-ShowPayment=Vis betaling
 AlreadyPaid=Allerede betalt
 AlreadyPaidBack=Allerede tilbakebetalt
 AlreadyPaidNoCreditNotesNoDeposits=Allerede betalt (uten kreditnotater og nedbetalinger)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generert fra fakturamal %s
 WarningInvoiceDateInFuture=Advarsel, fakturadato er høyere enn dagens dato
 WarningInvoiceDateTooFarInFuture=Advarsel, er fakturadato for langt fra dagens dato
 ViewAvailableGlobalDiscounts=Vis tilgjengelige rabatter
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Forfall ved mottak
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=Dette alternativet er bare tilgjengelig når du oppretter faktura fra kategorien "kunde" under tredjepart
 YouMustCreateInvoiceFromSupplierThird=Dette alternativet er bare tilgjengelig når du oppretter faktura fra kategorien "leverandør" under tredjepart
 YouMustCreateStandardInvoiceFirstDesc=Du må først lage en standardfaktura og så konvertere den til "mal" for å lage en ny fakturamal
-PDFCrabeDescription=PDF-fakturamal Crabe. En komplett fakturamal 
+PDFCrabeDescription=PDF-fakturamal Crabe. En komplett fakturamal (gammel implementering av Sponge-mal)
 PDFSpongeDescription=PDF Fakturamal Sponge. En komplett fakturamal
 PDFCrevetteDescription=PDF fakturamal Crevette. En komplett mal for delfaktura
 TerreNumRefModelDesc1=Returnerer nummer med format %syymm-nnnn for standardfaktura og %syymm-nnnn for kreditnota, der yy er året, mm måned og nnnn er et løpenummer som starter på 0+1.
@@ -578,4 +571,4 @@ AutoFillDateTo=Angi sluttdato for tjenestelinje med neste faktura dato
 AutoFillDateToShort=Angi sluttdato
 MaxNumberOfGenerationReached=Maks ant. genereringer nådd
 BILL_DELETEInDolibarr=Faktura slettet
-BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
+BILL_SUPPLIER_DELETEInDolibarr=Leverandørfaktura slettet
diff --git a/htdocs/langs/nb_NO/modulebuilder.lang b/htdocs/langs/nb_NO/modulebuilder.lang
index 49a54bc0533..5dd4c5c3623 100644
--- a/htdocs/langs/nb_NO/modulebuilder.lang
+++ b/htdocs/langs/nb_NO/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=Liste over ordbokinnføringer
 ListOfPermissionsDefined=Liste over definerte tillatelser
 SeeExamples=Se eksempler her
 EnabledDesc=Betingelse for å ha dette feltet aktivt (Eksempler: 1 eller $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Er feltet synlig? (Eksempler: 0=Aldri synlig, 1=Synlig på liste og opprett/oppdater/vis skjemaer, 2=Synlig bare på liste, 3=Synlig bare på opprett/oppdater/vis skjema (ikke liste), 4=Synlig bare på liste og oppdaterings-/visningsskjema  (ikke opprett), 5=Synlig på listens sluttformular (ikke opprett, ikke oppdatering). Bruk av negativ verdi betyr at feltet ikke vises som standard på listen, men kan velges for visning). Det kan være et uttrykk, for eksempel: <br> preg_match ('public/',$_SERVER['PHP_SELF'])?0:1<br>($ user->rights->holiday>define_holiday ? 1: 0)
-DisplayOnPdfDesc=Vis dette feltet på kompatible PDF-dokumenter, du kan endre posisjon med "Posisjon" -feltet. <br/> For øyeblikket er kjente kompatible PDF-modeller: eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Vis dette feltet på kompatible PDF-dokumenter, du kan administrere posisjon med "Posisjon" -feltet.<br/>Kjente kompatible PDF-modeller er: Eratosthenes (Ordre), espadon (Forsendelse), sponge (Fakturaer), cyan (Tilbud), cornas (Leverandørordre)<br/><br/><strong>For dokument:</strong><br/>0 = Vises ikke <br/> 1 = Vises<br/> 2 = Vises bare hvis ikke tom<br/><br/><strong>For dokumentlinjer:</strong><br/>0 = Vises ikke <br/> 1 = Vises i en kolonne <br/> 3 = vises i linje etter beskrivelsen <br/> 4 = vises etter beskrivelse hvis ikke tom
 DisplayOnPdf=Vis på PDF
 IsAMeasureDesc=Kan verdien av feltet bli kumulert for å få en total i listen? (Eksempler: 1 eller 0)
 SearchAllDesc=Er feltet brukt til å søke fra hurtigsøkingsverktøyet? (Eksempler: 1 eller 0)
diff --git a/htdocs/langs/nb_NO/multicurrency.lang b/htdocs/langs/nb_NO/multicurrency.lang
index 1363f65f8b7..37e020c3028 100644
--- a/htdocs/langs/nb_NO/multicurrency.lang
+++ b/htdocs/langs/nb_NO/multicurrency.lang
@@ -18,3 +18,5 @@ MulticurrencyReceived=Mottatt, originalvaluta
 MulticurrencyRemainderToTake=Resterende beløp, opprinnelig valuta
 MulticurrencyPaymentAmount=Beløp, original valuta
 AmountToOthercurrency=Beløp til (i valuta for mottakskonto)
+CurrencyRateSyncSucceed=Valutakurssynkronisering vellykket
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Bruk dokumentets valuta for online betalinger
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index d514c0df475..563ac6d01d5 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -186,7 +186,7 @@ PlannedWorkload=Planlagt arbeidsmengde
 PlannedWorkloadShort=Arbeidsmengde
 ProjectReferers=Relaterte elementer
 ProjectMustBeValidatedFirst=Prosjektet må valideres først
-FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+FirstAddRessourceToAllocateTime=Tildel en brukerressurs som kontakt for prosjektet for å fordele tid
 InputPerDay=Tidsbruk pr. dag
 InputPerWeek=Tidsbruk pr. uke
 InputPerMonth=Forbruk pr. måned
@@ -238,7 +238,7 @@ LatestModifiedProjects=Siste %s endrede prosjekter
 OtherFilteredTasks=Andre filtrerte oppgaver
 NoAssignedTasks=Ingen tildelte oppgaver funnet (tilordne prosjekt/oppgaver til den nåværende brukeren fra den øverste valgboksen for å legge inn tid på den)
 ThirdPartyRequiredToGenerateInvoice=En tredjepart må defineres på prosjektet for å kunne fakturere det.
-ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+ChooseANotYetAssignedTask=Velg en oppgave som du ennå ikke er tildelt
 # Comments trans
 AllowCommentOnTask=Tillat brukerkommentarer på oppgaver
 AllowCommentOnProject=Tillat brukerkommentarer på prosjekter
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Tjeneste for bruk på linjer
 InvoiceGeneratedFromTimeSpent=Faktura %s er generert fra tid brukt på prosjekt
 ProjectBillTimeDescription=Sjekk om du legger inn timeliste på prosjektoppgaver, OG planlegger å generere faktura (er) fra timelisten for å fakturere kunden til prosjektet (ikke kryss av om du planlegger å opprette faktura som ikke er basert på innlagte timelister). Merk: For å generere faktura, gå til fanen 'Tidsbruk' av prosjektet og velg linjer du vil inkludere.
 ProjectFollowOpportunity=Følg mulighet
-ProjectFollowTasks=Følg oppgaver
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Bruk
 UsageOpportunity=Bruk: Mulighet
 UsageTasks=Bruk: Oppgaver
@@ -264,4 +264,4 @@ InvoiceToUse=Fakturamal som skal brukes
 NewInvoice=Ny faktura
 OneLinePerTask=Én linje per oppgave
 OneLinePerPeriod=Én linje per periode
-RefTaskParent=Ref. Parent Task
+RefTaskParent=Ref. forelderoppgave
diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
index df149546c37..9137f31703f 100644
--- a/htdocs/langs/nb_NO/website.lang
+++ b/htdocs/langs/nb_NO/website.lang
@@ -42,7 +42,7 @@ ViewPageInNewTab=Vis side i ny fane
 SetAsHomePage=Sett som startside
 RealURL=Virkelig URL
 ViewWebsiteInProduction=Vis webside ved hjelp av  hjemme-URL
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+SetHereVirtualHost=<u>Bruk med Apache/NGinx/...</u><br>Opprett på webserveren din (Apache, Nginx, ...) en dedikert virtuell vert med PHP aktivert og en rotkatalog på <br><strong>%s</strong>
 ExampleToUseInApacheVirtualHostConfig=Eksempel på Apache virtuelt vertsoppsett:
 YouCanAlsoTestWithPHPS= <u> Bruk med PHP-innebygd server </u> <br> I utviklingsmiljø kan du foretrekke å teste nettstedet med PHP-innebygd webserver (PHP 5.5 nødvendig) ved å kjøre <br> <strong> php -S 0.0.0.0:8080 -t %s </strong>
 YouCanAlsoDeployToAnotherWHP=<u>Kjør nettstedet ditt med en annen leverandør av Dolibarr Hosting</u> <br> Hvis du ikke har en webserver som Apache eller NGinx tilgjengelig på internett, kan du eksportere og importere nettstedet til en annen Dolibarr-forekomst levert av en annen Dolibarr-leverandør som gir full integrasjon med nettstedsmodulen. Du kan finne en liste over noen Dolibarr-vertsleverandører på <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
@@ -57,7 +57,7 @@ NoPageYet=Ingen sider ennå
 YouCanCreatePageOrImportTemplate=Du kan opprette en ny side eller importere en full nettsidemal
 SyntaxHelp=Hjelp med spesifikke syntakstips
 YouCanEditHtmlSourceckeditor=Du kan redigere HTML kildekode ved hjelp av "Kilde" -knappen i redigeringsprogrammet.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Du kan inkludere PHP-kode i denne kilden ved å bruke tagger <strong>&lt;? Php?&gt;</strong> . Følgende globale variabler er tilgjengelige: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs. <br><br><span class="fa fa-bug"></span> Du kan også ta med innhold av en annen side/container med følgende syntaks: <br> <strong>&lt;?php includeContainer ('alias_of_container_to_include'); ?&gt;</strong> <br><br><span class="fa fa-bug"></span> Du kan lage en viderekobling til en annen side/container med følgende syntaks (Merk: ikke send ut noe innhold før en viderekobling): <br> <strong>&lt;? php redirectToContainer ('alias_of_container_to_redirect_to'); ?&gt;</strong> <br><br><span class="fa fa-link"></span> Hvis du vil legge til en kobling til en annen side, bruker du syntaks: <br> <strong>&lt;a href="quot;alias_of_page_to_link_to.php"&gt;mylink &lt;a&gt;</strong> <br><br><span class="fa fa-download"></span> Hvis du vil inkludere en <strong>kobling for å laste ned</strong> en fil som er lagret i <strong>dokumentkatalogen</strong> , bruker du wrapper til <strong>document.php</strong> : <br> For eksempel, for en fil til dokumenter / ecm (må loggføres), er syntaks: <br> <strong>&lt;a href="/document.php?modulepart=ecm&amp;file=??relative_dir/??filename.ext&"&gt;</strong> <br> For en fil i dokumenter / medier (åpen katalog for offentlig tilgang) er syntaks: <br> <strong>&lt;a href="/document.php?modulepart=medias&amp;file=??relative_dir/??filename.ext"&gt;</strong> <br> For en fil som er delt med en delelink (åpen tilgang ved å bruke hash-nøkkelen til filen), er syntaks: <br> <strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong> <br><br><span class="fa fa-picture-o"></span> Hvis du vil ta med et <strong>bilde som er</strong> lagret i <strong>dokumentkatalogen</strong> , bruker du innpakningen <strong>viewimage.php</strong> : <br> For eksempel, for et bilde i dokumenter / medier (åpen katalog for offentlig tilgang), er syntaks: <br> <strong>&lt;img src="/ viewimage.php? modulepart = medias &amp; file = [relative_dir /] filnavn.ext"&gt;</strong> <br><br> Flere eksempler på HTML eller dynamisk kode er tilgjengelige <a href="%s" target="_blank">i wikidokumentasjonen</a> <br> .
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Klon side/container
 CloneSite=Klon side
 SiteAdded=Nettsted lagt til
@@ -77,7 +77,7 @@ BlogPost=Blogg post
 WebsiteAccount=Nettstedskonto
 WebsiteAccounts=Nettstedskontoer
 AddWebsiteAccount=Opprett nettsidekonto
-BackToListOfThirdParty=Tilbake til listen over tredjeparter
+BackToListForThirdParty=Tilbake til listen for tredjepart
 DisableSiteFirst=Deaktiver nettsted først
 MyContainerTitle=Mitt nettsteds tittel
 AnotherContainer=Slik inkluderer du innhold på en annen side/container (du kan ha en feil her hvis du aktiverer dynamisk kode fordi den innebygde undercontaineren kanskje ikke eksisterer)
@@ -85,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Beklager, dette nettstedet er for øyeblikket off
 WEBSITE_USE_WEBSITE_ACCOUNTS=Aktiver nettstedkontotabellen
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktiver tabellen for å lagre nettstedkontoer (innlogging/pass) for hvert nettsted/tredjepart
 YouMustDefineTheHomePage=Du må først definere standard startside
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContentFuture=Advarsel: Å opprette en webside ved å importere en ekstern webside er forbeholdt erfarne brukere. Avhengig av kompleksiteten på kildesiden, kan resultatet av importen avvike fra originalen. Også hvis kildesiden bruker vanlige CSS-stiler eller motstridende javascript, kan det ødelegge utseendet eller funksjonene til nettstedredigereren når du jobber med denne siden. Denne metoden er en raskere måte å opprette en side på, men det anbefales å opprette den nye siden fra bunnen av eller fra en foreslått sidemal. <br> Merk også at inline-redigeringsprogrammet ikke fungerer korrekt når det brukes på en ekstern side.
 OnlyEditionOfSourceForGrabbedContent=Kun HTML-kilde er mulig når innholdet ble tatt fra et eksternt nettsted
 GrabImagesInto=Hent bilder som er funnet i css og side også.
 ImagesShouldBeSavedInto=Bilder bør lagres i katalogen
@@ -125,6 +125,6 @@ UseTextBetween5And70Chars=For god SEO-praksis, bruk en tekst mellom 5 og 70 tegn
 MainLanguage=Hovedspråk
 OtherLanguages=Andre språk
 UseManifest=Oppgi en manifest.json-fil
-PublicAuthorAlias=Public author alias
-AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
-ReplacementDoneInXPages=Replacement done in %s pages or containers
+PublicAuthorAlias=Offentlig forfatter alias
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Tilgjengelige språk er definert i nettstedegenskaper
+ReplacementDoneInXPages=Utskifting utført på %s sider eller containere
diff --git a/htdocs/langs/nb_NO/zapier.lang b/htdocs/langs/nb_NO/zapier.lang
new file mode 100644
index 00000000000..7793dff866f
--- /dev/null
+++ b/htdocs/langs/nb_NO/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr-modul
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Oppsett av Zapier for Dolibarr
diff --git a/htdocs/langs/ne_NP/accountancy.lang b/htdocs/langs/ne_NP/accountancy.lang
new file mode 100644
index 00000000000..b8ce37a0956
--- /dev/null
+++ b/htdocs/langs/ne_NP/accountancy.lang
@@ -0,0 +1,382 @@
+# Dolibarr language file - en_US - Accountancy (Double entries)
+Accountancy=Accountancy
+Accounting=Accounting
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
+ACCOUNTING_EXPORT_LABEL=Export label
+ACCOUNTING_EXPORT_AMOUNT=Export amount
+ACCOUNTING_EXPORT_DEVISE=Export currency
+Selectformat=Select the format for the file
+ACCOUNTING_EXPORT_FORMAT=Select the format for the file
+ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
+ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
+ThisService=This service
+ThisProduct=This product
+DefaultForService=Default for service
+DefaultForProduct=Default for product
+CantSuggest=Can't suggest
+AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journalization=Journalization
+Journaux=Journals
+JournalFinancial=Financial journals
+BackToChartofaccounts=Return chart of accounts
+Chartofaccounts=Chart of accounts
+CurrentDedicatedAccountingAccount=Current dedicated account
+AssignDedicatedAccountingAccount=New account to assign
+InvoiceLabel=Invoice label
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
+OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
+JournalizationInLedgerStatus=Status of journalization
+AlreadyInGeneralLedger=Already journalized in ledgers
+NotYetInGeneralLedger=Not yet journalized in ledgers
+GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
+DetailByAccount=Show detail by account
+AccountWithNonZeroValues=Accounts with non-zero values
+ListOfAccounts=List of accounts
+CountriesInEEC=Countries in EEC
+CountriesNotInEEC=Countries not in EEC
+CountriesInEECExceptMe=Countries in EEC except %s
+CountriesExceptMe=All countries except %s
+AccountantFiles=Export accounting documents
+
+MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
+MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
+MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+
+AccountancyArea=Accounting area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
+
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expenses (miscellaneous taxes). For this, use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
+AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
+AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+
+AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+Selectchartofaccounts=Select active chart of accounts
+ChangeAndLoad=Change and load
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+AccountAccountingShort=Account
+SubledgerAccount=Subledger account
+SubledgerAccountLabel=Subledger account label
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
+AccountAccountingSuggest=Accounting account suggested
+MenuDefaultAccounts=Default accounts
+MenuBankAccounts=Bank accounts
+MenuVatAccounts=Vat accounts
+MenuTaxAccounts=Tax accounts
+MenuExpenseReportAccounts=Expense report accounts
+MenuLoanAccounts=Loan accounts
+MenuProductsAccounts=Product accounts
+MenuClosureAccounts=Closure accounts
+MenuAccountancyClosure=Closure
+MenuAccountancyValidationMovements=Validate movements
+ProductsBinding=Products accounts
+TransferInAccounting=Transfer in accounting
+RegistrationInAccounting=Registration in accounting
+Binding=Binding to accounts
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Vendor invoice binding
+ExpenseReportsVentilation=Expense report binding
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+ValidTransaction=Validate transaction
+WriteBookKeeping=Register transactions in Ledger
+Bookkeeping=Ledger
+AccountBalance=Account balance
+ObjectsRef=Source object ref
+CAHTF=Total purchase vendor before tax
+TotalExpenseReport=Total expense report
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+ExpenseReportLines=Lines of expense reports to bind
+ExpenseReportLinesDone=Bound lines of expense reports
+IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
+
+
+Ventilate=Bind
+LineId=Id line
+Processing=Processing
+EndProcessing=Process terminated.
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+LineOfExpenseReport=Line of expense report
+NoAccountSelected=No accounting account selected
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+
+ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
+BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+
+ACCOUNTING_SELL_JOURNAL=Sell journal
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
+ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
+
+ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
+ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
+TransitionalAccount=Transitional bank transfer account
+
+ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
+DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+LabelAccount=Label account
+LabelOperation=Label operation
+Sens=Sens
+LetteringCode=Lettering code
+Lettering=Lettering
+Codejournal=Journal
+JournalLabel=Journal label
+NumPiece=Piece number
+TransactionNumShort=Num. transaction
+AccountingCategory=Personalized groups
+GroupByAccountAccounting=Group by accounting account
+AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
+ByAccounts=By accounts
+ByPredefinedAccountGroups=By predefined groups
+ByPersonalizedAccountGroups=By personalized groups
+ByYear=By year
+NotMatch=Not Set
+DeleteMvt=Delete Ledger lines
+DelMonth=Month to delete
+DelYear=Year to delete
+DelJournal=Journal to delete
+ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+FinanceJournal=Finance journal
+ExpenseReportsJournal=Expense reports journal
+DescFinanceJournal=Finance journal including all the types of payments by bank account
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+FeeAccountNotDefined=Account for fee not defined
+BankAccountNotDefined=Account for bank not defined
+CustomerInvoicePayment=Payment of invoice customer
+ThirdPartyAccount=Third-party account
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+AddCompteFromBK=Add accounting accounts to the group
+ReportThirdParty=List third-party account
+DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
+ListAccounts=List of the accounting accounts
+UnknownAccountForThirdparty=Unknown third-party account. We will use %s
+UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
+ShowOpeningBalance=Show opening balance
+HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
+
+Pcgtype=Group of account
+PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+
+Reconcilable=Reconcilable
+
+TotalVente=Total turnover before tax
+TotalMarge=Total sales margin
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
+Vide=-
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account (only record not already transfered in accountancy are visible)
+DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
+DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
+DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
+DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+
+DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
+OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+ValidateMovements=Validate movements
+DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
+SelectMonthAndValidate=Select month and validate movements
+
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
+Balancing=Balancing
+FicheVentilation=Binding card
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
+NoNewRecordSaved=No more record to journalize
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
+ShowTutorial=Show Tutorial
+NotReconciled=Not reconciled
+
+## Admin
+ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
+CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccountingJournal=Show accounting journal
+NatureOfJournal=Nature of Journal
+AccountingJournalType1=Miscellaneous operations
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
+NumberOfAccountancyEntries=Number of entries
+NumberOfAccountancyMovements=Number of movements
+
+## Export
+ExportDraftJournal=Export draft journal
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export for CEGID Expert Comptabilité
+Modelcsv_COALA=Export for Sage Coala
+Modelcsv_bob50=Export for Sage BOB 50
+Modelcsv_ciel=Export for Sage Ciel Compta or Compta Evolution
+Modelcsv_quadratus=Export for Quadratus QuadraCompta
+Modelcsv_ebp=Export for EBP
+Modelcsv_cogilog=Export for Cogilog
+Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
+Modelcsv_openconcerto=Export for OpenConcerto (Test)
+Modelcsv_configurable=Export CSV Configurable
+Modelcsv_FEC=Export FEC
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+ChartofaccountsId=Chart of accounts Id
+
+## Tools - Init accounting account on product / service
+InitAccountancy=Init accountancy
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
+DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
+Options=Options
+OptionModeProductSell=Mode sales
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
+OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
+OptionModeProductSellDesc=Show all products with accounting account for sales.
+OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
+OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
+OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
+CleanFixHistory=Remove accounting code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
+PredefinedGroups=Predefined groups
+WithoutValidAccount=Without valid dedicated account
+WithValidAccount=With valid dedicated account
+ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
+AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
+
+## Dictionary
+Range=Range of accounting account
+Calculated=Calculated
+Formula=Formula
+
+## Error
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
+ExportNotSupported=The export format setuped is not supported into this page
+BookeppingLineAlreayExists=Lines already existing into bookkeeping
+NoJournalDefined=No journal defined
+Binded=Lines bound
+ToBind=Lines to bind
+UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
+
+## Import
+ImportAccountingEntries=Accounting entries
+DateExport=Date export
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/ne_NP/admin.lang b/htdocs/langs/ne_NP/admin.lang
new file mode 100644
index 00000000000..7eb67d7a4ab
--- /dev/null
+++ b/htdocs/langs/ne_NP/admin.lang
@@ -0,0 +1,2002 @@
+# Dolibarr language file - Source file is en_US - admin
+Foundation=Foundation
+Version=Version
+Publisher=Publisher
+VersionProgram=Version program
+VersionLastInstall=Initial install version
+VersionLastUpgrade=Latest version upgrade
+VersionExperimental=Experimental
+VersionDevelopment=Development
+VersionUnknown=Unknown
+VersionRecommanded=Recommended
+FileCheck=Fileset Integrity Checks
+FileCheckDesc=This tool allows you to check the integrity of files and the setup of your application, comparing each file with the official one. The value of some setup constants may also be checked. You can use this tool to determine if any files have been modified (e.g by a hacker).
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files have been added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when the application is installed from an official package
+XmlNotFound=Xml Integrity File of application not found
+SessionId=Session ID
+SessionSaveHandler=Handler to save sessions
+SessionSavePath=Session save location
+PurgeSessions=Purge of sessions
+ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
+NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow listing all running sessions.
+LockNewSessions=Lock new connections
+ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself? Only user <b>%s</b> will be able to connect after that.
+UnlockNewSessions=Remove connection lock
+YourSession=Your session
+Sessions=Users Sessions
+WebUserGroup=Web server user/group
+NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
+DBStoringCharset=Database charset to store data
+DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
+ClientCharset=Client charset
+ClientSortingCharset=Client collation
+WarningModuleNotActive=Module <b>%s</b> must be enabled
+WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
+DolibarrSetup=Dolibarr install or upgrade
+InternalUser=Internal user
+ExternalUser=External user
+InternalUsers=Internal users
+ExternalUsers=External users
+GUISetup=Display
+SetupArea=Setup
+UploadNewTemplate=Upload new template(s)
+FormToTestFileUploadForm=Form to test file upload (according to setup)
+IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
+RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
+RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
+SecuritySetup=Security setup
+SecurityFilesDesc=Define here options related to security about uploading files.
+ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
+ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
+ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
+DictionarySetup=Dictionary setup
+Dictionary=Dictionaries
+ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
+ErrorCodeCantContainZero=Code can't contain value 0
+DisableJavascript=Disable JavaScript and Ajax functions
+DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
+NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
+JavascriptDisabled=JavaScript disabled
+UsePreviewTabs=Use preview tabs
+ShowPreview=Show preview
+PreviewNotAvailable=Preview not available
+ThemeCurrentlyActive=Theme currently active
+CurrentTimeZone=TimeZone PHP (server)
+MySQLTimeZone=TimeZone MySql (database)
+TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+Space=Space
+Table=Table
+Fields=Fields
+Index=Index
+Mask=Mask
+NextValue=Next value
+NextValueForInvoices=Next value (invoices)
+NextValueForCreditNotes=Next value (credit notes)
+NextValueForDeposit=Next value (down payment)
+NextValueForReplacements=Next value (replacements)
+MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
+MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page
+AntiVirusCommand=Full path to antivirus command
+AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusParam= More parameters on command line
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=Accounting module setup
+UserSetup=User management setup
+MultiCurrencySetup=Multi-currency setup
+MenuLimits=Limits and accuracy
+MenuIdParent=Parent menu ID
+DetailMenuIdParent=ID of parent menu (empty for a top menu)
+DetailPosition=Sort number to define menu position
+AllMenus=All
+NotConfigured=Module/Application not configured
+Active=Active
+SetupShort=Setup
+OtherOptions=Other options
+OtherSetup=Other Setup
+CurrentValueSeparatorDecimal=Decimal separator
+CurrentValueSeparatorThousand=Thousand separator
+Destination=Destination
+IdModule=Module ID
+IdPermissions=Permissions ID
+LanguageBrowserParameter=Parameter %s
+LocalisationDolibarrParameters=Localization parameters
+ClientTZ=Client Time Zone (user)
+ClientHour=Client time (user)
+OSTZ=Server OS Time Zone
+PHPTZ=PHP server Time Zone
+DaylingSavingTime=Daylight saving time
+CurrentHour=PHP Time (server)
+CurrentSessionTimeOut=Current session timeout
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a .htaccess file with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but of the timezone of the server.
+Box=Widget
+Boxes=Widgets
+MaxNbOfLinesForBoxes=Max. number of lines for widgets
+AllWidgetsWereEnabled=All available widgets are enabled
+PositionByDefault=Default order
+Position=Position
+MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
+MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br>Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenuForUsers=Menu for users
+LangFile=.lang file
+Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
+System=System
+SystemInfo=System information
+SystemToolsArea=System tools area
+SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature.
+Purge=Purge
+PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
+PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
+PurgeRunNow=Purge now
+PurgeNothingToDelete=No directory or files to delete.
+PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
+PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
+PurgeAuditEvents=Purge all security events
+ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
+GenerateBackup=Generate backup
+Backup=Backup
+Restore=Restore
+RunCommandSummary=Backup has been launched with the following command
+BackupResult=Backup result
+BackupFileSuccessfullyCreated=Backup file successfully generated
+YouCanDownloadBackupFile=The generated file can now be downloaded
+NoBackupFileAvailable=No backup files available.
+ExportMethod=Export method
+ImportMethod=Import method
+ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
+ImportMySqlDesc=To import a MySQL backup file, you may use phpMyAdmin via your hosting or use the mysql command from the Command line.<br>For example:
+ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
+ImportMySqlCommand=%s %s < mybackupfile.sql
+ImportPostgreSqlCommand=%s %s mybackupfile.sql
+FileNameToGenerate=Filename for backup:
+Compression=Compression
+CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
+CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
+ExportCompatibility=Compatibility of generated export file
+ExportUseMySQLQuickParameter=Use the --quick parameter
+ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
+MySqlExportParameters=MySQL export parameters
+PostgreSqlExportParameters= PostgreSQL export parameters
+UseTransactionnalMode=Use transactional mode
+FullPathToMysqldumpCommand=Full path to mysqldump command
+FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
+AddDropDatabase=Add DROP DATABASE command
+AddDropTable=Add DROP TABLE command
+ExportStructure=Structure
+NameColumn=Name columns
+ExtendedInsert=Extended INSERT
+NoLockBeforeInsert=No lock commands around INSERT
+DelayedInsert=Delayed insert
+EncodeBinariesInHexa=Encode binary data in hexadecimal
+IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
+AutoDetectLang=Autodetect (browser language)
+FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
+BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
+OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
+ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external app/modules
+ModulesDevelopYourModule=Develop your own app/modules
+ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
+DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
+NewModule=New
+FreeModule=Free
+CompatibleUpTo=Compatible with version %s
+NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
+CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
+SeeInMarkerPlace=See in Market place
+SeeSetupOfModule=See setup of module %s
+Updated=Updated
+Nouveauté=Novelty
+AchatTelechargement=Buy / Download
+GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
+DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming may develop a module.
+WebSiteDesc=External websites for more add-on (non-core) modules...
+DevelopYourModuleDesc=Some solutions to develop your own module...
+URL=URL
+RelativeURL=Relative URL
+BoxesAvailable=Widgets available
+BoxesActivated=Widgets activated
+ActivateOn=Activate on
+ActiveOn=Activated on
+SourceFile=Source file
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
+Required=Required
+UsedOnlyWithTypeOption=Used by some agenda option only
+Security=Security
+Passwords=Passwords
+DoNotStoreClearPassword=Encrypt passwords stored in database (NOT as plain-text). It is strongly recommended to activate this option.
+MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
+ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
+Feature=Feature
+DolibarrLicense=License
+Developpers=Developers/contributors
+OfficialWebSite=Dolibarr official web site
+OfficialWebSiteLocal=Local web site (%s)
+OfficialWiki=Dolibarr documentation / Wiki
+OfficialDemo=Dolibarr online demo
+OfficialMarketPlace=Official market place for external modules/addons
+OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
+ReferencedPreferredPartners=Preferred Partners
+OtherResources=Other resources
+ExternalResources=External Resources
+SocialNetworks=Social Networks
+ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
+ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
+HelpCenterDesc2=Some of these resources are only available in <b>english</b>.
+CurrentMenuHandler=Current menu handler
+MeasuringUnit=Measuring unit
+LeftMargin=Left margin
+TopMargin=Top margin
+PaperSize=Paper type
+Orientation=Orientation
+SpaceX=Space X
+SpaceY=Space Y
+FontSize=Font size
+Content=Content
+NoticePeriod=Notice period
+NewByMonth=New by month
+Emails=Emails
+EMailsSetup=Emails setup
+EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EmailSenderProfiles=Emails sender profiles
+EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
+MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix-like systems)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix-like systems)
+MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
+MAIN_MAIL_AUTOCOPY_TO= Copy (Bcc) all sent emails to
+MAIN_DISABLE_ALL_MAILS=Disable all email sending (for test purposes or demos)
+MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
+MAIN_MAIL_SENDMODE=Email sending method
+MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
+MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
+MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
+MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
+MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos)
+MAIN_SMS_SENDMODE=Method to use to send SMS
+MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending
+MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
+UserEmail=User email
+CompanyEmail=Company Email
+FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+ModuleSetup=Module setup
+ModulesSetup=Modules/Application setup
+ModuleFamilyBase=System
+ModuleFamilyCrm=Customer Relationship Management (CRM)
+ModuleFamilySrm=Vendor Relationship Management (VRM)
+ModuleFamilyProducts=Product Management (PM)
+ModuleFamilyHr=Human Resource Management (HR)
+ModuleFamilyProjects=Projects/Collaborative work
+ModuleFamilyOther=Other
+ModuleFamilyTechnic=Multi-modules tools
+ModuleFamilyExperimental=Experimental modules
+ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
+ModuleFamilyECM=Electronic Content Management (ECM)
+ModuleFamilyPortal=Websites and other frontal application
+ModuleFamilyInterface=Interfaces with external systems
+MenuHandlers=Menu handlers
+MenuAdmin=Menu editor
+DoNotUseInProduction=Do not use in production
+ThisIsProcessToFollow=Upgrade procedure:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+StepNb=Step %s
+FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
+DownloadPackageFromWebSite=Download package (for example from the official web site %s).
+UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
+YouCanSubmitFile=You can upload the .zip file of module package from here:
+CurrentVersion=Dolibarr current version
+CallUpdatePage=Browse to the page that updates the database structure and data: %s.
+LastStableVersion=Latest stable version
+LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
+UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
+GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
+GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
+GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
+ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
+ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
+DoTestServerAvailability=Test server connectivity
+DoTestSend=Test sending
+DoTestSendHTML=Test sending HTML
+ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
+UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
+SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
+UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
+DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
+DisableLinkToHelp=Hide link to online help "<b>%s</b>"
+AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
+ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
+MinLength=Minimum length
+LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
+LanguageFile=Language file
+ExamplesWithCurrentSetup=Examples with current configuration
+ListOfDirectories=List of OpenDocument templates directories
+ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
+NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
+FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
+FirstnameNamePosition=Position of Name/Lastname
+DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
+KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
+TestSubmitForm=Input test form
+ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours.
+ThemeDir=Skins directory
+ConnectionTimeout=Connection timeout
+ResponseTimeout=Response timeout
+SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
+ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
+SecurityToken=Key to secure URLs
+NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
+PDF=PDF
+PDFDesc=Global options for PDF generation.
+PDFAddressForging=Rules for address boxes
+HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
+PDFLocaltax=Rules for %s
+HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideDescOnPDF=Hide products description
+HideRefOnPDF=Hide products ref.
+HideDetailsOnPDF=Hide product lines details
+PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+Library=Library
+UrlGenerationParameters=Parameters to secure URLs
+SecurityTokenIsUnique=Use a unique securekey parameter for each URL
+EnterRefToBuildUrl=Enter reference for object %s
+GetSecuredUrl=Get calculated URL
+ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+OldVATRates=Old VAT rate
+NewVATRates=New VAT rate
+PriceBaseTypeToChange=Modify on prices with base reference value defined on
+MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
+String=String
+TextLong=Long text
+HtmlText=Html text
+Int=Integer
+Float=Float
+DateAndTime=Date and hour
+Unique=Unique
+Boolean=Boolean (one checkbox)
+ExtrafieldPhone = Phone
+ExtrafieldPrice = Price
+ExtrafieldMail = Email
+ExtrafieldUrl = Url
+ExtrafieldSelect = Select list
+ExtrafieldSelectList = Select from table
+ExtrafieldSeparator=Separator (not a field)
+ExtrafieldPassword=Password
+ExtrafieldRadio=Radio buttons (one choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
+ExtrafieldLink=Link to an object
+ComputedFormula=Computed field
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+Computedpersistent=Store computed field
+ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
+ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
+ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
+LibraryToBuildPDF=Library used for PDF generation
+LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
+SMS=SMS
+LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
+RefreshPhoneLink=Refresh link
+LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
+KeepEmptyToUseDefault=Keep empty to use default value
+DefaultLink=Default link
+SetAsDefault=Set as default
+ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
+ExternalModule=External module
+InstalledInto=Installed into directory %s
+BarcodeInitForthird-parties=Mass barcode init for third-parties
+BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
+CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
+InitEmptyBarCode=Init value for next %s empty records
+EraseAllCurrentBarCode=Erase all current barcode values
+ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
+AllBarcodeReset=All barcode values have been removed
+NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
+EnableFileCache=Enable file cache
+ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
+NoDetails=No additional details in footer
+DisplayCompanyInfo=Display company address
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
+EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
+ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code
+ModuleCompanyCodePanicum=Return an empty accounting code.
+ModuleCompanyCodeDigitaria=Returns a compound accounting code according to the name of the third party. The code consists of a prefix that can be defined in the first position followed by the number of characters defined in the third party code.
+ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
+ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+ClickToShowDescription=Click to show description
+DependsOn=This module needs the module(s)
+RequiredBy=This module is required by module(s)
+TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
+PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
+EnableDefaultValues=Enable customization of default values
+EnableOverwriteTranslation=Enable usage of overwritten translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
+AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
+FilesAttachedToEmail=Attach file
+SendEmailsReminders=Send agenda reminders by emails
+davDescription=Setup a WebDAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
+DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
+DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
+DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
+DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
+# Modules
+Module0Name=Users & Groups
+Module0Desc=Users / Employees and Groups management
+Module1Name=Third Parties
+Module1Desc=Companies and contacts management (customers, prospects...)
+Module2Name=Commercial
+Module2Desc=Commercial management
+Module10Name=Accounting (simplified)
+Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
+Module20Name=Proposals
+Module20Desc=Commercial proposal management
+Module22Name=Mass Emailings
+Module22Desc=Manage bulk emailing
+Module23Name=Energy
+Module23Desc=Monitoring the consumption of energies
+Module25Name=Sales Orders
+Module25Desc=Sales order management
+Module30Name=Invoices
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
+Module40Name=Vendors
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
+Module42Name=Debug Logs
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module49Name=Editors
+Module49Desc=Editor management
+Module50Name=Products
+Module50Desc=Management of Products
+Module51Name=Mass mailings
+Module51Desc=Mass paper mailing management
+Module52Name=Stocks
+Module52Desc=Stock management
+Module53Name=Services
+Module53Desc=Management of Services
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or recurring subscriptions)
+Module55Name=Barcodes
+Module55Desc=Barcode management
+Module56Name=Telephony
+Module56Desc=Telephony integration
+Module57Name=Bank Direct Debit payments
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module58Name=ClickToDial
+Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
+Module59Name=Bookmark4u
+Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
+Module60Name=Stickers
+Module60Desc=Management of stickers
+Module70Name=Interventions
+Module70Desc=Intervention management
+Module75Name=Expense and trip notes
+Module75Desc=Expense and trip notes management
+Module80Name=Shipments
+Module80Desc=Shipments and delivery note management
+Module85Name=Banks & Cash
+Module85Desc=Management of bank or cash accounts
+Module100Name=External Site
+Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module105Name=Mailman and SPIP
+Module105Desc=Mailman or SPIP interface for member module
+Module200Name=LDAP
+Module200Desc=LDAP directory synchronization
+Module210Name=PostNuke
+Module210Desc=PostNuke integration
+Module240Name=Data exports
+Module240Desc=Tool to export Dolibarr data (with assistance)
+Module250Name=Data imports
+Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module310Name=Members
+Module310Desc=Foundation members management
+Module320Name=RSS Feed
+Module320Desc=Add a RSS feed to Dolibarr pages
+Module330Name=Bookmarks & Shortcuts
+Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access
+Module400Name=Projects or Leads
+Module400Desc=Management of projects, leads/opportunities and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module410Name=Webcalendar
+Module410Desc=Webcalendar integration
+Module500Name=Taxes & Special Expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
+Module510Name=Salaries
+Module510Desc=Record and track employee payments
+Module520Name=Loans
+Module520Desc=Management of loans
+Module600Name=Notifications on business event
+Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
+Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
+Module610Name=Product Variants
+Module610Desc=Creation of product variants (color, size etc.)
+Module700Name=Donations
+Module700Desc=Donation management
+Module770Name=Expense Reports
+Module770Desc=Manage expense reports claims (transportation, meal, ...)
+Module1120Name=Vendor Commercial Proposals
+Module1120Desc=Request vendor commercial proposal and prices
+Module1200Name=Mantis
+Module1200Desc=Mantis integration
+Module1520Name=Document Generation
+Module1520Desc=Mass email document generation
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module2000Name=WYSIWYG editor
+Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
+Module2200Name=Dynamic Prices
+Module2200Desc=Use maths expressions for auto-generation of prices
+Module2300Name=Scheduled jobs
+Module2300Desc=Scheduled jobs management (alias cron or chrono table)
+Module2400Name=Events/Agenda
+Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
+Module2500Name=DMS / ECM
+Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
+Module2600Name=API/Web services (SOAP server)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API/Web services (REST server)
+Module2610Desc=Enable the Dolibarr REST server providing API services
+Module2660Name=Call WebServices (SOAP client)
+Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
+Module2700Name=Gravatar
+Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
+Module2800Desc=FTP Client
+Module2900Name=GeoIPMaxmind
+Module2900Desc=GeoIP Maxmind conversions capabilities
+Module3200Name=Unalterable Archives
+Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module4000Name=HRM
+Module4000Desc=Human resources management (management of department, employee contracts and feelings)
+Module5000Name=Multi-company
+Module5000Desc=Allows you to manage multiple companies
+Module6000Name=Workflow
+Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module10000Name=Websites
+Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
+Module20000Name=Leave Request Management
+Module20000Desc=Define and track employee leave requests
+Module39000Name=Product Lots
+Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
+Module40000Name=Multicurrency
+Module40000Desc=Use alternative currencies in prices and documents
+Module50000Name=PayBox
+Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50100Name=POS SimplePOS
+Module50100Desc=Point of Sale module SimplePOS (simple POS).
+Module50150Name=POS TakePOS
+Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50200Name=Paypal
+Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50300Name=Stripe
+Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50400Name=Accounting (double entry)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module54000Name=PrintIPP
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
+Module59000Name=Margins
+Module59000Desc=Module to manage margins
+Module60000Name=Commissions
+Module60000Desc=Module to manage commissions
+Module62000Name=Incoterms
+Module62000Desc=Add features to manage Incoterms
+Module63000Name=Resources
+Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
+Permission11=Read customer invoices
+Permission12=Create/modify customer invoices
+Permission13=Unvalidate customer invoices
+Permission14=Validate customer invoices
+Permission15=Send customer invoices by email
+Permission16=Create payments for customer invoices
+Permission19=Delete customer invoices
+Permission21=Read commercial proposals
+Permission22=Create/modify commercial proposals
+Permission24=Validate commercial proposals
+Permission25=Send commercial proposals
+Permission26=Close commercial proposals
+Permission27=Delete commercial proposals
+Permission28=Export commercial proposals
+Permission31=Read products
+Permission32=Create/modify products
+Permission34=Delete products
+Permission36=See/manage hidden products
+Permission38=Export products
+Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
+Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
+Permission44=Delete projects (shared project and projects I'm contact for)
+Permission45=Export projects
+Permission61=Read interventions
+Permission62=Create/modify interventions
+Permission64=Delete interventions
+Permission67=Export interventions
+Permission71=Read members
+Permission72=Create/modify members
+Permission74=Delete members
+Permission75=Setup types of membership
+Permission76=Export data
+Permission78=Read subscriptions
+Permission79=Create/modify subscriptions
+Permission81=Read customers orders
+Permission82=Create/modify customers orders
+Permission84=Validate customers orders
+Permission86=Send customers orders
+Permission87=Close customers orders
+Permission88=Cancel customers orders
+Permission89=Delete customers orders
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
+Permission95=Read reports
+Permission101=Read sendings
+Permission102=Create/modify sendings
+Permission104=Validate sendings
+Permission106=Export sendings
+Permission109=Delete sendings
+Permission111=Read financial accounts
+Permission112=Create/modify/delete and compare transactions
+Permission113=Setup financial accounts (create, manage categories)
+Permission114=Reconcile transactions
+Permission115=Export transactions and account statements
+Permission116=Transfers between accounts
+Permission117=Manage checks dispatching
+Permission121=Read third parties linked to user
+Permission122=Create/modify third parties linked to user
+Permission125=Delete third parties linked to user
+Permission126=Export third parties
+Permission141=Read all projects and tasks (also private projects for which I am not a contact)
+Permission142=Create/modify all projects and tasks (also private projects for which I am not a contact)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
+Permission146=Read providers
+Permission147=Read stats
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejections of direct debit payment orders
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
+Permission171=Read trips and expenses (yours and your subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
+Permission180=Read suppliers
+Permission181=Read purchase orders
+Permission182=Create/modify purchase orders
+Permission183=Validate purchase orders
+Permission184=Approve purchase orders
+Permission185=Order or cancel purchase orders
+Permission186=Receive purchase orders
+Permission187=Close purchase orders
+Permission188=Cancel purchase orders
+Permission192=Create lines
+Permission193=Cancel lines
+Permission194=Read the bandwidth lines
+Permission202=Create ADSL connections
+Permission203=Order connections orders
+Permission204=Order connections
+Permission205=Manage connections
+Permission206=Read connections
+Permission211=Read Telephony
+Permission212=Order lines
+Permission213=Activate line
+Permission214=Setup Telephony
+Permission215=Setup providers
+Permission221=Read emailings
+Permission222=Create/modify emailings (topic, recipients...)
+Permission223=Validate emailings (allows sending)
+Permission229=Delete emailings
+Permission237=View recipients and info
+Permission238=Manually send mailings
+Permission239=Delete mailings after validation or sent
+Permission241=Read categories
+Permission242=Create/modify categories
+Permission243=Delete categories
+Permission244=See the contents of the hidden categories
+Permission251=Read other users and groups
+PermissionAdvanced251=Read other users
+Permission252=Read permissions of other users
+Permission253=Create/modify other users, groups and permissions
+PermissionAdvanced253=Create/modify internal/external users and permissions
+Permission254=Create/modify external users only
+Permission255=Modify other users password
+Permission256=Delete or disable other users
+Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission271=Read CA
+Permission272=Read invoices
+Permission273=Issue invoices
+Permission281=Read contacts
+Permission282=Create/modify contacts
+Permission283=Delete contacts
+Permission286=Export contacts
+Permission291=Read tariffs
+Permission292=Set permissions on the tariffs
+Permission293=Modify customer's tariffs
+Permission300=Read barcodes
+Permission301=Create/modify barcodes
+Permission302=Delete barcodes
+Permission311=Read services
+Permission312=Assign service/subscription to contract
+Permission331=Read bookmarks
+Permission332=Create/modify bookmarks
+Permission333=Delete bookmarks
+Permission341=Read its own permissions
+Permission342=Create/modify his own user information
+Permission343=Modify his own password
+Permission344=Modify its own permissions
+Permission351=Read groups
+Permission352=Read groups permissions
+Permission353=Create/modify groups
+Permission354=Delete or disable groups
+Permission358=Export users
+Permission401=Read discounts
+Permission402=Create/modify discounts
+Permission403=Validate discounts
+Permission404=Delete discounts
+Permission430=Use Debug Bar
+Permission511=Read payments of salaries
+Permission512=Create/modify payments of salaries
+Permission514=Delete payments of salaries
+Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
+Permission531=Read services
+Permission532=Create/modify services
+Permission534=Delete services
+Permission536=See/manage hidden services
+Permission538=Export services
+Permission650=Read Bills of Materials
+Permission651=Create/Update Bills of Materials
+Permission652=Delete Bills of Materials
+Permission701=Read donations
+Permission702=Create/modify donations
+Permission703=Delete donations
+Permission771=Read expense reports (yours and your subordinates)
+Permission772=Create/modify expense reports
+Permission773=Delete expense reports
+Permission774=Read all expense reports (even for user not subordinates)
+Permission775=Approve expense reports
+Permission776=Pay expense reports
+Permission779=Export expense reports
+Permission1001=Read stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
+Permission1004=Read stock movements
+Permission1005=Create/modify stock movements
+Permission1101=Read delivery receipts
+Permission1102=Create/modify delivery receipts
+Permission1104=Validate delivery receipts
+Permission1109=Delete delivery receipts
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
+Permission1181=Read suppliers
+Permission1182=Read purchase orders
+Permission1183=Create/modify purchase orders
+Permission1184=Validate purchase orders
+Permission1185=Approve purchase orders
+Permission1186=Order purchase orders
+Permission1187=Acknowledge receipt of purchase orders
+Permission1188=Delete purchase orders
+Permission1190=Approve (second approval) purchase orders
+Permission1201=Get result of an export
+Permission1202=Create/Modify an export
+Permission1231=Read vendor invoices
+Permission1232=Create/modify vendor invoices
+Permission1233=Validate vendor invoices
+Permission1234=Delete vendor invoices
+Permission1235=Send vendor invoices by email
+Permission1236=Export vendor invoices, attributes and payments
+Permission1237=Export purchase orders and their details
+Permission1251=Run mass imports of external data into database (data load)
+Permission1321=Export customer invoices, attributes and payments
+Permission1322=Reopen a paid bill
+Permission1421=Export sales orders and attributes
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
+Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
+Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
+Permission2411=Read actions (events or tasks) of others
+Permission2412=Create/modify actions (events or tasks) of others
+Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
+Permission2501=Read/Download documents
+Permission2502=Download documents
+Permission2503=Submit or delete documents
+Permission2515=Setup documents directories
+Permission2801=Use FTP client in read mode (browse and download only)
+Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=Delete leave requests
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20006=Admin leave requests (setup and update balance)
+Permission20007=Approve leave requests
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
+Permission50101=Use Point of Sale
+Permission50201=Read transactions
+Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define fiscal periods. Validate transactions and close fiscal periods.
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
+Permission54001=Print
+Permission55001=Read polls
+Permission55002=Create/modify polls
+Permission59001=Read commercial margins
+Permission59002=Define commercial margins
+Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
+DictionaryCompanyType=Third-party types
+DictionaryCompanyJuridicalType=Third-party legal entities
+DictionaryProspectLevel=Prospect potential
+DictionaryCanton=States/Provinces
+DictionaryRegion=Regions
+DictionaryCountry=Countries
+DictionaryCurrency=Currencies
+DictionaryCivility=Honorific titles
+DictionaryActions=Types of agenda events
+DictionarySocialContributions=Types of social or fiscal taxes
+DictionaryVAT=VAT Rates or Sales Tax Rates
+DictionaryRevenueStamp=Amount of tax stamps
+DictionaryPaymentConditions=Payment Terms
+DictionaryPaymentModes=Payment Modes
+DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Website - Type of website pages/containers
+DictionaryEcotaxe=Ecotax (WEEE)
+DictionaryPaperFormat=Paper formats
+DictionaryFormatCards=Card formats
+DictionaryFees=Expense report - Types of expense report lines
+DictionarySendingMethods=Shipping methods
+DictionaryStaff=Number of Employees
+DictionaryAvailability=Delivery delay
+DictionaryOrderMethods=Ordering methods
+DictionarySource=Origin of proposals/orders
+DictionaryAccountancyCategory=Personalized groups for reports
+DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
+DictionaryEMailTemplates=Email Templates
+DictionaryUnits=Units
+DictionaryMeasuringUnits=Measuring Units
+DictionarySocialNetworks=Social Networks
+DictionaryProspectStatus=Prospect status
+DictionaryHolidayTypes=Types of leave
+DictionaryOpportunityStatus=Lead status for project/lead
+DictionaryExpenseTaxCat=Expense report - Transportation categories
+DictionaryExpenseTaxRange=Expense report - Range by transportation category
+SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
+BackToModuleList=Back to Module list
+BackToDictionaryList=Back to Dictionaries list
+TypeOfRevenueStamp=Type of tax stamp
+VATManagement=Sales Tax Management
+VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
+##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
+LTRate=Rate
+LocalTax1IsNotUsed=Do not use second tax
+LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
+LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax1Management=Second type of tax
+LocalTax1IsUsedExample=
+LocalTax1IsNotUsedExample=
+LocalTax2IsNotUsed=Do not use third tax
+LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
+LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax2Management=Third type of tax
+LocalTax2IsUsedExample=
+LocalTax2IsNotUsedExample=
+LocalTax1ManagementES=RE Management
+LocalTax1IsUsedDescES=The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
+LocalTax1IsNotUsedDescES=By default the proposed RE is 0. End of rule.
+LocalTax1IsUsedExampleES=In Spain they are professionals subject to some specific sections of the Spanish IAE.
+LocalTax1IsNotUsedExampleES=In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
+LocalTax2ManagementES=IRPF Management
+LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
+LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
+LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
+LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
+UseRevenueStamp=Use a tax stamp
+UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+CalcLocaltax=Reports on local taxes
+CalcLocaltax1=Sales - Purchases
+CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
+CalcLocaltax2=Purchases
+CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
+CalcLocaltax3=Sales
+CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+LabelUsedByDefault=Label used by default if no translation can be found for code
+LabelOnDocuments=Label on documents
+LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of a configuration constant
+NbOfDays=No. of days
+AtEndOfMonth=At end of month
+CurrentNext=Current/Next
+Offset=Offset
+AlwaysActive=Always active
+Upgrade=Upgrade
+MenuUpgrade=Upgrade / Extend
+AddExtensionThemeModuleOrOther=Deploy/install external app/module
+WebServer=Web server
+DocumentRootServer=Web server's root directory
+DataRootServer=Data files directory
+IP=IP
+Port=Port
+VirtualServerName=Virtual server name
+OS=OS
+PhpWebLink=Web-Php link
+Server=Server
+Database=Database
+DatabaseServer=Database host
+DatabaseName=Database name
+DatabasePort=Database port
+DatabaseUser=Database user
+DatabasePassword=Database password
+Tables=Tables
+TableName=Table name
+NbOfRecord=No. of records
+Host=Server
+DriverType=Driver type
+SummarySystem=System information summary
+SummaryConst=List of all Dolibarr setup parameters
+MenuCompanySetup=Company/Organization
+DefaultMenuManager= Standard menu manager
+DefaultMenuSmartphoneManager=Smartphone menu manager
+Skin=Skin theme
+DefaultSkin=Default skin theme
+MaxSizeList=Max length for list
+DefaultMaxSizeList=Default max length for lists
+DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
+MessageOfDay=Message of the day
+MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
+PermanentLeftSearchForm=Permanent search form on left menu
+DefaultLanguage=Default language
+EnableMultilangInterface=Enable multilanguage support
+EnableShowLogo=Show the company logo in the menu
+CompanyInfo=Company/Organization
+CompanyIds=Company/Organization identities
+CompanyName=Name
+CompanyAddress=Address
+CompanyZip=Zip
+CompanyTown=Town
+CompanyCountry=Country
+CompanyCurrency=Main currency
+CompanyObject=Object of the company
+IDCountry=ID country
+Logo=Logo
+LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
+LogoSquarred=Logo (squarred)
+LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
+DoNotSuggestPaymentMode=Do not suggest
+NoActiveBankAccountDefined=No active bank account defined
+OwnerOfBankAccount=Owner of bank account %s
+BankModuleNotActive=Bank accounts module not enabled
+ShowBugTrackLink=Show link "<strong>%s</strong>"
+Alerts=Alerts
+DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
+DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
+Delays_MAIN_DELAY_ACTIONS_TODO=Planned events (agenda events) not completed
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time
+Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Order not processed
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
+Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation
+Delays_MAIN_DELAY_MEMBERS=Delayed membership fee
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
+Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
+Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
+SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
+SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
+SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
+SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescription5=Other Setup menu entries manage optional parameters.
+LogEvents=Security audit events
+Audit=Audit
+InfoDolibarr=About Dolibarr
+InfoBrowser=About Browser
+InfoOS=About OS
+InfoWebServer=About Web Server
+InfoDatabase=About Database
+InfoPHP=About PHP
+InfoPerf=About Performances
+BrowserName=Browser name
+BrowserOS=Browser OS
+ListOfSecurityEvents=List of Dolibarr security events
+SecurityEventsPurged=Security events purged
+LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
+SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
+SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
+AccountantFileNumber=Accountant code
+DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
+AvailableModules=Available app/modules
+ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
+SessionTimeOut=Time out for session
+SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
+TriggersAvailable=Available triggers
+TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
+TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
+TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
+TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
+TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
+GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
+DictionaryDesc=Insert all reference data. You can add your values to the default.
+ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
+MiscellaneousDesc=All other security related parameters are defined here.
+LimitsSetup=Limits/Precision setup
+LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
+MAIN_MAX_DECIMALS_UNIT=Max. decimals for unit prices
+MAIN_MAX_DECIMALS_TOT=Max. decimals for total prices
+MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
+UnitPriceOfProduct=Net unit price of a product
+TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
+ParameterActiveForNextInputOnly=Parameter effective for next input only
+NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page.
+NoEventFoundWithCriteria=No security event has been found for this search criteria.
+SeeLocalSendMailSetup=See your local sendmail setup
+BackupDesc=A <b>complete</b> backup of a Dolibarr installation requires two steps.
+BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
+BackupDesc3=Backup the structure and contents of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
+BackupDescX=The archived directory should be stored in a secure place.
+BackupDescY=The generated dump file should be stored in a secure place.
+BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
+RestoreDesc=To restore a Dolibarr backup, two steps are required.
+RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
+RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
+RestoreMySQL=MySQL import
+ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+PreviousDumpFiles=Existing backup files
+PreviousArchiveFiles=Existing archive files
+WeekStartOnDay=First day of the week
+RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
+YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
+YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
+DownloadMoreSkins=More skins to download
+SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+ShowProfIdInAddress=Show professional id with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+TranslationUncomplete=Partial translation
+MAIN_DISABLE_METEO=Disable meteorological view
+MeteoStdMod=Standard mode
+MeteoStdModEnabled=Standard mode enabled
+MeteoPercentageMod=Percentage mode
+MeteoPercentageModEnabled=Percentage mode enabled
+MeteoUseMod=Click to use %s
+TestLoginToAPI=Test login to API
+ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
+ExternalAccess=External/Internet Access
+MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet)
+MAIN_PROXY_HOST=Proxy server: Name/Address
+MAIN_PROXY_PORT=Proxy server: Port
+MAIN_PROXY_USER=Proxy server: Login/User
+MAIN_PROXY_PASS=Proxy server: Password
+DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+ExtraFields=Complementary attributes
+ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsThirdParties=Complementary attributes (third party)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
+ExtraFieldsMember=Complementary attributes (member)
+ExtraFieldsMemberType=Complementary attributes (member type)
+ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
+ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
+ExtraFieldsSupplierOrders=Complementary attributes (orders)
+ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
+ExtraFieldsProject=Complementary attributes (projects)
+ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldHasWrongValue=Attribute %s has a wrong value.
+AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
+PathToDocuments=Path to documents
+PathDirectory=Directory
+SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+YouMustEnableOneModule=You must at least enable 1 module
+ClassNotFoundIntoPathWarning=Class %s not found in PHP path
+YesInSummer=Yes in summer
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
+SuhosinSessionEncrypt=Session storage encrypted by Suhosin
+ConditionIsCurrently=Condition is currently %s
+YouUseBestDriver=You use driver %s which is the best driver currently available.
+YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+SearchOptim=Search optimization
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
+BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
+AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
+AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
+FieldEdition=Edition of field %s
+FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
+GetBarCode=Get barcode
+NumberingModules=Numbering models
+##### Module password generation
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
+PasswordGenerationPerso=Return a password according to your personally defined configuration.
+SetupPerso=According to your configuration
+PasswordPatternDesc=Password pattern description
+##### Users setup #####
+RuleForGeneratedPasswords=Rules to generate and validate passwords
+DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
+UsersSetup=Users module setup
+UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
+##### HRM setup #####
+HRMSetup=HRM module setup
+##### Company setup #####
+CompanySetup=Companies module setup
+CompanyCodeChecker=Options for automatic generation of customer/vendor codes
+AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
+NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
+NotificationsDescUser=* per user, one user at a time.
+NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
+NotificationsDescGlobal=* or by setting global email addresses in this setup page.
+ModelModules=Document Templates
+DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
+WatermarkOnDraft=Watermark on draft document
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
+CompanyIdProfChecker=Rules for Professional IDs
+MustBeUnique=Must be unique?
+MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
+MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
+WebDavServer=Root URL of %s server: %s
+##### Webcal setup #####
+WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
+##### Invoices #####
+BillsSetup=Invoices module setup
+BillsNumberingModule=Invoices and credit notes numbering model
+BillsPDFModules=Invoice documents models
+BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
+PaymentsPDFModules=Payment documents models
+ForceInvoiceDate=Force invoice date to validation date
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
+SuggestPaymentByChequeToAddress=Suggest payment by check to
+FreeLegalTextOnInvoices=Free text on invoices
+WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
+PaymentsNumberingModule=Payments numbering model
+SuppliersPayment=Vendor payments
+SupplierPaymentSetup=Vendor payments setup
+##### Proposals #####
+PropalSetup=Commercial proposals module setup
+ProposalsNumberingModules=Commercial proposal numbering models
+ProposalsPDFModules=Commercial proposal documents models
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+FreeLegalTextOnProposal=Free text on commercial proposals
+WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
+##### Suppliers Orders #####
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
+##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+OrdersSetup=Sales Orders management setup
+OrdersNumberingModules=Orders numbering models
+OrdersModelModule=Order documents models
+FreeLegalTextOnOrders=Free text on orders
+WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+##### Interventions #####
+InterventionsSetup=Interventions module setup
+FreeLegalTextOnInterventions=Free text on intervention documents
+FicheinterNumberingModules=Intervention numbering models
+TemplatePDFInterventions=Intervention card documents models
+WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+##### Contracts #####
+ContractsSetup=Contracts/Subscriptions module setup
+ContractsNumberingModules=Contracts numbering modules
+TemplatePDFContracts=Contracts documents models
+FreeLegalTextOnContracts=Free text on contracts
+WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+##### Members #####
+MembersSetup=Members module setup
+MemberMainOptions=Main options
+AdherentLoginRequired= Manage a Login for each member
+AdherentMailRequired=Email required to create a new member
+MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
+MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+##### LDAP setup #####
+LDAPSetup=LDAP Setup
+LDAPGlobalParameters=Global parameters
+LDAPUsersSynchro=Users
+LDAPGroupsSynchro=Groups
+LDAPContactsSynchro=Contacts
+LDAPMembersSynchro=Members
+LDAPMembersTypesSynchro=Members types
+LDAPSynchronization=LDAP synchronisation
+LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
+LDAPToDolibarr=LDAP -> Dolibarr
+DolibarrToLDAP=Dolibarr -> LDAP
+LDAPNamingAttribute=Key in LDAP
+LDAPSynchronizeUsers=Organization of users in LDAP
+LDAPSynchronizeGroups=Organization of groups in LDAP
+LDAPSynchronizeContacts=Organization of contacts in LDAP
+LDAPSynchronizeMembers=Organization of foundation's members in LDAP
+LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
+LDAPPrimaryServer=Primary server
+LDAPSecondaryServer=Secondary server
+LDAPServerPort=Server port
+LDAPServerPortExample=Default port: 389
+LDAPServerProtocolVersion=Protocol version
+LDAPServerUseTLS=Use TLS
+LDAPServerUseTLSExample=Your LDAP server use TLS
+LDAPServerDn=Server DN
+LDAPAdminDn=Administrator DN
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
+LDAPPassword=Administrator password
+LDAPUserDn=Users' DN
+LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
+LDAPGroupDn=Groups' DN
+LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
+LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
+LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
+LDAPDnSynchroActive=Users and groups synchronization
+LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
+LDAPDnContactActive=Contacts' synchronization
+LDAPDnContactActiveExample=Activated/Unactivated synchronization
+LDAPDnMemberActive=Members' synchronization
+LDAPDnMemberActiveExample=Activated/Unactivated synchronization
+LDAPDnMemberTypeActive=Members types' synchronization
+LDAPDnMemberTypeActiveExample=Activated/Unactivated synchronization
+LDAPContactDn=Dolibarr contacts' DN
+LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
+LDAPMemberDn=Dolibarr members DN
+LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
+LDAPMemberObjectClassList=List of objectClass
+LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPMemberTypeDn=Dolibarr members types DN
+LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeObjectClassList=List of objectClass
+LDAPMemberTypeObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPUserObjectClassList=List of objectClass
+LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPGroupObjectClassList=List of objectClass
+LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPContactObjectClassList=List of objectClass
+LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPTestConnect=Test LDAP connection
+LDAPTestSynchroContact=Test contacts synchronization
+LDAPTestSynchroUser=Test user synchronization
+LDAPTestSynchroGroup=Test group synchronization
+LDAPTestSynchroMember=Test member synchronization
+LDAPTestSynchroMemberType=Test member type synchronization
+LDAPTestSearch= Test a LDAP search
+LDAPSynchroOK=Synchronization test successful
+LDAPSynchroKO=Failed synchronization test
+LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
+LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
+LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
+LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPSetupForVersion3=LDAP server configured for version 3
+LDAPSetupForVersion2=LDAP server configured for version 2
+LDAPDolibarrMapping=Dolibarr Mapping
+LDAPLdapMapping=LDAP Mapping
+LDAPFieldLoginUnix=Login (unix)
+LDAPFieldLoginExample=Example: uid
+LDAPFilterConnection=Search filter
+LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPFieldLoginSamba=Login (samba, activedirectory)
+LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldFullname=Full name
+LDAPFieldFullnameExample=Example: cn
+LDAPFieldPasswordNotCrypted=Password not encrypted
+LDAPFieldPasswordCrypted=Password encrypted
+LDAPFieldPasswordExample=Example: userPassword
+LDAPFieldCommonNameExample=Example: cn
+LDAPFieldName=Name
+LDAPFieldNameExample=Example: sn
+LDAPFieldFirstName=First name
+LDAPFieldFirstNameExample=Example: givenName
+LDAPFieldMail=Email address
+LDAPFieldMailExample=Example: mail
+LDAPFieldPhone=Professional phone number
+LDAPFieldPhoneExample=Example: telephonenumber
+LDAPFieldHomePhone=Personal phone number
+LDAPFieldHomePhoneExample=Example: homephone
+LDAPFieldMobile=Cellular phone
+LDAPFieldMobileExample=Example: mobile
+LDAPFieldFax=Fax number
+LDAPFieldFaxExample=Example: facsimiletelephonenumber
+LDAPFieldAddress=Street
+LDAPFieldAddressExample=Example: street
+LDAPFieldZip=Zip
+LDAPFieldZipExample=Example: postalcode
+LDAPFieldTown=Town
+LDAPFieldTownExample=Example: l
+LDAPFieldCountry=Country
+LDAPFieldDescription=Description
+LDAPFieldDescriptionExample=Example: description
+LDAPFieldNotePublic=Public Note
+LDAPFieldNotePublicExample=Example: publicnote
+LDAPFieldGroupMembers= Group members
+LDAPFieldGroupMembersExample= Example: uniqueMember
+LDAPFieldBirthdate=Birthdate
+LDAPFieldCompany=Company
+LDAPFieldCompanyExample=Example: o
+LDAPFieldSid=SID
+LDAPFieldSidExample=Example: objectsid
+LDAPFieldEndLastSubscription=Date of subscription end
+LDAPFieldTitle=Job position
+LDAPFieldTitleExample=Example: title
+LDAPFieldGroupid=Group id
+LDAPFieldGroupidExample=Exemple : gidnumber
+LDAPFieldUserid=User id
+LDAPFieldUseridExample=Exemple : uidnumber
+LDAPFieldHomedirectory=Home directory
+LDAPFieldHomedirectoryExample=Exemple : homedirectory
+LDAPFieldHomedirectoryprefix=Home directory prefix
+LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
+LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
+LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
+LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
+LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
+LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
+LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use thoose values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all thoose schemas loaded.
+ForANonAnonymousAccess=For an authenticated access (for a write access for example)
+PerfDolibarr=Performance setup/optimizing report
+YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
+NotInstalled=Not installed, so your server is not slowed down by this.
+ApplicativeCache=Applicative cache
+MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
+MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
+MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
+OPCodeCache=OPCode cache
+NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
+HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
+FilesOfTypeCached=Files of type %s are cached by HTTP server
+FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
+FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
+FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
+CacheByServer=Cache by server
+CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
+CacheByClient=Cache by browser
+CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
+DefaultCreateForm=Default values (to use on forms)
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
+DefaultMandatory=Mandatory form fields
+##### Products #####
+ProductSetup=Products module setup
+ServiceSetup=Services module setup
+ProductServiceSetup=Products and Services modules setup
+NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
+ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in the language of the third party
+UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
+SetDefaultBarcodeTypeProducts=Default barcode type to use for products
+SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
+ProductCodeChecker= Module for product code generation and checking (product or service)
+ProductOtherConf= Product / Service configuration
+IsNotADir=is not a directory!
+##### Syslog #####
+SyslogSetup=Logs module setup
+SyslogOutput=Logs outputs
+SyslogFacility=Facility
+SyslogLevel=Level
+SyslogFilename=File name and path
+YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
+ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
+OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+##### Donations #####
+DonationsSetup=Donation module setup
+DonationsReceiptModel=Template of donation receipt
+##### Barcode #####
+BarcodeSetup=Barcode setup
+PaperFormatModule=Print format module
+BarcodeEncodeModule=Barcode encoding type
+CodeBarGenerator=Barcode generator
+ChooseABarCode=No generator defined
+FormatNotSupportedByGenerator=Format not supported by this generator
+BarcodeDescEAN8=Barcode of type EAN8
+BarcodeDescEAN13=Barcode of type EAN13
+BarcodeDescUPC=Barcode of type UPC
+BarcodeDescISBN=Barcode of type ISBN
+BarcodeDescC39=Barcode of type C39
+BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
+GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
+BarcodeInternalEngine=Internal engine
+BarCodeNumberManager=Manager to auto define barcode numbers
+##### Prelevements #####
+WithdrawalsSetup=Setup of module Direct Debit payments
+##### ExternalRSS #####
+ExternalRSSSetup=External RSS imports setup
+NewRSS=New RSS Feed
+RSSUrl=RSS URL
+RSSUrlExample=An interesting RSS feed
+##### Mailing #####
+MailingSetup=EMailing module setup
+MailingEMailFrom=Sender email (From) for emails sent by emailing module
+MailingEMailError=Return Email (Errors-to) for emails with errors
+MailingDelay=Seconds to wait after sending next message
+##### Notification #####
+NotificationSetup=Email Notification module setup
+NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
+FixedEmailTarget=Recipient
+##### Sendings #####
+SendingsSetup=Shipping module setup
+SendingsReceiptModel=Sending receipt model
+SendingsNumberingModules=Sendings numbering modules
+SendingsAbility=Support shipping sheets for customer deliveries
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
+FreeLegalTextOnShippings=Free text on shipments
+##### Deliveries #####
+DeliveryOrderNumberingModules=Products deliveries receipt numbering module
+DeliveryOrderModel=Products deliveries receipt model
+DeliveriesOrderAbility=Support products deliveries receipts
+FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+##### FCKeditor #####
+AdvancedEditor=Advanced editor
+ActivateFCKeditor=Activate advanced editor for:
+FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
+FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
+FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
+FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
+FCKeditorForTicket=WYSIWIG creation/edition for tickets
+##### Stock #####
+StockSetup=Stock module setup
+IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+##### Menu #####
+MenuDeleted=Menu deleted
+Menus=Menus
+TreeMenuPersonalized=Personalized menus
+NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
+NewMenu=New menu
+Menu=Selection of menu
+MenuHandler=Menu handler
+MenuModule=Source module
+HideUnauthorizedMenu= Hide unauthorized menus (gray)
+DetailId=Id menu
+DetailMenuHandler=Menu handler where to show new menu
+DetailMenuModule=Module name if menu entry come from a module
+DetailType=Type of menu (top or left)
+DetailTitre=Menu label or label code for translation
+DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
+DetailEnabled=Condition to show or not entry
+DetailRight=Condition to display unauthorized grey menus
+DetailLangs=Lang file name for label code translation
+DetailUser=Intern / Extern / All
+Target=Target
+DetailTarget=Target for links (_blank top opens a new window)
+DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
+ModifMenu=Menu change
+DeleteMenu=Delete menu entry
+ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
+FailedToInitializeMenu=Failed to initialize menu
+##### Tax #####
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
+OptionVatMode=VAT due
+OptionVATDefault=Standard basis
+OptionVATDebitOption=Accrual basis
+OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
+OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
+SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option:
+OnDelivery=On delivery
+OnPayment=On payment
+OnInvoice=On invoice
+SupposedToBePaymentDate=Payment date used
+SupposedToBeInvoiceDate=Invoice date used
+Buy=Buy
+Sell=Sell
+InvoiceDateUsed=Invoice date used
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
+AccountancyCode=Accounting Code
+AccountancyCodeSell=Sale account. code
+AccountancyCodeBuy=Purchase account. code
+##### Agenda #####
+AgendaSetup=Events and agenda module setup
+PasswordTogetVCalExport=Key to authorize export link
+PastDelayVCalExport=Do not export event older than
+AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
+AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
+AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
+AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
+ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+##### Point Of Sale (CashDesk) #####
+CashDesk=Point of Sale
+CashDeskSetup=Point of Sales module setup
+CashDeskThirdPartyForSell=Default generic third party to use for sales
+CashDeskBankAccountForSell=Default account to use to receive cash payments
+CashDeskBankAccountForCheque=Default account to use to receive payments by check
+CashDeskBankAccountForCB=Default account to use to receive payments by credit cards
+CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with module Serial/Lot management (currently active) so stock decrease is disabled.
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
+CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
+CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
+CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+##### Bookmark #####
+BookmarkSetup=Bookmark module setup
+BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
+NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
+##### WebServices #####
+WebServicesSetup=Webservices module setup
+WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
+WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
+EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
+ApiExporerIs=You can explore and test the APIs at URL
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+##### Bank #####
+BankSetupModule=Bank module setup
+FreeLegalTextOnChequeReceipts=Free text on check receipts
+BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
+BankOrderGlobal=General
+BankOrderGlobalDesc=General display order
+BankOrderES=Spanish
+BankOrderESDesc=Spanish display order
+ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+##### Multicompany #####
+MultiCompanySetup=Multi-company module setup
+##### Suppliers #####
+SuppliersSetup=Vendor module setup
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
+SuppliersInvoiceModel=Complete template of Vendor Invoice
+SuppliersInvoiceNumberingModel=Vendor invoices numbering models
+IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
+##### GeoIPMaxmind #####
+GeoIPMaxmindSetup=GeoIP Maxmind module setup
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
+NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
+YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
+YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
+TestGeoIPResult=Test of a conversion IP -> country
+##### Projects #####
+ProjectsNumberingModules=Projects numbering module
+ProjectsSetup=Project module setup
+ProjectsModelModule=Project reports document model
+TasksNumberingModules=Tasks numbering module
+TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
+##### ECM (GED) #####
+##### Fiscal Year #####
+AccountingPeriods=Accounting periods
+AccountingPeriodCard=Accounting period
+NewFiscalYear=New accounting period
+OpenFiscalYear=Open accounting period
+CloseFiscalYear=Close accounting period
+DeleteFiscalYear=Delete accounting period
+ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
+ShowFiscalYear=Show accounting period
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
+Format=Format
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
+IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
+ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
+ExpenseReportNumberingModules=Expense reports numbering module
+NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerUser=List of automatic notifications per user*
+ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
+ListOfFixedNotifications=List of automatic fixed notifications
+GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+Threshold=Threshold
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
+SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
+SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
+HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+TextTitleColor=Text color of Page title
+LinkColor=Color of links
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
+MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
+NbAddedAutomatically=Number of days added to counters of users (automatically) each month
+EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+Enter0or1=Enter 0 or 1
+UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
+PositionIntoComboList=Position of line into combo lists
+SellTaxRate=Sale tax rate
+RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
+UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
+OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
+TemplateForElement=This template record is dedicated to which element
+TypeOfTemplate=Type of template
+TemplateIsVisibleByOwnerOnly=Template is visible to owner only
+VisibleEverywhere=Visible everywhere
+VisibleNowhere=Visible nowhere
+FixTZ=TimeZone fix
+FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
+ExpectedChecksum=Expected Checksum
+CurrentChecksum=Current Checksum
+ExpectedSize=Expected size
+CurrentSize=Current size
+ForcedConstants=Required constant values
+MailToSendProposal=Customer proposals
+MailToSendOrder=Sales orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Shipments
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracts
+MailToThirdparty=Third parties
+MailToMember=Members
+MailToUser=Users
+MailToProject=Projects page
+ByDefaultInList=Show by default on list view
+YouUseLastStableVersion=You use the latest stable version
+TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
+TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
+SeeChangeLog=See ChangeLog file (english only)
+AllPublishers=All publishers
+UnknownPublishers=Unknown publishers
+AddRemoveTabs=Add or remove tabs
+AddDataTables=Add object tables
+AddDictionaries=Add dictionaries tables
+AddData=Add objects or dictionaries data
+AddBoxes=Add widgets
+AddSheduledJobs=Add scheduled jobs
+AddHooks=Add hooks
+AddTriggers=Add triggers
+AddMenus=Add menus
+AddPermissions=Add permissions
+AddExportProfiles=Add export profiles
+AddImportProfiles=Add import profiles
+AddOtherPagesOrServices=Add other pages or services
+AddModels=Add document or numbering templates
+AddSubstitutions=Add keys substitutions
+DetectionNotPossible=Detection not possible
+UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
+ListOfAvailableAPIs=List of available APIs
+activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
+CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
+UserHasNoPermissions=This user has no permissions defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
+BaseCurrency=Reference currency of the company (go into setup of company to change this)
+WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
+WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
+MAIN_PDF_MARGIN_LEFT=Left margin on PDF
+MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
+MAIN_PDF_MARGIN_TOP=Top margin on PDF
+MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+NothingToSetup=There is no specific setup required for this module.
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+RemoveSpecialChars=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
+GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
+GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
+HelpOnTooltip=Help text to show on tooltip
+HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
+YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
+ChartLoaded=Chart of account loaded
+SocialNetworkSetup=Setup of module Social Networks
+EnableFeatureFor=Enable features for <strong>%s</strong>
+VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+EmailCollector=Email collector
+EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
+NewEmailCollector=New Email Collector
+EMailHost=Host of email IMAP server
+MailboxSourceDirectory=Mailbox source directory
+MailboxTargetDirectory=Mailbox target directory
+EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
+CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
+DateLastCollectResult=Date latest collect tried
+DateLastcollectResultOk=Date latest collect successfull
+LastResult=Latest result
+EmailCollectorConfirmCollectTitle=Email collect confirmation
+EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
+NoNewEmailToProcess=No new email (matching filters) to process
+NothingProcessed=Nothing done
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+RecordEvent=Record email event
+CreateLeadAndThirdParty=Create lead (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CodeLastResult=Latest result code
+NbOfEmailsInInbox=Number of emails in source directory
+LoadThirdPartyFromName=Load third party searching on %s (load only)
+LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+WithDolTrackingID=Dolibarr Reference found in Message ID
+WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+FormatZip=Zip
+MainMenuCode=Menu entry code (mainmenu)
+ECMAutoTree=Show automatic ECM tree
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OpeningHours=Opening hours
+OpeningHoursDesc=Enter here the regular opening hours of your company.
+ResourceSetup=Configuration of Resource module
+UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
+EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
+ConfirmUnactivation=Confirm module reset
+OnMobileOnly=On small screen (smartphone) only
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
+Protanopia=Protanopia
+Deuteranopes=Deuteranopes
+Tritanopes=Tritanopes
+ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
+DefaultCustomerType=Default thirdparty type for "New customer" creation form
+ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
+RootCategoryForProductsToSell=Root category of products to sell
+RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
+DebugBar=Debug Bar
+DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
+DebugBarSetup=DebugBar Setup
+GeneralOptions=General Options
+LogsLinesNumber=Number of lines to show on logs tab
+UseDebugBar=Use the debug bar
+DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
+WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
+ModuleActivated=Module %s is activated and slows the interface
+EXPORTS_SHARE_MODELS=Export models are share with everybody
+ExportSetup=Setup of module Export
+ImportSetup=Setup of module Import
+InstanceUniqueID=Unique ID of the instance
+SmallerThan=Smaller than
+LargerThan=Larger than
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
+EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
+RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
+AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+IPListExample=127.0.0.1 192.168.0.2 [::1]
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
+FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
+EmailTemplate=Template for email
+EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
+FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/ne_NP/agenda.lang b/htdocs/langs/ne_NP/agenda.lang
new file mode 100644
index 00000000000..2031241d2c9
--- /dev/null
+++ b/htdocs/langs/ne_NP/agenda.lang
@@ -0,0 +1,154 @@
+# Dolibarr language file - Source file is en_US - agenda
+IdAgenda=ID event
+Actions=Events
+Agenda=Agenda
+TMenuAgenda=Agenda
+Agendas=Agendas
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+ActionsOwnedByShort=Owner
+AffectedTo=Assigned to
+Event=Event
+Events=Events
+EventsNb=Number of events
+ListOfActions=List of events
+EventReports=Event reports
+Location=Location
+ToUserOfGroup=To any user in group
+EventOnFullDay=Event on all day(s)
+MenuToDoActions=All incomplete events
+MenuDoneActions=All terminated events
+MenuToDoMyActions=My incomplete events
+MenuDoneMyActions=My terminated events
+ListOfEvents=List of events (internal calendar)
+ActionsAskedBy=Events reported by
+ActionsToDoBy=Events assigned to
+ActionsDoneBy=Events done by
+ActionAssignedTo=Event assigned to
+ViewCal=Month view
+ViewDay=Day view
+ViewWeek=Week view
+ViewPerUser=Per user view
+ViewPerType=Per type view
+AutoActions= Automatic filling
+AgendaAutoActionDesc= Here you may define events which you want Dolibarr to create automatically  in Agenda. If nothing is checked, only manual actions will be included in logs and displayed in Agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
+AgendaSetupOtherDesc= This page provides options to allow the export of your Dolibarr events into an external calendar (Thunderbird, Google Calendar etc...)
+AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
+ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
+EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
+##### Agenda event labels #####
+NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
+ContractValidatedInDolibarr=Contract %s validated
+CONTRACT_DELETEInDolibarr=Contract %s deleted
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
+InvoiceDeleteDolibarr=Invoice %s deleted
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+MemberValidatedInDolibarr=Member %s validated
+MemberModifiedInDolibarr=Member %s modified
+MemberResiliatedInDolibarr=Member %s terminated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
+ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
+ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
+ShipmentDeletedInDolibarr=Shipment %s deleted
+OrderCreatedInDolibarr=Order %s created
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
+OrderApprovedInDolibarr=Order %s approved
+OrderRefusedInDolibarr=Order %s refused
+OrderBackToDraftInDolibarr=Order %s go back to draft status
+ProposalSentByEMail=Commercial proposal %s sent by email
+ContractSentByEMail=Contract %s sent by email
+OrderSentByEMail=Sales order %s sent by email
+InvoiceSentByEMail=Customer invoice %s sent by email
+SupplierOrderSentByEMail=Purchase order %s sent by email
+ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
+SupplierInvoiceSentByEMail=Vendor invoice %s sent by email
+ShippingSentByEMail=Shipment %s sent by email
+ShippingValidated= Shipment %s validated
+InterventionSentByEMail=Intervention %s sent by email
+ProposalDeleted=Proposal deleted
+OrderDeleted=Order deleted
+InvoiceDeleted=Invoice deleted
+DraftInvoiceDeleted=Draft invoice deleted
+PRODUCT_CREATEInDolibarr=Product %s created
+PRODUCT_MODIFYInDolibarr=Product %s modified
+PRODUCT_DELETEInDolibarr=Product %s deleted
+HOLIDAY_CREATEInDolibarr=Request for leave %s created
+HOLIDAY_MODIFYInDolibarr=Request for leave %s modified
+HOLIDAY_APPROVEInDolibarr=Request for leave %s approved
+HOLIDAY_VALIDATEInDolibarr=Request for leave %s validated
+HOLIDAY_DELETEInDolibarr=Request for leave %s deleted
+EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created
+EXPENSE_REPORT_VALIDATEInDolibarr=Expense report %s validated
+EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved
+EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted
+EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused
+PROJECT_CREATEInDolibarr=Project %s created
+PROJECT_MODIFYInDolibarr=Project %s modified
+PROJECT_DELETEInDolibarr=Project %s deleted
+TICKET_CREATEInDolibarr=Ticket %s created
+TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
+TICKET_CLOSEInDolibarr=Ticket %s closed
+TICKET_DELETEInDolibarr=Ticket %s deleted
+BOM_VALIDATEInDolibarr=BOM validated
+BOM_UNVALIDATEInDolibarr=BOM unvalidated
+BOM_CLOSEInDolibarr=BOM disabled
+BOM_REOPENInDolibarr=BOM reopen
+BOM_DELETEInDolibarr=BOM deleted
+MRP_MO_VALIDATEInDolibarr=MO validated
+MRP_MO_PRODUCEDInDolibarr=MO produced
+MRP_MO_DELETEInDolibarr=MO deleted
+##### End agenda events #####
+AgendaModelModule=Document templates for event
+DateActionStart=Start date
+DateActionEnd=End date
+AgendaUrlOptions1=You can also add following parameters to filter output:
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
+AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
+AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
+AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaHideBirthdayEvents=Hide birthdays of contacts
+Busy=Busy
+ExportDataset_event1=List of agenda events
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
+# External Sites ical
+ExportCal=Export calendar
+ExtSites=Import external calendars
+ExtSitesEnableThisTool=Show external calendars (defined in global setup) in Agenda. Does not affect external calendars defined by users.
+ExtSitesNbOfAgenda=Number of calendars
+AgendaExtNb=Calendar no. %s
+ExtSiteUrlAgenda=URL to access .ical file
+ExtSiteNoLabel=No Description
+VisibleTimeRange=Visible time range
+VisibleDaysRange=Visible days range
+AddEvent=Create event
+MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
+RepeatEvent=Repeat event
+EveryWeek=Every week
+EveryMonth=Every month
+DayOfMonth=Day of month
+DayOfWeek=Day of week
+DateStartPlusOne=Date start + 1 hour
diff --git a/htdocs/langs/ne_NP/assets.lang b/htdocs/langs/ne_NP/assets.lang
new file mode 100644
index 00000000000..ef04723c6c2
--- /dev/null
+++ b/htdocs/langs/ne_NP/assets.lang
@@ -0,0 +1,65 @@
+# Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+Assets = Assets
+NewAsset = New asset
+AccountancyCodeAsset = Accounting code (asset)
+AccountancyCodeDepreciationAsset = Accounting code (depreciation asset account)
+AccountancyCodeDepreciationExpense = Accounting code (depreciation expense account)
+NewAssetType=New asset type
+AssetsTypeSetup=Asset type setup
+AssetTypeModified=Asset type modified
+AssetType=Asset type
+AssetsLines=Assets
+DeleteType=Delete
+DeleteAnAssetType=Delete an asset type
+ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
+ShowTypeCard=Show type '%s'
+
+# Module label 'ModuleAssetsName'
+ModuleAssetsName = Assets
+# Module description 'ModuleAssetsDesc'
+ModuleAssetsDesc = Assets description
+
+#
+# Admin page
+#
+AssetsSetup = Assets setup
+Settings = Settings
+AssetsSetupPage = Assets setup page
+ExtraFieldsAssetsType = Complementary attributes (Asset type)
+AssetsType=Asset type
+AssetsTypeId=Asset type id
+AssetsTypeLabel=Asset type label
+AssetsTypes=Assets types
+
+#
+# Menu
+#
+MenuAssets = Assets
+MenuNewAsset = New asset
+MenuTypeAssets = Type assets
+MenuListAssets = List
+MenuNewTypeAssets = New
+MenuListTypeAssets = List
+
+#
+# Module
+#
+NewAssetType=New asset type
+NewAsset=New asset
diff --git a/htdocs/langs/ne_NP/banks.lang b/htdocs/langs/ne_NP/banks.lang
new file mode 100644
index 00000000000..e54239e9fb2
--- /dev/null
+++ b/htdocs/langs/ne_NP/banks.lang
@@ -0,0 +1,175 @@
+# Dolibarr language file - Source file is en_US - banks
+Bank=Bank
+MenuBankCash=Banks | Cash
+MenuVariousPayment=Miscellaneous payments
+MenuNewVariousPayment=New Miscellaneous payment
+BankName=Bank name
+FinancialAccount=Account
+BankAccount=Bank account
+BankAccounts=Bank accounts
+BankAccountsAndGateways=Bank accounts | Gateways
+ShowAccount=Show Account
+AccountRef=Financial account ref
+AccountLabel=Financial account label
+CashAccount=Cash account
+CashAccounts=Cash accounts
+CurrentAccounts=Current accounts
+SavingAccounts=Savings accounts
+ErrorBankLabelAlreadyExists=Financial account label already exists
+BankBalance=Balance
+BankBalanceBefore=Balance before
+BankBalanceAfter=Balance after
+BalanceMinimalAllowed=Minimum allowed balance
+BalanceMinimalDesired=Minimum desired balance
+InitialBankBalance=Initial balance
+EndBankBalance=End balance
+CurrentBalance=Current balance
+FutureBalance=Future balance
+ShowAllTimeBalance=Show balance from start
+AllTime=From start
+Reconciliation=Reconciliation
+RIB=Bank Account Number
+IBAN=IBAN number
+BIC=BIC/SWIFT code
+SwiftValid=BIC/SWIFT valid
+SwiftVNotalid=BIC/SWIFT not valid
+IbanValid=BAN valid
+IbanNotValid=BAN not valid
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
+AccountStatement=Account statement
+AccountStatementShort=Statement
+AccountStatements=Account statements
+LastAccountStatements=Last account statements
+IOMonthlyReporting=Monthly reporting
+BankAccountDomiciliation=Bank address
+BankAccountCountry=Account country
+BankAccountOwner=Account owner name
+BankAccountOwnerAddress=Account owner address
+RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
+CreateAccount=Create account
+NewBankAccount=New account
+NewFinancialAccount=New financial account
+MenuNewFinancialAccount=New financial account
+EditFinancialAccount=Edit account
+LabelBankCashAccount=Bank or cash label
+AccountType=Account type
+BankType0=Savings account
+BankType1=Current or credit card account
+BankType2=Cash account
+AccountsArea=Accounts area
+AccountCard=Account card
+DeleteAccount=Delete account
+ConfirmDeleteAccount=Are you sure you want to delete this account?
+Account=Account
+BankTransactionByCategories=Bank entries by categories
+BankTransactionForCategory=Bank entries for category <b>%s</b>
+RemoveFromRubrique=Remove link with category
+RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
+ListBankTransactions=List of bank entries
+IdTransaction=Transaction ID
+BankTransactions=Bank entries
+BankTransaction=Bank entry
+ListTransactions=List entries
+ListTransactionsByCategory=List entries/category
+TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
+Conciliable=Can be reconciled
+Conciliate=Reconcile
+Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
+ReconciliationLate=Reconciliation late
+IncludeClosedAccount=Include closed accounts
+OnlyOpenedAccount=Only open accounts
+AccountToCredit=Account to credit
+AccountToDebit=Account to debit
+DisableConciliation=Disable reconciliation feature for this account
+ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated entry
+StatusAccountOpened=Open
+StatusAccountClosed=Closed
+AccountIdShort=Number
+LineRecord=Transaction
+AddBankRecord=Add entry
+AddBankRecordLong=Add entry manually
+Conciliated=Reconciled
+ConciliatedBy=Reconciled by
+DateConciliating=Reconcile date
+BankLineConciliated=Entry reconciled with bank receipt
+Reconciled=Reconciled
+NotReconciled=Not reconciled
+CustomerInvoicePayment=Customer payment
+SupplierInvoicePayment=Vendor payment
+SubscriptionPayment=Subscription payment
+WithdrawalPayment=Debit payment order
+SocialContributionPayment=Social/fiscal tax payment
+BankTransfer=Bank transfer
+BankTransfers=Bank transfers
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferFrom=From
+TransferTo=To
+TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
+CheckTransmitter=Transmitter
+ValidateCheckReceipt=Validate this check receipt?
+ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done?
+DeleteCheckReceipt=Delete this check receipt?
+ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
+BankChecks=Bank checks
+BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
+ShowCheckReceipt=Show check deposit receipt
+NumberOfCheques=No. of check
+DeleteTransaction=Delete entry
+ConfirmDeleteTransaction=Are you sure you want to delete this entry?
+ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
+BankMovements=Movements
+PlannedTransactions=Planned entries
+Graph=Graphics
+ExportDataset_banque_1=Bank entries and account statement
+ExportDataset_banque_2=Deposit slip
+TransactionOnTheOtherAccount=Transaction on the other account
+PaymentNumberUpdateSucceeded=Payment number updated successfully
+PaymentNumberUpdateFailed=Payment number could not be updated
+PaymentDateUpdateSucceeded=Payment date updated successfully
+PaymentDateUpdateFailed=Payment date could not be updated
+Transactions=Transactions
+BankTransactionLine=Bank entry
+AllAccounts=All bank and cash accounts
+BackToAccount=Back to account
+ShowAllAccounts=Show for all accounts
+FutureTransaction=Future transaction. Unable to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+EventualyAddCategory=Eventually, specify a category in which to classify the records
+ToConciliate=To reconcile?
+ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
+DefaultRIB=Default BAN
+AllRIB=All BAN
+LabelRIB=BAN Label
+NoBANRecord=No BAN record
+DeleteARib=Delete BAN record
+ConfirmDeleteRib=Are you sure you want to delete this BAN record?
+RejectCheck=Check returned
+ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
+RejectCheckDate=Date the check was returned
+CheckRejected=Check returned
+CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
+VariousPayments=Miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
+SEPAMandate=SEPA mandate
+YourSEPAMandate=Your SEPA mandate
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
+BankColorizeMovement=Colorize movements
+BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
+BankColorizeMovementName1=Background color for debit movement
+BankColorizeMovementName2=Background color for credit movement
diff --git a/htdocs/langs/ne_NP/bills.lang b/htdocs/langs/ne_NP/bills.lang
new file mode 100644
index 00000000000..9f11d8ecf87
--- /dev/null
+++ b/htdocs/langs/ne_NP/bills.lang
@@ -0,0 +1,574 @@
+# Dolibarr language file - Source file is en_US - bills
+Bill=Invoice
+Bills=Invoices
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Vendor invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid vendor invoices
+BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsLate=Late payments
+BillsStatistics=Customers invoices statistics
+BillsStatisticsSuppliers=Vendors invoices statistics
+DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
+DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
+DisabledBecauseNotErasable=Disabled because cannot be erased
+InvoiceStandard=Standard invoice
+InvoiceStandardAsk=Standard invoice
+InvoiceStandardDesc=This kind of invoice is the common invoice.
+InvoiceDeposit=Down payment invoice
+InvoiceDepositAsk=Down payment invoice
+InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
+InvoiceProForma=Proforma invoice
+InvoiceProFormaAsk=Proforma invoice
+InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
+InvoiceReplacement=Replacement invoice
+InvoiceReplacementAsk=Replacement invoice for invoice
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceAvoir=Credit note
+InvoiceAvoirAsk=Credit note to correct invoice
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
+invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+ReplaceInvoice=Replace invoice %s
+ReplacementInvoice=Replacement invoice
+ReplacedByInvoice=Replaced by invoice %s
+ReplacementByInvoice=Replaced by invoice
+CorrectInvoice=Correct invoice %s
+CorrectionInvoice=Correction invoice
+UsedByInvoice=Used to pay invoice %s
+ConsumedBy=Consumed by
+NotConsumed=Not consumed
+NoReplacableInvoice=No replaceable invoices
+NoInvoiceToCorrect=No invoice to correct
+InvoiceHasAvoir=Was source of one or several credit notes
+CardBill=Invoice card
+PredefinedInvoices=Predefined Invoices
+Invoice=Invoice
+PdfInvoiceTitle=Invoice
+Invoices=Invoices
+InvoiceLine=Invoice line
+InvoiceCustomer=Customer invoice
+CustomerInvoice=Customer invoice
+CustomersInvoices=Customers invoices
+SupplierInvoice=Vendor invoice
+SuppliersInvoices=Vendors invoices
+SupplierBill=Vendor invoice
+SupplierBills=suppliers invoices
+Payment=Payment
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
+Payments=Payments
+PaymentsBack=Refunds
+paymentInInvoiceCurrency=in invoices currency
+PaidBack=Paid back
+DeletePayment=Delete payment
+ConfirmDeletePayment=Are you sure you want to delete this payment?
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+SupplierPayments=Vendor payments
+ReceivedPayments=Received payments
+ReceivedCustomersPayments=Payments received from customers
+PayedSuppliersPayments=Payments paid to vendors
+ReceivedCustomersPaymentsToValid=Received customers payments to validate
+PaymentsReportsForYear=Payments reports for %s
+PaymentsReports=Payments reports
+PaymentsAlreadyDone=Payments already done
+PaymentsBackAlreadyDone=Refunds already done
+PaymentRule=Payment rule
+PaymentMode=Payment Type
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
+IdPaymentMode=Payment Type (id)
+CodePaymentMode=Payment Type (code)
+LabelPaymentMode=Payment Type (label)
+PaymentModeShort=Payment Type
+PaymentTerm=Payment Term
+PaymentConditions=Payment Terms
+PaymentConditionsShort=Payment Terms
+PaymentAmount=Payment amount
+PaymentHigherThanReminderToPay=Payment higher than reminder to pay
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
+ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
+ClassifyPaidPartially=Classify 'Paid partially'
+ClassifyCanceled=Classify 'Abandoned'
+ClassifyClosed=Classify 'Closed'
+ClassifyUnBilled=Classify 'Unbilled'
+CreateBill=Create Invoice
+CreateCreditNote=Create credit note
+AddBill=Create invoice or credit note
+AddToDraftInvoices=Add to draft invoice
+DeleteBill=Delete invoice
+SearchACustomerInvoice=Search for a customer invoice
+SearchASupplierInvoice=Search for a vendor invoice
+CancelBill=Cancel an invoice
+SendRemindByMail=Send reminder by email
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
+ConvertToReduc=Mark as credit available
+ConvertExcessReceivedToReduc=Convert excess received into available credit
+ConvertExcessPaidToReduc=Convert excess paid into available discount
+EnterPaymentReceivedFromCustomer=Enter payment received from customer
+EnterPaymentDueToCustomer=Make payment due to customer
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+PriceBase=Price base
+BillStatus=Invoice status
+StatusOfGeneratedInvoices=Status of generated invoices
+BillStatusDraft=Draft (needs to be validated)
+BillStatusPaid=Paid
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
+BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusCanceled=Abandoned
+BillStatusValidated=Validated (needs to be paid)
+BillStatusStarted=Started
+BillStatusNotPaid=Not paid
+BillStatusNotRefunded=Not refunded
+BillStatusClosedUnpaid=Closed (unpaid)
+BillStatusClosedPaidPartially=Paid (partially)
+BillShortStatusDraft=Draft
+BillShortStatusPaid=Paid
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
+BillShortStatusConverted=Paid
+BillShortStatusCanceled=Abandoned
+BillShortStatusValidated=Validated
+BillShortStatusStarted=Started
+BillShortStatusNotPaid=Not paid
+BillShortStatusNotRefunded=Not refunded
+BillShortStatusClosedUnpaid=Closed
+BillShortStatusClosedPaidPartially=Paid (partially)
+PaymentStatusToValidShort=To validate
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
+ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
+ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
+ErrorBillNotFound=Invoice %s does not exist
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorDiscountAlreadyUsed=Error, discount already used
+ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
+ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
+ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
+BillFrom=From
+BillTo=To
+ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=Template / Recurring invoice
+NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
+FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
+NotARecurringInvoiceTemplate=Not a recurring template invoice
+NewBill=New invoice
+LastBills=Latest %s invoices
+LatestTemplateInvoices=Latest %s template invoices
+LatestCustomerTemplateInvoices=Latest %s customer template invoices
+LatestSupplierTemplateInvoices=Latest %s vendor template invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s vendor invoices
+AllBills=All invoices
+AllCustomerTemplateInvoices=All template invoices
+OtherBills=Other invoices
+DraftBills=Draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Vendor draft invoices
+Unpaid=Unpaid
+ErrorNoPaymentDefined=Error No payment defined
+ConfirmDeleteBill=Are you sure you want to delete this invoice?
+ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
+ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
+ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
+ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
+ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
+ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
+ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
+ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyAbandonReasonOther=Other
+ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
+ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
+ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
+ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
+ValidateBill=Validate invoice
+UnvalidateBill=Unvalidate invoice
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
+AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
+AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
+UseSituationInvoices=Allow situation invoice
+UseSituationInvoicesCreditNote=Allow situation invoice credit note
+Retainedwarranty=Retained warranty
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
+RetainedwarrantyDefaultPercent=Retained warranty default percent
+RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
+RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
+ToPayOn=To pay on %s
+toPayOn=to pay on %s
+RetainedWarranty=Retained Warranty
+PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
+DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
+setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
+setretainedwarranty=Set retained warranty
+setretainedwarrantyDateLimit=Set retained warranty date limit
+RetainedWarrantyDateLimit=Retained warranty date limit
+RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
+AlreadyPaid=Already paid
+AlreadyPaidBack=Already paid back
+AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
+Abandoned=Abandoned
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to refund
+Rest=Pending
+AmountExpected=Amount claimed
+ExcessReceived=Excess received
+ExcessPaid=Excess paid
+EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
+NoDraftBills=No draft invoices
+NoOtherDraftBills=No other draft invoices
+NoDraftInvoices=No draft invoices
+RefBill=Invoice ref
+ToBill=To bill
+RemainderToBill=Remainder to bill
+SendBillByMail=Send invoice by email
+SendReminderBillByMail=Send reminder by email
+RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
+MenuToValid=To valid
+DateMaxPayment=Payment due on
+DateInvoice=Invoice date
+DatePointOfTax=Point of tax
+NoInvoice=No invoice
+ClassifyBill=Classify invoice
+SupplierBillsToPay=Unpaid vendor invoices
+CustomerBillsUnpaid=Unpaid customer invoices
+NonPercuRecuperable=Non-recoverable
+SetConditions=Set Payment Terms
+SetMode=Set Payment Type
+SetRevenuStamp=Set revenue stamp
+Billed=Billed
+RecurringInvoices=Recurring invoices
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
+CustomersInvoicesAndPayments=Customer invoices and payments
+ExportDataset_invoice_1=Customer invoices and invoice details
+ExportDataset_invoice_2=Customer invoices and payments
+ProformaBill=Proforma Bill:
+Reduction=Reduction
+ReductionShort=Disc.
+Reductions=Reductions
+ReductionsShort=Disc.
+Discounts=Discounts
+AddDiscount=Create discount
+AddRelativeDiscount=Create relative discount
+EditRelativeDiscount=Edit relative discount
+AddGlobalDiscount=Create absolute discount
+EditGlobalDiscounts=Edit absolute discounts
+AddCreditNote=Create credit note
+ShowDiscount=Show discount
+ShowReduc=Show the discount
+ShowSourceInvoice=Show the source invoice
+RelativeDiscount=Relative discount
+GlobalDiscount=Global discount
+CreditNote=Credit note
+CreditNotes=Credit notes
+CreditNotesOrExcessReceived=Credit notes or excess received
+Deposit=Down payment
+Deposits=Down payments
+DiscountFromCreditNote=Discount from credit note %s
+DiscountFromDeposit=Down payments from invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
+AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
+CreditNoteDepositUse=Invoice must be validated to use this kind of credits
+NewGlobalDiscount=New absolute discount
+NewRelativeDiscount=New relative discount
+DiscountType=Discount type
+NoteReason=Note/Reason
+ReasonDiscount=Reason
+DiscountOfferedBy=Granted by
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Vendors discounts
+BillAddress=Bill address
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
+IdSocialContribution=Social/fiscal tax payment id
+PaymentId=Payment id
+PaymentRef=Payment ref.
+InvoiceId=Invoice id
+InvoiceRef=Invoice ref.
+InvoiceDateCreation=Invoice creation date
+InvoiceStatus=Invoice status
+InvoiceNote=Invoice note
+InvoicePaid=Invoice paid
+InvoicePaidCompletely=Paid completely
+InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
+OrderBilled=Order billed
+DonationPaid=Donation paid
+PaymentNumber=Payment number
+RemoveDiscount=Remove discount
+WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty)
+InvoiceNotChecked=No invoice selected
+ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
+DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
+NbOfPayments=No. of payments
+SplitDiscount=Split discount in two
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
+ConfirmRemoveDiscount=Are you sure you want to remove this discount?
+RelatedBill=Related invoice
+RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related vendor invoices
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoices already exist
+MergingPDFTool=Merging PDF tool
+AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
+PaymentNote=Payment note
+ListOfPreviousSituationInvoices=List of previous situation invoices
+ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+FrequencyUnit=Frequency unit
+toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
+NextDateToExecution=Date for next invoice generation
+NextDateToExecutionShort=Date next gen.
+DateLastGeneration=Date of latest generation
+DateLastGenerationShort=Date latest gen.
+MaxPeriodNumber=Max. number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
+InvoiceAutoValidate=Validate invoices automatically
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not reached yet
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
+WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
+WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
+ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
+# PaymentConditions
+Statut=Status
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShort30D=30 days
+PaymentCondition30D=30 days
+PaymentConditionShort30DENDMONTH=30 days of month-end
+PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort60D=60 days
+PaymentCondition60D=60 days
+PaymentConditionShort60DENDMONTH=60 days of month-end
+PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShortPT_DELIVERY=Delivery
+PaymentConditionPT_DELIVERY=On delivery
+PaymentConditionShortPT_ORDER=Order
+PaymentConditionPT_ORDER=On order
+PaymentConditionShortPT_5050=50-50
+PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+PaymentConditionShort10D=10 days
+PaymentCondition10D=10 days
+PaymentConditionShort10DENDMONTH=10 days of month-end
+PaymentCondition10DENDMONTH=Within 10 days following the end of the month
+PaymentConditionShort14D=14 days
+PaymentCondition14D=14 days
+PaymentConditionShort14DENDMONTH=14 days of month-end
+PaymentCondition14DENDMONTH=Within 14 days following the end of the month
+FixAmount=Fixed amount - 1 line with label '%s'
+VarAmount=Variable amount (%% tot.)
+VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
+VarAmountAllLines=Variable amount (%% tot.) - all same lines
+# PaymentType
+PaymentTypeVIR=Bank transfer
+PaymentTypeShortVIR=Bank transfer
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
+PaymentTypeLIQ=Cash
+PaymentTypeShortLIQ=Cash
+PaymentTypeCB=Credit card
+PaymentTypeShortCB=Credit card
+PaymentTypeCHQ=Check
+PaymentTypeShortCHQ=Check
+PaymentTypeTIP=TIP (Documents against Payment)
+PaymentTypeShortTIP=TIP Payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
+PaymentTypeTRA=Bank draft
+PaymentTypeShortTRA=Draft
+PaymentTypeFAC=Factor
+PaymentTypeShortFAC=Factor
+BankDetails=Bank details
+BankCode=Bank code
+DeskCode=Branch code
+BankAccountNumber=Account number
+BankAccountNumberKey=Checksum
+Residence=Address
+IBANNumber=IBAN account number
+IBAN=IBAN
+BIC=BIC/SWIFT
+BICNumber=BIC/SWIFT code
+ExtraInfos=Extra infos
+RegulatedOn=Regulated on
+ChequeNumber=Check N°
+ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
+ChequeMaker=Check/Transfer transmitter
+ChequeBank=Bank of Check
+CheckBank=Check
+NetToBePaid=Net to be paid
+PhoneNumber=Tel
+FullPhoneNumber=Telephone
+TeleFax=Fax
+PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration.
+IntracommunityVATNumber=Intra-Community VAT ID
+PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
+PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
+SendTo=sent to
+PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
+VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
+LawApplicationPart1=By application of the law 80.335 of 12/05/80
+LawApplicationPart2=the goods remain the property of
+LawApplicationPart3=the seller until full payment of
+LawApplicationPart4=their price.
+LimitedLiabilityCompanyCapital=SARL with Capital of
+UseLine=Apply
+UseDiscount=Use discount
+UseCredit=Use credit
+UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit
+MenuChequeDeposits=Check Deposits
+MenuCheques=Checks
+MenuChequesReceipts=Check receipts
+NewChequeDeposit=New deposit
+ChequesReceipts=Check receipts
+ChequesArea=Check deposits area
+ChequeDeposits=Check deposits
+Cheques=Checks
+DepositId=Id deposit
+NbCheque=Number of checks
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices
+ShowUnpaidAll=Show all unpaid invoices
+ShowUnpaidLateOnly=Show late unpaid invoices only
+PaymentInvoiceRef=Payment invoice %s
+ValidateInvoice=Validate invoice
+ValidateInvoices=Validate invoices
+Cash=Cash
+Reported=Delayed
+DisabledBecausePayments=Not possible since there are some payments
+CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+ExpectedToPay=Expected payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
+PayedByThisPayment=Paid by this payment
+ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
+ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
+ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
+ToMakePayment=Pay
+ToMakePaymentBack=Pay back
+ListOfYourUnpaidInvoices=List of unpaid invoices
+NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
+RevenueStamp=Tax stamp
+YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
+YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
+PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
+TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+EarlyClosingReason=Early closing reason
+EarlyClosingComment=Early closing note
+##### Types de contacts #####
+TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
+TypeContact_facture_external_BILLING=Customer invoice contact
+TypeContact_facture_external_SHIPPING=Customer shipping contact
+TypeContact_facture_external_SERVICE=Customer service contact
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
+TypeContact_invoice_supplier_external_BILLING=Vendor invoice contact
+TypeContact_invoice_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+# Situation invoices
+InvoiceFirstSituationAsk=First situation invoice
+InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
+InvoiceSituation=Situation invoice
+InvoiceSituationAsk=Invoice following the situation
+InvoiceSituationDesc=Create a new situation following an already existing one
+SituationAmount=Situation invoice amount(net)
+SituationDeduction=Situation subtraction
+ModifyAllLines=Modify all lines
+CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
+NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
+DisabledBecauseNotLastInCycle=The next situation already exists.
+DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
+CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
+NoSituations=No open situations
+InvoiceSituationLast=Final and general invoice
+PDFCrevetteSituationNumber=Situation N°%s
+PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
+PDFCrevetteSituationInvoiceTitle=Situation invoice
+PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
+TotalSituationInvoice=Total situation
+invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
+updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
+CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
+BillCreated=%s bill(s) created
+StatusOfGeneratedDocuments=Status of document generation
+DoNotGenerateDoc=Do not generate document file
+AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/ne_NP/blockedlog.lang b/htdocs/langs/ne_NP/blockedlog.lang
new file mode 100644
index 00000000000..5afae6e9e53
--- /dev/null
+++ b/htdocs/langs/ne_NP/blockedlog.lang
@@ -0,0 +1,54 @@
+BlockedLog=Unalterable Logs
+Field=Field
+BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525).
+Fingerprints=Archived events and fingerprints
+FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed).
+CompanyInitialKey=Company initial key (hash of genesis block)
+BrowseBlockedLog=Unalterable logs
+ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
+ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
+DownloadBlockChain=Download fingerprints
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
+OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
+AddedByAuthority=Stored into remote authority
+NotAddedByAuthorityYet=Not yet stored into remote authority
+ShowDetails=Show stored details
+logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
+logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
+logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
+logPAYMENT_ADD_TO_BANK=Payment added to bank
+logPAYMENT_CUSTOMER_CREATE=Customer payment created
+logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
+logDONATION_PAYMENT_CREATE=Donation payment created
+logDONATION_PAYMENT_DELETE=Donation payment logical deletion
+logBILL_PAYED=Customer invoice paid
+logBILL_UNPAYED=Customer invoice set unpaid
+logBILL_VALIDATE=Customer invoice validated
+logBILL_SENTBYMAIL=Customer invoice send by mail
+logBILL_DELETE=Customer invoice logically deleted
+logMODULE_RESET=Module BlockedLog was disabled
+logMODULE_SET=Module BlockedLog was enabled
+logDON_VALIDATE=Donation validated
+logDON_MODIFY=Donation modified
+logDON_DELETE=Donation logical deletion
+logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
+logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
+logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
+logCASHCONTROL_VALIDATE=Cash fence recording
+BlockedLogBillDownload=Customer invoice download
+BlockedLogBillPreview=Customer invoice preview
+BlockedlogInfoDialog=Log Details
+ListOfTrackedEvents=List of tracked events
+Fingerprint=Fingerprint
+DownloadLogCSV=Export archived logs (CSV)
+logDOC_PREVIEW=Preview of a validated document in order to print or download
+logDOC_DOWNLOAD=Download of a validated document in order to print or send
+DataOfArchivedEvent=Full datas of archived event
+ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
+BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
+BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
+OnlyNonValid=Non-valid
+TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
+RestrictYearToExport=Restrict month / year to export
diff --git a/htdocs/langs/ne_NP/bookmarks.lang b/htdocs/langs/ne_NP/bookmarks.lang
new file mode 100644
index 00000000000..87466cadcfa
--- /dev/null
+++ b/htdocs/langs/ne_NP/bookmarks.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - marque pages
+AddThisPageToBookmarks=Add current page to bookmarks
+Bookmark=Bookmark
+Bookmarks=Bookmarks
+ListOfBookmarks=List of bookmarks
+EditBookmarks=List/edit bookmarks
+NewBookmark=New bookmark
+ShowBookmark=Show bookmark
+OpenANewWindow=Open a new tab
+ReplaceWindow=Replace current tab
+BookmarkTargetNewWindowShort=New tab
+BookmarkTargetReplaceWindowShort=Current tab
+BookmarkTitle=Bookmark name
+UrlOrLink=URL
+BehaviourOnClick=Behaviour when a bookmark URL is selected
+CreateBookmark=Create bookmark
+SetHereATitleForLink=Set a name for the bookmark
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if the linked page should open in the current tab or a new tab
+BookmarksManagement=Bookmarks management
+BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/ne_NP/boxes.lang b/htdocs/langs/ne_NP/boxes.lang
new file mode 100644
index 00000000000..bd62684421a
--- /dev/null
+++ b/htdocs/langs/ne_NP/boxes.lang
@@ -0,0 +1,102 @@
+# Dolibarr language file - Source file is en_US - boxes
+BoxLoginInformation=Login Information
+BoxLastRssInfos=RSS Information
+BoxLastProducts=Latest %s Products/Services
+BoxProductsAlertStock=Stock alerts for products
+BoxLastProductsInContract=Latest %s contracted products/services
+BoxLastSupplierBills=Latest Vendor invoices
+BoxLastCustomerBills=Latest Customer invoices
+BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
+BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
+BoxLastProposals=Latest commercial proposals
+BoxLastProspects=Latest modified prospects
+BoxLastCustomers=Latest modified customers
+BoxLastSuppliers=Latest modified suppliers
+BoxLastCustomerOrders=Latest sales orders
+BoxLastActions=Latest actions
+BoxLastContracts=Latest contracts
+BoxLastContacts=Latest contacts/addresses
+BoxLastMembers=Latest members
+BoxFicheInter=Latest interventions
+BoxCurrentAccounts=Open accounts balance
+BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleLastRssInfos=Latest %s news from %s
+BoxTitleLastProducts=Products/Services: last %s modified
+BoxTitleProductsAlertStock=Products: stock alert
+BoxTitleLastSuppliers=Latest %s recorded suppliers
+BoxTitleLastModifiedSuppliers=Vendors: last %s modified
+BoxTitleLastModifiedCustomers=Customers: last %s modified
+BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
+BoxTitleLastModifiedProspects=Prospects: last %s modified
+BoxTitleLastModifiedMembers=Latest %s members
+BoxTitleLastFicheInter=Latest %s modified interventions
+BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
+BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
+BoxTitleCurrentAccounts=Open Accounts: balances
+BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
+BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
+BoxMyLastBookmarks=Bookmarks: latest %s
+BoxOldestExpiredServices=Oldest active expired services
+BoxLastExpiredServices=Latest %s oldest contacts with active expired services
+BoxTitleLastActionsToDo=Latest %s actions to do
+BoxTitleLastContracts=Latest %s modified contracts
+BoxTitleLastModifiedDonations=Latest %s modified donations
+BoxTitleLastModifiedExpenses=Latest %s modified expense reports
+BoxTitleLatestModifiedBoms=Latest %s modified BOMs
+BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
+FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
+LastRefreshDate=Latest refresh date
+NoRecordedBookmarks=No bookmarks defined.
+ClickToAdd=Click here to add.
+NoRecordedCustomers=No recorded customers
+NoRecordedContacts=No recorded contacts
+NoActionsToDo=No actions to do
+NoRecordedOrders=No recorded sales orders
+NoRecordedProposals=No recorded proposals
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid vendor invoices
+NoModifiedSupplierBills=No recorded vendor invoices
+NoRecordedProducts=No recorded products/services
+NoRecordedProspects=No recorded prospects
+NoContractedProducts=No products/services contracted
+NoRecordedContracts=No recorded contracts
+NoRecordedInterventions=No recorded interventions
+BoxLatestSupplierOrders=Latest purchase orders
+BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
+NoSupplierOrder=No recorded purchase order
+BoxCustomersInvoicesPerMonth=Customer Invoices per month
+BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
+BoxCustomersOrdersPerMonth=Sales Orders per month
+BoxSuppliersOrdersPerMonth=Vendor Orders per month
+BoxProposalsPerMonth=Proposals per month
+NoTooLowStockProducts=No products are under the low stock limit
+BoxProductDistribution=Products/Services Distribution
+ForObject=On %s
+BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
+BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
+BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
+BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
+BoxTitleLastModifiedPropals=Latest %s modified proposals
+ForCustomersInvoices=Customers invoices
+ForCustomersOrders=Customers orders
+ForProposals=Proposals
+LastXMonthRolling=The latest %s month rolling
+ChooseBoxToAdd=Add widget to your dashboard
+BoxAdded=Widget was added in your dashboard
+BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
+BoxLastManualEntries=Last manual entries in accountancy
+BoxTitleLastManualEntries=%s latest manual entries
+NoRecordedManualEntries=No manual entries record in accountancy
+BoxSuspenseAccount=Count accountancy operation with suspense account
+BoxTitleSuspenseAccount=Number of unallocated lines
+NumberOfLinesInSuspenseAccount=Number of line in suspense account
+SuspenseAccountNotDefined=Suspense account isn't defined
+BoxLastCustomerShipments=Last customer shipments
+BoxTitleLastCustomerShipments=Latest %s customer shipments
+NoRecordedShipments=No recorded customer shipment
diff --git a/htdocs/langs/ne_NP/cashdesk.lang b/htdocs/langs/ne_NP/cashdesk.lang
new file mode 100644
index 00000000000..0903a3d10bc
--- /dev/null
+++ b/htdocs/langs/ne_NP/cashdesk.lang
@@ -0,0 +1,110 @@
+# Language file - Source file is en_US - cashdesk
+CashDeskMenu=Point of sale
+CashDesk=Point of sale
+CashDeskBankCash=Bank account (cash)
+CashDeskBankCB=Bank account (card)
+CashDeskBankCheque=Bank account (cheque)
+CashDeskWarehouse=Warehouse
+CashdeskShowServices=Selling services
+CashDeskProducts=Products
+CashDeskStock=Stock
+CashDeskOn=on
+CashDeskThirdParty=Third party
+ShoppingCart=Shopping cart
+NewSell=New sell
+AddThisArticle=Add this article
+RestartSelling=Go back on sell
+SellFinished=Sale complete
+PrintTicket=Print ticket
+SendTicket=Send ticket
+NoProductFound=No article found
+ProductFound=product found
+NoArticle=No article
+Identification=Identification
+Article=Article
+Difference=Difference
+TotalTicket=Total ticket
+NoVAT=No VAT for this sale
+Change=Excess received
+BankToPay=Account for payment
+ShowCompany=Show company
+ShowStock=Show warehouse
+DeleteArticle=Click to remove this article
+FilterRefOrLabelOrBC=Search (Ref/Label)
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
+DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of Sale
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
+Receipt=Receipt
+Header=Header
+Footer=Footer
+AmountAtEndOfPeriod=Amount at end of period (day, month or year)
+TheoricalAmount=Theorical amount
+RealAmount=Real amount
+CashFence=Cash fence
+CashFenceDone=Cash fence done for the period
+NbOfInvoices=Nb of invoices
+Paymentnumpad=Type of Pad to enter payment
+Numberspad=Numbers Pad
+BillsCoinsPad=Coins and banknotes Pad
+DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
+TakeposNeedsCategories=TakePOS needs product categories to work
+OrderNotes=Order Notes
+CashDeskBankAccountFor=Default account to use for payments in
+NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
+PrintCustomerOnReceipts=Print customer on tickets|receipts
+EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
+ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
+POSTerminal=POS Terminal
+POSModule=POS Module
+BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
+CustomReceipt=Custom Receipt
+ReceiptName=Receipt Name
+ProductSupplements=Product Supplements
+SupplementCategory=Supplement category
+ColorTheme=Color theme
+Colorful=Colorful
+HeadBar=Head Bar
+SortProductField=Field for sorting products
+Browser=Browser
+BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
+TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
+PrintMethod=Print method
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ByTerminal=By terminal
+TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for POS sales
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
+BarRestaurant=Bar Restaurant
+AutoOrder=Customer auto order
diff --git a/htdocs/langs/ne_NP/categories.lang b/htdocs/langs/ne_NP/categories.lang
new file mode 100644
index 00000000000..30bace0574c
--- /dev/null
+++ b/htdocs/langs/ne_NP/categories.lang
@@ -0,0 +1,89 @@
+# Dolibarr language file - Source file is en_US - categories
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+RubriquesTransactions=Tags/Categories of transactions
+categories=tags/categories
+NoCategoryYet=No tag/category of this type created
+In=In
+AddIn=Add in
+modify=modify
+Classify=Classify
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Vendors tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
+UsersCategoriesArea=Users tags/categories area
+SubCats=Sub-categories
+CatList=List of tags/categories
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
+NoSubCat=No subcategory.
+SubCatOf=Subcategory
+FoundCats=Found tags/categories
+ImpossibleAddCat=Impossible to add the tag/category %s
+WasAddedSuccessfully=<b>%s</b> was added successfully.
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+ProductIsInCategories=Product/service is linked to following tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
+ClassifyInCategory=Add to tag/category
+NotCategorized=Without tag/category
+CategoryExistsAtSameLevel=This category already exists with this ref
+ContentsVisibleByAllShort=Contents visible by all
+ContentsNotVisibleByAllShort=Contents not visible by all
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Vendors tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
+SuppliersCategoriesShort=Vendors tags/categories
+CustomersCategoriesShort=Customers tags/categories
+ProspectsCategoriesShort=Prospects tags/categories
+CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
+AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
+UsersCategoriesShort=Users tags/categories
+StockCategoriesShort=Warehouse tags/categories
+ThisCategoryHasNoItems=This category does not contain any items.
+CategId=Tag/category id
+CatSupList=List of vendor tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatContactsLinks=Links between contacts/addresses and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
+DeleteFromCat=Remove from tags/category
+ExtraFieldsCategories=Complementary attributes
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
+CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
+AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show tag/category
+ByDefaultInList=By default in list
+ChooseCategory=Choose category
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/ne_NP/commercial.lang b/htdocs/langs/ne_NP/commercial.lang
new file mode 100644
index 00000000000..10c536e0d48
--- /dev/null
+++ b/htdocs/langs/ne_NP/commercial.lang
@@ -0,0 +1,80 @@
+# Dolibarr language file - Source file is en_US - commercial
+Commercial=Commerce
+CommercialArea=Commerce area
+Customer=Customer
+Customers=Customers
+Prospect=Prospect
+Prospects=Prospects
+DeleteAction=Delete an event
+NewAction=New event
+AddAction=Create event
+AddAnAction=Create an event
+AddActionRendezVous=Create a Rendez-vous event
+ConfirmDeleteAction=Are you sure you want to delete this event?
+CardAction=Event card
+ActionOnCompany=Related company
+ActionOnContact=Related contact
+TaskRDVWith=Meeting with %s
+ShowTask=Show task
+ShowAction=Show event
+ActionsReport=Events report
+ThirdPartiesOfSaleRepresentative=Third parties with sales representative
+SaleRepresentativesOfThirdParty=Sales representatives of third party
+SalesRepresentative=Sales representative
+SalesRepresentatives=Sales representatives
+SalesRepresentativeFollowUp=Sales representative (follow-up)
+SalesRepresentativeSignature=Sales representative (signature)
+NoSalesRepresentativeAffected=No particular sales representative assigned
+ShowCustomer=Show customer
+ShowProspect=Show prospect
+ListOfProspects=List of prospects
+ListOfCustomers=List of customers
+LastDoneTasks=Latest %s completed actions
+LastActionsToDo=Oldest %s not completed actions
+DoneAndToDoActions=Completed and To do events
+DoneActions=Completed events
+ToDoActions=Incomplete events
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
+StatusNotApplicable=Not applicable
+StatusActionToDo=To do
+StatusActionDone=Complete
+StatusActionInProcess=In process
+TasksHistoryForThisContact=Events for this contact
+LastProspectDoNotContact=Do not contact
+LastProspectNeverContacted=Never contacted
+LastProspectToContact=To contact
+LastProspectContactInProcess=Contact in process
+LastProspectContactDone=Contact done
+ActionAffectedTo=Event assigned to
+ActionDoneBy=Event done by
+ActionAC_TEL=Phone call
+ActionAC_FAX=Send fax
+ActionAC_PROP=Send proposal by mail
+ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
+ActionAC_RDV=Meetings
+ActionAC_INT=Intervention on site
+ActionAC_FAC=Send customer invoice by mail
+ActionAC_REL=Send customer invoice by mail (reminder)
+ActionAC_CLO=Close
+ActionAC_EMAILING=Send mass email
+ActionAC_COM=Send sales order by mail
+ActionAC_SHIP=Send shipping by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
+ActionAC_OTH=Other
+ActionAC_OTH_AUTO=Automatically inserted events
+ActionAC_MANUAL=Manually inserted events
+ActionAC_AUTO=Automatically inserted events
+ActionAC_OTH_AUTOShort=Auto
+Stats=Sales statistics
+StatusProsp=Prospect status
+DraftPropals=Draft commercial proposals
+NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commercial proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/ne_NP/companies.lang b/htdocs/langs/ne_NP/companies.lang
new file mode 100644
index 00000000000..0fad58c9389
--- /dev/null
+++ b/htdocs/langs/ne_NP/companies.lang
@@ -0,0 +1,458 @@
+# Dolibarr language file - Source file is en_US - companies
+ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
+ErrorSetACountryFirst=Set the country first
+SelectThirdParty=Select a third party
+ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+DeleteContact=Delete a contact/address
+ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+MenuNewThirdParty=New Third Party
+MenuNewCustomer=New Customer
+MenuNewProspect=New Prospect
+MenuNewSupplier=New Vendor
+MenuNewPrivateIndividual=New private individual
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New Third Party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
+CreateThirdPartyOnly=Create third party
+CreateThirdPartyAndContact=Create a third party + a child contact
+ProspectionArea=Prospection area
+IdThirdParty=Id third party
+IdCompany=Company Id
+IdContact=Contact Id
+Contacts=Contacts/Addresses
+ThirdPartyContacts=Third-party contacts
+ThirdPartyContact=Third-party contact/address
+Company=Company
+CompanyName=Company name
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias Name
+Companies=Companies
+CountryIsInEEC=Country is inside the European Economic Community
+PriceFormatInCurrentLanguage=Price display format in the current language and currency
+ThirdPartyName=Third-party name
+ThirdPartyEmail=Third-party email
+ThirdParty=Third-party
+ThirdParties=Third-parties
+ThirdPartyProspects=Prospects
+ThirdPartyProspectsStats=Prospects
+ThirdPartyCustomers=Customers
+ThirdPartyCustomersStats=Customers
+ThirdPartyCustomersWithIdProf12=Customers with %s or %s
+ThirdPartySuppliers=Vendors
+ThirdPartyType=Third-party type
+Individual=Private individual
+ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
+ParentCompany=Parent company
+Subsidiaries=Subsidiaries
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
+ReportByQuarter=Report by rate
+CivilityCode=Civility code
+RegisteredOffice=Registered office
+Lastname=Last name
+Firstname=First name
+PostOrFunction=Job position
+UserTitle=Title
+NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
+Address=Address
+State=State/Province
+StateCode=State/Province code
+StateShort=State
+Region=Region
+Region-State=Region - State
+Country=Country
+CountryCode=Country code
+CountryId=Country id
+Phone=Phone
+PhoneShort=Phone
+Skype=Skype
+Call=Call
+Chat=Chat
+PhonePro=Prof. phone
+PhonePerso=Pers. phone
+PhoneMobile=Mobile
+No_Email=Refuse bulk emailings
+Fax=Fax
+Zip=Zip Code
+Town=City
+Web=Web
+Poste= Position
+DefaultLang=Language default
+VATIsUsed=Sales tax used
+VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
+CopyAddressFromSoc=Copy address from third-party details
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
+PaymentBankAccount=Payment bank account
+OverAllProposals=Proposals
+OverAllOrders=Orders
+OverAllInvoices=Invoices
+OverAllSupplierProposals=Price requests
+##### Local Taxes #####
+LocalTax1IsUsed=Use second tax
+LocalTax1IsUsedES= RE is used
+LocalTax1IsNotUsedES= RE is not used
+LocalTax2IsUsed=Use third tax
+LocalTax2IsUsedES= IRPF is used
+LocalTax2IsNotUsedES= IRPF is not used
+WrongCustomerCode=Customer code invalid
+WrongSupplierCode=Vendor code invalid
+CustomerCodeModel=Customer code model
+SupplierCodeModel=Vendor code model
+Gencod=Barcode
+##### Professional ID #####
+ProfId1Short=Prof. id 1
+ProfId2Short=Prof. id 2
+ProfId3Short=Prof. id 3
+ProfId4Short=Prof. id 4
+ProfId5Short=Prof. id 5
+ProfId6Short=Prof. id 6
+ProfId1=Professional ID 1
+ProfId2=Professional ID 2
+ProfId3=Professional ID 3
+ProfId4=Professional ID 4
+ProfId5=Professional ID 5
+ProfId6=Professional ID 6
+ProfId1AR=Prof Id 1 (CUIT/CUIL)
+ProfId2AR=Prof Id 2 (Revenu brutes)
+ProfId3AR=-
+ProfId4AR=-
+ProfId5AR=-
+ProfId6AR=-
+ProfId1AT=Prof Id 1 (USt.-IdNr)
+ProfId2AT=Prof Id 2 (USt.-Nr)
+ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
+ProfId4AT=-
+ProfId5AT=-
+ProfId6AT=-
+ProfId1AU=Prof Id 1 (ABN)
+ProfId2AU=-
+ProfId3AU=-
+ProfId4AU=-
+ProfId5AU=-
+ProfId6AU=-
+ProfId1BE=Prof Id 1 (Professional number)
+ProfId2BE=-
+ProfId3BE=-
+ProfId4BE=-
+ProfId5BE=-
+ProfId6BE=-
+ProfId1BR=-
+ProfId2BR=IE (Inscricao Estadual)
+ProfId3BR=IM (Inscricao Municipal)
+ProfId4BR=CPF
+#ProfId5BR=CNAE
+#ProfId6BR=INSS
+ProfId1CH=-
+ProfId2CH=-
+ProfId3CH=Prof Id 1 (Federal number)
+ProfId4CH=Prof Id 2 (Commercial Record number)
+ProfId5CH=-
+ProfId6CH=-
+ProfId1CL=Prof Id 1 (R.U.T.)
+ProfId2CL=-
+ProfId3CL=-
+ProfId4CL=-
+ProfId5CL=-
+ProfId6CL=-
+ProfId1CO=Prof Id 1 (R.U.T.)
+ProfId2CO=-
+ProfId3CO=-
+ProfId4CO=-
+ProfId5CO=-
+ProfId6CO=-
+ProfId1DE=Prof Id 1 (USt.-IdNr)
+ProfId2DE=Prof Id 2 (USt.-Nr)
+ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId4DE=-
+ProfId5DE=-
+ProfId6DE=-
+ProfId1ES=Prof Id 1 (CIF/NIF)
+ProfId2ES=Prof Id 2 (Social security number)
+ProfId3ES=Prof Id 3 (CNAE)
+ProfId4ES=Prof Id 4 (Collegiate number)
+ProfId5ES=-
+ProfId6ES=-
+ProfId1FR=Prof Id 1 (SIREN)
+ProfId2FR=Prof Id 2 (SIRET)
+ProfId3FR=Prof Id 3 (NAF, old APE)
+ProfId4FR=Prof Id 4 (RCS/RM)
+ProfId5FR=-
+ProfId6FR=-
+ProfId1GB=Registration Number
+ProfId2GB=-
+ProfId3GB=SIC
+ProfId4GB=-
+ProfId5GB=-
+ProfId6GB=-
+ProfId1HN=Id prof. 1 (RTN)
+ProfId2HN=-
+ProfId3HN=-
+ProfId4HN=-
+ProfId5HN=-
+ProfId6HN=-
+ProfId1IN=Prof Id 1 (TIN)
+ProfId2IN=Prof Id 2 (PAN)
+ProfId3IN=Prof Id 3 (SRVC TAX)
+ProfId4IN=Prof Id 4
+ProfId5IN=Prof Id 5
+ProfId6IN=-
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
+ProfId1MA=Id prof. 1 (R.C.)
+ProfId2MA=Id prof. 2 (Patente)
+ProfId3MA=Id prof. 3 (I.F.)
+ProfId4MA=Id prof. 4 (C.N.S.S.)
+ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId6MA=-
+ProfId1MX=Prof Id 1 (R.F.C).
+ProfId2MX=Prof Id 2 (R..P. IMSS)
+ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId4MX=-
+ProfId5MX=-
+ProfId6MX=-
+ProfId1NL=KVK nummer
+ProfId2NL=-
+ProfId3NL=-
+ProfId4NL=Burgerservicenummer (BSN)
+ProfId5NL=-
+ProfId6NL=-
+ProfId1PT=Prof Id 1 (NIPC)
+ProfId2PT=Prof Id 2 (Social security number)
+ProfId3PT=Prof Id 3 (Commercial Record number)
+ProfId4PT=Prof Id 4 (Conservatory)
+ProfId5PT=-
+ProfId6PT=-
+ProfId1SN=RC
+ProfId2SN=NINEA
+ProfId3SN=-
+ProfId4SN=-
+ProfId5SN=-
+ProfId6SN=-
+ProfId1TN=Prof Id 1 (RC)
+ProfId2TN=Prof Id 2 (Fiscal matricule)
+ProfId3TN=Prof Id 3 (Douane code)
+ProfId4TN=Prof Id 4 (BAN)
+ProfId5TN=-
+ProfId6TN=-
+ProfId1US=Prof Id (FEIN)
+ProfId2US=-
+ProfId3US=-
+ProfId4US=-
+ProfId5US=-
+ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
+ProfId1RU=Prof Id 1 (OGRN)
+ProfId2RU=Prof Id 2 (INN)
+ProfId3RU=Prof Id 3 (KPP)
+ProfId4RU=Prof Id 4 (OKPO)
+ProfId5RU=-
+ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
+VATIntra=VAT ID
+VATIntraShort=VAT ID
+VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
+ProspectCustomer=Prospect / Customer
+Prospect=Prospect
+CustomerCard=Customer Card
+Customer=Customer
+CustomerRelativeDiscount=Relative customer discount
+SupplierRelativeDiscount=Relative vendor discount
+CustomerRelativeDiscountShort=Relative discount
+CustomerAbsoluteDiscountShort=Absolute discount
+CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
+CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
+CompanyHasAbsoluteDiscount=This customer has discounts available (credits notes or down payments) for <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
+CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
+CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
+DiscountNone=None
+Vendor=Vendor
+Supplier=Vendor
+AddContact=Create contact
+AddContactAddress=Create contact/address
+EditContact=Edit contact
+EditContactAddress=Edit contact/address
+Contact=Contact
+ContactId=Contact id
+ContactsAddresses=Contacts/Addresses
+FromContactName=Name:
+NoContactDefinedForThirdParty=No contact defined for this third party
+NoContactDefined=No contact defined
+DefaultContact=Default contact/address
+ContactByDefaultFor=Default contact/address for
+AddThirdParty=Create third party
+DeleteACompany=Delete a company
+PersonalInformations=Personal data
+AccountancyCode=Accounting account
+CustomerCode=Customer Code
+SupplierCode=Vendor Code
+CustomerCodeShort=Customer Code
+SupplierCodeShort=Vendor Code
+CustomerCodeDesc=Customer Code, unique for all customers
+SupplierCodeDesc=Vendor Code, unique for all vendors
+RequiredIfCustomer=Required if third party is a customer or prospect
+RequiredIfSupplier=Required if third party is a vendor
+ValidityControledByModule=Validity controlled by module
+ThisIsModuleRules=Rules for this module
+ProspectToContact=Prospect to contact
+CompanyDeleted=Company "%s" deleted from database.
+ListOfContacts=List of contacts/addresses
+ListOfContactsAddresses=List of contacts/addresses
+ListOfThirdParties=List of Third Parties
+ShowCompany=Third Party
+ShowContact=Contact-Address
+ContactsAllShort=All (No filter)
+ContactType=Contact type
+ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
+ContactForProposals=Proposal's contact
+ContactForContracts=Contract's contact
+ContactForInvoices=Invoice's contact
+NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
+NoContactForAnyProposal=This contact is not a contact for any commercial proposal
+NoContactForAnyContract=This contact is not a contact for any contract
+NoContactForAnyInvoice=This contact is not a contact for any invoice
+NewContact=New contact
+NewContactAddress=New Contact/Address
+MyContacts=My contacts
+Capital=Capital
+CapitalOf=Capital of %s
+EditCompany=Edit company
+ThisUserIsNot=This user is not a prospect, customer or vendor
+VATIntraCheck=Check
+VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
+VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
+NorProspectNorCustomer=Not prospect, nor customer
+JuridicalStatus=Legal Entity Type
+Staff=Employees
+ProspectLevelShort=Potential
+ProspectLevel=Prospect potential
+ContactPrivate=Private
+ContactPublic=Shared
+ContactVisibility=Visibility
+ContactOthers=Other
+OthersNotLinkedToThirdParty=Others, not linked to a third party
+ProspectStatus=Prospect status
+PL_NONE=None
+PL_UNKNOWN=Unknown
+PL_LOW=Low
+PL_MEDIUM=Medium
+PL_HIGH=High
+TE_UNKNOWN=-
+TE_STARTUP=Startup
+TE_GROUP=Large company
+TE_MEDIUM=Medium company
+TE_ADMIN=Governmental
+TE_SMALL=Small company
+TE_RETAIL=Retailer
+TE_WHOLE=Wholesaler
+TE_PRIVATE=Private individual
+TE_OTHER=Other
+StatusProspect-1=Do not contact
+StatusProspect0=Never contacted
+StatusProspect1=To be contacted
+StatusProspect2=Contact in process
+StatusProspect3=Contact done
+ChangeDoNotContact=Change status to 'Do not contact'
+ChangeNeverContacted=Change status to 'Never contacted'
+ChangeToContact=Change status to 'To be contacted'
+ChangeContactInProcess=Change status to 'Contact in process'
+ChangeContactDone=Change status to 'Contact done'
+ProspectsByStatus=Prospects by status
+NoParentCompany=None
+ExportCardToFormat=Export card to format
+ContactNotLinkedToCompany=Contact not linked to any third party
+DolibarrLogin=Dolibarr login
+NoDolibarrAccess=No Dolibarr access
+ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
+ExportDataset_company_2=Contacts and their properties
+ImportDataset_company_1=Third-parties and their properties
+ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ImportDataset_company_3=Third-parties Bank accounts
+ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
+PriceLevel=Price Level
+PriceLevelLabels=Price Level Labels
+DeliveryAddress=Delivery address
+AddAddress=Add address
+SupplierCategory=Vendor category
+JuridicalStatus200=Independent
+DeleteFile=Delete file
+ConfirmDeleteFile=Are you sure you want to delete this file?
+AllocateCommercial=Assigned to sales representative
+Organization=Organization
+FiscalYearInformation=Fiscal Year
+FiscalMonthStart=Starting month of the fiscal year
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
+YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
+YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
+ListSuppliersShort=List of Vendors
+ListProspectsShort=List of Prospects
+ListCustomersShort=List of Customers
+ThirdPartiesArea=Third Parties/Contacts
+LastModifiedThirdParties=Last %s modified Third Parties
+UniqueThirdParties=Total of Third Parties
+InActivity=Open
+ActivityCeased=Closed
+ThirdPartyIsClosed=Third party is closed
+ProductsIntoElements=List of products/services into %s
+CurrentOutstandingBill=Current outstanding bill
+OutstandingBill=Max. for outstanding bill
+OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
+MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
+ManagingDirectors=Manager(s) name (CEO, director, president...)
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ThirdpartiesMergeSuccess=Third parties have been merged
+SaleRepresentativeLogin=Login of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+#Imports
+PaymentTypeCustomer=Payment Type - Customer
+PaymentTermsCustomer=Payment Terms - Customer
+PaymentTypeSupplier=Payment Type - Vendor
+PaymentTermsSupplier=Payment Term - Vendor
+PaymentTypeBoth=Payment Type - Customer and Vendor
+MulticurrencyUsed=Use Multicurrency
+MulticurrencyCurrency=Currency
diff --git a/htdocs/langs/ne_NP/compta.lang b/htdocs/langs/ne_NP/compta.lang
new file mode 100644
index 00000000000..8a8c837ac87
--- /dev/null
+++ b/htdocs/langs/ne_NP/compta.lang
@@ -0,0 +1,266 @@
+# Dolibarr language file - Source file is en_US - compta
+MenuFinancial=Billing | Payment
+TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
+OptionMode=Option for accountancy
+OptionModeTrue=Option Incomes-Expenses
+OptionModeVirtual=Option Claims-Debts
+OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
+OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
+FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
+VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
+LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+Param=Setup
+RemainingAmountPayment=Amount payment remaining:
+Account=Account
+Accountparent=Parent account
+Accountsparent=Parent accounts
+Income=Income
+Outcome=Expense
+MenuReportInOut=Income / Expense
+ReportInOut=Balance of income and expenses
+ReportTurnover=Turnover invoiced
+ReportTurnoverCollected=Turnover collected
+PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party
+PaymentsNotLinkedToUser=Payments not linked to any user
+Profit=Profit
+AccountingResult=Accounting result
+BalanceBefore=Balance (before)
+Balance=Balance
+Debit=Debit
+Credit=Credit
+Piece=Accounting Doc.
+AmountHTVATRealReceived=Net collected
+AmountHTVATRealPaid=Net paid
+VATToPay=Tax sales
+VATReceived=Tax received
+VATToCollect=Tax purchases
+VATSummary=Tax monthly
+VATBalance=Tax Balance
+VATPaid=Tax paid
+LT1Summary=Tax 2 summary
+LT2Summary=Tax 3 summary
+LT1SummaryES=RE Balance
+LT2SummaryES=IRPF Balance
+LT1SummaryIN=CGST Balance
+LT2SummaryIN=SGST Balance
+LT1Paid=Tax 2 paid
+LT2Paid=Tax 3 paid
+LT1PaidES=RE Paid
+LT2PaidES=IRPF Paid
+LT1PaidIN=CGST Paid
+LT2PaidIN=SGST Paid
+LT1Customer=Tax 2 sales
+LT1Supplier=Tax 2 purchases
+LT1CustomerES=RE sales
+LT1SupplierES=RE purchases
+LT1CustomerIN=CGST sales
+LT1SupplierIN=CGST purchases
+LT2Customer=Tax 3 sales
+LT2Supplier=Tax 3 purchases
+LT2CustomerES=IRPF sales
+LT2SupplierES=IRPF purchases
+LT2CustomerIN=SGST sales
+LT2SupplierIN=SGST purchases
+VATCollected=VAT collected
+StatusToPay=To pay
+SpecialExpensesArea=Area for all special payments
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
+SocialContributionsDeductibles=Deductible social or fiscal taxes
+SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
+MenuSpecialExpenses=Special expenses
+MenuTaxAndDividends=Taxes and dividends
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New social/fiscal tax
+NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
+AccountancyTreasuryArea=Billing and payment area
+NewPayment=New payment
+PaymentCustomerInvoice=Customer invoice payment
+PaymentSupplierInvoice=vendor invoice payment
+PaymentSocialContribution=Social/fiscal tax payment
+PaymentVat=VAT payment
+ListPayment=List of payments
+ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of vendor payments
+DateStartPeriod=Date start period
+DateEndPeriod=Date end period
+newLT1Payment=New tax 2 payment
+newLT2Payment=New tax 3 payment
+LT1Payment=Tax 2 payment
+LT1Payments=Tax 2 payments
+LT2Payment=Tax 3 payment
+LT2Payments=Tax 3 payments
+newLT1PaymentES=New RE payment
+newLT2PaymentES=New IRPF payment
+LT1PaymentES=RE Payment
+LT1PaymentsES=RE Payments
+LT2PaymentES=IRPF Payment
+LT2PaymentsES=IRPF Payments
+VATPayment=Sales tax payment
+VATPayments=Sales tax payments
+VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
+NewLocalTaxPayment=New tax %s payment
+Refund=Refund
+SocialContributionsPayments=Social/fiscal taxes payments
+ShowVatPayment=Show VAT payment
+TotalToPay=Total to pay
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+CustomerAccountancyCode=Customer accounting code
+SupplierAccountancyCode=Vendor accounting code
+CustomerAccountancyCodeShort=Cust. account. code
+SupplierAccountancyCodeShort=Sup. account. code
+AccountNumber=Account number
+NewAccountingAccount=New account
+Turnover=Turnover invoiced
+TurnoverCollected=Turnover collected
+SalesTurnoverMinimum=Minimum turnover
+ByExpenseIncome=By expenses & incomes
+ByThirdParties=By third parties
+ByUserAuthorOfInvoice=By invoice author
+CheckReceipt=Check deposit
+CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Latest %s check receipts
+NewCheckReceipt=New discount
+NewCheckDeposit=New check deposit
+NewCheckDepositOn=Create receipt for deposit on account: %s
+NoWaitingChecks=No checks awaiting deposit.
+DateChequeReceived=Check reception date
+NbOfCheques=No. of checks
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
+CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
+CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
+CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
+CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
+CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
+CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
+CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
+CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
+CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
+CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
+AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
+AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
+AnnualByCompanies=Balance of income and expenses, by predefined groups of account
+AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
+AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
+SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
+SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
+SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
+RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
+RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
+RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
+RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
+RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
+SeePageForSetup=See menu <a href="%s">%s</a> for setup
+DepositsAreNotIncluded=- Down payment invoices are not included
+DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
+VATReportByCustomers=Sale tax report by customer
+VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
+SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
+SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
+RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
+RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
+OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
+PercentOfInvoice=%%/invoice
+NotUsedForGoods=Not used on goods
+ProposalStats=Statistics on proposals
+OrderStats=Statistics on orders
+InvoiceStats=Statistics on bills
+Dispatch=Dispatching
+Dispatched=Dispatched
+ToDispatch=To dispatch
+ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer
+SellsJournal=Sales Journal
+PurchasesJournal=Purchases Journal
+DescSellsJournal=Sales Journal
+DescPurchasesJournal=Purchases Journal
+CodeNotDef=Not defined
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
+DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
+Pcg_version=Chart of accounts models
+Pcg_type=Pcg type
+Pcg_subtype=Pcg subtype
+InvoiceLinesToDispatch=Invoice lines to dispatch
+ByProductsAndServices=By product and service
+RefExt=External ref
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+LinkedOrder=Link to order
+Mode1=Method 1
+Mode2=Method 2
+CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
+CalculationRuleDescSupplier=According to vendor, choose appropriate method to apply same calculation rule and get same result expected by your vendor.
+TurnoverPerProductInCommitmentAccountingNotRelevant=The report of Turnover collected per product is not available. This report is only available for turnover invoiced.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
+CalculationMode=Calculation mode
+AccountancyJournal=Accounting code journal
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+CloneTaxForNextMonth=Clone it for next month
+SimpleReport=Simple report
+AddExtraReport=Extra reports (add foreign and national customer report)
+OtherCountriesCustomersReport=Foreign customers report
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
+SameCountryCustomersWithVAT=National customers report
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
+LinkedFichinter=Link to an intervention
+ImportDataset_tax_contrib=Social/fiscal taxes
+ImportDataset_tax_vat=Vat payments
+ErrorBankAccountNotFound=Error: Bank account not found
+FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
+DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignment
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover invoiced by sale tax rate
+TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
+LabelToShow=Short label
+PurchaseTurnover=Purchase turnover
+PurchaseTurnoverCollected=Purchase turnover collected
+RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
+RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/ne_NP/contracts.lang b/htdocs/langs/ne_NP/contracts.lang
new file mode 100644
index 00000000000..47572c355ab
--- /dev/null
+++ b/htdocs/langs/ne_NP/contracts.lang
@@ -0,0 +1,101 @@
+# Dolibarr language file - Source file is en_US - contracts
+ContractsArea=Contracts area
+ListOfContracts=List of contracts
+AllContracts=All contracts
+ContractCard=Contract card
+ContractStatusNotRunning=Not running
+ContractStatusDraft=Draft
+ContractStatusValidated=Validated
+ContractStatusClosed=Closed
+ServiceStatusInitial=Not running
+ServiceStatusRunning=Running
+ServiceStatusNotLate=Running, not expired
+ServiceStatusNotLateShort=Not expired
+ServiceStatusLate=Running, expired
+ServiceStatusLateShort=Expired
+ServiceStatusClosed=Closed
+ShowContractOfService=Show contract of service
+Contracts=Contracts
+ContractsSubscriptions=Contracts/Subscriptions
+ContractsAndLine=Contracts and line of contracts
+Contract=Contract
+ContractLine=Contract line
+Closing=Closing
+NoContracts=No contracts
+MenuServices=Services
+MenuInactiveServices=Services not active
+MenuRunningServices=Running services
+MenuExpiredServices=Expired services
+MenuClosedServices=Closed services
+NewContract=New contract
+NewContractSubscription=New contract/subscription
+AddContract=Create contract
+DeleteAContract=Delete a contract
+ActivateAllOnContract=Activate all services
+CloseAContract=Close a contract
+ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
+ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
+ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
+ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract?
+ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
+ValidateAContract=Validate a contract
+ActivateService=Activate service
+ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b>?
+RefContract=Contract reference
+DateContract=Contract date
+DateServiceActivate=Service activation date
+ListOfServices=List of services
+ListOfInactiveServices=List of not active services
+ListOfExpiredServices=List of expired active services
+ListOfClosedServices=List of closed services
+ListOfRunningServices=List of running services
+NotActivatedServices=Inactive services (among validated contracts)
+BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
+LastContracts=Latest %s contracts
+LastModifiedServices=Latest %s modified services
+ContractStartDate=Start date
+ContractEndDate=End date
+DateStartPlanned=Planned start date
+DateStartPlannedShort=Planned start date
+DateEndPlanned=Planned end date
+DateEndPlannedShort=Planned end date
+DateStartReal=Real start date
+DateStartRealShort=Real start date
+DateEndReal=Real end date
+DateEndRealShort=Real end date
+CloseService=Close service
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
+ServiceStatus=Status of service
+DraftContracts=Drafts contracts
+CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
+ActivateAllContracts=Activate all contract lines
+CloseAllContracts=Close all contract lines
+DeleteContractLine=Delete a contract line
+ConfirmDeleteContractLine=Are you sure you want to delete this contract line?
+MoveToAnotherContract=Move service into another contract.
+ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract.
+ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
+PaymentRenewContractId=Renew contract line (number %s)
+ExpiredSince=Expiration date
+NoExpiredServices=No expired active services
+ListOfServicesToExpireWithDuration=List of Services to expire in %s days
+ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
+ListOfServicesToExpire=List of Services to expire
+NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
+StandardContractsTemplate=Standard contracts template
+ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
+LowerDateEndPlannedShort=Lower planned end date of active services
+SendContractRef=Contract information __REF__
+OtherContracts=Other contracts
+##### Types de contacts #####
+TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
+TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract
+TypeContact_contrat_external_BILLING=Billing customer contact
+TypeContact_contrat_external_CUSTOMER=Follow-up customer contact
+TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact
diff --git a/htdocs/langs/ne_NP/cron.lang b/htdocs/langs/ne_NP/cron.lang
new file mode 100644
index 00000000000..1de1251831a
--- /dev/null
+++ b/htdocs/langs/ne_NP/cron.lang
@@ -0,0 +1,84 @@
+# Dolibarr language file - Source file is en_US - cron
+# About page
+# Right
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
+# Admin
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
+CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
+CronJobProfiles=List of predefined cron job profiles
+# Menu
+EnabledAndDisabled=Enabled and disabled
+# Page list
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
+CronCommand=Command
+CronList=Scheduled jobs
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
+CronExecute=Launch scheduled job
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
+CronTask=Job
+CronNone=None
+CronDtStart=Not before
+CronDtEnd=Not after
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Start date of latest execution
+CronDtLastResult=End date of latest execution
+CronFrequency=Frequency
+CronClass=Class
+CronMethod=Method
+CronModule=Module
+CronNoJobs=No jobs registered
+CronPriority=Priority
+CronLabel=Label
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
+CronEach=Every
+JobFinished=Job launched and finished
+#Page card
+CronAdd= Add jobs
+CronEvery=Execute job each
+CronObject=Instance/Object to create
+CronArgs=Parameters
+CronSaveSucess=Save successfully
+CronNote=Comment
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+StatusAtInstall=Status at module installation
+CronStatusActiveBtn=Enable
+CronStatusInactiveBtn=Disable
+CronTaskInactive=This job is disabled
+CronId=Id
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
+CronFrom=From
+# Info
+# Common
+CronType=Job type
+CronType_method=Call method of a PHP Class
+CronType_command=Shell command
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
+JobDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
diff --git a/htdocs/langs/ne_NP/deliveries.lang b/htdocs/langs/ne_NP/deliveries.lang
new file mode 100644
index 00000000000..1f48c01de75
--- /dev/null
+++ b/htdocs/langs/ne_NP/deliveries.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - deliveries
+Delivery=Delivery
+DeliveryRef=Ref Delivery
+DeliveryCard=Receipt card
+DeliveryOrder=Delivery receipt
+DeliveryDate=Delivery date
+CreateDeliveryOrder=Generate delivery receipt
+DeliveryStateSaved=Delivery state saved
+SetDeliveryDate=Set shipping date
+ValidateDeliveryReceipt=Validate delivery receipt
+ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt?
+DeleteDeliveryReceipt=Delete delivery receipt
+DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b>?
+DeliveryMethod=Delivery method
+TrackingNumber=Tracking number
+DeliveryNotValidated=Delivery not validated
+StatusDeliveryCanceled=Canceled
+StatusDeliveryDraft=Draft
+StatusDeliveryValidated=Received
+# merou PDF model
+NameAndSignature=Name and Signature:
+ToAndDate=To___________________________________ on ____/_____/__________
+GoodStatusDeclaration=Have received the goods above in good condition,
+Deliverer=Deliverer:
+Sender=Sender
+Recipient=Recipient
+ErrorStockIsNotEnough=There's not enough stock
+Shippable=Shippable
+NonShippable=Not Shippable
+ShowReceiving=Show delivery receipt
+NonExistentOrder=Nonexistent order
diff --git a/htdocs/langs/ne_NP/dict.lang b/htdocs/langs/ne_NP/dict.lang
new file mode 100644
index 00000000000..ec315d97142
--- /dev/null
+++ b/htdocs/langs/ne_NP/dict.lang
@@ -0,0 +1,359 @@
+# Dolibarr language file - Source file is en_US - dict
+CountryFR=France
+CountryBE=Belgium
+CountryIT=Italy
+CountryES=Spain
+CountryDE=Germany
+CountryCH=Switzerland
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
+CountryUK=United Kingdom
+CountryIE=Ireland
+CountryCN=China
+CountryTN=Tunisia
+CountryUS=United States
+CountryMA=Morocco
+CountryDZ=Algeria
+CountryCA=Canada
+CountryTG=Togo
+CountryGA=Gabon
+CountryNL=Netherlands
+CountryHU=Hungary
+CountryRU=Russia
+CountrySE=Sweden
+CountryCI=Ivoiry Coast
+CountrySN=Senegal
+CountryAR=Argentina
+CountryCM=Cameroon
+CountryPT=Portugal
+CountrySA=Saudi Arabia
+CountryMC=Monaco
+CountryAU=Australia
+CountrySG=Singapore
+CountryAF=Afghanistan
+CountryAX=Åland Islands
+CountryAL=Albania
+CountryAS=American Samoa
+CountryAD=Andorra
+CountryAO=Angola
+CountryAI=Anguilla
+CountryAQ=Antarctica
+CountryAG=Antigua and Barbuda
+CountryAM=Armenia
+CountryAW=Aruba
+CountryAT=Austria
+CountryAZ=Azerbaijan
+CountryBS=Bahamas
+CountryBH=Bahrain
+CountryBD=Bangladesh
+CountryBB=Barbados
+CountryBY=Belarus
+CountryBZ=Belize
+CountryBJ=Benin
+CountryBM=Bermuda
+CountryBT=Bhutan
+CountryBO=Bolivia
+CountryBA=Bosnia and Herzegovina
+CountryBW=Botswana
+CountryBV=Bouvet Island
+CountryBR=Brazil
+CountryIO=British Indian Ocean Territory
+CountryBN=Brunei Darussalam
+CountryBG=Bulgaria
+CountryBF=Burkina Faso
+CountryBI=Burundi
+CountryKH=Cambodia
+CountryCV=Cape Verde
+CountryKY=Cayman Islands
+CountryCF=Central African Republic
+CountryTD=Chad
+CountryCL=Chile
+CountryCX=Christmas Island
+CountryCC=Cocos (Keeling) Islands
+CountryCO=Colombia
+CountryKM=Comoros
+CountryCG=Congo
+CountryCD=Congo, The Democratic Republic of the
+CountryCK=Cook Islands
+CountryCR=Costa Rica
+CountryHR=Croatia
+CountryCU=Cuba
+CountryCY=Cyprus
+CountryCZ=Czech Republic
+CountryDK=Denmark
+CountryDJ=Djibouti
+CountryDM=Dominica
+CountryDO=Dominican Republic
+CountryEC=Ecuador
+CountryEG=Egypt
+CountrySV=El Salvador
+CountryGQ=Equatorial Guinea
+CountryER=Eritrea
+CountryEE=Estonia
+CountryET=Ethiopia
+CountryFK=Falkland Islands
+CountryFO=Faroe Islands
+CountryFJ=Fiji Islands
+CountryFI=Finland
+CountryGF=French Guiana
+CountryPF=French Polynesia
+CountryTF=French Southern Territories
+CountryGM=Gambia
+CountryGE=Georgia
+CountryGH=Ghana
+CountryGI=Gibraltar
+CountryGR=Greece
+CountryGL=Greenland
+CountryGD=Grenada
+CountryGP=Guadeloupe
+CountryGU=Guam
+CountryGT=Guatemala
+CountryGN=Guinea
+CountryGW=Guinea-Bissau
+CountryGY=Guyana
+CountryHT=Haïti
+CountryHM=Heard Island and McDonald
+CountryVA=Holy See (Vatican City State)
+CountryHN=Honduras
+CountryHK=Hong Kong
+CountryIS=Iceland
+CountryIN=India
+CountryID=Indonesia
+CountryIR=Iran
+CountryIQ=Iraq
+CountryIL=Israel
+CountryJM=Jamaica
+CountryJP=Japan
+CountryJO=Jordan
+CountryKZ=Kazakhstan
+CountryKE=Kenya
+CountryKI=Kiribati
+CountryKP=North Korea
+CountryKR=South Korea
+CountryKW=Kuwait
+CountryKG=Kyrgyzstan
+CountryLA=Lao
+CountryLV=Latvia
+CountryLB=Lebanon
+CountryLS=Lesotho
+CountryLR=Liberia
+CountryLY=Libyan
+CountryLI=Liechtenstein
+CountryLT=Lithuania
+CountryLU=Luxembourg
+CountryMO=Macao
+CountryMK=Macedonia, the former Yugoslav of
+CountryMG=Madagascar
+CountryMW=Malawi
+CountryMY=Malaysia
+CountryMV=Maldives
+CountryML=Mali
+CountryMT=Malta
+CountryMH=Marshall Islands
+CountryMQ=Martinique
+CountryMR=Mauritania
+CountryMU=Mauritius
+CountryYT=Mayotte
+CountryMX=Mexico
+CountryFM=Micronesia
+CountryMD=Moldova
+CountryMN=Mongolia
+CountryMS=Monserrat
+CountryMZ=Mozambique
+CountryMM=Myanmar (Burma)
+CountryNA=Namibia
+CountryNR=Nauru
+CountryNP=Nepal
+CountryAN=Netherlands Antilles
+CountryNC=New Caledonia
+CountryNZ=New Zealand
+CountryNI=Nicaragua
+CountryNE=Niger
+CountryNG=Nigeria
+CountryNU=Niue
+CountryNF=Norfolk Island
+CountryMP=Northern Mariana Islands
+CountryNO=Norway
+CountryOM=Oman
+CountryPK=Pakistan
+CountryPW=Palau
+CountryPS=Palestinian Territory, Occupied
+CountryPA=Panama
+CountryPG=Papua New Guinea
+CountryPY=Paraguay
+CountryPE=Peru
+CountryPH=Philippines
+CountryPN=Pitcairn Islands
+CountryPL=Poland
+CountryPR=Puerto Rico
+CountryQA=Qatar
+CountryRE=Reunion
+CountryRO=Romania
+CountryRW=Rwanda
+CountrySH=Saint Helena
+CountryKN=Saint Kitts and Nevis
+CountryLC=Saint Lucia
+CountryPM=Saint Pierre and Miquelon
+CountryVC=Saint Vincent and Grenadines
+CountryWS=Samoa
+CountrySM=San Marino
+CountryST=Sao Tome and Principe
+CountryRS=Serbia
+CountrySC=Seychelles
+CountrySL=Sierra Leone
+CountrySK=Slovakia
+CountrySI=Slovenia
+CountrySB=Solomon Islands
+CountrySO=Somalia
+CountryZA=South Africa
+CountryGS=South Georgia and the South Sandwich Islands
+CountryLK=Sri Lanka
+CountrySD=Sudan
+CountrySR=Suriname
+CountrySJ=Svalbard and Jan Mayen
+CountrySZ=Swaziland
+CountrySY=Syrian
+CountryTW=Taiwan
+CountryTJ=Tajikistan
+CountryTZ=Tanzania
+CountryTH=Thailand
+CountryTL=Timor-Leste
+CountryTK=Tokelau
+CountryTO=Tonga
+CountryTT=Trinidad and Tobago
+CountryTR=Turkey
+CountryTM=Turkmenistan
+CountryTC=Turks and Caicos Islands
+CountryTV=Tuvalu
+CountryUG=Uganda
+CountryUA=Ukraine
+CountryAE=United Arab Emirates
+CountryUM=United States Minor Outlying Islands
+CountryUY=Uruguay
+CountryUZ=Uzbekistan
+CountryVU=Vanuatu
+CountryVE=Venezuela
+CountryVN=Viet Nam
+CountryVG=Virgin Islands, British
+CountryVI=Virgin Islands, U.S.
+CountryWF=Wallis and Futuna
+CountryEH=Western Sahara
+CountryYE=Yemen
+CountryZM=Zambia
+CountryZW=Zimbabwe
+CountryGG=Guernsey
+CountryIM=Isle of Man
+CountryJE=Jersey
+CountryME=Montenegro
+CountryBL=Saint Barthelemy
+CountryMF=Saint Martin
+
+##### Civilities #####
+CivilityMME=Mrs.
+CivilityMR=Mr.
+CivilityMLE=Ms.
+CivilityMTRE=Master
+CivilityDR=Doctor
+##### Currencies #####
+Currencyeuros=Euros
+CurrencyAUD=AU Dollars
+CurrencySingAUD=AU Dollar
+CurrencyCAD=CAN Dollars
+CurrencySingCAD=CAN Dollar
+CurrencyCHF=Swiss Francs
+CurrencySingCHF=Swiss Franc
+CurrencyEUR=Euros
+CurrencySingEUR=Euro
+CurrencyFRF=French Francs
+CurrencySingFRF=French Franc
+CurrencyGBP=GB Pounds
+CurrencySingGBP=GB Pound
+CurrencyINR=Indian rupees
+CurrencySingINR=Indian rupee
+CurrencyMAD=Dirham
+CurrencySingMAD=Dirham
+CurrencyMGA=Ariary
+CurrencySingMGA=Ariary
+CurrencyMUR=Mauritius rupees
+CurrencySingMUR=Mauritius rupee
+CurrencyNOK=Norwegian krones
+CurrencySingNOK=Norwegian kronas
+CurrencyTND=Tunisian dinars
+CurrencySingTND=Tunisian dinar
+CurrencyUSD=US Dollars
+CurrencySingUSD=US Dollar
+CurrencyUAH=Hryvnia
+CurrencySingUAH=Hryvnia
+CurrencyXAF=CFA Francs BEAC
+CurrencySingXAF=CFA Franc BEAC
+CurrencyXOF=CFA Francs BCEAO
+CurrencySingXOF=CFA Franc BCEAO
+CurrencyXPF=CFP Francs
+CurrencySingXPF=CFP Franc
+CurrencyCentEUR=cents
+CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=thousandth
+#### Input reasons #####
+DemandReasonTypeSRC_INTE=Internet
+DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
+DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
+DemandReasonTypeSRC_CAMP_PHO=Phone campaign
+DemandReasonTypeSRC_CAMP_FAX=Fax campaign
+DemandReasonTypeSRC_COMM=Commercial contact
+DemandReasonTypeSRC_SHOP=Shop contact
+DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_PARTNER=Partner
+DemandReasonTypeSRC_EMPLOYEE=Employee
+DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
+#### Paper formats ####
+PaperFormatEU4A0=Format 4A0
+PaperFormatEU2A0=Format 2A0
+PaperFormatEUA0=Format A0
+PaperFormatEUA1=Format A1
+PaperFormatEUA2=Format A2
+PaperFormatEUA3=Format A3
+PaperFormatEUA4=Format A4
+PaperFormatEUA5=Format A5
+PaperFormatEUA6=Format A6
+PaperFormatUSLETTER=Format Letter US
+PaperFormatUSLEGAL=Format Legal US
+PaperFormatUSEXECUTIVE=Format Executive US
+PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatCAP1=Format P1 Canada
+PaperFormatCAP2=Format P2 Canada
+PaperFormatCAP3=Format P3 Canada
+PaperFormatCAP4=Format P4 Canada
+PaperFormatCAP5=Format P5 Canada
+PaperFormatCAP6=Format P6 Canada
+#### Expense report categories ####
+ExpAutoCat=Car
+ExpCycloCat=Moped
+ExpMotoCat=Motorbike
+ExpAuto3CV=3 CV
+ExpAuto4CV=4 CV
+ExpAuto5CV=5 CV
+ExpAuto6CV=6 CV
+ExpAuto7CV=7 CV
+ExpAuto8CV=8 CV
+ExpAuto9CV=9 CV
+ExpAuto10CV=10 CV
+ExpAuto11CV=11 CV
+ExpAuto12CV=12 CV
+ExpAuto3PCV=3 CV and more
+ExpAuto4PCV=4 CV and more
+ExpAuto5PCV=5 CV and more
+ExpAuto6PCV=6 CV and more
+ExpAuto7PCV=7 CV and more
+ExpAuto8PCV=8 CV and more
+ExpAuto9PCV=9 CV and more
+ExpAuto10PCV=10 CV and more
+ExpAuto11PCV=11 CV and more
+ExpAuto12PCV=12 CV and more
+ExpAuto13PCV=13 CV and more
+ExpCyclo=Capacity lower to 50cm3
+ExpMoto12CV=Motorbike 1 or 2 CV
+ExpMoto345CV=Motorbike 3, 4 or 5 CV
+ExpMoto5PCV=Motorbike 5 CV and more
diff --git a/htdocs/langs/ne_NP/donations.lang b/htdocs/langs/ne_NP/donations.lang
new file mode 100644
index 00000000000..de4bdf68f03
--- /dev/null
+++ b/htdocs/langs/ne_NP/donations.lang
@@ -0,0 +1,34 @@
+# Dolibarr language file - Source file is en_US - donations
+Donation=Donation
+Donations=Donations
+DonationRef=Donation ref.
+Donor=Donor
+AddDonation=Create a donation
+NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation?
+PublicDonation=Public donation
+DonationsArea=Donations area
+DonationStatusPromiseNotValidated=Draft promise
+DonationStatusPromiseValidated=Validated promise
+DonationStatusPaid=Donation received
+DonationStatusPromiseNotValidatedShort=Draft
+DonationStatusPromiseValidatedShort=Validated
+DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDate=Donation date
+DonationDatePayment=Payment date
+ValidPromess=Validate promise
+DonationReceipt=Donation receipt
+DonationsModels=Documents models for donation receipts
+LastModifiedDonations=Latest %s modified donations
+DonationRecipient=Donation recipient
+IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+MinimumAmount=Minimum amount is  %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
+DonationValidated=Donation %s validated
diff --git a/htdocs/langs/ne_NP/ecm.lang b/htdocs/langs/ne_NP/ecm.lang
new file mode 100644
index 00000000000..369ac6dfdfa
--- /dev/null
+++ b/htdocs/langs/ne_NP/ecm.lang
@@ -0,0 +1,52 @@
+# Dolibarr language file - Source file is en_US - ecm
+ECMNbOfDocs=No. of documents in directory
+ECMSection=Directory
+ECMSectionManual=Manual directory
+ECMSectionAuto=Automatic directory
+ECMSectionsManual=Manual tree
+ECMSectionsAuto=Automatic tree
+ECMSections=Directories
+ECMRoot=ECM Root
+ECMNewSection=New directory
+ECMAddSection=Add directory
+ECMCreationDate=Creation date
+ECMNbOfFilesInDir=Number of files in directory
+ECMNbOfSubDir=Number of sub-directories
+ECMNbOfFilesInSubDir=Number of files in sub-directories
+ECMCreationUser=Creator
+ECMArea=DMS/ECM area
+ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.<br>* Manual directories can be used to save documents not linked to a particular element.
+ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
+ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMSearchByKeywords=Search by keywords
+ECMSearchByEntity=Search by object
+ECMSectionOfDocuments=Directories of documents
+ECMTypeAuto=Automatic
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
+ECMDocsByThirdParties=Documents linked to third parties
+ECMDocsByProposals=Documents linked to proposals
+ECMDocsByOrders=Documents linked to customers orders
+ECMDocsByContracts=Documents linked to contracts
+ECMDocsByInvoices=Documents linked to customers invoices
+ECMDocsByProducts=Documents linked to products
+ECMDocsByProjects=Documents linked to projects
+ECMDocsByUsers=Documents linked to users
+ECMDocsByInterventions=Documents linked to interventions
+ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to vendor proposals
+ECMNoDirectoryYet=No directory created
+ShowECMSection=Show directory
+DeleteSection=Remove directory
+ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
+ECMDirectoryForFiles=Relative directory for files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+ECMFileManager=File manager
+ECMSelectASection=Select a directory in the tree...
+DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
+ReSyncListOfDir=Resync list of directories
+HashOfFileContent=Hash of file content
+NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/ne_NP/errors.lang b/htdocs/langs/ne_NP/errors.lang
new file mode 100644
index 00000000000..7c67aeca8b5
--- /dev/null
+++ b/htdocs/langs/ne_NP/errors.lang
@@ -0,0 +1,265 @@
+# Dolibarr language file - Source file is en_US - errors
+
+# No errors
+NoErrorCommitIsDone=No error, we commit
+# Errors
+ErrorButCommitIsDone=Errors found but we validate despite this
+ErrorBadEMail=Email %s is wrong
+ErrorBadUrl=Url %s is wrong
+ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorLoginAlreadyExists=Login %s already exists.
+ErrorGroupAlreadyExists=Group %s already exists.
+ErrorRecordNotFound=Record not found.
+ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
+ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
+ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
+ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
+ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
+ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
+ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
+ErrorBadThirdPartyName=Bad value for third-party name
+ErrorProdIdIsMandatory=The %s is mandatory
+ErrorBadCustomerCodeSyntax=Bad syntax for customer code
+ErrorBadBarCodeSyntax=Bad syntax for barcode. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorCustomerCodeRequired=Customer code required
+ErrorBarCodeRequired=Barcode required
+ErrorCustomerCodeAlreadyUsed=Customer code already used
+ErrorBarCodeAlreadyUsed=Barcode already used
+ErrorPrefixRequired=Prefix required
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
+ErrorBadParameters=Bad parameters
+ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
+ErrorBadDateFormat=Value '%s' has wrong date format
+ErrorWrongDate=Date is not correct!
+ErrorFailedToWriteInDir=Failed to write in directory %s
+ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
+ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
+ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
+ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
+ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
+ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
+ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
+ErrorFileNotFound=File <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
+ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
+ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
+ErrorDirAlreadyExists=A directory with this name already exists.
+ErrorFileAlreadyExists=A file with this name already exists.
+ErrorPartialFile=File not received completely by server.
+ErrorNoTmpDir=Temporary directy %s does not exists.
+ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
+ErrorFileSizeTooLarge=File size is too large.
+ErrorFieldTooLong=Field %s is too long.
+ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum)
+ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum)
+ErrorNoValueForSelectType=Please fill value for select list
+ErrorNoValueForCheckBoxType=Please fill value for checkbox list
+ErrorNoValueForRadioType=Please fill value for radio list
+ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
+ErrorFieldCanNotContainSpecialCharacters=The field <b>%s</b> must not contains special characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
+ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
+ErrorNoAccountancyModuleLoaded=No accountancy module activated
+ErrorExportDuplicateProfil=This profile name already exists for this export set.
+ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
+ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
+ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
+ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
+ErrorRecordHasChildren=Failed to delete record since it has some child records.
+ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
+ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
+ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display.
+ErrorPasswordsMustMatch=Both typed passwords must match each other
+ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
+ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
+ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
+ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
+ErrorsOnXLines=%s errors found
+ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
+ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
+ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
+ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorBadMask=Error on mask
+ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
+ErrorBadMaskBadRazMonth=Error, bad reset value
+ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
+ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
+ErrorSelectAtLeastOne=Error, select at least one entry.
+ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
+ErrorProdIdAlreadyExist=%s is assigned to another third
+ErrorFailedToSendPassword=Failed to send password
+ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
+ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
+ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
+ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
+ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
+ErrorRecordAlreadyExists=Record already exists
+ErrorLabelAlreadyExists=This label already exists
+ErrorCantReadFile=Failed to read file '%s'
+ErrorCantReadDir=Failed to read directory '%s'
+ErrorBadLoginPassword=Bad value for login or password
+ErrorLoginDisabled=Your account has been disabled
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToChangePassword=Failed to change password
+ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
+ErrorLoginHasNoEmail=This user has no email address. Process aborted.
+ErrorBadValueForCode=Bad value for security code. Try again with new value...
+ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice.
+ErrorLinesCantBeNegativeForOneVATRate=Total of lines can't be negative for a given VAT rate.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
+ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
+ErrorNoActivatedBarcode=No barcode type activated
+ErrUnzipFails=Failed to unzip %s with ZipArchive
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
+ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
+ErrorModuleFileRequired=You must select a Dolibarr module package file
+ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
+ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
+ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
+ErrorNewValueCantMatchOldValue=New value can't be equal to old one
+ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
+ErrorFailedToAddContact=Failed to add contact
+ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
+ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
+ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
+ErrorWarehouseMustDiffers=Source and target warehouses must differs
+ErrorBadFormat=Bad format!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
+ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
+ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
+ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Operator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpression23=Unknown or non set variable '%s' in %s
+ErrorPriceExpression24=Variable '%s' exists but has no value
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
+ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
+ErrorSavingChanges=An error has occurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
+ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
+ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
+ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
+ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
+ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
+ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
+ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
+ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
+ErrorTaskAlreadyAssigned=Task already assigned to user
+ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
+ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
+ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
+ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
+ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
+ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
+ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
+ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
+ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
+ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
+ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
+ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
+ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, record is already transferred in accounting, deletion is not possible.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, language is mandatory if you set the page as a translation of another one.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
+ErrorBatchNoFoundForProductInWarehouse=No lot/serial found for product "%s" in warehouse "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this lot/serial for product "%s" in warehouse "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
+ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
+ErrorReplaceStringEmpty=Error, the string to replace into is empty
+# Warnings
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
+WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
+WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
+WarningEnableYourModulesApplications=Click here to enable your modules and applications
+WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.
+WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
+WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
+WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php</b>) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe.
+WarningsOnXLines=Warnings on <b>%s</b> source record(s)
+WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
+WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable the installation/migration tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Omitting the creation of this file is a grave security risk.
+WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
+WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
+WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
+WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
+WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
+WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
+WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
+WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectClosed=Project is closed. You must re-open it first.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
diff --git a/htdocs/langs/ne_NP/exports.lang b/htdocs/langs/ne_NP/exports.lang
new file mode 100644
index 00000000000..3549e3f8b23
--- /dev/null
+++ b/htdocs/langs/ne_NP/exports.lang
@@ -0,0 +1,135 @@
+# Dolibarr language file - Source file is en_US - exports
+ExportsArea=Exports
+ImportArea=Import
+NewExport=New Export
+NewImport=New Import
+ExportableDatas=Exportable dataset
+ImportableDatas=Importable dataset
+SelectExportDataSet=Choose dataset you want to export...
+SelectImportDataSet=Choose dataset you want to import...
+SelectExportFields=Choose the fields you want to export, or select a predefined export profile
+SelectImportFields=Choose the source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
+NotImportedFields=Fields of source file not imported
+SaveExportModel=Save your selections as an export profile/template (for reuse).
+SaveImportModel=Save this import profile (for reuse) ...
+ExportModelName=Export profile name
+ExportModelSaved=Export profile saved as <b>%s</b>.
+ExportableFields=Exportable fields
+ExportedFields=Exported fields
+ImportModelName=Import profile name
+ImportModelSaved=Import profile saved as <b>%s</b>.
+DatasetToExport=Dataset to export
+DatasetToImport=Import file into dataset
+ChooseFieldsOrdersAndTitle=Choose fields order...
+FieldsTitle=Fields title
+FieldTitle=Field title
+NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
+AvailableFormats=Available Formats
+LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
+Step=Step
+FormatedImport=Import Assistant
+FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
+FormatedImportDesc2=First step is to choose the kind of data you want to import, then the format of the source file, then the fields you want to import.
+FormatedExport=Export Assistant
+FormatedExportDesc1=These tools allow the export of personalized data using an assistant, to help you in the process without requiring technical knowledge.
+FormatedExportDesc2=First step is to choose a predefined dataset, then which fields you want to export, and in which order.
+FormatedExportDesc3=When data to export are selected, you can choose the format of the output file.
+Sheet=Sheet
+NoImportableData=No importable data (no module with definitions to allow data imports)
+FileSuccessfullyBuilt=File generated
+SQLUsedForExport=SQL Request used to extract data
+LineId=Id of line
+LineLabel=Label of line
+LineDescription=Description of line
+LineUnitPrice=Unit price of line
+LineVATRate=VAT Rate of line
+LineQty=Quantity for line
+LineTotalHT=Amount excl. tax for line
+LineTotalTTC=Amount with tax for line
+LineTotalVAT=Amount of VAT for line
+TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
+FileWithDataToImport=File with data to import
+FileToImport=Source file to import
+FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SourceFileFormat=Source file format
+FieldsInSourceFile=Fields in source file
+FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+Field=Field
+NoFields=No fields
+MoveField=Move field column number %s
+ExampleOfImportFile=Example_of_import_file
+SaveImportProfile=Save this import profile
+ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name.
+TablesTarget=Targeted tables
+FieldsTarget=Targeted fields
+FieldTarget=Targeted field
+FieldSource=Source field
+NbOfSourceLines=Number of lines in source file
+NowClickToTestTheImport=Check that the file format (field and string delimiters) of your file matches the options shown and that you have omitted the header line, or these will be flagged as errors in the following simulation.<br>Click on the "<b>%s</b>" button to run a check of the file structure/contents and simulate the import process.<br><b>No data will be changed in your database</b>.
+RunSimulateImportFile=Run Import Simulation
+FieldNeedSource=This field requires data from the source file
+SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
+InformationOnSourceFile=Information on source file
+InformationOnTargetTables=Information on target fields
+SelectAtLeastOneField=Switch at least one source field in the column of fields to export
+SelectFormat=Choose this import file format
+RunImportFile=Import Data
+NowClickToRunTheImport=Check the results of the import simulation. Correct any errors and re-test.<br>When the simulation reports no errors you may proceed to import the data into the database.
+DataLoadedWithId=The imported data will have an additional field in each database table with this import id: <b>%s</b>, to allow it to be searchable in the case of investigating a problem related to this import.
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+TooMuchErrors=There are still <b>%s</b> other source lines with errors but output has been limited.
+TooMuchWarnings=There are still <b>%s</b> other source lines with warnings but output has been limited.
+EmptyLine=Empty line (will be discarded)
+CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
+FileWasImported=File was imported with number <b>%s</b>.
+YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
+NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
+NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
+DataComeFromNoWhere=Value to insert comes from nowhere in source file.
+DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
+DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
+DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
+DataIsInsertedInto=Data coming from source file will be inserted into the following field:
+DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
+DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field:
+SourceRequired=Data value is mandatory
+SourceExample=Example of possible data value
+ExampleAnyRefFoundIntoElement=Any ref found for element <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
+CSVFormatDesc=<b>Comma Separated Value</b> file format (.csv).<br>This is a text file format where fields are separated by a separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ].
+Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is the native Excel 95 format (BIFF5).
+Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is the native Excel 2007 format (SpreadsheetML).
+TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
+ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate record (with this field added, all lines will own their own id and will differ).
+CsvOptions=CSV format options
+Separator=Field Separator
+Enclosure=String Delimiter
+SpecialCode=Special code
+ExportStringFilter=%% allows replacing one or more characters in the text
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD: filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD: filters on all previous years/months/days
+ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+ImportFromToLine=Limit range (From - To). Eg. to omit header line(s).
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines.<br>If the header lines are NOT omitted, this will result in multiple errors in the Import Simulation.
+KeepEmptyToGoToEndOfFile=Keep this field empty to process all lines to the end of the file.
+SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for an UPDATE import
+UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
+NoUpdateAttempt=No update attempt was performed, only insert
+ImportDataset_user_1=Users (employees or not) and properties
+ComputedField=Computed field
+## filters
+SelectFilterFields=If you want to filter on some values, just input values here.
+FilteredFields=Filtered fields
+FilteredFieldsValues=Value for filter
+FormatControlRule=Format control rule
+## imports updates
+KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
+NbInsert=Number of inserted lines: %s
+NbUpdate=Number of updated lines: %s
+MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
diff --git a/htdocs/langs/ne_NP/externalsite.lang b/htdocs/langs/ne_NP/externalsite.lang
new file mode 100644
index 00000000000..da4853df0df
--- /dev/null
+++ b/htdocs/langs/ne_NP/externalsite.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExternalSiteSetup=Setup link to external website
+ExternalSiteURL=External Site URL
+ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/ne_NP/ftp.lang b/htdocs/langs/ne_NP/ftp.lang
new file mode 100644
index 00000000000..d80b87c2715
--- /dev/null
+++ b/htdocs/langs/ne_NP/ftp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - ftp
+FTPClientSetup=FTP Client module setup
+NewFTPClient=New FTP connection setup
+FTPArea=FTP Area
+FTPAreaDesc=This screen shows a view of an FTP server.
+SetupOfFTPClientModuleNotComplete=The setup of the FTP client module seems to be incomplete
+FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
+FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
+FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
+FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
+FTPPassiveMode=Passive mode
+ChooseAFTPEntryIntoMenu=Choose a FTP site from the menu...
+FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/ne_NP/help.lang b/htdocs/langs/ne_NP/help.lang
new file mode 100644
index 00000000000..048de16d3c0
--- /dev/null
+++ b/htdocs/langs/ne_NP/help.lang
@@ -0,0 +1,23 @@
+# Dolibarr language file - Source file is en_US - help
+CommunitySupport=Forum/Wiki support
+EMailSupport=Emails support
+RemoteControlSupport=Online real-time / remote support
+OtherSupport=Other support
+ToSeeListOfAvailableRessources=To contact/see available resources:
+HelpCenter=Help Center
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
+TypeSupportCommunauty=Community (free)
+TypeSupportCommercial=Commercial
+TypeOfHelp=Type
+NeedHelpCenter=Need help or support?
+Efficiency=Efficiency
+TypeHelpOnly=Help only
+TypeHelpDev=Help+Development
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
+PossibleLanguages=Supported languages
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
+SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/ne_NP/holiday.lang b/htdocs/langs/ne_NP/holiday.lang
new file mode 100644
index 00000000000..82de49f9c5f
--- /dev/null
+++ b/htdocs/langs/ne_NP/holiday.lang
@@ -0,0 +1,133 @@
+# Dolibarr language file - Source file is en_US - holiday
+HRM=HRM
+Holidays=Leave
+CPTitreMenu=Leave
+MenuReportMonth=Monthly statement
+MenuAddCP=New leave request
+NotActiveModCP=You must enable the module Leave to view this page.
+AddCP=Make a leave request
+DateDebCP=Start date
+DateFinCP=End date
+DraftCP=Draft
+ToReviewCP=Awaiting approval
+ApprovedCP=Approved
+CancelCP=Canceled
+RefuseCP=Refused
+ValidatorCP=Approbator
+ListeCP=List of leave
+LeaveId=Leave ID
+ReviewedByCP=Will be approved by
+UserID=User ID
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
+DescCP=Description
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
+ErrorEndDateCP=You must select an end date greater than the start date.
+ErrorSQLCreateCP=An SQL error occurred during the creation:
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
+ReturnCP=Return to previous page
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosWorkflowCP=Information Workflow
+RequestByCP=Requested by
+TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
+NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DayIsANonWorkingDay=%s is a non working day
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
+EditCP=Edit
+DeleteCP=Delete
+ActionRefuseCP=Refuse
+ActionCancelCP=Cancel
+StatutCP=Status
+TitleDeleteCP=Delete the leave request
+ConfirmDeleteCP=Confirm the deletion of this leave request?
+ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
+CantCreateCP=You don't have the right to make leave requests.
+InvalidValidatorCP=You must choose an approbator to your leave request.
+NoDateDebut=You must select a start date.
+NoDateFin=You must select an end date.
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
+ConfirmValidCP=Are you sure you want to approve the leave request?
+DateValidCP=Date approved
+TitleToValidCP=Send leave request
+ConfirmToValidCP=Are you sure you want to send the leave request?
+TitleRefuseCP=Refuse the leave request
+ConfirmRefuseCP=Are you sure you want to refuse the leave request?
+NoMotifRefuseCP=You must choose a reason for refusing the request.
+TitleCancelCP=Cancel the leave request
+ConfirmCancelCP=Are you sure you want to cancel the leave request?
+DetailRefusCP=Reason for refusal
+DateRefusCP=Date of refusal
+DateCancelCP=Date of cancellation
+DefineEventUserCP=Assign an exceptional leave for a user
+addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
+MotifCP=Reason
+UserCP=User
+ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
+AddEventToUserOkCP=The addition of the exceptional leave has been completed.
+MenuLogCP=View change logs
+LogCP=Log of updates of available vacation days
+ActionByCP=Performed by
+UserUpdateCP=For the user
+PrevSoldeCP=Previous Balance
+NewSoldeCP=New Balance
+alreadyCPexist=A leave request has already been done on this period.
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
+BoxTitleLastLeaveRequests=Latest %s modified leave requests
+HolidaysMonthlyUpdate=Monthly update
+ManualUpdate=Manual update
+HolidaysCancelation=Leave request cancelation
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
+## Configuration du Module ##
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
+UpdateConfCPOK=Updated successfully.
+Module27130Name= Management of leave requests
+Module27130Desc= Management of leave requests
+ErrorMailNotSend=An error occurred while sending email:
+NoticePeriod=Notice period
+#Messages
+HolidaysToValidate=Validate leave requests
+HolidaysToValidateBody=Below is a leave request to validate
+HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
+HolidaysValidated=Validated leave requests
+HolidaysValidatedBody=Your leave request for %s to %s has been validated.
+HolidaysRefused=Request denied
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
+HolidaysCanceled=Canceled leaved request
+HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
+FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
+NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
+NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
diff --git a/htdocs/langs/ne_NP/hrm.lang b/htdocs/langs/ne_NP/hrm.lang
new file mode 100644
index 00000000000..3697c47e30d
--- /dev/null
+++ b/htdocs/langs/ne_NP/hrm.lang
@@ -0,0 +1,18 @@
+# Dolibarr language file - en_US - hrm
+# Admin
+HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
+Establishments=Establishments
+Establishment=Establishment
+NewEstablishment=New establishment
+DeleteEstablishment=Delete establishment
+ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
+OpenEtablishment=Open establishment
+CloseEtablishment=Close establishment
+# Dictionary
+DictionaryPublicHolidays=HRM - Public holidays
+DictionaryDepartment=HRM - Department list
+DictionaryFunction=HRM - Function list
+# Module
+Employees=Employees
+Employee=Employee
+NewEmployee=New employee
diff --git a/htdocs/langs/ne_NP/install.lang b/htdocs/langs/ne_NP/install.lang
new file mode 100644
index 00000000000..f67dff57184
--- /dev/null
+++ b/htdocs/langs/ne_NP/install.lang
@@ -0,0 +1,223 @@
+# Dolibarr language file - Source file is en_US - install
+InstallEasy=Just follow the instructions step by step.
+MiscellaneousChecks=Prerequisites check
+ConfFileExists=Configuration file <b>%s</b> exists.
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
+ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
+ConfFileReload=Reloading parameters from configuration file.
+PHPSupportSessions=This PHP supports sessions.
+PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportCalendar=This PHP supports calendars extensions.
+PHPSupportUTF8=This PHP supports UTF8 functions.
+PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupport=This PHP supports %s functions.
+PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
+ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
+ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
+ErrorDirDoesNotExists=Directory %s does not exist.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
+ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
+ErrorFailedToCreateDatabase=Failed to create database '%s'.
+ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
+ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
+ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
+ErrorDatabaseAlreadyExists=Database '%s' already exists.
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
+IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
+PHPVersion=PHP Version
+License=Using license
+ConfigurationFile=Configuration file
+WebPagesDirectory=Directory where web pages are stored
+DocumentsDirectory=Directory to store uploaded and generated documents
+URLRoot=URL Root
+ForceHttps=Force secure connections (https)
+CheckToForceHttps=Check this option to force secure connections (https).<br>This requires that the web server is configured with an SSL certificate.
+DolibarrDatabase=Dolibarr Database
+DatabaseType=Database type
+DriverType=Driver type
+Server=Server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
+ServerPortDescription=Database server port. Keep empty if unknown.
+DatabaseServer=Database server
+DatabaseName=Database name
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
+AdminPassword=Password for Dolibarr database owner.
+CreateDatabase=Create database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
+DatabaseSuperUserAccess=Database server - Superuser access
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
+ServerConnection=Server connection
+DatabaseCreation=Database creation
+CreateDatabaseObjects=Database objects creation
+ReferenceDataLoading=Reference data loading
+TablesAndPrimaryKeysCreation=Tables and Primary keys creation
+CreateTableAndPrimaryKey=Create table %s
+CreateOtherKeysForTable=Create foreign keys and indexes for table %s
+OtherKeysCreation=Foreign keys and indexes creation
+FunctionsCreation=Functions creation
+AdminAccountCreation=Administrator login creation
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
+SetupEnd=End of setup
+SystemIsInstalled=This installation is complete.
+SystemIsUpgraded=Dolibarr has been upgraded successfully.
+YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below:
+AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
+GoToDolibarr=Go to Dolibarr
+GoToSetupArea=Go to Dolibarr (setup area)
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
+GoToUpgradePage=Go to upgrade page again
+WithNoSlashAtTheEnd=Without the slash "/" at the end
+DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
+LoginAlreadyExists=Already exists
+DolibarrAdminLogin=Dolibarr admin login
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
+FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
+ChoosedMigrateScript=Choose migration script
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
+ProcessMigrateScript=Script processing
+ChooseYourSetupMode=Choose your setup mode and click "Start"...
+FreshInstall=Fresh install
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
+Upgrade=Upgrade
+UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
+Start=Start
+InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
+YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
+AlreadyDone=Already migrated
+DatabaseVersion=Database version
+ServerVersion=Database server version
+YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
+DBSortingCollation=Character sorting order
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
+OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
+RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
+FieldRenamed=Field renamed
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
+InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
+InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
+IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
+OpenBaseDir=PHP openbasedir parameter
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
+MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
+MigrationShippingDelivery=Upgrade storage of shipping
+MigrationShippingDelivery2=Upgrade storage of shipping 2
+MigrationFinished=Migration finished
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
+ActivateModule=Activate module %s
+ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
+SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
+NothingToDelete=Nothing to clean/delete
+NothingToDo=Nothing to do
+#########
+# upgrade
+MigrationFixData=Fix for denormalized data
+MigrationOrder=Data migration for customer's orders
+MigrationSupplierOrder=Data migration for vendor's orders
+MigrationProposal=Data migration for commercial proposals
+MigrationInvoice=Data migration for customer's invoices
+MigrationContract=Data migration for contracts
+MigrationSuccessfullUpdate=Upgrade successful
+MigrationUpdateFailed=Failed upgrade process
+MigrationRelationshipTables=Data migration for relationship tables (%s)
+MigrationPaymentsUpdate=Payment data correction
+MigrationPaymentsNumberToUpdate=%s payment(s) to update
+MigrationProcessPaymentUpdate=Update payment(s) %s
+MigrationPaymentsNothingToUpdate=No more things to do
+MigrationPaymentsNothingUpdatable=No more payments that can be corrected
+MigrationContractsUpdate=Contract data correction
+MigrationContractsNumberToUpdate=%s contract(s) to update
+MigrationContractsLineCreation=Create contract line for contract ref %s
+MigrationContractsNothingToUpdate=No more things to do
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
+MigrationContractsEmptyDatesUpdate=Contract empty date correction
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
+MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
+MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
+MigrationContractsInvalidDatesUpdate=Bad value date contract correction
+MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s)
+MigrationContractsInvalidDatesNumber=%s contracts modified
+MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct
+MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction
+MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
+MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct
+MigrationReopeningContracts=Open contract closed by error
+MigrationReopenThisContract=Reopen contract %s
+MigrationReopenedContractsNumber=%s contracts modified
+MigrationReopeningContractsNothingToUpdate=No closed contract to open
+MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
+MigrationBankTransfertsNothingToUpdate=All links are up to date
+MigrationShipmentOrderMatching=Sendings receipt update
+MigrationDeliveryOrderMatching=Delivery receipt update
+MigrationDeliveryDetail=Delivery update
+MigrationStockDetail=Update stock value of products
+MigrationMenusDetail=Update dynamic menus tables
+MigrationDeliveryAddress=Update delivery address in shipments
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
+MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
+MigrationProjectTaskTime=Update time spent in seconds
+MigrationActioncommElement=Update data on actions
+MigrationPaymentMode=Data migration for payment type
+MigrationCategorieAssociation=Migration of categories
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
+MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
+MigrationReloadModule=Reload module %s
+MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
+ClickHereToGoToApp=Click here to go to your application
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/ne_NP/interventions.lang b/htdocs/langs/ne_NP/interventions.lang
new file mode 100644
index 00000000000..e5936f8246e
--- /dev/null
+++ b/htdocs/langs/ne_NP/interventions.lang
@@ -0,0 +1,66 @@
+# Dolibarr language file - Source file is en_US - interventions
+Intervention=Intervention
+Interventions=Interventions
+InterventionCard=Intervention card
+NewIntervention=New intervention
+AddIntervention=Create intervention
+ChangeIntoRepeatableIntervention=Change to repeatable intervention
+ListOfInterventions=List of interventions
+ActionsOnFicheInter=Actions on intervention
+LastInterventions=Latest %s interventions
+AllInterventions=All interventions
+CreateDraftIntervention=Create draft
+InterventionContact=Intervention contact
+DeleteIntervention=Delete intervention
+ValidateIntervention=Validate intervention
+ModifyIntervention=Modify intervention
+DeleteInterventionLine=Delete intervention line
+ConfirmDeleteIntervention=Are you sure you want to delete this intervention?
+ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
+ConfirmModifyIntervention=Are you sure you want to modify this intervention?
+ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line?
+ConfirmCloneIntervention=Are you sure you want to clone this intervention?
+NameAndSignatureOfInternalContact=Name and signature of intervening:
+NameAndSignatureOfExternalContact=Name and signature of customer:
+DocumentModelStandard=Standard document model for interventions
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
+InterventionClassifyDone=Classify "Done"
+StatusInterInvoiced=Billed
+SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by email
+InterventionDeletedInDolibarr=Intervention %s deleted
+InterventionsArea=Interventions area
+DraftFichinter=Draft interventions
+LastModifiedInterventions=Latest %s modified interventions
+FichinterToProcess=Interventions to process
+TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
+PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
+PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
+UseDurationOnFichinter=Hides the duration field for intervention records
+UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records
+InterventionStatistics=Statistics of interventions
+NbOfinterventions=No. of intervention cards
+NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
+InterId=Intervention id
+InterRef=Intervention ref.
+InterDateCreation=Date creation intervention
+InterDuration=Duration intervention
+InterStatus=Status intervention
+InterNote=Note intervention
+InterLine=Line of intervention
+InterLineId=Line id intervention
+InterLineDate=Line date intervention
+InterLineDuration=Line duration intervention
+InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/ne_NP/languages.lang b/htdocs/langs/ne_NP/languages.lang
new file mode 100644
index 00000000000..6185183161b
--- /dev/null
+++ b/htdocs/langs/ne_NP/languages.lang
@@ -0,0 +1,89 @@
+# Dolibarr language file - Source file is en_US - languages
+Language_ar_AR=Arabic
+Language_ar_EG=Arabic (Egypt)
+Language_ar_SA=Arabic
+Language_bn_BD=Bengali
+Language_bg_BG=Bulgarian
+Language_bs_BA=Bosnian
+Language_ca_ES=Catalan
+Language_cs_CZ=Czech
+Language_da_DA=Danish
+Language_da_DK=Danish
+Language_de_DE=German
+Language_de_AT=German (Austria)
+Language_de_CH=German (Switzerland)
+Language_el_GR=Greek
+Language_el_CY=Greek (Cyprus)
+Language_en_AU=English (Australia)
+Language_en_CA=English (Canada)
+Language_en_GB=English (United Kingdom)
+Language_en_IN=English (India)
+Language_en_NZ=English (New Zealand)
+Language_en_SA=English (Saudi Arabia)
+Language_en_US=English (United States)
+Language_en_ZA=English (South Africa)
+Language_es_ES=Spanish
+Language_es_AR=Spanish (Argentina)
+Language_es_BO=Spanish (Bolivia)
+Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
+Language_es_EC=Spanish (Ecuador)
+Language_es_HN=Spanish (Honduras)
+Language_es_MX=Spanish (Mexico)
+Language_es_PA=Spanish (Panama)
+Language_es_PY=Spanish (Paraguay)
+Language_es_PE=Spanish (Peru)
+Language_es_PR=Spanish (Puerto Rico)
+Language_es_UY=Spanish (Uruguay)
+Language_es_VE=Spanish (Venezuela)
+Language_et_EE=Estonian
+Language_eu_ES=Basque
+Language_fa_IR=Persian
+Language_fi_FI=Finnish
+Language_fr_BE=French (Belgium)
+Language_fr_CA=French (Canada)
+Language_fr_CH=French (Switzerland)
+Language_fr_FR=French
+Language_fr_NC=French (New Caledonia)
+Language_fy_NL=Frisian
+Language_he_IL=Hebrew
+Language_hr_HR=Croatian
+Language_hu_HU=Hungarian
+Language_id_ID=Indonesian
+Language_is_IS=Icelandic
+Language_it_IT=Italian
+Language_ja_JP=Japanese
+Language_ka_GE=Georgian
+Language_km_KH=Khmer
+Language_kn_IN=Kannada
+Language_ko_KR=Korean
+Language_lo_LA=Lao
+Language_lt_LT=Lithuanian
+Language_lv_LV=Latvian
+Language_mk_MK=Macedonian
+Language_mn_MN=Mongolian
+Language_nb_NO=Norwegian (Bokmål)
+Language_nl_BE=Dutch (Belgium)
+Language_nl_NL=Dutch
+Language_pl_PL=Polish
+Language_pt_BR=Portuguese (Brazil)
+Language_pt_PT=Portuguese
+Language_ro_RO=Romanian
+Language_ru_RU=Russian
+Language_ru_UA=Russian (Ukraine)
+Language_tr_TR=Turkish
+Language_sl_SI=Slovenian
+Language_sv_SV=Swedish
+Language_sv_SE=Swedish
+Language_sq_AL=Albanian
+Language_sk_SK=Slovakian
+Language_sr_RS=Serbian
+Language_sw_SW=Kiswahili
+Language_th_TH=Thai
+Language_uk_UA=Ukrainian
+Language_uz_UZ=Uzbek
+Language_vi_VN=Vietnamese
+Language_zh_CN=Chinese
+Language_zh_TW=Chinese (Traditional)
+Language_bh_MY=Malay
diff --git a/htdocs/langs/ne_NP/ldap.lang b/htdocs/langs/ne_NP/ldap.lang
new file mode 100644
index 00000000000..8b6f0864215
--- /dev/null
+++ b/htdocs/langs/ne_NP/ldap.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - ldap
+YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
+UserMustChangePassNextLogon=User must change password on the domain %s
+LDAPInformationsForThisContact=Information in LDAP database for this contact
+LDAPInformationsForThisUser=Information in LDAP database for this user
+LDAPInformationsForThisGroup=Information in LDAP database for this group
+LDAPInformationsForThisMember=Information in LDAP database for this member
+LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPAttributes=LDAP attributes
+LDAPCard=LDAP card
+LDAPRecordNotFound=Record not found in LDAP database
+LDAPUsers=Users in LDAP database
+LDAPFieldStatus=Status
+LDAPFieldFirstSubscriptionDate=First subscription date
+LDAPFieldFirstSubscriptionAmount=First subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example: skypeName
+UserSynchronized=User synchronized
+GroupSynchronized=Group synchronized
+MemberSynchronized=Member synchronized
+MemberTypeSynchronized=Member type synchronized
+ContactSynchronized=Contact synchronized
+ForceSynchronize=Force synchronizing Dolibarr -> LDAP
+ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/ne_NP/link.lang b/htdocs/langs/ne_NP/link.lang
new file mode 100644
index 00000000000..1ffcd41a18b
--- /dev/null
+++ b/htdocs/langs/ne_NP/link.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - languages
+LinkANewFile=Link a new file/document
+LinkedFiles=Linked files and documents
+NoLinkFound=No registered links
+LinkComplete=The file has been linked successfully
+ErrorFileNotLinked=The file could not be linked
+LinkRemoved=The link %s has been removed
+ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
+ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+URLToLink=URL to link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/ne_NP/loan.lang b/htdocs/langs/ne_NP/loan.lang
new file mode 100644
index 00000000000..534dee08867
--- /dev/null
+++ b/htdocs/langs/ne_NP/loan.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+LoanPayment=Loan payment
+ShowLoanPayment=Show Loan Payment
+LoanCapital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+Term=Term
+LoanAccountancyCapitalCode=Accounting account capital
+LoanAccountancyInsuranceCode=Accounting account insurance
+LoanAccountancyInterestCode=Accounting account interest
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ListLoanAssociatedProject=List of loan associated with the project
+AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
+CreateCalcSchedule=Edit financial commitment
diff --git a/htdocs/langs/ne_NP/mailmanspip.lang b/htdocs/langs/ne_NP/mailmanspip.lang
new file mode 100644
index 00000000000..bab4b3576b4
--- /dev/null
+++ b/htdocs/langs/ne_NP/mailmanspip.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - mailmanspip
+MailmanSpipSetup=Mailman and SPIP module Setup
+MailmanTitle=Mailman mailing list system
+TestSubscribe=To test subscription to Mailman lists
+TestUnSubscribe=To test unsubscribe from Mailman lists
+MailmanCreationSuccess=Subscription test was executed successfully
+MailmanDeletionSuccess=Unsubscription test was executed successfully
+SynchroMailManEnabled=A Mailman update will be performed
+SynchroSpipEnabled=A Spip update will be performed
+DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
+DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
+DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
+DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
+SPIPTitle=SPIP Content Management System
+DescADHERENT_SPIP_SERVEUR=SPIP Server
+DescADHERENT_SPIP_DB=SPIP database name
+DescADHERENT_SPIP_USER=SPIP database login
+DescADHERENT_SPIP_PASS=SPIP database password
+AddIntoSpip=Add into SPIP
+AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
+AddIntoSpipError=Failed to add the user in SPIP
+DeleteIntoSpip=Remove from SPIP
+DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
+DeleteIntoSpipError=Failed to suppress the user from SPIP
+SPIPConnectionFailed=Failed to connect to SPIP
+SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
+SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
diff --git a/htdocs/langs/ne_NP/mails.lang b/htdocs/langs/ne_NP/mails.lang
new file mode 100644
index 00000000000..7b3bfd3852a
--- /dev/null
+++ b/htdocs/langs/ne_NP/mails.lang
@@ -0,0 +1,170 @@
+# Dolibarr language file - Source file is en_US - mails
+Mailing=EMailing
+EMailing=EMailing
+EMailings=EMailings
+AllEMailings=All eMailings
+MailCard=EMailing card
+MailRecipients=Recipients
+MailRecipient=Recipient
+MailTitle=Description
+MailFrom=Sender
+MailErrorsTo=Errors to
+MailReply=Reply to
+MailTo=Receiver(s)
+MailToUsers=To user(s)
+MailCC=Copy to
+MailToCCUsers=Copy to users(s)
+MailCCC=Cached copy to
+MailTopic=Email topic
+MailText=Message
+MailFile=Attached files
+MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
+ShowEMailing=Show emailing
+ListOfEMailings=List of emailings
+NewMailing=New emailing
+EditMailing=Edit emailing
+ResetMailing=Resend emailing
+DeleteMailing=Delete emailing
+DeleteAMailing=Delete an emailing
+PreviewMailing=Preview emailing
+CreateMailing=Create emailing
+TestMailing=Test email
+ValidMailing=Valid emailing
+MailingStatusDraft=Draft
+MailingStatusValidated=Validated
+MailingStatusSent=Sent
+MailingStatusSentPartialy=Sent partially
+MailingStatusSentCompletely=Sent completely
+MailingStatusError=Error
+MailingStatusNotSent=Not sent
+MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
+MailingSuccessfullyValidated=EMailing successfully validated
+MailUnsubcribe=Unsubscribe
+MailingStatusNotContact=Don't contact anymore
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
+ErrorMailRecipientIsEmpty=Email recipient is empty
+WarningNoEMailsAdded=No new Email to add to recipient's list.
+ConfirmValidMailing=Are you sure you want to validate this emailing?
+ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
+ConfirmDeleteMailing=Are you sure you want to delete this emailing?
+NbOfUniqueEMails=No. of unique emails
+NbOfEMails=No. of EMails
+TotalNbOfDistinctRecipients=Number of distinct recipients
+NoTargetYet=No recipients defined yet (Go on tab 'Recipients')
+NoRecipientEmail=No recipient email for %s
+RemoveRecipient=Remove recipient
+YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README.
+EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values
+MailingAddFile=Attach this file
+NoAttachedFiles=No attached files
+BadEMail=Bad value for Email
+ConfirmCloneEMailing=Are you sure you want to clone this emailing?
+CloneContent=Clone message
+CloneReceivers=Cloner recipients
+DateLastSend=Date of latest sending
+DateSending=Date sending
+SentTo=Sent to <b>%s</b>
+MailingStatusRead=Read
+YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubscribe from mailing list
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubscribe" feature
+EMailSentToNRecipients=Email sent to %s recipients.
+EMailSentForNElements=Email sent for %s elements.
+XTargetsAdded=<b>%s</b> recipients added into target list
+OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachments in mass sending in this version).
+AllRecipientSelected=The recipients of the %s record selected (if their email is known).
+GroupEmails=Group emails
+OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
+WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
+ResultOfMailSending=Result of mass Email sending
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
+SentXXXmessages=%s message(s) sent.
+ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
+MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
+MailingModuleDescContactsByCompanyCategory=Contacts by third-party category
+MailingModuleDescContactsByCategory=Contacts by categories
+MailingModuleDescContactsByFunction=Contacts by position
+MailingModuleDescEmailsFromFile=Emails from file
+MailingModuleDescEmailsFromUser=Emails input by user
+MailingModuleDescDolibarrUsers=Users with Emails
+MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+
+# Libelle des modules de liste de destinataires mailing
+LineInFile=Line %s in file
+RecipientSelectionModules=Defined requests for recipient's selection
+MailSelectedRecipients=Selected recipients
+MailingArea=EMailings area
+LastMailings=Latest %s emailings
+TargetsStatistics=Targets statistics
+NbOfCompaniesContacts=Unique contacts/addresses
+MailNoChangePossible=Recipients for validated emailing can't be changed
+SearchAMailing=Search mailing
+SendMailing=Send emailing
+SentBy=Sent by
+MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
+MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
+ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+TargetsReset=Clear list
+ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
+ToAddRecipientsChooseHere=Add recipients by choosing from the lists
+NbOfEMailingsReceived=Mass emailings received
+NbOfEMailingsSend=Mass emailings sent
+IdRecord=ID record
+DeliveryReceipt=Delivery Ack.
+YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
+TagCheckMail=Track mail opening
+TagUnsubscribe=Unsubscribe link
+TagSignature=Signature of sending user
+EMailRecipient=Recipient Email
+TagMailtoEmail=Recipient Email (including html "mailto:" link)
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
+# Module Notifications
+Notifications=Notifications
+NoNotificationsWillBeSent=No email notifications are planned for this event and company
+ANotificationsWillBeSent=1 notification will be sent by email
+SomeNotificationsWillBeSent=%s notifications will be sent by email
+AddNewNotification=Activate a new email notification target/event
+ListOfActiveNotifications=List all active targets/events for email notification
+ListOfNotificationsDone=List all email notifications sent
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
+UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
+UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
+MailAdvTargetRecipients=Recipients (advanced selection)
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchIntHelp=Use interval to select int or float value
+AdvTgtMinVal=Minimum value
+AdvTgtMaxVal=Maximum value
+AdvTgtSearchDtHelp=Use interval to select date value
+AdvTgtStartDt=Start dt.
+AdvTgtEndDt=End dt.
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third-party email or just contact email
+AdvTgtTypeOfIncude=Type of targeted email
+AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
+AddAll=Add all
+RemoveAll=Remove all
+ItemsCount=Item(s)
+AdvTgtNameTemplate=Filter name
+AdvTgtAddContact=Add emails according to criteria
+AdvTgtLoadFilter=Load filter
+AdvTgtDeleteFilter=Delete filter
+AdvTgtSaveFilter=Save filter
+AdvTgtCreateFilter=Create filter
+AdvTgtOrCreateNewFilter=Name of new filter
+NoContactWithCategoryFound=No contact/address with a category found
+NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+DefaultOutgoingEmailSetup=Default outgoing email setup
+Information=Information
+ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/ne_NP/main.lang b/htdocs/langs/ne_NP/main.lang
new file mode 100644
index 00000000000..824a5e495b8
--- /dev/null
+++ b/htdocs/langs/ne_NP/main.lang
@@ -0,0 +1,1035 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+# Note for Chinese:
+# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
+# stsongstdlight or cid0cs are for simplified Chinese
+# To read Chinese pdf with Linux: sudo apt-get install poppler-data
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
+DatabaseConnection=Database connection
+NoTemplateDefined=No template available for this email type
+AvailableVariables=Available substitution variables
+NoTranslation=No translation
+Translation=Translation
+EmptySearchString=Enter a non empty search string
+NoRecordFound=No record found
+NoRecordDeleted=No record deleted
+NotEnoughDataYet=Not enough data
+NoError=No error
+Error=Error
+Errors=Errors
+ErrorFieldRequired=Field '%s' is required
+ErrorFieldFormat=Field '%s' has a bad value
+ErrorFileDoesNotExists=File %s does not exist
+ErrorFailedToOpenFile=Failed to open file %s
+ErrorCanNotCreateDir=Cannot create dir %s
+ErrorCanNotReadDir=Cannot read dir %s
+ErrorConstantNotDefined=Parameter %s not defined
+ErrorUnknown=Unknown error
+ErrorSQL=SQL Error
+ErrorLogoFileNotFound=Logo file '%s' was not found
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
+ErrorGoToModuleSetup=Go to Module setup to fix this
+ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
+ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
+ErrorInternalErrorDetected=Error detected
+ErrorWrongHostParameter=Wrong host parameter
+ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post the form again.
+ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child record.
+ErrorWrongValue=Wrong value
+ErrorWrongValueForParameterX=Wrong value for parameter %s
+ErrorNoRequestInError=No request in error
+ErrorServiceUnavailableTryLater=Service not available at the moment. Try again later.
+ErrorDuplicateField=Duplicate value in a unique field
+ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back.
+ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
+ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
+ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
+ErrorFailedToSaveFile=Error, failed to save file.
+ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
+MaxNbOfRecordPerPage=Max. number of records per page
+NotAuthorized=You are not authorized to do that.
+SetDate=Set date
+SelectDate=Select a date
+SeeAlso=See also %s
+SeeHere=See here
+ClickHere=Click here
+Here=Here
+Apply=Apply
+BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
+FileGenerated=The file was successfully generated
+FileSaved=The file was successfully saved
+FileUploaded=The file was successfully uploaded
+FileTransferComplete=File(s) uploaded successfully
+FilesDeleted=File(s) successfully deleted
+FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
+NbOfEntries=No. of entries
+GoToWikiHelpPage=Read online help (Internet access needed)
+GoToHelpPage=Read help
+RecordSaved=Record saved
+RecordDeleted=Record deleted
+RecordGenerated=Record generated
+LevelOfFeature=Level of features
+NotDefined=Not defined
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
+Administrator=Administrator
+Undefined=Undefined
+PasswordForgotten=Password forgotten?
+NoAccount=No account?
+SeeAbove=See above
+HomeArea=Home
+LastConnexion=Last login
+PreviousConnexion=Previous login
+PreviousValue=Previous value
+ConnectedOnMultiCompany=Connected on environment
+ConnectedSince=Connected since
+AuthenticationMode=Authentication mode
+RequestedUrl=Requested URL
+DatabaseTypeManager=Database type manager
+RequestLastAccessInError=Latest database access request error
+ReturnCodeLastAccessInError=Return code for latest database access request error
+InformationLastAccessInError=Information for latest database access request error
+DolibarrHasDetectedError=Dolibarr has detected a technical error
+YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices)
+MoreInformation=More information
+TechnicalInformation=Technical information
+TechnicalID=Technical ID
+LineID=Line ID
+NotePublic=Note (public)
+NotePrivate=Note (private)
+PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
+DoTest=Test
+ToFilter=Filter
+NoFilter=No filter
+WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
+yes=yes
+Yes=Yes
+no=no
+No=No
+All=All
+Home=Home
+Help=Help
+OnlineHelp=Online help
+PageWiki=Wiki page
+MediaBrowser=Media browser
+Always=Always
+Never=Never
+Under=under
+Period=Period
+PeriodEndDate=End date for period
+SelectedPeriod=Selected period
+PreviousPeriod=Previous period
+Activate=Activate
+Activated=Activated
+Closed=Closed
+Closed2=Closed
+NotClosed=Not closed
+Enabled=Enabled
+Enable=Enable
+Deprecated=Deprecated
+Disable=Disable
+Disabled=Disabled
+Add=Add
+AddLink=Add link
+RemoveLink=Remove link
+AddToDraft=Add to draft
+Update=Update
+Close=Close
+CloseBox=Remove widget from your dashboard
+Confirm=Confirm
+ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
+Delete=Delete
+Remove=Remove
+Resiliate=Terminate
+Cancel=Cancel
+Modify=Modify
+Edit=Edit
+Validate=Validate
+ValidateAndApprove=Validate and Approve
+ToValidate=To validate
+NotValidated=Not validated
+Save=Save
+SaveAs=Save As
+SaveAndStay=Save and stay
+SaveAndNew=Save and new
+TestConnection=Test connection
+ToClone=Clone
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
+ConfirmClone=Choose data you want to clone:
+NoCloneOptionsSpecified=No data to clone defined.
+Of=of
+Go=Go
+Run=Run
+CopyOf=Copy of
+Show=Show
+Hide=Hide
+ShowCardHere=Show card
+Search=Search
+SearchOf=Search
+SearchMenuShortCut=Ctrl + shift + f
+Valid=Valid
+Approve=Approve
+Disapprove=Disapprove
+ReOpen=Re-Open
+Upload=Upload
+ToLink=Link
+Select=Select
+Choose=Choose
+Resize=Resize
+ResizeOrCrop=Resize or Crop
+Recenter=Recenter
+Author=Author
+User=User
+Users=Users
+Group=Group
+Groups=Groups
+NoUserGroupDefined=No user group defined
+Password=Password
+PasswordRetype=Retype your password
+NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
+Name=Name
+NameSlashCompany=Name / Company
+Person=Person
+Parameter=Parameter
+Parameters=Parameters
+Value=Value
+PersonalValue=Personal value
+NewObject=New %s
+NewValue=New value
+CurrentValue=Current value
+Code=Code
+Type=Type
+Language=Language
+MultiLanguage=Multi-language
+Note=Note
+Title=Title
+Label=Label
+RefOrLabel=Ref. or label
+Info=Log
+Family=Family
+Description=Description
+Designation=Description
+DescriptionOfLine=Description of line
+DateOfLine=Date of line
+DurationOfLine=Duration of line
+Model=Doc template
+DefaultModel=Default doc template
+Action=Event
+About=About
+Number=Number
+NumberByMonth=Number by month
+AmountByMonth=Amount by month
+Numero=Number
+Limit=Limit
+Limits=Limits
+Logout=Logout
+NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
+Connection=Login
+Setup=Setup
+Alert=Alert
+MenuWarnings=Alerts
+Previous=Previous
+Next=Next
+Cards=Cards
+Card=Card
+Now=Now
+HourStart=Start hour
+Date=Date
+DateAndHour=Date and hour
+DateToday=Today's date
+DateReference=Reference date
+DateStart=Start date
+DateEnd=End date
+DateCreation=Creation date
+DateCreationShort=Creat. date
+DateModification=Modification date
+DateModificationShort=Modif. date
+DateLastModification=Latest modification date
+DateValidation=Validation date
+DateClosing=Closing date
+DateDue=Due date
+DateValue=Value date
+DateValueShort=Value date
+DateOperation=Operation date
+DateOperationShort=Oper. Date
+DateLimit=Limit date
+DateRequest=Request date
+DateProcess=Process date
+DateBuild=Report build date
+DatePayment=Date of payment
+DateApprove=Approving date
+DateApprove2=Approving date (second approval)
+RegistrationDate=Registration date
+UserCreation=Creation user
+UserModification=Modification user
+UserValidation=Validation user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
+UserValidationShort=Valid. user
+DurationYear=year
+DurationMonth=month
+DurationWeek=week
+DurationDay=day
+DurationYears=years
+DurationMonths=months
+DurationWeeks=weeks
+DurationDays=days
+Year=Year
+Month=Month
+Week=Week
+WeekShort=Week
+Day=Day
+Hour=Hour
+Minute=Minute
+Second=Second
+Years=Years
+Months=Months
+Days=Days
+days=days
+Hours=Hours
+Minutes=Minutes
+Seconds=Seconds
+Weeks=Weeks
+Today=Today
+Yesterday=Yesterday
+Tomorrow=Tomorrow
+Morning=Morning
+Afternoon=Afternoon
+Quadri=Quadri
+MonthOfDay=Month of the day
+HourShort=H
+MinuteShort=mn
+Rate=Rate
+CurrencyRate=Currency conversion rate
+UseLocalTax=Include tax
+Bytes=Bytes
+KiloBytes=Kilobytes
+MegaBytes=Megabytes
+GigaBytes=Gigabytes
+TeraBytes=Terabytes
+UserAuthor=User of creation
+UserModif=User of last update
+b=b.
+Kb=Kb
+Mb=Mb
+Gb=Gb
+Tb=Tb
+Cut=Cut
+Copy=Copy
+Paste=Paste
+Default=Default
+DefaultValue=Default value
+DefaultValues=Default values/filters/sorting
+Price=Price
+PriceCurrency=Price (currency)
+UnitPrice=Unit price
+UnitPriceHT=Unit price (excl.)
+UnitPriceHTCurrency=Unit price (excl.) (currency)
+UnitPriceTTC=Unit price
+PriceU=U.P.
+PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
+PriceUTTC=U.P. (inc. tax)
+Amount=Amount
+AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
+AmountInvoicedHT=Amount invoiced (incl. tax)
+AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountPayment=Payment amount
+AmountHTShort=Amount (excl.)
+AmountTTCShort=Amount (inc. tax)
+AmountHT=Amount (excl. tax)
+AmountTTC=Amount (inc. tax)
+AmountVAT=Amount tax
+MulticurrencyAlreadyPaid=Already paid, original currency
+MulticurrencyRemainderToPay=Remain to pay, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+MulticurrencyAmountHT=Amount (excl. tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
+AmountLT1=Amount tax 2
+AmountLT2=Amount tax 3
+AmountLT1ES=Amount RE
+AmountLT2ES=Amount IRPF
+AmountTotal=Total amount
+AmountAverage=Average amount
+PriceQtyMinHT=Price quantity min. (excl. tax)
+PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+Percentage=Percentage
+Total=Total
+SubTotal=Subtotal
+TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
+TotalHTShortCurrency=Total (excl. in currency)
+TotalTTCShort=Total (inc. tax)
+TotalHT=Total (excl. tax)
+TotalHTforthispage=Total (excl. tax) for this page
+Totalforthispage=Total for this page
+TotalTTC=Total (inc. tax)
+TotalTTCToYourCredit=Total (inc. tax) to your credit
+TotalVAT=Total tax
+TotalVATIN=Total IGST
+TotalLT1=Total tax 2
+TotalLT2=Total tax 3
+TotalLT1ES=Total RE
+TotalLT2ES=Total IRPF
+TotalLT1IN=Total CGST
+TotalLT2IN=Total SGST
+HT=Excl. tax
+TTC=Inc. tax
+INCVATONLY=Inc. VAT
+INCT=Inc. all taxes
+VAT=Sales tax
+VATIN=IGST
+VATs=Sales taxes
+VATINs=IGST taxes
+LT1=Sales tax 2
+LT1Type=Sales tax 2 type
+LT2=Sales tax 3
+LT2Type=Sales tax 3 type
+LT1ES=RE
+LT2ES=IRPF
+LT1IN=CGST
+LT2IN=SGST
+LT1GC=Additionnal cents
+VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
+DefaultTaxRate=Default tax rate
+Average=Average
+Sum=Sum
+Delta=Delta
+StatusToPay=To pay
+RemainToPay=Remain to pay
+Module=Module/Application
+Modules=Modules/Applications
+Option=Option
+List=List
+FullList=Full list
+FullConversation=Full conversation
+Statistics=Statistics
+OtherStatistics=Other statistics
+Status=Status
+Favorite=Favorite
+ShortInfo=Info.
+Ref=Ref.
+ExternalRef=Ref. extern
+RefSupplier=Ref. vendor
+RefPayment=Ref. payment
+CommercialProposalsShort=Commercial proposals
+Comment=Comment
+Comments=Comments
+ActionsToDo=Events to do
+ActionsToDoShort=To do
+ActionsDoneShort=Done
+ActionNotApplicable=Not applicable
+ActionRunningNotStarted=To start
+ActionRunningShort=In progress
+ActionDoneShort=Finished
+ActionUncomplete=Incomplete
+LatestLinkedEvents=Latest %s linked events
+CompanyFoundation=Company/Organization
+Accountant=Accountant
+ContactsForCompany=Contacts for this third party
+ContactsAddressesForCompany=Contacts/addresses for this third party
+AddressesForCompany=Addresses for this third party
+ActionsOnCompany=Events for this third party
+ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
+ActionsOnMember=Events about this member
+ActionsOnProduct=Events about this product
+NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
+RequestAlreadyDone=Request already recorded
+Filter=Filter
+FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
+RemoveFilter=Remove filter
+ChartGenerated=Chart generated
+ChartNotGenerated=Chart not generated
+GeneratedOn=Build on %s
+Generate=Generate
+Duration=Duration
+TotalDuration=Total duration
+Summary=Summary
+DolibarrStateBoard=Database Statistics
+DolibarrWorkBoard=Open Items
+NoOpenedElementToProcess=No open element to process
+Available=Available
+NotYetAvailable=Not yet available
+NotAvailable=Not available
+Categories=Tags/categories
+Category=Tag/category
+By=By
+From=From
+FromLocation=From
+to=to
+To=to
+and=and
+or=or
+Other=Other
+Others=Others
+OtherInformations=Other information
+Quantity=Quantity
+Qty=Qty
+ChangedBy=Changed by
+ApprovedBy=Approved by
+ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
+ReCalculate=Recalculate
+ResultKo=Failure
+Reporting=Reporting
+Reportings=Reporting
+Draft=Draft
+Drafts=Drafts
+StatusInterInvoiced=Invoiced
+Validated=Validated
+Opened=Open
+OpenAll=Open (All)
+ClosedAll=Closed (All)
+New=New
+Discount=Discount
+Unknown=Unknown
+General=General
+Size=Size
+OriginalSize=Original size
+Received=Received
+Paid=Paid
+Topic=Subject
+ByCompanies=By third parties
+ByUsers=By user
+Links=Links
+Link=Link
+Rejects=Rejects
+Preview=Preview
+NextStep=Next step
+Datas=Data
+None=None
+NoneF=None
+NoneOrSeveral=None or several
+Late=Late
+LateDesc=An item is defined as Delayed as per the system configuration in menu Home - Setup - Alerts.
+NoItemLate=No late item
+Photo=Picture
+Photos=Pictures
+AddPhoto=Add picture
+DeletePicture=Picture delete
+ConfirmDeletePicture=Confirm picture deletion?
+Login=Login
+LoginEmail=Login (email)
+LoginOrEmail=Login or Email
+CurrentLogin=Current login
+EnterLoginDetail=Enter login details
+January=January
+February=February
+March=March
+April=April
+May=May
+June=June
+July=July
+August=August
+September=September
+October=October
+November=November
+December=December
+Month01=January
+Month02=February
+Month03=March
+Month04=April
+Month05=May
+Month06=June
+Month07=July
+Month08=August
+Month09=September
+Month10=October
+Month11=November
+Month12=December
+MonthShort01=Jan
+MonthShort02=Feb
+MonthShort03=Mar
+MonthShort04=Apr
+MonthShort05=May
+MonthShort06=Jun
+MonthShort07=Jul
+MonthShort08=Aug
+MonthShort09=Sep
+MonthShort10=Oct
+MonthShort11=Nov
+MonthShort12=Dec
+MonthVeryShort01=J
+MonthVeryShort02=F
+MonthVeryShort03=M
+MonthVeryShort04=A
+MonthVeryShort05=M
+MonthVeryShort06=J
+MonthVeryShort07=J
+MonthVeryShort08=A
+MonthVeryShort09=S
+MonthVeryShort10=O
+MonthVeryShort11=N
+MonthVeryShort12=D
+AttachedFiles=Attached files and documents
+JoinMainDoc=Join main document
+DateFormatYYYYMM=YYYY-MM
+DateFormatYYYYMMDD=YYYY-MM-DD
+DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
+ReportName=Report name
+ReportPeriod=Report period
+ReportDescription=Description
+Report=Report
+Keyword=Keyword
+Origin=Origin
+Legend=Legend
+Fill=Fill
+Reset=Reset
+File=File
+Files=Files
+NotAllowed=Not allowed
+ReadPermissionNotAllowed=Read permission not allowed
+AmountInCurrency=Amount in %s currency
+Example=Example
+Examples=Examples
+NoExample=No example
+FindBug=Report a bug
+NbOfThirdParties=Number of third parties
+NbOfLines=Number of lines
+NbOfObjects=Number of objects
+NbOfObjectReferers=Number of related items
+Referers=Related items
+TotalQuantity=Total quantity
+DateFromTo=From %s to %s
+DateFrom=From %s
+DateUntil=Until %s
+Check=Check
+Uncheck=Uncheck
+Internal=Internal
+External=External
+Internals=Internal
+Externals=External
+Warning=Warning
+Warnings=Warnings
+BuildDoc=Build Doc
+Entity=Environment
+Entities=Entities
+CustomerPreview=Customer preview
+SupplierPreview=Vendor preview
+ShowCustomerPreview=Show customer preview
+ShowSupplierPreview=Show vendor preview
+RefCustomer=Ref. customer
+Currency=Currency
+InfoAdmin=Information for administrators
+Undo=Undo
+Redo=Redo
+ExpandAll=Expand all
+UndoExpandAll=Undo expand
+SeeAll=See all
+Reason=Reason
+FeatureNotYetSupported=Feature not yet supported
+CloseWindow=Close window
+Response=Response
+Priority=Priority
+SendByMail=Send by email
+MailSentBy=Email sent by
+TextUsedInTheMessageBody=Email body
+SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
+Email=Email
+NoEMail=No email
+AlreadyRead=Already read
+NotRead=Not read
+NoMobilePhone=No mobile phone
+Owner=Owner
+FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
+Refresh=Refresh
+BackToList=Back to list
+GoBack=Go back
+CanBeModifiedIfOk=Can be modified if valid
+CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
+RecordCreatedSuccessfully=Record created successfully
+RecordModifiedSuccessfully=Record modified successfully
+RecordsModified=%s record(s) modified
+RecordsDeleted=%s record(s) deleted
+RecordsGenerated=%s record(s) generated
+AutomaticCode=Automatic code
+FeatureDisabled=Feature disabled
+MoveBox=Move widget
+Offered=Offered
+NotEnoughPermissions=You don't have permission for this action
+SessionName=Session name
+Method=Method
+Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+PartialWoman=Partial
+TotalWoman=Total
+NeverReceived=Never received
+Canceled=Canceled
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
+YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record in module setup
+Color=Color
+Documents=Linked files
+Documents2=Documents
+UploadDisabled=Upload disabled
+MenuAccountancy=Accounting
+MenuECM=Documents
+MenuAWStats=AWStats
+MenuMembers=Members
+MenuAgendaGoogle=Google agenda
+ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+NoFileFound=No documents saved in this directory
+CurrentUserLanguage=Current language
+CurrentTheme=Current theme
+CurrentMenuManager=Current menu manager
+Browser=Browser
+Layout=Layout
+Screen=Screen
+DisabledModules=Disabled modules
+For=For
+ForCustomer=For customer
+Signature=Signature
+DateOfSignature=Date of signature
+HidePassword=Show command with password hidden
+UnHidePassword=Show real command with clear password
+Root=Root
+RootOfMedias=Root of public medias (/medias)
+Informations=Information
+Page=Page
+Notes=Notes
+AddNewLine=Add new line
+AddFile=Add file
+FreeZone=Not a predefined product/service
+FreeLineOfType=Free-text item, type:
+CloneMainAttributes=Clone object with its main attributes
+ReGeneratePDF=Re-generate PDF
+PDFMerge=PDF Merge
+Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
+PrintContentArea=Show page to print main content area
+MenuManager=Menu manager
+WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
+CoreErrorTitle=System error
+CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
+CreditCard=Credit card
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
+FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
+FieldsWithIsForPublic=Fields with <b>%s</b> are shown in public list of members. If you don't want this, uncheck the "public" box.
+AccordingToGeoIPDatabase=(according to GeoIP conversion)
+Line=Line
+NotSupported=Not supported
+RequiredField=Required field
+Result=Result
+ToTest=Test
+ValidateBefore=Item must be validated before using this feature
+Visibility=Visibility
+Totalizable=Totalizable
+TotalizableDesc=This field is totalizable in list
+Private=Private
+Hidden=Hidden
+Resources=Resources
+Source=Source
+Prefix=Prefix
+Before=Before
+After=After
+IPAddress=IP address
+Frequency=Frequency
+IM=Instant messaging
+NewAttribute=New attribute
+AttributeCode=Attribute code
+URLPhoto=URL of photo/logo
+SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToTemplateInvoice=Link to template invoice
+LinkToSupplierOrder=Link to purchase order
+LinkToSupplierProposal=Link to vendor proposal
+LinkToSupplierInvoice=Link to vendor invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
+CreateDraft=Create draft
+SetToDraft=Back to draft
+ClickToEdit=Click to edit
+ClickToRefresh=Click to refresh
+EditWithEditor=Edit with CKEditor
+EditWithTextEditor=Edit with Text editor
+EditHTMLSource=Edit HTML Source
+ObjectDeleted=Object %s deleted
+ByCountry=By country
+ByTown=By town
+ByDate=By date
+ByMonthYear=By month/year
+ByYear=By year
+ByMonth=By month
+ByDay=By day
+BySalesRepresentative=By sales representative
+LinkedToSpecificUsers=Linked to a particular user contact
+NoResults=No results
+AdminTools=Admin Tools
+SystemTools=System tools
+ModulesSystemTools=Modules tools
+Test=Test
+Element=Element
+NoPhotoYet=No pictures available yet
+Dashboard=Dashboard
+MyDashboard=My Dashboard
+Deductible=Deductible
+from=from
+toward=toward
+Access=Access
+SelectAction=Select action
+SelectTargetUser=Select target user/employee
+HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
+SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
+OriginFileName=Original filename
+SetDemandReason=Set source
+SetBankAccount=Define Bank Account
+AccountCurrency=Account currency
+ViewPrivateNote=View notes
+XMoreLines=%s line(s) hidden
+ShowMoreLines=Show more/less lines
+PublicUrl=Public URL
+AddBox=Add box
+SelectElementAndClick=Select an element and click %s
+PrintFile=Print File %s
+ShowTransaction=Show entry on bank account
+ShowIntervention=Show intervention
+ShowContract=Show contract
+GoIntoSetupToChangeLogo=Go to Home - Setup - Company to change logo or go to Home - Setup - Display to hide.
+Deny=Deny
+Denied=Denied
+ListOf=List of %s
+ListOfTemplates=List of templates
+Gender=Gender
+Genderman=Man
+Genderwoman=Woman
+ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
+Mandatory=Mandatory
+Hello=Hello
+GoodBye=GoodBye
+Sincerely=Sincerely
+ConfirmDeleteObject=Are you sure you want to delete this object?
+DeleteLine=Delete line
+ConfirmDeleteLine=Are you sure you want to delete this line?
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records.
+NoRecordSelected=No record selected
+MassFilesArea=Area for files built by mass actions
+ShowTempMassFilesArea=Show area of files built by mass actions
+ConfirmMassDeletion=Bulk Delete confirmation
+ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
+RelatedObjects=Related Objects
+ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
+Progress=Progress
+ProgressShort=Progr.
+FrontOffice=Front office
+BackOffice=Back office
+Submit=Submit
+View=View
+Export=Export
+Exports=Exports
+ExportFilteredList=Export filtered list
+ExportList=Export list
+ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
+Miscellaneous=Miscellaneous
+Calendar=Calendar
+GroupBy=Group by...
+ViewFlatList=View flat list
+RemoveString=Remove string '%s'
+SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+DirectDownloadLink=Direct download link (public/external)
+DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+Download=Download
+DownloadDocument=Download document
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
+ModuleBuilder=Module and Application Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status?
+ImportId=Import id
+Events=Events
+EMailTemplates=Email templates
+FileNotShared=File not shared to external public
+Project=Project
+Projects=Projects
+LeadOrProject=Lead | Project
+LeadsOrProjects=Leads | Projects
+Lead=Lead
+Leads=Leads
+ListOpenLeads=List open leads
+ListOpenProjects=List open projects
+NewLeadOrProject=New lead or project
+Rights=Permissions
+LineNb=Line no.
+IncotermLabel=Incoterms
+TabLetteringCustomer=Customer lettering
+TabLetteringSupplier=Vendor lettering
+Monday=Monday
+Tuesday=Tuesday
+Wednesday=Wednesday
+Thursday=Thursday
+Friday=Friday
+Saturday=Saturday
+Sunday=Sunday
+MondayMin=Mo
+TuesdayMin=Tu
+WednesdayMin=We
+ThursdayMin=Th
+FridayMin=Fr
+SaturdayMin=Sa
+SundayMin=Su
+Day1=Monday
+Day2=Tuesday
+Day3=Wednesday
+Day4=Thursday
+Day5=Friday
+Day6=Saturday
+Day0=Sunday
+ShortMonday=M
+ShortTuesday=T
+ShortWednesday=W
+ShortThursday=T
+ShortFriday=F
+ShortSaturday=S
+ShortSunday=S
+SelectMailModel=Select an email template
+SetRef=Set ref
+Select2ResultFoundUseArrows=Some results found. Use arrows to select.
+Select2NotFound=No result found
+Select2Enter=Enter
+Select2MoreCharacter=or more character
+Select2MoreCharacters=or more characters
+Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
+Select2LoadingMoreResults=Loading more results...
+Select2SearchInProgress=Search in progress...
+SearchIntoThirdparties=Third parties
+SearchIntoContacts=Contacts
+SearchIntoMembers=Members
+SearchIntoUsers=Users
+SearchIntoProductsOrServices=Products or services
+SearchIntoProjects=Projects
+SearchIntoMO=Manufacturing Orders
+SearchIntoTasks=Tasks
+SearchIntoCustomerInvoices=Customer invoices
+SearchIntoSupplierInvoices=Vendor invoices
+SearchIntoCustomerOrders=Sales orders
+SearchIntoSupplierOrders=Purchase orders
+SearchIntoCustomerProposals=Commercial proposals
+SearchIntoSupplierProposals=Vendor proposals
+SearchIntoInterventions=Interventions
+SearchIntoContracts=Contracts
+SearchIntoCustomerShipments=Customer shipments
+SearchIntoExpenseReports=Expense reports
+SearchIntoLeaves=Leave
+SearchIntoTickets=Tickets
+CommentLink=Comments
+NbComments=Number of comments
+CommentPage=Comments space
+CommentAdded=Comment added
+CommentDeleted=Comment deleted
+Everybody=Everybody
+PayedBy=Paid by
+PayedTo=Paid to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft mass delete confirmation
+FileSharedViaALink=File shared via a link
+SelectAThirdPartyFirst=Select a third party first...
+YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
+AnalyticCode=Analytic code
+TMenuMRP=MRP
+ShowMoreInfos=Show More Infos
+NoFilesUploadedYet=Please upload a document first
+SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
+ContactDefault_agenda=Event
+ContactDefault_commande=Order
+ContactDefault_contrat=Contract
+ContactDefault_facture=Invoice
+ContactDefault_fichinter=Intervention
+ContactDefault_invoice_supplier=Supplier Invoice
+ContactDefault_order_supplier=Purchase Order
+ContactDefault_project=Project
+ContactDefault_project_task=Task
+ContactDefault_propal=Proposal
+ContactDefault_supplier_proposal=Supplier Proposal
+ContactDefault_ticket=Ticket
+ContactAddedAutomatically=Contact added from contact thirdparty roles
+More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+StatisticsOn=Statistics on
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
+Measures=Measures
+XAxis=X-Axis
+YAxis=Y-Axis
+StatusOfRefMustBe=Status of %s must be %s
+DeleteFileHeader=Confirm file delete
+DeleteFileText=Do you really want delete this file?
+ShowOtherLanguages=Show other languages
+SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
+NotUsedForThisCustomer=Not used for this customer
diff --git a/htdocs/langs/ne_NP/margins.lang b/htdocs/langs/ne_NP/margins.lang
new file mode 100644
index 00000000000..76ea8ad5c4d
--- /dev/null
+++ b/htdocs/langs/ne_NP/margins.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - marges
+
+Margin=Margin
+Margins=Margins
+TotalMargin=Total Margin
+MarginOnProducts=Margin / Products
+MarginOnServices=Margin / Services
+MarginRate=Margin rate
+MarkRate=Mark rate
+DisplayMarginRates=Display margin rates
+DisplayMarkRates=Display mark rates
+InputPrice=Input price
+margin=Profit margins management
+margesSetup=Profit margins management setup
+MarginDetails=Margin details
+ProductMargins=Product margins
+CustomerMargins=Customer margins
+SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
+UserMargins=User margins
+ProductService=Product or Service
+AllProducts=All products and services
+ChooseProduct/Service=Choose product or service
+ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
+ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
+UseDiscountAsProduct=As a product
+UseDiscountAsService=As a service
+UseDiscountOnTotal=On subtotal
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
+MargeType1=Margin on Best vendor price
+MargeType2=Margin on Weighted Average Price (WAP)
+MargeType3=Margin on Cost Price
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
+CostPrice=Cost price
+UnitCharges=Unit charges
+Charges=Charges
+AgentContactType=Commercial agent contact type
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
+CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/ne_NP/members.lang b/htdocs/langs/ne_NP/members.lang
new file mode 100644
index 00000000000..dd0a5bf49e2
--- /dev/null
+++ b/htdocs/langs/ne_NP/members.lang
@@ -0,0 +1,204 @@
+# Dolibarr language file - Source file is en_US - members
+MembersArea=Members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of terminated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Terminated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
+DateSubscription=Subscription date
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=Subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Terminated member
+MemberStatusResiliatedShort=Terminated
+MembersStatusToValid=Draft members
+MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Validated
+SubscriptionNotNeeded=No subscription needed
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+MemberTypeModified=Member type modified
+DeleteAMemberType=Delete a member type
+ConfirmDeleteMemberType=Are you sure you want to delete this member type?
+MemberTypeDeleted=Member type deleted
+MemberTypeCanNotBeDeleted=Member type can not be deleted
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome email
+SubscriptionRequired=Subscription required
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Terminate a member
+ConfirmResiliateMember=Are you sure you want to terminate this member?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions)?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public self-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public website with self-subscription form
+ForceMemberType=Force the member type
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembersModified=Latest %s modified members
+LastSubscriptionsModified=Latest %s modified subscriptions
+String=String
+Text=Text
+Int=Int
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+SubscriptionNotRecorded=Subscription not recorded
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct entry on bank account
+MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Latest member date
+LatestSubscriptionDate=Latest subscription date
+MemberNature=Nature of member
+Public=Information are public
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No VAT for subscriptions
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
+MembershipPaid=Membership paid for current period (until %s)
+YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
+XMembersClosed=%s member(s) closed
diff --git a/htdocs/langs/ne_NP/modulebuilder.lang b/htdocs/langs/ne_NP/modulebuilder.lang
new file mode 100644
index 00000000000..135ac1ae9ec
--- /dev/null
+++ b/htdocs/langs/ne_NP/modulebuilder.lang
@@ -0,0 +1,141 @@
+# Dolibarr language file - Source file is en_US - loan
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
+ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
+ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
+ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
+NewModule=New module
+NewObjectInModulebuilder=New object
+ModuleKey=Module key
+ObjectKey=Object key
+ModuleInitialized=Module initialized
+FilesForObjectInitialized=Files for new object '%s' initialized
+FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
+ModuleBuilderDescdescription=Enter here all general information that describe your module.
+ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
+ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
+ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
+ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
+ModuleBuilderDeschooks=This tab is dedicated to hooks.
+ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
+ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
+DangerZone=Danger zone
+BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
+BuildDocumentation=Build documentation
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
+DescriptionLong=Long description
+EditorName=Name of editor
+EditorUrl=URL of editor
+DescriptorFile=Descriptor file of module
+ClassFile=File for PHP DAO CRUD class
+ApiClassFile=File for PHP API class
+PageForList=PHP page for list of record
+PageForCreateEditView=PHP page to create/edit/view a record
+PageForAgendaTab=PHP page for event tab
+PageForDocumentTab=PHP page for document tab
+PageForNoteTab=PHP page for note tab
+PathToModulePackage=Path to zip of module/application package
+PathToModuleDocumentation=Path to file of module/application documentation (%s)
+SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
+FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Force update of .class and .sql files
+RegenerateMissingFiles=Generate missing files
+SpecificationFile=File of documentation
+LanguageFile=File for language
+ObjectProperties=Object Properties
+ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
+NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
+SearchAll=Used for 'search all'
+DatabaseIndex=Database index
+FileAlreadyExists=File %s already exists
+TriggersFile=File for triggers code
+HooksFile=File for hooks code
+ArrayOfKeyValues=Array of key-val
+ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
+WidgetFile=Widget file
+CSSFile=CSS file
+JSFile=Javascript file
+ReadmeFile=Readme file
+ChangeLog=ChangeLog file
+TestClassFile=File for PHP Unit Test class
+SqlFile=Sql file
+PageForLib=File for the common PHP library
+PageForObjLib=File for the PHP library dedicated to object
+SqlFileExtraFields=Sql file for complementary attributes
+SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
+AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
+UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Is a measure
+DirScanned=Directory scanned
+NoTrigger=No trigger
+NoWidget=No widget
+GoToApiExplorer=Go to API explorer
+ListOfMenusEntries=List of menu entries
+ListOfDictionariesEntries=List of dictionaries entries
+ListOfPermissionsDefined=List of defined permissions
+SeeExamples=See examples here
+EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdf=Display on PDF
+IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
+SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
+SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
+LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
+MenusDefDesc=Define here the menus provided by your module
+DictionariesDefDesc=Define here the dictionaries provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
+HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
+TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
+SeeIDsInUse=See IDs in use in your installation
+SeeReservedIDsRangeHere=See range of reserved IDs
+ToolkitForDevelopers=Toolkit for Dolibarr developers
+TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
+SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
+AddLanguageFile=Add language file
+YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
+DropTableIfEmpty=(Delete table if empty)
+TableDoesNotExists=The table %s does not exists
+TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
+UseAboutPage=Disable the about page
+UseDocFolder=Disable the documentation folder
+UseSpecificReadme=Use a specific ReadMe
+ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
+RealPathOfModule=Real path of module
+ContentCantBeEmpty=Content of file can't be empty
+WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
+CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
+JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
+CLIDesc=You can generate here some command line scripts you want to provide with your module.
+CLIFile=CLI File
+NoCLIFile=No CLI files
+UseSpecificEditorName = Use a specific editor name
+UseSpecificEditorURL = Use a specific editor URL
+UseSpecificFamily = Use a specific family
+UseSpecificAuthor = Use a specific author
+UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
+IncludeRefGeneration=The reference of object must be generated automatically
+IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
+IncludeDocGeneration=I want to generate some documents from the object
+IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
+ShowOnCombobox=Show value into combobox
+KeyForTooltip=Key for tooltip
+CSSClass=CSS Class
+NotEditable=Not editable
+ForeignKey=Foreign key
+TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/ne_NP/mrp.lang b/htdocs/langs/ne_NP/mrp.lang
new file mode 100644
index 00000000000..d3c4d3253c6
--- /dev/null
+++ b/htdocs/langs/ne_NP/mrp.lang
@@ -0,0 +1,76 @@
+Mrp=Manufacturing Orders
+MO=Manufacturing Order
+MRPDescription=Module to manage production and Manufacturing Orders (MO).
+MRPArea=MRP Area
+MrpSetupPage=Setup of module MRP
+MenuBOM=Bills of material
+LatestBOMModified=Latest %s Bills of materials modified
+LatestMOModified=Latest %s Manufacturing Orders modified
+Bom=Bills of Material
+BillOfMaterials=Bill of Material
+BOMsSetup=Setup of module BOM
+ListOfBOMs=List of bills of material - BOM
+ListOfManufacturingOrders=List of Manufacturing Orders
+NewBOM=New bill of material
+ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+BOMsNumberingModules=BOM numbering templates
+BOMsModelModule=BOM document templates
+MOsNumberingModules=MO numbering templates
+MOsModelModule=MO document templates
+FreeLegalTextOnBOMs=Free text on document of BOM
+WatermarkOnDraftBOMs=Watermark on draft BOM
+FreeLegalTextOnMOs=Free text on document of MO
+WatermarkOnDraftMOs=Watermark on draft MO
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
+ManufacturingEfficiency=Manufacturing efficiency
+ConsumptionEfficiency=Consumption efficiency
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
+DeleteBillOfMaterials=Delete Bill Of Materials
+DeleteMo=Delete Manufacturing Order
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+MenuMRP=Manufacturing Orders
+NewMO=New Manufacturing Order
+QtyToProduce=Qty to produce
+DateStartPlannedMo=Date start planned
+DateEndPlannedMo=Date end planned
+KeepEmptyForAsap=Empty means 'As Soon As Possible'
+EstimatedDuration=Estimated duration
+EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
+ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
+ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
+StatusMOProduced=Produced
+QtyFrozen=Frozen Qty
+QuantityFrozen=Frozen Quantity
+QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
+DisableStockChange=Stock change disabled
+DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
+BomAndBomLines=Bills Of Material and lines
+BOMLine=Line of BOM
+WarehouseForProduction=Warehouse for production
+CreateMO=Create MO
+ToConsume=To consume
+ToProduce=To produce
+QtyAlreadyConsumed=Qty already consumed
+QtyAlreadyProduced=Qty already produced
+QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
+ConsumeOrProduce=Consume or Produce
+ConsumeAndProduceAll=Consume and Produce All
+Manufactured=Manufactured
+TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
+ForAQuantityOf=For a quantity to produce of %s
+ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
+ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
+ProductionForRef=Production of %s
+AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
+NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
+AddNewConsumeLines=Add new line to consume
+ProductsToConsume=Products to consume
+ProductsToProduce=Products to produce
+UnitCost=Unit cost
+TotalCost=Total cost
diff --git a/htdocs/langs/ne_NP/multicurrency.lang b/htdocs/langs/ne_NP/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/ne_NP/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/ne_NP/oauth.lang b/htdocs/langs/ne_NP/oauth.lang
new file mode 100644
index 00000000000..075ff49a895
--- /dev/null
+++ b/htdocs/langs/ne_NP/oauth.lang
@@ -0,0 +1,32 @@
+# Dolibarr language file - Source file is en_US - oauth
+ConfigOAuth=OAuth Configuration
+OAuthServices=OAuth Services
+ManualTokenGeneration=Manual token generation
+TokenManager=Token Manager
+IsTokenGenerated=Is token generated ?
+NoAccessToken=No access token saved into local database
+HasAccessToken=A token was generated and saved into local database
+NewTokenStored=Token received and saved
+ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
+TokenDeleted=Token deleted
+RequestAccess=Click here to request/renew access and receive a new token to save
+DeleteAccess=Click here to delete token
+UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
+ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
+OAuthSetupForLogin=Page to generate an OAuth token
+SeePreviousTab=See previous tab
+OAuthIDSecret=OAuth ID and Secret
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=OAuth Google service
+OAUTH_GOOGLE_ID=OAuth Google Id
+OAUTH_GOOGLE_SECRET=OAuth Google Secret
+OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create OAuth credentials
+OAUTH_GITHUB_NAME=OAuth GitHub service
+OAUTH_GITHUB_ID=OAuth GitHub Id
+OAUTH_GITHUB_SECRET=OAuth GitHub Secret
+OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create OAuth credentials
+OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
+OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/ne_NP/opensurvey.lang b/htdocs/langs/ne_NP/opensurvey.lang
new file mode 100644
index 00000000000..7d26151fa16
--- /dev/null
+++ b/htdocs/langs/ne_NP/opensurvey.lang
@@ -0,0 +1,61 @@
+# Dolibarr language file - Source file is en_US - opensurvey
+Survey=Poll
+Surveys=Polls
+OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select the type of poll...
+NewSurvey=New poll
+OpenSurveyArea=Polls area
+AddACommentForPoll=You can add a comment into poll...
+AddComment=Add comment
+CreatePoll=Create poll
+PollTitle=Poll title
+ToReceiveEMailForEachVote=Receive an email for each vote
+TypeDate=Type date
+TypeClassic=Type standard
+OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
+RemoveAllDays=Remove all days
+CopyHoursOfFirstDay=Copy hours of first day
+RemoveAllHours=Remove all hours
+SelectedDays=Selected days
+TheBestChoice=The best choice currently is
+TheBestChoices=The best choices currently are
+with=with
+OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
+CommentsOfVoters=Comments of voters
+ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
+RemovePoll=Remove poll
+UrlForSurvey=URL to communicate to get a direct access to poll
+PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
+CreateSurveyDate=Create a date poll
+CreateSurveyStandard=Create a standard poll
+CheckBox=Simple checkbox
+YesNoList=List (empty/yes/no)
+PourContreList=List (empty/for/against)
+AddNewColumn=Add new column
+TitleChoice=Choice label
+ExportSpreadsheet=Export result spreadsheet
+ExpireDate=Limit date
+NbOfSurveys=Number of polls
+NbOfVoters=No. of voters
+SurveyResults=Results
+PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
+5MoreChoices=5 more choices
+Against=Against
+YouAreInivitedToVote=You are invited to vote for this poll
+VoteNameAlreadyExists=This name was already used for this poll
+AddADate=Add a date
+AddStartHour=Add start hour
+AddEndHour=Add end hour
+votes=vote(s)
+NoCommentYet=No comments have been posted for this poll yet
+CanComment=Voters can comment in the poll
+CanSeeOthersVote=Voters can see other people's vote
+SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
+BackToCurrentMonth=Back to current month
+ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
+ErrorOpenSurveyOneChoice=Enter at least one choice
+ErrorInsertingComment=There was an error while inserting your comment
+MoreChoices=Enter more choices for the voters
+SurveyExpiredInfo=The poll has been closed or voting delay has expired.
+EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
+ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/ne_NP/orders.lang b/htdocs/langs/ne_NP/orders.lang
new file mode 100644
index 00000000000..ad91e1eef63
--- /dev/null
+++ b/htdocs/langs/ne_NP/orders.lang
@@ -0,0 +1,189 @@
+# Dolibarr language file - Source file is en_US - orders
+OrdersArea=Customers orders area
+SuppliersOrdersArea=Purchase orders area
+OrderCard=Order card
+OrderId=Order Id
+Order=Order
+PdfOrderTitle=Order
+Orders=Orders
+OrderLine=Order line
+OrderDate=Order date
+OrderDateShort=Order date
+OrderToProcess=Order to process
+NewOrder=New order
+NewOrderSupplier=New Purchase Order
+ToOrder=Make order
+MakeOrder=Make order
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Sales Order
+CustomersOrders=Sales Orders
+CustomersOrdersRunning=Current sales orders
+CustomersOrdersAndOrdersLines=Sales orders and order details
+OrdersDeliveredToBill=Sales orders delivered to bill
+OrdersToBill=Sales orders delivered
+OrdersInProcess=Sales orders in process
+OrdersToProcess=Sales orders to process
+SuppliersOrdersToProcess=Purchase orders to process
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
+StatusOrderCanceledShort=Canceled
+StatusOrderDraftShort=Draft
+StatusOrderValidatedShort=Validated
+StatusOrderSentShort=In process
+StatusOrderSent=Shipment in process
+StatusOrderOnProcessShort=Ordered
+StatusOrderProcessedShort=Processed
+StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
+StatusOrderToBillShort=Delivered
+StatusOrderApprovedShort=Approved
+StatusOrderRefusedShort=Refused
+StatusOrderToProcessShort=To process
+StatusOrderReceivedPartiallyShort=Partially received
+StatusOrderReceivedAllShort=Products received
+StatusOrderCanceled=Canceled
+StatusOrderDraft=Draft (needs to be validated)
+StatusOrderValidated=Validated
+StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderProcessed=Processed
+StatusOrderToBill=Delivered
+StatusOrderApproved=Approved
+StatusOrderRefused=Refused
+StatusOrderReceivedPartially=Partially received
+StatusOrderReceivedAll=All products received
+ShippingExist=A shipment exists
+QtyOrdered=Qty ordered
+ProductQtyInDraft=Product quantity into draft orders
+ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
+MenuOrdersToBill=Orders delivered
+MenuOrdersToBill2=Billable orders
+ShipProduct=Ship product
+CreateOrder=Create Order
+RefuseOrder=Refuse order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
+ValidateOrder=Validate order
+UnvalidateOrder=Unvalidate order
+DeleteOrder=Delete order
+CancelOrder=Cancel order
+OrderReopened= Order %s re-open
+AddOrder=Create order
+AddPurchaseOrder=Create purchase order
+AddToDraftOrders=Add to draft order
+ShowOrder=Show order
+OrdersOpened=Orders to process
+NoDraftOrders=No draft orders
+NoOrder=No order
+NoSupplierOrder=No purchase order
+LastOrders=Latest %s sales orders
+LastCustomerOrders=Latest %s sales orders
+LastSupplierOrders=Latest %s purchase orders
+LastModifiedOrders=Latest %s modified orders
+AllOrders=All orders
+NbOfOrders=Number of orders
+OrdersStatistics=Order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
+NumberOfOrdersByMonth=Number of orders by month
+AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
+ListOfOrders=List of orders
+CloseOrder=Close order
+ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
+ConfirmDeleteOrder=Are you sure you want to delete this order?
+ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b>?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status?
+ConfirmCancelOrder=Are you sure you want to cancel this order?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
+GenerateBill=Generate invoice
+ClassifyShipped=Classify delivered
+DraftOrders=Draft orders
+DraftSuppliersOrders=Draft purchase orders
+OnProcessOrders=In process orders
+RefOrder=Ref. order
+RefCustomerOrder=Ref. order for customer
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
+SendOrderByMail=Send order by mail
+ActionsOnOrder=Events on order
+NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
+OrderMode=Order method
+AuthorRequest=Request author
+UserWithApproveOrderGrant=Users granted with "approve orders" permission.
+PaymentOrderRef=Payment of order %s
+ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
+DispatchSupplierOrder=Receiving purchase order %s
+FirstApprovalAlreadyDone=First approval already done
+SecondApprovalAlreadyDone=Second approval already done
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
+OtherOrders=Other orders
+##### Types de contacts #####
+TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
+TypeContact_commande_internal_SHIPPING=Representative following-up shipping
+TypeContact_commande_external_BILLING=Customer invoice contact
+TypeContact_commande_external_SHIPPING=Customer shipping contact
+TypeContact_commande_external_CUSTOMER=Customer contact following-up order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
+TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
+Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
+Error_OrderNotChecked=No orders to invoice selected
+# Order modes (how we receive order). Not the "why" are keys stored into dict.lang
+OrderByMail=Mail
+OrderByFax=Fax
+OrderByEMail=Email
+OrderByWWW=Online
+OrderByPhone=Phone
+# Documents models
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
+PDFEratostheneDescription=A complete order model
+PDFEdisonDescription=A simple order model
+PDFProformaDescription=A complete Proforma invoice template
+CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
+IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
+SetShippingMode=Set shipping mode
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Canceled
+StatusSupplierOrderDraftShort=Draft
+StatusSupplierOrderValidatedShort=Validated
+StatusSupplierOrderSentShort=In process
+StatusSupplierOrderSent=Shipment in process
+StatusSupplierOrderOnProcessShort=Ordered
+StatusSupplierOrderProcessedShort=Processed
+StatusSupplierOrderDelivered=Delivered
+StatusSupplierOrderDeliveredShort=Delivered
+StatusSupplierOrderToBillShort=Delivered
+StatusSupplierOrderApprovedShort=Approved
+StatusSupplierOrderRefusedShort=Refused
+StatusSupplierOrderToProcessShort=To process
+StatusSupplierOrderReceivedPartiallyShort=Partially received
+StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderCanceled=Canceled
+StatusSupplierOrderDraft=Draft (needs to be validated)
+StatusSupplierOrderValidated=Validated
+StatusSupplierOrderOnProcess=Ordered - Standby reception
+StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusSupplierOrderProcessed=Processed
+StatusSupplierOrderToBill=Delivered
+StatusSupplierOrderApproved=Approved
+StatusSupplierOrderRefused=Refused
+StatusSupplierOrderReceivedPartially=Partially received
+StatusSupplierOrderReceivedAll=All products received
diff --git a/htdocs/langs/ne_NP/other.lang b/htdocs/langs/ne_NP/other.lang
new file mode 100644
index 00000000000..ba85f51e739
--- /dev/null
+++ b/htdocs/langs/ne_NP/other.lang
@@ -0,0 +1,286 @@
+# Dolibarr language file - Source file is en_US - other
+SecurityCode=Security code
+NumberingShort=N°
+Tools=Tools
+TMenuTools=Tools
+ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
+Birthday=Birthday
+BirthdayDate=Birthday date
+DateToBirth=Birth date
+BirthdayAlertOn=birthday alert active
+BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (text) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+DocFileGeneratedInto=Doc file generated into <b>%s</b>.
+JumpToLogin=Disconnected. Go to login page...
+MessageForm=Message on online payment form
+MessageOK=Message on the return page for a validated payment
+MessageKO=Message on the return page for a canceled payment
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursively
+PoweredBy=Powered by
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+DateNextInvoiceBeforeGen=Date of next invoice (before generation)
+DateNextInvoiceAfterGen=Date of next invoice (after generation)
+GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
+OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Only the first selected field has been selected.
+AtLeastOneMeasureIsRequired=At least 1 field for measure is required
+AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
+LatestBlogPosts=Latest Blog Posts
+Notify_ORDER_VALIDATE=Sales order validated
+Notify_ORDER_SENTBYMAIL=Sales order sent by mail
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
+Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
+Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
+Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
+Notify_PROPAL_VALIDATE=Customer proposal validated
+Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
+Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
+Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
+Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
+Notify_WITHDRAW_CREDIT=Credit withdrawal
+Notify_WITHDRAW_EMIT=Perform withdrawal
+Notify_COMPANY_CREATE=Third party created
+Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_BILL_VALIDATE=Customer invoice validated
+Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_BILL_PAYED=Customer invoice paid
+Notify_BILL_CANCEL=Customer invoice canceled
+Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
+Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
+Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
+Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
+Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
+Notify_CONTRACT_VALIDATE=Contract validated
+Notify_FICHINTER_VALIDATE=Intervention validated
+Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
+Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
+Notify_SHIPPING_VALIDATE=Shipping validated
+Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail
+Notify_MEMBER_VALIDATE=Member validated
+Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_SUBSCRIPTION=Member subscribed
+Notify_MEMBER_RESILIATE=Member terminated
+Notify_MEMBER_DELETE=Member deleted
+Notify_PROJECT_CREATE=Project creation
+Notify_TASK_CREATE=Task created
+Notify_TASK_MODIFY=Task modified
+Notify_TASK_DELETE=Task deleted
+Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
+Notify_EXPENSE_REPORT_APPROVE=Expense report approved
+Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
+Notify_HOLIDAY_APPROVE=Leave request approved
+SeeModuleSetup=See setup of module %s
+NbOfAttachedFiles=Number of attached files/documents
+TotalSizeOfAttachedFiles=Total size of attached files/documents
+MaxSize=Maximum size
+AttachANewFile=Attach a new file/document
+LinkedObject=Linked object
+NbOfActiveNotifications=Number of notifications (no. of recipient emails)
+PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to remind you that the invoice  __REF__ seems to have not been paid. A copy of the invoice is attached as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find commercial proposal __REF__ attached \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price request __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
+ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
+DemoFundation=Manage members of a foundation
+DemoFundation2=Manage members and bank account of a foundation
+DemoCompanyServiceOnly=Company or freelance selling service only
+DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
+DemoCompanyAll=Company with multiple activities (all main modules)
+CreatedBy=Created by %s
+ModifiedBy=Modified by %s
+ValidatedBy=Validated by %s
+ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made latest change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made latest change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
+FileWasRemoved=File %s was removed
+DirWasRemoved=Directory %s was removed
+FeatureNotYetAvailable=Feature not yet available in the current version
+FeaturesSupported=Supported features
+Width=Width
+Height=Height
+Depth=Depth
+Top=Top
+Bottom=Bottom
+Left=Left
+Right=Right
+CalculatedWeight=Calculated weight
+CalculatedVolume=Calculated volume
+Weight=Weight
+WeightUnitton=tonne
+WeightUnitkg=kg
+WeightUnitg=g
+WeightUnitmg=mg
+WeightUnitpound=pound
+WeightUnitounce=ounce
+Length=Length
+LengthUnitm=m
+LengthUnitdm=dm
+LengthUnitcm=cm
+LengthUnitmm=mm
+Surface=Area
+SurfaceUnitm2=m²
+SurfaceUnitdm2=dm²
+SurfaceUnitcm2=cm²
+SurfaceUnitmm2=mm²
+SurfaceUnitfoot2=ft²
+SurfaceUnitinch2=in²
+Volume=Volume
+VolumeUnitm3=m³
+VolumeUnitdm3=dm³ (L)
+VolumeUnitcm3=cm³ (ml)
+VolumeUnitmm3=mm³ (µl)
+VolumeUnitfoot3=ft³
+VolumeUnitinch3=in³
+VolumeUnitounce=ounce
+VolumeUnitlitre=litre
+VolumeUnitgallon=gallon
+SizeUnitm=m
+SizeUnitdm=dm
+SizeUnitcm=cm
+SizeUnitmm=mm
+SizeUnitinch=inch
+SizeUnitfoot=foot
+SizeUnitpoint=point
+BugTracker=Bug tracker
+SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
+BackToLoginPage=Back to login page
+AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
+EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
+ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
+DolibarrDemo=Dolibarr ERP/CRM demo
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of sales orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of vendor proposals
+NumberOfSupplierOrders=Number of purchase orders
+NumberOfSupplierInvoices=Number of vendor invoices
+NumberOfContracts=Number of contracts
+NumberOfMos=Number of manufacturing orders
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on sales orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on vendor proposals
+NumberOfUnitsSupplierOrders=Number of units on purchase orders
+NumberOfUnitsSupplierInvoices=Number of units on vendor invoices
+NumberOfUnitsContracts=Number of units on contracts
+NumberOfUnitsMos=Number of units to produce in manufacturing orders
+EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
+EMailTextInterventionValidated=The intervention %s has been validated.
+EMailTextInvoiceValidated=Invoice %s has been validated.
+EMailTextInvoicePayed=Invoice %s has been paid.
+EMailTextProposalValidated=Proposal %s has been validated.
+EMailTextProposalClosedSigned=Proposal %s has been closed signed.
+EMailTextOrderValidated=Order %s has been validated.
+EMailTextOrderApproved=Order %s has been approved.
+EMailTextOrderValidatedBy=Order %s has been recorded by %s.
+EMailTextOrderApprovedBy=Order %s has been approved by %s.
+EMailTextOrderRefused=Order %s has been refused.
+EMailTextOrderRefusedBy=Order %s has been refused by %s.
+EMailTextExpeditionValidated=Shipping %s has been validated.
+EMailTextExpenseReportValidated=Expense report %s has been validated.
+EMailTextExpenseReportApproved=Expense report %s has been approved.
+EMailTextHolidayValidated=Leave request %s has been validated.
+EMailTextHolidayApproved=Leave request %s has been approved.
+ImportedWithSet=Importation data set
+DolibarrNotification=Automatic notification
+ResizeDesc=Enter new width <b>OR</b> new height. Ratio will be kept during resizing...
+NewLength=New width
+NewHeight=New height
+NewSizeAfterCropping=New size after cropping
+DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner)
+CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
+ImageEditor=Image editor
+YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s.
+YouReceiveMailBecauseOfNotification2=This event is the following:
+ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start".
+UseAdvancedPerms=Use the advanced permissions of some modules
+FileFormat=File format
+SelectAColor=Choose a color
+AddFiles=Add Files
+StartUpload=Start upload
+CancelUpload=Cancel upload
+FileIsTooBig=Files is too big
+PleaseBePatient=Please be patient...
+NewPassword=New password
+ResetPassword=Reset password
+RequestToResetPasswordReceived=A request to change your password has been received.
+NewKeyIs=This is your new keys to login
+NewKeyWillBe=Your new key to login to software will be
+ClickHereToGoTo=Click here to go to %s
+YouMustClickToChange=You must however first click on the following link to validate this password change
+ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
+Chart=Chart
+PassEncoding=Password encoding
+PermissionsAdd=Permissions added
+PermissionsDelete=Permissions removed
+YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+YourPasswordHasBeenReset=Your password has been reset successfully
+ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+MissingIds=Missing ids
+ThirdPartyCreatedByEmailCollector=Third party created by email collector from email MSGID %s
+ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s
+ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
+TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
+OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+
+##### Export #####
+ExportsArea=Exports area
+AvailableFormats=Available formats
+LibraryUsed=Library used
+LibraryVersion=Library version
+ExportableDatas=Exportable data
+NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
+##### External sites #####
+WebsiteSetup=Setup of module website
+WEBSITE_PAGEURL=URL of page
+WEBSITE_TITLE=Title
+WEBSITE_DESCRIPTION=Description
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
+WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
+
+MemoryUsage=Memory usage
+RequestDuration=Duration of request
+PopuProp=Products/Services by popularity in Proposals
+PopuCom=Products/Services by popularity in Orders
+ProductStatistics=Products/Services Statistics
+NbOfQtyInOrders=Qty in orders
diff --git a/htdocs/langs/ne_NP/paybox.lang b/htdocs/langs/ne_NP/paybox.lang
new file mode 100644
index 00000000000..1bbbef4017b
--- /dev/null
+++ b/htdocs/langs/ne_NP/paybox.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - paybox
+PayBoxSetup=PayBox module setup
+PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+Creditor=Creditor
+PaymentCode=Payment code
+PayBoxDoPayment=Pay with Paybox
+YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
+Continue=Next
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
+YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/ne_NP/paypal.lang b/htdocs/langs/ne_NP/paypal.lang
new file mode 100644
index 00000000000..5eb5f389445
--- /dev/null
+++ b/htdocs/langs/ne_NP/paypal.lang
@@ -0,0 +1,36 @@
+# Dolibarr language file - Source file is en_US - paypal
+PaypalSetup=PayPal module setup
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
+PAYPAL_API_SANDBOX=Mode test/sandbox
+PAYPAL_API_USER=API username
+PAYPAL_API_PASSWORD=API password
+PAYPAL_API_SIGNATURE=API signature
+PAYPAL_SSLVERSION=Curl SSL Version
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
+PaypalModeIntegral=Integral
+PaypalModeOnlyPaypal=PayPal only
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
+ThisIsTransactionId=This is id of transaction: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
+NewOnlinePaymentReceived=New online payment received
+NewOnlinePaymentFailed=New online payment tried but failed
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
+ReturnURLAfterPayment=Return URL after payment
+ValidationOfOnlinePaymentFailed=Validation of online payment failed
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
+DetailedErrorMessage=Detailed Error Message
+ShortErrorMessage=Short Error Message
+ErrorCode=Error Code
+ErrorSeverityCode=Error Severity Code
+OnlinePaymentSystem=Online payment system
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/ne_NP/printing.lang b/htdocs/langs/ne_NP/printing.lang
new file mode 100644
index 00000000000..16494583550
--- /dev/null
+++ b/htdocs/langs/ne_NP/printing.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - printing
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
+PrintingSetup=Setup of Direct Printing System
+PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer without needing to open the document in another application.
+MenuDirectPrinting=Direct Printing jobs
+DirectPrint=Direct print
+PrintingDriverDesc=Configuration variables for printing driver.
+ListDrivers=List of drivers
+PrintTestDesc=List of Printers.
+FileWasSentToPrinter=File %s was sent to printer
+ViaModule=via the module
+NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
+PleaseSelectaDriverfromList=Please select a driver from list.
+PleaseConfigureDriverfromList=Please configure the selected driver from list.
+SetupDriver=Driver setup
+TargetedPrinter=Targeted printer
+UserConf=Setup per user
+PRINTGCP_INFO=Google OAuth API setup
+PRINTGCP_AUTHLINK=Authentication
+PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
+PrintGCPDesc=This driver allows sending documents directly to a printer using Google Cloud Print.
+GCP_Name=Name
+GCP_displayName=Display Name
+GCP_Id=Printer Id
+GCP_OwnerName=Owner Name
+GCP_State=Printer State
+GCP_connectionStatus=Online State
+GCP_Type=Printer Type
+PrintIPPDesc=This driver allows sending of documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+IPP_Uri=Printer Uri
+IPP_Name=Printer Name
+IPP_State=Printer State
+IPP_State_reason=State reason
+IPP_State_reason1=State reason1
+IPP_BW=BW
+IPP_Color=Color
+IPP_Device=Device
+IPP_Media=Printer media
+IPP_Supported=Type of media
+DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
+GoogleAuthNotConfigured=Google OAuth has not been setup. Enable module OAuth and set a Google ID/Secret.
+GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
+PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
+PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
+PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+PrintTestDescprintipp=List of Printers for Cups.
diff --git a/htdocs/langs/ne_NP/productbatch.lang b/htdocs/langs/ne_NP/productbatch.lang
new file mode 100644
index 00000000000..54270c4a23b
--- /dev/null
+++ b/htdocs/langs/ne_NP/productbatch.lang
@@ -0,0 +1,24 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Use lot/serial number
+ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusNotOnBatch=No (lot/serial not used)
+ProductStatusOnBatchShort=Yes
+ProductStatusNotOnBatchShort=No
+Batch=Lot/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
+batch_number=Lot/Serial number
+BatchNumberShort=Lot/Serial
+EatByDate=Eat-by date
+SellByDate=Sell-by date
+DetailBatchNumber=Lot/Serial details
+printBatch=Lot/Serial: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
+StockDetailPerBatch=Stock detail per lot
diff --git a/htdocs/langs/ne_NP/products.lang b/htdocs/langs/ne_NP/products.lang
new file mode 100644
index 00000000000..a31243a07b6
--- /dev/null
+++ b/htdocs/langs/ne_NP/products.lang
@@ -0,0 +1,385 @@
+# Dolibarr language file - Source file is en_US - products
+ProductRef=Product ref.
+ProductLabel=Product label
+ProductLabelTranslated=Translated product label
+ProductDescription=Product description
+ProductDescriptionTranslated=Translated product description
+ProductNoteTranslated=Translated product note
+ProductServiceCard=Products/Services card
+TMenuProducts=Products
+TMenuServices=Services
+Products=Products
+Services=Services
+Product=Product
+Service=Service
+ProductId=Product/service id
+Create=Create
+Reference=Reference
+NewProduct=New product
+NewService=New service
+ProductVatMassChange=Global VAT Update
+ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
+MassBarcodeInit=Mass barcode init
+MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
+ProductAccountancyBuyCode=Accounting code (purchase)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
+ProductAccountancySellCode=Accounting code (sale)
+ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
+ProductAccountancySellExportCode=Accounting code (sale export)
+ProductOrService=Product or Service
+ProductsAndServices=Products and Services
+ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
+ProductsOnSale=Products for sale
+ProductsOnPurchase=Products for purchase
+ProductsOnSaleOnly=Products for sale only
+ProductsOnPurchaseOnly=Products for purchase only
+ProductsNotOnSell=Products not for sale and not for purchase
+ProductsOnSellAndOnBuy=Products for sale and for purchase
+ServicesOnSale=Services for sale
+ServicesOnPurchase=Services for purchase
+ServicesOnSaleOnly=Services for sale only
+ServicesOnPurchaseOnly=Services for purchase only
+ServicesNotOnSell=Services not for sale and not for purchase
+ServicesOnSellAndOnBuy=Services for sale and for purchase
+LastModifiedProductsAndServices=Last %s modified products/services
+LastRecordedProducts=Latest %s recorded products
+LastRecordedServices=Latest %s recorded services
+CardProduct0=Product
+CardProduct1=Service
+Stock=Stock
+MenuStocks=Stocks
+Stocks=Stocks and location (warehouse) of products
+Movements=Movements
+Sell=Sell
+Buy=Purchase
+OnSell=For sale
+OnBuy=For purchase
+NotOnSell=Not for sale
+ProductStatusOnSell=For sale
+ProductStatusNotOnSell=Not for sale
+ProductStatusOnSellShort=For sale
+ProductStatusNotOnSellShort=Not for sale
+ProductStatusOnBuy=For purchase
+ProductStatusNotOnBuy=Not for purchase
+ProductStatusOnBuyShort=For purchase
+ProductStatusNotOnBuyShort=Not for purchase
+UpdateVAT=Update vat
+UpdateDefaultPrice=Update default price
+UpdateLevelPrices=Update prices for each level
+AppliedPricesFrom=Applied from
+SellingPrice=Selling price
+SellingPriceHT=Selling price (excl. tax)
+SellingPriceTTC=Selling price (inc. tax)
+SellingMinPriceTTC=Minimum Selling price (inc. tax)
+CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceUsage=This value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
+NewPrice=New price
+MinPrice=Min. sell price
+EditSellingPriceLabel=Edit selling price label
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
+ContractStatusClosed=Closed
+ErrorProductAlreadyExists=A product with reference %s already exists.
+ErrorProductBadRefOrLabel=Wrong value for reference or label.
+ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
+Suppliers=Vendors
+SupplierRef=Vendor SKU
+ShowProduct=Show product
+ShowService=Show service
+ProductsAndServicesArea=Product and Services area
+ProductsArea=Product area
+ServicesArea=Services area
+ListOfStockMovements=List of stock movements
+BuyingPrice=Buying price
+PriceForEachProduct=Products with specific prices
+SupplierCard=Vendor card
+PriceRemoved=Price removed
+BarCode=Barcode
+BarcodeType=Barcode type
+SetDefaultBarcodeType=Set barcode type
+BarcodeValue=Barcode value
+NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
+ServiceLimitedDuration=If product is a service with limited duration:
+MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
+MultiPricesNumPrices=Number of prices
+AssociatedProductsAbility=Activate virtual products (kits)
+AssociatedProducts=Virtual products
+AssociatedProductsNumber=Number of products composing this virtual product
+ParentProductsNumber=Number of parent packaging product
+ParentProducts=Parent products
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+KeywordFilter=Keyword filter
+CategoryFilter=Category filter
+ProductToAddSearch=Search product to add
+NoMatchFound=No match found
+ListOfProductsServices=List of products/services
+ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
+ProductParentList=List of virtual products/services with this product as a component
+ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
+DeleteProduct=Delete a product/service
+ConfirmDeleteProduct=Are you sure you want to delete this product/service?
+ProductDeleted=Product/Service "%s" deleted from database.
+ExportDataset_produit_1=Products
+ExportDataset_service_1=Services
+ImportDataset_produit_1=Products
+ImportDataset_service_1=Services
+DeleteProductLine=Delete product line
+ConfirmDeleteProductLine=Are you sure you want to delete this product line?
+ProductSpecial=Special
+QtyMin=Min. purchase quantity
+PriceQtyMin=Price quantity min.
+PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
+VATRateForSupplierProduct=VAT Rate (for this vendor/product)
+DiscountQtyMin=Discount for this qty.
+NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
+NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedProductsToSell=Predefined Product
+PredefinedServicesToSell=Predefined Service
+PredefinedProductsAndServicesToSell=Predefined products/services to sell
+PredefinedProductsToPurchase=Predefined product to purchase
+PredefinedServicesToPurchase=Predefined services to purchase
+PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
+NotPredefinedProducts=Not predefined products/services
+GenerateThumb=Generate thumb
+ServiceNb=Service #%s
+ListProductServiceByPopularity=List of products/services by popularity
+ListProductByPopularity=List of products by popularity
+ListServiceByPopularity=List of services by popularity
+Finished=Manufactured product
+RowMaterial=Raw Material
+ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
+CloneContentProduct=Clone all main information of product/service
+ClonePricesProduct=Clone prices
+CloneCategoriesProduct=Clone tags/categories linked
+CloneCompositionProduct=Clone virtual product/service
+CloneCombinationsProduct=Clone product variants
+ProductIsUsed=This product is used
+NewRefForClone=Ref. of new product/service
+SellingPrices=Selling prices
+BuyingPrices=Buying prices
+CustomerPrices=Customer prices
+SuppliersPrices=Vendor prices
+SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
+CustomCode=Customs / Commodity / HS code
+CountryOrigin=Origin country
+Nature=Nature of product (material/finished)
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+lm=lm
+m2=m²
+m3=m³
+liter=liter
+l=L
+unitP=Piece
+unitSET=Set
+unitS=Second
+unitH=Hour
+unitD=Day
+unitG=Gram
+unitM=Meter
+unitLM=Linear meter
+unitM2=Square meter
+unitM3=Cubic meter
+unitL=Liter
+unitT=ton
+unitKG=kg
+unitG=Gram
+unitMG=mg
+unitLB=pound
+unitOZ=ounce
+unitM=Meter
+unitDM=dm
+unitCM=cm
+unitMM=mm
+unitFT=ft
+unitIN=in
+unitM2=Square meter
+unitDM2=dm²
+unitCM2=cm²
+unitMM2=mm²
+unitFT2=ft²
+unitIN2=in²
+unitM3=Cubic meter
+unitDM3=dm³
+unitCM3=cm³
+unitMM3=mm³
+unitFT3=ft³
+unitIN3=in³
+unitOZ3=ounce
+unitgallon=gallon
+ProductCodeModel=Product ref template
+ServiceCodeModel=Service ref template
+CurrentProductPrice=Current price
+AlwaysUseNewPrice=Always use current price of product/service
+AlwaysUseFixedPrice=Use the fixed price
+PriceByQuantity=Different prices by quantity
+DisablePriceByQty=Disable prices by quantity
+PriceByQuantityRange=Quantity range
+MultipriceRules=Price segment rules
+UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
+PercentVariationOver=%% variation over %s
+PercentDiscountOver=%% discount over %s
+KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
+VariantRefExample=Examples: COL, SIZE
+VariantLabelExample=Examples: Color, Size
+### composition fabrication
+Build=Produce
+ProductsMultiPrice=Products and prices for each price segment
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
+ProductSellByQuarterHT=Products turnover quarterly before tax
+ServiceSellByQuarterHT=Services turnover quarterly before tax
+Quarter1=1st. Quarter
+Quarter2=2nd. Quarter
+Quarter3=3rd. Quarter
+Quarter4=4th. Quarter
+BarCodePrintsheet=Print barcode
+PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
+NumberOfStickers=Number of stickers to print on page
+PrintsheetForOneBarCode=Print several stickers for one barcode
+BuildPageToPrint=Generate page to print
+FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
+FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
+DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
+BarCodeDataForProduct=Barcode information of product %s:
+BarCodeDataForThirdparty=Barcode information of third party %s:
+ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
+PriceByCustomer=Different prices for each customer
+PriceCatalogue=A single sell price per product/service
+PricingRule=Rules for selling prices
+AddCustomerPrice=Add price by customer
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+PriceByCustomerLog=Log of previous customer prices
+MinimumPriceLimit=Minimum price can't be lower then %s
+MinimumRecommendedPrice=Minimum recommended price is: %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
+PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=Available global values:
+PriceMode=Price mode
+PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Child products
+MinSupplierPrice=Minimum buying price
+MinCustomerPrice=Minimum selling price
+DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
+AddVariable=Add Variable
+AddUpdater=Add Updater
+GlobalVariables=Global variables
+VariableToUpdate=Variable to update
+GlobalVariableUpdaters=External updaters for variables
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Latest update
+CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product/service with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
+WarningSelectOneDocument=Please select at least one document
+DefaultUnitToShow=Unit
+NbOfQtyInProposals=Qty in proposals
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+ProductsOrServicesTranslations=Products/Services translations
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+WidthUnits=Width unit
+LengthUnits=Length unit
+HeightUnits=Height unit
+SurfaceUnits=Surface unit
+SizeUnits=Size unit
+DeleteProductBuyPrice=Delete buying price
+ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
+ProductSheet=Product sheet
+ServiceSheet=Service sheet
+PossibleValues=Possible values
+GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
+ProductSupplierDescription=Vendor description for the product
+UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
+PackagingForThisProduct=Packaging
+QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+
+#Attributes
+VariantAttributes=Variant attributes
+ProductAttributes=Variant attributes for products
+ProductAttributeName=Variant attribute %s
+ProductAttribute=Variant attribute
+ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
+ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
+ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
+ProductCombinations=Variants
+PropagateVariant=Propagate variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+NewProductCombinations=New variants
+EditProductCombinations=Editing variants
+SelectCombination=Select combination
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+NewProductAttributeValue=New attribute value
+ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
+ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
+TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
+DoNotRemovePreviousCombinations=Do not remove previous variants
+UsePercentageVariations=Use percentage variations
+PercentageVariation=Percentage variation
+ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
+NbOfDifferentValues=No. of different values
+NbProducts=Number of products
+ParentProduct=Parent product
+HideChildProducts=Hide variant products
+ShowChildProducts=Show variant products
+NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
+ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
+CloneDestinationReference=Destination product reference
+ErrorCopyProductCombinations=There was an error while copying the product variants
+ErrorDestinationProductNotFound=Destination product not found
+ErrorProductCombinationNotFound=Product variant not found
+ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
+ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
+DeleteLinkedProduct=Delete the child product linked to the combination
diff --git a/htdocs/langs/ne_NP/projects.lang b/htdocs/langs/ne_NP/projects.lang
new file mode 100644
index 00000000000..bb42bff3c87
--- /dev/null
+++ b/htdocs/langs/ne_NP/projects.lang
@@ -0,0 +1,267 @@
+# Dolibarr language file - Source file is en_US - projects
+RefProject=Ref. project
+ProjectRef=Project ref.
+ProjectId=Project Id
+ProjectLabel=Project label
+ProjectsArea=Projects Area
+ProjectStatus=Project status
+SharedProject=Everybody
+PrivateProject=Project contacts
+ProjectsImContactFor=Projects for I am explicitly a contact
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=All projects
+MyProjectsDesc=This view is limited to projects you are a contact for
+ProjectsPublicDesc=This view presents all projects you are allowed to read.
+TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
+TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
+ClosedProjectsAreHidden=Closed projects are not visible.
+TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
+TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
+NewProject=New project
+AddProject=Create project
+DeleteAProject=Delete a project
+DeleteATask=Delete a task
+ConfirmDeleteAProject=Are you sure you want to delete this project?
+ConfirmDeleteATask=Are you sure you want to delete this task?
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
+OpportunitiesStatusForProjects=Leads amount of projects by status
+ShowProject=Show project
+ShowTask=Show task
+SetProject=Set project
+NoProject=No project defined or owned
+NbOfProjects=Number of projects
+NbOfTasks=Number of tasks
+TimeSpent=Time spent
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
+TimesSpent=Time spent
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
+TaskTimeSpent=Time spent on tasks
+TaskTimeUser=User
+TaskTimeNote=Note
+TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on open projects
+WorkloadNotDefined=Workload not defined
+NewTimeSpent=Time spent
+MyTimeSpent=My time spent
+BillTime=Bill the time spent
+BillTimeShort=Bill time
+TimeToBill=Time not billed
+TimeBilled=Time billed
+Tasks=Tasks
+Task=Task
+TaskDateStart=Task start date
+TaskDateEnd=Task end date
+TaskDescription=Task description
+NewTask=New task
+AddTask=Create task
+AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
+AddHereTimeSpentForWeek=Add here time spent for this week/task
+Activity=Activity
+Activities=Tasks/activities
+MyActivities=My tasks/activities
+MyProjects=My projects
+MyProjectsArea=My projects Area
+DurationEffective=Effective duration
+ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently open tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
+ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
+Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GanttView=Gantt View
+ListProposalsAssociatedProject=List of the commercial proposals related to the project
+ListOrdersAssociatedProject=List of sales orders related to the project
+ListInvoicesAssociatedProject=List of customer invoices related to the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
+ListSupplierOrdersAssociatedProject=List of purchase orders related to the project
+ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project
+ListContractAssociatedProject=List of contracts related to the project
+ListShippingAssociatedProject=List of shippings related to the project
+ListFichinterAssociatedProject=List of interventions related to the project
+ListExpenseReportsAssociatedProject=List of expense reports related to the project
+ListDonationsAssociatedProject=List of donations related to the project
+ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
+ListSalariesAssociatedProject=List of payments of salaries related to the project
+ListActionsAssociatedProject=List of events related to the project
+ListMOAssociatedProject=List of manufacturing orders related to the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
+ActivityOnProjectToday=Activity on project today
+ActivityOnProjectYesterday=Activity on project yesterday
+ActivityOnProjectThisWeek=Activity on project this week
+ActivityOnProjectThisMonth=Activity on project this month
+ActivityOnProjectThisYear=Activity on project this year
+ChildOfProjectTask=Child of project/task
+ChildOfTask=Child of task
+TaskHasChild=Task has child
+NotOwnerOfProject=Not owner of this private project
+AffectedTo=Allocated to
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
+ValidateProject=Validate projet
+ConfirmValidateProject=Are you sure you want to validate this project?
+CloseAProject=Close project
+ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+ReOpenAProject=Open project
+ConfirmReOpenAProject=Are you sure you want to re-open this project?
+ProjectContact=Contacts of project
+TaskContact=Task contacts
+ActionsOnProject=Events on project
+YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
+DeleteATimeSpent=Delete time spent
+ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
+TaskRessourceLinks=Contacts of task
+ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
+NoTasks=No tasks for this project
+LinkedToAnotherCompany=Linked to other third party
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
+ErrorTimeSpentIsEmpty=Time spent is empty
+ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
+IfNeedToUseOtherObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
+CloneTasks=Clone tasks
+CloneContacts=Clone contacts
+CloneNotes=Clone notes
+CloneProjectFiles=Clone project joined files
+CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
+CloneMoveDate=Update project/tasks dates from now?
+ConfirmCloneProject=Are you sure to clone this project?
+ProjectReportDate=Change task dates according to new project start date
+ErrorShiftTaskDate=Impossible to shift task date according to new project start date
+ProjectsAndTasksLines=Projects and tasks
+ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
+ProjectModifiedInDolibarr=Project %s modified
+TaskCreatedInDolibarr=Task %s created
+TaskModifiedInDolibarr=Task %s modified
+TaskDeletedInDolibarr=Task %s deleted
+OpportunityStatus=Lead status
+OpportunityStatusShort=Lead status
+OpportunityProbability=Lead probability
+OpportunityProbabilityShort=Lead probab.
+OpportunityAmount=Lead amount
+OpportunityAmountShort=Lead amount
+OpportunityWeightedAmount=Opportunity weighted amount
+OpportunityWeightedAmountShort=Opp. weighted amount
+OpportunityAmountAverageShort=Average lead amount
+OpportunityAmountWeigthedShort=Weighted lead amount
+WonLostExcluded=Won/Lost excluded
+##### Types de contacts #####
+TypeContact_project_internal_PROJECTLEADER=Project leader
+TypeContact_project_external_PROJECTLEADER=Project leader
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_task_internal_TASKEXECUTIVE=Task executive
+TypeContact_project_task_external_TASKEXECUTIVE=Task executive
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
+TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
+SelectElement=Select element
+AddElement=Link to element
+# Documents models
+DocumentModelBeluga=Project document template for linked objects overview
+DocumentModelBaleine=Project document template for tasks
+DocumentModelTimeSpent=Project report template for time spent
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+ProjectReferers=Related items
+ProjectMustBeValidatedFirst=Project must be validated first
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerMonth=Input per month
+InputDetail=Input detail
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTheTask=Not assigned to the task
+NoUserAssignedToTheProject=No users assigned to this project
+TimeSpentBy=Time spent by
+TasksAssignedTo=Tasks assigned to
+AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
+AssignTask=Assign
+ProjectOverview=Overview
+ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
+ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
+ProjectNbProjectByMonth=No. of created projects by month
+ProjectNbTaskByMonth=No. of created tasks by month
+ProjectOppAmountOfProjectsByMonth=Amount of leads by month
+ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
+ProjectOpenedProjectByOppStatus=Open project/lead by lead status
+ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
+TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
+IdTaskTime=Id task time
+YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
+OpenedProjectsByThirdparties=Open projects by third parties
+OnlyOpportunitiesShort=Only leads
+OpenedOpportunitiesShort=Open leads
+NotOpenedOpportunitiesShort=Not an open lead
+NotAnOpportunityShort=Not a lead
+OpportunityTotalAmount=Total amount of leads
+OpportunityPonderatedAmount=Weighted amount of leads
+OpportunityPonderatedAmountDesc=Leads amount weighted with probability
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWON=Won
+OppStatusLOST=Lost
+Budget=Budget
+AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
+LatestProjects=Latest %s projects
+LatestModifiedProjects=Latest %s modified projects
+OtherFilteredTasks=Other filtered tasks
+NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
+ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+# Comments trans
+AllowCommentOnTask=Allow user comments on tasks
+AllowCommentOnProject=Allow user comments on projects
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=Information project %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
+NewTaskRefSuggested=Task ref already used, a new task ref is required
+TimeSpentInvoiced=Time spent billed
+TimeSpentForInvoice=Time spent
+OneLinePerUser=One line per user
+ServiceToUseOnLines=Service to use on lines
+InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
+ProjectFollowOpportunity=Follow opportunity
+ProjectFollowTasks=Follow tasks or time spent
+Usage=Usage
+UsageOpportunity=Usage: Opportunity
+UsageTasks=Usage: Tasks
+UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=New invoice
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/ne_NP/propal.lang b/htdocs/langs/ne_NP/propal.lang
new file mode 100644
index 00000000000..71d6857c909
--- /dev/null
+++ b/htdocs/langs/ne_NP/propal.lang
@@ -0,0 +1,86 @@
+# Dolibarr language file - Source file is en_US - propal
+Proposals=Commercial proposals
+Proposal=Commercial proposal
+ProposalShort=Proposal
+ProposalsDraft=Draft commercial proposals
+ProposalsOpened=Open commercial proposals
+CommercialProposal=Commercial proposal
+PdfCommercialProposalTitle=Commercial proposal
+ProposalCard=Proposal card
+NewProp=New commercial proposal
+NewPropal=New proposal
+Prospect=Prospect
+DeleteProp=Delete commercial proposal
+ValidateProp=Validate commercial proposal
+AddProp=Create proposal
+ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
+ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
+LastPropals=Latest %s proposals
+LastModifiedProposals=Latest %s modified proposals
+AllPropals=All proposals
+SearchAProposal=Search a proposal
+NoProposal=No proposal
+ProposalsStatistics=Commercial proposal's statistics
+NumberOfProposalsByMonth=Number by month
+AmountOfProposalsByMonthHT=Amount by month (excl. tax)
+NbOfProposals=Number of commercial proposals
+ShowPropal=Show proposal
+PropalsDraft=Drafts
+PropalsOpened=Open
+PropalStatusDraft=Draft (needs to be validated)
+PropalStatusValidated=Validated (proposal is open)
+PropalStatusSigned=Signed (needs billing)
+PropalStatusNotSigned=Not signed (closed)
+PropalStatusBilled=Billed
+PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated (open)
+PropalStatusClosedShort=Closed
+PropalStatusSignedShort=Signed
+PropalStatusNotSignedShort=Not signed
+PropalStatusBilledShort=Billed
+PropalsToClose=Commercial proposals to close
+PropalsToBill=Signed commercial proposals to bill
+ListOfProposals=List of commercial proposals
+ActionsOnPropal=Events on proposal
+RefProposal=Commercial proposal ref
+SendPropalByMail=Send commercial proposal by mail
+DatePropal=Date of proposal
+DateEndPropal=Validity ending date
+ValidityDuration=Validity duration
+CloseAs=Set status to
+SetAcceptedRefused=Set accepted/refused
+ErrorPropalNotFound=Propal %s not found
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
+CopyPropalFrom=Create commercial proposal by copying existing proposal
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
+DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
+ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
+ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
+ProposalsAndProposalsLines=Commercial proposal and lines
+ProposalLine=Proposal line
+AvailabilityPeriod=Availability delay
+SetAvailability=Set availability delay
+AfterOrder=after order
+OtherProposals=Other proposals
+##### Availability #####
+AvailabilityTypeAV_NOW=Immediate
+AvailabilityTypeAV_1W=1 week
+AvailabilityTypeAV_2W=2 weeks
+AvailabilityTypeAV_3W=3 weeks
+AvailabilityTypeAV_1M=1 month
+##### Types de contacts #####
+TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
+TypeContact_propal_external_BILLING=Customer invoice contact
+TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
+TypeContact_propal_external_SHIPPING=Customer contact for delivery
+# Document models
+DocModelAzurDescription=A complete proposal model (old implementation of Cyan template)
+DocModelCyanDescription=A complete proposal model
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
+ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/ne_NP/receiptprinter.lang b/htdocs/langs/ne_NP/receiptprinter.lang
new file mode 100644
index 00000000000..896eaa313dd
--- /dev/null
+++ b/htdocs/langs/ne_NP/receiptprinter.lang
@@ -0,0 +1,95 @@
+# Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
+PrinterAdded=Printer %s added
+PrinterUpdated=Printer %s updated
+PrinterDeleted=Printer %s deleted
+TestSentToPrinter=Test Sent To Printer %s
+ReceiptPrinter=Receipt printers
+ReceiptPrinterDesc=Setup of receipt printers
+ReceiptPrinterTemplateDesc=Setup of Templates
+ReceiptPrinterTypeDesc=Description of Receipt Printer's type
+ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
+ListPrinters=List of Printers
+SetupReceiptTemplate=Template Setup
+CONNECTOR_DUMMY=Dummy Printer
+CONNECTOR_NETWORK_PRINT=Network Printer
+CONNECTOR_FILE_PRINT=Local Printer
+CONNECTOR_WINDOWS_PRINT=Local Windows Printer
+CONNECTOR_CUPS_PRINT=Cups Printer
+CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
+CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
+CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
+CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
+PROFILE_DEFAULT=Default Profile
+PROFILE_SIMPLE=Simple Profile
+PROFILE_EPOSTEP=Epos Tep Profile
+PROFILE_P822D=P822D Profile
+PROFILE_STAR=Star Profile
+PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
+PROFILE_SIMPLE_HELP=Simple Profile No Graphics
+PROFILE_EPOSTEP_HELP=Epos Tep Profile
+PROFILE_P822D_HELP=P822D Profile No Graphics
+PROFILE_STAR_HELP=Star Profile
+DOL_LINE_FEED=Skip line
+DOL_ALIGN_LEFT=Left align text
+DOL_ALIGN_CENTER=Center text
+DOL_ALIGN_RIGHT=Right align text
+DOL_USE_FONT_A=Use font A of printer
+DOL_USE_FONT_B=Use font B of printer
+DOL_USE_FONT_C=Use font C of printer
+DOL_PRINT_BARCODE=Print barcode
+DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
+DOL_CUT_PAPER_FULL=Cut ticket completely
+DOL_CUT_PAPER_PARTIAL=Cut ticket partially
+DOL_OPEN_DRAWER=Open cash drawer
+DOL_ACTIVATE_BUZZER=Activate buzzer
+DOL_PRINT_QRCODE=Print QR Code
+DOL_PRINT_LOGO=Print logo of my company
+DOL_PRINT_LOGO_OLD=Print logo of my company (old printers)
+DOL_BOLD=Bold
+DOL_BOLD_DISABLED=Disable bold
+DOL_DOUBLE_HEIGHT=Double height size
+DOL_DOUBLE_WIDTH=Double width size
+DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
+DOL_UNDERLINE=Enable underline
+DOL_UNDERLINE_DISABLED=Disable underline
+DOL_BEEP=Beed sound
+DOL_PRINT_TEXT=Print text
+DOL_VALUE_DATE=Invoice date
+DOL_VALUE_DATE_TIME=Invoice date and time
+DOL_VALUE_YEAR=Invoice year
+DOL_VALUE_MONTH_LETTERS=Invoice month in letters
+DOL_VALUE_MONTH=Invoice month
+DOL_VALUE_DAY=Invoice day
+DOL_VALUE_DAY_LETTERS=Inovice day in letters
+DOL_LINE_FEED_REVERSE=Line feed reverse
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Invoice ref
+DOL_PRINT_OBJECT_LINES=Invoice lines
+DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
+DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
+DOL_VALUE_CUSTOMER_MAIL=Customer mail
+DOL_VALUE_CUSTOMER_PHONE=Customer phone
+DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
+DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
+DOL_VALUE_MYSOC_NAME=Your company name
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/ne_NP/receptions.lang b/htdocs/langs/ne_NP/receptions.lang
new file mode 100644
index 00000000000..010a7521846
--- /dev/null
+++ b/htdocs/langs/ne_NP/receptions.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - receptions
+ReceptionsSetup=Product Reception setup
+RefReception=Ref. reception
+Reception=Reception
+Receptions=Receptions
+AllReceptions=All Receptions
+Reception=Reception
+Receptions=Receptions
+ShowReception=Show Receptions
+ReceptionsArea=Receptions area
+ListOfReceptions=List of receptions
+ReceptionMethod=Reception method
+LastReceptions=Latest %s receptions
+StatisticsOfReceptions=Statistics for receptions
+NbOfReceptions=Number of receptions
+NumberOfReceptionsByMonth=Number of receptions by month
+ReceptionCard=Reception card
+NewReception=New reception
+CreateReception=Create reception
+QtyInOtherReceptions=Qty in other receptions
+OtherReceptionsForSameOrder=Other receptions for this order
+ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
+ReceptionsToValidate=Receptions to validate
+StatusReceptionCanceled=Canceled
+StatusReceptionDraft=Draft
+StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionProcessed=Processed
+StatusReceptionDraftShort=Draft
+StatusReceptionValidatedShort=Validated
+StatusReceptionProcessedShort=Processed
+ReceptionSheet=Reception sheet
+ConfirmDeleteReception=Are you sure you want to delete this reception?
+ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
+ConfirmCancelReception=Are you sure you want to cancel this reception?
+StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
+SendReceptionByEMail=Send reception by email
+SendReceptionRef=Submission of reception %s
+ActionsOnReception=Events on reception
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the order card.
+ReceptionLine=Reception line
+ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
+ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
+ReceptionsNumberingModules=Numbering module for receptions
+ReceptionsReceiptModel=Document templates for receptions
diff --git a/htdocs/langs/ne_NP/resource.lang b/htdocs/langs/ne_NP/resource.lang
new file mode 100644
index 00000000000..e8574dc680f
--- /dev/null
+++ b/htdocs/langs/ne_NP/resource.lang
@@ -0,0 +1,39 @@
+# Dolibarr language file - Source file is en_US - resource
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+ActionsOnResource=Events about this resource
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResource=Show resource
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+SelectResource=Select resource
+
+IdResource=Id resource
+AssetNumber=Serial number
+ResourceTypeCode=Resource type code
+ImportDataset_resource_1=Resources
+
+ErrorResourcesAlreadyInUse=Some resources are in use
+ErrorResourceUseInEvent=%s used in %s event
diff --git a/htdocs/langs/ne_NP/salaries.lang b/htdocs/langs/ne_NP/salaries.lang
new file mode 100644
index 00000000000..7c3c08a65bd
--- /dev/null
+++ b/htdocs/langs/ne_NP/salaries.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+Salary=Salary
+Salaries=Salaries
+NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
+SalaryPayment=Salary payment
+SalariesPayments=Salaries payments
+ShowSalaryPayment=Show salary payment
+THM=Average hourly rate
+TJM=Average daily rate
+CurrentSalary=Current salary
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/ne_NP/sendings.lang b/htdocs/langs/ne_NP/sendings.lang
new file mode 100644
index 00000000000..5ce3b7f67e9
--- /dev/null
+++ b/htdocs/langs/ne_NP/sendings.lang
@@ -0,0 +1,74 @@
+# Dolibarr language file - Source file is en_US - sendings
+RefSending=Ref. shipment
+Sending=Shipment
+Sendings=Shipments
+AllSendings=All Shipments
+Shipment=Shipment
+Shipments=Shipments
+ShowSending=Show Shipments
+Receivings=Delivery Receipts
+SendingsArea=Shipments area
+ListOfSendings=List of shipments
+SendingMethod=Shipping method
+LastSendings=Latest %s shipments
+StatisticsOfSendings=Statistics for shipments
+NbOfSendings=Number of shipments
+NumberOfShipmentsByMonth=Number of shipments by month
+SendingCard=Shipment card
+NewSending=New shipment
+CreateShipment=Create shipment
+QtyShipped=Qty shipped
+QtyShippedShort=Qty ship.
+QtyPreparedOrShipped=Qty prepared or shipped
+QtyToShip=Qty to ship
+QtyToReceive=Qty to receive
+QtyReceived=Qty received
+QtyInOtherShipments=Qty in other shipments
+KeepToShip=Remain to ship
+KeepToShipShort=Remain
+OtherSendingsForSameOrder=Other shipments for this order
+SendingsAndReceivingForSameOrder=Shipments and receipts for this order
+SendingsToValidate=Shipments to validate
+StatusSendingCanceled=Canceled
+StatusSendingDraft=Draft
+StatusSendingValidated=Validated (products to ship or already shipped)
+StatusSendingProcessed=Processed
+StatusSendingDraftShort=Draft
+StatusSendingValidatedShort=Validated
+StatusSendingProcessedShort=Processed
+SendingSheet=Shipment sheet
+ConfirmDeleteSending=Are you sure you want to delete this shipment?
+ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
+ConfirmCancelSending=Are you sure you want to cancel this shipment?
+DocumentModelMerou=Merou A5 model
+WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+DateDeliveryPlanned=Planned date of delivery
+RefDeliveryReceipt=Ref delivery receipt
+StatusReceipt=Status delivery receipt
+DateReceived=Date delivery received
+ClassifyReception=Classify reception
+SendShippingByEMail=Send shipment by email
+SendShippingRef=Submission of shipment %s
+ActionsOnShipping=Events on shipment
+LinkToTrackYourPackage=Link to track your package
+ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
+ShipmentLine=Shipment line
+ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
+ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
+ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
+NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+
+# Sending methods
+# ModelDocument
+DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty: %d)
diff --git a/htdocs/langs/ne_NP/sms.lang b/htdocs/langs/ne_NP/sms.lang
new file mode 100644
index 00000000000..055085eb16a
--- /dev/null
+++ b/htdocs/langs/ne_NP/sms.lang
@@ -0,0 +1,51 @@
+# Dolibarr language file - Source file is en_US - sms
+Sms=Sms
+SmsSetup=SMS setup
+SmsDesc=This page allows you to define global options on SMS features
+SmsCard=SMS Card
+AllSms=All SMS campaigns
+SmsTargets=Targets
+SmsRecipients=Targets
+SmsRecipient=Target
+SmsTitle=Description
+SmsFrom=Sender
+SmsTo=Target
+SmsTopic=Topic of SMS
+SmsText=Message
+SmsMessage=SMS Message
+ShowSms=Show SMS
+ListOfSms=List SMS campaigns
+NewSms=New SMS campaign
+EditSms=Edit SMS
+ResetSms=New sending
+DeleteSms=Delete SMS campaign
+DeleteASms=Remove a SMS campaign
+PreviewSms=Previuw SMS
+PrepareSms=Prepare SMS
+CreateSms=Create SMS
+SmsResult=Result of SMS sending
+TestSms=Test SMS
+ValidSms=Validate SMS
+ApproveSms=Approve SMS
+SmsStatusDraft=Draft
+SmsStatusValidated=Validated
+SmsStatusApproved=Approved
+SmsStatusSent=Sent
+SmsStatusSentPartialy=Sent partially
+SmsStatusSentCompletely=Sent completely
+SmsStatusError=Error
+SmsStatusNotSent=Not sent
+SmsSuccessfulySent=SMS correctly sent (from %s to %s)
+ErrorSmsRecipientIsEmpty=Number of target is empty
+WarningNoSmsAdded=No new phone number to add to target list
+ConfirmValidSms=Do you confirm validation of this campaign?
+NbOfUniqueSms=No. of unique phone numbers
+NbOfSms=No. of phone numbers
+ThisIsATestMessage=This is a test message
+SendSms=Send SMS
+SmsInfoCharRemain=No. of remaining characters
+SmsInfoNumero= (international format i.e.: +33899701761)
+DelayBeforeSending=Delay before sending (minutes)
+SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
+SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider.
+DisableStopIfSupported=Disable STOP message (if supported)
diff --git a/htdocs/langs/ne_NP/stocks.lang b/htdocs/langs/ne_NP/stocks.lang
new file mode 100644
index 00000000000..9856649b834
--- /dev/null
+++ b/htdocs/langs/ne_NP/stocks.lang
@@ -0,0 +1,220 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseCard=Warehouse card
+Warehouse=Warehouse
+Warehouses=Warehouses
+ParentWarehouse=Parent warehouse
+NewWarehouse=New warehouse / Stock Location
+WarehouseEdit=Modify warehouse
+MenuNewWarehouse=New warehouse
+WarehouseSource=Source warehouse
+WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
+AddOne=Add one
+DefaultWarehouse=Default warehouse
+WarehouseTarget=Target warehouse
+ValidateSending=Delete sending
+CancelSending=Cancel sending
+DeleteSending=Delete sending
+Stock=Stock
+Stocks=Stocks
+StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
+Movements=Movements
+ErrorWarehouseRefRequired=Warehouse reference name is required
+ListOfWarehouses=List of warehouses
+ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
+MovementId=Movement ID
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
+StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
+Location=Location
+LocationSummary=Short name location
+NumberOfDifferentProducts=Number of different products
+NumberOfProducts=Total number of products
+LastMovement=Latest movement
+LastMovements=Latest movements
+Units=Units
+Unit=Unit
+StockCorrection=Stock correction
+CorrectStock=Correct stock
+StockTransfer=Stock transfer
+TransferStock=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
+NumberOfUnit=Number of units
+UnitPurchaseValue=Unit purchase price
+StockTooLow=Stock too low
+StockLowerThanLimit=Stock lower than alert limit (%s)
+EnhancedValue=Value
+PMPValue=Weighted average price
+PMPValueShort=WAP
+EnhancedValueOfWarehouses=Warehouses value
+UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
+QtyDispatched=Quantity dispatched
+QtyDispatchedShort=Qty dispatched
+QtyToDispatchShort=Qty to dispatch
+OrderDispatch=Item receipts
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
+DeStockOnShipment=Decrease real stocks on shipping validation
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
+OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
+StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
+NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
+DispatchVerb=Dispatch
+StockLimitShort=Limit for alert
+StockLimit=Stock limit for alert
+StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+PhysicalStock=Physical Stock
+RealStock=Real Stock
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
+VirtualStock=Virtual stock
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+IdWarehouse=Id warehouse
+DescWareHouse=Description warehouse
+LieuWareHouse=Localisation warehouse
+WarehousesAndProducts=Warehouses and products
+WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
+AverageUnitPricePMPShort=Weighted average input price
+AverageUnitPricePMP=Weighted average input price
+SellPriceMin=Selling Unit Price
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
+EstimatedStockValueShort=Input stock value
+EstimatedStockValue=Input stock value
+DeleteAWarehouse=Delete a warehouse
+ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
+PersonalStock=Personal stock %s
+ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
+SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
+SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
+NoStockAction=No stock action
+DesiredStock=Desired Stock
+DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
+StockToBuy=To order
+Replenishment=Replenishment
+ReplenishmentOrders=Replenishment orders
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
+UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+UseVirtualStock=Use virtual stock
+UsePhysicalStock=Use physical stock
+CurentSelectionMode=Current selection mode
+CurentlyUsingVirtualStock=Virtual stock
+CurentlyUsingPhysicalStock=Physical stock
+RuleForStockReplenishment=Rule for stocks replenishment
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
+AlertOnly= Alerts only
+WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
+WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
+ForThisWarehouse=For this warehouse
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+Replenishments=Replenishments
+NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
+NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
+MassMovement=Mass movement
+SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+RecordMovement=Record transfer
+ReceivingForSameOrder=Receipts for this order
+StockMovementRecorded=Stock movements recorded
+RuleForStockAvailability=Rules on stock requirements
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
+MovementLabel=Label of movement
+TypeMovement=Type of movement
+DateMovement=Date of movement
+InventoryCode=Movement or inventory code
+IsInPackage=Contained into package
+WarehouseAllowNegativeTransfer=Stock can be negative
+qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
+ShowWarehouse=Show warehouse
+MovementCorrectStock=Stock correction for product %s
+MovementTransferStock=Stock transfer of product %s into another warehouse
+InventoryCodeShort=Inv./Mov. code
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
+ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
+OpenAll=Open for all actions
+OpenInternal=Open only for internal actions
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
+OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
+ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
+ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
+ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
+AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
+AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+InventoryDate=Inventory date
+NewInventory=New inventory
+inventorySetup = Inventory Setup
+inventoryCreatePermission=Create new inventory
+inventoryReadPermission=View inventories
+inventoryWritePermission=Update inventories
+inventoryValidatePermission=Validate inventory
+inventoryTitle=Inventory
+inventoryListTitle=Inventories
+inventoryListEmpty=No inventory in progress
+inventoryCreateDelete=Create/Delete inventory
+inventoryCreate=Create new
+inventoryEdit=Edit
+inventoryValidate=Validated
+inventoryDraft=Running
+inventorySelectWarehouse=Warehouse choice
+inventoryConfirmCreate=Create
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
+inventoryMvtStock=By inventory
+inventoryWarningProductAlreadyExists=This product is already into list
+SelectCategory=Category filter
+SelectFournisseur=Vendor filter
+inventoryOnDate=Inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
+inventoryChangePMPPermission=Allow to change PMP value for a product
+ColumnNewPMP=New unit PMP
+OnlyProdsInStock=Do not add product without stock
+TheoricalQty=Theorique qty
+TheoricalValue=Theorique qty
+LastPA=Last BP
+CurrentPA=Curent BP
+RecordedQty=Recorded Qty
+RealQty=Real Qty
+RealValue=Real Value
+RegulatedQty=Regulated Qty
+AddInventoryProduct=Add product to inventory
+AddProduct=Add
+ApplyPMP=Apply PMP
+FlushInventory=Flush inventory
+ConfirmFlushInventory=Do you confirm this action?
+InventoryFlushed=Inventory flushed
+ExitEditMode=Exit edition
+inventoryDeleteLine=Delete line
+RegulateStock=Regulate Stock
+ListInventory=List
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
+ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
+InventoryForASpecificWarehouse=Inventory for a specific warehouse
+InventoryForASpecificProduct=Inventory for a specific product
+StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
+ForceTo=Force to
diff --git a/htdocs/langs/ne_NP/stripe.lang b/htdocs/langs/ne_NP/stripe.lang
new file mode 100644
index 00000000000..844762040af
--- /dev/null
+++ b/htdocs/langs/ne_NP/stripe.lang
@@ -0,0 +1,72 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Stripe module setup
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
+StripeOrCBDoPayment=Pay with credit card or Stripe
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+Creditor=Creditor
+PaymentCode=Payment code
+StripeDoPayment=Pay with Stripe
+YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+Continue=Next
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment page for a sales order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment page for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.<br>For the URL of payments with no existing object, you may also add the parameter <strong>&noidempotency=1</strong> so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter)
+SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+NewStripePaymentReceived=New Stripe payment received
+NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
+STRIPE_TEST_SECRET_KEY=Secret test key
+STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
+STRIPE_LIVE_SECRET_KEY=Secret live key
+STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
+StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
+StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
+StripePayoutList=List of Stripe payouts
+ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
+ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
+PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
+ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
diff --git a/htdocs/langs/ne_NP/supplier_proposal.lang b/htdocs/langs/ne_NP/supplier_proposal.lang
new file mode 100644
index 00000000000..ce5bdf0425a
--- /dev/null
+++ b/htdocs/langs/ne_NP/supplier_proposal.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposalNew=New price request
+CommRequest=Price request
+CommRequests=Price requests
+SearchRequest=Find a request
+DraftRequests=Draft requests
+SupplierProposalsDraft=Draft vendor proposals
+LastModifiedRequests=Latest %s modified price requests
+RequestsOpened=Open price requests
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
+NewAskPrice=New price request
+ShowSupplierProposal=Show price request
+AddSupplierProposal=Create a price request
+SupplierProposalRefFourn=Vendor ref
+SupplierProposalDate=Delivery date
+SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
+ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
+DeleteAsk=Delete request
+ValidateAsk=Validate request
+SupplierProposalStatusDraft=Draft (needs to be validated)
+SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusClosed=Closed
+SupplierProposalStatusSigned=Accepted
+SupplierProposalStatusNotSigned=Refused
+SupplierProposalStatusDraftShort=Draft
+SupplierProposalStatusValidatedShort=Validated
+SupplierProposalStatusClosedShort=Closed
+SupplierProposalStatusSignedShort=Accepted
+SupplierProposalStatusNotSignedShort=Refused
+CopyAskFrom=Create a price request by copying an existing request
+CreateEmptyAsk=Create blank request
+ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
+ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
+SendAskByMail=Send price request by mail
+SendAskRef=Sending the price request %s
+SupplierProposalCard=Request card
+ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
+ActionsOnSupplierProposal=Events on price request
+DocModelAuroreDescription=A complete request model (logo...)
+CommercialAsk=Price request
+DefaultModelSupplierProposalCreate=Default model creation
+DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
+DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
+ListOfSupplierProposals=List of vendor proposal requests
+ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
+SupplierProposalsToClose=Vendor proposals to close
+SupplierProposalsToProcess=Vendor proposals to process
+LastSupplierProposals=Latest %s price requests
+AllPriceRequests=All requests
diff --git a/htdocs/langs/ne_NP/suppliers.lang b/htdocs/langs/ne_NP/suppliers.lang
new file mode 100644
index 00000000000..b69b11272b4
--- /dev/null
+++ b/htdocs/langs/ne_NP/suppliers.lang
@@ -0,0 +1,47 @@
+# Dolibarr language file - Source file is en_US - vendors
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
+History=History
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
+OrderDate=Order date
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
+SupplierPrices=Vendor prices
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
+Availability=Availability
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order details
+ApproveThisOrder=Approve this order
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
+DenyingThisOrder=Deny this order
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
+SupplierReputation=Vendor reputation
+DoNotOrderThisProductToThisSupplier=Do not order
+NotTheGoodQualitySupplier=Low quality
+ReputationForThisProduct=Reputation
+BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
+AllProductReferencesOfSupplier=All product / service references of vendor
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/ne_NP/ticket.lang b/htdocs/langs/ne_NP/ticket.lang
new file mode 100644
index 00000000000..80518c3401a
--- /dev/null
+++ b/htdocs/langs/ne_NP/ticket.lang
@@ -0,0 +1,305 @@
+# en_US lang file for module ticket
+# Copyright (C) 2013  Jean-François FERRY <hello@librethic.io>
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+Module56000Name=Tickets
+Module56000Desc=Ticket system for issue or request management
+
+Permission56001=See tickets
+Permission56002=Modify tickets
+Permission56003=Delete tickets
+Permission56004=Manage tickets
+Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+
+TicketDictType=Ticket - Types
+TicketDictCategory=Ticket - Groupes
+TicketDictSeverity=Ticket - Severities
+TicketDictResolution=Ticket - Resolution
+TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
+TicketTypeShortBUGHARD=Dysfonctionnement matériel
+TicketTypeShortCOM=Commercial question
+
+TicketTypeShortHELP=Request for functionnal help
+TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortPROJET=Project
+TicketTypeShortOTHER=Other
+
+TicketSeverityShortLOW=Low
+TicketSeverityShortNORMAL=Normal
+TicketSeverityShortHIGH=High
+TicketSeverityShortBLOCKING=Critical/Blocking
+
+ErrorBadEmailAddress=Field '%s' incorrect
+MenuTicketMyAssign=My tickets
+MenuTicketMyAssignNonClosed=My open tickets
+MenuListNonClosed=Open tickets
+
+TypeContact_ticket_internal_CONTRIBUTOR=Contributor
+TypeContact_ticket_internal_SUPPORTTEC=Assigned user
+TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
+TypeContact_ticket_external_CONTRIBUTOR=External contributor
+
+OriginEmail=Email source
+Notify_TICKET_SENTBYMAIL=Send ticket message by email
+
+# Status
+NotRead=Not read
+Read=Read
+Assigned=Assigned
+InProgress=In progress
+NeedMoreInformation=Waiting for information
+Answered=Answered
+Waiting=Waiting
+Closed=Closed
+Deleted=Deleted
+
+# Dict
+Type=Type
+Category=Analytic code
+Severity=Severity
+
+# Email templates
+MailToSendTicketMessage=To send email from ticket message
+
+#
+# Admin page
+#
+TicketSetup=Ticket module setup
+TicketSettings=Settings
+TicketSetupPage=
+TicketPublicAccess=A public interface requiring no identification is available at the following url
+TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
+TicketParamModule=Module variable setup
+TicketParamMail=Email setup
+TicketEmailNotificationFrom=Notification email from
+TicketEmailNotificationFromHelp=Used into ticket message answer by example
+TicketEmailNotificationTo=Notifications email to
+TicketEmailNotificationToHelp=Send email notifications to this address.
+TicketNewEmailBodyLabel=Text message sent after creating a ticket
+TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
+TicketParamPublicInterface=Public interface setup
+TicketsEmailMustExist=Require an existing email address to create a ticket
+TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket.
+PublicInterface=Public interface
+TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
+TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
+TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
+TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
+TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
+TicketPublicInterfaceTopicLabelAdmin=Interface title
+TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
+TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
+ExtraFieldsTicket=Extra attributes
+TicketCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
+TicketsDisableEmail=Do not send emails for ticket creation or message recording
+TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
+TicketsLogEnableEmail=Enable log by email
+TicketsLogEnableEmailHelp=At each change, an email will be sent **to each contact** associated with the ticket.
+TicketParams=Params
+TicketsShowModuleLogo=Display the logo of the module in the public interface
+TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
+TicketsShowCompanyLogo=Display the logo of the company in the public interface
+TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
+TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
+TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
+TicketsActivatePublicInterface=Activate public interface
+TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create tickets.
+TicketsAutoAssignTicket=Automatically assign the user who created the ticket
+TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
+TicketNumberingModules=Tickets numbering module
+TicketNotifyTiersAtCreation=Notify third party at creation
+TicketGroup=Group
+TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
+#
+# Index & list page
+#
+TicketsIndex=Tickets area
+TicketList=List of tickets
+TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
+NoTicketsFound=No ticket found
+NoUnreadTicketsFound=No unread ticket found
+TicketViewAllTickets=View all tickets
+TicketViewNonClosedOnly=View only open tickets
+TicketStatByStatus=Tickets by status
+OrderByDateAsc=Sort by ascending date
+OrderByDateDesc=Sort by descending date
+ShowAsConversation=Show as conversation list
+MessageListViewType=Show as table list
+
+#
+# Ticket card
+#
+Ticket=Ticket
+TicketCard=Ticket card
+CreateTicket=Create ticket
+EditTicket=Edit ticket
+TicketsManagement=Tickets Management
+CreatedBy=Created by
+NewTicket=New Ticket
+SubjectAnswerToTicket=Ticket answer
+TicketTypeRequest=Request type
+TicketCategory=Analytic code
+SeeTicket=See ticket
+TicketMarkedAsRead=Ticket has been marked as read
+TicketReadOn=Read on
+TicketCloseOn=Closing date
+MarkAsRead=Mark ticket as read
+TicketHistory=Ticket history
+AssignUser=Assign to user
+TicketAssigned=Ticket is now assigned
+TicketChangeType=Change type
+TicketChangeCategory=Change analytic code
+TicketChangeSeverity=Change severity
+TicketAddMessage=Add a message
+AddMessage=Add a message
+MessageSuccessfullyAdded=Ticket added
+TicketMessageSuccessfullyAdded=Message successfully added
+TicketMessagesList=Message list
+NoMsgForThisTicket=No message for this ticket
+Properties=Classification
+LatestNewTickets=Latest %s newest tickets (not read)
+TicketSeverity=Severity
+ShowTicket=See ticket
+RelatedTickets=Related tickets
+TicketAddIntervention=Create intervention
+CloseTicket=Close ticket
+CloseATicket=Close a ticket
+ConfirmCloseAticket=Confirm ticket closing
+ConfirmDeleteTicket=Please confirm ticket deleting
+TicketDeletedSuccess=Ticket deleted with success
+TicketMarkedAsClosed=Ticket marked as closed
+TicketDurationAuto=Calculated duration
+TicketDurationAutoInfos=Duration calculated automatically from intervention related
+TicketUpdated=Ticket updated
+SendMessageByEmail=Send message by email
+TicketNewMessage=New message
+ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
+TicketGoIntoContactTab=Please go into "Contacts" tab to select them
+TicketMessageMailIntro=Introduction
+TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
+TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
+TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
+TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
+TicketMessageMailSignature=Signature
+TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
+TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
+TicketMessageMailSignatureLabelAdmin=Signature of response email
+TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
+TicketMessageHelp=Only this text will be saved in the message list on ticket card.
+TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
+TimeElapsedSince=Time elapsed since
+TicketTimeToRead=Time elapsed before read
+TicketContacts=Contacts ticket
+TicketDocumentsLinked=Documents linked to ticket
+ConfirmReOpenTicket=Confirm reopen this ticket ?
+TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
+TicketAssignedToYou=Ticket assigned
+TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
+MarkMessageAsPrivate=Mark message as private
+TicketMessagePrivateHelp=This message will not display to external users
+TicketEmailOriginIssuer=Issuer at origin of the tickets
+InitialMessage=Initial Message
+LinkToAContract=Link to a contract
+TicketPleaseSelectAContract=Select a contract
+UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
+TicketMailExchanges=Mail exchanges
+TicketInitialMessageModified=Initial message modified
+TicketMessageSuccesfullyUpdated=Message successfully updated
+TicketChangeStatus=Change status
+TicketConfirmChangeStatus=Confirm the status change: %s ?
+TicketLogStatusChanged=Status changed: %s to %s
+TicketNotNotifyTiersAtCreate=Not notify company at create
+Unread=Unread
+TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
+PublicInterfaceNotEnabled=Public interface was not enabled
+ErrorTicketRefRequired=Ticket reference name is required
+
+#
+# Logs
+#
+TicketLogMesgReadBy=Ticket %s read by %s
+NoLogForThisTicket=No log for this ticket yet
+TicketLogAssignedTo=Ticket %s assigned to %s
+TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
+TicketLogClosedBy=Ticket %s closed by %s
+TicketLogReopen=Ticket %s re-open
+
+#
+# Public pages
+#
+TicketSystem=Ticket system
+ShowListTicketWithTrackId=Display ticket list from track ID
+ShowTicketWithTrackId=Display ticket from track ID
+TicketPublicDesc=You can create a support ticket or check from an existing ID.
+YourTicketSuccessfullySaved=Ticket has been successfully saved!
+MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
+PleaseRememberThisId=Please keep the tracking number that we might ask you later.
+TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
+TicketNewEmailSubjectCustomer=New support ticket
+TicketNewEmailBody=This is an automatic email to confirm you have registered a new ticket.
+TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
+TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
+TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
+TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
+TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
+TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
+TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
+TicketPublicMsgViewLogIn=Please enter ticket tracking ID
+TicketTrackId=Public Tracking ID
+OneOfTicketTrackId=One of your tracking ID
+ErrorTicketNotFound=Ticket with tracking ID %s not found!
+Subject=Subject
+ViewTicket=View ticket
+ViewMyTicketList=View my ticket list
+ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
+TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
+TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
+SeeThisTicketIntomanagementInterface=See ticket in management interface
+TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
+ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
+OldUser=Old user
+NewUser=New user
+NumberOfTicketsByMonth=Number of tickets per month
+NbOfTickets=Number of tickets
+# notifications
+TicketNotificationEmailSubject=Ticket %s updated
+TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
+TicketNotificationRecipient=Notification recipient
+TicketNotificationLogMessage=Log message
+TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
+TicketNotificationNumberEmailSent=Notification email sent: %s
+
+ActionsOnTicket=Events on ticket
+
+#
+# Boxes
+#
+BoxLastTicket=Latest created tickets
+BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicketContent=
+BoxLastTicketNoRecordedTickets=No recent unread tickets
+BoxLastModifiedTicket=Latest modified tickets
+BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastModifiedTicketContent=
+BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
diff --git a/htdocs/langs/ne_NP/trips.lang b/htdocs/langs/ne_NP/trips.lang
new file mode 100644
index 00000000000..654f14d6bf7
--- /dev/null
+++ b/htdocs/langs/ne_NP/trips.lang
@@ -0,0 +1,151 @@
+# Dolibarr language file - Source file is en_US - trips
+ShowExpenseReport=Show expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense reports
+ListOfFees=List of fees
+TypeFees=Types of fees
+ShowTrip=Show expense report
+NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
+CompanyVisited=Company/organization visited
+FeesKilometersOrAmout=Amount or kilometers
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportApproved=An expense report was approved
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
+ExpenseReportRefused=An expense report was refused
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
+ExpenseReportCanceled=An expense report was canceled
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
+ExpenseReportPaid=An expense report was paid
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripNDF=Informations expense report
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Other
+TF_TRIP=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hotel
+TF_TAXI=Taxi
+EX_KME=Mileage costs
+EX_FUE=Fuel CV
+EX_HOT=Hotel
+EX_PAR=Parking CV
+EX_TOL=Toll CV
+EX_TAX=Various Taxes
+EX_IND=Indemnity transportation subscription
+EX_SUM=Maintenance supply
+EX_SUO=Office supplies
+EX_CAR=Car rental
+EX_DOC=Documentation
+EX_CUR=Customers receiving
+EX_OTR=Other receiving
+EX_POS=Postage
+EX_CAM=CV maintenance and repair
+EX_EMM=Employees meal
+EX_GUM=Guests meal
+EX_BRE=Breakfast
+EX_FUE_VP=Fuel PV
+EX_TOL_VP=Toll PV
+EX_PAR_VP=Parking PV
+EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
+UploadANewFileNow=Upload a new document now
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+AucuneLigne=There is no expense report declared yet
+ModePaiement=Payment mode
+VALIDATOR=User responsible for approval
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paid by
+REFUSEUR=Denied by
+CANCEL_USER=Deleted by
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+BROUILLONNER=Reopen
+ExpenseReportRef=Ref. expense report
+ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+ConfirmRefuseTrip=Are you sure you want to deny this expense report?
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report?
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
+ConfirmCancelTrip=Are you sure you want to cancel this expense report?
+BrouillonnerTrip=Move back expense report to status "Draft"
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report?
+NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
+ExpenseReportsToApprove=Expense reports to approve
+ExpenseReportsToPay=Expense reports to pay
+ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
+ExpenseReportsIk=Expense report milles index
+ExpenseReportsRules=Expense report rules
+ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
+ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report
+expenseReportOffset=Offset
+expenseReportCoef=Coefficient
+expenseReportTotalForFive=Example with <u>d</u> = 5
+expenseReportRangeFromTo=from %d to %d
+expenseReportRangeMoreThan=more than %d
+expenseReportCoefUndefined=(value not defined)
+expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
+expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
+expenseReportPrintExample=offset + (d x coef) = %s
+ExpenseReportApplyTo=Apply to
+ExpenseReportDomain=Domain to apply
+ExpenseReportLimitOn=Limit on
+ExpenseReportDateStart=Date start
+ExpenseReportDateEnd=Date end
+ExpenseReportLimitAmount=Limite amount
+ExpenseReportRestrictive=Restrictive
+AllExpenseReport=All type of expense report
+OnExpense=Expense line
+ExpenseReportRuleSave=Expense report rule saved
+ExpenseReportRuleErrorOnSave=Error: %s
+RangeNum=Range %d
+ExpenseReportConstraintViolationError=Constraint violation id [%s]: %s  is superior to %s %s
+byEX_DAY=by day (limitation to %s)
+byEX_MON=by month (limitation to %s)
+byEX_YEA=by year (limitation to %s)
+byEX_EXP=by line (limitation to %s)
+ExpenseReportConstraintViolationWarning=Constraint violation id [%s]: %s  is superior to %s %s
+nolimitbyEX_DAY=by day (no limitation)
+nolimitbyEX_MON=by month (no limitation)
+nolimitbyEX_YEA=by year (no limitation)
+nolimitbyEX_EXP=by line (no limitation)
+CarCategory=Category of car
+ExpenseRangeOffset=Offset amount: %s
+RangeIk=Mileage range
+AttachTheNewLineToTheDocument=Attach the line to an uploaded document
diff --git a/htdocs/langs/ne_NP/users.lang b/htdocs/langs/ne_NP/users.lang
new file mode 100644
index 00000000000..41a5ebd0981
--- /dev/null
+++ b/htdocs/langs/ne_NP/users.lang
@@ -0,0 +1,118 @@
+# Dolibarr language file - Source file is en_US - users
+HRMArea=HRM area
+UserCard=User card
+GroupCard=Group card
+Permission=Permission
+Permissions=Permissions
+EditPassword=Edit password
+SendNewPassword=Regenerate and send password
+SendNewPasswordLink=Send link to reset password
+ReinitPassword=Regenerate password
+PasswordChangedTo=Password changed to: %s
+SubjectNewPassword=Your new password for %s
+GroupRights=Group permissions
+UserRights=User permissions
+UserGUISetup=User Display Setup
+DisableUser=Disable
+DisableAUser=Disable a user
+DeleteUser=Delete
+DeleteAUser=Delete a user
+EnableAUser=Enable a user
+DeleteGroup=Delete
+DeleteAGroup=Delete a group
+ConfirmDisableUser=Are you sure you want to disable user <b>%s</b>?
+ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b>?
+ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b>?
+ConfirmEnableUser=Are you sure you want to enable user <b>%s</b>?
+ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b>?
+ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
+NewUser=New user
+CreateUser=Create user
+LoginNotDefined=Login is not defined.
+NameNotDefined=Name is not defined.
+ListOfUsers=List of users
+SuperAdministrator=Super Administrator
+SuperAdministratorDesc=Global administrator
+AdministratorDesc=Administrator
+DefaultRights=Default Permissions
+DefaultRightsDesc=Define here the <u>default</u> permissions that are automatically granted to a <u>new</u> user (to modify permissions for existing users, go to the user card).
+DolibarrUsers=Dolibarr users
+LastName=Last name
+FirstName=First name
+ListOfGroups=List of groups
+NewGroup=New group
+CreateGroup=Create group
+RemoveFromGroup=Remove from group
+PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
+PasswordChangeRequest=Request to change password for <b>%s</b>
+PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+ConfirmPasswordReset=Confirm password reset
+MenuUsersAndGroups=Users & Groups
+LastGroupsCreated=Latest %s groups created
+LastUsersCreated=Latest %s users created
+ShowGroup=Show group
+ShowUser=Show user
+NonAffectedUsers=Non assigned users
+UserModified=User modified successfully
+PhotoFile=Photo file
+ListOfUsersInGroup=List of users in this group
+ListOfGroupsForUser=List of groups for this user
+LinkToCompanyContact=Link to third party / contact
+LinkedToDolibarrMember=Link to member
+LinkedToDolibarrUser=Link to Dolibarr user
+LinkedToDolibarrThirdParty=Link to Dolibarr third party
+CreateDolibarrLogin=Create a user
+CreateDolibarrThirdParty=Create a third party
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
+UsePersonalValue=Use personal value
+InternalUser=Internal user
+ExportDataset_user_1=Users and their properties
+DomainUser=Domain user %s
+Reactivate=Reactivate
+CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
+Inherited=Inherited
+UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
+UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
+IdPhoneCaller=Id phone caller
+NewUserCreated=User %s created
+NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
+EventUserModified=User %s modified
+UserDisabled=User %s disabled
+UserEnabled=User %s activated
+UserDeleted=User %s removed
+NewGroupCreated=Group %s created
+GroupModified=Group %s modified
+GroupDeleted=Group %s removed
+ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact?
+ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member?
+ConfirmCreateThirdParty=Are you sure you want to create a third party for this member?
+LoginToCreate=Login to create
+NameToCreate=Name of third party to create
+YourRole=Your roles
+YourQuotaOfUsersIsReached=Your quota of active users is reached !
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
+DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
+HierarchicalResponsible=Supervisor
+HierarchicView=Hierarchical view
+UseTypeFieldToChange=Use field Type to change
+OpenIDURL=OpenID URL
+LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Hours worked (per week)
+ExpectedWorkedHours=Expected worked hours per week
+ColorUser=Color of the user
+DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accounting code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Employment Start Date
+DateEmploymentEnd=Employment End Date
+CantDisableYourself=You can't disable your own user record
+ForceUserExpenseValidator=Force expense report validator
+ForceUserHolidayValidator=Force leave request validator
+ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/ne_NP/website.lang b/htdocs/langs/ne_NP/website.lang
new file mode 100644
index 00000000000..bce2a09fb03
--- /dev/null
+++ b/htdocs/langs/ne_NP/website.lang
@@ -0,0 +1,130 @@
+# Dolibarr language file - Source file is en_US - website
+Shortname=Code
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
+DeleteWebsite=Delete website
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
+WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
+WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
+WEBSITE_CSS_URL=URL of external CSS file
+WEBSITE_CSS_INLINE=CSS file content (common to all pages)
+WEBSITE_JS_INLINE=Javascript file content (common to all pages)
+WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
+WEBSITE_ROBOT=Robot file (robots.txt)
+WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
+HtmlHeaderPage=HTML header (specific to this page only)
+PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
+EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
+MediaFiles=Media library
+EditCss=Edit website properties
+EditMenu=Edit menu
+EditMedias=Edit medias
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
+AddWebsite=Add website
+Webpage=Web page/container
+AddPage=Add page/container
+HomePage=Home Page
+PageContainer=Page/container
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
+PageContent=Page/Contenair
+PageDeleted=Page/Contenair '%s' of website %s deleted
+PageAdded=Page/Contenair '%s' added
+ViewSiteInNewTab=View site in new tab
+ViewPageInNewTab=View page in new tab
+SetAsHomePage=Set as Home page
+RealURL=Real URL
+ViewWebsiteInProduction=View web site using home URLs
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+TestDeployOnWeb=Test/deploy on web
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
+NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
+SyntaxHelp=Help on specific syntax tips
+YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+ClonePage=Clone page/container
+CloneSite=Clone site
+SiteAdded=Website added
+ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
+PageIsANewTranslation=The new page is a translation of the current page ?
+LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
+ParentPageId=Parent page ID
+WebsiteId=Website ID
+CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
+FetchAndCreate=Fetch and Create
+ExportSite=Export website
+ImportSite=Import website template
+IDOfPage=Id of page
+Banner=Banner
+BlogPost=Blog post
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
+AddWebsiteAccount=Create web site account
+BackToListForThirdParty=Back to list for the third-party
+DisableSiteFirst=Disable website first
+MyContainerTitle=My web site title
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is a translation of
+ThisPageHasTranslationPages=This page/container has translation
+NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
+GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Search or Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
+MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
+EditInLineOnOff=Mode 'Edit inline' is %s
+ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
+GlobalCSSorJS=Global CSS/JS/Header file of web site
+BackToHomePage=Back to home page...
+TranslationLinks=Translation links
+YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not a website page
+UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
+MainLanguage=Main language
+OtherLanguages=Other languages
+UseManifest=Provide a manifest.json file
+PublicAuthorAlias=Public author alias
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
+ReplacementDoneInXPages=Replacement done in %s pages or containers
diff --git a/htdocs/langs/ne_NP/withdrawals.lang b/htdocs/langs/ne_NP/withdrawals.lang
new file mode 100644
index 00000000000..b1d6e30e329
--- /dev/null
+++ b/htdocs/langs/ne_NP/withdrawals.lang
@@ -0,0 +1,119 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
+NewStandingOrder=New direct debit order
+StandingOrderToProcess=To process
+WithdrawalsReceipts=Direct debit orders
+WithdrawalReceipt=Direct debit order
+LastWithdrawalReceipts=Latest %s direct debit files
+WithdrawalsLines=Direct debit order lines
+RequestStandingOrderToTreat=Request for direct debit payment order to process
+RequestStandingOrderTreated=Request for direct debit payment order processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
+AmountToWithdraw=Amount to withdraw
+WithdrawsRefused=Direct debit refused
+NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
+ResponsibleUser=User Responsible
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
+MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
+ClassCredited=Classify credited
+ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
+TransData=Transmission date
+TransMetod=Transmission method
+Send=Send
+Lines=Lines
+StandingOrderReject=Issue a rejection
+WithdrawalRefused=Withdrawal refused
+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=Invoice refused (Charge the rejection to customer)
+StatusDebitCredit=Status debit/credit
+StatusWaiting=Waiting
+StatusTrans=Sent
+StatusCredited=Credited
+StatusRefused=Refused
+StatusMotif0=Unspecified
+StatusMotif1=Insufficient funds
+StatusMotif2=Request contested
+StatusMotif3=No direct debit payment order
+StatusMotif4=Sales Order
+StatusMotif5=RIB unusable
+StatusMotif6=Account without balance
+StatusMotif7=Judicial Decision
+StatusMotif8=Other reason
+CreateForSepaFRST=Create direct debit file (SEPA FRST)
+CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
+CreateAll=Create direct debit file (all)
+CreateGuichet=Only office
+CreateBanque=Only bank
+OrderWaiting=Waiting for treatment
+NotifyTransmision=Withdrawal Transmission
+NotifyCredit=Withdrawal Credit
+NumeroNationalEmetter=National Transmitter Number
+WithBankUsingRIB=For bank accounts using RIB
+WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
+BankToReceiveWithdraw=Receiving Bank Account
+CreditDate=Credit on
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+WithdrawalFile=Withdrawal file
+SetToStatusSent=Set to status "File Sent"
+ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
+StatisticsByLineStatus=Statistics by status of lines
+RUM=UMR
+DateRUM=Mandate signature date
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
+WithdrawMode=Direct debit mode (FRST or RECUR)
+WithdrawRequestAmount=Amount of Direct debit request:
+WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
+SepaMandate=SEPA Direct Debit Mandate
+SepaMandateShort=SEPA Mandate
+PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
+SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+CreditorIdentifier=Creditor Identifier
+CreditorName=Creditor Name
+SEPAFillForm=(B) Please complete all the fields marked *
+SEPAFormYourName=Your name
+SEPAFormYourBAN=Your Bank Account Name (IBAN)
+SEPAFormYourBIC=Your Bank Identifier Code (BIC)
+SEPAFrstOrRecur=Type of payment
+ModeRECUR=Recurring payment
+ModeFRST=One-off payment
+PleaseCheckOne=Please check one only
+DirectDebitOrderCreated=Direct debit order %s created
+AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
+
+### Notifications
+InfoCreditSubject=Payment of direct debit payment order %s by the bank
+InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
+InfoTransSubject=Transmission of direct debit payment order %s to bank
+InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
+InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
+InfoRejectSubject=Direct debit payment order refused
+InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/ne_NP/workflow.lang b/htdocs/langs/ne_NP/workflow.lang
new file mode 100644
index 00000000000..be126eef0f4
--- /dev/null
+++ b/htdocs/langs/ne_NP/workflow.lang
@@ -0,0 +1,20 @@
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=Workflow module setup
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+# Autocreate
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
+# Autoclassify customer proposal or order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+AutomaticCreation=Automatic creation
+AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/ne_NP/zapier.lang b/htdocs/langs/ne_NP/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/ne_NP/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/nl_BE/donations.lang b/htdocs/langs/nl_BE/donations.lang
new file mode 100644
index 00000000000..213d8fc18ac
--- /dev/null
+++ b/htdocs/langs/nl_BE/donations.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - donations
+ConfirmDeleteADonation=Bent u zeker dat u deze donatie wilt verwijderen?
+LastModifiedDonations=Laatste %s gewijzigde donaties
+DonationValidated=Donatie %s gevalideerd
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index 1baa044da70..c833cf05a1f 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -63,7 +63,6 @@ UserModif=Gebruiker van laatste update
 PriceUHTCurrency=UP (valuta)
 AmountHT=Bedrag (excl. BTW)
 MulticurrencyRemainderToPay=Blijf betalen, oorspronkelijke valuta
-MulticurrencyPaymentAmount=Betalingsbedrag, oorspronkelijke valuta
 MulticurrencyAmountHT=Bedrag (excl. Btw), oorspronkelijke valuta
 MulticurrencyAmountTTC=Bedrag (incl. Btw), oorspronkelijke valuta
 MulticurrencyAmountVAT=Bedragsbelasting, oorspronkelijke valuta
diff --git a/htdocs/langs/nl_BE/modulebuilder.lang b/htdocs/langs/nl_BE/modulebuilder.lang
new file mode 100644
index 00000000000..8bbcc78a506
--- /dev/null
+++ b/htdocs/langs/nl_BE/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
diff --git a/htdocs/langs/nl_BE/multicurrency.lang b/htdocs/langs/nl_BE/multicurrency.lang
new file mode 100644
index 00000000000..f257fd39f88
--- /dev/null
+++ b/htdocs/langs/nl_BE/multicurrency.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MulticurrencyPaymentAmount=Betalingsbedrag, oorspronkelijke valuta
diff --git a/htdocs/langs/nl_BE/products.lang b/htdocs/langs/nl_BE/products.lang
index d9fbabf7d93..e7993aa1b39 100644
--- a/htdocs/langs/nl_BE/products.lang
+++ b/htdocs/langs/nl_BE/products.lang
@@ -6,7 +6,6 @@ OnBuy=Te koop
 NotOnSell=Niet meer beschikbaar
 ProductStatusNotOnSell=Niet meer verkrijgbaar
 ProductStatusOnSellShort=Te koop
-Suppliers=Verkoper
 ListOfStockMovements=Voorradenlijst
 ProductSellByQuarterHT=Bruto omzetcijfer per trimester
 ServiceSellByQuarterHT=Bruto omzetcijfer per trimester
diff --git a/htdocs/langs/nl_BE/suppliers.lang b/htdocs/langs/nl_BE/suppliers.lang
new file mode 100644
index 00000000000..edf3c39315a
--- /dev/null
+++ b/htdocs/langs/nl_BE/suppliers.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - suppliers
+Suppliers=Verkoper
+ApproveThisOrder=Opdracht goedkeuren
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index eef07f16977..a25671bd5da 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Gekoppelde factuurregels
 ExpenseReportLines=Te koppelen kostenboekingen
 ExpenseReportLinesDone=Gekoppelde kostenboekingen
 IntoAccount=Koppel regel aan grootboekrekening
+TotalForAccount=Totaal grootboekrekening
 
 
 Ventilate=Koppelen
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Grootboeknummer voor donaties
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Grootboekrekening om abonnementen te registreren
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standaard grootboekrekening voor de gekochte producten (gebruikt indien niet gedefinieerd in de productfiche)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Grootboekrekening standaard voor de gekochte producten in de EEG (gebruikt indien niet gedefinieerd in het productblad)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Grootboekrekening standaard voor de gekochte producten en geïmporteerd uit de EEG (gebruikt indien niet gedefinieerd in het productblad)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standaard grootboekrekening omzet producten (indien niet opgegeven bij productgegevens)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Standaard grootboekrekening voor de in EEG verkochte producten (gebruikt indien niet gedefinieerd bij de productgegevens)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Standaard boekhoudrekening voor de producten die worden verkocht en uitgevoerd uit de EEG (gebruikt indien niet gedefinieerd bij de productgegevens)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Standaard grootboekrekening inkoop diensten (indien niet opgegeven bij dienstgegevens)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Grootboekrekening standaard voor de gekochte services in EEC (gebruikt indien niet gedefinieerd in het serviceblad)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Standaard grootboekrekening voor de gekochte services en geïmporteerd uit EEC (gebruikt indien niet gedefinieerd in het serviceblad)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standaard grootboekrekening omzet diensten (indien niet opgegeven bij dienstgegevens)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Standaard grootboekrekening voor de in EEG verkochte diensten (gebruikt indien niet gedefinieerd bij de servicegegevens)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Standaard grootboekrekening voor de diensten die worden verkocht en geëxporteerd uit EEG (gebruikt indien niet gedefinieerd in het serviceblad)
@@ -228,11 +234,15 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Onbekende relatie
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Tegenrekening relatie niet gedefinieerd of relatie onbekend. Blokkeringsfout.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Onbekend account van derden en wachtaccount niet gedefinieerd. Blokkeerfout
 PaymentsNotLinkedToProduct=Betaling niet gekoppeld aan een product / dienst
+OpeningBalance=Begin balans
 ShowOpeningBalance=Toon beginsaldo
 HideOpeningBalance=Verberg beginsaldo
+ShowSubtotalByGroup=Totaal per groep
 
 Pcgtype=Rekening hoofdgroep
-PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+PcgtypeDesc=Cluster grootboekrekeningen welke gebruikt worden als vooraf gedefinieerde 'filter'- en' groepeer'-criteria voor sommige boekhoudrapporten. 'INKOMEN' of 'UITGAVEN' worden bijvoorbeeld gebruikt als groepen voor boekhoudrekeningen van producten om het kosten- / inkomstenrapport samen te stellen.
+
+Reconcilable=Samentrekken
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Exporteren naar Quadratus QuadraCompta
 Modelcsv_ebp=Exporteren naar EBP
 Modelcsv_cogilog=Exporteren naar Cogilog
 Modelcsv_agiris=Exporteren naar Agiris
-Modelcsv_LDCompta=Exporteren naar LD Compta (v9 en hoger) (test)
+Modelcsv_LDCompta=Exporteren voor LD Compta (v9) (test)
+Modelcsv_LDCompta10=Exporteren voor LD Compta (v10 en hoger)
 Modelcsv_openconcerto=Exporteren voor OpenConcerto (test)
 Modelcsv_configurable=Configureerbare CSV export
 Modelcsv_FEC=FEC exporteren
 Modelcsv_Sage50_Swiss=Export voor Sage 50 Zwitserland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Rekeningschema Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Instellingen verkopen
 OptionModeProductSellIntra=Mode verkoop uitgevoerd in EEG
 OptionModeProductSellExport=Mode-verkopen geëxporteerd naar andere landen
 OptionModeProductBuy=Instellingen inkopen
+OptionModeProductBuyIntra=Modus voor aankopen geïmporteerd in EEC
+OptionModeProductBuyExport=Modus voor gekocht geïmporteerd uit andere landen
 OptionModeProductSellDesc=Omzet grootboekrekening bij producten
 OptionModeProductSellIntraDesc=Toon alle producten met boekhoudaccount voor verkoop in de EEG.
 OptionModeProductSellExportDesc=Toon alle producten met een rekening voor overige buitenlandse verkopen.
 OptionModeProductBuyDesc=Inkoop grootboekrekening bij producten
+OptionModeProductBuyIntraDesc=Toon alle producten met grootboekrekening voor aankopen in de EEG.
+OptionModeProductBuyExportDesc=Toon alle producten met grootboekrekening voor andere buitenlandse aankopen.
 CleanFixHistory=Verwijder tegenrekening van regels welke niet voorkomen in het rekeningschema
 CleanHistory=Verwijder alle koppelingen van gekozen boekjaar,
 PredefinedGroups=Voorgedefinieerde groepen
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Rekening uit groep verwijderd.
 SaleLocal=Lokale verkoop
 SaleExport=Verkoop buitenland
 SaleEEC=Verkoop binnen EEG
+SaleEECWithVAT=Verkoop in de EEG met een btw die niet nul is, dus we veronderstellen dat dit GEEN intracommunautaire verkoop is en de voorgestelde grootboekrekening het standaardproductaccount is.
+SaleEECWithoutVATNumber=Verkoop in de EEG zonder btw, maar het btw-nummer van een derde partij is niet gedefinieerd. Voor standaardverkoop vallen we terug op het product-grootboekrekening. U kunt indien nodig het btw-nummer van een derde partij of het productaccount aanpassen.
 
 ## Dictionary
 Range=Grootboeknummer van/tot
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index b83e9d0cf25..9d99e689e2e 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Webserver gebruiker / groep
 NoSessionFound=Uw PHP-configuratie lijkt geen lijst van actieve sessies toe te staan. De map die wordt gebruikt om sessies op te slaan ( <b>%s</b> ) kan worden beschermd (bijvoorbeeld door OS-machtigingen of door PHP-richtlijn open_basedir).
 DBStoringCharset=Database karakterset voor het opslaan van gegevens
 DBSortingCharset=Database karakterset voor het sorteren van gegevens
+HostCharset=Host-tekenset
 ClientCharset=Cliënt tekenset
 ClientSortingCharset=Cliënt vergelijking
 WarningModuleNotActive=<b>Module %s</b> dient te worden ingeschakeld
@@ -99,9 +100,9 @@ NoMaxSizeByPHPLimit=Opmerking: Geen limiet ingesteld in uw PHP instellingen
 MaxSizeForUploadedFiles=Maximale grootte voor geüploade bestanden (0 om uploaden niet toe te staan)
 UseCaptchaCode=Gebruik een grafische code (CAPTCHA) op de aanmeldingspagina (SPAM preventie)
 AntiVirusCommand=Het volledige pad naar het antiviruscommando
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusCommandExample=Voorbeeld voor ClamAv Daemon (vereist clamav-daemon): / usr / bin / clamdscan<br>Voorbeeld voor ClamWin (erg langzaam): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Aanvullende parameters op de opdrachtregel
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Voorbeeld voor ClamAv Daemon: --fdpass<br>Voorbeeld voor ClamWin: --database = "C: \\ Program Files (x86) \\ ClamWin \\ lib"
 ComptaSetup=Instellingen van de boekhoudkundige module
 UserSetup=Gebruikersbeheer instellingen
 MultiCurrencySetup=Setup meerdere valuta's
@@ -199,7 +200,7 @@ FeatureDisabledInDemo=Functionaliteit uitgeschakeld in de demonstratie
 FeatureAvailableOnlyOnStable=Functie alleen beschikbaar bij officiële stabiele versies
 BoxesDesc=Widgets zijn componenten die informatie tonen die u kunt toevoegen om sommige pagina's te personaliseren. U kunt kiezen of u de widget wilt weergeven of niet door de doelpagina te selecteren en op 'Activeren' te klikken of door op de prullenbak te klikken om deze uit te schakelen.
 OnlyActiveElementsAreShown=Alleen elementen van ingeschakelde <a href="%s">modules</a> worden getoond.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesDesc=De modules / applicaties bepalen welke features beschikbaar zijn in de software. Voor sommige modules moet toestemming worden verleend aan gebruikers na het activeren van de module. Klik op de aan / uitknop <span class="small valignmiddle">%s</span> van elke module om een module / applicatie in of uit te schakelen.
 ModulesMarketPlaceDesc=U kunt meer modules downloaden van externe websites op het internet...
 ModulesDeployDesc=Als machtigingen op uw bestandssysteem dit toestaan, kunt u dit hulpprogramma gebruiken om een externe module te implementeren. De module is dan zichtbaar op het tabblad <strong>%s</strong> .
 ModulesMarketPlaces=Vind externe apps of modules
@@ -212,7 +213,7 @@ CompatibleUpTo=Compatibel met versie %s
 NotCompatible=Deze module lijkt niet compatibel met uw Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=Deze module vereist een update van uw Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Zie op de Marktplaats
-SeeSetupOfModule=See setup of module %s
+SeeSetupOfModule=Zie setup van module%s
 Updated=Bijgewerkt
 Nouveauté=Nieuwigheid
 AchatTelechargement=Kopen/Downloaden
@@ -222,7 +223,7 @@ DoliPartnersDesc=Lijst van bedrijven die op maat ontwikkelde modules of functies
 WebSiteDesc=Externe websites voor meer add-on (niet-core) modules ...
 DevelopYourModuleDesc=Enkele oplossingen om uw eigen module te ontwikkelen ...
 URL=URL
-RelativeURL=Relative URL
+RelativeURL=Relatieve URL
 BoxesAvailable=Beschikbare widgets
 BoxesActivated=Widgets geactiveerd
 ActivateOn=Activeren op
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxen
 ExtrafieldCheckBoxFromList=Checkboxen uit tabel
 ExtrafieldLink=Link naar een object
 ComputedFormula=Berekend veld
-ComputedFormulaDesc=U kunt hier een formule invoeren met andere eigenschappen van het object of een willekeurige PHP-codering om een dynamische berekende waarde te krijgen. U kunt alle PHP-compatibele formules gebruiken, inclusief de "?" voorwaarde-operator en het volgende globale object: <strong>$ db, $ conf, $ langs, $ mysoc, $ user, $ object</strong> . <br> <strong>WAARSCHUWING</strong> : Mogelijk zijn slechts enkele eigenschappen van $ object beschikbaar. Als u eigenschappen nodig hebt die niet zijn geladen, haalt u het object gewoon in uw formule op zoals in het tweede voorbeeld. <br> Als u een berekend veld gebruikt, kunt u geen waarde invoeren via de interface. Als er een syntaxisfout is, kan de formule ook niets retourneren. <br><br> Voorbeeld van formule: <br> $object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br> Voorbeeld om een object opnieuw te laden <br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1' <br><br> Ander voorbeeld van een formule om de belasting van het object en het bovenliggende object te forceren: <br> (($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found' 
+ComputedFormulaDesc=U kunt hier een formule invoeren met andere eigenschappen van het object of een PHP-codering om een dynamisch berekende waarde te krijgen. U kunt alle PHP-compatibele formules gebruiken, inclusief de "?" condition operator en volgend globaal object: <strong> $ db, $ conf, $ langs, $ mysoc, $ user, $ object </strong>. <br> <strong> WAARSCHUWING </strong>: Mogelijk zijn slechts enkele eigenschappen van $ object beschikbaar. Als je eigenschappen nodig hebt die niet zijn geladen, haal dan gewoon het object in je formule zoals in het tweede voorbeeld. <br> Als u een berekend veld gebruikt, betekent dit dat u geen enkele waarde uit de interface kunt invoeren. Als er een syntaxisfout is, retourneert de formule mogelijk ook niets. <br> <br> Voorbeeld van formule: <br> $ object-> id < 10 ? round($object-> id / 2, 2): ($ object-> id + 2 * $ user-> id) * (int) substr ($ mysoc-> zip, 1, 2 ) <br> <br> Voorbeeld om object <br> (($ $ reloadedobj = new Societe ($ db)) && ($ reloadedobj-> fetchNoCompute ($ obj-> id? $ obj-> id> ($ obj-> id: ($ obj-)) te herladen > rowid: $ object-> id))> 0))? $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1' <br> <br> Ander voorbeeld van formule om het laden van een object en het bovenliggende object te forceren: <br> (($ reloadedbj0) )) && ($ reloadedobj-> fetchNoCompute ($ object-> id)> 0) && ($ secondloadedobj = nieuw project ($ db)) && ($ secondloadedobj-> fetchNoCompute ($ reloadedobj-> fk_project)> 0))? $ secondloadedobj-> ref: 'Parent project not found'
 Computedpersistent=Berekend veld opslaan
 ComputedpersistentDesc=Berekende extra velden worden opgeslagen in de database, maar de waarde wordt alleen opnieuw berekend als het object van dit veld wordt gewijzigd. Als het berekende veld afhankelijk is van andere objecten of algemene gegevens, kan deze waarde onjuist zijn !!
 ExtrafieldParamHelpPassword=Dit veld leeg laten betekent dat deze waarde zonder codering wordt opgeslagen (veld mag alleen worden verborgen met een ster op het scherm). <br> Stel 'auto' in om de standaard coderingsregel te gebruiken om het wachtwoord in de database op te slaan (waarde lezen is dan alleen de hash, geen manier om de oorspronkelijke waarde op te halen)
@@ -448,8 +449,8 @@ KeepEmptyToUseDefault=Laat leeg om standaardwaarde te gebruiken
 DefaultLink=Standaard link
 SetAsDefault=Gebruik standaard
 ValueOverwrittenByUserSetup=Waarschuwing, deze waarde kan worden overschreven door de gebruiker specifieke setup (elke gebruiker kan zijn eigen ClickToDial url ingestellen)
-ExternalModule=External module
-InstalledInto=Installed into directory %s
+ExternalModule=Externe module
+InstalledInto=Geïnstalleerd in directory %s
 BarcodeInitForthird-parties=Massa streepjescode initialisatie relaties
 BarcodeInitForProductsOrServices=Mass barcode init of reset voor producten of diensten
 CurrentlyNWithoutBarCode=Momenteel hebt u een <strong>%s</strong> record op <strong>%s</strong>%s zonder gedefinieerde streepjescode.
@@ -950,7 +951,7 @@ DictionaryCanton=Staten / Provincies
 DictionaryRegion=Regio
 DictionaryCountry=Landen
 DictionaryCurrency=Valuta
-DictionaryCivility=Honorific titles
+DictionaryCivility=Eervolle titels
 DictionaryActions=Agenda evenementen
 DictionarySocialContributions=Soorten sociale of fiscale belastingen
 DictionaryVAT=BTW-tarieven of Verkoop Tax tarieven
@@ -991,7 +992,7 @@ VATIsNotUsedDesc=Standaard is de voorgestelde BTW 0. Dit kan gebruikt worden in
 VATIsUsedExampleFR=In Frankrijk betekent dit dat bedrijven of organisaties een echt fiscaal systeem hebben (Vereenvoudigd echt of normaal echt). Een systeem waarin btw wordt aangegeven.
 VATIsNotUsedExampleFR=In Frankrijk betekent dit verenigingen die niet-omzetbelasting zijn aangegeven of bedrijven, organisaties of vrije beroepen die hebben gekozen voor het micro-onderneming fiscale systeem (omzetbelasting in franchise) en een franchise omzetbelasting hebben betaald zonder aangifte omzetbelasting. Bij deze keuze wordt de verwijzing "Niet van toepassing omzetbelasting - art-293B van CGI" op facturen weergegeven.
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
+TypeOfSaleTaxes=Soort omzetbelasting
 LTRate=Tarief
 LocalTax1IsNotUsed=Gebruik geen tweede belasting
 LocalTax1IsUsedDesc=Gebruik een tweede type belasting (anders dan de eerste)
@@ -1015,9 +1016,9 @@ LocalTax2IsUsedDescES=Het IRPF-tarief standaard bij het maken van prospects, fac
 LocalTax2IsNotUsedDescES=Standaard is de voorgestelde IRPF 0. Einde van de regel.
 LocalTax2IsUsedExampleES=In Spanje, freelancers en onafhankelijke professionals die diensten aanbieden alsmede bedrijven die voor het belastingsysteem van modules hebben gekozen.
 LocalTax2IsNotUsedExampleES=In Spanje zijn het bedrijven die niet onderworpen zijn aan het belastingstelsel van modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
-UseRevenueStamp=Use a tax stamp
-UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+RevenueStampDesc=De "belastingzegel" of "opbrengstzegel" is een vaste belasting die u per factuur betaalt (deze is niet afhankelijk van het factuurbedrag). Het kan ook een procentuele belasting zijn, maar het gebruik van het tweede of derde type belasting is beter voor procentuele belastingen, omdat belastingzegels geen rapportage bieden. Slechts enkele landen gebruiken dit type belasting.
+UseRevenueStamp=Gebruik een belastingzegel
+UseRevenueStampExample=De waarde van het belastingzegel wordt standaard gedefinieerd in de instelling van woordenboeken (%s-%s-%s)
 CalcLocaltax=Rapporten over lokale belastingen
 CalcLocaltax1=Verkopen - Aankopen
 CalcLocaltax1Desc=Lokale belastings rapporten worden berekend met het verschil tussen verkopen en aankopen
@@ -1025,7 +1026,7 @@ CalcLocaltax2=Aankopen
 CalcLocaltax2Desc=Lokale Belastingen rapporten zijn het totaal van balastingen aankopen
 CalcLocaltax3=Verkopen
 CalcLocaltax3Desc=Lokale Belastingen rapporten zijn het totaal van belastingen verkoop
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+NoLocalTaxXForThisCountry=Volgens de instelling van belastingen (Zie %s - %s - %s), wordt deze in uw land niet gebruikt.
 LabelUsedByDefault=Standaard te gebruiken label indien er geen vertaling kan worden gevonden voor de code
 LabelOnDocuments=Etiket op documenten
 LabelOrTranslationKey=Label- of vertaalsleutel
@@ -1116,8 +1117,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Onkostendeclaratie ter goedkeuring
 Delays_MAIN_DELAY_HOLIDAYS=Verzoek voor goedkeuring
 SetupDescription1=Voordat u Dolibarr begint te gebruiken, moeten enkele beginparameters worden gedefinieerd en modules ingeschakeld / geconfigureerd.
 SetupDescription2=De volgende twee secties zijn verplicht (de twee eerste vermeldingen in het Setup-menu):
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Basisparameters die worden gebruikt om het standaardgedrag van uw toepassing aan te passen (bijvoorbeeld voor landgerelateerde functies).
+SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Dit programma is een samenstelling van vele modules / applicaties. De modules die betrekking hebben op uw behoeften moeten worden ingeschakeld en geconfigureerd. Menu-items verschijnen met de activering van deze modules.
 SetupDescription5=Andere items in het Setup-menu beheren optionele parameters.
 LogEvents=Veiligheidsauditgebeurtenissen
 Audit=Audit
@@ -1136,7 +1137,7 @@ LogEventDesc=Schakel logboekregistratie in voor specifieke beveiligingsgebeurten
 AreaForAdminOnly=Setup functies kunnen alleen door <b>Administrator gebruikers</b> worden ingesteld
 SystemInfoDesc=Systeeminformatie is technische informatie welke u in alleen-lezen modus krijgt en alleen door beheerders is in te zien.
 SystemAreaForAdminOnly=Dit gebied is alleen beschikbaar voor beheerders. Gebruikersrechten van Dolibarr kunnen deze beperking niet wijzigen.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+CompanyFundationDesc=Bewerk de gegevens van uw bedrijf / organisatie. Klik op de knop "%s" onderaan de pagina als u klaar bent.
 AccountantDesc=Als u een externe accountant / boekhouder hebt, kunt u hier de informatie bewerken.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters die het uiterlijk en gedrag van Dolibarr beïnvloeden, kunnen hier worden gewijzigd.
@@ -1272,8 +1273,9 @@ RuleForGeneratedPasswords=Regels om wachtwoorden te genereren en te valideren
 DisableForgetPasswordLinkOnLogonPage=De link &quot;Wachtwoord vergeten&quot; niet weergeven op de aanmeldingspagina
 UsersSetup=Gebruikersmoduleinstellingen
 UserMailRequired=E-mail vereist om een nieuwe gebruiker te maken
-UsersDocModules=Document templates for documents generated from user record
-GroupsDocModules=Document templates for documents generated from a group record
+UserHideInactive=Verberg inactieve gebruikers uit alle combinatielijsten van gebruikers (niet aanbevolen: dit kan betekenen dat u op sommige pagina's niet kunt filteren of zoeken op oude gebruikers)
+UsersDocModules=Documentsjablonen voor documenten die zijn gegenereerd op basis van een gebruikersrecord
+GroupsDocModules=Documentsjablonen voor documenten die zijn gegenereerd op basis van een groepsrecord
 ##### HRM setup #####
 HRMSetup=Instellingen HRM module
 ##### Company setup #####
@@ -1305,7 +1307,7 @@ BillsPDFModules=Factuur documentsjablonen
 BillsPDFModulesAccordindToInvoiceType=Factuur documenteert modellen volgens factuurtype
 PaymentsPDFModules=Modellen betaal documenten
 ForceInvoiceDate=Forceer factuurdatum naar validatiedatum
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestedPaymentModesIfNotDefinedInInvoice=Voorgestelde betaalmethode op factuur standaard indien niet gedefinieerd op de factuur
 SuggestPaymentByRIBOnAccount=Stel de betaling voor door opname op rekening
 SuggestPaymentByChequeToAddress=Stel betaling per cheque voor aan
 FreeLegalTextOnInvoices=Vrije tekst op facturen
@@ -1317,7 +1319,7 @@ SupplierPaymentSetup=Instelling leveranciersbetalingen
 PropalSetup=Offertemoduleinstellingen
 ProposalsNumberingModules=Offertenummeringmodules
 ProposalsPDFModules=Offertedocumentsjablonen
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Voorgestelde betaalmethode als standaard indien niet gedefinieerd in het voorstel
 FreeLegalTextOnProposal=Vrije tekst op Offertes
 WatermarkOnDraftProposal=Watermerk op ontwerp offertes (geen indien leeg)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Vraag naar bankrekening bestemming van het voorstel
@@ -1332,7 +1334,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Vraag te gebruiken magazijn bij order
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Vraag naar bankrekeningbestemming van bestelling
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Voorgestelde betaalmethode voor  standaard verkooporder indien niet gedefinieerd in de bestelling
 OrdersSetup=Beheer van verkooporders
 OrdersNumberingModules=Opdrachtennummeringmodules
 OrdersModelModule=Oprachtendocumentsjablonen
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-Bedrijfmoduleinstellingen
 ##### Suppliers #####
 SuppliersSetup=Installatie van leveranciersmodule
 SuppliersCommandModel=Volledige sjabloon van bestelling
-SuppliersCommandModelMuscadet=Volledige sjabloon van bestelling 
+SuppliersCommandModelMuscadet=Volledige sjabloon van bestelling (oude implementatie van cornas-sjabloon)
 SuppliersInvoiceModel=Volledige sjabloon van leveranciersfactuur
 SuppliersInvoiceNumberingModel=Nummeringsmodellen voor leveranciersfacturen
 IfSetToYesDontForgetPermission=Als deze is ingesteld op een niet-nulwaarde, vergeet dan niet om machtigingen te verstrekken aan groepen of gebruikers die zijn toegestaan voor de tweede goedkeuring
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Verberg afbeeldingen in Top menu
 LeftMenuBackgroundColor=Achtergrondkleur voor linkermenu
 BackgroundTableTitleColor=Achtergrondkleur voor tabeltitelregel
 BackgroundTableTitleTextColor=Tekstkleur voor tabeltitelregel
+BackgroundTableTitleTextlinkColor=Tekstkleur linkregel tabeltitel
 BackgroundTableLineOddColor=Achtergrondkleur voor oneven tabellijnen
 BackgroundTableLineEvenColor=Achtergrondkleur voor gelijkmatige tabellijnen
 MinimumNoticePeriod=Minimale opzegtermijn (uw verlofaanvraag moet vóór deze vertraging worden gedaan)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference niet gevonden in Message ID
 FormatZip=Zip
 MainMenuCode=Menu toegangscode (hoofdmenu)
 ECMAutoTree=Toon automatische ECM-structuur
-OperationParamDesc=Definieer waarden die moeten worden gebruikt voor actie of hoe waarden worden geëxtraheerd. Bijvoorbeeld: <br> objproperty1 = SET: abc <br> objproperty1 = SET: een waarde met vervanging van __objproperty1__ <br> objproperty3 = SETIFEMPTY: abc <br> objproperty4 = EXTRACT: HEADER. (. *) X-Myheaderkey * [^ \\ s] + <br> options_myextrafield = EXTRACT: BETREFT: ([^ \\ s] *) <br> object.objproperty5 = EXTRACT: BODY: Mijn bedrijfsnaam is \\ s ([^ \\ s] *) <br><br> Gebruik een ; char als scheidingsteken om meerdere eigenschappen te extraheren of in te stellen.
+OperationParamDesc=Definieer de waarden die u wilt gebruiken voor het object van de actie of hoe u waarden kunt extraheren. Bijvoorbeeld:<br>objproperty1 = SET: de waarde om<br>objproperty2 = SET in te stellen: een waarde met vervanging van __objproperty1__<br> objproperty3 = SETIFEMPTY:waarde gebruikt als objproperty3 is niet EX4: a2 = a0: ([^ \\ s] *)<br>options_myextrafield1 = EXTRACT: SUBJECT: ([^ & # 92; n] *) <br> object.objproperty5 = EXTRACT: BODY: Mijn bedrijfsnaam is \\ s ([^ \\ s] *) a0342ff <br> Gebruik het ; char als scheidingsteken om verschillende eigenschappen te extraheren of in te stellen.
 OpeningHours=Openingstijden
 OpeningHoursDesc=Voer hier de reguliere openingstijden van uw bedrijf in.
 ResourceSetup=Configuratie van bronmodule
@@ -1991,7 +1994,9 @@ MakeAnonymousPing=Maak een anonieme ping &#39;+1&#39; naar de Dolibarr-fundering
 FeatureNotAvailableWithReceptionModule=Functie niet beschikbaar wanneer module-ontvangst is ingeschakeld
 EmailTemplate=Sjabloon voor e-mail
 EMailsWillHaveMessageID=E-mails hebben een tag 'Verwijzingen' die overeenkomen met deze syntaxis
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
+PDF_USE_ALSO_LANGUAGE_CODE=Als u wilt dat sommige teksten in uw PDF worden gedupliceerd in 2 verschillende talen in dezelfde gegenereerde PDF, moet u hier deze tweede taal instellen, zodat de gegenereerde PDF 2 verschillende talen op dezelfde pagina bevat, degene die is gekozen bij het genereren van PDF en deze ( slechts enkele PDF-sjablonen ondersteunen dit). Voor 1 taal per pdf leeg houden.
 FafaIconSocialNetworksDesc=Voer hier de code van een FontAwesome-pictogram in. Als je niet weet wat FontAwesome is, kun je het generieke waarde fa-adresboek gebruiken.
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
+RssNote=Opmerking: elke RSS-feeddefinitie biedt een widget die u moet inschakelen om deze beschikbaar te hebben in het dashboard
+JumpToBoxes=Ga naar Setup -> Widgets
+MeasuringUnitTypeDesc=Gebruik hier een waarde als "grootte", "oppervlakte", "volume", "gewicht", "tijd"
+MeasuringScaleDesc=De schaal is het aantal plaatsen dat u nodig heeft om het decimale gedeelte te verplaatsen zodat het overeenkomt met de standaard referentie-eenheid. Voor het type "tijd" is dit het aantal seconden. Waarden tussen 80 en 99 zijn gereserveerde waarden.
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 7e711e58431..ecbaf1f36d6 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -209,20 +209,13 @@ NumberOfBillsByMonth=Aantal facturen per maand
 AmountOfBills=Bedrag van de facturen
 AmountOfBillsHT=Bedrag van facturen (excl. BTW)
 AmountOfBillsByMonthHT=Totaal aan facturen per maand (excl. belasting)
-ShowSocialContribution=Toon sociale/fiscale belasting
-ShowBill=Toon factuur
-ShowInvoice=Toon factuur
-ShowInvoiceReplace=Toon vervangingsfactuur
-ShowInvoiceAvoir=Toon creditnota
-ShowInvoiceDeposit=Bekijk factuurbetalingen
-ShowInvoiceSituation=Situatie factuur weergeven
 UseSituationInvoices=Situatiefactuur toestaan
 UseSituationInvoicesCreditNote=Toestaan factuur creditnota
 Retainedwarranty=Ingehouden garantie
-AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
+AllowedInvoiceForRetainedWarranty=Behouden garantie bruikbaar op de volgende soorten facturen
 RetainedwarrantyDefaultPercent=Standaardgarantiepercentage behouden
-RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
-RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
+RetainedwarrantyOnlyForSituation=Maak "bewaarde garantie" alleen beschikbaar voor situatie facturen
+RetainedwarrantyOnlyForSituationFinal=Op facturen van situaties wordt de globale aftrek voor "behouden garantie" alleen toegepast op de eindsituatie
 ToPayOn=Te betalen op %s
 toPayOn=te betalen op %s
 RetainedWarranty=Ingehouden garantie
@@ -233,7 +226,6 @@ setretainedwarranty=Set behouden garantie
 setretainedwarrantyDateLimit=Stel de bewaarde garantiedatumlimiet in
 RetainedWarrantyDateLimit=Behouden garantiedatum limiet
 RetainedWarrantyNeed100Percent=De situatiefactuur moet 100%% zijn om op de PDF te worden weergegeven
-ShowPayment=Toon betaling
 AlreadyPaid=Reeds betaald
 AlreadyPaidBack=Reeds terugbetaald
 AlreadyPaidNoCreditNotesNoDeposits=Reeds betaald (zonder creditnota's en stortingen's)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Gegenereerd van sjabloonfactuur %s
 WarningInvoiceDateInFuture=Waarschuwing, de factuurdatum ligt hoger dan de huidige datum
 WarningInvoiceDateTooFarInFuture=Waarschuwing, de factuurdatum ligt te ver van de huidige datum
 ViewAvailableGlobalDiscounts=Bekijk beschikbare kortingen
+GroupPaymentsByModOnReports=Groepeer betalingen per modus op rapporten
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Vervalt bij ontvangst
@@ -512,11 +505,11 @@ ToMakePayment=Betaal
 ToMakePaymentBack=Terugbetalen
 ListOfYourUnpaidInvoices=Lijst van onbetaalde facturen
 NoteListOfYourUnpaidInvoices=Nota: deze lijst bevat enkel facturen voor derde partijen waarvoor je als verkoopsvertegenwoordiger aangegeven bent.
-RevenueStamp=Tax stamp
+RevenueStamp=Belastingzegel
 YouMustCreateInvoiceFromThird=Deze optie is alleen beschikbaar wanneer u een factuur maakt op het tabblad "Klant" van een relatie
 YouMustCreateInvoiceFromSupplierThird=Deze optie is alleen beschikbaar bij het maken van een factuur op het tabblad "Leverancier" bij relatie
 YouMustCreateStandardInvoiceFirstDesc=Maak eerst een standaard factuur en converteer naar een sjabloon om deze als sjabloon te gebruiken
-PDFCrabeDescription=Factuur PDF-sjabloon Crabe. Een volledig factuursjabloon 
+PDFCrabeDescription=Factuur PDF-sjabloon Crabe. Een volledig factuursjabloon (oude implementatie van Sponge-sjabloon)
 PDFSpongeDescription=Factuur PDF-sjabloon Sponge. Een complete sjabloon voor een factuur
 PDFCrevetteDescription=Factuur PDF-sjabloon 'Crevette'. Een compleet sjabloon voor facturen
 TerreNumRefModelDesc1=Geeft een getal in de vorm van %syymm-nnnn voor standaard facturen en %syymm-nnnn voor creditnota's, met yy voor jaar, mm voor maand en nnnn als opeenvolgende getallenreeks die niet terug op 0 komt
@@ -578,4 +571,4 @@ AutoFillDateTo=Stel de einddatum in voor de servicelijn met de volgende factuur-
 AutoFillDateToShort=Tot datum
 MaxNumberOfGenerationReached=Max aantal gegenereerd bereikt
 BILL_DELETEInDolibarr=Factuur verwijderd
-BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
+BILL_SUPPLIER_DELETEInDolibarr=Leverancierfactuur verwijderd
diff --git a/htdocs/langs/nl_NL/blockedlog.lang b/htdocs/langs/nl_NL/blockedlog.lang
index ef56512687e..f455e80d1d6 100644
--- a/htdocs/langs/nl_NL/blockedlog.lang
+++ b/htdocs/langs/nl_NL/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Niet aanpasbare logboeken
 ShowAllFingerPrintsMightBeTooLong=Toon alle gearchiveerde logs (kunnen lang zijn)
 ShowAllFingerPrintsErrorsMightBeTooLong=Toon alle ongeldige archieflogboeken (kunnen lang zijn)
 DownloadBlockChain=Vingerafdrukken downloaden
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Gearchiveerde logboekinvoer is niet geldig. Het betekent dat iemand (een hacker?) Sommige gegevens van dit record heeft gewijzigd nadat het is opgenomen of het vorige gearchiveerde record heeft gewist (controleer of die regel met het vorige # bestaat).
 OkCheckFingerprintValidity=Gearchiveerde logboekrecord is geldig. De gegevens op deze regel zijn niet gewijzigd en de invoer volgt op de vorige.
 OkCheckFingerprintValidityButChainIsKo=Gearchiveerd log lijkt geldig in vergelijking met de vorige, maar de ketting was eerder beschadigd.
 AddedByAuthority=Opgeslagen in autoriteit op afstand
diff --git a/htdocs/langs/nl_NL/boxes.lang b/htdocs/langs/nl_NL/boxes.lang
index a15f7a40511..a2134a6df91 100644
--- a/htdocs/langs/nl_NL/boxes.lang
+++ b/htdocs/langs/nl_NL/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Laatste %s opgenomen leveranciers
 BoxTitleLastModifiedSuppliers=Verkopers: laatste %s gewijzigd
 BoxTitleLastModifiedCustomers=Klanten: laatste %s gewijzigd
 BoxTitleLastCustomersOrProspects=Laatste %s klanten of prospects
-BoxTitleLastCustomerBills=Laatste %s Klantfacturen
-BoxTitleLastSupplierBills=Laatste %s Leveranciersfacturen
+BoxTitleLastCustomerBills=Laatste %s gewijzigde klantfacturen
+BoxTitleLastSupplierBills=Laatste %s gewijzigde leveranciersfacturen
 BoxTitleLastModifiedProspects=Vooruitzichten: laatste %s gewijzigd
 BoxTitleLastModifiedMembers=Laatste %s leden
 BoxTitleLastFicheInter=Laatste %s aangepaste interventies
diff --git a/htdocs/langs/nl_NL/cashdesk.lang b/htdocs/langs/nl_NL/cashdesk.lang
index cb263dc77e9..cbb692314ea 100644
--- a/htdocs/langs/nl_NL/cashdesk.lang
+++ b/htdocs/langs/nl_NL/cashdesk.lang
@@ -16,7 +16,7 @@ AddThisArticle=Voeg dit artikel
 RestartSelling=Ga terug op de verkopen
 SellFinished=Verkoop gereed
 PrintTicket=Print bon
-SendTicket=Send ticket
+SendTicket=Bon versturen
 NoProductFound=Geen artikel gevonden
 ProductFound=product gevonden
 NoArticle=Geen artikel
@@ -49,7 +49,7 @@ Footer=Voetnoot
 AmountAtEndOfPeriod=Bedrag aan het einde van de periode (dag, maand of jaar)
 TheoricalAmount=Theoretisch bedrag
 RealAmount=Aanwezig bedrag
-CashFence=Cash fence
+CashFence=Cash hek
 CashFenceDone=Kas te ontvangen voor de periode
 NbOfInvoices=Aantal facturen
 Paymentnumpad=Soort betaling om de betaling in te voeren
@@ -60,9 +60,9 @@ TakeposNeedsCategories=TakePOS heeft product-categorieën nodig om te werken
 OrderNotes=Verkoop notities
 CashDeskBankAccountFor=Standaardrekening voor betalingen
 NoPaimementModesDefined=Geen betaalmethode gedefinieerd in TakePOS-configuratie
-TicketVatGrouped=Group VAT by rate in tickets|receipts
-AutoPrintTickets=Automatically print tickets|receipts
-PrintCustomerOnReceipts=Print customer on tickets|receipts
+TicketVatGrouped=Groep BTW op tarief in tickets | kwitanties
+AutoPrintTickets=Print automatisch tickets | bonnen
+PrintCustomerOnReceipts=Druk klant af op tickets | kwitanties
 EnableBarOrRestaurantFeatures=Functies inschakelen voor Bar of Restaurant
 ConfirmDeletionOfThisPOSSale=Bevestig je de verwijdering van deze huidige verkoop?
 ConfirmDiscardOfThisPOSSale=Wilt u deze huidige verkoop weggooien?
@@ -87,22 +87,24 @@ SupplementCategory=Toevoeging categorie
 ColorTheme=Kleur thema
 Colorful=Kleurrijk
 HeadBar=Hoofdbalk
-SortProductField=Field for sorting products
+SortProductField=Veld voor het sorteren van producten
 Browser=Browser
-BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
-TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
-PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
-ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
-CashDeskRefNumberingModules=Numbering module for cash desk
-CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
-TakeposGroupSameProduct=Group same products lines
-StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
-CloseCashFence=Close cash fence
-CashReport=Cash report
-MainPrinterToUse=Main printer to use
-OrderPrinterToUse=Order printer to use
-MainTemplateToUse=Main template to use
-OrderTemplateToUse=Order template to use
+BrowserMethodDescription=Eenvoudig en gemakkelijk afdrukken van bonnen. Slechts een paar parameters om de bon te configureren. Afdrukken via browser.
+TakeposConnectorMethodDescription=Externe module met extra functies. Mogelijkheid om vanuit de cloud af te drukken.
+PrintMethod=Afdrukmethode
+ReceiptPrinterMethodDescription=Krachtige methode met veel parameters. Volledig aanpasbaar met sjablonen. Kan niet afdrukken vanuit de cloud.
+ByTerminal=Per terminal
+TakeposNumpadUsePaymentIcon=Gebruik betalingspictogram op numpad
+CashDeskRefNumberingModules=Nummeringsmodule voor POS-verkoop
+CashDeskGenericMaskCodes6 =  <br><b>{TN}</b> tag wordt gebruikt om het terminalnummer toe te voegen
+TakeposGroupSameProduct=Groepeer dezelfde productlijnen
+StartAParallelSale=Start een nieuwe parallelle verkoop
+ControlCashOpening=Controle kassa bij opening pos
+CloseCashFence=Sluit de kassa
+CashReport=Kassa verslag
+MainPrinterToUse=Hoofdprinter om te gebruiken
+OrderPrinterToUse=Bestel printer om te gebruiken
+MainTemplateToUse=Hoofdsjabloon om te gebruiken
+OrderTemplateToUse=Bestelsjabloon te gebruiken
+BarRestaurant=Bar Restaurant
+AutoOrder=Automatische bestelling van klant
diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang
index 505de75929f..c7f89fd4180 100644
--- a/htdocs/langs/nl_NL/categories.lang
+++ b/htdocs/langs/nl_NL/categories.lang
@@ -63,13 +63,7 @@ AccountsCategoriesShort=Labels/categorieën rekeningen
 ProjectsCategoriesShort=Labels/categorieën projecten
 UsersCategoriesShort=Gebruikers tags / categorieën
 StockCategoriesShort=Magazijn-tags / categorieën
-ThisCategoryHasNoProduct=Deze categorie bevat geen producten.
-ThisCategoryHasNoSupplier=Deze categorie bevat geen leveranciers.
-ThisCategoryHasNoCustomer=Deze categorie bevat geen enkele afnemer.
-ThisCategoryHasNoMember=Deze categorie bevat geen enkel lid.
-ThisCategoryHasNoContact=Deze categorie bevat geen enkel contact.
-ThisCategoryHasNoAccount=Deze categorie bevat geen account.
-ThisCategoryHasNoProject=Deze categorie bevat geen project.
+ThisCategoryHasNoItems=Deze categorie bevat geen items.
 CategId=Label/categorie id
 CatSupList=Lijst met leverancierslabels/categorieën
 CatCusList=Lijst van de klant/prospect kenmerken/categorieën
@@ -78,7 +72,7 @@ CatMemberList=Lijst leden kenmerken/categorieën
 CatContactList=Lijst met contactpersoon labels/-categorieën
 CatSupLinks=Koppelingen tussen leveranciers en kenmerken/categorieën
 CatCusLinks=Koppelingen tussen klanten/prospects en labels/categorieën
-CatContactsLinks=Links between contacts/addresses and tags/categories
+CatContactsLinks=Koppelingen tussen contacten / adressen en tags / categorieën
 CatProdLinks=Koppelingen tussen producten/diensten en labels/categorieën
 CatProJectLinks=Koppelingen tussen projecten en labels/categorieën
 DeleteFromCat=Verwijderen uit labels/categorie
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index 024acf55a55..77adb7a1898 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -325,7 +325,8 @@ CompanyDeleted=Bedrijf '%s' verwijderd uit de database.
 ListOfContacts=Contactpersonen- / adressenlijst
 ListOfContactsAddresses=Contactpersonen- / adressenlijst
 ListOfThirdParties=Lijst van derden
-ShowContact=Toon contactpersoon
+ShowCompany=Relatie
+ShowContact=Contact adres
 ContactsAllShort=Alle (Geen filter)
 ContactType=Type contactpersoon
 ContactForOrders=Opdrachtencontactpersoon
@@ -446,7 +447,7 @@ SaleRepresentativeFirstname=Vertegenwoordiger voornaam
 SaleRepresentativeLastname=Vertegenwoordiger achternaam
 ErrorThirdpartiesMerge=Er is een fout opgetreden bij het verwijderen van de relatie. Controleer het log. Wijzigingen zijn ongedaan gemaakt.
 NewCustomerSupplierCodeProposed=Klant- of leverancierscode die al wordt gebruikt, wordt een nieuwe code voorgesteld
-KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+KeepEmptyIfGenericAddress=Houd dit veld leeg als dit adres het standaard adres is
 #Imports
 PaymentTypeCustomer=Betalingswijze - Klant
 PaymentTermsCustomer=Betalingsvoorwaarden - Klant
diff --git a/htdocs/langs/nl_NL/modulebuilder.lang b/htdocs/langs/nl_NL/modulebuilder.lang
index a3a40cb1ca9..4ad2497172a 100644
--- a/htdocs/langs/nl_NL/modulebuilder.lang
+++ b/htdocs/langs/nl_NL/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=Lijst met woordenboekingangen
 ListOfPermissionsDefined=Lijst met gedefinieerde machtigingen
 SeeExamples=Zie hier voorbeelden
 EnabledDesc=Voorwaarde om dit veld actief te hebben (voorbeelden: 1 of $ conf-&gt; global-&gt; MYMODULE_MYOPTION)
-VisibleDesc=Is het veld zichtbaar? (Voorbeelden: 0 = Nooit zichtbaar, 1 = Zichtbaar op lijst en formulieren maken / bijwerken / bekijken, 2 = Alleen zichtbaar op lijst, 3 = Zichtbaar op alleen formulier maken / bijwerken / bekijken (niet lijst), 4 = Zichtbaar op lijst en update / weergave alleen formulier (niet aanmaken), 5 = Alleen zichtbaar op lijst eindweergave formulier (niet maken, niet bijwerken) Het gebruik van een negatief waarde betekent dat veld niet standaard wordt weergegeven in de lijst, maar kan worden geselecteerd voor weergave). Het kan een uitdrukking zijn, bijvoorbeeld: <br> preg_match ('/ public /', $ _SERVER ['PHP_SELF'])? 0: 1 <br> ($ user-> rights-> holiday-> define_holiday? 1: 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Kan de waarde van het veld worden gecumuleerd om een totaal in de lijst te krijgen? (Voorbeelden: 1 of 0)
 SearchAllDesc=Wordt het veld gebruikt om een zoekopdracht uit het snelzoekprogramma te doen? (Voorbeelden: 1 of 0)
diff --git a/htdocs/langs/nl_NL/multicurrency.lang b/htdocs/langs/nl_NL/multicurrency.lang
new file mode 100644
index 00000000000..1d9c124018f
--- /dev/null
+++ b/htdocs/langs/nl_NL/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Meerdere valuta
+ErrorAddRateFail=Fout in toegevoegde koers
+ErrorAddCurrencyFail=Fout in toegevoegde valuta
+ErrorDeleteCurrencyFail=Verwijderen fout mislukt
+multicurrency_syncronize_error=Synchronisatiefout: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Gebruik de datum van het document om de wisselkoers te vinden, in plaats van de laatst bekende koers te gebruiken
+multicurrency_useOriginTx=Wanneer een object van een ander wordt gemaakt, moet u de oorspronkelijke koers van het bronobject behouden (gebruik anders de laatst bekende koers)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=U moet een account maken op de website %s om deze functionaliteit te gebruiken. <br> Download uw <b>API-sleutel</b> . <br> Als je een gratis account gebruikt, kunt u de <b>bron (USD</b> standaard) niet veranderen. <br> Als uw hoofdvaluta geen USD is, zal de toepassing deze automatisch opnieuw berekenen. <br><br> U bent beperkt tot 1000 synchronisaties per maand.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Bron valuta
+multicurrency_alternateCurrencySource=Alternatieve bron valuta
+CurrenciesUsed=Gebruikte valuta's
+CurrenciesUsed_help_to_add=Voeg de verschillende valuta's en koersen toe die u moet gebruiken voor uw <b>voorstellen</b>, <b>bestellingen</b> enz.
+rate=koers
+MulticurrencyReceived=Ontvangen, originele valuta
+MulticurrencyRemainderToTake=Resterend bedrag, oorspronkelijke valuta
+MulticurrencyPaymentAmount=Betalingsbedrag, originele valuta
+AmountToOthercurrency=Bedrag in (in valuta van ontvangende account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index 18f66dcf5f5..7cc73cd3184 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service voor gebruik op lijnen
 InvoiceGeneratedFromTimeSpent=Factuur %s is gegenereerd op basis van de tijd besteed aan het project
 ProjectBillTimeDescription=Controleer of u urenstaat invoert voor taken van het project EN u van plan bent om facturen uit de urenstaat te genereren om de klant van het project te factureren (controleer niet of u een factuur wilt creëren die niet is gebaseerd op ingevoerde urenstaten). Opmerking: Om de factuur te genereren, gaat u naar het tabblad 'Bestede tijd' van het project en selecteert u de regels die u wilt opnemen.
 ProjectFollowOpportunity=Volg gelegenheid
-ProjectFollowTasks=Taken volgen
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Gebruik: Kans
 UsageTasks=Gebruik: Taken
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index ec6a14f3860..3634c2a4331 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -57,7 +57,7 @@ NoPageYet=Nog geen pagina's
 YouCanCreatePageOrImportTemplate=U kunt een nieuwe pagina maken of een volledige websitesjabloon importeren
 SyntaxHelp=Help bij specifieke syntax-tips
 YouCanEditHtmlSourceckeditor=U kunt HTML-broncode bewerken met de knop "Bron" in de editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> U kunt PHP-code in deze bron opnemen met behulp van tags <strong>&lt;? Php?&gt;</strong> . De volgende globale variabelen zijn beschikbaar: $ conf, $ db, $ mysoc, $ user, $ website, $ websitepage, $ weblangs. <br><br><span class="fa fa-bug"></span> U kunt ook inhoud van een andere pagina / container met de volgende syntaxis opnemen: <br> <strong>&lt;? php includeContainer (&#39;alias_of_container_to_include&#39;); ?&gt;</strong> <br><br><span class="fa fa-bug"></span> U kunt een omleiding maken naar een andere pagina / container met de volgende syntaxis (Opmerking: voer geen inhoud uit vóór een omleiding): <br> <strong>&lt;? php redirectToContainer (&#39;alias_of_container_to_redirect_to&#39;); ?&gt;</strong> <br><br><span class="fa fa-link"></span> Gebruik de syntaxis om een link naar een andere pagina toe te voegen: <br> <strong>&lt;a href="alias_of_page_to_link_to.php"&gt; mylink &lt;a&gt;</strong> <br><br><span class="fa fa-download"></span> Gebruik de <strong>document.php</strong> wrapper om een <strong>link op te nemen om</strong> een bestand <strong>te downloaden</strong> dat is opgeslagen in de <strong>documentenmap</strong> : <br> Voor een bestand in documenten / ecm (moet worden vastgelegd) is de syntaxis: <br> <strong>&lt;a href="/document.php?modulepart=ecm&amp;file= cialisrelative_dir/Buchfilename.ext"&gt;</strong> <br> Voor een bestand in documenten / media (map openen voor openbare toegang) is syntaxis: <br> <strong>&lt;a href="/document.php?modulepart=medias&amp;file= cialisrelative_dir/Buchfilename.ext"&gt;</strong> <br> Voor een bestand dat wordt gedeeld met een deellink (open toegang met de gedeelde hash-sleutel van het bestand), is de syntaxis: <br> <strong>&lt;a href=&quot;/document.php?hashp=publicsharekeyoffile"&gt;</strong> <br><br><span class="fa fa-picture-o"></span> Gebruik de <strong>viewimage.php</strong> wrapper om een <strong>afbeelding op te nemen die is</strong> opgeslagen in de <strong>documentenmap</strong> : <br> Voor een afbeelding in documenten / media (open directory voor openbare toegang) is de syntaxis: <br> <strong>&lt;img src = ";/ viewimage.php? modulepart = medias &amp; file = [relative_dir /] bestandsnaam.ext"&gt;</strong> <br><br> Meer voorbeelden van HTML of dynamische code beschikbaar in <a href="%s" target="_blank">de wikidocumentatie</a> <br> .
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Kloon pagina/container
 CloneSite=Klonen site
 SiteAdded=Website toegevoegd
@@ -77,7 +77,7 @@ BlogPost=Blogpost
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Maak een website-account
-BackToListOfThirdParty=Terug naar lijst voor relatie
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Schakel website eerst uit
 MyContainerTitle=De titel van mijn website
 AnotherContainer=Zo neemt u inhoud van een andere pagina / container op (mogelijk hebt u hier een foutmelding als u dynamische code inschakelt omdat de ingesloten subcontainer mogelijk niet bestaat)
diff --git a/htdocs/langs/nl_NL/zapier.lang b/htdocs/langs/nl_NL/zapier.lang
new file mode 100644
index 00000000000..41961119393
--- /dev/null
+++ b/htdocs/langs/nl_NL/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier voor Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier voor Dolibarr-module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Installatie van Zapier voor Dolibarr
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index f7e6bdb765f..9fb5af3c472 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -16,7 +16,7 @@ ThisService=Ta usługa
 ThisProduct=Ten produkt
 DefaultForService=Domyślny dla usługi
 DefaultForProduct=Domyślny dla produktu
-CantSuggest=Nie można zaproponować
+CantSuggest=Nie mogę zasugerować
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
 ConfigAccountingExpert=Konfiguracja modułu eksperta księgowego
 Journalization=Dokumentowanie
@@ -97,8 +97,8 @@ MenuTaxAccounts=Konta podatkowe
 MenuExpenseReportAccounts=Konta raportu kosztów
 MenuLoanAccounts=Konta kredytowe
 MenuProductsAccounts=Konta produktów
-MenuClosureAccounts=Closure accounts
-MenuAccountancyClosure=Closure
+MenuClosureAccounts=Zamknięte konta
+MenuAccountancyClosure=Zamknięte
 MenuAccountancyValidationMovements=Validate movements
 ProductsBinding=Konta produktów
 TransferInAccounting=Transfer in accounting
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Linie raportów kosztów do dowiązania
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Powiąż
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Konto księgowe dla zarejestrowanych dotatcji
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Konto księgowe używane domyślnie dla sprzedanych produktów (używane jeżeli nie zdefiniowano konta w arkuszu produktu)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Konto księgowe używane domyślnie dla kupionych usług (używane jeżeli nie zdefiniowano konta w arkuszu produktu)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Konto księgowe używane domyślnie dla sprzedanych usług (używane jeżeli nie zdefiniowano konta w arkuszu produktu)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Grupa konta
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Łączny obrót przed opodatkowaniem
 TotalMarge=Całkowita marża sprzedaży
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Tryb sprzedaży
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Tryb zakupów
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Pokaż wszystkie produkty z kontem księgowym dla sprzedaży
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Pokaż wszystkie produkty z kontem księgowym dla zakupów
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Resetuj wszystkie dowiązania dla wybranego roku
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Zakres konta księgowego
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 7c09b1d09c5..12cc4230876 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Serwer sieci Web użytkownik / grupa
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Kodowanie bazy danych do przechowywania danych
 DBSortingCharset=Kodowanie bazy danych by sortować dane
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Zestawienie klienta
 WarningModuleNotActive=<b>Moduł %s</b> musi być aktywny
@@ -67,8 +68,8 @@ ErrorReservedTypeSystemSystemAuto=Wartość "System" i "systemauto" dla typu jes
 ErrorCodeCantContainZero=Kod nie może zawierać wartości "0"
 DisableJavascript=Wyłączanie funkcji JavaScript i Ajax
 DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
-UseSearchToSelectCompanyTooltip=Także jeśli masz dużą liczbę osób trzecich (> 100 000), można zwiększyć prędkość przez ustawienie stałej COMPANY_DONOTSEARCH_ANYWHERE do 1 w Setup-> Inne. Szukaj zostaną ograniczone do początku łańcucha.
-UseSearchToSelectContactTooltip=Także jeśli masz dużą liczbę osób trzecich (> 100 000), można zwiększyć prędkość przez ustawienie stałej CONTACT_DONOTSEARCH_ANYWHERE do 1 w Setup-> Inne. Szukaj zostaną ograniczone do początku łańcucha.
+UseSearchToSelectCompanyTooltip=Jeśli masz dużą liczbę kontrahentów (> 100 000), można zwiększyć prędkość przez ustawienie stałej COMPANY_DONOTSEARCH_ANYWHERE na 1 w Ustawienia -> Inne. Wyszukiwanie będzie wtedy ograniczone do rozpoczęcia ciągu znaków.
+UseSearchToSelectContactTooltip=Jeśli masz dużą liczbę kontrahentów (> 100 000), można zwiększyć prędkość przez ustawienie stałej COMPANY_DONOTSEARCH_ANYWHERE na 1 w Ustawienia -> Inne. Wyszukiwanie będzie wtedy ograniczone do rozpoczęcia ciągu znaków.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
 NumberOfKeyToSearch=Number of characters to trigger search: %s
@@ -212,7 +213,7 @@ CompatibleUpTo=Kompatybilne z wersją %s
 NotCompatible=ten moduł nie jest kompatybilny z twoją wersją Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
-SeeSetupOfModule=Zobacz konfigurację modułu% s
+SeeSetupOfModule=Zobacz konfigurację modułu %s
 Updated=Zaktualizowane
 Nouveauté=Nowość
 AchatTelechargement=Kup / Pobierz
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Pola wyboru
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link do obiektu
 ComputedFormula=Obliczone pole
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=Domyślnie proponowany IRPF wynosi 0. Koniec zasady.
 LocalTax2IsUsedExampleES=W Hiszpanii, freelancerów i przedstawicieli wolnych zawodów, którzy świadczą usługi i przedsiębiorstwa, którzy wybrali system podatkowy modułów.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Raporty odnośnie podatków lokalnych
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Użytkownicy modułu konfiguracji
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Firma Multi-Moduł konfiguracji
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Ukryj obrazki górnego menu
 LeftMenuBackgroundColor=Kolor tła bocznego menu
 BackgroundTableTitleColor=Kolor tła nagłówka tabeli
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Kolor tła pozostałych lini tabeli
 BackgroundTableLineEvenColor=Kolor tła dla równomiernych lini tabeli
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Kod pocztowy
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index 316c3c46629..9e1721d67a2 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Kwota faktury
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Kwota faktur przez miesiąc (netto)
-ShowSocialContribution=Pokaż składkę ZUS/podatek
-ShowBill=Pokaż fakturę
-ShowInvoice=Pokaż fakturę
-ShowInvoiceReplace=Pokaż faktury zastępcze
-ShowInvoiceAvoir=Pokaż notę kredytową
-ShowInvoiceDeposit=Pokaż fakturę zaliczkową
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Pokaż płatności
 AlreadyPaid=Zapłacono
 AlreadyPaidBack=Zwrócono
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=Pokaż dostępne zniżki
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Zwróć numer w formacie %srrmm-nnnn dla standardowych faktur i %srrmm-nnnn dla not kredytowych, gdzie rr oznacza rok, mm to miesiąc, a nnnn to kolejny niepowtarzalny numer rozpoczynający się od 0
diff --git a/htdocs/langs/pl_PL/donations.lang b/htdocs/langs/pl_PL/donations.lang
index 787d44a37e2..9223bd5affa 100644
--- a/htdocs/langs/pl_PL/donations.lang
+++ b/htdocs/langs/pl_PL/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Tworzenie darowizny
 NewDonation=Nowa darowizna
 DeleteADonation=Usuń darowiznę
 ConfirmDeleteADonation=Czy jesteś pewien, że chcesz usunąć tą dotację?
-ShowDonation=Pokaż darowizny
 PublicDonation=Publiczna dotacja
 DonationsArea=Obszar dotacji
 DonationStatusPromiseNotValidated=Projekt obietnicy
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Szkic
 DonationStatusPromiseValidatedShort=Zatwierdzona
 DonationStatusPaidShort=Odebrano
 DonationTitle=Otrzymanie darowizny
+DonationDate=Donation date
 DonationDatePayment=Data płatności
 ValidPromess=Sprawdź obietnicy
 DonationReceipt=Otrzymanie darowizny
@@ -31,4 +31,4 @@ DONATION_ART200=Pokaż artykuł 200 z CGI, jeśli obawiasz
 DONATION_ART238=Pokaż artykuł 238 z CGI, jeśli obawiasz
 DONATION_ART885=Pokaż artykuł 885 z CGI, jeśli obawiasz
 DonationPayment=Płatności Darowizna
-DonationValidated=Donation %s validated
+DonationValidated=Dotacja %s zatwierdzona
diff --git a/htdocs/langs/pl_PL/interventions.lang b/htdocs/langs/pl_PL/interventions.lang
index 895256f21f6..130ddc8c964 100644
--- a/htdocs/langs/pl_PL/interventions.lang
+++ b/htdocs/langs/pl_PL/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Obszar interwencji
 DraftFichinter=Szkic interwencji
 LastModifiedInterventions=Ostatnie %s zmodyfikowane interwencje
 FichinterToProcess=Interwencje do przetworzenia
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=W ślad za kontakt z klientem
-# Modele numérotation
 PrintProductsOnFichinter=Wydrukuj również linie typu "produkt" (nie tylko usługi) na karcie interwencji
 PrintProductsOnFichinterDetails=Interwencje generowane z zamówień
 UseServicesDurationOnFichinter=Użyj czasu trwania usług dla interwencji generowanych przez zamówienia
@@ -53,14 +51,16 @@ InterventionStatistics=Statystyki interwencji
 NbOfinterventions=Ilość kart interwencji
 NumberOfInterventionsByMonth=Ilość kart interwencji w miesiącu (data potwierdzenia)
 AmountOfInteventionNotIncludedByDefault=Ilość interwencji nie jest domyślnie uwzględniana w zysku (w większości przypadków do obliczania czasu wykorzystano karty czasu pracy). Ustaw opcję PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT na 1 w konfiguracji domowej - inne, aby je uwzględnić.
-##### Exports #####
 InterId=ID interwencji
 InterRef=Numer referencyjny interwencji
 InterDateCreation=Data stworzenia interwencji
 InterDuration=Czas trwania interwencji
 InterStatus=Status interwencji
 InterNote=Nota interwencji
+InterLine=Line of intervention
 InterLineId=Linia ID interwencji
 InterLineDate=Linia daty interwencji
 InterLineDuration=Linia czasu trwania interwencji
 InterLineDesc=Lini aopisu interwencji
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/pl_PL/modulebuilder.lang b/htdocs/langs/pl_PL/modulebuilder.lang
index 5d15c004229..c8761c676dc 100644
--- a/htdocs/langs/pl_PL/modulebuilder.lang
+++ b/htdocs/langs/pl_PL/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 4e3eb48d808..901ef507521 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/pl_PL/receptions.lang b/htdocs/langs/pl_PL/receptions.lang
index 4b07088e8d7..c57de4ca1fe 100644
--- a/htdocs/langs/pl_PL/receptions.lang
+++ b/htdocs/langs/pl_PL/receptions.lang
@@ -22,10 +22,10 @@ OtherReceptionsForSameOrder=Other receptions for this order
 ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Anulowany
-StatusReceptionDraft=Projekt
+StatusReceptionDraft=Szkic
 StatusReceptionValidated=Zatwierdzone (produkty do wysyłki lub już wysłane)
 StatusReceptionProcessed=Przetwarzany
-StatusReceptionDraftShort=Projekt
+StatusReceptionDraftShort=Szkic
 StatusReceptionValidatedShort=Zatwierdzony
 StatusReceptionProcessedShort=Przetwarzany
 ReceptionSheet=Reception sheet
diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
index 3a2a005d91d..d74de4c3978 100644
--- a/htdocs/langs/pl_PL/website.lang
+++ b/htdocs/langs/pl_PL/website.lang
@@ -57,7 +57,7 @@ NoPageYet=Brak stron
 YouCanCreatePageOrImportTemplate=Możesz utworzyć nową stronę albo załadować pełny szablon witryny
 SyntaxHelp=Pomoc na temat określonych wskazówek dotyczących składni
 YouCanEditHtmlSourceckeditor=Możesz edytować kod źródłowy HTML używając przycisku „Źródło” w edytorze.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Możesz dołączyć kod PHP do tego źródła używając znaczników <strong>&lt;?php ?&gt;</strong>. Dostępne są następujące zmienne globalne: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> Możesz także dołączyć zawartość innej web strony/pojemnika o następującej składni:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> Można zrobić przekierowanie do innej web strony/pojemnika z następującą składnią (Uwaga: nie wyprowadzaj jakiejkolwiek zawartości przed przekierowaniem):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> Aby dodać link do innej web strony użyj składni:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> Aby umieścić <strong>odsyłacz do pobrania</strong> pliku przechowywanego w katalogu <strong>documents</strong>, użyj funkcji opakowującej <strong>document.php</strong> :<br>Na przykład, dla pliku w documents/ecm składnia to:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Dla pliku w documents/medias (katalog otwarty na dostęp publiczny) składnia to:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> By dołączyć <strong>obraz</strong> przechowywany w katalogu <strong>documents</strong> użyj funkcji opakowującej <strong>viewimage.php</strong>:<br>Na przykład, dla obrazu w documents/medias (katalog otwarty na dostęp publiczny) składnia to:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>Więcej przykładów HTML lub kodu dynamicznego dostępnych jest w<a href="%s" target="_blank">dokumentacji typu wiki</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Powiel stronę/pojemnik
 CloneSite=Duplikuj stronę
 SiteAdded=Dodano witrynę
@@ -77,7 +77,7 @@ BlogPost=Post na blogu
 WebsiteAccount=Konto witryny
 WebsiteAccounts=Konta witryny
 AddWebsiteAccount=Utwórz konto witryny
-BackToListOfThirdParty=Wróć do listy Stron Trzecich
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Najpierw wyłącz witrynę
 MyContainerTitle=Tytuł mojej witryny
 AnotherContainer=W ten sposób można dołączyć zawartość innej web strony/pojemnika (może pojawić się błąd, gdy włączysz obsługę kodu dynamicznego a wbudowany podrzędny pojemnik nie istnieje)
diff --git a/htdocs/langs/pl_PL/zapier.lang b/htdocs/langs/pl_PL/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/pl_PL/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/pt_BR/donations.lang b/htdocs/langs/pt_BR/donations.lang
index 60d99b0518d..023e3e72172 100644
--- a/htdocs/langs/pt_BR/donations.lang
+++ b/htdocs/langs/pt_BR/donations.lang
@@ -15,7 +15,6 @@ DonationStatusPromiseValidatedShort=Validada
 DonationTitle=Recibo de doação
 DonationReceipt=Recibo de doação
 DonationsModels=Modelo de documento de recepção de Doação
-LastModifiedDonations=Últimas %s doações modificadas
 DonationRecipient=Recipiente doaçaõ
 IConfirmDonationReception=O beneficiário declara ter recebido, como doação, o seguinte montante
 MinimumAmount=O montante mínimo é de %s
diff --git a/htdocs/langs/pt_BR/zapier.lang b/htdocs/langs/pt_BR/zapier.lang
new file mode 100644
index 00000000000..a89605c4809
--- /dev/null
+++ b/htdocs/langs/pt_BR/zapier.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - zapier
+ModuleZapierForDolibarrName =Zapier para Dolibarr
+ModuleZapierForDolibarrDesc =Módulo Zapier para Dolibarr
+ZapierForDolibarrSetup =Configurações do Zapier para Dolibarr
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index f779449974d..7718a78ead4 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Linhas vinculadas de faturas
 ExpenseReportLines=Linhas de relatórios de despesas para vincular
 ExpenseReportLinesDone=Linhas vinculadas de relatórios de despesas
 IntoAccount=Vincular linha com a conta contabilística
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Vincular
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Conta contabilística para registar donativos
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Conta contabilística padrão para produtos vendidos (utilizada se não for definida na folha de produto)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Conta contabilística padrão para compra de serviços (usada se não for definida na folha de serviço)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Conta contabilística padrão para serviços vendidos (usada se não for definida na folha de serviço)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Pagamento não vinculado a nenhum produto / serviço
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Grupo de conta
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total de volume de negócios sem impostos
 TotalMarge=Margem total de vendas
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Exportar CSV configurável
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=ID de plano de contas
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Modo de vendas
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Modo de compras
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Mostrar todos os produtos com conta contabilística para as vendas.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Mostrar todos os produtos com conta contabilística para as compras.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remover o código contábil das linhas que não existem nos gráficos de contas
 CleanHistory=Repor todas as vinculações para o ano selecionado
 PredefinedGroups=Grupos pré-definidos
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Gama da conta contabilística
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 53c118f9204..691132ea152 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Utilizador/grupo do servidor da Web
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Conjunto de carateres  da base de dados para guardar os dados
 DBSortingCharset=Conjunto de carateres da base de dados para ordenar os dados
+HostCharset=Host charset
 ClientCharset=Jogo de caráter Cliente
 ClientSortingCharset=Colação de clientes
 WarningModuleNotActive=O módulo <b>%s</b> deve estar ativado
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Caixas de marcação
 ExtrafieldCheckBoxFromList=Caixas de marcação da tabela
 ExtrafieldLink=Vincular a um objeto
 ComputedFormula=Campo calculado
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Deixar esse campo em branco significa que esse valor será armazenado sem criptografia (o campo deve ser oculto apenas com estrela na tela). <br> Defina 'auto' para usar a regra de criptografia padrão para salvar a senha no banco de dados (o valor lido será o hash apenas, nenhuma maneira de recuperar o valor original)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=A taxa de IRPF por padrão ao criar prospetos, faturas, or
 LocalTax2IsNotUsedDescES=Por defeito, o IRS proposto é 0. Fim da regra.
 LocalTax2IsUsedExampleES=Em Espanha, os freelancers e profissionais liberais que prestam serviços e empresas que escolheram o regime fiscal dos módulos.
 LocalTax2IsNotUsedExampleES=Em Espanha, são empresas não sujeitas ao sistema fiscal de módulos.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Relatórios sobre impostos locais
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Configuração do módulo "Utilizadores"
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Configuração do módulo "Multi-empresa"
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Ocultar imagens no menu do topo
 LeftMenuBackgroundColor=Cor de fundo para o menu à esquerda
 BackgroundTableTitleColor=A cor do fundo para a linha de título das tabelas
 BackgroundTableTitleTextColor=Cor do texto para a linha de título da tabela
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=A cor do fundo para as linhas ímpares da tabela
 BackgroundTableLineEvenColor=Cor de fundo para linhas pares da tabela
 MinimumNoticePeriod=Período mínimo de notificação (o seu pedido de licença deve ser feito antes deste período)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Código postal
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index 2dacb43642f..0aeb6ee5df7 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=N.ª de faturas por mês
 AmountOfBills=Montante das faturas
 AmountOfBillsHT=Quantidade de faturas (líquidas de imposto)
 AmountOfBillsByMonthHT=Quantidade de faturas por mês (sem IVA)
-ShowSocialContribution=Mostrar imposto social/fiscal
-ShowBill=Ver fatura
-ShowInvoice=Ver fatura
-ShowInvoiceReplace=Ver fatura retificativa
-ShowInvoiceAvoir=Ver deposito
-ShowInvoiceDeposit=Mostrar fatura de adiantamento
-ShowInvoiceSituation=Mostrar fatura da situação
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Mostrar pagamento
 AlreadyPaid=Já e
 AlreadyPaidBack=Já reembolsado
 AlreadyPaidNoCreditNotesNoDeposits=Já pago (sem notas de crédito e adiantamentos)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Atenção, a data da fatura é maior que a data atual
 WarningInvoiceDateTooFarInFuture=Atenção, a data da fatura está muito longe da data atual
 ViewAvailableGlobalDiscounts=Ver descontos disponíveis
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Estado
 PaymentConditionShortRECEP=Pronto Pagamento
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=Você precisa criar uma fatura padrão primeiro e convertê-la em "modelo" para criar uma nova fatura modelo
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Modelo PDF da fatura Esponja. Um modelo de fatura completo
 PDFCrevetteDescription=Modelo PDF da fatura Crevette. Um modelo de fatura completo para faturas de situação
 TerreNumRefModelDesc1=Devolve o número com o formato %syymm-nnnn para facturas standard e %syymm-nnnn para notas de crédito em que yy é ano, mm é mês e nnnn é uma sequência sem pausa e sem retorno a 0
diff --git a/htdocs/langs/pt_PT/donations.lang b/htdocs/langs/pt_PT/donations.lang
index e913dcbe1e2..4eb12222791 100644
--- a/htdocs/langs/pt_PT/donations.lang
+++ b/htdocs/langs/pt_PT/donations.lang
@@ -4,10 +4,9 @@ Donations=Donativos
 DonationRef=Ref. do donativo
 Donor=Doador
 AddDonation=Crie uma donativo
-NewDonation=Novo Donativo
+NewDonation=Novo donativo
 DeleteADonation=Eliminar um donativo
 ConfirmDeleteADonation=Tem a certeza de que deseja eliminar este donativo? 
-ShowDonation=Mostrar Donativo
 PublicDonation=Donativo Público
 DonationsArea=Área de Donativos
 DonationStatusPromiseNotValidated=Promessa em rascunho
@@ -17,11 +16,12 @@ DonationStatusPromiseNotValidatedShort=Rascunho
 DonationStatusPromiseValidatedShort=Validado
 DonationStatusPaidShort=Recebido
 DonationTitle=Recibo do donativo
+DonationDate=Donation date
 DonationDatePayment=Data de pagamento
 ValidPromess=Validar promessa
 DonationReceipt=Recibo do Donativo
 DonationsModels=Modelos de documentos dos recibos de donativos
-LastModifiedDonations=%s Últimas doações modificadas
+LastModifiedDonations=Últimas %s doações modificadas
 DonationRecipient=Destinatário do Donativo
 IConfirmDonationReception=O destinatário declarou a receção, como um donativo, do seguinte montante
 MinimumAmount=O montante mínimo é %s
diff --git a/htdocs/langs/pt_PT/interventions.lang b/htdocs/langs/pt_PT/interventions.lang
index f6cc216b282..00fd605bc8a 100644
--- a/htdocs/langs/pt_PT/interventions.lang
+++ b/htdocs/langs/pt_PT/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Área de Intervenções
 DraftFichinter=Intervenções rascunho
 LastModifiedInterventions=Últimas %s intervenções modificadas 
 FichinterToProcess=Intervenções a processar
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Contacto do cliente do seguimiento da intervenção
-# Modele numérotation
 PrintProductsOnFichinter=Imprimir também linhas do tipo "produto" (não apenas serviços) na ficha de intervenção
 PrintProductsOnFichinterDetails=intervenções geradas a partir de encomendas
 UseServicesDurationOnFichinter=Utilizar a duração do serviço para as intervenções geradas a partir de encomendas
@@ -53,14 +51,16 @@ InterventionStatistics=Estatísticas das intervenções
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=O montante da intervenção não é incluído, por defeito, no lucro (na maioria dos casos, os quadros de horários são usados ​​para contar o tempo gasto). Adicione a opção PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT com o valor 1 em Inicio->Configurações->Outras configurações para incluí-los.
-##### Exports #####
 InterId=ID da intervenção
 InterRef=Ref. da intervenção
 InterDateCreation=Data de criação da intervenção
 InterDuration=Duração da intervenção
 InterStatus=Estado da intervenção
 InterNote=Nota da intervenção
+InterLine=Line of intervention
 InterLineId=ID da intervenção na linha
 InterLineDate=Data da intervenção na linha
 InterLineDuration=Duração da intervenção na linha
 InterLineDesc=Descrição da intervenção na linha
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/pt_PT/modulebuilder.lang b/htdocs/langs/pt_PT/modulebuilder.lang
index 893002e52c2..8fde0ce0fc6 100644
--- a/htdocs/langs/pt_PT/modulebuilder.lang
+++ b/htdocs/langs/pt_PT/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=Lista de permissões definidas
 SeeExamples=Veja exemplos aqui
 EnabledDesc=Condição para ter este campo ativo (Exemplos: 1 ou $ conf-> global-> MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=O valor do campo pode ser acumulado para obter um total na lista? (Exemplos: 1 ou 0)
 SearchAllDesc=O campo é usado para fazer uma pesquisa a partir da ferramenta de pesquisa rápida? (Exemplos: 1 ou 0)
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index d1ec4809bb8..7720b8f1c77 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang
index 404cb9f8cec..db1c9d13c3a 100644
--- a/htdocs/langs/pt_PT/website.lang
+++ b/htdocs/langs/pt_PT/website.lang
@@ -57,7 +57,7 @@ NoPageYet=Ainda sem páginas
 YouCanCreatePageOrImportTemplate=Você pode criar uma nova página ou importar um modelo de site completo
 SyntaxHelp=Ajuda em dicas de sintaxe específicas
 YouCanEditHtmlSourceckeditor=Você pode editar o código-fonte HTML usando o botão "Fonte" no editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Página / contêiner clone
 CloneSite=Site clone
 SiteAdded=Website adicionado
@@ -77,7 +77,7 @@ BlogPost=Postagem no blog
 WebsiteAccount=Conta do site
 WebsiteAccounts=Contas do site
 AddWebsiteAccount=Crie uma conta do site
-BackToListOfThirdParty=Voltar para lista de terceiros
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Desativar primeiro site
 MyContainerTitle=Meu título do site
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/pt_PT/zapier.lang b/htdocs/langs/pt_PT/zapier.lang
new file mode 100644
index 00000000000..db32d03ccc0
--- /dev/null
+++ b/htdocs/langs/pt_PT/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier para o módulo Dolibarr
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Configuração do Zapier para Dolibarr
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index a112e86b8ef..3f2c550facb 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Asociaza liniile facturii
 ExpenseReportLines=Linii de rapoarte de cheltuieli de asociat
 ExpenseReportLinesDone=Linii asociate de rapoarte de cheltuieli
 IntoAccount=Asociaza linia cu contul contabil
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Asociaza
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Contul contabil pentru a înregistra donații
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Contul Contabilitate pentru a înregistra abonamente
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cont contabil implicit pentru produsele vândute (utilizate dacă nu este definit în fișa produsului)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Contul contabil implicit pentru serviciile cumpărate (utilizat dacă nu este definit în fișa serviciului)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Contul contabil implicit pentru serviciile vândute (utilizat dacă nu este definit în fișa de servicii)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Terț necunoscut
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Contul terț nu este definit sau este necunoscut. Eroare de blocare.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Conturile terț și de așteptare necunoscute nu sunt definite. Eroare de blocare
 PaymentsNotLinkedToProduct=Plata nu legată de vreun produs/serviciu
+OpeningBalance=Opening balance
 ShowOpeningBalance=Afişează  soldurile de deschidere
 HideOpeningBalance=Ascunde soldurile de deschidere
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Grup de conturi
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Cifra de afaceri totală înainte de impozitare
 TotalMarge=Total Marje vânzări
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export pentru Quadratus QuadraCompta
 Modelcsv_ebp=Export pentru EBP
 Modelcsv_cogilog=Export pentru Cogilog
 Modelcsv_agiris=Export pentru Agiris
-Modelcsv_LDCompta=Export pentru LD Compta (v9 & superior) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export pentru OpenConcerto (Test)
 Modelcsv_configurable=Exportați CSV configurabil
 Modelcsv_FEC=Exportă fişier FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Id-ul listei de conturi
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mod vanzari
 OptionModeProductSellIntra=Mod  vânzări export în CEE
 OptionModeProductSellExport=Mod vânzări export în alte ţări
 OptionModeProductBuy=Mod cumparari
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Afișați toate produsele ce au cont contabil pentru vânzări.
 OptionModeProductSellIntraDesc=Afișează toate produsele cu cont contabil pentru vânzările în CEE.
 OptionModeProductSellExportDesc=Afișează toate produsele cu cont contabil pentru vânzările în alte ţări.
 OptionModeProductBuyDesc=Afișați toate produsele ce au cont contabil pentru achiziții.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Eliminați codul contabil din linii care nu există în diagramele de cont
 CleanHistory=Resetați toate asocierile pentru anul selectat
 PredefinedGroups=Grupuri predefinite
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Cont contabil eliminat din grupă
 SaleLocal=Vânzare locală
 SaleExport=Vânzare la export
 SaleEEC=Vânzări în CEE
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Rang cont contabil
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 31613a3ef4d..9118285a109 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web Server utilizator / grup
 NoSessionFound=Configurația dvs. PHP pare să nu permită listarea sesiunilor active. Directorul utilizat pentru salvarea sesiunilor (<b> %s </b>) ar putea fi protejat (de exemplu prin permisiuni ale sistemului de operare sau prin directiva PHP open_basedir).
 DBStoringCharset=Set caractere  al bazei de date pentru  stocarea datelor
 DBSortingCharset=Set caractereal bazei de date pentru sortarea datelor
+HostCharset=Host charset
 ClientCharset=Set de caractere client
 ClientSortingCharset=Compararea clienților
 WarningModuleNotActive=<b>Modulul %s</b> trebuie să fie activat
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Casetele de selectare
 ExtrafieldCheckBoxFromList=Căsuțele de selectare din tabel
 ExtrafieldLink=Link către un obiect
 ComputedFormula=Câmp calculat
-ComputedFormulaDesc=Puteți introduce aici o formulă care utilizează alte proprietăți ale obiectului sau orice codare PHP pentru a obține o valoare dinamică calculată. Puteți utiliza orice formule compatibile PHP, inclusiv operatorul de stare "?" și următorul obiect global:<strong>$db, $conf, $langs, $mysoc, $user, $object </strong>. <br><strong>AVERTISMENT </strong> Doar unele proprietăţi ale $obiect pot fi disponibile. Dacă aveți nevoie de proprietăți care nu sunt încărcate, trebuie doar să vă aduceți obiectul în formula dvs. ca în cel de-al doilea exemplu.<br> Utilizarea unui câmp calculat înseamnă că nu vă puteți introduce nici o valoare din interfață. De asemenea, dacă există o eroare de sintaxă, formula poate să nu redea nimic. <br><br> Exemplul formulei: <br>$object->id < 10? round($object-> id / 2, 2): ($object->id + 2 * $user-> id) * (int) substr($mysoc->zip, 1, 2) <br><br> Exemplu de reîncărcare a obiectului <br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ?$reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br> Alt exemplu de formula pentru forțarea încărcării obiectului și a obiectului său părinte:<br> (($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: "Proiectul părinte nu a fost găsit"
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Stocați câmpul calculat
 ComputedpersistentDesc=Câmpurile suplimentare computerizate vor fi stocate în baza de date, cu toate acestea, valoarea va fi recalculată numai atunci când obiectul acestui câmp este modificat. Dacă câmpul calculat depinde de alte obiecte sau date globale, această valoare ar putea fi greșită !!
 ExtrafieldParamHelpPassword=Lăsând acest câmp necompletat înseamnă că această valoare va fi stocată fără criptare (câmpul trebuie ascuns numai cu stea pe ecran). <br> Setarea "auto" pentru utilizarea regulii de criptare implicită pentru a salva parola în baza de date (atunci valoarea citită va fi hash numai, nici o şansă de a recupera valoarea inițială)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=Rata IRPF în mod implicit când se creează perspective,
 LocalTax2IsNotUsedDescES=În mod implicit propus IRPF este 0. Sfârşitul regulă.
 LocalTax2IsUsedExampleES=În Spania, liber profesionişti şi specialişti independenţi, care presta servicii şi companiile care au ales sistemul de impozitare de module.
 LocalTax2IsNotUsedExampleES=În Spania, sunt întreprinderi care nu sunt supuse sistemului de taxare pe module.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Rapoarte pe taxe locale
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Reguli pentru generarea și validarea parolelor
 DisableForgetPasswordLinkOnLogonPage=Nu afișați link-ul "Parola uitată" pe pagina de autentificare
 UsersSetup=Utilizatorii modul de configurare
 UserMailRequired=E-mailul necesar pentru a crea un utilizator nou
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-societate modul setup
 ##### Suppliers #####
 SuppliersSetup=Configurarea modulului furnizor
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Modele de numerotare a facturilor furnizorilor
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Ascundeți imaginile în meniul de deasupra
 LeftMenuBackgroundColor=Culoare Background pentru Left menu
 BackgroundTableTitleColor=Culoarea de fundal pentru linia de titlul a tabelului
 BackgroundTableTitleTextColor=Culoarea textului pentru linia de titlul a tabelului
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Culoarea de fundal pentru liniile impare ale tabelului
 BackgroundTableLineEvenColor=Culoarea de fundal pentru liniile pare ale tabelului
 MinimumNoticePeriod=Perioada minimă de preaviz (cererea dvs. de concediu trebuie făcută înainte de această întârziere)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Codul de introducere a meniului (meniu principal)
 ECMAutoTree=Afișați arborele ECM automat
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Ore de program
 OpeningHoursDesc=Introduceți aici orele de program normale ale companiei dvs.
 ResourceSetup=Configurarea modulului Resurse 
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index e947ece0ec0..29729435af0 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=Nr. de facturi pe lună
 AmountOfBills=Valoare facturi
 AmountOfBillsHT=Suma facturilor (fără impozit)
 AmountOfBillsByMonthHT=Valoarea facturilor pe luni (fără tva)
-ShowSocialContribution=Afisează taxa sociala/fiscala
-ShowBill=Afisează  factura
-ShowInvoice=Afisează  factura
-ShowInvoiceReplace=Afisează  factura de înlocuire
-ShowInvoiceAvoir=Afisează  nota de credit
-ShowInvoiceDeposit=Afișați factura în avans
-ShowInvoiceSituation=Afişează factura de situaţie
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Afisează plata
 AlreadyPaid=Deja platite
 AlreadyPaidBack=Deja rambursată
 AlreadyPaidNoCreditNotesNoDeposits=Plătit deja (fără note de credit și plăți în avans)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Avertisment, data facturii este mai mare decât data curentă
 WarningInvoiceDateTooFarInFuture=Avertisment, data facturii este prea departe de data curentă
 ViewAvailableGlobalDiscounts=Vedeți reducerile disponibile
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Scadentă la primire
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=Această opțiune este disponibilă numai când creați o factură din fila "Client" al unui terț
 YouMustCreateInvoiceFromSupplierThird=Această opțiune este disponibilă numai când creați o factură din fila "Furnizor" al unui terț
 YouMustCreateStandardInvoiceFirstDesc=Intai se poate crea o factură standard si se transforma in model pentru a avea un nou model de factura.
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Factura PDF șablon Burete. Un șablon complet de factură
 PDFCrevetteDescription=Model factură PDF Crevette. Un model complet pentru factura de situaţie
 TerreNumRefModelDesc1=Returnează numărul sub forma %syymm-nnnn pentru facturile standard și %syymm-nnnn pentru notele de credit unde yy este anul, mm este luna și nnnn este o secvenţă fără nici o pauză și fără revenire la 0
diff --git a/htdocs/langs/ro_RO/donations.lang b/htdocs/langs/ro_RO/donations.lang
index fb515fd9943..61a0548379c 100644
--- a/htdocs/langs/ro_RO/donations.lang
+++ b/htdocs/langs/ro_RO/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Crează o donaţie
 NewDonation=Donaţie nouă
 DeleteADonation=Şterge o donaţie
 ConfirmDeleteADonation=Sunteți sigur că doriți să ștergeți această donație?
-ShowDonation=Afişează donaţia
 PublicDonation=Donaţie Publică
 DonationsArea=Donaţii
 DonationStatusPromiseNotValidated=Promisiune schiţă
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Schiţă
 DonationStatusPromiseValidatedShort=Validată
 DonationStatusPaidShort=Plătită
 DonationTitle=Chitanţă donaţie
+DonationDate=Donation date
 DonationDatePayment=Data Plata 
 ValidPromess=Validează promisiune
 DonationReceipt=Chitanţă donaţie
@@ -31,4 +31,4 @@ DONATION_ART200=Afiseaza articolului 200 din CGI dacă sunteți îngrijorat
 DONATION_ART238=Afiseaza articolului 238 din CGI dacă sunteți îngrijorat
 DONATION_ART885=Afiseaza articol 885 din CGI dacă sunteți îngrijorat
 DonationPayment=Plată donaţie
-DonationValidated=Donation %s validated
+DonationValidated=Donaţie%s validata
diff --git a/htdocs/langs/ro_RO/interventions.lang b/htdocs/langs/ro_RO/interventions.lang
index d3dedb91c0e..7e5c62016e6 100644
--- a/htdocs/langs/ro_RO/interventions.lang
+++ b/htdocs/langs/ro_RO/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Intervenţii
 DraftFichinter=Intervenții schita
 LastModifiedInterventions=Ultimele %s intervenţii modificate
 FichinterToProcess=Intervenții la proces
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Contact client urmărire intervenţie
-# Modele numérotation
 PrintProductsOnFichinter=Printează si liniile de tip ''produs''( nu numai serviciile) pe fişa intervenţiei
 PrintProductsOnFichinterDetails=intervenții generate din comenzi
 UseServicesDurationOnFichinter=Utilizați durata serviciilor pentru intervențiile generate din comenzi
@@ -53,14 +51,16 @@ InterventionStatistics=Statistici intervenţii
 NbOfinterventions=Numărul cardurilor de intervenție
 NumberOfInterventionsByMonth=Numărul cardurilor de intervenție pe lună (data validării)
 AmountOfInteventionNotIncludedByDefault=Suma de intervenție nu este inclusă implicit în profit (în majoritatea cazurilor, foile de pontaj sunt utilizate pentru a calcula timpul petrecut). Adăugați opțiunea PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT la 1 în acasa-gestionare-altul pentru a-l include.
-##### Exports #####
 InterId=Id Intervenţie
 InterRef=Ref. Intervenţie
 InterDateCreation=Data crearea Intervenție
 InterDuration=Durată Intervenție
 InterStatus=Status Intervenție 
 InterNote=Nota interventie
+InterLine=Line of intervention
 InterLineId=Id linie Intervenţie
 InterLineDate=Data linie interventie
 InterLineDuration=Durată linie  Intervenție
 InterLineDesc=Descriere linie Intervenţie
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/ro_RO/modulebuilder.lang b/htdocs/langs/ro_RO/modulebuilder.lang
index e7042514986..948fc3c28ca 100644
--- a/htdocs/langs/ro_RO/modulebuilder.lang
+++ b/htdocs/langs/ro_RO/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=Lista permisiunilor definite
 SeeExamples=Vedeți aici exemple
 EnabledDesc=Condiție de activare a acestui câmp (Exemple: 1 sau $ conf-> global-> MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Poate fi cumulata valoarea câmpului pentru a obține un total în listă? (Exemple: 1 sau 0)
 SearchAllDesc=Este câmpul folosit pentru a face o căutare din instrumentul de căutare rapidă? (Exemple: 1 sau 0)
diff --git a/htdocs/langs/ro_RO/multicurrency.lang b/htdocs/langs/ro_RO/multicurrency.lang
new file mode 100644
index 00000000000..9e55663db90
--- /dev/null
+++ b/htdocs/langs/ro_RO/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Mai multe valute
+ErrorAddRateFail=Eroare în rata adăugată
+ErrorAddCurrencyFail=Eroare în valuta adăugată
+ErrorDeleteCurrencyFail=Eroare la ștergere
+multicurrency_syncronize_error=Eroare de sincronizare: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Utilizați data documentului pentru a găsi rata valutei, în loc să utilizați cea mai recentă rată cunoscută
+multicurrency_useOriginTx=Când un obiect este creat din altul, păstrați rata inițială din obiectul sursă (altfel utilizați ultima rată cunoscută)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=Cheia API
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Valute utilizate
+CurrenciesUsed_help_to_add=Adăugați diferitele valute și ratele pe care trebuie să le utilizați pentru <b> propunerile dvs.  </b>, <b> ordine </b> etc.
+rate=rată
+MulticurrencyReceived=Primite, valuta inițială
+MulticurrencyRemainderToTake=Valoarea rămasă, moneda inițială
+MulticurrencyPaymentAmount=Suma plății, moneda inițială
+AmountToOthercurrency=Suma pentru (în moneda contului de primire)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index ff6bc18336d..3bad4179a7e 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Serviciu de utilizare pe linii
 InvoiceGeneratedFromTimeSpent=Factura %s a fost generată din timpul petrecut pe proiect
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index 6a998de377e..79d81ac3deb 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -57,7 +57,7 @@ NoPageYet=Nici o pagină
 YouCanCreatePageOrImportTemplate=Puteți să creați o pagină nouă sau să importați un șablon de site complet
 SyntaxHelp=Ajutor pe sfaturile de sintaxă specifice
 YouCanEditHtmlSourceckeditor=Puteți edita codul sursă HTML folosind butonul "Sursă" din editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clona pagina/container
 CloneSite=Clonează site-ul
 SiteAdded=Site adăugat
@@ -77,7 +77,7 @@ BlogPost=Postare pe blog
 WebsiteAccount=Contul site-ului
 WebsiteAccounts=Conturi de site
 AddWebsiteAccount=Creați un cont de site web
-BackToListOfThirdParty=Înapoi la listă pentru terți
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Dezactivați mai întâi site-ul web
 MyContainerTitle=Titlul site-ului meu web
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/ro_RO/zapier.lang b/htdocs/langs/ro_RO/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/ro_RO/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index 90e9f9db172..63bb878fc0a 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Привязка
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Итоговая наценка на продажи
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 18a2d706a50..bf30360fb44 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Пользователь / группа Web-сервера
 NoSessionFound=Кажется, ваша конфигурация PHP не позволяет отображать активные сеансы. Каталог, используемый для сохранения сеансов ( <b>%s</b> ), может быть защищен (например, разрешениями ОС или директивой PHP open_basedir).
 DBStoringCharset=Кодировка базы данных для хранения данных
 DBSortingCharset=Кодировка базы данных для сортировки данных
+HostCharset=Host charset
 ClientCharset=Клиентская кодировка
 ClientSortingCharset=Сопоставление клиентов
 WarningModuleNotActive=Модуль <b>%s</b> должен быть включен
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Флажок
 ExtrafieldCheckBoxFromList=Флажки из таблицы
 ExtrafieldLink=Ссылка на объект
 ComputedFormula=Вычисленное поле
-ComputedFormulaDesc=Вы можете ввести здесь формулу, используя другие свойства объекта или любую кодировку PHP, чтобы получить динамически вычисленное значение. Вы можете использовать любые PHP-совместимые формулы, включая "?" оператор условия и следующий глобальный объект: 1$db, $conf, $langs, $mysoc, $user, $object1 . 2 3ВНИМАНИЕ3 : могут быть доступны только некоторые свойства $object. Если нужные вам свойства не загружены, просто извлеките объект в формулу, как во втором примере.  <br> Использование вычисляемого поля означает, что вы не можете ввести себе любое значение из интерфейса. Также, если есть синтаксическая ошибка, формула может ничего не возвращать. <br><br> Пример формулы: <br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br> Пример для перезагрузки объекта <br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1' <br><br> Другой пример формулы для принудительной загрузки объекта и его родительского объекта: <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Родительский проект не найден'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Сохранить вычисленное поле
 ComputedpersistentDesc=Вычисленные дополнительные поля будут сохранены в базе данных, однако значение будет пересчитано только при изменении объекта этого поля. Если вычисляемое поле зависит от других объектов или глобальных данных, это значение может быть неправильным!!
 ExtrafieldParamHelpPassword=Оставьте это поле пустым, чтобы значение хранилось без шифрования (поле должно быть скрыто только звездочкой на экране). <br> Установите 'auto', чтобы использовать правило шифрования по умолчанию для сохранения пароля в базе данных (тогда считываемое значение будет только хешем, никакой возможности восстановить исходное значение)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=Ставка IRPF (подоходный налог для
 LocalTax2IsNotUsedDescES=По умолчанию предлагается IRPF 0. Конец правления.
 LocalTax2IsUsedExampleES=В Испании работают фрилансеры и независимые профессионалы, предлагающие услуги, и компании, которые выбрали налоговую систему модулей.
 LocalTax2IsNotUsedExampleES=В Испании это предприятия, не подпадающие под налоговую систему модулей.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Отчеты о местных налогах
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Правила генерации и проверки
 DisableForgetPasswordLinkOnLogonPage=Не показывать ссылку «Забыли пароль» на странице входа
 UsersSetup=Настройка модуля пользователя
 UserMailRequired=Требуется электронная почта для создания нового пользователя
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Настройка модуля Корпорация
 ##### Suppliers #####
 SuppliersSetup=Настройка модуля Поставщика
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Скрыть изображения в верхнем ме
 LeftMenuBackgroundColor=Цвет фона для меню слева
 BackgroundTableTitleColor=Цвет фона для заголовка таблицы
 BackgroundTableTitleTextColor=Цвет текста для заголовка таблицы
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Цвет фона для нечетных строк таблицы
 BackgroundTableLineEvenColor=Цвет фона для четных строк таблицы
 MinimumNoticePeriod=Минимальный период уведомления (ваш запрос на отпуск должен быть выполнен до этой задержки)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Индекс
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Конфигурация  модуля Ресурсов
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index 9ea55716414..1ec19dd54c1 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Сумма счетов-фактур
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Сумма счетов-фактур за месяц (за вычетом налога)
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=Показать счет-фактуру
-ShowInvoice=Показать счет-фактуру
-ShowInvoiceReplace=Показать заменяющий счет-фактуру
-ShowInvoiceAvoir=Показать кредитое авизо
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Показать платеж
 AlreadyPaid=Уже оплачен
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Статус
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Функция возвращает номер в формате %syymm-nnnn  для стандартных счетов и %syymm-nnnn для кредитных авизо, где yy год,  mm месяц и nnnn является непрерывной последовательностью и не возвращает 0
diff --git a/htdocs/langs/ru_RU/donations.lang b/htdocs/langs/ru_RU/donations.lang
index 108a50827bf..5e28ad37810 100644
--- a/htdocs/langs/ru_RU/donations.lang
+++ b/htdocs/langs/ru_RU/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Создать пожертование
 NewDonation=Новое пожертвование
 DeleteADonation=Удалить пожертование
 ConfirmDeleteADonation=Вы уверены, что хотите удалить это пожертвование?
-ShowDonation=Показать пожертование
 PublicDonation=Общественное пожертвование
 DonationsArea=Пожертвования
 DonationStatusPromiseNotValidated=Проект обещания
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Проект
 DonationStatusPromiseValidatedShort=Подтверждено
 DonationStatusPaidShort=Получено
 DonationTitle=Получатель пожертования
+DonationDate=Donation date
 DonationDatePayment=Дата платежа
 ValidPromess=Подтвердить обещание
 DonationReceipt=Получатель пожертования
diff --git a/htdocs/langs/ru_RU/interventions.lang b/htdocs/langs/ru_RU/interventions.lang
index c053d723ca3..9cd51055196 100644
--- a/htdocs/langs/ru_RU/interventions.lang
+++ b/htdocs/langs/ru_RU/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=После деятельность заказчика контакт
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/ru_RU/modulebuilder.lang b/htdocs/langs/ru_RU/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/ru_RU/modulebuilder.lang
+++ b/htdocs/langs/ru_RU/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 70aee875338..cd7d1bd6cec 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang
index 94d11400665..9b629ca755c 100644
--- a/htdocs/langs/ru_RU/website.lang
+++ b/htdocs/langs/ru_RU/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Аккаунты сайта
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/ru_RU/zapier.lang b/htdocs/langs/ru_RU/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/ru_RU/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index 51cbbf4d809..cfafddf1d87 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Viazané riadky faktúr
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Priradiť riadok k účnovnému účtu
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Priradiť
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Účtovný účet na registráciu darov
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Účtovný účet štandardne pre predané produkty (použité, ak nie sú definované v produktovom liste)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Účtovný účet predvolene pre zakúpené služby (používa sa, ak nie je definovaný v služobnom liste)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Účtovný účet predvolene pre predané služby (používa sa, ak nie je definovaný v služobnom liste)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Celkový obrat pred zdanením
 TotalMarge=Celkové predajné rozpätie
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mód predaja
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mód nákupu
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Zobraziť všetky produkty s účtovným účtom pre predaj.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Zobraziť všetky produkty s účtovným účtom pre nákupy.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Resetovať všetky priradenia pre zvolený rok
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Rozsah účtovného účtu
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 84124c3fb7f..8e080ed435e 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Webový server užívateľ / skupina
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Znaková sada dát uložených v databáze
 DBSortingCharset=Znaková sada databázy pre radenie dát
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Modul <b>%s</b> musí byť povolený
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Odkaz na objekt
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=V predvolenom nastavení je navrhovaná IRPF je 0. Koniec vlády.
 LocalTax2IsUsedExampleES=V Španielsku, na voľnej nohe a nezávislí odborníci, ktorí poskytujú služby a firmy, ktorí sa rozhodli daňového systému modulov.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Vypisy lokálnej dane
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Užívatelia modul nastavenia
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Spoločnosť Multi-modul nastavenia
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Skryť obrázky vo vrchnom menu
 LeftMenuBackgroundColor=Farba pozadia pre ľavé menu
 BackgroundTableTitleColor=Farba pozadia pre riadok s názvom
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Farba pozadia pre nepárne riadky tabuľky
 BackgroundTableLineEvenColor=Farba pozadia pre párne riadky tabuľky
 MinimumNoticePeriod=Minimálny oznamovací čas ( Vaša požiadávka musi byť zaznamenaná pred týmto časom )
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zips
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index 24fb68ab4e1..c1bbc4e9d9c 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Výška faktúr
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Výška faktúr mesačne (bez dane)
-ShowSocialContribution=Zobrazit sociálnu/fiškálnu daň
-ShowBill=Zobraziť faktúru
-ShowInvoice=Zobraziť faktúru
-ShowInvoiceReplace=Zobraziť výmene faktúru
-ShowInvoiceAvoir=Zobraziť dobropis
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Zobraziť platbu
 AlreadyPaid=Už zaplatené
 AlreadyPaidBack=Už vráti
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Postavenie
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/sk_SK/donations.lang b/htdocs/langs/sk_SK/donations.lang
index 3cd6387dda7..a399ace9462 100644
--- a/htdocs/langs/sk_SK/donations.lang
+++ b/htdocs/langs/sk_SK/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Create a donation
 NewDonation=Nový darcovstvo
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Zobraziť dar
 PublicDonation=Verejné dar
 DonationsArea=Dary oblasť
 DonationStatusPromiseNotValidated=Návrh sľub
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Návrh
 DonationStatusPromiseValidatedShort=Overené
 DonationStatusPaidShort=Prijaté
 DonationTitle=Darovanie príjem
+DonationDate=Donation date
 DonationDatePayment=Dátum platby
 ValidPromess=Overiť sľub
 DonationReceipt=Darovanie príjem
diff --git a/htdocs/langs/sk_SK/interventions.lang b/htdocs/langs/sk_SK/interventions.lang
index 4093c66d98c..24b6496bfaa 100644
--- a/htdocs/langs/sk_SK/interventions.lang
+++ b/htdocs/langs/sk_SK/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Najnovšie %s upravené zásahy
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=V nadväznosti kontakt so zákazníkom
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=Zásahy vytvorené z objednávok
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/sk_SK/modulebuilder.lang b/htdocs/langs/sk_SK/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/sk_SK/modulebuilder.lang
+++ b/htdocs/langs/sk_SK/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/sk_SK/multicurrency.lang b/htdocs/langs/sk_SK/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/sk_SK/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index 6563c5fe07c..293e24952ac 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang
index c1ecdc37147..def2580fd58 100644
--- a/htdocs/langs/sk_SK/website.lang
+++ b/htdocs/langs/sk_SK/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/sk_SK/zapier.lang b/htdocs/langs/sk_SK/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/sk_SK/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index b1872aeca0c..a362c24efda 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Skupaj prodajna marža
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 5ce59884f3d..d6589945d4a 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Spletni strežnik uporabnik / skupina
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Nabor znakov v bazi podatkov za shranjevanje podatkov
 DBSortingCharset=Nabor znakov v bazi podatkov za sortiranje podatkov
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Modul <b>%s</b> mora biti omogočen
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Poveži z objektom
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=Privzeto predlagani IRPF je 0. Konec pravila.
 LocalTax2IsUsedExampleES=V Španiji, samostojnimi in neodvisni strokovnjaki, ki opravljajo storitve in podjetja, ki so se odločili davčni sistem modulov.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Poročila o lokalnih davkih
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Nastavitve modula uporabnikov
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Nastavitev modula za več podjetij
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Barva ozadja za levi meni
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Barva ozadja za lihe vrstice tabele
 BackgroundTableLineEvenColor=Barva ozadja za sode vrstice tabele
 MinimumNoticePeriod=Minimalni rok za obvestilo (Vaš zahtevek za odsotnost mora biti podan pred tem rokom)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index 31b4151c077..719c6d19426 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Znesek račuov
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Znesek računov po mesecih (brez DDV)
-ShowSocialContribution=Prikaži socialni/fiskalni davek
-ShowBill=Prikaži račun
-ShowInvoice=Prikaži račun
-ShowInvoiceReplace=Prikaži nadomestni račun
-ShowInvoiceAvoir=Prikaži dobropis
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Prikaži plačilo
 AlreadyPaid=Že plačano
 AlreadyPaidBack=Že vrnjeno plačilo
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Predlaga številko v formatu %syymm-nnnn za standardne račune in %syymm-nnnn za dobropise kjer je yy leto, mm mesec in nnnn zaporedna številka brez presledkov in večja od 0
diff --git a/htdocs/langs/sl_SI/donations.lang b/htdocs/langs/sl_SI/donations.lang
index 8e71e0b6a57..c118b281e75 100644
--- a/htdocs/langs/sl_SI/donations.lang
+++ b/htdocs/langs/sl_SI/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Ustvari donacijo
 NewDonation=Nova donacija
 DeleteADonation=Zbriši donacijo
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Prikaži donacijo
 PublicDonation=Javna donacija
 DonationsArea=Področje donacij
 DonationStatusPromiseNotValidated=Osnutek obljube
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Osnutek
 DonationStatusPromiseValidatedShort=Potrjena
 DonationStatusPaidShort=Prejeta
 DonationTitle=Prejem donacije
+DonationDate=Donation date
 DonationDatePayment=Datum plačila
 ValidPromess=Potrjena obljuba
 DonationReceipt=Prejem donacije
diff --git a/htdocs/langs/sl_SI/interventions.lang b/htdocs/langs/sl_SI/interventions.lang
index 65cfb11131f..5690b096a51 100644
--- a/htdocs/langs/sl_SI/interventions.lang
+++ b/htdocs/langs/sl_SI/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Zadnje %s spremenjene intervencije
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Kontakt za nadaljnjo obravnavo pri kupcu
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=intervencije na osnovi naročil
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/sl_SI/modulebuilder.lang b/htdocs/langs/sl_SI/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/sl_SI/modulebuilder.lang
+++ b/htdocs/langs/sl_SI/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/sl_SI/multicurrency.lang b/htdocs/langs/sl_SI/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/sl_SI/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 415d234eec8..2ab9a1552ea 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/sl_SI/website.lang b/htdocs/langs/sl_SI/website.lang
index f5f8502d7e8..9eb86dfd086 100644
--- a/htdocs/langs/sl_SI/website.lang
+++ b/htdocs/langs/sl_SI/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/sl_SI/zapier.lang b/htdocs/langs/sl_SI/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/sl_SI/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index 13a9459f015..9179719767b 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Lidh
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 73bb36b8597..f9e3a441b08 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web server user/group
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Module <b>%s</b> must be enabled
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Users module setup
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index c76900fe8a7..920879641ca 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=Show invoice
-ShowInvoice=Show invoice
-ShowInvoiceReplace=Show replacing invoice
-ShowInvoiceAvoir=Show credit note
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Statusi
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/sq_AL/donations.lang b/htdocs/langs/sq_AL/donations.lang
index 74887916bc0..741d37b1ee9 100644
--- a/htdocs/langs/sq_AL/donations.lang
+++ b/htdocs/langs/sq_AL/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Krijo nje dhurim
 NewDonation=Dhurim i ri
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Shfaq dhurim
 PublicDonation=Dhurim publik
 DonationsArea=Donations area
 DonationStatusPromiseNotValidated=Draft promise
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
 DonationTitle=Donation receipt
+DonationDate=Donation date
 DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
diff --git a/htdocs/langs/sq_AL/interventions.lang b/htdocs/langs/sq_AL/interventions.lang
index e7667ef6946..e5936f8246e 100644
--- a/htdocs/langs/sq_AL/interventions.lang
+++ b/htdocs/langs/sq_AL/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/sq_AL/modulebuilder.lang b/htdocs/langs/sq_AL/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/sq_AL/modulebuilder.lang
+++ b/htdocs/langs/sq_AL/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/sq_AL/multicurrency.lang b/htdocs/langs/sq_AL/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/sq_AL/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index c7a65cff25d..54a20abd8c0 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang
index c802b2d2ae8..bce2a09fb03 100644
--- a/htdocs/langs/sq_AL/website.lang
+++ b/htdocs/langs/sq_AL/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/sq_AL/zapier.lang b/htdocs/langs/sq_AL/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/sq_AL/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
index 219a63914a5..0b5e8090eaa 100644
--- a/htdocs/langs/sr_RS/accountancy.lang
+++ b/htdocs/langs/sr_RS/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Ukupni obrt pre poreza
 TotalMarge=Ukupna prodajna marža
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Vrsta prodaje
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Vrsta kupovine
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Opseg knjižnih računa
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 658acef8a25..30555386b54 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web server korisnik/grupa
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Module <b>%s</b> must be enabled
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Users module setup
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Pozadinska boja za naslovnu liniju tabela
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/sr_RS/assets.lang b/htdocs/langs/sr_RS/assets.lang
new file mode 100644
index 00000000000..642d73d7794
--- /dev/null
+++ b/htdocs/langs/sr_RS/assets.lang
@@ -0,0 +1,65 @@
+# Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+Assets = Assets
+NewAsset = New asset
+AccountancyCodeAsset = Accounting code (asset)
+AccountancyCodeDepreciationAsset = Accounting code (depreciation asset account)
+AccountancyCodeDepreciationExpense = Accounting code (depreciation expense account)
+NewAssetType=New asset type
+AssetsTypeSetup=Asset type setup
+AssetTypeModified=Asset type modified
+AssetType=Asset type
+AssetsLines=Assets
+DeleteType=Obriši
+DeleteAnAssetType=Delete an asset type
+ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
+ShowTypeCard=Prikaži tim "%s"
+
+# Module label 'ModuleAssetsName'
+ModuleAssetsName = Assets
+# Module description 'ModuleAssetsDesc'
+ModuleAssetsDesc = Assets description
+
+#
+# Admin page
+#
+AssetsSetup = Assets setup
+Settings = Settings
+AssetsSetupPage = Assets setup page
+ExtraFieldsAssetsType = Complementary attributes (Asset type)
+AssetsType=Asset type
+AssetsTypeId=Asset type id
+AssetsTypeLabel=Asset type label
+AssetsTypes=Assets types
+
+#
+# Menu
+#
+MenuAssets = Assets
+MenuNewAsset = New asset
+MenuTypeAssets = Type assets
+MenuListAssets = Lista
+MenuNewTypeAssets = Novo
+MenuListTypeAssets = Lista
+
+#
+# Module
+#
+NewAssetType=New asset type
+NewAsset=New asset
diff --git a/htdocs/langs/sr_RS/bills.lang b/htdocs/langs/sr_RS/bills.lang
index 8da848053e3..6dfcbf5e48f 100644
--- a/htdocs/langs/sr_RS/bills.lang
+++ b/htdocs/langs/sr_RS/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=Show invoice
-ShowInvoice=Show invoice
-ShowInvoiceReplace=Show replacing invoice
-ShowInvoiceAvoir=Show credit note
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Dospeva na plaćanje po prijemu računa
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/sr_RS/blockedlog.lang b/htdocs/langs/sr_RS/blockedlog.lang
new file mode 100644
index 00000000000..9be5b672696
--- /dev/null
+++ b/htdocs/langs/sr_RS/blockedlog.lang
@@ -0,0 +1,54 @@
+BlockedLog=Unalterable Logs
+Field=Polje
+BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525).
+Fingerprints=Archived events and fingerprints
+FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed).
+CompanyInitialKey=Company initial key (hash of genesis block)
+BrowseBlockedLog=Unalterable logs
+ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
+ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
+DownloadBlockChain=Download fingerprints
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
+OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
+AddedByAuthority=Stored into remote authority
+NotAddedByAuthorityYet=Not yet stored into remote authority
+ShowDetails=Show stored details
+logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
+logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
+logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
+logPAYMENT_ADD_TO_BANK=Payment added to bank
+logPAYMENT_CUSTOMER_CREATE=Customer payment created
+logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
+logDONATION_PAYMENT_CREATE=Donation payment created
+logDONATION_PAYMENT_DELETE=Donation payment logical deletion
+logBILL_PAYED=Customer invoice paid
+logBILL_UNPAYED=Customer invoice set unpaid
+logBILL_VALIDATE=Račun klijenta je potvrđen
+logBILL_SENTBYMAIL=Customer invoice send by mail
+logBILL_DELETE=Customer invoice logically deleted
+logMODULE_RESET=Module BlockedLog was disabled
+logMODULE_SET=Module BlockedLog was enabled
+logDON_VALIDATE=Donation validated
+logDON_MODIFY=Donation modified
+logDON_DELETE=Donation logical deletion
+logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
+logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
+logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
+logCASHCONTROL_VALIDATE=Cash fence recording
+BlockedLogBillDownload=Customer invoice download
+BlockedLogBillPreview=Customer invoice preview
+BlockedlogInfoDialog=Log Details
+ListOfTrackedEvents=List of tracked events
+Fingerprint=Fingerprint
+DownloadLogCSV=Export archived logs (CSV)
+logDOC_PREVIEW=Preview of a validated document in order to print or download
+logDOC_DOWNLOAD=Download of a validated document in order to print or send
+DataOfArchivedEvent=Full datas of archived event
+ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
+BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
+BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
+OnlyNonValid=Non-valid
+TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
+RestrictYearToExport=Restrict month / year to export
diff --git a/htdocs/langs/sr_RS/donations.lang b/htdocs/langs/sr_RS/donations.lang
index b4b9fabdf57..a94f53ade74 100644
--- a/htdocs/langs/sr_RS/donations.lang
+++ b/htdocs/langs/sr_RS/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Kreiraj donaciju
 NewDonation=Nova donacija
 DeleteADonation=Obriši donaciju
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Pokaži donaciju
 PublicDonation=Javna donacija
 DonationsArea=Oblast donacije
 DonationStatusPromiseNotValidated=Draft obećanje
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Odobreno
 DonationStatusPaidShort=Primljeno
 DonationTitle=Priznanica donacije
+DonationDate=Donation date
 DonationDatePayment=Datum uplate
 ValidPromess=Odobri obećanje
 DonationReceipt=Priznaica donacije
diff --git a/htdocs/langs/sr_RS/hrm.lang b/htdocs/langs/sr_RS/hrm.lang
new file mode 100644
index 00000000000..96ef12f23bc
--- /dev/null
+++ b/htdocs/langs/sr_RS/hrm.lang
@@ -0,0 +1,18 @@
+# Dolibarr language file - en_US - hrm
+# Admin
+HRM_EMAIL_EXTERNAL_SERVICE=Email za blokiranje eksternog HR servisa
+Establishments=Ogranci
+Establishment=Ogranak
+NewEstablishment=Novi ogranak
+DeleteEstablishment=Obriši ogranak
+ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
+OpenEtablishment=Otvori ogranak
+CloseEtablishment=Zatvori ogranak
+# Dictionary
+DictionaryPublicHolidays=HRM - Public holidays
+DictionaryDepartment=HR - Lista odeljenja
+DictionaryFunction=HR - Lista funkcija
+# Module
+Employees=Zaposleni
+Employee=Zaposleni
+NewEmployee=Novi zaposleni
diff --git a/htdocs/langs/sr_RS/interventions.lang b/htdocs/langs/sr_RS/interventions.lang
index 4e5c2c19735..b1bc27aa9e7 100644
--- a/htdocs/langs/sr_RS/interventions.lang
+++ b/htdocs/langs/sr_RS/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Intervencije
 DraftFichinter=Draft intervencije
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Kontakt klijenta koji prat intervenciju
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=Intervencije generisane iz narudžbina
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistika intervencija
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Id intervencije
 InterRef=Ref. intervencije
 InterDateCreation=Datum kreiranja intervencije
 InterDuration=Trajanje intervencije
 InterStatus=Status intervencije
 InterNote=Napomena intervencije
+InterLine=Line of intervention
 InterLineId=Id linije intervencije
 InterLineDate=Datum linije intervencije
 InterLineDuration=Trajanje linije intervencije
 InterLineDesc=Opis linije intervencije
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/sr_RS/modulebuilder.lang b/htdocs/langs/sr_RS/modulebuilder.lang
new file mode 100644
index 00000000000..135ac1ae9ec
--- /dev/null
+++ b/htdocs/langs/sr_RS/modulebuilder.lang
@@ -0,0 +1,141 @@
+# Dolibarr language file - Source file is en_US - loan
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
+ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
+ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
+ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
+NewModule=New module
+NewObjectInModulebuilder=New object
+ModuleKey=Module key
+ObjectKey=Object key
+ModuleInitialized=Module initialized
+FilesForObjectInitialized=Files for new object '%s' initialized
+FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
+ModuleBuilderDescdescription=Enter here all general information that describe your module.
+ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
+ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
+ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
+ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
+ModuleBuilderDeschooks=This tab is dedicated to hooks.
+ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
+ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
+DangerZone=Danger zone
+BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
+BuildDocumentation=Build documentation
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
+DescriptionLong=Long description
+EditorName=Name of editor
+EditorUrl=URL of editor
+DescriptorFile=Descriptor file of module
+ClassFile=File for PHP DAO CRUD class
+ApiClassFile=File for PHP API class
+PageForList=PHP page for list of record
+PageForCreateEditView=PHP page to create/edit/view a record
+PageForAgendaTab=PHP page for event tab
+PageForDocumentTab=PHP page for document tab
+PageForNoteTab=PHP page for note tab
+PathToModulePackage=Path to zip of module/application package
+PathToModuleDocumentation=Path to file of module/application documentation (%s)
+SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
+FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Force update of .class and .sql files
+RegenerateMissingFiles=Generate missing files
+SpecificationFile=File of documentation
+LanguageFile=File for language
+ObjectProperties=Object Properties
+ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
+NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
+SearchAll=Used for 'search all'
+DatabaseIndex=Database index
+FileAlreadyExists=File %s already exists
+TriggersFile=File for triggers code
+HooksFile=File for hooks code
+ArrayOfKeyValues=Array of key-val
+ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
+WidgetFile=Widget file
+CSSFile=CSS file
+JSFile=Javascript file
+ReadmeFile=Readme file
+ChangeLog=ChangeLog file
+TestClassFile=File for PHP Unit Test class
+SqlFile=Sql file
+PageForLib=File for the common PHP library
+PageForObjLib=File for the PHP library dedicated to object
+SqlFileExtraFields=Sql file for complementary attributes
+SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
+AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
+UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Is a measure
+DirScanned=Directory scanned
+NoTrigger=No trigger
+NoWidget=No widget
+GoToApiExplorer=Go to API explorer
+ListOfMenusEntries=List of menu entries
+ListOfDictionariesEntries=List of dictionaries entries
+ListOfPermissionsDefined=List of defined permissions
+SeeExamples=See examples here
+EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdf=Display on PDF
+IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
+SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
+SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
+LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
+MenusDefDesc=Define here the menus provided by your module
+DictionariesDefDesc=Define here the dictionaries provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
+HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
+TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
+SeeIDsInUse=See IDs in use in your installation
+SeeReservedIDsRangeHere=See range of reserved IDs
+ToolkitForDevelopers=Toolkit for Dolibarr developers
+TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
+SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
+AddLanguageFile=Add language file
+YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
+DropTableIfEmpty=(Delete table if empty)
+TableDoesNotExists=The table %s does not exists
+TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
+UseAboutPage=Disable the about page
+UseDocFolder=Disable the documentation folder
+UseSpecificReadme=Use a specific ReadMe
+ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
+RealPathOfModule=Real path of module
+ContentCantBeEmpty=Content of file can't be empty
+WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
+CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
+JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
+CLIDesc=You can generate here some command line scripts you want to provide with your module.
+CLIFile=CLI File
+NoCLIFile=No CLI files
+UseSpecificEditorName = Use a specific editor name
+UseSpecificEditorURL = Use a specific editor URL
+UseSpecificFamily = Use a specific family
+UseSpecificAuthor = Use a specific author
+UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
+IncludeRefGeneration=The reference of object must be generated automatically
+IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
+IncludeDocGeneration=I want to generate some documents from the object
+IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
+ShowOnCombobox=Show value into combobox
+KeyForTooltip=Key for tooltip
+CSSClass=CSS Class
+NotEditable=Not editable
+ForeignKey=Foreign key
+TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/sr_RS/mrp.lang b/htdocs/langs/sr_RS/mrp.lang
new file mode 100644
index 00000000000..d3c4d3253c6
--- /dev/null
+++ b/htdocs/langs/sr_RS/mrp.lang
@@ -0,0 +1,76 @@
+Mrp=Manufacturing Orders
+MO=Manufacturing Order
+MRPDescription=Module to manage production and Manufacturing Orders (MO).
+MRPArea=MRP Area
+MrpSetupPage=Setup of module MRP
+MenuBOM=Bills of material
+LatestBOMModified=Latest %s Bills of materials modified
+LatestMOModified=Latest %s Manufacturing Orders modified
+Bom=Bills of Material
+BillOfMaterials=Bill of Material
+BOMsSetup=Setup of module BOM
+ListOfBOMs=List of bills of material - BOM
+ListOfManufacturingOrders=List of Manufacturing Orders
+NewBOM=New bill of material
+ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+BOMsNumberingModules=BOM numbering templates
+BOMsModelModule=BOM document templates
+MOsNumberingModules=MO numbering templates
+MOsModelModule=MO document templates
+FreeLegalTextOnBOMs=Free text on document of BOM
+WatermarkOnDraftBOMs=Watermark on draft BOM
+FreeLegalTextOnMOs=Free text on document of MO
+WatermarkOnDraftMOs=Watermark on draft MO
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
+ManufacturingEfficiency=Manufacturing efficiency
+ConsumptionEfficiency=Consumption efficiency
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
+DeleteBillOfMaterials=Delete Bill Of Materials
+DeleteMo=Delete Manufacturing Order
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+MenuMRP=Manufacturing Orders
+NewMO=New Manufacturing Order
+QtyToProduce=Qty to produce
+DateStartPlannedMo=Date start planned
+DateEndPlannedMo=Date end planned
+KeepEmptyForAsap=Empty means 'As Soon As Possible'
+EstimatedDuration=Estimated duration
+EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
+ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
+ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
+StatusMOProduced=Produced
+QtyFrozen=Frozen Qty
+QuantityFrozen=Frozen Quantity
+QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
+DisableStockChange=Stock change disabled
+DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
+BomAndBomLines=Bills Of Material and lines
+BOMLine=Line of BOM
+WarehouseForProduction=Warehouse for production
+CreateMO=Create MO
+ToConsume=To consume
+ToProduce=To produce
+QtyAlreadyConsumed=Qty already consumed
+QtyAlreadyProduced=Qty already produced
+QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
+ConsumeOrProduce=Consume or Produce
+ConsumeAndProduceAll=Consume and Produce All
+Manufactured=Manufactured
+TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
+ForAQuantityOf=For a quantity to produce of %s
+ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
+ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
+ProductionForRef=Production of %s
+AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
+NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
+AddNewConsumeLines=Add new line to consume
+ProductsToConsume=Products to consume
+ProductsToProduce=Products to produce
+UnitCost=Unit cost
+TotalCost=Total cost
diff --git a/htdocs/langs/sr_RS/multicurrency.lang b/htdocs/langs/sr_RS/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/sr_RS/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/sr_RS/oauth.lang b/htdocs/langs/sr_RS/oauth.lang
new file mode 100644
index 00000000000..c5b772af121
--- /dev/null
+++ b/htdocs/langs/sr_RS/oauth.lang
@@ -0,0 +1,32 @@
+# Dolibarr language file - Source file is en_US - oauth
+ConfigOAuth=OAuth Configuration
+OAuthServices=OAuth Services
+ManualTokenGeneration=Manual token generation
+TokenManager=Token Manager
+IsTokenGenerated=Is token generated ?
+NoAccessToken=Nema tokena u lokalnoj bazi
+HasAccessToken=Token je generisan i sačuvan u lokalnoj bazi
+NewTokenStored=Token received and saved
+ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
+TokenDeleted=Token obrisan
+RequestAccess=Kliknite ovde da biste tražili/obnovili pristup i primili novi token za čuvanje
+DeleteAccess=Kliknite ovde da obrišete token
+UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
+ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
+OAuthSetupForLogin=Page to generate an OAuth token
+SeePreviousTab=See previous tab
+OAuthIDSecret=OAuth ID and Secret
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token ističe
+TOKEN_DELETE=Obriši sačuvani token
+OAUTH_GOOGLE_NAME=OAuth Google service
+OAUTH_GOOGLE_ID=OAuth Google Id
+OAUTH_GOOGLE_SECRET=OAuth Google Secret
+OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create OAuth credentials
+OAUTH_GITHUB_NAME=OAuth GitHub service
+OAUTH_GITHUB_ID=OAuth GitHub Id
+OAUTH_GITHUB_SECRET=OAuth GitHub Secret
+OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create OAuth credentials
+OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
+OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index 3717041a79c..d849eea5e71 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/sr_RS/receiptprinter.lang b/htdocs/langs/sr_RS/receiptprinter.lang
new file mode 100644
index 00000000000..450cd4e3ca5
--- /dev/null
+++ b/htdocs/langs/sr_RS/receiptprinter.lang
@@ -0,0 +1,95 @@
+# Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Pdešavanje modula Štampača računa
+PrinterAdded=Štampač %s je dodat
+PrinterUpdated=Štampač %s je ažuriran
+PrinterDeleted=Štampač %s je obrisan
+TestSentToPrinter=Test je poslat na štampač %s
+ReceiptPrinter=Štampači računa
+ReceiptPrinterDesc=Podešavanje štampača
+ReceiptPrinterTemplateDesc=Podešavanje template-a
+ReceiptPrinterTypeDesc=Opis tipa štampača računa
+ReceiptPrinterProfileDesc=Opis profila štampača računa
+ListPrinters=Lista štampača
+SetupReceiptTemplate=Podešavanje template-a
+CONNECTOR_DUMMY=Fiktivni štampač
+CONNECTOR_NETWORK_PRINT=Mrežni štampač
+CONNECTOR_FILE_PRINT=Lokalni štampač
+CONNECTOR_WINDOWS_PRINT=Lokalni Windows štampač
+CONNECTOR_CUPS_PRINT=Cups Printer
+CONNECTOR_DUMMY_HELP=Fiktivni štampač za testiranje
+CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
+CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
+CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
+PROFILE_DEFAULT=Default profil
+PROFILE_SIMPLE=Jednostavan profil
+PROFILE_EPOSTEP=Eops Tep profil
+PROFILE_P822D=P822D profil
+PROFILE_STAR=Star profil
+PROFILE_DEFAULT_HELP=Default profil namenjen Epson štampačima
+PROFILE_SIMPLE_HELP=Jednostavan profil bez grafike
+PROFILE_EPOSTEP_HELP=Eops Tep profil
+PROFILE_P822D_HELP=P822D profil bez grafike
+PROFILE_STAR_HELP=Star profil
+DOL_LINE_FEED=Skip line
+DOL_ALIGN_LEFT=Levo poravnanje teksta
+DOL_ALIGN_CENTER=Centriranje teksta
+DOL_ALIGN_RIGHT=Desno poravnanje teksta
+DOL_USE_FONT_A=Korišćenje fonta A za štampač
+DOL_USE_FONT_B=Korišćenje fonta B za štampač
+DOL_USE_FONT_C=Korišćenje fonta C za štampač
+DOL_PRINT_BARCODE=Štampanje bar koda
+DOL_PRINT_BARCODE_CUSTOMER_ID=Štampanje bar koda za ID klijenta
+DOL_CUT_PAPER_FULL=Potpuno sečenje tiketa
+DOL_CUT_PAPER_PARTIAL=Delimično sečenje tiketa
+DOL_OPEN_DRAWER=Otvaranje kase
+DOL_ACTIVATE_BUZZER=Aktivacija alarma
+DOL_PRINT_QRCODE=Štampanje QR koda
+DOL_PRINT_LOGO=Print logo of my company
+DOL_PRINT_LOGO_OLD=Print logo of my company (old printers)
+DOL_BOLD=Bold
+DOL_BOLD_DISABLED=Disable bold
+DOL_DOUBLE_HEIGHT=Double height size
+DOL_DOUBLE_WIDTH=Double width size
+DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
+DOL_UNDERLINE=Enable underline
+DOL_UNDERLINE_DISABLED=Disable underline
+DOL_BEEP=Beed sound
+DOL_PRINT_TEXT=Print text
+DOL_VALUE_DATE=Invoice date
+DOL_VALUE_DATE_TIME=Invoice date and time
+DOL_VALUE_YEAR=Invoice year
+DOL_VALUE_MONTH_LETTERS=Invoice month in letters
+DOL_VALUE_MONTH=Invoice month
+DOL_VALUE_DAY=Invoice day
+DOL_VALUE_DAY_LETTERS=Inovice day in letters
+DOL_LINE_FEED_REVERSE=Line feed reverse
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Invoice ref
+DOL_PRINT_OBJECT_LINES=Invoice lines
+DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
+DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
+DOL_VALUE_CUSTOMER_MAIL=Customer mail
+DOL_VALUE_CUSTOMER_PHONE=Customer phone
+DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
+DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
+DOL_VALUE_MYSOC_NAME=Your company name
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Kapital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/sr_RS/receptions.lang b/htdocs/langs/sr_RS/receptions.lang
new file mode 100644
index 00000000000..40061426993
--- /dev/null
+++ b/htdocs/langs/sr_RS/receptions.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - receptions
+ReceptionsSetup=Product Reception setup
+RefReception=Ref. reception
+Reception=Reception
+Receptions=Receptions
+AllReceptions=All Receptions
+Reception=Reception
+Receptions=Receptions
+ShowReception=Show Receptions
+ReceptionsArea=Receptions area
+ListOfReceptions=List of receptions
+ReceptionMethod=Reception method
+LastReceptions=Latest %s receptions
+StatisticsOfReceptions=Statistics for receptions
+NbOfReceptions=Number of receptions
+NumberOfReceptionsByMonth=Number of receptions by month
+ReceptionCard=Reception card
+NewReception=New reception
+CreateReception=Create reception
+QtyInOtherReceptions=Qty in other receptions
+OtherReceptionsForSameOrder=Other receptions for this order
+ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
+ReceptionsToValidate=Receptions to validate
+StatusReceptionCanceled=Poništeno
+StatusReceptionDraft=Nacrt
+StatusReceptionValidated=Potvrđeno (proizvodi za isporuku ili već isporučeni)
+StatusReceptionProcessed=Procesuirano
+StatusReceptionDraftShort=Nacrt
+StatusReceptionValidatedShort=Potvrđen
+StatusReceptionProcessedShort=Procesuirano
+ReceptionSheet=Reception sheet
+ConfirmDeleteReception=Are you sure you want to delete this reception?
+ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
+ConfirmCancelReception=Are you sure you want to cancel this reception?
+StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
+SendReceptionByEMail=Send reception by email
+SendReceptionRef=Submission of reception %s
+ActionsOnReception=Events on reception
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the order card.
+ReceptionLine=Reception line
+ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
+ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
+ReceptionsNumberingModules=Numbering module for receptions
+ReceptionsReceiptModel=Document templates for receptions
diff --git a/htdocs/langs/sr_RS/stripe.lang b/htdocs/langs/sr_RS/stripe.lang
new file mode 100644
index 00000000000..a80639d92a7
--- /dev/null
+++ b/htdocs/langs/sr_RS/stripe.lang
@@ -0,0 +1,72 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Stripe module setup
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
+StripeOrCBDoPayment=Pay with credit card or Stripe
+FollowingUrlAreAvailableToMakePayments=Sledeći URL-ovi mogu omogućiti klijentu da izvrši uplatu na Dolibarr objekte
+PaymentForm=Forma za uplatu
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=Ovaj ekran vam omogućava da izvršite online uplatu u korist %s
+ThisIsInformationOnPayment=Ovo su informacije o uplati
+ToComplete=Popuniti
+YourEMail=Email za potvrdu uplate
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+Creditor=Kreditor
+PaymentCode=Kod uplate
+StripeDoPayment=Pay with Stripe
+YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+Continue=Dalje
+ToOfferALinkForOnlinePayment=URL za %s uplatu
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment page for a sales order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment page for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.<br>For the URL of payments with no existing object, you may also add the parameter <strong>&noidempotency=1</strong> so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter)
+SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
+AccountParameter=Parametri naloga
+UsageParameter=Parametri korišćenja
+InformationToFindParameters=Pomoć za pronalaženje informacije o Vašem %s nalogu
+STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+VendorName=Ime prodavca
+CSSUrlForPaymentForm=CSS url za formu za plaćanje
+NewStripePaymentReceived=New Stripe payment received
+NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
+STRIPE_TEST_SECRET_KEY=Secret test key
+STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
+STRIPE_LIVE_SECRET_KEY=Secret live key
+STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
+StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
+StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
+StripePayoutList=List of Stripe payouts
+ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
+ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
+PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
+ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
diff --git a/htdocs/langs/sr_RS/supplier_proposal.lang b/htdocs/langs/sr_RS/supplier_proposal.lang
new file mode 100644
index 00000000000..d3857cc2787
--- /dev/null
+++ b/htdocs/langs/sr_RS/supplier_proposal.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Updavljanje zahtevima za cene dobavljača
+SupplierProposalNew=Novi zahtev za cenu
+CommRequest=Zahtev za cenu
+CommRequests=Zahtevi za cenu
+SearchRequest=Pronađi zahtev
+DraftRequests=Draft zahtevi
+SupplierProposalsDraft=Draft vendor proposals
+LastModifiedRequests=Najnoviji %s promenjeni zahtevi za cenu
+RequestsOpened=Otvori zahteve za cenu
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
+NewAskPrice=Novi zahtev za cenu
+ShowSupplierProposal=Prikaži zahtev za cenu
+AddSupplierProposal=Kreiraj zahtev za cenu
+SupplierProposalRefFourn=Vendor ref
+SupplierProposalDate=Datum isporuke
+SupplierProposalRefFournNotice=Pre prelaska na "Prihvaćeno", zabeležte reference dobavljača.
+ConfirmValidateAsk=Da li ste sigurni da želite da potvrdite ovaj zahtev za cenu pod imenom <b>%s</b>?
+DeleteAsk=Obriši zahtev
+ValidateAsk=Potvrdi zahtev
+SupplierProposalStatusDraft=Nacrt (čeka na potvrdu)
+SupplierProposalStatusValidated=Potvrđen (zahtev je otvoren)
+SupplierProposalStatusClosed=Zatvoren
+SupplierProposalStatusSigned=Prihvaćen
+SupplierProposalStatusNotSigned=Odbijen
+SupplierProposalStatusDraftShort=Nacrt
+SupplierProposalStatusValidatedShort=Potvrđen
+SupplierProposalStatusClosedShort=Zatvoren
+SupplierProposalStatusSignedShort=Prihvaćen
+SupplierProposalStatusNotSignedShort=Odbijen
+CopyAskFrom=Create a price request by copying an existing request
+CreateEmptyAsk=Kreiraj prazan zahtev
+ConfirmCloneAsk=Da li ste sigurni da želite da napravite kopiju zahteva za cenu <b>%s</b>?
+ConfirmReOpenAsk=Da li ste sigurni da želite da ponovo otvorite zahtev za cenu <b>%s</b>?
+SendAskByMail=Pošalji zahtev za cenu mailom
+SendAskRef=Slanje zahteva za cenu %s
+SupplierProposalCard=Kartica zahteva
+ConfirmDeleteAsk=Da li ste sigurni da želite da obrišete ovaj upit za cenu <b>%s</b>?
+ActionsOnSupplierProposal=Događaji na zahtevu za cenu
+DocModelAuroreDescription=Kompletan model zahteva (logo...)
+CommercialAsk=Zahtev za cenu
+DefaultModelSupplierProposalCreate=Default model za kreiranje
+DefaultModelSupplierProposalToBill=Default template prilikom zatvaranja zahteva za cenu (prihvaćen)
+DefaultModelSupplierProposalClosed=Default template prilikom zatvaranja zahteva za cenu (odbijen)
+ListOfSupplierProposals=List of vendor proposal requests
+ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
+SupplierProposalsToClose=Vendor proposals to close
+SupplierProposalsToProcess=Vendor proposals to process
+LastSupplierProposals=Najnoviji %s upiti za cenu
+AllPriceRequests=Svi zahtevi
diff --git a/htdocs/langs/sr_RS/ticket.lang b/htdocs/langs/sr_RS/ticket.lang
new file mode 100644
index 00000000000..9de7c3fceb3
--- /dev/null
+++ b/htdocs/langs/sr_RS/ticket.lang
@@ -0,0 +1,305 @@
+# en_US lang file for module ticket
+# Copyright (C) 2013  Jean-François FERRY <hello@librethic.io>
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+Module56000Name=Tickets
+Module56000Desc=Ticket system for issue or request management
+
+Permission56001=See tickets
+Permission56002=Modify tickets
+Permission56003=Delete tickets
+Permission56004=Manage tickets
+Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+
+TicketDictType=Ticket - Types
+TicketDictCategory=Ticket - Groupes
+TicketDictSeverity=Ticket - Severities
+TicketDictResolution=Ticket - Resolution
+TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
+TicketTypeShortBUGHARD=Dysfonctionnement matériel
+TicketTypeShortCOM=Commercial question
+
+TicketTypeShortHELP=Request for functionnal help
+TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortPROJET=Projekat
+TicketTypeShortOTHER=Drugo
+
+TicketSeverityShortLOW=Nizak
+TicketSeverityShortNORMAL=Normal
+TicketSeverityShortHIGH=Visok
+TicketSeverityShortBLOCKING=Critical/Blocking
+
+ErrorBadEmailAddress=Field '%s' incorrect
+MenuTicketMyAssign=My tickets
+MenuTicketMyAssignNonClosed=My open tickets
+MenuListNonClosed=Open tickets
+
+TypeContact_ticket_internal_CONTRIBUTOR=Saradnik
+TypeContact_ticket_internal_SUPPORTTEC=Assigned user
+TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
+TypeContact_ticket_external_CONTRIBUTOR=External contributor
+
+OriginEmail=Email source
+Notify_TICKET_SENTBYMAIL=Send ticket message by email
+
+# Status
+NotRead=Not read
+Read=Pročitaj
+Assigned=Assigned
+InProgress=In progress
+NeedMoreInformation=Waiting for information
+Answered=Answered
+Waiting=Na čekanju
+Closed=Zatvoreno
+Deleted=Deleted
+
+# Dict
+Type=Tip
+Category=Analytic code
+Severity=Severity
+
+# Email templates
+MailToSendTicketMessage=To send email from ticket message
+
+#
+# Admin page
+#
+TicketSetup=Ticket module setup
+TicketSettings=Settings
+TicketSetupPage=
+TicketPublicAccess=A public interface requiring no identification is available at the following url
+TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
+TicketParamModule=Module variable setup
+TicketParamMail=Email setup
+TicketEmailNotificationFrom=Notification email from
+TicketEmailNotificationFromHelp=Used into ticket message answer by example
+TicketEmailNotificationTo=Notifications email to
+TicketEmailNotificationToHelp=Send email notifications to this address.
+TicketNewEmailBodyLabel=Text message sent after creating a ticket
+TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
+TicketParamPublicInterface=Public interface setup
+TicketsEmailMustExist=Require an existing email address to create a ticket
+TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket.
+PublicInterface=Public interface
+TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
+TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
+TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
+TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
+TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
+TicketPublicInterfaceTopicLabelAdmin=Interface title
+TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
+TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
+ExtraFieldsTicket=Extra attributes
+TicketCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
+TicketsDisableEmail=Do not send emails for ticket creation or message recording
+TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
+TicketsLogEnableEmail=Enable log by email
+TicketsLogEnableEmailHelp=At each change, an email will be sent **to each contact** associated with the ticket.
+TicketParams=Params
+TicketsShowModuleLogo=Display the logo of the module in the public interface
+TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
+TicketsShowCompanyLogo=Display the logo of the company in the public interface
+TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
+TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
+TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
+TicketsActivatePublicInterface=Activate public interface
+TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create tickets.
+TicketsAutoAssignTicket=Automatically assign the user who created the ticket
+TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
+TicketNumberingModules=Tickets numbering module
+TicketNotifyTiersAtCreation=Notify third party at creation
+TicketGroup=Grupa
+TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
+#
+# Index & list page
+#
+TicketsIndex=Tickets area
+TicketList=List of tickets
+TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
+NoTicketsFound=No ticket found
+NoUnreadTicketsFound=No unread ticket found
+TicketViewAllTickets=View all tickets
+TicketViewNonClosedOnly=View only open tickets
+TicketStatByStatus=Tickets by status
+OrderByDateAsc=Sort by ascending date
+OrderByDateDesc=Sort by descending date
+ShowAsConversation=Show as conversation list
+MessageListViewType=Show as table list
+
+#
+# Ticket card
+#
+Ticket=Ticket
+TicketCard=Ticket card
+CreateTicket=Create ticket
+EditTicket=Edit ticket
+TicketsManagement=Tickets Management
+CreatedBy=Created by
+NewTicket=New Ticket
+SubjectAnswerToTicket=Ticket answer
+TicketTypeRequest=Request type
+TicketCategory=Analytic code
+SeeTicket=See ticket
+TicketMarkedAsRead=Ticket has been marked as read
+TicketReadOn=Read on
+TicketCloseOn=Datum zatvaranja
+MarkAsRead=Mark ticket as read
+TicketHistory=Ticket history
+AssignUser=Assign to user
+TicketAssigned=Ticket is now assigned
+TicketChangeType=Change type
+TicketChangeCategory=Change analytic code
+TicketChangeSeverity=Change severity
+TicketAddMessage=Add a message
+AddMessage=Add a message
+MessageSuccessfullyAdded=Ticket added
+TicketMessageSuccessfullyAdded=Message successfully added
+TicketMessagesList=Message list
+NoMsgForThisTicket=No message for this ticket
+Properties=Classification
+LatestNewTickets=Latest %s newest tickets (not read)
+TicketSeverity=Severity
+ShowTicket=See ticket
+RelatedTickets=Related tickets
+TicketAddIntervention=Kreiraj intervenciju
+CloseTicket=Close ticket
+CloseATicket=Close a ticket
+ConfirmCloseAticket=Confirm ticket closing
+ConfirmDeleteTicket=Please confirm ticket deleting
+TicketDeletedSuccess=Ticket deleted with success
+TicketMarkedAsClosed=Ticket marked as closed
+TicketDurationAuto=Calculated duration
+TicketDurationAutoInfos=Duration calculated automatically from intervention related
+TicketUpdated=Ticket updated
+SendMessageByEmail=Send message by email
+TicketNewMessage=New message
+ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
+TicketGoIntoContactTab=Please go into "Contacts" tab to select them
+TicketMessageMailIntro=Introduction
+TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
+TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
+TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
+TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
+TicketMessageMailSignature=Potpis
+TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
+TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
+TicketMessageMailSignatureLabelAdmin=Signature of response email
+TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
+TicketMessageHelp=Only this text will be saved in the message list on ticket card.
+TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
+TimeElapsedSince=Time elapsed since
+TicketTimeToRead=Time elapsed before read
+TicketContacts=Contacts ticket
+TicketDocumentsLinked=Documents linked to ticket
+ConfirmReOpenTicket=Confirm reopen this ticket ?
+TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
+TicketAssignedToYou=Ticket assigned
+TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
+MarkMessageAsPrivate=Mark message as private
+TicketMessagePrivateHelp=This message will not display to external users
+TicketEmailOriginIssuer=Issuer at origin of the tickets
+InitialMessage=Initial Message
+LinkToAContract=Link to a contract
+TicketPleaseSelectAContract=Select a contract
+UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
+TicketMailExchanges=Mail exchanges
+TicketInitialMessageModified=Initial message modified
+TicketMessageSuccesfullyUpdated=Message successfully updated
+TicketChangeStatus=Change status
+TicketConfirmChangeStatus=Confirm the status change: %s ?
+TicketLogStatusChanged=Status changed: %s to %s
+TicketNotNotifyTiersAtCreate=Not notify company at create
+Unread=Unread
+TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
+PublicInterfaceNotEnabled=Public interface was not enabled
+ErrorTicketRefRequired=Ticket reference name is required
+
+#
+# Logs
+#
+TicketLogMesgReadBy=Ticket %s read by %s
+NoLogForThisTicket=No log for this ticket yet
+TicketLogAssignedTo=Ticket %s assigned to %s
+TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
+TicketLogClosedBy=Ticket %s closed by %s
+TicketLogReopen=Ticket %s re-open
+
+#
+# Public pages
+#
+TicketSystem=Ticket system
+ShowListTicketWithTrackId=Display ticket list from track ID
+ShowTicketWithTrackId=Display ticket from track ID
+TicketPublicDesc=You can create a support ticket or check from an existing ID.
+YourTicketSuccessfullySaved=Ticket has been successfully saved!
+MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
+PleaseRememberThisId=Please keep the tracking number that we might ask you later.
+TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
+TicketNewEmailSubjectCustomer=New support ticket
+TicketNewEmailBody=This is an automatic email to confirm you have registered a new ticket.
+TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
+TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
+TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
+TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
+TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
+TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
+TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
+TicketPublicMsgViewLogIn=Please enter ticket tracking ID
+TicketTrackId=Public Tracking ID
+OneOfTicketTrackId=One of your tracking ID
+ErrorTicketNotFound=Ticket with tracking ID %s not found!
+Subject=Objekat
+ViewTicket=View ticket
+ViewMyTicketList=View my ticket list
+ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
+TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
+TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
+SeeThisTicketIntomanagementInterface=See ticket in management interface
+TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
+ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
+OldUser=Old user
+NewUser=Novi korisnik
+NumberOfTicketsByMonth=Number of tickets per month
+NbOfTickets=Number of tickets
+# notifications
+TicketNotificationEmailSubject=Ticket %s updated
+TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
+TicketNotificationRecipient=Notification recipient
+TicketNotificationLogMessage=Log message
+TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
+TicketNotificationNumberEmailSent=Notification email sent: %s
+
+ActionsOnTicket=Events on ticket
+
+#
+# Boxes
+#
+BoxLastTicket=Latest created tickets
+BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicketContent=
+BoxLastTicketNoRecordedTickets=No recent unread tickets
+BoxLastModifiedTicket=Latest modified tickets
+BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastModifiedTicketContent=
+BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
diff --git a/htdocs/langs/sr_RS/website.lang b/htdocs/langs/sr_RS/website.lang
new file mode 100644
index 00000000000..eccc473274a
--- /dev/null
+++ b/htdocs/langs/sr_RS/website.lang
@@ -0,0 +1,130 @@
+# Dolibarr language file - Source file is en_US - website
+Shortname=Kod
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
+DeleteWebsite=Obrisati Web Sajt
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
+WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
+WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
+WEBSITE_CSS_URL=URL of external CSS file
+WEBSITE_CSS_INLINE=CSS file content (common to all pages)
+WEBSITE_JS_INLINE=Javascript file content (common to all pages)
+WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
+WEBSITE_ROBOT=Robot file (robots.txt)
+WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
+HtmlHeaderPage=HTML header (specific to this page only)
+PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
+EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
+MediaFiles=Media library
+EditCss=Edit website properties
+EditMenu=Edit menu
+EditMedias=Edit medias
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
+AddWebsite=Add website
+Webpage=Web page/container
+AddPage=Add page/container
+HomePage=Home Page
+PageContainer=Page/container
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
+PageContent=Page/Contenair
+PageDeleted=Page/Contenair '%s' of website %s deleted
+PageAdded=Page/Contenair '%s' added
+ViewSiteInNewTab=View site in new tab
+ViewPageInNewTab=View page in new tab
+SetAsHomePage=Set as Home page
+RealURL=Real URL
+ViewWebsiteInProduction=View web site using home URLs
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Pročitaj
+WritePerm=Write
+TestDeployOnWeb=Test/deploy on web
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
+NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
+SyntaxHelp=Help on specific syntax tips
+YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+ClonePage=Clone page/container
+CloneSite=Clone site
+SiteAdded=Website added
+ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
+PageIsANewTranslation=The new page is a translation of the current page ?
+LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
+ParentPageId=Parent page ID
+WebsiteId=Website ID
+CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
+FetchAndCreate=Fetch and Create
+ExportSite=Export website
+ImportSite=Import website template
+IDOfPage=Id of page
+Banner=Banner
+BlogPost=Blog post
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
+AddWebsiteAccount=Create web site account
+BackToListForThirdParty=Back to list for the third-party
+DisableSiteFirst=Disable website first
+MyContainerTitle=My web site title
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is a translation of
+ThisPageHasTranslationPages=This page/container has translation
+NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
+GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Search or Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
+MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
+EditInLineOnOff=Mode 'Edit inline' is %s
+ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
+GlobalCSSorJS=Global CSS/JS/Header file of web site
+BackToHomePage=Back to home page...
+TranslationLinks=Translation links
+YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not a website page
+UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
+MainLanguage=Main language
+OtherLanguages=Other languages
+UseManifest=Provide a manifest.json file
+PublicAuthorAlias=Public author alias
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
+ReplacementDoneInXPages=Replacement done in %s pages or containers
diff --git a/htdocs/langs/sr_RS/zapier.lang b/htdocs/langs/sr_RS/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/sr_RS/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index b7fe55b406e..3d220a365ab 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bundet linjer med fakturor
 ExpenseReportLines=Kostnadsberäkningar rapporterar att förbinda
 ExpenseReportLinesDone=Förbundna utgiftsrapporter
 IntoAccount=Bind rad med bokföringskonto
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Binda
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Redovisningskonto för att registrera donationer
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Redovisningskonto för att registrera prenumerationer
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Bokföringskonto som standard för de sålda produkterna (används om de inte anges i produktbladet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Bokföringskonto som standard för de köpta tjänsterna (används om det inte anges i servicebladet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Redovisningskonto som standard för de sålda tjänsterna (används om de inte anges i servicebladet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Okänt tredje part konto och väntande konto inte definierat. Blockeringsfel
 PaymentsNotLinkedToProduct=Betalning som inte är kopplad till någon produkt / tjänst
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Grupp av konto
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total försäljning marginal
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Exportera till Quadratus QuadraCompta
 Modelcsv_ebp=Exportera till EBP
 Modelcsv_cogilog=Exportera till Cogilog
 Modelcsv_agiris=Exportera till Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Exportera CSV konfigurerbar
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Diagram över konton Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode försäljning
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode inköp
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Visa alla produkter med bokföringskonto för försäljning.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Visa alla produkter med bokföringskonto för inköp.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Ta bort bokföringskoden från rader som inte finns i kontoplaner
 CleanHistory=Återställ alla bindningar för valt år
 PredefinedGroups=Fördefinierade grupper
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Konto borttaget från grupp
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Räckvidd av bokföringskonto
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index c8505262020..6327c33d771 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Webbserver användare / grupp
 NoSessionFound=Din PHP-konfiguration verkar inte tillåta att du registrerar aktiva sessioner. Den katalog som används för att spara sessioner (<b> %s </b>) kan skyddas (till exempel av operatörsbehörigheter eller genom PHP-direktivet open_basedir).
 DBStoringCharset=Databas charset för att lagra data
 DBSortingCharset=Databas charset att sortera data
+HostCharset=Host charset
 ClientCharset=Klientcharset
 ClientSortingCharset=Klientsamling
 WarningModuleNotActive=Modul <b>%s</b> måste vara aktiverat
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Kryssrutor
 ExtrafieldCheckBoxFromList=Kryssrutor från bordet
 ExtrafieldLink=Länk till ett objekt
 ComputedFormula=Beräknat fält
-ComputedFormulaDesc=Du kan ange här en formel med andra objektegenskaper eller någon PHP-kodning för att få ett dynamiskt beräknat värde. Du kan använda alla PHP-kompatibla formler inklusive "?" tillståndsoperatör och följande globala objekt: <strong> $ db, $ conf, $ längd, $ mysoc, $ user, $ object </strong>. <br> <strong> VARNING </strong>: Endast vissa egenskaper på $ -objekt kan vara tillgängliga. Om du behöver en egenskap inte laddad, hämta bara objektet i din formel som i det andra exemplet. <br> Med ett beräknat fält kan du inte ange något värde från gränssnittet själv. Om det också finns ett syntaxfel kan inte formeln returnera någonting. <br> <br> Exempel på formel: <br> $ objekt-> id < 10 ? round($object-> id / 2, 2): ($ objekt-> id + 2 * $ användar-> id) * (int) substr ($ mysoc-> zip, 1, 2 ) <br> <br> Exempel på att ladda objektet <br> (($ reloadedobj = new Societe ($ db)) && ($ reloadedobj-> hämta ($ obj-> id? $ Obj-> id: ($ obj-> rowid? $ Obj- > rowid: $ object-> id))> 0))? $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> kapital / 5: '-1' <br> <br> Ett annat exempel på formel för att tvinga belastning av objekt och dess moderobjekt: <br> (($ reloadedobj = new Task ($ db )) && ($ reloadedobj-> hämta ($ object-> id)> 0) && ($ secondloadedobj = nytt projekt ($ db)) && ($ secondloadedobj-> hämta ($ reloadedobj-> fk_project)> 0))? $ secondloadedobj-> ref: 'Föräldraprojekt hittades inte'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Om du lämnar fältet tomt betyder det att detta värde kommer att sparas utan kryptering (fältet måste bara döljas med stjärnan på skärmen). <br> Ange 'auto' för att använda standardkrypteringsregeln för att spara lösenord i databasen (då är läsningsvärde endast ett hash, inget sätt att hämta originalvärdet)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=IRPF-räntan som standard när du skapar prospekt, fakturo
 LocalTax2IsNotUsedDescES=Som standard föreslås IRPF är 0. Slut på regeln.
 LocalTax2IsUsedExampleES=I Spanien, frilansare och oberoende yrkesutövare som tillhandahåller tjänster och företag som har valt skattesystemet i moduler.
 LocalTax2IsNotUsedExampleES=I Spanien är de företag som inte omfattas av skattesystem för moduler.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Rapporter om lokala skatter
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Regler för att generera och bekräfta lösenord
 DisableForgetPasswordLinkOnLogonPage=Visa inte länken "Glömt lösenord" på sidan Inloggning
 UsersSetup=Användare modul inställning
 UserMailRequired=E-post krävs för att skapa en ny användare
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-bolag modul inställning
 ##### Suppliers #####
 SuppliersSetup=Inställning av leverantörsmodul
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Leverantörsfakturor nummereringsmodeller
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Dölj bilder i toppmenyn
 LeftMenuBackgroundColor=Bakgrundsfärg för vänstermenyn
 BackgroundTableTitleColor=Bakgrundsfärg för tabellens titellinje
 BackgroundTableTitleTextColor=Textfärg för tabellens titellinje
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Bakgrundsfärg för udda bords linjer
 BackgroundTableLineEvenColor=Bakgrundsfärg för ännu bords linjer
 MinimumNoticePeriod=Minsta varseltid (Din ledighet begäran måste göras innan denna försening)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menyinmatningskod (huvudmeny)
 ECMAutoTree=Visa automatiskt ECM-träd
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Öppettider
 OpeningHoursDesc=Ange här företagets vanliga öppettider.
 ResourceSetup=Konfiguration av resursmodulen
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index a2e64a6b307..2cd69dd8394 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=Antal fakturor per månad
 AmountOfBills=Belopp för fakturor
 AmountOfBillsHT=Mängden fakturor (utan skatt)
 AmountOfBillsByMonthHT=Mängd av fakturor per månad (netto efter skatt)
-ShowSocialContribution=Visa social / skattemässig skatt
-ShowBill=Visa faktura
-ShowInvoice=Visa faktura
-ShowInvoiceReplace=Visa ersätter faktura
-ShowInvoiceAvoir=Visa kreditnota
-ShowInvoiceDeposit=Visa nedbetalningsfaktura
-ShowInvoiceSituation=Visa lägesfaktura
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Visa betalning
 AlreadyPaid=Redan betalats ut
 AlreadyPaidBack=Redan återbetald
 AlreadyPaidNoCreditNotesNoDeposits=Redan betalad (utan kreditnoteringar och nedbetalningar)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Varning, fakturadatumet är högre än aktuellt datum
 WarningInvoiceDateTooFarInFuture=Varning, fakturadatumet är för långt från det aktuella datumet
 ViewAvailableGlobalDiscounts=Visa lediga rabatter
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Förfaller vid kvitto
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=Det här alternativet är endast tillgängligt när du skapar en faktura från fliken "Kund" från tredje part
 YouMustCreateInvoiceFromSupplierThird=Det här alternativet är endast tillgängligt när du skapar en faktura från fliken "Leverantör" till tredje part
 YouMustCreateStandardInvoiceFirstDesc=Du måste först skapa en standardfaktura och konvertera den till "mall" för att skapa en ny mallfaktura
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Faktura PDF mall Svamp. En komplett fakturamall
 PDFCrevetteDescription=Faktura PDF-mall Crevette. En komplett faktura mall för lägesfakturor
 TerreNumRefModelDesc1=Återger nummer med formatet %syymm-nnnn för standardfakturor och %syymm-NNNN för kreditnotor där yy är året, mm månaden och nnnn är en sekvens med ingen paus och ingen återgång till 0
diff --git a/htdocs/langs/sv_SE/donations.lang b/htdocs/langs/sv_SE/donations.lang
index 7d01404238c..902ed742443 100644
--- a/htdocs/langs/sv_SE/donations.lang
+++ b/htdocs/langs/sv_SE/donations.lang
@@ -5,23 +5,23 @@ DonationRef=Donation ref.
 Donor=Givare
 AddDonation=Skapa en donation
 NewDonation=Ny donation
-DeleteADonation=Delete a donation
-ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Visa donation
+DeleteADonation=Ta bort en gåva
+ConfirmDeleteADonation=Är du säker att du vill ta bort denna gåva?
 PublicDonation=Offentliga donation
 DonationsArea=Donationer område
 DonationStatusPromiseNotValidated=Förslag löfte
-DonationStatusPromiseValidated=Validerad löfte
+DonationStatusPromiseValidated=Bekräftat löfte
 DonationStatusPaid=Donation fått
 DonationStatusPromiseNotValidatedShort=Förslag
-DonationStatusPromiseValidatedShort=Validerad
+DonationStatusPromiseValidatedShort=Bekräftat
 DonationStatusPaidShort=Mottagna
 DonationTitle=Donation kvitto
+DonationDate=Donation date
 DonationDatePayment=Betalningsdag
-ValidPromess=Validate löfte
+ValidPromess=Bekräfta löfte
 DonationReceipt=Donation kvitto
 DonationsModels=Dokument modeller för donation kvitton
-LastModifiedDonations=Latest %s modified donations
+LastModifiedDonations=Senast %s ändrade gåvor
 DonationRecipient=Donation mottagaren
 IConfirmDonationReception=Mottagaren förklarar mottagning, som en donation, av följande belopp
 MinimumAmount=Minsta belopp är% s
@@ -30,5 +30,5 @@ FrenchOptions=Alternativ för Frankrike
 DONATION_ART200=Visar artikel 200 från CGI om du är orolig
 DONATION_ART238=Visar artikel 238 från CGI om du är orolig
 DONATION_ART885=Visar artikel 885 från CGI om du är orolig
-DonationPayment=Donation payment
-DonationValidated=Donation %s validated
+DonationPayment=Donation
+DonationValidated=Gåva %s bekräftad
diff --git a/htdocs/langs/sv_SE/interventions.lang b/htdocs/langs/sv_SE/interventions.lang
index 80a62cd5fd6..82dedf51bb9 100644
--- a/htdocs/langs/sv_SE/interventions.lang
+++ b/htdocs/langs/sv_SE/interventions.lang
@@ -12,11 +12,11 @@ AllInterventions=Alla insatser
 CreateDraftIntervention=Skapa utkast
 InterventionContact=Insatskontakt
 DeleteIntervention=Ta bort insats
-ValidateIntervention=Validera insats
+ValidateIntervention=Bekräfta insats
 ModifyIntervention=Ändra insats
 DeleteInterventionLine=Ta bort insats linje
 ConfirmDeleteIntervention=Är du säker på att du vill radera detta insats?
-ConfirmValidateIntervention=Är du säker på att du vill validera detta insats under namnet <b> %s </b>?
+ConfirmValidateIntervention=Är du säker på att du vill bekräfta detta insats under namnet <b> %s </b>?
 ConfirmModifyIntervention=Är du säker på att du vill ändra detta insats?
 ConfirmDeleteInterventionLine=Är du säker på att du vill ta bort denna interventionslinje?
 ConfirmCloneIntervention=Är du säker på att du vill klona detta insats?
@@ -24,14 +24,14 @@ NameAndSignatureOfInternalContact=Namn och underskrift av intervenient:
 NameAndSignatureOfExternalContact=Kundens namn och underskrift:
 DocumentModelStandard=Standarddokument modell för insatser
 InterventionCardsAndInterventionLines=Insats och linjer av interventioner
-InterventionClassifyBilled=Klassificera "Fakturerad"
+InterventionClassifyBilled=Märk "Fakturerad"
 InterventionClassifyUnBilled=Classify "ofakturerade"
-InterventionClassifyDone=Klassificera "klar"
+InterventionClassifyDone=Märk "klar"
 StatusInterInvoiced=Fakturerade
 SendInterventionRef=Inlämning av insats %s
 SendInterventionByMail=Skicka insats via e-post
 InterventionCreatedInDolibarr=Insats %s skapad
-InterventionValidatedInDolibarr=Insats %s validerade
+InterventionValidatedInDolibarr=Insats %s bekräftades
 InterventionModifiedInDolibarr=Insats %s modifierade
 InterventionClassifiedBilledInDolibarr=Insats %s uppsättning som faktureras
 InterventionClassifiedUnbilledInDolibarr=Insats %s uppsättning som ofakturerade
@@ -41,9 +41,7 @@ InterventionsArea=Insatssområde
 DraftFichinter=Utkast till ingripanden
 LastModifiedInterventions=Senaste %s modifierade interventioner
 FichinterToProcess=Insatser för att bearbeta
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Uppföljning kundkontakt
-# Modele numérotation
 PrintProductsOnFichinter=Skriv även rader av typen "produkt" (inte bara tjänster) på interventionskortet
 PrintProductsOnFichinterDetails=Insatser skapade utifrån order
 UseServicesDurationOnFichinter=Använd tjänstens varaktighet för interventioner som genereras av order
@@ -51,16 +49,18 @@ UseDurationOnFichinter=Döljer varaktighetsfältet för interventionsposter
 UseDateWithoutHourOnFichinter=Döljer timmar och minuter från datumfältet för interventionsrekord
 InterventionStatistics=Statistik över interventioner
 NbOfinterventions=Antal interventionskort
-NumberOfInterventionsByMonth=Antal interventionskort per månad (datum för validering)
+NumberOfInterventionsByMonth=Antal interventionskort per månad (datum för bekräftande)
 AmountOfInteventionNotIncludedByDefault=Antalet ingripanden ingår inte som standard i vinst (i de flesta fall används tidtabeller för att räkna upp tid). Lägg till alternativ PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT till 1 i heminställningar-andra för att inkludera dem.
-##### Exports #####
 InterId=Insatss id
 InterRef=Insatss ref.
 InterDateCreation=Datum skapande insats
 InterDuration=Varaktighetsintervention
 InterStatus=Statusintervention
 InterNote=Observera insats
+InterLine=Line of intervention
 InterLineId=Line id insats
 InterLineDate=Linjedatumintervention
 InterLineDuration=Linjens längdintervention
 InterLineDesc=Linjebeskrivningsintervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/sv_SE/modulebuilder.lang b/htdocs/langs/sv_SE/modulebuilder.lang
index f44ffbf299a..389bdf6fbf1 100644
--- a/htdocs/langs/sv_SE/modulebuilder.lang
+++ b/htdocs/langs/sv_SE/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=Lista över definierade behörigheter
 SeeExamples=Se exempel här
 EnabledDesc=Villkor att ha detta fält aktivt (Exempel: 1 eller $ conf-> global-> MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Kan värdet av fält ackumuleras för att få en total i listan? (Exempel: 1 eller 0)
 SearchAllDesc=Är fältet används för att göra en sökning från snabbsökningsverktyget? (Exempel: 1 eller 0)
diff --git a/htdocs/langs/sv_SE/multicurrency.lang b/htdocs/langs/sv_SE/multicurrency.lang
new file mode 100644
index 00000000000..979b14693c6
--- /dev/null
+++ b/htdocs/langs/sv_SE/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Flera valutor
+ErrorAddRateFail=Fel i tilläggspris
+ErrorAddCurrencyFail=Fel i tilläggsvaluta
+ErrorDeleteCurrencyFail=Radering misslyckades
+multicurrency_syncronize_error=Synkroniseringsfel: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Använd datumet för dokumentet för att hitta valutakursen istället för att använda den senast kända kursen
+multicurrency_useOriginTx=När ett objekt skapas från en annan, behåll originalfrekvensen från källobjektet (använd annars den senast kända kursen)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API-nyckel
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Valutor som används
+CurrenciesUsed_help_to_add=Lägg till de olika valutorna och priserna du behöver använda på dina <b> förslag </b>, <b> beställer </b> etc.
+rate=Betygsätta
+MulticurrencyReceived=Mottagen, ursprunglig valuta
+MulticurrencyRemainderToTake=Återstående belopp, ursprunglig valuta
+MulticurrencyPaymentAmount=Betalningsbelopp, ursprunglig valuta
+AmountToOthercurrency=Belopp till (i valuta för mottagande konto)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index 094019b2be1..2e85ebe40ef 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service att använda på linjer
 InvoiceGeneratedFromTimeSpent=Faktura %s har genererats från tid till projekt
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang
index 20a211e774d..4c5b8940623 100644
--- a/htdocs/langs/sv_SE/website.lang
+++ b/htdocs/langs/sv_SE/website.lang
@@ -57,7 +57,7 @@ NoPageYet=Inga sidor ännu
 YouCanCreatePageOrImportTemplate=Du kan skapa en ny sida eller importera en fullständig webbplatsmall
 SyntaxHelp=Hjälp med specifika syntaxtips
 YouCanEditHtmlSourceckeditor=Du kan redigera HTML-källkod med knappen "Källa" i redigeraren.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Klona sida / behållare
 CloneSite=Klona webbplatsen
 SiteAdded=Webbplats tillagd
@@ -77,7 +77,7 @@ BlogPost=Blogginlägg
 WebsiteAccount=Webbsida konto
 WebsiteAccounts=Webbsida konton
 AddWebsiteAccount=Skapa webbplatskonto
-BackToListOfThirdParty=Tillbaka till listan för tredje part
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Inaktivera webbplats först
 MyContainerTitle=Min webbplatstitel
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/sv_SE/zapier.lang b/htdocs/langs/sv_SE/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/sv_SE/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index 1f9382137ea..b8ce37a0956 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index 0205f246b0c..7eb67d7a4ab 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web server user/group
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Module <b>%s</b> must be enabled
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Users module setup
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/sw_SW/assets.lang b/htdocs/langs/sw_SW/assets.lang
new file mode 100644
index 00000000000..ef04723c6c2
--- /dev/null
+++ b/htdocs/langs/sw_SW/assets.lang
@@ -0,0 +1,65 @@
+# Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+Assets = Assets
+NewAsset = New asset
+AccountancyCodeAsset = Accounting code (asset)
+AccountancyCodeDepreciationAsset = Accounting code (depreciation asset account)
+AccountancyCodeDepreciationExpense = Accounting code (depreciation expense account)
+NewAssetType=New asset type
+AssetsTypeSetup=Asset type setup
+AssetTypeModified=Asset type modified
+AssetType=Asset type
+AssetsLines=Assets
+DeleteType=Delete
+DeleteAnAssetType=Delete an asset type
+ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
+ShowTypeCard=Show type '%s'
+
+# Module label 'ModuleAssetsName'
+ModuleAssetsName = Assets
+# Module description 'ModuleAssetsDesc'
+ModuleAssetsDesc = Assets description
+
+#
+# Admin page
+#
+AssetsSetup = Assets setup
+Settings = Settings
+AssetsSetupPage = Assets setup page
+ExtraFieldsAssetsType = Complementary attributes (Asset type)
+AssetsType=Asset type
+AssetsTypeId=Asset type id
+AssetsTypeLabel=Asset type label
+AssetsTypes=Assets types
+
+#
+# Menu
+#
+MenuAssets = Assets
+MenuNewAsset = New asset
+MenuTypeAssets = Type assets
+MenuListAssets = List
+MenuNewTypeAssets = New
+MenuListTypeAssets = List
+
+#
+# Module
+#
+NewAssetType=New asset type
+NewAsset=New asset
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index 8c22ce0159a..9f11d8ecf87 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=Show invoice
-ShowInvoice=Show invoice
-ShowInvoiceReplace=Show replacing invoice
-ShowInvoiceAvoir=Show credit note
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/sw_SW/blockedlog.lang b/htdocs/langs/sw_SW/blockedlog.lang
new file mode 100644
index 00000000000..5afae6e9e53
--- /dev/null
+++ b/htdocs/langs/sw_SW/blockedlog.lang
@@ -0,0 +1,54 @@
+BlockedLog=Unalterable Logs
+Field=Field
+BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525).
+Fingerprints=Archived events and fingerprints
+FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed).
+CompanyInitialKey=Company initial key (hash of genesis block)
+BrowseBlockedLog=Unalterable logs
+ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
+ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
+DownloadBlockChain=Download fingerprints
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
+OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
+AddedByAuthority=Stored into remote authority
+NotAddedByAuthorityYet=Not yet stored into remote authority
+ShowDetails=Show stored details
+logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
+logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
+logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
+logPAYMENT_ADD_TO_BANK=Payment added to bank
+logPAYMENT_CUSTOMER_CREATE=Customer payment created
+logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
+logDONATION_PAYMENT_CREATE=Donation payment created
+logDONATION_PAYMENT_DELETE=Donation payment logical deletion
+logBILL_PAYED=Customer invoice paid
+logBILL_UNPAYED=Customer invoice set unpaid
+logBILL_VALIDATE=Customer invoice validated
+logBILL_SENTBYMAIL=Customer invoice send by mail
+logBILL_DELETE=Customer invoice logically deleted
+logMODULE_RESET=Module BlockedLog was disabled
+logMODULE_SET=Module BlockedLog was enabled
+logDON_VALIDATE=Donation validated
+logDON_MODIFY=Donation modified
+logDON_DELETE=Donation logical deletion
+logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
+logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
+logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
+logCASHCONTROL_VALIDATE=Cash fence recording
+BlockedLogBillDownload=Customer invoice download
+BlockedLogBillPreview=Customer invoice preview
+BlockedlogInfoDialog=Log Details
+ListOfTrackedEvents=List of tracked events
+Fingerprint=Fingerprint
+DownloadLogCSV=Export archived logs (CSV)
+logDOC_PREVIEW=Preview of a validated document in order to print or download
+logDOC_DOWNLOAD=Download of a validated document in order to print or send
+DataOfArchivedEvent=Full datas of archived event
+ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
+BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
+BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
+OnlyNonValid=Non-valid
+TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
+RestrictYearToExport=Restrict month / year to export
diff --git a/htdocs/langs/sw_SW/donations.lang b/htdocs/langs/sw_SW/donations.lang
index 5edc8d62033..de4bdf68f03 100644
--- a/htdocs/langs/sw_SW/donations.lang
+++ b/htdocs/langs/sw_SW/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Create a donation
 NewDonation=New donation
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Show donation
 PublicDonation=Public donation
 DonationsArea=Donations area
 DonationStatusPromiseNotValidated=Draft promise
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
 DonationTitle=Donation receipt
+DonationDate=Donation date
 DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
diff --git a/htdocs/langs/sw_SW/hrm.lang b/htdocs/langs/sw_SW/hrm.lang
new file mode 100644
index 00000000000..3697c47e30d
--- /dev/null
+++ b/htdocs/langs/sw_SW/hrm.lang
@@ -0,0 +1,18 @@
+# Dolibarr language file - en_US - hrm
+# Admin
+HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
+Establishments=Establishments
+Establishment=Establishment
+NewEstablishment=New establishment
+DeleteEstablishment=Delete establishment
+ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
+OpenEtablishment=Open establishment
+CloseEtablishment=Close establishment
+# Dictionary
+DictionaryPublicHolidays=HRM - Public holidays
+DictionaryDepartment=HRM - Department list
+DictionaryFunction=HRM - Function list
+# Module
+Employees=Employees
+Employee=Employee
+NewEmployee=New employee
diff --git a/htdocs/langs/sw_SW/interventions.lang b/htdocs/langs/sw_SW/interventions.lang
index e7667ef6946..e5936f8246e 100644
--- a/htdocs/langs/sw_SW/interventions.lang
+++ b/htdocs/langs/sw_SW/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/sw_SW/modulebuilder.lang b/htdocs/langs/sw_SW/modulebuilder.lang
new file mode 100644
index 00000000000..135ac1ae9ec
--- /dev/null
+++ b/htdocs/langs/sw_SW/modulebuilder.lang
@@ -0,0 +1,141 @@
+# Dolibarr language file - Source file is en_US - loan
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
+ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
+ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
+ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
+NewModule=New module
+NewObjectInModulebuilder=New object
+ModuleKey=Module key
+ObjectKey=Object key
+ModuleInitialized=Module initialized
+FilesForObjectInitialized=Files for new object '%s' initialized
+FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
+ModuleBuilderDescdescription=Enter here all general information that describe your module.
+ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
+ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
+ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
+ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
+ModuleBuilderDeschooks=This tab is dedicated to hooks.
+ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
+ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
+DangerZone=Danger zone
+BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
+BuildDocumentation=Build documentation
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
+DescriptionLong=Long description
+EditorName=Name of editor
+EditorUrl=URL of editor
+DescriptorFile=Descriptor file of module
+ClassFile=File for PHP DAO CRUD class
+ApiClassFile=File for PHP API class
+PageForList=PHP page for list of record
+PageForCreateEditView=PHP page to create/edit/view a record
+PageForAgendaTab=PHP page for event tab
+PageForDocumentTab=PHP page for document tab
+PageForNoteTab=PHP page for note tab
+PathToModulePackage=Path to zip of module/application package
+PathToModuleDocumentation=Path to file of module/application documentation (%s)
+SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
+FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Force update of .class and .sql files
+RegenerateMissingFiles=Generate missing files
+SpecificationFile=File of documentation
+LanguageFile=File for language
+ObjectProperties=Object Properties
+ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
+NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
+SearchAll=Used for 'search all'
+DatabaseIndex=Database index
+FileAlreadyExists=File %s already exists
+TriggersFile=File for triggers code
+HooksFile=File for hooks code
+ArrayOfKeyValues=Array of key-val
+ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
+WidgetFile=Widget file
+CSSFile=CSS file
+JSFile=Javascript file
+ReadmeFile=Readme file
+ChangeLog=ChangeLog file
+TestClassFile=File for PHP Unit Test class
+SqlFile=Sql file
+PageForLib=File for the common PHP library
+PageForObjLib=File for the PHP library dedicated to object
+SqlFileExtraFields=Sql file for complementary attributes
+SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
+AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
+UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Is a measure
+DirScanned=Directory scanned
+NoTrigger=No trigger
+NoWidget=No widget
+GoToApiExplorer=Go to API explorer
+ListOfMenusEntries=List of menu entries
+ListOfDictionariesEntries=List of dictionaries entries
+ListOfPermissionsDefined=List of defined permissions
+SeeExamples=See examples here
+EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdf=Display on PDF
+IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
+SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
+SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
+LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
+MenusDefDesc=Define here the menus provided by your module
+DictionariesDefDesc=Define here the dictionaries provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
+HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
+TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
+SeeIDsInUse=See IDs in use in your installation
+SeeReservedIDsRangeHere=See range of reserved IDs
+ToolkitForDevelopers=Toolkit for Dolibarr developers
+TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
+SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
+AddLanguageFile=Add language file
+YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
+DropTableIfEmpty=(Delete table if empty)
+TableDoesNotExists=The table %s does not exists
+TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
+UseAboutPage=Disable the about page
+UseDocFolder=Disable the documentation folder
+UseSpecificReadme=Use a specific ReadMe
+ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
+RealPathOfModule=Real path of module
+ContentCantBeEmpty=Content of file can't be empty
+WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
+CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
+JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
+CLIDesc=You can generate here some command line scripts you want to provide with your module.
+CLIFile=CLI File
+NoCLIFile=No CLI files
+UseSpecificEditorName = Use a specific editor name
+UseSpecificEditorURL = Use a specific editor URL
+UseSpecificFamily = Use a specific family
+UseSpecificAuthor = Use a specific author
+UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
+IncludeRefGeneration=The reference of object must be generated automatically
+IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
+IncludeDocGeneration=I want to generate some documents from the object
+IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
+ShowOnCombobox=Show value into combobox
+KeyForTooltip=Key for tooltip
+CSSClass=CSS Class
+NotEditable=Not editable
+ForeignKey=Foreign key
+TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/sw_SW/mrp.lang b/htdocs/langs/sw_SW/mrp.lang
new file mode 100644
index 00000000000..d3c4d3253c6
--- /dev/null
+++ b/htdocs/langs/sw_SW/mrp.lang
@@ -0,0 +1,76 @@
+Mrp=Manufacturing Orders
+MO=Manufacturing Order
+MRPDescription=Module to manage production and Manufacturing Orders (MO).
+MRPArea=MRP Area
+MrpSetupPage=Setup of module MRP
+MenuBOM=Bills of material
+LatestBOMModified=Latest %s Bills of materials modified
+LatestMOModified=Latest %s Manufacturing Orders modified
+Bom=Bills of Material
+BillOfMaterials=Bill of Material
+BOMsSetup=Setup of module BOM
+ListOfBOMs=List of bills of material - BOM
+ListOfManufacturingOrders=List of Manufacturing Orders
+NewBOM=New bill of material
+ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+BOMsNumberingModules=BOM numbering templates
+BOMsModelModule=BOM document templates
+MOsNumberingModules=MO numbering templates
+MOsModelModule=MO document templates
+FreeLegalTextOnBOMs=Free text on document of BOM
+WatermarkOnDraftBOMs=Watermark on draft BOM
+FreeLegalTextOnMOs=Free text on document of MO
+WatermarkOnDraftMOs=Watermark on draft MO
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
+ManufacturingEfficiency=Manufacturing efficiency
+ConsumptionEfficiency=Consumption efficiency
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
+DeleteBillOfMaterials=Delete Bill Of Materials
+DeleteMo=Delete Manufacturing Order
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+MenuMRP=Manufacturing Orders
+NewMO=New Manufacturing Order
+QtyToProduce=Qty to produce
+DateStartPlannedMo=Date start planned
+DateEndPlannedMo=Date end planned
+KeepEmptyForAsap=Empty means 'As Soon As Possible'
+EstimatedDuration=Estimated duration
+EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
+ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
+ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
+StatusMOProduced=Produced
+QtyFrozen=Frozen Qty
+QuantityFrozen=Frozen Quantity
+QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
+DisableStockChange=Stock change disabled
+DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
+BomAndBomLines=Bills Of Material and lines
+BOMLine=Line of BOM
+WarehouseForProduction=Warehouse for production
+CreateMO=Create MO
+ToConsume=To consume
+ToProduce=To produce
+QtyAlreadyConsumed=Qty already consumed
+QtyAlreadyProduced=Qty already produced
+QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
+ConsumeOrProduce=Consume or Produce
+ConsumeAndProduceAll=Consume and Produce All
+Manufactured=Manufactured
+TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
+ForAQuantityOf=For a quantity to produce of %s
+ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
+ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
+ProductionForRef=Production of %s
+AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
+NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
+AddNewConsumeLines=Add new line to consume
+ProductsToConsume=Products to consume
+ProductsToProduce=Products to produce
+UnitCost=Unit cost
+TotalCost=Total cost
diff --git a/htdocs/langs/sw_SW/multicurrency.lang b/htdocs/langs/sw_SW/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/sw_SW/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/sw_SW/oauth.lang b/htdocs/langs/sw_SW/oauth.lang
new file mode 100644
index 00000000000..075ff49a895
--- /dev/null
+++ b/htdocs/langs/sw_SW/oauth.lang
@@ -0,0 +1,32 @@
+# Dolibarr language file - Source file is en_US - oauth
+ConfigOAuth=OAuth Configuration
+OAuthServices=OAuth Services
+ManualTokenGeneration=Manual token generation
+TokenManager=Token Manager
+IsTokenGenerated=Is token generated ?
+NoAccessToken=No access token saved into local database
+HasAccessToken=A token was generated and saved into local database
+NewTokenStored=Token received and saved
+ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
+TokenDeleted=Token deleted
+RequestAccess=Click here to request/renew access and receive a new token to save
+DeleteAccess=Click here to delete token
+UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
+ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
+OAuthSetupForLogin=Page to generate an OAuth token
+SeePreviousTab=See previous tab
+OAuthIDSecret=OAuth ID and Secret
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=OAuth Google service
+OAUTH_GOOGLE_ID=OAuth Google Id
+OAUTH_GOOGLE_SECRET=OAuth Google Secret
+OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create OAuth credentials
+OAUTH_GITHUB_NAME=OAuth GitHub service
+OAUTH_GITHUB_ID=OAuth GitHub Id
+OAUTH_GITHUB_SECRET=OAuth GitHub Secret
+OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create OAuth credentials
+OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
+OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index cdc0e6b3c95..bb42bff3c87 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/sw_SW/receiptprinter.lang b/htdocs/langs/sw_SW/receiptprinter.lang
new file mode 100644
index 00000000000..896eaa313dd
--- /dev/null
+++ b/htdocs/langs/sw_SW/receiptprinter.lang
@@ -0,0 +1,95 @@
+# Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
+PrinterAdded=Printer %s added
+PrinterUpdated=Printer %s updated
+PrinterDeleted=Printer %s deleted
+TestSentToPrinter=Test Sent To Printer %s
+ReceiptPrinter=Receipt printers
+ReceiptPrinterDesc=Setup of receipt printers
+ReceiptPrinterTemplateDesc=Setup of Templates
+ReceiptPrinterTypeDesc=Description of Receipt Printer's type
+ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
+ListPrinters=List of Printers
+SetupReceiptTemplate=Template Setup
+CONNECTOR_DUMMY=Dummy Printer
+CONNECTOR_NETWORK_PRINT=Network Printer
+CONNECTOR_FILE_PRINT=Local Printer
+CONNECTOR_WINDOWS_PRINT=Local Windows Printer
+CONNECTOR_CUPS_PRINT=Cups Printer
+CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
+CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
+CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
+CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
+PROFILE_DEFAULT=Default Profile
+PROFILE_SIMPLE=Simple Profile
+PROFILE_EPOSTEP=Epos Tep Profile
+PROFILE_P822D=P822D Profile
+PROFILE_STAR=Star Profile
+PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
+PROFILE_SIMPLE_HELP=Simple Profile No Graphics
+PROFILE_EPOSTEP_HELP=Epos Tep Profile
+PROFILE_P822D_HELP=P822D Profile No Graphics
+PROFILE_STAR_HELP=Star Profile
+DOL_LINE_FEED=Skip line
+DOL_ALIGN_LEFT=Left align text
+DOL_ALIGN_CENTER=Center text
+DOL_ALIGN_RIGHT=Right align text
+DOL_USE_FONT_A=Use font A of printer
+DOL_USE_FONT_B=Use font B of printer
+DOL_USE_FONT_C=Use font C of printer
+DOL_PRINT_BARCODE=Print barcode
+DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
+DOL_CUT_PAPER_FULL=Cut ticket completely
+DOL_CUT_PAPER_PARTIAL=Cut ticket partially
+DOL_OPEN_DRAWER=Open cash drawer
+DOL_ACTIVATE_BUZZER=Activate buzzer
+DOL_PRINT_QRCODE=Print QR Code
+DOL_PRINT_LOGO=Print logo of my company
+DOL_PRINT_LOGO_OLD=Print logo of my company (old printers)
+DOL_BOLD=Bold
+DOL_BOLD_DISABLED=Disable bold
+DOL_DOUBLE_HEIGHT=Double height size
+DOL_DOUBLE_WIDTH=Double width size
+DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
+DOL_UNDERLINE=Enable underline
+DOL_UNDERLINE_DISABLED=Disable underline
+DOL_BEEP=Beed sound
+DOL_PRINT_TEXT=Print text
+DOL_VALUE_DATE=Invoice date
+DOL_VALUE_DATE_TIME=Invoice date and time
+DOL_VALUE_YEAR=Invoice year
+DOL_VALUE_MONTH_LETTERS=Invoice month in letters
+DOL_VALUE_MONTH=Invoice month
+DOL_VALUE_DAY=Invoice day
+DOL_VALUE_DAY_LETTERS=Inovice day in letters
+DOL_LINE_FEED_REVERSE=Line feed reverse
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Invoice ref
+DOL_PRINT_OBJECT_LINES=Invoice lines
+DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
+DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
+DOL_VALUE_CUSTOMER_MAIL=Customer mail
+DOL_VALUE_CUSTOMER_PHONE=Customer phone
+DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
+DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
+DOL_VALUE_MYSOC_NAME=Your company name
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/sw_SW/receptions.lang b/htdocs/langs/sw_SW/receptions.lang
new file mode 100644
index 00000000000..010a7521846
--- /dev/null
+++ b/htdocs/langs/sw_SW/receptions.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - receptions
+ReceptionsSetup=Product Reception setup
+RefReception=Ref. reception
+Reception=Reception
+Receptions=Receptions
+AllReceptions=All Receptions
+Reception=Reception
+Receptions=Receptions
+ShowReception=Show Receptions
+ReceptionsArea=Receptions area
+ListOfReceptions=List of receptions
+ReceptionMethod=Reception method
+LastReceptions=Latest %s receptions
+StatisticsOfReceptions=Statistics for receptions
+NbOfReceptions=Number of receptions
+NumberOfReceptionsByMonth=Number of receptions by month
+ReceptionCard=Reception card
+NewReception=New reception
+CreateReception=Create reception
+QtyInOtherReceptions=Qty in other receptions
+OtherReceptionsForSameOrder=Other receptions for this order
+ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
+ReceptionsToValidate=Receptions to validate
+StatusReceptionCanceled=Canceled
+StatusReceptionDraft=Draft
+StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionProcessed=Processed
+StatusReceptionDraftShort=Draft
+StatusReceptionValidatedShort=Validated
+StatusReceptionProcessedShort=Processed
+ReceptionSheet=Reception sheet
+ConfirmDeleteReception=Are you sure you want to delete this reception?
+ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
+ConfirmCancelReception=Are you sure you want to cancel this reception?
+StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
+SendReceptionByEMail=Send reception by email
+SendReceptionRef=Submission of reception %s
+ActionsOnReception=Events on reception
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the order card.
+ReceptionLine=Reception line
+ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
+ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
+ReceptionsNumberingModules=Numbering module for receptions
+ReceptionsReceiptModel=Document templates for receptions
diff --git a/htdocs/langs/sw_SW/stripe.lang b/htdocs/langs/sw_SW/stripe.lang
new file mode 100644
index 00000000000..844762040af
--- /dev/null
+++ b/htdocs/langs/sw_SW/stripe.lang
@@ -0,0 +1,72 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Stripe module setup
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
+StripeOrCBDoPayment=Pay with credit card or Stripe
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+Creditor=Creditor
+PaymentCode=Payment code
+StripeDoPayment=Pay with Stripe
+YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+Continue=Next
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment page for a sales order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment page for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.<br>For the URL of payments with no existing object, you may also add the parameter <strong>&noidempotency=1</strong> so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter)
+SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+NewStripePaymentReceived=New Stripe payment received
+NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
+STRIPE_TEST_SECRET_KEY=Secret test key
+STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
+STRIPE_LIVE_SECRET_KEY=Secret live key
+STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
+StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
+StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
+StripePayoutList=List of Stripe payouts
+ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
+ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
+PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
+ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
diff --git a/htdocs/langs/sw_SW/supplier_proposal.lang b/htdocs/langs/sw_SW/supplier_proposal.lang
new file mode 100644
index 00000000000..ce5bdf0425a
--- /dev/null
+++ b/htdocs/langs/sw_SW/supplier_proposal.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposalNew=New price request
+CommRequest=Price request
+CommRequests=Price requests
+SearchRequest=Find a request
+DraftRequests=Draft requests
+SupplierProposalsDraft=Draft vendor proposals
+LastModifiedRequests=Latest %s modified price requests
+RequestsOpened=Open price requests
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
+NewAskPrice=New price request
+ShowSupplierProposal=Show price request
+AddSupplierProposal=Create a price request
+SupplierProposalRefFourn=Vendor ref
+SupplierProposalDate=Delivery date
+SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
+ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
+DeleteAsk=Delete request
+ValidateAsk=Validate request
+SupplierProposalStatusDraft=Draft (needs to be validated)
+SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusClosed=Closed
+SupplierProposalStatusSigned=Accepted
+SupplierProposalStatusNotSigned=Refused
+SupplierProposalStatusDraftShort=Draft
+SupplierProposalStatusValidatedShort=Validated
+SupplierProposalStatusClosedShort=Closed
+SupplierProposalStatusSignedShort=Accepted
+SupplierProposalStatusNotSignedShort=Refused
+CopyAskFrom=Create a price request by copying an existing request
+CreateEmptyAsk=Create blank request
+ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
+ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
+SendAskByMail=Send price request by mail
+SendAskRef=Sending the price request %s
+SupplierProposalCard=Request card
+ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
+ActionsOnSupplierProposal=Events on price request
+DocModelAuroreDescription=A complete request model (logo...)
+CommercialAsk=Price request
+DefaultModelSupplierProposalCreate=Default model creation
+DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
+DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
+ListOfSupplierProposals=List of vendor proposal requests
+ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
+SupplierProposalsToClose=Vendor proposals to close
+SupplierProposalsToProcess=Vendor proposals to process
+LastSupplierProposals=Latest %s price requests
+AllPriceRequests=All requests
diff --git a/htdocs/langs/sw_SW/ticket.lang b/htdocs/langs/sw_SW/ticket.lang
new file mode 100644
index 00000000000..80518c3401a
--- /dev/null
+++ b/htdocs/langs/sw_SW/ticket.lang
@@ -0,0 +1,305 @@
+# en_US lang file for module ticket
+# Copyright (C) 2013  Jean-François FERRY <hello@librethic.io>
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+Module56000Name=Tickets
+Module56000Desc=Ticket system for issue or request management
+
+Permission56001=See tickets
+Permission56002=Modify tickets
+Permission56003=Delete tickets
+Permission56004=Manage tickets
+Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+
+TicketDictType=Ticket - Types
+TicketDictCategory=Ticket - Groupes
+TicketDictSeverity=Ticket - Severities
+TicketDictResolution=Ticket - Resolution
+TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
+TicketTypeShortBUGHARD=Dysfonctionnement matériel
+TicketTypeShortCOM=Commercial question
+
+TicketTypeShortHELP=Request for functionnal help
+TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortPROJET=Project
+TicketTypeShortOTHER=Other
+
+TicketSeverityShortLOW=Low
+TicketSeverityShortNORMAL=Normal
+TicketSeverityShortHIGH=High
+TicketSeverityShortBLOCKING=Critical/Blocking
+
+ErrorBadEmailAddress=Field '%s' incorrect
+MenuTicketMyAssign=My tickets
+MenuTicketMyAssignNonClosed=My open tickets
+MenuListNonClosed=Open tickets
+
+TypeContact_ticket_internal_CONTRIBUTOR=Contributor
+TypeContact_ticket_internal_SUPPORTTEC=Assigned user
+TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
+TypeContact_ticket_external_CONTRIBUTOR=External contributor
+
+OriginEmail=Email source
+Notify_TICKET_SENTBYMAIL=Send ticket message by email
+
+# Status
+NotRead=Not read
+Read=Read
+Assigned=Assigned
+InProgress=In progress
+NeedMoreInformation=Waiting for information
+Answered=Answered
+Waiting=Waiting
+Closed=Closed
+Deleted=Deleted
+
+# Dict
+Type=Type
+Category=Analytic code
+Severity=Severity
+
+# Email templates
+MailToSendTicketMessage=To send email from ticket message
+
+#
+# Admin page
+#
+TicketSetup=Ticket module setup
+TicketSettings=Settings
+TicketSetupPage=
+TicketPublicAccess=A public interface requiring no identification is available at the following url
+TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
+TicketParamModule=Module variable setup
+TicketParamMail=Email setup
+TicketEmailNotificationFrom=Notification email from
+TicketEmailNotificationFromHelp=Used into ticket message answer by example
+TicketEmailNotificationTo=Notifications email to
+TicketEmailNotificationToHelp=Send email notifications to this address.
+TicketNewEmailBodyLabel=Text message sent after creating a ticket
+TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
+TicketParamPublicInterface=Public interface setup
+TicketsEmailMustExist=Require an existing email address to create a ticket
+TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket.
+PublicInterface=Public interface
+TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
+TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
+TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
+TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
+TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
+TicketPublicInterfaceTopicLabelAdmin=Interface title
+TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
+TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
+ExtraFieldsTicket=Extra attributes
+TicketCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
+TicketsDisableEmail=Do not send emails for ticket creation or message recording
+TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
+TicketsLogEnableEmail=Enable log by email
+TicketsLogEnableEmailHelp=At each change, an email will be sent **to each contact** associated with the ticket.
+TicketParams=Params
+TicketsShowModuleLogo=Display the logo of the module in the public interface
+TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
+TicketsShowCompanyLogo=Display the logo of the company in the public interface
+TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
+TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
+TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
+TicketsActivatePublicInterface=Activate public interface
+TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create tickets.
+TicketsAutoAssignTicket=Automatically assign the user who created the ticket
+TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
+TicketNumberingModules=Tickets numbering module
+TicketNotifyTiersAtCreation=Notify third party at creation
+TicketGroup=Group
+TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
+#
+# Index & list page
+#
+TicketsIndex=Tickets area
+TicketList=List of tickets
+TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
+NoTicketsFound=No ticket found
+NoUnreadTicketsFound=No unread ticket found
+TicketViewAllTickets=View all tickets
+TicketViewNonClosedOnly=View only open tickets
+TicketStatByStatus=Tickets by status
+OrderByDateAsc=Sort by ascending date
+OrderByDateDesc=Sort by descending date
+ShowAsConversation=Show as conversation list
+MessageListViewType=Show as table list
+
+#
+# Ticket card
+#
+Ticket=Ticket
+TicketCard=Ticket card
+CreateTicket=Create ticket
+EditTicket=Edit ticket
+TicketsManagement=Tickets Management
+CreatedBy=Created by
+NewTicket=New Ticket
+SubjectAnswerToTicket=Ticket answer
+TicketTypeRequest=Request type
+TicketCategory=Analytic code
+SeeTicket=See ticket
+TicketMarkedAsRead=Ticket has been marked as read
+TicketReadOn=Read on
+TicketCloseOn=Closing date
+MarkAsRead=Mark ticket as read
+TicketHistory=Ticket history
+AssignUser=Assign to user
+TicketAssigned=Ticket is now assigned
+TicketChangeType=Change type
+TicketChangeCategory=Change analytic code
+TicketChangeSeverity=Change severity
+TicketAddMessage=Add a message
+AddMessage=Add a message
+MessageSuccessfullyAdded=Ticket added
+TicketMessageSuccessfullyAdded=Message successfully added
+TicketMessagesList=Message list
+NoMsgForThisTicket=No message for this ticket
+Properties=Classification
+LatestNewTickets=Latest %s newest tickets (not read)
+TicketSeverity=Severity
+ShowTicket=See ticket
+RelatedTickets=Related tickets
+TicketAddIntervention=Create intervention
+CloseTicket=Close ticket
+CloseATicket=Close a ticket
+ConfirmCloseAticket=Confirm ticket closing
+ConfirmDeleteTicket=Please confirm ticket deleting
+TicketDeletedSuccess=Ticket deleted with success
+TicketMarkedAsClosed=Ticket marked as closed
+TicketDurationAuto=Calculated duration
+TicketDurationAutoInfos=Duration calculated automatically from intervention related
+TicketUpdated=Ticket updated
+SendMessageByEmail=Send message by email
+TicketNewMessage=New message
+ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
+TicketGoIntoContactTab=Please go into "Contacts" tab to select them
+TicketMessageMailIntro=Introduction
+TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
+TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
+TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
+TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
+TicketMessageMailSignature=Signature
+TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
+TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
+TicketMessageMailSignatureLabelAdmin=Signature of response email
+TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
+TicketMessageHelp=Only this text will be saved in the message list on ticket card.
+TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
+TimeElapsedSince=Time elapsed since
+TicketTimeToRead=Time elapsed before read
+TicketContacts=Contacts ticket
+TicketDocumentsLinked=Documents linked to ticket
+ConfirmReOpenTicket=Confirm reopen this ticket ?
+TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
+TicketAssignedToYou=Ticket assigned
+TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
+MarkMessageAsPrivate=Mark message as private
+TicketMessagePrivateHelp=This message will not display to external users
+TicketEmailOriginIssuer=Issuer at origin of the tickets
+InitialMessage=Initial Message
+LinkToAContract=Link to a contract
+TicketPleaseSelectAContract=Select a contract
+UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
+TicketMailExchanges=Mail exchanges
+TicketInitialMessageModified=Initial message modified
+TicketMessageSuccesfullyUpdated=Message successfully updated
+TicketChangeStatus=Change status
+TicketConfirmChangeStatus=Confirm the status change: %s ?
+TicketLogStatusChanged=Status changed: %s to %s
+TicketNotNotifyTiersAtCreate=Not notify company at create
+Unread=Unread
+TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
+PublicInterfaceNotEnabled=Public interface was not enabled
+ErrorTicketRefRequired=Ticket reference name is required
+
+#
+# Logs
+#
+TicketLogMesgReadBy=Ticket %s read by %s
+NoLogForThisTicket=No log for this ticket yet
+TicketLogAssignedTo=Ticket %s assigned to %s
+TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
+TicketLogClosedBy=Ticket %s closed by %s
+TicketLogReopen=Ticket %s re-open
+
+#
+# Public pages
+#
+TicketSystem=Ticket system
+ShowListTicketWithTrackId=Display ticket list from track ID
+ShowTicketWithTrackId=Display ticket from track ID
+TicketPublicDesc=You can create a support ticket or check from an existing ID.
+YourTicketSuccessfullySaved=Ticket has been successfully saved!
+MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
+PleaseRememberThisId=Please keep the tracking number that we might ask you later.
+TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
+TicketNewEmailSubjectCustomer=New support ticket
+TicketNewEmailBody=This is an automatic email to confirm you have registered a new ticket.
+TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
+TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
+TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
+TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
+TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
+TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
+TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
+TicketPublicMsgViewLogIn=Please enter ticket tracking ID
+TicketTrackId=Public Tracking ID
+OneOfTicketTrackId=One of your tracking ID
+ErrorTicketNotFound=Ticket with tracking ID %s not found!
+Subject=Subject
+ViewTicket=View ticket
+ViewMyTicketList=View my ticket list
+ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
+TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
+TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
+SeeThisTicketIntomanagementInterface=See ticket in management interface
+TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
+ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
+OldUser=Old user
+NewUser=New user
+NumberOfTicketsByMonth=Number of tickets per month
+NbOfTickets=Number of tickets
+# notifications
+TicketNotificationEmailSubject=Ticket %s updated
+TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
+TicketNotificationRecipient=Notification recipient
+TicketNotificationLogMessage=Log message
+TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
+TicketNotificationNumberEmailSent=Notification email sent: %s
+
+ActionsOnTicket=Events on ticket
+
+#
+# Boxes
+#
+BoxLastTicket=Latest created tickets
+BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicketContent=
+BoxLastTicketNoRecordedTickets=No recent unread tickets
+BoxLastModifiedTicket=Latest modified tickets
+BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastModifiedTicketContent=
+BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
diff --git a/htdocs/langs/sw_SW/website.lang b/htdocs/langs/sw_SW/website.lang
new file mode 100644
index 00000000000..bce2a09fb03
--- /dev/null
+++ b/htdocs/langs/sw_SW/website.lang
@@ -0,0 +1,130 @@
+# Dolibarr language file - Source file is en_US - website
+Shortname=Code
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
+DeleteWebsite=Delete website
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
+WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
+WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
+WEBSITE_CSS_URL=URL of external CSS file
+WEBSITE_CSS_INLINE=CSS file content (common to all pages)
+WEBSITE_JS_INLINE=Javascript file content (common to all pages)
+WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
+WEBSITE_ROBOT=Robot file (robots.txt)
+WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
+HtmlHeaderPage=HTML header (specific to this page only)
+PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
+EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
+MediaFiles=Media library
+EditCss=Edit website properties
+EditMenu=Edit menu
+EditMedias=Edit medias
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
+AddWebsite=Add website
+Webpage=Web page/container
+AddPage=Add page/container
+HomePage=Home Page
+PageContainer=Page/container
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
+PageContent=Page/Contenair
+PageDeleted=Page/Contenair '%s' of website %s deleted
+PageAdded=Page/Contenair '%s' added
+ViewSiteInNewTab=View site in new tab
+ViewPageInNewTab=View page in new tab
+SetAsHomePage=Set as Home page
+RealURL=Real URL
+ViewWebsiteInProduction=View web site using home URLs
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+TestDeployOnWeb=Test/deploy on web
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
+NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
+SyntaxHelp=Help on specific syntax tips
+YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+ClonePage=Clone page/container
+CloneSite=Clone site
+SiteAdded=Website added
+ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
+PageIsANewTranslation=The new page is a translation of the current page ?
+LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
+ParentPageId=Parent page ID
+WebsiteId=Website ID
+CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
+FetchAndCreate=Fetch and Create
+ExportSite=Export website
+ImportSite=Import website template
+IDOfPage=Id of page
+Banner=Banner
+BlogPost=Blog post
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
+AddWebsiteAccount=Create web site account
+BackToListForThirdParty=Back to list for the third-party
+DisableSiteFirst=Disable website first
+MyContainerTitle=My web site title
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is a translation of
+ThisPageHasTranslationPages=This page/container has translation
+NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
+GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Search or Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
+MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
+EditInLineOnOff=Mode 'Edit inline' is %s
+ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
+GlobalCSSorJS=Global CSS/JS/Header file of web site
+BackToHomePage=Back to home page...
+TranslationLinks=Translation links
+YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not a website page
+UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
+MainLanguage=Main language
+OtherLanguages=Other languages
+UseManifest=Provide a manifest.json file
+PublicAuthorAlias=Public author alias
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
+ReplacementDoneInXPages=Replacement done in %s pages or containers
diff --git a/htdocs/langs/sw_SW/zapier.lang b/htdocs/langs/sw_SW/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/sw_SW/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index 7839fc21d24..35f86f621b2 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=อัตรากำไรขั้นต้นรวมยอดขาย
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 773bab926c6..16c6dba398c 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=ผู้ใช้เว็บเซิร์ฟเวอร์ / 
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=ฐานข้อมูล charset ในการเก็บข้อมูล
 DBSortingCharset=ฐานข้อมูล charset ในการจัดเรียงข้อมูล
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=<b>% s</b> โมดูลต้องเปิดใช้งาน
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=เชื่อมโยงไปยังวัตถุ
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=โดยค่าเริ่มต้น IRPF เสนอคือ 0 สิ้นสุดของการปกครอง
 LocalTax2IsUsedExampleES=ในสเปนมือปืนรับจ้างและอาชีพอิสระที่ให้บริการและ บริษัท ที่ได้รับเลือกให้ระบบภาษีของโมดูล
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=รายงานเกี่ยวกับภาษีท้องถิ่น
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=ผู้ใช้ติดตั้งโมดูล
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=หลาย บริษัท ติดตั้งโมด
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=สีพื้นหลังสำหรับเมนูด้านซ้าย
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=สีพื้นหลังสำหรับสายตารางแปลก
 BackgroundTableLineEvenColor=สีพื้นหลังสำหรับแม้แต่เส้นตาราง
 MinimumNoticePeriod=ระยะเวลาการแจ้งให้ทราบล่วงหน้าขั้นต่ำ (ตามคำขอลาของคุณจะต้องทำก่อนการหน่วงเวลานี้)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=ไปรษณีย์
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index c78795bd6d4..98fa07d56b7 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=จำนวนเงินของใบแจ้งหนี้
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=จำนวนเงินของใบแจ้งหนี้ตามเดือน (สุทธิจากภาษี)
-ShowSocialContribution=แสดงทางสังคม / ภาษีการคลัง
-ShowBill=แสดงใบแจ้งหนี้
-ShowInvoice=แสดงใบแจ้งหนี้
-ShowInvoiceReplace=แสดงการเปลี่ยนใบแจ้งหนี้
-ShowInvoiceAvoir=แสดงใบลดหนี้
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=แสดงการชำระเงิน
 AlreadyPaid=จ่ายเงินไปแล้ว
 AlreadyPaidBack=จ่ายเงินไปแล้วกลับมา
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=สถานะ
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=จำนวนกลับมาพร้อมกับรูปแบบ% syymm-nnnn สำหรับใบแจ้งหนี้และมาตรฐาน% syymm-nnnn สำหรับการบันทึกเครดิตที่ yy เป็นปีเป็นเดือนมิลลิเมตรและ nnnn เป็นลำดับที่มีการหยุดพักและกลับไปที่ 0 ไม่มี
diff --git a/htdocs/langs/th_TH/donations.lang b/htdocs/langs/th_TH/donations.lang
index e0b8d33217f..71a67dc9758 100644
--- a/htdocs/langs/th_TH/donations.lang
+++ b/htdocs/langs/th_TH/donations.lang
@@ -7,7 +7,6 @@ AddDonation=สร้างการบริจาค
 NewDonation=บริจาคใหม่
 DeleteADonation=ลบบริจาค
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=แสดงบริจาค
 PublicDonation=เงินบริจาคของประชาชน
 DonationsArea=พื้นที่บริจาค
 DonationStatusPromiseNotValidated=ร่างสัญญา
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=ร่าง
 DonationStatusPromiseValidatedShort=ผ่านการตรวจสอบ
 DonationStatusPaidShort=ที่ได้รับ
 DonationTitle=ใบเสร็จรับเงินบริจาค
+DonationDate=Donation date
 DonationDatePayment=วันที่ชำระเงิน
 ValidPromess=ตรวจสอบสัญญา
 DonationReceipt=ใบเสร็จรับเงินบริจาค
diff --git a/htdocs/langs/th_TH/interventions.lang b/htdocs/langs/th_TH/interventions.lang
index f15fc776b73..dd10bf804e4 100644
--- a/htdocs/langs/th_TH/interventions.lang
+++ b/htdocs/langs/th_TH/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=ติดตามการติดต่อกับลูกค้า
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=การแทรกแซงที่เกิดจากคำสั่งซื้อ
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/th_TH/modulebuilder.lang b/htdocs/langs/th_TH/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/th_TH/modulebuilder.lang
+++ b/htdocs/langs/th_TH/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index 58543c6538b..b07c8503eaa 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/th_TH/website.lang b/htdocs/langs/th_TH/website.lang
index 4925729beba..0fee45ead93 100644
--- a/htdocs/langs/th_TH/website.lang
+++ b/htdocs/langs/th_TH/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/th_TH/zapier.lang b/htdocs/langs/th_TH/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/th_TH/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index b9b246b7831..932d6b1f5d1 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bağlı fatura satırları
 ExpenseReportLines=Bağlanacak gider raporu satırları
 ExpenseReportLinesDone=Bağlanmış gider raporları satırları
 IntoAccount=Satırı muhasebe hesabına bağla
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bağla
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Satılan ürünler için varsayılan muhasebe hesabı (ürün kartlarında tanımlanmışsa)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Satınalınan hizmetler için varsayılan muhasebe hesabı (ürün kartlarında tanımlanmışsa)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Satılan hizmetler için varsayılan muhasebe kodu (hizmet sayfasında tanımlanmamışsa)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -192,8 +198,8 @@ AccountingCategory=Kişiselleştirilmiş gruplar
 GroupByAccountAccounting=Group by accounting account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
-ByPredefinedAccountGroups=By predefined groups
-ByPersonalizedAccountGroups=By personalized groups
+ByPredefinedAccountGroups=Önceden tanımlanmış gruplar tarafından
+ByPersonalizedAccountGroups=Kişiselleştirilmiş gruplar tarafından
 ByYear=Yıla göre
 NotMatch=Ayarlanmamış
 DeleteMvt=Büyük defter satırlarını sil
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Hesap grubu
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Vergi öncesi toplam gelir
 TotalMarge=Toplam satışlar kar oranı
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=EBP için dışa aktarım
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Hesap planı Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Satış modu
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Satınalma modu
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Önceden tanımlanmış gruplar
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Muhasebe hesabı aralığı
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 4fdacce278c..a4b05dfe3b1 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web sunucusu kullanıcısı/grubu
 NoSessionFound=PHP yapılandırmanız aktif oturumların listelenmesine izin vermiyor gibi görünüyor. Oturumları kaydetmek için kullanılan dizin (<b>%s</b>) korunuyor olabilir (örneğin, İşletim Sistemi izinleri veya open_basedir PHP direkti tarafından).
 DBStoringCharset=Veri depolamak için veri tabanı karakter seti
 DBSortingCharset=Veri sıralamak için veri tabanı karakter seti
+HostCharset=Host charset
 ClientCharset=İstemci karakter seti
 ClientSortingCharset=İstemci karşılaştırma
 WarningModuleNotActive=<b>%s</b> modülü etkin olmalıdır
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Onay kutuları
 ExtrafieldCheckBoxFromList=Tablodan onay kutuları
 ExtrafieldLink=Bir nesneye bağlantı
 ComputedFormula=Hesaplanmış alan
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=Varsayılan olarak önerilen IRPF 0. Kural sonu.
 LocalTax2IsUsedExampleES=İspanya'da, hizmet işleri yapan serbest meslek sahipleri ve bağımsız uzmanlar ile bu vergi sistemini seçen firmalardır.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Yerel vergi raporları
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Parola oluşturma ve doğrulama kuralları
 DisableForgetPasswordLinkOnLogonPage=Oturum açma sayfasında “Parolanızı mı unuttunuz?” bağlantısını gösterme
 UsersSetup=Kullanıcılar modülü kurulumu
 UserMailRequired=Yeni bir kullanıcı oluşturmak için e-posta gerekli
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Çoklu şirket modülü kurulumu
 ##### Suppliers #####
 SuppliersSetup=Tedarikçi modülü ayarları
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Tedarikçi faturaları numaralandırma modelleri
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Üst menüdeki görüntüleri gizle
 LeftMenuBackgroundColor=Sol menü için arka plan rengi
 BackgroundTableTitleColor=Tablo satırı başlığı için arka plan rengi
 BackgroundTableTitleTextColor=Tablo satırı başlığı için metin rengi
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Tabloda tek satırlar için arka plan rengi
 BackgroundTableLineEvenColor=Tabloda çift satırlar için arka plan rengi
 MinimumNoticePeriod=Enaz bildirim süresi (İzin isteğiniz bu süreden önce yapılmalı)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Posta Kodu
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Otomatik ECM ağacını göster
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Açılış saatleri
 OpeningHoursDesc=Buraya şirketinizin normal çalışma saatlerini girin.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index 73cb73cd3ff..f6b11557d8e 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=Aylık fatura sayısı
 AmountOfBills=Faturaların tutarı
 AmountOfBillsHT=Fatura tutarı (vergisiz net)
 AmountOfBillsByMonthHT=Aylık fatura tutarı (vergisiz net)
-ShowSocialContribution=Sosyal/mali vergi göster
-ShowBill=Fatura göster
-ShowInvoice=Fatura göster
-ShowInvoiceReplace=Değiştirilen faturayı göster
-ShowInvoiceAvoir=İade faturası göster
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Hakediş faturası göster
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Ödeme göster
 AlreadyPaid=Zaten ödenmiş
 AlreadyPaidBack=Zaten geri ödenmiş
 AlreadyPaidNoCreditNotesNoDeposits=Zaten ödenmiş (alacak dekontu veya peşinatlar olmadan)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Uyarı: fatura tarihi şu anki tarihten daha yüksek
 WarningInvoiceDateTooFarInFuture=Uyarı, fatura tarihi şu anki tarihten çok uzak
 ViewAvailableGlobalDiscounts=Mevcut indirimleri görüntüle
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Durumu
 PaymentConditionShortRECEP=Teslimatta peşin
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=Yeni bir fatura şablonu oluşturmak için önce bir standart fatura oluşturmalı ve onu "şablona" dönüştürmelisiniz
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Fatura PDF şablonu Crevette. Durum faturaları için eksiksiz bir fatura şablonu
 TerreNumRefModelDesc1=Standart faturalar için numarayı  %syymm-nnnn biçiminde ve iade faturaları için %syymm-nnnn biçiminde göster, yy yıl, mm ay ve nnnn boşluksuz ve 0 olmayan bir dizidir.
diff --git a/htdocs/langs/tr_TR/interventions.lang b/htdocs/langs/tr_TR/interventions.lang
index e3fff435d06..f29757a0b21 100644
--- a/htdocs/langs/tr_TR/interventions.lang
+++ b/htdocs/langs/tr_TR/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Müdahaleler alanı
 DraftFichinter=Taslak müdahale
 LastModifiedInterventions=Değiştirilen son %s müdahale
 FichinterToProcess=İşlenecek müdahaleler
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Müşteri izleme yetkilisi
-# Modele numérotation
 PrintProductsOnFichinter=Müdahale kartında "ürün" türü (yalnızca hizmetleri değil) satırını da yazdır.
 PrintProductsOnFichinterDetails=Siparişlerden oluşturulan müdahaleler
 UseServicesDurationOnFichinter=Siparişlerden oluşturulan müdahaleler için hizmet sürelerini kullan
@@ -53,14 +51,16 @@ InterventionStatistics=Müdahale istatistikleri
 NbOfinterventions=Müdahale kartlarının sayısı
 NumberOfInterventionsByMonth=Aya göre müdahale kartlarının sayısı (doğrulama tarihi)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Müdahale kimliği
 InterRef=Müdahele ref.
 InterDateCreation=Müdahele oluşturma tarihi
 InterDuration=Müdahale süresi
 InterStatus=Müdahele durumu
 InterNote=Müdahele notu
+InterLine=Line of intervention
 InterLineId=Müdahele satır kimliği
 InterLineDate=Müdahele satır tarihi
 InterLineDuration=Müdahele satır süresi
 InterLineDesc=Müdahele satır açıklaması
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/tr_TR/modulebuilder.lang b/htdocs/langs/tr_TR/modulebuilder.lang
index 3bc8febcdb3..693338ec65f 100644
--- a/htdocs/langs/tr_TR/modulebuilder.lang
+++ b/htdocs/langs/tr_TR/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=Sözlük girişlerinin listesi
 ListOfPermissionsDefined=Tanımlanan izinlerin listesi
 SeeExamples=Burada örneklere bakın
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index 44d35644f1c..6ed953ea615 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/tr_TR/website.lang b/htdocs/langs/tr_TR/website.lang
index 2c6025eb4dd..99c7f17168c 100644
--- a/htdocs/langs/tr_TR/website.lang
+++ b/htdocs/langs/tr_TR/website.lang
@@ -57,7 +57,7 @@ NoPageYet=Henüz hiç sayfa yok
 YouCanCreatePageOrImportTemplate=Yeni bir sayfa oluşturabilir veya tam bir web sitesi şablonunu içe aktarabilirsiniz
 SyntaxHelp=Belirli sözdizimi ipuçları hakkında yardım
 YouCanEditHtmlSourceckeditor=Düzenleyicideki "Kaynak" düğmesini kullanarak HTML kaynak kodunu düzenleyebilirsiniz
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Sayfa/kapsayıcı kopyasını oluştur
 CloneSite=Sitenin kopyasını oluştur
 SiteAdded=Web sitesi eklendi
@@ -77,7 +77,7 @@ BlogPost=Blog yazısı
 WebsiteAccount=Web sitesi hesabı
 WebsiteAccounts=Web sitesi hesapları
 AddWebsiteAccount=Web sitesi hesabı oluştur
-BackToListOfThirdParty=Üçüncü Parti listesine geri dön
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Önce web sitesini devre dışı bırak
 MyContainerTitle=Web sitemin başlığı
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/tr_TR/zapier.lang b/htdocs/langs/tr_TR/zapier.lang
new file mode 100644
index 00000000000..c1f64887a9a
--- /dev/null
+++ b/htdocs/langs/tr_TR/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Dolibarr için Zapier
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Dolibarr modülü için Zapier
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Dolibarr için Zapier ayarları
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index 9bf0f16ab8f..c3f5802b92a 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 2e96db5c8dc..77db823c815 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web server user/group
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Модуль <b>%s</b> повинен бути активованим
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Users module setup
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index d481e665112..f33892e06aa 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Сума рахунків-фактур
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Сума рахунків-фактур за місяць (за вирахуванням податку)
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=Показати рахунок-фактуру
-ShowInvoice=Показати рахунок-фактуру
-ShowInvoiceReplace=Показати замінюючий рахунок-фактуру
-ShowInvoiceAvoir=Показати кредитое авізо
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Показати платіж
 AlreadyPaid=Вже сплачений
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/uk_UA/donations.lang b/htdocs/langs/uk_UA/donations.lang
index db25a36744c..8ceb3f02a07 100644
--- a/htdocs/langs/uk_UA/donations.lang
+++ b/htdocs/langs/uk_UA/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Create a donation
 NewDonation=New donation
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Show donation
 PublicDonation=Public donation
 DonationsArea=Donations area
 DonationStatusPromiseNotValidated=Draft promise
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Проект
 DonationStatusPromiseValidatedShort=Підтверджений
 DonationStatusPaidShort=Received
 DonationTitle=Donation receipt
+DonationDate=Donation date
 DonationDatePayment=Дата платежу
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
diff --git a/htdocs/langs/uk_UA/interventions.lang b/htdocs/langs/uk_UA/interventions.lang
index 59f2cb4dc60..69872dae7de 100644
--- a/htdocs/langs/uk_UA/interventions.lang
+++ b/htdocs/langs/uk_UA/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/uk_UA/modulebuilder.lang b/htdocs/langs/uk_UA/modulebuilder.lang
index 00a8c0f9d32..135ac1ae9ec 100644
--- a/htdocs/langs/uk_UA/modulebuilder.lang
+++ b/htdocs/langs/uk_UA/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/uk_UA/multicurrency.lang b/htdocs/langs/uk_UA/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/uk_UA/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index 5e499f4b2c7..c719a049380 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang
index 1fe75b2993e..e2d360bc4c8 100644
--- a/htdocs/langs/uk_UA/website.lang
+++ b/htdocs/langs/uk_UA/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=Blog post
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/uk_UA/zapier.lang b/htdocs/langs/uk_UA/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/uk_UA/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index 1f9382137ea..b8ce37a0956 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Bind
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Reset all bindings for selected year
 PredefinedGroups=Predefined groups
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 0205f246b0c..7eb67d7a4ab 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web server user/group
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Module <b>%s</b> must be enabled
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Reports on local taxes
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Users module setup
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/uz_UZ/assets.lang b/htdocs/langs/uz_UZ/assets.lang
new file mode 100644
index 00000000000..ef04723c6c2
--- /dev/null
+++ b/htdocs/langs/uz_UZ/assets.lang
@@ -0,0 +1,65 @@
+# Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+Assets = Assets
+NewAsset = New asset
+AccountancyCodeAsset = Accounting code (asset)
+AccountancyCodeDepreciationAsset = Accounting code (depreciation asset account)
+AccountancyCodeDepreciationExpense = Accounting code (depreciation expense account)
+NewAssetType=New asset type
+AssetsTypeSetup=Asset type setup
+AssetTypeModified=Asset type modified
+AssetType=Asset type
+AssetsLines=Assets
+DeleteType=Delete
+DeleteAnAssetType=Delete an asset type
+ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
+ShowTypeCard=Show type '%s'
+
+# Module label 'ModuleAssetsName'
+ModuleAssetsName = Assets
+# Module description 'ModuleAssetsDesc'
+ModuleAssetsDesc = Assets description
+
+#
+# Admin page
+#
+AssetsSetup = Assets setup
+Settings = Settings
+AssetsSetupPage = Assets setup page
+ExtraFieldsAssetsType = Complementary attributes (Asset type)
+AssetsType=Asset type
+AssetsTypeId=Asset type id
+AssetsTypeLabel=Asset type label
+AssetsTypes=Assets types
+
+#
+# Menu
+#
+MenuAssets = Assets
+MenuNewAsset = New asset
+MenuTypeAssets = Type assets
+MenuListAssets = List
+MenuNewTypeAssets = New
+MenuListTypeAssets = List
+
+#
+# Module
+#
+NewAssetType=New asset type
+NewAsset=New asset
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index 8c22ce0159a..9f11d8ecf87 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social/fiscal tax
-ShowBill=Show invoice
-ShowInvoice=Show invoice
-ShowInvoiceReplace=Show replacing invoice
-ShowInvoiceAvoir=Show credit note
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/uz_UZ/blockedlog.lang b/htdocs/langs/uz_UZ/blockedlog.lang
new file mode 100644
index 00000000000..5afae6e9e53
--- /dev/null
+++ b/htdocs/langs/uz_UZ/blockedlog.lang
@@ -0,0 +1,54 @@
+BlockedLog=Unalterable Logs
+Field=Field
+BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525).
+Fingerprints=Archived events and fingerprints
+FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed).
+CompanyInitialKey=Company initial key (hash of genesis block)
+BrowseBlockedLog=Unalterable logs
+ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
+ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
+DownloadBlockChain=Download fingerprints
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
+OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
+AddedByAuthority=Stored into remote authority
+NotAddedByAuthorityYet=Not yet stored into remote authority
+ShowDetails=Show stored details
+logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
+logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
+logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
+logPAYMENT_ADD_TO_BANK=Payment added to bank
+logPAYMENT_CUSTOMER_CREATE=Customer payment created
+logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
+logDONATION_PAYMENT_CREATE=Donation payment created
+logDONATION_PAYMENT_DELETE=Donation payment logical deletion
+logBILL_PAYED=Customer invoice paid
+logBILL_UNPAYED=Customer invoice set unpaid
+logBILL_VALIDATE=Customer invoice validated
+logBILL_SENTBYMAIL=Customer invoice send by mail
+logBILL_DELETE=Customer invoice logically deleted
+logMODULE_RESET=Module BlockedLog was disabled
+logMODULE_SET=Module BlockedLog was enabled
+logDON_VALIDATE=Donation validated
+logDON_MODIFY=Donation modified
+logDON_DELETE=Donation logical deletion
+logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
+logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
+logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
+logCASHCONTROL_VALIDATE=Cash fence recording
+BlockedLogBillDownload=Customer invoice download
+BlockedLogBillPreview=Customer invoice preview
+BlockedlogInfoDialog=Log Details
+ListOfTrackedEvents=List of tracked events
+Fingerprint=Fingerprint
+DownloadLogCSV=Export archived logs (CSV)
+logDOC_PREVIEW=Preview of a validated document in order to print or download
+logDOC_DOWNLOAD=Download of a validated document in order to print or send
+DataOfArchivedEvent=Full datas of archived event
+ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
+BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
+BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
+OnlyNonValid=Non-valid
+TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
+RestrictYearToExport=Restrict month / year to export
diff --git a/htdocs/langs/uz_UZ/donations.lang b/htdocs/langs/uz_UZ/donations.lang
index 5edc8d62033..de4bdf68f03 100644
--- a/htdocs/langs/uz_UZ/donations.lang
+++ b/htdocs/langs/uz_UZ/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Create a donation
 NewDonation=New donation
 DeleteADonation=Delete a donation
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Show donation
 PublicDonation=Public donation
 DonationsArea=Donations area
 DonationStatusPromiseNotValidated=Draft promise
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
 DonationTitle=Donation receipt
+DonationDate=Donation date
 DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
diff --git a/htdocs/langs/uz_UZ/hrm.lang b/htdocs/langs/uz_UZ/hrm.lang
new file mode 100644
index 00000000000..3697c47e30d
--- /dev/null
+++ b/htdocs/langs/uz_UZ/hrm.lang
@@ -0,0 +1,18 @@
+# Dolibarr language file - en_US - hrm
+# Admin
+HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
+Establishments=Establishments
+Establishment=Establishment
+NewEstablishment=New establishment
+DeleteEstablishment=Delete establishment
+ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
+OpenEtablishment=Open establishment
+CloseEtablishment=Close establishment
+# Dictionary
+DictionaryPublicHolidays=HRM - Public holidays
+DictionaryDepartment=HRM - Department list
+DictionaryFunction=HRM - Function list
+# Module
+Employees=Employees
+Employee=Employee
+NewEmployee=New employee
diff --git a/htdocs/langs/uz_UZ/interventions.lang b/htdocs/langs/uz_UZ/interventions.lang
index e7667ef6946..e5936f8246e 100644
--- a/htdocs/langs/uz_UZ/interventions.lang
+++ b/htdocs/langs/uz_UZ/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,14 +51,16 @@ InterventionStatistics=Statistics of interventions
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=Intervention id
 InterRef=Intervention ref.
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/uz_UZ/modulebuilder.lang b/htdocs/langs/uz_UZ/modulebuilder.lang
new file mode 100644
index 00000000000..135ac1ae9ec
--- /dev/null
+++ b/htdocs/langs/uz_UZ/modulebuilder.lang
@@ -0,0 +1,141 @@
+# Dolibarr language file - Source file is en_US - loan
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
+ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
+ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
+ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
+NewModule=New module
+NewObjectInModulebuilder=New object
+ModuleKey=Module key
+ObjectKey=Object key
+ModuleInitialized=Module initialized
+FilesForObjectInitialized=Files for new object '%s' initialized
+FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
+ModuleBuilderDescdescription=Enter here all general information that describe your module.
+ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
+ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
+ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
+ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
+ModuleBuilderDeschooks=This tab is dedicated to hooks.
+ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
+ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
+DangerZone=Danger zone
+BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
+BuildDocumentation=Build documentation
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
+DescriptionLong=Long description
+EditorName=Name of editor
+EditorUrl=URL of editor
+DescriptorFile=Descriptor file of module
+ClassFile=File for PHP DAO CRUD class
+ApiClassFile=File for PHP API class
+PageForList=PHP page for list of record
+PageForCreateEditView=PHP page to create/edit/view a record
+PageForAgendaTab=PHP page for event tab
+PageForDocumentTab=PHP page for document tab
+PageForNoteTab=PHP page for note tab
+PathToModulePackage=Path to zip of module/application package
+PathToModuleDocumentation=Path to file of module/application documentation (%s)
+SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
+FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Force update of .class and .sql files
+RegenerateMissingFiles=Generate missing files
+SpecificationFile=File of documentation
+LanguageFile=File for language
+ObjectProperties=Object Properties
+ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
+NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
+SearchAll=Used for 'search all'
+DatabaseIndex=Database index
+FileAlreadyExists=File %s already exists
+TriggersFile=File for triggers code
+HooksFile=File for hooks code
+ArrayOfKeyValues=Array of key-val
+ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
+WidgetFile=Widget file
+CSSFile=CSS file
+JSFile=Javascript file
+ReadmeFile=Readme file
+ChangeLog=ChangeLog file
+TestClassFile=File for PHP Unit Test class
+SqlFile=Sql file
+PageForLib=File for the common PHP library
+PageForObjLib=File for the PHP library dedicated to object
+SqlFileExtraFields=Sql file for complementary attributes
+SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
+AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
+UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Is a measure
+DirScanned=Directory scanned
+NoTrigger=No trigger
+NoWidget=No widget
+GoToApiExplorer=Go to API explorer
+ListOfMenusEntries=List of menu entries
+ListOfDictionariesEntries=List of dictionaries entries
+ListOfPermissionsDefined=List of defined permissions
+SeeExamples=See examples here
+EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdf=Display on PDF
+IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
+SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
+SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
+LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
+MenusDefDesc=Define here the menus provided by your module
+DictionariesDefDesc=Define here the dictionaries provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
+HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
+TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
+SeeIDsInUse=See IDs in use in your installation
+SeeReservedIDsRangeHere=See range of reserved IDs
+ToolkitForDevelopers=Toolkit for Dolibarr developers
+TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
+SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
+AddLanguageFile=Add language file
+YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
+DropTableIfEmpty=(Delete table if empty)
+TableDoesNotExists=The table %s does not exists
+TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
+UseAboutPage=Disable the about page
+UseDocFolder=Disable the documentation folder
+UseSpecificReadme=Use a specific ReadMe
+ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
+RealPathOfModule=Real path of module
+ContentCantBeEmpty=Content of file can't be empty
+WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
+CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
+JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
+CLIDesc=You can generate here some command line scripts you want to provide with your module.
+CLIFile=CLI File
+NoCLIFile=No CLI files
+UseSpecificEditorName = Use a specific editor name
+UseSpecificEditorURL = Use a specific editor URL
+UseSpecificFamily = Use a specific family
+UseSpecificAuthor = Use a specific author
+UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
+IncludeRefGeneration=The reference of object must be generated automatically
+IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
+IncludeDocGeneration=I want to generate some documents from the object
+IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
+ShowOnCombobox=Show value into combobox
+KeyForTooltip=Key for tooltip
+CSSClass=CSS Class
+NotEditable=Not editable
+ForeignKey=Foreign key
+TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/uz_UZ/mrp.lang b/htdocs/langs/uz_UZ/mrp.lang
new file mode 100644
index 00000000000..d3c4d3253c6
--- /dev/null
+++ b/htdocs/langs/uz_UZ/mrp.lang
@@ -0,0 +1,76 @@
+Mrp=Manufacturing Orders
+MO=Manufacturing Order
+MRPDescription=Module to manage production and Manufacturing Orders (MO).
+MRPArea=MRP Area
+MrpSetupPage=Setup of module MRP
+MenuBOM=Bills of material
+LatestBOMModified=Latest %s Bills of materials modified
+LatestMOModified=Latest %s Manufacturing Orders modified
+Bom=Bills of Material
+BillOfMaterials=Bill of Material
+BOMsSetup=Setup of module BOM
+ListOfBOMs=List of bills of material - BOM
+ListOfManufacturingOrders=List of Manufacturing Orders
+NewBOM=New bill of material
+ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+BOMsNumberingModules=BOM numbering templates
+BOMsModelModule=BOM document templates
+MOsNumberingModules=MO numbering templates
+MOsModelModule=MO document templates
+FreeLegalTextOnBOMs=Free text on document of BOM
+WatermarkOnDraftBOMs=Watermark on draft BOM
+FreeLegalTextOnMOs=Free text on document of MO
+WatermarkOnDraftMOs=Watermark on draft MO
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
+ManufacturingEfficiency=Manufacturing efficiency
+ConsumptionEfficiency=Consumption efficiency
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
+DeleteBillOfMaterials=Delete Bill Of Materials
+DeleteMo=Delete Manufacturing Order
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+MenuMRP=Manufacturing Orders
+NewMO=New Manufacturing Order
+QtyToProduce=Qty to produce
+DateStartPlannedMo=Date start planned
+DateEndPlannedMo=Date end planned
+KeepEmptyForAsap=Empty means 'As Soon As Possible'
+EstimatedDuration=Estimated duration
+EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
+ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
+ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
+StatusMOProduced=Produced
+QtyFrozen=Frozen Qty
+QuantityFrozen=Frozen Quantity
+QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
+DisableStockChange=Stock change disabled
+DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
+BomAndBomLines=Bills Of Material and lines
+BOMLine=Line of BOM
+WarehouseForProduction=Warehouse for production
+CreateMO=Create MO
+ToConsume=To consume
+ToProduce=To produce
+QtyAlreadyConsumed=Qty already consumed
+QtyAlreadyProduced=Qty already produced
+QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
+ConsumeOrProduce=Consume or Produce
+ConsumeAndProduceAll=Consume and Produce All
+Manufactured=Manufactured
+TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
+ForAQuantityOf=For a quantity to produce of %s
+ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
+ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
+ProductionForRef=Production of %s
+AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
+NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
+AddNewConsumeLines=Add new line to consume
+ProductsToConsume=Products to consume
+ProductsToProduce=Products to produce
+UnitCost=Unit cost
+TotalCost=Total cost
diff --git a/htdocs/langs/uz_UZ/multicurrency.lang b/htdocs/langs/uz_UZ/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/uz_UZ/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/uz_UZ/oauth.lang b/htdocs/langs/uz_UZ/oauth.lang
new file mode 100644
index 00000000000..075ff49a895
--- /dev/null
+++ b/htdocs/langs/uz_UZ/oauth.lang
@@ -0,0 +1,32 @@
+# Dolibarr language file - Source file is en_US - oauth
+ConfigOAuth=OAuth Configuration
+OAuthServices=OAuth Services
+ManualTokenGeneration=Manual token generation
+TokenManager=Token Manager
+IsTokenGenerated=Is token generated ?
+NoAccessToken=No access token saved into local database
+HasAccessToken=A token was generated and saved into local database
+NewTokenStored=Token received and saved
+ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
+TokenDeleted=Token deleted
+RequestAccess=Click here to request/renew access and receive a new token to save
+DeleteAccess=Click here to delete token
+UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
+ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
+OAuthSetupForLogin=Page to generate an OAuth token
+SeePreviousTab=See previous tab
+OAuthIDSecret=OAuth ID and Secret
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=OAuth Google service
+OAUTH_GOOGLE_ID=OAuth Google Id
+OAUTH_GOOGLE_SECRET=OAuth Google Secret
+OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create OAuth credentials
+OAUTH_GITHUB_NAME=OAuth GitHub service
+OAUTH_GITHUB_ID=OAuth GitHub Id
+OAUTH_GITHUB_SECRET=OAuth GitHub Secret
+OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create OAuth credentials
+OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
+OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index cdc0e6b3c95..bb42bff3c87 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/uz_UZ/receiptprinter.lang b/htdocs/langs/uz_UZ/receiptprinter.lang
new file mode 100644
index 00000000000..896eaa313dd
--- /dev/null
+++ b/htdocs/langs/uz_UZ/receiptprinter.lang
@@ -0,0 +1,95 @@
+# Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
+PrinterAdded=Printer %s added
+PrinterUpdated=Printer %s updated
+PrinterDeleted=Printer %s deleted
+TestSentToPrinter=Test Sent To Printer %s
+ReceiptPrinter=Receipt printers
+ReceiptPrinterDesc=Setup of receipt printers
+ReceiptPrinterTemplateDesc=Setup of Templates
+ReceiptPrinterTypeDesc=Description of Receipt Printer's type
+ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
+ListPrinters=List of Printers
+SetupReceiptTemplate=Template Setup
+CONNECTOR_DUMMY=Dummy Printer
+CONNECTOR_NETWORK_PRINT=Network Printer
+CONNECTOR_FILE_PRINT=Local Printer
+CONNECTOR_WINDOWS_PRINT=Local Windows Printer
+CONNECTOR_CUPS_PRINT=Cups Printer
+CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
+CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
+CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
+CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
+PROFILE_DEFAULT=Default Profile
+PROFILE_SIMPLE=Simple Profile
+PROFILE_EPOSTEP=Epos Tep Profile
+PROFILE_P822D=P822D Profile
+PROFILE_STAR=Star Profile
+PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
+PROFILE_SIMPLE_HELP=Simple Profile No Graphics
+PROFILE_EPOSTEP_HELP=Epos Tep Profile
+PROFILE_P822D_HELP=P822D Profile No Graphics
+PROFILE_STAR_HELP=Star Profile
+DOL_LINE_FEED=Skip line
+DOL_ALIGN_LEFT=Left align text
+DOL_ALIGN_CENTER=Center text
+DOL_ALIGN_RIGHT=Right align text
+DOL_USE_FONT_A=Use font A of printer
+DOL_USE_FONT_B=Use font B of printer
+DOL_USE_FONT_C=Use font C of printer
+DOL_PRINT_BARCODE=Print barcode
+DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
+DOL_CUT_PAPER_FULL=Cut ticket completely
+DOL_CUT_PAPER_PARTIAL=Cut ticket partially
+DOL_OPEN_DRAWER=Open cash drawer
+DOL_ACTIVATE_BUZZER=Activate buzzer
+DOL_PRINT_QRCODE=Print QR Code
+DOL_PRINT_LOGO=Print logo of my company
+DOL_PRINT_LOGO_OLD=Print logo of my company (old printers)
+DOL_BOLD=Bold
+DOL_BOLD_DISABLED=Disable bold
+DOL_DOUBLE_HEIGHT=Double height size
+DOL_DOUBLE_WIDTH=Double width size
+DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
+DOL_UNDERLINE=Enable underline
+DOL_UNDERLINE_DISABLED=Disable underline
+DOL_BEEP=Beed sound
+DOL_PRINT_TEXT=Print text
+DOL_VALUE_DATE=Invoice date
+DOL_VALUE_DATE_TIME=Invoice date and time
+DOL_VALUE_YEAR=Invoice year
+DOL_VALUE_MONTH_LETTERS=Invoice month in letters
+DOL_VALUE_MONTH=Invoice month
+DOL_VALUE_DAY=Invoice day
+DOL_VALUE_DAY_LETTERS=Inovice day in letters
+DOL_LINE_FEED_REVERSE=Line feed reverse
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Invoice ref
+DOL_PRINT_OBJECT_LINES=Invoice lines
+DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
+DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
+DOL_VALUE_CUSTOMER_MAIL=Customer mail
+DOL_VALUE_CUSTOMER_PHONE=Customer phone
+DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
+DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
+DOL_VALUE_MYSOC_NAME=Your company name
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/uz_UZ/receptions.lang b/htdocs/langs/uz_UZ/receptions.lang
new file mode 100644
index 00000000000..010a7521846
--- /dev/null
+++ b/htdocs/langs/uz_UZ/receptions.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - receptions
+ReceptionsSetup=Product Reception setup
+RefReception=Ref. reception
+Reception=Reception
+Receptions=Receptions
+AllReceptions=All Receptions
+Reception=Reception
+Receptions=Receptions
+ShowReception=Show Receptions
+ReceptionsArea=Receptions area
+ListOfReceptions=List of receptions
+ReceptionMethod=Reception method
+LastReceptions=Latest %s receptions
+StatisticsOfReceptions=Statistics for receptions
+NbOfReceptions=Number of receptions
+NumberOfReceptionsByMonth=Number of receptions by month
+ReceptionCard=Reception card
+NewReception=New reception
+CreateReception=Create reception
+QtyInOtherReceptions=Qty in other receptions
+OtherReceptionsForSameOrder=Other receptions for this order
+ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
+ReceptionsToValidate=Receptions to validate
+StatusReceptionCanceled=Canceled
+StatusReceptionDraft=Draft
+StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionProcessed=Processed
+StatusReceptionDraftShort=Draft
+StatusReceptionValidatedShort=Validated
+StatusReceptionProcessedShort=Processed
+ReceptionSheet=Reception sheet
+ConfirmDeleteReception=Are you sure you want to delete this reception?
+ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
+ConfirmCancelReception=Are you sure you want to cancel this reception?
+StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
+SendReceptionByEMail=Send reception by email
+SendReceptionRef=Submission of reception %s
+ActionsOnReception=Events on reception
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the order card.
+ReceptionLine=Reception line
+ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
+ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
+ReceptionsNumberingModules=Numbering module for receptions
+ReceptionsReceiptModel=Document templates for receptions
diff --git a/htdocs/langs/uz_UZ/stripe.lang b/htdocs/langs/uz_UZ/stripe.lang
new file mode 100644
index 00000000000..844762040af
--- /dev/null
+++ b/htdocs/langs/uz_UZ/stripe.lang
@@ -0,0 +1,72 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Stripe module setup
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
+StripeOrCBDoPayment=Pay with credit card or Stripe
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+Creditor=Creditor
+PaymentCode=Payment code
+StripeDoPayment=Pay with Stripe
+YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+Continue=Next
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment page for a sales order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment page for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.<br>For the URL of payments with no existing object, you may also add the parameter <strong>&noidempotency=1</strong> so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter)
+SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+NewStripePaymentReceived=New Stripe payment received
+NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
+STRIPE_TEST_SECRET_KEY=Secret test key
+STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
+STRIPE_LIVE_SECRET_KEY=Secret live key
+STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
+StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
+StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
+StripePayoutList=List of Stripe payouts
+ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
+ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
+PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
+ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
diff --git a/htdocs/langs/uz_UZ/supplier_proposal.lang b/htdocs/langs/uz_UZ/supplier_proposal.lang
new file mode 100644
index 00000000000..ce5bdf0425a
--- /dev/null
+++ b/htdocs/langs/uz_UZ/supplier_proposal.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposalNew=New price request
+CommRequest=Price request
+CommRequests=Price requests
+SearchRequest=Find a request
+DraftRequests=Draft requests
+SupplierProposalsDraft=Draft vendor proposals
+LastModifiedRequests=Latest %s modified price requests
+RequestsOpened=Open price requests
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
+NewAskPrice=New price request
+ShowSupplierProposal=Show price request
+AddSupplierProposal=Create a price request
+SupplierProposalRefFourn=Vendor ref
+SupplierProposalDate=Delivery date
+SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
+ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
+DeleteAsk=Delete request
+ValidateAsk=Validate request
+SupplierProposalStatusDraft=Draft (needs to be validated)
+SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusClosed=Closed
+SupplierProposalStatusSigned=Accepted
+SupplierProposalStatusNotSigned=Refused
+SupplierProposalStatusDraftShort=Draft
+SupplierProposalStatusValidatedShort=Validated
+SupplierProposalStatusClosedShort=Closed
+SupplierProposalStatusSignedShort=Accepted
+SupplierProposalStatusNotSignedShort=Refused
+CopyAskFrom=Create a price request by copying an existing request
+CreateEmptyAsk=Create blank request
+ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
+ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
+SendAskByMail=Send price request by mail
+SendAskRef=Sending the price request %s
+SupplierProposalCard=Request card
+ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
+ActionsOnSupplierProposal=Events on price request
+DocModelAuroreDescription=A complete request model (logo...)
+CommercialAsk=Price request
+DefaultModelSupplierProposalCreate=Default model creation
+DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
+DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
+ListOfSupplierProposals=List of vendor proposal requests
+ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
+SupplierProposalsToClose=Vendor proposals to close
+SupplierProposalsToProcess=Vendor proposals to process
+LastSupplierProposals=Latest %s price requests
+AllPriceRequests=All requests
diff --git a/htdocs/langs/uz_UZ/ticket.lang b/htdocs/langs/uz_UZ/ticket.lang
new file mode 100644
index 00000000000..80518c3401a
--- /dev/null
+++ b/htdocs/langs/uz_UZ/ticket.lang
@@ -0,0 +1,305 @@
+# en_US lang file for module ticket
+# Copyright (C) 2013  Jean-François FERRY <hello@librethic.io>
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+Module56000Name=Tickets
+Module56000Desc=Ticket system for issue or request management
+
+Permission56001=See tickets
+Permission56002=Modify tickets
+Permission56003=Delete tickets
+Permission56004=Manage tickets
+Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+
+TicketDictType=Ticket - Types
+TicketDictCategory=Ticket - Groupes
+TicketDictSeverity=Ticket - Severities
+TicketDictResolution=Ticket - Resolution
+TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
+TicketTypeShortBUGHARD=Dysfonctionnement matériel
+TicketTypeShortCOM=Commercial question
+
+TicketTypeShortHELP=Request for functionnal help
+TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortPROJET=Project
+TicketTypeShortOTHER=Other
+
+TicketSeverityShortLOW=Low
+TicketSeverityShortNORMAL=Normal
+TicketSeverityShortHIGH=High
+TicketSeverityShortBLOCKING=Critical/Blocking
+
+ErrorBadEmailAddress=Field '%s' incorrect
+MenuTicketMyAssign=My tickets
+MenuTicketMyAssignNonClosed=My open tickets
+MenuListNonClosed=Open tickets
+
+TypeContact_ticket_internal_CONTRIBUTOR=Contributor
+TypeContact_ticket_internal_SUPPORTTEC=Assigned user
+TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
+TypeContact_ticket_external_CONTRIBUTOR=External contributor
+
+OriginEmail=Email source
+Notify_TICKET_SENTBYMAIL=Send ticket message by email
+
+# Status
+NotRead=Not read
+Read=Read
+Assigned=Assigned
+InProgress=In progress
+NeedMoreInformation=Waiting for information
+Answered=Answered
+Waiting=Waiting
+Closed=Closed
+Deleted=Deleted
+
+# Dict
+Type=Type
+Category=Analytic code
+Severity=Severity
+
+# Email templates
+MailToSendTicketMessage=To send email from ticket message
+
+#
+# Admin page
+#
+TicketSetup=Ticket module setup
+TicketSettings=Settings
+TicketSetupPage=
+TicketPublicAccess=A public interface requiring no identification is available at the following url
+TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
+TicketParamModule=Module variable setup
+TicketParamMail=Email setup
+TicketEmailNotificationFrom=Notification email from
+TicketEmailNotificationFromHelp=Used into ticket message answer by example
+TicketEmailNotificationTo=Notifications email to
+TicketEmailNotificationToHelp=Send email notifications to this address.
+TicketNewEmailBodyLabel=Text message sent after creating a ticket
+TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
+TicketParamPublicInterface=Public interface setup
+TicketsEmailMustExist=Require an existing email address to create a ticket
+TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket.
+PublicInterface=Public interface
+TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
+TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
+TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
+TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
+TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
+TicketPublicInterfaceTopicLabelAdmin=Interface title
+TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
+TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
+ExtraFieldsTicket=Extra attributes
+TicketCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
+TicketsDisableEmail=Do not send emails for ticket creation or message recording
+TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
+TicketsLogEnableEmail=Enable log by email
+TicketsLogEnableEmailHelp=At each change, an email will be sent **to each contact** associated with the ticket.
+TicketParams=Params
+TicketsShowModuleLogo=Display the logo of the module in the public interface
+TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
+TicketsShowCompanyLogo=Display the logo of the company in the public interface
+TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
+TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
+TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
+TicketsActivatePublicInterface=Activate public interface
+TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create tickets.
+TicketsAutoAssignTicket=Automatically assign the user who created the ticket
+TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
+TicketNumberingModules=Tickets numbering module
+TicketNotifyTiersAtCreation=Notify third party at creation
+TicketGroup=Group
+TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
+#
+# Index & list page
+#
+TicketsIndex=Tickets area
+TicketList=List of tickets
+TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
+NoTicketsFound=No ticket found
+NoUnreadTicketsFound=No unread ticket found
+TicketViewAllTickets=View all tickets
+TicketViewNonClosedOnly=View only open tickets
+TicketStatByStatus=Tickets by status
+OrderByDateAsc=Sort by ascending date
+OrderByDateDesc=Sort by descending date
+ShowAsConversation=Show as conversation list
+MessageListViewType=Show as table list
+
+#
+# Ticket card
+#
+Ticket=Ticket
+TicketCard=Ticket card
+CreateTicket=Create ticket
+EditTicket=Edit ticket
+TicketsManagement=Tickets Management
+CreatedBy=Created by
+NewTicket=New Ticket
+SubjectAnswerToTicket=Ticket answer
+TicketTypeRequest=Request type
+TicketCategory=Analytic code
+SeeTicket=See ticket
+TicketMarkedAsRead=Ticket has been marked as read
+TicketReadOn=Read on
+TicketCloseOn=Closing date
+MarkAsRead=Mark ticket as read
+TicketHistory=Ticket history
+AssignUser=Assign to user
+TicketAssigned=Ticket is now assigned
+TicketChangeType=Change type
+TicketChangeCategory=Change analytic code
+TicketChangeSeverity=Change severity
+TicketAddMessage=Add a message
+AddMessage=Add a message
+MessageSuccessfullyAdded=Ticket added
+TicketMessageSuccessfullyAdded=Message successfully added
+TicketMessagesList=Message list
+NoMsgForThisTicket=No message for this ticket
+Properties=Classification
+LatestNewTickets=Latest %s newest tickets (not read)
+TicketSeverity=Severity
+ShowTicket=See ticket
+RelatedTickets=Related tickets
+TicketAddIntervention=Create intervention
+CloseTicket=Close ticket
+CloseATicket=Close a ticket
+ConfirmCloseAticket=Confirm ticket closing
+ConfirmDeleteTicket=Please confirm ticket deleting
+TicketDeletedSuccess=Ticket deleted with success
+TicketMarkedAsClosed=Ticket marked as closed
+TicketDurationAuto=Calculated duration
+TicketDurationAutoInfos=Duration calculated automatically from intervention related
+TicketUpdated=Ticket updated
+SendMessageByEmail=Send message by email
+TicketNewMessage=New message
+ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
+TicketGoIntoContactTab=Please go into "Contacts" tab to select them
+TicketMessageMailIntro=Introduction
+TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
+TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
+TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
+TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
+TicketMessageMailSignature=Signature
+TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
+TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
+TicketMessageMailSignatureLabelAdmin=Signature of response email
+TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
+TicketMessageHelp=Only this text will be saved in the message list on ticket card.
+TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
+TimeElapsedSince=Time elapsed since
+TicketTimeToRead=Time elapsed before read
+TicketContacts=Contacts ticket
+TicketDocumentsLinked=Documents linked to ticket
+ConfirmReOpenTicket=Confirm reopen this ticket ?
+TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
+TicketAssignedToYou=Ticket assigned
+TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
+MarkMessageAsPrivate=Mark message as private
+TicketMessagePrivateHelp=This message will not display to external users
+TicketEmailOriginIssuer=Issuer at origin of the tickets
+InitialMessage=Initial Message
+LinkToAContract=Link to a contract
+TicketPleaseSelectAContract=Select a contract
+UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
+TicketMailExchanges=Mail exchanges
+TicketInitialMessageModified=Initial message modified
+TicketMessageSuccesfullyUpdated=Message successfully updated
+TicketChangeStatus=Change status
+TicketConfirmChangeStatus=Confirm the status change: %s ?
+TicketLogStatusChanged=Status changed: %s to %s
+TicketNotNotifyTiersAtCreate=Not notify company at create
+Unread=Unread
+TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
+PublicInterfaceNotEnabled=Public interface was not enabled
+ErrorTicketRefRequired=Ticket reference name is required
+
+#
+# Logs
+#
+TicketLogMesgReadBy=Ticket %s read by %s
+NoLogForThisTicket=No log for this ticket yet
+TicketLogAssignedTo=Ticket %s assigned to %s
+TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
+TicketLogClosedBy=Ticket %s closed by %s
+TicketLogReopen=Ticket %s re-open
+
+#
+# Public pages
+#
+TicketSystem=Ticket system
+ShowListTicketWithTrackId=Display ticket list from track ID
+ShowTicketWithTrackId=Display ticket from track ID
+TicketPublicDesc=You can create a support ticket or check from an existing ID.
+YourTicketSuccessfullySaved=Ticket has been successfully saved!
+MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
+PleaseRememberThisId=Please keep the tracking number that we might ask you later.
+TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
+TicketNewEmailSubjectCustomer=New support ticket
+TicketNewEmailBody=This is an automatic email to confirm you have registered a new ticket.
+TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
+TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
+TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
+TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
+TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
+TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
+TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
+TicketPublicMsgViewLogIn=Please enter ticket tracking ID
+TicketTrackId=Public Tracking ID
+OneOfTicketTrackId=One of your tracking ID
+ErrorTicketNotFound=Ticket with tracking ID %s not found!
+Subject=Subject
+ViewTicket=View ticket
+ViewMyTicketList=View my ticket list
+ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
+TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
+TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
+SeeThisTicketIntomanagementInterface=See ticket in management interface
+TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
+ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
+OldUser=Old user
+NewUser=New user
+NumberOfTicketsByMonth=Number of tickets per month
+NbOfTickets=Number of tickets
+# notifications
+TicketNotificationEmailSubject=Ticket %s updated
+TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
+TicketNotificationRecipient=Notification recipient
+TicketNotificationLogMessage=Log message
+TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
+TicketNotificationNumberEmailSent=Notification email sent: %s
+
+ActionsOnTicket=Events on ticket
+
+#
+# Boxes
+#
+BoxLastTicket=Latest created tickets
+BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicketContent=
+BoxLastTicketNoRecordedTickets=No recent unread tickets
+BoxLastModifiedTicket=Latest modified tickets
+BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastModifiedTicketContent=
+BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
diff --git a/htdocs/langs/uz_UZ/website.lang b/htdocs/langs/uz_UZ/website.lang
new file mode 100644
index 00000000000..bce2a09fb03
--- /dev/null
+++ b/htdocs/langs/uz_UZ/website.lang
@@ -0,0 +1,130 @@
+# Dolibarr language file - Source file is en_US - website
+Shortname=Code
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
+DeleteWebsite=Delete website
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
+WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
+WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
+WEBSITE_CSS_URL=URL of external CSS file
+WEBSITE_CSS_INLINE=CSS file content (common to all pages)
+WEBSITE_JS_INLINE=Javascript file content (common to all pages)
+WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
+WEBSITE_ROBOT=Robot file (robots.txt)
+WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
+HtmlHeaderPage=HTML header (specific to this page only)
+PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
+EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
+MediaFiles=Media library
+EditCss=Edit website properties
+EditMenu=Edit menu
+EditMedias=Edit medias
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
+AddWebsite=Add website
+Webpage=Web page/container
+AddPage=Add page/container
+HomePage=Home Page
+PageContainer=Page/container
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
+PageContent=Page/Contenair
+PageDeleted=Page/Contenair '%s' of website %s deleted
+PageAdded=Page/Contenair '%s' added
+ViewSiteInNewTab=View site in new tab
+ViewPageInNewTab=View page in new tab
+SetAsHomePage=Set as Home page
+RealURL=Real URL
+ViewWebsiteInProduction=View web site using home URLs
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+TestDeployOnWeb=Test/deploy on web
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
+NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
+SyntaxHelp=Help on specific syntax tips
+YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+ClonePage=Clone page/container
+CloneSite=Clone site
+SiteAdded=Website added
+ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
+PageIsANewTranslation=The new page is a translation of the current page ?
+LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
+ParentPageId=Parent page ID
+WebsiteId=Website ID
+CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
+FetchAndCreate=Fetch and Create
+ExportSite=Export website
+ImportSite=Import website template
+IDOfPage=Id of page
+Banner=Banner
+BlogPost=Blog post
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
+AddWebsiteAccount=Create web site account
+BackToListForThirdParty=Back to list for the third-party
+DisableSiteFirst=Disable website first
+MyContainerTitle=My web site title
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is a translation of
+ThisPageHasTranslationPages=This page/container has translation
+NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
+GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Search or Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
+MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
+EditInLineOnOff=Mode 'Edit inline' is %s
+ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
+GlobalCSSorJS=Global CSS/JS/Header file of web site
+BackToHomePage=Back to home page...
+TranslationLinks=Translation links
+YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not a website page
+UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
+MainLanguage=Main language
+OtherLanguages=Other languages
+UseManifest=Provide a manifest.json file
+PublicAuthorAlias=Public author alias
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
+ReplacementDoneInXPages=Replacement done in %s pages or containers
diff --git a/htdocs/langs/uz_UZ/zapier.lang b/htdocs/langs/uz_UZ/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/uz_UZ/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index a043f3b64ca..f979bc9b1a3 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=Giới hạn dòng hóa đơn
 ExpenseReportLines=Dòng báo cáo chi phí để ràng buộc
 ExpenseReportLinesDone=Giới hạn dòng của báo cáo chi phí
 IntoAccount=Ràng buộc dòng với tài khoản kế toán
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Ràng buộc
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=Tài khoản kế toán cho đăng ký quyên góp.
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Tài khoản kế toán để đăng ký tham gia
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Tài khoản kế toán theo mặc định cho các sản phẩm đã mua (được sử dụng nếu không được xác định trong bảng sản phẩm)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Tài khoản kế toán theo mặc định cho các sản phẩm đã mua trong EEC (được sử dụng nếu không được xác định trong bảng sản phẩm)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Tài khoản kế toán theo mặc định cho các sản phẩm đã mua và được nhập ra khỏi EEC (được sử dụng nếu không được xác định trong bảng sản phẩm)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Tài khoản kế toán theo mặc định cho các sản phẩm đã bán (được sử dụng nếu không được xác định trong bảng sản phẩm)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Tài khoản kế toán theo mặc định cho các sản phẩm được bán trong EEC (được sử dụng nếu không được xác định trong bảng sản phẩm)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Tài khoản kế toán theo mặc định cho các sản phẩm được bán và xuất ra khỏi EEC (được sử dụng nếu không được xác định trong bảng sản phẩm)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Tài khoản kế toán theo mặc định cho các dịch vụ đã mua (được sử dụng nếu không được xác định trong bảng dịch vụ)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Tài khoản kế toán theo mặc định cho các dịch vụ đã mua trong EEC (được sử dụng nếu không được xác định trong bảng dịch vụ)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Tài khoản kế toán theo mặc định cho các dịch vụ đã mua và được nhập ra khỏi EEC (được sử dụng nếu không được xác định trong bảng dịch vụ)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Tài khoản kế toán theo mặc định cho các dịch vụ đã bán (được sử dụng nếu không được xác định trong bảng dịch vụ)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Tài khoản kế toán theo mặc định cho các dịch vụ được bán trong EEC (được sử dụng nếu không được xác định trong bảng dịch vụ)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Tài khoản kế toán theo mặc định cho các dịch vụ được bán và xuất ra khỏi EEC (được sử dụng nếu không được xác định trong bảng dịch vụ)
@@ -224,15 +230,19 @@ ListAccounts=Danh sách các tài khoản kế toán
 UnknownAccountForThirdparty=Không biết tài khoản bên thứ ba. Chúng ta sẽ sử dụng %s
 UnknownAccountForThirdpartyBlocking=Không biết tài khoản bên thứ ba. Lỗi chặn
 ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Tài khoản bên thứ ba không được xác định hoặc không biết bên thứ ba. Chúng ta sẽ sử dụng %s
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Bên thứ ba không xác định và người đăng ký không được xác định trên thanh toán. Chúng tôi sẽ giữ giá trị tài khoản subledger trống.
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Tài khoản bên thứ ba không được xác định hoặc không biết bên thứ ba. Lỗi chặn.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Không biết tài khoản bên thứ ba và tài khoản đang chờ không xác định. Lỗi chặn
 PaymentsNotLinkedToProduct=Thanh toán không được liên kết với bất kỳ sản phẩm/ dịch vụ nào
-ShowOpeningBalance=Show opening balance
-HideOpeningBalance=Hide opening balance
+OpeningBalance=Opening balance
+ShowOpeningBalance=Xem số dư 
+HideOpeningBalance=Ẩn số dư
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Nhóm tài khoản
-PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+PcgtypeDesc=Nhóm tài khoản được sử dụng làm tiêu chí 'bộ lọc' và 'nhóm' được xác định trước cho một số báo cáo kế toán. Ví dụ: 'THU NHẬP' hoặc 'CHI PHÍ' được sử dụng làm nhóm cho tài khoản kế toán của các sản phẩm để xây dựng báo cáo chi phí / thu nhập.
+
+Reconcilable=Đối soát lại
 
 TotalVente=Tổng doanh thu trước thuế
 TotalMarge=Tổng  lợi nhuận bán hàng
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Xuất dữ liệu cho Quadratus QuadraCompta
 Modelcsv_ebp=Xuất dữ liệu cho EBP
 Modelcsv_cogilog=Xuất dữ liệu Cogilog
 Modelcsv_agiris=Xuất dữ liệu cho Agiris
-Modelcsv_LDCompta=Xuất dữ liệu cho LD Compta (v9 trở lên) (Kiểm tra)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Xuất cho chuẩn LD Compta (v10 hoặc cao hơn)
 Modelcsv_openconcerto=Xuất dữ liệu cho OpenConcerto (Kiểm tra)
 Modelcsv_configurable=Xuất dữ liệu cấu hình CSV
 Modelcsv_FEC=Xuất dữ liệu FEC
 Modelcsv_Sage50_Swiss=Xuất dữ liệu cho Sage 50 Thụy Sĩ
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=ID Hệ thống tài khoản
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=Chế độ bán hàng
 OptionModeProductSellIntra=Chế độ bán hàng xuất khẩu trong EEC
 OptionModeProductSellExport=Chế độ bán hàng xuất khẩu ở các nước khác
 OptionModeProductBuy=Chế độ mua hàng
+OptionModeProductBuyIntra=Mẫu mua hàng được nhập trong EEC
+OptionModeProductBuyExport=Mẫu mua hàng được nhập từ các quốc gia khác
 OptionModeProductSellDesc=Hiển thị tất cả các sản phẩm có tài khoản kế toán để bán hàng.
 OptionModeProductSellIntraDesc=Hiển thị tất cả các sản phẩm có tài khoản kế toán để bán hàng trong EEC.
 OptionModeProductSellExportDesc=Hiển thị tất cả các sản phẩm có tài khoản kế toán để bán hàng nước ngoài khác.
 OptionModeProductBuyDesc=Hiển thị tất cả các sản phẩm có tài khoản kế toán để mua hàng.
+OptionModeProductBuyIntraDesc=Hiển thị tất cả các sản phẩm có tài khoản kế toán để mua hàng trong EEC.
+OptionModeProductBuyExportDesc=Hiển thị tất cả các sản phẩm có tài khoản kế toán cho mua hàng nước ngoài khác.
 CleanFixHistory=Xóa mã kế toán khỏi các dòng không tồn tại trong hệ thống tài khoản
 CleanHistory=Đặt lại tất cả các ràng buộc cho năm đã chọn
 PredefinedGroups=Các nhóm được xác định trước
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Tài khoản bị xóa khỏi nhóm
 SaleLocal=Bán địa phương
 SaleExport=Bán hàng xuất khẩu
 SaleEEC=Bán trong EEC
+SaleEECWithVAT=Bán trong EEC với VAT không phải là null, vì vậy chúng tôi cho rằng đây KHÔNG phải là bán hàng nội bộ và tài khoản được đề xuất là tài khoản sản phẩm tiêu chuẩn.
+SaleEECWithoutVATNumber=Bán trong EEC không có VAT nhưng ID VAT của bên thứ ba không được xác định. Chúng tôi dự phòng tài khoản sản phẩm để bán hàng tiêu chuẩn. Bạn có thể sửa ID VAT của bên thứ ba hoặc tài khoản sản phẩm nếu cần.
 
 ## Dictionary
 Range=Phạm vi tài khoản kế toán
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 5c39e62c272..5a41044e730 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Người dùng/nhóm trên máy chủ
 NoSessionFound=Cấu hình PHP của bạn dường như không cho phép liệt kê các phiên hoạt động. Thư mục được sử dụng để lưu phiên ( <b>%s</b> ) có thể được bảo vệ (ví dụ: bằng quyền của hệ điều hành hoặc bằng lệnh open_basingir của PHP).
 DBStoringCharset=Cơ sở dữ liệu bộ ký tự để lưu trữ dữ liệu
 DBSortingCharset=Cơ sở dữ liệu bộ ký tự để sắp xếp dữ liệu
+HostCharset=Host charset
 ClientCharset=Charset máy khách
 ClientSortingCharset=Đối chiếu máy khách
 WarningModuleNotActive=Module <b>%s</b> phải được mở
@@ -99,9 +100,9 @@ NoMaxSizeByPHPLimit=Ghi chú: Không có giới hạn được chỉnh sửa tro
 MaxSizeForUploadedFiles=Kích thước tối đa của tập tin được tải lên (0 sẽ tắt chế độ tải lên)
 UseCaptchaCode=Sử dụng mã xác nhận (CAPTCHA) ở trang đăng nhập
 AntiVirusCommand=Đường dẫn đầy đủ để thi hành việc quét virus
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusCommandExample=Ví dụ cho ClamAv Daemon (yêu cầu clamav-daemon): / usr / bin / clamdscan<br>Example cho ClamWin (rất rất chậm): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Nhiều thông số trên dòng lệnh
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Ví dụ cho ClamAv Daemon: --fdpass<br> Ví dụ cho ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Cài đặt module kế toán
 UserSetup=Cài đặt quản lý người dùng
 MultiCurrencySetup=Thiết lập đa tiền tệ
@@ -199,7 +200,7 @@ FeatureDisabledInDemo=Tính năng đã vô hiệu hóa trong bản demo
 FeatureAvailableOnlyOnStable=Tính năng chỉ khả dụng trên các phiên bản ổn định chính thức
 BoxesDesc=Widget là các thành phần hiển thị một số thông tin mà bạn có thể thêm để cá nhân hóa một số trang. Bạn có thể chọn giữa hiển thị tiện ích hoặc không bằng cách chọn trang đích và nhấp vào 'Kích hoạt' hoặc bằng cách nhấp vào thùng rác để tắt nó.
 OnlyActiveElementsAreShown=Chỉ có các yếu tố từ <a href="%s">module kích hoạt</a> được hiển thị.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesDesc=Các mô-đun / ứng dụng xác định các tính năng có sẵn trong phần mềm. Một số mô-đun yêu cầu quyền được cấp cho người dùng sau khi kích hoạt mô-đun.. Bấm nút bật/tắt <span class="small valignmiddle">%s</span>của từng module để cho phép hoặc tắt một mô-đun / ứng dụng
 ModulesMarketPlaceDesc=Bạn có thể tìm thấy nhiều mô-đun để tải về ở các websites trên Internet ...
 ModulesDeployDesc=Nếu quyền trên hệ thống tệp của bạn cho phép, bạn có thể sử dụng công cụ này để triển khai mô-đun bên ngoài. Mô-đun sau đó sẽ hiển thị trên tab <strong>%s</strong> .
 ModulesMarketPlaces=Tìm ứng dụng bên ngoài/ mô-đun
@@ -222,7 +223,7 @@ DoliPartnersDesc=Danh sách các công ty cung cấp các mô-đun hoặc tính
 WebSiteDesc=Các trang web bên ngoài để có thêm các mô-đun bổ sung (không lõi) ...
 DevelopYourModuleDesc=Một số giải pháp để phát triển mô-đun của riêng bạn ...
 URL=URL
-RelativeURL=Relative URL
+RelativeURL=URL liên quan
 BoxesAvailable=Widgets có sẵn
 BoxesActivated=Widgets được kích hoạt
 ActivateOn=Kích hoạt trên
@@ -330,7 +331,7 @@ SetupIsReadyForUse=Triển khai mô-đun kết thúc. Tuy nhiên, bạn phải b
 NotExistsDirect=Thư mục gốc thay thế không được xác định cho một thư mục hiện có. <br>
 InfDirAlt=Kể từ phiên bản 3, có thể xác định một thư mục gốc thay thế. Điều này cho phép bạn lưu trữ, vào một thư mục chuyên dụng, các trình cắm và các mẫu tùy chỉnh. <br> Chỉ cần tạo một thư mục ở thư mục gốc của Dolibarr (ví dụ: tùy chỉnh). <br>
 InfDirExample=<br> Sau đó khai báo nó trong tập tin <strong>conf.php</strong> <br> $ dolibarr_main_url_root_alt='/custom' <br> $dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom' <br> Nếu những dòng này được nhận xét bằng '#', để kích hoạt chúng, chỉ cần bỏ ghi chú bằng cách xóa ký tự '#'.
-YouCanSubmitFile=You can upload the .zip file of module package from here:
+YouCanSubmitFile=Bạn có thể upload file .zip của gói module vào đây:
 CurrentVersion=Phiên bản hiện tại Dolibarr
 CallUpdatePage=Duyệt đến trang cập nhật cấu trúc cơ sở dữ liệu và dữ liệu: %s.
 LastStableVersion=Phiên bản ổn định mới nhất
@@ -448,8 +449,8 @@ KeepEmptyToUseDefault=Giữ trống để sử dụng giá trị mặc định
 DefaultLink=Liên kết mặc định
 SetAsDefault=Đặt làm mặc định
 ValueOverwrittenByUserSetup=Cảnh báo, giá trị này có thể được ghi đè bởi các thiết lập cụ thể người sử dụng (mỗi người dùng có thể thiết lập url clicktodial riêng của mình)
-ExternalModule=External module
-InstalledInto=Installed into directory %s
+ExternalModule=Module bên ngoài
+InstalledInto=Đã cài đặt vào thư mục %s
 BarcodeInitForthird-parties=Khởi tạo mã vạch hàng loạt cho bên thứ ba
 BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
 CurrentlyNWithoutBarCode=Hiện tại, bạn có <strong>%s</strong> bản ghi <strong>%s</strong> %s không xác định được mã vạch
@@ -475,7 +476,7 @@ Use3StepsApproval=Theo mặc định, Đơn đặt hàng cần được tạo v
 UseDoubleApproval=Sử dụng phê duyệt 3 bước khi số tiền (chưa có thuế) cao hơn ...
 WarningPHPMail=CẢNH BÁO: Thông thường tốt hơn là thiết lập các email gửi đi để sử dụng máy chủ email của nhà cung cấp của bạn thay vì thiết lập mặc định. Một số nhà cung cấp email (như Yahoo) không cho phép bạn gửi email từ máy chủ khác ngoài máy chủ của họ. Thiết lập hiện tại của bạn sử dụng máy chủ của ứng dụng để gửi email chứ không phải máy chủ của nhà cung cấp email của bạn, vì vậy một số người nhận (tương thích với giao thức DMARC hạn chế), sẽ hỏi nhà cung cấp email của bạn nếu họ có thể chấp nhận email của bạn và một số nhà cung cấp email (như Yahoo) có thể trả lời &quot;không&quot; vì máy chủ không phải là của họ, vì vậy rất ít Email đã gửi của bạn có thể không được chấp nhận (hãy cẩn thận với hạn ngạch gửi của nhà cung cấp email của bạn). <br> Nếu nhà cung cấp Email của bạn (như Yahoo) có hạn chế này, bạn phải thay đổi thiết lập Email để chọn phương thức khác &quot;Máy chủ SMTP&quot; và nhập máy chủ SMTP và thông tin đăng nhập do nhà cung cấp Email của bạn cung cấp.
 WarningPHPMail2=Nếu nhà cung cấp dịch vụ email email của bạn cần hạn chế ứng dụng email khách đến một số địa chỉ IP (rất hiếm), thì đây là địa chỉ IP của tác nhân người dùng thư (MUA) cho ứng dụng ERP CRM của bạn: <strong>%s</strong> .
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=Nếu tên miền trong địa chỉ email người gửi của bạn được bảo vệ bởi SPF (yêu cầu nhà cung cấp email của bạn), bạn phải bao gồm các IP sau trong bản ghi SPF của DNS của tên miền của bạn:<strong>%s</strong>.
 ClickToShowDescription=Nhấn vào đây để hiển thị mô tả
 DependsOn=Mô-đun này cần (các) mô-đun
 RequiredBy=Mô-đun này được yêu cầu bởi (các) mô-đun
@@ -523,7 +524,7 @@ Module25Desc=Quản lý đơn hàng bán
 Module30Name=Hoá đơn
 Module30Desc=Quản lý hóa đơn và ghi chú tín dụng cho khách hàng. Quản lý hóa đơn và ghi chú tín dụng cho nhà cung cấp
 Module40Name=Nhà cung cấp
-Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
+Module40Desc=Quản lý nhà cung cấp và mua hàng (Đơn mua và hóa đơn mua hàng)
 Module42Name=Nhật ký gỡ lỗi
 Module42Desc=Phương tiện ghi nhật ký (tệp, syslog, ...). Nhật ký như vậy là cho mục đích kỹ thuật / gỡ lỗi.
 Module49Name=Biên tập
@@ -548,8 +549,8 @@ Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
 Module59Desc=Thêm chức năng để tạo ra tài khoản Bookmark4u từ một tài khoản Dolibarr
-Module60Name=Stickers
-Module60Desc=Management of stickers
+Module60Name=Hình vui nhộn
+Module60Desc=Quản lý hình vui nhộn
 Module70Name=Interventions
 Module70Desc=Quản lý Intervention
 Module75Name=Phiếu công tác phí
@@ -567,9 +568,9 @@ Module200Desc=Đồng bộ hóa thư mục LDAP
 Module210Name=PostNuke
 Module210Desc=Tích hợp PostNuke
 Module240Name=Xuất dữ liệu
-Module240Desc=Tool to export Dolibarr data (with assistance)
+Module240Desc=Công cụ xuất dữ liệu Dolibarr (có trợ lý)
 Module250Name=Nhập dữ liệu
-Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module250Desc=Công cụ nhập liệu vào Dolibarr (với trợ lý)
 Module310Name=Thành viên
 Module310Desc=Quản lý thành viên của tổ chức
 Module320Name=RSS Feed
@@ -645,7 +646,7 @@ Module50000Desc=Đề nghị cho khách hàng một trang thanh toán trực tuy
 Module50100Name=POS SimplePOS
 Module50100Desc=Mô-đun điểm bán hàng SimplePOS (POS đơn giản).
 Module50150Name=POS TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50150Desc=Mô-đun điểm bán hàng TakePOS (màn hình cảm ứng POS, cho cửa hàng, nhà hàng, bars).
 Module50200Name=Paypal
 Module50200Desc=Đề nghị cho khách hàng một trang thanh toán trực tuyến PayPal (tài khoản PayPal hoặc thẻ tín dụng / thẻ ghi nợ). Điều này có thể được sử dụng để cho phép khách hàng của bạn thực hiện thanh toán đột xuất hoặc thanh toán liên quan đến một đối tượng Dolibarr cụ thể (hóa đơn, đơn đặt hàng, v.v.)
 Module50300Name=Cổng thanh toán Stripe
@@ -884,7 +885,7 @@ Permission1251=Chạy nhập dữ liệu khối cho dữ liệu bên ngoài vào
 Permission1321=Xuất dữ liệu Hóa đơn khách hàng, các thuộc tính và thanh toán
 Permission1322=Mở lại một hóa đơn thanh toán
 Permission1421=Xuất dữ liệu đơn đặt hàng và các thuộc tính
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
+Permission2401=Đọc các hành động (sự kiện hoặc tác vụ) được liên kết với tài khoản người dùng của anh ấy (nếu là chủ sở hữu của sự kiện hoặc chỉ được giao cho)
 Permission2402=Tạo / sửa đổi các hành động (sự kiện hoặc tác vụ) được liên kết với tài khoản người dùng của họ (nếu là chủ sở hữu của sự kiện)
 Permission2403=Xóa các hành động (sự kiện hoặc tác vụ) được liên kết với tài khoản người dùng của họ (nếu là chủ sở hữu của sự kiện)
 Permission2411=Xem hành động (sự kiện hay tác vụ) của người khác
@@ -991,7 +992,7 @@ VATIsNotUsedDesc=Theo mặc định, thuế Bán hàng được đề xuất là
 VATIsUsedExampleFR=Ở Pháp, nó có nghĩa là các công ty hoặc tổ chức có một hệ thống tài chính thực sự (Đơn giản hóa thực tế hoặc thực tế bình thường). Một hệ thống trong đó VAT được khai báo.
 VATIsNotUsedExampleFR=Ở Pháp, điều đó có nghĩa là các hiệp hội không khai thuế bán hàng hoặc các công ty, tổ chức hoặc ngành nghề tự do đã chọn hệ thống tài chính doanh nghiệp siêu nhỏ (Thuế bán hàng trong nhượng quyền thương mại) và nộp thuế nhượng quyền Thuế bán hàng mà không cần khai báo thuế Bán hàng. Lựa chọn này sẽ hiển thị tham chiếu "Thuế bán hàng không áp dụng - art-293B của CGI" trên hóa đơn.
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
+TypeOfSaleTaxes=Loại thuế bán hàng
 LTRate=Tỷ suất
 LocalTax1IsNotUsed=Do not use second tax
 LocalTax1IsUsedDesc=Sử dụng loại thuế thứ hai (không phải loại thứ nhất)
@@ -1015,8 +1016,8 @@ LocalTax2IsUsedDescES=Tỷ lệ IRPF theo mặc định khi tạo khách hàng t
 LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=Ở Tây Ban Nha, họ là các doanh nghiệp không phải chịu hệ thống thuế của các mô-đun.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
-UseRevenueStamp=Use a tax stamp
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
+UseRevenueStamp=Sử dụng một tem thuế
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Báo cáo thuế địa phương
 CalcLocaltax1=Bán - Mua
@@ -1029,7 +1030,7 @@ NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), yo
 LabelUsedByDefault=Nhãn được sử dụng bởi mặc định nếu không có bản dịch có thể được tìm thấy với code đó
 LabelOnDocuments=Nhãn trên các tài liệu
 LabelOrTranslationKey=Nhãn hoặc từ khóa dịch
-ValueOfConstantKey=Value of a configuration constant
+ValueOfConstantKey=Giá trị của hằng số
 NbOfDays=Số ngày
 AtEndOfMonth=Vào cuối tháng
 CurrentNext=Hiện tại / Tiếp theo
@@ -1117,7 +1118,7 @@ Delays_MAIN_DELAY_HOLIDAYS=Yêu cầu nghỉ phép để phê duyệt
 SetupDescription1=Trước khi bắt đầu sử dụng Dolibarr, một số tham số ban đầu phải được xác định và các mô-đun được kích hoạt/ định cấu hình.
 SetupDescription2=Hai phần sau đây là bắt buộc (hai mục đầu tiên trong menu Cài đặt):
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescription4=<a href="%s">%s -> %s</a> <br> Phần mềm này là một bộ gồm nhiều mô-đun/ứng dụng, tất cả đều ít nhiều độc lập nhau. Các mô-đun liên quan đến nhu cầu của bạn phải được kích hoạt và cấu hình. Các mục/tùy chọn sẽ được thêm vào menu với sự kích hoạt của một mô-đun.
 SetupDescription5=Các menu thiết lập khác quản lý các tham số tùy chọn.
 LogEvents=Sự kiện kiểm toán bảo mật
 Audit=Kiểm toán
@@ -1136,7 +1137,7 @@ LogEventDesc=Cho phép đăng nhập cho các sự kiện bảo mật cụ thể
 AreaForAdminOnly=Thông số cài đặt chỉ có thể được đặt bởi <b>người dùng quản trị viên</b> .
 SystemInfoDesc=Hệ thống thông tin là thông tin kỹ thuật linh tinh bạn nhận được trong chế độ chỉ đọc và có thể nhìn thấy chỉ cho quản trị viên.
 SystemAreaForAdminOnly=Khu vực này chỉ dành cho người dùng quản trị viên. Quyền người dùng Dolibarr không thể thay đổi hạn chế này.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+CompanyFundationDesc=Chỉnh sửa thông tin của công ty/tổ chức. Nhấp vào nút "%s" ở cuối trang.
 AccountantDesc=Nếu bạn có một kế toán viên/ kế toán bên ngoài, bạn có thể chỉnh sửa thông tin ở đây.
 AccountantFileNumber=Mã kế toán
 DisplayDesc=Các thông số ảnh hưởng đến giao diện và hành vi của Dolibarr có thể được sửa đổi tại đây.
@@ -1167,7 +1168,7 @@ NoEventOrNoAuditSetup=Không có sự kiện bảo mật đã được ghi vào
 NoEventFoundWithCriteria=Không có sự kiện bảo mật được tìm thấy cho tiêu chí tìm kiếm này.
 SeeLocalSendMailSetup=Xem thiết lập sendmail địa phương của bạn
 BackupDesc=Một bản sao lưu <b>hoàn chỉnh</b> của bản cài đặt Dolibarr yêu cầu hai bước.
-BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
+BackupDesc2=Sao lưu nội dung của thư mục "documents" ( <b>%s</b> ) có chứa tất cả các tệp được tải lên và tạo ra. Điều này cũng sẽ bao gồm tất cả các tệp kết xuất được tạo trong Bước 1. Việc này có thể tốn vài phút
 BackupDesc3=Sao lưu cấu trúc và nội dung của cơ sở dữ liệu của bạn ( <b>%s</b> ) vào một tệp kết xuất. Đối với điều này, bạn có thể sử dụng theo các trợ lý.
 BackupDescX=Thư mục lưu trữ nên được lưu trữ ở một nơi an toàn.
 BackupDescY=Tạo ra các tập tin dump nên được lưu trữ ở một nơi an toàn.
@@ -1178,7 +1179,7 @@ RestoreDesc3=Khôi phục cấu trúc cơ sở dữ liệu và dữ liệu từ
 RestoreMySQL=MySQL nhập dữ liệu
 ForcedToByAModule= Quy luật này buộc <b>%s</b> bởi một mô-đun được kích hoạt
 PreviousDumpFiles=Các tập tin sao lưu hiện có
-PreviousArchiveFiles=Existing archive files
+PreviousArchiveFiles=Các tập tin sao lưu hiện có
 WeekStartOnDay=Ngày đầu tiên trong tuần
 RunningUpdateProcessMayBeRequired=Quá trình chạy nâng cấp dường như là bắt buộc (Phiên bản chương trình %s khác với phiên bản Cơ sở dữ liệu %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
@@ -1260,7 +1261,7 @@ AskForPreferredShippingMethod=Yêu cầu phương thức vận chuyển ưa thí
 FieldEdition=Biên soạn của trường %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
 GetBarCode=Nhận mã vạch
-NumberingModules=Numbering models
+NumberingModules=Kiểu thiết lập số
 ##### Module password generation
 PasswordGenerationStandard=Quay trở lại một mật khẩu được tạo ra theo thuật toán Dolibarr nội bộ: 8 ký tự có chứa số chia sẻ và ký tự trong chữ thường.
 PasswordGenerationNone=Không có gợi ý tạo mật khẩu. Mật khẩu phải được nhập bằng tay.
@@ -1272,8 +1273,9 @@ RuleForGeneratedPasswords=Quy tắc tạo và xác thực mật khẩu
 DisableForgetPasswordLinkOnLogonPage=Không hiển thị liên kết "Quên mật khẩu" trên trang Đăng nhập
 UsersSetup=Thiết lập module người dùng
 UserMailRequired=Yêu cầu email để tạo người dùng mới
-UsersDocModules=Document templates for documents generated from user record
-GroupsDocModules=Document templates for documents generated from a group record
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
+UsersDocModules=Mẫu tài liệu cho tài liệu được tạo từ hồ sơ người dùng
+GroupsDocModules=Mẫu tài liệu cho các tài liệu được tạo từ một bản ghi nhóm
 ##### HRM setup #####
 HRMSetup=Thiết lập mô-đun Nhân sự
 ##### Company setup #####
@@ -1305,7 +1307,7 @@ BillsPDFModules=Mô hình chứng từ hóa đơn
 BillsPDFModulesAccordindToInvoiceType=Mẫu chứng từ hóa đơn theo loại hóa đơn
 PaymentsPDFModules=Mẫu chứng từ thanh toán
 ForceInvoiceDate=Buộc ngày hóa đơn là ngày xác nhận
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestedPaymentModesIfNotDefinedInInvoice=Chế độ thanh toán được đề xuất trên hóa đơn theo mặc định nếu không được xác định trên hóa đơn
 SuggestPaymentByRIBOnAccount=Đề nghị thanh toán bằng cách rút tiền trên tài khoản
 SuggestPaymentByChequeToAddress=Đề nghị thanh toán bằng séc
 FreeLegalTextOnInvoices=Free text on invoices
@@ -1317,7 +1319,7 @@ SupplierPaymentSetup=Thiết lập thanh toán của nhà cung cấp
 PropalSetup=Cài đặt module đơn hàng đề xuất
 ProposalsNumberingModules=Mô hình đánh số đơn hàng đề xuất
 ProposalsPDFModules=Mô hình chứng từ đơn hàng đề xuất
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Chế độ thanh toán được đề xuất theo đề xuất theo mặc định nếu không được xác định trên đề xuất
 FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Yêu cầu tài khoản ngân hàng của đơn hàng đề xuất
@@ -1332,7 +1334,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Hỏi nguồn kho để đặt hàng
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Hỏi tài khoản ngân hàng đích của đơn đặt hàng mua
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Chế độ thanh toán được đề xuất theo đơn đặt hàng theo mặc định nếu không được xác định trên đơn đặt hàng
 OrdersSetup=Thiết lập quản lý đơn đặt hàng
 OrdersNumberingModules=Mô hình đánh số đơn hàng
 OrdersModelModule=Mô hình chứng từ đơn hàng
@@ -1697,9 +1699,9 @@ CashDeskIdWareHouse=Buộc và hạn chế kho hàng để sử dụng cho giả
 StockDecreaseForPointOfSaleDisabled=Giảm tồn kho từ Điểm bán hàng bị vô hiệu hóa
 StockDecreaseForPointOfSaleDisabledbyBatch=Giảm tồn kho trong POS không tương thích với mô-đun Quản lý Sê-ri/lô (hiện đang hoạt động) nên việc giảm tồn kho bị vô hiệu hóa.
 CashDeskYouDidNotDisableStockDecease=Bạn đã không vô hiệu hóa giảm tồn kho khi thực hiện bán hàng từ Điểm bán hàng. Do đó có một kho được yêu cầu.
-CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
+CashDeskForceDecreaseStockLabel=Giảm tồn kho cho các lô sản phẩm đã bị buộc.
 CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
-CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+CashDeskReaderKeyCodeForEnter=Mã khóa cho "Enter" được xác định trong đầu đọc mã vạch (Ví dụ: 13)
 ##### Bookmark #####
 BookmarkSetup=Cài đặt module Bookmark
 BookmarkDesc=Mô-đun này cho phép bạn quản lý dấu trang. Bạn cũng có thể thêm lối tắt vào bất kỳ trang Dolibarr hoặc các trang web bên ngoài trên menu bên trái của bạn.
@@ -1730,9 +1732,9 @@ ChequeReceiptsNumberingModule=Kiểm tra mô-đun đánh số biên nhận séc
 MultiCompanySetup=Thiết lập mô-đun đa công ty
 ##### Suppliers #####
 SuppliersSetup=Thiết lập mô-đun nhà cung cấp
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
-SuppliersInvoiceModel=Complete template of Vendor Invoice
+SuppliersCommandModel=Mẫu hoàn chỉnh của đơn mua hàng
+SuppliersCommandModelMuscadet=Mẫu hoàn chỉnh của Đơn đặt hàng (triển khai cũ của mẫu cornas)
+SuppliersInvoiceModel=Mẫu hoàn chỉnh của Hóa đơn mua hàng
 SuppliersInvoiceNumberingModel=Mô hình đánh số hóa đơn nhà cung cấp
 IfSetToYesDontForgetPermission=Nếu được đặt thành giá trị không null, đừng quên cung cấp quyền cho các nhóm hoặc người dùng được phép phê duyệt lần thứ hai
 ##### GeoIPMaxmind #####
@@ -1782,10 +1784,10 @@ ListOfNotificationsPerUser=Danh sách thông báo tự động cho mỗi ngườ
 ListOfNotificationsPerUserOrContact=Danh sách các thông báo tự động có thể có (về sự kiện kinh doanh) có sẵn cho mỗi người dùng * hoặc mỗi liên lạc **
 ListOfFixedNotifications=Danh sách thông báo cố định tự động
 GoOntoUserCardToAddMore=Chuyển đến tab "Thông báo" của người dùng để thêm hoặc xóa thông báo cho người dùng
-GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Chuyển đến tab "Thông báo" của bên thứ ba để thêm hoặc xóa thông báo cho các liên hệ / địa chỉ
 Threshold=Threshold
-BackupDumpWizard=Wizard to build the database dump file
-BackupZipWizard=Wizard to build the archive of documents directory
+BackupDumpWizard=Hướng dẫn cách dump file dữ liệu
+BackupZipWizard=Hướng dẫn tạo lưu trữ của thư mục hồ sơ
 SomethingMakeInstallFromWebNotPossible=Cài đặt module bên ngoài là không thể từ giao diện web với các lý do sau:
 SomethingMakeInstallFromWebNotPossible2=Vì lý do này, quá trình nâng cấp được mô tả ở đây là quy trình thủ công chỉ người dùng đặc quyền mới có thể thực hiện.
 InstallModuleFromWebHasBeenDisabledByFile=Cài đặt các module bên ngoài từ các ứng dụng đã bị vô hiệu bởi quản trị viên của bạn. Bạn phải yêu cầu ông phải loại bỏ các tập tin <strong>%s</strong> để cho phép tính năng này.
@@ -1803,12 +1805,13 @@ TopMenuDisableImages=Ẩn hình ảnh trong menu trên cùng
 LeftMenuBackgroundColor=Màu nền của menu Trái
 BackgroundTableTitleColor=Màu nền cho tiêu đề của Table
 BackgroundTableTitleTextColor=Màu văn bản cho dòng tiêu đề Bảng
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=Màu nền của hàng lẻ
 BackgroundTableLineEvenColor=Màu nền của hàng chẵn
 MinimumNoticePeriod=Thời gian thông báo tối thiểu (Yêu cầu nghỉ phép của bạn phải được thực hiện trước khi trì hoãn này)
 NbAddedAutomatically=Số ngày được thêm vào bộ đếm của người dùng (tự động) mỗi tháng
 EnterAnyCode=Trường này chứa một tham chiếu để xác định dòng. Nhập bất kỳ giá trị nào bạn chọn, nhưng không có ký tự đặc biệt.
-Enter0or1=Enter 0 or 1
+Enter0or1=Lỗi 0 hoặc 1
 UnicodeCurrency=Nhập vào đây giữa các dấu ngoặc nhọn, danh sách số byte đại diện cho ký hiệu tiền tệ. Ví dụ: với $, nhập [36] - đối với brazil real R $ [82,36] - với €, nhập [8364]
 ColorFormat=Màu RGB ở định dạng HEX, ví dụ: FF0000
 PositionIntoComboList=Vị trí của dòng ở trong danh sách kết hợp
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Tham chiếu Dolibarr không tìm thấy trong ID tin nhắ
 FormatZip=Zip
 MainMenuCode=Mã mục nhập menu (mainmenu)
 ECMAutoTree=Hiển thị cây ECM tự động
-OperationParamDesc=Xác định các giá trị để sử dụng cho hành động hoặc cách trích xuất các giá trị. Ví dụ: <br> objproperty1=SET:abc <br> objproperty1=SET: một giá trị thay thế của __objproperty1__ <br> objproperty3=SETIFEMPTY: abc <br> objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*) <br> Options_myextrafield=EXTRACT:SUBJECT:([^\\s]*) <br> object.objproperty5=EXTRACT:BODY: Tên công ty của tôi là \\s([^\\s]*) <br><br> Sử dụng một ký tự ; như dấu phân cách để trích xuất hoặc thiết lập một số thuộc tính.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Giờ mở cửa
 OpeningHoursDesc=Nhập vào đây giờ mở cửa thường xuyên của công ty bạn.
 ResourceSetup=Cấu hình của mô-đun tài nguyên
@@ -1970,14 +1973,14 @@ WarningValueHigherSlowsDramaticalyOutput=Cảnh báo, giá trị cao hơn làm c
 ModuleActivated=Mô-đun %s được kích hoạt và làm chậm giao diện
 EXPORTS_SHARE_MODELS=Mô hình xuất dữ liệu được chia sẻ với mọi người
 ExportSetup=Thiết lập mô-đun Xuất dữ liệu
-ImportSetup=Setup of module Import
+ImportSetup=Thiết lập module nhập liệu
 InstanceUniqueID=ID duy nhất của đối tượng
 SmallerThan=Nhỏ hơn
 LargerThan=Lớn hơn
 IfTrackingIDFoundEventWillBeLinked=Lưu ý rằng nếu tìm thấy ID theo dõi trong email đến, sự kiện sẽ được tự động liên kết với các đối tượng liên quan.
 WithGMailYouCanCreateADedicatedPassword=Với tài khoản GMail, nếu bạn đã bật xác thực 2 bước, bạn nên tạo mật khẩu thứ hai dành riêng cho ứng dụng thay vì sử dụng mật khẩu tài khoản của riêng bạn từ https://myaccount.google.com/.
-EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
+EmailCollectorTargetDir=Nó có thể là một hành vi mong muốn để di chuyển email vào một thẻ / thư mục khác khi nó được xử lý thành công. Chỉ cần đặt một giá trị ở đây để sử dụng tính năng này. Lưu ý rằng bạn cũng phải sử dụng tài khoản đăng nhập đọc / ghi.
+EmailCollectorLoadThirdPartyHelp=Bạn có thể sử dụng hành động này để sử dụng nội dung email để tìm và tải một bên thứ ba hiện có trong cơ sở dữ liệu của bạn. Phần thứ ba được tìm thấy (hoặc được tạo) sẽ được sử dụng cho các hành động sau đây cần nó. Trong trường tham số, bạn có thể sử dụng ví dụ 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)' nếu bạn muốn trích xuất tên của bên thứ ba từ một chuỗi 'Name: name to find' được tìm thấy trong phần nội dung
 EndPointFor=Điểm kết thúc cho %s: %s
 DeleteEmailCollector=Xóa trình thu thập email
 ConfirmDeleteEmailCollector=Bạn có chắc chắn muốn xóa trình thu thập email này?
@@ -1990,8 +1993,10 @@ NotAPublicIp=Không phải IP công cộng
 MakeAnonymousPing=Tạo một Ping ẩn danh '+1' cho máy chủ nền tảng Dolibarr (chỉ được thực hiện 1 lần sau khi cài đặt) để cho phép nền tảng đếm số lượng cài đặt Dolibarr.
 FeatureNotAvailableWithReceptionModule=Tính năng không khả dụng khi mô-đun Tiếp nhận được bật
 EmailTemplate=Mẫu cho email
-EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
-FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
+EMailsWillHaveMessageID=Email sẽ có thẻ 'Tài liệu tham khảo' khớp với cú pháp này
+PDF_USE_ALSO_LANGUAGE_CODE=Nếu bạn muốn có text trong PDF của mình bằng 2 ngôn ngữ khác nhau trong cùng một tệp PDF được tạo, bạn phải đặt ở đây ngôn ngữ thứ hai này để PDF được tạo sẽ chứa 2 ngôn ngữ khác nhau trong cùng một trang, một ngôn ngữ được chọn khi tạo PDF và ngôn ngữ này ( chỉ có vài mẫu PDF hỗ trợ này). Giữ trống cho 1 ngôn ngữ trên mỗi PDF.
+FafaIconSocialNetworksDesc=Nhập vào đây mã của biểu tượng FontAwgie. Nếu bạn không biết FontAwgie là gì, bạn có thể sử dụng  fa-address-book
+RssNote=Lưu ý: Mỗi nguồn cấp RSS cung cấp một tiện ích mà bạn phải kích hoạt để có sẵn trong bảng điều khiển
+JumpToBoxes=Chuyển tới  Thiết lập --> Widgets
+MeasuringUnitTypeDesc=Sử dụng ở đây một giá trị như "kích thước", "diện tích", "khối lượng", "trọng lượng", "thời gian"
+MeasuringScaleDesc=Thang đo là số vị trí bạn phải di chuyển phần thập phân để khớp với đơn vị tham chiếu mặc định. Đối với loại đơn vị "thời gian", đó là số giây. Giá trị từ 80 đến 99 là giá trị dành riêng.
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index d57824e370e..4012e188c09 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -61,14 +61,14 @@ Payment=Thanh toán
 PaymentBack=Hoàn thuế
 CustomerInvoicePaymentBack=Hoàn thuế
 Payments=Thanh toán
-PaymentsBack=Refunds
+PaymentsBack=Thanh toán lại
 paymentInInvoiceCurrency=tiền tệ trên hóa đơn
 PaidBack=Đã trả lại
 DeletePayment=Xóa thanh toán
 ConfirmDeletePayment=Bạn có chắc chắn muốn xóa khoản thanh toán này?
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReduc=Bạn có muốn chuyển %sthành lượng giảm giá không?
 ConfirmConvertToReduc2=Số tiền sẽ được lưu trong số tất cả các khoản giảm giá và có thể được sử dụng làm khoản giảm giá cho hóa đơn hiện tại hoặc tương lai cho khách hàng này.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
+ConfirmConvertToReducSupplier=Bạn có muốn chuyển %sthành lượng giảm giá không?
 ConfirmConvertToReducSupplier2=Số tiền sẽ được lưu trong số tất cả các khoản giảm giá và có thể được sử dụng làm khoản giảm giá cho hóa đơn hiện tại hoặc tương lai cho nhà cung cấp này.
 SupplierPayments=Thanh toán của nhà cung cấp
 ReceivedPayments=Đã nhận thanh toán
@@ -78,7 +78,7 @@ ReceivedCustomersPaymentsToValid=Đã nhận thanh toán khách hàng để xác
 PaymentsReportsForYear=Báo cáo thanh toán cho %s
 PaymentsReports=Báo cáo thanh toán
 PaymentsAlreadyDone=Đã thanh toán
-PaymentsBackAlreadyDone=Refunds already done
+PaymentsBackAlreadyDone=Đã thanh toán lại
 PaymentRule=Quy tắc thanh toán
 PaymentMode=Hình thức thanh toán
 PaymentTypeDC=Thẻ tín dụng/Ghi nợ
@@ -209,20 +209,13 @@ NumberOfBillsByMonth=Số lượng hóa đơn mỗi tháng
 AmountOfBills=Số tiền của hóa đơn
 AmountOfBillsHT=Số tiền hóa đơn (thuế ròng)
 AmountOfBillsByMonthHT=Số tiền của hóa đơn theo tháng (có thuế)
-ShowSocialContribution=Hiển thị thuế xã hội / tài chính
-ShowBill=Hiện thị hóa đơn
-ShowInvoice=Hiển thị hóa đơn
-ShowInvoiceReplace=Hiển thị hóa đơn thay thế
-ShowInvoiceAvoir=Xem giấy báo có
-ShowInvoiceDeposit=Hiển thị hóa đơn thanh toán tiền cọc
-ShowInvoiceSituation=Xem hóa đơn tình huống
 UseSituationInvoices=Cho phép hóa đơn tình huống
 UseSituationInvoicesCreditNote=Cho phép ghi chú tín dụng hóa đơn tình huống
 Retainedwarranty=Giữ lại bảo hành
-AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
+AllowedInvoiceForRetainedWarranty=Bảo lãnh bảo hành không sử dụng với các loại hoá đơn
 RetainedwarrantyDefaultPercent=Giữ lại phần trăm mặc định bảo hành
-RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
-RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
+RetainedwarrantyOnlyForSituation=Tạo bảo lãnh bảo hành chỉ áp dụng với hoá đơn bán hàng
+RetainedwarrantyOnlyForSituationFinal=Hóa don chuẩn của "bảo lãnh bảo hành" chỉ được áp dụng vào hóa đơn cuối cùng
 ToPayOn=Thanh toán trên %s
 toPayOn=thanh toán trên %s
 RetainedWarranty=Giữ lại bảo hành
@@ -233,7 +226,6 @@ setretainedwarranty=Thiết lập bảo hành giữ lại
 setretainedwarrantyDateLimit=Thiết lập ngày giới hạn bảo hành được giữ lại
 RetainedWarrantyDateLimit=Giới hạn ngày giữ lại bảo hành
 RetainedWarrantyNeed100Percent=Hóa đơn tình huống cần có ở tiến trình 100%% để được hiển thị trên PDF
-ShowPayment=Hiển thị thanh toán
 AlreadyPaid=Đã trả
 AlreadyPaidBack=Đã trả lại
 AlreadyPaidNoCreditNotesNoDeposits=Đã thanh toán (không có ghi chú tín dụng và giảm thanh toán)
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Được tạo từ hóa đơn mẫu %s
 WarningInvoiceDateInFuture=Cảnh báo, ngày hóa đơn cao hơn ngày hiện tại
 WarningInvoiceDateTooFarInFuture=Cảnh báo, ngày hóa đơn quá xa so với ngày hiện tại
 ViewAvailableGlobalDiscounts=Xem giảm giá có sẵn
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Trạng thái
 PaymentConditionShortRECEP=Đến khi nhận
@@ -419,10 +412,10 @@ PaymentConditionShort14D=14 ngày
 PaymentCondition14D=14 ngày
 PaymentConditionShort14DENDMONTH=14 ngày cuối tháng
 PaymentCondition14DENDMONTH=Trong vòng 14 ngày sau khi kết thúc tháng
-FixAmount=Fixed amount - 1 line with label '%s'
+FixAmount=Số tiền không đổi -1 dòng với nhãn là '%s'
 VarAmount=Số tiền thay đổi (%% tot.)
 VarAmountOneLine=Số tiền thay đổi (%% tot.) - 1 dòng có nhãn '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Số lượng sai khác (%%trên tổng) - tất cả các dòng giống nhau
 # PaymentType
 PaymentTypeVIR=Chuyển khoản ngân hàng
 PaymentTypeShortVIR=Chuyển khoản ngân hàng
@@ -512,19 +505,19 @@ ToMakePayment=Trả
 ToMakePaymentBack=Trả lại
 ListOfYourUnpaidInvoices=Danh sách các hoá đơn chưa trả
 NoteListOfYourUnpaidInvoices=Ghi chú: Danh sách này chỉ chứa các hoá đơn cho bên thứ ba mà bạn liên quan như là một đại diện bán hàng.
-RevenueStamp=Tax stamp
+RevenueStamp=Tem thuế
 YouMustCreateInvoiceFromThird=Tùy chọn này chỉ khả dụng khi tạo hóa đơn từ tab "Khách hàng" của bên thứ ba
 YouMustCreateInvoiceFromSupplierThird=Tùy chọn này chỉ khả dụng khi tạo hóa đơn từ tab "Nhà cung cấp" của bên thứ ba
 YouMustCreateStandardInvoiceFirstDesc=Trước tiên, bạn phải tạo hóa đơn chuẩn và chuyển đổi thành "mẫu" để tạo hóa đơn mẫu mới
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Hóa đơn mẫu PDF Crabe. Một mẫu hóa đơn đầy đủ (mẫu đề nghị)
 PDFSpongeDescription=Hóa đơn PDF mẫu Sponge. Một mẫu hóa đơn hoàn chỉnh
 PDFCrevetteDescription=Hóa đơn PDF mẫu Crevette. Mẫu hóa đơn hoàn chỉnh cho hóa đơn tình huống
 TerreNumRefModelDesc1=Quay về số với định dạng %ssyymm-nnnn cho hóa đơn chuẩn và %syymm-nnnn cho các giấy báo có nơi mà yy là năm, mm là tháng và nnnn là một chuỗi ngắt và không trở về 0
 MarsNumRefModelDesc1=Trả về số có định dạng %syymm-nnnn cho hóa đơn tiêu chuẩn, %syymm-nnnn cho hóa đơn thay thế, %syymm-nnn cho thanh toán giảm và %syymm-nnnn cho ghi chú tín dụng khi yy là năm, mm là tháng và nnnn là chuỗi không ngăn cách và không trả về 0
 TerreNumRefModelError=Bắt đầu ra một hóa đơn với $syymm mà đã tồn tại thì không tương thích với mô hình này của chuỗi. Xóa bỏ nó hoặc đổi tên nó để kích hoạt module này.
 CactusNumRefModelDesc1=Số trả về có định dạng %syymm-nnnn cho các hóa đơn tiêu chuẩn, %syymm-nnnn cho các ghi chú tín dụng và %syymm-nnnn cho giảm thanh toán các hóa đơn khi yy là năm, mm là tháng và nnnn là chuỗi không phân cách và không trả về 0
-EarlyClosingReason=Early closing reason
-EarlyClosingComment=Early closing note
+EarlyClosingReason=Lý do đóng sớm
+EarlyClosingComment=Ghi chú lý do đóng sớm
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Đại diện theo dõi hóa đơn khách hàng
 TypeContact_facture_external_BILLING=Liên lạc hóa đơn khách hàng
@@ -578,4 +571,4 @@ AutoFillDateTo=Đặt ngày kết thúc cho dòng dịch vụ với ngày hóa 
 AutoFillDateToShort=Đặt ngày kết thúc
 MaxNumberOfGenerationReached=Số lượng tạo ra đạt tối đa
 BILL_DELETEInDolibarr=Hóa đơn đã bị xóa
-BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
+BILL_SUPPLIER_DELETEInDolibarr=Hoá đơn Nhà cung cấp đã được xoá
diff --git a/htdocs/langs/vi_VN/modulebuilder.lang b/htdocs/langs/vi_VN/modulebuilder.lang
index 04fc2ac7f0c..455ce16e8bb 100644
--- a/htdocs/langs/vi_VN/modulebuilder.lang
+++ b/htdocs/langs/vi_VN/modulebuilder.lang
@@ -83,9 +83,9 @@ ListOfDictionariesEntries=Danh sách các mục từ điển
 ListOfPermissionsDefined=Danh sách các quyền được định nghĩa
 SeeExamples=Xem ví dụ ở đây
 EnabledDesc=Điều kiện để có trường này hoạt động (Ví dụ: 1 hoặc $conf-> golobal->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
-DisplayOnPdf=Display on PDF
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdf=Hiển thị trên file PDF
 IsAMeasureDesc=Giá trị của trường có thể được tích lũy để có được tổng số vào danh sách không? (Ví dụ: 1 hoặc 0)
 SearchAllDesc=Là trường được sử dụng để thực hiện tìm kiếm từ công cụ tìm kiếm nhanh? (Ví dụ: 1 hoặc 0)
 SpecDefDesc=Nhập vào đây tất cả tài liệu bạn muốn cung cấp với mô-đun chưa được xác định bởi các tab khác. Bạn có thể sử dụng .md hoặc tốt hơn, cú pháp .asciidoc đầy đủ.
@@ -137,5 +137,5 @@ CSSClass=Lớp CSS
 NotEditable=Không thể chỉnh sửa
 ForeignKey=Khóa ngoại
 TypeOfFieldsHelp=Kiểu trường: <br> varchar (99), double (24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' có nghĩa là chúng ta thêm nút + sau khi kết hợp để tạo bản ghi, ví dụ 'bộ lọc' có thể là 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTEER__)')
-AsciiToHtmlConverter=Ascii to HTML converter
-AsciiToPdfConverter=Ascii to PDF converter
+AsciiToHtmlConverter=Chuyển mã ASCII sang HTML
+AsciiToPdfConverter=Chuyển ASCII sang PDF
diff --git a/htdocs/langs/vi_VN/multicurrency.lang b/htdocs/langs/vi_VN/multicurrency.lang
new file mode 100644
index 00000000000..c5650585f4d
--- /dev/null
+++ b/htdocs/langs/vi_VN/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Đa tiền tệ
+ErrorAddRateFail=Xảy ra lỗi trong thêm tỷ lệ
+ErrorAddCurrencyFail=Xảy ra lỗi trong thêm tiền tệ
+ErrorDeleteCurrencyFail=Lỗi xóa thất bại
+multicurrency_syncronize_error=Lỗi đồng bộ hóa: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Sử dụng ngày của tài liệu để tìm tỷ giá tiền tệ, thay vì sử dụng tỷ giá mới nhất được biết
+multicurrency_useOriginTx=Khi một đối tượng được tạo từ đối tượng khác, hãy giữ tỷ lệ ban đầu từ đối tượng nguồn (nếu không sử dụng tỷ lệ đã biết mới nhất)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=Bạn phải tạo một tài khoản trên trang web %s để sử dụng chức năng này. <br> Nhận <b>khóa API</b> của bạn. <br> Nếu bạn sử dụng tài khoản miễn phí, bạn không thể thay đổi <b>loại tiền tệ</b> (USD theo mặc định). <br> Nếu loại tiền chính của bạn không phải là USD, ứng dụng sẽ tự động tính toán lại. <br><br> Bạn bị giới hạn ở 1000 đồng bộ hóa mỗi tháng.
+multicurrency_appId=Khóa API
+multicurrency_appCurrencySource=Nguồn tiền tệ
+multicurrency_alternateCurrencySource=Nguồn tiền tệ thay thế
+CurrenciesUsed=Tiền tệ được sử dụng
+CurrenciesUsed_help_to_add=Thêm các loại tiền tệ và tỷ lệ khác nhau mà bạn cần sử dụng cho các <b>đề xuất</b> , <b>đơn đặt hàng</b> , v.v.
+rate=tỷ lệ
+MulticurrencyReceived=Đã nhận, nguyên tệ
+MulticurrencyRemainderToTake=Số tiền còn lại, nguyên tệ
+MulticurrencyPaymentAmount=Số tiền thanh toán, nguyên tệ
+AmountToOthercurrency=Số tiền chuyển (bằng tiền tệ tài khoản nhận)
+CurrencyRateSyncSucceed=Tỷ giá được đồng bộ thành công
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Sử dụng tiền tệ cho hồ sơ thanh toán trực tuyến
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index 81bec314452..ac2d9e2f49c 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -39,8 +39,8 @@ ShowProject=Hiển thị dự án
 ShowTask=Hiện tác vụ
 SetProject=Lập dự án
 NoProject=Không có dự án được xác định hoặc tự tạo
-NbOfProjects=Number of projects
-NbOfTasks=Number of tasks
+NbOfProjects=Số dự án
+NbOfTasks=Số công việc
 TimeSpent=Thời gian đã qua
 TimeSpentByYou=Thời gian đã qua bởi bạn
 TimeSpentByUser=Thời gian đã qua bởi người dùng
@@ -69,7 +69,7 @@ NewTask=Tác vụ mới
 AddTask=Tạo tác vụ
 AddTimeSpent=Tạo thời gian đã qua
 AddHereTimeSpentForDay=Thêm vào đây thời gian dành cho ngày/ nhiệm vụ này
-AddHereTimeSpentForWeek=Add here time spent for this week/task
+AddHereTimeSpentForWeek=Thêm vào đây thời gian đã làm cho công việc của tuần này
 Activity=Hoạt động
 Activities=Tác vụ/hoạt động
 MyActivities=Tác vụ/hoạt động của tôi
@@ -78,7 +78,7 @@ MyProjectsArea=Khu vực dự án của tôi
 DurationEffective=Thời hạn hiệu lực
 ProgressDeclared=Tiến độ công bố
 TaskProgressSummary=Tiến độ công việc
-CurentlyOpenedTasks=Curently open tasks
+CurentlyOpenedTasks=Công việc còn mở
 TheReportedProgressIsLessThanTheCalculatedProgressionByX=Tiến độ khai báo ít hơn %s so với tiến độ tính toán
 TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Tiến độ khai báo là nhiều hơn %s so với tiến độ tính toán
 ProgressCalculated=Tiến độ được tính toán
@@ -102,7 +102,7 @@ ListDonationsAssociatedProject=Danh sách quyên góp liên quan đến dự án
 ListVariousPaymentsAssociatedProject=Danh sách các khoản thanh toán khác liên quan đến dự án
 ListSalariesAssociatedProject=Danh sách các khoản thanh toán tiền lương liên quan đến dự án
 ListActionsAssociatedProject=Danh sách các sự kiện liên quan đến dự án
-ListMOAssociatedProject=List of manufacturing orders related to the project
+ListMOAssociatedProject=Danh sách đơn sản xuất liên quan dự án
 ListTaskTimeUserProject=Danh sách thời gian tiêu thụ cho các nhiệm vụ của dự án
 ListTaskTimeForTask=Danh sách thời gian tiêu thụ cho nhiệm vụ
 ActivityOnProjectToday=Hoạt động trong dự án hôm nay
@@ -162,8 +162,8 @@ OpportunityProbability=Xác suất tiềm năng
 OpportunityProbabilityShort=Xác suất tiềm năng
 OpportunityAmount=Số tiền tiềm năng
 OpportunityAmountShort=Số tiền tiềm năng
-OpportunityWeightedAmount=Opportunity weighted amount
-OpportunityWeightedAmountShort=Opp. weighted amount
+OpportunityWeightedAmount=Tổng trị giá cơ hội
+OpportunityWeightedAmountShort=Tổng trị giá cơ hội
 OpportunityAmountAverageShort=Số tiền tiềm năng trung bình
 OpportunityAmountWeigthedShort=Số tiền tiềm năng thận trọng
 WonLostExcluded=Không gồm Thắng/ thua
@@ -186,10 +186,10 @@ PlannedWorkload=Khối lượng công việc dự tính
 PlannedWorkloadShort=Khối lượng công việc
 ProjectReferers=Những thứ có liên quan
 ProjectMustBeValidatedFirst=Dự án phải được xác nhận trước
-FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+FirstAddRessourceToAllocateTime=Chỉ định tài nguyên người dùng làm liên hệ của dự án để phân bổ thời gian
 InputPerDay=Đầu vào mỗi ngày
 InputPerWeek=Đầu vào mỗi tuần
-InputPerMonth=Input per month
+InputPerMonth=Lượng nhập liệu theo tháng
 InputDetail=Chi tiết đầu vào
 TimeAlreadyRecorded=Đây là thời gian đã qua được ghi nhận cho nhiệm vụ/ ngày này và người dùng %s
 ProjectsWithThisUserAsContact=Dự án với người dùng này là người liên lạc
@@ -238,7 +238,7 @@ LatestModifiedProjects=Dự án sửa đổi %s mới nhất
 OtherFilteredTasks=Các nhiệm vụ được lọc khác
 NoAssignedTasks=Không tìm thấy nhiệm vụ được giao (chỉ định dự án / nhiệm vụ cho người dùng hiện tại từ hộp chọn trên cùng để nhập thời gian vào nó)
 ThirdPartyRequiredToGenerateInvoice=Một bên thứ ba phải được xác định trong dự án để có thể lập hóa đơn.
-ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+ChooseANotYetAssignedTask=Chọn một cônng việc chưa gán cho bạn
 # Comments trans
 AllowCommentOnTask=Cho phép người dùng nhận xét về các nhiệm vụ
 AllowCommentOnProject=Cho phép người dùng nhận xét về các dự án
@@ -253,15 +253,15 @@ TimeSpentForInvoice=Thời gian đã qua
 OneLinePerUser=Một dòng trên mỗi người dùng
 ServiceToUseOnLines=Dịch vụ được sử dụng trên các dòng
 InvoiceGeneratedFromTimeSpent=Hóa đơn %s đã được tạo từ thời gian dành đã qua trên dự án
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
+ProjectBillTimeDescription=Kiểm tra xem bạn nhập bảng thời gian vào các nhiệm vụ của dự án VÀ bạn có kế hoạch tạo (các) hóa đơn từ bảng chấm công để lập hóa đơn cho khách hàng của dự án (không kiểm tra xem bạn có kế hoạch tạo hóa đơn không dựa trên bảng thời gian đã nhập không). Lưu ý: Để tạo hóa đơn, hãy chuyển đến tab 'Thời gian sử dụng' của dự án và chọn các dòng để đưa vào.
 ProjectFollowOpportunity=Theo dõi cơ hội
-ProjectFollowTasks=Theo dõi các nhiệm vụ
-Usage=Usage
+ProjectFollowTasks=Follow tasks or time spent
+Usage=Chức năng
 UsageOpportunity=Cách dùng: Cơ hội
 UsageTasks=Cách dùng: Nhiệm vụ
 UsageBillTimeShort=Cách dùng: Hóa đơn thời gian
-InvoiceToUse=Draft invoice to use
+InvoiceToUse=Hoá đơn dự thảo sử dụng
 NewInvoice=Hóa đơn mới
-OneLinePerTask=One line per task
-OneLinePerPeriod=One line per period
-RefTaskParent=Ref. Parent Task
+OneLinePerTask=Dòng dòng một công việc
+OneLinePerPeriod=Một dòng cho một khoảng thời gian
+RefTaskParent=Tham chiếu công việc cấp cha
diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang
index 6c3e12df2e3..7bf4ff832ce 100644
--- a/htdocs/langs/vi_VN/website.lang
+++ b/htdocs/langs/vi_VN/website.lang
@@ -57,7 +57,7 @@ NoPageYet=Chưa có trang nào
 YouCanCreatePageOrImportTemplate=Bạn có thể tạo một trang mới hoặc nhập một mẫu trang web đầy đủ
 SyntaxHelp=Trợ giúp về các mẹo cú pháp cụ thể
 YouCanEditHtmlSourceckeditor=Bạn có thể chỉnh sửa mã nguồn HTML bằng nút "Nguồn" trong trình chỉnh sửa.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Bạn có thể đưa mã PHP vào nguồn này bằng cách sử dụng thẻ <strong><php >;</strong> . Các biến toàn cục sau đây có sẵn: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs. <br><br><span class="fa fa-bug"></span> Bạn cũng có thể bao gồm nội dung của Trang / Vùng chứa khác với cú pháp sau: <br> <strong><php includeContainer('alias_of_container_to_include'); ></strong> <br><br><span class="fa fa-bug"></span> Bạn có thể thực hiện chuyển hướng đến Trang / Vùng chứa khác theo cú pháp sau (Lưu ý: không xuất bất kỳ nội dung nào trước khi chuyển hướng): <br> <strong><php redirectToContainer('alias_of_container_to_redirect_to');></strong> <br><br><span class="fa fa-link"></span> Để thêm một liên kết đến một trang khác, sử dụng cú pháp: <br> <strong><a href="alias_of_page_to_link_to.php"> mylink <a></strong> <br><br><span class="fa fa-download"></span> Để bao gồm một <strong>liên kết để tải xuống</strong> một tệp được lưu trữ trong thư mục <strong>tài liệu</strong> , hãy sử dụng trình bao bọc <strong>document.php</strong> : <br> Ví dụ, đối với một tệp thành tài liệu /ecm (cần phải đăng nhập), cú pháp là: <br> <strong><a href="/document.php?modulepart=ecm&file=[relative_dir/[filename.ext"></strong> <br> Đối với một tệp thành tài liệu / phương tiện (thư mục mở để truy cập công khai), cú pháp là: <br> <strong><a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"></strong> <br> Đối với tệp được chia sẻ với liên kết chia sẻ (truy cập mở bằng khóa băm chia sẻ của tệp), cú pháp là: <br> <strong><a href="/document.php?hashp=publicsharekeyoffile"></strong> <br><br><span class="fa fa-picture-o"></span> Để bao gồm một <strong>hình ảnh</strong> được lưu trữ trong thư mục <strong>tài liệu</strong> , hãy sử dụng trình bao bọc <strong>viewimage.php</strong> : <br> Ví dụ, đối với một hình ảnh thành tài liệu / phương tiện (thư mục mở để truy cập công khai), cú pháp là: <br> <strong><img src="/viewimage.php?modulepart=medias&file=[Rel_dir/]filename.ext"></strong> <br><br> Các ví dụ khác về HTML hoặc mã động có sẵn trên <a href="%s" target="_blank">tài liệu wiki</a> <br> .
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=Nhân bản Trang  / vùng chứa
 CloneSite=Nhân bản trang web
 SiteAdded=Đã thêm trang web
@@ -77,7 +77,7 @@ BlogPost=Bài viết trên blog
 WebsiteAccount=Tài khoản trang web
 WebsiteAccounts=Tài khoản trang web
 AddWebsiteAccount=Tạo tài khoản trang web
-BackToListOfThirdParty=Quay lại danh sách cho bên thứ ba
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Vô hiệu hóa trang web đầu tiên
 MyContainerTitle=Tiêu đề trang web của tôi
 AnotherContainer=Đây là cách bao gồm nội dung của trang / vùng chứa khác (bạn có thể gặp lỗi ở đây nếu bạn bật mã động vì nhà cung cấp phụ được nhúng có thể không tồn tại)
@@ -122,9 +122,9 @@ BackToHomePage=Quay lại trang chủ...
 TranslationLinks=Liên kết dịch
 YouTryToAccessToAFileThatIsNotAWebsitePage=Bạn cố gắng truy cập vào một trang không phải là trang web
 UseTextBetween5And70Chars=Để thực hành SEO tốt, hãy sử dụng văn bản có từ 5 đến 70 ký tự
-MainLanguage=Main language
-OtherLanguages=Other languages
-UseManifest=Provide a manifest.json file
-PublicAuthorAlias=Public author alias
-AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
+MainLanguage=Ngôn ngữ chính
+OtherLanguages=Ngôn ngữ khác
+UseManifest=Cung cấp một file manifest.json
+PublicAuthorAlias=Tên tác giả công khai
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Các ngôn ngữ hiện hữu để thiết lập vào thuộc tính website
 ReplacementDoneInXPages=Replacement done in %s pages or containers
diff --git a/htdocs/langs/vi_VN/zapier.lang b/htdocs/langs/vi_VN/zapier.lang
new file mode 100644
index 00000000000..33d5ee1fd5a
--- /dev/null
+++ b/htdocs/langs/vi_VN/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier cho Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Mô-đun Zapier cho Dolibarr
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Thiết lập Zapier cho Dolibarr
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index be64eed4ec2..4cd78fc7e6d 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -121,6 +121,7 @@ InvoiceLinesDone=已绑定的发票行
 ExpenseReportLines=要绑定的费用行报告
 ExpenseReportLinesDone=已绑定的费用报告行
 IntoAccount=用会计科目绑定行
+TotalForAccount=Total for accounting account
 
 
 Ventilate=绑定
@@ -168,10 +169,15 @@ DONATION_ACCOUNTINGACCOUNT=会计科目-登记捐款
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=销售产品的默认会计科目（如果未在产品说明书中定义，则使用）
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=已购买服务的默认会计科目（如果未在服务单中定义，则使用）
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=默认情况下，已售出服务的会计科目（如果未在服务单中定义，则使用）
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
@@ -228,12 +234,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=付款未与任何产品/服务相关联
+OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=帐户组
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
+Reconcilable=Reconcilable
+
 TotalVente=Total turnover before tax
 TotalMarge=总销售利润率
 
@@ -307,11 +317,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=导出CSV可配置
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=会计科目表ID
 
 ## Tools - Init accounting account on product / service
@@ -324,10 +336,14 @@ OptionModeProductSell=销售模式
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=采购模式
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
 OptionModeProductSellDesc=显示所有具有销售会计帐户的产品。
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=显示所有带有会计帐户的产品。
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
 CleanFixHistory=将不存在于会计科目表中的行删除科目代码
 CleanHistory=重置所选年份的所有绑定
 PredefinedGroups=预定义的组
@@ -338,6 +354,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
 Range=会计科目范围
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 1c4c03260c0..abb3d411bfc 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -40,6 +40,7 @@ WebUserGroup=Web 服务器用户/组
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=数据库保存数据的字符编码
 DBSortingCharset=数据库排序数据的字符编码
+HostCharset=Host charset
 ClientCharset=客户端的字符编码
 ClientSortingCharset=客户核对
 WarningModuleNotActive=<b> %s </b>模块必须启用
@@ -427,7 +428,7 @@ ExtrafieldCheckBox=复选框
 ExtrafieldCheckBoxFromList=表格中的复选框
 ExtrafieldLink=连接到对象
 ComputedFormula=计算字段
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -1015,7 +1016,7 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=默认情况下，建议IRPF为0。规则结束。
 LocalTax2IsUsedExampleES=在西班牙，提供服务的自由职业者和独立专业人士以及选择模块税制的公司。
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=地税报表
@@ -1272,6 +1273,7 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=用户模块设置
 UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
@@ -1731,7 +1733,7 @@ MultiCompanySetup=多公司模块设置
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order 
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
@@ -1803,6 +1805,7 @@ TopMenuDisableImages=隐藏顶部菜单图片
 LeftMenuBackgroundColor=左侧菜单背景颜色
 BackgroundTableTitleColor=清单表格表头背景颜色
 BackgroundTableTitleTextColor=表标题行的文本颜色
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
 BackgroundTableLineOddColor=表格奇数背景颜色
 BackgroundTableLineEvenColor=表格偶数背景颜色
 MinimumNoticePeriod=最小通知间隔
@@ -1936,7 +1939,7 @@ WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=邮编
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -1995,3 +1998,5 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index 36bcc71b879..2e40a958f6f 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -209,13 +209,6 @@ NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=发票金额
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=按月发票金额 (税后)
-ShowSocialContribution=显示财政税/增值税
-ShowBill=显示发票
-ShowInvoice=显示发票
-ShowInvoiceReplace=显示替换发票
-ShowInvoiceAvoir=显示信用记录
-ShowInvoiceDeposit=显示付款发票
-ShowInvoiceSituation=显示情况发票
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -233,7 +226,6 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-ShowPayment=显示支付
 AlreadyPaid=已支付
 AlreadyPaidBack=已支付
 AlreadyPaidNoCreditNotesNoDeposits=已经支付（没有信用票据和预付款）
@@ -393,6 +385,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=警告，发票日期高于当前日期
 WarningInvoiceDateTooFarInFuture=警告，发票日期与当前日期相差太远
 ViewAvailableGlobalDiscounts=查看可用折扣
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=状态
 PaymentConditionShortRECEP=由于收到
@@ -516,7 +509,7 @@ RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=您必须先创建标准发票并将其转换为“模板”以创建新模板发票
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=发票PDF模板Crevette。情况发票的完整发票模板
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/zh_CN/donations.lang b/htdocs/langs/zh_CN/donations.lang
index 74050e572c2..ba7103cc726 100644
--- a/htdocs/langs/zh_CN/donations.lang
+++ b/htdocs/langs/zh_CN/donations.lang
@@ -6,8 +6,7 @@ Donor=捐赠者
 AddDonation=新建捐赠
 NewDonation=新捐赠
 DeleteADonation=删除捐赠
-ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=显示捐赠
+ConfirmDeleteADonation=您确定要删除此捐款吗？
 PublicDonation=市民捐款
 DonationsArea=捐赠区
 DonationStatusPromiseNotValidated=草案承诺
@@ -17,6 +16,7 @@ DonationStatusPromiseNotValidatedShort=草稿
 DonationStatusPromiseValidatedShort=验证
 DonationStatusPaidShort=收稿
 DonationTitle=捐款收据
+DonationDate=Donation date
 DonationDatePayment=付款日期
 ValidPromess=验证承诺
 DonationReceipt=捐款收据
@@ -31,4 +31,4 @@ DONATION_ART200=从CGI显示200笔
 DONATION_ART238=从CGI显示238笔
 DONATION_ART885=从CGI显示885笔
 DonationPayment=捐赠付款
-DonationValidated=Donation %s validated
+DonationValidated=捐赠%s经过验证
diff --git a/htdocs/langs/zh_CN/interventions.lang b/htdocs/langs/zh_CN/interventions.lang
index 2df4889401a..cdeaceb4571 100644
--- a/htdocs/langs/zh_CN/interventions.lang
+++ b/htdocs/langs/zh_CN/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=干预区
 DraftFichinter=干预草稿
 LastModifiedInterventions=最近变更的 %s 干预
 FichinterToProcess=要处理的干预措施
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=随访客户联系
-# Modele numérotation
 PrintProductsOnFichinter=在干预卡上也打印“产品”类型（不仅是服务）
 PrintProductsOnFichinterDetails=从订单生成干预
 UseServicesDurationOnFichinter=使用服务持续时间从订单生成干预
@@ -53,14 +51,16 @@ InterventionStatistics=干预统计
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=默认情况下，干预金额不包括在利润中（在大多数情况下，时间表用于计算花费的时间）。将选项PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT添加到1到home-setup-other以包含它们。
-##### Exports #####
 InterId=干预身份
 InterRef=干预编号
 InterDateCreation=日期创建干预
 InterDuration=持续干预
 InterStatus=现状干预
 InterNote=注意干预
+InterLine=Line of intervention
 InterLineId=线路ID干预
 InterLineDate=行日期干预
 InterLineDuration=线路持续时间干预
 InterLineDesc=线描述干预
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/zh_CN/modulebuilder.lang b/htdocs/langs/zh_CN/modulebuilder.lang
index 259d3ee7b08..3b202541f01 100644
--- a/htdocs/langs/zh_CN/modulebuilder.lang
+++ b/htdocs/langs/zh_CN/modulebuilder.lang
@@ -83,8 +83,8 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=已定义权限的列表
 SeeExamples=见这里的例子
 EnabledDesc=激活此字段的条件（示例：1 或 $conf->global->MYMODULE_MYOPTION）
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index e797f15a346..004d16e024c 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -255,7 +255,7 @@ ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
+ProjectFollowTasks=Follow tasks or time spent
 Usage=Usage
 UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
diff --git a/htdocs/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang
index bf972ed8656..b62d4664b83 100644
--- a/htdocs/langs/zh_CN/website.lang
+++ b/htdocs/langs/zh_CN/website.lang
@@ -57,7 +57,7 @@ NoPageYet=还没有页面
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=有关特定语法提示的帮助
 YouCanEditHtmlSourceckeditor=您可以使用编辑器中的“源”按钮编辑HTML源代码。
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
 ClonePage=克隆页面/容器
 CloneSite=克隆网站
 SiteAdded=Website added
@@ -77,7 +77,7 @@ BlogPost=博客文章
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=创建网站帐户
-BackToListOfThirdParty=返回合伙人列表
+BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=首先停用网站
 MyContainerTitle=我的网站标题
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
diff --git a/htdocs/langs/zh_CN/zapier.lang b/htdocs/langs/zh_CN/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/zh_CN/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
diff --git a/htdocs/langs/zh_HK/accountancy.lang b/htdocs/langs/zh_HK/accountancy.lang
new file mode 100644
index 00000000000..b8ce37a0956
--- /dev/null
+++ b/htdocs/langs/zh_HK/accountancy.lang
@@ -0,0 +1,382 @@
+# Dolibarr language file - en_US - Accountancy (Double entries)
+Accountancy=Accountancy
+Accounting=Accounting
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
+ACCOUNTING_EXPORT_LABEL=Export label
+ACCOUNTING_EXPORT_AMOUNT=Export amount
+ACCOUNTING_EXPORT_DEVISE=Export currency
+Selectformat=Select the format for the file
+ACCOUNTING_EXPORT_FORMAT=Select the format for the file
+ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
+ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
+ThisService=This service
+ThisProduct=This product
+DefaultForService=Default for service
+DefaultForProduct=Default for product
+CantSuggest=Can't suggest
+AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journalization=Journalization
+Journaux=Journals
+JournalFinancial=Financial journals
+BackToChartofaccounts=Return chart of accounts
+Chartofaccounts=Chart of accounts
+CurrentDedicatedAccountingAccount=Current dedicated account
+AssignDedicatedAccountingAccount=New account to assign
+InvoiceLabel=Invoice label
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
+OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
+JournalizationInLedgerStatus=Status of journalization
+AlreadyInGeneralLedger=Already journalized in ledgers
+NotYetInGeneralLedger=Not yet journalized in ledgers
+GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
+DetailByAccount=Show detail by account
+AccountWithNonZeroValues=Accounts with non-zero values
+ListOfAccounts=List of accounts
+CountriesInEEC=Countries in EEC
+CountriesNotInEEC=Countries not in EEC
+CountriesInEECExceptMe=Countries in EEC except %s
+CountriesExceptMe=All countries except %s
+AccountantFiles=Export accounting documents
+
+MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
+MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
+MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+
+AccountancyArea=Accounting area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
+AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
+AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
+
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expenses (miscellaneous taxes). For this, use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
+AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
+AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+
+AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+Selectchartofaccounts=Select active chart of accounts
+ChangeAndLoad=Change and load
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+AccountAccountingShort=Account
+SubledgerAccount=Subledger account
+SubledgerAccountLabel=Subledger account label
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
+AccountAccountingSuggest=Accounting account suggested
+MenuDefaultAccounts=Default accounts
+MenuBankAccounts=Bank accounts
+MenuVatAccounts=Vat accounts
+MenuTaxAccounts=Tax accounts
+MenuExpenseReportAccounts=Expense report accounts
+MenuLoanAccounts=Loan accounts
+MenuProductsAccounts=Product accounts
+MenuClosureAccounts=Closure accounts
+MenuAccountancyClosure=Closure
+MenuAccountancyValidationMovements=Validate movements
+ProductsBinding=Products accounts
+TransferInAccounting=Transfer in accounting
+RegistrationInAccounting=Registration in accounting
+Binding=Binding to accounts
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Vendor invoice binding
+ExpenseReportsVentilation=Expense report binding
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+ValidTransaction=Validate transaction
+WriteBookKeeping=Register transactions in Ledger
+Bookkeeping=Ledger
+AccountBalance=Account balance
+ObjectsRef=Source object ref
+CAHTF=Total purchase vendor before tax
+TotalExpenseReport=Total expense report
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+ExpenseReportLines=Lines of expense reports to bind
+ExpenseReportLinesDone=Bound lines of expense reports
+IntoAccount=Bind line with the accounting account
+TotalForAccount=Total for accounting account
+
+
+Ventilate=Bind
+LineId=Id line
+Processing=Processing
+EndProcessing=Process terminated.
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+LineOfExpenseReport=Line of expense report
+NoAccountSelected=No accounting account selected
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+
+ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
+BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+
+ACCOUNTING_SELL_JOURNAL=Sell journal
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
+ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
+
+ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
+ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
+TransitionalAccount=Transitional bank transfer account
+
+ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
+DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+LabelAccount=Label account
+LabelOperation=Label operation
+Sens=Sens
+LetteringCode=Lettering code
+Lettering=Lettering
+Codejournal=Journal
+JournalLabel=Journal label
+NumPiece=Piece number
+TransactionNumShort=Num. transaction
+AccountingCategory=Personalized groups
+GroupByAccountAccounting=Group by accounting account
+AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
+ByAccounts=By accounts
+ByPredefinedAccountGroups=By predefined groups
+ByPersonalizedAccountGroups=By personalized groups
+ByYear=By year
+NotMatch=Not Set
+DeleteMvt=Delete Ledger lines
+DelMonth=Month to delete
+DelYear=Year to delete
+DelJournal=Journal to delete
+ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+FinanceJournal=Finance journal
+ExpenseReportsJournal=Expense reports journal
+DescFinanceJournal=Finance journal including all the types of payments by bank account
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+FeeAccountNotDefined=Account for fee not defined
+BankAccountNotDefined=Account for bank not defined
+CustomerInvoicePayment=Payment of invoice customer
+ThirdPartyAccount=Third-party account
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+AddCompteFromBK=Add accounting accounts to the group
+ReportThirdParty=List third-party account
+DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
+ListAccounts=List of the accounting accounts
+UnknownAccountForThirdparty=Unknown third-party account. We will use %s
+UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
+ShowOpeningBalance=Show opening balance
+HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
+
+Pcgtype=Group of account
+PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+
+Reconcilable=Reconcilable
+
+TotalVente=Total turnover before tax
+TotalMarge=Total sales margin
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
+Vide=-
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account (only record not already transfered in accountancy are visible)
+DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
+DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
+DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
+DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+
+DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
+OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+ValidateMovements=Validate movements
+DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
+SelectMonthAndValidate=Select month and validate movements
+
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
+Balancing=Balancing
+FicheVentilation=Binding card
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
+NoNewRecordSaved=No more record to journalize
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
+ShowTutorial=Show Tutorial
+NotReconciled=Not reconciled
+
+## Admin
+ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
+CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccountingJournal=Show accounting journal
+NatureOfJournal=Nature of Journal
+AccountingJournalType1=Miscellaneous operations
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
+NumberOfAccountancyEntries=Number of entries
+NumberOfAccountancyMovements=Number of movements
+
+## Export
+ExportDraftJournal=Export draft journal
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export for CEGID Expert Comptabilité
+Modelcsv_COALA=Export for Sage Coala
+Modelcsv_bob50=Export for Sage BOB 50
+Modelcsv_ciel=Export for Sage Ciel Compta or Compta Evolution
+Modelcsv_quadratus=Export for Quadratus QuadraCompta
+Modelcsv_ebp=Export for EBP
+Modelcsv_cogilog=Export for Cogilog
+Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
+Modelcsv_openconcerto=Export for OpenConcerto (Test)
+Modelcsv_configurable=Export CSV Configurable
+Modelcsv_FEC=Export FEC
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+ChartofaccountsId=Chart of accounts Id
+
+## Tools - Init accounting account on product / service
+InitAccountancy=Init accountancy
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
+DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
+Options=Options
+OptionModeProductSell=Mode sales
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
+OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
+OptionModeProductSellDesc=Show all products with accounting account for sales.
+OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
+OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
+OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
+CleanFixHistory=Remove accounting code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
+PredefinedGroups=Predefined groups
+WithoutValidAccount=Without valid dedicated account
+WithValidAccount=With valid dedicated account
+ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
+AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
+
+## Dictionary
+Range=Range of accounting account
+Calculated=Calculated
+Formula=Formula
+
+## Error
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
+ExportNotSupported=The export format setuped is not supported into this page
+BookeppingLineAlreayExists=Lines already existing into bookkeeping
+NoJournalDefined=No journal defined
+Binded=Lines bound
+ToBind=Lines to bind
+UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
+
+## Import
+ImportAccountingEntries=Accounting entries
+DateExport=Date export
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/zh_HK/admin.lang b/htdocs/langs/zh_HK/admin.lang
new file mode 100644
index 00000000000..7eb67d7a4ab
--- /dev/null
+++ b/htdocs/langs/zh_HK/admin.lang
@@ -0,0 +1,2002 @@
+# Dolibarr language file - Source file is en_US - admin
+Foundation=Foundation
+Version=Version
+Publisher=Publisher
+VersionProgram=Version program
+VersionLastInstall=Initial install version
+VersionLastUpgrade=Latest version upgrade
+VersionExperimental=Experimental
+VersionDevelopment=Development
+VersionUnknown=Unknown
+VersionRecommanded=Recommended
+FileCheck=Fileset Integrity Checks
+FileCheckDesc=This tool allows you to check the integrity of files and the setup of your application, comparing each file with the official one. The value of some setup constants may also be checked. You can use this tool to determine if any files have been modified (e.g by a hacker).
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files have been added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when the application is installed from an official package
+XmlNotFound=Xml Integrity File of application not found
+SessionId=Session ID
+SessionSaveHandler=Handler to save sessions
+SessionSavePath=Session save location
+PurgeSessions=Purge of sessions
+ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
+NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow listing all running sessions.
+LockNewSessions=Lock new connections
+ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself? Only user <b>%s</b> will be able to connect after that.
+UnlockNewSessions=Remove connection lock
+YourSession=Your session
+Sessions=Users Sessions
+WebUserGroup=Web server user/group
+NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
+DBStoringCharset=Database charset to store data
+DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
+ClientCharset=Client charset
+ClientSortingCharset=Client collation
+WarningModuleNotActive=Module <b>%s</b> must be enabled
+WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
+DolibarrSetup=Dolibarr install or upgrade
+InternalUser=Internal user
+ExternalUser=External user
+InternalUsers=Internal users
+ExternalUsers=External users
+GUISetup=Display
+SetupArea=Setup
+UploadNewTemplate=Upload new template(s)
+FormToTestFileUploadForm=Form to test file upload (according to setup)
+IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
+RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
+RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
+SecuritySetup=Security setup
+SecurityFilesDesc=Define here options related to security about uploading files.
+ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
+ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
+ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
+DictionarySetup=Dictionary setup
+Dictionary=Dictionaries
+ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
+ErrorCodeCantContainZero=Code can't contain value 0
+DisableJavascript=Disable JavaScript and Ajax functions
+DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
+NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
+JavascriptDisabled=JavaScript disabled
+UsePreviewTabs=Use preview tabs
+ShowPreview=Show preview
+PreviewNotAvailable=Preview not available
+ThemeCurrentlyActive=Theme currently active
+CurrentTimeZone=TimeZone PHP (server)
+MySQLTimeZone=TimeZone MySql (database)
+TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+Space=Space
+Table=Table
+Fields=Fields
+Index=Index
+Mask=Mask
+NextValue=Next value
+NextValueForInvoices=Next value (invoices)
+NextValueForCreditNotes=Next value (credit notes)
+NextValueForDeposit=Next value (down payment)
+NextValueForReplacements=Next value (replacements)
+MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
+MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page
+AntiVirusCommand=Full path to antivirus command
+AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusParam= More parameters on command line
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=Accounting module setup
+UserSetup=User management setup
+MultiCurrencySetup=Multi-currency setup
+MenuLimits=Limits and accuracy
+MenuIdParent=Parent menu ID
+DetailMenuIdParent=ID of parent menu (empty for a top menu)
+DetailPosition=Sort number to define menu position
+AllMenus=All
+NotConfigured=Module/Application not configured
+Active=Active
+SetupShort=Setup
+OtherOptions=Other options
+OtherSetup=Other Setup
+CurrentValueSeparatorDecimal=Decimal separator
+CurrentValueSeparatorThousand=Thousand separator
+Destination=Destination
+IdModule=Module ID
+IdPermissions=Permissions ID
+LanguageBrowserParameter=Parameter %s
+LocalisationDolibarrParameters=Localization parameters
+ClientTZ=Client Time Zone (user)
+ClientHour=Client time (user)
+OSTZ=Server OS Time Zone
+PHPTZ=PHP server Time Zone
+DaylingSavingTime=Daylight saving time
+CurrentHour=PHP Time (server)
+CurrentSessionTimeOut=Current session timeout
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a .htaccess file with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but of the timezone of the server.
+Box=Widget
+Boxes=Widgets
+MaxNbOfLinesForBoxes=Max. number of lines for widgets
+AllWidgetsWereEnabled=All available widgets are enabled
+PositionByDefault=Default order
+Position=Position
+MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
+MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br>Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenuForUsers=Menu for users
+LangFile=.lang file
+Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
+System=System
+SystemInfo=System information
+SystemToolsArea=System tools area
+SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature.
+Purge=Purge
+PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
+PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
+PurgeRunNow=Purge now
+PurgeNothingToDelete=No directory or files to delete.
+PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
+PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
+PurgeAuditEvents=Purge all security events
+ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
+GenerateBackup=Generate backup
+Backup=Backup
+Restore=Restore
+RunCommandSummary=Backup has been launched with the following command
+BackupResult=Backup result
+BackupFileSuccessfullyCreated=Backup file successfully generated
+YouCanDownloadBackupFile=The generated file can now be downloaded
+NoBackupFileAvailable=No backup files available.
+ExportMethod=Export method
+ImportMethod=Import method
+ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
+ImportMySqlDesc=To import a MySQL backup file, you may use phpMyAdmin via your hosting or use the mysql command from the Command line.<br>For example:
+ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
+ImportMySqlCommand=%s %s < mybackupfile.sql
+ImportPostgreSqlCommand=%s %s mybackupfile.sql
+FileNameToGenerate=Filename for backup:
+Compression=Compression
+CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
+CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
+ExportCompatibility=Compatibility of generated export file
+ExportUseMySQLQuickParameter=Use the --quick parameter
+ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
+MySqlExportParameters=MySQL export parameters
+PostgreSqlExportParameters= PostgreSQL export parameters
+UseTransactionnalMode=Use transactional mode
+FullPathToMysqldumpCommand=Full path to mysqldump command
+FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
+AddDropDatabase=Add DROP DATABASE command
+AddDropTable=Add DROP TABLE command
+ExportStructure=Structure
+NameColumn=Name columns
+ExtendedInsert=Extended INSERT
+NoLockBeforeInsert=No lock commands around INSERT
+DelayedInsert=Delayed insert
+EncodeBinariesInHexa=Encode binary data in hexadecimal
+IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
+AutoDetectLang=Autodetect (browser language)
+FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
+BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
+OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
+ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external app/modules
+ModulesDevelopYourModule=Develop your own app/modules
+ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
+DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
+NewModule=New
+FreeModule=Free
+CompatibleUpTo=Compatible with version %s
+NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
+CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
+SeeInMarkerPlace=See in Market place
+SeeSetupOfModule=See setup of module %s
+Updated=Updated
+Nouveauté=Novelty
+AchatTelechargement=Buy / Download
+GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
+DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming may develop a module.
+WebSiteDesc=External websites for more add-on (non-core) modules...
+DevelopYourModuleDesc=Some solutions to develop your own module...
+URL=URL
+RelativeURL=Relative URL
+BoxesAvailable=Widgets available
+BoxesActivated=Widgets activated
+ActivateOn=Activate on
+ActiveOn=Activated on
+SourceFile=Source file
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
+Required=Required
+UsedOnlyWithTypeOption=Used by some agenda option only
+Security=Security
+Passwords=Passwords
+DoNotStoreClearPassword=Encrypt passwords stored in database (NOT as plain-text). It is strongly recommended to activate this option.
+MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
+ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
+Feature=Feature
+DolibarrLicense=License
+Developpers=Developers/contributors
+OfficialWebSite=Dolibarr official web site
+OfficialWebSiteLocal=Local web site (%s)
+OfficialWiki=Dolibarr documentation / Wiki
+OfficialDemo=Dolibarr online demo
+OfficialMarketPlace=Official market place for external modules/addons
+OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
+ReferencedPreferredPartners=Preferred Partners
+OtherResources=Other resources
+ExternalResources=External Resources
+SocialNetworks=Social Networks
+ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
+ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
+HelpCenterDesc2=Some of these resources are only available in <b>english</b>.
+CurrentMenuHandler=Current menu handler
+MeasuringUnit=Measuring unit
+LeftMargin=Left margin
+TopMargin=Top margin
+PaperSize=Paper type
+Orientation=Orientation
+SpaceX=Space X
+SpaceY=Space Y
+FontSize=Font size
+Content=Content
+NoticePeriod=Notice period
+NewByMonth=New by month
+Emails=Emails
+EMailsSetup=Emails setup
+EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EmailSenderProfiles=Emails sender profiles
+EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
+MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix-like systems)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix-like systems)
+MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
+MAIN_MAIL_AUTOCOPY_TO= Copy (Bcc) all sent emails to
+MAIN_DISABLE_ALL_MAILS=Disable all email sending (for test purposes or demos)
+MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
+MAIN_MAIL_SENDMODE=Email sending method
+MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
+MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
+MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
+MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
+MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos)
+MAIN_SMS_SENDMODE=Method to use to send SMS
+MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending
+MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
+UserEmail=User email
+CompanyEmail=Company Email
+FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+ModuleSetup=Module setup
+ModulesSetup=Modules/Application setup
+ModuleFamilyBase=System
+ModuleFamilyCrm=Customer Relationship Management (CRM)
+ModuleFamilySrm=Vendor Relationship Management (VRM)
+ModuleFamilyProducts=Product Management (PM)
+ModuleFamilyHr=Human Resource Management (HR)
+ModuleFamilyProjects=Projects/Collaborative work
+ModuleFamilyOther=Other
+ModuleFamilyTechnic=Multi-modules tools
+ModuleFamilyExperimental=Experimental modules
+ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
+ModuleFamilyECM=Electronic Content Management (ECM)
+ModuleFamilyPortal=Websites and other frontal application
+ModuleFamilyInterface=Interfaces with external systems
+MenuHandlers=Menu handlers
+MenuAdmin=Menu editor
+DoNotUseInProduction=Do not use in production
+ThisIsProcessToFollow=Upgrade procedure:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+StepNb=Step %s
+FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
+DownloadPackageFromWebSite=Download package (for example from the official web site %s).
+UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
+YouCanSubmitFile=You can upload the .zip file of module package from here:
+CurrentVersion=Dolibarr current version
+CallUpdatePage=Browse to the page that updates the database structure and data: %s.
+LastStableVersion=Latest stable version
+LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
+UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
+GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
+GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
+GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
+ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
+ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
+DoTestServerAvailability=Test server connectivity
+DoTestSend=Test sending
+DoTestSendHTML=Test sending HTML
+ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
+UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
+SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
+UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
+DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
+DisableLinkToHelp=Hide link to online help "<b>%s</b>"
+AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
+ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
+MinLength=Minimum length
+LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
+LanguageFile=Language file
+ExamplesWithCurrentSetup=Examples with current configuration
+ListOfDirectories=List of OpenDocument templates directories
+ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
+NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
+FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
+FirstnameNamePosition=Position of Name/Lastname
+DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
+KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
+TestSubmitForm=Input test form
+ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours.
+ThemeDir=Skins directory
+ConnectionTimeout=Connection timeout
+ResponseTimeout=Response timeout
+SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
+ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
+SecurityToken=Key to secure URLs
+NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
+PDF=PDF
+PDFDesc=Global options for PDF generation.
+PDFAddressForging=Rules for address boxes
+HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
+PDFLocaltax=Rules for %s
+HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideDescOnPDF=Hide products description
+HideRefOnPDF=Hide products ref.
+HideDetailsOnPDF=Hide product lines details
+PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+Library=Library
+UrlGenerationParameters=Parameters to secure URLs
+SecurityTokenIsUnique=Use a unique securekey parameter for each URL
+EnterRefToBuildUrl=Enter reference for object %s
+GetSecuredUrl=Get calculated URL
+ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+OldVATRates=Old VAT rate
+NewVATRates=New VAT rate
+PriceBaseTypeToChange=Modify on prices with base reference value defined on
+MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
+String=String
+TextLong=Long text
+HtmlText=Html text
+Int=Integer
+Float=Float
+DateAndTime=Date and hour
+Unique=Unique
+Boolean=Boolean (one checkbox)
+ExtrafieldPhone = Phone
+ExtrafieldPrice = Price
+ExtrafieldMail = Email
+ExtrafieldUrl = Url
+ExtrafieldSelect = Select list
+ExtrafieldSelectList = Select from table
+ExtrafieldSeparator=Separator (not a field)
+ExtrafieldPassword=Password
+ExtrafieldRadio=Radio buttons (one choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
+ExtrafieldLink=Link to an object
+ComputedFormula=Computed field
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+Computedpersistent=Store computed field
+ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
+ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
+ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
+LibraryToBuildPDF=Library used for PDF generation
+LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
+SMS=SMS
+LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
+RefreshPhoneLink=Refresh link
+LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
+KeepEmptyToUseDefault=Keep empty to use default value
+DefaultLink=Default link
+SetAsDefault=Set as default
+ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
+ExternalModule=External module
+InstalledInto=Installed into directory %s
+BarcodeInitForthird-parties=Mass barcode init for third-parties
+BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
+CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
+InitEmptyBarCode=Init value for next %s empty records
+EraseAllCurrentBarCode=Erase all current barcode values
+ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
+AllBarcodeReset=All barcode values have been removed
+NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
+EnableFileCache=Enable file cache
+ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
+NoDetails=No additional details in footer
+DisplayCompanyInfo=Display company address
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
+EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
+ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code
+ModuleCompanyCodePanicum=Return an empty accounting code.
+ModuleCompanyCodeDigitaria=Returns a compound accounting code according to the name of the third party. The code consists of a prefix that can be defined in the first position followed by the number of characters defined in the third party code.
+ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
+ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
+WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+ClickToShowDescription=Click to show description
+DependsOn=This module needs the module(s)
+RequiredBy=This module is required by module(s)
+TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
+PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
+EnableDefaultValues=Enable customization of default values
+EnableOverwriteTranslation=Enable usage of overwritten translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
+AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
+FilesAttachedToEmail=Attach file
+SendEmailsReminders=Send agenda reminders by emails
+davDescription=Setup a WebDAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
+DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
+DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
+DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
+DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
+# Modules
+Module0Name=Users & Groups
+Module0Desc=Users / Employees and Groups management
+Module1Name=Third Parties
+Module1Desc=Companies and contacts management (customers, prospects...)
+Module2Name=Commercial
+Module2Desc=Commercial management
+Module10Name=Accounting (simplified)
+Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
+Module20Name=Proposals
+Module20Desc=Commercial proposal management
+Module22Name=Mass Emailings
+Module22Desc=Manage bulk emailing
+Module23Name=Energy
+Module23Desc=Monitoring the consumption of energies
+Module25Name=Sales Orders
+Module25Desc=Sales order management
+Module30Name=Invoices
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
+Module40Name=Vendors
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
+Module42Name=Debug Logs
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module49Name=Editors
+Module49Desc=Editor management
+Module50Name=Products
+Module50Desc=Management of Products
+Module51Name=Mass mailings
+Module51Desc=Mass paper mailing management
+Module52Name=Stocks
+Module52Desc=Stock management
+Module53Name=Services
+Module53Desc=Management of Services
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or recurring subscriptions)
+Module55Name=Barcodes
+Module55Desc=Barcode management
+Module56Name=Telephony
+Module56Desc=Telephony integration
+Module57Name=Bank Direct Debit payments
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module58Name=ClickToDial
+Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
+Module59Name=Bookmark4u
+Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
+Module60Name=Stickers
+Module60Desc=Management of stickers
+Module70Name=Interventions
+Module70Desc=Intervention management
+Module75Name=Expense and trip notes
+Module75Desc=Expense and trip notes management
+Module80Name=Shipments
+Module80Desc=Shipments and delivery note management
+Module85Name=Banks & Cash
+Module85Desc=Management of bank or cash accounts
+Module100Name=External Site
+Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module105Name=Mailman and SPIP
+Module105Desc=Mailman or SPIP interface for member module
+Module200Name=LDAP
+Module200Desc=LDAP directory synchronization
+Module210Name=PostNuke
+Module210Desc=PostNuke integration
+Module240Name=Data exports
+Module240Desc=Tool to export Dolibarr data (with assistance)
+Module250Name=Data imports
+Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module310Name=Members
+Module310Desc=Foundation members management
+Module320Name=RSS Feed
+Module320Desc=Add a RSS feed to Dolibarr pages
+Module330Name=Bookmarks & Shortcuts
+Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access
+Module400Name=Projects or Leads
+Module400Desc=Management of projects, leads/opportunities and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module410Name=Webcalendar
+Module410Desc=Webcalendar integration
+Module500Name=Taxes & Special Expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
+Module510Name=Salaries
+Module510Desc=Record and track employee payments
+Module520Name=Loans
+Module520Desc=Management of loans
+Module600Name=Notifications on business event
+Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
+Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
+Module610Name=Product Variants
+Module610Desc=Creation of product variants (color, size etc.)
+Module700Name=Donations
+Module700Desc=Donation management
+Module770Name=Expense Reports
+Module770Desc=Manage expense reports claims (transportation, meal, ...)
+Module1120Name=Vendor Commercial Proposals
+Module1120Desc=Request vendor commercial proposal and prices
+Module1200Name=Mantis
+Module1200Desc=Mantis integration
+Module1520Name=Document Generation
+Module1520Desc=Mass email document generation
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module2000Name=WYSIWYG editor
+Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
+Module2200Name=Dynamic Prices
+Module2200Desc=Use maths expressions for auto-generation of prices
+Module2300Name=Scheduled jobs
+Module2300Desc=Scheduled jobs management (alias cron or chrono table)
+Module2400Name=Events/Agenda
+Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
+Module2500Name=DMS / ECM
+Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
+Module2600Name=API/Web services (SOAP server)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API/Web services (REST server)
+Module2610Desc=Enable the Dolibarr REST server providing API services
+Module2660Name=Call WebServices (SOAP client)
+Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
+Module2700Name=Gravatar
+Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
+Module2800Desc=FTP Client
+Module2900Name=GeoIPMaxmind
+Module2900Desc=GeoIP Maxmind conversions capabilities
+Module3200Name=Unalterable Archives
+Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module4000Name=HRM
+Module4000Desc=Human resources management (management of department, employee contracts and feelings)
+Module5000Name=Multi-company
+Module5000Desc=Allows you to manage multiple companies
+Module6000Name=Workflow
+Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module10000Name=Websites
+Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
+Module20000Name=Leave Request Management
+Module20000Desc=Define and track employee leave requests
+Module39000Name=Product Lots
+Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
+Module40000Name=Multicurrency
+Module40000Desc=Use alternative currencies in prices and documents
+Module50000Name=PayBox
+Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50100Name=POS SimplePOS
+Module50100Desc=Point of Sale module SimplePOS (simple POS).
+Module50150Name=POS TakePOS
+Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50200Name=Paypal
+Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50300Name=Stripe
+Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50400Name=Accounting (double entry)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module54000Name=PrintIPP
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
+Module59000Name=Margins
+Module59000Desc=Module to manage margins
+Module60000Name=Commissions
+Module60000Desc=Module to manage commissions
+Module62000Name=Incoterms
+Module62000Desc=Add features to manage Incoterms
+Module63000Name=Resources
+Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
+Permission11=Read customer invoices
+Permission12=Create/modify customer invoices
+Permission13=Unvalidate customer invoices
+Permission14=Validate customer invoices
+Permission15=Send customer invoices by email
+Permission16=Create payments for customer invoices
+Permission19=Delete customer invoices
+Permission21=Read commercial proposals
+Permission22=Create/modify commercial proposals
+Permission24=Validate commercial proposals
+Permission25=Send commercial proposals
+Permission26=Close commercial proposals
+Permission27=Delete commercial proposals
+Permission28=Export commercial proposals
+Permission31=Read products
+Permission32=Create/modify products
+Permission34=Delete products
+Permission36=See/manage hidden products
+Permission38=Export products
+Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
+Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
+Permission44=Delete projects (shared project and projects I'm contact for)
+Permission45=Export projects
+Permission61=Read interventions
+Permission62=Create/modify interventions
+Permission64=Delete interventions
+Permission67=Export interventions
+Permission71=Read members
+Permission72=Create/modify members
+Permission74=Delete members
+Permission75=Setup types of membership
+Permission76=Export data
+Permission78=Read subscriptions
+Permission79=Create/modify subscriptions
+Permission81=Read customers orders
+Permission82=Create/modify customers orders
+Permission84=Validate customers orders
+Permission86=Send customers orders
+Permission87=Close customers orders
+Permission88=Cancel customers orders
+Permission89=Delete customers orders
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
+Permission95=Read reports
+Permission101=Read sendings
+Permission102=Create/modify sendings
+Permission104=Validate sendings
+Permission106=Export sendings
+Permission109=Delete sendings
+Permission111=Read financial accounts
+Permission112=Create/modify/delete and compare transactions
+Permission113=Setup financial accounts (create, manage categories)
+Permission114=Reconcile transactions
+Permission115=Export transactions and account statements
+Permission116=Transfers between accounts
+Permission117=Manage checks dispatching
+Permission121=Read third parties linked to user
+Permission122=Create/modify third parties linked to user
+Permission125=Delete third parties linked to user
+Permission126=Export third parties
+Permission141=Read all projects and tasks (also private projects for which I am not a contact)
+Permission142=Create/modify all projects and tasks (also private projects for which I am not a contact)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
+Permission146=Read providers
+Permission147=Read stats
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejections of direct debit payment orders
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
+Permission171=Read trips and expenses (yours and your subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
+Permission180=Read suppliers
+Permission181=Read purchase orders
+Permission182=Create/modify purchase orders
+Permission183=Validate purchase orders
+Permission184=Approve purchase orders
+Permission185=Order or cancel purchase orders
+Permission186=Receive purchase orders
+Permission187=Close purchase orders
+Permission188=Cancel purchase orders
+Permission192=Create lines
+Permission193=Cancel lines
+Permission194=Read the bandwidth lines
+Permission202=Create ADSL connections
+Permission203=Order connections orders
+Permission204=Order connections
+Permission205=Manage connections
+Permission206=Read connections
+Permission211=Read Telephony
+Permission212=Order lines
+Permission213=Activate line
+Permission214=Setup Telephony
+Permission215=Setup providers
+Permission221=Read emailings
+Permission222=Create/modify emailings (topic, recipients...)
+Permission223=Validate emailings (allows sending)
+Permission229=Delete emailings
+Permission237=View recipients and info
+Permission238=Manually send mailings
+Permission239=Delete mailings after validation or sent
+Permission241=Read categories
+Permission242=Create/modify categories
+Permission243=Delete categories
+Permission244=See the contents of the hidden categories
+Permission251=Read other users and groups
+PermissionAdvanced251=Read other users
+Permission252=Read permissions of other users
+Permission253=Create/modify other users, groups and permissions
+PermissionAdvanced253=Create/modify internal/external users and permissions
+Permission254=Create/modify external users only
+Permission255=Modify other users password
+Permission256=Delete or disable other users
+Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission271=Read CA
+Permission272=Read invoices
+Permission273=Issue invoices
+Permission281=Read contacts
+Permission282=Create/modify contacts
+Permission283=Delete contacts
+Permission286=Export contacts
+Permission291=Read tariffs
+Permission292=Set permissions on the tariffs
+Permission293=Modify customer's tariffs
+Permission300=Read barcodes
+Permission301=Create/modify barcodes
+Permission302=Delete barcodes
+Permission311=Read services
+Permission312=Assign service/subscription to contract
+Permission331=Read bookmarks
+Permission332=Create/modify bookmarks
+Permission333=Delete bookmarks
+Permission341=Read its own permissions
+Permission342=Create/modify his own user information
+Permission343=Modify his own password
+Permission344=Modify its own permissions
+Permission351=Read groups
+Permission352=Read groups permissions
+Permission353=Create/modify groups
+Permission354=Delete or disable groups
+Permission358=Export users
+Permission401=Read discounts
+Permission402=Create/modify discounts
+Permission403=Validate discounts
+Permission404=Delete discounts
+Permission430=Use Debug Bar
+Permission511=Read payments of salaries
+Permission512=Create/modify payments of salaries
+Permission514=Delete payments of salaries
+Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
+Permission531=Read services
+Permission532=Create/modify services
+Permission534=Delete services
+Permission536=See/manage hidden services
+Permission538=Export services
+Permission650=Read Bills of Materials
+Permission651=Create/Update Bills of Materials
+Permission652=Delete Bills of Materials
+Permission701=Read donations
+Permission702=Create/modify donations
+Permission703=Delete donations
+Permission771=Read expense reports (yours and your subordinates)
+Permission772=Create/modify expense reports
+Permission773=Delete expense reports
+Permission774=Read all expense reports (even for user not subordinates)
+Permission775=Approve expense reports
+Permission776=Pay expense reports
+Permission779=Export expense reports
+Permission1001=Read stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
+Permission1004=Read stock movements
+Permission1005=Create/modify stock movements
+Permission1101=Read delivery receipts
+Permission1102=Create/modify delivery receipts
+Permission1104=Validate delivery receipts
+Permission1109=Delete delivery receipts
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
+Permission1181=Read suppliers
+Permission1182=Read purchase orders
+Permission1183=Create/modify purchase orders
+Permission1184=Validate purchase orders
+Permission1185=Approve purchase orders
+Permission1186=Order purchase orders
+Permission1187=Acknowledge receipt of purchase orders
+Permission1188=Delete purchase orders
+Permission1190=Approve (second approval) purchase orders
+Permission1201=Get result of an export
+Permission1202=Create/Modify an export
+Permission1231=Read vendor invoices
+Permission1232=Create/modify vendor invoices
+Permission1233=Validate vendor invoices
+Permission1234=Delete vendor invoices
+Permission1235=Send vendor invoices by email
+Permission1236=Export vendor invoices, attributes and payments
+Permission1237=Export purchase orders and their details
+Permission1251=Run mass imports of external data into database (data load)
+Permission1321=Export customer invoices, attributes and payments
+Permission1322=Reopen a paid bill
+Permission1421=Export sales orders and attributes
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
+Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
+Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
+Permission2411=Read actions (events or tasks) of others
+Permission2412=Create/modify actions (events or tasks) of others
+Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
+Permission2501=Read/Download documents
+Permission2502=Download documents
+Permission2503=Submit or delete documents
+Permission2515=Setup documents directories
+Permission2801=Use FTP client in read mode (browse and download only)
+Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=Delete leave requests
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20006=Admin leave requests (setup and update balance)
+Permission20007=Approve leave requests
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
+Permission50101=Use Point of Sale
+Permission50201=Read transactions
+Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define fiscal periods. Validate transactions and close fiscal periods.
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
+Permission54001=Print
+Permission55001=Read polls
+Permission55002=Create/modify polls
+Permission59001=Read commercial margins
+Permission59002=Define commercial margins
+Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
+DictionaryCompanyType=Third-party types
+DictionaryCompanyJuridicalType=Third-party legal entities
+DictionaryProspectLevel=Prospect potential
+DictionaryCanton=States/Provinces
+DictionaryRegion=Regions
+DictionaryCountry=Countries
+DictionaryCurrency=Currencies
+DictionaryCivility=Honorific titles
+DictionaryActions=Types of agenda events
+DictionarySocialContributions=Types of social or fiscal taxes
+DictionaryVAT=VAT Rates or Sales Tax Rates
+DictionaryRevenueStamp=Amount of tax stamps
+DictionaryPaymentConditions=Payment Terms
+DictionaryPaymentModes=Payment Modes
+DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Website - Type of website pages/containers
+DictionaryEcotaxe=Ecotax (WEEE)
+DictionaryPaperFormat=Paper formats
+DictionaryFormatCards=Card formats
+DictionaryFees=Expense report - Types of expense report lines
+DictionarySendingMethods=Shipping methods
+DictionaryStaff=Number of Employees
+DictionaryAvailability=Delivery delay
+DictionaryOrderMethods=Ordering methods
+DictionarySource=Origin of proposals/orders
+DictionaryAccountancyCategory=Personalized groups for reports
+DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
+DictionaryEMailTemplates=Email Templates
+DictionaryUnits=Units
+DictionaryMeasuringUnits=Measuring Units
+DictionarySocialNetworks=Social Networks
+DictionaryProspectStatus=Prospect status
+DictionaryHolidayTypes=Types of leave
+DictionaryOpportunityStatus=Lead status for project/lead
+DictionaryExpenseTaxCat=Expense report - Transportation categories
+DictionaryExpenseTaxRange=Expense report - Range by transportation category
+SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
+BackToModuleList=Back to Module list
+BackToDictionaryList=Back to Dictionaries list
+TypeOfRevenueStamp=Type of tax stamp
+VATManagement=Sales Tax Management
+VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
+##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
+LTRate=Rate
+LocalTax1IsNotUsed=Do not use second tax
+LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
+LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax1Management=Second type of tax
+LocalTax1IsUsedExample=
+LocalTax1IsNotUsedExample=
+LocalTax2IsNotUsed=Do not use third tax
+LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
+LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax2Management=Third type of tax
+LocalTax2IsUsedExample=
+LocalTax2IsNotUsedExample=
+LocalTax1ManagementES=RE Management
+LocalTax1IsUsedDescES=The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
+LocalTax1IsNotUsedDescES=By default the proposed RE is 0. End of rule.
+LocalTax1IsUsedExampleES=In Spain they are professionals subject to some specific sections of the Spanish IAE.
+LocalTax1IsNotUsedExampleES=In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
+LocalTax2ManagementES=IRPF Management
+LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
+LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
+LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
+LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
+UseRevenueStamp=Use a tax stamp
+UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+CalcLocaltax=Reports on local taxes
+CalcLocaltax1=Sales - Purchases
+CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
+CalcLocaltax2=Purchases
+CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
+CalcLocaltax3=Sales
+CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+LabelUsedByDefault=Label used by default if no translation can be found for code
+LabelOnDocuments=Label on documents
+LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of a configuration constant
+NbOfDays=No. of days
+AtEndOfMonth=At end of month
+CurrentNext=Current/Next
+Offset=Offset
+AlwaysActive=Always active
+Upgrade=Upgrade
+MenuUpgrade=Upgrade / Extend
+AddExtensionThemeModuleOrOther=Deploy/install external app/module
+WebServer=Web server
+DocumentRootServer=Web server's root directory
+DataRootServer=Data files directory
+IP=IP
+Port=Port
+VirtualServerName=Virtual server name
+OS=OS
+PhpWebLink=Web-Php link
+Server=Server
+Database=Database
+DatabaseServer=Database host
+DatabaseName=Database name
+DatabasePort=Database port
+DatabaseUser=Database user
+DatabasePassword=Database password
+Tables=Tables
+TableName=Table name
+NbOfRecord=No. of records
+Host=Server
+DriverType=Driver type
+SummarySystem=System information summary
+SummaryConst=List of all Dolibarr setup parameters
+MenuCompanySetup=Company/Organization
+DefaultMenuManager= Standard menu manager
+DefaultMenuSmartphoneManager=Smartphone menu manager
+Skin=Skin theme
+DefaultSkin=Default skin theme
+MaxSizeList=Max length for list
+DefaultMaxSizeList=Default max length for lists
+DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
+MessageOfDay=Message of the day
+MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
+PermanentLeftSearchForm=Permanent search form on left menu
+DefaultLanguage=Default language
+EnableMultilangInterface=Enable multilanguage support
+EnableShowLogo=Show the company logo in the menu
+CompanyInfo=Company/Organization
+CompanyIds=Company/Organization identities
+CompanyName=Name
+CompanyAddress=Address
+CompanyZip=Zip
+CompanyTown=Town
+CompanyCountry=Country
+CompanyCurrency=Main currency
+CompanyObject=Object of the company
+IDCountry=ID country
+Logo=Logo
+LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
+LogoSquarred=Logo (squarred)
+LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
+DoNotSuggestPaymentMode=Do not suggest
+NoActiveBankAccountDefined=No active bank account defined
+OwnerOfBankAccount=Owner of bank account %s
+BankModuleNotActive=Bank accounts module not enabled
+ShowBugTrackLink=Show link "<strong>%s</strong>"
+Alerts=Alerts
+DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
+DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
+Delays_MAIN_DELAY_ACTIONS_TODO=Planned events (agenda events) not completed
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time
+Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Order not processed
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
+Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation
+Delays_MAIN_DELAY_MEMBERS=Delayed membership fee
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
+Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
+Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
+SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
+SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
+SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
+SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescription5=Other Setup menu entries manage optional parameters.
+LogEvents=Security audit events
+Audit=Audit
+InfoDolibarr=About Dolibarr
+InfoBrowser=About Browser
+InfoOS=About OS
+InfoWebServer=About Web Server
+InfoDatabase=About Database
+InfoPHP=About PHP
+InfoPerf=About Performances
+BrowserName=Browser name
+BrowserOS=Browser OS
+ListOfSecurityEvents=List of Dolibarr security events
+SecurityEventsPurged=Security events purged
+LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
+SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
+SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
+AccountantFileNumber=Accountant code
+DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
+AvailableModules=Available app/modules
+ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
+SessionTimeOut=Time out for session
+SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
+TriggersAvailable=Available triggers
+TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
+TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
+TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
+TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
+TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
+GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
+DictionaryDesc=Insert all reference data. You can add your values to the default.
+ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
+MiscellaneousDesc=All other security related parameters are defined here.
+LimitsSetup=Limits/Precision setup
+LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
+MAIN_MAX_DECIMALS_UNIT=Max. decimals for unit prices
+MAIN_MAX_DECIMALS_TOT=Max. decimals for total prices
+MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
+UnitPriceOfProduct=Net unit price of a product
+TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
+ParameterActiveForNextInputOnly=Parameter effective for next input only
+NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page.
+NoEventFoundWithCriteria=No security event has been found for this search criteria.
+SeeLocalSendMailSetup=See your local sendmail setup
+BackupDesc=A <b>complete</b> backup of a Dolibarr installation requires two steps.
+BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
+BackupDesc3=Backup the structure and contents of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
+BackupDescX=The archived directory should be stored in a secure place.
+BackupDescY=The generated dump file should be stored in a secure place.
+BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
+RestoreDesc=To restore a Dolibarr backup, two steps are required.
+RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
+RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
+RestoreMySQL=MySQL import
+ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+PreviousDumpFiles=Existing backup files
+PreviousArchiveFiles=Existing archive files
+WeekStartOnDay=First day of the week
+RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
+YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
+YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
+DownloadMoreSkins=More skins to download
+SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+ShowProfIdInAddress=Show professional id with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+TranslationUncomplete=Partial translation
+MAIN_DISABLE_METEO=Disable meteorological view
+MeteoStdMod=Standard mode
+MeteoStdModEnabled=Standard mode enabled
+MeteoPercentageMod=Percentage mode
+MeteoPercentageModEnabled=Percentage mode enabled
+MeteoUseMod=Click to use %s
+TestLoginToAPI=Test login to API
+ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
+ExternalAccess=External/Internet Access
+MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet)
+MAIN_PROXY_HOST=Proxy server: Name/Address
+MAIN_PROXY_PORT=Proxy server: Port
+MAIN_PROXY_USER=Proxy server: Login/User
+MAIN_PROXY_PASS=Proxy server: Password
+DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+ExtraFields=Complementary attributes
+ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsThirdParties=Complementary attributes (third party)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
+ExtraFieldsMember=Complementary attributes (member)
+ExtraFieldsMemberType=Complementary attributes (member type)
+ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
+ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
+ExtraFieldsSupplierOrders=Complementary attributes (orders)
+ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
+ExtraFieldsProject=Complementary attributes (projects)
+ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldHasWrongValue=Attribute %s has a wrong value.
+AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
+PathToDocuments=Path to documents
+PathDirectory=Directory
+SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+YouMustEnableOneModule=You must at least enable 1 module
+ClassNotFoundIntoPathWarning=Class %s not found in PHP path
+YesInSummer=Yes in summer
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
+SuhosinSessionEncrypt=Session storage encrypted by Suhosin
+ConditionIsCurrently=Condition is currently %s
+YouUseBestDriver=You use driver %s which is the best driver currently available.
+YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+SearchOptim=Search optimization
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
+BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
+AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
+AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
+FieldEdition=Edition of field %s
+FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
+GetBarCode=Get barcode
+NumberingModules=Numbering models
+##### Module password generation
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
+PasswordGenerationPerso=Return a password according to your personally defined configuration.
+SetupPerso=According to your configuration
+PasswordPatternDesc=Password pattern description
+##### Users setup #####
+RuleForGeneratedPasswords=Rules to generate and validate passwords
+DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
+UsersSetup=Users module setup
+UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
+##### HRM setup #####
+HRMSetup=HRM module setup
+##### Company setup #####
+CompanySetup=Companies module setup
+CompanyCodeChecker=Options for automatic generation of customer/vendor codes
+AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
+NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
+NotificationsDescUser=* per user, one user at a time.
+NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
+NotificationsDescGlobal=* or by setting global email addresses in this setup page.
+ModelModules=Document Templates
+DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
+WatermarkOnDraft=Watermark on draft document
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
+CompanyIdProfChecker=Rules for Professional IDs
+MustBeUnique=Must be unique?
+MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
+MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
+WebDavServer=Root URL of %s server: %s
+##### Webcal setup #####
+WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
+##### Invoices #####
+BillsSetup=Invoices module setup
+BillsNumberingModule=Invoices and credit notes numbering model
+BillsPDFModules=Invoice documents models
+BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
+PaymentsPDFModules=Payment documents models
+ForceInvoiceDate=Force invoice date to validation date
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
+SuggestPaymentByChequeToAddress=Suggest payment by check to
+FreeLegalTextOnInvoices=Free text on invoices
+WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
+PaymentsNumberingModule=Payments numbering model
+SuppliersPayment=Vendor payments
+SupplierPaymentSetup=Vendor payments setup
+##### Proposals #####
+PropalSetup=Commercial proposals module setup
+ProposalsNumberingModules=Commercial proposal numbering models
+ProposalsPDFModules=Commercial proposal documents models
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+FreeLegalTextOnProposal=Free text on commercial proposals
+WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
+##### Suppliers Orders #####
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
+##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+OrdersSetup=Sales Orders management setup
+OrdersNumberingModules=Orders numbering models
+OrdersModelModule=Order documents models
+FreeLegalTextOnOrders=Free text on orders
+WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+##### Interventions #####
+InterventionsSetup=Interventions module setup
+FreeLegalTextOnInterventions=Free text on intervention documents
+FicheinterNumberingModules=Intervention numbering models
+TemplatePDFInterventions=Intervention card documents models
+WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+##### Contracts #####
+ContractsSetup=Contracts/Subscriptions module setup
+ContractsNumberingModules=Contracts numbering modules
+TemplatePDFContracts=Contracts documents models
+FreeLegalTextOnContracts=Free text on contracts
+WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+##### Members #####
+MembersSetup=Members module setup
+MemberMainOptions=Main options
+AdherentLoginRequired= Manage a Login for each member
+AdherentMailRequired=Email required to create a new member
+MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
+MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+##### LDAP setup #####
+LDAPSetup=LDAP Setup
+LDAPGlobalParameters=Global parameters
+LDAPUsersSynchro=Users
+LDAPGroupsSynchro=Groups
+LDAPContactsSynchro=Contacts
+LDAPMembersSynchro=Members
+LDAPMembersTypesSynchro=Members types
+LDAPSynchronization=LDAP synchronisation
+LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
+LDAPToDolibarr=LDAP -> Dolibarr
+DolibarrToLDAP=Dolibarr -> LDAP
+LDAPNamingAttribute=Key in LDAP
+LDAPSynchronizeUsers=Organization of users in LDAP
+LDAPSynchronizeGroups=Organization of groups in LDAP
+LDAPSynchronizeContacts=Organization of contacts in LDAP
+LDAPSynchronizeMembers=Organization of foundation's members in LDAP
+LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
+LDAPPrimaryServer=Primary server
+LDAPSecondaryServer=Secondary server
+LDAPServerPort=Server port
+LDAPServerPortExample=Default port: 389
+LDAPServerProtocolVersion=Protocol version
+LDAPServerUseTLS=Use TLS
+LDAPServerUseTLSExample=Your LDAP server use TLS
+LDAPServerDn=Server DN
+LDAPAdminDn=Administrator DN
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
+LDAPPassword=Administrator password
+LDAPUserDn=Users' DN
+LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
+LDAPGroupDn=Groups' DN
+LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
+LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
+LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
+LDAPDnSynchroActive=Users and groups synchronization
+LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
+LDAPDnContactActive=Contacts' synchronization
+LDAPDnContactActiveExample=Activated/Unactivated synchronization
+LDAPDnMemberActive=Members' synchronization
+LDAPDnMemberActiveExample=Activated/Unactivated synchronization
+LDAPDnMemberTypeActive=Members types' synchronization
+LDAPDnMemberTypeActiveExample=Activated/Unactivated synchronization
+LDAPContactDn=Dolibarr contacts' DN
+LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
+LDAPMemberDn=Dolibarr members DN
+LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
+LDAPMemberObjectClassList=List of objectClass
+LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPMemberTypeDn=Dolibarr members types DN
+LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeObjectClassList=List of objectClass
+LDAPMemberTypeObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPUserObjectClassList=List of objectClass
+LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPGroupObjectClassList=List of objectClass
+LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPContactObjectClassList=List of objectClass
+LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPTestConnect=Test LDAP connection
+LDAPTestSynchroContact=Test contacts synchronization
+LDAPTestSynchroUser=Test user synchronization
+LDAPTestSynchroGroup=Test group synchronization
+LDAPTestSynchroMember=Test member synchronization
+LDAPTestSynchroMemberType=Test member type synchronization
+LDAPTestSearch= Test a LDAP search
+LDAPSynchroOK=Synchronization test successful
+LDAPSynchroKO=Failed synchronization test
+LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
+LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
+LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
+LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPSetupForVersion3=LDAP server configured for version 3
+LDAPSetupForVersion2=LDAP server configured for version 2
+LDAPDolibarrMapping=Dolibarr Mapping
+LDAPLdapMapping=LDAP Mapping
+LDAPFieldLoginUnix=Login (unix)
+LDAPFieldLoginExample=Example: uid
+LDAPFilterConnection=Search filter
+LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPFieldLoginSamba=Login (samba, activedirectory)
+LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldFullname=Full name
+LDAPFieldFullnameExample=Example: cn
+LDAPFieldPasswordNotCrypted=Password not encrypted
+LDAPFieldPasswordCrypted=Password encrypted
+LDAPFieldPasswordExample=Example: userPassword
+LDAPFieldCommonNameExample=Example: cn
+LDAPFieldName=Name
+LDAPFieldNameExample=Example: sn
+LDAPFieldFirstName=First name
+LDAPFieldFirstNameExample=Example: givenName
+LDAPFieldMail=Email address
+LDAPFieldMailExample=Example: mail
+LDAPFieldPhone=Professional phone number
+LDAPFieldPhoneExample=Example: telephonenumber
+LDAPFieldHomePhone=Personal phone number
+LDAPFieldHomePhoneExample=Example: homephone
+LDAPFieldMobile=Cellular phone
+LDAPFieldMobileExample=Example: mobile
+LDAPFieldFax=Fax number
+LDAPFieldFaxExample=Example: facsimiletelephonenumber
+LDAPFieldAddress=Street
+LDAPFieldAddressExample=Example: street
+LDAPFieldZip=Zip
+LDAPFieldZipExample=Example: postalcode
+LDAPFieldTown=Town
+LDAPFieldTownExample=Example: l
+LDAPFieldCountry=Country
+LDAPFieldDescription=Description
+LDAPFieldDescriptionExample=Example: description
+LDAPFieldNotePublic=Public Note
+LDAPFieldNotePublicExample=Example: publicnote
+LDAPFieldGroupMembers= Group members
+LDAPFieldGroupMembersExample= Example: uniqueMember
+LDAPFieldBirthdate=Birthdate
+LDAPFieldCompany=Company
+LDAPFieldCompanyExample=Example: o
+LDAPFieldSid=SID
+LDAPFieldSidExample=Example: objectsid
+LDAPFieldEndLastSubscription=Date of subscription end
+LDAPFieldTitle=Job position
+LDAPFieldTitleExample=Example: title
+LDAPFieldGroupid=Group id
+LDAPFieldGroupidExample=Exemple : gidnumber
+LDAPFieldUserid=User id
+LDAPFieldUseridExample=Exemple : uidnumber
+LDAPFieldHomedirectory=Home directory
+LDAPFieldHomedirectoryExample=Exemple : homedirectory
+LDAPFieldHomedirectoryprefix=Home directory prefix
+LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
+LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
+LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
+LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
+LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
+LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
+LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use thoose values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all thoose schemas loaded.
+ForANonAnonymousAccess=For an authenticated access (for a write access for example)
+PerfDolibarr=Performance setup/optimizing report
+YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
+NotInstalled=Not installed, so your server is not slowed down by this.
+ApplicativeCache=Applicative cache
+MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
+MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
+MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
+OPCodeCache=OPCode cache
+NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
+HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
+FilesOfTypeCached=Files of type %s are cached by HTTP server
+FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
+FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
+FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
+CacheByServer=Cache by server
+CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
+CacheByClient=Cache by browser
+CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
+DefaultCreateForm=Default values (to use on forms)
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
+DefaultMandatory=Mandatory form fields
+##### Products #####
+ProductSetup=Products module setup
+ServiceSetup=Services module setup
+ProductServiceSetup=Products and Services modules setup
+NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
+ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in the language of the third party
+UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
+SetDefaultBarcodeTypeProducts=Default barcode type to use for products
+SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
+ProductCodeChecker= Module for product code generation and checking (product or service)
+ProductOtherConf= Product / Service configuration
+IsNotADir=is not a directory!
+##### Syslog #####
+SyslogSetup=Logs module setup
+SyslogOutput=Logs outputs
+SyslogFacility=Facility
+SyslogLevel=Level
+SyslogFilename=File name and path
+YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
+ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
+OnlyWindowsLOG_USER=Windows only supports LOG_USER
+CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+##### Donations #####
+DonationsSetup=Donation module setup
+DonationsReceiptModel=Template of donation receipt
+##### Barcode #####
+BarcodeSetup=Barcode setup
+PaperFormatModule=Print format module
+BarcodeEncodeModule=Barcode encoding type
+CodeBarGenerator=Barcode generator
+ChooseABarCode=No generator defined
+FormatNotSupportedByGenerator=Format not supported by this generator
+BarcodeDescEAN8=Barcode of type EAN8
+BarcodeDescEAN13=Barcode of type EAN13
+BarcodeDescUPC=Barcode of type UPC
+BarcodeDescISBN=Barcode of type ISBN
+BarcodeDescC39=Barcode of type C39
+BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
+GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
+BarcodeInternalEngine=Internal engine
+BarCodeNumberManager=Manager to auto define barcode numbers
+##### Prelevements #####
+WithdrawalsSetup=Setup of module Direct Debit payments
+##### ExternalRSS #####
+ExternalRSSSetup=External RSS imports setup
+NewRSS=New RSS Feed
+RSSUrl=RSS URL
+RSSUrlExample=An interesting RSS feed
+##### Mailing #####
+MailingSetup=EMailing module setup
+MailingEMailFrom=Sender email (From) for emails sent by emailing module
+MailingEMailError=Return Email (Errors-to) for emails with errors
+MailingDelay=Seconds to wait after sending next message
+##### Notification #####
+NotificationSetup=Email Notification module setup
+NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
+FixedEmailTarget=Recipient
+##### Sendings #####
+SendingsSetup=Shipping module setup
+SendingsReceiptModel=Sending receipt model
+SendingsNumberingModules=Sendings numbering modules
+SendingsAbility=Support shipping sheets for customer deliveries
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
+FreeLegalTextOnShippings=Free text on shipments
+##### Deliveries #####
+DeliveryOrderNumberingModules=Products deliveries receipt numbering module
+DeliveryOrderModel=Products deliveries receipt model
+DeliveriesOrderAbility=Support products deliveries receipts
+FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+##### FCKeditor #####
+AdvancedEditor=Advanced editor
+ActivateFCKeditor=Activate advanced editor for:
+FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
+FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
+FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
+FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
+FCKeditorForTicket=WYSIWIG creation/edition for tickets
+##### Stock #####
+StockSetup=Stock module setup
+IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+##### Menu #####
+MenuDeleted=Menu deleted
+Menus=Menus
+TreeMenuPersonalized=Personalized menus
+NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
+NewMenu=New menu
+Menu=Selection of menu
+MenuHandler=Menu handler
+MenuModule=Source module
+HideUnauthorizedMenu= Hide unauthorized menus (gray)
+DetailId=Id menu
+DetailMenuHandler=Menu handler where to show new menu
+DetailMenuModule=Module name if menu entry come from a module
+DetailType=Type of menu (top or left)
+DetailTitre=Menu label or label code for translation
+DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
+DetailEnabled=Condition to show or not entry
+DetailRight=Condition to display unauthorized grey menus
+DetailLangs=Lang file name for label code translation
+DetailUser=Intern / Extern / All
+Target=Target
+DetailTarget=Target for links (_blank top opens a new window)
+DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
+ModifMenu=Menu change
+DeleteMenu=Delete menu entry
+ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
+FailedToInitializeMenu=Failed to initialize menu
+##### Tax #####
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
+OptionVatMode=VAT due
+OptionVATDefault=Standard basis
+OptionVATDebitOption=Accrual basis
+OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
+OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
+SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option:
+OnDelivery=On delivery
+OnPayment=On payment
+OnInvoice=On invoice
+SupposedToBePaymentDate=Payment date used
+SupposedToBeInvoiceDate=Invoice date used
+Buy=Buy
+Sell=Sell
+InvoiceDateUsed=Invoice date used
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
+AccountancyCode=Accounting Code
+AccountancyCodeSell=Sale account. code
+AccountancyCodeBuy=Purchase account. code
+##### Agenda #####
+AgendaSetup=Events and agenda module setup
+PasswordTogetVCalExport=Key to authorize export link
+PastDelayVCalExport=Do not export event older than
+AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
+AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
+AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
+AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
+ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+##### Point Of Sale (CashDesk) #####
+CashDesk=Point of Sale
+CashDeskSetup=Point of Sales module setup
+CashDeskThirdPartyForSell=Default generic third party to use for sales
+CashDeskBankAccountForSell=Default account to use to receive cash payments
+CashDeskBankAccountForCheque=Default account to use to receive payments by check
+CashDeskBankAccountForCB=Default account to use to receive payments by credit cards
+CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with module Serial/Lot management (currently active) so stock decrease is disabled.
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
+CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
+CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
+CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+##### Bookmark #####
+BookmarkSetup=Bookmark module setup
+BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
+NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
+##### WebServices #####
+WebServicesSetup=Webservices module setup
+WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
+WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
+EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
+ApiExporerIs=You can explore and test the APIs at URL
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+##### Bank #####
+BankSetupModule=Bank module setup
+FreeLegalTextOnChequeReceipts=Free text on check receipts
+BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
+BankOrderGlobal=General
+BankOrderGlobalDesc=General display order
+BankOrderES=Spanish
+BankOrderESDesc=Spanish display order
+ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+##### Multicompany #####
+MultiCompanySetup=Multi-company module setup
+##### Suppliers #####
+SuppliersSetup=Vendor module setup
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
+SuppliersInvoiceModel=Complete template of Vendor Invoice
+SuppliersInvoiceNumberingModel=Vendor invoices numbering models
+IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
+##### GeoIPMaxmind #####
+GeoIPMaxmindSetup=GeoIP Maxmind module setup
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
+NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
+YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
+YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
+TestGeoIPResult=Test of a conversion IP -> country
+##### Projects #####
+ProjectsNumberingModules=Projects numbering module
+ProjectsSetup=Project module setup
+ProjectsModelModule=Project reports document model
+TasksNumberingModules=Tasks numbering module
+TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
+##### ECM (GED) #####
+##### Fiscal Year #####
+AccountingPeriods=Accounting periods
+AccountingPeriodCard=Accounting period
+NewFiscalYear=New accounting period
+OpenFiscalYear=Open accounting period
+CloseFiscalYear=Close accounting period
+DeleteFiscalYear=Delete accounting period
+ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
+ShowFiscalYear=Show accounting period
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
+Format=Format
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
+IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
+ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
+ExpenseReportNumberingModules=Expense reports numbering module
+NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerUser=List of automatic notifications per user*
+ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
+ListOfFixedNotifications=List of automatic fixed notifications
+GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+Threshold=Threshold
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
+SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
+SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
+HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+TextTitleColor=Text color of Page title
+LinkColor=Color of links
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
+MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
+NbAddedAutomatically=Number of days added to counters of users (automatically) each month
+EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+Enter0or1=Enter 0 or 1
+UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
+PositionIntoComboList=Position of line into combo lists
+SellTaxRate=Sale tax rate
+RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
+UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
+OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
+TemplateForElement=This template record is dedicated to which element
+TypeOfTemplate=Type of template
+TemplateIsVisibleByOwnerOnly=Template is visible to owner only
+VisibleEverywhere=Visible everywhere
+VisibleNowhere=Visible nowhere
+FixTZ=TimeZone fix
+FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
+ExpectedChecksum=Expected Checksum
+CurrentChecksum=Current Checksum
+ExpectedSize=Expected size
+CurrentSize=Current size
+ForcedConstants=Required constant values
+MailToSendProposal=Customer proposals
+MailToSendOrder=Sales orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Shipments
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracts
+MailToThirdparty=Third parties
+MailToMember=Members
+MailToUser=Users
+MailToProject=Projects page
+ByDefaultInList=Show by default on list view
+YouUseLastStableVersion=You use the latest stable version
+TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
+TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
+SeeChangeLog=See ChangeLog file (english only)
+AllPublishers=All publishers
+UnknownPublishers=Unknown publishers
+AddRemoveTabs=Add or remove tabs
+AddDataTables=Add object tables
+AddDictionaries=Add dictionaries tables
+AddData=Add objects or dictionaries data
+AddBoxes=Add widgets
+AddSheduledJobs=Add scheduled jobs
+AddHooks=Add hooks
+AddTriggers=Add triggers
+AddMenus=Add menus
+AddPermissions=Add permissions
+AddExportProfiles=Add export profiles
+AddImportProfiles=Add import profiles
+AddOtherPagesOrServices=Add other pages or services
+AddModels=Add document or numbering templates
+AddSubstitutions=Add keys substitutions
+DetectionNotPossible=Detection not possible
+UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
+ListOfAvailableAPIs=List of available APIs
+activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
+CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
+UserHasNoPermissions=This user has no permissions defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
+BaseCurrency=Reference currency of the company (go into setup of company to change this)
+WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
+WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
+MAIN_PDF_MARGIN_LEFT=Left margin on PDF
+MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
+MAIN_PDF_MARGIN_TOP=Top margin on PDF
+MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+NothingToSetup=There is no specific setup required for this module.
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Several language variants found
+RemoveSpecialChars=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
+GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
+GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
+HelpOnTooltip=Help text to show on tooltip
+HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
+YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
+ChartLoaded=Chart of account loaded
+SocialNetworkSetup=Setup of module Social Networks
+EnableFeatureFor=Enable features for <strong>%s</strong>
+VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+EmailCollector=Email collector
+EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
+NewEmailCollector=New Email Collector
+EMailHost=Host of email IMAP server
+MailboxSourceDirectory=Mailbox source directory
+MailboxTargetDirectory=Mailbox target directory
+EmailcollectorOperations=Operations to do by collector
+MaxEmailCollectPerCollect=Max number of emails collected per collect
+CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
+DateLastCollectResult=Date latest collect tried
+DateLastcollectResultOk=Date latest collect successfull
+LastResult=Latest result
+EmailCollectorConfirmCollectTitle=Email collect confirmation
+EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
+NoNewEmailToProcess=No new email (matching filters) to process
+NothingProcessed=Nothing done
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+RecordEvent=Record email event
+CreateLeadAndThirdParty=Create lead (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CodeLastResult=Latest result code
+NbOfEmailsInInbox=Number of emails in source directory
+LoadThirdPartyFromName=Load third party searching on %s (load only)
+LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+WithDolTrackingID=Dolibarr Reference found in Message ID
+WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+FormatZip=Zip
+MainMenuCode=Menu entry code (mainmenu)
+ECMAutoTree=Show automatic ECM tree
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OpeningHours=Opening hours
+OpeningHoursDesc=Enter here the regular opening hours of your company.
+ResourceSetup=Configuration of Resource module
+UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
+EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
+ConfirmUnactivation=Confirm module reset
+OnMobileOnly=On small screen (smartphone) only
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
+Protanopia=Protanopia
+Deuteranopes=Deuteranopes
+Tritanopes=Tritanopes
+ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
+DefaultCustomerType=Default thirdparty type for "New customer" creation form
+ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
+RootCategoryForProductsToSell=Root category of products to sell
+RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
+DebugBar=Debug Bar
+DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
+DebugBarSetup=DebugBar Setup
+GeneralOptions=General Options
+LogsLinesNumber=Number of lines to show on logs tab
+UseDebugBar=Use the debug bar
+DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
+WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
+ModuleActivated=Module %s is activated and slows the interface
+EXPORTS_SHARE_MODELS=Export models are share with everybody
+ExportSetup=Setup of module Export
+ImportSetup=Setup of module Import
+InstanceUniqueID=Unique ID of the instance
+SmallerThan=Smaller than
+LargerThan=Larger than
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
+EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
+RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
+AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+IPListExample=127.0.0.1 192.168.0.2 [::1]
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
+FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
+EmailTemplate=Template for email
+EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
+FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
diff --git a/htdocs/langs/zh_HK/agenda.lang b/htdocs/langs/zh_HK/agenda.lang
new file mode 100644
index 00000000000..2031241d2c9
--- /dev/null
+++ b/htdocs/langs/zh_HK/agenda.lang
@@ -0,0 +1,154 @@
+# Dolibarr language file - Source file is en_US - agenda
+IdAgenda=ID event
+Actions=Events
+Agenda=Agenda
+TMenuAgenda=Agenda
+Agendas=Agendas
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+ActionsOwnedByShort=Owner
+AffectedTo=Assigned to
+Event=Event
+Events=Events
+EventsNb=Number of events
+ListOfActions=List of events
+EventReports=Event reports
+Location=Location
+ToUserOfGroup=To any user in group
+EventOnFullDay=Event on all day(s)
+MenuToDoActions=All incomplete events
+MenuDoneActions=All terminated events
+MenuToDoMyActions=My incomplete events
+MenuDoneMyActions=My terminated events
+ListOfEvents=List of events (internal calendar)
+ActionsAskedBy=Events reported by
+ActionsToDoBy=Events assigned to
+ActionsDoneBy=Events done by
+ActionAssignedTo=Event assigned to
+ViewCal=Month view
+ViewDay=Day view
+ViewWeek=Week view
+ViewPerUser=Per user view
+ViewPerType=Per type view
+AutoActions= Automatic filling
+AgendaAutoActionDesc= Here you may define events which you want Dolibarr to create automatically  in Agenda. If nothing is checked, only manual actions will be included in logs and displayed in Agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
+AgendaSetupOtherDesc= This page provides options to allow the export of your Dolibarr events into an external calendar (Thunderbird, Google Calendar etc...)
+AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
+ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
+EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
+##### Agenda event labels #####
+NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
+ContractValidatedInDolibarr=Contract %s validated
+CONTRACT_DELETEInDolibarr=Contract %s deleted
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
+InvoiceDeleteDolibarr=Invoice %s deleted
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+MemberValidatedInDolibarr=Member %s validated
+MemberModifiedInDolibarr=Member %s modified
+MemberResiliatedInDolibarr=Member %s terminated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
+ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
+ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
+ShipmentDeletedInDolibarr=Shipment %s deleted
+OrderCreatedInDolibarr=Order %s created
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
+OrderApprovedInDolibarr=Order %s approved
+OrderRefusedInDolibarr=Order %s refused
+OrderBackToDraftInDolibarr=Order %s go back to draft status
+ProposalSentByEMail=Commercial proposal %s sent by email
+ContractSentByEMail=Contract %s sent by email
+OrderSentByEMail=Sales order %s sent by email
+InvoiceSentByEMail=Customer invoice %s sent by email
+SupplierOrderSentByEMail=Purchase order %s sent by email
+ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
+SupplierInvoiceSentByEMail=Vendor invoice %s sent by email
+ShippingSentByEMail=Shipment %s sent by email
+ShippingValidated= Shipment %s validated
+InterventionSentByEMail=Intervention %s sent by email
+ProposalDeleted=Proposal deleted
+OrderDeleted=Order deleted
+InvoiceDeleted=Invoice deleted
+DraftInvoiceDeleted=Draft invoice deleted
+PRODUCT_CREATEInDolibarr=Product %s created
+PRODUCT_MODIFYInDolibarr=Product %s modified
+PRODUCT_DELETEInDolibarr=Product %s deleted
+HOLIDAY_CREATEInDolibarr=Request for leave %s created
+HOLIDAY_MODIFYInDolibarr=Request for leave %s modified
+HOLIDAY_APPROVEInDolibarr=Request for leave %s approved
+HOLIDAY_VALIDATEInDolibarr=Request for leave %s validated
+HOLIDAY_DELETEInDolibarr=Request for leave %s deleted
+EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created
+EXPENSE_REPORT_VALIDATEInDolibarr=Expense report %s validated
+EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved
+EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted
+EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused
+PROJECT_CREATEInDolibarr=Project %s created
+PROJECT_MODIFYInDolibarr=Project %s modified
+PROJECT_DELETEInDolibarr=Project %s deleted
+TICKET_CREATEInDolibarr=Ticket %s created
+TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
+TICKET_CLOSEInDolibarr=Ticket %s closed
+TICKET_DELETEInDolibarr=Ticket %s deleted
+BOM_VALIDATEInDolibarr=BOM validated
+BOM_UNVALIDATEInDolibarr=BOM unvalidated
+BOM_CLOSEInDolibarr=BOM disabled
+BOM_REOPENInDolibarr=BOM reopen
+BOM_DELETEInDolibarr=BOM deleted
+MRP_MO_VALIDATEInDolibarr=MO validated
+MRP_MO_PRODUCEDInDolibarr=MO produced
+MRP_MO_DELETEInDolibarr=MO deleted
+##### End agenda events #####
+AgendaModelModule=Document templates for event
+DateActionStart=Start date
+DateActionEnd=End date
+AgendaUrlOptions1=You can also add following parameters to filter output:
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
+AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
+AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
+AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaHideBirthdayEvents=Hide birthdays of contacts
+Busy=Busy
+ExportDataset_event1=List of agenda events
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
+# External Sites ical
+ExportCal=Export calendar
+ExtSites=Import external calendars
+ExtSitesEnableThisTool=Show external calendars (defined in global setup) in Agenda. Does not affect external calendars defined by users.
+ExtSitesNbOfAgenda=Number of calendars
+AgendaExtNb=Calendar no. %s
+ExtSiteUrlAgenda=URL to access .ical file
+ExtSiteNoLabel=No Description
+VisibleTimeRange=Visible time range
+VisibleDaysRange=Visible days range
+AddEvent=Create event
+MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
+RepeatEvent=Repeat event
+EveryWeek=Every week
+EveryMonth=Every month
+DayOfMonth=Day of month
+DayOfWeek=Day of week
+DateStartPlusOne=Date start + 1 hour
diff --git a/htdocs/langs/zh_HK/assets.lang b/htdocs/langs/zh_HK/assets.lang
new file mode 100644
index 00000000000..ef04723c6c2
--- /dev/null
+++ b/htdocs/langs/zh_HK/assets.lang
@@ -0,0 +1,65 @@
+# Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+Assets = Assets
+NewAsset = New asset
+AccountancyCodeAsset = Accounting code (asset)
+AccountancyCodeDepreciationAsset = Accounting code (depreciation asset account)
+AccountancyCodeDepreciationExpense = Accounting code (depreciation expense account)
+NewAssetType=New asset type
+AssetsTypeSetup=Asset type setup
+AssetTypeModified=Asset type modified
+AssetType=Asset type
+AssetsLines=Assets
+DeleteType=Delete
+DeleteAnAssetType=Delete an asset type
+ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
+ShowTypeCard=Show type '%s'
+
+# Module label 'ModuleAssetsName'
+ModuleAssetsName = Assets
+# Module description 'ModuleAssetsDesc'
+ModuleAssetsDesc = Assets description
+
+#
+# Admin page
+#
+AssetsSetup = Assets setup
+Settings = Settings
+AssetsSetupPage = Assets setup page
+ExtraFieldsAssetsType = Complementary attributes (Asset type)
+AssetsType=Asset type
+AssetsTypeId=Asset type id
+AssetsTypeLabel=Asset type label
+AssetsTypes=Assets types
+
+#
+# Menu
+#
+MenuAssets = Assets
+MenuNewAsset = New asset
+MenuTypeAssets = Type assets
+MenuListAssets = List
+MenuNewTypeAssets = New
+MenuListTypeAssets = List
+
+#
+# Module
+#
+NewAssetType=New asset type
+NewAsset=New asset
diff --git a/htdocs/langs/zh_HK/banks.lang b/htdocs/langs/zh_HK/banks.lang
new file mode 100644
index 00000000000..e54239e9fb2
--- /dev/null
+++ b/htdocs/langs/zh_HK/banks.lang
@@ -0,0 +1,175 @@
+# Dolibarr language file - Source file is en_US - banks
+Bank=Bank
+MenuBankCash=Banks | Cash
+MenuVariousPayment=Miscellaneous payments
+MenuNewVariousPayment=New Miscellaneous payment
+BankName=Bank name
+FinancialAccount=Account
+BankAccount=Bank account
+BankAccounts=Bank accounts
+BankAccountsAndGateways=Bank accounts | Gateways
+ShowAccount=Show Account
+AccountRef=Financial account ref
+AccountLabel=Financial account label
+CashAccount=Cash account
+CashAccounts=Cash accounts
+CurrentAccounts=Current accounts
+SavingAccounts=Savings accounts
+ErrorBankLabelAlreadyExists=Financial account label already exists
+BankBalance=Balance
+BankBalanceBefore=Balance before
+BankBalanceAfter=Balance after
+BalanceMinimalAllowed=Minimum allowed balance
+BalanceMinimalDesired=Minimum desired balance
+InitialBankBalance=Initial balance
+EndBankBalance=End balance
+CurrentBalance=Current balance
+FutureBalance=Future balance
+ShowAllTimeBalance=Show balance from start
+AllTime=From start
+Reconciliation=Reconciliation
+RIB=Bank Account Number
+IBAN=IBAN number
+BIC=BIC/SWIFT code
+SwiftValid=BIC/SWIFT valid
+SwiftVNotalid=BIC/SWIFT not valid
+IbanValid=BAN valid
+IbanNotValid=BAN not valid
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
+AccountStatement=Account statement
+AccountStatementShort=Statement
+AccountStatements=Account statements
+LastAccountStatements=Last account statements
+IOMonthlyReporting=Monthly reporting
+BankAccountDomiciliation=Bank address
+BankAccountCountry=Account country
+BankAccountOwner=Account owner name
+BankAccountOwnerAddress=Account owner address
+RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
+CreateAccount=Create account
+NewBankAccount=New account
+NewFinancialAccount=New financial account
+MenuNewFinancialAccount=New financial account
+EditFinancialAccount=Edit account
+LabelBankCashAccount=Bank or cash label
+AccountType=Account type
+BankType0=Savings account
+BankType1=Current or credit card account
+BankType2=Cash account
+AccountsArea=Accounts area
+AccountCard=Account card
+DeleteAccount=Delete account
+ConfirmDeleteAccount=Are you sure you want to delete this account?
+Account=Account
+BankTransactionByCategories=Bank entries by categories
+BankTransactionForCategory=Bank entries for category <b>%s</b>
+RemoveFromRubrique=Remove link with category
+RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
+ListBankTransactions=List of bank entries
+IdTransaction=Transaction ID
+BankTransactions=Bank entries
+BankTransaction=Bank entry
+ListTransactions=List entries
+ListTransactionsByCategory=List entries/category
+TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
+Conciliable=Can be reconciled
+Conciliate=Reconcile
+Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
+ReconciliationLate=Reconciliation late
+IncludeClosedAccount=Include closed accounts
+OnlyOpenedAccount=Only open accounts
+AccountToCredit=Account to credit
+AccountToDebit=Account to debit
+DisableConciliation=Disable reconciliation feature for this account
+ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated entry
+StatusAccountOpened=Open
+StatusAccountClosed=Closed
+AccountIdShort=Number
+LineRecord=Transaction
+AddBankRecord=Add entry
+AddBankRecordLong=Add entry manually
+Conciliated=Reconciled
+ConciliatedBy=Reconciled by
+DateConciliating=Reconcile date
+BankLineConciliated=Entry reconciled with bank receipt
+Reconciled=Reconciled
+NotReconciled=Not reconciled
+CustomerInvoicePayment=Customer payment
+SupplierInvoicePayment=Vendor payment
+SubscriptionPayment=Subscription payment
+WithdrawalPayment=Debit payment order
+SocialContributionPayment=Social/fiscal tax payment
+BankTransfer=Bank transfer
+BankTransfers=Bank transfers
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferFrom=From
+TransferTo=To
+TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
+CheckTransmitter=Transmitter
+ValidateCheckReceipt=Validate this check receipt?
+ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done?
+DeleteCheckReceipt=Delete this check receipt?
+ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
+BankChecks=Bank checks
+BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
+ShowCheckReceipt=Show check deposit receipt
+NumberOfCheques=No. of check
+DeleteTransaction=Delete entry
+ConfirmDeleteTransaction=Are you sure you want to delete this entry?
+ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
+BankMovements=Movements
+PlannedTransactions=Planned entries
+Graph=Graphics
+ExportDataset_banque_1=Bank entries and account statement
+ExportDataset_banque_2=Deposit slip
+TransactionOnTheOtherAccount=Transaction on the other account
+PaymentNumberUpdateSucceeded=Payment number updated successfully
+PaymentNumberUpdateFailed=Payment number could not be updated
+PaymentDateUpdateSucceeded=Payment date updated successfully
+PaymentDateUpdateFailed=Payment date could not be updated
+Transactions=Transactions
+BankTransactionLine=Bank entry
+AllAccounts=All bank and cash accounts
+BackToAccount=Back to account
+ShowAllAccounts=Show for all accounts
+FutureTransaction=Future transaction. Unable to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+EventualyAddCategory=Eventually, specify a category in which to classify the records
+ToConciliate=To reconcile?
+ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
+DefaultRIB=Default BAN
+AllRIB=All BAN
+LabelRIB=BAN Label
+NoBANRecord=No BAN record
+DeleteARib=Delete BAN record
+ConfirmDeleteRib=Are you sure you want to delete this BAN record?
+RejectCheck=Check returned
+ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
+RejectCheckDate=Date the check was returned
+CheckRejected=Check returned
+CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
+VariousPayments=Miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
+SEPAMandate=SEPA mandate
+YourSEPAMandate=Your SEPA mandate
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash fence
+NewCashFence=New cash fence
+BankColorizeMovement=Colorize movements
+BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
+BankColorizeMovementName1=Background color for debit movement
+BankColorizeMovementName2=Background color for credit movement
diff --git a/htdocs/langs/zh_HK/bills.lang b/htdocs/langs/zh_HK/bills.lang
new file mode 100644
index 00000000000..9f11d8ecf87
--- /dev/null
+++ b/htdocs/langs/zh_HK/bills.lang
@@ -0,0 +1,574 @@
+# Dolibarr language file - Source file is en_US - bills
+Bill=Invoice
+Bills=Invoices
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Vendor invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid vendor invoices
+BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsLate=Late payments
+BillsStatistics=Customers invoices statistics
+BillsStatisticsSuppliers=Vendors invoices statistics
+DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
+DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
+DisabledBecauseNotErasable=Disabled because cannot be erased
+InvoiceStandard=Standard invoice
+InvoiceStandardAsk=Standard invoice
+InvoiceStandardDesc=This kind of invoice is the common invoice.
+InvoiceDeposit=Down payment invoice
+InvoiceDepositAsk=Down payment invoice
+InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
+InvoiceProForma=Proforma invoice
+InvoiceProFormaAsk=Proforma invoice
+InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
+InvoiceReplacement=Replacement invoice
+InvoiceReplacementAsk=Replacement invoice for invoice
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceAvoir=Credit note
+InvoiceAvoirAsk=Credit note to correct invoice
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
+invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+ReplaceInvoice=Replace invoice %s
+ReplacementInvoice=Replacement invoice
+ReplacedByInvoice=Replaced by invoice %s
+ReplacementByInvoice=Replaced by invoice
+CorrectInvoice=Correct invoice %s
+CorrectionInvoice=Correction invoice
+UsedByInvoice=Used to pay invoice %s
+ConsumedBy=Consumed by
+NotConsumed=Not consumed
+NoReplacableInvoice=No replaceable invoices
+NoInvoiceToCorrect=No invoice to correct
+InvoiceHasAvoir=Was source of one or several credit notes
+CardBill=Invoice card
+PredefinedInvoices=Predefined Invoices
+Invoice=Invoice
+PdfInvoiceTitle=Invoice
+Invoices=Invoices
+InvoiceLine=Invoice line
+InvoiceCustomer=Customer invoice
+CustomerInvoice=Customer invoice
+CustomersInvoices=Customers invoices
+SupplierInvoice=Vendor invoice
+SuppliersInvoices=Vendors invoices
+SupplierBill=Vendor invoice
+SupplierBills=suppliers invoices
+Payment=Payment
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
+Payments=Payments
+PaymentsBack=Refunds
+paymentInInvoiceCurrency=in invoices currency
+PaidBack=Paid back
+DeletePayment=Delete payment
+ConfirmDeletePayment=Are you sure you want to delete this payment?
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+SupplierPayments=Vendor payments
+ReceivedPayments=Received payments
+ReceivedCustomersPayments=Payments received from customers
+PayedSuppliersPayments=Payments paid to vendors
+ReceivedCustomersPaymentsToValid=Received customers payments to validate
+PaymentsReportsForYear=Payments reports for %s
+PaymentsReports=Payments reports
+PaymentsAlreadyDone=Payments already done
+PaymentsBackAlreadyDone=Refunds already done
+PaymentRule=Payment rule
+PaymentMode=Payment Type
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
+IdPaymentMode=Payment Type (id)
+CodePaymentMode=Payment Type (code)
+LabelPaymentMode=Payment Type (label)
+PaymentModeShort=Payment Type
+PaymentTerm=Payment Term
+PaymentConditions=Payment Terms
+PaymentConditionsShort=Payment Terms
+PaymentAmount=Payment amount
+PaymentHigherThanReminderToPay=Payment higher than reminder to pay
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
+ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
+ClassifyPaidPartially=Classify 'Paid partially'
+ClassifyCanceled=Classify 'Abandoned'
+ClassifyClosed=Classify 'Closed'
+ClassifyUnBilled=Classify 'Unbilled'
+CreateBill=Create Invoice
+CreateCreditNote=Create credit note
+AddBill=Create invoice or credit note
+AddToDraftInvoices=Add to draft invoice
+DeleteBill=Delete invoice
+SearchACustomerInvoice=Search for a customer invoice
+SearchASupplierInvoice=Search for a vendor invoice
+CancelBill=Cancel an invoice
+SendRemindByMail=Send reminder by email
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
+ConvertToReduc=Mark as credit available
+ConvertExcessReceivedToReduc=Convert excess received into available credit
+ConvertExcessPaidToReduc=Convert excess paid into available discount
+EnterPaymentReceivedFromCustomer=Enter payment received from customer
+EnterPaymentDueToCustomer=Make payment due to customer
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+PriceBase=Price base
+BillStatus=Invoice status
+StatusOfGeneratedInvoices=Status of generated invoices
+BillStatusDraft=Draft (needs to be validated)
+BillStatusPaid=Paid
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
+BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusCanceled=Abandoned
+BillStatusValidated=Validated (needs to be paid)
+BillStatusStarted=Started
+BillStatusNotPaid=Not paid
+BillStatusNotRefunded=Not refunded
+BillStatusClosedUnpaid=Closed (unpaid)
+BillStatusClosedPaidPartially=Paid (partially)
+BillShortStatusDraft=Draft
+BillShortStatusPaid=Paid
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
+BillShortStatusConverted=Paid
+BillShortStatusCanceled=Abandoned
+BillShortStatusValidated=Validated
+BillShortStatusStarted=Started
+BillShortStatusNotPaid=Not paid
+BillShortStatusNotRefunded=Not refunded
+BillShortStatusClosedUnpaid=Closed
+BillShortStatusClosedPaidPartially=Paid (partially)
+PaymentStatusToValidShort=To validate
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
+ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
+ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
+ErrorBillNotFound=Invoice %s does not exist
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorDiscountAlreadyUsed=Error, discount already used
+ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
+ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
+ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
+BillFrom=From
+BillTo=To
+ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=Template / Recurring invoice
+NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
+FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
+NotARecurringInvoiceTemplate=Not a recurring template invoice
+NewBill=New invoice
+LastBills=Latest %s invoices
+LatestTemplateInvoices=Latest %s template invoices
+LatestCustomerTemplateInvoices=Latest %s customer template invoices
+LatestSupplierTemplateInvoices=Latest %s vendor template invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s vendor invoices
+AllBills=All invoices
+AllCustomerTemplateInvoices=All template invoices
+OtherBills=Other invoices
+DraftBills=Draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Vendor draft invoices
+Unpaid=Unpaid
+ErrorNoPaymentDefined=Error No payment defined
+ConfirmDeleteBill=Are you sure you want to delete this invoice?
+ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
+ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
+ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
+ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
+ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
+ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
+ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
+ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyAbandonReasonOther=Other
+ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
+ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
+ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
+ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
+ValidateBill=Validate invoice
+UnvalidateBill=Unvalidate invoice
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
+AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
+AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
+UseSituationInvoices=Allow situation invoice
+UseSituationInvoicesCreditNote=Allow situation invoice credit note
+Retainedwarranty=Retained warranty
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
+RetainedwarrantyDefaultPercent=Retained warranty default percent
+RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
+RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
+ToPayOn=To pay on %s
+toPayOn=to pay on %s
+RetainedWarranty=Retained Warranty
+PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
+DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
+setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
+setretainedwarranty=Set retained warranty
+setretainedwarrantyDateLimit=Set retained warranty date limit
+RetainedWarrantyDateLimit=Retained warranty date limit
+RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
+AlreadyPaid=Already paid
+AlreadyPaidBack=Already paid back
+AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
+Abandoned=Abandoned
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to refund
+Rest=Pending
+AmountExpected=Amount claimed
+ExcessReceived=Excess received
+ExcessPaid=Excess paid
+EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
+NoDraftBills=No draft invoices
+NoOtherDraftBills=No other draft invoices
+NoDraftInvoices=No draft invoices
+RefBill=Invoice ref
+ToBill=To bill
+RemainderToBill=Remainder to bill
+SendBillByMail=Send invoice by email
+SendReminderBillByMail=Send reminder by email
+RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
+MenuToValid=To valid
+DateMaxPayment=Payment due on
+DateInvoice=Invoice date
+DatePointOfTax=Point of tax
+NoInvoice=No invoice
+ClassifyBill=Classify invoice
+SupplierBillsToPay=Unpaid vendor invoices
+CustomerBillsUnpaid=Unpaid customer invoices
+NonPercuRecuperable=Non-recoverable
+SetConditions=Set Payment Terms
+SetMode=Set Payment Type
+SetRevenuStamp=Set revenue stamp
+Billed=Billed
+RecurringInvoices=Recurring invoices
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
+CustomersInvoicesAndPayments=Customer invoices and payments
+ExportDataset_invoice_1=Customer invoices and invoice details
+ExportDataset_invoice_2=Customer invoices and payments
+ProformaBill=Proforma Bill:
+Reduction=Reduction
+ReductionShort=Disc.
+Reductions=Reductions
+ReductionsShort=Disc.
+Discounts=Discounts
+AddDiscount=Create discount
+AddRelativeDiscount=Create relative discount
+EditRelativeDiscount=Edit relative discount
+AddGlobalDiscount=Create absolute discount
+EditGlobalDiscounts=Edit absolute discounts
+AddCreditNote=Create credit note
+ShowDiscount=Show discount
+ShowReduc=Show the discount
+ShowSourceInvoice=Show the source invoice
+RelativeDiscount=Relative discount
+GlobalDiscount=Global discount
+CreditNote=Credit note
+CreditNotes=Credit notes
+CreditNotesOrExcessReceived=Credit notes or excess received
+Deposit=Down payment
+Deposits=Down payments
+DiscountFromCreditNote=Discount from credit note %s
+DiscountFromDeposit=Down payments from invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
+AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
+CreditNoteDepositUse=Invoice must be validated to use this kind of credits
+NewGlobalDiscount=New absolute discount
+NewRelativeDiscount=New relative discount
+DiscountType=Discount type
+NoteReason=Note/Reason
+ReasonDiscount=Reason
+DiscountOfferedBy=Granted by
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Vendors discounts
+BillAddress=Bill address
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
+IdSocialContribution=Social/fiscal tax payment id
+PaymentId=Payment id
+PaymentRef=Payment ref.
+InvoiceId=Invoice id
+InvoiceRef=Invoice ref.
+InvoiceDateCreation=Invoice creation date
+InvoiceStatus=Invoice status
+InvoiceNote=Invoice note
+InvoicePaid=Invoice paid
+InvoicePaidCompletely=Paid completely
+InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
+OrderBilled=Order billed
+DonationPaid=Donation paid
+PaymentNumber=Payment number
+RemoveDiscount=Remove discount
+WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty)
+InvoiceNotChecked=No invoice selected
+ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
+DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
+NbOfPayments=No. of payments
+SplitDiscount=Split discount in two
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
+ConfirmRemoveDiscount=Are you sure you want to remove this discount?
+RelatedBill=Related invoice
+RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related vendor invoices
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoices already exist
+MergingPDFTool=Merging PDF tool
+AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
+PaymentNote=Payment note
+ListOfPreviousSituationInvoices=List of previous situation invoices
+ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+FrequencyUnit=Frequency unit
+toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
+NextDateToExecution=Date for next invoice generation
+NextDateToExecutionShort=Date next gen.
+DateLastGeneration=Date of latest generation
+DateLastGenerationShort=Date latest gen.
+MaxPeriodNumber=Max. number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
+InvoiceAutoValidate=Validate invoices automatically
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not reached yet
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
+WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
+WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
+ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
+# PaymentConditions
+Statut=Status
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShort30D=30 days
+PaymentCondition30D=30 days
+PaymentConditionShort30DENDMONTH=30 days of month-end
+PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort60D=60 days
+PaymentCondition60D=60 days
+PaymentConditionShort60DENDMONTH=60 days of month-end
+PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShortPT_DELIVERY=Delivery
+PaymentConditionPT_DELIVERY=On delivery
+PaymentConditionShortPT_ORDER=Order
+PaymentConditionPT_ORDER=On order
+PaymentConditionShortPT_5050=50-50
+PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+PaymentConditionShort10D=10 days
+PaymentCondition10D=10 days
+PaymentConditionShort10DENDMONTH=10 days of month-end
+PaymentCondition10DENDMONTH=Within 10 days following the end of the month
+PaymentConditionShort14D=14 days
+PaymentCondition14D=14 days
+PaymentConditionShort14DENDMONTH=14 days of month-end
+PaymentCondition14DENDMONTH=Within 14 days following the end of the month
+FixAmount=Fixed amount - 1 line with label '%s'
+VarAmount=Variable amount (%% tot.)
+VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
+VarAmountAllLines=Variable amount (%% tot.) - all same lines
+# PaymentType
+PaymentTypeVIR=Bank transfer
+PaymentTypeShortVIR=Bank transfer
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
+PaymentTypeLIQ=Cash
+PaymentTypeShortLIQ=Cash
+PaymentTypeCB=Credit card
+PaymentTypeShortCB=Credit card
+PaymentTypeCHQ=Check
+PaymentTypeShortCHQ=Check
+PaymentTypeTIP=TIP (Documents against Payment)
+PaymentTypeShortTIP=TIP Payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
+PaymentTypeTRA=Bank draft
+PaymentTypeShortTRA=Draft
+PaymentTypeFAC=Factor
+PaymentTypeShortFAC=Factor
+BankDetails=Bank details
+BankCode=Bank code
+DeskCode=Branch code
+BankAccountNumber=Account number
+BankAccountNumberKey=Checksum
+Residence=Address
+IBANNumber=IBAN account number
+IBAN=IBAN
+BIC=BIC/SWIFT
+BICNumber=BIC/SWIFT code
+ExtraInfos=Extra infos
+RegulatedOn=Regulated on
+ChequeNumber=Check N°
+ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
+ChequeMaker=Check/Transfer transmitter
+ChequeBank=Bank of Check
+CheckBank=Check
+NetToBePaid=Net to be paid
+PhoneNumber=Tel
+FullPhoneNumber=Telephone
+TeleFax=Fax
+PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration.
+IntracommunityVATNumber=Intra-Community VAT ID
+PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
+PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
+SendTo=sent to
+PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
+VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
+LawApplicationPart1=By application of the law 80.335 of 12/05/80
+LawApplicationPart2=the goods remain the property of
+LawApplicationPart3=the seller until full payment of
+LawApplicationPart4=their price.
+LimitedLiabilityCompanyCapital=SARL with Capital of
+UseLine=Apply
+UseDiscount=Use discount
+UseCredit=Use credit
+UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit
+MenuChequeDeposits=Check Deposits
+MenuCheques=Checks
+MenuChequesReceipts=Check receipts
+NewChequeDeposit=New deposit
+ChequesReceipts=Check receipts
+ChequesArea=Check deposits area
+ChequeDeposits=Check deposits
+Cheques=Checks
+DepositId=Id deposit
+NbCheque=Number of checks
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices
+ShowUnpaidAll=Show all unpaid invoices
+ShowUnpaidLateOnly=Show late unpaid invoices only
+PaymentInvoiceRef=Payment invoice %s
+ValidateInvoice=Validate invoice
+ValidateInvoices=Validate invoices
+Cash=Cash
+Reported=Delayed
+DisabledBecausePayments=Not possible since there are some payments
+CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+ExpectedToPay=Expected payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
+PayedByThisPayment=Paid by this payment
+ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
+ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
+ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
+ToMakePayment=Pay
+ToMakePaymentBack=Pay back
+ListOfYourUnpaidInvoices=List of unpaid invoices
+NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
+RevenueStamp=Tax stamp
+YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
+YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
+PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
+TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+EarlyClosingReason=Early closing reason
+EarlyClosingComment=Early closing note
+##### Types de contacts #####
+TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
+TypeContact_facture_external_BILLING=Customer invoice contact
+TypeContact_facture_external_SHIPPING=Customer shipping contact
+TypeContact_facture_external_SERVICE=Customer service contact
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
+TypeContact_invoice_supplier_external_BILLING=Vendor invoice contact
+TypeContact_invoice_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+# Situation invoices
+InvoiceFirstSituationAsk=First situation invoice
+InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
+InvoiceSituation=Situation invoice
+InvoiceSituationAsk=Invoice following the situation
+InvoiceSituationDesc=Create a new situation following an already existing one
+SituationAmount=Situation invoice amount(net)
+SituationDeduction=Situation subtraction
+ModifyAllLines=Modify all lines
+CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
+NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
+DisabledBecauseNotLastInCycle=The next situation already exists.
+DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
+CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
+NoSituations=No open situations
+InvoiceSituationLast=Final and general invoice
+PDFCrevetteSituationNumber=Situation N°%s
+PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
+PDFCrevetteSituationInvoiceTitle=Situation invoice
+PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
+TotalSituationInvoice=Total situation
+invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
+updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
+CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
+BillCreated=%s bill(s) created
+StatusOfGeneratedDocuments=Status of document generation
+DoNotGenerateDoc=Do not generate document file
+AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/zh_HK/blockedlog.lang b/htdocs/langs/zh_HK/blockedlog.lang
new file mode 100644
index 00000000000..5afae6e9e53
--- /dev/null
+++ b/htdocs/langs/zh_HK/blockedlog.lang
@@ -0,0 +1,54 @@
+BlockedLog=Unalterable Logs
+Field=Field
+BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525).
+Fingerprints=Archived events and fingerprints
+FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed).
+CompanyInitialKey=Company initial key (hash of genesis block)
+BrowseBlockedLog=Unalterable logs
+ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
+ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
+DownloadBlockChain=Download fingerprints
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
+OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
+AddedByAuthority=Stored into remote authority
+NotAddedByAuthorityYet=Not yet stored into remote authority
+ShowDetails=Show stored details
+logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
+logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
+logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
+logPAYMENT_ADD_TO_BANK=Payment added to bank
+logPAYMENT_CUSTOMER_CREATE=Customer payment created
+logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
+logDONATION_PAYMENT_CREATE=Donation payment created
+logDONATION_PAYMENT_DELETE=Donation payment logical deletion
+logBILL_PAYED=Customer invoice paid
+logBILL_UNPAYED=Customer invoice set unpaid
+logBILL_VALIDATE=Customer invoice validated
+logBILL_SENTBYMAIL=Customer invoice send by mail
+logBILL_DELETE=Customer invoice logically deleted
+logMODULE_RESET=Module BlockedLog was disabled
+logMODULE_SET=Module BlockedLog was enabled
+logDON_VALIDATE=Donation validated
+logDON_MODIFY=Donation modified
+logDON_DELETE=Donation logical deletion
+logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
+logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
+logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
+logCASHCONTROL_VALIDATE=Cash fence recording
+BlockedLogBillDownload=Customer invoice download
+BlockedLogBillPreview=Customer invoice preview
+BlockedlogInfoDialog=Log Details
+ListOfTrackedEvents=List of tracked events
+Fingerprint=Fingerprint
+DownloadLogCSV=Export archived logs (CSV)
+logDOC_PREVIEW=Preview of a validated document in order to print or download
+logDOC_DOWNLOAD=Download of a validated document in order to print or send
+DataOfArchivedEvent=Full datas of archived event
+ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
+BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
+BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
+OnlyNonValid=Non-valid
+TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
+RestrictYearToExport=Restrict month / year to export
diff --git a/htdocs/langs/zh_HK/bookmarks.lang b/htdocs/langs/zh_HK/bookmarks.lang
new file mode 100644
index 00000000000..87466cadcfa
--- /dev/null
+++ b/htdocs/langs/zh_HK/bookmarks.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - marque pages
+AddThisPageToBookmarks=Add current page to bookmarks
+Bookmark=Bookmark
+Bookmarks=Bookmarks
+ListOfBookmarks=List of bookmarks
+EditBookmarks=List/edit bookmarks
+NewBookmark=New bookmark
+ShowBookmark=Show bookmark
+OpenANewWindow=Open a new tab
+ReplaceWindow=Replace current tab
+BookmarkTargetNewWindowShort=New tab
+BookmarkTargetReplaceWindowShort=Current tab
+BookmarkTitle=Bookmark name
+UrlOrLink=URL
+BehaviourOnClick=Behaviour when a bookmark URL is selected
+CreateBookmark=Create bookmark
+SetHereATitleForLink=Set a name for the bookmark
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if the linked page should open in the current tab or a new tab
+BookmarksManagement=Bookmarks management
+BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/zh_HK/boxes.lang b/htdocs/langs/zh_HK/boxes.lang
new file mode 100644
index 00000000000..bd62684421a
--- /dev/null
+++ b/htdocs/langs/zh_HK/boxes.lang
@@ -0,0 +1,102 @@
+# Dolibarr language file - Source file is en_US - boxes
+BoxLoginInformation=Login Information
+BoxLastRssInfos=RSS Information
+BoxLastProducts=Latest %s Products/Services
+BoxProductsAlertStock=Stock alerts for products
+BoxLastProductsInContract=Latest %s contracted products/services
+BoxLastSupplierBills=Latest Vendor invoices
+BoxLastCustomerBills=Latest Customer invoices
+BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
+BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
+BoxLastProposals=Latest commercial proposals
+BoxLastProspects=Latest modified prospects
+BoxLastCustomers=Latest modified customers
+BoxLastSuppliers=Latest modified suppliers
+BoxLastCustomerOrders=Latest sales orders
+BoxLastActions=Latest actions
+BoxLastContracts=Latest contracts
+BoxLastContacts=Latest contacts/addresses
+BoxLastMembers=Latest members
+BoxFicheInter=Latest interventions
+BoxCurrentAccounts=Open accounts balance
+BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleLastRssInfos=Latest %s news from %s
+BoxTitleLastProducts=Products/Services: last %s modified
+BoxTitleProductsAlertStock=Products: stock alert
+BoxTitleLastSuppliers=Latest %s recorded suppliers
+BoxTitleLastModifiedSuppliers=Vendors: last %s modified
+BoxTitleLastModifiedCustomers=Customers: last %s modified
+BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
+BoxTitleLastModifiedProspects=Prospects: last %s modified
+BoxTitleLastModifiedMembers=Latest %s members
+BoxTitleLastFicheInter=Latest %s modified interventions
+BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
+BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
+BoxTitleCurrentAccounts=Open Accounts: balances
+BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
+BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
+BoxMyLastBookmarks=Bookmarks: latest %s
+BoxOldestExpiredServices=Oldest active expired services
+BoxLastExpiredServices=Latest %s oldest contacts with active expired services
+BoxTitleLastActionsToDo=Latest %s actions to do
+BoxTitleLastContracts=Latest %s modified contracts
+BoxTitleLastModifiedDonations=Latest %s modified donations
+BoxTitleLastModifiedExpenses=Latest %s modified expense reports
+BoxTitleLatestModifiedBoms=Latest %s modified BOMs
+BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
+FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
+LastRefreshDate=Latest refresh date
+NoRecordedBookmarks=No bookmarks defined.
+ClickToAdd=Click here to add.
+NoRecordedCustomers=No recorded customers
+NoRecordedContacts=No recorded contacts
+NoActionsToDo=No actions to do
+NoRecordedOrders=No recorded sales orders
+NoRecordedProposals=No recorded proposals
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid vendor invoices
+NoModifiedSupplierBills=No recorded vendor invoices
+NoRecordedProducts=No recorded products/services
+NoRecordedProspects=No recorded prospects
+NoContractedProducts=No products/services contracted
+NoRecordedContracts=No recorded contracts
+NoRecordedInterventions=No recorded interventions
+BoxLatestSupplierOrders=Latest purchase orders
+BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
+NoSupplierOrder=No recorded purchase order
+BoxCustomersInvoicesPerMonth=Customer Invoices per month
+BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
+BoxCustomersOrdersPerMonth=Sales Orders per month
+BoxSuppliersOrdersPerMonth=Vendor Orders per month
+BoxProposalsPerMonth=Proposals per month
+NoTooLowStockProducts=No products are under the low stock limit
+BoxProductDistribution=Products/Services Distribution
+ForObject=On %s
+BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
+BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
+BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
+BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
+BoxTitleLastModifiedPropals=Latest %s modified proposals
+ForCustomersInvoices=Customers invoices
+ForCustomersOrders=Customers orders
+ForProposals=Proposals
+LastXMonthRolling=The latest %s month rolling
+ChooseBoxToAdd=Add widget to your dashboard
+BoxAdded=Widget was added in your dashboard
+BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
+BoxLastManualEntries=Last manual entries in accountancy
+BoxTitleLastManualEntries=%s latest manual entries
+NoRecordedManualEntries=No manual entries record in accountancy
+BoxSuspenseAccount=Count accountancy operation with suspense account
+BoxTitleSuspenseAccount=Number of unallocated lines
+NumberOfLinesInSuspenseAccount=Number of line in suspense account
+SuspenseAccountNotDefined=Suspense account isn't defined
+BoxLastCustomerShipments=Last customer shipments
+BoxTitleLastCustomerShipments=Latest %s customer shipments
+NoRecordedShipments=No recorded customer shipment
diff --git a/htdocs/langs/zh_HK/cashdesk.lang b/htdocs/langs/zh_HK/cashdesk.lang
new file mode 100644
index 00000000000..0903a3d10bc
--- /dev/null
+++ b/htdocs/langs/zh_HK/cashdesk.lang
@@ -0,0 +1,110 @@
+# Language file - Source file is en_US - cashdesk
+CashDeskMenu=Point of sale
+CashDesk=Point of sale
+CashDeskBankCash=Bank account (cash)
+CashDeskBankCB=Bank account (card)
+CashDeskBankCheque=Bank account (cheque)
+CashDeskWarehouse=Warehouse
+CashdeskShowServices=Selling services
+CashDeskProducts=Products
+CashDeskStock=Stock
+CashDeskOn=on
+CashDeskThirdParty=Third party
+ShoppingCart=Shopping cart
+NewSell=New sell
+AddThisArticle=Add this article
+RestartSelling=Go back on sell
+SellFinished=Sale complete
+PrintTicket=Print ticket
+SendTicket=Send ticket
+NoProductFound=No article found
+ProductFound=product found
+NoArticle=No article
+Identification=Identification
+Article=Article
+Difference=Difference
+TotalTicket=Total ticket
+NoVAT=No VAT for this sale
+Change=Excess received
+BankToPay=Account for payment
+ShowCompany=Show company
+ShowStock=Show warehouse
+DeleteArticle=Click to remove this article
+FilterRefOrLabelOrBC=Search (Ref/Label)
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
+DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of Sale
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
+Receipt=Receipt
+Header=Header
+Footer=Footer
+AmountAtEndOfPeriod=Amount at end of period (day, month or year)
+TheoricalAmount=Theorical amount
+RealAmount=Real amount
+CashFence=Cash fence
+CashFenceDone=Cash fence done for the period
+NbOfInvoices=Nb of invoices
+Paymentnumpad=Type of Pad to enter payment
+Numberspad=Numbers Pad
+BillsCoinsPad=Coins and banknotes Pad
+DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
+TakeposNeedsCategories=TakePOS needs product categories to work
+OrderNotes=Order Notes
+CashDeskBankAccountFor=Default account to use for payments in
+NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
+PrintCustomerOnReceipts=Print customer on tickets|receipts
+EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
+ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
+POSTerminal=POS Terminal
+POSModule=POS Module
+BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
+CustomReceipt=Custom Receipt
+ReceiptName=Receipt Name
+ProductSupplements=Product Supplements
+SupplementCategory=Supplement category
+ColorTheme=Color theme
+Colorful=Colorful
+HeadBar=Head Bar
+SortProductField=Field for sorting products
+Browser=Browser
+BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
+TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
+PrintMethod=Print method
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ByTerminal=By terminal
+TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for POS sales
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
+BarRestaurant=Bar Restaurant
+AutoOrder=Customer auto order
diff --git a/htdocs/langs/zh_HK/categories.lang b/htdocs/langs/zh_HK/categories.lang
new file mode 100644
index 00000000000..30bace0574c
--- /dev/null
+++ b/htdocs/langs/zh_HK/categories.lang
@@ -0,0 +1,89 @@
+# Dolibarr language file - Source file is en_US - categories
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+RubriquesTransactions=Tags/Categories of transactions
+categories=tags/categories
+NoCategoryYet=No tag/category of this type created
+In=In
+AddIn=Add in
+modify=modify
+Classify=Classify
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Vendors tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
+UsersCategoriesArea=Users tags/categories area
+SubCats=Sub-categories
+CatList=List of tags/categories
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
+NoSubCat=No subcategory.
+SubCatOf=Subcategory
+FoundCats=Found tags/categories
+ImpossibleAddCat=Impossible to add the tag/category %s
+WasAddedSuccessfully=<b>%s</b> was added successfully.
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+ProductIsInCategories=Product/service is linked to following tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
+ClassifyInCategory=Add to tag/category
+NotCategorized=Without tag/category
+CategoryExistsAtSameLevel=This category already exists with this ref
+ContentsVisibleByAllShort=Contents visible by all
+ContentsNotVisibleByAllShort=Contents not visible by all
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Vendors tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
+SuppliersCategoriesShort=Vendors tags/categories
+CustomersCategoriesShort=Customers tags/categories
+ProspectsCategoriesShort=Prospects tags/categories
+CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
+AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
+UsersCategoriesShort=Users tags/categories
+StockCategoriesShort=Warehouse tags/categories
+ThisCategoryHasNoItems=This category does not contain any items.
+CategId=Tag/category id
+CatSupList=List of vendor tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatContactsLinks=Links between contacts/addresses and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
+DeleteFromCat=Remove from tags/category
+ExtraFieldsCategories=Complementary attributes
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
+CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
+AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show tag/category
+ByDefaultInList=By default in list
+ChooseCategory=Choose category
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/zh_HK/commercial.lang b/htdocs/langs/zh_HK/commercial.lang
new file mode 100644
index 00000000000..10c536e0d48
--- /dev/null
+++ b/htdocs/langs/zh_HK/commercial.lang
@@ -0,0 +1,80 @@
+# Dolibarr language file - Source file is en_US - commercial
+Commercial=Commerce
+CommercialArea=Commerce area
+Customer=Customer
+Customers=Customers
+Prospect=Prospect
+Prospects=Prospects
+DeleteAction=Delete an event
+NewAction=New event
+AddAction=Create event
+AddAnAction=Create an event
+AddActionRendezVous=Create a Rendez-vous event
+ConfirmDeleteAction=Are you sure you want to delete this event?
+CardAction=Event card
+ActionOnCompany=Related company
+ActionOnContact=Related contact
+TaskRDVWith=Meeting with %s
+ShowTask=Show task
+ShowAction=Show event
+ActionsReport=Events report
+ThirdPartiesOfSaleRepresentative=Third parties with sales representative
+SaleRepresentativesOfThirdParty=Sales representatives of third party
+SalesRepresentative=Sales representative
+SalesRepresentatives=Sales representatives
+SalesRepresentativeFollowUp=Sales representative (follow-up)
+SalesRepresentativeSignature=Sales representative (signature)
+NoSalesRepresentativeAffected=No particular sales representative assigned
+ShowCustomer=Show customer
+ShowProspect=Show prospect
+ListOfProspects=List of prospects
+ListOfCustomers=List of customers
+LastDoneTasks=Latest %s completed actions
+LastActionsToDo=Oldest %s not completed actions
+DoneAndToDoActions=Completed and To do events
+DoneActions=Completed events
+ToDoActions=Incomplete events
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
+StatusNotApplicable=Not applicable
+StatusActionToDo=To do
+StatusActionDone=Complete
+StatusActionInProcess=In process
+TasksHistoryForThisContact=Events for this contact
+LastProspectDoNotContact=Do not contact
+LastProspectNeverContacted=Never contacted
+LastProspectToContact=To contact
+LastProspectContactInProcess=Contact in process
+LastProspectContactDone=Contact done
+ActionAffectedTo=Event assigned to
+ActionDoneBy=Event done by
+ActionAC_TEL=Phone call
+ActionAC_FAX=Send fax
+ActionAC_PROP=Send proposal by mail
+ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
+ActionAC_RDV=Meetings
+ActionAC_INT=Intervention on site
+ActionAC_FAC=Send customer invoice by mail
+ActionAC_REL=Send customer invoice by mail (reminder)
+ActionAC_CLO=Close
+ActionAC_EMAILING=Send mass email
+ActionAC_COM=Send sales order by mail
+ActionAC_SHIP=Send shipping by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
+ActionAC_OTH=Other
+ActionAC_OTH_AUTO=Automatically inserted events
+ActionAC_MANUAL=Manually inserted events
+ActionAC_AUTO=Automatically inserted events
+ActionAC_OTH_AUTOShort=Auto
+Stats=Sales statistics
+StatusProsp=Prospect status
+DraftPropals=Draft commercial proposals
+NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commercial proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/zh_HK/companies.lang b/htdocs/langs/zh_HK/companies.lang
new file mode 100644
index 00000000000..0fad58c9389
--- /dev/null
+++ b/htdocs/langs/zh_HK/companies.lang
@@ -0,0 +1,458 @@
+# Dolibarr language file - Source file is en_US - companies
+ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
+ErrorSetACountryFirst=Set the country first
+SelectThirdParty=Select a third party
+ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+DeleteContact=Delete a contact/address
+ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+MenuNewThirdParty=New Third Party
+MenuNewCustomer=New Customer
+MenuNewProspect=New Prospect
+MenuNewSupplier=New Vendor
+MenuNewPrivateIndividual=New private individual
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New Third Party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
+CreateThirdPartyOnly=Create third party
+CreateThirdPartyAndContact=Create a third party + a child contact
+ProspectionArea=Prospection area
+IdThirdParty=Id third party
+IdCompany=Company Id
+IdContact=Contact Id
+Contacts=Contacts/Addresses
+ThirdPartyContacts=Third-party contacts
+ThirdPartyContact=Third-party contact/address
+Company=Company
+CompanyName=Company name
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias Name
+Companies=Companies
+CountryIsInEEC=Country is inside the European Economic Community
+PriceFormatInCurrentLanguage=Price display format in the current language and currency
+ThirdPartyName=Third-party name
+ThirdPartyEmail=Third-party email
+ThirdParty=Third-party
+ThirdParties=Third-parties
+ThirdPartyProspects=Prospects
+ThirdPartyProspectsStats=Prospects
+ThirdPartyCustomers=Customers
+ThirdPartyCustomersStats=Customers
+ThirdPartyCustomersWithIdProf12=Customers with %s or %s
+ThirdPartySuppliers=Vendors
+ThirdPartyType=Third-party type
+Individual=Private individual
+ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
+ParentCompany=Parent company
+Subsidiaries=Subsidiaries
+ReportByMonth=Report by month
+ReportByCustomers=Report by customer
+ReportByQuarter=Report by rate
+CivilityCode=Civility code
+RegisteredOffice=Registered office
+Lastname=Last name
+Firstname=First name
+PostOrFunction=Job position
+UserTitle=Title
+NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
+Address=Address
+State=State/Province
+StateCode=State/Province code
+StateShort=State
+Region=Region
+Region-State=Region - State
+Country=Country
+CountryCode=Country code
+CountryId=Country id
+Phone=Phone
+PhoneShort=Phone
+Skype=Skype
+Call=Call
+Chat=Chat
+PhonePro=Prof. phone
+PhonePerso=Pers. phone
+PhoneMobile=Mobile
+No_Email=Refuse bulk emailings
+Fax=Fax
+Zip=Zip Code
+Town=City
+Web=Web
+Poste= Position
+DefaultLang=Language default
+VATIsUsed=Sales tax used
+VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
+CopyAddressFromSoc=Copy address from third-party details
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
+PaymentBankAccount=Payment bank account
+OverAllProposals=Proposals
+OverAllOrders=Orders
+OverAllInvoices=Invoices
+OverAllSupplierProposals=Price requests
+##### Local Taxes #####
+LocalTax1IsUsed=Use second tax
+LocalTax1IsUsedES= RE is used
+LocalTax1IsNotUsedES= RE is not used
+LocalTax2IsUsed=Use third tax
+LocalTax2IsUsedES= IRPF is used
+LocalTax2IsNotUsedES= IRPF is not used
+WrongCustomerCode=Customer code invalid
+WrongSupplierCode=Vendor code invalid
+CustomerCodeModel=Customer code model
+SupplierCodeModel=Vendor code model
+Gencod=Barcode
+##### Professional ID #####
+ProfId1Short=Prof. id 1
+ProfId2Short=Prof. id 2
+ProfId3Short=Prof. id 3
+ProfId4Short=Prof. id 4
+ProfId5Short=Prof. id 5
+ProfId6Short=Prof. id 6
+ProfId1=Professional ID 1
+ProfId2=Professional ID 2
+ProfId3=Professional ID 3
+ProfId4=Professional ID 4
+ProfId5=Professional ID 5
+ProfId6=Professional ID 6
+ProfId1AR=Prof Id 1 (CUIT/CUIL)
+ProfId2AR=Prof Id 2 (Revenu brutes)
+ProfId3AR=-
+ProfId4AR=-
+ProfId5AR=-
+ProfId6AR=-
+ProfId1AT=Prof Id 1 (USt.-IdNr)
+ProfId2AT=Prof Id 2 (USt.-Nr)
+ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
+ProfId4AT=-
+ProfId5AT=-
+ProfId6AT=-
+ProfId1AU=Prof Id 1 (ABN)
+ProfId2AU=-
+ProfId3AU=-
+ProfId4AU=-
+ProfId5AU=-
+ProfId6AU=-
+ProfId1BE=Prof Id 1 (Professional number)
+ProfId2BE=-
+ProfId3BE=-
+ProfId4BE=-
+ProfId5BE=-
+ProfId6BE=-
+ProfId1BR=-
+ProfId2BR=IE (Inscricao Estadual)
+ProfId3BR=IM (Inscricao Municipal)
+ProfId4BR=CPF
+#ProfId5BR=CNAE
+#ProfId6BR=INSS
+ProfId1CH=-
+ProfId2CH=-
+ProfId3CH=Prof Id 1 (Federal number)
+ProfId4CH=Prof Id 2 (Commercial Record number)
+ProfId5CH=-
+ProfId6CH=-
+ProfId1CL=Prof Id 1 (R.U.T.)
+ProfId2CL=-
+ProfId3CL=-
+ProfId4CL=-
+ProfId5CL=-
+ProfId6CL=-
+ProfId1CO=Prof Id 1 (R.U.T.)
+ProfId2CO=-
+ProfId3CO=-
+ProfId4CO=-
+ProfId5CO=-
+ProfId6CO=-
+ProfId1DE=Prof Id 1 (USt.-IdNr)
+ProfId2DE=Prof Id 2 (USt.-Nr)
+ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId4DE=-
+ProfId5DE=-
+ProfId6DE=-
+ProfId1ES=Prof Id 1 (CIF/NIF)
+ProfId2ES=Prof Id 2 (Social security number)
+ProfId3ES=Prof Id 3 (CNAE)
+ProfId4ES=Prof Id 4 (Collegiate number)
+ProfId5ES=-
+ProfId6ES=-
+ProfId1FR=Prof Id 1 (SIREN)
+ProfId2FR=Prof Id 2 (SIRET)
+ProfId3FR=Prof Id 3 (NAF, old APE)
+ProfId4FR=Prof Id 4 (RCS/RM)
+ProfId5FR=-
+ProfId6FR=-
+ProfId1GB=Registration Number
+ProfId2GB=-
+ProfId3GB=SIC
+ProfId4GB=-
+ProfId5GB=-
+ProfId6GB=-
+ProfId1HN=Id prof. 1 (RTN)
+ProfId2HN=-
+ProfId3HN=-
+ProfId4HN=-
+ProfId5HN=-
+ProfId6HN=-
+ProfId1IN=Prof Id 1 (TIN)
+ProfId2IN=Prof Id 2 (PAN)
+ProfId3IN=Prof Id 3 (SRVC TAX)
+ProfId4IN=Prof Id 4
+ProfId5IN=Prof Id 5
+ProfId6IN=-
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
+ProfId1MA=Id prof. 1 (R.C.)
+ProfId2MA=Id prof. 2 (Patente)
+ProfId3MA=Id prof. 3 (I.F.)
+ProfId4MA=Id prof. 4 (C.N.S.S.)
+ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId6MA=-
+ProfId1MX=Prof Id 1 (R.F.C).
+ProfId2MX=Prof Id 2 (R..P. IMSS)
+ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId4MX=-
+ProfId5MX=-
+ProfId6MX=-
+ProfId1NL=KVK nummer
+ProfId2NL=-
+ProfId3NL=-
+ProfId4NL=Burgerservicenummer (BSN)
+ProfId5NL=-
+ProfId6NL=-
+ProfId1PT=Prof Id 1 (NIPC)
+ProfId2PT=Prof Id 2 (Social security number)
+ProfId3PT=Prof Id 3 (Commercial Record number)
+ProfId4PT=Prof Id 4 (Conservatory)
+ProfId5PT=-
+ProfId6PT=-
+ProfId1SN=RC
+ProfId2SN=NINEA
+ProfId3SN=-
+ProfId4SN=-
+ProfId5SN=-
+ProfId6SN=-
+ProfId1TN=Prof Id 1 (RC)
+ProfId2TN=Prof Id 2 (Fiscal matricule)
+ProfId3TN=Prof Id 3 (Douane code)
+ProfId4TN=Prof Id 4 (BAN)
+ProfId5TN=-
+ProfId6TN=-
+ProfId1US=Prof Id (FEIN)
+ProfId2US=-
+ProfId3US=-
+ProfId4US=-
+ProfId5US=-
+ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
+ProfId1RU=Prof Id 1 (OGRN)
+ProfId2RU=Prof Id 2 (INN)
+ProfId3RU=Prof Id 3 (KPP)
+ProfId4RU=Prof Id 4 (OKPO)
+ProfId5RU=-
+ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
+VATIntra=VAT ID
+VATIntraShort=VAT ID
+VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
+ProspectCustomer=Prospect / Customer
+Prospect=Prospect
+CustomerCard=Customer Card
+Customer=Customer
+CustomerRelativeDiscount=Relative customer discount
+SupplierRelativeDiscount=Relative vendor discount
+CustomerRelativeDiscountShort=Relative discount
+CustomerAbsoluteDiscountShort=Absolute discount
+CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
+CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
+CompanyHasAbsoluteDiscount=This customer has discounts available (credits notes or down payments) for <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
+CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
+CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
+DiscountNone=None
+Vendor=Vendor
+Supplier=Vendor
+AddContact=Create contact
+AddContactAddress=Create contact/address
+EditContact=Edit contact
+EditContactAddress=Edit contact/address
+Contact=Contact
+ContactId=Contact id
+ContactsAddresses=Contacts/Addresses
+FromContactName=Name:
+NoContactDefinedForThirdParty=No contact defined for this third party
+NoContactDefined=No contact defined
+DefaultContact=Default contact/address
+ContactByDefaultFor=Default contact/address for
+AddThirdParty=Create third party
+DeleteACompany=Delete a company
+PersonalInformations=Personal data
+AccountancyCode=Accounting account
+CustomerCode=Customer Code
+SupplierCode=Vendor Code
+CustomerCodeShort=Customer Code
+SupplierCodeShort=Vendor Code
+CustomerCodeDesc=Customer Code, unique for all customers
+SupplierCodeDesc=Vendor Code, unique for all vendors
+RequiredIfCustomer=Required if third party is a customer or prospect
+RequiredIfSupplier=Required if third party is a vendor
+ValidityControledByModule=Validity controlled by module
+ThisIsModuleRules=Rules for this module
+ProspectToContact=Prospect to contact
+CompanyDeleted=Company "%s" deleted from database.
+ListOfContacts=List of contacts/addresses
+ListOfContactsAddresses=List of contacts/addresses
+ListOfThirdParties=List of Third Parties
+ShowCompany=Third Party
+ShowContact=Contact-Address
+ContactsAllShort=All (No filter)
+ContactType=Contact type
+ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
+ContactForProposals=Proposal's contact
+ContactForContracts=Contract's contact
+ContactForInvoices=Invoice's contact
+NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
+NoContactForAnyProposal=This contact is not a contact for any commercial proposal
+NoContactForAnyContract=This contact is not a contact for any contract
+NoContactForAnyInvoice=This contact is not a contact for any invoice
+NewContact=New contact
+NewContactAddress=New Contact/Address
+MyContacts=My contacts
+Capital=Capital
+CapitalOf=Capital of %s
+EditCompany=Edit company
+ThisUserIsNot=This user is not a prospect, customer or vendor
+VATIntraCheck=Check
+VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
+VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
+NorProspectNorCustomer=Not prospect, nor customer
+JuridicalStatus=Legal Entity Type
+Staff=Employees
+ProspectLevelShort=Potential
+ProspectLevel=Prospect potential
+ContactPrivate=Private
+ContactPublic=Shared
+ContactVisibility=Visibility
+ContactOthers=Other
+OthersNotLinkedToThirdParty=Others, not linked to a third party
+ProspectStatus=Prospect status
+PL_NONE=None
+PL_UNKNOWN=Unknown
+PL_LOW=Low
+PL_MEDIUM=Medium
+PL_HIGH=High
+TE_UNKNOWN=-
+TE_STARTUP=Startup
+TE_GROUP=Large company
+TE_MEDIUM=Medium company
+TE_ADMIN=Governmental
+TE_SMALL=Small company
+TE_RETAIL=Retailer
+TE_WHOLE=Wholesaler
+TE_PRIVATE=Private individual
+TE_OTHER=Other
+StatusProspect-1=Do not contact
+StatusProspect0=Never contacted
+StatusProspect1=To be contacted
+StatusProspect2=Contact in process
+StatusProspect3=Contact done
+ChangeDoNotContact=Change status to 'Do not contact'
+ChangeNeverContacted=Change status to 'Never contacted'
+ChangeToContact=Change status to 'To be contacted'
+ChangeContactInProcess=Change status to 'Contact in process'
+ChangeContactDone=Change status to 'Contact done'
+ProspectsByStatus=Prospects by status
+NoParentCompany=None
+ExportCardToFormat=Export card to format
+ContactNotLinkedToCompany=Contact not linked to any third party
+DolibarrLogin=Dolibarr login
+NoDolibarrAccess=No Dolibarr access
+ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
+ExportDataset_company_2=Contacts and their properties
+ImportDataset_company_1=Third-parties and their properties
+ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ImportDataset_company_3=Third-parties Bank accounts
+ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
+PriceLevel=Price Level
+PriceLevelLabels=Price Level Labels
+DeliveryAddress=Delivery address
+AddAddress=Add address
+SupplierCategory=Vendor category
+JuridicalStatus200=Independent
+DeleteFile=Delete file
+ConfirmDeleteFile=Are you sure you want to delete this file?
+AllocateCommercial=Assigned to sales representative
+Organization=Organization
+FiscalYearInformation=Fiscal Year
+FiscalMonthStart=Starting month of the fiscal year
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
+YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
+YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
+ListSuppliersShort=List of Vendors
+ListProspectsShort=List of Prospects
+ListCustomersShort=List of Customers
+ThirdPartiesArea=Third Parties/Contacts
+LastModifiedThirdParties=Last %s modified Third Parties
+UniqueThirdParties=Total of Third Parties
+InActivity=Open
+ActivityCeased=Closed
+ThirdPartyIsClosed=Third party is closed
+ProductsIntoElements=List of products/services into %s
+CurrentOutstandingBill=Current outstanding bill
+OutstandingBill=Max. for outstanding bill
+OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
+MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
+ManagingDirectors=Manager(s) name (CEO, director, president...)
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ThirdpartiesMergeSuccess=Third parties have been merged
+SaleRepresentativeLogin=Login of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+#Imports
+PaymentTypeCustomer=Payment Type - Customer
+PaymentTermsCustomer=Payment Terms - Customer
+PaymentTypeSupplier=Payment Type - Vendor
+PaymentTermsSupplier=Payment Term - Vendor
+PaymentTypeBoth=Payment Type - Customer and Vendor
+MulticurrencyUsed=Use Multicurrency
+MulticurrencyCurrency=Currency
diff --git a/htdocs/langs/zh_HK/compta.lang b/htdocs/langs/zh_HK/compta.lang
new file mode 100644
index 00000000000..8a8c837ac87
--- /dev/null
+++ b/htdocs/langs/zh_HK/compta.lang
@@ -0,0 +1,266 @@
+# Dolibarr language file - Source file is en_US - compta
+MenuFinancial=Billing | Payment
+TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
+OptionMode=Option for accountancy
+OptionModeTrue=Option Incomes-Expenses
+OptionModeVirtual=Option Claims-Debts
+OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
+OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
+FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
+VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
+LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+Param=Setup
+RemainingAmountPayment=Amount payment remaining:
+Account=Account
+Accountparent=Parent account
+Accountsparent=Parent accounts
+Income=Income
+Outcome=Expense
+MenuReportInOut=Income / Expense
+ReportInOut=Balance of income and expenses
+ReportTurnover=Turnover invoiced
+ReportTurnoverCollected=Turnover collected
+PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party
+PaymentsNotLinkedToUser=Payments not linked to any user
+Profit=Profit
+AccountingResult=Accounting result
+BalanceBefore=Balance (before)
+Balance=Balance
+Debit=Debit
+Credit=Credit
+Piece=Accounting Doc.
+AmountHTVATRealReceived=Net collected
+AmountHTVATRealPaid=Net paid
+VATToPay=Tax sales
+VATReceived=Tax received
+VATToCollect=Tax purchases
+VATSummary=Tax monthly
+VATBalance=Tax Balance
+VATPaid=Tax paid
+LT1Summary=Tax 2 summary
+LT2Summary=Tax 3 summary
+LT1SummaryES=RE Balance
+LT2SummaryES=IRPF Balance
+LT1SummaryIN=CGST Balance
+LT2SummaryIN=SGST Balance
+LT1Paid=Tax 2 paid
+LT2Paid=Tax 3 paid
+LT1PaidES=RE Paid
+LT2PaidES=IRPF Paid
+LT1PaidIN=CGST Paid
+LT2PaidIN=SGST Paid
+LT1Customer=Tax 2 sales
+LT1Supplier=Tax 2 purchases
+LT1CustomerES=RE sales
+LT1SupplierES=RE purchases
+LT1CustomerIN=CGST sales
+LT1SupplierIN=CGST purchases
+LT2Customer=Tax 3 sales
+LT2Supplier=Tax 3 purchases
+LT2CustomerES=IRPF sales
+LT2SupplierES=IRPF purchases
+LT2CustomerIN=SGST sales
+LT2SupplierIN=SGST purchases
+VATCollected=VAT collected
+StatusToPay=To pay
+SpecialExpensesArea=Area for all special payments
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
+SocialContributionsDeductibles=Deductible social or fiscal taxes
+SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
+MenuSpecialExpenses=Special expenses
+MenuTaxAndDividends=Taxes and dividends
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New social/fiscal tax
+NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
+AccountancyTreasuryArea=Billing and payment area
+NewPayment=New payment
+PaymentCustomerInvoice=Customer invoice payment
+PaymentSupplierInvoice=vendor invoice payment
+PaymentSocialContribution=Social/fiscal tax payment
+PaymentVat=VAT payment
+ListPayment=List of payments
+ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of vendor payments
+DateStartPeriod=Date start period
+DateEndPeriod=Date end period
+newLT1Payment=New tax 2 payment
+newLT2Payment=New tax 3 payment
+LT1Payment=Tax 2 payment
+LT1Payments=Tax 2 payments
+LT2Payment=Tax 3 payment
+LT2Payments=Tax 3 payments
+newLT1PaymentES=New RE payment
+newLT2PaymentES=New IRPF payment
+LT1PaymentES=RE Payment
+LT1PaymentsES=RE Payments
+LT2PaymentES=IRPF Payment
+LT2PaymentsES=IRPF Payments
+VATPayment=Sales tax payment
+VATPayments=Sales tax payments
+VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
+NewLocalTaxPayment=New tax %s payment
+Refund=Refund
+SocialContributionsPayments=Social/fiscal taxes payments
+ShowVatPayment=Show VAT payment
+TotalToPay=Total to pay
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+CustomerAccountancyCode=Customer accounting code
+SupplierAccountancyCode=Vendor accounting code
+CustomerAccountancyCodeShort=Cust. account. code
+SupplierAccountancyCodeShort=Sup. account. code
+AccountNumber=Account number
+NewAccountingAccount=New account
+Turnover=Turnover invoiced
+TurnoverCollected=Turnover collected
+SalesTurnoverMinimum=Minimum turnover
+ByExpenseIncome=By expenses & incomes
+ByThirdParties=By third parties
+ByUserAuthorOfInvoice=By invoice author
+CheckReceipt=Check deposit
+CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Latest %s check receipts
+NewCheckReceipt=New discount
+NewCheckDeposit=New check deposit
+NewCheckDepositOn=Create receipt for deposit on account: %s
+NoWaitingChecks=No checks awaiting deposit.
+DateChequeReceived=Check reception date
+NbOfCheques=No. of checks
+PaySocialContribution=Pay a social/fiscal tax
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ExportDataset_tax_1=Social and fiscal taxes and payments
+CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
+CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
+CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
+CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
+CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
+CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
+CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
+CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
+CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
+CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
+AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
+AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
+AnnualByCompanies=Balance of income and expenses, by predefined groups of account
+AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
+AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
+SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
+SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
+SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
+RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
+RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
+RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
+RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
+RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
+SeePageForSetup=See menu <a href="%s">%s</a> for setup
+DepositsAreNotIncluded=- Down payment invoices are not included
+DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
+VATReportByCustomers=Sale tax report by customer
+VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
+SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
+SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
+RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
+RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
+OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
+PercentOfInvoice=%%/invoice
+NotUsedForGoods=Not used on goods
+ProposalStats=Statistics on proposals
+OrderStats=Statistics on orders
+InvoiceStats=Statistics on bills
+Dispatch=Dispatching
+Dispatched=Dispatched
+ToDispatch=To dispatch
+ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer
+SellsJournal=Sales Journal
+PurchasesJournal=Purchases Journal
+DescSellsJournal=Sales Journal
+DescPurchasesJournal=Purchases Journal
+CodeNotDef=Not defined
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
+DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
+Pcg_version=Chart of accounts models
+Pcg_type=Pcg type
+Pcg_subtype=Pcg subtype
+InvoiceLinesToDispatch=Invoice lines to dispatch
+ByProductsAndServices=By product and service
+RefExt=External ref
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+LinkedOrder=Link to order
+Mode1=Method 1
+Mode2=Method 2
+CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
+CalculationRuleDescSupplier=According to vendor, choose appropriate method to apply same calculation rule and get same result expected by your vendor.
+TurnoverPerProductInCommitmentAccountingNotRelevant=The report of Turnover collected per product is not available. This report is only available for turnover invoiced.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
+CalculationMode=Calculation mode
+AccountancyJournal=Accounting code journal
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+CloneTaxForNextMonth=Clone it for next month
+SimpleReport=Simple report
+AddExtraReport=Extra reports (add foreign and national customer report)
+OtherCountriesCustomersReport=Foreign customers report
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
+SameCountryCustomersWithVAT=National customers report
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
+LinkedFichinter=Link to an intervention
+ImportDataset_tax_contrib=Social/fiscal taxes
+ImportDataset_tax_vat=Vat payments
+ErrorBankAccountNotFound=Error: Bank account not found
+FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
+DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignment
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover invoiced by sale tax rate
+TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
+LabelToShow=Short label
+PurchaseTurnover=Purchase turnover
+PurchaseTurnoverCollected=Purchase turnover collected
+RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
+RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/zh_HK/contracts.lang b/htdocs/langs/zh_HK/contracts.lang
new file mode 100644
index 00000000000..47572c355ab
--- /dev/null
+++ b/htdocs/langs/zh_HK/contracts.lang
@@ -0,0 +1,101 @@
+# Dolibarr language file - Source file is en_US - contracts
+ContractsArea=Contracts area
+ListOfContracts=List of contracts
+AllContracts=All contracts
+ContractCard=Contract card
+ContractStatusNotRunning=Not running
+ContractStatusDraft=Draft
+ContractStatusValidated=Validated
+ContractStatusClosed=Closed
+ServiceStatusInitial=Not running
+ServiceStatusRunning=Running
+ServiceStatusNotLate=Running, not expired
+ServiceStatusNotLateShort=Not expired
+ServiceStatusLate=Running, expired
+ServiceStatusLateShort=Expired
+ServiceStatusClosed=Closed
+ShowContractOfService=Show contract of service
+Contracts=Contracts
+ContractsSubscriptions=Contracts/Subscriptions
+ContractsAndLine=Contracts and line of contracts
+Contract=Contract
+ContractLine=Contract line
+Closing=Closing
+NoContracts=No contracts
+MenuServices=Services
+MenuInactiveServices=Services not active
+MenuRunningServices=Running services
+MenuExpiredServices=Expired services
+MenuClosedServices=Closed services
+NewContract=New contract
+NewContractSubscription=New contract/subscription
+AddContract=Create contract
+DeleteAContract=Delete a contract
+ActivateAllOnContract=Activate all services
+CloseAContract=Close a contract
+ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
+ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
+ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
+ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract?
+ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
+ValidateAContract=Validate a contract
+ActivateService=Activate service
+ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b>?
+RefContract=Contract reference
+DateContract=Contract date
+DateServiceActivate=Service activation date
+ListOfServices=List of services
+ListOfInactiveServices=List of not active services
+ListOfExpiredServices=List of expired active services
+ListOfClosedServices=List of closed services
+ListOfRunningServices=List of running services
+NotActivatedServices=Inactive services (among validated contracts)
+BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
+LastContracts=Latest %s contracts
+LastModifiedServices=Latest %s modified services
+ContractStartDate=Start date
+ContractEndDate=End date
+DateStartPlanned=Planned start date
+DateStartPlannedShort=Planned start date
+DateEndPlanned=Planned end date
+DateEndPlannedShort=Planned end date
+DateStartReal=Real start date
+DateStartRealShort=Real start date
+DateEndReal=Real end date
+DateEndRealShort=Real end date
+CloseService=Close service
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
+ServiceStatus=Status of service
+DraftContracts=Drafts contracts
+CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
+ActivateAllContracts=Activate all contract lines
+CloseAllContracts=Close all contract lines
+DeleteContractLine=Delete a contract line
+ConfirmDeleteContractLine=Are you sure you want to delete this contract line?
+MoveToAnotherContract=Move service into another contract.
+ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract.
+ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
+PaymentRenewContractId=Renew contract line (number %s)
+ExpiredSince=Expiration date
+NoExpiredServices=No expired active services
+ListOfServicesToExpireWithDuration=List of Services to expire in %s days
+ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
+ListOfServicesToExpire=List of Services to expire
+NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
+StandardContractsTemplate=Standard contracts template
+ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
+LowerDateEndPlannedShort=Lower planned end date of active services
+SendContractRef=Contract information __REF__
+OtherContracts=Other contracts
+##### Types de contacts #####
+TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
+TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract
+TypeContact_contrat_external_BILLING=Billing customer contact
+TypeContact_contrat_external_CUSTOMER=Follow-up customer contact
+TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact
diff --git a/htdocs/langs/zh_HK/cron.lang b/htdocs/langs/zh_HK/cron.lang
new file mode 100644
index 00000000000..1de1251831a
--- /dev/null
+++ b/htdocs/langs/zh_HK/cron.lang
@@ -0,0 +1,84 @@
+# Dolibarr language file - Source file is en_US - cron
+# About page
+# Right
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
+# Admin
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
+CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
+CronJobProfiles=List of predefined cron job profiles
+# Menu
+EnabledAndDisabled=Enabled and disabled
+# Page list
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
+CronCommand=Command
+CronList=Scheduled jobs
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
+CronExecute=Launch scheduled job
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
+CronTask=Job
+CronNone=None
+CronDtStart=Not before
+CronDtEnd=Not after
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Start date of latest execution
+CronDtLastResult=End date of latest execution
+CronFrequency=Frequency
+CronClass=Class
+CronMethod=Method
+CronModule=Module
+CronNoJobs=No jobs registered
+CronPriority=Priority
+CronLabel=Label
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
+CronEach=Every
+JobFinished=Job launched and finished
+#Page card
+CronAdd= Add jobs
+CronEvery=Execute job each
+CronObject=Instance/Object to create
+CronArgs=Parameters
+CronSaveSucess=Save successfully
+CronNote=Comment
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+StatusAtInstall=Status at module installation
+CronStatusActiveBtn=Enable
+CronStatusInactiveBtn=Disable
+CronTaskInactive=This job is disabled
+CronId=Id
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
+CronFrom=From
+# Info
+# Common
+CronType=Job type
+CronType_method=Call method of a PHP Class
+CronType_command=Shell command
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
+JobDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
diff --git a/htdocs/langs/zh_HK/deliveries.lang b/htdocs/langs/zh_HK/deliveries.lang
new file mode 100644
index 00000000000..1f48c01de75
--- /dev/null
+++ b/htdocs/langs/zh_HK/deliveries.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - deliveries
+Delivery=Delivery
+DeliveryRef=Ref Delivery
+DeliveryCard=Receipt card
+DeliveryOrder=Delivery receipt
+DeliveryDate=Delivery date
+CreateDeliveryOrder=Generate delivery receipt
+DeliveryStateSaved=Delivery state saved
+SetDeliveryDate=Set shipping date
+ValidateDeliveryReceipt=Validate delivery receipt
+ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt?
+DeleteDeliveryReceipt=Delete delivery receipt
+DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b>?
+DeliveryMethod=Delivery method
+TrackingNumber=Tracking number
+DeliveryNotValidated=Delivery not validated
+StatusDeliveryCanceled=Canceled
+StatusDeliveryDraft=Draft
+StatusDeliveryValidated=Received
+# merou PDF model
+NameAndSignature=Name and Signature:
+ToAndDate=To___________________________________ on ____/_____/__________
+GoodStatusDeclaration=Have received the goods above in good condition,
+Deliverer=Deliverer:
+Sender=Sender
+Recipient=Recipient
+ErrorStockIsNotEnough=There's not enough stock
+Shippable=Shippable
+NonShippable=Not Shippable
+ShowReceiving=Show delivery receipt
+NonExistentOrder=Nonexistent order
diff --git a/htdocs/langs/zh_HK/dict.lang b/htdocs/langs/zh_HK/dict.lang
new file mode 100644
index 00000000000..ec315d97142
--- /dev/null
+++ b/htdocs/langs/zh_HK/dict.lang
@@ -0,0 +1,359 @@
+# Dolibarr language file - Source file is en_US - dict
+CountryFR=France
+CountryBE=Belgium
+CountryIT=Italy
+CountryES=Spain
+CountryDE=Germany
+CountryCH=Switzerland
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
+CountryUK=United Kingdom
+CountryIE=Ireland
+CountryCN=China
+CountryTN=Tunisia
+CountryUS=United States
+CountryMA=Morocco
+CountryDZ=Algeria
+CountryCA=Canada
+CountryTG=Togo
+CountryGA=Gabon
+CountryNL=Netherlands
+CountryHU=Hungary
+CountryRU=Russia
+CountrySE=Sweden
+CountryCI=Ivoiry Coast
+CountrySN=Senegal
+CountryAR=Argentina
+CountryCM=Cameroon
+CountryPT=Portugal
+CountrySA=Saudi Arabia
+CountryMC=Monaco
+CountryAU=Australia
+CountrySG=Singapore
+CountryAF=Afghanistan
+CountryAX=Åland Islands
+CountryAL=Albania
+CountryAS=American Samoa
+CountryAD=Andorra
+CountryAO=Angola
+CountryAI=Anguilla
+CountryAQ=Antarctica
+CountryAG=Antigua and Barbuda
+CountryAM=Armenia
+CountryAW=Aruba
+CountryAT=Austria
+CountryAZ=Azerbaijan
+CountryBS=Bahamas
+CountryBH=Bahrain
+CountryBD=Bangladesh
+CountryBB=Barbados
+CountryBY=Belarus
+CountryBZ=Belize
+CountryBJ=Benin
+CountryBM=Bermuda
+CountryBT=Bhutan
+CountryBO=Bolivia
+CountryBA=Bosnia and Herzegovina
+CountryBW=Botswana
+CountryBV=Bouvet Island
+CountryBR=Brazil
+CountryIO=British Indian Ocean Territory
+CountryBN=Brunei Darussalam
+CountryBG=Bulgaria
+CountryBF=Burkina Faso
+CountryBI=Burundi
+CountryKH=Cambodia
+CountryCV=Cape Verde
+CountryKY=Cayman Islands
+CountryCF=Central African Republic
+CountryTD=Chad
+CountryCL=Chile
+CountryCX=Christmas Island
+CountryCC=Cocos (Keeling) Islands
+CountryCO=Colombia
+CountryKM=Comoros
+CountryCG=Congo
+CountryCD=Congo, The Democratic Republic of the
+CountryCK=Cook Islands
+CountryCR=Costa Rica
+CountryHR=Croatia
+CountryCU=Cuba
+CountryCY=Cyprus
+CountryCZ=Czech Republic
+CountryDK=Denmark
+CountryDJ=Djibouti
+CountryDM=Dominica
+CountryDO=Dominican Republic
+CountryEC=Ecuador
+CountryEG=Egypt
+CountrySV=El Salvador
+CountryGQ=Equatorial Guinea
+CountryER=Eritrea
+CountryEE=Estonia
+CountryET=Ethiopia
+CountryFK=Falkland Islands
+CountryFO=Faroe Islands
+CountryFJ=Fiji Islands
+CountryFI=Finland
+CountryGF=French Guiana
+CountryPF=French Polynesia
+CountryTF=French Southern Territories
+CountryGM=Gambia
+CountryGE=Georgia
+CountryGH=Ghana
+CountryGI=Gibraltar
+CountryGR=Greece
+CountryGL=Greenland
+CountryGD=Grenada
+CountryGP=Guadeloupe
+CountryGU=Guam
+CountryGT=Guatemala
+CountryGN=Guinea
+CountryGW=Guinea-Bissau
+CountryGY=Guyana
+CountryHT=Haïti
+CountryHM=Heard Island and McDonald
+CountryVA=Holy See (Vatican City State)
+CountryHN=Honduras
+CountryHK=Hong Kong
+CountryIS=Iceland
+CountryIN=India
+CountryID=Indonesia
+CountryIR=Iran
+CountryIQ=Iraq
+CountryIL=Israel
+CountryJM=Jamaica
+CountryJP=Japan
+CountryJO=Jordan
+CountryKZ=Kazakhstan
+CountryKE=Kenya
+CountryKI=Kiribati
+CountryKP=North Korea
+CountryKR=South Korea
+CountryKW=Kuwait
+CountryKG=Kyrgyzstan
+CountryLA=Lao
+CountryLV=Latvia
+CountryLB=Lebanon
+CountryLS=Lesotho
+CountryLR=Liberia
+CountryLY=Libyan
+CountryLI=Liechtenstein
+CountryLT=Lithuania
+CountryLU=Luxembourg
+CountryMO=Macao
+CountryMK=Macedonia, the former Yugoslav of
+CountryMG=Madagascar
+CountryMW=Malawi
+CountryMY=Malaysia
+CountryMV=Maldives
+CountryML=Mali
+CountryMT=Malta
+CountryMH=Marshall Islands
+CountryMQ=Martinique
+CountryMR=Mauritania
+CountryMU=Mauritius
+CountryYT=Mayotte
+CountryMX=Mexico
+CountryFM=Micronesia
+CountryMD=Moldova
+CountryMN=Mongolia
+CountryMS=Monserrat
+CountryMZ=Mozambique
+CountryMM=Myanmar (Burma)
+CountryNA=Namibia
+CountryNR=Nauru
+CountryNP=Nepal
+CountryAN=Netherlands Antilles
+CountryNC=New Caledonia
+CountryNZ=New Zealand
+CountryNI=Nicaragua
+CountryNE=Niger
+CountryNG=Nigeria
+CountryNU=Niue
+CountryNF=Norfolk Island
+CountryMP=Northern Mariana Islands
+CountryNO=Norway
+CountryOM=Oman
+CountryPK=Pakistan
+CountryPW=Palau
+CountryPS=Palestinian Territory, Occupied
+CountryPA=Panama
+CountryPG=Papua New Guinea
+CountryPY=Paraguay
+CountryPE=Peru
+CountryPH=Philippines
+CountryPN=Pitcairn Islands
+CountryPL=Poland
+CountryPR=Puerto Rico
+CountryQA=Qatar
+CountryRE=Reunion
+CountryRO=Romania
+CountryRW=Rwanda
+CountrySH=Saint Helena
+CountryKN=Saint Kitts and Nevis
+CountryLC=Saint Lucia
+CountryPM=Saint Pierre and Miquelon
+CountryVC=Saint Vincent and Grenadines
+CountryWS=Samoa
+CountrySM=San Marino
+CountryST=Sao Tome and Principe
+CountryRS=Serbia
+CountrySC=Seychelles
+CountrySL=Sierra Leone
+CountrySK=Slovakia
+CountrySI=Slovenia
+CountrySB=Solomon Islands
+CountrySO=Somalia
+CountryZA=South Africa
+CountryGS=South Georgia and the South Sandwich Islands
+CountryLK=Sri Lanka
+CountrySD=Sudan
+CountrySR=Suriname
+CountrySJ=Svalbard and Jan Mayen
+CountrySZ=Swaziland
+CountrySY=Syrian
+CountryTW=Taiwan
+CountryTJ=Tajikistan
+CountryTZ=Tanzania
+CountryTH=Thailand
+CountryTL=Timor-Leste
+CountryTK=Tokelau
+CountryTO=Tonga
+CountryTT=Trinidad and Tobago
+CountryTR=Turkey
+CountryTM=Turkmenistan
+CountryTC=Turks and Caicos Islands
+CountryTV=Tuvalu
+CountryUG=Uganda
+CountryUA=Ukraine
+CountryAE=United Arab Emirates
+CountryUM=United States Minor Outlying Islands
+CountryUY=Uruguay
+CountryUZ=Uzbekistan
+CountryVU=Vanuatu
+CountryVE=Venezuela
+CountryVN=Viet Nam
+CountryVG=Virgin Islands, British
+CountryVI=Virgin Islands, U.S.
+CountryWF=Wallis and Futuna
+CountryEH=Western Sahara
+CountryYE=Yemen
+CountryZM=Zambia
+CountryZW=Zimbabwe
+CountryGG=Guernsey
+CountryIM=Isle of Man
+CountryJE=Jersey
+CountryME=Montenegro
+CountryBL=Saint Barthelemy
+CountryMF=Saint Martin
+
+##### Civilities #####
+CivilityMME=Mrs.
+CivilityMR=Mr.
+CivilityMLE=Ms.
+CivilityMTRE=Master
+CivilityDR=Doctor
+##### Currencies #####
+Currencyeuros=Euros
+CurrencyAUD=AU Dollars
+CurrencySingAUD=AU Dollar
+CurrencyCAD=CAN Dollars
+CurrencySingCAD=CAN Dollar
+CurrencyCHF=Swiss Francs
+CurrencySingCHF=Swiss Franc
+CurrencyEUR=Euros
+CurrencySingEUR=Euro
+CurrencyFRF=French Francs
+CurrencySingFRF=French Franc
+CurrencyGBP=GB Pounds
+CurrencySingGBP=GB Pound
+CurrencyINR=Indian rupees
+CurrencySingINR=Indian rupee
+CurrencyMAD=Dirham
+CurrencySingMAD=Dirham
+CurrencyMGA=Ariary
+CurrencySingMGA=Ariary
+CurrencyMUR=Mauritius rupees
+CurrencySingMUR=Mauritius rupee
+CurrencyNOK=Norwegian krones
+CurrencySingNOK=Norwegian kronas
+CurrencyTND=Tunisian dinars
+CurrencySingTND=Tunisian dinar
+CurrencyUSD=US Dollars
+CurrencySingUSD=US Dollar
+CurrencyUAH=Hryvnia
+CurrencySingUAH=Hryvnia
+CurrencyXAF=CFA Francs BEAC
+CurrencySingXAF=CFA Franc BEAC
+CurrencyXOF=CFA Francs BCEAO
+CurrencySingXOF=CFA Franc BCEAO
+CurrencyXPF=CFP Francs
+CurrencySingXPF=CFP Franc
+CurrencyCentEUR=cents
+CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=thousandth
+#### Input reasons #####
+DemandReasonTypeSRC_INTE=Internet
+DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
+DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
+DemandReasonTypeSRC_CAMP_PHO=Phone campaign
+DemandReasonTypeSRC_CAMP_FAX=Fax campaign
+DemandReasonTypeSRC_COMM=Commercial contact
+DemandReasonTypeSRC_SHOP=Shop contact
+DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_PARTNER=Partner
+DemandReasonTypeSRC_EMPLOYEE=Employee
+DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
+#### Paper formats ####
+PaperFormatEU4A0=Format 4A0
+PaperFormatEU2A0=Format 2A0
+PaperFormatEUA0=Format A0
+PaperFormatEUA1=Format A1
+PaperFormatEUA2=Format A2
+PaperFormatEUA3=Format A3
+PaperFormatEUA4=Format A4
+PaperFormatEUA5=Format A5
+PaperFormatEUA6=Format A6
+PaperFormatUSLETTER=Format Letter US
+PaperFormatUSLEGAL=Format Legal US
+PaperFormatUSEXECUTIVE=Format Executive US
+PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatCAP1=Format P1 Canada
+PaperFormatCAP2=Format P2 Canada
+PaperFormatCAP3=Format P3 Canada
+PaperFormatCAP4=Format P4 Canada
+PaperFormatCAP5=Format P5 Canada
+PaperFormatCAP6=Format P6 Canada
+#### Expense report categories ####
+ExpAutoCat=Car
+ExpCycloCat=Moped
+ExpMotoCat=Motorbike
+ExpAuto3CV=3 CV
+ExpAuto4CV=4 CV
+ExpAuto5CV=5 CV
+ExpAuto6CV=6 CV
+ExpAuto7CV=7 CV
+ExpAuto8CV=8 CV
+ExpAuto9CV=9 CV
+ExpAuto10CV=10 CV
+ExpAuto11CV=11 CV
+ExpAuto12CV=12 CV
+ExpAuto3PCV=3 CV and more
+ExpAuto4PCV=4 CV and more
+ExpAuto5PCV=5 CV and more
+ExpAuto6PCV=6 CV and more
+ExpAuto7PCV=7 CV and more
+ExpAuto8PCV=8 CV and more
+ExpAuto9PCV=9 CV and more
+ExpAuto10PCV=10 CV and more
+ExpAuto11PCV=11 CV and more
+ExpAuto12PCV=12 CV and more
+ExpAuto13PCV=13 CV and more
+ExpCyclo=Capacity lower to 50cm3
+ExpMoto12CV=Motorbike 1 or 2 CV
+ExpMoto345CV=Motorbike 3, 4 or 5 CV
+ExpMoto5PCV=Motorbike 5 CV and more
diff --git a/htdocs/langs/zh_HK/donations.lang b/htdocs/langs/zh_HK/donations.lang
new file mode 100644
index 00000000000..de4bdf68f03
--- /dev/null
+++ b/htdocs/langs/zh_HK/donations.lang
@@ -0,0 +1,34 @@
+# Dolibarr language file - Source file is en_US - donations
+Donation=Donation
+Donations=Donations
+DonationRef=Donation ref.
+Donor=Donor
+AddDonation=Create a donation
+NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation?
+PublicDonation=Public donation
+DonationsArea=Donations area
+DonationStatusPromiseNotValidated=Draft promise
+DonationStatusPromiseValidated=Validated promise
+DonationStatusPaid=Donation received
+DonationStatusPromiseNotValidatedShort=Draft
+DonationStatusPromiseValidatedShort=Validated
+DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDate=Donation date
+DonationDatePayment=Payment date
+ValidPromess=Validate promise
+DonationReceipt=Donation receipt
+DonationsModels=Documents models for donation receipts
+LastModifiedDonations=Latest %s modified donations
+DonationRecipient=Donation recipient
+IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+MinimumAmount=Minimum amount is  %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
+DonationValidated=Donation %s validated
diff --git a/htdocs/langs/zh_HK/ecm.lang b/htdocs/langs/zh_HK/ecm.lang
new file mode 100644
index 00000000000..369ac6dfdfa
--- /dev/null
+++ b/htdocs/langs/zh_HK/ecm.lang
@@ -0,0 +1,52 @@
+# Dolibarr language file - Source file is en_US - ecm
+ECMNbOfDocs=No. of documents in directory
+ECMSection=Directory
+ECMSectionManual=Manual directory
+ECMSectionAuto=Automatic directory
+ECMSectionsManual=Manual tree
+ECMSectionsAuto=Automatic tree
+ECMSections=Directories
+ECMRoot=ECM Root
+ECMNewSection=New directory
+ECMAddSection=Add directory
+ECMCreationDate=Creation date
+ECMNbOfFilesInDir=Number of files in directory
+ECMNbOfSubDir=Number of sub-directories
+ECMNbOfFilesInSubDir=Number of files in sub-directories
+ECMCreationUser=Creator
+ECMArea=DMS/ECM area
+ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.<br>* Manual directories can be used to save documents not linked to a particular element.
+ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
+ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMSearchByKeywords=Search by keywords
+ECMSearchByEntity=Search by object
+ECMSectionOfDocuments=Directories of documents
+ECMTypeAuto=Automatic
+ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
+ECMDocsByThirdParties=Documents linked to third parties
+ECMDocsByProposals=Documents linked to proposals
+ECMDocsByOrders=Documents linked to customers orders
+ECMDocsByContracts=Documents linked to contracts
+ECMDocsByInvoices=Documents linked to customers invoices
+ECMDocsByProducts=Documents linked to products
+ECMDocsByProjects=Documents linked to projects
+ECMDocsByUsers=Documents linked to users
+ECMDocsByInterventions=Documents linked to interventions
+ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to vendor proposals
+ECMNoDirectoryYet=No directory created
+ShowECMSection=Show directory
+DeleteSection=Remove directory
+ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
+ECMDirectoryForFiles=Relative directory for files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+ECMFileManager=File manager
+ECMSelectASection=Select a directory in the tree...
+DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
+ReSyncListOfDir=Resync list of directories
+HashOfFileContent=Hash of file content
+NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/zh_HK/errors.lang b/htdocs/langs/zh_HK/errors.lang
new file mode 100644
index 00000000000..7c67aeca8b5
--- /dev/null
+++ b/htdocs/langs/zh_HK/errors.lang
@@ -0,0 +1,265 @@
+# Dolibarr language file - Source file is en_US - errors
+
+# No errors
+NoErrorCommitIsDone=No error, we commit
+# Errors
+ErrorButCommitIsDone=Errors found but we validate despite this
+ErrorBadEMail=Email %s is wrong
+ErrorBadUrl=Url %s is wrong
+ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorLoginAlreadyExists=Login %s already exists.
+ErrorGroupAlreadyExists=Group %s already exists.
+ErrorRecordNotFound=Record not found.
+ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
+ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
+ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
+ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
+ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
+ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
+ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
+ErrorBadThirdPartyName=Bad value for third-party name
+ErrorProdIdIsMandatory=The %s is mandatory
+ErrorBadCustomerCodeSyntax=Bad syntax for customer code
+ErrorBadBarCodeSyntax=Bad syntax for barcode. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorCustomerCodeRequired=Customer code required
+ErrorBarCodeRequired=Barcode required
+ErrorCustomerCodeAlreadyUsed=Customer code already used
+ErrorBarCodeAlreadyUsed=Barcode already used
+ErrorPrefixRequired=Prefix required
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
+ErrorBadParameters=Bad parameters
+ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
+ErrorBadDateFormat=Value '%s' has wrong date format
+ErrorWrongDate=Date is not correct!
+ErrorFailedToWriteInDir=Failed to write in directory %s
+ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
+ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
+ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
+ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
+ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
+ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
+ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
+ErrorFileNotFound=File <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
+ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
+ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
+ErrorDirAlreadyExists=A directory with this name already exists.
+ErrorFileAlreadyExists=A file with this name already exists.
+ErrorPartialFile=File not received completely by server.
+ErrorNoTmpDir=Temporary directy %s does not exists.
+ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
+ErrorFileSizeTooLarge=File size is too large.
+ErrorFieldTooLong=Field %s is too long.
+ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum)
+ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum)
+ErrorNoValueForSelectType=Please fill value for select list
+ErrorNoValueForCheckBoxType=Please fill value for checkbox list
+ErrorNoValueForRadioType=Please fill value for radio list
+ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
+ErrorFieldCanNotContainSpecialCharacters=The field <b>%s</b> must not contains special characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
+ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
+ErrorNoAccountancyModuleLoaded=No accountancy module activated
+ErrorExportDuplicateProfil=This profile name already exists for this export set.
+ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
+ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
+ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
+ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
+ErrorRecordHasChildren=Failed to delete record since it has some child records.
+ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
+ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
+ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display.
+ErrorPasswordsMustMatch=Both typed passwords must match each other
+ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
+ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
+ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
+ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
+ErrorsOnXLines=%s errors found
+ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
+ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
+ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
+ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorBadMask=Error on mask
+ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
+ErrorBadMaskBadRazMonth=Error, bad reset value
+ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
+ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
+ErrorSelectAtLeastOne=Error, select at least one entry.
+ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
+ErrorProdIdAlreadyExist=%s is assigned to another third
+ErrorFailedToSendPassword=Failed to send password
+ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
+ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
+ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
+ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
+ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
+ErrorRecordAlreadyExists=Record already exists
+ErrorLabelAlreadyExists=This label already exists
+ErrorCantReadFile=Failed to read file '%s'
+ErrorCantReadDir=Failed to read directory '%s'
+ErrorBadLoginPassword=Bad value for login or password
+ErrorLoginDisabled=Your account has been disabled
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToChangePassword=Failed to change password
+ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
+ErrorLoginHasNoEmail=This user has no email address. Process aborted.
+ErrorBadValueForCode=Bad value for security code. Try again with new value...
+ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice.
+ErrorLinesCantBeNegativeForOneVATRate=Total of lines can't be negative for a given VAT rate.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
+ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
+ErrorNoActivatedBarcode=No barcode type activated
+ErrUnzipFails=Failed to unzip %s with ZipArchive
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
+ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
+ErrorModuleFileRequired=You must select a Dolibarr module package file
+ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
+ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
+ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
+ErrorNewValueCantMatchOldValue=New value can't be equal to old one
+ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
+ErrorFailedToAddContact=Failed to add contact
+ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
+ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
+ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
+ErrorWarehouseMustDiffers=Source and target warehouses must differs
+ErrorBadFormat=Bad format!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
+ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
+ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
+ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Operator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpression23=Unknown or non set variable '%s' in %s
+ErrorPriceExpression24=Variable '%s' exists but has no value
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
+ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
+ErrorSavingChanges=An error has occurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
+ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
+ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
+ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
+ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
+ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
+ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
+ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
+ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
+ErrorTaskAlreadyAssigned=Task already assigned to user
+ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
+ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
+ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
+ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
+ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
+ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
+ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
+ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
+ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
+ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
+ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
+ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
+ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, record is already transferred in accounting, deletion is not possible.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, language is mandatory if you set the page as a translation of another one.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
+ErrorBatchNoFoundForProductInWarehouse=No lot/serial found for product "%s" in warehouse "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this lot/serial for product "%s" in warehouse "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
+ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
+ErrorReplaceStringEmpty=Error, the string to replace into is empty
+# Warnings
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
+WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
+WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
+WarningEnableYourModulesApplications=Click here to enable your modules and applications
+WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.
+WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
+WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
+WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php</b>) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe.
+WarningsOnXLines=Warnings on <b>%s</b> source record(s)
+WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
+WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable the installation/migration tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Omitting the creation of this file is a grave security risk.
+WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
+WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
+WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
+WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
+WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
+WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
+WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
+WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectClosed=Project is closed. You must re-open it first.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
diff --git a/htdocs/langs/zh_HK/exports.lang b/htdocs/langs/zh_HK/exports.lang
new file mode 100644
index 00000000000..3549e3f8b23
--- /dev/null
+++ b/htdocs/langs/zh_HK/exports.lang
@@ -0,0 +1,135 @@
+# Dolibarr language file - Source file is en_US - exports
+ExportsArea=Exports
+ImportArea=Import
+NewExport=New Export
+NewImport=New Import
+ExportableDatas=Exportable dataset
+ImportableDatas=Importable dataset
+SelectExportDataSet=Choose dataset you want to export...
+SelectImportDataSet=Choose dataset you want to import...
+SelectExportFields=Choose the fields you want to export, or select a predefined export profile
+SelectImportFields=Choose the source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
+NotImportedFields=Fields of source file not imported
+SaveExportModel=Save your selections as an export profile/template (for reuse).
+SaveImportModel=Save this import profile (for reuse) ...
+ExportModelName=Export profile name
+ExportModelSaved=Export profile saved as <b>%s</b>.
+ExportableFields=Exportable fields
+ExportedFields=Exported fields
+ImportModelName=Import profile name
+ImportModelSaved=Import profile saved as <b>%s</b>.
+DatasetToExport=Dataset to export
+DatasetToImport=Import file into dataset
+ChooseFieldsOrdersAndTitle=Choose fields order...
+FieldsTitle=Fields title
+FieldTitle=Field title
+NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
+AvailableFormats=Available Formats
+LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
+Step=Step
+FormatedImport=Import Assistant
+FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
+FormatedImportDesc2=First step is to choose the kind of data you want to import, then the format of the source file, then the fields you want to import.
+FormatedExport=Export Assistant
+FormatedExportDesc1=These tools allow the export of personalized data using an assistant, to help you in the process without requiring technical knowledge.
+FormatedExportDesc2=First step is to choose a predefined dataset, then which fields you want to export, and in which order.
+FormatedExportDesc3=When data to export are selected, you can choose the format of the output file.
+Sheet=Sheet
+NoImportableData=No importable data (no module with definitions to allow data imports)
+FileSuccessfullyBuilt=File generated
+SQLUsedForExport=SQL Request used to extract data
+LineId=Id of line
+LineLabel=Label of line
+LineDescription=Description of line
+LineUnitPrice=Unit price of line
+LineVATRate=VAT Rate of line
+LineQty=Quantity for line
+LineTotalHT=Amount excl. tax for line
+LineTotalTTC=Amount with tax for line
+LineTotalVAT=Amount of VAT for line
+TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
+FileWithDataToImport=File with data to import
+FileToImport=Source file to import
+FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SourceFileFormat=Source file format
+FieldsInSourceFile=Fields in source file
+FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+Field=Field
+NoFields=No fields
+MoveField=Move field column number %s
+ExampleOfImportFile=Example_of_import_file
+SaveImportProfile=Save this import profile
+ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name.
+TablesTarget=Targeted tables
+FieldsTarget=Targeted fields
+FieldTarget=Targeted field
+FieldSource=Source field
+NbOfSourceLines=Number of lines in source file
+NowClickToTestTheImport=Check that the file format (field and string delimiters) of your file matches the options shown and that you have omitted the header line, or these will be flagged as errors in the following simulation.<br>Click on the "<b>%s</b>" button to run a check of the file structure/contents and simulate the import process.<br><b>No data will be changed in your database</b>.
+RunSimulateImportFile=Run Import Simulation
+FieldNeedSource=This field requires data from the source file
+SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
+InformationOnSourceFile=Information on source file
+InformationOnTargetTables=Information on target fields
+SelectAtLeastOneField=Switch at least one source field in the column of fields to export
+SelectFormat=Choose this import file format
+RunImportFile=Import Data
+NowClickToRunTheImport=Check the results of the import simulation. Correct any errors and re-test.<br>When the simulation reports no errors you may proceed to import the data into the database.
+DataLoadedWithId=The imported data will have an additional field in each database table with this import id: <b>%s</b>, to allow it to be searchable in the case of investigating a problem related to this import.
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+TooMuchErrors=There are still <b>%s</b> other source lines with errors but output has been limited.
+TooMuchWarnings=There are still <b>%s</b> other source lines with warnings but output has been limited.
+EmptyLine=Empty line (will be discarded)
+CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
+FileWasImported=File was imported with number <b>%s</b>.
+YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
+NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
+NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
+DataComeFromNoWhere=Value to insert comes from nowhere in source file.
+DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
+DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
+DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
+DataIsInsertedInto=Data coming from source file will be inserted into the following field:
+DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
+DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field:
+SourceRequired=Data value is mandatory
+SourceExample=Example of possible data value
+ExampleAnyRefFoundIntoElement=Any ref found for element <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
+CSVFormatDesc=<b>Comma Separated Value</b> file format (.csv).<br>This is a text file format where fields are separated by a separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ].
+Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is the native Excel 95 format (BIFF5).
+Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is the native Excel 2007 format (SpreadsheetML).
+TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
+ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate record (with this field added, all lines will own their own id and will differ).
+CsvOptions=CSV format options
+Separator=Field Separator
+Enclosure=String Delimiter
+SpecialCode=Special code
+ExportStringFilter=%% allows replacing one or more characters in the text
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD: filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD: filters on all previous years/months/days
+ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+ImportFromToLine=Limit range (From - To). Eg. to omit header line(s).
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines.<br>If the header lines are NOT omitted, this will result in multiple errors in the Import Simulation.
+KeepEmptyToGoToEndOfFile=Keep this field empty to process all lines to the end of the file.
+SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for an UPDATE import
+UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
+NoUpdateAttempt=No update attempt was performed, only insert
+ImportDataset_user_1=Users (employees or not) and properties
+ComputedField=Computed field
+## filters
+SelectFilterFields=If you want to filter on some values, just input values here.
+FilteredFields=Filtered fields
+FilteredFieldsValues=Value for filter
+FormatControlRule=Format control rule
+## imports updates
+KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
+NbInsert=Number of inserted lines: %s
+NbUpdate=Number of updated lines: %s
+MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
diff --git a/htdocs/langs/zh_HK/externalsite.lang b/htdocs/langs/zh_HK/externalsite.lang
new file mode 100644
index 00000000000..da4853df0df
--- /dev/null
+++ b/htdocs/langs/zh_HK/externalsite.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExternalSiteSetup=Setup link to external website
+ExternalSiteURL=External Site URL
+ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/zh_HK/ftp.lang b/htdocs/langs/zh_HK/ftp.lang
new file mode 100644
index 00000000000..d80b87c2715
--- /dev/null
+++ b/htdocs/langs/zh_HK/ftp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - ftp
+FTPClientSetup=FTP Client module setup
+NewFTPClient=New FTP connection setup
+FTPArea=FTP Area
+FTPAreaDesc=This screen shows a view of an FTP server.
+SetupOfFTPClientModuleNotComplete=The setup of the FTP client module seems to be incomplete
+FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
+FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
+FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
+FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
+FTPPassiveMode=Passive mode
+ChooseAFTPEntryIntoMenu=Choose a FTP site from the menu...
+FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/zh_HK/help.lang b/htdocs/langs/zh_HK/help.lang
new file mode 100644
index 00000000000..048de16d3c0
--- /dev/null
+++ b/htdocs/langs/zh_HK/help.lang
@@ -0,0 +1,23 @@
+# Dolibarr language file - Source file is en_US - help
+CommunitySupport=Forum/Wiki support
+EMailSupport=Emails support
+RemoteControlSupport=Online real-time / remote support
+OtherSupport=Other support
+ToSeeListOfAvailableRessources=To contact/see available resources:
+HelpCenter=Help Center
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
+TypeSupportCommunauty=Community (free)
+TypeSupportCommercial=Commercial
+TypeOfHelp=Type
+NeedHelpCenter=Need help or support?
+Efficiency=Efficiency
+TypeHelpOnly=Help only
+TypeHelpDev=Help+Development
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
+PossibleLanguages=Supported languages
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
+SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/zh_HK/holiday.lang b/htdocs/langs/zh_HK/holiday.lang
new file mode 100644
index 00000000000..82de49f9c5f
--- /dev/null
+++ b/htdocs/langs/zh_HK/holiday.lang
@@ -0,0 +1,133 @@
+# Dolibarr language file - Source file is en_US - holiday
+HRM=HRM
+Holidays=Leave
+CPTitreMenu=Leave
+MenuReportMonth=Monthly statement
+MenuAddCP=New leave request
+NotActiveModCP=You must enable the module Leave to view this page.
+AddCP=Make a leave request
+DateDebCP=Start date
+DateFinCP=End date
+DraftCP=Draft
+ToReviewCP=Awaiting approval
+ApprovedCP=Approved
+CancelCP=Canceled
+RefuseCP=Refused
+ValidatorCP=Approbator
+ListeCP=List of leave
+LeaveId=Leave ID
+ReviewedByCP=Will be approved by
+UserID=User ID
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
+DescCP=Description
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
+ErrorEndDateCP=You must select an end date greater than the start date.
+ErrorSQLCreateCP=An SQL error occurred during the creation:
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
+ReturnCP=Return to previous page
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosWorkflowCP=Information Workflow
+RequestByCP=Requested by
+TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
+NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DayIsANonWorkingDay=%s is a non working day
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
+EditCP=Edit
+DeleteCP=Delete
+ActionRefuseCP=Refuse
+ActionCancelCP=Cancel
+StatutCP=Status
+TitleDeleteCP=Delete the leave request
+ConfirmDeleteCP=Confirm the deletion of this leave request?
+ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
+CantCreateCP=You don't have the right to make leave requests.
+InvalidValidatorCP=You must choose an approbator to your leave request.
+NoDateDebut=You must select a start date.
+NoDateFin=You must select an end date.
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
+ConfirmValidCP=Are you sure you want to approve the leave request?
+DateValidCP=Date approved
+TitleToValidCP=Send leave request
+ConfirmToValidCP=Are you sure you want to send the leave request?
+TitleRefuseCP=Refuse the leave request
+ConfirmRefuseCP=Are you sure you want to refuse the leave request?
+NoMotifRefuseCP=You must choose a reason for refusing the request.
+TitleCancelCP=Cancel the leave request
+ConfirmCancelCP=Are you sure you want to cancel the leave request?
+DetailRefusCP=Reason for refusal
+DateRefusCP=Date of refusal
+DateCancelCP=Date of cancellation
+DefineEventUserCP=Assign an exceptional leave for a user
+addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
+MotifCP=Reason
+UserCP=User
+ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
+AddEventToUserOkCP=The addition of the exceptional leave has been completed.
+MenuLogCP=View change logs
+LogCP=Log of updates of available vacation days
+ActionByCP=Performed by
+UserUpdateCP=For the user
+PrevSoldeCP=Previous Balance
+NewSoldeCP=New Balance
+alreadyCPexist=A leave request has already been done on this period.
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
+BoxTitleLastLeaveRequests=Latest %s modified leave requests
+HolidaysMonthlyUpdate=Monthly update
+ManualUpdate=Manual update
+HolidaysCancelation=Leave request cancelation
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
+## Configuration du Module ##
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
+UpdateConfCPOK=Updated successfully.
+Module27130Name= Management of leave requests
+Module27130Desc= Management of leave requests
+ErrorMailNotSend=An error occurred while sending email:
+NoticePeriod=Notice period
+#Messages
+HolidaysToValidate=Validate leave requests
+HolidaysToValidateBody=Below is a leave request to validate
+HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
+HolidaysValidated=Validated leave requests
+HolidaysValidatedBody=Your leave request for %s to %s has been validated.
+HolidaysRefused=Request denied
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
+HolidaysCanceled=Canceled leaved request
+HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
+FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
+NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
+NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
diff --git a/htdocs/langs/zh_HK/hrm.lang b/htdocs/langs/zh_HK/hrm.lang
new file mode 100644
index 00000000000..3697c47e30d
--- /dev/null
+++ b/htdocs/langs/zh_HK/hrm.lang
@@ -0,0 +1,18 @@
+# Dolibarr language file - en_US - hrm
+# Admin
+HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
+Establishments=Establishments
+Establishment=Establishment
+NewEstablishment=New establishment
+DeleteEstablishment=Delete establishment
+ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
+OpenEtablishment=Open establishment
+CloseEtablishment=Close establishment
+# Dictionary
+DictionaryPublicHolidays=HRM - Public holidays
+DictionaryDepartment=HRM - Department list
+DictionaryFunction=HRM - Function list
+# Module
+Employees=Employees
+Employee=Employee
+NewEmployee=New employee
diff --git a/htdocs/langs/zh_HK/install.lang b/htdocs/langs/zh_HK/install.lang
new file mode 100644
index 00000000000..f67dff57184
--- /dev/null
+++ b/htdocs/langs/zh_HK/install.lang
@@ -0,0 +1,223 @@
+# Dolibarr language file - Source file is en_US - install
+InstallEasy=Just follow the instructions step by step.
+MiscellaneousChecks=Prerequisites check
+ConfFileExists=Configuration file <b>%s</b> exists.
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
+ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
+ConfFileReload=Reloading parameters from configuration file.
+PHPSupportSessions=This PHP supports sessions.
+PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportCalendar=This PHP supports calendars extensions.
+PHPSupportUTF8=This PHP supports UTF8 functions.
+PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupport=This PHP supports %s functions.
+PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
+ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
+ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
+ErrorDirDoesNotExists=Directory %s does not exist.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
+ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
+ErrorFailedToCreateDatabase=Failed to create database '%s'.
+ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
+ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
+ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
+ErrorDatabaseAlreadyExists=Database '%s' already exists.
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
+IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
+PHPVersion=PHP Version
+License=Using license
+ConfigurationFile=Configuration file
+WebPagesDirectory=Directory where web pages are stored
+DocumentsDirectory=Directory to store uploaded and generated documents
+URLRoot=URL Root
+ForceHttps=Force secure connections (https)
+CheckToForceHttps=Check this option to force secure connections (https).<br>This requires that the web server is configured with an SSL certificate.
+DolibarrDatabase=Dolibarr Database
+DatabaseType=Database type
+DriverType=Driver type
+Server=Server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
+ServerPortDescription=Database server port. Keep empty if unknown.
+DatabaseServer=Database server
+DatabaseName=Database name
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
+AdminPassword=Password for Dolibarr database owner.
+CreateDatabase=Create database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
+DatabaseSuperUserAccess=Database server - Superuser access
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
+ServerConnection=Server connection
+DatabaseCreation=Database creation
+CreateDatabaseObjects=Database objects creation
+ReferenceDataLoading=Reference data loading
+TablesAndPrimaryKeysCreation=Tables and Primary keys creation
+CreateTableAndPrimaryKey=Create table %s
+CreateOtherKeysForTable=Create foreign keys and indexes for table %s
+OtherKeysCreation=Foreign keys and indexes creation
+FunctionsCreation=Functions creation
+AdminAccountCreation=Administrator login creation
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
+SetupEnd=End of setup
+SystemIsInstalled=This installation is complete.
+SystemIsUpgraded=Dolibarr has been upgraded successfully.
+YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below:
+AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
+GoToDolibarr=Go to Dolibarr
+GoToSetupArea=Go to Dolibarr (setup area)
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
+GoToUpgradePage=Go to upgrade page again
+WithNoSlashAtTheEnd=Without the slash "/" at the end
+DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
+LoginAlreadyExists=Already exists
+DolibarrAdminLogin=Dolibarr admin login
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
+FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
+ChoosedMigrateScript=Choose migration script
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
+ProcessMigrateScript=Script processing
+ChooseYourSetupMode=Choose your setup mode and click "Start"...
+FreshInstall=Fresh install
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
+Upgrade=Upgrade
+UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
+Start=Start
+InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
+YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
+AlreadyDone=Already migrated
+DatabaseVersion=Database version
+ServerVersion=Database server version
+YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
+DBSortingCollation=Character sorting order
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
+OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
+RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
+FieldRenamed=Field renamed
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
+InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
+InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
+IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
+OpenBaseDir=PHP openbasedir parameter
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
+MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
+MigrationShippingDelivery=Upgrade storage of shipping
+MigrationShippingDelivery2=Upgrade storage of shipping 2
+MigrationFinished=Migration finished
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
+ActivateModule=Activate module %s
+ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
+SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
+NothingToDelete=Nothing to clean/delete
+NothingToDo=Nothing to do
+#########
+# upgrade
+MigrationFixData=Fix for denormalized data
+MigrationOrder=Data migration for customer's orders
+MigrationSupplierOrder=Data migration for vendor's orders
+MigrationProposal=Data migration for commercial proposals
+MigrationInvoice=Data migration for customer's invoices
+MigrationContract=Data migration for contracts
+MigrationSuccessfullUpdate=Upgrade successful
+MigrationUpdateFailed=Failed upgrade process
+MigrationRelationshipTables=Data migration for relationship tables (%s)
+MigrationPaymentsUpdate=Payment data correction
+MigrationPaymentsNumberToUpdate=%s payment(s) to update
+MigrationProcessPaymentUpdate=Update payment(s) %s
+MigrationPaymentsNothingToUpdate=No more things to do
+MigrationPaymentsNothingUpdatable=No more payments that can be corrected
+MigrationContractsUpdate=Contract data correction
+MigrationContractsNumberToUpdate=%s contract(s) to update
+MigrationContractsLineCreation=Create contract line for contract ref %s
+MigrationContractsNothingToUpdate=No more things to do
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
+MigrationContractsEmptyDatesUpdate=Contract empty date correction
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
+MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
+MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
+MigrationContractsInvalidDatesUpdate=Bad value date contract correction
+MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s)
+MigrationContractsInvalidDatesNumber=%s contracts modified
+MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct
+MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction
+MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
+MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct
+MigrationReopeningContracts=Open contract closed by error
+MigrationReopenThisContract=Reopen contract %s
+MigrationReopenedContractsNumber=%s contracts modified
+MigrationReopeningContractsNothingToUpdate=No closed contract to open
+MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
+MigrationBankTransfertsNothingToUpdate=All links are up to date
+MigrationShipmentOrderMatching=Sendings receipt update
+MigrationDeliveryOrderMatching=Delivery receipt update
+MigrationDeliveryDetail=Delivery update
+MigrationStockDetail=Update stock value of products
+MigrationMenusDetail=Update dynamic menus tables
+MigrationDeliveryAddress=Update delivery address in shipments
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
+MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
+MigrationProjectTaskTime=Update time spent in seconds
+MigrationActioncommElement=Update data on actions
+MigrationPaymentMode=Data migration for payment type
+MigrationCategorieAssociation=Migration of categories
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
+MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
+MigrationReloadModule=Reload module %s
+MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
+ClickHereToGoToApp=Click here to go to your application
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/zh_HK/interventions.lang b/htdocs/langs/zh_HK/interventions.lang
new file mode 100644
index 00000000000..e5936f8246e
--- /dev/null
+++ b/htdocs/langs/zh_HK/interventions.lang
@@ -0,0 +1,66 @@
+# Dolibarr language file - Source file is en_US - interventions
+Intervention=Intervention
+Interventions=Interventions
+InterventionCard=Intervention card
+NewIntervention=New intervention
+AddIntervention=Create intervention
+ChangeIntoRepeatableIntervention=Change to repeatable intervention
+ListOfInterventions=List of interventions
+ActionsOnFicheInter=Actions on intervention
+LastInterventions=Latest %s interventions
+AllInterventions=All interventions
+CreateDraftIntervention=Create draft
+InterventionContact=Intervention contact
+DeleteIntervention=Delete intervention
+ValidateIntervention=Validate intervention
+ModifyIntervention=Modify intervention
+DeleteInterventionLine=Delete intervention line
+ConfirmDeleteIntervention=Are you sure you want to delete this intervention?
+ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
+ConfirmModifyIntervention=Are you sure you want to modify this intervention?
+ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line?
+ConfirmCloneIntervention=Are you sure you want to clone this intervention?
+NameAndSignatureOfInternalContact=Name and signature of intervening:
+NameAndSignatureOfExternalContact=Name and signature of customer:
+DocumentModelStandard=Standard document model for interventions
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
+InterventionClassifyDone=Classify "Done"
+StatusInterInvoiced=Billed
+SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by email
+InterventionDeletedInDolibarr=Intervention %s deleted
+InterventionsArea=Interventions area
+DraftFichinter=Draft interventions
+LastModifiedInterventions=Latest %s modified interventions
+FichinterToProcess=Interventions to process
+TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
+PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
+PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
+UseDurationOnFichinter=Hides the duration field for intervention records
+UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records
+InterventionStatistics=Statistics of interventions
+NbOfinterventions=No. of intervention cards
+NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
+InterId=Intervention id
+InterRef=Intervention ref.
+InterDateCreation=Date creation intervention
+InterDuration=Duration intervention
+InterStatus=Status intervention
+InterNote=Note intervention
+InterLine=Line of intervention
+InterLineId=Line id intervention
+InterLineDate=Line date intervention
+InterLineDuration=Line duration intervention
+InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
diff --git a/htdocs/langs/zh_HK/languages.lang b/htdocs/langs/zh_HK/languages.lang
new file mode 100644
index 00000000000..6185183161b
--- /dev/null
+++ b/htdocs/langs/zh_HK/languages.lang
@@ -0,0 +1,89 @@
+# Dolibarr language file - Source file is en_US - languages
+Language_ar_AR=Arabic
+Language_ar_EG=Arabic (Egypt)
+Language_ar_SA=Arabic
+Language_bn_BD=Bengali
+Language_bg_BG=Bulgarian
+Language_bs_BA=Bosnian
+Language_ca_ES=Catalan
+Language_cs_CZ=Czech
+Language_da_DA=Danish
+Language_da_DK=Danish
+Language_de_DE=German
+Language_de_AT=German (Austria)
+Language_de_CH=German (Switzerland)
+Language_el_GR=Greek
+Language_el_CY=Greek (Cyprus)
+Language_en_AU=English (Australia)
+Language_en_CA=English (Canada)
+Language_en_GB=English (United Kingdom)
+Language_en_IN=English (India)
+Language_en_NZ=English (New Zealand)
+Language_en_SA=English (Saudi Arabia)
+Language_en_US=English (United States)
+Language_en_ZA=English (South Africa)
+Language_es_ES=Spanish
+Language_es_AR=Spanish (Argentina)
+Language_es_BO=Spanish (Bolivia)
+Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
+Language_es_EC=Spanish (Ecuador)
+Language_es_HN=Spanish (Honduras)
+Language_es_MX=Spanish (Mexico)
+Language_es_PA=Spanish (Panama)
+Language_es_PY=Spanish (Paraguay)
+Language_es_PE=Spanish (Peru)
+Language_es_PR=Spanish (Puerto Rico)
+Language_es_UY=Spanish (Uruguay)
+Language_es_VE=Spanish (Venezuela)
+Language_et_EE=Estonian
+Language_eu_ES=Basque
+Language_fa_IR=Persian
+Language_fi_FI=Finnish
+Language_fr_BE=French (Belgium)
+Language_fr_CA=French (Canada)
+Language_fr_CH=French (Switzerland)
+Language_fr_FR=French
+Language_fr_NC=French (New Caledonia)
+Language_fy_NL=Frisian
+Language_he_IL=Hebrew
+Language_hr_HR=Croatian
+Language_hu_HU=Hungarian
+Language_id_ID=Indonesian
+Language_is_IS=Icelandic
+Language_it_IT=Italian
+Language_ja_JP=Japanese
+Language_ka_GE=Georgian
+Language_km_KH=Khmer
+Language_kn_IN=Kannada
+Language_ko_KR=Korean
+Language_lo_LA=Lao
+Language_lt_LT=Lithuanian
+Language_lv_LV=Latvian
+Language_mk_MK=Macedonian
+Language_mn_MN=Mongolian
+Language_nb_NO=Norwegian (Bokmål)
+Language_nl_BE=Dutch (Belgium)
+Language_nl_NL=Dutch
+Language_pl_PL=Polish
+Language_pt_BR=Portuguese (Brazil)
+Language_pt_PT=Portuguese
+Language_ro_RO=Romanian
+Language_ru_RU=Russian
+Language_ru_UA=Russian (Ukraine)
+Language_tr_TR=Turkish
+Language_sl_SI=Slovenian
+Language_sv_SV=Swedish
+Language_sv_SE=Swedish
+Language_sq_AL=Albanian
+Language_sk_SK=Slovakian
+Language_sr_RS=Serbian
+Language_sw_SW=Kiswahili
+Language_th_TH=Thai
+Language_uk_UA=Ukrainian
+Language_uz_UZ=Uzbek
+Language_vi_VN=Vietnamese
+Language_zh_CN=Chinese
+Language_zh_TW=Chinese (Traditional)
+Language_bh_MY=Malay
diff --git a/htdocs/langs/zh_HK/ldap.lang b/htdocs/langs/zh_HK/ldap.lang
new file mode 100644
index 00000000000..8b6f0864215
--- /dev/null
+++ b/htdocs/langs/zh_HK/ldap.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - ldap
+YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
+UserMustChangePassNextLogon=User must change password on the domain %s
+LDAPInformationsForThisContact=Information in LDAP database for this contact
+LDAPInformationsForThisUser=Information in LDAP database for this user
+LDAPInformationsForThisGroup=Information in LDAP database for this group
+LDAPInformationsForThisMember=Information in LDAP database for this member
+LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPAttributes=LDAP attributes
+LDAPCard=LDAP card
+LDAPRecordNotFound=Record not found in LDAP database
+LDAPUsers=Users in LDAP database
+LDAPFieldStatus=Status
+LDAPFieldFirstSubscriptionDate=First subscription date
+LDAPFieldFirstSubscriptionAmount=First subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example: skypeName
+UserSynchronized=User synchronized
+GroupSynchronized=Group synchronized
+MemberSynchronized=Member synchronized
+MemberTypeSynchronized=Member type synchronized
+ContactSynchronized=Contact synchronized
+ForceSynchronize=Force synchronizing Dolibarr -> LDAP
+ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/zh_HK/link.lang b/htdocs/langs/zh_HK/link.lang
new file mode 100644
index 00000000000..1ffcd41a18b
--- /dev/null
+++ b/htdocs/langs/zh_HK/link.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - languages
+LinkANewFile=Link a new file/document
+LinkedFiles=Linked files and documents
+NoLinkFound=No registered links
+LinkComplete=The file has been linked successfully
+ErrorFileNotLinked=The file could not be linked
+LinkRemoved=The link %s has been removed
+ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
+ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+URLToLink=URL to link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/zh_HK/loan.lang b/htdocs/langs/zh_HK/loan.lang
new file mode 100644
index 00000000000..534dee08867
--- /dev/null
+++ b/htdocs/langs/zh_HK/loan.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+LoanPayment=Loan payment
+ShowLoanPayment=Show Loan Payment
+LoanCapital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+Term=Term
+LoanAccountancyCapitalCode=Accounting account capital
+LoanAccountancyInsuranceCode=Accounting account insurance
+LoanAccountancyInterestCode=Accounting account interest
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ListLoanAssociatedProject=List of loan associated with the project
+AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
+CreateCalcSchedule=Edit financial commitment
diff --git a/htdocs/langs/zh_HK/mailmanspip.lang b/htdocs/langs/zh_HK/mailmanspip.lang
new file mode 100644
index 00000000000..bab4b3576b4
--- /dev/null
+++ b/htdocs/langs/zh_HK/mailmanspip.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - mailmanspip
+MailmanSpipSetup=Mailman and SPIP module Setup
+MailmanTitle=Mailman mailing list system
+TestSubscribe=To test subscription to Mailman lists
+TestUnSubscribe=To test unsubscribe from Mailman lists
+MailmanCreationSuccess=Subscription test was executed successfully
+MailmanDeletionSuccess=Unsubscription test was executed successfully
+SynchroMailManEnabled=A Mailman update will be performed
+SynchroSpipEnabled=A Spip update will be performed
+DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
+DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
+DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
+DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
+SPIPTitle=SPIP Content Management System
+DescADHERENT_SPIP_SERVEUR=SPIP Server
+DescADHERENT_SPIP_DB=SPIP database name
+DescADHERENT_SPIP_USER=SPIP database login
+DescADHERENT_SPIP_PASS=SPIP database password
+AddIntoSpip=Add into SPIP
+AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
+AddIntoSpipError=Failed to add the user in SPIP
+DeleteIntoSpip=Remove from SPIP
+DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
+DeleteIntoSpipError=Failed to suppress the user from SPIP
+SPIPConnectionFailed=Failed to connect to SPIP
+SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
+SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
diff --git a/htdocs/langs/zh_HK/mails.lang b/htdocs/langs/zh_HK/mails.lang
new file mode 100644
index 00000000000..7b3bfd3852a
--- /dev/null
+++ b/htdocs/langs/zh_HK/mails.lang
@@ -0,0 +1,170 @@
+# Dolibarr language file - Source file is en_US - mails
+Mailing=EMailing
+EMailing=EMailing
+EMailings=EMailings
+AllEMailings=All eMailings
+MailCard=EMailing card
+MailRecipients=Recipients
+MailRecipient=Recipient
+MailTitle=Description
+MailFrom=Sender
+MailErrorsTo=Errors to
+MailReply=Reply to
+MailTo=Receiver(s)
+MailToUsers=To user(s)
+MailCC=Copy to
+MailToCCUsers=Copy to users(s)
+MailCCC=Cached copy to
+MailTopic=Email topic
+MailText=Message
+MailFile=Attached files
+MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
+ShowEMailing=Show emailing
+ListOfEMailings=List of emailings
+NewMailing=New emailing
+EditMailing=Edit emailing
+ResetMailing=Resend emailing
+DeleteMailing=Delete emailing
+DeleteAMailing=Delete an emailing
+PreviewMailing=Preview emailing
+CreateMailing=Create emailing
+TestMailing=Test email
+ValidMailing=Valid emailing
+MailingStatusDraft=Draft
+MailingStatusValidated=Validated
+MailingStatusSent=Sent
+MailingStatusSentPartialy=Sent partially
+MailingStatusSentCompletely=Sent completely
+MailingStatusError=Error
+MailingStatusNotSent=Not sent
+MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
+MailingSuccessfullyValidated=EMailing successfully validated
+MailUnsubcribe=Unsubscribe
+MailingStatusNotContact=Don't contact anymore
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
+ErrorMailRecipientIsEmpty=Email recipient is empty
+WarningNoEMailsAdded=No new Email to add to recipient's list.
+ConfirmValidMailing=Are you sure you want to validate this emailing?
+ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
+ConfirmDeleteMailing=Are you sure you want to delete this emailing?
+NbOfUniqueEMails=No. of unique emails
+NbOfEMails=No. of EMails
+TotalNbOfDistinctRecipients=Number of distinct recipients
+NoTargetYet=No recipients defined yet (Go on tab 'Recipients')
+NoRecipientEmail=No recipient email for %s
+RemoveRecipient=Remove recipient
+YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README.
+EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values
+MailingAddFile=Attach this file
+NoAttachedFiles=No attached files
+BadEMail=Bad value for Email
+ConfirmCloneEMailing=Are you sure you want to clone this emailing?
+CloneContent=Clone message
+CloneReceivers=Cloner recipients
+DateLastSend=Date of latest sending
+DateSending=Date sending
+SentTo=Sent to <b>%s</b>
+MailingStatusRead=Read
+YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubscribe from mailing list
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubscribe" feature
+EMailSentToNRecipients=Email sent to %s recipients.
+EMailSentForNElements=Email sent for %s elements.
+XTargetsAdded=<b>%s</b> recipients added into target list
+OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachments in mass sending in this version).
+AllRecipientSelected=The recipients of the %s record selected (if their email is known).
+GroupEmails=Group emails
+OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
+WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
+ResultOfMailSending=Result of mass Email sending
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
+SentXXXmessages=%s message(s) sent.
+ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
+MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
+MailingModuleDescContactsByCompanyCategory=Contacts by third-party category
+MailingModuleDescContactsByCategory=Contacts by categories
+MailingModuleDescContactsByFunction=Contacts by position
+MailingModuleDescEmailsFromFile=Emails from file
+MailingModuleDescEmailsFromUser=Emails input by user
+MailingModuleDescDolibarrUsers=Users with Emails
+MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+
+# Libelle des modules de liste de destinataires mailing
+LineInFile=Line %s in file
+RecipientSelectionModules=Defined requests for recipient's selection
+MailSelectedRecipients=Selected recipients
+MailingArea=EMailings area
+LastMailings=Latest %s emailings
+TargetsStatistics=Targets statistics
+NbOfCompaniesContacts=Unique contacts/addresses
+MailNoChangePossible=Recipients for validated emailing can't be changed
+SearchAMailing=Search mailing
+SendMailing=Send emailing
+SentBy=Sent by
+MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
+MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
+ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+TargetsReset=Clear list
+ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
+ToAddRecipientsChooseHere=Add recipients by choosing from the lists
+NbOfEMailingsReceived=Mass emailings received
+NbOfEMailingsSend=Mass emailings sent
+IdRecord=ID record
+DeliveryReceipt=Delivery Ack.
+YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
+TagCheckMail=Track mail opening
+TagUnsubscribe=Unsubscribe link
+TagSignature=Signature of sending user
+EMailRecipient=Recipient Email
+TagMailtoEmail=Recipient Email (including html "mailto:" link)
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
+# Module Notifications
+Notifications=Notifications
+NoNotificationsWillBeSent=No email notifications are planned for this event and company
+ANotificationsWillBeSent=1 notification will be sent by email
+SomeNotificationsWillBeSent=%s notifications will be sent by email
+AddNewNotification=Activate a new email notification target/event
+ListOfActiveNotifications=List all active targets/events for email notification
+ListOfNotificationsDone=List all email notifications sent
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
+UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
+UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
+MailAdvTargetRecipients=Recipients (advanced selection)
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchIntHelp=Use interval to select int or float value
+AdvTgtMinVal=Minimum value
+AdvTgtMaxVal=Maximum value
+AdvTgtSearchDtHelp=Use interval to select date value
+AdvTgtStartDt=Start dt.
+AdvTgtEndDt=End dt.
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third-party email or just contact email
+AdvTgtTypeOfIncude=Type of targeted email
+AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
+AddAll=Add all
+RemoveAll=Remove all
+ItemsCount=Item(s)
+AdvTgtNameTemplate=Filter name
+AdvTgtAddContact=Add emails according to criteria
+AdvTgtLoadFilter=Load filter
+AdvTgtDeleteFilter=Delete filter
+AdvTgtSaveFilter=Save filter
+AdvTgtCreateFilter=Create filter
+AdvTgtOrCreateNewFilter=Name of new filter
+NoContactWithCategoryFound=No contact/address with a category found
+NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+DefaultOutgoingEmailSetup=Default outgoing email setup
+Information=Information
+ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/zh_HK/main.lang b/htdocs/langs/zh_HK/main.lang
new file mode 100644
index 00000000000..824a5e495b8
--- /dev/null
+++ b/htdocs/langs/zh_HK/main.lang
@@ -0,0 +1,1035 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+# Note for Chinese:
+# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
+# stsongstdlight or cid0cs are for simplified Chinese
+# To read Chinese pdf with Linux: sudo apt-get install poppler-data
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
+DatabaseConnection=Database connection
+NoTemplateDefined=No template available for this email type
+AvailableVariables=Available substitution variables
+NoTranslation=No translation
+Translation=Translation
+EmptySearchString=Enter a non empty search string
+NoRecordFound=No record found
+NoRecordDeleted=No record deleted
+NotEnoughDataYet=Not enough data
+NoError=No error
+Error=Error
+Errors=Errors
+ErrorFieldRequired=Field '%s' is required
+ErrorFieldFormat=Field '%s' has a bad value
+ErrorFileDoesNotExists=File %s does not exist
+ErrorFailedToOpenFile=Failed to open file %s
+ErrorCanNotCreateDir=Cannot create dir %s
+ErrorCanNotReadDir=Cannot read dir %s
+ErrorConstantNotDefined=Parameter %s not defined
+ErrorUnknown=Unknown error
+ErrorSQL=SQL Error
+ErrorLogoFileNotFound=Logo file '%s' was not found
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
+ErrorGoToModuleSetup=Go to Module setup to fix this
+ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
+ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
+ErrorInternalErrorDetected=Error detected
+ErrorWrongHostParameter=Wrong host parameter
+ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post the form again.
+ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child record.
+ErrorWrongValue=Wrong value
+ErrorWrongValueForParameterX=Wrong value for parameter %s
+ErrorNoRequestInError=No request in error
+ErrorServiceUnavailableTryLater=Service not available at the moment. Try again later.
+ErrorDuplicateField=Duplicate value in a unique field
+ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back.
+ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
+ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
+ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
+ErrorFailedToSaveFile=Error, failed to save file.
+ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
+MaxNbOfRecordPerPage=Max. number of records per page
+NotAuthorized=You are not authorized to do that.
+SetDate=Set date
+SelectDate=Select a date
+SeeAlso=See also %s
+SeeHere=See here
+ClickHere=Click here
+Here=Here
+Apply=Apply
+BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
+FileGenerated=The file was successfully generated
+FileSaved=The file was successfully saved
+FileUploaded=The file was successfully uploaded
+FileTransferComplete=File(s) uploaded successfully
+FilesDeleted=File(s) successfully deleted
+FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
+NbOfEntries=No. of entries
+GoToWikiHelpPage=Read online help (Internet access needed)
+GoToHelpPage=Read help
+RecordSaved=Record saved
+RecordDeleted=Record deleted
+RecordGenerated=Record generated
+LevelOfFeature=Level of features
+NotDefined=Not defined
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
+Administrator=Administrator
+Undefined=Undefined
+PasswordForgotten=Password forgotten?
+NoAccount=No account?
+SeeAbove=See above
+HomeArea=Home
+LastConnexion=Last login
+PreviousConnexion=Previous login
+PreviousValue=Previous value
+ConnectedOnMultiCompany=Connected on environment
+ConnectedSince=Connected since
+AuthenticationMode=Authentication mode
+RequestedUrl=Requested URL
+DatabaseTypeManager=Database type manager
+RequestLastAccessInError=Latest database access request error
+ReturnCodeLastAccessInError=Return code for latest database access request error
+InformationLastAccessInError=Information for latest database access request error
+DolibarrHasDetectedError=Dolibarr has detected a technical error
+YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices)
+MoreInformation=More information
+TechnicalInformation=Technical information
+TechnicalID=Technical ID
+LineID=Line ID
+NotePublic=Note (public)
+NotePrivate=Note (private)
+PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
+DoTest=Test
+ToFilter=Filter
+NoFilter=No filter
+WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
+yes=yes
+Yes=Yes
+no=no
+No=No
+All=All
+Home=Home
+Help=Help
+OnlineHelp=Online help
+PageWiki=Wiki page
+MediaBrowser=Media browser
+Always=Always
+Never=Never
+Under=under
+Period=Period
+PeriodEndDate=End date for period
+SelectedPeriod=Selected period
+PreviousPeriod=Previous period
+Activate=Activate
+Activated=Activated
+Closed=Closed
+Closed2=Closed
+NotClosed=Not closed
+Enabled=Enabled
+Enable=Enable
+Deprecated=Deprecated
+Disable=Disable
+Disabled=Disabled
+Add=Add
+AddLink=Add link
+RemoveLink=Remove link
+AddToDraft=Add to draft
+Update=Update
+Close=Close
+CloseBox=Remove widget from your dashboard
+Confirm=Confirm
+ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
+Delete=Delete
+Remove=Remove
+Resiliate=Terminate
+Cancel=Cancel
+Modify=Modify
+Edit=Edit
+Validate=Validate
+ValidateAndApprove=Validate and Approve
+ToValidate=To validate
+NotValidated=Not validated
+Save=Save
+SaveAs=Save As
+SaveAndStay=Save and stay
+SaveAndNew=Save and new
+TestConnection=Test connection
+ToClone=Clone
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
+ConfirmClone=Choose data you want to clone:
+NoCloneOptionsSpecified=No data to clone defined.
+Of=of
+Go=Go
+Run=Run
+CopyOf=Copy of
+Show=Show
+Hide=Hide
+ShowCardHere=Show card
+Search=Search
+SearchOf=Search
+SearchMenuShortCut=Ctrl + shift + f
+Valid=Valid
+Approve=Approve
+Disapprove=Disapprove
+ReOpen=Re-Open
+Upload=Upload
+ToLink=Link
+Select=Select
+Choose=Choose
+Resize=Resize
+ResizeOrCrop=Resize or Crop
+Recenter=Recenter
+Author=Author
+User=User
+Users=Users
+Group=Group
+Groups=Groups
+NoUserGroupDefined=No user group defined
+Password=Password
+PasswordRetype=Retype your password
+NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
+Name=Name
+NameSlashCompany=Name / Company
+Person=Person
+Parameter=Parameter
+Parameters=Parameters
+Value=Value
+PersonalValue=Personal value
+NewObject=New %s
+NewValue=New value
+CurrentValue=Current value
+Code=Code
+Type=Type
+Language=Language
+MultiLanguage=Multi-language
+Note=Note
+Title=Title
+Label=Label
+RefOrLabel=Ref. or label
+Info=Log
+Family=Family
+Description=Description
+Designation=Description
+DescriptionOfLine=Description of line
+DateOfLine=Date of line
+DurationOfLine=Duration of line
+Model=Doc template
+DefaultModel=Default doc template
+Action=Event
+About=About
+Number=Number
+NumberByMonth=Number by month
+AmountByMonth=Amount by month
+Numero=Number
+Limit=Limit
+Limits=Limits
+Logout=Logout
+NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
+Connection=Login
+Setup=Setup
+Alert=Alert
+MenuWarnings=Alerts
+Previous=Previous
+Next=Next
+Cards=Cards
+Card=Card
+Now=Now
+HourStart=Start hour
+Date=Date
+DateAndHour=Date and hour
+DateToday=Today's date
+DateReference=Reference date
+DateStart=Start date
+DateEnd=End date
+DateCreation=Creation date
+DateCreationShort=Creat. date
+DateModification=Modification date
+DateModificationShort=Modif. date
+DateLastModification=Latest modification date
+DateValidation=Validation date
+DateClosing=Closing date
+DateDue=Due date
+DateValue=Value date
+DateValueShort=Value date
+DateOperation=Operation date
+DateOperationShort=Oper. Date
+DateLimit=Limit date
+DateRequest=Request date
+DateProcess=Process date
+DateBuild=Report build date
+DatePayment=Date of payment
+DateApprove=Approving date
+DateApprove2=Approving date (second approval)
+RegistrationDate=Registration date
+UserCreation=Creation user
+UserModification=Modification user
+UserValidation=Validation user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
+UserValidationShort=Valid. user
+DurationYear=year
+DurationMonth=month
+DurationWeek=week
+DurationDay=day
+DurationYears=years
+DurationMonths=months
+DurationWeeks=weeks
+DurationDays=days
+Year=Year
+Month=Month
+Week=Week
+WeekShort=Week
+Day=Day
+Hour=Hour
+Minute=Minute
+Second=Second
+Years=Years
+Months=Months
+Days=Days
+days=days
+Hours=Hours
+Minutes=Minutes
+Seconds=Seconds
+Weeks=Weeks
+Today=Today
+Yesterday=Yesterday
+Tomorrow=Tomorrow
+Morning=Morning
+Afternoon=Afternoon
+Quadri=Quadri
+MonthOfDay=Month of the day
+HourShort=H
+MinuteShort=mn
+Rate=Rate
+CurrencyRate=Currency conversion rate
+UseLocalTax=Include tax
+Bytes=Bytes
+KiloBytes=Kilobytes
+MegaBytes=Megabytes
+GigaBytes=Gigabytes
+TeraBytes=Terabytes
+UserAuthor=User of creation
+UserModif=User of last update
+b=b.
+Kb=Kb
+Mb=Mb
+Gb=Gb
+Tb=Tb
+Cut=Cut
+Copy=Copy
+Paste=Paste
+Default=Default
+DefaultValue=Default value
+DefaultValues=Default values/filters/sorting
+Price=Price
+PriceCurrency=Price (currency)
+UnitPrice=Unit price
+UnitPriceHT=Unit price (excl.)
+UnitPriceHTCurrency=Unit price (excl.) (currency)
+UnitPriceTTC=Unit price
+PriceU=U.P.
+PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
+PriceUTTC=U.P. (inc. tax)
+Amount=Amount
+AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
+AmountInvoicedHT=Amount invoiced (incl. tax)
+AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountPayment=Payment amount
+AmountHTShort=Amount (excl.)
+AmountTTCShort=Amount (inc. tax)
+AmountHT=Amount (excl. tax)
+AmountTTC=Amount (inc. tax)
+AmountVAT=Amount tax
+MulticurrencyAlreadyPaid=Already paid, original currency
+MulticurrencyRemainderToPay=Remain to pay, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+MulticurrencyAmountHT=Amount (excl. tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
+AmountLT1=Amount tax 2
+AmountLT2=Amount tax 3
+AmountLT1ES=Amount RE
+AmountLT2ES=Amount IRPF
+AmountTotal=Total amount
+AmountAverage=Average amount
+PriceQtyMinHT=Price quantity min. (excl. tax)
+PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+Percentage=Percentage
+Total=Total
+SubTotal=Subtotal
+TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
+TotalHTShortCurrency=Total (excl. in currency)
+TotalTTCShort=Total (inc. tax)
+TotalHT=Total (excl. tax)
+TotalHTforthispage=Total (excl. tax) for this page
+Totalforthispage=Total for this page
+TotalTTC=Total (inc. tax)
+TotalTTCToYourCredit=Total (inc. tax) to your credit
+TotalVAT=Total tax
+TotalVATIN=Total IGST
+TotalLT1=Total tax 2
+TotalLT2=Total tax 3
+TotalLT1ES=Total RE
+TotalLT2ES=Total IRPF
+TotalLT1IN=Total CGST
+TotalLT2IN=Total SGST
+HT=Excl. tax
+TTC=Inc. tax
+INCVATONLY=Inc. VAT
+INCT=Inc. all taxes
+VAT=Sales tax
+VATIN=IGST
+VATs=Sales taxes
+VATINs=IGST taxes
+LT1=Sales tax 2
+LT1Type=Sales tax 2 type
+LT2=Sales tax 3
+LT2Type=Sales tax 3 type
+LT1ES=RE
+LT2ES=IRPF
+LT1IN=CGST
+LT2IN=SGST
+LT1GC=Additionnal cents
+VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
+DefaultTaxRate=Default tax rate
+Average=Average
+Sum=Sum
+Delta=Delta
+StatusToPay=To pay
+RemainToPay=Remain to pay
+Module=Module/Application
+Modules=Modules/Applications
+Option=Option
+List=List
+FullList=Full list
+FullConversation=Full conversation
+Statistics=Statistics
+OtherStatistics=Other statistics
+Status=Status
+Favorite=Favorite
+ShortInfo=Info.
+Ref=Ref.
+ExternalRef=Ref. extern
+RefSupplier=Ref. vendor
+RefPayment=Ref. payment
+CommercialProposalsShort=Commercial proposals
+Comment=Comment
+Comments=Comments
+ActionsToDo=Events to do
+ActionsToDoShort=To do
+ActionsDoneShort=Done
+ActionNotApplicable=Not applicable
+ActionRunningNotStarted=To start
+ActionRunningShort=In progress
+ActionDoneShort=Finished
+ActionUncomplete=Incomplete
+LatestLinkedEvents=Latest %s linked events
+CompanyFoundation=Company/Organization
+Accountant=Accountant
+ContactsForCompany=Contacts for this third party
+ContactsAddressesForCompany=Contacts/addresses for this third party
+AddressesForCompany=Addresses for this third party
+ActionsOnCompany=Events for this third party
+ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
+ActionsOnMember=Events about this member
+ActionsOnProduct=Events about this product
+NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
+RequestAlreadyDone=Request already recorded
+Filter=Filter
+FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
+RemoveFilter=Remove filter
+ChartGenerated=Chart generated
+ChartNotGenerated=Chart not generated
+GeneratedOn=Build on %s
+Generate=Generate
+Duration=Duration
+TotalDuration=Total duration
+Summary=Summary
+DolibarrStateBoard=Database Statistics
+DolibarrWorkBoard=Open Items
+NoOpenedElementToProcess=No open element to process
+Available=Available
+NotYetAvailable=Not yet available
+NotAvailable=Not available
+Categories=Tags/categories
+Category=Tag/category
+By=By
+From=From
+FromLocation=From
+to=to
+To=to
+and=and
+or=or
+Other=Other
+Others=Others
+OtherInformations=Other information
+Quantity=Quantity
+Qty=Qty
+ChangedBy=Changed by
+ApprovedBy=Approved by
+ApprovedBy2=Approved by (second approval)
+Approved=Approved
+Refused=Refused
+ReCalculate=Recalculate
+ResultKo=Failure
+Reporting=Reporting
+Reportings=Reporting
+Draft=Draft
+Drafts=Drafts
+StatusInterInvoiced=Invoiced
+Validated=Validated
+Opened=Open
+OpenAll=Open (All)
+ClosedAll=Closed (All)
+New=New
+Discount=Discount
+Unknown=Unknown
+General=General
+Size=Size
+OriginalSize=Original size
+Received=Received
+Paid=Paid
+Topic=Subject
+ByCompanies=By third parties
+ByUsers=By user
+Links=Links
+Link=Link
+Rejects=Rejects
+Preview=Preview
+NextStep=Next step
+Datas=Data
+None=None
+NoneF=None
+NoneOrSeveral=None or several
+Late=Late
+LateDesc=An item is defined as Delayed as per the system configuration in menu Home - Setup - Alerts.
+NoItemLate=No late item
+Photo=Picture
+Photos=Pictures
+AddPhoto=Add picture
+DeletePicture=Picture delete
+ConfirmDeletePicture=Confirm picture deletion?
+Login=Login
+LoginEmail=Login (email)
+LoginOrEmail=Login or Email
+CurrentLogin=Current login
+EnterLoginDetail=Enter login details
+January=January
+February=February
+March=March
+April=April
+May=May
+June=June
+July=July
+August=August
+September=September
+October=October
+November=November
+December=December
+Month01=January
+Month02=February
+Month03=March
+Month04=April
+Month05=May
+Month06=June
+Month07=July
+Month08=August
+Month09=September
+Month10=October
+Month11=November
+Month12=December
+MonthShort01=Jan
+MonthShort02=Feb
+MonthShort03=Mar
+MonthShort04=Apr
+MonthShort05=May
+MonthShort06=Jun
+MonthShort07=Jul
+MonthShort08=Aug
+MonthShort09=Sep
+MonthShort10=Oct
+MonthShort11=Nov
+MonthShort12=Dec
+MonthVeryShort01=J
+MonthVeryShort02=F
+MonthVeryShort03=M
+MonthVeryShort04=A
+MonthVeryShort05=M
+MonthVeryShort06=J
+MonthVeryShort07=J
+MonthVeryShort08=A
+MonthVeryShort09=S
+MonthVeryShort10=O
+MonthVeryShort11=N
+MonthVeryShort12=D
+AttachedFiles=Attached files and documents
+JoinMainDoc=Join main document
+DateFormatYYYYMM=YYYY-MM
+DateFormatYYYYMMDD=YYYY-MM-DD
+DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
+ReportName=Report name
+ReportPeriod=Report period
+ReportDescription=Description
+Report=Report
+Keyword=Keyword
+Origin=Origin
+Legend=Legend
+Fill=Fill
+Reset=Reset
+File=File
+Files=Files
+NotAllowed=Not allowed
+ReadPermissionNotAllowed=Read permission not allowed
+AmountInCurrency=Amount in %s currency
+Example=Example
+Examples=Examples
+NoExample=No example
+FindBug=Report a bug
+NbOfThirdParties=Number of third parties
+NbOfLines=Number of lines
+NbOfObjects=Number of objects
+NbOfObjectReferers=Number of related items
+Referers=Related items
+TotalQuantity=Total quantity
+DateFromTo=From %s to %s
+DateFrom=From %s
+DateUntil=Until %s
+Check=Check
+Uncheck=Uncheck
+Internal=Internal
+External=External
+Internals=Internal
+Externals=External
+Warning=Warning
+Warnings=Warnings
+BuildDoc=Build Doc
+Entity=Environment
+Entities=Entities
+CustomerPreview=Customer preview
+SupplierPreview=Vendor preview
+ShowCustomerPreview=Show customer preview
+ShowSupplierPreview=Show vendor preview
+RefCustomer=Ref. customer
+Currency=Currency
+InfoAdmin=Information for administrators
+Undo=Undo
+Redo=Redo
+ExpandAll=Expand all
+UndoExpandAll=Undo expand
+SeeAll=See all
+Reason=Reason
+FeatureNotYetSupported=Feature not yet supported
+CloseWindow=Close window
+Response=Response
+Priority=Priority
+SendByMail=Send by email
+MailSentBy=Email sent by
+TextUsedInTheMessageBody=Email body
+SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
+Email=Email
+NoEMail=No email
+AlreadyRead=Already read
+NotRead=Not read
+NoMobilePhone=No mobile phone
+Owner=Owner
+FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
+Refresh=Refresh
+BackToList=Back to list
+GoBack=Go back
+CanBeModifiedIfOk=Can be modified if valid
+CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
+RecordCreatedSuccessfully=Record created successfully
+RecordModifiedSuccessfully=Record modified successfully
+RecordsModified=%s record(s) modified
+RecordsDeleted=%s record(s) deleted
+RecordsGenerated=%s record(s) generated
+AutomaticCode=Automatic code
+FeatureDisabled=Feature disabled
+MoveBox=Move widget
+Offered=Offered
+NotEnoughPermissions=You don't have permission for this action
+SessionName=Session name
+Method=Method
+Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+PartialWoman=Partial
+TotalWoman=Total
+NeverReceived=Never received
+Canceled=Canceled
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
+YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record in module setup
+Color=Color
+Documents=Linked files
+Documents2=Documents
+UploadDisabled=Upload disabled
+MenuAccountancy=Accounting
+MenuECM=Documents
+MenuAWStats=AWStats
+MenuMembers=Members
+MenuAgendaGoogle=Google agenda
+ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+NoFileFound=No documents saved in this directory
+CurrentUserLanguage=Current language
+CurrentTheme=Current theme
+CurrentMenuManager=Current menu manager
+Browser=Browser
+Layout=Layout
+Screen=Screen
+DisabledModules=Disabled modules
+For=For
+ForCustomer=For customer
+Signature=Signature
+DateOfSignature=Date of signature
+HidePassword=Show command with password hidden
+UnHidePassword=Show real command with clear password
+Root=Root
+RootOfMedias=Root of public medias (/medias)
+Informations=Information
+Page=Page
+Notes=Notes
+AddNewLine=Add new line
+AddFile=Add file
+FreeZone=Not a predefined product/service
+FreeLineOfType=Free-text item, type:
+CloneMainAttributes=Clone object with its main attributes
+ReGeneratePDF=Re-generate PDF
+PDFMerge=PDF Merge
+Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
+PrintContentArea=Show page to print main content area
+MenuManager=Menu manager
+WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
+CoreErrorTitle=System error
+CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
+CreditCard=Credit card
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
+FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
+FieldsWithIsForPublic=Fields with <b>%s</b> are shown in public list of members. If you don't want this, uncheck the "public" box.
+AccordingToGeoIPDatabase=(according to GeoIP conversion)
+Line=Line
+NotSupported=Not supported
+RequiredField=Required field
+Result=Result
+ToTest=Test
+ValidateBefore=Item must be validated before using this feature
+Visibility=Visibility
+Totalizable=Totalizable
+TotalizableDesc=This field is totalizable in list
+Private=Private
+Hidden=Hidden
+Resources=Resources
+Source=Source
+Prefix=Prefix
+Before=Before
+After=After
+IPAddress=IP address
+Frequency=Frequency
+IM=Instant messaging
+NewAttribute=New attribute
+AttributeCode=Attribute code
+URLPhoto=URL of photo/logo
+SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToTemplateInvoice=Link to template invoice
+LinkToSupplierOrder=Link to purchase order
+LinkToSupplierProposal=Link to vendor proposal
+LinkToSupplierInvoice=Link to vendor invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
+CreateDraft=Create draft
+SetToDraft=Back to draft
+ClickToEdit=Click to edit
+ClickToRefresh=Click to refresh
+EditWithEditor=Edit with CKEditor
+EditWithTextEditor=Edit with Text editor
+EditHTMLSource=Edit HTML Source
+ObjectDeleted=Object %s deleted
+ByCountry=By country
+ByTown=By town
+ByDate=By date
+ByMonthYear=By month/year
+ByYear=By year
+ByMonth=By month
+ByDay=By day
+BySalesRepresentative=By sales representative
+LinkedToSpecificUsers=Linked to a particular user contact
+NoResults=No results
+AdminTools=Admin Tools
+SystemTools=System tools
+ModulesSystemTools=Modules tools
+Test=Test
+Element=Element
+NoPhotoYet=No pictures available yet
+Dashboard=Dashboard
+MyDashboard=My Dashboard
+Deductible=Deductible
+from=from
+toward=toward
+Access=Access
+SelectAction=Select action
+SelectTargetUser=Select target user/employee
+HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
+SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
+OriginFileName=Original filename
+SetDemandReason=Set source
+SetBankAccount=Define Bank Account
+AccountCurrency=Account currency
+ViewPrivateNote=View notes
+XMoreLines=%s line(s) hidden
+ShowMoreLines=Show more/less lines
+PublicUrl=Public URL
+AddBox=Add box
+SelectElementAndClick=Select an element and click %s
+PrintFile=Print File %s
+ShowTransaction=Show entry on bank account
+ShowIntervention=Show intervention
+ShowContract=Show contract
+GoIntoSetupToChangeLogo=Go to Home - Setup - Company to change logo or go to Home - Setup - Display to hide.
+Deny=Deny
+Denied=Denied
+ListOf=List of %s
+ListOfTemplates=List of templates
+Gender=Gender
+Genderman=Man
+Genderwoman=Woman
+ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
+Mandatory=Mandatory
+Hello=Hello
+GoodBye=GoodBye
+Sincerely=Sincerely
+ConfirmDeleteObject=Are you sure you want to delete this object?
+DeleteLine=Delete line
+ConfirmDeleteLine=Are you sure you want to delete this line?
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records.
+NoRecordSelected=No record selected
+MassFilesArea=Area for files built by mass actions
+ShowTempMassFilesArea=Show area of files built by mass actions
+ConfirmMassDeletion=Bulk Delete confirmation
+ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
+RelatedObjects=Related Objects
+ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
+Progress=Progress
+ProgressShort=Progr.
+FrontOffice=Front office
+BackOffice=Back office
+Submit=Submit
+View=View
+Export=Export
+Exports=Exports
+ExportFilteredList=Export filtered list
+ExportList=Export list
+ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
+Miscellaneous=Miscellaneous
+Calendar=Calendar
+GroupBy=Group by...
+ViewFlatList=View flat list
+RemoveString=Remove string '%s'
+SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+DirectDownloadLink=Direct download link (public/external)
+DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+Download=Download
+DownloadDocument=Download document
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
+ModuleBuilder=Module and Application Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status?
+ImportId=Import id
+Events=Events
+EMailTemplates=Email templates
+FileNotShared=File not shared to external public
+Project=Project
+Projects=Projects
+LeadOrProject=Lead | Project
+LeadsOrProjects=Leads | Projects
+Lead=Lead
+Leads=Leads
+ListOpenLeads=List open leads
+ListOpenProjects=List open projects
+NewLeadOrProject=New lead or project
+Rights=Permissions
+LineNb=Line no.
+IncotermLabel=Incoterms
+TabLetteringCustomer=Customer lettering
+TabLetteringSupplier=Vendor lettering
+Monday=Monday
+Tuesday=Tuesday
+Wednesday=Wednesday
+Thursday=Thursday
+Friday=Friday
+Saturday=Saturday
+Sunday=Sunday
+MondayMin=Mo
+TuesdayMin=Tu
+WednesdayMin=We
+ThursdayMin=Th
+FridayMin=Fr
+SaturdayMin=Sa
+SundayMin=Su
+Day1=Monday
+Day2=Tuesday
+Day3=Wednesday
+Day4=Thursday
+Day5=Friday
+Day6=Saturday
+Day0=Sunday
+ShortMonday=M
+ShortTuesday=T
+ShortWednesday=W
+ShortThursday=T
+ShortFriday=F
+ShortSaturday=S
+ShortSunday=S
+SelectMailModel=Select an email template
+SetRef=Set ref
+Select2ResultFoundUseArrows=Some results found. Use arrows to select.
+Select2NotFound=No result found
+Select2Enter=Enter
+Select2MoreCharacter=or more character
+Select2MoreCharacters=or more characters
+Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
+Select2LoadingMoreResults=Loading more results...
+Select2SearchInProgress=Search in progress...
+SearchIntoThirdparties=Third parties
+SearchIntoContacts=Contacts
+SearchIntoMembers=Members
+SearchIntoUsers=Users
+SearchIntoProductsOrServices=Products or services
+SearchIntoProjects=Projects
+SearchIntoMO=Manufacturing Orders
+SearchIntoTasks=Tasks
+SearchIntoCustomerInvoices=Customer invoices
+SearchIntoSupplierInvoices=Vendor invoices
+SearchIntoCustomerOrders=Sales orders
+SearchIntoSupplierOrders=Purchase orders
+SearchIntoCustomerProposals=Commercial proposals
+SearchIntoSupplierProposals=Vendor proposals
+SearchIntoInterventions=Interventions
+SearchIntoContracts=Contracts
+SearchIntoCustomerShipments=Customer shipments
+SearchIntoExpenseReports=Expense reports
+SearchIntoLeaves=Leave
+SearchIntoTickets=Tickets
+CommentLink=Comments
+NbComments=Number of comments
+CommentPage=Comments space
+CommentAdded=Comment added
+CommentDeleted=Comment deleted
+Everybody=Everybody
+PayedBy=Paid by
+PayedTo=Paid to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft mass delete confirmation
+FileSharedViaALink=File shared via a link
+SelectAThirdPartyFirst=Select a third party first...
+YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
+AnalyticCode=Analytic code
+TMenuMRP=MRP
+ShowMoreInfos=Show More Infos
+NoFilesUploadedYet=Please upload a document first
+SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
+ContactDefault_agenda=Event
+ContactDefault_commande=Order
+ContactDefault_contrat=Contract
+ContactDefault_facture=Invoice
+ContactDefault_fichinter=Intervention
+ContactDefault_invoice_supplier=Supplier Invoice
+ContactDefault_order_supplier=Purchase Order
+ContactDefault_project=Project
+ContactDefault_project_task=Task
+ContactDefault_propal=Proposal
+ContactDefault_supplier_proposal=Supplier Proposal
+ContactDefault_ticket=Ticket
+ContactAddedAutomatically=Contact added from contact thirdparty roles
+More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+StatisticsOn=Statistics on
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
+Measures=Measures
+XAxis=X-Axis
+YAxis=Y-Axis
+StatusOfRefMustBe=Status of %s must be %s
+DeleteFileHeader=Confirm file delete
+DeleteFileText=Do you really want delete this file?
+ShowOtherLanguages=Show other languages
+SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
+NotUsedForThisCustomer=Not used for this customer
diff --git a/htdocs/langs/zh_HK/margins.lang b/htdocs/langs/zh_HK/margins.lang
new file mode 100644
index 00000000000..76ea8ad5c4d
--- /dev/null
+++ b/htdocs/langs/zh_HK/margins.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - marges
+
+Margin=Margin
+Margins=Margins
+TotalMargin=Total Margin
+MarginOnProducts=Margin / Products
+MarginOnServices=Margin / Services
+MarginRate=Margin rate
+MarkRate=Mark rate
+DisplayMarginRates=Display margin rates
+DisplayMarkRates=Display mark rates
+InputPrice=Input price
+margin=Profit margins management
+margesSetup=Profit margins management setup
+MarginDetails=Margin details
+ProductMargins=Product margins
+CustomerMargins=Customer margins
+SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
+UserMargins=User margins
+ProductService=Product or Service
+AllProducts=All products and services
+ChooseProduct/Service=Choose product or service
+ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
+ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
+UseDiscountAsProduct=As a product
+UseDiscountAsService=As a service
+UseDiscountOnTotal=On subtotal
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
+MargeType1=Margin on Best vendor price
+MargeType2=Margin on Weighted Average Price (WAP)
+MargeType3=Margin on Cost Price
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
+CostPrice=Cost price
+UnitCharges=Unit charges
+Charges=Charges
+AgentContactType=Commercial agent contact type
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
+CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/zh_HK/members.lang b/htdocs/langs/zh_HK/members.lang
new file mode 100644
index 00000000000..dd0a5bf49e2
--- /dev/null
+++ b/htdocs/langs/zh_HK/members.lang
@@ -0,0 +1,204 @@
+# Dolibarr language file - Source file is en_US - members
+MembersArea=Members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of terminated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Terminated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
+DateSubscription=Subscription date
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=Subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Terminated member
+MemberStatusResiliatedShort=Terminated
+MembersStatusToValid=Draft members
+MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Validated
+SubscriptionNotNeeded=No subscription needed
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+MemberTypeModified=Member type modified
+DeleteAMemberType=Delete a member type
+ConfirmDeleteMemberType=Are you sure you want to delete this member type?
+MemberTypeDeleted=Member type deleted
+MemberTypeCanNotBeDeleted=Member type can not be deleted
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome email
+SubscriptionRequired=Subscription required
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Terminate a member
+ConfirmResiliateMember=Are you sure you want to terminate this member?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions)?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public self-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public website with self-subscription form
+ForceMemberType=Force the member type
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembersModified=Latest %s modified members
+LastSubscriptionsModified=Latest %s modified subscriptions
+String=String
+Text=Text
+Int=Int
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+SubscriptionNotRecorded=Subscription not recorded
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
+SendingEmailOnCancelation=Sending email on cancelation
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct entry on bank account
+MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Latest member date
+LatestSubscriptionDate=Latest subscription date
+MemberNature=Nature of member
+Public=Information are public
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No VAT for subscriptions
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
+MembershipPaid=Membership paid for current period (until %s)
+YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
+XMembersClosed=%s member(s) closed
diff --git a/htdocs/langs/zh_HK/modulebuilder.lang b/htdocs/langs/zh_HK/modulebuilder.lang
new file mode 100644
index 00000000000..135ac1ae9ec
--- /dev/null
+++ b/htdocs/langs/zh_HK/modulebuilder.lang
@@ -0,0 +1,141 @@
+# Dolibarr language file - Source file is en_US - loan
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
+ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
+ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
+ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
+NewModule=New module
+NewObjectInModulebuilder=New object
+ModuleKey=Module key
+ObjectKey=Object key
+ModuleInitialized=Module initialized
+FilesForObjectInitialized=Files for new object '%s' initialized
+FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
+ModuleBuilderDescdescription=Enter here all general information that describe your module.
+ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
+ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
+ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
+ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
+ModuleBuilderDeschooks=This tab is dedicated to hooks.
+ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
+ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
+DangerZone=Danger zone
+BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
+BuildDocumentation=Build documentation
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
+DescriptionLong=Long description
+EditorName=Name of editor
+EditorUrl=URL of editor
+DescriptorFile=Descriptor file of module
+ClassFile=File for PHP DAO CRUD class
+ApiClassFile=File for PHP API class
+PageForList=PHP page for list of record
+PageForCreateEditView=PHP page to create/edit/view a record
+PageForAgendaTab=PHP page for event tab
+PageForDocumentTab=PHP page for document tab
+PageForNoteTab=PHP page for note tab
+PathToModulePackage=Path to zip of module/application package
+PathToModuleDocumentation=Path to file of module/application documentation (%s)
+SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
+FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Force update of .class and .sql files
+RegenerateMissingFiles=Generate missing files
+SpecificationFile=File of documentation
+LanguageFile=File for language
+ObjectProperties=Object Properties
+ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
+NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
+SearchAll=Used for 'search all'
+DatabaseIndex=Database index
+FileAlreadyExists=File %s already exists
+TriggersFile=File for triggers code
+HooksFile=File for hooks code
+ArrayOfKeyValues=Array of key-val
+ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
+WidgetFile=Widget file
+CSSFile=CSS file
+JSFile=Javascript file
+ReadmeFile=Readme file
+ChangeLog=ChangeLog file
+TestClassFile=File for PHP Unit Test class
+SqlFile=Sql file
+PageForLib=File for the common PHP library
+PageForObjLib=File for the PHP library dedicated to object
+SqlFileExtraFields=Sql file for complementary attributes
+SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
+AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
+UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Is a measure
+DirScanned=Directory scanned
+NoTrigger=No trigger
+NoWidget=No widget
+GoToApiExplorer=Go to API explorer
+ListOfMenusEntries=List of menu entries
+ListOfDictionariesEntries=List of dictionaries entries
+ListOfPermissionsDefined=List of defined permissions
+SeeExamples=See examples here
+EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdf=Display on PDF
+IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
+SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
+SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
+LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
+MenusDefDesc=Define here the menus provided by your module
+DictionariesDefDesc=Define here the dictionaries provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
+HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
+TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
+SeeIDsInUse=See IDs in use in your installation
+SeeReservedIDsRangeHere=See range of reserved IDs
+ToolkitForDevelopers=Toolkit for Dolibarr developers
+TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
+SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
+AddLanguageFile=Add language file
+YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
+DropTableIfEmpty=(Delete table if empty)
+TableDoesNotExists=The table %s does not exists
+TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
+UseAboutPage=Disable the about page
+UseDocFolder=Disable the documentation folder
+UseSpecificReadme=Use a specific ReadMe
+ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
+RealPathOfModule=Real path of module
+ContentCantBeEmpty=Content of file can't be empty
+WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
+CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
+JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
+CLIDesc=You can generate here some command line scripts you want to provide with your module.
+CLIFile=CLI File
+NoCLIFile=No CLI files
+UseSpecificEditorName = Use a specific editor name
+UseSpecificEditorURL = Use a specific editor URL
+UseSpecificFamily = Use a specific family
+UseSpecificAuthor = Use a specific author
+UseSpecificVersion = Use a specific initial version
+ModuleMustBeEnabled=The module/application must be enabled first
+IncludeRefGeneration=The reference of object must be generated automatically
+IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
+IncludeDocGeneration=I want to generate some documents from the object
+IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
+ShowOnCombobox=Show value into combobox
+KeyForTooltip=Key for tooltip
+CSSClass=CSS Class
+NotEditable=Not editable
+ForeignKey=Foreign key
+TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/zh_HK/mrp.lang b/htdocs/langs/zh_HK/mrp.lang
new file mode 100644
index 00000000000..d3c4d3253c6
--- /dev/null
+++ b/htdocs/langs/zh_HK/mrp.lang
@@ -0,0 +1,76 @@
+Mrp=Manufacturing Orders
+MO=Manufacturing Order
+MRPDescription=Module to manage production and Manufacturing Orders (MO).
+MRPArea=MRP Area
+MrpSetupPage=Setup of module MRP
+MenuBOM=Bills of material
+LatestBOMModified=Latest %s Bills of materials modified
+LatestMOModified=Latest %s Manufacturing Orders modified
+Bom=Bills of Material
+BillOfMaterials=Bill of Material
+BOMsSetup=Setup of module BOM
+ListOfBOMs=List of bills of material - BOM
+ListOfManufacturingOrders=List of Manufacturing Orders
+NewBOM=New bill of material
+ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+BOMsNumberingModules=BOM numbering templates
+BOMsModelModule=BOM document templates
+MOsNumberingModules=MO numbering templates
+MOsModelModule=MO document templates
+FreeLegalTextOnBOMs=Free text on document of BOM
+WatermarkOnDraftBOMs=Watermark on draft BOM
+FreeLegalTextOnMOs=Free text on document of MO
+WatermarkOnDraftMOs=Watermark on draft MO
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
+ManufacturingEfficiency=Manufacturing efficiency
+ConsumptionEfficiency=Consumption efficiency
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
+DeleteBillOfMaterials=Delete Bill Of Materials
+DeleteMo=Delete Manufacturing Order
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+MenuMRP=Manufacturing Orders
+NewMO=New Manufacturing Order
+QtyToProduce=Qty to produce
+DateStartPlannedMo=Date start planned
+DateEndPlannedMo=Date end planned
+KeepEmptyForAsap=Empty means 'As Soon As Possible'
+EstimatedDuration=Estimated duration
+EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
+ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
+ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
+StatusMOProduced=Produced
+QtyFrozen=Frozen Qty
+QuantityFrozen=Frozen Quantity
+QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
+DisableStockChange=Stock change disabled
+DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
+BomAndBomLines=Bills Of Material and lines
+BOMLine=Line of BOM
+WarehouseForProduction=Warehouse for production
+CreateMO=Create MO
+ToConsume=To consume
+ToProduce=To produce
+QtyAlreadyConsumed=Qty already consumed
+QtyAlreadyProduced=Qty already produced
+QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
+ConsumeOrProduce=Consume or Produce
+ConsumeAndProduceAll=Consume and Produce All
+Manufactured=Manufactured
+TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
+ForAQuantityOf=For a quantity to produce of %s
+ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
+ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
+ProductionForRef=Production of %s
+AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
+NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
+AddNewConsumeLines=Add new line to consume
+ProductsToConsume=Products to consume
+ProductsToProduce=Products to produce
+UnitCost=Unit cost
+TotalCost=Total cost
diff --git a/htdocs/langs/zh_HK/multicurrency.lang b/htdocs/langs/zh_HK/multicurrency.lang
new file mode 100644
index 00000000000..bfcbd11fb7c
--- /dev/null
+++ b/htdocs/langs/zh_HK/multicurrency.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/zh_HK/oauth.lang b/htdocs/langs/zh_HK/oauth.lang
new file mode 100644
index 00000000000..075ff49a895
--- /dev/null
+++ b/htdocs/langs/zh_HK/oauth.lang
@@ -0,0 +1,32 @@
+# Dolibarr language file - Source file is en_US - oauth
+ConfigOAuth=OAuth Configuration
+OAuthServices=OAuth Services
+ManualTokenGeneration=Manual token generation
+TokenManager=Token Manager
+IsTokenGenerated=Is token generated ?
+NoAccessToken=No access token saved into local database
+HasAccessToken=A token was generated and saved into local database
+NewTokenStored=Token received and saved
+ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
+TokenDeleted=Token deleted
+RequestAccess=Click here to request/renew access and receive a new token to save
+DeleteAccess=Click here to delete token
+UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
+ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
+OAuthSetupForLogin=Page to generate an OAuth token
+SeePreviousTab=See previous tab
+OAuthIDSecret=OAuth ID and Secret
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=OAuth Google service
+OAUTH_GOOGLE_ID=OAuth Google Id
+OAUTH_GOOGLE_SECRET=OAuth Google Secret
+OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create OAuth credentials
+OAUTH_GITHUB_NAME=OAuth GitHub service
+OAUTH_GITHUB_ID=OAuth GitHub Id
+OAUTH_GITHUB_SECRET=OAuth GitHub Secret
+OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create OAuth credentials
+OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
+OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/zh_HK/opensurvey.lang b/htdocs/langs/zh_HK/opensurvey.lang
new file mode 100644
index 00000000000..7d26151fa16
--- /dev/null
+++ b/htdocs/langs/zh_HK/opensurvey.lang
@@ -0,0 +1,61 @@
+# Dolibarr language file - Source file is en_US - opensurvey
+Survey=Poll
+Surveys=Polls
+OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select the type of poll...
+NewSurvey=New poll
+OpenSurveyArea=Polls area
+AddACommentForPoll=You can add a comment into poll...
+AddComment=Add comment
+CreatePoll=Create poll
+PollTitle=Poll title
+ToReceiveEMailForEachVote=Receive an email for each vote
+TypeDate=Type date
+TypeClassic=Type standard
+OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
+RemoveAllDays=Remove all days
+CopyHoursOfFirstDay=Copy hours of first day
+RemoveAllHours=Remove all hours
+SelectedDays=Selected days
+TheBestChoice=The best choice currently is
+TheBestChoices=The best choices currently are
+with=with
+OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
+CommentsOfVoters=Comments of voters
+ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
+RemovePoll=Remove poll
+UrlForSurvey=URL to communicate to get a direct access to poll
+PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
+CreateSurveyDate=Create a date poll
+CreateSurveyStandard=Create a standard poll
+CheckBox=Simple checkbox
+YesNoList=List (empty/yes/no)
+PourContreList=List (empty/for/against)
+AddNewColumn=Add new column
+TitleChoice=Choice label
+ExportSpreadsheet=Export result spreadsheet
+ExpireDate=Limit date
+NbOfSurveys=Number of polls
+NbOfVoters=No. of voters
+SurveyResults=Results
+PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
+5MoreChoices=5 more choices
+Against=Against
+YouAreInivitedToVote=You are invited to vote for this poll
+VoteNameAlreadyExists=This name was already used for this poll
+AddADate=Add a date
+AddStartHour=Add start hour
+AddEndHour=Add end hour
+votes=vote(s)
+NoCommentYet=No comments have been posted for this poll yet
+CanComment=Voters can comment in the poll
+CanSeeOthersVote=Voters can see other people's vote
+SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
+BackToCurrentMonth=Back to current month
+ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
+ErrorOpenSurveyOneChoice=Enter at least one choice
+ErrorInsertingComment=There was an error while inserting your comment
+MoreChoices=Enter more choices for the voters
+SurveyExpiredInfo=The poll has been closed or voting delay has expired.
+EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
+ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/zh_HK/orders.lang b/htdocs/langs/zh_HK/orders.lang
new file mode 100644
index 00000000000..ad91e1eef63
--- /dev/null
+++ b/htdocs/langs/zh_HK/orders.lang
@@ -0,0 +1,189 @@
+# Dolibarr language file - Source file is en_US - orders
+OrdersArea=Customers orders area
+SuppliersOrdersArea=Purchase orders area
+OrderCard=Order card
+OrderId=Order Id
+Order=Order
+PdfOrderTitle=Order
+Orders=Orders
+OrderLine=Order line
+OrderDate=Order date
+OrderDateShort=Order date
+OrderToProcess=Order to process
+NewOrder=New order
+NewOrderSupplier=New Purchase Order
+ToOrder=Make order
+MakeOrder=Make order
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Sales Order
+CustomersOrders=Sales Orders
+CustomersOrdersRunning=Current sales orders
+CustomersOrdersAndOrdersLines=Sales orders and order details
+OrdersDeliveredToBill=Sales orders delivered to bill
+OrdersToBill=Sales orders delivered
+OrdersInProcess=Sales orders in process
+OrdersToProcess=Sales orders to process
+SuppliersOrdersToProcess=Purchase orders to process
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
+StatusOrderCanceledShort=Canceled
+StatusOrderDraftShort=Draft
+StatusOrderValidatedShort=Validated
+StatusOrderSentShort=In process
+StatusOrderSent=Shipment in process
+StatusOrderOnProcessShort=Ordered
+StatusOrderProcessedShort=Processed
+StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
+StatusOrderToBillShort=Delivered
+StatusOrderApprovedShort=Approved
+StatusOrderRefusedShort=Refused
+StatusOrderToProcessShort=To process
+StatusOrderReceivedPartiallyShort=Partially received
+StatusOrderReceivedAllShort=Products received
+StatusOrderCanceled=Canceled
+StatusOrderDraft=Draft (needs to be validated)
+StatusOrderValidated=Validated
+StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderProcessed=Processed
+StatusOrderToBill=Delivered
+StatusOrderApproved=Approved
+StatusOrderRefused=Refused
+StatusOrderReceivedPartially=Partially received
+StatusOrderReceivedAll=All products received
+ShippingExist=A shipment exists
+QtyOrdered=Qty ordered
+ProductQtyInDraft=Product quantity into draft orders
+ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
+MenuOrdersToBill=Orders delivered
+MenuOrdersToBill2=Billable orders
+ShipProduct=Ship product
+CreateOrder=Create Order
+RefuseOrder=Refuse order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
+ValidateOrder=Validate order
+UnvalidateOrder=Unvalidate order
+DeleteOrder=Delete order
+CancelOrder=Cancel order
+OrderReopened= Order %s re-open
+AddOrder=Create order
+AddPurchaseOrder=Create purchase order
+AddToDraftOrders=Add to draft order
+ShowOrder=Show order
+OrdersOpened=Orders to process
+NoDraftOrders=No draft orders
+NoOrder=No order
+NoSupplierOrder=No purchase order
+LastOrders=Latest %s sales orders
+LastCustomerOrders=Latest %s sales orders
+LastSupplierOrders=Latest %s purchase orders
+LastModifiedOrders=Latest %s modified orders
+AllOrders=All orders
+NbOfOrders=Number of orders
+OrdersStatistics=Order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
+NumberOfOrdersByMonth=Number of orders by month
+AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
+ListOfOrders=List of orders
+CloseOrder=Close order
+ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
+ConfirmDeleteOrder=Are you sure you want to delete this order?
+ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b>?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status?
+ConfirmCancelOrder=Are you sure you want to cancel this order?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
+GenerateBill=Generate invoice
+ClassifyShipped=Classify delivered
+DraftOrders=Draft orders
+DraftSuppliersOrders=Draft purchase orders
+OnProcessOrders=In process orders
+RefOrder=Ref. order
+RefCustomerOrder=Ref. order for customer
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
+SendOrderByMail=Send order by mail
+ActionsOnOrder=Events on order
+NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
+OrderMode=Order method
+AuthorRequest=Request author
+UserWithApproveOrderGrant=Users granted with "approve orders" permission.
+PaymentOrderRef=Payment of order %s
+ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
+DispatchSupplierOrder=Receiving purchase order %s
+FirstApprovalAlreadyDone=First approval already done
+SecondApprovalAlreadyDone=Second approval already done
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
+OtherOrders=Other orders
+##### Types de contacts #####
+TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
+TypeContact_commande_internal_SHIPPING=Representative following-up shipping
+TypeContact_commande_external_BILLING=Customer invoice contact
+TypeContact_commande_external_SHIPPING=Customer shipping contact
+TypeContact_commande_external_CUSTOMER=Customer contact following-up order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
+TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
+Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
+Error_OrderNotChecked=No orders to invoice selected
+# Order modes (how we receive order). Not the "why" are keys stored into dict.lang
+OrderByMail=Mail
+OrderByFax=Fax
+OrderByEMail=Email
+OrderByWWW=Online
+OrderByPhone=Phone
+# Documents models
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
+PDFEratostheneDescription=A complete order model
+PDFEdisonDescription=A simple order model
+PDFProformaDescription=A complete Proforma invoice template
+CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
+IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
+SetShippingMode=Set shipping mode
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Canceled
+StatusSupplierOrderDraftShort=Draft
+StatusSupplierOrderValidatedShort=Validated
+StatusSupplierOrderSentShort=In process
+StatusSupplierOrderSent=Shipment in process
+StatusSupplierOrderOnProcessShort=Ordered
+StatusSupplierOrderProcessedShort=Processed
+StatusSupplierOrderDelivered=Delivered
+StatusSupplierOrderDeliveredShort=Delivered
+StatusSupplierOrderToBillShort=Delivered
+StatusSupplierOrderApprovedShort=Approved
+StatusSupplierOrderRefusedShort=Refused
+StatusSupplierOrderToProcessShort=To process
+StatusSupplierOrderReceivedPartiallyShort=Partially received
+StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderCanceled=Canceled
+StatusSupplierOrderDraft=Draft (needs to be validated)
+StatusSupplierOrderValidated=Validated
+StatusSupplierOrderOnProcess=Ordered - Standby reception
+StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusSupplierOrderProcessed=Processed
+StatusSupplierOrderToBill=Delivered
+StatusSupplierOrderApproved=Approved
+StatusSupplierOrderRefused=Refused
+StatusSupplierOrderReceivedPartially=Partially received
+StatusSupplierOrderReceivedAll=All products received
diff --git a/htdocs/langs/zh_HK/other.lang b/htdocs/langs/zh_HK/other.lang
new file mode 100644
index 00000000000..ba85f51e739
--- /dev/null
+++ b/htdocs/langs/zh_HK/other.lang
@@ -0,0 +1,286 @@
+# Dolibarr language file - Source file is en_US - other
+SecurityCode=Security code
+NumberingShort=N°
+Tools=Tools
+TMenuTools=Tools
+ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
+Birthday=Birthday
+BirthdayDate=Birthday date
+DateToBirth=Birth date
+BirthdayAlertOn=birthday alert active
+BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (text) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+DocFileGeneratedInto=Doc file generated into <b>%s</b>.
+JumpToLogin=Disconnected. Go to login page...
+MessageForm=Message on online payment form
+MessageOK=Message on the return page for a validated payment
+MessageKO=Message on the return page for a canceled payment
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursively
+PoweredBy=Powered by
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+DateNextInvoiceBeforeGen=Date of next invoice (before generation)
+DateNextInvoiceAfterGen=Date of next invoice (after generation)
+GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
+OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Only the first selected field has been selected.
+AtLeastOneMeasureIsRequired=At least 1 field for measure is required
+AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
+LatestBlogPosts=Latest Blog Posts
+Notify_ORDER_VALIDATE=Sales order validated
+Notify_ORDER_SENTBYMAIL=Sales order sent by mail
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
+Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
+Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
+Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
+Notify_PROPAL_VALIDATE=Customer proposal validated
+Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
+Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
+Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
+Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
+Notify_WITHDRAW_CREDIT=Credit withdrawal
+Notify_WITHDRAW_EMIT=Perform withdrawal
+Notify_COMPANY_CREATE=Third party created
+Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_BILL_VALIDATE=Customer invoice validated
+Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_BILL_PAYED=Customer invoice paid
+Notify_BILL_CANCEL=Customer invoice canceled
+Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
+Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
+Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
+Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
+Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
+Notify_CONTRACT_VALIDATE=Contract validated
+Notify_FICHINTER_VALIDATE=Intervention validated
+Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
+Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
+Notify_SHIPPING_VALIDATE=Shipping validated
+Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail
+Notify_MEMBER_VALIDATE=Member validated
+Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_SUBSCRIPTION=Member subscribed
+Notify_MEMBER_RESILIATE=Member terminated
+Notify_MEMBER_DELETE=Member deleted
+Notify_PROJECT_CREATE=Project creation
+Notify_TASK_CREATE=Task created
+Notify_TASK_MODIFY=Task modified
+Notify_TASK_DELETE=Task deleted
+Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
+Notify_EXPENSE_REPORT_APPROVE=Expense report approved
+Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
+Notify_HOLIDAY_APPROVE=Leave request approved
+SeeModuleSetup=See setup of module %s
+NbOfAttachedFiles=Number of attached files/documents
+TotalSizeOfAttachedFiles=Total size of attached files/documents
+MaxSize=Maximum size
+AttachANewFile=Attach a new file/document
+LinkedObject=Linked object
+NbOfActiveNotifications=Number of notifications (no. of recipient emails)
+PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to remind you that the invoice  __REF__ seems to have not been paid. A copy of the invoice is attached as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find commercial proposal __REF__ attached \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price request __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
+ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
+DemoFundation=Manage members of a foundation
+DemoFundation2=Manage members and bank account of a foundation
+DemoCompanyServiceOnly=Company or freelance selling service only
+DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
+DemoCompanyAll=Company with multiple activities (all main modules)
+CreatedBy=Created by %s
+ModifiedBy=Modified by %s
+ValidatedBy=Validated by %s
+ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made latest change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made latest change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
+FileWasRemoved=File %s was removed
+DirWasRemoved=Directory %s was removed
+FeatureNotYetAvailable=Feature not yet available in the current version
+FeaturesSupported=Supported features
+Width=Width
+Height=Height
+Depth=Depth
+Top=Top
+Bottom=Bottom
+Left=Left
+Right=Right
+CalculatedWeight=Calculated weight
+CalculatedVolume=Calculated volume
+Weight=Weight
+WeightUnitton=tonne
+WeightUnitkg=kg
+WeightUnitg=g
+WeightUnitmg=mg
+WeightUnitpound=pound
+WeightUnitounce=ounce
+Length=Length
+LengthUnitm=m
+LengthUnitdm=dm
+LengthUnitcm=cm
+LengthUnitmm=mm
+Surface=Area
+SurfaceUnitm2=m²
+SurfaceUnitdm2=dm²
+SurfaceUnitcm2=cm²
+SurfaceUnitmm2=mm²
+SurfaceUnitfoot2=ft²
+SurfaceUnitinch2=in²
+Volume=Volume
+VolumeUnitm3=m³
+VolumeUnitdm3=dm³ (L)
+VolumeUnitcm3=cm³ (ml)
+VolumeUnitmm3=mm³ (µl)
+VolumeUnitfoot3=ft³
+VolumeUnitinch3=in³
+VolumeUnitounce=ounce
+VolumeUnitlitre=litre
+VolumeUnitgallon=gallon
+SizeUnitm=m
+SizeUnitdm=dm
+SizeUnitcm=cm
+SizeUnitmm=mm
+SizeUnitinch=inch
+SizeUnitfoot=foot
+SizeUnitpoint=point
+BugTracker=Bug tracker
+SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
+BackToLoginPage=Back to login page
+AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
+EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
+ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
+DolibarrDemo=Dolibarr ERP/CRM demo
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of sales orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of vendor proposals
+NumberOfSupplierOrders=Number of purchase orders
+NumberOfSupplierInvoices=Number of vendor invoices
+NumberOfContracts=Number of contracts
+NumberOfMos=Number of manufacturing orders
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on sales orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on vendor proposals
+NumberOfUnitsSupplierOrders=Number of units on purchase orders
+NumberOfUnitsSupplierInvoices=Number of units on vendor invoices
+NumberOfUnitsContracts=Number of units on contracts
+NumberOfUnitsMos=Number of units to produce in manufacturing orders
+EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
+EMailTextInterventionValidated=The intervention %s has been validated.
+EMailTextInvoiceValidated=Invoice %s has been validated.
+EMailTextInvoicePayed=Invoice %s has been paid.
+EMailTextProposalValidated=Proposal %s has been validated.
+EMailTextProposalClosedSigned=Proposal %s has been closed signed.
+EMailTextOrderValidated=Order %s has been validated.
+EMailTextOrderApproved=Order %s has been approved.
+EMailTextOrderValidatedBy=Order %s has been recorded by %s.
+EMailTextOrderApprovedBy=Order %s has been approved by %s.
+EMailTextOrderRefused=Order %s has been refused.
+EMailTextOrderRefusedBy=Order %s has been refused by %s.
+EMailTextExpeditionValidated=Shipping %s has been validated.
+EMailTextExpenseReportValidated=Expense report %s has been validated.
+EMailTextExpenseReportApproved=Expense report %s has been approved.
+EMailTextHolidayValidated=Leave request %s has been validated.
+EMailTextHolidayApproved=Leave request %s has been approved.
+ImportedWithSet=Importation data set
+DolibarrNotification=Automatic notification
+ResizeDesc=Enter new width <b>OR</b> new height. Ratio will be kept during resizing...
+NewLength=New width
+NewHeight=New height
+NewSizeAfterCropping=New size after cropping
+DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner)
+CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
+ImageEditor=Image editor
+YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s.
+YouReceiveMailBecauseOfNotification2=This event is the following:
+ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start".
+UseAdvancedPerms=Use the advanced permissions of some modules
+FileFormat=File format
+SelectAColor=Choose a color
+AddFiles=Add Files
+StartUpload=Start upload
+CancelUpload=Cancel upload
+FileIsTooBig=Files is too big
+PleaseBePatient=Please be patient...
+NewPassword=New password
+ResetPassword=Reset password
+RequestToResetPasswordReceived=A request to change your password has been received.
+NewKeyIs=This is your new keys to login
+NewKeyWillBe=Your new key to login to software will be
+ClickHereToGoTo=Click here to go to %s
+YouMustClickToChange=You must however first click on the following link to validate this password change
+ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
+Chart=Chart
+PassEncoding=Password encoding
+PermissionsAdd=Permissions added
+PermissionsDelete=Permissions removed
+YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+YourPasswordHasBeenReset=Your password has been reset successfully
+ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+MissingIds=Missing ids
+ThirdPartyCreatedByEmailCollector=Third party created by email collector from email MSGID %s
+ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s
+ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
+TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
+OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+
+##### Export #####
+ExportsArea=Exports area
+AvailableFormats=Available formats
+LibraryUsed=Library used
+LibraryVersion=Library version
+ExportableDatas=Exportable data
+NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
+##### External sites #####
+WebsiteSetup=Setup of module website
+WEBSITE_PAGEURL=URL of page
+WEBSITE_TITLE=Title
+WEBSITE_DESCRIPTION=Description
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
+WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
+
+MemoryUsage=Memory usage
+RequestDuration=Duration of request
+PopuProp=Products/Services by popularity in Proposals
+PopuCom=Products/Services by popularity in Orders
+ProductStatistics=Products/Services Statistics
+NbOfQtyInOrders=Qty in orders
diff --git a/htdocs/langs/zh_HK/paybox.lang b/htdocs/langs/zh_HK/paybox.lang
new file mode 100644
index 00000000000..1bbbef4017b
--- /dev/null
+++ b/htdocs/langs/zh_HK/paybox.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - paybox
+PayBoxSetup=PayBox module setup
+PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+Creditor=Creditor
+PaymentCode=Payment code
+PayBoxDoPayment=Pay with Paybox
+YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
+Continue=Next
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
+YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/zh_HK/paypal.lang b/htdocs/langs/zh_HK/paypal.lang
new file mode 100644
index 00000000000..5eb5f389445
--- /dev/null
+++ b/htdocs/langs/zh_HK/paypal.lang
@@ -0,0 +1,36 @@
+# Dolibarr language file - Source file is en_US - paypal
+PaypalSetup=PayPal module setup
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
+PAYPAL_API_SANDBOX=Mode test/sandbox
+PAYPAL_API_USER=API username
+PAYPAL_API_PASSWORD=API password
+PAYPAL_API_SIGNATURE=API signature
+PAYPAL_SSLVERSION=Curl SSL Version
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
+PaypalModeIntegral=Integral
+PaypalModeOnlyPaypal=PayPal only
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
+ThisIsTransactionId=This is id of transaction: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
+NewOnlinePaymentReceived=New online payment received
+NewOnlinePaymentFailed=New online payment tried but failed
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
+ReturnURLAfterPayment=Return URL after payment
+ValidationOfOnlinePaymentFailed=Validation of online payment failed
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
+DetailedErrorMessage=Detailed Error Message
+ShortErrorMessage=Short Error Message
+ErrorCode=Error Code
+ErrorSeverityCode=Error Severity Code
+OnlinePaymentSystem=Online payment system
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/zh_HK/printing.lang b/htdocs/langs/zh_HK/printing.lang
new file mode 100644
index 00000000000..16494583550
--- /dev/null
+++ b/htdocs/langs/zh_HK/printing.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - printing
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
+PrintingSetup=Setup of Direct Printing System
+PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer without needing to open the document in another application.
+MenuDirectPrinting=Direct Printing jobs
+DirectPrint=Direct print
+PrintingDriverDesc=Configuration variables for printing driver.
+ListDrivers=List of drivers
+PrintTestDesc=List of Printers.
+FileWasSentToPrinter=File %s was sent to printer
+ViaModule=via the module
+NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
+PleaseSelectaDriverfromList=Please select a driver from list.
+PleaseConfigureDriverfromList=Please configure the selected driver from list.
+SetupDriver=Driver setup
+TargetedPrinter=Targeted printer
+UserConf=Setup per user
+PRINTGCP_INFO=Google OAuth API setup
+PRINTGCP_AUTHLINK=Authentication
+PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
+PrintGCPDesc=This driver allows sending documents directly to a printer using Google Cloud Print.
+GCP_Name=Name
+GCP_displayName=Display Name
+GCP_Id=Printer Id
+GCP_OwnerName=Owner Name
+GCP_State=Printer State
+GCP_connectionStatus=Online State
+GCP_Type=Printer Type
+PrintIPPDesc=This driver allows sending of documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+IPP_Uri=Printer Uri
+IPP_Name=Printer Name
+IPP_State=Printer State
+IPP_State_reason=State reason
+IPP_State_reason1=State reason1
+IPP_BW=BW
+IPP_Color=Color
+IPP_Device=Device
+IPP_Media=Printer media
+IPP_Supported=Type of media
+DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
+GoogleAuthNotConfigured=Google OAuth has not been setup. Enable module OAuth and set a Google ID/Secret.
+GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
+PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
+PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
+PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+PrintTestDescprintipp=List of Printers for Cups.
diff --git a/htdocs/langs/zh_HK/productbatch.lang b/htdocs/langs/zh_HK/productbatch.lang
new file mode 100644
index 00000000000..54270c4a23b
--- /dev/null
+++ b/htdocs/langs/zh_HK/productbatch.lang
@@ -0,0 +1,24 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Use lot/serial number
+ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusNotOnBatch=No (lot/serial not used)
+ProductStatusOnBatchShort=Yes
+ProductStatusNotOnBatchShort=No
+Batch=Lot/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
+batch_number=Lot/Serial number
+BatchNumberShort=Lot/Serial
+EatByDate=Eat-by date
+SellByDate=Sell-by date
+DetailBatchNumber=Lot/Serial details
+printBatch=Lot/Serial: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
+StockDetailPerBatch=Stock detail per lot
diff --git a/htdocs/langs/zh_HK/products.lang b/htdocs/langs/zh_HK/products.lang
new file mode 100644
index 00000000000..a31243a07b6
--- /dev/null
+++ b/htdocs/langs/zh_HK/products.lang
@@ -0,0 +1,385 @@
+# Dolibarr language file - Source file is en_US - products
+ProductRef=Product ref.
+ProductLabel=Product label
+ProductLabelTranslated=Translated product label
+ProductDescription=Product description
+ProductDescriptionTranslated=Translated product description
+ProductNoteTranslated=Translated product note
+ProductServiceCard=Products/Services card
+TMenuProducts=Products
+TMenuServices=Services
+Products=Products
+Services=Services
+Product=Product
+Service=Service
+ProductId=Product/service id
+Create=Create
+Reference=Reference
+NewProduct=New product
+NewService=New service
+ProductVatMassChange=Global VAT Update
+ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
+MassBarcodeInit=Mass barcode init
+MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
+ProductAccountancyBuyCode=Accounting code (purchase)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
+ProductAccountancySellCode=Accounting code (sale)
+ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
+ProductAccountancySellExportCode=Accounting code (sale export)
+ProductOrService=Product or Service
+ProductsAndServices=Products and Services
+ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
+ProductsOnSale=Products for sale
+ProductsOnPurchase=Products for purchase
+ProductsOnSaleOnly=Products for sale only
+ProductsOnPurchaseOnly=Products for purchase only
+ProductsNotOnSell=Products not for sale and not for purchase
+ProductsOnSellAndOnBuy=Products for sale and for purchase
+ServicesOnSale=Services for sale
+ServicesOnPurchase=Services for purchase
+ServicesOnSaleOnly=Services for sale only
+ServicesOnPurchaseOnly=Services for purchase only
+ServicesNotOnSell=Services not for sale and not for purchase
+ServicesOnSellAndOnBuy=Services for sale and for purchase
+LastModifiedProductsAndServices=Last %s modified products/services
+LastRecordedProducts=Latest %s recorded products
+LastRecordedServices=Latest %s recorded services
+CardProduct0=Product
+CardProduct1=Service
+Stock=Stock
+MenuStocks=Stocks
+Stocks=Stocks and location (warehouse) of products
+Movements=Movements
+Sell=Sell
+Buy=Purchase
+OnSell=For sale
+OnBuy=For purchase
+NotOnSell=Not for sale
+ProductStatusOnSell=For sale
+ProductStatusNotOnSell=Not for sale
+ProductStatusOnSellShort=For sale
+ProductStatusNotOnSellShort=Not for sale
+ProductStatusOnBuy=For purchase
+ProductStatusNotOnBuy=Not for purchase
+ProductStatusOnBuyShort=For purchase
+ProductStatusNotOnBuyShort=Not for purchase
+UpdateVAT=Update vat
+UpdateDefaultPrice=Update default price
+UpdateLevelPrices=Update prices for each level
+AppliedPricesFrom=Applied from
+SellingPrice=Selling price
+SellingPriceHT=Selling price (excl. tax)
+SellingPriceTTC=Selling price (inc. tax)
+SellingMinPriceTTC=Minimum Selling price (inc. tax)
+CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceUsage=This value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
+NewPrice=New price
+MinPrice=Min. sell price
+EditSellingPriceLabel=Edit selling price label
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
+ContractStatusClosed=Closed
+ErrorProductAlreadyExists=A product with reference %s already exists.
+ErrorProductBadRefOrLabel=Wrong value for reference or label.
+ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
+Suppliers=Vendors
+SupplierRef=Vendor SKU
+ShowProduct=Show product
+ShowService=Show service
+ProductsAndServicesArea=Product and Services area
+ProductsArea=Product area
+ServicesArea=Services area
+ListOfStockMovements=List of stock movements
+BuyingPrice=Buying price
+PriceForEachProduct=Products with specific prices
+SupplierCard=Vendor card
+PriceRemoved=Price removed
+BarCode=Barcode
+BarcodeType=Barcode type
+SetDefaultBarcodeType=Set barcode type
+BarcodeValue=Barcode value
+NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
+ServiceLimitedDuration=If product is a service with limited duration:
+MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
+MultiPricesNumPrices=Number of prices
+AssociatedProductsAbility=Activate virtual products (kits)
+AssociatedProducts=Virtual products
+AssociatedProductsNumber=Number of products composing this virtual product
+ParentProductsNumber=Number of parent packaging product
+ParentProducts=Parent products
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+KeywordFilter=Keyword filter
+CategoryFilter=Category filter
+ProductToAddSearch=Search product to add
+NoMatchFound=No match found
+ListOfProductsServices=List of products/services
+ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
+ProductParentList=List of virtual products/services with this product as a component
+ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
+DeleteProduct=Delete a product/service
+ConfirmDeleteProduct=Are you sure you want to delete this product/service?
+ProductDeleted=Product/Service "%s" deleted from database.
+ExportDataset_produit_1=Products
+ExportDataset_service_1=Services
+ImportDataset_produit_1=Products
+ImportDataset_service_1=Services
+DeleteProductLine=Delete product line
+ConfirmDeleteProductLine=Are you sure you want to delete this product line?
+ProductSpecial=Special
+QtyMin=Min. purchase quantity
+PriceQtyMin=Price quantity min.
+PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
+VATRateForSupplierProduct=VAT Rate (for this vendor/product)
+DiscountQtyMin=Discount for this qty.
+NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
+NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedProductsToSell=Predefined Product
+PredefinedServicesToSell=Predefined Service
+PredefinedProductsAndServicesToSell=Predefined products/services to sell
+PredefinedProductsToPurchase=Predefined product to purchase
+PredefinedServicesToPurchase=Predefined services to purchase
+PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
+NotPredefinedProducts=Not predefined products/services
+GenerateThumb=Generate thumb
+ServiceNb=Service #%s
+ListProductServiceByPopularity=List of products/services by popularity
+ListProductByPopularity=List of products by popularity
+ListServiceByPopularity=List of services by popularity
+Finished=Manufactured product
+RowMaterial=Raw Material
+ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
+CloneContentProduct=Clone all main information of product/service
+ClonePricesProduct=Clone prices
+CloneCategoriesProduct=Clone tags/categories linked
+CloneCompositionProduct=Clone virtual product/service
+CloneCombinationsProduct=Clone product variants
+ProductIsUsed=This product is used
+NewRefForClone=Ref. of new product/service
+SellingPrices=Selling prices
+BuyingPrices=Buying prices
+CustomerPrices=Customer prices
+SuppliersPrices=Vendor prices
+SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
+CustomCode=Customs / Commodity / HS code
+CountryOrigin=Origin country
+Nature=Nature of product (material/finished)
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+lm=lm
+m2=m²
+m3=m³
+liter=liter
+l=L
+unitP=Piece
+unitSET=Set
+unitS=Second
+unitH=Hour
+unitD=Day
+unitG=Gram
+unitM=Meter
+unitLM=Linear meter
+unitM2=Square meter
+unitM3=Cubic meter
+unitL=Liter
+unitT=ton
+unitKG=kg
+unitG=Gram
+unitMG=mg
+unitLB=pound
+unitOZ=ounce
+unitM=Meter
+unitDM=dm
+unitCM=cm
+unitMM=mm
+unitFT=ft
+unitIN=in
+unitM2=Square meter
+unitDM2=dm²
+unitCM2=cm²
+unitMM2=mm²
+unitFT2=ft²
+unitIN2=in²
+unitM3=Cubic meter
+unitDM3=dm³
+unitCM3=cm³
+unitMM3=mm³
+unitFT3=ft³
+unitIN3=in³
+unitOZ3=ounce
+unitgallon=gallon
+ProductCodeModel=Product ref template
+ServiceCodeModel=Service ref template
+CurrentProductPrice=Current price
+AlwaysUseNewPrice=Always use current price of product/service
+AlwaysUseFixedPrice=Use the fixed price
+PriceByQuantity=Different prices by quantity
+DisablePriceByQty=Disable prices by quantity
+PriceByQuantityRange=Quantity range
+MultipriceRules=Price segment rules
+UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
+PercentVariationOver=%% variation over %s
+PercentDiscountOver=%% discount over %s
+KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
+VariantRefExample=Examples: COL, SIZE
+VariantLabelExample=Examples: Color, Size
+### composition fabrication
+Build=Produce
+ProductsMultiPrice=Products and prices for each price segment
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
+ProductSellByQuarterHT=Products turnover quarterly before tax
+ServiceSellByQuarterHT=Services turnover quarterly before tax
+Quarter1=1st. Quarter
+Quarter2=2nd. Quarter
+Quarter3=3rd. Quarter
+Quarter4=4th. Quarter
+BarCodePrintsheet=Print barcode
+PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
+NumberOfStickers=Number of stickers to print on page
+PrintsheetForOneBarCode=Print several stickers for one barcode
+BuildPageToPrint=Generate page to print
+FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
+FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
+DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
+BarCodeDataForProduct=Barcode information of product %s:
+BarCodeDataForThirdparty=Barcode information of third party %s:
+ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
+PriceByCustomer=Different prices for each customer
+PriceCatalogue=A single sell price per product/service
+PricingRule=Rules for selling prices
+AddCustomerPrice=Add price by customer
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+PriceByCustomerLog=Log of previous customer prices
+MinimumPriceLimit=Minimum price can't be lower then %s
+MinimumRecommendedPrice=Minimum recommended price is: %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
+PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=Available global values:
+PriceMode=Price mode
+PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Child products
+MinSupplierPrice=Minimum buying price
+MinCustomerPrice=Minimum selling price
+DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
+AddVariable=Add Variable
+AddUpdater=Add Updater
+GlobalVariables=Global variables
+VariableToUpdate=Variable to update
+GlobalVariableUpdaters=External updaters for variables
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Latest update
+CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Including product/service with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
+WarningSelectOneDocument=Please select at least one document
+DefaultUnitToShow=Unit
+NbOfQtyInProposals=Qty in proposals
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+ProductsOrServicesTranslations=Products/Services translations
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+WidthUnits=Width unit
+LengthUnits=Length unit
+HeightUnits=Height unit
+SurfaceUnits=Surface unit
+SizeUnits=Size unit
+DeleteProductBuyPrice=Delete buying price
+ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
+ProductSheet=Product sheet
+ServiceSheet=Service sheet
+PossibleValues=Possible values
+GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
+ProductSupplierDescription=Vendor description for the product
+UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
+PackagingForThisProduct=Packaging
+QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+
+#Attributes
+VariantAttributes=Variant attributes
+ProductAttributes=Variant attributes for products
+ProductAttributeName=Variant attribute %s
+ProductAttribute=Variant attribute
+ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
+ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
+ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
+ProductCombinations=Variants
+PropagateVariant=Propagate variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+NewProductCombinations=New variants
+EditProductCombinations=Editing variants
+SelectCombination=Select combination
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+NewProductAttributeValue=New attribute value
+ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
+ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
+TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
+DoNotRemovePreviousCombinations=Do not remove previous variants
+UsePercentageVariations=Use percentage variations
+PercentageVariation=Percentage variation
+ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
+NbOfDifferentValues=No. of different values
+NbProducts=Number of products
+ParentProduct=Parent product
+HideChildProducts=Hide variant products
+ShowChildProducts=Show variant products
+NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
+ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
+CloneDestinationReference=Destination product reference
+ErrorCopyProductCombinations=There was an error while copying the product variants
+ErrorDestinationProductNotFound=Destination product not found
+ErrorProductCombinationNotFound=Product variant not found
+ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
+ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
+DeleteLinkedProduct=Delete the child product linked to the combination
diff --git a/htdocs/langs/zh_HK/projects.lang b/htdocs/langs/zh_HK/projects.lang
new file mode 100644
index 00000000000..bb42bff3c87
--- /dev/null
+++ b/htdocs/langs/zh_HK/projects.lang
@@ -0,0 +1,267 @@
+# Dolibarr language file - Source file is en_US - projects
+RefProject=Ref. project
+ProjectRef=Project ref.
+ProjectId=Project Id
+ProjectLabel=Project label
+ProjectsArea=Projects Area
+ProjectStatus=Project status
+SharedProject=Everybody
+PrivateProject=Project contacts
+ProjectsImContactFor=Projects for I am explicitly a contact
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=All projects
+MyProjectsDesc=This view is limited to projects you are a contact for
+ProjectsPublicDesc=This view presents all projects you are allowed to read.
+TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
+TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
+ClosedProjectsAreHidden=Closed projects are not visible.
+TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
+TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
+NewProject=New project
+AddProject=Create project
+DeleteAProject=Delete a project
+DeleteATask=Delete a task
+ConfirmDeleteAProject=Are you sure you want to delete this project?
+ConfirmDeleteATask=Are you sure you want to delete this task?
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
+OpportunitiesStatusForProjects=Leads amount of projects by status
+ShowProject=Show project
+ShowTask=Show task
+SetProject=Set project
+NoProject=No project defined or owned
+NbOfProjects=Number of projects
+NbOfTasks=Number of tasks
+TimeSpent=Time spent
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
+TimesSpent=Time spent
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
+TaskTimeSpent=Time spent on tasks
+TaskTimeUser=User
+TaskTimeNote=Note
+TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on open projects
+WorkloadNotDefined=Workload not defined
+NewTimeSpent=Time spent
+MyTimeSpent=My time spent
+BillTime=Bill the time spent
+BillTimeShort=Bill time
+TimeToBill=Time not billed
+TimeBilled=Time billed
+Tasks=Tasks
+Task=Task
+TaskDateStart=Task start date
+TaskDateEnd=Task end date
+TaskDescription=Task description
+NewTask=New task
+AddTask=Create task
+AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
+AddHereTimeSpentForWeek=Add here time spent for this week/task
+Activity=Activity
+Activities=Tasks/activities
+MyActivities=My tasks/activities
+MyProjects=My projects
+MyProjectsArea=My projects Area
+DurationEffective=Effective duration
+ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently open tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
+ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
+Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GanttView=Gantt View
+ListProposalsAssociatedProject=List of the commercial proposals related to the project
+ListOrdersAssociatedProject=List of sales orders related to the project
+ListInvoicesAssociatedProject=List of customer invoices related to the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
+ListSupplierOrdersAssociatedProject=List of purchase orders related to the project
+ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project
+ListContractAssociatedProject=List of contracts related to the project
+ListShippingAssociatedProject=List of shippings related to the project
+ListFichinterAssociatedProject=List of interventions related to the project
+ListExpenseReportsAssociatedProject=List of expense reports related to the project
+ListDonationsAssociatedProject=List of donations related to the project
+ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
+ListSalariesAssociatedProject=List of payments of salaries related to the project
+ListActionsAssociatedProject=List of events related to the project
+ListMOAssociatedProject=List of manufacturing orders related to the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
+ActivityOnProjectToday=Activity on project today
+ActivityOnProjectYesterday=Activity on project yesterday
+ActivityOnProjectThisWeek=Activity on project this week
+ActivityOnProjectThisMonth=Activity on project this month
+ActivityOnProjectThisYear=Activity on project this year
+ChildOfProjectTask=Child of project/task
+ChildOfTask=Child of task
+TaskHasChild=Task has child
+NotOwnerOfProject=Not owner of this private project
+AffectedTo=Allocated to
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
+ValidateProject=Validate projet
+ConfirmValidateProject=Are you sure you want to validate this project?
+CloseAProject=Close project
+ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+ReOpenAProject=Open project
+ConfirmReOpenAProject=Are you sure you want to re-open this project?
+ProjectContact=Contacts of project
+TaskContact=Task contacts
+ActionsOnProject=Events on project
+YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
+DeleteATimeSpent=Delete time spent
+ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
+TaskRessourceLinks=Contacts of task
+ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
+NoTasks=No tasks for this project
+LinkedToAnotherCompany=Linked to other third party
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
+ErrorTimeSpentIsEmpty=Time spent is empty
+ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
+IfNeedToUseOtherObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
+CloneTasks=Clone tasks
+CloneContacts=Clone contacts
+CloneNotes=Clone notes
+CloneProjectFiles=Clone project joined files
+CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
+CloneMoveDate=Update project/tasks dates from now?
+ConfirmCloneProject=Are you sure to clone this project?
+ProjectReportDate=Change task dates according to new project start date
+ErrorShiftTaskDate=Impossible to shift task date according to new project start date
+ProjectsAndTasksLines=Projects and tasks
+ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
+ProjectModifiedInDolibarr=Project %s modified
+TaskCreatedInDolibarr=Task %s created
+TaskModifiedInDolibarr=Task %s modified
+TaskDeletedInDolibarr=Task %s deleted
+OpportunityStatus=Lead status
+OpportunityStatusShort=Lead status
+OpportunityProbability=Lead probability
+OpportunityProbabilityShort=Lead probab.
+OpportunityAmount=Lead amount
+OpportunityAmountShort=Lead amount
+OpportunityWeightedAmount=Opportunity weighted amount
+OpportunityWeightedAmountShort=Opp. weighted amount
+OpportunityAmountAverageShort=Average lead amount
+OpportunityAmountWeigthedShort=Weighted lead amount
+WonLostExcluded=Won/Lost excluded
+##### Types de contacts #####
+TypeContact_project_internal_PROJECTLEADER=Project leader
+TypeContact_project_external_PROJECTLEADER=Project leader
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_task_internal_TASKEXECUTIVE=Task executive
+TypeContact_project_task_external_TASKEXECUTIVE=Task executive
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
+TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
+SelectElement=Select element
+AddElement=Link to element
+# Documents models
+DocumentModelBeluga=Project document template for linked objects overview
+DocumentModelBaleine=Project document template for tasks
+DocumentModelTimeSpent=Project report template for time spent
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+ProjectReferers=Related items
+ProjectMustBeValidatedFirst=Project must be validated first
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerMonth=Input per month
+InputDetail=Input detail
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTheTask=Not assigned to the task
+NoUserAssignedToTheProject=No users assigned to this project
+TimeSpentBy=Time spent by
+TasksAssignedTo=Tasks assigned to
+AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
+AssignTask=Assign
+ProjectOverview=Overview
+ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
+ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
+ProjectNbProjectByMonth=No. of created projects by month
+ProjectNbTaskByMonth=No. of created tasks by month
+ProjectOppAmountOfProjectsByMonth=Amount of leads by month
+ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
+ProjectOpenedProjectByOppStatus=Open project/lead by lead status
+ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
+TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
+IdTaskTime=Id task time
+YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
+OpenedProjectsByThirdparties=Open projects by third parties
+OnlyOpportunitiesShort=Only leads
+OpenedOpportunitiesShort=Open leads
+NotOpenedOpportunitiesShort=Not an open lead
+NotAnOpportunityShort=Not a lead
+OpportunityTotalAmount=Total amount of leads
+OpportunityPonderatedAmount=Weighted amount of leads
+OpportunityPonderatedAmountDesc=Leads amount weighted with probability
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWON=Won
+OppStatusLOST=Lost
+Budget=Budget
+AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
+LatestProjects=Latest %s projects
+LatestModifiedProjects=Latest %s modified projects
+OtherFilteredTasks=Other filtered tasks
+NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
+ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+# Comments trans
+AllowCommentOnTask=Allow user comments on tasks
+AllowCommentOnProject=Allow user comments on projects
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=Information project %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
+NewTaskRefSuggested=Task ref already used, a new task ref is required
+TimeSpentInvoiced=Time spent billed
+TimeSpentForInvoice=Time spent
+OneLinePerUser=One line per user
+ServiceToUseOnLines=Service to use on lines
+InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
+ProjectFollowOpportunity=Follow opportunity
+ProjectFollowTasks=Follow tasks or time spent
+Usage=Usage
+UsageOpportunity=Usage: Opportunity
+UsageTasks=Usage: Tasks
+UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=New invoice
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/zh_HK/propal.lang b/htdocs/langs/zh_HK/propal.lang
new file mode 100644
index 00000000000..71d6857c909
--- /dev/null
+++ b/htdocs/langs/zh_HK/propal.lang
@@ -0,0 +1,86 @@
+# Dolibarr language file - Source file is en_US - propal
+Proposals=Commercial proposals
+Proposal=Commercial proposal
+ProposalShort=Proposal
+ProposalsDraft=Draft commercial proposals
+ProposalsOpened=Open commercial proposals
+CommercialProposal=Commercial proposal
+PdfCommercialProposalTitle=Commercial proposal
+ProposalCard=Proposal card
+NewProp=New commercial proposal
+NewPropal=New proposal
+Prospect=Prospect
+DeleteProp=Delete commercial proposal
+ValidateProp=Validate commercial proposal
+AddProp=Create proposal
+ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
+ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
+LastPropals=Latest %s proposals
+LastModifiedProposals=Latest %s modified proposals
+AllPropals=All proposals
+SearchAProposal=Search a proposal
+NoProposal=No proposal
+ProposalsStatistics=Commercial proposal's statistics
+NumberOfProposalsByMonth=Number by month
+AmountOfProposalsByMonthHT=Amount by month (excl. tax)
+NbOfProposals=Number of commercial proposals
+ShowPropal=Show proposal
+PropalsDraft=Drafts
+PropalsOpened=Open
+PropalStatusDraft=Draft (needs to be validated)
+PropalStatusValidated=Validated (proposal is open)
+PropalStatusSigned=Signed (needs billing)
+PropalStatusNotSigned=Not signed (closed)
+PropalStatusBilled=Billed
+PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated (open)
+PropalStatusClosedShort=Closed
+PropalStatusSignedShort=Signed
+PropalStatusNotSignedShort=Not signed
+PropalStatusBilledShort=Billed
+PropalsToClose=Commercial proposals to close
+PropalsToBill=Signed commercial proposals to bill
+ListOfProposals=List of commercial proposals
+ActionsOnPropal=Events on proposal
+RefProposal=Commercial proposal ref
+SendPropalByMail=Send commercial proposal by mail
+DatePropal=Date of proposal
+DateEndPropal=Validity ending date
+ValidityDuration=Validity duration
+CloseAs=Set status to
+SetAcceptedRefused=Set accepted/refused
+ErrorPropalNotFound=Propal %s not found
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
+CopyPropalFrom=Create commercial proposal by copying existing proposal
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
+DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
+ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
+ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
+ProposalsAndProposalsLines=Commercial proposal and lines
+ProposalLine=Proposal line
+AvailabilityPeriod=Availability delay
+SetAvailability=Set availability delay
+AfterOrder=after order
+OtherProposals=Other proposals
+##### Availability #####
+AvailabilityTypeAV_NOW=Immediate
+AvailabilityTypeAV_1W=1 week
+AvailabilityTypeAV_2W=2 weeks
+AvailabilityTypeAV_3W=3 weeks
+AvailabilityTypeAV_1M=1 month
+##### Types de contacts #####
+TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
+TypeContact_propal_external_BILLING=Customer invoice contact
+TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
+TypeContact_propal_external_SHIPPING=Customer contact for delivery
+# Document models
+DocModelAzurDescription=A complete proposal model (old implementation of Cyan template)
+DocModelCyanDescription=A complete proposal model
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
+ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/zh_HK/receiptprinter.lang b/htdocs/langs/zh_HK/receiptprinter.lang
new file mode 100644
index 00000000000..896eaa313dd
--- /dev/null
+++ b/htdocs/langs/zh_HK/receiptprinter.lang
@@ -0,0 +1,95 @@
+# Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
+PrinterAdded=Printer %s added
+PrinterUpdated=Printer %s updated
+PrinterDeleted=Printer %s deleted
+TestSentToPrinter=Test Sent To Printer %s
+ReceiptPrinter=Receipt printers
+ReceiptPrinterDesc=Setup of receipt printers
+ReceiptPrinterTemplateDesc=Setup of Templates
+ReceiptPrinterTypeDesc=Description of Receipt Printer's type
+ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
+ListPrinters=List of Printers
+SetupReceiptTemplate=Template Setup
+CONNECTOR_DUMMY=Dummy Printer
+CONNECTOR_NETWORK_PRINT=Network Printer
+CONNECTOR_FILE_PRINT=Local Printer
+CONNECTOR_WINDOWS_PRINT=Local Windows Printer
+CONNECTOR_CUPS_PRINT=Cups Printer
+CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
+CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
+CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
+CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
+PROFILE_DEFAULT=Default Profile
+PROFILE_SIMPLE=Simple Profile
+PROFILE_EPOSTEP=Epos Tep Profile
+PROFILE_P822D=P822D Profile
+PROFILE_STAR=Star Profile
+PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
+PROFILE_SIMPLE_HELP=Simple Profile No Graphics
+PROFILE_EPOSTEP_HELP=Epos Tep Profile
+PROFILE_P822D_HELP=P822D Profile No Graphics
+PROFILE_STAR_HELP=Star Profile
+DOL_LINE_FEED=Skip line
+DOL_ALIGN_LEFT=Left align text
+DOL_ALIGN_CENTER=Center text
+DOL_ALIGN_RIGHT=Right align text
+DOL_USE_FONT_A=Use font A of printer
+DOL_USE_FONT_B=Use font B of printer
+DOL_USE_FONT_C=Use font C of printer
+DOL_PRINT_BARCODE=Print barcode
+DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
+DOL_CUT_PAPER_FULL=Cut ticket completely
+DOL_CUT_PAPER_PARTIAL=Cut ticket partially
+DOL_OPEN_DRAWER=Open cash drawer
+DOL_ACTIVATE_BUZZER=Activate buzzer
+DOL_PRINT_QRCODE=Print QR Code
+DOL_PRINT_LOGO=Print logo of my company
+DOL_PRINT_LOGO_OLD=Print logo of my company (old printers)
+DOL_BOLD=Bold
+DOL_BOLD_DISABLED=Disable bold
+DOL_DOUBLE_HEIGHT=Double height size
+DOL_DOUBLE_WIDTH=Double width size
+DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
+DOL_UNDERLINE=Enable underline
+DOL_UNDERLINE_DISABLED=Disable underline
+DOL_BEEP=Beed sound
+DOL_PRINT_TEXT=Print text
+DOL_VALUE_DATE=Invoice date
+DOL_VALUE_DATE_TIME=Invoice date and time
+DOL_VALUE_YEAR=Invoice year
+DOL_VALUE_MONTH_LETTERS=Invoice month in letters
+DOL_VALUE_MONTH=Invoice month
+DOL_VALUE_DAY=Invoice day
+DOL_VALUE_DAY_LETTERS=Inovice day in letters
+DOL_LINE_FEED_REVERSE=Line feed reverse
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Invoice ref
+DOL_PRINT_OBJECT_LINES=Invoice lines
+DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
+DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
+DOL_VALUE_CUSTOMER_MAIL=Customer mail
+DOL_VALUE_CUSTOMER_PHONE=Customer phone
+DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
+DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
+DOL_VALUE_MYSOC_NAME=Your company name
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/zh_HK/receptions.lang b/htdocs/langs/zh_HK/receptions.lang
new file mode 100644
index 00000000000..010a7521846
--- /dev/null
+++ b/htdocs/langs/zh_HK/receptions.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - receptions
+ReceptionsSetup=Product Reception setup
+RefReception=Ref. reception
+Reception=Reception
+Receptions=Receptions
+AllReceptions=All Receptions
+Reception=Reception
+Receptions=Receptions
+ShowReception=Show Receptions
+ReceptionsArea=Receptions area
+ListOfReceptions=List of receptions
+ReceptionMethod=Reception method
+LastReceptions=Latest %s receptions
+StatisticsOfReceptions=Statistics for receptions
+NbOfReceptions=Number of receptions
+NumberOfReceptionsByMonth=Number of receptions by month
+ReceptionCard=Reception card
+NewReception=New reception
+CreateReception=Create reception
+QtyInOtherReceptions=Qty in other receptions
+OtherReceptionsForSameOrder=Other receptions for this order
+ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
+ReceptionsToValidate=Receptions to validate
+StatusReceptionCanceled=Canceled
+StatusReceptionDraft=Draft
+StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionProcessed=Processed
+StatusReceptionDraftShort=Draft
+StatusReceptionValidatedShort=Validated
+StatusReceptionProcessedShort=Processed
+ReceptionSheet=Reception sheet
+ConfirmDeleteReception=Are you sure you want to delete this reception?
+ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
+ConfirmCancelReception=Are you sure you want to cancel this reception?
+StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
+SendReceptionByEMail=Send reception by email
+SendReceptionRef=Submission of reception %s
+ActionsOnReception=Events on reception
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the order card.
+ReceptionLine=Reception line
+ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
+ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
+ReceptionsNumberingModules=Numbering module for receptions
+ReceptionsReceiptModel=Document templates for receptions
diff --git a/htdocs/langs/zh_HK/resource.lang b/htdocs/langs/zh_HK/resource.lang
new file mode 100644
index 00000000000..e8574dc680f
--- /dev/null
+++ b/htdocs/langs/zh_HK/resource.lang
@@ -0,0 +1,39 @@
+# Dolibarr language file - Source file is en_US - resource
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+ActionsOnResource=Events about this resource
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResource=Show resource
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+SelectResource=Select resource
+
+IdResource=Id resource
+AssetNumber=Serial number
+ResourceTypeCode=Resource type code
+ImportDataset_resource_1=Resources
+
+ErrorResourcesAlreadyInUse=Some resources are in use
+ErrorResourceUseInEvent=%s used in %s event
diff --git a/htdocs/langs/zh_HK/salaries.lang b/htdocs/langs/zh_HK/salaries.lang
new file mode 100644
index 00000000000..7c3c08a65bd
--- /dev/null
+++ b/htdocs/langs/zh_HK/salaries.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+Salary=Salary
+Salaries=Salaries
+NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
+SalaryPayment=Salary payment
+SalariesPayments=Salaries payments
+ShowSalaryPayment=Show salary payment
+THM=Average hourly rate
+TJM=Average daily rate
+CurrentSalary=Current salary
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/zh_HK/sendings.lang b/htdocs/langs/zh_HK/sendings.lang
new file mode 100644
index 00000000000..5ce3b7f67e9
--- /dev/null
+++ b/htdocs/langs/zh_HK/sendings.lang
@@ -0,0 +1,74 @@
+# Dolibarr language file - Source file is en_US - sendings
+RefSending=Ref. shipment
+Sending=Shipment
+Sendings=Shipments
+AllSendings=All Shipments
+Shipment=Shipment
+Shipments=Shipments
+ShowSending=Show Shipments
+Receivings=Delivery Receipts
+SendingsArea=Shipments area
+ListOfSendings=List of shipments
+SendingMethod=Shipping method
+LastSendings=Latest %s shipments
+StatisticsOfSendings=Statistics for shipments
+NbOfSendings=Number of shipments
+NumberOfShipmentsByMonth=Number of shipments by month
+SendingCard=Shipment card
+NewSending=New shipment
+CreateShipment=Create shipment
+QtyShipped=Qty shipped
+QtyShippedShort=Qty ship.
+QtyPreparedOrShipped=Qty prepared or shipped
+QtyToShip=Qty to ship
+QtyToReceive=Qty to receive
+QtyReceived=Qty received
+QtyInOtherShipments=Qty in other shipments
+KeepToShip=Remain to ship
+KeepToShipShort=Remain
+OtherSendingsForSameOrder=Other shipments for this order
+SendingsAndReceivingForSameOrder=Shipments and receipts for this order
+SendingsToValidate=Shipments to validate
+StatusSendingCanceled=Canceled
+StatusSendingDraft=Draft
+StatusSendingValidated=Validated (products to ship or already shipped)
+StatusSendingProcessed=Processed
+StatusSendingDraftShort=Draft
+StatusSendingValidatedShort=Validated
+StatusSendingProcessedShort=Processed
+SendingSheet=Shipment sheet
+ConfirmDeleteSending=Are you sure you want to delete this shipment?
+ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
+ConfirmCancelSending=Are you sure you want to cancel this shipment?
+DocumentModelMerou=Merou A5 model
+WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+DateDeliveryPlanned=Planned date of delivery
+RefDeliveryReceipt=Ref delivery receipt
+StatusReceipt=Status delivery receipt
+DateReceived=Date delivery received
+ClassifyReception=Classify reception
+SendShippingByEMail=Send shipment by email
+SendShippingRef=Submission of shipment %s
+ActionsOnShipping=Events on shipment
+LinkToTrackYourPackage=Link to track your package
+ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
+ShipmentLine=Shipment line
+ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
+ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
+ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
+NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+
+# Sending methods
+# ModelDocument
+DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty: %d)
diff --git a/htdocs/langs/zh_HK/sms.lang b/htdocs/langs/zh_HK/sms.lang
new file mode 100644
index 00000000000..055085eb16a
--- /dev/null
+++ b/htdocs/langs/zh_HK/sms.lang
@@ -0,0 +1,51 @@
+# Dolibarr language file - Source file is en_US - sms
+Sms=Sms
+SmsSetup=SMS setup
+SmsDesc=This page allows you to define global options on SMS features
+SmsCard=SMS Card
+AllSms=All SMS campaigns
+SmsTargets=Targets
+SmsRecipients=Targets
+SmsRecipient=Target
+SmsTitle=Description
+SmsFrom=Sender
+SmsTo=Target
+SmsTopic=Topic of SMS
+SmsText=Message
+SmsMessage=SMS Message
+ShowSms=Show SMS
+ListOfSms=List SMS campaigns
+NewSms=New SMS campaign
+EditSms=Edit SMS
+ResetSms=New sending
+DeleteSms=Delete SMS campaign
+DeleteASms=Remove a SMS campaign
+PreviewSms=Previuw SMS
+PrepareSms=Prepare SMS
+CreateSms=Create SMS
+SmsResult=Result of SMS sending
+TestSms=Test SMS
+ValidSms=Validate SMS
+ApproveSms=Approve SMS
+SmsStatusDraft=Draft
+SmsStatusValidated=Validated
+SmsStatusApproved=Approved
+SmsStatusSent=Sent
+SmsStatusSentPartialy=Sent partially
+SmsStatusSentCompletely=Sent completely
+SmsStatusError=Error
+SmsStatusNotSent=Not sent
+SmsSuccessfulySent=SMS correctly sent (from %s to %s)
+ErrorSmsRecipientIsEmpty=Number of target is empty
+WarningNoSmsAdded=No new phone number to add to target list
+ConfirmValidSms=Do you confirm validation of this campaign?
+NbOfUniqueSms=No. of unique phone numbers
+NbOfSms=No. of phone numbers
+ThisIsATestMessage=This is a test message
+SendSms=Send SMS
+SmsInfoCharRemain=No. of remaining characters
+SmsInfoNumero= (international format i.e.: +33899701761)
+DelayBeforeSending=Delay before sending (minutes)
+SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
+SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider.
+DisableStopIfSupported=Disable STOP message (if supported)
diff --git a/htdocs/langs/zh_HK/stocks.lang b/htdocs/langs/zh_HK/stocks.lang
new file mode 100644
index 00000000000..9856649b834
--- /dev/null
+++ b/htdocs/langs/zh_HK/stocks.lang
@@ -0,0 +1,220 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseCard=Warehouse card
+Warehouse=Warehouse
+Warehouses=Warehouses
+ParentWarehouse=Parent warehouse
+NewWarehouse=New warehouse / Stock Location
+WarehouseEdit=Modify warehouse
+MenuNewWarehouse=New warehouse
+WarehouseSource=Source warehouse
+WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
+AddOne=Add one
+DefaultWarehouse=Default warehouse
+WarehouseTarget=Target warehouse
+ValidateSending=Delete sending
+CancelSending=Cancel sending
+DeleteSending=Delete sending
+Stock=Stock
+Stocks=Stocks
+StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
+Movements=Movements
+ErrorWarehouseRefRequired=Warehouse reference name is required
+ListOfWarehouses=List of warehouses
+ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
+MovementId=Movement ID
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
+StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
+Location=Location
+LocationSummary=Short name location
+NumberOfDifferentProducts=Number of different products
+NumberOfProducts=Total number of products
+LastMovement=Latest movement
+LastMovements=Latest movements
+Units=Units
+Unit=Unit
+StockCorrection=Stock correction
+CorrectStock=Correct stock
+StockTransfer=Stock transfer
+TransferStock=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
+NumberOfUnit=Number of units
+UnitPurchaseValue=Unit purchase price
+StockTooLow=Stock too low
+StockLowerThanLimit=Stock lower than alert limit (%s)
+EnhancedValue=Value
+PMPValue=Weighted average price
+PMPValueShort=WAP
+EnhancedValueOfWarehouses=Warehouses value
+UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
+QtyDispatched=Quantity dispatched
+QtyDispatchedShort=Qty dispatched
+QtyToDispatchShort=Qty to dispatch
+OrderDispatch=Item receipts
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
+DeStockOnShipment=Decrease real stocks on shipping validation
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
+OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
+StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
+NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
+DispatchVerb=Dispatch
+StockLimitShort=Limit for alert
+StockLimit=Stock limit for alert
+StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+PhysicalStock=Physical Stock
+RealStock=Real Stock
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
+VirtualStock=Virtual stock
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+IdWarehouse=Id warehouse
+DescWareHouse=Description warehouse
+LieuWareHouse=Localisation warehouse
+WarehousesAndProducts=Warehouses and products
+WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
+AverageUnitPricePMPShort=Weighted average input price
+AverageUnitPricePMP=Weighted average input price
+SellPriceMin=Selling Unit Price
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
+EstimatedStockValueShort=Input stock value
+EstimatedStockValue=Input stock value
+DeleteAWarehouse=Delete a warehouse
+ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
+PersonalStock=Personal stock %s
+ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
+SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
+SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
+NoStockAction=No stock action
+DesiredStock=Desired Stock
+DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
+StockToBuy=To order
+Replenishment=Replenishment
+ReplenishmentOrders=Replenishment orders
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
+UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+UseVirtualStock=Use virtual stock
+UsePhysicalStock=Use physical stock
+CurentSelectionMode=Current selection mode
+CurentlyUsingVirtualStock=Virtual stock
+CurentlyUsingPhysicalStock=Physical stock
+RuleForStockReplenishment=Rule for stocks replenishment
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
+AlertOnly= Alerts only
+WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
+WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
+ForThisWarehouse=For this warehouse
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+Replenishments=Replenishments
+NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
+NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
+MassMovement=Mass movement
+SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+RecordMovement=Record transfer
+ReceivingForSameOrder=Receipts for this order
+StockMovementRecorded=Stock movements recorded
+RuleForStockAvailability=Rules on stock requirements
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
+MovementLabel=Label of movement
+TypeMovement=Type of movement
+DateMovement=Date of movement
+InventoryCode=Movement or inventory code
+IsInPackage=Contained into package
+WarehouseAllowNegativeTransfer=Stock can be negative
+qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
+ShowWarehouse=Show warehouse
+MovementCorrectStock=Stock correction for product %s
+MovementTransferStock=Stock transfer of product %s into another warehouse
+InventoryCodeShort=Inv./Mov. code
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
+ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
+OpenAll=Open for all actions
+OpenInternal=Open only for internal actions
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
+OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
+ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
+ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
+ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
+AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
+AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+InventoryDate=Inventory date
+NewInventory=New inventory
+inventorySetup = Inventory Setup
+inventoryCreatePermission=Create new inventory
+inventoryReadPermission=View inventories
+inventoryWritePermission=Update inventories
+inventoryValidatePermission=Validate inventory
+inventoryTitle=Inventory
+inventoryListTitle=Inventories
+inventoryListEmpty=No inventory in progress
+inventoryCreateDelete=Create/Delete inventory
+inventoryCreate=Create new
+inventoryEdit=Edit
+inventoryValidate=Validated
+inventoryDraft=Running
+inventorySelectWarehouse=Warehouse choice
+inventoryConfirmCreate=Create
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
+inventoryMvtStock=By inventory
+inventoryWarningProductAlreadyExists=This product is already into list
+SelectCategory=Category filter
+SelectFournisseur=Vendor filter
+inventoryOnDate=Inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
+inventoryChangePMPPermission=Allow to change PMP value for a product
+ColumnNewPMP=New unit PMP
+OnlyProdsInStock=Do not add product without stock
+TheoricalQty=Theorique qty
+TheoricalValue=Theorique qty
+LastPA=Last BP
+CurrentPA=Curent BP
+RecordedQty=Recorded Qty
+RealQty=Real Qty
+RealValue=Real Value
+RegulatedQty=Regulated Qty
+AddInventoryProduct=Add product to inventory
+AddProduct=Add
+ApplyPMP=Apply PMP
+FlushInventory=Flush inventory
+ConfirmFlushInventory=Do you confirm this action?
+InventoryFlushed=Inventory flushed
+ExitEditMode=Exit edition
+inventoryDeleteLine=Delete line
+RegulateStock=Regulate Stock
+ListInventory=List
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
+ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
+InventoryForASpecificWarehouse=Inventory for a specific warehouse
+InventoryForASpecificProduct=Inventory for a specific product
+StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
+ForceTo=Force to
diff --git a/htdocs/langs/zh_HK/stripe.lang b/htdocs/langs/zh_HK/stripe.lang
new file mode 100644
index 00000000000..844762040af
--- /dev/null
+++ b/htdocs/langs/zh_HK/stripe.lang
@@ -0,0 +1,72 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Stripe module setup
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
+StripeOrCBDoPayment=Pay with credit card or Stripe
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+Creditor=Creditor
+PaymentCode=Payment code
+StripeDoPayment=Pay with Stripe
+YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+Continue=Next
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment page for a sales order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment page for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.<br>For the URL of payments with no existing object, you may also add the parameter <strong>&noidempotency=1</strong> so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter)
+SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+NewStripePaymentReceived=New Stripe payment received
+NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
+STRIPE_TEST_SECRET_KEY=Secret test key
+STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
+STRIPE_LIVE_SECRET_KEY=Secret live key
+STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
+StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
+StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
+StripePayoutList=List of Stripe payouts
+ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
+ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
+PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
+ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
diff --git a/htdocs/langs/zh_HK/supplier_proposal.lang b/htdocs/langs/zh_HK/supplier_proposal.lang
new file mode 100644
index 00000000000..ce5bdf0425a
--- /dev/null
+++ b/htdocs/langs/zh_HK/supplier_proposal.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposalNew=New price request
+CommRequest=Price request
+CommRequests=Price requests
+SearchRequest=Find a request
+DraftRequests=Draft requests
+SupplierProposalsDraft=Draft vendor proposals
+LastModifiedRequests=Latest %s modified price requests
+RequestsOpened=Open price requests
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
+NewAskPrice=New price request
+ShowSupplierProposal=Show price request
+AddSupplierProposal=Create a price request
+SupplierProposalRefFourn=Vendor ref
+SupplierProposalDate=Delivery date
+SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
+ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
+DeleteAsk=Delete request
+ValidateAsk=Validate request
+SupplierProposalStatusDraft=Draft (needs to be validated)
+SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusClosed=Closed
+SupplierProposalStatusSigned=Accepted
+SupplierProposalStatusNotSigned=Refused
+SupplierProposalStatusDraftShort=Draft
+SupplierProposalStatusValidatedShort=Validated
+SupplierProposalStatusClosedShort=Closed
+SupplierProposalStatusSignedShort=Accepted
+SupplierProposalStatusNotSignedShort=Refused
+CopyAskFrom=Create a price request by copying an existing request
+CreateEmptyAsk=Create blank request
+ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
+ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
+SendAskByMail=Send price request by mail
+SendAskRef=Sending the price request %s
+SupplierProposalCard=Request card
+ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
+ActionsOnSupplierProposal=Events on price request
+DocModelAuroreDescription=A complete request model (logo...)
+CommercialAsk=Price request
+DefaultModelSupplierProposalCreate=Default model creation
+DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
+DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
+ListOfSupplierProposals=List of vendor proposal requests
+ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
+SupplierProposalsToClose=Vendor proposals to close
+SupplierProposalsToProcess=Vendor proposals to process
+LastSupplierProposals=Latest %s price requests
+AllPriceRequests=All requests
diff --git a/htdocs/langs/zh_HK/suppliers.lang b/htdocs/langs/zh_HK/suppliers.lang
new file mode 100644
index 00000000000..b69b11272b4
--- /dev/null
+++ b/htdocs/langs/zh_HK/suppliers.lang
@@ -0,0 +1,47 @@
+# Dolibarr language file - Source file is en_US - vendors
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
+History=History
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
+OrderDate=Order date
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
+SupplierPrices=Vendor prices
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
+Availability=Availability
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order details
+ApproveThisOrder=Approve this order
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
+DenyingThisOrder=Deny this order
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
+SupplierReputation=Vendor reputation
+DoNotOrderThisProductToThisSupplier=Do not order
+NotTheGoodQualitySupplier=Low quality
+ReputationForThisProduct=Reputation
+BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
+AllProductReferencesOfSupplier=All product / service references of vendor
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/zh_HK/ticket.lang b/htdocs/langs/zh_HK/ticket.lang
new file mode 100644
index 00000000000..80518c3401a
--- /dev/null
+++ b/htdocs/langs/zh_HK/ticket.lang
@@ -0,0 +1,305 @@
+# en_US lang file for module ticket
+# Copyright (C) 2013  Jean-François FERRY <hello@librethic.io>
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+Module56000Name=Tickets
+Module56000Desc=Ticket system for issue or request management
+
+Permission56001=See tickets
+Permission56002=Modify tickets
+Permission56003=Delete tickets
+Permission56004=Manage tickets
+Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+
+TicketDictType=Ticket - Types
+TicketDictCategory=Ticket - Groupes
+TicketDictSeverity=Ticket - Severities
+TicketDictResolution=Ticket - Resolution
+TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
+TicketTypeShortBUGHARD=Dysfonctionnement matériel
+TicketTypeShortCOM=Commercial question
+
+TicketTypeShortHELP=Request for functionnal help
+TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortPROJET=Project
+TicketTypeShortOTHER=Other
+
+TicketSeverityShortLOW=Low
+TicketSeverityShortNORMAL=Normal
+TicketSeverityShortHIGH=High
+TicketSeverityShortBLOCKING=Critical/Blocking
+
+ErrorBadEmailAddress=Field '%s' incorrect
+MenuTicketMyAssign=My tickets
+MenuTicketMyAssignNonClosed=My open tickets
+MenuListNonClosed=Open tickets
+
+TypeContact_ticket_internal_CONTRIBUTOR=Contributor
+TypeContact_ticket_internal_SUPPORTTEC=Assigned user
+TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
+TypeContact_ticket_external_CONTRIBUTOR=External contributor
+
+OriginEmail=Email source
+Notify_TICKET_SENTBYMAIL=Send ticket message by email
+
+# Status
+NotRead=Not read
+Read=Read
+Assigned=Assigned
+InProgress=In progress
+NeedMoreInformation=Waiting for information
+Answered=Answered
+Waiting=Waiting
+Closed=Closed
+Deleted=Deleted
+
+# Dict
+Type=Type
+Category=Analytic code
+Severity=Severity
+
+# Email templates
+MailToSendTicketMessage=To send email from ticket message
+
+#
+# Admin page
+#
+TicketSetup=Ticket module setup
+TicketSettings=Settings
+TicketSetupPage=
+TicketPublicAccess=A public interface requiring no identification is available at the following url
+TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
+TicketParamModule=Module variable setup
+TicketParamMail=Email setup
+TicketEmailNotificationFrom=Notification email from
+TicketEmailNotificationFromHelp=Used into ticket message answer by example
+TicketEmailNotificationTo=Notifications email to
+TicketEmailNotificationToHelp=Send email notifications to this address.
+TicketNewEmailBodyLabel=Text message sent after creating a ticket
+TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
+TicketParamPublicInterface=Public interface setup
+TicketsEmailMustExist=Require an existing email address to create a ticket
+TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket.
+PublicInterface=Public interface
+TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
+TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
+TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
+TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
+TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
+TicketPublicInterfaceTopicLabelAdmin=Interface title
+TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
+TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
+ExtraFieldsTicket=Extra attributes
+TicketCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
+TicketsDisableEmail=Do not send emails for ticket creation or message recording
+TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
+TicketsLogEnableEmail=Enable log by email
+TicketsLogEnableEmailHelp=At each change, an email will be sent **to each contact** associated with the ticket.
+TicketParams=Params
+TicketsShowModuleLogo=Display the logo of the module in the public interface
+TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
+TicketsShowCompanyLogo=Display the logo of the company in the public interface
+TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
+TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
+TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
+TicketsActivatePublicInterface=Activate public interface
+TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create tickets.
+TicketsAutoAssignTicket=Automatically assign the user who created the ticket
+TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
+TicketNumberingModules=Tickets numbering module
+TicketNotifyTiersAtCreation=Notify third party at creation
+TicketGroup=Group
+TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
+#
+# Index & list page
+#
+TicketsIndex=Tickets area
+TicketList=List of tickets
+TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
+NoTicketsFound=No ticket found
+NoUnreadTicketsFound=No unread ticket found
+TicketViewAllTickets=View all tickets
+TicketViewNonClosedOnly=View only open tickets
+TicketStatByStatus=Tickets by status
+OrderByDateAsc=Sort by ascending date
+OrderByDateDesc=Sort by descending date
+ShowAsConversation=Show as conversation list
+MessageListViewType=Show as table list
+
+#
+# Ticket card
+#
+Ticket=Ticket
+TicketCard=Ticket card
+CreateTicket=Create ticket
+EditTicket=Edit ticket
+TicketsManagement=Tickets Management
+CreatedBy=Created by
+NewTicket=New Ticket
+SubjectAnswerToTicket=Ticket answer
+TicketTypeRequest=Request type
+TicketCategory=Analytic code
+SeeTicket=See ticket
+TicketMarkedAsRead=Ticket has been marked as read
+TicketReadOn=Read on
+TicketCloseOn=Closing date
+MarkAsRead=Mark ticket as read
+TicketHistory=Ticket history
+AssignUser=Assign to user
+TicketAssigned=Ticket is now assigned
+TicketChangeType=Change type
+TicketChangeCategory=Change analytic code
+TicketChangeSeverity=Change severity
+TicketAddMessage=Add a message
+AddMessage=Add a message
+MessageSuccessfullyAdded=Ticket added
+TicketMessageSuccessfullyAdded=Message successfully added
+TicketMessagesList=Message list
+NoMsgForThisTicket=No message for this ticket
+Properties=Classification
+LatestNewTickets=Latest %s newest tickets (not read)
+TicketSeverity=Severity
+ShowTicket=See ticket
+RelatedTickets=Related tickets
+TicketAddIntervention=Create intervention
+CloseTicket=Close ticket
+CloseATicket=Close a ticket
+ConfirmCloseAticket=Confirm ticket closing
+ConfirmDeleteTicket=Please confirm ticket deleting
+TicketDeletedSuccess=Ticket deleted with success
+TicketMarkedAsClosed=Ticket marked as closed
+TicketDurationAuto=Calculated duration
+TicketDurationAutoInfos=Duration calculated automatically from intervention related
+TicketUpdated=Ticket updated
+SendMessageByEmail=Send message by email
+TicketNewMessage=New message
+ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
+TicketGoIntoContactTab=Please go into "Contacts" tab to select them
+TicketMessageMailIntro=Introduction
+TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
+TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
+TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
+TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
+TicketMessageMailSignature=Signature
+TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
+TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
+TicketMessageMailSignatureLabelAdmin=Signature of response email
+TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
+TicketMessageHelp=Only this text will be saved in the message list on ticket card.
+TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
+TimeElapsedSince=Time elapsed since
+TicketTimeToRead=Time elapsed before read
+TicketContacts=Contacts ticket
+TicketDocumentsLinked=Documents linked to ticket
+ConfirmReOpenTicket=Confirm reopen this ticket ?
+TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
+TicketAssignedToYou=Ticket assigned
+TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
+MarkMessageAsPrivate=Mark message as private
+TicketMessagePrivateHelp=This message will not display to external users
+TicketEmailOriginIssuer=Issuer at origin of the tickets
+InitialMessage=Initial Message
+LinkToAContract=Link to a contract
+TicketPleaseSelectAContract=Select a contract
+UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
+TicketMailExchanges=Mail exchanges
+TicketInitialMessageModified=Initial message modified
+TicketMessageSuccesfullyUpdated=Message successfully updated
+TicketChangeStatus=Change status
+TicketConfirmChangeStatus=Confirm the status change: %s ?
+TicketLogStatusChanged=Status changed: %s to %s
+TicketNotNotifyTiersAtCreate=Not notify company at create
+Unread=Unread
+TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
+PublicInterfaceNotEnabled=Public interface was not enabled
+ErrorTicketRefRequired=Ticket reference name is required
+
+#
+# Logs
+#
+TicketLogMesgReadBy=Ticket %s read by %s
+NoLogForThisTicket=No log for this ticket yet
+TicketLogAssignedTo=Ticket %s assigned to %s
+TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
+TicketLogClosedBy=Ticket %s closed by %s
+TicketLogReopen=Ticket %s re-open
+
+#
+# Public pages
+#
+TicketSystem=Ticket system
+ShowListTicketWithTrackId=Display ticket list from track ID
+ShowTicketWithTrackId=Display ticket from track ID
+TicketPublicDesc=You can create a support ticket or check from an existing ID.
+YourTicketSuccessfullySaved=Ticket has been successfully saved!
+MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
+PleaseRememberThisId=Please keep the tracking number that we might ask you later.
+TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
+TicketNewEmailSubjectCustomer=New support ticket
+TicketNewEmailBody=This is an automatic email to confirm you have registered a new ticket.
+TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
+TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
+TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
+TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
+TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
+TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
+TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
+TicketPublicMsgViewLogIn=Please enter ticket tracking ID
+TicketTrackId=Public Tracking ID
+OneOfTicketTrackId=One of your tracking ID
+ErrorTicketNotFound=Ticket with tracking ID %s not found!
+Subject=Subject
+ViewTicket=View ticket
+ViewMyTicketList=View my ticket list
+ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
+TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
+TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
+SeeThisTicketIntomanagementInterface=See ticket in management interface
+TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
+ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
+OldUser=Old user
+NewUser=New user
+NumberOfTicketsByMonth=Number of tickets per month
+NbOfTickets=Number of tickets
+# notifications
+TicketNotificationEmailSubject=Ticket %s updated
+TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
+TicketNotificationRecipient=Notification recipient
+TicketNotificationLogMessage=Log message
+TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
+TicketNotificationNumberEmailSent=Notification email sent: %s
+
+ActionsOnTicket=Events on ticket
+
+#
+# Boxes
+#
+BoxLastTicket=Latest created tickets
+BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicketContent=
+BoxLastTicketNoRecordedTickets=No recent unread tickets
+BoxLastModifiedTicket=Latest modified tickets
+BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastModifiedTicketContent=
+BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
diff --git a/htdocs/langs/zh_HK/trips.lang b/htdocs/langs/zh_HK/trips.lang
new file mode 100644
index 00000000000..654f14d6bf7
--- /dev/null
+++ b/htdocs/langs/zh_HK/trips.lang
@@ -0,0 +1,151 @@
+# Dolibarr language file - Source file is en_US - trips
+ShowExpenseReport=Show expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense reports
+ListOfFees=List of fees
+TypeFees=Types of fees
+ShowTrip=Show expense report
+NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
+CompanyVisited=Company/organization visited
+FeesKilometersOrAmout=Amount or kilometers
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportApproved=An expense report was approved
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
+ExpenseReportRefused=An expense report was refused
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
+ExpenseReportCanceled=An expense report was canceled
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
+ExpenseReportPaid=An expense report was paid
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripNDF=Informations expense report
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Other
+TF_TRIP=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hotel
+TF_TAXI=Taxi
+EX_KME=Mileage costs
+EX_FUE=Fuel CV
+EX_HOT=Hotel
+EX_PAR=Parking CV
+EX_TOL=Toll CV
+EX_TAX=Various Taxes
+EX_IND=Indemnity transportation subscription
+EX_SUM=Maintenance supply
+EX_SUO=Office supplies
+EX_CAR=Car rental
+EX_DOC=Documentation
+EX_CUR=Customers receiving
+EX_OTR=Other receiving
+EX_POS=Postage
+EX_CAM=CV maintenance and repair
+EX_EMM=Employees meal
+EX_GUM=Guests meal
+EX_BRE=Breakfast
+EX_FUE_VP=Fuel PV
+EX_TOL_VP=Toll PV
+EX_PAR_VP=Parking PV
+EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
+UploadANewFileNow=Upload a new document now
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+AucuneLigne=There is no expense report declared yet
+ModePaiement=Payment mode
+VALIDATOR=User responsible for approval
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paid by
+REFUSEUR=Denied by
+CANCEL_USER=Deleted by
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+BROUILLONNER=Reopen
+ExpenseReportRef=Ref. expense report
+ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+ConfirmRefuseTrip=Are you sure you want to deny this expense report?
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report?
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
+ConfirmCancelTrip=Are you sure you want to cancel this expense report?
+BrouillonnerTrip=Move back expense report to status "Draft"
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report?
+NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
+ExpenseReportsToApprove=Expense reports to approve
+ExpenseReportsToPay=Expense reports to pay
+ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
+ExpenseReportsIk=Expense report milles index
+ExpenseReportsRules=Expense report rules
+ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
+ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report
+expenseReportOffset=Offset
+expenseReportCoef=Coefficient
+expenseReportTotalForFive=Example with <u>d</u> = 5
+expenseReportRangeFromTo=from %d to %d
+expenseReportRangeMoreThan=more than %d
+expenseReportCoefUndefined=(value not defined)
+expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
+expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
+expenseReportPrintExample=offset + (d x coef) = %s
+ExpenseReportApplyTo=Apply to
+ExpenseReportDomain=Domain to apply
+ExpenseReportLimitOn=Limit on
+ExpenseReportDateStart=Date start
+ExpenseReportDateEnd=Date end
+ExpenseReportLimitAmount=Limite amount
+ExpenseReportRestrictive=Restrictive
+AllExpenseReport=All type of expense report
+OnExpense=Expense line
+ExpenseReportRuleSave=Expense report rule saved
+ExpenseReportRuleErrorOnSave=Error: %s
+RangeNum=Range %d
+ExpenseReportConstraintViolationError=Constraint violation id [%s]: %s  is superior to %s %s
+byEX_DAY=by day (limitation to %s)
+byEX_MON=by month (limitation to %s)
+byEX_YEA=by year (limitation to %s)
+byEX_EXP=by line (limitation to %s)
+ExpenseReportConstraintViolationWarning=Constraint violation id [%s]: %s  is superior to %s %s
+nolimitbyEX_DAY=by day (no limitation)
+nolimitbyEX_MON=by month (no limitation)
+nolimitbyEX_YEA=by year (no limitation)
+nolimitbyEX_EXP=by line (no limitation)
+CarCategory=Category of car
+ExpenseRangeOffset=Offset amount: %s
+RangeIk=Mileage range
+AttachTheNewLineToTheDocument=Attach the line to an uploaded document
diff --git a/htdocs/langs/zh_HK/users.lang b/htdocs/langs/zh_HK/users.lang
new file mode 100644
index 00000000000..41a5ebd0981
--- /dev/null
+++ b/htdocs/langs/zh_HK/users.lang
@@ -0,0 +1,118 @@
+# Dolibarr language file - Source file is en_US - users
+HRMArea=HRM area
+UserCard=User card
+GroupCard=Group card
+Permission=Permission
+Permissions=Permissions
+EditPassword=Edit password
+SendNewPassword=Regenerate and send password
+SendNewPasswordLink=Send link to reset password
+ReinitPassword=Regenerate password
+PasswordChangedTo=Password changed to: %s
+SubjectNewPassword=Your new password for %s
+GroupRights=Group permissions
+UserRights=User permissions
+UserGUISetup=User Display Setup
+DisableUser=Disable
+DisableAUser=Disable a user
+DeleteUser=Delete
+DeleteAUser=Delete a user
+EnableAUser=Enable a user
+DeleteGroup=Delete
+DeleteAGroup=Delete a group
+ConfirmDisableUser=Are you sure you want to disable user <b>%s</b>?
+ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b>?
+ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b>?
+ConfirmEnableUser=Are you sure you want to enable user <b>%s</b>?
+ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b>?
+ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
+NewUser=New user
+CreateUser=Create user
+LoginNotDefined=Login is not defined.
+NameNotDefined=Name is not defined.
+ListOfUsers=List of users
+SuperAdministrator=Super Administrator
+SuperAdministratorDesc=Global administrator
+AdministratorDesc=Administrator
+DefaultRights=Default Permissions
+DefaultRightsDesc=Define here the <u>default</u> permissions that are automatically granted to a <u>new</u> user (to modify permissions for existing users, go to the user card).
+DolibarrUsers=Dolibarr users
+LastName=Last name
+FirstName=First name
+ListOfGroups=List of groups
+NewGroup=New group
+CreateGroup=Create group
+RemoveFromGroup=Remove from group
+PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
+PasswordChangeRequest=Request to change password for <b>%s</b>
+PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+ConfirmPasswordReset=Confirm password reset
+MenuUsersAndGroups=Users & Groups
+LastGroupsCreated=Latest %s groups created
+LastUsersCreated=Latest %s users created
+ShowGroup=Show group
+ShowUser=Show user
+NonAffectedUsers=Non assigned users
+UserModified=User modified successfully
+PhotoFile=Photo file
+ListOfUsersInGroup=List of users in this group
+ListOfGroupsForUser=List of groups for this user
+LinkToCompanyContact=Link to third party / contact
+LinkedToDolibarrMember=Link to member
+LinkedToDolibarrUser=Link to Dolibarr user
+LinkedToDolibarrThirdParty=Link to Dolibarr third party
+CreateDolibarrLogin=Create a user
+CreateDolibarrThirdParty=Create a third party
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
+UsePersonalValue=Use personal value
+InternalUser=Internal user
+ExportDataset_user_1=Users and their properties
+DomainUser=Domain user %s
+Reactivate=Reactivate
+CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
+Inherited=Inherited
+UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
+UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
+IdPhoneCaller=Id phone caller
+NewUserCreated=User %s created
+NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
+EventUserModified=User %s modified
+UserDisabled=User %s disabled
+UserEnabled=User %s activated
+UserDeleted=User %s removed
+NewGroupCreated=Group %s created
+GroupModified=Group %s modified
+GroupDeleted=Group %s removed
+ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact?
+ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member?
+ConfirmCreateThirdParty=Are you sure you want to create a third party for this member?
+LoginToCreate=Login to create
+NameToCreate=Name of third party to create
+YourRole=Your roles
+YourQuotaOfUsersIsReached=Your quota of active users is reached !
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
+DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
+HierarchicalResponsible=Supervisor
+HierarchicView=Hierarchical view
+UseTypeFieldToChange=Use field Type to change
+OpenIDURL=OpenID URL
+LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Hours worked (per week)
+ExpectedWorkedHours=Expected worked hours per week
+ColorUser=Color of the user
+DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accounting code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Employment Start Date
+DateEmploymentEnd=Employment End Date
+CantDisableYourself=You can't disable your own user record
+ForceUserExpenseValidator=Force expense report validator
+ForceUserHolidayValidator=Force leave request validator
+ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/zh_HK/website.lang b/htdocs/langs/zh_HK/website.lang
new file mode 100644
index 00000000000..bce2a09fb03
--- /dev/null
+++ b/htdocs/langs/zh_HK/website.lang
@@ -0,0 +1,130 @@
+# Dolibarr language file - Source file is en_US - website
+Shortname=Code
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
+DeleteWebsite=Delete website
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
+WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
+WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
+WEBSITE_CSS_URL=URL of external CSS file
+WEBSITE_CSS_INLINE=CSS file content (common to all pages)
+WEBSITE_JS_INLINE=Javascript file content (common to all pages)
+WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
+WEBSITE_ROBOT=Robot file (robots.txt)
+WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
+HtmlHeaderPage=HTML header (specific to this page only)
+PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
+EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
+MediaFiles=Media library
+EditCss=Edit website properties
+EditMenu=Edit menu
+EditMedias=Edit medias
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
+AddWebsite=Add website
+Webpage=Web page/container
+AddPage=Add page/container
+HomePage=Home Page
+PageContainer=Page/container
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
+PageContent=Page/Contenair
+PageDeleted=Page/Contenair '%s' of website %s deleted
+PageAdded=Page/Contenair '%s' added
+ViewSiteInNewTab=View site in new tab
+ViewPageInNewTab=View page in new tab
+SetAsHomePage=Set as Home page
+RealURL=Real URL
+ViewWebsiteInProduction=View web site using home URLs
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+TestDeployOnWeb=Test/deploy on web
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
+NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
+SyntaxHelp=Help on specific syntax tips
+YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br><br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+ClonePage=Clone page/container
+CloneSite=Clone site
+SiteAdded=Website added
+ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
+PageIsANewTranslation=The new page is a translation of the current page ?
+LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
+ParentPageId=Parent page ID
+WebsiteId=Website ID
+CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
+FetchAndCreate=Fetch and Create
+ExportSite=Export website
+ImportSite=Import website template
+IDOfPage=Id of page
+Banner=Banner
+BlogPost=Blog post
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
+AddWebsiteAccount=Create web site account
+BackToListForThirdParty=Back to list for the third-party
+DisableSiteFirst=Disable website first
+MyContainerTitle=My web site title
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is a translation of
+ThisPageHasTranslationPages=This page/container has translation
+NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
+GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Search or Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
+MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
+EditInLineOnOff=Mode 'Edit inline' is %s
+ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
+GlobalCSSorJS=Global CSS/JS/Header file of web site
+BackToHomePage=Back to home page...
+TranslationLinks=Translation links
+YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not a website page
+UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
+MainLanguage=Main language
+OtherLanguages=Other languages
+UseManifest=Provide a manifest.json file
+PublicAuthorAlias=Public author alias
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
+ReplacementDoneInXPages=Replacement done in %s pages or containers
diff --git a/htdocs/langs/zh_HK/withdrawals.lang b/htdocs/langs/zh_HK/withdrawals.lang
new file mode 100644
index 00000000000..b1d6e30e329
--- /dev/null
+++ b/htdocs/langs/zh_HK/withdrawals.lang
@@ -0,0 +1,119 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
+NewStandingOrder=New direct debit order
+StandingOrderToProcess=To process
+WithdrawalsReceipts=Direct debit orders
+WithdrawalReceipt=Direct debit order
+LastWithdrawalReceipts=Latest %s direct debit files
+WithdrawalsLines=Direct debit order lines
+RequestStandingOrderToTreat=Request for direct debit payment order to process
+RequestStandingOrderTreated=Request for direct debit payment order processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
+AmountToWithdraw=Amount to withdraw
+WithdrawsRefused=Direct debit refused
+NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
+ResponsibleUser=User Responsible
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
+MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
+ClassCredited=Classify credited
+ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
+TransData=Transmission date
+TransMetod=Transmission method
+Send=Send
+Lines=Lines
+StandingOrderReject=Issue a rejection
+WithdrawalRefused=Withdrawal refused
+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=Invoice refused (Charge the rejection to customer)
+StatusDebitCredit=Status debit/credit
+StatusWaiting=Waiting
+StatusTrans=Sent
+StatusCredited=Credited
+StatusRefused=Refused
+StatusMotif0=Unspecified
+StatusMotif1=Insufficient funds
+StatusMotif2=Request contested
+StatusMotif3=No direct debit payment order
+StatusMotif4=Sales Order
+StatusMotif5=RIB unusable
+StatusMotif6=Account without balance
+StatusMotif7=Judicial Decision
+StatusMotif8=Other reason
+CreateForSepaFRST=Create direct debit file (SEPA FRST)
+CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
+CreateAll=Create direct debit file (all)
+CreateGuichet=Only office
+CreateBanque=Only bank
+OrderWaiting=Waiting for treatment
+NotifyTransmision=Withdrawal Transmission
+NotifyCredit=Withdrawal Credit
+NumeroNationalEmetter=National Transmitter Number
+WithBankUsingRIB=For bank accounts using RIB
+WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
+BankToReceiveWithdraw=Receiving Bank Account
+CreditDate=Credit on
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+WithdrawalFile=Withdrawal file
+SetToStatusSent=Set to status "File Sent"
+ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
+StatisticsByLineStatus=Statistics by status of lines
+RUM=UMR
+DateRUM=Mandate signature date
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
+WithdrawMode=Direct debit mode (FRST or RECUR)
+WithdrawRequestAmount=Amount of Direct debit request:
+WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
+SepaMandate=SEPA Direct Debit Mandate
+SepaMandateShort=SEPA Mandate
+PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
+SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+CreditorIdentifier=Creditor Identifier
+CreditorName=Creditor Name
+SEPAFillForm=(B) Please complete all the fields marked *
+SEPAFormYourName=Your name
+SEPAFormYourBAN=Your Bank Account Name (IBAN)
+SEPAFormYourBIC=Your Bank Identifier Code (BIC)
+SEPAFrstOrRecur=Type of payment
+ModeRECUR=Recurring payment
+ModeFRST=One-off payment
+PleaseCheckOne=Please check one only
+DirectDebitOrderCreated=Direct debit order %s created
+AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
+
+### Notifications
+InfoCreditSubject=Payment of direct debit payment order %s by the bank
+InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
+InfoTransSubject=Transmission of direct debit payment order %s to bank
+InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
+InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
+InfoRejectSubject=Direct debit payment order refused
+InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/zh_HK/workflow.lang b/htdocs/langs/zh_HK/workflow.lang
new file mode 100644
index 00000000000..be126eef0f4
--- /dev/null
+++ b/htdocs/langs/zh_HK/workflow.lang
@@ -0,0 +1,20 @@
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=Workflow module setup
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+# Autocreate
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
+# Autoclassify customer proposal or order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+AutomaticCreation=Automatic creation
+AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/zh_HK/zapier.lang b/htdocs/langs/zh_HK/zapier.lang
new file mode 100644
index 00000000000..6d6eda71313
--- /dev/null
+++ b/htdocs/langs/zh_HK/zapier.lang
@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Setup of Zapier for Dolibarr

From ef17ed2f8799698fd8e1efc1333e513f0ded7c6d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 24 May 2020 00:01:52 +0200
Subject: [PATCH 430/490] Look and feel v12

---
 htdocs/admin/translation.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index c17c2bdcee6..e509f96c001 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -244,7 +244,6 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-print '<input type="hidden" name="page" value="'.$page.'">';
 
 $head = translation_prepare_head();
 
@@ -252,7 +251,7 @@ dol_fiche_head($head, $mode, '', -1, '');
 
 if ($mode == 'overwrite')
 {
-    //print load_fiche_titre($langs->trans("TranslationOverwriteKey"), '', '')."\n";
+	print '<input type="hidden" name="page" value="'.$page.'">';
 
 	$disabled = '';
 	if ($action == 'edit' || empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION)) $disabled = ' disabled="disabled"';
@@ -456,8 +455,8 @@ if ($mode == 'searchkey')
 
     //print 'param='.$param.' $_SERVER["PHP_SELF"]='.$_SERVER["PHP_SELF"].' num='.$num.' page='.$page.' nbtotalofrecords='.$nbtotalofrecords." sortfield=".$sortfield." sortorder=".$sortorder;
     $title = $langs->trans("TranslationKeySearch");
-    if ($nbtotalofrecords > 0) $title .= ' ('.$nbtotalofrecords.' / '.$nbtotalofrecordswithoutfilters.' - '.$nbtotaloffiles.' '.$langs->trans("Files").')';
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, '', '', $limit);
+    if ($nbtotalofrecords > 0) $title .= ' <span class="opacitymedium colorblack paddingleft">('.$nbtotalofrecords.' / '.$nbtotalofrecordswithoutfilters.' - '.$nbtotaloffiles.' '.$langs->trans("Files").')</span>';
+    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
     print '<input type="hidden" id="action" name="action" value="search">';
     print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';

From 4cb0ffeb1f500e51de5beb5e0cf23644ec762472 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 24 May 2020 01:04:56 +0200
Subject: [PATCH 431/490] Fix css

---
 htdocs/theme/eldy/global.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index fc365ae5812..f907e057be5 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3319,7 +3319,7 @@ td.evenodd, tr.nohoverpair td, #trlinefordates td {
 .trforbreak td {
 	font-weight: 500;
     border-bottom: 1pt solid black !important;
-	background-color: var(--colorbacklinebreak) !important; !important;
+	background-color: var(--colorbacklinebreak) !important;
 }
 .trforbreak.nobold td a, .trforbreak.nobold span.secondary {
     font-weight: normal !important;

From 509ce9f571705a87c1355ea40b44e75210aab587 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 24 May 2020 01:09:45 +0200
Subject: [PATCH 432/490] CSS

---
 htdocs/theme/eldy/theme_vars.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index d2a11725ecf..f7ae5b3c320 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -65,7 +65,7 @@ $colorbacklinepair1 = '251,251,251'; // line pair
 $colorbacklinepair2 = '251,251,251'; // line pair
 $colorbacklinepairhover = '230,237,244'; // line hover
 $colorbacklinepairchecked = '230,237,244'; // line checked
-$colorbacklinebreak = '253,251,250'; // line break
+$colorbacklinebreak = '248,247,244'; // line break
 $colorbackbody = '255,255,255';
 $colortexttitlenotab = '0,113,120'; // 150,90,121 140,80,10 or 10,140,80  #875a7b  green=0,113,120, violet: 0,50,120
 $colortexttitle = '0,0,0';

From e2f0f0d71d46dff6e4f971cfd8c08f3944966290 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 24 May 2020 12:11:39 +0200
Subject: [PATCH 433/490] Add exclude id

---
 scripts/website/migrate-news-joomla2dolibarr.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/website/migrate-news-joomla2dolibarr.php b/scripts/website/migrate-news-joomla2dolibarr.php
index 1575976a318..30c166aa594 100755
--- a/scripts/website/migrate-news-joomla2dolibarr.php
+++ b/scripts/website/migrate-news-joomla2dolibarr.php
@@ -43,6 +43,7 @@ $joomlaserverinfo = empty($argv[3]) ? '' : $argv[3];
 $image = 'image/__WEBSITE_KEY__/images/stories/dolibarr.png';
 
 $max = (!isset($argv[4]) || (empty($argv[4]) && $argv[4] !== '0')) ? '10' : $argv[4];
+$excludeid = (empty($argv[5]) ? '' : $argv[5]);
 
 if (empty($argv[3]) || !in_array($argv[1], array('test', 'confirm')) || empty($websiteref)) {
 	print '***** '.$script_file.' *****'."\n";
@@ -87,6 +88,7 @@ if ($dbjoomla->error)
 $sql = 'SELECT c.id, c.title, c.alias, c.created, c.introtext, `fulltext`, c.metadesc, c.metakey, c.language, c.created, c.publish_up, u.username FROM '.$joomlaprefix.'_content as c';
 $sql .= ' LEFT JOIN '.$joomlaprefix.'_users as u ON u.id = c.created_by';
 $sql .= ' WHERE featured = 1';
+$sql .= ' AND c.id NOT IN ('.$excludeid.')';
 $sql .= ' ORDER BY publish_up ASC';
 $resql = $dbjoomla->query($sql);
 

From 65708ec360b112d702423105730cf5c5f9b92d8a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 24 May 2020 15:07:57 +0200
Subject: [PATCH 434/490] Fix responsive

---
 htdocs/core/boxes/box_shipments.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/boxes/box_shipments.php b/htdocs/core/boxes/box_shipments.php
index 278ad974cf5..8908f52640c 100644
--- a/htdocs/core/boxes/box_shipments.php
+++ b/htdocs/core/boxes/box_shipments.php
@@ -133,7 +133,7 @@ class box_shipments extends ModeleBoxes
                     $societestatic->logo = $objp->logo;
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => '',
+                        'td' => 'class="nowraponall"',
                         'text' => $shipmentstatic->getNomUrl(1),
                         'asis' => 1,
                     );
@@ -145,7 +145,7 @@ class box_shipments extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => '',
+                        'td' => 'class="nowraponall"',
                         'text' => $orderstatic->getNomUrl(1),
                         'asis' => 1,
                     );

From 26ee0d194952f04f0f544ea395fb75c773eb2bf3 Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sun, 24 May 2020 16:29:42 +0200
Subject: [PATCH 435/490] genimg improvements

---
 htdocs/takepos/genimg/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/takepos/genimg/index.php b/htdocs/takepos/genimg/index.php
index fbb388b9aec..2700bad3a17 100644
--- a/htdocs/takepos/genimg/index.php
+++ b/htdocs/takepos/genimg/index.php
@@ -60,7 +60,7 @@ if ($query == "cat")
 		{
 			$filename = $obj['photo'];
 		}
-		$file = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$filename);
+		$file = DOL_URL_ROOT.'/viewimage.php?cache=1&publictakepos=1&modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$filename);
 		header('Location: '.$file);
 		exit;
 	}

From 221e8d8ce1810e440a85998a30e935dbf75e92b7 Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sun, 24 May 2020 16:30:42 +0200
Subject: [PATCH 436/490] invoice.php improvements

---
 htdocs/takepos/invoice.php | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 3b486b7a3bc..859859fbc93 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -865,6 +865,9 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT)
 		print $langs->trans('Place')." <b>".$label."</b> - ";
 		print $langs->trans('Floor')." <b>".$floor."</b> - ";
 	}
+	elseif (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) print $mysoc->name;
+	elseif ($mobilepage == "cats") print $langs->trans('Category');
+	elseif ($mobilepage == "products") print $langs->trans('Label');
 }
 // In phone version only show when is invoice page
 if ($mobilepage == "invoice" || $mobilepage == "") {
@@ -879,7 +882,7 @@ if ($_SESSION["basiclayout"] != 1)
 	print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
 	print '<td class="linecolht right nowraponall">'.$langs->trans('TotalTTCShort').'</td>';
 }
-else print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
+elseif ($mobilepage == "invoice") print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
 print "</tr>\n";
 
 
@@ -892,11 +895,14 @@ if ($_SESSION["basiclayout"] == 1)
         $categories = $categorie->get_full_arbo('product');
 		$htmlforlines = '';
         foreach ($categories as $row) {
-			$htmlforlines .= '<div class="leftcat';
+			if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) $htmlforlines .= '<div class="leftcat';
+			else $htmlforlines .= '<tr class="drag drop oddeven posinvoiceline';
 			$htmlforlines .= '" onclick="LoadProducts('.$row['id'].');">';
-			$htmlforlines .= '<img class="imgwrapper" width="33%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=cat&query=cat&id='.$row['id'].'"><br>';
+			if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) $htmlforlines .= '<img class="imgwrapper" width="33%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=cat&query=cat&id='.$row['id'].'"><br>';
+			else $htmlforlines .= '<td class="left">';
 			$htmlforlines .= $row['label'];
-			$htmlforlines .= '</div>'."\n";
+			if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) $htmlforlines .= '</div>'."\n";
+			else $htmlforlines .= '</td></tr>'."\n";
 		}
 		$htmlforlines .= '</table>';
 		$htmlforlines .= '</table>';
@@ -912,11 +918,20 @@ if ($_SESSION["basiclayout"] == 1)
 		$prods = $object->getObjectsInCateg("product");
 		$htmlforlines = '';
 		foreach ($prods as $row) {
-			$htmlforlines .= '<div class="leftcat';
+			if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) $htmlforlines .= '<div class="leftcat';
+			else $htmlforlines .= '<tr class="drag drop oddeven posinvoiceline';
 			$htmlforlines .= '" onclick="AddProduct(\''.$place.'\', '.$row->id.')">';
-			$htmlforlines .= '<img class="imgwrapper" width="33%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=pro&query=pro&id='.$row->id.'"><br>';
-			$htmlforlines .= $row->label.''.price($row->price_ttc, 1, $langs, 1, -1, -1, $conf->currency);
-			$htmlforlines .= '</div>'."\n";
+			if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+				$htmlforlines .= '<img class="imgwrapper" width="33%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=pro&query=pro&id='.$row->id.'"><br>';
+				$htmlforlines .= $row->label.''.price($row->price_ttc, 1, $langs, 1, -1, -1, $conf->currency);
+				$htmlforlines .= '</div>'."\n";
+			}
+			else {
+				$htmlforlines .= '<td class="left">';
+				$htmlforlines .= $row->label;
+				$htmlforlines .= '<div class="right">'.price($row->price_ttc, 1, $langs, 1, -1, -1, $conf->currency).'</div>';
+				$htmlforlines .= '</tr>'."\n";
+			}
 		}
 		$htmlforlines .= '</table>';
 		print $htmlforlines;
@@ -993,7 +1008,6 @@ if ($placeid > 0)
             $htmlforlines .= '" id="'.$line->id.'">';
             $htmlforlines .= '<td class="left">';
 			if ($_SESSION["basiclayout"] == 1) $htmlforlines .= '<span class="phoneqty">'.$line->qty."</span> x ";
-            //if ($line->product_label) $htmlforlines.= '<b>'.$line->product_label.'</b>';
             if (isset($line->product_type))
             {
                 if (empty($line->product_type)) $htmlforlines .= img_object('', 'product').' ';

From c80989d74f8a1408c444b533423ef3e12dd48c7a Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sun, 24 May 2020 16:31:22 +0200
Subject: [PATCH 437/490] phone.php improvements

---
 htdocs/takepos/phone.php | 740 +++++++++++++++++++++------------------
 1 file changed, 391 insertions(+), 349 deletions(-)

diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 32074b43d74..72d97e7a07a 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -1,349 +1,391 @@
-<?php
-/* Copyright (C) 2018	Andreu Bisquerra	<jove@bisquerra.com>
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/takepos/phone.php
- *	\ingroup    takepos
- *	\brief      TakePOS Phone screen
- */
-
-//if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
-if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
-
-if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-
-if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-	// Decode place if it is an order from customer phone
-	$key = GETPOST('key');
-	$place = dol_decode($key);
-}
-else $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
-$action = GETPOST('action', 'alpha');
-$setterminal = GETPOST('setterminal', 'int');
-$idproduct = GETPOST('idproduct', 'int');
-
-if ($setterminal > 0)
-{
-	$_SESSION["takeposterminal"] = $setterminal;
-}
-
-$langs->loadLangs(array("bills", "orders", "commercial", "cashdesk", "receiptprinter"));
-
-if (empty($user->rights->takepos->run) && !defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-	accessforbidden();
-}
-
-/*
- * View
- */
-
-if ($action == "productinfo") {
-	$prod = new Product($db);
-    $prod->fetch($idproduct);
-	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="AddProductConfirm(place, '.$idproduct.');">'.$langs->trans('Add').'</button>';
-	print "<br><b>".$prod->label."</b><br>";
-	print '<img class="imgwrapper" width="60%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=pro&query=pro&id='.$idproduct.'">';
-	print "<br>".$prod->description;
-	print "<br><b>".price($prod->price_ttc, 1, $langs, 1, -1, -1, $conf->currency)."</b>";
-	print '<br>';
-}
-elseif ($action == "publicpreorder") {
-	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="TakeposPrintingOrder();">'.$langs->trans('Confirm').'</button>';
-	print "<br><br>";
-	print 	'<div class="comment">
-            <textarea class="textinput" placeholder="'.$langs->trans('Note').'"></textarea>
-			</div>';
-	print '<br>';
-}
-elseif ($action == "publicpayment") {
-	$langs->loadLangs(array("orders"));
-	print '<h1>'.$langs->trans('StatusOrderDelivered').'</h1>';
-	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease();">'.$langs->trans('Payment').'</button>';
-	print '<br>';
-}
-elseif ($action == "checkplease") {
-	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease();">'.$langs->trans('Cash').'</button>';
-	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease();">'.$langs->trans('CreditCard').'</button>';
-	print '<br>';
-}
-elseif ($action == "editline") {
-	$placeid = GETPOST('placeid', 'int');
-	$selectedline = GETPOST('selectedline', 'int');
-	$invoice = new Facture($db);
-	$invoice->fetch($placeid);
-	foreach ($invoice->lines as $line)
-    {
-        if ($line->id == $selectedline)
-		{
-			$prod = new Product($db);
-			$prod->fetch($line->fk_product);
-			print "<b>".$prod->label."</b><br>";
-			print '<img class="imgwrapper" width="60%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=pro&query=pro&id='.$line->fk_product.'">';
-			print "<br>".$prod->description;
-			print "<br><b>".price($prod->price_ttc, 1, $langs, 1, -1, -1, $conf->currency)."</b>";
-			print '<br>';
-			print '<button type="button" class="publicphonebutton2 phonered width24" onclick="SetQty(place, '.$selectedline.', '.($line->qty - 1).');">-</button>';
-			print '<button type="button" class="publicphonebutton2 phonegreen width24" onclick="SetQty(place, '.$selectedline.', '.($line->qty + 1).');">+</button>';
-			print '<button type="button" class="publicphonebutton2 phoneblue width24" onclick="SetNote(place, '.$selectedline.');">'.$langs->trans('Note').'</button>';
-        }
-    }
-}
-else {
-	// Title
-	$title = 'TakePOS - Dolibarr '.DOL_VERSION;
-	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
-	$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="mobile-web-app-capable" content="yes">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
-	$arrayofcss = array('/takepos/css/phone.css');
-	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
-	?>
-<script language="javascript">
-	<?php
-	$categorie = new Categorie($db);
-	$categories = $categorie->get_full_arbo('product', (($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) ? $conf->global->TAKEPOS_ROOT_CATEGORY_ID : 0), 1);
-
-	// Search root category to know its level
-	//$conf->global->TAKEPOS_ROOT_CATEGORY_ID=0;
-	$levelofrootcategory = 0;
-	if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0)
-	{
-    	foreach ($categories as $key => $categorycursor)
-    	{
-        	if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
-        	{
-            	$levelofrootcategory = $categorycursor['level'];
-            	break;
-        	}
-    	}
-	}
-	$levelofmaincategories = $levelofrootcategory + 1;
-
-	$maincategories = array();
-	$subcategories = array();
-	foreach ($categories as $key => $categorycursor)
-	{
-    	if ($categorycursor['level'] == $levelofmaincategories)
-    	{
-        	$maincategories[$key] = $categorycursor;
-    	}
-    	else
-    	{
-        	$subcategories[$key] = $categorycursor;
-    	}
-	}
-
-	sort($maincategories);
-	sort($subcategories);
-
-
-	?>
-
-var categories = <?php echo json_encode($maincategories); ?>;
-var subcategories = <?php echo json_encode($subcategories); ?>;
-
-var currentcat;
-var pageproducts=0;
-var pagecategories=0;
-var pageactions=0;
-var place="<?php echo $place; ?>";
-var editaction="qty";
-var editnumber="";
-
-
-$( document ).ready(function() {
-    console.log("Refresh");
-	LoadPlace(place);
-});
-
-function LoadPlace(placeid){
-    place=placeid;
-	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&place="+place, function() {
-		});';
-	}
-	else {
-		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&place="+place, function() {
-		});';
-	}
-	?>
-    LoadCats();
-}
-
-function AddProduct(placeid, productid){
-	<?php
-	// If is a public terminal first show product information
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		print 'place=placeid;
-		$("#phonediv1").load("auto_order.php?action=productinfo&place="+place+"&idproduct="+productid, function() {
-		});';
-	}
-	else {
-		print 'AddProductConfirm(placeid, productid);';
-	}
-	?>
-}
-
-function PublicPreOrder(){
-	$("#phonediv1").load("auto_order.php?action=publicpreorder&place="+place, function() {
-	});
-}
-
-function AddProductConfirm(placeid, productid){
-	place=placeid;
-	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
-		});';
-	}
-	else {
-		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
-		});';
-	}
-	?>
-}
-
-function SetQty(place, selectedline, qty){
-	if (qty==0){
-		$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=deleteline&place="+place+"&idline="+selectedline, function() {
-		});
-	}
-	else{
-		$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=updateqty&place="+place+"&idline="+selectedline+"&number="+qty, function() {
-		});
-	}
-	LoadCats();
-}
-
-function SetNote(place, selectedline){
-	var note = prompt("<?php $langs->trans('Note'); ?>", "");
-	$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=updateqty&place="+place+"&idline="+selectedline+"&number="+qty, function() {
-    });
-	LoadCats();
-}
-
-function LoadCats(){
-	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		echo '$("#phonediv1").load("auto_order.php?mobilepage=cats&place="+place, function() {
-		});';
-	}
-	else {
-		echo '$("#phonediv1").load("invoice.php?mobilepage=cats&place="+place, function() {
-		});';
-	}
-	?>
-}
-
-function LoadProducts(idcat){
-    
-	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		echo '$("#phonediv1").load("auto_order.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
-		});';
-	}
-	else {
-		echo '$("#phonediv1").load("invoice.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
-		});';
-	}
-	?>
-}
-
-function LoadPlacesList(){
-    $("#phonediv1").load("invoice.php?mobilepage=places", function() {
-    });
-}
-
-function TakeposPrintingOrder(){
-    console.log("TakeposPrintingOrder");
-	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		echo '$("#phonediv2").load("auto_order.php?action=order&mobilepage=order&place="+place, function() {
-		});';
-		echo '$("#phonediv1").load("auto_order.php?action=publicpayment&place="+place, function() {
-		});';
-	}
-	else {
-		echo '$("#phonediv2").load("invoice.php?action=order&place="+place, function() {
-		});';
-	}
-	?>
-}
-
-function Exit(){
-    window.location.href='../user/logout.php';
-}
-
-function CheckPlease(){
-	$("#phonediv1").load("auto_order.php?action=checkplease&place="+place, function() {
-	});
-	console.log("Request the check to the waiter");
-	$.ajax({
-		type: "GET",
-		url: "<?php print dol_buildpath('/takepos/ajax/ajax.php', 1).'?action=thecheck&=place='.$place; ?>",
-	});
-}
-
-</script>
-
-<body style="background-color:#D1D1D1;">
-	<?php
-	if ($conf->global->TAKEPOS_NUM_TERMINALS != "1" && $_SESSION["takeposterminal"] == "") print '<div class="dialog-info-takepos-terminal" id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>';
-	?>
-<div class="container">
-	<div class="phonebuttonsrow">
-		<?php
-		if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-			print '<button type="button" class="phonebutton" onclick="LoadPlacesList();">'.strtoupper(substr($langs->trans('Floors'), 0, 3)).'</button>';
-			print '<button type="button" class="phonebutton" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 3)).'</button>';
-			print '<button type="button" class="phonebutton" onclick="TakeposPrintingOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 3)).'</button>';
-			print '<button type="button" class="phonebutton" onclick="Exit();">'.strtoupper(substr($langs->trans('Logout'), 0, 3)).'</button>';
-		}
-		else {
-			print '<button type="button" class="publicphonebutton phoneblue" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 5)).'</button>';
-			print '<button type="button" class="publicphonebutton phoneorange" onclick="PublicPreOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 5)).'</button>';
-			print '<button type="button" class="publicphonebutton phonegreen" onclick="CheckPlease();">'.strtoupper(substr($langs->trans('Payment'), 0, 5)).'</button>';
-		}
-		?>
-	</div>
-	<div class="phonerow2">
-		<div id="phonediv2" class="phonediv2"></div>
-	</div>
-	<div class="phonerow1">
-		<div id="phonediv1" class="phonediv1"></div>
-	</div>
-</div>
-</body>
-	<?php
-}
-
-llxFooter();
-
-$db->close();
+<?php
+/* Copyright (C) 2018	Andreu Bisquerra	<jove@bisquerra.com>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/takepos/phone.php
+ *	\ingroup    takepos
+ *	\brief      TakePOS Phone screen
+ */
+
+//if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
+//if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
+//if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
+if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
+if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
+
+if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+
+if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+	// Decode place if it is an order from customer phone
+	if (GETPOSTISSET("key")) $place = dol_decode(GETPOST('key'));
+	else $place = GETPOST('place', 'aZ09');
+}
+else $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
+$action = GETPOST('action', 'alpha');
+$setterminal = GETPOST('setterminal', 'int');
+$idproduct = GETPOST('idproduct', 'int');
+
+if ($setterminal > 0)
+{
+	$_SESSION["takeposterminal"] = $setterminal;
+}
+
+$langs->loadLangs(array("bills", "orders", "commercial", "cashdesk", "receiptprinter"));
+
+if (empty($user->rights->takepos->run) && !defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+	accessforbidden();
+}
+
+/*
+ * View
+ */
+
+if ($action == "productinfo") {
+	$prod = new Product($db);
+    $prod->fetch($idproduct);
+	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="AddProductConfirm(place, '.$idproduct.');">'.$langs->trans('Add').'</button>';
+	print "<br><b>".$prod->label."</b><br>";
+	print '<img class="imgwrapper" width="60%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=pro&query=pro&id='.$idproduct.'">';
+	print "<br>".$prod->description;
+	print "<br><b>".price($prod->price_ttc, 1, $langs, 1, -1, -1, $conf->currency)."</b>";
+	print '<br>';
+}
+elseif ($action == "publicpreorder") {
+	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="TakeposPrintingOrder();">'.$langs->trans('Confirm').'</button>';
+	print "<br><br>";
+	print 	'<div class="comment">
+            <textarea class="textinput" placeholder="'.$langs->trans('Note').'"></textarea>
+			</div>';
+	print '<br>';
+}
+elseif ($action == "publicpayment") {
+	$langs->loadLangs(array("orders"));
+	print '<h1>'.$langs->trans('StatusOrderDelivered').'</h1>';
+	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease();">'.$langs->trans('Payment').'</button>';
+	print '<br>';
+}
+elseif ($action == "checkplease") {
+	if (GETPOSTISSET("payment")){
+		print '<h1>'.$langs->trans('StatusOrderDelivered').'</h1>';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+		$printer = new dolReceiptPrinter($db);
+		$printer->initPrinter($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$_SESSION["takeposterminal"]});
+		$printer->printer->feed();
+		$printer->printer->feed();
+		$printer->printer->text($langs->trans('IM'));
+		$printer->printer->feed();
+		$printer->printer->text($langs->trans('Place').": ".$place);
+		$printer->printer->feed();
+		$printer->printer->text($langs->trans('Payment').": ".$langs->trans(GETPOST('payment', 'alpha')));
+		$printer->printer->feed();
+		$printer->printer->feed();
+		$printer->printer->feed();
+		$printer->printer->feed();
+		$printer->printer->feed();
+		$printer->close();
+	}
+	else{
+		print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease(\'Cash\');">'.$langs->trans('Cash').'</button>';
+		print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease(\'CreditCard\');">'.$langs->trans('CreditCard').'</button>';
+		print '<br>';
+	}
+}
+elseif ($action == "editline") {
+	$placeid = GETPOST('placeid', 'int');
+	$selectedline = GETPOST('selectedline', 'int');
+	$invoice = new Facture($db);
+	$invoice->fetch($placeid);
+	foreach ($invoice->lines as $line)
+    {
+        if ($line->id == $selectedline)
+		{
+			$prod = new Product($db);
+			$prod->fetch($line->fk_product);
+			print "<b>".$prod->label."</b><br>";
+			print '<img class="imgwrapper" width="60%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=pro&query=pro&id='.$line->fk_product.'">';
+			print "<br>".$prod->description;
+			print "<br><b>".price($prod->price_ttc, 1, $langs, 1, -1, -1, $conf->currency)."</b>";
+			print '<br>';
+			print '<button type="button" class="publicphonebutton2 phonered width24" onclick="SetQty(place, '.$selectedline.', '.($line->qty - 1).');">-</button>';
+			print '<button type="button" class="publicphonebutton2 phonegreen width24" onclick="SetQty(place, '.$selectedline.', '.($line->qty + 1).');">+</button>';
+			print '<button type="button" class="publicphonebutton2 phoneblue width24" onclick="SetNote(place, '.$selectedline.');">'.$langs->trans('Note').'</button>';
+        }
+    }
+}
+else {
+// Title
+$title = 'TakePOS - Dolibarr '.DOL_VERSION;
+if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="mobile-web-app-capable" content="yes">
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
+$arrayofcss = array('/takepos/css/phone.css');
+top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+	?>
+<script language="javascript">
+	<?php
+	$categorie = new Categorie($db);
+	$categories = $categorie->get_full_arbo('product', (($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) ? $conf->global->TAKEPOS_ROOT_CATEGORY_ID : 0), 1);
+
+	// Search root category to know its level
+	//$conf->global->TAKEPOS_ROOT_CATEGORY_ID=0;
+	$levelofrootcategory = 0;
+	if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0)
+	{
+    	foreach ($categories as $key => $categorycursor)
+    	{
+        	if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
+        	{
+            	$levelofrootcategory = $categorycursor['level'];
+            	break;
+        	}
+    	}
+	}
+	$levelofmaincategories = $levelofrootcategory + 1;
+
+	$maincategories = array();
+	$subcategories = array();
+	foreach ($categories as $key => $categorycursor)
+	{
+    	if ($categorycursor['level'] == $levelofmaincategories)
+    	{
+        	$maincategories[$key] = $categorycursor;
+    	}
+    	else
+    	{
+        	$subcategories[$key] = $categorycursor;
+    	}
+	}
+
+	sort($maincategories);
+	sort($subcategories);
+
+
+	?>
+
+var categories = <?php echo json_encode($maincategories); ?>;
+var subcategories = <?php echo json_encode($subcategories); ?>;
+
+var currentcat;
+var pageproducts=0;
+var pagecategories=0;
+var pageactions=0;
+var place="<?php echo $place; ?>";
+var editaction="qty";
+var editnumber="";
+
+
+$( document ).ready(function() {
+    console.log("Refresh");
+	LoadPlace(place);
+});
+
+function LoadPlace(placeid){
+    place=placeid;
+	<?php
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&place="+place, function() {
+		});';
+	}
+	else {
+		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&place="+place, function() {
+		});';
+	}
+	?>
+    LoadCats();
+}
+
+function AddProduct(placeid, productid){
+	<?php
+	// If is a public terminal first show product information
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+		print 'place=placeid;
+		$("#phonediv1").load("auto_order.php?action=productinfo&place="+place+"&idproduct="+productid, function() {
+		});';
+	}
+	else {
+		print 'AddProductConfirm(placeid, productid);';
+	}
+	?>
+}
+
+function PublicPreOrder(){
+	$("#phonediv1").load("auto_order.php?action=publicpreorder&place="+place, function() {
+	});
+}
+
+function AddProductConfirm(placeid, productid){
+	place=placeid;
+	<?php
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
+		});';
+	}
+	else {
+		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
+		});';
+	}
+	?>
+}
+
+function SetQty(place, selectedline, qty){
+	<?php
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+	?>
+	if (qty==0){
+		$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=deleteline&place="+place+"&idline="+selectedline, function() {
+		});
+	}
+	else{
+		$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=updateqty&place="+place+"&idline="+selectedline+"&number="+qty, function() {
+		});
+	}
+	<?php
+	}
+	else {
+	?>
+	if (qty==0){
+		$("#phonediv2").load("invoice.php?mobilepage=invoice&action=deleteline&place="+place+"&idline="+selectedline, function() {
+		});
+	}
+	else{
+		$("#phonediv2").load("invoice.php?mobilepage=invoice&action=updateqty&place="+place+"&idline="+selectedline+"&number="+qty, function() {
+		});
+	}
+	<?php
+	}
+	?>	
+	LoadCats();
+}
+
+function SetNote(place, selectedline){
+	var note = prompt("<?php $langs->trans('Note'); ?>", "");
+	$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=updateqty&place="+place+"&idline="+selectedline+"&number="+qty, function() {
+    });
+	LoadCats();
+}
+
+function LoadCats(){
+	<?php
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+		echo '$("#phonediv1").load("auto_order.php?mobilepage=cats&place="+place, function() {
+		});';
+	}
+	else {
+		echo '$("#phonediv1").load("invoice.php?mobilepage=cats&place="+place, function() {
+		});';
+	}
+	?>
+}
+
+function LoadProducts(idcat){
+    
+	<?php
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+		echo '$("#phonediv1").load("auto_order.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
+		});';
+	}
+	else {
+		echo '$("#phonediv1").load("invoice.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
+		});';
+	}
+	?>
+}
+
+function LoadPlacesList(){
+    $("#phonediv1").load("invoice.php?mobilepage=places", function() {
+    });
+}
+
+function TakeposPrintingOrder(){
+    console.log("TakeposPrintingOrder");
+	<?php
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+		echo '$("#phonediv2").load("auto_order.php?action=order&mobilepage=order&place="+place, function() {
+		});';
+		echo '$("#phonediv1").load("auto_order.php?action=publicpayment&place="+place, function() {
+		});';
+	}
+	else {
+		echo '$("#phonediv2").load("invoice.php?action=order&place="+place, function() {
+		});';
+	}
+	?>
+}
+
+function Exit(){
+    window.location.href='../user/logout.php';
+}
+
+function CheckPlease(payment){
+	if (payment==undefined){
+		$("#phonediv1").load("auto_order.php?action=checkplease&place="+place, function() {
+		});
+	}
+	else{
+		console.log("Request the check to the waiter");
+		$("#phonediv1").load("auto_order.php?action=checkplease&place=<?php echo $place;?>&payment="+payment, function() {
+		});
+	}
+}
+
+</script>
+
+<body style="background-color:#D1D1D1;">
+	<?php
+	if ($conf->global->TAKEPOS_NUM_TERMINALS != "1" && $_SESSION["takeposterminal"] == "") print '<div class="dialog-info-takepos-terminal" id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>';
+	?>
+<div class="container">
+	<div class="phonebuttonsrow">
+		<?php
+		if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+			print '<button type="button" class="phonebutton" onclick="LoadPlacesList();">'.strtoupper(substr($langs->trans('Floors'), 0, 3)).'</button>';
+			print '<button type="button" class="phonebutton" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 3)).'</button>';
+			print '<button type="button" class="phonebutton" onclick="TakeposPrintingOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 3)).'</button>';
+			print '<button type="button" class="phonebutton" onclick="Exit();">'.strtoupper(substr($langs->trans('Logout'), 0, 3)).'</button>';
+		}
+		else {
+			print '<button type="button" class="publicphonebutton phoneblue" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 5)).'</button>';
+			print '<button type="button" class="publicphonebutton phoneorange" onclick="PublicPreOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 5)).'</button>';
+			print '<button type="button" class="publicphonebutton phonegreen" onclick="CheckPlease();">'.strtoupper(substr($langs->trans('Payment'), 0, 5)).'</button>';
+		}
+		?>
+	</div>
+	<div class="phonerow2">
+		<div id="phonediv2" class="phonediv2"></div>
+	</div>
+	<div class="phonerow1">
+		<div id="phonediv1" class="phonediv1"></div>
+	</div>
+</div>
+</body>
+	<?php
+}
+
+llxFooter();
+
+$db->close();

From 3632111705de7d7ef64b36080a5e08e844e3f72d Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sun, 24 May 2020 17:29:35 +0200
Subject: [PATCH 438/490] Fix travis

---
 htdocs/takepos/phone.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 72d97e7a07a..059538d68cc 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2018	Andreu Bisquerra	<jove@bisquerra.com>
+ /* Copyright (C) 2018	Andreu Bisquerra	<jove@bisquerra.com>
  *
  * 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
@@ -136,15 +136,15 @@ elseif ($action == "editline") {
     }
 }
 else {
-// Title
-$title = 'TakePOS - Dolibarr '.DOL_VERSION;
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
-$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
+	// Title
+	$title = 'TakePOS - Dolibarr '.DOL_VERSION;
+	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+	$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="mobile-web-app-capable" content="yes">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
-$arrayofcss = array('/takepos/css/phone.css');
-top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+	$arrayofcss = array('/takepos/css/phone.css');
+	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 	?>
 <script language="javascript">
 	<?php
@@ -255,7 +255,7 @@ function AddProductConfirm(placeid, productid){
 function SetQty(place, selectedline, qty){
 	<?php
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-	?>
+		?>
 	if (qty==0){
 		$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=deleteline&place="+place+"&idline="+selectedline, function() {
 		});
@@ -264,10 +264,10 @@ function SetQty(place, selectedline, qty){
 		$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=updateqty&place="+place+"&idline="+selectedline+"&number="+qty, function() {
 		});
 	}
-	<?php
+		<?php
 	}
 	else {
-	?>
+		?>
 	if (qty==0){
 		$("#phonediv2").load("invoice.php?mobilepage=invoice&action=deleteline&place="+place+"&idline="+selectedline, function() {
 		});
@@ -276,7 +276,7 @@ function SetQty(place, selectedline, qty){
 		$("#phonediv2").load("invoice.php?mobilepage=invoice&action=updateqty&place="+place+"&idline="+selectedline+"&number="+qty, function() {
 		});
 	}
-	<?php
+		<?php
 	}
 	?>	
 	LoadCats();

From 957c40e072120c562b19293e5eb6813fa62362b0 Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sun, 24 May 2020 18:03:07 +0200
Subject: [PATCH 439/490] Fix travis

---
 htdocs/takepos/phone.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 059538d68cc..ff54253daeb 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -1,5 +1,5 @@
 <?php
- /* Copyright (C) 2018	Andreu Bisquerra	<jove@bisquerra.com>
+/* Copyright (C) 2018	Andreu Bisquerra	<jove@bisquerra.com>
  *
  * 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

From 7a17bbacb9f85958980e400c07c1c0229f2f0b68 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 24 May 2020 18:04:08 +0200
Subject: [PATCH 440/490] Can force lang during import

---
 scripts/website/migrate-news-joomla2dolibarr.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/website/migrate-news-joomla2dolibarr.php b/scripts/website/migrate-news-joomla2dolibarr.php
index 30c166aa594..b4399ba0885 100755
--- a/scripts/website/migrate-news-joomla2dolibarr.php
+++ b/scripts/website/migrate-news-joomla2dolibarr.php
@@ -44,6 +44,7 @@ $image = 'image/__WEBSITE_KEY__/images/stories/dolibarr.png';
 
 $max = (!isset($argv[4]) || (empty($argv[4]) && $argv[4] !== '0')) ? '10' : $argv[4];
 $excludeid = (empty($argv[5]) ? '' : $argv[5]);
+$forcelang = (empty($argv[6]) ? '' : $argv[6]);
 
 if (empty($argv[3]) || !in_array($argv[1], array('test', 'confirm')) || empty($websiteref)) {
 	print '***** '.$script_file.' *****'."\n";
@@ -136,7 +137,7 @@ while ($obj = $dbjoomla->fetch_object($resql)) {
 		}
 		if ($blogpostfooter) $htmltext .= "\n".$blogpostfooter;
 
-		$language = ($obj->language && $obj->language != '*' ? $obj->language : 'en');
+		$language = ($forcelang ? $forcelang : ($obj->language && $obj->language != '*' ? $obj->language : 'en'));
 		$keywords = $obj->metakey;
 		$author_alias = $obj->username;
 

From d60bcb871f82bf124e63b80e7b7cd824c6e945b6 Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sun, 24 May 2020 18:24:41 +0200
Subject: [PATCH 441/490] Fix travis

---
 htdocs/takepos/phone.php | 782 +++++++++++++++++++--------------------
 1 file changed, 391 insertions(+), 391 deletions(-)

diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index ff54253daeb..2276317a198 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -1,391 +1,391 @@
-<?php
-/* Copyright (C) 2018	Andreu Bisquerra	<jove@bisquerra.com>
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/takepos/phone.php
- *	\ingroup    takepos
- *	\brief      TakePOS Phone screen
- */
-
-//if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
-if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
-
-if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-
-if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-	// Decode place if it is an order from customer phone
-	if (GETPOSTISSET("key")) $place = dol_decode(GETPOST('key'));
-	else $place = GETPOST('place', 'aZ09');
-}
-else $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
-$action = GETPOST('action', 'alpha');
-$setterminal = GETPOST('setterminal', 'int');
-$idproduct = GETPOST('idproduct', 'int');
-
-if ($setterminal > 0)
-{
-	$_SESSION["takeposterminal"] = $setterminal;
-}
-
-$langs->loadLangs(array("bills", "orders", "commercial", "cashdesk", "receiptprinter"));
-
-if (empty($user->rights->takepos->run) && !defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-	accessforbidden();
-}
-
-/*
- * View
- */
-
-if ($action == "productinfo") {
-	$prod = new Product($db);
-    $prod->fetch($idproduct);
-	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="AddProductConfirm(place, '.$idproduct.');">'.$langs->trans('Add').'</button>';
-	print "<br><b>".$prod->label."</b><br>";
-	print '<img class="imgwrapper" width="60%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=pro&query=pro&id='.$idproduct.'">';
-	print "<br>".$prod->description;
-	print "<br><b>".price($prod->price_ttc, 1, $langs, 1, -1, -1, $conf->currency)."</b>";
-	print '<br>';
-}
-elseif ($action == "publicpreorder") {
-	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="TakeposPrintingOrder();">'.$langs->trans('Confirm').'</button>';
-	print "<br><br>";
-	print 	'<div class="comment">
-            <textarea class="textinput" placeholder="'.$langs->trans('Note').'"></textarea>
-			</div>';
-	print '<br>';
-}
-elseif ($action == "publicpayment") {
-	$langs->loadLangs(array("orders"));
-	print '<h1>'.$langs->trans('StatusOrderDelivered').'</h1>';
-	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease();">'.$langs->trans('Payment').'</button>';
-	print '<br>';
-}
-elseif ($action == "checkplease") {
-	if (GETPOSTISSET("payment")){
-		print '<h1>'.$langs->trans('StatusOrderDelivered').'</h1>';
-		require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
-		require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-		$printer = new dolReceiptPrinter($db);
-		$printer->initPrinter($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$_SESSION["takeposterminal"]});
-		$printer->printer->feed();
-		$printer->printer->feed();
-		$printer->printer->text($langs->trans('IM'));
-		$printer->printer->feed();
-		$printer->printer->text($langs->trans('Place').": ".$place);
-		$printer->printer->feed();
-		$printer->printer->text($langs->trans('Payment').": ".$langs->trans(GETPOST('payment', 'alpha')));
-		$printer->printer->feed();
-		$printer->printer->feed();
-		$printer->printer->feed();
-		$printer->printer->feed();
-		$printer->printer->feed();
-		$printer->close();
-	}
-	else{
-		print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease(\'Cash\');">'.$langs->trans('Cash').'</button>';
-		print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease(\'CreditCard\');">'.$langs->trans('CreditCard').'</button>';
-		print '<br>';
-	}
-}
-elseif ($action == "editline") {
-	$placeid = GETPOST('placeid', 'int');
-	$selectedline = GETPOST('selectedline', 'int');
-	$invoice = new Facture($db);
-	$invoice->fetch($placeid);
-	foreach ($invoice->lines as $line)
-    {
-        if ($line->id == $selectedline)
-		{
-			$prod = new Product($db);
-			$prod->fetch($line->fk_product);
-			print "<b>".$prod->label."</b><br>";
-			print '<img class="imgwrapper" width="60%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=pro&query=pro&id='.$line->fk_product.'">';
-			print "<br>".$prod->description;
-			print "<br><b>".price($prod->price_ttc, 1, $langs, 1, -1, -1, $conf->currency)."</b>";
-			print '<br>';
-			print '<button type="button" class="publicphonebutton2 phonered width24" onclick="SetQty(place, '.$selectedline.', '.($line->qty - 1).');">-</button>';
-			print '<button type="button" class="publicphonebutton2 phonegreen width24" onclick="SetQty(place, '.$selectedline.', '.($line->qty + 1).');">+</button>';
-			print '<button type="button" class="publicphonebutton2 phoneblue width24" onclick="SetNote(place, '.$selectedline.');">'.$langs->trans('Note').'</button>';
-        }
-    }
-}
-else {
-	// Title
-	$title = 'TakePOS - Dolibarr '.DOL_VERSION;
-	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
-	$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="mobile-web-app-capable" content="yes">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
-	$arrayofcss = array('/takepos/css/phone.css');
-	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
-	?>
-<script language="javascript">
-	<?php
-	$categorie = new Categorie($db);
-	$categories = $categorie->get_full_arbo('product', (($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) ? $conf->global->TAKEPOS_ROOT_CATEGORY_ID : 0), 1);
-
-	// Search root category to know its level
-	//$conf->global->TAKEPOS_ROOT_CATEGORY_ID=0;
-	$levelofrootcategory = 0;
-	if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0)
-	{
-    	foreach ($categories as $key => $categorycursor)
-    	{
-        	if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
-        	{
-            	$levelofrootcategory = $categorycursor['level'];
-            	break;
-        	}
-    	}
-	}
-	$levelofmaincategories = $levelofrootcategory + 1;
-
-	$maincategories = array();
-	$subcategories = array();
-	foreach ($categories as $key => $categorycursor)
-	{
-    	if ($categorycursor['level'] == $levelofmaincategories)
-    	{
-        	$maincategories[$key] = $categorycursor;
-    	}
-    	else
-    	{
-        	$subcategories[$key] = $categorycursor;
-    	}
-	}
-
-	sort($maincategories);
-	sort($subcategories);
-
-
-	?>
-
-var categories = <?php echo json_encode($maincategories); ?>;
-var subcategories = <?php echo json_encode($subcategories); ?>;
-
-var currentcat;
-var pageproducts=0;
-var pagecategories=0;
-var pageactions=0;
-var place="<?php echo $place; ?>";
-var editaction="qty";
-var editnumber="";
-
-
-$( document ).ready(function() {
-    console.log("Refresh");
-	LoadPlace(place);
-});
-
-function LoadPlace(placeid){
-    place=placeid;
-	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&place="+place, function() {
-		});';
-	}
-	else {
-		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&place="+place, function() {
-		});';
-	}
-	?>
-    LoadCats();
-}
-
-function AddProduct(placeid, productid){
-	<?php
-	// If is a public terminal first show product information
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		print 'place=placeid;
-		$("#phonediv1").load("auto_order.php?action=productinfo&place="+place+"&idproduct="+productid, function() {
-		});';
-	}
-	else {
-		print 'AddProductConfirm(placeid, productid);';
-	}
-	?>
-}
-
-function PublicPreOrder(){
-	$("#phonediv1").load("auto_order.php?action=publicpreorder&place="+place, function() {
-	});
-}
-
-function AddProductConfirm(placeid, productid){
-	place=placeid;
-	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
-		});';
-	}
-	else {
-		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
-		});';
-	}
-	?>
-}
-
-function SetQty(place, selectedline, qty){
-	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		?>
-	if (qty==0){
-		$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=deleteline&place="+place+"&idline="+selectedline, function() {
-		});
-	}
-	else{
-		$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=updateqty&place="+place+"&idline="+selectedline+"&number="+qty, function() {
-		});
-	}
-		<?php
-	}
-	else {
-		?>
-	if (qty==0){
-		$("#phonediv2").load("invoice.php?mobilepage=invoice&action=deleteline&place="+place+"&idline="+selectedline, function() {
-		});
-	}
-	else{
-		$("#phonediv2").load("invoice.php?mobilepage=invoice&action=updateqty&place="+place+"&idline="+selectedline+"&number="+qty, function() {
-		});
-	}
-		<?php
-	}
-	?>	
-	LoadCats();
-}
-
-function SetNote(place, selectedline){
-	var note = prompt("<?php $langs->trans('Note'); ?>", "");
-	$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=updateqty&place="+place+"&idline="+selectedline+"&number="+qty, function() {
-    });
-	LoadCats();
-}
-
-function LoadCats(){
-	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		echo '$("#phonediv1").load("auto_order.php?mobilepage=cats&place="+place, function() {
-		});';
-	}
-	else {
-		echo '$("#phonediv1").load("invoice.php?mobilepage=cats&place="+place, function() {
-		});';
-	}
-	?>
-}
-
-function LoadProducts(idcat){
-    
-	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		echo '$("#phonediv1").load("auto_order.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
-		});';
-	}
-	else {
-		echo '$("#phonediv1").load("invoice.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
-		});';
-	}
-	?>
-}
-
-function LoadPlacesList(){
-    $("#phonediv1").load("invoice.php?mobilepage=places", function() {
-    });
-}
-
-function TakeposPrintingOrder(){
-    console.log("TakeposPrintingOrder");
-	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		echo '$("#phonediv2").load("auto_order.php?action=order&mobilepage=order&place="+place, function() {
-		});';
-		echo '$("#phonediv1").load("auto_order.php?action=publicpayment&place="+place, function() {
-		});';
-	}
-	else {
-		echo '$("#phonediv2").load("invoice.php?action=order&place="+place, function() {
-		});';
-	}
-	?>
-}
-
-function Exit(){
-    window.location.href='../user/logout.php';
-}
-
-function CheckPlease(payment){
-	if (payment==undefined){
-		$("#phonediv1").load("auto_order.php?action=checkplease&place="+place, function() {
-		});
-	}
-	else{
-		console.log("Request the check to the waiter");
-		$("#phonediv1").load("auto_order.php?action=checkplease&place=<?php echo $place;?>&payment="+payment, function() {
-		});
-	}
-}
-
-</script>
-
-<body style="background-color:#D1D1D1;">
-	<?php
-	if ($conf->global->TAKEPOS_NUM_TERMINALS != "1" && $_SESSION["takeposterminal"] == "") print '<div class="dialog-info-takepos-terminal" id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>';
-	?>
-<div class="container">
-	<div class="phonebuttonsrow">
-		<?php
-		if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-			print '<button type="button" class="phonebutton" onclick="LoadPlacesList();">'.strtoupper(substr($langs->trans('Floors'), 0, 3)).'</button>';
-			print '<button type="button" class="phonebutton" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 3)).'</button>';
-			print '<button type="button" class="phonebutton" onclick="TakeposPrintingOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 3)).'</button>';
-			print '<button type="button" class="phonebutton" onclick="Exit();">'.strtoupper(substr($langs->trans('Logout'), 0, 3)).'</button>';
-		}
-		else {
-			print '<button type="button" class="publicphonebutton phoneblue" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 5)).'</button>';
-			print '<button type="button" class="publicphonebutton phoneorange" onclick="PublicPreOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 5)).'</button>';
-			print '<button type="button" class="publicphonebutton phonegreen" onclick="CheckPlease();">'.strtoupper(substr($langs->trans('Payment'), 0, 5)).'</button>';
-		}
-		?>
-	</div>
-	<div class="phonerow2">
-		<div id="phonediv2" class="phonediv2"></div>
-	</div>
-	<div class="phonerow1">
-		<div id="phonediv1" class="phonediv1"></div>
-	</div>
-</div>
-</body>
-	<?php
-}
-
-llxFooter();
-
-$db->close();
+<?php
+/* Copyright (C) 2018	Andreu Bisquerra	<jove@bisquerra.com>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/takepos/phone.php
+ *	\ingroup    takepos
+ *	\brief      TakePOS Phone screen
+ */
+
+//if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
+//if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
+//if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
+if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
+if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
+
+if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+
+if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+	// Decode place if it is an order from customer phone
+	if (GETPOSTISSET("key")) $place = dol_decode(GETPOST('key'));
+	else $place = GETPOST('place', 'aZ09');
+}
+else $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
+$action = GETPOST('action', 'alpha');
+$setterminal = GETPOST('setterminal', 'int');
+$idproduct = GETPOST('idproduct', 'int');
+
+if ($setterminal > 0)
+{
+	$_SESSION["takeposterminal"] = $setterminal;
+}
+
+$langs->loadLangs(array("bills", "orders", "commercial", "cashdesk", "receiptprinter"));
+
+if (empty($user->rights->takepos->run) && !defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+	accessforbidden();
+}
+
+/*
+ * View
+ */
+
+if ($action == "productinfo") {
+	$prod = new Product($db);
+    $prod->fetch($idproduct);
+	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="AddProductConfirm(place, '.$idproduct.');">'.$langs->trans('Add').'</button>';
+	print "<br><b>".$prod->label."</b><br>";
+	print '<img class="imgwrapper" width="60%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=pro&query=pro&id='.$idproduct.'">';
+	print "<br>".$prod->description;
+	print "<br><b>".price($prod->price_ttc, 1, $langs, 1, -1, -1, $conf->currency)."</b>";
+	print '<br>';
+}
+elseif ($action == "publicpreorder") {
+	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="TakeposPrintingOrder();">'.$langs->trans('Confirm').'</button>';
+	print "<br><br>";
+	print 	'<div class="comment">
+            <textarea class="textinput" placeholder="'.$langs->trans('Note').'"></textarea>
+			</div>';
+	print '<br>';
+}
+elseif ($action == "publicpayment") {
+	$langs->loadLangs(array("orders"));
+	print '<h1>'.$langs->trans('StatusOrderDelivered').'</h1>';
+	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease();">'.$langs->trans('Payment').'</button>';
+	print '<br>';
+}
+elseif ($action == "checkplease") {
+	if (GETPOSTISSET("payment")){
+		print '<h1>'.$langs->trans('StatusOrderDelivered').'</h1>';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+		$printer = new dolReceiptPrinter($db);
+		$printer->initPrinter($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$_SESSION["takeposterminal"]});
+		$printer->printer->feed();
+		$printer->printer->feed();
+		$printer->printer->text($langs->trans('IM'));
+		$printer->printer->feed();
+		$printer->printer->text($langs->trans('Place').": ".$place);
+		$printer->printer->feed();
+		$printer->printer->text($langs->trans('Payment').": ".$langs->trans(GETPOST('payment', 'alpha')));
+		$printer->printer->feed();
+		$printer->printer->feed();
+		$printer->printer->feed();
+		$printer->printer->feed();
+		$printer->printer->feed();
+		$printer->close();
+	}
+	else{
+		print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease(\'Cash\');">'.$langs->trans('Cash').'</button>';
+		print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease(\'CreditCard\');">'.$langs->trans('CreditCard').'</button>';
+		print '<br>';
+	}
+}
+elseif ($action == "editline") {
+	$placeid = GETPOST('placeid', 'int');
+	$selectedline = GETPOST('selectedline', 'int');
+	$invoice = new Facture($db);
+	$invoice->fetch($placeid);
+	foreach ($invoice->lines as $line)
+    {
+        if ($line->id == $selectedline)
+		{
+			$prod = new Product($db);
+			$prod->fetch($line->fk_product);
+			print "<b>".$prod->label."</b><br>";
+			print '<img class="imgwrapper" width="60%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=pro&query=pro&id='.$line->fk_product.'">';
+			print "<br>".$prod->description;
+			print "<br><b>".price($prod->price_ttc, 1, $langs, 1, -1, -1, $conf->currency)."</b>";
+			print '<br>';
+			print '<button type="button" class="publicphonebutton2 phonered width24" onclick="SetQty(place, '.$selectedline.', '.($line->qty - 1).');">-</button>';
+			print '<button type="button" class="publicphonebutton2 phonegreen width24" onclick="SetQty(place, '.$selectedline.', '.($line->qty + 1).');">+</button>';
+			print '<button type="button" class="publicphonebutton2 phoneblue width24" onclick="SetNote(place, '.$selectedline.');">'.$langs->trans('Note').'</button>';
+        }
+    }
+}
+else {
+	// Title
+	$title = 'TakePOS - Dolibarr '.DOL_VERSION;
+	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+	$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="mobile-web-app-capable" content="yes">
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
+	$arrayofcss = array('/takepos/css/phone.css');
+	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+	?>
+<script language="javascript">
+	<?php
+	$categorie = new Categorie($db);
+	$categories = $categorie->get_full_arbo('product', (($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) ? $conf->global->TAKEPOS_ROOT_CATEGORY_ID : 0), 1);
+
+	// Search root category to know its level
+	//$conf->global->TAKEPOS_ROOT_CATEGORY_ID=0;
+	$levelofrootcategory = 0;
+	if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0)
+	{
+    	foreach ($categories as $key => $categorycursor)
+    	{
+        	if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
+        	{
+            	$levelofrootcategory = $categorycursor['level'];
+            	break;
+        	}
+    	}
+	}
+	$levelofmaincategories = $levelofrootcategory + 1;
+
+	$maincategories = array();
+	$subcategories = array();
+	foreach ($categories as $key => $categorycursor)
+	{
+    	if ($categorycursor['level'] == $levelofmaincategories)
+    	{
+        	$maincategories[$key] = $categorycursor;
+    	}
+    	else
+    	{
+        	$subcategories[$key] = $categorycursor;
+    	}
+	}
+
+	sort($maincategories);
+	sort($subcategories);
+
+
+	?>
+
+var categories = <?php echo json_encode($maincategories); ?>;
+var subcategories = <?php echo json_encode($subcategories); ?>;
+
+var currentcat;
+var pageproducts=0;
+var pagecategories=0;
+var pageactions=0;
+var place="<?php echo $place; ?>";
+var editaction="qty";
+var editnumber="";
+
+
+$( document ).ready(function() {
+    console.log("Refresh");
+	LoadPlace(place);
+});
+
+function LoadPlace(placeid){
+    place=placeid;
+	<?php
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&place="+place, function() {
+		});';
+	}
+	else {
+		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&place="+place, function() {
+		});';
+	}
+	?>
+    LoadCats();
+}
+
+function AddProduct(placeid, productid){
+	<?php
+	// If is a public terminal first show product information
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+		print 'place=placeid;
+		$("#phonediv1").load("auto_order.php?action=productinfo&place="+place+"&idproduct="+productid, function() {
+		});';
+	}
+	else {
+		print 'AddProductConfirm(placeid, productid);';
+	}
+	?>
+}
+
+function PublicPreOrder(){
+	$("#phonediv1").load("auto_order.php?action=publicpreorder&place="+place, function() {
+	});
+}
+
+function AddProductConfirm(placeid, productid){
+	place=placeid;
+	<?php
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
+		});';
+	}
+	else {
+		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
+		});';
+	}
+	?>
+}
+
+function SetQty(place, selectedline, qty){
+	<?php
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+		?>
+	if (qty==0){
+		$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=deleteline&place="+place+"&idline="+selectedline, function() {
+		});
+	}
+	else{
+		$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=updateqty&place="+place+"&idline="+selectedline+"&number="+qty, function() {
+		});
+	}
+		<?php
+	}
+	else {
+		?>
+	if (qty==0){
+		$("#phonediv2").load("invoice.php?mobilepage=invoice&action=deleteline&place="+place+"&idline="+selectedline, function() {
+		});
+	}
+	else{
+		$("#phonediv2").load("invoice.php?mobilepage=invoice&action=updateqty&place="+place+"&idline="+selectedline+"&number="+qty, function() {
+		});
+	}
+		<?php
+	}
+	?>	
+	LoadCats();
+}
+
+function SetNote(place, selectedline){
+	var note = prompt("<?php $langs->trans('Note'); ?>", "");
+	$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=updateqty&place="+place+"&idline="+selectedline+"&number="+qty, function() {
+    });
+	LoadCats();
+}
+
+function LoadCats(){
+	<?php
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+		echo '$("#phonediv1").load("auto_order.php?mobilepage=cats&place="+place, function() {
+		});';
+	}
+	else {
+		echo '$("#phonediv1").load("invoice.php?mobilepage=cats&place="+place, function() {
+		});';
+	}
+	?>
+}
+
+function LoadProducts(idcat){
+    
+	<?php
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+		echo '$("#phonediv1").load("auto_order.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
+		});';
+	}
+	else {
+		echo '$("#phonediv1").load("invoice.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
+		});';
+	}
+	?>
+}
+
+function LoadPlacesList(){
+    $("#phonediv1").load("invoice.php?mobilepage=places", function() {
+    });
+}
+
+function TakeposPrintingOrder(){
+    console.log("TakeposPrintingOrder");
+	<?php
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+		echo '$("#phonediv2").load("auto_order.php?action=order&mobilepage=order&place="+place, function() {
+		});';
+		echo '$("#phonediv1").load("auto_order.php?action=publicpayment&place="+place, function() {
+		});';
+	}
+	else {
+		echo '$("#phonediv2").load("invoice.php?action=order&place="+place, function() {
+		});';
+	}
+	?>
+}
+
+function Exit(){
+    window.location.href='../user/logout.php';
+}
+
+function CheckPlease(payment){
+	if (payment==undefined){
+		$("#phonediv1").load("auto_order.php?action=checkplease&place="+place, function() {
+		});
+	}
+	else{
+		console.log("Request the check to the waiter");
+		$("#phonediv1").load("auto_order.php?action=checkplease&place=<?php echo $place;?>&payment="+payment, function() {
+		});
+	}
+}
+
+</script>
+
+<body style="background-color:#D1D1D1;">
+	<?php
+	if ($conf->global->TAKEPOS_NUM_TERMINALS != "1" && $_SESSION["takeposterminal"] == "") print '<div class="dialog-info-takepos-terminal" id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>';
+	?>
+<div class="container">
+	<div class="phonebuttonsrow">
+		<?php
+		if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+			print '<button type="button" class="phonebutton" onclick="LoadPlacesList();">'.strtoupper(substr($langs->trans('Floors'), 0, 3)).'</button>';
+			print '<button type="button" class="phonebutton" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 3)).'</button>';
+			print '<button type="button" class="phonebutton" onclick="TakeposPrintingOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 3)).'</button>';
+			print '<button type="button" class="phonebutton" onclick="Exit();">'.strtoupper(substr($langs->trans('Logout'), 0, 3)).'</button>';
+		}
+		else {
+			print '<button type="button" class="publicphonebutton phoneblue" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 5)).'</button>';
+			print '<button type="button" class="publicphonebutton phoneorange" onclick="PublicPreOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 5)).'</button>';
+			print '<button type="button" class="publicphonebutton phonegreen" onclick="CheckPlease();">'.strtoupper(substr($langs->trans('Payment'), 0, 5)).'</button>';
+		}
+		?>
+	</div>
+	<div class="phonerow2">
+		<div id="phonediv2" class="phonediv2"></div>
+	</div>
+	<div class="phonerow1">
+		<div id="phonediv1" class="phonediv1"></div>
+	</div>
+</div>
+</body>
+	<?php
+}
+
+llxFooter();
+
+$db->close();

From aee6fce9f85d38cfe2a05af77eea7d30a62ea1b3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 24 May 2020 20:04:26 +0200
Subject: [PATCH 442/490] Fix remove bad use

---
 htdocs/core/class/conf.class.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 10d6fedf0e0..ad87949d4e9 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -1,9 +1,7 @@
 <?php
-use Splash\Tests\WsObjects\O00ObjectBaseTest;
-
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Xavier Dutoit        <doli@sydesy.com>
- * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2017 Regis Houssin      	<regis.houssin@inodbox.com>
  * Copyright (C) 2006 	   Jean Heimburger    	<jean@tiaris.info>
  *

From 6158e41822145b846baf1109adbc431046ed6698 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 24 May 2020 23:44:04 +0200
Subject: [PATCH 443/490] CSS

---
 htdocs/takepos/admin/other.php    | 2 +-
 htdocs/takepos/admin/receipt.php  | 2 +-
 htdocs/takepos/admin/setup.php    | 2 +-
 htdocs/takepos/admin/terminal.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/takepos/admin/other.php b/htdocs/takepos/admin/other.php
index cbb22c94f90..902bcfc81d4 100644
--- a/htdocs/takepos/admin/other.php
+++ b/htdocs/takepos/admin/other.php
@@ -111,7 +111,7 @@ llxHeader('', $langs->trans("CashDeskSetup"));
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
 $head = takepos_prepare_head();
-dol_fiche_head($head, 'other', 'TakePOS', -1);
+dol_fiche_head($head, 'other', 'TakePOS', -1, 'cash-register');
 print '<br>';
 
 
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 83b31569a7b..2f54d79d603 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -82,7 +82,7 @@ llxHeader('', $langs->trans("CashDeskSetup"));
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
 $head = takepos_prepare_head();
-dol_fiche_head($head, 'receipt', 'TakePOS', -1);
+dol_fiche_head($head, 'receipt', 'TakePOS', -1, 'cash-register');
 
 print '<form action="'.$_SERVER["PHP_SELF"].'?terminal='.(empty($terminal) ? 1 : $terminal).'" method="post">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 85406c46faa..03607409ea7 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -133,7 +133,7 @@ llxHeader('', $langs->trans("CashDeskSetup"));
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
 $head = takepos_prepare_head();
-dol_fiche_head($head, 'setup', 'TakePOS', -1);
+dol_fiche_head($head, 'setup', 'TakePOS', -1, 'cash-register');
 
 // Numbering modules
 $now = dol_now();
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index 46d168ddd24..ec3908361fc 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -123,7 +123,7 @@ llxHeader('', $langs->trans("CashDeskSetup"));
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
 $head = takepos_prepare_head();
-dol_fiche_head($head, 'terminal'.$terminal, 'TakePOS', -1);
+dol_fiche_head($head, 'terminal'.$terminal, 'TakePOS', -1, 'cash-register');
 print '<br>';
 
 

From 0041bca82f3dc0ea8c83eec91ef71fbf02fc87a8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 24 May 2020 23:49:33 +0200
Subject: [PATCH 444/490] Fix ambiguous param

---
 htdocs/install/mysql/migration/repair.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index b21429a4d1b..7546790b151 100644
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -495,8 +495,8 @@ UPDATE llx_accounting_bookkeeping set date_creation = tms where date_creation IS
 UPDATE llx_facturedet SET situation_percent = 100 WHERE situation_percent IS NULL AND fk_prev_id IS NULL;
 
 -- Test inconsistency of data into situation invoices: If it differs, it may be the total_ht that is wrong and situation_percent that is good.
--- select f.rowid, f.type, qty, subprice, situation_percent, total_ht, total_ttc, total_tva, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc, (situation_percent  / 100 * subprice * qty * (1 - (fd.remise_percent / 100)))
--- from llx_facturedet as fd, llx_facture as f where fd.fk_facture = f.rowid AND (total_ht - situation_percent  / 100 * subprice * qty * (1 - (fd.remise_percent / 100))) > 0.01 and f.type = 5;
+-- select f.rowid, f.type, qty, subprice, situation_percent, fd.total_ht, fd.total_ttc, fd.total_tva, fd.multicurrency_total_ht, fd.multicurrency_total_tva, fd.multicurrency_total_ttc, (situation_percent  / 100 * subprice * qty * (1 - (fd.remise_percent / 100)))
+-- from llx_facturedet as fd, llx_facture as f where fd.fk_facture = f.rowid AND (fd.total_ht - situation_percent  / 100 * subprice * qty * (1 - (fd.remise_percent / 100))) > 0.01 and f.type = 5;
 
 
 -- Note to make all deposit as payed when there is already a discount generated from it.

From 47465f4108a541a03f01cc1dc30019177b9968ef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 00:20:00 +0200
Subject: [PATCH 445/490] Fix for situation invoice (exclude credit not when
 searching last invoice to use)

---
 htdocs/compta/facture/card.php        |  4 ++--
 htdocs/core/class/html.form.class.php | 30 +++++++++++++--------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index d7ac591755a..b7cfb8272d1 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3146,10 +3146,10 @@ if ($action == 'create')
 			print '</div></div>';
 
 			// Next situation invoice
-			$opt = $form->selectSituationInvoices(GETPOST('originid'), $socid);
+			$opt = $form->selectSituationInvoices(GETPOST('originid', 'int'), $socid);
 
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-			$tmp = '<input type="radio" name="type" value="5"'.(GETPOST('type') == 5 && GETPOST('originid') ? ' checked' : '');
+			$tmp = '<input type="radio" name="type" value="5"'.(GETPOST('type') == 5 && GETPOST('originid', 'int') ? ' checked' : '');
 			if ($opt == ('<option value ="0" selected>'.$langs->trans('NoSituations').'</option>') || (GETPOST('origin') && GETPOST('origin') != 'facture' && GETPOST('origin') != 'commande'))
 				$tmp .= ' disabled';
 			$tmp .= '> ';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index d7e46922f56..622ffb1d127 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3804,27 +3804,27 @@ class Form
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture';
 		$sql .= ' WHERE entity IN ('.getEntity('invoice').')';
 		$sql .= ' AND situation_counter>=1';
+		$sql .= ' AND fk_soc = '.(int) $socid;
+		$sql .= ' AND type <> 2';
 		$sql .= ' ORDER by situation_cycle_ref, situation_counter desc';
 		$resql = $this->db->query($sql);
+
 		if ($resql && $this->db->num_rows($resql) > 0) {
 			// Last seen cycle
 			$ref = 0;
 			while ($obj = $this->db->fetch_object($resql)) {
-				//Same company ?
-			    if ($socid == $obj->fk_soc) {
-					//Same cycle ?
-			        if ($obj->situation_cycle_ref != $ref) {
-						// Just seen this cycle
-			            $ref = $obj->situation_cycle_ref;
-						//not final ?
-			            if ($obj->situation_final != 1) {
-							//Not prov?
-			                if (substr($obj->ref, 1, 4) != 'PROV') {
-			                    if ($selected == $obj->rowid) {
-			                        $opt .= '<option value="'.$obj->rowid.'" selected>'.$obj->ref.'</option>';
-								} else {
-								    $opt .= '<option value="'.$obj->rowid.'">'.$obj->ref.'</option>';
-								}
+				//Same cycle ?
+		        if ($obj->situation_cycle_ref != $ref) {
+					// Just seen this cycle
+		            $ref = $obj->situation_cycle_ref;
+					//not final ?
+		            if ($obj->situation_final != 1) {
+						//Not prov?
+		                if (substr($obj->ref, 1, 4) != 'PROV') {
+		                    if ($selected == $obj->rowid) {
+		                        $opt .= '<option value="'.$obj->rowid.'" selected>'.$obj->ref.'</option>';
+							} else {
+							    $opt .= '<option value="'.$obj->rowid.'">'.$obj->ref.'</option>';
 							}
 						}
 					}

From 61545703d14c119acdfb6446a8908ae3b16e4aad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 10:58:18 +0200
Subject: [PATCH 446/490] CSS

---
 htdocs/compta/charges/index.php      |  9 ++++++---
 htdocs/theme/eldy/global.inc.php     | 19 +++++++++++++------
 htdocs/theme/eldy/theme_vars.inc.php |  3 ++-
 htdocs/theme/md/style.css.php        |  6 ++++--
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 93065219248..c64797b801c 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -89,6 +89,8 @@ if ($mode == 'sconly') $param = '&mode=sconly';
 if ($sortfield) $param .= '&sortfield='.$sortfield;
 if ($sortorder) $param .= '&sortorder='.$sortorder;
 
+$totalnboflines = 0;
+$num = 0;
 
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -99,14 +101,15 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
+$nav = '';
 if ($mode != 'sconly')
 {
-    $center = ($year ? '<a href="index.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="index.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'object_payment', 0, '', '', $limit, 1);
+    $nav = ($year ? '<a href="index.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="index.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");
+    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 1);
 }
 else
 {
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'object_payment', 0, '', '', $limit, 0);
+    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 0);
 }
 
 if ($year) $param .= '&year='.$year;
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 79bf092c82f..6e0bfd53e68 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -20,6 +20,7 @@
 	--colorbacklinebreak: rgb(<?php print $colorbacklinebreak; ?>);
 	--colorbackbody: rgb(<?php print $colorbackbody; ?>);
 	--colortexttitlenotab: rgb(<?php print $colortexttitlenotab; ?>);
+	--colortexttitlenotab2: rgb(<?php print $colortexttitlenotab2; ?>);
 	--colortexttitle: rgb(<?php print $colortexttitle; ?>);
 	--colortext: rgb(<?php print $colortext; ?>);
 	--colortextlink: rgb(<?php print $colortextlink; ?>);
@@ -31,7 +32,7 @@
 	--tooltipbgcolor: <?php print $toolTipBgColor; ?>;
 	--tooltipfontcolor : <?php print $toolTipFontColor; ?>;
 	--oddevencolor: #202020;
-	--colorboxstatsborder: #ddd;
+	--colorboxstatsborder: #e0e0e0;
 	--dolgraphbg: rgba(255,255,255,0);
 	--fieldrequiredcolor: #000055;
 	--colortextbacktab: #<?php print $colortextbacktab; ?>;
@@ -62,6 +63,7 @@ if (!empty($conf->global->MAIN_THEME_DARKMODEENABLED)) {
 	            --colorbackbody: #1d1e20;
 	            --tooltipbgcolor: #2b2d2f;
 	            --colortexttitlenotab: rgb(220,220,220);
+	            --colortexttitlenotab2: rgb(220,220,220);
 	            --colortexttitle: rgb(220,220,220);
 	            --colortext: rgb(220,220,220);
 	            --colortextlink: #4390dc;
@@ -2688,7 +2690,7 @@ div.tabBar.tabBarNoTop {
 /* tabBar used for creation/update/send forms */
 div.tabBarWithBottom {
 	padding-bottom: 18px;
-	border-bottom: 1px solid #aaa;
+	border-bottom: 1px solid #bbb;
 }
 div.tabBarWithBottom tr {
 	background: unset !important;
@@ -3588,7 +3590,7 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
     background: var(--colorbackbody);
     border: 1px solid var(--colorboxstatsborder);
     border-left: 6px solid var(--colorboxstatsborder);
-    box-shadow: 1px 1px 8px var(--colorboxstatsborder);
+    /* box-shadow: 1px 1px 8px var(--colorboxstatsborder); */
     border-radius: 0px;
 }
 .boxstats, .boxstats130, .boxstatscontent {
@@ -3981,9 +3983,14 @@ div.titre {
 	padding-top: 5px;
     padding-bottom: 5px;
 }
-div.titre, .secondary {
-	font-family: <?php print $fontlist ?>;
-	color: var(--colortexttitlenotab);
+.secondary, div.titre {
+    color: var(--colortexttitlenotab);
+}
+.tertiary {
+	color: var(--colortexttitlenotab2);
+}
+table.table-fiche-title:first-of-type div {
+    color: var(--colortexttitlenotab);
 }
 
 table.table-fiche-title .col-title div.titre{
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index f7ae5b3c320..79b58c5c3ad 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -67,7 +67,8 @@ $colorbacklinepairhover = '230,237,244'; // line hover
 $colorbacklinepairchecked = '230,237,244'; // line checked
 $colorbacklinebreak = '248,247,244'; // line break
 $colorbackbody = '255,255,255';
-$colortexttitlenotab = '0,113,120'; // 150,90,121 140,80,10 or 10,140,80  #875a7b  green=0,113,120, violet: 0,50,120
+$colortexttitlenotab = '0,123,140'; // 150,90,121 140,80,10 or 10,140,80  #875a7b  green=0,113,120, violet: 0,50,120
+$colortexttitlenotab2 = '100,0,100'; // 150,90,121 140,80,10 or 10,140,80  #875a7b  green=0,113,120, violet: 0,50,120
 $colortexttitle = '0,0,0';
 $colortexttitlelink = '10, 20, 100';
 $colortext = '0,0,0';
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index c43fa9cd7d9..f1e2c9257e6 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3921,8 +3921,10 @@ div.titre {
 	/* text-shadow: 1px 1px 2px #FFFFFF; */
 	<?php print (empty($conf->dol_optimize_smallscreen) ? '' : 'margin-top: 4px;'); ?>
 }
-div.titre, .secondary {
-	font-family: <?php print $fontlist ?>;
+.secondary, div.titre {
+	color: var(--colortexttitlenotab);
+}
+.tertiary {
 	color: var(--colortexttitlenotab);
 }
 

From a44f0d24ebfdc411dd6fbcd133413455c5a14c5d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 11:06:16 +0200
Subject: [PATCH 447/490] Fix Popup

---
 .../core/boxes/box_produits_alerte_stock.php  | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index f4a433c013d..dcd95445ddd 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -88,7 +88,9 @@ class box_produits_alerte_stock extends ModeleBoxes
 
 		if (($user->rights->produit->lire || $user->rights->service->lire) && $user->rights->stock->lire)
 		{
-			$sql = "SELECT p.rowid, p.label, p.price, p.ref, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity,";
+			$sql = "SELECT p.rowid, p.label, p.price, p.ref, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.barcode, p.seuil_stock_alerte, p.entity,";
+			$sql .= " p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
+			$sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export,";
 			$sql .= " SUM(".$this->db->ifsql("s.reel IS NULL", "0", "s.reel").") as total_stock";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as s on p.rowid = s.fk_product";
@@ -103,8 +105,10 @@ class box_produits_alerte_stock extends ModeleBoxes
     		    $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
     		    $sql .= $hookmanager->resPrint;
     		}
-		    $sql .= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity";
-			$sql .= " HAVING SUM(".$this->db->ifsql("s.reel IS NULL", "0", "s.reel").") < p.seuil_stock_alerte";
+		    $sql .= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.barcode, p.seuil_stock_alerte, p.entity,";
+		    $sql .= " p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
+		    $sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export";
+		    $sql .= " HAVING SUM(".$this->db->ifsql("s.reel IS NULL", "0", "s.reel").") < p.seuil_stock_alerte";
 			$sql .= $this->db->order('p.seuil_stock_alerte', 'DESC');
 			$sql .= $this->db->plimit($max, 0);
 
@@ -142,6 +146,15 @@ class box_produits_alerte_stock extends ModeleBoxes
                     $productstatic->type = $objp->fk_product_type;
                     $productstatic->label = $objp->label;
 					$productstatic->entity = $objp->entity;
+					$productstatic->barcode = $objp->barcode;
+					$productstatic->status = $objp->tosell;
+					$productstatic->status_buy = $objp->tobuy;
+					$productstatic->accountancy_code_sell = $objp->accountancy_code_sell;
+					$productstatic->accountancy_code_sell_intra = $objp->accountancy_code_sell_intra;
+					$productstatic->accountancy_code_sell_export = $objp->accountancy_code_sell_export;
+					$productstatic->accountancy_code_buy = $objp->accountancy_code_buy;
+					$productstatic->accountancy_code_buy_intra = $objp->accountancy_code_buy_intra;
+					$productstatic->accountancy_code_buy_export = $objp->accountancy_code_buy_export;
 
                     $this->info_box_contents[$line][] = array(
                         'td' => '',

From c67eeeaf6cee16bf972adbf1466e92e40b2ea7c0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 10:58:18 +0200
Subject: [PATCH 448/490] CSS

---
 htdocs/compta/charges/index.php      |  9 ++++++---
 htdocs/theme/eldy/global.inc.php     | 19 +++++++++++++------
 htdocs/theme/eldy/theme_vars.inc.php |  3 ++-
 htdocs/theme/md/style.css.php        |  6 ++++--
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 93065219248..c64797b801c 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -89,6 +89,8 @@ if ($mode == 'sconly') $param = '&mode=sconly';
 if ($sortfield) $param .= '&sortfield='.$sortfield;
 if ($sortorder) $param .= '&sortorder='.$sortorder;
 
+$totalnboflines = 0;
+$num = 0;
 
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -99,14 +101,15 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
+$nav = '';
 if ($mode != 'sconly')
 {
-    $center = ($year ? '<a href="index.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="index.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'object_payment', 0, '', '', $limit, 1);
+    $nav = ($year ? '<a href="index.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="index.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");
+    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 1);
 }
 else
 {
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'object_payment', 0, '', '', $limit, 0);
+    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 0);
 }
 
 if ($year) $param .= '&year='.$year;
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index f907e057be5..569e84496b6 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -20,6 +20,7 @@
 	--colorbacklinebreak: rgb(<?php print $colorbacklinebreak; ?>);
 	--colorbackbody: rgb(<?php print $colorbackbody; ?>);
 	--colortexttitlenotab: rgb(<?php print $colortexttitlenotab; ?>);
+	--colortexttitlenotab2: rgb(<?php print $colortexttitlenotab2; ?>);
 	--colortexttitle: rgb(<?php print $colortexttitle; ?>);
 	--colortext: rgb(<?php print $colortext; ?>);
 	--colortextlink: rgb(<?php print $colortextlink; ?>);
@@ -31,7 +32,7 @@
 	--tooltipbgcolor: <?php print $toolTipBgColor; ?>;
 	--tooltipfontcolor : <?php print $toolTipFontColor; ?>;
 	--oddevencolor: #202020;
-	--colorboxstatsborder: #ddd;
+	--colorboxstatsborder: #e0e0e0;
 	--dolgraphbg: rgba(255,255,255,0);
 	--fieldrequiredcolor: #000055;
 	--colortextbacktab: #<?php print $colortextbacktab; ?>;
@@ -62,6 +63,7 @@ if (!empty($conf->global->MAIN_THEME_DARKMODEENABLED)) {
 	            --colorbackbody: #1d1e20;
 	            --tooltipbgcolor: #2b2d2f;
 	            --colortexttitlenotab: rgb(220,220,220);
+	            --colortexttitlenotab2: rgb(220,220,220);
 	            --colortexttitle: rgb(220,220,220);
 	            --colortext: rgb(220,220,220);
 	            --colortextlink: #4390dc;
@@ -2688,7 +2690,7 @@ div.tabBar.tabBarNoTop {
 /* tabBar used for creation/update/send forms */
 div.tabBarWithBottom {
 	padding-bottom: 18px;
-	border-bottom: 1px solid #aaa;
+	border-bottom: 1px solid #bbb;
 }
 div.tabBarWithBottom tr {
 	background: unset !important;
@@ -3588,7 +3590,7 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
     background: var(--colorbackbody);
     border: 1px solid var(--colorboxstatsborder);
     border-left: 6px solid var(--colorboxstatsborder);
-    box-shadow: 1px 1px 8px var(--colorboxstatsborder);
+    /* box-shadow: 1px 1px 8px var(--colorboxstatsborder); */
     border-radius: 0px;
 }
 .boxstats, .boxstats130, .boxstatscontent {
@@ -3981,9 +3983,14 @@ div.titre {
 	padding-top: 5px;
     padding-bottom: 5px;
 }
-div.titre, .secondary {
-	font-family: <?php print $fontlist ?>;
-	color: var(--colortexttitlenotab);
+.secondary, div.titre {
+    color: var(--colortexttitlenotab);
+}
+.tertiary {
+	color: var(--colortexttitlenotab2);
+}
+table.table-fiche-title:first-of-type div {
+    color: var(--colortexttitlenotab);
 }
 
 table.table-fiche-title .col-title div.titre{
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index f7ae5b3c320..79b58c5c3ad 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -67,7 +67,8 @@ $colorbacklinepairhover = '230,237,244'; // line hover
 $colorbacklinepairchecked = '230,237,244'; // line checked
 $colorbacklinebreak = '248,247,244'; // line break
 $colorbackbody = '255,255,255';
-$colortexttitlenotab = '0,113,120'; // 150,90,121 140,80,10 or 10,140,80  #875a7b  green=0,113,120, violet: 0,50,120
+$colortexttitlenotab = '0,123,140'; // 150,90,121 140,80,10 or 10,140,80  #875a7b  green=0,113,120, violet: 0,50,120
+$colortexttitlenotab2 = '100,0,100'; // 150,90,121 140,80,10 or 10,140,80  #875a7b  green=0,113,120, violet: 0,50,120
 $colortexttitle = '0,0,0';
 $colortexttitlelink = '10, 20, 100';
 $colortext = '0,0,0';
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index c43fa9cd7d9..f1e2c9257e6 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3921,8 +3921,10 @@ div.titre {
 	/* text-shadow: 1px 1px 2px #FFFFFF; */
 	<?php print (empty($conf->dol_optimize_smallscreen) ? '' : 'margin-top: 4px;'); ?>
 }
-div.titre, .secondary {
-	font-family: <?php print $fontlist ?>;
+.secondary, div.titre {
+	color: var(--colortexttitlenotab);
+}
+.tertiary {
 	color: var(--colortexttitlenotab);
 }
 

From 384e1e31add21c8c03d3e528d6cd96fc5ed6afcb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 11:06:16 +0200
Subject: [PATCH 449/490] Fix Popup

---
 .../core/boxes/box_produits_alerte_stock.php  | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index f4a433c013d..dcd95445ddd 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -88,7 +88,9 @@ class box_produits_alerte_stock extends ModeleBoxes
 
 		if (($user->rights->produit->lire || $user->rights->service->lire) && $user->rights->stock->lire)
 		{
-			$sql = "SELECT p.rowid, p.label, p.price, p.ref, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity,";
+			$sql = "SELECT p.rowid, p.label, p.price, p.ref, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.barcode, p.seuil_stock_alerte, p.entity,";
+			$sql .= " p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
+			$sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export,";
 			$sql .= " SUM(".$this->db->ifsql("s.reel IS NULL", "0", "s.reel").") as total_stock";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as s on p.rowid = s.fk_product";
@@ -103,8 +105,10 @@ class box_produits_alerte_stock extends ModeleBoxes
     		    $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
     		    $sql .= $hookmanager->resPrint;
     		}
-		    $sql .= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity";
-			$sql .= " HAVING SUM(".$this->db->ifsql("s.reel IS NULL", "0", "s.reel").") < p.seuil_stock_alerte";
+		    $sql .= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.barcode, p.seuil_stock_alerte, p.entity,";
+		    $sql .= " p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
+		    $sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export";
+		    $sql .= " HAVING SUM(".$this->db->ifsql("s.reel IS NULL", "0", "s.reel").") < p.seuil_stock_alerte";
 			$sql .= $this->db->order('p.seuil_stock_alerte', 'DESC');
 			$sql .= $this->db->plimit($max, 0);
 
@@ -142,6 +146,15 @@ class box_produits_alerte_stock extends ModeleBoxes
                     $productstatic->type = $objp->fk_product_type;
                     $productstatic->label = $objp->label;
 					$productstatic->entity = $objp->entity;
+					$productstatic->barcode = $objp->barcode;
+					$productstatic->status = $objp->tosell;
+					$productstatic->status_buy = $objp->tobuy;
+					$productstatic->accountancy_code_sell = $objp->accountancy_code_sell;
+					$productstatic->accountancy_code_sell_intra = $objp->accountancy_code_sell_intra;
+					$productstatic->accountancy_code_sell_export = $objp->accountancy_code_sell_export;
+					$productstatic->accountancy_code_buy = $objp->accountancy_code_buy;
+					$productstatic->accountancy_code_buy_intra = $objp->accountancy_code_buy_intra;
+					$productstatic->accountancy_code_buy_export = $objp->accountancy_code_buy_export;
 
                     $this->info_box_contents[$line][] = array(
                         'td' => '',

From 962d795740026942063abd64345a04cc6d19d89b Mon Sep 17 00:00:00 2001
From: laurantines <lauriiika@gmail.com>
Date: Mon, 25 May 2020 12:26:05 +0200
Subject: [PATCH 450/490] Update list.php

Search by d,phone, d.phone_perso, d.phone_mobile in SELECT QUERY
---
 htdocs/adherents/list.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 6cb34192845..bf8353da5c9 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -301,6 +301,9 @@ if ($search_email) $sql .= natural_search("d.email", $search_email);
 if ($search_town)     $sql .= natural_search("d.town", $search_town);
 if ($search_zip)      $sql .= natural_search("d.zip", $search_zip);
 if ($search_state)    $sql .= natural_search("state.nom", $search_state);
+if ($search_phone)      $sql .= natural_search("d.phone", $search_phone);
+if ($search_phone_perso)      $sql .= natural_search("d.phone_perso", $search_phone_perso);
+if ($search_phone_mobile)      $sql .= natural_search("d.phone_mobile", $search_phone_mobile);
 if ($search_country) $sql .= " AND d.country IN (".$search_country.')';
 if ($filter == 'uptodate') $sql .= " AND (datefin >= '".$db->idate($now)."' OR t.subscription = 0)";
 if ($filter == 'outofdate') $sql .= " AND ((datefin IS NULL OR datefin < '".$db->idate($now)."') AND t.subscription = 1)";

From 9e77dc0a261aa06ec63b7427f3f9d990728fde6e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 12:50:29 +0200
Subject: [PATCH 451/490] CSS

---
 htdocs/admin/modules.php             | 4 ++--
 htdocs/core/lib/security2.lib.php    | 2 +-
 htdocs/main.inc.php                  | 2 +-
 htdocs/theme/eldy/manifest.json.php  | 2 +-
 htdocs/theme/eldy/theme_vars.inc.php | 4 ++--
 htdocs/theme/md/manifest.json.php    | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index c0f1991835b..ab2889368cd 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -1198,7 +1198,7 @@ if ($mode == 'develop')
 	print '<tr class="oddeven" height="80">'."\n";
 	print '<td class="left">';
 	//span class="fa fa-bug"></span>
-	//print '<img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner_int.png">';
+	//print '<img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner.png">';
 	print '<div class="imgmaxheight50 logo_setup"></div>';
 	print '</td>';
 	print '<td>'.$langs->trans("TryToUseTheModuleBuilder", $langs->transnoentitiesnoconv("ModuleBuilder")).'</td>';
@@ -1208,7 +1208,7 @@ if ($mode == 'develop')
 	print '<tr class="oddeven" height="80">'."\n";
 	$url = 'https://partners.dolibarr.org';
 	print '<td class="left">';
-	print'<a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner_int.png"></a>';
+	print'<a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner.png"></a>';
 	print '</td>';
 	print '<td>'.$langs->trans("DoliPartnersDesc").'</td>';
 	print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index c7f5a7b7330..ce346c0d26e 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -279,7 +279,7 @@ if (!function_exists('dol_loginfunction'))
 		// Set jquery theme
 		$dol_loginmesg = (!empty($_SESSION["dol_loginmesg"]) ? $_SESSION["dol_loginmesg"] : '');
 
-		$favicon = DOL_URL_ROOT.'/theme/dolibarr_logo_256x256.png';
+		$favicon = DOL_URL_ROOT.'/theme/dolibarr_256x256_color.png';
 		if (!empty($mysoc->logo_squarred_mini)) $favicon = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
 		if (!empty($conf->global->MAIN_FAVICON_URL)) $favicon = $conf->global->MAIN_FAVICON_URL;
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 48c9c0bc96c..0bc25d0c096 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1209,7 +1209,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		print '<meta name="author" content="Dolibarr Development Team">'."\n";
 
 		// Favicon
-		$favicon = DOL_URL_ROOT.'/theme/dolibarr_logo_256x256.png';
+		$favicon = DOL_URL_ROOT.'/theme/dolibarr_256x256_color.png';
 		if (!empty($mysoc->logo_squarred_mini)) $favicon = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
 		if (!empty($conf->global->MAIN_FAVICON_URL)) $favicon = $conf->global->MAIN_FAVICON_URL;
 		if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n"; // Not required into an Android webview
diff --git a/htdocs/theme/eldy/manifest.json.php b/htdocs/theme/eldy/manifest.json.php
index a4fc5c3618e..bc6262d1a92 100644
--- a/htdocs/theme/eldy/manifest.json.php
+++ b/htdocs/theme/eldy/manifest.json.php
@@ -46,7 +46,7 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli = $conf->global->MAIN_
     "name": "<?php echo $appli; ?>",
     "icons": [
         {
-            "src": "<?php echo DOL_URL_ROOT.'/theme/dolibarr_logo_256x256.png'; ?>",
+            "src": "<?php echo DOL_URL_ROOT.'/theme/dolibarr_256x256_color.png'; ?>",
             "sizes": "256x256",
             "type": "image/png"
         }
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 79b58c5c3ad..fdbd23f1a3a 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -53,7 +53,7 @@ $theme_bgcolor = array(hexdec('F4'), hexdec('F4'), hexdec('F4'));
 $theme_bgcoloronglet = array(hexdec('DE'), hexdec('E7'), hexdec('EC'));
 
 // Colors
-$colorbackhmenu1 = '55,61,90'; // topmenu
+$colorbackhmenu1 = '38,60,92'; // topmenu
 $colorbackvmenu1 = '250,250,250'; // vmenu
 $colortopbordertitle1 = '215,215,215'; // top border of title
 $colorbacktitle1 = '233,234,237'; // title of tables,list
@@ -75,7 +75,7 @@ $colortext = '0,0,0';
 $colortextlink = '10, 20, 100';
 $fontsize = '0.86em';
 $fontsizesmaller = '0.75em';
-$topMenuFontSize = '1.2em';
+$topMenuFontSize = '1.1em';
 $toolTipBgColor = 'rgba(255, 255, 255, 0.96)';
 $toolTipFontColor = '#333';
 
diff --git a/htdocs/theme/md/manifest.json.php b/htdocs/theme/md/manifest.json.php
index f8d059752a6..e3423149e30 100644
--- a/htdocs/theme/md/manifest.json.php
+++ b/htdocs/theme/md/manifest.json.php
@@ -46,7 +46,7 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_AP
     "name": "<?php echo $appli; ?>",
     "icons": [
         {
-            "src": "<?php echo DOL_URL_ROOT.'/theme/dolibarr_logo_256x256.png'; ?>",
+            "src": "<?php echo DOL_URL_ROOT.'/theme/dolibarr_256x256_color.png'; ?>",
             "sizes": "256x256",
             "type": "image/png"
         }

From 0dbb8224fb79e897f69b4944dcf7569bf20f22bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 12:50:54 +0200
Subject: [PATCH 452/490] Fix logo

---
 htdocs/theme/dolibarr_256x256_color.png       | Bin 0 -> 5078 bytes
 htdocs/theme/dolibarr_logo.jpg                | Bin 0 -> 18776 bytes
 htdocs/theme/dolibarr_logo.png                | Bin 14082 -> 14133 bytes
 htdocs/theme/dolibarr_logo.svg                | 258 +-----------------
 htdocs/theme/dolibarr_logo_256x256.png        | Bin 3525 -> 0 bytes
 htdocs/theme/dolibarr_logo_squarred.png       | Bin 6959 -> 0 bytes
 htdocs/theme/dolibarr_logo_squarred_alpha.png | Bin 7844 -> 0 bytes
 htdocs/theme/dolibarr_preferred_partner.png   | Bin 0 -> 12136 bytes
 .../theme/dolibarr_preferred_partner_int.png  | Bin 6719 -> 0 bytes
 htdocs/theme/dolistore_logo.jpg               | Bin 0 -> 14843 bytes
 htdocs/theme/dolistore_logo.png               | Bin 10077 -> 13413 bytes
 htdocs/theme/dolistore_logo.svg               | 146 ++++++++++
 htdocs/theme/eldy/thumb.png                   | Bin 11825 -> 10818 bytes
 13 files changed, 160 insertions(+), 244 deletions(-)
 create mode 100644 htdocs/theme/dolibarr_256x256_color.png
 create mode 100644 htdocs/theme/dolibarr_logo.jpg
 mode change 100644 => 100755 htdocs/theme/dolibarr_logo.png
 delete mode 100644 htdocs/theme/dolibarr_logo_256x256.png
 delete mode 100644 htdocs/theme/dolibarr_logo_squarred.png
 delete mode 100644 htdocs/theme/dolibarr_logo_squarred_alpha.png
 create mode 100755 htdocs/theme/dolibarr_preferred_partner.png
 delete mode 100644 htdocs/theme/dolibarr_preferred_partner_int.png
 create mode 100644 htdocs/theme/dolistore_logo.jpg
 create mode 100755 htdocs/theme/dolistore_logo.svg

diff --git a/htdocs/theme/dolibarr_256x256_color.png b/htdocs/theme/dolibarr_256x256_color.png
new file mode 100644
index 0000000000000000000000000000000000000000..417387d6a27ce85f3ba64399804845b63da235c8
GIT binary patch
literal 5078
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
O$Uw&g{ani_?*9P%E)P@y

literal 0
HcmV?d00001

diff --git a/htdocs/theme/dolibarr_logo.jpg b/htdocs/theme/dolibarr_logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a4a0611067d1c58945f76c097b0b3e4bd3311426
GIT binary patch
literal 18776
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
C&ZV0G

literal 0
HcmV?d00001

diff --git a/htdocs/theme/dolibarr_logo.png b/htdocs/theme/dolibarr_logo.png
old mode 100644
new mode 100755
index c15f03c821baf1e72192ebaee9c73477f5668810..9a0781ce2ea7820d09f3b00131a313120e804e8a
GIT binary patch
delta 13797
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
Z3`AxHd2(4#5yQbgin6LQRZ?F9{|`Xtl>z_&

delta 13740
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
Pfj(rVlq9RgO}_mPO+EXa

diff --git a/htdocs/theme/dolibarr_logo.svg b/htdocs/theme/dolibarr_logo.svg
index 44f6c07ece5..9c9259d0b33 100644
--- a/htdocs/theme/dolibarr_logo.svg
+++ b/htdocs/theme/dolibarr_logo.svg
@@ -23,94 +23,6 @@
      id="title3072">Logo Dolibarr ERP-CRM</title>
   <defs
      id="defs3452">
-    <linearGradient
-       id="linearGradient888">
-      <stop
-         style="stop-color:#373d5f;stop-opacity:1"
-         offset="0"
-         id="stop884" />
-      <stop
-         style="stop-color:#373d5a;stop-opacity:1"
-         offset="1"
-         id="stop886" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5378">
-      <stop
-         id="stop5374"
-         offset="0"
-         style="stop-color:#373d5f;stop-opacity:1" />
-      <stop
-         id="stop5376"
-         offset="1"
-         style="stop-color:#373d5a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5372">
-      <stop
-         id="stop5368"
-         offset="0"
-         style="stop-color:#373d5f;stop-opacity:1" />
-      <stop
-         id="stop5370"
-         offset="1"
-         style="stop-color:#373d5a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5366">
-      <stop
-         id="stop5362"
-         offset="0"
-         style="stop-color:#373d5f;stop-opacity:1" />
-      <stop
-         id="stop5364"
-         offset="1"
-         style="stop-color:#373d5a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5360">
-      <stop
-         id="stop5356"
-         offset="0"
-         style="stop-color:#373d5f;stop-opacity:1" />
-      <stop
-         id="stop5358"
-         offset="1"
-         style="stop-color:#373d5a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4730">
-      <stop
-         id="stop4726"
-         offset="0"
-         style="stop-color:#373d5f;stop-opacity:1" />
-      <stop
-         id="stop4728"
-         offset="1"
-         style="stop-color:#373d5a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="5360">
-      <stop
-         id="stop4720"
-         offset="0"
-         style="stop-color:#373d5f;stop-opacity:1" />
-      <stop
-         id="stop4722"
-         offset="1"
-         style="stop-color:#373d5a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4718">
-      <stop
-         id="stop4714"
-         offset="0"
-         style="stop-color:#373d55;stop-opacity:1" />
-      <stop
-         id="stop4716"
-         offset="1"
-         style="stop-color:#373d5a;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        id="linearGradient3734-3-6">
       <stop
@@ -122,23 +34,6 @@
          offset="1"
          id="stop3738" />
     </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter3775"
-       style="color-interpolation-filters:sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="11.473048"
-         id="feGaussianBlur3777" />
-    </filter>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath922">
-      <g
-         style="fill:url(#linearGradient884);fill-opacity:1"
-         inkscape:label="Clip"
-         id="use924" />
-    </clipPath>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3734-3-6"
@@ -148,92 +43,6 @@
        y1="310.53391"
        x2="742.98004"
        y2="310.53391" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient888"
-       id="linearGradient4650"
-       gradientUnits="userSpaceOnUse"
-       x1="385.41022"
-       y1="210.12474"
-       x2="386.59824"
-       y2="386.90143"
-       gradientTransform="translate(0,-0.08891)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4718"
-       id="linearGradient4652"
-       gradientUnits="userSpaceOnUse"
-       x1="385.41022"
-       y1="210.12474"
-       x2="386.59824"
-       y2="386.90143"
-       gradientTransform="translate(0,-1.60543)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4730"
-       id="linearGradient4654"
-       gradientUnits="userSpaceOnUse"
-       x1="385.41022"
-       y1="210.12474"
-       x2="386.59824"
-       y2="386.90143" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5360"
-       id="linearGradient4658"
-       gradientUnits="userSpaceOnUse"
-       x1="385.41022"
-       y1="210.12474"
-       x2="386.59824"
-       y2="386.90143"
-       gradientTransform="translate(0,-1.0682839)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5366"
-       id="linearGradient4660"
-       gradientUnits="userSpaceOnUse"
-       x1="385.41022"
-       y1="210.12474"
-       x2="386.59824"
-       y2="386.90143" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5372"
-       id="linearGradient4662"
-       gradientUnits="userSpaceOnUse"
-       x1="385.41022"
-       y1="210.12474"
-       x2="386.59824"
-       y2="386.90143" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5378"
-       id="linearGradient4664"
-       gradientUnits="userSpaceOnUse"
-       x1="385.41022"
-       y1="210.12474"
-       x2="386.59824"
-       y2="386.90143" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath880">
-      <g
-         inkscape:label="Clip"
-         id="use882">
-        <text
-           transform="matrix(0.35661275,0,0,0.39656343,-125.67134,110.19296)"
-           id="text889"
-           y="887.85065"
-           x="537.1402"
-           style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Bitstream Vera Sans';opacity:0.17204303;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3775)"
-           xml:space="preserve"><tspan
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:518.16009521px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             y="887.85065"
-             x="537.1402"
-             id="tspan887"
-             sodipodi:role="line">Dolibarr</tspan></text>
-      </g>
-    </clipPath>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3734-3-6"
@@ -243,45 +52,6 @@
        y1="310.53391"
        x2="742.98004"
        y2="310.53391" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath923">
-      <g
-         inkscape:label="Clip"
-         id="use925">
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Bitstream Vera Sans';opacity:0.17204303;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3775)"
-           x="537.1402"
-           y="887.85065"
-           id="text932"
-           transform="matrix(0.35661275,0,0,0.39656343,-121.4287,154.03358)"><tspan
-             sodipodi:role="line"
-             id="tspan930"
-             x="537.1402"
-             y="887.85065"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:518.16009521px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none">Dolibarr</tspan></text>
-      </g>
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3734-3-6"
-       id="linearGradient884"
-       gradientUnits="userSpaceOnUse"
-       x1="75.697441"
-       y1="310.53391"
-       x2="742.98004"
-       y2="310.53391" />
-    <linearGradient
-       gradientTransform="matrix(1,0,0,0.74259216,53.441098,97.405596)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient888"
-       id="linearGradient4654-3"
-       gradientUnits="userSpaceOnUse"
-       x1="385.41022"
-       y1="210.12474"
-       x2="386.59824"
-       y2="386.90143" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -290,9 +60,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.6568544"
-     inkscape:cx="318.01609"
-     inkscape:cy="106.45631"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="391.6782"
+     inkscape:cy="-50.366015"
      inkscape:current-layer="g4648"
      inkscape:document-units="px"
      showgrid="false"
@@ -369,48 +139,48 @@
           <path
              sodipodi:nodetypes="cccccscsssccsssc"
              d="m 112.32913,280.29476 v 98.02589 l -36.631688,-0.40123 v 0.40123 -137.35672 h 47.729468 c 20.93239,0 37.32341,5.28424 49.17307,15.85272 14.07523,12.64204 21.11285,29.7991 21.11285,51.47117 0,20.73563 -6.01506,37.65857 -18.04517,50.76884 -12.03011,13.11027 -27.20637,19.35291 -46.1538,19.35291 -2.22557,0 -6.23968,-0.0713 -11.22982,-0.0888 v -40.23379 l 10.08954,-0.0542 c 21.35314,-0.11469 27.8053,-9.87885 27.8053,-29.74492 0,-18.66206 -10.49627,-27.99309 -31.48881,-27.99309 z"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient4650);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#263c5c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
              id="path8463"
              inkscape:connector-curvature="0" />
           <path
              d="m 251.18669,274.26322 q 19.12787,0 32.75197,15.35106 13.71432,15.25071 13.71432,36.62179 0,21.67206 -13.89478,36.92279 -13.80455,15.25071 -33.38356,15.25071 -19.57899,0 -33.47377,-15.25071 -13.89479,-15.35105 -13.89479,-36.92279 0,-21.97308 13.89479,-36.9228 13.89478,-15.05005 34.28582,-15.05005 z m -0.90227,37.02313 q -5.41355,0 -9.20303,4.41468 -3.78949,4.31435 -3.78949,10.63537 0,6.22068 3.78949,10.63537 3.87971,4.41468 9.20303,4.41468 5.41356,0 9.20304,-4.41468 3.8797,-4.41469 3.8797,-10.63537 0,-6.32102 -3.78947,-10.63537 -3.78949,-4.41468 -9.29327,-4.41468 z"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient4652);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#263c5c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
              id="path8465"
              inkscape:connector-curvature="0" />
           <path
              sodipodi:nodetypes="ccccc"
              d="M 345.47268,241.05287 V 378.40956 H 311.72822 V 241.05287 Z"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient4654);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#263c5c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
              id="path8467"
              inkscape:connector-curvature="0" />
           <path
              sodipodi:nodetypes="csscscsccscsssccscc"
              d="m 450.676,239.98458 v 81.97261 c 0,13.31093 4.30076,19.9664 12.90229,19.9664 3.66918,0 6.76693,-1.37123 9.29326,-4.11368 2.58647,-2.80935 3.87971,-6.18725 3.87971,-10.1337 0,-4.08023 -1.20301,-7.49158 -3.60903,-10.23403 -2.40603,-2.80935 -5.3534,-4.21402 -8.84213,-4.21402 -2.46617,0 -8.23123,-0.013 -8.23123,-0.013 l -0.25,-38.08747 c 0,0 6.97747,-0.22701 9.02258,-0.22701 12.69177,0 23.54895,5.08358 32.57153,15.25073 9.08273,10.16714 13.6241,22.40785 13.6241,36.72212 0,14.64872 -5.14562,26.5166 -13.80455,37.02313 -8.57803,10.40836 -22.98621,14.59993 -33.92491,14.51154 -6.73664,-0.0544 -13.32335,-1.10024 -19.75947,-4.37784 -6.37595,-3.27757 -11.63912,-7.69225 -15.78951,-13.24404 -7.21807,-9.63203 -10.8271,-22.10686 -10.8271,-37.42447 v -83.37728 z"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient4658);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#263c5c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
              id="path8471"
              inkscape:connector-curvature="0" />
           <path
              sodipodi:nodetypes="ccssscscsccscscscscc"
              d="m 575.66649,342.98354 -0.15625,35.42602 c 0,0 -5.0745,0 -7.36022,0 -13.53387,0 -24.8121,-3.24403 -33.83468,-13.14362 -9.02259,-9.89959 -13.53388,-22.30753 -13.53388,-37.2238 0,-14.51494 4.54137,-26.82254 13.6241,-36.92279 9.14289,-10.10026 20.24066,-15.15039 33.29333,-15.15039 14.55643,0 26.01511,4.74913 34.37604,14.24739 8.42108,9.43136 12.63162,22.34096 12.63162,38.72879 l -0.0625,49.46442 h -33.80696 l 0.125,-46.75541 c 0.0141,-5.28421 -1.17293,-9.49824 -3.5188,-12.64203 -2.28573,-3.14379 -5.38348,-4.71569 -9.29327,-4.71569 -3.54889,0 -6.61657,1.43811 -9.20304,4.31434 -2.58647,2.87623 -3.87971,6.28758 -3.87971,10.23405 0,4.14712 1.17294,7.55846 3.51881,10.23403 2.34587,2.67556 5.32333,4.01334 8.93236,4.01334 2.94737,0 8.14805,-0.10867 8.14805,-0.10867 z"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient4660);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#263c5c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
              id="path8473"
              inkscape:connector-curvature="0" />
           <path
              sodipodi:nodetypes="ccssccscsc"
              d="m 683.66305,275.87667 0.004,38.91662 c 0,0 -4.41872,0.10517 -6.34353,0.10517 -6.13535,0 -9.20303,5.21735 -9.20303,15.65204 v 47.85906 h -33.74447 v -55.08308 c 0,-14.44805 3.54888,-25.95298 10.64665,-34.51479 7.09777,-8.62869 16.57148,-12.94304 28.42114,-12.94304 2.64662,0 10.21945,0.008 10.21945,0.008 z"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient4662);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#263c5c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
              id="path8475"
              inkscape:connector-curvature="0" />
           <path
              sodipodi:nodetypes="ccssccscscc"
              d="m 742.97999,275.87857 -0.0312,38.94597 c 0,0 -4.51247,0.0739 -6.43728,0.0739 -6.13537,0 -9.20305,5.21735 -9.20305,15.65204 v 47.85906 h -33.74445 v -55.08308 c 0,-14.44805 3.54888,-25.95298 10.64664,-34.51479 7.09777,-8.62869 16.57149,-12.94304 28.42114,-12.94304 2.64663,0 10.34825,0.01 10.34825,0.01 z"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient4664);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#263c5c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
              id="path8477"
              inkscape:connector-curvature="0" />
           <path
              sodipodi:nodetypes="ccccc"
              d="m 398.91378,276.40957 v 102 h -33.74446 v -102 z"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:url(#linearGradient4654-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.47124052;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#263c5c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.47124052;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
              id="path8467-5"
              inkscape:connector-curvature="0" />
         </g>
@@ -418,18 +188,18 @@
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#007179;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#007b8c;fill-opacity:1;fill-rule:nonzero;stroke:none;"
        x="643.31146"
        y="229.77211"
        id="text5484"
        transform="scale(0.88533213,1.1295196)"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42.95219803px;line-height:100%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#007179;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42.95219803px;line-height:100%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#007b8c;fill-opacity:1;fill-rule:nonzero;stroke:none;"
          sodipodi:role="line"
          id="tspan5486"
          x="643.31146"
          y="229.77211">ERP/CRM</tspan></text>
     <ellipse
-       style="fill:#007179;fill-opacity:1;stroke:none;stroke-width:1.02999127;stroke-opacity:1"
+       style="fill:#007b8c;fill-opacity:1;stroke:none;stroke-width:1.02999127;stroke-opacity:1"
        id="path957"
        cx="381.94193"
        cy="247.58162"
diff --git a/htdocs/theme/dolibarr_logo_256x256.png b/htdocs/theme/dolibarr_logo_256x256.png
deleted file mode 100644
index 3c3c61008adfc9caec9aeee2ce0b9ffd8a9e7257..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3525
zcmV;$4Lb6PP)<h;3K|Lk000e1NJLTq00961009690ssI2(-1!~000e)Nkl<ZcmeF%
z0S$ma3<JPICJj?)LS(T4*`0@G>;8}Hega!f(!f^J2G%+Qn+O0104TvQY1V>i{ta{h
z5CBku!2|$TAaDf&D-bBbU;=;=3?={w08G<>2>=2Bu0UV{fR|wK84j#KAOPSB1WGVi
zfxs0AOaM@VK?w#c5C{MW062rfXH6;sSb;zQKmb4hc-gxL=t!0>4&Zkfdl@@x+xD|<
z+qP}5&BwKEZ|uy(&LlG#_gByM)ca~u|KI7e=A6EL>sH^Y`o9BgjFlE0F}!;;c`b!q
zisE#++2wM7{SAlH)oOQI?apt%G+P}ev#rTubGsD+^aA}l0Ir(co7y@>A+y!qXtp&r
zTWgvu?5Z_cY8x%(buGpklgVNu;6^p#&UqxN(}$+scm5EP8w&sy28L==VR=J-c|$>Y
zLqm&|JOs1^Vhi^7=^odfUG%;B=GGizU8bQnv!pi5P}^*=6CeQO5gz0>v|BX0z8yXp
zYMKt`R2<H&IF?_<hEnu5VF)x=>><!lg1?4U(kw0P%`omtHx^em68r_K;dcle0K-!6
z|3?7;rM1nwPZ>5IDatLaBfxtA*+jPsx^Qgw+4s&^_|Tb`Pwd$#JdgkZAffn<A=gju
zxBRiQU%7t#ux`<6m5KlXARBhyv!eOs>&Gv9?Cguj^$76Q5s1Gg*yH~;=o}t+^XdJs
znAGcwy*bNwWY#uWkO4qCECaASu;TG^?>To!M6e%PA!JMdpwp<&8qsCypyZW1vleYR
zCF2V<EQthPz4p=xJ=u)&N2`y1xi{CXC>R2Pj13p;o#V`VW^{{dFKH1BkQNj1@m<rG
z@5uOQ^%0xHC0zypP^svGG2Q3ge`fdi_L3ICD1srTL-2=pOrN{q#GDPs-EKv?3;>{3
ztFE5f=bhW8v=8x@bQTB+0Qw|#n)~1xPt4tMD5o4nFhW2^p#i?H-!$>{mHR*2oh{=K
z2tcD&-*^77JI)@gR;eTn001^S^x}2n^*Rk^fg}YZdc?kY)8zX;+GMsmkO5=_eUdx9
zd;7G|KwoT(B`>@%{@~7OH@&sCp}7?qKt>SPG4$<QrUd!>NE!eD$x-2N-aOggM<;0j
z0I=54S8kZ7(`rb3=mi2E`lWP!<l>P}&fAVR!IDM*Odgn2TGKRh?NRgsNqYOkHPiYT
zYD^mr<)a3W6g+g%h=fj|@&*84ZSiy0jAvh>2$mEib`HDeykXBR+=(I>Re+>U8=AT=
z!?5*Ok)%T)fcq{O&N_u84FG_!AisOhAC75Ic?Uo+p?~70BL&+}6e9yj3hp|0sE<zT
z6|+DJQUG`yJCftFiM?j7If4uzDY$%6Zx#lU1^@sX0^M}_AbA4-VA8-OwsZ!wK=Q)T
zOjk|q`^4OB^pBtjMtFL?$peyEDQv86l5_|J*kkmviM<8R0DlMAovu$-AEv)at5NH;
zny)X7TCdfxwdCQ!eym?0JjgF3z?a=3)TT`tl=9AJ2bwK51c29bI9>BL9QW)4vU7M)
zbo=0#4k6L)f>WX+x+ipCE6v+jr}XK=(iUw#i2#6Ka=VqXS`)htWR?C95-Cv;y%Ib2
zPm3JVEv9V*!?~loFWGWRzyrus18)3)M0M7PZVz8FibP_z+Q-~AoBk_oywpE6a#XMQ
z3H_72eKWRO-(Jmv91CLp1~h2c9j<*DMs~fiV(++qiR?MrJE;?Sr)h&z4`h~N7U&;B
z@xA_F-nFlMe);pO_GcQ&3ytlQ=;xzF0KmVJWvIFB?KQW&wK~UGOJ0TD{VWC$03HAb
zvq~?2Vbw=p9dfzd<ULp=Lmq)O!T49X-O9{0huH$$XRetL(>{c}!N4w2dYzgTHpl>;
z0U5>BSH8IFL_wvuyb$Q08YNgW91?(+Hz+l=*lv2`%jd3{IJR#B32#KtxV`BHWB~B+
zZ0Q3ZZ`gUVn1sh(?V$!h4Zx)&c=(fzAK!CkxA+buu-FbEtPiT*WI+b-FtFO4cfPl_
zrqL|^;oBGj0T=Aa`of|e!XLBO8Lbd#h2Ul9iQ;t!a;FYXB~kTa89>33NK^payt-`n
z=-vtbzB*A47mHA-RJ=MvF$99f7VENYr$l}m5Y;{yvp^UFakOCLu?xob6gCN@M28!z
z8<7EkmnO6Ii#?enDmDtjED-R;N?{Te|K=qelgf$WHDkt%qH05RV{C^|A$JZ9A_cQR
zm<8f&<DvX(rw<S@03w1E6u}4q-VSA#iWvYM!vfSQ;yV+H8URieRytj75|2i$jtKEb
z5e(eBgEEV&Nl5?2CKm_*$StiUA%z6+4*;AHgDrc@YfYjCfDfSt0NyI<nneu&KTLz7
z5rVt&Iui*gz)!DWZ&2XBV%SPT(rYy+f`L1W%^_$2=rkyTu`L957OS0vq}8aof07si
zL95k)ArOW@@=~c(BqT*qFbjlEAnyD`T@&MUxfNsp;LXoR+yKB4Nx+?-UW)+0Il<!p
zt9W)C2+8hnq7?$T>l_hGLNZxwm<0mvBHINEyKG<TSs?TRApkH71l+}U3KPFc2}Lj$
zD1y~$RgZ*@B&50~Gm2o~D>bIQnC}7HZl%s-K@kl6HzF5OO_Q0$00IDbAIKF?LaJ_P
z!REN=2I4C?z;|emI8hgBnuyR0hn*358s9(p>z;cd6<0PW*c%iHfU6lpyOOAiD;hX{
zjHm&iM`EV|U7|@;MHThL4*~$LnLbeD_b4m_pa|v#W1ys{h;jXrNmRz_2D8<M3;<lH
zRP^ZO<Jp(O$|$NLPB06E=l@wFd-P9>CV{0FS1C9r7!kljhp@oAFBnB)%P6ek@)=?X
zgyp~Q-g)NNyDkgN=5VGLR+48S06?u$y?DdauJIj6Y{&D;SqzW|p%nuEDt7ljcIEhS
z{gX*}`!ful`~Z;wK%-GVcm33J$Mhm^a3HgUM54ud7_VLr6X2_V{)VZn?T5TUy~&bZ
zSml`y5c>i__k@nG+&m+;V<>rv?Z*l{a55xn0Q{@88ujH<2Hbw`2=)!~9$Sy*|JzRw
z834xjPhpe&ah<}*tF+o2`_lhK0e}ENkHd(b3D=!Iq+e<jd7;gR^Zv;MC;|ZdeRXGy
z=yA!Ue*E`1;pp>S>Gap36#^wdpr3wp-=v8HQ%CfQ_topjo0Zp^4rUri5ibCgzx|KG
z{jYGH*6f`e*(W8kUt08lv}m1HLv6wryV8F-|AQeAu-iSVeMmy*@WiNy#K?%`sEDMf
zb{e&c+7_qFy?omV;s604(1}-fUpSh63%jB9TCGm2W{-1rv70_D*grhTkA2C07fE2_
z!5j|zpdbJQJM{Ci$^8j_%YqF@NK|S9;M@LLcCw&?M1pgIIWz<P&c_HJe70AB565#$
zB0>4fKM3iC6}wIr5hLLc2;hD8_-7;x0Dz-8rL6rE0RWP&ns{O1R{D2vOsbeKf)x}2
zf1&f|R7PP1F|uU<fR<L<o6B~R_^>e+W`THked&(s#uj2^%K!k!a?6%(IYx|Z0RZ4|
zx*nUko_}45HNip-g5Zs1I||Bbh(F;L#NhsiJtvFiu02Q!F>(!o0P0MZ2R>M>D8$GW
z001txa{qf@etq~mf0zcv2uQ@C|DIFDBsvtq2mub(AIP5h)jsk(6v60+7G73K)k7bw
z7XH7F8UQ#bt7*Fa#pSIw2a#j}0MOLZdfki5YWTN2AOJwbjXrODWo2P`9r1&WvB-Ni
z#$rDx)!l#nOUsVt8cB4>0Knnyzu}eT2eS;s9cF<r3o00k)qc|}D-UFp5C=kM0D#8k
z)+?S}yg#Fu7^wmPpt8RC;wKlJ%r7UQ;Y~2cKpf;4s&9B{Sw)?Rgoa)q-2NPFIg)$N
zJ72KTKk+Bl=C}Z#e7WznCENIK?T=X?!5{@RTWpVhv}WD@EaDGEFbKD&=a~=A<bU_0
z2u2DJj9XFWtvUGWlC2J>i^PQ*05~YAtbg!>ua0CJi37|6;rTE0gMY!gL$58}CU$Q#
zS|Jbt9Gu82dt&CgjG{`C3Wh+?&}?~i@wOFPk0}aC1aE?o0?e)U*{k=ni)~~}@<0Xv
ztKGR|(~%E8-OV2VBo71tG?}f7)*qU;?qI#iLLgNDV19GahQrIY9Q#E}4`_uxAO@$T
z{yR>Wd-I{3#T$?8OD~e8%taB5B3M!AXpZr#J?ZQAWq!R~A;>TU0+-9p?t9j~ymoJ9
zd2JJc3;_V8HH`-|O12-%+kK+YWVRBt`2fHvENqDuTb+0~tK?9YL8OIRXoWyC5Qp2{
zSlw7sQO{;_at+n2QJH<os$22|P$i!8B>iik(`s%!YlNSVj$Qt~`mewA(fj+d?|%KI
zUdyPp8jW77`Su%bx7*=zJDo0eE887Tw)&*mVl|n+zStyvRYP-Cor!%}S!ZIG%dL>d
z{jXg+FaaQjK>#R^`>*V;QOMm6l9(0&fG;2baE<^#v*jx20#+ap01yE19r|_PFA!LP
zz!?-w08oNK2?i?=2mrVOff5W>AaDf&695DNIy(?100;oM0)YttUV^~{;Cc8A2TCwl
zfj|ic695DNT!Fw92$W#Z0YCsi0H9kg0woxJji!|dA|wrv00000NkvXXu0mjfVjEkt

diff --git a/htdocs/theme/dolibarr_logo_squarred.png b/htdocs/theme/dolibarr_logo_squarred.png
deleted file mode 100644
index bbe16cbc6dbb4163a0df89c94f9b949ead0fa9b1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6959
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

diff --git a/htdocs/theme/dolibarr_logo_squarred_alpha.png b/htdocs/theme/dolibarr_logo_squarred_alpha.png
deleted file mode 100644
index f972c98bd041eff23b781fc85dcc18d3714da31b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7844
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

diff --git a/htdocs/theme/dolibarr_preferred_partner.png b/htdocs/theme/dolibarr_preferred_partner.png
new file mode 100755
index 0000000000000000000000000000000000000000..06e26cab9a292910cc002cbd780e783a3e3bcfc6
GIT binary patch
literal 12136
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

literal 0
HcmV?d00001

diff --git a/htdocs/theme/dolibarr_preferred_partner_int.png b/htdocs/theme/dolibarr_preferred_partner_int.png
deleted file mode 100644
index 6c7056903271ed12dcfbc023d4d189b776dd0be0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6719
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

diff --git a/htdocs/theme/dolistore_logo.jpg b/htdocs/theme/dolistore_logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b79280d819f5144fa0e3c2283bf1d839640de377
GIT binary patch
literal 14843
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

literal 0
HcmV?d00001

diff --git a/htdocs/theme/dolistore_logo.png b/htdocs/theme/dolistore_logo.png
index adcb01473954857e53eed709447724935e53ddcd..747863108ce41416e1671339a0fbd4d936076668 100644
GIT binary patch
literal 13413
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
KfLAJ*hyM>mL72Y)

literal 10077
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

diff --git a/htdocs/theme/dolistore_logo.svg b/htdocs/theme/dolistore_logo.svg
new file mode 100755
index 00000000000..844010e19b5
--- /dev/null
+++ b/htdocs/theme/dolistore_logo.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="260"
+   height="70"
+   id="svg3450"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="dolistore_logo.svg"
+   inkscape:export-filename="/home/ldestailleur/git/dolibarr-foundation/logo-cliparts/dolistore_logo.png"
+   inkscape:export-xdpi="192"
+   inkscape:export-ydpi="192">
+  <title
+     id="title3072">Logo Dolibarr ERP-CRM</title>
+  <defs
+     id="defs3452">
+    <linearGradient
+       id="linearGradient3734">
+      <stop
+         style="stop-color:#a1590c;stop-opacity:1;"
+         offset="0"
+         id="stop3736" />
+      <stop
+         style="stop-color:#d3a768;stop-opacity:1;"
+         offset="1"
+         id="stop3738" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="43.791163"
+     inkscape:cy="30.424404"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1023"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="false"
+     showborder="true"
+     borderlayer="false" />
+  <metadata
+     id="metadata3455">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Logo Dolibarr ERP-CRM</dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Laurent Destailleur</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Laurent Destailleur</dc:title>
+          </cc:Agent>
+        </dc:rights>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline"
+     transform="translate(0,-530)">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#525252;fill-opacity:1;stroke:none"
+       x="188.29013"
+       y="440.52631"
+       id="text3763"
+       transform="scale(0.74258923,1.3466395)"><tspan
+         sodipodi:role="line"
+         id="tspan3765"
+         x="188.29013"
+         y="440.52631"
+         style="font-size:58.11785507px;line-height:1.25;font-family:sans-serif">Store</tspan></text>
+    <path
+       sodipodi:nodetypes="cccccscsssccsssc"
+       d="m 24.436019,555.72292 v 38.45934 l -14.106106,-0.15741 v 0.15741 -53.89033 h 18.379631 c 8.060629,0 14.372471,2.07321 18.93553,6.21963 5.420081,4.95996 8.130122,11.69133 8.130122,20.19412 0,8.13538 -2.316275,14.77491 -6.948822,19.91857 -4.632547,5.14366 -10.476609,7.5929 -17.772872,7.5929 -0.857021,0 -2.402771,-0.028 -4.324371,-0.0348 v -15.78527 l 3.885273,-0.0213 c 8.222652,-0.045 10.707244,-3.87586 10.707244,-11.67008 0,-7.32185 -4.041895,-10.98277 -12.125687,-10.98277 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.66361171;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+       id="path8463"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 77.907188,553.35652 q 7.365748,0 12.612105,6.02282 5.281101,5.98343 5.281101,14.36813 0,8.50278 -5.350592,14.48624 -5.315846,5.98344 -12.855317,5.98344 -7.539464,0 -12.890055,-5.98344 -5.350596,-6.02281 -5.350596,-14.48624 0,-8.62088 5.350596,-14.48624 5.350591,-5.90471 13.202758,-5.90471 z m -0.347444,14.5256 q -2.084646,0 -3.543897,1.73205 -1.459254,1.69269 -1.459254,4.17266 0,2.44062 1.459254,4.17267 1.493996,1.73205 3.543897,1.73205 2.084649,0 3.5439,-1.73205 1.493991,-1.73205 1.493991,-4.17267 0,-2.47997 -1.459246,-4.17266 -1.459254,-1.73205 -3.578645,-1.73205 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.66361171;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+       id="path8465"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       d="m 114.21477,540.32682 v 53.89033 h -12.99429 v -53.89033 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.66361171;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+       id="path8467"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       d="m 134.79383,554.19861 v 40.01854 h -12.9943 v -40.01854 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.57185936;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+       id="path8467-5"
+       inkscape:connector-curvature="0" />
+    <ellipse
+       style="display:inline;fill:#a05a2c;fill-opacity:1;stroke:none;stroke-width:0.40034935;stroke-opacity:1"
+       id="path957"
+       cx="128.25832"
+       cy="542.88831"
+       rx="6.7222133"
+       ry="7.1090221" />
+  </g>
+</svg>
diff --git a/htdocs/theme/eldy/thumb.png b/htdocs/theme/eldy/thumb.png
index 47ddbfe36d1e7ab7b13cf3b3bf158dd0754c0bbd..6d385ae4c03a9b3d90b196bbdaa688ea401d2c5a 100644
GIT binary patch
literal 10818
zcmV-ID!tW-P)<h;3K|Lk000e1NJLTq005u>003kN0ssI2j?}E!00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF->s83{NHwFs{c001BWNkl<Zc-rlKd6->Cb?2$7yS;ng
z+WlVd-Riw1bxW44eX)e)*hZFdynqeZIKYGuhk$`FWJ2<V5J*B863Aq}A<Qr#WQGhg
z@PQL>j4{|?%SN(n?R!h=eR<ul-~R4iRrAMHzkX`9S}pY=8C3ed?x)xH-a5BVom1!h
z&Z$$VZTk}d0Dus14uAjv5Jw0&0|4OMai}B-954W9jAIN45C@I`7ytpxfB^twj3B}h
z2LO(NyFf5-KmfoQqW~hooC5#{@SXs`Ipquh1dKTVLf}#$7%pCb0CCO%127JVb4D=Y
z93kKUQ1T!|8OH>G18`0O0b_zdfOFtLfn$WdYk_f&03ieboO8yJ*VkL6VU8FAK)^Zo
z28mA&#cX#00FlJ^K61Az0Rq6H{J`#=o4OhqWdP98+3}Un{ho{{0`4-t`)%uXZRw(%
zApj8Mcig$baxL#cckkL(9u&RL<>B&=zW+X-Bm?5W*|x1~f9IV$T$chsWo7KCC-*2K
z0pQhjb${{c5B|-ce27{W0J0c-;S=w69Et#lBz@prcUMM32p9mWtFQju$9HRzh=Czd
zdDs0r-?@9M<GR4XrF8eMjUm+sfEt>bo_^oGfAL2jvP~Tjbgl0A>(BglEF=SfZM*;R
z>EC+t!8<5p0MOjruxERhOWC5bgfVX#bFWj!ab1@I0Hu`itMdi{Fg8UYLjcs;&=%RT
zG8*(@4!}9*lh5%!@XH>H0pPAXw?Fm1J<*^BfHc4Q=sR}2=QrQRDFXzNva&6=ufRY#
z0-K?~|BH`Thk}%H0RG^fJKu57mgbr$0#sgAz59;N55D()*Rp`az4vVYy$?RRX;lMo
zY*P5E&wOxvJdH5|fSS6RjVqfOa{zEOTDE)FhP!vH<BTHU>sBuhm6cV56#$F`@say?
z{P9zdIF5sWcdclC?7`n?t}kbR8RPGH<nBGY)_GHK&AL@x%~ghFW8mk{pBqfsU-_@!
z5`8KM)YjJY(7jt3r3k=r-S<CwcTF?^fB^VCyS9DuWAER&rU?VOsJ0fiap-7Uws}LR
zLSXIft3L4H9foD?xogY2_H5BD_Tk@pV9$=V2;oS`uZW^wm4g9|IxfLP5D=vtA;bZy
zs;i!Q?|p(m9Lq)s0id=D{K?;Y@{TQQo_t_~>o_ag8ke^&tBgh}%EQZ-H`SDf+S?j@
zvIqzm=ae!)fZDge&$eybb$vdCAmmc28zvz{^(g>=2@Yy%E?-~_7-c4P2w+(h03lts
z7;|NxEC>PuP!$n46but1qMMfEIEqh^L_%HgDT1yWL=+K#X*v#dRYk@GJC19Z76KX!
z1UUf0IO6vuGg*WLMrq!(L{acb5=Vdl1p~fxCWo-VT*tB<2FUM|J(ce;CL#b#IAek=
zP}@dG1Yo9V*^Z-WevE-JRwx*XBnuKj2w_4(nw-fMILC8Qbl2LbLm#;Bj^UByczonP
z{n1ll?mYC=U;o=b{i$Ub?|J&G`+o4{zQLhKpZd!cZH=->3WY*hM3Y1{R2EFdCx|5M
zJA9sC*mM7`-+5s3-H(6ffjw_~{%5aaLTcpEzx~n|zxTcG-h0p8zx&y5-hJ0rC!0-~
zw4plUQ$;&(j^#`}mAWvJ6eM3|P&j^W7`1G9|0DNr%4G7x@#N`q{ae?suC0s=j3j#c
zhei^a2k*OMVmxEp`u@Y+8`i80`hAXR9ymLgPv@Wh-G}t?vD1T@*A5(6zoskXm#Jl)
z=p7zQ=HI@3m2Ft@ynX7_nRT~yb=1dPz~6uVRnwxs{q9`@LvcXj3opNZ``X)7uyl_4
zdj}F}_u+fj`lGSL;NXv6KD2y!OJ#Yvl}}$7O$?8u9(!n4YJ5CjF!vumySl5*FN@Jw
z`M<yPhU-}O?b@82m>`1q${Qy(+}_z*TRD+R9X;6{pRgXee~VKnWDNHg`wri>s$G?_
z=nI`aesnlRKlu1>^qn81uJg*l(*&Uf=P>7>DpDqw7ep~u7Dfo-iDYL-3#ZPRbAwgY
z6`ACO;V{NHASg~S&N;#eIL8<R0CioLGFg^52ZR6+xS8Q(-y4+`v9~|?<g>4yEm6tb
zGoU7I41_WAEGpEn={*=&*UFZYr+OG;fJG5=B8Zk_F$$t6AaEHV*P$3;3M{DkOpDr%
zt%wrkz?scB03gO$O=WCoG=Ts#)rT<Xmcw0F(=^AjF+qmq0O!Ggk0E3mmg6#nk?Qlg
zj^i>)T`mxU31gJG6oP)g?V6l}WiyNsbKRzfs`2r3&NKupAc2U8TaN28kT6pGs-+u_
zOEE?qp-3>0Or{wizouY>b<3fyBVa)gF#=2(bsUE>@CRhVaZWd35hQq0?ej_d6)+%%
z7`kYiVgR@f&4GY$sx#L`qK5IDj4X8E@Yz_IR$o{B#*vc*3#D(%OI9adLiH?9V~mQD
zG<`Xm_QF%2(WRG_UgKTHXX=w*I*7A$QTpWKPnhYyi?9e!Cl4-tule`O=kf&P*p|1Z
z^GWHRpWWz6(;0lL-N+_zK;U_`7fo(HZ`Fiu4eL$B;EUc8nldI4LZ$B4t@f5@u;V!W
z{rx_l&v6{T-=9vW+uGXZ&SS$c5{X28ef_P`oYpQ}xDXD9GntGeNt|<xv1ytZV?u}^
z2$CdGN;&6*5K$BpiG<(p&tx(f<3J#QG1hh6w(YjIwz>B>K0Xcru~=+MquRF37|ZAL
z9^5Dh0z$~|_g{ljMhGE9DfO)NTWfH!S(arO1^{T9me1!2A%<ai!;3L?9EVa$2ytCE
z5C{}mAj>kPv?ySzsuDs7A=kNN+O}<3mS<nhr+Gx&VsNp!uIo+uX~IwnC?bS7Uw9|Y
z(-2b(UQh@B7K3lH5XG$___eU22_c*_LIh8@2!g;E^Oj@)D5@Glh~qeO6lK#iXSqO@
z<wbfWk8DcmEXoNXw0N4vBfxdtS;neVi!MCK!g+Dc77zepx&QaQpEk5EfAi&MN3-U}
zja$chj-?H#uBjX9?{NW|8=C|X^68vbUh&ZV_sy}JLZNV_rJZx`^Z5q)dIOP2Dmh`<
zPHlBH!r<7>SR#RdXsTRWd!1&vHyvHq)ph-f^I8xTMM-DUsbtb|EPo(eC=@DU<)Khy
zK~`VSH<^V1S(YUMojlX+^Z9^dNkF+m!89x+;Ev@h6j7KDoM7Ab6oWY+ET~P*%gUp{
zcfI$Ck@$EzTZpdO;131zdE>UO6{%cSRaMI{f*k=_3CwFfz_`@=dh_+Yy<;h+oAGqI
zJfO9$TwX|LCbDV2D5YHKQy=-zVymye``f<>1w;O5_|5%CTH6{k>HMF6?z2m#JRK|h
z@++_Q_Vg}awYvYz@w$fQ@<>qdiJ|h!#+u57>SYEaix6_T`FE{G7Uz6oVgeyV2rd+K
zQ4+_;lP6D{X>459($c^fi$<eYebn{Y_KxF-qG(x`=XiMV8YTn-cu5DI1cySQ%kMQ!
zix7+nwe&P#0-O>-mF2)S$&+o{k|Y_1Q7XZTB3ZWOrAl}btoi+Dx^Cyd879Oq5{$YS
zAyEzyK}Odo%^m?$Yw$F7ULSW6LSB$-+G=#@@DYNEZdiqaURD-9d#<~^z0s57GpCLL
zmg0$IQ*Fh-aJ+9|u%^0V-MS4&jvU&uW%I!|53gCXS`Zdsr5x|>xv=jrb=^(xeSk<)
zYyYdiJQ9tTCq`4@itx(zx@Z3NrC2mFIx<m5zMIM<66b#!Yuqv3`_lWqke??3swzMA
z;qQFz^Y8Hcr`BEWT0h@+x-96AC$nA48}qr$*)s#Oh{NUN;6HC!zWF`L(c?r4KJfc{
z=WApULI5EGhyq8zIdH@=2bg~xO%McuV23itwnE{sORW{{Ek!Z<_a8pvU{yDqj)t=H
zgQL$r_lvK5@sFN)?nRlUH*Ea$$3FbT6Yu-b=~IX1t)vh$-O9%LLN@D~ZYhJiI$P4I
zd`*2hAk2V={HkT!!JsCg>dMFppCVhXEeDs)e-K{Vd;Xn|ZW!!OHnl`$`JxzLL29gz
z#>WcnEwv%P;@Sp6Aj)DO5UgAMP|b>6*~FPpW$Qe(+C>$e80qOx(x70<{xZwV*Vi}N
zmK6*JuGI^_TtzdE4jn&hyEqc8>KpD|)m~X!8D*SDqfy5(1yL~#9TP+uqSOg!0bMU(
zOmst6d<t-?`U3M*(Fmb4zt}&~H(;c5n;(BrEen^b=;Az{O$~Ae2w%5~K683}e7tb@
zaR2u0ZKh>y+1$i|%d)Jg%7Me((MZU0oLG5ed_3h-6~nednpPewd+ym+HC5L9!Tz7`
z4n|j|hmV`N!4H1fy&e@UisF~P{CDqu@<YjV;+cQ?b}(9H=aWOD$$$LDKg`i7n%!rp
zsja~v$&znb{cWmDi`dPnlczXF2(Tmwwqr*tYy6sDRW$%m6lDQ@hL)|jFI%$`5K@Bv
zX~+>O{+LY)=7kotwMSc8qU+b!i4x`<l>~LLswzD_W1=e6R!8$WJ((<oqJdPV5DqDZ
zSrEXMe6k={Hm`m6vE=8?-1S%_$hK`S5tRe>avr=tq%&zv^<S%&zFdM403ZUuC?y2D
zeDbnrG<xA&w?!QU#5M{p<+4B6+0i=xXyXh<miJIEF?d!ZYeCvfMwXZD>v0zWa9Ni9
zevQLa4l+!o0q`qDUFWExr%N!u_&Dx56yV|lsj1q6<g#!8;1mGxBzKFgxwQ?Jsx3gI
zd!Bk^ii5m_>rlEnAh`7ROqT5R7+J3C&Og|2xfP8uo(1S|9A`0bcFzkCMbYbhmiJmz
z0*bGHB?1^@i$uV*a6Ymf2XQWlqSq?|Ko~Ph5h2{Qu^>^G5`nnX<&4i^qTUKN++<iZ
z0xpP9Usd(^Q=fRpw$8)nM-wB1RkaOPA-nUgUElcn*EVmxv%lwjd*_Nr9(?ecY_8ek
zREv$oGR8c}@a7}{A#~j#-fP05k!@R|fd1@HKevASU8_6l<6}vOGQZ~IoL5v;<x&&r
zOx|#)-zTkIyN*)#T8*qLDX3U1md|G~CbA;y`GTsc<Kq*-a7fqnP$<Y56!KYwu`J1!
z?MR}4F%~3=xzu(nzZRH_k(JBku0()mWEqBTI}S$3G<C(N0YJbXnE&|Bh-6)kMXQ=>
z+m=h2YZ-w^w2(>Lj;s1LRq-td0T&tU*bYaW1HznhC}!<?t|2gQ7Z_ZUpFMvDdsg)S
z`ltUsG&IsTlE@_E)pZSp@sx$d&i1BcF5A|zO2*ca!-s<9m5K53hMMYg=Xxbo>0Gtu
z?5Sg4`s*)Us}(&XgFpGvkGdH9R3$(lo^z|~8$R=?r<aVuejj_{KRg}vtF>(_hR>gj
zMq?(!8#Zl!VE0`M$za>IuN!&3+{l`d!GwqaK$%mT!hcmPdI8-egfJnPQpP#==IJ%M
zNfdz0gTcr%xEPzl0AyLdro5<mVbNX~_zFqkQ(wWP({@drVN8Dc`ZI{&re$klWi_RC
z<I&^Ys!y$~2*t-Uk}Q}7D`!}BwGrTCWME7RYMM{RoY&RHzW2QsBH@6ns3UtH_Lr|n
z4j*yM)CayeM~D~=j&%199B-&;Usl(}_|$AZaNtBJ7V!~mGFBT6|M>ZRp`a|v{^7lk
zgv&d|1`d_gwg6J@|L_a*oBD93dtbrK#>$&&t6GW!>zc;No)O@vEUcM^mDcUf*18}5
z=obN1W*pVk1z!7~w=e75S;(irF*~+>c=e7?UPtd3A#iQu```V}p<|~81_#fdJ8PIm
zA)hlX`|z9l0mHLDeqJ{Vg@Uf<b9p`QG6vV?Qz4sLBk|thk+bJ797bqL6l!Z?hGnNx
znOwnU49=hGCyMMcP$ZnyO=j46-AGJi000Zvu^a%z#ZdF@kNLxuK6UQ$$0>DXSs5HT
zKh2TTG~dWba%^;h2m->`aV#Pb1c)dVjqBbWiq+~9LudiAype7hxqNy!ezueVK@nZc
zO(e6KbRm(_HJ=QeJ1%uyh5;c!70q{4ueeuF4a!;>u<LZFknK3>@u4RkfB*9JJKw!$
z+e>@*jSP)7u3TYcQc+FXaObXn{r-<7Fb#{QbD3}`u=}A$H?CccuHeAU5H7^z)dT+)
z2!^S{)~<S6G5InYjh;T;>kkG^%W!NO4*Oh(o;%a;)8x&YZ-dF*=zNZ7;;brqVCc-L
z?)|dtziY>1uHzI{GzX3@njKzOcrjEoLipg(pE<5+T7|c5eT*?WsiIX5fB<t~FeNl-
zp;a{J;aKhSFTUg%w_A4JT?&aY#@5}o&bu^|O@)FH#@IEj*^JSZ?VD{|SCrti8za#`
zZ%@3cy1chH9tk&?rsXo8%jPddc^05mRWxd9h;d3U^;;$(Bz(25=H<_D&N^Dw8D>_J
zv`e$i@#H%$VrJa6WK~Yf`JA^EJ-P5t394yXk|<stSDr5xjfxrpU6+wHe=C{;5CC?G
z6}@Ce)*?ZbbG)xqdXz=V#N%+;*2N`msFb@)iexP+rZY>M9cG&6lSNUSeac=H=bAqj
zeFF)&6pOx<`2MSnMc*hHo##S(HRl_1&Sy6Ue}xGsjbbe#;GRmQW-+o#cfc(;l7%t0
zZ9A9CUFjN86c^jbGEK8kC|v0pMNyW{$XbGVG-Lbb|M>ee=f=i{x&yKLkS3n#>3{U0
z2i|!7AQ#1Ce57Uhid1|U2&r7wVT|>D`m>)W*XT7})pGpgA3PoKM@C0SR<2la=Jffh
z+L$B?m?#S5Upa89qqT`>;nCjnv8swMeE##-Hv+TC0JHw^Q=cA5>nh=avZ%y)Lucoi
z1Ftc`9|$SbMb#D2iLntWQuW85`uLK#N!PLlm!#|<i~#|sYzpS&oJXVOw&Uh9Y0V$h
zEyE{^1PhddED8m^Ajt{=W;>h+IGaw%K3^~pnr0WHIlD<1Apv2BF_<iU;<-tbQqwXp
zB9u{qAR<VV(tJ)2g(ISXvU$@ov%!Ghq1>-(*Y74F5CCxuoK1z)JvYgA%tRs?EiVH=
zx}mFD02q}d(QzD?iv)wA>yj+`uF<(zA_=~T5n%W~N6#US*Vjc`%R}yzfrrjt81RPz
zqGcI6bu8e_Ol1nO3O_+&d^k>gl24HYLdwdc&;MjUaJQqn@65sPW#cD&TG@`rza5FT
z&yj{xW9irXM>?xw>+8#TiMMj{WKUT|L=lN?vrs^O@x^_DAXJDiyxDsw6F)6$!JY5<
z-?AK)=LbX}fS>n_qz!jjL|R={!KZ}5J$Y)Vv8i%mB5%1)O+|EMc=Yt?evEiSLv;Ul
zc2zg7b6x6Fqi=i9w{AuwtEi{O(pJ2n`(?2&ncLM`M<>U)ygb~~I|dcO-l0@^dEn4%
zC+j+wseZw)pzd>nk&2KYOM1@Ov31o%DyIoJpYD$}?$Ts5)O*k|vvVgQYuchHogPnb
zYOG{z%Jj1x`_R#zfWXV^D}zDRFdPDQp7q3<?~w(P96MnfnM?7@OBBZ(Q{WJwWI-Ry
z*%p=8)F8@=S(Sn$l6=-YcC1?zg^7$6lCf!+0H~15_`@yBI`^DE_=C*E`K3a#u1iHr
z7=7*aQ<VX~<yeodZl%ooBacR-=PwMzD#~RM=kk^$Vo?%AQR?j(j*pBtHrLnI#){B{
z>rxI(Ah?hn1}tKPRe$B&k*qfc<1d~Y3d!=vcC4{Vu;@f0QyvZI1#2ReQGF6dgouO)
zNY4yAF4YYhjn<2jpeWLb<L9&4Tz$24?75GGDjHndu4vxbwe9!kqM`}H-#&a60LF9X
zCw8v(3S@d%^fa8u!}1V-EX#U+j8cmTq9}(%!FThjXqUmZhN`q-RmB1q7r`Q2r$`45
zoNa2Vyl`$13uGdZx#O;N<B4RxV5F1j+S+I_d$b6}_(KiXK|^zSm?Oko?q2G*?A>=l
zL?~xC4UOfP!;v@6?YM7q-`O75LAgS%y0&Uy_-r<1-nDz<_*lwu=olaHg_~-dHXM8T
z>p&E^0)wZ+4#2i7s~XGdYicX#B|)JXG=CAxQ~ec7jzwRW1WzK(-gX#%DHeUXsl*M_
zD&+NGFd#|dLSfNfN{Y8Dr#NFScasXbuBqxpG>S1&;-?l0x@lO!us_kij{y<|!5?Yz
z`D19NocQU{Bml1{a_KcoibXGOyO;|+W2V663mEb#if`ezHI$Ix#YkpbGK<^=05Uyt
ztZJGH0M*TRTvzWmtSpsqqdG3Fb-Wlz>{Wcw$+p-~@GJx@UNN%L_gX|OdiEDsq`|!?
ze}vpX0*dKrvvjejuU{J3TU;ayZfN_pC7`t5MZ}^LiNuY?qO;lTEiC#*V$sh%`^?x_
zqPusHQ7TbeiBzs!-V`587EJx)zyHzs&#<cs(6|2in~AXrQ%@_wShOsX&E!7%(T^;d
z1XC;Zg)e_Yq?w7dS=HR(W7)>$mTXqnb7_u+?z3mqQ0z}W^M?Y4`D89FzME9?s-^YG
zqtR$@&pDT&s_Ke~WTq_OGaWWKFx1@I9FLE-x3&W?4j6F;2wxd_W|w=DGp6i#Mcw&i
z0<h;MW%8M1eB2iZj1CRgH8iA>$+ot($s9a1PXQ{rNgR0_R}n68CA<yb2M-=;YHqSD
z17T6qq;u!`f<X-d#)L#dLDO+6V-+(2?^mf5y|iu;0Kw$cL?1$EMOlN(rl1CasAUxq
zMp-mc=2BM>QA1;+K*ZXbTGKS+<C*HJ@Yq<oygV$4<c&8@S*BHAnLoYv%aVu@78=(+
z(cJaWT*Rn18@H*;fmf-Kpfu$Rjg4fgYN{nc^!o#eM5em3aw3x{<gAKlP?E&gUOg(y
zB4h5R&1>fArC|h#u{R>+oe29%zD9vaR8ciT1db5FVry#~r*6)0%EIdCSaPT@KG2&e
z=z49WzwhY(b&OQFa(Q;Fd)NEFFU%R+S^_K@4C*}F|2pTWK3J&`vA7L;B9;5)!JgXc
zU^1N#s%k2gZSQR9>%Gua9qb-VMZ)sAvqM?K5ir01zD=Ve<ANxSxu?qO)=9|fJM}_l
z<T&qo_^N^?65;z7Ud_8!g%*wq{&%+CQ52*2X!6MEVU=5v##*G?iP4FZJ&CG{Ku@2v
zV_Vno@K{^>vVp$%JO=<Ha{lx`Gn!6}?(bOrG0vH%MldGnq={hS!nuAdORhnEVHtEY
zWwXxq+CtvQ<P46Ho-2%J-w0LT4tnp%;7K>%>sYy&8GP|<hoxmO2k;Y#a&VXv6cxv%
ze3FKmn%Hf(bxhMaD_Uv*pkw9K6Am6cdGttkWmUPGc-F}d4t2jQ`TVj!+V!?SnDLb^
z2U85obh&Ffwv8@<D!1RU#${B%Q(3X=H%<|L&%Ik*m$tUl&3gp6Pm6J`abCKE1OT9>
zI$Tj1ZELA9O|!IWg>5?wL2F|*1D4Jj%j(vT4<04t&S;zN4+PHj<T*{bltrZD@eBJc
zGesoTr^eRZ^QSjJf)NLsyH9o9#~8DzTe^1i_6|Ms?1AbkEw9@$A>)bc?HfD#dM6~H
ziSevf8P(IN#~-`%Tu*$>s+PoP%Ibe^<HP^W&JV^Kcb?h%Uqo?EF<Q%Yo?iEeO<fK&
zDEg-XYNgzrMtC?JT#ymKfEBHlGlw(A!7c9XqmDT+H1^z24of}|k;DYPs<r08p#d!*
zWK(*qDu6f-1w&^p3<_8X`o&zq4u{kS?pyupo3Az2SM^>PDexcFt$uRg&97<Ew&7FX
zgP9n-L`K%Mq}4fYJ{ucLR#cP?4vad~Q57F|&Sw+72q<Gz3)a-N-8FYCdKz-N^ffvz
z)hW!Y(J{NNl+PDLQIciRG;KwhN@W}!9XAbA6eU%f7#}(coO5usKviAa-Ip6#OU2;J
zE?dgog)=CwrDpK-_A3%>;8)(lwAeV#BGuZyCinM75wH|08m^W$yQt@WcxNQcvSVZM
zA`KpcMNzzg1e6{Da4YfsSG+AQ7Ja4MZq9jGSs6xn#&gXWWAoWn=(?^XNweog6GDQ)
z;HBhwh012=nNk;BOR+o0ab#JZeGQgGN%gA)6Yq@?V8-ah-K_I&-UuuO7CoEufbqZo
z=m)R9vah0knT*^_-cU6~5S3l`?Cxl4n18>sD?l%x_RVkoqr~Zj{t=LTjkQ%H@sT~d
z@BQv~e<1lZ#ixXQB4zBhO*=QN>0H=+YydzQQ6u|rKYN)`=Gg9qb7!7<`jZjA`j(O4
z%h3k7Y-?XrV^dY_GD#A1c^xt43uxSNL#pD<=mqV4s{c|NR(EwFKzkl}*O9{~D`LS!
zqA3!IzVnfXCepcWo7W#ae5|IX!XK(cb3=e<<M>5H=8{P#C~D9jiiCrRvz1*d#jCyX
zWW_^t(=k{O#6mvBIrj(3Tz9I{mKLh)sIT(WbRw1YN!X{V7-0Z7@cJ=8uzr2lLWERN
zVth!?rx=4}%_~chuRyS>y{!QNcHXgd3SFwH1%LyuA7@-f#)abt{)Rg`2k6@IiL%Ph
z>q4@aZ4?I2zZnQsS1wz@ifB9%T3Xv18){|%XH5I(v9mtahjTy9#4k8@4q>wGp|1j#
z(9I^nh>*QM{ujNFc3syWD%*a~6O1{NYa2ZC%*(AUHE$m65Bnv<u_ls*SXtoV-@K!L
zI1$kl+p=Xvp7B6Y&WoCm&su!}1W|nPnXg-V-gd0rkA1wleyReqDB<t_=v8LfE`XgW
z;E+!dRo5{dddIfz?t!wh5Fh(VAlzo>PfZLSPYfTrJ_Zvco;kU<_rxnhJ;&~R=cijb
zxATjO6d4?tNTtmaZyp`Zv$BeCnJoH)K7-QE*4lK|$fR|<``c?D`1`Xz|9m#xr|W6I
zzw)M2(E`EAi8wHubDm5%f`E!<dn_7!_`#iy<E&oQHqF@Cw0;EumlZFE6fwrU6XH{;
z%-}%0p|Q5_(ASvjPIQ13000TqNkl<Za^{4qJDa*5zN+J&oERx9ug+#BN*RnWdHDWq
z0N_#=0V0H)I(c3Yg!IVkA^H<*#BuzF7;RKTJA>6*8`^hYx5c@7%R{bhz2gIa)pzb7
zLuj(X3E#eL6#%SV-B`$*TFC<JQi>2)6&03$B{O!es`IfL4t{^dbu1H$j%0BF4E)Vk
zp96r~x7-6*EGE9c{PX?YgE?6QYC3_4kGq1!Dc5x!$htKx0|O(~Wx<0d`ocjK34(2y
z>o;~$%U~{-RNsMb-*NAgf7gBVxy;a!`#$p8EJzl{_{_0abIAl_tmC$=fpDydWS!~m
zJAG!D*`@`ksxsEuUcLW~(@sH;p?`@r@9Ek1w*tYd?)}e|%QnsD%!brhU+>9R^O<qg
zU$$n)qk^dLi{*ru0?AqmsFEYVym*W{zY<iL&lmjutHcjdsqEn3NW-$a;S=8x)j%$O
zI$XWFY1M;QgDTO*Lv;BJdC|GN9`LKFR4yFRP8{nIBoq|-3)vCJNbC90t{oqj<q(=j
z#dm}-!U%E15im-<5%`s2@a1;&Ei8J;7`$Xh+wn^dk6#jy_J(88Hw=F+Az%@qO3Sit
z)F?=j<W=1M^&|jeeCzblUzc|4^wC=kzSZ8!Z4skMx?!NV&Omtn6DFjj+8(Erc{{S-
zVoVi;C5R^RT+a0Q6vuG|fjEv!2&R-Ggc#$ZC@{tlAO@T<MlfcKBLE^0@A!H`2;&R^
z!WdJ^Jac4`as<5G4^fmDqoN3ke91H|6s(fukf}1-Gk$rKG{1(6hLEsW^1zYLhyL;}
zzqnz;+Ts4b*5xb4#uA~RzhK(8-`4rcFZQ;tT+!Rt=a<Ch){efRepS&jnTh0RqGkOi
zBi_#mN@op4@)>%jJW^h;jBqF%2!z|)S{K&Z+`IRcrl#gtEcUaXKCdXgyYIfIl=U3Y
z_;|uFbT2_d*Y(LQRVbUyxUL(CL{h1gD2jq0V2u5Kzouz7UK^G8hl_|sI}UpLefO3}
z!i|kh0!CUOm`bL)R<=lrZ|(Zc<z<0LBtmURQRJ@GtHy@M>uRdg^@Xac$`RMBt*;)6
zPXshSXRc+KvgT*5gU|w742-e%_V!q;f-x42RYjxG%Ux&Jbu7yo8tV7?RM&OSpYN`$
ztSA)p*4B<hA~8HXtZABM8Mf`z)YLkTb2Bjb68*GDZW3c`G(Le5;%KT|u&1BV<@;=k
zp-yiXK1QC#o&tb5Z~%-ETWIWJntD|gITQ+%aMw+yawR8xq0$XjC5jpWaPLH_n<3Fo
zQx#29E}rLi%MYGi#0~Q;XJjEkB$6mDx{6+mHaa?5T<{b{5k+xPyTcf3s_!j5N8e(8
zu%>CIX;Mnl>GV?eJ2W)pRd_BoUDpl6@Uma0{mFIRB23E|8yOj)lzQKrrkT&@ZQJIY
zU+MNDz?n*=3Wb7g+lfTNyR3M9>1W4ryeF8ZxpaQ;BDFvu5C{YSpscKHNwpqA7~|3`
z%<=JYUDwm;v>*tAAar(i&f=98vy=_PIDY)NmpJX6ZpS$n1fi>|t90Qnb}9%0rPQ*l
z{rmUJvg|#_w(ZKw%87{y@8OQ)2!gO`)v6^0I$)7g+ZR<W&*ieJsw&r|_4W1FbnLpO
zX`41~a$H9cgrW$}(j!7hQ502GJ3BjlJ|CluaYis90;#U9&gb)*rV&DBiR&zGQS7&3
zo8#N%Gb1m*@B>Mbdivt&oPG^sLNMa)p?xp7u9Zw?M#eINNM<ow5kiqjBoGJ)f*?uw
z!s!FO-N!J-iDV`m4todb`h31$ku~_{X_;g^K6s8XmPi+V@zRmr(bU}Uef|euKXLH2
z7k>Ed%F1Xwk(o0N#(`V^@K>Ms$FF|!_>q&(y>x6&u;ndQU0*wUbiZ9lCKBVoXjf-_
zP3#&r6W_k&o`d^d+_?Sz#CUSk+P2x({!8UizVFfB0nVG-n`}NO4`T6Bc9@}Cm!Jv7
zq#ZQVF^QM|TsjM?h+6;=usl=s?L;CGi9{{|F)+diQ_2vh+)FMjVFqKY2>7H@sms!X
z_{D>EIGV9SffugN<#K``6kS2@bXX5L;=q8zG-%ItUFEVWkc-4%&N;-#(~2xO4#j|g
zV9FSpOkl<saq0qKz!yt|dQcTYi~~l%I3Ns25U^#t3(jrMxoKGhV@Z-OZhPQdlq5!}
zD3V}6`&H63i>9JEh{XBfvp=t^D$f@ta(Pfy#9fpvq*r%#zJBa%MJ%cyUN8*;+;n-@
ziuUfaXAOo|G}ra^5BfAMpG)`mkKX(C-4)UDg(Zy;^3sbh?%cUkQG9#%{=BKFH5QBg
z^rt^j6y=^vf(=tm*L7KzuL*|qq|ozsr*a(Uuxq(^IJhT!MY|7UJiB93R2xg>CV|{o
zUx^6RhMEo23Pgh7P{S&eSJiIB3L>Iy70Q7DV9udX$kjG9`BXLF*F;Iy4X3WUwz;X@
zrz|}1$rxL|etjSiV2rl6uZYEBjImg(V#Z*D*V5^9P0b~HOfs2_s;Y)z2!i0cZZH^}
zrY(!wqEINPlXYz4@wldGuIqZ<k!{<4zu(&oSk$h?dv#q`RkfI1)z{Y-4u=s!lu~d1
zv99ZyrWLa@XWWpzXaRrVu5GurbzBS}TvW~sI7R?fHC32%hRQAi;(W5?83GRAldA!M
zBkvz#j82|DxG<<N0*FSVj_Z1WiB~1OYt<^?K-pZ+-Lxz#nM}GawJehmVH$&HnOn)^
zL@JdIg+jJ%2mFBx7cNA?5lNPmnTjZ1Qa2VsHk+lCW-=LBmI=Xre;__KHhcQ*A~6_Y
zjH;_+3pQKerUU#dDk`pn$m;590BC4fR=mEtrh1O|HZ&}o<T{&s<n#u(Nw56!<wzh@
z)6nGTx$d6+=4G|1j2;dK@_IoQh(l?lJT@^NS5==R`GyAvLgBFMI+o??1%1=zjW-E{
zPwao@nQ#30lYji(iG;JPt$r+#?P#gK>Ro60M!x*~$*mo=%Vk(r7fIy`sRBigxoyj;
ztKR$7e|_y|hlhXo*>@g1a=}Pv#h@ktgrdRLhU%M(!A<q`r%s<!v=By4Fc8e9lfgjb
zd~ctoN;W3RY=Hwl-Q8Ut3NByXC15;}NJ@%AUCZYaZwA(KV2I<+O%H<LXEZMhY9yqc
zI?)SrU@*ocZ#WLe9JBtR@l&Tqh^kyTaenKTRdBWa{TajNSO5UmqJpNlhWYxj3(c(!
zvorXH#DgzA+<Q*??FMV<;o;#@Bg=L2#}E8Ml*GzqtD~{1%i(C(bv@&VF*Y$VQLLSu
z%j<o~d{9*yqQNV@Uh&>^I_>lMihlXo!3mSP%j=>NnHkzF-dNiHKWr|gW%ni8iU0rr
M07*qoM6N<$g7~u-?f?J)

literal 11825
zcmV-1F3!=3P)<h;3K|Lk000e1NJLTq005u>004Lh0ssI2`oL~D001rcNkl<ZcmeEI
z18lZQ5N^y<e2ksns%`hPZM(Lu-?nYrwr!hH@A*3Io-a5fnY?*s2fI7kHzZHuk4)A@
zBx&*e5z%^Bf|@W>`!)6#L}3Y<U-JJeR==$IV+v2yvW?jHM^<c|nULsjL;8p$9Qb#3
z8%!|nnI-Tr*NNE{7B8%ipR#mhoU)G<deS%!W}GebFr3D5@)ZSy;YzA4iB8oMn~-H`
zXqyq8Y9KZ_$3~IG7rS$$fs|Z3i4=x1rpAaI%JgL_bLB5x!|G`yP~SQY`?hq=rY(fZ
zBBimML~)s>*6uk}uaH{3jVfcs-zUMNVt7imB~Rr3ofC{CwU3$m{KYGgsu;Y=RM|Cd
zere74;V}xZa(&s>9fyWS%7Bxyt&bi*A2V@bXm5-}>Y}~-Ps$DD6t6&OS7pPbm^1@e
z;8(BTOqsD9g@UHpux0<A{U<VbE{H<o)$2CywfUNW2S-S+-@13{%FRjBms5LnPgsyE
z_L16w!)LbbIwDjRf`!}j7q9I(a56km6OpW2v~2VH_aA02SVwn&=N-F_P(8T{+HkPK
ziZQ|2lc>3S?@>=r4=Sv;9K8n*pT^a2Du`yzU9*1k-gK_>?~vW7MCszii`K1M>vFmH
zilQ8mFGu7Z8LJ!>uYz=BoGMG;X7h#trLh78fa=F0?p517Rc)?BKUmxi5v+r&8z&=J
z14Bg=tc#a#Y}m37AqJ~9SMAz+9Lc6ABTp6e6T^Eq@RxK=o4v~5sHNN(opqp;JUduV
zQOD`CSGvb9=uNP?Yy5)px`{L%qf+$q7jJY1T5+JEQL?k=u3or&vvce`5*<Hzar3r=
z$Rem??7Sn#&T*vy+WOFuGaI+=$2!<4vsTQQyL!U3Wx$|AN6*3)8@vx5KBYQ?GOBa@
zlqEErOs@KU2Tv|swi#C&6{lLWVfW!<=ahesCJv2CKXBl{jvYJNT3hQ{CS%f6HBK(B
z8e7vmwV`b~in6(LmQYoMB1W+yoiK?`(F>G?Am9_HFCIE_7K0X*y?6hKs1)7&C7b3f
zT!#qsy}|#}U!CCWtgNh@oE)>sWO3IfW?M7(F0r-*?~7PnEYX&rr;(|&{&~Y%1y2(2
z!$;3HZrP8j^_6s@aMAkPcORKCXBEmlM5ZhC7Immh74U+DYb;d`UyIG#lq2@h+g4gV
zjzoHUt=?9nv(;#<Rq$?h*UR<gG;FojYFd}-O5s#tEH}9tuo$0dmg&l1WpOv6?$A1(
z!ggn%1>e|oBc=s>!VsH6gv*pvkHZ@w))ZqBU>!Y&FM3_3FSU3Yiz>#@3ytG}G}dZh
z+}~H+2`T;npotsWyp2|GQ(U?U$Fuue9R3!}c|0rd42*{yYCL&9SXX`<{Zjnp6p^U@
z;>&M7`}AX_%0yEtA_=7ZG5ydAL8G~dj8bIMc}@ftfPSq2LNfX8VNr7Y6XA;zz%(8f
zEgv4OfDN&DfJekA2m?UW$41LX#44f8MBxb<vI2$_izE9nh*=GblF?pJhPNQ~`^Th(
z8Yn30GbAfTbedsEgcO(^5>na=-k^ZPfCUb2!9>8pt(C;GV?ddt7;9kv4iuW89TqA2
zmi@9wmzapc=vx(Yw!+e24kJdm)9!IkyCfAWz15)_hv#lNU(5aemdGjn;KPp|_HWO+
zeNEF{wGwG{Cav!Do{t}Y?)QgA@5MZt#~Gze2*Ejr6XKqavMlO`m&6$+gg+d4p4SbH
z;D#p^EQCNQ0sz6efIp#>s$3QP1^~cif?YrGg3t@&y5YG51Mu-!ivrJeY}*fP*O|w2
zLz_iG5c)p90o`u*ykH5!GR?qu=JSPRyYhHcA<kA+SrA-QWe%L8!zM@j`c0E231wVC
z38s_@07?i*c`7I=ih?nQF_y<u0)k^gt1`#9R5=$alLS|su{=Xkg5bPBNqq?bAcQ#I
zgZXB=TP+t+;HPO4MDc#N-S1U0S0~4B0AuXDV2Vq}u?D}h-flS;Djfg(*|(p6Y>a+(
zwAQa*e$x8p(?y`yZyM7y#{Gdg)59oof+))h$1+Mxr@gl6sVodU+Ye$=RkrUZo25Tr
zT9(!8bmA~F40E+yhVf=*hl?;6YTn3>s$^YXf|L>=^dG^5(ELiW8*_e$)@IXau`zTl
zT>g1ZTnI)AT%xi_$~-BuL<RL*rzkOiV2o2j)Ig?cWkLvXlt6HGNK#6fN+@F>C7~xk
z!l_UZ7nBh75S**;tGucz0dSi+_<=YtxX5!td0FI`(E43M2vI&T#?|GVK7CLCpjkz~
zvuzTb5RKrsDOgHjTZS9NS(YJ$ilRIm4ywxYLJ31@icre0B#z@d2tGaz&CxH|CJl#U
zT^rk`F&&Rb{h{rJwl*0}G|Mzx+j30p>J4!eMZd9k7GP~ATjTHF-TnXA=kBgoKmV@Z
zb*mdKg(?(j(IPESD6YW?nm_^}?ry~0h<k_-gZ&0_mrc7#4Z_mBoab~h?=Vl!yzehF
zbLLDY{UTuSS#f2TP$(47jevIs)+IzHqIm$(GMG`<uvFkQ<jy*o#A|;t)zO|=Nkndr
ztb^%1vy%l}xMUJ&G8T{R=97_d1Z2RBow`gsS5g(80StzL=Kuyx@wuE@t<GXum#cIV
zk<jOL(Wx|^P@+~yUA}-)_nNU0Fb;tfH#j|*cW>~@{fx?hB0(L0z%N<j6L18Z%_fqn
zEEe-C8_QyS7_xYyu<7RY%nDl|fI560S16W?#bSrWh{xk8RJz&j-oH-=`th^Nq}0f~
ze|aHbx7(c#_|vH8dcn=+rbe1bQB_sfT3<6c1*xd6J@wJa1w2!xHSgyU<A-L3uG}BG
zT9Hv1)61Yv*^R61-JQiZi}Ug?506jYtExXJz$3#;H?KF}x{+DoJAk*E9#q}9n%_1s
zIrO9fg+`Cfqe%?@K>^OC7o7z#pvz=&L0?HxP7NktbN~W^T*)*^6@rH58gMikPmNEh
z6ui1zKA^y`Tf=uqXbveoXxHZg@LpWvvs(tT?R0wGZeL_G7BH(*)_n%)Q3ouS%jpaz
zjYgkaKn@O$4-Ag8*!-UWPK4WgAQOXK{^+MGNQ7F#7t0h>24^?C2R;Q(;ERBocAI?y
zj<LJEcDn<Qn0gJs^NmB(rH|ot9nSzJkkvxIVF4kblH>xh)v)ebTq0wzY#~?F^=Bve
z{e?@nzcca9|KBIzg8T+HS5aBs@eE)TPAwK2a0Df6StgQNY&H)ZPDHITa3oR3ADrMp
zDn`ElKS#g!Uyd|j&}(Tl8VZeBfGyz(gyoghsp(nZk);4f+{Pb$bgBPwC7L1lonQN{
z`xRvk%}?&%ukbod-}v4;-}<9J(YiL?zgY6&yFYsC+?{{;<{y1>t-7Z4`l|x&zfj_L
z_!1z}vgz-?SoS&KcnrrddF?(FNvqX3Jl?R;;$4K3R#0@QSg~;V&rIYASpL@+F8=O5
z0pGsa90)}pKInf2Fo$pC@=X%)x<>D{+5C397XT(vgj9xX=G3p-*Ra#?{P&rYzj!c!
z_najldzav43&>|BAWa3>QfVsl!XB*C=}@aE==3aVmA(L5oPtgR>U%@9X?-1Ra1aRi
zb)(MXa%@CmcB=)Hi-dgfnkW>F+gyGQPXIPEm<)!+>F01buK}13!>f35zr~aeI9n_i
z2zW$WiP%;mzLO>s`vIJvR}Y7i`8?Uk1g@#RKMn9UTWEDS13rH^eeDDikO8K_zwKl^
zwz)YyjaghI?F%q?86F&1nwzB&Rxah=8iNeBG&QQ^(vgAIg1npO&t8EHLmoEws$HS;
zm#(z-4xheU+%+)RJTQLa*4-BZ1~|DQ6%50qa!gYQ0iMcnI-PrfH^V`T#R4L*&o(q1
z0_lOw!F?A>*2Nm1)AwmS*mt4y`G61H$r_!dQBXK<Fp4DzaZA`6*PHfwuu<=*sYk((
zl7W6w?=Z`}?wMcW436<3y_i|7v7;3;02PA4Zef7{g`)Qb7?dn6%#whcZZ^*^%p(`)
zQK%J%!!bEFG|<^SKL^9CAf~2fY#Y(;fl(5J*V_7Iu&0wQ)=n=hzXV_xN1_)i*46re
zRPC|Zou7Nr$p~a@oQTH?MY6HUaT1-ou&^*Z*bk=a(J|;j0R}o>(*dvVp09X3c%|Zy
z0T&my-!E;is~s#Y?JO^OlGcM?O2BY}#j?m`{*m^gox4n}wm|CgbHJZD&!A0duIx{y
ziUS0kriTnTvpyg2o4QPLI6cn-&Vd{Q&JgGbACSCKBnvbpr;ivnFg<X&90ap6Du`s|
z)H;Y{T`zcaqcF3==J8)b58iilG(#*Jgf;A01TgmGMtnXWu<kTlL=>io!pf*xslw~^
z=FYm=Y@^Y5*;FP|=g2ycEZ?dOd4{GIZDu2K8D(=g)pF?q5~DX5{az24K*_61zDOeA
z^MLvBP24U#{?gsnXm?9(Q>TE>rIUz-1^H#SZZ$SkUcGRt;?Ax1`pTLbaLDK02WJZa
zy_W}UcUTNYO*Zv<-O=1gEEWUS!TTEwS*<%=c2F&s)?F{K9tGBOA{hZE*G=nShz5-d
z@5*K*vf*=&LgAqh$fsoI^_7Nb$XHv;lY7~eFJ$C&7DTShG`E#!vyLYsa%z2P8TuUS
z1oHBs&cRtG;KcU!vw^CE1#DOIii=D03X6K$n~U$&&OpbCD{2YI`L@RmH8s@*Mfav>
z7di%^z2oygK6UL{N#(~^Z_hzG+gjU(+v~siw?6_85{E^h>5`0(7_l<b^5nUIgLcT!
zU{_byCnwL8Rn->Ux>Z@*c)6gcrn-6oHpdZZ_X+qp_fFged^<1iMrk#hfN1WWtSBie
zDyf(ng_yn3g9jWtAbC~5A+N*d^;>LK92N`e6Uk&G3LEr!q#}V>Wf1aMB83)<LST__
zp@2`K^T7;4B9i$WHj9joIaR}hLj(*;Z}q$oFz8IpApeCP%;9p_42nR&=ZWNMwL&RZ
zPzX3YiH^mSbQ(?AZHahoVYfB08Qve@a?pS;0N$1>wHCd4ZB3|DsfAKCi$)@nNRb49
z1Ok*`s81v!!HCDY(*}<<7W5stb#OXhaECy@I7G|jR-?gfT=%Wp0&=NYrEvwqaUnyc
zw})q;EU!Blj3iukzstQbH-{$@IPgXC@ZbMyT*H--@BVj0!Jm(O_dlj=Js<G!So`qU
zlgI7P0$#<bcD`D&5jI);V!2IgaKPatJb_ClFnYgsg3(zp@z(!ZE&I`8{-5jz@W4ph
z_yn+i|Ct`lW*cp`fZ5`+IztkfEx561wE`bJJU34u5xL7K*3#wQMHKyD^oRcoUG&$`
z4}W$)fMcl(;BBSCV<6q$N&;Xzm&xQ_;TE{q&48Cw3L^6_1UxwhVX*KrrG!LU8W?)G
z2RP{4z+mM#nvOzKPfxSaL^T4d^7$h&z7Do5UlW;87&&Z7#1-3|&cM_Zn#~l=&f<Ij
z;)GL(o__0p5Gudl_l*-T1l-(OYBFiojcNjJcUIm5yqzF1j99c7fs%qaxmNE`Yi-Lb
z3?h+-Ss@Mo;Q!irh>7=p4sqk}XFmDGeE=>uSafcihDcZd*3$tqNV2&Z!75cXI>A~c
zsPJS3fv5@u!c$NTgDzZLqRpNDwSY;qocC+=Cl^M*zTtj08~*Zle&L57oKs5I>L1in
z2$%=8)$^;YP%v<_Fb|2sT)k2NcKW)zyD>x>aTQ+EK1ibwZk1FpDTI|p7#N(N4_Kx*
z>U9#HfT7l@S5f2XJvbbR|Kzih0O{vqG+2xVYkG;nVAbm_cDvgyrpTAN)#wrRD#XNC
zdKth<#hOse*2>wB9+&O`&KURwCV+;*Q7vv9SkYj|RH#9)>%JerdYi@Ou!g)QU_Bi$
zkgeUjj>VEs-Mi7YbEgikN6nWlcB)n(s?{N@0KYH5zx03q{n!5PEtkdE+R|Kd_wIw5
znuo1@4!fnbz57~0;f*`@dU|?$d;9zP`#K)h)U~uctSzgpt!=BX?C%|UA>bu6oXVkt
z5;SIJe4;H4@b)rJL%~bi`{_$48DfqzJk1+jlzTiI@I?v|{)+Lu?0_wHYjiWTt`R&7
zI0upuFpEtJc#P?Q57&#1#Zni0=aw>DW|8erUpz!NwU#}4T+-fM-PBsTH%tM*k<g~a
z5%haQMw8d+3h6Wse=z3Xh=LX^At)F$<3Iqnw3Q=JGdMg94j%&64;e5}7!pb#Ay!r<
zfb}m4@c!lKt%F~@OxmC9f0=Z6n+>4@k{kd&27Huz@aUHcczOEE1dKdNfI$??pwnuN
zW`M_GHQQ}Am&XSJli)HQi-I5}IKu)K-Wrt>9ARF!Sa%OIM#AAxZ0E0`Y=DudX}~y}
zilw|nZY1@H87#tctkaoz5TMPSb@2YrvCd!-b7UQiqnQ9l{MW8ty>_ddCzcL8x?kT=
zf497*s;(*Tdhw-`Kdx_Vzg$>3wt)KMKmMBE#4o-7;C^YznZk-|Wo3D1-Yw2Qoz05|
zvh`&MxWk`X>p(IcU5UpKu(_Fec);)F^94K}Pa>1^_(HBgq?C!7REkn#RH}6}8Vz(=
z21j5uYE*J*XHS<>CX$JTu`E3}6p6Te-fS8ShvT`Cl=BaU9JfD^O*cYcP3u4o>{oWc
zNA>x0@b$j7x9iKZDUy?`IXD;$g0yD|bE>iH^ux?LhNb4zde<WQIo2oev>aIn+l7bc
zWEBl{e%w@@O;J47hC|=n($>;cU)lKh?#*i*{Uep7#TWB#W2o%?yE*+x+{MTJm$K*-
zf&OXCQ&>=Vx2*hO!-Mk5%Fd3?qT9C{+k4u&I!j9KwYNT*SzN8Hta?yWd-ju41-FVn
ze&;PHeCknS9dd3g|J+H!nspMkf+Di=Zh`OW*GzSGrd#hrV4q`sn#2HgIyyR<AGg)q
zy<Sq+)>d0uT-osGQA<^2RZssAjZV)muBxbR80&1md8_0}TW4ECRdq?>*>l$^6zrY5
zr8P|*udqzoJRo^hz+tbQNTOh|C?u9F=Fp~RU}P$R!(GFYnTG*55oEJDGqdxnC?sDf
zAyDX(BZGQ}mqf&_ps)*5V@n7WYIzljTv?oijE|2GL*XbQ7PX2}iaCgt)p;Zifgz&F
zEP=wZj6lxMEoqga?d?|p45mC31_zrOot&72&MzX6%g|8>Y8kvMg(Z{;wN4Cyy0Eac
zxU@Xl*UhC9X?SF7YX=Ml2bCd^;pYK9{2qMjaos1)H7A>E(g7zE$xtM*xe0bPb}}F+
z9gQY^p3tXT+aNsa_eXZh!*S4Fz21t$vDHf5+?iiR7ymUp?@y37zy9)oFShhuXz9Dy
z@)TfDClZN+yN||_;cyJNBAd}9*aVNq65&X~V)g=u30%hFTi}WL124Hvn*nfP=g7_O
zkuL%U?+Ffv029FOW;6j>f<`l`G?8+l1##`q=g<D;Qr_==nv7>NbhH4sV(<lneO04f
z>3~ClaL)jB0VSv61tasa@hJw_ze6mqIrQePY3VXb+S87KE=s^#aX3;ITS6hwhrjz@
zjO59YcYg=+5C85Z0iSQ~X+sd_Y1~JXbLX4;(g1I_wxXvHaxzVg!HD{LDI+ripMO)v
zkq<%`BX9`{EuEjFj=`jfSZp4xdR@SMe7#YjQLQpL;6s)UczQvE#z{N6h>IwhOks0-
z0!Sov9!4hI`>tNVTh9AU%+22nm{o58;Ex_vl9g(++dYYaefX$q4=|_`1Knja<#q!1
zGYPs>BoYH%2MFljAa%HcHk(@_(egNA9&!qn_vggg59ZGP7I(1ZB>|&EdbPnolPDzy
zGjtVu@iV~NTid(4SP9_HTdaPN4~1f>jh)>#Y<YY;ui$KJG@1zb!><iks5b~SdcI6{
zuBkU2a4en-M`FA84y<hhV?3T*D$}ns;70PaY_^fpRj{4hsSplt+U*{&S8Edz%v_9>
zj}6*%N2>>SU~s^2<<mVl;tOIa8oqGdXmBuucAeg-P&y1C6&n}eVkFH7-h{~%v$-<V
z3U!@4HTuK<Gxy$qqqkp1Uiqz;pMxhT0+r1LN+t>Pp~dArz@UUo*AWQvHL;m1Fi9j<
zq1>^(wS_@v*&KZB9<0@>Eq497;cQb+I$$tzs1!E2#!aM1NEE$7?Fa-SO1V`cw@XwW
zkx<VPIpr!lsJXI2BN5nQ4zK@PC%8{OnY;20$lw3lqXqbb#)>iQ;s*~a(*c7?k3>;3
zg%+#HfurihViSvFWU{nEu9i&EuF0+7O~A;^;z-aas*yCwpC7gJ;ne2Si|2po<pE!A
z9RPZ(XZ%VV$b3ErZ*4{;8n4eCz>>8pl|wGItSKB|LKX;&2MV~KDA(FNKDA!^bPrC7
zWDXX`KxgXY%5^T&I5sbc#S?6X8b?;+NGgTON@nP#DklJjLeWtuhJ?$TKK~bbGJNFi
zpCA6te>_@%fxf>-H*JW1p@7JN#}n}RHnz7CPAT0Xp}7=nx0-(dUUUv5BjB@-dQLy=
zKJ%z2-O0+dgpFsPSz}&r0E{j!CEFpTyVbmi$9m)d1I-S2|8gV&XI~~A`Q4;rz{h}V
zr-m=KHDpsXj}_02q)rD-;i-ikkn34=hDZn7Ik~ewiKRTp`W%UwBkLegdRTyg?EDZy
zayyI0qR~ih1gv#Z=C=~@Y#NV!HLZhK^wIc9|Kp!B%$Xb>;65a_dUQ6MGNj7nXWzKq
zYuWDWRuYteG`Y3+*PYQ|Hw70j+$vA~nBW>^cDeud%D|nBDxu8-D?5@h4Rlvh@4wT4
z&oZg<ET*zr#~`O$>+ZB=Q6d_a`Z)t&1!Ph;zI(H&bSv??0y^>G4bc_DGr*z9rZ|Bl
z8uVasIIT|4WH6-)6>bH=VzC5kVu#JRCXwnvcn`IzluOxc7M?^SGkA11Tg0Urt?rj`
zb7=4<(1v%R4ew=C9%cyCk;&weH9m{Q#t_JKDw#x~DkXfY(`_~DxE!9<;dWT`E2~&M
ziSepV*2GY2Y5seq*WS;lh`C`<$6~Q?xeS3&3LPE9<8g=;j6x>DVzCOX>F}MboB%e6
zC~ZB%H*ekU>>j}4k$10MDY#WsTU)O+tB8wZwN;f@E?um+S9&q;%9YFKKmPb^-{@#v
z)y@8C%)tOo2CJ*9!TZ1e{`<{+Q$jwg>V7%2ui<u4ap9GVm-27aRh1Q7I(@t3Ud!NQ
z4ghaoyms^Mo&1J}U8UE~=3l*f^=@5PYjwxt?#8y>HxKZcot1v~#g?Z4XKbR|9S{mt
zQkfxY*NVp~gphLKKv8nTm0ssH08iDw^DN*OiB@Zs$&GTk!DMoXppD$YQciy{tLp}{
zqaa{bzY^fPSKs|&501a|MiH2_QW0r^K;dwBc#v}LKpCg^ws5TGNC3Xj+{;wz88Y>~
zf$^sSZ!av%5KC)#vV3kqFf}KPZGB3i2owrEg~U}Xv>=P$A{70BaPoly(Yp`8?=G}m
zpu?JBPtHFBcxF+=XKO~Md2=w~5?YE}5)M!C7g3UBlsLH=o0weHsdN<T+7g1+^Jgav
zOd|MULGt74YAj@Js{SPbm*l@+Uhn~QxV_@$C*_47rUS;4wa8`u=m;BuRg6pvkTA~Z
zqyR@$n$#ARCA5r|B4GTHSpg9vf{b&0!Gy_V<BE)A5@+Ds|IDMN&R+i7(BJ&aBLVn)
zQ;*DO@%T4j1QOUX+XD<fnDNAxTH}mv#)J}EI1*3o3__vk>1nKyFpezxF6QoE_kZ(*
zRe*nOz*BW^YbA86lA+<iKtE0g3@m~zES1J-TK6WBTRYps(d6z)j|BMZ>@0428VwG;
zp;lRw@BBa7!%xQl?!>^iPmF&5znVF#FA4Zg;d#tVA1EOZaYL<T>410kfTM9>4(wuu
zf$2zWw*d*TAstWdY%YO61$Q^NLg5&w?{s>hP|TW8IrumKmQeF9ICwYwkN^It0Jiu-
zOr?P*7J?nwv>u!b$uLAK#1tj5k2Y5`RsXb;CAUaqc9q6ubA}vtKS;fvU@WmkXB)sK
z4>&{v9=+ciw7DZ-b%`U1n0&2Nu|D(3FR)rq!t(wEUHV-OcJ%px`+7R5_+_O`h*_FJ
zPPCPP!W7^f$d@-nH}z;7UZLJf<8cok@MP_eObU+EBy}0rp!IKk4miFEb_pS4+$D@+
zWmP%`A<ZFWPLmDCwJolQ2?WVN4{>T)4e2APecQoc7>(nKWO_1zIsBdfuEjxNSHGdf
z4hY7opAWb=@5d}I+wXOo73`ZAeh5mwf`EZu>wpw?4(C4^1o^}7!O+I{flh<;={Y!=
zOs#jfz?MG9?k&i{MLeDa6;kU|Py!ajCX;=A-4O|I8mO>!){34yrzg$CL;ja>vdRiR
zNM*jVfcNy!0cT$(<wCMAlioDI$AFIkmkmMBH}_^!EMJ_{M@(I4nSAi$$-1{PDi1x7
zQ|n{>&Bb|d7hlP&OS6!#0$`KFDc0yD8hu8!IGn-UNGci}@HmVrVKxOZNKh?z*4<9K
zTq?|_W>aph=NRx&l4HpsU^HSHj8xfFvc`$$M#AARu+E{bjJB7JwwGsACIJpY9M2pY
zJ1FZvEr6S=uY(wDHl-1kW09aY5Ryy8JRZ+rvMA(IiCC)Bs=%w?<J4<4p=jduW<f9y
zO>|Who%)NS)0q`M+6-#yv^t$yX?1uE1|5@1(rC1=W+}V%p9;W_Yi|ONF`LqeD>fDP
z<Bv}c!?2TmtvH^dp{}Z>rLV86tuXJ>gUVZVl@%hb{k7ek$)4)sGhe%V_UjpSaqMx@
zYl2Qq^!5*aaQ1w2Yv1F#>b~L0g9LmGIGF&U*XZu=orX7~v5i0gxC!BK#A3DuLy>hc
z-6rRGwW7pkC>MZ1on21{9M+8lfoueVp{M=>6rXP+8jVGK4v$9Y)rtKkMP_@)fWd&=
z-(EY|QQP&f2n1vI0E0R#o>?ZbNE8+h$3UQH!Gj@_`DiqQfy4KF{RE}vd(e}=HFx$m
z_6fM=*877kcbbdeE&?TKfSDY_&Pf8LT_#!Q3N31xnI*E}u~LgCYO{L~NE&j5+4%=2
zsI7$qfA=3p{`y2_d&hu_@8mmeCcRo_Pzp<~zP$(7ZTB&R77Rv4W@u3;u}JPnCbt=k
zH4KKuArcYAKVGLVjJ^9yi}`=LAHYSY{#>J$I_+kYR^D9nqt5}yVhDnc%g}(`x@82P
zFSL?La<SUYqAA^xZJX0eqKQHLdF)63$EW7N&;0V_TmLPyy<@;dx38v3>`qtJ^>@;H
z@ZJ}Z0NT_gaBerjrd=`_@!BFjd&FyxM>h7^gNx7nC3$7Mx4Cqox3qW<aN1~`Y6Fn;
zLeLE0Tt@@$R5Lbx&dm0X0pBUSuvd7$;H@;kIgw`oH<q02slOs-AbJ|E-97V{=|l8^
z$+44l>%tFG3i5{xxW4$KzQ%&?y8Ql!*UQd-;}~%6z39UQ3>0Ki3i4k;z{i01^dJEr
z18%9g0TxBs6hyLe47jTJ^j`wT85KU(vR^aDfW-nfeswXMD&-Py&IDN3sl+(sBpx}H
zQAIqO&*#gX^{+JGV>t$VEXRP4<rwg>e7S&ACnVoQNq<1eH&DQnKMcSwx6fvGy%B16
zxYIAenVP+bwAJPWC2y7nHiCx%*yHtcczpA^S)<WwWKy-k!entRHm63dQR~*#Dve65
zGnlMOnN+OQTP#*CM_@9Ujq5g}aouWj33z<F&7sq3sdTp4=90=(cDLW{4UkAo43WlU
z^R)(x(c*A8J^NIr+b0%F!N*an(NSp(m2MsMfIYx=r$@jS*c~pn$8RuMoKDxe)#LF7
zJRUzt9Zs)CYjC@L4!6(g@`4Pg2Gr&9X0@1m-3W#b3GfsY+S2&2rm{jJmJ(RP?(Uw(
zM-A<reWU$Pif`R`*xuV%*GQlXMtXWC;fo`X(Sd$QeO>*~KtGqV+VQx(v9`LWyK{IL
z0!O09XXdJI7ggWAd#|({zBFE4SySE6HZhCb|Kkt|*O1H0VugXtWboD`G_EuqFd*94
z&{p~2Vc*~gY#s_}Z|dkB?d+TB8;3)o<Ns9NRWP}ZBjGK)e|TJUSa8fxaLn+SnT9!J
zhn(19W(FsA90rFcM_;14Y#!`Ovb%5QX0J=7YRhU#?oZgMv?`_PO;cLdr`Br9mB#(2
zaG86sv$@Ur)BhI$=W={5S3oR?l2EE<vV5T^@&yDTpW`tg^7*15R*(T%^7%q0Ti|Dj
zrIM7(7kOU5BT7Ilh~-=k;w2OUnQUIb=+E)uM^^_%UY-}KwT38`F&xpJMSv^Sx|uPt
zEXUZqE|)tJjd3>jF6Fkn13s6%QZC!<&Ui*}J8e>>ZgmA%JACB_Q#s+24=`pb%x@PW
zR2CmA^+kZCavifb0{Q_0=@9igc!U;tT#N~W@W}_b-yie{buUIB)a|~1ammb6bhjhV
zLTAk&e`LWAD?1#H&H`X^#vp#9E(F0Pxm2rt(Ay7v{R)_M1wVA9sO?M*9jNm5l|OZg
zWwSMt=Nmd*#O~oKIs%WmN6HXq&uVlr4INz+$z&@!V*r2s*I9XstDw;*J_J-@2kmjX
z4k<%L9;mboNz^D53QCK`oMQ~3c*0@jC>?XGq}-fVYz&a0Ac_vZfBYuj85r5qoA3Wi
z=(VF64MB+CM9>C7w^pmY{t5*Ue)O6+Tp^J)0?J&d6jGB_ZdEu_fNRy-mEZiRo)tBQ
zq%~NrS6aN-p{Y=YZ|$E1j}#$F7lnU}MG?Czxqs|vHTzGW+Hc>t8eGzc0N7{ODpfSC
z*H>CHXLpmt-Ms^)hLSs-u-me+b7(Z^&5XfhbxHY@JX1?smi@8V8=aQb>vgD)m=S<(
zCLE}gN@b}$#wS;cfd6znMQSp6-_!tXAPBxtDBy9?iej}|(%Br491Ugcy&<$n1mM{Q
zzKTNU1)8*)&gc})0A!#(#7EO^_loTQx~XzJo_ekT^AYL8|0KH%U?^R!RMV8f#&TNq
zv5um*_fJ$Oo27hOZ1v}OK-V7xFl#h$77M34Hd(ETqa&f(Sp{IuY}PZ3PNRJCeCt@D
zad>=@cvN$^JDE(*2VhiudNJwk027d2C*q%PDZsCbV~Ji0FzAim5EqT9=MOLvNLb{_
z<6>sQy)L_0$XhNRdt*$PSJDYBNW(#D8*i2ZJl7^-To=BWxD;SiJQ|Hr%V0RhYK{gV
zUIAdTI-FurJ{_N8l7o1+OPX|k07EGoFP_PjdLmm+C1H%r+8t>#n~-WUZY;1l(+rz5
zb4ld&ZCxcLbmc)HoGVE%1a^sf>y2K&H?TT#7$gYcU_q}93B?9@ynUqsETb*wV|rR$
z%B4dgf34Macmi;4361HECIiD3vPp}@8qXG3MrYwzhI8=wEDAcE{3GZ6tKs&ihW+L$
z0ORYv|AX&>kt*%DKMmEd2yiSesMOwQQZSg)ds|kcIjv-ps{o9iv480N+YN<OtUuWF
zKX~eTc!xb_faQ*S?Kj^q#j=}wzF?{rj|+DmTiwo#o=Lvgc5H0BjpoRc7v9vtZ|L8A
zdGasJHWL#Y**mgVq~@jD<~z6b*RC6H|6LVG)cg_g(k<@qH@UyxGH*P${N=Lo<|F%!
zYg%Y_k-}bwLb<)Mr`g{-xU+G<*E`r*p;+kr<V2;>8XN{%YjrA54sABOn$jODH75Fq
zms;opN!!mgm)`5k;wk`RtM!wg{s_#K>kOq1@{+tFz}bA+=}H%bnm;6Zy}6^4pjsEl
z`=tOwpL%2PSmmk+RbJ}uABWUOzH<f`M3~tJOc1b2fk$KU?O+g)p<q9b9Nm=L9pp@;
zM1OEPSV^#P31}GkQ8+|M_$Ogz;;%G-90##9wfiIDwiUIJSHz1BfI<2!CNzbEOw?#p
zUlvwbg9(xK5AWBSqUZGz6!8Mgic>VQlYn)bFy{>L$~SgS!Czb{Kl=Z&Kdji~jR4~y
z)LD~&4Y33?8jZCCQ5ONY+wHDfDLU@i0X$Dct)~}*Cio#3t%Y)5H)Bm-uS0W3(Cgj>
zP5elI_)5?69E>V4&)_RDt71;VY=kzDKYM|JJ`p2KbB=~{^DnX?1L%#XTjHXO&`f==
zei9kGbC285*xV9H77H><PRR5?6iSTet$2v~44BsmIS1<yna>GG;MbC!_b`0Lx|N<a
zz-Z^=8-Hx^B{dzBs$H)w`RpiYW0RbnKT-xlk&=>*M#Ew|X|~?^H4*XpvMSnBDYaCF
zBtEv^>C(8w@PYmJf6{L4x+A4QyVL%|U$h%aczh`8nYd!tb^9iF{fQS{f|S6gf|SY2
z=#7sK=yGp-qS29bkI!@O;S&dAw0m8Fpf?hZ=*^B3g)-u^H{=mA#F(#Bm)`@-Z(oD`
z9uGkd@nj&+Po$*!`ErQ-^EG&$h~AV*B~E8O3P6(XNIK9fr?15|m<W!0Z48ZSt@h8!
zXwjClxCWo~oekJUQwJN}YBLy>5`3p5G;FRs+{@;RZI`#;_7<>{tknm>$3Hau`U|7c
zw8d^;Mos&0Z--hN?aIS=Ot6?!I#ZT&6w0M)zBcrDa!#M9qGAq54qNMhGm}Y(NBZ2n
zQh54s*lZqOFdU6^dV^#-N78vd&lidfi4R7T3}cE!!ssLMbgo)1)MrPsZrvZ&eQ~KJ
zOL43*+uZR)%<FNmI$Et`tWNw?%(99t1Et0h_br<&lqSI9ZMT|DMx%*UDm4ZpW3^h5
zzSNRspw&)?O>dx0dP=9EEDjILv8+xrnVi!m>w?l!fMvN?%x80%)S%yQ)$4pgtkheL
zcCTKoiba01Y!@w+#A*e|4Vq0z*Q;eol*-7tbQj%~W$f3W;cmMDi+ZKj#IC9=6wYlI
zjm8ZxAQ52RdQ6(%=P`{*9`Gc6=`o22lSv+O2qbwaz;i<D$YekYJI`a%ct+SukyfBF
z&;!|5A|~OLvn-@Y%10rhS#l0WJWnL)1Pt;>Kq6<c@vz$vSga1KoP*n)eljUk>+Rir
z&(W^E+#aoX4hCU$c=$qFt+cJ~g3cI46{`b`6um(YYvr~wMpDibV6^7uwM(sH*&W~`
zks@o3Y3Ptj6G-P9C+d)j4r}PB&5=eYo|jOobvSzz2YDD>r(rOSNf=^%Ta7e|!&Jy`
zwy;vYsbx6yCn)UjM5$0y@t}{Qb-qY~QXZ+*>SLA8YhxO{F?vG6^5f|yOO{pvSd^M>
zcRE+BmMU!+Ru8PD)dAkz-1ylq?_vxa_2F;+M6njYk|bTea%nU=_3Az64=@&+Km6qD
zVkEP*?_<4UJW_c4+{Up9Pe6S1+>U!1wzeJjpE>cVL>x%4me|gLtt2+D-{o#Tu-<!S
zeQ=k)e?xoY62<x}D;{UJw|4jT4xa5E@Ri01rAM*Q*t6%G&o;Kg4zt?G?rd*Ult!sk
zo~X46ze8*eF?Hnqmtm?LkB6%Oj9T!6EMlqLfmis^>11_FRvA>OcIAGvJ?Qm@NLd}=
zX0ss(MKGxM`~e1$11KPz&5L-Pehy*gVbP9Mk{Wrw+U-t{gQsJpjQ=t04LcpV*1%19
ztN-4I>lnxd-@s>{2m%mfik_nfos)8rHXilgXvu1|S}-t;)}i?^sZ=VhC5Yef3BcG=
ffgi0&uQdKYefAKDbN5|k00000NkvXXu0mjfQUAna


From 056206098b874118e4f23c0cde341cc172fb269e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 12:50:29 +0200
Subject: [PATCH 453/490] CSS

---
 htdocs/admin/modules.php             | 4 ++--
 htdocs/core/lib/security2.lib.php    | 2 +-
 htdocs/main.inc.php                  | 2 +-
 htdocs/theme/eldy/manifest.json.php  | 2 +-
 htdocs/theme/eldy/theme_vars.inc.php | 4 ++--
 htdocs/theme/md/manifest.json.php    | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index c0f1991835b..ab2889368cd 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -1198,7 +1198,7 @@ if ($mode == 'develop')
 	print '<tr class="oddeven" height="80">'."\n";
 	print '<td class="left">';
 	//span class="fa fa-bug"></span>
-	//print '<img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner_int.png">';
+	//print '<img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner.png">';
 	print '<div class="imgmaxheight50 logo_setup"></div>';
 	print '</td>';
 	print '<td>'.$langs->trans("TryToUseTheModuleBuilder", $langs->transnoentitiesnoconv("ModuleBuilder")).'</td>';
@@ -1208,7 +1208,7 @@ if ($mode == 'develop')
 	print '<tr class="oddeven" height="80">'."\n";
 	$url = 'https://partners.dolibarr.org';
 	print '<td class="left">';
-	print'<a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner_int.png"></a>';
+	print'<a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner.png"></a>';
 	print '</td>';
 	print '<td>'.$langs->trans("DoliPartnersDesc").'</td>';
 	print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index c7f5a7b7330..ce346c0d26e 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -279,7 +279,7 @@ if (!function_exists('dol_loginfunction'))
 		// Set jquery theme
 		$dol_loginmesg = (!empty($_SESSION["dol_loginmesg"]) ? $_SESSION["dol_loginmesg"] : '');
 
-		$favicon = DOL_URL_ROOT.'/theme/dolibarr_logo_256x256.png';
+		$favicon = DOL_URL_ROOT.'/theme/dolibarr_256x256_color.png';
 		if (!empty($mysoc->logo_squarred_mini)) $favicon = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
 		if (!empty($conf->global->MAIN_FAVICON_URL)) $favicon = $conf->global->MAIN_FAVICON_URL;
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 49c48e34ec1..98d00a98404 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1209,7 +1209,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		print '<meta name="author" content="Dolibarr Development Team">'."\n";
 
 		// Favicon
-		$favicon = DOL_URL_ROOT.'/theme/dolibarr_logo_256x256.png';
+		$favicon = DOL_URL_ROOT.'/theme/dolibarr_256x256_color.png';
 		if (!empty($mysoc->logo_squarred_mini)) $favicon = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
 		if (!empty($conf->global->MAIN_FAVICON_URL)) $favicon = $conf->global->MAIN_FAVICON_URL;
 		if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n"; // Not required into an Android webview
diff --git a/htdocs/theme/eldy/manifest.json.php b/htdocs/theme/eldy/manifest.json.php
index a4fc5c3618e..bc6262d1a92 100644
--- a/htdocs/theme/eldy/manifest.json.php
+++ b/htdocs/theme/eldy/manifest.json.php
@@ -46,7 +46,7 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli = $conf->global->MAIN_
     "name": "<?php echo $appli; ?>",
     "icons": [
         {
-            "src": "<?php echo DOL_URL_ROOT.'/theme/dolibarr_logo_256x256.png'; ?>",
+            "src": "<?php echo DOL_URL_ROOT.'/theme/dolibarr_256x256_color.png'; ?>",
             "sizes": "256x256",
             "type": "image/png"
         }
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 79b58c5c3ad..fdbd23f1a3a 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -53,7 +53,7 @@ $theme_bgcolor = array(hexdec('F4'), hexdec('F4'), hexdec('F4'));
 $theme_bgcoloronglet = array(hexdec('DE'), hexdec('E7'), hexdec('EC'));
 
 // Colors
-$colorbackhmenu1 = '55,61,90'; // topmenu
+$colorbackhmenu1 = '38,60,92'; // topmenu
 $colorbackvmenu1 = '250,250,250'; // vmenu
 $colortopbordertitle1 = '215,215,215'; // top border of title
 $colorbacktitle1 = '233,234,237'; // title of tables,list
@@ -75,7 +75,7 @@ $colortext = '0,0,0';
 $colortextlink = '10, 20, 100';
 $fontsize = '0.86em';
 $fontsizesmaller = '0.75em';
-$topMenuFontSize = '1.2em';
+$topMenuFontSize = '1.1em';
 $toolTipBgColor = 'rgba(255, 255, 255, 0.96)';
 $toolTipFontColor = '#333';
 
diff --git a/htdocs/theme/md/manifest.json.php b/htdocs/theme/md/manifest.json.php
index f8d059752a6..e3423149e30 100644
--- a/htdocs/theme/md/manifest.json.php
+++ b/htdocs/theme/md/manifest.json.php
@@ -46,7 +46,7 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_AP
     "name": "<?php echo $appli; ?>",
     "icons": [
         {
-            "src": "<?php echo DOL_URL_ROOT.'/theme/dolibarr_logo_256x256.png'; ?>",
+            "src": "<?php echo DOL_URL_ROOT.'/theme/dolibarr_256x256_color.png'; ?>",
             "sizes": "256x256",
             "type": "image/png"
         }

From 0409ec00d7ccd65db2a5fe631c9e30fbd9bfcabd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 13:01:32 +0200
Subject: [PATCH 454/490] CSS

---
 htdocs/install/check.php   | 4 ++--
 htdocs/install/default.css | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 95e3082cb56..1b7ac620057 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -430,7 +430,7 @@ else
 		{
 			$choice .= '<br>';
 			//print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE);
-			$choice .= '<div class="center"><div class="ok">'.$langs->trans("InstallChoiceSuggested").'</div></div>';
+			$choice .= '<div class="center"><div class="ok suggestedchoice">'.$langs->trans("InstallChoiceSuggested").'</div></div>';
 			// <img src="../theme/eldy/img/tick.png" alt="Ok"> ';
 		}
 
@@ -534,7 +534,7 @@ else
                 $choice .= '<br>';
                 //print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE);
                 $choice .= '<div class="center">';
-                $choice .= '<div class="ok">'.$langs->trans("InstallChoiceSuggested").'</div>';
+                $choice .= '<div class="ok suggestedchoice">'.$langs->trans("InstallChoiceSuggested").'</div>';
                 if ($count < count($migarray))	// There are other choices after
                 {
                     print $langs->trans("MigrateIsDoneStepByStep", DOL_VERSION);
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index f363789c129..e469a3bbb80 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -361,7 +361,7 @@ a.button:link,a.button:visited,a.button:active {
     background: #ddd;
     color: #fff;
     /* border: 1px solid #e0e0e0; */
-    padding: 0.3em 0.7em;
+    padding: 0.5em 0.7em;
     margin: 0 0.5em;
     -moz-border-radius: 3px;
     -webkit-border-radius: 3px;
@@ -374,6 +374,13 @@ a.button:hover {
     text-decoration:none;
 }
 
+.suggestedchoice {
+	color: rgba(70, 3, 62, 0.6) !important;
+    /* background-color: rgba(70, 3, 62, 0.3); */
+    padding: 2px 4px;
+    border-radius: 4px;
+    white-space: nowrap;
+}
 .choiceselected {
 	background-color: #f4f6f4;
 	background-repeat: repeat-x;

From 160ac14eb30c04818edb876fb4a087b002339e13 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 13:32:57 +0200
Subject: [PATCH 455/490] Update logo

---
 htdocs/theme/dolibarr.png | Bin 794 -> 1711 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/htdocs/theme/dolibarr.png b/htdocs/theme/dolibarr.png
index 1ef6b77d4ca2cf880ef5158128f0b1b8917dca2c..3f7c35b6cf82059973602c2bf0cdbbf68e84b76d 100644
GIT binary patch
literal 1711
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
FV1ilTO6ULp

literal 794
zcmV+#1LgdQP)<h;3K|Lk000e1NJLTq0027x0027(0ssI2N=Ien0008vNkl<ZcmeI1
z1F+ms6o&7!Z5xZ)w#`9pw`0|IJE(2j=Cf^^%UbEF-IG<CO!KXE_n$8(7jq3e&D~8n
zg&{>z97{|9-ZAf(cg#EH9djnJmAP?<mlIKu?9y80vseG7Dj@EPDZPnWRMg4K>lE1~
zwXvC{*`;+Hs0w#S8@RRz^%~u?sp8p-i;vSUhGi(9z2wH3XKijerdKn#9=;im<krx!
z)(-`Q9@Ig&_Q-?StTNUl#(kTuoZ4sWxv&e5Gq}_r&l=hu?jbbW93!DA3PPuIX#|-)
ztX*bNbyi6&hel~V2t9lA1y)rBg22~xa0k)(M`;WtRy=)v?qTXrU9Z5`S>Wpe{s=vW
zb`nD)3{^#Wt^DBiIPyDM3cSYmZ2<}ihKG}#z{feWxJC<(L9*J%Av&W3uHbL(h>oc5
zmO}50qH1ka1&z3WZ|dxWRQP<}$WBONf!F@4F>L88phkPN2p0Oekv{{UVrL%FT3<n@
zsoSyHXeKK&W5x5AO!RJaz7v&JJZ~iOolqa==*$v4F$RTvOfPY1t&E-@>i=7rQuI0t
z8Z%52I{yVtv89d$J}!9W)JR!W6>Y@61f#50P5?GIhLRZGwFx4)S_188Au)}(c;dwq
z`{?N*qjY*f6|}>EW28%hdEC;;ecCqkCm4~b1xR9@7p};+cWXhf)&e~}eHvcg-H6E|
z0AqDLvTNhst%c+xo-VewmKH=6ZbW86Ba9}twlEV1co22jeK8zQOjyIN3t`9@uI0Ys
z3q&nSs_J)L3@13u^~cBww_xWL<mc?E3Wz&y+2QoUN&+zN7*ILx(nD!@T!vPr2ql$u
zb2gqTsgZGD=LXd7JRi36LYOY+$6D$u-a*!Lk5Al+lRtYwa2TlLKYWyuTbh<vky=o3
zEi#><otyB~f<~iP5R4NyW7G1=$#<mXSAb6T?&ry#J`YRD=XW6aU0&WX@0fSYJ7yv8
Y0Sd_k&AHuYx&QzG07*qoM6N<$f`t}#cK`qY


From 25d1a2a1d81440368ac3ff802d77f97f64c82f0d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 13:36:56 +0200
Subject: [PATCH 456/490] Restore missing png file

---
 htdocs/core/menus/standard/auguria.lib.php |   2 +-
 htdocs/core/menus/standard/eldy.lib.php    |   2 +-
 htdocs/theme/dolibarr_512x512_white.png    | Bin 0 -> 8921 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 htdocs/theme/dolibarr_512x512_white.png

diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 4b4a4c54151..e55da6f93ac 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -147,7 +147,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 		 }*/
 		else
 		{
-			$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo_squarred_alpha.png';
+			$urllogo = DOL_URL_ROOT.'/theme/dolibarr_512x512_white.png';
 			$logoContainerAdditionalClass = '';
 		}
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 3f539260856..be455d5431a 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -514,7 +514,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		}*/
 		else
 		{
-			$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo_squarred_alpha.png';
+			$urllogo = DOL_URL_ROOT.'/theme/dolibarr_512x512_white.png';
 			$logoContainerAdditionalClass = '';
 		}
 		$title = $langs->trans("GoIntoSetupToChangeLogo");
diff --git a/htdocs/theme/dolibarr_512x512_white.png b/htdocs/theme/dolibarr_512x512_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..06e69ad8b7b66c0fb6b464644290dd3bcc66064e
GIT binary patch
literal 8921
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
L`rV>CkKg<cQ{I|z

literal 0
HcmV?d00001


From e4ef6334aacd527f6741fd725834ff7e0e0460fd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 14:08:36 +0200
Subject: [PATCH 457/490] Look and feel v12

---
 htdocs/bom/class/bom.class.php                         | 2 +-
 htdocs/core/class/commonobject.class.php               | 9 +++++----
 htdocs/core/class/html.formticket.class.php            | 4 ++--
 htdocs/ecm/dir_add_card.php                            | 2 +-
 htdocs/modulebuilder/template/class/myobject.class.php | 1 +
 htdocs/theme/eldy/global.inc.php                       | 2 +-
 htdocs/theme/eldy/theme_vars.inc.php                   | 4 ++--
 htdocs/ticket/class/ticket.class.php                   | 2 +-
 8 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 86e0b84b655..790487b4032 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -91,7 +91,7 @@ class BOM extends CommonObject
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>5),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'noteditable'=>1, 'visible'=>4, 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of BOM", 'showoncombobox'=>'1',),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'notnull'=>1, 'searchall'=>1, 'showoncombobox'=>'1',),
+		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'notnull'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'autofocusoncreate'=>1),
 		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>60, 'notnull'=>-1,),
 		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:1:(finished IS NULL or finished <> 0)', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'help'=>'ProductBOMHelp'),
 	    'qty' => array('type'=>'real', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'default'=>1, 'position'=>55, 'notnull'=>1, 'isameasure'=>'1', 'css'=>'maxwidth75imp'),
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f3f1b9eaee3..4fcac1979b7 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6046,6 +6046,7 @@ abstract class CommonObject
 		$computed = $this->fields[$key]['computed'];
 		$unique = $this->fields[$key]['unique'];
 		$required = $this->fields[$key]['required'];
+		$autofocusoncreate = $this->fields[$key]['autofocusoncreate'];
 
 		$langfile = $this->fields[$key]['langfile'];
 		$list = $this->fields[$key]['list'];
@@ -6122,19 +6123,19 @@ abstract class CommonObject
 		{
 			$tmp = explode(',', $size);
 			$newsize = $tmp[0];
-			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
 		}
 		elseif (in_array($type, array('real')))
 		{
-		    $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
 		}
 		elseif (preg_match('/varchar/', $type))
 		{
-			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
 		}
 		elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
-			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
 		}
 		elseif ($type == 'text')
 		{
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index da41a02491b..a8654f6bfc5 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -175,7 +175,7 @@ class FormTicket
 			print '</td></tr>';
 		}
 
-		// Si origin du ticket
+		// If ticket created from another object
 		if (isset($this->param['origin']) && $this->param['originid'] > 0) {
 			// Parse element/subelement (ex: project_task)
 			$element = $subelement = $this->param['origin'];
@@ -225,7 +225,7 @@ class FormTicket
 				if ($this->withthreadid > 0) {
 					$subject = $langs->trans('SubjectAnswerToTicket').' '.$this->withthreadid.' : '.$this->topic_title.'';
 				}
-				print '<input class="text minwidth300" id="subject" name="subject" value="'.(GETPOST('subject', 'alpha') ? GETPOST('subject', 'alpha') : $subject).'" />';
+				print '<input class="text minwidth500" id="subject" name="subject" value="'.(GETPOST('subject', 'alpha') ? GETPOST('subject', 'alpha') : $subject).'" autofocus />';
 				print '</td></tr>';
 			}
 		}
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index 4d6f2bdce5a..a826c6382ce 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -241,7 +241,7 @@ if ($action == 'create')
 	print '<table class="border centpercent">';
 
 	// Label
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" class="minwidth100" maxlength="32" value="'.$ecmdir->label.'"></td></tr>'."\n";
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" class="minwidth100" maxlength="32" value="'.$ecmdir->label.'" autofocus></td></tr>'."\n";
 
 	print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
 	print $formecm->selectAllSections((GETPOST("catParent", 'alpha') ? GETPOST("catParent", 'alpha') : $ecmdir->fk_parent), 'catParent', $module);
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 2070bedf568..12400ecb087 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -83,6 +83,7 @@ class MyObject extends CommonObject
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
 	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 569e84496b6..4eaa193e682 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3843,7 +3843,7 @@ div.info {
     padding-bottom: 8px;
     margin: 1em 0em 1em 0em;
     background: #eff8fc;
-    color: #668;
+    color: #558;
 }
 
 /* Warning message */
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index fdbd23f1a3a..0677c8e4918 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -82,7 +82,7 @@ $toolTipFontColor = '#333';
 // text color
 $textSuccess   = '#28a745';
 $colorblind_deuteranopes_textSuccess = '#37de5d';
-$textWarning   = '#a37c0d'; // See $badgeWarning
+$textWarning   = '#bc9526'; // See $badgeWarning
 $textDanger    = '#9f4705'; // See $badgeDanger
 $colorblind_deuteranopes_textWarning = $textWarning; // currently not tested with a color blind people so use default color
 
@@ -91,7 +91,7 @@ $colorblind_deuteranopes_textWarning = $textWarning; // currently not tested wit
 $badgePrimary   = '#007bff';
 $badgeSecondary = '#cccccc';
 $badgeSuccess   = '#55a580';
-$badgeWarning   = '#a37c0d'; // See $textDanger bc9526
+$badgeWarning   = '#bc9526'; // See $textWarning bc9526
 $badgeDanger    = '#9f4705'; // See $textDanger
 $badgeInfo      = '#aaaabb';
 $badgeDark      = '#343a40';
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 4db98cfe7ad..4545497be62 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -184,7 +184,7 @@ class Ticket extends CommonObject
 		'track_id' => array('type'=>'varchar(255)', 'label'=>'TicketTrackId', 'visible'=>-2, 'enabled'=>1, 'position'=>11, 'notnull'=>-1, 'searchall'=>1, 'help'=>"Help text"),
 		'fk_user_create' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Author', 'visible'=>1, 'enabled'=>1, 'position'=>15, 'notnull'=>1, 'css'=>'tdoverflowmax150 maxwidth150onsmartphone'),
 		'origin_email' => array('type'=>'mail', 'label'=>'OriginEmail', 'visible'=>-2, 'enabled'=>1, 'position'=>16, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'css'=>'tdoverflowmax150'),
-		'subject' => array('type'=>'varchar(255)', 'label'=>'Subject', 'visible'=>1, 'enabled'=>1, 'position'=>18, 'notnull'=>-1, 'searchall'=>1, 'help'=>"", 'css'=>'maxwidth75'),
+		'subject' => array('type'=>'varchar(255)', 'label'=>'Subject', 'visible'=>1, 'enabled'=>1, 'position'=>18, 'notnull'=>-1, 'searchall'=>1, 'help'=>"", 'css'=>'maxwidth75', 'autofocusoncreate'=>1),
 		'type_code' => array('type'=>'varchar(32)', 'label'=>'Type', 'visible'=>1, 'enabled'=>1, 'position'=>20, 'notnull'=>-1, 'searchall'=>1, 'help'=>"", 'css'=>'maxwidth100'),
 		'category_code' => array('type'=>'varchar(32)', 'label'=>'TicketGroup', 'visible'=>-1, 'enabled'=>1, 'position'=>21, 'notnull'=>-1, 'help'=>"", 'css'=>'maxwidth100'),
 		'severity_code' => array('type'=>'varchar(32)', 'label'=>'Severity', 'visible'=>1, 'enabled'=>1, 'position'=>22, 'notnull'=>-1, 'help'=>"", 'css'=>'maxwidth100'),

From 02b9ce59013d473546604837b03fa5814f206042 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 18:16:36 +0200
Subject: [PATCH 458/490] Fix length of title

---
 htdocs/install/mysql/migration/11.0.0-12.0.0.sql | 2 ++
 htdocs/install/mysql/tables/llx_facture_rec.sql  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 96506120263..5e673d97611 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -64,6 +64,8 @@ create table llx_facturedet_rec_extrafields
 
 ALTER TABLE llx_facturedet_rec_extrafields ADD INDEX idx_facturedet_rec_extrafields (fk_object);
 
+ALTER TABLE llx_facture_rec MODIFY COLUMN titre varchar(200) NOT NULL;
+
 -- This var is per entity now, so we remove const if global if exists
 delete from llx_const where name = 'PROJECT_HIDE_TASKS' and entity = 0;
 
diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql
index d0e4486262a..220c1fa608a 100644
--- a/htdocs/install/mysql/tables/llx_facture_rec.sql
+++ b/htdocs/install/mysql/tables/llx_facture_rec.sql
@@ -22,7 +22,7 @@
 create table llx_facture_rec
 (
   rowid              integer AUTO_INCREMENT PRIMARY KEY,
-  titre              varchar(100) NOT NULL,
+  titre              varchar(200) NOT NULL,
   entity             integer DEFAULT 1 NOT NULL,	 -- multi company id
   fk_soc             integer NOT NULL,
   datec              datetime,            -- date de creation

From 19bcdb6418eba5700d2b045ed2f7baad8bbd3fb9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 22:19:28 +0200
Subject: [PATCH 459/490] Fix structured data

---
 htdocs/core/lib/website.lib.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 1864ca27bea..977397c2ca4 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -559,7 +559,7 @@ function getStructuredData($type, $data = array())
 
 	if ($type == 'software')
 	{
-		$ret = '<!-- Add structured data for blog post -->'."\n";
+		$ret = '<!-- Add structured data for software post -->'."\n";
 		$ret .= '<script type="application/ld+json">'."\n";
 		$ret .= '{
 			"@context": "https://schema.org",
@@ -585,7 +585,7 @@ function getStructuredData($type, $data = array())
 		$companyname = $mysoc->name;
 		$url = $mysoc->url;
 
-		$ret = '<!-- Add structured data for blog post -->'."\n";
+		$ret = '<!-- Add structured data for organization -->'."\n";
 		$ret .= '<script type="application/ld+json">'."\n";
 		$ret .= '{
 			"@context": "https://schema.org",
@@ -597,9 +597,10 @@ function getStructuredData($type, $data = array())
 				"@type": "ContactPoint",
 				"contactType": "Contact",
 				"email": "'.dol_escape_json($data['email'] ? $data['email'] : $mysoc->email).'"
-			},'."\n";
+			}'."\n";
 		if (is_array($mysoc->socialnetworks) && count($mysoc->socialnetworks) > 0) {
-			$ret .= '"sameAs": [';
+			$ret .= ",\n";
+			$ret .= 'sameAs": [';
 			$i = 0;
 			foreach($mysoc->socialnetworks as $key => $value) {
 				if ($key == 'linkedin') {
@@ -613,7 +614,7 @@ function getStructuredData($type, $data = array())
 				$i++;
 				if ($i < count($mysoc->socialnetworks)) $ret .= ', ';
 			}
-			$ret .= '],'."\n";
+			$ret .= ']'."\n";
 		}
 		$ret .= "\n".'}'."\n";
 		$ret .= '</script>'."\n";
@@ -684,7 +685,7 @@ function getStructuredData($type, $data = array())
 	}
 	elseif ($type == 'product')
 	{
-		$ret = '<!-- Add structured data for blog post -->'."\n";
+		$ret = '<!-- Add structured data for product -->'."\n";
 		$ret .= '<script type="application/ld+json">'."\n";
 		$ret .= '{
 				"@context": "https://schema.org/",

From ba047428e2ab46041722912dd72d4cdb2820c842 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 22:21:36 +0200
Subject: [PATCH 460/490] Fix duplicate \n

---
 htdocs/core/lib/website.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 977397c2ca4..804509b4154 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -616,7 +616,7 @@ function getStructuredData($type, $data = array())
 			}
 			$ret .= ']'."\n";
 		}
-		$ret .= "\n".'}'."\n";
+		$ret .= '}'."\n";
 		$ret .= '</script>'."\n";
 	}
 	elseif ($type == 'blogpost')

From 2fe8e03ed6f3bda4325e1fa436c28d9216a33e03 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 22:23:22 +0200
Subject: [PATCH 461/490] Fix missing quote

---
 htdocs/core/lib/website.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 804509b4154..f3a4f738927 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -600,7 +600,7 @@ function getStructuredData($type, $data = array())
 			}'."\n";
 		if (is_array($mysoc->socialnetworks) && count($mysoc->socialnetworks) > 0) {
 			$ret .= ",\n";
-			$ret .= 'sameAs": [';
+			$ret .= '"sameAs": [';
 			$i = 0;
 			foreach($mysoc->socialnetworks as $key => $value) {
 				if ($key == 'linkedin') {

From 5fe4520385a89b8651218909d6f2c34bb0f53116 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 25 May 2020 20:43:35 +0000
Subject: [PATCH 462/490] Fixing style errors.

---
 htdocs/takepos/phone.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 0bc483b3fe1..2fd2beec15d 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -41,7 +41,7 @@ if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 	// Decode place if it is an order from customer phone
 	$place = GETPOSTISSET("key") ? dol_decode(GETPOST('key')) : GETPOST('place', 'aZ09');
 } else {
-  $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
+	$place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
 }
 $action = GETPOST('action', 'alpha');
 $setterminal = GETPOST('setterminal', 'int');

From 49c4ed5a085dc32a143220d80b21017018cc71ab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 22:50:00 +0200
Subject: [PATCH 463/490] Update list.php

---
 htdocs/product/list.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 97d08477946..064ac2dce4f 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -1255,6 +1255,8 @@ if ($resql)
 					print '<td class="right nowraponall">';
 					if ($obj->tosell)
 					{
+						// TODO Make 1 request for all price levels (without filter on price_level) and saved result into an cache array
+						// then reuse the cache array if we need prices for other price levels
 						$resultp = "SELECT p.rowid, p.fk_product, p.price, p.price_ttc, p.price_level, p.date_price";
 						$resultp .= " FROM ".MAIN_DB_PREFIX."product_price as p";
 						$resultp .= " WHERE fk_product = ".$obj->rowid;

From 416d1d0301640ce9c22483f1160ed3107824540a Mon Sep 17 00:00:00 2001
From: laurantines <lauriiika@gmail.com>
Date: Mon, 25 May 2020 12:26:05 +0200
Subject: [PATCH 464/490] Update list.php

Search by d,phone, d.phone_perso, d.phone_mobile in SELECT QUERY
---
 htdocs/adherents/list.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 6cb34192845..bf8353da5c9 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -301,6 +301,9 @@ if ($search_email) $sql .= natural_search("d.email", $search_email);
 if ($search_town)     $sql .= natural_search("d.town", $search_town);
 if ($search_zip)      $sql .= natural_search("d.zip", $search_zip);
 if ($search_state)    $sql .= natural_search("state.nom", $search_state);
+if ($search_phone)      $sql .= natural_search("d.phone", $search_phone);
+if ($search_phone_perso)      $sql .= natural_search("d.phone_perso", $search_phone_perso);
+if ($search_phone_mobile)      $sql .= natural_search("d.phone_mobile", $search_phone_mobile);
 if ($search_country) $sql .= " AND d.country IN (".$search_country.')';
 if ($filter == 'uptodate') $sql .= " AND (datefin >= '".$db->idate($now)."' OR t.subscription = 0)";
 if ($filter == 'outofdate') $sql .= " AND ((datefin IS NULL OR datefin < '".$db->idate($now)."') AND t.subscription = 1)";

From d169162ef12d370fa8994414cbdcc6aaa635d331 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 22:56:29 +0200
Subject: [PATCH 465/490] Revert "NEW enable free emails input with select2"

---
 htdocs/core/actions_sendmails.inc.php     |  8 +---
 htdocs/core/class/html.form.class.php     | 46 ++---------------------
 htdocs/core/class/html.formmail.class.php | 16 ++++++--
 htdocs/core/lib/project.lib.php           |  2 +-
 htdocs/langs/en_US/mails.lang             |  1 -
 5 files changed, 19 insertions(+), 54 deletions(-)

diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index d6c4c0a6313..e23d2ce01a9 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -190,12 +190,10 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				{
 					$tmparray[] = dol_string_nospecial($contact->getFullName($langs), ' ', array(",")).' <'.$contact->email.'>';
 				}
-				elseif ((int) $val > 0)	// $val is the Id of a contact
+				elseif ($val)	// $val is the Id of a contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 					$sendtoid[] = $val;
-				} else {
-					$tmparray[] = $val;
 				}
 			}
 		}
@@ -242,12 +240,10 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				{
 					$tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
 				}
-				elseif ((int) $val > 0)				// $val is the Id of a contact
+				elseif ($val)				// $val is the Id of a contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 					//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
-				} else {
-					$tmparray[] = $val;
 				}
 			}
 		}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6d1ce33b0be..622ffb1d127 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6621,11 +6621,10 @@ class Form
 	 *  @param	string	$elemtype		Type of element we show ('category', ...). Will execute a formating function on it. To use in readonly mode if js component support HTML formatting.
 	 *  @param	string	$placeholder	String to use as placeholder
 	 *  @param	int		$addjscombo		Add js combo
-	 *  @param  int     $enablefreetag  0 no free tag, 1 enable free tag for elemtype
 	 *	@return	string					HTML multiselect string
 	 *  @see selectarray(), selectArrayAjax(), selectArrayFilter()
 	 */
-	public static function multiselectarray($htmlname, $array, $selected = array(), $key_in_label = 0, $value_as_key = 0, $morecss = '', $translate = 0, $width = 0, $moreattrib = '', $elemtype = '', $placeholder = '', $addjscombo = -1, $enablefreetag = 0)
+	public static function multiselectarray($htmlname, $array, $selected = array(), $key_in_label = 0, $value_as_key = 0, $morecss = '', $translate = 0, $width = 0, $moreattrib = '', $elemtype = '', $placeholder = '', $addjscombo = -1)
 	{
 		global $conf, $langs;
 
@@ -6667,50 +6666,13 @@ class Form
 				$out .= '$(document).ready(function () {
 							$(\'#'.$htmlname.'\').'.$tmpplugin.'({
 								dir: \'ltr\',
-								tags: '.($enablefreetag?'true':'false').',
 								// Specify format function for dropdown item
 								formatResult: formatResult,
-								/* For 4.0 */
-							 	templateResult: formatResult,
+							 	templateResult: formatResult,		/* For 4.0 */
 								// Specify format function for selected item
 								formatSelection: formatSelection,
-								/* For 4.0 */
-								templateSelection: formatSelection';
-				if ($enablefreetag && $elemtype == 'email') {
-					$out .= ',
-								createTag: function (params) {
-									var REGEX_EMAIL = "([a-z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+/=?^_`{|}~-]+)*@" +
-									"(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)";
-									// Dont offset to create a tag if there is no @ symbol
-									if (params.term.indexOf("@") === -1) {
-										// Return null to disable tag creation
-										return null;
-									}
-									var match = params.term.match(new RegExp("^([^<]*)\<" + REGEX_EMAIL + "\>$", "i"));
-									// console.log(match);
-									if (match !== null) {
-										return {
-											id: $.trim(match[1]) + " <" + match[2] + ">",
-											text: $.trim(match[1]) + " <" + match[2] + ">"
-										}
-									}
-									if (params.term.indexOf("<") >= 0) {
-										// Return null to disable tag creation
-										return null;
-									}
-									var match = params.term.match(new RegExp("^" + REGEX_EMAIL + "$", "i"));
-									// console.log(match);
-									if (match !== null) {
-										var pos = params.term.indexOf("@");
-										return {
-											id: $.trim(match[1].substring(0, pos)) + " <" + match[1] + ">",
-											text: $.trim(match[1].substring(0, pos)) + " <" + match[1] + ">"
-										}
-									}
-									return null;
-								}';
-				}
-				$out .= '			});
+							 	templateSelection: formatSelection		/* For 4.0 */
+							});
 						});'."\n";
 			}
 			elseif ($addjscombo == 2)
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 8881b93349f..d961cd20536 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -630,7 +630,7 @@ class FormMail extends Form
 			if (!empty($this->withto) || is_array($this->withto))
 			{
 				$out .= '<tr><td class="fieldrequired">';
-				if ($this->withtofree) $out .= $form->textwithpicto($langs->trans("MailTo"), $langs->trans("YouCanUseFreeEmailsForRecipients"));
+				if ($this->withtofree) $out .= $form->textwithpicto($langs->trans("MailTo"), $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
 				else $out .= $langs->trans("MailTo");
 				$out .= '</td><td>';
 				if ($this->withtoreadonly)
@@ -669,9 +669,15 @@ class FormMail extends Form
 				}
 				else
 				{
+					// The free input of email
+					if (!empty($this->withtofree))
+					{
+						$out .= '<input class="minwidth200" id="sendto" name="sendto" value="'.(($this->withtofree && !is_numeric($this->withtofree)) ? $this->withtofree : (!is_array($this->withto) && !is_numeric($this->withto) ? (isset($_REQUEST["sendto"]) ? $_REQUEST["sendto"] : $this->withto) : "")).'" />';
+					}
 					// The select combo
 					if (!empty($this->withto) && is_array($this->withto))
 					{
+						if (!empty($this->withtofree)) $out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withto;
 						foreach ($tmparray as $key => $val)
@@ -683,7 +689,7 @@ class FormMail extends Form
 						{
 							$withtoselected = array_keys($tmparray);
 						}
-						$out .= $form->multiselectarray("receiver", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', 0, '', '', 'email', '', -1, !empty($this->withtofree)?1:0);
+						$out .= $form->multiselectarray("receiver", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
 					}
 				}
 				$out .= "</td></tr>\n";
@@ -730,7 +736,7 @@ class FormMail extends Form
 			if (!empty($this->withtocc) || is_array($this->withtocc))
 			{
 				$out .= '<tr><td>';
-				$out .= $form->textwithpicto($langs->trans("MailCC"), $langs->trans("YouCanUseFreeEmailsForRecipients"));
+				$out .= $form->textwithpicto($langs->trans("MailCC"), $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
 				$out .= '</td><td>';
 				if ($this->withtoccreadonly)
 				{
@@ -738,8 +744,10 @@ class FormMail extends Form
 				}
 				else
 				{
+				    $out .= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.(GETPOST("sendtocc", "alpha") ? GETPOST("sendtocc", "alpha") : ((!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : '')).'" />';
 					if (!empty($this->withtocc) && is_array($this->withtocc))
 					{
+						$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withtocc;
 						foreach ($tmparray as $key => $val)
@@ -747,7 +755,7 @@ class FormMail extends Form
 							$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 						}
 						$withtoccselected = GETPOST("receivercc"); // Array of selected value
-						$out .= $form->multiselectarray("receivercc", $tmparray, $withtoccselected, null, null, 'inline-block minwidth500', 0, '', '', 'email', '', -1, !empty($this->withtofree)?1:0);
+						$out .= $form->multiselectarray("receivercc", $tmparray, $withtoccselected, null, null, 'inline-block minwidth500', null, "");
 					}
 				}
 				$out .= "</td></tr>\n";
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index aa568bedce3..bef3d9fd0dc 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2288,7 +2288,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 					$total_plannedworkload += $plannedworkload;
 					if (!in_array('plannedworkload', $hiddenfields))
 					{
-						print '<td class="right">'.($plannedworkload ? convertSecondToTime($plannedworkload) : '').'</td>';
+						print '<td class="right">'.($plannedworkload ?convertSecondToTime($plannedworkload) : '').'</td>';
 					}
 					if (!in_array('declaredprogress', $hiddenfields))
 					{
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 9806748a1c0..7b3bfd3852a 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -117,7 +117,6 @@ NbOfEMailingsSend=Mass emailings sent
 IdRecord=ID record
 DeliveryReceipt=Delivery Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
-YouCanUseFreeEmailsForRecipients=You can enter free emails to specify several recipients.
 TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature of sending user

From faf7a379ba090e6d6d6e663c576c7a55a4d1e1e9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 23:01:20 +0200
Subject: [PATCH 466/490] Revert "clean"

This reverts commit 8f9ee3250dba03aea88cfd5188253383c866e2fd.
---
 htdocs/core/class/html.formmail.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 8881b93349f..6007dd1dbaa 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -669,7 +669,6 @@ class FormMail extends Form
 				}
 				else
 				{
-					// The select combo
 					if (!empty($this->withto) && is_array($this->withto))
 					{
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time

From a80270ebb5a1c68f042af8b9ebb974a3fb452f0d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 23:01:25 +0200
Subject: [PATCH 467/490] Revert "clean"

This reverts commit 7e7a10f8d2140ff2ca0eae2a3818bb2da35435b5.
---
 htdocs/core/class/html.formmail.class.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 6007dd1dbaa..45c40a8bc72 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -669,8 +669,15 @@ class FormMail extends Form
 				}
 				else
 				{
+					// The free input of email
+					// if (!empty($this->withtofree))
+					// {
+					// 	$out .= '<input class="minwidth200" id="sendto" name="sendto" value="'.(($this->withtofree && !is_numeric($this->withtofree)) ? $this->withtofree : (!is_array($this->withto) && !is_numeric($this->withto) ? (isset($_REQUEST["sendto"]) ? $_REQUEST["sendto"] : $this->withto) : "")).'" />';
+					// }
+					// The select combo
 					if (!empty($this->withto) && is_array($this->withto))
 					{
+						//if (!empty($this->withtofree)) $out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withto;
 						foreach ($tmparray as $key => $val)
@@ -737,8 +744,10 @@ class FormMail extends Form
 				}
 				else
 				{
+				    //$out .= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.(GETPOST("sendtocc", "alpha") ? GETPOST("sendtocc", "alpha") : ((!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : '')).'" />';
 					if (!empty($this->withtocc) && is_array($this->withtocc))
 					{
+						//$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withtocc;
 						foreach ($tmparray as $key => $val)

From 80ace3b52ca3eb5443f9b90a8bf2f9bdcb1e36aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 May 2020 23:05:29 +0200
Subject: [PATCH 468/490] Revert due to regressions

---
 htdocs/core/actions_sendmails.inc.php     |  8 +---
 htdocs/core/class/html.form.class.php     | 52 +++--------------------
 htdocs/core/class/html.formmail.class.php | 22 +++++-----
 htdocs/langs/en_US/mails.lang             |  1 -
 4 files changed, 19 insertions(+), 64 deletions(-)

diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index d6c4c0a6313..e23d2ce01a9 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -190,12 +190,10 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				{
 					$tmparray[] = dol_string_nospecial($contact->getFullName($langs), ' ', array(",")).' <'.$contact->email.'>';
 				}
-				elseif ((int) $val > 0)	// $val is the Id of a contact
+				elseif ($val)	// $val is the Id of a contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 					$sendtoid[] = $val;
-				} else {
-					$tmparray[] = $val;
 				}
 			}
 		}
@@ -242,12 +240,10 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				{
 					$tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
 				}
-				elseif ((int) $val > 0)				// $val is the Id of a contact
+				elseif ($val)				// $val is the Id of a contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 					//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
-				} else {
-					$tmparray[] = $val;
 				}
 			}
 		}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6d1ce33b0be..bc89fb3403d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6621,11 +6621,10 @@ class Form
 	 *  @param	string	$elemtype		Type of element we show ('category', ...). Will execute a formating function on it. To use in readonly mode if js component support HTML formatting.
 	 *  @param	string	$placeholder	String to use as placeholder
 	 *  @param	int		$addjscombo		Add js combo
-	 *  @param  int     $enablefreetag  0 no free tag, 1 enable free tag for elemtype
 	 *	@return	string					HTML multiselect string
 	 *  @see selectarray(), selectArrayAjax(), selectArrayFilter()
 	 */
-	public static function multiselectarray($htmlname, $array, $selected = array(), $key_in_label = 0, $value_as_key = 0, $morecss = '', $translate = 0, $width = 0, $moreattrib = '', $elemtype = '', $placeholder = '', $addjscombo = -1, $enablefreetag = 0)
+	public static function multiselectarray($htmlname, $array, $selected = array(), $key_in_label = 0, $value_as_key = 0, $morecss = '', $translate = 0, $width = 0, $moreattrib = '', $elemtype = '', $placeholder = '', $addjscombo = -1)
 	{
 		global $conf, $langs;
 
@@ -6639,11 +6638,11 @@ class Form
 		// Add code for jquery to use multiselect
 		if (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))
 		{
+			$out .= "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
+						<script>'."\n";
 			if ($addjscombo == 1)
 			{
 				$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
-				$out .= "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->'."\n";
-				$out .= '<script>'."\n";
 				$out .= 'function formatResult(record) {'."\n";
 				if ($elemtype == 'category')
 				{
@@ -6667,50 +6666,13 @@ class Form
 				$out .= '$(document).ready(function () {
 							$(\'#'.$htmlname.'\').'.$tmpplugin.'({
 								dir: \'ltr\',
-								tags: '.($enablefreetag?'true':'false').',
 								// Specify format function for dropdown item
 								formatResult: formatResult,
-								/* For 4.0 */
-							 	templateResult: formatResult,
+							 	templateResult: formatResult,		/* For 4.0 */
 								// Specify format function for selected item
 								formatSelection: formatSelection,
-								/* For 4.0 */
-								templateSelection: formatSelection';
-				if ($enablefreetag && $elemtype == 'email') {
-					$out .= ',
-								createTag: function (params) {
-									var REGEX_EMAIL = "([a-z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+/=?^_`{|}~-]+)*@" +
-									"(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)";
-									// Dont offset to create a tag if there is no @ symbol
-									if (params.term.indexOf("@") === -1) {
-										// Return null to disable tag creation
-										return null;
-									}
-									var match = params.term.match(new RegExp("^([^<]*)\<" + REGEX_EMAIL + "\>$", "i"));
-									// console.log(match);
-									if (match !== null) {
-										return {
-											id: $.trim(match[1]) + " <" + match[2] + ">",
-											text: $.trim(match[1]) + " <" + match[2] + ">"
-										}
-									}
-									if (params.term.indexOf("<") >= 0) {
-										// Return null to disable tag creation
-										return null;
-									}
-									var match = params.term.match(new RegExp("^" + REGEX_EMAIL + "$", "i"));
-									// console.log(match);
-									if (match !== null) {
-										var pos = params.term.indexOf("@");
-										return {
-											id: $.trim(match[1].substring(0, pos)) + " <" + match[1] + ">",
-											text: $.trim(match[1].substring(0, pos)) + " <" + match[1] + ">"
-										}
-									}
-									return null;
-								}';
-				}
-				$out .= '			});
+							 	templateSelection: formatSelection		/* For 4.0 */
+							});
 						});'."\n";
 			}
 			elseif ($addjscombo == 2)
@@ -6718,8 +6680,6 @@ class Form
 				// Add other js lib
 				// TODO external lib multiselect/jquery.multi-select.js must have been loaded to use this multiselect plugin
 				// ...
-				$out .= "\n".'<!-- JS CODE TO ENABLE external lib for id '.$htmlname.' -->'."\n";
-				$out .= '<script>'."\n";
 				$out .= '$(document).ready(function () {
 							$(\'#'.$htmlname.'\').multiSelect({
 								containerHTML: \'<div class="multi-select-container">\',
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 45c40a8bc72..d961cd20536 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -630,7 +630,7 @@ class FormMail extends Form
 			if (!empty($this->withto) || is_array($this->withto))
 			{
 				$out .= '<tr><td class="fieldrequired">';
-				if ($this->withtofree) $out .= $form->textwithpicto($langs->trans("MailTo"), $langs->trans("YouCanUseFreeEmailsForRecipients"));
+				if ($this->withtofree) $out .= $form->textwithpicto($langs->trans("MailTo"), $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
 				else $out .= $langs->trans("MailTo");
 				$out .= '</td><td>';
 				if ($this->withtoreadonly)
@@ -670,14 +670,14 @@ class FormMail extends Form
 				else
 				{
 					// The free input of email
-					// if (!empty($this->withtofree))
-					// {
-					// 	$out .= '<input class="minwidth200" id="sendto" name="sendto" value="'.(($this->withtofree && !is_numeric($this->withtofree)) ? $this->withtofree : (!is_array($this->withto) && !is_numeric($this->withto) ? (isset($_REQUEST["sendto"]) ? $_REQUEST["sendto"] : $this->withto) : "")).'" />';
-					// }
+					if (!empty($this->withtofree))
+					{
+						$out .= '<input class="minwidth200" id="sendto" name="sendto" value="'.(($this->withtofree && !is_numeric($this->withtofree)) ? $this->withtofree : (!is_array($this->withto) && !is_numeric($this->withto) ? (isset($_REQUEST["sendto"]) ? $_REQUEST["sendto"] : $this->withto) : "")).'" />';
+					}
 					// The select combo
 					if (!empty($this->withto) && is_array($this->withto))
 					{
-						//if (!empty($this->withtofree)) $out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
+						if (!empty($this->withtofree)) $out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withto;
 						foreach ($tmparray as $key => $val)
@@ -689,7 +689,7 @@ class FormMail extends Form
 						{
 							$withtoselected = array_keys($tmparray);
 						}
-						$out .= $form->multiselectarray("receiver", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', 0, '', '', 'email', '', -1, !empty($this->withtofree)?1:0);
+						$out .= $form->multiselectarray("receiver", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
 					}
 				}
 				$out .= "</td></tr>\n";
@@ -736,7 +736,7 @@ class FormMail extends Form
 			if (!empty($this->withtocc) || is_array($this->withtocc))
 			{
 				$out .= '<tr><td>';
-				$out .= $form->textwithpicto($langs->trans("MailCC"), $langs->trans("YouCanUseFreeEmailsForRecipients"));
+				$out .= $form->textwithpicto($langs->trans("MailCC"), $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
 				$out .= '</td><td>';
 				if ($this->withtoccreadonly)
 				{
@@ -744,10 +744,10 @@ class FormMail extends Form
 				}
 				else
 				{
-				    //$out .= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.(GETPOST("sendtocc", "alpha") ? GETPOST("sendtocc", "alpha") : ((!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : '')).'" />';
+				    $out .= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.(GETPOST("sendtocc", "alpha") ? GETPOST("sendtocc", "alpha") : ((!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : '')).'" />';
 					if (!empty($this->withtocc) && is_array($this->withtocc))
 					{
-						//$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
+						$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withtocc;
 						foreach ($tmparray as $key => $val)
@@ -755,7 +755,7 @@ class FormMail extends Form
 							$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 						}
 						$withtoccselected = GETPOST("receivercc"); // Array of selected value
-						$out .= $form->multiselectarray("receivercc", $tmparray, $withtoccselected, null, null, 'inline-block minwidth500', 0, '', '', 'email', '', -1, !empty($this->withtofree)?1:0);
+						$out .= $form->multiselectarray("receivercc", $tmparray, $withtoccselected, null, null, 'inline-block minwidth500', null, "");
 					}
 				}
 				$out .= "</td></tr>\n";
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 9806748a1c0..7b3bfd3852a 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -117,7 +117,6 @@ NbOfEMailingsSend=Mass emailings sent
 IdRecord=ID record
 DeliveryReceipt=Delivery Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
-YouCanUseFreeEmailsForRecipients=You can enter free emails to specify several recipients.
 TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature of sending user

From f9f5beb064a832d0c63513053341f5bf761481d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 26 May 2020 00:19:32 +0200
Subject: [PATCH 469/490] NEW Can set tags/categories to website pages.

---
 htdocs/core/class/commonobject.class.php | 62 +++++++++++++++++++-
 htdocs/core/class/html.form.class.php    |  2 +-
 htdocs/website/index.php                 | 75 +++++++++++++++++-------
 3 files changed, 117 insertions(+), 22 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index efa69c744b2..2bd621bc0f6 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8523,8 +8523,68 @@ abstract class CommonObject
         }
     }
 
+    /* Part for categories/tags */
+
     /**
-     *  copy related categories to another object
+     * Sets object to given categories.
+     *
+     * Deletes object from existing categories not supplied.
+     * Adds it to non existing supplied categories.
+     * Existing categories are left untouch.
+     *
+     * @param 	int[]|int 	$categories 	Category ID or array of Categories IDs
+     * @param 	string 		$type_categ 	Category type ('customer', 'supplier', 'website_page', ...)
+     * @return	int							<0 if KO, >0 if OK
+     */
+    public function setCategories($categories, $type_categ)
+    {
+    	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
+    	// Handle single category
+    	if (!is_array($categories)) {
+    		$categories = array($categories);
+    	}
+
+    	// Get current categories
+    	$c = new Categorie($this->db);
+    	$existing = $c->containing($this->id, $type_categ, 'id');
+
+    	// Diff
+    	if (is_array($existing)) {
+    		$to_del = array_diff($existing, $categories);
+    		$to_add = array_diff($categories, $existing);
+    	} else {
+    		$to_del = array(); // Nothing to delete
+    		$to_add = $categories;
+    	}
+
+    	$error = 0;
+
+    	// Process
+    	foreach ($to_del as $del) {
+    		if ($c->fetch($del) > 0) {
+    			$c->del_type($this, $type_categ);
+    		}
+    	}
+    	foreach ($to_add as $add) {
+    		if ($c->fetch($add) > 0)
+    		{
+    			$result = $c->add_type($this, $type_categ);
+    			if ($result < 0)
+    			{
+    				$error++;
+    				$this->error = $c->error;
+    				$this->errors = $c->errors;
+    				break;
+    			}
+    		}
+    	}
+
+    	return $error ? -1 : 1;
+    }
+
+    /**
+     * Copy related categories to another object
      *
      * @param  int		$fromId	Id object source
      * @param  int		$toId	Id object cible
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index bc89fb3403d..3f7ab69089f 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4070,7 +4070,7 @@ class Form
 	 *    Return list of categories having choosed type
 	 *
 	 *    @param	string|int	            $type				Type of category ('customer', 'supplier', 'contact', 'product', 'member'). Old mode (0, 1, 2, ...) is deprecated.
-	 *    @param    string		            $selected    		Id of category preselected or 'auto' (autoselect category if there is only one element)
+	 *    @param    string		            $selected    		Id of category preselected or 'auto' (autoselect category if there is only one element). Not used if $outputmode = 1.
 	 *    @param    string		            $htmlname			HTML field name
 	 *    @param    int			            $maxlength      	Maximum length for labels
      *    @param    int|string|array    	$markafterid        Keep only or removed all categories including the leaf $markafterid in category tree (exclude) or Keep only of category is inside the leaf starting with this id.
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 969c56dde8c..a6f4f0250fb 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -39,6 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formwebsite.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
 require_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 $langs->loadLangs(array("admin", "other", "website", "errors"));
 
@@ -1558,6 +1559,17 @@ if ($action == 'updatemeta')
 		}
 	}
 
+	if (!$error) {
+		// Supplier categories association
+		$categoriesarray = GETPOST('categories', 'array');
+		$result = $objectpage->setCategories($categoriesarray, Categorie::TYPE_WEBSITE_PAGE);
+		if ($result < 0)
+		{
+			$error++;
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+
 	if (!$error)
 	{
 		$db->commit();
@@ -3235,20 +3247,6 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	if (GETPOST('WEBSITE_LANG', 'aZ09'))         $pagelang = GETPOST('WEBSITE_LANG', 'aZ09');
 	if (GETPOST('htmlheader', 'none'))			 $pagehtmlheader = GETPOST('htmlheader', 'none');
 
-	// Title
-	print '<tr><td class="fieldrequired">';
-	print $langs->trans('WEBSITE_TITLE');
-	print '</td><td>';
-	print '<input type="text" class="flat quatrevingtpercent" name="WEBSITE_TITLE" id="WEBSITE_TITLE" value="'.dol_escape_htmltag($pagetitle).'" autofocus>';
-	print '</td></tr>';
-
-	// Alias
-	print '<tr><td class="titlefieldcreate fieldrequired">';
-	print $langs->trans('WEBSITE_PAGENAME');
-	print '</td><td>';
-	print '<input type="text" class="flat minwidth300" name="WEBSITE_PAGENAME" id="WEBSITE_PAGENAME" value="'.dol_escape_htmltag($pageurl).'">';
-	print '</td></tr>';
-
 	// Type of container
 	print '<tr><td class="titlefield fieldrequired">';
 	print $langs->trans('WEBSITE_TYPE_CONTAINER');
@@ -3265,6 +3263,27 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 		print '</td></tr>';
 	}
 
+	// Title
+	print '<tr><td class="fieldrequired">';
+	print $langs->trans('WEBSITE_TITLE');
+	print '</td><td>';
+	print '<input type="text" class="flat quatrevingtpercent" name="WEBSITE_TITLE" id="WEBSITE_TITLE" value="'.dol_escape_htmltag($pagetitle).'" autofocus>';
+	print '</td></tr>';
+
+	// Alias
+	print '<tr><td class="titlefieldcreate fieldrequired">';
+	print $langs->trans('WEBSITE_PAGENAME');
+	print '</td><td>';
+	print '<input type="text" class="flat minwidth300" name="WEBSITE_PAGENAME" id="WEBSITE_PAGENAME" value="'.dol_escape_htmltag($pageurl).'">';
+	print '</td></tr>';
+
+	print '<tr><td class="titlefieldcreate">';
+	$htmlhelp = $langs->trans("WEBSITE_ALIASALTDesc");
+	print $form->textwithpicto($langs->trans('WEBSITE_ALIASALT'), $htmlhelp, 1, 'help', '', 0, 2, 'aliastooltip');
+	print '</td><td>';
+	print '<input type="text" class="flat minwidth500" name="WEBSITE_ALIASALT" value="'.dol_escape_htmltag($pagealiasalt).'">';
+	print '</td></tr>';
+
 	print '<tr><td>';
 	print $langs->trans('WEBSITE_DESCRIPTION');
 	print '</td><td>';
@@ -3365,12 +3384,28 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	}
 	print '</td></tr>';
 
-	print '<tr><td class="titlefieldcreate">';
-	$htmlhelp = $langs->trans("WEBSITE_ALIASALTDesc");
-	print $form->textwithpicto($langs->trans('WEBSITE_ALIASALT'), $htmlhelp, 1, 'help', '', 0, 2, 'aliastooltip');
-	print '</td><td>';
-	print '<input type="text" class="flat minwidth300" name="WEBSITE_ALIASALT" value="'.dol_escape_htmltag($pagealiasalt).'">';
-	print '</td></tr>';
+	// Categories
+	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
+	{
+		$langs->load('categories');
+
+		if (! GETPOSTISSET('categories')) {
+			$cate_arbo = $form->select_all_categories(Categorie::TYPE_WEBSITE_PAGE, '', null, null, null, 1);
+			$c = new Categorie($db);
+			$cats = $c->containing($objectpage->id, Categorie::TYPE_WEBSITE_PAGE);
+			$arrayselected = array();
+			foreach ($cats as $cat) {
+				$arrayselected[] = $cat->id;
+			}
+
+			$cate_arbo = $form->select_all_categories(Categorie::TYPE_WEBSITE_PAGE, '', 'parent', null, null, 1);
+		}
+
+		print '<tr class="visibleifsupplier"><td class="toptd">'.$form->editfieldkey('Categories', 'categories', '', $objectpage, 0).'</td><td colspan="3">';
+		print img_picto('', 'category', 'class="paddingright"').$form->multiselectarray('categories', $cate_arbo, (GETPOSTISSET('categories') ? GETPOST('categories', 'array') : $arrayselected), null, null, null, null, "90%");
+		print "</td></tr>";
+	}
+
 
 	$fuser = new User($db);
 

From 3aaefd15b0c8b1cd0a5645399cfb8515541f7d03 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 26 May 2020 01:07:09 +0200
Subject: [PATCH 470/490] Fix set of categories

---
 htdocs/core/class/commonobject.class.php   |  2 +-
 htdocs/website/class/websitepage.class.php | 15 +++++++++++++++
 htdocs/website/index.php                   |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 3d4372a0cb1..39186f14213 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8166,7 +8166,7 @@ abstract class CommonObject
      * @param 	string 		$type_categ 	Category type ('customer', 'supplier', 'website_page', ...)
      * @return	int							<0 if KO, >0 if OK
      */
-    public function setCategories($categories, $type_categ)
+    public function setCategoriesCommon($categories, $type_categ)
     {
     	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index dcc7b0508fa..3effe5ccd6e 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -720,6 +720,21 @@ class WebsitePage extends CommonObject
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
 
+	/**
+	 * Sets object to given categories.
+	 *
+	 * Deletes object from existing categories not supplied.
+	 * Adds it to non existing supplied categories.
+	 * Existing categories are left untouch.
+	 *
+	 * @param 	int[]|int 	$categories 	Category ID or array of Categories IDs
+	 * @return	int							<0 if KO, >0 if OK
+	 */
+	public function setCategories($categories)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		return $this->setCategoriesCommon($categories, Categorie::TYPE_WEBSITE_PAGE);
+	}
 
 	/**
 	 * Initialise object with example values
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 4198ef8e1eb..9babe86d341 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -1547,7 +1547,7 @@ if ($action == 'updatemeta')
 	if (!$error) {
 		// Supplier categories association
 		$categoriesarray = GETPOST('categories', 'array');
-		$result = $objectpage->setCategories($categoriesarray, Categorie::TYPE_WEBSITE_PAGE);
+		$result = $objectpage->setCategories($categoriesarray);
 		if ($result < 0)
 		{
 			$error++;

From b6308f6dfa8adfbe50cae5352298850d1e7f9665 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 26 May 2020 01:16:18 +0200
Subject: [PATCH 471/490] Fix phpcs

---
 htdocs/product/list.php   | 7 ++-----
 test/phpunit/LangTest.php | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index d5eaa81d06f..ff5f6ee5047 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -217,12 +217,9 @@ if ($conf->global->PRODUIT_MULTIPRICES){
 	for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
 	{
 		$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$i;
-		if (!empty($conf->global->$keyforlabel))
-		{
+		if (!empty($conf->global->$keyforlabel)) {
 			$labelp = $i.' - '.$langs->trans($conf->global->$keyforlabel);
-		}
-		else
-		{
+		} else {
 			$labelp = $langs->trans("SellingPrice")." ".$i;
 		}
 		$arrayfields['p.sellprice'.$i] = array('label'=>$labelp, 'checked'=>1, 'enabled'=>$conf->global->PRODUIT_MULTIPRICES, 'position'=>40);
diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index 73e826cf75a..c064a03e2f8 100644
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -183,7 +183,7 @@ class LangTest extends PHPUnit\Framework\TestCase
 			unset($tmplangs);
 
 			$filesarray2 = scandir(DOL_DOCUMENT_ROOT.'/langs/'.$code);
-			foreach($filesarray2 as $key => $file) {
+			foreach ($filesarray2 as $key => $file) {
 				if (! preg_match('/\.lang$/', $file)) {
 					continue;
 				}

From c7d43b26df68a73c9e44e2a5811fa79fcfa8c19e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 26 May 2020 01:44:22 +0200
Subject: [PATCH 472/490] Prepare ChangeLog for v12

---
 ChangeLog | 254 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 227 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ffb51bd26c3..395b443cd1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,233 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+
+***** ChangeLog for 12.0 compared to 11.0 *****
+For users:
+
+NEW: Module MO (Manufacturing Order) is available as stable module.
+NEW: Receipt printer module moved from 'development' to 'experimental'
+NEW: Add option MAIN_VIEW_LINE_NUMBER_IN_LIST for some lists.
+NEW: add numbering module for TakePOS module
+NEW: 2 new options when creating an invoice from time spent on a project : by period or by task
+NEW: Accountancy add column thirdparty on binding page
+NEW: Accountancy - Add Export for Fiducial Winfic eWinfic WinSis Compta
+NEW: Accountancy - Add Export LD compta version 10
+NEW: Accountancy - Add mode intra & export for product or service bought
+NEW: Accountancy - Add possibility to manage a short alternative label for account - Use to simplify accountancy
+NEW: Accountancy - General ledger - Add an option to search not reconciled lines
+NEW: Add accountancy code of thirdparty in contact and supplier export
+NEW: add a link to notes in members list
+NEW: add a parameter to group same products in TakePOS
+NEW: add a parameter to sort product by label in TakePOS
+NEW: Add a profil to import contact categories
+NEW: Add company extrafields into order export
+NEW: add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation
+NEW: add const TAKEPOS_NUMPAD_USE_PAYMENT_ICON to use icons on payment buttons
+NEW: add csv separator setup in module admin
+NEW: add dedicated substitutions keys for extrafields of type date and datetime
+NEW: add default warehouse for dispatch
+NEW: Add due date in feature "Export accounting documents"
+NEW: Add duration information for fichinter
+NEW: Start support of Dark theme into ELDY theme
+NEW: Add field author public alias for blog post on website module
+NEW: Add "finished" field on product list
+NEW: Add French association chart of accounts 2018
+NEW: Add French farm chart of accounts 2014
+NEW: Add French foundation chart of accounts 2018
+NEW: add global reduction in cash desk
+NEW: Add graph type 'piesemicircle'
+NEW: Add hook getInputIdProf. Better solution for #13228
+NEW: Add hook on margin list page
+NEW: add icon on payment buttons in cash desk
+NEW: Add include various payments and loans in accounting report with simplfified accountancy
+NEW: Add invoice stat graph and categ search
+NEW: Addition of delivery times in substitution variables
+NEW: add member to validate on dashboard
+NEW: Add method to add social network sharing buttons on blog posts
+NEW: add multicurrency columns to document lists
+NEW: add numbering module for cash desk
+NEW: add Opening Balance column to balance.php
+NEW: add opportunity status in project stats
+NEW: Add option PDF_USE_ALSO_LANGUAGE_CODE to generate PDF in 2 languages
+NEW: Add option to hide all inactive users into combo list of users.
+NEW: add PDF certificate if present on document folder
+NEW: add product if only one found
+NEW: Add product on key "Enter" in search bar
+NEW: add professional ID 1 in sepamandate document
+NEW: Add Project Ref Column on list of social/fiscal contributions
+NEW: add Project Ref in events export
+NEW: add public and private notes in propal list
+NEW: Add social networks of the company
+NEW: Add sorting for contacts of ... pages
+NEW: Add subtitution variables for url of document in backoffice
+NEW: Add tel and fax in warehouse card
+NEW: add total of value in product stat
+NEW: add total weighted amount in project list
+NEW: add units in product list
+NEW: add VAT ID in sepamandate document
+NEW: add VAT rates in free zone for product/service in TakePOS
+NEW: add weighted amount on project/opportunity
+NEW: add width and height measures in product list
+NEW: add WYSiWYG on member type's description
+NEW: [Allow constants values to be overridden by environment variables]
+NEW: Allow custom module class origine type in Mouvementstock
+NEW: allow display extrafields on pdf
+NEW: Allow extrafields on pdf : extend to line desc
+NEW: allow time consumed to be linked to another task
+NEW: Another way to navigate between pages for some lists
+NEW: Add author column in the client/supplier invoice lists and into order list
+NEW: bank account tags for invoice ODT template
+NEW: Bar Restaurant tab and Auto order
+NEW: better filter on shipment list as other list
+NEW: Better php module view admin
+NEW: Bookkeeping - Add link to document & pdf
+NEW: Bookmarks are now in top menu bar
+NEW: Can check all events in one click in setup of audited events
+NEW: Can create an deposit from order using a percentage of qty.
+NEW: Can edit option PDF_USE_ALSO_LANGUAGE_CODE from PDF setup page
+NEW: Can enter and edit stripe credit card using the Stripe card ID
+NEW: Can filter on donation status in list
+NEW: Can replace a string into all pages in website module
+NEW: Can select several fields to personalize list before submit.
+NEW: Can select which element to export in export accounting documents.
+NEW: can update contact in import model
+NEW: Cash Fence in TakePOS
+NEW: Categories and subcategories sorted by label in TakePOS
+NEW: Categories for actioncomm
+NEW: Category filter for bank and warehouse list
+NEW: Chart of accounts to Ecuador
+NEW: class tool for converting units
+NEW: Close #13011 Add button create thirdparty when creating intervention
+NEW: Colorful theme for TakePOS
+NEW: columns units in product list
+NEW: compatibility of translabel with more dict
+NEW: Confirm file delete on fracture card
+NEW: "contact_civility" for ODT templates
+NEW: CUPS printing compatibility for TakePOS
+NEW: Customer command list - Add date start & date end
+NEW: display weight in shipment list
+NEW: Documentation about PHP support in Dolibarr
+NEW: Donation - Update FR CERFA to 11580*04
+NEW: Easier way to setup the different types of tax. Better visibility.
+NEW: enable put for agendaevents api
+NEW: Expedition list - Add date start & date end
+NEW: Experiment supplier packaging with option PRODUCT_USE_SUPPLIER_PACKAGING: Using price according to the minimum quantity
+NEW: Export module, add extrafields for Contract and Contract line
+NEW: Extend retained warranty to be  available for all invoices
+NEW: filter by product on supplier order API
+NEW: French new regions
+NEW: get documents for categories with RESP API
+NEW: get proposal by ref with API
+NEW: Hidden option MAIN_TEMP_DIR
+NEW: hook and data id
+NEW: hook on ics generation to add more events in eventarray
+NEW: hook on product load stats
+NEW: If $dolibarr_main_force_https is set, the flag 'secure' on session
+NEW: ignore dir for apple pay with stripe
+NEW: Invoice list - Add date start & date end
+NEW: invoice list: enable multicurrency columns
+NEW: labels on reduction buttons in cash desk
+NEW: Minimum sell prices taking into account in TakePOS
+NEW: monthly view to enter time
+NEW: Multiple sales in TakePOS
+NEW: multiselect categorie client stats facturation
+NEW: no confirm discard ticket if paid
+NEW: not show linked table on add message action
+NEW: only auto print paid ticket in cash desk
+NEW: only show units columns in product list (not in service list)
+NEW: order list: enable multicurrency columns
+NEW: Overwrite tpl with module_part['tpl'] is deprecated. USe hooks
+NEW: possibility to defined rounding rules by currency
+NEW: possibility to show society info when print page
+NEW: Povide a RSS Feed for blogposts
+NEW: PRODUCT_SHOW_ORIGIN_IN_COMBO
+NEW: Project task list, add column selector and extrafields
+NEW: Propal list - Add date start & date end
+NEW: propal list: enable multicurrency columns
+NEW: RECEIPT_PRINTER_NB_CHARACT_BY_LINE and FIX: product label
+NEW: Restore version of application on main screen (for screenshots)
+NEW: Salaries list - Add date start & date end
+NEW: search on key code "enter" if defined in TakePOS
+NEW: set payment method on paid ticket in TakePOS
+NEW: Show active widget state of a RSS feed
+NEW: Show count of each category elements in category card
+NEW: Show creator, last update user of category/tag in the information tab
+NEW: Show list of users in the user category card
+NEW: show messages on ticket card
+NEW: show "New category" button in top of sub categories list
+NEW: show project label in project index
+NEW: Show units of products in stocks and hide total units if content is of diffents units
+NEW: sorting elements on project overview
+NEW: special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other documents lines the id of original lines and origin class line rather than origin object id and origin object type
+NEW: stats invoice graph with 3 bars (3 years instead of 2)
+NEW: supplier invoice list: enable multicurrency columns
+NEW: supplier order list: enable multicurrency columns
+NEW: supplier proposal list: enable multicurrency columns
+NEW: Support of tag {line_pos} for line numbers for tables in ODT templates
+NEW: Support some HTML contents into ODT documents
+NEW: Parameters for Bar Restaurant are grouped in same tab
+NEW: Takepos : Sort products by reference
+NEW: Takepos supplements are supported.
+NEW: The info_admin() can show text after click on other text
+NEW: The module selection uses a KanBan view by default.
+NEW: tooltip for Unit_type and scale in "Dictionary setup - Measuring Units"
+NEW: tooltip notes with first public note and then private note
+NEW: Tree view for sub-categories
+NEW: Truncate columns names when too long and show full title as popup
+NEW: upload odt models for invoices, order, proposal, thirdparties and shipments.
+NEW: Use native --convert-to feature to convert to pdf
+NEW: Add user on order list
+NEW: Various payment list - Add search date start & date end & subledger account
+NEW: visu FROM day TO day in permonth view
+NEW: Website logs are now into a separated log file.
+NEW: X-Axis on graph are shown verticaly when there is a lot of values.
+NEW: Can force ref of a variant product
+
+For developers or integrators:
+
+NEW: Add API to get types of expense reports
+NEW: API filter bankaccounts by category
+NEW: API filter contacts by category
+NEW: API filter members by category
+NEW: API filter projects by category
+NEW: API filter thirdpartie by category
+NEW: API filter thirdparty by category
+NEW: API filter user by category
+NEW: API filter warehouses by categorie
+NEW: api for  get user's documents
+NEW: api invoice get by ref
+NEW: API to update purchase price.
+NEW: Move engine to build charts from jflot to chart.js
+NEW: Upgrade ace to 1.4.8 - Upgrade select2 to 4.0.13
+NEW: Upgrade Stripe library to 6.43.1
+NEW: Bookkeeping by account - Add selectfields & hook
+NEW: Can force position of legend of graph on right (instead of top)
+NEW: Can change destination of "Back to list" using a "backtolist" parameter
+NEW: add more category types from hook
+
+WARNING:
+
+Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
+* PHP 5.5 is no more supported. Minimum PHP is now 5.6+.
+* Default mode for GETPOST function is now 'alphanohtml' instead of 'none'. So check when you make POST or GET requests with
+  HTML content that you make a GETPOST('myparam', 'restricthtml') or GETPOST('myparam', 'none') if you really need posted content without sanitizing
+  the HTML code of content (in such a case, sanitize data later)
+* Removed hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless. 
+* Reference of object including a "/" are no more allowed. It is never used by default but to support setup that introduced it, the "/" will be replaced 
+  by a "_" automatically when a reference (with a custom numbering mask that use it) is generated.  
+* Library jflot (replace with chartjs) was removed.
+* Library geoip (replaced with geoip2) was removed.  
+* Hidden constant COMMANDE_VALID_AFTER_CLOSE_PROPAL was renamed into ORDER_VALID_AFTER_CLOSE_PROPAL.
+* Object field ref_int is deprecated and set to 'not used', method to fetch object by only ref_int is not supported anymore.
+* UserGroup class has been refactored with new architecture. Triggers of class UserGroup are now USERGROUP_CREATE, USERGROUP_MODIFY, USERGROUP_DELETE
+* A new way to navigate between pages in list is available. To use it (not mandatory), you must:
+  - replace line $page = GETPOST('page', 'int') with $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); 
+  - remove input field in form '<input type="hidden" name="page" value="'.$page.'">';'
+  - add parameter $pagenavastextinput to value 1 when calling print_barre_liste()
+
+
+
 ***** ChangeLog for 11.0.4 compared to 11.0.3 *****
 FIX: #13749
 FIX: #7594 Expense report multi pagebreak
@@ -80,33 +307,6 @@ FIX: Wrong Sql on getListOfTowns api method
 FIX: wrong user right's name to top menu "commercial"
 FIX: XSS Vulnerability reported by Mehmet Kelepçe / Gais Cyber Security
 
-***** ChangeLog for 12.0.0 compared to 11.0.0 *****
-For Users:
-NEW: Module MO (Manufacturing Order) is available as stable module.
-NEW: Add option MAIN_VIEW_LINE_NUMBER_IN_LIST for some lists.
-
-For Developers or integrators:
-* A new way to navigate between pages in list is available. To use it, you must
-  - replace $page = GETPOST('page', 'int') with $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); 
-  - remove input field in form '<input type="hidden" name="page" value="'.$page.'">';'
-  - add parameter $pagenavastextinput to value 1 when calling print_barre_liste   
-* UserGroup class has been refactored with new architecture. Triggers of class UserGroup are now USERGROUP_CREATE, USERGROUP_MODIFY, USERGROUP_DELETE
-
-WARNING:
-
-Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
-* PHP 5.5 is no more supported. Minimum PHP is now 5.6+.
-* Default mode for GETPOST function is now 'alphanohtml' instead of 'none'. So check when you make POST or GET requests
-  with HTML content that you make a GETPOST('myparam', 'restricthtml') or GETPOST('myparam', 'none') if you really need posted content without sanitizing
-  the HTML into content (in such a case, sanitize data later)
-* Removed hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless. 
-* Reference of object including a "/" are no more allowed. It is never used by default but to support setup that introduced it, the "/" will be replaced 
-  by a "_" automatically when a reference (with a custom numbering mask that use it) is generated.  
-* Library jflot (replace with chartjs) and geoip (replaced with geoip2) were removed.  
-* Hidden constant COMMANDE_VALID_AFTER_CLOSE_PROPAL were renamed into ORDER_VALID_AFTER_CLOSE_PROPAL.
-* Object field ref_int is deprecated and set to not used, object fetch by only ref_int is not supported anymore.
-
-
 ***** ChangeLog for 11.0.3 compared to 11.0.2 *****
 FIX: unit price for selected supplier products not set. NaN was used.
 FIX: use bad var to check if total is positive for each VAT rate when validating an invoice

From f849ccd1289be386199f56e0363c34ba7cdac0fe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 26 May 2020 01:47:32 +0200
Subject: [PATCH 473/490] Doc

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 395b443cd1a..7e8ce042bf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -187,6 +187,7 @@ NEW: Can force ref of a variant product
 
 For developers or integrators:
 
+NEW: Add a method $form->widgetForTranslation to allow any field of a form to be entered into different languages.
 NEW: Add API to get types of expense reports
 NEW: API filter bankaccounts by category
 NEW: API filter contacts by category

From 2d30d333033b318ed6ec0227a5ebeefa91ac2401 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 26 May 2020 12:25:41 +0200
Subject: [PATCH 474/490] NEW Can filter on container type, language and tags
 in the list of pages of website module.

---
 htdocs/admin/ihm.php            |  2 +-
 htdocs/core/lib/website.lib.php | 26 ++++++----
 htdocs/website/index.php        | 84 +++++++++++++++++++++++++++------
 3 files changed, 87 insertions(+), 25 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index b6233f13146..e1be556d906 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -248,7 +248,7 @@ print '</tr>';
 
 // Default language
 print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultLanguage").'</td><td>';
-print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'MAIN_LANG_DEFAULT', 1, 0, 0, 0, 0, 'minwidth300', 2);
+print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'MAIN_LANG_DEFAULT', 1, null, '', 0, 0, 'minwidth300', 2);
 print '<input class="button" type="submit" name="submit" value="'.$langs->trans("Save").'">';
 print '</td>';
 print '<td width="20">&nbsp;</td>';
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 4bebc0c0081..ebbaf4ec775 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -768,9 +768,10 @@ function getSocialNetworkSharingLinks()
  * @param	string		$sortfield			Sort Fields
  * @param	string		$sortorder			Sort order ('DESC' or 'ASC')
  * @param	string		$langcode			Language code ('' or 'en', 'fr', 'es', ...)
+ * @param	array		$otherfilters		Other filters
  * @return  string							HTML content
  */
-function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $sortfield = 'date_creation', $sortorder = 'DESC', $langcode = '')
+function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $sortfield = 'date_creation', $sortorder = 'DESC', $langcode = '', $otherfilters = 'null')
 {
 	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running inluded containers.
 
@@ -784,8 +785,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 		$error++;
 		$arrayresult['code'] = 'KO';
 		$arrayresult['message'] = $weblangs->trans("EmptySearchString");
-	} elseif (dol_strlen($searchstring) < 2)
-	{
+	} elseif (dol_strlen($searchstring) < 2) {
 		$weblangs->load("errors");
 		$error++;
 		$arrayresult['code'] = 'KO';
@@ -807,10 +807,13 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 
 	if (!$error && (empty($max) || ($found < $max)) && (preg_match('/meta/', $algo) || preg_match('/content/', $algo)))
 	{
-		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'website_page';
-		$sql .= " WHERE fk_website = ".$website->id;
+		$sql = 'SELECT wp.rowid FROM '.MAIN_DB_PREFIX.'website_page as wp';
+		if (is_array($otherfilters) && ! empty($otherfilters['category'])) {
+			$sql .= ', '.MAIN_DB_PREFIX.'categorie_website_page as cwp';
+		}
+		$sql .= " WHERE wp.fk_website = ".$website->id;
 		if ($langcode) {
-			$sql .= " AND lang ='".$db->escape($langcode)."'";
+			$sql .= " AND wp.lang ='".$db->escape($langcode)."'";
 		}
 		if ($type) {
 			$tmparrayoftype = explode(',', $type);
@@ -818,20 +821,23 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 			foreach ($tmparrayoftype as $tmptype) {
 				$typestring .= ($typestring ? ", " : "")."'".trim($tmptype)."'";
 			}
-			$sql .= " AND type_container IN (".$typestring.")";
+			$sql .= " AND wp.type_container IN (".$typestring.")";
 		}
 		$sql .= " AND (";
 		$searchalgo = '';
 		if (preg_match('/meta/', $algo))
 		{
-			$searchalgo .= ($searchalgo ? ' OR ' : '')."title LIKE '%".$db->escape($searchstring)."%' OR description LIKE '%".$db->escape($searchstring)."%'";
-			$searchalgo .= ($searchalgo ? ' OR ' : '')."keywords LIKE '".$db->escape($searchstring).",%' OR keywords LIKE '% ".$db->escape($searchstring)."%'"; // TODO Use a better way to scan keywords
+			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.title LIKE '%".$db->escape($searchstring)."%' OR wp.description LIKE '%".$db->escape($searchstring)."%'";
+			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.keywords LIKE '".$db->escape($searchstring).",%' OR wp.keywords LIKE '% ".$db->escape($searchstring)."%'"; // TODO Use a better way to scan keywords
 		}
 		if (preg_match('/content/', $algo))
 		{
-			$searchalgo .= ($searchalgo ? ' OR ' : '')."content LIKE '%".$db->escape($searchstring)."%'";
+			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.content LIKE '%".$db->escape($searchstring)."%'";
 		}
 		$sql .= $searchalgo;
+		if (is_array($otherfilters) && ! empty($otherfilters['category'])) {
+			$sql .= ' AND cwp.fk_website_page = wp.rowid AND cwp.fk_categorie = '.((int) $otherfilters['category']);
+		}
 		$sql .= ")";
 		$sql .= $db->order($sortfield, $sortorder);
 		$sql .= $db->plimit($max);
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 9babe86d341..9b704405559 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -282,7 +282,14 @@ if (empty($sortfield)) {
 $searchkey = GETPOST('searchstring', 'none');
 
 if ($action == 'replacesiteconfirm') {
-	$listofpages = getPagesFromSearchCriterias('', $algo, $searchkey, 1000, $sortfield, $sortorder);
+	$containertype = GETPOST('optioncontainertype', 'aZ09') != '-1' ? GETPOST('optioncontainertype', 'aZ09') : '';
+	$langcode = GETPOST('optionlanguage', 'aZ09');
+	$otherfilters = array();
+	if (GETPOST('optioncategory', 'int') > 0) {
+		$otherfilters['category'] = GETPOST('optioncategory', 'int');
+	}
+
+	$listofpages = getPagesFromSearchCriterias($containertype, $algo, $searchkey, 1000, $sortfield, $sortorder, $langcode, $otherfilters);
 }
 
 
@@ -430,8 +437,15 @@ if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha'))
 			setEventMessages($langs->trans("ReplacementDoneInXPages", $nbreplacement), null, 'mesgs');
 		}
 
+		$containertype = GETPOST('optioncontainertype', 'aZ09') != '-1' ? GETPOST('optioncontainertype', 'aZ09') : '';
+		$langcode = GETPOST('optionlanguage', 'aZ09');
+		$otherfilters = array();
+		if (GETPOST('optioncategory', 'int') > 0) {
+			$otherfilters['category'] = GETPOST('optioncategory', 'int');
+		}
+
 		// Now we reload list
-		$listofpages = getPagesFromSearchCriterias('', $algo, $searchkey, 1000, $sortfield, $sortorder);
+		$listofpages = getPagesFromSearchCriterias($containertype, $algo, $searchkey, 1000, $sortfield, $sortorder, $langcode, $otherfilters);
 	}
 }
 
@@ -3547,10 +3561,12 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 
 	print load_fiche_titre($langs->trans("ReplaceWebsiteContent"), '', 'search');
 
+	print '<div class="fichecenter"><div class="fichehalfleft">';
+
 	print '<div class="tagtable">';
 
 	print '<div class="tagtr">';
-	print '<div class="tagtd paddingrightonly">';
+	print '<div class="tagtd paddingrightonly opacitymedium">';
 	print $langs->trans("SearchReplaceInto");
 	print '</div>';
 	print '<div class="tagtd">';
@@ -3561,23 +3577,64 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 	print '</div>';
 
 	print '<div class="tagtr">';
-	print '<div class="tagtd paddingrightonly">';
+	print '<div class="tagtd paddingrightonly opacitymedium" style="padding-right: 10px !important">';
 	print $langs->trans("SearchString");
 	print '</div>';
 	print '<div class="tagtd">';
-
 	print '<input type="text" name="searchstring" value="'.dol_escape_htmltag($searchkey, 0, 0, '', 1).'" autofocus>';
+	print '</div>';
+	print '</div>';
+
+	print '</div>';
+
+	print '</div><div class="fichehalfleft">';
+
+	print '<div class="tagtable">';
+
+	print '<div class="tagtr">';
+	print '<div class="tagtd paddingrightonly opacitymedium" style="padding-right: 10px !important">';
+	print $langs->trans("WEBSITE_TYPE_CONTAINER");
+	print '</div>';
+	print '<div class="tagtd">';
+	print $formwebsite->selectTypeOfContainer('optioncontainertype', (GETPOST('optioncontainertype', 'alpha') ? GETPOST('optioncontainertype', 'alpha') : ''), 1);
+	print '</div>';
+	print '</div>';
+
+	print '<div class="tagtr">';
+	print '<div class="tagtd paddingrightonly opacitymedium" style="padding-right: 10px !important">';
+	print $langs->trans("Language");
+	print '</div>';
+	print '<div class="tagtd">';
+	print img_picto('', 'language', 'class="paddingrightonly"').' '.$formadmin->select_language(GETPOSTISSET('optionlanguage') ? GETPOST('optionlanguage') : '', 'optionlanguage', 0, null, '1', 0, 0, 'minwidth300', 2, 0, 0, null, 1);
+	print '</div>';
+	print '</div>';
+
+	// Categories
+	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
+	{
+		print '<div class="tagtr">';
+		print '<div class="tagtd paddingrightonly marginrightonly opacitymedium" style="padding-right: 10px !important">';
+		print $langs->trans("Category");
+		print '</div>';
+		print '<div class="tagtd">';
+		print img_picto('', 'category', 'class="paddingrightonly"').' '.$form->select_all_categories(Categorie::TYPE_WEBSITE_PAGE, GETPOSTISSET('optioncategory') ? GETPOST('optioncategory') : '', 'optioncategory', null, null);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+		print ajax_combobox('optioncategory');
+		print '</div>';
+		print '</div>';
+	}
+
+	print '</div>';
 
 	print '<input type="submit" class="button" name="buttonreplacesitesearch" value="'.dol_escape_htmltag($langs->trans("Search")).'">';
 
-	print '</div>';
-	print '</div>';
-
-	print '</div>';
-
+	print '</div></div>';
 
 	if ($action == 'replacesiteconfirm')
 	{
+		print '<!-- List of search result -->'."\n";
+		print '<div class="rowsearchresult clearboth">';
+
 		print '<br>';
 		print '<br>';
 
@@ -3606,9 +3663,6 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 
 			print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit, 1, 1, 1);
 
-			print '<!-- List of search result -->'."\n";
-			print '<div class="rowsearchresult">';
-
 			$param = 'action=replacesiteconfirm&website='.urlencode($website->ref);
 			$param .= '&searchstring='.urlencode($searchkey);
 			if (GETPOST('optioncontent')) $param .= '&optioncontent=content';
@@ -3727,12 +3781,14 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 				}
 			}
 			print '</table>';
-			print '</div></div>';
+			print '</div>';
 			print '<br>';
 		}
 		else {
 			print $listofpages['message'];
 		}
+
+		print '</div>';
 	}
 
 	print '</form>';

From 05ac3de2f0a39d08048aabd6f3084c0747d7c743 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 26 May 2020 12:46:51 +0200
Subject: [PATCH 475/490] Enhance search / filter

---
 htdocs/core/lib/website.lib.php | 10 +++++-----
 htdocs/website/index.php        |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index ebbaf4ec775..b158f65c044 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -780,26 +780,26 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 
 	if (!is_object($weblangs)) $weblangs = $langs;
 
-	if (empty($searchstring))
+	if (empty($searchstring) && empty($type) && empty($langcode) && empty($otherfilters))
 	{
 		$error++;
 		$arrayresult['code'] = 'KO';
 		$arrayresult['message'] = $weblangs->trans("EmptySearchString");
-	} elseif (dol_strlen($searchstring) < 2) {
+	} elseif ($searchstring && dol_strlen($searchstring) < 2) {
 		$weblangs->load("errors");
 		$error++;
 		$arrayresult['code'] = 'KO';
 		$arrayresult['message'] = $weblangs->trans("ErrorSearchCriteriaTooSmall");
 	} else {
 		$tmparrayoftype = explode(',', $type);
-		foreach ($tmparrayoftype as $tmptype) {
+		/*foreach ($tmparrayoftype as $tmptype) {
 			if (!in_array($tmptype, array('', 'page', 'blogpost'))) {
 				$error++;
 				$arrayresult['code'] = 'KO';
 				$arrayresult['message'] = 'Bad value for parameter type';
 				break;
 			}
-		}
+		}*/
 	}
 
 	$searchdone = 0;
@@ -819,7 +819,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 			$tmparrayoftype = explode(',', $type);
 			$typestring = '';
 			foreach ($tmparrayoftype as $tmptype) {
-				$typestring .= ($typestring ? ", " : "")."'".trim($tmptype)."'";
+				$typestring .= ($typestring ? ", " : "")."'".$db->escape(trim($tmptype))."'";
 			}
 			$sql .= " AND wp.type_container IN (".$typestring.")";
 		}
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 9b704405559..aa7e165754f 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -374,9 +374,10 @@ if ($action == 'unsetshowsubcontainers')
 	exit;
 }
 
-if (($action == 'replacesite' || $action == 'replacesiteconfirm') && !$searchkey)
+if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha') && !$searchkey)
 {
 	$action = 'replacesite';
+	$massaction = '';
 }
 
 // Replacement of string into pages
@@ -3648,9 +3649,10 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 
 			// List of mass actions available
 			$arrayofmassactions = array();
-			if ($user->rights->website->writephp) $arrayofmassactions['replace'] = $langs->trans("Replace");
+			if ($user->rights->website->writephp && $searchkey) $arrayofmassactions['replace'] = $langs->trans("Replace");
 			if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 			if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+
 			$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 			$massactionbutton .= '<div class="massactionother hidden">';
 			$massactionbutton .= $langs->trans("ReplaceString");

From d51bf44f55012b87fb0967678f4fa8351aaedfd0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 26 May 2020 12:53:58 +0200
Subject: [PATCH 476/490] Add picto

---
 htdocs/website/index.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index aa7e165754f..bd19975ba47 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -3208,7 +3208,8 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	print '<tr><td class="titlefield fieldrequired">';
 	print $langs->trans('WEBSITE_TYPE_CONTAINER');
 	print '</td><td>';
-	print $formwebsite->selectTypeOfContainer('WEBSITE_TYPE_CONTAINER', (GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha') ?GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha') : $type_container));
+	print img_picto('', 'object_technic', 'class="paddingrightonly"').' ';
+	$formwebsite->selectTypeOfContainer('WEBSITE_TYPE_CONTAINER', (GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha') ?GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha') : $type_container));
 	print '</td></tr>';
 
 	if ($action == 'createcontainer')
@@ -3597,7 +3598,8 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 	print $langs->trans("WEBSITE_TYPE_CONTAINER");
 	print '</div>';
 	print '<div class="tagtd">';
-	print $formwebsite->selectTypeOfContainer('optioncontainertype', (GETPOST('optioncontainertype', 'alpha') ? GETPOST('optioncontainertype', 'alpha') : ''), 1);
+	print img_picto('', 'object_technic', 'class="paddingrightonly"').' ';
+	$formwebsite->selectTypeOfContainer('optioncontainertype', (GETPOST('optioncontainertype', 'alpha') ? GETPOST('optioncontainertype', 'alpha') : ''), 1);
 	print '</div>';
 	print '</div>';
 

From 48137f8cad08c3a9a77d520efa7320e1daa6cfac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 26 May 2020 14:43:50 +0200
Subject: [PATCH 477/490] Fix look and field v12

---
 htdocs/categories/info.php       | 15 +++++++++++----
 htdocs/categories/photos.php     |  2 +-
 htdocs/categories/traduction.php | 11 +++++------
 htdocs/categories/viewcat.php    |  2 +-
 htdocs/commande/info.php         |  2 +-
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/htdocs/categories/info.php b/htdocs/categories/info.php
index 644886c7387..bef54f9dd6b 100644
--- a/htdocs/categories/info.php
+++ b/htdocs/categories/info.php
@@ -60,10 +60,10 @@ llxHeader('', $langs->trans('Categories'), '');
 
 //$object->info($object->id);
 
-$head = categories_prepare_head($object, $type);
-
 $title = Categorie::$MAP_TYPE_TITLE_AREA[$type];
 
+$head = categories_prepare_head($object, $type);
+
 dol_fiche_head($head, 'info', $langs->trans($title), -1, 'category');
 $backtolist = (GETPOST('backtolist') ? GETPOST('backtolist') : DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
 $linkback = '<a href="'.$backtolist.'">'.$langs->trans("BackToList").'</a>';
@@ -78,14 +78,21 @@ $morehtmlref .= '</div>';
 
 dol_banner_tab($object, 'label', $linkback, ($user->socid ? 0 : 1), 'label', 'label', $morehtmlref, '&type='.$type, 0, '', '', 1);
 
+print '<br>';
+
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
 
 print '<br>';
 
-print '<table width="100%"><tr><td>';
+print '<table "border centpercent tableforfield">';
+
+print '<tr><td>';
 dol_print_object_info($object);
-print '</td></tr></table>';
+print '</td></tr>';
+
+print '</table>';
+
 print '</div>';
 
 dol_fiche_end();
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index ba09852d61b..e8b3da0a525 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -144,7 +144,7 @@ if ($object->id)
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
+	print '<table class="border centpercent tableforfield">';
 
 	// Description
 	print '<tr><td class="titlefield notopnoleft">';
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index ea36ce40edd..a8f3510c31b 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -22,7 +22,7 @@
 /**
  *	\file       htdocs/product/traduction.php
  *	\ingroup    product
- *	\brief      Page de traduction des produits
+ *	\brief      Page of translation of products
  */
 
 require '../main.inc.php';
@@ -167,12 +167,12 @@ $cancel != $langs->trans("Cancel") &&
  * View
  */
 
-llxHeader("", "", $langs->trans("Translation"));
-
 $form = new Form($db);
 $formadmin = new FormAdmin($db);
 $formother = new FormOther($db);
 
+llxHeader("", "", $langs->trans("Translation"));
+
 $title = Categorie::$MAP_TYPE_TITLE_AREA[$type];
 
 $head = categories_prepare_head($object, $type);
@@ -194,8 +194,7 @@ $object->next_prev_filter = ' type = '.$object->type;
 $object->ref = $object->label;
 $morehtmlref = '<br><div class="refidno"><a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("Root").'</a> >> ';
 $ways = $object->print_all_ways(" &gt;&gt; ", '', 1);
-foreach ($ways as $way)
-{
+foreach ($ways as $way) {
     $morehtmlref .= $way."<br>\n";
 }
 $morehtmlref .= '</div>';
@@ -207,7 +206,7 @@ print '<br>';
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
 
-print '<table class="border centpercent">';
+print '<table class="border centpercent tableforfield">';
 
 // Description
 print '<tr><td class="titlefield notopnoleft">';
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 6c2a71fe21e..0e5b50085c9 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -228,7 +228,7 @@ print '<br>';
 
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
-print '<table width="100%" class="border">';
+print '<table class="border centpercent tableforfield">';
 
 // Description
 print '<tr><td class="titlefield notopnoleft tdtop">';
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index 6de602c22d4..9b45bf66312 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -20,7 +20,7 @@
 /**
  *      \file       htdocs/commande/info.php
  *      \ingroup    commande
- *		\brief      Page des informations d'une commande
+ *		\brief      Sale Order info page
  */
 
 require '../main.inc.php';

From 7ceb236a095f195916384ee8c33be9a96d3109f3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 26 May 2020 14:43:50 +0200
Subject: [PATCH 478/490] Fix look and field v12

---
 htdocs/categories/info.php       | 15 +++++++++++----
 htdocs/categories/photos.php     |  2 +-
 htdocs/categories/traduction.php | 11 +++++------
 htdocs/categories/viewcat.php    |  2 +-
 htdocs/commande/info.php         |  2 +-
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/htdocs/categories/info.php b/htdocs/categories/info.php
index 644886c7387..bef54f9dd6b 100644
--- a/htdocs/categories/info.php
+++ b/htdocs/categories/info.php
@@ -60,10 +60,10 @@ llxHeader('', $langs->trans('Categories'), '');
 
 //$object->info($object->id);
 
-$head = categories_prepare_head($object, $type);
-
 $title = Categorie::$MAP_TYPE_TITLE_AREA[$type];
 
+$head = categories_prepare_head($object, $type);
+
 dol_fiche_head($head, 'info', $langs->trans($title), -1, 'category');
 $backtolist = (GETPOST('backtolist') ? GETPOST('backtolist') : DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
 $linkback = '<a href="'.$backtolist.'">'.$langs->trans("BackToList").'</a>';
@@ -78,14 +78,21 @@ $morehtmlref .= '</div>';
 
 dol_banner_tab($object, 'label', $linkback, ($user->socid ? 0 : 1), 'label', 'label', $morehtmlref, '&type='.$type, 0, '', '', 1);
 
+print '<br>';
+
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
 
 print '<br>';
 
-print '<table width="100%"><tr><td>';
+print '<table "border centpercent tableforfield">';
+
+print '<tr><td>';
 dol_print_object_info($object);
-print '</td></tr></table>';
+print '</td></tr>';
+
+print '</table>';
+
 print '</div>';
 
 dol_fiche_end();
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index 07e5d56d268..6b20105f797 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -144,7 +144,7 @@ if ($object->id)
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
+	print '<table class="border centpercent tableforfield">';
 
 	// Description
 	print '<tr><td class="titlefield notopnoleft">';
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index c3f87e404b7..b06a24c995f 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -22,7 +22,7 @@
 /**
  *	\file       htdocs/product/traduction.php
  *	\ingroup    product
- *	\brief      Page de traduction des produits
+ *	\brief      Page of translation of products
  */
 
 require '../main.inc.php';
@@ -167,12 +167,12 @@ $cancel != $langs->trans("Cancel") &&
  * View
  */
 
-llxHeader("", "", $langs->trans("Translation"));
-
 $form = new Form($db);
 $formadmin = new FormAdmin($db);
 $formother = new FormOther($db);
 
+llxHeader("", "", $langs->trans("Translation"));
+
 $title = Categorie::$MAP_TYPE_TITLE_AREA[$type];
 
 $head = categories_prepare_head($object, $type);
@@ -194,8 +194,7 @@ $object->next_prev_filter = ' type = '.$object->type;
 $object->ref = $object->label;
 $morehtmlref = '<br><div class="refidno"><a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("Root").'</a> >> ';
 $ways = $object->print_all_ways(" &gt;&gt; ", '', 1);
-foreach ($ways as $way)
-{
+foreach ($ways as $way) {
     $morehtmlref .= $way."<br>\n";
 }
 $morehtmlref .= '</div>';
@@ -207,7 +206,7 @@ print '<br>';
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
 
-print '<table class="border centpercent">';
+print '<table class="border centpercent tableforfield">';
 
 // Description
 print '<tr><td class="titlefield notopnoleft">';
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 803b4ae34ab..958b77e42e8 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -241,7 +241,7 @@ print '<br>';
 
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
-print '<table width="100%" class="border">';
+print '<table class="border centpercent tableforfield">';
 
 // Description
 print '<tr><td class="titlefield notopnoleft tdtop">';
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index 6de602c22d4..9b45bf66312 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -20,7 +20,7 @@
 /**
  *      \file       htdocs/commande/info.php
  *      \ingroup    commande
- *		\brief      Page des informations d'une commande
+ *		\brief      Sale Order info page
  */
 
 require '../main.inc.php';

From da8bd7507e3a66d0d02926e1cc2ea068625911ac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 26 May 2020 22:29:46 +0200
Subject: [PATCH 479/490] NEW Add mass action to set category on a list of
 website pages.

---
 htdocs/categories/class/categorie.class.php |  6 ++-
 htdocs/core/class/html.form.class.php       |  9 ++--
 htdocs/main.inc.php                         |  2 +-
 htdocs/theme/eldy/global.inc.php            |  3 ++
 htdocs/website/index.php                    | 57 +++++++++++++++++++--
 5 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 762e0f10f78..3076b9ecacd 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -655,10 +655,10 @@ class Categorie extends CommonObject
 	 * Link an object to the category
 	 *
 	 * @param   CommonObject 	$obj  	Object to link to category
-	 * @param   string     		$type 	Type of category ('product', ...)
+	 * @param   string     		$type 	Type of category ('product', ...). Use '' to take $obj->element.
 	 * @return  int                		1 : OK, -1 : erreur SQL, -2 : id not defined, -3 : Already linked
 	 */
-	public function add_type($obj, $type)
+	public function add_type($obj, $type = '')
 	{
         // phpcs:enable
 		global $user, $langs, $conf;
@@ -667,6 +667,8 @@ class Categorie extends CommonObject
 
 		if ($this->id == -1) return -2;
 
+		if (empty($type)) $type = $obj->element;
+
         $this->db->begin();
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 108fd211865..c7e39077fd3 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -647,7 +647,7 @@ class Form
 
 		$disabled = 0;
 		$ret = '<div class="centpercent center">';
-                $ret .= '<select class="flat'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' ' . $name . ' ' . $name . 'select valignmiddle" name="' . $name . '"'.($disabled ? ' disabled="disabled"' : '').'>';
+                $ret .= '<select class="flat'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' ' . $name . ' ' . $name . 'select valignmiddle alignstart" name="' . $name . '"'.($disabled ? ' disabled="disabled"' : '').'>';
 
 		// Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['currentcontext'] completed by executeHooks.
 		$parameters = array();
@@ -713,17 +713,18 @@ class Form
                         urlform = urlform + "#show_files";
     	            }
         			$( this ).closest("form").attr("action", urlform);
-                    console.log("we select a mass action "+massaction+" - "+urlform);
+                    console.log("we select a mass action name='.$name.' massaction="+massaction+" - "+urlform);
         	        /* Warning: if you set submit button to disabled, post using Enter will no more work if there is no other button */
         			if ($(this).val() != \'0\')
     	  			{
                                         jQuery(".' . $name . 'confirmed").prop(\'disabled\', false);
-                                        jQuery(".' . $name . 'other").show();
+										jQuery(".' . $name . 'other").hide();	/* To disable if another div was open */
+                                        jQuery(".' . $name . '"+massaction).show();
     	  			}
     	  			else
     	  			{
                                         jQuery(".' . $name . 'confirmed").prop(\'disabled\', true);
-                                        jQuery(".' . $name . 'other").hide();
+										jQuery(".' . $name . 'other").hide();	/* To disable any div open */
     	  			}
     	        });
         	});
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 57e5a421208..71835beaefa 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1239,7 +1239,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		if (GETPOSTISSET('dol_optimize_smallscreen')) { $themeparam .= '&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen', 'int'); }
 		if (GETPOSTISSET('dol_no_mouse_hover')) { $themeparam .= '&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover', 'int'); }
 		if (GETPOSTISSET('dol_use_jmobile')) { $themeparam .= '&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile', 'int'); $conf->dol_use_jmobile = GETPOST('dol_use_jmobile', 'int'); }
-		if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) { $themeparam .= '&amp;THEME_AGRESSIVENESS_RATIO='.GETPOST('THEME_AGRESSIVENESS_RATIO', 'int'); }
+		if (GETPOSTISSET('THEME_SATURATE_RATIO')) { $themeparam .= '&amp;THEME_SATURATE_RATIO='.GETPOST('THEME_SATURATE_RATIO', 'int'); }
 
 		if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax)
 		{
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index fa423f676f2..9f2e022825c 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -552,6 +552,9 @@ textarea.centpercent {
     text-align: center;
     margin: 0px auto;
 }
+.alignstart {
+    text-align: start;
+}
 .left {
 	text-align: <?php print $left; ?>;
 }
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index bd19975ba47..be1ea0eb4cb 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -292,6 +292,8 @@ if ($action == 'replacesiteconfirm') {
 	$listofpages = getPagesFromSearchCriterias($containertype, $algo, $searchkey, 1000, $sortfield, $sortorder, $langcode, $otherfilters);
 }
 
+$usercanedit = $user->rights->website->write;
+
 
 
 /*
@@ -380,6 +382,46 @@ if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha') && !$searc
 	$massaction = '';
 }
 
+// Set categoery
+if ($massaction == 'setcategory' && GETPOST('confirmmassaction', 'alpha') && $usercanedit)
+{
+	$error = 0;
+
+	$db->begin();
+
+	$categoryid = GETPOST('setcategory', 'none');
+	if ($categoryid > 0) {
+		$nbupdate = 0;
+		$tmpwebsitepage = new WebsitePage($db);
+		$category = new Categorie($db);
+		$category->fetch($categoryid);
+
+		foreach($toselect as $tmpid) {
+			$tmpwebsitepage->id = $tmpid;
+			$result = $category->add_type($tmpwebsitepage, 'website_page');
+			if ($result < 0 && $result != -3) {
+				$error++;
+				setEventMessages($category->error, $category->errors, 'errors');
+				break;
+			} else {
+				$nbupdate++;
+			}
+		}
+	}
+
+	if ($error) {
+		$db->rollback();
+	} else {
+		if ($nbupdate) {
+			setEventMessages($langs->trans("RecordsModified", $nbupdate), null, 'mesgs');
+		}
+
+		$db->commit();
+	}
+	// Now we reload list
+	$listofpages = getPagesFromSearchCriterias($containertype, $algo, $searchkey, 1000, $sortfield, $sortorder, $langcode, $otherfilters);
+}
+
 // Replacement of string into pages
 if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha'))
 {
@@ -3558,7 +3600,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 	print '<input type="hidden" name="website" value="'.$website->ref.'">';
 
 
-	print '<!-- Replace string -->'."\n";
+	print '<!-- Search page and replace string -->'."\n";
 	print '<div class="fiche"><br>';
 
 	print load_fiche_titre($langs->trans("ReplaceWebsiteContent"), '', 'search');
@@ -3652,20 +3694,27 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 			// List of mass actions available
 			$arrayofmassactions = array();
 			if ($user->rights->website->writephp && $searchkey) $arrayofmassactions['replace'] = $langs->trans("Replace");
+			if ($user->rights->website->write) $arrayofmassactions['setcategory'] = $langs->trans("ClassifyInCategory");
 			if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 			if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 
 			$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
-			$massactionbutton .= '<div class="massactionother hidden">';
+			$massactionbutton .= '<div class="massactionother massactionreplace hidden">';
 			$massactionbutton .= $langs->trans("ReplaceString");
-			$massactionbutton .= '<input type="text" name="replacestring" value="'.dol_escape_htmltag(GETPOST('replacestring', 'none')).'">';
+			$massactionbutton .= ' <input type="text" name="replacestring" value="'.dol_escape_htmltag(GETPOST('replacestring', 'none')).'">';
+			$massactionbutton .= '</div>';
+			$massactionbutton .= '<div class="massactionother massactionsetcategory hidden">';
+			$massactionbutton .= $langs->trans("Category");
+			$massactionbutton .= ' '.$form->select_all_categories(Categorie::TYPE_WEBSITE_PAGE, GETPOSTISSET('setcategory') ? GETPOST('setcategory') : '', 'setcategory', 64, 0, 0, 0, 'minwidth300 alignstart');
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+			$massactionbutton .= ajax_combobox('setcategory');
 			$massactionbutton .= '</div>';
 
 			$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 			//$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 			$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
-			print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit, 1, 1, 1);
+			print_barre_liste($langs->trans("Results"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, '', '', $limit, 1, 1, 1);
 
 			$param = 'action=replacesiteconfirm&website='.urlencode($website->ref);
 			$param .= '&searchstring='.urlencode($searchkey);

From 91ecd3455fec6f9c7301b2de726fe3660ca0eb97 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 26 May 2020 22:30:11 +0200
Subject: [PATCH 480/490] Fix CSS

---
 htdocs/core/lib/functions.lib.php  | 32 +++++------
 htdocs/main.inc.php                |  2 +-
 htdocs/theme/eldy/info-box.inc.php | 62 ++++++++++++++++-----
 htdocs/theme/eldy/style.css.php    |  2 +-
 htdocs/theme/md/info-box.inc.php   | 88 +++++++++++++++++++++++-------
 5 files changed, 134 insertions(+), 52 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e3059ade21e..d08522bfaa4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3262,24 +3262,24 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 			// Add CSS
 			$arrayconvpictotomorcess = array(
-				'action'=>'bg-infobox-action', 'account'=>'bg-infobox-bank_account', 'accountancy'=>'bg-infobox-bank_account',
+				'action'=>'infobox-action', 'account'=>'infobox-bank_account', 'accountancy'=>'infobox-bank_account',
 				'bank_account'=>'bg-infobox-bank_account',
-				'bill'=>'bg-infobox-commande', 'billa'=>'bg-infobox-commande', 'billd'=>'bg-infobox-commande',
-				'cash-register'=>'bg-infobox-bank_account', 'contract'=>'bg-infobox-contrat', 'check'=>'font-status4', 'conversation'=>'bg-infobox-contrat',
-				'donation'=>'bg-infobox-commande', 'dollyrevert'=>'flip', 'ecm'=>'bg-infobox-action',
-				'hrm'=>'bg-infobox-adherent', 'group'=>'bg-infobox-adherent', 'intervention'=>'bg-infobox-contrat',
-				'multicurrency'=>'bg-infobox-bank_account',
-				'members'=>'bg-infobox-adherent', 'member'=>'bg-infobox-adherent', 'money-bill-alt'=>'bg-infobox-bank_account',
-				'order'=>'bg-infobox-commande',
-				'user'=>'bg-infobox-adherent', 'users'=>'bg-infobox-adherent',
+				'bill'=>'infobox-commande', 'billa'=>'infobox-commande', 'billd'=>'infobox-commande',
+				'cash-register'=>'infobox-bank_account', 'contract'=>'infobox-contrat', 'check'=>'font-status4', 'conversation'=>'infobox-contrat',
+				'donation'=>'infobox-commande', 'dollyrevert'=>'flip', 'ecm'=>'infobox-action',
+				'hrm'=>'infobox-adherent', 'group'=>'infobox-adherent', 'intervention'=>'infobox-contrat',
+				'multicurrency'=>'infobox-bank_account',
+				'members'=>'infobox-adherent', 'member'=>'infobox-adherent', 'money-bill-alt'=>'infobox-bank_account',
+				'order'=>'infobox-commande',
+				'user'=>'infobox-adherent', 'users'=>'infobox-adherent',
 				'error'=>'pictoerror', 'warning'=>'pictowarning', 'switch_on'=>'font-status4',
-				'holiday'=>'bg-infobox-holiday', 'invoice'=>'bg-infobox-commande',
-				'payment'=>'bg-infobox-bank_account', 'poll'=>'bg-infobox-adherent', 'project'=>'bg-infobox-project', 'projecttask'=>'bg-infobox-project', 'propal'=>'bg-infobox-propal',
-				'resource'=>'bg-infobox-action',
-				'supplier_invoice'=>'bg-infobox-order_supplier', 'supplier_invoicea'=>'bg-infobox-order_supplier', 'supplier_invoiced'=>'bg-infobox-order_supplier',
-				'supplier_order'=>'bg-infobox-order_supplier', 'supplier_proposal'=>'bg-infobox-supplier_proposal',
-				'ticket'=>'bg-infobox-contrat', 'title_accountancy'=>'bg-infobox-bank_account', 'title_hrm'=>'bg-infobox-holiday', 'trip'=>'bg-infobox-expensereport', 'title_agenda'=>'bg-infobox-action',
-				//'title_setup'=>'bg-infobox-action', 'tools'=>'bg-infobox-action',
+				'holiday'=>'infobox-holiday', 'invoice'=>'infobox-commande',
+				'payment'=>'infobox-bank_account', 'poll'=>'infobox-adherent', 'project'=>'infobox-project', 'projecttask'=>'infobox-project', 'propal'=>'infobox-propal',
+				'resource'=>'infobox-action',
+				'supplier_invoice'=>'infobox-order_supplier', 'supplier_invoicea'=>'infobox-order_supplier', 'supplier_invoiced'=>'infobox-order_supplier',
+				'supplier_order'=>'infobox-order_supplier', 'supplier_proposal'=>'infobox-supplier_proposal',
+				'ticket'=>'infobox-contrat', 'title_accountancy'=>'infobox-bank_account', 'title_hrm'=>'infobox-holiday', 'trip'=>'infobox-expensereport', 'title_agenda'=>'infobox-action',
+				//'title_setup'=>'infobox-action', 'tools'=>'infobox-action',
 				'list-alt'=>'imgforviewmode', 'calendar'=>'imgforviewmode', 'calendarweek'=>'imgforviewmode', 'calendarmonth'=>'imgforviewmode', 'calendarday'=>'imgforviewmode', 'calendarperuser'=>'imgforviewmode'
 			);
 			if (!empty($arrayconvpictotomorcess[$pictowithouttext])) {
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 98d00a98404..490641ca9fa 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1262,7 +1262,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		if (GETPOSTISSET('dol_optimize_smallscreen')) { $themeparam .= '&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen', 'int'); }
 		if (GETPOSTISSET('dol_no_mouse_hover')) { $themeparam .= '&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover', 'int'); }
 		if (GETPOSTISSET('dol_use_jmobile')) { $themeparam .= '&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile', 'int'); $conf->dol_use_jmobile = GETPOST('dol_use_jmobile', 'int'); }
-		if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) { $themeparam .= '&amp;THEME_AGRESSIVENESS_RATIO='.GETPOST('THEME_AGRESSIVENESS_RATIO', 'int'); }
+		if (GETPOSTISSET('THEME_SATURATE_RATIO')) { $themeparam .= '&amp;THEME_SATURATE_RATIO='.GETPOST('THEME_SATURATE_RATIO', 'int'); }
 
 		if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax)
 		{
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 2b734f037b3..a0f54591534 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -198,12 +198,10 @@ a.info-box-text{ text-decoration: none;}
 include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 $prefix = '';
-//$prefix = 'background-';
 if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) $prefix = 'background-';
 
-if (!isset($conf->global->THEME_AGRESSIVENESS_RATIO) && $prefix) $conf->global->THEME_AGRESSIVENESS_RATIO = -50;
-if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENESS_RATIO = GETPOST('THEME_AGRESSIVENESS_RATIO', 'int');
-//var_dump($conf->global->THEME_AGRESSIVENESS_RATIO);
+if (!isset($conf->global->THEME_SATURATE_RATIO)) $conf->global->THEME_SATURATE_RATIO = 0.7;
+if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int');
 
 ?>
 .info-box-icon {
@@ -211,38 +209,76 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES
 	color: #fff !important;
 	<?php } ?>
     opacity: 0.95;
+    <?php if (isset($conf->global->THEME_SATURATE_RATIO)) { ?>
+        filter: saturate(<?php echo $conf->global->THEME_SATURATE_RATIO; ?>);
+    <?php } ?>
 }
 
 .bg-infobox-project{
-	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#6c6aa8', $conf->global->THEME_AGRESSIVENESS_RATIO); ?> !important;
+	<?php echo $prefix; ?>color: #6c6aa8 !important;
 }
 .bg-infobox-action{
-	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#a47080', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	<?php echo $prefix; ?>color: #a47080 !important;
 }
 .bg-infobox-propal,
 .bg-infobox-facture,
 .bg-infobox-commande{
-	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#99a17d', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	<?php echo $prefix; ?>color: #99a17d !important;
 }
 .bg-infobox-supplier_proposal,
 .bg-infobox-invoice_supplier,
 .bg-infobox-order_supplier{
-	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#599caf', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	<?php echo $prefix; ?>color: #599caf !important;
 }
 .bg-infobox-contrat, .bg-infobox-ticket{
-	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#46a676', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	<?php echo $prefix; ?>color: #46a676 !important;
 }
 .bg-infobox-bank_account{
-	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#b0a53e', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	<?php echo $prefix; ?>color: #b0a53e !important;
 }
 .bg-infobox-adherent, .bg-infobox-member {
-	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#79633f', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	<?php echo $prefix; ?>color: #79633f !important;
 }
 .bg-infobox-expensereport{
-	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#79633f', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	<?php echo $prefix; ?>color: #79633f !important;
 }
 .bg-infobox-holiday{
-	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#755114', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	<?php echo $prefix; ?>color: #755114 !important;
+}
+
+.infobox-adherent, .infobox-member {
+	color: #79633f !important;
+}
+.infobox-project{
+	color: #6c6aa8 !important;
+}
+.infobox-action{
+	color: #a47080 !important;
+}
+.infobox-propal,
+.infobox-facture,
+.infobox-commande{
+	color: #99a17d !important;
+}
+.infobox-supplier_proposal,
+.infobox-invoice_supplier,
+.infobox-order_supplier{
+	color: #599caf !important;
+}
+.infobox-contrat, .infobox-ticket{
+	color: #46a676 !important;
+}
+.infobox-bank_account{
+	color: #b0a53e !important;
+}
+.infobox-adherent, .infobox-member {
+	color: #79633f !important;
+}
+.infobox-expensereport{
+	color: #79633f !important;
+}
+.infobox-holiday{
+	color: #755114 !important;
 }
 
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 927d29e1919..526846f8a19 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -237,7 +237,7 @@ print 'fontsizesmaller='.$fontsizesmaller."\n";
 print 'topMenuFontSize='.$topMenuFontSize."\n";
 print 'toolTipBgColor='.$toolTipBgColor."\n";
 print 'toolTipFontColor='.$toolTipFontColor."\n";
-print 'conf->global->THEME_AGRESSIVENESS_RATIO='.$conf->global->THEME_AGRESSIVENESS_RATIO." (must be between -100 and +100)\n";
+print 'conf->global->THEME_SATURATE_RATIO='.$conf->global->THEME_SATURATE_RATIO." (must be between 0 and 1)\n";
 print '*/'."\n";
 
 
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index f2a2a8b810d..6a313ace567 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -8,42 +8,85 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 $prefix = '';
-//$prefix = 'background-';
 if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) $prefix = 'background-';
+
+$prefix = '';
+if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) $prefix = 'background-';
+
+if (!isset($conf->global->THEME_SATURATE_RATIO)) $conf->global->THEME_SATURATE_RATIO = 0.5;
+if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int');
+
 ?>
 
 .bg-infobox-project{
-	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#6c6aa8', $conf->global->THEME_AGRESSIVENESS_RATIO); ?> !important;
+	<?php echo $prefix; ?>color: #6c6aa8 !important;
 }
 .bg-infobox-action{
-	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#a47080', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	<?php echo $prefix; ?>color: #a47080  !important;
 }
 .bg-infobox-propal,
 .bg-infobox-facture,
 .bg-infobox-commande{
-	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#99a17d', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	<?php echo $prefix; ?>color: #99a17d  !important;
 }
 .bg-infobox-supplier_proposal,
 .bg-infobox-invoice_supplier,
 .bg-infobox-order_supplier{
-	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#599caf', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	<?php echo $prefix; ?>color: #599caf  !important;
 }
 .bg-infobox-contrat, .bg-infobox-ticket{
-	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#46a676', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	<?php echo $prefix; ?>color: #46a676  !important;
 }
 .bg-infobox-bank_account{
-	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#b0a53e', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	<?php echo $prefix; ?>color: #b0a53e  !important;
 }
 .bg-infobox-adherent, .bg-infobox-member{
-	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#79633f', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	<?php echo $prefix; ?>color: #79633f  !important;
 }
 .bg-infobox-expensereport{
-	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#79633f', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	<?php echo $prefix; ?>color: #79633f  !important;
 }
 .bg-infobox-holiday{
-	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#755114', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	<?php echo $prefix; ?>color: #755114  !important;
 }
 
+
+.infobox-adherent, .infobox-member {
+	color: #79633f !important;
+}
+.infobox-project{
+	color: #6c6aa8 !important;
+}
+.infobox-action{
+	color: #a47080 !important;
+}
+.infobox-propal,
+.infobox-facture,
+.infobox-commande{
+	color: #99a17d !important;
+}
+.infobox-supplier_proposal,
+.infobox-invoice_supplier,
+.infobox-order_supplier{
+	color: #599caf !important;
+}
+.infobox-contrat, .infobox-ticket{
+	color: #46a676 !important;
+}
+.infobox-bank_account{
+	color: #b0a53e !important;
+}
+.infobox-adherent, .infobox-member {
+	color: #79633f !important;
+}
+.infobox-expensereport{
+	color: #79633f !important;
+}
+.infobox-holiday{
+	color: #755114 !important;
+}
+
+
 .info-box-module-external span.info-box-icon-version {
     background: #bbb;
 }
@@ -102,6 +145,9 @@ if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) $prefix = 'backgro
 	font-size: 45px;
 	line-height: 90px;
 	background: #eee;
+    <?php if (isset($conf->global->THEME_SATURATE_RATIO)) { ?>
+        filter: saturate(<?php echo $conf->global->THEME_SATURATE_RATIO; ?>);
+    <?php } ?>
 }
 .info-box-sm .info-box-icon {
     width: 80px;
@@ -233,39 +279,39 @@ a.info-box-text{ text-decoration: none;}
 }
 <?php
 include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (!isset($conf->global->THEME_AGRESSIVENESS_RATIO)) $conf->global->THEME_AGRESSIVENESS_RATIO = -100;
-if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENESS_RATIO = GETPOST('THEME_AGRESSIVENESS_RATIO', 'int');
+if (!isset($conf->global->THEME_SATURATE_RATIO)) $conf->global->THEME_SATURATE_RATIO = 0.7;
+if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int');
 ?>
 .bg-infobox-project i.fa{
-	color: <?php print colorAgressiveness('#605ca8', $conf->global->THEME_AGRESSIVENESS_RATIO); ?> !important;
+	color: #605ca8 !important;
 }
 .bg-infobox-action i.fa{
-	color: <?php print colorAgressiveness('#d84b80', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	color: #d84b80  !important;
 }
 .bg-infobox-propal i.fa,
 .bg-infobox-facture i.fa,
 .bg-infobox-commande i.fa{
-	color: <?php print colorAgressiveness('#abb87b', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	color: #abb87b  !important;
 }
 .bg-infobox-supplier_proposal i.fa,
 .bg-infobox-invoice_supplier i.fa,
 .bg-infobox-order_supplier i.fa{
-	color: <?php print colorAgressiveness('#40b0cf', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	color: #40b0cf  !important;
 }
 .bg-infobox-contrat i.fa, .bg-infobox-ticket i.fa{
-	color: <?php print colorAgressiveness('#20a68a', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	color: #20a68a  !important;
 }
 .bg-infobox-bank_account i.fa{
-	color: <?php print colorAgressiveness('#b0a53e', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	color: #b0a53e  !important;
 }
 .bg-infobox-adherent i.fa, .bg-infobox-member i.fa{
-	color: <?php print colorAgressiveness('#f39c12', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	color: #755114  !important;
 }
 .bg-infobox-expensereport i.fa{
-	color: <?php print colorAgressiveness('#755114', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	color: #755114  !important;
 }
 .bg-infobox-holiday i.fa{
-	color: <?php print colorAgressiveness('#755114', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
+	color: #755114  !important;
 }
 
 

From 44273e05708eafd9ffd8b5b6e973b4e137d1abb7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 26 May 2020 22:31:27 +0200
Subject: [PATCH 481/490] Fix duplicate code

---
 htdocs/theme/md/info-box.inc.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index 6a313ace567..65ff1811269 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -10,9 +10,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 $prefix = '';
 if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) $prefix = 'background-';
 
-$prefix = '';
-if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) $prefix = 'background-';
-
 if (!isset($conf->global->THEME_SATURATE_RATIO)) $conf->global->THEME_SATURATE_RATIO = 0.5;
 if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int');
 

From e02aa4e41b3a5c74fc0e5d60699bae5354e51229 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 26 May 2020 23:22:14 +0200
Subject: [PATCH 482/490] FIX Default bank account was not loaded for document
 generation.

---
 htdocs/core/class/commondocgenerator.class.php |  4 ++--
 htdocs/societe/class/societe.class.php         | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 56910b43e4a..4a8e097fd6d 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -212,8 +212,8 @@ abstract class CommonDocGenerator
             'company_idprof6'=>$object->idprof6,
             'company_note_public'=>$object->note_public,
             'company_note_private'=>$object->note_private,
-            'company_default_bank_iban'=>$object->bank_account->iban,
-            'company_default_bank_bic'=>$object->bank_account->bic
+        	'company_default_bank_iban'=>(is_object($object->bank_account) ? $object->bank_account->iban : ''),
+        	'company_default_bank_bic'=>(is_object($object->bank_account) ? $object->bank_account->bic : '')
         );
 
         // Retrieve extrafields
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 9cc36dbb7b4..67bdbf5142c 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -636,6 +636,12 @@ class Societe extends CommonObject
      */
 	public $multicurrency_code;
 
+	/**
+	 * @var Account Default BAN account
+	 */
+	public $bank_account;
+
+
 	/**
 	 *    Constructor
 	 *
@@ -4155,6 +4161,17 @@ class Societe extends CommonObject
 				}
 			}
 
+			if (! isset($this->bank_account)) {
+				require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
+				$bac = new CompanyBankAccount($this->db);
+				$result = $bac->fetch(0, $this->id);
+				if ($result > 0) {
+					$this->bank_account = $bac;
+				} else {
+					$this->bank_account = '';
+				}
+			}
+
 			$modelpath = "core/modules/societe/doc/";
 
 			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);

From c0ce584487af128fde4e862dc8357f4d5e26ef8b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 27 May 2020 00:26:04 +0200
Subject: [PATCH 483/490] Look and feel v12

---
 htdocs/core/lib/company.lib.php   |  5 ++++-
 htdocs/core/lib/functions.lib.php |  4 ++--
 htdocs/societe/consumption.php    | 15 +++++++++------
 htdocs/societe/paymentmodes.php   |  2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 4b0a2d5b131..ec8e91f5419 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -802,7 +802,10 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
                         print '<tr class="oddeven">';
 
                         // Ref
-                        print '<td><a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$projecttmp->id.'">'.img_object($langs->trans("ShowProject"), ($obj->public ? 'projectpub' : 'project'))." ".$obj->ref.'</a></td>';
+                        print '<td>';
+                        print $projecttmp->getNomUrl(1);
+                        print '</td>';
+
                         // Label
                         print '<td>'.$obj->title.'</td>';
                         // Date start
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d08522bfaa4..2d8996523fe 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3167,7 +3167,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
         		'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website',
         		'off', 'on', 'order',
         		'paiment', 'play', 'playdisabled', 'poll', 'printer', 'product', 'propal', 'projecttask', 'stock', 'resize', 'service', 'stats', 'trip',
-				'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
+				'setup', 'sign-out', 'split', 'stripe-s', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
 				'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top',
 				'home', 'companies', 'products', 'commercial', 'invoicing', 'preview', 'project', 'projectpub', 'supplier_invoice', 'hrm', 'members', 'ticket', 'generic',
@@ -3181,7 +3181,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			if (in_array($pictowithouttext, array('object_generic', 'note', 'off', 'on', 'object_bookmark', 'bookmark', 'vcard'))) {
 				$fa = 'far';
 			}
-			if (in_array($pictowithouttext, array('skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp'))) {
+			if (in_array($pictowithouttext, array('skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'stripe-s', 'youtube', 'google-plus-g', 'whatsapp'))) {
 				$fa = 'fab';
 			}
 
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index ad7383d81af..0ce28356d90 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -31,6 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'thirdpartylist';
+
 // Security check
 $socid = GETPOST('socid', 'int');
 if ($user->socid) $socid = $user->socid;
@@ -147,6 +149,7 @@ if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) $elementTypeA
 
 if ($object->fournisseur)
 {
+	$langs->load("supplier_proposal");
 	print '<tr><td class="titlefield">';
 	print $langs->trans('SupplierCode').'</td><td colspan="3">';
 	print $object->code_fournisseur;
@@ -352,14 +355,14 @@ if ($sql_select)
 
 	$num = $db->num_rows($resql);
 
-	$param = "&socid=".$socid."&type_element=".$type_element;
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	$param = "&socid=".urlencode($socid)."&type_element=".urlencode($type_element);
+    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 	if ($sprod_fulldescr) $param .= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
 	if ($sref) $param .= "&sref=".urlencode($sref);
-	if ($month) $param .= "&month=".$month;
-	if ($year) $param .= "&year=".$year;
-	if ($optioncss != '') $param .= '&optioncss='.$optioncss;
+	if ($month) $param .= "&month=".urlencode($month);
+	if ($year) $param .= "&year=".urlencode($year);
+	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
 
     print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, '', 0, '', '', $limit);
 
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 6385346ce5d..e0636932cc2 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -963,7 +963,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		{
             $morehtmlright .= dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=createcard');
 		}
-		print load_fiche_titre($langs->trans('StripePaymentModes').($stripeacc ? ' (Stripe connection with StripeConnect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, '');
+		print load_fiche_titre($langs->trans('StripePaymentModes').($stripeacc ? ' (Stripe connection with StripeConnect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, 'stripe-s');
 
 		$listofsources = array();
 		if (is_object($stripe))

From e308170ed8ad0766300f1ddb15751aa34a801a72 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 27 May 2020 02:38:12 +0200
Subject: [PATCH 484/490] CSS

---
 htdocs/theme/eldy/global.inc.php | 3 +++
 htdocs/theme/md/style.css.php    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 9f2e022825c..bdd9e6a55c5 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1966,6 +1966,9 @@ div.mainmenu {
 	margin-left: 0px;
 	min-width: 40px;
 }
+a.tmenuimage:focus, .mainmenu.topmenuimage:focus {
+    outline: none;
+}
 
 /* For mainmenu, we always load the img */
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index c58700dc007..1e760404c8d 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2001,6 +2001,9 @@ div.mainmenu {
 	margin-left: 0px;
 	min-width: 40px;
 }
+a.tmenuimage:focus, .mainmenu.topmenuimage:focus {
+    outline: none;
+}
 
 /* Do not load menu img if hidden to save bandwidth */
 <?php if (empty($dol_hide_topmenu)) { ?>

From d3e21c82f2cd3cbf6f2e51d54a2b97321cc869e1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 27 May 2020 02:38:12 +0200
Subject: [PATCH 485/490] CSS

---
 htdocs/theme/eldy/global.inc.php | 3 +++
 htdocs/theme/md/style.css.php    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 4eaa193e682..3f6d999104e 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1963,6 +1963,9 @@ div.mainmenu {
 	margin-left: 0px;
 	min-width: 40px;
 }
+a.tmenuimage:focus, .mainmenu.topmenuimage:focus {
+    outline: none;
+}
 
 /* For mainmenu, we always load the img */
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index f1e2c9257e6..b9fe51ca252 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2005,6 +2005,9 @@ div.mainmenu {
 	margin-left: 0px;
 	min-width: 40px;
 }
+a.tmenuimage:focus, .mainmenu.topmenuimage:focus {
+    outline: none;
+}
 
 /* Do not load menu img if hidden to save bandwidth */
 <?php if (empty($dol_hide_topmenu)) { ?>

From 3f4ae8875fdae9895cbcdb73fbdc574518275a62 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 27 May 2020 02:45:09 +0200
Subject: [PATCH 486/490] Fix bad tooltip

---
 htdocs/asset/class/asset.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 7c9d91d79e7..21cd3b6393e 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -82,7 +82,7 @@ class Asset extends CommonObject
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1, 'searchall'=>1),
 		'amount_ht' => array('type'=>'double(24,8)', 'label'=>'AmountHTShort', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1, 'isameasure'=>'1', 'help'=>"Help text",),
 		'amount_vat' => array('type'=>'double(24,8)', 'label'=>'AmountVAT', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1, 'isameasure'=>'1', 'help'=>"Help text",),
-		'fk_asset_type' => array('type'=>'integer:AssetType:asset/class/asset_type.class.php', 'label'=>'AssetsType', 'visible'=>1, 'enabled'=>1, 'position'=>50, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'help'=>"LinkToThirparty",),
+		'fk_asset_type' => array('type'=>'integer:AssetType:asset/class/asset_type.class.php', 'label'=>'AssetsType', 'visible'=>1, 'enabled'=>1, 'position'=>50, 'notnull'=>1, 'index'=>1, 'searchall'=>1),
 		'description' => array('type'=>'text', 'label'=>'Description', 'visible'=>-1, 'enabled'=>1, 'position'=>90, 'notnull'=>-1,),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'visible'=>-1, 'enabled'=>1, 'position'=>91, 'notnull'=>-1,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'visible'=>-1, 'enabled'=>1, 'position'=>92, 'notnull'=>-1,),

From 479e8ceceb300ce212f963fdf4bf0ab8320a92fc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 27 May 2020 03:19:37 +0200
Subject: [PATCH 487/490] Look and feel v12

---
 htdocs/opensurvey/card.php      | 2 +-
 htdocs/opensurvey/css/style.css | 2 +-
 htdocs/opensurvey/results.php   | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 32dde7ddb3e..56aabc24721 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -214,7 +214,7 @@ print '<input type="hidden" name="action" value="update">';
 $head = opensurvey_prepare_head($object);
 
 
-dol_fiche_head($head, 'general', $langs->trans("Survey"), -1, DOL_URL_ROOT.'/opensurvey/img/object_opensurvey.png', 1);
+dol_fiche_head($head, 'general', $langs->trans("Survey"), -1, 'poll');
 
 $morehtmlref = '';
 
diff --git a/htdocs/opensurvey/css/style.css b/htdocs/opensurvey/css/style.css
index e6b84f5fde5..d9cf48c72ee 100644
--- a/htdocs/opensurvey/css/style.css
+++ b/htdocs/opensurvey/css/style.css
@@ -367,8 +367,8 @@ div.cadre td.vide {
 /*Case de tableau contenant les noms dans affichage de sondage*/
 div.cadre td.nom {
 	background-color: #DDDDDD;
-	font-size:12px;
 	text-align:center;
+	padding: 8px;
 }
 div.cadre td.casevide {
 	background-color: white;
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index 337ccb3e435..181ec830433 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -421,10 +421,11 @@ $toutsujet = str_replace("°", "'", $toutsujet);
 
 
 print '<form name="formulaire4" action="#" method="POST">'."\n";
+print '<input type="hidden" name="token" value="'.newToken().'">';
 
 $head = opensurvey_prepare_head($object);
 
-dol_fiche_head($head, 'preview', $langs->trans("Survey"), -1, DOL_URL_ROOT.'/opensurvey/img/object_opensurvey.png', 1);
+dol_fiche_head($head, 'preview', $langs->trans("Survey"), -1, 'poll');
 
 $morehtmlref = '';
 
@@ -519,6 +520,7 @@ if (GETPOST('ajoutsujet'))
 	if (!$user->rights->opensurvey->write) accessforbidden();
 
 	print '<form name="formulaire" action="" method="POST">'."\n";
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="backtopage" value="'.GETPOST('backtopage', 'alpha').'">';
 
 	print '<div class="center">'."\n";
@@ -605,6 +607,7 @@ if ($user->rights->opensurvey->write) {
 $nbcolonnes = substr_count($object->sujet, ',') + 1;
 
 print '<form name="formulaire" action="" method="POST">'."\n";
+print '<input type="hidden" name="token" value="'.newToken().'">';
 
 print '<div class="cadre"> '."\n";
 
@@ -766,7 +769,7 @@ else
 		print '<td class="sujet">'.dol_htmlentities($tmp[0]).'</td>'."\n";
 	}
 
-	print '<td class="sujet"><a href="'.$_SERVER["PHP_SELF"].'?id='.$numsondage.'&ajoutsujet=1&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_picto('', dol_buildpath('/opensurvey/img/add-16.png', 1), '', 1).'</a></td>'."\n";
+	print '<td class="sujet"><a href="'.$_SERVER["PHP_SELF"].'?id='.$numsondage.'&ajoutsujet=1&backtopage='.urlencode($_SERVER["PHP_SELF"]).'"><span class="fa fa-plus-circle valignmiddle btnTitle-icon"></span></a></td>'."\n";
 	print '</tr>'."\n";
 }
 

From 0b48ffe3cd127e503c3493bc084d75af82bbbbb6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 27 May 2020 11:38:28 +0200
Subject: [PATCH 488/490] Removed not used var $useglobalvars

---
 htdocs/core/ajax/ajaxdirpreview.php   | 2 +-
 htdocs/core/class/html.form.class.php | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index bb6a8de30d4..83227b00e51 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -355,7 +355,7 @@ if ($useajax || $action == 'delete')
 	$section_id = $section;
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-	$useglobalvars = 1;
+
 	$form = new Form($db);
 	$formquestion['urlfile'] = array('type'=>'hidden', 'value'=>$urlfile, 'name'=>'urlfile'); // We must always put field, even if empty because it is filled by javascript later
 	$formquestion['section'] = array('type'=>'hidden', 'value'=>$section, 'name'=>'section'); // We must always put field, even if empty because it is filled by javascript later
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index f2b11938ca2..30519077c9e 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4207,7 +4207,6 @@ class Form
     public function formconfirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = '', $useajax = 0, $height = 0, $width = 500, $disableformtag = 0)
 	{
 		global $langs, $conf;
-		global $useglobalvars;
 
 		$more = '<!-- formconfirm -->';
 		$formconfirm = '';
@@ -4355,7 +4354,7 @@ class Form
 					if (isset($input['inputko']) && $input['inputko'] == 1) array_push($inputko, $input['name']);
 				}
 			}
-			// Show JQuery confirm box. Note that global var $useglobalvars is used inside this template
+			// Show JQuery confirm box.
 			$formconfirm .= '<div id="'.$dialogconfirm.'" title="'.dol_escape_htmltag($title).'" style="display: none;">';
 			if (!empty($formquestion['text'])) {
 				$formconfirm .= '<div class="confirmtext">'.$formquestion['text'].'</div>'."\n";

From a207365bd2f3373405e04ebd292b29529d3b4217 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 27 May 2020 13:12:18 +0200
Subject: [PATCH 489/490] FIX XSS using the renaming of .noexe files - reported
 by Nolan.

---
 htdocs/core/class/html.formfile.class.php |  3 +-
 htdocs/core/lib/files.lib.php             | 27 +++++++++--------
 htdocs/core/tpl/filemanager.tpl.php       |  4 +--
 htdocs/ecm/class/ecmfiles.class.php       | 36 ++++++++++++-----------
 htdocs/ecm/file_card.php                  | 26 ++++++++++++----
 htdocs/ecm/index.php                      |  6 ++--
 htdocs/langs/en_US/errors.lang            |  1 +
 7 files changed, 63 insertions(+), 40 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index ec9dff5f1a3..97a4bdf1948 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1269,7 +1269,8 @@ class FormFile
 					}
 					else
 					{
-						print dol_trunc($file['name'], 200);
+						$filenametoshow = preg_replace('/\.noexe$/', '', $file['name']);
+						print dol_trunc($filenametoshow, 200);
 						print '</a>';
 					}
 					// Preview link
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 41d7bf1b294..6614b22e5ed 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -870,7 +870,7 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 			{
 				$rel_filetorenamebefore = preg_replace('/^[\\/]/', '', $rel_filetorenamebefore);
 				$rel_filetorenameafter = preg_replace('/^[\\/]/', '', $rel_filetorenameafter);
-				//var_dump($rel_filetorenamebefore.' - '.$rel_filetorenameafter);
+				//var_dump($rel_filetorenamebefore.' - '.$rel_filetorenameafter);exit;
 
 				dol_syslog("Try to rename also entries in database for full relative path before = ".$rel_filetorenamebefore." after = ".$rel_filetorenameafter, LOG_DEBUG);
 				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
@@ -893,6 +893,7 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 
 					$ecmfile->filepath = $rel_dir;
 					$ecmfile->filename = $filename;
+
 					$resultecm = $ecmfile->update($user);
 				}
 				elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
@@ -995,7 +996,7 @@ function dolCheckVirus($src_file)
  * 	@param	integer	$uploaderrorcode	Value of PHP upload error code ($_FILES['field']['error'])
  * 	@param	int		$nohook				Disable all hooks
  * 	@param	string	$varfiles			_FILES var name
- *	@return int|string       			>0 if OK, <0 or string if KO
+ *	@return int|string       			1 if OK, 2 if OK and .noexe appended, <0 or string if KO
  *  @see    dol_move()
  */
 function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disablevirusscan = 0, $uploaderrorcode = 0, $nohook = 0, $varfiles = 'addedfile')
@@ -1005,6 +1006,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 
 	$reshook = 0;
 	$file_name = $dest_file;
+	$successcode = 1;
 
 	if (empty($nohook))
 	{
@@ -1055,6 +1057,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 		if (isAFileWithExecutableContent($dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
 		{
 			$file_name .= '.noexe';
+			$successcode = 2;
 		}
 
 		// Security:
@@ -1109,7 +1112,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 		{
 			if (!empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
 			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);
-			return 1; // Success
+			return $successcode; // Success
 		}
 		else
 		{
@@ -1118,7 +1121,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 		}
 	}
 
-	return 1; // Success
+	return $successcode; // Success
 }
 
 /**
@@ -1173,8 +1176,6 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 	}
 	else
 	{
-		$error = 0;
-
 		//print "x".$file." ".$disableglob;exit;
 		$file_osencoded = dol_osencode($file); // New filename encoded in OS filesystem encoding charset
 		if (empty($disableglob) && !empty($file_osencoded))
@@ -1197,10 +1198,11 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 						$rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $filename);
 						if (!preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
 						{
-							$rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
-
 							if (is_object($db) && $indexdatabase)		// $db may not be defined when lib is in a context with define('NOREQUIREDB',1)
 							{
+								$rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
+								$rel_filetodelete = preg_replace('/\.noexe$/', '', $rel_filetodelete);
+
 								dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG);
 								include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 								$ecmfile = new EcmFiles($db);
@@ -1564,6 +1566,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 				$destfile = dol_string_nohtmltag($destfile);
 				$destfull = dol_string_nohtmltag($destfull);
 
+				// Move file from temp directory to final directory. A .noexe may also be appended on file name.
 				$resupload = dol_move_uploaded_file($TFile['tmp_name'][$i], $destfull, $allowoverwrite, 0, $TFile['error'][$i], 0, $varfiles);
 
 				if (is_numeric($resupload) && $resupload > 0)   // $resupload can be 'ErrorFileAlreadyExists'
@@ -1600,10 +1603,10 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 					// Update table of files
 					if ($donotupdatesession == 1)
 					{
-						$result = addFileIntoDatabaseIndex($upload_dir, basename($destfile), $TFile['name'][$i], 'uploaded', 0);
+						$result = addFileIntoDatabaseIndex($upload_dir, basename($destfile).($resupload == 2 ? '.noexe' : ''), $TFile['name'][$i], 'uploaded', 0);
 						if ($result < 0)
 						{
-							setEventMessages('FailedToAddFileIntoDatabaseIndex', '', 'warnings');
+							setEventMessages('WarningFailedToAddFileIntoDatabaseIndex', '', 'warnings');
 						}
 					}
 
@@ -1714,7 +1717,7 @@ function dol_remove_file_process($filenb, $donotupdatesession = 0, $donotdeletef
  *  See also commonGenerateDocument that also add/update database index when a file is generated.
  *
  *  @param      string	$dir			Directory name (full real path without ending /)
- *  @param		string	$file			File name
+ *  @param		string	$file			File name (May end with '.noexe')
  *  @param		string	$fullpathorig	Full path of origin for file (can be '')
  *  @param		string	$mode			How file was created ('uploaded', 'generated', ...)
  *  @param		int		$setsharekey	Set also the share key
@@ -1730,7 +1733,7 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo
 
 	if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
 	{
-		$filename = basename($file);
+		$filename = basename(preg_replace('/\.noexe$/', '', $file));
 		$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 		$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index 3a3395432de..f95286bbcfc 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -178,7 +178,7 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
 
 	    print '</td></tr>';
     }
-    else	// Show filtree when ajax is disabled (rare)
+    else	// Show file tree when ajax is disabled (rare)
     {
         print '<tr><td style="padding-left: 20px">';
 
@@ -212,7 +212,7 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
 <div class="pane-in ecm-in-layout-center">
 <div id="ecmfileview" class="ecmfileview">
 <?php
-// Start right panel
+// Start right panel - List of content of a directory
 
 
 $mode='noajax';
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 01f6228ad83..8f1b2c91d78 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -138,7 +138,7 @@ class EcmFiles extends CommonObject
 			 $this->entity = trim($this->entity);
 		}
 		if (isset($this->filename)) {
-			 $this->filename = trim($this->filename);
+			 $this->filename = preg_replace('/\.noexe$/', '', trim($this->filename));
 		}
 		if (isset($this->filepath)) {
 			 $this->filepath = trim($this->filepath);
@@ -346,12 +346,13 @@ class EcmFiles extends CommonObject
 		$sql .= " t.src_object_id";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		$sql.= ' WHERE 1 = 1';
-		/* Fetching this table depends on filepath+filename, it must not depends on entity
+		/* Fetching this table depends on filepath+filename, it must not depends on entity because filesystem on disk does not know what is Dolibarr entities
 		if (! empty($conf->multicompany->enabled)) {
 		    $sql .= " AND entity IN (" . getEntity('ecmfiles') . ")";
 		}*/
 		if ($relativepath) {
-			$sql .= " AND t.filepath = '" . $this->db->escape(dirname($relativepath)) . "' AND t.filename = '".$this->db->escape(basename($relativepath))."'";
+			$relativepathwithnoexe = preg_replace('/\.noexe$/', '', $relativepath);		// We must never have the .noexe into the database
+			$sql .= " AND t.filepath = '" . $this->db->escape(dirname($relativepath)) . "' AND t.filename = '".$this->db->escape(basename($relativepathwithnoexe))."'";
 			$sql .= " AND t.entity = ".$conf->entity;				// unique key include the entity so each company has its own index
 		}
 		elseif (! empty($ref)) {		// hash of file path
@@ -552,46 +553,47 @@ class EcmFiles extends CommonObject
 		// Clean parameters
 
 		if (isset($this->ref)) {
-			 $this->ref = trim($this->ref);
+			$this->ref = trim($this->ref);
 		}
 		if (isset($this->label)) {
-			 $this->label = trim($this->label);
+			$this->label = trim($this->label);
 		}
 		if (isset($this->share)) {
-			 $this->share = trim($this->share);
+			$this->share = trim($this->share);
 		}
 		if (isset($this->entity)) {
-			 $this->entity = trim($this->entity);
+			$this->entity = trim($this->entity);
 		}
 		if (isset($this->filename)) {
-			 $this->filename = trim($this->filename);
+			$this->filename = preg_replace('/\.noexe$/', '', trim($this->filename));
 		}
 		if (isset($this->filepath)) {
-			 $this->filepath = trim($this->filepath);
+			$this->filepath = trim($this->filepath);
+			$this->filepath = preg_replace('/[\\/]+$/', '', $this->filepath);		// Remove last /
 		}
 		if (isset($this->fullpath_orig)) {
-			 $this->fullpath_orig = trim($this->fullpath_orig);
+			$this->fullpath_orig = trim($this->fullpath_orig);
 		}
 		if (isset($this->description)) {
-			 $this->description = trim($this->description);
+			$this->description = trim($this->description);
 		}
 		if (isset($this->keywords)) {
-			 $this->keywords = trim($this->keywords);
+			$this->keywords = trim($this->keywords);
 		}
 		if (isset($this->cover)) {
-			 $this->cover = trim($this->cover);
+			$this->cover = trim($this->cover);
 		}
 		if (isset($this->gen_or_uploaded)) {
-			 $this->gen_or_uploaded = trim($this->gen_or_uploaded);
+			$this->gen_or_uploaded = trim($this->gen_or_uploaded);
 		}
 		if (isset($this->extraparams)) {
-			 $this->extraparams = trim($this->extraparams);
+			$this->extraparams = trim($this->extraparams);
 		}
 		if (isset($this->fk_user_m)) {
-			 $this->fk_user_m = trim($this->fk_user_m);
+			$this->fk_user_m = trim($this->fk_user_m);
 		}
 		if (isset($this->acl)) {
-			 $this->acl = trim($this->acl);
+			$this->acl = trim($this->acl);
 		}
 		if (isset($this->src_object_type)) {
 			$this->src_object_type = trim($this->src_object_type);
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 3664a2e7f28..e1796068370 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -139,6 +139,12 @@ if ($action == 'update')
 
     $oldfile = $olddir.$oldlabel;
     $newfile = $newdir.$newlabel;
+    $newfileformove = $newfile;
+    // If old file end with .noexe, new file must also end with .noexe
+    if (preg_match('/\.noexe$/', $oldfile) && ! preg_match('/\.noexe$/', $newfileformove)) {
+    	$newfileformove .= '.noexe';
+    }
+    //var_dump($oldfile);var_dump($newfile);exit;
 
     // Now we update index of file
     $db->begin();
@@ -146,7 +152,7 @@ if ($action == 'update')
     //print $oldfile.' - '.$newfile;
     if ($newlabel != $oldlabel)
     {
-        $result = dol_move($oldfile, $newfile); // This include update of database
+    	$result = dol_move($oldfile, $newfileformove); // This include update of database
         if (!$result)
         {
             $langs->load('errors');
@@ -190,7 +196,7 @@ if ($action == 'update')
 			$object->entity = $conf->entity;
 			$object->filepath = preg_replace('/[\\/]+$/', '', $newdirrelativetodocument);
 			$object->filename = $newlabel;
-			$object->label = md5_file(dol_osencode($newfile)); // hash of file content
+			$object->label = md5_file(dol_osencode($newfileformove)); // hash of file content
 			$object->fullpath_orig = '';
 			$object->gen_or_uploaded = 'unknown';
 			$object->description = ''; // indexed content
@@ -208,6 +214,11 @@ if ($action == 'update')
         $db->commit();
 
         $urlfile = $newlabel;
+        // If old file end with .noexe, new file must also end with .noexe
+        if (preg_match('/\.noexe$/', $newfileformove)) {
+        	$urlfile .= '.noexe';
+        }
+
         header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'&section='.urlencode($section));
         exit;
     }
@@ -264,9 +275,13 @@ while ($tmpecmdir && $result > 0)
 	$i++;
 }
 
+$urlfiletoshow = preg_replace('/\.noexe$/', '', $urlfile);
+
 $s = img_picto('', 'object_dir').' <a href="'.DOL_URL_ROOT.'/ecm/index.php">'.$langs->trans("ECMRoot").'</a> -> '.$s.' -> ';
-if ($action == 'edit') $s .= '<input type="text" name="label" class="quatrevingtpercent" value="'.$urlfile.'">';
-else $s .= $urlfile;
+if ($action == 'edit') $s .= '<input type="text" name="label" class="quatrevingtpercent" value="'.$urlfiletoshow.'">';
+else $s .= $urlfiletoshow;
+
+$morehtml = '';
 
 $object->ref = ''; // Force to hide ref
 dol_banner_tab($object, '', $morehtml, 0, '', '', $s);
@@ -289,10 +304,9 @@ print dol_print_size($totalsize);
 print '</td></tr>';
 */
 
+// Hash of file content
 print '<tr><td>'.$langs->trans("HashOfFileContent").'</td><td>';
 $object = new EcmFiles($db);
-//$filenametosearch=basename($filepath);
-//$filedirtosearch=basedir($filepath);
 $object->fetch(0, '', $filepathtodocument);
 if (!empty($object->label))
 {
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index e51efb01aaa..852d148e258 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -124,15 +124,17 @@ if ($action == 'confirm_deletefile')
 	if (GETPOST('confirm') == 'yes')
 	{
 		// GETPOST('urlfile','alpha') is full relative URL from ecm root dir. Contains path of all sections.
-		//var_dump(GETPOST('urlfile'));exit;
 
 		$upload_dir = $conf->ecm->dir_output.($relativepath?'/'.$relativepath:'');
 		$file = $upload_dir . "/" . GETPOST('urlfile', 'alpha');
+		//var_dump($file);exit;
 
 		$ret=dol_delete_file($file);	// This include also the delete from file index in database.
 		if ($ret)
 		{
-			setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile', 'alpha')), null, 'mesgs');
+			$urlfiletoshow = GETPOST('urlfile', 'alpha');
+			$urlfiletoshow = preg_replace('/\.noexe$/', '', $urlfiletoshow);
+			setEventMessages($langs->trans("FileWasRemoved", $urlfiletoshow), null, 'mesgs');
 			$result=$ecmdir->changeNbOfFiles('-');
 		}
 		else
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index c5b61e50ed6..d145e75bad6 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -255,3 +255,4 @@ WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different re
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
+WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
\ No newline at end of file

From 34d7dbe7e904270d7da264300190fc84a15557fd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 27 May 2020 14:42:17 +0200
Subject: [PATCH 490/490] Fix css

---
 htdocs/install/default.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index e469a3bbb80..b7fd69d9ecb 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -87,6 +87,9 @@ div.soustitre {
 tr.trlineforchoice {
     height: 4em;
 }
+a.button.runupgrade {
+    padding: 10px;
+}
 
 /* Force values for small screen 570 */
 @media only screen and (max-width: 570px)